diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..4862e0eab93c9de01feaf673d1633679d8d75db5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,16 @@ +**/deps.nix linguist-generated +**/node-packages.nix linguist-generated + +pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated +pkgs/development/r-modules/*-packages.nix linguist-generated +pkgs/development/haskell-modules/hackage-packages.nix linguist-generated +pkgs/development/beam-modules/hex-packages.nix linguist-generated + +doc/** linguist-documentation +doc/default.nix linguist-documentation=false + +nixos/doc/** linguist-documentation +nixos/doc/default.nix linguist-documentation=false + +nixos/modules/module-list.nix merge=union +# pkgs/top-level/all-packages.nix merge=union diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9e89cc78954fd148fec09dffb48e30e7b6606c11..4e508d739e6af4f69a0a6551ff092c396208a4b4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,18 +10,20 @@ # This file /.github/CODEOWNERS @edolstra -# Boostraping and core infra -/pkgs/stdenv @edolstra -/pkgs/build-support/cc-wrapper @edolstra - # Libraries /lib @edolstra @nbp +/lib/systems @nbp @ericson2314 +/lib/generators.nix @edolstra @nbp @Profpatsch # Nixpkgs Internals -/default.nix @nbp -/pkgs/top-level/default.nix @nbp -/pkgs/top-level/impure.nix @nbp -/pkgs/top-level/stage.nix @nbp +/default.nix @nbp +/pkgs/top-level/default.nix @nbp @Ericson2314 +/pkgs/top-level/impure.nix @nbp @Ericson2314 +/pkgs/top-level/stage.nix @nbp @Ericson2314 +/pkgs/stdenv +/pkgs/build-support/cc-wrapper @Ericson2314 @orivej +/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej +/pkgs/build-support/setup-hooks @Ericson2314 # NixOS Internals /nixos/default.nix @nbp @@ -62,6 +64,9 @@ /pkgs/development/interpreters/ruby @zimbatm /pkgs/development/ruby-modules @zimbatm +# Rust +/pkgs/development/compilers/rust @Mic92 @LnL7 + # Darwin-related /pkgs/stdenv/darwin @NixOS/darwin-maintainers /pkgs/os-specific/darwin @NixOS/darwin-maintainers @@ -82,4 +87,10 @@ /pkgs/applications/editors/eclipse @rycee # https://github.com/NixOS/nixpkgs/issues/31401 -/lib/maintainers.nix @ghost +/lib/licenses.nix @ghost + +# Qt / KDE +/pkgs/applications/kde @ttuegel +/pkgs/desktops/plasma-5 @ttuegel +/pkgs/development/libraries/kde-frameworks @ttuegel +/pkgs/development/libraries/qt-5 @ttuegel diff --git a/.version b/.version index a88d2ca323198953803097f102cc3d5e6704206c..770bde1f44b3d407b56396ef4614d70990bd08a1 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -18.03 +18.09 diff --git a/COPYING b/COPYING index afc460fff5cbd448d08f2b4b7d76bc363077bd12..198597a1b410bb3fc3c4c5a3f6c7a488af220891 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2017 Eelco Dolstra and the Nixpkgs/NixOS contributors +Copyright (c) 2003-2018 Eelco Dolstra and the Nixpkgs/NixOS contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index 64cfb25eac347d9daab49b19e99d2fbb1c3dcdaa..9714bbd1ab309ab704dadf3defb4e0f457f4c3ab 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ -[logo](https://nixos.org/nixos) +[logo](https://nixos.org/nixos) -[![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) [![Code Triagers Badge](https://www.codetriage.com/nixos/nixpkgs/badges/users.svg)](https://www.codetriage.com/nixos/nixpkgs) Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package -manager. It is periodically built and tested by the [hydra](http://hydra.nixos.org/) +manager. It is periodically built and tested by the [Hydra](https://hydra.nixos.org/) build daemon as so-called channels. To get channel information via git, add [nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote: @@ -13,17 +12,17 @@ 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-17.09` for the latest +custom changes on top of one of the channels, e.g. `nixos-18.03` for the latest release and `nixos-unstable` for the latest successful build of master: ``` % git remote update channels -% git rebase channels/nixos-17.09 +% git rebase channels/nixos-18.03 ``` For pull-requests, please rebase onto nixpkgs `master`. -[NixOS](https://nixos.org/nixos/) linux distribution source code is located inside +[NixOS](https://nixos.org/nixos/) Linux distribution source code is located inside `nixos/` folder. * [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation) @@ -32,9 +31,9 @@ For pull-requests, please rebase onto nixpkgs `master`. * [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Community maintained wiki](https://nixos.wiki/) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09) +* [Continuous package builds for 18.03 release](https://hydra.nixos.org/jobset/nixos/release-18.03) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for 17.09 release](https://hydra.nixos.org/job/nixos/release-17.09/tested#tabs-constituents) +* [Tests for 18.03 release](https://hydra.nixos.org/job/nixos/release-18.03/tested#tabs-constituents) Communication: diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..d0ba103fa9f1f47f51071c138404c71b43690db2 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,6 @@ +*.chapter.xml +*.section.xml +.version +out +manual-full.xml +highlightjs diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..0ddae8631f3cade387c96617d37a0633046226b7 --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,90 @@ +MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md))) + +.PHONY: all +all: validate out/html/index.html out/epub/manual.epub + +.PHONY: debug +debug: + nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml" + +.PHONY: clean +clean: + rm -f ${MD_TARGETS} .version manual-full.xml + rm -rf ./out/ ./highlightjs + +.PHONY: validate +validate: manual-full.xml + jing "$$RNG" manual-full.xml + +out/html/index.html: manual-full.xml style.css highlightjs + mkdir -p out/html + xsltproc ${xsltFlags} \ + --nonet --xinclude \ + --output $@ \ + "$$XSL/docbook/xhtml/docbook.xsl" \ + ./manual-full.xml + + mkdir -p out/html/highlightjs/ + cp -r highlightjs out/html/ + + cp ./overrides.css out/html/ + cp ./style.css out/html/style.css + + mkdir -p out/html/images/callouts + cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/ + chmod u+w -R out/html/ + +out/epub/manual.epub: manual-full.xml + mkdir -p out/epub/scratch + xsltproc ${xsltFlags} --nonet \ + --output out/epub/scratch/ \ + "$$XSL/docbook/epub/docbook.xsl" \ + ./manual-full.xml + + cp ./overrides.css out/epub/scratch/OEBPS + cp ./style.css out/epub/scratch/OEBPS + mkdir -p out/epub/scratch/OEBPS/images/callouts/ + cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/ + echo "application/epub+zip" > mimetype + zip -0Xq "out/epub/manual.epub" mimetype + rm mimetype + cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" * + rm -rf "out/epub/scratch/" + +highlightjs: + mkdir -p highlightjs + cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/ + cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/ + cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/ + cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/ + + +manual-full.xml: ${MD_TARGETS} .version *.xml + xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml + +.version: + nix-instantiate --eval \ + -E '(import ../lib).nixpkgsVersion' > .version + +%.section.xml: %.section.md + pandoc $^ -w docbook+smart \ + -f markdown+smart \ + | sed -e 's|||' \ + -e 's|||' \ + -e '1s| id=| xml:id=|' \ + -e '1s|\(<[^ ]* \)|\1xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" |' \ + | cat > $@ + +%.chapter.xml: %.chapter.md + pandoc $^ -w docbook+smart \ + --top-level-division=chapter \ + -f markdown+smart \ + | sed -e 's|||' \ + -e 's|||' \ + -e '1s| id=| xml:id=|' \ + -e '1s|\(<[^ ]* \)|\1|' \ + | cat > $@ diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 765fc56c3bb3ca6faa76f3ecc827091d317eb813..d556c7ebe1ed40908b9a7032f0d839593d583cf2 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -18,9 +18,9 @@ tab settings so it’s asking for trouble. Use lowerCamelCase for variable - names, not UpperCamelCase. TODO: naming of - attributes in - all-packages.nix? + names, not UpperCamelCase. Note, this rule does + not apply to package attribute names, which instead follow the rules + in . Function calls with attribute set arguments are written as @@ -220,9 +220,10 @@ args.stdenv.mkDerivation (args // { The variable name used for the instantiated package in all-packages.nix, and when passing it as a - dependency to other functions. This is what Nix expression authors - see. It can also be used when installing using nix-env - -iA. + dependency to other functions. Typically this is called the + package attribute name. This is what Nix + expression authors see. It can also be used when installing using + nix-env -iA. The filename for (the directory containing) the Nix expression. @@ -259,12 +260,12 @@ bound to the variable name e2fsprogs in Also append "unstable" to the name - e.g., "pkgname-unstable-2014-09-23". - Dashes in the package name should be preserved - in new variable names, rather than converted to underscores - (which was convention up to around 2013 and most names - still have underscores instead of dashes) — e.g., - http-parser instead of - http_parser. + Dashes in the package name should be preserved in + new variable names, rather than converted to underscores or camel + cased — e.g., http-parser instead of + http_parser or httpParser. The + hyphenated style is preferred in all three package + names. If there are multiple versions of a package, this should be reflected in the variable names in diff --git a/doc/configuration.xml b/doc/configuration.xml index 55c5ea809d354493cadf8f89e8b2ee116583c9fb..5370265c53ad8703d6892de3bcb58e48a4c2706a 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -14,6 +14,8 @@ true: its meta.broken set to true. + The package isn't intended to run on the given system, as none of its meta.platforms match the given system. + The package's meta.license is set to a license which is considered to be unfree. @@ -88,6 +90,42 @@ distributing the software. +
+ Installing packages on unsupported systems + + + + There are also two ways to try compiling a package which has been marked as unsuported for the given system. + + + + + For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: + + $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 + + + + + For permanently allowing broken packages to be built, you may add allowUnsupportedSystem = true; to your user's configuration file, like this: + + +{ + allowUnsupportedSystem = true; +} + + + + + + + The difference between an a package being unsupported on some system and being broken is admittedly a bit fuzzy. + If a program ought to work on a certain platform, but doesn't, the platform should be included in meta.platforms, but marked as broken with e.g. meta.broken = !hostPlatform.isWindows. + Of course, this begs the question of what "ought" means exactly. + That is left to the package maintainer. + +
+
Installing unfree packages @@ -397,7 +435,7 @@ fi
- +
GNU info setup diff --git a/doc/contributing.xml b/doc/contributing.xml index a83059aa36e62d082c38b2eddba093a8493428ff..7aa0df271ff499fd0d3a35452f215356b9261f93 100644 --- a/doc/contributing.xml +++ b/doc/contributing.xml @@ -6,12 +6,27 @@ The DocBook sources of the Nixpkgs manual are in the doc -subdirectory of the Nixpkgs repository. If you make modifications to -the manual, it's important to build it before committing. You can do that as follows: +subdirectory of the Nixpkgs repository. + +You can quickly check your edits with make: + + + $ cd /path/to/nixpkgs/doc + $ nix-shell + [nix-shell]$ make + + +If you experience problems, run make debug +to help understand the docbook errors. + +After making modifications to the manual, it's important to +build it before committing. You can do that as follows: -$ cd /path/to/nixpkgs -$ nix-build doc + $ cd /path/to/nixpkgs/doc + $ nix-shell + [nix-shell]$ make clean + [nix-shell]$ nix-build . If the build succeeds, the manual will be in diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 4b35b72feae03655322555ddaf72476f9364df9b..10e4706b0590f0ecc4eebf300d61199be5137c44 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -61,7 +61,7 @@ The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software. - Instead, it is only relevant for compatability with building certain specific compilers and build tools. + Instead, it is only relevant for compatibility with building certain specific compilers and build tools. It can be safely ignored for all other packages. @@ -162,7 +162,7 @@ A runtime dependency between 2 packages implies that between them both the host and target platforms match. This is directly implied by the meaning of "host platform" and "runtime dependency": - The package dependency exists while both packages are runnign on a single host platform. + The package dependency exists while both packages are running on a single host platform. A build time dependency, however, implies a shift in platforms between the depending package and the depended-on package. @@ -187,7 +187,7 @@ 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 six (gasp) 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. @@ -200,6 +200,45 @@
+
+ Cross packagaing cookbook + + Some frequently problems when packaging for cross compilation are good to just spell and answer. + Ideally the information above is exhaustive, so this section cannot provide any new information, + but its ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. + Feel free to add to this list! + + + + + What if my package's build system needs to build a C program to be run under the build environment? + + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + Add it to your mkDerivation invocation. + + + + + My package fails to find ar. + + + Many packages assume that an unprefixed ar is available, but Nix doesn't provide one. + It only provides a prefixed one, just as it only does for all the other binutils programs. + It may be necessary to patch the package to fix the build system to use a prefixed `ar`. + + + + + My package's testsuite needs to run host platform code. + + + doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom; + Add it to your mkDerivation invocation. + + + +
@@ -214,8 +253,19 @@ 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'. + You can use them programmatically, or on the command line: +nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz' -A whatever + + + Eventually we would like to make these platform examples an unnecessary convenience so that +nix-build <nixpkgs> --arg crossSystem.config '<arch>-<os>-<vendor>-<abi>' -A whatever + works in the vast majority of cases. + The problem today is dependencies on other sorts of configuration which aren't given proper defaults. + We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf. + Issue #34274 tracks this inconvenience along with its root cause in crufty configuration options. + + 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. diff --git a/doc/default.nix b/doc/default.nix index cfd51fba257e96a645f17d801857314be34a4c71..8abde58bb1141176c9f56a32bd730b104be7b8d3 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -7,107 +7,41 @@ in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; - - buildInputs = with pkgs; [ pandoc libxml2 libxslt zip ]; - - xsltFlags = '' - --param section.autolabel 1 - --param section.label.includes.component.label 1 - --param html.stylesheet 'style.css' - --param xref.with.number.and.title 1 - --param toc.section.depth 3 - --param admon.style ''' - --param callout.graphics.extension '.gif' - ''; - - - buildCommand = let toDocbook = { useChapters ? false, inputFile, outputFile }: - let - extraHeader = ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" ''; - in '' - { - pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--top-level-division=chapter"} \ - --smart \ - | sed -e 's|||' \ - -e 's|||' \ - -e '1s| id=| xml:id=|' \ - -e '1s|\(<[^ ]* \)|\1${extraHeader}|' - } > '${outputFile}' - ''; - in - - '' - ln -s '${sources}/'*.xml . - mkdir ./languages-frameworks - cp -s '${sources-langs}'/* ./languages-frameworks - '' - + toDocbook { - inputFile = ./introduction.md; - outputFile = "introduction.xml"; - useChapters = true; - } - + toDocbook { - inputFile = ./languages-frameworks/python.md; - outputFile = "./languages-frameworks/python.xml"; - } - + toDocbook { - inputFile = ./languages-frameworks/haskell.md; - outputFile = "./languages-frameworks/haskell.xml"; - } - + toDocbook { - inputFile = ../pkgs/development/idris-modules/README.md; - outputFile = "languages-frameworks/idris.xml"; - } - + toDocbook { - inputFile = ../pkgs/development/node-packages/README.md; - outputFile = "languages-frameworks/node.xml"; - } - + toDocbook { - 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"; - } - + '' + buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing ]; + + src = ./.; + + # Hacking on these variables? Make sure to close and open + # nix-shell between each test, maybe even: + # $ nix-shell --run "make clean all" + # otherwise they won't reapply :) + HIGHLIGHTJS = pkgs.documentation-highlighter; + XSL = "${pkgs.docbook5_xsl}/xml/xsl"; + RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng"; + xsltFlags = lib.concatStringsSep " " [ + "--param section.autolabel 1" + "--param section.label.includes.component.label 1" + "--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'" + "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'" + "--param xref.with.number.and.title 1" + "--param toc.section.depth 3" + "--stringparam admon.style ''" + "--stringparam callout.graphics.extension .svg" + ]; + + postPatch = '' echo ${lib.nixpkgsVersion} > .version + ''; - # validate against relaxng schema - xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml - ${pkgs.jing}/bin/jing ${pkgs.docbook5}/xml/rng/docbook/docbook.rng manual-full.xml - - dst=$out/share/doc/nixpkgs - mkdir -p $dst - xsltproc $xsltFlags --nonet --xinclude \ - --output $dst/manual.html \ - ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \ - ./manual.xml - - cp ${./style.css} $dst/style.css - - mkdir -p $dst/images/callouts - cp "${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/"*.gif $dst/images/callouts/ - - mkdir -p $out/nix-support - echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products + installPhase = '' + dest="$out/share/doc/nixpkgs" + mkdir -p "$(dirname "$dest")" + mv out/html "$dest" + mv "$dest/index.html" "$dest/manual.html" - xsltproc $xsltFlags --nonet --xinclude \ - --output $dst/epub/ \ - ${pkgs.docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \ - ./manual.xml + mv out/epub/manual.epub "$dest/nixpkgs-manual.epub" - cp -r $dst/images $dst/epub/OEBPS - echo "application/epub+zip" > mimetype - manual="$dst/nixpkgs-manual.epub" - zip -0Xq "$manual" mimetype - cd $dst/epub && zip -Xr9D "$manual" * - rm -rf $dst/epub + mkdir -p $out/nix-support/ + echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products ''; } diff --git a/doc/functions.xml b/doc/functions.xml index 52bdf13eba9bbb9f7f2a62f4714f23e329faf0d1..f790512e7db17f806234324d84fe1e56973a77fb 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -221,16 +221,69 @@ All generators follow a similar call interface: generatorName - configFunctions data, where configFunctions is a - set of user-defined functions that format variable parts of the content. + configFunctions data, where configFunctions is + an attrset of user-defined functions that format nested parts of the + content. They each have common defaults, so often they do not need to be set manually. An example is mkSectionName ? (name: libStr.escape [ "[" "]" - ] name) from the INI generator. It gets the name - of a section and returns a sanitized name. The default + ] name) from the INI generator. It receives the + name of a section and sanitizes it. The default mkSectionName escapes [ and ] with a backslash. + + Generators can be fine-tuned to produce exactly the file format required + by your application/service. One example is an INI-file format which uses + : as separator, the strings + "yes"/"no" as boolean values + and requires all string values to be quoted: + + + +with lib; +let + customToINI = generators.toINI { + # specifies how to format a key/value pair + mkKeyValue = generators.mkKeyValueDefault { + # specifies the generated string for a subset of nix values + mkValueString = v: + if v == true then ''"yes"'' + else if v == false then ''"no"'' + else if isString v then ''"${v}"'' + # and delegats all other values to the default generator + else generators.mkValueStringDefault {} v; + } ":"; + }; + +# the INI file can now be given as plain old nix values +in customToINI { + main = { + pushinfo = true; + autopush = false; + host = "localhost"; + port = 42; + }; + mergetool = { + merge = "diff3"; + }; +} + + + This will produce the following INI file as nix string: + + +[main] +autopush:"no" +host:"localhost" +port:42 +pushinfo:"yes" +str\:ange:"very::strange" + +[mergetool] +merge:"diff3" + + Nix store paths can be converted to strings by enclosing a derivation attribute like so: "${drv}". diff --git a/doc/introduction.md b/doc/introduction.chapter.md similarity index 100% rename from doc/introduction.md rename to doc/introduction.chapter.md diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml index d16c9f3dc87f5d3db343c6bc197f071707773294..0ce1abd6194c8db12713e66155c3b51adf40f159 100644 --- a/doc/languages-frameworks/coq.xml +++ b/doc/languages-frameworks/coq.xml @@ -11,31 +11,53 @@ in the Coq derivation. - Some libraries require OCaml and sometimes also Camlp5. The exact - versions that were used to build Coq are saved in the + Some libraries require OCaml and sometimes also Camlp5 or findlib. + The exact versions that were used to build Coq are saved in the coq.ocaml and coq.camlp5 - attributes. + and coq.findlib attributes. + + + Coq libraries may be compatible with some specific versions of Coq only. + The compatibleCoqVersions attribute is used to + precisely select those versions of Coq that are compatible with this + derivation. Here is a simple package example. It is a pure Coq library, thus it - only depends on Coq. Its makefile has been - generated using coq_makefile so we only have to + depends on Coq. It builds on the Mathematical Components library, thus it + also takes mathcomp as buildInputs. + Its Makefile has been generated using + coq_makefile so we only have to set the $COQLIB variable at install time. -{stdenv, fetchurl, coq}: -stdenv.mkDerivation { - src = fetchurl { - url = http://coq.inria.fr/pylons/contribs/files/Karatsuba/v8.4/Karatsuba.tar.gz; - sha256 = "0ymfpv4v49k4fm63nq6gcl1hbnnxrvjjp7yzc4973n49b853c5b1"; - }; +{ stdenv, fetchFromGitHub, coq, mathcomp }: - name = "coq-karatsuba"; +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-multinomials-${version}"; + version = "1.0"; + src = fetchFromGitHub { + owner = "math-comp"; + repo = "multinomials"; + rev = version; + sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; + }; buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; + inherit (src.meta) homepage; + license = stdenv.lib.licenses.cecill-b; + inherit (coq.meta) platforms; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; } - diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md new file mode 100644 index 0000000000000000000000000000000000000000..24c49ec1409c2b20005776b5613d1b42279445a8 --- /dev/null +++ b/doc/languages-frameworks/emscripten.section.md @@ -0,0 +1,185 @@ +# User's Guide to Emscripten in Nixpkgs + +[Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler + +This section of the manual covers how to use `emscripten` in nixpkgs. + +Minimal requirements: + +* nix +* nixpkgs + +Modes of use of `emscripten`: + +* **Imperative usage** (on the command line): + + If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions you can use these commands: + + * `nix-env -i emscripten` + * `nix-shell -p emscripten` + +* **Declarative usage**: + + This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`. + * build and install all packages: + * `nix-env -iA emscriptenPackages` + + * dev-shell for zlib implementation hacking: + * `nix-shell -A emscriptenPackages.zlib` + + +## Imperative usage + +A few things to note: + +* `export EMCC_DEBUG=2` is nice for debugging +* `~/.emscripten`, the build artifact cache sometimes creates issues and needs to be removed from time to time + + +## Declarative usage + +Let's see two different examples from `pkgs/top-level/emscripten-packages.nix`: + +* `pkgs.zlib.override` +* `pkgs.buildEmscriptenPackage` + +Both are interesting concepts. + +A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = true` is a default meaning that each emscriptenPackage requires a `checkPhase` implemented. + +* Use `export EMCC_DEBUG=2` from within a emscriptenPackage's `phase` to get more detailed debug output what is going wrong. +* ~/.emscripten cache is requiring us to set `HOME=$TMPDIR` in individual phases. This makes compilation slower but also makes it more deterministic. + +### Usage 1: pkgs.zlib.override + +This example uses `zlib` from nixpkgs but instead of compiling **C** to **ELF** it compiles **C** to **JS** since we were using `pkgs.zlib.override` and changed stdenv to `pkgs.emscriptenStdenv`. A few adaptions and hacks were set in place to make it working. One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. However, this can also be the downside... + +See the `zlib` example: + + zlib = (pkgs.zlib.override { + stdenv = pkgs.emscriptenStdenv; + }).overrideDerivation + (old: rec { + buildInputs = old.buildInputs ++ [ pkgconfig ]; + # we need to reset this setting! + NIX_CFLAGS_COMPILE=""; + configurePhase = '' + # FIXME: Some tests require writing at $HOME + HOME=$TMPDIR + runHook preConfigure + + #export EMCC_DEBUG=2 + emconfigure ./configure --prefix=$out --shared + + runHook postConfigure + ''; + dontStrip = true; + outputs = [ "out" ]; + buildPhase = '' + emmake make + ''; + installPhase = '' + emmake make install + ''; + checkPhase = '' + echo "================= testing zlib using node =================" + + echo "Compiling a custom test" + set -x + emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ + libz.so.${old.version} -I . -o example.js + + echo "Using node to execute the test" + ${pkgs.nodejs}/bin/node ./example.js + + set +x + if [ $? -ne 0 ]; then + echo "test failed for some reason" + exit 1; + else + echo "it seems to work! very good." + fi + echo "================= /testing zlib using node =================" + ''; + + postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' + substituteInPlace configure \ + --replace '/usr/bin/libtool' 'ar' \ + --replace 'AR="libtool"' 'AR="ar"' \ + --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' + ''; + }); + +### Usage 2: pkgs.buildEmscriptenPackage + +This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used. + + xmlmirror = pkgs.buildEmscriptenPackage rec { + name = "xmlmirror"; + + buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; + nativeBuildInputs = [ pkgconfig zlib ]; + + src = pkgs.fetchgit { + url = "https://gitlab.com/odfplugfest/xmlmirror.git"; + rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd"; + sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b"; + }; + + configurePhase = '' + rm -f fastXmlLint.js* + # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728 + # https://gitlab.com/odfplugfest/xmlmirror/issues/8 + sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv + # https://github.com/kripken/emscripten/issues/6344 + # https://gitlab.com/odfplugfest/xmlmirror/issues/9 + sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv + # https://gitlab.com/odfplugfest/xmlmirror/issues/11 + sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv + ''; + + buildPhase = '' + HOME=$TMPDIR + make -f Makefile.emEnv + ''; + + outputs = [ "out" "doc" ]; + + installPhase = '' + mkdir -p $out/share + mkdir -p $doc/share/${name} + + cp Demo* $out/share + cp -R codemirror-5.12 $out/share + cp fastXmlLint.js* $out/share + cp *.xsd $out/share + cp *.js $out/share + cp *.xhtml $out/share + cp *.html $out/share + cp *.json $out/share + cp *.rng $out/share + cp README.md $doc/share/${name} + ''; + checkPhase = '' + + ''; + }; + +### Declarative debugging + +Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go trough the individual steps. This makes it easy to build a good `unit test` or list the files of the project. + +1. `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` +2. `cd /tmp/` +3. `unpackPhase` +4. cd libz-1.2.3 +5. `configurePhase` +6. `buildPhase` +7. ... happy hacking... + +## Summary + +Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from. + +If in trouble, ask the maintainers. + diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md deleted file mode 100644 index da3fd770ce728a6293d5656d33c0dccda150fd01..0000000000000000000000000000000000000000 --- a/doc/languages-frameworks/haskell.md +++ /dev/null @@ -1,959 +0,0 @@ ---- -title: User's Guide for Haskell in Nixpkgs -author: Peter Simons -date: 2015-06-01 ---- -# User's Guide to the Haskell Infrastructure - - -## How to install Haskell packages - -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 -``` - -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 ...] -``` - -To install any of those packages into your profile, refer to them by their -attribute path (first column): -```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 -`haskellPackages.cabal-install`, and so on. (Actually, this convention causes -trouble with packages like `3dmodels` and `4Blocks`, because these names are -invalid identifiers in the Nix language. The issue of how to deal with these -rare corner cases is currently unresolved.) - -Haskell packages who's Nix name (second column) begins with a `haskell-` prefix -are packages that provide a library whereas packages without that prefix -provide just executables. Libraries may provide executables too, though: the -package `haskell-pandoc`, for example, installs both a library and an -application. You can install and use Haskell executables just like any other -program in Nixpkgs, but using Haskell libraries for development is a bit -trickier and we'll address that subject in great detail in section [How to -create a development environment]. - -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 -``` - -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 -``` - -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: -```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: -```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 -``` - -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. -Also, the attributes `haskell.compiler.ghcXYC` and -`haskell.packages.ghcXYC.ghc` are synonymous for the sake of convenience. - -## How to create a development environment - -### How to install a compiler - -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: -```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 -to the same GHC version regardless of what Nixpkgs considers "default" at any -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: -```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 -```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 -```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. -See [How to build a Haskell project using Stack]. - -If you're using `cabal-install`, re-running `cabal configure` inside the spawned -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: -```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 -required tools like GHC in its build configuration inside of the `dist/` -directory. Please note, however, that `nix-collect-garbage` can break such an -environment because the Nix store paths created by `nix-shell` aren't "alive" -anymore once `nix-shell` has terminated. If you find that your Haskell builds -no longer work after garbage collection, then you'll have to re-run `cabal -configure` inside of a new `nix-shell` environment. - -### How to install a compiler with libraries - -GHC expects to find all installed libraries inside of its own `lib` directory. -This approach works fine on traditional Unix systems, but it doesn't work for -Nix, because GHC's store path is immutable once it's built. We cannot install -additional libraries into that location. As a consequence, our copies of GHC -don't know any packages except their own core libraries, like `base`, -`containers`, `Cabal`, etc. - -We can register additional libraries to GHC, however, using a special build -function called `ghcWithPackages`. That function expects one argument: a -function that maps from an attribute set of Haskell packages to a list of -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:~]$ 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`, -```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 -definition with the appropriate name. Of course, it's also possible to define -any number of these development environments! (You can't install two of them -into the same profile at the same time, though, because that would result in -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" "$@" -``` - -The variables `$NIX_GHC`, `$NIX_GHCPKG`, etc. point to the *new* store path -`ghcWithPackages` constructed specifically for this environment. The last line -of the wrapper script then executes the real `ghc`, but passes the path to the -new `lib` directory using GHC's `-B` flag. - -The purpose of those environment variables is to work around an impurity in the -popular [ghc-paths](http://hackage.haskell.org/package/ghc-paths) library. That -library promises to give its users access to GHC's installation paths. Only, -the library can't possible know that path when it's compiled, because the path -GHC considers its own is determined only much later, when the user configures -it through `ghcWithPackages`. So we [patched -ghc-paths](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch) -to return the paths found in those environment variables at run-time rather -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`: -```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: -```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 - -If you plan to use your environment for interactive programming, not just -compiling random Haskell code, you might want to replace `ghcWithPackages` in -all the listings above with `ghcWithHoogle`. - -This environment generator not only produces an environment with GHC and all -the specified libraries, but also generates a `hoogle` and `haddock` indexes -for all the packages, and provides a wrapper script around `hoogle` binary that -uses all those things. A precise name for this thing would be -"`ghcWithPackagesAndHoogleAndDocumentationIndexes`", which is, regrettably, too -long and scary. - -For example, installing the following environment -```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 -choice to `~/.nix-profiles/share/doc/hoogle/index.html` (or -`/run/current-system/sw/share/doc/hoogle/index.html` in case you put it in -`environment.systemPackages` in NixOS). - -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 ++ "\"" -``` -and test it by typing into `ghci`: -``` -: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 -```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 -security reasons, which might be quite an inconvenience. See [this -page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for -workarounds. - -### How to build a Haskell project using Stack - -[Stack](http://haskellstack.org) is a popular build tool for Haskell projects. -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. -```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: -```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`, -`zeromq` and `zlib` packages from Nixpkgs are available. All `stack` commands -will implicitly be executed inside this ad hoc environment. - -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`: -```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 -function around `mkDerivation` called `haskell.lib.buildStackProject` to help you -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 { }); - -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}: - -with nixpkgs; - -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 - -### How to create ad hoc environments for `nix-shell` - -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: -```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: -```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`, -then add all other packages that your development environment needs into the -`buildInputs` attribute. If you'd like to switch to a different compiler -version, then pass an appropriate `compiler` argument to the expression, i.e. -`nix-shell --argstr compiler ghc784`. - -If you need such an environment because you'd like to compile a Hackage package -outside of Nix --- i.e. because you're hacking on the latest version from Git ----, then the package set provides suitable nix-shell environments for you -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/ - -$ 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 -`$PATH` already to use it here --- the `nix-shell` environment does not provide -it. - -## How to create Nix builds for your own private Haskell packages - -If your own Haskell packages have build instructions for Cabal, then you can -convert those automatically into build instructions for Nix using the -`cabal2nix` utility, which you can install into your profile by running -`nix-env -i cabal2nix`. - -### How to build a stand-alone project - -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: -```shell -cabal2nix . > foo.nix -``` -Then write the following snippet into a file called `default.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`: -```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 -called `result` after `nix-build` returns that points into that location. Of -course, passing the flag `--argstr compiler ghc763` allows switching the build -to any version of GHC currently supported. - -Furthermore, you can call `nix-shell` to enter an interactive development -environment in which you can use `cabal configure` and `cabal build` to develop -your code. That environment will automatically contain a proper GHC derivation -with all the required libraries registered as well as all the system-level -libraries your package might need. - -If your package does not depend on any system-level libraries, then it's -sufficient to run -```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 -command for that project even outside of the `nix-shell` environment. This -feature is particularly nice for those of us who like to edit their code with -an IDE, like Emacs' `haskell-mode`, because it's not necessary to start Emacs -inside of nix-shell just to make it find out the necessary settings for -building the project; `cabal-install` has already done that for us. - -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 -```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: -```shell -nix-build shell.nix -``` - -### How to build projects that depend on each other - -If you have multiple private Haskell packages that depend on each other, then -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`: -```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: -```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 -```shell -nix-build "" -A haskellPackages.foo -``` -or enter an interactive shell environment suitable for building them: -```shell -nix-shell "" -A haskellPackages.bar.env -``` - -## Miscellaneous Topics - -### How to build with profiling enabled - -Every Haskell package set takes a function called `overrides` that you can use -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: -```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`. - -### How to override package versions in a compiler-specific package set - -Nixpkgs provides the latest version of -[`ghc-events`](http://hackage.haskell.org/package/ghc-events), which is 0.4.4.0 -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`: -```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`: -```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 {}; - }; - }; -} -``` -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 -loses the `haskell.packages.ghcXYZ` sets for all compilers but GHC 7.8.4. To -avoid that problem, we have to perform the convoluted little dance from above, -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: -```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: -```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 -an ideal solution, because `ghc-events` can analyze the output emitted by any -version of GHC later than 6.12 regardless of the compiler version that was used -to build the `ghc-events` executable, so strictly speaking there's no reason to -prefer one built with GHC 7.8.x in the first place. However, for users who -cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an -older version might be useful. - -### How to recover from GHC's infamous non-deterministic library ID bug - -GHC and distributed build farms don't get along well: - - - 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 -``` -then you have to download and re-install `foo` and all its dependents from -scratch: -```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: -```shell -rm /nix/var/nix/binary-cache-v3.sqlite -rm /nix/var/nix/manifests/* -rm /nix/var/nix/channel-cache/* -``` - -### 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 -``` -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 -```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 - -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 -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 -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 -Haskell package that's built inside of nix-shell but run outside of that -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 ] -``` - -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. - - 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: - ```shell - 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. - - 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; -``` -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" ]; -``` - -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 - -By default GHC implements the Integer type using the -[GNU Multiple Precision Arithmetic (GMP) library](https://gmplib.org/). -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), -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 -if your program incorporates portions of the library, if it is linked -statically, then your program is a "derivative"--a "work based on the -library"--and according to paragraph 2, section c, you "must cause the whole of -the work to be licensed" under the terms of the LGPL (including for free). - -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 macOS.) -The LGPL licensing situation may be worse: even though -[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! - -To work around these problems GHC can be build with a slower but LGPL-free -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: `haskell.compiler.integer-simple."${ghcVersion}"`. -For example: -``` -$ 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.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: -`haskell.packages.integer-simple."${ghcVersion}"`. For example -use the following to get the `scientific` package build with `integer-simple`: -```shell -nix-build -A haskell.packages.integer-simple.ghc802.scientific -``` - -### Quality assurance - -The `haskell.lib` library includes a number of functions for checking for -various imperfections in Haskell packages. It's useful to apply these functions -to your own Haskell packages and integrate that in a Continuous Integration -server like [hydra](https://nixos.org/hydra/) to assure your packages maintain a -minimum level of quality. This section discusses some of these functions. - -#### failOnAllWarnings - -Applying `haskell.lib.failOnAllWarnings` to a Haskell package enables the -`-Wall` and `-Werror` GHC options to turn all warnings into build failures. - -#### buildStrictly - -Applying `haskell.lib.buildStrictly` to a Haskell package calls -`failOnAllWarnings` on the given package to turn all warnings into build -failures. Additionally the source of your package is gotten from first invoking -`cabal sdist` to ensure all needed files are listed in the Cabal file. - -#### checkUnusedPackages - -Applying `haskell.lib.checkUnusedPackages` to a Haskell package invokes -the [packunused](http://hackage.haskell.org/package/packunused) tool on the -package. `packunused` complains when it finds packages listed as build-depends -in the Cabal file which are redundant. For example: - -``` -$ nix-build -E 'let pkgs = import {}; in pkgs.haskell.lib.checkUnusedPackages {} pkgs.haskellPackages.scientific' -these derivations will be built: - /nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv -... -detected package components -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - - library - - testsuite(s): test-scientific - - benchmark(s): bench-scientific* - -(component names suffixed with '*' are not configured to be built) - -library -~~~~~~~ - -The following package dependencies seem redundant: - - - ghc-prim-0.5.0.0 - -testsuite(test-scientific) -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -no redundant packages dependencies found - -builder for ‘/nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv’ failed with exit code 1 -error: build of ‘/nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv’ failed -``` - -As you can see, `packunused` finds out that although the testsuite component has -no redundant dependencies the library component of `scientific-0.3.5.1` depends -on `ghc-prim` which is unused in the library. - -## 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. - - - 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). - - - The *Journey into the Haskell NG infrastructure* series of postings - describe the new Haskell infrastructure in great detail: - - - [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](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](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/haskell.section.md b/doc/languages-frameworks/haskell.section.md new file mode 100644 index 0000000000000000000000000000000000000000..1623e0d276f225098cc03de9d045d9f7f9b3e9e4 --- /dev/null +++ b/doc/languages-frameworks/haskell.section.md @@ -0,0 +1,953 @@ +--- +title: User's Guide for Haskell in Nixpkgs +author: Peter Simons +date: 2015-06-01 +--- +# User's Guide to the Haskell Infrastructure + + +## How to install Haskell packages + +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 +``` + +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 ...] +``` + +To install any of those packages into your profile, refer to them by their +attribute path (first column): +```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 +`haskellPackages.cabal-install`, and so on. (Actually, this convention causes +trouble with packages like `3dmodels` and `4Blocks`, because these names are +invalid identifiers in the Nix language. The issue of how to deal with these +rare corner cases is currently unresolved.) + +Haskell packages whose Nix name (second column) begins with a `haskell-` prefix +are packages that provide a library whereas packages without that prefix +provide just executables. Libraries may provide executables too, though: the +package `haskell-pandoc`, for example, installs both a library and an +application. You can install and use Haskell executables just like any other +program in Nixpkgs, but using Haskell libraries for development is a bit +trickier and we'll address that subject in great detail in section [How to +create a development environment]. + +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 +``` + +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 +``` + +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: +```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: +```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 +``` + +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. +Also, the attributes `haskell.compiler.ghcXYC` and +`haskell.packages.ghcXYC.ghc` are synonymous for the sake of convenience. + +## How to create a development environment + +### How to install a compiler + +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: +```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 +to the same GHC version regardless of what Nixpkgs considers "default" at any +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: +```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 +```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 +```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. +See [How to build a Haskell project using Stack]. + +If you're using `cabal-install`, re-running `cabal configure` inside the spawned +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: +```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 +required tools like GHC in its build configuration inside of the `dist/` +directory. Please note, however, that `nix-collect-garbage` can break such an +environment because the Nix store paths created by `nix-shell` aren't "alive" +anymore once `nix-shell` has terminated. If you find that your Haskell builds +no longer work after garbage collection, then you'll have to re-run `cabal +configure` inside of a new `nix-shell` environment. + +### How to install a compiler with libraries + +GHC expects to find all installed libraries inside of its own `lib` directory. +This approach works fine on traditional Unix systems, but it doesn't work for +Nix, because GHC's store path is immutable once it's built. We cannot install +additional libraries into that location. As a consequence, our copies of GHC +don't know any packages except their own core libraries, like `base`, +`containers`, `Cabal`, etc. + +We can register additional libraries to GHC, however, using a special build +function called `ghcWithPackages`. That function expects one argument: a +function that maps from an attribute set of Haskell packages to a list of +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:~]$ 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`, +```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 +definition with the appropriate name. Of course, it's also possible to define +any number of these development environments! (You can't install two of them +into the same profile at the same time, though, because that would result in +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" "$@" +``` + +The variables `$NIX_GHC`, `$NIX_GHCPKG`, etc. point to the *new* store path +`ghcWithPackages` constructed specifically for this environment. The last line +of the wrapper script then executes the real `ghc`, but passes the path to the +new `lib` directory using GHC's `-B` flag. + +The purpose of those environment variables is to work around an impurity in the +popular [ghc-paths](http://hackage.haskell.org/package/ghc-paths) library. That +library promises to give its users access to GHC's installation paths. Only, +the library can't possible know that path when it's compiled, because the path +GHC considers its own is determined only much later, when the user configures +it through `ghcWithPackages`. So we [patched +ghc-paths](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch) +to return the paths found in those environment variables at run-time rather +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`: +```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: +```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 + +If you plan to use your environment for interactive programming, not just +compiling random Haskell code, you might want to replace `ghcWithPackages` in +all the listings above with `ghcWithHoogle`. + +This environment generator not only produces an environment with GHC and all +the specified libraries, but also generates a `hoogle` and `haddock` indexes +for all the packages, and provides a wrapper script around `hoogle` binary that +uses all those things. A precise name for this thing would be +"`ghcWithPackagesAndHoogleAndDocumentationIndexes`", which is, regrettably, too +long and scary. + +For example, installing the following environment +```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 +choice to `~/.nix-profiles/share/doc/hoogle/index.html` (or +`/run/current-system/sw/share/doc/hoogle/index.html` in case you put it in +`environment.systemPackages` in NixOS). + +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 ++ "\"" +``` +and test it by typing into `ghci`: +``` +: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 +```shell +hoogle server -p 8080 --local +``` +and navigate to http://localhost:8080/ for your own local +[Hoogle](https://www.haskell.org/hoogle/). + +### How to build a Haskell project using Stack + +[Stack](http://haskellstack.org) is a popular build tool for Haskell projects. +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. +```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: +```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`, +`zeromq` and `zlib` packages from Nixpkgs are available. All `stack` commands +will implicitly be executed inside this ad hoc environment. + +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`: +```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 +function around `mkDerivation` called `haskell.lib.buildStackProject` to help you +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 { }); + +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}: + +with nixpkgs; + +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 + +### How to create ad hoc environments for `nix-shell` + +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: +```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: +```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`, +then add all other packages that your development environment needs into the +`buildInputs` attribute. If you'd like to switch to a different compiler +version, then pass an appropriate `compiler` argument to the expression, i.e. +`nix-shell --argstr compiler ghc784`. + +If you need such an environment because you'd like to compile a Hackage package +outside of Nix --- i.e. because you're hacking on the latest version from Git +---, then the package set provides suitable nix-shell environments for you +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/ + +$ 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 +`$PATH` already to use it here --- the `nix-shell` environment does not provide +it. + +## How to create Nix builds for your own private Haskell packages + +If your own Haskell packages have build instructions for Cabal, then you can +convert those automatically into build instructions for Nix using the +`cabal2nix` utility, which you can install into your profile by running +`nix-env -i cabal2nix`. + +### How to build a stand-alone project + +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: +```shell +cabal2nix . > foo.nix +``` +Then write the following snippet into a file called `default.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`: +```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 +called `result` after `nix-build` returns that points into that location. Of +course, passing the flag `--argstr compiler ghc763` allows switching the build +to any version of GHC currently supported. + +Furthermore, you can call `nix-shell` to enter an interactive development +environment in which you can use `cabal configure` and `cabal build` to develop +your code. That environment will automatically contain a proper GHC derivation +with all the required libraries registered as well as all the system-level +libraries your package might need. + +If your package does not depend on any system-level libraries, then it's +sufficient to run +```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 +command for that project even outside of the `nix-shell` environment. This +feature is particularly nice for those of us who like to edit their code with +an IDE, like Emacs' `haskell-mode`, because it's not necessary to start Emacs +inside of nix-shell just to make it find out the necessary settings for +building the project; `cabal-install` has already done that for us. + +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 +```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: +```shell +nix-build shell.nix +``` + +### How to build projects that depend on each other + +If you have multiple private Haskell packages that depend on each other, then +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`: +```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: +```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 +```shell +nix-build "" -A haskellPackages.foo +``` +or enter an interactive shell environment suitable for building them: +```shell +nix-shell "" -A haskellPackages.bar.env +``` + +## Miscellaneous Topics + +### How to build with profiling enabled + +Every Haskell package set takes a function called `overrides` that you can use +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 the following +snippet to your `~/.config/nixpkgs/config.nix` file: +```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`. + +### How to override package versions in a compiler-specific package set + +Nixpkgs provides the latest version of +[`ghc-events`](http://hackage.haskell.org/package/ghc-events), which is 0.4.4.0 +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`: +```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`: +```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 {}; + }; + }; +} +``` +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 +loses the `haskell.packages.ghcXYZ` sets for all compilers but GHC 7.8.4. To +avoid that problem, we have to perform the convoluted little dance from above, +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: +```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: +```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 +an ideal solution, because `ghc-events` can analyze the output emitted by any +version of GHC later than 6.12 regardless of the compiler version that was used +to build the `ghc-events` executable, so strictly speaking there's no reason to +prefer one built with GHC 7.8.x in the first place. However, for users who +cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an +older version might be useful. + +### How to recover from GHC's infamous non-deterministic library ID bug + +GHC and distributed build farms don't get along well: + + - 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 +``` +then you have to download and re-install `foo` and all its dependents from +scratch: +```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: +```shell +rm ~/.cache/nix/binary-cache*.sqlite +``` + +### 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 +``` +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 +```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 + +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 +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 +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 +Haskell package that's built inside of nix-shell but run outside of that +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 ] +``` + +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. + + 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: + ```shell + 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. + +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; +``` +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" ]; +``` + +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 + +By default GHC implements the Integer type using the +[GNU Multiple Precision Arithmetic (GMP) library](https://gmplib.org/). +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), +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 +if your program incorporates portions of the library, if it is linked +statically, then your program is a "derivative"--a "work based on the +library"--and according to paragraph 2, section c, you "must cause the whole of +the work to be licensed" under the terms of the LGPL (including for free). + +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 macOS.) +The LGPL licensing situation may be worse: even though +[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! + +To work around these problems GHC can be build with a slower but LGPL-free +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: `haskell.compiler.integer-simple."${ghcVersion}"`. +For example: +``` +$ 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.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: +`haskell.packages.integer-simple."${ghcVersion}"`. For example +use the following to get the `scientific` package build with `integer-simple`: +```shell +nix-build -A haskell.packages.integer-simple.ghc802.scientific +``` + +### Quality assurance + +The `haskell.lib` library includes a number of functions for checking for +various imperfections in Haskell packages. It's useful to apply these functions +to your own Haskell packages and integrate that in a Continuous Integration +server like [hydra](https://nixos.org/hydra/) to assure your packages maintain a +minimum level of quality. This section discusses some of these functions. + +#### failOnAllWarnings + +Applying `haskell.lib.failOnAllWarnings` to a Haskell package enables the +`-Wall` and `-Werror` GHC options to turn all warnings into build failures. + +#### buildStrictly + +Applying `haskell.lib.buildStrictly` to a Haskell package calls +`failOnAllWarnings` on the given package to turn all warnings into build +failures. Additionally the source of your package is gotten from first invoking +`cabal sdist` to ensure all needed files are listed in the Cabal file. + +#### checkUnusedPackages + +Applying `haskell.lib.checkUnusedPackages` to a Haskell package invokes +the [packunused](http://hackage.haskell.org/package/packunused) tool on the +package. `packunused` complains when it finds packages listed as build-depends +in the Cabal file which are redundant. For example: + +``` +$ nix-build -E 'let pkgs = import {}; in pkgs.haskell.lib.checkUnusedPackages {} pkgs.haskellPackages.scientific' +these derivations will be built: + /nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv +... +detected package components +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + - library + - testsuite(s): test-scientific + - benchmark(s): bench-scientific* + +(component names suffixed with '*' are not configured to be built) + +library +~~~~~~~ + +The following package dependencies seem redundant: + + - ghc-prim-0.5.0.0 + +testsuite(test-scientific) +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +no redundant packages dependencies found + +builder for ‘/nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv’ failed with exit code 1 +error: build of ‘/nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv’ failed +``` + +As you can see, `packunused` finds out that although the testsuite component has +no redundant dependencies the library component of `scientific-0.3.5.1` depends +on `ghc-prim` which is unused in the library. + +## 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. + + - 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). + + - The *Journey into the Haskell NG infrastructure* series of postings + describe the new Haskell infrastructure in great detail: + + - [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](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](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/idris.section.md b/doc/languages-frameworks/idris.section.md new file mode 100644 index 0000000000000000000000000000000000000000..005ed3602851ccee3a0dba23da67976335751471 --- /dev/null +++ b/doc/languages-frameworks/idris.section.md @@ -0,0 +1,39 @@ +Idris packages +============== + +This directory contains build rules for idris packages. In addition, +it contains several functions to build and compose those packages. +Everything is exposed to the user via the `idrisPackages` attribute. + +callPackage +------------ + +This is like the normal nixpkgs callPackage function, specialized to +idris packages. + +builtins +--------- + +This is a list of all of the libraries that come packaged with Idris +itself. + +build-idris-package +-------------------- + +A function to build an idris package. Its sole argument is a set like +you might pass to `stdenv.mkDerivation`, except `build-idris-package` +sets several attributes for you. See `build-idris-package.nix` for +details. + +build-builtin-package +---------------------- + +A version of `build-idris-package` specialized to builtin libraries. +Mostly for internal use. + +with-packages +------------- + +Bundle idris together with a list of packages. Because idris currently +only supports a single directory in its library path, you must include +all desired libraries here, including `prelude` and `base`. \ No newline at end of file diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index fc15d847d15f0dc9cad56e3e3b976a6c1edb1785..a1c265f674845693ec06d3d3c3bf7f702a3b898b 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -17,19 +17,20 @@ such as Perl or Haskell. These are described in this chapter. - - + + - + - + - + - + - + + diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml index 2d40a254cedfbc740fb1d36b59337df8911bc055..2507cc2c469ad7e30f0a0f6c0ecef5428e46798a 100644 --- a/doc/languages-frameworks/java.xml +++ b/doc/languages-frameworks/java.xml @@ -62,16 +62,7 @@ depending on the JDK at runtime. It is possible to use a different Java compiler than javac from the OpenJDK. For instance, to use the -Eclipse Java Compiler: - - -buildInputs = [ jre ant ecj ]; - - -(Note that here you don’t need the full JDK as an input, but just the -JRE.) The ECJ has a stdenv setup hook that sets some environment -variables to cause Ant to use ECJ, but this doesn’t work with all Ant -files. Similarly, you can use the GNU Java Compiler: +GNU Java Compiler: buildInputs = [ gcj ant ]; diff --git a/doc/languages-frameworks/node.section.md b/doc/languages-frameworks/node.section.md new file mode 100644 index 0000000000000000000000000000000000000000..17a203ed12befb2f34a70b1b2be1aa6f9a736339 --- /dev/null +++ b/doc/languages-frameworks/node.section.md @@ -0,0 +1,51 @@ +Node.js packages +================ +The `pkgs/development/node-packages` folder contains a generated collection of +[NPM packages](https://npmjs.com/) that can be installed with the Nix package +manager. + +As a rule of thumb, the package set should only provide *end user* software +packages, such as command-line utilities. Libraries should only be added to the +package set if there is a non-NPM package that requires it. + +When it is desired to use NPM libraries in a development project, use the +`node2nix` generator directly on the `package.json` configuration file of the +project. + +The package set also provides support for multiple Node.js versions. The policy +is that a new package should be added to the collection for the latest stable LTS +release (which is currently 6.x), unless there is an explicit reason to support +a different release. + +If your package uses native addons, you need to examine what kind of native +build system it uses. Here are some examples: + +* `node-gyp` +* `node-gyp-builder` +* `node-pre-gyp` + +After you have identified the correct system, you need to override your package +expression while adding in build system as a build input. For example, `dat` +requires `node-gyp-build`, so we override its expression in `default-v6.nix`: + +```nix +dat = nodePackages.dat.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; +}); +``` + +To add a package from NPM to nixpkgs: + + 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update + or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` + for packages depending on Node.js 4.x) + 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`. + 3. Build your new package to test your changes: + `cd /path/to/nixpkgs && nix-build -A nodePackages.`. + To build against a specific Node.js version (e.g. 4.x): + `nix-build -A nodePackages_4_x.` + 4. Add and commit all modified and generated files. + +For more information about the generation process, consult the +[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` +tool. diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml index dfb463b99912614a41c650b823fadb6d89fc3303..149fcb275a0954376cc00a6d0d282accb1004044 100644 --- a/doc/languages-frameworks/perl.xml +++ b/doc/languages-frameworks/perl.xml @@ -177,5 +177,19 @@ you need it. +
Cross-compiling modules + +Nixpkgs has experimental support for cross-compiling Perl +modules. In many cases, it will just work out of the box, even for +modules with native extensions. Sometimes, however, the Makefile.PL +for a module may (indirectly) import a native module. In that case, +you will need to make a stub for that module that will satisfy the +Makefile.PL and install it into +lib/perl5/site_perl/cross_perl/${perl.version}. +See the postInstall for DBI for +an example. + +
+ diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md deleted file mode 100644 index 9172d712213940f933a7bc879b8edf63ebdca5ff..0000000000000000000000000000000000000000 --- a/doc/languages-frameworks/python.md +++ /dev/null @@ -1,1020 +0,0 @@ -# Python - -## User Guide - -### Using Python - -#### Overview - -Several versions of the Python interpreter are available on Nix, as well as a -high amount of packages. The attribute `python` refers to the default -interpreter, which is currently CPython 2.7. It is also possible to refer to -specific versions, e.g. `python35` refers to CPython 3.5, and `pypy` refers to -the default PyPy interpreter. - -Python is used a lot, and in different ways. This affects also how it is -packaged. In the case of Python on Nix, an important distinction is made between -whether the package is considered primarily an application, or whether it should -be used as a library, i.e., of primary interest are the modules in -`site-packages` that should be importable. - -In the Nixpkgs tree Python applications can be found throughout, depending on -what they do, and are called from the main package set. Python libraries, -however, are in separate sets, with one set per interpreter version. - -The interpreters have several common attributes. One of these attributes is -`pkgs`, which is a package set of Python libraries for this specific -interpreter. E.g., the `toolz` package corresponding to the default interpreter -is `python.pkgs.toolz`, and the CPython 3.5 version is `python35.pkgs.toolz`. -The main package set contains aliases to these package sets, e.g. -`pythonPackages` refers to `python.pkgs` and `python35Packages` to -`python35.pkgs`. - -#### Installing Python and packages - -The Nix and NixOS manuals explain how packages are generally installed. In the -case of Python and Nix, it is important to make a distinction between whether the -package is considered an application or a library. - -Applications on Nix are typically installed into your user -profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the -package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`. -Dependencies such as libraries are automatically installed and should not be -installed explicitly. - -The same goes for Python applications and libraries. Python applications can be -installed in your profile. But Python libraries you would like to use for -development cannot be installed, at least not individually, because they won't -be able to find each other resulting in import errors. Instead, it is possible -to create an environment with `python.buildEnv` or `python.withPackages` where -the interpreter and other executables are able to find each other and all of the -modules. - -In the following examples we create an environment with Python 3.5, `numpy` and -`toolz`. As you may imagine, there is one limitation here, and that's that -you can install only one environment at a time. You will notice the complaints -about collisions when you try to install a second environment. - -##### Environment defined in separate `.nix` file - -Create a file, e.g. `build.nix`, with the following expression -```nix -with import {}; - -python35.withPackages (ps: with ps; [ numpy toolz ]) -``` -and install it in your profile with -```shell -nix-env -if build.nix -``` -Now you can use the Python interpreter, as well as the extra packages (`numpy`, -`toolz`) that you added to the environment. - -##### 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, e.g. -using `config.nix`, -```nix -{ # ... - - packageOverrides = pkgs: with pkgs; { - myEnv = python35.withPackages (ps: with ps; [ numpy toolz ]); - }; -} -``` -and install it in your profile with -```shell -nix-env -iA nixpkgs.myEnv -``` -The environment is is installed by referring to the attribute, and considering -the `nixpkgs` channel was used. - -##### Environment defined in `/etc/nixos/configuration.nix` - -For the sake of completeness, here's another example how to install the environment system-wide. - -```nix -{ # ... - - environment.systemPackages = with pkgs; [ - (python35.withPackages(ps: with ps; [ numpy toolz ])) - ]; -} -``` - -#### Temporary Python environment with `nix-shell` - -The examples in the previous section showed how to install a Python environment -into a profile. For development you may need to use multiple environments. -`nix-shell` gives the possibility to temporarily load another environment, akin -to `virtualenv`. - -There are two methods for loading a shell with Python packages. The first and recommended method -is to create an environment with `python.buildEnv` or `python.withPackages` and load that. E.g. -```sh -$ nix-shell -p 'python35.withPackages(ps: with ps; [ numpy toolz ])' -``` -opens a shell from which you can launch the interpreter -```sh -[nix-shell:~] python3 -``` -The other method, which is not recommended, does not create an environment and requires you to list the packages directly, - -```sh -$ nix-shell -p python35.pkgs.numpy python35.pkgs.toolz -``` -Again, it is possible to launch the interpreter from the shell. -The Python interpreter has the attribute `pkgs` which contains all Python libraries for that specific interpreter. - -##### Load environment from `.nix` expression -As explained in the Nix manual, `nix-shell` can also load an -expression from a `.nix` file. Say we want to have Python 3.5, `numpy` -and `toolz`, like before, in an environment. Consider a `shell.nix` file -with -```nix -with import {}; - -python35.withPackages (ps: [ps.numpy ps.toolz]) -``` -Executing `nix-shell` gives you again a Nix shell from which you can run Python. - -What's happening here? - -1. We begin with importing the Nix Packages collections. `import ` imports the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set. -2. Then we create a Python 3.5 environment with the `withPackages` function. -3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set. - -##### Execute command with `--run` -A convenient option with `nix-shell` is the `--run` -option, with which you can execute a command in the `nix-shell`. We can -e.g. directly open a Python shell -```sh -$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3" -``` -or run a script -```sh -$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py" -``` - -##### `nix-shell` as shebang -In fact, for the second use case, there is a more convenient method. You can -add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script -specifying which dependencies `nix-shell` needs. With the following shebang, you -can just execute `./myscript.py`, and it will make available all dependencies and -run the script in the `python3` shell. - -```py -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])" - -import numpy - -print(numpy.__version__) -``` - -### Developing with Python - -Now that you know how to get a working Python environment with Nix, it is time -to go forward and start actually developing with Python. We will first have a -look at how Python packages are packaged on Nix. Then, we will look at how you -can use development mode with your code. - -#### Packaging a library - -With Nix all packages are built by functions. The main function in Nix for -building Python libraries is `buildPythonPackage`. Let's see how we can build the -`toolz` package. - -```nix -{ # ... - - toolz = buildPythonPackage rec { - pname = "toolz"; - version = "0.7.4"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; - }; - - doCheck = false; - - meta = { - homepage = "http://github.com/pytoolz/toolz/"; - description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; -} -``` - -What happens here? The function `buildPythonPackage` is called and as argument -it accepts a set. In this case the set is a recursive set, `rec`. One of the -arguments is the name of the package, which consists of a basename (generally -following the name on PyPi) and a version. Another argument, `src` specifies the -source, which in this case is fetched from PyPI using the helper function -`fetchPypi`. The argument `doCheck` is used to set whether tests should be run -when building the package. Furthermore, we specify some (optional) meta -information. The output of the function is a derivation. - -An expression for `toolz` can be found in the Nixpkgs repository. As explained -in the introduction of this Python section, a derivation of `toolz` is available -for each interpreter version, e.g. `python35.pkgs.toolz` refers to the `toolz` -derivation corresponding to the CPython 3.5 interpreter. -The above example works when you're directly working on -`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, -you will want to test a Nix expression outside of the Nixpkgs tree. - -The following expression creates a derivation for the `toolz` package, -and adds it along with a `numpy` package to a Python environment. - -```nix -with import {}; - -( let - my_toolz = python35.pkgs.buildPythonPackage rec { - pname = "toolz"; - version = "0.7.4"; - name = "${pname}-${version}"; - - src = python35.pkgs.fetchPypi { - inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; - }; - - doCheck = false; - - meta = { - homepage = "http://github.com/pytoolz/toolz/"; - description = "List processing tools and functional utilities"; - }; - }; - - in python35.withPackages (ps: [ps.numpy my_toolz]) -).env -``` -Executing `nix-shell` will result in an environment in which you can use -Python 3.5 and the `toolz` package. As you can see we had to explicitly mention -for which Python version we want to build a package. - -So, what did we do here? Well, we took the Nix expression that we used earlier -to build a Python environment, and said that we wanted to include our own -version of `toolz`, named `my_toolz`. To introduce our own package in the scope -of `withPackages` we used a `let` expression. You can see that we used -`ps.numpy` to select numpy from the nixpkgs package set (`ps`). We did not take -`toolz` from the Nixpkgs package set this time, but instead took our own version -that we introduced with the `let` expression. - -#### Handling dependencies - -Our example, `toolz`, does not have any dependencies on other Python -packages or system libraries. According to the manual, `buildPythonPackage` -uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is -exclusively a build-time dependency, then the dependency should be included as a -`buildInput`, but if it is (also) a runtime dependency, then it should be added -to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies. - -The following example shows which arguments are given to `buildPythonPackage` in -order to build [`datashape`](https://github.com/blaze/datashape). - -```nix -{ # ... - - datashape = buildPythonPackage rec { - name = "datashape-${version}"; - version = "0.4.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/D/DataShape/${name}.tar.gz"; - sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; - - meta = { - homepage = https://github.com/ContinuumIO/datashape; - description = "A data description language"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; - }; -} -``` - -We can see several runtime dependencies, `numpy`, `multipledispatch`, and -`dateutil`. Furthermore, we have one `buildInput`, i.e. `pytest`. `pytest` is a -test runner and is only used during the `checkPhase` and is therefore not added -to `propagatedBuildInputs`. - -In the previous case we had only dependencies on other Python packages to consider. -Occasionally you have also system libraries to consider. E.g., `lxml` provides -Python bindings to `libxml2` and `libxslt`. These libraries are only required -when building the bindings and are therefore added as `buildInputs`. - -```nix -{ # ... - - lxml = buildPythonPackage rec { - name = "lxml-3.4.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/lxml/${name}.tar.gz"; - sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; - }; - - buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; - - meta = { - description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = http://lxml.de; - license = licenses.bsd3; - maintainers = with maintainers; [ sjourdois ]; - }; - }; -} -``` - -In this example `lxml` and Nix are able to work out exactly where the relevant -files of the dependencies are. This is not always the case. - -The example below shows bindings to The Fastest Fourier Transform in the West, commonly known as -FFTW. On Nix we have separate packages of FFTW for the different types of floats -(`"single"`, `"double"`, `"long-double"`). The bindings need all three types, -and therefore we add all three as `buildInputs`. The bindings don't expect to -find each of them in a different folder, and therefore we have to set `LDFLAGS` -and `CFLAGS`. - -```nix -{ # ... - - pyfftw = buildPythonPackage rec { - name = "pyfftw-${version}"; - version = "0.9.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyFFTW/pyFFTW-${version}.tar.gz"; - sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; - }; - - buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; - - propagatedBuildInputs = with self; [ numpy scipy ]; - - # Tests cannot import pyfftw. pyfftw works fine though. - doCheck = false; - - preConfigure = '' - export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" - export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" - ''; - - meta = { - description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; - homepage = http://hgomersall.github.com/pyFFTW/; - license = with licenses; [ bsd2 bsd3 ]; - maintainer = with maintainers; [ fridh ]; - }; - }; -} -``` -Note also the line `doCheck = false;`, we explicitly disabled running the test-suite. - - -#### Develop local package - -As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) (`python setup.py develop`); -instead of installing the package this command creates a special link to the project code. -That way, you can run updated code without having to reinstall after each and every change you make. -Development mode is also available. Let's see how you can use it. - -In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using -`src = ./path/to/source/tree;` - -If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src` -is a local source, and if the local source has a `setup.py`, then development -mode is activated. - -In the following example we create a simple environment that -has a Python 3.5 version of our package in it, as well as its dependencies and -other packages we like to have in the environment, all specified with `propagatedBuildInputs`. -Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`. - -```nix -with import {}; -with pkgs.python35Packages; - -buildPythonPackage rec { - name = "mypackage"; - src = ./path/to/package/source; - propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ]; -} -``` - -It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode. - - -### Organising your packages - -So far we discussed how you can use Python on Nix, and how you can develop with -it. We've looked at how you write expressions to package Python packages, and we -looked at how you can create environments in which specified packages are -available. - -At some point you'll likely have multiple packages which you would -like to be able to use in different projects. In order to minimise unnecessary -duplication we now look at how you can maintain yourself a repository with your -own packages. The important functions here are `import` and `callPackage`. - -### Including a derivation using `callPackage` - -Earlier we created a Python environment using `withPackages`, and included the -`toolz` package via a `let` expression. -Let's split the package definition from the environment definition. - -We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` - -```nix -{ pkgs, buildPythonPackage }: - -buildPythonPackage rec { - name = "toolz-${version}"; - version = "0.7.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; - }; - - meta = { - homepage = "http://github.com/pytoolz/toolz/"; - description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; -} -``` - -It takes two arguments, `pkgs` and `buildPythonPackage`. -We now call this function using `callPackage` in the definition of our environment - -```nix -with import {}; - -( let - toolz = pkgs.callPackage /path/to/toolz/release.nix { - pkgs = pkgs; - buildPythonPackage = pkgs.python35Packages.buildPythonPackage; - }; - in pkgs.python35.withPackages (ps: [ ps.numpy toolz ]) -).env -``` - -Important to remember is that the Python version for which the package is made -depends on the `python` derivation that is passed to `buildPythonPackage`. Nix -tries to automatically pass arguments when possible, which is why generally you -don't explicitly define which `python` derivation should be used. In the above -example we use `buildPythonPackage` that is part of the set `python35Packages`, -and in this case the `python35` interpreter is automatically used. - - - -## Reference - -### Interpreters - -Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as -respectively `python27`, `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 -`pkgs/development/interpreters/python`. - -All packages depending on any Python interpreter get appended -`out/{python.sitePackages}` to `$PYTHONPATH` if such directory -exists. - -#### Missing `tkinter` module standard library - -To reduce closure size the `Tkinter`/`tkinter` is available as a separate package, `pythonPackages.tkinter`. - -#### Attributes on interpreters packages - -Each interpreter has the following attributes: - -- `libPrefix`. Name of the folder in `${python}/lib/` for corresponding interpreter. -- `interpreter`. Alias for `${python}/bin/${executable}`. -- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. -- `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation. -- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. -- `executable`. Name of the interpreter executable, e.g. `python3.4`. -- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. - -### Building packages and applications - -Python libraries and applications that use `setuptools` or -`distutils` are typically build with respectively the `buildPythonPackage` and -`buildPythonApplication` functions. These two functions also support installing a `wheel`. - -All Python packages reside in `pkgs/top-level/python-packages.nix` and all -applications elsewhere. In case a package is used as both a library and an application, -then the package should be in `pkgs/top-level/python-packages.nix` since only those packages are made -available for all interpreter versions. The preferred location for library expressions is in -`pkgs/development/python-modules`. It is important that these packages are -called from `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee -the right version of the package is built. - -Based on the packages defined in `pkgs/top-level/python-packages.nix` an -attribute set is created for each available Python interpreter. The available -sets are - -* `pkgs.python27Packages` -* `pkgs.python34Packages` -* `pkgs.python35Packages` -* `pkgs.python36Packages` -* `pkgs.pypyPackages` - -and the aliases - -* `pkgs.python2Packages` pointing to `pkgs.python27Packages` -* `pkgs.python3Packages` pointing to `pkgs.python36Packages` -* `pkgs.pythonPackages` pointing to `pkgs.python2Packages` - -#### `buildPythonPackage` function - -The `buildPythonPackage` function is implemented in -`pkgs/development/interpreters/python/build-python-package.nix` - -The following is an example: -```nix -{ # ... - - twisted = buildPythonPackage { - name = "twisted-8.1.0"; - - src = pkgs.fetchurl { - url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; - sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; - }; - - propagatedBuildInputs = [ self.ZopeInterface ]; - - meta = { - homepage = http://twistedmatrix.com/; - description = "Twisted, an event-driven networking engine written in Python"; - license = stdenv.lib.licenses.mit; - }; - }; -} -``` - -The `buildPythonPackage` mainly does four things: - -* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to - build a wheel binary zipfile. -* In the `installPhase`, it installs the wheel file using `pip install *.whl`. -* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to - wrap all programs in the `$out/bin/*` directory to include `$PATH` - environment variable and add dependent libraries to script's `sys.path`. -* In the `installCheck` phase, `${python.interpreter} setup.py test` is ran. - -As in Perl, dependencies on other Python packages can be specified in the -`buildInputs` and `propagatedBuildInputs` attributes. If something is -exclusively a build-time dependency, use `buildInputs`; if it’s (also) a runtime -dependency, use `propagatedBuildInputs`. - -By default tests are run because `doCheck = true`. Test dependencies, like -e.g. the test runner, should be added to `buildInputs`. - -By default `meta.platforms` is set to the same value -as the interpreter unless overridden otherwise. - -##### `buildPythonPackage` parameters - -All parameters from `mkDerivation` function are still supported. - -* `namePrefix`: Prepended text to `${name}` parameter. Defaults to `"python3.3-"` for Python 3.3, etc. Set it to `""` if you're packaging an application or a command line tool. -* `disabled`: If `true`, package is not build for particular python interpreter version. Grep around `pkgs/top-level/python-packages.nix` for examples. -* `setupPyBuildFlags`: List of flags passed to `setup.py build_ext` command. -* `pythonPath`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). -* `preShellHook`: Hook to execute commands before `shellHook`. -* `postShellHook`: Hook to execute commands after `shellHook`. -* `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. -* `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. -* `format`: Format of the source. Valid options are `setuptools` (default), `flit`, `wheel`, and `other`. `setuptools` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. In case you need to provide your own `buildPhase` and `installPhase` you can use `other`. -* `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. -* `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. - -##### Overriding Python packages - -The `buildPythonPackage` function has a `overridePythonAttrs` method that -can be used to override the package. In the following example we create an -environment where we have the `blaze` package using an older version of `pandas`. -We override first the Python interpreter and pass -`packageOverrides` which contains the overrides for packages in the package set. - -```nix -with import {}; - -(let - python = let - packageOverrides = self: super: { - pandas = super.pandas.overridePythonAttrs(old: rec { - version = "0.19.1"; - name = "pandas-${version}"; - src = super.fetchPypi { - pname = "pandas"; - inherit version; - sha256 = "08blshqj9zj1wyjhhw3kl2vas75vhhicvv72flvf1z3jvapgw295"; - }; - }); - }; - in pkgs.python3.override {inherit packageOverrides;}; - -in python.withPackages(ps: [ps.blaze])).env -``` - -#### `buildPythonApplication` function - -The `buildPythonApplication` function is practically the same as `buildPythonPackage`. -The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter. -Because with an application we're not interested in multiple version the prefix is dropped. - -#### python.buildEnv function - -Python environments can be created using the low-level `pkgs.buildEnv` function. -This example shows how to create an environment that has the Pyramid Web Framework. -Saving the following as `default.nix` -```nix -with import {}; - -python.buildEnv.override { - extraLibs = [ pkgs.pythonPackages.pyramid ]; - ignoreCollisions = true; -} -``` - -and running `nix-build` will create -``` -/nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env -``` - -with wrapped binaries in `bin/`. - -You can also use the `env` attribute to create local environments with needed -packages installed. This is somewhat comparable to `virtualenv`. For example, -running `nix-shell` with the following `shell.nix` -```nix -with import {}; - -(python3.buildEnv.override { - extraLibs = with python3Packages; [ numpy requests ]; -}).env -``` - -will drop you into a shell where Python will have the -specified packages in its path. - - -##### `python.buildEnv` arguments - -* `extraLibs`: List of packages installed inside the environment. -* `postBuild`: Shell command executed after the build of environment. -* `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`). - -#### python.withPackages function - -The `python.withPackages` function provides a simpler interface to the `python.buildEnv` functionality. -It takes a function as an argument that is passed the set of python packages and returns the list -of the packages to be included in the environment. Using the `withPackages` function, the previous -example for the Pyramid Web Framework environment can be written like this: -```nix -with import {}; - -python.withPackages (ps: [ps.pyramid]) -``` - -`withPackages` passes the correct package set for the specific interpreter version as an -argument to the function. In the above example, `ps` equals `pythonPackages`. -But you can also easily switch to using python3: -```nix -with import {}; - -python3.withPackages (ps: [ps.pyramid]) -``` - -Now, `ps` is set to `python3Packages`, matching the version of the interpreter. - -As `python.withPackages` simply uses `python.buildEnv` under the hood, it also supports the `env` -attribute. The `shell.nix` file from the previous section can thus be also written like this: -```nix -with import {}; - -(python36.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 -`buildPythonPackage` has additional logic inside `shellPhase` to run `pip -install -e . --prefix $TMPDIR/`for the package. - -Warning: `shellPhase` is executed only if `setup.py` exists. - -Given a `default.nix`: -```nix -with import {}; - -buildPythonPackage { name = "myproject"; - -buildInputs = with pkgs.pythonPackages; [ pyramid ]; - -src = ./.; } -``` - -Running `nix-shell` with no arguments should give you -the environment in which the package would be built with -`nix-build`. - -Shortcut to setup environments with C headers/libraries and python packages: -```shell -nix-shell -p pythonPackages.pyramid zlib libjpeg git -``` - -Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked. - -### Tools - -Packages inside nixpkgs are written by hand. However many tools exist in -community to help save time. No tool is preferred at the moment. - -- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov -- [pypi2nix](https://github.com/garbas/pypi2nix) by Rok Garbas -- [pypi2nix](https://github.com/offlinehacker/pypi2nix) by Jaka Hudoklin - -### Deterministic builds - -Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. -Minor modifications had to be made to the interpreters in order to generate -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=1` and -[PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED). -Both are also exported in `nix-shell`. - - -### Automatic tests - -It is recommended to test packages as part of the build process. -Source distributions (`sdist`) often include test files, but not always. - -By default the command `python setup.py test` is run as part of the -`checkPhase`, but often it is necessary to pass a custom `checkPhase`. An -example of such a situation is when `py.test` is used. - -#### Common issues - -- Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`. - Most python modules follows the standard test protocol where the pytest runner can be used instead. - `py.test` supports a `-k` parameter to ignore test methods or classes: - - ```nix - buildPythonPackage { - # ... - # assumes the tests are located in tests - checkInputs = [ pytest ]; - checkPhase = '' - py.test -k 'not function_name and not other_function' tests - ''; - } - ``` -- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`. -- Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)` - -## FAQ - -### How to solve circular dependencies? - -Consider the packages `A` and `B` that depend on each other. When packaging `B`, -a solution is to override package `A` not to depend on `B` as an input. The same -should also be done when packaging `A`. - -### How to override a Python package? - -We can override the interpreter and pass `packageOverrides`. -In the following example we rename the `pandas` package and build it. -```nix -with import {}; - -(let - python = let - packageOverrides = self: super: { - pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); - }; - in pkgs.python35.override {inherit packageOverrides;}; - -in python.withPackages(ps: [ps.pandas])).env -``` -Using `nix-build` on this expression will build an environment that contains the -package `pandas` but with the new name `foo`. - -All packages in the package set will use the renamed package. -A typical use case is to switch to another version of a certain package. -For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`. -In the following example we use a different version of `scipy` and create an environment that uses it. -All packages in the Python package set will now use the updated `scipy` version. - -```nix -with import {}; - -( let - packageOverrides = self: super: { - scipy = super.scipy_0_17; - }; - in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) -).env -``` -The requested package `blaze` depends on `pandas` which itself depends on `scipy`. - -If you want the whole of Nixpkgs to use your modifications, then you can use `overlays` -as explained in this manual. In the following example we build a `inkscape` using a different version of `numpy`. -```nix -let - pkgs = import {}; - newpkgs = import pkgs.path { overlays = [ (pkgsself: pkgssuper: { - python27 = let - packageOverrides = self: super: { - numpy = super.numpy_1_10; - }; - in pkgssuper.python27.override {inherit packageOverrides;}; - } ) ]; }; -in newpkgs.inkscape -``` - -### `python setup.py bdist_wheel` cannot create .whl - -Executing `python setup.py bdist_wheel` in a `nix-shell `fails with -``` -ValueError: ZIP does not support timestamps before 1980 -``` -This is because files are included that depend on items in the Nix store which have a timestamp of, that is, it corresponds to January the 1st, 1970 at 00:00:00. And as the error informs you, ZIP does not support that. -The command `bdist_wheel` takes into account `SOURCE_DATE_EPOCH`, and `nix-shell` sets this to 1. By setting it to a value corresponding to 1980 or later, or by unsetting it, it is possible to build wheels. - -Use 1980 as timestamp: -```shell -nix-shell --run "SOURCE_DATE_EPOCH=315532800 python3 setup.py bdist_wheel" -``` -or the current time: -```shell -nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel" -``` -or unset: -```shell -nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel" -``` - -### `install_data` / `data_files` problems - -If you get the following error: -``` -could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': -Permission denied -``` -This is a [known bug](https://github.com/pypa/setuptools/issues/130) in `setuptools`. -Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. -As workaround install it as an extra `preInstall` step: -```shell -${python.interpreter} setup.py install_data --install-dir=$out --root=$out -sed -i '/ = data\_files/d' setup.py -``` - -### Rationale of non-existent global site-packages - -On most operating systems a global `site-packages` is maintained. This however -becomes problematic if you want to run multiple Python versions or have multiple -versions of certain libraries for your projects. Generally, you would solve such -issues by creating virtual environments using `virtualenv`. - -On Nix each package has an isolated dependency tree which, in the case of -Python, guarantees the right versions of the interpreter and libraries or -packages are available. There is therefore no need to maintain a global `site-packages`. - -If you want to create a Python environment for development, then the recommended -method is to use `nix-shell`, either with or without the `python.buildEnv` -function. - -### How to consume python modules using pip in a virtualenv like I am used to on other Operating Systems ? - -This is an example of a `default.nix` for a `nix-shell`, which allows to consume a `virtualenv` environment, -and install python modules through `pip` the traditional way. - -Create this `default.nix` file, together with a `requirements.txt` and simply execute `nix-shell`. - -```nix -with import {}; -with pkgs.python27Packages; - -stdenv.mkDerivation { - name = "impurePythonEnv"; - buildInputs = [ - # these packages are required for virtualenv and pip to work: - # - python27Full - python27Packages.virtualenv - python27Packages.pip - # the following packages are related to the dependencies of your python - # project. - # In this particular example the python modules listed in the - # requirements.tx require the following packages to be installed locally - # in order to compile any binary extensions they may require. - # - taglib - openssl - git - libxml2 - libxslt - libzip - stdenv - zlib ]; - src = null; - shellHook = '' - # set SOURCE_DATE_EPOCH so that we can use python wheels - SOURCE_DATE_EPOCH=$(date +%s) - virtualenv --no-setuptools venv - export PATH=$PWD/venv/bin:$PATH - pip install -r requirements.txt - ''; -} -``` - -Note that the `pip install` is an imperative action. So every time `nix-shell` -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 - -### Contributing guidelines - -Following rules are desired to be respected: - -* Python libraries are called from `python-packages.nix` and packaged with `buildPythonPackage`. The expression of a library should be in `pkgs/development/python-modules//default.nix`. Libraries in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts. -* Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`. -* Make sure libraries build for all Python interpreters. -* By default we enable tests. Make sure the tests are found and, in the case of libraries, are passing for all interpreters. If certain tests fail they can be disabled individually. Try to avoid disabling the tests altogether. In any case, when you disable tests, leave a comment explaining why. -* Commit names of Python libraries should reflect that they are Python libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`. - diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md new file mode 100644 index 0000000000000000000000000000000000000000..23ceb82eb31ef0cb3a466c74883f9c054cf7a0bf --- /dev/null +++ b/doc/languages-frameworks/python.section.md @@ -0,0 +1,1026 @@ +# Python + +## User Guide + +### Using Python + +#### Overview + +Several versions of the Python interpreter are available on Nix, as well as a +high amount of packages. The attribute `python` refers to the default +interpreter, which is currently CPython 2.7. It is also possible to refer to +specific versions, e.g. `python35` refers to CPython 3.5, and `pypy` refers to +the default PyPy interpreter. + +Python is used a lot, and in different ways. This affects also how it is +packaged. In the case of Python on Nix, an important distinction is made between +whether the package is considered primarily an application, or whether it should +be used as a library, i.e., of primary interest are the modules in +`site-packages` that should be importable. + +In the Nixpkgs tree Python applications can be found throughout, depending on +what they do, and are called from the main package set. Python libraries, +however, are in separate sets, with one set per interpreter version. + +The interpreters have several common attributes. One of these attributes is +`pkgs`, which is a package set of Python libraries for this specific +interpreter. E.g., the `toolz` package corresponding to the default interpreter +is `python.pkgs.toolz`, and the CPython 3.5 version is `python35.pkgs.toolz`. +The main package set contains aliases to these package sets, e.g. +`pythonPackages` refers to `python.pkgs` and `python35Packages` to +`python35.pkgs`. + +#### Installing Python and packages + +The Nix and NixOS manuals explain how packages are generally installed. In the +case of Python and Nix, it is important to make a distinction between whether the +package is considered an application or a library. + +Applications on Nix are typically installed into your user +profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the +package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`. +Dependencies such as libraries are automatically installed and should not be +installed explicitly. + +The same goes for Python applications and libraries. Python applications can be +installed in your profile. But Python libraries you would like to use for +development cannot be installed, at least not individually, because they won't +be able to find each other resulting in import errors. Instead, it is possible +to create an environment with `python.buildEnv` or `python.withPackages` where +the interpreter and other executables are able to find each other and all of the +modules. + +In the following examples we create an environment with Python 3.5, `numpy` and +`toolz`. As you may imagine, there is one limitation here, and that's that +you can install only one environment at a time. You will notice the complaints +about collisions when you try to install a second environment. + +##### Environment defined in separate `.nix` file + +Create a file, e.g. `build.nix`, with the following expression +```nix +with import {}; + +python35.withPackages (ps: with ps; [ numpy toolz ]) +``` +and install it in your profile with +```shell +nix-env -if build.nix +``` +Now you can use the Python interpreter, as well as the extra packages (`numpy`, +`toolz`) that you added to the environment. + +##### 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, e.g. +using `config.nix`, +```nix +{ # ... + + packageOverrides = pkgs: with pkgs; { + myEnv = python35.withPackages (ps: with ps; [ numpy toolz ]); + }; +} +``` +and install it in your profile with +```shell +nix-env -iA nixpkgs.myEnv +``` +The environment is is installed by referring to the attribute, and considering +the `nixpkgs` channel was used. + +##### Environment defined in `/etc/nixos/configuration.nix` + +For the sake of completeness, here's another example how to install the environment system-wide. + +```nix +{ # ... + + environment.systemPackages = with pkgs; [ + (python35.withPackages(ps: with ps; [ numpy toolz ])) + ]; +} +``` + +#### Temporary Python environment with `nix-shell` + +The examples in the previous section showed how to install a Python environment +into a profile. For development you may need to use multiple environments. +`nix-shell` gives the possibility to temporarily load another environment, akin +to `virtualenv`. + +There are two methods for loading a shell with Python packages. The first and recommended method +is to create an environment with `python.buildEnv` or `python.withPackages` and load that. E.g. +```sh +$ nix-shell -p 'python35.withPackages(ps: with ps; [ numpy toolz ])' +``` +opens a shell from which you can launch the interpreter +```sh +[nix-shell:~] python3 +``` +The other method, which is not recommended, does not create an environment and requires you to list the packages directly, + +```sh +$ nix-shell -p python35.pkgs.numpy python35.pkgs.toolz +``` +Again, it is possible to launch the interpreter from the shell. +The Python interpreter has the attribute `pkgs` which contains all Python libraries for that specific interpreter. + +##### Load environment from `.nix` expression +As explained in the Nix manual, `nix-shell` can also load an +expression from a `.nix` file. Say we want to have Python 3.5, `numpy` +and `toolz`, like before, in an environment. Consider a `shell.nix` file +with +```nix +with import {}; + +(python35.withPackages (ps: [ps.numpy ps.toolz])).env +``` +Executing `nix-shell` gives you again a Nix shell from which you can run Python. + +What's happening here? + +1. We begin with importing the Nix Packages collections. `import ` imports the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set. +2. Then we create a Python 3.5 environment with the `withPackages` function. +3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set. + +##### Execute command with `--run` +A convenient option with `nix-shell` is the `--run` +option, with which you can execute a command in the `nix-shell`. We can +e.g. directly open a Python shell +```sh +$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3" +``` +or run a script +```sh +$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py" +``` + +##### `nix-shell` as shebang +In fact, for the second use case, there is a more convenient method. You can +add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script +specifying which dependencies `nix-shell` needs. With the following shebang, you +can just execute `./myscript.py`, and it will make available all dependencies and +run the script in the `python3` shell. + +```py +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])" + +import numpy + +print(numpy.__version__) +``` + +### Developing with Python + +Now that you know how to get a working Python environment with Nix, it is time +to go forward and start actually developing with Python. We will first have a +look at how Python packages are packaged on Nix. Then, we will look at how you +can use development mode with your code. + +#### Packaging a library + +With Nix all packages are built by functions. The main function in Nix for +building Python libraries is `buildPythonPackage`. Let's see how we can build the +`toolz` package. + +```nix +{ # ... + + toolz = buildPythonPackage rec { + pname = "toolz"; + version = "0.7.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + }; + + doCheck = false; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; + }; + }; +} +``` + +What happens here? The function `buildPythonPackage` is called and as argument +it accepts a set. In this case the set is a recursive set, `rec`. One of the +arguments is the name of the package, which consists of a basename (generally +following the name on PyPi) and a version. Another argument, `src` specifies the +source, which in this case is fetched from PyPI using the helper function +`fetchPypi`. The argument `doCheck` is used to set whether tests should be run +when building the package. Furthermore, we specify some (optional) meta +information. The output of the function is a derivation. + +An expression for `toolz` can be found in the Nixpkgs repository. As explained +in the introduction of this Python section, a derivation of `toolz` is available +for each interpreter version, e.g. `python35.pkgs.toolz` refers to the `toolz` +derivation corresponding to the CPython 3.5 interpreter. +The above example works when you're directly working on +`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, +you will want to test a Nix expression outside of the Nixpkgs tree. + +The following expression creates a derivation for the `toolz` package, +and adds it along with a `numpy` package to a Python environment. + +```nix +with import {}; + +( let + my_toolz = python35.pkgs.buildPythonPackage rec { + pname = "toolz"; + version = "0.7.4"; + + src = python35.pkgs.fetchPypi { + inherit pname version; + sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + }; + + doCheck = false; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + }; + }; + + in python35.withPackages (ps: [ps.numpy my_toolz]) +).env +``` +Executing `nix-shell` will result in an environment in which you can use +Python 3.5 and the `toolz` package. As you can see we had to explicitly mention +for which Python version we want to build a package. + +So, what did we do here? Well, we took the Nix expression that we used earlier +to build a Python environment, and said that we wanted to include our own +version of `toolz`, named `my_toolz`. To introduce our own package in the scope +of `withPackages` we used a `let` expression. You can see that we used +`ps.numpy` to select numpy from the nixpkgs package set (`ps`). We did not take +`toolz` from the Nixpkgs package set this time, but instead took our own version +that we introduced with the `let` expression. + +#### Handling dependencies + +Our example, `toolz`, does not have any dependencies on other Python +packages or system libraries. According to the manual, `buildPythonPackage` +uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is +exclusively a build-time dependency, then the dependency should be included as a +`buildInput`, but if it is (also) a runtime dependency, then it should be added +to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies. + +The following example shows which arguments are given to `buildPythonPackage` in +order to build [`datashape`](https://github.com/blaze/datashape). + +```nix +{ # ... + + datashape = buildPythonPackage rec { + pname = "datashape"; + version = "0.4.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; + }; + + checkInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; + + meta = { + homepage = https://github.com/ContinuumIO/datashape; + description = "A data description language"; + license = licenses.bsd2; + maintainers = with maintainers; [ fridh ]; + }; + }; +} +``` + +We can see several runtime dependencies, `numpy`, `multipledispatch`, and +`dateutil`. Furthermore, we have one `buildInput`, i.e. `pytest`. `pytest` is a +test runner and is only used during the `checkPhase` and is therefore not added +to `propagatedBuildInputs`. + +In the previous case we had only dependencies on other Python packages to consider. +Occasionally you have also system libraries to consider. E.g., `lxml` provides +Python bindings to `libxml2` and `libxslt`. These libraries are only required +when building the bindings and are therefore added as `buildInputs`. + +```nix +{ # ... + + lxml = buildPythonPackage rec { + pname = "lxml"; + version = "3.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; + }; + + buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; + + meta = { + description = "Pythonic binding for the libxml2 and libxslt libraries"; + homepage = http://lxml.de; + license = licenses.bsd3; + maintainers = with maintainers; [ sjourdois ]; + }; + }; +} +``` + +In this example `lxml` and Nix are able to work out exactly where the relevant +files of the dependencies are. This is not always the case. + +The example below shows bindings to The Fastest Fourier Transform in the West, commonly known as +FFTW. On Nix we have separate packages of FFTW for the different types of floats +(`"single"`, `"double"`, `"long-double"`). The bindings need all three types, +and therefore we add all three as `buildInputs`. The bindings don't expect to +find each of them in a different folder, and therefore we have to set `LDFLAGS` +and `CFLAGS`. + +```nix +{ # ... + + pyfftw = buildPythonPackage rec { + pname = "pyFFTW"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; + }; + + buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; + + propagatedBuildInputs = with self; [ numpy scipy ]; + + # Tests cannot import pyfftw. pyfftw works fine though. + doCheck = false; + + preConfigure = '' + export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" + export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" + ''; + + meta = { + description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; + homepage = http://hgomersall.github.com/pyFFTW/; + license = with licenses; [ bsd2 bsd3 ]; + maintainers = with maintainers; [ fridh ]; + }; + }; +} +``` +Note also the line `doCheck = false;`, we explicitly disabled running the test-suite. + + +#### Develop local package + +As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) (`python setup.py develop`); +instead of installing the package this command creates a special link to the project code. +That way, you can run updated code without having to reinstall after each and every change you make. +Development mode is also available. Let's see how you can use it. + +In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using +`src = ./path/to/source/tree;` + +If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src` +is a local source, and if the local source has a `setup.py`, then development +mode is activated. + +In the following example we create a simple environment that +has a Python 3.5 version of our package in it, as well as its dependencies and +other packages we like to have in the environment, all specified with `propagatedBuildInputs`. +Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`. + +```nix +with import {}; +with pkgs.python35Packages; + +buildPythonPackage rec { + name = "mypackage"; + src = ./path/to/package/source; + propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ]; +} +``` + +It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode. + + +### Organising your packages + +So far we discussed how you can use Python on Nix, and how you can develop with +it. We've looked at how you write expressions to package Python packages, and we +looked at how you can create environments in which specified packages are +available. + +At some point you'll likely have multiple packages which you would +like to be able to use in different projects. In order to minimise unnecessary +duplication we now look at how you can maintain yourself a repository with your +own packages. The important functions here are `import` and `callPackage`. + +### Including a derivation using `callPackage` + +Earlier we created a Python environment using `withPackages`, and included the +`toolz` package via a `let` expression. +Let's split the package definition from the environment definition. + +We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` + +```nix +{ pkgs, buildPythonPackage }: + +buildPythonPackage rec { + pname = "toolz"; + version = "0.7.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + }; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; + }; +} +``` + +It takes two arguments, `pkgs` and `buildPythonPackage`. +We now call this function using `callPackage` in the definition of our environment + +```nix +with import {}; + +( let + toolz = pkgs.callPackage /path/to/toolz/release.nix { + pkgs = pkgs; + buildPythonPackage = pkgs.python35Packages.buildPythonPackage; + }; + in pkgs.python35.withPackages (ps: [ ps.numpy toolz ]) +).env +``` + +Important to remember is that the Python version for which the package is made +depends on the `python` derivation that is passed to `buildPythonPackage`. Nix +tries to automatically pass arguments when possible, which is why generally you +don't explicitly define which `python` derivation should be used. In the above +example we use `buildPythonPackage` that is part of the set `python35Packages`, +and in this case the `python35` interpreter is automatically used. + + + +## Reference + +### Interpreters + +Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as +respectively `python27`, `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 +`pkgs/development/interpreters/python`. + +All packages depending on any Python interpreter get appended +`out/{python.sitePackages}` to `$PYTHONPATH` if such directory +exists. + +#### Missing `tkinter` module standard library + +To reduce closure size the `Tkinter`/`tkinter` is available as a separate package, `pythonPackages.tkinter`. + +#### Attributes on interpreters packages + +Each interpreter has the following attributes: + +- `libPrefix`. Name of the folder in `${python}/lib/` for corresponding interpreter. +- `interpreter`. Alias for `${python}/bin/${executable}`. +- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. +- `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation. +- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. +- `executable`. Name of the interpreter executable, e.g. `python3.4`. +- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. + +### Building packages and applications + +Python libraries and applications that use `setuptools` or +`distutils` are typically build with respectively the `buildPythonPackage` and +`buildPythonApplication` functions. These two functions also support installing a `wheel`. + +All Python packages reside in `pkgs/top-level/python-packages.nix` and all +applications elsewhere. In case a package is used as both a library and an application, +then the package should be in `pkgs/top-level/python-packages.nix` since only those packages are made +available for all interpreter versions. The preferred location for library expressions is in +`pkgs/development/python-modules`. It is important that these packages are +called from `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee +the right version of the package is built. + +Based on the packages defined in `pkgs/top-level/python-packages.nix` an +attribute set is created for each available Python interpreter. The available +sets are + +* `pkgs.python27Packages` +* `pkgs.python34Packages` +* `pkgs.python35Packages` +* `pkgs.python36Packages` +* `pkgs.pypyPackages` + +and the aliases + +* `pkgs.python2Packages` pointing to `pkgs.python27Packages` +* `pkgs.python3Packages` pointing to `pkgs.python36Packages` +* `pkgs.pythonPackages` pointing to `pkgs.python2Packages` + +#### `buildPythonPackage` function + +The `buildPythonPackage` function is implemented in +`pkgs/development/interpreters/python/build-python-package.nix` + +The following is an example: +```nix + +buildPythonPackage rec { + version = "3.3.1"; + pname = "pytest"; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93"; + }; + + checkInputs = [ hypothesis ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs py setuptools six pluggy ]; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + description = "Framework for writing tests"; + }; +} + +``` + +The `buildPythonPackage` mainly does four things: + +* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to + build a wheel binary zipfile. +* In the `installPhase`, it installs the wheel file using `pip install *.whl`. +* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to + wrap all programs in the `$out/bin/*` directory to include `$PATH` + environment variable and add dependent libraries to script's `sys.path`. +* In the `installCheck` phase, `${python.interpreter} setup.py test` is ran. + +As in Perl, dependencies on other Python packages can be specified in the +`buildInputs` and `propagatedBuildInputs` attributes. If something is +exclusively a build-time dependency, use `buildInputs`; if it’s (also) a runtime +dependency, use `propagatedBuildInputs`. + +By default tests are run because `doCheck = true`. Test dependencies, like +e.g. the test runner, should be added to `buildInputs`. + +By default `meta.platforms` is set to the same value +as the interpreter unless overridden otherwise. + +##### `buildPythonPackage` parameters + +All parameters from `mkDerivation` function are still supported. + +* `namePrefix`: Prepended text to `${name}` parameter. Defaults to `"python3.3-"` for Python 3.3, etc. Set it to `""` if you're packaging an application or a command line tool. +* `disabled`: If `true`, package is not build for particular python interpreter version. Grep around `pkgs/top-level/python-packages.nix` for examples. +* `setupPyBuildFlags`: List of flags passed to `setup.py build_ext` command. +* `pythonPath`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). +* `preShellHook`: Hook to execute commands before `shellHook`. +* `postShellHook`: Hook to execute commands after `shellHook`. +* `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. +* `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. +* `format`: Format of the source. Valid options are `setuptools` (default), `flit`, `wheel`, and `other`. `setuptools` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. In case you need to provide your own `buildPhase` and `installPhase` you can use `other`. +* `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. +* `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. + +##### Overriding Python packages + +The `buildPythonPackage` function has a `overridePythonAttrs` method that +can be used to override the package. In the following example we create an +environment where we have the `blaze` package using an older version of `pandas`. +We override first the Python interpreter and pass +`packageOverrides` which contains the overrides for packages in the package set. + +```nix +with import {}; + +(let + python = let + packageOverrides = self: super: { + pandas = super.pandas.overridePythonAttrs(old: rec { + version = "0.19.1"; + src = super.fetchPypi { + pname = "pandas"; + inherit version; + sha256 = "08blshqj9zj1wyjhhw3kl2vas75vhhicvv72flvf1z3jvapgw295"; + }; + }); + }; + in pkgs.python3.override {inherit packageOverrides;}; + +in python.withPackages(ps: [ps.blaze])).env +``` + +#### `buildPythonApplication` function + +The `buildPythonApplication` function is practically the same as `buildPythonPackage`. +The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter. +Because with an application we're not interested in multiple version the prefix is dropped. + +#### python.buildEnv function + +Python environments can be created using the low-level `pkgs.buildEnv` function. +This example shows how to create an environment that has the Pyramid Web Framework. +Saving the following as `default.nix` +```nix +with import {}; + +python.buildEnv.override { + extraLibs = [ pkgs.pythonPackages.pyramid ]; + ignoreCollisions = true; +} +``` + +and running `nix-build` will create +``` +/nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env +``` + +with wrapped binaries in `bin/`. + +You can also use the `env` attribute to create local environments with needed +packages installed. This is somewhat comparable to `virtualenv`. For example, +running `nix-shell` with the following `shell.nix` +```nix +with import {}; + +(python3.buildEnv.override { + extraLibs = with python3Packages; [ numpy requests ]; +}).env +``` + +will drop you into a shell where Python will have the +specified packages in its path. + + +##### `python.buildEnv` arguments + +* `extraLibs`: List of packages installed inside the environment. +* `postBuild`: Shell command executed after the build of environment. +* `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`). + +#### python.withPackages function + +The `python.withPackages` function provides a simpler interface to the `python.buildEnv` functionality. +It takes a function as an argument that is passed the set of python packages and returns the list +of the packages to be included in the environment. Using the `withPackages` function, the previous +example for the Pyramid Web Framework environment can be written like this: +```nix +with import {}; + +python.withPackages (ps: [ps.pyramid]) +``` + +`withPackages` passes the correct package set for the specific interpreter version as an +argument to the function. In the above example, `ps` equals `pythonPackages`. +But you can also easily switch to using python3: +```nix +with import {}; + +python3.withPackages (ps: [ps.pyramid]) +``` + +Now, `ps` is set to `python3Packages`, matching the version of the interpreter. + +As `python.withPackages` simply uses `python.buildEnv` under the hood, it also supports the `env` +attribute. The `shell.nix` file from the previous section can thus be also written like this: +```nix +with import {}; + +(python36.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 +`buildPythonPackage` has additional logic inside `shellPhase` to run `pip +install -e . --prefix $TMPDIR/`for the package. + +Warning: `shellPhase` is executed only if `setup.py` exists. + +Given a `default.nix`: +```nix +with import {}; + +buildPythonPackage { name = "myproject"; + +buildInputs = with pkgs.pythonPackages; [ pyramid ]; + +src = ./.; } +``` + +Running `nix-shell` with no arguments should give you +the environment in which the package would be built with +`nix-build`. + +Shortcut to setup environments with C headers/libraries and python packages: +```shell +nix-shell -p pythonPackages.pyramid zlib libjpeg git +``` + +Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked. + +### Tools + +Packages inside nixpkgs are written by hand. However many tools exist in +community to help save time. No tool is preferred at the moment. + +- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov +- [pypi2nix](https://github.com/garbas/pypi2nix) by Rok Garbas +- [pypi2nix](https://github.com/offlinehacker/pypi2nix) by Jaka Hudoklin + +### Deterministic builds + +Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. +Minor modifications had to be made to the interpreters in order to generate +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=1` and +[PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED). +Both are also exported in `nix-shell`. + + +### Automatic tests + +It is recommended to test packages as part of the build process. +Source distributions (`sdist`) often include test files, but not always. + +By default the command `python setup.py test` is run as part of the +`checkPhase`, but often it is necessary to pass a custom `checkPhase`. An +example of such a situation is when `py.test` is used. + +#### Common issues + +- Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`. + Most python modules follows the standard test protocol where the pytest runner can be used instead. + `py.test` supports a `-k` parameter to ignore test methods or classes: + + ```nix + buildPythonPackage { + # ... + # assumes the tests are located in tests + checkInputs = [ pytest ]; + checkPhase = '' + py.test -k 'not function_name and not other_function' tests + ''; + } + ``` +- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`. +- Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)` + +## FAQ + +### How to solve circular dependencies? + +Consider the packages `A` and `B` that depend on each other. When packaging `B`, +a solution is to override package `A` not to depend on `B` as an input. The same +should also be done when packaging `A`. + +### How to override a Python package? + +We can override the interpreter and pass `packageOverrides`. +In the following example we rename the `pandas` package and build it. +```nix +with import {}; + +(let + python = let + packageOverrides = self: super: { + pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); + }; + in pkgs.python35.override {inherit packageOverrides;}; + +in python.withPackages(ps: [ps.pandas])).env +``` +Using `nix-build` on this expression will build an environment that contains the +package `pandas` but with the new name `foo`. + +All packages in the package set will use the renamed package. +A typical use case is to switch to another version of a certain package. +For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`. +In the following example we use a different version of `scipy` and create an environment that uses it. +All packages in the Python package set will now use the updated `scipy` version. + +```nix +with import {}; + +( let + packageOverrides = self: super: { + scipy = super.scipy_0_17; + }; + in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) +).env +``` +The requested package `blaze` depends on `pandas` which itself depends on `scipy`. + +If you want the whole of Nixpkgs to use your modifications, then you can use `overlays` +as explained in this manual. In the following example we build a `inkscape` using a different version of `numpy`. +```nix +let + pkgs = import {}; + newpkgs = import pkgs.path { overlays = [ (pkgsself: pkgssuper: { + python27 = let + packageOverrides = self: super: { + numpy = super.numpy_1_10; + }; + in pkgssuper.python27.override {inherit packageOverrides;}; + } ) ]; }; +in newpkgs.inkscape +``` + +### `python setup.py bdist_wheel` cannot create .whl + +Executing `python setup.py bdist_wheel` in a `nix-shell `fails with +``` +ValueError: ZIP does not support timestamps before 1980 +``` + +This is because files from the Nix store (which have a timestamp of the UNIX epoch of January 1, 1970) are included in the .ZIP, but .ZIP archives follow the DOS convention of counting timestamps from 1980. + +The command `bdist_wheel` reads the `SOURCE_DATE_EPOCH` environment variable, which `nix-shell` sets to 1. Unsetting this variable or giving it a value corresponding to 1980 or later enables building wheels. + +Use 1980 as timestamp: +```shell +nix-shell --run "SOURCE_DATE_EPOCH=315532800 python3 setup.py bdist_wheel" +``` +or the current time: +```shell +nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel" +``` +or unset `SOURCE_DATE_EPOCH`: +```shell +nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel" +``` + +### `install_data` / `data_files` problems + +If you get the following error: +``` +could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': +Permission denied +``` +This is a [known bug](https://github.com/pypa/setuptools/issues/130) in `setuptools`. +Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. +As workaround install it as an extra `preInstall` step: +```shell +${python.interpreter} setup.py install_data --install-dir=$out --root=$out +sed -i '/ = data\_files/d' setup.py +``` + +### Rationale of non-existent global site-packages + +On most operating systems a global `site-packages` is maintained. This however +becomes problematic if you want to run multiple Python versions or have multiple +versions of certain libraries for your projects. Generally, you would solve such +issues by creating virtual environments using `virtualenv`. + +On Nix each package has an isolated dependency tree which, in the case of +Python, guarantees the right versions of the interpreter and libraries or +packages are available. There is therefore no need to maintain a global `site-packages`. + +If you want to create a Python environment for development, then the recommended +method is to use `nix-shell`, either with or without the `python.buildEnv` +function. + +### How to consume python modules using pip in a virtualenv like I am used to on other Operating Systems ? + +This is an example of a `default.nix` for a `nix-shell`, which allows to consume a `virtualenv` environment, +and install python modules through `pip` the traditional way. + +Create this `default.nix` file, together with a `requirements.txt` and simply execute `nix-shell`. + +```nix +with import {}; +with pkgs.python27Packages; + +stdenv.mkDerivation { + name = "impurePythonEnv"; + buildInputs = [ + # these packages are required for virtualenv and pip to work: + # + python27Full + python27Packages.virtualenv + python27Packages.pip + # the following packages are related to the dependencies of your python + # project. + # In this particular example the python modules listed in the + # requirements.tx require the following packages to be installed locally + # in order to compile any binary extensions they may require. + # + taglib + openssl + git + libxml2 + libxslt + libzip + stdenv + zlib ]; + src = null; + shellHook = '' + # set SOURCE_DATE_EPOCH so that we can use python wheels + SOURCE_DATE_EPOCH=$(date +%s) + virtualenv --no-setuptools venv + export PATH=$PWD/venv/bin:$PATH + pip install -r requirements.txt + ''; +} +``` + +Note that the `pip install` is an imperative action. So every time `nix-shell` +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 + +### Contributing guidelines + +Following rules are desired to be respected: + +* Python libraries are called from `python-packages.nix` and packaged with `buildPythonPackage`. The expression of a library should be in `pkgs/development/python-modules//default.nix`. Libraries in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts. +* Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`. +* Make sure libraries build for all Python interpreters. +* By default we enable tests. Make sure the tests are found and, in the case of libraries, are passing for all interpreters. If certain tests fail they can be disabled individually. Try to avoid disabling the tests altogether. In any case, when you disable tests, leave a comment explaining why. +* Commit names of Python libraries should reflect that they are Python libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`. + diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md new file mode 100644 index 0000000000000000000000000000000000000000..c8f02bd1478067990b03e0a2c7fd1e2f03a0ba69 --- /dev/null +++ b/doc/languages-frameworks/r.section.md @@ -0,0 +1,120 @@ +R packages +========== + +## Installation + +Define an environment for R that contains all the libraries that you'd like to +use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file: + +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + + rEnv = super.rWrapper.override { + packages = with self.rPackages; [ + devtools + ggplot2 + reshape2 + yaml + optparse + ]; + }; + }; +} +``` + +Then you can use `nix-env -f "" -iA rEnv` to install it into your user +profile. The set of available libraries can be discovered by running the +command `nix-env -f "" -qaP -A rPackages`. The first column from that +output is the name that has to be passed to rWrapper in the code snipped above. + +However, if you'd like to add a file to your project source to make the +environment available for other contributors, you can create a `default.nix` +file like so: +```nix +let + pkgs = import {}; + stdenv = pkgs.stdenv; +in with pkgs; { + myProject = stdenv.mkDerivation { + name = "myProject"; + version = "1"; + src = if pkgs.lib.inNixShell then null else nix; + + buildInputs = with rPackages; [ + R + ggplot2 + knitr + ]; + }; +} +``` +and then run `nix-shell .` to be dropped into a shell with those packages +available. + +## RStudio + +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 + { + + rstudioEnv = super.rstudioWrapper.override { + packages = with self.rPackages; [ + dplyr + ggplot2 + reshape2 + ]; + }; + }; +} +``` + +Then like above, `nix-env -f "" -iA rstudioEnv` will install +this into your user profile. + +Alternatively, you can create a self-contained `shell.nix` without the need to +modify any configuration files: + +```nix +{ pkgs ? import {} +}: + +pkgs.rstudioWrapper.override { + packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ]; +} + +``` + +Executing `nix-shell` will then drop you into an environment equivalent to the +one above. If you need additional packages just add them to the list and +re-enter the shell. + +## Updating the package set + +```bash +nix-shell generate-shell.nix + +Rscript generate-r-packages.R cran > cran-packages.nix.new +mv cran-packages.nix.new cran-packages.nix + +Rscript generate-r-packages.R bioc > bioc-packages.nix.new +mv bioc-packages.nix.new bioc-packages.nix +``` + +`generate-r-packages.R ` reads `-packages.nix`, therefor the renaming. + + +## Testing if the Nix-expression could be evaluated + +```bash +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/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md deleted file mode 100644 index 7c6955af812bcc745ed0cd1694397b165dfd09d6..0000000000000000000000000000000000000000 --- a/doc/languages-frameworks/rust.md +++ /dev/null @@ -1,88 +0,0 @@ ---- -title: Rust -author: Matthias Beyer -date: 2017-03-05 ---- - -# User's Guide to the Rust Infrastructure - -To install the rust compiler and cargo put - -``` -rust -``` - -into the `environment.systemPackages` or bring them into -scope with `nix-shell -p rust`. - -For daily builds (beta and nightly) use either rustup from -nixpkgs or use the [Rust nightlies -overlay](#using-the-rust-nightlies-overlay). - -## Packaging Rust applications - -Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: - -``` -rustPlatform.buildRustPackage rec { - name = "ripgrep-${version}"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "BurntSushi"; - repo = "ripgrep"; - rev = "${version}"; - sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj"; - }; - - cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; - - meta = with stdenv.lib; { - description = "A fast line-oriented regex search tool, similar to ag and ack"; - homepage = https://github.com/BurntSushi/ripgrep; - license = licenses.unlicense; - maintainers = [ maintainers.tailhook ]; - platforms = platforms.all; - }; -} -``` - -`buildRustPackage` requires a `cargoSha256` attribute which is computed over -all crate sources of this package. Currently it is obtained by inserting a -fake checksum into the expression and building the package once. The correct -checksum can be then take from the failed build. - -To install crates with nix there is also an experimental project called -[nixcrates](https://github.com/fractalide/nixcrates). - -## Using the Rust nightlies overlay - -Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. -This overlay can _also_ be used to install recent unstable or stable versions -of Rust, if desired. - -To use this overlay, clone -[nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla), -and create a symbolic link to the file -[rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix) -in the `~/.config/nixpkgs/overlays` directory. - - $ git clone https://github.com/mozilla/nixpkgs-mozilla.git - $ mkdir -p ~/.config/nixpkgs/overlays - $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix - -The latest version can be installed with the following command: - - $ nix-env -Ai nixos.latest.rustChannels.stable.rust - -Or using the attribute with nix-shell: - - $ nix-shell -p nixos.latest.rustChannels.stable.rust - -To install the beta or nightly channel, "stable" should be substituted by -"nightly" or "beta", or -use the function provided by this overlay to pull a version based on a -build date. - -The overlay automatically updates itself as it uses the same source as -[rustup](https://www.rustup.rs/). diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md new file mode 100644 index 0000000000000000000000000000000000000000..b77c41e9b2299f7a52dadff49785ce9ada82afae --- /dev/null +++ b/doc/languages-frameworks/rust.section.md @@ -0,0 +1,393 @@ +--- +title: Rust +author: Matthias Beyer +date: 2017-03-05 +--- + +# User's Guide to the Rust Infrastructure + +To install the rust compiler and cargo put + +``` +rustc +cargo +``` + +into the `environment.systemPackages` or bring them into +scope with `nix-shell -p rustc cargo`. + +> If you are using NixOS and you want to use rust without a nix expression you +> probably want to add the following in your `configuration.nix` to build +> crates with C dependencies. +> +> environment.systemPackages = [binutils gcc gnumake openssl pkgconfig] + +For daily builds (beta and nightly) use either rustup from +nixpkgs or use the [Rust nightlies +overlay](#using-the-rust-nightlies-overlay). + +## Compiling Rust applications with Cargo + +Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: + +``` +rustPlatform.buildRustPackage rec { + name = "ripgrep-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "BurntSushi"; + repo = "ripgrep"; + rev = "${version}"; + sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj"; + }; + + cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; + + meta = with stdenv.lib; { + description = "A fast line-oriented regex search tool, similar to ag and ack"; + homepage = https://github.com/BurntSushi/ripgrep; + license = licenses.unlicense; + maintainers = [ maintainers.tailhook ]; + platforms = platforms.all; + }; +} +``` + +`buildRustPackage` requires a `cargoSha256` attribute which is computed over +all crate sources of this package. Currently it is obtained by inserting a +fake checksum into the expression and building the package once. The correct +checksum can be then take from the failed build. + +To install crates with nix there is also an experimental project called +[nixcrates](https://github.com/fractalide/nixcrates). + +## Compiling Rust crates using Nix instead of Cargo + +### Simple operation + +When run, `cargo build` produces a file called `Cargo.lock`, +containing pinned versions of all dependencies. Nixpkgs contains a +tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used +to turn a `Cargo.lock` into a Nix expression. + +That Nix expression calls `rustc` directly (hence bypassing Cargo), +and can be used to compile a crate and all its dependencies. Here is +an example for a minimal `hello` crate: + + + $ cargo new hello + $ cd hello + $ cargo build + Compiling hello v0.1.0 (file:///tmp/hello) + Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs + $ carnix -o hello.nix --src ./. Cargo.lock --standalone + $ nix-build hello.nix -A hello_0_1_0 + +Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: + +``` +# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + # ... (content skipped) +in +rec { + hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; }; + hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hello"; + version = "0.1.0"; + authors = [ "pe@pijul.org " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; + hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ {}; + hello_0_1_0_features = f: updateFeatures f (rec { + hello_0_1_0.default = (f.hello_0_1_0.default or true); + }) [ ]; +} +``` + +In particular, note that the argument given as `--src` is copied +verbatim to the source. If we look at a more complicated +dependencies, for instance by adding a single line `libc="*"` to our +`Cargo.toml`, we first need to run `cargo build` to update the +`Cargo.lock`. Then, `carnix` needs to be run again, and produces the +following nix file: + +``` +# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + # ... (content skipped) +in +rec { + hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; }; + hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hello"; + version = "0.1.0"; + authors = [ "pe@pijul.org " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; + libc_0_2_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.36"; + authors = [ "The Rust Project Developers" ]; + sha256 = "01633h4yfqm0s302fm0dlba469bx8y6cs4nqc8bqrmjqxfxn515l"; + inherit dependencies buildDependencies features; + }; + hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ { + dependencies = mapFeatures features ([ libc_0_2_36 ]); + }; + hello_0_1_0_features = f: updateFeatures f (rec { + hello_0_1_0.default = (f.hello_0_1_0.default or true); + libc_0_2_36.default = true; + }) [ libc_0_2_36_features ]; + libc_0_2_36 = { features?(libc_0_2_36_features {}) }: libc_0_2_36_ { + features = mkFeatures (features.libc_0_2_36 or {}); + }; + libc_0_2_36_features = f: updateFeatures f (rec { + libc_0_2_36.default = (f.libc_0_2_36.default or true); + libc_0_2_36.use_std = + (f.libc_0_2_36.use_std or false) || + (f.libc_0_2_36.default or false) || + (libc_0_2_36.default or false); + }) []; +} +``` + +Here, the `libc` crate has no `src` attribute, so `buildRustCrate` +will fetch it from [crates.io](https://crates.io). A `sha256` +attribute is still needed for Nix purity. + +### Handling external dependencies + +Some crates require external libraries. For crates from +[crates.io](https://crates.io), such libraries can be specified in +`defaultCrateOverrides` package in nixpkgs itself. + +Starting from that file, one can add more overrides, to add features +or build inputs by overriding the hello crate in a seperate file. + +``` +with import {}; +((import ./hello.nix).hello {}).override { + crateOverrides = defaultCrateOverrides // { + hello = attrs: { buildInputs = [ openssl ]; }; + }; +} +``` + +Here, `crateOverrides` is expected to be a attribute set, where the +key is the crate name without version number and the value a function. +The function gets all attributes passed to `buildRustCrate` as first +argument and returns a set that contains all attribute that should be +overwritten. + +For more complicated cases, such as when parts of the crate's +derivation depend on the the crate's version, the `attrs` argument of +the override above can be read, as in the following example, which +patches the derivation: + +``` +with import {}; +((import ./hello.nix).hello {}).override { + crateOverrides = defaultCrateOverrides // { + hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { + postPatch = '' + substituteInPlace lib/zoneinfo.rs \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + }; + }; +} +``` + +Another situation is when we want to override a nested +dependency. This actually works in the exact same way, since the +`crateOverrides` parameter is forwarded to the crate's +dependencies. For instance, to override the build inputs for crate +`libc` in the example above, where `libc` is a dependency of the main +crate, we could do: + +``` +with import {}; +((import hello.nix).hello {}).override { + crateOverrides = defaultCrateOverrides // { + libc = attrs: { buildInputs = []; }; + }; +} +``` + +### Options and phases configuration + +Actually, the overrides introduced in the previous section are more +general. A number of other parameters can be overridden: + +- The version of rustc used to compile the crate: + + ``` + (hello {}).override { rust = pkgs.rust; }; + ``` + +- Whether to build in release mode or debug mode (release mode by + default): + + ``` + (hello {}).override { release = false; }; + ``` + +- Whether to print the commands sent to rustc when building + (equivalent to `--verbose` in cargo: + + ``` + (hello {}).override { verbose = false; }; + ``` + +- Extra arguments to be passed to `rustc`: + + ``` + (hello {}).override { extraRustcOpts = "-Z debuginfo=2"; }; + ``` + +- Phases, just like in any other derivation, can be specified using + the following attributes: `preUnpack`, `postUnpack`, `prePatch`, + `patches`, `postPatch`, `preConfigure` (in the case of a Rust crate, + this is run before calling the "build" script), `postConfigure` + (after the "build" script),`preBuild`, `postBuild`, `preInstall` and + `postInstall`. As an example, here is how to create a new module + before running the build script: + + ``` + (hello {}).override { + preConfigure = '' + echo "pub const PATH=\"${hi.out}\";" >> src/path.rs" + ''; + }; + ``` + +### Features + +One can also supply features switches. For example, if we want to +compile `diesel_cli` only with the `postgres` feature, and no default +features, we would write: + +``` +(callPackage ./diesel.nix {}).diesel { + default = false; + postgres = true; +} +``` + +Where `diesel.nix` is the file generated by Carnix, as explained above. + + +## Setting Up `nix-shell` +Oftentimes you want to develop code from within `nix-shell`. Unfortunately +`buildRustCrate` does not support common `nix-shell` operations directly +(see [this issue](https://github.com/NixOS/nixpkgs/issues/37945)) +so we will use `stdenv.mkDerivation` instead. + +Using the example `hello` project above, we want to do the following: +- Have access to `cargo` and `rustc` +- Have the `openssl` library available to a crate through it's _normal_ + compilation mechanism (`pkg-config`). + +A typical `shell.nix` might look like: + +``` +with import {}; + +stdenv.mkDerivation { + name = "rust-env"; + buildInputs = [ + rustc cargo + + # Example Additional Dependencies + pkgconfig openssl + ]; + + # Set Environment Variables + RUST_BACKTRACE = 1; +} +``` + +You should now be able to run the following: +``` +$ nix-shell --pure +$ cargo build +$ cargo test +``` + +### Controlling Rust Version Inside `nix-shell` +To control your rust version (i.e. use nightly) from within `shell.nix` (or +other nix expressions) you can use the following `shell.nix` + +``` +# Latest Nightly +with import {}; +let src = fetchFromGitHub { + owner = "mozilla"; + repo = "nixpkgs-mozilla"; + # commit from: 2018-03-27 + rev = "2945b0b6b2fd19e7d23bac695afd65e320efcebe"; + sha256 = "034m1dryrzh2lmjvk3c0krgip652dql46w5yfwpvh7gavd3iypyw"; + }; +in +with import "${src.out}/rust-overlay.nix" pkgs pkgs; +stdenv.mkDerivation { + name = "rust-env"; + buildInputs = [ + # Note: to use use stable, just replace `nightly` with `stable` + latest.rustChannels.nightly.rust + + # Add some extra dependencies from `pkgs` + pkgconfig openssl + ]; + + # Set Environment Variables + RUST_BACKTRACE = 1; +} +``` + +Now run: +``` +$ rustc --version +rustc 1.26.0-nightly (188e693b3 2018-03-26) +``` + +To see that you are using nightly. + + +## Using the Rust nightlies overlay + +Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. +This overlay can _also_ be used to install recent unstable or stable versions +of Rust, if desired. + +To use this overlay, clone +[nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla), +and create a symbolic link to the file +[rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix) +in the `~/.config/nixpkgs/overlays` directory. + + $ git clone https://github.com/mozilla/nixpkgs-mozilla.git + $ mkdir -p ~/.config/nixpkgs/overlays + $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix + +The latest version can be installed with the following command: + + $ nix-env -Ai nixos.latest.rustChannels.stable.rust + +Or using the attribute with nix-shell: + + $ nix-shell -p nixos.latest.rustChannels.stable.rust + +To install the beta or nightly channel, "stable" should be substituted by +"nightly" or "beta", or +use the function provided by this overlay to pull a version based on a +build date. + +The overlay automatically updates itself as it uses the same source as +[rustup](https://www.rustup.rs/). diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml index fdee1e405ecc073be8b09e6898f23a46fcdced63..4515e17ec09e3a9ae9adca8b156461f6fdfbe905 100644 --- a/doc/languages-frameworks/texlive.xml +++ b/doc/languages-frameworks/texlive.xml @@ -39,6 +39,9 @@ nix-repl> :l <nixpkgs> nix-repl> texlive.collection-<TAB> + + Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example scheme-basic, into the combination. + diff --git a/doc/languages-frameworks/vim.md b/doc/languages-frameworks/vim.section.md similarity index 100% rename from doc/languages-frameworks/vim.md rename to doc/languages-frameworks/vim.section.md diff --git a/doc/manual.xml b/doc/manual.xml index eb0a24789d44c97c93fd267490036e094a846915..385079eb5785efd3ba65dbd77b37155b815c930b 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -9,7 +9,7 @@ - + diff --git a/doc/meta.xml b/doc/meta.xml index 0f9dccfb91b58d31094cb777a3fb2bc8dc22a9dd..5dbe810810d14492c51466740a43c9d3ab22a102 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -53,7 +53,7 @@ $ nix-env -qa hello --json "x86_64-linux", "armv5tel-linux", "armv7l-linux", - "mips64el-linux", + "mips32-linux", "x86_64-darwin", "i686-cygwin", "i686-freebsd", @@ -174,7 +174,7 @@ meta-attributes maintainers of this Nix expression. If you would like to be a maintainer of a package, you may want to add yourself to nixpkgs/lib/maintainers.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix">nixpkgs/maintainers/maintainer-list.nix and write something like [ stdenv.lib.maintainers.alice stdenv.lib.maintainers.bob ]. diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index a2acc91e55a2edf7cd589f30b4deb9b4c987c2bf..2f23da8df01ee23446589ec874df12de64f10013 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -68,7 +68,7 @@ $outputDevdoc - is for developer documentation. Currently we count gtk-doc in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. + is for developer documentation. Currently we count gtk-doc and devhelp books in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. diff --git a/doc/overrides.css b/doc/overrides.css new file mode 100644 index 0000000000000000000000000000000000000000..4c7d4a31be2d09210f8dfeb67eb3ba85b98a42d3 --- /dev/null +++ b/doc/overrides.css @@ -0,0 +1,9 @@ +.docbook .xref img[src^=images\/callouts\/], +.screen img, +.programlisting img { + width: 1em; +} + +.calloutlist img { + width: 1.5em; +} diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 184bee089ae368ff58bbe008f951c9f1b07c4f64..1fccfd5d329d28e033284dd339ce8b4f31eb5bff 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -660,6 +660,32 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el passing -q to the Emacs command. + + Sometimes emacsWithPackages is not enough, as + this package set has some priorities imposed on packages (with + the lowest priority assigned to Melpa Unstable, and the highest for + packages manually defined in + pkgs/top-level/emacs-packages.nix). But you + can't control this priorities when some package is installed as a + dependency. You can override it on per-package-basis, providing all + the required dependencies manually - but it's tedious and there is + always a possibility that an unwanted dependency will sneak in + through some other package. To completely override such a package + you can use overrideScope. + + + +overrides = super: self: rec { + haskell-mode = self.melpaPackages.haskell-mode; + ... +}; +((emacsPackagesNgGen emacs).overrideScope overrides).emacsWithPackages (p: with p; [ + # here both these package will use haskell-mode of our own choice + ghc-mod + dante +]) + + @@ -667,11 +693,13 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
Weechat -Weechat can currently be configured to include your choice of plugins. -To make use of this functionality, install an expression that overrides its configuration such as +Weechat can be configured to include your choice of plugins, reducing its +closure size from the default configuration which includes all available +plugins. To make use of this functionality, install an expression that +overrides its configuration such as weechat.override {configure = {availablePlugins, ...}: { - plugins = with availablePlugins; [ python perl ]; - } + plugins = with availablePlugins; [ python perl ]; + } } @@ -685,7 +713,7 @@ the inotify.py script in weechat-scripts requires D-Bus or libnotify, and the fish.py script requires pycrypto. To use these scripts, use the python plugin's withPackages attribute: -weechat.override {configure = {availablePlugins, ...}: { +weechat.override { configure = {availablePlugins, ...}: { plugins = with availablePlugins; [ (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) ]; @@ -693,5 +721,15 @@ plugin's withPackages attribute: } + +In order to also keep all default plugins installed, it is possible to use +the following method: +weechat.override { configure = { availablePlugins, ... }: { + plugins = builtins.attrValues (availablePlugins // { + python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); + }); +}; } + +
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index 0813e0968e86e175ed9cfab3dc787455cef4778c..d6f33ccd1cdb9ee3190dfa64221ab016a68665a3 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -7,123 +7,123 @@ Reviewing contributions - The following section is a draft and reviewing policy is still being + The following section is a draft and reviewing policy is still being discussed. -The nixpkgs projects receives a fairly high number of contributions via - GitHub pull-requests. Reviewing and approving these is an important task and a +The nixpkgs projects receives a fairly high number of contributions via + GitHub pull-requests. Reviewing and approving these is an important task and a way to contribute to the project. -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 - filters that can be used to see the most - recently and the least +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 + filters that can be used to see the most + recently and the least recently updated pull-requests. -When reviewing a pull request, please always be nice and polite. - Controversial changes can lead to controversial opinions, but it is important +When reviewing a pull request, please always be nice and polite. + Controversial changes can lead to controversial opinions, but it is important to respect every community members and their work. -GitHub provides reactions, they are a simple and quick way to provide - feedback to pull-requests or any comments. The thumb-down reaction should be - used with care and if possible accompanied with some explanations so the +GitHub provides reactions, they are a simple and quick way to provide + feedback to pull-requests or any comments. The thumb-down reaction should be + used with care and if possible accompanied with some explanations so the submitter has directions to improve his contribution. -Pull-requests reviews should include a list of what has been reviewed in a - comment, so other reviewers and mergers can know the state of the +Pull-requests reviews should include a list of what has been reviewed in a + comment, so other reviewers and mergers can know the state of the review. -All the review template samples provided in this section are generic and - meant as examples. Their usage is optional and the reviewer is free to adapt +All the review template samples provided in this section are generic and + meant as examples. Their usage is optional and the reviewer is free to adapt them to his liking.
Package updates -A package update is the most trivial and common type of pull-request. - These pull-requests mainly consist in updating the version part of the package +A package update is the most trivial and common type of pull-request. + These pull-requests mainly consist in updating the version part of the package name and the source hash. -It can happen that non trivial updates include patches or more complex +It can happen that non trivial updates include patches or more complex changes. Reviewing process: - Add labels to the pull-request. (Requires commit + Add labels to the pull-request. (Requires commit rights) - 8.has: package (update) and any topic + 8.has: package (update) and any topic label that fit the updated package. - Ensure that the package versioning is fitting the + Ensure that the package versioning is fitting the guidelines. - Ensure that the commit text is fitting the + Ensure that the commit text is fitting the guidelines. Ensure that the package maintainers are notified. - mention-bot usually notify GitHub users based on the - submitted changes, but it can happen that it misses some of the + mention-bot usually notify GitHub users based on the + submitted changes, but it can happen that it misses some of the package maintainers. - Ensure that the meta field contains correct + Ensure that the meta field contains correct information. - License can change with version updates, so it should be + License can change with version updates, so it should be checked to be fitting upstream license. - If the package has no maintainer, a maintainer must be - set. This can be the update submitter or a community member that + If the package has no maintainer, a maintainer must be + set. This can be the update submitter or a community member that accepts to take maintainership of the package. Ensure that the code contains no typos. Building the package locally. - Pull-requests are often targeted to the master or staging - branch so building the pull-request locally as it is submitted can + Pull-requests are often targeted to the master or staging + branch so building the pull-request locally as it is submitted can trigger a large amount of source builds. - It is possible to rebase the changes on nixos-unstable or - nixpkgs-unstable for easier review by running the following commands + It is possible to rebase the changes on nixos-unstable or + nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone. -$ git remote add channels https://github.com/NixOS/nixpkgs-channels.git $ git fetch channels nixos-unstable $ git fetch origin pull/PRNUMBER/head -$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD - This should be done only once to be able to fetch channel + This should be done only once to be able to fetch channel branches from the nixpkgs-channels repository. Fetching the nixos-unstable branch. - Fetching the pull-request changes, PRNUMBER - is the number at the end of the pull-request title and - BASEBRANCH the base branch of the + Fetching the pull-request changes, PRNUMBER + is the number at the end of the pull-request title and + BASEBRANCH the base branch of the pull-request. - - Rebasing the pull-request changes to the nixos-unstable + + Rebasing the pull-request changes to the nixos-unstable branch. - The nox - tool can be used to review a pull-request content in a single command. - It doesn't rebase on a channel branch so it might trigger multiple - source builds. PRNUMBER should be replaced by the + The nox + tool can be used to review a pull-request content in a single command. + It doesn't rebase on a channel branch so it might trigger multiple + source builds. PRNUMBER should be replaced by the number at the end of the pull-request title. $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" @@ -153,42 +153,42 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
New packages -New packages are a common type of pull-requests. These pull requests +New packages are a common type of pull-requests. These pull requests consists in adding a new nix-expression for a package. Reviewing process: - Add labels to the pull-request. (Requires commit + Add labels to the pull-request. (Requires commit rights) - 8.has: package (new) and any topic + 8.has: package (new) and any topic label that fit the new package. - Ensure that the package versioning is fitting the + Ensure that the package versioning is fitting the guidelines. - Ensure that the commit name is fitting the + Ensure that the commit name is fitting the guidelines. - Ensure that the meta field contains correct + Ensure that the meta field contains correct information. - License must be checked to be fitting upstream + License must be checked to be fitting upstream license. - Platforms should be set or the package will not get binary + Platforms should be set or the package will not get binary substitutes. - A maintainer must be set, this can be the package - submitter or a community member that accepts to take maintainership of + A maintainer must be set, this can be the package + submitter or a community member that accepts to take maintainership of the package. Ensure that the code contains no typos. Ensure the package source. - Mirrors urls should be used when + Mirrors urls should be used when available. - The most appropriate function should be used (e.g. - packages from GitHub should use + The most appropriate function should be used (e.g. + packages from GitHub should use fetchFromGitHub). @@ -223,49 +223,49 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
Module updates -Module updates are submissions changing modules in some ways. These often +Module updates are submissions changing modules in some ways. These often contains changes to the options or introduce new options. Reviewing process - Add labels to the pull-request. (Requires commit + Add labels to the pull-request. (Requires commit rights) - 8.has: module (update) and any topic + 8.has: module (update) and any topic label that fit the module. Ensure that the module maintainers are notified. - Mention-bot notify GitHub users based on the submitted - changes, but it can happen that it miss some of the package + Mention-bot notify GitHub users based on the submitted + changes, but it can happen that it miss some of the package maintainers. - Ensure that the module tests, if any, are + Ensure that the module tests, if any, are succeeding. Ensure that the introduced options are correct. - Type should be appropriate (string related types differs - in their merging capabilities, optionSet and + Type should be appropriate (string related types differs + in their merging capabilities, optionSet and string types are deprecated). - Description, default and example should be + Description, default and example should be provided. Ensure that option changes are backward compatible. - mkRenamedOptionModule and - mkAliasOptionModule functions provide way to make + mkRenamedOptionModule and + mkAliasOptionModule functions provide way to make option changes backward compatible. - Ensure that removed options are declared with + Ensure that removed options are declared with mkRemovedOptionModule - Ensure that changes that are not backward compatible are + Ensure that changes that are not backward compatible are mentioned in release notes. - Ensure that documentations affected by the change is + Ensure that documentations affected by the change is updated. @@ -294,37 +294,37 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" New modules submissions introduce a new module to NixOS. - Add labels to the pull-request. (Requires commit + Add labels to the pull-request. (Requires commit rights) - 8.has: module (new) and any topic label + 8.has: module (new) and any topic label that fit the module. - Ensure that the module tests, if any, are + Ensure that the module tests, if any, are succeeding. Ensure that the introduced options are correct. - Type should be appropriate (string related types differs - in their merging capabilities, optionSet and + Type should be appropriate (string related types differs + in their merging capabilities, optionSet and string types are deprecated). - Description, default and example should be + Description, default and example should be provided. - Ensure that module meta field is + Ensure that module meta field is present - Maintainers should be declared in + Maintainers should be declared in meta.maintainers. - Module documentation should be declared with + Module documentation should be declared with meta.doc. - Ensure that the module respect other modules + Ensure that the module respect other modules functionality. - For example, enabling a module should not open firewall + For example, enabling a module should not open firewall ports by default. @@ -340,7 +340,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" - [ ] options have default - [ ] options have example - [ ] options have descriptions -- [ ] No unneeded package is added to system.environmentPackages +- [ ] No unneeded package is added to environment.systemPackages - [ ] meta.maintainers is set - [ ] module documentation is declared in meta.doc @@ -355,22 +355,22 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" Other type of submissions requires different reviewing steps. -If you consider having enough knowledge and experience in a topic and - would like to be a long-term reviewer for related submissions, please contact - the current reviewers for that topic. They will give you information about the +If you consider having enough knowledge and experience in a topic and + would like to be a long-term reviewer for related submissions, please contact + the current reviewers for that topic. They will give you information about the reviewing process. -The main reviewers for a topic can be hard to find as there is no list, but -checking past pull-requests to see who reviewed or git-blaming the code to see +The main reviewers for a topic can be hard to find as there is no list, but +checking past pull-requests to see who reviewed or git-blaming the code to see who committed to that topic can give some hints. -Container system, boot system and library changes are some examples of the +Container system, boot system and library changes are some examples of the pull requests fitting this category.
Merging pull-requests -It is possible for community members that have enough knowledge and +It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests. TODO: add the procedure to request merging rights. @@ -380,13 +380,13 @@ The following paragraph about how to deal with unactive contributors is just a proposition and should be modified to what the community agrees to be the right policy. -Please note that contributors with commit rights unactive for more than +Please note that contributors with commit rights unactive for more than three months will have their commit rights revoked. --> -In a case a contributor leaves definitively the Nix community, he should - create an issue or notify the mailing list with references of packages and - modules he maintains so the maintainership can be taken over by other +In a case a contributor leaves definitively the Nix community, he should + create an issue or notify the mailing list with references of packages and + modules he maintains so the maintainership can be taken over by other contributors.
diff --git a/doc/shell.nix b/doc/shell.nix new file mode 100644 index 0000000000000000000000000000000000000000..22590142ee1ad0801d128f1289ff2c6658d9335e --- /dev/null +++ b/doc/shell.nix @@ -0,0 +1,4 @@ +{ pkgs ? import ../. {} }: +(import ./default.nix).overrideAttrs (x: { + buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ]; +}) diff --git a/doc/shell.section.md b/doc/shell.section.md new file mode 100644 index 0000000000000000000000000000000000000000..cb8832a814fcc036a881544d175430e3cf6b2587 --- /dev/null +++ b/doc/shell.section.md @@ -0,0 +1,22 @@ +--- +title: pkgs.mkShell +author: zimbatm +date: 2017-10-30 +--- + +# mkShell + +pkgs.mkShell is a special kind of derivation that is only useful when using +it combined with nix-shell. It will in fact fail to instantiate when invoked +with nix-build. + +## Usage + +```nix +{ pkgs ? import {} }: +pkgs.mkShell { + # this will make all the build inputs from hello and gnutar available to the shell environment + inputsFrom = with pkgs; [ hello gnutar ]; + buildInputs = [ pkgs.gnumake ]; +} +``` diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 46b562a794f02c39b7761b2e0a00c5e2b9c72df6..2a3316b8d01835460bee7af40cc2e993999cf64f 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -179,68 +179,283 @@ genericBuild
-
Attributes +
Specifying dependencies + + + As described in the Nix manual, almost any *.drv store path in a derivation's attribute set will induce a dependency on that derivation. + mkDerivation, however, takes a few attributes intended to, between them, include all the dependencies of a package. + This is done both for structure and consistency, but also so that certain other setup can take place. + For example, certain dependencies need their bin directories added to the PATH. + That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. + See for details. + + + Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated. + The platform distinctions are motivated by cross compilation; see for exactly what each platform means. + + The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: + As a general programming principle, dependencies are always specified as interfaces, not concrete implementation. + + But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. + For now, the run-time/build-time distinction is just a hint for mental clarity, but in the future it perhaps could be enforced. + + + The extension of PATH with dependencies, alluded to above, proceeds according to the relative platforms alone. + The process is carried out only for dependencies whose host platform matches the new derivation's build platform–i.e. which run on the platform where the new derivation will be built. + + Currently, that means for native builds all dependencies are put on the PATH. + But in the future that may not be the case for sake of matching cross: + the platforms would be assumed to be unique for native and cross builds alike, so only the depsBuild* and nativeBuildDependencies dependencies would affect the PATH. + + For each dependency dep of those dependencies, dep/bin, if present, is added to the PATH environment variable. + + + The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. + Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency. + + + It is important to note dependencies are not necessary propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. + The exact rules for dependency propagation can be given by assigning each sort of dependency two integers based one how it's host and target platforms are offset from the depending derivation's platforms. + Those offsets are given are given below in the descriptions of each dependency list attribute. + Algorithmically, we traverse propagated inputs, accumulating every propagated dep's propagated deps and adjusting them to account for the "shift in perspective" described by the current dep's platform offsets. + This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. + We also prune transitive deps whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd. + + + We can define the process precisely with Natural Deduction using the inference rules. + This probably seems a bit obtuse, but so is the bash code that actually implements it! + + The findInputs function, currently residing in pkgs/stdenv/generic/setup.sh, implements the propagation logic. + + They're confusing in very different ways so...hopefully if something doesn't make sense in one presentation, it does in the other! + +let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) + +propagated-dep(h0, t0, A, B) +propagated-dep(h1, t1, B, C) +h0 + h1 in {-1, 0, 1} +h0 + t1 in {-1, 0, 1} +-------------------------------------- Transitive property +propagated-dep(mapOffset(h0, t0, h1), + mapOffset(h0, t0, t1), + A, C) + +let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) + +dep(h0, _, A, B) +propagated-dep(h1, t1, B, C) +h0 + h1 in {-1, 0, 1} +h0 + t1 in {-1, 0, -1} +-------------------------------------- Take immediate deps' propagated deps +propagated-dep(mapOffset(h0, t0, h1), + mapOffset(h0, t0, t1), + A, C) + +propagated-dep(h, t, A, B) +-------------------------------------- Propagated deps count as deps +dep(h, t, A, B) + Some explanation of this monstrosity is in order. + In the common case, the target offset of a dependency is the successor to the target offset: t = h + 1. + That means that: + +let f(h, t, i) = i + (if i <= 0 then h else t - 1) +let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1) +let f(h, h + 1, i) = i + (if i <= 0 then h else h) +let f(h, h + 1, i) = i + h + + This is where the "sum-like" comes from above: + We can just sum all the host offset to get the host offset of the transitive dependency. + The target offset is the transitive dep is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; + it can be ignored as it doesn't add any new information. + + + Because of the bounds checks, the uncommon cases are h = t and h + 2 = t. + In the former case, the motivation for mapOffset is that since its host and target platforms are the same, no transitive dep of it should be able to "discover" an offset greater than its reduced target offsets. + mapOffset effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original h = t package. + In the other case, h + 1 is skipped over between the host and target offsets. + Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one. + + +Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the needing package is unaware of. +The offset bounds checking and definition of mapOffset together ensure that this is the case. +Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant. +From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. + - Variables affecting <literal>stdenv</literal> - initialisation + Variables specifying dependencies + + + depsBuildBuild + + + A list of dependencies whose host and target platforms are the new derivation's build platform. + This means a -1 host and -1 target offset from the new derivation's platforms. + They are programs/libraries used at build time that furthermore produce programs/libraries also used at build time. + If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in nativeBuildInputsinstead. + The most common use for this buildPackages.stdenv.cc, the default C compiler for this role. + That example crops up more than one might think in old commonly used C libraries. + + + Since these packages are able to be run at build time, that are always added to the PATH, as described above. + But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. + This isn't currently enforced, but could be in the future. + + + - NIX_DEBUG + nativeBuildInputs + + + A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform. + This means a -1 host offset and 0 target offset from the new derivation's platforms. + They are programs/libraries used at build time that, if they are a compiler or similar tool, produce code to run at run time—i.e. tools used to build the new derivation. + If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild or depsBuildTarget. + This would be called depsBuildHost but for historical continuity. + + + Since these packages are able to be run at build time, that are added to the PATH, as described above. + But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies. + This isn't currently enforced, but could be in the future. + + + + + + depsBuildTarget + + + A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform. + This means a -1 host offset and 1 target offset from the new derivation's platforms. + They are programs used at build time that produce code to run at run with code produced by the depending package. + Most commonly, these would tools used to build the runtime or standard library the currently-being-built compiler will inject into any code it compiles. + In many cases, the currently-being built compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible. + Other times, the compiler relies on some other tool, like binutils, that is always built separately so the dependency is unconditional. + + + This is a somewhat confusing dependency to wrap ones head around, and for good reason. + As the only one where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage two away from the current one. + It and it's use-case go hand in hand and are both considered poor form: + try not to need this sort dependency, and try not avoid building standard libraries / runtimes in the same derivation as the compiler produces code using them. + Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. + In short, do not use this attribute unless you are packaging a compiler and are sure it is needed. + + + Since these packages are able to be run at build time, that are added to the PATH, as described above. + But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies. + This isn't currently enforced, but could be in the future. + + + + + + depsHostHost - A natural number indicating how much information to log. - If set to 1 or higher, stdenv will print moderate debug information during the build. - In particular, the gcc and ld wrapper scripts will print out the complete command line passed to the wrapped tools. - If set to 6 or higher, the stdenv setup script will be run with set -x tracing. - If set to 7 or higher, the gcc and ld wrapper scripts will also be run with set -x tracing. + A list of dependencies whose host and target platforms match the new derivation's host platform. + This means a both 0 host offset and 0 target offset from the new derivation's host platform. + These are packages used at run-time to generate code also used at run-time. + In practice, that would usually be tools used by compilers for metaprogramming/macro systems, or libraries used by the macros/metaprogramming code itself. + It's always preferable to use a depsBuildBuild dependency in the derivation being built than a depsHostHost on the tool doing the building for this purpose. - + + buildInputs + + + A list of dependencies whose host platform and target platform match the new derivation's. + This means a 0 host offset and 1 target offset from the new derivation's host platform. + This would be called depsHostTarget but for historical continuity. + If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild. + + + These often are programs/libraries used by the new derivation at run-time, but that isn't always the case. + For example, the machine code in a statically linked library is only used at run time, but the derivation containing the library is only needed at build time. + Even in the dynamic case, the library may also be needed at build time to appease the linker. + + + - - Variables specifying dependencies + + depsTargetTarget + + A list of dependencies whose host platform matches the new derivation's target platform. + This means a 1 offset from the new derivation's platforms. + These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. + It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset]. + Do not use this attribute unless you are packaging a compiler and are sure it is needed. + + - nativeBuildInputs + depsBuildBuildPropagated - A list of dependencies used by the new derivation at build-time. - I.e. these dependencies should not make it into the package's runtime-closure, though this is currently not checked. - For each dependency dir, the directory dir/bin, if it exists, is added to the PATH environment variable. - Other environment variables are also set up via a pluggable mechanism. - For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable. - See for details. + The propagated equivalent of depsBuildBuild. + This perhaps never ought to be used, but it is included for consistency [see below for the others]. - buildInputs + propagatedNativeBuildInputs - A list of dependencies used by the new derivation at run-time. - Currently, the build-time environment is modified in the exact same way as with nativeBuildInputs. - This is problematic in that when cross-compiling, foreign executables can clobber native ones on the PATH. - Even more confusing is static-linking. - A statically-linked library should be listed here because ultimately that generated machine code will be used at run-time, even though a derivation containing the object files or static archives will only be used at build-time. - A less confusing solution to this would be nice. + The propagated equivalent of nativeBuildInputs. + This would be called depsBuildHostPropagated but for historical continuity. + For example, if package Y has propagatedNativeBuildInputs = [X], and package Z has buildInputs = [Y], then package Z will be built as if it included package X in its nativeBuildInputs. + If instead, package Z has nativeBuildInputs = [Y], then Z will be built as if it included X in the depsBuildBuild of package Z, because of the sum of the two -1 host offsets. + + depsBuildTargetPropagated + + The propagated equivalent of depsBuildTarget. + This is prefixed for the same reason of alerting potential users. + + - propagatedNativeBuildInputs + depsHostHostPropagated - Like nativeBuildInputs, but these dependencies are propagated: - that is, the dependencies listed here are added to the nativeBuildInputs of any package that uses this package as a dependency. - So if package Y has propagatedNativeBuildInputs = [X], and package Z has nativeBuildInputs = [Y], - then package X will appear in Z’s build environment automatically. + The propagated equivalent of depsHostHost. propagatedBuildInputs - Like buildInputs, but propagated just like propagatedNativeBuildInputs. - This inherits buildInputs's flaws of clobbering native executables when cross-compiling and being confusing for static linking. + The propagated equivalent of buildInputs. + This would be called depsHostTargetPropagated but for historical continuity. + + + + + depsTargetTarget + + The propagated equivalent of depsTargetTarget. + This is prefixed for the same reason of alerting potential users. + + + + + +
+ + +
Attributes + + + Variables affecting <literal>stdenv</literal> + initialisation + + + NIX_DEBUG + + A natural number indicating how much information to log. + If set to 1 or higher, stdenv will print moderate debug information during the build. + In particular, the gcc and ld wrapper scripts will print out the complete command line passed to the wrapped tools. + If set to 6 or higher, the stdenv setup script will be run with set -x tracing. + If set to 7 or higher, the gcc and ld wrapper scripts will also be run with set -x tracing. @@ -251,10 +466,17 @@ genericBuild enableParallelBuilding - If set, stdenv will pass specific - flags to make and other build tools to enable - parallel building with up to build-cores - workers. + + If set to true, stdenv will + pass specific flags to make and other build tools to + enable parallel building with up to build-cores + workers. + + Unless set to false, some build systems with good + support for parallel building including cmake, + meson, and qmake will set it to + true. + @@ -649,7 +871,7 @@ script) if it exists. By default, when cross compiling, the configure script has and passed. Packages can instead pass [ "build" "host" "target" ] or a subset to control exactly which platform flags are passed. Compilers and other tools should use this to also pass the target platform, for example. - Note eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity. + 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. @@ -773,13 +995,14 @@ but only if the doCheck variable is enabled. doCheck - If set to a non-empty string, the check phase is - executed, otherwise it is skipped (default). Thus you should set - - -doCheck = true; - - in the derivation to enable checks. + + Controls whether the check phase is executed. + By default it is skipped, but if doCheck is set to true, the check phase is usually executed. + Thus you should set doCheck = true; in the derivation to enable checks. + The exception is cross compilation. + Cross compiled builds never run tests, no matter how doCheck is set, + as the newly-built program won't run on the platform used to build it. + @@ -916,6 +1139,20 @@ following: If set, libraries and executables are not stripped. By default, they are. + + dontStripHost + + Like dontStripHost, but only affects the strip command targetting the package's host platform. + Useful when supporting cross compilation, but otherwise feel free to ignore. + + + + dontStripTarget + + Like dontStripHost, but only affects the strip command targetting the packages' target platform. + Useful when supporting cross compilation, but otherwise feel free to ignore. + + dontMoveSbin @@ -1044,12 +1281,14 @@ installcheck. doInstallCheck - If set to a non-empty string, the installCheck phase is - executed, otherwise it is skipped (default). Thus you should set - - doInstallCheck = true; - - in the derivation to enable install checks. + + Controls whether the installCheck phase is executed. + By default it is skipped, but if doInstallCheck is set to true, the installCheck phase is usually executed. + Thus you should set doInstallCheck = true; in the derivation to enable install checks. + The exception is cross compilation. + Cross compiled builds never run tests, no matter how doInstallCheck is set, + as the newly-built program won't run on the platform used to build it. + @@ -1346,46 +1585,127 @@ someVar=$(stripHash $name)
Package setup hooks -The following packages provide a setup hook: - + + Nix itself considers a build-time dependency merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. + In most cases, that is fine, and the downstream derivation can deal with it's own dependencies. + But for a few common tasks, that would result in almost every package doing the same sort of setup work---depending not on the package itself, but entirely on which dependencies were used. + + + In order to alleviate this burden, the setup hook>mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process. + That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. + No boilerplate mirroring the list of dependencies is needed. + + + The Setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. + The combination of its power and implicit use may be expedient, but isn't without costs. + Nix itself is unchanged, but the spirit of adding dependencies being effect-free is violated even if the letter isn't. + For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. + However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). + More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. + + + The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. + For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libaries and headers. + This is done by defining a bash function, and appending its name to one of + envBuildBuildHooks`, + envBuildHostHooks`, + envBuildTargetHooks`, + envHostHostHooks`, + envHostTargetHooks`, or + envTargetTargetHooks`. + These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). + + + Packages adding a hook should not hard code a specific hook, but rather choose a variable relative to how they are included. + Returning to the C compiler wrapper example, if it itself is an n dependency, then it only wants to accumulate flags from n + 1 dependencies, as only those ones match the compiler's target platform. + The hostOffset variable is defined with the current dependency's host offset targetOffset with its target offset, before it's setup hook is sourced. + Additionally, since most environment hooks don't care about the target platform, + That means the setup hook can append to the right bash array by doing something like + +addEnvHooks "$hostOffset" myBashFunction + + + + The existence of setups hooks has long been documented and packages inside Nixpkgs are free to use these mechanism. + Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. + Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time. + + + Here are some packages that provide a setup hook. + Since the mechanism is modular, this probably isn't an exhaustive list. + Then again, since the mechanism is only to be used as a last resort, it might be. - CC Wrapper + Bintools Wrapper - CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. - Specifically, a C compiler (GCC or Clang), Binutils (or the CCTools + binutils mashup when targetting Darwin), and a C standard library (glibc or Darwin's libSystem) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper. - Packages typically depend on only CC Wrapper, instead of those 3 inputs directly. + Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. + These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. + [The "Bintools" name is supposed to be a compromise between "Binutils" and "cctools" not denoting any specific implementation.] + Specifically, the underlying bintools package, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by Bintools Wrapper. + Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper. - Dependency finding is undoubtedly the main task of CC wrapper. + Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. + For example, it shouldn't care about about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). + Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. It is currently accomplished by collecting directories of host-platform dependencies (i.e. buildInputs and nativeBuildInputs) in environment variables. - CC wrapper's setup hook causes any include subdirectory of such a dependency to be added to NIX_CFLAGS_COMPILE, and any lib and lib64 subdirectories to NIX_LDFLAGS. - The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. + Bintools Wrapper's setup hook causes any lib and lib64 subdirectories to be added to NIX_LDFLAGS. + Since CC Wrapper and Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to CC Wrapper. + But CC Wrapper's code, by contrast, has quite lengthy comments. + Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync. A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables full-fill which purpose. - They are defined to just be the base name of the tools, under the assumption that CC Wrapper's binaries will be on the path. + They are defined to just be the base name of the tools, under the assumption that Bintools Wrapper's binaries will be on the path. Firstly, this helps poorly-written packages, e.g. ones that look for just gcc when CC isn't defined yet clang is to be used. - Secondly, this helps packages not get confused when cross-compiling, in which case multiple CC wrappers may be simultaneous in use (targeting different platforms). - BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional CC Wrappers, properly disambiguating them. + Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use. + + Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times. + As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms. + + BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional Bintools Wrappers, properly disambiguating them. - A problem with this final task is that CC Wrapper is honest and defines LD as ld. + A problem with this final task is that Bintools Wrapper is honest and defines LD as ld. Most packages, however, firstly use the C compiler for linking, secondly use LD anyways, defining it as the C compiler, and thirdly, only so define LD when it is undefined as a fallback. - This triple-threat means CC Wrapper will break those packages, as LD is already defined as the actually linker which the package won't override yet doesn't want to use. + This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won't override yet doesn't want to use. The workaround is to define, just for the problematic package, LD as the C compiler. A good way to do this would be preConfigure = "LD=$CC". + + CC Wrapper + + + CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. + Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper. + Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper. + + + Dependency finding is undoubtedly the main task of CC Wrapper. + This works just like Bintools Wrapper, except that any include subdirectory of any relevant dependency is added to NIX_CFLAGS_COMPILE. + The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. + + + CC Wrapper also like Bintools Wrapper defines standard environment variables with the names of the tools it wraps, for the same reasons described above. + Importantly, while it includes a cc symlink to the c compiler for portability, the CC will be defined using the compiler's "real name" (i.e. gcc or clang). + This helps lousy build systems that inspect on the name of the compiler rather than run it. + + + + Perl - Adds the lib/site_perl subdirectory - of each build input to the PERL5LIB - environment variable. + + + Adds the lib/site_perl subdirectory of each build input to the PERL5LIB environment variable. + For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable. + + @@ -1482,6 +1802,20 @@ someVar=$(stripHash $name) disabled or patched to work with PaX. + + autoPatchelfHook + This is a special setup hook which helps in packaging + proprietary software in that it automatically tries to find missing shared + library dependencies of ELF files. All packages within the + runtimeDependencies environment variable are unconditionally + added to executables, which is useful for programs that use + + dlopen + 3 + + to load libraries at runtime. + + diff --git a/doc/style.css b/doc/style.css index ac76a64bbb210316dab95c2a51684be1f4320b64..0db907815b6b77496871cd266fcc828b51ae57d9 100644 --- a/doc/style.css +++ b/doc/style.css @@ -29,8 +29,8 @@ h2 /* chapters, appendices, subtitle */ } /* Extra space between chapters, appendices. */ -div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 -{ +div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 +{ margin-top: 1.5em; } @@ -104,7 +104,7 @@ pre.screen, pre.programlisting padding: 3px 3px; margin-left: 1.5em; margin-right: 1.5em; - color: #600000; + background: #f4f4f8; font-family: monospace; border-radius: 0.4em; @@ -118,7 +118,6 @@ div.example pre.programlisting margin: 0 0 0 0; } - /*************************************************************************** Notes, warnings etc: ***************************************************************************/ @@ -172,7 +171,7 @@ div.navfooter * /*************************************************************************** - Links colors and highlighting: + Links colors and highlighting: ***************************************************************************/ a { text-decoration: none; } @@ -209,7 +208,7 @@ tt, code .term { font-weight: bold; - + } div.variablelist dd p, div.glosslist dd p @@ -249,7 +248,24 @@ table box-shadow: 0.4em 0.4em 0.5em #e0e0e0; } +table.simplelist +{ + text-align: left; + color: #005aa0; + border: 0; + padding: 5px; + background: #fffff5; + font-weight: normal; + font-style: italic; + box-shadow: none; + margin-bottom: 1em; +} + +div.navheader table, div.navfooter table { + box-shadow: none; +} + div.affiliation { font-style: italic; -} \ No newline at end of file +} diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index f65b2898262e88e42051847d39011f58516e41fd..d3cf221c9b6962234fffa092b6a996f66d0526f8 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -317,11 +317,11 @@ Additional information. review uncommitted changes: - nix-shell -p nox --run nox-review wip + nix-shell -p nox --run "nox-review wip" review changes from pull request number 12345: - nix-shell -p nox --run nox-review pr 12345 + nix-shell -p nox --run "nox-review pr 12345"
diff --git a/lib/customisation.nix b/lib/customisation.nix index 483ef6fd4866abb7202c920b006a1b646fcfaaa6..d942f54ee7989f66b51dd252f6671d872e8dfcff 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -1,7 +1,7 @@ { lib }: let - inherit (builtins) attrNames isFunction; + inherit (builtins) attrNames; in @@ -36,7 +36,7 @@ rec { overrideDerivation = drv: f: let newDrv = derivation (drv.drvAttrs // (f drv)); - in addPassthru newDrv ( + in lib.flip (extendDerivation true) newDrv ( { meta = drv.meta or {}; passthru = if drv ? passthru then drv.passthru else {}; } @@ -72,7 +72,7 @@ rec { makeOverridable = f: origArgs: let ff = f origArgs; - overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); + overrideWith = newArgs: origArgs // (if lib.isFunction newArgs then newArgs origArgs else newArgs); in if builtins.isAttrs ff then (ff // { override = newArgs: makeOverridable f (overrideWith newArgs); @@ -81,7 +81,7 @@ rec { ${if ff ? overrideAttrs then "overrideAttrs" else null} = fdrv: makeOverridable (args: (f args).overrideAttrs fdrv) origArgs; }) - else if builtins.isFunction ff then { + else if lib.isFunction ff then { override = newArgs: makeOverridable f (overrideWith newArgs); __functor = self: ff; overrideDerivation = throw "overrideDerivation not yet supported for functors"; @@ -112,8 +112,8 @@ rec { */ callPackageWith = autoArgs: fn: args: let - f = if builtins.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + f = if lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; in makeOverridable f (auto // args); @@ -122,8 +122,8 @@ rec { individual attributes. */ callPackagesWith = autoArgs: fn: args: let - f = if builtins.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + f = if lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; origArgs = auto // args; pkgs = f origArgs; mkAttrOverridable = name: pkg: makeOverridable (newArgs: (f newArgs).${name}) origArgs; @@ -131,8 +131,8 @@ rec { /* Add attributes to each output of a derivation without changing - the derivation itself. */ - addPassthru = drv: passthru: + the derivation itself and check a given condition when evaluating. */ + extendDerivation = condition: passthru: drv: let outputs = drv.outputs or [ "out" ]; @@ -142,13 +142,18 @@ rec { outputToAttrListElement = outputName: { name = outputName; value = commonAttrs // { - inherit (drv.${outputName}) outPath drvPath type outputName; + inherit (drv.${outputName}) type outputName; + drvPath = assert condition; drv.${outputName}.drvPath; + outPath = assert condition; drv.${outputName}.outPath; }; }; outputsList = map outputToAttrListElement outputs; - in commonAttrs // { outputUnspecified = true; }; - + in commonAttrs // { + outputUnspecified = true; + drvPath = assert condition; drv.drvPath; + outPath = assert condition; drv.outPath; + }; /* Strip a derivation of all non-essential attributes, returning only those needed by hydra-eval-jobs. Also strictly evaluate the diff --git a/lib/debug.nix b/lib/debug.nix index 646ef220ad0a3ec897d63c994193469584ca2ddf..d163e60b69570851c123947ffe61e04691cb1929 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -2,10 +2,10 @@ let -inherit (builtins) trace attrNamesToStr isAttrs isFunction isList isInt +inherit (builtins) trace attrNamesToStr isAttrs isList isInt isString isBool head substring attrNames; -inherit (lib) all id mapAttrsFlatten elem; +inherit (lib) all id mapAttrsFlatten elem isFunction; in diff --git a/lib/default.nix b/lib/default.nix index 3e30ec515fcbbaaab709e2965c6cf7c4f975ded2..c292ed33e1daab57415219fa39b9b91d80f925e1 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -5,9 +5,11 @@ */ let - callLibs = file: import file { inherit lib; }; + inherit (import ./fixed-points.nix {}) makeExtensible; - lib = rec { + lib = makeExtensible (self: let + callLibs = file: import file { lib = self; }; + in with self; { # often used, or depending on very little trivial = callLibs ./trivial.nix; @@ -21,10 +23,10 @@ let # packaging customisation = callLibs ./customisation.nix; - maintainers = callLibs ./maintainers.nix; + maintainers = import ../maintainers/maintainer-list.nix; meta = callLibs ./meta.nix; sources = callLibs ./sources.nix; - + versions = callLibs ./versions.nix; # module system modules = callLibs ./modules.nix; @@ -41,23 +43,23 @@ let generators = callLibs ./generators.nix; misc = callLibs ./deprecated.nix; # domain-specific - sandbox = callLibs ./sandbox.nix; fetchers = callLibs ./fetchers.nix; # Eval-time filesystem handling filesystem = callLibs ./filesystem.nix; # back-compat aliases - platforms = systems.doubles; + platforms = systems.forMeta; inherit (builtins) add addErrorContext attrNames concatLists deepSeq elem elemAt filter genericClosure genList - getAttr hasAttr head isAttrs isBool isFunction isInt isList + getAttr hasAttr head isAttrs isBool isInt isList isString length lessThan listToAttrs pathExists readFile replaceStrings seq stringLength sub substring tail; inherit (trivial) id const concat or and boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info - nixpkgsVersion mod; + nixpkgsVersion mod compare splitByAndCompare + functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; @@ -72,8 +74,8 @@ let inherit (lists) singleton foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists - reverseList listDfs toposort sort take drop sublist last init - crossLists unique intersectLists subtractLists + reverseList listDfs toposort sort naturalSort compareLists take drop sublist + last init crossLists unique intersectLists subtractLists mutuallyExclusive; inherit (strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep @@ -88,13 +90,14 @@ let inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith addPassthru hydraJob makeScope; + callPackageWith callPackagesWith extendDerivation + hydraJob makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio hiPrioSet; inherit (sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices - commitIdFromGitRepo; + commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource; inherit (modules) evalModules closeModules unifyModuleSyntax applyIfFunction unpackSubmodule packSubmodule mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions @@ -127,5 +130,5 @@ let mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults mergeAttrsByFuncDefaultsClean mergeAttrBy prepareDerivationArgs nixType imap overridableDelayableArgs; - }; + }); in lib diff --git a/lib/deprecated.nix b/lib/deprecated.nix index 2a0f5a55bf14e9adc38fb7f5b1894ba9210f9152..34cf336d1f42c4c4c6fc3adf3d6033ee1487a547 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -1,6 +1,6 @@ { lib }: let - inherit (builtins) isFunction head tail isList isAttrs isInt attrNames; + inherit (builtins) head tail isList isAttrs isInt attrNames; in @@ -53,7 +53,7 @@ rec { 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 + takeFixed = if lib.isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument tidy = args: let # apply all functions given in "applyPreTidy" in sequence applyPreTidyFun = fold ( n: a: x: n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args); @@ -63,7 +63,7 @@ rec { let args = takeFixed fixed; mergeFun = args.${n}; in if isAttrs x then (mergeFun args x) - else assert isFunction x; + else assert lib.isFunction x; mergeFun args (x ( args // { inherit fixed; })); in overridableDelayableArgs f newArgs; in @@ -374,7 +374,7 @@ rec { if isAttrs x then if x ? outPath then "derivation" else "attrs" - else if isFunction x then "function" + else if lib.isFunction x then "function" else if isList x then "list" else if x == true then "bool" else if x == false then "bool" diff --git a/lib/generators.nix b/lib/generators.nix index 5f9da234f4474638b3fc91279a7087f3da651f26..d1a8f6bf8dcdaf63cbf0fd03740d232096667fba 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -4,6 +4,12 @@ * They all follow a similar interface: * generator { config-attrs } data * + * `config-attrs` are “holes” in the generators + * with sensible default implementations that + * can be overwritten. The default implementations + * are mostly generators themselves, called with + * their respective default values; they can be reused. + * * Tests can be found in ./tests.nix * Documentation in the manual, #sec-generators */ @@ -14,19 +20,54 @@ let libAttr = lib.attrsets; flipMapAttrs = flip libAttr.mapAttrs; + + inherit (lib) isFunction; in rec { + ## -- HELPER FUNCTIONS & DEFAULTS -- + + /* Convert a value to a sensible default string representation. + * The builtin `toString` function has some strange defaults, + * suitable for bash scripts but not much else. + */ + mkValueStringDefault = {}: v: with builtins; + let err = t: v: abort + ("generators.mkValueStringDefault: " + + "${t} not supported: ${toPretty {} v}"); + in if isInt v then toString v + # we default to not quoting strings + else if isString v then v + # isString returns "1", which is not a good default + else if true == v then "true" + # here it returns to "", which is even less of a good default + else if false == v then "false" + else if null == v then "null" + # if you have lists you probably want to replace this + else if isList v then err "lists" v + # same as for lists, might want to replace + else if isAttrs v then err "attrsets" v + else if isFunction v then err "functions" v + else err "this value is" (toString v); + + /* Generate a line of key k and value v, separated by * character sep. If sep appears in k, it is escaped. * Helper for synaxes with different separators. * - * mkKeyValueDefault ":" "f:oo" "bar" + * mkValueString specifies how values should be formatted. + * + * mkKeyValueDefault {} ":" "f:oo" "bar" * > "f\:oo:bar" */ - mkKeyValueDefault = sep: k: v: - "${libStr.escape [sep] k}${sep}${toString v}"; + mkKeyValueDefault = { + mkValueString ? mkValueStringDefault {} + }: sep: k: v: + "${libStr.escape [sep] k}${sep}${mkValueString v}"; + + + ## -- FILE FORMAT GENERATORS -- /* Generate a key-value-style config file from an attrset. @@ -34,7 +75,7 @@ rec { * mkKeyValue is the same as in toINI. */ toKeyValue = { - mkKeyValue ? mkKeyValueDefault "=" + mkKeyValue ? mkKeyValueDefault {} "=" }: attrs: let mkLine = k: v: mkKeyValue k v + "\n"; in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs); @@ -64,7 +105,7 @@ rec { # apply transformations (e.g. escapes) to section names mkSectionName ? (name: libStr.escape [ "[" "]" ] name), # format a setting line from key and value - mkKeyValue ? mkKeyValueDefault "=" + mkKeyValue ? mkKeyValueDefault {} "=" }: attrsOfAttrs: let # map function to string for each key val @@ -92,6 +133,7 @@ rec { */ toYAML = {}@args: toJSON args; + /* Pretty print a value, akin to `builtins.trace`. * Should probably be a builtin as well. */ @@ -102,11 +144,12 @@ rec { 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 isString v then ''"${libStr.escape [''"''] v}"'' + else if true == v then "true" + else if false == v then "false" else if null == v then "null" else if isFunction v then - let fna = functionArgs v; + let fna = lib.functionArgs v; showFnas = concatStringsSep "," (libAttr.mapAttrsToList (name: hasDefVal: if hasDefVal then "(${name})" else name) fna); @@ -126,6 +169,6 @@ rec { (name: value: "${toPretty args name} = ${toPretty args value};") v) + " }" - else "toPretty: should never happen (v = ${v})"; + else abort "generators.toPretty: should never happen (v = ${v})"; } diff --git a/lib/licenses.nix b/lib/licenses.nix index cbd737dc57f17e891818ba32bf5bbd2ccc8a8fcc..767fd89b948cc219f651dc616f8f9568a647e1c0 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -2,7 +2,7 @@ let spdx = lic: lic // { - url = "http://spdx.org/licenses/${lic.spdxId}"; + url = "http://spdx.org/licenses/${lic.spdxId}.html"; }; in @@ -15,7 +15,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { afl21 = spdx { spdxId = "AFL-2.1"; - fullName = "Academic Free License"; + fullName = "Academic Free License v2.1"; + }; + + afl3 = spdx { + spdxId = "AFL-3.0"; + fullName = "Academic Free License v3.0"; }; agpl3 = spdx { @@ -74,6 +79,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = ''Beerware License''; }; + bsd0 = spdx { + spdxId = "0BSD"; + fullName = "BSD Zero Clause License"; + }; + bsd2 = spdx { spdxId = "BSD-2-Clause"; fullName = ''BSD 2-clause "Simplified" License''; @@ -89,6 +99,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = ''BSD 4-clause "Original" or "Old" License''; }; + clArtistic = spdx { + spdxId = "ClArtistic"; + fullName = "Clarified Artistic License"; + }; + cc0 = spdx { spdxId = "CC0-1.0"; fullName = "Creative Commons Zero v1.0 Universal"; @@ -164,6 +179,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "CeCILL-C Free Software License Agreement"; }; + cpal10 = spdx { + spdxId = "CPAL-1.0"; + fullName = "Common Public Attribution License 1.0"; + }; + cpl10 = spdx { spdxId = "CPL-1.0"; fullName = "Common Public License 1.0"; @@ -195,6 +215,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Eclipse Public License 1.0"; }; + epl20 = spdx { + spdxId = "EPL-2.0"; + fullName = "Eclipse Public License 2.0"; + }; + epson = { fullName = "Seiko Epson Corporation Software License Agreement for Linux"; url = https://download.ebz.epson.net/dsc/du/02/eula/global/LINUX_EN.html; @@ -259,7 +284,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { gpl2Oss = { fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)"; - url = http://www.mysql.com/about/legal/licensing/foss-exception; + url = https://www.mysql.com/about/legal/licensing/foss-exception; }; gpl2Plus = spdx { @@ -304,6 +329,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { free = false; }; + inria-icesl = { + fullName = "INRIA Non-Commercial License Agreement for IceSL"; + url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf"; + free = false; + }; + ipa = spdx { spdxId = "IPA"; fullName = "IPA Font License"; @@ -426,6 +457,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Notion modified LGPL"; }; + nposl3 = spdx { + spdxId = "NPOSL-3.0"; + fullName = "Non-Profit Open Software License 3.0"; + }; + ofl = spdx { spdxId = "OFL-1.1"; fullName = "SIL Open Font License 1.1"; @@ -441,6 +477,16 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "OpenSSL License"; }; + osl21 = spdx { + spdxId = "OSL-2.1"; + fullName = "Open Software License 2.1"; + }; + + osl3 = spdx { + spdxId = "OSL-3.0"; + fullName = "Open Software License 3.0"; + }; + php301 = spdx { spdxId = "PHP-3.01"; fullName = "PHP License v3.01"; @@ -451,6 +497,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "PostgreSQL License"; }; + postman = { + fullName = "Postman EULA"; + url = https://www.getpostman.com/licenses/postman_base_app; + free = false; + }; + psfl = spdx { spdxId = "Python-2.0"; fullName = "Python Software Foundation License version 2"; @@ -538,6 +590,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Vovida Software License v1.0"; }; + watcom = spdx { + spdxId = "Watcom-1.0"; + fullName = "Sybase Open Watcom Public License 1.0"; + }; + w3c = spdx { spdxId = "W3C"; fullName = "W3C Software Notice and License"; @@ -572,5 +629,4 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; - } diff --git a/lib/lists.nix b/lib/lists.nix index 8f67c6bb0ca3bece07f307c827dc45c46c2c8d23..5ec97f5a07f386ee57153d0742633e4bed8dc13e 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -1,7 +1,9 @@ # General list operations. { lib }: with lib.trivial; - +let + inherit (lib.strings) toInt; +in rec { inherit (builtins) head tail length isList elemAt concatLists filter elem genList; @@ -385,6 +387,49 @@ rec { if len < 2 then list else (sort strictLess pivot.left) ++ [ first ] ++ (sort strictLess pivot.right)); + /* Compare two lists element-by-element. + + Example: + compareLists compare [] [] + => 0 + compareLists compare [] [ "a" ] + => -1 + compareLists compare [ "a" ] [] + => 1 + compareLists compare [ "a" "b" ] [ "a" "c" ] + => 1 + */ + compareLists = cmp: a: b: + if a == [] + then if b == [] + then 0 + else -1 + else if b == [] + then 1 + else let rel = cmp (head a) (head b); in + if rel == 0 + then compareLists cmp (tail a) (tail b) + else rel; + + /* Sort list using "Natural sorting". + Numeric portions of strings are sorted in numeric order. + + Example: + naturalSort ["disk11" "disk8" "disk100" "disk9"] + => ["disk8" "disk9" "disk11" "disk100"] + naturalSort ["10.46.133.149" "10.5.16.62" "10.54.16.25"] + => ["10.5.16.62" "10.46.133.149" "10.54.16.25"] + naturalSort ["v0.2" "v0.15" "v0.0.9"] + => [ "v0.0.9" "v0.2" "v0.15" ] + */ + naturalSort = lst: + let + vectorise = s: map (x: if isList x then toInt (head x) else x) (builtins.split "(0|[1-9][0-9]*)" s); + prepared = map (x: [ (vectorise x) x ]) lst; # remember vectorised version for O(n) regex splits + less = a: b: (compareLists compare (head a) (head b)) < 0; + in + map (x: elemAt x 1) (sort less prepared); + /* Return the first (at most) N elements of a list. Example: @@ -440,8 +485,12 @@ rec { init = list: assert list != []; take (length list - 1) list; - /* FIXME(zimbatm) Not used anywhere - */ + /* return the image of the cross product of some lists by a function + + Example: + crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]] + => [ "13" "14" "23" "24" ] + */ crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f]; diff --git a/lib/maintainers.nix b/lib/maintainers.nix deleted file mode 100644 index f050904896fcb07873ed8c284ae62ed38d9d6b66..0000000000000000000000000000000000000000 --- a/lib/maintainers.nix +++ /dev/null @@ -1,723 +0,0 @@ -{ ...}: -/* List of NixOS maintainers. The format is: - - handle = "Real Name "; - - where is preferred to be your GitHub username (so it's easy - to ping a package @), and is your real name, not - a pseudonym. Please keep the list alphabetically sorted. */ -{ - a1russell = "Adam Russell "; - aaronschif = "Aaron Schif "; - abaldeau = "Andreas Baldeau "; - abbradar = "Nikolay Amiantov "; - abigailbuccaneer = "Abigail Bunyan "; - aboseley = "Adam Boseley "; - abuibrahim = "Ruslan Babayev "; - acowley = "Anthony Cowley "; - adelbertc = "Adelbert Chang "; - adev = "Adrien Devresse "; - adisbladis = "Adam Hose "; - Adjective-Object = "Maxwell Huang-Hobbs "; - adnelson = "Allen Nelson "; - adolfogc = "Adolfo E. García Castro "; - aespinosa = "Allan Espinosa "; - aflatter = "Alexander Flatter "; - afldcr = "James Alexander Feldman-Crough "; - aforemny = "Alexander Foremny "; - afranchuk = "Alex Franchuk "; - aherrmann = "Andreas Herrmann "; - ahmedtd = "Taahir Ahmed "; - ak = "Alexander Kjeldaas "; - akaWolf = "Artjom Vejsel "; - akc = "Anders Claesson "; - alexvorobiev = "Alex Vorobiev "; - dezgeg = "Tuomas Tynkkynen "; - dfordivam = "Divam "; - dfoxfranke = "Daniel Fox Franke "; - dgonyeo = "Derek Gonyeo "; - dipinhora = "Dipin Hora "; - disassembler = "Samuel Leathers "; - dizfer = "David Izquierdo "; - dmalikov = "Dmitry Malikov "; - DmitryTsygankov = "Dmitry Tsygankov "; - dmjio = "David Johnson "; - dochang = "Desmond O. Chang "; - domenkozar = "Domen Kozar "; - dotlambda = "Robert Schütz "; - doublec = "Chris Double "; - dpaetzel = "David Pätzel "; - dpflug = "David Pflug "; - drets = "Dmytro Rets "; - drewkett = "Andrew Burkett "; - dsferruzza = "David Sferruzza "; - dtzWill = "Will Dietz "; - dupgit = "Olivier Delhomme "; - dywedir = "Vladyslav M. "; - e-user = "Alexander Kahl "; - earldouglas = "James Earl Douglas "; - ebzzry = "Rommel Martinez "; - edanaher = "Evan Danaher "; - edef = "edef "; - ederoyd46 = "Matthew Brown "; - eduarrrd = "Eduard Bachmakov "; - edwtjo = "Edward Tjörnhammar "; - eelco = "Eelco Dolstra "; - ehegnes = "Eric Hegnes "; - ehmry = "Emery Hemingway "; - eikek = "Eike Kettner "; - ekleog = "Leo Gaspard "; - elasticdog = "Aaron Bull Schaefer "; - eleanor = "Dejan Lukan "; - elijahcaine = "Elijah Caine "; - elitak = "Eric Litak "; - ellis = "Ellis Whitehead "; - eperuffo = "Emanuele Peruffo "; - epitrochoid = "Mabry Cervin "; - eqyiel = "Ruben Maher "; - ericbmerritt = "Eric Merritt "; - ericsagnes = "Eric Sagnes "; - erictapen = "Justin Humm "; - erikryb = "Erik Rybakken "; - ertes = "Ertugrul Söylemez "; - ethercrow = "Dmitry Ivanov "; - etu = "Elis Hirwing "; - exi = "Reno Reckling "; - exlevan = "Alexey Levan "; - expipiplus1 = "Joe Hermaszewski "; - fadenb = "Tristan Helmich "; - falsifian = "James Cook "; - fare = "Francois-Rene Rideau "; - fgaz = "Francesco Gazzetta "; - FireyFly = "Jonas Höglund "; - flokli = "Florian Klink "; - florianjacob = "Florian Jacob "; - flosse = "Markus Kohlhase "; - fluffynukeit = "Daniel Austin "; - fmthoma = "Franz Thoma "; - forkk = "Andrew Okin "; - fornever = "Friedrich von Never "; - fpletz = "Franz Pletz "; - fps = "Florian Paul Schmidt "; - fridh = "Frederik Rietdijk "; - frlan = "Frank Lanitz "; - fro_ozen = "fro_ozen "; - ftrvxmtrx = "Siarhei Zirukin "; - funfunctor = "Edward O'Callaghan "; - fuuzetsu = "Mateusz Kowalczyk "; - fuzzy-id = "Thomas Bach "; - fxfactorial = "Edgar Aroutiounian "; - gabesoft = "Gabriel Adomnicai "; - gal_bolle = "Florent Becker "; - garbas = "Rok Garbas "; - garrison = "Jim Garrison "; - gavin = "Gavin Rogers "; - gebner = "Gabriel Ebner "; - geistesk = "Alvar Penning "; - georgewhewell = "George Whewell "; - gilligan = "Tobias Pflug "; - giogadi = "Luis G. Torres "; - gleber = "Gleb Peregud "; - glenns = "Glenn Searby "; - globin = "Robin Gloster "; - gnidorah = "Alex Ivanov "; - goibhniu = "Cillian de Róiste "; - Gonzih = "Max Gonzih "; - goodrone = "Andrew Trachenko "; - gpyh = "Yacine Hmito "; - grahamc = "Graham Christensen "; - grburst = "Julius Elias "; - gridaphobe = "Eric Seidel "; - guibert = "David Guibert "; - guibou = "Guillaume Bouchard "; - guillaumekoenig = "Guillaume Koenig "; - guyonvarch = "Joris Guyonvarch "; - hakuch = "Jesse Haber-Kucharsky "; - hamhut1066 = "Hamish Hutchings "; - havvy = "Ryan Scheel "; - hbunke = "Hendrik Bunke "; - hce = "Hans-Christian Esperer "; - hectorj = "Hector Jusforgues "; - hedning = "Tor Hedin Brønner "; - heel = "Sergii Paryzhskyi "; - henrytill = "Henry Till "; - hhm = "hhm "; - hinton = "Tom Hinton "; - hodapp = "Chris Hodapp "; - hrdinka = "Christoph Hrdinka "; - htr = "Hugo Tavares Reis "; - iand675 = "Ian Duncan "; - ianwookim = "Ian-Woo Kim "; - iblech = "Ingo Blechschmidt "; - igsha = "Igor Sharonov "; - ikervagyok = "Balázs Lengyel "; - infinisil = "Silvan Mosberger "; - ironpinguin = "Michele Catalano "; - ivan-tkatchev = "Ivan Tkatchev "; - ixmatus = "Parnell Springmeyer "; - j-keck = "Jürgen Keck "; - jagajaga = "Arseniy Seroka "; - jammerful = "jammerful "; - jansol = "Jan Solanti "; - javaguirre = "Javier Aguirre "; - jb55 = "William Casarin "; - jbedo = "Justin Bedő "; - jcumming = "Jack Cummings "; - jdagilliland = "Jason Gilliland "; - jefdaj = "Jeffrey David Johnson "; - jensbin = "Jens Binkert "; - jerith666 = "Matt McHenry "; - jfb = "James Felix Black "; - jfrankenau = "Johannes Frankenau "; - jgeerds = "Jascha Geerds "; - jgertm = "Tim Jaeger "; - jgillich = "Jakob Gillich "; - jhhuh = "Ji-Haeng Huh "; - jirkamarsik = "Jirka Marsik "; - jlesquembre = "José Luis Lafuente "; - jluttine = "Jaakko Luttinen "; - joachifm = "Joachim Fasting "; - joamaki = "Jussi Maki "; - joelmo = "Joel Moberg "; - joelteon = "Joel Taylor "; - johbo = "Johannes Bornhold "; - johnmh = "John M. Harris, Jr. "; - johnramsden = "John Ramsden "; - joko = "Ioannis Koutras "; - jonafato = "Jon Banafato "; - joncojonathan = "Jonathan Haddock "; - jpierre03 = "Jean-Pierre PRUNARET "; - jpotier = "Martin Potier "; - jraygauthier = "Raymond Gauthier "; - jtojnar = "Jan Tojnar "; - juliendehos = "Julien Dehos "; - jwiegley = "John Wiegley "; - jwilberding = "Jordan Wilberding "; - jyp = "Jean-Philippe Bernardy "; - jzellner = "Jeff Zellner "; - kaiha = "Kai Harries "; - kamilchm = "Kamil Chmielewski "; - kampfschlaefer = "Arnold Krille "; - karolchmist = "karolchmist "; - kentjames = "James Kent "(allow file-read* (literal \"/usr/bin/file\"))"; - -lib.sandbox.allowFileRead { - literal = [ "/usr/bin/file" ]; - subpath = [ "/usr/lib/system" ]; -} - # => "(allow file-read* (literal \"/usr/bin/file\") (subpath \"/usr/lib/system\"))" -*/ - -let - -sexp = tokens: "(" + builtins.concatStringsSep " " tokens + ")"; -generateFileList = files: - if builtins.isList files - then concatMapStringsSep " " (x: sexp [ "literal" ''"${x}"'' ]) files - else if builtins.isString files - then generateFileList [ files ] - else concatStringsSep " " ( - (map (x: sexp [ "literal" ''"${x}"'' ]) (files.literal or [])) ++ - (map (x: sexp [ "subpath" ''"${x}"'' ]) (files.subpath or [])) - ); -applyToFiles = f: act: files: f "${act} ${generateFileList files}"; -genActions = actionName: let - action = feature: sexp [ actionName feature ]; - self = { - "${actionName}" = action; - "${actionName}File" = applyToFiles action "file*"; - "${actionName}FileRead" = applyToFiles action "file-read*"; - "${actionName}FileReadMetadata" = applyToFiles action "file-read-metadata"; - "${actionName}DirectoryList" = self."${actionName}FileReadMetadata"; - "${actionName}FileWrite" = applyToFiles action "file-write*"; - "${actionName}FileWriteMetadata" = applyToFiles action "file-write-metadata"; - }; - in self; - -in - -genActions "allow" // genActions "deny" // { - importProfile = derivation: '' - (import "${derivation}") - ''; -} diff --git a/lib/sources.nix b/lib/sources.nix index 0fd56d58ddd2d6150486db9bd926367c54948f04..704711b20cd9492b3cead39b0f73f6d86fe682cb 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -26,14 +26,35 @@ rec { (type == "symlink" && lib.hasPrefix "result" baseName) ); - cleanSource = builtins.filterSource cleanSourceFilter; + cleanSource = src: cleanSourceWith { filter = cleanSourceFilter; inherit src; }; + + # Like `builtins.filterSource`, except it will compose with itself, + # allowing you to chain multiple calls together without any + # intermediate copies being put in the nix store. + # + # lib.cleanSourceWith f (lib.cleanSourceWith g ./.) # Succeeds! + # builtins.filterSource f (builtins.filterSource g ./.) # Fails! + cleanSourceWith = { filter, src }: + let + isFiltered = src ? _isLibCleanSourceWith; + origSrc = if isFiltered then src.origSrc else src; + filter' = if isFiltered then name: type: filter name type && src.filter name type else filter; + in { + inherit origSrc; + filter = filter'; + outPath = builtins.filterSource filter' origSrc; + _isLibCleanSourceWith = true; + }; # Filter sources by a list of regular expressions. # # E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]` - sourceByRegex = src: regexes: builtins.filterSource (path: type: - let relPath = lib.removePrefix (toString src + "/") (toString path); - in lib.any (re: builtins.match re relPath != null) regexes) src; + sourceByRegex = src: regexes: cleanSourceWith { + filter = (path: type: + let relPath = lib.removePrefix (toString src + "/") (toString path); + in lib.any (re: builtins.match re relPath != null) regexes); + inherit src; + }; # Get all files ending with the specified suffices from the given # directory or its descendants. E.g. `sourceFilesBySuffices ./dir @@ -42,7 +63,7 @@ rec { let filter = name: type: let base = baseNameOf (toString name); in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts; - in builtins.filterSource filter path; + in cleanSourceWith { inherit filter; src = path; }; # Get the commit id of a git repo @@ -72,4 +93,8 @@ rec { else lib.head matchRef else throw ("Not a .git directory: " + path); in lib.flip readCommitFromFile "HEAD"; + + pathHasContext = builtins.hasContext or (lib.hasPrefix builtins.storeDir); + + canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src)); } diff --git a/lib/strings.nix b/lib/strings.nix index aca9ef45e615ddfb5e9eb11c50d31fb23692aa01..e6df7d99cb2e196c15eafa509a27c0de0a0c8b52 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -219,6 +219,14 @@ rec { */ escapeShellArgs = concatMapStringsSep " " escapeShellArg; + /* Turn a string into a Nix expression representing that string + + Example: + escapeNixString "hello\${}\n" + => "\"hello\\\${}\\n\"" + */ + escapeNixString = s: escape ["$"] (builtins.toJSON s); + /* Obsolete - use replaceStrings instead. */ replaceChars = builtins.replaceStrings or ( del: new: s: @@ -429,6 +437,13 @@ rec { */ fixedWidthNumber = width: n: fixedWidthString width "0" (toString n); + /* Check whether a value can be coerced to a string */ + isCoercibleToString = x: + builtins.elem (builtins.typeOf x) [ "path" "string" "null" "int" "float" "bool" ] || + (builtins.isList x && lib.all isCoercibleToString x) || + x ? outPath || + x ? __toString; + /* Check whether a value is a store path. Example: @@ -442,7 +457,7 @@ rec { => false */ isStorePath = x: - builtins.isString x + isCoercibleToString x && builtins.substring 0 1 (toString x) == "/" && dirOf (builtins.toPath x) == builtins.storeDir; diff --git a/lib/systems/default.nix b/lib/systems/default.nix index b1036b80c4dba960b28ad79ed761e682dc4d39be..e7346a538d358c3e635666172d6be4e51af24f27 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -3,6 +3,7 @@ rec { doubles = import ./doubles.nix { inherit lib; }; + forMeta = import ./for-meta.nix { inherit lib; }; parse = import ./parse.nix { inherit lib; }; inspect = import ./inspect.nix { inherit lib; }; platforms = import ./platforms.nix { inherit lib; }; @@ -23,12 +24,15 @@ rec { config = parse.tripleFromSystem final.parsed; # Just a guess, based on `system` platform = platforms.selectBySystem final.system; + # Derived meta-data libc = - /**/ if final.isDarwin then "libSystem" - else if final.isMinGW then "msvcrt" - else if final.isLinux then "glibc" + /**/ if final.isDarwin then "libSystem" + else if final.isMinGW then "msvcrt" + else if final.isMusl then "musl" + else if final.isAndroid then "bionic" + else if final.isLinux /* default */ then "glibc" # TODO(@Ericson2314) think more about other operating systems - else "native/impure"; + else "native/impure"; extensions = { sharedLibrary = /**/ if final.isDarwin then ".dylib" @@ -38,7 +42,12 @@ rec { /**/ if final.isWindows then ".exe" else ""; }; + # Misc boolean options + useAndroidPrebuilt = false; + useiOSPrebuilt = false; + isiPhoneSimulator = false; } // mapAttrs (n: v: v final.parsed) inspect.predicates // args; - in final; + in assert final.useAndroidPrebuilt -> final.isAndroid; + final; } diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 0cae8ec56fdf626ba9f6927395cc3bc0c662beb7..012a1786a3ccb44096f86f85e45591194919890c 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -1,15 +1,15 @@ { lib }: let inherit (lib) lists; - parse = import ./parse.nix { inherit lib; }; - inherit (import ./inspect.nix { inherit lib; }) predicates; + inherit (lib.systems) parse; + inherit (lib.systems.inspect) predicates; inherit (lib.attrsets) matchAttrs; all = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" - "mips64el-linux" + "mipsel-linux" "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd" @@ -24,19 +24,20 @@ let in rec { inherit all; - allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; none = []; arm = filterDoubles predicates.isArm; + aarch64 = filterDoubles predicates.isAarch64; + x86 = filterDoubles predicates.isx86; i686 = filterDoubles predicates.isi686; - mips = filterDoubles predicates.isMips; x86_64 = filterDoubles predicates.isx86_64; + mips = filterDoubles predicates.isMips; 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; }); + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); illumos = filterDoubles predicates.isSunOS; linux = filterDoubles predicates.isLinux; netbsd = filterDoubles predicates.isNetBSD; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ff2273febcb03e3299cf5926c1a66d08166247f7..848737700b0bc5fdd45605be3679acb33f79eeb4 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -11,84 +11,78 @@ rec { 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; + }; + + aarch64-android-prebuilt = rec { + config = "aarch64-unknown-linux-android"; + arch = "aarch64"; + platform = platforms.aarch64-multiplatform; + useAndroidPrebuilt = true; }; scaleway-c1 = armv7l-hf-multiplatform // rec { platform = platforms.scaleway-c1; - inherit (platform) gcc; - inherit (gcc) fpu; + inherit (platform.gcc) fpu; }; pogoplug4 = rec { arch = "armv5tel"; - config = "armv5tel-softfloat-linux-gnueabi"; + config = "armv5tel-unknown-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; + config = "mipsel-unknown-linux-gnu"; arch = "mips"; float = "hard"; - withTLS = true; - libc = "glibc"; platform = platforms.fuloong2f_n32; - openssl.system = "linux-generic32"; - inherit (platform) gcc; }; + muslpi = raspberryPi // { + config = "armv6l-unknown-linux-musleabihf"; + }; + + aarch64-multiplatform-musl = aarch64-multiplatform // { + config = "aarch64-unknown-linux-musl"; + }; + + musl64 = { config = "x86_64-unknown-linux-musl"; }; + musl32 = { config = "i686-unknown-linux-musl"; }; + + riscv = bits: { + config = "riscv${bits}-unknown-linux-gnu"; + platform = platforms.riscv-multiplatform bits; + }; + riscv64 = riscv "64"; + riscv32 = riscv "32"; + + # # Darwin # diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix new file mode 100644 index 0000000000000000000000000000000000000000..43c0195c3f18a8addab01195a4b76b76b2603586 --- /dev/null +++ b/lib/systems/for-meta.nix @@ -0,0 +1,31 @@ +{ lib }: +let + inherit (lib.systems) parse; + inherit (lib.systems.inspect) patterns; + +in rec { + all = [ {} ]; # `{}` matches anything + none = []; + + arm = [ patterns.isArm ]; + aarch64 = [ patterns.isAarch64 ]; + x86 = [ patterns.isx86 ]; + i686 = [ patterns.isi686 ]; + x86_64 = [ patterns.isx86_64 ]; + mips = [ patterns.isMips ]; + riscv = [ patterns.isRiscV ]; + + cygwin = [ patterns.isCygwin ]; + darwin = [ patterns.isDarwin ]; + freebsd = [ patterns.isFreeBSD ]; + # Should be better, but MinGW is unclear, and HURD is bit-rotted. + gnu = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ]; + illumos = [ patterns.isSunOS ]; + linux = [ patterns.isLinux ]; + netbsd = [ patterns.isNetBSD ]; + openbsd = [ patterns.isOpenBSD ]; + unix = patterns.isUnix; # Actually a list + windows = [ patterns.isWindows ]; + + inherit (lib.systems.doubles) mesaPlatforms; +} diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index a4fa9af4e0a81cfbfdc310faf07e4c7330d16912..d7fabf684b72d521a87293d8c5feab60abd8e708 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -5,38 +5,47 @@ with lib.lists; 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"; }; }; - Aarch64 = { cpu = { family = "aarch64"; }; }; - 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; }; + isi686 = { cpu = cpuTypes.i686; }; + isx86_64 = { cpu = cpuTypes.x86_64; }; + isPowerPC = { cpu = cpuTypes.powerpc; }; + isx86 = { cpu = { family = "x86"; }; }; + isArm = { cpu = { family = "arm"; }; }; + isAarch64 = { cpu = { family = "aarch64"; }; }; + isMips = { cpu = { family = "mips"; }; }; + isRiscV = { cpu = { family = "riscv"; }; }; + isWasm = { cpu = { family = "wasm"; }; }; + + is32bit = { cpu = { bits = 32; }; }; + is64bit = { cpu = { bits = 64; }; }; + isBigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; }; + isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; }; + + isBSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; }; + isDarwin = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; }; + isUnix = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ]; + + isMacOS = { kernel = kernels.macos; }; + isiOS = { kernel = kernels.ios; }; + isLinux = { kernel = kernels.linux; }; + isSunOS = { kernel = kernels.solaris; }; + isFreeBSD = { kernel = kernels.freebsd; }; + isHurd = { kernel = kernels.hurd; }; + isNetBSD = { kernel = kernels.netbsd; }; + isOpenBSD = { kernel = kernels.openbsd; }; + isWindows = { kernel = kernels.windows; }; + isCygwin = { kernel = kernels.windows; abi = abis.cygnus; }; + isMinGW = { kernel = kernels.windows; abi = abis.gnu; }; + + isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; + isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; + + isEfi = map (family: { cpu.family = family; }) + [ "x86" "arm" "aarch64" ]; }; 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; + predicates = mapAttrs (_: matchAnyAttrs) patterns; } diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index d14ca04bfb9eead20fccf8638f14abf4b2cb5704..381108d76fe286e484b4eceba6b531b7bdda717c 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -4,6 +4,16 @@ # 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. +# +# Most of the types below come in "open" and "closed" pairs. The open ones +# specify what information we need to know about systems in general, and the +# closed ones are sub-types representing the whitelist of systems we support in +# practice. +# +# Code in the remainder of nixpkgs shouldn't rely on the closed ones in +# e.g. exhaustive cases. Its more a sanity check to make sure nobody defines +# systems that overlap with existing ones and won't notice something amiss. +# { lib }: with lib.lists; with lib.types; @@ -11,29 +21,52 @@ with lib.attrsets; with (import ./inspect.nix { inherit lib; }).predicates; let - setTypesAssert = type: pred: + inherit (lib.options) mergeOneOption; + + setTypes = type: mapAttrs (name: value: - assert pred value; - setType type ({ inherit name; } // value)); - setTypes = type: setTypesAssert type (_: true); + assert type.check value; + setType type.name ({ inherit name; } // value)); in rec { - isSignificantByte = isType "significant-byte"; - significantBytes = setTypes "significant-byte" { + ################################################################################ + + types.openSignificantByte = mkOptionType { + name = "significant-byte"; + description = "Endianness"; + merge = mergeOneOption; + }; + + types.significantByte = enum (attrValues significantBytes); + + significantBytes = setTypes types.openSignificantByte { 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))) - { + ################################################################################ + + # Reasonable power of 2 + types.bitWidth = enum [ 8 16 32 64 128 ]; + + ################################################################################ + + types.openCpuType = mkOptionType { + name = "cpu-type"; + description = "instruction set architecture name and information"; + merge = mergeOneOption; + check = x: types.bitWidth.check x.bits + && (if 8 < x.bits + then types.significantByte.check x.significantByte + else !(x ? significantByte)); + }; + + types.cpuType = enum (attrValues cpuTypes); + + cpuTypes = with significantBytes; setTypes types.openCpuType { arm = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; @@ -42,20 +75,45 @@ rec { aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; }; i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; - mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; + mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; + mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; + riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; }; + riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; + wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; }; + wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; }; + }; + + ################################################################################ + + types.openVendor = mkOptionType { + name = "vendor"; + description = "vendor for the platform"; + merge = mergeOneOption; }; - isVendor = isType "vendor"; - vendors = setTypes "vendor" { + types.vendor = enum (attrValues vendors); + + vendors = setTypes types.openVendor { apple = {}; pc = {}; unknown = {}; }; - isExecFormat = isType "exec-format"; - execFormats = setTypes "exec-format" { + ################################################################################ + + types.openExecFormat = mkOptionType { + name = "exec-format"; + description = "executable container used by the kernel"; + merge = mergeOneOption; + }; + + types.execFormat = enum (attrValues execFormats); + + execFormats = setTypes types.openExecFormat { aout = {}; # a.out elf = {}; macho = {}; @@ -64,16 +122,38 @@ rec { unknown = {}; }; - isKernelFamily = isType "kernel-family"; - kernelFamilies = setTypes "kernel-family" { + ################################################################################ + + types.openKernelFamily = mkOptionType { + name = "exec-format"; + description = "executable container used by the kernel"; + merge = mergeOneOption; + }; + + types.kernelFamily = enum (attrValues kernelFamilies); + + kernelFamilies = setTypes types.openKernelFamily { bsd = {}; + darwin = {}; }; - 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 = { }; }; + ################################################################################ + + types.openKernel = mkOptionType { + name = "kernel"; + description = "kernel name and information"; + merge = mergeOneOption; + check = x: types.execFormat.check x.execFormat + && all types.kernelFamily.check (attrValues x.families); + }; + + types.kernel = enum (attrValues kernels); + + kernels = with execFormats; with kernelFamilies; setTypes types.openKernel { + # TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as + # the nnormalized name for macOS. + macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; }; + ios = { execFormat = macho; families = { inherit darwin; }; }; freebsd = { execFormat = elf; families = { inherit bsd; }; }; hurd = { execFormat = elf; families = { }; }; linux = { execFormat = elf; families = { }; }; @@ -83,14 +163,28 @@ rec { solaris = { execFormat = elf; families = { }; }; windows = { execFormat = pe; families = { }; }; } // { # aliases + # 'darwin' is the kernel for all of them. We choose macOS by default. + darwin = kernels.macos; # TODO(@Ericson2314): Handle these Darwin version suffixes more generally. - darwin10 = kernels.darwin; - darwin14 = kernels.darwin; + darwin10 = kernels.macos; + darwin14 = kernels.macos; + watchos = kernels.ios; + tvos = kernels.ios; win32 = kernels.windows; }; - isAbi = isType "abi"; - abis = setTypes "abi" { + ################################################################################ + + types.openAbi = mkOptionType { + name = "abi"; + description = "binary interface for compiled code and syscalls"; + merge = mergeOneOption; + }; + + types.abi = enum (attrValues abis); + + abis = setTypes types.openAbi { + android = {}; cygnus = {}; gnu = {}; msvc = {}; @@ -98,16 +192,31 @@ rec { androideabi = {}; gnueabi = {}; gnueabihf = {}; + musleabi = {}; + musleabihf = {}; + musl = {}; unknown = {}; }; + ################################################################################ + + types.parsedPlatform = mkOptionType { + name = "system"; + description = "fully parsed representation of llvm- or nix-style platform tuple"; + merge = mergeOneOption; + check = { cpu, vendor, kernel, abi }: + types.cpuType.check cpu + && types.vendor.check vendor + && types.kernel.check kernel + && types.abi.check abi; + }; + isSystem = isType "system"; - mkSystem = { cpu, vendor, kernel, abi }: - assert isCpuType cpu && isVendor vendor && isKernel kernel && isAbi abi; - setType "system" { - inherit cpu vendor kernel abi; - }; + + mkSystem = components: + assert types.parsedPlatform.check components; + setType "system" components; mkSkeletonFromList = l: { "2" = # We only do 2-part hacks for things Nix already supports @@ -162,12 +271,14 @@ rec { mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s)); doubleFromSystem = { cpu, vendor, kernel, abi, ... }: - if abi == abis.cygnus - then "${cpu.name}-cygwin" + /**/ if abi == abis.cygnus then "${cpu.name}-cygwin" + else if kernel.families ? darwin then "${cpu.name}-darwin" 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 index fd43ceaa0df2df404ca255e59e4de34bb69e8289..f39e890fbf1c968cfcfb5a95df1fdf05f623a83f 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -2,7 +2,6 @@ rec { pcBase = { name = "pc"; - kernelHeadersBaseConfig = "defconfig"; kernelBaseConfig = "defconfig"; # Build whatever possible as a module, if not stated in the extra config. kernelAutoModules = true; @@ -30,7 +29,6 @@ rec { }; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v5_defconfig"; kernelBaseConfig = "multi_v5_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -54,7 +52,6 @@ rec { sheevaplug = { name = "sheevaplug"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v5_defconfig"; kernelBaseConfig = "multi_v5_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -168,7 +165,6 @@ rec { raspberrypi = { name = "raspberrypi"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "bcm2835_defconfig"; kernelBaseConfig = "bcmrpi_defconfig"; kernelDTB = true; kernelArch = "arm"; @@ -347,7 +343,6 @@ rec { utilite = { name = "utilite"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v7_defconfig"; kernelBaseConfig = "multi_v7_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -379,13 +374,11 @@ rec { # 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; @@ -471,7 +464,6 @@ rec { 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; @@ -479,6 +471,11 @@ rec { kernelPreferBuiltin = true; kernelTarget = "zImage"; kernelExtraConfig = '' + # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig. + SERIAL_8250_BCM2835AUX y + SERIAL_8250_EXTENDED y + SERIAL_8250_SHARE_IRQ y + # Fix broken sunxi-sid nvmem driver. TI_CPTS y @@ -512,7 +509,6 @@ rec { 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; @@ -545,6 +541,19 @@ rec { }; }; + riscv-multiplatform = bits: { + name = "riscv-multiplatform"; + kernelArch = "riscv"; + bfdEmulation = "elf${bits}lriscv"; + kernelTarget = "vmlinux"; + kernelAutoModules = true; + kernelBaseConfig = "defconfig"; + kernelExtraConfig = '' + FTRACE n + SERIAL_OF_PLATFORM y + ''; + }; + selectBySystem = system: { "i686-linux" = pc32; "x86_64-linux" = pc64; @@ -552,6 +561,6 @@ rec { "armv6l-linux" = raspberrypi; "armv7l-linux" = armv7l-hf-multiplatform; "aarch64-linux" = aarch64-multiplatform; - "mips64el-linux" = fuloong2f_n32; + "mipsel-linux" = fuloong2f_n32; }.${system} or pcBase; } diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 4c4c06fe78dab537d6e25d82fe8e0eb8bc575c34..5f19dd63f2d86e815ab0bfbeb865884a633960f3 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -93,6 +93,7 @@ runTests { "${builtins.storeDir}/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11"; in { storePath = isStorePath goodPath; + storePathDerivation = isStorePath (import ../.. {}).hello; storePathAppendix = isStorePath "${goodPath}/bin/python"; nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath))); @@ -106,6 +107,7 @@ runTests { }; expected = { storePath = true; + storePathDerivation = true; storePathAppendix = false; nonAbsolute = false; asPath = true; @@ -201,10 +203,33 @@ runTests { # in alphabetical order testMkKeyValueDefault = { - expr = generators.mkKeyValueDefault ":" "f:oo" "bar"; + expr = generators.mkKeyValueDefault {} ":" "f:oo" "bar"; expected = ''f\:oo:bar''; }; + testMkValueString = { + expr = let + vals = { + int = 42; + string = ''fo"o''; + bool = true; + bool2 = false; + null = null; + # float = 42.23; # floats are strange + }; + in mapAttrs + (const (generators.mkValueStringDefault {})) + vals; + expected = { + int = "42"; + string = ''fo"o''; + bool = "true"; + bool2 = "false"; + null = "null"; + # float = "42.23" true false [ "bar" ] ]''; + }; + }; + testToKeyValue = { expr = generators.toKeyValue {} { key = "value"; @@ -247,6 +272,8 @@ runTests { "section 1" = { attribute1 = 5; x = "Me-se JarJar Binx"; + # booleans are converted verbatim by default + boolean = false; }; "foo[]" = { "he\\h=he" = "this is okay"; @@ -258,6 +285,7 @@ runTests { [section 1] attribute1=5 + boolean=false x=Me-se JarJar Binx ''; }; diff --git a/lib/tests/release.nix b/lib/tests/release.nix index a6184041682f01b9aef57507fc39a5bcb49eb417..d9a8a006725385216255aeac775bc38b9a02fb81 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -13,7 +13,6 @@ pkgs.stdenv.mkDerivation { export NIX_DB_DIR=$TEST_ROOT/db export NIX_LOCALSTATE_DIR=$TEST_ROOT/var export NIX_LOG_DIR=$TEST_ROOT/var/log/nix - export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests export NIX_STATE_DIR=$TEST_ROOT/var/nix export NIX_STORE_DIR=$TEST_ROOT/store export PAGER=cat @@ -21,7 +20,7 @@ pkgs.stdenv.mkDerivation { nix-store --init cd ${pkgs.path}/lib/tests - ./modules.sh + bash ./modules.sh [[ "$(nix-instantiate --eval --strict misc.nix)" == "[ ]" ]] diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 523fd3feb3b0cd5b3eed6f13bf94e789f537cd26..ffdd8ae929c86819057261f3bdd376ac80701e4f 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -16,7 +16,7 @@ in with lib.systems.doubles; lib.runTests { 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" ]); + mips = assertTrue (mseteq mips [ "mipsel-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" ]); @@ -24,7 +24,7 @@ in with lib.systems.doubles; lib.runTests { 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" ]); + linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-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 c452c7b65bc1639e074b0579fafb3651efc69103..a928e1dbca98c1249bb14e4ebe6574d681cd2c47 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -52,7 +52,7 @@ rec { # Pull in some builtins not included elsewhere. inherit (builtins) - pathExists readFile isBool isFunction + pathExists readFile isBool isInt add sub lessThan seq deepSeq genericClosure; @@ -81,6 +81,42 @@ rec { */ mod = base: int: base - (int * (builtins.div base int)); + /* C-style comparisons + + a < b, compare a b => -1 + a == b, compare a b => 0 + a > b, compare a b => 1 + */ + compare = a: b: + if a < b + then -1 + else if a > b + then 1 + else 0; + + /* Split type into two subtypes by predicate `p`, take all elements + of the first subtype to be less than all the elements of the + second subtype, compare elements of a single subtype with `yes` + and `no` respectively. + + Example: + + let cmp = splitByAndCompare (hasPrefix "foo") compare compare; in + + cmp "a" "z" => -1 + cmp "fooa" "fooz" => -1 + + cmp "f" "a" => 1 + cmp "fooa" "a" => -1 + # while + compare "fooa" "a" => 1 + + */ + splitByAndCompare = p: yes: no: a: b: + if p a + then if p b then yes a b else -1 + else if p b then 1 else no a b; + /* Reads a JSON file. */ importJSON = path: builtins.fromJSON (builtins.readFile path); @@ -99,4 +135,29 @@ rec { */ warn = msg: builtins.trace "WARNING: ${msg}"; info = msg: builtins.trace "INFO: ${msg}"; + + # | Add metadata about expected function arguments to a function. + # The metadata should match the format given by + # builtins.functionArgs, i.e. a set from expected argument to a bool + # representing whether that argument has a default or not. + # setFunctionArgs : (a → b) → Map String Bool → (a → b) + # + # This function is necessary because you can't dynamically create a + # function of the { a, b ? foo, ... }: format, but some facilities + # like callPackage expect to be able to query expected arguments. + setFunctionArgs = f: args: + { # TODO: Should we add call-time "type" checking like built in? + __functor = self: f; + __functionArgs = args; + }; + + # | Extract the expected function arguments from a function. + # This works both with nix-native { a, b ? foo, ... }: style + # functions and functions with args set with 'setFunctionArgs'. It + # has the same return type and semantics as builtins.functionArgs. + # setFunctionArgs : (a → b) → Map String Bool. + functionArgs = f: f.__functionArgs or (builtins.functionArgs f); + + isFunction = f: builtins.isFunction f || + (f ? __functor && isFunction (f.__functor f)); } diff --git a/lib/types.nix b/lib/types.nix index 46ed05d288f2e3ff2477fad7d0af2f5921384076..a334db5c7247b5ac4ea8ebc09693381f8b0386bc 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -174,6 +174,13 @@ rec { merge = mergeOneOption; }; + strMatching = pattern: mkOptionType { + name = "strMatching ${escapeNixString pattern}"; + description = "string matching the pattern ${pattern}"; + check = x: str.check x && builtins.match pattern x != null; + inherit (str) merge; + }; + # Merge multiple definitions by concatenating them (with the given # separator between the values). separatedString = sep: mkOptionType rec { @@ -249,6 +256,10 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; + nonEmptyListOf = elemType: + let list = addCheck (types.listOf elemType) (l: l != []); + in list // { description = "non-empty " + list.description; }; + attrsOf = elemType: mkOptionType rec { name = "attrsOf"; description = "attribute set of ${elemType.description}s"; diff --git a/lib/versions.nix b/lib/versions.nix new file mode 100644 index 0000000000000000000000000000000000000000..8f7f98ff5e1e1cdafb1a463ce96a7159c4742be1 --- /dev/null +++ b/lib/versions.nix @@ -0,0 +1,47 @@ +/* Version string functions. */ +{ lib }: + +let + + splitVersion = builtins.splitVersion or (lib.splitString "."); + +in + +rec { + + /* Get the major version string from a string. + + Example: + major "1.2.3" + => "1" + */ + major = v: builtins.elemAt (splitVersion v) 0; + + /* Get the minor version string from a string. + + Example: + minor "1.2.3" + => "2" + */ + minor = v: builtins.elemAt (splitVersion v) 1; + + /* Get the patch version string from a string. + + Example: + patch "1.2.3" + => "3" + */ + patch = v: builtins.elemAt (splitVersion v) 2; + + /* Get string of the first two parts (major and minor) + of a version string. + + Example: + majorMinor "1.2.3" + => "1.2" + */ + majorMinor = v: + builtins.concatStringsSep "." + (lib.take 2 (splitVersion v)); + +} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix new file mode 100644 index 0000000000000000000000000000000000000000..e6a89f93acc5dc0cabbe0a77e6e10f7182b80636 --- /dev/null +++ b/maintainers/maintainer-list.nix @@ -0,0 +1,4163 @@ +/* List of NixOS maintainers. + + handle = { + name = "Real name"; + email = "address@example.org"; + github = "GithubUsername"; + }; + + where `name` is your real name, `email` is your maintainer email + address and `github` is your GitHub handle (as it appears in the + URL of your profile page, `https://github.com/`). + address + The only required fields are `name` and `email`. + More fields may be added in the future. + + Please keep the list alphabetically sorted. + See `../maintainers/scripts/check-maintainer-github-handles.sh` + for an example on how to work with this data. + */ +{ + Adjective-Object = { + email = "mhuan13@gmail.com"; + github = "Adjective-Object"; + name = "Maxwell Huang-Hobbs"; + }; + AndersonTorres = { + email = "torres.anderson.85@gmail.com"; + github = "AndersonTorres"; + name = "Anderson Torres"; + }; + Baughn = { + email = "sveina@gmail.com"; + github = "Baughn"; + name = "Svein Ove Aas"; + }; + ChengCat = { + email = "yu@cheng.cat"; + github = "ChengCat"; + name = "Yucheng Zhang"; + }; + CrystalGamma = { + email = "nixos@crystalgamma.de"; + github = "CrystalGamma"; + name = "Jona Stubbe"; + }; + DamienCassou = { + email = "damien@cassou.me"; + github = "DamienCassou"; + name = "Damien Cassou"; + }; + DerGuteMoritz = { + email = "moritz@twoticketsplease.de"; + github = "DerGuteMoritz"; + name = "Moritz Heidkamp"; + }; + DerTim1 = { + email = "tim.digel@active-group.de"; + github = "DerTim1"; + name = "Tim Digel"; + }; + DmitryTsygankov = { + email = "dmitry.tsygankov@gmail.com"; + github = "DmitryTsygankov"; + name = "Dmitry Tsygankov"; + }; + Esteth = { + email = "adam.copp@gmail.com"; + name = "Adam Copp"; + }; + FireyFly = { + email = "nix@firefly.nu"; + github = "FireyFly"; + name = "Jonas Höglund"; + }; + Fresheyeball = { + email = "fresheyeball@gmail.com"; + github = "fresheyeball"; + name = "Isaac Shapira"; + }; + Gonzih = { + email = "gonzih@gmail.com"; + github = "Gonzih"; + name = "Max Gonzih"; + }; + Jo = { + email = "0x4A6F@shackspace.de"; + name = "Joachim Ernst"; + }; + KibaFox = { + email = "kiba.fox@foxypossibilities.com"; + github = "KibaFox"; + name = "Kiba Fox"; + }; + MP2E = { + email = "MP2E@archlinux.us"; + github = "MP2E"; + name = "Cray Elliott"; + }; + Mogria = { + email = "m0gr14@gmail.com"; + github = "mogria"; + name = "Mogria"; + }; + MostAwesomeDude = { + email = "cds@corbinsimpson.com"; + github = "MostAwesomeDude"; + name = "Corbin Simpson"; + }; + Nate-Devv = { + email = "natedevv@gmail.com"; + name = "Nathan Moore"; + }; + NikolaMandic = { + email = "nikola@mandic.email"; + github = "NikolaMandic"; + name = "Ratko Mladic"; + }; + Phlogistique = { + email = "noe.rubinstein@gmail.com"; + github = "Phlogistique"; + name = "Noé Rubinstein"; + }; + Profpatsch = { + email = "mail@profpatsch.de"; + github = "Profpatsch"; + name = "Profpatsch"; + }; + roosemberth = { + email = "roosembert.palacios+nixpkgs@gmail.com"; + github = "roosemberth"; + name = "Roosembert (Roosemberth) Palacios"; + }; + SShrike = { + email = "severen@shrike.me"; + github = "severen"; + name = "Severen Redwood"; + }; + SeanZicari = { + email = "sean.zicari@gmail.com"; + github = "SeanZicari"; + name = "Sean Zicari"; + }; + StijnDW = { + email = "stekke@airmail.cc"; + github = "StijnDW"; + name = "Stijn DW"; + }; + StillerHarpo = { + email = "florianengel39@gmail.com"; + github = "StillerHarpo"; + name = "Florian Engel"; + }; + SuprDewd = { + email = "suprdewd@gmail.com"; + github = "SuprDewd"; + name = "Bjarki Ágúst Guðmundsson"; + }; + TealG = { + email = "~@Teal.Gr"; + github = "TealG"; + name = "Teal Gaure"; + }; + ThomasMader = { + email = "thomas.mader@gmail.com"; + github = "ThomasMader"; + name = "Thomas Mader"; + }; + Zimmi48 = { + email = "theo.zimmermann@univ-paris-diderot.fr"; + github = "Zimmi48"; + name = "Théo Zimmermann"; + }; + a1russell = { + email = "adamlr6+pub@gmail.com"; + github = "a1russell"; + name = "Adam Russell"; + }; + aaronschif = { + email = "aaronschif@gmail.com"; + github = "aaronschif"; + name = "Aaron Schif"; + }; + abaldeau = { + email = "andreas@baldeau.net"; + github = "baldo"; + name = "Andreas Baldeau"; + }; + abbradar = { + email = "ab@fmap.me"; + github = "abbradar"; + name = "Nikolay Amiantov"; + }; + abigailbuccaneer = { + email = "abigailbuccaneer@gmail.com"; + github = "abigailbuccaneer"; + name = "Abigail Bunyan"; + }; + aborsu = { + email = "a.borsu@gmail.com"; + github = "aborsu"; + name = "Augustin Borsu"; + }; + aboseley = { + email = "adam.boseley@gmail.com"; + github = "aboseley"; + name = "Adam Boseley"; + }; + abuibrahim = { + email = "ruslan@babayev.com"; + github = "abuibrahim"; + name = "Ruslan Babayev"; + }; + acowley = { + email = "acowley@gmail.com"; + github = "acowley"; + name = "Anthony Cowley"; + }; + adelbertc = { + email = "adelbertc@gmail.com"; + github = "adelbertc"; + name = "Adelbert Chang"; + }; + adev = { + email = "adev@adev.name"; + github = "adevress"; + name = "Adrien Devresse"; + }; + adisbladis = { + email = "adis@blad.is"; + github = "adisbladis"; + name = "Adam Hose"; + }; + adnelson = { + email = "ithinkican@gmail.com"; + github = "adnelson"; + name = "Allen Nelson"; + }; + adolfogc = { + email = "adolfo.garcia.cr@gmail.com"; + github = "adolfogc"; + name = "Adolfo E. García Castro"; + }; + aespinosa = { + email = "allan.espinosa@outlook.com"; + github = "aespinosa"; + name = "Allan Espinosa"; + }; + aflatter = { + email = "flatter@fastmail.fm"; + github = "aflatter"; + name = "Alexander Flatter"; + }; + afldcr = { + email = "alex@fldcr.com"; + github = "afldcr"; + name = "James Alexander Feldman-Crough"; + }; + aforemny = { + email = "alexanderforemny@googlemail.com"; + github = "aforemny"; + name = "Alexander Foremny"; + }; + afranchuk = { + email = "alex.franchuk@gmail.com"; + github = "afranchuk"; + name = "Alex Franchuk"; + }; + aherrmann = { + email = "andreash87@gmx.ch"; + github = "aherrmann"; + name = "Andreas Herrmann"; + }; + ahmedtd = { + email = "ahmed.taahir@gmail.com"; + github = "ahmedtd"; + name = "Taahir Ahmed"; + }; + aij = { + email = "aij+git@mrph.org"; + github = "aij"; + name = "Ivan Jager"; + }; + ajgrf = { + email = "a@ajgrf.com"; + github = "ajgrf"; + name = "Alex Griffin"; + }; + ak = { + email = "ak@formalprivacy.com"; + github = "alexanderkjeldaas"; + name = "Alexander Kjeldaas"; + }; + akaWolf = { + email = "akawolf0@gmail.com"; + github = "akaWolf"; + name = "Artjom Vejsel"; + }; + akc = { + email = "akc@akc.is"; + github = "akc"; + name = "Anders Claesson"; + }; + akru = { + email = "mail@akru.me"; + github = "akru"; + name = "Alexander Krupenkin "; + }; + alexchapman = { + name = "Alex Chapman"; + email = "alex@farfromthere.net"; + github = "AJChapman"; + }; + alexvorobiev = { + email = "alexander.vorobiev@gmail.com"; + github = "alexvorobiev"; + name = "Alex Vorobiev"; + }; + algorith = { + email = "dries_van_daele@telenet.be"; + name = "Dries Van Daele"; + }; + alibabzo = { + email = "alistair.bill@gmail.com"; + github = "alibabzo"; + name = "Alistair Bill"; + }; + all = { + email = "nix-commits@lists.science.uu.nl"; + name = "Nix Committers"; + }; + alunduil = { + email = "alunduil@alunduil.com"; + github = "alunduil"; + name = "Alex Brandt"; + }; + ambrop72 = { + email = "ambrop7@gmail.com"; + github = "ambrop72"; + name = "Ambroz Bizjak"; + }; + amiddelk = { + email = "amiddelk@gmail.com"; + github = "amiddelk"; + name = "Arie Middelkoop"; + }; + amiloradovsky = { + email = "miloradovsky@gmail.com"; + github = "amiloradovsky"; + name = "Andrew Miloradovsky"; + }; + aminechikhaoui = { + email = "amine.chikhaoui91@gmail.com"; + github = "AmineChikhaoui"; + name = "Amine Chikhaoui"; + }; + amorsillo = { + email = "andrew.morsillo@gmail.com"; + github = "AndrewMorsillo"; + name = "Andrew Morsillo"; + }; + anderspapitto = { + email = "anderspapitto@gmail.com"; + github = "anderspapitto"; + name = "Anders Papitto"; + }; + andir = { + email = "andreas@rammhold.de"; + github = "andir"; + name = "Andreas Rammhold"; + }; + andres = { + email = "ksnixos@andres-loeh.de"; + github = "kosmikus"; + name = "Andres Loeh"; + }; + andrestylianos = { + email = "andre.stylianos@gmail.com"; + github = "andrestylianos"; + name = "Andre S. Ramos"; + }; + andrew-d = { + email = "andrew@du.nham.ca"; + github = "andrew-d"; + name = "Andrew Dunham"; + }; + andrewrk = { + email = "superjoe30@gmail.com"; + github = "andrewrk"; + name = "Andrew Kelley"; + }; + andsild = { + email = "andsild@gmail.com"; + github = "andsild"; + name = "Anders Sildnes"; + }; + aneeshusa = { + email = "aneeshusa@gmail.com"; + github = "aneeshusa"; + name = "Aneesh Agrawal"; + }; + ankhers = { + email = "justin.k.wood@gmail.com"; + github = "ankhers"; + name = "Justin Wood"; + }; + antono = { + email = "self@antono.info"; + github = "antono"; + name = "Antono Vasiljev"; + }; + antonxy = { + email = "anton.schirg@posteo.de"; + github = "antonxy"; + name = "Anton Schirg"; + }; + apeschar = { + email = "albert@peschar.net"; + github = "apeschar"; + name = "Albert Peschar"; + }; + apeyroux = { + email = "alex@px.io"; + github = "apeyroux"; + name = "Alexandre Peyroux"; + }; + arcadio = { + email = "arc@well.ox.ac.uk"; + github = "arcadio"; + name = "Arcadio Rubio García"; + }; + ardumont = { + email = "eniotna.t@gmail.com"; + github = "ardumont"; + name = "Antoine R. Dumont"; + }; + aristid = { + email = "aristidb@gmail.com"; + github = "aristidb"; + name = "Aristid Breitkreuz"; + }; + arobyn = { + email = "shados@shados.net"; + github = "shados"; + name = "Alexei Robyn"; + }; + artuuge = { + email = "artuuge@gmail.com"; + github = "artuuge"; + name = "Artur E. Ruuge"; + }; + ashalkhakov = { + email = "artyom.shalkhakov@gmail.com"; + github = "ashalkhakov"; + name = "Artyom Shalkhakov"; + }; + ashgillman = { + email = "gillmanash@gmail.com"; + github = "ashgillman"; + name = "Ashley Gillman"; + }; + aske = { + email = "aske@fmap.me"; + github = "aske"; + name = "Kirill Boltaev"; + }; + asppsa = { + email = "asppsa@gmail.com"; + github = "asppsa"; + name = "Alastair Pharo"; + }; + astsmtl = { + email = "astsmtl@yandex.ru"; + github = "astsmtl"; + name = "Alexander Tsamutali"; + }; + asymmetric = { + email = "lorenzo@mailbox.org"; + github = "asymmetric"; + name = "Lorenzo Manacorda"; + }; + aszlig = { + email = "aszlig@nix.build"; + github = "aszlig"; + name = "aszlig"; + }; + auntie = { + email = "auntieNeo@gmail.com"; + github = "auntie"; + name = "Jonathan Glines"; + }; + avnik = { + email = "avn@avnik.info"; + github = "avnik"; + name = "Alexander V. Nikolaev"; + }; + aycanirican = { + email = "iricanaycan@gmail.com"; + github = "aycanirican"; + name = "Aycan iRiCAN"; + }; + babariviere = { + email = "babariviere@protonmail.com"; + github = "babariviere"; + name = "babariviere"; + }; + bachp = { + email = "pascal.bach@nextrem.ch"; + github = "bachp"; + name = "Pascal Bach"; + }; + backuitist = { + email = "biethb@gmail.com"; + github = "backuitist"; + name = "Bruno Bieth"; + }; + badi = { + email = "abdulwahidc@gmail.com"; + github = "badi"; + name = "Badi' Abdul-Wahid"; + }; + balajisivaraman = { + email = "sivaraman.balaji@gmail.com"; + name = "Balaji Sivaraman"; + }; + bandresen = { + email = "bandresen@gmail.com"; + github = "bandresen"; + name = "Benjamin Andresen"; + }; + barrucadu = { + email = "mike@barrucadu.co.uk"; + github = "barrucadu"; + name = "Michael Walker"; + }; + basvandijk = { + email = "v.dijk.bas@gmail.com"; + github = "basvandijk"; + name = "Bas van Dijk"; + }; + bcarrell = { + email = "brandoncarrell@gmail.com"; + github = "bcarrell"; + name = "Brandon Carrell"; + }; + bcdarwin = { + email = "bcdarwin@gmail.com"; + github = "bcdarwin"; + name = "Ben Darwin"; + }; + bdimcheff = { + email = "brandon@dimcheff.com"; + github = "bdimcheff"; + name = "Brandon Dimcheff"; + }; + bendlas = { + email = "herwig@bendlas.net"; + github = "bendlas"; + name = "Herwig Hochleitner"; + }; + benley = { + email = "benley@gmail.com"; + github = "benley"; + name = "Benjamin Staffin"; + }; + bennofs = { + email = "benno.fuenfstueck@gmail.com"; + github = "bennofs"; + name = "Benno Fünfstück"; + }; + benwbooth = { + email = "benwbooth@gmail.com"; + github = "benwbooth"; + name = "Ben Booth"; + }; + berce = { + email = "bert.moens@gmail.com"; + github = "berce"; + name = "Bert Moens"; + }; + berdario = { + email = "berdario@gmail.com"; + github = "berdario"; + name = "Dario Bertini"; + }; + bergey = { + email = "bergey@teallabs.org"; + github = "bergey"; + name = "Daniel Bergey"; + }; + bfortz = { + email = "bernard.fortz@gmail.com"; + github = "bfortz"; + name = "Bernard Fortz"; + }; + bgamari = { + email = "ben@smart-cactus.org"; + github = "bgamari"; + name = "Ben Gamari"; + }; + bhipple = { + email = "bhipple@protonmail.com"; + github = "bhipple"; + name = "Benjamin Hipple"; + }; + binarin = { + email = "binarin@binarin.ru"; + github = "binarin"; + name = "Alexey Lebedeff"; + }; + bjg = { + email = "bjg@gnu.org"; + name = "Brian Gough"; + }; + bjornfor = { + email = "bjorn.forsman@gmail.com"; + github = "bjornfor"; + name = "Bjørn Forsman"; + }; + bkchr = { + email = "nixos@kchr.de"; + github = "bkchr"; + name = "Bastian Köcher"; + }; + bluescreen303 = { + email = "mathijs@bluescreen303.nl"; + github = "bluescreen303"; + name = "Mathijs Kwik"; + }; + bobakker = { + email = "bobakk3r@gmail.com"; + github = "bobakker"; + name = "Bo Bakker"; + }; + bobvanderlinden = { + email = "bobvanderlinden@gmail.com"; + github = "bobvanderlinden"; + name = "Bob van der Linden"; + }; + bodil = { + email = "nix@bodil.org"; + github = "bodil"; + name = "Bodil Stokke"; + }; + boothead = { + email = "ben@perurbis.com"; + github = "boothead"; + name = "Ben Ford"; + }; + bosu = { + email = "boriss@gmail.com"; + github = "bosu"; + name = "Boris Sukholitko"; + }; + bradediger = { + email = "brad@bradediger.com"; + github = "bradediger"; + name = "Brad Ediger"; + }; + brainrape = { + email = "martonboros@gmail.com"; + github = "brainrape"; + name = "Marton Boros"; + }; + bramd = { + email = "bram@bramd.nl"; + github = "bramd"; + name = "Bram Duvigneau"; + }; + bstrik = { + email = "dutchman55@gmx.com"; + github = "bstrik"; + name = "Berno Strik"; + }; + bugworm = { + email = "bugworm@zoho.com"; + github = "bugworm"; + name = "Roman Gerasimenko"; + }; + bzizou = { + email = "Bruno@bzizou.net"; + github = "bzizou"; + name = "Bruno Bzeznik"; + }; + c0bw3b = { + email = "c0bw3b@gmail.com"; + github = "c0bw3b"; + name = "Renaud"; + }; + c0dehero = { + email = "codehero@nerdpol.ch"; + name = "CodeHero"; + }; + calbrecht = { + email = "christian.albrecht@mayflower.de"; + github = "calbrecht"; + name = "Christian Albrecht"; + }; + calvertvl = { + email = "calvertvl@gmail.com"; + github = "calvertvl"; + name = "Victor Calvert"; + }; + campadrenalin = { + email = "campadrenalin@gmail.com"; + github = "campadrenalin"; + name = "Philip Horger"; + }; + canndrew = { + email = "shum@canndrew.org"; + github = "canndrew"; + name = "Andrew Cann"; + }; + carlsverre = { + email = "accounts@carlsverre.com"; + github = "carlsverre"; + name = "Carl Sverre"; + }; + cartr = { + email = "carter.sande@duodecima.technology"; + github = "cartr"; + name = "Carter Sande"; + }; + casey = { + email = "casey@rodarmor.net"; + github = "casey"; + name = "Casey Rodarmor"; + }; + catern = { + email = "sbaugh@catern.com"; + github = "catern"; + name = "Spencer Baugh"; + }; + caugner = { + email = "nixos@caugner.de"; + github = "caugner"; + name = "Claas Augner"; + }; + cdepillabout = { + email = "cdep.illabout@gmail.com"; + github = "cdepillabout"; + name = "Dennis Gosnell"; + }; + cfouche = { + email = "chaddai.fouche@gmail.com"; + github = "Chaddai"; + name = "Chaddaï Fouché"; + }; + changlinli = { + email = "mail@changlinli.com"; + github = "changlinli"; + name = "Changlin Li"; + }; + chaoflow = { + email = "flo@chaoflow.net"; + github = "chaoflow"; + name = "Florian Friesdorf"; + }; + chattered = { + email = "me@philscotted.com"; + name = "Phil Scott"; + }; + chiiruno = { + email = "okinan@protonmail.com"; + github = "chiiruno"; + name = "Okina Matara"; + }; + choochootrain = { + email = "hurshal@imap.cc"; + github = "choochootrain"; + name = "Hurshal Patel"; + }; + chpatrick = { + email = "chpatrick@gmail.com"; + github = "chpatrick"; + name = "Patrick Chilton"; + }; + chreekat = { + email = "b@chreekat.net"; + github = "chreekat"; + name = "Bryan Richter"; + }; + chris-martin = { + email = "ch.martin@gmail.com"; + github = "chris-martin"; + name = "Chris Martin"; + }; + chrisjefferson = { + email = "chris@bubblescope.net"; + github = "chrisjefferson"; + name = "Christopher Jefferson"; + }; + chrisrosset = { + email = "chris@rosset.org.uk"; + github = "chrisrosset"; + name = "Christopher Rosset"; + }; + christopherpoole = { + email = "mail@christopherpoole.net"; + github = "christopherpoole"; + name = "Christopher Mark Poole"; + }; + ciil = { + email = "simon@lackerbauer.com"; + github = "ciil"; + name = "Simon Lackerbauer"; + }; + ck3d = { + email = "ck3d@gmx.de"; + github = "ck3d"; + name = "Christian Kögler"; + }; + ckampka = { + email = "christian@kampka.net"; + github = "kampka"; + name = "Christian Kampka"; + }; + ckauhaus = { + email = "kc@flyingcircus.io"; + github = "ckauhaus"; + name = "Christian Kauhaus"; + }; + cko = { + email = "christine.koppelt@gmail.com"; + github = "cko"; + name = "Christine Koppelt"; + }; + cleverca22 = { + email = "cleverca22@gmail.com"; + github = "cleverca22"; + name = "Michael Bishop"; + }; + cmcdragonkai = { + email = "roger.qiu@matrix.ai"; + github = "cmcdragonkai"; + name = "Roger Qiu"; + }; + cmfwyp = { + email = "cmfwyp@riseup.net"; + github = "cmfwyp"; + name = "cmfwyp"; + }; + cobbal = { + email = "andrew.cobb@gmail.com"; + github = "cobbal"; + name = "Andrew Cobb"; + }; + coconnor = { + email = "coreyoconnor@gmail.com"; + github = "coreyoconnor"; + name = "Corey O'Connor"; + }; + codsl = { + email = "codsl@riseup.net"; + github = "codsl"; + name = "codsl"; + }; + codyopel = { + email = "codyopel@gmail.com"; + github = "codyopel"; + name = "Cody Opel"; + }; + colemickens = { + email = "cole.mickens@gmail.com"; + github = "colemickens"; + name = "Cole Mickens"; + }; + colescott = { + email = "colescottsf@gmail.com"; + github = "colescott"; + name = "Cole Scott"; + }; + copumpkin = { + email = "pumpkingod@gmail.com"; + github = "copumpkin"; + name = "Dan Peebles"; + }; + corngood = { + email = "corngood@gmail.com"; + github = "corngood"; + name = "David McFarland"; + }; + coroa = { + email = "jonas@chaoflow.net"; + github = "coroa"; + name = "Jonas Hörsch"; + }; + couchemar = { + email = "couchemar@yandex.ru"; + github = "couchemar"; + name = "Andrey Pavlov"; + }; + cpages = { + email = "page@ruiec.cat"; + github = "cpages"; + name = "Carles Pagès"; + }; + cransom = { + email = "cransom@hubns.net"; + github = "cransom"; + name = "Casey Ransom"; + }; + cryptix = { + email = "cryptix@riseup.net"; + github = "cryptix"; + name = "Henry Bubert"; + }; + csingley = { + email = "csingley@gmail.com"; + github = "csingley"; + name = "Christopher Singley"; + }; + cstrahan = { + email = "charles@cstrahan.com"; + github = "cstrahan"; + name = "Charles Strahan"; + }; + cwoac = { + email = "oliver@codersoffortune.net"; + github = "cwoac"; + name = "Oliver Matthews"; + }; + danbst = { + email = "abcz2.uprola@gmail.com"; + github = "danbst"; + name = "Danylo Hlynskyi"; + }; + dancek = { + email = "hannu.hartikainen@gmail.com"; + github = "dancek"; + name = "Hannu Hartikainen"; + }; + danharaj = { + email = "dan@obsidian.systems"; + github = "danharaj"; + name = "Dan Haraj"; + }; + danielfullmer = { + email = "danielrf12@gmail.com"; + github = "danielfullmer"; + name = "Daniel Fullmer"; + }; + dasuxullebt = { + email = "christoph.senjak@googlemail.com"; + name = "Christoph-Simon Senjak"; + }; + david50407 = { + email = "me@davy.tw"; + github = "david50407"; + name = "David Kuo"; + }; + davidak = { + email = "post@davidak.de"; + github = "davidak"; + name = "David Kleuker"; + }; + davidrusu = { + email = "davidrusu.me@gmail.com"; + github = "davidrusu"; + name = "David Rusu"; + }; + davorb = { + email = "davor@davor.se"; + github = "davorb"; + name = "Davor Babic"; + }; + dbohdan = { + email = "danyil.bohdan@gmail.com"; + github = "dbohdan"; + name = "Danyil Bohdan"; + }; + dbrock = { + email = "daniel@brockman.se"; + github = "dbrock"; + name = "Daniel Brockman"; + }; + deepfire = { + email = "_deepfire@feelingofgreen.ru"; + github = "deepfire"; + name = "Kosyrev Serge"; + }; + demin-dmitriy = { + email = "demindf@gmail.com"; + github = "demin-dmitriy"; + name = "Dmitriy Demin"; + }; + derchris = { + email = "derchris@me.com"; + github = "derchrisuk"; + name = "Christian Gerbrandt"; + }; + dermetfan = { + email = "serverkorken@gmail.com"; + github = "dermetfan"; + name = "Robin Stumm"; + }; + desiderius = { + email = "didier@devroye.name"; + github = "desiderius"; + name = "Didier J. Devroye"; + }; + devhell = { + email = "\"^\"@regexmail.net"; + github = "devhell"; + name = "devhell"; + }; + dezgeg = { + email = "tuomas.tynkkynen@iki.fi"; + github = "dezgeg"; + name = "Tuomas Tynkkynen"; + }; + dfordivam = { + email = "dfordivam+nixpkgs@gmail.com"; + github = "dfordivam"; + name = "Divam"; + }; + dfoxfranke = { + email = "dfoxfranke@gmail.com"; + github = "dfoxfranke"; + name = "Daniel Fox Franke"; + }; + dgonyeo = { + email = "derek@gonyeo.com"; + github = "dgonyeo"; + name = "Derek Gonyeo"; + }; + dipinhora = { + email = "dipinhora+github@gmail.com"; + github = "dipinhora"; + name = "Dipin Hora"; + }; + disassembler = { + email = "disasm@gmail.com"; + github = "disassembler"; + name = "Samuel Leathers"; + }; + dizfer = { + email = "david@izquierdofernandez.com"; + github = "dizfer"; + name = "David Izquierdo"; + }; + dmalikov = { + email = "malikov.d.y@gmail.com"; + github = "dmalikov"; + name = "Dmitry Malikov"; + }; + dmjio = { + email = "djohnson.m@gmail.com"; + github = "dmjio"; + name = "David Johnson"; + }; + dochang = { + email = "dochang@gmail.com"; + github = "dochang"; + name = "Desmond O. Chang"; + }; + domenkozar = { + email = "domen@dev.si"; + github = "domenkozar"; + name = "Domen Kozar"; + }; + dotlambda = { + email = "rschuetz17@gmail.com"; + github = "dotlambda"; + name = "Robert Schütz"; + }; + doublec = { + email = "chris.double@double.co.nz"; + github = "doublec"; + name = "Chris Double"; + }; + dpaetzel = { + email = "david.a.paetzel@gmail.com"; + github = "dpaetzel"; + name = "David Pätzel"; + }; + dpflug = { + email = "david@pflug.email"; + github = "dpflug"; + name = "David Pflug"; + }; + drets = { + email = "dmitryrets@gmail.com"; + github = "drets"; + name = "Dmytro Rets"; + }; + drewkett = { + email = "burkett.andrew@gmail.com"; + name = "Andrew Burkett"; + }; + dsferruzza = { + email = "david.sferruzza@gmail.com"; + github = "dsferruzza"; + name = "David Sferruzza"; + }; + dtzWill = { + email = "nix@wdtz.org"; + github = "dtzWill"; + name = "Will Dietz"; + }; + dywedir = { + email = "dywedir@protonmail.ch"; + github = "dywedir"; + name = "Vladyslav M."; + }; + dzabraev = { + email = "dzabraew@gmail.com"; + github = "dzabraev"; + name = "Maksim Dzabraev"; + }; + e-user = { + email = "nixos@sodosopa.io"; + github = "e-user"; + name = "Alexander Kahl"; + }; + earldouglas = { + email = "james@earldouglas.com"; + github = "earldouglas"; + name = "James Earl Douglas"; + }; + earvstedt = { + email = "erik.arvstedt@gmail.com"; + github = "erikarvstedt"; + name = "Erik Arvstedt"; + }; + ebzzry = { + email = "ebzzry@ebzzry.io"; + github = "ebzzry"; + name = "Rommel Martinez"; + }; + edanaher = { + email = "nixos@edanaher.net"; + github = "edanaher"; + name = "Evan Danaher"; + }; + edef = { + email = "edef@edef.eu"; + github = "edef1c"; + name = "edef"; + }; + ederoyd46 = { + email = "matt@ederoyd.co.uk"; + github = "ederoyd46"; + name = "Matthew Brown"; + }; + eduarrrd = { + email = "e.bachmakov@gmail.com"; + github = "eduarrrd"; + name = "Eduard Bachmakov"; + }; + edwtjo = { + email = "ed@cflags.cc"; + github = "edwtjo"; + name = "Edward Tjörnhammar"; + }; + eelco = { + email = "eelco.dolstra@logicblox.com"; + github = "edolstra"; + name = "Eelco Dolstra"; + }; + ehegnes = { + email = "eric.hegnes@gmail.com"; + github = "ehegnes"; + name = "Eric Hegnes"; + }; + ehmry = { + email = "emery@vfemail.net"; + name = "Emery Hemingway"; + }; + eikek = { + email = "eike.kettner@posteo.de"; + github = "eikek"; + name = "Eike Kettner"; + }; + ekleog = { + email = "leo@gaspard.io"; + github = "ekleog"; + name = "Leo Gaspard"; + }; + elasticdog = { + email = "aaron@elasticdog.com"; + github = "elasticdog"; + name = "Aaron Bull Schaefer"; + }; + eleanor = { + email = "dejan@proteansec.com"; + github = "proteansec"; + name = "Dejan Lukan"; + }; + elijahcaine = { + email = "elijahcainemv@gmail.com"; + github = "pop"; + name = "Elijah Caine"; + }; + elitak = { + email = "elitak@gmail.com"; + github = "elitak"; + name = "Eric Litak"; + }; + ellis = { + email = "nixos@ellisw.net"; + github = "ellis"; + name = "Ellis Whitehead"; + }; + elvishjerricco = { + email = "elvishjerricco@gmail.com"; + github = "ElvishJerricco"; + name = "Will Fancher"; + }; + endgame = { + email = "jack@jackkelly.name"; + github = "endgame"; + name = "Jack Kelly"; + }; + enzime = { + email = "enzime@users.noreply.github.com"; + github = "enzime"; + name = "Michael Hoang"; + }; + eperuffo = { + email = "info@emanueleperuffo.com"; + github = "emanueleperuffo"; + name = "Emanuele Peruffo"; + }; + epitrochoid = { + email = "mpcervin@uncg.edu"; + name = "Mabry Cervin"; + }; + eqyiel = { + email = "r@rkm.id.au"; + github = "eqyiel"; + name = "Ruben Maher"; + }; + ericbmerritt = { + email = "eric@afiniate.com"; + github = "ericbmerritt"; + name = "Eric Merritt"; + }; + erosennin = { + email = "ag@sologoc.com"; + github = "erosennin"; + name = "Andrey Golovizin"; + }; + ericsagnes = { + email = "eric.sagnes@gmail.com"; + github = "ericsagnes"; + name = "Eric Sagnes"; + }; + ericson2314 = { + email = "John.Ericson@Obsidian.Systems"; + github = "ericson2314"; + name = "John Ericson"; + }; + erictapen = { + email = "justin.humm@posteo.de"; + github = "erictapen"; + name = "Justin Humm"; + }; + erikryb = { + email = "erik.rybakken@math.ntnu.no"; + github = "erikryb"; + name = "Erik Rybakken"; + }; + ertes = { + email = "esz@posteo.de"; + github = "ertes"; + name = "Ertugrul Söylemez"; + }; + ethercrow = { + email = "ethercrow@gmail.com"; + github = "ethercrow"; + name = "Dmitry Ivanov"; + }; + etu = { + email = "elis@hirwing.se"; + github = "etu"; + name = "Elis Hirwing"; + }; + exfalso = { + email = "0slemi0@gmail.com"; + github = "exfalso"; + name = "Andras Slemmer"; + }; + exi = { + email = "nixos@reckling.org"; + github = "exi"; + name = "Reno Reckling"; + }; + exlevan = { + email = "exlevan@gmail.com"; + github = "exlevan"; + name = "Alexey Levan"; + }; + expipiplus1 = { + email = "nix@monoid.al"; + github = "expipiplus1"; + name = "Joe Hermaszewski"; + }; + f-breidenstein = { + email = "mail@felixbreidenstein.de"; + github = "f-breidenstein"; + name = "Felix Breidenstein"; + }; + fadenb = { + email = "tristan.helmich+nixos@gmail.com"; + github = "fadenb"; + name = "Tristan Helmich"; + }; + falsifian = { + email = "james.cook@utoronto.ca"; + github = "falsifian"; + name = "James Cook"; + }; + fare = { + email = "fahree@gmail.com"; + github = "fare"; + name = "Francois-Rene Rideau"; + }; + fdns = { + email = "fdns02@gmail.com"; + github = "fdns"; + name = "Felipe Espinoza"; + }; + fgaz = { + email = "francygazz@gmail.com"; + github = "fgaz"; + name = "Francesco Gazzetta"; + }; + flokli = { + email = "flokli@flokli.de"; + github = "flokli"; + name = "Florian Klink"; + }; + florianjacob = { + email = "projects+nixos@florianjacob.de"; + github = "florianjacob"; + name = "Florian Jacob"; + }; + flosse = { + email = "mail@markus-kohlhase.de"; + github = "flosse"; + name = "Markus Kohlhase"; + }; + fluffynukeit = { + email = "dan@fluffynukeit.com"; + github = "fluffynukeit"; + name = "Daniel Austin"; + }; + fmthoma = { + email = "f.m.thoma@googlemail.com"; + github = "fmthoma"; + name = "Franz Thoma"; + }; + forkk = { + email = "forkk@forkk.net"; + github = "forkk"; + name = "Andrew Okin"; + }; + fornever = { + email = "friedrich@fornever.me"; + github = "fornever"; + name = "Friedrich von Never"; + }; + fpletz = { + email = "fpletz@fnordicwalking.de"; + github = "fpletz"; + name = "Franz Pletz"; + }; + fps = { + email = "mista.tapas@gmx.net"; + github = "fps"; + name = "Florian Paul Schmidt"; + }; + fridh = { + email = "fridh@fridh.nl"; + github = "fridh"; + name = "Frederik Rietdijk"; + }; + frlan = { + email = "frank@frank.uvena.de"; + github = "frlan"; + name = "Frank Lanitz"; + }; + fro_ozen = { + email = "fro_ozen@gmx.de"; + github = "froozen"; + name = "fro_ozen"; + }; + ftrvxmtrx = { + email = "ftrvxmtrx@gmail.com"; + github = "ftrvxmtrx"; + name = "Siarhei Zirukin"; + }; + funfunctor = { + email = "eocallaghan@alterapraxis.com"; + name = "Edward O'Callaghan"; + }; + fuuzetsu = { + email = "fuuzetsu@fuuzetsu.co.uk"; + github = "fuuzetsu"; + name = "Mateusz Kowalczyk"; + }; + fuzzy-id = { + email = "hacking+nixos@babibo.de"; + name = "Thomas Bach"; + }; + fxfactorial = { + email = "edgar.factorial@gmail.com"; + github = "fxfactorial"; + name = "Edgar Aroutiounian"; + }; + gabesoft = { + email = "gabesoft@gmail.com"; + github = "gabesoft"; + name = "Gabriel Adomnicai"; + }; + gal_bolle = { + email = "florent.becker@ens-lyon.org"; + github = "FlorentBecker"; + name = "Florent Becker"; + }; + garbas = { + email = "rok@garbas.si"; + github = "garbas"; + name = "Rok Garbas"; + }; + garrison = { + email = "jim@garrison.cc"; + github = "garrison"; + name = "Jim Garrison"; + }; + gavin = { + email = "gavin@praxeology.co.uk"; + github = "gavinrogers"; + name = "Gavin Rogers"; + }; + gebner = { + email = "gebner@gebner.org"; + github = "gebner"; + name = "Gabriel Ebner"; + }; + geistesk = { + email = "post@0x21.biz"; + github = "geistesk"; + name = "Alvar Penning"; + }; + genesis = { + email = "ronan@aimao.org"; + github = "bignaux"; + name = "Ronan Bignaux"; + }; + georgewhewell = { + email = "georgerw@gmail.com"; + github = "georgewhewell"; + name = "George Whewell"; + }; + gilligan = { + email = "tobias.pflug@gmail.com"; + github = "gilligan"; + name = "Tobias Pflug"; + }; + giogadi = { + email = "lgtorres42@gmail.com"; + github = "giogadi"; + name = "Luis G. Torres"; + }; + gleber = { + email = "gleber.p@gmail.com"; + github = "gleber"; + name = "Gleb Peregud"; + }; + glenns = { + email = "glenn.searby@gmail.com"; + github = "glenns"; + name = "Glenn Searby"; + }; + globin = { + email = "mail@glob.in"; + github = "globin"; + name = "Robin Gloster"; + }; + gnidorah = { + email = "yourbestfriend@opmbx.org"; + github = "gnidorah"; + name = "Alex Ivanov"; + }; + goibhniu = { + email = "cillian.deroiste@gmail.com"; + github = "cillianderoiste"; + name = "Cillian de Róiste"; + }; + goodrone = { + email = "goodrone@gmail.com"; + github = "goodrone"; + name = "Andrew Trachenko"; + }; + gpyh = { + email = "yacine.hmito@gmail.com"; + github = "yacinehmito"; + name = "Yacine Hmito"; + }; + grahamc = { + email = "graham@grahamc.com"; + github = "grahamc"; + name = "Graham Christensen"; + }; + grburst = { + email = "grburst@openmailbox.org"; + github = "grburst"; + name = "Julius Elias"; + }; + gridaphobe = { + email = "eric@seidel.io"; + github = "gridaphobe"; + name = "Eric Seidel"; + }; + guibert = { + email = "david.guibert@gmail.com"; + github = "dguibert"; + name = "David Guibert"; + }; + guibou = { + email = "guillaum.bouchard@gmail.com"; + github = "guibou"; + name = "Guillaume Bouchard"; + }; + guillaumekoenig = { + email = "guillaume.edward.koenig@gmail.com"; + github = "guillaumekoenig"; + name = "Guillaume Koenig"; + }; + guyonvarch = { + email = "joris@guyonvarch.me"; + github = "guyonvarch"; + name = "Joris Guyonvarch"; + }; + hakuch = { + email = "hakuch@gmail.com"; + github = "hakuch"; + name = "Jesse Haber-Kucharsky"; + }; + hamhut1066 = { + email = "github@hamhut1066.com"; + github = "hamhut1066"; + name = "Hamish Hutchings"; + }; + havvy = { + email = "ryan.havvy@gmail.com"; + github = "havvy"; + name = "Ryan Scheel"; + }; + hbunke = { + email = "bunke.hendrik@gmail.com"; + github = "hbunke"; + name = "Hendrik Bunke"; + }; + hce = { + email = "hc@hcesperer.org"; + github = "hce"; + name = "Hans-Christian Esperer"; + }; + hectorj = { + email = "hector.jusforgues+nixos@gmail.com"; + github = "hectorj"; + name = "Hector Jusforgues"; + }; + hedning = { + email = "torhedinbronner@gmail.com"; + github = "hedning"; + name = "Tor Hedin Brønner"; + }; + heel = { + email = "parizhskiy@gmail.com"; + github = "heel"; + name = "Sergii Paryzhskyi"; + }; + henrytill = { + email = "henrytill@gmail.com"; + github = "henrytill"; + name = "Henry Till"; + }; + hhm = { + email = "heehooman+nixpkgs@gmail.com"; + github = "hhm0"; + name = "hhm"; + }; + hinton = { + email = "t@larkery.com"; + name = "Tom Hinton"; + }; + hodapp = { + email = "hodapp87@gmail.com"; + github = "Hodapp87"; + name = "Chris Hodapp"; + }; + hrdinka = { + email = "c.nix@hrdinka.at"; + github = "hrdinka"; + name = "Christoph Hrdinka"; + }; + hschaeidt = { + email = "he.schaeidt@gmail.com"; + github = "hschaeidt"; + name = "Hendrik Schaeidt"; + }; + htr = { + email = "hugo@linux.com"; + github = "htr"; + name = "Hugo Tavares Reis"; + }; + hyphon81 = { + email = "zero812n@gmail.com"; + github = "hyphon81"; + name = "Masato Yonekawa"; + }; + iand675 = { + email = "ian@iankduncan.com"; + github = "iand675"; + name = "Ian Duncan"; + }; + ianwookim = { + email = "ianwookim@gmail.com"; + github = "wavewave"; + name = "Ian-Woo Kim"; + }; + iblech = { + email = "iblech@speicherleck.de"; + github = "iblech"; + name = "Ingo Blechschmidt"; + }; + idontgetoutmuch = { + email = "dominic@steinitz.org"; + github = "idontgetoutmuch"; + name = "Dominic Steinitz"; + }; + igsha = { + email = "igor.sharonov@gmail.com"; + github = "igsha"; + name = "Igor Sharonov"; + }; + ikervagyok = { + email = "ikervagyok@gmail.com"; + github = "ikervagyok"; + name = "Balázs Lengyel"; + }; + ilya-kolpakov = { + email = "ilya.kolpakov@gmail.com"; + github = "ilya-kolpakov"; + name = "Ilya Kolpakov"; + }; + infinisil = { + email = "infinisil@icloud.com"; + github = "infinisil"; + name = "Silvan Mosberger"; + }; + ironpinguin = { + email = "michele@catalano.de"; + github = "ironpinguin"; + name = "Michele Catalano"; + }; + ivan-tkatchev = { + email = "tkatchev@gmail.com"; + name = "Ivan Tkatchev"; + }; + ixmatus = { + email = "parnell@digitalmentat.com"; + github = "ixmatus"; + name = "Parnell Springmeyer"; + }; + ixxie = { + email = "matan@fluxcraft.net"; + github = "ixxie"; + name = "Matan Bendix Shenhav"; + }; + izorkin = { + email = "Izorkin@gmail.com"; + github = "izorkin"; + name = "Yurii Izorkin"; + }; + j-keck = { + email = "jhyphenkeck@gmail.com"; + github = "j-keck"; + name = "Jürgen Keck"; + }; + jagajaga = { + email = "ars.seroka@gmail.com"; + github = "jagajaga"; + name = "Arseniy Seroka"; + }; + jammerful = { + email = "jammerful@gmail.com"; + github = "jammerful"; + name = "jammerful"; + }; + jansol = { + email = "jan.solanti@paivola.fi"; + github = "jansol"; + name = "Jan Solanti"; + }; + javaguirre = { + email = "contacto@javaguirre.net"; + github = "javaguirre"; + name = "Javier Aguirre"; + }; + jb55 = { + email = "jb55@jb55.com"; + github = "jb55"; + name = "William Casarin"; + }; + jbedo = { + email = "cu@cua0.org"; + github = "jbedo"; + name = "Justin Bedő"; + }; + jcumming = { + email = "jack@mudshark.org"; + name = "Jack Cummings"; + }; + jdagilliland = { + email = "jdagilliland@gmail.com"; + github = "jdagilliland"; + name = "Jason Gilliland"; + }; + jefdaj = { + email = "jefdaj@gmail.com"; + github = "jefdaj"; + name = "Jeffrey David Johnson"; + }; + jensbin = { + email = "jensbin@protonmail.com"; + github = "jensbin"; + name = "Jens Binkert"; + }; + jerith666 = { + email = "github@matt.mchenryfamily.org"; + github = "jerith666"; + name = "Matt McHenry"; + }; + jfb = { + email = "james@yamtime.com"; + github = "tftio"; + name = "James Felix Black"; + }; + jfrankenau = { + email = "johannes@frankenau.net"; + github = "jfrankenau"; + name = "Johannes Frankenau"; + }; + jgeerds = { + email = "jascha@geerds.org"; + github = "jgeerds"; + name = "Jascha Geerds"; + }; + jgertm = { + email = "jger.tm@gmail.com"; + github = "jgertm"; + name = "Tim Jaeger"; + }; + jgillich = { + email = "jakob@gillich.me"; + github = "jgillich"; + name = "Jakob Gillich"; + }; + jhhuh = { + email = "jhhuh.note@gmail.com"; + github = "jhhuh"; + name = "Ji-Haeng Huh"; + }; + jirkamarsik = { + email = "jiri.marsik89@gmail.com"; + github = "jirkamarsik"; + name = "Jirka Marsik"; + }; + jlesquembre = { + email = "jl@lafuente.me"; + github = "jlesquembre"; + name = "José Luis Lafuente"; + }; + jluttine = { + email = "jaakko.luttinen@iki.fi"; + github = "jluttine"; + name = "Jaakko Luttinen"; + }; + joachifm = { + email = "joachifm@fastmail.fm"; + github = "joachifm"; + name = "Joachim Fasting"; + }; + joamaki = { + email = "joamaki@gmail.com"; + github = "joamaki"; + name = "Jussi Maki"; + }; + joelmo = { + email = "joel.moberg@gmail.com"; + github = "joelmo"; + name = "Joel Moberg"; + }; + joelteon = { + email = "me@joelt.io"; + name = "Joel Taylor"; + }; + johbo = { + email = "johannes@bornhold.name"; + github = "johbo"; + name = "Johannes Bornhold"; + }; + johnazoidberg = { + email = "git@danielschaefer.me"; + github = "johnazoidberg"; + name = "Daniel Schäfer"; + }; + johnchildren = { + email = "john.a.children@gmail.com"; + github = "johnchildren"; + name = "John Children"; + }; + johnmh = { + email = "johnmh@openblox.org"; + github = "johnmh"; + name = "John M. Harris, Jr."; + }; + johnramsden = { + email = "johnramsden@riseup.net"; + github = "johnramsden"; + name = "John Ramsden"; + }; + joko = { + email = "ioannis.koutras@gmail.com"; + github = "jokogr"; + name = "Ioannis Koutras"; + }; + jonafato = { + email = "jon@jonafato.com"; + github = "jonafato"; + name = "Jon Banafato"; + }; + joncojonathan = { + email = "joncojonathan@gmail.com"; + github = "joncojonathan"; + name = "Jonathan Haddock"; + }; + jpdoyle = { + email = "joethedoyle@gmail.com"; + github = "jpdoyle"; + name = "Joe Doyle"; + }; + jpierre03 = { + email = "nix@prunetwork.fr"; + github = "jpierre03"; + name = "Jean-Pierre PRUNARET"; + }; + jpotier = { + email = "jpo.contributes.to.nixos@marvid.fr"; + github = "jpotier"; + name = "Martin Potier"; + }; + jraygauthier = { + email = "jraygauthier@gmail.com"; + github = "jraygauthier"; + name = "Raymond Gauthier"; + }; + jtojnar = { + email = "jtojnar@gmail.com"; + github = "jtojnar"; + name = "Jan Tojnar"; + }; + juliendehos = { + email = "dehos@lisic.univ-littoral.fr"; + github = "juliendehos"; + name = "Julien Dehos"; + }; + jwiegley = { + email = "johnw@newartisans.com"; + github = "jwiegley"; + name = "John Wiegley"; + }; + jwilberding = { + email = "jwilberding@afiniate.com"; + name = "Jordan Wilberding"; + }; + jyp = { + email = "jeanphilippe.bernardy@gmail.com"; + github = "jyp"; + name = "Jean-Philippe Bernardy"; + }; + jzellner = { + email = "jeffz@eml.cc"; + github = "sofuture"; + name = "Jeff Zellner"; + }; + kaiha = { + email = "kai.harries@gmail.com"; + github = "kaiha"; + name = "Kai Harries"; + }; + kamilchm = { + email = "kamil.chm@gmail.com"; + github = "kamilchm"; + name = "Kamil Chmielewski"; + }; + kampfschlaefer = { + email = "arnold@arnoldarts.de"; + github = "kampfschlaefer"; + name = "Arnold Krille"; + }; + karolchmist = { + email = "info+nix@chmist.com"; + name = "karolchmist"; + }; + kazcw = { + email = "kaz@lambdaverse.org"; + github = "kazcw"; + name = "Kaz Wesley"; + }; + kentjames = { + email = "jameschristopherkent@gmail.com"; + github = "kentjames"; + name = "James Kent"; + }; + kevincox = { + email = "kevincox@kevincox.ca"; + github = "kevincox"; + name = "Kevin Cox"; + }; + khumba = { + email = "bog@khumba.net"; + github = "khumba"; + name = "Bryan Gardiner"; + }; + kierdavis = { + email = "kierdavis@gmail.com"; + github = "kierdavis"; + name = "Kier Davis"; + }; + kiloreux = { + email = "kiloreux@gmail.com"; + github = "kiloreux"; + name = "Kiloreux Emperex"; + }; + kini = { + email = "keshav.kini@gmail.com"; + github = "kini"; + name = "Keshav Kini"; + }; + kkallio = { + email = "tierpluspluslists@gmail.com"; + name = "Karn Kallio"; + }; + knedlsepp = { + email = "josef.kemetmueller@gmail.com"; + github = "knedlsepp"; + name = "Josef Kemetmüller"; + }; + konimex = { + email = "herdiansyah@netc.eu"; + github = "konimex"; + name = "Muhammad Herdiansyah"; + }; + koral = { + email = "koral@mailoo.org"; + github = "k0ral"; + name = "Koral"; + }; + kovirobi = { + email = "kovirobi@gmail.com"; + github = "kovirobi"; + name = "Kovacsics Robert"; + }; + kquick = { + email = "quick@sparq.org"; + github = "kquick"; + name = "Kevin Quick"; + }; + kragniz = { + email = "louis@kragniz.eu"; + github = "kragniz"; + name = "Louis Taylor"; + }; + krav = { + email = "kristoffer@microdisko.no"; + github = "krav"; + name = "Kristoffer Thømt Ravneberg"; + }; + kristoff3r = { + email = "k.soeholm@gmail.com"; + github = "kristoff3r"; + name = "Kristoffer Søholm"; + }; + ktosiek = { + email = "tomasz.kontusz@gmail.com"; + github = "ktosiek"; + name = "Tomasz Kontusz"; + }; + kuznero = { + email = "roman@kuznero.com"; + github = "kuznero"; + name = "Roman Kuznetsov"; + }; + lasandell = { + email = "lasandell@gmail.com"; + github = "lasandell"; + name = "Luke Sandell"; + }; + lassulus = { + email = "lassulus@gmail.com"; + github = "Lassulus"; + name = "Lassulus"; + }; + layus = { + email = "layus.on@gmail.com"; + github = "layus"; + name = "Guillaume Maudoux"; + }; + lblasc = { + email = "lblasc@znode.net"; + github = "lblasc"; + name = "Luka Blaskovic"; + }; + ldesgoui = { + email = "ldesgoui@gmail.com"; + github = "ldesgoui"; + name = "Lucas Desgouilles"; + }; + league = { + email = "league@contrapunctus.net"; + github = "league"; + name = "Christopher League"; + }; + lebastr = { + email = "lebastr@gmail.com"; + github = "lebastr"; + name = "Alexander Lebedev"; + }; + ledif = { + email = "refuse@gmail.com"; + github = "ledif"; + name = "Adam Fidel"; + }; + leemachin = { + email = "me@mrl.ee"; + github = "leemachin"; + name = "Lee Machin"; + }; + leenaars = { + email = "ml.software@leenaa.rs"; + github = "leenaars"; + name = "Michiel Leenaars"; + }; + leo60228 = { + email = "iakornfeld@gmail.com"; + github = "leo60228"; + name = "leo60228"; + }; + leonardoce = { + email = "leonardo.cecchi@gmail.com"; + github = "leonardoce"; + name = "Leonardo Cecchi"; + }; + lejonet = { + email = "daniel@kuehn.se"; + github = "lejonet"; + name = "Daniel Kuehn"; + }; + lethalman = { + email = "lucabru@src.gnome.org"; + github = "lethalman"; + name = "Luca Bruno"; + }; + lewo = { + email = "lewo@abesis.fr"; + github = "nlewo"; + name = "Antoine Eiche"; + }; + lheckemann = { + email = "git@sphalerite.org"; + github = "lheckemann"; + name = "Linus Heckemann"; + }; + lhvwb = { + email = "nathaniel.baxter@gmail.com"; + github = "nathanielbaxter"; + name = "Nathaniel Baxter"; + }; + lihop = { + email = "nixos@leroy.geek.nz"; + github = "lihop"; + name = "Leroy Hopson"; + }; + limeytexan = { + email = "limeytexan@gmail.com"; + github = "limeytexan"; + name = "Michael Brantley"; + }; + linquize = { + email = "linquize@yahoo.com.hk"; + github = "linquize"; + name = "Linquize"; + }; + linus = { + email = "linusarver@gmail.com"; + github = "listx"; + name = "Linus Arver"; + }; + lluchs = { + email = "lukas.werling@gmail.com"; + github = "lluchs"; + name = "Lukas Werling"; + }; + lnl7 = { + email = "daiderd@gmail.com"; + github = "lnl7"; + name = "Daiderd Jordan"; + }; + lo1tuma = { + email = "schreck.mathias@gmail.com"; + github = "lo1tuma"; + name = "Mathias Schreck"; + }; + lopsided98 = { + email = "benwolsieffer@gmail.com"; + github = "lopsided98"; + name = "Ben Wolsieffer"; + }; + loskutov = { + email = "ignat.loskutov@gmail.com"; + github = "loskutov"; + name = "Ignat Loskutov"; + }; + lovek323 = { + email = "jason@oconal.id.au"; + github = "lovek323"; + name = "Jason O'Conal"; + }; + lowfatcomputing = { + email = "andreas.wagner@lowfatcomputing.org"; + github = "lowfatcomputing"; + name = "Andreas Wagner"; + }; + lschuermann = { + email = "leon.git@is.currently.online"; + github = "lschuermann"; + name = "Leon Schuermann"; + }; + lsix = { + email = "lsix@lancelotsix.com"; + github = "lsix"; + name = "Lancelot SIX"; + }; + ltavard = { + email = "laure.tavard@univ-grenoble-alpes.fr"; + github = "ltavard"; + name = "Laure Tavard"; + }; + lucas8 = { + email = "luc.linux@mailoo.org"; + github = "lucas8"; + name = "Luc Chabassier"; + }; + ludo = { + email = "ludo@gnu.org"; + github = "civodul"; + name = "Ludovic Courtès"; + }; + lufia = { + email = "lufia@lufia.org"; + github = "lufia"; + name = "Kyohei Kadota"; + }; + luispedro = { + email = "luis@luispedro.org"; + github = "luispedro"; + name = "Luis Pedro Coelho"; + }; + lukego = { + email = "luke@snabb.co"; + github = "lukego"; + name = "Luke Gorrie"; + }; + luz = { + email = "luz666@daum.net"; + github = "Luz"; + name = "Luz"; + }; + lw = { + email = "lw@fmap.me"; + github = "lolwat97"; + name = "Sergey Sofeychuk"; + }; + lyt = { + email = "wheatdoge@gmail.com"; + name = "Tim Liou"; + }; + m3tti = { + email = "mathaeus.peter.sander@gmail.com"; + name = "Mathaeus Sander"; + }; + ma27 = { + email = "maximilian@mbosch.me"; + github = "ma27"; + name = "Maximilian Bosch"; + }; + madjar = { + email = "georges.dubus@compiletoi.net"; + github = "madjar"; + name = "Georges Dubus"; + }; + magnetophon = { + email = "bart@magnetophon.nl"; + github = "magnetophon"; + name = "Bart Brouns"; + }; + mahe = { + email = "matthias.mh.herrmann@gmail.com"; + github = "2chilled"; + name = "Matthias Herrmann"; + }; + makefu = { + email = "makefu@syntax-fehler.de"; + github = "makefu"; + name = "Felix Richter"; + }; + malyn = { + email = "malyn@strangeGizmo.com"; + github = "malyn"; + name = "Michael Alyn Miller"; + }; + manveru = { + email = "m.fellinger@gmail.com"; + github = "manveru"; + name = "Michael Fellinger"; + }; + marcweber = { + email = "marco-oweber@gmx.de"; + github = "marcweber"; + name = "Marc Weber"; + }; + markWot = { + email = "markus@wotringer.de"; + name = "Markus Wotringer"; + }; + markus1189 = { + email = "markus1189@gmail.com"; + github = "markus1189"; + name = "Markus Hauck"; + }; + markuskowa = { + email = "markus.kowalewski@gmail.com"; + github = "markuskowa"; + name = "Markus Kowalewski"; + }; + marsam = { + email = "marsam@users.noreply.github.com"; + github = "marsam"; + name = "Mario Rodas"; + }; + martijnvermaat = { + email = "martijn@vermaat.name"; + github = "martijnvermaat"; + name = "Martijn Vermaat"; + }; + martingms = { + email = "martin@mg.am"; + github = "martingms"; + name = "Martin Gammelsæter"; + }; + matejc = { + email = "cotman.matej@gmail.com"; + github = "matejc"; + name = "Matej Cotman"; + }; + mathnerd314 = { + email = "mathnerd314.gph+hs@gmail.com"; + github = "mathnerd314"; + name = "Mathnerd314"; + }; + matthewbauer = { + email = "mjbauer95@gmail.com"; + github = "matthewbauer"; + name = "Matthew Bauer"; + }; + matthiasbeyer = { + email = "mail@beyermatthias.de"; + github = "matthiasbeyer"; + name = "Matthias Beyer"; + }; + maurer = { + email = "matthew.r.maurer+nix@gmail.com"; + github = "maurer"; + name = "Matthew Maurer"; + }; + mbakke = { + email = "mbakke@fastmail.com"; + github = "mbakke"; + name = "Marius Bakke"; + }; + mbbx6spp = { + email = "me@susanpotter.net"; + github = "mbbx6spp"; + name = "Susan Potter"; + }; + mbe = { + email = "brandonedens@gmail.com"; + github = "brandonedens"; + name = "Brandon Edens"; + }; + mbode = { + email = "maxbode@gmail.com"; + github = "mbode"; + name = "Maximilian Bode"; + }; + mboes = { + email = "mboes@tweag.net"; + github = "mboes"; + name = "Mathieu Boespflug"; + }; + mbrgm = { + email = "marius@yeai.de"; + github = "mbrgm"; + name = "Marius Bergmann"; + }; + mcmtroffaes = { + email = "matthias.troffaes@gmail.com"; + github = "mcmtroffaes"; + name = "Matthias C. M. Troffaes"; + }; + mdaiter = { + email = "mdaiter8121@gmail.com"; + github = "mdaiter"; + name = "Matthew S. Daiter"; + }; + meditans = { + email = "meditans@gmail.com"; + github = "meditans"; + name = "Carlo Nucera"; + }; + mehandes = { + email = "niewskici@gmail.com"; + github = "mehandes"; + name = "Matt Deming"; + }; + meisternu = { + email = "meister@krutt.org"; + github = "meisternu"; + name = "Matt Miemiec"; + }; + metabar = { + email = "softs@metabarcoding.org"; + name = "Celine Mercier"; + }; + mgdelacroix = { + email = "mgdelacroix@gmail.com"; + github = "mgdelacroix"; + name = "Miguel de la Cruz"; + }; + mgttlinger = { + email = "megoettlinger@gmail.com"; + github = "mgttlinger"; + name = "Merlin Göttlinger"; + }; + mguentner = { + email = "code@klandest.in"; + github = "mguentner"; + name = "Maximilian Güntner"; + }; + mic92 = { + email = "joerg@thalheim.io"; + github = "mic92"; + name = "Jörg Thalheim"; + }; + michaelpj = { + email = "michaelpj@gmail.com"; + github = "michaelpj"; + name = "Michael Peyton Jones"; + }; + michalrus = { + email = "m@michalrus.com"; + github = "michalrus"; + name = "Michal Rus"; + }; + michelk = { + email = "michel@kuhlmanns.info"; + github = "michelk"; + name = "Michel Kuhlmann"; + }; + mickours = { + email = "mickours@gmail.com<"; + github = "mickours"; + name = "Michael Mercier"; + }; + midchildan = { + email = "midchildan+nix@gmail.com"; + github = "midchildan"; + name = "midchildan"; + }; + mikefaille = { + email = "michael@faille.io"; + github = "mikefaille"; + name = "Michaël Faille"; + }; + mikoim = { + email = "ek@esh.ink"; + github = "mikoim"; + name = "Eshin Kunishima"; + }; + miltador = { + email = "miltador@yandex.ua"; + name = "Vasiliy Solovey"; + }; + mimadrid = { + email = "mimadrid@ucm.es"; + github = "mimadrid"; + name = "Miguel Madrid"; + }; + mirdhyn = { + email = "mirdhyn@gmail.com"; + github = "mirdhyn"; + name = "Merlin Gaillard"; + }; + mirrexagon = { + email = "mirrexagon@mirrexagon.com"; + github = "mirrexagon"; + name = "Andrew Abbott"; + }; + mjanczyk = { + email = "m@dragonvr.pl"; + github = "mjanczyk"; + name = "Marcin Janczyk"; + }; + mjp = { + email = "mike@mythik.co.uk"; + github = "MikePlayle"; + name = "Mike Playle"; + }; + mkg = { + email = "mkg@vt.edu"; + github = "mkgvt"; + name = "Mark K Gardner"; + }; + mlieberman85 = { + email = "mlieberman85@gmail.com"; + github = "mlieberman85"; + name = "Michael Lieberman"; + }; + mmahut = { + email = "marek.mahut@gmail.com"; + github = "mmahut"; + name = "Marek Mahut"; + }; + moaxcp = { + email = "moaxcp@gmail.com"; + github = "moaxcp"; + name = "John Mercier"; + }; + modulistic = { + email = "modulistic@gmail.com"; + github = "modulistic"; + name = "Pablo Costa"; + }; + mog = { + email = "mog-lists@rldn.net"; + github = "mogorman"; + name = "Matthew O'Gorman"; + }; + montag451 = { + email = "montag451@laposte.net"; + github = "montag451"; + name = "montag451"; + }; + moosingin3space = { + email = "moosingin3space@gmail.com"; + github = "moosingin3space"; + name = "Nathan Moos"; + }; + moredread = { + email = "code@apb.name"; + github = "moredread"; + name = "André-Patrick Bubel"; + }; + moretea = { + email = "maarten@moretea.nl"; + github = "moretea"; + name = "Maarten Hoogendoorn"; + }; + mounium = { + email = "muoniurn@gmail.com"; + github = "mounium"; + name = "Katona László"; + }; + mpcsh = { + email = "m@mpc.sh"; + github = "mpcsh"; + name = "Mark Cohen"; + }; + mpickering = { + email = "matthewtpickering@gmail.com"; + github = "mpickering"; + name = "Matthew Pickering"; + }; + mpscholten = { + email = "marc@mpscholten.de"; + github = "mpscholten"; + name = "Marc Scholten"; + }; + mpsyco = { + email = "fr.st-amour@gmail.com"; + github = "fstamour"; + name = "Francis St-Amour"; + }; + mrVanDalo = { + email = "contact@ingolf-wagner.de"; + github = "mrVanDalo"; + name = "Ingolf Wanger"; + }; + msackman = { + email = "matthew@wellquite.org"; + name = "Matthew Sackman"; + }; + mschristiansen = { + email = "mikkel@rheosystems.com"; + github = "mschristiansen"; + name = "Mikkel Christiansen"; + }; + msiedlarek = { + email = "mikolaj@siedlarek.pl"; + github = "msiedlarek"; + name = "Mikołaj Siedlarek"; + }; + mstarzyk = { + email = "mstarzyk@gmail.com"; + github = "mstarzyk"; + name = "Maciek Starzyk"; + }; + msteen = { + email = "emailmatthijs@gmail.com"; + github = "msteen"; + name = "Matthijs Steen"; + }; + mt-caret = { + email = "mtakeda.enigsol@gmail.com"; + github = "mt-caret"; + name = "Masayuki Takeda"; + }; + MtP = { + email = "marko.nixos@poikonen.de"; + github = "MtP76"; + name = "Marko Poikonen"; + }; + mtreskin = { + email = "zerthurd@gmail.com"; + github = "Zert"; + name = "Max Treskin"; + }; + mudri = { + email = "lamudri@gmail.com"; + github = "laMudri"; + name = "James Wood"; + }; + muflax = { + email = "mail@muflax.com"; + github = "muflax"; + name = "Stefan Dorn"; + }; + myrl = { + email = "myrl.0xf@gmail.com"; + github = "myrl"; + name = "Myrl Hex"; + }; + nadrieril = { + email = "nadrieril@gmail.com"; + github = "nadrieril"; + name = "Nadrieril Feneanar"; + }; + namore = { + email = "namor@hemio.de"; + github = "namore"; + name = "Roman Naumann"; + }; + nand0p = { + email = "nando@hex7.com"; + github = "nand0p"; + name = "Fernando Jose Pando"; + }; + nathan-gs = { + email = "nathan@nathan.gs"; + github = "nathan-gs"; + name = "Nathan Bijnens"; + }; + nckx = { + email = "github@tobias.gr"; + github = "nckx"; + name = "Tobias Geerinckx-Rice"; + }; + ndowens = { + email = "ndowens04@gmail.com"; + github = "ndowens"; + name = "Nathan Owens"; + }; + neeasade = { + email = "nathanisom27@gmail.com"; + github = "neeasade"; + name = "Nathan Isom"; + }; + nequissimus = { + email = "tim@nequissimus.com"; + github = "nequissimus"; + name = "Tim Steinbach"; + }; + nfjinjing = { + email = "nfjinjing@gmail.com"; + github = "nfjinjing"; + name = "Jinjing Wang"; + }; + nh2 = { + email = "mail@nh2.me"; + github = "nh2"; + name = "Niklas Hambüchen"; + }; + nhooyr = { + email = "anmol@aubble.com"; + github = "nhooyr"; + name = "Anmol Sethi"; + }; + nickhu = { + email = "me@nickhu.co.uk"; + github = "nickhu"; + name = "Nick Hu"; + }; + nicknovitski = { + email = "nixpkgs@nicknovitski.com"; + github = "nicknovitski"; + name = "Nick Novitski"; + }; + nico202 = { + email = "anothersms@gmail.com"; + github = "nico202"; + name = "Nicolò Balzarotti"; + }; + ninjatrappeur = { + email = "felix@alternativebit.fr"; + github = "ninjatrappeur"; + name = "Félix Baylac-Jacqué"; + }; + nioncode = { + email = "nioncode+github@gmail.com"; + github = "nioncode"; + name = "Nicolas Schneider"; + }; + nipav = { + email = "niko.pavlinek@gmail.com"; + github = "nipav"; + name = "Niko Pavlinek"; + }; + nixy = { + email = "nixy@nixy.moe"; + github = "nixy"; + name = "Andrew R. M."; + }; + nmattia = { + email = "nicolas@nmattia.com"; + github = "nmattia"; + name = "Nicolas Mattia"; + }; + nocoolnametom = { + email = "nocoolnametom@gmail.com"; + github = "nocoolnametom"; + name = "Tom Doggett"; + }; + notthemessiah = { + email = "brian.cohen.88@gmail.com"; + github = "notthemessiah"; + name = "Brian Cohen"; + }; + np = { + email = "np.nix@nicolaspouillard.fr"; + github = "np"; + name = "Nicolas Pouillard"; + }; + nslqqq = { + email = "nslqqq@gmail.com"; + name = "Nikita Mikhailov"; + }; + nthorne = { + email = "notrupertthorne@gmail.com"; + github = "nthorne"; + name = "Niklas Thörne"; + }; + nyanloutre = { + email = "paul@nyanlout.re"; + github = "nyanloutre"; + name = "Paul Trehiou"; + }; + nyarly = { + email = "nyarly@gmail.com"; + github = "nyarly"; + name = "Judson Lester"; + }; + obadz = { + email = "obadz-nixos@obadz.com"; + github = "obadz"; + name = "obadz"; + }; + ocharles = { + email = "ollie@ocharles.org.uk"; + github = "ocharles"; + name = "Oliver Charles"; + }; + odi = { + email = "oliver.dunkl@gmail.com"; + github = "odi"; + name = "Oliver Dunkl"; + }; + offline = { + email = "jakahudoklin@gmail.com"; + github = "offlinehacker"; + name = "Jaka Hudoklin"; + }; + oida = { + email = "oida@posteo.de"; + github = "oida"; + name = "oida"; + }; + okasu = { + email = "oka.sux@gmail.com"; + name = "Okasu"; + }; + olcai = { + email = "dev@timan.info"; + github = "olcai"; + name = "Erik Timan"; + }; + olejorgenb = { + email = "olejorgenb@yahoo.no"; + github = "olejorgenb"; + name = "Ole Jørgen Brønner"; + }; + olynch = { + email = "owen@olynch.me"; + github = "olynch"; + name = "Owen Lynch"; + }; + orbekk = { + email = "kjetil.orbekk@gmail.com"; + github = "orbekk"; + name = "KJ Ørbekk"; + }; + orbitz = { + email = "mmatalka@gmail.com"; + github = "orbitz"; + name = "Malcolm Matalka"; + }; + orivej = { + email = "orivej@gmx.fr"; + github = "orivej"; + name = "Orivej Desh"; + }; + osener = { + email = "ozan@ozansener.com"; + github = "osener"; + name = "Ozan Sener"; + }; + otwieracz = { + email = "slawek@otwiera.cz"; + github = "otwieracz"; + name = "Slawomir Gonet"; + }; + oxij = { + email = "oxij@oxij.org"; + github = "oxij"; + name = "Jan Malakhovski"; + }; + pSub = { + email = "mail@pascal-wittmann.de"; + github = "pSub"; + name = "Pascal Wittmann"; + }; + paholg = { + email = "paho@paholg.com"; + github = "paholg"; + name = "Paho Lurie-Gregg"; + }; + pakhfn = { + email = "pakhfn@gmail.com"; + github = "pakhfn"; + name = "Fedor Pakhomov"; + }; + panaeon = { + email = "vitalii.voloshyn@gmail.com"; + github = "panaeon"; + name = "Vitalii Voloshyn"; + }; + paperdigits = { + email = "mica@silentumbrella.com"; + github = "paperdigits"; + name = "Mica Semrick"; + }; + paraseba = { + email = "paraseba@gmail.com"; + github = "paraseba"; + name = "Sebastian Galkin"; + }; + pashev = { + email = "pashev.igor@gmail.com"; + github = "ip1981"; + name = "Igor Pashev"; + }; + patternspandemic = { + email = "patternspandemic@live.com"; + github = "patternspandemic"; + name = "Brad Christensen"; + }; + pawelpacana = { + email = "pawel.pacana@gmail.com"; + github = "pawelpacana"; + name = "Paweł Pacana"; + }; + pbogdan = { + email = "ppbogdan@gmail.com"; + github = "pbogdan"; + name = "Piotr Bogdan"; + }; + pcarrier = { + email = "pc@rrier.ca"; + github = "pcarrier"; + name = "Pierre Carrier"; + }; + periklis = { + email = "theopompos@gmail.com"; + github = "periklis"; + name = "Periklis Tsirakidis"; + }; + pesterhazy = { + email = "pesterhazy@gmail.com"; + github = "pesterhazy"; + name = "Paulus Esterhazy"; + }; + peterhoeg = { + email = "peter@hoeg.com"; + github = "peterhoeg"; + name = "Peter Hoeg"; + }; + peterromfeldhk = { + email = "peter.romfeld.hk@gmail.com"; + github = "peterromfeldhk"; + name = "Peter Romfeld"; + }; + peti = { + email = "simons@cryp.to"; + github = "peti"; + name = "Peter Simons"; + }; + philandstuff = { + email = "philip.g.potter@gmail.com"; + github = "philandstuff"; + name = "Philip Potter"; + }; + phile314 = { + email = "nix@314.ch"; + github = "phile314"; + name = "Philipp Hausmann"; + }; + phreedom = { + email = "phreedom@yandex.ru"; + github = "phreedom"; + name = "Evgeny Egorochkin"; + }; + phunehehe = { + email = "phunehehe@gmail.com"; + github = "phunehehe"; + name = "Hoang Xuan Phu"; + }; + pierrechevalier83 = { + email = "pierrechevalier83@gmail.com"; + github = "pierrechevalier83"; + name = "Pierre Chevalier"; + }; + pierrer = { + email = "pierrer@pi3r.be"; + github = "pierrer"; + name = "Pierre Radermecker"; + }; + pierron = { + email = "nixos@nbp.name"; + github = "nbp"; + name = "Nicolas B. Pierron"; + }; + piotr = { + email = "ppietrasa@gmail.com"; + name = "Piotr Pietraszkiewicz"; + }; + pjbarnoy = { + email = "pjbarnoy@gmail.com"; + github = "pjbarnoy"; + name = "Perry Barnoy"; + }; + pjones = { + email = "pjones@devalot.com"; + github = "pjones"; + name = "Peter Jones"; + }; + pkmx = { + email = "pkmx.tw@gmail.com"; + github = "pkmx"; + name = "Chih-Mao Chen"; + }; + plcplc = { + email = "plcplc@gmail.com"; + github = "plcplc"; + name = "Philip Lykke Carlsen"; + }; + plumps = { + email = "maks.bronsky@web.de"; + github = "plumps"; + name = "Maksim Bronsky"; + }; + pmahoney = { + email = "pat@polycrystal.org"; + github = "pmahoney"; + name = "Patrick Mahoney"; + }; + pmeunier = { + email = "pierre-etienne.meunier@inria.fr"; + github = "P-E-Meunier"; + name = "Pierre-Étienne Meunier"; + }; + pmiddend = { + email = "pmidden@secure.mailbox.org"; + github = "pmiddend"; + name = "Philipp Middendorf"; + }; + pneumaticat = { + email = "kevin@potatofrom.space"; + github = "pneumaticat"; + name = "Kevin Liu"; + }; + polyrod = { + email = "dc1mdp@gmail.com"; + github = "polyrod"; + name = "Maurizio Di Pietro"; + }; + pradeepchhetri = { + email = "pradeep.chhetri89@gmail.com"; + github = "pradeepchhetri"; + name = "Pradeep Chhetri"; + }; + prikhi = { + email = "pavan.rikhi@gmail.com"; + github = "prikhi"; + name = "Pavan Rikhi"; + }; + primeos = { + email = "dev.primeos@gmail.com"; + github = "primeos"; + name = "Michael Weiss"; + }; + proglodyte = { + email = "proglodyte23@gmail.com"; + github = "proglodyte"; + name = "Proglodyte"; + }; + pshendry = { + email = "paul@pshendry.com"; + github = "pshendry"; + name = "Paul Hendry"; + }; + psibi = { + email = "sibi@psibi.in"; + github = "psibi"; + name = "Sibi"; + }; + pstn = { + email = "philipp@xndr.de"; + name = "Philipp Steinpaß"; + }; + puffnfresh = { + email = "brian@brianmckenna.org"; + github = "puffnfresh"; + name = "Brian McKenna"; + }; + pxc = { + email = "patrick.callahan@latitudeengineering.com"; + name = "Patrick Callahan"; + }; + qknight = { + email = "js@lastlog.de"; + github = "qknight"; + name = "Joachim Schiele"; + }; + ragge = { + email = "r.dahlen@gmail.com"; + github = "ragnard"; + name = "Ragnar Dahlen"; + }; + ralith = { + email = "ben.e.saunders@gmail.com"; + github = "ralith"; + name = "Benjamin Saunders"; + }; + ramkromberg = { + email = "ramkromberg@mail.com"; + github = "ramkromberg"; + name = "Ram Kromberg"; + }; + rardiol = { + email = "ricardo.ardissone@gmail.com"; + github = "rardiol"; + name = "Ricardo Ardissone"; + }; + rasendubi = { + email = "rasen.dubi@gmail.com"; + github = "rasendubi"; + name = "Alexey Shmalko"; + }; + raskin = { + email = "7c6f434c@mail.ru"; + github = "7c6f434c"; + name = "Michael Raskin"; + }; + ravloony = { + email = "ravloony@gmail.com"; + name = "Tom Macdonald"; + }; + razvan = { + email = "razvan.panda@gmail.com"; + github = "razvan-panda"; + name = "Răzvan Flavius Panda"; + }; + rbasso = { + email = "rbasso@sharpgeeks.net"; + github = "rbasso"; + name = "Rafael Basso"; + }; + rdnetto = { + email = "rdnetto@gmail.com"; + github = "rdnetto"; + name = "Reuben D'Netto"; + }; + redbaron = { + email = "ivanov.maxim@gmail.com"; + github = "redbaron"; + name = "Maxim Ivanov"; + }; + redfish64 = { + email = "engler@gmail.com"; + github = "redfish64"; + name = "Tim Engler"; + }; + redvers = { + email = "red@infect.me"; + github = "redvers"; + name = "Redvers Davies"; + }; + refnil = { + email = "broemartino@gmail.com"; + github = "refnil"; + name = "Martin Lavoie"; + }; + regnat = { + email = "regnat@regnat.ovh"; + github = "regnat"; + name = "Théophane Hufschmitt"; + }; + relrod = { + email = "ricky@elrod.me"; + github = "relrod"; + name = "Ricky Elrod"; + }; + renzo = { + email = "renzocarbonara@gmail.com"; + github = "k0001"; + name = "Renzo Carbonara"; + }; + retrry = { + email = "retrry@gmail.com"; + github = "retrry"; + name = "Tadas Barzdžius"; + }; + rht = { + email = "rhtbot@protonmail.com"; + github = "rht"; + name = "rht"; + }; + richardipsum = { + email = "richardipsum@fastmail.co.uk"; + github = "richardipsum"; + name = "Richard Ipsum"; + }; + rick68 = { + email = "rick68@gmail.com"; + github = "rick68"; + name = "Wei-Ming Yang"; + }; + rickynils = { + email = "rickynils@gmail.com"; + github = "rickynils"; + name = "Rickard Nilsson"; + }; + ris = { + email = "code@humanleg.org.uk"; + github = "risicle"; + name = "Robert Scott"; + }; + rittelle = { + email = "rittelle@posteo.de"; + github = "rittelle"; + name = "Lennart Rittel"; + }; + rlupton20 = { + email = "richard.lupton@gmail.com"; + github = "rlupton20"; + name = "Richard Lupton"; + }; + rnhmjoj = { + email = "micheleguerinirocco@me.com"; + github = "rnhmjoj"; + name = "Michele Guerini Rocco"; + }; + rob = { + email = "rob.vermaas@gmail.com"; + github = "rbvermaa"; + name = "Rob Vermaas"; + }; + robberer = { + email = "robberer@freakmail.de"; + github = "robberer"; + name = "Longrin Wischnewski"; + }; + robbinch = { + email = "robbinch33@gmail.com"; + github = "robbinch"; + name = "Robbin C."; + }; + roberth = { + email = "nixpkgs@roberthensing.nl"; + github = "roberth"; + name = "Robert Hensing"; + }; + robertodr = { + email = "roberto.diremigio@gmail.com"; + github = "robertodr"; + name = "Roberto Di Remigio"; + }; + robgssp = { + email = "robgssp@gmail.com"; + github = "robgssp"; + name = "Rob Glossop"; + }; + roblabla = { + email = "robinlambertz+dev@gmail.com"; + github = "roblabla"; + name = "Robin Lambertz"; + }; + roconnor = { + email = "roconnor@theorem.ca"; + github = "roconnor"; + name = "Russell O'Connor"; + }; + romildo = { + email = "malaquias@gmail.com"; + github = "romildo"; + name = "José Romildo Malaquias"; + }; + rongcuid = { + email = "rongcuid@outlook.com"; + github = "rongcuid"; + name = "Rongcui Dong"; + }; + rprospero = { + email = "rprospero+nix@gmail.com"; + github = "rprospero"; + name = "Adam Washington"; + }; + rszibele = { + email = "richard@szibele.com"; + github = "rszibele"; + name = "Richard Szibele"; + }; + rtreffer = { + email = "treffer+nixos@measite.de"; + github = "rtreffer"; + name = "Rene Treffer"; + }; + rushmorem = { + email = "rushmore@webenchanter.com"; + github = "rushmorem"; + name = "Rushmore Mushambi"; + }; + rvl = { + email = "dev+nix@rodney.id.au"; + github = "rvl"; + name = "Rodney Lorrimar"; + }; + rvlander = { + email = "rvlander@gaetanandre.eu"; + github = "rvlander"; + name = "Gaëtan André"; + }; + rvolosatovs = { + email = "rvolosatovs@riseup.net"; + github = "rvolosatovs"; + name = "Roman Volosatovs"; + }; + ryanartecona = { + email = "ryanartecona@gmail.com"; + github = "ryanartecona"; + name = "Ryan Artecona"; + }; + ryansydnor = { + email = "ryan.t.sydnor@gmail.com"; + github = "ryansydnor"; + name = "Ryan Sydnor"; + }; + ryantm = { + email = "ryan@ryantm.com"; + github = "ryantm"; + name = "Ryan Mulligan"; + }; + ryantrinkle = { + email = "ryan.trinkle@gmail.com"; + github = "ryantrinkle"; + name = "Ryan Trinkle"; + }; + rybern = { + email = "ryan.bernstein@columbia.edu"; + github = "rybern"; + name = "Ryan Bernstein"; + }; + rycee = { + email = "robert@rycee.net"; + github = "rycee"; + name = "Robert Helgesson"; + }; + ryneeverett = { + email = "ryneeverett@gmail.com"; + github = "ryneeverett"; + name = "Ryne Everett"; + }; + rzetterberg = { + email = "richard.zetterberg@gmail.com"; + github = "rzetterberg"; + name = "Richard Zetterberg"; + }; + s1lvester = { + email = "s1lvester@bockhacker.me"; + github = "s1lvester"; + name = "Markus Silvester"; + }; + samdroid-apps = { + email = "sam@sam.today"; + github = "samdroid-apps"; + name = "Sam Parkinson"; + }; + samueldr = { + email = "samuel@dionne-riel.com"; + github = "samueldr"; + name = "Samuel Dionne-Riel"; + }; + samuelrivas = { + email = "samuelrivas@gmail.com"; + github = "samuelrivas"; + name = "Samuel Rivas"; + }; + sander = { + email = "s.vanderburg@tudelft.nl"; + github = "svanderburg"; + name = "Sander van der Burg"; + }; + sargon = { + email = "danielehlers@mindeye.net"; + github = "sargon"; + name = "Daniel Ehlers"; + }; + sauyon = { + email = "s@uyon.co"; + github = "sauyon"; + name = "Sauyon Lee"; + }; + schmitthenner = { + email = "development@schmitthenner.eu"; + github = "fkz"; + name = "Fabian Schmitthenner"; + }; + schneefux = { + email = "schneefux+nixos_pkg@schneefux.xyz"; + github = "schneefux"; + name = "schneefux"; + }; + schristo = { + email = "schristopher@konputa.com"; + name = "Scott Christopher"; + }; + scode = { + email = "peter.schuller@infidyne.com"; + github = "scode"; + name = "Peter Schuller"; + }; + scolobb = { + email = "sivanov@colimite.fr"; + github = "scolobb"; + name = "Sergiu Ivanov"; + }; + sdll = { + email = "sasha.delly@gmail.com"; + github = "sdll"; + name = "Sasha Illarionov"; + }; + sellout = { + email = "greg@technomadic.org"; + github = "sellout"; + name = "Greg Pfeil"; + }; + sengaya = { + email = "tlo@sengaya.de"; + github = "sengaya"; + name = "Thilo Uttendorfer"; + }; + sephalon = { + email = "me@sephalon.net"; + github = "sephalon"; + name = "Stefan Wiehler"; + }; + sepi = { + email = "raffael@mancini.lu"; + github = "sepi"; + name = "Raffael Mancini"; + }; + seppeljordan = { + email = "sebastian.jordan.mail@googlemail.com"; + github = "seppeljordan"; + name = "Sebastian Jordan"; + }; + sfrijters = { + email = "sfrijters@gmail.com"; + github = "sfrijters"; + name = "Stefan Frijters"; + }; + shanemikel = { + email = "shanemikel1@gmail.com"; + github = "shanemikel"; + name = "Shane Pearlman"; + }; + shawndellysse = { + email = "sdellysse@gmail.com"; + github = "shawndellysse"; + name = "Shawn Dellysse"; + }; + sheenobu = { + email = "sheena.artrip@gmail.com"; + github = "sheenobu"; + name = "Sheena Artrip"; + }; + sheganinans = { + email = "sheganinans@gmail.com"; + github = "sheganinans"; + name = "Aistis Raulinaitis"; + }; + shell = { + email = "cam.turn@gmail.com"; + github = "VShell"; + name = "Shell Turner"; + }; + shlevy = { + email = "shea@shealevy.com"; + github = "shlevy"; + name = "Shea Levy"; + }; + siddharthist = { + email = "langston.barrett@gmail.com"; + github = "siddharthist"; + name = "Langston Barrett"; + }; + sifmelcara = { + email = "ming@culpring.com"; + github = "sifmelcara"; + name = "Ming Chuan"; + }; + sigma = { + email = "yann.hodique@gmail.com"; + github = "sigma"; + name = "Yann Hodique"; + }; + simonvandel = { + email = "simon.vandel@gmail.com"; + github = "simonvandel"; + name = "Simon Vandel Sillesen"; + }; + sivteck = { + email = "sivaram1992@gmail.com"; + github = "sivteck"; + name = "Sivaram Balakrishnan"; + }; + sjagoe = { + email = "simon@simonjagoe.com"; + github = "sjagoe"; + name = "Simon Jagoe"; + }; + sjmackenzie = { + email = "setori88@gmail.com"; + github = "sjmackenzie"; + name = "Stewart Mackenzie"; + }; + sjourdois = { + email = "sjourdois@gmail.com"; + name = "Stéphane ‘kwisatz’ Jourdois"; + }; + skeidel = { + email = "svenkeidel@gmail.com"; + github = "svenkeidel"; + name = "Sven Keidel"; + }; + skrzyp = { + email = "jot.skrzyp@gmail.com"; + name = "Jakub Skrzypnik"; + }; + sleexyz = { + email = "freshdried@gmail.com"; + github = "sleexyz"; + name = "Sean Lee"; + }; + smironov = { + email = "grrwlf@gmail.com"; + github = "grwlf"; + name = "Sergey Mironov"; + }; + sna = { + email = "abouzahra.9@wright.edu"; + github = "s-na"; + name = "S. Nordin Abouzahra"; + }; + snyh = { + email = "snyh@snyh.org"; + github = "snyh"; + name = "Xia Bin"; + }; + solson = { + email = "scott@solson.me"; + github = "solson"; + name = "Scott Olson"; + }; + sorki = { + email = "srk@48.io"; + github = "sorki"; + name = "Richard Marko"; + }; + sorpaas = { + email = "hi@that.world"; + github = "sorpaas"; + name = "Wei Tang"; + }; + spacefrogg = { + email = "spacefrogg-nixos@meterriblecrew.net"; + github = "spacefrogg"; + name = "Michael Raitza"; + }; + spencerjanssen = { + email = "spencerjanssen@gmail.com"; + github = "spencerjanssen"; + name = "Spencer Janssen"; + }; + spinus = { + email = "tomasz.czyz@gmail.com"; + github = "spinus"; + name = "Tomasz Czyż"; + }; + sprock = { + email = "rmason@mun.ca"; + github = "sprock"; + name = "Roger Mason"; + }; + spwhitt = { + email = "sw@swhitt.me"; + github = "spwhitt"; + name = "Spencer Whitt"; + }; + srghma = { + email = "srghma@gmail.com"; + github = "srghma"; + name = "Sergei Khoma"; + }; + srhb = { + email = "sbrofeldt@gmail.com"; + github = "srhb"; + name = "Sarah Brofeldt"; + }; + stephenmw = { + email = "stephen@q5comm.com"; + github = "stephenmw"; + name = "Stephen Weinberg"; + }; + sternenseemann = { + email = "post@lukasepple.de"; + github = "sternenseemann"; + name = "Lukas Epple"; + }; + stesie = { + email = "stesie@brokenpipe.de"; + github = "stesie"; + name = "Stefan Siegl"; + }; + steveej = { + email = "mail@stefanjunker.de"; + github = "steveej"; + name = "Stefan Junker"; + }; + stumoss = { + email = "samoss@gmail.com"; + github = "stumoss"; + name = "Stuart Moss"; + }; + suvash = { + email = "suvash+nixpkgs@gmail.com"; + github = "suvash"; + name = "Suvash Thapaliya"; + }; + sveitser = { + email = "sveitser@gmail.com"; + github = "sveitser"; + name = "Mathis Antony"; + }; + svsdep = { + email = "svsdep@gmail.com"; + github = "svsdep"; + name = "Vasyl Solovei"; + }; + swarren83 = { + email = "shawn.w.warren@gmail.com"; + github = "swarren83"; + name = "Shawn Warren"; + }; + swflint = { + email = "swflint@flintfam.org"; + github = "swflint"; + name = "Samuel W. Flint"; + }; + swistak35 = { + email = "me@swistak35.com"; + github = "swistak35"; + name = "Rafał Łasocha"; + }; + symphorien = { + email = "symphorien_nixpkgs@xlumurb.eu"; + github = "symphorien"; + name = "Guillaume Girol"; + }; + synthetica = { + email = "nix@hilhorst.be"; + github = "Synthetica9"; + name = "Patrick Hilhorst"; + }; + szczyp = { + email = "qb@szczyp.com"; + github = "szczyp"; + name = "Szczyp"; + }; + sztupi = { + email = "attila.sztupak@gmail.com"; + github = "sztupi"; + name = "Attila Sztupak"; + }; + tadfisher = { + email = "tadfisher@gmail.com"; + github = "tadfisher"; + name = "Tad Fisher"; + }; + taeer = { + email = "taeer@necsi.edu"; + github = "Radvendii"; + name = "Taeer Bar-Yam"; + }; + tailhook = { + email = "paul@colomiets.name"; + github = "tailhook"; + name = "Paul Colomiets"; + }; + taketwo = { + email = "alexandrov88@gmail.com"; + github = "taketwo"; + name = "Sergey Alexandrov"; + }; + takikawa = { + email = "asumu@igalia.com"; + github = "takikawa"; + name = "Asumu Takikawa"; + }; + taktoa = { + email = "taktoa@gmail.com"; + github = "taktoa"; + name = "Remy Goldschmidt"; + }; + taku0 = { + email = "mxxouy6x3m_github@tatapa.org"; + github = "taku0"; + name = "Takuo Yonezawa"; + }; + tari = { + email = "peter@taricorp.net"; + github = "tari"; + name = "Peter Marheine"; + }; + tavyc = { + email = "octavian.cerna@gmail.com"; + github = "tavyc"; + name = "Octavian Cerna"; + }; + tazjin = { + email = "mail@tazj.in"; + github = "tazjin"; + name = "Vincent Ambo"; + }; + teh = { + email = "tehunger@gmail.com"; + github = "teh"; + name = "Tom Hunger"; + }; + telotortium = { + email = "rirelan@gmail.com"; + github = "telotortium"; + name = "Robert Irelan"; + }; + teozkr = { + email = "teo@nullable.se"; + github = "teozkr"; + name = "Teo Klestrup Röijezon"; + }; + teto = { + email = "mcoudron@hotmail.com"; + github = "teto"; + name = "Matthieu Coudron"; + }; + tex = { + email = "milan.svoboda@centrum.cz"; + github = "tex"; + name = "Milan Svoboda"; + }; + thall = { + email = "niclas.thall@gmail.com"; + github = "thall"; + name = "Niclas Thall"; + }; + thammers = { + email = "jawr@gmx.de"; + github = "tobias-hammerschmidt"; + name = "Tobias Hammerschmidt"; + }; + thanegill = { + email = "me@thanegill.com"; + github = "thanegill"; + name = "Thane Gill"; + }; + the-kenny = { + email = "moritz@tarn-vedra.de"; + github = "the-kenny"; + name = "Moritz Ulrich"; + }; + theuni = { + email = "ct@flyingcircus.io"; + github = "ctheune"; + name = "Christian Theune"; + }; + thoughtpolice = { + email = "aseipp@pobox.com"; + github = "thoughtpolice"; + name = "Austin Seipp"; + }; + thpham = { + email = "thomas.pham@ithings.ch"; + github = "thpham"; + name = "Thomas Pham"; + }; + tilpner = { + email = "till@hoeppner.ws"; + github = "tilpner"; + name = "Till Höppner"; + }; + timbertson = { + email = "tim@gfxmonk.net"; + github = "timbertson"; + name = "Tim Cuthbertson"; + }; + timokau = { + email = "timokau@zoho.com"; + github = "timokau"; + name = "Timo Kaufmann"; + }; + timor = { + email = "timor.dd@googlemail.com"; + github = "timor"; + name = "timor"; + }; + tiramiseb = { + email = "sebastien@maccagnoni.eu"; + github = "tiramiseb"; + name = "Sébastien Maccagnoni"; + }; + titanous = { + email = "jonathan@titanous.com"; + github = "titanous"; + name = "Jonathan Rudenberg"; + }; + tnias = { + email = "phil@grmr.de"; + github = "tnias"; + name = "Philipp Bartsch"; + }; + tobim = { + email = "nix@tobim.fastmail.fm"; + github = "tobimpub"; + name = "Tobias Mayer"; + }; + tohl = { + email = "tom@logand.com"; + github = "tohl"; + name = "Tomas Hlavaty"; + }; + tokudan = { + email = "git@danielfrank.net"; + github = "tokudan"; + name = "Daniel Frank"; + }; + tomberek = { + email = "tomberek@gmail.com"; + github = "tomberek"; + name = "Thomas Bereknyei"; + }; + tomsmeets = { + email = "tom@tsmeets.nl"; + github = "tomsmeets"; + name = "Tom Smeets"; + }; + travisbhartwell = { + email = "nafai@travishartwell.net"; + github = "travisbhartwell"; + name = "Travis B. Hartwell"; + }; + treemo = { + email = "matthieu.chevrier@treemo.fr"; + github = "treemo"; + name = "Matthieu Chevrier"; + }; + trevorj = { + email = "nix@trevor.joynson.io"; + github = "akatrevorjay"; + name = "Trevor Joynson"; + }; + trino = { + email = "muehlhans.hubert@ekodia.de"; + github = "hmuehlhans"; + name = "Hubert Mühlhans"; + }; + troydm = { + email = "d.geurkov@gmail.com"; + github = "troydm"; + name = "Dmitry Geurkov"; + }; + tstrobel = { + email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains"; + name = "Thomas Strobel"; + }; + ttuegel = { + email = "ttuegel@mailbox.org"; + github = "ttuegel"; + name = "Thomas Tuegel"; + }; + tv = { + email = "tv@shackspace.de"; + github = "4z3"; + name = "Tomislav Viljetić"; + }; + tvestelind = { + email = "tomas.vestelind@fripost.org"; + github = "tvestelind"; + name = "Tomas Vestelind"; + }; + tvorog = { + email = "marszaripov@gmail.com"; + github = "tvorog"; + name = "Marsel Zaripov"; + }; + tweber = { + email = "tw+nixpkgs@360vier.de"; + github = "thorstenweber83"; + name = "Thorsten Weber"; + }; + twey = { + email = "twey@twey.co.uk"; + github = "twey"; + name = "James ‘Twey’ Kay"; + }; + typetetris = { + email = "ericwolf42@mail.com"; + github = "typetetris"; + name = "Eric Wolf"; + }; + unode = { + email = "alves.rjc@gmail.com"; + github = "unode"; + name = "Renato Alves"; + }; + uralbash = { + email = "root@uralbash.ru"; + github = "uralbash"; + name = "Svintsov Dmitry"; + }; + utdemir = { + email = "me@utdemir.com"; + github = "utdemir"; + name = "Utku Demir"; + }; + uvnikita = { + email = "uv.nikita@gmail.com"; + github = "uvNikita"; + name = "Nikita Uvarov"; + }; + uwap = { + email = "me@uwap.name"; + github = "uwap"; + name = "uwap"; + }; + va1entin = { + email = "github@valentinsblog.com"; + github = "va1entin"; + name = "Valentin Heidelberger"; + }; + vaibhavsagar = { + email = "vaibhavsagar@gmail.com"; + github = "vaibhavsagar"; + name = "Vaibhav Sagar"; + }; + valeriangalliat = { + email = "val@codejam.info"; + github = "valeriangalliat"; + name = "Valérian Galliat"; + }; + vandenoever = { + email = "jos@vandenoever.info"; + github = "vandenoever"; + name = "Jos van den Oever"; + }; + vanschelven = { + email = "klaas@vanschelven.com"; + github = "vanschelven"; + name = "Klaas van Schelven"; + }; + vanzef = { + email = "vanzef@gmail.com"; + github = "vanzef"; + name = "Ivan Solyankin"; + }; + varunpatro = { + email = "varun.kumar.patro@gmail.com"; + github = "varunpatro"; + name = "Varun Patro"; + }; + vbgl = { + email = "Vincent.Laporte@gmail.com"; + github = "vbgl"; + name = "Vincent Laporte"; + }; + vbmithr = { + email = "vb@luminar.eu.org"; + github = "vbmithr"; + name = "Vincent Bernardoff"; + }; + vcunat = { + email = "vcunat@gmail.com"; + github = "vcunat"; + name = "Vladimír Čunát"; + }; + vdemeester = { + email = "vincent@sbr.pm"; + github = "vdemeester"; + name = "Vincent Demeester"; + }; + velovix = { + email = "xaviosx@gmail.com"; + github = "velovix"; + name = "Tyler Compton"; + }; + veprbl = { + email = "veprbl@gmail.com"; + github = "veprbl"; + name = "Dmitry Kalinkin"; + }; + vidbina = { + email = "vid@bina.me"; + github = "vidbina"; + name = "David Asabina"; + }; + vifino = { + email = "vifino@tty.sh"; + github = "vifino"; + name = "Adrian Pistol"; + }; + vinymeuh = { + email = "vinymeuh@gmail.com"; + github = "vinymeuh"; + name = "VinyMeuh"; + }; + viric = { + email = "viric@viric.name"; + github = "viric"; + name = "Lluís Batlle i Rossell"; + }; + vizanto = { + email = "danny@prime.vc"; + github = "vizanto"; + name = "Danny Wilson"; + }; + vklquevs = { + email = "vklquevs@gmail.com"; + github = "vklquevs"; + name = "vklquevs"; + }; + vlstill = { + email = "xstill@fi.muni.cz"; + github = "vlstill"; + name = "Vladimír Štill"; + }; + vmandela = { + email = "venkat.mandela@gmail.com"; + github = "vmandela"; + name = "Venkateswara Rao Mandela"; + }; + vmchale = { + email = "tmchale@wisc.edu"; + github = "vmchale"; + name = "Vanessa McHale"; + }; + volhovm = { + email = "volhovm.cs@gmail.com"; + github = "volhovm"; + name = "Mikhail Volkhov"; + }; + volth = { + email = "jaroslavas@volth.com"; + github = "volth"; + name = "Jaroslavas Pocepko"; + }; + vozz = { + email = "oliver.huntuk@gmail.com"; + name = "Oliver Hunt"; + }; + vrthra = { + email = "rahul@gopinath.org"; + github = "vrthra"; + name = "Rahul Gopinath"; + }; + vyp = { + email = "elisp.vim@gmail.com"; + github = "vyp"; + name = "vyp"; + }; + wedens = { + email = "kirill.wedens@gmail.com"; + name = "wedens"; + }; + willibutz = { + email = "willibutz@posteo.de"; + github = "willibutz"; + name = "Willi Butz"; + }; + willtim = { + email = "tim.williams.public@gmail.com"; + name = "Tim Philip Williams"; + }; + winden = { + email = "windenntw@gmail.com"; + name = "Antonio Vargas Gonzalez"; + }; + wizeman = { + email = "rcorreia@wizy.org"; + github = "wizeman"; + name = "Ricardo M. Correia"; + }; + wjlroe = { + email = "willroe@gmail.com"; + github = "wjlroe"; + name = "William Roe"; + }; + wkennington = { + email = "william@wkennington.com"; + github = "wkennington"; + name = "William A. Kennington III"; + }; + wmertens = { + email = "Wout.Mertens@gmail.com"; + github = "wmertens"; + name = "Wout Mertens"; + }; + woffs = { + email = "github@woffs.de"; + github = "woffs"; + name = "Frank Doepper"; + }; + womfoo = { + email = "kranium@gikos.net"; + github = "womfoo"; + name = "Kranium Gikos Mendoza"; + }; + wscott = { + email = "wsc9tt@gmail.com"; + github = "wscott"; + name = "Wayne Scott"; + }; + wyvie = { + email = "elijahrum@gmail.com"; + github = "wyvie"; + name = "Elijah Rum"; + }; + xaverdh = { + email = "hoe.dom@gmx.de"; + github = "xaverdh"; + name = "Dominik Xaver Hörl"; + }; + xeji = { + email = "xeji@cat3.de"; + github = "xeji"; + name = "xeji"; + }; + xnaveira = { + email = "xnaveira@gmail.com"; + github = "xnaveira"; + name = "Xavier Naveira"; + }; + xnwdd = { + email = "nwdd+nixos@no.team"; + github = "xnwdd"; + name = "Guillermo NWDD"; + }; + xurei = { + email = "olivier.bourdoux@gmail.com"; + github = "xurei"; + name = "Olivier Bourdoux"; + }; + xvapx = { + email = "marti.serra.coscollano@gmail.com"; + github = "xvapx"; + name = "Marti Serra"; + }; + xwvvvvwx = { + email = "davidterry@posteo.de"; + github = "xwvvvvwx"; + name = "David Terry"; + }; + xzfc = { + email = "xzfcpw@gmail.com"; + github = "xzfc"; + name = "Albert Safin"; + }; + y0no = { + email = "y0no@y0no.fr"; + github = "y0no"; + name = "Yoann Ono"; + }; + yarr = { + email = "savraz@gmail.com"; + github = "Eternity-Yarr"; + name = "Dmitry V."; + }; + yegortimoshenko = { + email = "yegortimoshenko@gmail.com"; + github = "yegortimoshenko"; + name = "Yegor Timoshenko"; + }; + yesbox = { + email = "jesper.geertsen.jonsson@gmail.com"; + github = "yesbox"; + name = "Jesper Geertsen Jonsson"; + }; + ylwghst = { + email = "ylwghst@onionmail.info"; + github = "ylwghst"; + name = "Burim Augustin Berisa"; + }; + yochai = { + email = "yochai@titat.info"; + github = "yochai"; + name = "Yochai"; + }; + yorickvp = { + email = "yorickvanpelt@gmail.com"; + github = "yorickvp"; + name = "Yorick van Pelt"; + }; + yrashk = { + email = "yrashk@gmail.com"; + github = "yrashk"; + name = "Yurii Rashkovskii"; + }; + ysndr = { + email = "me@ysndr.de"; + github = "ysndr"; + name = "Yannik Sander"; + }; + yuriaisaka = { + email = "yuri.aisaka+nix@gmail.com"; + github = "yuriaisaka"; + name = "Yuri Aisaka"; + }; + yurrriq = { + email = "eric@ericb.me"; + github = "yurrriq"; + name = "Eric Bailey"; + }; + z77z = { + email = "maggesi@math.unifi.it"; + github = "maggesi"; + name = "Marco Maggesi"; + }; + zagy = { + email = "cz@flyingcircus.io"; + github = "zagy"; + name = "Christian Zagrodnick"; + }; + zalakain = { + email = "contact@unaizalakain.info"; + github = "umazalakain"; + name = "Unai Zalakain"; + }; + zarelit = { + email = "david@zarel.net"; + github = "zarelit"; + name = "David Costa"; + }; + zauberpony = { + email = "elmar@athmer.org"; + github = "zauberpony"; + name = "Elmar Athmer"; + }; + zef = { + email = "zef@zef.me"; + name = "Zef Hemel"; + }; + zimbatm = { + email = "zimbatm@zimbatm.com"; + github = "zimbatm"; + name = "zimbatm"; + }; + zohl = { + email = "zohl@fmap.me"; + github = "zohl"; + name = "Al Zohali"; + }; + zoomulator = { + email = "zoomulator@gmail.com"; + github = "zoomulator"; + name = "Kim Simmons"; + }; + zraexy = { + email = "zraexy@gmail.com"; + github = "zraexy"; + name = "David Mell"; + }; + zx2c4 = { + email = "Jason@zx2c4.com"; + github = "zx2c4"; + name = "Jason A. Donenfeld"; + }; + zzamboni = { + email = "diego@zzamboni.org"; + github = "zzamboni"; + name = "Diego Zamboni"; + }; +} diff --git a/maintainers/scripts/check-maintainer-github-handles.sh b/maintainers/scripts/check-maintainer-github-handles.sh new file mode 100755 index 0000000000000000000000000000000000000000..879a2e452cb334483ac7b53011b8bdda189e306e --- /dev/null +++ b/maintainers/scripts/check-maintainer-github-handles.sh @@ -0,0 +1,66 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq parallel + +# Example how to work with the `lib.maintainers` attrset. +# Can be used to check whether all user handles are still valid. + +set -e + +# nixpkgs='' +# if [ -n "$1" ]; then + +function checkCommits { + local user="$1" + local tmp=$(mktemp) + curl --silent -w "%{http_code}" \ + "https://github.com/NixOS/nixpkgs/commits?author=$user" \ + > "$tmp" + # the last line of tmp contains the http status + local status=$(tail -n1 "$tmp") + local ret= + case $status in + 200) if <"$tmp" grep -i "no commits found" > /dev/null; then + ret=1 + else + ret=0 + fi + ;; + # because of github’s hard request limits, this can take some time + 429) sleep 2 + printf "." + checkCommits "$user" + ret=$? + ;; + *) printf "BAD STATUS: $(tail -n1 $tmp) for %s\n" "$user"; ret=1 + ret=1 + ;; + esac + rm "$tmp" + return $ret +} +export -f checkCommits + +function checkUser { + local user="$1" + local status= + status="$(curl --silent --head "https://github.com/${user}" | grep Status)" + # checks whether a user handle can be found on github + if [[ "$status" =~ 404 ]]; then + printf "%s\t\t\t\t%s\n" "$status" "$user" + # checks whether the user handle has any nixpkgs commits + elif checkCommits "$user"; then + printf "OK!\t\t\t\t%s\n" "$user" + else + printf "No Commits!\t\t\t%s\n" "$user" + fi +} +export -f checkUser + +# output the maintainers set as json +# and filter out the github username of each maintainer (if it exists) +# then check some at the same time +nix-instantiate -A lib.maintainers --eval --strict --json \ + | jq -r '.[]|.github|select(.)' \ + | parallel -j5 checkUser + +# parallel -j100 checkUser ::: "eelco" "profpatsch" "Profpatsch" "a" diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 178dcfb38da4c07cc8d98902f790794169af6968..31e6045fb64564274fbf9fce94b005547a3c83a2 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable +#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings # This command uploads tarballs to tarballs.nixos.org, the # content-addressed cache used by fetchurl as a fallback for when @@ -59,6 +59,7 @@ my $s3 = Net::Amazon::S3->new( { aws_access_key_id => $aws_access_key_id, aws_secret_access_key => $aws_secret_access_key, retry => 1, + host => "s3-eu-west-1.amazonaws.com", }); my $bucket = $s3->bucket("nixpkgs-tarballs") or die; @@ -99,7 +100,10 @@ sub uploadFile { sub redirect { my ($name, $dest) = @_; #print STDERR "linking $name to $dest...\n"; - $bucket->add_key($name, "", { 'x-amz-website-redirect-location' => "/" . $dest }) + $bucket->add_key($name, "", { + 'x-amz-website-redirect-location' => "/" . $dest, + 'x-amz-acl' => "public-read" + }) or die "failed to create redirect from $name to $dest\n"; $cache{$name} = 1; } @@ -111,7 +115,10 @@ sub uploadFile { # Upload the file as sha512/. print STDERR "uploading $fn to $mainKey...\n"; - $bucket->add_key_filename($mainKey, $fn, { 'x-amz-meta-original-name' => $name }) + $bucket->add_key_filename($mainKey, $fn, { + 'x-amz-meta-original-name' => $name, + 'x-amz-acl' => "public-read" + }) or die "failed to upload $fn to $mainKey\n"; $cache{$mainKey} = 1; } diff --git a/maintainers/scripts/debian-patches.sh b/maintainers/scripts/debian-patches.sh index 78678473a49fdaa11e510e2ff5fef43f835e6d9a..b4923fb537e9cd979427648a3a0f419de7740f00 100755 --- a/maintainers/scripts/debian-patches.sh +++ b/maintainers/scripts/debian-patches.sh @@ -4,11 +4,13 @@ # Usage $0 debian-patches.txt debian-patches.nix # An example input and output files can be found in applications/graphics/xara/ -DEB_URL=http://patch-tracker.debian.org/patch/series/dl +DEB_URL=https://sources.debian.org/data/main declare -a deb_patches mapfile -t deb_patches < $1 -prefix="${DEB_URL}/${deb_patches[0]}" +# First letter +deb_prefix="${deb_patches[0]:0:1}" +prefix="${DEB_URL}/${deb_prefix}/${deb_patches[0]}/debian/patches" if [[ -n "$2" ]]; then exec 1> $2 diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index a2b8080e2a4338f497446ee62339048b885cb4a0..1357f87aaa5d3ced8b152e003037afa2744d88d3 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -21,7 +21,7 @@ find . -type f | while read src; do # Sanitize file name filename=$(basename "$src" | tr '@' '_') nameVersion="${filename%.tar.*}" - name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') + name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,') version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') echo "$name,$version,$src,$filename" >>$csv done diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh deleted file mode 100755 index d44bda53f8d68fd5b912d653ffffed408f69aa36..0000000000000000000000000000000000000000 --- a/maintainers/scripts/gnome.sh +++ /dev/null @@ -1,192 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail - -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="ghex gtkhtml gdm gucharmap" - -usage() { - echo "Usage: $0 || [major.minor]" >&2 - exit 0 -} - -if [ "$#" -lt 1 ]; then - usage -fi - -GNOME_TOP=pkgs/desktops/gnome-3 - -action=$1 - -# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have -# any conversations with sysadmin. Somehow lftp works. -if [ "$FTP_CLIENT" = "lftp" ]; then - ls_ftp() { - lftp -c "open $1; cls" - } -else - ls_ftp() { - curl -s -l "$1"/ - } -fi - -find_project() { - exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d "$@" -} - -show_project() { - local project=$1 - local majorVersion=$2 - local version= - - if [ -z "$majorVersion" ]; then - echo "Looking for available versions..." >&2 - local available_baseversions=$(ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n) - if [ "$?" -ne 0 ]; then - echo "Project $project not found" >&2 - return 1 - fi - - echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2 - echo -en "Choose one of them: " >&2 - read majorVersion - fi - - if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then - # not a major version - version=$majorVersion - majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2) - fi - - local FTPDIR=${GNOME_FTP}/${project}/${majorVersion} - - #version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//` - # gnome's LATEST-IS is broken. Do not trust it. - - if [ -z "$version" ]; then - local files=$(ls_ftp "${FTPDIR}") - declare -A versions - - for f in $files; do - case $f in - (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*): - ;; - ($project-*.*.9*.tar.*): - tmp=${f#$project-} - tmp=${tmp%.tar*} - echo "Ignored unstable version ${tmp}" >&2 - ;; - ($project-*.tar.*): - tmp=${f#$project-} - tmp=${tmp%.tar*} - versions[${tmp}]=1 - ;; - (*): - echo "UNKNOWN FILE $f" >&2 - ;; - esac - done - echo "Found versions ${!versions[@]}" >&2 - version=$(echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1) - if [ -z "$version" ]; then - echo "No version available for major $majorVersion" >&2 - return 1 - fi - - echo "Latest version is: ${version}" >&2 - fi - - local name=${project}-${version} - echo "Fetching .sha256 file" >&2 - local sha256out=$(curl -s -f http://"${FTPDIR}"/"${name}".sha256sum) - - if [ "$?" -ne "0" ]; then - echo "Version not found" >&2 - return 1 - fi - - extensions=( "xz" "bz2" "gz" ) - echo "Choosing archive extension (known are ${extensions[@]})..." >&2 - for ext in ${extensions[@]}; do - if echo -e "$sha256out" | grep -q "\\.tar\\.${ext}$"; then - ext_pref=$ext - sha256=$(echo -e "$sha256out" | grep "\\.tar\\.${ext}$" | cut -f1 -d\ ) - break - fi - done - echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 - - echo "# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = \"${project}-${version}\"; - - src = fetchurl { - url = mirror://gnome/sources/${project}/${majorVersion}/${project}-${version}.tar.${ext_pref}; - sha256 = \"${sha256}\"; - }; -}" - - return 0 -} - -update_project() { - local project=$1 - local majorVersion=$2 - - # find project in nixpkgs tree - projectPath=$(find_project -name "$project" -print) - if [ -z "$projectPath" ]; then - echo "Project $project not found under $GNOME_TOP" - exit 1 - fi - - src=$(show_project "$project" "$majorVersion") - - if [ "$?" -eq "0" ]; then - echo "Updating $projectPath/src.nix" >&2 - echo -e "$src" > "$projectPath"/src.nix - fi - - return 0 -} - -if [ "$action" = "update-all" ]; then - majorVersion=$2 - if [ -z "$majorVersion" ]; then - echo "No major version specified" >&2 - usage - fi - - # find projects - projects=$(find_project -exec basename '{}' \;) - for project in $projects; do - if echo "$NO_GNOME_MAJOR"|grep -q $project; then - echo "Skipping $project" - else - echo "= Updating $project to $majorVersion" >&2 - update_project "$project" "$majorVersion" - echo >&2 - fi - done -else - project=$2 - majorVersion=$3 - - if [ -z "$project" ]; then - echo "No project specified, exiting" >&2 - usage - fi - - if [ "$action" = show ]; then - show_project "$project" "$majorVersion" - elif [ "$action" = update ]; then - update_project "$project" "$majorVersion" - else - echo "Unknown action $action" >&2 - usage - fi -fi diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index ddc3c7c4a96752f731b7661a8632b91441da1e0e..d0bd1913ba8a71d89eb7208bbca66d8cff695c84 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -13,7 +13,7 @@ from pyquery import PyQuery as pq maintainers_json = subprocess.check_output([ - 'nix-instantiate', '-E', 'import ./lib/maintainers.nix {}', '--eval', '--json' + 'nix-instantiate', '-E', 'import ./maintainers/maintainer-list.nix {}', '--eval', '--json' ]) maintainers = json.loads(maintainers_json) MAINTAINERS = {v: k for k, v in maintainers.iteritems()} diff --git a/maintainers/scripts/rebuild-amount.sh b/maintainers/scripts/rebuild-amount.sh index 098a8c88cb7e26bb0e6cb9947afda75c985a069e..1a54cada8af678860ae1a17ee4584832a57f6e4e 100755 --- a/maintainers/scripts/rebuild-amount.sh +++ b/maintainers/scripts/rebuild-amount.sh @@ -1,9 +1,16 @@ #!/usr/bin/env bash set -e +# --print: avoid dependency on environment +optPrint= +if [ "$1" == "--print" ]; then + optPrint=true + shift +fi + if [ "$#" != 1 ] && [ "$#" != 2 ]; then cat <<-EOF - Usage: $0 commit-spec [commit-spec] + Usage: $0 [--print] 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 @@ -113,3 +120,8 @@ newPkgs "${tree[1]}" "${tree[2]}" '--argstr system "x86_64-linux"' > "$newlist" sed -n 's/\([^. ]*\.\)*\([^. ]*\) .*$/\2/p' < "$newlist" \ | sort | uniq -c +if [ -n "$optPrint" ]; then + echo + cat "$newlist" +fi + diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 3ddc8c23a79be8d8b3ee7ad9a90f6b09b6385d9f..4536662c8420b29025d68218fbeef2a41d148e15 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests toolz ])' +#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git """ Update a Python package expression by passing in the `.nix` file, or the directory containing it. @@ -18,7 +18,12 @@ import os import re import requests import toolz -from concurrent.futures import ThreadPoolExecutor as pool +from concurrent.futures import ThreadPoolExecutor as Pool +from packaging.version import Version as _Version +from packaging.version import InvalidVersion +from packaging.specifiers import SpecifierSet +import collections +import subprocess INDEX = "https://pypi.io/pypi" """url of PyPI""" @@ -26,10 +31,30 @@ INDEX = "https://pypi.io/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.""" +PRERELEASES = False + import logging logging.basicConfig(level=logging.INFO) +class Version(_Version, collections.abc.Sequence): + + def __init__(self, version): + super().__init__(version) + # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21` + # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882 + self.raw_version = version + + def __getitem__(self, i): + return self._version.release[i] + + def __len__(self): + return len(self._version.release) + + def __iter__(self): + yield from self._version.release + + def _get_values(attribute, text): """Match attribute in text and return all matches. @@ -82,13 +107,59 @@ def _fetch_page(url): else: raise ValueError("request for {} failed".format(url)) -def _get_latest_version_pypi(package, extension): + +SEMVER = { + 'major' : 0, + 'minor' : 1, + 'patch' : 2, +} + + +def _determine_latest_version(current_version, target, versions): + """Determine latest version, given `target`. + """ + current_version = Version(current_version) + + def _parse_versions(versions): + for v in versions: + try: + yield Version(v) + except InvalidVersion: + pass + + versions = _parse_versions(versions) + + index = SEMVER[target] + + ceiling = list(current_version[0:index]) + if len(ceiling) == 0: + ceiling = None + else: + ceiling[-1]+=1 + ceiling = Version(".".join(map(str, ceiling))) + + # We do not want prereleases + versions = SpecifierSet(prereleases=PRERELEASES).filter(versions) + + if ceiling is not None: + versions = SpecifierSet(f"<{ceiling}").filter(versions) + + return (max(sorted(versions))).raw_version + + +def _get_latest_version_pypi(package, extension, current_version, target): """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]: + versions = json['releases'].keys() + version = _determine_latest_version(current_version, target, versions) + + try: + releases = json['releases'][version] + except KeyError as e: + raise KeyError('Could not find version {} for {}'.format(version, package)) from e + for release in releases: if release['filename'].endswith(extension): # TODO: In case of wheel we need to do further checks! sha256 = release['digests']['sha256'] @@ -98,7 +169,7 @@ def _get_latest_version_pypi(package, extension): return version, sha256 -def _get_latest_version_github(package, extension): +def _get_latest_version_github(package, extension, current_version, target): raise ValueError("updating from GitHub is not yet supported.") @@ -141,9 +212,9 @@ def _determine_extension(text, fetcher): """ if fetcher == 'fetchPypi': try: - format = _get_unique_value('format', text) + src_format = _get_unique_value('format', text) except ValueError as e: - format = None # format was not given + src_format = None # format was not given try: extension = _get_unique_value('extension', text) @@ -151,9 +222,11 @@ def _determine_extension(text, fetcher): extension = None # extension was not given if extension is None: - if format is None: - format = 'setuptools' - extension = FORMATS[format] + if src_format is None: + src_format = 'setuptools' + elif src_format == 'flit': + raise ValueError("Don't know how to update a Flit package.") + extension = FORMATS[src_format] elif fetcher == 'fetchurl': url = _get_unique_value('url', text) @@ -167,9 +240,7 @@ def _determine_extension(text, fetcher): return extension -def _update_package(path): - - +def _update_package(path, target): # Read the expression with open(path, 'r') as f: @@ -186,11 +257,13 @@ def _update_package(path): extension = _determine_extension(text, fetcher) - new_version, new_sha256 = _get_latest_version_pypi(pname, extension) + new_version, new_sha256 = FETCHERS[fetcher](pname, extension, version, target) if new_version == version: logging.info("Path {}: no update available for {}.".format(path, pname)) return False + elif new_version <= version: + raise ValueError("downgrade for {}.".format(pname)) if not new_sha256: raise ValueError("no file available for {}.".format(pname)) @@ -202,10 +275,19 @@ def _update_package(path): logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version)) - return True + result = { + 'path' : path, + 'target': target, + 'pname': pname, + 'old_version' : version, + 'new_version' : new_version, + #'fetcher' : fetcher, + } + return result -def _update(path): + +def _update(path, target): # We need to read and modify a Nix expression. if os.path.isdir(path): @@ -222,24 +304,58 @@ def _update(path): return False try: - return _update_package(path) + return _update_package(path, target) except ValueError as e: logging.warning("Path {}: {}".format(path, e)) return False + +def _commit(path, pname, old_version, new_version, **kwargs): + """Commit result. + """ + + msg = f'python: {pname}: {old_version} -> {new_version}' + + try: + subprocess.check_call(['git', 'add', path]) + subprocess.check_call(['git', 'commit', '-m', msg]) + except subprocess.CalledProcessError as e: + subprocess.check_call(['git', 'checkout', path]) + raise subprocess.CalledProcessError(f'Could not commit {path}') from e + + return True + + def main(): parser = argparse.ArgumentParser() parser.add_argument('package', type=str, nargs='+') + parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major') + parser.add_argument('--commit', action='store_true', help='Create a commit for each package update') args = parser.parse_args() + target = args.target + + packages = list(map(os.path.abspath, args.package)) + + logging.info("Updating packages...") + + # Use threads to update packages concurrently + with Pool() as p: + results = list(p.map(lambda pkg: _update(pkg, target), packages)) + + logging.info("Finished updating packages.") + + # Commits are created sequentially. + if args.commit: + logging.info("Committing updates...") + list(map(lambda x: _commit(**x), filter(bool, results))) + logging.info("Finished committing updates") - packages = map(os.path.abspath, args.package) + count = sum(map(bool, results)) + logging.info("{} package(s) updated".format(count)) - with pool() as p: - count = list(p.map(_update, packages)) - logging.info("{} package(s) updated".format(sum(count))) if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 2035950da3e33175f06dd85dbb80f1eef9da6978..8d1e47c6bc951d3e601cf573cf63937734ba8f93 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -1,37 +1,51 @@ { package ? null , maintainer ? null +, path ? null }: # TODO: add assert statements let + /* Remove duplicate elements from the list based on some extracted value. O(n^2) complexity. + */ + nubOn = f: list: + if list == [] then + [] + else + let + x = pkgs.lib.head list; + xs = pkgs.lib.filter (p: f x != f p) (pkgs.lib.drop 1 list); + in + [x] ++ nubOn f xs; pkgs = import ./../../default.nix { }; packagesWith = cond: return: set: - pkgs.lib.flatten - (pkgs.lib.mapAttrsToList - (name: pkg: - let - result = builtins.tryEval ( - if pkgs.lib.isDerivation pkg && cond name pkg - then [(return name pkg)] - else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false - then packagesWith cond return pkg + nubOn (pkg: pkg.updateScript) + (pkgs.lib.flatten + (pkgs.lib.mapAttrsToList + (name: pkg: + let + result = builtins.tryEval ( + if pkgs.lib.isDerivation pkg && cond name pkg + then [(return name pkg)] + else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false + then packagesWith cond return pkg + else [] + ); + in + if result.success then result.value else [] - ); - in - if result.success then result.value - else [] + ) + set ) - set ); packagesWithUpdateScriptAndMaintainer = maintainer': let maintainer = if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then - builtins.throw "Maintainer with name `${maintainer'} does not exist in `lib/maintainers.nix`." + builtins.throw "Maintainer with name `${maintainer'} does not exist in `maintainers/maintainer-list.nix`." else builtins.getAttr maintainer' pkgs.lib.maintainers; in @@ -47,6 +61,14 @@ let (name: pkg: pkg) pkgs; + packagesWithUpdateScript = path: + let + attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." path) null pkgs; + in + packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg) + (name: pkg: pkg) + attrSet; + packageByName = name: let package = pkgs.lib.attrByPath (pkgs.lib.splitString "." name) null pkgs; @@ -54,7 +76,7 @@ let if package == null then builtins.throw "Package with an attribute name `${name}` does not exists." else if ! builtins.hasAttr "updateScript" package then - builtins.throw "Package with an attribute name `${name}` does have an `passthru.updateScript` defined." + builtins.throw "Package with an attribute name `${name}` does not have a `passthru.updateScript` attribute defined." else package; @@ -63,6 +85,8 @@ let [ (packageByName package) ] else if maintainer != null then packagesWithUpdateScriptAndMaintainer maintainer + else if path != null then + packagesWithUpdateScript path else builtins.throw "No arguments provided.\n\n${helpText}"; @@ -76,7 +100,11 @@ let % nix-shell maintainers/scripts/update.nix --argstr package garbas - to run update script for specific package. + to run update script for specific package, or + + % nix-shell maintainers/scripts/update.nix --argstr path gnome3 + + to run update script for all package under an attribute path. ''; runUpdateScript = package: '' diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh index 27e7741799f0fbb76299fc3574faf73e0301518f..aa7d4ec967dafb6b7d75de7ba63d7a3cce090195 100755 --- a/maintainers/scripts/vanity.sh +++ b/maintainers/scripts/vanity.sh @@ -10,7 +10,7 @@ git_data="$(echo "$raw_git_log" | grep 'Author:' | # Name - nick - email correspondence from log and from maintainer list # Also there are a few manual entries -maintainers="$(cat "$(dirname "$0")/../../lib/maintainers.nix" | +maintainers="$(cat "$(dirname "$0")/../maintainer-list.nix" | grep '=' | sed -re 's/\\"/''/g; s/[ ]*([^ =]*)[ ]*=[ ]*" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')" git_lines="$( ( echo "$git_data"; diff --git a/nixos/default.nix b/nixos/default.nix index 0e45a1cd75e241d7101f19aa57fd198a0e2a5312..45da78e9261ccb54cd23189caceed8590efbc86c 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -9,8 +9,6 @@ let modules = [ configuration ]; }; - inherit (eval) pkgs; - # This is for `nixos-rebuild build-vm'. vmConfig = (import ./lib/eval-config.nix { inherit system; @@ -30,7 +28,7 @@ let in { - inherit (eval) config options; + inherit (eval) pkgs config options; system = eval.config.system.build.toplevel; diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml index 87406c28c2f767372cae9837d2f6835a253d91dd..75cccef95b38f06af0667772bcdd1c4b2c1b4c93 100644 --- a/nixos/doc/manual/configuration/firewall.xml +++ b/nixos/doc/manual/configuration/firewall.xml @@ -23,10 +23,23 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; Note that TCP port 22 (ssh) is opened automatically if the SSH daemon -is enabled (). UDP +is enabled (). UDP ports can be opened through -. Also of -interest is +. + +To open ranges of TCP ports: + + +networking.firewall.allowedTCPPortRanges = [ + { from = 4000; to = 4007; } + { from = 8000; to = 8010; } +]; + + +Similarly, UDP port ranges can be opened through +. + +Also of interest is networking.firewall.allowPing = true; diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index 053501b1736d2982b977351fe6a556329cb7b5a6..68238b547d60fb79eb3ff704af62ddedb23c9fb3 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,7 +12,7 @@ interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ]; +networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; Typically you’ll also want to set a default gateway and set of name diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index 6d9e0a164e9edda10158e86a1acd32745acc91c2..74a21e18ec3fee57a8f1f5e9cd37304c45d41ab3 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -26,7 +26,7 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; DHCPv6. You can configure an interface manually: -networking.interfaces.eth0.ip6 = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; +networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 2bd9cca5622f2869a7e793fcadb26d73d54ff089..c6656edff6c8f5ffee70efd61089ded8b66ba20b 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -12,7 +12,7 @@ management. In the declarative style, users are specified in states that a user account named alice shall exist: -users.extraUsers.alice = +users.users.alice = { isNormalUser = true; home = "/home/alice"; description = "Alice Foobar"; @@ -34,7 +34,7 @@ to set a password, which is retained across invocations of If you set users.mutableUsers to false, then the contents of /etc/passwd and /etc/group will be congruent to your NixOS configuration. For instance, -if you remove a user from users.extraUsers and run nixos-rebuild, the user +if you remove a user from users.users and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. Passwords may still be assigned by setting the user's hashedPassword option. A @@ -54,7 +54,7 @@ to the user specification. group named students shall exist: -users.extraGroups.students.gid = 1000; +users.groups.students.gid = 1000; As with users, the group ID (gid) is optional and will be assigned @@ -68,8 +68,8 @@ account named alice: # useradd -m alice -To make all nix tools available to this new user use `su - USER` which -opens a login shell (==shell that loads the profile) for given user. +To make all nix tools available to this new user use `su - USER` which +opens a login shell (==shell that loads the profile) for given user. This will create the ~/.nix-defexpr symlink. So run: diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index fc6082ce3afd6212845585dbebcb6eed9af2be07..9c2c59006f15d04453c352b8052e6802f22df60a 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -115,13 +115,14 @@ hardware.opengl.driSupport32Bit = true; Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows: -services.xserver.synaptics.enable = true; +services.xserver.libinput.enable = true; The driver has many options (see ). For -instance, the following enables two-finger scrolling: +instance, the following disables tap-to-click behavior: -services.xserver.synaptics.twoFingerScroll = true; +services.xserver.libinput.tapping = false; +Note: the use of services.xserver.synaptics is deprecated since NixOS 17.09. @@ -129,7 +130,7 @@ services.xserver.synaptics.twoFingerScroll = true; GTK/Qt themes GTK themes can be installed either to user profile or system-wide (via -system.environmentPackages). To make Qt 5 applications look similar +environment.systemPackages). To make Qt 5 applications look similar to GTK2 ones, you can install qt5.qtbase.gtk package into your system environment. It should work for all Qt 5 library versions. diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 21c7a85e19ccbdb966d9cd993f6d6d6b78465324..18804d2c08bed85d4c9716f258493a0d55fffb71 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -35,18 +35,7 @@ services.compton = { To install them manually (system wide), put them into your environment.systemPackages. - - - NixOS’s default display manager is SLiM. - (DM is the program that provides a graphical login prompt - and manages the X server.) - You can, for example, select KDE’s - sddm instead: - -services.xserver.displayManager.sddm.enable = true; - - - + Thunar Volume Support diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 9413d71a34cf229d3e5c24c9eeb674ffb7ae275f..ac22712baf87aecffc480dca4d067548ea806999 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -6,22 +6,52 @@ let lib = pkgs.lib; # Remove invisible and internal options. - optionsList = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); + optionsListVisible = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); # Replace functions by the string substFunction = x: if builtins.isAttrs x then lib.mapAttrs (name: substFunction) x else if builtins.isList x then map substFunction x - else if builtins.isFunction x then "" + else if lib.isFunction x then "" else x; - # Clean up declaration sites to not refer to the NixOS source tree. - optionsList' = lib.flip map optionsList (opt: opt // { + # Generate DocBook documentation for a list of packages. This is + # what `relatedPackages` option of `mkOption` from + # ../../../lib/options.nix influences. + # + # Each element of `relatedPackages` can be either + # - a string: that will be interpreted as an attribute name from `pkgs`, + # - a list: that will be interpreted as an attribute path from `pkgs`, + # - an attrset: that can specify `name`, `path`, `package`, `comment` + # (either of `name`, `path` is required, the rest are optional). + genRelatedPackages = packages: + let + unpack = p: if lib.isString p then { name = p; } + else if lib.isList p then { path = p; } + else p; + describe = args: + let + name = args.name or (lib.concatStringsSep "." args.path); + path = args.path or [ args.name ]; + package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs); + in "" + + "pkgs.${name} (${package.meta.name})" + + lib.optionalString (!package.meta.available) " [UNAVAILABLE]" + + ": ${package.meta.description or "???"}." + + lib.optionalString (args ? comment) "\n${args.comment}" + # Lots of `longDescription's break DocBook, so we just wrap them into + + lib.optionalString (package.meta ? longDescription) "\n${package.meta.longDescription}" + + ""; + in "${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}"; + + optionsListDesc = lib.flip map optionsListVisible (opt: opt // { + # Clean up declaration sites to not refer to the NixOS source tree. declarations = map stripAnyPrefixes opt.declarations; } // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; } // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; } - // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; }); + // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; } + // lib.optionalAttrs (opt ? relatedPackages) { relatedPackages = genRelatedPackages opt.relatedPackages; }); # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, @@ -32,8 +62,21 @@ let prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources); stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip; + # Custom "less" that pushes up all the things ending in ".enable*" + # and ".package*" + optionLess = a: b: + let + ise = lib.hasPrefix "enable"; + isp = lib.hasPrefix "package"; + cmp = lib.splitByAndCompare ise lib.compare + (lib.splitByAndCompare isp lib.compare lib.compare); + in lib.compareLists cmp a.loc b.loc < 0; + + # Customly sort option list for the man page. + optionsList = lib.sort optionLess optionsListDesc; + # Convert the list of options into an XML file. - optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList'); + optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); optionsDocBook = runCommand "options-db.xml" {} '' optionsXML=${optionsXML} @@ -44,7 +87,7 @@ let echo "for hints about the offending path)." exit 1 fi - ${libxslt.bin}/bin/xsltproc \ + ${buildPackages.libxslt.bin}/bin/xsltproc \ --stringparam revision '${revision}' \ -o $out ${./options-to-docbook.xsl} $optionsXML ''; @@ -81,11 +124,12 @@ let manualXsltprocOptions = toString [ "--param section.autolabel 1" "--param section.label.includes.component.label 1" - "--stringparam html.stylesheet style.css" + "--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'" + "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'" "--param xref.with.number.and.title 1" "--param toc.section.depth 3" "--stringparam admon.style ''" - "--stringparam callout.graphics.extension .gif" + "--stringparam callout.graphics.extension .svg" "--stringparam current.docid manual" "--param chunk.section.depth 0" "--param chunk.first.sections 1" @@ -96,7 +140,7 @@ let manual-combined = runCommand "nixos-manual-combined" { inherit sources; - buildInputs = [ libxml2 libxslt ]; + nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; meta.description = "The NixOS manual as plain docbook XML"; } '' @@ -106,13 +150,43 @@ let 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 - + # outputs the context of an xmllint error output + # LEN lines around the failing line are printed + function context { + # length of context + local LEN=6 + # lines to print before error line + local BEFORE=4 + + # xmllint output lines are: + # file.xml:1234: there was an error on line 1234 + while IFS=':' read -r file line rest; do + echo + if [[ -n "$rest" ]]; then + echo "$file:$line:$rest" + local FROM=$(($line>$BEFORE ? $line - $BEFORE : 1)) + # number lines & filter context + nl --body-numbering=a "$file" | sed -n "$FROM,+$LEN p" + else + if [[ -n "$line" ]]; then + echo "$file:$line" + else + echo "$file" + fi + fi + done + } + + function lintrng { + xmllint --debug --noout --nonet \ + --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ + "$1" \ + 2>&1 | context 1>&2 + # ^ redirect assumes xmllint doesn’t print to stdout + } + + lintrng manual-combined.xml + lintrng man-pages-combined.xml mkdir $out cp manual-combined.xml $out/ @@ -121,7 +195,7 @@ let olinkDB = runCommand "manual-olinkdb" { inherit sources; - buildInputs = [ libxml2 libxslt ]; + nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; } '' xsltproc \ @@ -161,7 +235,7 @@ in rec { mkdir -p $dst cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON - (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList')))) + (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList)))) } $dst/options.json mkdir -p $out/nix-support @@ -171,7 +245,7 @@ in rec { # Generate the NixOS manual. manual = runCommand "nixos-manual" { inherit sources; - buildInputs = [ libxml2 libxslt ]; + nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; meta.description = "The NixOS manual in HTML format"; allowedReferences = ["out"]; } @@ -187,9 +261,11 @@ in rec { ${manual-combined}/manual-combined.xml mkdir -p $dst/images/callouts - cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/ + cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ - cp ${./style.css} $dst/style.css + cp ${../../../doc/style.css} $dst/style.css + cp ${../../../doc/overrides.css} $dst/overrides.css + cp -r ${pkgs.documentation-highlighter} $dst/highlightjs mkdir -p $out/nix-support echo "nix-build out $out" >> $out/nix-support/hydra-build-products @@ -199,7 +275,7 @@ in rec { manualEpub = runCommand "nixos-manual-epub" { inherit sources; - buildInputs = [ libxml2 libxslt zip ]; + buildInputs = [ libxml2.bin libxslt.bin zip ]; } '' # Generate the epub manual. @@ -213,7 +289,7 @@ in rec { ${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/*.svg $dst/epub/OEBPS/images/callouts # */ echo "application/epub+zip" > mimetype manual="$dst/nixos-manual.epub" zip -0Xq "$manual" mimetype @@ -229,7 +305,7 @@ in rec { # Generate the NixOS manpages. manpages = runCommand "nixos-manpages" { inherit sources; - buildInputs = [ libxml2 libxslt ]; + nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; allowedReferences = ["out"]; } '' diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index be793152f9ef982bae25ccddd9c2ec4811783b94..ed718c89eb77cf6577c09539701f66070f697529 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -22,6 +22,15 @@ options = { }; +The attribute names within the name +attribute path must be camel cased in general but should, as an +exception, match the + +package attribute name when referencing a Nixpkgs package. For +example, the option services.nix-serve.bindAddress +references the nix-serve Nixpkgs package. + The function mkOption accepts the following arguments. diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 83dcf0232d9d3c4981b21f526f3357c9b913a9a5..13fa8d1e114cce7db822e2b1bf41d411b34c3f0b 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -110,6 +110,12 @@ A string. Multiple definitions are concatenated with a collon ":". + + types.strMatching + A string matching a specific regular expression. Multiple + definitions cannot be merged. The regular expression is processed using + builtins.match. +
@@ -276,8 +282,8 @@ options.mod = mkOption { option set (). -Declaration of a list - nof submodules +Declaration of a list + of submodules options.mod = mkOption { description = "submodule example"; diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml index 20c8d51815ad3da2ad5f73bc06e340869a2a63b6..16bc8125d9ff48ccdf46d6a782d5ca99f29cb812 100644 --- a/nixos/doc/manual/development/testing-installer.xml +++ b/nixos/doc/manual/development/testing-installer.xml @@ -11,15 +11,17 @@ tedious, so here is a quick way to see if the installer works properly: -$ nix-build -A config.system.build.nixos-install # mount -t tmpfs none /mnt +# nixos-generate-config --root /mnt +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install # ./result/bin/nixos-install To start a login shell in the new NixOS installation in /mnt: -# ./result/bin/nixos-install --chroot +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter +# ./result/bin/nixos-enter diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index b9da712b86f030a690de98ecf1e1e77a1781ae13..a8f6aa00858e3229493a678372ec3a554e6b6a6a 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -262,8 +262,47 @@ startAll; waitForWindow(qr/Terminal/). + + copyFileFromHost + Copies a file from host to machine, e.g., + copyFileFromHost("myfile", "/etc/my/important/file"). + The first argument is the file on the host. The file needs to be + accessible while building the nix derivation. The second argument is + the location of the file on the machine. + + + + + systemctl + + Runs systemctl commands with optional support for + systemctl --user + + + $machine->systemctl("list-jobs --no-pager"); // runs `systemctl list-jobs --no-pager` + $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` + + + + + -
\ No newline at end of file + + To test user units declared by systemd.user.services the optional $user + argument can be used: + + + $machine->start; + $machine->waitForX; + $machine->waitForUnit("xautolock.service", "x-session-user"); + + + This applies to systemctl, getUnitInfo, + waitForUnit, startJob + and stopJob. + + +
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 75df307a1b7c8ca9a6762c4b6bf2cb5199a58741..4db9020b96064a09d2fbf6abceed87d3b928b6de 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -70,9 +70,21 @@ $ ./result/bin/run-*-vm The VM does not have any data from your host system, so your existing -user accounts and home directories will not be available. You can -forward ports on the host to the guest. For instance, the following -will forward host port 2222 to guest port 22 (SSH): +user accounts and home directories will not be available unless you +have set mutableUsers = false. Another way is to +temporarily add the following to your configuration: + + +users.extraUsers.your-user.initialPassword = "test" + + +Important: delete the $hostname.qcow2 file if you +have started the virtual machine at least once without the right +users, otherwise the changes will not get picked up. + +You can forward ports on the host to the guest. For +instance, the following will forward host port 2222 to guest port 22 +(SSH): $ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml new file mode 100644 index 0000000000000000000000000000000000000000..ecd020a067a95ff5750581af3c252ae54ca25cb0 --- /dev/null +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -0,0 +1,309 @@ + +
+ + Installing from another Linux distribution + + + Because Nix (the package manager) & Nixpkgs (the Nix packages + collection) can both be installed on any (most?) Linux distributions, + they can be used to install NixOS in various creative ways. You can, + for instance: + + + + Install NixOS on another partition, from your existing + Linux distribution (without the use of a USB or optical + device!) + + Install NixOS on the same partition (in place!), from + your existing non-NixOS Linux distribution using + NIXOS_LUSTRATE. + + Install NixOS on your hard drive from the Live CD of + any Linux distribution. + + + The first steps to all these are the same: + + + + Install the Nix package manager: + + Short version: + + +$ bash <(curl https://nixos.org/nix/install) +$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell + + More details in the + Nix manual + + + + Switch to the NixOS channel: + + If you've just installed Nix on a non-NixOS distribution, you + will be on the nixpkgs channel by + default. + + +$ nix-channel --list +nixpkgs https://nixos.org/channels/nixpkgs-unstable + + As that channel gets released without running the NixOS + tests, it will be safer to use the nixos-* + channels instead: + + +$ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs + + You may want to throw in a nix-channel + --update for good measure. + + + + Install the NixOS installation tools: + + You'll need nixos-generate-config and + nixos-install and we'll throw in some man + pages and nixos-enter just in case you want + to chroot into your NixOS partition. They are installed by + default on NixOS, but you don't have NixOS yet.. + + $ nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]" + + + + The following 5 steps are only for installing NixOS to + another partition. For installing NixOS in place using + NIXOS_LUSTRATE, skip ahead. + + Prepare your target partition: + + At this point it is time to prepare your target partition. + Please refer to the partitioning, file-system creation, and + mounting steps of + + If you're about to install NixOS in place using + NIXOS_LUSTRATE there is nothing to do for + this step. + + + + Generate your NixOS configuration: + + $ sudo `which nixos-generate-config` --root /mnt + + You'll probably want to edit the configuration files. Refer + to the nixos-generate-config step in for more information. + + Consider setting up the NixOS bootloader to give you the + ability to boot on your existing Linux partition. For instance, + if you're using GRUB and your existing distribution is running + Ubuntu, you may want to add something like this to your + configuration.nix: + + +boot.loader.grub.extraEntries = '' + menuentry "Ubuntu" { + search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e + configfile "($ubuntu)/boot/grub/grub.cfg" + } +''; + + (You can find the appropriate UUID for your partition in + /dev/disk/by-uuid) + + + + Create the nixbld group and user on your + original distribution: + + +$ sudo groupadd -g 30000 nixbld +$ sudo useradd -u 30000 -g nixbld -G nixbld nixbld + + + + Download/build/install NixOS: + + Once you complete this step, you might no longer be + able to boot on existing systems without the help of a + rescue USB drive or similar. + + $ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt + + Again, please refer to the nixos-install + step in for more + information. + + That should be it for installation to another partition! + + + + Optionally, you may want to clean up your non-NixOS distribution: + + +$ sudo userdel nixbld +$ sudo groupdel nixbld + + If you do not wish to keep the Nix package mananager + installed either, run something like sudo rm -rv + ~/.nix-* /nix and remove the line that the Nix + installer added to your ~/.profile. + + + + The following steps are only for installing NixOS in + place using + NIXOS_LUSTRATE: + + Generate your NixOS configuration: + + $ sudo `which nixos-generate-config` --root / + + Note that this will place the generated configuration files + in /etc/nixos. You'll probably want to edit + the configuration files. Refer to the + nixos-generate-config step in for more information. + + You'll likely want to set a root password for your first boot + using the configuration files because you won't have a chance + to enter a password until after you reboot. You can initalize + the root password to an empty one with this line: (and of course + don't forget to set one once you've rebooted or to lock the + account with sudo passwd -l root if you use + sudo) + + users.extraUsers.root.initialHashedPassword = ""; + + + + Build the NixOS closure and install it in the + system profile: + + $ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system + + + + Change ownership of the /nix tree to root + (since your Nix install was probably single user): + + $ sudo chown -R 0.0 /nix + + + + Set up the /etc/NIXOS and + /etc/NIXOS_LUSTRATE files: + + /etc/NIXOS officializes that this is now a + NixOS partition (the bootup scripts require its presence). + + /etc/NIXOS_LUSTRATE tells the NixOS bootup + scripts to move everything that's in the + root partition to /old-root. This will move + your existing distribution out of the way in the very early + stages of the NixOS bootup. There are exceptions (we do need to + keep NixOS there after all), so the NixOS lustrate process will + not touch: + + + The /nix + directory + + The /boot + directory + + Any file or directory listed in + /etc/NIXOS_LUSTRATE (one per + line) + + + Support for NIXOS_LUSTRATE was added + in NixOS 16.09. The act of "lustrating" refers to the + wiping of the existing distribution. Creating + /etc/NIXOS_LUSTRATE can also be used on + NixOS to remove all mutable files from your root partition + (anything that's not in /nix or + /boot gets "lustrated" on the next + boot. + lustrate /ˈlʌstreɪt/ verb. + purify by expiatory sacrifice, ceremonial washing, or + some other ritual action. + + Let's create the files: + + +$ sudo touch /etc/NIXOS +$ sudo touch /etc/NIXOS_LUSTRATE + + Let's also make sure the NixOS configuration files are kept + once we reboot on NixOS: + + +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + + + + Finally, move the /boot directory of your + current distribution out of the way (the lustrate process will + take care of the rest once you reboot, but this one must be + moved out now because NixOS needs to install its own boot + files: + + Once you complete this step, your current + distribution will no longer be bootable! If you didn't get + all the NixOS configuration right, especially those + settings pertaining to boot loading and root partition, + NixOS may not be bootable either. Have a USB rescue device + ready in case this happens. + + +$ sudo mv -v /boot /boot.bak && + sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot + + Cross your fingers, reboot, hopefully you should get a NixOS + prompt! + + + If for some reason you want to revert to the old + distribution, you'll need to boot on a USB rescue disk and do + something along these lines: + + +# mkdir root +# mount /dev/sdaX root +# mkdir root/nixos-root +# mv -v root/* root/nixos-root/ +# mv -v root/nixos-root/old-root/* root/ +# mv -v root/boot.bak root/boot # We had renamed this by hand earlier +# umount root +# reboot + + This may work as is or you might also need to reinstall the + boot loader + + And of course, if you're happy with NixOS and no longer need + the old distribution: + + sudo rm -rf /old-root + + + + It's also worth noting that this whole process can be + automated. This is especially useful for Cloud VMs, where + provider do not provide NixOS. For instance, nixos-infect + uses the lustrate process to convert Digital Ocean droplets to + NixOS from other distributions automatically. + + +
diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml deleted file mode 100644 index 0d3eaa8bb1fb0c88479f977f02d8c2febc67766b..0000000000000000000000000000000000000000 --- a/nixos/doc/manual/installation/installing-uefi.xml +++ /dev/null @@ -1,48 +0,0 @@ -
- -UEFI Installation - -NixOS can also be installed on UEFI systems. The procedure -is by and large the same as a BIOS installation, with the following -changes: - - - - You should boot the live CD in UEFI mode (consult your - specific hardware's documentation for instructions). You may find - the rEFInd - boot manager useful. - - - Instead of fdisk, you should use - gdisk to partition your disks. You will need to - have a separate partition for /boot with - partition code EF00, and it should be formatted as a - vfat filesystem. - - - Instead of , - you must set to - true. nixos-generate-config - should do this automatically for new configurations when booted in - UEFI mode. - - - After having mounted your installation partition to - /mnt, you must mount the boot partition - to /mnt/boot. - - - You may want to look at the options starting with - and - as well. - - - - -
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 31d51816e39b0f0760673bfe1ccd741a583774c1..d68cd61626329ad0e247177926108f63bf3528e2 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -11,10 +11,24 @@ a USB stick. You can use the dd utility to write the image: dd if=path-to-image of=/dev/sdb. Be careful about specifying the correct drive; you can use the lsblk command to get a list of -block devices. If you're on macOS you can run diskutil list -to see the list of devices; the device you'll use for the USB must be ejected -before writing the image. +block devices. +On macOS: + +$ diskutil list +[..] +/dev/diskN (external, physical): + #: TYPE NAME SIZE IDENTIFIER +[..] +$ diskutil unmountDisk diskN +Unmount of all volumes on diskN was successful +$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN + +Using the 'raw' rdiskN device instead of diskN +completes in minutes instead of hours. After dd completes, a GUI +dialog "The disk you inserted was not readable by this computer" will pop up, which +can be ignored. + The dd utility will write the image verbatim to the drive, making it the recommended option for both UEFI and non-UEFI installations. For non-UEFI installations, you can alternatively use @@ -37,7 +51,7 @@ ISO, copy its contents verbatim to your drive, then either: 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 - copytoramto the options field. + copytoram to the options field. diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index ee9680ced397e4dc09dafc2ab43ef0314c501f42..7fcd22a112cf0e3b4e4ccd330ab17e034ebf9776 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -4,18 +4,18 @@ version="5.0" xml:id="sec-instaling-virtualbox-guest"> -Installing in a Virtualbox guest +Installing in a VirtualBox guest - Installing NixOS into a Virtualbox guest is convenient for users who want to + Installing NixOS into a VirtualBox guest is convenient for users who want to try NixOS without installing it on bare metal. If you want to use a pre-made - Virtualbox appliance, it is available at the downloads page. - If you want to set up a Virtualbox guest manually, follow these instructions: + If you want to set up a VirtualBox guest manually, follow these instructions: - Add a New Machine in Virtualbox with OS Type "Linux / Other + Add a New Machine in VirtualBox with OS Type "Linux / Other Linux" Base Memory Size: 768 MB or higher. diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index b0674307a563d48ba44c6d065f0ecd239fa66f00..1f09704bce53c0ae476450b133ca1b1d1385a32c 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -6,9 +6,18 @@ Installing NixOS +NixOS can be installed on BIOS or UEFI systems. The procedure +for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow. + - Boot from the CD. + Boot from the CD. + + UEFI systems + You should boot the live CD in UEFI mode + (consult your specific hardware's documentation for instructions). + You may find the rEFInd boot + manager useful. The CD contains a basic NixOS installation. (It also contains Memtest86+, useful if you want to test new hardware). @@ -36,7 +45,10 @@ using ifconfig. To manually configure the network on the graphical installer, first disable network-manager with - systemctl stop network-manager. + systemctl stop network-manager. + To manually configure the wifi on the minimal installer, run + wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' 'key'). + If you would like to continue the installation from a different machine you need to activate the SSH daemon via systemctl start sshd. @@ -50,7 +62,31 @@ For partitioning: - fdisk. + fdisk. + +# fdisk /dev/sda # (or whatever device you want to install on) +-- for UEFI systems only +> n # (create a new partition for /boot) +> 3 # (make it a partition number 3) +> # (press enter to accept the default) +> +512M # (the size of the UEFI boot partition) +> t # (change the partition type ...) +> 3 # (... of the boot partition ...) +> 1 # (... to 'UEFI System') +-- for BIOS or UEFI systems +> n # (create a new partition for /swap) +> 2 # (make it a partition number 2) +> # (press enter to accept the default) +> +8G # (the size of the swap partition, set to whatever you like) +> n # (create a new partition for /) +> 1 # (make it a partition number 1) +> # (press enter to accept the default) +> # (press enter to accept the default and use the rest of the remaining space) +> a # (make the partition bootable) +> x # (enter expert mode) +> f # (fix up the partition ordering) +> r # (exit expert mode) +> w # (write the partition table to disk and exit) For initialising Ext4 partitions: mkfs.ext4. It is recommended that you assign a @@ -67,18 +103,30 @@ For creating swap partitions: mkswap. Again it’s recommended to assign a label to the swap partition: . - - For creating LVM volumes, the LVM commands, e.g., + label. For example: -# pvcreate /dev/sda1 /dev/sdb1 -# vgcreate MyVolGroup /dev/sda1 /dev/sdb1 -# lvcreate --size 2G --name bigdisk MyVolGroup -# lvcreate --size 1G --name smalldisk MyVolGroup +# mkswap -L swap /dev/sda2 + + + UEFI systems + For creating boot partitions: + mkfs.fat. Again it’s recommended to assign a + label to the boot partition: . For example: + + +# mkfs.fat -F 32 -n boot /dev/sda3 + + + + For creating LVM volumes, the LVM commands, e.g., + pvcreate, vgcreate, and + lvcreate. + For creating software RAID devices, use mdadm. @@ -95,11 +143,28 @@ + + + UEFI systems + Mount the boot file system on /mnt/boot, e.g. + + +# mkdir -p /mnt/boot +# mount /dev/disk/by-label/boot /mnt/boot + + + + If your machine has a limited amount of memory, you may want to activate swap devices now (swapon device). The installer (or rather, the build actions that it may spawn) may need quite a bit of - RAM, depending on your configuration. + RAM, depending on your configuration. + + +# swapon /dev/sda2 + + @@ -135,10 +200,25 @@ install Emacs by running nix-env -i emacs. - You must set the option + + + BIOS systems + You must set the option to specify on which disk the GRUB boot loader is to be installed. Without it, NixOS cannot - boot. + boot. + + UEFI systems + You must set the option + to true. + nixos-generate-config should do this automatically for new + configurations when booted in + UEFI mode. + You may want to look at the options starting with + and + as well. + + If there are other operating systems running on the machine before installing NixOS, the @@ -190,11 +270,20 @@ Enter new UNIX password: *** Retype new UNIX password: *** + + + To prevent the password prompt, set users.mutableUsers = false; in + configuration.nix, which allows unattended installation + necessary in automation. + + + - If everything went well: + + If everything went well: # reboot @@ -247,10 +336,35 @@ drive (here /dev/sda). Commands for Installing NixOS on <filename>/dev/sda</filename> # fdisk /dev/sda # (or whatever device you want to install on) +-- for UEFI systems only +> n # (create a new partition for /boot) +> 3 # (make it a partition number 3) +> # (press enter to accept the default) +> +512M # (the size of the UEFI boot partition) +> t # (change the partition type ...) +> 3 # (... of the boot partition ...) +> 1 # (... to 'UEFI System') +-- for BIOS or UEFI systems +> n # (create a new partition for /swap) +> 2 # (make it a partition number 2) +> # (press enter to accept the default) +> +8G # (the size of the swap partition) +> n # (create a new partition for /) +> 1 # (make it a partition number 1) +> # (press enter to accept the default) +> # (press enter to accept the default and use the rest of the remaining space) +> a # (make the partition bootable) +> x # (enter expert mode) +> f # (fix up the partition ordering) +> r # (exit expert mode) +> w # (write the partition table to disk and exit) # mkfs.ext4 -L nixos /dev/sda1 # mkswap -L swap /dev/sda2 # swapon /dev/sda2 +# mkfs.fat -F 32 -n boot /dev/sda3 # (for UEFI systems only) # mount /dev/disk/by-label/nixos /mnt +# mkdir -p /mnt/boot # (for UEFI systems only) +# mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) # nixos-generate-config --root /mnt # nano /mnt/etc/nixos/configuration.nix # nixos-install @@ -267,7 +381,8 @@ drive (here /dev/sda). (for BIOS systems only) + boot.loader.systemd-boot.enable = true; # (for UEFI systems only) # Note: setting fileSystems is generally not # necessary, since nixos-generate-config figures them out @@ -279,9 +394,9 @@ drive (here /dev/sda). - + diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index 20a4838be88051245a20bd3772ed4a6a56cc7b2f..9b2b474c60ce5fa9d3b8cab146963208ef8d3c0c 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -12,11 +12,10 @@ download page. There are a number of installation options. If you happen to have an optical drive and a spare CD, burning the image to CD and booting from that is probably the easiest option. Most people will need to prepare a USB stick to boot from. -Unetbootin is recommended and the process is described in brief below. -Note that systems which use UEFI require some additional manual steps. -If you run into difficulty a number of alternative methods are presented -in the NixOS + describes the preferred method +to prepare a USB stick. +A number of alternative methods are presented in the NixOS Wiki. As an alternative to installing NixOS yourself, you can get a diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml index 878ebee05273c1186f4c50c74e010bef10a2f595..f4b59a7c6d4b914bdebb5822f74baa71552c1855 100644 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ b/nixos/doc/manual/man-nixos-build-vms.xml @@ -40,7 +40,7 @@ points to the generated virtual network. test1 = {pkgs, config, ...}: { services.openssh.enable = true; - nixpkgs.system = "i686-linux"; + nixpkgs.localSystem.system = "i686-linux"; deployment.targetHost = "test1.example.net"; # Other NixOS options @@ -51,7 +51,7 @@ points to the generated virtual network. services.openssh.enable = true; services.httpd.enable = true; environment.systemPackages = [ pkgs.lynx ]; - nixpkgs.system = "x86_64-linux"; + nixpkgs.localSystem.system = "x86_64-linux"; deployment.targetHost = "test2.example.net"; # Other NixOS options @@ -66,7 +66,7 @@ In each NixOS configuration, two attributes have a special meaning. The deployment.targetHost specifies the address (domain name or IP address) of the system which is used by ssh to perform -remote deployment operations. The nixpkgs.system +remote deployment operations. The nixpkgs.localSystem.system attribute can be used to specify an architecture for the target machine, such as i686-linux which builds a 32-bit NixOS configuration. Omitting this property will build the configuration diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml new file mode 100644 index 0000000000000000000000000000000000000000..a2fbe07961db622b98f539ac8c66668e176b60a3 --- /dev/null +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -0,0 +1,119 @@ + + + + nixos-enter + 8 + NixOS + + + + + nixos-enter + run a command in a NixOS chroot environment + + + + + nixos-enter + + + root + + + + system + + + + shell-command + + + + + + + arguments + + + + + +Description + +This command runs a command in a NixOS chroot environment, that +is, in a filesystem hierarchy previously prepared using +nixos-install. + + + +Options + +This command accepts the following options: + + + + + + + The path to the NixOS system you want to enter. It defaults to /mnt. + + + + + + + The NixOS system configuration to use. It defaults to + /nix/var/nix/profiles/system. You can enter + a previous NixOS configuration by specifying a path such as + /nix/var/nix/profiles/system-106-link. + + + + + + + + The bash command to execute. + + + + + + + Interpret the remaining arguments as the program + name and arguments to be invoked. The program is not executed in a + shell. + + + + + + + + +Examples + +Start an interactive shell in the NixOS installation in +/mnt: + + +# nixos-enter /mnt + + +Run a shell command: + + +# nixos-enter -c 'ls -l /; cat /proc/mounts' + + +Run a non-shell command: + + +# nixos-enter -- cat /proc/mounts + + + + + diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 15c603256ca713f1aedb2d5696a7275a2fdb2363..c9887146989b19af935fa8cdb53a3e635ec3ae75 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -26,8 +26,8 @@ root - - closure + + path @@ -118,7 +118,7 @@ it. - + If this option is provided, nixos-install will install the specified closure rather than attempt to build one from /mnt/etc/nixos/configuration.nix. diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml index e945e0e62639301f69a620e2fea16b8a942a748b..80a8458fbfec499831d67874239e7d1a16eb1d7a 100644 --- a/nixos/doc/manual/man-pages.xml +++ b/nixos/doc/manual/man-pages.xml @@ -15,7 +15,7 @@ - 2007-2015 + 2007-2018 Eelco Dolstra @@ -25,6 +25,7 @@ + diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl index 5387546b5982889cd5455d54e2200b0f6e73ee0c..7b45b233ab2a5a6efae7e405f001a4b7d0d71ff8 100644 --- a/nixos/doc/manual/options-to-docbook.xsl +++ b/nixos/doc/manual/options-to-docbook.xsl @@ -70,6 +70,15 @@ + + + Related packages: + + + + + Declared by: diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 5ed56bde66592a6929eec942adf4f2db6aced49f..b7f9fab44f3b100460bb2a94375140ba93593301 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -9,6 +9,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml index 36f67ed88b0ba6c0de23cb39433dc3674d0161bd..137caf14cba206492fa47d50fe78506467a6cde1 100644 --- a/nixos/doc/manual/release-notes/rl-1404.xml +++ b/nixos/doc/manual/release-notes/rl-1404.xml @@ -13,7 +13,7 @@ the following highlights: Installation on UEFI systems is now supported. See - for + for details. Systemd has been updated to version 212, which has diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index c1fe692ceecba72ea85308d4f846adfed452aa0e..9221c2951ed25b5739159694ef75164901371fc8 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="sec-release-18.03"> -Release 18.03 (“Impala”, 2018/03/??) +Release 18.03 (“Impala”, 2018/04/04)
+ + + + End of support is planned for end of October 2018, handing over to 18.09. + + + + + + Platform support: x86_64-linux and x86_64-darwin since release time (the latter isn't NixOS, really). + Binaries for aarch64-linux are available, but no channel exists yet, as it's waiting for some test fixes, etc. + + + + + + Nix now defaults to 2.0; see its + release notes. + + + + Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> 7, systemd: 234 -> 237. + + + + Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 -> 5.12. + + + + + + MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes + have been made to the infrastructure involved: + + + + libmysql has been deprecated, please use mysql.connector-c + instead, a compatibility passthru has been added to the MySQL packages. + + + + + The mysql57 package has a new static output containing + the static libraries including libmysqld.a + + + + + + + + PHP now defaults to PHP 7.2, updated from 7.1. +
@@ -36,9 +89,66 @@ has the following highlights: The following new services were added since the last release: - - - + ./config/krb5/default.nix + ./hardware/digitalbitbox.nix + ./misc/label.nix + ./programs/ccache.nix + ./programs/criu.nix + ./programs/digitalbitbox/default.nix + ./programs/less.nix + ./programs/npm.nix + ./programs/plotinus.nix + ./programs/rootston.nix + ./programs/systemtap.nix + ./programs/sway.nix + ./programs/udevil.nix + ./programs/way-cooler.nix + ./programs/yabar.nix + ./programs/zsh/zsh-autoenv.nix + ./services/backup/borgbackup.nix + ./services/backup/crashplan-small-business.nix + ./services/desktops/dleyna-renderer.nix + ./services/desktops/dleyna-server.nix + ./services/desktops/pipewire.nix + ./services/desktops/gnome3/chrome-gnome-shell.nix + ./services/desktops/gnome3/tracker-miners.nix + ./services/hardware/fwupd.nix + ./services/hardware/interception-tools.nix + ./services/hardware/u2f.nix + ./services/hardware/usbmuxd.nix + ./services/mail/clamsmtp.nix + ./services/mail/dkimproxy-out.nix + ./services/mail/pfix-srsd.nix + ./services/misc/gitea.nix + ./services/misc/home-assistant.nix + ./services/misc/ihaskell.nix + ./services/misc/logkeys.nix + ./services/misc/novacomd.nix + ./services/misc/osrm.nix + ./services/misc/plexpy.nix + ./services/misc/pykms.nix + ./services/misc/tzupdate.nix + ./services/monitoring/fusion-inventory.nix + ./services/monitoring/prometheus/exporters.nix + ./services/network-filesystems/beegfs.nix + ./services/network-filesystems/davfs2.nix + ./services/network-filesystems/openafs/client.nix + ./services/network-filesystems/openafs/server.nix + ./services/network-filesystems/ceph.nix + ./services/networking/aria2.nix + ./services/networking/monero.nix + ./services/networking/nghttpx/default.nix + ./services/networking/nixops-dns.nix + ./services/networking/rxe.nix + ./services/networking/stunnel.nix + ./services/web-apps/matomo.nix + ./services/web-apps/restya-board.nix + ./services/web-servers/mighttpd2.nix + ./services/x11/fractalart.nix + ./system/boot/binfmt.nix + ./system/boot/grow-partition.nix + ./tasks/filesystems/ecryptfs.nix + ./virtualisation/hyperv-guest.nix
@@ -54,6 +164,11 @@ has the following highlights: following incompatible changes: + + + sound.enable now defaults to false. + + Dollar signs in options under are @@ -72,6 +187,243 @@ following incompatible changes: . + + + Package attributes starting with a digit have been prefixed with an + underscore sign. This is to avoid quoting in the configuration and + other issues with command-line tools like nix-env. + The change affects the following packages: + + + 2048-in-terminal → _2048-in-terminal + + + 90secondportraits → _90secondportraits + + + 2bwm → _2bwm + + + 389-ds-base → _389-ds-base + + + + + + + + The OpenSSH service no longer enables support for DSA keys by default, + which could cause a system lock out. Update your keys or, unfavorably, + re-enable DSA support manually. + + + + + DSA support was + deprecated in OpenSSH 7.0, + due to it being too weak. To re-enable support, add + PubkeyAcceptedKeyTypes +ssh-dss to the end of your + . + + + + After updating the keys to be stronger, anyone still on a pre-17.03 + version is safe to jump to 17.03, as vetted + here. + + + + + The openssh package + now includes Kerberos support by default; + the openssh_with_kerberos package + is now a deprecated alias. + If you do not want Kerberos support, + you can do openssh.override { withKerberos = false; }. + Note, this also applies to the openssh_hpn package. + + + + + cc-wrapper has been split in two; there is now also a bintools-wrapper. + The most commonly used files in nix-support are now split between the two wrappers. + Some commonly used ones, like nix-support/dynamic-linker, are duplicated for backwards compatability, even though they rightly belong only in bintools-wrapper. + Other more obscure ones are just moved. + + + + + The propagation logic has been changed. + The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual. + + The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. + In practice, that means that many propagatedNativeBuildInputs should instead be propagatedBuildInputs. + Thankfully, that was and is the least used type of dependency. + Also, it means that some propagatedBuildInputs should instead be depsTargetTargetPropagated. + Other types dependencies should be unaffected. + + + + + lib.addPassthru drv passthru is removed. Use lib.extendDerivation true passthru drv instead. + + + + + The memcached service no longer accept dynamic socket + paths via . Unix sockets can be + still enabled by and + will be accessible at /run/memcached/memcached.sock. + + + + + The hardware.amdHybridGraphics.disable option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports. + + + + + The merging of config options for services.postfix.config + was buggy. Previously, if other options in the Postfix module like + services.postfix.useSrs were set and the user set config + options that were also set by such options, the resulting config wouldn't + include all options that were needed. They are now merged correctly. If + config options need to be overridden, lib.mkForce or + lib.mkOverride can be used. + + + + + The following changes apply if the stateVersion is changed to 18.03 or higher. + For stateVersion = "17.09" or lower the old behavior is preserved. + + + + + matrix-synapse uses postgresql by default instead of sqlite. + Migration instructions can be found here . + + + + + + + The jid package has been removed, due to maintenance + overhead of a go package having non-versioned dependencies. + + + + + When using (enabled by default in GNOME), + it now handles all input devices, not just touchpads. As a result, you might need to + re-evaluate any custom Xorg configuration. In particular, + Option "XkbRules" "base" may result in broken keyboard layout. + + + + + The attic package was removed. A maintained fork called + Borg should be used instead. + Migration instructions can be found + here. + + + + + The Piwik analytics software was renamed to Matomo: + + + The package pkgs.piwik was renamed to pkgs.matomo. + + + The service services.piwik was renamed to services.matomo. + + + + The data directory /var/lib/piwik was renamed to /var/lib/matomo. + All files will be moved automatically on first startup, but you might need to adjust your backup scripts. + + + + + The default for the nginx configuration changed from + piwik.${config.networking.hostName} to + matomo.${config.networking.hostName}.${config.networking.domain} + if is set, + matomo.${config.networking.hostName} if it is not set. + If you change your , remember you'll need to update the + trustedHosts[] array in /var/lib/matomo/config/config.ini.php + as well. + + + + + The piwik user was renamed to matomo. + The service will adjust ownership automatically for files in the data directory. + If you use unix socket authentication, remember to give the new matomo user + access to the database and to change the username to matomo + in the [database] section of /var/lib/matomo/config/config.ini.php. + + + + + If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean, + but this is neither enforced nor required. + + + + + + + + nodejs-4_x is end-of-life. + nodejs-4_x, nodejs-slim-4_x and nodePackages_4_x are removed. + + + + + The pump.io NixOS module was removed. + It is now maintained as an + external module. + + + + + The Prosody XMPP server has received a major update. The following modules were renamed: + + + + is now + + + + + is now + + + + + + + Many new modules are now core modules, most notably + and . + + + + The better-performing libevent backend is now enabled by default. + + + + withCommunityModules now passes through the modules to . + Use withOnlyInstalledCommunityModules for modules that should not be enabled directly, e.g lib_ldap. + + + + + All prometheus exporter modules are now defined as submodules. + The exporters are configured using services.prometheus.exporters. + + @@ -102,10 +454,106 @@ following incompatible changes: - The option is now none by default. - An assertion failure is thrown if WM's and DM's default are none. - To explicitly run a plain X session without and DM or WM, the newly introduced option - must be set to true. + In the module the + following options have been removed: + + + + + + + + + + + + + + + + + + To assign static addresses to an interface the options + and + should be used instead. + The options and have been + renamed to + respectively. + The new options and + have been added to set up static routing. + + + + + The option is now 127.0.0.1 by default. + Previously the default behaviour was to listen on all interfaces. + + + + + services.btrfs.autoScrub has been added, to + periodically check btrfs filesystems for data corruption. + If there's a correct copy available, it will automatically repair + corrupted blocks. + + + + + displayManager.lightdm.greeters.gtk.clock-format. + has been added, the clock format string (as expected by + strftime, e.g. %H:%M) to use with the lightdm + gtk greeter panel. + + + If set to null the default clock format is used. + + + + + displayManager.lightdm.greeters.gtk.indicators + has been added, a list of allowed indicator modules to use with + the lightdm gtk greeter panel. + + + Built-in indicators include ~a11y, + ~language, ~session, + ~power, ~clock, + ~host, ~spacer. Unity + indicators can be represented by short name + (e.g. sound, power), + service file name, or absolute path. + + + If set to null the default indicators are + used. + + + In order to have the previous default configuration add + + services.xserver.displayManager.lightdm.greeters.gtk.indicators = [ + "~host" "~spacer" + "~clock" "~spacer" + "~session" + "~language" + "~a11y" + "~power" + ]; + + to your configuration.nix. + + + + + The NixOS test driver supports user services declared by systemd.user.services. + The methods waitForUnit, getUnitInfo, startJob + and stopJob provide an optional $user argument for that purpose. + + + + + Enabling bash completion on NixOS, programs.bash.enableCompletion, will now also enable + completion for the Nix command line tools by installing the + nix-bash-completions package. diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml new file mode 100644 index 0000000000000000000000000000000000000000..61f9ec8ba995026bb686a7a968e0d154d8fe72dc --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -0,0 +1,85 @@ +
+ +Release 18.09 (“Jellyfish”, 2018/09/??) + +
+ +Highlights + +In addition to numerous new and upgraded packages, this release +has the following highlights: + + + + + TODO + + + + + +
+
+ +New Services + +The following new services were added since the last release: + + + + + + + +
+
+ +Backward Incompatibilities + +When upgrading from a previous release, please be aware of the +following incompatible changes: + + + + + The clementine package points now to the free derivation. + clementineFree is removed now and clementineUnfree + points to the package which is bundled with the unfree libspotify package. + + + + +
+
+ +Other Notable Changes + + + + + + + + +
+
diff --git a/nixos/doc/manual/style.css b/nixos/doc/manual/style.css deleted file mode 100644 index 3118b37ead1f2000b940a1c67a9d66b822757b0d..0000000000000000000000000000000000000000 --- a/nixos/doc/manual/style.css +++ /dev/null @@ -1,267 +0,0 @@ -/* Copied from http://bakefile.sourceforge.net/, which appears - licensed under the GNU GPL. */ - - -/*************************************************************************** - Basic headers and text: - ***************************************************************************/ - -body -{ - font-family: "Nimbus Sans L", sans-serif; - background: white; - margin: 2em 1em 2em 1em; -} - -h1, h2, h3, h4 -{ - color: #005aa0; -} - -h1 /* title */ -{ - font-size: 200%; -} - -h2 /* chapters, appendices, subtitle */ -{ - font-size: 180%; -} - -/* Extra space between chapters, appendices. */ -div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 -{ - margin-top: 1.5em; -} - -div.section > div.titlepage h2 /* sections */ -{ - font-size: 150%; - margin-top: 1.5em; -} - -h3 /* subsections */ -{ - font-size: 125%; -} - -div.simplesect h2 -{ - font-size: 110%; -} - -div.appendix h3 -{ - font-size: 150%; - margin-top: 1.5em; -} - -div.refnamediv h2, div.refsynopsisdiv h2, div.refsection h2 /* refentry parts */ -{ - margin-top: 1.4em; - font-size: 125%; -} - -div.refsection h3 -{ - font-size: 110%; -} - - -/*************************************************************************** - Examples: - ***************************************************************************/ - -div.example -{ - border: 1px solid #b0b0b0; - padding: 6px 6px; - margin-left: 1.5em; - margin-right: 1.5em; - background: #f4f4f8; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -div.example p.title -{ - margin-top: 0em; -} - -div.example pre -{ - box-shadow: none; -} - - -/*************************************************************************** - Screen dumps: - ***************************************************************************/ - -pre.screen, pre.programlisting -{ - border: 1px solid #b0b0b0; - padding: 3px 3px; - margin-left: 1.5em; - margin-right: 1.5em; - color: #600000; - background: #f4f4f8; - font-family: monospace; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -div.example pre.programlisting -{ - border: 0px; - padding: 0 0; - margin: 0 0 0 0; -} - - -/*************************************************************************** - Notes, warnings etc: - ***************************************************************************/ - -.note, .warning -{ - border: 1px solid #b0b0b0; - padding: 3px 3px; - margin-left: 1.5em; - margin-right: 1.5em; - margin-bottom: 1em; - padding: 0.3em 0.3em 0.3em 0.3em; - background: #fffff5; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -div.note, div.warning -{ - font-style: italic; -} - -div.note h3, div.warning h3 -{ - color: red; - font-size: 100%; - padding-right: 0.5em; - display: inline; -} - -div.note p, div.warning p -{ - margin-bottom: 0em; -} - -div.note h3 + p, div.warning h3 + p -{ - display: inline; -} - -div.note h3 -{ - color: blue; - font-size: 100%; -} - -div.navfooter * -{ - font-size: 90%; -} - - -/*************************************************************************** - Links colors and highlighting: - ***************************************************************************/ - -a { text-decoration: none; } -a:hover { text-decoration: underline; } -a:link { color: #0048b3; } -a:visited { color: #002a6a; } - - -/*************************************************************************** - Table of contents: - ***************************************************************************/ - -div.toc -{ - font-size: 90%; -} - -div.toc dl -{ - margin-top: 0em; - margin-bottom: 0em; -} - - -/*************************************************************************** - Special elements: - ***************************************************************************/ - -tt, code -{ - color: #400000; -} - -.term -{ - font-weight: bold; - -} - -div.variablelist dd p, div.glosslist dd p -{ - margin-top: 0em; -} - -div.variablelist dd, div.glosslist dd -{ - margin-left: 1.5em; -} - -div.glosslist dt -{ - font-style: italic; -} - -.varname -{ - color: #400000; -} - -span.command strong -{ - font-weight: normal; - color: #400000; -} - -div.calloutlist table -{ - box-shadow: none; -} - -table -{ - border-collapse: collapse; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -table.simplelist -{ - text-align: left; - color: #005aa0; - border: 0; - padding: 5px; - background: #fffff5; - font-weight: normal; - font-style: italic; - box-shadow: none; - margin-bottom: 1em; -} - -div.navheader table, div.navfooter table { - box-shadow: none; -} diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 1a17a080ba45271b83883950752149ce4ec41d2f..e14105f5f011be00c159ce30b8ccde374eb9af8e 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -3,7 +3,7 @@ let pkgs = import ../.. { inherit system config; }; in with pkgs.lib; -with import ../lib/qemu-flags.nix; +with import ../lib/qemu-flags.nix { inherit pkgs; }; rec { @@ -51,7 +51,7 @@ rec { let interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255); interfaces = flip map interfacesNumbered ({ fst, snd }: - nameValuePair "eth${toString snd}" { ip4 = + nameValuePair "eth${toString snd}" { ipv4.addresses = [ { address = "192.168.${toString fst}.${toString m.snd}"; prefixLength = 24; } ]; @@ -64,7 +64,7 @@ rec { networking.interfaces = listToAttrs interfaces; networking.primaryIPAddress = - optionalString (interfaces != []) (head (head interfaces).value.ip4).address; + optionalString (interfaces != []) (head (head interfaces).value.ipv4.addresses).address; # Put the IP addresses of all VMs in this machine's # /etc/hosts file. If a machine has multiple diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 2e7971cca8103d6e276976a20e0f3e779282f625..97c79487df4c140d2c0126899cd9630041e357c9 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -26,7 +26,7 @@ , lib ? import ../../lib }: -let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; +let extraArgs_ = extraArgs; pkgs_ = pkgs; extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; in if e == "" then [] else [(import (builtins.toPath e))]; in @@ -36,7 +36,7 @@ let _file = ./eval-config.nix; key = _file; config = { - nixpkgs.system = lib.mkDefault system_; + nixpkgs.localSystem = lib.mkDefault { inherit system; }; _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); }; }; diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index bf25e0cab2597fbbb80a6c278e8f19074f93a349..ebfb09db7b7e4e91f869d1d952f7b08a37ed4a6c 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -13,10 +13,16 @@ # grafted in the file system at path `target'. , contents ? [] -, # Whether the disk should be partitioned (with a single partition - # containing the root filesystem) or contain the root filesystem - # directly. - partitioned ? true +, # Type of partition table to use; either "legacy", "efi", or "none". + # For "efi" images, the GPT partition table is used and a mandatory ESP + # partition of reasonable size is created in addition to the root partition. + # If `installBootLoader` is true, GRUB will be installed in EFI mode. + # For "legacy", the msdos partition table is used and a single large root + # partition is created. If `installBootLoader` is true, GRUB will be + # installed in legacy mode. + # For "none", no partition table is created. Enabling `installBootLoader` + # most likely fails as GRUB will probably refuse to install. + partitionTableType ? "legacy" # Whether to invoke switch-to-configuration boot during image creation , installBootLoader ? true @@ -37,11 +43,15 @@ format ? "raw" }: +assert partitionTableType == "legacy" || partitionTableType == "efi" || partitionTableType == "none"; +# We use -E offset=X below, which is only supported by e2fsprogs +assert partitionTableType != "none" -> fsType == "ext4"; + with lib; let format' = format; in let - format = if (format' == "qcow2-compressed") then "qcow2" else format'; + format = if format' == "qcow2-compressed" then "qcow2" else format'; compress = optionalString (format' == "qcow2-compressed") "-c"; @@ -51,9 +61,31 @@ let format' = format; in let raw = "img"; }.${format}; + rootPartition = { # switch-case + legacy = "1"; + efi = "2"; + }.${partitionTableType}; + + partitionDiskScript = { # switch-case + legacy = '' + parted --script $diskImage -- \ + mklabel msdos \ + mkpart primary ext4 1MiB -1 + ''; + efi = '' + parted --script $diskImage -- \ + mklabel gpt \ + mkpart ESP fat32 8MiB 256MiB \ + set 1 boot on \ + mkpart primary ext4 256MiB -1 + ''; + none = ""; + }.${partitionTableType}; + nixpkgs = cleanSource pkgs.path; - channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} '' + # FIXME: merge with channel.nix / make-channel.nix. + channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" {} '' mkdir -p $out cp -prd ${nixpkgs} $out/nixos chmod -R u+w $out/nixos @@ -61,16 +93,19 @@ let format' = format; in let ln -s . $out/nixos/nixpkgs fi rm -rf $out/nixos/.git - echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix + echo -n ${config.system.nixos.versionSuffix} > $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; + binPath = with pkgs; makeBinPath ( + [ rsync + utillinux + parted + e2fsprogs + lkl + config.system.build.nixos-install + config.system.build.nixos-enter + nix + ] ++ 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 :) @@ -78,22 +113,35 @@ let format' = format; in let sources = map (x: x.source) contents; targets = map (x: x.target) contents; + closureInfo = pkgs.closureInfo { rootPaths = [ config.system.build.toplevel channelSources ]; }; + prepareImage = '' - export PATH=${makeSearchPathOutput "bin" "bin" prepareImageInputs} + export PATH=${binPath} + + # Yes, mkfs.ext4 takes different units in different contexts. Fun. + sectorsToKilobytes() { + echo $(( ( "$1" * 512 ) / 1024 )) + } + + sectorsToBytes() { + echo $(( "$1" * 512 )) + } mkdir $out diskImage=nixos.raw truncate -s ${toString diskSize}M $diskImage - ${if partitioned then '' - parted --script $diskImage -- mklabel msdos mkpart primary ext4 1M -1s - offset=$((2048*512)) + ${partitionDiskScript} + + ${if partitionTableType != "none" then '' + # Get start & length of the root partition in sectors to $START and $SECTORS. + eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs) + + mkfs.${fsType} -F -L nixos $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K '' else '' - offset=0 + mkfs.${fsType} -F -L nixos $diskImage ''} - mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage - root="$PWD/root" mkdir -p $root @@ -126,17 +174,23 @@ let format' = format; in let 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 + export HOME=$TMPDIR + + # Provide a Nix database so that nixos-install can copy closures. + export NIX_STATE_DIR=$TMPDIR/state + nix-store --load-db < ${closureInfo}/registration + + echo "running nixos-install..." + nixos-install --root $root --no-bootloader --no-root-passwd \ + --system ${config.system.build.toplevel} --channel ${channelSources} --substituters "" echo "copying staging root to image..." - cptofs ${optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* / + cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / ''; in pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name { preVM = prepareImage; - buildInputs = with pkgs; [ utillinux e2fsprogs ]; - exportReferencesGraph = [ "closure" metaClosure ]; + buildInputs = with pkgs; [ utillinux e2fsprogs dosfstools ]; postVM = '' ${if format == "raw" then '' mv $diskImage $out/${filename} @@ -149,13 +203,9 @@ in pkgs.vmTools.runInLinuxVM ( memSize = 1024; } '' - ${if partitioned then '' - . /sys/class/block/vda1/uevent - mknod /dev/vda1 b $MAJOR $MINOR - rootDisk=/dev/vda1 - '' else '' - rootDisk=/dev/vda - ''} + export PATH=${binPath}:$PATH + + rootDisk=${if partitionTableType != "none" then "/dev/vda${rootPartition}" else "/dev/vda"} # Some tools assume these exist ln -s vda /dev/xvda @@ -165,21 +215,22 @@ in pkgs.vmTools.runInLinuxVM ( mkdir $mountPoint mount $rootDisk $mountPoint + # Create the ESP and mount it. Unlike e2fsprogs, mkfs.vfat doesn't support an + # '-E offset=X' option, so we can't do this outside the VM. + ${optionalString (partitionTableType == "efi") '' + mkdir -p /mnt/boot + mkfs.vfat -n ESP /dev/vda1 + mount /dev/vda1 /mnt/boot + ''} + # Install a configuration.nix mkdir -p /mnt/etc/nixos ${optionalString (configFile != null) '' cp ${configFile} /mnt/etc/nixos/configuration.nix ''} - mount --rbind /dev $mountPoint/dev - mount --rbind /proc $mountPoint/proc - mount --rbind /sys $mountPoint/sys - # Set up core system link, GRUB, etc. - NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration boot - - # TODO: figure out if I should activate, but for now I won't - # chroot $mountPoint /nix/var/nix/profiles/system/activate + NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot # 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 diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index f06649e1991a53a75c6bf073a70dd7524f605eab..986d80ff1b999674aecb52e91869acd23c525848 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -7,23 +7,22 @@ , volumeLabel }: +let + sdClosureInfo = pkgs.closureInfo { rootPaths = storePaths; }; +in + pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - buildInputs = with pkgs; [e2fsprogs libfaketime perl]; - - # For obtaining the closure of `storePaths'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) storePaths; + nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl]; buildCommand = '' # Add the closures of the top-level store objects. - storePaths=$(perl ${pkgs.pathsFromGraph} closure-*) + storePaths=$(cat ${sdClosureInfo}/store-paths) - # Also include a manifest of the closures in a format suitable - # for nix-store --load-db. - printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > nix-path-registration + # Also include a manifest of the closures in a format suitable for nix-store --load-db. + cp ${sdClosureInfo}/registration nix-path-registration # Make a crude approximation of the size of the target image. # If the script starts failing, increase the fudge factors here. diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 75be70dbcb2bfffea29d8ef284ff857fdb073618..c6bafd48f9dbd80a8d56fd233a368f1788af06d1 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, pathsFromGraph, xorriso, syslinux +{ stdenv, perl, closureInfo, xorriso, syslinux , # The file name of the resulting ISO image. isoName ? "cd.iso" @@ -48,9 +48,9 @@ assert usbBootable -> isohybridMbrImage != ""; stdenv.mkDerivation { name = isoName; builder = ./make-iso9660-image.sh; - buildInputs = [perl xorriso syslinux]; + buildInputs = [ xorriso syslinux ]; - inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable isohybridMbrImage usbBootable; + inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable; # !!! should use XML. sources = map (x: x.source) contents; @@ -61,6 +61,5 @@ stdenv.mkDerivation { symlinks = map (x: x.symlink) storeContents; # For obtaining the closure of `storeContents'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents; + closureInfo = closureInfo { rootPaths = map (x: x.object) storeContents; }; } diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index c623436f6c5b91bf836b1757d5e0e3c81b0096e3..45cdef1ef4df5933e4ae10d057bf341d92ad6db2 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -72,16 +72,15 @@ done # Add the closures of the top-level store objects. -storePaths=$(perl $pathsFromGraph closure-*) -for i in $storePaths; do +for i in $(< $closureInfo/store-paths); do addPath "${i:1}" "$i" done # Also include a manifest of the closures in a format suitable for # nix-store --load-db. -if [ -n "$object" ]; then - printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration +if [[ ${#objects[*]} != 0 ]]; then + cp $closureInfo/registration nix-path-registration addPath "nix-path-registration" "nix-path-registration" fi diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index 4100af27becbbd2c4fef3acc7a2ba49161528fac..7ab84e47f53b592ef70e5c598a126ece66c0a299 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -1,4 +1,4 @@ -{ stdenv, squashfsTools, perl, pathsFromGraph +{ stdenv, squashfsTools, closureInfo , # The root directory of the squashfs filesystem is filled with the # closures of the Nix store paths listed here. @@ -8,23 +8,18 @@ stdenv.mkDerivation { name = "squashfs.img"; - buildInputs = [perl squashfsTools]; - - # For obtaining the closure of `storeContents'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) storeContents; + nativeBuildInputs = [ squashfsTools ]; buildCommand = '' - # Add the closures of the top-level store objects. - storePaths=$(perl ${pathsFromGraph} closure-*) + closureInfo=${closureInfo { rootPaths = storeContents; }} # Also include a manifest of the closures in a format suitable # for nix-store --load-db. - printRegistration=1 perl ${pathsFromGraph} closure-* > nix-path-registration + cp $closureInfo/registration nix-path-registration # Generate the squashfs image. - mksquashfs nix-path-registration $storePaths $out \ + mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \ -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100% ''; } diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix index a2a0340a6bd3d7d42a51da3e3e3b2dd2c76f79a7..92539235be754932dbee61e72d68da62792aeb8c 100644 --- a/nixos/lib/make-system-tarball.nix +++ b/nixos/lib/make-system-tarball.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, xz, pathsFromGraph +{ stdenv, perl, pixz, pathsFromGraph , # The file name of the resulting tarball fileName ? "nixos-system-${stdenv.system}" @@ -21,14 +21,20 @@ # Extra tar arguments , extraArgs ? "" + # Command used for compression +, compressCommand ? "pixz" + # Extension for the compressed tarball +, compressionExtension ? ".xz" + # extra inputs, like the compressor to use +, extraInputs ? [ pixz ] }: stdenv.mkDerivation { name = "tarball"; builder = ./make-system-tarball.sh; - buildInputs = [perl xz]; + buildInputs = [ perl ] ++ extraInputs; - inherit fileName pathsFromGraph extraArgs extraCommands; + inherit fileName pathsFromGraph extraArgs extraCommands compressCommand; # !!! should use XML. sources = map (x: x.source) contents; @@ -41,4 +47,6 @@ stdenv.mkDerivation { # For obtaining the closure of `storeContents'. exportReferencesGraph = map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents; + + extension = compressionExtension; } diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 73a009d8488a7045fbc0286bc484e92b52f2bd66..1a52a284a2573ebffe0c9c3e160eb8fd7bc4ac1b 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -1,5 +1,4 @@ source $stdenv/setup -set -x sources_=($sources) targets_=($targets) @@ -54,8 +53,8 @@ mkdir -p $out/tarball rm env-vars -tar --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner -cvJf $out/tarball/$fileName.tar.xz * $extraArgs +time tar --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner -c * $extraArgs | $compressCommand > $out/tarball/$fileName.tar${extension} mkdir -p $out/nix-support echo $system > $out/nix-support/system -echo "file system-tarball $out/tarball/$fileName.tar.xz" > $out/nix-support/hydra-build-products +echo "file system-tarball $out/tarball/$fileName.tar${extension}" > $out/nix-support/hydra-build-products diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index de355b08918caf77102508843e45118de4c0e3c6..fcdcbf1b00770014c4076c01f50e8cb86f17fa02 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -1,4 +1,5 @@ # QEMU flags shared between various Nix expressions. +{ pkgs }: { @@ -7,4 +8,14 @@ "-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}" ]; + qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" + else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" + else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; + + qemuBinary = qemuPkg: { + "i686-linux" = "${qemuPkg}/bin/qemu-kvm"; + "x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; + "armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; + "aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; + }.${pkgs.stdenv.system} or (throw "Unknown QEMU binary for '${pkgs.stdenv.system}'"); } diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index a7ed5d1faa381b6b277bd6046b18030b11e96add..7e269b43e70ff5da0b1afe1b393733c3f74b82a3 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -146,6 +146,7 @@ sub start { ($self->{allowReboot} ? "" : "-no-reboot ") . "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " . "-device virtio-serial -device virtconsole,chardev=shell " . + "-device virtio-rng-pci " . ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || ""); chdir $self->{stateDir} or die; exec $self->{startCommand}; @@ -361,8 +362,8 @@ sub mustFail { sub getUnitInfo { - my ($self, $unit) = @_; - my ($status, $lines) = $self->execute("systemctl --no-pager show '$unit'"); + my ($self, $unit, $user) = @_; + my ($status, $lines) = $self->systemctl("--no-pager show \"$unit\"", $user); return undef if $status != 0; my $info = {}; foreach my $line (split '\n', $lines) { @@ -372,6 +373,16 @@ sub getUnitInfo { return $info; } +sub systemctl { + my ($self, $q, $user) = @_; + if ($user) { + $q =~ s/'/\\'/g; + return $self->execute("su -l $user -c \$'XDG_RUNTIME_DIR=/run/user/`id -u` systemctl --user $q'"); + } + + return $self->execute("systemctl $q"); +} + # Fail if the given systemd unit is not in the "active" state. sub requireActiveUnit { my ($self, $unit) = @_; @@ -386,16 +397,16 @@ sub requireActiveUnit { # Wait for a systemd unit to reach the "active" state. sub waitForUnit { - my ($self, $unit) = @_; + my ($self, $unit, $user) = @_; $self->nest("waiting for unit ‘$unit’", sub { retry sub { - my $info = $self->getUnitInfo($unit); + my $info = $self->getUnitInfo($unit, $user); my $state = $info->{ActiveState}; die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed"; if ($state eq "inactive") { # If there are no pending jobs, then assume this unit # will never reach active state. - my ($status, $jobs) = $self->execute("systemctl list-jobs --full 2>&1"); + my ($status, $jobs) = $self->systemctl("list-jobs --full 2>&1", $user); if ($jobs =~ /No jobs/) { # FIXME: fragile # Handle the case where the unit may have started # between the previous getUnitInfo() and @@ -429,14 +440,14 @@ sub waitForFile { } sub startJob { - my ($self, $jobName) = @_; - $self->execute("systemctl start $jobName"); + my ($self, $jobName, $user) = @_; + $self->systemctl("start $jobName", $user); # FIXME: check result } sub stopJob { - my ($self, $jobName) = @_; - $self->execute("systemctl stop $jobName"); + my ($self, $jobName, $user) = @_; + $self->systemctl("stop $jobName", $user); } @@ -601,7 +612,7 @@ sub waitForX { my ($self, $regexp) = @_; $self->nest("waiting for the X11 server", sub { retry sub { - my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'"); + my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'Reached target Current graphical'"); return 0 if $status != 0; ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]"); return 1 if $status == 0; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 9339ba78ff0c5ad7b17545811dbfe8ff803e7d0e..57acc990a48f719622dd7de0753b500373f3de9b 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -3,7 +3,11 @@ with import ./build-vms.nix { inherit system minimal config; }; with pkgs; -rec { +let + jquery-ui = callPackage ./testing/jquery-ui.nix { }; + jquery = callPackage ./testing/jquery.nix { }; + +in rec { inherit pkgs; @@ -29,7 +33,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu vde2 netpbm coreutils ]}" \ + --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; @@ -78,14 +82,26 @@ rec { } @ t: let - testDriverName = "nixos-test-driver-${name}"; + # A standard store path to the vm monitor is built like this: + # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor + # The max filename length of a unix domain socket is 108 bytes. + # This means $name can at most be 50 bytes long. + maxTestNameLen = 50; + testNameLen = builtins.stringLength name; + + testDriverName = with builtins; + if testNameLen > maxTestNameLen then + abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " + + "it's currently ${toString testNameLen} characters long.") + else + "nixos-test-driver-${name}"; nodes = buildVirtualNetwork ( t.nodes or (if t ? machine then { machine = t.machine; } else { })); testScript' = # Call the test script with the computed nodes. - if builtins.isFunction testScript + if lib.isFunction testScript then testScript { inherit nodes; } else testScript; @@ -95,6 +111,8 @@ rec { ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; }; + imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; + # Generate onvenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. @@ -112,9 +130,8 @@ rec { wrapProgram $out/bin/nixos-test-driver \ --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR - "--prefix PATH : '${ocrProg}/bin:${imagemagick}/bin'"} \ - --run "testScript=\"\$(cat $out/test-script)\"" \ - --set testScript '$testScript' \ + "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ + --run "export testScript=\"\$(cat $out/test-script)\"" \ --set VLANS '${toString vlans}' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ @@ -132,8 +149,8 @@ rec { test = passMeta (runTests driver); report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; }); - in (if makeCoverageReport then report else test) // { - inherit nodes driver test; + in (if makeCoverageReport then report else test) // { + inherit nodes driver test; }; runInMachine = diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/nixos/lib/testing/jquery-ui.nix similarity index 100% rename from pkgs/development/libraries/javascript/jquery-ui/default.nix rename to nixos/lib/testing/jquery-ui.nix diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/nixos/lib/testing/jquery.nix similarity index 100% rename from pkgs/development/libraries/javascript/jquery/default.nix rename to nixos/lib/testing/jquery.nix diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix index 7be0255b35acb67f08d33617baf6b771dc08bc9e..371ee7d91808d691d8a1017f33bccd4bcfc451d1 100644 --- a/nixos/maintainers/option-usages.nix +++ b/nixos/maintainers/option-usages.nix @@ -15,7 +15,7 @@ # # $ nix-build ./option-usage.nix --argstr testOption service.xserver.enable -A txt -o service.xserver.enable._txt # -# otther target exists such as, `dotContent`, `dot`, and `pdf`. If you are +# Other targets exists such as `dotContent`, `dot`, and `pdf`. If you are # looking for the option usage of multiple options, you can provide a list # as argument. # @@ -35,7 +35,7 @@ # value is replaced by a `throw` statement which is caught by the `tryEval` # evaluation of each option value. # -# We then compare the result of the evluation of the original module, with +# We then compare the result of the evaluation of the original module, with # the result of the second evaluation, and consider that the new failures are # caused by our mutation of the `config` argument. # @@ -62,7 +62,7 @@ let "_module.args" # For some reasons which we yet have to investigate, some options cannot - # be replaced by a throw without cuasing a non-catchable failure. + # be replaced by a throw without causing a non-catchable failure. "networking.bonds" "networking.bridges" "networking.interfaces" diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 2e67edf8ee3d5846501459ccf1df81f3f8260caf..972c04453aefcde4b9f0847379c9154726dc1111 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -46,7 +46,7 @@ in { inherit lib config; inherit (cfg) contents format name; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - partitioned = config.ec2.hvm; + partitionTableType = if config.ec2.hvm then "legacy" else "none"; diskSize = cfg.sizeMB; configFile = pkgs.writeText "configuration.nix" '' diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index dfc0f8d1146585fb349b60b41fc4ca84681eff5e..347e6b9c6e0dbb104847dc0bdab4085d8f0a10b9 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -18,7 +18,7 @@ rm -f ec2-amis.nix types="hvm" stores="ebs" -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" +regions="eu-west-1 eu-west-2 eu-west-3 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" for type in $types; do link=$stateDir/$type diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh index ef1801fe54beb87a700aa131f19a7e9f57f6b5cf..0fd26d34d07f9ff6bf8bc55eb78bb88785196ae9 100755 --- a/nixos/maintainers/scripts/gce/create-gce.sh +++ b/nixos/maintainers/scripts/gce/create-gce.sh @@ -3,7 +3,7 @@ set -euo pipefail -BUCKET_NAME="${BUCKET_NAME:-nixos-images}" +BUCKET_NAME="${BUCKET_NAME:-nixos-cloud-images}" TIMESTAMP="$(date +%Y%m%d%H%M)" export TIMESTAMP @@ -19,5 +19,5 @@ 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" + gsutil acl ch -u AllUsers:R "gs://${BUCKET_NAME}/$img_name" fi -gcloud compute images create "$img_id" --source-uri "gs://${BUCKET_NAME}/$img_name" diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 46b22fc128540f85652803deebc33b91049dc367..6bf8c653e113a0247ee5cc1f7fefca5ba53f988b 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -10,7 +10,7 @@ with lib; i18n = { glibcLocales = mkOption { type = types.path; - default = pkgs.glibcLocales.override { + default = pkgs.buildPackages.glibcLocales.override { allLocales = any (x: x == "all") config.i18n.supportedLocales; locales = config.i18n.supportedLocales; }; diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 619f36cd5150e6a59f84ff01530d23290f6a022c..4101ef82f3e1b46670905162d50cdc280991f878 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -290,8 +290,8 @@ in ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd ''} - # Make sure resolv.conf is up to date if not managed by systemd - ${optionalString (!config.services.resolved.enable) '' + # Make sure resolv.conf is up to date if not managed manually or by systemd + ${optionalString (!config.environment.etc?"resolv.conf") '' ${pkgs.openresolv}/bin/resolvconf -u ''} ''; diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index ae3e17ac27b67dc65036b08bf1f0583af7b36ef0..a20910353f34766dc9072d51bb1a7fd85d0ff3f2 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -28,14 +28,14 @@ with lib; nixpkgs.config.packageOverrides = pkgs: { dbus = pkgs.dbus.override { x11Support = false; }; - networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; }; - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; }; - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; }; - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; }; - networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; }; - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; }; - networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; }; - pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; }; + networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { withGnome = false; }; + networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; }; + networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; }; + networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; }; + networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; }; + networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; }; + pinentry = pkgs.pinentry_ncurses; + gobjectIntrospection = pkgs.gobjectIntrospection.override { x11Support = false; }; }; }; } diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 7b36d4f1cbdf6f68271c2d000ce008221d298d46..c595c693294694ba7fb3b2292c9ecb4752863955 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -17,23 +17,23 @@ let resolved = canLoadExternalModules && config.services.resolved.enable; hostArray = [ "files" ] - ++ optionals mymachines [ "mymachines" ] - ++ optionals nssmdns [ "mdns_minimal [NOTFOUND=return]" ] - ++ optionals nsswins [ "wins" ] - ++ optionals resolved ["resolve [!UNAVAIL=return]"] + ++ optional mymachines "mymachines" + ++ optional nssmdns "mdns_minimal [NOTFOUND=return]" + ++ optional nsswins "wins" + ++ optional resolved "resolve [!UNAVAIL=return]" ++ [ "dns" ] - ++ optionals nssmdns [ "mdns" ] - ++ optionals myhostname ["myhostname" ]; + ++ optional nssmdns "mdns" + ++ optional myhostname "myhostname"; passwdArray = [ "files" ] ++ optional sssd "sss" - ++ optionals ldap [ "ldap" ] - ++ optionals mymachines [ "mymachines" ] + ++ optional ldap "ldap" + ++ optional mymachines "mymachines" ++ [ "systemd" ]; shadowArray = [ "files" ] ++ optional sssd "sss" - ++ optionals ldap [ "ldap" ]; + ++ optional ldap "ldap"; servicesArray = [ "files" ] ++ optional sssd "sss"; diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix index a4a4d6e1a6af382da3c465df95c5f3baa24b86ad..4c37e8a6208caa04c37f4970564048c38cfa575d 100644 --- a/nixos/modules/config/power-management.nix +++ b/nixos/modules/config/power-management.nix @@ -69,9 +69,6 @@ in config = mkIf cfg.enable { - # Leftover for old setups, should be set by nixos-generate-config now - powerManagement.cpuFreqGovernor = mkDefault "ondemand"; - systemd.targets.post-resume = { description = "Post-Resume Actions"; requires = [ "post-resume.service" ]; diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 8b9c3570476affa2e2c7dd1f5d9b0b20d31e9c63..90cea47b70ae9d63acab4debd5807c7a8a967777 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -45,7 +45,7 @@ let uid = ids.uids.pulseaudio; gid = ids.gids.pulseaudio; - stateDir = "/var/run/pulse"; + stateDir = "/run/pulse"; # Create pulse/client.conf even if PulseAudio is disabled so # that we can disable the autospawn feature in programs that @@ -101,7 +101,8 @@ in { each user that tries to use the sound system. The server runs with user privileges. This is the recommended and most secure way to use PulseAudio. If true, one system-wide PulseAudio - server is launched on boot, running as the user "pulse". + server is launched on boot, running as the user "pulse", and + only users in the "audio" group will have access to the server. Please read the PulseAudio documentation for more details. ''; }; @@ -213,12 +214,20 @@ in { (mkIf cfg.enable { environment.systemPackages = [ overriddenPackage ]; + sound.enable = true; + environment.etc = [ { target = "asound.conf"; source = alsaConf; } { target = "pulse/daemon.conf"; source = writeText "daemon.conf" (lib.generators.toKeyValue {} cfg.daemon.config); } + + { target = "openal/alsoft.conf"; + source = writeText "alsoft.conf" "drivers=pulse"; } + + { target = "libao.conf"; + source = writeText "libao.conf" "default_driver=pulse"; } ]; # Allow PulseAudio to get realtime priority using rtkit. diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 65f2e5d7af9925a63c7e7ea44d32b4f43ce360c2..398660967c529710eb957a52dacd5640ed95cf4b 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -36,7 +36,7 @@ in default = {}; description = '' A set of environment variables used in the global environment. - These variables will be set on shell initialisation. + These variables will be set on shell initialisation (e.g. in /etc/profile). The value of each variable can be either a string or a list of strings. The latter is concatenated, interspersed with colon characters. diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index d3212d93160519f41fae0f51877c97fbfdef03cd..361151665018130c75eb6fb002f40cce387da945 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -109,7 +109,6 @@ in "/sbin" "/share/applications" "/share/desktop-directories" - "/share/doc" "/share/emacs" "/share/icons" "/share/menus" diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index a4715175cc952f06138c72f35b51b062fc75bab6..621ca36fb6b82c6c13e74e2b620f658fa3f917ba 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -35,6 +35,7 @@ let name = mkOption { type = types.str; + apply = x: assert (builtins.stringLength x < 32 || abort "Username '${x}' is longer than 31 characters which is not allowed!"); x; description = '' The name of the user account. If undefined, the name of the attribute set will be used. @@ -91,6 +92,7 @@ let group = mkOption { type = types.str; + apply = x: assert (builtins.stringLength x < 32 || abort "Group name '${x}' is longer than 31 characters which is not allowed!"); x; default = "nogroup"; description = "The user's primary group."; }; @@ -502,9 +504,6 @@ in { }; }; - # Install all the user shells - environment.systemPackages = systemShells; - users.groups = { root.gid = ids.gids.root; wheel.gid = ids.gids.wheel; @@ -529,6 +528,9 @@ in { system.activationScripts.users = stringAfter [ "stdio" ] '' + install -m 0700 -d /root + install -m 0755 -d /home + ${pkgs.perl}/bin/perl -w \ -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \ -I${pkgs.perlPackages.JSON}/lib/perl5/site_perl \ @@ -538,14 +540,29 @@ in { # for backwards compatibility system.activationScripts.groups = stringAfter [ "users" ] ""; - environment.etc."subuid" = { - text = subuidFile; - mode = "0644"; - }; - environment.etc."subgid" = { - text = subgidFile; - mode = "0644"; - }; + # Install all the user shells + environment.systemPackages = systemShells; + + environment.etc = { + "subuid" = { + text = subuidFile; + mode = "0644"; + }; + "subgid" = { + text = subgidFile; + mode = "0644"; + }; + } // (mapAttrs' (name: { packages, ... }: { + name = "profiles/per-user/${name}"; + value.source = pkgs.buildEnv { + name = "user-environment"; + paths = packages; + inherit (config.environment) pathsToLink extraOutputsToInstall; + inherit (config.system.path) ignoreCollisions postBuild; + }; + }) (filterAttrs (_: u: u.packages != []) cfg.users)); + + environment.profiles = [ "/etc/profiles/per-user/$USER" ]; assertions = [ { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); @@ -576,20 +593,4 @@ 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/config/zram.nix b/nixos/modules/config/zram.nix index ad41ad4f3d7c4b43193eab182d555e25766df907..ae1b0a6c8e113f6ead2d0565957f9fe2129b9af5 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -93,7 +93,7 @@ in serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStop = "${pkgs.stdenv.shell} -c 'echo 1 > /sys/class/block/${dev}/reset'"; + ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/class/block/${dev}/reset'"; }; script = '' set -u diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index afaa65f6ce35bb63e806c0c51bf1e2c029e72118..b61acf1815d9681726b76996f262e793aff42163 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -37,8 +37,9 @@ in { hardware.firmware = with pkgs; [ firmwareLinuxNonfree intel2200BGFirmware - rtl8723bs-firmware rtl8192su-firmware + ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ + rtl8723bs-firmware ]; }) (mkIf cfg.enableAllFirmware { diff --git a/nixos/modules/hardware/digitalbitbox.nix b/nixos/modules/hardware/digitalbitbox.nix new file mode 100644 index 0000000000000000000000000000000000000000..0888cfbef2a81fd480734387e9cb62de44239291 --- /dev/null +++ b/nixos/modules/hardware/digitalbitbox.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.digitalbitbox; +in + +{ + options.hardware.digitalbitbox = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables udev rules for Digital Bitbox devices. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.digitalbitbox; + defaultText = "pkgs.digitalbitbox"; + description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/hardware/onlykey.nix b/nixos/modules/hardware/onlykey.nix new file mode 100644 index 0000000000000000000000000000000000000000..b6820fe01911fee112538ff215bfc4428a73ca2d --- /dev/null +++ b/nixos/modules/hardware/onlykey.nix @@ -0,0 +1,33 @@ +{ config, lib, ... }: + +with lib; + +{ + + ####### interface + + options = { + + hardware.onlykey = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable OnlyKey device (https://crp.to/p/) support. + ''; + }; + }; + + }; + + ## As per OnlyKey's documentation piece (hhttps://docs.google.com/document/d/1Go_Rs218fKUx-j_JKhddbSVTqY6P0vQO831t2MKCJC8), + ## it is important to add udev rule for OnlyKey for it to work on Linux + + ####### implementation + + config = mkIf config.hardware.onlykey.enable { + services.udev.extraRules = builtin.readFile ./onlykey.udev; + }; + + +} diff --git a/nixos/modules/hardware/onlykey.udev b/nixos/modules/hardware/onlykey.udev new file mode 100644 index 0000000000000000000000000000000000000000..6583530e56846754bf85cb4e2a3e7b1e0ce6b166 --- /dev/null +++ b/nixos/modules/hardware/onlykey.udev @@ -0,0 +1,4 @@ +ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" +ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", GROUP+="plugdev" +KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", GROUP+="plugdev" diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index c2c36f02a1436a56d2bbbfa29508a025bd7fbb86..b371af353cf9ac2b3913398c51e55221064c63d3 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -14,7 +14,6 @@ let name = "mesa-drivers+txc-${p.mesa_drivers.version}"; paths = [ p.mesa_drivers - p.mesa_drivers.out # mainly for libGL (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) ]; }; @@ -33,82 +32,92 @@ in { options = { - hardware.opengl.enable = mkOption { - description = "Whether this configuration requires OpenGL."; - type = types.bool; - default = false; - internal = true; - }; - - hardware.opengl.driSupport = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable accelerated OpenGL rendering through the - Direct Rendering Interface (DRI). - ''; - }; - - hardware.opengl.driSupport32Bit = mkOption { - type = types.bool; - default = false; - description = '' - On 64-bit systems, whether to support Direct Rendering for - 32-bit applications (such as Wine). This is currently only - supported for the nvidia and - ati_unfree drivers, as well as - Mesa. - ''; - }; - - hardware.opengl.s3tcSupport = mkOption { - type = types.bool; - default = false; - description = '' - Make S3TC(S3 Texture Compression) via libtxc_dxtn available - to OpenGL drivers instead of the patent-free S2TC replacement. - - Using this library may require a patent license depending on your location. - ''; - }; - hardware.opengl.package = mkOption { - type = types.package; - internal = true; - description = '' - The package that provides the OpenGL implementation. - ''; - }; - - hardware.opengl.package32 = mkOption { - type = types.package; - internal = true; - description = '' - The package that provides the 32-bit OpenGL implementation on - 64-bit systems. Used when is - set. - ''; - }; - - hardware.opengl.extraPackages = mkOption { - type = types.listOf types.package; - default = []; - example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; - description = '' - Additional packages to add to OpenGL drivers. This can be used - to add OpenCL drivers, VA-API/VDPAU drivers etc. - ''; - }; - - hardware.opengl.extraPackages32 = mkOption { - type = types.listOf types.package; - default = []; - example = literalExample "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; - description = '' - Additional packages to add to 32-bit OpenGL drivers on - 64-bit systems. Used when is - set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. - ''; + hardware.opengl = { + enable = mkOption { + description = '' + Whether to enable OpenGL drivers. This is needed to enable + OpenGL support in X11 systems, as well as for Wayland compositors + like sway, way-cooler and Weston. It is enabled by default + by the corresponding modules, so you do not usually have to + set it yourself, only if there is no module for your wayland + compositor of choice. See services.xserver.enable, + programs.sway.enable, and programs.way-cooler.enable. + ''; + type = types.bool; + default = false; + }; + + driSupport = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable accelerated OpenGL rendering through the + Direct Rendering Interface (DRI). + ''; + }; + + driSupport32Bit = mkOption { + type = types.bool; + default = false; + description = '' + On 64-bit systems, whether to support Direct Rendering for + 32-bit applications (such as Wine). This is currently only + supported for the nvidia and + ati_unfree drivers, as well as + Mesa. + ''; + }; + + s3tcSupport = mkOption { + type = types.bool; + default = false; + description = '' + Make S3TC(S3 Texture Compression) via libtxc_dxtn available + to OpenGL drivers instead of the patent-free S2TC replacement. + + Using this library may require a patent license depending on your location. + ''; + }; + + package = mkOption { + type = types.package; + internal = true; + description = '' + The package that provides the OpenGL implementation. + ''; + }; + + package32 = mkOption { + type = types.package; + internal = true; + description = '' + The package that provides the 32-bit OpenGL implementation on + 64-bit systems. Used when is + set. + ''; + }; + + extraPackages = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; + description = '' + Additional packages to add to OpenGL drivers. This can be used + to add OpenCL drivers, VA-API/VDPAU drivers etc. + ''; + }; + + extraPackages32 = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; + description = '' + Additional packages to add to 32-bit OpenGL drivers on + 64-bit systems. Used when is + set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. + ''; + }; }; }; diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index 5cc96d8bd0746b1caa02b9a713df2272788b9d40..50af022b93c86e54c0680afab7f1920ef6f053ef 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -15,13 +15,19 @@ let opengl = config.hardware.opengl; + kernel = pkgs.linux_4_9.override { + extraConfig = '' + KALLSYMS_ALL y + ''; + }; + in { config = mkIf enabled { - nixpkgs.config.xorg.abiCompat = "1.18"; + nixpkgs.config.xorg.abiCompat = "1.19"; services.xserver.drivers = singleton { name = "amdgpu"; modules = [ package ]; libPath = [ package ]; }; @@ -31,6 +37,9 @@ in boot.extraModulePackages = [ package ]; + boot.kernelPackages = + pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor kernel); + boot.blacklistedKernelModules = [ "radeon" ]; hardware.firmware = [ package ]; @@ -38,10 +47,15 @@ in system.activationScripts.setup-amdgpu-pro = '' mkdir -p /run/lib ln -sfn ${package}/lib ${package.libCompatDir} + ln -sfn ${package} /run/amdgpu-pro '' + optionalString opengl.driSupport32Bit '' ln -sfn ${package32}/lib ${package32.libCompatDir} ''; + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isYes "KALLSYMS_ALL") + ]; + environment.etc = { "amd/amdrc".source = package + "/etc/amd/amdrc"; "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb"; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 50c085dd7ee24a544340260b2f4cdbb406c9d5f4..eb1952280331f6553cc21f016e9376b64b33de2c 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -16,8 +16,6 @@ let kernelPackages.nvidia_x11 else if elem "nvidiaBeta" drivers then kernelPackages.nvidia_x11_beta - else if elem "nvidiaLegacy173" drivers then - kernelPackages.nvidia_x11_legacy173 else if elem "nvidiaLegacy304" drivers then kernelPackages.nvidia_x11_legacy304 else if elem "nvidiaLegacy340" drivers then @@ -27,13 +25,6 @@ let nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }; - nvidiaPackage = nvidia: pkgs: - if !nvidia.useGLVND then nvidia.out - else pkgs.buildEnv { - name = "nvidia-libs"; - paths = [ pkgs.libglvnd nvidia.out ]; - }; - enabled = nvidia_x11 != null; in @@ -59,8 +50,8 @@ in source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc"; }; - hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs; - hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686; + hardware.opengl.package = nvidia_x11.out; + hardware.opengl.package32 = nvidia_libs32.out; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ]; @@ -75,10 +66,10 @@ in # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. services.udev.extraRules = '' - KERNEL=="nvidia", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidiactl c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" - KERNEL=="nvidia_modeset", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-modeset c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" - KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia%n c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'" - KERNEL=="nvidia_uvm", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" + KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" + KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%n c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'" + KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" ''; boot.blacklistedKernelModules = [ "nouveau" "nvidiafb" ]; diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index ddb00f174d1aeea8c0900fd08e498641f24013f3..01cfe8a02e10d248083fd135e32bfd33c8e7e222 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -12,7 +12,7 @@ let # CD. These are installed into the "nixos" channel of the root # user, as expected by nixos-rebuild/nixos-install. FIXME: merge # with make-channel.nix. - channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" + channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" { } '' mkdir -p $out @@ -21,7 +21,9 @@ let if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs fi - echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix + echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision + echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix + echo ${config.system.nixos.versionSuffix} | sed -e s/pre// > $out/nixos/svn-revision ''; in diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 2569860a098ffdf79235609a369c3cf2f5e8847b..756c8751d00e5ddc829e4ab6b24b60a2af72221d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -16,7 +16,7 @@ with lib; ]; # ISO naming. - isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosLabel}-${pkgs.stdenv.system}.iso"; + isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.system}.iso"; isoImage.volumeID = substring 0 11 "NIXOS_ISO"; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 5725938465f5debbc06dab1dd05db3b0b689c0b7..4c4e69d60d9c701aae370a39f9def061f66fcf18 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -69,7 +69,7 @@ with lib; in '' mkdir -p /root/Desktop ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop - cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop + cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop chmod a+rx /root/Desktop/gnome-terminal.desktop cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop chmod a+rx /root/Desktop/gparted.desktop diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index a039f7fdcb6e72d4e709023191962760e55c0c6b..e7cbf415a22335770594a0abe2ab7e4cd98dddb9 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -39,31 +39,31 @@ let DEFAULT boot LABEL boot - MENU LABEL NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel} - LINUX /boot/bzImage + MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} + LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} - INITRD /boot/initrd + INITRD /boot/${config.system.boot.loader.initrdFile} # A variant to boot with 'nomodeset' LABEL boot-nomodeset - MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (nomodeset) - LINUX /boot/bzImage + MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (nomodeset) + LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset - INITRD /boot/initrd + INITRD /boot/${config.system.boot.loader.initrdFile} # A variant to boot with 'copytoram' LABEL boot-copytoram - MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (copytoram) - LINUX /boot/bzImage + MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (copytoram) + LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram - INITRD /boot/initrd + INITRD /boot/${config.system.boot.loader.initrdFile} # A variant to boot with verbose logging to the console LABEL boot-nomodeset - MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (debug) - LINUX /boot/bzImage + MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (debug) + LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7 - INITRD /boot/initrd + INITRD /boot/${config.system.boot.loader.initrdFile} ''; isolinuxMemtest86Entry = '' @@ -82,35 +82,35 @@ let mkdir -p $out/loader/entries cat << EOF > $out/loader/entries/nixos-iso.conf - title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} - linux /boot/bzImage - initrd /boot/initrd + title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} + linux /boot/${config.system.boot.loader.kernelFile} + initrd /boot/${config.system.boot.loader.initrdFile} options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} EOF # A variant to boot with 'nomodeset' cat << EOF > $out/loader/entries/nixos-iso-nomodeset.conf - title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} + title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} version nomodeset - linux /boot/bzImage - initrd /boot/initrd + linux /boot/${config.system.boot.loader.kernelFile} + initrd /boot/${config.system.boot.loader.initrdFile} options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset EOF # A variant to boot with 'copytoram' cat << EOF > $out/loader/entries/nixos-iso-copytoram.conf - title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} + title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} version copytoram - linux /boot/bzImage - initrd /boot/initrd + linux /boot/${config.system.boot.loader.kernelFile} + initrd /boot/${config.system.boot.loader.initrdFile} options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram EOF # A variant to boot with verbose logging to the console cat << EOF > $out/loader/entries/nixos-iso-debug.conf - title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (debug) - linux /boot/bzImage - initrd /boot/initrd + title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (debug) + linux /boot/${config.system.boot.loader.kernelFile} + initrd /boot/${config.system.boot.loader.initrdFile} options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7 EOF @@ -127,8 +127,8 @@ let mkdir ./contents && cd ./contents cp -rp "${efiDir}"/* . mkdir ./boot - cp -p "${config.boot.kernelPackages.kernel}/bzImage" \ - "${config.system.build.initialRamdisk}/initrd" ./boot/ + cp -p "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}" \ + "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" ./boot/ touch --date=@0 ./* usage_size=$(du -sb --apparent-size . | tr -cd '[:digit:]') @@ -331,8 +331,7 @@ in config.system.build.toplevel.drvPath; # Create the squashfs image that contains the Nix store. - system.build.squashfsStore = import ../../../lib/make-squashfs.nix { - inherit (pkgs) stdenv squashfsTools perl pathsFromGraph; + system.build.squashfsStore = pkgs.callPackage ../../../lib/make-squashfs.nix { storeContents = config.isoImage.storeContents; }; @@ -346,11 +345,11 @@ in }; target = "/isolinux/isolinux.cfg"; } - { source = config.boot.kernelPackages.kernel + "/bzImage"; - target = "/boot/bzImage"; + { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile; + target = "/boot/" + config.system.boot.loader.kernelFile; } - { source = config.system.build.initialRamdisk + "/initrd"; - target = "/boot/initrd"; + { source = config.system.build.initialRamdisk + "/" + config.system.boot.loader.initrdFile; + target = "/boot/" + config.system.boot.loader.initrdFile; } { source = config.system.build.squashfsStore; target = "/nix-store.squashfs"; @@ -361,7 +360,7 @@ in { source = config.isoImage.splashImage; target = "/isolinux/background.png"; } - { source = pkgs.writeText "version" config.system.nixosVersion; + { source = pkgs.writeText "version" config.system.nixos.label; target = "/version.txt"; } ] ++ optionals config.isoImage.makeEfiBootable [ @@ -383,11 +382,8 @@ in boot.loader.timeout = 10; # Create the ISO image. - system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({ - inherit (pkgs) stdenv perl pathsFromGraph xorriso syslinux; - + system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({ inherit (config.isoImage) isoName compressImage volumeID contents; - bootable = true; bootImage = "/isolinux/isolinux.bin"; } // optionalAttrs config.isoImage.makeUsbBootable { diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index efb9ba39bcd452d7c6f417b215073a520f2d7a6d..ddf91a5656c7cfc34552212931a4fef688f24df8 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -21,12 +21,10 @@ in "it cannot be cross compiled"; }; - # Needed by RPi firmware - nixpkgs.config.allowUnfree = true; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; + boot.consoleLogLevel = lib.mkDefault 7; boot.kernelPackages = pkgs.linuxPackages_latest; # The serial ports listed here are: @@ -42,8 +40,17 @@ in populateBootCommands = let configTxt = pkgs.writeText "config.txt" '' kernel=u-boot-rpi3.bin + + # Boot in 64-bit mode. arm_control=0x200 + + # U-Boot used to need this to work, regardless of whether UART is actually used or not. + # TODO: check when/if this can be removed. enable_uart=1 + + # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel + # when attempting to show low-voltage or overtemperature warnings. + avoid_warnings=1 ''; in '' (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) 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 880a6bf2e1e8e64afb15fdd18421d8d107c4d5da..891923234dda9144bc21f3c0cb5d486f75b1761f 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -21,12 +21,10 @@ in "it cannot be cross compiled"; }; - # Needed by RPi firmware - nixpkgs.config.allowUnfree = true; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; + boot.consoleLogLevel = lib.mkDefault 7; boot.kernelPackages = pkgs.linuxPackages_latest; # The serial ports listed here are: # - ttyS0: for Tegra (Jetson TK1) @@ -42,11 +40,18 @@ in sdImage = { populateBootCommands = let configTxt = pkgs.writeText "config.txt" '' + # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel + # when attempting to show low-voltage or overtemperature warnings. + avoid_warnings=1 + [pi2] kernel=u-boot-rpi2.bin [pi3] kernel=u-boot-rpi3.bin + + # U-Boot used to need this to work, regardless of whether UART is actually used or not. + # TODO: check when/if this can be removed. enable_uart=1 ''; in '' diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index eb676eae05e8998f0dff2d1803bb9f402939ff3f..212013b5e289621c73d7417383ff405c68b2d389 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -21,12 +21,10 @@ in "it cannot be cross compiled"; }; - # Needed by RPi firmware - nixpkgs.config.allowUnfree = true; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; + boot.consoleLogLevel = lib.mkDefault 7; boot.kernelPackages = pkgs.linuxPackages_rpi; # FIXME: this probably should be in installation-device.nix diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 23312c073d5688deab7b622510e2a64bbf3ca700..c091923de60f7daf6741214aa6a19b1fc0088469 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -20,6 +20,20 @@ let in { options.sdImage = { + imageName = mkOption { + default = "${config.sdImage.imageBaseName}-${config.system.nixos.label}-${pkgs.stdenv.system}.img"; + description = '' + Name of the generated image file. + ''; + }; + + imageBaseName = mkOption { + default = "nixos-sd-image"; + description = '' + Prefix of the name of the generated image file. + ''; + }; + storePaths = mkOption { type = with types; listOf package; example = literalExample "[ pkgs.stdenv ]"; @@ -61,19 +75,25 @@ in sdImage.storePaths = [ config.system.build.toplevel ]; system.build.sdImage = pkgs.stdenv.mkDerivation { - name = "sd-image-${pkgs.stdenv.system}.img"; + name = config.sdImage.imageName; buildInputs = with pkgs; [ dosfstools e2fsprogs mtools libfaketime utillinux ]; buildCommand = '' + mkdir -p $out/nix-support $out/sd-image + export img=$out/sd-image/${config.sdImage.imageName} + + echo "${pkgs.stdenv.system}" > $out/nix-support/system + echo "file sd-image $img" >> $out/nix-support/hydra-build-products + # Create the image file sized to fit /boot and /, plus 20M of slack rootSizeBlocks=$(du -B 512 --apparent-size ${rootfsImage} | awk '{ print $1 }') bootSizeBlocks=$((${toString config.sdImage.bootSize} * 1024 * 1024 / 512)) imageSize=$((rootSizeBlocks * 512 + bootSizeBlocks * 512 + 20 * 1024 * 1024)) - truncate -s $imageSize $out + truncate -s $imageSize $img # type=b is 'W95 FAT32', type=83 is 'Linux'. - sfdisk $out <&2 + exit 126 +fi + +mkdir -m 0755 -p "$mountPoint/dev" +mount --rbind /dev "$mountPoint/dev" + +# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings. +LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 || true + +exec chroot "$mountPoint" "${command[@]}" diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 7c737e84de0a826ad2440a873d5e5490544b26b6..14c611e18bc3e233d8ff9ab8a22287468e540202 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -585,7 +585,6 @@ $bootLoaderConfig # Some programs need SUID wrappers, can be configured further or are # started in user sessions. - # programs.bash.enableCompletion = true; # programs.mtr.enable = true; # programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; @@ -603,6 +602,10 @@ $bootLoaderConfig # Enable CUPS to print documents. # services.printing.enable = true; + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + # Enable the X11 windowing system. # services.xserver.enable = true; # services.xserver.layout = "us"; @@ -625,7 +628,7 @@ $bootLoaderConfig # compatible, in order to avoid breaking some software such as database # servers. You should change this only after NixOS release notes say you # should. - system.stateVersion = "${\(qw(@nixosRelease@))}"; # Did you read the comment? + system.stateVersion = "${\(qw(@release@))}"; # Did you read the comment? } EOF diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index f994d5b4bde1120f6bc4e3659ecd874519ff27d7..22c1e0fe9a34b64769ebd4dc8dac65fd2a931859 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -1,35 +1,23 @@ #! @shell@ -# - make Nix store etc. -# - copy closure of Nix to target device -# - register validity -# - with a chroot to the target device: -# * nix-env -p /nix/var/nix/profiles/system -i -# * install the boot loader +set -e +shopt -s nullglob + +export PATH=@path@:$PATH # Ensure a consistent umask. umask 0022 -# Re-exec ourselves in a private mount namespace so that our bind -# mounts get cleaned up automatically. -if [ "$(id -u)" = 0 ]; then - if [ -z "$NIXOS_INSTALL_REEXEC" ]; then - export NIXOS_INSTALL_REEXEC=1 - exec unshare --mount --uts -- "$0" "$@" - else - mount --make-rprivate / - fi -fi - # Parse the command line for the -I flag extraBuildFlags=() -chrootCommand=(/run/current-system/sw/bin/bash) -buildUsersGroup="nixbld" + +mountPoint=/mnt +channelPath= while [ "$#" -gt 0 ]; do i="$1"; shift 1 case "$i" in - --max-jobs|-j|--cores|-I) + --max-jobs|-j|--cores|-I|--substituters) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; @@ -41,9 +29,11 @@ while [ "$#" -gt 0 ]; do --root) mountPoint="$1"; shift 1 ;; - --closure) - closure="$1"; shift 1 - buildUsersGroup="" + --system|--closure) + system="$1"; shift 1 + ;; + --channel) + channelPath="$1"; shift 1 ;; --no-channel-copy) noChannelCopy=1 @@ -57,17 +47,13 @@ while [ "$#" -gt 0 ]; do --show-trace) extraBuildFlags+=("$i") ;; - --chroot) - runChroot=1 - if [[ "$@" != "" ]]; then - chrootCommand=("$@") - fi - break - ;; --help) exec man nixos-install exit 1 ;; + --debug) + set -x + ;; *) echo "$0: unknown option \`$i'" exit 1 @@ -75,132 +61,83 @@ while [ "$#" -gt 0 ]; do esac done -set -e -shopt -s nullglob - -if test -z "$mountPoint"; then - mountPoint=/mnt -fi - if ! test -e "$mountPoint"; then echo "mount point $mountPoint doesn't exist" exit 1 fi # Get the path of the NixOS configuration file. -if test -z "$NIXOS_CONFIG"; then - NIXOS_CONFIG=/etc/nixos/configuration.nix +if [[ -z $NIXOS_CONFIG ]]; then + NIXOS_CONFIG=$mountPoint/etc/nixos/configuration.nix fi -if [ ! -e "$mountPoint/$NIXOS_CONFIG" ] && [ -z "$closure" ]; then - echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist" +if [[ ${NIXOS_CONFIG:0:1} != / ]]; then + echo "$0: \$NIXOS_CONFIG is not an absolute path" exit 1 fi - -# 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") - -# We only need nixpkgs in the path if we don't already have a system closure to install -if [[ -z "$closure" ]]; then - nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")" - export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG" -fi -unset NIXOS_CONFIG - -# These get created in nixos-prepare-root as well, but we want to make sure they're here in case we're -# running with --chroot. TODO: --chroot should just be split into a separate tool. -mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys" - -# Set up some bind mounts we'll want regardless of chroot or not -mount --rbind /dev "$mountPoint/dev" -mount --rbind /proc "$mountPoint/proc" -mount --rbind /sys "$mountPoint/sys" - -# If we asked for a chroot, that means we're not actually installing anything (yeah I was confused too) -# and we just want to run a command in the context of a $mountPoint that we're assuming has already been -# set up by a previous nixos-install invocation. In that case we set up some remaining bind mounts and -# exec the requested command, skipping the rest of the installation procedure. -if [ -n "$runChroot" ]; then - 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 - - 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[@]}" +if [[ ! -e $NIXOS_CONFIG && -z $system ]]; then + echo "configuration file $NIXOS_CONFIG doesn't exist" + exit 1 fi -# A place to drop temporary closures +# A place to drop temporary stuff. 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\"" -} - -system_closure="$tmpdir/system.closure" -# Use a FIFO for piping nix-store --export into nix-store --import, saving disk -# I/O and space. nix-store --import is run by nixos-prepare-root. -mkfifo $system_closure - -if [ -z "$closure" ]; then - expr="(import {}).system" - system_root="$(nix-build -E "$expr")" - system_closure="$(closure "$expr")" -else - 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! - # Run in background to avoid blocking while trying to write to the FIFO - # $system_closure refers to - nix-store --export $(nix-store -qR $closure) > $system_closure & -fi - -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" - -# 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 +sub="auto?trusted=1" +# Build the system configuration in the target filesystem. +if [[ -z $system ]]; then + echo "building the configuration in $NIXOS_CONFIG..." + outLink="$tmpdir/system" + nix build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ + --extra-substituters "$sub" \ + -f '' system -I "nixos-config=$NIXOS_CONFIG" + system=$(readlink -f $outLink) +fi +# Set the system profile to point to the configuration. TODO: combine +# this with the previous step once we have a nix-env replacement with +# a progress bar. +nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \ + --extra-substituters "$sub" \ + -p $mountPoint/nix/var/nix/profiles/system --set "$system" + +# Copy the NixOS/Nixpkgs sources to the target as the initial contents +# of the NixOS channel. +if [[ -z $noChannelCopy ]]; then + if [[ -z $channelPath ]]; then + channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" + fi + if [[ -n $channelPath ]]; then + echo "copying channel..." + mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root + nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \ + -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet + install -m 0700 -d $mountPoint/root/.nix-defexpr + ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels + fi +fi -# 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. +mkdir -m 0755 -p "$mountPoint/etc" +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. -echo "finalising the installation..." -if [ -z "$noBootLoader" ]; then - NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint \ - /nix/var/nix/profiles/system/bin/switch-to-configuration boot +if [[ -z $noBootLoader ]]; then + echo "installing the boot loader..." + # Grub needs an mtab. + ln -sfn /proc/mounts $mountPoint/etc/mtab + NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot fi -# Run the activation script. -chroot $mountPoint /nix/var/nix/profiles/system/activate - - -# Ask the user to set a root password. -if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /run/wrappers/bin/passwd ] && [ -t 0 ]; then - echo "setting root password..." - chroot $mountPoint /run/wrappers/bin/passwd +# Ask the user to set a root password, but only if the passwd command +# exists (i.e. when mutable user accounts are enabled). +if [[ -z $noRootPasswd ]] && [ -t 0 ]; then + nixos-enter --root "$mountPoint" -c '[[ -e /nix/var/nix/profiles/system/sw/bin/passwd ]] && echo "setting root password..." && /nix/var/nix/profiles/system/sw/bin/passwd' fi - echo "installation finished!" diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh deleted file mode 100644 index ed5af234fec966b869c299858abf9d47b855ac26..0000000000000000000000000000000000000000 --- a/nixos/modules/installer/tools/nixos-prepare-root.sh +++ /dev/null @@ -1,104 +0,0 @@ -#! @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. -install -m 0755 -d $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home -install -m 01777 -d $mountPoint/tmp -install -m 0755 -d $mountPoint/tmp/root -install -m 0755 -d $mountPoint/var -install -m 0700 -d $mountPoint/root - -ln -sf /run $mountPoint/var/run - -# Create the necessary Nix directories on the target device -install -m 0755 -d \ - $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 - -install -m 1775 -d $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 -install -m 0755 -d $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. -install -m 0755 -d $mountPoint/nix/var/nix/profiles -install -m 1777 -d $mountPoint/nix/var/nix/profiles/per-user -install -m 0755 -d $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 -install -m 0700 -d $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 9ede74a54cd72a1b364a822a0dc3bfde32955ba4..2af73519bc5243bae58703d9402fc3dc61a42789 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -382,6 +382,6 @@ fi if [ "$action" = build-vm ]; then cat >&2 <environment.systemPackages into the generated system path. + ''; + }; + + man.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install manual pages and the man command. + This also includes "man" outputs. + ''; + }; + + doc.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install documentation distributed in packages' /share/doc. + Usually plain text and/or HTML. + This also includes "doc" outputs. + ''; + }; + + info.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install info pages and the info command. + This also includes "info" outputs. + ''; + }; + + }; + + }; + + config = mkIf cfg.enable (mkMerge [ + + (mkIf cfg.man.enable { + environment.systemPackages = [ pkgs.man-db ]; + environment.pathsToLink = [ "/share/man" ]; + environment.extraOutputsToInstall = [ "man" ]; + }) + + (mkIf cfg.doc.enable { + # TODO(@oxij): put it here and remove from profiles? + # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox? + environment.pathsToLink = [ "/share/doc" ]; + environment.extraOutputsToInstall = [ "doc" ]; + }) + + (mkIf cfg.info.enable { + environment.systemPackages = [ pkgs.texinfoInteractive ]; + environment.pathsToLink = [ "/share/info" ]; + environment.extraOutputsToInstall = [ "info" ]; + }) + + ]); + +} diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 7d0cbf6aad024eddcaa916f0b4c0046bcfb21ed6..ab3cbcab0646fbff90e1d2bef7efae382b4333ba 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -56,7 +56,7 @@ #dialout = 27; # unused polkituser = 28; #utmp = 29; # unused - ddclient = 30; + # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; #disnix = 33; # unused osgi = 34; @@ -65,7 +65,7 @@ foldingathome = 37; sabnzbd = 38; #kdm = 39; # dropped in 17.03 - ghostone = 40; + #ghostone = 40; # dropped in 18.03 git = 41; fourstore = 42; fourstorehttp = 43; @@ -106,7 +106,7 @@ freenet = 79; ircd = 80; bacula = 81; - almir = 82; + #almir = 82; # removed 2018-03-25, the almir package was removed in 30291227f2411abaca097773eedb49b8f259e297 during 2017-08 deluge = 83; mysql = 84; rabbitmq = 85; @@ -197,10 +197,10 @@ #input = 174; # unused sddm = 175; tss = 176; - memcached = 177; + #memcached = 177; removed 2018-01-03 ntp = 179; zabbix = 180; - redis = 181; + #redis = 181; removed 2018-01-03 unifi = 183; uptimed = 184; zope2 = 185; @@ -233,7 +233,7 @@ calibre-server = 213; heapster = 214; bepasty = 215; - pumpio = 216; + # pumpio = 216; # unused, removed 2018-02-24 nm-openvpn = 217; mathics = 218; ejabberd = 219; @@ -281,8 +281,8 @@ stanchion = 262; riak-cs = 263; infinoted = 264; - keystone = 265; - glance = 266; + # keystone = 265; # unused, removed 2017-12-13 + # glance = 266; # unused, removed 2017-12-13 couchpotato = 267; gogs = 268; pdns-recursor = 269; @@ -300,6 +300,12 @@ kanboard = 281; pykms = 282; kodi = 283; + restya-board = 284; + mighttpd2 = 285; + hass = 286; + monero = 287; + ceph = 288; + duplicati = 289; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -338,7 +344,7 @@ dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; - ddclient = 30; + # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; disnix = 33; osgi = 34; @@ -347,7 +353,7 @@ #foldingathome = 37; # unused #sabnzd = 38; # unused #kdm = 39; # unused, even before 17.03 - ghostone = 40; + #ghostone = 40; # dropped in 18.03 git = 41; fourstore = 42; fourstorehttp = 43; @@ -388,7 +394,7 @@ freenet = 79; ircd = 80; bacula = 81; - almir = 82; + #almir = 82; # removed 2018-03-25, the almir package was removed in 30291227f2411abaca097773eedb49b8f259e297 during 2017-08 deluge = 83; mysql = 84; rabbitmq = 85; @@ -474,10 +480,10 @@ input = 174; sddm = 175; tss = 176; - #memcached = 177; # unused + #memcached = 177; # unused, removed 2018-01-03 #ntp = 179; # unused #zabbix = 180; # unused - #redis = 181; # unused + #redis = 181; # unused, removed 2018-01-03 #unifi = 183; # unused #uptimed = 184; # unused #zope2 = 185; # unused @@ -509,7 +515,7 @@ xtreemfs = 212; calibre-server = 213; bepasty = 215; - pumpio = 216; + # pumpio = 216; # unused, removed 2018-02-24 nm-openvpn = 217; mathics = 218; ejabberd = 219; @@ -550,8 +556,8 @@ stanchion = 262; riak-cs = 263; infinoted = 264; - keystone = 265; - glance = 266; + # keystone = 265; # unused, removed 2017-12-13 + # glance = 266; # unused, removed 2017-12-13 couchpotato = 267; gogs = 268; kresd = 270; @@ -568,6 +574,12 @@ kanboard = 281; pykms = 282; kodi = 283; + restya-board = 284; + mighttpd2 = 285; + hass = 286; + monero = 287; + ceph = 288; + duplicati = 289; # 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/label.nix b/nixos/modules/misc/label.nix new file mode 100644 index 0000000000000000000000000000000000000000..8e5e57b3b83b71b6cb0cc707809c833f6f984571 --- /dev/null +++ b/nixos/modules/misc/label.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.system.nixos; +in + +{ + + options.system = { + + nixos.label = mkOption { + type = types.str; + description = '' + NixOS version name to be used in the names of generated + outputs and boot labels. + + If you ever wanted to influence the labels in your GRUB menu, + this is the option for you. + + The default is separated by + "-" + "-" + NIXOS_LABEL_VERSION environment + variable (defaults to the value of + ). + + Can be overriden by setting NIXOS_LABEL. + + Useful for not loosing track of configurations built from different + nixos branches/revisions, e.g.: + + + #!/bin/sh + today=`date +%Y%m%d` + branch=`(cd nixpkgs ; git branch 2>/dev/null | sed -n '/^\* / { s|^\* ||; p; }')` + revision=`(cd nixpkgs ; git rev-parse HEAD)` + export NIXOS_LABEL_VERSION="$today.$branch-''${revision:0:7}" + nixos-rebuild switch + ''; + }; + + nixos.tags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "with-xen" ]; + description = '' + Strings to prefix to the default + . + + Useful for not loosing track of configurations built with + different options, e.g.: + + + { + system.nixos.tags = [ "with-xen" ]; + virtualisation.xen.enable = true; + } + + ''; + }; + + }; + + config = { + # This is set here rather than up there so that changing it would + # not rebuild the manual + system.nixos.label = mkDefault (maybeEnv "NIXOS_LABEL" + (concatStringsSep "-" ((sort (x: y: x < y) cfg.tags) + ++ [ (maybeEnv "NIXOS_LABEL_VERSION" cfg.version) ]))); + }; + +} diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 51953d1110c438d027a908897c42fc1c2786ceaa..ce5765cf1978ceba208ac2a40a2228413cb547c6 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -97,7 +97,7 @@ in { Whether not to index bind mounts ''; }; - + }; config = mkIf cfg.enable { @@ -133,13 +133,26 @@ in { systemd.services.update-locatedb = { description = "Update Locate Database"; path = mkIf (!isMLocate) [ pkgs.su ]; + + # mlocate's updatedb takes flags via a configuration file or + # on the command line, but not by environment variable. script = + if isMLocate + then let toFlags = x: optional (cfg.${x} != []) + "--${lib.toLower x} '${concatStringsSep " " cfg.${x}}'"; + args = concatLists (map toFlags ["pruneFS" "pruneNames" "prunePaths"]); + in '' + exec ${cfg.locate}/bin/updatedb \ + --output ${toString cfg.output} ${concatStringsSep " " args} \ + --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \ + ${concatStringsSep " " cfg.extraFlags} '' + else '' exec ${cfg.locate}/bin/updatedb \ ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; - environment = { + environment = optionalAttrs (!isMLocate) { PRUNEFS = concatStringsSep " " cfg.pruneFS; PRUNEPATHS = concatStringsSep " " cfg.prunePaths; PRUNENAMES = concatStringsSep " " cfg.pruneNames; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 1793c1447d602404280d6e73eb5115d779a1a5eb..b8a55a24394e46f819a58f74b0a1b5d5d11dd2a2 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -3,11 +3,13 @@ with lib; let + cfg = config.nixpkgs; + isConfig = x: - builtins.isAttrs x || builtins.isFunction x; + builtins.isAttrs x || lib.isFunction x; optCall = f: x: - if builtins.isFunction f + if lib.isFunction f then f x else f; @@ -38,27 +40,72 @@ let overlayType = mkOptionType { name = "nixpkgs-overlay"; description = "nixpkgs overlay"; - check = builtins.isFunction; + check = lib.isFunction; merge = lib.mergeOneOption; }; - _pkgs = import ../../.. config.nixpkgs; + pkgsType = mkOptionType { + name = "nixpkgs"; + description = "An evaluation of Nixpkgs; the top level attribute set of packages"; + check = builtins.isAttrs; + }; in { options.nixpkgs = { + + pkgs = mkOption { + defaultText = literalExample + ''import "''${nixos}/.." { + inherit (config.nixpkgs) config overlays localSystem crossSystem; + } + ''; + default = import ../../.. { + localSystem = { inherit (cfg) system; } // cfg.localSystem; + inherit (cfg) config overlays crossSystem; + }; + type = pkgsType; + example = literalExample ''import {}''; + description = '' + This is the evaluation of Nixpkgs that will be provided to + all NixOS modules. Defining this option has the effect of + ignoring the other options that would otherwise be used to + evaluate Nixpkgs, because those are arguments to the default + value. The default value imports the Nixpkgs source files + relative to the location of this NixOS module, because + NixOS and Nixpkgs are distributed together for consistency, + so the nixos in the default value is in fact a + relative path. The config, overlays, + localSystem, and crossSystem come + from this option's siblings. + + This option can be used by applications like NixOps to increase + the performance of evaluation, or to create packages that depend + on a container that should be built with the exact same evaluation + of Nixpkgs, for example. Applications like this should set + their default value using lib.mkDefault, so + user-provided configuration can override it without using + lib. + + Note that using a distinct version of Nixpkgs with NixOS may + be an unexpected source of problems. Use this option with care. + ''; + }; + config = mkOption { default = {}; example = literalExample '' - { firefox.enableGeckoMediaPlayer = true; } + { allowBroken = true; allowUnfree = true; } ''; type = configType; description = '' The configuration of the Nix Packages collection. (For details, see the Nixpkgs documentation.) It allows you to set package configuration options. + + Ignored when nixpkgs.pkgs is set. ''; }; @@ -69,7 +116,6 @@ in [ (self: super: { openssh = super.openssh.override { hpnSupport = true; - withKerberos = true; kerberos = self.libkrb5; }; }; @@ -83,6 +129,47 @@ in takes as an argument the original Nixpkgs. The first argument should be used for finding dependencies, and the second should be used for overriding recipes. + + Ignored when nixpkgs.pkgs is set. + ''; + }; + + localSystem = mkOption { + type = types.attrs; # TODO utilize lib.systems.parsedPlatform + default = { system = builtins.currentSystem; }; + example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + defaultText = literalExample + ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; + description = '' + Specifies the platform on which NixOS should be built. When + nixpkgs.crossSystem is unset, it also specifies + the platform for which NixOS should be + built. If this option is unset, it defaults to the platform + type of the machine where evaluation happens. Specifying this + option is useful when doing distributed multi-platform + deployment, or when building virtual machines. See its + description in the Nixpkgs manual for more details. + + Ignored when nixpkgs.pkgs is set. + ''; + }; + + crossSystem = mkOption { + type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform + default = null; + example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + defaultText = literalExample + ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; + description = '' + Specifies the platform for which NixOS should be + built. Specify this only if it is different from + nixpkgs.localSystem, the platform + on which NixOS should be built. In other + words, specify this to cross-compile NixOS. Otherwise it + should be set as null, the default. See its description in the + Nixpkgs manual for more details. + + Ignored when nixpkgs.pkgs is set. ''; }; @@ -90,18 +177,30 @@ in type = types.str; example = "i686-linux"; description = '' - Specifies the Nix platform type for which NixOS should be built. - If unset, it defaults to the platform type of your host system. - Specifying this option is useful when doing distributed - multi-platform deployment, or when building virtual machines. + Specifies the Nix platform type on which NixOS should be built. + It is better to specify nixpkgs.localSystem instead. + + { + nixpkgs.system = ..; + } + + is the same as + + { + nixpkgs.localSystem.system = ..; + } + + See nixpkgs.localSystem for more information. + + Ignored when nixpkgs.pkgs is set. ''; }; }; config = { _module.args = { - pkgs = _pkgs; - pkgs_i686 = _pkgs.pkgsi686Linux; + pkgs = cfg.pkgs; + pkgs_i686 = cfg.pkgs.pkgsi686Linux; }; }; } diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 48cde2ebbc8ad60782dc4989f6f0e8ccb7071c61..7519d9176982be709fbb36ed4d75bf7571f3ca9e 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.system; + cfg = config.system.nixos; releaseFile = "${toString pkgs.path}/.version"; suffixFile = "${toString pkgs.path}/.version-suffix"; @@ -16,51 +16,42 @@ in options.system = { - stateVersion = mkOption { + # XXX: Reintroduce old options to make nixops before 1.6 able to evaluate configurations + # XXX: Remove after nixops has been bumped to a compatible version + nixosVersion = mkOption { + readOnly = true; + internal = true; type = types.str; - default = cfg.nixosRelease; - description = '' - Every once in a while, a new NixOS release may change - configuration defaults in a way incompatible with stateful - data. For instance, if the default version of PostgreSQL - changes, the new version will probably be unable to read your - existing databases. To prevent such breakage, you can set the - value of this option to the NixOS release with which you want - to be compatible. The effect is that NixOS will option - defaults corresponding to the specified release (such as using - an older version of PostgreSQL). - ''; + default = config.system.nixos.version; }; - - nixosLabel = mkOption { + nixosVersionSuffix = mkOption { + readOnly = true; + internal = true; type = types.str; - description = '' - Label to be used in the names of generated outputs and boot - labels. - ''; + default = config.system.nixos.versionSuffix; }; - nixosVersion = mkOption { + nixos.version = mkOption { internal = true; type = types.str; description = "The full NixOS version (e.g. 16.03.1160.f2d4ee1)."; }; - nixosRelease = mkOption { + nixos.release = mkOption { readOnly = true; type = types.str; default = fileContents releaseFile; description = "The NixOS release (e.g. 16.03)."; }; - nixosVersionSuffix = mkOption { + nixos.versionSuffix = mkOption { internal = true; type = types.str; default = if pathExists suffixFile then fileContents suffixFile else "pre-git"; description = "The NixOS version suffix (e.g. 1160.f2d4ee1)."; }; - nixosRevision = mkOption { + nixos.revision = mkOption { internal = true; type = types.str; default = if pathIsDirectory gitRepo then commitIdFromGitRepo gitRepo @@ -69,12 +60,28 @@ in description = "The Git revision from which this NixOS configuration was built."; }; - nixosCodeName = mkOption { + nixos.codeName = mkOption { readOnly = true; type = types.str; description = "The NixOS release code name (e.g. Emu)."; }; + stateVersion = mkOption { + type = types.str; + default = cfg.release; + description = '' + Every once in a while, a new NixOS release may change + configuration defaults in a way incompatible with stateful + data. For instance, if the default version of PostgreSQL + changes, the new version will probably be unable to read your + existing databases. To prevent such breakage, you can set the + value of this option to the NixOS release with which you want + to be compatible. The effect is that NixOS will option + defaults corresponding to the specified release (such as using + an older version of PostgreSQL). + ''; + }; + defaultChannel = mkOption { internal = true; type = types.str; @@ -86,16 +93,15 @@ in config = { - system = { + system.nixos = { # These defaults are set here rather than up there so that # changing them would not rebuild the manual - nixosLabel = mkDefault cfg.nixosVersion; - nixosVersion = mkDefault (cfg.nixosRelease + cfg.nixosVersionSuffix); - nixosRevision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId); - nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId)); + version = mkDefault (cfg.release + cfg.versionSuffix); + revision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId); + versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId)); - # Note: code names must only increase in alphabetical order. - nixosCodeName = "Impala"; + # Note: the first letter is bumped on every release. It's an animal. + codeName = "Jellyfish"; }; # Generate /etc/os-release. See @@ -105,10 +111,10 @@ in '' NAME=NixOS ID=nixos - VERSION="${config.system.nixosVersion} (${config.system.nixosCodeName})" - VERSION_CODENAME=${toLower config.system.nixosCodeName} - VERSION_ID="${config.system.nixosVersion}" - PRETTY_NAME="NixOS ${config.system.nixosVersion} (${config.system.nixosCodeName})" + VERSION="${cfg.version} (${cfg.codeName})" + VERSION_CODENAME=${toLower cfg.codeName} + VERSION_ID="${cfg.version}" + PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})" HOME_URL="https://nixos.org/" SUPPORT_URL="https://nixos.org/nixos/support.html" BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues" diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d6360648964987a365f83a0a30172e7ae6b84d17..74c8c7bbc8209bc43acfb88e469c437aa6ab631c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -31,6 +31,7 @@ ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix + ./hardware/digitalbitbox.nix ./hardware/sensor/iio.nix ./hardware/ksm.nix ./hardware/mcelog.nix @@ -40,6 +41,7 @@ ./hardware/pcmcia.nix ./hardware/raid/hpsa.nix ./hardware/usb-wwan.nix + ./hardware/onlykey.nix ./hardware/video/amdgpu.nix ./hardware/video/amdgpu-pro.nix ./hardware/video/ati.nix @@ -57,9 +59,11 @@ ./installer/tools/tools.nix ./misc/assertions.nix ./misc/crashdump.nix + ./misc/documentation.nix ./misc/extra-arguments.nix ./misc/ids.nix ./misc/lib.nix + ./misc/label.nix ./misc/locate.nix ./misc/meta.nix ./misc/nixpkgs.nix @@ -71,44 +75,55 @@ ./programs/bcc.nix ./programs/blcr.nix ./programs/browserpass.nix + ./programs/ccache.nix ./programs/cdemu.nix ./programs/chromium.nix ./programs/command-not-found/command-not-found.nix + ./programs/criu.nix ./programs/dconf.nix + ./programs/digitalbitbox/default.nix ./programs/environment.nix ./programs/fish.nix ./programs/freetds.nix ./programs/gnupg.nix ./programs/gphoto2.nix - ./programs/info.nix + ./programs/iftop.nix ./programs/java.nix ./programs/kbdlight.nix + ./programs/less.nix ./programs/light.nix - ./programs/man.nix ./programs/mosh.nix ./programs/mtr.nix ./programs/nano.nix ./programs/npm.nix ./programs/oblogout.nix + ./programs/plotinus.nix ./programs/qt5ct.nix + ./programs/rootston.nix ./programs/screen.nix ./programs/slock.nix ./programs/shadow.nix ./programs/shell.nix ./programs/spacefm.nix + ./programs/singularity.nix ./programs/ssh.nix ./programs/ssmtp.nix ./programs/sysdig.nix + ./programs/systemtap.nix ./programs/sway.nix ./programs/thefuck.nix ./programs/tmux.nix + ./programs/udevil.nix ./programs/venus.nix ./programs/vim.nix + ./programs/way-cooler.nix ./programs/wireshark.nix ./programs/xfs_quota.nix ./programs/xonsh.nix + ./programs/yabar.nix ./programs/zsh/oh-my-zsh.nix ./programs/zsh/zsh.nix + ./programs/zsh/zsh-autoenv.nix ./programs/zsh/zsh-syntax-highlighting.nix ./rename.nix ./security/acme.nix @@ -144,11 +159,14 @@ ./services/audio/slimserver.nix ./services/audio/squeezelite.nix ./services/audio/ympd.nix - ./services/backup/almir.nix ./services/backup/bacula.nix + ./services/backup/borgbackup.nix + ./services/backup/duplicati.nix ./services/backup/crashplan.nix + ./services/backup/crashplan-small-business.nix ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix + ./services/backup/restic.nix ./services/backup/rsnapshot.nix ./services/backup/tarsnap.nix ./services/backup/znapzend.nix @@ -196,7 +214,9 @@ ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix ./services/desktops/geoclue2.nix + ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix + ./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome3/gnome-disks.nix ./services/desktops/gnome3/gnome-documents.nix @@ -210,22 +230,22 @@ ./services/desktops/gnome3/seahorse.nix ./services/desktops/gnome3/sushi.nix ./services/desktops/gnome3/tracker.nix + ./services/desktops/gnome3/tracker-miners.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix ./services/development/hoogle.nix ./services/editors/emacs.nix ./services/editors/infinoted.nix ./services/games/factorio.nix - ./services/games/ghost-one.nix ./services/games/minecraft-server.nix ./services/games/minetest-server.nix ./services/games/terraria.nix ./services/hardware/acpid.nix ./services/hardware/actkbd.nix - ./services/hardware/amd-hybrid-graphics.nix ./services/hardware/bluetooth.nix ./services/hardware/brltty.nix ./services/hardware/freefall.nix + ./services/hardware/fwupd.nix ./services/hardware/illum.nix ./services/hardware/interception-tools.nix ./services/hardware/irqbalance.nix @@ -233,13 +253,16 @@ ./services/hardware/pcscd.nix ./services/hardware/pommed.nix ./services/hardware/sane.nix + ./services/hardware/sane_extra_backends/brscan4.nix ./services/hardware/tcsd.nix ./services/hardware/tlp.nix ./services/hardware/thinkfan.nix ./services/hardware/trezord.nix + ./services/hardware/u2f.nix ./services/hardware/udev.nix ./services/hardware/udisks2.nix ./services/hardware/upower.nix + ./services/hardware/usbmuxd.nix ./services/hardware/thermald.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix @@ -255,6 +278,8 @@ ./services/logging/rsyslogd.nix ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix + ./services/mail/clamsmtp.nix + ./services/mail/dkimproxy-out.nix ./services/mail/dovecot.nix ./services/mail/dspam.nix ./services/mail/exim.nix @@ -301,11 +326,13 @@ ./services/misc/geoip-updater.nix ./services/misc/gitea.nix #./services/misc/gitit.nix - ./services/misc/gitlab.nix + #./services/misc/gitlab.nix ./services/misc/gitolite.nix + ./services/misc/gitweb.nix ./services/misc/gogs.nix ./services/misc/gollum.nix ./services/misc/gpsd.nix + ./services/misc/home-assistant.nix ./services/misc/ihaskell.nix ./services/misc/irkerd.nix ./services/misc/jackett.nix @@ -324,8 +351,10 @@ ./services/misc/nix-optimise.nix ./services/misc/nixos-manual.nix ./services/misc/nix-ssh-serve.nix + ./services/misc/novacomd.nix ./services/misc/nzbget.nix ./services/misc/octoprint.nix + ./services/misc/osrm.nix ./services/misc/packagekit.nix ./services/misc/parsoid.nix ./services/misc/phd.nix @@ -337,6 +366,8 @@ ./services/misc/rippled.nix ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix + ./services/misc/serviio.nix + ./services/misc/safeeyes.nix ./services/misc/siproxd.nix ./services/misc/snapper.nix ./services/misc/sonarr.nix @@ -350,6 +381,7 @@ ./services/misc/taskserver ./services/misc/tzupdate.nix ./services/misc/uhub.nix + ./services/misc/xmr-stak.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix ./services/monitoring/arbtt.nix @@ -371,16 +403,7 @@ ./services/monitoring/osquery.nix ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix - ./services/monitoring/prometheus/blackbox-exporter.nix - ./services/monitoring/prometheus/collectd-exporter.nix - ./services/monitoring/prometheus/fritzbox-exporter.nix - ./services/monitoring/prometheus/json-exporter.nix - ./services/monitoring/prometheus/minio-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/prometheus/exporters.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix @@ -396,14 +419,17 @@ ./services/monitoring/vnstat.nix ./services/monitoring/zabbix-agent.nix ./services/monitoring/zabbix-server.nix + ./services/network-filesystems/beegfs.nix ./services/network-filesystems/cachefilesd.nix + ./services/network-filesystems/davfs2.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 - ./services/network-filesystems/openafs-client/default.nix + ./services/network-filesystems/openafs/client.nix + ./services/network-filesystems/openafs/server.nix ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba.nix ./services/network-filesystems/tahoe.nix @@ -411,7 +437,9 @@ ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/xtreemfs.nix + ./services/network-filesystems/ceph.nix ./services/networking/amuled.nix + ./services/networking/aria2.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix @@ -476,6 +504,7 @@ ./services/networking/minidlna.nix ./services/networking/miniupnpd.nix ./services/networking/mosquitto.nix + ./services/networking/monero.nix ./services/networking/miredo.nix ./services/networking/mstpd.nix ./services/networking/murmur.nix @@ -486,6 +515,7 @@ ./services/networking/ngircd.nix ./services/networking/nghttpx/default.nix ./services/networking/nix-serve.nix + ./services/networking/nixops-dns.nix ./services/networking/nntp-proxy.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix @@ -504,7 +534,7 @@ ./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 @@ -513,10 +543,12 @@ ./services/networking/redsocks.nix ./services/networking/resilio.nix ./services/networking/rpcbind.nix + ./services/networking/rxe.nix ./services/networking/sabnzbd.nix ./services/networking/searx.nix ./services/networking/seeks.nix ./services/networking/skydns.nix + ./services/networking/shadowsocks.nix ./services/networking/shairport-sync.nix ./services/networking/shout.nix ./services/networking/sniproxy.nix @@ -528,6 +560,7 @@ ./services/networking/ssh/lshd.nix ./services/networking/ssh/sshd.nix ./services/networking/strongswan.nix + ./services/networking/stunnel.nix ./services/networking/supplicant.nix ./services/networking/supybot.nix ./services/networking/syncthing.nix @@ -586,6 +619,7 @@ ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/earlyoom.nix + ./services/system/localtime.nix ./services/system/kerberos.nix ./services/system/nscd.nix ./services/system/saslauthd.nix @@ -603,11 +637,10 @@ ./services/web-apps/atlassian/jira.nix ./services/web-apps/frab.nix ./services/web-apps/mattermost.nix - ./services/web-apps/nixbot.nix ./services/web-apps/nexus.nix ./services/web-apps/pgpkeyserver-lite.nix - ./services/web-apps/piwik.nix - ./services/web-apps/pump.io.nix + ./services/web-apps/matomo.nix + ./services/web-apps/restya-board.nix ./services/web-apps/tt-rss.nix ./services/web-apps/selfoss.nix ./services/web-apps/quassel-webserver.nix @@ -620,8 +653,10 @@ ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/gitweb.nix ./services/web-servers/lighttpd/inginious.nix + ./services/web-servers/mighttpd2.nix ./services/web-servers/minio.nix ./services/web-servers/nginx/default.nix + ./services/web-servers/nginx/gitweb.nix ./services/web-servers/phpfpm/default.nix ./services/web-servers/shellinabox.nix ./services/web-servers/tomcat.nix @@ -666,8 +701,10 @@ ./services/x11/xserver.nix ./system/activation/activation-script.nix ./system/activation/top-level.nix + ./system/boot/binfmt.nix ./system/boot/coredump.nix ./system/boot/emergency-mode.nix + ./system/boot/grow-partition.nix ./system/boot/initrd-network.nix ./system/boot/initrd-ssh.nix ./system/boot/kernel.nix @@ -734,6 +771,7 @@ ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix ./virtualisation/amazon-options.nix + ./virtualisation/hyperv-guest.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/rkt.nix @@ -742,6 +780,4 @@ ./virtualisation/vmware-guest.nix ./virtualisation/xen-dom0.nix ./virtualisation/xe-guest-utilities.nix - ./virtualisation/openstack/keystone.nix - ./virtualisation/openstack/glance.nix ] diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 3c7e516c497f44b3ec7c5b6d72ce77345fb1335e..f56640f19782efef9589dadf367e8e448ac606fe 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -19,13 +19,12 @@ "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4" "sata_uli" "sata_via" "sata_vsc" - "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" - "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar" + "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar" "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3" "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell" "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix" "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000" - "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis" + "pata_serverworks" "pata_sil680" "pata_sis" "pata_sl82c105" "pata_triflex" "pata_via" "pata_winbond" diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 39b8553976ebd3095a0445c2d1851f9037fa09b6..3bf06a951193fc36e137cab17ef1b6cbe6e7ddf2 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -9,7 +9,7 @@ environment.systemPackages = [ pkgs.w3m-nox # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems - pkgs.mssys # for writing Microsoft boot sectors / MBRs + pkgs.ms-sys # for writing Microsoft boot sectors / MBRs pkgs.efibootmgr pkgs.efivar pkgs.parted diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix index 77d86f8d7405713f538e65c738333af63bcc7856..5b4e68beb6a6928021e7022b89d221282b480b01 100644 --- a/nixos/modules/profiles/clone-config.nix +++ b/nixos/modules/profiles/clone-config.nix @@ -17,7 +17,7 @@ let # you should use files). moduleFiles = # FIXME: use typeOf (Nix 1.6.1). - filter (x: !isAttrs x && !builtins.isFunction x) modules; + filter (x: !isAttrs x && !lib.isFunction x) modules; # Partition module files because between NixOS and non-NixOS files. NixOS # files may change if the repository is updated. diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix index ef6fd77b5f8d5367ad5074858e43d92bf524bd31..c3ee6e98371ee1d18b0ed9700b000d2f071dba3a 100644 --- a/nixos/modules/profiles/demo.nix +++ b/nixos/modules/profiles/demo.nix @@ -10,4 +10,10 @@ password = "demo"; uid = 1000; }; + + services.xserver.displayManager.sddm.autoLogin = { + enable = true; + relogin = true; + user = "demo"; + }; } diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix index 433492b96137e6ab290ae0add042d40eaa3cb504..7031d7d1d5931ef69b7828eb8ee810f7631c87f9 100644 --- a/nixos/modules/profiles/docker-container.nix +++ b/nixos/modules/profiles/docker-container.nix @@ -14,9 +14,7 @@ in { ]; # Create the tarball - system.build.tarball = import ../../lib/make-system-tarball.nix { - inherit (pkgs) stdenv perl xz pathsFromGraph; - + system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { contents = []; extraArgs = "--owner=0"; diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 506a6ee3eaa813840eb19ebb595ec71bf525f109..43f06c219f8242fbcab6195563877259c28861ee 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -72,7 +72,13 @@ with lib; # To speed up installation a little bit, include the complete # stdenv in the Nix store on the CD. - system.extraDependencies = with pkgs; [ stdenv stdenvNoCC busybox ]; + system.extraDependencies = with pkgs; + [ + stdenv + stdenvNoCC # for runCommand + busybox + jq # for closureInfo + ]; # Show all debug messages from the kernel but don't log refused packets # because we have the firewall enabled. This makes installs from the diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index e2497d04252e07f4deacc6a64ed3e4ef208543a1..40df7063a9bf371d9d248e523474b9f8bbd102a5 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -10,10 +10,9 @@ with lib; # This isn't perfect, but let's expect the user specifies an UTF-8 defaultLocale i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ]; - services.nixosManual.enable = mkDefault false; - programs.man.enable = mkDefault false; - programs.info.enable = mkDefault false; + documentation.enable = mkDefault false; + services.nixosManual.enable = mkDefault false; sound.enable = mkDefault false; } diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index 987eb051b98c5f96ea5d859e5337a2ba3bdc1df8..a1ec1d45395e96925032cc0841e452753970ae1e 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -4,7 +4,7 @@ { config, pkgs, ... }: { - boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; + boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ]; boot.initrd.postDeviceCommands = diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index 18290555b79df1548f5ed10701998198eaf5b4db..f648d70bd9fa40e392c8308b8fcf3cb3ff0cf911 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -16,6 +16,7 @@ with lib; To grant access to a user, it must be part of adbusers group: users.extraUsers.alice.extraGroups = ["adbusers"]; ''; + relatedPackages = [ ["androidenv" "platformTools"] ]; }; }; }; diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index e23849d350b4c3264cdf75e8e237f3f7aebc70fd..69a1a482d0747831940b43433db77c582eb2a7e6 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -14,13 +14,16 @@ let bashCompletion = optionalString cfg.enableCompletion '' # Check whether we're running a version of Bash that has support for # programmable completion. If we do, enable all modules installed in - # the system (and user profile). + # the system and user profile in obsolete /etc/bash_completion.d/ + # directories. Bash loads completions in all + # $XDG_DATA_DIRS/share/bash-completion/completions/ + # on demand, so they do not need to be sourced here. if shopt -q progcomp &>/dev/null; then . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh" nullglobStatus=$(shopt -p nullglob) shopt -s nullglob for p in $NIX_PROFILES; do - for m in "$p/etc/bash_completion.d/"* "$p/share/bash-completion/completions/"*; do + for m in "$p/etc/bash_completion.d/"*; do . $m done done @@ -107,7 +110,7 @@ in }; enableCompletion = mkOption { - default = false; + default = true; description = '' Enable Bash completion for all interactive bash shells. ''; @@ -123,7 +126,7 @@ in programs.bash = { shellInit = '' - . ${config.system.build.setEnvironment} + ${config.system.build.setEnvironment.text} ${cfge.shellInit} ''; @@ -197,8 +200,9 @@ in fi ''; - # Configuration for readline in bash. - environment.etc."inputrc".source = ./inputrc; + # Configuration for readline in bash. We use "option default" + # priority to allow user override using both .text and .source. + environment.etc."inputrc".source = mkOptionDefault ./inputrc; users.defaultUserShell = mkDefault pkgs.bashInteractive; @@ -207,6 +211,9 @@ in "/share/bash-completion" ]; + environment.systemPackages = optional cfg.enableCompletion + pkgs.nix-bash-completions; + environment.shells = [ "/run/current-system/sw/bin/bash" "/var/run/current-system/sw/bin/bash" diff --git a/nixos/modules/programs/browserpass.nix b/nixos/modules/programs/browserpass.nix index a073c7e66eb8564420d7aea9edefaab9f87f6f94..5f8a44a9848ece9723f829d97d952f9e36477619 100644 --- a/nixos/modules/programs/browserpass.nix +++ b/nixos/modules/programs/browserpass.nix @@ -18,5 +18,6 @@ with lib; "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"; }; + nixpkgs.config.firefox.enableBrowserpass = true; }; } diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix new file mode 100644 index 0000000000000000000000000000000000000000..874774c72b47cfed13afcf3ddcd0dcbb6f132854 --- /dev/null +++ b/nixos/modules/programs/ccache.nix @@ -0,0 +1,83 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.programs.ccache; +in { + options.programs.ccache = { + # host configuration + enable = mkEnableOption "CCache"; + cacheDir = mkOption { + type = types.path; + description = "CCache directory"; + default = "/var/cache/ccache"; + }; + # target configuration + packageNames = mkOption { + type = types.listOf types.str; + description = "Nix top-level packages to be compiled using CCache"; + default = []; + example = [ "wxGTK30" "qt48" "ffmpeg_3_3" "libav_all" ]; + }; + }; + + config = mkMerge [ + # host configuration + (mkIf cfg.enable { + systemd.tmpfiles.rules = [ "d ${cfg.cacheDir} 0770 root nixbld -" ]; + + # "nix-ccache --show-stats" and "nix-ccache --clear" + security.wrappers.nix-ccache = { + group = "nixbld"; + setgid = true; + source = pkgs.writeScript "nix-ccache.pl" '' + #!${pkgs.perl}/bin/perl + + %ENV=( CCACHE_DIR => '${cfg.cacheDir}' ); + sub untaint { + my $v = shift; + return '-C' if $v eq '-C' || $v eq '--clear'; + return '-V' if $v eq '-V' || $v eq '--version'; + return '-s' if $v eq '-s' || $v eq '--show-stats'; + return '-z' if $v eq '-z' || $v eq '--zero-stats'; + exec('${pkgs.ccache}/bin/ccache', '-h'); + } + exec('${pkgs.ccache}/bin/ccache', map { untaint $_ } @ARGV); + ''; + }; + }) + + # target configuration + (mkIf (cfg.packageNames != []) { + nixpkgs.overlays = [ + (self: super: genAttrs cfg.packageNames (pn: super.${pn}.override { stdenv = builtins.trace "with ccache: ${pn}" self.ccacheStdenv; })) + + (self: super: { + ccacheWrapper = super.ccacheWrapper.override { + extraConfig = '' + export CCACHE_COMPRESS=1 + export CCACHE_DIR="${cfg.cacheDir}" + export CCACHE_UMASK=007 + if [ ! -d "$CCACHE_DIR" ]; then + echo "=====" + echo "Directory '$CCACHE_DIR' does not exist" + echo "Please create it with:" + echo " sudo mkdir -m0770 '$CCACHE_DIR'" + echo " sudo chown root:nixbld '$CCACHE_DIR'" + echo "=====" + exit 1 + fi + if [ ! -w "$CCACHE_DIR" ]; then + echo "=====" + echo "Directory '$CCACHE_DIR' is not accessible for user $(whoami)" + echo "Please verify its access permissions" + echo "=====" + exit 1 + fi + ''; + }; + }) + ]; + }) + ]; +} \ No newline at end of file diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 54739feab97658a6790aed994a739cca7ade16e3..41c49db8c71cca9f78c943b85f9eb47143b65604 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -36,6 +36,7 @@ in "chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet "mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere + "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin ] ''; }; @@ -52,8 +53,7 @@ in description = "Chromium default search provider url."; default = null; example = - "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google: - ↪searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}"; + "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}"; }; defaultSearchProviderSuggestURL = mkOption { @@ -79,7 +79,11 @@ in ###### implementation config = lib.mkIf cfg.enable { + # for chromium environment.etc."chromium/policies/managed/default.json".text = builtins.toJSON defaultProfile; environment.etc."chromium/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; + # for google-chrome https://www.chromium.org/administrators/linux-quick-start + environment.etc."opt/chrome/policies/managed/default.json".text = builtins.toJSON defaultProfile; + environment.etc."opt/chrome/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; }; } diff --git a/nixos/modules/programs/criu.nix b/nixos/modules/programs/criu.nix new file mode 100644 index 0000000000000000000000000000000000000000..48cf5c88a9fc1c25107549bbe04ffd94f748fe52 --- /dev/null +++ b/nixos/modules/programs/criu.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.programs.criu; +in { + + options = { + programs.criu = { + enable = mkOption { + default = false; + description = '' + Install criu along with necessary kernel options. + ''; + }; + }; + }; + config = mkIf cfg.enable { + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isYes "CHECKPOINT_RESTORE") + ]; + boot.kernel.features.criu = true; + environment.systemPackages = [ pkgs.criu ]; + }; + +} diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 1b7e20799819a6cf1ec9ec996011748bd5d514df..b7d8a345e65c56b4d4d97aef275659ed7e64a81a 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -1,7 +1,8 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: + +with lib; let - inherit (lib) mkOption mkIf types mapAttrsToList; cfg = config.programs.dconf; mkDconfProfile = name: path: @@ -13,6 +14,7 @@ in options = { programs.dconf = { + enable = mkEnableOption "dconf"; profiles = mkOption { type = types.attrsOf types.path; @@ -26,9 +28,15 @@ in ###### implementation - config = mkIf (cfg.profiles != {}) { - environment.etc = + config = mkIf (cfg.profiles != {} || cfg.enable) { + environment.etc = optionals (cfg.profiles != {}) (mapAttrsToList mkDconfProfile cfg.profiles); + + environment.variables.GIO_EXTRA_MODULES = optional cfg.enable + "${pkgs.gnome3.dconf.lib}/lib/gio/modules"; + # https://github.com/NixOS/nixpkgs/pull/31891 + #environment.variables.XDG_DATA_DIRS = optional cfg.enable + # "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; }; } diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixos/modules/programs/digitalbitbox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7c727489c6c96f96b34c5be8806f4301b6e4c5d9 --- /dev/null +++ b/nixos/modules/programs/digitalbitbox/default.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.digitalbitbox; +in + +{ + options.programs.digitalbitbox = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Installs the Digital Bitbox application and enables the complementary hardware module. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.digitalbitbox; + defaultText = "pkgs.digitalbitbox"; + description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + hardware.digitalbitbox = { + enable = true; + package = cfg.package; + }; + }; + + meta = { + doc = ./doc.xml; + maintainers = with stdenv.lib.maintainers; [ vidbina ]; + }; +} diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml new file mode 100644 index 0000000000000000000000000000000000000000..7acbc2fc4dde8b1ac163697502c2d143646de48a --- /dev/null +++ b/nixos/modules/programs/digitalbitbox/doc.xml @@ -0,0 +1,85 @@ + + + Digital Bitbox + + + Digital Bitbox is a hardware wallet and second-factor authenticator. + + + + The digitalbitbox programs module may be + installed by setting programs.digitalbitbox + to true in a manner similar to + + + programs.digitalbitbox.enable = true; + + + and bundles the digitalbitbox package (see ), which contains the + dbb-app and dbb-cli binaries, + along with the hardware module (see ) which sets up the + necessary udev rules to access the device. + + + + Enabling the digitalbitbox module is pretty much the easiest way to + get a Digital Bitbox device working on your system. + + + + For more information, see + . + + +
+ Package + + + The binaries, dbb-app (a GUI tool) and + dbb-cli (a CLI tool), are available through the + digitalbitbox package which could be installed + as follows: + + + environment.systemPackages = [ + pkgs.digitalbitbox + ]; + + +
+ + +
+ Hardware + + + The digitalbitbox hardware package enables the udev rules for + Digital Bitbox devices and may be installed as follows: + + + hardware.digitalbitbox.enable = true; + + + + + In order to alter the udev rules, one may provide different values for + the udevRule51 and udevRule52 + attributes by means of overriding as follows: + + + programs.digitalbitbox = { + enable = true; + package = pkgs.digitalbitbox.override { + udevRule51 = "something else"; + }; + }; + + +
+ diff --git a/nixos/modules/programs/iftop.nix b/nixos/modules/programs/iftop.nix new file mode 100644 index 0000000000000000000000000000000000000000..a98a9a8187d4ba6b604e4cba20defe7f034b8805 --- /dev/null +++ b/nixos/modules/programs/iftop.nix @@ -0,0 +1,18 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.iftop; +in { + options = { + programs.iftop.enable = mkEnableOption "iftop + setcap wrapper"; + }; + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.iftop ]; + security.wrappers.iftop = { + source = "${pkgs.iftop}/bin/iftop"; + capabilities = "cap_net_raw+p"; + }; + }; +} diff --git a/nixos/modules/programs/info.nix b/nixos/modules/programs/info.nix deleted file mode 100644 index be6439dca5adc2f3909e6cbd5c1fb2a276275837..0000000000000000000000000000000000000000 --- a/nixos/modules/programs/info.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ - - options = { - - programs.info.enable = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable info pages and the info command. - ''; - }; - - }; - - - config = mkIf config.programs.info.enable { - - environment.systemPackages = [ pkgs.texinfoInteractive ]; - - environment.pathsToLink = [ "/info" "/share/info" ]; - - environment.extraOutputsToInstall = [ "info" ]; - - }; - -} diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix new file mode 100644 index 0000000000000000000000000000000000000000..d39103a58057d6a09a3c22276144841b9ae8af70 --- /dev/null +++ b/nixos/modules/programs/less.nix @@ -0,0 +1,131 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.programs.less; + + configText = if (cfg.configFile != null) then (builtins.readFile cfg.configFile) else '' + #command + ${concatStringsSep "\n" + (mapAttrsToList (command: action: "${command} ${action}") cfg.commands) + } + ${if cfg.clearDefaultCommands then "#stop" else ""} + + #line-edit + ${concatStringsSep "\n" + (mapAttrsToList (command: action: "${command} ${action}") cfg.lineEditingKeys) + } + + #env + ${concatStringsSep "\n" + (mapAttrsToList (variable: values: "${variable}=${values}") cfg.envVariables) + } + ''; + + lessKey = pkgs.runCommand "lesskey" + { src = pkgs.writeText "lessconfig" configText; } + "${pkgs.less}/bin/lesskey -o $out $src"; + +in + +{ + options = { + + programs.less = { + + enable = mkEnableOption "less"; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + example = literalExample "$${pkgs.my-configs}/lesskey"; + description = '' + Path to lesskey configuration file. + + takes precedence over , + , , and + . + ''; + }; + + commands = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + "h" = "noaction 5\e("; + "l" = "noaction 5\e)"; + }; + description = "Defines new command keys."; + }; + + clearDefaultCommands = mkOption { + type = types.bool; + default = false; + description = '' + Clear all default commands. + You should remember to set the quit key. + Otherwise you will not be able to leave less without killing it. + ''; + }; + + lineEditingKeys = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + "\e" = "abort"; + }; + description = "Defines new line-editing keys."; + }; + + envVariables = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + LESS = "--quit-if-one-screen"; + }; + description = "Defines environment variables."; + }; + + lessopen = mkOption { + type = types.nullOr types.str; + default = "|${pkgs.lesspipe}/bin/lesspipe.sh %s"; + description = '' + Before less opens a file, it first gives your input preprocessor a chance to modify the way the contents of the file are displayed. + ''; + }; + + lessclose = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + When less closes a file opened in such a way, it will call another program, called the input postprocessor, which may perform any desired clean-up action (such as deleting the replacement file created by LESSOPEN). + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.less ]; + + environment.variables = { + "LESSKEY_SYSTEM" = toString lessKey; + } // optionalAttrs (cfg.lessopen != null) { + "LESSOPEN" = cfg.lessopen; + } // optionalAttrs (cfg.lessclose != null) { + "LESSCLOSE" = cfg.lessclose; + }; + + warnings = optional ( + cfg.clearDefaultCommands && (all (x: x != "quit") (attrValues cfg.commands)) + ) '' + config.programs.less.clearDefaultCommands clears all default commands of less but there is no alternative binding for exiting. + Consider adding a binding for 'quit'. + ''; + }; + + meta.maintainers = with maintainers; [ johnazoidberg ]; + +} diff --git a/nixos/modules/programs/man.nix b/nixos/modules/programs/man.nix deleted file mode 100644 index 5b20a38d885655dffd0572f8d305038d4d56823b..0000000000000000000000000000000000000000 --- a/nixos/modules/programs/man.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ - - options = { - - programs.man.enable = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable manual pages and the man command. - This also includes "man" outputs of all systemPackages. - ''; - }; - - }; - - - config = mkIf config.programs.man.enable { - - environment.systemPackages = [ pkgs.man-db ]; - - environment.pathsToLink = [ "/share/man" ]; - - environment.extraOutputsToInstall = [ "man" ]; - - }; - -} diff --git a/nixos/modules/programs/plotinus.nix b/nixos/modules/programs/plotinus.nix new file mode 100644 index 0000000000000000000000000000000000000000..065e72d6c37462ede9b6dfb249738cca28e7abc0 --- /dev/null +++ b/nixos/modules/programs/plotinus.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.plotinus; +in +{ + meta = { + maintainers = pkgs.plotinus.meta.maintainers; + doc = ./plotinus.xml; + }; + + ###### interface + + options = { + programs.plotinus = { + enable = mkOption { + default = false; + description = '' + Whether to enable the Plotinus GTK+3 plugin. Plotinus provides a + popup (triggered by Ctrl-Shift-P) to search the menus of a + compatible application. + ''; + type = types.bool; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + environment.variables.XDG_DATA_DIRS = [ "${pkgs.plotinus}/share/gsettings-schemas/${pkgs.plotinus.name}" ]; + environment.variables.GTK3_MODULES = [ "${pkgs.plotinus}/lib/libplotinus.so" ]; + }; +} diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml new file mode 100644 index 0000000000000000000000000000000000000000..85b0e023e6c1721f1f83ba72ebf097e8397c06e1 --- /dev/null +++ b/nixos/modules/programs/plotinus.xml @@ -0,0 +1,25 @@ + + +Plotinus + +Source: modules/programs/plotinus.nix + +Upstream documentation: + +Plotinus is a searchable command palette in every modern GTK+ application. + +When in a GTK+3 application and Plotinus is enabled, you can press Ctrl+Shift+P to open the command palette. The command palette provides a searchable list of of all menu items in the application. + +To enable Plotinus, add the following to your configuration.nix: + + +programs.plotinus.enable = true; + + + + + diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix new file mode 100644 index 0000000000000000000000000000000000000000..842d9e6cfb48f10fe5bbe447876ac3f3a7c2d3ec --- /dev/null +++ b/nixos/modules/programs/rootston.nix @@ -0,0 +1,103 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.rootston; + + rootstonWrapped = pkgs.writeScriptBin "rootston" '' + #! ${pkgs.runtimeShell} + if [[ "$#" -ge 1 ]]; then + exec ${pkgs.rootston}/bin/rootston "$@" + else + ${cfg.extraSessionCommands} + exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile} + fi + ''; +in { + options.programs.rootston = { + enable = mkEnableOption '' + rootston, the reference compositor for wlroots. The purpose of rootston + is to test and demonstrate the features of wlroots (if you want a real + Wayland compositor you should e.g. use Sway instead). You can manually + start the compositor by running "rootston" from a terminal''; + + extraSessionCommands = mkOption { + type = types.lines; + default = ""; + example = '' + # Define a keymap (US QWERTY is the default) + export XKB_DEFAULT_LAYOUT=de,us + export XKB_DEFAULT_VARIANT=nodeadkeys + export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape + ''; + description = '' + Shell commands executed just before rootston is started. + ''; + }; + + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs; [ + westonLite xwayland rofi + ]; + defaultText = literalExample '' + with pkgs; [ + westonLite xwayland rofi + ] + ''; + example = literalExample "[ ]"; + description = '' + Extra packages to be installed system wide. + ''; + }; + + config = mkOption { + type = types.str; + default = '' + [keyboard] + meta-key = Logo + + # Sway/i3 like Keybindings + # Maps key combinations with commands to execute + # Commands include: + # - "exit" to stop the compositor + # - "exec" to execute a shell command + # - "close" to close the current view + # - "next_window" to cycle through windows + [bindings] + Logo+Shift+e = exit + Logo+q = close + Logo+m = maximize + Alt+Tab = next_window + Logo+Return = exec weston-terminal + Logo+d = exec rofi -show run + ''; + description = '' + Default configuration for rootston (used when called without any + parameters). + ''; + }; + + configFile = mkOption { + type = types.path; + default = "/etc/rootston.ini"; + example = literalExample "${pkgs.rootston}/etc/rootston.ini"; + description = '' + Path to the default rootston configuration file (the "config" option + will have no effect if you change the path). + ''; + }; + }; + + config = mkIf cfg.enable { + environment.etc."rootston.ini".text = cfg.config; + environment.systemPackages = [ rootstonWrapped ] ++ cfg.extraPackages; + + hardware.opengl.enable = mkDefault true; + fonts.enableDefaultFonts = mkDefault true; + programs.dconf.enable = mkDefault true; + }; + + meta.maintainers = with lib.maintainers; [ primeos gnidorah ]; +} diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 0f3f42901bab141923aad76c1554731f27b35786..8ec4169207db51282139e0adc3cbfbb20e56b4cc 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -26,8 +26,9 @@ let # Ensure privacy for newly created home directories. UMASK 077 - # Uncomment this to allow non-root users to change their account - #information. This should be made configurable. + # Uncomment this and install chfn SUID to allow non-root + # users to change their account GECOS information. + # This should be made configurable. #CHFN_RESTRICT frwh ''; @@ -103,13 +104,12 @@ in security.wrappers = { su.source = "${pkgs.shadow.su}/bin/su"; - chfn.source = "${pkgs.shadow.out}/bin/chfn"; + sg.source = "${pkgs.shadow.out}/bin/sg"; + newgrp.source = "${pkgs.shadow.out}/bin/newgrp"; newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap"; newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap"; } // (if config.users.mutableUsers then { passwd.source = "${pkgs.shadow.out}/bin/passwd"; - sg.source = "${pkgs.shadow.out}/bin/sg"; - newgrp.source = "${pkgs.shadow.out}/bin/newgrp"; } else {}); }; } diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix new file mode 100644 index 0000000000000000000000000000000000000000..86153d933855d6437f5b60d03492bd5ef1c89c99 --- /dev/null +++ b/nixos/modules/programs/singularity.nix @@ -0,0 +1,20 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.programs.singularity; +in { + options.programs.singularity = { + enable = mkEnableOption "Singularity"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.singularity ]; + systemd.tmpfiles.rules = [ "d /var/singularity/mnt/session 0770 root root -" + "d /var/singularity/mnt/final 0770 root root -" + "d /var/singularity/mnt/overlay 0770 root root -" + "d /var/singularity/mnt/container 0770 root root -" + "d /var/singularity/mnt/source 0770 root root -"]; + }; + +} diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 0935bf0cae71446c181c5e4fdd3bca82c3cc84dc..36289080a82ac6fc337a604ece836140b84a2d83 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -13,7 +13,7 @@ let askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')" exec ${askPassword} ''; diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index 9070722c770bf9ed06fd6530ef6c8e0360dec154..d9503d6004ff6b45e02e434bbf1a8bffcf7431a8 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -4,33 +4,42 @@ with lib; let cfg = config.programs.sway; - sway = pkgs.sway; + swayPackage = pkgs.sway; - swayWrapped = pkgs.writeScriptBin "sway" '' - #! ${pkgs.stdenv.shell} - ${cfg.extraSessionCommands} - PATH="${sway}/bin:$PATH" - exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap + swayWrapped = pkgs.writeShellScriptBin "sway" '' + if [[ "$#" -ge 1 ]]; then + exec sway-setcap "$@" + else + ${cfg.extraSessionCommands} + exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap + fi ''; swayJoined = pkgs.symlinkJoin { - name = "sway-wrapped"; - paths = [ swayWrapped sway ]; + name = "sway-joined"; + paths = [ swayWrapped swayPackage ]; }; -in -{ +in { options.programs.sway = { - enable = mkEnableOption "sway"; + enable = mkEnableOption '' + the tiling Wayland compositor Sway. After adding yourself to the "sway" + group you can manually launch Sway by executing "sway" from a terminal. + If you call "sway" with any parameters the extraSessionCommands won't be + executed and Sway won't be launched with dbus-launch''; extraSessionCommands = mkOption { - default = ""; - type = types.lines; + type = types.lines; + default = ""; example = '' - export XKB_DEFAULT_LAYOUT=us,de - export XKB_DEFAULT_VARIANT=,nodeadkeys - export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle, + # Define a keymap (US QWERTY is the default) + export XKB_DEFAULT_LAYOUT=de,us + export XKB_DEFAULT_VARIANT=nodeadkeys + export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape + # Change the Keyboard repeat delay and rate + export WLC_REPEAT_DELAY=660 + export WLC_REPEAT_RATE=25 ''; description = '' - Shell commands executed just before sway is started. + Shell commands executed just before Sway is started. ''; }; @@ -39,9 +48,12 @@ in default = with pkgs; [ i3status xwayland rxvt_unicode dmenu ]; + defaultText = literalExample '' + with pkgs; [ i3status xwayland rxvt_unicode dmenu ]; + ''; example = literalExample '' with pkgs; [ - i3status xwayland rxvt_unicode dmenu + i3lock light termite ] ''; description = '' @@ -54,7 +66,7 @@ in environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages; security.wrappers.sway = { program = "sway-setcap"; - source = "${sway}/bin/sway"; + source = "${swayPackage}/bin/sway"; capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip"; owner = "root"; group = "sway"; @@ -62,8 +74,12 @@ in }; users.extraGroups.sway = {}; + security.pam.services.swaylock = {}; hardware.opengl.enable = mkDefault true; fonts.enableDefaultFonts = mkDefault true; + programs.dconf.enable = mkDefault true; }; + + meta.maintainers = with lib.maintainers; [ gnidorah primeos ]; } diff --git a/nixos/modules/programs/systemtap.nix b/nixos/modules/programs/systemtap.nix new file mode 100644 index 0000000000000000000000000000000000000000..fd84732cd4125945e7b1173e85d2daf3a61f30c2 --- /dev/null +++ b/nixos/modules/programs/systemtap.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.programs.systemtap; +in { + + options = { + programs.systemtap = { + enable = mkOption { + default = false; + description = '' + Install systemtap along with necessary kernel options. + ''; + }; + }; + }; + config = mkIf cfg.enable { + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isYes "DEBUG") + ]; + boot.kernel.features.debug = true; + environment.systemPackages = [ + config.boot.kernelPackages.systemtap + ]; + }; + +} diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index ed1d88a420a261741830bf1dec67ba3859f0ec16..4a60403a2827edb22980593a922cbcb59b6481f8 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -61,7 +61,12 @@ in { options = { programs.tmux = { - enable = mkEnableOption "tmux - a screen replacement."; + enable = mkOption { + type = types.bool; + default = false; + description = "Whenever to configure tmux system-wide."; + relatedPackages = [ "tmux" ]; + }; aggressiveResize = mkOption { default = false; @@ -151,6 +156,15 @@ in { type = types.str; description = "Set the $TERM variable."; }; + + secureSocket = mkOption { + default = true; + type = types.bool; + description = '' + Store tmux socket under /run, which is more secure than /tmp, but as a + downside it doesn't survive user logout. + ''; + }; }; }; @@ -163,7 +177,7 @@ in { systemPackages = [ pkgs.tmux ]; variables = { - TMUX_TMPDIR = ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}''; + TMUX_TMPDIR = lib.optional cfg.secureSocket ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}''; }; }; }; diff --git a/nixos/modules/programs/udevil.nix b/nixos/modules/programs/udevil.nix new file mode 100644 index 0000000000000000000000000000000000000000..ba5670f9dfe9dcb6b022913afc59e351f948d739 --- /dev/null +++ b/nixos/modules/programs/udevil.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.udevil; + +in { + options.programs.udevil.enable = mkEnableOption "udevil"; + + config = mkIf cfg.enable { + security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil"; + }; +} diff --git a/nixos/modules/programs/way-cooler.nix b/nixos/modules/programs/way-cooler.nix new file mode 100644 index 0000000000000000000000000000000000000000..633e959be9f329123d51b76f5b09d258e09ca603 --- /dev/null +++ b/nixos/modules/programs/way-cooler.nix @@ -0,0 +1,78 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.way-cooler; + way-cooler = pkgs.way-cooler; + + wcWrapped = pkgs.writeShellScriptBin "way-cooler" '' + ${cfg.extraSessionCommands} + exec ${pkgs.dbus.dbus-launch} --exit-with-session ${way-cooler}/bin/way-cooler + ''; + wcJoined = pkgs.symlinkJoin { + name = "way-cooler-wrapped"; + paths = [ wcWrapped way-cooler ]; + }; + configFile = readFile "${way-cooler}/etc/way-cooler/init.lua"; + spawnBar = '' + util.program.spawn_at_startup("lemonbar"); + ''; +in +{ + options.programs.way-cooler = { + enable = mkEnableOption "way-cooler"; + + extraSessionCommands = mkOption { + default = ""; + type = types.lines; + example = '' + export XKB_DEFAULT_LAYOUT=us,de + export XKB_DEFAULT_VARIANT=,nodeadkeys + export XKB_DEFAULT_OPTIONS=grp:caps_toggle, + ''; + description = '' + Shell commands executed just before way-cooler is started. + ''; + }; + + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs; [ + westonLite xwayland dmenu + ]; + example = literalExample '' + with pkgs; [ + westonLite xwayland dmenu + ] + ''; + description = '' + Extra packages to be installed system wide. + ''; + }; + + enableBar = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable an unofficial bar. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ wcJoined ] ++ cfg.extraPackages; + + security.pam.services.wc-lock = {}; + environment.etc."way-cooler/init.lua".text = '' + ${configFile} + ${optionalString cfg.enableBar spawnBar} + ''; + + hardware.opengl.enable = mkDefault true; + fonts.enableDefaultFonts = mkDefault true; + programs.dconf.enable = mkDefault true; + }; + + meta.maintainers = with maintainers; [ gnidorah ]; +} diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix new file mode 100644 index 0000000000000000000000000000000000000000..a01083c3ace980f97eb9663362ad2476977eeee8 --- /dev/null +++ b/nixos/modules/programs/yabar.nix @@ -0,0 +1,149 @@ +{ lib, pkgs, config, ... }: + +with lib; + +let + cfg = config.programs.yabar; + + mapExtra = v: lib.concatStringsSep "\n" (mapAttrsToList ( + key: val: "${key} = ${if (isString val) then "\"${val}\"" else "${builtins.toString val}"};" + ) v); + + listKeys = r: concatStringsSep "," (map (n: "\"${n}\"") (attrNames r)); + + configFile = let + bars = mapAttrsToList ( + name: cfg: '' + ${name}: { + font: "${cfg.font}"; + position: "${cfg.position}"; + + ${mapExtra cfg.extra} + + block-list: [${listKeys cfg.indicators}] + + ${concatStringsSep "\n" (mapAttrsToList ( + name: cfg: '' + ${name}: { + exec: "${cfg.exec}"; + align: "${cfg.align}"; + ${mapExtra cfg.extra} + }; + '' + ) cfg.indicators)} + }; + '' + ) cfg.bars; + in pkgs.writeText "yabar.conf" '' + bar-list = [${listKeys cfg.bars}]; + ${concatStringsSep "\n" bars} + ''; +in + { + options.programs.yabar = { + enable = mkEnableOption "yabar"; + + package = mkOption { + default = pkgs.yabar; + example = literalExample "pkgs.yabar-unstable"; + type = types.package; + + description = '' + The package which contains the `yabar` binary. + + Nixpkgs provides the `yabar` and `yabar-unstable` + derivations since 18.03, so it's possible to choose. + ''; + }; + + bars = mkOption { + default = {}; + type = types.attrsOf(types.submodule { + options = { + font = mkOption { + default = "sans bold 9"; + example = "Droid Sans, FontAwesome Bold 9"; + type = types.string; + + description = '' + The font that will be used to draw the status bar. + ''; + }; + + position = mkOption { + default = "top"; + example = "bottom"; + type = types.enum [ "top" "bottom" ]; + + description = '' + The position where the bar will be rendered. + ''; + }; + + extra = mkOption { + default = {}; + type = types.attrsOf types.string; + + description = '' + An attribute set which contains further attributes of a bar. + ''; + }; + + indicators = mkOption { + default = {}; + type = types.attrsOf(types.submodule { + options.exec = mkOption { + example = "YABAR_DATE"; + type = types.string; + description = '' + The type of the indicator to be executed. + ''; + }; + + options.align = mkOption { + default = "left"; + example = "right"; + type = types.enum [ "left" "center" "right" ]; + + description = '' + Whether to align the indicator at the left or right of the bar. + ''; + }; + + options.extra = mkOption { + default = {}; + type = types.attrsOf (types.either types.string types.int); + + description = '' + An attribute set which contains further attributes of a indicator. + ''; + }; + }); + + description = '' + Indicators that should be rendered by yabar. + ''; + }; + }; + }); + + description = '' + List of bars that should be rendered by yabar. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.yabar = { + description = "yabar service"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + + script = '' + ${cfg.package}/bin/yabar -c ${configFile} + ''; + + serviceConfig.Restart = "always"; + }; + }; + } diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 9077643c4440c6834d49efd59d148f732c1cb1a0..b995d390b279388964998b7c1d9d15990effceb7 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -48,6 +48,15 @@ in Name of the theme to be used by oh-my-zsh. ''; }; + + cacheDir = mkOption { + default = "$HOME/.cache/oh-my-zsh"; + type = types.str; + description = '' + Cache directory to be used by `oh-my-zsh`. + Without this option it would default to the read-only nix store. + ''; + }; }; }; @@ -74,6 +83,13 @@ in "ZSH_THEME=\"${cfg.theme}\"" } + ${optionalString (cfg.cacheDir != null) '' + if [[ ! -d "${cfg.cacheDir}" ]]; then + mkdir -p "${cfg.cacheDir}" + fi + ZSH_CACHE_DIR=${cfg.cacheDir} + ''} + source $ZSH/oh-my-zsh.sh ''; }; diff --git a/nixos/modules/programs/zsh/zsh-autoenv.nix b/nixos/modules/programs/zsh/zsh-autoenv.nix new file mode 100644 index 0000000000000000000000000000000000000000..630114bcda9f34112eeb0d19a34ac8757a1902eb --- /dev/null +++ b/nixos/modules/programs/zsh/zsh-autoenv.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.zsh.zsh-autoenv; +in { + options = { + programs.zsh.zsh-autoenv = { + enable = mkEnableOption "zsh-autoenv"; + package = mkOption { + default = pkgs.zsh-autoenv; + defaultText = "pkgs.zsh-autoenv"; + description = '' + Package to install for `zsh-autoenv` usage. + ''; + + type = types.package; + }; + }; + }; + + config = mkIf cfg.enable { + programs.zsh.interactiveShellInit = '' + source ${cfg.package}/share/zsh-autoenv/autoenv.zsh + ''; + }; +} diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 6fb1346bbb338125a8c299e027e77f34e36d4f71..f689250dc61fb82b08fc92c5ccd11b9e68778691 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -36,8 +36,9 @@ in shellAliases = mkOption { default = config.environment.shellAliases; description = '' - Set of aliases for zsh shell. See - for an option format description. + Set of aliases for zsh shell. Overrides the default value taken from + . + See for an option format description. ''; type = types.attrs; # types.attrsOf types.stringOrPath; }; @@ -107,7 +108,7 @@ in if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi export __ETC_ZSHENV_SOURCED=1 - . ${config.system.build.setEnvironment} + ${config.system.build.setEnvironment.text} ${cfge.shellInit} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index f30cbe427f09c85a22b6bd6bd699ca9eb5547082..d8bea62673201ba9eba79360cbde333ae74ec33b 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -4,6 +4,7 @@ with lib; { imports = [ + (mkRenamedOptionModule [ "dysnomia" ] [ "services" "dysnomia" ]) (mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ]) (mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ]) (mkRenamedOptionModule [ "environment" "nix" ] [ "nix" "package" ]) @@ -22,6 +23,8 @@ with lib; (config: let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config; in if enabled then [ pkgs.gutenprint ] else [ ])) + (mkRenamedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]) + (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "") (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ]) @@ -48,6 +51,10 @@ with lib; (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead") (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead") + # Xsession script + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ]) + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "xserver" "displayManager" "job" "logToJournal" ]) + # Old Grub-related options. (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]) @@ -78,6 +85,10 @@ with lib; (mkRenamedOptionModule [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]) (mkRenamedOptionModule [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]) + # libvirtd + (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ] + "Set the option `virtualisation.libvirtd.qemuPackage' instead.") + # Tarsnap (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ]) @@ -140,6 +151,12 @@ with lib; # parsoid (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] [ "services" "parsoid" "wikis" ]) + # piwik was renamed to matomo + (mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ]) + (mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ]) + (mkRenamedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] [ "services" "matomo" "phpfpmProcessManagerConfig" ]) + (mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ]) + # tarsnap (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir") @@ -178,6 +195,21 @@ with lib; (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ]) (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) + # Profile splitting + (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ]) + + # misc/version.nix + #(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ]) + (mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ]) + #(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ]) + (mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ]) + (mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ]) + (mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ]) + + # Users + (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) + (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") @@ -194,11 +226,14 @@ with lib; "See the 16.09 release notes for more information.") (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") + (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") + (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") (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" ] "") + (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) @@ -209,5 +244,18 @@ with lib; (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" ]) - ]; + + # Xen + (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ]) + + (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ]) + (mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ]) + + ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter" + "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter" + "snmpExporter" "unifiExporter" "varnishExporter" ] + (opt: mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] '' + The prometheus exporters are now configured using `services.prometheus.exporters'. + See the 18.03 release notes for more information. + '' )); } diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index df0b4986eb82e01d7fe2b8aa47cfe512eaa44bc8..eb705007d028b647a8b8cfadcbb158f40e6c42e4 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -6,10 +6,11 @@ let cfg = config.security.acme; - certOpts = { ... }: { + certOpts = { name, ... }: { options = { webroot = mkOption { type = types.str; + example = "/var/lib/acme/acme-challenges"; description = '' Where the webroot of the HTTP vhost is located. .well-known/acme-challenge/ directory @@ -20,8 +21,8 @@ let }; domain = mkOption { - type = types.nullOr types.str; - default = null; + type = types.str; + default = name; description = "Domain to fetch certificate for (defaults to the entry name)"; }; @@ -48,7 +49,7 @@ let default = false; description = '' Give read permissions to the specified group - () to read SSL private certificates. + () to read SSL private certificates. ''; }; @@ -110,7 +111,7 @@ let } ''; description = '' - Extra domain names for which certificates are to be issued, with their + A list of extra domain names, which are included in the one certificate to be issued, with their own server roots if needed. ''; }; @@ -211,8 +212,9 @@ in domain = if data.domain != null then data.domain else cert; cpath = lpath + optionalString (data.activationDelay != null) ".staging"; lpath = "${cfg.directory}/${cert}"; + cpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; - cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ] + cmdline = [ "-v" "-d" data.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) @@ -284,6 +286,7 @@ in }; selfsignedService = { description = "Create preliminary self-signed certificate for ${cert}"; + path = [ pkgs.openssl ]; preStart = '' if [ ! -d '${cpath}' ] then @@ -294,37 +297,41 @@ in ''; script = '' - # Create self-signed key - workdir="/run/acme-selfsigned-${cert}" - ${pkgs.openssl.bin}/bin/openssl genrsa -des3 -passout pass:x -out $workdir/server.pass.key 2048 - ${pkgs.openssl.bin}/bin/openssl rsa -passin pass:x -in $workdir/server.pass.key -out $workdir/server.key - ${pkgs.openssl.bin}/bin/openssl req -new -key $workdir/server.key -out $workdir/server.csr \ + workdir="$(mktemp -d)" + + # Create CA + openssl genrsa -des3 -passout pass:x -out $workdir/ca.pass.key 2048 + openssl rsa -passin pass:x -in $workdir/ca.pass.key -out $workdir/ca.key + openssl req -new -key $workdir/ca.key -out $workdir/ca.csr \ + -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=Security Department/CN=example.com" + openssl x509 -req -days 1 -in $workdir/ca.csr -signkey $workdir/ca.key -out $workdir/ca.crt + + # Create key + openssl genrsa -des3 -passout pass:x -out $workdir/server.pass.key 2048 + openssl rsa -passin pass:x -in $workdir/server.pass.key -out $workdir/server.key + openssl req -new -key $workdir/server.key -out $workdir/server.csr \ -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com" - ${pkgs.openssl.bin}/bin/openssl x509 -req -days 1 -in $workdir/server.csr -signkey $workdir/server.key -out $workdir/server.crt + openssl x509 -req -days 1 -in $workdir/server.csr -CA $workdir/ca.crt \ + -CAkey $workdir/ca.key -CAserial $workdir/ca.srl -CAcreateserial \ + -out $workdir/server.crt - # Move key to destination - mv $workdir/server.key ${cpath}/key.pem - mv $workdir/server.crt ${cpath}/fullchain.pem + # Copy key to destination + cp $workdir/server.key ${cpath}/key.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" + # Create fullchain.pem (same format as "simp_le ... -f fullchain.pem" creates) + cat $workdir/{server.crt,ca.crt} > "${cpath}/fullchain.pem" - # Clean up working directory - rm $workdir/server.csr - rm $workdir/server.pass.key + # Create full.pem for e.g. lighttpd + cat $workdir/{server.key,server.crt,ca.crt} > "${cpath}/full.pem" # Give key acme permissions - chmod ${rights} '${cpath}/key.pem' - 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' + chown '${data.user}:${data.group}' "${cpath}/"{key,fullchain,full}.pem + chmod ${rights} "${cpath}/"{key,fullchain,full}.pem ''; serviceConfig = { Type = "oneshot"; - RuntimeDirectory = "acme-selfsigned-${cert}"; PermissionsStartOnly = true; + PrivateTmp = true; User = data.user; Group = data.group; }; diff --git a/nixos/modules/security/audit.nix b/nixos/modules/security/audit.nix index 7ac21fd965071f3e534050beb4cc71d50caa68a2..2b22bdd9f0ae63ecbae78a3f8743258c8f83aacd 100644 --- a/nixos/modules/security/audit.nix +++ b/nixos/modules/security/audit.nix @@ -13,7 +13,7 @@ let }; disableScript = pkgs.writeScript "audit-disable" '' - #!${pkgs.stdenv.shell} -eu + #!${pkgs.runtimeShell} -eu # Explicitly disable everything, as otherwise journald might start it. auditctl -D auditctl -e 0 -a task,never @@ -23,7 +23,7 @@ let # put in the store like this. At the same time, it doesn't feel like a huge deal and working # around that is a pain so I'm leaving it like this for now. startScript = pkgs.writeScript "audit-start" '' - #!${pkgs.stdenv.shell} -eu + #!${pkgs.runtimeShell} -eu # Clear out any rules we may start with auditctl -D @@ -43,7 +43,7 @@ let ''; stopScript = pkgs.writeScript "audit-stop" '' - #!${pkgs.stdenv.shell} -eu + #!${pkgs.runtimeShell} -eu # Clear the rules auditctl -D diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 9ca818e86ffa10831c68e49ec6e8cf08fb1e74ca..df6108dede7c476b6842f31d300570969cd34f7a 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -25,14 +25,14 @@ let loginCfgFile = optional cfg.ssh.enable { source = pkgs.writeText "login_duo.conf" configFile; mode = "0600"; - uid = config.ids.uids.sshd; + user = "sshd"; target = "duo/login_duo.conf"; }; pamCfgFile = optional cfg.pam.enable { source = pkgs.writeText "pam_duo.conf" configFile; mode = "0600"; - uid = config.ids.uids.sshd; + user = "sshd"; target = "duo/pam_duo.conf"; }; in diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 2d6713311a45f0f79d4661ab99ba612c47f2826d..48998285d89d695c07157893d07b1b06f0019c65 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -46,6 +46,18 @@ let ''; }; + googleAuthenticator = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + If set, users with enabled Google Authenticator (created + ~/.google_authenticator) will be required + to provide Google Authenticator token to log in. + ''; + }; + }; + usbAuth = mkOption { default = config.security.pam.usb.enable; type = types.bool; @@ -222,6 +234,22 @@ let password, KDE will prompt separately after login. ''; }; + sssdStrictAccess = mkOption { + default = false; + type = types.bool; + description = "enforce sssd access control"; + }; + + enableGnomeKeyring = mkOption { + default = false; + type = types.bool; + description = '' + If enabled, pam_gnome_keyring will attempt to automatically unlock the + user's default Gnome keyring upon login. If the user login password does + not match their keyring password, Gnome Keyring will prompt separately + after login. + ''; + }; text = mkOption { type = types.nullOr types.lines; @@ -241,11 +269,13 @@ let text = mkDefault ('' # Account management. - account sufficient pam_unix.so + account ${if cfg.sssdStrictAccess then "required" else "sufficient"} pam_unix.so ${optionalString use_ldap "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString config.services.sssd.enable + ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false) "account sufficient ${pkgs.sssd}/lib/security/pam_sss.so"} + ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess) + "account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so"} ${optionalString config.krb5.enable "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"} @@ -273,7 +303,12 @@ let # prompts the user for password so we run it once with 'required' at an # earlier point and it will run again with 'sufficient' further down. # We use try_first_pass the second time to avoid prompting password twice - (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet)) '' + (optionalString (cfg.unixAuth && + (config.security.pam.enableEcryptfs + || cfg.pamMount + || cfg.enableKwallet + || cfg.enableGnomeKeyring + || cfg.googleAuthenticator.enable)) '' auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth ${optionalString config.security.pam.enableEcryptfs "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -282,6 +317,10 @@ let ${optionalString cfg.enableKwallet ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + ${optionalString cfg.enableGnomeKeyring + ("auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so")} + ${optionalString cfg.googleAuthenticator.enable + "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} '') + '' ${optionalString cfg.unixAuth "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} @@ -351,6 +390,10 @@ let ${optionalString (cfg.enableKwallet) ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + ${optionalString (cfg.enableGnomeKeyring) + "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} + ${optionalString (config.virtualisation.lxc.lxcfs.enable) + "session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all"} ''); }; @@ -519,7 +562,6 @@ in ftp = {}; i3lock = {}; i3lock-color = {}; - swaylock = {}; screen = {}; vlock = {}; xlock = {}; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index cfd0595e63b72d16647db3f12d47244bfcdd45ec..24283e1d6165cbaf653480f8be387eb439433c6a 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -8,6 +8,22 @@ let inherit (pkgs) sudo; + toUserString = user: if (isInt user) then "#${toString user}" else "${user}"; + toGroupString = group: if (isInt group) then "%#${toString group}" else "%${group}"; + + toCommandOptionsString = options: + "${concatStringsSep ":" options}${optionalString (length options != 0) ":"} "; + + toCommandsString = commands: + concatStringsSep ", " ( + map (command: + if (isString command) then + command + else + "${toCommandOptionsString command.options}${command.command}" + ) commands + ); + in { @@ -31,8 +47,8 @@ in default = true; description = '' - Whether users of the wheel group can execute - commands as super user without entering a password. + Whether users of the wheel group must + provide a password to run commands as super user via sudo. ''; }; @@ -47,6 +63,97 @@ in ''; }; + security.sudo.extraRules = mkOption { + description = '' + Define specific rules to be in the sudoers file. + ''; + default = []; + example = [ + # Allow execution of any command by all users in group sudo, + # requiring a password. + { groups = [ "sudo" ]; commands = [ "ALL" ]; } + + # Allow execution of "/home/root/secret.sh" by user `backup`, `database` + # and the group with GID `1006` without a password. + { users = [ "backup" ]; groups = [ 1006 ]; + commands = [ { command = "/home/root/secret.sh"; options = [ "SETENV" "NOPASSWD" ]; } ]; } + + # Allow all users of group `bar` to run two executables as user `foo` + # with arguments being pre-set. + { groups = [ "bar" ]; runAs = "foo"; + commands = + [ "/home/baz/cmd1.sh hello-sudo" + { command = ''/home/baz/cmd2.sh ""''; options = [ "SETENV" ]; } ]; } + ]; + type = with types; listOf (submodule { + options = { + users = mkOption { + type = with types; listOf (either string int); + description = '' + The usernames / UIDs this rule should apply for. + ''; + default = []; + }; + + groups = mkOption { + type = with types; listOf (either string int); + description = '' + The groups / GIDs this rule should apply for. + ''; + default = []; + }; + + host = mkOption { + type = types.string; + default = "ALL"; + description = '' + For what host this rule should apply. + ''; + }; + + runAs = mkOption { + type = with types; string; + default = "ALL:ALL"; + description = '' + Under which user/group the specified command is allowed to run. + + A user can be specified using just the username: "foo". + It is also possible to specify a user/group combination using "foo:bar" + or to only allow running as a specific group with ":bar". + ''; + }; + + commands = mkOption { + description = '' + The commands for which the rule should apply. + ''; + type = with types; listOf (either string (submodule { + + options = { + command = mkOption { + type = with types; string; + description = '' + A command being either just a path to a binary to allow any arguments, + the full command with arguments pre-set or with "" used as the argument, + not allowing arguments to the command at all. + ''; + }; + + options = mkOption { + type = with types; listOf (enum [ "NOPASSWD" "PASSWD" "NOEXEC" "EXEC" "SETENV" "NOSETENV" "LOG_INPUT" "NOLOG_INPUT" "LOG_OUTPUT" "NOLOG_OUTPUT" ]); + description = '' + Options for running the command. Refer to the sudo manual. + ''; + default = []; + }; + }; + + })); + }; + }; + }); + }; + security.sudo.extraConfig = mkOption { type = types.lines; default = ""; @@ -61,10 +168,16 @@ in config = mkIf cfg.enable { + security.sudo.extraRules = [ + { groups = [ "wheel" ]; + commands = [ { command = "ALL"; options = (if cfg.wheelNeedsPassword then [ "SETENV" ] else [ "NOPASSWD" "SETENV" ]); } ]; + } + ]; + security.sudo.configFile = '' # Don't edit this file. Set the NixOS options ‘security.sudo.configFile’ - # or ‘security.sudo.extraConfig’ instead. + # or ‘security.sudo.extraRules’ instead. # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. Defaults env_keep+=SSH_AUTH_SOCK @@ -72,8 +185,18 @@ in # "root" is allowed to do anything. root ALL=(ALL:ALL) SETENV: ALL - # Users in the "wheel" group can do anything. - %wheel ALL=(ALL:ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL + # extraRules + ${concatStringsSep "\n" ( + lists.flatten ( + map ( + rule: if (length rule.commands != 0) then [ + (map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users) + (map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups) + ] else [] + ) cfg.extraRules + ) + )} + ${cfg.extraConfig} ''; @@ -92,7 +215,7 @@ in { src = pkgs.writeText "sudoers-in" cfg.configFile; } # Make sure that the sudoers file is syntactically valid. # (currently disabled - NIXOS-66) - "${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out"; + "${pkgs.buildPackages.sudo}/sbin/visudo -f $src -c && cp $src $out"; target = "sudoers"; mode = "0440"; }; diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 1f64213accd46fb38361edfadf8e62575b980625..77e4b2a616d8ef404d91693c3277e48424c7f7b5 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -17,7 +17,7 @@ let hardeningEnable = [ "pie" ]; installPhase = '' mkdir -p $out/bin - gcc -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \ + $CC -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \ -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper ''; }; @@ -79,7 +79,7 @@ let ({ owner = "root"; group = "root"; } // s) - else if + else if (s ? "setuid" && s.setuid) || (s ? "setgid" && s.setgid) || (s ? "permissions") diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c index 7091e314bb22210d73c4c06f8c5d9fcbf2d75f20..494e9e93ac22230a00846098b9ec20df8dc06c89 100644 --- a/nixos/modules/security/wrappers/wrapper.c +++ b/nixos/modules/security/wrappers/wrapper.c @@ -10,8 +10,8 @@ #include #include #include -#include #include +#include #include // Make sure assertions are not compiled out, we use them to codify diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index acf48d3c3d0323d36a0273321796d62356cc54fd..e3e8bb28c58bbebe4d10637332637404329ffed7 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -21,7 +21,7 @@ in enable = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether to enable ALSA sound. ''; diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index c0a0f03742942cf7493c09e525f7658c67b49eb6..52613d450b51eb83cbafd5c172695fd099e9ee08 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -4,17 +4,22 @@ with pkgs; with lib; let - uid = config.ids.uids.mopidy; gid = config.ids.gids.mopidy; cfg = config.services.mopidy; mopidyConf = writeText "mopidy.conf" cfg.configuration; - mopidyEnv = python.buildEnv.override { - extraLibs = [ mopidy ] ++ cfg.extensionPackages; + mopidyEnv = buildEnv { + name = "mopidy-with-extensions-${mopidy.version}"; + paths = closePropagation cfg.extensionPackages; + pathsToLink = [ "/${python.sitePackages}" ]; + buildInputs = [ makeWrapper ]; + postBuild = '' + makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \ + --prefix PYTHONPATH : $out/${python.sitePackages} + ''; }; - in { options = { @@ -61,7 +66,6 @@ in { }; - ###### implementation config = mkIf cfg.enable { diff --git a/nixos/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix deleted file mode 100644 index fbb4ff4034f148e095de5f0cc6188af8727914ea..0000000000000000000000000000000000000000 --- a/nixos/modules/services/backup/almir.nix +++ /dev/null @@ -1,173 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.almir; - - bconsoleconf = pkgs.writeText "bconsole.conf" - '' - Director { - Name = ${cfg.director_name} - DIRport = ${toString cfg.director_port} - address = ${cfg.director_address} - Password = "${cfg.director_password}" - } - ''; - - productionini = pkgs.writeText "production.ini" - '' -[app:main] -use = egg:almir - -pyramid.reload_templates = false -pyramid.debug_authorization = false -pyramid.debug_notfound = false -pyramid.debug_routematch = false -pyramid.debug_templates = false -pyramid.default_locale_name = en -pyramid.includes = - pyramid_exclog -exclog.extra_info = true - -sqlalchemy.url = ${cfg.sqlalchemy_engine_url} -timezone = ${cfg.timezone} -bconsole_config = ${bconsoleconf} - -[server:main] -use = egg:waitress#main -host = 127.0.0.1 -port = ${toString cfg.port} - - -# Begin logging configuration - -[loggers] -keys = root, almir, sqlalchemy, exc_logger - -[handlers] -keys = console - -[formatters] -keys = generic - -[logger_root] -level = WARN -handlers = console - -[logger_almir] -level = WARN -handlers = -qualname = almir - -[logger_exc_logger] -level = ERROR -handlers = -qualname = exc_logger - -[logger_sqlalchemy] -level = WARN -handlers = -qualname = sqlalchemy.engine -# "level = INFO" logs SQL queries. -# "level = DEBUG" logs SQL queries and results. -# "level = WARN" logs neither. (Recommended for production systems.) - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = NOTSET -formatter = generic - -[formatter_generic] -format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s - ''; -in { - options = { - services.almir = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable Almir web server. Also configures postgresql database and installs bacula. - ''; - }; - - port = mkOption { - default = 35000; - type = types.int; - description = '' - Port for Almir web server to listen on. - ''; - }; - - timezone = mkOption { - description = '' - Timezone as specified in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones - ''; - example = "Europe/Ljubljana"; - }; - - sqlalchemy_engine_url = mkOption { - default = "postgresql:///bacula"; - example = '' - postgresql://bacula:bacula@localhost:5432/bacula - mysql+mysqlconnector://:@/' - sqlite:////var/lib/bacula/bacula.db' - ''; - description = '' - Define SQL database connection to bacula catalog as specified in http://docs.sqlalchemy.org/en/latest/core/engines.html#database-urls - ''; - }; - - director_name = mkOption { - description = '' - Name of the Director to connect with bconsole. - ''; - }; - - director_password = mkOption { - description = '' - Password for Director to connect with bconsole. - ''; - }; - - director_port = mkOption { - default = 9101; - type = types.int; - description = '' - Port for Director to connect with bconsole. - ''; - }; - - director_address = mkOption { - default = "127.0.0.1"; - description = '' - IP/Hostname for Director to connect with bconsole. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - systemd.services.almir = { - after = [ "network.target" "postgresql.service" ]; - description = "Almir web app"; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.pythonPackages.almir ]; - environment.PYTHONPATH = "${pkgs.pythonPackages.almir}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages"; - serviceConfig.ExecStart = "${pkgs.pythonPackages.pyramid}/bin/pserve ${productionini}"; - }; - - environment.systemPackages = [ pkgs.pythonPackages.almir ]; - - users.extraUsers.almir = { - group = "almir"; - uid = config.ids.uids.almir; - createHome = true; - shell = "${pkgs.bash}/bin/bash"; - }; - - users.extraGroups.almir.gid = config.ids.gids.almir; - }; -} diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix new file mode 100644 index 0000000000000000000000000000000000000000..1b730e0c2b76d11253895aa6badf62c75d6cfac3 --- /dev/null +++ b/nixos/modules/services/backup/borgbackup.nix @@ -0,0 +1,580 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + isLocalPath = x: + builtins.substring 0 1 x == "/" # absolute path + || builtins.substring 0 1 x == "." # relative path + || builtins.match "[.*:.*]" == null; # not machine:path + + mkExcludeFile = cfg: + # Write each exclude pattern to a new line + pkgs.writeText "excludefile" (concatStringsSep "\n" cfg.exclude); + + mkKeepArgs = cfg: + # If cfg.prune.keep e.g. has a yearly attribute, + # its content is passed on as --keep-yearly + concatStringsSep " " + (mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep); + + mkBackupScript = cfg: '' + on_exit() + { + exitStatus=$? + # Reset the EXIT handler, or else we're called again on 'exit' below + trap - EXIT + ${cfg.postHook} + exit $exitStatus + } + trap 'on_exit' INT TERM QUIT EXIT + + archiveName="${cfg.archiveBaseName}-$(date ${cfg.dateFormat})" + archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}" + ${cfg.preHook} + '' + optionalString cfg.doInit '' + # Run borg init if the repo doesn't exist yet + if ! borg list > /dev/null; then + borg init \ + --encryption ${cfg.encryption.mode} \ + $extraInitArgs + ${cfg.postInit} + fi + '' + '' + borg create \ + --compression ${cfg.compression} \ + --exclude-from ${mkExcludeFile cfg} \ + $extraCreateArgs \ + "::$archiveName$archiveSuffix" \ + ${escapeShellArgs cfg.paths} + '' + optionalString cfg.appendFailedSuffix '' + borg rename "::$archiveName$archiveSuffix" "$archiveName" + '' + '' + ${cfg.postCreate} + '' + optionalString (cfg.prune.keep != { }) '' + borg prune \ + ${mkKeepArgs cfg} \ + --prefix ${escapeShellArg cfg.prune.prefix} \ + $extraPruneArgs + ${cfg.postPrune} + ''; + + mkPassEnv = cfg: with cfg.encryption; + if passCommand != null then + { BORG_PASSCOMMAND = passCommand; } + else if passphrase != null then + { BORG_PASSPHRASE = passphrase; } + else { }; + + mkBackupService = name: cfg: + let + userHome = config.users.users.${cfg.user}.home; + in nameValuePair "borgbackup-job-${name}" { + description = "BorgBackup job ${name}"; + path = with pkgs; [ + borgbackup openssh + ]; + script = mkBackupScript cfg; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + # Only run when no other process is using CPU or disk + CPUSchedulingPolicy = "idle"; + IOSchedulingClass = "idle"; + ProtectSystem = "strict"; + ReadWritePaths = + [ "${userHome}/.config/borg" "${userHome}/.cache/borg" ] + # Borg needs write access to repo if it is not remote + ++ optional (isLocalPath cfg.repo) cfg.repo; + PrivateTmp = true; + }; + environment = { + BORG_REPO = cfg.repo; + inherit (cfg) extraInitArgs extraCreateArgs extraPruneArgs; + } // (mkPassEnv cfg) // cfg.environment; + inherit (cfg) startAt; + }; + + # Paths listed in ReadWritePaths must exist before service is started + mkActivationScript = name: cfg: + let + install = "install -o ${cfg.user} -g ${cfg.group}"; + in + nameValuePair "borgbackup-job-${name}" (stringAfter [ "users" ] ('' + # Eensure that the home directory already exists + # We can't assert createHome == true because that's not the case for root + cd "${config.users.users.${cfg.user}.home}" + ${install} -d .config/borg + ${install} -d .cache/borg + '' + optionalString (isLocalPath cfg.repo) '' + ${install} -d ${escapeShellArg cfg.repo} + '')); + + mkPassAssertion = name: cfg: { + assertion = with cfg.encryption; + mode != "none" -> passCommand != null || passphrase != null; + message = + "passCommand or passphrase has to be specified because" + + '' borgbackup.jobs.${name}.encryption != "none"''; + }; + + mkRepoService = name: cfg: + nameValuePair "borgbackup-repo-${name}" { + description = "Create BorgBackup repository ${name} directory"; + script = '' + mkdir -p ${escapeShellArg cfg.path} + chown ${cfg.user}:${cfg.group} ${escapeShellArg cfg.path} + ''; + serviceConfig = { + # The service's only task is to ensure that the specified path exists + Type = "oneshot"; + }; + wantedBy = [ "multi-user.target" ]; + }; + + mkAuthorizedKey = cfg: appendOnly: key: + let + # Because of the following line, clients do not need to specify an absolute repo path + cdCommand = "cd ${escapeShellArg cfg.path}"; + restrictedArg = "--restrict-to-${if cfg.allowSubRepos then "path" else "repository"} ."; + appendOnlyArg = optionalString appendOnly "--append-only"; + quotaArg = optionalString (cfg.quota != null) "--storage-quota ${cfg.quota}"; + serveCommand = "borg serve ${restrictedArg} ${appendOnlyArg} ${quotaArg}"; + in + ''command="${cdCommand} && ${serveCommand}",restrict ${key}''; + + mkUsersConfig = name: cfg: { + users.${cfg.user} = { + openssh.authorizedKeys.keys = + (map (mkAuthorizedKey cfg false) cfg.authorizedKeys + ++ map (mkAuthorizedKey cfg true) cfg.authorizedKeysAppendOnly); + useDefaultShell = true; + }; + groups.${cfg.group} = { }; + }; + + mkKeysAssertion = name: cfg: { + assertion = cfg.authorizedKeys != [ ] || cfg.authorizedKeysAppendOnly != [ ]; + message = + "borgbackup.repos.${name} does not make sense" + + " without at least one public key"; + }; + +in { + meta.maintainers = with maintainers; [ dotlambda ]; + + ###### interface + + options.services.borgbackup.jobs = mkOption { + description = "Deduplicating backups using BorgBackup."; + default = { }; + example = literalExample '' + { + rootBackup = { + paths = "/"; + exclude = [ "/nix" ]; + repo = "/path/to/local/repo"; + encryption = { + mode = "repokey"; + passphrase = "secret"; + }; + compression = "auto,lzma"; + startAt = "weekly"; + }; + } + ''; + type = types.attrsOf (types.submodule (let globalConfig = config; in + { name, config, ... }: { + options = { + + paths = mkOption { + type = with types; either path (nonEmptyListOf path); + description = "Path(s) to back up."; + example = "/home/user"; + apply = x: if isList x then x else [ x ]; + }; + + repo = mkOption { + type = types.str; + description = "Remote or local repository to back up to."; + example = "user@machine:/path/to/repo"; + }; + + archiveBaseName = mkOption { + type = types.strMatching "[^/{}]+"; + default = "${globalConfig.networking.hostName}-${name}"; + defaultText = "\${config.networking.hostName}-"; + description = '' + How to name the created archives. A timestamp, whose format is + determined by , will be appended. The full + name can be modified at runtime ($archiveName). + Placeholders like {hostname} must not be used. + ''; + }; + + dateFormat = mkOption { + type = types.str; + description = '' + Arguments passed to date + to create a timestamp suffix for the archive name. + ''; + default = "+%Y-%m-%dT%H:%M:%S"; + example = "-u +%s"; + }; + + startAt = mkOption { + type = with types; either str (listOf str); + default = "daily"; + description = '' + When or how often the backup should run. + Must be in the format described in + systemd.time + 7. + If you do not want the backup to start + automatically, use [ ]. + ''; + }; + + user = mkOption { + type = types.str; + description = '' + The user borg is run as. + User or group need read permission + for the specified . + ''; + default = "root"; + }; + + group = mkOption { + type = types.str; + description = '' + The group borg is run as. User or group needs read permission + for the specified . + ''; + default = "root"; + }; + + encryption.mode = mkOption { + type = types.enum [ + "repokey" "keyfile" + "repokey-blake2" "keyfile-blake2" + "authenticated" "authenticated-blake2" + "none" + ]; + description = '' + Encryption mode to use. Setting a mode + other than "none" requires + you to specify a + or a . + ''; + }; + + encryption.passCommand = mkOption { + type = with types; nullOr str; + description = '' + A command which prints the passphrase to stdout. + Mutually exclusive with . + ''; + default = null; + example = "cat /path/to/passphrase_file"; + }; + + encryption.passphrase = mkOption { + type = with types; nullOr str; + description = '' + The passphrase the backups are encrypted with. + Mutually exclusive with . + If you do not want the passphrase to be stored in the + world-readable Nix store, use . + ''; + default = null; + }; + + compression = mkOption { + # "auto" is optional, + # compression mode must be given, + # compression level is optional + type = types.strMatching "none|(auto,)?(lz4|zstd|zlib|lzma)(,[[:digit:]]{1,2})?"; + description = '' + Compression method to use. Refer to + borg help compression + for all available options. + ''; + default = "lz4"; + example = "auto,lzma"; + }; + + exclude = mkOption { + type = with types; listOf str; + description = '' + Exclude paths matching any of the given patterns. See + borg help patterns for pattern syntax. + ''; + default = [ ]; + example = [ + "/home/*/.cache" + "/nix" + ]; + }; + + doInit = mkOption { + type = types.bool; + description = '' + Run borg init if the + specified does not exist. + You should set this to false + if the repository is located on an external drive + that might not always be mounted. + ''; + default = true; + }; + + appendFailedSuffix = mkOption { + type = types.bool; + description = '' + Append a .failed suffix + to the archive name, which is only removed if + borg create has a zero exit status. + ''; + default = true; + }; + + prune.keep = mkOption { + # Specifying e.g. `prune.keep.yearly = -1` + # means there is no limit of yearly archives to keep + # The regex is for use with e.g. --keep-within 1y + type = with types; attrsOf (either int (strMatching "[[:digit:]]+[Hdwmy]")); + description = '' + Prune a repository by deleting all archives not matching any of the + specified retention options. See borg help prune + for the available options. + ''; + default = { }; + example = literalExample '' + { + within = "1d"; # Keep all archives from the last day + daily = 7; + weekly = 4; + monthly = -1; # Keep at least one archive for each month + } + ''; + }; + + prune.prefix = mkOption { + type = types.str; + description = '' + Only consider archive names starting with this prefix for pruning. + By default, only archives created by this job are considered. + Use "" to consider all archives. + ''; + default = config.archiveBaseName; + defaultText = "\${archiveBaseName}"; + }; + + environment = mkOption { + type = with types; attrsOf str; + description = '' + Environment variables passed to the backup script. + You can for example specify which SSH key to use. + ''; + default = { }; + example = { BORG_RSH = "ssh -i /path/to/key"; }; + }; + + preHook = mkOption { + type = types.lines; + description = '' + Shell commands to run before the backup. + This can for example be used to mount file systems. + ''; + default = ""; + example = '' + # To add excluded paths at runtime + extraCreateArgs="$extraCreateArgs --exclude /some/path" + ''; + }; + + postInit = mkOption { + type = types.lines; + description = '' + Shell commands to run after borg init. + ''; + default = ""; + }; + + postCreate = mkOption { + type = types.lines; + description = '' + Shell commands to run after borg create. The name + of the created archive is stored in $archiveName. + ''; + default = ""; + }; + + postPrune = mkOption { + type = types.lines; + description = '' + Shell commands to run after borg prune. + ''; + default = ""; + }; + + postHook = mkOption { + type = types.lines; + description = '' + Shell commands to run just before exit. They are executed + even if a previous command exits with a non-zero exit code. + The latter is available as $exitStatus. + ''; + default = ""; + }; + + extraInitArgs = mkOption { + type = types.str; + description = '' + Additional arguments for borg init. + Can also be set at runtime using $extraInitArgs. + ''; + default = ""; + example = "--append-only"; + }; + + extraCreateArgs = mkOption { + type = types.str; + description = '' + Additional arguments for borg create. + Can also be set at runtime using $extraCreateArgs. + ''; + default = ""; + example = "--stats --checkpoint-interval 600"; + }; + + extraPruneArgs = mkOption { + type = types.str; + description = '' + Additional arguments for borg prune. + Can also be set at runtime using $extraPruneArgs. + ''; + default = ""; + example = "--save-space"; + }; + + }; + } + )); + }; + + options.services.borgbackup.repos = mkOption { + description = '' + Serve BorgBackup repositories to given public SSH keys, + restricting their access to the repository only. + Also, clients do not need to specify the absolute path when accessing the repository, + i.e. user@machine:. is enough. (Note colon and dot.) + ''; + default = { }; + type = types.attrsOf (types.submodule ( + { name, config, ... }: { + options = { + + path = mkOption { + type = types.path; + description = '' + Where to store the backups. Note that the directory + is created automatically, with correct permissions. + ''; + default = "/var/lib/borgbackup"; + }; + + user = mkOption { + type = types.str; + description = '' + The user borg serve is run as. + User or group needs write permission + for the specified . + ''; + default = "borg"; + }; + + group = mkOption { + type = types.str; + description = '' + The group borg serve is run as. + User or group needs write permission + for the specified . + ''; + default = "borg"; + }; + + authorizedKeys = mkOption { + type = with types; listOf str; + description = '' + Public SSH keys that are given full write access to this repository. + You should use a different SSH key for each repository you write to, because + the specified keys are restricted to running borg serve + and can only access this single repository. + ''; + default = [ ]; + }; + + authorizedKeysAppendOnly = mkOption { + type = with types; listOf str; + description = '' + Public SSH keys that can only be used to append new data (archives) to the repository. + Note that archives can still be marked as deleted and are subsequently removed from disk + upon accessing the repo with full write access, e.g. when pruning. + ''; + default = [ ]; + }; + + allowSubRepos = mkOption { + type = types.bool; + description = '' + Allow clients to create repositories in subdirectories of the + specified . These can be accessed using + user@machine:path/to/subrepo. Note that a + applies to repositories independently. + Therefore, if this is enabled, clients can create multiple + repositories and upload an arbitrary amount of data. + ''; + default = false; + }; + + quota = mkOption { + # See the definition of parse_file_size() in src/borg/helpers/parseformat.py + type = with types; nullOr (strMatching "[[:digit:].]+[KMGTP]?"); + description = '' + Storage quota for the repository. This quota is ensured for all + sub-repositories if is enabled + but not for the overall storage space used. + ''; + default = null; + example = "100G"; + }; + + }; + } + )); + }; + + ###### implementation + + config = mkIf (with config.services.borgbackup; jobs != { } || repos != { }) + (with config.services.borgbackup; { + assertions = + mapAttrsToList mkPassAssertion jobs + ++ mapAttrsToList mkKeysAssertion repos; + + system.activationScripts = mapAttrs' mkActivationScript jobs; + + systemd.services = + # A job named "foo" is mapped to systemd.services.borgbackup-job-foo + mapAttrs' mkBackupService jobs + # A repo named "foo" is mapped to systemd.services.borgbackup-repo-foo + // mapAttrs' mkRepoService repos; + + users = mkMerge (mapAttrsToList mkUsersConfig repos); + + environment.systemPackages = with pkgs; [ borgbackup ]; + }); +} diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix new file mode 100644 index 0000000000000000000000000000000000000000..9497d8c18bb76b0a558661d7008834a0aaaac391 --- /dev/null +++ b/nixos/modules/services/backup/crashplan-small-business.nix @@ -0,0 +1,74 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.services.crashplansb; + crashplansb = pkgs.crashplansb.override { maxRam = cfg.maxRam; }; + varDir = "/var/lib/crashplan"; +in + +with lib; + +{ + options = { + services.crashplansb = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Starts crashplan for small business background service. + ''; + }; + maxRam = mkOption { + default = "1024m"; + example = "2G"; + type = types.str; + description = '' + Maximum amount of ram that the crashplan engine should use. + ''; + }; + openPorts = mkOption { + description = "Open ports in the firewall for crashplan."; + default = true; + type = types.bool; + }; + ports = mkOption { + # https://support.code42.com/Administrator/6/Planning_and_installing/TCP_and_UDP_ports_used_by_the_Code42_platform + # used ports can also be checked in the desktop app console using the command connection.info + description = "which ports to open."; + default = [ 4242 4243 4244 4247 ]; + type = types.listOf types.int; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ crashplansb ]; + networking.firewall.allowedTCPPorts = mkIf cfg.openPorts cfg.ports; + + systemd.services.crashplansb = { + description = "CrashPlan Backup Engine"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" ]; + + preStart = '' + install -d -m 755 ${crashplansb.vardir} + install -d -m 700 ${crashplansb.vardir}/conf + install -d -m 700 ${crashplansb.manifestdir} + install -d -m 700 ${crashplansb.vardir}/cache + install -d -m 700 ${crashplansb.vardir}/backupArchives + install -d -m 777 ${crashplansb.vardir}/log + cp -avn ${crashplansb}/conf.template/* ${crashplansb.vardir}/conf + ''; + + serviceConfig = { + Type = "forking"; + EnvironmentFile = "${crashplansb}/bin/run.conf"; + ExecStart = "${crashplansb}/bin/CrashPlanEngine start"; + ExecStop = "${crashplansb}/bin/CrashPlanEngine stop"; + PIDFile = "${crashplansb.vardir}/CrashPlanEngine.pid"; + WorkingDirectory = crashplansb; + }; + }; + }; +} diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix new file mode 100644 index 0000000000000000000000000000000000000000..9772ca4d20a7935135c980135cb49ce00b068086 --- /dev/null +++ b/nixos/modules/services/backup/duplicati.nix @@ -0,0 +1,40 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.duplicati; +in +{ + options = { + services.duplicati = { + enable = mkEnableOption "Duplicati"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.duplicati ]; + + systemd.services.duplicati = { + description = "Duplicati backup"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "duplicati"; + Group = "duplicati"; + ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=any --webservice-port=8200 --server-datafolder=/var/lib/duplicati"; + Restart = "on-failure"; + }; + }; + + users.extraUsers.duplicati = { + uid = config.ids.uids.duplicati; + home = "/var/lib/duplicati"; + createHome = true; + group = "duplicati"; + }; + users.extraGroups.duplicati.gid = config.ids.gids.duplicati; + + }; +} + diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix new file mode 100644 index 0000000000000000000000000000000000000000..21d82469c6051b0716d02eb59c0ad41991661594 --- /dev/null +++ b/nixos/modules/services/backup/restic.nix @@ -0,0 +1,150 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ + options.services.restic.backups = mkOption { + description = '' + Periodic backups to create with Restic. + ''; + type = types.attrsOf (types.submodule ({ name, config, ... }: { + options = { + passwordFile = mkOption { + type = types.str; + description = '' + Read the repository password from a file. + ''; + example = "/etc/nixos/restic-password"; + + }; + + repository = mkOption { + type = types.str; + description = '' + repository to backup to. + ''; + example = "sftp:backup@192.168.1.100:/backups/${name}"; + }; + + paths = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Which paths to backup. + ''; + example = [ + "/var/lib/postgresql" + "/home/user/backup" + ]; + }; + + timerConfig = mkOption { + type = types.attrsOf types.str; + default = { + OnCalendar = "daily"; + }; + description = '' + When to run the backup. See man systemd.timer for details. + ''; + example = { + OnCalendar = "00:05"; + RandomizedDelaySec = "5h"; + }; + }; + + user = mkOption { + type = types.str; + default = "root"; + description = '' + As which user the backup should run. + ''; + example = "postgresql"; + }; + + extraBackupArgs = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra arguments passed to restic backup. + ''; + example = [ + "--exclude-file=/etc/nixos/restic-ignore" + ]; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra extended options to be passed to the restic --option flag. + ''; + example = [ + "sftp.command='ssh backup@192.168.1.100 -i /home/user/.ssh/id_rsa -s sftp'" + ]; + }; + + initialize = mkOption { + type = types.bool; + default = false; + description = '' + Create the repository if it doesn't exist. + ''; + }; + }; + })); + default = {}; + example = { + localbackup = { + paths = [ "/home" ]; + repository = "/mnt/backup-hdd"; + passwordFile = "/etc/nixos/secrets/restic-password"; + initialize = true; + }; + remotebackup = { + paths = [ "/home" ]; + repository = "sftp:backup@host:/backups/home"; + passwordFile = "/etc/nixos/secrets/restic-password"; + extraOptions = [ + "sftp.command='ssh backup@host -i /etc/nixos/secrets/backup-private-key -s sftp'" + ]; + timerConfig = { + OnCalendar = "00:05"; + RandomizedDelaySec = "5h"; + }; + }; + }; + }; + + config = { + systemd.services = + mapAttrs' (name: backup: + let + extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions; + connectTo = elemAt (splitString ":" backup.repository) 1; + resticCmd = "${pkgs.restic}/bin/restic${extraOptions}"; + in nameValuePair "restic-backups-${name}" ({ + environment = { + RESTIC_PASSWORD_FILE = backup.passwordFile; + RESTIC_REPOSITORY = backup.repository; + }; + path = with pkgs; [ + openssh + ]; + restartIfChanged = false; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${concatStringsSep " " backup.paths}"; + User = backup.user; + }; + } // optionalAttrs backup.initialize { + preStart = '' + ${resticCmd} snapshots || ${resticCmd} init + ''; + }) + ) config.services.restic.backups; + systemd.timers = + mapAttrs' (name: backup: nameValuePair "restic-backups-${name}" { + wantedBy = [ "timers.target" ]; + timerConfig = backup.timerConfig; + }) config.services.restic.backups; + }; +} diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 7c9dedb67ad2fa890b1a9577226775c9b3ef9bad..4fc7c24813a55b27777a6c1b6bc45f752bf3996b 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -115,7 +115,7 @@ in description = '' Print global archive statistics upon completion. The output is available via - systemctl status tarsnap@archive-name. + systemctl status tarsnap-archive-name. ''; }; @@ -238,6 +238,20 @@ in Whether to produce verbose logging output. ''; }; + explicitSymlinks = mkOption { + type = types.bool; + default = false; + description = '' + Whether to follow symlinks specified as archives. + ''; + }; + followSymlinks = mkOption { + type = types.bool; + default = false; + description = '' + Whether to follow all symlinks in archive trees. + ''; + }; }; } )); @@ -285,12 +299,12 @@ in }) gcfg.archives); systemd.services = - mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" { + (mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" { description = "Tarsnap archive '${name}'"; requires = [ "network-online.target" ]; after = [ "network-online.target" ]; - path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ]; + path = with pkgs; [ iputils tarsnap utillinux ]; # In order for the persistent tarsnap timer to work reliably, we have to # make sure that the tarsnap server is reachable after systemd starts up @@ -300,10 +314,12 @@ in while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done ''; - script = - let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" \ - -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \ + script = let + tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"''; + run = ''${tarsnap} -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \ ${optionalString cfg.verbose "-v"} \ + ${optionalString cfg.explicitSymlinks "-H"} \ + ${optionalString cfg.followSymlinks "-L"} \ ${concatStringsSep " " cfg.directories}''; in if (cfg.cachedir != null) then '' mkdir -p ${cfg.cachedir} @@ -313,7 +329,7 @@ in if [ ! -e ${cfg.cachedir}/firstrun ]; then ( flock 10 flock -u 9 - tarsnap --configfile "/etc/tarsnap/${name}.conf" --fsck + ${tarsnap} --fsck flock 9 ) 10>${cfg.cachedir}/firstrun fi @@ -329,7 +345,44 @@ in CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ]; PermissionsStartOnly = "true"; }; - }) gcfg.archives; + }) gcfg.archives) // + + (mapAttrs' (name: cfg: nameValuePair "tarsnap-restore-${name}"{ + description = "Tarsnap restore '${name}'"; + requires = [ "network-online.target" ]; + + path = with pkgs; [ iputils tarsnap utillinux ]; + + script = let + tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"''; + lastArchive = ''$(${tarsnap} --list-archives | sort | tail -1)''; + run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}''; + + in if (cfg.cachedir != null) then '' + mkdir -p ${cfg.cachedir} + chmod 0700 ${cfg.cachedir} + + ( flock 9 + if [ ! -e ${cfg.cachedir}/firstrun ]; then + ( flock 10 + flock -u 9 + ${tarsnap} --fsck + flock 9 + ) 10>${cfg.cachedir}/firstrun + fi + ) 9>${cfg.cachedir}/lockf + + exec flock ${cfg.cachedir}/firstrun ${run} + '' else "exec ${run}"; + + serviceConfig = { + Type = "oneshot"; + IOSchedulingClass = "idle"; + NoNewPrivileges = "true"; + CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ]; + PermissionsStartOnly = "true"; + }; + }) gcfg.archives); # Note: the timer must be Persistent=true, so that systemd will start it even # if e.g. your laptop was asleep while the latest interval occurred. diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index baf99930e3eb23c2d661826d86531ecc6fc600a2..3d133f82d204878ab6d88e6a88055936bd36ed76 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -1,39 +1,372 @@ { config, lib, pkgs, ... }: with lib; +with types; let + + # Converts a plan like + # { "1d" = "1h"; "1w" = "1d"; } + # into + # "1d=>1h,1w=>1d" + attrToPlan = attrs: concatStringsSep "," (builtins.attrValues ( + mapAttrs (n: v: "${n}=>${v}") attrs)); + + planDescription = '' + The znapzend backup plan to use for the source. + + + The plan specifies how often to backup and for how long to keep the + backups. It consists of a series of retention periodes to interval + associations: + + + + retA=>intA,retB=>intB,... + + + + Both intervals and retention periods are expressed in standard units + of time or multiples of them. You can use both the full name or a + shortcut according to the following listing: + + + + second|sec|s, minute|min, hour|h, day|d, week|w, month|mon|m, year|y + + + + See znapzendzetup1 for more info. + ''; + planExample = "1h=>10min,1d=>1h,1w=>1d,1m=>1w,1y=>1m"; + + # A type for a string of the form number{b|k|M|G} + mbufferSizeType = str // { + check = x: str.check x && builtins.isList (builtins.match "^[0-9]+[bkMG]$" x); + description = "string of the form number{b|k|M|G}"; + }; + + # Type for a string that must contain certain other strings (the list parameter). + # Note that these would need regex escaping. + stringContainingStrings = list: let + matching = s: map (str: builtins.match ".*${str}.*" s) list; + in str // { + check = x: str.check x && all isList (matching x); + description = "string containing all of the characters ${concatStringsSep ", " list}"; + }; + + timestampType = stringContainingStrings [ "%Y" "%m" "%d" "%H" "%M" "%S" ]; + + destType = srcConfig: submodule ({ name, ... }: { + options = { + + label = mkOption { + type = str; + description = "Label for this destination. Defaults to the attribute name."; + }; + + plan = mkOption { + type = str; + description = planDescription; + example = planExample; + }; + + dataset = mkOption { + type = str; + description = "Dataset name to send snapshots to."; + example = "tank/main"; + }; + + host = mkOption { + type = nullOr str; + description = '' + Host to use for the destination dataset. Can be prefixed with + user@ to specify the ssh user. + ''; + default = null; + example = "john@example.com"; + }; + + presend = mkOption { + type = nullOr str; + description = '' + Command to run before sending the snapshot to the destination. + Intended to run a remote script via ssh on the + destination, e.g. to bring up a backup disk or server or to put a + zpool online/offline. See also . + ''; + default = null; + example = "ssh root@bserv zpool import -Nf tank"; + }; + + postsend = mkOption { + type = nullOr str; + description = '' + Command to run after sending the snapshot to the destination. + Intended to run a remote script via ssh on the + destination, e.g. to bring up a backup disk or server or to put a + zpool online/offline. See also . + ''; + default = null; + example = "ssh root@bserv zpool export tank"; + }; + }; + + config = { + label = mkDefault name; + plan = mkDefault srcConfig.plan; + }; + }); + + + + srcType = submodule ({ name, config, ... }: { + options = { + + enable = mkOption { + type = bool; + description = "Whether to enable this source."; + default = true; + }; + + recursive = mkOption { + type = bool; + description = "Whether to do recursive snapshots."; + default = false; + }; + + mbuffer = { + enable = mkOption { + type = bool; + description = "Whether to use mbuffer."; + default = false; + }; + + port = mkOption { + type = nullOr ints.u16; + description = '' + Port to use for mbuffer. + + + If this is null, it will run mbuffer through + ssh. + + + If this is not null, it will run mbuffer + directly through TCP, which is not encrypted but faster. In that + case the given port needs to be open on the destination host. + ''; + default = null; + }; + + size = mkOption { + type = mbufferSizeType; + description = '' + The size for mbuffer. + Supports the units b, k, M, G. + ''; + default = "1G"; + example = "128M"; + }; + }; + + presnap = mkOption { + type = nullOr str; + description = '' + Command to run before snapshots are taken on the source dataset, + e.g. for database locking/flushing. See also + . + ''; + default = null; + example = literalExample '' + ''${pkgs.mariadb}/bin/mysql -e "set autocommit=0;flush tables with read lock;\\! ''${pkgs.coreutils}/bin/sleep 600" & ''${pkgs.coreutils}/bin/echo $! > /tmp/mariadblock.pid ; sleep 10 + ''; + }; + + postsnap = mkOption { + type = nullOr str; + description = '' + Command to run after snapshots are taken on the source dataset, + e.g. for database unlocking. See also . + ''; + default = null; + example = literalExample '' + ''${pkgs.coreutils}/bin/kill `''${pkgs.coreutils}/bin/cat /tmp/mariadblock.pid`;''${pkgs.coreutils}/bin/rm /tmp/mariadblock.pid + ''; + }; + + timestampFormat = mkOption { + type = timestampType; + description = '' + The timestamp format to use for constructing snapshot names. + The syntax is strftime-like. The string must + consist of the mandatory %Y %m %d %H %M %S. + Optionally - _ . : characters as well as any + alphanumeric character are allowed. If suffixed by a + Z, times will be in UTC. + ''; + default = "%Y-%m-%d-%H%M%S"; + example = "znapzend-%m.%d.%Y-%H%M%SZ"; + }; + + sendDelay = mkOption { + type = int; + description = '' + Specify delay (in seconds) before sending snaps to the destination. + May be useful if you want to control sending time. + ''; + default = 0; + example = 60; + }; + + plan = mkOption { + type = str; + description = planDescription; + example = planExample; + }; + + dataset = mkOption { + type = str; + description = "The dataset to use for this source."; + example = "tank/home"; + }; + + destinations = mkOption { + type = loaOf (destType config); + description = "Additional destinations."; + default = {}; + example = literalExample '' + { + local = { + dataset = "btank/backup"; + presend = "zpool import -N btank"; + postsend = "zpool export btank"; + }; + remote = { + host = "john@example.com"; + dataset = "tank/john"; + }; + }; + ''; + }; + }; + + config = { + dataset = mkDefault name; + }; + + }); + + ### Generating the configuration from here + cfg = config.services.znapzend; + + onOff = b: if b then "on" else "off"; + nullOff = b: if isNull b then "off" else toString b; + stripSlashes = replaceStrings [ "/" ] [ "." ]; + + attrsToFile = config: concatStringsSep "\n" (builtins.attrValues ( + mapAttrs (n: v: "${n}=${v}") config)); + + mkDestAttrs = dst: with dst; + mapAttrs' (n: v: nameValuePair "dst_${label}${n}" v) ({ + "" = optionalString (! isNull host) "${host}:" + dataset; + _plan = plan; + } // optionalAttrs (presend != null) { + _precmd = presend; + } // optionalAttrs (postsend != null) { + _pstcmd = postsend; + }); + + mkSrcAttrs = srcCfg: with srcCfg; { + enabled = onOff enable; + mbuffer = with mbuffer; if enable then "${pkgs.mbuffer}/bin/mbuffer" + + optionalString (port != null) ":${toString port}" else "off"; + mbuffer_size = mbuffer.size; + post_znap_cmd = nullOff postsnap; + pre_znap_cmd = nullOff presnap; + recursive = onOff recursive; + src = dataset; + src_plan = plan; + tsformat = timestampFormat; + zend_delay = toString sendDelay; + } // fold (a: b: a // b) {} ( + map mkDestAttrs (builtins.attrValues destinations) + ); + + files = mapAttrs' (n: srcCfg: let + fileText = attrsToFile (mkSrcAttrs srcCfg); + in { + name = srcCfg.dataset; + value = pkgs.writeText (stripSlashes srcCfg.dataset) fileText; + }) cfg.zetup; + in { options = { services.znapzend = { - enable = mkEnableOption "ZnapZend daemon"; + enable = mkEnableOption "ZnapZend ZFS backup 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."; + type = 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; + type = str; default = "syslog::daemon"; example = "/var/log/znapzend.log"; - description = "Where to log to (syslog::<facility> or <filepath>)."; + description = '' + Where to log to (syslog::<facility> or <filepath>). + ''; }; noDestroy = mkOption { - type = types.bool; + type = bool; default = false; description = "Does all changes to the filesystem except destroy."; }; autoCreation = mkOption { - type = types.bool; + type = bool; + default = false; + description = "Automatically create the destination dataset if it does not exists."; + }; + + zetup = mkOption { + type = loaOf srcType; + description = "Znapzend configuration."; + default = {}; + example = literalExample '' + { + "tank/home" = { + # Make snapshots of tank/home every hour, keep those for 1 day, + # keep every days snapshot for 1 month, etc. + plan = "1d=>1h,1m=>1d,1y=>1m"; + recursive = true; + # Send all those snapshots to john@example.com:rtank/john as well + destinations.remote = { + host = "john@example.com"; + dataset = "rtank/john"; + }; + }; + }; + ''; + }; + + pure = mkOption { + type = bool; + description = '' + Do not persist any stateful znapzend setups. If this option is + enabled, your previously set znapzend setups will be cleared and only + the ones defined with this module will be applied. + ''; default = false; - description = "Automatically create the dataset on dest if it does not exists."; }; }; }; @@ -49,12 +382,30 @@ in path = with pkgs; [ zfs mbuffer openssh ]; + preStart = optionalString cfg.pure '' + echo Resetting znapzend zetups + ${pkgs.znapzend}/bin/znapzendzetup list \ + | grep -oP '(?<=\*\*\* backup plan: ).*(?= \*\*\*)' \ + | xargs -I{} ${pkgs.znapzend}/bin/znapzendzetup delete "{}" + '' + concatStringsSep "\n" (mapAttrsToList (dataset: config: '' + echo Importing znapzend zetup ${config} for dataset ${dataset} + ${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config} + '') files); + serviceConfig = { - ExecStart = "${pkgs.znapzend}/bin/znapzend --logto=${cfg.logTo} --loglevel=${cfg.logLevel} ${optionalString cfg.noDestroy "--nodestroy"} ${optionalString cfg.autoCreation "--autoCreation"}"; + ExecStart = let + args = concatStringsSep " " [ + "--logto=${cfg.logTo}" + "--loglevel=${cfg.logLevel}" + (optionalString cfg.noDestroy "--nodestroy") + (optionalString cfg.autoCreation "--autoCreation") + ]; in "${pkgs.znapzend}/bin/znapzend ${args}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; }; }; }; }; + + meta.maintainers = with maintainers; [ infinisil ]; } diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix index 75d71fccfda4b56a4d31be726f97ef0e859a16fc..e331889b9dd5a2230366839dae5f872e7dc757c0 100644 --- a/nixos/modules/services/cluster/kubernetes/dashboard.nix +++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix @@ -6,12 +6,12 @@ let cfg = config.services.kubernetes.addons.dashboard; name = "gcr.io/google_containers/kubernetes-dashboard-amd64"; - version = "v1.6.3"; + version = "v1.8.2"; image = pkgs.dockerTools.pullImage { imageName = name; imageTag = version; - sha256 = "1sf54d96nkgic9hir9c6p14gw24ns1k5d5a0r1sg414kjrvic0b4"; + sha256 = "11h0fz3wxp0f10fsyqaxjm7l2qg7xws50dv5iwlck5gb1fjmajad"; }; in { options.services.kubernetes.addons.dashboard = { diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 077953e4d4f8b725f97334cfccae9075231f88e5..aeb0a0d2432d73e6b34dbd81a85383367dbcd022 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -279,7 +279,7 @@ in { tokenAuthFile = mkOption { description = '' Kubernetes apiserver token authentication file. See - + ''; default = null; type = types.nullOr types.path; @@ -288,7 +288,7 @@ in { basicAuthFile = mkOption { description = '' Kubernetes apiserver basic authentication file. See - + ''; default = pkgs.writeText "users" '' kubernetes,admin,0 @@ -299,16 +299,16 @@ in { authorizationMode = mkOption { description = '' Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See - + ''; - default = ["RBAC"]; - type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC"]); + default = ["RBAC" "Node"]; + type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]); }; authorizationPolicy = mkOption { description = '' Kubernetes apiserver authorization policy file. See - + ''; default = []; type = types.listOf types.attrs; @@ -332,7 +332,7 @@ in { runtimeConfig = mkOption { description = '' Api runtime configuration. See - + ''; default = "authentication.k8s.io/v1beta1=true"; example = "api/all=false,api/v1=true"; @@ -342,9 +342,9 @@ in { admissionControl = mkOption { description = '' Kubernetes admission control plugins to use. See - + ''; - default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds"]; + default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"]; example = [ "NamespaceLifecycle" "NamespaceExists" "LimitRanger" "SecurityContextDeny" "ServiceAccount" "ResourceQuota" @@ -766,7 +766,7 @@ in { rm /opt/cni/bin/* || true ${concatMapStrings (package: '' echo "Linking cni package: ${package}" - ln -fs ${package.plugins}/* /opt/cni/bin + ln -fs ${package}/bin/* /opt/cni/bin '') cfg.kubelet.cni.packages} ''; serviceConfig = { @@ -828,7 +828,7 @@ in { }; # Allways include cni plugins - services.kubernetes.kubelet.cni.packages = [pkgs.cni]; + services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins]; boot.kernelModules = ["br_netfilter"]; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index fb91a29a40002ca61a794523da6ce34a873d946d..45d34f5b76f504029c0dacddadb45b46e913af0c 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -6,14 +6,20 @@ let cfg = config.services.slurm; # configuration file can be generated by http://slurm.schedmd.com/configurator.html - configFile = pkgs.writeText "slurm.conf" + configFile = pkgs.writeText "slurm.conf" '' ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''} ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''} + PlugStackConfig=${plugStackConfig} ${cfg.extraConfig} ''; + + plugStackConfig = pkgs.writeText "plugstack.conf" + '' + ${optionalString cfg.enableSrunX11 ''optional ${pkgs.slurm-spank-x11}/lib/x11.so''} + ''; in { @@ -28,7 +34,7 @@ in enable = mkEnableOption "slurm control daemon"; }; - + client = { enable = mkEnableOption "slurm rlient daemon"; @@ -86,8 +92,19 @@ in ''; }; + enableSrunX11 = mkOption { + default = false; + type = types.bool; + description = '' + If enabled srun will accept the option "--x11" to allow for X11 forwarding + from within an interactive session or a batch job. This activates the + slurm-spank-x11 module. Note that this requires 'services.openssh.forwardX11' + to be enabled on the compute nodes. + ''; + }; + extraConfig = mkOption { - default = ""; + default = ""; type = types.lines; description = '' Extra configuration options that will be added verbatim at @@ -134,7 +151,8 @@ in environment.systemPackages = [ wrappedSlurm ]; systemd.services.slurmd = mkIf (cfg.client.enable) { - path = with pkgs; [ wrappedSlurm coreutils ]; + path = with pkgs; [ wrappedSlurm coreutils ] + ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; wantedBy = [ "multi-user.target" ]; after = [ "systemd-tmpfiles-clean.service" ]; @@ -152,8 +170,9 @@ in }; systemd.services.slurmctld = mkIf (cfg.server.enable) { - path = with pkgs; [ wrappedSlurm munge coreutils ]; - + path = with pkgs; [ wrappedSlurm munge coreutils ] + ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; + wantedBy = [ "multi-user.target" ]; after = [ "network.target" "munged.service" ]; requires = [ "munged.service" ]; diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 9c06e1d43bbe119fa7353238e07646e2ea8edc8b..03af9a7859ec2d8d03b3d46ec89552ec633cd2f1 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -4,14 +4,31 @@ with lib; let cfg = config.services.buildkite-agent; - configFile = pkgs.writeText "buildkite-agent.cfg" - '' - token="${cfg.token}" - name="${cfg.name}" - meta-data="${cfg.meta-data}" - hooks-path="${cfg.package}/share/hooks" - build-path="${cfg.dataDir}" + + mkHookOption = { name, description, example ? null }: { + inherit name; + value = mkOption { + default = null; + inherit description; + type = types.nullOr types.lines; + } // (if example == null then {} else { inherit example; }); + }; + mkHookOptions = hooks: listToAttrs (map mkHookOption hooks); + + hooksDir = let + mkHookEntry = name: value: '' + cat > $out/${name} <key=value pairs. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = "debug=true"; description = '' - Meta data for the agent. + Extra lines to be added verbatim to the configuration file. ''; }; openssh = - { privateKey = mkOption { - type = types.str; + { privateKeyPath = mkOption { + type = types.path; description = '' Private agent key. + + A run-time path to the key file, which is supposed to be provisioned + outside of Nix store. ''; }; - publicKey = mkOption { - type = types.str; + publicKeyPath = mkOption { + type = types.path; description = '' Public agent key. + + A run-time path to the key file, which is supposed to be provisioned + outside of Nix store. ''; }; }; + + hooks = mkHookOptions [ + { name = "checkout"; + description = '' + The `checkout` hook script will replace the default checkout routine of the + bootstrap.sh script. You can use this hook to do your own SCM checkout + behaviour + ''; } + { name = "command"; + description = '' + The `command` hook script will replace the default implementation of running + the build command. + ''; } + { name = "environment"; + description = '' + The `environment` hook will run before all other commands, and can be used + to set up secrets, data, etc. Anything exported in hooks will be available + to the build script. + + Note: the contents of this file will be copied to the world-readable + Nix store. + ''; + example = '' + export SECRET_VAR=`head -1 /run/keys/secret` + ''; } + { name = "post-artifact"; + description = '' + The `post-artifact` hook will run just after artifacts are uploaded + ''; } + { name = "post-checkout"; + description = '' + The `post-checkout` hook will run after the bootstrap script has checked out + your projects source code. + ''; } + { name = "post-command"; + description = '' + The `post-command` hook will run after the bootstrap script has run your + build commands + ''; } + { name = "pre-artifact"; + description = '' + The `pre-artifact` hook will run just before artifacts are uploaded + ''; } + { name = "pre-checkout"; + description = '' + The `pre-checkout` hook will run just before your projects source code is + checked out from your SCM provider + ''; } + { name = "pre-command"; + description = '' + The `pre-command` hook will run just before your build command runs + ''; } + { name = "pre-exit"; + description = '' + The `pre-exit` hook will run just before your build job finishes + ''; } + ]; + + hooksPath = mkOption { + type = types.path; + default = hooksDir; + defaultText = "generated from services.buildkite-agent.hooks"; + description = '' + Path to the directory storing the hooks. + Consider using + instead. + ''; + }; }; }; @@ -84,6 +190,7 @@ in home = cfg.dataDir; createHome = true; description = "Buildkite agent user"; + extraGroups = [ "keys" ]; }; environment.systemPackages = [ cfg.package ]; @@ -92,28 +199,54 @@ in { description = "Buildkite Agent"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - path = cfg.runtimePackages; + path = cfg.runtimePackages ++ [ pkgs.coreutils ]; environment = config.networking.proxy.envVars // { HOME = cfg.dataDir; NIX_REMOTE = "daemon"; }; - preStart = '' - ${pkgs.coreutils}/bin/mkdir -m 0700 -p ${cfg.dataDir}/.ssh - - echo "${cfg.openssh.privateKey}" > ${cfg.dataDir}/.ssh/id_rsa - ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa - echo "${cfg.openssh.publicKey}" > ${cfg.dataDir}/.ssh/id_rsa.pub - ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa.pub - ''; + ## NB: maximum care is taken so that secrets (ssh keys and the CI token) + ## don't end up in the Nix store. + preStart = let + sshDir = "${cfg.dataDir}/.ssh"; + in + '' + mkdir -m 0700 -p "${sshDir}" + cp -f "${toString cfg.openssh.privateKeyPath}" "${sshDir}/id_rsa" + cp -f "${toString cfg.openssh.publicKeyPath}" "${sshDir}/id_rsa.pub" + chmod 600 "${sshDir}"/id_rsa* + + cat > "${cfg.dataDir}/buildkite-agent.cfg" <' are mutually exclusive. + ''; + } + ]; }; + imports = [ + (mkRenamedOptionModule [ "services" "buildkite-agent" "token" ] [ "services" "buildkite-agent" "tokenPath" ]) + (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "privateKey" ] [ "services" "buildkite-agent" "openssh" "privateKeyPath" ]) + (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "publicKey" ] [ "services" "buildkite-agent" "openssh" "publicKeyPath" ]) + ]; } diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 43fec5ff5bb28b3aa842c318f2cb37d6643c9c06..2fa7c59a965d385a11be10c1b6cf4ac843b108ed 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -28,6 +28,7 @@ let serverEnv = env // { HYDRA_TRACKER = cfg.tracker; + XDG_CACHE_HOME = "${baseDir}/www/.cache"; COLUMNS = "80"; PGPASSFILE = "${baseDir}/pgpass-www"; # grrr } // (optionalAttrs cfg.debugServer { DBIC_TRACE = "1"; }); @@ -225,14 +226,14 @@ in services.hydra.extraConfig = '' - using_frontend_proxy 1 - base_uri ${cfg.hydraURL} - notification_sender ${cfg.notificationSender} - max_servers 25 + using_frontend_proxy = 1 + base_uri = ${cfg.hydraURL} + notification_sender = ${cfg.notificationSender} + max_servers = 25 ${optionalString (cfg.logo != null) '' - hydra_logo ${cfg.logo} + hydra_logo = ${cfg.logo} ''} - gc_roots_dir ${cfg.gcRootsDir} + gc_roots_dir = ${cfg.gcRootsDir} use-substitutes = ${if cfg.useSubstitutes then "1" else "0"} ''; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 0dd59e4fb4442b0bc728a7cab9735b1c89c0338f..c2f4e9c0c5a73b0bed1dbb031dfaf02b8c0d9910 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -145,6 +145,11 @@ in { }; config = mkIf cfg.enable { + # server references the dejavu fonts + environment.systemPackages = [ + pkgs.dejavu_fonts + ]; + users.extraGroups = optional (cfg.group == "jenkins") { name = "jenkins"; gid = config.ids.gids.jenkins; @@ -200,15 +205,17 @@ in { ${replacePlugins} ''; + # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript script = '' ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ --httpPort=${toString cfg.port} \ --prefix=${cfg.prefix} \ + -Djava.awt.headless=true \ ${concatStringsSep " " cfg.extraOptions} ''; postStart = '' - until [[ $(${pkgs.curl.bin}/bin/curl -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do + until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do sleep 1 done ''; diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix index 906cb320df9839b0a30c9d187d936afc1f453c58..d528355671f61c175440d6a4ce5a4a05bb2e0864 100644 --- a/nixos/modules/services/databases/4store-endpoint.nix +++ b/nixos/modules/services/databases/4store-endpoint.nix @@ -2,7 +2,7 @@ let cfg = config.services.fourStoreEndpoint; endpointUser = "fourstorehttp"; - run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${endpointUser} -c"; + run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${endpointUser} -c"; in with lib; { diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix index 62856822f906ef8489d028e3b512529226a92dd0..abb62e1f2637e3faae0b2c25d520426f15b645d8 100644 --- a/nixos/modules/services/databases/4store.nix +++ b/nixos/modules/services/databases/4store.nix @@ -3,7 +3,7 @@ let cfg = config.services.fourStore; stateDir = "/var/lib/4store"; fourStoreUser = "fourstore"; - run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fourStoreUser}"; + run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fourStoreUser}"; in with lib; { diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index c6875af506d35f9c7fd343d82fa857f399de6d83..46bc6fc5c1320f78390899ca4dbaaa22d8636c55 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -40,11 +40,7 @@ in description = "The port to bind to"; }; - socket = mkOption { - default = ""; - description = "Unix socket path to listen on. Setting this will disable network support"; - example = "/var/run/memcached"; - }; + enableUnixSocket = mkEnableOption "unix socket at /run/memcached/memcached.sock"; maxMemory = mkOption { default = 64; @@ -68,31 +64,40 @@ in config = mkIf config.services.memcached.enable { - users.extraUsers.memcached = - { name = cfg.user; - uid = config.ids.uids.memcached; - description = "Memcached server user"; - }; + users.extraUsers = optional (cfg.user == "memcached") { + name = "memcached"; + description = "Memcached server user"; + }; environment.systemPackages = [ memcached ]; - systemd.services.memcached = - { description = "Memcached server"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - ExecStart = - let - networking = if cfg.socket != "" - then "-s ${cfg.socket}" - else "-l ${cfg.listen} -p ${toString cfg.port}"; - in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}"; - - User = cfg.user; - }; + systemd.services.memcached = { + description = "Memcached server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + PermissionsStartOnly = true; + ExecStartPre = optionals cfg.enableUnixSocket [ + "${pkgs.coreutils}/bin/install -d -o ${cfg.user} /run/memcached/" + "${pkgs.coreutils}/bin/chown -R ${cfg.user} /run/memcached/" + ]; + ExecStart = + let + networking = if cfg.enableUnixSocket + then "-s /run/memcached/memcached.sock" + else "-l ${cfg.listen} -p ${toString cfg.port}"; + in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}"; + + User = cfg.user; }; + }; }; + imports = [ + (mkRemovedOptionModule ["services" "memcached" "socket"] '' + This option was replaced by a fixed unix socket path at /run/memcached/memcached.sock enabled using services.memached.enableUnixSocket. + '') + ]; } diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index a3bf4f9ba925c53a7416d99fa89ec648a9130d21..21a131b90a8115f6277cf8ce3f63867b519189ae 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -7,14 +7,12 @@ let cfg = config.services.mysql; mysql = cfg.package; - - isMariaDB = + + isMariaDB = let pName = _p: (builtins.parseDrvName (_p.name)).name; in pName mysql == pName pkgs.mariadb; - atLeast55 = versionAtLeast mysql.mysqlVersion "5.5"; - pidFile = "${cfg.pidDir}/mysqld.pid"; mysqldOptions = @@ -28,13 +26,6 @@ let ${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) - '' - master-host = ${cfg.replication.masterHost} - master-user = ${cfg.replication.masterUser} - master-password = ${cfg.replication.masterPassword} - master-port = ${toString cfg.replication.masterPort} - ''} ${optionalString (cfg.ensureUsers != []) '' plugin-load-add = auth_socket.so @@ -142,7 +133,7 @@ in ''; example = [ "nextcloud" - "piwik" + "matomo" ]; }; @@ -298,10 +289,10 @@ in # Create initial databases if ! test -e "${cfg.dataDir}/${database.name}"; then echo "Creating initial database: ${database.name}" - ( echo "create database ${database.name};" + ( echo 'create database `${database.name}`;' ${optionalString (database ? "schema") '' - echo "use ${database.name};" + echo 'use `${database.name}`;' if [ -f "${database.schema}" ] then @@ -315,7 +306,7 @@ in fi '') cfg.initialDatabases} - ${optionalString (cfg.replication.role == "master" && atLeast55) + ${optionalString (cfg.replication.role == "master") '' # Set up the replication master @@ -326,7 +317,7 @@ in ) | ${mysql}/bin/mysql -u root -N ''} - ${optionalString (cfg.replication.role == "slave" && atLeast55) + ${optionalString (cfg.replication.role == "slave") '' # Set up the replication slave diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index e884098cb08d0fc5fe357f895b2f4744764faa95..a67c61eb99492cbcb857a4dcdcaa475535f25e1d 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -7,8 +7,10 @@ let cfg = config.services.openldap; openldap = pkgs.openldap; + dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; configFile = pkgs.writeText "slapd.conf" cfg.extraConfig; - + configOpts = if cfg.configDir == null then "-f ${configFile}" + else "-F ${cfg.configDir}"; in { @@ -81,6 +83,34 @@ in ''' ''; }; + + declarativeContents = mkOption { + type = with types; nullOr lines; + default = null; + description = '' + Declarative contents for the LDAP database, in LDIF format. + + Note a few facts when using it. First, the database + must be stored in the directory defined by + dataDir. Second, all dataDir will be erased + when starting the LDAP server. Third, modifications to the database + are not prevented, they are just dropped on the next reboot of the + server. Finally, performance-wise the database and indexes are rebuilt + on each server startup, so this will slow down server startup, + especially with large databases. + ''; + example = '' + dn: dc=example,dc=org + objectClass: domain + dc: example + + dn: ou=users,dc=example,dc=org + objectClass = organizationalUnit + ou: users + + # ... + ''; + }; }; }; @@ -88,7 +118,7 @@ in ###### implementation - config = mkIf config.services.openldap.enable { + config = mkIf cfg.enable { environment.systemPackages = [ openldap ]; @@ -98,11 +128,21 @@ in after = [ "network.target" ]; preStart = '' mkdir -p /var/run/slapd - chown -R ${cfg.user}:${cfg.group} /var/run/slapd - mkdir -p ${cfg.dataDir} - chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir} + chown -R "${cfg.user}:${cfg.group}" /var/run/slapd + ${optionalString (cfg.declarativeContents != null) '' + rm -Rf "${cfg.dataDir}" + ''} + mkdir -p "${cfg.dataDir}" + ${optionalString (cfg.declarativeContents != null) '' + ${openldap.out}/bin/slapadd ${configOpts} -l ${dataFile} + ''} + chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}" ''; - serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" ${if cfg.configDir == null then "-f "+configFile else "-F "+cfg.configDir}"; + serviceConfig.ExecStart = + "${openldap.out}/libexec/slapd -d 0 " + + "-u '${cfg.user}' -g '${cfg.group}' " + + "-h '${concatStringsSep " " cfg.urlList}' " + + "${configOpts}"; }; users.extraUsers.openldap = diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index 86733a3e5a075d642f2af75082831dd28775e941..d1b48c06440e5a88ce777028333c96b3de059686 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -22,7 +22,7 @@ let web_root = ${cfg.package}/etc/pgmanage/web_root - data_root = ${cfg.dataRoot} + sql_root = ${cfg.sqlRoot} ${optionalString (!isNull cfg.tls) '' tls_cert = ${cfg.tls.cert} @@ -130,7 +130,7 @@ let ''; }; - dataRoot = mkOption { + sqlRoot = mkOption { type = types.str; default = "/var/lib/pgmanage"; description = '' @@ -210,7 +210,7 @@ in { users."${pgmanage}" = { name = pgmanage; group = pgmanage; - home = cfg.dataRoot; + home = cfg.sqlRoot; createHome = true; }; groups."${pgmanage}" = { diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 9b5e3735239fffc3042ab3ddefba7389a77c7827..f022e0863dfd375982a79070e963e910e140eab4 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -36,9 +36,6 @@ let ${cfg.extraConfig} ''; - pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4"; - - in { @@ -122,7 +119,7 @@ in extraPlugins = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]"; + example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]"; description = '' When this list contains elements a new store path is created. PostgreSQL and the elements are symlinked into it. Then pg_config, @@ -182,7 +179,7 @@ in services.postgresql.authentication = mkAfter '' # Generated file; do not edit! - local all all ident ${optionalString pre84 "sameuser"} + local all all ident host all all 127.0.0.1/32 md5 host all all ::1/128 md5 ''; diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index a039ad138f6fce97c9f1c56ba623e12f377d011b..e4e38a4364a0da0422b9e920000801ebbf6c931b 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -219,7 +219,6 @@ in users.extraUsers.redis = { name = cfg.user; - uid = config.ids.uids.redis; description = "Redis database user"; }; diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 55ed2d9ee21b67db2bda8db7561fdfaf2f149b80..cca98c43dc7a2da31f6e157362a054603d9c77cb 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -28,14 +28,15 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.at-spi2-core.enable { - - environment.systemPackages = [ pkgs.at_spi2_core ]; - - services.dbus.packages = [ pkgs.at_spi2_core ]; - - systemd.packages = [ pkgs.at_spi2_core ]; - - }; - + config = mkMerge [ + (mkIf config.services.gnome3.at-spi2-core.enable { + environment.systemPackages = [ pkgs.at-spi2-core ]; + services.dbus.packages = [ pkgs.at-spi2-core ]; + systemd.packages = [ pkgs.at-spi2-core ]; + }) + + (mkIf (!config.services.gnome3.at-spi2-core.enable) { + environment.variables.NO_AT_BRIDGE = "1"; + }) + ]; } diff --git a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix new file mode 100644 index 0000000000000000000000000000000000000000..2740a22c7ca0df973d8f834fe650dc9da6f307bb --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix @@ -0,0 +1,27 @@ +# Chrome GNOME Shell native host connector. +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + options = { + services.gnome3.chrome-gnome-shell.enable = mkEnableOption '' + Chrome GNOME Shell native host connector, a DBus service + allowing to install GNOME Shell extensions from a web browser. + ''; + }; + + + ###### implementation + config = mkIf config.services.gnome3.chrome-gnome-shell.enable { + environment.etc = { + "chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; + "opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; + }; + + environment.systemPackages = [ pkgs.chrome-gnome-shell ]; + + services.dbus.packages = [ pkgs.chrome-gnome-shell ]; + }; +} diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix index 86a47488d8658235216594299a185e85fce54e58..7e312a1b81eb3ee39fde9608e69e419b5c2089a2 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.gnome3.evolution-data-server.enable { - environment.systemPackages = [ pkgs.gnome3.evolution_data_server ]; + environment.systemPackages = [ pkgs.gnome3.evolution-data-server ]; - services.dbus.packages = [ pkgs.gnome3.evolution_data_server ]; + services.dbus.packages = [ pkgs.gnome3.evolution-data-server ]; - systemd.packages = [ pkgs.gnome3.evolution_data_server ]; + systemd.packages = [ pkgs.gnome3.evolution-data-server ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index 2a68af5a7dd891e993fcfe522bccae419d313cd1..aa1165ab3bba63b7987ef7c1f130f7a3a28414b0 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -31,9 +31,9 @@ with lib; config = mkIf config.services.gnome3.gnome-keyring.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_keyring ]; + environment.systemPackages = [ pkgs.gnome3.gnome-keyring ]; - services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ]; + services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix index 0da4aca73ecb92bbb4e0ebdc9e69e4138d2f7058..4286251357f7eafb5538c67874e77fd4eb105d80 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix @@ -30,9 +30,9 @@ with lib; config = mkIf config.services.gnome3.gnome-online-accounts.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ]; + environment.systemPackages = [ pkgs.gnome3.gnome-online-accounts ]; - services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ]; + services.dbus.packages = [ pkgs.gnome3.gnome-online-accounts ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix index 3ac767bfa00d1c0f0a4ca5bfeab668651a0fabfc..fd14efee5f2ea610440e81fcd1770bf72ad65079 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.gnome3.gnome-terminal-server.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_terminal ]; + environment.systemPackages = [ pkgs.gnome3.gnome-terminal ]; - services.dbus.packages = [ pkgs.gnome3.gnome_terminal ]; + services.dbus.packages = [ pkgs.gnome3.gnome-terminal ]; - systemd.packages = [ pkgs.gnome3.gnome_terminal ]; + systemd.packages = [ pkgs.gnome3.gnome-terminal ]; }; diff --git a/nixos/modules/services/desktops/gnome3/tracker-miners.nix b/nixos/modules/services/desktops/gnome3/tracker-miners.nix new file mode 100644 index 0000000000000000000000000000000000000000..20154fc2fed35c6c2d164a11131271748cce0c4a --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/tracker-miners.nix @@ -0,0 +1,41 @@ +# Tracker Miners daemons. + +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.gnome3.tracker-miners = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable Tracker miners, indexing services for Tracker + search engine and metadata storage system. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.gnome3.tracker-miners.enable { + + environment.systemPackages = [ pkgs.gnome3.tracker-miners ]; + + services.dbus.packages = [ pkgs.gnome3.tracker-miners ]; + + systemd.packages = [ pkgs.gnome3.tracker-miners ]; + + }; + +} diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix new file mode 100644 index 0000000000000000000000000000000000000000..263a06156f84b75bc2c4dddf8abef162864ee21d --- /dev/null +++ b/nixos/modules/services/desktops/pipewire.nix @@ -0,0 +1,23 @@ +# pipewire service. +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + options = { + services.pipewire = { + enable = mkEnableOption "pipewire service"; + }; + }; + + + ###### implementation + config = mkIf config.services.pipewire.enable { + environment.systemPackages = [ pkgs.pipewire ]; + + systemd.packages = [ pkgs.pipewire ]; + }; + + meta.maintainers = with lib.maintainers; [ jtojnar ]; +} diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix index 2554f3a1666fc9dd20cb8ce364b7cb3beb503eb2..f5401c180984f376633a15033c2e0e48e21aa61e 100644 --- a/nixos/modules/services/desktops/telepathy.nix +++ b/nixos/modules/services/desktops/telepathy.nix @@ -30,9 +30,9 @@ with lib; config = mkIf config.services.telepathy.enable { - environment.systemPackages = [ pkgs.telepathy_mission_control ]; + environment.systemPackages = [ pkgs.telepathy-mission-control ]; - services.dbus.packages = [ pkgs.telepathy_mission_control ]; + services.dbus.packages = [ pkgs.telepathy-mission-control ]; }; diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 2c5a0c4849efd4841f2d4e7eb3b0941617735370..ba7ec967919e7f553ac6af31be24130862977c8d 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -7,7 +7,7 @@ let cfg = config.services.emacs; editorScript = pkgs.writeScriptBin "emacseditor" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} if [ -z "$1" ]; then exec ${cfg.package}/bin/emacsclient --create-frame --alternate-editor ${cfg.package}/bin/emacs else @@ -15,6 +15,25 @@ let fi ''; +desktopApplicationFile = pkgs.writeTextFile { + name = "emacsclient.desktop"; + destination = "/share/applications/emacsclient.desktop"; + text = '' +[Desktop Entry] +Name=Emacsclient +GenericName=Text Editor +Comment=Edit text +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=emacseditor %F +Icon=emacs +Type=Application +Terminal=false +Categories=Development;TextEditor; +StartupWMClass=Emacs +Keywords=Text;Editor; +''; +}; + in { options.services.emacs = { @@ -74,7 +93,7 @@ in { }; } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; }; - environment.systemPackages = [ cfg.package editorScript ]; + environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ]; environment.variables = { # This is required so that GTK applications launched from Emacs diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 1dc8ce93a0e5c8cced153cd93bf3c7b2b4bf6f4d..3f6bf9de8931b260ec630de02d962f4a2ad945e9 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -6,7 +6,7 @@ let cfg = config.services.factorio; factorio = pkgs.factorio-headless; name = "Factorio"; - stateDir = "/var/lib/factorio"; + stateDir = cfg.stateDir; mkSavePath = name: "${stateDir}/saves/${name}.zip"; configFile = pkgs.writeText "factorio.conf" '' use-system-read-write-data-directories=true @@ -25,7 +25,7 @@ let password = cfg.password; token = cfg.token; game_password = cfg.game-password; - require_user_verification = true; + require_user_verification = cfg.requireUserVerification; max_upload_in_kilobytes_per_second = 0; minimum_latency_in_ticks = 0; ignore_player_limit_for_returning_players = false; @@ -80,6 +80,15 @@ in customizations. ''; }; + stateDir = mkOption { + type = types.path; + default = "/var/lib/factorio"; + description = '' + The server's data directory. + + The configuration and map will be stored here. + ''; + }; mods = mkOption { type = types.listOf types.package; default = []; @@ -148,6 +157,13 @@ in Game password. ''; }; + requireUserVerification = mkOption { + type = types.bool; + default = true; + description = '' + When set to true, the server will only allow clients that have a valid factorio.com account. + ''; + }; autosave-interval = mkOption { type = types.nullOr types.int; default = null; diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix deleted file mode 100644 index 71ff6bb2f3f06e794ec6442331c169199336658c..0000000000000000000000000000000000000000 --- a/nixos/modules/services/games/ghost-one.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; -let - - cfg = config.services.ghostOne; - ghostUser = "ghostone"; - stateDir = "/var/lib/ghost-one"; - -in -{ - - ###### interface - - options = { - services.ghostOne = { - - enable = mkOption { - default = false; - description = "Enable Ghost-One Warcraft3 game hosting server."; - }; - - language = mkOption { - default = "English"; - type = types.enum [ "English" "Spanish" "Russian" "Serbian" "Turkish" ]; - description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish."; - }; - - war3path = mkOption { - default = ""; - description = '' - The path to your local Warcraft III directory, which must contain war3.exe, storm.dll, and game.dll. - ''; - }; - - mappath = mkOption { - default = ""; - description = '' - The path to the directory where you keep your map files. GHost One doesn't require - map files but if it has access to them it can send them to players and automatically - calculate most map config values. GHost One will search [bot_mappath + map_localpath] - for the map file (map_localpath is set in each map's config file). - ''; - }; - - config = mkOption { - default = ""; - description = "Extra configuration options."; - }; - - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - - users.extraUsers = singleton - { name = ghostUser; - uid = config.ids.uids.ghostone; - description = "Ghost One game server user"; - home = stateDir; - }; - - users.extraGroups = singleton - { name = ghostUser; - gid = config.ids.gids.ghostone; - }; - - services.ghostOne.config = '' -# bot_log = /dev/stderr - bot_language = ${pkgs.ghostOne}/share/ghost-one/languages/${cfg.language}.cfg - bot_war3path = ${cfg.war3path} - - bot_mapcfgpath = mapcfgs - bot_savegamepath = savegames - bot_mappath = ${cfg.mappath} - bot_replaypath = replays - ''; - - systemd.services."ghost-one" = { - wantedBy = [ "multi-user.target" ]; - script = '' - mkdir -p ${stateDir} - cd ${stateDir} - chown ${ghostUser}:${ghostUser} . - - mkdir -p mapcfgs - chown ${ghostUser}:${ghostUser} mapcfgs - - mkdir -p replays - chown ${ghostUser}:${ghostUser} replays - - mkdir -p savegames - chown ${ghostUser}:${ghostUser} savegames - - ln -sf ${pkgs.writeText "ghost.cfg" cfg.config} ghost.cfg - ln -sf ${pkgs.ghostOne}/share/ghost-one/ip-to-country.csv - ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${ghostUser} \ - -c "LANG=C ${pkgs.ghostOne}/bin/ghost++" - ''; - }; - - }; - -} diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index bb17c8859d842af1a8d3048f1a48f45acb041428..0f05876aee32b217d3c86cd5b22718799650e937 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -31,7 +31,7 @@ let '' fn=$out/${name} echo "event=${handler.event}" > $fn - echo "action=${pkgs.writeScript "${name}.sh" (concatStringsSep "\n" [ "#! ${pkgs.bash}/bin/sh" handler.action ])}" >> $fn + echo "action=${pkgs.writeShellScriptBin "${name}.sh" handler.action }/bin/${name}.sh '%e'" >> $fn ''; in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // config.services.acpid.handlers)) } @@ -53,6 +53,12 @@ in description = "Whether to enable the ACPI daemon."; }; + logEvents = mkOption { + type = types.bool; + default = false; + description = "Log all event activity."; + }; + handlers = mkOption { type = types.attrsOf (types.submodule { options = { @@ -69,11 +75,33 @@ in }; }); - description = "Event handlers."; - default = {}; - example = { mute = { event = "button/mute.*"; action = "amixer set Master toggle"; }; }; - + description = '' + Event handlers. + + Handler can be a single command. + + ''; + default = {}; + example = { + ac-power = { + event = "ac_adapter/*"; + action = '' + vals=($1) # space separated string to array of multiple values + case ''${vals[3]} in + 00000000) + echo unplugged >> /tmp/acpi.log + ;; + 00000001) + echo plugged in >> /tmp/acpi.log + ;; + *) + echo unknown >> /tmp/acpi.log + ;; + esac + ''; + }; + }; }; powerEventCommands = mkOption { @@ -120,7 +148,7 @@ in ConditionPathExists = [ "/proc/acpi" ]; }; - script = "acpid --confdir ${acpiConfDir}"; + script = "acpid ${optionalString config.services.acpid.logEvents "--logevents"} --confdir ${acpiConfDir}"; }; }; diff --git a/nixos/modules/services/hardware/amd-hybrid-graphics.nix b/nixos/modules/services/hardware/amd-hybrid-graphics.nix deleted file mode 100644 index b0f9ff56d1b2c9abdbccab69333555c528c5490d..0000000000000000000000000000000000000000 --- a/nixos/modules/services/hardware/amd-hybrid-graphics.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - hardware.amdHybridGraphics.disable = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - Completely disable the AMD graphics card and use the - integrated graphics processor instead. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.hardware.amdHybridGraphics.disable { - systemd.services."amd-hybrid-graphics" = { - path = [ pkgs.bash ]; - description = "Disable AMD Card"; - after = [ "sys-kernel-debug.mount" ]; - 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'"; - 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 4a8cd86b0b11eeb0051f93fc3be6d4b4c49dbab6..d7ca8a431794656a10c533199dc0d1c72454f824 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -3,8 +3,8 @@ with lib; let - bluez-bluetooth = pkgs.bluez; cfg = config.hardware.bluetooth; + bluez-bluetooth = cfg.package; in { @@ -21,6 +21,16 @@ in { description = "Whether to power up the default Bluetooth controller on boot."; }; + package = mkOption { + type = types.package; + default = pkgs.bluez; + defaultText = "pkgs.bluez"; + example = "pkgs.bluez.override { enableMidi = true; }"; + description = '' + Which BlueZ package to use. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix new file mode 100644 index 0000000000000000000000000000000000000000..d8abde2a600a850fe9ae74ae6268019f54f16914 --- /dev/null +++ b/nixos/modules/services/hardware/fwupd.nix @@ -0,0 +1,90 @@ +# fwupd daemon. + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.fwupd; + originalEtc = + let + mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; }; + in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc); + extraTrustedKeys = + let + mkName = p: "pki/fwupd/${baseNameOf (toString p)}"; + mkEtcFile = p: nameValuePair (mkName p) { source = p; }; + in listToAttrs (map mkEtcFile cfg.extraTrustedKeys); +in { + + ###### interface + options = { + services.fwupd = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable fwupd, a DBus service that allows + applications to update firmware. + ''; + }; + + blacklistDevices = mkOption { + type = types.listOf types.string; + default = []; + example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ]; + description = '' + Allow blacklisting specific devices by their GUID + ''; + }; + + blacklistPlugins = mkOption { + type = types.listOf types.string; + default = []; + example = [ "udev" ]; + description = '' + Allow blacklisting specific plugins + ''; + }; + + extraTrustedKeys = mkOption { + type = types.listOf types.path; + default = []; + example = literalExample "[ /etc/nixos/fwupd/myfirmware.pem ]"; + description = '' + Installing a public key allows firmware signed with a matching private key to be recognized as trusted, which may require less authentication to install than for untrusted files. By default trusted firmware can be upgraded (but not downgraded) without the user or administrator password. Only very few keys are installed by default. + ''; + }; + }; + }; + + + ###### implementation + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.fwupd ]; + + environment.etc = { + "fwupd/daemon.conf" = { + source = pkgs.writeText "daemon.conf" '' + [fwupd] + BlacklistDevices=${lib.concatStringsSep ";" cfg.blacklistDevices} + BlacklistPlugins=${lib.concatStringsSep ";" cfg.blacklistPlugins} + ''; + }; + } // originalEtc // extraTrustedKeys; + + services.dbus.packages = [ pkgs.fwupd ]; + + services.udev.packages = [ pkgs.fwupd ]; + + systemd.packages = [ pkgs.fwupd ]; + + systemd.tmpfiles.rules = [ + "d /var/lib/fwupd 0755 root root -" + ]; + }; + + meta = { + maintainers = pkgs.fwupd.maintainers; + }; +} diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix index 9fe4021c4247429c379b5ab129940429f2ae3144..eb1713baa140ef6bb98523bac422fe874d90103e 100644 --- a/nixos/modules/services/hardware/nvidia-optimus.nix +++ b/nixos/modules/services/hardware/nvidia-optimus.nix @@ -23,7 +23,7 @@ let kernel = config.boot.kernelPackages; in ###### implementation config = lib.mkIf config.hardware.nvidiaOptimus.disable { - boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb"]; + boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb" "nvidia-drm"]; boot.kernelModules = [ "bbswitch" ]; boot.extraModulePackages = [ kernel.bbswitch ]; diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 018e82e58a3de046cfb580a3ad536b585fd0fa86..5a898631e0903a4f2b0aa9d0d3f596248175f674 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -55,7 +55,7 @@ in { enable = mkOption { default = false; description = '' - Whether to enable thinkfan, fan controller for ibm/lenovo thinkpads. + Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads. ''; }; diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index 38d0a3a1d75252e62778fb3abe602bb1c28856c0..fa0496114684317e2a8ae960e464e4a3a0b6ae6d 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -38,7 +38,7 @@ in { path = []; serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.trezord}/bin/trezord -f"; + ExecStart = "${pkgs.trezord}/bin/trezord-go"; User = "trezord"; }; }; diff --git a/nixos/modules/services/hardware/u2f.nix b/nixos/modules/services/hardware/u2f.nix new file mode 100644 index 0000000000000000000000000000000000000000..bb4b2f05f890cb361ec3acbb87c386ae27bc9a71 --- /dev/null +++ b/nixos/modules/services/hardware/u2f.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.u2f; +in { + options = { + hardware.u2f = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable U2F hardware support. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.libu2f-host ]; + }; +} + diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 9f42f9e59ad5e0f1d3973606daa8984e98f51c41..7bfc3bb6487270aec75d5a30ba21cfcf9a08023a 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -146,7 +146,7 @@ let echo "Generating hwdb database..." # hwdb --update doesn't return error code even on errors! - res="$(${udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)" + res="$(${pkgs.buildPackages.udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)" echo "$res" [ -z "$(echo "$res" | egrep '^Error')" ] mv etc/udev/hwdb.bin $out diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix new file mode 100644 index 0000000000000000000000000000000000000000..7ebd49fa01c2752354068c59e880effd385bc24f --- /dev/null +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + defaultUserGroup = "usbmux"; + apple = "05ac"; + + cfg = config.services.usbmuxd; + +in + +{ + options.services.usbmuxd = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the usbmuxd ("USB multiplexing daemon") service. This daemon is + in charge of multiplexing connections over USB to an iOS device. This is + needed for transferring data from and to iOS devices (see ifuse). Also + this may enable plug-n-play tethering for iPhones. + ''; + }; + + user = mkOption { + type = types.str; + default = defaultUserGroup; + description = '' + The user usbmuxd should use to run after startup. + ''; + }; + + group = mkOption { + type = types.str; + default = defaultUserGroup; + description = '' + The group usbmuxd should use to run after startup. + ''; + }; + }; + + config = mkIf cfg.enable { + + users.extraUsers = optional (cfg.user == defaultUserGroup) { + name = cfg.user; + description = "usbmuxd user"; + group = cfg.group; + }; + + users.extraGroups = optional (cfg.group == defaultUserGroup) { + name = cfg.group; + }; + + # Give usbmuxd permission for Apple devices + services.udev.extraRules = '' + SUBSYSTEM=="usb", ATTR{idVendor}=="${apple}", GROUP="${cfg.group}" + ''; + + systemd.services.usbmuxd = { + description = "usbmuxd"; + wantedBy = [ "multi-user.target" ]; + unitConfig.Documentation = "man:usbmuxd(8)"; + serviceConfig = { + # Trigger the udev rule manually. This doesn't require replugging the + # device when first enabling the option to get it to work + ExecStartPre = "${pkgs.libudev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; + ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f"; + }; + }; + + }; +} diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index a0dc0d6d089dee76a083d2a307d59c9112cfb8cb..95f31829882ff75acf45a04e8d4daa41113b9748 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -141,7 +141,7 @@ in JAVA_HOME = jre; GRAYLOG_CONF = "${confFile}"; }; - path = [ pkgs.openjdk8 pkgs.which pkgs.procps ]; + path = [ pkgs.jre_headless pkgs.which pkgs.procps ]; preStart = '' mkdir -p /var/lib/graylog -m 755 diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 2a8ac414720b7665f8f4d521d867ca7608ddc695..a4cab0c94cdccc6539bde652fdcca4e034b6b652 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -8,7 +8,7 @@ let defaultRules = pkgs.runCommand "logcheck-default-rules" {} '' cp -prd ${pkgs.logcheck}/etc/logcheck $out chmod u+w $out - rm $out/logcheck.* + rm -r $out/logcheck.* ''; rulesDir = pkgs.symlinkJoin diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index b4abd2cd7e5ebbfa7a2bbb2632ce07dc921f4e26..28d89a7463ab7d419e7a1f8eb594cdfbbceb20e7 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -103,7 +103,7 @@ in listenAddress = mkOption { type = types.str; - default = "0.0.0.0"; + default = "127.0.0.1"; description = "Address on which to start webserver."; }; diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix new file mode 100644 index 0000000000000000000000000000000000000000..8f4f39aa72889046f41a853f18b33cca61e78b14 --- /dev/null +++ b/nixos/modules/services/mail/clamsmtp.nix @@ -0,0 +1,179 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.clamsmtp; + clamdSocket = "/run/clamav/clamd.ctl"; # See services/security/clamav.nix +in +{ + ##### interface + options = { + services.clamsmtp = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable clamsmtp."; + }; + + instances = mkOption { + description = "Instances of clamsmtp to run."; + type = types.listOf (types.submodule { options = { + action = mkOption { + type = types.enum [ "bounce" "drop" "pass" ]; + default = "drop"; + description = + '' + Action to take when a virus is detected. + + Note that viruses often spoof sender addresses, so bouncing is + in most cases not a good idea. + ''; + }; + + header = mkOption { + type = types.str; + default = ""; + example = "X-Virus-Scanned: ClamAV using ClamSMTP"; + description = + '' + A header to add to scanned messages. See clamsmtpd.conf(5) for + more details. Empty means no header. + ''; + }; + + keepAlives = mkOption { + type = types.int; + default = 0; + description = + '' + Number of seconds to wait between each NOOP sent to the sending + server. 0 to disable. + + This is meant for slow servers where the sending MTA times out + waiting for clamd to scan the file. + ''; + }; + + listen = mkOption { + type = types.str; + example = "127.0.0.1:10025"; + description = + '' + Address to wait for incoming SMTP connections on. See + clamsmtpd.conf(5) for more details. + ''; + }; + + quarantine = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to quarantine files that contain viruses by leaving them + in the temporary directory. + ''; + }; + + maxConnections = mkOption { + type = types.int; + default = 64; + description = "Maximum number of connections to accept at once."; + }; + + outAddress = mkOption { + type = types.str; + description = + '' + Address of the SMTP server to send email to once it has been + scanned. + ''; + }; + + tempDirectory = mkOption { + type = types.str; + default = "/tmp"; + description = + '' + Temporary directory that needs to be accessible to both clamd + and clamsmtpd. + ''; + }; + + timeout = mkOption { + type = types.int; + default = 180; + description = "Time-out for network connections."; + }; + + transparentProxy = mkOption { + type = types.bool; + default = false; + description = "Enable clamsmtp's transparent proxy support."; + }; + + virusAction = mkOption { + type = with types; nullOr path; + default = null; + description = + '' + Command to run when a virus is found. Please see VIRUS ACTION in + clamsmtpd(8) for a discussion of this option and its safe use. + ''; + }; + + xClient = mkOption { + type = types.bool; + default = false; + description = + '' + Send the XCLIENT command to the receiving server, for forwarding + client addresses and connection information if the receiving + server supports this feature. + ''; + }; + };}); + }; + }; + }; + + ##### implementation + config = let + configfile = conf: pkgs.writeText "clamsmtpd.conf" + '' + Action: ${conf.action} + ClamAddress: ${clamdSocket} + Header: ${conf.header} + KeepAlives: ${toString conf.keepAlives} + Listen: ${conf.listen} + Quarantine: ${if conf.quarantine then "on" else "off"} + MaxConnections: ${toString conf.maxConnections} + OutAddress: ${conf.outAddress} + TempDirectory: ${conf.tempDirectory} + TimeOut: ${toString conf.timeout} + TransparentProxy: ${if conf.transparentProxy then "on" else "off"} + User: clamav + ${optionalString (conf.virusAction != null) "VirusAction: ${conf.virusAction}"} + XClient: ${if conf.xClient then "on" else "off"} + ''; + in + mkIf cfg.enable { + assertions = [ + { assertion = config.services.clamav.daemon.enable; + message = "clamsmtp requires clamav to be enabled"; + } + ]; + + systemd.services = listToAttrs (imap1 (i: conf: + nameValuePair "clamsmtp-${toString i}" { + description = "ClamSMTP instance ${toString i}"; + wantedBy = [ "multi-user.target" ]; + script = "exec ${pkgs.clamsmtp}/bin/clamsmtpd -f ${configfile conf}"; + after = [ "clamav-daemon.service" ]; + requires = [ "clamav-daemon.service" ]; + serviceConfig.Type = "forking"; + serviceConfig.PrivateTmp = "yes"; + unitConfig.JoinsNamespaceOf = "clamav-daemon.service"; + } + ) cfg.instances); + }; +} diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix new file mode 100644 index 0000000000000000000000000000000000000000..894b88e25c1b2f72534404dbe38e0a266202fadc --- /dev/null +++ b/nixos/modules/services/mail/dkimproxy-out.nix @@ -0,0 +1,118 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.dkimproxy-out; + keydir = "/var/lib/dkimproxy-out"; + privkey = "${keydir}/private.key"; + pubkey = "${keydir}/public.key"; +in +{ + ##### interface + options = { + services.dkimproxy-out = { + enable = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to enable dkimproxy_out. + + Note that a key will be auto-generated, and can be found in + ${keydir}. + ''; + }; + + listen = mkOption { + type = types.str; + example = "127.0.0.1:10027"; + description = "Address:port DKIMproxy should listen on."; + }; + + relay = mkOption { + type = types.str; + example = "127.0.0.1:10028"; + description = "Address:port DKIMproxy should forward mail to."; + }; + + domains = mkOption { + type = with types; listOf str; + example = [ "example.org" "example.com" ]; + description = "List of domains DKIMproxy can sign for."; + }; + + selector = mkOption { + type = types.str; + example = "selector1"; + description = + '' + The selector to use for DKIM key identification. + + For example, if 'selector1' is used here, then for each domain + 'example.org' given in `domain`, 'selector1._domainkey.example.org' + should contain the TXT record indicating the public key is the one + in ${pubkey}: "v=DKIM1; t=s; p=[THE PUBLIC KEY]". + ''; + }; + + keySize = mkOption { + type = types.int; + default = 2048; + description = + '' + Size of the RSA key to use to sign outgoing emails. Note that the + maximum mandatorily verified as per RFC6376 is 2048. + ''; + }; + + # TODO: allow signature for other schemes than dkim(c=relaxed/relaxed)? + # This being the scheme used by gmail, maybe nothing more is needed for + # reasonable use. + }; + }; + + ##### implementation + config = let + configfile = pkgs.writeText "dkimproxy_out.conf" + '' + listen ${cfg.listen} + relay ${cfg.relay} + + domain ${concatStringsSep "," cfg.domains} + selector ${cfg.selector} + + signature dkim(c=relaxed/relaxed) + + keyfile ${privkey} + ''; + in + mkIf cfg.enable { + users.groups.dkimproxy-out = {}; + users.users.dkimproxy-out = { + description = "DKIMproxy_out daemon"; + group = "dkimproxy-out"; + isSystemUser = true; + }; + + systemd.services.dkimproxy-out = { + description = "DKIMproxy_out"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + if [ ! -d "${keydir}" ]; then + mkdir -p "${keydir}" + chmod 0700 "${keydir}" + ${pkgs.openssl}/bin/openssl genrsa -out "${privkey}" ${toString cfg.keySize} + ${pkgs.openssl}/bin/openssl rsa -in "${privkey}" -pubout -out "${pubkey}" + chown -R dkimproxy-out:dkimproxy-out "${keydir}" + fi + ''; + script = '' + exec ${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile} + ''; + serviceConfig = { + User = "dkimproxy-out"; + PermissionsStartOnly = true; + }; + }; + }; +} diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 18101a3122544d844c9df4886048deebb55269e7..543e732127a538661ef801ddf2088f74d195a0be 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -30,6 +30,7 @@ let '' default_internal_user = ${cfg.user} + default_internal_group = ${cfg.group} ${optionalString (cfg.mailUser != null) "mail_uid = ${cfg.mailUser}"} ${optionalString (cfg.mailGroup != null) "mail_gid = ${cfg.mailGroup}"} @@ -104,7 +105,7 @@ let }; mailboxConfig = mailbox: '' - mailbox ${mailbox.name} { + mailbox "${mailbox.name}" { auto = ${toString mailbox.auto} '' + optionalString (mailbox.specialUse != null) '' special_use = \${toString mailbox.specialUse} @@ -113,7 +114,7 @@ let mailboxes = { lib, pkgs, ... }: { options = { name = mkOption { - type = types.str; + type = types.strMatching ''[^"]+''; example = "Spam"; description = "The name of the mailbox."; }; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 867c0ea6761c5d335f8569c4117c3522e9e4faae..5ab331ac067fdc091399ca2678d0ef3b8cc38ca8 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -15,20 +15,18 @@ let haveVirtual = cfg.virtual != ""; clientAccess = - if (cfg.dnsBlacklistOverrides != "") - then [ "check_client_access hash:/etc/postfix/client_access" ] - else []; + optional (cfg.dnsBlacklistOverrides != "") + "check_client_access hash:/etc/postfix/client_access"; dnsBl = - if (cfg.dnsBlacklists != []) - then [ (concatStringsSep ", " (map (s: "reject_rbl_client " + s) cfg.dnsBlacklists)) ] - else []; + optionals (cfg.dnsBlacklists != []) + (map (s: "reject_rbl_client " + s) cfg.dnsBlacklists); clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl); mainCf = let escape = replaceStrings ["$"] ["$$"]; - mkList = items: "\n " + concatStringsSep "\n " items; + mkList = items: "\n " + concatStringsSep ",\n " items; mkVal = value: if isList value then mkList value else " " + (if value == true then "yes" @@ -36,72 +34,9 @@ let else toString value); mkEntry = name: value: "${escape name} =${mkVal value}"; in - concatStringsSep "\n" (mapAttrsToList mkEntry (recursiveUpdate defaultConf cfg.config)) + concatStringsSep "\n" (mapAttrsToList mkEntry cfg.config) + "\n" + cfg.extraConfig; - 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"; - - # 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.relayHost == "" then "" else - if cfg.lookupMX - then "${cfg.relayHost}:${toString cfg.relayPort}" - else "[${cfg.relayHost}]:${toString cfg.relayPort}"; - - 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/postfix/transport"; } - // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; } - // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } - // optionalAttrs cfg.useSrs { - sender_canonical_maps = "tcp:127.0.0.1:10001"; - sender_canonical_classes = "envelope_sender"; - recipient_canonical_maps = "tcp:127.0.0.1:10002"; - recipient_canonical_classes= "envelope_recipient"; - } - // 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; - - smtp_use_tls = true; - - smtpd_tls_CAfile = cfg.sslCACert; - smtpd_tls_cert_file = cfg.sslCert; - smtpd_tls_key_file = cfg.sslKey; - - smtpd_use_tls = true; - }; - masterCfOptions = { options, config, name, ... }: { options = { name = mkOption { @@ -479,7 +414,10 @@ in postmasterAlias = mkOption { type = types.str; default = "root"; - description = "Who should receive postmaster e-mail."; + description = " + Who should receive postmaster e-mail. Multiple values can be added by + separating values with comma. + "; }; rootAlias = mkOption { @@ -487,6 +425,7 @@ in default = ""; description = " Who should receive root e-mail. Blank for no redirection. + Multiple values can be added by separating values with comma. "; }; @@ -507,7 +446,6 @@ in config = mkOption { type = with types; attrsOf (either bool (either str (listOf str))); - default = defaultConf; description = '' The main.cf configuration file as key value set. ''; @@ -749,6 +687,67 @@ in ''; }; + services.postfix.config = (mapAttrs (_: v: mkDefault v) { + compatibility_level = "9999"; + mail_owner = cfg.user; + default_privs = "nobody"; + + # 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 = 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; + mail_spool_directory = "/var/spool/mail/"; + setgid_group = cfg.setgidGroup; + }) + // optionalAttrs (cfg.relayHost != "") { relayhost = if cfg.lookupMX + then "${cfg.relayHost}:${toString cfg.relayPort}" + else "[${cfg.relayHost}]:${toString cfg.relayPort}"; } + // optionalAttrs config.networking.enableIPv6 { inet_protocols = mkDefault "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/postfix/transport" ]; } + // optionalAttrs haveVirtual { virtual_alias_maps = [ "${cfg.virtualMapType}:/etc/postfix/virtual" ]; } + // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } + // optionalAttrs cfg.useSrs { + sender_canonical_maps = [ "tcp:127.0.0.1:10001" ]; + sender_canonical_classes = [ "envelope_sender" ]; + recipient_canonical_maps = [ "tcp:127.0.0.1:10002" ]; + recipient_canonical_classes = [ "envelope_recipient" ]; + } + // 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; + + smtp_use_tls = true; + + smtpd_tls_CAfile = cfg.sslCACert; + smtpd_tls_cert_file = cfg.sslCert; + smtpd_tls_key_file = cfg.sslKey; + + smtpd_use_tls = true; + }; + services.postfix.masterConfig = { smtp_inet = { name = "smtp"; diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 6d403e448e04750d841b9bc03513d99671f9579b..09fb587e74b56814ee13e23e49ba1eec9197d5b9 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -1,14 +1,152 @@ -{ config, lib, pkgs, ... }: +{ config, options, pkgs, lib, ... }: with lib; let cfg = config.services.rspamd; + opts = options.services.rspamd; - mkBindSockets = socks: concatStringsSep "\n" (map (each: " bind_socket = \"${each}\"") socks); + bindSocketOpts = {options, config, ... }: { + options = { + socket = mkOption { + type = types.str; + example = "localhost:11333"; + description = '' + Socket for this worker to listen on in a format acceptable by rspamd. + ''; + }; + mode = mkOption { + type = types.str; + default = "0644"; + description = "Mode to set on unix socket"; + }; + owner = mkOption { + type = types.str; + default = "${cfg.user}"; + description = "Owner to set on unix socket"; + }; + group = mkOption { + type = types.str; + default = "${cfg.group}"; + description = "Group to set on unix socket"; + }; + rawEntry = mkOption { + type = types.str; + internal = true; + }; + }; + config.rawEntry = let + maybeOption = option: + optionalString options.${option}.isDefined " ${option}=${config.${option}}"; + in + if (!(hasPrefix "/" config.socket)) then "${config.socket}" + else "${config.socket}${maybeOption "mode"}${maybeOption "owner"}${maybeOption "group"}"; + }; - rspamdConfFile = pkgs.writeText "rspamd.conf" + workerOpts = { name, ... }: { + options = { + enable = mkOption { + type = types.nullOr types.bool; + default = null; + description = "Whether to run the rspamd worker."; + }; + name = mkOption { + type = types.nullOr types.str; + default = name; + description = "Name of the worker"; + }; + type = mkOption { + type = types.nullOr (types.enum [ + "normal" "controller" "fuzzy_storage" "proxy" "lua" + ]); + description = "The type of this worker"; + }; + bindSockets = mkOption { + type = types.listOf (types.either types.str (types.submodule bindSocketOpts)); + default = []; + description = '' + List of sockets to listen, in format acceptable by rspamd + ''; + example = [{ + socket = "/run/rspamd.sock"; + mode = "0666"; + owner = "rspamd"; + } "*:11333"]; + apply = value: map (each: if (isString each) + then if (isUnixSocket each) + then {socket = each; owner = cfg.user; group = cfg.group; mode = "0644"; rawEntry = "${each}";} + else {socket = each; rawEntry = "${each}";} + else each) value; + }; + count = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Number of worker instances to run + ''; + }; + includes = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of files to include in configuration + ''; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional entries to put verbatim into worker section of rspamd config file."; + }; + }; + config = mkIf (name == "normal" || name == "controller" || name == "fuzzy") { + type = mkDefault name; + includes = mkDefault [ "$CONFDIR/worker-${name}.inc" ]; + bindSockets = mkDefault (if name == "normal" + then [{ + socket = "/run/rspamd/rspamd.sock"; + mode = "0660"; + owner = cfg.user; + group = cfg.group; + }] + else if name == "controller" + then [ "localhost:11334" ] + else [] ); + }; + }; + + indexOf = default: start: list: e: + if list == [] + then default + else if (head list) == e then start + else (indexOf default (start + (length (listenStreams (head list).socket))) (tail list) e); + + systemdSocket = indexOf (abort "Socket not found") 0 allSockets; + + isUnixSocket = socket: hasPrefix "/" (if (isString socket) then socket else socket.socket); + isPort = hasPrefix "*:"; + isIPv4Socket = hasPrefix "*v4:"; + isIPv6Socket = hasPrefix "*v6:"; + isLocalHost = hasPrefix "localhost:"; + listenStreams = socket: + if (isLocalHost socket) then + let port = (removePrefix "localhost:" socket); + in [ "127.0.0.1:${port}" ] ++ (if config.networking.enableIPv6 then ["[::1]:${port}"] else []) + else if (isIPv6Socket socket) then [removePrefix "*v6:" socket] + else if (isPort socket) then [removePrefix "*:" socket] + else if (isIPv4Socket socket) then + throw "error: IPv4 only socket not supported in rspamd with socket activation" + else if (length (splitString " " socket)) != 1 then + throw "error: string options not supported in rspamd with socket activation" + else [socket]; + + mkBindSockets = enabled: socks: concatStringsSep "\n " (flatten (map (each: + if cfg.socketActivation && enabled != false then + let systemd = (systemdSocket each); + in (imap (idx: e: "bind_socket = \"systemd:${toString (systemd + idx - 1)}\";") (listenStreams each.socket)) + else "bind_socket = \"${each.rawEntry}\";") socks)); + + rspamdConfFile = pkgs.writeText "rspamd.conf" '' .include "$CONFDIR/common.conf" @@ -22,17 +160,33 @@ let .include "$CONFDIR/logging.inc" } - worker { - ${mkBindSockets cfg.bindSocket} - .include "$CONFDIR/worker-normal.inc" - } + ${concatStringsSep "\n" (mapAttrsToList (name: value: '' + worker ${optionalString (value.name != "normal" && value.name != "controller") "${value.name}"} { + type = "${value.type}"; + ${optionalString (value.enable != null) + "enabled = ${if value.enable != false then "yes" else "no"};"} + ${mkBindSockets value.enable value.bindSockets} + ${optionalString (value.count != null) "count = ${toString value.count};"} + ${concatStringsSep "\n " (map (each: ".include \"${each}\"") value.includes)} + ${value.extraConfig} + } + '') cfg.workers)} - worker { - ${mkBindSockets cfg.bindUISocket} - .include "$CONFDIR/worker-controller.inc" - } + ${cfg.extraConfig} ''; + allMappedSockets = flatten (mapAttrsToList (name: value: + if value.enable != false + then imap (idx: each: { + name = "${name}"; + index = idx; + value = each; + }) value.bindSockets + else []) cfg.workers); + allSockets = map (e: e.value) allMappedSockets; + + allSocketNames = map (each: "rspamd-${each.name}-${toString each.index}.socket") allMappedSockets; + in { @@ -46,36 +200,52 @@ in enable = mkEnableOption "Whether to run the rspamd daemon."; debug = mkOption { + type = types.bool; default = false; description = "Whether to run the rspamd daemon in debug mode."; }; - bindSocket = mkOption { - type = types.listOf types.str; - default = [ - "/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}" - ]''; + socketActivation = mkOption { + type = types.bool; description = '' - List of sockets to listen, in format acceptable by rspamd + Enable systemd socket activation for rspamd. ''; - example = '' - bindSocket = [ - "/run/rspamd.sock mode=0666 owner=rspamd" - "*:11333" - ]; + }; + + workers = mkOption { + type = with types; attrsOf (submodule workerOpts); + description = '' + Attribute set of workers to start. + ''; + default = { + normal = {}; + controller = {}; + }; + example = literalExample '' + { + normal = { + includes = [ "$CONFDIR/worker-normal.inc" ]; + bindSockets = [{ + socket = "/run/rspamd/rspamd.sock"; + mode = "0660"; + owner = "${cfg.user}"; + group = "${cfg.group}"; + }]; + }; + controller = { + includes = [ "$CONFDIR/worker-controller.inc" ]; + bindSockets = [ "[::1]:11334" ]; + }; + } ''; }; - bindUISocket = mkOption { - type = types.listOf types.str; - default = [ - "localhost:11334" - ]; + extraConfig = mkOption { + type = types.lines; + default = ""; description = '' - List of sockets for web interface, in format acceptable by rspamd + Extra configuration to add at the end of the rspamd configuration + file. ''; }; @@ -102,6 +272,13 @@ in config = mkIf cfg.enable { + services.rspamd.socketActivation = mkDefault (!opts.bindSocket.isDefined && !opts.bindUISocket.isDefined); + + assertions = [ { + assertion = !cfg.socketActivation || !(opts.bindSocket.isDefined || opts.bindUISocket.isDefined); + message = "Can't use socketActivation for rspamd when using renamed bind socket options"; + } ]; + # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; @@ -117,17 +294,22 @@ in gid = config.ids.gids.rspamd; }; + environment.etc."rspamd.conf".source = rspamdConfFile; + systemd.services.rspamd = { description = "Rspamd Service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wantedBy = mkIf (!cfg.socketActivation) [ "multi-user.target" ]; + after = [ "network.target" ] ++ + (if cfg.socketActivation then allSocketNames else []); + requires = mkIf cfg.socketActivation allSocketNames; serviceConfig = { ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f"; Restart = "always"; RuntimeDirectory = "rspamd"; PrivateTmp = true; + Sockets = mkIf cfg.socketActivation (concatStringsSep " " allSocketNames); }; preStart = '' @@ -135,5 +317,25 @@ in ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd ''; }; + systemd.sockets = mkIf cfg.socketActivation + (listToAttrs (map (each: { + name = "rspamd-${each.name}-${toString each.index}"; + value = { + description = "Rspamd socket ${toString each.index} for worker ${each.name}"; + wantedBy = [ "sockets.target" ]; + listenStreams = (listenStreams each.value.socket); + socketConfig = { + BindIPv6Only = mkIf (isIPv6Socket each.value.socket) "ipv6-only"; + Service = "rspamd.service"; + SocketUser = mkIf (isUnixSocket each.value.socket) each.value.owner; + SocketGroup = mkIf (isUnixSocket each.value.socket) each.value.group; + SocketMode = mkIf (isUnixSocket each.value.socket) each.value.mode; + }; + }; + }) allMappedSockets)); }; + imports = [ + (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ]) + (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ]) + ]; } diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb index 84622622db70b4434be780553ada2ce5b17a07a6..0b58c59c7a5132a81736bc9cad368d67699b35c9 100644 --- a/nixos/modules/services/misc/defaultUnicornConfig.rb +++ b/nixos/modules/services/misc/defaultUnicornConfig.rb @@ -1,205 +1,69 @@ -# The following was taken from github.com/crohr/syslogger and is BSD -# licensed. -require 'syslog' -require 'logger' -require 'thread' +worker_processes 3 -class Syslogger - - VERSION = "1.6.0" - - attr_reader :level, :ident, :options, :facility, :max_octets - attr_accessor :formatter - - MAPPING = { - Logger::DEBUG => Syslog::LOG_DEBUG, - Logger::INFO => Syslog::LOG_INFO, - Logger::WARN => Syslog::LOG_WARNING, - Logger::ERROR => Syslog::LOG_ERR, - Logger::FATAL => Syslog::LOG_CRIT, - Logger::UNKNOWN => Syslog::LOG_ALERT - } - - # - # Initializes default options for the logger - # ident:: the name of your program [default=$0]. - # options:: syslog options [default=Syslog::LOG_PID | Syslog::LOG_CONS]. - # Correct values are: - # LOG_CONS : writes the message on the console if an error occurs when sending the message; - # LOG_NDELAY : no delay before sending the message; - # LOG_PERROR : messages will also be written on STDERR; - # LOG_PID : adds the process number to the message (just after the program name) - # facility:: the syslog facility [default=nil] Correct values include: - # Syslog::LOG_DAEMON - # Syslog::LOG_USER - # Syslog::LOG_SYSLOG - # Syslog::LOG_LOCAL2 - # Syslog::LOG_NEWS - # etc. - # - # Usage: - # logger = Syslogger.new("my_app", Syslog::LOG_PID | Syslog::LOG_CONS, Syslog::LOG_LOCAL0) - # logger.level = Logger::INFO # use Logger levels - # logger.warn "warning message" - # logger.debug "debug message" - # - def initialize(ident = $0, options = Syslog::LOG_PID | Syslog::LOG_CONS, facility = nil) - @ident = ident - @options = options || (Syslog::LOG_PID | Syslog::LOG_CONS) - @facility = facility - @level = Logger::INFO - @mutex = Mutex.new - @formatter = Logger::Formatter.new - end - - %w{debug info warn error fatal unknown}.each do |logger_method| - # Accepting *args as message could be nil. - # Default params not supported in ruby 1.8.7 - define_method logger_method.to_sym do |*args, &block| - return true if @level > Logger.const_get(logger_method.upcase) - message = args.first || block && block.call - add(Logger.const_get(logger_method.upcase), message) - end - - unless logger_method == 'unknown' - define_method "#{logger_method}?".to_sym do - @level <= Logger.const_get(logger_method.upcase) - end - end - end - - # Log a message at the Logger::INFO level. Useful for use with Rack::CommonLogger - def write(msg) - add(Logger::INFO, msg) - end - - # Logs a message at the Logger::INFO level. - def <<(msg) - add(Logger::INFO, msg) - end - - # Low level method to add a message. - # +severity+:: the level of the message. One of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN - # +message+:: the message string. - # If nil, the method will call the block and use the result as the message string. - # If both are nil or no block is given, it will use the progname as per the behaviour of both the standard Ruby logger, and the Rails BufferedLogger. - # +progname+:: optionally, overwrite the program name that appears in the log message. - def add(severity, message = nil, progname = nil, &block) - if message.nil? && block.nil? && !progname.nil? - message, progname = progname, nil - end - progname ||= @ident - - @mutex.synchronize do - Syslog.open(progname, @options, @facility) do |s| - s.mask = Syslog::LOG_UPTO(MAPPING[@level]) - communication = clean(message || block && block.call) - if self.max_octets - buffer = "#{tags_text}" - communication.bytes do |byte| - buffer.concat(byte) - # if the last byte we added is potentially part of an escape, we'll go ahead and add another byte - if buffer.bytesize >= self.max_octets && !['%'.ord,'\\'.ord].include?(byte) - s.log(MAPPING[severity],buffer) - buffer = "" - end - end - s.log(MAPPING[severity],buffer) unless buffer.empty? - else - s.log(MAPPING[severity],"#{tags_text}#{communication}") - end - end - end - end - - # Set the max octets of the messages written to the log - def max_octets=(max_octets) - @max_octets = max_octets - end - - # Sets the minimum level for messages to be written in the log. - # +level+:: one of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN - def level=(level) - level = Logger.const_get(level.to_s.upcase) if level.is_a?(Symbol) - - unless level.is_a?(Fixnum) - raise ArgumentError.new("Invalid logger level `#{level.inspect}`") - end - - @level = level - end - - # Sets the ident string passed along to Syslog - def ident=(ident) - @ident = ident - end - - # Tagging code borrowed from ActiveSupport gem - def tagged(*tags) - new_tags = push_tags(*tags) - yield self - ensure - pop_tags(new_tags.size) - end - - def push_tags(*tags) - tags.flatten.reject{ |i| i.respond_to?(:empty?) ? i.empty? : !i }.tap do |new_tags| - current_tags.concat new_tags - end - end - - def pop_tags(size = 1) - current_tags.pop size - end - - def clear_tags! - current_tags.clear - end - - protected - - # Borrowed from SyslogLogger. - def clean(message) - message = message.to_s.dup - message.strip! # remove whitespace - message.gsub!(/\n/, '\\n') # escape newlines - message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf) - message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes - message - end - - private - - def tags_text - tags = current_tags - if tags.any? - tags.collect { |tag| "[#{tag}] " }.join - end - end - - def current_tags - Thread.current[:syslogger_tagged_logging_tags] ||= [] - end -end +listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024 +listen "/run/gitlab/gitlab.socket", :backlog => 1024 -worker_processes 2 working_directory ENV["GITLAB_PATH"] -pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid" -listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024 +pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid" timeout 60 -logger Syslogger.new - +# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings +# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow preload_app true - GC.respond_to?(:copy_on_write_friendly=) and GC.copy_on_write_friendly = true check_client_connection false +before_fork do |server, worker| + # the following is highly recommended for Rails + "preload_app true" + # as there's no need for the master process to hold a connection + defined?(ActiveRecord::Base) and + ActiveRecord::Base.connection.disconnect! + + # The following is only recommended for memory/DB-constrained + # installations. It is not needed if your system can house + # twice as many worker_processes as you have configured. + # + # This allows a new master process to incrementally + # phase out the old master process with SIGTTOU to avoid a + # thundering herd (especially in the "preload_app false" case) + # when doing a transparent upgrade. The last worker spawned + # will then kill off the old master process with a SIGQUIT. + old_pid = "#{server.config[:pid]}.oldbin" + if old_pid != server.pid + begin + sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU + Process.kill(sig, File.read(old_pid).to_i) + rescue Errno::ENOENT, Errno::ESRCH + end + end + + # Throttle the master from forking too quickly by sleeping. Due + # to the implementation of standard Unix signal handlers, this + # helps (but does not completely) prevent identical, repeated signals + # from being lost when the receiving process is busy. + # sleep 1 +end + after_fork do |server, worker| + # per-process listener ports for debugging/admin/migrations + # addr = "127.0.0.1:#{9293 + worker.nr}" + # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true) + + # the following is *required* for Rails + "preload_app true", defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection + + # reset prometheus client, this will cause any opened metrics files to be closed + defined?(::Prometheus::Client.reinitialize_on_pid_change) && + Prometheus::Client.reinitialize_on_pid_change + + # if preload_app is true, then you may also want to check and + # restart any other shared sockets/descriptors such as Memcached, + # and Redis. TokyoCabinet file handles are safe to reuse + # between any number of forked children (assuming your kernel + # correctly implements pread()/pwrite() system calls) end diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index e96645c79c77269650fefeadd9a74606c3a05fc5..e4517c636e880f92d704bf7aef7da5fdeda79927 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -32,11 +32,17 @@ in description = "Whether to enable Disnix"; }; + enableMultiUser = mkOption { + type = types.bool; + default = true; + description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; + }; + useWebServiceInterface = mkOption { default = false; description = "Whether to enable the DisnixWebService interface running on Apache Tomcat"; }; - + package = mkOption { type = types.path; description = "The Disnix package"; @@ -51,8 +57,8 @@ in ###### implementation config = mkIf cfg.enable { - dysnomia.enable = true; - + services.dysnomia.enable = true; + environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; services.dbus.enable = true; @@ -71,7 +77,7 @@ in }; systemd.services = { - disnix = { + disnix = mkIf cfg.enableMultiUser { description = "Disnix server"; wants = [ "dysnomia.target" ]; wantedBy = [ "multi-user.target" ]; @@ -92,7 +98,7 @@ in } // (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {}) // (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {}); - + serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service"; }; diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index df44d0a54866a647927be8a1a7ca77b4f19fd199..9e66e0811ab7959c8a3b18d63e03bc5424a09406 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -3,8 +3,8 @@ with lib; let - cfg = config.dysnomia; - + cfg = config.services.dysnomia; + printProperties = properties: concatMapStrings (propertyName: let @@ -13,7 +13,7 @@ let if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties."${propertyName}")})\n" else "${propertyName}=\"${toString property}\"\n" ) (builtins.attrNames properties); - + properties = pkgs.stdenv.mkDerivation { name = "dysnomia-properties"; buildCommand = '' @@ -22,13 +22,13 @@ let EOF ''; }; - + containersDir = pkgs.stdenv.mkDerivation { name = "dysnomia-containers"; buildCommand = '' mkdir -p $out cd $out - + ${concatMapStrings (containerName: let containerProperties = cfg.containers."${containerName}"; @@ -42,11 +42,11 @@ let ) (builtins.attrNames cfg.containers)} ''; }; - + linkMutableComponents = {containerName}: '' mkdir ${containerName} - + ${concatMapStrings (componentName: let component = cfg.components."${containerName}"."${componentName}"; @@ -54,13 +54,13 @@ let "ln -s ${component} ${containerName}/${componentName}\n" ) (builtins.attrNames (cfg.components."${containerName}" or {}))} ''; - + componentsDir = pkgs.stdenv.mkDerivation { name = "dysnomia-components"; buildCommand = '' mkdir -p $out cd $out - + ${concatMapStrings (containerName: let components = cfg.components."${containerName}"; @@ -72,59 +72,59 @@ let in { options = { - dysnomia = { - + services.dysnomia = { + enable = mkOption { type = types.bool; default = false; description = "Whether to enable Dysnomia"; }; - + enableAuthentication = mkOption { type = types.bool; default = false; description = "Whether to publish privacy-sensitive authentication credentials"; }; - + package = mkOption { type = types.path; description = "The Dysnomia package"; }; - + properties = mkOption { description = "An attribute set in which each attribute represents a machine property. Optionally, these values can be shell substitutions."; default = {}; }; - + containers = mkOption { description = "An attribute set in which each key represents a container and each value an attribute set providing its configuration properties"; default = {}; }; - + components = mkOption { description = "An atttribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state"; default = {}; }; - + extraContainerProperties = mkOption { description = "An attribute set providing additional container settings in addition to the default properties"; default = {}; }; - + extraContainerPaths = mkOption { description = "A list of paths containing additional container configurations that are added to the search folders"; default = []; }; - + extraModulePaths = mkOption { description = "A list of paths containing additional modules that are added to the search folders"; default = []; }; }; }; - + config = mkIf cfg.enable { - + environment.etc = { "dysnomia/containers" = { source = containersDir; @@ -136,16 +136,16 @@ in source = properties; }; }; - + environment.variables = { DYSNOMIA_STATEDIR = "/var/state/dysnomia-nixos"; DYSNOMIA_CONTAINERS_PATH = "${lib.concatMapStrings (containerPath: "${containerPath}:") cfg.extraContainerPaths}/etc/dysnomia/containers"; DYSNOMIA_MODULES_PATH = "${lib.concatMapStrings (modulePath: "${modulePath}:") cfg.extraModulePaths}/etc/dysnomia/modules"; }; - + environment.systemPackages = [ cfg.package ]; - - dysnomia.package = pkgs.dysnomia.override (origArgs: { + + services.dysnomia.package = pkgs.dysnomia.override (origArgs: { enableApacheWebApplication = config.services.httpd.enable; enableAxis2WebService = config.services.tomcat.axis2.enable; enableEjabberdDump = config.services.ejabberd.enable; @@ -155,10 +155,10 @@ in enableTomcatWebApplication = config.services.tomcat.enable; enableMongoDatabase = config.services.mongodb.enable; }); - - dysnomia.properties = { + + services.dysnomia.properties = { hostname = config.networking.hostName; - system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system; + inherit (config.nixpkgs.localSystem) system; supportedTypes = (import "${pkgs.stdenv.mkDerivation { name = "supportedtypes"; @@ -173,8 +173,8 @@ in ''; }}"); }; - - dysnomia.containers = lib.recursiveUpdate ({ + + services.dysnomia.containers = lib.recursiveUpdate ({ process = {}; wrapper = {}; } @@ -192,9 +192,11 @@ in mysqlPassword = builtins.readFile (config.services.mysql.rootPassword); }; } - // lib.optionalAttrs (config.services.postgresql.enable && cfg.enableAuthentication) { postgresql-database = { - postgresqlUsername = "root"; - }; } + // lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = { + } // lib.optionalAttrs (cfg.enableAuthentication) { + postgresqlUsername = "postgres"; + }; + } // lib.optionalAttrs (config.services.tomcat.enable) { tomcat-webapplication = { tomcatPort = 8080; }; } diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix index 053e7e95635fdc39707de8b2d03c4bc855f8f189..164221cbab7fb2ba089fdfbfcac0f65a57842434 100644 --- a/nixos/modules/services/misc/folding-at-home.nix +++ b/nixos/modules/services/misc/folding-at-home.nix @@ -57,7 +57,7 @@ in { chown ${fahUser} ${stateDir} cp -f ${pkgs.writeText "client.cfg" cfg.config} ${stateDir}/client.cfg ''; - script = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'"; + script = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'"; }; services.foldingAtHome.config = '' diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix index 760fa66e80d6cc10ac919525f8c33c2dc23a627c..e0b9df96f8e8d30bc0e2fd9efeb6451e9523fe77 100644 --- a/nixos/modules/services/misc/geoip-updater.nix +++ b/nixos/modules/services/misc/geoip-updater.nix @@ -14,7 +14,7 @@ let # ExecStart= command with '@' doesn't work because we start a shell (new # process) that creates a new argv[0].) geoip-updater = pkgs.writeScriptBin "geoip-updater" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} skipExisting=0 debug() { diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index f0b44b7bedebcb4e9a7d318c3360e1f19bd91641..63e976ae566ca08a43f3ad72ec060231c6864dbf 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.gitea; + pg = config.services.postgresql; + usePostgresql = cfg.database.type == "postgres"; configFile = pkgs.writeText "app.ini" '' APP_NAME = ${cfg.appName} RUN_USER = ${cfg.user} @@ -16,6 +18,9 @@ let USER = ${cfg.database.user} PASSWD = #dbpass# PATH = ${cfg.database.path} + ${optionalString usePostgresql '' + SSL_MODE = disable + ''} [repository] ROOT = ${cfg.repositoryRoot} @@ -35,6 +40,10 @@ let SECRET_KEY = #secretkey# INSTALL_LOCK = true + [log] + ROOT_PATH = ${cfg.log.rootPath} + LEVEL = ${cfg.log.level} + ${cfg.extraConfig} ''; in @@ -60,6 +69,19 @@ in description = "gitea data directory."; }; + log = { + rootPath = mkOption { + default = "${cfg.stateDir}/log"; + type = types.str; + description = "Root path for log files."; + }; + level = mkOption { + default = "Trace"; + type = types.enum [ "Trace" "Debug" "Info" "Warn" "Error" "Critical" ]; + description = "General log level."; + }; + }; + user = mkOption { type = types.str; default = "gitea"; @@ -82,7 +104,7 @@ in port = mkOption { type = types.int; - default = 3306; + default = (if !usePostgresql then 3306 else pg.port); description = "Database host port."; }; @@ -123,6 +145,15 @@ in default = "${cfg.stateDir}/data/gitea.db"; description = "Path to the sqlite3 database file."; }; + + createDatabase = mkOption { + type = types.bool; + default = true; + description = '' + Whether to create a local postgresql database automatically. + This only applies if database type "postgres" is selected. + ''; + }; }; appName = mkOption { @@ -186,10 +217,11 @@ in }; config = mkIf cfg.enable { + services.postgresql.enable = mkIf usePostgresql (mkDefault true); systemd.services.gitea = { description = "gitea"; - after = [ "network.target" ]; + after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.gitea.bin ]; @@ -231,12 +263,31 @@ in mkdir -p ${cfg.stateDir}/conf cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale fi + '' + optionalString (usePostgresql && cfg.database.createDatabase) '' + if ! test -e "${cfg.stateDir}/db-created"; then + echo "CREATE ROLE ${cfg.database.user} + WITH ENCRYPTED PASSWORD '$(head -n1 ${cfg.database.passwordFile})' + NOCREATEDB NOCREATEROLE LOGIN" | + ${pkgs.sudo}/bin/sudo -u ${pg.superUser} ${pg.package}/bin/psql + ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \ + ${pg.package}/bin/createdb \ + --owner=${cfg.database.user} \ + --encoding=UTF8 \ + --lc-collate=C \ + --lc-ctype=C \ + --template=template0 \ + ${cfg.database.name} + touch "${cfg.stateDir}/db-created" + fi + '' + '' + chown ${cfg.user} -R ${cfg.stateDir} ''; serviceConfig = { Type = "simple"; User = cfg.user; WorkingDirectory = cfg.stateDir; + PermissionsStartOnly = true; ExecStart = "${pkgs.gitea.bin}/bin/gitea web"; Restart = "always"; }; @@ -253,6 +304,7 @@ in description = "Gitea Service"; home = cfg.stateDir; createHome = true; + useDefaultShell = true; }; }; diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 44880ebeda146dacf4954407af97cfefc6e30610..94a98e0335dffc059308ae7c3aa2a075704aa78c 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -17,7 +17,7 @@ let gititSh = hsPkgs: extras: with pkgs; let env = gititWithPkgs hsPkgs extras; in writeScript "gitit" '' - #!${stdenv.shell} + #!${runtimeShell} cd $HOME export NIX_GHC="${env}/bin/ghc" export NIX_GHCPKG="${env}/bin/ghc-pkg" diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 7b2b40e59232961992c223bde7d34cdaa0d56505..20d7ec90dcc95f3ef8c5ba2fc13220d490e0c933 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -29,8 +29,12 @@ let gitalyToml = pkgs.writeText "gitaly.toml" '' socket_path = "${lib.escape ["\""] gitalySocket}" + bin_dir = "${cfg.packages.gitaly}/bin" prometheus_listen_addr = "localhost:9236" + [git] + bin_path = "${pkgs.git}/bin/git" + [gitaly-ruby] dir = "${cfg.packages.gitaly.ruby}" @@ -70,7 +74,7 @@ let secret_key_base: ${cfg.secrets.secret} otp_key_base: ${cfg.secrets.otp} db_key_base: ${cfg.secrets.db} - jws_private_key: ${builtins.toJSON cfg.secrets.jws} + openid_connect_signing_key: ${builtins.toJSON cfg.secrets.jws} ''; gitlabConfig = { @@ -104,6 +108,7 @@ let ldap.enabled = false; omniauth.enabled = false; shared.path = "${cfg.statePath}/shared"; + gitaly.client_path = "${cfg.packages.gitaly}/bin"; backup.path = "${cfg.backupPath}"; gitlab_shell = { path = "${cfg.packages.gitlab-shell}"; @@ -117,8 +122,6 @@ let }; git = { bin_path = "git"; - max_size = 20971520; # 20MB - timeout = 10; }; monitoring = { ip_whitelist = [ "127.0.0.0/8" "::1/128" ]; @@ -140,6 +143,7 @@ let GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; GITLAB_STATE_PATH = "${cfg.statePath}"; GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads"; + SCHEMA = "${cfg.statePath}/db/schema.rb"; GITLAB_LOG_PATH = "${cfg.statePath}/log"; GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}"; GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml"; @@ -248,7 +252,6 @@ in { databasePassword = mkOption { type = types.str; - default = ""; description = "Gitlab database user password."; }; @@ -440,12 +443,6 @@ in { environment.systemPackages = [ pkgs.git gitlab-rake cfg.packages.gitlab-shell ]; - assertions = [ - { assertion = cfg.databasePassword != ""; - message = "databasePassword must be set"; - } - ]; - # Redis is required for the sidekiq queue runner. services.redis.enable = mkDefault true; # We use postgres as the main data store. @@ -496,13 +493,15 @@ in { after = [ "network.target" "gitlab.service" ]; wantedBy = [ "multi-user.target" ]; environment.HOME = gitlabEnv.HOME; - path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ]; + environment.GEM_HOME = "${cfg.packages.gitaly.rubyEnv}/${ruby.gemPath}"; + environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH; + path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ]; serviceConfig = { #PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}"; @@ -568,6 +567,7 @@ in { mkdir -p ${cfg.statePath}/tmp/pids mkdir -p ${cfg.statePath}/tmp/sockets mkdir -p ${cfg.statePath}/shell + mkdir -p ${cfg.statePath}/db rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks mkdir -p ${cfg.statePath}/config @@ -582,6 +582,7 @@ in { ln -sf ${cfg.statePath}/log /run/gitlab/log ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp + ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml chown -R ${cfg.user}:${cfg.group} /run/gitlab # Prepare home directory @@ -589,6 +590,7 @@ in { touch ${gitlabEnv.HOME}/.ssh/authorized_keys chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/ + cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config ${optionalString cfg.smtp.enable '' ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index f395b9558b5a4a985bfea1880a95328caa85e9b5..6e60316d000c0baafc575fc27db1a5af36dcf503 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -207,7 +207,7 @@ in gitolite setup -pk ${pubkeyFile} fi if [ -n "${hooks}" ]; then - cp ${hooks} .gitolite/hooks/common/ + cp -f ${hooks} .gitolite/hooks/common/ chmod +x .gitolite/hooks/common/* fi gitolite setup # Upgrade if needed diff --git a/nixos/modules/services/misc/gitweb.nix b/nixos/modules/services/misc/gitweb.nix new file mode 100644 index 0000000000000000000000000000000000000000..ca21366b7796e03b4cfb1b036b5a5e31888d2579 --- /dev/null +++ b/nixos/modules/services/misc/gitweb.nix @@ -0,0 +1,59 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.gitweb; + +in +{ + + options.services.gitweb = { + + projectroot = mkOption { + default = "/srv/git"; + type = types.path; + description = '' + Path to git projects (bare repositories) that should be served by + gitweb. Must not end with a slash. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Verbatim configuration text appended to the generated gitweb.conf file. + ''; + example = '' + $feature{'highlight'}{'default'} = [1]; + $feature{'ctags'}{'default'} = [1]; + $feature{'avatar'}{'default'} = ['gravatar']; + ''; + }; + + gitwebTheme = mkOption { + default = false; + type = types.bool; + description = '' + Use an alternative theme for gitweb, strongly inspired by GitHub. + ''; + }; + + gitwebConfigFile = mkOption { + default = pkgs.writeText "gitweb.conf" '' + # path to git projects (.git) + $projectroot = "${cfg.projectroot}"; + $highlight_bin = "${pkgs.highlight}/bin/highlight"; + ${cfg.extraConfig} + ''; + type = types.path; + readOnly = true; + internal = true; + }; + + }; + + meta.maintainers = with maintainers; [ gnidorah ]; + +} diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index f6d326e43d948c665c64c39fbbe50b6d43a98053..ba744d37e71c5172cd45ac52ccab78f0ead0b318 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -35,6 +35,9 @@ let SECRET_KEY = #secretkey# INSTALL_LOCK = true + [log] + ROOT_PATH = ${cfg.stateDir}/log + ${cfg.extraConfig} ''; in diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 81fb024f9094d20b5ebd47a82096d35d746217dd..0888221ab62fc382f8af7822d18520a4662d5ce1 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -32,6 +32,24 @@ in description = "Content of the configuration file"; }; + mathjax = mkOption { + type = types.bool; + default = false; + description = "Enable support for math rendering using MathJax"; + }; + + allowUploads = mkOption { + type = types.nullOr (types.enum [ "dir" "page" ]); + default = null; + description = "Enable uploads of external files"; + }; + + emoji = mkOption { + type = types.bool; + default = false; + description = "Parse and interpret emoji tags"; + }; + branch = mkOption { type = types.str; default = "master"; @@ -84,6 +102,9 @@ in --host ${cfg.address} \ --config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \ --ref ${cfg.branch} \ + ${optionalString cfg.mathjax "--mathjax"} \ + ${optionalString cfg.emoji "--emoji"} \ + ${optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \ ${cfg.stateDir} ''; }; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix new file mode 100644 index 0000000000000000000000000000000000000000..ac37c11106efc6fa1732e95a09f1fb78dbb20dab --- /dev/null +++ b/nixos/modules/services/misc/home-assistant.nix @@ -0,0 +1,144 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.home-assistant; + + configFile = pkgs.writeText "configuration.yaml" (builtins.toJSON cfg.config); + + availableComponents = pkgs.home-assistant.availableComponents; + + # Given component "parentConfig.platform", returns whether config.parentConfig + # is a list containing a set with set.platform == "platform". + # + # For example, the component sensor.luftdaten is used as follows: + # config.sensor = [ { + # platform = "luftdaten"; + # ... + # } ]; + useComponentPlatform = component: + let + path = splitString "." component; + parentConfig = attrByPath (init path) null cfg.config; + platform = last path; + in isList parentConfig && any + (item: item.platform or null == platform) + parentConfig; + + # Returns whether component is used in config + useComponent = component: + hasAttrByPath (splitString "." component) cfg.config + || useComponentPlatform component; + + # List of components used in config + extraComponents = filter useComponent availableComponents; + + package = if cfg.autoExtraComponents + then (cfg.package.override { inherit extraComponents; }) + else cfg.package; + +in { + meta.maintainers = with maintainers; [ dotlambda ]; + + options.services.home-assistant = { + enable = mkEnableOption "Home Assistant"; + + configDir = mkOption { + default = "/var/lib/hass"; + type = types.path; + description = "The config directory, where your configuration.yaml is located."; + }; + + config = mkOption { + default = null; + type = with types; nullOr attrs; + example = literalExample '' + { + homeassistant = { + name = "Home"; + time_zone = "UTC"; + }; + frontend = { }; + http = { }; + feedreader.urls = [ "https://nixos.org/blogs.xml" ]; + } + ''; + description = '' + Your configuration.yaml as a Nix attribute set. + Beware that setting this option will delete your previous configuration.yaml. + ''; + }; + + package = mkOption { + default = pkgs.home-assistant; + defaultText = "pkgs.home-assistant"; + type = types.package; + example = literalExample '' + pkgs.home-assistant.override { + extraPackages = ps: with ps; [ colorlog ]; + } + ''; + description = '' + Home Assistant package to use. + Override extraPackages in order to add additional dependencies. + ''; + }; + + autoExtraComponents = mkOption { + default = true; + type = types.bool; + description = '' + If set to true, the components used in config + are set as the specified package's extraComponents. + This in turn adds all packaged dependencies to the derivation. + You might still see import errors in your log. + In this case, you will need to package the necessary dependencies yourself + or ask for someone else to package them. + If a dependency is packaged but not automatically added to this list, + you might need to specify it in extraPackages. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.home-assistant = { + description = "Home Assistant"; + after = [ "network.target" ]; + preStart = lib.optionalString (cfg.config != null) '' + rm -f ${cfg.configDir}/configuration.yaml + ln -s ${configFile} ${cfg.configDir}/configuration.yaml + ''; + serviceConfig = { + ExecStart = '' + ${package}/bin/hass --config "${cfg.configDir}" + ''; + User = "hass"; + Group = "hass"; + Restart = "on-failure"; + ProtectSystem = "strict"; + ReadWritePaths = "${cfg.configDir}"; + PrivateTmp = true; + }; + path = [ + "/run/wrappers" # needed for ping + ]; + }; + + systemd.targets.home-assistant = rec { + description = "Home Assistant"; + wantedBy = [ "multi-user.target" ]; + wants = [ "home-assistant.service" ]; + after = wants; + }; + + users.extraUsers.hass = { + home = cfg.configDir; + createHome = true; + group = "hass"; + uid = config.ids.uids.hass; + }; + + users.extraGroups.hass.gid = config.ids.gids.hass; + }; +} diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index e07a4a44613ae0f39cf4a5ab1a88bd2be0bb05b7..6da9cc8c47e6e9266ff09c5ca4370725e68adb28 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -55,7 +55,7 @@ in serviceConfig = { User = config.users.extraUsers.ihaskell.name; Group = config.users.extraGroups.ihaskell.name; - ExecStart = "${pkgs.stdenv.shell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\""; + ExecStart = "${pkgs.runtimeShell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\""; }; }; }; diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix index 6051c884465da015ba0b21dd46380f4fb129e0a1..df0b3ae24c90143ab57cc1ac74d6286ec92c85aa 100644 --- a/nixos/modules/services/misc/logkeys.nix +++ b/nixos/modules/services/misc/logkeys.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index a3ec0ea59f8f072f253ac1049dfbef083331651b..7e880ad09b89650ad6513588413fe46f376fc966 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.matrix-synapse; + pg = config.services.postgresql; + usePostgresql = cfg.database_type == "psycopg2"; logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; 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)}]}''; @@ -38,13 +40,12 @@ database: { name: "${cfg.database_type}", args: { ${concatStringsSep ",\n " ( - mapAttrsToList (n: v: "\"${n}\": ${v}") cfg.database_args + mapAttrsToList (n: v: "\"${n}\": ${builtins.toJSON v}") cfg.database_args )} } } event_cache_size: "${cfg.event_cache_size}" verbose: ${cfg.verbose} -log_file: "/var/log/matrix-synapse/homeserver.log" log_config: "${logConfigFile}" rc_messages_per_second: ${cfg.rc_messages_per_second} rc_message_burst_count: ${cfg.rc_message_burst_count} @@ -53,8 +54,8 @@ federation_rc_sleep_limit: ${cfg.federation_rc_sleep_limit} federation_rc_sleep_delay: ${cfg.federation_rc_sleep_delay} federation_rc_reject_limit: ${cfg.federation_rc_reject_limit} federation_rc_concurrent: ${cfg.federation_rc_concurrent} -media_store_path: "/var/lib/matrix-synapse/media" -uploads_path: "/var/lib/matrix-synapse/uploads" +media_store_path: "${cfg.dataDir}/media" +uploads_path: "${cfg.dataDir}/uploads" max_upload_size: "${cfg.max_upload_size}" max_image_pixels: "${cfg.max_image_pixels}" dynamic_thumbnails: ${boolToString cfg.dynamic_thumbnails} @@ -86,7 +87,7 @@ ${optionalString (cfg.macaroon_secret_key != null) '' 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" +signing_key_path: "${cfg.dataDir}/homeserver.signing.key" key_refresh_interval: "${cfg.key_refresh_interval}" perspectives: servers: { @@ -156,7 +157,7 @@ in { tls_certificate_path = mkOption { type = types.nullOr types.str; default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.crt"; + example = "${cfg.dataDir}/homeserver.tls.crt"; description = '' PEM encoded X509 certificate for TLS. You can replace the self-signed certificate that synapse @@ -168,7 +169,7 @@ in { tls_private_key_path = mkOption { type = types.nullOr types.str; default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.key"; + example = "${cfg.dataDir}/homeserver.tls.key"; description = '' PEM encoded private key for TLS. Specify null if synapse is not speaking TLS directly. @@ -177,7 +178,7 @@ in { tls_dh_params_path = mkOption { type = types.nullOr types.str; default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.dh"; + example = "${cfg.dataDir}/homeserver.tls.dh"; description = '' PEM dh parameters for ephemeral keys ''; @@ -185,6 +186,7 @@ in { server_name = mkOption { type = types.str; example = "example.com"; + default = config.networking.hostName; description = '' The domain name of the server, with optional explicit port. This is used by remote servers to connect to this server, @@ -340,16 +342,39 @@ in { }; database_type = mkOption { type = types.enum [ "sqlite3" "psycopg2" ]; - default = "sqlite3"; + default = if versionAtLeast config.system.stateVersion "18.03" + then "psycopg2" + else "sqlite3"; description = '' The database engine name. Can be sqlite or psycopg2. ''; }; + create_local_database = mkOption { + type = types.bool; + default = true; + description = '' + Whether to create a local database automatically. + ''; + }; + database_name = mkOption { + type = types.str; + default = "matrix-synapse"; + description = "Database name."; + }; + database_user = mkOption { + type = types.str; + default = "matrix-synapse"; + description = "Database user name."; + }; database_args = mkOption { type = types.attrs; default = { - database = "/var/lib/matrix-synapse/homeserver.db"; - }; + sqlite3 = { database = "${cfg.dataDir}/homeserver.db"; }; + psycopg2 = { + user = cfg.database_user; + database = cfg.database_name; + }; + }."${cfg.database_type}"; description = '' Arguments to pass to the engine. ''; @@ -579,6 +604,18 @@ in { Extra config options for matrix-synapse. ''; }; + extraConfigFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Extra config files to include. + + The configuration files will be included based on the command line + argument --config-path. This allows to configure secrets without + having to go through the Nix store, e.g. based on deployment keys if + NixOPS is in use. + ''; + }; logConfig = mkOption { type = types.lines; default = readFile ./matrix-synapse-log_config.yaml; @@ -586,6 +623,14 @@ in { A yaml python logging config file ''; }; + dataDir = mkOption { + type = types.str; + default = "/var/lib/matrix-synapse"; + description = '' + The directory where matrix-synapse stores its stateful data such as + certificates, media and uploads. + ''; + }; }; }; @@ -593,7 +638,7 @@ in { users.extraUsers = [ { name = "matrix-synapse"; group = "matrix-synapse"; - home = "/var/lib/matrix-synapse"; + home = cfg.dataDir; createHome = true; shell = "${pkgs.bash}/bin/bash"; uid = config.ids.uids.matrix-synapse; @@ -604,23 +649,48 @@ in { gid = config.ids.gids.matrix-synapse; } ]; + services.postgresql.enable = mkIf usePostgresql (mkDefault true); + systemd.services.matrix-synapse = { description = "Synapse Matrix homeserver"; - after = [ "network.target" ]; + after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; preStart = '' ${cfg.package}/bin/homeserver \ --config-path ${configFile} \ - --keys-directory /var/lib/matrix-synapse \ + --keys-directory ${cfg.dataDir} \ --generate-keys + '' + optionalString (usePostgresql && cfg.create_local_database) '' + if ! test -e "${cfg.dataDir}/db-created"; then + ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \ + ${pg.package}/bin/createuser \ + --login \ + --no-createdb \ + --no-createrole \ + --encrypted \ + ${cfg.database_user} + ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \ + ${pg.package}/bin/createdb \ + --owner=${cfg.database_user} \ + --encoding=UTF8 \ + --lc-collate=C \ + --lc-ctype=C \ + --template=template0 \ + ${cfg.database_name} + touch "${cfg.dataDir}/db-created" + fi ''; serviceConfig = { Type = "simple"; User = "matrix-synapse"; Group = "matrix-synapse"; - WorkingDirectory = "/var/lib/matrix-synapse"; + WorkingDirectory = cfg.dataDir; PermissionsStartOnly = true; - ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse"; + ExecStart = '' + ${cfg.package}/bin/homeserver \ + ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } + --keys-directory ${cfg.dataDir} + ''; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix index 972d8b572d3693ef5a18a0415163b28bffa6cbc1..50f6f80ad00cac3ab4c71e45119817da7784f2ea 100644 --- a/nixos/modules/services/misc/mbpfan.nix +++ b/nixos/modules/services/misc/mbpfan.nix @@ -8,13 +8,7 @@ let in { options.services.mbpfan = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable the mbpfan daemon. - ''; - }; + enable = mkEnableOption "mbpfan, fan controller daemon for Apple Macs and MacBooks"; package = mkOption { type = types.package; diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index 47be10274d3b58cb7b72f089e2d2ce966900c3a4..effa29b64f63c49e02b75908ecca90c85b936b25 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -188,7 +188,7 @@ in { description = "Mesos Slave"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - path = [ pkgs.stdenv.shellPackage ]; + path = [ pkgs.runtimeShellPackage ]; serviceConfig = { ExecStart = '' ${pkgs.mesos}/bin/mesos-slave \ @@ -213,7 +213,7 @@ in { PermissionsStartOnly = true; }; preStart = '' - mkdir -m 0700 -p ${cfg.workDir} + mkdir -m 0701 -p ${cfg.workDir} ''; }; }; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index beca820d2d602054ccad9cd8f6b976b2b122c67c..f2d34560a718dd23af0d60739dbab4decd630d1b 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.12pre"; + isNix20 = versionAtLeast (getVersion nix) "2.0pre"; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -26,32 +26,40 @@ let nixConf = let - # If we're using sandbox for builds, then provide /bin/sh in - # the sandbox as a bind-mount to bash. This means we also need to - # include the entire closure of bash. - sh = pkgs.stdenv.shell; + # In Nix < 2.0, If we're using sandbox for builds, then provide + # /bin/sh in the sandbox as a bind-mount to bash. This means we + # also need to include the entire closure of bash. Nix >= 2.0 + # provides a /bin/sh by default. + sh = pkgs.runtimeShell; binshDeps = pkgs.writeReferencesToFile sh; in - pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } '' - extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) + pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } '' + ${optionalString (!isNix20) '' + extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) + ''} cat > $out <", + "pool_password" : "minername", + "pool_weight" : 1, + }, + ], + ''; + description = '' + Verbatim xmr-stak config.txt. If empty, the -c + parameter will not be added to the xmr-stak command. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.xmr-stak = { + wantedBy = [ "multi-user.target" ]; + bindsTo = [ "network-online.target" ]; + after = [ "network-online.target" ]; + environment = mkIf cfg.cudaSupport { + LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib"; + }; + script = '' + exec ${pkg}/bin/xmr-stak ${xmrConfArg} ${concatStringsSep " " cfg.extraArgs} + ''; + serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in { + # xmr-stak generates cpu and/or gpu configuration files + WorkingDirectory = "/tmp"; + PrivateTmp = true; + DynamicUser = !rootRequired; + LimitMEMLOCK = toString (1024*1024); + }; + }; + }; +} diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index d85b5e4ec507678105a7bcdc8c3ae517f4064104..91539592511c2d4bc35db375724e772b8e2595fa 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -106,10 +106,19 @@ in { ''; }; + package = mkOption { + description = "The zookeeper package to use"; + default = pkgs.zookeeper; + defaultText = "pkgs.zookeeper"; + type = types.package; + }; + }; config = mkIf cfg.enable { + environment.systemPackages = [cfg.package]; + systemd.services.zookeeper = { description = "Zookeeper Daemon"; wantedBy = [ "multi-user.target" ]; @@ -118,7 +127,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.jre}/bin/java \ - -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \ + -cp "${cfg.package}/lib/*:${cfg.package}/${cfg.package.name}.jar:${configDir}" \ ${escapeShellArgs cfg.extraCmdLineOptions} \ -Dzookeeper.datadir.autocreate=false \ ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \ diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index 9abd6e9ab64141eaf41f5ad370dfc360414f2fdf..839116de6265bdefd958c972ddfc6557a2ec4232 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -38,7 +38,7 @@ let ]; shellCmdsForEventScript = eventname: commands: '' - echo "#!${pkgs.stdenv.shell}" > "$out/${eventname}" + echo "#!${pkgs.runtimeShell}" > "$out/${eventname}" echo '${commands}' >> "$out/${eventname}" chmod a+x "$out/${eventname}" ''; diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix index 1c00f3c299e95dd286e6c3b2038b59758b0e3f94..c3b869e00880e6207f0234f2758053bcf8d9e4e4 100644 --- a/nixos/modules/services/monitoring/fusion-inventory.nix +++ b/nixos/modules/services/monitoring/fusion-inventory.nix @@ -55,9 +55,6 @@ in { description = "Fusion Inventory Agent"; wantedBy = [ "multi-user.target" ]; - environment = { - OPTIONS = "--no-category=software"; - }; serviceConfig = { ExecStart = "${pkgs.fusionInventory}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork"; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 4fbacef788f9ca7e94760d87362f1d79ed922857..eceb91525db4ad145db2ed474425d04988f0ead4 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -25,6 +25,7 @@ let DATABASE_USER = cfg.database.user; DATABASE_PASSWORD = cfg.database.password; DATABASE_PATH = cfg.database.path; + DATABASE_CONN_MAX_LIFETIME = cfg.database.connMaxLifetime; SECURITY_ADMIN_USER = cfg.security.adminUser; SECURITY_ADMIN_PASSWORD = cfg.security.adminPassword; @@ -49,7 +50,7 @@ in { protocol = mkOption { description = "Which protocol to listen."; default = "http"; - type = types.enum ["http" "https"]; + type = types.enum ["http" "https" "socket"]; }; addr = mkOption { @@ -111,7 +112,7 @@ in { type = mkOption { description = "Database type."; default = "sqlite3"; - type = types.enum ["mysql" "sqlite3" "postgresql"]; + type = types.enum ["mysql" "sqlite3" "postgres"]; }; host = mkOption { @@ -143,6 +144,15 @@ in { default = "${cfg.dataDir}/data/grafana.db"; type = types.path; }; + + connMaxLifetime = mkOption { + description = '' + Sets the maximum amount of time (in seconds) a connection may be reused. + For MySQL this setting should be shorter than the `wait_timeout' variable. + ''; + default = 14400; + type = types.int; + }; }; security = { @@ -241,7 +251,9 @@ in { description = "Grafana Service Daemon"; wantedBy = ["multi-user.target"]; after = ["networking.target"]; - environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; + environment = { + QT_QPA_PLATFORM = "offscreen"; + } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; serviceConfig = { ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}"; WorkingDirectory = cfg.dataDir; @@ -249,7 +261,7 @@ in { }; preStart = '' ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir} - ln -fs ${cfg.package}/share/grafana/vendor ${cfg.dataDir} + ln -fs ${cfg.package}/share/grafana/tools ${cfg.dataDir} ''; }; diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix index 71f50cc0f19dfd397a9ba95c641c1f5467616b75..d48e5c550abbf1b6ca9bfa9e11efb7a2dadd65df 100644 --- a/nixos/modules/services/monitoring/monit.nix +++ b/nixos/modules/services/monitoring/monit.nix @@ -26,16 +26,10 @@ in environment.systemPackages = [ pkgs.monit ]; - environment.etc = [ - { - source = pkgs.writeTextFile { - name = "monitrc"; - text = config.services.monit.config; - }; - target = "monitrc"; - mode = "0400"; - } - ]; + environment.etc."monitrc" = { + text = config.services.monit.config; + mode = "0400"; + }; systemd.services.monit = { description = "Pro-active monitoring utility for unix systems"; @@ -48,6 +42,8 @@ in KillMode = "process"; Restart = "always"; }; + restartTriggers = [ config.environment.etc."monitrc".source ]; }; + }; } diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index cc6d51f0ef1bae39e1caf6c5c45e6e8de5e227cc..358ffd431dd48456ca32e7793642485adc0c0d62 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -17,40 +17,6 @@ let nodeCfg = config.services.munin-node; cronCfg = config.services.munin-cron; - muninPlugins = pkgs.stdenv.mkDerivation { - name = "munin-available-plugins"; - buildCommand = '' - mkdir -p $out - - cp --preserve=mode ${pkgs.munin}/lib/plugins/* $out/ - - for file in $out/*; do - case "$file" in - */plugin.sh|*/plugins.history) - chmod +x "$file" - continue;; - esac - - # read magic makers from the file - family=$(sed -nr 's/.*#%#\s+family\s*=\s*(\S+)\s*/\1/p' $file) - cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file) - - wrapProgram $file \ - --set PATH "/run/wrappers/bin:/run/current-system/sw/bin" \ - --set MUNIN_LIBDIR "${pkgs.munin}/lib" \ - --set MUNIN_PLUGSTATE "/var/run/munin" - - # munin uses markers to tell munin-node-configure what a plugin can do - echo "#%# family=$family" >> $file - echo "#%# capabilities=$cap" >> $file - done - - # NOTE: we disable disktstats because plugin seems to fail and it hangs html generation (100% CPU + memory leak) - rm -f $out/diskstats - ''; - buildInputs = [ pkgs.makeWrapper ]; - }; - muninConf = pkgs.writeText "munin.conf" '' dbdir /var/lib/munin @@ -83,6 +49,29 @@ let ${nodeCfg.extraConfig} ''; + + pluginConf = pkgs.writeText "munin-plugin-conf" + '' + [hddtemp_smartctl] + user root + group root + + [meminfo] + user root + group root + + [ipmi*] + user root + group root + ''; + + pluginConfDir = pkgs.stdenv.mkDerivation { + name = "munin-plugin-conf.d"; + buildCommand = '' + mkdir $out + ln -s ${pluginConf} $out/nixos-config + ''; + }; in { @@ -179,17 +168,22 @@ in description = "Munin Node"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.munin ]; + path = with pkgs; [ munin smartmontools "/run/current-system/sw" "/run/wrappers" ]; + environment.MUNIN_LIBDIR = "${pkgs.munin}/lib"; environment.MUNIN_PLUGSTATE = "/var/run/munin"; + environment.MUNIN_LOGDIR = "/var/log/munin"; preStart = '' echo "updating munin plugins..." mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* - 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 + ${pkgs.munin}/bin/munin-node-configure --suggest --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${pkgs.munin}/lib/plugins --servicedir=/etc/munin/plugins --sconfdir=${pluginConfDir} 2>/dev/null | ${pkgs.bash}/bin/bash + + # NOTE: we disable disktstats because plugin seems to fail and it hangs html generation (100% CPU + memory leak) + rm /etc/munin/plugins/diskstats || true ''; serviceConfig = { - ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/"; + ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/ --sconfdir=${pluginConfDir}"; }; }; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index e1fde4fc9500246cf84b6e7f52439fb6a2c9d9f2..d23b329eeb2580f003f3a715df27eb373a722bd7 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -5,18 +5,25 @@ with lib; let cfg = config.services.netdata; - configFile = pkgs.writeText "netdata.conf" cfg.configText; + wrappedPlugins = pkgs.runCommand "wrapped-plugins" {} '' + mkdir -p $out/libexec/netdata/plugins.d + ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin + ''; + + localConfig = { + global = { + "plugins directory" = "${wrappedPlugins}/libexec/netdata/plugins.d ${pkgs.netdata}/libexec/netdata/plugins.d"; + }; + }; + mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config); + configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig); defaultUser = "netdata"; in { options = { services.netdata = { - enable = mkOption { - default = false; - type = types.bool; - description = "Whether to enable netdata monitoring."; - }; + enable = mkEnableOption "netdata"; user = mkOption { type = types.str; @@ -31,9 +38,9 @@ in { }; configText = mkOption { - type = types.lines; - default = ""; - description = "netdata.conf configuration."; + type = types.nullOr types.lines; + description = "Verbatim netdata.conf, cannot be combined with config."; + default = null; example = '' [global] debug log = syslog @@ -42,11 +49,29 @@ in { ''; }; + config = mkOption { + type = types.attrsOf types.attrs; + default = {}; + description = "netdata.conf configuration as nix attributes. cannot be combined with configText."; + example = literalExample '' + global = { + "debug log" = "syslog"; + "access log" = "syslog"; + "error log" = "syslog"; + }; + ''; + }; + }; }; - }; config = mkIf cfg.enable { + assertions = + [ { assertion = cfg.config != {} -> cfg.configText == null ; + message = "Cannot specify both config and configText"; + } + ]; systemd.services.netdata = { + path = with pkgs; [ gawk curl ]; description = "Real time performance monitoring"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -66,6 +91,15 @@ in { }; }; + security.wrappers."apps.plugin" = { + source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin"; + capabilities = "cap_dac_read_search,cap_sys_ptrace+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+rx,o-rwx"; + }; + + users.extraUsers = optional (cfg.user == defaultUser) { name = defaultUser; }; diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index cf761edad9260e6f62d660d2e07f4dddb4a616c9..8a47c9f1e7d89cd807961735609ea00f8d5516b9 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -111,11 +111,11 @@ in { after = [ "network.target" ]; script = '' ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \ - -config.file ${alertmanagerYml} \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - -log.level ${cfg.logLevel} \ - ${optionalString (cfg.webExternalUrl != null) ''-web.external-url ${cfg.webExternalUrl} \''} - ${optionalString (cfg.logFormat != null) "-log.format ${cfg.logFormat}"} + --config.file ${alertmanagerYml} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --log.level ${cfg.logLevel} \ + ${optionalString (cfg.webExternalUrl != null) ''--web.external-url ${cfg.webExternalUrl} \''} + ${optionalString (cfg.logFormat != null) "--log.format ${cfg.logFormat}"} ''; serviceConfig = { diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix deleted file mode 100644 index ce2e1cf2d74b6c93f9381c8b2e592a9fea5fe629..0000000000000000000000000000000000000000 --- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.blackboxExporter; -in { - options = { - services.prometheus.blackboxExporter = { - enable = mkEnableOption "prometheus blackbox exporter"; - - configFile = mkOption { - type = types.path; - description = '' - Path to configuration file. - ''; - }; - - port = mkOption { - type = types.int; - default = 9115; - description = '' - Port to listen on. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the blackbox 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-blackbox-exporter = { - description = "Prometheus exporter for blackbox probes"; - unitConfig.Documentation = "https://github.com/prometheus/blackbox_exporter"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes - ExecStart = '' - ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ - --web.listen-address :${toString cfg.port} \ - --config.file ${cfg.configFile} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix b/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix deleted file mode 100644 index f8a5b9576a1168e8c7559d6562cf4a132c45198b..0000000000000000000000000000000000000000 --- a/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.collectdExporter; - - collectSettingsArgs = if (cfg.collectdBinary.enable) then '' - -collectd.listen-address ${optionalString (cfg.collectdBinary.listenAddress != null) cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ - -collectd.security-level ${cfg.collectdBinary.securityLevel} \ - '' else ""; - -in { - options = { - services.prometheus.collectdExporter = { - enable = mkEnableOption "prometheus collectd exporter"; - - port = mkOption { - type = types.int; - default = 9103; - description = '' - Port to listen on. - This is used for scraping as well as the to receive collectd data via the write_http plugin. - ''; - }; - - listenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "0.0.0.0"; - description = '' - Address to listen on for web interface, telemetry and collectd JSON data. - ''; - }; - - collectdBinary = { - enable = mkEnableOption "collectd binary protocol receiver"; - - authFile = mkOption { - default = null; - type = types.nullOr types.path; - description = "File mapping user names to pre-shared keys (passwords)."; - }; - - port = mkOption { - type = types.int; - default = 25826; - description = ''Network address on which to accept collectd binary network packets.''; - }; - - listenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "0.0.0.0"; - description = '' - Address to listen on for binary network packets. - ''; - }; - - securityLevel = mkOption { - type = types.enum ["None" "Sign" "Encrypt"]; - default = "None"; - description = '' - Minimum required security level for accepted packets. - ''; - }; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the collectd exporter. - ''; - }; - - logFormat = mkOption { - type = types.str; - default = "logger:stderr"; - example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true"; - description = '' - Set the log target and format. - ''; - }; - - logLevel = mkOption { - type = types.enum ["debug" "info" "warn" "error" "fatal"]; - default = "info"; - description = '' - Only log messages with the given severity or above. - ''; - }; - - 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) ++ - (optional (cfg.openFirewall && cfg.collectdBinary.enable) cfg.collectdBinary.port); - - systemd.services.prometheus-collectd-exporter = { - description = "Prometheus exporter for Collectd metrics"; - unitConfig.Documentation = "https://github.com/prometheus/collectd_exporter"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - DynamicUser = true; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecStart = '' - ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \ - -log.format ${cfg.logFormat} \ - -log.level ${cfg.logLevel} \ - -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \ - ${collectSettingsArgs} \ - ${concatStringsSep " " cfg.extraFlags} - ''; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix new file mode 100644 index 0000000000000000000000000000000000000000..180b273d177e589368ee016fc457a972282bd7d9 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -0,0 +1,173 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.exporters; + + # each attribute in `exporterOpts` is expected to have specified: + # - port (types.int): port on which the exporter listens + # - serviceOpts (types.attrs): config that is merged with the + # default definition of the exporter's + # systemd service + # - extraOpts (types.attrs): extra configuration options to + # configure the exporter with, which + # are appended to the default options + # + # Note that `extraOpts` is optional, but a script for the exporter's + # systemd service must be provided by specifying either + # `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart` + exporterOpts = { + blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; }; + collectd = import ./exporters/collectd.nix { inherit config lib pkgs; }; + dovecot = import ./exporters/dovecot.nix { inherit config lib pkgs; }; + fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; }; + json = import ./exporters/json.nix { inherit config lib pkgs; }; + minio = import ./exporters/minio.nix { inherit config lib pkgs; }; + nginx = import ./exporters/nginx.nix { inherit config lib pkgs; }; + node = import ./exporters/node.nix { inherit config lib pkgs; }; + postfix = import ./exporters/postfix.nix { inherit config lib pkgs; }; + snmp = import ./exporters/snmp.nix { inherit config lib pkgs; }; + unifi = import ./exporters/unifi.nix { inherit config lib pkgs; }; + varnish = import ./exporters/varnish.nix { inherit config lib pkgs; }; + }; + + mkExporterOpts = ({ name, port }: { + enable = mkEnableOption "the prometheus ${name} exporter"; + port = mkOption { + type = types.int; + default = port; + description = '' + Port to listen on. + ''; + }; + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + Address to listen on. + ''; + }; + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options to pass to the ${name} exporter. + ''; + }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + firewallFilter = mkOption { + type = types.str; + default = "-p tcp -m tcp --dport ${toString port}"; + example = literalExample '' + "-i eth0 -p tcp -m tcp --dport ${toString port}" + ''; + description = '' + Specify a filter for iptables to use when + + is true. It is used as `ip46tables -I INPUT -j ACCEPT`. + ''; + }; + user = mkOption { + type = types.str; + default = "nobody"; + description = '' + User name under which the ${name} exporter shall be run. + Has no effect when is true. + ''; + }; + group = mkOption { + type = types.str; + default = "nobody"; + description = '' + Group under which the ${name} exporter shall be run. + Has no effect when is true. + ''; + }; + }); + + mkSubModule = { name, port, extraOpts, serviceOpts }: { + ${name} = mkOption { + type = types.submodule { + options = (mkExporterOpts { + inherit name port; + } // extraOpts); + }; + internal = true; + default = {}; + }; + }; + + mkSubModules = (foldl' (a: b: a//b) {} + (mapAttrsToList (name: opts: mkSubModule { + inherit name; + inherit (opts) port serviceOpts; + extraOpts = opts.extraOpts or {}; + }) exporterOpts) + ); + + mkExporterConf = { name, conf, serviceOpts }: + mkIf conf.enable { + networking.firewall.extraCommands = mkIf conf.openFirewall '' + ip46tables -I INPUT ${conf.firewallFilter} -j ACCEPT + ''; + systemd.services."prometheus-${name}-exporter" = mkMerge ([{ + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + Restart = mkDefault "always"; + PrivateTmp = mkDefault true; + WorkingDirectory = mkDefault /tmp; + } // mkIf (!(serviceOpts.serviceConfig.DynamicUser or false)) { + User = conf.user; + Group = conf.group; + }; + } serviceOpts ]); + }; +in +{ + options.services.prometheus.exporters = mkOption { + type = types.submodule { + options = (mkSubModules); + }; + description = "Prometheus exporter configuration"; + default = {}; + example = literalExample '' + { + node = { + enable = true; + enabledCollectors = [ "systemd" ]; + }; + varnish.enable = true; + } + ''; + }; + + config = mkMerge ([{ + assertions = [{ + assertion = (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null); + message = '' + Please ensure you have either `services.prometheus.exporters.snmp.configuration' + or `services.prometheus.exporters.snmp.configurationPath' set! + ''; + }]; + }] ++ [(mkIf config.services.minio.enable { + services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000"; + services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey; + services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey; + })] ++ (mapAttrsToList (name: conf: + mkExporterConf { + inherit name; + inherit (conf) serviceOpts; + conf = cfg.${name}; + }) exporterOpts) + ); + + meta.doc = ./exporters.xml; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml new file mode 100644 index 0000000000000000000000000000000000000000..4f0bcb29810670e181f5e985a09b9f0ef779842b --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters.xml @@ -0,0 +1,135 @@ + + +Prometheus exporters + +Prometheus exporters provide metrics for the prometheus monitoring system. + +
Configuration + One of the most common exporters is the node exporter, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows: + + services.promtheus.exporters.node = { + enable = true; + enabledCollectors = [ + "logind" + "systemd" + ]; + disabledCollectors = [ + "textfile" + ]; + openFirewall = true; + firewallFilter = "-i br0 -p tcp -m tcp --dport 9100"; + }; + +It should now serve all metrics from the collectors +that are explicitly enabled and the ones that are +enabled by default, via http under /metrics. In this example the firewall should just +allow incoming connections to the exporter's port on the bridge interface br0 +(this would have to be configured seperately of course). +For more information about configuration see man configuration.nix or +search through the available options. + +
+
Adding a new exporter + To add a new exporter, it has to be packaged first (see nixpkgs/pkgs/servers/monitoring/prometheus/ for examples), then a module can be added. The postfix exporter is used in this example: + + + + Some default options for all exporters are provided by + nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix: + + + + + enable + port + listenAddress + extraFlags + openFirewall + firewallFilter + user + group + + + + As there is already a package available, the module can now be added. + This is accomplished by adding a new file to the + nixos/modules/services/monitoring/prometheus/exporters/ directory, + which will be called postfix.nix and contains all exporter specific options + and configuration: + + # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix + { config, lib, pkgs }: + + with lib; + + let + # for convenience we define cfg here + cfg = config.services.prometheus.exporters.postfix; + in + { + port = 9154; # The postfix exporter listens on this port by default + + # `extraOpts` is an attribute set which contains additional options + # (and optional overrides for default options). + # Note that this attribute is optional. + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + logfilePath = mkOption { + type = types.path; + default = /var/log/postfix_exporter_input.log; + example = /var/log/mail.log; + description = '' + Path where Postfix writes log entries. + This file will be truncated by this exporter! + ''; + }; + showqPath = mkOption { + type = types.path; + default = /var/spool/postfix/public/showq; + example = /var/lib/postfix/queue/public/showq; + description = '' + Path at which Postfix places its showq socket. + ''; + }; + }; + + # `serviceOpts` is an attribute set which contains configuration + # for the exporter's systemd service. One of + # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart` + # has to be specified here. This will be merged with the default + # service confiuration. + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; + } + + + + + + This should already be enough for the postfix exporter. Additionally one could + now add assertions and conditional default values. This can be done in the + 'meta-module' that combines all exporter definitions and generates the submodules: + nixpkgs/nixos/modules/services/prometheus/exporters.nix + + + +
+ diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix new file mode 100644 index 0000000000000000000000000000000000000000..d09d1c4f36631f926ddd03e9b384745db6a0bef8 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.blackbox; +in +{ + port = 9115; + extraOpts = { + configFile = mkOption { + type = types.path; + description = '' + Path to configuration file. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --config.file ${cfg.configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix new file mode 100644 index 0000000000000000000000000000000000000000..0eba3527162d0dd323695d6ba468e17adab5dc67 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -0,0 +1,78 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.collectd; +in +{ + port = 9103; + extraOpts = { + collectdBinary = { + enable = mkEnableOption "collectd binary protocol receiver"; + + authFile = mkOption { + default = null; + type = types.nullOr types.path; + description = "File mapping user names to pre-shared keys (passwords)."; + }; + + port = mkOption { + type = types.int; + default = 25826; + description = ''Network address on which to accept collectd binary network packets.''; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + Address to listen on for binary network packets. + ''; + }; + + securityLevel = mkOption { + type = types.enum ["None" "Sign" "Encrypt"]; + default = "None"; + description = '' + Minimum required security level for accepted packets. + ''; + }; + }; + + logFormat = mkOption { + type = types.str; + default = "logger:stderr"; + example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true"; + description = '' + Set the log target and format. + ''; + }; + + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error" "fatal"]; + default = "info"; + description = '' + Only log messages with the given severity or above. + ''; + }; + }; + serviceOpts = let + collectSettingsArgs = if (cfg.collectdBinary.enable) then '' + -collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ + -collectd.security-level ${cfg.collectdBinary.securityLevel} \ + '' else ""; + in { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \ + -log.format ${cfg.logFormat} \ + -log.level ${cfg.logLevel} \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${collectSettingsArgs} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix new file mode 100644 index 0000000000000000000000000000000000000000..4ca6d4e5f8b6d0dbd111b32775056f6df0c20201 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.dovecot; +in +{ + port = 9166; + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + socketPath = mkOption { + type = types.path; + default = "/var/run/dovecot/stats"; + example = "/var/run/dovecot2/stats"; + description = '' + Path under which the stats socket is placed. + The user/group under which the exporter runs, + should be able to access the socket in order + to scrape the metrics successfully. + ''; + }; + scopes = mkOption { + type = types.listOf types.str; + default = [ "user" ]; + example = [ "user" "global" ]; + description = '' + Stats scopes to query. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-dovecot-exporter}/bin/dovecot_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + --dovecot.socket-path ${cfg.socketPath} \ + --dovecot.scopes ${concatStringsSep "," cfg.scopes} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix new file mode 100644 index 0000000000000000000000000000000000000000..a3f1d9d313232db23294259c41f82f0267434ad4 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.fritzbox; +in +{ + port = 9133; + extraOpts = { + 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. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-fritzbox-exporter}/bin/fritzbox_exporter \ + -listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -gateway-address ${cfg.gatewayAddress} \ + -gateway-port ${toString cfg.gatewayPort} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixos/modules/services/monitoring/prometheus/exporters/json.nix new file mode 100644 index 0000000000000000000000000000000000000000..a5494e85e016df9b6277ba2e3d56255bddb7d78f --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/json.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.json; +in +{ + port = 7979; + extraOpts = { + url = mkOption { + type = types.str; + description = '' + URL to scrape JSON from. + ''; + }; + configFile = mkOption { + type = types.path; + description = '' + Path to configuration file. + ''; + }; + listenAddress = {}; # not used + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \ + --port ${toString cfg.port} \ + ${cfg.url} ${cfg.configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix new file mode 100644 index 0000000000000000000000000000000000000000..3cc4ffdbc8fd962f68c306a13abfe74151ace010 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix @@ -0,0 +1,65 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.minio; +in +{ + port = 9290; + extraOpts = { + minioAddress = mkOption { + type = types.str; + example = "https://10.0.0.1:9000"; + description = '' + The URL of the minio server. + Use HTTPS if Minio accepts secure connections only. + By default this connects to the local minio server if enabled. + ''; + }; + + minioAccessKey = mkOption { + type = types.str; + example = "yourMinioAccessKey"; + description = '' + The value of the Minio access key. + It is required in order to connect to the server. + By default this uses the one from the local minio server if enabled + and config.services.minio.accessKey. + ''; + }; + + minioAccessSecret = mkOption { + type = types.str; + description = '' + The value of the Minio access secret. + It is required in order to connect to the server. + By default this uses the one from the local minio server if enabled + and config.services.minio.secretKey. + ''; + }; + + minioBucketStats = mkOption { + type = types.bool; + default = false; + description = '' + Collect statistics about the buckets and files in buckets. + It requires more computation, use it carefully in case of large buckets.. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -minio.server ${cfg.minioAddress} \ + -minio.access-key ${cfg.minioAccessKey} \ + -minio.access-secret ${cfg.minioAccessSecret} \ + ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix new file mode 100644 index 0000000000000000000000000000000000000000..6a3ba2d0457c5670f2210ccd6af0c77b0324f448 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.nginx; +in +{ + port = 9113; + extraOpts = { + scrapeUri = mkOption { + type = types.string; + default = "http://localhost/nginx_status"; + description = '' + Address to access the nginx status page. + Can be enabled with services.nginx.statusPage = true. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \ + -nginx.scrape_uri '${cfg.scrapeUri}' \ + -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix new file mode 100644 index 0000000000000000000000000000000000000000..c85f5f9cfb2d7f15ceca09bd3dee821f3a8a59a3 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.node; +in +{ + port = 9100; + extraOpts = { + enabledCollectors = mkOption { + type = types.listOf types.string; + default = []; + example = ''[ "systemd" ]''; + description = '' + Collectors to enable. The collectors listed here are enabled in addition to the default ones. + ''; + }; + disabledCollectors = mkOption { + type = types.listOf types.str; + default = []; + example = ''[ "timex" ]''; + description = '' + Collectors to disable which are enabled by default. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-node-exporter}/bin/node_exporter \ + ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \ + ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix new file mode 100644 index 0000000000000000000000000000000000000000..efe78ebcba86548c153b306e26b98fb201fcb2de --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -0,0 +1,81 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.postfix; +in +{ + port = 9154; + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + logfilePath = mkOption { + type = types.path; + default = "/var/log/postfix_exporter_input.log"; + example = "/var/log/mail.log"; + description = '' + Path where Postfix writes log entries. + This file will be truncated by this exporter! + ''; + }; + showqPath = mkOption { + type = types.path; + default = "/var/spool/postfix/public/showq"; + example = "/var/lib/postfix/queue/public/showq"; + description = '' + Path where Postfix places it's showq socket. + ''; + }; + systemd = { + enable = mkEnableOption '' + reading metrics from the systemd-journal instead of from a logfile + ''; + unit = mkOption { + type = types.str; + default = "postfix.service"; + description = '' + Name of the postfix systemd unit. + ''; + }; + slice = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Name of the postfix systemd slice. + This overrides the . + ''; + }; + journalPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to the systemd journal. + ''; + }; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + --postfix.showq_path ${cfg.showqPath} \ + ${concatStringsSep " \\\n " (cfg.extraFlags + ++ optional cfg.systemd.enable "--systemd.enable" + ++ optional cfg.systemd.enable (if cfg.systemd.slice != null + then "--systemd.slice ${cfg.systemd.slice}" + else "--systemd.unit ${cfg.systemd.unit}") + ++ optional (cfg.systemd.enable && (cfg.systemd.journalPath != null)) + "--systemd.jounal_path ${cfg.systemd.journalPath}" + ++ optional (!cfg.systemd.enable) "--postfix.logfile_path ${cfg.logfilePath}")} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix new file mode 100644 index 0000000000000000000000000000000000000000..404cd0a1896b88558de834fc1c4c430acbb05b94 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.snmp; +in +{ + port = 9116; + extraOpts = { + configurationPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option. + ''; + example = "./snmp.yml"; + }; + + configuration = mkOption { + type = types.nullOr types.attrs; + default = {}; + description = '' + Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option. + ''; + example = '' + { + "default" = { + "version" = 2; + "auth" = { + "community" = "public"; + }; + }; + }; + ''; + }; + + logFormat = mkOption { + type = types.str; + default = "logger:stderr"; + description = '' + Set the log target and format. + ''; + }; + + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error" "fatal"]; + default = "info"; + description = '' + Only log messages with the given severity or above. + ''; + }; + }; + serviceOpts = let + configFile = if cfg.configurationPath != null + then cfg.configurationPath + else "${pkgs.writeText "snmp-eporter-conf.yml" (builtins.toJSON cfg.configuration)}"; + in { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \ + -config.file ${configFile} \ + -log.format ${cfg.logFormat} \ + -log.level ${cfg.logLevel} \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix new file mode 100644 index 0000000000000000000000000000000000000000..011dcbe208e4eff766da971a31f86458db08815d --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix @@ -0,0 +1,67 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.unifi; +in +{ + port = 9130; + extraOpts = { + 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. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \ + -telemetry.addr ${cfg.listenAddress}:${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/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix new file mode 100644 index 0000000000000000000000000000000000000000..b439a83e7aa2fb1eecc9de84897a8b761e7f4b71 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.varnish; +in +{ + port = 9131; + serviceOpts = { + path = [ pkgs.varnish ]; + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix deleted file mode 100644 index 6da39b6519cb257d41104cc79ab84a9356d5488b..0000000000000000000000000000000000000000 --- a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ 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/json-exporter.nix b/nixos/modules/services/monitoring/prometheus/json-exporter.nix deleted file mode 100644 index 6bc56df9834b0d5874b825a34f9dea870088e36c..0000000000000000000000000000000000000000 --- a/nixos/modules/services/monitoring/prometheus/json-exporter.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.jsonExporter; -in { - options = { - services.prometheus.jsonExporter = { - enable = mkEnableOption "prometheus JSON exporter"; - - url = mkOption { - type = types.str; - description = '' - URL to scrape JSON from. - ''; - }; - - configFile = mkOption { - type = types.path; - description = '' - Path to configuration file. - ''; - }; - - port = mkOption { - type = types.int; - default = 7979; - description = '' - Port to listen on. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the JSON 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-json-exporter = { - description = "Prometheus exporter for JSON over HTTP"; - unitConfig.Documentation = "https://github.com/kawamuray/prometheus-json-exporter"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecStart = '' - ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \ - --port ${toString cfg.port} \ - ${cfg.url} ${cfg.configFile} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix deleted file mode 100644 index 4314671523cf1988d8144b3fa1bbb34250ad8d93..0000000000000000000000000000000000000000 --- a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.minioExporter; -in { - options = { - services.prometheus.minioExporter = { - enable = mkEnableOption "prometheus minio exporter"; - - port = mkOption { - type = types.int; - default = 9290; - description = '' - Port to listen on. - ''; - }; - - listenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "0.0.0.0"; - description = '' - Address to listen on for web interface and telemetry. - ''; - }; - - minioAddress = mkOption { - type = types.str; - example = "https://10.0.0.1:9000"; - default = if config.services.minio.enable then "http://localhost:9000" else null; - description = '' - The URL of the minio server. - Use HTTPS if Minio accepts secure connections only. - By default this connects to the local minio server if enabled. - ''; - }; - - minioAccessKey = mkOption ({ - type = types.str; - example = "BKIKJAA5BMMU2RHO6IBB"; - description = '' - The value of the Minio access key. - It is required in order to connect to the server. - By default this uses the one from the local minio server if enabled - and config.services.minio.accessKey. - ''; - } // optionalAttrs (config.services.minio.enable && config.services.minio.accessKey != "") { - default = config.services.minio.accessKey; - }); - - minioAccessSecret = mkOption ({ - type = types.str; - description = '' - The calue of the Minio access secret. - It is required in order to connect to the server. - By default this uses the one from the local minio server if enabled - and config.services.minio.secretKey. - ''; - } // optionalAttrs (config.services.minio.enable && config.services.minio.secretKey != "") { - default = config.services.minio.secretKey; - }); - - minioBucketStats = mkOption { - type = types.bool; - default = false; - description = '' - Collect statistics about the buckets and files in buckets. - It requires more computation, use it carefully in case of large buckets.. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the minio 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-minio-exporter = { - description = "Prometheus exporter for Minio server metrics"; - unitConfig.Documentation = "https://github.com/joe-pll/minio-exporter"; - wantedBy = [ "multi-user.target" ]; - after = optional config.services.minio.enable "minio.service"; - serviceConfig = { - DynamicUser = true; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecStart = '' - ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \ - -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \ - -minio.server ${cfg.minioAddress} \ - -minio.access-key ${cfg.minioAccessKey} \ - -minio.access-secret ${cfg.minioAccessSecret} \ - ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix deleted file mode 100644 index 1ccafee3b18b95e667400d01ba7e925f24a75040..0000000000000000000000000000000000000000 --- a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.nginxExporter; -in { - options = { - services.prometheus.nginxExporter = { - enable = mkEnableOption "prometheus nginx exporter"; - - port = mkOption { - type = types.int; - default = 9113; - description = '' - Port to listen on. - ''; - }; - - listenAddress = mkOption { - type = types.string; - default = "0.0.0.0"; - description = '' - Address to listen on. - ''; - }; - - scrapeUri = mkOption { - type = types.string; - default = "http://localhost/nginx_status"; - description = '' - Address to access the nginx status page. - Can be enabled with services.nginx.statusPage = true. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the nginx 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-nginx-exporter = { - after = [ "network.target" "nginx.service" ]; - description = "Prometheus exporter for nginx metrics"; - unitConfig.Documentation = "https://github.com/discordianfish/nginx_exporter"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecStart = '' - ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \ - -nginx.scrape_uri '${cfg.scrapeUri}' \ - -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix deleted file mode 100644 index bad4389ce7993c0a422aac744ad0d90a4e27bedb..0000000000000000000000000000000000000000 --- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.nodeExporter; -in { - options = { - services.prometheus.nodeExporter = { - enable = mkEnableOption "prometheus node exporter"; - - port = mkOption { - type = types.int; - default = 9100; - description = '' - Port to listen on. - ''; - }; - - listenAddress = mkOption { - type = types.string; - default = "0.0.0.0"; - description = '' - Address to listen on. - ''; - }; - - enabledCollectors = mkOption { - type = types.listOf types.string; - default = []; - example = ''[ "systemd" ]''; - description = '' - Collectors to enable. The collectors listed here are enabled in addition to the default ones. - ''; - }; - - disabledCollectors = mkOption { - type = types.listOf types.str; - default = []; - example = ''[ "timex" ]''; - description = '' - Collectors to disable which are enabled by default. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the node 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-node-exporter = { - description = "Prometheus exporter for machine metrics"; - unitConfig.Documentation = "https://github.com/prometheus/node_exporter"; - wantedBy = [ "multi-user.target" ]; - script = '' - exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \ - ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \ - ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \ - --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix b/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix deleted file mode 100644 index fe33f8c1f04dd365b9938fe1ef5a7621ce29bb17..0000000000000000000000000000000000000000 --- a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.snmpExporter; - mkConfigFile = pkgs.writeText "snmp.yml" (if cfg.configurationPath == null then builtins.toJSON cfg.configuration else builtins.readFile cfg.configurationPath); -in { - options = { - services.prometheus.snmpExporter = { - enable = mkEnableOption "Prometheus snmp exporter"; - - user = mkOption { - type = types.str; - default = "nobody"; - description = '' - User name under which snmp exporter shall be run. - ''; - }; - - group = mkOption { - type = types.str; - default = "nogroup"; - description = '' - Group under which snmp exporter shall be run. - ''; - }; - - port = mkOption { - type = types.int; - default = 9116; - description = '' - Port to listen on. - ''; - }; - - listenAddress = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Address to listen on for web interface and telemetry. - ''; - }; - - configurationPath = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option. - ''; - example = "./snmp.yml"; - }; - - configuration = mkOption { - type = types.nullOr types.attrs; - default = {}; - description = '' - Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option. - ''; - example = '' - { - "default" = { - "version" = 2; - "auth" = { - "community" = "public"; - }; - }; - }; - ''; - }; - - logFormat = mkOption { - type = types.str; - default = "logger:stderr"; - description = '' - Set the log target and format. - ''; - }; - - logLevel = mkOption { - type = types.enum ["debug" "info" "warn" "error" "fatal"]; - default = "info"; - description = '' - Only log messages with the given severity or above. - ''; - }; - - 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; - - assertions = singleton - { - assertion = (cfg.configurationPath == null) != (cfg.configuration == null); - message = "Please ensure you have either 'configuration' or 'configurationPath' set!"; - }; - - systemd.services.prometheus-snmp-exporter = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - script = '' - ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \ - -config.file ${mkConfigFile} \ - -log.format ${cfg.logFormat} \ - -log.level ${cfg.logLevel} \ - -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = "/tmp"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix deleted file mode 100644 index 0a56d6ae95a59b917cf83465b75ec65ebdfc823f..0000000000000000000000000000000000000000 --- a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ 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" ]; - after = optional config.services.unifi.enable "unifi.service"; - 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/prometheus/varnish-exporter.nix b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix deleted file mode 100644 index 143ebb62aeac50b66d75c1182669bbe73aa78f31..0000000000000000000000000000000000000000 --- a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ config, pkgs, lib, ... }: - -# Shamelessly cribbed from nginx-exporter.nix. ~ C. -with lib; - -let - cfg = config.services.prometheus.varnishExporter; -in { - options = { - services.prometheus.varnishExporter = { - enable = mkEnableOption "prometheus Varnish exporter"; - - port = mkOption { - type = types.int; - default = 9131; - description = '' - Port to listen on. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the Varnish 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-varnish-exporter = { - description = "Prometheus exporter for Varnish metrics"; - unitConfig.Documentation = "https://github.com/jonnenauha/prometheus_varnish_exporter"; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.varnish ]; - script = '' - exec ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ - -web.listen-address :${toString cfg.port} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 1d6940c516a994c05485b016d92346c52544f71c..fecae4ca1b3620021bd131fd95a02d678926c0a7 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -14,7 +14,7 @@ let nx = cfg.notifications.x11; smartdNotify = pkgs.writeScript "smartd-notify.sh" '' - #! ${pkgs.stdenv.shell} + #! ${pkgs.runtimeShell} ${optionalString nm.enable '' { ${pkgs.coreutils}/bin/cat << EOF @@ -64,7 +64,7 @@ let "DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"} ''; - smartdOpts = { name, ... }: { + smartdDeviceOpts = { name, ... }: { options = { @@ -108,6 +108,18 @@ in ''; }; + extraOptions = mkOption { + default = []; + type = types.listOf types.str; + example = ["-A /var/log/smartd/" "--interval=3600"]; + description = '' + Extra command-line options passed to the smartd + daemon on startup. + + (See man 8 smartd.) + ''; + }; + notifications = { mail = { @@ -197,7 +209,7 @@ in devices = mkOption { default = []; example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ]; - type = with types; listOf (submodule smartdOpts); + type = with types; listOf (submodule smartdDeviceOpts); description = "List of devices to monitor."; }; @@ -222,7 +234,7 @@ in path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd - serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork --configfile=${smartdConf}"; + serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; }; }; diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index df2adb9f27660edcbcf360bab5f1418c5b3b088f..7b0e9981cbb18532f5869b30a489050e8b8b539b 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -9,6 +9,12 @@ let isBuiltinBackend = name: builtins.elem name [ "graphite" "console" "repeater" ]; + backendsToPackages = let + mkMap = list: name: + if isBuiltinBackend name then list + else list ++ [ pkgs.nodePackages.${name} ]; + in foldl mkMap []; + configFile = pkgs.writeText "statsd.conf" '' { address: "${cfg.listenAddress}", @@ -27,13 +33,21 @@ let prettyprint: false }, log: { - backend: "syslog" + backend: "stdout" }, automaticConfigReload: false${optionalString (cfg.extraConfig != null) ","} ${cfg.extraConfig} } ''; + deps = pkgs.buildEnv { + name = "statsd-runtime-deps"; + pathsToLink = [ "/lib" ]; + ignoreCollisions = true; + + paths = backendsToPackages cfg.backends; + }; + in { @@ -42,11 +56,7 @@ in options.services.statsd = { - enable = mkOption { - description = "Whether to enable statsd stats aggregation service"; - default = false; - type = types.bool; - }; + enable = mkEnableOption "statsd"; listenAddress = mkOption { description = "Address that statsd listens on over UDP"; @@ -110,6 +120,11 @@ in config = mkIf cfg.enable { + assertions = map (backend: { + assertion = !isBuiltinBackend backend -> hasAttrByPath [ backend ] pkgs.nodePackages; + message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!"; + }) cfg.backends; + users.extraUsers = singleton { name = "statsd"; uid = config.ids.uids.statsd; @@ -120,9 +135,7 @@ in description = "Statsd Server"; wantedBy = [ "multi-user.target" ]; environment = { - NODE_PATH=concatMapStringsSep ":" - (pkg: "${builtins.getAttr pkg pkgs.statsd.nodePackages}/lib/node_modules") - (filter (name: !isBuiltinBackend name) cfg.backends); + NODE_PATH = "${deps}/lib/node_modules"; }; serviceConfig = { ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}"; diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix new file mode 100644 index 0000000000000000000000000000000000000000..a6a2ec6cbc366d43f43dde9e633a4a41d9806a0d --- /dev/null +++ b/nixos/modules/services/network-filesystems/beegfs.nix @@ -0,0 +1,343 @@ +{ config, lib, pkgs, ...} : + +with lib; + +let + cfg = config.services.beegfs; + + # functions for the generations of config files + + configMgmtd = name: cfg: pkgs.writeText "mgmt-${name}.conf" '' + storeMgmtdDirectory = ${cfg.mgmtd.storeDir} + storeAllowFirstRunInit = false + connAuthFile = ${cfg.connAuthFile} + connPortShift = ${toString cfg.connPortShift} + + ${cfg.mgmtd.extraConfig} + ''; + + configAdmon = name: cfg: pkgs.writeText "admon-${name}.conf" '' + sysMgmtdHost = ${cfg.mgmtdHost} + connAuthFile = ${cfg.connAuthFile} + connPortShift = ${toString cfg.connPortShift} + + ${cfg.admon.extraConfig} + ''; + + configMeta = name: cfg: pkgs.writeText "meta-${name}.conf" '' + storeMetaDirectory = ${cfg.meta.storeDir} + sysMgmtdHost = ${cfg.mgmtdHost} + connAuthFile = ${cfg.connAuthFile} + connPortShift = ${toString cfg.connPortShift} + storeAllowFirstRunInit = false + + ${cfg.mgmtd.extraConfig} + ''; + + configStorage = name: cfg: pkgs.writeText "storage-${name}.conf" '' + storeStorageDirectory = ${cfg.storage.storeDir} + sysMgmtdHost = ${cfg.mgmtdHost} + connAuthFile = ${cfg.connAuthFile} + connPortShift = ${toString cfg.connPortShift} + storeAllowFirstRunInit = false + + ${cfg.storage.extraConfig} + ''; + + configHelperd = name: cfg: pkgs.writeText "helperd-${name}.conf" '' + connAuthFile = ${cfg.connAuthFile} + ${cfg.helperd.extraConfig} + ''; + + configClientFilename = name : "/etc/beegfs/client-${name}.conf"; + + configClient = name: cfg: '' + sysMgmtdHost = ${cfg.mgmtdHost} + connAuthFile = ${cfg.connAuthFile} + connPortShift = ${toString cfg.connPortShift} + + ${cfg.client.extraConfig} + ''; + + serviceList = [ + { service = "admon"; cfgFile = configAdmon; } + { service = "meta"; cfgFile = configMeta; } + { service = "mgmtd"; cfgFile = configMgmtd; } + { service = "storage"; cfgFile = configStorage; } + ]; + + # functions to generate systemd.service entries + + systemdEntry = service: cfgFile: (mapAttrs' ( name: cfg: + (nameValuePair "beegfs-${service}-${name}" (mkIf cfg."${service}".enable { + wantedBy = [ "multi-user.target" ]; + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + serviceConfig = rec { + ExecStart = '' + ${pkgs.beegfs}/bin/beegfs-${service} \ + cfgFile=${cfgFile name cfg} \ + pidFile=${PIDFile} + ''; + PIDFile = "/run/beegfs-${service}-${name}.pid"; + TimeoutStopSec = "300"; + }; + }))) cfg); + + systemdHelperd = mapAttrs' ( name: cfg: + (nameValuePair "beegfs-helperd-${name}" (mkIf cfg.client.enable { + wantedBy = [ "multi-user.target" ]; + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + serviceConfig = rec { + ExecStart = '' + ${pkgs.beegfs}/bin/beegfs-helperd \ + cfgFile=${configHelperd name cfg} \ + pidFile=${PIDFile} + ''; + PIDFile = "/run/beegfs-helperd-${name}.pid"; + TimeoutStopSec = "300"; + }; + }))) cfg; + + # wrappers to beegfs tools. Avoid typing path of config files + utilWrappers = mapAttrsToList ( name: cfg: + ( pkgs.runCommand "beegfs-utils-${name}" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' + mkdir -p $out/bin + + makeWrapper ${pkgs.beegfs}/bin/beegfs-check-servers \ + $out/bin/beegfs-check-servers-${name} \ + --add-flags "-c ${configClientFilename name}" \ + --prefix PATH : ${lib.makeBinPath [ pkgs.beegfs ]} + + makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \ + $out/bin/beegfs-ctl-${name} \ + --add-flags "--cfgFile=${configClientFilename name}" + + makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \ + $out/bin/beegfs-df-${name} \ + --add-flags "--cfgFile=${configClientFilename name}" \ + --add-flags --listtargets \ + --add-flags --hidenodeid \ + --add-flags --pools \ + --add-flags --spaceinfo + + makeWrapper ${pkgs.beegfs}/bin/beegfs-fsck \ + $out/bin/beegfs-fsck-${name} \ + --add-flags "--cfgFile=${configClientFilename name}" + '' + )) cfg; +in +{ + ###### interface + + options = { + services.beegfsEnable = mkEnableOption "BeeGFS"; + + services.beegfs = mkOption { + default = {}; + description = '' + BeeGFS configurations. Every mount point requires a separate configuration. + ''; + type = with types; attrsOf (submodule ({ config, ... } : { + options = { + mgmtdHost = mkOption { + type = types.str; + default = null; + example = "master"; + description = ''Hostname of managament host.''; + }; + + connAuthFile = mkOption { + type = types.str; + default = ""; + example = "/etc/my.key"; + description = "File containing shared secret authentication."; + }; + + connPortShift = mkOption { + type = types.int; + default = 0; + example = 5; + description = '' + For each additional beegfs configuration shift all + service TCP/UDP ports by at least 5. + ''; + }; + + client = { + enable = mkEnableOption "BeeGFS client"; + + mount = mkOption { + type = types.bool; + default = true; + description = "Create fstab entry automatically"; + }; + + mountPoint = mkOption { + type = types.str; + default = "/run/beegfs"; + description = '' + Mount point under which the beegfs filesytem should be mounted. + If mounted manually the mount option specifing the config file is needed: + cfgFile=/etc/beegfs/beegfs-client-<name>.conf + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines for beegfs-client.conf. + See documentation for further details. + ''; + }; + }; + + helperd = { + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines for beegfs-helperd.conf. See documentation + for further details. + ''; + }; + }; + + mgmtd = { + enable = mkEnableOption "BeeGFS mgmtd daemon"; + + storeDir = mkOption { + type = types.path; + default = null; + example = "/data/beegfs-mgmtd"; + description = '' + Data directory for mgmtd. + Must not be shared with other beegfs daemons. + This directory must exist and it must be initialized + with beegfs-setup-mgmtd, e.g. "beegfs-setup-mgmtd -C -p <storeDir>" + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines for beegfs-mgmtd.conf. See documentation + for further details. + ''; + }; + }; + + admon = { + enable = mkEnableOption "BeeGFS admon daemon"; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines for beegfs-admon.conf. See documentation + for further details. + ''; + }; + }; + + meta = { + enable = mkEnableOption "BeeGFS meta data daemon"; + + storeDir = mkOption { + type = types.path; + default = null; + example = "/data/beegfs-meta"; + description = '' + Data directory for meta data service. + Must not be shared with other beegfs daemons. + The underlying filesystem must be mounted with xattr turned on. + This directory must exist and it must be initialized + with beegfs-setup-meta, e.g. + "beegfs-setup-meta -C -s <serviceID> -p <storeDir>" + ''; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Additional lines for beegfs-meta.conf. See documentation + for further details. + ''; + }; + }; + + storage = { + enable = mkEnableOption "BeeGFS storage daemon"; + + storeDir = mkOption { + type = types.path; + default = null; + example = "/data/beegfs-storage"; + description = '' + Data directories for storage service. + Must not be shared with other beegfs daemons. + The underlying filesystem must be mounted with xattr turned on. + This directory must exist and it must be initialized + with beegfs-setup-storage, e.g. + "beegfs-setup-storage -C -s <serviceID> -i <storageTargetID> -p <storeDir>" + ''; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Addional lines for beegfs-storage.conf. See documentation + for further details. + ''; + }; + }; + }; + })); + }; + }; + + ###### implementation + + config = + mkIf config.services.beegfsEnable { + + environment.systemPackages = utilWrappers; + + # Put the client.conf files in /etc since they are needed + # by the commandline tools + environment.etc = mapAttrs' ( name: cfg: + (nameValuePair "beegfs/client-${name}.conf" (mkIf (cfg.client.enable) + { + enable = true; + text = configClient name cfg; + }))) cfg; + + # Kernel module, we need it only once per host. + boot = mkIf ( + foldr (a: b: a || b) false + (map (x: x.client.enable) (collect (x: x ? client) cfg))) + { + kernelModules = [ "beegfs" ]; + extraModulePackages = [ pkgs.linuxPackages.beegfs-module ]; + }; + + # generate fstab entries + fileSystems = mapAttrs' (name: cfg: + (nameValuePair cfg.client.mountPoint (optionalAttrs cfg.client.mount (mkIf cfg.client.enable { + device = "beegfs_nodev"; + fsType = "beegfs"; + mountPoint = cfg.client.mountPoint; + options = [ "cfgFile=${configClientFilename name}" "_netdev" ]; + })))) cfg; + + # generate systemd services + systemd.services = systemdHelperd // + foldr (a: b: a // b) {} + (map (x: systemdEntry x.service x.cfgFile) serviceList); + }; +} diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix new file mode 100644 index 0000000000000000000000000000000000000000..5de8ae79a246eed377a0250225c85b74a821e786 --- /dev/null +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -0,0 +1,371 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + ceph = pkgs.ceph; + cfg = config.services.ceph; + # function that translates "camelCaseOptions" to "camel case options", credits to tilpner in #nixos@freenode + translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars); + generateDaemonList = (daemonType: daemons: extraServiceConfig: + mkMerge ( + map (daemon: + { "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; } + ) daemons + ) + ); + generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: { + enable = true; + description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}"; + after = [ "network-online.target" "local-fs.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target"; + wants = [ "network-online.target" "local-fs.target" "time-sync.target" ]; + partOf = [ "ceph-${daemonType}.target" ]; + wantedBy = [ "ceph-${daemonType}.target" ]; + + serviceConfig = { + LimitNOFILE = 1048576; + LimitNPROC = 1048576; + Environment = "CLUSTER=${clusterName}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + PrivateDevices = "yes"; + PrivateTmp = "true"; + ProtectHome = "true"; + ProtectSystem = "full"; + Restart = "on-failure"; + StartLimitBurst = "5"; + StartLimitInterval = "30min"; + ExecStart = "${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} -f --cluster ${clusterName} --id ${if daemonType == "rgw" then "client.${daemonId}" else daemonId} --setuser ceph --setgroup ceph"; + } // extraServiceConfig + // optionalAttrs (daemonType == "osd") { ExecStartPre = "${ceph.out}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}"; }; + } // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) { preStart = '' + daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}" + if [ ! -d ''$daemonPath ]; then + mkdir -m 755 -p ''$daemonPath + chown -R ceph:ceph ''$daemonPath + fi + ''; + } // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; } + ); + generateTargetFile = (daemonType: + { + "ceph-${daemonType}" = { + description = "Ceph target allowing to start/stop all ceph-${daemonType} services at once"; + partOf = [ "ceph.target" ]; + before = [ "ceph.target" ]; + }; + } + ); +in +{ + options.services.ceph = { + # Ceph has a monolithic configuration file but different sections for + # each daemon, a separate client section and a global section + enable = mkEnableOption "Ceph global configuration"; + + global = { + fsid = mkOption { + type = types.str; + example = '' + 433a2193-4f8a-47a0-95d2-209d7ca2cca5 + ''; + description = '' + Filesystem ID, a generated uuid, its must be generated and set before + attempting to start a cluster + ''; + }; + + clusterName = mkOption { + type = types.str; + default = "ceph"; + description = '' + Name of cluster + ''; + }; + + monInitialMembers = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + node0, node1, node2 + ''; + description = '' + List of hosts that will be used as monitors at startup. + ''; + }; + + monHost = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + 10.10.0.1, 10.10.0.2, 10.10.0.3 + ''; + description = '' + List of hostname shortnames/IP addresses of the initial monitors. + ''; + }; + + maxOpenFiles = mkOption { + type = types.int; + default = 131072; + description = '' + Max open files for each OSD daemon. + ''; + }; + + authClusterRequired = mkOption { + type = types.enum [ "cephx" "none" ]; + default = "cephx"; + description = '' + Enables requiring daemons to authenticate with eachother in the cluster. + ''; + }; + + authServiceRequired = mkOption { + type = types.enum [ "cephx" "none" ]; + default = "cephx"; + description = '' + Enables requiring clients to authenticate with the cluster to access services in the cluster (e.g. radosgw, mds or osd). + ''; + }; + + authClientRequired = mkOption { + type = types.enum [ "cephx" "none" ]; + default = "cephx"; + description = '' + Enables requiring the cluster to authenticate itself to the client. + ''; + }; + + publicNetwork = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + 10.20.0.0/24, 192.168.1.0/24 + ''; + description = '' + A comma-separated list of subnets that will be used as public networks in the cluster. + ''; + }; + + clusterNetwork = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + 10.10.0.0/24, 192.168.0.0/24 + ''; + description = '' + A comma-separated list of subnets that will be used as cluster networks in the cluster. + ''; + }; + }; + + mgr = { + enable = mkEnableOption "Ceph MGR daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of names for manager daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in mgr.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + description = '' + Extra configuration to add to the global section for manager daemons. + ''; + }; + }; + + mon = { + enable = mkEnableOption "Ceph MON daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of monitor daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in mon.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + description = '' + Extra configuration to add to the monitor section. + ''; + }; + }; + + osd = { + enable = mkEnableOption "Ceph OSD daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of OSD daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in osd.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = { + "osd journal size" = "10000"; + "osd pool default size" = "3"; + "osd pool default min size" = "2"; + "osd pool default pg num" = "200"; + "osd pool default pgp num" = "200"; + "osd crush chooseleaf type" = "1"; + }; + description = '' + Extra configuration to add to the OSD section. + ''; + }; + }; + + mds = { + enable = mkEnableOption "Ceph MDS daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of metadata service daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in mds.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + description = '' + Extra configuration to add to the MDS section. + ''; + }; + }; + + rgw = { + enable = mkEnableOption "Ceph RadosGW daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of rados gateway daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in client.name1, radosgw daemons + aren't daemons to cluster in the sense that OSD, MGR or MON daemons are. They are simply + daemons, from ceph, that uses the cluster as a backend. + ''; + }; + }; + + client = { + enable = mkEnableOption "Ceph client configuration"; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + example = '' + { + # This would create a section for a radosgw daemon named node0 and related + # configuration for it + "client.radosgw.node0" = { "some config option" = "true"; }; + }; + ''; + description = '' + Extra configuration to add to the client section. Configuration for rados gateways + would be added here, with their own sections, see example. + ''; + }; + }; + }; + + config = mkIf config.services.ceph.enable { + assertions = [ + { assertion = cfg.global.fsid != ""; + message = "fsid has to be set to a valid uuid for the cluster to function"; + } + { assertion = cfg.mgr.enable == true; + message = "ceph 12.x requires atleast 1 MGR daemon enabled for the cluster to function"; + } + { assertion = cfg.mon.enable == true -> cfg.mon.daemons != []; + message = "have to set id of atleast one MON if you're going to enable Monitor"; + } + { assertion = cfg.mds.enable == true -> cfg.mds.daemons != []; + message = "have to set id of atleast one MDS if you're going to enable Metadata Service"; + } + { assertion = cfg.osd.enable == true -> cfg.osd.daemons != []; + message = "have to set id of atleast one OSD if you're going to enable OSD"; + } + { assertion = cfg.mgr.enable == true -> cfg.mgr.daemons != []; + message = "have to set id of atleast one MGR if you're going to enable MGR"; + } + ]; + + warnings = optional (cfg.global.monInitialMembers == null) + ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function''; + + environment.etc."ceph/ceph.conf".text = let + # Translate camelCaseOptions to the expected camel case option for ceph.conf + translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global; + # Merge the extraConfig set for mgr daemons, as mgr don't have their own section + globalAndMgrConfig = translatedGlobalConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig; + # Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf + globalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) (filterAttrs (name: value: value != null) globalAndMgrConfig); + totalConfig = { + "global" = globalConfig; + } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { "mon" = cfg.mon.extraConfig; } + // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { "mds" = cfg.mds.extraConfig; } + // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { "osd" = cfg.osd.extraConfig; } + // optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig; + in + generators.toINI {} totalConfig; + + users.extraUsers = singleton { + name = "ceph"; + uid = config.ids.uids.ceph; + description = "Ceph daemon user"; + }; + + users.extraGroups = singleton { + name = "ceph"; + gid = config.ids.gids.ceph; + }; + + systemd.services = let + services = [] + ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; }) + ++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; }) + ++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; }) + ++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { }) + ++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; }); + in + mkMerge services; + + systemd.targets = let + targets = [ + { "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; }; } + ] ++ optional cfg.mon.enable (generateTargetFile "mon") + ++ optional cfg.mds.enable (generateTargetFile "mds") + ++ optional cfg.osd.enable (generateTargetFile "osd") + ++ optional cfg.rgw.enable (generateTargetFile "rgw") + ++ optional cfg.mgr.enable (generateTargetFile "mgr"); + in + mkMerge targets; + + systemd.tmpfiles.rules = [ + "d /run/ceph 0770 ceph ceph -" + ]; + }; +} diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix new file mode 100644 index 0000000000000000000000000000000000000000..6b2a770100c5b28f8616127eefb786729e1130ad --- /dev/null +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.davfs2; + cfgFile = pkgs.writeText "davfs2.conf" '' + dav_user ${cfg.davUser} + dav_group ${cfg.davGroup} + ${cfg.extraConfig} + ''; +in +{ + options.services.davfs2 = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable davfs2. + ''; + }; + + davUser = mkOption { + type = types.string; + default = "davfs2"; + description = '' + When invoked by root the mount.davfs daemon will run as this user. + Value must be given as name, not as numerical id. + ''; + }; + + davGroup = mkOption { + type = types.string; + default = "davfs2"; + description = '' + The group of the running mount.davfs daemon. Ordinary users must be + member of this group in order to mount a davfs2 file system. Value must + be given as name, not as numerical id. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + kernel_fs coda + proxy foo.bar:8080 + use_locks 0 + ''; + description = '' + Extra lines appended to the configuration of davfs2. + '' ; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.davfs2 ]; + environment.etc."davfs2/davfs2.conf".source = cfgFile; + + users.extraGroups = optionalAttrs (cfg.davGroup == "davfs2") (singleton { + name = "davfs2"; + gid = config.ids.gids.davfs2; + }); + + users.extraUsers = optionalAttrs (cfg.davUser == "davfs2") (singleton { + name = "davfs2"; + createHome = false; + group = cfg.davGroup; + uid = config.ids.uids.davfs2; + description = "davfs2 user"; + }); + }; + +} diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index d4a695ef5880561e78422b2c499108f262235749..39a4fd6beff841a23ec390cb913624d88fe3bee3 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -39,8 +39,6 @@ let # NB: migration must be performed prior to pre-start, else we get the failure message! preStart = '' ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214) - ipfs --local config Addresses.API ${cfg.apiAddress} - ipfs --local config Addresses.Gateway ${cfg.gatewayAddress} '' + optionalString cfg.autoMount '' ipfs --local config Mounts.FuseAllowOther --json true ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir} @@ -56,7 +54,11 @@ let EOF ipfs --local config --json "${concatStringsSep "." path}" "$value" '') - cfg.extraConfig) + ({ Addresses.API = cfg.apiAddress; + Addresses.Gateway = cfg.gatewayAddress; + Addresses.Swarm = cfg.swarmAddress; + } // + cfg.extraConfig)) ); serviceConfig = { ExecStart = "${wrapped}/bin/ipfs daemon ${ipfsFlags}"; @@ -140,6 +142,12 @@ in { description = "Where IPFS exposes its API to"; }; + swarmAddress = mkOption { + type = types.listOf types.str; + default = [ "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" ]; + description = "Where IPFS listens for incoming p2p connections"; + }; + enableGC = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix deleted file mode 100644 index 0946e379e796796c94809f67b09e57d69253bca6..0000000000000000000000000000000000000000 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - inherit (lib) mkOption mkIf; - - cfg = config.services.openafsClient; - - cellServDB = pkgs.fetchurl { - url = http://dl.central.org/dl/cellservdb/CellServDB.2017-03-14; - sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc"; - }; - - afsConfig = pkgs.runCommand "afsconfig" {} '' - mkdir -p $out - echo ${cfg.cellName} > $out/ThisCell - cp ${cellServDB} $out/CellServDB - echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo - ''; - - openafsPkgs = config.boot.kernelPackages.openafsClient; -in -{ - ###### interface - - options = { - - services.openafsClient = { - - enable = mkOption { - default = false; - description = "Whether to enable the OpenAFS client."; - }; - - cellName = mkOption { - default = "grand.central.org"; - description = "Cell name."; - }; - - cacheSize = mkOption { - default = "100000"; - description = "Cache size."; - }; - - cacheDirectory = mkOption { - default = "/var/cache/openafs"; - description = "Cache directory."; - }; - - crypt = mkOption { - default = false; - description = "Whether to enable (weak) protocol encryption."; - }; - - sparse = mkOption { - default = false; - description = "Minimal cell list in /afs."; - }; - - }; - }; - - - ###### implementation - - config = mkIf cfg.enable { - - environment.systemPackages = [ openafsPkgs ]; - - environment.etc = [ - { source = afsConfig; - target = "openafs"; - } - ]; - - systemd.services.afsd = { - description = "AFS client"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { RemainAfterExit = true; }; - - preStart = '' - mkdir -p -m 0755 /afs - mkdir -m 0700 -p ${cfg.cacheDirectory} - ${pkgs.kmod}/bin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true - ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb - ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} - ''; - - # Doing this in preStop, because after these commands AFS is basically - # stopped, so systemd has nothing to do, just noticing it. If done in - # postStop, then we get a hang + kernel oops, because AFS can't be - # stopped simply by sending signals to processes. - preStop = '' - ${pkgs.utillinux}/bin/umount /afs - ${openafsPkgs}/sbin/afsd -shutdown - ''; - }; - }; -} diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix new file mode 100644 index 0000000000000000000000000000000000000000..3826fe3edfd0327db63857336726feb595d83eaf --- /dev/null +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -0,0 +1,239 @@ +{ config, pkgs, lib, ... }: + +with import ./lib.nix { inherit lib; }; + +let + inherit (lib) getBin mkOption mkIf optionalString singleton types; + + cfg = config.services.openafsClient; + + cellServDB = pkgs.fetchurl { + url = http://dl.central.org/dl/cellservdb/CellServDB.2017-03-14; + sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc"; + }; + + clientServDB = pkgs.writeText "client-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.cellServDB); + + afsConfig = pkgs.runCommand "afsconfig" {} '' + mkdir -p $out + echo ${cfg.cellName} > $out/ThisCell + cat ${cellServDB} ${clientServDB} > $out/CellServDB + echo "${cfg.mountPoint}:${cfg.cache.directory}:${toString cfg.cache.blocks}" > $out/cacheinfo + ''; + + openafsMod = config.boot.kernelPackages.openafs; + openafsBin = lib.getBin pkgs.openafs; +in +{ + ###### interface + + options = { + + services.openafsClient = { + + enable = mkOption { + default = false; + type = types.bool; + description = "Whether to enable the OpenAFS client."; + }; + + afsdb = mkOption { + default = true; + type = types.bool; + description = "Resolve cells via AFSDB DNS records."; + }; + + cellName = mkOption { + default = ""; + type = types.str; + description = "Cell name."; + example = "grand.central.org"; + }; + + cellServDB = mkOption { + default = []; + type = with types; listOf (submodule { options = cellServDBConfig; }); + description = '' + This cell's database server records, added to the global + CellServDB. See CellServDB(5) man page for syntax. Ignored when + afsdb is set to true. + ''; + example = '' + [ { ip = "1.2.3.4"; dnsname = "first.afsdb.server.dns.fqdn.org"; } + { ip = "2.3.4.5"; dnsname = "second.afsdb.server.dns.fqdn.org"; } + ] + ''; + }; + + cache = { + blocks = mkOption { + default = 100000; + type = types.int; + description = "Cache size in 1KB blocks."; + }; + + chunksize = mkOption { + default = 0; + type = types.ints.between 0 30; + description = '' + Size of each cache chunk given in powers of + 2. 0 resets the chunk size to its default + values (13 (8 KB) for memcache, 18-20 (256 KB to 1 MB) for + diskcache). Maximum value is 30. Important performance + parameter. Set to higher values when dealing with large files. + ''; + }; + + directory = mkOption { + default = "/var/cache/openafs"; + type = types.str; + description = "Cache directory."; + }; + + diskless = mkOption { + default = false; + type = types.bool; + description = '' + Use in-memory cache for diskless machines. Has no real + performance benefit anymore. + ''; + }; + }; + + crypt = mkOption { + default = true; + type = types.bool; + description = "Whether to enable (weak) protocol encryption."; + }; + + daemons = mkOption { + default = 2; + type = types.int; + description = '' + Number of daemons to serve user requests. Numbers higher than 6 + usually do no increase performance. Default is sufficient for up + to five concurrent users. + ''; + }; + + fakestat = mkOption { + default = false; + type = types.bool; + description = '' + Return fake data on stat() calls. If true, + always do so. If false, only do so for + cross-cell mounts (as these are potentially expensive). + ''; + }; + + inumcalc = mkOption { + default = "compat"; + type = types.strMatching "compat|md5"; + description = '' + Inode calculation method. compat is + computationally less expensive, but md5 greatly + reduces the likelihood of inode collisions in larger scenarios + involving multiple cells mounted into one AFS space. + ''; + }; + + mountPoint = mkOption { + default = "/afs"; + type = types.str; + description = '' + Mountpoint of the AFS file tree, conventionally + /afs. When set to a different value, only + cross-cells that use the same value can be accessed. + ''; + }; + + sparse = mkOption { + default = true; + type = types.bool; + description = "Minimal cell list in /afs."; + }; + + startDisconnected = mkOption { + default = false; + type = types.bool; + description = '' + Start up in disconnected mode. You need to execute + fs disco online (as root) to switch to + connected mode. Useful for roaming devices. + ''; + }; + + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + assertions = [ + { assertion = cfg.afsdb || cfg.cellServDB != []; + message = "You should specify all cell-local database servers in config.services.openafsClient.cellServDB or set config.services.openafsClient.afsdb."; + } + { assertion = cfg.cellName != ""; + message = "You must specify the local cell name in config.services.openafsClient.cellName."; + } + ]; + + environment.systemPackages = [ pkgs.openafs ]; + + environment.etc = { + clientCellServDB = { + source = pkgs.runCommand "CellServDB" {} '' + cat ${cellServDB} ${clientServDB} > $out + ''; + target = "openafs/CellServDB"; + mode = "0644"; + }; + clientCell = { + text = '' + ${cfg.cellName} + ''; + target = "openafs/ThisCell"; + mode = "0644"; + }; + }; + + systemd.services.afsd = { + description = "AFS client"; + wantedBy = [ "multi-user.target" ]; + after = singleton (if cfg.startDisconnected then "network.target" else "network-online.target"); + serviceConfig = { RemainAfterExit = true; }; + restartIfChanged = false; + + preStart = '' + mkdir -p -m 0755 ${cfg.mountPoint} + mkdir -m 0700 -p ${cfg.cache.directory} + ${pkgs.kmod}/bin/insmod ${openafsMod}/lib/modules/*/extra/openafs/libafs.ko.xz + ${openafsBin}/sbin/afsd \ + -mountdir ${cfg.mountPoint} \ + -confdir ${afsConfig} \ + ${optionalString (!cfg.cache.diskless) "-cachedir ${cfg.cache.directory}"} \ + -blocks ${toString cfg.cache.blocks} \ + -chunksize ${toString cfg.cache.chunksize} \ + ${optionalString cfg.cache.diskless "-memcache"} \ + -inumcalc ${cfg.inumcalc} \ + ${if cfg.fakestat then "-fakestat-all" else "-fakestat"} \ + ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} \ + ${optionalString cfg.afsdb "-afsdb"} + ${openafsBin}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} + ${optionalString cfg.startDisconnected "${openafsBin}/bin/fs discon offline"} + ''; + + # Doing this in preStop, because after these commands AFS is basically + # stopped, so systemd has nothing to do, just noticing it. If done in + # postStop, then we get a hang + kernel oops, because AFS can't be + # stopped simply by sending signals to processes. + preStop = '' + ${pkgs.utillinux}/bin/umount ${cfg.mountPoint} + ${openafsBin}/sbin/afsd -shutdown + ${pkgs.kmod}/sbin/rmmod libafs + ''; + }; + }; +} diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix new file mode 100644 index 0000000000000000000000000000000000000000..ecfc72d2eaf911a19b02f8801361a086387be230 --- /dev/null +++ b/nixos/modules/services/network-filesystems/openafs/lib.nix @@ -0,0 +1,28 @@ +{ lib, ...}: + +let + inherit (lib) concatStringsSep mkOption types; + +in rec { + + mkCellServDB = cellName: db: '' + >${cellName} + '' + (concatStringsSep "\n" (map (dbm: if (dbm.ip != "" && dbm.dnsname != "") then dbm.ip + " #" + dbm.dnsname else "") + db)); + + # CellServDB configuration type + cellServDBConfig = { + ip = mkOption { + type = types.str; + default = ""; + example = "1.2.3.4"; + description = "IP Address of a database server"; + }; + dnsname = mkOption { + type = types.str; + default = ""; + example = "afs.example.org"; + description = "DNS full-qualified domain name of a database server"; + }; + }; +} diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix new file mode 100644 index 0000000000000000000000000000000000000000..429eb945ac9e800493ae3fcd7968e56154c954bf --- /dev/null +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -0,0 +1,260 @@ +{ config, pkgs, lib, ... }: + +with import ./lib.nix { inherit lib; }; + +let + inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types; + + bosConfig = pkgs.writeText "BosConfig" ('' + restrictmode 1 + restarttime 16 0 0 0 0 + checkbintime 3 0 5 0 0 + '' + (optionalString cfg.roles.database.enable '' + bnode simple vlserver 1 + parm ${openafsBin}/libexec/openafs/vlserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.vlserverArgs} + end + bnode simple ptserver 1 + parm ${openafsBin}/libexec/openafs/ptserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.ptserverArgs} + end + '') + (optionalString cfg.roles.fileserver.enable '' + bnode dafs dafs 1 + parm ${openafsBin}/libexec/openafs/dafileserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.fileserverArgs} + parm ${openafsBin}/libexec/openafs/davolserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.volserverArgs} + parm ${openafsBin}/libexec/openafs/salvageserver ${cfg.roles.fileserver.salvageserverArgs} + parm ${openafsBin}/libexec/openafs/dasalvager ${cfg.roles.fileserver.salvagerArgs} + end + '') + (optionalString (cfg.roles.database.enable && cfg.roles.backup.enable) '' + bnode simple buserver 1 + parm ${openafsBin}/libexec/openafs/buserver ${cfg.roles.backup.buserverArgs} ${optionalString (cfg.roles.backup.cellServDB != []) "-cellservdb /etc/openafs/backup/"} + end + '')); + + netInfo = if (cfg.advertisedAddresses != []) then + pkgs.writeText "NetInfo" ((concatStringsSep "\nf " cfg.advertisedAddresses) + "\n") + else null; + + buCellServDB = pkgs.writeText "backup-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.roles.backup.cellServDB); + + cfg = config.services.openafsServer; + + udpSizeStr = toString cfg.udpPacketSize; + + openafsBin = lib.getBin pkgs.openafs; + +in { + + options = { + + services.openafsServer = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable the OpenAFS server. An OpenAFS server needs a + complex setup. So, be aware that enabling this service and setting + some options does not give you a turn-key-ready solution. You need + at least a running Kerberos 5 setup, as OpenAFS relies on it for + authentication. See the Guide "QuickStartUnix" coming with + pkgs.openafs.doc for complete setup + instructions. + ''; + }; + + advertisedAddresses = mkOption { + default = []; + description = "List of IP addresses this server is advertised under. See NetInfo(5)"; + }; + + cellName = mkOption { + default = ""; + type = types.str; + description = "Cell name, this server will serve."; + example = "grand.central.org"; + }; + + cellServDB = mkOption { + default = []; + type = with types; listOf (submodule [ { options = cellServDBConfig;} ]); + description = "Definition of all cell-local database server machines."; + }; + + roles = { + fileserver = { + enable = mkOption { + default = true; + type = types.bool; + description = "Fileserver role, serves files and volumes from its local storage."; + }; + + fileserverArgs = mkOption { + default = "-vattachpar 128 -vhashsize 11 -L -rxpck 400 -cb 1000000"; + type = types.str; + description = "Arguments to the dafileserver process. See its man page."; + }; + + volserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the davolserver process. See its man page."; + example = "-sync never"; + }; + + salvageserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the salvageserver process. See its man page."; + example = "-showlog"; + }; + + salvagerArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the dasalvager process. See its man page."; + example = "-showlog -showmounts"; + }; + }; + + database = { + enable = mkOption { + default = true; + type = types.bool; + description = '' + Database server role, maintains the Volume Location Database, + Protection Database (and Backup Database, see + backup role). There can be multiple + servers in the database role for replication, which then need + reliable network connection to each other. + + Servers in this role appear in AFSDB DNS records or the + CellServDB. + ''; + }; + + vlserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the vlserver process. See its man page."; + example = "-rxbind"; + }; + + ptserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the ptserver process. See its man page."; + example = "-restricted -default_access S---- S-M---"; + }; + }; + + backup = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Backup server role. Use in conjunction with the + database role to maintain the Backup + Database. Normally only used in conjunction with tape storage + or IBM's Tivoli Storage Manager. + ''; + }; + + buserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the buserver process. See its man page."; + example = "-p 8"; + }; + + cellServDB = mkOption { + default = []; + type = with types; listOf (submodule [ { options = cellServDBConfig;} ]); + description = '' + Definition of all cell-local backup database server machines. + Use this when your cell uses less backup database servers than + other database server machines. + ''; + }; + }; + }; + + dottedPrincipals= mkOption { + default = false; + type = types.bool; + description = '' + If enabled, allow principal names containing (.) dots. Enabling + this has security implications! + ''; + }; + + udpPacketSize = mkOption { + default = 1310720; + type = types.int; + description = '' + UDP packet size to use in Bytes. Higher values can speed up + communications. The default of 1 MB is a sufficient in most + cases. Make sure to increase the kernel's UDP buffer size + accordingly via net.core(w|r|opt)mem_max + sysctl. + ''; + }; + + }; + + }; + + config = mkIf cfg.enable { + + assertions = [ + { assertion = cfg.cellServDB != []; + message = "You must specify all cell-local database servers in config.services.openafsServer.cellServDB."; + } + { assertion = cfg.cellName != ""; + message = "You must specify the local cell name in config.services.openafsServer.cellName."; + } + ]; + + environment.systemPackages = [ pkgs.openafs ]; + + environment.etc = { + bosConfig = { + source = bosConfig; + target = "openafs/BosConfig"; + mode = "0644"; + }; + cellServDB = { + text = mkCellServDB cfg.cellName cfg.cellServDB; + target = "openafs/server/CellServDB"; + mode = "0644"; + }; + thisCell = { + text = cfg.cellName; + target = "openafs/server/ThisCell"; + mode = "0644"; + }; + buCellServDB = { + enable = (cfg.roles.backup.cellServDB != []); + text = mkCellServDB cfg.cellName cfg.roles.backup.cellServDB; + target = "openafs/backup/CellServDB"; + }; + }; + + systemd.services = { + openafs-server = { + description = "OpenAFS server"; + after = [ "syslog.target" "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartIfChanged = false; + unitConfig.ConditionPathExists = [ "/etc/openafs/server/rxkad.keytab" ]; + preStart = '' + mkdir -m 0755 -p /var/openafs + ${optionalString (netInfo != null) "cp ${netInfo} /var/openafs/netInfo"} + ${optionalString (cfg.roles.backup.cellServDB != []) "cp ${buCellServDB}"} + ''; + serviceConfig = { + ExecStart = "${openafsBin}/bin/bosserver -nofork"; + ExecStop = "${openafsBin}/bin/bos shutdown localhost -wait -localauth"; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 9b9c91a4f16726b30eff6d59a3ba01f4b39764ee..b23266e8d43a3ec5bb9f89a2d10b10834f30ee16 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -54,9 +54,12 @@ let }; serviceConfig = { - ExecStart = "${samba}/sbin/${appName} ${args}"; + ExecStart = "${samba}/sbin/${appName} --foreground --no-process-group ${args}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + LimitNOFILE = 16384; + PIDFile = "/run/${appName}.pid"; Type = "notify"; + NotifyAccess = "all"; #may not do anything... }; restartTriggers = [ configFile ]; @@ -230,11 +233,12 @@ in after = [ "samba-setup.service" "network.target" ]; wantedBy = [ "multi-user.target" ]; }; - + # Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd + # for correct use with systemd services = { - "samba-smbd" = daemonService "smbd" "-F"; - "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "-F"); - "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "-F"); + "samba-smbd" = daemonService "smbd" ""; + "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" ""); + "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" ""); "samba-setup" = { description = "Samba Setup Task"; script = setupScript; diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 0c6714563d8a057de764dcacb7c453f1063c803b..95d7641e8b53f947507597e8a6ef358630bc1cb5 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -11,7 +11,7 @@ let home = cfg.homeDir; startupScript = class: configPath: pkgs.writeScript "xtreemfs-osd.sh" '' - #! ${pkgs.stdenv.shell} + #! ${pkgs.runtimeShell} JAVA_HOME="${pkgs.jdk}" JAVADIR="${xtreemfs}/share/java" JAVA_CALL="$JAVA_HOME/bin/java -ea -cp $JAVADIR/XtreemFS.jar:$JAVADIR/BabuDB.jar:$JAVADIR/Flease.jar:$JAVADIR/protobuf-java-2.5.0.jar:$JAVADIR/Foundation.jar:$JAVADIR/jdmkrt.jar:$JAVADIR/jdmktk.jar:$JAVADIR/commons-codec-1.3.jar" diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index 4de206641331317aa422c4b2919b168b53583519..44b0edf6201854fc1e44e8f2a6235fbb528dea2b 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -99,10 +99,10 @@ in exit 1 fi - ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \ + ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${u} \ -c '${pkgs.yandex-disk}/bin/yandex-disk token -p ${cfg.password} ${cfg.username} ${dir}/token' - ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \ + ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${u} \ -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory} --exclude-dirs=${cfg.excludes}' ''; diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index fc7d56a24fa72cc9e4c88be0d865db5220e785c0..9898f164c5cf87ada7a6f0527ff790488766d037 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -68,7 +68,7 @@ in ''; script = '' - ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \ + ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \ -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled' ''; }; diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix index ad4ac9bf45e32cab4b05bf682139428d0d4737c8..df9c92db2e5408980ad9fcc317a8f6bcc5bb0f54 100644 --- a/nixos/modules/services/networking/aria2.nix +++ b/nixos/modules/services/networking/aria2.nix @@ -10,9 +10,9 @@ let 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} @@ -110,12 +110,12 @@ in mkdir -m 0770 -p "${homeDir}" chown aria2:aria2 "${homeDir}" if [[ ! -d "${config.services.aria2.downloadDir}" ]] - then + then mkdir -m 0770 -p "${config.services.aria2.downloadDir}" chown aria2:aria2 "${config.services.aria2.downloadDir}" fi if [[ ! -e "${sessionFile}" ]] - then + then touch "${sessionFile}" chown aria2:aria2 "${sessionFile}" fi @@ -132,4 +132,4 @@ in }; }; }; -} \ No newline at end of file +} diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 1a7a1e24b702d2e9e71b8406ba8c83aa17217ae6..c25bd0fdc5411cdf06b2d363633db84f4e61dc3b 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -7,21 +7,27 @@ let let cfg = config.services.${variant}; pkg = pkgs.${variant}; + birdBin = if variant == "bird6" then "bird6" else "bird"; birdc = if variant == "bird6" then "birdc6" else "birdc"; + descr = + { bird = "1.9.x with IPv4 suport"; + bird6 = "1.9.x with IPv6 suport"; + bird2 = "2.x"; + }.${variant}; configFile = pkgs.stdenv.mkDerivation { name = "${variant}.conf"; text = cfg.config; preferLocalBuild = true; buildCommand = '' echo -n "$text" > $out - ${pkg}/bin/${variant} -d -p -c $out + ${pkg}/bin/${birdBin} -d -p -c $out ''; }; in { ###### interface options = { services.${variant} = { - enable = mkEnableOption "BIRD Internet Routing Daemon"; + enable = mkEnableOption "BIRD Internet Routing Daemon (${descr})"; config = mkOption { type = types.lines; description = '' @@ -36,12 +42,12 @@ let config = mkIf cfg.enable { environment.systemPackages = [ pkg ]; systemd.services.${variant} = { - description = "BIRD Internet Routing Daemon"; + description = "BIRD Internet Routing Daemon (${descr})"; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; Restart = "on-failure"; - ExecStart = "${pkg}/bin/${variant} -c ${configFile} -u ${variant} -g ${variant}"; + ExecStart = "${pkg}/bin/${birdBin} -c ${configFile} -u ${variant} -g ${variant}"; ExecReload = "${pkg}/bin/${birdc} configure"; ExecStop = "${pkg}/bin/${birdc} down"; CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID" @@ -56,14 +62,15 @@ let users = { extraUsers.${variant} = { description = "BIRD Internet Routing Daemon user"; - group = "${variant}"; + group = variant; }; extraGroups.${variant} = {}; }; }; }; - inherit (config.services) bird bird6; -in { - imports = [(generic "bird") (generic "bird6")]; +in + +{ + imports = map generic [ "bird" "bird6" "bird2" ]; } diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index 546d270692328907ea5caf3459a913ba4b8ec739..c3ca6fbe725e56ce90c7747810d450ad9e83b532 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -52,6 +52,15 @@ in { ''; }; + extraFlags = mkOption { + type = with types; listOf string; + default = [ ]; + example = [ "--nodnsproxy" ]; + description = '' + Extra flags to pass to connmand + ''; + }; + }; }; @@ -81,7 +90,7 @@ in { Type = "dbus"; BusName = "net.connman"; Restart = "on-failure"; - ExecStart = "${pkgs.connman}/sbin/connmand --config=${configFile} --nodaemon"; + ExecStart = "${pkgs.connman}/sbin/connmand --config=${configFile} --nodaemon ${toString cfg.extraFlags}"; StandardOutput = "null"; }; }; diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix index a9a77f3412af99d555acd734ee0e4de4dce94458..32acce51e692a99225e241e63dcaf50d3b6c2177 100644 --- a/nixos/modules/services/networking/dante.nix +++ b/nixos/modules/services/networking/dante.nix @@ -47,7 +47,7 @@ in systemd.services.dante = { description = "Dante SOCKS v4 and v5 compatible proxy server"; - after = [ "network.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 9e56545f746c4d20cf0e7a61d4eb00b350472f1d..9a2e13e9553c6f23b395bc26b2e01afdc6323cd1 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -3,24 +3,24 @@ let cfg = config.services.ddclient; boolToStr = bool: if bool then "yes" else "no"; + dataDir = "/var/lib/ddclient"; configText = '' # This file can be used as a template for configFile or is automatically generated by Nix options. - daemon=${toString cfg.interval} - cache=${cfg.homeDir}/ddclient.cache - pid=/run/ddclient/ddclient.pid - foreground=NO + cache=${dataDir}/ddclient.cache + foreground=YES use=${cfg.use} login=${cfg.username} password=${cfg.password} protocol=${cfg.protocol} - ${let server = cfg.server; in - lib.optionalString (server != "") "server=${server}"} + ${lib.optionalString (cfg.script != "") "script=${cfg.script}"} + ${lib.optionalString (cfg.server != "") "server=${cfg.server}"} + ${lib.optionalString (cfg.zone != "") "zone=${cfg.zone}"} ssl=${boolToStr cfg.ssl} wildcard=YES quiet=${boolToStr cfg.quiet} verbose=${boolToStr cfg.verbose} - ${cfg.domain} + ${lib.concatStringsSep "," cfg.domains} ${cfg.extraConfig} ''; @@ -44,17 +44,11 @@ with lib; ''; }; - homeDir = mkOption { - default = "/var/lib/ddclient"; - type = str; - description = "Home directory for the daemon user."; - }; - - domain = mkOption { - default = ""; - type = str; + domains = mkOption { + default = [ "" ]; + type = listOf str; description = '' - Domain name to synchronize. + Domain name(s) to synchronize. ''; }; @@ -62,7 +56,7 @@ with lib; default = ""; type = str; description = '' - Username. + User name. ''; }; @@ -75,9 +69,12 @@ with lib; }; interval = mkOption { - default = 600; - type = int; - description = "The interval at which to run the check and update."; + default = "10min"; + type = str; + description = '' + The interval at which to run the check and update. + See man 7 systemd.time for the format. + ''; }; configFile = mkOption { @@ -95,7 +92,7 @@ with lib; default = "dyndns2"; type = str; description = '' - Protocol to use with dynamic DNS provider (see http://sourceforge.net/apps/trac/ddclient/wiki/Protocols). + Protocol to use with dynamic DNS provider (see https://sourceforge.net/p/ddclient/wiki/protocols). ''; }; @@ -115,11 +112,20 @@ with lib; ''; }; - extraConfig = mkOption { + + quiet = mkOption { + default = false; + type = bool; + description = '' + Print no messages for unnecessary updates. + ''; + }; + + script = mkOption { default = ""; - type = lines; + type = str; description = '' - Extra configuration. Contents will be added verbatim to the configuration file. + script as required by some providers. ''; }; @@ -139,11 +145,19 @@ with lib; ''; }; - quiet = mkOption { - default = false; - type = bool; + zone = mkOption { + default = ""; + type = str; description = '' - Print no messages for unnecessary updates. + zone as required by some providers. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = lines; + description = '' + Extra configuration. Contents will be added verbatim to the configuration file. ''; }; }; @@ -153,23 +167,8 @@ with lib; ###### implementation config = mkIf config.services.ddclient.enable { - - users = { - extraGroups.ddclient.gid = config.ids.gids.ddclient; - - extraUsers.ddclient = { - uid = config.ids.uids.ddclient; - description = "ddclient daemon user"; - group = "ddclient"; - home = cfg.homeDir; - createHome = true; - }; - }; - environment.etc."ddclient.conf" = { enable = cfg.configFile == "/etc/ddclient.conf"; - uid = config.ids.uids.ddclient; - gid = config.ids.gids.ddclient; mode = "0600"; text = configText; }; @@ -180,15 +179,22 @@ with lib; after = [ "network.target" ]; restartTriggers = [ config.environment.etc."ddclient.conf".source ]; - serviceConfig = { - RuntimeDirectory = "ddclient"; - # we cannot run in forking mode as it swallows all the program output - Type = "simple"; - User = "ddclient"; - Group = "ddclient"; - ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -foreground -file ${cfg.configFile}"; - ProtectSystem = "full"; - PrivateTmp = true; + serviceConfig = rec { + DynamicUser = true; + RuntimeDirectory = StateDirectory; + StateDirectory = builtins.baseNameOf dataDir; + Type = "oneshot"; + ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m666 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf"; + ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf"; + }; + }; + + systemd.timers.ddclient = { + description = "Run ddclient"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = cfg.interval; + OnUnitInactiveSec = cfg.interval; }; }; }; diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index d283c7624335692f4bfb16c3de97af431f796639..de0aa1a2c2c31009867fae775134061879dcfc88 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -16,7 +16,7 @@ let # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. ignoredInterfaces = - map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ip4 != [ ] || i.ipAddress != null) interfaces) + map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces) ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.vswitches)) @@ -156,11 +156,11 @@ in systemd.services.dhcpcd = let cfgN = config.networking; hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "") - || (cfgN.defaultGateway6 != null && cfgN.defaultGateway6.address != ""); + && (!cfgN.enableIPv6 || (cfgN.defaultGateway6 != null && cfgN.defaultGateway6.address != "")); in { description = "DHCP Client"; - wantedBy = optional (!hasDefaultGatewaySet) "network-online.target"; + wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target"; after = [ "network.target" ]; wants = [ "network.target" ]; diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 2eac6dfec5b7baf3ce126f49cf6f7f00d37b5ec7..fd7e317eee9551c262a2c92aa6c57c6b16064c8f 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -36,6 +36,7 @@ let preStart = '' mkdir -m 755 -p ${cfg.stateDir} + chown dhcpd:nogroup ${cfg.stateDir} touch ${cfg.stateDir}/dhcpd.leases ''; diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index 379203cd1ab6e121d414fab8f9e950081916f49a..ba5c8e2d5e53f565cac79b9cedf402e6d6e83875 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -9,12 +9,12 @@ let mkdir -p $out/{servers,ip} ${concatMapStrings (ip: '' - echo > "$out/ip/"${lib.escapeShellArg ip} + touch "$out/ip/"${lib.escapeShellArg ip} '') cfg.clientIps} ${concatStrings (mapAttrsToList (host: ips: '' ${concatMapStrings (ip: '' - echo ${lib.escapeShellArg ip} > "$out/servers/"${lib.escapeShellArg host} + echo ${lib.escapeShellArg ip} >> "$out/servers/"${lib.escapeShellArg host} '') ips} '') cfg.domainServers)} @@ -34,33 +34,49 @@ in { options = { services.dnscache = { + enable = mkOption { default = false; type = types.bool; - description = "Whether to run the dnscache caching dns server"; + description = "Whether to run the dnscache caching dns server."; }; ip = mkOption { default = "0.0.0.0"; type = types.str; - description = "IP address on which to listen for connections"; + description = "IP address on which to listen for connections."; }; clientIps = mkOption { default = [ "127.0.0.1" ]; type = types.listOf types.str; - description = "client IP addresses (or prefixes) from which to accept connections"; + description = "Client IP addresses (or prefixes) from which to accept connections."; example = ["192.168" "172.23.75.82"]; }; domainServers = mkOption { default = { }; type = types.attrsOf (types.listOf types.str); - description = "table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts)"; + description = '' + Table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts). + If entry for @ is not specified predefined list of root servers is used. + ''; example = { - "example.com" = ["8.8.8.8" "8.8.4.4"]; + "@" = ["8.8.8.8" "8.8.4.4"]; + "example.com" = ["192.168.100.100"]; }; }; + + forwardOnly = mkOption { + default = false; + type = types.bool; + description = '' + Whether to treat root servers (for @) as caching + servers, requesting addresses the same way a client does. This is + needed if you want to use e.g. Google DNS as your upstream DNS. + ''; + }; + }; }; @@ -82,6 +98,7 @@ in { ''; script = '' cd /var/lib/dnscache/ + ${optionalString cfg.forwardOnly "export FORWARDONLY=1"} exec ./run ''; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index ed658258c7f9d27242f171dad997b398e8337207..857657eea4db4f4c1da8148b8a79575ce312f378 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -10,7 +10,7 @@ let # This is somewhat more flexible than preloading the key as an # embedded string. upstreamResolverListPubKey = pkgs.fetchurl { - url = https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/minisign.pub; + url = https://raw.githubusercontent.com/dyne/dnscrypt-proxy/master/minisign.pub; sha256 = "18lnp8qr6ghfc2sd46nn1rhcpr324fqlvgsp4zaigw396cd7vnnh"; }; @@ -258,9 +258,9 @@ in 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/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv + https://$domain/dyne/dnscrypt-proxy/master/dnscrypt-resolvers.csv $get -o dnscrypt-resolvers.csv.minisig.tmp \ - https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig + https://$domain/dyne/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig mv dnscrypt-resolvers.csv.minisig{.tmp,} if ! minisign -q -V -p ${upstreamResolverListPubKey} \ -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig ; then diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix index 23cc92946e41fe6d601daa264b4c7dc10dcaaee4..bf13d5c6f5fec6f1607320d103d6fded6e2db94a 100644 --- a/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -145,6 +145,16 @@ in { }; users.groups.dnscrypt-wrapper = { }; + security.polkit.extraConfig = '' + // Allow dnscrypt-wrapper user to restart dnscrypt-wrapper.service + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.systemd1.manage-units" && + action.lookup("unit") == "dnscrypt-wrapper.service" && + subject.user == "dnscrypt-wrapper") { + return polkit.Result.YES; + } + }); + ''; systemd.services.dnscrypt-wrapper = { description = "dnscrypt-wrapper daemon"; diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index a9f3fd65d76b4053e5a28ef3ad1a58e64bb76ab9..97d223a56cab99011f146c0041c0cb04d6835577 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -33,6 +33,8 @@ let in { + meta.maintainers = with lib.maintainers; [ nadrieril ]; + options = { services.firefox.syncserver = { enable = mkOption { @@ -70,18 +72,6 @@ in ''; }; - user = mkOption { - type = types.str; - default = "syncserver"; - description = "User account under which syncserver runs."; - }; - - group = mkOption { - type = types.str; - default = "syncserver"; - description = "Group account under which syncserver runs."; - }; - publicUrl = mkOption { type = types.str; default = "http://localhost:5000/"; @@ -137,7 +127,9 @@ in config = mkIf cfg.enable { systemd.services.syncserver = let - syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]); + syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript requests ]); + user = "syncserver"; + group = "syncserver"; in { after = [ "network.target" ]; description = "Firefox Sync Server"; @@ -145,43 +137,43 @@ in path = [ pkgs.coreutils syncServerEnv ]; serviceConfig = { - User = cfg.user; - Group = cfg.group; + User = user; + Group = group; PermissionsStartOnly = true; }; preStart = '' if ! test -e ${cfg.privateConfig}; then - mkdir -m 700 -p $(dirname ${cfg.privateConfig}) + mkdir -p $(dirname ${cfg.privateConfig}) echo > ${cfg.privateConfig} '[syncserver]' + chmod 600 ${cfg.privateConfig} echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')" fi - chown ${cfg.user}:${cfg.group} ${cfg.privateConfig} + chmod 600 ${cfg.privateConfig} + chmod 755 $(dirname ${cfg.privateConfig}) + chown ${user}:${group} ${cfg.privateConfig} + '' + optionalString (cfg.sqlUri == defaultSqlUri) '' if ! test -e $(dirname ${defaultDbLocation}); then mkdir -m 700 -p $(dirname ${defaultDbLocation}) - chown ${cfg.user}:${cfg.group} $(dirname ${defaultDbLocation}) + chown ${user}:${group} $(dirname ${defaultDbLocation}) fi + # Move previous database file if it exists oldDb="/var/db/firefox-sync-server.db" if test -f $oldDb; then mv $oldDb ${defaultDbLocation} - chown ${cfg.user}:${cfg.group} ${defaultDbLocation} + chown ${user}:${group} ${defaultDbLocation} fi ''; serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}"; }; - users.extraUsers = optionalAttrs (cfg.user == "syncserver") - (singleton { - name = "syncserver"; - group = cfg.group; - isSystemUser = true; - }); - - users.extraGroups = optionalAttrs (cfg.group == "syncserver") - (singleton { - name = "syncserver"; - }); + users.users.syncserver = { + group = "syncserver"; + isSystemUser = true; + }; + + users.groups.syncserver = {}; }; } diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 9bd88ca1707b2ea6bbdf840fddcc03a547f65af6..20c0b0acf165c1f90cf6f4500fe4d8815cc078fd 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -54,7 +54,7 @@ let ''; writeShScript = name: text: let dir = pkgs.writeScriptBin name '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${text} ''; in "${dir}/bin/${name}"; @@ -125,6 +125,9 @@ let 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 DHCP4 client without first having to use APIPA + iptables -t raw -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN + # Allows this host to act as a DHCPv4 server iptables -t raw -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix index 5ba85178179bfcf22a30fa7f4012724bcefdff08..5b83ce131389b33e2979d5f382de254b969a2087 100644 --- a/nixos/modules/services/networking/flashpolicyd.nix +++ b/nixos/modules/services/networking/flashpolicyd.nix @@ -22,7 +22,7 @@ let flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd" '' - #! ${pkgs.stdenv.shell} + #! ${pkgs.runtimeShell} exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \ --file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \ 2> /dev/null diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix new file mode 100644 index 0000000000000000000000000000000000000000..45cba1ce27708dff331d1d6b34ef2f90dc1ea82d --- /dev/null +++ b/nixos/modules/services/networking/freeradius.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.freeradius; + + freeradiusService = cfg: + { + description = "FreeRadius server"; + wantedBy = ["multi-user.target"]; + after = ["network-online.target"]; + wants = ["network-online.target"]; + preStart = '' + ${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout + ''; + + serviceConfig = { + ExecStart = "${pkgs.freeradius}/bin/radiusd -f -d ${cfg.configDir} -l stdout -xx"; + ExecReload = [ + "${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout" + "${pkgs.coreutils}/bin/kill -HUP $MAINPID" + ]; + User = "radius"; + ProtectSystem = "full"; + ProtectHome = "on"; + Restart = "on-failure"; + RestartSec = 2; + }; + }; + + freeradiusConfig = { + enable = mkEnableOption "the freeradius server"; + + configDir = mkOption { + type = types.path; + default = "/etc/raddb"; + description = '' + The path of the freeradius server configuration directory. + ''; + }; + + }; + +in + +{ + + ###### interface + + options = { + services.freeradius = freeradiusConfig; + }; + + + ###### implementation + + config = mkIf (cfg.enable) { + + users = { + extraUsers.radius = { + /*uid = config.ids.uids.radius;*/ + description = "Radius daemon user"; + }; + }; + + systemd.services.freeradius = freeradiusService cfg; + + }; + +} diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 03ee54af43342c95eddb9a14fde0a3e04c2cd1d8..02cd53c6fa38069ccbe3feba96091e94cb017c0f 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -137,6 +137,8 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.gnunet pkgs.miniupnpc ]; + environment.TMPDIR = "/tmp"; + serviceConfig.PrivateTemp = true; serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; serviceConfig.User = "gnunet"; serviceConfig.UMask = "0007"; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index ca2e2a065dcf3ffb38c12980b339421ad7c253ce..8f5aeee4a16b4e956bd65f8dd80d61d3386c5943 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -126,6 +126,7 @@ let [${tun.name}] type = client destination = ${tun.destination} + destinationport = ${toString tun.destinationPort} keys = ${tun.keys} address = ${tun.address} port = ${toString tun.port} @@ -137,15 +138,15 @@ let '') } ${flip concatMapStrings - (collect (tun: tun ? port && tun ? host) cfg.inTunnels) - (tun: let portStr = toString tun.port; in '' + (collect (tun: tun ? port && tun ? address) cfg.inTunnels) + (tun: '' [${tun.name}] type = server destination = ${tun.destination} keys = ${tun.keys} host = ${tun.address} - port = ${tun.port} - inport = ${tun.inPort} + port = ${toString tun.port} + inport = ${toString tun.inPort} accesslist = ${builtins.concatStringsSep "," tun.accessList} '') } @@ -405,7 +406,13 @@ in default = {}; type = with types; loaOf (submodule ( { name, config, ... }: { - options = commonTunOpts name; + options = { + destinationPort = mkOption { + type = types.int; + default = 0; + description = "Connect to particular port at destination."; + }; + } // commonTunOpts name; config = { name = mkDefault name; }; diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index 23787bce9911d906be057eaa9456f15f38ce80b2..344212ad8329492bac87b50a8b96c89649d18aec 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -26,7 +26,7 @@ in { wants = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.iwd}/bin/iwd"; + serviceConfig.ExecStart = "${pkgs.iwd}/libexec/iwd"; }; }; diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 18e2ab9aebf10129dd037e83e90f9d5acf4c7c3f..aac02b811d716dfc4b083c5e0aa0c44012c4db48 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -43,7 +43,16 @@ in type = with types; listOf str; default = [ "::1" "127.0.0.1" ]; description = '' - What addresses the server should listen on. + What addresses the server should listen on. (UDP+TCP 53) + ''; + }; + listenTLS = mkOption { + type = with types; listOf str; + default = []; + example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ]; + description = '' + Addresses on which kresd should provide DNS over TLS (see RFC 7858). + For detailed syntax see ListenStream in man systemd.socket. ''; }; # TODO: perhaps options for more common stuff like cache size or forwarding @@ -72,6 +81,19 @@ in (iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53") cfg.interfaces; socketConfig.ListenDatagram = listenStreams; + socketConfig.FreeBind = true; + }; + + systemd.sockets.kresd-tls = mkIf (cfg.listenTLS != []) rec { + wantedBy = [ "sockets.target" ]; + before = wantedBy; + partOf = [ "kresd.socket" ]; + listenStreams = cfg.listenTLS; + socketConfig = { + FileDescriptorName = "tls"; + FreeBind = true; + Service = "kresd.service"; + }; }; systemd.sockets.kresd-control = rec { @@ -82,20 +104,11 @@ in socketConfig = { FileDescriptorName = "control"; Service = "kresd.service"; - SocketMode = "0660"; # only root user/group may connect + SocketMode = "0660"; # only root user/group may connect and control kresd }; }; - # Create the cacheDir; tmpfiles don't work on nixos-rebuild switch. - systemd.services.kresd-cachedir = { - serviceConfig.Type = "oneshot"; - script = '' - if [ ! -d '${cfg.cacheDir}' ]; then - mkdir -p '${cfg.cacheDir}' - chown kresd:kresd '${cfg.cacheDir}' - fi - ''; - }; + systemd.tmpfiles.rules = [ "d '${cfg.cacheDir}' 0770 kresd kresd - -" ]; systemd.services.kresd = { description = "Knot-resolver daemon"; @@ -104,16 +117,17 @@ in User = "kresd"; Type = "notify"; WorkingDirectory = cfg.cacheDir; + Restart = "on-failure"; + Sockets = [ "kresd.socket" "kresd-control.socket" ] + ++ optional (cfg.listenTLS != []) "kresd-tls.socket"; }; + # Trust anchor goes from dns-root-data by default. script = '' - exec '${package}/bin/kresd' --config '${configFile}' \ - -k '${cfg.cacheDir}/root.key' + exec '${package}/bin/kresd' --config '${configFile}' --forks=1 ''; - after = [ "kresd-cachedir.service" ]; - requires = [ "kresd.socket" "kresd-cachedir.service" ]; - wantedBy = [ "sockets.target" ]; + requires = [ "kresd.socket" ]; }; }; } diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix index ba4e1b1542fe4c756e0af50a39c75b1712076ba7..db1534edfd7c0c4e14b5e31afcb91712726a7b67 100644 --- a/nixos/modules/services/networking/lldpd.nix +++ b/nixos/modules/services/networking/lldpd.nix @@ -24,6 +24,7 @@ in description = "lldpd user"; group = "_lldpd"; home = "/var/run/lldpd"; + isSystemUser = true; }; users.extraGroups._lldpd = {}; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix new file mode 100644 index 0000000000000000000000000000000000000000..31379189f5de338a90235d098025d5df19ff0fc0 --- /dev/null +++ b/nixos/modules/services/networking/monero.nix @@ -0,0 +1,238 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.monero; + dataDir = "/var/lib/monero"; + + listToConf = option: list: + concatMapStrings (value: "${option}=${value}\n") list; + + login = (cfg.rpc.user != null && cfg.rpc.password != null); + + configFile = with cfg; pkgs.writeText "monero.conf" '' + log-file=/dev/stdout + data-dir=${dataDir} + + ${optionalString mining.enable '' + start-mining=${mining.address} + mining-threads=${toString mining.threads} + ''} + + rpc-bind-ip=${rpc.address} + rpc-bind-port=${toString rpc.port} + ${optionalString login '' + rpc-login=${rpc.user}:${rpc.password} + ''} + ${optionalString rpc.restricted '' + restrict-rpc=1 + ''} + + limit-rate-up=${toString limits.upload} + limit-rate-down=${toString limits.download} + max-concurrency=${toString limits.threads} + block-sync-size=${toString limits.syncSize} + + ${listToConf "add-peer" extraNodes} + ${listToConf "add-priority-node" priorityNodes} + ${listToConf "add-exclusive-node" exclusiveNodes} + + ${extraConfig} + ''; + +in + +{ + + ###### interface + + options = { + + services.monero = { + + enable = mkEnableOption "Monero node daemon."; + + mining.enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to mine moneroj. + ''; + }; + + mining.address = mkOption { + type = types.str; + default = ""; + description = '' + Monero address where to send mining rewards. + ''; + }; + + mining.threads = mkOption { + type = types.addCheck types.int (x: x>=0); + default = 0; + description = '' + Number of threads used for mining. + Set to 0 to use all available. + ''; + }; + + rpc.user = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + User name for RPC connections. + ''; + }; + + rpc.password = mkOption { + type = types.str; + default = null; + description = '' + Password for RPC connections. + ''; + }; + + rpc.address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + IP address the RPC server will bind to. + ''; + }; + + rpc.port = mkOption { + type = types.int; + default = 18081; + description = '' + Port the RPC server will bind to. + ''; + }; + + rpc.restricted = mkOption { + type = types.bool; + default = false; + description = '' + Whether to restrict RPC to view only commands. + ''; + }; + + limits.upload = mkOption { + type = types.addCheck types.int (x: x>=-1); + default = -1; + description = '' + Limit of the upload rate in kB/s. + Set to -1 to leave unlimited. + ''; + }; + + limits.download = mkOption { + type = types.addCheck types.int (x: x>=-1); + default = -1; + description = '' + Limit of the download rate in kB/s. + Set to -1 to leave unlimited. + ''; + }; + + limits.threads = mkOption { + type = types.addCheck types.int (x: x>=0); + default = 0; + description = '' + Maximum number of threads used for a parallel job. + Set to 0 to leave unlimited. + ''; + }; + + limits.syncSize = mkOption { + type = types.addCheck types.int (x: x>=0); + default = 0; + description = '' + Maximum number of blocks to sync at once. + Set to 0 for adaptive. + ''; + }; + + extraNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of additional peer IP addresses to add to the local list. + ''; + }; + + priorityNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of peer IP addresses to connect to and + attempt to keep the connection open. + ''; + }; + + exclusiveNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of peer IP addresses to connect to *only*. + If given the other peer options will be ignored. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra lines to be added verbatim to monerod configuration. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = "monero"; + uid = config.ids.uids.monero; + description = "Monero daemon user"; + home = dataDir; + createHome = true; + }; + + users.extraGroups = singleton { + name = "monero"; + gid = config.ids.gids.monero; + }; + + systemd.services.monero = { + description = "monero daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "monero"; + Group = "monero"; + ExecStart = "${pkgs.monero}/bin/monerod --config-file=${configFile} --non-interactive"; + Restart = "always"; + SuccessExitStatus = [ 0 1 ]; + }; + }; + + assertions = singleton { + assertion = cfg.mining.enable -> cfg.mining.address != ""; + message = '' + You need a Monero address to receive mining rewards: + specify one using option monero.mining.address. + ''; + }; + + }; + +} + diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 81915b5a2ef8259646156e275d41ca7862133dd9..d8135f4d0ffa4ec9fe04b77eaa2087bc7e92a935 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -12,6 +12,10 @@ let keyfile ${cfg.ssl.keyfile} ''; + passwordConf = optionalString cfg.checkPasswords '' + password_file ${cfg.dataDir}/passwd + ''; + mosquittoConf = pkgs.writeText "mosquitto.conf" '' pid_file /run/mosquitto/pid acl_file ${aclFile} @@ -19,6 +23,7 @@ let allow_anonymous ${boolToString cfg.allowAnonymous} bind_address ${cfg.host} port ${toString cfg.port} + ${passwordConf} ${listenerConf} ${cfg.extraConf} ''; @@ -153,6 +158,15 @@ in ''; }; + checkPasswords = mkOption { + default = false; + example = true; + type = types.bool; + description = '' + Refuse connection when clients provide incorrect passwords. + ''; + }; + extraConf = mkOption { default = ""; type = types.lines; @@ -198,7 +212,7 @@ in '' + concatStringsSep "\n" ( mapAttrsToList (n: c: if c.hashedPassword != null then - "echo '${n}:${c.hashedPassword}' > ${cfg.dataDir}/passwd" + "echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd" else optionalString (c.password != null) "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} ${c.password}" ) cfg.users); diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 13d7c3254f9db7b0ce80030dbc8809eaedf98b20..873d62dbf341e699866f05e72564dbfdba057447 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -80,7 +80,7 @@ in pidfile = mkOption { type = types.path; - default = "/tmp/murmurd.pid"; + default = "/run/murmur/murmurd.pid"; description = "Path to PID file for Murmur daemon."; }; @@ -252,6 +252,7 @@ in serviceConfig = { Type = "forking"; + RuntimeDirectory = "murmur"; PIDFile = cfg.pidfile; Restart = "always"; User = "murmur"; diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 366bb2ed7a80348e521a3abfec3f7007d3bf416f..da3827c35e63aef8bf536bdac7f459e35f2de5af 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -19,6 +19,8 @@ let iptables -w -t nat -D POSTROUTING -j nixos-nat-post 2>/dev/null || true iptables -w -t nat -F nixos-nat-post 2>/dev/null || true iptables -w -t nat -X nixos-nat-post 2>/dev/null || true + + ${cfg.extraStopCommands} ''; setupNat = '' @@ -51,8 +53,40 @@ let -i ${cfg.externalInterface} -p ${fwd.proto} \ --dport ${builtins.toString fwd.sourcePort} \ -j DNAT --to-destination ${fwd.destination} + + ${concatMapStrings (loopbackip: + let + m = builtins.match "([0-9.]+):([0-9-]+)" fwd.destination; + destinationIP = if (m == null) then throw "bad ip:ports `${fwd.destination}'" else elemAt m 0; + destinationPorts = if (m == null) then throw "bad ip:ports `${fwd.destination}'" else elemAt m 1; + in '' + # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from the host itself + iptables -w -t nat -A OUTPUT \ + -d ${loopbackip} -p ${fwd.proto} \ + --dport ${builtins.toString fwd.sourcePort} \ + -j DNAT --to-destination ${fwd.destination} + + # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from other hosts behind NAT + iptables -w -t nat -A nixos-nat-pre \ + -d ${loopbackip} -p ${fwd.proto} \ + --dport ${builtins.toString fwd.sourcePort} \ + -j DNAT --to-destination ${fwd.destination} + + iptables -w -t nat -A nixos-nat-post \ + -d ${destinationIP} -p ${fwd.proto} \ + --dport ${destinationPorts} \ + -j SNAT --to-source ${loopbackip} + '') fwd.loopbackIPs} '') cfg.forwardPorts} + ${optionalString (cfg.dmzHost != null) '' + iptables -w -t nat -A nixos-nat-pre \ + -i ${cfg.externalInterface} -j DNAT \ + --to-destination ${cfg.dmzHost} + ''} + + ${cfg.extraCommands} + # Append our chains to the nat tables iptables -w -t nat -A PREROUTING -j nixos-nat-pre iptables -w -t nat -A POSTROUTING -j nixos-nat-post @@ -125,15 +159,15 @@ in type = with types; listOf (submodule { options = { sourcePort = mkOption { - type = types.int; + type = types.either types.int (types.strMatching "[[:digit:]]+:[[:digit:]]+"); example = 8080; - description = "Source port of the external interface"; + description = "Source port of the external interface; to specify a port range, use a string with a colon (e.g. \"60000:61000\")"; }; destination = mkOption { type = types.str; example = "10.0.0.1:80"; - description = "Forward connection to destination ip:port"; + description = "Forward connection to destination ip:port; to specify a port range, use ip:start-end"; }; proto = mkOption { @@ -142,6 +176,13 @@ in example = "udp"; description = "Protocol of forwarded connection"; }; + + loopbackIPs = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample ''[ "55.1.2.3" ]''; + description = "Public IPs for NAT reflection; for connections to `loopbackip:sourcePort' from the host itself and from other hosts behind NAT"; + }; }; }); default = []; @@ -153,6 +194,39 @@ in ''; }; + networking.nat.dmzHost = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.0.0.1"; + description = + '' + The local IP address to which all traffic that does not match any + forwarding rule is forwarded. + ''; + }; + + networking.nat.extraCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -A INPUT -p icmp -j ACCEPT"; + description = + '' + Additional shell commands executed as part of the nat + initialisation script. + ''; + }; + + networking.nat.extraStopCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -D INPUT -p icmp -j ACCEPT || true"; + description = + '' + Additional shell commands executed as part of the nat + teardown script. + ''; + }; + }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 6bdae32f72bb329328353d8d55fca5d85f56a047..10e96eb403623b977072e339ca42dd4e98a46cac 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -133,10 +133,9 @@ in { basePackages = mkOption { type = types.attrsOf types.package; default = { inherit networkmanager modemmanager wpa_supplicant - networkmanager_openvpn networkmanager_vpnc - networkmanager_openconnect networkmanager_fortisslvpn - networkmanager_pptp networkmanager_l2tp - networkmanager_iodine; }; + networkmanager-openvpn networkmanager-vpnc + networkmanager-openconnect networkmanager-fortisslvpn + networkmanager-l2tp networkmanager-iodine; }; internal = true; }; @@ -241,6 +240,19 @@ in { A list of scripts which will be executed in response to network events. ''; }; + + enableStrongSwan = mkOption { + type = types.bool; + default = false; + description = '' + Enable the StrongSwan plugin. + + If you enable this option the + networkmanager_strongswan plugin will be added to + the option + so you don't need to to that yourself. + ''; + }; }; }; @@ -254,34 +266,29 @@ in { message = "You can not use networking.networkmanager with networking.wireless"; }]; - boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. - environment.etc = with cfg.basePackages; [ { source = configFile; target = "NetworkManager/NetworkManager.conf"; } - { source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name"; + { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name"; target = "NetworkManager/VPN/nm-openvpn-service.name"; } - { source = "${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name"; + { source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name"; target = "NetworkManager/VPN/nm-vpnc-service.name"; } - { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name"; + { 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"; + { 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"; - } - { source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; + { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name"; target = "NetworkManager/VPN/nm-strongswan-service.name"; } - { source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name"; + { source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name"; target = "NetworkManager/VPN/nm-iodine-service.name"; } ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) @@ -322,6 +329,7 @@ in { preStart = '' mkdir -m 700 -p /etc/NetworkManager/system-connections + mkdir -m 700 -p /etc/ipsec.d mkdir -m 755 -p ${stateDirs} ''; }; @@ -333,13 +341,13 @@ in { wireless.enable = lib.mkDefault false; }; - powerManagement.resumeCommands = '' - ${config.systemd.package}/bin/systemctl restart network-manager - ''; - security.polkit.extraConfig = polkitConf; - services.dbus.packages = cfg.packages; + networking.networkmanager.packages = + mkIf cfg.enableStrongSwan [ pkgs.networkmanager_strongswan ]; + + services.dbus.packages = + optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages; services.udev.packages = cfg.packages; }; diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index 56b942054140fcf4cea9a7309df93021de102aad..ad7c013a544916cf6f81c157c63451c04697ba03 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -116,7 +116,7 @@ in include "${cfg.rulesetFile}" ''; checkScript = pkgs.writeScript "nftables-check" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e if $(${pkgs.kmod}/bin/lsmod | grep -q ip_tables); then echo "Unload ip_tables before using nftables!" 1>&2 exit 1 diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 3e865e3b76a89bc169aa7f9928632a4c97657621..8499e7c0f7c466e9d95d7dd8ad4911aa9d8dc6c1 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -55,6 +55,8 @@ in environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile; serviceConfig = { + Restart = "always"; + RestartSec = "5s"; ExecStart = "${pkgs.nix-serve}/bin/nix-serve " + "--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}"; User = "nix-serve"; diff --git a/nixos/modules/services/networking/nixops-dns.nix b/nixos/modules/services/networking/nixops-dns.nix new file mode 100644 index 0000000000000000000000000000000000000000..2bb1263b7fa28144500dd55d9cf68938a72961a7 --- /dev/null +++ b/nixos/modules/services/networking/nixops-dns.nix @@ -0,0 +1,79 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + pkg = pkgs.nixops-dns; + cfg = config.services.nixops-dns; +in + +{ + options = { + services.nixops-dns = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the nixops-dns resolution + of NixOps virtual machines via dnsmasq and fake domain name. + ''; + }; + + user = mkOption { + type = types.str; + description = '' + The user the nixops-dns daemon should run as. + This should be the user, which is also used for nixops and + have the .nixops directory in its home. + ''; + }; + + domain = mkOption { + type = types.str; + description = '' + Fake domain name to resolve to NixOps virtual machines. + + For example "ops" will resolve "vm.ops". + ''; + example = "ops"; + default = "ops"; + }; + + dnsmasq = mkOption { + type = types.bool; + default = true; + description = '' + Enable dnsmasq forwarding to nixops-dns. This allows to use + nixops-dns for `services.nixops-dns.domain` resolution + while forwarding the rest of the queries to original resolvers. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + systemd.services.nixops-dns = { + description = "nixops-dns: DNS server for resolving NixOps machines"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + ExecStart="${pkg}/bin/nixops-dns --domain=.${cfg.domain}"; + }; + }; + + services.dnsmasq = mkIf cfg.dnsmasq { + enable = true; + resolveLocalQueries = true; + servers = [ + "/${cfg.domain}/127.0.0.1#5300" + ]; + extraConfig = '' + bind-interfaces + listen-address=127.0.0.1 + ''; + }; + + }; +} diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index c8b8ed547ebbe0c64e3a40fbed292c0d8b7892da..4241e6fcceab9e7f533176bec1183b44e988a5f8 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -11,6 +11,8 @@ let # build nsd with the options needed for the given config nsdPkg = pkgs.nsd.override { + configFile = "${configFile}/nsd.conf"; + bind8Stats = cfg.bind8Stats; ipv6 = cfg.ipv6; ratelimit = cfg.ratelimit.enable; @@ -788,6 +790,8 @@ in config = mkIf cfg.enable { + environment.systemPackages = [ nsdPkg ]; + users.extraGroups = singleton { name = username; gid = config.ids.gids.nsd; @@ -845,4 +849,6 @@ in }; }; + + meta.maintainers = with lib.maintainers; [ hrdinka ]; } diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 3fbf5a9f0227aca1c8a12c56671677c08a5a10b4..a418839d22b8baf3a493a8851056bbb9236e7879 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -50,6 +50,11 @@ let "up ${pkgs.writeScript "openvpn-${name}-up" upScript}"} ${optionalString (cfg.down != "" || cfg.updateResolvConf) "down ${pkgs.writeScript "openvpn-${name}-down" downScript}"} + ${optionalString (cfg.authUserPass != null) + "auth-user-pass ${pkgs.writeText "openvpn-credentials-${name}" '' + ${cfg.authUserPass.username} + ${cfg.authUserPass.password} + ''}"} ''; in { @@ -60,7 +65,7 @@ let path = [ pkgs.iptables pkgs.iproute pkgs.nettools ]; - serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --config ${configFile}"; + serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}"; serviceConfig.Restart = "always"; serviceConfig.Type = "notify"; }; @@ -161,6 +166,29 @@ in ''; }; + authUserPass = mkOption { + default = null; + description = '' + This option can be used to store the username / password credentials + with the "auth-user-pass" authentication method. + + WARNING: Using this option will put the credentials WORLD-READABLE in the Nix store! + ''; + type = types.nullOr (types.submodule { + + options = { + username = mkOption { + description = "The username to store inside the credentials file."; + type = types.string; + }; + + password = mkOption { + description = "The password to store inside the credentials file."; + type = types.string; + }; + }; + }); + }; }; }); diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index fb9c9dc67f249d2e8088872a87d517603d98f831..1b4f81f6b56e064bd5098d1d315b8f641c34bb35 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -10,98 +10,229 @@ let options = { - # TODO: require attribute key = mkOption { - type = types.str; - description = "Path to the key file"; + type = types.path; + description = "Path to the key file."; }; - # TODO: require attribute + # TODO: rename to certificate to match the prosody config cert = mkOption { - type = types.str; - description = "Path to the certificate file"; + type = types.path; + description = "Path to the certificate file."; }; + + extraOptions = mkOption { + type = types.attrs; + default = {}; + description = "Extra SSL configuration options."; + }; + }; }; moduleOpts = { - + # Generally required roster = mkOption { + type = types.bool; default = true; description = "Allow users to have a roster"; }; saslauth = mkOption { + type = types.bool; default = true; description = "Authentication for clients and servers. Recommended if you want to log in."; }; tls = mkOption { + type = types.bool; default = true; description = "Add support for secure TLS on c2s/s2s connections"; }; dialback = mkOption { + type = types.bool; default = true; description = "s2s dialback support"; }; disco = mkOption { + type = types.bool; default = true; description = "Service discovery"; }; - legacyauth = mkOption { + # Not essential, but recommended + carbons = mkOption { + type = types.bool; default = true; - description = "Legacy authentication. Only used by some old clients and bots"; + description = "Keep multiple clients in sync"; }; + pep = mkOption { + type = types.bool; + default = true; + description = "Enables users to publish their mood, activity, playing music and more"; + }; + + private = mkOption { + type = types.bool; + default = true; + description = "Private XML storage (for room bookmarks, etc.)"; + }; + + blocklist = mkOption { + type = types.bool; + default = true; + description = "Allow users to block communications with other users"; + }; + + vcard = mkOption { + type = types.bool; + default = true; + description = "Allow users to set vCards"; + }; + + # Nice to have version = mkOption { + type = types.bool; default = true; description = "Replies to server version requests"; }; uptime = mkOption { + type = types.bool; default = true; description = "Report how long server has been running"; }; time = mkOption { + type = types.bool; default = true; description = "Let others know the time here on this server"; }; ping = mkOption { + type = types.bool; default = true; description = "Replies to XMPP pings with pongs"; }; - console = mkOption { + register = mkOption { + type = types.bool; + default = true; + description = "Allow users to register on this server using a client and change passwords"; + }; + + mam = mkOption { + type = types.bool; default = false; - description = "telnet to port 5582"; + description = "Store messages in an archive and allow users to access it"; }; + # Admin interfaces + admin_adhoc = mkOption { + type = types.bool; + default = true; + description = "Allows administration via an XMPP client that supports ad-hoc commands"; + }; + + admin_telnet = mkOption { + type = types.bool; + default = false; + description = "Opens telnet console interface on localhost port 5582"; + }; + + # HTTP modules bosh = mkOption { + type = types.bool; default = false; description = "Enable BOSH clients, aka 'Jabber over HTTP'"; }; - httpserver = mkOption { + websocket = mkOption { + type = types.bool; + default = false; + description = "Enable WebSocket support"; + }; + + http_files = mkOption { + type = types.bool; default = false; description = "Serve static files from a directory over HTTP"; }; - websocket = mkOption { + # Other specific functionality + limits = mkOption { + type = types.bool; default = false; - description = "Enable WebSocket support"; + description = "Enable bandwidth limiting for XMPP connections"; + }; + + groups = mkOption { + type = types.bool; + default = false; + description = "Shared roster support"; + }; + + server_contact_info = mkOption { + type = types.bool; + default = false; + description = "Publish contact information for this service"; + }; + + announce = mkOption { + type = types.bool; + default = false; + description = "Send announcement to all online users"; + }; + + welcome = mkOption { + type = types.bool; + default = false; + description = "Welcome users who register accounts"; + }; + + watchregistrations = mkOption { + type = types.bool; + default = false; + description = "Alert admins of registrations"; + }; + + motd = mkOption { + type = types.bool; + default = false; + description = "Send a message to users when they log in"; + }; + + legacyauth = mkOption { + type = types.bool; + default = false; + description = "Legacy authentication. Only used by some old clients and bots"; + }; + + proxy65 = mkOption { + type = types.bool; + default = false; + description = "Enables a file transfer proxy service which clients behind NAT can use"; }; }; - createSSLOptsStr = o: - if o ? key && o ? cert then - ''ssl = { key = "${o.key}"; certificate = "${o.cert}"; };'' - else ""; + toLua = x: + if builtins.isString x then ''"${x}"'' + else if builtins.isBool x then (if x == true then "true" else "false") + else if builtins.isInt x then toString x + else if builtins.isList x then ''{ ${lib.concatStringsSep ", " (map (n: toLua n) x) } }'' + else throw "Invalid Lua value"; + + createSSLOptsStr = o: '' + ssl = { + key = "${o.key}"; + certificate = "${o.cert}"; + ${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)} + }; + ''; vHostOpts = { ... }: { @@ -114,18 +245,20 @@ let }; enabled = mkOption { + type = types.bool; default = false; description = "Whether to enable the virtual host"; }; ssl = mkOption { - description = "Paths to SSL files"; + type = types.nullOr (types.submodule sslOpts); default = null; - options = [ sslOpts ]; + description = "Paths to SSL files"; }; extraConfig = mkOption { - default = ''''; + type = types.lines; + default = ""; description = "Additional virtual host specific configuration"; }; @@ -144,20 +277,113 @@ in services.prosody = { enable = mkOption { + type = types.bool; default = false; description = "Whether to enable the prosody server"; }; + package = mkOption { + type = types.package; + description = "Prosody package to use"; + default = pkgs.prosody; + defaultText = "pkgs.prosody"; + example = literalExample '' + pkgs.prosody.override { + withExtraLibs = [ pkgs.luaPackages.lpty ]; + withCommunityModules = [ "auth_external" ]; + }; + ''; + }; + + dataDir = mkOption { + type = types.string; + description = "Directory where Prosody stores its data"; + default = "/var/lib/prosody"; + }; + + user = mkOption { + type = types.str; + default = "prosody"; + description = "User account under which prosody runs."; + }; + + group = mkOption { + type = types.str; + default = "prosody"; + description = "Group account under which prosody runs."; + }; + allowRegistration = mkOption { + type = types.bool; default = false; description = "Allow account creation"; }; + c2sRequireEncryption = mkOption { + type = types.bool; + default = true; + description = '' + Force clients to use encrypted connections? This option will + prevent clients from authenticating unless they are using encryption. + ''; + }; + + s2sRequireEncryption = mkOption { + type = types.bool; + default = true; + description = '' + Force servers to use encrypted connections? This option will + prevent servers from authenticating unless they are using encryption. + Note that this is different from authentication. + ''; + }; + + s2sSecureAuth = mkOption { + type = types.bool; + default = false; + description = '' + Force certificate authentication for server-to-server connections? + This provides ideal security, but requires servers you communicate + with to support encryption AND present valid, trusted certificates. + For more information see https://prosody.im/doc/s2s#security + ''; + }; + + s2sInsecureDomains = mkOption { + type = types.listOf types.str; + default = []; + example = [ "insecure.example.com" ]; + description = '' + Some servers have invalid or self-signed certificates. You can list + remote domains here that will not be required to authenticate using + certificates. They will be authenticated using DNS instead, even + when s2s_secure_auth is enabled. + ''; + }; + + s2sSecureDomains = mkOption { + type = types.listOf types.str; + default = []; + example = [ "jabber.org" ]; + description = '' + Even if you leave s2s_secure_auth disabled, you can still require valid + certificates for some domains by specifying a list here. + ''; + }; + + modules = moduleOpts; extraModules = mkOption { + type = types.listOf types.str; + default = []; description = "Enable custom modules"; + }; + + extraPluginPaths = mkOption { + type = types.listOf types.path; default = []; + description = "Addtional path in which to look find plugins/modules"; }; virtualHosts = mkOption { @@ -183,20 +409,21 @@ in }; ssl = mkOption { - description = "Paths to SSL files"; + type = types.nullOr (types.submodule sslOpts); default = null; - options = [ sslOpts ]; + description = "Paths to SSL files"; }; admins = mkOption { - description = "List of administrators of the current host"; - example = [ "admin1@example.com" "admin2@example.com" ]; + type = types.listOf types.str; default = []; + example = [ "admin1@example.com" "admin2@example.com" ]; + description = "List of administrators of the current host"; }; extraConfig = mkOption { type = types.lines; - default = ''''; + default = ""; description = "Additional prosody configuration"; }; @@ -208,37 +435,47 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.prosody ]; + environment.systemPackages = [ cfg.package ]; environment.etc."prosody/prosody.cfg.lua".text = '' - pidfile = "/var/lib/prosody/prosody.pid" - + pidfile = "/run/prosody/prosody.pid" log = "*syslog" - data_path = "/var/lib/prosody" - - allow_registration = ${boolToString cfg.allowRegistration}; - - ${ optionalString cfg.modules.console "console_enabled = true;" } + data_path = "${cfg.dataDir}" + plugin_paths = { + ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.extraPluginPaths) } + } ${ optionalString (cfg.ssl != null) (createSSLOptsStr cfg.ssl) } - admins = { ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.admins) } }; + admins = ${toLua cfg.admins} + + -- we already build with libevent, so we can just enable it for a more performant server + use_libevent = true modules_enabled = { ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList - (name: val: optionalString val ''"${name}";'') + (name: val: optionalString val "${toLua name};") cfg.modules) } + ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)} + ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.extraModules)} + }; - ${ optionalString cfg.allowRegistration "\"register\"\;" } + allow_registration = ${toLua cfg.allowRegistration} - ${ lib.concatStringsSep "\n" (map (x: "\"${x}\";") cfg.extraModules)} + c2s_require_encryption = ${toLua cfg.c2sRequireEncryption} + + s2s_require_encryption = ${toLua cfg.s2sRequireEncryption} + + s2s_secure_auth = ${toLua cfg.s2sSecureAuth} + + s2s_insecure_domains = ${toLua cfg.s2sInsecureDomains} + + s2s_secure_domains = ${toLua cfg.s2sSecureDomains} - "posix"; - }; ${ cfg.extraConfig } @@ -250,30 +487,32 @@ in '') cfg.virtualHosts) } ''; - users.extraUsers.prosody = { + users.extraUsers.prosody = mkIf (cfg.user == "prosody") { uid = config.ids.uids.prosody; description = "Prosody user"; createHome = true; - group = "prosody"; - home = "/var/lib/prosody"; + inherit (cfg) group; + home = "${cfg.dataDir}"; }; - users.extraGroups.prosody = { + users.extraGroups.prosody = mkIf (cfg.group == "prosody") { gid = config.ids.gids.prosody; }; systemd.services.prosody = { - description = "Prosody XMPP server"; after = [ "network-online.target" ]; wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."prosody/prosody.cfg.lua".source ]; serviceConfig = { - User = "prosody"; - PIDFile = "/var/lib/prosody/prosody.pid"; - ExecStart = "${pkgs.prosody}/bin/prosodyctl start"; + User = cfg.user; + Group = cfg.group; + Type = "forking"; + RuntimeDirectory = [ "prosody" ]; + PIDFile = "/run/prosody/prosody.pid"; + ExecStart = "${cfg.package}/bin/prosodyctl start"; }; - }; }; diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix index aab58cc77b90d4995004ec35b366f4b4fa8ab949..22204e53203cfd417119f52c29d45e1a350fb0ff 100644 --- a/nixos/modules/services/networking/quagga.nix +++ b/nixos/modules/services/networking/quagga.nix @@ -133,7 +133,7 @@ in users.groups = { quagga = {}; # Members of the quaggavty group can use vtysh to inspect the Quagga daemons - quaggavty = {}; + quaggavty = { members = [ "quagga" ]; }; }; systemd.services = diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 0199502163a3b6b782adb65011d439bc3f6668ab..85d7f9e4a41b8afc76c9536bbaa310a95d75da57 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -59,24 +59,11 @@ in systemd.services.radvd = { description = "IPv6 Router Advertisement Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - path = [ pkgs.radvd ]; - - preStart = '' - mkdir -m 755 -p /run/radvd - chown radvd /run/radvd - ''; - serviceConfig = - { ExecStart = "@${pkgs.radvd}/sbin/radvd radvd" - + " -p /run/radvd/radvd.pid -m syslog -u radvd -C ${confFile}"; + { ExecStart = "@${pkgs.radvd}/bin/radvd radvd -n -u radvd -C ${confFile}"; Restart = "always"; - Type = "forking"; - PIDFile = "/run/radvd/radvd.pid"; }; }; diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index 95833d31e99d0934bf4be272d9c91bc136666813..a102242eae715819b7379e123c1dac29929f7113 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -6,7 +6,7 @@ with lib; let mergeHook = pkgs.writeScript "rdnssd-merge-hook" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${pkgs.openresolv}/bin/resolvconf -u ''; in diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 6d2b7bdbca1b57458024cc90c26335a335cf7612..2956a5ecbc0405fba70991f22a3e8a5fe98f92b4 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -17,7 +17,7 @@ let search_lan = entry.searchLAN; use_sync_trash = entry.useSyncTrash; - known_hosts = knownHosts; + known_hosts = entry.knownHosts; }) cfg.sharedFolders; configFile = pkgs.writeText "config.json" (builtins.toJSON ({ @@ -50,12 +50,7 @@ in 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. + NixOS configuration. ''; }; diff --git a/nixos/modules/services/networking/rxe.nix b/nixos/modules/services/networking/rxe.nix new file mode 100644 index 0000000000000000000000000000000000000000..a6a069ec50c065bb4193e5296a3c400b7daa4b84 --- /dev/null +++ b/nixos/modules/services/networking/rxe.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.rxe; + + runRxeCmd = cmd: ifcs: + concatStrings ( map (x: "${pkgs.rdma-core}/bin/rxe_cfg -n ${cmd} ${x};") ifcs); + + startScript = pkgs.writeShellScriptBin "rxe-start" '' + ${pkgs.rdma-core}/bin/rxe_cfg -n start + ${runRxeCmd "add" cfg.interfaces} + ${pkgs.rdma-core}/bin/rxe_cfg + ''; + + stopScript = pkgs.writeShellScriptBin "rxe-stop" '' + ${runRxeCmd "remove" cfg.interfaces } + ${pkgs.rdma-core}/bin/rxe_cfg -n stop + ''; + +in { + ###### interface + + options = { + networking.rxe = { + enable = mkEnableOption "RDMA over converged ethernet"; + interfaces = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "eth0" ]; + description = '' + Enable RDMA on the listed interfaces. The corresponding virtual + RDMA interfaces will be named rxe0 ... rxeN where the ordering + will be as they are named in the list. UDP port 4791 must be + open on the respective ethernet interfaces. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.rxe = { + path = with pkgs; [ kmod rdma-core ]; + description = "RoCE interfaces"; + + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-modules-load.service" "network-online.target" ]; + wants = [ "network-pre.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${startScript}/bin/rxe-start"; + ExecStop = "${stopScript}/bin/rxe-stop"; + }; + }; + }; +} + diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix new file mode 100644 index 0000000000000000000000000000000000000000..fe6d65a5f963a30872c3cda669f3297355c063d1 --- /dev/null +++ b/nixos/modules/services/networking/shadowsocks.nix @@ -0,0 +1,112 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.shadowsocks; + + opts = { + server = cfg.localAddress; + server_port = cfg.port; + method = cfg.encryptionMethod; + mode = cfg.mode; + user = "nobody"; + fast_open = true; + } // optionalAttrs (cfg.password != null) { password = cfg.password; }; + + configFile = pkgs.writeText "shadowsocks.json" (builtins.toJSON opts); + +in + +{ + + ###### interface + + options = { + + services.shadowsocks = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run shadowsocks-libev shadowsocks server. + ''; + }; + + localAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + Local address to which the server binds. + ''; + }; + + port = mkOption { + type = types.int; + default = 8388; + description = '' + Port which the server uses. + ''; + }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Password for connecting clients. + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Password file with a password for connecting clients. + ''; + }; + + mode = mkOption { + type = types.enum [ "tcp_only" "tcp_and_udp" "udp_only" ]; + default = "tcp_and_udp"; + description = '' + Relay protocols. + ''; + }; + + encryptionMethod = mkOption { + type = types.str; + default = "chacha20-ietf-poly1305"; + description = '' + Encryption method. See . + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + assertions = singleton + { assertion = cfg.password == null || cfg.passwordFile == null; + message = "Cannot use both password and passwordFile for shadowsocks-libev"; + }; + + systemd.services.shadowsocks-libev = { + description = "shadowsocks-libev Daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.shadowsocks-libev ] ++ optional (cfg.passwordFile != null) pkgs.jq; + serviceConfig.PrivateTmp = true; + script = '' + ${optionalString (cfg.passwordFile != null) '' + cat ${configFile} | jq --arg password "$(cat "${cfg.passwordFile}")" '. + { password: $password }' > /tmp/shadowsocks.json + ''} + exec ss-server -c ${if cfg.passwordFile != null then "/tmp/shadowsocks.json" else configFile} + ''; + }; + }; +} diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix index 9087b75c29c10568747a7c54b4d665a55cb7d014..65df93a00da946fd267794e67a06f552cdb58cd5 100644 --- a/nixos/modules/services/networking/softether.nix +++ b/nixos/modules/services/networking/softether.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.softether; + package = cfg.package.override { dataDir = cfg.dataDir; }; + in { @@ -49,7 +51,7 @@ in dataDir = mkOption { type = types.string; - default = "${cfg.package.dataDir}"; + default = "/var/lib/softether"; description = '' Data directory for SoftEther VPN. ''; @@ -64,11 +66,8 @@ in config = mkIf cfg.enable ( mkMerge [{ - environment.systemPackages = [ - (pkgs.lib.overrideDerivation cfg.package (attrs: { - dataDir = cfg.dataDir; - })) - ]; + environment.systemPackages = [ package ]; + systemd.services."softether-init" = { description = "SoftEther VPN services initial task"; wantedBy = [ "network.target" ]; @@ -80,11 +79,11 @@ in for d in vpnserver vpnbridge vpnclient vpncmd; do if ! test -e ${cfg.dataDir}/$d; then ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d - install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 + install -m0600 ${package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 fi done rm -rf ${cfg.dataDir}/vpncmd/vpncmd - ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd + ln -s ${package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd ''; }; } @@ -97,12 +96,12 @@ in wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${cfg.package}/bin/vpnserver start"; - ExecStop = "${cfg.package}/bin/vpnserver stop"; + ExecStart = "${package}/bin/vpnserver start"; + ExecStop = "${package}/bin/vpnserver stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver - ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver + ln -s ${package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver ''; postStop = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver @@ -118,12 +117,12 @@ in wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${cfg.package}/bin/vpnbridge start"; - ExecStop = "${cfg.package}/bin/vpnbridge stop"; + ExecStart = "${package}/bin/vpnbridge start"; + ExecStop = "${package}/bin/vpnbridge stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge - ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge + ln -s ${package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge ''; postStop = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge @@ -139,12 +138,12 @@ in wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${cfg.package}/bin/vpnclient start"; - ExecStop = "${cfg.package}/bin/vpnclient stop"; + ExecStart = "${package}/bin/vpnclient start"; + ExecStop = "${package}/bin/vpnclient stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnclient/vpnclient - ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient + ln -s ${package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient ''; postStart = '' sleep 1 diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 8828429a8178b53d3112749f6426d1a086906d87..aab1203086ce39a12514027849bfc12d4cc76cb5 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -21,7 +21,7 @@ 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 + Warning: If you are using NixOps then don't use this option since it will replace the key required for deployment via ssh. ''; }; @@ -54,8 +54,6 @@ let )); in listToAttrs (map mkAuthKeyFile usersWithKeys); - supportOldHostKeys = !versionAtLeast config.system.stateVersion "15.07"; - in { @@ -139,6 +137,14 @@ in ''; }; + openFirewall = mkOption { + type = types.bool; + default = true; + description = '' + Whether to automatically open the specified ports in the firewall. + ''; + }; + listenAddresses = mkOption { type = with types; listOf (submodule { options = { @@ -191,9 +197,6 @@ in default = [ { type = "rsa"; bits = 4096; path = "/etc/ssh/ssh_host_rsa_key"; } { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; } - ] ++ optionals supportOldHostKeys - [ { type = "dsa"; path = "/etc/ssh/ssh_host_dsa_key"; } - { type = "ecdsa"; bits = 521; path = "/etc/ssh/ssh_host_ecdsa_key"; } ]; description = '' NixOS can automatically generate SSH host keys. This option @@ -210,6 +213,65 @@ in description = "Files from which authorized keys are read."; }; + kexAlgorithms = mkOption { + type = types.listOf types.str; + default = [ + "curve25519-sha256@libssh.org" + "diffie-hellman-group-exchange-sha256" + ]; + description = '' + Allowed key exchange algorithms + + + Defaults to recommended settings from both + + and + + ''; + }; + + ciphers = mkOption { + type = types.listOf types.str; + default = [ + "chacha20-poly1305@openssh.com" + "aes256-gcm@openssh.com" + "aes128-gcm@openssh.com" + "aes256-ctr" + "aes192-ctr" + "aes128-ctr" + ]; + description = '' + Allowed ciphers + + + Defaults to recommended settings from both + + and + + ''; + }; + + macs = mkOption { + type = types.listOf types.str; + default = [ + "hmac-sha2-512-etm@openssh.com" + "hmac-sha2-256-etm@openssh.com" + "umac-128-etm@openssh.com" + "hmac-sha2-512" + "hmac-sha2-256" + "umac-128@openssh.com" + ]; + description = '' + Allowed MACs + + + Defaults to recommended settings from both + + and + + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -253,13 +315,10 @@ in let service = { description = "SSH Daemon"; - wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target"; - + after = [ "network.target" ]; stopIfChanged = false; - path = [ cfgc.package pkgs.gawk ]; - environment.LD_LIBRARY_PATH = nssModulesPath; preStart = @@ -310,7 +369,7 @@ in }; - networking.firewall.allowedTCPPorts = cfg.ports; + networking.firewall.allowedTCPPorts = if cfg.openFirewall then cfg.ports else []; security.pam.services.sshd = { startSession = true; @@ -363,14 +422,13 @@ in HostKey ${k.path} '')} - # Allow DSA client keys for now. (These were deprecated - # in OpenSSH 7.0.) - PubkeyAcceptedKeyTypes +ssh-dss + KexAlgorithms ${concatStringsSep "," cfg.kexAlgorithms} + Ciphers ${concatStringsSep "," cfg.ciphers} + MACs ${concatStringsSep "," cfg.macs} - # Re-enable DSA host keys for now. - ${optionalString supportOldHostKeys '' - HostKeyAlgorithms +ssh-dss - ''} + # LogLevel VERBOSE logs user's key fingerprint on login. + # Needed to have a clear audit track of which key was used to log in. + LogLevel VERBOSE ''; assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 3a3f64221c422291c733e6a63bb7b5182dfffdcc..707d24b9220f7e31257e4f002de28d7ffb39d24d 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -32,13 +32,13 @@ let ${caConf} ''; - strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' + strongswanConf = {setup, connections, ca, secretsFile, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' charon { ${if managePlugins then "load_modular = no" else ""} ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""} plugins { stroke { - secrets_file = ${ipsecSecrets secrets} + secrets_file = ${secretsFile} } } } @@ -135,7 +135,18 @@ in }; }; - config = with cfg; mkIf enable { + + config = with cfg; + let + secretsFile = ipsecSecrets cfg.secrets; + in + mkIf enable + { + + # here we should use the default strongswan ipsec.secrets and + # append to it (default one is empty so not a pb for now) + environment.etc."ipsec.secrets".source = secretsFile; + systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; @@ -143,11 +154,15 @@ in wants = [ "keys.target" ]; after = [ "network-online.target" "keys.target" ]; environment = { - STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; }; + STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; }; serviceConfig = { ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork"; }; + preStart = '' + # with 'nopeerdns' setting, ppp writes into this folder + mkdir -m 700 -p /etc/ppp + ''; }; }; } diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix new file mode 100644 index 0000000000000000000000000000000000000000..89a14966eca7655cdd4df91e836a39b8e6897809 --- /dev/null +++ b/nixos/modules/services/networking/stunnel.nix @@ -0,0 +1,221 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.stunnel; + yesNo = val: if val then "yes" else "no"; + + verifyChainPathAssert = n: c: { + assertion = c.verifyHostname == null || (c.verifyChain || c.verifyPeer); + message = "stunnel: \"${n}\" client configuration - hostname verification " + + "is not possible without either verifyChain or verifyPeer enabled"; + }; + + serverConfig = { + options = { + accept = mkOption { + type = types.int; + description = "On which port stunnel should listen for incoming TLS connections."; + }; + + connect = mkOption { + type = types.int; + description = "To which port the decrypted connection should be forwarded."; + }; + + cert = mkOption { + type = types.path; + description = "File containing both the private and public keys."; + }; + }; + }; + + clientConfig = { + options = { + accept = mkOption { + type = types.string; + description = "IP:Port on which connections should be accepted."; + }; + + connect = mkOption { + type = types.string; + description = "IP:Port destination to connect to."; + }; + + verifyChain = mkOption { + type = types.bool; + default = true; + description = "Check if the provided certificate has a valid certificate chain (against CAPath)."; + }; + + verifyPeer = mkOption { + type = types.bool; + default = false; + description = "Check if the provided certificate is contained in CAPath."; + }; + + CAPath = mkOption { + type = types.path; + default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + description = "Path to a file containing certificates to validate against."; + }; + + verifyHostname = mkOption { + type = with types; nullOr string; + default = null; + description = "If set, stunnel checks if the provided certificate is valid for the given hostname."; + }; + }; + }; + + +in + +{ + + ###### interface + + options = { + + services.stunnel = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the stunnel TLS tunneling service."; + }; + + user = mkOption { + type = with types; nullOr string; + default = "nobody"; + description = "The user under which stunnel runs."; + }; + + group = mkOption { + type = with types; nullOr string; + default = "nogroup"; + description = "The group under which stunnel runs."; + }; + + logLevel = mkOption { + type = types.enum [ "emerg" "alert" "crit" "err" "warning" "notice" "info" "debug" ]; + default = "info"; + description = "Verbosity of stunnel output."; + }; + + fipsMode = mkOption { + type = types.bool; + default = false; + description = "Enable FIPS 140-2 mode required for compliance."; + }; + + enableInsecureSSLv3 = mkOption { + type = types.bool; + default = false; + description = "Enable support for the insecure SSLv3 protocol."; + }; + + + servers = mkOption { + description = "Define the server configuations."; + type = with types; attrsOf (submodule serverConfig); + example = { + fancyWebserver = { + enable = true; + accept = 443; + connect = 8080; + cert = "/path/to/pem/file"; + }; + }; + default = { }; + }; + + clients = mkOption { + description = "Define the client configurations."; + type = with types; attrsOf (submodule clientConfig); + example = { + foobar = { + accept = "0.0.0.0:8080"; + connect = "nixos.org:443"; + verifyChain = false; + }; + }; + default = { }; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + assertions = concatLists [ + (singleton { + assertion = (length (attrValues cfg.servers) != 0) || ((length (attrValues cfg.clients)) != 0); + message = "stunnel: At least one server- or client-configuration has to be present."; + }) + + (mapAttrsToList verifyChainPathAssert cfg.clients) + ]; + + environment.systemPackages = [ pkgs.stunnel ]; + + environment.etc."stunnel.cfg".text = '' + ${ if cfg.user != null then "setuid = ${cfg.user}" else "" } + ${ if cfg.group != null then "setgid = ${cfg.group}" else "" } + + debug = ${cfg.logLevel} + + ${ optionalString cfg.fipsMode "fips = yes" } + ${ optionalString cfg.enableInsecureSSLv3 "options = -NO_SSLv3" } + + ; ----- SERVER CONFIGURATIONS ----- + ${ lib.concatStringsSep "\n" + (lib.mapAttrsToList + (n: v: '' + [${n}] + accept = ${toString v.accept} + connect = ${toString v.connect} + cert = ${v.cert} + + '') + cfg.servers) + } + + ; ----- CLIENT CONFIGURATIONS ----- + ${ lib.concatStringsSep "\n" + (lib.mapAttrsToList + (n: v: '' + [${n}] + client = yes + accept = ${v.accept} + connect = ${v.connect} + verifyChain = ${yesNo v.verifyChain} + verifyPeer = ${yesNo v.verifyPeer} + ${optionalString (v.CAPath != null) "CApath = ${v.CAPath}"} + ${optionalString (v.verifyHostname != null) "checkHost = ${v.verifyHostname}"} + OCSPaia = yes + + '') + cfg.clients) + } + ''; + + systemd.services.stunnel = { + description = "stunnel TLS tunneling service"; + after = [ "network.target" ]; + wants = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."stunnel.cfg".source ]; + serviceConfig = { + ExecStart = "${pkgs.stunnel}/bin/stunnel ${config.environment.etc."stunnel.cfg".source}"; + Type = "forking"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index dcdc203bdc623868cfa8ffdc9de0af25464b22b3..e485c073cbddff28a53a9ba7159872d3fe5b32cb 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -16,12 +16,6 @@ in { available on http://127.0.0.1:8384/. ''; - useInotify = mkOption { - type = types.bool; - default = false; - description = "Provide syncthing-inotify as a service."; - }; - systemService = mkOption { type = types.bool; default = true; @@ -90,6 +84,12 @@ in { }; }; + imports = [ + (mkRemovedOptionModule ["services" "syncthing" "useInotify"] '' + This option was removed because syncthing now has the inotify functionality included under the name "fswatcher". + It can be enabled on a per-folder basis through the webinterface. + '') + ]; ###### implementation @@ -100,8 +100,7 @@ in { allowedUDPPorts = [ 21027 ]; }; - systemd.packages = [ pkgs.syncthing ] - ++ lib.optional cfg.useInotify pkgs.syncthing-inotify; + systemd.packages = [ pkgs.syncthing ]; users = mkIf (cfg.user == defaultUser) { extraUsers."${defaultUser}" = @@ -125,7 +124,6 @@ in { STNOUPGRADE = "yes"; inherit (cfg) all_proxy; } // config.networking.proxy.envVars; - wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { Restart = "on-failure"; @@ -141,20 +139,6 @@ in { syncthing-resume = { wantedBy = [ "suspend.target" ]; }; - - syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) { - description = "Syncthing Inotify File Watcher service"; - after = [ "network.target" "syncthing.service" ]; - requires = [ "syncthing.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - SuccessExitStatus = "2"; - RestartForceExitStatus = "3"; - Restart = "on-failure"; - User = cfg.user; - ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0"; - }; - }; }; }; } diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix index 2f304165eb4bdc72f5ad5ae5b16a1488991e5e11..ee005e11aa326691540166a357fb54bfd4ac2a8c 100644 --- a/nixos/modules/services/networking/tcpcrypt.nix +++ b/nixos/modules/services/networking/tcpcrypt.nix @@ -44,9 +44,9 @@ in path = [ pkgs.iptables pkgs.tcpcrypt pkgs.procps ]; preStart = '' - mkdir -p /var/run/tcpcryptd - chown tcpcryptd /var/run/tcpcryptd - sysctl -n net.ipv4.tcp_ecn >/run/pre-tcpcrypt-ecn-state + mkdir -p /run/tcpcryptd + chown tcpcryptd /run/tcpcryptd + sysctl -n net.ipv4.tcp_ecn > /run/tcpcryptd/pre-tcpcrypt-ecn-state sysctl -w net.ipv4.tcp_ecn=0 iptables -t raw -N nixos-tcpcrypt @@ -61,8 +61,8 @@ in script = "tcpcryptd -x 0x10"; postStop = '' - if [ -f /run/pre-tcpcrypt-ecn-state ]; then - sysctl -w net.ipv4.tcp_ecn=$(cat /run/pre-tcpcrypt-ecn-state) + if [ -f /run/tcpcryptd/pre-tcpcrypt-ecn-state ]; then + sysctl -w net.ipv4.tcp_ecn=$(cat /run/tcpcryptd/pre-tcpcrypt-ecn-state) fi iptables -t mangle -D POSTROUTING -j nixos-tcpcrypt || true diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index adb80ea2984059f5761f81375a117388677f8e4f..e3c9b5282b8c49d93469aba9fe9d5572655ac97c 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -178,6 +178,8 @@ in preStart = '' mkdir -p /etc/tinc/${network}/hosts chown tinc.${network} /etc/tinc/${network}/hosts + mkdir -p /etc/tinc/${network}/invitations + chown tinc.${network} /etc/tinc/${network}/invitations # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index c1f945773e2327b5ddbf53449d1db5c19cebd908..cb0e6b1586514e09c82203ec5cf4d045fb7f7978 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -69,7 +69,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = - { ExecStart = "${pkg}/bin/tox-bootstrapd ${cfgFile}"; + { ExecStart = "${pkg}/bin/tox-bootstrapd --config=${cfgFile}"; Type = "forking"; inherit PIDFile; User = "tox-bootstrapd"; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 545ee327d59649cf1641b3b124e91b39774b6d6f..f069a9883a7f5de9130eb37e552bddb5a76e41ac 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -112,7 +112,7 @@ in mkdir -m 0755 -p ${stateDir}/dev/ cp ${confFile} ${stateDir}/unbound.conf ${optionalString cfg.enableRootTrustAnchor '' - ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} + ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!" chown unbound ${stateDir} ${rootTrustAnchorFile} ''} touch ${stateDir}/dev/random diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index 86e0204ec2f72b9f6b36d0eaadf6acbc2c9e14a0..cd1617b8e2bac9146e1c4e3291e3414e099b279c 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -7,6 +7,16 @@ let in { options.services.zerotierone.enable = mkEnableOption "ZeroTierOne"; + + options.services.zerotierone.joinNetworks = mkOption { + default = []; + example = [ "a8a2c3c10c1a68de" ]; + type = types.listOf types.str; + description = '' + List of ZeroTier Network IDs to join on startup + ''; + }; + options.services.zerotierone.package = mkOption { default = pkgs.zerotierone; defaultText = "pkgs.zerotierone"; @@ -22,12 +32,13 @@ in path = [ cfg.package ]; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = - '' - mkdir -p /var/lib/zerotier-one + preStart = '' + mkdir -p /var/lib/zerotier-one/networks.d chmod 700 /var/lib/zerotier-one chown -R root:root /var/lib/zerotier-one - ''; + '' + (concatMapStrings (netId: '' + touch "/var/lib/zerotier-one/networks.d/${netId}.conf" + '') cfg.joinNetworks); serviceConfig = { ExecStart = "${cfg.package}/bin/zerotier-one"; Restart = "always"; @@ -38,6 +49,9 @@ in # ZeroTier does not issue DHCP leases, but some strangers might... networking.dhcpcd.denyInterfaces = [ "zt0" ]; + # ZeroTier receives UDP transmissions on port 9993 by default + networking.firewall.allowedUDPPorts = [ 9993 ]; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 4c7f58d1d8bc360ba6e9ae5613a5527ba416e19c..ecab8cfc7df9f3d21c038c00e52fd1a79302084e 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -124,7 +124,7 @@ in listenAddresses = mkOption { type = types.listOf types.str; - default = [ "127.0.0.1:631" ]; + default = [ "localhost:631" ]; example = [ "*:631" ]; description = '' A list of addresses and ports on which to listen. @@ -321,7 +321,10 @@ in ''} ''; - serviceConfig.PrivateTmp = true; + serviceConfig = { + PrivateTmp = true; + RuntimeDirectory = [ "cups" ]; + }; }; systemd.services.cups-browsed = mkIf avahiEnabled diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index ac589be57736b73f8ab9ccc291b0ad796b2ebbab..e3b6b638f5a715d83f67d196fa90f13b1688aa84 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -90,16 +90,24 @@ in [ (allowdeny "allow" (cfg.allow)) (allowdeny "deny" cfg.deny) # see man 5 fcron.conf - { source = pkgs.writeText "fcron.conf" '' - fcrontabs = /var/spool/fcron - pidfile = /var/run/fcron.pid - fifofile = /var/run/fcron.fifo - fcronallow = /etc/fcron.allow - fcrondeny = /etc/fcron.deny - shell = /bin/sh - sendmail = /run/wrappers/bin/sendmail - editor = ${pkgs.vim}/bin/vim - ''; + { source = + let + isSendmailWrapped = + lib.hasAttr "sendmail" config.security.wrappers; + sendmailPath = + if isSendmailWrapped then "/run/wrappers/bin/sendmail" + else "${config.system.path}/bin/sendmail"; + in + pkgs.writeText "fcron.conf" '' + fcrontabs = /var/spool/fcron + pidfile = /var/run/fcron.pid + fifofile = /var/run/fcron.fifo + fcronallow = /etc/fcron.allow + fcrondeny = /etc/fcron.deny + shell = /bin/sh + sendmail = ${sendmailPath} + editor = ${pkgs.vim}/bin/vim + ''; target = "fcron.conf"; gid = config.ids.gids.fcron; mode = "0644"; diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index c51dd5d946550402de2ec9304c62b293f56b4d0c..d61f588205af9796bbaedf96cb07027181b408a3 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -6,6 +6,7 @@ let cfg = config.services.elasticsearch; es5 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "5" >= 0; + es6 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "6" >= 0; esConfig = '' network.host: ${cfg.listenAddress} @@ -31,8 +32,11 @@ let (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 ""; + postBuild = concatStringsSep "\n" (concatLists [ + # Elasticsearch 5.x won't start when the scripts directory does not exist + (optional es5 "${pkgs.coreutils}/bin/mkdir -p $out/scripts") + (optional es6 "ln -s ${cfg.package}/config/jvm.options $out/jvm.options") + ]); }; esPlugins = pkgs.buildEnv { @@ -92,8 +96,6 @@ in { node.name: "elasticsearch" node.master: true node.data: false - index.number_of_shards: 5 - index.number_of_replicas: 1 ''; }; @@ -165,7 +167,10 @@ in { path = [ pkgs.inetutils ]; environment = { ES_HOME = cfg.dataDir; - ES_JAVA_OPTS = toString ([ "-Des.path.conf=${configDir}" ] ++ cfg.extraJavaOptions); + ES_JAVA_OPTS = toString ( optional (!es6) [ "-Des.path.conf=${configDir}" ] + ++ cfg.extraJavaOptions); + } // optionalAttrs es6 { + ES_PATH_CONF = configDir; }; serviceConfig = { ExecStart = "${cfg.package}/bin/elasticsearch ${toString cfg.extraCmdLineOptions}"; diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index f71f30fee97a88d1108de2d1a20e272fedd2d94c..4161c61ed375eee5868d3d4f92d18c9b7242ba70 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -76,8 +76,9 @@ in }; }; - config = mkIf cfg.updater.enable or cfg.daemon.enable { + config = mkIf (cfg.updater.enable || cfg.daemon.enable) { environment.systemPackages = [ pkg ]; + users.extraUsers = singleton { name = clamavUser; uid = config.ids.uids.clamav; @@ -94,10 +95,10 @@ in environment.etc."clamav/freshclam.conf".source = freshclamConfigFile; environment.etc."clamav/clamd.conf".source = clamdConfigFile; - systemd.services.clamav-daemon = mkIf cfg.daemon.enable { + systemd.services.clamav-daemon = optionalAttrs cfg.daemon.enable { description = "ClamAV daemon (clamd)"; - after = mkIf cfg.updater.enable [ "clamav-freshclam.service" ]; - requires = mkIf cfg.updater.enable [ "clamav-freshclam.service" ]; + after = optional cfg.updater.enable "clamav-freshclam.service"; + requires = optional cfg.updater.enable "clamav-freshclam.service"; wantedBy = [ "multi-user.target" ]; restartTriggers = [ clamdConfigFile ]; @@ -115,7 +116,7 @@ in }; }; - systemd.timers.clamav-freshclam = mkIf cfg.updater.enable { + systemd.timers.clamav-freshclam = optionalAttrs cfg.updater.enable { description = "Timer for ClamAV virus database updater (freshclam)"; wantedBy = [ "timers.target" ]; timerConfig = { @@ -124,7 +125,7 @@ in }; }; - systemd.services.clamav-freshclam = mkIf cfg.updater.enable { + systemd.services.clamav-freshclam = optionalAttrs cfg.updater.enable { description = "ClamAV virus database updater (freshclam)"; restartTriggers = [ freshclamConfigFile ]; diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix index 6c53a2df630663297f132b4979d0601754a1e5b3..39ed506f76176c4a3f84ab0b27498d0abe580246 100644 --- a/nixos/modules/services/security/hologram-agent.nix +++ b/nixos/modules/services/security/hologram-agent.nix @@ -35,10 +35,9 @@ in { config = mkIf cfg.enable { boot.kernelModules = [ "dummy" ]; - networking.interfaces.dummy0 = { - ipAddress = "169.254.169.254"; - prefixLength = 32; - }; + networking.interfaces.dummy0.ipv4.addresses = [ + { address = "169.254.169.254"; prefixLength = 32; } + ]; systemd.services.hologram-agent = { description = "Provide EC2 instance credentials to machines outside of EC2"; diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix index e267fed27955e5af66a308cec39a539bc1115ae0..bad02c7440bac0aa987bb6ac14d896f31569da9b 100644 --- a/nixos/modules/services/security/hologram-server.nix +++ b/nixos/modules/services/security/hologram-server.nix @@ -12,16 +12,20 @@ let dn = cfg.ldapBindDN; password = cfg.ldapBindPassword; }; - insecureldap = cfg.ldapInsecure; - userattr = cfg.ldapUserAttr; - baseDN = cfg.ldapBaseDN; + insecureldap = cfg.ldapInsecure; + userattr = cfg.ldapUserAttr; + baseDN = cfg.ldapBaseDN; + enableldapRoles = cfg.enableLdapRoles; + roleAttr = cfg.roleAttr; + groupClassAttr = cfg.groupClassAttr; }; aws = { account = cfg.awsAccount; defaultrole = cfg.awsDefaultRole; }; - stats = cfg.statsAddress; - listen = cfg.listenAddress; + stats = cfg.statsAddress; + listen = cfg.listenAddress; + cachetimeout = cfg.cacheTimeoutSeconds; }); in { options = { @@ -70,6 +74,24 @@ in { description = "Password of account to use to query the LDAP server"; }; + enableLdapRoles = mkOption { + type = types.bool; + default = false; + description = "Whether to assign user roles based on the user's LDAP group memberships"; + }; + + groupClassAttr = mkOption { + type = types.str; + default = "groupOfNames"; + description = "The objectclass attribute to search for groups when enableLdapRoles is true"; + }; + + roleAttr = mkOption { + type = types.str; + default = "businessCategory"; + description = "Which LDAP group attribute to search for authorized role ARNs"; + }; + awsAccount = mkOption { type = types.str; description = "AWS account number"; @@ -85,6 +107,12 @@ in { default = ""; description = "Address of statsd server"; }; + + cacheTimeoutSeconds = mkOption { + type = types.int; + default = 3600; + description = "How often (in seconds) to refresh the LDAP cache"; + }; }; }; diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 30224d7fc6bace7c3d30f554db3fa97503bac78f..97fbd6aae6e023671e52b5cdcdcd0323ad67b74f 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -30,6 +30,20 @@ in ''; }; + allowAnyUser = mkOption { + type = types.bool; + default = false; + description = '' + Whether to allow any user to lock the screen. This will install a + setuid wrapper to allow any user to start physlock as root, which + is a minor security risk. Call the physlock binary to use this instead + of using the systemd service. + + Note that you might need to relog to have the correct binary in your + PATH upon changing this option. + ''; + }; + disableSysRq = mkOption { type = types.bool; default = true; @@ -79,28 +93,36 @@ in ###### implementation - config = mkIf cfg.enable { - - # for physlock -l and physlock -L - environment.systemPackages = [ pkgs.physlock ]; - - systemd.services."physlock" = { - enable = true; - description = "Physlock"; - wantedBy = optional cfg.lockOn.suspend "suspend.target" - ++ optional cfg.lockOn.hibernate "hibernate.target" - ++ cfg.lockOn.extraTargets; - before = optional cfg.lockOn.suspend "systemd-suspend.service" - ++ optional cfg.lockOn.hibernate "systemd-hibernate.service" - ++ cfg.lockOn.extraTargets; - serviceConfig.Type = "forking"; - script = '' - ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"} - ''; - }; + config = mkIf cfg.enable (mkMerge [ + { + + # for physlock -l and physlock -L + environment.systemPackages = [ pkgs.physlock ]; + + systemd.services."physlock" = { + enable = true; + description = "Physlock"; + wantedBy = optional cfg.lockOn.suspend "suspend.target" + ++ optional cfg.lockOn.hibernate "hibernate.target" + ++ cfg.lockOn.extraTargets; + before = optional cfg.lockOn.suspend "systemd-suspend.service" + ++ optional cfg.lockOn.hibernate "systemd-hibernate.service" + ++ cfg.lockOn.extraTargets; + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}"; + }; + }; - security.pam.services.physlock = {}; + security.pam.services.physlock = {}; - }; + } + + (mkIf cfg.allowAnyUser { + + security.wrappers.physlock = { source = "${pkgs.physlock}/bin/physlock"; user = "root"; }; + + }) + ]); } diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index bc79d9f2a590c8853ded3e6ad5781b6ca19aa7a3..806252f49b8d72fa654630544f5b958618649131 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -5,10 +5,31 @@ with lib; let cfg = config.services.tor; torDirectory = "/var/lib/tor"; + torRunDirectory = "/run/tor"; opt = name: value: optionalString (value != null) "${name} ${value}"; optint = name: value: optionalString (value != null && value != 0) "${name} ${toString value}"; + isolationOptions = { + type = types.listOf (types.enum [ + "IsolateClientAddr" + "IsolateSOCKSAuth" + "IsolateClientProtocol" + "IsolateDestPort" + "IsolateDestAddr" + ]); + default = []; + example = [ + "IsolateClientAddr" + "IsolateSOCKSAuth" + "IsolateClientProtocol" + "IsolateDestPort" + "IsolateDestAddr" + ]; + description = "Tor isolation options"; + }; + + torRc = '' User tor DataDirectory ${torDirectory} @@ -18,12 +39,23 @@ let ''} ${optint "ControlPort" cfg.controlPort} + ${optionalString cfg.controlSocket.enable "ControlSocket ${torRunDirectory}/control GroupWritable RelaxDirModeCheck"} '' # Client connection config - + optionalString cfg.client.enable '' - SOCKSPort ${cfg.client.socksListenAddress} IsolateDestAddr + + optionalString cfg.client.enable '' + SOCKSPort ${cfg.client.socksListenAddress} ${toString cfg.client.socksIsolationOptions} SOCKSPort ${cfg.client.socksListenAddressFaster} ${opt "SocksPolicy" cfg.client.socksPolicy} + + ${optionalString cfg.client.transparentProxy.enable '' + TransPort ${cfg.client.transparentProxy.listenAddress} ${toString cfg.client.transparentProxy.isolationOptions} + ''} + + ${optionalString cfg.client.dns.enable '' + DNSPort ${cfg.client.dns.listenAddress} ${toString cfg.client.dns.isolationOptions} + AutomapHostsOnResolve 1 + AutomapHostsSuffixes ${concatStringsSep "," cfg.client.dns.automapHostsSuffixes} + ''} '' # Relay config + optionalString cfg.relay.enable '' @@ -58,6 +90,9 @@ let ${flip concatMapStrings v.map (p: '' HiddenServicePort ${toString p.port} ${p.destination} '')} + ${optionalString (v.authorizeClient != null) '' + HiddenServiceAuthorizeClient ${v.authorizeClient.authType} ${concatStringsSep "," v.authorizeClient.clientNames} + ''} '')) + cfg.extraConfig; @@ -107,6 +142,17 @@ in ''; }; + controlSocket = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Wheter to enable Tor control socket. Control socket is created + in ${torRunDirectory}/control + ''; + }; + }; + client = { enable = mkOption { type = types.bool; @@ -154,6 +200,55 @@ in ''; }; + socksIsolationOptions = mkOption (isolationOptions // { + default = ["IsolateDestAddr"]; + }); + + transparentProxy = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable tor transaprent proxy"; + }; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1:9040"; + example = "192.168.0.1:9040"; + description = '' + Bind transparent proxy to this address. + ''; + }; + + isolationOptions = mkOption isolationOptions; + }; + + dns = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable tor dns resolver"; + }; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1:9053"; + example = "192.168.0.1:9053"; + description = '' + Bind tor dns to this address. + ''; + }; + + isolationOptions = mkOption isolationOptions; + + automapHostsSuffixes = mkOption { + type = types.listOf types.str; + default = [".onion" ".exit"]; + example = [".onion"]; + description = "List of suffixes to use with automapHostsOnResolve"; + }; + }; + privoxy.enable = mkOption { type = types.bool; default = true; @@ -540,6 +635,33 @@ in })); }; + authorizeClient = mkOption { + default = null; + description = "If configured, the hidden service is accessible for authorized clients only."; + type = types.nullOr (types.submodule ({config, ...}: { + + options = { + + authType = mkOption { + type = types.enum [ "basic" "stealth" ]; + description = '' + Either "basic" for a general-purpose authorization protocol + or "stealth" for a less scalable protocol + that also hides service activity from unauthorized clients. + ''; + }; + + clientNames = mkOption { + type = types.nonEmptyListOf (types.strMatching "[A-Za-z0-9+-_]+"); + description = '' + Only clients that are listed here are authorized to access the hidden service. + Generated authorization data can be found in ${torDirectory}/onion/$name/hostname. + Clients need to put this authorization data in their configuration file using HidServAuth. + ''; + }; + }; + })); + }; }; config = { @@ -581,14 +703,10 @@ in after = [ "network.target" ]; restartTriggers = [ torRcFile ]; - # Translated from the upstream contrib/dist/tor.service.in - preStart = '' - install -o tor -g tor -d ${torDirectory}/onion - ${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config - ''; - serviceConfig = { Type = "simple"; + # Translated from the upstream contrib/dist/tor.service.in + ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config"; ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile} --RunAsDaemon 0"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillSignal = "SIGINT"; @@ -603,11 +721,13 @@ in # DeviceAllow /dev/urandom r # .. but we can't specify DeviceAllow multiple times. 'closed' # is close enough. + RuntimeDirectory = "tor"; + StateDirectory = [ "tor" "tor/onion" ]; PrivateTmp = "yes"; DevicePolicy = "closed"; InaccessibleDirectories = "/home"; ReadOnlyDirectories = "/"; - ReadWriteDirectories = torDirectory; + ReadWriteDirectories = [torDirectory torRunDirectory]; NoNewPrivileges = "yes"; }; }; diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix index a29cb3f33dae6f0997ac2345ab375c638e0f77a4..08da726437ea89e14d299b06427d74066d1ae195 100644 --- a/nixos/modules/services/security/torify.nix +++ b/nixos/modules/services/security/torify.nix @@ -7,7 +7,7 @@ let torify = pkgs.writeTextFile { name = "tsocks"; text = '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.tsocks.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@" ''; executable = true; diff --git a/nixos/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix index 1b5a05b21e77c6a0a40f8cc3f63e865eb77ce537..c60c745443bcf006729f87e82dcd5ef95e1a4443 100644 --- a/nixos/modules/services/security/torsocks.nix +++ b/nixos/modules/services/security/torsocks.nix @@ -23,7 +23,7 @@ let wrapTorsocks = name: server: pkgs.writeTextFile { name = name; text = '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (configFile server)} ${pkgs.torsocks}/bin/torsocks "$@" ''; executable = true; diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index 1f2c56a9efa15c5704619fe674fc04f412d0a4f2..5d469cabe2cbf7f476ebf4781f0d34e30e4149ca 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -56,7 +56,7 @@ in { }; rules = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.lines; default = null; example = '' allow with-interface equals { 08:*:* } @@ -192,7 +192,7 @@ in { serviceConfig = { Type = "simple"; - ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -d -k -c ${daemonConfFile}''; + ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -P -d -k -c ${daemonConfFile}''; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix new file mode 100644 index 0000000000000000000000000000000000000000..b9355bbb94419a6fdacc0fe0be9849c0e8fe6e8a --- /dev/null +++ b/nixos/modules/services/system/localtime.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.localtime; +in { + options = { + services.localtime = { + enable = mkOption { + default = false; + description = '' + Enable localtime, simple daemon for keeping the system + timezone up-to-date based on the current location. It uses geoclue2 to + determine the current location and systemd-timedated to actually set + the timezone. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.geoclue2.enable = true; + + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.timedate1.set-timezone" + && subject.user == "localtimed") { + return polkit.Result.YES; + } + }); + ''; + + users.users = [{ + name = "localtimed"; + description = "Taskserver user"; + }]; + + systemd.services.localtime = { + description = "localtime service"; + wantedBy = [ "multi-user.target" ]; + partOf = [ "geoclue.service "]; + + serviceConfig = { + Restart = "on-failure"; + # TODO: make it work with dbus + #DynamicUser = true; + Nice = 10; + User = "localtimed"; + PrivateTmp = "yes"; + PrivateDevices = true; + PrivateNetwork = "yes"; + NoNewPrivileges = "yes"; + ProtectSystem = "strict"; + ProtectHome = true; + ExecStart = "${pkgs.localtime}/bin/localtimed"; + }; + }; + }; +} diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index dd6b585b7e2372ed6f631fceb7203d2d3bcffe03..3564afd77f413b3ae07847a56db52bccf29204cb 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -21,6 +21,19 @@ let # for users in group "transmission" to have access to torrents fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings; + + # Directories transmission expects to exist and be ug+rwx. + directoriesToManage = [ homeDir settingsDir fullSettings.download-dir fullSettings.incomplete-dir ]; + + preStart = pkgs.writeScript "transmission-pre-start" '' + #!${pkgs.runtimeShell} + set -ex + for DIR in ${escapeShellArgs directoriesToManage}; do + mkdir -p "$DIR" + chmod 770 "$DIR" + done + cp -f ${settingsFile} ${settingsDir}/settings.json + ''; in { options = { @@ -59,8 +72,8 @@ in time the service starts). String values must be quoted, integer and boolean values must not. - See https://trac.transmissionbt.com/wiki/EditConfigFiles for - documentation. + See https://github.com/transmission/transmission/wiki/Editing-Configuration-Files + for documentation. ''; }; @@ -89,9 +102,7 @@ in # 1) Only the "transmission" user and group have access to torrents. # 2) Optionally update/force specific fields into the configuration file. - serviceConfig.ExecStartPre = '' - ${pkgs.stdenv.shell} -c "mkdir -p ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && chmod 770 ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json" - ''; + serviceConfig.ExecStartPre = preStart; serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}"; serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; serviceConfig.User = "transmission"; @@ -136,6 +147,7 @@ in ${getLib pkgs.libcap}/lib/libcap*.so* mr, ${getLib pkgs.attr}/lib/libattr*.so* mr, ${getLib pkgs.lz4}/lib/liblz4*.so* mr, + ${getLib pkgs.libkrb5}/lib/lib*.so* mr, @{PROC}/sys/kernel/random/uuid r, @{PROC}/sys/vm/overcommit_memory r, diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index 3429397d2cc29ab1cec83b2dd701e62433748246..b50de496e97538ad6d594b543b9db636ea8b08ea 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -64,8 +64,8 @@ in config = { # Note: this is set here rather than up there so that changing - # nixosLabel would not rebuild manual pages - services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixosLabel} (\m) - \l >>>''; + # nixos.label would not rebuild manual pages + services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>''; systemd.services."getty@" = { serviceConfig.ExecStart = [ diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 81ee8154326c7a970e5908893593bfd5ff5d9d8e..13c5951524d9f498b6d21d84517710d8a886ae13 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -155,7 +155,7 @@ in requires = [ "postgresql.service" ]; after = [ "postgresql.service" ]; - path = [ cfg.jrePackage ]; + path = [ cfg.jrePackage pkgs.bash ]; environment = { JIRA_USER = cfg.user; diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml new file mode 100644 index 0000000000000000000000000000000000000000..456aae6cc366283ab08d131cbc4436b20791f54c --- /dev/null +++ b/nixos/modules/services/web-apps/matomo-doc.xml @@ -0,0 +1,95 @@ + + + Matomo + + Matomo is a real-time web analytics application. + This module configures php-fpm as backend for Matomo, optionally configuring an nginx vhost as well. + + + + An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup. + + + +
+ Database Setup + + + You also need to configure a MariaDB or MySQL database and -user for Matomo 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: + + + # For MariaDB + INSTALL PLUGIN unix_socket SONAME 'auth_socket'; + CREATE DATABASE matomo; + CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket; + GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; + + # For MySQL + INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; + CREATE DATABASE matomo; + CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; + GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; + + + Then fill in matomo as database user and database name, and leave the password field blank. + This authentication works by allowing only the matomo unix user to authenticate as the + matomo database user (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/matomo/config/config.ini.php file. + Use a user in the matomo group or root to access the file. + For more information, see . + +
+ + +
+ Issues + + + + Matomo's file integrity check will warn you. + This is due to the patches necessary for NixOS, you can safely ignore this. + + + + + + Matomo 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. + + + +
+ + +
+ 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-matomo.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/matomo.nix b/nixos/modules/services/web-apps/matomo.nix new file mode 100644 index 0000000000000000000000000000000000000000..ef6ac9698e219b21ba9b954183f85ac2033c6692 --- /dev/null +++ b/nixos/modules/services/web-apps/matomo.nix @@ -0,0 +1,246 @@ +{ config, lib, pkgs, services, ... }: +with lib; +let + cfg = config.services.matomo; + + user = "matomo"; + dataDir = "/var/lib/${user}"; + deprecatedDataDir = "/var/lib/piwik"; + + 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"; + + fqdn = + let + join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; + in join config.networking.hostName config.networking.domain; + +in { + options = { + services.matomo = { + # NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963 + # matomo issue for automatic matomo setup: https://github.com/matomo-org/matomo/issues/10257 + # TODO: find a nice way to do this when more NixOS MySQL and / or matomo automatic setup stuff is implemented. + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable matomo web analytics with php-fpm backend. + Either the nginx option or the webServerUser option is mandatory. + ''; + }; + + webServerUser = mkOption { + type = types.nullOr types.str; + default = null; + example = "lighttpd"; + # TODO: piwik.php might get renamed to matomo.php in future releases + description = '' + Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for matomo if the nginx + option is not used. Either this option or the nginx option is mandatory. + 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 matomo. + ''; + }; + + nginx = mkOption { + type = types.nullOr (types.submodule ( + recursiveUpdate + (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) + { + # enable encryption by default, + # as sensitive login and matomo data should not be transmitted in clear text. + options.forceSSL.default = true; + options.enableACME.default = true; + } + ) + ); + default = null; + example = { + serverAliases = [ + "matomo.$\{config.networking.domain\}" + "stats.$\{config.networking.domain\}" + ]; + enableACME = false; + }; + description = '' + With this option, you can customize an nginx virtualHost which already has sensible defaults for matomo. + Either this option or the webServerUser option is mandatory. + Set this to {} to just enable the virtualHost if you don't need any customization. + If enabled, then by default, the is + ${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}, + SSL is active, and certificates are acquired via ACME. + If this is set to null (the default), no nginx virtualHost will be configured. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + warnings = mkIf (cfg.nginx != null && cfg.webServerUser != null) [ + "If services.matomo.nginx is set, services.matomo.nginx.webServerUser is ignored and should be removed." + ]; + + assertions = [ { + assertion = cfg.nginx != null || cfg.webServerUser != null; + message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory"; + }]; + + users.extraUsers.${user} = { + isSystemUser = true; + createHome = true; + home = dataDir; + group = user; + }; + users.extraGroups.${user} = {}; + + systemd.services.matomo_setup_update = { + # everything needs to set up and up to date before matomo 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.matomo ]; + serviceConfig = { + Type = "oneshot"; + User = user; + # hide especially config.ini.php from other + UMask = "0007"; + # TODO: might get renamed to MATOMO_USER_PATH in future versions + 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 = '' + # migrate data from piwik to matomo folder + if [ -d ${deprecatedDataDir} ]; then + echo "Migrating from ${deprecatedDataDir} to ${dataDir}" + mv -T ${deprecatedDataDir} ${dataDir} + fi + chown -R ${user}:${user} ${dataDir} + chmod -R ug+rwX,o-rwx ${dataDir} + ''; + script = '' + # Use User-Private Group scheme to protect matomo data, but allow administration / backup via matomo group + # Copy config folder + chmod g+s "${dataDir}" + cp -r "${pkgs.matomo}/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 + matomo-console core:update --yes + fi + ''; + }; + + systemd.services.${phpExecutionUnit} = { + # stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart + restartTriggers = [ pkgs.matomo ]; + # stop config.ini.php from getting written with read permission for others + serviceConfig.UMask = "0007"; + }; + + services.phpfpm.poolConfigs = let + # workaround for when both are null and need to generate a string, + # which is illegal, but as assertions apparently are being triggered *after* config generation, + # we have to avoid already throwing errors at this previous stage. + socketOwner = if (cfg.nginx != null) then config.services.nginx.user + else if (cfg.webServerUser != null) then cfg.webServerUser else ""; + in { + ${pool} = '' + listen = "${phpSocket}" + listen.owner = ${socketOwner} + 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 + "${user}.${fqdn}" = mkMerge [ cfg.nginx { + # don't allow to override the root easily, as it will almost certainly break matomo. + # disadvantage: not shown as default in docs. + root = mkForce "${pkgs.matomo}/share"; + + # define locations here instead of as the submodule option's default + # so that they can easily be extended with additional locations if required + # without needing to redefine the matomo ones. + # disadvantage: not shown as default in docs. + locations."/" = { + index = "index.php"; + }; + # allow index.php for webinterface + locations."= /index.php".extraConfig = '' + fastcgi_pass unix:${phpSocket}; + ''; + # TODO: might get renamed to matomo.php in future versions + # 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"; + ''; + # TODO: might get renamed to matomo.js in future versions + # let browsers cache piwik.js + locations."= /piwik.js".extraConfig = '' + expires 1M; + ''; + }]; + }; + }; + + meta = { + doc = ./matomo-doc.xml; + maintainers = with stdenv.lib.maintainers; [ florianjacob ]; + }; +} diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix index a750aa66b27c5b10d5fb41df43fcf204c4c854a4..f6a5ce73a12b0c1e701115e8e0aa2f1253b39baa 100644 --- a/nixos/modules/services/web-apps/nexus.nix +++ b/nixos/modules/services/web-apps/nexus.nix @@ -11,7 +11,7 @@ in { options = { services.nexus = { - enable = mkEnableOption "SonarType Nexus3 OSS service"; + enable = mkEnableOption "Sonatype Nexus3 OSS service"; user = mkOption { type = types.str; @@ -54,7 +54,7 @@ in users.extraGroups."${cfg.group}" = {}; systemd.services.nexus = { - description = "SonarType Nexus3"; + description = "Sonatype Nexus3"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/web-apps/nixbot.nix b/nixos/modules/services/web-apps/nixbot.nix deleted file mode 100644 index 0592d01bf36928f4e3c0d56f783f907aef253222..0000000000000000000000000000000000000000 --- a/nixos/modules/services/web-apps/nixbot.nix +++ /dev/null @@ -1,149 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.nixbot; - pyramidIni = '' - ### - # app configuration - # http://docs.pylonsproject.org/projects/pyramid/en/1.7-branch/narr/environment.html - ### - - [app:main] - use = egg:nixbot - - nixbot.github_token = ${cfg.githubToken} - nixbot.bot_name = ${cfg.botName} - nixbot.repo = ${cfg.repo} - nixbot.pr_repo = ${cfg.prRepo} - nixbot.hydra_jobsets_repo = ${cfg.hydraJobsetsRepo} - nixbot.github_secret = justnotsorandom - nixbot.public_url = ${cfg.publicUrl} - nixbot.repo_dir = ${cfg.repoDir} - - pyramid.reload_templates = false - pyramid.debug_authorization = false - pyramid.debug_notfound = false - pyramid.debug_routematch = false - pyramid.default_locale_name = en - - # By default, the toolbar only appears for clients from IP addresses - # '127.0.0.1' and '::1'. - # debugtoolbar.hosts = 127.0.0.1 ::1 - - ### - # wsgi server configuration - ### - - [server:main] - use = egg:waitress#main - host = 0.0.0.0 - port = 6543 - - ### - # logging configuration - # http://docs.pylonsproject.org/projects/pyramid/en/1.7-branch/narr/logging.html - ### - - [loggers] - keys = root, nixbot - - [handlers] - keys = console - - [formatters] - keys = generic - - [logger_root] - level = INFO - handlers = console - - [logger_nixbot] - level = INFO - handlers = - qualname = nixbot - - [handler_console] - class = StreamHandler - args = (sys.stderr,) - level = NOTSET - formatter = generic - - [formatter_generic] - format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s - ''; -in { - options = { - services.nixbot = { - enable = mkEnableOption "nixbot"; - - botName = mkOption { - type = types.str; - description = "The bot's github user account name."; - default = "nixbot"; - }; - - githubToken = mkOption { - type = types.str; - description = "The bot's github user account token."; - example = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; - }; - - repo = mkOption { - type = types.str; - description = "The github repository to check for PRs."; - example = "nixos/nixpkgs"; - }; - - prRepo = mkOption { - type = types.str; - description = "The github repository to push the testing branches to."; - example = "nixos/nixpkgs-pr"; - }; - - hydraJobsetsRepo = mkOption { - type = types.str; - description = "The github repository to push the hydra jobset definitions to."; - example = "nixos/hydra-jobsets"; - }; - - publicUrl = mkOption { - type = types.str; - description = "The public URL the bot is reachable at (Github hook endpoint)."; - example = "https://nixbot.nixos.org"; - }; - - repoDir = mkOption { - type = types.path; - description = "The directory the repositories are stored in."; - default = "/var/lib/nixbot"; - }; - }; - }; - - config = mkIf cfg.enable { - users.extraUsers.nixbot = { - createHome = true; - home = cfg.repoDir; - }; - - systemd.services.nixbot = let - env = pkgs.python3.buildEnv.override { - extraLibs = [ pkgs.nixbot ]; - }; - in { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - script = '' - ${env}/bin/pserve ${pkgs.writeText "production.ini" pyramidIni} - ''; - - serviceConfig = { - User = "nixbot"; - Group = "nogroup"; - PermissionsStartOnly = true; - }; - }; - }; -} diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/piwik-doc.xml deleted file mode 100644 index a393a182d36a946340cf75ecd7d2487d37d91fcc..0000000000000000000000000000000000000000 --- a/nixos/modules/services/web-apps/piwik-doc.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - 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: - - - # For MariaDB - INSTALL PLUGIN unix_socket SONAME 'auth_socket'; - CREATE DATABASE piwik; - CREATE USER 'piwik'@'localhost' IDENTIFIED WITH unix_socket; - GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost'; - - # For MySQL - INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; - CREATE DATABASE piwik; - CREATE USER 'piwik'@'localhost' IDENTIFIED WITH auth_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 authentication works by allowing only the piwik unix user to authenticate as the - piwik database user (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. - - - -
- - -
- 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 deleted file mode 100644 index ce86c6873dd408272e9b9efb8c653b4d1f8d6d9b..0000000000000000000000000000000000000000 --- a/nixos/modules/services/web-apps/piwik.nix +++ /dev/null @@ -1,227 +0,0 @@ -{ 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. - Either the nginx option or the webServerUser option is mandatory. - ''; - }; - - webServerUser = mkOption { - type = types.nullOr types.str; - default = null; - example = "lighttpd"; - description = '' - Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for piwik if the nginx - option is not used. Either this option or the nginx option is mandatory. - 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 { - type = types.nullOr (types.submodule ( - recursiveUpdate - (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) - { - # enable encryption by default, - # as sensitive login and piwik data should not be transmitted in clear text. - options.forceSSL.default = true; - options.enableACME.default = true; - } - ) - ); - default = null; - example = { - serverName = "stats.$\{config.networking.hostName\}"; - enableACME = false; - }; - description = '' - With this option, you can customize an nginx virtualHost which already has sensible defaults for piwik. - Either this option or the webServerUser option is mandatory. - Set this to {} to just enable the virtualHost if you don't need any customization. - If enabled, then by default, the serverName is piwik.$\{config.networking.hostName\}, SSL is active, - and certificates are acquired via ACME. - If this is set to null (the default), no nginx virtualHost will be configured. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - warnings = mkIf (cfg.nginx != null && cfg.webServerUser != null) [ - "If services.piwik.nginx is set, services.piwik.nginx.webServerUser is ignored and should be removed." - ]; - - assertions = [ { - assertion = cfg.nginx != null || cfg.webServerUser != null; - message = "Either services.piwik.nginx or services.piwik.nginx.webServerUser is mandatory"; - }]; - - 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 = let - # workaround for when both are null and need to generate a string, - # which is illegal, but as assertions apparently are being triggered *after* config generation, - # we have to avoid already throwing errors at this previous stage. - socketOwner = if (cfg.nginx != null) then config.services.nginx.user - else if (cfg.webServerUser != null) then cfg.webServerUser else ""; - in { - ${pool} = '' - listen = "${phpSocket}" - listen.owner = ${socketOwner} - 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 - "${user}.${config.networking.hostName}" = mkMerge [ cfg.nginx { - # don't allow to override the root easily, as it will almost certainly break piwik. - # disadvantage: not shown as default in docs. - root = mkForce "${pkgs.piwik}/share"; - - # define locations here instead of as the submodule option's default - # so that they can easily be extended with additional locations if required - # without needing to redefine the piwik ones. - # disadvantage: not shown as default in docs. - 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 deleted file mode 100644 index 1fbf346a34c4262512ea871c33f06871477ced2c..0000000000000000000000000000000000000000 --- a/nixos/modules/services/web-apps/pump.io-configure.js +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 27ae685163676a35ce789b6b5ed324a21e1b860e..0000000000000000000000000000000000000000 --- a/nixos/modules/services/web-apps/pump.io.nix +++ /dev/null @@ -1,438 +0,0 @@ -{ config, lib, pkgs, ... }: - -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 = { - 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; - - address = cfg.address; - port = cfg.port; - - noweb = false; - urlPort = cfg.urlPort; - hostname = cfg.hostname; - favicon = cfg.favicon; - - site = cfg.site; - owner = cfg.owner; - ownerURL = cfg.ownerURL; - - key = cfg.sslKey; - cert = cfg.sslCert; - bounce = false; - - 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; - - nologger = false; - enableUploads = cfg.enableUploads; - datadir = dataDir; - debugClient = false; - firehose = cfg.firehose; - disableRegistration = cfg.disableRegistration; - - 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 = { - - enable = mkEnableOption "Pump.io social streams server"; - - secret = mkOption { - type = types.nullOr types.str; - default = null; - example = "my dog has fleas"; - description = '' - A session-generating secret, server-wide password. Warning: - this is stored in cleartext in the Nix store! - ''; - }; - - 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"; - description = "Name of the server"; - }; - - owner = mkOption { - type = types.str; - default = ""; - example = "Awesome Inc."; - description = "Name of owning entity, if you want to link to it."; - }; - - ownerURL = mkOption { - type = types.str; - default = ""; - example = "https://pump.io"; - description = "URL of owning entity, if you want to link to it."; - }; - - address = mkOption { - type = types.str; - default = "localhost"; - description = '' - Web server listen address. - ''; - }; - - port = mkOption { - type = types.int; - default = 31337; - description = '' - Port to listen on. Defaults to 31337, which is suitable for - running behind a reverse proxy. For a standalone server, - use 443. - ''; - }; - - hostname = mkOption { - type = types.nullOr types.str; - default = "localhost"; - description = '' - The hostname of the server, used for generating - URLs. Defaults to "localhost" which doesn't do much for you. - ''; - }; - - urlPort = mkOption { - type = types.int; - default = 443; - description = '' - Port to use for generating URLs. This basically has to be - either 80 or 443 because the host-meta and Webfinger - protocols don't make any provision for HTTP/HTTPS servers - running on other ports. - ''; - }; - - favicon = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Local filesystem path to the favicon.ico file to use. This - will be served as "/favicon.ico" by the server. - ''; - }; - - 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"; - default = ""; - description = '' - The path to the server certificate private key. The - certificate is required, but it can be self-signed. - ''; - }; - - sslCert = mkOption { - type = types.path; - example = "${dataDir}/myserver.crt"; - default = ""; - description = '' - The path to the server certificate. The certificate is - required, but it can be self-signed. - ''; - }; - - firehose = mkOption { - type = types.str; - default = "ofirehose.com"; - description = '' - Firehose host running the ofirehose software. Defaults to - "ofirehose.com". Public notices will be ping this firehose - server and from there go out to search engines and the - world. If you want to disconnect from the public web, set - this to something falsy. - ''; - }; - - disableRegistration = mkOption { - type = types.bool; - default = false; - description = '' - Disables registering new users on the site through the Web - or the API. - ''; - }; - - requireEmail = mkOption { - type = types.bool; - default = false; - description = "Require an e-mail address to register."; - }; - - extraConfig = mkOption { - default = { }; - description = '' - Extra configuration options which are serialized to json and added - to the pump.io.json config file. - ''; - }; - - driver = mkOption { - type = types.enum [ "mongodb" "disk" "lrucache" "memcached" "redis" ]; - default = "mongodb"; - description = "Type of database. Corresponds to a nodejs databank driver."; - }; - - driverParams = mkOption { - default = { }; - description = "Extra parameters for the driver."; - }; - - dbHost = mkOption { - type = types.str; - default = "localhost"; - description = "The database host to connect to."; - }; - - dbPort = mkOption { - type = types.int; - default = 27017; - description = "The port that the database is listening on."; - }; - - dbName = mkOption { - type = types.str; - default = "pumpio"; - description = "The name of the database to use."; - }; - - dbUser = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The username. Defaults to null, meaning no authentication. - ''; - }; - - dbPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The password corresponding to dbUser. Warning: this is - stored in cleartext in the Nix store! - ''; - }; - - 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; - example = "localhost"; - description = '' - Server to use for sending transactional email. If it's not - set up, no email is sent and features like password recovery - and email notification won't work. - ''; - }; - - smtpPort = mkOption { - type = types.int; - default = 25; - description = '' - Port to connect to on SMTP server. - ''; - }; - - smtpUser = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Username to use to connect to SMTP server. Might not be - necessary for some servers. - ''; - }; - - smtpPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Password to use to connect to SMTP server. Might not be - necessary for some servers. Warning: this is stored in - cleartext in the Nix store! - ''; - }; - - 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; - description = '' - Only use SSL with the SMTP server. By default, a SSL - connection is negotiated using TLS. You may need to change - the smtpPort value if you set this. - ''; - }; - - smtpFrom = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Email address to use in the "From:" header of outgoing - notifications. Defaults to 'no-reply@' plus the site - hostname. - ''; - }; - - spamHost = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Host running activityspam software to use to test updates - for spam. - ''; - }; - spamClientId = mkOption { - type = types.nullOr types.str; - default = null; - description = "OAuth pair for spam server."; - }; - spamClientSecret = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - OAuth pair for spam server. Warning: this is - 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 - stream server that does most of what people really want from a social network"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - preStart = '' - mkdir -p ${dataDir}/uploads - mkdir -p ${runDir} - chown pumpio:pumpio ${dataDir}/uploads ${runDir} - chmod 770 ${dataDir}/uploads ${runDir} - - ${pkgs.nodejs}/bin/node ${configScript} < php.ini: extension = geoip.so +#expat + +let + cfg = config.services.restya-board; + + runDir = "/run/restya-board"; + + poolName = "restya-board"; + phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; + +in + +{ + + ###### interface + + options = { + + services.restya-board = { + + enable = mkEnableOption "restya-board"; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/restya-board"; + example = "/var/lib/restya-board"; + description = '' + Data of the application. + ''; + }; + + user = mkOption { + type = types.str; + default = "restya-board"; + example = "restya-board"; + description = '' + User account under which the web-application runs. + ''; + }; + + group = mkOption { + type = types.str; + default = "nginx"; + example = "nginx"; + description = '' + Group account under which the web-application runs. + ''; + }; + + virtualHost = { + serverName = mkOption { + type = types.str; + default = "restya.board"; + description = '' + Name of the nginx virtualhost to use. + ''; + }; + + listenHost = mkOption { + type = types.str; + default = "localhost"; + description = '' + Listen address for the virtualhost to use. + ''; + }; + + listenPort = mkOption { + type = types.int; + default = 3000; + description = '' + Listen port for the virtualhost to use. + ''; + }; + }; + + database = { + host = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Host of the database. Leave 'null' to use a local PostgreSQL database. + A local PostgreSQL database is initialized automatically. + ''; + }; + + port = mkOption { + type = types.nullOr types.int; + default = 5432; + description = '' + The database's port. + ''; + }; + + name = mkOption { + type = types.str; + default = "restya_board"; + description = '' + Name of the database. The database must exist. + ''; + }; + + user = mkOption { + type = types.str; + default = "restya_board"; + description = '' + The database user. The user must exist and have access to + the specified database. + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The database user's password. 'null' if no password is set. + ''; + }; + }; + + email = { + server = mkOption { + type = types.nullOr types.str; + default = null; + example = "localhost"; + description = '' + Hostname to send outgoing mail. Null to use the system MTA. + ''; + }; + + port = mkOption { + type = types.int; + default = 25; + description = '' + Port used to connect to SMTP server. + ''; + }; + + login = mkOption { + type = types.str; + default = ""; + description = '' + SMTP authentication login used when sending outgoing mail. + ''; + }; + + password = mkOption { + type = types.str; + default = ""; + description = '' + SMTP authentication password used when sending outgoing mail. + + ATTENTION: The password is stored world-readable in the nix-store! + ''; + }; + }; + + timezone = mkOption { + type = types.lines; + default = "GMT"; + description = '' + Timezone the web-app runs in. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + services.phpfpm.poolConfigs = { + "${poolName}" = '' + listen = "${phpfpmSocketName}"; + listen.owner = nginx + listen.group = nginx + listen.mode = 0600 + user = ${cfg.user} + group = ${cfg.group} + pm = dynamic + pm.max_children = 75 + pm.start_servers = 10 + pm.min_spare_servers = 5 + pm.max_spare_servers = 20 + pm.max_requests = 500 + catch_workers_output = 1 + ''; + }; + + services.phpfpm.phpOptions = '' + date.timezone = "CET" + + ${optionalString (!isNull cfg.email.server) '' + SMTP = ${cfg.email.server} + smtp_port = ${toString cfg.email.port} + auth_username = ${cfg.email.login} + auth_password = ${cfg.email.password} + ''} + ''; + + services.nginx.enable = true; + services.nginx.virtualHosts."${cfg.virtualHost.serverName}" = { + listen = [ { addr = cfg.virtualHost.listenHost; port = cfg.virtualHost.listenPort; } ]; + serverName = cfg.virtualHost.serverName; + root = runDir; + extraConfig = '' + index index.html index.php; + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types text/plain application/xml text/css text/js text/xml application/x-javascript text/javascript application/json application/xml+rss; + + client_max_body_size 300M; + + rewrite ^/oauth/authorize$ /server/php/authorize.php last; + rewrite ^/oauth_callback/([a-zA-Z0-9_\.]*)/([a-zA-Z0-9_\.]*)$ /server/php/oauth_callback.php?plugin=$1&code=$2 last; + rewrite ^/download/([0-9]*)/([a-zA-Z0-9_\.]*)$ /server/php/download.php?id=$1&hash=$2 last; + rewrite ^/ical/([0-9]*)/([0-9]*)/([a-z0-9]*).ics$ /server/php/ical.php?board_id=$1&user_id=$2&hash=$3 last; + rewrite ^/api/(.*)$ /server/php/R/r.php?_url=$1&$args last; + rewrite ^/api_explorer/api-docs/$ /client/api_explorer/api-docs/index.php last; + ''; + + locations."/".root = "${runDir}/client"; + + locations."~ \.php$" = { + tryFiles = "$uri =404"; + extraConfig = '' + include ${pkgs.nginx}/conf/fastcgi_params; + fastcgi_pass unix:${phpfpmSocketName}; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PHP_VALUE "upload_max_filesize=9G \n post_max_size=9G \n max_execution_time=200 \n max_input_time=200 \n memory_limit=256M"; + ''; + }; + + locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = { + root = "${runDir}/client"; + extraConfig = '' + if (-f $request_filename) { + break; + } + rewrite ^/img/([a-zA-Z_]*)/([a-zA-Z_]*)/([a-zA-Z0-9_\.]*)$ /server/php/image.php?size=$1&model=$2&filename=$3 last; + add_header Cache-Control public; + add_header Cache-Control must-revalidate; + expires 7d; + ''; + }; + }; + + systemd.services.restya-board-init = { + description = "Restya board initialization"; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + + wantedBy = [ "multi-user.target" ]; + requires = [ "postgresql.service" ]; + after = [ "network.target" "postgresql.service" ]; + + script = '' + rm -rf "${runDir}" + mkdir -m 750 -p "${runDir}" + cp -r "${pkgs.restya-board}/"* "${runDir}" + sed -i "s/@restya.com/@${cfg.virtualHost.serverName}/g" "${runDir}/sql/restyaboard_with_empty_data.sql" + rm -rf "${runDir}/media" + rm -rf "${runDir}/client/img" + chmod -R 0750 "${runDir}" + + sed -i "s@^php@${config.services.phpfpm.phpPackage}/bin/php@" "${runDir}/server/php/shell/"*.sh + + ${if (isNull cfg.database.host) then '' + sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', 'localhost');/g" "${runDir}/server/php/config.inc.php" + sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', 'restya');/g" "${runDir}/server/php/config.inc.php" + '' else '' + sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', '${cfg.database.host}');/g" "${runDir}/server/php/config.inc.php" + sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', '$(<${cfg.database.dbPassFile})');/g" "${runDir}/server/php/config.inc.php" + ''} + sed -i "s/^.*'R_DB_PORT'.*$/define('R_DB_PORT', '${toString cfg.database.port}');/g" "${runDir}/server/php/config.inc.php" + sed -i "s/^.*'R_DB_NAME'.*$/define('R_DB_NAME', '${cfg.database.name}');/g" "${runDir}/server/php/config.inc.php" + sed -i "s/^.*'R_DB_USER'.*$/define('R_DB_USER', '${cfg.database.user}');/g" "${runDir}/server/php/config.inc.php" + + chmod 0400 "${runDir}/server/php/config.inc.php" + + ln -sf "${cfg.dataDir}/media" "${runDir}/media" + ln -sf "${cfg.dataDir}/client/img" "${runDir}/client/img" + + chmod g+w "${runDir}/tmp/cache" + chown -R "${cfg.user}"."${cfg.group}" "${runDir}" + + + mkdir -m 0750 -p "${cfg.dataDir}" + mkdir -m 0750 -p "${cfg.dataDir}/media" + mkdir -m 0750 -p "${cfg.dataDir}/client/img" + cp -r "${pkgs.restya-board}/media/"* "${cfg.dataDir}/media" + cp -r "${pkgs.restya-board}/client/img/"* "${cfg.dataDir}/client/img" + chown "${cfg.user}"."${cfg.group}" "${cfg.dataDir}" + chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media" + chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img" + + ${optionalString (isNull cfg.database.host) '' + if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \ + ${config.services.postgresql.package}/bin/psql -U ${config.services.postgresql.superUser} \ + -c "CREATE USER ${cfg.database.user} WITH ENCRYPTED PASSWORD 'restya'" + + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \ + ${config.services.postgresql.package}/bin/psql -U ${config.services.postgresql.superUser} \ + -c "CREATE DATABASE ${cfg.database.name} OWNER ${cfg.database.user} ENCODING 'UTF8' TEMPLATE template0" + + ${pkgs.sudo}/bin/sudo -u ${cfg.user} \ + ${config.services.postgresql.package}/bin/psql -U ${cfg.database.user} \ + -d ${cfg.database.name} -f "${runDir}/sql/restyaboard_with_empty_data.sql" + + touch "${cfg.dataDir}/.db-initialized" + fi + ''} + ''; + }; + + systemd.timers.restya-board = { + description = "restya-board scripts for e.g. email notification"; + wantedBy = [ "timers.target" ]; + after = [ "restya-board-init.service" ]; + requires = [ "restya-board-init.service" ]; + timerConfig = { + OnUnitInactiveSec = "60s"; + Unit = "restya-board-timers.service"; + }; + }; + + systemd.services.restya-board-timers = { + description = "restya-board scripts for e.g. email notification"; + serviceConfig.Type = "oneshot"; + serviceConfig.User = cfg.user; + + after = [ "restya-board-init.service" ]; + requires = [ "restya-board-init.service" ]; + + script = '' + /bin/sh ${runDir}/server/php/shell/instant_email_notification.sh 2> /dev/null || true + /bin/sh ${runDir}/server/php/shell/periodic_email_notification.sh 2> /dev/null || true + /bin/sh ${runDir}/server/php/shell/imap.sh 2> /dev/null || true + /bin/sh ${runDir}/server/php/shell/webhook.sh 2> /dev/null || true + /bin/sh ${runDir}/server/php/shell/card_due_notification.sh 2> /dev/null || true + ''; + }; + + users.extraUsers.restya-board = { + isSystemUser = true; + createHome = false; + home = runDir; + group = "restya-board"; + }; + users.extraGroups.restya-board = {}; + + services.postgresql.enable = mkIf (isNull cfg.database.host) true; + + services.postgresql.identMap = optionalString (isNull cfg.database.host) + '' + restya-board-users restya-board restya_board + ''; + + services.postgresql.authentication = optionalString (isNull cfg.database.host) + '' + local restya_board all ident map=restya-board-users + ''; + + }; + +} + diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 76b0ee6da96857d41e9fa05f53627bb49f0c0f7d..610c6463a5eb5887e58e375b7a9779c0246de982 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -99,8 +99,8 @@ let user = mkOption { type = types.str; - default = "nginx"; - example = "nginx"; + default = "tt_rss"; + example = "tt_rss"; description = '' User account under which both the update daemon and the web-application run. ''; @@ -466,26 +466,28 @@ let ''; }; - services.nginx.virtualHosts = mkIf (cfg.virtualHost != null) { - "${cfg.virtualHost}" = { - root = "${cfg.root}"; - - locations."/" = { - index = "index.php"; - }; - - locations."~ \.php$" = { - extraConfig = '' - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${phpfpmSocketName}; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME ${cfg.root}/$fastcgi_script_name; - ''; + # NOTE: No configuration is done if not using virtual host + services.nginx = mkIf (cfg.virtualHost != null) { + enable = true; + virtualHosts = { + "${cfg.virtualHost}" = { + root = "${cfg.root}"; + + locations."/" = { + index = "index.php"; + }; + + locations."~ \.php$" = { + extraConfig = '' + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${phpfpmSocketName}; + fastcgi_index index.php; + ''; + }; }; }; }; - systemd.services.tt-rss = let dbService = if cfg.database.type == "pgsql" then "postgresql.service" else "mysql.service"; in { @@ -496,14 +498,14 @@ let callSql = e: if cfg.database.type == "pgsql" then '' ${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \ - ${pkgs.postgresql95}/bin/psql \ + ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.postgresql.package}/bin/psql \ -U ${cfg.database.user} \ ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \ -c '${e}' \ ${cfg.database.name}'' else if cfg.database.type == "mysql" then '' - echo '${e}' | ${pkgs.mysql}/bin/mysql \ + echo '${e}' | ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.mysql.package}/bin/mysql \ -u ${cfg.database.user} \ ${optionalString (cfg.database.password != null) "-p${cfg.database.password}"} \ ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} -P ${toString dbPort}"} \ @@ -521,6 +523,14 @@ let '' + (optionalString (cfg.database.type == "pgsql") '' + ${optionalString (cfg.database.host == null && cfg.database.password == null) '' + if ! [ -e ${cfg.root}/.db-created ]; then + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser ${cfg.database.user} + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O ${cfg.database.user} ${cfg.database.name} + touch ${cfg.root}/.db-created + fi + ''} + exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \ | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') @@ -554,5 +564,28 @@ let requires = ["${dbService}"]; after = ["network.target" "${dbService}"]; }; + + services.mysql = optionalAttrs (cfg.database.type == "mysql") { + enable = true; + package = mkDefault pkgs.mysql; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.user; + ensurePermissions = { + "${cfg.database.name}.*" = "ALL PRIVILEGES"; + }; + } + ]; + }; + + services.postgresql = optionalAttrs (cfg.database.type == "pgsql") { + enable = mkDefault true; + }; + + users = optionalAttrs (cfg.user == "tt_rss") { + extraUsers.tt_rss.group = "tt_rss"; + extraGroups.tt_rss = {}; + }; }; } diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index 94e85f1f42890b1ba6fe3957becbbb57b1e7d4b3..82b8bf3e30db5614d06cf67cd6a122a5226a824e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -188,8 +188,7 @@ let /* date format to be used while writing to the owncloud logfile */ 'logdateformat' => 'F d, Y H:i:s', - /* timezone used while writing to the owncloud logfile (default: UTC) */ - 'logtimezone' => '${serverInfo.fullConfig.time.timeZone}', + ${tzSetting} /* Append all database queries and parameters to the log file. (watch out, this option can increase the size of your log file)*/ @@ -339,6 +338,31 @@ let ''; + tzSetting = let tz = serverInfo.fullConfig.time.timeZone; in optionalString (!isNull tz) '' + /* timezone used while writing to the owncloud logfile (default: UTC) */ + 'logtimezone' => '${tz}', + ''; + + postgresql = serverInfo.fullConfig.services.postgresql.package; + + setupDb = pkgs.writeScript "setup-owncloud-db" '' + #!${pkgs.runtimeShell} + PATH="${postgresql}/bin" + createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true + createdb "${config.dbName}" -O "${config.dbUser}" || true + psql -U postgres -d postgres -c "alter user ${config.dbUser} with password '${config.dbPassword}';" || true + + QUERY="CREATE TABLE appconfig + ( appid VARCHAR( 255 ) NOT NULL + , configkey VARCHAR( 255 ) NOT NULL + , configvalue VARCHAR( 255 ) NOT NULL + ); + GRANT ALL ON appconfig TO ${config.dbUser}; + ALTER TABLE appconfig OWNER TO ${config.dbUser};" + + psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true + ''; + in rec { @@ -353,7 +377,7 @@ rec { ''} - ${builtins.readFile "${config.package}/.htaccess"} + Include ${config.package}/.htaccess ''; @@ -373,7 +397,7 @@ rec { defaultText = "pkgs.owncloud70"; example = literalExample "pkgs.owncloud70"; description = '' - PostgreSQL package to use. + ownCloud package to use. ''; }; @@ -574,13 +598,7 @@ rec { chmod -R o-rwx ${config.dataDir} chown -R wwwrun:wwwrun ${config.dataDir} - ${pkgs.postgresql}/bin/createuser -s -r postgres - ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true - ${pkgs.postgresql}/bin/createdb "${config.dbName}" -O "${config.dbUser}" || true - ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -U postgres -d postgres -c "alter user ${config.dbUser} with password '${config.dbPassword}';" || true - - QUERY="CREATE TABLE appconfig (appid VARCHAR( 255 ) NOT NULL ,configkey VARCHAR( 255 ) NOT NULL ,configvalue VARCHAR( 255 ) NOT NULL); GRANT ALL ON appconfig TO ${config.dbUser}; ALTER TABLE appconfig OWNER TO ${config.dbUser};" - ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true + ${pkgs.sudo}/bin/sudo -u postgres ${setupDb} fi if [ -e ${config.package}/config/ca-bundle.crt ]; then @@ -591,7 +609,11 @@ rec { chown wwwrun:wwwrun ${config.dataDir}/owncloud.log || true - QUERY="INSERT INTO groups (gid) values('admin'); INSERT INTO users (uid,password) values('${config.adminUser}','${builtins.hashString "sha1" config.adminPassword}'); INSERT INTO group_user (gid,uid) values('admin','${config.adminUser}');" - ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true + QUERY="INSERT INTO groups (gid) values('admin'); + INSERT INTO users (uid,password) + values('${config.adminUser}','${builtins.hashString "sha1" config.adminPassword}'); + INSERT INTO group_user (gid,uid) + values('admin','${config.adminUser}');" + ${pkgs.sudo}/bin/sudo -u postgres ${postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true ''; } diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index 1d53ce6590056de67a876643482070fe9de78d71..4bbd041b6e04262137b7f410f1d3f05b8c2eda37 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -118,7 +118,7 @@ with lib; default = []; example = [ { urlPath = "/foo/bar.png"; - files = "/home/eelco/some-file.png"; + file = "/home/eelco/some-file.png"; } ]; description = '' diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 700b4469c565ab7a5c828ec7c790cff7ab488c10..d23e810dcc6265a4c41f3ac336a59e343a3ecd36 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -50,11 +50,14 @@ let "mod_geoip" "mod_magnet" "mod_mysql_vhost" + "mod_openssl" # since v1.4.46 "mod_scgi" "mod_setenv" "mod_trigger_b4_dl" "mod_uploadprogress" + "mod_vhostdb" # since v1.4.46 "mod_webdav" + "mod_wstunnel" # since v1.4.46 ]; maybeModuleString = moduleName: diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix index c8d9836b0b689a1377fad47420f20c2ca8f8e2db..c494d6966a7f581303de6d17d952bef115b1bf6e 100644 --- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -3,12 +3,10 @@ with lib; let - cfg = config.services.lighttpd.gitweb; - gitwebConfigFile = pkgs.writeText "gitweb.conf" '' - # path to git projects (.git) - $projectroot = "${cfg.projectroot}"; - ${cfg.extraConfig} - ''; + cfg = config.services.gitweb; + package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme { + gitwebTheme = true; + }); in { @@ -23,26 +21,9 @@ in ''; }; - projectroot = mkOption { - default = "/srv/git"; - type = types.path; - description = '' - Path to git projects (bare repositories) that should be served by - gitweb. Must not end with a slash. - ''; - }; - - extraConfig = mkOption { - default = ""; - type = types.lines; - description = '' - Verbatim configuration text appended to the generated gitweb.conf file. - ''; - }; - }; - config = mkIf cfg.enable { + config = mkIf config.services.lighttpd.gitweb.enable { # declare module dependencies services.lighttpd.enableModules = [ "mod_cgi" "mod_redirect" "mod_alias" "mod_setenv" ]; @@ -56,11 +37,11 @@ in "^/gitweb$" => "/gitweb/" ) alias.url = ( - "/gitweb/static/" => "${pkgs.git}/share/gitweb/static/", - "/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi" + "/gitweb/static/" => "${package}/static/", + "/gitweb/" => "${package}/gitweb.cgi" ) setenv.add-environment = ( - "GITWEB_CONFIG" => "${gitwebConfigFile}", + "GITWEB_CONFIG" => "${cfg.gitwebConfigFile}", "HOME" => "${cfg.projectroot}" ) } diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix index 669e81d0f14b1dc8195326386d12a92bad357b2e..8c813d116a5284289d5d7e25c79e141aeb30599f 100644 --- a/nixos/modules/services/web-servers/lighttpd/inginious.nix +++ b/nixos/modules/services/web-servers/lighttpd/inginious.nix @@ -113,7 +113,6 @@ in tasksDirectory = mkOption { type = types.path; - default = "${inginious}/lib/python2.7/site-packages/inginious/tasks"; example = "/var/lib/INGInious/tasks"; description = '' Path to the tasks folder. @@ -218,6 +217,7 @@ in # Common { + services.lighttpd.inginious.tasksDirectory = mkDefault "${inginious}/lib/python2.7/site-packages/inginious/tasks"; # To access inginous tools (like inginious-test-task) environment.systemPackages = [ inginious ]; diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix new file mode 100644 index 0000000000000000000000000000000000000000..a888f623616e0985762e13dc3f9f51db9d7a5042 --- /dev/null +++ b/nixos/modules/services/web-servers/mighttpd2.nix @@ -0,0 +1,132 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.mighttpd2; + configFile = pkgs.writeText "mighty-config" cfg.config; + routingFile = pkgs.writeText "mighty-routing" cfg.routing; +in { + options.services.mighttpd2 = { + enable = mkEnableOption "Mighttpd2 web server"; + + config = mkOption { + default = ""; + example = '' + # Example configuration for Mighttpd 2 + Port: 80 + # IP address or "*" + Host: * + Debug_Mode: Yes # Yes or No + # If available, "nobody" is much more secure for User:. + User: root + # If available, "nobody" is much more secure for Group:. + Group: root + Pid_File: /var/run/mighty.pid + Logging: Yes # Yes or No + Log_File: /var/log/mighty # The directory must be writable by User: + Log_File_Size: 16777216 # bytes + Log_Backup_Number: 10 + Index_File: index.html + Index_Cgi: index.cgi + Status_File_Dir: /usr/local/share/mighty/status + Connection_Timeout: 30 # seconds + Fd_Cache_Duration: 10 # seconds + # Server_Name: Mighttpd/3.x.y + Tls_Port: 443 + Tls_Cert_File: cert.pem # should change this with an absolute path + # should change this with comma-separated absolute paths + Tls_Chain_Files: chain.pem + # Currently, Tls_Key_File must not be encrypted. + Tls_Key_File: privkey.pem # should change this with an absolute path + Service: 0 # 0 is HTTP only, 1 is HTTPS only, 2 is both + ''; + type = types.lines; + description = '' + Verbatim config file to use + (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html) + ''; + }; + + routing = mkOption { + default = ""; + example = '' + # Example routing for Mighttpd 2 + + # Domain lists + [localhost www.example.com] + + # Entries are looked up in the specified order + # All paths must end with "/" + + # A path to CGI scripts should be specified with "=>" + /~alice/cgi-bin/ => /home/alice/public_html/cgi-bin/ + + # A path to static files should be specified with "->" + /~alice/ -> /home/alice/public_html/ + /cgi-bin/ => /export/cgi-bin/ + + # Reverse proxy rules should be specified with ">>" + # /path >> host:port/path2 + # Either "host" or ":port" can be committed, but not both. + /app/cal/ >> example.net/calendar/ + # Yesod app in the same server + /app/wiki/ >> 127.0.0.1:3000/ + + / -> /export/www/ + ''; + type = types.lines; + description = '' + Verbatim routing file to use + (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html) + ''; + }; + + cores = mkOption { + default = null; + type = types.nullOr types.int; + description = '' + How many cores to use. + If null it will be determined automatically + ''; + }; + + }; + + config = mkIf cfg.enable { + assertions = + [ { assertion = cfg.routing != ""; + message = "You need at least one rule in mighttpd2.routing"; + } + ]; + systemd.services.mighttpd2 = { + description = "Mighttpd2 web server"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkgs.haskellPackages.mighttpd2}/bin/mighty \ + ${configFile} \ + ${routingFile} \ + +RTS -N${optionalString (cfg.cores != null) "${cfg.cores}"} + ''; + Type = "simple"; + User = "mighttpd2"; + Group = "mighttpd2"; + Restart = "on-failure"; + AmbientCapabilities = "cap_net_bind_service"; + CapabilityBoundingSet = "cap_net_bind_service"; + }; + }; + + users.extraUsers.mighttpd2 = { + group = "mighttpd2"; + uid = config.ids.uids.mighttpd2; + isSystemUser = true; + }; + + users.extraGroups.mighttpd2.gid = config.ids.gids.mighttpd2; + }; + + meta.maintainers = with lib.maintainers; [ fgaz ]; +} diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 97511aac973744764dc48be6dd45902183c463d9..938a8a1fe334bc7e9dea1940e3ae71423d306f9a 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -9,12 +9,16 @@ let serverName = if vhostConfig.serverName != null then vhostConfig.serverName else vhostName; + acmeDirectory = config.security.acme.directory; in vhostConfig // { inherit serverName; } // (optionalAttrs vhostConfig.enableACME { - sslCertificate = "/var/lib/acme/${serverName}/fullchain.pem"; - sslCertificateKey = "/var/lib/acme/${serverName}/key.pem"; + sslCertificate = "${acmeDirectory}/${serverName}/fullchain.pem"; + sslCertificateKey = "${acmeDirectory}/${serverName}/key.pem"; + }) // (optionalAttrs (vhostConfig.useACMEHost != null) { + sslCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem"; + sslCertificateKey = "${acmeDirectory}/${vhostConfig.useACMEHost}/key.pem"; }) ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; @@ -167,13 +171,14 @@ let listenString = { addr, port, ssl, ... }: "listen ${addr}:${toString port} " - + optionalString ssl "ssl http2 " + + optionalString ssl "ssl " + + optionalString (ssl && vhost.http2) "http2 " + optionalString vhost.default "default_server " + ";"; redirectListen = filter (x: !x.ssl) defaultListen; - acmeLocation = '' + acmeLocation = optionalString (vhost.enableACME || vhost.useACMEHost != null) '' location /.well-known/acme-challenge { ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"} root ${vhost.acmeRoot}; @@ -193,7 +198,7 @@ let ${concatMapStringsSep "\n" listenString redirectListen} server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; - ${optionalString vhost.enableACME acmeLocation} + ${acmeLocation} location / { return 301 https://$host$request_uri; } @@ -203,7 +208,7 @@ let server { ${concatMapStringsSep "\n" listenString hostListen} server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; - ${optionalString vhost.enableACME acmeLocation} + ${acmeLocation} ${optionalString (vhost.root != null) "root ${vhost.root};"} ${optionalString (vhost.globalRedirect != null) '' return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri; @@ -554,6 +559,14 @@ in are mutually exclusive. ''; } + + { + assertion = all (conf: !(conf.enableACME && conf.useACMEHost != null)) (attrValues virtualHosts); + message = '' + Options services.nginx.service.virtualHosts..enableACME and + services.nginx.virtualHosts..useACMEHost are mutually exclusive. + ''; + } ]; systemd.services.nginx = { @@ -566,6 +579,7 @@ in mkdir -p ${cfg.stateDir}/logs chmod 700 ${cfg.stateDir} chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} + ${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t ''; serviceConfig = { ExecStart = "${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; @@ -579,7 +593,7 @@ in security.acme.certs = filterAttrs (n: v: v != {}) ( let vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts; - acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME) vhostsConfigs; + acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME && vhostConfig.useACMEHost == null) vhostsConfigs; acmePairs = map (vhostConfig: { name = vhostConfig.serverName; value = { user = cfg.user; group = lib.mkDefault cfg.group; diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix new file mode 100644 index 0000000000000000000000000000000000000000..272fd1480185ead4e337ebb2196c4ba621ce3928 --- /dev/null +++ b/nixos/modules/services/web-servers/nginx/gitweb.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.gitweb; + package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme { + gitwebTheme = true; + }); + +in +{ + + options.services.nginx.gitweb = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + If true, enable gitweb in nginx. Access it at http://yourserver/gitweb + ''; + }; + + }; + + config = mkIf config.services.nginx.gitweb.enable { + + systemd.services.gitweb = { + description = "GitWeb service"; + script = "${package}/gitweb.cgi --fastcgi --nproc=1"; + environment = { + FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock"; + }; + serviceConfig = { + User = "nginx"; + Group = "nginx"; + RuntimeDirectory = [ "gitweb" ]; + }; + wantedBy = [ "multi-user.target" ]; + }; + + services.nginx = { + virtualHosts.default = { + locations."/gitweb/static/" = { + alias = "${package}/static/"; + }; + locations."/gitweb/" = { + extraConfig = '' + include ${pkgs.nginx}/conf/fastcgi_params; + fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile}; + fastcgi_pass unix:/run/gitweb/gitweb.sock; + ''; + }; + }; + }; + + }; + + meta.maintainers = with maintainers; [ gnidorah ]; + +} diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 801601aafd9d64064f2d75c43452b5bb23386d8d..bf18108a1a3cb428233f8f1cb773516078e1fd53 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -48,7 +48,21 @@ with lib; enableACME = mkOption { type = types.bool; default = false; - description = "Whether to ask Let's Encrypt to sign a certificate for this vhost."; + description = '' + Whether to ask Let's Encrypt to sign a certificate for this vhost. + Alternately, you can use an existing certificate through . + ''; + }; + + useACMEHost = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + A host of an existing Let's Encrypt certificate to use. + This is useful if you have many subdomains and want to avoid hitting the + rate limit. + Alternately, you can generate a certificate through . + ''; }; acmeRoot = mkOption { @@ -114,6 +128,20 @@ with lib; description = "Path to server SSL certificate key."; }; + http2 = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable HTTP 2. + Note that (as of writing) due to nginx's implementation, to disable + HTTP 2 you have to disable it on all vhosts that use a given + IP address / port. + If there is one server block configured to enable http2,then it is + enabled for all server blocks on this IP. + See https://stackoverflow.com/a/39466948/263061. + ''; + }; + root = mkOption { type = types.nullOr types.path; default = null; diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 943415e08c64548c99eb21409c77ae6bdf98029a..aa94e0e976c96f6565d115818c6a1e6ea9952a74 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -19,27 +19,43 @@ in options = { services.tomcat = { - - enable = mkOption { - default = false; - description = "Whether to enable Apache Tomcat"; - }; + enable = mkEnableOption "Apache Tomcat"; package = mkOption { type = types.package; default = pkgs.tomcat85; defaultText = "pkgs.tomcat85"; - example = lib.literalExample "pkgs.tomcatUnstable"; + example = lib.literalExample "pkgs.tomcat9"; description = '' Which tomcat package to use. ''; }; baseDir = mkOption { + type = lib.types.path; default = "/var/tomcat"; description = "Location where Tomcat stores configuration files, webapplications and logfiles"; }; + logDirs = mkOption { + default = []; + type = types.listOf types.path; + description = "Directories to create in baseDir/logs/"; + }; + + extraConfigFiles = mkOption { + default = []; + type = types.listOf types.path; + description = "Extra configuration files to pull into the tomcat conf directory"; + }; + + extraEnvironment = mkOption { + type = types.listOf types.str; + default = []; + example = [ "ENVIRONMENT=production" ]; + description = "Environment Variables to pass to the tomcat service"; + }; + extraGroups = mkOption { default = []; example = [ "users" ]; @@ -47,31 +63,46 @@ in }; user = mkOption { + type = types.str; default = "tomcat"; description = "User account under which Apache Tomcat runs."; }; group = mkOption { + type = types.str; default = "tomcat"; description = "Group account under which Apache Tomcat runs."; }; javaOpts = mkOption { + type = types.either (types.listOf types.str) types.str; default = ""; description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat"; }; catalinaOpts = mkOption { + type = types.either (types.listOf types.str) types.str; default = ""; description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container"; }; sharedLibs = mkOption { + type = types.listOf types.str; default = []; description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications"; }; + serverXml = mkOption { + type = types.lines; + default = ""; + description = " + Verbatim server.xml configuration. + This is mutually exclusive with the virtualHosts options. + "; + }; + commonLibs = mkOption { + type = types.listOf types.str; default = []; description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container"; }; @@ -84,11 +115,21 @@ in }; virtualHosts = mkOption { + type = types.listOf (types.submodule { + options = { + name = mkOption { + type = types.listOf types.str; + description = "name of the virtualhost"; + default = []; + }; + }; + }); default = []; description = "List consisting of a virtual host name and a list of web applications to deploy on each virtual host"; }; logPerVirtualHost = mkOption { + type = types.bool; default = false; description = "Whether to enable logging per virtual host."; }; @@ -104,11 +145,13 @@ in enable = mkOption { default = false; + type = types.bool; description = "Whether to enable an Apache Axis2 container"; }; services = mkOption { default = []; + type = types.listOf types.str; description = "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2"; }; @@ -140,130 +183,104 @@ in description = "Apache Tomcat server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; preStart = '' # Create the base directory - mkdir -p ${cfg.baseDir} + mkdir -p \ + ${cfg.baseDir}/{conf,virtualhosts,logs,temp,lib,shared/lib,webapps,work} + chown ${cfg.user}:${cfg.group} \ + ${cfg.baseDir}/{conf,virtualhosts,logs,temp,lib,shared/lib,webapps,work} # Create a symlink to the bin directory of the tomcat component ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin - # Create a conf/ directory - mkdir -p ${cfg.baseDir}/conf - chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf - # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml) - for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml) - do - ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i` + for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml); do + ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i` done - # Create subdirectory for virtual hosts - mkdir -p ${cfg.baseDir}/virtualhosts + ${if cfg.extraConfigFiles != [] then '' + for i in ${toString cfg.extraConfigFiles}; do + ln -sfn $i ${cfg.baseDir}/conf/`basename $i` + done + '' else ""} # Create a modified catalina.properties file # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries sed -e 's|''${catalina.home}|''${catalina.base}|g' \ - -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \ - ${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties - - # Create a modified server.xml which also includes all virtual hosts - sed -e "//a\ ${ - toString (map (virtualHost: ''${if cfg.logPerVirtualHost then '''' else ""}'') cfg.virtualHosts)}" \ - ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml - - # Create a logs/ directory - mkdir -p ${cfg.baseDir}/logs - chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs - ${if cfg.logPerVirtualHost then - toString (map (h: '' - mkdir -p ${cfg.baseDir}/logs/${h.name} - chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name} - '') cfg.virtualHosts) else ''''} - - # Create a temp/ directory - mkdir -p ${cfg.baseDir}/temp - chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/temp - - # Create a lib/ directory - mkdir -p ${cfg.baseDir}/lib - chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/lib - - # Create a shared/lib directory - mkdir -p ${cfg.baseDir}/shared/lib - chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/shared/lib - - # Create a webapps/ directory - mkdir -p ${cfg.baseDir}/webapps - chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps + -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \ + ${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties + + ${if cfg.serverXml != "" then '' + cp -f ${pkgs.writeTextDir "server.xml" cfg.serverXml}/* ${cfg.baseDir}/conf/ + '' else '' + # Create a modified server.xml which also includes all virtual hosts + sed -e "//a\ ${toString (map (virtualHost: ''${if cfg.logPerVirtualHost then '''' else ""}'') cfg.virtualHosts)}" \ + ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml + '' + } + ${optionalString (cfg.logDirs != []) '' + for i in ${toString cfg.logDirs}; do + mkdir -p ${cfg.baseDir}/logs/$i + chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/$i + done + ''} + ${optionalString cfg.logPerVirtualHost (toString (map (h: '' + mkdir -p ${cfg.baseDir}/logs/${h.name} + chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name} + '') cfg.virtualHosts))} # Symlink all the given common libs files or paths into the lib/ directory - for i in ${tomcat} ${toString cfg.commonLibs} - do - if [ -f $i ] - then - # If the given web application is a file, symlink it into the common/lib/ directory - ln -sfn $i ${cfg.baseDir}/lib/`basename $i` - elif [ -d $i ] - then - # If the given web application is a directory, then iterate over the files - # in the special purpose directories and symlink them into the tomcat tree - - for j in $i/lib/* - do - ln -sfn $j ${cfg.baseDir}/lib/`basename $j` - done - fi + for i in ${tomcat} ${toString cfg.commonLibs}; do + if [ -f $i ]; then + # If the given web application is a file, symlink it into the common/lib/ directory + ln -sfn $i ${cfg.baseDir}/lib/`basename $i` + elif [ -d $i ]; then + # If the given web application is a directory, then iterate over the files + # in the special purpose directories and symlink them into the tomcat tree + + for j in $i/lib/*; do + ln -sfn $j ${cfg.baseDir}/lib/`basename $j` + done + fi done # Symlink all the given shared libs files or paths into the shared/lib/ directory - for i in ${toString cfg.sharedLibs} - do - if [ -f $i ] - then - # If the given web application is a file, symlink it into the common/lib/ directory - ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i` - elif [ -d $i ] - then - # If the given web application is a directory, then iterate over the files - # in the special purpose directories and symlink them into the tomcat tree - - for j in $i/shared/lib/* - do - ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j` - done - fi + for i in ${toString cfg.sharedLibs}; do + if [ -f $i ]; then + # If the given web application is a file, symlink it into the common/lib/ directory + ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i` + elif [ -d $i ]; then + # If the given web application is a directory, then iterate over the files + # in the special purpose directories and symlink them into the tomcat tree + + for j in $i/shared/lib/*; do + ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j` + done + fi done # Symlink all the given web applications files or paths into the webapps/ directory - for i in ${toString cfg.webapps} - do - if [ -f $i ] - then - # If the given web application is a file, symlink it into the webapps/ directory - ln -sfn $i ${cfg.baseDir}/webapps/`basename $i` - elif [ -d $i ] - then - # If the given web application is a directory, then iterate over the files - # in the special purpose directories and symlink them into the tomcat tree - - for j in $i/webapps/* - do - ln -sfn $j ${cfg.baseDir}/webapps/`basename $j` - done + for i in ${toString cfg.webapps}; do + if [ -f $i ]; then + # If the given web application is a file, symlink it into the webapps/ directory + ln -sfn $i ${cfg.baseDir}/webapps/`basename $i` + elif [ -d $i ]; then + # If the given web application is a directory, then iterate over the files + # in the special purpose directories and symlink them into the tomcat tree + + for j in $i/webapps/*; do + ln -sfn $j ${cfg.baseDir}/webapps/`basename $j` + done - # Also symlink the configuration files if they are included - if [ -d $i/conf/Catalina ] - then - for j in $i/conf/Catalina/* - do - mkdir -p ${cfg.baseDir}/conf/Catalina/localhost - ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j` - done - fi + # Also symlink the configuration files if they are included + if [ -d $i/conf/Catalina ]; then + for j in $i/conf/Catalina/*; do + mkdir -p ${cfg.baseDir}/conf/Catalina/localhost + ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j` + done fi + fi done ${toString (map (virtualHost: '' @@ -275,94 +292,79 @@ in # Symlink all the given web applications files or paths into the webapps/ directory # of this virtual host - for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}" - do - if [ -f $i ] - then - # If the given web application is a file, symlink it into the webapps/ directory - ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i` - elif [ -d $i ] - then - # If the given web application is a directory, then iterate over the files - # in the special purpose directories and symlink them into the tomcat tree - - for j in $i/webapps/* - do - ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j` - done - - # Also symlink the configuration files if they are included - if [ -d $i/conf/Catalina ] - then - for j in $i/conf/Catalina/* - do - mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name} - ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j` - done - fi + for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"; do + if [ -f $i ]; then + # If the given web application is a file, symlink it into the webapps/ directory + ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i` + elif [ -d $i ]; then + # If the given web application is a directory, then iterate over the files + # in the special purpose directories and symlink them into the tomcat tree + + for j in $i/webapps/*; do + ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j` + done + + # Also symlink the configuration files if they are included + if [ -d $i/conf/Catalina ]; then + for j in $i/conf/Catalina/*; do + mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name} + ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j` + done fi + fi done - - '' - ) cfg.virtualHosts) } - - # Create a work/ directory - mkdir -p ${cfg.baseDir}/work - chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work - - ${if cfg.axis2.enable then - '' - # Copy the Axis2 web application - cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps - - # Turn off addressing, which causes many errors - sed -i -e 's%%%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml - - # Modify permissions on the Axis2 application - chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2 - - # Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory - for i in ${toString cfg.axis2.services} - do - if [ -f $i ] - then - # If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services - ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i` - elif [ -d $i ] - then - # If the given web application is a directory, then iterate over the files - # in the special purpose directories and symlink them into the tomcat tree - - for j in $i/webapps/axis2/WEB-INF/services/* - do - ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j` - done - - # Also symlink the configuration files if they are included - if [ -d $i/conf/Catalina ] - then - for j in $i/conf/Catalina/* - do - ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j` - done - fi - fi - done - '' - else ""} - ''; - - script = '' - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' - ''; - - preStop = '' - echo "Stopping tomcat..." - CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh + '') cfg.virtualHosts)} + + ${optionalString cfg.axis2.enable '' + # Copy the Axis2 web application + cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps + + # Turn off addressing, which causes many errors + sed -i -e 's%%%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml + + # Modify permissions on the Axis2 application + chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2 + + # Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory + for i in ${toString cfg.axis2.services}; do + if [ -f $i ]; then + # If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services + ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i` + elif [ -d $i ]; then + # If the given web application is a directory, then iterate over the files + # in the special purpose directories and symlink them into the tomcat tree + + for j in $i/webapps/axis2/WEB-INF/services/*; do + ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j` + done + + # Also symlink the configuration files if they are included + if [ -d $i/conf/Catalina ]; then + for j in $i/conf/Catalina/*; do + ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j` + done + fi + fi + done + ''} ''; + serviceConfig = { + Type = "forking"; + PermissionsStartOnly = true; + PIDFile="/run/tomcat/tomcat.pid"; + RuntimeDirectory = "tomcat"; + User = cfg.user; + Environment=[ + "CATALINA_BASE=${cfg.baseDir}" + "CATALINA_PID=/run/tomcat/tomcat.pid" + "JAVA_HOME='${cfg.jdk}'" + "JAVA_OPTS='${builtins.toString cfg.javaOpts}'" + "CATALINA_OPTS='${builtins.toString cfg.catalinaOpts}'" + ] ++ cfg.extraEnvironment; + ExecStart = "${tomcat}/bin/startup.sh"; + ExecStop = "${tomcat}/bin/shutdown.sh"; + }; }; - }; - } diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 4ede4fc209670b72d9a20d940977a3fe47d73ffd..b6c7fef21fb29821540bc39d5db8e49cdb1e291d 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -64,6 +64,16 @@ in { ''; }; + group = mkOption { + default = "traefik"; + type = types.string; + example = "docker"; + description = '' + Set the group that traefik runs under. + For the docker backend this needs to be set to docker instead. + ''; + }; + package = mkOption { default = pkgs.traefik; defaultText = "pkgs.traefik"; @@ -87,7 +97,7 @@ in { ]; Type = "simple"; User = "traefik"; - Group = "traefik"; + Group = cfg.group; Restart = "on-failure"; StartLimitInterval = 86400; StartLimitBurst = 5; diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index c3bc065d4651f10060919cdc916c701f7a52861a..bc74d62b116a1a63dae46bb7a3be73cd124b7ee9 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -1,14 +1,27 @@ { config, lib, pkgs, ...}: + +with lib; + let cfg = config.services.varnish; + commandLine = "-f ${pkgs.writeText "default.vcl" cfg.config}" + + optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([cfg.package] ++ cfg.extraModules)}' -r vmod_path"; in -with lib; { options = { services.varnish = { enable = mkEnableOption "Varnish Server"; + package = mkOption { + type = types.package; + default = pkgs.varnish5; + defaultText = "pkgs.varnish5"; + description = '' + The package to use + ''; + }; + http_address = mkOption { type = types.str; default = "*:6081"; @@ -35,7 +48,7 @@ with lib; extraModules = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.varnish-geoip ]"; + example = literalExample "[ pkgs.varnish5Packages.geoip ]"; description = " Varnish modules (except 'std'). "; @@ -69,8 +82,7 @@ with lib; serviceConfig = { Type = "simple"; PermissionsStartOnly = true; - ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -F ${cfg.extraCommandLine}" - + optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([pkgs.varnish] ++ cfg.extraModules)}' -r vmod_path"; + ExecStart = "${cfg.package}/sbin/varnishd -a ${cfg.http_address} -n ${cfg.stateDir} -F ${cfg.extraCommandLine} ${commandLine}"; Restart = "always"; RestartSec = "5s"; User = "varnish"; @@ -81,7 +93,15 @@ with lib; }; }; - environment.systemPackages = [ pkgs.varnish ]; + environment.systemPackages = [ cfg.package ]; + + # check .vcl syntax at compile time (e.g. before nixops deployment) + system.extraDependencies = [ + (pkgs.stdenv.mkDerivation { + name = "check-varnish-syntax"; + buildCommand = "${cfg.package}/sbin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1)"; + }) + ]; users.extraUsers.varnish = { group = "varnish"; diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index 11cbcac6fa85747677f032c108f79e22b56f01f4..8641c05de52e8c96357bd31e71dc319767761f4f 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -181,10 +181,10 @@ in { }; backend = mkOption { - type = types.enum [ "glx" "xrender" ]; + type = types.enum [ "glx" "xrender" "xr_glx_hybrid" ]; default = "xrender"; description = '' - Backend to use: glx or xrender. + Backend to use: glx, xrender or xr_glx_hybrid. ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 39b27d4ceb612dcae99cfe2f4a06ef525c82f13e..f435e85f6b835565d175a6e9e217017c62aaecd7 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -87,11 +87,11 @@ in default = mkOption { type = types.str; - default = "none"; - example = "plasma5"; + default = ""; + example = "none"; description = "Default desktop manager loaded if none have been chosen."; apply = defaultDM: - if defaultDM == "none" && cfg.session.list != [] then + if defaultDM == "" && cfg.session.list != [] then (head cfg.session.list).name else if any (w: w.name == defaultDM) cfg.session.list then defaultDM @@ -109,9 +109,5 @@ in }; - config = { - services.xserver.displayManager.session = cfg.session.list; - environment.systemPackages = - mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable - }; + config.services.xserver.displayManager.session = cfg.session.list; } diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 8a523f0d8036486d509400746fdf3827724566ff..da3287aaea6ecb98d0cc9bd24e899869e40934de 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -33,7 +33,7 @@ in pkgs.xorg.xauth # used by kdesu pkgs.gtk2 # To get GTK+'s themes. pkgs.tango-icon-theme - pkgs.shared_mime_info + pkgs.shared-mime-info pkgs.gnome2.gnomeicontheme pkgs.xorg.xcursorthemes ]; @@ -47,7 +47,7 @@ in export GTK_DATA_PREFIX=${config.system.path} # find theme engines export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 - export XDG_MENU_PREFIX=enlightenment + export XDG_MENU_PREFIX=e- export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}" diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index e5a79496c7a58dfe46e98f02937418b7e88b28bf..10e8ef0ed381798e377ebd887d98d7e71d067312 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -27,7 +27,7 @@ let nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {} '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages} @@ -60,7 +60,7 @@ in { example = literalExample "[ pkgs.gnome3.gpaste ]"; description = "Additional list of packages to be added to the session search path. Useful for gnome shell extensions or gsettings-conditionated autostart."; - apply = list: list ++ [ pkgs.gnome3.gnome_shell pkgs.gnome3.gnome-shell-extensions ]; + apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; }; extraGSettingsOverrides = mkOption { @@ -108,6 +108,7 @@ in { services.gnome3.seahorse.enable = mkDefault true; services.gnome3.sushi.enable = mkDefault true; services.gnome3.tracker.enable = mkDefault true; + services.gnome3.tracker-miners.enable = mkDefault true; hardware.pulseaudio.enable = mkDefault true; services.telepathy.enable = mkDefault true; networking.networkmanager.enable = mkDefault true; @@ -117,13 +118,13 @@ in { services.packagekit.enable = mkDefault true; 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 ]; + 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"; - fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; + fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; services.xserver.desktopManager.session = singleton { name = "gnome3"; @@ -135,7 +136,7 @@ in { # find theme engines export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 - export XDG_MENU_PREFIX=gnome + export XDG_MENU_PREFIX=gnome- ${concatMapStrings (p: '' if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then @@ -152,7 +153,7 @@ in { export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share # Override gsettings-desktop-schema - export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS + export NIX_GSETTINGS_OVERRIDES_DIR=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas # Let nautilus find extensions export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ @@ -163,7 +164,7 @@ in { # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update - ${pkgs.gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} & + ${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} & waitPID=$! ''; }; @@ -171,7 +172,7 @@ in { services.xserver.updateDbusEnvironment = true; environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" - "${pkgs.gnome3.glib_networking.out}/lib/gio/modules" + "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages); @@ -179,10 +180,9 @@ in { # Use the correct gnome3 packageSet networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant; - inherit (pkgs.gnome3) networkmanager_openvpn networkmanager_vpnc - networkmanager_openconnect networkmanager_fortisslvpn - networkmanager_pptp networkmanager_iodine - networkmanager_l2tp; }; + inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc + networkmanager-openconnect networkmanager-fortisslvpn + networkmanager-iodine networkmanager-l2tp; }; # Needed for themes and backgrounds environment.pathsToLink = [ "/share" ]; diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index fb907618d35b7141070fe18032e599f882a1502f..2596ec4ad85cbb118de6154b7c8c2736df8640d2 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -61,6 +61,8 @@ in environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; + services.upower.enable = config.powerManagement.enable; }; + } diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index ab8a0a48b4837d18097aff4d6f1e2557646f2301..db83aaf3c19f3cdc31fb551c4059c8700fbd46ea 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -12,6 +12,17 @@ let in filter (x: !(builtins.elem (pkgName x) ysNames)) xs; + addToXDGDirs = p: '' + if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} + fi + + if [ -d "${p}/lib/girepository-1.0" ]; then + export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib + fi + ''; + xcfg = config.services.xserver; cfg = xcfg.desktopManager.mate; @@ -20,10 +31,14 @@ in { options = { - services.xserver.desktopManager.mate.enable = mkOption { - type = types.bool; - default = false; - description = "Enable the MATE desktop environment"; + services.xserver.desktopManager.mate = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the MATE desktop environment"; + }; + + debug = mkEnableOption "mate-session debug messages"; }; environment.mate.excludePackages = mkOption { @@ -47,15 +62,34 @@ in # Find theme engines export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 - export XDG_MENU_PREFIX=mate + export XDG_MENU_PREFIX=mate- # Find the mouse export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons + # Let caja find extensions + export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0 + + # Let caja extensions find gsettings schemas + ${concatMapStrings (p: '' + if [ -d "${p}/lib/caja/extensions-2.0" ]; then + ${addToXDGDirs p} + fi + '') + config.environment.systemPackages + } + + # Let mate-panel find applets + export MATE_PANEL_APPLETS_DIR=$MATE_PANEL_APPLETS_DIR''${MATE_PANEL_APPLETS_DIR:+:}${config.system.path}/share/mate-panel/applets + export MATE_PANEL_EXTRA_MODULES=$MATE_PANEL_EXTRA_MODULES''${MATE_PANEL_EXTRA_MODULES:+:}${config.system.path}/lib/mate-panel/applets + + # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive) + ${addToXDGDirs pkgs.mate.mate-control-center} + # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update - ${pkgs.mate.mate-session-manager}/bin/mate-session & + ${pkgs.mate.mate-session-manager}/bin/mate-session ${optionalString cfg.debug "--debug"} & waitPID=$! ''; }; @@ -68,12 +102,14 @@ in services.dbus.packages = [ pkgs.gnome3.dconf - pkgs.at_spi2_core + pkgs.at-spi2-core ]; services.gnome3.gnome-keyring.enable = true; services.upower.enable = config.powerManagement.enable; + security.pam.services."mate-screensaver".unixAuth = true; + environment.pathsToLink = [ "/share" ]; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index bb4f4e868fea1aae08f3b377e42da8d51e80b390..91d091d7d7e257512f46d51fb3a38d9aef17358c 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -25,8 +25,8 @@ in type = types.bool; default = true; description = '' - Enable support for Qt 4-based applications. Particularly, install the - Qt 4 version of the Breeze theme and a default backend for Phonon. + Enable support for Qt 4-based applications. Particularly, install a + default backend for Phonon. ''; }; @@ -47,6 +47,18 @@ in ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ''} + if [ -f "$HOME/.config/kdeglobals" ] + then + # Remove extraneous font style names. + # See also: https://phabricator.kde.org/D9070 + ${getBin pkgs.gnused}/bin/sed -i "$HOME/.config/kdeglobals" \ + -e '/^fixed=/ s/,Regular$//' \ + -e '/^font=/ s/,Regular$//' \ + -e '/^menuFont=/ s/,Regular$//' \ + -e '/^smallestReadableFont=/ s/,Regular$//' \ + -e '/^toolBarFont=/ s/,Regular$//' + fi + exec "${getBin plasma5.plasma-workspace}/bin/startkde" ''; }; @@ -54,6 +66,10 @@ in security.wrappers = { kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass"; "start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit"; + kwin_wayland = { + source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland"; + capabilities = "cap_sys_nice+ep"; + }; }; environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications; @@ -138,15 +154,17 @@ in print-manager breeze-icons - pkgs.hicolor_icon_theme + pkgs.hicolor-icon-theme kde-gtk-config breeze-gtk + qtvirtualkeyboard + libsForQt56.phonon-backend-gstreamer libsForQt5.phonon-backend-gstreamer ] - ++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ] + ++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ] # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable bluedevil @@ -193,16 +211,6 @@ in theme = mkDefault "breeze"; }; - boot.plymouth = { - theme = mkDefault "breeze"; - themePackages = mkDefault [ - (pkgs.breeze-plymouth.override { - nixosBranding = true; - nixosVersion = config.system.nixosRelease; - }) - ]; - }; - security.pam.services.kde = { allowNullPassword = true; }; # Doing these one by one seems silly, but we currently lack a better diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 9c42dc8781b9f492723f6af7eca626e1784a63db..7dcc600d2664f90200827571cb2568dccd80744a 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -3,15 +3,11 @@ with lib; let - - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.xfce; - + cfg = config.services.xserver.desktopManager.xfce; in { options = { - services.xserver.desktopManager.xfce = { enable = mkOption { type = types.bool; @@ -54,81 +50,93 @@ in description = "Application used by XFCE to lock the screen."; }; }; - }; + config = mkIf cfg.enable { + environment.systemPackages = with pkgs.xfce // pkgs; [ + # Get GTK+ themes and gtk-update-icon-cache + gtk2.out + + # Supplies some abstract icons such as: + # utilities-terminal, accessories-text-editor + gnome3.defaultIconTheme + + hicolor-icon-theme + tango-icon-theme + xfce4-icon-theme + + desktop-file-utils + shared-mime-info + + # Needed by Xfce's xinitrc script + # TODO: replace with command -v + which + + exo + garcon + gtk-xfce-engine + gvfs + libxfce4ui + tumbler + xfconf + + mousepad + ristretto + xfce4-appfinder + xfce4-screenshooter + xfce4-session + xfce4-settings + xfce4-terminal + + (thunar.override { thunarPlugins = cfg.thunarPlugins; }) + thunar-volman # TODO: drop + ] ++ (if config.hardware.pulseaudio.enable + then [ xfce4-mixer-pulse xfce4-volumed-pulse ] + else [ xfce4-mixer xfce4-volumed ]) + # TODO: NetworkManager doesn't belong here + ++ optionals config.networking.networkmanager.enable [ networkmanagerapplet ] + ++ optionals config.powerManagement.enable [ xfce4-power-manager ] + ++ optionals cfg.enableXfwm [ xfwm4 ] + ++ optionals (!cfg.noDesktop) [ + xfce4-panel + xfce4-notifyd + xfdesktop + ]; + + environment.pathsToLink = [ + "/share/xfce4" + "/share/themes" + "/share/mime" + "/share/desktop-directories" + "/share/gtksourceview-2.0" + ]; + + environment.variables = { + GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; + GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ]; + }; - config = mkIf (xcfg.enable && cfg.enable) { - - services.xserver.desktopManager.session = singleton - { name = "xfce"; - bgSupport = true; - start = - '' - ${cfg.extraSessionCommands} + services.xserver.desktopManager.session = [{ + name = "xfce"; + bgSupport = true; + start = '' + ${cfg.extraSessionCommands} - # Set GTK_PATH so that GTK+ can find the theme engines. - export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" + # Set GTK_PATH so that GTK+ can find the theme engines. + export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" - # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. - export GTK_DATA_PREFIX=${config.system.path} + # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. + export GTK_DATA_PREFIX=${config.system.path} - ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} & - waitPID=$! - ''; - }; + ${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} & + waitPID=$! + ''; + }]; services.xserver.updateDbusEnvironment = true; - environment.systemPackages = - [ pkgs.gtk2.out # To get GTK+'s themes and gtk-update-icon-cache - pkgs.hicolor_icon_theme - pkgs.tango-icon-theme - pkgs.shared_mime_info - pkgs.which # Needed by the xfce's xinitrc script. - pkgs."${cfg.screenLock}" - pkgs.xfce.exo - pkgs.xfce.gtk_xfce_engine - pkgs.xfce.mousepad - pkgs.xfce.ristretto - pkgs.xfce.terminal - (pkgs.xfce.thunar.override { thunarPlugins = cfg.thunarPlugins; }) - pkgs.xfce.xfce4icontheme - pkgs.xfce.xfce4session - pkgs.xfce.xfce4settings - pkgs.xfce.xfce4mixer - pkgs.xfce.xfce4volumed - pkgs.xfce.xfce4-screenshooter - pkgs.xfce.xfconf - # This supplies some "abstract" icons such as - # "utilities-terminal" and "accessories-text-editor". - pkgs.gnome3.defaultIconTheme - pkgs.desktop_file_utils - pkgs.xfce.libxfce4ui - pkgs.xfce.garcon - pkgs.xfce.thunar_volman - pkgs.xfce.gvfs - pkgs.xfce.xfce4_appfinder - pkgs.xfce.tumbler # found via dbus - ] - ++ optional cfg.enableXfwm pkgs.xfce.xfwm4 - ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager - ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet - ++ optionals (!cfg.noDesktop) - [ pkgs.xfce.xfce4panel - pkgs.xfce.xfdesktop - pkgs.xfce.xfce4notifyd # found via dbus - ]; - - environment.pathsToLink = - [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ]; - - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ]; - # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - }; - } diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 3fa482fb672210eaa09ad801eb83b6a11092e957..43ed21c95feeb7d90135a7e933a8fda47586a498 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -59,12 +59,6 @@ let # 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 - _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$@" - fi - ''} - . /etc/profile cd "$HOME" @@ -72,16 +66,23 @@ let sessionType="$1" if [ "$sessionType" = default ]; then sessionType=""; fi - ${optionalString (!cfg.displayManager.job.logsXsession && !cfg.displayManager.logToJournal) '' - exec > ~/.xsession-errors 2>&1 - ''} - ${optionalString cfg.startDbusSession '' if test -z "$DBUS_SESSION_BUS_ADDRESS"; then exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$sessionType" fi ''} + ${optionalString cfg.displayManager.job.logToJournal '' + if [ -z "$_DID_SYSTEMD_CAT" ]; then + export _DID_SYSTEMD_CAT=1 + exec ${config.systemd.package}/bin/systemd-cat -t xsession "$0" "$sessionType" + fi + ''} + + ${optionalString cfg.displayManager.job.logToFile '' + exec &> >(tee ~/.xsession-errors) + ''} + # Start PulseAudio if enabled. ${optionalString (config.hardware.pulseaudio.enable) '' ${optionalString (!config.hardware.pulseaudio.systemWide) @@ -306,26 +307,24 @@ in description = "Additional environment variables needed by the display manager."; }; - logsXsession = mkOption { + logToFile = mkOption { type = types.bool; default = false; description = '' - Whether the display manager redirects the - output of the session script to - ~/.xsession-errors. + Whether the display manager redirects the output of the + session script to ~/.xsession-errors. ''; }; - }; + logToJournal = mkOption { + type = types.bool; + default = true; + description = '' + Whether the display manager redirects the output of the + session script to the systemd journal. + ''; + }; - logToJournal = mkOption { - type = types.bool; - default = true; - description = '' - By default, the stdout/stderr of sessions is written - to ~/.xsession-errors. When this option - is enabled, it will instead be written to the journal. - ''; }; }; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index e83f26516f5f836f3ff1e014dcfbdd2d818be172..70fc7388c2acdfc1ea1f38b282378b089cf26b99 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -122,11 +122,8 @@ in "rc-local.service" "systemd-machined.service" "systemd-user-sessions.service" - "getty@tty1.service" ]; - systemd.services."getty@tty1".enable = false; - systemd.services.display-manager.conflicts = [ "getty@tty1.service" ]; systemd.services.display-manager.serviceConfig = { # Restart = "always"; - already defined in xserver.nix KillMode = "mixed"; @@ -136,7 +133,7 @@ in StandardError = "inherit"; }; - systemd.services.display-manager.path = [ pkgs.gnome3.gnome_session ]; + systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ]; services.dbus.packages = [ gdm ]; @@ -196,7 +193,7 @@ in auth required pam_env.so envfile=${config.system.build.pamEnvironment} auth required pam_succeed_if.so uid >= 1000 quiet - auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so + auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth ${optionalString config.security.pam.enableEcryptfs "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -216,7 +213,7 @@ in "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_loginuid.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so - session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start + session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start ''; gdm-password.text = '' @@ -224,7 +221,7 @@ in auth required pam_env.so envfile=${config.system.build.pamEnvironment} auth required pam_succeed_if.so uid >= 1000 quiet - auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so + auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth ${optionalString config.security.pam.enableEcryptfs "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -243,7 +240,7 @@ in "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_loginuid.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so - session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start + session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start ''; gdm-autologin.text = '' 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 1d5dcb2c7cbe1107733c3559e296757dda747ada..2a71d23386072902efe8150a80c2e4042a4df5d2 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,8 @@ let theme-name = ${cfg.theme.name} icon-theme-name = ${cfg.iconTheme.name} background = ${ldmcfg.background} + ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} + ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"} ${cfg.extraConfig} ''; @@ -66,8 +68,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.gnome_themes_standard; - defaultText = "pkgs.gnome3.gnome_themes_standard"; + default = pkgs.gnome3.gnome-themes-standard; + defaultText = "pkgs.gnome3.gnome-themes-standard"; description = '' The package path that contains the theme given in the name option. ''; @@ -104,6 +106,35 @@ in }; + clock-format = mkOption { + type = types.nullOr types.str; + default = null; + example = "%F"; + description = '' + Clock format string (as expected by strftime, e.g. "%H:%M") + to use with the lightdm gtk greeter panel. + + If set to null the default clock format is used. + ''; + }; + + indicators = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + example = [ "~host" "~spacer" "~clock" "~spacer" "~session" "~language" "~a11y" "~power" ]; + description = '' + List of allowed indicator modules to use for the lightdm gtk + greeter panel. + + Built-in indicators include "~a11y", "~language", "~session", + "~power", "~clock", "~host", "~spacer". Unity indicators can be + represented by short name (e.g. "sound", "power"), service file name, + or absolute path. + + If set to null the default indicators are used. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 1733f2fd39b2778ccb5b391f2c8a043392469ca2..9d30155a72348d9c24b3dc1ee492ae0559f03fea 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -9,6 +9,10 @@ let xEnv = config.systemd.services."display-manager".environment; cfg = dmcfg.lightdm; + dmDefault = xcfg.desktopManager.default; + wmDefault = xcfg.windowManager.default; + hasDefaultUserSession = dmDefault != "none" || wmDefault != "none"; + inherit (pkgs) stdenv lightdm writeScript writeText; # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup @@ -54,14 +58,13 @@ let autologin-user-timeout = ${toString cfg.autoLogin.timeout} autologin-session = ${defaultSessionName} ''} + ${optionalString hasDefaultUserSession '' + user-session=${defaultSessionName} + ''} ${cfg.extraSeatDefaults} ''; - defaultSessionName = - let - dm = xcfg.desktopManager.default; - wm = xcfg.windowManager.default; - in dm + optionalString (wm != "none") ("+" + wm); + defaultSessionName = dmDefault + optionalString (wmDefault != "none") ("+" + wmDefault); in { # Note: the order in which lightdm greeter modules are imported @@ -179,6 +182,14 @@ in default session: ${defaultSessionName} is not valid. ''; } + { assertion = hasDefaultUserSession -> elem defaultSessionName dmcfg.session.names; + message = '' + services.xserver.desktopManager.default and + services.xserver.windowMananger.default are not set to valid + values. The current default session: ${defaultSessionName} + is not valid. + ''; + } { assertion = !cfg.greeter.enable -> (cfg.autoLogin.enable && cfg.autoLogin.timeout == 0); message = '' LightDM can only run without greeter if automatic login is enabled and the timeout for it @@ -190,7 +201,7 @@ in services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.job = { - logsXsession = true; + logToFile = true; # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH execCmd = '' diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index facaea131ae5137915ed052de0c1e0ae0fcfc378..2d4cb8aa20a57680bb7bcf017810361a9b2224a2 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -205,7 +205,7 @@ in services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.job = { - logsXsession = true; + logToFile = true; environment = { # Load themes from system environment diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 0c4dd1973b53467bf801823b80b1bba2e7d400ac..f645a5c2f0781fd55936f031ae7ae5c78529822b 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -14,7 +14,7 @@ let default_xserver ${dmcfg.xserverBin} xserver_arguments ${toString dmcfg.xserverArgs} sessiondir ${dmcfg.session.desktops} - login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session" + login_cmd exec ${pkgs.runtimeShell} ${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 diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix index 8f5ce3dccc6a3cd6b2dff64c188256928af2ec3e..b46ede550c16e49bc85420077192a8f90d48d96c 100644 --- a/nixos/modules/services/x11/display-managers/xpra.nix +++ b/nixos/modules/services/x11/display-managers/xpra.nix @@ -220,7 +220,7 @@ in ''; services.xserver.displayManager.job = { - logsXsession = true; + logToFile = true; execCmd = '' ${optionalString (cfg.pulseaudio) diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 44555cb6e2a923823fe9d21642d02c377e30800c..d0a87f183b6fb934f8d2e290610479cae157d8f1 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -170,7 +170,7 @@ in { disableWhileTyping = mkOption { type = types.bool; - default = true; + default = false; description = '' Disable input method while typing. @@ -198,6 +198,13 @@ in { environment.systemPackages = [ pkgs.xorg.xf86inputlibinput ]; + environment.etc = [ + (let cfgPath = "X11/xorg.conf.d/40-libinput.conf"; in { + source = pkgs.xorg.xf86inputlibinput.out + "/share/" + cfgPath; + target = cfgPath; + }) + ]; + services.udev.packages = [ pkgs.libinput ]; services.xserver.config = diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix index e3f5ec7dbe6744f72ea79226b3e6c6ca724a2f6e..fdbdf35b0f5af402ff2f827330546d05f841b950 100644 --- a/nixos/modules/services/x11/window-managers/2bwm.nix +++ b/nixos/modules/services/x11/window-managers/2bwm.nix @@ -25,12 +25,12 @@ in { name = "2bwm"; start = '' - ${pkgs."2bwm"}/bin/2bwm & + ${pkgs._2bwm}/bin/2bwm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs."2bwm" ]; + environment.systemPackages = [ pkgs._2bwm ]; }; diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index eb97449c6bd9122a8005e5ebbc3ce7cbefe853d5..71eb02ec595498181630ba331a72db19c1430608 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -6,7 +6,11 @@ let cfg = config.services.xserver.windowManager.awesome; awesome = cfg.package; - inherit (pkgs.luaPackages) getLuaPath getLuaCPath; + getLuaPath = lib : dir : "${lib}/${dir}/lua/${pkgs.luaPackages.lua.luaversion}"; + makeSearchPath = lib.concatMapStrings (path: + " --search " + (getLuaPath path "share") + + " --search " + (getLuaPath path "lib") + ); in { @@ -46,10 +50,7 @@ in { name = "awesome"; start = '' - export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}" - export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}" - - ${awesome}/bin/awesome & + ${awesome}/bin/awesome ${makeSearchPath cfg.luaModules} & waitPID=$! ''; }; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 25ba95fccd756ea8bc75b68951c1fc475c9cb330..e617e55a7a57a8166508deaf040d2d9bef2618b3 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -12,6 +12,7 @@ in ./afterstep.nix ./bspwm.nix ./dwm.nix + ./evilwm.nix ./exwm.nix ./fluxbox.nix ./fvwm.nix @@ -61,9 +62,7 @@ in example = "wmii"; description = "Default window manager loaded if none have been chosen."; apply = defaultWM: - if defaultWM == "none" && cfg.session != [] then - (head cfg.session).name - else if any (w: w.name == defaultWM) cfg.session then + if any (w: w.name == defaultWM) cfg.session then defaultWM else throw "Default window manager (${defaultWM}) not found."; diff --git a/nixos/modules/services/x11/window-managers/evilwm.nix b/nixos/modules/services/x11/window-managers/evilwm.nix new file mode 100644 index 0000000000000000000000000000000000000000..6e19e3572c79d929d4ab31f5045e648f17e2611d --- /dev/null +++ b/nixos/modules/services/x11/window-managers/evilwm.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.evilwm; +in +{ + ###### interface + options = { + services.xserver.windowManager.evilwm.enable = mkEnableOption "evilwm"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "evilwm"; + start = '' + ${pkgs.evilwm}/bin/evilwm & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.evilwm ]; + }; +} diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix index 28fc92024bcb46a4fa99c59896ee760cee959758..a614559970e939a00778ec2022fe27b032289438 100644 --- a/nixos/modules/services/x11/xautolock.nix +++ b/nixos/modules/services/x11/xautolock.nix @@ -26,9 +26,9 @@ in }; locker = mkOption { - default = "xlock"; # default according to `man xautolock` - example = "i3lock -i /path/to/img"; - type = types.string; + default = "${pkgs.xlockmore}/bin/xlock"; # default according to `man xautolock` + example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img"; + type = types.str; description = '' The script to use when automatically locking the computer. @@ -37,8 +37,8 @@ in nowlocker = mkOption { default = null; - example = "i3lock -i /path/to/img"; - type = types.nullOr types.string; + example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img"; + type = types.nullOr types.str; description = '' The script to use when manually locking the computer with xautolock -locknow. @@ -56,10 +56,8 @@ in notifier = mkOption { default = null; - example = literalExample '' - "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\"" - ''; - type = types.nullOr types.string; + example = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; + type = types.nullOr types.str; description = '' Notification script to be used to warn about the pending autolock. @@ -68,8 +66,8 @@ in killer = mkOption { default = null; # default according to `man xautolock` is none - example = "systemctl suspend"; - type = types.nullOr types.string; + example = "${pkgs.systemd}/bin/systemctl suspend"; + type = types.nullOr types.str; description = '' The script to use when nothing has happend for as long as @@ -131,6 +129,12 @@ in assertion = cfg.killer != null -> cfg.killtime >= 10; message = "killtime has to be at least 10 minutes according to `man xautolock`"; } - ]; + ] ++ (lib.flip map [ "locker" "notifier" "nowlocker" "killer" ] + (option: + { + assertion = cfg."${option}" != null -> builtins.substring 0 1 cfg."${option}" == "/"; + message = "Please specify a canonical path for `services.xserver.xautolock.${option}`"; + }) + ); }; } diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 7d544e153e9a4b95f250c18c55f2055218d4cbc7..5f0a0f2784522e60c90e674bbc0af495e687de0c 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -161,15 +161,6 @@ in ''; }; - plainX = mkOption { - type = types.bool; - default = false; - description = '' - Whether the X11 session can be plain (without DM/WM) and - the Xsession script will be used as fallback or not. - ''; - }; - autorun = mkOption { type = types.bool; default = true; @@ -548,7 +539,7 @@ in knownVideoDrivers; in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver)); - nixpkgs.config.xorg = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { abiCompat = "1.18"; }; + nixpkgs.config = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { xorg.abiCompat = "1.18"; }; assertions = [ { assertion = config.security.polkit.enable; @@ -561,11 +552,6 @@ in + "${toString (length primaryHeads)} heads set to primary: " + concatMapStringsSep ", " (x: x.output) primaryHeads; }) - { assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX; - message = "Either the desktop manager or the window manager shouldn't be `none`! " - + "To explicitly allow this, you can also set `services.xserver.plainX` to `true`. " - + "The `default` value looks for enabled WMs/DMs and select the first one."; - } ]; environment.etc = @@ -578,6 +564,22 @@ in target = "X11/xkb"; } ]) + # localectl looks into 00-keyboard.conf + ++ [ + { + text = '' + Section "InputClass" + Identifier "Keyboard catchall" + MatchIsKeyboard "on" + Option "XkbModel" "${cfg.xkbModel}" + Option "XkbLayout" "${cfg.layout}" + Option "XkbOptions" "${cfg.xkbOptions}" + Option "XkbVariant" "${cfg.xkbVariant}" + EndSection + ''; + target = "X11/xorg.conf.d/00-keyboard.conf"; + } + ] # Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5 ++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in [{ @@ -624,9 +626,7 @@ in environment = { - XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. - LD_LIBRARY_PATH = concatStringsSep ":" ( - [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" "/run/opengl-driver/lib" ] + LD_LIBRARY_PATH = concatStringsSep ":" ([ "/run/opengl-driver/lib" ] ++ concatLists (catAttrs "libPath" cfg.drivers)); } // cfg.displayManager.job.environment; @@ -697,16 +697,6 @@ in ${cfg.monitorSection} EndSection - Section "InputClass" - Identifier "Keyboard catchall" - MatchIsKeyboard "on" - Option "XkbRules" "base" - Option "XkbModel" "${cfg.xkbModel}" - Option "XkbLayout" "${cfg.layout}" - Option "XkbOptions" "${cfg.xkbOptions}" - Option "XkbVariant" "${cfg.xkbVariant}" - EndSection - # Additional "InputClass" sections ${flip concatMapStrings cfg.inputClassSections (inputClassSection: '' Section "InputClass" diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index c2ac731d433d1feb0f37cbadd9203ca033a99809..c563614caaaf3802823628243aab31c45c72ba21 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -61,7 +61,7 @@ in apply = set: { script = '' - #! ${pkgs.stdenv.shell} + #! ${pkgs.runtimeShell} systemConfig=@out@ @@ -117,14 +117,7 @@ in config = { - system.activationScripts.stdio = - '' - # Needed by some programs. - ln -sfn /proc/self/fd /dev/fd - ln -sfn /proc/self/fd/0 /dev/stdin - ln -sfn /proc/self/fd/1 /dev/stdout - ln -sfn /proc/self/fd/2 /dev/stderr - ''; + system.activationScripts.stdio = ""; # obsolete system.activationScripts.var = '' diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 29cc60b00324bba20e93f135ac876e02f79f060b..87a4ab2a586df7e539fd83ca65d2545035ce7cc0 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -16,6 +16,10 @@ my $reloadListFile = "/run/systemd/reload-list"; my $action = shift @ARGV; +if ("@localeArchive@" ne "") { + $ENV{LOCALE_ARCHIVE} = "@localeArchive@"; +} + if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) { print STDERR <; chomp $escaped; @@ -364,7 +370,8 @@ syslog(LOG_NOTICE, "switching to system configuration $out"); if (scalar (keys %unitsToStop) > 0) { print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" if scalar @unitsToStopFiltered; - system("systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? + # Use current version of systemctl binary before daemon is reexeced. + system("/run/current-system/sw/bin/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? } print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 67cb2264e3f37623d06e9a1a23dc360c28a25ae9..091a2e412eeda91be63803ed45fbc0a1ddc90615 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -26,11 +26,12 @@ let cloner false config.nesting.children ++ cloner true config.nesting.clone; - systemBuilder = let kernelPath = "${config.boot.kernelPackages.kernel}/" + "${config.system.boot.loader.kernelFile}"; + initrdPath = "${config.system.build.initialRamdisk}/" + + "${config.system.boot.loader.initrdFile}"; in '' mkdir $out @@ -51,7 +52,7 @@ let echo -n "$kernelParams" > $out/kernel-params - ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd + ln -s ${initrdPath} $out/initrd ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out @@ -83,6 +84,7 @@ let done mkdir $out/bin + export localeArchive="${config.i18n.glibcLocales}/lib/locale/locale-archive" substituteAll ${./switch-to-configuration.pl} $out/bin/switch-to-configuration chmod +x $out/bin/switch-to-configuration @@ -106,7 +108,7 @@ let if [] == failed then pkgs.stdenvNoCC.mkDerivation { name = let hn = config.networking.hostName; nn = if (hn != "") then hn else "unnamed"; - in "nixos-system-${nn}-${config.system.nixosLabel}"; + in "nixos-system-${nn}-${config.system.nixos.label}"; preferLocalBuild = true; allowSubstitutes = false; buildCommand = systemBuilder; @@ -120,7 +122,7 @@ let config.system.build.installBootLoader or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; activationScript = config.system.activationScripts.script; - nixosLabel = config.system.nixosLabel; + nixosLabel = config.system.nixos.label; configurationName = config.boot.loader.grub.configurationName; @@ -179,6 +181,15 @@ in ''; }; + system.boot.loader.initrdFile = mkOption { + internal = true; + default = "initrd"; + type = types.str; + description = '' + Name of the initrd file to be passed to the bootloader. + ''; + }; + system.copySystemConfiguration = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix new file mode 100644 index 0000000000000000000000000000000000000000..15e84dc021e28deaf882acc4c1d83e801cb1dabd --- /dev/null +++ b/nixos/modules/system/boot/binfmt.nix @@ -0,0 +1,139 @@ +{ config, lib, ... }: +let + inherit (lib) mkOption types optionalString; + + cfg = config.boot.binfmtMiscRegistrations; + + makeBinfmtLine = name: { recognitionType, offset, magicOrExtension + , mask, preserveArgvZero, openBinary + , matchCredentials, fixBinary, ... + }: let + type = if recognitionType == "magic" then "M" else "E"; + offset' = toString offset; + mask' = toString mask; + interpreter = "/run/binfmt/${name}"; + flags = if !(matchCredentials -> openBinary) + then throw "boot.binfmtMiscRegistrations.${name}: you can't specify openBinary = false when matchCredentials = true." + else optionalString preserveArgvZero "P" + + optionalString (openBinary && !matchCredentials) "O" + + optionalString matchCredentials "C" + + optionalString fixBinary "F"; + in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}"; + + binfmtFile = builtins.toFile "binfmt_nixos.conf" + (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine cfg)); + + activationSnippet = name: { interpreter, ... }: + "ln -sf ${interpreter} /run/binfmt/${name}"; + activationScript = '' + mkdir -p -m 0755 /run/binfmt + ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet cfg)} + ''; +in { + options = { + boot.binfmtMiscRegistrations = mkOption { + default = {}; + + description = '' + Extra binary formats to register with the kernel. + See https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html for more details. + ''; + + type = types.attrsOf (types.submodule ({ config, ... }: { + options = { + recognitionType = mkOption { + default = "magic"; + description = "Whether to recognize executables by magic number or extension."; + type = types.enum [ "magic" "extension" ]; + }; + + offset = mkOption { + default = null; + description = "The byte offset of the magic number used for recognition."; + type = types.nullOr types.int; + }; + + magicOrExtension = mkOption { + description = "The magic number or extension to match on."; + type = types.str; + }; + + mask = mkOption { + default = null; + description = + "A mask to be ANDed with the byte sequence of the file before matching"; + type = types.nullOr types.str; + }; + + interpreter = mkOption { + description = '' + The interpreter to invoke to run the program. + + Note that the actual registration will point to + /run/binfmt/''${name}, so the kernel interpreter length + limit doesn't apply. + ''; + type = types.path; + }; + + preserveArgvZero = mkOption { + default = false; + description = '' + Whether to pass the original argv[0] to the interpreter. + + See the description of the 'P' flag in the kernel docs + for more details; + ''; + type = types.bool; + }; + + openBinary = mkOption { + default = config.matchCredentials; + description = '' + Whether to pass the binary to the interpreter as an open + file descriptor, instead of a path. + ''; + type = types.bool; + }; + + matchCredentials = mkOption { + default = false; + description = '' + Whether to launch with the credentials and security + token of the binary, not the interpreter (e.g. setuid + bit). + + See the description of the 'C' flag in the kernel docs + for more details. + + Implies/requires openBinary = true. + ''; + type = types.bool; + }; + + fixBinary = mkOption { + default = false; + description = '' + Whether to open the interpreter file as soon as the + registration is loaded, rather than waiting for a + relevant file to be invoked. + + See the description of the 'F' flag in the kernel docs + for more details. + ''; + type = types.bool; + }; + }; + })); + }; + }; + + config = lib.mkIf (cfg != {}) { + environment.etc."binfmt.d/nixos.conf".source = binfmtFile; + system.activationScripts.binfmt = activationScript; + systemd.additionalUpstreamSystemUnits = + [ "proc-sys-fs-binfmt_misc.automount" + "proc-sys-fs-binfmt_misc.mount" + ]; + }; +} diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix new file mode 100644 index 0000000000000000000000000000000000000000..1e6f9e442b679913779dac6938f0805ef8c96f9c --- /dev/null +++ b/nixos/modules/system/boot/grow-partition.nix @@ -0,0 +1,50 @@ +# This module automatically grows the root partition. +# This allows an instance to be created with a bigger root filesystem +# than provided by the machine image. + +{ config, lib, pkgs, ... }: + +with lib; + +{ + + options = { + boot.growPartition = mkEnableOption "grow the root partition on boot"; + }; + + config = mkIf config.boot.growPartition { + + boot.initrd.extraUtilsCommands = '' + copy_bin_and_libs ${pkgs.gawk}/bin/gawk + copy_bin_and_libs ${pkgs.gnused}/bin/sed + copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk + copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk + + substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \ + --replace "${pkgs.bash}/bin/sh" "/bin/sh" \ + --replace "awk" "gawk" \ + --replace "sed" "gnused" + + ln -s sed $out/bin/gnused + ''; + + boot.initrd.postDeviceCommands = '' + rootDevice="${config.fileSystems."/".device}" + if [ -e "$rootDevice" ]; then + rootDevice="$(readlink -f "$rootDevice")" + parentDevice="$rootDevice" + while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do + parentDevice="''${parentDevice%[0-9]}"; + done + partNum="''${rootDevice#''${parentDevice}}" + if [ "''${parentDevice%[0-9]p}" != "''${parentDevice}" ] && [ -b "''${parentDevice%p}" ]; then + parentDevice="''${parentDevice%p}" + fi + TMPDIR=/run sh $(type -P growpart) "$parentDevice" "$partNum" + udevadm settle + fi + ''; + + }; + +} diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index 6e226c190609065ec49bb373185fcf3956f13082..33862b0965cc20658434290ae45ffc4927ecdc4b 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -23,6 +23,8 @@ let fi ''; + udhcpcArgs = toString cfg.udhcpc.extraArgs; + in { @@ -40,6 +42,20 @@ in kernel documentation. Otherwise, if is enabled, an IP address is acquired using DHCP. + + You should add the module(s) required for your network card to + boot.initrd.availableKernelModules. lspci -v -s <ethernet controller> + will tell you which. + ''; + }; + + boot.initrd.network.udhcpc.extraArgs = mkOption { + default = []; + type = types.listOf types.str; + description = '' + Additional command-line arguments passed verbatim to udhcpc if + and + are enabled. ''; }; @@ -87,7 +103,7 @@ in # Acquire a DHCP lease. echo "acquiring IP address via DHCP..." - udhcpc --quit --now --script ${udhcpcScript} && hasNetwork=1 + udhcpc --quit --now --script ${udhcpcScript} ${udhcpcArgs} && hasNetwork=1 fi '' diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index d78775c27582699d48b2dabce32ed17a6d8ab9be..8b3dc2d90eb333abbd7362a8a1a230ff5b50a897 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -89,9 +89,6 @@ in config = mkIf (config.boot.initrd.network.enable && cfg.enable) { assertions = [ - { assertion = cfg.hostRSAKey != null || cfg.hostDSSKey != null || cfg.hostECDSAKey != null; - message = "You should specify at least one host key for initrd SSH"; - } { assertion = cfg.authorizedKeys != []; message = "You should specify at least one authorized key for initrd SSH"; } @@ -121,7 +118,7 @@ in echo ${escapeShellArg key} >> /root/.ssh/authorized_keys '') cfg.authorizedKeys)} - dropbear -s -j -k -E -m -p ${toString cfg.port} + dropbear -s -j -k -E -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} ''; boot.initrd.secrets = diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 4db9631743e3b5a92766a9d020d59362bd8ec8f1..8ea05ed14687e878e8737bd911e573107a99726b 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -5,7 +5,7 @@ with lib; let inherit (config.boot) kernelPatches; - + inherit (config.boot.kernel) features; inherit (config.boot.kernelPackages) kernel; kernelModulesConf = pkgs.writeText "nixos.conf" @@ -21,11 +21,25 @@ in options = { + boot.kernel.features = mkOption { + default = {}; + example = literalExample "{ debug = true; }"; + internal = true; + description = '' + This option allows to enable or disable certain kernel features. + It's not API, because it's about kernel feature sets, that + make sense for specific use cases. Mostly along with programs, + which would have separate nixos options. + `grep features pkgs/os-specific/linux/kernel/common-config.nix` + ''; + }; + boot.kernelPackages = mkOption { default = pkgs.linuxPackages; apply = kernelPackages: kernelPackages.extend (self: super: { kernel = super.kernel.override { kernelPatches = super.kernel.kernelPatches ++ kernelPatches; + features = lib.recursiveUpdate super.kernel.features features; }; }); # We don't want to evaluate all of linuxPackages for the manual @@ -63,8 +77,8 @@ in type = types.int; default = 4; description = '' - The kernel console log level. Log messages with a priority - numerically less than this will not appear on the console. + The kernel console loglevel. All Kernel Messages with a log level smaller + than this setting will be printed to the console. ''; }; @@ -170,7 +184,7 @@ in [ "loglevel=${toString config.boot.consoleLogLevel}" ] ++ optionals config.boot.vesa [ "vga=0x317" ]; - boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel; + boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel; boot.kernelModules = [ "loop" "atkbd" ]; @@ -197,7 +211,7 @@ in "mmc_block" # Support USB keyboards, in case the boot fails and we only have - # a USB keyboard. + # a USB keyboard, or for LUKS passphrase prompt. "uhci_hcd" "ehci_hcd" "ehci_pci" @@ -207,11 +221,13 @@ in "xhci_pci" "usbhid" "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" + "hid_logitech_hidpp" "hid_logitech_dj" - # Misc. keyboard stuff. + ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ + # Misc. x86 keyboard stuff. "pcips2" "atkbd" "i8042" - # Needed by the stage 2 init script. + # x86 RTC needed by the stage 2 init script. "rtc_cmos" ]; diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix index b7821f9509f12bba10dd3dfc92d2c683c5308026..3fc1af28f628e7353272aedf37e347db934c31a2 100644 --- a/nixos/modules/system/boot/kexec.nix +++ b/nixos/modules/system/boot/kexec.nix @@ -1,21 +1,22 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { - environment.systemPackages = [ pkgs.kexectools ]; + config = lib.mkIf (pkgs.kexectools.meta.available) { + environment.systemPackages = [ pkgs.kexectools ]; - systemd.services."prepare-kexec" = - { description = "Preparation for kexec"; - wantedBy = [ "kexec.target" ]; - before = [ "systemd-kexec.service" ]; - unitConfig.DefaultDependencies = false; - serviceConfig.Type = "oneshot"; - path = [ pkgs.kexectools ]; - script = - '' - p=$(readlink -f /nix/var/nix/profiles/system) - if ! [ -d $p ]; then exit 1; fi - exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init" - ''; - }; - -} \ No newline at end of file + systemd.services."prepare-kexec" = + { description = "Preparation for kexec"; + wantedBy = [ "kexec.target" ]; + before = [ "systemd-kexec.service" ]; + unitConfig.DefaultDependencies = false; + serviceConfig.Type = "oneshot"; + path = [ pkgs.kexectools ]; + script = + '' + p=$(readlink -f /nix/var/nix/profiles/system) + if ! [ -d $p ]; then exit 1; fi + exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init" + ''; + }; + }; +} diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 9056121fa7d1657a46176ae15f12f4dcf283e8d3..e2cff1c1bd9457c9413954e989fc1e1625a05e62 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -40,7 +40,7 @@ let { splashImage = f cfg.splashImage; grub = f grub; grubTarget = f (grub.grubTarget or ""); - shell = "${pkgs.stdenv.shell}"; + shell = "${pkgs.runtimeShell}"; fullName = (builtins.parseDrvName realGrub.name).name; fullVersion = (builtins.parseDrvName realGrub.name).version; grubEfi = f grubEfi; @@ -110,7 +110,7 @@ in device = mkOption { default = ""; - example = "/dev/hda"; + example = "/dev/disk/by-id/wwn-0x500001234567890a"; type = types.str; description = '' The device on which the GRUB boot loader will be installed. @@ -123,7 +123,7 @@ in devices = mkOption { default = []; - example = [ "/dev/hda" ]; + example = [ "/dev/disk/by-id/wwn-0x500001234567890a" ]; type = types.listOf types.str; description = '' The devices on which the boot loader, GRUB, will be @@ -135,8 +135,8 @@ in mirroredBoots = mkOption { default = [ ]; example = [ - { path = "/boot1"; devices = [ "/dev/sda" ]; } - { path = "/boot2"; devices = [ "/dev/sdb" ]; } + { path = "/boot1"; devices = [ "/dev/disk/by-id/wwn-0x500001234567890a" ]; } + { path = "/boot2"; devices = [ "/dev/disk/by-id/wwn-0x500009876543210a" ]; } ]; description = '' Mirror the boot configuration to multiple partitions and install grub @@ -178,7 +178,7 @@ in devices = mkOption { default = [ ]; - example = [ "/dev/sda" "/dev/sdb" ]; + example = [ "/dev/disk/by-id/wwn-0x500001234567890a" "/dev/disk/by-id/wwn-0x500009876543210a" ]; type = types.listOf types.str; description = '' The path to the devices which will have the GRUB MBR written. @@ -536,9 +536,9 @@ in btrfsprogs = pkgs.btrfs-progs; }; in pkgs.writeScript "install-grub.sh" ('' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} set -e - export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])} + export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX XMLSAXBase ListCompare ])} ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} '' + flip concatMapStrings cfg.mirroredBoots (args: '' ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@ diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index cc03e54ead63184ee2dd4075513b4ccfd030d91d..8bd203106f55dbc7749e6ef8d4387da77a13c0cb 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -182,7 +182,7 @@ sub GrubFs { # Based on the type pull in the identifier from the system my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}"); if ($status != 0) { - die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}"; + die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}"; } my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; if ($#matches != 0) { diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 06f004fb06ecc2a9c79d0f6e94630b6f02747a56..54dfb53fd30ffba7c716ca46a89a86e31225cc6d 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -5,7 +5,7 @@ with lib; let luks = config.boot.initrd.luks; - openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, ... }: assert name' == name; '' + openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, fallbackToPassword, ... }: assert name' == name; '' # Wait for a target (e.g. device, keyFile, header, ...) to appear. wait_target() { @@ -43,8 +43,17 @@ let open_normally() { echo luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \ ${optionalString (header != null) "--header=${header}"} \ - ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"} \ > /.luksopen_args + ${optionalString (keyFile != null) '' + ${optionalString fallbackToPassword "if [ -e ${keyFile} ]; then"} + echo " --key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}" \ + >> /.luksopen_args + ${optionalString fallbackToPassword '' + else + echo "keyfile ${keyFile} not found -- fallback to interactive unlocking" + fi + ''} + ''} cryptsetup-askpass rm /.luksopen_args } @@ -227,6 +236,7 @@ in default = [ "aes" "aes_generic" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" + (if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586") ]; description = '' @@ -323,6 +333,16 @@ in ''; }; + fallbackToPassword = mkOption { + default = false; + type = types.bool; + description = '' + Whether to fallback to interactive passphrase prompt if the keyfile + cannot be found. This will prevent unattended boot should the keyfile + go missing. + ''; + }; + yubikey = mkOption { default = null; description = '' @@ -434,7 +454,12 @@ in ["firewire_ohci" "firewire_core" "firewire_sbp2"]; # Some modules that may be needed for mounting anything ciphered - boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" ] ++ luks.cryptoModules; + # Also load input_leds to get caps lock light working (#12456) + boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ] + ++ luks.cryptoModules + # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged + # remove once 'modprobe --show-depends xts' shows ecb as a dependency + ++ (if builtins.elem "xts" luks.cryptoModules then ["ecb"] else []); # copy the cryptsetup binary and it's dependencies boot.initrd.extraUtilsCommands = '' diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index b915a98d5375b01e2c590d742967087fe2842683..dee0ab470c992f94367a221b1e446bc8d9af04b8 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -54,7 +54,7 @@ with lib; environment.systemPackages = [ pkgs.kmod ]; - system.activationScripts.modprobe = + system.activationScripts.modprobe = stringAfter ["specialfs"] '' # Allow the kernel to find our wrapped modprobe (which searches # in the right location in the Nix store for kernel modules). diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 9d2cea3ad165b8c79690d4ecdf6785cd04edd356..eea10613ea586aa4a5d5ee32d3d925b66d059882 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" "MulticastDNS" "Domains" "Bridge" "Bond" + "LLMNR" "MulticastDNS" "Domains" "Bridge" "Bond" "IPv6PrivacyExtensions" ]) (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"]) (assertValueOneOf "DHCPServer" boolValues) @@ -104,6 +104,7 @@ let (assertValueOneOf "IPv4LLRoute" boolValues) (assertValueOneOf "LLMNR" boolValues) (assertValueOneOf "MulticastDNS" boolValues) + (assertValueOneOf "IPv6PrivacyExtensions" ["yes" "no" "prefer-public" "kernel"]) ]; checkAddress = checkUnitConfig "Address" [ @@ -700,7 +701,6 @@ in systemd.additionalUpstreamSystemUnits = [ "systemd-networkd.service" "systemd-networkd-wait-online.service" - "org.freedesktop.network1.busname" ]; systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 4b0c498424b53a7c3a856c0b3e0df3dd780469a2..f8fb8a64cb9b8a3c0b805e713d259d9c7a9e7da9 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -8,9 +8,14 @@ let cfg = config.boot.plymouth; + breezePlymouth = pkgs.breeze-plymouth.override { + nixosBranding = true; + nixosVersion = config.system.nixos.release; + }; + themesEnv = pkgs.buildEnv { name = "plymouth-themes"; - paths = [ plymouth ] ++ cfg.themePackages; + paths = [ plymouth breezePlymouth ] ++ cfg.themePackages; }; configFile = pkgs.writeText "plymouthd.conf" '' @@ -38,7 +43,7 @@ in }; theme = mkOption { - default = "fade-in"; + default = "breeze"; type = types.str; description = '' Splash screen theme. diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 2147d43c4f19a807830083cebe4af819bbb29284..4d9de020c84e24101463f52bf9d8f47d41462940 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -126,7 +126,7 @@ in config = mkIf cfg.enable { systemd.additionalUpstreamSystemUnits = [ - "systemd-resolved.service" "org.freedesktop.resolve1.busname" + "systemd-resolved.service" ]; systemd.services.systemd-resolved = { diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index b442386914ad5b3a2b37da465aee83f2fefcd945..964ec68cfe2f81ea838dbe35aed507a49f1fbcf9 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -167,6 +167,7 @@ done # Load the required kernel modules. mkdir -p /lib ln -s @modulesClosure@/lib/modules /lib/modules +ln -s @modulesClosure@/lib/firmware /lib/firmware echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe for i in @kernelModules@; do echo "loading module $(basename $i)..." diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index d6e3e3a87d0182c051a4cd77834db356c733d69c..55bb6d3449c5c71712866b2ec69c620dc9656ffe 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -13,12 +13,14 @@ let kernelPackages = config.boot.kernelPackages; modulesTree = config.system.modulesTree; + firmware = config.hardware.firmware; # Determine the set of modules that we need to mount the root FS. modulesClosure = pkgs.makeModulesClosure { rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules; kernel = modulesTree; + firmware = firmware; allowMissing = true; }; @@ -28,6 +30,50 @@ let # mounting `/`, like `/` on a loopback). fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems; + # A utility for enumerating the shared-library dependencies of a program + findLibs = pkgs.writeShellScriptBin "find-libs" '' + set -euo pipefail + + declare -A seen + declare -a left + + patchelf="${pkgs.buildPackages.patchelf}/bin/patchelf" + + function add_needed { + rpath="$($patchelf --print-rpath $1)" + dir="$(dirname $1)" + for lib in $($patchelf --print-needed $1); do + left+=("$lib" "$rpath" "$dir") + done + } + + add_needed $1 + + while [ ''${#left[@]} -ne 0 ]; do + next=''${left[0]} + rpath=''${left[1]} + ORIGIN=''${left[2]} + left=("''${left[@]:3}") + if [ -z ''${seen[$next]+x} ]; then + seen[$next]=1 + IFS=: read -ra paths <<< $rpath + res= + for path in "''${paths[@]}"; do + path=$(eval "echo $path") + if [ -f "$path/$next" ]; then + res="$path/$next" + echo "$res" + add_needed "$res" + break + fi + done + if [ -z "$res" ]; then + echo "Couldn't satisfy dependency $next" >&2 + exit 1 + fi + fi + done + ''; # Some additional utilities needed in stage 1, like mount, lvm, fsck # etc. We don't want to bring in all of those packages, so we just @@ -35,7 +81,7 @@ let # we just copy what we need from Glibc and use patchelf to make it # work. extraUtils = pkgs.runCommandCC "extra-utils" - { buildInputs = [pkgs.nukeReferences]; + { nativeBuildInputs = [pkgs.buildPackages.nukeReferences]; allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd } '' @@ -101,9 +147,7 @@ let # Copy all of the needed libraries find $out/bin $out/lib -type f | while read BIN; do echo "Copying libs for executable $BIN" - LDD="$(ldd $BIN)" || continue - LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')" - for LIB in $LIBS; do + for LIB in $(${findLibs}/bin/find-libs $BIN); do TGT="$out/lib/$(basename $LIB)" if [ ! -f "$TGT" ]; then SRC="$(readlink -e $LIB)" @@ -130,6 +174,7 @@ let fi done + if [ -z "${toString pkgs.stdenv.isCross}" ]; then # Make sure that the patchelf'ed binaries still work. echo "testing patched programs..." $out/bin/ash -c 'echo hello world' | grep "hello world" @@ -142,6 +187,7 @@ let $out/bin/mdadm --version ${config.boot.initrd.extraUtilsCommandsTest} + fi ''; # */ @@ -243,7 +289,7 @@ let { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; } '' target=$out - ${pkgs.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out + ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out ''; symlink = "/etc/modprobe.d/ubuntu.conf"; } diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 46aed44bf10fc8796c0cb8fec486e48ab3d7be60..b83012dfda7ef4e0808bc0b5d3b6469a206bca03 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -43,7 +43,7 @@ if [ ! -e /proc/1 ]; then local options="$3" local fsType="$4" - mkdir -m 0755 -p "$mountPoint" + install -m 0755 -d "$mountPoint" mount -n -t "$fsType" -o "$options" "$device" "$mountPoint" } source @earlyMountScript@ @@ -71,7 +71,7 @@ fi # Provide a /etc/mtab. -mkdir -m 0755 -p /etc +install -m 0755 -d /etc test -e /etc/fstab || touch /etc/fstab # to shut up mount rm -f /etc/mtab* # not that we care about stale locks ln -s /proc/mounts /etc/mtab @@ -79,10 +79,9 @@ ln -s /proc/mounts /etc/mtab # 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/{log,lib,db} /nix/var /etc/nixos/ \ +install -m 01777 -d /tmp +install -m 0755 -d /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. diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index 8db6d2d2f7347720a662cd0f573321bc5366e2c1..78afbd8dbc12ba49f5dce9b1fe07adeaaa3c1f15 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -10,6 +10,7 @@ let bootStage2 = pkgs.substituteAll { src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; + shell = "${pkgs.bash}/bin/bash"; isExecutable = true; inherit (config.nix) readOnlyStore; inherit (config.networking) useHostResolvConf; diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 43a9c28bb69404491c1e3ceb418460a72d06492a..5255f1a1b97a59ad9f01567f1fecd93081ae29ff 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -217,7 +217,7 @@ in rec { environment = mkOption { default = {}; - type = types.attrs; # FIXME + type = with types; attrsOf (nullOr (either str package)); example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index dd9ba7104485854391b1ade5fe5bbe1cf2a15f91..d2fe33488a7ad0ac0032673f573d3f7eb7c57442 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -14,7 +14,6 @@ let upstreamSystemUnits = [ # Targets. "basic.target" - "busnames.target" "sysinit.target" "sockets.target" "exit.target" @@ -47,6 +46,7 @@ let # Consoles. "getty.target" + "getty-pre.target" "getty@.service" "serial-getty@.service" "console-getty.service" @@ -63,10 +63,7 @@ let "systemd-logind.service" "autovt@.service" "systemd-user-sessions.service" - "dbus-org.freedesktop.login1.service" "dbus-org.freedesktop.machine1.service" - "org.freedesktop.login1.busname" - "org.freedesktop.machine1.busname" "user@.service" # Journal. @@ -99,7 +96,6 @@ let "swap.target" "dev-hugepages.mount" "dev-mqueue.mount" - "proc-sys-fs-binfmt_misc.mount" "sys-fs-fuse-connections.mount" "sys-kernel-config.mount" "sys-kernel-debug.mount" @@ -141,7 +137,6 @@ let # Slices / containers. "slices.target" - "system.slice" "user.slice" "machine.slice" "machines.target" @@ -155,19 +150,16 @@ let "systemd-tmpfiles-setup-dev.service" # Misc. - "org.freedesktop.systemd1.busname" "systemd-sysctl.service" "dbus-org.freedesktop.timedate1.service" "dbus-org.freedesktop.locale1.service" "dbus-org.freedesktop.hostname1.service" - "org.freedesktop.timedate1.busname" - "org.freedesktop.locale1.busname" - "org.freedesktop.hostname1.busname" "systemd-timedated.service" "systemd-localed.service" "systemd-hostnamed.service" "systemd-binfmt.service" "systemd-exit.service" + "systemd-update-done.service" ] ++ cfg.additionalUpstreamSystemUnits; @@ -182,7 +174,6 @@ let upstreamUserUnits = [ "basic.target" "bluetooth.target" - "busnames.target" "default.target" "exit.target" "graphical-session-pre.target" @@ -249,37 +240,37 @@ let } (mkIf (config.preStart != "") { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${config.preStart} ''; }) (mkIf (config.script != "") { serviceConfig.ExecStart = makeJobScript "${name}-start" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${config.script} '' + " " + config.scriptArgs; }) (mkIf (config.postStart != "") { serviceConfig.ExecStartPost = makeJobScript "${name}-post-start" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${config.postStart} ''; }) (mkIf (config.reload != "") { serviceConfig.ExecReload = makeJobScript "${name}-reload" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${config.reload} ''; }) (mkIf (config.preStop != "") { serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${config.preStop} ''; }) (mkIf (config.postStop != "") { serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${config.postStop} ''; }) @@ -524,7 +515,7 @@ in }; systemd.globalEnvironment = mkOption { - type = types.attrs; + type = with types; attrsOf (nullOr (either str package)); default = {}; example = { TZ = "CET"; }; description = '' @@ -532,6 +523,14 @@ in ''; }; + systemd.enableCgroupAccounting = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable cgroup accounting. + ''; + }; + systemd.extraConfig = mkOption { default = ""; type = types.lines; @@ -733,6 +732,13 @@ in "systemd/system.conf".text = '' [Manager] + ${optionalString config.systemd.enableCgroupAccounting '' + DefaultCPUAccounting=yes + DefaultIOAccounting=yes + DefaultBlockIOAccounting=yes + DefaultMemoryAccounting=yes + DefaultTasksAccounting=yes + ''} ${config.systemd.extraConfig} ''; @@ -789,8 +795,7 @@ in # Keep a persistent journal. Note that systemd-tmpfiles will # set proper ownership/permissions. - # FIXME: revert to 0700 with systemd v233. - mkdir -m 0750 -p /var/log/journal + mkdir -m 0700 -p /var/log/journal ''; users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network; @@ -830,7 +835,8 @@ in system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET" - "SYSFS" "PROC_FS" "FHANDLE" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" + "SYSFS" "PROC_FS" "FHANDLE" "CRYPTO_USER_API_HASH" "CRYPTO_HMAC" + "CRYPTO_SHA256" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" "TMPFS_XATTR" "SECCOMP" ]; @@ -887,7 +893,7 @@ in systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; - systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ]; + systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; # Don't bother with certain units in containers. systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index 8cfa1b6921d37a250c01334cccab27ec5d88295d..1384873b66315c74de77e28cbd6c509d4f55b380 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -1,35 +1,132 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; let inInitrd = any (fs: fs == "btrfs") config.boot.initrd.supportedFilesystems; + inSystem = any (fs: fs == "btrfs") config.boot.supportedFilesystems; + + cfgScrub = config.services.btrfs.autoScrub; + + enableAutoScrub = cfgScrub.enable; + enableBtrfs = inInitrd || inSystem || enableAutoScrub; in { - config = mkIf (any (fs: fs == "btrfs") config.boot.supportedFilesystems) { + options = { + # One could also do regular btrfs balances, but that shouldn't be necessary + # during normal usage and as long as the filesystems aren't filled near capacity + services.btrfs.autoScrub = { + enable = mkEnableOption "Enable regular btrfs scrub"; - system.fsPackages = [ pkgs.btrfs-progs ]; + fileSystems = mkOption { + type = types.listOf types.path; + example = [ "/" ]; + description = '' + List of paths to btrfs filesystems to regularily call btrfs scrub on. + Defaults to all mount points with btrfs filesystems. + If you mount a filesystem multiple times or additionally mount subvolumes, + you need to manually specify this list to avoid scrubbing multiple times. + ''; + }; - boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ]; + interval = mkOption { + default = "monthly"; + type = types.str; + example = "weekly"; + description = '' + Systemd calendar expression for when to scrub btrfs filesystems. + The recommended period is a month but could be less + (btrfs-scrub + 8). + See + systemd.time + 7 + for more information on the syntax. + ''; + }; + + }; + }; - boot.initrd.extraUtilsCommands = mkIf inInitrd + config = mkMerge [ + (mkIf enableBtrfs { + system.fsPackages = [ pkgs.btrfs-progs ]; + + boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ]; + + boot.initrd.extraUtilsCommands = mkIf inInitrd '' copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs ln -sv btrfs $out/bin/btrfsck ln -sv btrfsck $out/bin/fsck.btrfs ''; - boot.initrd.extraUtilsCommandsTest = mkIf inInitrd + boot.initrd.extraUtilsCommandsTest = mkIf inInitrd '' $out/bin/btrfs --version ''; - boot.initrd.postDeviceCommands = mkIf inInitrd + boot.initrd.postDeviceCommands = mkIf inInitrd '' btrfs device scan ''; - }; + }) + + (mkIf enableAutoScrub { + assertions = [ + { + assertion = cfgScrub.enable -> (cfgScrub.fileSystems != []); + message = '' + If 'services.btrfs.autoScrub' is enabled, you need to have at least one + btrfs file system mounted via 'fileSystems' or specify a list manually + in 'services.btrfs.autoScrub.fileSystems'. + ''; + } + ]; + + # This will yield duplicated units if the user mounts a filesystem multiple times + # or additionally mounts subvolumes, but going the other way around via devices would + # yield duplicated units when a filesystem spans multiple devices. + # This way around seems like the more sensible default. + services.btrfs.autoScrub.fileSystems = mkDefault (mapAttrsToList (name: fs: fs.mountPoint) + (filterAttrs (name: fs: fs.fsType == "btrfs") config.fileSystems)); + + # TODO: Did not manage to do it via the usual btrfs-scrub@.timer/.service + # template units due to problems enabling the parameterized units, + # so settled with many units and templating via nix for now. + # https://github.com/NixOS/nixpkgs/pull/32496#discussion_r156527544 + systemd.timers = let + scrubTimer = fs: let + fs' = utils.escapeSystemdPath fs; + in nameValuePair "btrfs-scrub-${fs'}" { + description = "regular btrfs scrub timer on ${fs}"; + + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfgScrub.interval; + AccuracySec = "1d"; + Persistent = true; + }; + }; + in listToAttrs (map scrubTimer cfgScrub.fileSystems); + + systemd.services = let + scrubService = fs: let + fs' = utils.escapeSystemdPath fs; + in nameValuePair "btrfs-scrub-${fs'}" { + description = "btrfs scrub on ${fs}"; + + serviceConfig = { + Type = "oneshot"; + Nice = 19; + IOSchedulingClass = "idle"; + ExecStart = "${pkgs.btrfs-progs}/bin/btrfs scrub start -B ${fs}"; + }; + }; + in listToAttrs (map scrubService cfgScrub.fileSystems); + }) + ]; } diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix index 963bc940b4fa110f04eb058518ec04669ef6d9d8..1527f993fdd4ff68cf9af70f0298ed12a77bf07a 100644 --- a/nixos/modules/tasks/filesystems/exfat.nix +++ b/nixos/modules/tasks/filesystems/exfat.nix @@ -5,7 +5,7 @@ with lib; { config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { - system.fsPackages = [ pkgs.exfat-utils pkgs.fuse_exfat ]; + system.fsPackages = [ pkgs.exfat ]; }; } diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 7fee99115329fc90d7e330ba6327b6379b529164..c3bf897d51fdd95aefab78a8bf34b351623bb2d4 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -24,7 +24,11 @@ let kernel = config.boot.kernelPackages; - packages = if config.boot.zfs.enableUnstable then { + packages = if config.boot.zfs.enableLegacyCrypto then { + spl = kernel.splLegacyCrypto; + zfs = kernel.zfsLegacyCrypto; + zfsUser = pkgs.zfsLegacyCrypto; + } else if config.boot.zfs.enableUnstable then { spl = kernel.splUnstable; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; @@ -75,6 +79,27 @@ in ''; }; + enableLegacyCrypto = mkOption { + type = types.bool; + default = false; + description = '' + Enabling this option will allow you to continue to use the old format for + encrypted datasets. With the inclusion of stability patches the format of + encrypted datasets has changed. They can still be accessed and mounted but + in read-only mode mounted. It is highly recommended to convert them to + the new format. + + This option is only for convenience to people that cannot convert their + datasets to the new format yet and it will be removed in due time. + + For migration strategies from old format to this new one, check the Wiki: + https://nixos.wiki/wiki/NixOS_on_ZFS#Encrypted_Dataset_Format_Change + + See https://github.com/zfsonlinux/zfs/pull/6864 for more details about + the stability patches. + ''; + }; + extraPools = mkOption { type = types.listOf types.str; default = []; @@ -268,7 +293,7 @@ in assertions = [ { assertion = config.networking.hostId != null; - message = "ZFS requires config.networking.hostId to be set"; + message = "ZFS requires networking.hostId to be set"; } { assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot; @@ -280,6 +305,8 @@ in } ]; + virtualisation.lxd.zfsSupport = true; + boot = { kernelModules = [ "spl" "zfs" ] ; extraModulePackages = with packages; [ spl zfs ]; @@ -427,7 +454,7 @@ in }) snapshotNames); systemd.timers = let - timer = name: if name == "frequent" then "*:15,30,45" else name; + timer = name: if name == "frequent" then "*:0,15,30,45" else name; in builtins.listToAttrs (map (snapName: { name = "zfs-snapshot-${snapName}"; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 7fb3cbc5c1bc16f756e8531114cb5968b0709f86..fbe42b8e8f04d4d4a99228477e9e4412237da4f9 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -13,7 +13,7 @@ let isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale); optimizedKeymap = pkgs.runCommand "keymap" { - nativeBuildInputs = [ pkgs.kbd ]; + nativeBuildInputs = [ pkgs.buildPackages.kbd ]; LOADKEYS_KEYMAP_PATH = "${kbdEnv}/share/keymaps/**"; } '' loadkeys -b ${optionalString isUnicode "-u"} "${config.i18n.consoleKeyMap}" > $out diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 1f424f84c6e0124aca5d77520326584be7c5ba13..e754a1e8718d5fed52a519c894a2f5eba757bd03 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -20,14 +20,8 @@ let "sys-subsystem-net-devices-${escapeSystemdPath interface}.device"; interfaceIps = i: - i.ip4 ++ optionals cfg.enableIPv6 i.ip6 - ++ optional (i.ipAddress != null) { - address = i.ipAddress; - prefixLength = i.prefixLength; - } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) { - address = i.ipv6Address; - prefixLength = i.ipv6PrefixLength; - }; + i.ipv4.addresses + ++ optionals cfg.enableIPv6 i.ipv6.addresses; destroyBond = i: '' while true; do @@ -74,13 +68,12 @@ let (hasAttr dev cfg.macvlans) || (hasAttr dev cfg.sits) || (hasAttr dev cfg.vlans) || - (hasAttr dev cfg.vswitches) || - (hasAttr dev cfg.wlanInterfaces) + (hasAttr dev cfg.vswitches) then [ "${dev}-netdev.service" ] else optional (dev != null && dev != "lo" && !config.boot.isContainer) (subsystemDevice dev); hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "") - || (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != ""); + || (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != ""); networkLocalCommands = { after = [ "network-setup.service" ]; @@ -185,33 +178,58 @@ let path = [ pkgs.iproute ]; script = '' - # FIXME: shouldn't this be done in network-link? - echo "bringing up interface..." - ip link set "${i.name}" up - state="/run/nixos/network/addresses/${i.name}" + mkdir -p $(dirname "$state") + ${flip concatMapStrings ips (ip: + let + cidr = "${ip.address}/${toString ip.prefixLength}"; + in + '' + echo "${cidr}" >> $state + echo -n "adding address ${cidr}... " + if out=$(ip addr add "${cidr}" dev "${i.name}" 2>&1); then + echo "done" + elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then + echo "'ip addr add "${cidr}" dev "${i.name}"' failed: $out" + exit 1 + fi + '' + )} + + state="/run/nixos/network/routes/${i.name}" mkdir -p $(dirname "$state") - '' + flip concatMapStrings (ips) (ip: - let - address = "${ip.address}/${toString ip.prefixLength}"; - in - '' - echo "${address}" >> $state - if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then - echo "added ip ${address}" - elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then - echo "failed to add ${address}" - exit 1 - fi - ''); + ${flip concatMapStrings (i.ipv4.routes ++ i.ipv6.routes) (route: + let + cidr = "${route.address}/${toString route.prefixLength}"; + via = optionalString (route.via != null) ''via "${route.via}"''; + options = concatStrings (mapAttrsToList (name: val: "${name} ${val} ") route.options); + in + '' + echo "${cidr}" >> $state + echo -n "adding route ${cidr}... " + if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" 2>&1); then + echo "done" + elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then + echo "'ip route add "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out" + exit 1 + fi + '' + )} + ''; preStop = '' + state="/run/nixos/network/routes/${i.name}" + while read cidr; do + echo -n "deleting route $cidr... " + ip route del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed" + done < "$state" + rm -f "$state" + 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 "" + while read cidr; do + echo -n "deleting address $cidr... " + ip addr del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed" done < "$state" rm -f "$state" ''; @@ -230,9 +248,7 @@ let RemainAfterExit = true; }; script = '' - ip tuntap add dev "${i.name}" \ - ${optionalString (i.virtualType != null) "mode ${i.virtualType}"} \ - user "${i.virtualOwner}" + ip tuntap add dev "${i.name}" mode "${i.virtualType}" user "${i.virtualOwner}" ''; postStop = '' ip link del ${i.name} || true @@ -271,6 +287,17 @@ let ${i} '')}" > /run/${n}.interfaces + ${optionalString config.virtualisation.libvirtd.enable '' + # Enslave dynamically added interfaces which may be lost on nixos-rebuild + for uri in qemu:///system lxc:///; do + for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do + ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \ + ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \ + ${pkgs.bash}/bin/bash + done + done + ''} + # Enable stp on the interface ${optionalString v.rstp '' echo 2 >/sys/class/net/${n}/bridge/stp_state diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index a365a01bfb1ed5f70f4e4c466e178be2eb5d3003..c640e886fca855bc5727cb1a2fed8201cb5c260c 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -9,14 +9,8 @@ let interfaces = attrValues cfg.interfaces; interfaceIps = i: - i.ip4 ++ optionals cfg.enableIPv6 i.ip6 - ++ optional (i.ipAddress != null) { - address = i.ipAddress; - prefixLength = i.prefixLength; - } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) { - address = i.ipv6Address; - prefixLength = i.ipv6PrefixLength; - }; + i.ipv4.addresses + ++ optionals cfg.enableIPv6 i.ipv6.addresses; dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "none"; @@ -74,27 +68,24 @@ in networks."99-main" = genericNetwork mkDefault; } (mkMerge (flip map interfaces (i: { - netdevs = mkIf i.virtual ( - let - devType = if i.virtualType != null then i.virtualType - else (if hasPrefix "tun" i.name then "tun" else "tap"); - in { - "40-${i.name}" = { - netdevConfig = { - Name = i.name; - Kind = devType; - }; - "${devType}Config" = optionalAttrs (i.virtualOwner != null) { - User = i.virtualOwner; - }; + netdevs = mkIf i.virtual ({ + "40-${i.name}" = { + netdevConfig = { + Name = i.name; + Kind = i.virtualType; + }; + "${i.virtualType}Config" = optionalAttrs (i.virtualOwner != null) { + User = i.virtualOwner; }; - }); + }; + }); networks."40-${i.name}" = mkMerge [ (genericNetwork mkDefault) { name = mkDefault i.name; DHCP = mkForce (dhcpStr (if i.useDHCP != null then i.useDHCP else cfg.useDHCP && interfaceIps i == [ ])); address = flip map (interfaceIps i) (ip: "${ip.address}/${toString ip.prefixLength}"); + networkConfig.IPv6PrivacyExtensions = "kernel"; } ]; }))) (mkMerge (flip mapAttrsToList cfg.bridges (name: bridge: { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index b7e85e402aa9e766c13e89175a9b1d69a17c8084..14f9b95675151fd1bccbeffcf0ec2367f01f1bb5 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, utils, stdenv, ... }: +{ config, options, lib, pkgs, utils, stdenv, ... }: with lib; with utils; @@ -26,7 +26,7 @@ let executable = true; destination = "/bin/bridge-stp"; text = '' - #!${pkgs.stdenv.shell} -e + #!${pkgs.runtimeShell} -e export PATH="${pkgs.mstpd}/bin" BRIDGES=(${concatStringsSep " " (attrNames rstpBridges)}) @@ -62,35 +62,6 @@ let then mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n==device) interfaces) ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces) else mapAttrsToList (n: v: v // {_iName = n;}) interfaces; - # udev script that configures a physical wlan device and adds virtual interfaces - wlanDeviceUdevScript = device: interfaceList: pkgs.writeScript "wlan-${device}-udev-script" '' - #!${pkgs.stdenv.shell} - - # Change the wireless phy device to a predictable name. - if [ -e "/sys/class/net/${device}/phy80211/name" ]; then - ${pkgs.iw}/bin/iw phy `${pkgs.coreutils}/bin/cat /sys/class/net/${device}/phy80211/name` set name ${device} || true - fi - - # Crate new, virtual interfaces and configure them at the same time - ${flip concatMapStrings (drop 1 interfaceList) (i: '' - ${pkgs.iw}/bin/iw dev ${device} interface add ${i._iName} type ${i.type} \ - ${optionalString (i.type == "mesh" && i.meshID != null) "mesh_id ${i.meshID}"} \ - ${optionalString (i.type == "monitor" && i.flags != null) "flags ${i.flags}"} \ - ${optionalString (i.type == "managed" && i.fourAddr != null) "4addr ${if i.fourAddr then "on" else "off"}"} \ - ${optionalString (i.mac != null) "addr ${i.mac}"} - '')} - - # Reconfigure and rename the default interface that already exists - ${flip concatMapStrings (take 1 interfaceList) (i: '' - ${pkgs.iw}/bin/iw dev ${device} set type ${i.type} - ${optionalString (i.type == "mesh" && i.meshID != null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${i.meshID}"} - ${optionalString (i.type == "monitor" && i.flags != null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${i.flags}"} - ${optionalString (i.type == "managed" && i.fourAddr != null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if i.fourAddr then "on" else "off"}"} - ${optionalString (i.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${i.mac}"} - ${optionalString (device != i._iName) "${pkgs.iproute}/bin/ip link set dev ${device} name ${i._iName}"} - '')} - ''; - # We must escape interfaces due to the systemd interpretation subsystemDevice = interface: "sys-subsystem-net-devices-${escapeSystemdPath interface}.device"; @@ -101,7 +72,7 @@ let address = mkOption { type = types.str; description = '' - IPv${toString v} address of the interface. Leave empty to configure the + IPv${toString v} address of the interface. Leave empty to configure the interface using DHCP. ''; }; @@ -116,6 +87,40 @@ let }; }; + routeOpts = v: + { options = { + address = mkOption { + type = types.str; + description = "IPv${toString v} address of the network."; + }; + + prefixLength = mkOption { + type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + description = '' + Subnet mask of the network, specified as the number of + bits in the prefix (${if v == 4 then "24" else "64"}). + ''; + }; + + via = mkOption { + type = types.nullOr types.str; + default = null; + description = "IPv${toString v} address of the next hop."; + }; + + options = mkOption { + type = types.attrsOf types.str; + default = { }; + example = { mtu = "1492"; window = "524288"; }; + description = '' + Other route options. See the symbol OPTIONS + in the ip-route(8) manual page for the details. + ''; + }; + + }; + }; + gatewayCoerce = address: { inherit address; }; gatewayOpts = { ... }: { @@ -148,13 +153,22 @@ let interfaceOpts = { name, ... }: { options = { - name = mkOption { example = "eth0"; type = types.str; description = "Name of the interface."; }; + preferTempAddress = mkOption { + type = types.bool; + default = cfg.enableIPv6; + defaultText = literalExample "config.networking.enableIPv6"; + description = '' + When using SLAAC prefer a temporary (IPv6) address over the EUI-64 + address for originating connections. This is used to reduce tracking. + ''; + }; + useDHCP = mkOption { type = types.nullOr types.bool; default = null; @@ -165,7 +179,7 @@ let ''; }; - ip4 = mkOption { + ipv4.addresses = mkOption { default = [ ]; example = [ { address = "10.0.0.1"; prefixLength = 16; } @@ -177,7 +191,7 @@ let ''; }; - ip6 = mkOption { + ipv6.addresses = mkOption { default = [ ]; example = [ { address = "fdfd:b3f0:482::1"; prefixLength = 48; } @@ -189,50 +203,27 @@ let ''; }; - ipAddress = mkOption { - default = null; - example = "10.0.0.1"; - type = types.nullOr types.str; - description = '' - IP address of the interface. Leave empty to configure the - interface using DHCP. - ''; - }; - - prefixLength = mkOption { - default = null; - example = 24; - type = types.nullOr types.int; - description = '' - Subnet mask of the interface, specified as the number of - bits in the prefix (24). - ''; - }; - - subnetMask = mkOption { - default = null; - description = '' - Defunct, supply the prefix length instead. - ''; - }; - - ipv6Address = mkOption { - default = null; - example = "2001:1470:fffd:2098::e006"; - type = types.nullOr types.str; + ipv4.routes = mkOption { + default = []; + example = [ + { address = "10.0.0.0"; prefixLength = 16; } + { address = "192.168.2.0"; prefixLength = 24; via = "192.168.1.1"; } + ]; + type = with types; listOf (submodule (routeOpts 4)); description = '' - IPv6 address of the interface. Leave empty to configure the - interface using NDP. + List of extra IPv4 static routes that will be assigned to the interface. ''; }; - ipv6PrefixLength = mkOption { - default = 64; - example = 64; - type = types.int; + ipv6.routes = mkOption { + default = []; + example = [ + { address = "fdfd:b3f0::"; prefixLength = 48; } + { address = "2001:1470:fffd:2098::"; prefixLength = 64; via = "fdfd:b3f0::1"; } + ]; + type = with types; listOf (submodule (routeOpts 6)); description = '' - Subnet mask of the interface, specified as the number of - bits in the prefix (64). + List of extra IPv6 static routes that will be assigned to the interface. ''; }; @@ -273,11 +264,13 @@ let }; virtualType = mkOption { - default = null; - type = with types; nullOr (enum [ "tun" "tap" ]); + default = if hasPrefix "tun" name then "tun" else "tap"; + defaultText = literalExample ''if hasPrefix "tun" name then "tun" else "tap"''; + type = with types; enum [ "tun" "tap" ]; description = '' - The explicit type of interface to create. Accepts tun or tap strings. - Also accepts null to implicitly detect the type of device. + The type of interface to create. + The default is TUN for an interface name starting + with "tun", otherwise TAP. ''; }; @@ -305,6 +298,32 @@ let name = mkDefault name; }; + # Renamed or removed options + imports = + let + defined = x: x != "_mkMergedOptionModule"; + in [ + (mkRenamedOptionModule [ "ip4" ] [ "ipv4" "addresses"]) + (mkRenamedOptionModule [ "ip6" ] [ "ipv6" "addresses"]) + (mkRemovedOptionModule [ "subnetMask" ] '' + Supply a prefix length instead; use option + networking.interfaces..ipv{4,6}.addresses'') + (mkMergedOptionModule + [ [ "ipAddress" ] [ "prefixLength" ] ] + [ "ipv4" "addresses" ] + (cfg: with cfg; + optional (defined ipAddress && defined prefixLength) + { address = ipAddress; prefixLength = prefixLength; })) + (mkMergedOptionModule + [ [ "ipv6Address" ] [ "ipv6PrefixLength" ] ] + [ "ipv6" "addresses" ] + (cfg: with cfg; + optional (defined ipv6Address && defined ipv6PrefixLength) + { address = ipv6Address; prefixLength = ipv6PrefixLength; })) + + ({ options.warnings = options.warnings; }) + ]; + }; hexChars = stringToCharacters "0123456789abcdef"; @@ -441,7 +460,7 @@ in networking.interfaces = mkOption { default = {}; example = - { eth0.ip4 = [ { + { eth0.ipv4.addresses = [ { address = "131.211.84.78"; prefixLength = 25; } ]; @@ -920,13 +939,10 @@ in config = { + warnings = concatMap (i: i.warnings) interfaces; + assertions = (flip map interfaces (i: { - assertion = i.subnetMask == null; - message = '' - The networking.interfaces."${i.name}".subnetMask option is defunct. Use prefixLength instead. - ''; - })) ++ (flip map interfaces (i: { # With the linux kernel, interface name length is limited by IFNAMSIZ # to 16 bytes, including the trailing null byte. # See include/linux/if.h in the kernel sources @@ -935,10 +951,15 @@ in The name of networking.interfaces."${i.name}" is too long, it needs to be less than 16 characters. ''; })) ++ (flip map slaveIfs (i: { - assertion = i.ip4 == [ ] && i.ipAddress == null && i.ip6 == [ ] && i.ipv6Address == null; + assertion = i.ipv4.addresses == [ ] && i.ipv6.addresses == [ ]; message = '' The networking.interfaces."${i.name}" must not have any defined ips when it is a slave. ''; + })) ++ (flip map interfaces (i: { + assertion = i.preferTempAddress -> cfg.enableIPv6; + message = '' + Temporary addresses are only needed when IPv6 is enabled. + ''; })) ++ [ { assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId); @@ -961,9 +982,10 @@ in "net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6); "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6); "net.ipv6.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces); - } // listToAttrs (concatLists (flip map (filter (i: i.proxyARP) interfaces) - (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true)) - )); + } // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces) + (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true))) + // listToAttrs (flip map (filter (i: i.preferTempAddress) interfaces) + (i: nameValuePair "net.ipv6.conf.${i.name}.use_tempaddr" 2)); # Capabilities won't work unless we have at-least a 4.3 Linux # kernel because we need the ambient capability @@ -1071,6 +1093,9 @@ in '' + optionalString (i.mtu != null) '' echo "setting MTU to ${toString i.mtu}..." ip link set "${i.name}" mtu "${toString i.mtu}" + '' + '' + echo -n "bringing up interface... " + ip link set "${i.name}" up && echo "done" || (echo "failed"; exit 1) ''; }))); @@ -1104,7 +1129,7 @@ in # The script creates the required, new WLAN interfaces interfaces and configures the # existing, default interface. curInterfaceScript = device: current: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${device}.sh" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} # Change the wireless phy device to a predictable name. ${pkgs.iw}/bin/iw phy `${pkgs.coreutils}/bin/cat /sys/class/net/$INTERFACE/phy80211/name` set name ${device} @@ -1123,7 +1148,7 @@ in # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface. newInterfaceScript = device: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} # Configure the new interface ${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type} ${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${new.meshID}"} diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 7f5b55d5cca0936c3fef88245759edc977dcc0e4..41dec2af9ed431e94052b13e41e558b31c875119 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -4,8 +4,11 @@ { config, lib, pkgs, ... }: with lib; +with import ../../lib/qemu-flags.nix { inherit pkgs; }; -let kernel = config.boot.kernelPackages.kernel; in +let + kernel = config.boot.kernelPackages.kernel; +in { @@ -22,8 +25,8 @@ let kernel = config.boot.kernelPackages.kernel; in systemd.services.backdoor = { wantedBy = [ "multi-user.target" ]; - requires = [ "dev-hvc0.device" "dev-ttyS0.device" ]; - after = [ "dev-hvc0.device" "dev-ttyS0.device" ]; + requires = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ]; + after = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ]; script = '' export USER=root @@ -40,7 +43,7 @@ let kernel = config.boot.kernelPackages.kernel; in cd /tmp exec < /dev/hvc0 > /dev/hvc0 - while ! exec 2> /dev/ttyS0; do sleep 0.1; done + while ! exec 2> /dev/${qemuSerialDevice}; do sleep 0.1; done echo "connecting to host..." >&2 stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion echo @@ -49,10 +52,10 @@ let kernel = config.boot.kernelPackages.kernel; in serviceConfig.KillSignal = "SIGHUP"; }; - # Prevent agetty from being instantiated on ttyS0, since it - # interferes with the backdoor (writes to ttyS0 will randomly fail + # Prevent agetty from being instantiated on the serial device, since it + # interferes with the backdoor (writes to it will randomly fail # with EIO). Likewise for hvc0. - systemd.services."serial-getty@ttyS0".enable = false; + systemd.services."serial-getty@${qemuSerialDevice}".enable = false; systemd.services."serial-getty@hvc0".enable = false; boot.initrd.preDeviceCommands = @@ -88,7 +91,7 @@ let kernel = config.boot.kernelPackages.kernel; in # Panic if an error occurs in stage 1 (rather than waiting for # user intervention). boot.kernelParams = - [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; + [ "console=${qemuSerialDevice}" "panic=1" "boot.panic_on_fail" ]; # `xwininfo' is used by the test driver to query open windows. environment.systemPackages = [ pkgs.xorg.xwininfo ]; @@ -122,7 +125,7 @@ let kernel = config.boot.kernelPackages.kernel; in # Make it easy to log in as root when running the test interactively. users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; - services.xserver.displayManager.logToJournal = true; + services.xserver.displayManager.job.logToJournal = true; }; } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 1eb3ca707afd0ae7cdf82489f4472e5e8d06defb..f74c42a777f53a069405191754a24579a026a78c 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -11,7 +11,7 @@ with lib; let cfg = config.ec2; in { - imports = [ ../profiles/headless.nix ./ec2-data.nix ./grow-partition.nix ./amazon-init.nix ]; + imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-init.nix ]; config = { @@ -21,7 +21,7 @@ let cfg = config.ec2; in } ]; - virtualisation.growPartition = cfg.hvm; + boot.growPartition = cfg.hvm; fileSystems."/" = { device = "/dev/disk/by-label/nixos"; @@ -152,5 +152,8 @@ let cfg = config.ec2; in environment.systemPackages = [ pkgs.cryptsetup ]; boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; + + # EC2 has its own NTP server provided by the hypervisor + networking.timeServers = [ "169.254.169.123" ]; }; } diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index a7362423eb467daf09e45825d44b12356a4b6e28..8032b2c6d7ca4cee85a47018d13078cb84ab8b3b 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -2,7 +2,7 @@ let script = '' - #!${pkgs.stdenv.shell} -eu + #!${pkgs.runtimeShell} -eu echo "attempting to fetch configuration from EC2 user data..." diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index 6817eb837a018a552e548843e008d55777f9e796..b7ab54aab7ec8aaac2d6ce7b84d0f24dcc06a732 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -47,7 +47,7 @@ let }; provisionedHook = pkgs.writeScript "provisioned-hook" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} ${config.systemd.package}/bin/systemctl start provisioned.target ''; @@ -66,6 +66,10 @@ in default = false; description = "Whether to enable verbose logging."; }; + mountResourceDisk = mkOption { + default = true; + description = "Whether the agent should format (ext4) and mount the resource disk to /mnt/resource."; + }; }; ###### implementation @@ -112,7 +116,7 @@ in Provisioning.ExecuteCustomData=n # Format if unformatted. If 'n', resource disk will not be mounted. - ResourceDisk.Format=y + ResourceDisk.Format=${if cfg.mountResourceDisk then "y" else "n"} # File system on the resource disk # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. @@ -181,7 +185,7 @@ in after = [ "network-online.target" "sshd.service" ]; wants = [ "network-online.target" ]; - path = [ pkgs.e2fsprogs ]; + path = [ pkgs.e2fsprogs pkgs.bash ]; description = "Windows Azure Agent Service"; unitConfig.ConditionPathExists = "/etc/waagent.conf"; serviceConfig = { diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index 08bbcfd9d7c22bd86cd971f9e8f0cb58737b2196..39a655b4c104e9e3d4a0146f8ecd39fd130a04dc 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -26,7 +26,7 @@ in rm $diskImageBase popd ''; - diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; + diskImageBase = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.system}.raw"; buildInputs = [ pkgs.utillinux pkgs.perl ]; exportReferencesGraph = [ "closure" config.system.build.toplevel ]; diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index b4f9d8b6fc1780c263fb8fc95b061b593417bfff..5e368acd6d8b5e1d512c07ee5e0c1b5aea47921f 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -11,7 +11,7 @@ with lib; services.udisks2.enable = mkDefault false; powerManagement.enable = mkDefault false; - networking.useHostResolvConf = true; + networking.useHostResolvConf = mkDefault true; # Containers should be light-weight, so start sshd on demand. services.openssh.startWhenNeeded = mkDefault true; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index e68bfd86060109d678a3b9a98fd1cda9f4ed0126..248c2fc1fb2387f8d548b967640f59e49b00cd4c 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -33,7 +33,7 @@ let in pkgs.writeScript "container-init" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e # Initialise the container side of the veth pair. if [ "$PRIVATE_NETWORK" = 1 ]; then @@ -112,7 +112,7 @@ let # If the host is 64-bit and the container is 32-bit, add a # --personality flag. - ${optionalString (config.nixpkgs.system == "x86_64-linux") '' + ${optionalString (config.nixpkgs.localSystem.system == "x86_64-linux") '' if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then extraFlags+=" --personality=x86" fi @@ -223,7 +223,7 @@ let serviceDirectives = cfg: { ExecReload = pkgs.writeScript "reload-container" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \ bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test" ''; @@ -255,7 +255,7 @@ let }; - system = config.nixpkgs.system; + system = config.nixpkgs.localSystem.system; bindMountOpts = { name, config, ... }: { @@ -575,6 +575,16 @@ in ''; }; + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--drop-capability=CAP_SYS_CHROOT" ]; + description = '' + Extra flags passed to the systemd-nspawn command. + See systemd-nspawn(1) for details. + ''; + }; + } // networkOptions; config = mkMerge @@ -714,7 +724,9 @@ in ${optionalString cfg.autoStart '' AUTO_START=1 ''} - EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts}" + EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts + + optionalString (cfg.extraFlags != []) + (" " + concatStringsSep " " cfg.extraFlags)}" ''; }) config.containers; @@ -726,6 +738,11 @@ in networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ]; + services.udev.extraRules = optionalString config.networking.networkmanager.enable '' + # Don't manage interfaces created by nixos-container. + ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1" + ''; + environment.systemPackages = [ pkgs.nixos-container ]; }); } diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 14826b6272f7c83cf38f7655a91002314c81258f..baffad79b0019ffac7853ca77a7fa47a47ca7186 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -223,21 +223,39 @@ let self = { "17.03".us-west-2.hvm-ebs = "ami-a93daac9"; "17.03".us-west-2.hvm-s3 = "ami-5139ae31"; - # 17.09.1483.d0f0657ca0 - "17.09".eu-west-1.hvm-ebs = "ami-cf33e7b6"; - "17.09".eu-west-2.hvm-ebs = "ami-7d061419"; - "17.09".eu-central-1.hvm-ebs = "ami-7548fa1a"; - "17.09".us-east-1.hvm-ebs = "ami-6f669d15"; - "17.09".us-east-2.hvm-ebs = "ami-cbe1ccae"; - "17.09".us-west-1.hvm-ebs = "ami-9d95a5fd"; - "17.09".us-west-2.hvm-ebs = "ami-d3956fab"; - "17.09".ca-central-1.hvm-ebs = "ami-ee4ef78a"; - "17.09".ap-southeast-1.hvm-ebs = "ami-1dfc807e"; - "17.09".ap-southeast-2.hvm-ebs = "ami-dcb350be"; - "17.09".ap-northeast-1.hvm-ebs = "ami-00ec3d66"; - "17.09".ap-northeast-2.hvm-ebs = "ami-1107dd7f"; - "17.09".sa-east-1.hvm-ebs = "ami-0377086f"; - "17.09".ap-south-1.hvm-ebs = "ami-4a064625"; + # 17.09.2681.59661f21be6 + "17.09".eu-west-1.hvm-ebs = "ami-a30192da"; + "17.09".eu-west-2.hvm-ebs = "ami-295a414d"; + "17.09".eu-west-3.hvm-ebs = "ami-8c0eb9f1"; + "17.09".eu-central-1.hvm-ebs = "ami-266cfe49"; + "17.09".us-east-1.hvm-ebs = "ami-40bee63a"; + "17.09".us-east-2.hvm-ebs = "ami-9d84aff8"; + "17.09".us-west-1.hvm-ebs = "ami-d14142b1"; + "17.09".us-west-2.hvm-ebs = "ami-3eb40346"; + "17.09".ca-central-1.hvm-ebs = "ami-ca8207ae"; + "17.09".ap-southeast-1.hvm-ebs = "ami-84bccff8"; + "17.09".ap-southeast-2.hvm-ebs = "ami-0dc5386f"; + "17.09".ap-northeast-1.hvm-ebs = "ami-89b921ef"; + "17.09".ap-northeast-2.hvm-ebs = "ami-179b3b79"; + "17.09".sa-east-1.hvm-ebs = "ami-4762202b"; + "17.09".ap-south-1.hvm-ebs = "ami-4e376021"; - latest = self."17.09"; + # 18.03.131792.becbe4dbe16 + "18.03".eu-west-1.hvm-ebs = "ami-cda4fab4"; + "18.03".eu-west-2.hvm-ebs = "ami-d96786be"; + "18.03".eu-west-3.hvm-ebs = "ami-6b0cba16"; + "18.03".eu-central-1.hvm-ebs = "ami-5e2b75b5"; + "18.03".us-east-1.hvm-ebs = "ami-d464cba9"; + "18.03".us-east-2.hvm-ebs = "ami-fd221298"; + "18.03".us-west-1.hvm-ebs = "ami-ff0d1d9f"; + "18.03".us-west-2.hvm-ebs = "ami-c05c3bb8"; + "18.03".ca-central-1.hvm-ebs = "ami-cc72f4a8"; + "18.03".ap-southeast-1.hvm-ebs = "ami-b61633ca"; + "18.03".ap-southeast-2.hvm-ebs = "ami-530fc131"; + "18.03".ap-northeast-1.hvm-ebs = "ami-90d6c0ec"; + "18.03".ap-northeast-2.hvm-ebs = "ami-a1248bcf"; + "18.03".sa-east-1.hvm-ebs = "ami-b090c6dc"; + "18.03".ap-south-1.hvm-ebs = "ami-32c9ec5d"; + + latest = self."18.03"; }; in self diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index e3b3e6a5f4ab8735ef38f9cd1ce9e122f60e87d0..0b6bec786da4c4774b7ad4cfd961cc01b156a8f7 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -2,11 +2,11 @@ with lib; let - diskSize = 1024; # MB + diskSize = 1536; # MB gce = pkgs.google-compute-engine; in { - imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ]; + imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; @@ -14,7 +14,7 @@ in 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 + tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.system}.raw.tar.gz disk.raw rm $out/disk.raw popd ''; @@ -29,6 +29,7 @@ in autoResize = true; }; + boot.growPartition = true; boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; boot.initrd.kernelModules = [ "virtio_scsi" ]; boot.kernelModules = [ "virtio_pci" "virtio_net" ]; @@ -56,6 +57,12 @@ in # Always include cryptsetup so that NixOps can use it. environment.systemPackages = [ pkgs.cryptsetup ]; + # Make sure GCE image does not replace host key that NixOps sets + environment.etc."default/instance_configs.cfg".text = lib.mkDefault '' + [InstanceSetup] + set_host_keys = false + ''; + # Rely on GCP's firewall instead networking.firewall.enable = mkDefault false; @@ -68,6 +75,9 @@ in networking.usePredictableInterfaceNames = false; + # GC has 1460 MTU + networking.interfaces.eth0.mtu = 1460; + # allow the google-accounts-daemon to manage users users.mutableUsers = true; # and allow users to sudo without password @@ -211,7 +221,7 @@ in 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 + ${wget} -O $AUTH_KEYS --header="Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys if [ -s $AUTH_KEYS ]; then # Read in key one by one, split in case Google decided diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix index 2cb932d208f0f53941dd7c7010a4372b8f5133d2..444c0bc1630e6e286f20c1f19e4ec50a3cd1f82e 100644 --- a/nixos/modules/virtualisation/grow-partition.nix +++ b/nixos/modules/virtualisation/grow-partition.nix @@ -1,48 +1,3 @@ -# This module automatically grows the root partition on virtual machines. -# This allows an instance to be created with a bigger root filesystem -# than provided by the machine image. - -{ config, lib, pkgs, ... }: - -with lib; - -{ - - options = { - - virtualisation.growPartition = mkOption { - type = types.bool; - default = true; - }; - - }; - - config = mkIf config.virtualisation.growPartition { - - boot.initrd.extraUtilsCommands = '' - copy_bin_and_libs ${pkgs.gawk}/bin/gawk - copy_bin_and_libs ${pkgs.gnused}/bin/sed - copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk - copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk - - substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \ - --replace "${pkgs.bash}/bin/sh" "/bin/sh" \ - --replace "awk" "gawk" \ - --replace "sed" "gnused" - - ln -s sed $out/bin/gnused - ''; - - boot.initrd.postDeviceCommands = '' - rootDevice="${config.fileSystems."/".device}" - if [ -e "$rootDevice" ]; then - rootDevice="$(readlink -f "$rootDevice")" - parentDevice="$(lsblk -npo PKNAME "$rootDevice")" - TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}" - udevadm settle - fi - ''; - - }; - -} +# This profile is deprecated, use boot.growPartition directly. +builtins.trace "the profile is deprecated, use boot.growPartition instead" +{ } diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix new file mode 100644 index 0000000000000000000000000000000000000000..ecd2a8117710fea7a2b9370434b59a0dc8fbacc3 --- /dev/null +++ b/nixos/modules/virtualisation/hyperv-guest.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.hypervGuest; + +in { + options = { + virtualisation.hypervGuest = { + enable = mkEnableOption "Hyper-V Guest Support"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ config.boot.kernelPackages.hyperv-daemons.bin ]; + + security.rngd.enable = false; + + # enable hotadding memory + services.udev.packages = lib.singleton (pkgs.writeTextFile { + name = "hyperv-memory-hotadd-udev-rules"; + destination = "/etc/udev/rules.d/99-hyperv-memory-hotadd.rules"; + text = '' + ACTION="add", SUBSYSTEM=="memory", ATTR{state}="online" + ''; + }); + + systemd = { + packages = [ config.boot.kernelPackages.hyperv-daemons.lib ]; + + targets.hyperv-daemons = { + wantedBy = [ "multi-user.target" ]; + }; + }; + }; +} diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 8aa7ad8e3911cf2c84c0d20880476a350eae4468..024db7f87c2e8ea2fab803477de8186a88ea31b5 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -37,11 +37,13 @@ in { ''; }; - virtualisation.libvirtd.enableKVM = mkOption { - type = types.bool; - default = true; + virtualisation.libvirtd.qemuPackage = mkOption { + type = types.package; + default = pkgs.qemu; description = '' - This option enables support for QEMU/KVM in libvirtd. + Qemu package to use with libvirt. + `pkgs.qemu` can emulate alien architectures (e.g. aarch64 on x86) + `pkgs.qemu_kvm` saves disk space allowing to emulate only host architectures. ''; }; @@ -102,7 +104,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ libvirt netcat-openbsd qemu_kvm ]; + environment.systemPackages = with pkgs; [ libvirt netcat-openbsd cfg.qemuPackage ]; boot.kernelModules = [ "tun" ]; @@ -117,17 +119,10 @@ in { after = [ "systemd-udev-settle.service" ] ++ optional vswitch.enable "vswitchd.service"; - environment = { - LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; - }; + environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; - path = with pkgs; [ - bridge-utils - dmidecode - dnsmasq - ebtables - ] - ++ optional vswitch.enable vswitch.package; + path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images + ++ optional vswitch.enable vswitch.package; preStart = '' mkdir -p /var/log/libvirt/qemu -m 755 @@ -154,9 +149,9 @@ in { # stable (not GC'able as in /nix/store) paths for using in section of xml configs mkdir -p /run/libvirt/nix-emulators - ln -s --force ${pkgs.libvirt}/libexec/libvirt_lxc /run/libvirt/nix-emulators/ - ${optionalString pkgs.stdenv.isAarch64 "ln -s --force ${pkgs.qemu}/bin/qemu-system-aarch64 /run/libvirt/nix-emulators/"} - ${optionalString cfg.enableKVM "ln -s --force ${pkgs.qemu_kvm}/bin/qemu-kvm /run/libvirt/nix-emulators/"} + for emulator in ${pkgs.libvirt}/libexec/libvirt_lxc ${cfg.qemuPackage}/bin/qemu-kvm ${cfg.qemuPackage}/bin/qemu-system-*; do + ln -s --force "$emulator" /run/libvirt/nix-emulators/ + done ${optionalString cfg.qemuOvmf '' mkdir -p /run/libvirt/nix-ovmf diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 2310fe984325b06246d5c45696d87f9fe4f6363a..9b5adaf08249e4020a197bfbe90f8210d37f6d56 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -74,6 +74,9 @@ in 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" ]; + security.apparmor.profiles = [ + "${pkgs.lxc}/etc/apparmor.d/lxc-containers" + "${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start" + ]; }; } diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix index 48462dc66da84c261e6447070e2461437dcdef4c..b2457403463a5daf69fa47389bc0836a4f763998 100644 --- a/nixos/modules/virtualisation/lxcfs.nix +++ b/nixos/modules/virtualisation/lxcfs.nix @@ -28,13 +28,9 @@ in { ###### implementation config = mkIf cfg.enable { - services.cgmanager.enable = true; - systemd.services.lxcfs = { description = "FUSE filesystem for LXC"; wantedBy = [ "multi-user.target" ]; - requires = [ "cgmanager.service" ]; - after = [ "cgmanager.service" ]; before = [ "lxc.service" ]; restartIfChanged = false; serviceConfig = { diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index b1ff0337994ee7d7a1c04abb46662c8379b77983..3e76cdacfc4b8c7ec50ede96bdcdd610c3e40256 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -15,50 +15,69 @@ in options = { - virtualisation.lxd.enable = - mkOption { + virtualisation.lxd = { + enable = mkOption { type = types.bool; default = false; - description = - '' - This option enables lxd, a daemon that manages - containers. Users in the "lxd" group can interact with - the daemon (e.g. to start or stop containers) using the - lxc command line tool, among others. - ''; + description = '' + This option enables lxd, a daemon that manages + containers. Users in the "lxd" group can interact with + the daemon (e.g. to start or stop containers) using the + lxc command line tool, among others. + ''; }; - + zfsSupport = mkOption { + type = types.bool; + default = false; + description = '' + enables lxd to use zfs as a storage for containers. + This option is enabled by default if a zfs pool is configured + with nixos. + ''; + }; + }; }; - ###### implementation config = mkIf cfg.enable { - environment.systemPackages = - [ pkgs.lxd ]; + environment.systemPackages = [ pkgs.lxd ]; - systemd.services.lxd = - { description = "LXD Container Management Daemon"; + security.apparmor = { + enable = true; + profiles = [ + "${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start" + "${pkgs.lxc}/etc/apparmor.d/lxc-containers" + ]; + packages = [ pkgs.lxc ]; + }; - wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; + systemd.services.lxd = { + description = "LXD Container Management Daemon"; - # TODO(wkennington): Add lvm2 and thin-provisioning-tools - path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ]; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; - serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd"; - serviceConfig.Type = "simple"; - serviceConfig.KillMode = "process"; # when stopping, leave the containers alone + path = lib.optional cfg.zfsSupport pkgs.zfs; + + preStart = '' + mkdir -m 0755 -p /var/lib/lxc/rootfs + ''; + + serviceConfig = { + ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --group lxd"; + Type = "simple"; + KillMode = "process"; # when stopping, leave the containers alone }; + }; + users.extraGroups.lxd.gid = config.ids.gids.lxd; users.extraUsers.root = { subUidRanges = [ { startUid = 1000000; count = 65536; } ]; subGidRanges = [ { startGid = 1000000; count = 65536; } ]; }; - }; - } diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix index c865cf451e405989ba1b6975350d763f1c939ea4..c1d2a314daf2d25d2772fe3d2a650b656c8719fa 100644 --- a/nixos/modules/virtualisation/nova-config.nix +++ b/nixos/modules/virtualisation/nova-config.nix @@ -6,7 +6,6 @@ with lib; imports = [ ../profiles/qemu-guest.nix ../profiles/headless.nix - ./grow-partition.nix ]; config = { @@ -15,8 +14,7 @@ with lib; autoResize = true; }; - virtualisation.growPartition = true; - + boot.growPartition = true; boot.kernelParams = [ "console=ttyS0" ]; boot.loader.grub.device = "/dev/vda"; boot.loader.timeout = 0; diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix deleted file mode 100644 index c2837d0e2e242ed7e398f0c66eb94eb9d0b9c2ed..0000000000000000000000000000000000000000 --- a/nixos/modules/virtualisation/nova.nix +++ /dev/null @@ -1,174 +0,0 @@ -# Module for Nova, a.k.a. OpenStack Compute. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.virtualisation.nova; - - nova = pkgs.nova; - - novaConf = pkgs.writeText "nova.conf" - '' - --nodaemon - --verbose - ${cfg.extraConfig} - ''; - -in - -{ - - ###### interface - - options = { - - virtualisation.nova.enableSingleNode = - mkOption { - default = false; - description = - '' - This option enables Nova, also known as OpenStack Compute, - a cloud computing system, as a single-machine - installation. That is, all of Nova's components are - enabled on this machine, using SQLite as Nova's database. - This is useful for evaluating and experimenting with Nova. - However, for a real cloud computing environment, you'll - want to enable some of Nova's services on other machines, - and use a database such as MySQL. - ''; - }; - - virtualisation.nova.extraConfig = - mkOption { - default = ""; - description = - '' - Additional text appended to nova.conf, - the main Nova configuration file. - ''; - }; - - }; - - - ###### implementation - - config = mkIf cfg.enableSingleNode { - - environment.systemPackages = [ nova pkgs.euca2ools pkgs.novaclient ]; - - environment.etc = - [ { source = novaConf; - target = "nova/nova.conf"; - } - ]; - - # Nova requires libvirtd and RabbitMQ. - virtualisation.libvirtd.enable = true; - services.rabbitmq.enable = true; - - # `qemu-nbd' required the `nbd' kernel module. - boot.kernelModules = [ "nbd" ]; - - system.activationScripts.nova = - '' - mkdir -m 755 -p /var/lib/nova - mkdir -m 755 -p /var/lib/nova/networks - mkdir -m 700 -p /var/lib/nova/instances - mkdir -m 700 -p /var/lib/nova/keys - - # Allow the CA certificate generation script (called by - # nova-api) to work. - mkdir -m 700 -p /var/lib/nova/CA /var/lib/nova/CA/private - - # Initialise the SQLite database. - ${nova}/bin/nova-manage db sync - ''; - - # `nova-api' receives and executes external client requests from - # tools such as euca2ools. It listens on port 8773 (XML) and 8774 - # (JSON). - jobs.nova_api = - { name = "nova-api"; - - description = "Nova API service"; - - startOn = "ip-up"; - - # `openssl' is required to generate the CA. `openssh' is - # required to generate key pairs. - path = [ pkgs.openssl config.programs.ssh.package pkgs.bash ]; - - respawn = false; - - exec = "${nova}/bin/nova-api --flagfile=${novaConf} --api_paste_config=${nova}/etc/nova/api-paste.ini"; - }; - - # `nova-objectstore' is a simple image server. Useful if you're - # not running the OpenStack Imaging Service (Swift). It serves - # images placed in /var/lib/nova/images/. - jobs.nova_objectstore = - { name = "nova-objectstore"; - - description = "Nova Simple Object Store Service"; - - startOn = "ip-up"; - - preStart = - '' - mkdir -m 700 -p /var/lib/nova/images - ''; - - exec = "${nova}/bin/nova-objectstore --flagfile=${novaConf}"; - }; - - # `nova-scheduler' schedules VM execution requests. - jobs.nova_scheduler = - { name = "nova-scheduler"; - - description = "Nova Scheduler Service"; - - startOn = "ip-up"; - - exec = "${nova}/bin/nova-scheduler --flagfile=${novaConf}"; - }; - - # `nova-compute' starts and manages virtual machines. - jobs.nova_compute = - { name = "nova-compute"; - - description = "Nova Compute Service"; - - startOn = "ip-up"; - - path = - [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm - pkgs.e2fsprogs pkgs.utillinux pkgs.multipath-tools pkgs.iproute - pkgs.bridge-utils - ]; - - exec = "${nova}/bin/nova-compute --flagfile=${novaConf}"; - }; - - # `nova-network' manages networks and allocates IP addresses. - jobs.nova_network = - { name = "nova-network"; - - description = "Nova Network Service"; - - startOn = "ip-up"; - - path = - [ pkgs.sudo pkgs.vlan pkgs.dnsmasq pkgs.nettools pkgs.iptables - pkgs.iproute pkgs.bridge-utils pkgs.radvd - ]; - - exec = "${nova}/bin/nova-network --flagfile=${novaConf}"; - }; - - }; - -} diff --git a/nixos/modules/virtualisation/openstack/common.nix b/nixos/modules/virtualisation/openstack/common.nix deleted file mode 100644 index 2feb0a8739512db064f00d300405d9c27f74f33b..0000000000000000000000000000000000000000 --- a/nixos/modules/virtualisation/openstack/common.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib }: - -with lib; - -rec { - # A shell script string helper to get the value of a secret at - # runtime. - getSecret = secretOption: - if secretOption.storage == "fromFile" - then ''$(cat ${secretOption.value})'' - else ''${secretOption.value}''; - - - # A shell script string help to replace at runtime in a file the - # pattern of a secret by its value. - replaceSecret = secretOption: filename: '' - sed -i "s/${secretOption.pattern}/${getSecret secretOption}/g" ${filename} - ''; - - # This generates an option that can be used to declare secrets which - # can be stored in the nix store, or not. A pattern is written in - # the nix store to represent the secret. The pattern can - # then be overwritten with the value of the secret at runtime. - mkSecretOption = {name, description ? ""}: - mkOption { - description = description; - type = types.submodule ({ - options = { - pattern = mkOption { - type = types.str; - default = "##${name}##"; - description = "The pattern that represent the secret."; - }; - storage = mkOption { - type = types.enum [ "fromNixStore" "fromFile" ]; - description = '' - Choose the way the password is provisionned. If - fromNixStore is used, the value is the password and it is - written in the nix store. If fromFile is used, the value - is a path from where the password will be read at - runtime. This is generally used with - deployment keys of Nixops. - '';}; - value = mkOption { - type = types.str; - description = '' - If the storage is fromNixStore, the value is the password itself, - otherwise it is a path to the file that contains the password. - ''; - }; - };}); - }; - - databaseOption = name: { - host = mkOption { - type = types.str; - default = "localhost"; - description = '' - Host of the database. - ''; - }; - - name = mkOption { - type = types.str; - default = name; - description = '' - Name of the existing database. - ''; - }; - - user = mkOption { - type = types.str; - default = name; - description = '' - The database user. The user must exist and has access to - the specified database. - ''; - }; - password = mkSecretOption { - name = name + "MysqlPassword"; - description = "The database user's password";}; - }; -} diff --git a/nixos/modules/virtualisation/openstack/glance.nix b/nixos/modules/virtualisation/openstack/glance.nix deleted file mode 100644 index 7862409a65ecaaada2b48740a8412be4835620cc..0000000000000000000000000000000000000000 --- a/nixos/modules/virtualisation/openstack/glance.nix +++ /dev/null @@ -1,245 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; with import ./common.nix {inherit lib;}; - -let - cfg = config.virtualisation.openstack.glance; - commonConf = '' - [database] - connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}" - notification_driver = noop - - [keystone_authtoken] - auth_url = ${cfg.authUrl} - auth_plugin = password - project_name = service - project_domain_id = default - user_domain_id = default - username = ${cfg.serviceUsername} - password = ${cfg.servicePassword.pattern} - - [glance_store] - default_store = file - filesystem_store_datadir = /var/lib/glance/images/ - ''; - glanceApiConfTpl = pkgs.writeText "glance-api.conf" '' - ${commonConf} - - [paste_deploy] - flavor = keystone - config_file = ${cfg.package}/etc/glance-api-paste.ini - ''; - glanceRegistryConfTpl = pkgs.writeText "glance-registry.conf" '' - ${commonConf} - - [paste_deploy] - config_file = ${cfg.package}/etc/glance-registry-paste.ini - ''; - glanceApiConf = "/var/lib/glance/glance-api.conf"; - glanceRegistryConf = "/var/lib/glance/glance-registry.conf"; - -in { - options.virtualisation.openstack.glance = { - package = mkOption { - type = types.package; - default = pkgs.glance; - defaultText = "pkgs.glance"; - description = '' - Glance package to use. - ''; - }; - - enable = mkOption { - default = false; - type = types.bool; - description = '' - This option enables Glance as a single-machine - installation. That is, all of Glance's components are - enabled on this machine. This is useful for evaluating and - experimenting with Glance. Note we are currently not - providing any configurations for a multi-node setup. - ''; - }; - - authUrl = mkOption { - type = types.str; - default = http://localhost:5000; - description = '' - Complete public Identity (Keystone) API endpoint. Note this is - unversionned. - ''; - }; - - serviceUsername = mkOption { - type = types.str; - default = "glance"; - description = '' - The Glance service username. This user is created if bootstrap - is enable, otherwise it has to be manually created before - starting this service. - ''; - }; - - servicePassword = mkSecretOption { - name = "glanceAdminPassword"; - description = '' - The Glance service user's password. - ''; - }; - - database = databaseOption "glance"; - - bootstrap = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Bootstrap the Glance service by creating the service tenant, - an admin account and a public endpoint. This option provides - a ready-to-use glance service. This is only done at the - first Glance execution by the systemd post start section. - The keystone admin account is used to create required - Keystone resource for the Glance service. - - This option is a helper for setting up - development or testing environments. - ''; - }; - - endpointPublic = mkOption { - type = types.str; - default = "http://localhost:9292"; - description = '' - The public image endpoint. The link - create endpoint provides more informations - about that. - ''; - }; - - keystoneAdminUsername = mkOption { - type = types.str; - default = "admin"; - description = '' - The keystone admin user name used to create the Glance account. - ''; - }; - - keystoneAdminPassword = mkSecretOption { - name = "keystoneAdminPassword"; - description = '' - The keystone admin user's password. - ''; - }; - - keystoneAdminTenant = mkOption { - type = types.str; - default = "admin"; - description = '' - The keystone admin tenant used to create the Glance account. - ''; - }; - keystoneAuthUrl = mkOption { - type = types.str; - default = "http://localhost:5000/v2.0"; - description = '' - The keystone auth url used to create the Glance account. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.extraUsers = [{ - name = "glance"; - group = "glance"; - uid = config.ids.gids.glance; - - }]; - users.extraGroups = [{ - name = "glance"; - gid = config.ids.gids.glance; - }]; - - systemd.services.glance-registry = { - description = "OpenStack Glance Registry Daemon"; - after = [ "network.target"]; - path = [ pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ]; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 775 -p /var/lib/glance/{images,scrubber,image_cache} - chown glance:glance /var/lib/glance/{images,scrubber,image_cache} - - # Secret file managment - cp ${glanceRegistryConfTpl} ${glanceRegistryConf}; - chown glance:glance ${glanceRegistryConf}; - chmod 640 ${glanceRegistryConf} - ${replaceSecret cfg.database.password glanceRegistryConf} - ${replaceSecret cfg.servicePassword glanceRegistryConf} - - cp ${glanceApiConfTpl} ${glanceApiConf}; - chown glance:glance ${glanceApiConf}; - chmod 640 ${glanceApiConf} - ${replaceSecret cfg.database.password glanceApiConf} - ${replaceSecret cfg.servicePassword glanceApiConf} - - # Initialise the database - ${cfg.package}/bin/glance-manage --config-file=${glanceApiConf} --config-file=${glanceRegistryConf} db_sync - ''; - postStart = '' - set -eu - export OS_AUTH_URL=${cfg.bootstrap.keystoneAuthUrl} - export OS_USERNAME=${cfg.bootstrap.keystoneAdminUsername} - export OS_PASSWORD=${getSecret cfg.bootstrap.keystoneAdminPassword} - export OS_TENANT_NAME=${cfg.bootstrap.keystoneAdminTenant} - - # Wait until the keystone is available for use - count=0 - while ! keystone user-get ${cfg.bootstrap.keystoneAdminUsername} > /dev/null - do - if [ $count -eq 30 ] - then - echo "Tried 30 times, giving up..." - exit 1 - fi - - echo "Keystone not yet started. Waiting for 1 second..." - count=$((count++)) - sleep 1 - done - - # If the service glance doesn't exist, we consider glance is - # not initialized - if ! keystone service-get glance - then - keystone service-create --type image --name glance - ID=$(keystone service-get glance | awk '/ id / { print $4 }') - keystone endpoint-create --region RegionOne --service $ID --internalurl http://localhost:9292 --adminurl http://localhost:9292 --publicurl ${cfg.bootstrap.endpointPublic} - - keystone user-create --name ${cfg.serviceUsername} --tenant service --pass ${getSecret cfg.servicePassword} - keystone user-role-add --tenant service --user ${cfg.serviceUsername} --role admin - fi - ''; - serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root - TimeoutStartSec = "600"; # 10min for initial db migrations - User = "glance"; - Group = "glance"; - ExecStart = "${cfg.package}/bin/glance-registry --config-file=${glanceRegistryConf}"; - }; - }; - systemd.services.glance-api = { - description = "OpenStack Glance API Daemon"; - after = [ "glance-registry.service" "network.target"]; - requires = [ "glance-registry.service" "network.target"]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root - User = "glance"; - Group = "glance"; - ExecStart = "${cfg.package}/bin/glance-api --config-file=${glanceApiConf}"; - }; - }; - }; - -} diff --git a/nixos/modules/virtualisation/openstack/keystone.nix b/nixos/modules/virtualisation/openstack/keystone.nix deleted file mode 100644 index e32c5a4cae1b693dde4c4418e382056a724705ab..0000000000000000000000000000000000000000 --- a/nixos/modules/virtualisation/openstack/keystone.nix +++ /dev/null @@ -1,220 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; with import ./common.nix {inherit lib;}; - -let - cfg = config.virtualisation.openstack.keystone; - keystoneConfTpl = pkgs.writeText "keystone.conf" '' - [DEFAULT] - admin_token = ${cfg.adminToken.pattern} - policy_file=${cfg.package}/etc/policy.json - - [database] - - connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}" - - [paste_deploy] - config_file = ${cfg.package}/etc/keystone-paste.ini - - ${cfg.extraConfig} - ''; - keystoneConf = "/var/lib/keystone/keystone.conf"; - -in { - options.virtualisation.openstack.keystone = { - package = mkOption { - type = types.package; - example = literalExample "pkgs.keystone"; - description = '' - Keystone package to use. - ''; - }; - - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable Keystone, the OpenStack Identity Service - ''; - }; - - extraConfig = mkOption { - default = ""; - type = types.lines; - description = '' - Additional text appended to keystone.conf, - the main Keystone configuration file. - ''; - }; - - adminToken = mkSecretOption { - name = "adminToken"; - description = '' - This is the admin token used to boostrap keystone, - ie. to provision first resources. - ''; - }; - - bootstrap = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Bootstrap the Keystone service by creating the service - tenant, an admin account and a public endpoint. This options - provides a ready-to-use admin account. This is only done at - the first Keystone execution by the systemd post start. - - Note this option is a helper for setting up development or - testing environments. - ''; - }; - - endpointPublic = mkOption { - type = types.str; - default = "http://localhost:5000/v2.0"; - description = '' - The public identity endpoint. The link - create keystone endpoint provides more informations - about that. - ''; - }; - - adminUsername = mkOption { - type = types.str; - default = "admin"; - description = '' - A keystone admin username. - ''; - }; - - adminPassword = mkSecretOption { - name = "keystoneAdminPassword"; - description = '' - The keystone admin user's password. - ''; - }; - - adminTenant = mkOption { - type = types.str; - default = "admin"; - description = '' - A keystone admin tenant name. - ''; - }; - }; - - database = { - host = mkOption { - type = types.str; - default = "localhost"; - description = '' - Host of the database. - ''; - }; - - name = mkOption { - type = types.str; - default = "keystone"; - description = '' - Name of the existing database. - ''; - }; - - user = mkOption { - type = types.str; - default = "keystone"; - description = '' - The database user. The user must exist and has access to - the specified database. - ''; - }; - password = mkSecretOption { - name = "mysqlPassword"; - description = "The database user's password";}; - }; - }; - - config = mkIf cfg.enable { - # Note: when changing the default, make it conditional on - # ‘system.stateVersion’ to maintain compatibility with existing - # systems! - virtualisation.openstack.keystone.package = mkDefault pkgs.keystone; - - users.extraUsers = [{ - name = "keystone"; - group = "keystone"; - uid = config.ids.uids.keystone; - }]; - users.extraGroups = [{ - name = "keystone"; - gid = config.ids.gids.keystone; - }]; - - systemd.services.keystone-all = { - description = "OpenStack Keystone Daemon"; - after = [ "network.target"]; - path = [ cfg.package pkgs.mysql pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ]; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 755 -p /var/lib/keystone - - cp ${keystoneConfTpl} ${keystoneConf}; - chown keystone:keystone ${keystoneConf}; - chmod 640 ${keystoneConf} - - ${replaceSecret cfg.database.password keystoneConf} - ${replaceSecret cfg.adminToken keystoneConf} - - # Initialise the database - ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} db_sync - # Set up the keystone's PKI infrastructure - ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} pki_setup --keystone-user keystone --keystone-group keystone - ''; - postStart = optionalString cfg.bootstrap.enable '' - set -eu - # Wait until the keystone is available for use - count=0 - while ! curl --fail -s http://localhost:35357/v2.0 > /dev/null - do - if [ $count -eq 30 ] - then - echo "Tried 30 times, giving up..." - exit 1 - fi - - echo "Keystone not yet started. Waiting for 1 second..." - count=$((count++)) - sleep 1 - done - - # We use the service token to create a first admin user - export OS_SERVICE_ENDPOINT=http://localhost:35357/v2.0 - export OS_SERVICE_TOKEN=${getSecret cfg.adminToken} - - # If the tenant service doesn't exist, we consider - # keystone is not initialized - if ! keystone tenant-get service - then - keystone tenant-create --name service - keystone tenant-create --name ${cfg.bootstrap.adminTenant} - keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${getSecret cfg.bootstrap.adminPassword} - keystone role-create --name admin - keystone role-create --name Member - keystone user-role-add --tenant ${cfg.bootstrap.adminTenant} --user ${cfg.bootstrap.adminUsername} --role admin - keystone service-create --type identity --name keystone - ID=$(keystone service-get keystone | awk '/ id / { print $4 }') - keystone endpoint-create --region RegionOne --service $ID --publicurl ${cfg.bootstrap.endpointPublic} --adminurl http://localhost:35357/v2.0 --internalurl http://localhost:5000/v2.0 - fi - ''; - serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root - TimeoutStartSec = "600"; # 10min for initial db migrations - User = "keystone"; - Group = "keystone"; - ExecStart = "${cfg.package}/bin/keystone-all --config-file=${keystoneConf}"; - }; - }; - }; -} diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 4218a3840fc1a099fa820952d35f4c271e652d41..38b138e0632636ca47aa68e244599bb1d1c36ea1 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -169,7 +169,7 @@ in { mkdir -p ${runDir}/ipsec/{etc/racoon,etc/init.d/,usr/sbin/} ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey ln -fs ${pkgs.writeScript "racoon-restart" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} /var/run/current-system/sw/bin/systemctl $1 racoon ''} ${runDir}/ipsec/etc/init.d/racoon ''; diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index bd85973ee56103a18468df53fde1ff2918bc7833..36ca7f356d442f1c8de177242e17090aee4738a3 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -3,9 +3,7 @@ with lib; let - - prl-tools = config.boot.kernelPackages.prl-tools; - + prl-tools = config.hardware.parallels.package; in { @@ -22,12 +20,31 @@ in ''; }; + autoMountShares = mkOption { + type = types.bool; + default = true; + description = '' + Control prlfsmountd service. When this service is running, shares can not be manually + mounted through `mount -t prl_fs ...` as this service will remount and trample any set options. + Recommended to enable for simple file sharing, but extended share use such as for code should + disable this to manually mount shares. + ''; + }; + + package = mkOption { + type = types.package; + default = config.boot.kernelPackages.prl-tools; + defaultText = "config.boot.kernelPackages.prl-tools"; + example = literalExample "config.boot.kernelPackages.prl-tools"; + description = '' + Defines which package to use for prl-tools. Override to change the version. + ''; + }; }; }; config = mkIf config.hardware.parallels.enable { - services.xserver = { drivers = singleton { name = "prlvideo"; modules = [ prl-tools ]; libPath = [ prl-tools ]; }; @@ -55,7 +72,7 @@ in boot.extraModulePackages = [ prl-tools ]; - boot.kernelModules = [ "prl_tg" "prl_eth" "prl_fs" "prl_fs_freeze" "acpi_memhotplug" ]; + boot.kernelModules = [ "prl_tg" "prl_eth" "prl_fs" "prl_fs_freeze" ]; services.timesyncd.enable = false; @@ -68,7 +85,7 @@ in }; }; - systemd.services.prlfsmountd = { + systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares { description = "Parallels Shared Folders Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = rec { @@ -89,5 +106,50 @@ in }; }; + systemd.user.services = { + prlcc = { + description = "Parallels Control Center"; + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = "${prl-tools}/bin/prlcc"; + }; + }; + prldnd = { + description = "Parallels Control Center"; + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = "${prl-tools}/bin/prldnd"; + }; + }; + prl_wmouse_d = { + description = "Parallels Walking Mouse Daemon"; + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = "${prl-tools}/bin/prl_wmouse_d"; + }; + }; + prlcp = { + description = "Parallels CopyPaste Tool"; + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = "${prl-tools}/bin/prlcp"; + }; + }; + prlsga = { + description = "Parallels Shared Guest Applications Tool"; + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = "${prl-tools}/bin/prlsga"; + }; + }; + prlshprof = { + description = "Parallels Shared Profile Tool"; + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = "${prl-tools}/bin/prlshprof"; + }; + }; + }; + }; } diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 3c89ca68113b741d20e3d5f4631df5f56e3455bc..45325c6b0d8da5cf0b9c434088d7240b1d215e18 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -10,6 +10,7 @@ { config, lib, pkgs, ... }: with lib; +with import ../../lib/qemu-flags.nix { inherit pkgs; }; let @@ -23,13 +24,13 @@ let cfg = config.virtualisation; qemuGraphics = if cfg.graphics then "" else "-nographic"; - kernelConsole = if cfg.graphics then "" else "console=ttyS0"; + kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; # Shell script to start the VM. startVM = '' - #! ${pkgs.stdenv.shell} + #! ${pkgs.runtimeShell} NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}}) @@ -72,11 +73,10 @@ let '')} # Start QEMU. - exec ${qemu}/bin/qemu-kvm \ + exec ${qemuBinary qemu} \ -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 \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ @@ -98,7 +98,7 @@ let ${qemuGraphics} \ ${toString config.virtualisation.qemu.options} \ $QEMU_OPTS \ - $@ + "$@" ''; @@ -319,8 +319,8 @@ in networkingOptions = mkOption { default = [ - "-net nic,vlan=0,model=virtio" - "-net user,vlan=0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" + "-net nic,netdev=user.0,model=virtio" + "-netdev user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" ]; type = types.listOf types.str; description = '' @@ -434,7 +434,11 @@ in virtualisation.pathsInNixDB = [ config.system.build.toplevel ]; - virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ]; + # FIXME: Consolidate this one day. + virtualisation.qemu.options = mkMerge [ + (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ]) + (mkIf (pkgs.stdenv.isArm || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) + ]; # Mount the host filesystem via 9P, and bind-mount the Nix store # of the host into our own filesystem. We use mkVMOverride to diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index bb0c38bd4eb843bbc1c5237f68b59e04d8a5e599..7413e12c8f3d012d4c4dfd92cc836726c2e49ffe 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -124,7 +124,7 @@ in ''; }; - networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ]; + networking.interfaces.vboxnet0.ipv4.addresses = [{ address = "192.168.56.1"; prefixLength = 24; }]; # Make sure NetworkManager won't assume this interface being up # means we have internet access. networking.networkmanager.unmanaged = ["vboxnet0"]; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index d68b3bb73904fdb4e1f6b1281c74cd5b4eda739e..64f145f77ca39917cfdd589e1b898badba248853 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -8,8 +8,6 @@ let in { - imports = [ ./grow-partition.nix ]; - options = { virtualbox = { baseImageSize = mkOption { @@ -23,12 +21,11 @@ in { }; config = { - system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix { - name = "nixos-ova-${config.system.nixosLabel}-${pkgs.stdenv.system}"; + name = "nixos-ova-${config.system.nixos.label}-${pkgs.stdenv.system}"; inherit pkgs lib config; - partitioned = true; + partitionTableType = "legacy"; diskSize = cfg.baseImageSize; postVM = @@ -40,7 +37,7 @@ in { VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage echo "creating VirtualBox VM..." - vmName="NixOS ${config.system.nixosLabel} (${pkgs.stdenv.system})" + vmName="NixOS ${config.system.nixos.label} (${pkgs.stdenv.system})" VBoxManage createvm --name "$vmName" --register \ --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"} VBoxManage modifyvm "$vmName" \ @@ -56,7 +53,7 @@ in { echo "exporting VirtualBox VM..." mkdir -p $out - fn="$out/nixos-${config.system.nixosLabel}-${pkgs.stdenv.system}.ova" + fn="$out/nixos-${config.system.nixos.label}-${pkgs.stdenv.system}.ova" VBoxManage export "$vmName" --output "$fn" rm -v $diskImage @@ -71,6 +68,7 @@ in { autoResize = true; }; + boot.growPartition = true; boot.loader.grub.device = "/dev/sda"; virtualisation.virtualbox.guest.enable = true; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index c7656bc309c0b468a06adbac46496f4648bf1dd1..cf57868acef90853d2575296cf7888186c467d38 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -35,24 +35,19 @@ in description = '' The package used for Xen binary. ''; + relatedPackages = [ "xen" "xen-light" ]; }; - virtualisation.xen.qemu = mkOption { - type = types.path; - defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386"; - example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386"; - description = '' - The qemu binary to use for Dom-0 backend. - ''; - }; - - virtualisation.xen.qemu-package = mkOption { + virtualisation.xen.package-qemu = mkOption { type = types.package; defaultText = "pkgs.xen"; example = literalExample "pkgs.qemu_xen-light"; description = '' - The package with qemu binaries for xendomains. + The package with qemu binaries for dom0 qemu and xendomains. ''; + relatedPackages = [ "xen" + { name = "qemu_xen-light"; comment = "For use with pkgs.xen-light."; } + ]; }; virtualisation.xen.bootParams = @@ -158,8 +153,7 @@ in } ]; 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.package-qemu = mkDefault pkgs.xen; virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored"; environment.systemPackages = [ cfg.package ]; @@ -247,6 +241,12 @@ in ''; target = "default/xendomains"; } + ] + ++ lib.optionals (builtins.compareVersions cfg.package.version "4.10" >= 0) [ + # in V 4.10 oxenstored requires /etc/xen/oxenstored.conf to start + { source = "${cfg.package}/etc/xen/oxenstored.conf"; + target = "xen/oxenstored.conf"; + } ]; # Xen provides udev rules. @@ -268,7 +268,7 @@ in mkdir -p /var/lib/xen # so we create them here unconditionally. grep -q control_d /proc/xen/capabilities ''; - serviceConfig = if cfg.package.version < "4.8" then + serviceConfig = if (builtins.compareVersions cfg.package.version "4.8" < 0) then { ExecStart = '' ${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork ''; @@ -281,7 +281,7 @@ in NotifyAccess = "all"; }; postStart = '' - ${optionalString (cfg.package.version < "4.8") '' + ${optionalString (builtins.compareVersions cfg.package.version "4.8" < 0) '' time=0 timeout=30 # Wait for xenstored to actually come up, timing out after 30 seconds @@ -326,7 +326,7 @@ in serviceConfig = { ExecStart = '' ${cfg.package}/bin/xenconsoled\ - ${optionalString ((cfg.package.version >= "4.8")) " -i"}\ + ${optionalString ((builtins.compareVersions cfg.package.version "4.8" >= 0)) " -i"}\ ${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"} ''; }; @@ -339,7 +339,8 @@ in after = [ "xen-console.service" ]; requires = [ "xen-store.service" ]; serviceConfig.ExecStart = '' - ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \ + ${cfg.package-qemu}/${cfg.package-qemu.qemu-system-i386} \ + -xen-attach -xen-domid 0 -name dom0 -M xenpv \ -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null ''; }; @@ -448,7 +449,7 @@ in before = [ "dhcpd.service" ]; restartIfChanged = false; serviceConfig.RemainAfterExit = "yes"; - path = [ cfg.package cfg.qemu-package ]; + path = [ cfg.package cfg.package-qemu ]; environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains"; preStart = "mkdir -p /var/lock/subsys -m 755"; serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start"; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 7536bf3e48ef671886e9dcfcc6f680871ed9990a..e010b532a688b1f6a40d436acbdc8fccde02638c 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -2,7 +2,7 @@ # and nixos-14.04). The channel is updated every time the ‘tested’ job # succeeds, and all other jobs have finished (they may fail). -{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } +{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" ] , limitedSupportedSystems ? [ "i686-linux" ] @@ -52,16 +52,17 @@ in rec { (all nixos.dummy) (all nixos.manual) - (all nixos.iso_minimal) - nixos.iso_graphical.x86_64-linux - nixos.ova.x86_64-linux + nixos.iso_minimal.x86_64-linux or [] + nixos.iso_minimal.i686-linux or [] + nixos.iso_graphical.x86_64-linux or [] + nixos.ova.x86_64-linux or [] #(all nixos.tests.containers) - nixos.tests.chromium + nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) - nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only + nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only (all nixos.tests.installer.lvm) (all nixos.tests.installer.luksroot) (all nixos.tests.installer.separateBoot) @@ -80,7 +81,7 @@ in rec { (all nixos.tests.boot.uefiUsb) (all nixos.tests.boot-stage1) (all nixos.tests.hibernate) - nixos.tests.docker + nixos.tests.docker.x86_64-linux or [] (all nixos.tests.ecryptfs) (all nixos.tests.env) (all nixos.tests.ipv6) @@ -95,6 +96,7 @@ in rec { #(all nixos.tests.lightdm) (all nixos.tests.login) (all nixos.tests.misc) + (all nixos.tests.mutableUsers) (all nixos.tests.nat.firewall) (all nixos.tests.nat.standalone) (all nixos.tests.networking.scripted.loopback) @@ -115,6 +117,7 @@ in rec { (all nixos.tests.sddm.default) (all nixos.tests.simple) (all nixos.tests.slim) + (all nixos.tests.switchTest) (all nixos.tests.udisks2) (all nixos.tests.xfce) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index e9f3cfb4de53966cbf791ba39489e8098278fcdd..4bfb9a423f7d526457bf153903a09ae414dbf5ba 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -2,7 +2,7 @@ # small subset of Nixpkgs, mostly useful for servers that need fast # security updates. -{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } +{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" ] # no i686-linux }: @@ -41,6 +41,7 @@ in rec { nfs3 openssh php-pcre + predictable-interface-names proxy simple; installer = { @@ -49,6 +50,10 @@ in rec { separateBoot simple; }; + boot = { + inherit (nixos'.tests.boot) + biosCdrom; + }; }; }; diff --git a/nixos/release.nix b/nixos/release.nix index 367fdadd0f4567cb1c61006d777b59b8a8b14fc2..7a12baba5c1c24ae0924f3b9ab1855bdc2c09a11 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,8 +1,9 @@ -{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } +{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 130979; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" ] +, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] }: +with import ../pkgs/top-level/release-lib.nix { inherit supportedSystems; }; with import ../lib; let @@ -11,15 +12,19 @@ let versionSuffix = (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; - forAllSystems = genAttrs supportedSystems; - importTest = fn: args: system: import fn ({ inherit system; } // args); - callTest = fn: args: forAllSystems (system: hydraJob (importTest fn args system)); + # Note: only supportedSystems are considered. + callTestOnMatchingSystems = systems: fn: args: + forMatchingSystems + (intersectLists supportedSystems systems) + (system: hydraJob (importTest fn args system)); + callTest = callTestOnMatchingSystems supportedSystems; - callSubTests = fn: args: let + callSubTests = callSubTestsOnMatchingSystems supportedSystems; + callSubTestsOnMatchingSystems = systems: fn: args: let discover = attrs: let subTests = filterAttrs (const (hasAttr "test")) attrs; in mapAttrs (const (t: hydraJob t.test)) subTests; @@ -28,17 +33,14 @@ let ${system} = test; }) (discover (importTest fn args system)); - # If the test is only for a particular system, use only the specified - # system instead of generating attributes for all available systems. - in if args ? system then discover (import fn args) - else foldAttrs mergeAttrs {} (map discoverForSystem supportedSystems); + in foldAttrs mergeAttrs {} (map discoverForSystem (intersectLists systems supportedSystems)); pkgs = import nixpkgs { system = "x86_64-linux"; }; versionModule = - { system.nixosVersionSuffix = versionSuffix; - system.nixosRevision = nixpkgs.rev or nixpkgs.shortRev; + { system.nixos.versionSuffix = versionSuffix; + system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev; }; @@ -53,6 +55,17 @@ let }).config.system.build.isoImage); + makeSdImage = + { module, maintainers ? ["dezgeg"], system }: + + with import nixpkgs { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = [ module versionModule ]; + }).config.system.build.sdImage); + + makeSystemTarball = { module, maintainers ? ["viric"], system }: @@ -89,6 +102,28 @@ let }); }).config)); + makeNetboot = config: + let + configEvaled = import lib/eval-config.nix config; + build = configEvaled.config.system.build; + kernelTarget = configEvaled.pkgs.stdenv.platform.kernelTarget; + in + pkgs.symlinkJoin { + name = "netboot"; + paths = [ + build.netbootRamdisk + build.kernel + build.netbootIpxeScript + ]; + postBuild = '' + mkdir -p $out/nix-support + echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products + echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products + echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products + ''; + preferLocalBuild = true; + }; + in rec { @@ -103,28 +138,13 @@ in rec { # Build the initial ramdisk so Hydra can keep track of its size over time. initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk); - netboot.x86_64-linux = let build = (import lib/eval-config.nix { - system = "x86_64-linux"; - modules = [ - ./modules/installer/netboot/netboot-minimal.nix - versionModule - ]; - }).config.system.build; - in - pkgs.symlinkJoin { - name="netboot"; - paths=[ - build.netbootRamdisk - build.kernel - build.netbootIpxeScript - ]; - postBuild = '' - mkdir -p $out/nix-support - echo "file bzImage $out/bzImage" >> $out/nix-support/hydra-build-products - echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products - echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products - ''; - }; + netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot { + inherit system; + modules = [ + ./modules/installer/netboot/netboot-minimal.nix + versionModule + ]; + }); iso_minimal = forAllSystems (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; @@ -132,7 +152,7 @@ in rec { inherit system; }); - iso_graphical = genAttrs [ "x86_64-linux" ] (system: makeIso { + iso_graphical = forMatchingSystems [ "x86_64-linux" ] (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix; type = "graphical"; inherit system; @@ -140,15 +160,23 @@ in rec { # A variant with a more recent (but possibly less stable) kernel # that might support more hardware. - iso_minimal_new_kernel = genAttrs [ "x86_64-linux" ] (system: makeIso { + iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" ] (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; type = "minimal-new-kernel"; inherit system; }); + sd_image = forMatchingSystems [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ] (system: makeSdImage { + module = { + armv6l-linux = ./modules/installer/cd-dvd/sd-image-raspberrypi.nix; + armv7l-linux = ./modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix; + aarch64-linux = ./modules/installer/cd-dvd/sd-image-aarch64.nix; + }.${system}; + inherit system; + }); # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). - ova = genAttrs [ "x86_64-linux" ] (system: + ova = forMatchingSystems [ "x86_64-linux" ] (system: with import nixpkgs { inherit system; }; @@ -217,12 +245,16 @@ in rec { tests.atd = callTest tests/atd.nix {}; tests.acme = callTest tests/acme.nix {}; tests.avahi = callTest tests/avahi.nix {}; + tests.beegfs = callTest tests/beegfs.nix {}; tests.bittorrent = callTest tests/bittorrent.nix {}; tests.blivet = callTest tests/blivet.nix {}; tests.boot = callSubTests tests/boot.nix {}; tests.boot-stage1 = callTest tests/boot-stage1.nix {}; - tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); - tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable; + tests.borgbackup = callTest tests/borgbackup.nix {}; + tests.buildbot = callTest tests/buildbot.nix {}; + tests.cadvisor = callTestOnMatchingSystems ["x86_64-linux"] tests/cadvisor.nix {}; + tests.ceph = callTestOnMatchingSystems ["x86_64-linux"] tests/ceph.nix {}; + tests.chromium = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/chromium.nix {}).stable or {}; tests.cjdns = callTest tests/cjdns.nix {}; tests.cloud-init = callTest tests/cloud-init.nix {}; tests.containers-ipv4 = callTest tests/containers-ipv4.nix {}; @@ -235,23 +267,27 @@ in rec { tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {}; tests.containers-hosts = callTest tests/containers-hosts.nix {}; tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; - tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); - tests.docker-edge = hydraJob (import tests/docker-edge.nix { system = "x86_64-linux"; }); + tests.couchdb = callTest tests/couchdb.nix {}; + tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {}; + tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {}; + tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {}; + tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {}; tests.dovecot = callTest tests/dovecot.nix {}; - tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; }; + tests.dnscrypt-proxy = callTestOnMatchingSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {}; tests.ecryptfs = callTest tests/ecryptfs.nix {}; - tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); - tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; - tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; - tests.elk = hydraJob (import tests/elk.nix { system = "x86_64-linux"; }); + tests.etcd = callTestOnMatchingSystems ["x86_64-linux"] tests/etcd.nix {}; + tests.ec2-nixops = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops or {}; + tests.ec2-config = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config or {}; + tests.elk = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/elk.nix {}; tests.env = callTest tests/env.nix {}; tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; - tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); + tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {}; + tests.fwupd = callTest tests/fwupd.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; - tests.glance = callTest tests/glance.nix {}; + tests.gjs = callTest tests/gjs.nix {}; tests.gocd-agent = callTest tests/gocd-agent.nix {}; tests.gocd-server = callTest tests/gocd-server.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; @@ -260,14 +296,18 @@ in rec { tests.graphite = callTest tests/graphite.nix {}; tests.hardened = callTest tests/hardened.nix { }; tests.hibernate = callTest tests/hibernate.nix {}; + tests.home-assistant = callTest tests/home-assistant.nix { }; tests.hound = callTest tests/hound.nix {}; + tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {}; tests.i3wm = callTest tests/i3wm.nix {}; - tests.initrd-network-ssh = callTest tests/initrd-network-ssh.nix {}; + tests.iftop = callTest tests/iftop.nix {}; + tests.initrd-network-ssh = callTest tests/initrd-network-ssh {}; tests.installer = callSubTests tests/installer.nix {}; tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; tests.plasma5 = callTest tests/plasma5.nix {}; + tests.plotinus = callTest tests/plotinus.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; tests.kafka_0_9 = callTest tests/kafka_0_9.nix {}; @@ -277,25 +317,30 @@ in rec { tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {}; tests.kernel-latest = callTest tests/kernel-latest.nix {}; tests.kernel-lts = callTest tests/kernel-lts.nix {}; - tests.keystone = callTest tests/keystone.nix {}; - tests.kubernetes = hydraJob (import tests/kubernetes/default.nix { system = "x86_64-linux"; }); + tests.kubernetes.dns = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/dns.nix {}; + ## kubernetes.e2e should eventually replace kubernetes.rbac when it works + #tests.kubernetes.e2e = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/e2e.nix {}; + tests.kubernetes.rbac = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/rbac.nix {}; 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 {}; tests.mathics = callTest tests/mathics.nix {}; + tests.matrix-synapse = callTest tests/matrix-synapse.nix {}; tests.mesos = callTest tests/mesos.nix {}; tests.misc = callTest tests/misc.nix {}; tests.mongodb = callTest tests/mongodb.nix {}; tests.mumble = callTest tests/mumble.nix {}; tests.munin = callTest tests/munin.nix {}; + tests.mutableUsers = callTest tests/mutable-users.nix {}; tests.mysql = callTest tests/mysql.nix {}; tests.mysqlBackup = callTest tests/mysql-backup.nix {}; tests.mysqlReplication = callTest tests/mysql-replication.nix {}; tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; }; tests.nat.firewall-conntrack = callTest tests/nat.nix { withFirewall = true; withConntrackHelpers = true; }; tests.nat.standalone = callTest tests/nat.nix { withFirewall = false; }; + tests.netdata = callTest tests/netdata.nix { }; tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; }; tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; }; # TODO: put in networking.nix after the test becomes more complete @@ -304,38 +349,56 @@ in rec { tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nginx = callTest tests/nginx.nix { }; tests.nghttpx = callTest tests/nghttpx.nix { }; + tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { }; + tests.novacomd = callTestOnMatchingSystems ["x86_64-linux"] tests/novacomd.nix { }; tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; + tests.openldap = callTest tests/openldap.nix {}; + tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; - #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); + #tests.panamax = callTestOnMatchingSystems ["x86_64-linux"] tests/panamax.nix {}; tests.peerflix = callTest tests/peerflix.nix {}; tests.php-pcre = callTest tests/php-pcre.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; tests.pgmanage = callTest tests/pgmanage.nix {}; tests.postgis = callTest tests/postgis.nix {}; + tests.powerdns = callTest tests/powerdns.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {}; + tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {}; tests.printing = callTest tests/printing.nix {}; tests.prometheus = callTest tests/prometheus.nix {}; + tests.prosody = callTest tests/prosody.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.rabbitmq = callTest tests/rabbitmq.nix {}; tests.radicale = callTest tests/radicale.nix {}; + tests.rspamd = callSubTests tests/rspamd.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; + tests.rxe = callTest tests/rxe.nix {}; tests.samba = callTest tests/samba.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.statsd = callTest tests/statsd.nix {}; + tests.sudo = callTest tests/sudo.nix {}; + tests.systemd = callTest tests/systemd.nix {}; + tests.switchTest = callTest tests/switch-test.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; + tests.transmission = callTest tests/transmission.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; - tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; }; + tests.vault = callTest tests/vault.nix {}; + tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {}; tests.wordpress = callTest tests/wordpress.nix {}; + tests.xautolock = callTest tests/xautolock.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; + tests.xrdp = callTest tests/xrdp.nix {}; + tests.yabar = callTest tests/yabar.nix {}; tests.zookeeper = callTest tests/zookeeper.nix {}; /* Build a bunch of typical closures so that Hydra can keep track of diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index c2c0a716e0de5feac3f8e3860e9d9cde5e4b0ba8..5260c8ddfb827199d07f49e7d160a1385c514619 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -17,20 +17,14 @@ import ./make-test.nix ({ pkgs, lib, ... }: startAll; $machine->fail("test -f ~root/at-1"); - $machine->fail("test -f ~root/batch-1"); $machine->fail("test -f ~alice/at-1"); - $machine->fail("test -f ~alice/batch-1"); $machine->succeed("echo 'touch ~root/at-1' | at now+1min"); - $machine->succeed("echo 'touch ~root/batch-1' | batch"); $machine->succeed("su - alice -c \"echo 'touch at-1' | at now+1min\""); - $machine->succeed("su - alice -c \"echo 'touch batch-1' | batch\""); $machine->succeed("sleep 1.5m"); $machine->succeed("test -f ~root/at-1"); - $machine->succeed("test -f ~root/batch-1"); $machine->succeed("test -f ~alice/at-1"); - $machine->succeed("test -f ~alice/batch-1"); ''; }) diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix new file mode 100644 index 0000000000000000000000000000000000000000..433910feafe306475cc68702ecd9b5177680bd26 --- /dev/null +++ b/nixos/tests/beegfs.nix @@ -0,0 +1,115 @@ +import ./make-test.nix ({ pkgs, ... } : + +let + connAuthFile="beegfs/auth-def.key"; + + client = { config, pkgs, lib, ... } : { + networking.firewall.enable = false; + services.beegfsEnable = true; + services.beegfs.default = { + mgmtdHost = "mgmt"; + connAuthFile = "/etc/${connAuthFile}"; + client = { + mount = false; + enable = true; + }; + }; + + fileSystems = pkgs.lib.mkVMOverride # FIXME: this should be creatd by the module + [ { mountPoint = "/beegfs"; + device = "default"; + fsType = "beegfs"; + options = [ "cfgFile=/etc/beegfs/client-default.conf" "_netdev" ]; + } + ]; + + environment.etc."${connAuthFile}" = { + enable = true; + text = "ThisIsALousySecret"; + mode = "0600"; + }; + }; + + + server = service : { config, pkgs, lib, ... } : { + networking.firewall.enable = false; + boot.initrd.postDeviceCommands = '' + ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb + ''; + + virtualisation.emptyDiskImages = [ 4096 ]; + + fileSystems = pkgs.lib.mkVMOverride + [ { mountPoint = "/data"; + device = "/dev/disk/by-label/data"; + fsType = "ext4"; + } + ]; + + environment.systemPackages = with pkgs; [ beegfs ]; + environment.etc."${connAuthFile}" = { + enable = true; + text = "ThisIsALousySecret"; + mode = "0600"; + }; + + services.beegfsEnable = true; + services.beegfs.default = { + mgmtdHost = "mgmt"; + connAuthFile = "/etc/${connAuthFile}"; + "${service}" = { + enable = true; + storeDir = "/data"; + }; + }; + }; + +in +{ + name = "beegfs"; + + nodes = { + meta = server "meta"; + mgmt = server "mgmtd"; + storage1 = server "storage"; + storage2 = server "storage"; + client1 = client; + client2 = client; + }; + + testScript = '' + # Initalize the data directories + $mgmt->waitForUnit("default.target"); + $mgmt->succeed("beegfs-setup-mgmtd -C -f -p /data"); + $mgmt->succeed("systemctl start beegfs-mgmtd-default"); + + $meta->waitForUnit("default.target"); + $meta->succeed("beegfs-setup-meta -C -f -s 1 -p /data"); + $meta->succeed("systemctl start beegfs-meta-default"); + + $storage1->waitForUnit("default.target"); + $storage1->succeed("beegfs-setup-storage -C -f -s 1 -i 1 -p /data"); + $storage1->succeed("systemctl start beegfs-storage-default"); + + $storage2->waitForUnit("default.target"); + $storage2->succeed("beegfs-setup-storage -C -f -s 2 -i 2 -p /data"); + $storage2->succeed("systemctl start beegfs-storage-default"); + + # + + # Basic test + $client1->waitForUnit("beegfs.mount"); + $client1->succeed("beegfs-check-servers-default"); + $client1->succeed("echo test > /beegfs/test"); + $client2->waitForUnit("beegfs.mount"); + $client2->succeed("test -e /beegfs/test"); + $client2->succeed("cat /beegfs/test | grep test"); + + # test raid0/stripping + $client1->succeed("dd if=/dev/urandom bs=1M count=10 of=/beegfs/striped"); + $client2->succeed("cat /beegfs/striped > /dev/null"); + + # check if fs is still healthy + $client1->succeed("beegfs-fsck-default --checkfs"); + ''; +}) diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 3a718a79831552740efdac072946ceff3d81f50b..50c98664660a9676d02aeb717cbc38b43bd5a7f0 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -16,7 +16,7 @@ let miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf" '' ext_ifname=eth1 - listening_ip=${(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address}/24 + listening_ip=${(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address}/24 allow 1024-65535 192.168.2.0/24 1024-65535 ''; @@ -56,7 +56,7 @@ in { environment.systemPackages = [ pkgs.transmission ]; virtualisation.vlans = [ 2 ]; networking.defaultGateway = - (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address; + (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address; networking.firewall.enable = false; }; @@ -84,7 +84,7 @@ in # Create the torrent. $tracker->succeed("mkdir /tmp/data"); $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2"); - $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -p -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent"); + $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -p -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ipv4.addresses).address}:6969/announce -o /tmp/test.torrent"); $tracker->succeed("chmod 644 /tmp/test.torrent"); # Start the tracker. !!! use a less crappy tracker diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix index eeaca9f50edcf42c3e989a2a0c713dd9e37a45a0..b2e74bff6fcdcb2d3d58219585d43e38f8f36036 100644 --- a/nixos/tests/boot-stage1.nix +++ b/nixos/tests/boot-stage1.nix @@ -9,6 +9,7 @@ import ./make-test.nix ({ pkgs, ... }: { kver = config.boot.kernelPackages.kernel.modDirVersion; ksrc = "${kdev}/lib/modules/${kver}/build"; hardeningDisable = [ "pic" ]; + nativeBuildInputs = kdev.moduleBuildDependencies; } '' echo "obj-m += $name.o" > Makefile echo "$source" > "$name.c" diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 69ab4755e4447c4f8f8662d2dbefdc267c29b966..301d9d0f817f84fb760844c6682aeb50f7cf1b4d 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -1,7 +1,6 @@ { system ? builtins.currentSystem }: with import ../lib/testing.nix { inherit system; }; -with import ../lib/qemu-flags.nix; with pkgs.lib; let @@ -25,6 +24,12 @@ let my $machine = createMachine({ ${machineConfig}, qemuFlags => '-m 768' }); $machine->start; $machine->waitForUnit("multi-user.target"); + $machine->succeed("nix verify -r --no-trust /run/current-system"); + + # Test whether the channel got installed correctly. + $machine->succeed("nix-instantiate --dry-run '' -A hello"); + $machine->succeed("nix-env --dry-run -iA nixos.procps"); + $machine->shutdown; ''; }; diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix new file mode 100644 index 0000000000000000000000000000000000000000..36731773de27e3fc8b822200cbce6952bbb28ece --- /dev/null +++ b/nixos/tests/borgbackup.nix @@ -0,0 +1,162 @@ +import ./make-test.nix ({ pkgs, ... }: + +let + passphrase = "supersecret"; + dataDir = "/ran:dom/data"; + excludeFile = "not_this_file"; + keepFile = "important_file"; + keepFileData = "important_data"; + localRepo = "/root/back:up"; + archiveName = "my_archive"; + remoteRepo = "borg@server:."; # No need to specify path + privateKey = pkgs.writeText "id_ed25519" '' + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrwAAAJB+cF5HfnBe + RwAAAAtzc2gtZWQyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrw + AAAEBN75NsJZSpt63faCuaD75Unko0JjlSDxMhYHAPJk2/xXHxQHThDpD9/AMWNqQer3Tg + 9gXMb2lTZMn0pelo8xyvAAAADXJzY2h1ZXR6QGt1cnQ= + -----END OPENSSH PRIVATE KEY----- + ''; + publicKey = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHHxQHThDpD9/AMWNqQer3Tg9gXMb2lTZMn0pelo8xyv root@client + ''; + privateKeyAppendOnly = pkgs.writeText "id_ed25519" '' + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACBacZuz1ELGQdhI7PF6dGFafCDlvh8pSEc4cHjkW0QjLwAAAJC9YTxxvWE8 + cQAAAAtzc2gtZWQyNTUxOQAAACBacZuz1ELGQdhI7PF6dGFafCDlvh8pSEc4cHjkW0QjLw + AAAEAAhV7wTl5dL/lz+PF/d4PnZXuG1Id6L/mFEiGT1tZsuFpxm7PUQsZB2Ejs8Xp0YVp8 + IOW+HylIRzhweORbRCMvAAAADXJzY2h1ZXR6QGt1cnQ= + -----END OPENSSH PRIVATE KEY----- + ''; + publicKeyAppendOnly = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFpxm7PUQsZB2Ejs8Xp0YVp8IOW+HylIRzhweORbRCMv root@client + ''; + +in { + name = "borgbackup"; + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ dotlambda ]; + }; + + nodes = { + client = { config, pkgs, ... }: { + services.borgbackup.jobs = { + + local = rec { + paths = dataDir; + repo = localRepo; + preHook = '' + # Don't append a timestamp + archiveName="${archiveName}" + ''; + encryption = { + mode = "repokey"; + inherit passphrase; + }; + compression = "auto,zlib,9"; + prune.keep = { + within = "1y"; + yearly = 5; + }; + exclude = [ "*/${excludeFile}" ]; + postHook = "echo post"; + startAt = [ ]; # Do not run automatically + }; + + remote = { + paths = dataDir; + repo = remoteRepo; + encryption.mode = "none"; + startAt = [ ]; + environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519"; + }; + + remoteAppendOnly = { + paths = dataDir; + repo = remoteRepo; + encryption.mode = "none"; + startAt = [ ]; + environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly"; + }; + + }; + }; + + server = { config, pkgs, ... }: { + services.openssh = { + enable = true; + passwordAuthentication = false; + challengeResponseAuthentication = false; + }; + + services.borgbackup.repos.repo1 = { + authorizedKeys = [ publicKey ]; + path = "/data/borgbackup"; + }; + + # Second repo to make sure the authorizedKeys options are merged correctly + services.borgbackup.repos.repo2 = { + authorizedKeysAppendOnly = [ publicKeyAppendOnly ]; + path = "/data/borgbackup"; + quota = ".5G"; + }; + }; + }; + + testScript = '' + startAll; + + $client->fail('test -d "${remoteRepo}"'); + + $client->succeed("cp ${privateKey} /root/id_ed25519"); + $client->succeed("chmod 0600 /root/id_ed25519"); + $client->succeed("cp ${privateKeyAppendOnly} /root/id_ed25519.appendOnly"); + $client->succeed("chmod 0600 /root/id_ed25519.appendOnly"); + + $client->succeed("mkdir -p ${dataDir}"); + $client->succeed("touch ${dataDir}/${excludeFile}"); + $client->succeed("echo '${keepFileData}' > ${dataDir}/${keepFile}"); + + subtest "local", sub { + my $borg = "BORG_PASSPHRASE='${passphrase}' borg"; + $client->systemctl("start --wait borgbackup-job-local"); + $client->fail("systemctl is-failed borgbackup-job-local"); + # Make sure exactly one archive has been created + $client->succeed("c=\$($borg list '${localRepo}' | wc -l) && [[ \$c == '1' ]]"); + # Make sure excludeFile has been excluded + $client->fail("$borg list '${localRepo}::${archiveName}' | grep -qF '${excludeFile}'"); + # Make sure keepFile has the correct content + $client->succeed("$borg extract '${localRepo}::${archiveName}'"); + $client->succeed('c=$(cat ${dataDir}/${keepFile}) && [[ "$c" == "${keepFileData}" ]]'); + }; + + subtest "remote", sub { + my $borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519' borg"; + $server->waitForUnit("sshd.service"); + $client->waitForUnit("network.target"); + $client->systemctl("start --wait borgbackup-job-remote"); + $client->fail("systemctl is-failed borgbackup-job-remote"); + + # Make sure we can't access repos other than the specified one + $client->fail("$borg list borg\@server:wrong"); + + #TODO: Make sure that data is actually deleted + }; + + subtest "remoteAppendOnly", sub { + my $borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly' borg"; + $server->waitForUnit("sshd.service"); + $client->waitForUnit("network.target"); + $client->systemctl("start --wait borgbackup-job-remoteAppendOnly"); + $client->fail("systemctl is-failed borgbackup-job-remoteAppendOnly"); + + # Make sure we can't access repos other than the specified one + $client->fail("$borg list borg\@server:wrong"); + + #TODO: Make sure that data is not actually deleted + }; + + ''; +}) diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix new file mode 100644 index 0000000000000000000000000000000000000000..b9993062c079adcd4e7e303e851a86f30b78ccca --- /dev/null +++ b/nixos/tests/ceph.nix @@ -0,0 +1,140 @@ +import ./make-test.nix ({pkgs, ...}: rec { + name = "All-in-one-basic-ceph-cluster"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lejonet ]; + }; + + nodes = { + aio = { config, pkgs, ... }: { + virtualisation = { + emptyDiskImages = [ 20480 20480 ]; + vlans = [ 1 ]; + }; + + networking = { + firewall.allowPing = true; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + + environment.systemPackages = with pkgs; [ + bash + sudo + ceph + xfsprogs + ]; + nixpkgs.config.packageOverrides = super: { + ceph = super.ceph.override({ nss = super.nss; libxfs = super.libxfs; libaio = super.libaio; jemalloc = super.jemalloc; }); + }; + + boot.kernelModules = [ "xfs" ]; + + services.ceph.enable = true; + services.ceph.global = { + fsid = "066ae264-2a5d-4729-8001-6ad265f50b03"; + monInitialMembers = "aio"; + monHost = "192.168.1.1"; + }; + + services.ceph.mon = { + enable = true; + daemons = [ "aio" ]; + }; + + services.ceph.mgr = { + enable = true; + daemons = [ "aio" ]; + }; + + services.ceph.osd = { + enable = true; + daemons = [ "0" "1" ]; + }; + }; + }; + + testScript = { nodes, ... }: '' + startAll; + + $aio->waitForUnit("network.target"); + + # Create the ceph-related directories + $aio->mustSucceed( + "mkdir -p /var/lib/ceph/mgr/ceph-aio/", + "mkdir -p /var/lib/ceph/mon/ceph-aio/", + "mkdir -p /var/lib/ceph/osd/ceph-{0..1}/", + "chown ceph:ceph -R /var/lib/ceph/" + ); + + # Bootstrap ceph-mon daemon + $aio->mustSucceed( + "mkdir -p /var/lib/ceph/bootstrap-osd && chown ceph:ceph /var/lib/ceph/bootstrap-osd", + "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'", + "ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'", + "ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring", + "monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap", + "sudo -u ceph ceph-mon --mkfs -i aio --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring", + "touch /var/lib/ceph/mon/ceph-aio/done", + "systemctl start ceph-mon-aio" + ); + $aio->waitForUnit("ceph-mon-aio"); + + # Can't check ceph status until a mon is up + $aio->succeed("ceph -s | grep 'mon: 1 daemons'"); + + # Start the ceph-mgr daemon, it has no deps and hardly any setup + $aio->mustSucceed( + "ceph auth get-or-create mgr.aio mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-aio/keyring", + "systemctl start ceph-mgr-aio" + ); + $aio->waitForUnit("ceph-mgr-aio"); + $aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'"); + + # Bootstrap both OSDs + $aio->mustSucceed( + "mkfs.xfs /dev/vdb", + "mkfs.xfs /dev/vdc", + "mount /dev/vdb /var/lib/ceph/osd/ceph-0", + "mount /dev/vdc /var/lib/ceph/osd/ceph-1", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-0/keyring --name osd.0 --add-key AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-1/keyring --name osd.1 --add-key AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==", + "echo '{\"cephx_secret\": \"AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==\"}' | ceph osd new 55ba2294-3e24-478f-bee0-9dca4c231dd9 -i -", + "echo '{\"cephx_secret\": \"AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==\"}' | ceph osd new 5e97a838-85b6-43b0-8950-cb56d554d1e5 -i -" + ); + + # Initialize the OSDs with regular filestore + $aio->mustSucceed( + "ceph-osd -i 0 --mkfs --osd-uuid 55ba2294-3e24-478f-bee0-9dca4c231dd9", + "ceph-osd -i 1 --mkfs --osd-uuid 5e97a838-85b6-43b0-8950-cb56d554d1e5", + "chown -R ceph:ceph /var/lib/ceph/osd", + "systemctl start ceph-osd-0", + "systemctl start ceph-osd-1" + ); + + $aio->waitUntilSucceeds("ceph osd stat | grep '2 osds: 2 up, 2 in'"); + $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active)'"); + $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'"); + + $aio->mustSucceed( + "ceph osd pool create aio-test 100 100", + "ceph osd pool ls | grep 'aio-test'", + "ceph osd pool rename aio-test aio-other-test", + "ceph osd pool ls | grep 'aio-other-test'", + "ceph -s | grep '1 pools, 100 pgs'", + "ceph osd getcrushmap -o crush", + "crushtool -d crush -o decrushed", + "sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush", + "crushtool -c modcrush -o recrushed", + "ceph osd setcrushmap -i recrushed", + "ceph osd pool set aio-other-test size 2" + ); + $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'"); + $aio->waitUntilSucceeds("ceph -s | grep '100 active+clean'"); + $aio->mustFail( + "ceph osd pool ls | grep 'aio-test'", + "ceph osd pool delete aio-other-test aio-other-test --yes-i-really-really-mean-it" + ); + ''; +}) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 3a2c6516476679fc58101ad3ce6aa126fbbaf905..65c314e22e1d251e1696d16e859dc84bbc8166ad 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -151,11 +151,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec { $machine->screenshot("sandbox_info"); - $machine->succeed(ru "${xdo "submit-url" '' + $machine->succeed(ru "${xdo "find-window" '' search --sync --onlyvisible --name "sandbox status" windowfocus --sync ''}"); - $machine->succeed(ru "${xdo "submit-url" '' + $machine->succeed(ru "${xdo "copy-sandbox-info" '' key --delay 1000 Ctrl+a Ctrl+c ''}"); @@ -166,6 +166,26 @@ mapAttrs (channel: chromiumPkg: makeTest rec { && $clipboard =~ /network namespaces.*yes/mi && $clipboard =~ /seccomp.*sandbox.*yes/mi && $clipboard =~ /you are adequately sandboxed/mi; + + $machine->sleep(1); + $machine->succeed(ru "${xdo "find-window-after-copy" '' + search --onlyvisible --name "sandbox status" + ''}"); + + my $clipboard = $machine->succeed(ru "echo void | ${pkgs.xclip}/bin/xclip -i"); + $machine->succeed(ru "${xdo "copy-sandbox-info" '' + key --delay 1000 Ctrl+a Ctrl+c + ''}"); + + my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o"); + die "copying twice in a row does not work properly: $clipboard" + unless $clipboard =~ /namespace sandbox.*yes/mi + && $clipboard =~ /pid namespaces.*yes/mi + && $clipboard =~ /network namespaces.*yes/mi + && $clipboard =~ /seccomp.*sandbox.*yes/mi + && $clipboard =~ /you are adequately sandboxed/mi; + + $machine->screenshot("afer_copy_from_chromium"); }; $machine->shutdown; diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 4666637992411e5b439404db8ae4df2bcff5f660..4d3b58abc6e557992fc9094c845cdfbe0ace02d1 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -12,7 +12,6 @@ let # the sequence of address assignment less stochastic. networking.useDHCP = false; - networking.interfaces.eth1.prefixLength = 24; # CJDNS output is incompatible with the XML log. systemd.services.cjdns.serviceConfig.StandardOutput = "null"; #networking.firewall.enable = true; @@ -49,7 +48,9 @@ import ./make-test.nix ({ pkgs, ...} : { { imports = [ basicConfig ]; - networking.interfaces.eth1.ipAddress = "192.168.0.2"; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.2"; prefixLength = 24; } + ]; services.cjdns = { UDPInterface = @@ -76,7 +77,9 @@ import ./make-test.nix ({ pkgs, ...} : { CJDNS_ADMIN_PASSWORD=FOOBAR ''; - networking.interfaces.eth1.ipAddress = "192.168.0.1"; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.1"; prefixLength = 24; } + ]; services.cjdns = { authorizedPasswords = [ carolPassword ]; diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index c0add7eff360fc96c8200d24ec97d782d5345d9a..2a258e4bff542bb65b9a5c9ad29fa8e29f77dde0 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -1,7 +1,6 @@ { system ? builtins.currentSystem }: with import ../lib/testing.nix { inherit system; }; -with import ../lib/qemu-flags.nix; with pkgs.lib; let diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix index 9b53d9d61a16179994e3528003eb1736c6103cdd..10cde45d18a8bc98ee904ab87b9438a33d2b0729 100644 --- a/nixos/tests/common/letsencrypt.nix +++ b/nixos/tests/common/letsencrypt.nix @@ -138,8 +138,8 @@ let boulder = let owner = "letsencrypt"; repo = "boulder"; - rev = "9866abab8962a591f06db457a4b84c518cc88243"; - version = "20170510"; + rev = "9c6a1f2adc4c26d925588f5ae366cfd4efb7813a"; + version = "20180129"; in pkgs.buildGoPackage rec { name = "${repo}-${version}"; @@ -147,7 +147,7 @@ let src = pkgs.fetchFromGitHub { name = "${name}-src"; inherit rev owner repo; - sha256 = "170m5cjngbrm36wi7wschqw8jzs7kxpcyzmshq3pcrmcpigrhna1"; + sha256 = "09kszswrifm9rc6idfaq0p1mz5w21as2qbc8gd5pphrq9cf9pn55"; }; postPatch = '' @@ -168,6 +168,18 @@ let cat "${snakeOilCa}/ca.pem" > test/test-ca.pem ''; + # Until vendored pkcs11 is go 1.9 compatible + preBuild = '' + rm -r go/src/github.com/letsencrypt/boulder/vendor/github.com/miekg/pkcs11 + ''; + + extraSrcs = map mkGoDep [ + { goPackagePath = "github.com/miekg/pkcs11"; + rev = "6dbd569b952ec150d1425722dbbe80f2c6193f83"; + sha256 = "1m8g6fx7df6hf6q6zsbyw1icjmm52dmsx28rgb0h930wagvngfwb"; + } + ]; + goPackagePath = "github.com/${owner}/${repo}"; buildInputs = [ pkgs.libtool ]; }; @@ -284,7 +296,11 @@ let ocsp-updater.after = [ "boulder-publisher" ]; ocsp-responder.args = "--config ${cfgDir}/ocsp-responder.json"; ct-test-srv = {}; - mail-test-srv.args = "--closeFirst 5"; + mail-test-srv.args = let + key = "${boulderSource}/test/mail-test-srv/minica-key.pem"; + crt = "${boulderSource}/test/mail-test-srv/minica.pem"; + in + "--closeFirst 5 --cert ${crt} --key ${key}"; }; commonPath = [ softhsm pkgs.mariadb goose boulder ]; diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index b8d4759684cc5179dcdd1b7fbf74dc69b3968973..dfef46a2ada495fc4ba814881b80e5f69949c9ce 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -26,8 +26,8 @@ import ./make-test.nix ({ pkgs, ...} : { }; networking.interfaces = { br0 = { - ip4 = [{ address = hostIp; prefixLength = 24; }]; - ip6 = [{ address = hostIp6; prefixLength = 7; }]; + ipv4.addresses = [{ address = hostIp; prefixLength = 24; }]; + ipv6.addresses = [{ address = hostIp6; prefixLength = 7; }]; }; }; diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix index 6339c8c558b9b251f4a824faf508cdb1de3f3a2f..df3f3354b2d994f6f9733b13b5b333dd8b6aa7ff 100644 --- a/nixos/tests/containers-extra_veth.nix +++ b/nixos/tests/containers-extra_veth.nix @@ -21,11 +21,11 @@ import ./make-test.nix ({ pkgs, ...} : { }; networking.interfaces = { br0 = { - ip4 = [{ address = "192.168.0.1"; prefixLength = 24; }]; - ip6 = [{ address = "fc00::1"; prefixLength = 7; }]; + ipv4.addresses = [{ address = "192.168.0.1"; prefixLength = 24; }]; + ipv6.addresses = [{ address = "fc00::1"; prefixLength = 7; }]; }; br1 = { - ip4 = [{ address = "192.168.1.1"; prefixLength = 24; }]; + ipv4.addresses = [{ address = "192.168.1.1"; prefixLength = 24; }]; }; }; diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix index c7a85f190a5d14b2c8716e984bbdebd9fe297934..df1ef6d149364bd8a2b0b8941e944a75c2ca6262 100644 --- a/nixos/tests/containers-hosts.nix +++ b/nixos/tests/containers-hosts.nix @@ -13,9 +13,9 @@ import ./make-test.nix ({ pkgs, ...} : { virtualisation.vlans = []; networking.bridges.br0.interfaces = []; - networking.interfaces.br0 = { - ip4 = [ { address = "10.11.0.254"; prefixLength = 24; } ]; - }; + networking.interfaces.br0.ipv4.addresses = [ + { address = "10.11.0.254"; prefixLength = 24; } + ]; # Force /etc/hosts to be the only source for host name resolution environment.etc."nsswitch.conf".text = lib.mkForce '' diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 7e2a54976387d572d0b165b93a26b48087503f45..015b79b1cee6ec28224bcdf0ce9874b571eb4527 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -15,12 +15,12 @@ import ./make-test.nix ({ pkgs, ...} : { # container available within the VM, because we don't have network access. virtualisation.pathsInNixDB = let emptyContainer = import ../lib/eval-config.nix { - inherit (config.nixpkgs) system; + inherit (config.nixpkgs.localSystem) system; modules = lib.singleton { containers.foo.config = {}; }; }; - in [ pkgs.stdenv emptyContainer.config.containers.foo.path ]; + in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ]; }; testScript = diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix index 721f9848149781288c3966ce417b0ee8721ee828..390dc4ad2c29c9e6eb199a4ab9b63eeac28db7da 100644 --- a/nixos/tests/containers-macvlans.nix +++ b/nixos/tests/containers-macvlans.nix @@ -26,9 +26,9 @@ import ./make-test.nix ({ pkgs, ...} : { interface = "eth1"; mode = "bridge"; }; - networking.interfaces.eth1.ip4 = lib.mkForce []; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce []; networking.interfaces.mv-eth1-host = { - ip4 = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; }; containers.test1 = { @@ -37,7 +37,7 @@ import ./make-test.nix ({ pkgs, ...} : { config = { networking.interfaces.mv-eth1 = { - ip4 = [ { address = containerIp1; prefixLength = 24; } ]; + ipv4.addresses = [ { address = containerIp1; prefixLength = 24; } ]; }; }; }; @@ -48,7 +48,7 @@ import ./make-test.nix ({ pkgs, ...} : { config = { networking.interfaces.mv-eth1 = { - ip4 = [ { address = containerIp2; prefixLength = 24; } ]; + ipv4.addresses = [ { address = containerIp2; prefixLength = 24; } ]; }; }; }; diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix index a3b0b29951bffefbb999b42b445c32ac405943f8..bde8e175f9532121ed8e3f59016596d9601bb585 100644 --- a/nixos/tests/containers-physical_interfaces.nix +++ b/nixos/tests/containers-physical_interfaces.nix @@ -16,9 +16,9 @@ import ./make-test.nix ({ pkgs, ...} : { interfaces = [ "eth1" ]; config = { - networking.interfaces.eth1 = { - ip4 = [ { address = "10.10.0.1"; prefixLength = 24; } ]; - }; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "10.10.0.1"; prefixLength = 24; } + ]; networking.firewall.enable = false; }; }; @@ -33,9 +33,9 @@ import ./make-test.nix ({ pkgs, ...} : { config = { networking.bridges.br0.interfaces = [ "eth1" ]; - networking.interfaces.br0 = { - ip4 = [ { address = "10.10.0.2"; prefixLength = 24; } ]; - }; + networking.interfaces.br0.ipv4.addresses = [ + { address = "10.10.0.2"; prefixLength = 24; } + ]; networking.firewall.enable = false; }; }; @@ -52,11 +52,11 @@ import ./make-test.nix ({ pkgs, ...} : { config = { networking.bonds.bond0 = { interfaces = [ "eth1" ]; - mode = "active-backup"; - }; - networking.interfaces.bond0 = { - ip4 = [ { address = "10.10.0.3"; prefixLength = 24; } ]; + driverOptions.mode = "active-backup"; }; + networking.interfaces.bond0.ipv4.addresses = [ + { address = "10.10.0.3"; prefixLength = 24; } + ]; networking.firewall.enable = false; }; }; @@ -73,12 +73,12 @@ import ./make-test.nix ({ pkgs, ...} : { config = { networking.bonds.bond0 = { interfaces = [ "eth1" ]; - mode = "active-backup"; + driverOptions.mode = "active-backup"; }; networking.bridges.br0.interfaces = [ "bond0" ]; - networking.interfaces.br0 = { - ip4 = [ { address = "10.10.0.4"; prefixLength = 24; } ]; - }; + networking.interfaces.br0.ipv4.addresses = [ + { address = "10.10.0.4"; prefixLength = 24; } + ]; networking.firewall.enable = false; }; }; diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index b5867c6f6ab180c6bf29da176886b0b79a666e7f..5fb42f2272b357ef67e6440bce3a49a76c60a0b0 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -11,7 +11,7 @@ let # prevent make-test.nix to change IP networking.interfaces = { - eth1.ip4 = lib.mkOverride 0 [ ]; + eth1.ipv4.addresses = lib.mkOverride 0 [ ]; }; }; in { diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix index 086d056c51cd57fc7f778ca6c23ec0bb19f2e339..f68c9b07759b2185ea2085289b37336653bed06d 100644 --- a/nixos/tests/containers-restart_networking.nix +++ b/nixos/tests/containers-restart_networking.nix @@ -11,7 +11,7 @@ let config = { networking.firewall.enable = false; networking.firewall.allowPing = true; - networking.interfaces.eth0.ip4 = [ + networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.122"; prefixLength = 24; } ]; }; @@ -33,8 +33,8 @@ in import ./make-test.nix ({ pkgs, lib, ...} : rstp = false; }; networking.interfaces = { - eth1.ip4 = lib.mkOverride 0 [ ]; - br0.ip4 = [{ address = "192.168.1.1"; prefixLength = 24; }]; + eth1.ipv4.addresses = lib.mkOverride 0 [ ]; + br0.ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; }; }; @@ -44,8 +44,8 @@ in import ./make-test.nix ({ pkgs, lib, ...} : rstp = false; }; networking.interfaces = { - eth1.ip4 = lib.mkOverride 0 [ ]; - br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }]; + eth1.ipv4.addresses = lib.mkOverride 0 [ ]; + br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; }; }; client_eth1_rstp = { lib, pkgs, ... }: client_base // { @@ -54,8 +54,8 @@ in import ./make-test.nix ({ pkgs, lib, ...} : rstp = true; }; networking.interfaces = { - eth1.ip4 = lib.mkOverride 0 [ ]; - br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }]; + eth1.ipv4.addresses = lib.mkOverride 0 [ ]; + br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; }; }; }; diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index 564831fa27373f9dfcde73f3f3341b23677aa3f9..873dd364369fb27a55dde8241df5c7ccd93e4c13 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -1,7 +1,7 @@ # Test for NixOS' container support. import ./make-test.nix ({ pkgs, ...} : { - name = "containers-bridge"; + name = "containers-tmpfs"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ckampka ]; }; diff --git a/nixos/tests/couchdb.nix b/nixos/tests/couchdb.nix new file mode 100644 index 0000000000000000000000000000000000000000..a3f675236bc6fc2cc3d7c3255d7aaf47459fbb87 --- /dev/null +++ b/nixos/tests/couchdb.nix @@ -0,0 +1,56 @@ +import ./make-test.nix ({ pkgs, lib, ...}: + +with lib; + +{ + name = "couchdb"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ fpletz ]; + }; + + nodes = { + couchdb1 = + { pkgs, config, ... }: + + { environment.systemPackages = with pkgs; [ jq ]; + services.couchdb.enable = true; + }; + + couchdb2 = + { pkgs, config, ... }: + + { environment.systemPackages = with pkgs; [ jq ]; + services.couchdb.enable = true; + services.couchdb.package = pkgs.couchdb2; + }; + }; + + testScript = let + curlJqCheck = action: path: jqexpr: result: + pkgs.writeScript "curl-jq-check-${action}-${path}.sh" '' + RESULT=$(curl -X ${action} http://127.0.0.1:5984/${path} | jq -r '${jqexpr}') + echo $RESULT >&2 + if [ "$RESULT" != "${result}" ]; then + exit 1 + fi + ''; + in '' + startAll; + + $couchdb1->waitForUnit("couchdb.service"); + $couchdb1->waitUntilSucceeds("${curlJqCheck "GET" "" ".couchdb" "Welcome"}"); + $couchdb1->waitUntilSucceeds("${curlJqCheck "GET" "_all_dbs" ". | length" "2"}"); + $couchdb1->succeed("${curlJqCheck "PUT" "foo" ".ok" "true"}"); + $couchdb1->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "3"}"); + $couchdb1->succeed("${curlJqCheck "DELETE" "foo" ".ok" "true"}"); + $couchdb1->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "2"}"); + + $couchdb2->waitForUnit("couchdb.service"); + $couchdb2->waitUntilSucceeds("${curlJqCheck "GET" "" ".couchdb" "Welcome"}"); + $couchdb2->waitUntilSucceeds("${curlJqCheck "GET" "_all_dbs" ". | length" "0"}"); + $couchdb2->succeed("${curlJqCheck "PUT" "foo" ".ok" "true"}"); + $couchdb2->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "1"}"); + $couchdb2->succeed("${curlJqCheck "DELETE" "foo" ".ok" "true"}"); + $couchdb2->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "0"}"); + ''; +}) diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix new file mode 100644 index 0000000000000000000000000000000000000000..9d7fa3e7a8c528d0707688a8cde967e7407a5d2e --- /dev/null +++ b/nixos/tests/docker-tools-overlay.nix @@ -0,0 +1,32 @@ +# this test creates a simple GNU image with docker tools and sees if it executes + +import ./make-test.nix ({ pkgs, ... }: +{ + name = "docker-tools-overlay"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lnl7 ]; + }; + + nodes = { + docker = + { config, pkgs, ... }: + { + virtualisation.docker.enable = true; + virtualisation.docker.storageDriver = "overlay"; # defaults to overlay2 + }; + }; + + testScript = + '' + $docker->waitForUnit("sockets.target"); + + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + + # Check if the nix store has correct user permissions depending on what + # storage driver is used, incorrectly built images can show up as readonly. + # drw------- 3 0 0 3 Apr 14 11:36 /nix + # drw------- 99 0 0 100 Apr 14 11:36 /nix/store + $docker->succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + ''; +}) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix new file mode 100644 index 0000000000000000000000000000000000000000..4466081d01e9f9e043ee7015cffeaf262281a0ad --- /dev/null +++ b/nixos/tests/docker-tools.nix @@ -0,0 +1,49 @@ +# this test creates a simple GNU image with docker tools and sees if it executes + +import ./make-test.nix ({ pkgs, ... }: { + name = "docker-tools"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lnl7 ]; + }; + + nodes = { + docker = + { config, pkgs, ... }: { + virtualisation = { + diskSize = 2048; + docker.enable = true; + }; + }; + }; + + testScript = + '' + $docker->waitForUnit("sockets.target"); + + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + $docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}"); + + # Check if the nix store is correctly initialized by listing dependencies of the installed Nix binary + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nix}'"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.nix.imageName} nix-store -qR ${pkgs.nix}"); + $docker->succeed("docker rmi ${pkgs.dockerTools.examples.nix.imageName}"); + + # To test the pullImage tool + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nixFromDockerHub}'"); + $docker->succeed("docker run --rm nixos/nix:1.11 nix-store --version"); + $docker->succeed("docker rmi nixos/nix:1.11"); + + # To test runAsRoot and entry point + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nginx}'"); + $docker->succeed("docker run --name nginx -d -p 8000:80 ${pkgs.dockerTools.examples.nginx.imageName}"); + $docker->waitUntilSucceeds('curl http://localhost:8000/'); + $docker->succeed("docker rm --force nginx"); + $docker->succeed("docker rmi '${pkgs.dockerTools.examples.nginx.imageName}'"); + + # An pulled image can be used as base image + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.onTopOfPulledImage}'"); + $docker->succeed("docker run --rm ontopofpulledimage hello"); + $docker->succeed("docker rmi ontopofpulledimage"); + ''; +}) diff --git a/nixos/tests/dovecot.nix b/nixos/tests/dovecot.nix index 3814855ed8e70ad609a774747e7a68a51dde5a1c..156079d1d585d57f1ea9f6326097f5bf5ffd450b 100644 --- a/nixos/tests/dovecot.nix +++ b/nixos/tests/dovecot.nix @@ -18,6 +18,18 @@ import ./make-test.nix { MAIL ''; + sendTestMailViaDeliveryAgent = pkgs.writeScriptBin "send-lda" '' + #!${pkgs.stdenv.shell} + + exec ${pkgs.dovecot}/libexec/dovecot/deliver -d bob <waitForUnit('postfix.service'); $machine->waitForUnit('dovecot2.service'); $machine->succeed('send-testmail'); + $machine->succeed('send-lda'); $machine->waitUntilFails('[ "$(postqueue -p)" != "Mail queue is empty" ]'); $machine->succeed('test-imap'); $machine->succeed('test-pop'); diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 4ec7e56cc6cb554280e657c579452b9e91cfc363..f585fa2ec237bb83e60f4f531520e828b450bc77 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -1,7 +1,6 @@ { system ? builtins.currentSystem }: with import ../lib/testing.nix { inherit system; }; -with import ../lib/qemu-flags.nix; with pkgs.lib; let diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 65ff1cac070bd9b20814ab5020e6ff86779bfc8c..ed656b3628b9edc8f96a73484ecdae5c01a80861 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -1,95 +1,107 @@ -# Test the ELK stack: Elasticsearch, Logstash and Kibana. - -import ./make-test.nix ({ pkgs, ...} : +{ system ? builtins.currentSystem }: +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; 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; + mkElkTest = name : elk : makeTest { + inherit name; + 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 ]; + # 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}" ] - } - ''; - }; + services = { + logstash = { + enable = true; + package = elk.logstash; + 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; - }; + elasticsearch = { + enable = true; + package = elk.elasticsearch; + }; - kibana = { - enable = true; - package = pkgs.kibana5; - elasticsearch.url = esUrl; + kibana = { + enable = true; + package = elk.kibana; + elasticsearch.url = esUrl; + }; }; }; - }; - }; + }; - testScript = '' - startAll; + testScript = '' + startAll; - $one->waitForUnit("elasticsearch.service"); + $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"); + # 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"); + # 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 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"); - ''; -}) + # 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"); + ''; + }; +in mapAttrs mkElkTest { + "ELK-5" = { + elasticsearch = pkgs.elasticsearch5; + logstash = pkgs.logstash5; + kibana = pkgs.kibana5; + }; + "ELK-6" = { + elasticsearch = pkgs.elasticsearch6; + logstash = pkgs.logstash6; + kibana = pkgs.kibana6; + }; +} diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index 8f2a8c01eebc03566a2edd5ff9780b6dcb206bcc..bb7daae118c0845864ce9415b0a49e7fb659d80b 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -11,8 +11,8 @@ import ./make-test.nix ({ pkgs, ...} : { with pkgs.lib; { networking = { - interfaces.eth1.ip6 = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ]; - interfaces.eth1.ip4 = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ]; + interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ]; + interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ]; }; }; server = @@ -20,8 +20,8 @@ import ./make-test.nix ({ pkgs, ...} : { with pkgs.lib; { networking = { - interfaces.eth1.ip6 = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ]; - interfaces.eth1.ip4 = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ]; + interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ]; + interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ]; }; services = { diff --git a/nixos/tests/fwupd.nix b/nixos/tests/fwupd.nix new file mode 100644 index 0000000000000000000000000000000000000000..bf4ef25130b3da722e088c1b602ddfc024720736 --- /dev/null +++ b/nixos/tests/fwupd.nix @@ -0,0 +1,19 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: { + name = "fwupd"; + + meta = { + maintainers = pkgs.fwupd.meta.maintainers; + }; + + machine = { config, pkgs, ... }: { + services.fwupd.enable = true; + environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + environment.variables.XDG_DATA_DIRS = [ "${pkgs.fwupd.installedTests}/share" ]; + virtualisation.memorySize = 768; + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner"); + ''; +}) diff --git a/nixos/tests/gjs.nix b/nixos/tests/gjs.nix new file mode 100644 index 0000000000000000000000000000000000000000..e6002ef98dd0c896f497c496d6fff75c83a1c3eb --- /dev/null +++ b/nixos/tests/gjs.nix @@ -0,0 +1,19 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: { + name = "gjs"; + + meta = { + maintainers = pkgs.gnome3.gjs.meta.maintainers; + }; + + machine = { pkgs, ... }: { + imports = [ ./common/x11.nix ]; + environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + environment.variables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gjs.installedTests}/share" ]; + }; + + testScript = '' + $machine->waitForX; + $machine->succeed("gnome-desktop-testing-runner"); + ''; +}) diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix deleted file mode 100644 index 992b77227a4bca1e8513b508a4c6c97e1d6629c4..0000000000000000000000000000000000000000 --- a/nixos/tests/glance.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ system ? builtins.currentSystem }: - -with import ../lib/testing.nix { inherit system; }; -with pkgs.lib; - -let - glanceMysqlPassword = "glanceMysqlPassword"; - glanceAdminPassword = "glanceAdminPassword"; - - createDb = pkgs.writeText "db-provisionning.sql" '' - create database keystone; - GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY 'keystone'; - GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY 'keystone'; - - create database glance; - GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'localhost' IDENTIFIED BY '${glanceMysqlPassword}'; - GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' IDENTIFIED BY '${glanceMysqlPassword}'; - ''; - - image = - (import ../lib/eval-config.nix { - inherit system; - modules = [ ../../nixos/modules/virtualisation/nova-image.nix ]; - }).config.system.build.novaImage; - - # The admin keystone account - adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=keystone OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; - -in makeTest { - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ lewo ]; - }; - machine = - { config, pkgs, ... }: - { - services.mysql.enable = true; - services.mysql.package = pkgs.mysql; - services.mysql.initialScript = createDb; - - virtualisation = { - openstack.keystone = { - enable = true; - database.password = { value = "keystone"; storage = "fromNixStore"; }; - adminToken = { value = "adminToken"; storage = "fromNixStore"; }; - bootstrap.enable = true; - bootstrap.adminPassword = { value = "keystone"; storage = "fromNixStore"; }; - }; - - openstack.glance = { - enable = true; - database.password = { value = glanceMysqlPassword; storage = "fromNixStore"; }; - servicePassword = { value = glanceAdminPassword; storage = "fromNixStore"; }; - - bootstrap = { - enable = true; - keystoneAdminPassword = { value = "keystone"; storage = "fromNixStore"; }; - }; - }; - - memorySize = 2096; - diskSize = 4 * 1024; - }; - - environment.systemPackages = with pkgs.pythonPackages; with pkgs; [ - openstackclient - ]; - }; - - testScript = - '' - $machine->waitForUnit("glance-api.service"); - - # Since Glance api can take time to start, we retry until success - $machine->waitUntilSucceeds("${adminOpenstackCmd} image create nixos --file ${image}/nixos.img --disk-format qcow2 --container-format bare --public"); - $machine->succeed("${adminOpenstackCmd} image list") =~ /nixos/ or die; - ''; -} diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix index 4b459e93e1be613fc395a317d551a94a766d3141..71ae1709d526433eb00544a283b442bf69d67894 100644 --- a/nixos/tests/gnome3-gdm.nix +++ b/nixos/tests/gnome3-gdm.nix @@ -26,15 +26,22 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' + # wait for gdm to start and bring up X + $machine->waitForUnit("display-manager.service"); $machine->waitForX; - $machine->sleep(15); + + # wait for alice to be logged in + $machine->waitForUnit("default.target","alice"); # Check that logging in has given the user ownership of devices. $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); - $machine->succeed("xauth merge ~alice/.Xauthority"); + # open a terminal and check it's there + $machine->succeed("su - alice -c 'DISPLAY=:0.0 XAUTHORITY=/run/user/\$UID/gdm/Xauthority gnome-terminal'"); + $machine->succeed("xauth merge /run/user/1000/gdm/Xauthority"); $machine->waitForWindow(qr/Terminal/); + + # wait to get a nice screenshot $machine->sleep(20); $machine->screenshot("screen"); ''; diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix index 16b8181498a6fb70618d5f2e5b44f0c222ec6737..d45776c3ee29333b898ab1fa3c29e178df99900b 100644 --- a/nixos/tests/grafana.nix +++ b/nixos/tests/grafana.nix @@ -20,6 +20,6 @@ import ./make-test.nix ({ lib, ... }: $machine->start; $machine->waitForUnit("grafana.service"); $machine->waitForOpenPort(3000); - $machine->succeed("curl -sS http://127.0.0.1:3000/"); + $machine->succeed("curl -sSfL http://127.0.0.1:3000/"); ''; }) diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4f30f01e403224460d727e85813ce424ce3aa930 --- /dev/null +++ b/nixos/tests/hocker-fetchdocker/default.nix @@ -0,0 +1,15 @@ +import ../make-test.nix ({ pkgs, ...} : { + name = "test-hocker-fetchdocker"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ixmatus ]; + }; + + machine = import ./machine.nix; + + testScript = '' + startAll; + + $machine->waitForUnit("sockets.target"); + $machine->waitUntilSucceeds("docker run registry-1.docker.io/v2/library/hello-world:latest"); + ''; +}) diff --git a/nixos/tests/hocker-fetchdocker/hello-world-container.nix b/nixos/tests/hocker-fetchdocker/hello-world-container.nix new file mode 100644 index 0000000000000000000000000000000000000000..a127875264e95f94617f00c28427244ef3fc2626 --- /dev/null +++ b/nixos/tests/hocker-fetchdocker/hello-world-container.nix @@ -0,0 +1,19 @@ +{ fetchDockerConfig, fetchDockerLayer, fetchdocker }: +fetchdocker rec { + name = "hello-world"; + registry = "https://registry-1.docker.io/v2/"; + repository = "library"; + imageName = "hello-world"; + tag = "latest"; + imageConfig = fetchDockerConfig { + inherit tag registry repository imageName; + sha256 = "1ivbd23hyindkahzfw4kahgzi6ibzz2ablmgsz6340vc6qr1gagj"; + }; + imageLayers = let + layer0 = fetchDockerLayer { + inherit registry repository imageName; + layerDigest = "ca4f61b1923c10e9eb81228bd46bee1dfba02b9c7dac1844527a734752688ede"; + sha256 = "1plfd194fwvsa921ib3xkhms1yqxxrmx92r2h7myj41wjaqn2kya"; + }; + in [ layer0 ]; + } diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix new file mode 100644 index 0000000000000000000000000000000000000000..12c58a01224322add8698a305eda5cbf8d5c09d0 --- /dev/null +++ b/nixos/tests/hocker-fetchdocker/machine.nix @@ -0,0 +1,26 @@ +{ config, pkgs, ... }: +{ nixpkgs.config.packageOverrides = pkgs': { + hello-world-container = pkgs'.callPackage ./hello-world-container.nix { }; + }; + + virtualisation.docker = { + enable = true; + package = pkgs.docker; + }; + + systemd.services.docker-load-fetchdocker-image = { + description = "Docker load hello-world-container"; + wantedBy = [ "multi-user.target" ]; + wants = [ "docker.service" "local-fs.target" ]; + after = [ "docker.service" "local-fs.target" ]; + + script = '' + ${pkgs.hello-world-container}/compositeImage.sh | ${pkgs.docker}/bin/docker load + ''; + + serviceConfig = { + Type = "oneshot"; + }; + }; +} + diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix new file mode 100644 index 0000000000000000000000000000000000000000..2e45dc78471f0822df99d0f4cb719001ef78d483 --- /dev/null +++ b/nixos/tests/home-assistant.nix @@ -0,0 +1,76 @@ +import ./make-test.nix ({ pkgs, ... }: + +let + configDir = "/var/lib/foobar"; + apiPassword = "secret"; + +in { + name = "home-assistant"; + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ dotlambda ]; + }; + + nodes = { + hass = + { config, pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + mosquitto + ]; + services.home-assistant = { + inherit configDir; + enable = true; + package = pkgs.home-assistant.override { + extraPackages = ps: with ps; [ hbmqtt ]; + }; + config = { + homeassistant = { + name = "Home"; + time_zone = "UTC"; + latitude = "0.0"; + longitude = "0.0"; + elevation = 0; + }; + frontend = { }; + http.api_password = apiPassword; + mqtt = { }; # Use hbmqtt as broker + binary_sensor = [ + { + platform = "mqtt"; + state_topic = "home-assistant/test"; + payload_on = "let_there_be_light"; + payload_off = "off"; + } + ]; + }; + }; + }; + }; + + testScript = '' + startAll; + $hass->waitForUnit("home-assistant.service"); + + # Since config is specified using a Nix attribute set, + # configuration.yaml is a link to the Nix store + $hass->succeed("test -L ${configDir}/configuration.yaml"); + + # Check that Home Assistant's web interface and API can be reached + $hass->waitForOpenPort(8123); + $hass->succeed("curl --fail http://localhost:8123/states"); + $hass->succeed("curl --fail -H 'x-ha-access: ${apiPassword}' http://localhost:8123/api/ | grep -qF 'API running'"); + + # Toggle a binary sensor using MQTT + $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'"); + $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${apiPassword}' -m let_there_be_light"); + $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'"); + + # Check that no errors were logged + $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR"); + + # Print log to ease debugging + my $log = $hass->succeed("cat ${configDir}/home-assistant.log"); + print "\n### home-assistant.log ###\n"; + print "$log\n"; + ''; +}) diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix new file mode 100644 index 0000000000000000000000000000000000000000..21ff3cafed7ce48c902b10ee20eec12557370829 --- /dev/null +++ b/nixos/tests/iftop.nix @@ -0,0 +1,30 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "iftop"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + + nodes = { + withIftop = { + imports = [ ./common/user-account.nix ]; + + programs.iftop.enable = true; + }; + withoutIftop = { + imports = [ ./common/user-account.nix ]; + }; + }; + + testScript = '' + subtest "machine with iftop enabled", sub { + $withIftop->start; + $withIftop->succeed("su -l alice -c 'iftop -t -s 1'"); + }; + subtest "machine without iftop", sub { + $withoutIftop->start; + $withoutIftop->mustFail("su -l alice -c 'iftop -t -s 1'"); + }; + ''; +}) diff --git a/nixos/tests/initrd-network-ssh.nix b/nixos/tests/initrd-network-ssh.nix deleted file mode 100644 index 5966104939215ed6f652ef3eb0216907a9aabb38..0000000000000000000000000000000000000000 --- a/nixos/tests/initrd-network-ssh.nix +++ /dev/null @@ -1,74 +0,0 @@ -import ./make-test.nix ({ pkgs, lib, ... }: - -let - keys = pkgs.runCommand "gen-keys" { - outputs = [ "out" "dbPub" "dbPriv" "sshPub" "sshPriv" ]; - buildInputs = with pkgs; [ dropbear openssh ]; - } - '' - touch $out - dropbearkey -t rsa -f $dbPriv -s 4096 | sed -n 2p > $dbPub - ssh-keygen -q -t rsa -b 4096 -N "" -f client - mv client $sshPriv - mv client.pub $sshPub - ''; - -in { - name = "initrd-network-ssh"; - meta = with lib.maintainers; { - maintainers = [ willibutz ]; - }; - - nodes = with lib; rec { - server = - { config, pkgs, ... }: - { - boot.kernelParams = [ - "ip=${ - (head config.networking.interfaces.eth1.ip4).address - }:::255.255.255.0::eth1:none" - ]; - boot.initrd.network = { - enable = true; - ssh = { - enable = true; - authorizedKeys = [ "${readFile keys.sshPub}" ]; - port = 22; - hostRSAKey = keys.dbPriv; - }; - }; - boot.initrd.preLVMCommands = '' - while true; do - if [ -f fnord ]; then - poweroff - fi - sleep 1 - done - ''; - }; - - client = - { config, pkgs, ... }: - { - environment.etc.knownHosts = { - text = concatStrings [ - "server," - "${toString (head (splitString " " ( - toString (elemAt (splitString "\n" config.networking.extraHosts) 2) - )))} " - "${readFile keys.dbPub}" - ]; - }; - }; - }; - - testScript = '' - startAll; - $client->waitForUnit("network.target"); - $client->copyFileFromHost("${keys.sshPriv}","/etc/sshKey"); - $client->succeed("chmod 0600 /etc/sshKey"); - $client->waitUntilSucceeds("ping -c 1 server"); - $client->succeed("ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'touch /fnord'"); - $client->shutdown; - ''; -}) diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b1f3d147e86264317b110a3c717d5ee6be3ee43f --- /dev/null +++ b/nixos/tests/initrd-network-ssh/default.nix @@ -0,0 +1,59 @@ +import ../make-test.nix ({ pkgs, lib, ... }: + +{ + name = "initrd-network-ssh"; + meta = with lib.maintainers; { + maintainers = [ willibutz ]; + }; + + nodes = with lib; rec { + server = + { config, pkgs, ... }: + { + boot.kernelParams = [ + "ip=${config.networking.primaryIPAddress}:::255.255.255.0::eth1:none" + ]; + boot.initrd.network = { + enable = true; + ssh = { + enable = true; + authorizedKeys = [ "${readFile ./openssh.pub}" ]; + port = 22; + hostRSAKey = ./dropbear.priv; + }; + }; + boot.initrd.preLVMCommands = '' + while true; do + if [ -f fnord ]; then + poweroff + fi + sleep 1 + done + ''; + }; + + client = + { config, pkgs, ... }: + { + environment.etc.knownHosts = { + text = concatStrings [ + "server," + "${toString (head (splitString " " ( + toString (elemAt (splitString "\n" config.networking.extraHosts) 2) + )))} " + "${readFile ./dropbear.pub}" + ]; + }; + }; + }; + + testScript = '' + startAll; + $client->waitForUnit("network.target"); + $client->copyFileFromHost("${./openssh.priv}","/etc/sshKey"); + $client->succeed("chmod 0600 /etc/sshKey"); + $client->waitUntilSucceeds("ping -c 1 server"); + $client->succeed("ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'touch /fnord'"); + $client->shutdown; + ''; +}) diff --git a/nixos/tests/initrd-network-ssh/dropbear.priv b/nixos/tests/initrd-network-ssh/dropbear.priv new file mode 100644 index 0000000000000000000000000000000000000000..af340535f0a3841d2b9ed2abbd60f64118f924da Binary files /dev/null and b/nixos/tests/initrd-network-ssh/dropbear.priv differ diff --git a/nixos/tests/initrd-network-ssh/dropbear.pub b/nixos/tests/initrd-network-ssh/dropbear.pub new file mode 100644 index 0000000000000000000000000000000000000000..385c625522aa1f074a5baae566bc77bf7a50b9cd --- /dev/null +++ b/nixos/tests/initrd-network-ssh/dropbear.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzJ0OniLB91MpPC86I1m3wwJeAc+Gme7bAuaLIU/cSfPwxT5NO7MfCp0Pu94gYDKtDXMs/wXg0bTAVDeAFFkdIj6kBBumEmQLCTL48q2UxDIXVLT/E/AAgj6q7WwgCg7fwm4Vjn4z7aUyBx8EfRy+5/SQyeYla3D/lFYgMi5x4D6J+yeR+JPAptDE/IR5IizNV7mY0ZcoXYyHrrehI1tTYEEqjX13ZqS4OCBFWwHe1QHhRNM+jHhcATbgikjAj8FyFPtLvc+dSVtkuhQktQl36Bi8zMUQcV6+mM7Ln6DBcDlM9urHKLYPTWmUAyhxM955iglOn5z0RaAIcyNMT6hz0rHaNf0BIlmbXoTC0XGjHh/OnoOEC/zg0JqgQTnPiU45K4TnRSSXp2GfiDfiQAK0+HaXACkjuFR68u7WCZpB1Bse1OgKNClFqtRhIr5DilUb2/e5DCCmFkddMUcjmYqzZdbXNt7fo8CFULe+mbiCp8+tMg4aRTaDZ/Hk93nCvGE5TP2ypEMbfL6nRVKvXOjhdvSQQgKwx+O003FDEHCSG0Bpageh7yVpna+SPrbGklce7MjTpbx3iIwmvKpQ6asnK1L3KkahpY1S3NhQ+/S3Gs8KWQ5LAU+d3xiPX3jfIVHsCIIyxHDbwcJvxM4MFBFQpqRMD6E+LoM9RHjl4C9k2iQ== tmtynkky@duuni diff --git a/nixos/tests/initrd-network-ssh/generate-keys.nix b/nixos/tests/initrd-network-ssh/generate-keys.nix new file mode 100644 index 0000000000000000000000000000000000000000..0183e12d7a88f4627fdfae5fa81ca0299e84ba98 --- /dev/null +++ b/nixos/tests/initrd-network-ssh/generate-keys.nix @@ -0,0 +1,12 @@ +with import ../../.. {}; + +runCommand "gen-keys" { + buildInputs = [ dropbear openssh ]; + } + '' + mkdir $out + dropbearkey -t rsa -f $out/dropbear.priv -s 4096 | sed -n 2p > $out/dropbear.pub + ssh-keygen -q -t rsa -b 4096 -N "" -f client + mv client $out/openssh.priv + mv client.pub $out/openssh.pub + '' diff --git a/nixos/tests/initrd-network-ssh/openssh.priv b/nixos/tests/initrd-network-ssh/openssh.priv new file mode 100644 index 0000000000000000000000000000000000000000..816d65435fd70a09789c6f285764238161e4f252 --- /dev/null +++ b/nixos/tests/initrd-network-ssh/openssh.priv @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEA7+9A2PCPOTAlFmrablrUWA+VZdAuLfM6JXeHsOF7ZbC2F6lv +WmvDM925DQqhiAjcgWnt5WHWS5Y+b7lGnuzT7fyKegXd80nCRmqlpSG3srX0/lxR +aQAJLzfoDjcsF+ceswQo6GSsYnCHVxMNs007gbbVY3f7o+sWZtLdxJPD2iHvl5Zr +LK0d1RLMmU6cfIhIABlL0S8EWiv29RROepsCQnS0dnK2b+von1SCYoggvAMe2ToA +IAJ8+uqaYfGAyn9q8fjZiRHxLmKDq90tKoCUL5r/2dmEIE+t8T/3PfHoq1QzZts9 +W9idhBdT21dEXBtGyoMtckp5njk5m82LQDYiOXkuSoIUhSOteh5g7fBv1BtVSERx +Jg3UeJjPeGKFwdnzapmAKC2w/6V8xcIINNA+fhZA7B9fD1RAi2TECZ+gyMYDc4T+ +USlMSm9cfvSOrf2+5ngtFb84nHjqvClxCMLu+bCWK8HamqUzhE/a5LbR+48E7PyG +s3KV+sWFN9KOnakTjj/6iQhXZRhgeAK39F2XTk5Ms5Y+BRSStnMoMZA2grIV+jHi +1zbWokVqXPI5YRo5isR/PgtKAV6FfNWumcYoFJ9F40pMHQ6hJVEmtrCBx7EApSl3 +mSGbQJUmilLC51qNhwQRbD//ZtpIrN82HTMKzZ6kj7kDCdsff+wsnkIXmmMCAwEA +AQKCAgA4tMINw6UF7hQF3VEsnbjr6xrzCiWv5HlMm5htPI1OdlpC81+G7ksfOfrf +UzDkFrwOtftsqBfem268Nvyy2OQprfMIbdSMCFWrEM9/XJ2u1gRGDYmMGF8TUtI8 +cduw9oWx53zHl+uKBHBoKu+k/c7flFeQf63wisIroRCawhWau0SF/h3sXCndzuie +Hw8q+4aQx2m80bDkotlmCNuXbIU3MZ/pEql9gDLlXTLHmMaryM0EqAmZhx0ErGe6 +WDqJIV4kPB0loSDwRoY6GzbugZ8ENUzcruTkQhCpIOYNNNw5idfwKkaxK1vm+SBv +iYt1fVjYyfH2vhVKSNoNsaGEloa1u4Dymt/FpFztEpRzHXcw93N8BdLxJ4OUhzm2 +iAbpiyjniTIeAVVi7BUwLXh5WAx8nT0eeb1zKoZg1p1ciK5cYl1Uel7j8xRycsSW +3YgmtuPqY4Agbc9v3eXbQZNDk48JFMEqpIxk97FAkRYpzfxg5Qq14WJCp60CkdRt +T60hXy8lT/BcI8OWLfGJuBbsVLNRiC7PpwqRKQAinXSv134FpP7jrhpkMybs2oIS +5obRG7J5OfOTp925erG5mrpwqa3BPkgqx347Wj9z8quOZyuhi+XaPvqmPtvs5JOl +4RCqjt6RQlHm7xos9ZZGI4jDAIFaFWgyVZrYplOgwxWma4DTgQKCAQEA9+tizQRU +lF0lxNcEPvsFnYJo80Y+MQK9VdtlhR19YuSfwP1NCaMG1MhQ+PVBVmepOwJMRJR7 +9PLfOouNMfixKBGP12dtStMuh7jowq/BxhRI6JWp3RhTZ1yJ9ouzHze7IDrEBa6w +p0hUu9H0Sbt51LXbC3JmTyhbdhfry559DfyGW1Ma/bv/pihL9B5Y7sNf1thNp1gi +GbQ9B+o2Yyw8ZD8zY+sl+aYDSWyCtcBV/KXEF74Bkfs/a5ExJ00X0jYj/TAp2ray +T4PY0FR8wN/O10bFLP9j+Xa/ywbcPhoj8nvVRIg9VfWT/QaEd+KR0EZVxdjCCqne +enbSQksTpAZNwQKCAQEA98E+BMmS+yHUVUhNZABtQ5avwuV4+DoSN8KTp3xwQ0CH +m9fWxSDs12FdyMhDxrJPeywvHtZ18/7cl3dr8wnFVE0s4ongnRDXsNk5xN6J3AaO +KqW4HF9cbwZqzLILy8TrO+EK/EQV9FypbrxqvxAlP1kezIA2CJNzVRAgimSuV/H7 +05HTnp5W06fjtEf8U1CUrdNetoSROUo1j/IMGPYGlsBFYAGrj5y/BlKd+3T3kjRp +Xje7HpiykjrZHn0WDp04Ln+u9nveEewXmHKch313emt7HpW0xspp8JM8OZtEKozk +D5PfYdBfMJJOUlqovCCzTTJ6kNOahknKXFeO/qs5IwKCAQEAjF0/zhWikXF/fcfD +Bql2z2vTYdEmSvdjHSYff1Nn90K71DdVk5wytOxJM/sfp/z+yoMNjVKIL/IGQw5Z +va4xFx+CUhGjxlZ0pLEjT37U9gHsGYsK5jvslLvG/MixfH5AOwoqi5ERQVTpbIF9 +jvVPEAh6YSu/ExglWGJIxTsRUIblxvTxdjEnl/p+rlM0RNJnA6vpo1J51BXA7CdF +7bZQ5u0Feo/bK1I70ClYg/DGfkmYEV0pZG5cxNkqfDbgwsqWa7YGLGd94xkh+ymq +jETqxeWyozxhbQ83nYpfzeVc7t//qlJ8b5uf0wUKoRmtNr9rtp13lzP/21REzPXW +w+oxwQKCAQAoAf2Y2lAw25KlPuq4ZlU+n9u8FkBFnWMJvBMJ7c9XHNmJMf6NkLaO +RTvWy3geYvbwxf7J9QnRH+vRTciR05cY+Olxn6A03N5nwXxRrToH3MsiWeZ0NnX/ +u8KNUYcUHbV60ulqOThuYHQ/3I9EUUAijaqqjV2sXts19ke68W0x6HKpBJhuudT9 +ktPzbdhyP8Xyl/pocNnerXwexZBsi3Ye6+eIDFz+8OnsBHVcgNPluS72tvsxgqj7 +ciNTiBGCxKKo55eCWBhRPpXE2WUrf/hGPYsBMl2h6FfZMH1+M/N7B4tgdJmS+woU +Ftws8lTjJEiwA6HFN1ZxrwLNjJobx9yPAoIBAE0igsBuWWn6rXeOPylYg4264XOq +8gb94pte2n9amDgCzyCn8m6AL3snLC/AoCD19DK+gyK0ukoesXPa3iX6w2xv69ZC +urDx36Jhd4zrJb4QsFPoeKfDP+UvNVZaS41vipRRzY/y11em15prUZ4U8FA/UT1Y +FzkBo9r6iUZRnyBLppMuEfWASDtuRNmeIHynoT1AcQOH3l9vR210iEpmAuJr0CYA +bvTuz3UzzGGEAuIUvuaiRtkfKY52jBmiEr7SSPCr1HvLj3Ccz8bgjgR2kiXmcU50 +1zLnaPAD44LZ/0Fjqj+PimQGT6K7CNXPllmYh7MvoU52g3SVPf6rHlIR0Nc= +-----END RSA PRIVATE KEY----- diff --git a/nixos/tests/initrd-network-ssh/openssh.pub b/nixos/tests/initrd-network-ssh/openssh.pub new file mode 100644 index 0000000000000000000000000000000000000000..5b72b8085f2707482fa8ae70d2b12b7a0525c1a0 --- /dev/null +++ b/nixos/tests/initrd-network-ssh/openssh.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDv70DY8I85MCUWatpuWtRYD5Vl0C4t8zold4ew4XtlsLYXqW9aa8Mz3bkNCqGICNyBae3lYdZLlj5vuUae7NPt/Ip6Bd3zScJGaqWlIbeytfT+XFFpAAkvN+gONywX5x6zBCjoZKxicIdXEw2zTTuBttVjd/uj6xZm0t3Ek8PaIe+XlmssrR3VEsyZTpx8iEgAGUvRLwRaK/b1FE56mwJCdLR2crZv6+ifVIJiiCC8Ax7ZOgAgAnz66pph8YDKf2rx+NmJEfEuYoOr3S0qgJQvmv/Z2YQgT63xP/c98eirVDNm2z1b2J2EF1PbV0RcG0bKgy1ySnmeOTmbzYtANiI5eS5KghSFI616HmDt8G/UG1VIRHEmDdR4mM94YoXB2fNqmYAoLbD/pXzFwgg00D5+FkDsH18PVECLZMQJn6DIxgNzhP5RKUxKb1x+9I6t/b7meC0VvziceOq8KXEIwu75sJYrwdqapTOET9rkttH7jwTs/IazcpX6xYU30o6dqROOP/qJCFdlGGB4Arf0XZdOTkyzlj4FFJK2cygxkDaCshX6MeLXNtaiRWpc8jlhGjmKxH8+C0oBXoV81a6ZxigUn0XjSkwdDqElUSa2sIHHsQClKXeZIZtAlSaKUsLnWo2HBBFsP/9m2kis3zYdMwrNnqSPuQMJ2x9/7CyeQheaYw== tmtynkky@duuni diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 43b166a38374a357bb46dcc49ed5726643f7260f..acf248d0a5a664c393fb2e44a0613651fb9d75cf 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -1,7 +1,6 @@ { system ? builtins.currentSystem }: with import ../lib/testing.nix { inherit system; }; -with import ../lib/qemu-flags.nix; with pkgs.lib; let @@ -70,13 +69,20 @@ let let iface = if grubVersion == 1 then "ide" else "virtio"; isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); + + # FIXME don't duplicate the -enable-kvm etc. flags here yet again! qemuFlags = (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") + - (optionalString (system == "x86_64-linux") "-cpu kvm64 "); + (optionalString (system == "x86_64-linux") "-cpu kvm64 ") + + (optionalString (system == "aarch64-linux") "-enable-kvm -machine virt,gic-version=host -cpu host "); + hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", '' - + optionalString isEfi ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", ''; - in - '' + + optionalString isEfi (if pkgs.stdenv.isAarch64 + then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", '' + else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", ''); + in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then + throw "Non-EFI boot methods are only supported on i686 / x86_64" + else '' $machine->start; # Make sure that we get a login prompt etc. @@ -146,7 +152,7 @@ let # 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. + # We need a writable Nix store on next boot. $machine->copyFileFromHost( "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier grubUseEfi extraConfig; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); @@ -196,8 +202,7 @@ let }; nodes = { - # The configuration of the machine used to run "nixos-install". It - # also has a web server that simulates cache.nixos.org. + # The configuration of the machine used to run "nixos-install". machine = { config, lib, pkgs, ... }: @@ -209,7 +214,6 @@ let virtualisation.diskSize = 8 * 1024; virtualisation.memorySize = 1024; - virtualisation.writableStore = true; # Use a small /dev/vdb as the root disk for the # installer. This ensures the target disk (/dev/vda) is @@ -246,6 +250,11 @@ let ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ]; nix.binaryCaches = mkForce [ ]; + nix.extraOptions = + '' + hashed-mirrors = + connect-timeout = 1 + ''; }; }; @@ -307,11 +316,11 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel gpt", - "parted -s /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot - "parted -s /dev/vda -- set 1 boot on", - "parted -s /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB", - "parted -s /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # / + "parted --script /dev/vda mklabel gpt", + "parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot + "parted --script /dev/vda -- set 1 boot on", + "parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB", + "parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # / "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", @@ -461,6 +470,47 @@ in { ''; }; + # Test whether opening encrypted filesystem with keyfile + # Checks for regression of missing cryptsetup, when no luks device without + # keyfile is configured + filesystemEncryptedWithKeyfile = makeInstallerTest "filesystemEncryptedWithKeyfile" + { createPartitions = '' + $machine->succeed( + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M", + "parted --script /dev/vda -- mkpart primary 1024M 1280M", # LUKS with keyfile + "parted --script /dev/vda -- mkpart primary 1280M -1s", + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.ext3 -L nixos /dev/vda4", + "mount LABEL=nixos /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount LABEL=boot /mnt/boot", + "modprobe dm_mod dm_crypt", + "echo -n supersecret > /mnt/keyfile", + "cryptsetup luksFormat -q /dev/vda3 --key-file /mnt/keyfile", + "cryptsetup luksOpen --key-file /mnt/keyfile /dev/vda3 crypt", + "mkfs.ext3 -L test /dev/mapper/crypt", + "cryptsetup luksClose crypt", + "mkdir -p /mnt/test" + ); + ''; + extraConfig = '' + fileSystems."/test" = + { device = "/dev/disk/by-label/test"; + fsType = "ext3"; + encrypted.enable = true; + encrypted.blkDev = "/dev/vda3"; + encrypted.label = "crypt"; + encrypted.keyFile = "/mnt-root/keyfile"; + }; + ''; + }; + + swraid = makeInstallerTest "swraid" { createPartitions = '' @@ -469,10 +519,10 @@ in { . " mklabel msdos" . " mkpart primary ext2 1M 100MB" # /boot . " mkpart extended 100M -1s" - . " mkpart logical 102M 1602M" # md0 (root), first device - . " mkpart logical 1603M 3103M" # md0 (root), second device - . " mkpart logical 3104M 3360M" # md1 (swap), first device - . " mkpart logical 3361M 3617M", # md1 (swap), second device + . " mkpart logical 102M 2102M" # md0 (root), first device + . " mkpart logical 2103M 4103M" # md0 (root), second device + . " mkpart logical 4104M 4360M" # md1 (swap), first device + . " mkpart logical 4361M 4617M", # md1 (swap), second device "udevadm settle", "ls -l /dev/vda* >&2", "cat /proc/partitions >&2", diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index 060f63216796e195bbe362a7ed0d6b39bcedf755..7a98fd85cfda9db8057c49985ffa4425b3e4ab22 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -47,7 +47,7 @@ import ./make-test.nix ({ pkgs, ...} : { # Detection). sub waitForAddress { my ($machine, $iface, $scope) = @_; - $machine->waitUntilSucceeds("[ `ip -o -6 addr show dev $iface scope $scope | grep -v tentative | wc -l` -eq 1 ]"); + $machine->waitUntilSucceeds("[ `ip -o -6 addr show dev $iface scope $scope | grep -v tentative | wc -l` -ge 1 ]"); my $ip = (split /[ \/]+/, $machine->succeed("ip -o -6 addr show dev $iface scope $scope"))[3]; $machine->log("$scope address on $iface is $ip"); return $ip; diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index a9833058f378660a43dba617aea29671fd9c675b..ed55b2ff58716d3c08dd6dd71d5098f79fd7ee99 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -36,6 +36,9 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $master->waitForUnit("jenkins"); + + $master->mustSucceed("curl http://localhost:8080 | grep 'Authentication required'"); + print $master->execute("sudo -u jenkins groups"); $master->mustSucceed("sudo -u jenkins groups | grep jenkins | grep users"); @@ -44,4 +47,4 @@ import ./make-test.nix ({ pkgs, ...} : { $slave->mustFail("systemctl is-enabled jenkins.service"); ''; -}) \ No newline at end of file +}) diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix index 07427d7f2a8935e9378cb47349d7e6a1a28b460a..0af978f1851f934bd9e14d1401d7b7d9d4948ba9 100644 --- a/nixos/tests/kernel-copperhead.nix +++ b/nixos/tests/kernel-copperhead.nix @@ -6,14 +6,14 @@ import ./make-test.nix ({ pkgs, ...} : { machine = { config, lib, pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_hardened_copperhead; + boot.kernelPackages = pkgs.linuxPackages_copperhead_hardened; }; testScript = '' $machine->succeed("uname -a"); $machine->succeed("uname -s | grep 'Linux'"); - $machine->succeed("uname -a | grep '${pkgs.linuxPackages_hardened_copperhead.kernel.modDirVersion}'"); + $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_hardened.kernel.modDirVersion}'"); $machine->succeed("uname -a | grep 'hardened'"); ''; }) diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index c431c1a341744a3de8ae8d488583104a81138acd..caa5f7107c23afaf5104efbdd3c4415e648495ae 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -46,41 +46,11 @@ let in makeTest { name = "keymap-${layout}"; + machine.services.xserver.desktopManager.xterm.enable = false; machine.i18n.consoleKeyMap = mkOverride 900 layout; machine.services.xserver.layout = mkOverride 900 layout; machine.imports = [ ./common/x11.nix extraConfig ]; - machine.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" <waitForUnit("keystone-all.service"); - - # Verify that admin ccount is working - $machine->succeed("${adminOpenstackCmd} token issue"); - - # Try to create a new user - $machine->succeed("${adminOpenstackCmd} project create --domain default --description 'Demo Project' demo"); - $machine->succeed("${adminOpenstackCmd} user create --domain default --password demo demo"); - $machine->succeed("${adminOpenstackCmd} role create user"); - $machine->succeed("${adminOpenstackCmd} role add --project demo --user demo user"); - - # Verify this new account is working - $machine->succeed("${demoOpenstackCmd} token issue"); - ''; -} diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index acf2e0250819abcca0087559da3c6f4337b0b877..27b99aacab7d149b50298693419c8f2d82ace4ec 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -1,14 +1,13 @@ { system ? builtins.currentSystem }: with import ../../lib/testing.nix { inherit system; }; -with import ../../lib/qemu-flags.nix; with pkgs.lib; let mkKubernetesBaseTest = { name, domain ? "my.zyx", test, machines , pkgs ? import { inherit system; } - , certs ? import ./certs.nix { inherit pkgs; externalDomain = domain; } + , certs ? import ./certs.nix { inherit pkgs; externalDomain = domain; kubelets = attrNames machines; } , extraConfiguration ? null }: let masterName = head (filter (machineName: any (role: role == "master") machines.${machineName}.roles) (attrNames machines)); diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix index f108e35b98cd11dfdb16bafac094787d3495624d..520c728b65ee288756f483e9bf3f7f57b1e1e847 100644 --- a/nixos/tests/kubernetes/certs.nix +++ b/nixos/tests/kubernetes/certs.nix @@ -2,32 +2,66 @@ pkgs ? import {}, internalDomain ? "cloud.yourdomain.net", externalDomain ? "myawesomecluster.cluster.yourdomain.net", - serviceClusterIp ? "10.0.0.1" + serviceClusterIp ? "10.0.0.1", + kubelets }: let - runWithCFSSL = name: cmd: - builtins.fromJSON (builtins.readFile ( - pkgs.runCommand "${name}-cfss.json" { - buildInputs = [ pkgs.cfssl ]; - } "cfssl ${cmd} > $out" - )); - - writeCFSSL = content: - pkgs.runCommand content.name { - buildInputs = [ pkgs.cfssl ]; - } '' - mkdir -p $out - cd $out - cat ${writeFile content} | cfssljson -bare ${content.name} - ''; + runWithCFSSL = name: cmd: + let secrets = pkgs.runCommand "${name}-cfss.json" { + buildInputs = [ pkgs.cfssl pkgs.jq ]; + outputs = [ "out" "cert" "key" "csr" ]; + } + '' + ( + echo "${cmd}" + cfssl ${cmd} > tmp + cat tmp | jq -r .key > $key + cat tmp | jq -r .cert > $cert + cat tmp | jq -r .csr > $csr + + touch $out + ) 2>&1 | fold -w 80 -s + ''; + in { + key = secrets.key; + cert = secrets.cert; + csr = secrets.csr; + }; + + writeCFSSL = content: + pkgs.runCommand content.name { + buildInputs = [ pkgs.cfssl pkgs.jq ]; + } '' + mkdir -p $out + cd $out + + json=${pkgs.lib.escapeShellArg (builtins.toJSON content)} + + # for a given $field in the $json, treat the associated value as a + # file path and substitute the contents thereof into the $json + # object. + expandFileField() { + local field=$1 + if jq -e --arg field "$field" 'has($field)'; then + local path="$(echo "$json" | jq -r ".$field")" + json="$(echo "$json" | jq --arg val "$(cat "$path")" ".$field = \$val")" + fi + } + + expandFileField key + expandFileField ca + expandFileField cert + + echo "$json" | cfssljson -bare ${content.name} + ''; noCSR = content: pkgs.lib.filterAttrs (n: v: n != "csr") content; noKey = content: pkgs.lib.filterAttrs (n: v: n != "key") content; - writeFile = content: pkgs.writeText "content" ( - if pkgs.lib.isAttrs content then builtins.toJSON content - else toString content - ); + writeFile = content: + if pkgs.lib.isDerivation content + then content + else pkgs.writeText "content" (builtins.toJSON content); createServingCertKey = { ca, cn, hosts? [], size ? 2048, name ? cn }: noCSR ( @@ -123,9 +157,10 @@ let }; apiserver-client = { - kubelet = createClientCertKey { + kubelet = hostname: createClientCertKey { inherit ca; - cn = "apiserver-client-kubelet"; + name = "apiserver-client-kubelet-${hostname}"; + cn = "system:node:${hostname}.${externalDomain}"; groups = ["system:nodes"]; }; @@ -175,10 +210,9 @@ in { paths = [ (writeCFSSL (noKey ca)) (writeCFSSL kubelet) - (writeCFSSL apiserver-client.kubelet) (writeCFSSL apiserver-client.kube-proxy) (writeCFSSL etcd-client) - ]; + ] ++ map (hostname: writeCFSSL (apiserver-client.kubelet hostname)) kubelets; }; admin = writeCFSSL apiserver-client.admin; diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 74d98dabec8d2959806a738cbfa27cc534cb8b1f..8c488d271bcd2934fcb80341397b1c4da6baab4c 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -3,7 +3,7 @@ with import ./base.nix { inherit system; }; let domain = "my.zyx"; - certs = import ./certs.nix { externalDomain = domain; }; + certs = import ./certs.nix { externalDomain = domain; kubelets = [ "machine1" "machine2" ]; }; redisPod = pkgs.writeText "redis-pod.json" (builtins.toJSON { kind = "Pod"; diff --git a/nixos/tests/kubernetes/e2e.nix b/nixos/tests/kubernetes/e2e.nix index d9d7ba9bb2cc5858b03b0134db38d6691c52ed3f..175d8413045ed747b7108cd8ad37bf867cf5f4e1 100644 --- a/nixos/tests/kubernetes/e2e.nix +++ b/nixos/tests/kubernetes/e2e.nix @@ -2,7 +2,7 @@ with import ./base.nix { inherit system; }; let domain = "my.zyx"; - certs = import ./certs.nix { externalDomain = domain; }; + certs = import ./certs.nix { externalDomain = domain; kubelets = ["machine1" "machine2"]; }; kubeconfig = pkgs.writeText "kubeconfig.json" (builtins.toJSON { apiVersion = "v1"; kind = "Config"; diff --git a/nixos/tests/kubernetes/kubernetes-common.nix b/nixos/tests/kubernetes/kubernetes-common.nix index 00a5c9aba4e3cb8f8272e3e0f731ba46ce95f3c7..ddf427e1b01abb70f72880229e046a807944ecd2 100644 --- a/nixos/tests/kubernetes/kubernetes-common.nix +++ b/nixos/tests/kubernetes/kubernetes-common.nix @@ -29,8 +29,8 @@ let tlsKeyFile = "${certs.worker}/kubelet-key.pem"; hostname = "${config.networking.hostName}.${config.networking.domain}"; kubeconfig = { - certFile = "${certs.worker}/apiserver-client-kubelet.pem"; - keyFile = "${certs.worker}/apiserver-client-kubelet-key.pem"; + certFile = "${certs.worker}/apiserver-client-kubelet-${config.networking.hostName}.pem"; + keyFile = "${certs.worker}/apiserver-client-kubelet-${config.networking.hostName}-key.pem"; }; }; controllerManager = { diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index 1966fed3a5fb944db46a64b8c85581ca16f85382..226808c4b26327c76bb6b048dab181a81d40fdbf 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -12,7 +12,7 @@ let }); roRoleBinding = pkgs.writeText "ro-role-binding.json" (builtins.toJSON { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; + apiVersion = "rbac.authorization.k8s.io/v1"; kind = "RoleBinding"; metadata = { name = "read-pods"; @@ -31,7 +31,7 @@ let }); roRole = pkgs.writeText "ro-role.json" (builtins.toJSON { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; + apiVersion = "rbac.authorization.k8s.io/v1"; kind = "Role"; metadata = { name = "pod-reader"; diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix index f3e26aa7e74d2215e3af9ef6b5c7fab6361c1654..ee4ba310ad50e9ba78684fe0e45117de48f70308 100644 --- a/nixos/tests/make-test.nix +++ b/nixos/tests/make-test.nix @@ -2,4 +2,4 @@ f: { system ? builtins.currentSystem, ... } @ args: with import ../lib/testing.nix { inherit system; }; -makeTest (if builtins.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) +makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix new file mode 100644 index 0000000000000000000000000000000000000000..113fb622588b3ea1409f4330c1b88c3867fe2815 --- /dev/null +++ b/nixos/tests/matrix-synapse.nix @@ -0,0 +1,30 @@ +import ./make-test.nix ({ pkgs, ... } : { + + name = "matrix-synapse"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ corngood ]; + }; + + nodes = { + server_postgres = args: { + services.matrix-synapse.enable = true; + services.matrix-synapse.database_type = "psycopg2"; + }; + + server_sqlite = args: { + services.matrix-synapse.enable = true; + services.matrix-synapse.database_type = "sqlite3"; + }; + }; + + testScript = '' + startAll; + $server_postgres->waitForUnit("matrix-synapse.service"); + $server_postgres->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $server_postgres->requireActiveUnit("postgresql.service"); + $server_sqlite->waitForUnit("matrix-synapse.service"); + $server_sqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $server_sqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]"); + ''; + +}) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 79290861cb0b48ef001e780a434baf59cb979cdf..179c95e764366304428d7d1424b144f015c7f054 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -1,11 +1,13 @@ # Miscellaneous small tests that don't warrant their own VM run. -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test.nix ({ pkgs, ...} : rec { name = "misc"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco chaoflow ]; }; + foo = pkgs.writeText "foo" "Hello World"; + machine = { config, lib, pkgs, ... }: with lib; @@ -27,10 +29,17 @@ import ./make-test.nix ({ pkgs, ...} : { security.sudo = { enable = true; wheelNeedsPassword = false; }; boot.kernel.sysctl."vm.swappiness" = 1; boot.kernelParams = [ "vsyscall=emulate" ]; + system.extraDependencies = [ foo ]; }; testScript = '' + subtest "nix-db", sub { + my $json = $machine->succeed("nix path-info --json ${foo}"); + $json =~ /"narHash":"sha256:0afw0d9j1hvwiz066z93jiddc33nxg6i6qyp26vnqyglpyfivlq5"/ or die "narHash not set"; + $json =~ /"narSize":128/ or die "narSize not set"; + }; + subtest "nixos-version", sub { $machine->succeed("[ `nixos-version | wc -w` = 2 ]"); }; @@ -87,7 +96,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->succeed("systemctl start systemd-udev-settle.service"); subtest "udev-auto-load", sub { $machine->waitForUnit('systemd-udev-settle.service'); - $machine->succeed('lsmod | grep psmouse'); + $machine->succeed('lsmod | grep mousedev'); }; # Test whether systemd-tmpfiles-clean works. @@ -115,11 +124,6 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->succeed("nix-store -qR /run/current-system | grep nixos-"); }; - # Test sudo - subtest "sudo", sub { - $machine->succeed("su - sybil -c 'sudo true'"); - }; - # Test sysctl subtest "sysctl", sub { $machine->waitForUnit("systemd-sysctl.service"); diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix new file mode 100644 index 0000000000000000000000000000000000000000..4f11a4b8366908930858919e027f07246d0dd127 --- /dev/null +++ b/nixos/tests/mutable-users.nix @@ -0,0 +1,39 @@ +# Mutable users tests. + +import ./make-test.nix ({ pkgs, ...} : { + name = "mutable-users"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ gleber ]; + }; + + nodes = { + machine = { config, lib, pkgs, ... }: { + users.mutableUsers = false; + }; + mutable = { config, lib, pkgs, ... }: { + users.mutableUsers = true; + }; + }; + + testScript = {nodes, ...}: let + immutableSystem = nodes.machine.config.system.build.toplevel; + mutableSystem = nodes.mutable.config.system.build.toplevel; + in '' + $machine->start(); + $machine->waitForUnit("default.target"); + + # Machine starts in immutable mode. Add a user and test if reactivating + # configuration removes the user. + $machine->fail("cat /etc/passwd | grep ^foobar:"); + $machine->succeed("sudo useradd foobar"); + $machine->succeed("cat /etc/passwd | grep ^foobar:"); + $machine->succeed("${immutableSystem}/bin/switch-to-configuration test"); + $machine->fail("cat /etc/passwd | grep ^foobar:"); + + # In immutable mode passwd is not wrapped, while in mutable mode it is + # wrapped. + $machine->succeed('which passwd | grep /run/current-system/'); + $machine->succeed("${mutableSystem}/bin/switch-to-configuration test"); + $machine->succeed('which passwd | grep /run/wrappers/'); + ''; +}) diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index a12b7645bc28e2d34cd669718086bf97142c1f26..7057158a829bbbe290a2de48ef521b63282fef4c 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -35,7 +35,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, { virtualisation.vlans = [ 1 ]; networking.firewall.allowPing = true; networking.defaultGateway = - (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address; + (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address; } (lib.optionalAttrs withConntrackHelpers { networking.firewall.connectionTrackingModules = [ "ftp" ]; diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix new file mode 100644 index 0000000000000000000000000000000000000000..58733c1b3379b6b305cd425539e42acfd9905ee0 --- /dev/null +++ b/nixos/tests/netdata.nix @@ -0,0 +1,31 @@ +# This test runs netdata and checks for data via apps.plugin + +import ./make-test.nix ({ pkgs, ...} : { + name = "netdata"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ cransom ]; + }; + + nodes = { + netdata = + { config, pkgs, ... }: + { + environment.systemPackages = with pkgs; [ curl jq ]; + services.netdata.enable = true; + }; + }; + + testScript = '' + startAll; + + $netdata->waitForUnit("netdata.service"); + # check if netdata can read disk ops for root owned processes. + # if > 0, successful. verifies both netdata working and + # apps.plugin has elevated capabilities. + my $cmd = <<'CMD'; + curl -s http://localhost:19999/api/v1/data\?chart=users.pwrites | \ + jq -e '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0' + CMD + $netdata->waitUntilSucceeds($cmd); + ''; +}) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 7708775f73f3abdf0f13454262a6c0784a5c8a17..5cb40af5799e4033de8957eb8d879839a3430fd3 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -21,10 +21,8 @@ let firewall.allowedUDPPorts = [ 547 ]; interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n: nameValuePair "eth${toString n}" { - ipAddress = "192.168.${toString n}.1"; - prefixLength = 24; - ipv6Address = "fd00:1234:5678:${toString n}::1"; - ipv6PrefixLength = 64; + ipv4.addresses = [ { address = "192.168.${toString n}.1"; prefixLength = 24; } ]; + ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ]; }))); }; services.dhcpd4 = { @@ -90,12 +88,12 @@ let firewall.allowPing = true; useDHCP = false; defaultGateway = "192.168.1.1"; - interfaces.eth1.ip4 = mkOverride 0 [ + interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } { address = "192.168.1.3"; prefixLength = 32; } { address = "192.168.1.10"; prefixLength = 32; } ]; - interfaces.eth2.ip4 = mkOverride 0 [ + interfaces.eth2.ipv4.addresses = mkOverride 0 [ { address = "192.168.2.2"; prefixLength = 24; } ]; }; @@ -143,12 +141,12 @@ let firewall.allowPing = true; useDHCP = true; interfaces.eth1 = { - ip4 = mkOverride 0 [ ]; - ip6 = mkOverride 0 [ ]; + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; }; interfaces.eth2 = { - ip4 = mkOverride 0 [ ]; - ip6 = mkOverride 0 [ ]; + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; }; }; }; @@ -198,10 +196,10 @@ let firewall.allowPing = true; useDHCP = false; interfaces.eth1 = { - ip4 = mkOverride 0 [ ]; + ipv4.addresses = mkOverride 0 [ ]; useDHCP = true; }; - interfaces.eth2.ip4 = mkOverride 0 [ ]; + interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; }; }; testScript = { nodes, ... }: @@ -241,9 +239,9 @@ let interfaces = [ "eth1" "eth2" ]; driverOptions.mode = "balance-rr"; }; - interfaces.eth1.ip4 = mkOverride 0 [ ]; - interfaces.eth2.ip4 = mkOverride 0 [ ]; - interfaces.bond.ip4 = mkOverride 0 + interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; + interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; + interfaces.bond.ipv4.addresses = mkOverride 0 [ { inherit address; prefixLength = 30; } ]; }; }; @@ -274,7 +272,7 @@ let useNetworkd = networkd; firewall.allowPing = true; useDHCP = false; - interfaces.eth1.ip4 = mkOverride 0 + interfaces.eth1.ipv4.addresses = mkOverride 0 [ { inherit address; prefixLength = 24; } ]; }; }; @@ -289,9 +287,9 @@ let firewall.allowPing = true; useDHCP = false; bridges.bridge.interfaces = [ "eth1" "eth2" ]; - interfaces.eth1.ip4 = mkOverride 0 [ ]; - interfaces.eth2.ip4 = mkOverride 0 [ ]; - interfaces.bridge.ip4 = mkOverride 0 + interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; + interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; + interfaces.bridge.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ]; }; }; @@ -328,7 +326,7 @@ let firewall.allowPing = true; useDHCP = true; macvlans.macvlan.interface = "eth1"; - interfaces.eth1.ip4 = mkOverride 0 [ ]; + interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; }; }; testScript = { nodes, ... }: @@ -369,9 +367,9 @@ let local = address4; dev = "eth1"; }; - interfaces.eth1.ip4 = mkOverride 0 + interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = address4; prefixLength = 24; } ]; - interfaces.sit.ip6 = mkOverride 0 + interfaces.sit.ipv6.addresses = mkOverride 0 [ { address = address6; prefixLength = 64; } ]; }; }; @@ -410,9 +408,9 @@ let id = 1; interface = "eth0"; }; - interfaces.eth0.ip4 = mkOverride 0 [ ]; - interfaces.eth1.ip4 = mkOverride 0 [ ]; - interfaces.vlan.ip4 = mkOverride 0 + interfaces.eth0.ipv4.addresses = mkOverride 0 [ ]; + interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; + interfaces.vlan.ipv4.addresses = mkOverride 0 [ { inherit address; prefixLength = 24; } ]; }; }; @@ -433,6 +431,169 @@ let $client2->succeed("ip addr show dev vlan >&2"); ''; }; + virtual = { + name = "Virtual"; + machine = { + networking.interfaces."tap0" = { + ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ]; + virtual = true; + }; + networking.interfaces."tun0" = { + ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; + ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ]; + virtual = true; + }; + }; + + testScript = '' + my $targetList = <<'END'; + tap0: tap UNKNOWN_FLAGS:800 user 0 + tun0: tun UNKNOWN_FLAGS:800 user 0 + END + + # Wait for networking to come up + $machine->start; + $machine->waitForUnit("network.target"); + + # Test interfaces set up + my $list = $machine->succeed("ip tuntap list | sort"); + "$list" eq "$targetList" or die( + "The list of virtual interfaces does not match the expected one:\n", + "Result:\n", "$list\n", + "Expected:\n", "$targetList\n" + ); + + # Test interfaces clean up + $machine->succeed("systemctl stop network-addresses-tap0"); + $machine->succeed("systemctl stop network-addresses-tun0"); + my $residue = $machine->succeed("ip tuntap list"); + $residue eq "" or die( + "Some virtual interface has not been properly cleaned:\n", + "$residue\n" + ); + ''; + }; + privacy = { + name = "Privacy"; + nodes.router = { config, pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; + networking = { + useNetworkd = networkd; + interfaces.eth1.ipv6.addresses = singleton { + address = "fd00:1234:5678:1::1"; + prefixLength = 64; + }; + }; + services.radvd = { + enable = true; + config = '' + interface eth1 { + AdvSendAdvert on; + AdvManagedFlag on; + AdvOtherConfigFlag on; + + prefix fd00:1234:5678:1::/64 { + AdvAutonomous on; + AdvOnLink on; + }; + }; + ''; + }; + }; + nodes.client = { config, pkgs, ... }: with pkgs.lib; { + virtualisation.vlans = [ 1 ]; + networking = { + useNetworkd = networkd; + useDHCP = true; + interfaces.eth1 = { + preferTempAddress = true; + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; + }; + }; + }; + testScript = { nodes, ... }: + '' + startAll; + + $client->waitForUnit("network.target"); + $router->waitForUnit("network-online.target"); + + # Wait until we have an ip address + $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'"); + + # Test vlan 1 + $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1"); + + # Test address used is temporary + $client->waitUntilSucceeds("! ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'"); + ''; + }; + routes = { + name = "routes"; + machine = { + networking.useDHCP = false; + networking.interfaces."eth0" = { + ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; + ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ]; + ipv6.routes = [ + { address = "fdfd:b3f0::"; prefixLength = 48; } + { address = "2001:1470:fffd:2098::"; prefixLength = 64; via = "fdfd:b3f0::1"; } + ]; + ipv4.routes = [ + { address = "10.0.0.0"; prefixLength = 16; options = { mtu = "1500"; }; } + { address = "192.168.2.0"; prefixLength = 24; via = "192.168.1.1"; } + ]; + }; + virtualisation.vlans = [ ]; + }; + + testScript = '' + my $targetIPv4Table = <<'END'; + 10.0.0.0/16 scope link mtu 1500 + 192.168.1.0/24 proto kernel scope link src 192.168.1.2 + 192.168.2.0/24 via 192.168.1.1 + END + + my $targetIPv6Table = <<'END'; + 2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium + 2001:1470:fffd:2098::/64 via fdfd:b3f0::1 metric 1024 pref medium + fdfd:b3f0::/48 metric 1024 pref medium + END + + $machine->start; + $machine->waitForUnit("network.target"); + + # test routing tables + my $ipv4Table = $machine->succeed("ip -4 route list dev eth0 | head -n3"); + my $ipv6Table = $machine->succeed("ip -6 route list dev eth0 | head -n3"); + "$ipv4Table" eq "$targetIPv4Table" or die( + "The IPv4 routing table does not match the expected one:\n", + "Result:\n", "$ipv4Table\n", + "Expected:\n", "$targetIPv4Table\n" + ); + "$ipv6Table" eq "$targetIPv6Table" or die( + "The IPv6 routing table does not match the expected one:\n", + "Result:\n", "$ipv6Table\n", + "Expected:\n", "$targetIPv6Table\n" + ); + + # test clean-up of the tables + $machine->succeed("systemctl stop network-addresses-eth0"); + my $ipv4Residue = $machine->succeed("ip -4 route list dev eth0 | head -n-3"); + my $ipv6Residue = $machine->succeed("ip -6 route list dev eth0 | head -n-3"); + $ipv4Residue eq "" or die( + "The IPv4 routing table has not been properly cleaned:\n", + "$ipv4Residue\n" + ); + $ipv6Residue eq "" or die( + "The IPv6 routing table has not been properly cleaned:\n", + "$ipv6Residue\n" + ); + ''; + }; }; in mapAttrs (const (attrs: makeTest (attrs // { diff --git a/nixos/tests/nix-ssh-serve.nix b/nixos/tests/nix-ssh-serve.nix new file mode 100644 index 0000000000000000000000000000000000000000..aa366d8612d723e101e3baaf1afb73dbd21ca8f0 --- /dev/null +++ b/nixos/tests/nix-ssh-serve.nix @@ -0,0 +1,39 @@ +import ./make-test.nix ({ pkgs, lib, ... }: +let inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey snakeOilPublicKey; + ssh-config = builtins.toFile "ssh.conf" '' + UserKnownHostsFile=/dev/null + StrictHostKeyChecking=no + ''; +in + { name = "nix-ssh-serve"; + meta.maintainers = [ lib.maintainers.shlevy ]; + nodes = + { server.nix.sshServe = + { enable = true; + keys = [ snakeOilPublicKey ]; + protocol = "ssh-ng"; + }; + server.nix.package = pkgs.nixUnstable; + client.nix.package = pkgs.nixUnstable; + }; + testScript = '' + startAll; + + $client->succeed("mkdir -m 700 /root/.ssh"); + $client->copyFileFromHost("${ssh-config}", "/root/.ssh/config"); + $client->succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa"); + $client->succeed("chmod 600 /root/.ssh/id_ecdsa"); + + $client->succeed("nix-store --add /etc/machine-id > mach-id-path"); + + $server->waitForUnit("sshd"); + + $client->fail("diff /root/other-store\$(cat mach-id-path) /etc/machine-id"); + # Currently due to shared store this is a noop :( + $client->succeed("nix copy --to ssh-ng://nix-ssh\@server \$(cat mach-id-path)"); + $client->succeed("nix-store --realise \$(cat mach-id-path) --store /root/other-store --substituters ssh-ng://nix-ssh\@server"); + $client->succeed("diff /root/other-store\$(cat mach-id-path) /etc/machine-id"); + ''; + } +) diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix new file mode 100644 index 0000000000000000000000000000000000000000..21b86f6dae279b676df47e26cf4211b23941f5fc --- /dev/null +++ b/nixos/tests/novacomd.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "novacomd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ dtzWill ]; + }; + + machine = { config, pkgs, ... }: { + services.novacomd.enable = true; + }; + + testScript = '' + startAll; + + $machine->waitForUnit("novacomd.service"); + + # Check status and try connecting with novacom + $machine->succeed("systemctl status novacomd.service >&2"); + $machine->succeed("novacom -l"); + + # Stop the daemon, double-check novacom fails if daemon isn't working + $machine->stopJob("novacomd"); + $machine->fail("novacom -l"); + + # And back again for good measure + $machine->startJob("novacomd"); + $machine->succeed("novacom -l"); + ''; +}) diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index 0b1082056f6fcc41a5372acdce62b852843384ee..ad4d4f8224353d1be28f49e7c6a7bd54ee14001a 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -15,25 +15,31 @@ in import ./make-test.nix ({ pkgs, ...} : { clientv4 = { lib, nodes, ... }: { imports = [ common ]; networking.nameservers = lib.mkForce [ - nodes.server.config.networking.interfaces.eth1.ipAddress + (lib.head nodes.server.config.networking.interfaces.eth1.ipv4.addresses).address + ]; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.2"; prefixLength = 24; } ]; - networking.interfaces.eth1.ipAddress = "192.168.0.2"; - networking.interfaces.eth1.prefixLength = 24; }; clientv6 = { lib, nodes, ... }: { imports = [ common ]; networking.nameservers = lib.mkForce [ - nodes.server.config.networking.interfaces.eth1.ipv6Address + (lib.head nodes.server.config.networking.interfaces.eth1.ipv6.addresses).address + ]; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "dead:beef::2"; prefixLength = 24; } ]; - networking.interfaces.eth1.ipv6Address = "dead:beef::2"; }; server = { lib, ... }: { imports = [ common ]; - networking.interfaces.eth1.ipAddress = "192.168.0.1"; - networking.interfaces.eth1.prefixLength = 24; - networking.interfaces.eth1.ipv6Address = "dead:beef::1"; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.1"; prefixLength = 24; } + ]; + networking.interfaces.eth1.ipv6.addresses = [ + { address = "dead:beef::1"; prefixLength = 64; } + ]; services.nsd.enable = true; services.nsd.interfaces = lib.mkForce []; services.nsd.zones."example.com.".data = '' diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix new file mode 100644 index 0000000000000000000000000000000000000000..1eaf87a8eaa85ffc96030831e417bc61e2f7d71e --- /dev/null +++ b/nixos/tests/openldap.nix @@ -0,0 +1,35 @@ +import ./make-test.nix { + name = "openldap"; + + machine = { pkgs, ... }: { + services.openldap = { + enable = true; + extraConfig = '' + include ${pkgs.openldap}/etc/schema/core.schema + include ${pkgs.openldap}/etc/schema/cosine.schema + include ${pkgs.openldap}/etc/schema/inetorgperson.schema + include ${pkgs.openldap}/etc/schema/nis.schema + database bdb + suffix dc=example + directory /var/db/openldap + rootdn cn=root,dc=example + rootpw notapassword + ''; + declarativeContents = '' + dn: dc=example + objectClass: domain + dc: example + + dn: ou=users,dc=example + objectClass: organizationalUnit + ou: users + ''; + }; + }; + + testScript = '' + $machine->waitForUnit('openldap.service'); + $machine->succeed('systemctl status openldap.service'); + $machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"'); + ''; +} diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 2915449968897da557a4557008ef397fd5b55852..b2d254e9d9d942cfee5ef5270dd20788dcad03f7 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -1,20 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: -let - snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" '' - -----BEGIN EC PRIVATE KEY----- - MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49 - AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN - r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA== - -----END EC PRIVATE KEY----- - ''; - - snakeOilPublicKey = pkgs.lib.concatStrings [ - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" - "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" - "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil" - ]; - +let inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey snakeOilPublicKey; in { name = "openssh"; meta = with pkgs.stdenv.lib.maintainers; { diff --git a/nixos/tests/owncloud.nix b/nixos/tests/owncloud.nix new file mode 100644 index 0000000000000000000000000000000000000000..0dcdea40b0646e4a2f180e485f0c2758a147276f --- /dev/null +++ b/nixos/tests/owncloud.nix @@ -0,0 +1,39 @@ +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "owncloud"; + nodes = + { web = + { config, pkgs, ... }: + { + services.postgresql.enable = true; + services.httpd = { + enable = true; + logPerVirtualHost = true; + adminAddr = "example@example.com"; + virtualHosts = [ + { + hostName = "owncloud"; + extraSubservices = + [ + { + serviceType = "owncloud"; + adminPassword = "secret"; + dbPassword = "secret"; + } + ]; + } + ]; + }; + }; + }; + + testScript = '' + startAll; + + $web->waitForUnit("postgresql"); + $web->waitForUnit("httpd"); + + $web->succeed("curl -L 127.0.0.1:80"); + ''; +}) diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix new file mode 100644 index 0000000000000000000000000000000000000000..557d65f7960a95c78e47bc3dc72e31a5fbcfcf51 --- /dev/null +++ b/nixos/tests/plotinus.nix @@ -0,0 +1,27 @@ +import ./make-test.nix ({ pkgs, ... }: { + name = "plotinus"; + meta = { + maintainers = pkgs.plotinus.meta.maintainers; + }; + + machine = + { config, pkgs, ... }: + + { imports = [ ./common/x11.nix ]; + programs.plotinus.enable = true; + environment.systemPackages = [ pkgs.gnome3.gnome-calculator pkgs.xdotool ]; + }; + + testScript = + '' + $machine->waitForX; + $machine->execute("xterm -e 'gnome-calculator' &"); + $machine->waitForWindow(qr/Calculator/); + $machine->execute("xdotool key ctrl+shift+p"); + $machine->sleep(1); # wait for the popup + $machine->execute("xdotool key p r e f e r e n c e s Return"); + $machine->waitForWindow(qr/Preferences/); + $machine->screenshot("screen"); + ''; + +}) diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index f6ce3fe38ed3ea296285a04dcb18ff77f6d84e85..7fe905eb4254f7d18c521843a2a45b7ac6dcfaa8 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.postgresql = let mypg = pkgs.postgresql100; in { enable = true; package = mypg; - extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ]; + extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ]; }; }; }; diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix new file mode 100644 index 0000000000000000000000000000000000000000..0d5b0f715f52b0e4fc4b4df407c3a9471d2f3062 --- /dev/null +++ b/nixos/tests/powerdns.nix @@ -0,0 +1,12 @@ +import ./make-test.nix ({ pkgs, ... }: { + name = "powerdns"; + + nodes.server = { config, pkgs, ... }: { + services.powerdns.enable = true; + }; + + testScript = '' + $server->waitForUnit("pdns"); + $server->succeed("${pkgs.dnsutils}/bin/dig version.bind txt chaos \@127.0.0.1"); + ''; +}) diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix new file mode 100644 index 0000000000000000000000000000000000000000..b4c2039923cf02d5fea04768315ba7706d5c4a3a --- /dev/null +++ b/nixos/tests/predictable-interface-names.nix @@ -0,0 +1,27 @@ +{ system ? builtins.currentSystem +, pkgs ? import ../.. { inherit system; } +}: +with import ../lib/testing.nix { inherit system; }; +let boolToString = x: if x then "yes" else "no"; in +let testWhenSetTo = predictable: withNetworkd: +makeTest { + name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; + meta = {}; + + machine = { config, pkgs, ... }: { + networking.usePredictableInterfaceNames = pkgs.stdenv.lib.mkForce predictable; + networking.useNetworkd = withNetworkd; + networking.dhcpcd.enable = !withNetworkd; + }; + + testScript = '' + print $machine->succeed("ip link"); + $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); + $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); + ''; +}; in +with pkgs.stdenv.lib.lists; +with pkgs.stdenv.lib.attrsets; +listToAttrs (map (drv: nameValuePair drv.name drv) ( +crossLists testWhenSetTo [[true false] [true false]] +)) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index e44e5bf11d333d33530efb1c69d58460149d9539..9890088306136e2c00e69936cef6dda1a70fcbb4 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -39,7 +39,9 @@ import ./make-test.nix ({pkgs, ... }: { $client->waitForUnit("cups.service"); $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; + # Test that UNIX socket is used for connections. $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; + # Test that HTTP server is available too. $client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://server:631/"); $server->fail("curl --fail --connect-timeout 2 http://client:631/"); diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix new file mode 100644 index 0000000000000000000000000000000000000000..fcebfaf74e12642b3e2f856d6af76fc9ddf217c1 --- /dev/null +++ b/nixos/tests/prosody.nix @@ -0,0 +1,75 @@ +import ./make-test.nix { + name = "prosody"; + + machine = { config, pkgs, ... }: { + services.prosody = { + enable = true; + # TODO: use a self-signed certificate + c2sRequireEncryption = false; + }; + environment.systemPackages = let + sendMessage = pkgs.writeScriptBin "send-message" '' + #!/usr/bin/env python3 + # Based on the sleekxmpp send_client example, look there for more details: + # https://github.com/fritzy/SleekXMPP/blob/develop/examples/send_client.py + import sleekxmpp + + class SendMsgBot(sleekxmpp.ClientXMPP): + """ + A basic SleekXMPP bot that will log in, send a message, + and then log out. + """ + def __init__(self, jid, password, recipient, message): + sleekxmpp.ClientXMPP.__init__(self, jid, password) + + self.recipient = recipient + self.msg = message + + self.add_event_handler("session_start", self.start, threaded=True) + + def start(self, event): + self.send_presence() + self.get_roster() + + self.send_message(mto=self.recipient, + mbody=self.msg, + mtype='chat') + + self.disconnect(wait=True) + + + if __name__ == '__main__': + xmpp = SendMsgBot("test1@localhost", "test1", "test2@localhost", "Hello World!") + xmpp.register_plugin('xep_0030') # Service Discovery + xmpp.register_plugin('xep_0199') # XMPP Ping + + # TODO: verify certificate + # If you want to verify the SSL certificates offered by a server: + # xmpp.ca_certs = "path/to/ca/cert" + + if xmpp.connect(('localhost', 5222)): + xmpp.process(block=True) + else: + print("Unable to connect.") + sys.exit(1) + ''; + in [ (pkgs.python3.withPackages (ps: [ ps.sleekxmpp ])) sendMessage ]; + }; + + testScript = '' + $machine->waitForUnit('prosody.service'); + $machine->succeed('prosodyctl status') =~ /Prosody is running/; + + # set password to 'test' (it's asked twice) + $machine->succeed('yes test1 | prosodyctl adduser test1@localhost'); + # set password to 'y' + $machine->succeed('yes | prosodyctl adduser test2@localhost'); + # correct password to 'test2' + $machine->succeed('yes test2 | prosodyctl passwd test2@localhost'); + + $machine->succeed("send-message"); + + $machine->succeed('prosodyctl deluser test1@localhost'); + $machine->succeed('prosodyctl deluser test2@localhost'); + ''; +} diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix deleted file mode 100644 index 0991ed3fce1fdc0ba26458f376b8db53fbbc2256..0000000000000000000000000000000000000000 --- a/nixos/tests/pump.io.nix +++ /dev/null @@ -1,89 +0,0 @@ -# This test runs pump.io with mongodb, listing on port 443. - -import ./make-test.nix ({ pkgs, ...} : let - snakeOilKey = '' - -----BEGIN PRIVATE KEY----- - MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqVemio78R41Tz - MnR2zFD/wFT0iScOpFkuytNmuPf28FLaa9wSBWmuAGbEi7wBIfw8/bUqFBTQp2G1 - m1cmcCKxhmvvOkGs89eM131s1lW/bXU3zYso4e7724kHwU65jRlQs6cFWIlmW7V5 - 3HQobP05dy+zPpujPPSlOQ0qYViR1s+RgZI8r0wS2ZDsliNtQwBLJSIvX6XVnXLo - F/HmF4/ySJ9pL2AxQXCwZE8SfCzHpArs9COIqTaAuwB79kxWSFQJewmab74BXiM6 - 9FMCtHON24Pl7OR9sRJHH8rMEzUumppmUeCNEzABjzQQ7svR18cmbzRWetp0tT9Y - 7rj6URHHAgMBAAECggEAGmbCldDnlrAzxJY3cwpsK5f2EwkHIr/aiuQpLCzTUlUh - onVBYRGxtaSeSSyXcV2BKTrxz5nZOBYZkPqI4Y5T8kwxgpz2/QW2jUABUtNN6yPe - HU4gma+bSTJX5PnTZ/M0z0tpQezdLx5b3I2M+48ZGMUegZvcp8qU6N8U6VK5VbFD - DMTGL4b+Kc9HScRkCJjU3FfQcqf9Ml5w9jzHSeHImYEDrG0nX8N8EImRCBXbgxCl - 5XT1h6LFUGdr+N6n2w56+6l8OZZVmwj1NdF6NJybUQl4Y7b0niA+5czzjRt/YUjZ - HW0fXmx3XlbYGWYdMdS+VaIW6pkUpm8kZkqjngqLwQKBgQDfhbFQmg9lsJQ8/dQZ - WzRNsozHKWkQiZbW5sXBWygJbAB3Hc8gvQkuZe9TVyF99cznRj6ro6pGZjP0rTdY - 3ACTL+ygRArcIR6VsJCIr6nPvBLpOoNb8TQeKPmHC2gnSP9zaT/K2lldYISKNaYQ - 0seB2gvZhIgMgWtZtmb3jdgl9wKBgQDDFdknXgvFgB+y96//9wTu2WWuE5yQ5yB7 - utAcHNO9rx5X1tJqxymYh+iE8HUN25By+96SpNMQFI+0wNGVB00YWNBKtyepimWN - EUCojTy+MIXIjrLcvviEePsI4TPWYf8XtZeiYtcczYrt/wPQUYaDb8LBRfpIfmhr - rCGW93s+sQKBgEDOKTeeQyKPjJsWWL01RTfVsZ04s155FcOeyu0heb0plAT1Ho12 - YUgTg8zc8Tfs4QiYxCjNXdvlW+Dvq6FWv8/s0CUzNRbXf1+U/oKys4AoHi+CqH0q - tJqd9KKjuwHQ10dl13n/znMVPbg4j7pG8lMCnfblxvAhQbeT+8yAUo/HAoGBAL3t - /n4KXNGK3NHDvXEp0H6t3wWsiEi3DPQJO+Wy1x8caCFCv5c/kaqz3tfWt0+njSm1 - N8tzdx13tzVWaHV8Jz3l8dxcFtxEJnxB6L5wy0urOAS7kT3DG3b1xgmuH2a//7fY - jumE60NahcER/2eIh7pdS7IZbAO6NfVmH0m4Zh/xAoGAbquh60sAfLC/1O2/4Xom - PHS7z2+TNpwu4ou3nspxfigNQcTWzzzTVFLnaTPg+HKbLRXSWysjssmmj5u3lCyc - S2M9xuhApa9CrN/udz4gEojRVsTla/gyLifIZ3CtTn2QEQiIJEMxM+59KAlkgUBo - 9BeZ03xTaEZfhVZ9bEN30Ak= - -----END PRIVATE KEY----- - ''; - - snakeOilCert = '' - -----BEGIN CERTIFICATE----- - MIICvjCCAaagAwIBAgIJANhA6+PPhomZMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV - BAMMDGIwOTM0YWMwYWZkNTAeFw0xNTExMzAxNzQ3MzVaFw0yNTExMjcxNzQ3MzVa - MBcxFTATBgNVBAMMDGIwOTM0YWMwYWZkNTCCASIwDQYJKoZIhvcNAQEBBQADggEP - ADCCAQoCggEBAKpV6aKjvxHjVPMydHbMUP/AVPSJJw6kWS7K02a49/bwUtpr3BIF - aa4AZsSLvAEh/Dz9tSoUFNCnYbWbVyZwIrGGa+86Qazz14zXfWzWVb9tdTfNiyjh - 7vvbiQfBTrmNGVCzpwVYiWZbtXncdChs/Tl3L7M+m6M89KU5DSphWJHWz5GBkjyv - TBLZkOyWI21DAEslIi9fpdWdcugX8eYXj/JIn2kvYDFBcLBkTxJ8LMekCuz0I4ip - NoC7AHv2TFZIVAl7CZpvvgFeIzr0UwK0c43bg+Xs5H2xEkcfyswTNS6ammZR4I0T - MAGPNBDuy9HXxyZvNFZ62nS1P1juuPpREccCAwEAAaMNMAswCQYDVR0TBAIwADAN - BgkqhkiG9w0BAQsFAAOCAQEAd2w9rxi6qF9WV8L3rHnTE7uu0ldtdgJlCASx6ouj - TleOnjfEg+kH8r8UbmRV5vsTDn1Qp5JGDYxfytRUQwLb1zTLde0xotx37E3LY8Wr - sD6Al4t8sHywB/hc5dy29TgG0iyG8LKZrkwytLvDZ814W3OwpN2rpEz6pdizdHNn - jsoDEngZiDHvLjIyE0cDkFXkeYMGXOnBUeOcu4nfu4C5eKs3nXGGAcNDbDRIuLoE - BZExUBY+YSs6JBvh5tvRqLVW0Dz0akEcjb/jhwS2LmDip8Pdoxx4Q1jPKEu38zrr - Vd5WD2HJhLb9u0UxVp9vfWIUDgydopV5ZmWCQ5YvNepb1w== - -----END CERTIFICATE----- - ''; -in { - name = "pumpio"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ rvl ]; - }; - - nodes = { - one = - { config, pkgs, ... }: - { - services = { - 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 - ''; - }; - systemd.services.mongodb.unitConfig.Before = "pump.io.service"; - systemd.services."pump.io".unitConfig.Requires = "mongodb.service"; - }; - }; - - testScript = '' - startAll; - - $one->waitForUnit("pump.io.service"); - $one->waitUntilSucceeds("curl -k https://localhost"); - ''; -}) diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix index b9644b4768c0ee6259f5d30ccd8b561b76a81010..613180942c41567076113d2bd9c0084a0cc47d37 100644 --- a/nixos/tests/quagga.nix +++ b/nixos/tests/quagga.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: let - ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ip4).address; + ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ipv4.addresses).address; ospfConf = '' interface eth2 diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index f694fc75ef777f3f376ac26a05f37ea836a3636d..8ac0639c6a8cebc96509cdee7b09c0466d9b980f 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -20,7 +20,7 @@ let ''; }; # WARNING: DON'T DO THIS IN PRODUCTION! - # This puts secrets (albeit hashed) directly into the Nix store for ease of testing. + # This puts unhashed secrets directly into the Nix store for ease of testing. environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} '' ${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password} ''; diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix new file mode 100644 index 0000000000000000000000000000000000000000..6b2e2dd3a53179bae9d108077a322f7bb5926155 --- /dev/null +++ b/nixos/tests/rspamd.nix @@ -0,0 +1,140 @@ +{ system ? builtins.currentSystem }: +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; +let + initMachine = '' + startAll + $machine->waitForUnit("rspamd.service"); + $machine->succeed("id \"rspamd\" >/dev/null"); + ''; + checkSocket = socket: user: group: mode: '' + $machine->succeed("ls ${socket} >/dev/null"); + $machine->succeed("[[ \"\$(stat -c %U ${socket})\" == \"${user}\" ]]"); + $machine->succeed("[[ \"\$(stat -c %G ${socket})\" == \"${group}\" ]]"); + $machine->succeed("[[ \"\$(stat -c %a ${socket})\" == \"${mode}\" ]]"); + ''; + simple = name: socketActivation: enableIPv6: makeTest { + name = "rspamd-${name}"; + machine = { + services.rspamd = { + enable = true; + socketActivation = socketActivation; + }; + networking.enableIPv6 = enableIPv6; + }; + testScript = '' + startAll + $machine->waitForUnit("multi-user.target"); + $machine->waitForOpenPort(11334); + $machine->waitForUnit("rspamd.service"); + $machine->succeed("id \"rspamd\" >/dev/null"); + ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" } + sleep 10; + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->log($machine->succeed("systemctl cat rspamd.service")); + ${if socketActivation then '' + $machine->log($machine->succeed("systemctl cat rspamd-controller-1.socket")); + $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket")); + '' else '' + $machine->fail("systemctl cat rspamd-controller-1.socket"); + $machine->fail("systemctl cat rspamd-normal-1.socket"); + ''} + $machine->log($machine->succeed("curl http://localhost:11334/auth")); + $machine->log($machine->succeed("curl http://127.0.0.1:11334/auth")); + ${optionalString enableIPv6 '' + $machine->log($machine->succeed("curl http://[::1]:11334/auth")); + ''} + ''; + }; +in +{ + simple = simple "simple" false true; + ipv4only = simple "ipv4only" false false; + simple-socketActivated = simple "simple-socketActivated" true true; + ipv4only-socketActivated = simple "ipv4only-socketActivated" true false; + deprecated = makeTest { + name = "rspamd-deprecated"; + machine = { + services.rspamd = { + enable = true; + bindSocket = [ "/run/rspamd.sock mode=0600 user=root group=root" ]; + bindUISocket = [ "/run/rspamd-worker.sock mode=0666 user=root group=root" ]; + }; + }; + + testScript = '' + ${initMachine} + $machine->waitForFile("/run/rspamd.sock"); + ${checkSocket "/run/rspamd.sock" "root" "root" "600" } + ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->fail("systemctl cat rspamd-normal-1.socket"); + $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); + $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); + ''; + }; + + bindports = makeTest { + name = "rspamd-bindports"; + machine = { + services.rspamd = { + enable = true; + socketActivation = false; + workers.normal.bindSockets = [{ + socket = "/run/rspamd.sock"; + mode = "0600"; + owner = "root"; + group = "root"; + }]; + workers.controller.bindSockets = [{ + socket = "/run/rspamd-worker.sock"; + mode = "0666"; + owner = "root"; + group = "root"; + }]; + }; + }; + + testScript = '' + ${initMachine} + $machine->waitForFile("/run/rspamd.sock"); + ${checkSocket "/run/rspamd.sock" "root" "root" "600" } + ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->fail("systemctl cat rspamd-normal-1.socket"); + $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); + $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); + ''; + }; + socketActivated = makeTest { + name = "rspamd-socketActivated"; + machine = { + services.rspamd = { + enable = true; + workers.normal.bindSockets = [{ + socket = "/run/rspamd.sock"; + mode = "0600"; + owner = "root"; + group = "root"; + }]; + workers.controller.bindSockets = [{ + socket = "/run/rspamd-worker.sock"; + mode = "0666"; + owner = "root"; + group = "root"; + }]; + }; + }; + + testScript = '' + startAll + $machine->waitForFile("/run/rspamd.sock"); + ${checkSocket "/run/rspamd.sock" "root" "root" "600" } + ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket")); + $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); + $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); + ''; + }; +} diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix new file mode 100644 index 0000000000000000000000000000000000000000..cfe64a75a63523a3dc001b48316237645c0400a9 --- /dev/null +++ b/nixos/tests/rxe.nix @@ -0,0 +1,53 @@ +import ./make-test.nix ({ pkgs, ... } : + +let + node = { config, pkgs, lib, ... } : { + networking = { + firewall = { + allowedUDPPorts = [ 4791 ]; # open RoCE port + allowedTCPPorts = [ 4800 ]; # port for test utils + }; + rxe = { + enable = true; + interfaces = [ "eth1" ]; + }; + }; + + environment.systemPackages = with pkgs; [ rdma-core screen ]; + }; + +in { + name = "rxe"; + + nodes = { + server = node; + client = node; + }; + + testScript = '' + # Test if rxe interface comes up + $server->waitForUnit("default.target"); + $server->succeed("systemctl status rxe.service"); + $server->succeed("ibv_devices | grep rxe0"); + + $client->waitForUnit("default.target"); + + # ping pong test + $server->succeed("screen -dmS rc_pingpong ibv_rc_pingpong -p 4800 -g0"); + $client->succeed("sleep 2; ibv_rc_pingpong -p 4800 -g0 server"); + + $server->succeed("screen -dmS uc_pingpong ibv_uc_pingpong -p 4800 -g0"); + $client->succeed("sleep 2; ibv_uc_pingpong -p 4800 -g0 server"); + + $server->succeed("screen -dmS ud_pingpong ibv_ud_pingpong -p 4800 -s 1024 -g0"); + $client->succeed("sleep 2; ibv_ud_pingpong -p 4800 -s 1024 -g0 server"); + + $server->succeed("screen -dmS srq_pingpong ibv_srq_pingpong -p 4800 -g0"); + $client->succeed("sleep 2; ibv_srq_pingpong -p 4800 -g0 server"); + + $server->succeed("screen -dmS rping rping -s -a server -C 10"); + $client->succeed("sleep 2; rping -c -a server -C 10"); + ''; +}) + + diff --git a/nixos/tests/ssh-keys.nix b/nixos/tests/ssh-keys.nix new file mode 100644 index 0000000000000000000000000000000000000000..07d422196efa70f598d21d5a7010d37691d88890 --- /dev/null +++ b/nixos/tests/ssh-keys.nix @@ -0,0 +1,15 @@ +pkgs: +{ snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" '' + -----BEGIN EC PRIVATE KEY----- + MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49 + AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN + r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA== + -----END EC PRIVATE KEY----- + ''; + + snakeOilPublicKey = pkgs.lib.concatStrings [ + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" + "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" + "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil" + ]; +} diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix new file mode 100644 index 0000000000000000000000000000000000000000..a9d7dc61cb603ab876cbd58f2832ead5f199711b --- /dev/null +++ b/nixos/tests/statsd.nix @@ -0,0 +1,40 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "statsd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + nodes.statsd1 = { + services.statsd.enable = true; + services.statsd.backends = [ "statsd-influxdb-backend" "console" ]; + services.statsd.extraConfig = '' + influxdb: { + username: "root", + password: "root", + database: "statsd" + } + ''; + + services.influxdb.enable = true; + + systemd.services.influx-init = { + description = "Setup Influx Test Base"; + after = [ "influxdb.service" ]; + before = [ "statsd.service" ]; + + script = '' + echo "CREATE DATABASE statsd" | ${pkgs.influxdb}/bin/influx + ''; + }; + }; + + testScript = '' + $statsd1->start(); + $statsd1->waitForUnit("statsd.service"); + $statsd1->succeed("nc -z 127.0.0.1 8126"); + ''; +}) diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix new file mode 100644 index 0000000000000000000000000000000000000000..35addb0ee80562a5c99822023e413c81d858cb01 --- /dev/null +++ b/nixos/tests/sudo.nix @@ -0,0 +1,93 @@ +# Some tests to ensure sudo is working properly. + +let + password = "helloworld"; + +in + import ./make-test.nix ({ pkgs, ...} : { + name = "sudo"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lschuermann ]; + }; + + machine = + { config, lib, pkgs, ... }: + with lib; + { + users.extraGroups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; + users.users = { + test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; }; + test1 = { isNormalUser = true; password = password; }; + test2 = { isNormalUser = true; extraGroups = [ "foobar" ]; password = password; }; + test3 = { isNormalUser = true; extraGroups = [ "barfoo" ]; }; + test4 = { isNormalUser = true; extraGroups = [ "baz" ]; }; + test5 = { isNormalUser = true; }; + }; + + security.sudo = { + enable = true; + wheelNeedsPassword = false; + + extraRules = [ + # SUDOERS SYNTAX CHECK (Test whether the module produces a valid output; + # errors being detected by the visudo checks. + + # These should not create any entries + { users = [ "notest1" ]; commands = [ ]; } + { commands = [ { command = "ALL"; options = [ ]; } ]; } + + # Test defining commands with the options syntax, though not setting any options + { users = [ "notest2" ]; commands = [ { command = "ALL"; options = [ ]; } ]; } + + + # CONFIGURATION FOR TEST CASES + { users = [ "test1" ]; groups = [ "foobar" ]; commands = [ "ALL" ]; } + { groups = [ "barfoo" 1337 ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" "NOSETENV" ]; } ]; } + { users = [ "test5" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" "SETENV" ]; } ]; runAs = "test1:barfoo"; } + ]; + }; + }; + + testScript = + '' + subtest "users in wheel group should have passwordless sudo", sub { + $machine->succeed("su - test0 -c \"sudo -u root true\""); + }; + + subtest "test1 user should have sudo with password", sub { + $machine->succeed("su - test1 -c \"echo ${password} | sudo -S -u root true\""); + }; + + subtest "test1 user should not be able to use sudo without password", sub { + $machine->fail("su - test1 -c \"sudo -n -u root true\""); + }; + + subtest "users in group 'foobar' should be able to use sudo with password", sub { + $machine->succeed("sudo -u test2 echo ${password} | sudo -S -u root true"); + }; + + subtest "users in group 'barfoo' should be able to use sudo without password", sub { + $machine->succeed("sudo -u test3 sudo -n -u root true"); + }; + + subtest "users in group 'baz' (GID 1337) should be able to use sudo without password", sub { + $machine->succeed("sudo -u test4 sudo -n -u root echo true"); + }; + + subtest "test5 user should be able to run commands under test1", sub { + $machine->succeed("sudo -u test5 sudo -n -u test1 true"); + }; + + subtest "test5 user should not be able to run commands under root", sub { + $machine->fail("sudo -u test5 sudo -n -u root true"); + }; + + subtest "test5 user should be able to keep his environment", sub { + $machine->succeed("sudo -u test5 sudo -n -E -u test1 true"); + }; + + subtest "users in group 'barfoo' should not be able to keep their environment", sub { + $machine->fail("sudo -u test3 sudo -n -E -u root true"); + }; + ''; + }) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix new file mode 100644 index 0000000000000000000000000000000000000000..46f2563af8d996cbb1814cc1fc9f690a88c1dc84 --- /dev/null +++ b/nixos/tests/switch-test.nix @@ -0,0 +1,25 @@ +# Test configuration switching. + +import ./make-test.nix ({ pkgs, ...} : { + name = "switch-test"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ gleber ]; + }; + + nodes = { + machine = { config, lib, pkgs, ... }: { + users.mutableUsers = false; + }; + other = { config, lib, pkgs, ... }: { + users.mutableUsers = true; + }; + }; + + testScript = {nodes, ...}: let + originalSystem = nodes.machine.config.system.build.toplevel; + otherSystem = nodes.other.config.system.build.toplevel; + in '' + $machine->succeed("env -i ${originalSystem}/bin/switch-to-configuration test | tee /dev/stderr"); + $machine->succeed("env -i ${otherSystem}/bin/switch-to-configuration test | tee /dev/stderr"); + ''; +}) diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix new file mode 100644 index 0000000000000000000000000000000000000000..65aa553b314843fc8df9acbda774e06f7cb0f6af --- /dev/null +++ b/nixos/tests/systemd.nix @@ -0,0 +1,68 @@ +import ./make-test.nix { + name = "systemd"; + + machine = { lib, ... }: { + imports = [ common/user-account.nix common/x11.nix ]; + + virtualisation.emptyDiskImages = [ 512 ]; + + fileSystems = lib.mkVMOverride { + "/test-x-initrd-mount" = { + device = "/dev/vdb"; + fsType = "ext2"; + autoFormat = true; + noCheck = true; + options = [ "x-initrd.mount" ]; + }; + }; + + systemd.extraConfig = "DefaultEnvironment=\"XXX_SYSTEM=foo\""; + systemd.user.extraConfig = "DefaultEnvironment=\"XXX_USER=bar\""; + services.journald.extraConfig = "Storage=volatile"; + services.xserver.displayManager.auto.user = "alice"; + + systemd.services.testservice1 = { + description = "Test Service 1"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + if [ "$XXX_SYSTEM" = foo ]; then + touch /system_conf_read + fi + ''; + }; + + systemd.user.services.testservice2 = { + description = "Test Service 2"; + wantedBy = [ "default.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + if [ "$XXX_USER" = bar ]; then + touch "$HOME/user_conf_read" + fi + ''; + }; + }; + + testScript = '' + $machine->waitForX; + # wait for user services + $machine->waitForUnit("default.target","alice"); + + # Regression test for https://github.com/NixOS/nixpkgs/issues/35415 + subtest "configuration files are recognized by systemd", sub { + $machine->succeed('test -e /system_conf_read'); + $machine->succeed('test -e /home/alice/user_conf_read'); + $machine->succeed('test -z $(ls -1 /var/log/journal)'); + }; + + # Regression test for https://github.com/NixOS/nixpkgs/issues/35268 + subtest "file system with x-initrd.mount is not unmounted", sub { + $machine->shutdown; + $machine->waitForUnit('multi-user.target'); + # If the file system was unmounted during the shutdown the file system + # has a last mount time, because the file system wasn't checked. + $machine->fail('dumpe2fs /dev/vdb | grep -q "^Last mount time: *n/a"'); + }; + ''; +} diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix new file mode 100644 index 0000000000000000000000000000000000000000..34c49bd7f15b8ade06dc529884e35966e067b955 --- /dev/null +++ b/nixos/tests/transmission.nix @@ -0,0 +1,21 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "transmission"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ coconnor ]; + }; + + machine = { config, pkgs, ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + networking.firewall.allowedTCPPorts = [ 9091 ]; + + services.transmission.enable = true; + }; + + testScript = + '' + startAll; + $machine->waitForUnit("transmission"); + $machine->shutdown; + ''; +}) diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix new file mode 100644 index 0000000000000000000000000000000000000000..515d5c8bac251382069bf4b632de75ccb74c79da --- /dev/null +++ b/nixos/tests/vault.nix @@ -0,0 +1,23 @@ +import ./make-test.nix ({ pkgs, ... }: +{ + name = "vault"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lnl7 ]; + }; + machine = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.vault ]; + environment.variables.VAULT_ADDR = "http://127.0.0.1:8200"; + services.vault.enable = true; + }; + + testScript = + '' + startAll; + + $machine->waitForUnit('multi-user.target'); + $machine->waitForUnit('vault.service'); + $machine->waitForOpenPort(8200); + $machine->succeed('vault operator init'); + $machine->succeed('vault status | grep Sealed | grep true'); + ''; +}) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index c519d7dae8beba46fb1137f5c978f00646cd5624..249571fcedec1dde76ca5a7594721739219ffb4f 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -43,6 +43,9 @@ let "init=${pkgs.writeScript "mini-init.sh" miniInit}" ]; + # XXX: Remove this once TSS location detection has been fixed in VirtualBox + boot.kernelPackages = pkgs.linuxPackages_4_9; + fileSystems."/" = { device = "vboxshare"; fsType = "vboxsf"; @@ -109,9 +112,6 @@ let } '' ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos ${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s - . /sys/class/block/vda1/uevent - mknod /dev/vda1 b $MAJOR $MINOR - ${pkgs.e2fsprogs}/sbin/mkfs.ext4 /dev/vda1 ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 mkdir /mnt diff --git a/nixos/tests/xautolock.nix b/nixos/tests/xautolock.nix new file mode 100644 index 0000000000000000000000000000000000000000..ee46d9e05b068a5bc70574675dad5fd48e79aa45 --- /dev/null +++ b/nixos/tests/xautolock.nix @@ -0,0 +1,24 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "xautolock"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + + nodes.machine = { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + + services.xserver.displayManager.auto.user = "bob"; + services.xserver.xautolock.enable = true; + services.xserver.xautolock.time = 1; + }; + + testScript = '' + $machine->start; + $machine->waitForX; + $machine->mustFail("pgrep xlock"); + $machine->sleep(120); + $machine->mustSucceed("pgrep xlock"); + ''; +}) diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix new file mode 100644 index 0000000000000000000000000000000000000000..40ca91e8064d5b4a4b13d4d8feb3973026302159 --- /dev/null +++ b/nixos/tests/yabar.nix @@ -0,0 +1,25 @@ +import ./make-test.nix ({ pkgs, lib }: + +with lib; + +{ + name = "yabar"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + nodes.yabar = { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + + services.xserver.displayManager.auto.user = "bob"; + + programs.yabar.enable = true; + }; + + testScript = '' + $yabar->start; + $yabar->waitForX; + + $yabar->waitForUnit("yabar.service", "bob"); + ''; +}) diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cfbb1f24b19857dbbdc4d11df10fa7ee706574d5 --- /dev/null +++ b/pkgs/applications/altcoins/aeon/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }: + +let + version = "0.9.14.0"; +in +stdenv.mkDerivation { + name = "aeon-${version}"; + + src = fetchFromGitHub { + owner = "aeonix"; + repo = "aeon"; + rev = "v${version}"; + sha256 = "0pl9nfhihj0wsdgvvpv5f14k4m2ikk8s3xw6nd8ymbnpxfzyxynr"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ boost miniupnpc openssl unbound ]; + + installPhase = '' + install -D src/aeond "$out/bin/aeond" + install src/simpleminer "$out/bin/aeon-simpleminer" + install src/simplewallet "$out/bin/aeon-simplewallet" + install src/connectivity_tool "$out/bin/aeon-connectivity-tool" + ''; + + meta = with stdenv.lib; { + description = "Private, secure, untraceable currency"; + homepage = http://www.aeon.cash/; + license = licenses.bsd3; + maintainers = [ maintainers.aij ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index 011e3cd7c8741124d25565813531a2dec23f4f81..35488732117d61f501c42378659ecd34f7417a2c 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "0wwcgvd8zgl5qh6z1sa3kdv1lr9cwwbs9j2gaad5mqr9sfwbbxdh"; + sha256 = "1s2y29h2q4fnbrfg2ig1cd3h7g3kdcdyrfq7znq1ndnh8xj1j489"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index 9a2145d91cfb49ec982aa6a65508eeac6fdcdffb..31c8ed6fc8d0620e84fcc52069dbd35ab7bf338a 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; - version = "1.3.6"; + version = "1.3.8"; src = fetchFromGitHub { owner = "bitcoinclassic"; repo = "bitcoinclassic"; rev = "v${version}"; - sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07"; + sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch new file mode 100644 index 0000000000000000000000000000000000000000..1b74a48a84aa49462a385ae048a99933b1dbc0bd --- /dev/null +++ b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch @@ -0,0 +1,38 @@ +--- a/src/txmempool.h ++++ b/src/txmempool.h +@@ -204,7 +204,7 @@ + class CompareTxMemPoolEntryByDescendantScore + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + bool fUseADescendants = UseDescendantScore(a); + bool fUseBDescendants = UseDescendantScore(b); +@@ -226,7 +226,7 @@ + } + + // Calculate which score to use for an entry (avoiding division). +- bool UseDescendantScore(const CTxMemPoolEntry &a) ++ bool UseDescendantScore(const CTxMemPoolEntry &a) const + { + double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants(); + double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize(); +@@ -241,7 +241,7 @@ + class CompareTxMemPoolEntryByScore + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + double f1 = (double)a.GetModifiedFee() * b.GetTxSize(); + double f2 = (double)b.GetModifiedFee() * a.GetTxSize(); +@@ -255,7 +255,7 @@ + class CompareTxMemPoolEntryByEntryTime + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + return a.GetTime() < b.GetTime(); + } diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index 9eb1e54b9093325f1e84a39d35e41d1559d7702c..d9040377ebe340cb5087a004208915245525397b 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.0.2.0"; + version = "1.0.3.0"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "v${version}"; - sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q"; + sha256 = "0l02a7h502msrp4c02wgm7f3159ap8l61k4890vas99gq7ywxkcx"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -21,8 +21,13 @@ stdenv.mkDerivation rec { miniupnpc utillinux protobuf libevent ] ++ optionals withGui [ qt4 qrencode ]; + patches = [ + ./bitcoin-unlimited-const-comparators.patch + ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; + enableParallelBuilding = true; meta = { description = "Peer-to-peer electronic cash system (Unlimited client)"; diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index 388676198044d937b474cbed4722515ef66d102b..ccc55d17bcf6b091d324e1d6a0a27515a27a41b4 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -6,13 +6,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version; - version = "0.11G2"; + version = "0.11H"; src = fetchFromGitHub { owner = "bitcoinxt"; repo = "bitcoinxt"; rev = "v${version}"; - sha256 = "071rljvsabyc9j64v248qfb7zfqpfl84hpsnvlavin235zljq8qs"; + sha256 = "1v43bynmidn2zdpky939km721x3ks91bzyh4200gji61qzsmyg62"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 63c45b3ba07fe7d35ba99bbfa536ca7a885d7239..0acd616eeaffcf73763447c82de317ca1bacd3fd 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "1d22fgwdcn343kd95lh389hj417zwbmnhi29cij8n7wc0nz2vpil"; + sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec{ homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; - platforms = platforms.unix; + # bitcoin needs hexdump to build, which doesn't seem to build on darwin at the moment. + platforms = platforms.linux; }; } diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix index 8ade6fb5251f64c55f270174393055744fd9c513..95e03ee6a213d19d17f331f982911a6064bb656c 100644 --- a/pkgs/applications/altcoins/btc1.nix +++ b/pkgs/applications/altcoins/btc1.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.14.5"; + version = "1.15.1"; src = fetchurl { url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz"; - sha256 = "1az6bbblh3adgcs16r9cjz8jacg6sbwfpg8zzfzkbp9h9j85ass5"; + sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix index 0136ab18ceacb4c38a913f18ee3663f32bf1148b..01c47b320de58105baa6aaf210dc239695c9b305 100644 --- a/pkgs/applications/altcoins/cryptop/default.nix +++ b/pkgs/applications/altcoins/cryptop/default.nix @@ -1,16 +1,15 @@ -{ lib, python2}: +{ lib, buildPythonApplication, fetchPypi, requests, requests-cache }: -python2.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "cryptop"; - version = "0.1.0"; - name = "${pname}-${version}"; + version = "0.2.0"; - src = python2.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh"; + sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb"; }; - propagatedBuildInputs = [ python2.pkgs.requests ]; + propagatedBuildInputs = [ requests requests-cache ]; # No tests in archive doCheck = false; diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix index ff0f2407cfec2ee6c22a3852738dbbacb4bbb7a6..b2f2a457a99d6861ea560c949968468c259c78bb 100644 --- a/pkgs/applications/altcoins/dashpay.nix +++ b/pkgs/applications/altcoins/dashpay.nix @@ -2,26 +2,26 @@ , openssl, db48, boost, zlib, miniupnpc , qrencode, glib, protobuf, yasm, libevent , utillinux -, enable_Upnp ? false +, enable_Upnp ? false , disable_Wallet ? false , disable_Daemon ? false }: with stdenv.lib; stdenv.mkDerivation rec { name = "dashpay-${version}"; - version = "0.12.1.3"; + version = "0.12.2.3"; src = fetchFromGitHub { owner = "dashpay"; repo= "dash"; rev = "v${version}"; - sha256 = "0h0fxhh30wy5vp06l1mkswhz565qs6j9y0dm84fmn28rdfvhv2aj"; + sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ glib openssl db48 yasm boost zlib libevent + buildInputs = [ glib openssl db48 yasm boost zlib libevent miniupnpc protobuf qrencode utillinux ]; - + configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ] ++ optional enable_Upnp "--enable-upnp-default" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { with instant transactions. It allows you to keep your finances private as you make transactions without waits, similar to cash. ''; - homepage = http://dashpay.io; + homepage = https://www.dash.org; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/altcoins/dcrd.nix new file mode 100644 index 0000000000000000000000000000000000000000..cc3e83befa64a9820d152280a22c4787819e02a0 --- /dev/null +++ b/pkgs/applications/altcoins/dcrd.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: + +buildGoPackage rec { + name = "dcrd-${version}"; + version = "1.1.2"; + rev = "refs/tags/v${version}"; + goPackagePath = "github.com/decred/dcrd"; + + buildInputs = [ go git dep cacert ]; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "0xcynipdn9zmmralxj0hjrwyanvhkwfj2b1vvjk5zfc95s2xc1q9"; + }; + + preBuild = '' + export CWD=$(pwd) + cd go/src/github.com/decred/dcrd + dep ensure + go install . ./cmd/... + cd $CWD + ''; + + meta = { + homepage = "https://decred.org"; + description = "Decred daemon in Go (golang)"; + license = with lib.licenses; [ isc ]; + broken = stdenv.isLinux; # 2018-04-10 + }; +} diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/altcoins/dcrwallet.nix new file mode 100644 index 0000000000000000000000000000000000000000..8d966684b23c5ec884cc98ff1b04ce296bd8f1bd --- /dev/null +++ b/pkgs/applications/altcoins/dcrwallet.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: + +buildGoPackage rec { + name = "dcrwallet-${version}"; + version = "1.1.2"; + rev = "refs/tags/v${version}"; + goPackagePath = "github.com/decred/dcrwallet"; + + buildInputs = [ go git dep cacert ]; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + src = fetchgit { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "058im4vmcmxcl5ir14h17wik5lagp2ay0p8qc3r99qmpfwvvz39x"; + }; + + preBuild = '' + export CWD=$(pwd) + cd go/src/github.com/decred/dcrwallet + dep ensure + ''; + + buildPhase = '' + runHook preBuild + go build + ''; + + installPhase = '' + mkdir -pv $bin/bin + cp -v dcrwallet $bin/bin + ''; + + + meta = { + homepage = "https://decred.org"; + description = "Decred daemon in Go (golang)"; + license = with lib.licenses; [ isc ]; + broken = stdenv.isLinux; # 2018-04-10 + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index bccb6a34e8e3ef603d7030bbc178ce5a243999dd..174ff96a1247067e8abed1e6af8dccebc093cd60 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,29 +1,40 @@ -{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2 }: +{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: rec { + aeon = callPackage ./aeon { }; + bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; - bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; - bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; + bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; + bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; - bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; }; - bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; + bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; }; + bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; }; + + bitcoin-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; }; + bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; }; - bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; - bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; }; + btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; }; + btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; }; - btc1 = callPackage ./btc1.nix { withGui = true; }; - btc1d = callPackage ./btc1.nix { withGui = false; }; + cryptop = python3.pkgs.callPackage ./cryptop { }; dashpay = callPackage ./dashpay.nix { }; - dogecoin = callPackage ./dogecoin.nix { withGui = true; }; - dogecoind = callPackage ./dogecoin.nix { withGui = false; }; + dcrd = callPackage ./dcrd.nix { }; + dcrwallet = callPackage ./dcrwallet.nix { }; + + dero = callPackage ./dero.nix { }; + + dogecoin = callPackage ./dogecoin.nix { boost = boost165; withGui = true; }; + dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; }; + + ethsign = callPackage ./ethsign { }; freicoin = callPackage ./freicoin.nix { boost = boost155; }; go-ethereum = callPackage ./go-ethereum.nix { @@ -32,14 +43,15 @@ rec { }; 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; }; - memorycoin = callPackage ./memorycoin.nix { withGui = true; }; - memorycoind = callPackage ./memorycoin.nix { withGui = false; }; + masari = callPackage ./masari.nix { }; + + memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; }; + memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; }; + + mist = callPackage ./mist.nix { }; namecoin = callPackage ./namecoin.nix { withGui = true; }; namecoind = callPackage ./namecoin.nix { withGui = false; }; @@ -51,13 +63,15 @@ rec { hevm = (haskellPackages.callPackage ./hevm.nix {}); - primecoin = callPackage ./primecoin.nix { withGui = true; }; - primecoind = callPackage ./primecoin.nix { withGui = false; }; - stellar-core = callPackage ./stellar-core.nix { }; + sumokoin = callPackage ./sumokoin.nix { }; + zcash = callPackage ./zcash { withGui = false; openssl = openssl_1_1_0; }; + + parity = callPackage ./parity { }; + parity-beta = callPackage ./parity/beta.nix { }; } diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix new file mode 100644 index 0000000000000000000000000000000000000000..dff7bc0b0dc415f7ea529c19511a3d5b20a1ff91 --- /dev/null +++ b/pkgs/applications/altcoins/dero.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +, libunwind, lmdb, miniupnpc, readline }: + +stdenv.mkDerivation rec { + name = "dero-${version}"; + version = "0.11.6"; + + src = fetchFromGitHub { + owner = "deroproject"; + repo = "dero"; + rev = "v${version}"; + sha256 = "0jc5rh2ra4wra04dwv9sydid5ij5930s38mhzq3qkdjyza1ahmsr"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Secure, private blockchain with smart contracts based on Monero"; + homepage = "https://dero.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix index e8fb1c49828eef8e64835018445fb9b2191d76cd..81b4cb52948f4abcb9e2e783e28a30134c8011ec 100644 --- a/pkgs/applications/altcoins/ethabi.nix +++ b/pkgs/applications/altcoins/ethabi.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ethabi-${version}"; - version = "1.0.4"; + version = "4.1.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "ethabi"; - rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f"; - sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd"; + rev = "v${version}"; + sha256 = "0kxflixmgycdh7sv73zf2mrkbcfzzw7f5sjbsjks9crc9cvjqi6p"; }; - cargoSha256 = "0i9617qwc6d4jvlbydwk03rcsnyvxzpbn2ms10ds4r6x7jy2a4sy"; + cargoSha256 = "18rigpsmfiv6im2sspnxadgqrlfdp9dd75ji8s56ksc9g7hrc3wz"; cargoBuildFlags = ["--features cli"]; diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0659c4fa258505901c3a32c140d71cf44c6efec4 --- /dev/null +++ b/pkgs/applications/altcoins/ethsign/default.nix @@ -0,0 +1,59 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit, clang }: + +buildGoPackage rec { + name = "ethsign-${version}"; + version = "0.8.2"; + + goPackagePath = "github.com/dapphub/ethsign"; + hardeningDisable = ["fortify"]; + + src = fetchFromGitHub { + owner = "dapphub"; + repo = "ethsign"; + rev = "v${version}"; + sha256 = "1gd0bq5x49sjm83r2wivjf03dxvhdli6cvwb9b853wwcvy4inmmh"; + }; + + extraSrcs = [ + { + goPackagePath = "github.com/ethereum/go-ethereum"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "go-ethereum"; + rev = "v1.7.3"; + sha256 = "1w6rbq2qpjyf2v9mr18yiv2af1h2sgyvgrdk4bd8ixgl3qcd5b11"; + }; + } + { + goPackagePath = "gopkg.in/urfave/cli.v1"; + src = fetchFromGitHub { + owner = "urfave"; + repo = "cli"; + rev = "v1.19.1"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122"; + sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + src = fetchgit { + url = "https://go.googlesource.com/sys"; + rev = "53aa286056ef226755cd898109dbcdaba8ac0b81"; + sha256 = "1yd17ccklby099cpdcsgx6lf0lj968hsnppp16mwh9009ldf72r1"; + }; + } + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/dapphub/ethsign; + description = "Make raw signed Ethereum transactions"; + license = [licenses.gpl3]; + }; +} diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index a44dbbd62ce63e1e8db93a2813780e7b7d52a25d..b753e2d48c977c2844bedff219acb070ecb3de41 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "freicoin"; repo = "freicoin"; rev = "v${version}"; - sha256 = "1m5pcnfhwhcj7q00p2sy3h73rkdm3w6grmljgiq53gshcj08cq1z"; + sha256 = "1v1qwv4x5agjba82s1vknmdgq67y26wzdwbmwwqavv7f7y3y860h"; }; qmakeFlags = ["USE_UPNP=-"]; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 04e68b1f12824d79277aa144bf79b340fd64e882..65e1dbc9b198e170af902220b579d2303f9c0683 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.7.2"; + version = "1.8.3"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -12,11 +12,22 @@ buildGoPackage rec { # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; + # Only install binaries in $out, source is not interesting and takes ~50M + outputs = [ "out" ]; + preFixup = '' + export bin="''${out}" + ''; + installPhase = '' + mkdir -p $out/bin $out + dir="$NIX_BUILD_TOP/go/bin" + [ -e "$dir" ] && cp -r $dir $out + ''; + src = fetchFromGitHub { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "11n77zlf8qixhx26sqf33v911716msi6h0z4ng8gxhzhznrn2nrd"; + sha256 = "1vdrf3fi4arr6aivyp5myj4jy7apqbiqa6brr3jplmc07q1yijnf"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix index 51e5f6bcb298766ad8d9faaf4da5d8261bc8c2cb..1aa598f32545d81611943dc348e25398e47fd972 100644 --- a/pkgs/applications/altcoins/hevm.nix +++ b/pkgs/applications/altcoins/hevm.nix @@ -55,6 +55,7 @@ lib.overrideDerivation (mkDerivation rec { description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; maintainers = [stdenv.lib.maintainers.dbrock]; + broken = true; # 2018-04-10 }) (attrs: { buildInputs = attrs.buildInputs ++ [solc]; nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper]; diff --git a/pkgs/applications/altcoins/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix deleted file mode 100644 index 208a2d3915f0f9b668e3a49edd36caeb502ff0cc..0000000000000000000000000000000000000000 --- a/pkgs/applications/altcoins/hivemind.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ 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/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index ac42caa80999573c43ab6b26b96ee048fc1442ae..12cf5dcb71c1f06c2ab500b505b2a5cefd288ed5 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/pkgs/applications/altcoins/litecoin.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.14.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "litecoin-project"; repo = "litecoin"; rev = "v${version}"; - sha256 = "1smadd5d2mpz2v3pyk7wqm60vdp81zqr4m3z4wfvnlz62m1m800y"; + sha256 = "01q0lj0grabyfh67ar984m9lv9xs0rakadkci8jpfbp8xw166r40"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/altcoins/masari.nix new file mode 100644 index 0000000000000000000000000000000000000000..02a6d25df516423392f414a41ec4ea6d1a639903 --- /dev/null +++ b/pkgs/applications/altcoins/masari.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +, lmdb, miniupnpc, readline }: + +stdenv.mkDerivation rec { + name = "masari-${version}"; + version = "0.1.4.0"; + + src = fetchFromGitHub { + owner = "masari-project"; + repo = "masari"; + rev = "v${version}"; + sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; + homepage = "https://www.getmasari.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index 24b891d60eb247908f8d0467b167b78faab0cc11..944c82250d4755d11868e23a5edc111528edbf9a 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec{ then "install -D bitcoin-qt $out/bin/memorycoin-qt" else "install -D bitcoind $out/bin/memorycoind"; + # `make build/version.o`: + # make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop. + enableParallelBuilding = false; + meta = { description = "Peer-to-peer, CPU-based electronic cash system"; longDescription= '' @@ -47,6 +51,6 @@ stdenv.mkDerivation rec{ homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ AndersonTorres ]; license = licenses.mit; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix new file mode 100644 index 0000000000000000000000000000000000000000..c112384f3d846cfa05fe7c58d1d2ad48d39920ea --- /dev/null +++ b/pkgs/applications/altcoins/mist.nix @@ -0,0 +1,71 @@ +{ stdenv, lib, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }: + +let + version = "0.10.0"; + name = "mist-${version}"; + + throwSystem = throw "Unsupported system: ${stdenv.system}"; + + meta = with stdenv.lib; { + description = "Browse and use Ðapps on the Ethereum network"; + homepage = https://github.com/ethereum/mist; + license = licenses.gpl3; + maintainers = with maintainers; []; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; + + urlVersion = builtins.replaceStrings ["."] ["-"] version; + + desktopItem = makeDesktopItem rec { + name = "Mist"; + exec = "mist"; + icon = "mist"; + desktopName = name; + genericName = "Mist Browser"; + categories = "Network;"; + }; + + mist = stdenv.mkDerivation { + inherit name version; + + src = { + i686-linux = fetchurl { + url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux32-${urlVersion}.zip"; + sha256 = "01hvxlm9w522pwvsjdy18gsrapkfjr7d1jjl4bqjjysxnjaaj2lk"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux64-${urlVersion}.zip"; + sha256 = "01k17j7fdfhxfd26njdsiwap0xnka2536k9ydk32czd8db7ya9zi"; + }; + }.${stdenv.system} or throwSystem; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out/lib/mist $out/bin + unzip -d $out/lib/mist $src + ln -s $out/lib/mist/mist $out/bin + fixupPhase + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:$out/lib/mist" \ + $out/lib/mist/mist + ''; + }; +in +buildFHSUserEnv { + name = "mist"; + + targetPkgs = pkgs: with pkgs; [ + mist + ]; + + extraInstallCommands = '' + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* $out/share/applications + ''; + + runScript = "mist"; +} diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2aff86ae1d380173d144445afc947c9da08f3da6 --- /dev/null +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchFromGitHub +, makeWrapper, makeDesktopItem +, qtbase, qmake, qtmultimedia, qttools +, qtgraphicaleffects, qtdeclarative +, qtlocation, qtquickcontrols2, qtwebchannel +, qtwebengine, qtx11extras, qtxmlpatterns +, monero, unbound, readline, boost, libunwind +, pcsclite, zeromq, cppzmq, pkgconfig +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "monero-gui-${version}"; + version = "0.12.0.0"; + + src = fetchFromGitHub { + owner = "monero-project"; + repo = "monero-gui"; + rev = "v${version}"; + sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl"; + }; + + nativeBuildInputs = [ qmake pkgconfig ]; + + buildInputs = [ + qtbase qtmultimedia qtgraphicaleffects + qtdeclarative qtlocation qtquickcontrols2 + qtwebchannel qtwebengine qtx11extras + qtxmlpatterns monero unbound readline + boost libunwind pcsclite zeromq cppzmq + makeWrapper + ]; + + patches = [ + ./move-log-file.patch + ./move-translations-dir.patch + ]; + + postPatch = '' + echo ' + var GUI_VERSION = "${version}"; + var GUI_MONERO_VERSION = "${getVersion monero}"; + ' > version.js + substituteInPlace monero-wallet-gui.pro \ + --replace '$$[QT_INSTALL_BINS]/lrelease' '${getDev qttools}/bin/lrelease' + substituteInPlace src/daemon/DaemonManager.cpp \ + --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin' + ''; + + makeFlags = [ "INSTALL_ROOT=$(out)" ]; + + preBuild = '' + sed -i s#/opt/monero-wallet-gui##g Makefile + make -C src/zxcvbn-c + ''; + + desktopItem = makeDesktopItem { + name = "monero-wallet-gui"; + exec = "monero-wallet-gui"; + icon = "monero"; + desktopName = "Monero Wallet"; + genericName = "Wallet"; + categories = "Application;Network;Utility;"; + }; + + postInstall = '' + # install desktop entry + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + + # install translations + cp -r release/bin/translations $out/share/ + + # install icons + for n in 16 24 32 48 64 96 128 256; do + size=$n"x"$n + mkdir -p $out/share/icons/hicolor/$size/apps + cp $src/images/appicons/$size.png \ + $out/share/icons/hicolor/$size/apps/monero.png + done; + ''; + + meta = { + description = "Private, secure, untraceable currency"; + homepage = https://getmonero.org/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch new file mode 100644 index 0000000000000000000000000000000000000000..08840c6a65e8ddbd7cccc2a98382bf7fc5437070 --- /dev/null +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -0,0 +1,38 @@ +diff --git a/main.cpp b/main.cpp +index c03b160..a8ea263 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -80,14 +80,16 @@ int main(int argc, char *argv[]) + // qDebug() << "High DPI auto scaling - enabled"; + //#endif + +- // Log settings +- Monero::Wallet::init(argv[0], "monero-wallet-gui"); +-// qInstallMessageHandler(messageHandler); +- + MainApp app(argc, argv); + + qDebug() << "app startd"; + ++ // Log settings ++ QString logfile = ++ QStandardPaths::writableLocation(QStandardPaths::CacheLocation) ++ + "/monero-wallet-gui.log"; ++ Monero::Wallet::init(argv[0], logfile.toUtf8().constData()); ++ + app.setApplicationName("monero-core"); + app.setOrganizationDomain("getmonero.org"); + app.setOrganizationName("monero-project"); +diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp +index 74649ce..fe1efc6 100644 +--- a/src/libwalletqt/Wallet.cpp ++++ b/src/libwalletqt/Wallet.cpp +@@ -729,7 +729,7 @@ QString Wallet::getWalletLogPath() const + #ifdef Q_OS_MACOS + return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs/" + filename; + #else +- return QCoreApplication::applicationDirPath() + "/" + filename; ++ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + filename; + #endif + } + diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch new file mode 100644 index 0000000000000000000000000000000000000000..29bb56301547cce76838a1c5f376ef2413b8cf4d --- /dev/null +++ b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch @@ -0,0 +1,14 @@ +diff --git a/TranslationManager.cpp b/TranslationManager.cpp +index fa39d35..5a410f7 100644 +--- a/TranslationManager.cpp ++++ b/TranslationManager.cpp +@@ -29,7 +29,7 @@ bool TranslationManager::setLanguage(const QString &language) + #ifdef Q_OS_MACX + QString dir = qApp->applicationDirPath() + "/../Resources/translations"; + #else +- QString dir = qApp->applicationDirPath() + "/translations"; ++ QString dir = qApp->applicationDirPath() + "/../share/translations"; + #endif + + QString filename = "monero-core_" + language; + diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8be24522f5648d3ffe6169cf38ecd30598566c26 --- /dev/null +++ b/pkgs/applications/altcoins/monero/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, git +, boost, miniupnpc, openssl, unbound, cppzmq +, zeromq, pcsclite, readline +, CoreData, IOKit, PCSC +}: + +assert stdenv.isDarwin -> IOKit != null; + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "monero-${version}"; + version = "0.12.0.0"; + + src = fetchFromGitHub { + owner = "monero-project"; + repo = "monero"; + rev = "v${version}"; + sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk"; + }; + + nativeBuildInputs = [ cmake pkgconfig git ]; + + buildInputs = [ + boost miniupnpc openssl unbound + cppzmq zeromq pcsclite readline + ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" + ]; + + hardeningDisable = [ "fortify" ]; + + meta = { + description = "Private, secure, untraceable currency"; + homepage = https://getmonero.org/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ ehmry rnhmjoj ]; + }; +} diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix index 83bead0adac589e620be192d5f5fb2860d4f53ef..f734958116953632cc5e0255f2f9fb528cc09193 100644 --- a/pkgs/applications/altcoins/namecoin.nix +++ b/pkgs/applications/altcoins/namecoin.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "nc0.13.0rc1"; + version = "nc0.15.99-name-tab-beta2"; name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = version; - sha256 = "17zz0rm3js285w2assxp8blfx830rs0ambcsaqqfli9mnaik3m39"; + sha256 = "1r0v0yvlazmidxp6xhapbdawqb8fhzrdp11d4an5vgxa208s6wdf"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix new file mode 100644 index 0000000000000000000000000000000000000000..ed78133a759cf17ed913b04a01590a40d0d4c85b --- /dev/null +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -0,0 +1,7 @@ +let + version = "1.10.0"; + sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g"; + cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m"; + patches = [ ./patches/vendored-sources-1.10.patch ]; +in + import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..99179932109470f794bd93a3476af50fe6a21da2 --- /dev/null +++ b/pkgs/applications/altcoins/parity/default.nix @@ -0,0 +1,7 @@ +let + version = "1.9.5"; + sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7"; + cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva"; + patches = [ ./patches/vendored-sources-1.9.patch ]; +in + import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix new file mode 100644 index 0000000000000000000000000000000000000000..9c9d1d4293e0a5e04f212834c35a189cc027fb36 --- /dev/null +++ b/pkgs/applications/altcoins/parity/parity.nix @@ -0,0 +1,38 @@ +{ version +, sha256 +, cargoSha256 +, patches +}: + +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, openssl +, systemd +}: + +rustPlatform.buildRustPackage rec { + name = "parity-${version}"; + inherit cargoSha256 patches; + + src = fetchFromGitHub { + owner = "paritytech"; + repo = "parity"; + rev = "v${version}"; + inherit sha256; + }; + + buildInputs = [ pkgconfig systemd.lib systemd.dev openssl openssl.dev ]; + + # Some checks failed + doCheck = false; + + meta = with stdenv.lib; { + description = "Fast, light, robust Ethereum implementation"; + homepage = http://parity.io; + license = licenses.gpl3; + maintainers = [ maintainers.akru ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch new file mode 100644 index 0000000000000000000000000000000000000000..3e8e032f30c2e97bbf61edb2b5e402f04d901b39 --- /dev/null +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch @@ -0,0 +1,118 @@ +diff --git a/.cargo/config b/.cargo/config +index 72652ad2f..b21c6aa7b 100644 +--- a/.cargo/config ++++ b/.cargo/config +@@ -1,3 +1,113 @@ + [target.x86_64-pc-windows-msvc] + # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 + rustflags = ["-Ctarget-feature=+crt-static"] ++ ++[source."https://github.com/alexcrichton/mio-named-pipes"] ++git = "https://github.com/alexcrichton/mio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"] ++git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git" ++rev = "bd25b41cd642c6b822d820dded3aa601a29aa079" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"] ++git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git" ++rev = "4b6f112412716cd05123d32eeb7fda448288a6c6" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/parity-tokio-ipc"] ++git = "https://github.com/nikvolf/parity-tokio-ipc" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/tokio-named-pipes"] ++git = "https://github.com/nikvolf/tokio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/parity-js/dapp-wallet.git"] ++git = "https://github.com/parity-js/dapp-wallet.git" ++rev = "65deb02e7c007a0fd8aab0c089c93e3fd1de6f87" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/parity-js/shell.git"] ++git = "https://github.com/parity-js/shell.git" ++rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/bn"] ++git = "https://github.com/paritytech/bn" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/hidapi-rs"] ++git = "https://github.com/paritytech/hidapi-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/hyper"] ++git = "https://github.com/paritytech/hyper" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/jsonrpc.git"] ++git = "https://github.com/paritytech/jsonrpc.git" ++branch = "parity-1.10" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-rs"] ++git = "https://github.com/paritytech/libusb-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-sys"] ++git = "https://github.com/paritytech/libusb-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-ctrlc.git"] ++git = "https://github.com/paritytech/rust-ctrlc.git" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-rocksdb"] ++git = "https://github.com/paritytech/rust-rocksdb" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-secp256k1"] ++git = "https://github.com/paritytech/rust-secp256k1" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-snappy"] ++git = "https://github.com/paritytech/rust-snappy" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/trezor-sys"] ++git = "https://github.com/paritytech/trezor-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/wasm-utils"] ++git = "https://github.com/paritytech/wasm-utils" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/wasmi"] ++git = "https://github.com/paritytech/wasmi" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/tailhook/rotor"] ++git = "https://github.com/tailhook/rotor" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/tomusdrw/ws-rs"] ++git = "https://github.com/tomusdrw/ws-rs" ++branch = "master" ++replace-with = "vendored-sources" diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch new file mode 100644 index 0000000000000000000000000000000000000000..d91b103c6cef9915f21768897191e816efd372a4 --- /dev/null +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch @@ -0,0 +1,107 @@ +diff --git a/.cargo/config b/.cargo/config +new file mode 100644 +index 000000000..0efb69724 +--- /dev/null ++++ b/.cargo/config +@@ -0,0 +1,100 @@ ++ ++[source."https://github.com/alexcrichton/mio-named-pipes"] ++git = "https://github.com/alexcrichton/mio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"] ++git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"] ++git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/parity-tokio-ipc"] ++git = "https://github.com/nikvolf/parity-tokio-ipc" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/tokio-named-pipes"] ++git = "https://github.com/nikvolf/tokio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/bn"] ++git = "https://github.com/paritytech/bn" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/hidapi-rs"] ++git = "https://github.com/paritytech/hidapi-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/hyper"] ++git = "https://github.com/paritytech/hyper" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/jsonrpc.git"] ++git = "https://github.com/paritytech/jsonrpc.git" ++branch = "parity-1.9" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-rs"] ++git = "https://github.com/paritytech/libusb-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-sys"] ++git = "https://github.com/paritytech/libusb-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-ctrlc.git"] ++git = "https://github.com/paritytech/rust-ctrlc.git" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-rocksdb"] ++git = "https://github.com/paritytech/rust-rocksdb" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-secp256k1"] ++git = "https://github.com/paritytech/rust-secp256k1" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-snappy"] ++git = "https://github.com/paritytech/rust-snappy" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/trezor-sys"] ++git = "https://github.com/paritytech/trezor-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/wasm-utils"] ++git = "https://github.com/paritytech/wasm-utils" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/wasmi"] ++git = "https://github.com/paritytech/wasmi" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/tailhook/rotor"] ++git = "https://github.com/tailhook/rotor" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/tomusdrw/ws-rs"] ++git = "https://github.com/tomusdrw/ws-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix deleted file mode 100644 index b1e3dc2dd93d8328bf4030a1dc906cd8aecc0be9..0000000000000000000000000000000000000000 --- a/pkgs/applications/altcoins/primecoin.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, db48, boost -, zlib, qt4, qmake4Hook, utillinux, protobuf, qrencode -, withGui }: - -with stdenv.lib; -stdenv.mkDerivation rec{ - - name = "primecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.8.6"; - - src = fetchurl { - url = "https://github.com/primecoin/primecoin/archive/v${version}.tar.gz"; - sha256 = "0cixnkici74204s9d5iqj5sccib5a8dig2p2fp1axdjifpg787i3"; - }; - - qmakeFlags = ["USE_UPNP=-"]; - makeFlags = ["USE_UPNP=-"]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl db48 boost zlib utillinux protobuf ] - ++ optionals withGui [ qt4 qmake4Hook qrencode ]; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; - - preBuild = "unset AR;" - + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile")); - - installPhase = - if withGui - then "install -D bitcoin-qt $out/bin/primecoin-qt" - else "install -D bitcoind $out/bin/primecoind"; - - meta = { - description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers"; - longDescription= '' - Primecoin is an innovative cryptocurrency, a form of digital - currency secured by cryptography and issued through a - decentralized mining market. Derived from Satoshi Nakamoto's - Bitcoin, Primecoin introduces an unique form of proof-of-work - based on prime numbers. - - The innovative prime proof-of-work in Primecoin not only - provides security and minting to the network, but also generates - a special form of prime number chains of interest to mathematical - research. Thus primecoin network is energy-multiuse, compared to - bitcoin. - ''; - homepage = http://primecoin.io/; - maintainers = with maintainers; [ AndersonTorres ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix index b2f5cfdea067f95f192cf8c31f84ab90d2a633f5..334ec9277e1b527d796bb6ae7a72cde8ce300a32 100644 --- a/pkgs/applications/altcoins/seth.nix +++ b/pkgs/applications/altcoins/seth.nix @@ -1,22 +1,24 @@ { stdenv, makeWrapper, lib, fetchFromGitHub -, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which }: +, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which +, nodejs, ethsign +}: stdenv.mkDerivation rec { name = "seth-${version}"; - version = "0.5.6"; + version = "0.6.3"; src = fetchFromGitHub { owner = "dapphub"; repo = "seth"; rev = "v${version}"; - sha256 = "1zl70xy7njjwy4k4g84v7lpf9a2nnnbxh4mkpw7jzqfs2mr636z6"; + sha256 = "0la2nfqsscpbq6zwa6hsd73nimdnrhilrmgyy77yr3jca2wjhsjk"; }; nativeBuildInputs = [makeWrapper]; buildPhase = "true"; makeFlags = ["prefix=$(out)"]; postInstall = let path = lib.makeBinPath [ - bc coreutils curl ethabi git gnused jshon perl solc which + bc coreutils curl ethabi git gnused jshon perl solc which nodejs ethsign ]; in '' wrapProgram "$out/bin/seth" --prefix PATH : "${path}" ''; diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/altcoins/sumokoin.nix new file mode 100644 index 0000000000000000000000000000000000000000..026008b2761a9dd4ffdff8588c72b0d4cf62335d --- /dev/null +++ b/pkgs/applications/altcoins/sumokoin.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake, unbound, openssl, boost +, libunwind, lmdb, miniupnpc }: + +stdenv.mkDerivation rec { + name = "sumokoin-${version}"; + version = "0.2.0.0"; + + src = fetchFromGitHub { + owner = "sumoprojects"; + repo = "sumokoin"; + rev = "v${version}"; + sha256 = "0ndgcawhxh3qb3llrrilrwzhs36qpxv7f53rxgcansbff9b3za6n"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ unbound openssl boost libunwind lmdb miniupnpc ]; + + postPatch = '' + substituteInPlace src/blockchain_db/lmdb/db_lmdb.cpp --replace mdb_size_t size_t + ''; + + cmakeFlags = [ + "-DLMDB_INCLUDE=${lmdb}/include" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Sumokoin is a fork of Monero and a truely fungible cryptocurrency"; + homepage = "https://www.sumokoin.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix index aa912f04efb5d1c0e95364f0f475752b86e60121..6a8fba3c2bb70c8d5dd35307e67985acc99d2c90 100644 --- a/pkgs/applications/altcoins/zcash/default.nix +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -2,36 +2,35 @@ , zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent , withGui }: -let libsnark = callPackage ./libsnark { inherit boost openssl; }; - librustzcash = callPackage ./librustzcash {}; +let librustzcash = callPackage ./librustzcash {}; in with stdenv.lib; stdenv.mkDerivation rec { name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s"; + sha256 = "05y7wxs66anxr5akbf05r36mmjfzqpwawn6vyh3jhpva51hzzzyz"; }; - enableParallelBuilding = true; + # Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o" + # fails with "fatal error: test/data/merkle_roots.json.h: No such file or directory" + enableParallelBuilding = false; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtest gmock gmp libsnark openssl wget db62 boost zlib + buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib protobuf libevent libsodium librustzcash ] ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; - configureFlags = [ "LIBSNARK_INCDIR=${libsnark}/include/libsnark" - "--with-boost-libdir=${boost.out}/lib" + configureFlags = [ "--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 ''; @@ -45,6 +44,6 @@ stdenv.mkDerivation rec { homepage = https://z.cash/; maintainers = with maintainers; [ rht ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix deleted file mode 100644 index 303b3bc171ef835bb6580468dffbe5b258bd254e..0000000000000000000000000000000000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ 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 deleted file mode 100644 index be885493dcda8da161683d6c22b070fb9ca4713a..0000000000000000000000000000000000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ 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 deleted file mode 100644 index a66ff128293ea130a5c9a964015e1ab5afb93504..0000000000000000000000000000000000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/mie.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ 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 deleted file mode 100644 index 88d432fd1637d52a3ce6afef7236e91bae9625ba..0000000000000000000000000000000000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "xbyak-unstable-${version}"; - version = "2016-05-03"; - - src = fetchFromGitHub { - owner = "herumi"; - repo = "xbyak"; - rev = "b6133a02dd6b7116bea31d0e6b7142bf97f071aa"; - sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn"; - }; - - dontBuild = true; - - 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/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 224ae9f6f6f84979ea7f7355f7be6b879cbd725f..dfa27aa9f2ebe036713c359b65372d7bf89ac460 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }: stdenv.mkDerivation rec { - version = "15.12"; + version = "16.06"; name = "mma-${version}"; src = fetchurl { url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; - sha256 = "0k37kcrfaxmwjb8xb1cbqinrkx3g50dbvwqbvwl3l762j4vr8jgx"; + sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww"; }; buildInputs = [ makeWrapper python alsaUtils timidity ]; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index ad12609429f5e4eb9e68f45c3bd25bbad9154bfb..d09a10a15b2c98d87f28cc151cbbd509972cddb8 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -28,6 +28,6 @@ in stdenv.mkDerivation rec { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index a22866dc031abd399578ce589c4dfbd93bae457b..32ae107ed9cb9d26e296b47b2f41f9e12d6ca268 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { name = "aacgain-1.9.0"; @@ -12,7 +12,19 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + postPatch = '' + ( + cd mp4v2 + patch -p0 < ${fetchpatch { + name = "fix_missing_ptr_deref.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_missing_ptr_deref.patch?h=aacgain-cvs&id=e1a19c920f57063e64bab75cb0d8624731f6e3d7"; + sha256 = "1cq7r005nvmwdjb25z80grcam7jv6k57jnl2bh349mg3ajmslbq9"; + }} + ) + ''; + configurePhase = '' + runHook preConfigure cd mp4v2 ./configure @@ -21,9 +33,11 @@ stdenv.mkDerivation { cd .. ./configure + runHook postConfigure ''; buildPhase = '' + runHook preBuild cd mp4v2 make libmp4v2.la @@ -32,18 +46,18 @@ stdenv.mkDerivation { cd .. make + runHook postBuild ''; installPhase = '' - strip -s aacgain/aacgain - install -vD aacgain/aacgain "$out/bin/aacgain" + install -D aacgain/aacgain "$out/bin/aacgain" ''; - meta = { + meta = with stdenv.lib; { description = "ReplayGain for AAC files"; homepage = https://github.com/mulx/aacgain; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.robbinch ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.robbinch ]; }; } diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index a23af5b5caf88d0170cf37d401986bd20c3f13d0..b74d85b9dbfa0f66bd453fe803ceecd89b268e6b 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3 +{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3 , lame, flac, eject, mkcue, glyr , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: @@ -42,7 +42,7 @@ in 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 ]} + ${stdenv.lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} done ''; diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 5a6901a94348cd47d2e3bee74b4f272d6a2d410a..c37963c77f3eff5030b608fd7d363d79b68979eb 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, file, gcc_multi, libX11, makeWrapper +{ stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper , overrideCC, qt5, requireFile, unzip, wine }: @@ -13,14 +13,12 @@ let sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s"; }; - stdenv_multi = overrideCC stdenv gcc_multi; - vst-sdk = stdenv.mkDerivation rec { - name = "vstsdk366_27_06_2016_build_61"; + name = "vstsdk368_08_11_2017_build_121"; src = requireFile { name = "${name}.zip"; url = "http://www.steinberg.net/en/company/developers.html"; - sha256 = "05gsr13bpi2hhp34rvhllsvmn44rqvmjdpg9fsgfzgylfkz0kiki"; + sha256 = "e0f235d8826d70f1ae0ae5929cd198acae1ecff74612fde5c60cbfb45c2f4a70"; }; nativeBuildInputs = [ unzip ]; installPhase = "cp -r . $out"; @@ -38,7 +36,7 @@ let in -stdenv_multi.mkDerivation { +multiStdenv.mkDerivation { name = "airwave-${version}"; src = airwave-src; @@ -54,7 +52,7 @@ stdenv_multi.mkDerivation { # For airwave-host-32.exe.so, point wineg++ to 32-bit versions of # these libraries, as $NIX_LDFLAGS contains only 64-bit ones. substituteInPlace src/host/CMakeLists.txt --replace '-m32' \ - '-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${stdenv_multi.cc.libc.out}/lib/32' + '-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${multiStdenv.cc.libc.out}/lib/32' ''; # libstdc++.so link gets lost in 64-bit executables during @@ -64,7 +62,7 @@ stdenv_multi.mkDerivation { # Cf. https://github.com/phantom-code/airwave/issues/57 hardeningDisable = [ "format" ]; - cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}"; + cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK"; postInstall = '' mv $out/bin $out/libexec diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 115df15d2a57abd8da2ecbf628c644d578be0b3e..f84958e1f820363246a53ac0091f169b181f5ce1 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.7"; + version = "0.9.8"; src = fetchurl { url = "mirror://sourceforge/${packageName}/${name}.tar.bz2"; - sha256 = "0yxccgp9qw2cyqv719wlbq8wfsr5ga8czvwa7bmb8dh5s11n3rn8"; + sha256 = "0wilky1g2mb88v2z0520s7sw1dsn10iwanc8id5p6z1xsnhg7b6p"; }; doCheck = false; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://aj-snapshot.sourceforge.net/; license = licenses.gpl2; - maintainers = [ maintainers.palo ]; + maintainers = [ maintainers.mrVanDalo ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix deleted file mode 100644 index 022e33991f989b0448b95e7358ce90bba70251ee..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/amarok/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig -, qtscriptgenerator, gettext, curl , libxml2, mysql, taglib -, taglib_extras, loudmouth , kdelibs4, qca2, libmtp, liblastfm, libgpod -, phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null -, lz4, lzo, snappy, libaio, pcre -}: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - pname = "amarok"; - version = "2.8.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "1ilf9wdp3wna5pmvxill8x08rb9gw86qkc2zwm3xk9hpy8l9pf7l"; - }; - - QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - - buildInputs = [ - qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/ - taglib taglib_extras loudmouth kdelibs4 phonon strigi soprano qca2 - libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core - lz4 lzo snappy libaio pcre - ]; - - # This is already fixed upstream, will be release in 2.9 - preConfigure = '' - sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake - ''; - - cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; - - enableParallelBuilding = true; - - propagatedUserEnvPkgs = [ qtscriptgenerator ]; - - meta = { - repositories.git = git://anongit.kde.org/amarok.git; - description = "Popular music player for KDE"; - license = "GPL"; - homepage = https://amarok.kde.org; - inherit (kdelibs4.meta) platforms; - }; -} diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix index a96aa3ed65d0e57230a063390ea95bab06654b32..a4ac2943bfbc292264a8c22ce92fc7068138542d 100644 --- a/pkgs/applications/audio/amarok/kf5.nix +++ b/pkgs/applications/audio/amarok/kf5.nix @@ -3,7 +3,7 @@ , qca-qt5, qjson, qtscript, qtwebkit , kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor , phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mariadb, pcre, snappy, taglib, taglib_extras +, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: let @@ -26,7 +26,8 @@ in mkDerivation { qca-qt5 qjson qtscript qtwebkit kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor phonon plasma-framework threadweaver - curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mariadb pcre snappy taglib taglib_extras + curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + pcre snappy taglib taglib_extras ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index afb3c8342731bd83a991585adca3b259208273be..a99fb80df7236070649806a55ae5eb05d3dfedbb 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, - libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify, + libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify, libsoup, avahi, taglib }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext gtk2 expat intltool libgcrypt libunique gnutls - libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib + libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib ]; meta = { diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 99d6357e9216c4f3185f6fee00ab63367f388b4e..9c42c98ba5e33811b950f54b95fadb96739b09fa 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.8"; + version = "2.9.3"; name = "asunder-${version}"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; - sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq"; + sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 8242d035e5b8e53f1b2b1bda724f4eb5a464db5c..6e411c8448f6f39c7fc32829cf48f782dca47307 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 -, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib +, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis -, libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b +, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack , neon, faad2, lame, libnotify, libsidplayfp }: stdenv.mkDerivation rec { name = "audacious-${version}"; - version = "3.8.2"; + version = "3.9"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; - sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf"; + sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2"; - sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq"; + sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra"; }; nativeBuildInputs = [ @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gettext glib gtk3 libmowgli dbus_glib libxml2 + gettext glib gtk3 libmowgli dbus-glib libxml2 xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 - libpulseaudio fluidsynth libmad libogg libvorbis libcdio082 + libpulseaudio fluidsynth libmad libogg libvorbis libcdio libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libmodplug libsamplerate soxr lirc curl wavpack neon faad2 lame libnotify libsidplayfp @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Audio player"; - homepage = http://audacious-media-player.org/; + homepage = https://audacious-media-player.org/; maintainers = with maintainers; [ eelco ramkromberg ]; platforms = with platforms; linux; license = with licenses; [ diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 803b0115fbdfb8592e00eeb49a8d3ba3c6a2d82d..019bde7cc64aa1d284935a2a9cb9ffc7dde0cf74 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -1,27 +1,32 @@ { - mkDerivation, lib, fetchurl, + mkDerivation, lib, fetchurl, fetchpatch, gettext, pkgconfig, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, - libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug, + libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, wavpack }: let - version = "3.8.2"; + version = "3.9"; sources = { "audacious-${version}" = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx"; + sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d"; }; "audacious-plugins-${version}" = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp"; + sha256 = "1f17r7ar0mngcf7z41s6xh073vjafw3i7iy9ijb0cd6bi48g5xwb"; }; }; + + qt510_plugins_patch = fetchpatch { + url = "https://github.com/audacious-media-player/audacious-plugins/commit/971f7ff7c3d8a0b9b420bf4fd19ab97755607637.patch"; + sha256 = "15fy37syj9ygl2ibkkz3g3b9wd22vk9bjfmvqhhkpxphry2zwb17"; + }; in mkDerivation { @@ -33,13 +38,15 @@ mkDerivation { nativeBuildInputs = [ gettext pkgconfig ]; + inherit qt510_plugins_patch; + buildInputs = [ # Core dependencies qtbase # Plugin dependencies alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb - libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli + libcdio libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack ]; @@ -55,6 +62,10 @@ mkDerivation { for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do ( + # only patch the plugins + if [ "$i" -eq "1" ]; then + patches=( $qt510_plugins_patch ) + fi src=''${sourceFiles[$i]} sourceRoot=''${sourceRoots[$i]} source $stdenv/setup @@ -70,7 +81,7 @@ mkDerivation { meta = with lib; { description = "Audio player"; - homepage = http://audacious-media-player.org/; + homepage = https://audacious-media-player.org/; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; linux; license = with licenses; [ diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 4dbde82e09212aade7cdc059f480f35617e8a7b5..b0c47972e3856c40177a70f57c9a8b7104f15adc 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.0"; + version = "2.2.2"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry"; + sha256 = "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix new file mode 100644 index 0000000000000000000000000000000000000000..8b26ba0959d436a509613c20de60a6e88c389e27 --- /dev/null +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -0,0 +1,100 @@ +{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf +, glib, gtk2, harfbuzz, jdk, lib, xorg +, libbsd, libjack2, libpng +, libxkbcommon +, makeWrapper, pixman +, xdg_utils, zenity, zlib }: + +stdenv.mkDerivation rec { + name = "bitwig-studio-${version}"; + version = "1.3.16"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; + sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + libPath = with xorg; lib.makeLibraryPath [ + alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau + libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb + libxkbfile pixman xcbutil xcbutilwm zlib + ]; + + binPath = lib.makeBinPath [ + xdg_utils zenity + ]; + + installPhase = '' + mkdir -p $out + cp -r opt/bitwig-studio $out/libexec + + # Use NixOS versions of these libs instead of the bundled ones. + ( + cd $out/libexec/lib/bitwig-studio + rm libbz2.so* libxkbfile.so* libXcursor.so* libXau.so* \ + libXdmcp.so* libpng16.so* libxcb*.so* libharfbuzz.so* \ + libcairo.so* libfreetype.so* + ln -s ${bzip2.out}/lib/libbz2.so.1.0.6 libbz2.so.1.0 + ) + + # Use our OpenJDK instead of Bitwig’s bundled—and commercial!—one. + rm -rf $out/libexec/lib/jre + ln -s ${jdk.home}/jre $out/libexec/lib/jre + + # Bitwig’s `libx11-windowing-system.so` has several problems: + # + # • has some old version of libxkbcommon linked statically (ಠ_ಠ), + # + # • hardcodes path to `/usr/share/X11/xkb`, + # + # • even if we redirected it with libredirect (after adding + # `eaccess()` to libredirect!), their version of libxkbcommon + # is unable to parse our xkeyboardconfig. Been there, done that. + # + # However, it suffices to override theirs with our libxkbcommon + # in LD_PRELOAD. :-) + + find $out -type f -executable \ + -not -name '*.so.*' \ + -not -name '*.so' \ + -not -path '*/resources/*' | \ + while IFS= read -r f ; do + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + $f && \ + wrapProgram $f \ + --prefix PATH : "${binPath}" \ + --prefix LD_LIBRARY_PATH : "${libPath}" \ + --set LD_PRELOAD "${libxkbcommon.out}/lib/libxkbcommon.so" || true + done + + mkdir -p $out/bin + ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio + + cp -r usr/share $out/share + substitute usr/share/applications/bitwig-studio.desktop \ + $out/share/applications/bitwig-studio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio + ''; + + meta = with stdenv.lib; { + description = "A digital audio workstation"; + longDescription = '' + Bitwig Studio is a multi-platform music-creation system for + production, performance and DJing, with a focus on flexible + editing tools and a super-fast workflow. + ''; + homepage = http://www.bitwig.com/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ michalrus mrVanDalo ]; + }; +} diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix new file mode 100644 index 0000000000000000000000000000000000000000..922acf9e3e00c128fd62c753b532f92c0f27065b --- /dev/null +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, bitwig-studio1, + xdg_utils, zenity, ffmpeg }: + +bitwig-studio1.overrideAttrs (oldAttrs: rec { + name = "bitwig-studio-${version}"; + version = "2.3.1"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; + sha256 = "18gghx0ygwh01cidj8mkf82l9qhq2dy1b3yc4ajksvj762yg6cf2"; + }; + + buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; + + binPath = stdenv.lib.makeBinPath [ + ffmpeg xdg_utils zenity + ]; +}) diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix deleted file mode 100644 index c597e42eaa6dfad43a5abc0cadab9f6f10f69b96..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ 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 -, xdg_utils, zenity, zlib }: - -stdenv.mkDerivation rec { - name = "bitwig-studio-${version}"; - version = "2.1.3"; - - src = fetchurl { - url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "0blfw7dayl1wzys11mdixlkbr1p1d5rnwrvim1hblfpnw2zmlslb"; - }; - - nativeBuildInputs = [ dpkg makeWrapper ]; - - unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; - - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - libPath = lib.makeLibraryPath [ - alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz - libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender - libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm - zlib - ]; - - binPath = lib.makeBinPath [ - ffmpeg xdg_utils zenity - ]; - - installPhase = '' - mkdir -p $out - cp -r opt/bitwig-studio $out/libexec - - # Use NixOS versions of these libs instead of the bundled ones. - ( - cd $out/libexec/lib/bitwig-studio - rm libbz2.so* libxkbfile.so* libXcursor.so* libXau.so* \ - libXdmcp.so* libpng16.so* libxcb*.so* libharfbuzz.so* \ - libcairo.so* libfreetype.so* - ln -s ${bzip2.out}/lib/libbz2.so.1.0.6 libbz2.so.1.0 - ) - - # Use our OpenJDK instead of Bitwig’s bundled—and commercial!—one. - rm -rf $out/libexec/lib/jre - ln -s ${jdk.home}/jre $out/libexec/lib/jre - - # Bitwig’s `libx11-windowing-system.so` has several problems: - # - # • has some old version of libxkbcommon linked statically (ಠ_ಠ), - # - # • hardcodes path to `/usr/share/X11/xkb`, - # - # • even if we redirected it with libredirect (after adding - # `eaccess()` to libredirect!), their version of libxkbcommon - # is unable to parse our xkeyboardconfig. Been there, done that. - # - # However, it suffices to override theirs with our libxkbcommon - # in LD_PRELOAD. :-) - - find $out -type f -executable \ - -not -name '*.so.*' \ - -not -name '*.so' \ - -not -path '*/resources/*' | \ - while IFS= read -r f ; do - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - $f && \ - wrapProgram $f \ - --prefix PATH : "${binPath}" \ - --prefix LD_LIBRARY_PATH : "${libPath}" \ - --set LD_PRELOAD "${libxkbcommon.out}/lib/libxkbcommon.so" || true - done - - mkdir -p $out/bin - ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio - - cp -r usr/share $out/share - substitute usr/share/applications/bitwig-studio.desktop \ - $out/share/applications/bitwig-studio.desktop \ - --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio - ''; - - meta = with stdenv.lib; { - description = "A digital audio workstation"; - longDescription = '' - Bitwig Studio is a multi-platform music-creation system for - production, performance and DJing, with a focus on flexible - editing tools and a super-fast workflow. - ''; - homepage = http://www.bitwig.com/; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michalrus ]; - }; -} diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 15fca59deee3cff77123fd04fb23f9718ad235f9..82c32903bd86502746600d117677095b03fc4eb4 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { name = "calf-${version}"; - version = "0.0.60"; + version = "0.90.0"; src = fetchurl { url = "http://calf-studio-gear.org/files/${name}.tar.gz"; - sha256 = "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9"; + sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib"; }; - buildInputs = [ + buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH libglade lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 35fe510cbb2b5dceb3a95ab13b8b67ec8a69db84..35214502e09a51fd80b5a8b2d6168beadd3c2b1e 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc -, withQt4 ? false, qt4 -, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, vlc +, qtbase, qtmultimedia, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -19,11 +18,6 @@ , withStreams ? true }: -# One and only one front-end. -assert withQt5 -> withQt4 == false; -assert withQt4 -> withQt5 == false; -assert withQt4 || withQt5; - # Inter-dependencies. assert withCddb -> withCdda && withTaglib; assert withCdda -> withCddb && withMusicbrainz; @@ -51,9 +45,16 @@ in stdenv.mkDerivation rec { sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; }; - buildInputs = [ vlc ] - ++ stdenv.lib.optional withQt4 qt4 - ++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ] + patches = [ + # patch is needed for 2.2.0 with qt 5.10 (doesn't harm earlier versions) + (fetchpatch { + url = "https://github.com/CDrummond/cantata/commit/4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a.patch"; + sha256 = "1z21ax3542z7hm628xv110lmplaspb407jzgfk16xkphww5qyphj"; + name = "fix_qt_510.patch"; + }) + + ]; + buildInputs = [ vlc qtbase qtmultimedia qtsvg ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] ++ stdenv.lib.optional withCdda cdparanoia @@ -63,12 +64,11 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 ++ stdenv.lib.optional withUdisks udisks2; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; cmakeFlags = stdenv.lib.flatten [ - (fstat withQt5 "QT5") (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) (fstat withCdda "CDPARANOIA") diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index 27724bc28e990277e4d03253c4c2e2209a2edc7e..2d90599346fb46db6b0f24194af063bd8cd0c07e 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -9,9 +9,13 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = "https://anonscm.debian.org/cgit/pkg-multimedia/caps.git/plain/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch"; + url = "https://salsa.debian.org/multimedia-team/caps/raw/9a99c225/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch"; sha256 = "1b1pb5yfskiw8zi1lkj572l2ajpirh4amq538vggwvlpv1fqfway"; }) + (fetchurl { + url = "https://salsa.debian.org/multimedia-team/caps/raw/a411203d/debian/patches/0002-Use-standard-exp10f-instead-of-pow10f.patch"; + sha256 = "18ciklnscabr77l8b89xmbagkk79w4iqfpzr2yhn2ywv2jp8akx9"; + }) ]; configurePhase = '' diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 57107924b618baca348d1198a8dfd08589dfd182..1420627c02a085672e33368c679864ac163f8fcd 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "cava-${version}"; - version = "0.4.2"; + version = "0.6.0"; buildInputs = [ alsaLib @@ -16,14 +16,16 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "1c5gl8ghmd89f6097rjd2dzrgh1z4i4v9m4vn5wkpnnm68b96yyc"; + sha256 = "01maaq5pfd4a7zilgarwr1nl7jbqyrvir6w7ikchggsckrlk23wr"; }; nativeBuildInputs = [ autoreconfHook ]; postConfigure = '' - substituteInPlace Makefile \ + substituteInPlace Makefile.am \ --replace "-L/usr/local/lib -Wl,-rpath /usr/local/lib" "" + substituteInPlace configure.ac \ + --replace "/usr/share/consolefonts" "$out/share/consolefonts" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 34dba5e206fa4f2f5fe39c5dca7e1acd3e3e7e93..d4d302f07d21a8070b090ad9aab1bf0ffbf88a81 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; }) - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch; buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; diff --git a/pkgs/applications/audio/cdparanoia/utils.patch b/pkgs/applications/audio/cdparanoia/utils.patch new file mode 100644 index 0000000000000000000000000000000000000000..338e5303dcd0c29e16ca9b505aab6aad3eec7bd9 --- /dev/null +++ b/pkgs/applications/audio/cdparanoia/utils.patch @@ -0,0 +1,68 @@ +diff --git cdparanoia-III-10.2/interface/utils.h cdparanoia-III-10.2/interface/utils.h +index c9647da..68c1a3a 100644 +--- cdparanoia-III-10.2/interface/utils.h ++++ cdparanoia-III-10.2/interface/utils.h +@@ -1,4 +1,6 @@ +-#include ++#include ++#include ++#include + #include + #include + #include +@@ -14,15 +16,15 @@ static inline int bigendianp(void){ + } + + static inline int32_t swap32(int32_t x){ +- return((((u_int32_t)x & 0x000000ffU) << 24) | +- (((u_int32_t)x & 0x0000ff00U) << 8) | +- (((u_int32_t)x & 0x00ff0000U) >> 8) | +- (((u_int32_t)x & 0xff000000U) >> 24)); ++ return((((uint32_t)x & 0x000000ffU) << 24) | ++ (((uint32_t)x & 0x0000ff00U) << 8) | ++ (((uint32_t)x & 0x00ff0000U) >> 8) | ++ (((uint32_t)x & 0xff000000U) >> 24)); + } + + static inline int16_t swap16(int16_t x){ +- return((((u_int16_t)x & 0x00ffU) << 8) | +- (((u_int16_t)x & 0xff00U) >> 8)); ++ return((((uint16_t)x & 0x00ffU) << 8) | ++ (((uint16_t)x & 0xff00U) >> 8)); + } + + #if BYTE_ORDER == LITTLE_ENDIAN +diff --git cdparanoia-III-10.2/utils.h cdparanoia-III-10.2/utils.h +index 10dce58..6211ce3 100644 +--- cdparanoia-III-10.2/utils.h ++++ cdparanoia-III-10.2/utils.h +@@ -1,5 +1,6 @@ ++#include ++#include + #include +-#include + #include + #include + #include +@@ -18,15 +19,15 @@ static inline int bigendianp(void){ + } + + static inline int32_t swap32(int32_t x){ +- return((((u_int32_t)x & 0x000000ffU) << 24) | +- (((u_int32_t)x & 0x0000ff00U) << 8) | +- (((u_int32_t)x & 0x00ff0000U) >> 8) | +- (((u_int32_t)x & 0xff000000U) >> 24)); ++ return((((uint32_t)x & 0x000000ffU) << 24) | ++ (((uint32_t)x & 0x0000ff00U) << 8) | ++ (((uint32_t)x & 0x00ff0000U) >> 8) | ++ (((uint32_t)x & 0xff000000U) >> 24)); + } + + static inline int16_t swap16(int16_t x){ +- return((((u_int16_t)x & 0x00ffU) << 8) | +- (((u_int16_t)x & 0xff00U) >> 8)); ++ return((((uint16_t)x & 0x00ffU) << 8) | ++ (((uint16_t)x & 0xff00U) >> 8)); + } + + #if BYTE_ORDER == LITTLE_ENDIAN diff --git a/pkgs/applications/audio/chuck/clang.patch b/pkgs/applications/audio/chuck/clang.patch new file mode 100644 index 0000000000000000000000000000000000000000..77227ef0fd44a6c3936909bc25ed40b5f81fa3c7 --- /dev/null +++ b/pkgs/applications/audio/chuck/clang.patch @@ -0,0 +1,58 @@ +diff --git a/src/ugen_osc.cpp b/src/ugen_osc.cpp +index 6b93c6b..dbefe4f 100644 +--- a/src/ugen_osc.cpp ++++ b/src/ugen_osc.cpp +@@ -1232,7 +1232,7 @@ CK_DLL_CTRL( gen5_coeffs ) + Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(in_args<0) return; ++ if(in_args!=0) return; + size = in_args->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1287,7 +1287,7 @@ CK_DLL_CTRL( gen7_coeffs ) + Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(in_args<0) return; ++ if(in_args!=0) return; + size = in_args->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1340,7 +1340,7 @@ CK_DLL_CTRL( gen9_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1390,7 +1390,7 @@ CK_DLL_CTRL( gen10_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1441,7 +1441,7 @@ CK_DLL_CTRL( gen17_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen17coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1502,7 +1502,7 @@ CK_DLL_CTRL( curve_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen17coeffs, %d\n", weights); +- if(weights<0) goto done; ++ if(weights!=0) goto done; + + nargs = weights->size(); + if (nargs < 5 || (nargs % 3) != 2) { // check number of args diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index fd7f0c2b07c2016303b56c28cfbd29c2b7619b14..e94172b0f879dae534f8a983f5ad512da3737d29 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }: +{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which +, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel +}: stdenv.mkDerivation rec { version = "1.3.5.2"; @@ -10,19 +12,24 @@ stdenv.mkDerivation rec { }; buildInputs = [ bison flex libsndfile which ] - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib + ++ stdenv.lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; - patches = [ ./darwin-limits.patch ]; + patches = [ ./clang.patch ./darwin-limits.patch ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework MultitouchSupport"; postPatch = '' substituteInPlace src/makefile --replace "/usr/bin" "$out/bin" substituteInPlace src/makefile.osx --replace "xcodebuild" "/usr/bin/xcodebuild" substituteInPlace src/makefile.osx --replace "weak_framework" "framework" + substituteInPlace src/makefile.osx --replace "MACOSX_DEPLOYMENT_TARGET=10.5" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" ''; - buildPhase = - stdenv.lib.optionals stdenv.isLinux ["make -C src linux-alsa"] ++ - stdenv.lib.optionals stdenv.isDarwin ["make -C src osx"]; + buildPhase = '' + make -C src ${if stdenv.isDarwin then "osx" else "linux-alsa"} + ''; installPhase = '' install -Dm755 ./src/chuck $out/bin/chuck diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index affddd90784cfe02649618d5d40d1e69aa1ae2a4..b8ff3daec6067c8c6a8c65ba022fb399fe6b9a04 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +{ stdenv, fetchurl, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm , qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf , qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }: @@ -24,6 +24,11 @@ let # Required so as to avoid adding libspotify as a build dependency (as it is # unfree and thus would prevent us from having a free package). ./clementine-spotify-blob-remove-from-build.patch + (fetchpatch { + # Fix w/gcc7 + url = "https://github.com/clementine-player/Clementine/pull/5630.patch"; + sha256 = "0px7xp1m4nvrncx8sga1qlxppk562wrk2qqk19iiry84nxg20mk4"; + }) ]; nativeBuildInputs = [ cmake pkgconfig ]; @@ -71,6 +76,8 @@ let enableParallelBuilding = true; + passthru.unfree = unfree; + meta = with stdenv.lib; { homepage = http://www.clementine-player.org; description = "A multiplatform music player"; @@ -80,8 +87,8 @@ let }; }; - # Spotify blob for Clementine - blob = stdenv.mkDerivation { + # Unfree Spotify blob for Clementine + unfree = stdenv.mkDerivation { name = "clementine-blob-${version}"; # Use the same patches and sources as Clementine inherit src nativeBuildInputs postPatch; @@ -90,7 +97,7 @@ let ./clementine-spotify-blob.patch ]; - buildInputs = buildInputs ++ [ libspotify ]; + buildInputs = buildInputs ++ [ libspotify makeWrapper gst_plugins ]; # Only build and install the Spotify blob preBuild = '' cd ext/clementine-spotifyblob @@ -99,6 +106,15 @@ let mkdir -p $out/libexec/clementine mv $out/bin/clementine-spotifyblob $out/libexec/clementine rmdir $out/bin + + makeWrapper ${free}/bin/clementine $out/bin/clementine \ + --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + + mkdir -p $out/share + for dir in applications icons kde4; do + ln -s "$free/share/$dir" "$out/share/$dir" + done ''; enableParallelBuilding = true; meta = with stdenv.lib; { @@ -111,34 +127,4 @@ let }; }; -in - -with stdenv.lib; - -runCommand "clementine-${version}" -{ - inherit blob free; - buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks - dontPatchELF = true; - dontStrip = true; - meta = { - description = "A multiplatform music player" - + " (" + (optionalString withSpotify "with Spotify, ") - + "with gstreamer plugins: " - + concatStrings (intersperse ", " (map (x: x.name) gst_plugins)) - + ")"; - license = licenses.gpl3Plus; - inherit (free.meta) homepage platforms maintainers; - }; -} -'' - mkdir -p $out/bin - makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ - ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - - mkdir -p $out/share - for dir in applications icons kde4; do - ln -s "$free/share/$dir" "$out/share/$dir" - done -'' +in free diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index c0dd2e92178c4d6b0ef975a429b2920fa3d5f411..f8c5a4e5acff8f6c5f1acab18858467b6fc039b1 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -17,7 +17,7 @@ #, waveoutSupport , cddbSupport ? true, libcddb ? null -, cdioSupport ? true, libcdio ? null +, cdioSupport ? true, libcdio ? null, libcdio-paranoia ? null , cueSupport ? true, libcue ? null , discidSupport ? (!stdenv.isDarwin), libdiscid ? null , ffmpegSupport ? true, ffmpeg ? null @@ -69,7 +69,7 @@ let # Input file formats (mkFlag cddbSupport "CONFIG_CDDB=y" libcddb) - (mkFlag cdioSupport "CONFIG_CDIO=y" libcdio) + (mkFlag cdioSupport "CONFIG_CDIO=y" [ libcdio libcdio-paranoia ]) (mkFlag cueSupport "CONFIG_CUE=y" libcue) (mkFlag discidSupport "CONFIG_DISCID=y" libdiscid) (mkFlag ffmpegSupport "CONFIG_FFMPEG=y" ffmpeg) diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0383af06795e80ae02c4a303b7f24ed80ab46376 --- /dev/null +++ b/pkgs/applications/audio/crip/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchurl +, makeWrapper + +, perl +, perlPackages + +, cdparanoia +, coreutils +, eject +, flac +, gnugrep +, nano +, sox +, vorbis-tools +, vorbisgain +, which +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "crip-3.9"; + src = fetchurl { + url = "http://bach.dynet.com/crip/src/${name}.tar.gz"; + sha256 = "0pk9152wll6fmkj1pki3fz3ijlf06jyk32v31yarwvdkwrk7s9xz"; + }; + + buildInputs = [ perl perlPackages.CDDB_get ]; + nativeBuildInputs = [ makeWrapper ]; + + toolDeps = makeBinPath [ + cdparanoia + coreutils + eject + flac + gnugrep + sox + vorbis-tools + vorbisgain + which + ]; + + scripts = [ "crip" "editcomment" "editfilenames" ]; + + installPhase = '' + mkdir -p $out/bin/ + + for script in ${escapeShellArgs scripts}; do + cp $script $out/bin/ + + substituteInPlace $out/bin/$script \ + --replace '$editor = "vim";' '$editor = "${nano}/bin/nano";' + + wrapProgram $out/bin/$script \ + --set PERL5LIB "${makePerlPath [ perlPackages.CDDB_get ]}" \ + --set PATH "${toolDeps}" + done + ''; + + meta = { + homepage = http://bach.dynet.com/crip/; + description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; + license = stdenv.lib.licenses.gpl1; + platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.endgame ]; + }; +} diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index dc0c8eabcacfc903504e401b76fba865cb7b74f9..191074eba27aecb8d9b2d0389a28f9ac77cf8aba 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "csound-${version}"; - version = "6.09.0"; + version = "6.10.0"; enableParallelBuilding = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "1vfb0mab89psfwidadjrn5mbzq3bhjbyrrmyp98yp0xm6a8cssih"; + sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 1552982cf1ade3b6423dc6b0899bf7d3a0276bae..4dced0cfafae57250cc7ab1d74ca342225df1ee3 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null -, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null +, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null # input plugins , vorbisSupport ? true, libvorbis ? null , mp123Support ? true, libmad ? null @@ -30,7 +30,7 @@ assert gtk2Support || gtk3Support; assert gtk2Support -> gtk2 != null; -assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null; +assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null; assert vorbisSupport -> libvorbis != null; assert mp123Support -> libmad != null; assert flacSupport -> flac != null; @@ -57,12 +57,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2"; - sha256 = "0rwdxxn7h94vlgblbkswyvj6pm82488v8x5nrmlrcsbzjjf2pccw"; + sha256 = "1168hgr1nf27pf24n1rlfh1kx1wiscwhpbhqw0rprwy203gsnqwa"; }; buildInputs = with stdenv.lib; [ jansson ] ++ optional gtk2Support gtk2 - ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ] + ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] ++ optional vorbisSupport libvorbis ++ optional mp123Support libmad ++ optional flacSupport flac @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { description = "Ultimate Music Player for GNU/Linux"; homepage = http://deadbeef.sourceforge.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.abbradar ]; repositories.git = "https://github.com/Alexey-Yakovenko/deadbeef"; }; diff --git a/pkgs/applications/audio/deadbeef/plugins/opus.nix b/pkgs/applications/audio/deadbeef/plugins/opus.nix new file mode 100644 index 0000000000000000000000000000000000000000..55db00c15bf63836ed3f9cca88839aae03ccead1 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/opus.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromBitbucket, opusfile, libopus, libogg, openssl, deadbeef }: + +stdenv.mkDerivation rec { + name = "deadbeef-opus-plugin-${version}"; + version = "0.8"; + + src = fetchFromBitbucket { + owner = "Lithopsian"; + repo = "deadbeef-opus"; + rev = "v${version}"; + sha256 = "057rgsw4563gs63k05s7zsdc0n4djxwlbyqabf7c88f23z35ryyi"; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${opusfile}/include/opus" + ]; + + buildInputs = [ deadbeef opusfile libopus libogg openssl ]; + + meta = with stdenv.lib; { + description = "Ogg Opus decoder plugin for the DeaDBeeF music player"; + homepage = https://bitbucket.org/Lithopsian/deadbeef-opus; + license = licenses.gpl2; # There are three files, each licensed under different license: zlib, gpl2Plus and lgpl2 + maintainers = [ maintainers.jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..be941bc3db292fb845b6eaab3c7721fcb81b73b9 --- /dev/null +++ b/pkgs/applications/audio/denemo/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig +, libjack2, gettext, intltool, guile_2_0, lilypond +, glib, libxml2, librsvg, libsndfile, aubio +, gtk3, gtksourceview, evince, fluidsynth, rubberband +, portaudio, portmidi, fftw, makeWrapper }: + +stdenv.mkDerivation rec { + name = "denemo-${version}"; + version = "2.2.0"; + + src = fetchurl { + url = "http://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; + sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh"; + }; + + buildInputs = [ + libjack2 gettext guile_2_0 lilypond pkgconfig glib libxml2 librsvg libsndfile + aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi + makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/denemo --prefix PATH : ${lilypond}/bin + ''; + + nativeBuildInputs = [ + intltool + ]; + + meta = with stdenv.lib; { + description = "Music notation and composition software used with lilypond"; + homepage = http://denemo.org; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.olynch ]; + }; +} diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 918accb4e167f6f5cb68936ee05d8d08e8988d5f..d16534b03d3266268537fb59fcb1168a3d13971d 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -6,7 +6,7 @@ let src = fetchFromGitHub { sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc"; rev = "39053e8896eedd7b3e8a9e9a9ffd80f1fc6ceb16"; - repo = "reaper"; + repo = "REAPER"; owner = "gillesdegottex"; }; meta = with stdenv.lib; { @@ -16,8 +16,8 @@ let libqaudioextra = { src = fetchFromGitHub { - sha256 = "17pvlij8cc4lwzf6f1cnygj3m3ci6xfa3lv5bgcr5i1gzyjxqpq1"; - rev = "b7d187cd9a1fd76ea94151e2e02453508d0151d3"; + sha256 = "0m6x1qm7lbjplqasr2jhnd2ndi0y6z9ybbiiixnlwfm23sp15wci"; + rev = "9ae051989a8fed0b2f8194b1501151909a821a89"; repo = "libqaudioextra"; owner = "gillesdegottex"; }; @@ -28,10 +28,10 @@ let in stdenv.mkDerivation rec { name = "dfasma-${version}"; - version = "1.2.5"; + version = "1.4.5"; src = fetchFromGitHub { - sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d"; + sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h"; rev = "v${version}"; repo = "dfasma"; owner = "gillesdegottex"; @@ -42,13 +42,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; postPatch = '' - substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' cp -Rv "${reaperFork.src}"/* external/REAPER cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra - ''; - - preConfigure = '' - qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out" + substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" ""; ''; enableParallelBuilding = true; @@ -66,6 +62,5 @@ in stdenv.mkDerivation rec { homepage = http://gillesdegottex.github.io/dfasma/; license = [ licenses.gpl3Plus reaperFork.meta.license ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 740d6d8d7e0a7b8199c9cc03013ada0349504a25..6d56f53bd16f8072f470dde1a1f4811c4c8818da 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: stdenv.mkDerivation rec { - name = "dirt-2015-04-28"; + name = "dirt-2018-01-01"; src = fetchFromGitHub { repo = "Dirt"; owner = "tidalcycles"; - rev = "cfc5e85318defda7462192b5159103c823ce61f7"; - sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz"; + rev = "b09604c7d8e581bc7799d7e2ad293e7cdd254bda"; + sha256 = "13adglk2d31d7mswfvi02b0rjdhzmsv11cc8smhidmrns3f9s96n"; + fetchSubmodules = true; }; buildInputs = [ libsndfile libsamplerate liblo libjack2 ]; postPatch = '' - sed -i "s|./samples|$out/share/dirt/samples|" file.h - ''; - configurePhase = '' - export DESTDIR=$out + sed -i "s|./samples|$out/share/dirt/samples|" dirt.c ''; + makeFlags = ["PREFIX=$(out)"]; postInstall = '' mkdir -p $out/share/dirt/ cp -r samples $out/share/dirt/ diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index a80cc36b216408c55c43e689920a150b69d25ebc..5c9211e7f3bbbe8fd768f9051aed20c5319ae629 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2 +{ stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2 , libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { - name = "distrho-ports-unstable-2017-08-04"; + name = "distrho-ports-unstable-2018-01-01"; - src = fetchgit { - url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; - rev = "f591a1066cd3929536699bb516caa4b5efd9d025"; - sha256 = "1qjnmpmwbq2zpwn8v1dmqn3bjp2ykj5p89fkjax7idgpx1cg7pp9"; + src = fetchFromGitHub { + owner = "DISTRHO"; + repo = "DISTRHO-Ports"; + rev = "b200e7409aa9f6612c4d948932f6ce6f0a087f5a"; + sha256 = "0672r0a9s6skzkxpjdraziwh5k8ivrfzvi4zcpkcg3zrv2hia2vz"; }; patchPhase = '' @@ -37,12 +38,12 @@ stdenv.mkDerivation rec { description = "A collection of cross-platform audio effects and plugins"; longDescription = '' Includes: - Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger - drowaudio-reverb drowaudio-tremolo drumsynt EasySSP eqinox - JuceDemoPlugin klangfalter LUFSMeter luftikus obxd pitchedDelay - stereosourceseparation TAL-Dub-3 TAL-Filter TAL-Filter-2 TAL-NoiseMaker - TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 TAL-Vocoder-2 TheFunction - ThePilgrim Vex Wolpertinger + Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger + drowaudio-reverb drowaudio-tremolo drumsynth EasySSP eqinox HiReSam + JuceDemoPlugin KlangFalter LUFSMeter LUFSMeterMulti Luftikus Obxd + PitchedDelay ReFine StereoSourceSeparation TAL-Dub-3 TAL-Filter + TAL-Filter-2 TAL-NoiseMaker TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 + TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger ''; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index fb62b6ea3de6b4620593720accb792eb3cd509d2..3594fd881b282e5babd87d43c43eca25607c8850 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.4"; + version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "0qqpklzy4wgw9jy0v2810j06712q90bwc69fp7da82536ba058a9"; + sha256 = "1vm8lrk3lykdic6fyfpl12jx1xg6rcaid242s8sij30p1ix4zdab"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index f9c9dc2faef05fb6eba7de5fa40a9d6bd508b85e..e3263c944f45cf4d7358231b624f5b22acbfe2a6 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,35 +1,37 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib -, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas -, makeWrapper, gnome3 +, libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas +, gnome3, wrapGAppsHook }: -stdenv.mkDerivation rec { - name = "easytag-${version}"; - majorVersion = "2.4"; - version = "${majorVersion}.3"; +let + pname = "easytag"; + version = "2.4.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/easytag/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw"; }; - preFixup = '' - wrapProgram $out/bin/easytag \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" - ''; - NIX_LDFLAGS = "-lid3tag -lz"; - nativeBuildInputs = [ makeWrapper pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) + gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac + gsettings-desktop-schemas gnome3.defaultIconTheme ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { description = "View and edit tags for various audio files"; - homepage = http://projects.gnome.org/easytag/; + homepage = https://wiki.gnome.org/Apps/EasyTAG; license = licenses.gpl2Plus; maintainers = with maintainers; [ fuuzetsu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/eflite/buf-overflow.patch b/pkgs/applications/audio/eflite/buf-overflow.patch deleted file mode 100644 index 8873aa77b0e69df75d55597bb240bd540a93d84f..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/eflite/buf-overflow.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix buffer overflow - ---- eflite-0.4.1.orig/es.c -+++ eflite-0.4.1/es.c -@@ -329,7 +329,7 @@ - char *p; - - p = getenv("HOME"); -- sprintf(buf, "%s/.es.conf", p); -+ snprintf(buf, sizeof(buf), "%s/.es.conf", p); - fp = fopen(buf, "r"); - if (!fp) fp = fopen("/etc/es.conf", "r"); - if (!fp) return 1; -@@ -438,7 +438,7 @@ - char logname[200]; - - if ((flags & 0xffff) > DEBUG) return; -- sprintf(logname, "%s/es.log", getenv("HOME")); -+ snprintf(logname, sizeof(logname), "%s/es.log", getenv("HOME")); - va_start(arg, text); - vsnprintf(buf, 200, text, arg); - va_end(arg); diff --git a/pkgs/applications/audio/eflite/cvs-update.patch b/pkgs/applications/audio/eflite/cvs-update.patch deleted file mode 100644 index 1ceace83aa5dcd5fcd02dfd711c38302ec1a2253..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/eflite/cvs-update.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- eflite-0.4.1.orig/fs.c -+++ eflite-0.4.1/fs.c -@@ -9,7 +9,7 @@ - * GNU General Public License, as published by the Free Software - * Foundation. Please see the file COPYING for details. - * -- * $Id: fs.c,v 1.19 2007/01/18 23:58:42 mgorse Exp $ -+ * $Id: fs.c,v 1.22 2008/03/05 15:21:43 mgorse Exp $ - * - * Notes: - * -@@ -505,19 +505,6 @@ - } - } - -- -- --static void play_audio_close(void *cancel) --{ -- if (audiodev) -- { -- audio_drain(audiodev); -- close_audiodev(); -- // usleep(5000); -- } --} -- -- - static inline void determine_playlen(int speed, cst_wave *wptr, int type, int *pl, int *s) - { - int playlen, skip; -@@ -573,12 +560,12 @@ - type = ac[ac_head].type; - WAVE_UNLOCK; - pthread_testcancel(); -- pthread_cleanup_push(play_audio_close, NULL); -- -+ - es_log(2, "Opening audio device."); - /* We abuse the wave mutex here to avoid being canceled - * while the audio device is being openned */ - WAVE_LOCK; -+ assert(audiodev == NULL); - audiodev = audio_open(wptr->sample_rate, wptr->num_channels, CST_AUDIO_LINEAR16); - WAVE_UNLOCK; - if (audiodev == NULL) -@@ -606,8 +593,8 @@ - #ifdef DEBUG - start_time = get_ticks_count(); - #endif -- pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); - audio_write(audiodev, wptr->samples + skip, playlen * 2); -+ pthread_testcancel(); - es_log(2, "Write took %.2f seconds.", get_ticks_count() - start_time); - } - es_log(2, "play: syncing."); -@@ -617,16 +604,16 @@ - audio_flush(audiodev); - pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL); - es_log(2, "Flush took %.2f seconds.", get_ticks_count() - start_time); -- es_log(2, "play: Closing audio device"); -- close_audiodev(); -- pthread_cleanup_pop(0); -- pthread_testcancel(); -- TEXT_LOCK; -+ pthread_testcancel(); -+ -+ TEXT_LOCK; - time_left -= ((float)playlen) / wptr->sample_rate; - pthread_cond_signal(&text_condition); - TEXT_UNLOCK; - - WAVE_LOCK; -+ es_log(2, "play: Closing audio device"); -+ close_audiodev(); - ac_destroy(&ac[ac_head]); - ac_head++; - if (ac_head == ac_tail) -@@ -894,6 +881,7 @@ - WAVE_LOCK_NI; - pthread_cond_signal(&wave_condition); // necessary because we inhibit cancellation while waiting - pthread_cancel(wave_thread); -+ if (audiodev != NULL) audio_drain(audiodev); - WAVE_UNLOCK_NI; - } - -@@ -917,7 +905,10 @@ - } - - /* At this point, no thread is running */ -- -+ -+ // Make sure audio device is closed -+ close_audiodev(); -+ - /* Free any wave data */ - es_log(2, "s_clear: freeing wave data: %d", ac_tail); - for (i = 0; i < ac_tail; i++) diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 36fbdbc2cc9e135d1ebe902e1a13fd9e460db633..4138a07ec0674634462d72b7444a6a98c46926fb 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -1,21 +1,40 @@ -{stdenv,fetchurl,flite,alsaLib,debug ? false}: +{ stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }: stdenv.mkDerivation rec { name = "eflite-${version}"; version = "0.4.1"; + src = fetchurl { url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz"; sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci"; }; + buildInputs = [ flite alsaLib ]; - configureFlags = "flite_dir=${flite} --with-audio=alsa --with-vox=cmu_us_kal16"; + + configureFlags = [ + "flite_dir=${flite}" + "--with-audio=alsa" + "--with-vox=cmu_us_kal16" + ]; + patches = [ - ./buf-overflow.patch - ./cvs-update.patch - ./link.patch + (fetchpatch { + url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/cvs-update"; + sha256 = "0r631vzmky7b7qyhm152557y4fr0xqrpi3y4w66fcn6p4rj03j05"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/buf-overflow"; + sha256 = "071qk133kb7n7bq6kxgh3p9bba6hcl1ixsn4lx8vp8klijgrvkmx"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/link"; + sha256 = "0p833dp4pdsya72bwh3syvkq85927pm6snxvx13lvcppisbhj0fc"; + }) ./format.patch - ]; # Patches are taken from debian. + ]; + CFLAGS = stdenv.lib.optionalString debug " -DDEBUG=2"; + meta = { homepage = http://eflite.sourceforge.net; description = "EFlite is a speech server for screen readers"; diff --git a/pkgs/applications/audio/eflite/link.patch b/pkgs/applications/audio/eflite/link.patch deleted file mode 100644 index 73c69da965c30e06f6679b796e990c1e4247430c..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/eflite/link.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- eflite-0.4.1/Makefile.in 2007-01-19 01:01:09.000000000 +0100 -+++ eflite-0.4.1-new/Makefile.in 2017-03-01 23:25:34.223615492 +0100 -@@ -34,7 +34,7 @@ - $(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS) - - fs.o: fs.c -- $(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $< -+ $(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(FL_VOX) -DSTANDALONE -DEFLITE -c -o $@ $< - - tone.o: tone.c - $(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $< diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4ef1f1dd20207e936ff74a796380662039294b9b --- /dev/null +++ b/pkgs/applications/audio/elisa/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, fetchFromGitHub, lib +, extra-cmake-modules, kdoctools, wrapGAppsHook +, qtmultimedia, qtquickcontrols2, qtwebsockets +, kconfig, kcmutils, kcrash, kdeclarative, kfilemetadata, kinit +, baloo +}: + +mkDerivation rec { + name = "elisa-${version}"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "KDE"; + repo = "elisa"; + rev = version; + sha256 = "13i0fkpwrskric3gfalh7mcpp4l2knwnq7jpq391lgh6krq04r4w"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + + propagatedBuildInputs = [ + qtmultimedia qtquickcontrols2 qtwebsockets + kconfig kcmutils kcrash kdeclarative kfilemetadata kinit + baloo + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Elisa Music Player"; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + inherit (kconfig.meta) platforms; + }; +} diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 3faeeb12d4c654cc5b59e37d8c42be69482c9ebe..651604c71a11d0dcc0442cae44d493191c27e293 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }: +{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig +, xorg }: stdenv.mkDerivation rec { name = "eq10q-${version}"; version = "2.2"; @@ -10,6 +11,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + patches = [ + (fetchpatch { + # glibc 2.27 compatibility + url = https://sources.debian.org/data/main/e/eq10q/2.2~repack0-2.1/debian/patches/05-pow10.patch; + sha256 = "07b0wf6k4xqgigv4h095bzfaw8r218wa36r9w1817jcys13r6c5r"; + }) + ]; + installFlags = '' DESTDIR=$(out) ''; diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 889506deb76868b6b4e4d1ecccabc199e6d1e506..f4160ff6f8081e4f65003b7bd9a2c396ea4ce8c7 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "espeak-ng-${version}"; - version = "2016-08-28"; + version = "1.49.2"; src = fetchFromGitHub { owner = "espeak-ng"; repo = "espeak-ng"; - rev = "b784e77c5708b61feed780d8f1113c4c8eb92200"; - sha256 = "1whix4mv0qvsvifgpwwbdzhv621as3rxpn9ijqc2683h6k8pvcfk"; + rev = version; + sha256 = "17bbl3zi8214iaaj8kjnancjvmvizwybg3sg17qjq4mf5c6xfg2c"; }; nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ]; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 4875ee8b57da3fce6eb5d1d3cf8124c6cacfb1eb..bf5bb7815856ebffbc6c2b2dc09eaa39406a36ef 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -49,7 +49,7 @@ let # faust.wrapWithBuildEnv. postInstall = '' # syntax error when eval'd directly - pattern="faust2!(svg)" + pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" (shopt -s extglob; rm "$out"/bin/$pattern) ''; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 901df19ebf596ead80b79012bb6da92d681ae599..db5433cc35fc5cfef789949b034cb60d10c71e47 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -16,13 +16,14 @@ with stdenv.lib.strings; let - version = "2.1.0"; + version = "2.5.23"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "v${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m"; + rev = "${version}"; + sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc"; + fetchSubmodules = true; }; meta = with stdenv.lib; { @@ -77,7 +78,7 @@ let # faust.wrapWithBuildEnv. postInstall = '' # syntax error when eval'd directly - pattern="faust2!(svg)" + pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" (shopt -s extglob; rm "$out"/bin/$pattern) ''; diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 3867114562d56edabc1c50fe8520a31e407576ab..7762ca393690ded3384368d182835f647f71b0bb 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -2,6 +2,7 @@ , gtk2 , jack2Full , opencv +, libsndfile }: faust.wrapWithBuildEnv { @@ -18,6 +19,7 @@ faust.wrapWithBuildEnv { gtk2 jack2Full opencv + libsndfile ]; } diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index c0911b315386293dda2c8f2fe7cd7eea9d11ddc3..5a015e5ca31e57a3d005063ae71d4bcbc0579330 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -2,6 +2,7 @@ , jack2Full , opencv , qt4 +, libsndfile }: faust.wrapWithBuildEnv { @@ -17,6 +18,7 @@ faust.wrapWithBuildEnv { jack2Full opencv qt4 + libsndfile ]; } diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 425b2b866a5af2a04e2d43600fab0d80de192f51..99aedae19124bde1833fb274d4e8f586a1e4cc47 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = https://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; - maintainers = [ maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index ab28c43f66cf9b0f4525b1ebff20ed429046b6ed..a16593d4d1b0bef838799ce3e6e5a058c349fd61 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "2.1.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0jazv3d1xaydp2ws1pd5rmga76z5yk74v3a8yqfc8vbb2z6ahimz"; + sha256 = "1sw2v2w3s79lbzhkf96m8lwvag824am7rwfzzsi8bz6sa6krmj0m"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 545e7c5047a9f68bb77303d93c8035c0f0da1d9b..246e02c53c720e3737a0799c051433ecf39f560a 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "3.23.15"; + version = "4.0.16"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1nxafk99fr6yb09cq3vdpzjcd85mnjwwl8rzccx21kla1ysihl5m"; + sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index a8bf05187e3367cf5174eea6e7bb573bc1a1ed59..27ca539850e2526e59c593ed84c6c0c612652d24 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,34 +1,31 @@ -{ stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig -, libpulseaudio, CoreServices, CoreAudio, AudioUnit }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +, alsaLib, glib, libjack2, libsndfile, libpulseaudio +, AudioUnit, CoreAudio, CoreMIDI, CoreServices +}: stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.6"; + version = "1.1.10"; - src = fetchurl { - url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2"; - sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj"; + src = fetchFromGitHub { + owner = "FluidSynth"; + repo = "fluidsynth"; + rev = "v${version}"; + sha256 = "04jlgq1d1hd8r9cnmkl3lgf1fgm7kgy4hh9nfddap41fm1wp121p"; }; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i '40 i\ - #include \ - #include ' \ - src/drivers/fluid_coreaudio.c - ''; + nativeBuildInputs = [ pkgconfig cmake ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin - "-framework CoreAudio -framework CoreServices"; - - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libsndfile ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ]; + ++ lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] + ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; + + cmakeFlags = lib.optional stdenv.isDarwin "-Denable-framework=off"; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; homepage = http://www.fluidsynth.org; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ goibhniu lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index e4c6c658efd763868a6c5bbf07032419f42595e9..f1bdcd8c5242528e9ddfb51c3aef772ff91888c7 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, qmake +{ stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: @@ -11,10 +11,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fmit-${version}"; - version = "1.1.11"; + version = "1.1.14"; src = fetchFromGitHub { - sha256 = "1w492lf8n2sjkr53z8cvkgywzn0w53cf78hz93zaw6dwwv36lwdp"; + sha256 = "18gvl8smcnigzldy1acs5h8rscf287b39xi4y2cl5armqbj0y38x"; rev = "v${version}"; repo = "fmit"; owner = "gillesdegottex"; @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { homepage = http://gillesdegottex.github.io/fmit/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 25704d2628019da5a7e05d45dc6734eb7406a5ac..4266b8c69bb856f406a0e68453b55ec349745875 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { name = "freewheeling-${version}"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; rev = "v${version}"; - sha256 = "01hmp0jxzxpb5sl0x91hdlwmbw9n4yffrpra4f89s4n8cixrz3d9"; + sha256 = "1xflbbnjdibjmyxb1zq8liylaw5k03nnl1z3272jh204pqh17ri9"; }; nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index e53b498fb6eefd8b976ff841e439b0c97a0c1e44..b92d4f6eb1e8a52941044581db50a1a9bfa186da 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45 -, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt -, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which +, docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt +}: stdenv.mkDerivation rec { - name = "gigedit-svn-${version}"; - version = "2342"; + name = "gigedit-${version}"; + version = "1.1.0"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/gigedit/trunk"; - rev = "${version}"; - sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs"; + src = fetchurl { + url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; }; - patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs"; + patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ]; - preConfigure = "make -f Makefile.cvs"; + preConfigure = "make -f Makefile.svn"; - buildInputs = [ - autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool - libgig libsndfile libtool libxslt pkgconfig - ]; + nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ]; + + buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch new file mode 100644 index 0000000000000000000000000000000000000000..eb00fcc87a24e59b7d81e6e9a3f5deb130dce97b --- /dev/null +++ b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch @@ -0,0 +1,15 @@ +--- a/src/gigedit/wrapLabel.cc ++++ b/src/gigedit/wrapLabel.cc +@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text + : mWrapWidth(0), + mWrapHeight(0) + { +- // pangomm >= 2.35.1 +-#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1))) +- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR); +-#else + get_layout()->set_wrap(Pango::WRAP_WORD_CHAR); +-#endif + set_alignment(0.0, 0.0); + set_text(text); + } diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 2d63245fef6388b8f34ccb6d589e3bb8b5de511c..42285ba4bf862af5d0a2a0641ea2f22bb32f0f5e 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl +{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ]; + buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 50b1bcde58f3ef0e81de8607a4df6b8236c54a39..c2adc58f9ce564d99c780ad701f42ad52923c844 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib -, gtk2, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique -, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook +, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique +, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -24,11 +24,10 @@ stdenv.mkDerivation rec { sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ - libtool intltool glib gtk2 curl mpd_clientlib libsoup - libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme - wrapGAppsHook + glib gtk2 curl mpd_clientlib libsoup + libunique libmpd libSM libICE sqlite hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 9d9af63118320c9b2fde6e65074d37d07a820c2e..6c7d6dba455c929641a60e0818326d1e7edfc39e 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -4,7 +4,7 @@ }: let - version = "4.4.1"; + version = "4.5.0"; deps = [ alsaLib @@ -46,7 +46,7 @@ stdenv.mkDerivation { 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 = "0jqgawgij6jxf3zy3glviqj6s34mq7d756syg2c7kk1gkqkwgdpw"; + sha256 = "06h9g1yhd5q7gg8v55q143fr65frxg0khfgckr03gsaw0swin51q"; }; dontBuild = true; @@ -74,6 +74,6 @@ stdenv.mkDerivation { 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; + maintainers = [ stdenv.lib.maintainers.SuprDewd ]; }; } diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 3d074bf1e19ed88f57b7ada3002432ba3281cce4..0cf5a3610038d48e1ab5232a377c388dc532c278 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,65 +1,67 @@ -{ stdenv, fetchurl, fetchpatch, python2Packages, mygpoclient, intltool -, ipodSupport ? false, libgpod -, gnome3 +{ stdenv, fetchFromGitHub, python3, python3Packages, intltool +, glibcLocales, gnome3, gtk3, wrapGAppsHook +, ipodSupport ? false, libgpod, gobjectIntrospection }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "gpodder-${version}"; + version = "3.10.1"; - version = "3.9.3"; + format = "other"; - src = fetchurl { - url = "http://gpodder.org/src/${name}.tar.gz"; - sha256 = "1s83m90dic2zphwwv6wrvqx950y12v5sakm7q5nj5bnh5k9l2hgl"; + src = fetchFromGitHub { + owner = "gpodder"; + repo = "gpodder"; + rev = version; + sha256 = "1cqhm5h0kkdb2m691dbj8i3bixl7bw0iww2pl6k1jkz8mgafyd9d"; }; - 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 - - makeWrapperArgs="--suffix XDG_DATA_DIRS : '${concatStringsSep ":" [ - "${gnome3.gnome_themes_standard}/share" - "$XDG_ICON_DIRS" - "$GSETTINGS_SCHEMAS_PATH" - ]}'" ''; + nativeBuildInputs = [ + intltool + wrapGAppsHook + glibcLocales + ]; + buildInputs = [ - intltool python2Packages.coverage python2Packages.minimock - gnome3.gnome_themes_standard gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas + python3 + gobjectIntrospection + gnome3.defaultIconTheme ]; - propagatedBuildInputs = with python2Packages; [ - feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib + checkInputs = with python3Packages; [ + coverage minimock + ]; + + doCheck = true; + + propagatedBuildInputs = with python3Packages; [ + feedparser + dbus-python + mygpoclient + pygobject3 + eyeD3 + podcastparser + html5lib + gtk3 ] ++ stdenv.lib.optional ipodSupport libgpod; + makeFlags = [ + "PREFIX=$(out)" + "share/applications/gpodder-url-handler.desktop" + "share/applications/gpodder.desktop" + "share/dbus-1/services/org.gpodder.service" + ]; + preBuild = '' - make PREFIX="$out" \ - share/applications/gpodder-url-handler.desktop \ - share/applications/gpodder.desktop \ - share/dbus-1/services/org.gpodder.service + export LC_ALL="en_US.UTF-8" ''; - checkPhase = '' - LC_ALL=C python -m gpodder.unittests + installCheckPhase = '' + LC_ALL=C PYTHONPATH=./src:$PYTHONPATH python3 -m gpodder.unittests ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 2f4bde92167b461b66fa1baadd873d2ee6fe00b2..d111502651ed2a14abaa1e56ed9de798213c7826 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, pkgconfig , gcc , python3 -, gsettings_desktop_schemas -, desktop_file_utils +, gsettings-desktop-schemas +, desktop-file-utils , glib , gtk3 , intltool , libsoup -, json_glib +, json-glib , wrapGAppsHook , meson , ninja @@ -17,7 +17,7 @@ , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - version = "6.0.2"; + version = "7.1"; in stdenv.mkDerivation rec { name = "gradio-${version}"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { owner = "haecker-felix"; repo = "gradio"; rev = "v${version}"; - sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s"; + sha256 = "0x0hmcjvpgvsm64ywcc71srlwqybfhadn5nkwycq0lh7r49d89kx"; }; nativeBuildInputs = [ @@ -44,15 +44,15 @@ in stdenv.mkDerivation rec { glib intltool libsoup - json_glib + json-glib gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook - desktop_file_utils - gsettings_desktop_schemas + desktop-file-utils + gsettings-desktop-schemas ] ++ gst_plugins; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 7ebdce7835275610aed2ca487d9907a173ea6064..e0e620bd05f941b9bb6f348b77b5f2d552d645d0 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, - gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, - libvorbis, hicolor_icon_theme, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, + gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag, + libvorbis, hicolor-icon-theme, gdk_pixbuf }: stdenv.mkDerivation rec { version = "2.1.5"; @@ -11,24 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser - flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta - gnome.gdl gnome.defaultIconTheme - hicolor_icon_theme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + buildInputs = [ + curl gettext perl perlXMLParser + flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf + gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta + ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh ''; - preFixup = '' - wrapProgram "$out/bin/gtkpod" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index b149aab06e10fa5c40cb653df6ba5ebd4d6d2700..bcb301687089eadb777606b6e33020da234862f7 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python2 -, avahi, bluez, boost, eigen, fftw, glib, glib_networking -, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 +, avahi, bluez, boost, eigen, fftw, glib, glib-networking +, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 , ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom , wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions @@ -12,18 +12,18 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.35.6"; + version = "0.36.1"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "0ffvfnvhj6vz73zsrpi88hs69ys4zskm847zf825dl2r39n9nn41"; + sha256 = "1g5949jwh2n755xjs3kcbdb8a1wxr5mn0m115wdnk27dxcdn93b0"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; buildInputs = [ - avahi bluez boost eigen fftw glib glibmm glib_networking.out - gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf + avahi bluez boost eigen fftw glib glibmm glib-networking.out + gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf libsndfile lilv lv2 serd sord sratom zita-convolver zita-resampler ]; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 80fb6a9ef923c0dc5397d9d3b817c8c9465925ca..fa76a1a26e823a03ab7fe2e53714c24212285213 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 - , lv2, pkgconfig, mesa }: + , lv2, pkgconfig, libGLU_combined }: stdenv.mkDerivation rec { version = "0.9.0"; @@ -15,7 +15,7 @@ buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsaLib curl libjack2 pkgconfig mesa lv2 + freetype alsaLib curl libjack2 pkgconfig libGLU_combined lv2 ]; CXXFLAGS = "-DHAVE_LROUND"; diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 6653526c6e2f15be0874c55515e83d34a7611b89..d2720fcace67326ad950d48b2a048fa4fd33328f 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { description = "A command line editor for id3v2 tags"; homepage = http://id3v2.sourceforge.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9fe0820e5d6f7adb63e19803c90170e3b27c0504 --- /dev/null +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: + +stdenv.mkDerivation rec { + name = "infamousPlugins-v${version}"; + version = "0.2.04"; + + src = fetchFromGitHub { + owner = "ssj71"; + repo = "infamousPlugins"; + rev = "v${version}"; + sha256 = "0hmqk80w4qxq09iag7b7srf2g0wigkyhzq0ywxvhz2iz0hq9k0dh"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; + + meta = with stdenv.lib; { + homepage = https://ssj71.github.io/infamousPlugins; + description = "A collection of open-source LV2 plugins"; + longDescription = '' + These are audio plugins in the LV2 format, developed for linux. Most are suitable for live use. + This collection contains: + * Cellular Automaton Synth - additive synthesizer, where 16 harmonics are added according to rules of elementary cellular automata + * Envelope Follower - a fully featured envelope follower plugin + * Hip2B - a distortion/destroyer plugin + * cheap distortion - another distortion plugin, but this one I wanted to get it as light as possible + * stuck - a clone of the electro-harmonix freeze + * power cut - this effect is commonly called tape stop + * power up - the opposite of the power cut + * ewham - a whammy style pitchshifter + * lushlife - a simulated double tracking plugin capable of everything from a thin beatle effect to thick lush choruses to weird outlandish effects + ''; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index ca806aad02feae984640ad9cc2d59fb67e3cfa8f..d9109dd1c0e7155b66bfe4bace0ab791f718fa32 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom +, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom + , suil }: stdenv.mkDerivation rec { name = "ingen-unstable-${rev}"; - rev = "2017-01-18"; + rev = "2017-07-22"; src = fetchgit { - url = "http://git.drobilla.net/cgit.cgi/ingen.git"; - rev = "02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340"; - sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k"; + url = "https://git.drobilla.net/cgit.cgi/ingen.git"; + rev = "cc4a4db33f4d126a07a4a498e053c5fb9a883be3"; + sha256 = "1gmwmml486r9zq4w65v91mfaz36af9zzyjkmi74m8qmh67ffqn3w"; + deepClone = true; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper + boost ganv glibmm gtkmm2 libjack2 lilv lv2Unstable makeWrapper python raul serd sord sratom suil ]; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index f1e00e876730ff4b46b1ce4ddfdde786ee54a626..e4d20db78682ae88f121b3c5e4108d4dc1a69fee 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jack_capture-${version}"; - version = "0.9.69"; + version = "0.9.73"; src = fetchurl { url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz"; - sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; + sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index a75513ff059ee86b4f3cd6d48dbeb7aaa383537c..75a8a6a4b1a11da810c5e4d16f9f913eb00aead9 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libjack2, mesa, pkgconfig }: +{ stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }: stdenv.mkDerivation rec { name = "jack_oscrolloscope-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL libjack2 mesa ]; + buildInputs = [ SDL libjack2 libGLU_combined ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 060b7f703a31503aa0147f88fa4dd2875bf753f2..e44dfddd37b7c1564428eea5bb6048e1b91fe145 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jackmeter-0.4"; src = fetchurl { - url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz"; + url = "https://www.aelius.com/njh/jackmeter/${name}.tar.gz"; sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Console jack loudness meter"; - homepage = http://www.aelius.com/njh/jackmeter/; + homepage = https://www.aelius.com/njh/jackmeter/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 6a013e8c604fa7cb8838efcdb8f5d995bba154ac..344e6894baf5d4a05827110c4549e68fb7df227f 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 6aaf14a5763a86dccb35f4cb5519100820dea856..55039e8508bc064df1b3b33462206eb56d814b7f 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "keyfinder-${version}"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { - sha256 = "0j9k90ll4cr8j8dywb6zf1bs9vijlx7m4zsh6w9hxwrr7ymz89hn"; + sha256 = "0vjszk1h8vj2qycgbffzy6k7amg75jlvlnzwaqhz9nll2pcvw0zl"; rev = version; repo = "is_KeyFinder"; owner = "ibsh"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace is_KeyFinder.pro \ --replace "keyfinder.0" "keyfinder" \ - --replace "-stdlib=libc++" "" + --replace "-stdlib=libc++" "" \ + --replace "\$\$[QT_INSTALL_PREFIX]" "$out" ''; enableParallelBuilding = true; @@ -36,6 +37,5 @@ stdenv.mkDerivation rec { homepage = http://www.ibrahimshaath.co.uk/keyfinder/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index ac484445b1e595a266cf24e8b69ca80aa5193154..680542dc405b9a4dd5b6805b0eefe8c0306ce5bd 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.4.2"; + version = "3.6.0"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "0gka4na583015jyqva18g85q7vnkjdk0iji2jp88di3kpvqhf1sw"; + sha256 = "1kv795prc4d3f2cbzskvdi73l6nx4cfcd32x255wq1s74zp1k73p"; }; buildInputs = with stdenv.lib; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A simple and powerful audio tag editor"; longDescription = '' diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index 2038f898e3eccc1f46d88ce29af50541a0cdda2a..d0ffbf29bcb222c1b86ebf37d1718231d3d806e8 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "ladspa-sdk-${version}"; version = "1.13"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz"; + url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; }; diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index aa0a191bdd1a796c0f4c39a61f200141d46e2114..e41d2ba96750b7a8870e7c34baa895a94fa2a4eb 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "ladspa.h-${version}"; version = "1.13"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz"; + url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; }; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index 01b450ab7dd0632939af2ebf0eebf019d2e6089f..d0c3eab69154f13b67c16a6df5b39a85448048c8 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { version = "1.0.6"; src = fetchurl { - url = "http://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz"; + url = "https://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz"; sha256 = "c2636d5095a95167366bacd458624d67b046e060244fa54ba2c2e3efb79f9b0e"; }; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { installCommand = "python setup.py install --prefix=$out"; meta = { - homepage = http://www.red-bean.com/decklin/lastfmsubmitd/; + homepage = https://www.red-bean.com/decklin/lastfmsubmitd/; description = "An last.fm audio scrobbler and daemon"; }; } diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 4dad6e58fee91a6f7a7982909b43cf0117589f55..7f368fe6c2815b129c2c799644b5a5f07331aa73 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,31 +1,24 @@ -{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison -, libjack2, libgig, libsndfile, libtool, lv2, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which +, alsaLib, asio, libjack2, libgig, libsndfile, lv2 }: stdenv.mkDerivation rec { - name = "linuxsampler-svn-${version}"; - version = "2340"; + name = "linuxsampler-${version}"; + version = "2.1.0"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/linuxsampler/trunk"; - rev = "${version}"; - sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7"; + src = fetchurl { + url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf"; }; - patches = ./linuxsampler_lv2_sfz_fix.diff; - - # It fails to compile without this option. I'm not sure what the bug - # is, but everything works OK for me (goibhniu). - configureFlags = [ "--disable-nptl-bug-check" ]; - preConfigure = '' - sed -e 's/which/type -P/g' -i scripts/generate_parser.sh - make -f Makefile.cvs + make -f Makefile.svn ''; - buildInputs = [ - alsaLib asio autoconf automake bison libjack2 libgig libsndfile - libtool lv2 pkgconfig - ]; + nativeBuildInputs = [ autoconf automake bison libtool pkgconfig which ]; + + buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; @@ -40,7 +33,7 @@ stdenv.mkDerivation rec { prior written permission by the LinuxSampler authors. If you have questions on the subject, that are not yet covered by the FAQ, please contact us. - ''; + ''; license = licenses.unfree; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff b/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff deleted file mode 100644 index 114726db19d63540d7274f802bd58b6914a7d9b6..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff +++ /dev/null @@ -1,50 +0,0 @@ -Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp -=================================================================== ---- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (revision 2359) -+++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (working copy) -@@ -18,6 +18,8 @@ - * MA 02110-1301 USA * - ***************************************************************************/ - -+#define _BSD_SOURCE 1 /* for realpath() */ -+ - #include - #include - #include -@@ -118,6 +120,23 @@ - dmsg(2, ("linuxsampler: Deactivate\n")); - } - -+ static String RealPath(const String& path) -+ { -+ String out = path; -+ char* cpath = NULL; -+#ifdef _WIN32 -+ cpath = (char*)malloc(MAX_PATH); -+ GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL); -+#else -+ cpath = realpath(path.c_str(), NULL); -+#endif -+ if (cpath) { -+ out = cpath; -+ free(cpath); -+ } -+ return out; -+ } -+ - String PluginLv2::PathToState(const String& path) { - if (MapPath) { - char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str()); -@@ -131,9 +150,10 @@ - String PluginLv2::PathFromState(const String& path) { - if (MapPath) { - char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str()); -- const String abstract_path(cstr); -+ // Resolve symbolic links so SFZ sample paths load correctly -+ const String absolute_path(RealPath(cstr)); - free(cstr); -- return abstract_path; -+ return absolute_path; - } - return path; - } diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index 206754a519558f2a9a6e244976235abe78ad7ad8..f355c540f301bf861922de575699e14da43686e4 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "lib/CharacterCompressor.lib" faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp faust2lv2 -vec -time -gui -t 99999 CharacterCompressorMono.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 467e11daaf65b68c197aaef38452c7d739a42cc4..90e4eabeef0b7b32f3e375856681aaaa0fa92ff2 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { faust2jaqt -time -vec -double -t 99999 $f done - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "CompBus.lib" - for f in *.dsp; do faust2lv2 -time -vec -double -gui -t 99999 $f diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index b452d91426e0afd835c650872fd8905b19ebde4c..73dd7b48e9c4255306e58b9384ef1f1092b26d50 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "ConstantDetuneChorus.dsp" faust2lv2 -time -vec -t 99999 -gui ConstantDetuneChorus.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index d1959ec3cebc2de36b15f69a40b73bf1201d6d3c..39065db6edeb53eb85316eeaddd2e638437abba0 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -vec -time -t 99999 LazyLimiter.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "GUI.lib" faust2lv2 -vec -time -t 99999 -gui LazyLimiter.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index 6216ba55593888ef1cc67f8fdd06180e05f9d6b7..362451988d38e27536a99905415ff691552d2003 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -time -vec -t 99999 MBdistortion.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "MBdistortion.dsp" faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 0bb2034fc46ef5c9aa5552d229a021e473886f8c..3f809aa78474963ab01e17f838d12c8120f19b35 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -time -vec -t 99999 RhythmDelay.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "RhythmDelay.dsp" faust2lv2 -time -vec -t 99999 -gui RhythmDelay.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index e526e40a1e36f1293581c455cf0993cc50621648..fece392ab1cc3ff4a56343a9b062b2ac12611c3e 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -19,11 +19,9 @@ stdenv.mkDerivation rec { faust2jaqt -time -double -t 99999 $f done - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "compressors.lib" - for f in *.dsp; do - echo "compiling plugin from" $f + echo "Compiling plugin from" $f faust2lv2 -time -double -gui -t 99999 $f done ''; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index daa23baa966bb23df136526f2b523483670db3c4..6237628e600c8076454abb209c2ddb211222122c 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { do echo "Building jack standalone for $f" faust2jaqt -vec -time -t 99999 "$f" - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "$f" echo "Building lv2 for $f" faust2lv2 -vec -time -gui -t 99999 "$f" done diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 422aabb2829960d4a076ce7121c7c2e213feb306..cb9247fd3d084b7736143271c85b171287767bb8 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "shelfMultiBand.lib" faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBandMono.dsp faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBand.dsp ''; diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index d6ba094f45843f6c16d542f11b102eb460c25163..d16107e4c292a1c8daf93c78199da6c55fa6814c 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -2,12 +2,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.2"; + version = "0.9.3"; name = "meterbridge-${version}"; src = fetchurl { url = "http://plugin.org.uk/meterbridge/${name}.tar.gz"; - sha256 = "0jb6g3kbfyr5yf8mvblnciva2bmc01ijpr51m21r27rqmgi8gj5k"; + sha256 = "0s7n3czfpil94vsd7iblv4xrck9c7zvsz4r3yfbkqcv85pjz1viz"; }; patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index f4245b0a51e342eb19bf35d5ed79e9a535f51c96..669ffbb2688a1b5ad20d3405cd198f7f90ad6627 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, lv2, mesa, gtk2, cairo, pango, fftw }: +, lv2, libGLU_combined, gtk2, cairo, pango, fftw }: let version = "0.8.1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { inherit name; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lv2 mesa gtk2 cairo pango fftw ]; + buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftw ]; srcs = [ src robtkSrc ]; sourceRoot = name; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 2c6df650d5d74d1b8e59d1a3249ec17e804d45ef..3a77c7bbbf2466b49a13cc6311631ef7c9419d5b 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk2, libjack2, ladspaH +{ stdenv, fetchurl, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame , vorbis-tools }: @@ -7,12 +7,18 @@ stdenv.mkDerivation rec { version = "1.4.23"; src = fetchurl { - url = "http://download.gna.org/mhwaveedit/${name}.tar.bz2"; - sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3"; + url = "https://github.com/magnush/mhwaveedit/archive/v${version}.tar.gz"; + sha256 = "1lvd54d8kpxwl4gihhznx1b5skhibz4vfxi9k2kwqg808jfgz37l"; }; - buildInputs = [ SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile - pkgconfig libpulseaudio makeWrapper ]; + nativeBuildInputs = [ autoreconfHook ]; + + preAutoreconf = "(cd docgen && sh gendocs.sh)"; + + buildInputs = [ + SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile + pkgconfig libpulseaudio makeWrapper + ]; configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index fa4ea6343e915916e624573156fa5bd16e053f34..4dfc7b13046ef1877cf4c59e7fcbd94c2f70e24b 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 918b743fef7af7e98b20505d04731fefb6bd46d0..f077afec8b209548c627ce377c89a9adf2f1578f 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libmikmod, ncurses, alsaLib }: stdenv.mkDerivation rec { - name = "mikmod-3.2.6"; + name = "mikmod-3.2.8"; src = fetchurl { url = "mirror://sourceforge/mikmod/${name}.tar.gz"; - sha256 = "0wr61raj10rpl64mk3x9g3rwys898fbzyg93c6mrz89nvc74wm04"; + sha256 = "1k54p8pn3jinha0f2i23ad15pf1pamibzcxjrbzjbklpcz1ipc6v"; }; buildInputs = [ libmikmod ncurses ]; diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix index 2e293ee4552dc1ce0db0ade056335d81b3efcd4e..8d179e8eed118d36f89fd31358ff743fddfc4a08 100644 --- a/pkgs/applications/audio/minimodem/default.nix +++ b/pkgs/applications/audio/minimodem/default.nix @@ -1,18 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }: +{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libtool +, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio +}: stdenv.mkDerivation rec { - version = "0.19"; + version = "0.24-1"; pname = "minimodem"; name = "${pname}-${version}"; - src = fetchurl { - url = "http://www.whence.com/${pname}/${name}.tar.gz"; - sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g"; + src = fetchFromGitHub { + owner = "kamalmostafa"; + repo = "minimodem"; + rev = "${pname}-${version}"; + sha256 = "1b5xy36fjcp7vkp115dpx4mlmqg2fc7xvxdy648fb8im953bw7ql"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; + preConfigure = '' + aclocal \ + && autoheader \ + && automake --gnu --add-missing \ + && autoconf + ''; + meta = { description = "General-purpose software audio FSK modem"; longDescription = '' @@ -28,3 +39,4 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ relrod ]; }; } + diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 6d353344b07fb25b6c54857b18aa5bd44faad3d4..f511fa65914997a5cdce40069ca86f2bcbfcb8fb 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, libid3tag, libmad -, libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig -, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite +{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2 +, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis +, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite , taglib, vampSDK }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - chromaprint fftw flac libid3tag libmad libopus libshout libsndfile + chromaprint fftw flac faad2 mp4v2 libid3tag libmad libopus libshout libsndfile libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4 rubberband scons sqlite taglib vampSDK ]; @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { sconsFlags = [ "build=release" "qtdir=${qt4}" + "faad=1" ]; buildPhase = '' diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index a1837287079580ba3f0d8f0dc5d1393fd78ad771..c66f78373228cf5edb5ac01b379c901a8728f6f4 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation rec { - name = "mod-distortion-${version}"; - version = "git-2015-05-18"; + name = "mod-distortion-git-${version}"; + version = "2016-08-19"; src = fetchFromGitHub { owner = "portalmod"; repo = "mod-distortion"; - rev = "0cdf186abc2a9275890b57057faf5c3f6d86d84a"; - sha256 = "1wmxgpcdcy9m7j78yq85824if0wz49wv7mw13bj3sw2s87dcmw19"; + rev = "e672d5feb9d631798e3d56eb96e8958c3d2c6821"; + sha256 = "005wdkbhn9dgjqv019cwnziqg86yryc5vh7j5qayrzh9v446dw34"; }; buildInputs = [ lv2 ]; - installFlags = [ "LV2_PATH=$(out)/lib/lv2" ]; + installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ]; meta = with stdenv.lib; { homepage = https://github.com/portalmod/mod-distortion; diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index d1c6ed6379a8dd44b7b57df2e38d8cca0b10349d..55f3a667e06fa78b1126881a61e0e5c7ffba402d 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix deleted file mode 100644 index b792ec3428e74fbb0ddd0b5c798f94a25fedc80f..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-gmusic-${version}"; - version = "2.0.0"; - - src = fetchurl { - url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; - sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j"; - }; - - propagatedBuildInputs = [ - mopidy - pythonPackages.requests - pythonPackages.gmusicapi - pythonPackages.cachetools_1 - ]; - - doCheck = false; - - meta = with stdenv.lib; { - homepage = http://www.mopidy.com/; - description = "Mopidy extension for playing music from Google Play Music"; - license = licenses.asl20; - maintainers = [ maintainers.jgillich ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix deleted file mode 100644 index caeba5eb1acbcdf618ee6922436f0713602eefab..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, pythonPackages, mopidy, mopidy-local-images }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-iris-${version}"; - version = "3.6.1"; - - src = pythonPackages.fetchPypi { - inherit version; - pname = "Mopidy-Iris"; - sha256 = "1mfi3qx7pvfq4rz0py39lnbzv7sq703b6k6mypzhj1gdzbisfn46"; - }; - - propagatedBuildInputs = [ - mopidy - mopidy-local-images - pythonPackages.configobj - pythonPackages.pylast - pythonPackages.spotipy - pythonPackages.raven - ]; - - 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 deleted file mode 100644 index b09db88bbcb0fce5989822516ab71992f43d4ddd..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/mopidy-local-images/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ 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-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix deleted file mode 100644 index c8afd4c6290f8dbfb0ae7ebc3727601145ea2e99..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/mopidy-moped/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, mopidy, glibcLocales }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-moped-${version}"; - version = "0.6.0"; - - src = fetchurl { - url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz"; - sha256 = "0xff8y1kc7rwwsd7ppgbvywf6i8lchjwbxjisfl1kmilwsb166yr"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ mopidy ]; - - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://github.com/martijnboland/moped; - description = "A web client for Mopidy"; - license = licenses.mit; - maintainers = [ maintainers.rickynils ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix deleted file mode 100644 index 0cb076556c7085af19980d009f9698730f690be6..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-mopify-${version}"; - - version = "1.5.17"; - - src = fetchurl { - url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz"; - sha256 = "1qi7f5i87ygn486gxc84njl22y84xrwabpz58y5a1hw7z1lp7l8s"; - }; - - propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; - - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://github.com/dirkgroenen/mopidy-mopify; - description = "A mopidy webclient based on the Spotify webbased interface"; - license = licenses.gpl3; - maintainers = [ maintainers.Gonzih ]; - }; -} diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix deleted file mode 100644 index 999883dc26c3ddc7a1269e3ed70a6f950c0fd21e..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-spotify-${version}"; - version = "3.1.0"; - - src = fetchurl { - url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl"; - }; - - propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; - - doCheck = false; - - meta = with stdenv.lib; { - homepage = http://www.mopidy.com/; - description = "Mopidy extension for playing music from Spotify"; - license = licenses.asl20; - maintainers = [ maintainers.rickynils ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 7de8f6941c2b8fbc2b186ea3b315c9267389b478..ad280d382d02f0005c9cc109be5b9893f5b250a5 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook -, gst_all_1, glib_networking, gobjectIntrospection +, gst_all_1, glib-networking, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { @@ -18,12 +18,12 @@ pythonPackages.buildPythonApplication rec { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - glib_networking gobjectIntrospection + glib-networking gobjectIntrospection ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado requests dbus-python - ]; + gst-python pygobject3 pykka tornado requests + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests doCheck = false; @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://www.mopidy.com/; + homepage = https://www.mopidy.com/; description = '' An extensible music server that plays music from local disk, Spotify, SoundCloud, Google Play Music, and more diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix new file mode 100644 index 0000000000000000000000000000000000000000..e58cddd42942e6303d73e24dcb1fa992e4f16130 --- /dev/null +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-gmusic-${version}"; + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; + sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j"; + }; + + propagatedBuildInputs = [ + mopidy + pythonPackages.requests + pythonPackages.gmusicapi + pythonPackages.cachetools_1 + ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.mopidy.com/; + description = "Mopidy extension for playing music from Google Play Music"; + license = licenses.asl20; + maintainers = [ maintainers.jgillich ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix new file mode 100644 index 0000000000000000000000000000000000000000..f3a9b73aabe5e29152c74630bebd15c67c9f1c74 --- /dev/null +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -0,0 +1,34 @@ +{ stdenv, pythonPackages, mopidy, mopidy-local-images }: + +pythonPackages.buildPythonApplication rec { + pname = "Mopidy-Iris"; + version = "3.17.1"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "02k1br077v9c5x6nn0391vh28pvn1zjbkjv8h508vy7k6ch2xjyq"; + }; + + propagatedBuildInputs = [ + mopidy + mopidy-local-images + ] ++ (with pythonPackages; [ + configobj + pylast + spotipy + raven + tornado + ]); + + postPatch = "sed -i /tornado/d setup.py"; + + # no tests implemented + doCheck = false; + + 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.nix b/pkgs/applications/audio/mopidy/local-images.nix new file mode 100644 index 0000000000000000000000000000000000000000..063821544aed48f2ae44e18e17a9bffa9647023f --- /dev/null +++ b/pkgs/applications/audio/mopidy/local-images.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }: + +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"; + }; + + buildInputs = [ gobjectIntrospection ]; + + checkInputs = [ + pythonPackages.mock + ]; + + 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.nix similarity index 100% rename from pkgs/applications/audio/mopidy-local-sqlite/default.nix rename to pkgs/applications/audio/mopidy/local-sqlite.nix diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix new file mode 100644 index 0000000000000000000000000000000000000000..3754bf763b20dcdda96d40d8c058e37861b1e345 --- /dev/null +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -0,0 +1,26 @@ +{ stdenv, pythonPackages, mopidy, glibcLocales }: + +pythonPackages.buildPythonApplication rec { + pname = "Mopidy-Moped"; + version = "0.7.1"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4"; + }; + + LC_ALL = "en_US.UTF-8"; + buildInputs = [ glibcLocales ]; + propagatedBuildInputs = [ mopidy ]; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/martijnboland/moped; + description = "A web client for Mopidy"; + license = licenses.mit; + maintainers = [ maintainers.rickynils ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix new file mode 100644 index 0000000000000000000000000000000000000000..d55e711cf330259ac0d7d499bb5e375042231b50 --- /dev/null +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + pname = "Mopidy-Mopify"; + version = "1.6.1"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "93ad2b3d38b1450c8f2698bb908b0b077a96b3f64cdd6486519e518132e23a5c"; + }; + + propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/dirkgroenen/mopidy-mopify; + description = "A mopidy webclient based on the Spotify webbased interface"; + license = licenses.gpl3; + maintainers = [ maintainers.Gonzih ]; + }; +} diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix similarity index 100% rename from pkgs/applications/audio/mopidy-musicbox-webclient/default.nix rename to pkgs/applications/audio/mopidy/musicbox-webclient.nix diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy/soundcloud.nix similarity index 100% rename from pkgs/applications/audio/mopidy-soundcloud/default.nix rename to pkgs/applications/audio/mopidy/soundcloud.nix diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix similarity index 100% rename from pkgs/applications/audio/mopidy-spotify-tunigo/default.nix rename to pkgs/applications/audio/mopidy/spotify-tunigo.nix diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix new file mode 100644 index 0000000000000000000000000000000000000000..64b5ee629b339fddc7856ef68b107120b81600d4 --- /dev/null +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-spotify-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; + sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl"; + }; + + propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.mopidy.com/; + description = "Mopidy extension for playing music from Spotify"; + license = licenses.asl20; + maintainers = [ maintainers.rickynils ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy/youtube.nix similarity index 100% rename from pkgs/applications/audio/mopidy-youtube/default.nix rename to pkgs/applications/audio/mopidy/youtube.nix diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..eb5aa7c036cc2f53749b367387f4f26cdf455fb8 --- /dev/null +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }: +stdenv.mkDerivation rec { + + version = "3.2.6"; + + name = "mp3blaster-${version}"; + + src = fetchFromGitHub { + owner = "stragulus"; + repo = "mp3blaster"; + rev = "v${version}"; + sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs"; + }; + + buildInputs = [ + ncurses + libvorbis + ] ++ stdenv.lib.optional stdenv.isDarwin SDL; + + buildFlags = [ "CXXFLAGS=-Wno-narrowing" ]; + + meta = with stdenv.lib; { + description = "An audio player for the text console"; + homepage = http://www.mp3blaster.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ earldouglas ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 73352b65092144d7342cc04b188829a76f6c992b..220e72b568afa736444ca72d9c76e12d1d9adbdb 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A minimalist command line interface to MPD"; - homepage = http://www.musicpd.org/clients/mpc/; + homepage = https://www.musicpd.org/clients/mpc/; license = licenses.gpl2; 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 1e0b46826cf0190f171b9e3bd3f85bf47c19970c..3aef2e35943d746fc8497267733e0b5d86757212 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.25.7"; + name = "mpg123-1.25.10"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i"; + sha256 = "08vhp8lz7d9ybhxcmkq3adwfryhivfvp0745k4r9kgz4wap3f4vc"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 9d6f2fc9c8f9b53674dc5732cd9e696d4ce81e48..f56ca009f1e081fd8b3be386d10836034739b975 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music notation and composition software"; - homepage = http://musescore.org/; + homepage = https://musescore.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.vandenoever ]; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 09c718c63e92bd22faa892ad3f9c2355465157c0..ffd5b9a5858248996a1bb7f2f7bd7a1098af6923 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -3,23 +3,21 @@ stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.28"; + version = "0.30"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n"; + sha256 = "0s2bynm5szrk8bjhg200mvsm2ny0wz9s10nx7r69y9y4jsxr8624"; }; buildInputs = [ glib ncurses mpd_clientlib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; - homepage = http://www.musicpd.org/clients/ncmpc/; + homepage = https://www.musicpd.org/clients/ncmpc/; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 4452ab23cd5ee53ebb43f3cf05911155c5a27c7a..87f5f94bb30b2d7b2f9ddd5e325299dd1c4d8ae5 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1zw8d07b2bkssbsybg6jnmpq001w525viajrnz4jvfml3l55gyad"; + sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "A featureful ncurses based MPD client inspired by ncmpc"; homepage = https://ncmpcpp.rybczak.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ]; + maintainers = with maintainers; [ jfrankenau koral lovek323 ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c3449ed3a4f4c620a6c4a514a975adbeb5e51238 --- /dev/null +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkgconfig }: + +stdenv.mkDerivation rec { + + name = "ncpamixer-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "fulhax"; + repo = "ncpamixer"; + rev = version; + sha256 = "01kvd0pg5yraymlln5xdzqj1r6adxfvvza84wxn2481kcxfral54"; + }; + + buildInputs = [ ncurses libpulseaudio ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + configurePhase = '' + make PREFIX=$out build/Makefile + ''; + + buildPhase = '' + make build + ''; + + meta = with stdenv.lib; { + description = "An ncurses mixer for PulseAudio inspired by pavucontrol"; + homepage = https://github.com/fulhax/ncpamixer; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ StijnDW ]; + }; +} diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 3b429290f7c8c487828767fac054ae952bc3f596..c28c711d618e9377c033eed76ea2c2d8fa3a667c 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 = "2017-03-29"; + version = "2018-02-15"; src = fetchFromGitHub { owner = "original-male"; repo = "non"; - rev = "10c31e57291b6e42be53371567a722b62b32d220"; - sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx"; + rev = "5ae43bb27c42387052a73e5ffc5d33efb9d946a9"; + sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix index ad4a06cff99446ae46877683f3fb027b3568a34b..a727160ff2992d92ba93f5f2874b012614079204 100644 --- a/pkgs/applications/audio/normalize/default.nix +++ b/pkgs/applications/audio/normalize/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libmad }: stdenv.mkDerivation rec { name = "normalize-${version}"; version = "0.7.7"; src = fetchurl { - url = "mirror://savannah/normalize/normalize-0.7.7.tar.gz"; + url = "mirror://savannah/normalize/${name}.tar.gz"; sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"; }; + buildInputs = [ libmad ]; + meta = with stdenv.lib; { homepage = http://normalize.nongnu.org/; description = "Audio file normalizer"; diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index 8a7ab8889a6671057800d0f2de1d59e8714cecb3..d864d5972bce8b31d892786fe511ed456b44d84c 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: stdenv.mkDerivation rec { - name = "opusfile-0.8"; + name = "opusfile-0.10"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "192mp2jgn5s9815h31ybzsfipmbppmdhwx1dymrk26xarz9iw8rc"; + sha256 = "0bs1376sd131qdh7198jp64vv5d17az5wyy4y7srrvw7p8k3bq28"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 820ff385c107f627d3d7a6f2ee67da28b6768dc6..5cecdc8187d8e14ca23fca8a42e113ed226d4f34 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.8.4"; + version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "1p6wfgh90h7gj1j3hlvwik3zj07xamkxbya85va2lsj6fkkkk20r"; + sha256 = "0c519qk2g0dk8gqf9ywqfp7dnr4b25lsnxxbf2l1spnnvf8nysvh"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index dbf3cd92b5d0ad357a47b9ab80e7c8a6ec843fc8..cc4a781ef66c0ef15b38dcbfd3893b023328db80 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -1,19 +1,23 @@ { stdenv, fetchFromGitHub -, autoreconfHook, autoconf-archive, pkgconfig +, pkgconfig, cmake , libpulseaudio, ncurses }: stdenv.mkDerivation rec { name = "pamix-${version}"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "patroclos"; repo = "pamix"; rev = version; - sha256 = "1d6b0iv8p73bwq88kdaanm4igvmp9rkq082vyaxpc67mz398yjbp"; + sha256 = "1d44ggnwkf2gff62959pj45v3a2k091q8v154wc5pmzamam458wp"; }; - nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ]; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg" + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libpulseaudio ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index fa25a474c1dfaff21c4d6bb626142abdf266e97f..322a4e2384619c8a9ce9dc2c37873e43c50697ec 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -1,15 +1,22 @@ -{ stdenv, fetchurl, boost, libpulseaudio }: +{ stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }: stdenv.mkDerivation rec { - name = "pamixer-${version}"; - version = "1.3"; + version = "1.3.1"; - src = fetchurl { - url = "https://github.com/cdemoulins/pamixer/archive/${version}.tar.gz"; - sha256 = "091676ww4jbf4jr728gjfk7fkd5nisy70mr6f3s1p7n05hjpmfjx"; + src = fetchFromGitHub { + owner = "cdemoulins"; + repo = "pamixer"; + rev = version; + sha256 = "15zs2x4hnrpxphqn542b6qqm4ymvhkvbcfyffy69d6cki51chzzw"; }; + # Remove after https://github.com/cdemoulins/pamixer/pull/16 gets fixed + patches = [(fetchpatch { + url = "https://github.com/oxij/pamixer/commit/dea1cd967aa837940e5c0b04ef7ebc47a7a93d63.patch"; + sha256 = "0s77xmsiwywyyp6f4bjxg1sqdgms1k5fiy7na6ws0aswshfnzfjb"; + })]; + buildInputs = [ boost libpulseaudio ]; installPhase = '' diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index f21c171ef6096c3cececf286c525e358e0154f90..fe9ed12390a5bc73a0f8770ad2fab8abf85fb5ed 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm2, libglademm -, dbus_glib, GConf, gconfmm, intltool }: +{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm +, dbus-glib, GConf, gconfmm, intltool }: stdenv.mkDerivation rec { name = "paprefs-0.9.10"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; - buildInputs = [ libpulseaudio gtkmm2 libglademm dbus_glib gconfmm ]; + buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 91a270a698e6e51ab8e080f1d3e81aaad85a036d..8425b48166e67fcb10811b2d59d423aef8ea4a15 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm +{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm , gtkmm2, libjack2, pkgconfig, python2 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2 + alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2 pkgconfig python2 ]; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 69db9d74ee3449f061fd04cb47b25626b651838f..d113b8a49b31305526b60787127f0df243dd6aee 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 -, libcanberra_gtk3, makeWrapper, gnome3 }: +, libcanberra-gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "pavucontrol-3.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''; - buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper + buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index e4ec281cacb85170a787670ad249492106960ab3..ae43bad5b2c29ca982c86e5a7b219d9e0534e5d4 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -1,32 +1,26 @@ -{ stdenv, fetchurl, puredata }: +{ stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { name = "cyclone-${version}"; - version = "0.1-alpha55"; + version = "0.3beta-2"; - src = fetchurl { - url = "mirror://sourceforge/project/pure-data/libraries/cyclone/${name}.tar.gz"; - sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i"; + src = fetchFromGitHub { + owner = "porres"; + repo = "pd-cyclone"; + rev = "cyclone${version}"; + sha256 = "192jrq3bdsv626js1ymq10gwp9wwcszjs63ys6ap9ig8xdkbhr3q"; }; buildInputs = [ puredata ]; - hardeningDisable = [ "format" ]; + makeFlags = [ + "pdincludepath=${puredata}/include/pd" + "prefix=$(out)" + ]; - patchPhase = '' - for file in `grep -r -l g_canvas.h` - do - sed -i 's|#include "g_canvas.h"|#include "${puredata}/include/pd/g_canvas.h"|g' $file - done - for file in `grep -r -l m_imp.h` - do - sed -i 's|#include "m_imp.h"|#include "${puredata}/include/pd/m_imp.h"|g' $file - done - ''; - - installPhase = '' - mkdir -p $out/cyclone - cp -r bin/* $out/cyclone + postInstall = '' + mv "$out/lib/pd-externals/cyclone" "$out/" + rm -rf $out/lib ''; meta = { diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 8f04bf116a6c4fbab7f195be149bc753d173a363..3670fb8347d69c607fbbc630cdfaef89efc302e4 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -20,13 +20,16 @@ stdenv.mkDerivation rec { mv helmholtz~/src/Makefile . rm -rf helmholtz~/src/ rm helmholtz~/helmholtz~.pd_darwin + rm helmholtz~/helmholtz~.pd_linux rm helmholtz~/helmholtz~.dll rm -rf __MACOSX ''; patchPhase = '' + mkdir -p $out/helmholtz~ sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile sed -i "s@-Wl@@g" Makefile + sed -i "s@\$(NAME).pd_linux \.\./\$(NAME).pd_linux@helmholtz~.pd_linux $out/helmholtz~/@g" Makefile ''; installPhase = '' diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index 3b836d9eb3304be9fd63d7b3ed48a51d6e6ad5b4..0eb75d77c68c943c4ddbf15c0be3684967ad1f5d 100644 --- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -1,28 +1,26 @@ -{ stdenv, fetchurl, puredata }: +{ stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { name = "maxlib-${version}"; - version = "1.5.5"; + version = "1.5.7"; - src = fetchurl { - url = "mirror://sourceforge/project/pure-data/libraries/maxlib/${name}.tar.gz"; - sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w"; + src = fetchFromGitHub { + owner = "electrickery"; + repo = "pd-maxlib"; + rev = "v${version}"; + sha256 = "10w9qfgn26lj3zqjksf2r1wsjpf5xy4dx22jay9l6idy9q62mxsn"; }; buildInputs = [ puredata ]; hardeningDisable = [ "format" ]; - patchPhase = '' - for i in ${puredata}/include/pd/*; do - ln -s $i . - done - sed -i "s@/usr@$out@g" Makefile - ''; + makeFlags = [ "prefix=$(out)" ]; postInstall = '' - mv $out/local/lib/pd-externals/maxlib/ $out + mv $out/lib/pd-externals/maxlib/ $out rm -rf $out/local/ + rm -rf $out/lib/ ''; meta = { diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix index f8a25256bb07b62a418db566c08cd2b2e86860af..f2e54b327fceebd0912c2041e57593dafe695967 100644 --- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -1,30 +1,40 @@ -{ stdenv, fetchurl, unzip, puredata }: +{ stdenv, fetchurl, unzip, puredata, fftw }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.7.0"; name = "timbreid-${version}"; src = fetchurl { url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip"; - sha256 = "02rnkb0vpjxrr60c3hryv7zhyjpci2mi9dk27kjxpj5zp26gjk0p"; + sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b"; }; - buildInputs = [ unzip puredata ]; + buildInputs = [ unzip puredata fftw ]; unpackPhase = '' + mkdir source + cd source unzip $src - mv timbreID-0.6.0-src/tID/* . - rm -rf timbreID-0.6.0-src/tID/ - rm -rf timbreID-0.6.0-src/INSTALL.txt ''; + buildPhase = '' + make tIDLib.o all + ''; + installPhase = '' mkdir -p $out/ cp -r *.pd $out/ cp -r *.pd_linux $out/ - cp -r *.wav $out/ + cp -r audio/ $out/ + cp -r data/ $out/ + cp -r doc/ $out/ ''; + postFixup = '' + mv $out/share/doc/ $out/ + rm -rf $out/share/ + ''; + meta = { description = "A collection of audio feature analysis externals for puredata"; homepage = http://williambrent.conflations.com/pages/research.html; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index 67848cdc804b9d58ec006fc7975f8ca121109441..d013a26277e81e542347650ffac0ac2e4b8cf0fe 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, mesa, makeWrapper, qt4 }: +{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: stdenv.mkDerivation rec { name = "pianobooster-${version}"; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; - buildInputs = [ alsaLib cmake makeWrapper mesa qt4 ]; + buildInputs = [ alsaLib cmake makeWrapper libGLU_combined qt4 ]; postInstall = '' wrapProgram $out/bin/pianobooster \ - --prefix LD_LIBRARY_PATH : ${mesa}/lib + --prefix LD_LIBRARY_PATH : ${libGLU_combined}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 66f68c066c8891a82146cbe22260174902c3a1e4..677c60399e52169d3dee633f30dcb04a6c1073db 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,7 +1,7 @@ { stdenv, python2Packages, fetchurl, gettext, chromaprint }: let - version = "1.4"; + version = "1.4.2"; pythonPackages = python2Packages; in pythonPackages.buildPythonApplication { name = "picard-${version}"; @@ -9,7 +9,7 @@ in pythonPackages.buildPythonApplication { src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; - sha256 = "0gi7f1h7jcg7n18cx8iw38sd868viv3w377xmi7cq98f1g76d4h6"; + sha256 = "0d12k40d9fbcn801gp5zdsgvjdrh4g97vda3ga16rmmvfwwfxbgh"; }; buildInputs = [ gettext ]; diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9f51d30082593f6a915337bd9b9bc26f03326230 --- /dev/null +++ b/pkgs/applications/audio/pmidi/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, alsaLib +, version ? "1.7.1" +, sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055" +}: +stdenv.mkDerivation { + name = "pmidi-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz"; + sha256 = sourceSha256; + }; + + buildInputs = [ alsaLib ]; + + meta = with stdenv.lib; { + homepage = http://www.parabola.me.uk/alsa/pmidi.html; + description = "A straightforward command line program to play midi files through the ALSA sequencer"; + maintainers = with maintainers; [ lheckemann ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 2bb2960afbf10ac5f9b84aed0cba488a95a309c4..ada12eefaf7ebf1d94e649be75f88747e89da00d 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "5.4.17"; + version = "6.0.38"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "0s2hrksghg686059vc90h3ywhd2702pqcvy99icw27q5mdk6dqsx"; + sha256 = "1l01mdhd0kf6mnyrg8maydr56cpw4312gryk303kr0a4w0gwzhhc"; }; configurePhase = '' diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..72af8aff106bd9316ef02d3354aa23c22339dc2b --- /dev/null +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -0,0 +1,50 @@ +{ fetchFromGitHub, stdenv, pythonPackages +, mp3Support ? true, lame ? null +, opusSupport ? true, opusTools ? null +, faacSupport ? false, faac ? null +, flacSupport ? true, flac ? null +, soxSupport ? true, sox ? null +, vorbisSupport ? true, vorbisTools ? null +}: + +assert mp3Support -> lame != null; +assert opusSupport -> opusTools != null; +assert faacSupport -> faac != null; +assert flacSupport -> flac != null; +assert soxSupport -> sox != null; +assert vorbisSupport -> vorbisTools != null; + +pythonPackages.buildPythonApplication rec { + pname = "pulseaudio-dlna"; + version = "2017-11-01"; + + src = fetchFromGitHub { + owner = "masmu"; + repo = "pulseaudio-dlna"; + rev = "4472928dd23f274193f14289f59daec411023ab0"; + sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk"; + }; + + # pulseaudio-dlna has no tests + doCheck = false; + + propagatedBuildInputs = with pythonPackages; [ + dbus-python docopt requests setproctitle protobuf psutil futures + chardet notify2 netifaces pyroute2 pygobject2 lxml zeroconf ] + ++ stdenv.lib.optional mp3Support lame + ++ stdenv.lib.optional opusSupport opusTools + ++ stdenv.lib.optional faacSupport faac + ++ stdenv.lib.optional flacSupport flac + ++ stdenv.lib.optional soxSupport sox + ++ stdenv.lib.optional vorbisSupport vorbisTools; + + meta = with stdenv.lib; { + description = "A lightweight streaming server which brings DLNA / UPNP and Chromecast support to PulseAudio and Linux"; + homepage = https://github.com/masmu/pulseaudio-dlna; + + license = licenses.gpl3Plus; + + maintainers = with maintainers; [ mog ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index daa017d1ccbdc943f58afee8e58cb988828d4967..73f50e45d3df8ed2c8c7259e84bd57d7f5391b6d 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,30 +1,31 @@ { stdenv, fetchurl, autoreconfHook, gettext, makeWrapper -, alsaLib, libjack2, tk +, alsaLib, libjack2, tk, fftw }: stdenv.mkDerivation rec { name = "puredata-${version}"; - version = "0.47-1"; + version = "0.48-0"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "0k5s949kqd7yw97h3m8z81bjz32bis9m4ih8df1z0ymipnafca67"; + sha256 = "0wy9kl2v00fl27x4mfzhbca415hpaisp6ls8a6mkl01qbw20krny"; }; - patchPhase = '' - rm portaudio/configure.in - ''; - nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; - buildInputs = [ alsaLib libjack2 ]; + buildInputs = [ alsaLib libjack2 fftw ]; configureFlags = '' --enable-alsa --enable-jack + --enable-fftw --disable-portaudio + ''; + # https://github.com/pure-data/pure-data/issues/188 + # --disable-oss + postInstall = '' wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin ''; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index c5a977d741a7a4918c98bffc9b6b34329e2317c7..925078fb3a157bc21ec99f1023ac927cdb7d8a05 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.5"; + version = "0.5.0"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5"; + sha256 = "0lx81dfwanc10vrny1vzi0wx73ph82dlz99ffjzsigj3cqzz6x4s"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 132e4a0fca289486afa6081253e73e31d67d0e25..831a30bc4fe2ee359b84eb16fda67f8fa2c8211b 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.3"; + version = "0.5.0"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "1qhxhlvi6bj2a06i48pw81zf5vd36idxbq04g30794yhqcimh6vw"; + sha256 = "0nxbvjgx11ljy1nxqknyq7pla55ky2ybi1jbisvq2cqxa34jsxf6"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index 1e76e769937bba3164a251c99614bdf9c25757d8..7f5191a02c20831c11cecb5df9a8d55f50abac7f 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt4, alsaLib }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.4.0"; name = "qmidiroute-${version}"; src = fetchurl { url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz"; - sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2"; + sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 77c82f1737c60e2b2304c555b1e9bc03b860be26..e2218f477a59889d459630bd4a8181a2aab8a88a 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.1.10"; + name = "qmmp-1.2.1"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "16hb3s48filq0q18m7x9vmhpirk4fh0aqj8kwbapv8mkcnzq2mqy"; + sha256 = "1ag8wh11dq394zjqdyz5g1srjnm4fnq4cwlhpb9k89gpmlk42cdr"; }; buildInputs = diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 1211570f9bc53bcb5cc5a4927f1256654c4906c8..518fef0c4f5e9feb49506fcb0a5ff5e8424c1bcd 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchsvn, autoconf, automake, liblscp, libtool, pkgconfig -, qt4 }: +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools +, liblscp, libgig, qtbase }: stdenv.mkDerivation rec { - name = "qsampler-svn-${version}"; - version = "2342"; + name = "qsampler-${version}"; + version = "0.5.0"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/qsampler/trunk"; - rev = "${version}"; - sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx"; + src = fetchurl { + url = "mirror://sourceforge/qsampler/${name}.tar.gz"; + sha256 = "0kn1mv31ygjjsric03pkbv7r8kg3bri9ldx2ajc9pyx0p8ggnbmc"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake liblscp libtool qt4 ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; + buildInputs = [ liblscp libgig qtbase ]; preConfigure = "make -f Makefile.svn"; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; description = "Graphical frontend to LinuxSampler"; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 49d9e80be11785baad38b5dcec5026ee09d9dfc0..71f41f87009e65c0d73da0db5eaa7ae1c2938ca9 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,21 +1,31 @@ -{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt4 }: +{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qtbase, qttools, qtx11extras, cmake, pkgconfig }: stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.3.9"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "08kyn6cl755l9i1grzjx8yi3f8mgiz4gx0hgqad1n0d8yz85087b"; + sha256 = "1sr6vrz8z9r99j9xcix86lgcqldragb2ajmq1bnhr58d99sda584"; }; - buildInputs = [ alsaLib fluidsynth libjack2 qt4 ]; + # cmake is looking for qsynth.desktop.in and fails if it doesn't find it + # seems like a bug and can presumable go in the next version after 0.5.0 + postPatch = '' + mv src/qsynth.desktop src/qsynth.desktop.in + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Fluidsynth GUI"; homepage = https://sourceforge.net/projects/qsynth; license = licenses.gpl2Plus; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index fd328669846f1c26255f0f240b8d41b6e1d91a0a..972da4f773f61295b71843025b5a90f64b932bab 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, python2Packages, wrapGAppsHook, gettext, intltool, libsoup, gnome3, - tag ? "", +{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf, + tag ? "", xvfb_run, dbus, glibcLocales, glib, gobjectIntrospection, gst_all_1, withGstPlugins ? true, xineBackend ? false, xineLib, withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, @@ -7,38 +7,53 @@ keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: let optionals = stdenv.lib.optionals; in -python2Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { name = "quodlibet${tag}-${version}"; - version = "3.9.1"; + version = "4.0.2"; # XXX, tests fail + # https://github.com/quodlibet/quodlibet/issues/2820 doCheck = false; src = fetchurl { url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; - sha256 = "d2b42df5d439213973dc97149fddc779a6c90cec389c24baf1c0bdcc39ffe591"; + sha256 = "072s983p3n84yl807pbdxsy5vrgs8jzzfl648gsri6kpwsp6w5fz"; }; nativeBuildInputs = [ wrapGAppsHook gettext intltool ]; - # ++ (with python2Packages; [ pytest pyflakes pycodestyle polib ]); # test deps - buildInputs = [ gnome3.defaultIconTheme libsoup webkitgtk keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ] + checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; + + buildInputs = [ gnome3.defaultIconTheme libsoup glib gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobjectIntrospection ] ++ (if xineBackend then [ xineLib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); - propagatedBuildInputs = with python2Packages; - [ pygobject3 pycairo mutagen pygtk gst-python feedparser faulthandler futures ] + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ] ++ optionals withDbusPython [ dbus-python ] ++ optionals withPyInotify [ pyinotify ] ++ optionals withMusicBrainzNgs [ musicbrainzngs ] ++ optionals stdenv.isDarwin [ pyobjc ] ++ optionals withPahoMqtt [ paho-mqtt ]; - makeWrapperArgs = optionals (kakasi != null) [ "--prefix PATH : ${kakasi}/bin" ]; + LC_ALL = "en_US.UTF-8"; + + checkPhase = '' + runHook preCheck + checkHomeDir=$(mktemp -d) + mkdir -p $checkHomeDir/.cache/thumbnails/normal # Required by TThumb.test_recreate_broken_cache_file + env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \ + HOME=$checkHomeDir \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + py.test + runHook postCheck + ''; + + preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; - meta = { + meta = with stdenv.lib; { description = "GTK+-based audio player written in Python, using the Mutagen tagging library"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Quod Libet is a GTK+-based audio player written in Python, using @@ -54,7 +69,7 @@ python2Packages.buildPythonApplication rec { & internet radio, and all major audio formats. ''; - maintainers = with stdenv.lib.maintainers; [ coroa sauyon ]; + maintainers = with maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; }; } diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 4bc9371dd17b36f81b7e41b7e67591bc51e272a0..60c8f90b6d15029e59beccc20820628ff1225a97 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , cmake, pkgconfig # Transport , curl @@ -11,10 +11,11 @@ , dbus , glibmm , gnome3 -, hicolor_icon_theme +, hicolor-icon-theme , libappindicator-gtk3 , libnotify , libxdg_basedir +, wxGTK # GStreamer , gst_all_1 # User-agent info @@ -39,13 +40,13 @@ let in stdenv.mkDerivation rec { name = "radiotray-ng-${version}"; - version = "0.1.7"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv"; + sha256 = "0hqg6vn8hv5pic96klf1d9vj8fibrgiqnqb5vwrg3wvakx0y32kr"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; @@ -53,27 +54,27 @@ stdenv.mkDerivation rec { buildInputs = [ curl boost jsoncpp libbsd pcre - glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify + glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify libxdg_basedir lsb-release + wxGTK ] ++ stdenv.lib.optional doCheck gmock ++ gstInputs ++ pythonInputs; prePatch = '' - substituteInPlace debian/CMakeLists.txt \ - --replace /usr $out - substituteInPlace include/radiotray-ng/common.hpp \ - --replace /usr $out + for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do + substituteInPlace $x --replace /usr $out + done + + # We don't find the radiotray-ng-notification icon otherwise + substituteInPlace data/radiotray-ng.desktop \ + --replace radiotray-ng-notification radiotray-ng-on + substituteInPlace data/rtng-bookmark-editor.desktop \ + --replace radiotray-ng-notification radiotray-ng-on ''; - patches = [ - (fetchpatch { - # Fix menu separators and minor touchup to 'version' - url = "https://github.com/ebruck/radiotray-ng/commit/827e9f1baaa03ab4d8a5fb3aab043e72950eb965.patch"; - sha256 = "1aykl6lq4pga34xg5r9mc616gxnd63q6gr8qzg57w6874cj3csrr"; - }) - ]; + cmakeFlags = stdenv.lib.optional doCheck "-DBUILD_TESTS=ON"; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..65cb7dab34a1f050b980e6d25df5ee7820fbbf4d --- /dev/null +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -0,0 +1,48 @@ +{ stdenv, lib, pkgconfig, fetchFromGitHub, scons, python, glibmm, libpulseaudio, libao +}: + +let + version = "unstable-2018-02-10"; +in stdenv.mkDerivation rec { + name = "rhvoice-${version}"; + + src = fetchFromGitHub { + owner = "Olga-Yakovleva"; + repo = "RHVoice"; + rev = "7a25a881b0465e47a12d8029b56f3b71a1d02312"; + sha256 = "1gkrlmv7msh9qlm0gkjqpl9gswghpclfdwszr1p85v8vk6m63v0b"; + }; + + nativeBuildInputs = [ + scons pkgconfig + ]; + + buildInputs = [ + python glibmm libpulseaudio libao + ]; + + # SConstruct patch + # Scons creates an independent environment that assumes standard POSIX paths. + # The patch is needed to push the nix environment. + # - PATH + # - PKG_CONFIG_PATH, to find available (sound) libraries + # - RPATH, to link to the newly built libraries + + patches = [ ./honor_nix_environment.patch ]; + + buildPhase = '' + scons prefix=$out + ''; + + installPhase = '' + scons install + ''; + + meta = { + description = "A free and open source speech synthesizer for Russian language and others"; + homepage = https://github.com/Olga-Yakovleva/RHVoice/wiki; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ berce ]; + platforms = with lib.platforms; all; + }; +} diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch new file mode 100644 index 0000000000000000000000000000000000000000..ed180c92debc381f08a47b4594d5b0b02b83ec4d --- /dev/null +++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch @@ -0,0 +1,14 @@ +diff --git a/SConstruct b/SConstruct +index 2421399..ba39254 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -147,6 +147,9 @@ def create_base_env(vars): + env_args["package_name"]="RHVoice" + env_args["CPPDEFINES"]=[("RHVOICE","1")] + env=Environment(**env_args) ++ env.PrependENVPath("PATH", os.environ["PATH"]) ++ env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"] ++ env["RPATH"]=env["libdir"] + env["package_version"]=get_version(env["release"]) + env.Append(CPPDEFINES=("PACKAGE",env.subst(r'\"$package_name\"'))) + env.Append(CPPDEFINES=("VERSION",env.subst(r'\"$package_version\"'))) diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 534fd2f0edb12f5c6b064ec7db6b2453d49254b7..a23324c7fdacda9a7f786336ac81f817b4e6310c 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -7,36 +7,35 @@ , libsoup , gnome3 , tdb -, json_glib +, json-glib , itstool , wrapGAppsHook , gst_all_1 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - version = "${major}.${minor}"; - major = "3.2"; - minor = "1"; - + pname = "rhythmbox"; + version = "3.4.2"; in stdenv.mkDerivation rec { - name = "rhythmbox-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/rhythmbox/${major}/${name}.tar.xz"; - sha256 = "0f3radhlji7rxl760yl2vm49fvfslympxrpm8497acbmbd7wlhxz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + intltool perl perlPackages.XMLParser + itstool + wrapGAppsHook + ]; + buildInputs = [ python3 - perl - perlPackages.XMLParser - - intltool libsoup tdb - json_glib - itstool + json-glib gtk3 gnome3.libpeas @@ -45,12 +44,17 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base - - wrapGAppsHook ] ++ gst_plugins; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Rhythmbox; description = "A music playing application for GNOME"; diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 3ebdce2b4820fb8292874bc5b9e98c59a977f818..28a69d5a3b76d51d4971e4716b3174c6d52e69dd 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -4,13 +4,13 @@ automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile stdenv.mkDerivation rec { repo = "rkrlv2"; - name = "${repo}-b1.0"; + name = "${repo}-b2.0"; src = fetchFromGitHub { owner = "ssj71"; inherit repo; - rev = "a315f5aefe63be7e34663596b8b050410a9b7e72"; - sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; + rev = "beta_2"; + sha256 = "128jcilbrd1l65c01w2bazsb21x78mng0jjkhi3x9crf1n9qbh2m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 5966d4253f51a6d64c251c5fe1d787554fd7a093..d881afa7f5f056ad15be1d51af2aa1d58cf6942e 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -3,12 +3,12 @@ , liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }: stdenv.mkDerivation (rec { - version = "17.04"; + version = "17.12.1"; name = "rosegarden-${version}"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; - sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq"; + sha256 = "155kqbxg85wqv0w97cmmx8wq0r4xb3qpnk20lfma04vj8k6hc1mg"; }; patchPhase = '' diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 1eb366d6bbd9530ee6982ea18632c8d4a4b07bbd..4eeb893ee969dc96cb8f99040f1005776d955dd2 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.8.4"; + version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "107p2xsj066q2bil0xcgqrrn7lawp02wzf7qmlajcbnd79jhsi6i"; + sha256 = "0g67vm9ilmq5nlvk0f3abia9pbinr4ck5v4mll6igni1rxz2n7wk"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1bf1a8b2c49e2bbe1478145376b73ddb80aa1703 --- /dev/null +++ b/pkgs/applications/audio/sayonara/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, cmake, qt5, zlib, taglib, pkgconfig, pcre, gst_all_1 }: + +let + version = "1.0.0-git5-20180115"; +in +stdenv.mkDerivation { + name = "sayonara-player-${version}"; + + src = fetchurl { + url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz"; + sha256 = "1fl7zplnrrvbv1xm4g348bpd46jj39jvbm808hyjjq92i64wqg37"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = with qt5; with gst_all_1; + [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly + pcre qtbase qttools taglib zlib + ]; + + # CMake Error at src/GUI/Resources/Icons/cmake_install.cmake:49 (file): + # file cannot create directory: /usr/share/icons. Maybe need administrative + # privileges. + # Call Stack (most recent call first): + # src/GUI/Resources/cmake_install.cmake:50 (include) + # src/GUI/cmake_install.cmake:50 (include) + # src/cmake_install.cmake:59 (include) + # cmake_install.cmake:42 (include) + postPatch = '' + substituteInPlace src/GUI/Resources/Icons/CMakeLists.txt \ + --replace "/usr/share" "$out/share" + ''; + + # [ 65%] Building CXX object src/Components/Engine/CMakeFiles/say_comp_engine.dir/AbstractPipeline.cpp.o + # /tmp/nix-build-sayonara-player-1.0.0-git5-20180115.drv-0/sayonara-player/src/Components/Engine/AbstractPipeline.cpp:28:32: fatal error: gst/app/gstappsink.h: No such file or directory + # #include + NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; + + meta = with stdenv.lib; + { description = "Sayonara music player"; + homepage = https://sayonara-player.com/; + license = licenses.gpl3; + platforms = qt5.qtbase.meta.platforms; + maintainers = [ maintainers.deepfire ]; + }; +} diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 2b2fd161ede325e0dd4cefb4d7b29eb16eab8cae..22786304faa9b83e64001a665e2a6dc84715a85e 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -9,10 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii"; }; + preConfigure = '' + # Build fails on Linux with windres. + export ac_cv_prog_ac_ct_WINDRES= + ''; + configureFlags = "--enable-dependency-tracking"; buildInputs = [ alsaLib python SDL ]; + enableParallelBuilding = true; + meta = { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = http://schismtracker.org/; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index ebeef301e103494569d52a502b0394aa84046b75..11ee00adc887cddfd3890a7456b2b8a25008b587 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.filter24.org/seq24; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu nckx ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 0eaa9bde14f68ddff3704b88a2f88bf80cac72fc..4d8435454239f197a4f33b046266d920cee96644 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, alsaLib, freetype, ftgl, libjack2, libX11, lv2 -, mesa, pkgconfig, ttf_bitstream_vera +, libGLU_combined, pkgconfig, ttf_bitstream_vera }: stdenv.mkDerivation rec { name = "setbfree-${version}"; - version = "0.8.0"; + version = "0.8.5"; src = fetchurl { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "1lfylai4gyk512dknj16w2aq9ka8hvqca46nmq5b4rfjmi6dkxf6"; + sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4"; }; patchPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib freetype ftgl libjack2 libX11 lv2 mesa + alsaLib freetype ftgl libjack2 libX11 lv2 libGLU_combined ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index a60c3bef0daacf767c2565cb7df23f9bef54977d..32cfd0f74940437582675b93e36ffb0ff9f618c3 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lv2, pkgconfig, mesa, cairo, pango, libjack2 }: +{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU_combined, cairo, pango, libjack2 }: let name = "sisco.lv2-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sourceRoot = src.name; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lv2 pango cairo libjack2 mesa ]; + buildInputs = [ lv2 pango cairo libjack2 libGLU_combined ]; postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; sisco_VERSION = version; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 1932ec3d93bc0ec35b0658f7c1f1c408e50b32f7..660f342dc9d96f8ad9c91eb0641cfad2ce52edb0 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-17.8"; + name = "snd-18.2"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "161bx2xgz692iqmsmhv9yi8rvd7y31si4rniizwirwz7q4y4vwvf"; + sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index e91c08c30b77f3559cf0d071f797ba9b79f293eb..55c3dfa92e301d2f432a154b68ae538d2ea5dd40 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -19,8 +19,8 @@ in buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook - gnome3.gnome_themes_standard gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas + gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas ]; postPatch = '' @@ -28,8 +28,6 @@ in buildPythonApplication rec { sed -i '/localmpd/d' sonata/consts.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gobjectIntrospection gtk3 pygobject3 ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index cbcdc0ecccd77815ce17b074a2a5007f966bb79d..e38f38dad78c91859c0c8259ab3b505717c93156 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,41 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero -, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes -, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero +, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes +, wrapGAppsHook }: let - major = "3.16"; - minor = "1"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "sound-juicer-${version}"; + pname = "sound-juicer"; + version = "3.16.1"; +in stdenv.mkDerivation rec{ + name = "${pname}-${version}"; src = fetchurl { - url = "http://download.gnome.org/sources/sound-juicer/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 - gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes - makeWrapper (stdenv.lib.getLib gnome3.dconf) - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-libav - ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" - done - ''; + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; + buildInputs = [ + glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + ]; - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { description = "A Gnome CD Ripper"; diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 7daae31a468b20475fbae6bce5136819e1a97e3f..babe4edff9df68edb2b024a0d7291ce02e27c1cc 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -11,7 +11,7 @@ , boost , ecasound , glibcLocales -, mesa # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL +, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL }: stdenv.mkDerivation rec { @@ -27,11 +27,13 @@ stdenv.mkDerivation rec { # Without it doesn't find all of the boost libraries. BOOST_LIB_DIR="${boost}/lib"; + # uses the deprecated get_generic_category() in boost_system + NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; LC_ALL = "en_US.UTF-8"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ boost boost.dev ecasound mesa help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; + buildInputs = [ boost boost.dev ecasound libGLU_combined help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 # 2) Make it find ecasound headers @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://spatialaudio.net/ssr/; description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; license = stdenv.lib.licenses.gpl3; - maintainer = stdenv.lib.maintainers.fridh; + maintainers = [ stdenv.lib.maintainers.fridh ]; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 249bbe0d8fb7036118823bbc605aa22acc08a92d..87bf440ed4f39b08c1f2f87d6f9a146011ebc2b7 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # 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.64.407.g9bd02c2d-26"; + version = "1.0.77.338.g758ebd78-41"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0zc8vclf1wx60yllc1jgzhqyv5lkwz95qmmy5f79zkj6vrdak5wc"; + sha256 = "1971jc0431pl8yixpl37ryl2l0pqdf0xjvkg59nqdwj3vbdx5606"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index 2022183f4a0837fb3a0122ca5be5c14044f89cb8..496ce779ffb5739d3d757b905410cf4c7d9f5ff7 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ flac libao libvorbis ncurses opusfile ]; + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS"; + patches = [ ./gnu-screen.patch ]; postInstall = '' diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 0fb1b77e708147522b4dbaa5a244595fc8117b8f..39d1c266a37368db6498649030d8ea7565e4a915 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis }: +{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: stdenv.mkDerivation rec { name = "streamripper-${version}"; @@ -10,13 +10,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libogg libvorbis ]; + buildInputs = [ glib libogg libvorbis libmad ]; meta = with stdenv.lib; { homepage = http://streamripper.sourceforge.net/; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; - platforms = platforms.linux; maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ccbceddefd2fcff5b9ce9e6b437db55e66c53906 --- /dev/null +++ b/pkgs/applications/audio/sunvox/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }: + +let + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ]; + arch = + if stdenv.isAarch64 + then "arm64" + else if stdenv.isArm + then "arm_armhf_raspberry_pi" + else if stdenv.is64bit + then "x86_64" + else "x86"; +in +stdenv.mkDerivation rec { + name = "SunVox-${version}"; + version = "1.9.3b"; + + src = fetchurl { + url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; + sha256 = "0k74rcq7niw4p17vj3zp9lpgi932896dmzqv4ln43g0pz7l18c8b"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = "unzip $src"; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share $out/bin + mv sunvox $out/share/ + + bin="$out/share/sunvox/sunvox/linux_${arch}/sunvox" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + "$bin" + + ln -s "$bin" $out/bin/sunvox + ''; + + meta = with stdenv.lib; { + description = "Small, fast and powerful modular synthesizer with pattern-based sequencer"; + license = licenses.unfreeRedistributable; + homepage = "http://www.warmplace.ru/soft/sunvox/"; + maintainers = with maintainers; [ puffnfresh ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 2f5a4ebb43f2eea3f48041d62ab67637b1cf3505..53875389a4c3bf58071b498111445f46b53aed6b 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.8.4"; + version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "0awk2zx0xa6vl6ah24zz0k2mwsx50hh5g1rh32mp790fp4x7l5s8"; + sha256 = "1skynjg6ip0qfbqqkybfjh6xcwxagq89ghl08f7sp7j0sz5qdcwp"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 364949b2241650d76e3559a7796c663beb8c4eea..4140c5da5a459c196b4bb4536c8304fe2cee76a1 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -4,12 +4,12 @@ , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs4 ? null -, enableTelepathy ? false, telepathy_qt ? null +, enableTelepathy ? false, telepathy-qt ? null }: assert enableXMPP -> libjreen != null; assert enableKDE -> kdelibs4 != null; -assert enableTelepathy -> telepathy_qt != null; +assert enableTelepathy -> telepathy-qt != null; stdenv.mkDerivation rec { name = "tomahawk-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen ++ stdenv.lib.optional enableKDE kdelibs4 - ++ stdenv.lib.optional enableTelepathy telepathy_qt; + ++ stdenv.lib.optional enableTelepathy telepathy-qt; postInstall = let pluginPath = stdenv.lib.concatStringsSep ":" [ @@ -47,10 +47,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "A multi-source music player"; + description = "A multi-source music player (unmaintained)"; homepage = http://tomahawk-player.org/; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = [ maintainers.aszlig ]; }; } diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 0c151697e8979e602344930d5e2a075b1bdca95d..4c4f958ec493712c971070b6b6429a659b7ab5ca 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 -, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: +, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { version = "20170428"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; + buildInputs = [ libGLU ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; # Don't remove this. The default fails with 'do not know how to unpack source archive' # every now and then on Hydra. No idea why. diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 9aa24738c37924563ddd3235fbcf3db9bdd95852..d234f6b6b8ccff85a43f68fd6edddd998186f758 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: stdenv.mkDerivation rec { - name = "xmp-4.0.10"; + name = "xmp-4.1.0"; meta = with stdenv.lib; { description = "Extended module player"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz"; - sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n"; + sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 2b79718809ff239680abbcec18aed0881f8a01b1..678345a91ddd72b552193c25c2ad0679e2b999bf 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk -, libjack2, libsndfile, libXdmcp, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg +{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre +, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU_combined, minixml, pkgconfig, zlib, xorg }: assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.3"; + version = "1.5.7"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0sns35pyw2f74xrv1fxiyf9g9415kvh2rrbdjd60hsiv584nlari"; + sha256 = "1w916mmi6hh547a7icrgx6qr2kwxlxwlm6ampql427rshcz9r61k"; }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 mesa - minixml zlib xorg.libpthreadstubs + alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU_combined + minixml zlib xorg.libpthreadstubs pcre ]; nativeBuildInputs = [ cmake pkgconfig ]; patchPhase = '' - sed -i -e 's,/usr/share,'$out/share,g src/Misc/Config.cpp src/Misc/Bank.cpp + substituteInPlace src/Misc/Config.cpp --replace /usr $out + substituteInPlace src/Misc/Bank.cpp --replace /usr $out ''; preConfigure = "cd src"; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index f81aad4e2af188fcf9a5c0fbd9907761aa41aac9..210d0f7e989d3ba30238f21f704e6dcefb174dfb 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchgit , boost, libX11, mesa, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile }: +{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation rec { name = "zam-plugins-${version}"; - version = "3.9"; + version = "3.10"; src = fetchgit { url = "https://github.com/zamaudio/zam-plugins.git"; deepClone = true; - rev = "4976cf204074c1dfaf344821e83e8d896b35107d"; - sha256 = "1xgwl51sf2hgc5ikcnycyxaw9vy82lrcswn07b6av6i67qclm8f8"; + rev = "a3321af1892a6994d64fb705e48ae8adf8d7df20"; + sha256 = "0yqrs21ph2lx00p0jlc70qkmzfrnf9ihg1r3i9j5n2r903ljdg5p"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 rubberband libsndfile ]; + buildInputs = [ boost libX11 libGLU_combined liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; patchPhase = '' patchShebangs ./dpf/utils/generate-ttl.sh diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 52b9a57c00b27ff02d792d78fb63cbf359230358..1b3429f39d7f8743f973ccc145449c6f99e6acd0 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -4,16 +4,20 @@ stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm"; + sha256 = "1hfpiqdm337gl4ynkmmp2qss2m5z8mzqzjrbiyg6w1v4js7l9phi"; }; buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; nativeBuildInputs = [ cmake pkgconfig ]; + patchPhase = '' + substituteInPlace src/Misc/Config.cpp --replace /usr $out + ''; + hardeningDisable = [ "format" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix new file mode 100644 index 0000000000000000000000000000000000000000..9bed504103a14286669358a07a2e0f0f08edf246 --- /dev/null +++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, + procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, + fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, libudev, + libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, + libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages, + maxRam ? "1024m" }: + +stdenv.mkDerivation rec { + version = "6.7.0"; + rev = "1512021600670_4503"; + pname = "CrashPlanSmb"; + name = "${pname}_${version}_${rev}"; + + src = fetchurl { + url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz"; + sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q"; + }; + + nativeBuildInputs = [ makeWrapper cpio nodePackages.asar ]; + buildInputs = [ getopt which ]; + + vardir = "/var/lib/crashplan"; + manifestdir = "${vardir}/manifest"; + + postPatch = '' + # patch scripts/CrashPlanEngine + substituteInPlace scripts/CrashPlanEngine \ + --replace /bin/ps ${procps}/bin/ps \ + --replace awk ${gawk}/bin/awk \ + --replace '`sed' '`${gnused}/bin/sed' \ + --replace grep ${gnugrep}/bin/grep \ + --replace TARGETDIR/log VARDIR/log \ + --replace TARGETDIR/\''${NAME} VARDIR/\''${NAME} \ + --replace \$TARGETDIR/bin/run.conf $out/bin/run.conf \ + --replace \$VARDIR ${vardir} + + # patch scripts/CrashPlanDesktop + substituteInPlace scripts/CrashPlanDesktop \ + --replace awk ${gawk}/bin/awk \ + --replace "\"\$SCRIPTDIR/..\"" "$out" \ + --replace "\$(dirname \$SCRIPT)" "$out" \ + --replace "\''${TARGETDIR}/log" ${vardir}/log \ + --replace "\''${TARGETDIR}" "$out" + ''; + + installPhase = '' + mkdir $out + zcat -v ${pname}_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner) + + install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop + install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine + install -D -m 644 scripts/run.conf $out/bin/run.conf + install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop + + # unpack, patch and repack app.asar to stop electron from creating /usr/local/crashplan/log to store the ui logs. + asar e $out/app.asar $out/app.asar-unpacked + rm -v $out/app.asar + substituteInPlace $out/app.asar-unpacked/shared_modules/shell/platform_paths.js \ + --replace "getLogFileParentPath();" "\"$vardir/log\";" + asar p $out/app.asar-unpacked $out/app.asar + + mv -v $out/*.asar $out/electron/resources + chmod 755 "$out/electron/crashplan" + + rm -r $out/log + mv -v $out/conf $out/conf.template + ln -s $vardir/log $out/log + ln -s $vardir/cache $out/cache + ln -s $vardir/conf $out/conf + + substituteInPlace $out/bin/run.conf \ + --replace "-Xmx1024m" "-Xmx${maxRam}" + + echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars + echo "APP_BASENAME=CrashPlan" >> $out/install.vars + echo "TARGETDIR=$out" >> $out/install.vars + echo "BINSDIR=$out/bin" >> $out/install.vars + echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars + echo "VARDIR=${vardir}" >> $out/install.vars + echo "INITDIR=" >> $out/install.vars + echo "RUNLVLDIR=" >> $out/install.vars + echo "INSTALLDATE=" >> $out/install.vars + + ''; + + postFixup = '' + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan + wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype + fontconfig dbus gconf nss nspr alsaLib cups expat libudev + libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite + libXext libXfixes libXrender libXtst libXScrnSaver]}" + ''; + + meta = with stdenv.lib; { + description = "An online backup solution"; + homepage = http://www.crashplan.com/business/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ xvapx ]; + }; + +} diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index c330aeb0092c2d3681d5f34273bfdb7bce06596d..ef7aa96beb063b713371a2a789186ddd94df38bf 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext -, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 +{ stdenv, fetchurl, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext +, gnome3, libnotify, itstool, glib, gtk3, libxml2 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook -, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror -, appstream-glib, desktop_file_utils, atk, pango, duplicity +, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror +, appstream-glib, desktop-file-utils, duplicity }: stdenv.mkDerivation rec { @@ -15,58 +15,35 @@ stdenv.mkDerivation rec { }; patches = [ - ./fix-paths.patch + (substituteAll { + src = ./fix-paths.patch; + inherit coreutils; + }) ]; - postPatch = '' - substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \ - "/bin/rm" \ - "${coreutils}/bin/rm" - ''; - - # couldn't find gio/gdesktopappinfo.h - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ - meson ninja pkgconfig vala_0_38 gettext intltool itstool - appstream-glib desktop_file_utils libxml2 wrapGAppsHook + meson ninja pkgconfig vala_0_40 gettext itstool + appstream-glib desktop-file-utils libxml2 wrapGAppsHook ]; buildInputs = [ libnotify gnome3.libpeas glib gtk3 libsecret pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus - at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror + at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror ]; propagatedUserEnvPkgs = [ duplicity ]; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0"; + postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; - # Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed - postFixup = - let - rpath = stdenv.lib.makeLibraryPath [ - glib - gtk3 - gnome3.gnome_online_accounts - gnome3.libpeas - gnome3.nautilus - libgpgerror - libsecret - # Transitive - atk - pango - ]; - in '' - # Unwrap accidentally wrapped library - mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so - - for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do - patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf" - done - ''; + postFixup = '' + # Unwrap accidentally wrapped library + mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so + ''; meta = with stdenv.lib; { description = "A simple backup tool"; diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch index 1cc57e6a54a2d65ec1b779fbbf2d27dc05037f05..26126fdc9d56fd3735b2a156899530e58e6b4a01 100644 --- a/pkgs/applications/backup/deja-dup/fix-paths.patch +++ b/pkgs/applications/backup/deja-dup/fix-paths.patch @@ -1,12 +1,11 @@ -diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build -index 04b136f3..ed8f7cba 100644 ---- a/deja-dup/nautilus/meson.build -+++ b/deja-dup/nautilus/meson.build -@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'], - link_with: [dirhandling], - dependencies: [nautilus_dep], - install: true, -- install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir')) -+ install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0')) +--- a/libdeja/tools/duplicity/DuplicityInstance.vala ++++ b/libdeja/tools/duplicity/DuplicityInstance.vala +@@ -159,7 +159,7 @@ + // We already are pretty sure we don't have other duplicities in our + // archive directories, because we use our own and we ensure we only have + // one deja-dup running at a time via DBus. +- Posix.system("/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock"); ++ Posix.system("@coreutils@/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock"); - endif + Process.spawn_async_with_pipes(null, real_argv, real_envp, + SpawnFlags.SEARCH_PATH | diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix deleted file mode 100644 index 9dd7eb2a29941330ed7b186c0c712af5f6c44787..0000000000000000000000000000000000000000 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, lightdm, pkgconfig, intltool -, hicolor_icon_theme, makeWrapper -, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported -}: - -#ToDo: bad icons with gtk2; -# avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from - -let - ver_branch = "2.0"; - version = "2.0.1"; -in -stdenv.mkDerivation rec { - name = "lightdm-gtk-greeter-${version}"; - - src = fetchurl { - url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; - sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j"; - }; - - patches = [ - (fetchurl { - name = "lightdm-gtk-greeter-2.0.1-lightdm-1.19.patch"; - url = "https://588764.bugs.gentoo.org/attachment.cgi?id=442616"; - sha256 = "0r383kjkvq9yanjc1lk878xc5g8993pjgxylqhhjb5rkpi1mbfsv"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lightdm intltool makeWrapper ] - ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); - - configureFlags = [ - "--localstatedir=/var" - "--sysconfdir=/etc" - ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; - - installFlags = [ - "localstatedir=\${TMPDIR}" - "sysconfdir=\${out}/etc" - ]; - - postInstall = '' - substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ - --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" - wrapProgram "$out/sbin/lightdm-gtk-greeter" \ - --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" - ''; - - meta = with stdenv.lib; { - homepage = http://launchpad.net/lightdm-gtk-greeter; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = with maintainers; [ ocharles wkennington ]; - }; -} diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index e82d4c69def6801cd82f16d2ce3f8652b6fe29cf..6765c5f9dfd00b9fc2973b87f95f555994927ae7 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit +, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils , qt4 ? null , withQt5 ? false, qtbase }: @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; + prePatch = '' + substituteInPlace src/shared-data-manager.c \ + --replace /bin/rm ${coreutils}/bin/rm + ''; + meta = { homepage = https://launchpad.net/lightdm; platforms = platforms.linux; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix new file mode 100644 index 0000000000000000000000000000000000000000..3227151ce21e1dae2f4f956b4b88831d3c75a6bb --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, lightdm, pkgconfig, intltool +, hicolor-icon-theme, makeWrapper +, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported +, exo +}: + +#ToDo: bad icons with gtk2; +# avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from + +let + ver_branch = "2.0"; + version = "2.0.5"; +in +stdenv.mkDerivation rec { + name = "lightdm-gtk-greeter-${version}"; + + src = fetchurl { + url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; + sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lightdm exo intltool makeWrapper ] + ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); + + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + + installFlags = [ + "localstatedir=\${TMPDIR}" + "sysconfdir=\${out}/etc" + ]; + + postInstall = '' + substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ + --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" + wrapProgram "$out/sbin/lightdm-gtk-greeter" \ + --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share" + ''; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/lightdm-gtk-greeter; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ocharles wkennington ]; + }; +} diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 86a963bdac48c314d71041ed9c60c25e102ff6bd..a41f917a7ec2a41574f8839feca12a15911b9b88 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -4,8 +4,7 @@ }: let - - version = "0.16.0"; + version = "0.17.0"; in mkDerivation rec { name = "sddm-${version}"; @@ -14,7 +13,7 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb"; + sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq"; }; patches = [ ./sddm-ignore-config-mtime.patch ]; @@ -23,6 +22,10 @@ in mkDerivation rec { # Module Qt5::Test must be included in `find_package` before it is used. '' sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|' + '' + # Fix missing include for gettimeofday() + + '' + sed -e '1i#include ' -i src/helper/HelperApp.cpp ''; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 5d06c2221b348a1e3474a1abf2a5b96b858a9f1b..5160e02963f26492214c3b6a830818bd51d00ddf 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng +{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng , fontconfig, freetype, pam, dbus_libs, makeWrapper }: stdenv.mkDerivation rec { @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { # Allow to set logfile to a special "/dev/stderr" in order to continue # logging to stderr and thus to the journal. ./no-logfile.patch - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/8eddda8072add075ebf56cf6d288bc1450d6b5f8/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch"; + sha256 = "0f82672s2r2cmdqfn2mbg3di76mbla9n0ik20p2gv4igi6p866xm"; + }); preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib"; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 360d373f0707b03051c3b486a2fa1ecb87c077f2..a165fad370ecd359c0642fa2aea76193a19d10f6 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -5,10 +5,13 @@ , fetchurl , findutils , file +, fontsConf , git , glxinfo , gnugrep +, gnused , gnutar +, gtk2, gnome_vfs, glib, GConf , gzip , fontconfig , freetype @@ -29,12 +32,11 @@ , writeTextFile , xkeyboard_config , zlib -, fontsConf }: let androidStudio = stdenv.mkDerivation { - name = "${pname}"; + name = "${pname}-${version}"; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; @@ -48,6 +50,7 @@ let installPhase = '' cp -r . $out wrapProgram $out/bin/studio.sh \ + --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set PATH "${stdenv.lib.makeBinPath [ # Checked in studio.sh @@ -55,6 +58,7 @@ let findutils gnugrep which + gnused # For Android emulator file @@ -68,7 +72,6 @@ let # Runtime stuff git - ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ @@ -95,6 +98,11 @@ let libpulseaudio libX11 + # For GTKLookAndFeel + gtk2 + gnome_vfs + glib + GConf ]}" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ --set FONTCONFIG_FILE ${fontsConf} @@ -106,6 +114,7 @@ let # environment is used as a work around for that. fhsEnv = buildFHSUserEnv { name = "${pname}-fhs-env"; + multiPkgs = pkgs: [ pkgs.ncurses5 ]; }; in diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b9e096c69279316a4253627f71640c0fa90b2c4f..e18235024df44416f90ec6aedcdf2d3b33bb7449 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,19 +1,34 @@ -{ stdenv, callPackage, fetchurl, makeFontsConf }: +{ stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }: + let mkStudio = opts: callPackage (import ./common.nix opts) { fontsConf = makeFontsConf { fontDirectories = []; }; + inherit (gnome2) GConf gnome_vfs; + }; + stableVersion = { + version = "3.1.1.0"; # "Android Studio 3.1.1" + build = "173.4697961"; + sha256Hash = "0xn02miq2hz7666mziza56pfqw9sjflgvn88ds7j5yd4rlcr0lq8"; + }; + latestVersion = { + version = "3.2.0.10"; # "Android Studio 3.2 Canary 11" + build = "181.4720098"; + sha256Hash = "00cd7qdznspi69cgs1a13a3fnkvsc7zjfl517jgp32vdygkb0qxw"; }; in rec { - stable = mkStudio { + # Old alias + preview = beta; + + # Attributes are named by the corresponding release channels + + stable = mkStudio (stableVersion // { pname = "android-studio"; - version = "3.0.0.18"; # "Android Studio 3.0" - build = "171.4408382"; - sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br"; + #pname = "android-studio-stable"; # TODO: Rename and provide symlink meta = with stdenv.lib; { - description = "The Official IDE for Android (stable version)"; + description = "The Official IDE for Android (stable channel)"; longDescription = '' Android Studio is the official IDE for Android app development, based on IntelliJ IDEA. @@ -23,17 +38,31 @@ in rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ primeos ]; }; - }; + }); - preview = mkStudio { + beta = mkStudio (stableVersion // { pname = "android-studio-preview"; - version = "3.1.0.3"; # "Android Studio 3.1 Canary 4" - build = "171.4444016"; - sha256Hash = "0qgd0hd3i3p1adv0xqa0409r5injw3ygs50lajzi99s33j6vdc6s"; + #pname = "android-studio-beta"; # TODO: Rename and provide symlink meta = stable.meta // { - description = "The Official IDE for Android (preview version)"; + description = "The Official IDE for Android (beta channel)"; homepage = https://developer.android.com/studio/preview/index.html; }; - }; + }); + + dev = mkStudio (latestVersion // { + pname = "android-studio-dev"; + + meta = beta.meta // { + description = "The Official IDE for Android (dev channel)"; + }; + }); + + canary = mkStudio (latestVersion // { + pname = "android-studio-canary"; + + meta = beta.meta // { + description = "The Official IDE for Android (canary channel)"; + }; + }); } diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 39be7f534060bff83628b98bbde0fce39ec4fd80..429b2430fce29f2746131d1b187f7ca94c07fba0 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "aseprite-${version}"; - version = if unfree then "1.2.2" else "1.1.7"; + version = if unfree then "1.2.4" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "1ldi7zikl1g6rq3g9lkypx5wqzza5j0054j1r8bh7lyvb0szicig" + then "1rnf4a8vgddz8x55rpqaihlxmqip1kgpdhqb4d3l71h1zmidg5k3" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix index bc39d3466765fc56bbf21381c27ac72d66aab7bb..0734da173e5f443063f0e78a54b3c7d052b8ef71 100644 --- a/pkgs/applications/editors/atom/beta.nix +++ b/pkgs/applications/editors/atom/beta.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-beta-${version}"; - version = "1.23.0-beta0"; + version = "1.24.0-beta3"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1vfc8jin07kivdmyw88vbzinbjsb6py9n2ggpvy4cccagnvxwj2y"; + sha256 = "02nnjjwlkxafi2fbi4gz276nqkmi92kf3q414vw1k3kc8q5zvxrs"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index f5763ea787f3996dfdb2a55797cc48a7f8d86fc8..7b989f8df1f9bf5416526dcf5f4bf4a3b7466b9a 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.22.0"; + version = "1.26.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1jxw0m1hfaisf1f875wr28f0mr3h0wjml6pjhfxbybvcblpnd27k"; + sha256 = "1gyxys3mwwizc88vlb6j769b6r4ibjnqs6pg5iv336b13f9acyvr"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 8f6c5f5c2906fb4a43967485250a28d10c4d2ae2..c7e1dfe27364b546731b14bd6e022105a968de92 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,16 +1,16 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr -, gconf, nss, xorg, libcap, systemd, libnotify +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 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 xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb + xorg.libxcb libsecret ]; libPathNative = lib.makeLibraryPath packages; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 20c2623e034cd54081fe746aef6fe13a2b8ced43..72642cfbe63fc9c794d5ace0797aa9ed5b6a0ad8 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -6,12 +6,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}"; - version = "16.01"; + version = "17.12"; pname = "codeblocks"; src = fetchurl { - url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.gz"; - sha256 = "00sskm91r20ywydwqwx6v7z3nwn9lyh5297c5wp3razldlh9vyrh"; + url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.xz"; + sha256 = "1q2pph7md1p10i83rir2l4gvy7ym2iw8w6sk5vl995knf851m20k"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ]; @@ -22,11 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; configureFlags = [ "--enable-pch=no" ] - ++ optional contribPlugins "--with-contrib-plugins"; - - # Fix boost 1.59 compat - # Try removing in the next version - #CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + ++ optional contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ]; meta = { maintainers = [ maintainers.linquize ]; diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index d1ed4826c68234fab68df3be3936bccfc1a0c7c4..4ab11064eae3d7a014d2f7e6caa1320b081eaf01 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft -, version ? "2016-10-08" -, rev ? "a17c4a9c2a1af2de0a756fe16d482e0db88c0541" -, sha256 ? "03xmfzlijz4gbmr7l0pb1gl9kmlz1ab3hr8d51innvlasy4g6xgj" -}: +{ stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }: stdenv.mkDerivation rec { - inherit version; + version = "2017-10-27"; name = "deadpixi-sam-unstable-${version}"; - src = fetchFromGitHub { - inherit sha256 rev; - owner = "deadpixi"; - repo = "sam"; - }; + + src = fetchFromGitHub { + owner = "deadpixi"; + repo = "sam"; + rev = "51693780fb1457913389db6634163998f9b775b8"; + sha256 = "0nfkj93j4bgli4ixbk041nwi14rabk04kqg8krq4mj0044m1qywr"; + }; postPatch = '' substituteInPlace config.mk.def \ - --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" + --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \ + --replace "CC=gcc" "" ''; + CFLAGS = "-D_DARWIN_C_SOURCE"; makeFlags = [ "DESTDIR=$(out)" ]; - buildInputs = [ libX11 libXt libXft ]; + buildInputs = [ libX11 libXi libXt libXft ]; postInstall = '' mkdir -p $out/share/applications @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "Updated version of the sam text editor"; license = with licenses; lpl-102; maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..03c3c5d5eec6c7d9c81a5e93034d1fe4c71f9386 --- /dev/null +++ b/pkgs/applications/editors/dit/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchurl, stdenv, coreutils, ncurses, lua }: + +stdenv.mkDerivation rec { + name = "dit-${version}"; + version = "0.4"; + + src = fetchurl { + url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz"; + sha256 = "0bwczbv7annbbpg7bgbsqd5kwypn81sza4v7v99fin94wwmcn784"; + }; + + buildInputs = [ coreutils ncurses lua ]; + + prePatch = '' + patchShebangs tools/GenHeaders + ''; + + # needs GNU tail for tail -r + postPatch = '' + substituteInPlace Prototypes.h --replace 'tail' "$(type -P tail)" + ''; + + meta = with stdenv.lib; { + description = "A console text editor for Unix that you already know how to use"; + homepage = https://hisham.hm/dit/; + license = licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 6a5bc3e7b0f8ee8e516c2a7f6d35bdc9bee9a24d..a26d380ec1dff60fb85da8dbbad9d6b852b917f2 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2 +, zlib, jdk, glib, gtk3, libXtst, gsettings-desktop-schemas, webkitgtk , makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11 + fontconfig freetype glib gsettings-desktop-schemas gtk3 jdk libX11 libXrender libXtst makeWrapper zlib - ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2; + ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk; buildCommand = '' # Unpack tarball. @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2)} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk)} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 5ef29081cf0122e0bf3fe419497828ea562bfd7d..1688e606222dceaf29e5ac3842529e8381cea8f3 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas -, webkitgtk24x-gtk2 ? null # for internal web browser +, glib, gtk3, libXtst, jdk, gsettings-desktop-schemas +, webkitgtk ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage }: @@ -15,7 +15,7 @@ rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2 + jdk glib gtk3 libXtst gsettings-desktop-schemas webkitgtk makeWrapper; }; @@ -114,16 +114,16 @@ rec { }; eclipse-platform-47 = buildEclipse { - name = "eclipse-platform-4.7.1a"; + name = "eclipse-platform-4.7.2"; 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.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz; - sha256 = "13gyrnhyhdpsrbi5nl0fhpwrqz3gdyqq3r0m1f2z3y6yr75sgw33"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz; + sha256 = "1zl406brvhh25dkd2pi1kvz5386gzkybpwik03aadpzmjrbm9730"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk.tar.gz; - sha256 = "013dfk23wa4jy177ywrkkr16wdjf6jxzjcz6mkl4ygki47yj9c5s"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk.tar.gz; + sha256 = "0v0i13ah8d8zmcv0ip1ia5ifnfnl76aibiqpv4q4lih5d1qsa79d"; }; }; }; @@ -168,16 +168,16 @@ rec { }; eclipse-sdk-47 = buildEclipse { - name = "eclipse-sdk-4.7.1a"; + name = "eclipse-sdk-4.7.2"; 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.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk-x86_64.tar.gz; - sha256 = "05xpdbig170rw7k5dx33dlyz187wv62mma8s5wxrqi7f4117sx4y"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk-x86_64.tar.gz; + sha256 = "1j5d72rkl3lq3rpnvq1spsa0zlzbmbkgadfhbz868sqqbavrwbzv"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk.tar.gz; - sha256 = "09c9m88k1cm9bhd900p5yf2q9pijrymgjcbhmagz0fcwhldrv0ys"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk.tar.gz; + sha256 = "117436ni79v1kiync8b3wkfkb8a5rv3sbqp6qnwbmanwkvnyvfvc"; }; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 8d96a79b3c3d7f32c87295308729acd5b154ad4c..1710c0e35531e51613c0e75b583038059ddb7722 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -20,20 +20,32 @@ rec { # Helper for the common case where we have separate feature and # plugin JARs. - buildEclipsePlugin = { name, srcFeature, srcPlugin, ... } @ attrs: - buildEclipsePluginBase (attrs // { - srcs = [ srcFeature srcPlugin ]; + buildEclipsePlugin = + { name, srcFeature, srcPlugin ? null, srcPlugins ? [], ... } @ attrs: + assert srcPlugin == null -> srcPlugins != []; + assert srcPlugin != null -> srcPlugins == []; - buildCommand = '' - dropinDir="$out/eclipse/dropins/${name}" + let - mkdir -p $dropinDir/features - unzip ${srcFeature} -d $dropinDir/features/ + pSrcs = if (srcPlugin != null) then [ srcPlugin ] else srcPlugins; - mkdir -p $dropinDir/plugins - cp -v ${srcPlugin} $dropinDir/plugins/${name}.jar - ''; - }); + in + + buildEclipsePluginBase (attrs // { + srcs = [ srcFeature ] ++ pSrcs; + + buildCommand = '' + dropinDir="$out/eclipse/dropins/${name}" + + mkdir -p $dropinDir/features + unzip ${srcFeature} -d $dropinDir/features/ + + mkdir -p $dropinDir/plugins + for plugin in ${toString pSrcs}; do + cp -v $plugin $dropinDir/plugins/$(stripHash $plugin) + done + ''; + }); # Helper for the case where the build directory has the layout of an # Eclipse update site, that is, it contains the directories @@ -102,6 +114,75 @@ rec { }; }; + ansi-econsole = buildEclipsePlugin rec { + name = "ansi-econsole-${version}"; + version = "1.3.5.201612301822"; + + srcFeature = fetchurl { + url = "https://mihnita.github.io/ansi-econsole/install/features/net.mihai-nita.ansicon_${version}.jar"; + sha256 = "086ylxpsrlpbvwv5mw7v6b44j63cwzgi8apg2mq058ydr5ak6hxs"; + }; + + srcPlugin = fetchurl { + url = "https://mihnita.github.io/ansi-econsole/install/plugins/net.mihai-nita.ansicon.plugin_${version}.jar"; + sha256 = "1j42l0xxzs89shqkyn91lb0gia10mifzy0i73c3n7gj7sv2ddbjq"; + }; + + meta = with stdenv.lib; { + homepage = "https://mihai-nita.net/java/#ePluginAEC"; + description = "Adds support for ANSI escape sequences in the Eclipse console"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + + antlr-runtime_4_5 = buildEclipsePluginBase rec { + name = "antlr-runtime-4.5.3"; + + src = fetchurl { + url = "http://www.antlr.org/download/${name}.jar"; + sha256 = "0lm78i2annlczlc2cg5xvby0g1dyl0sh1y5xc2pymjlmr67a1g4k"; + }; + + buildCommand = '' + dropinDir="$out/eclipse/dropins/" + mkdir -p $dropinDir + cp -v $src $dropinDir/${name}.jar + ''; + + meta = with stdenv.lib; { + description = "A powerful parser generator for processing structured text or binary files"; + homepage = http://www.antlr.org/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + + antlr-runtime_4_7 = buildEclipsePluginBase rec { + name = "antlr-runtime-4.7.1"; + + src = fetchurl { + url = "http://www.antlr.org/download/${name}.jar"; + sha256 = "07f91mjclacrvkl8a307w2abq5wcqp0gcsnh0jg90ddfpqcnsla3"; + }; + + buildCommand = '' + dropinDir="$out/eclipse/dropins/" + mkdir -p $dropinDir + cp -v $src $dropinDir/${name}.jar + ''; + + meta = with stdenv.lib; { + description = "A powerful parser generator for processing structured text or binary files"; + homepage = http://www.antlr.org/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + anyedittools = buildEclipsePlugin rec { name = "anyedit-${version}"; version = "2.7.1.201709201439"; @@ -127,16 +208,16 @@ rec { autodetect-encoding = buildEclipsePlugin rec { name = "autodetect-encoding-${version}"; - version = "1.8.4.201708052053"; + version = "1.8.5.201801191359"; srcFeature = fetchurl { - url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar"; - sha256 = "1gbvib5dd75pp5mr17ckj2y66gnxjvpc067im5nsl9fyljdw867c"; + url = "https://github.com/cypher256/eclipse-encoding-plugin/raw/master/eclipse.encoding.updatesite.snapshot/features/eclipse.encoding.plugin.feature_${version}.jar"; + sha256 = "1m8ypsc1dwz0y6yhjgxsdi9813d38jllv7javgwvcd30g042a3kx"; }; srcPlugin = fetchurl { - url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar"; - sha256 = "0728zsbfs1mc4qvx2p92hkxpnknckqk0xvqlmzivsnr62b5qd5im"; + url = "https://github.com/cypher256/eclipse-encoding-plugin/raw/master/eclipse.encoding.updatesite.snapshot/plugins/mergedoc.encoding_${version}.jar"; + sha256 = "1n2rzybfcwp3ss2qi0fhd8vm38vdwav8j837lqiqlfcnvzwsk86m"; }; meta = with stdenv.lib; { @@ -192,12 +273,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "8.0.0.201707161819"; + version = "8.7.0.201801131309"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.0.0/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "1p07xcf71qc99sh73vqm9xxxgi819m58frv0cpvsn06y6ljr0aj2"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.7.0/net.sf.eclipsecs-updatesite_${version}.zip"; + sha256 = "07fymk705x4mwq7vh2i6frsf67jql4bzrkdzhb4n74zb0g1dib60"; }; meta = with stdenv.lib; { @@ -233,7 +314,7 @@ rec { }; }; - cup = buildEclipsePluginBase rec { + cup = buildEclipsePlugin rec { name = "cup-${version}"; version = "1.1.0.201604221613"; version_ = "1.0.0.201604221613"; @@ -243,31 +324,20 @@ rec { sha256 = "13nnsf0cqg02z3af6xg45rhcgiffsibxbx6h1zahjv7igvqgkyna"; }; - srcPlugin1 = fetchurl { - url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version_}.jar"; - sha256 = "0kif8kivrysprva1pxzajm88gi967qf7idhb6ga2xpvsdcris91j"; - }; - - srcPlugin2 = fetchurl { - url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar"; - sha256 = "022phbrsny3gb8npb6sxyqqxacx138q5bd7dq3gqxh3kprx5chbl"; - }; + srcPlugins = [ + (fetchurl { + url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version_}.jar"; + sha256 = "0kif8kivrysprva1pxzajm88gi967qf7idhb6ga2xpvsdcris91j"; + }) - srcs = [ srcFeature srcPlugin1 srcPlugin2 ]; + (fetchurl { + url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar"; + sha256 = "022phbrsny3gb8npb6sxyqqxacx138q5bd7dq3gqxh3kprx5chbl"; + }) + ]; propagatedBuildInputs = [ zest ]; - phases = [ "installPhase" ]; - - installPhase = '' - dropinDir="$out/eclipse/dropins/${name}" - mkdir -p $dropinDir/features - unzip ${srcFeature} -d $dropinDir/features/ - mkdir -p $dropinDir/plugins - cp -v ${srcPlugin1} $dropinDir/plugins/''${srcPlugin1#*-} - cp -v ${srcPlugin2} $dropinDir/plugins/''${srcPlugin2#*-} - ''; - meta = with stdenv.lib; { homepage = http://www2.cs.tum.edu/projects/cup/eclipse.php; description = "IDE for developing CUP based parsers"; @@ -360,14 +430,52 @@ rec { }; }; + jsonedit = buildEclipsePlugin rec { + name = "jsonedit-${version}"; + version = "1.1.0"; + + srcFeature = fetchurl { + url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar"; + sha256 = "1qqbzh9sv0s9p0irim7kimvzdkw0hg6yv090bz5ifpzqdxc4v9r5"; + }; + + srcPlugins = + let + fetch = { n, h }: + fetchurl { + url = "https://boothen.github.io/Json-Eclipse-Plugin/plugins/jsonedit-${n}_${version}.jar"; + sha256 = h; + }; + in + map fetch [ + { n = "core"; h = "1fl4api6j0wp4vfbyabxqsrjvvpclp8p3b4xnxxpn4v8g12q526m"; } + { n = "editor"; h = "1kn15qampdlpxblj2bv94b3bb15qfwng27lk0n578585yqmb3p66"; } + { n = "folding"; h = "1qnzdx4xx9ma3p6lg1ab8xf3nik1yrww33nksi0j3vnvh8i9ihdm"; } + { n = "model"; h = "0n8855ma1h2as0skrrp2qy3sdkmnhl5vlqxcjv8xlc3faa72174a"; } + { n = "outline"; h = "07i2spmzghs49pkxl8z9c29n6l38x26v20prkh4a7i1rf9whg1q8"; } + { n = "preferences"; h = "0d1m8pb903wpc4vvhsp0gx0h65r432ax898wif3a23c5wxj4nh9i"; } + { n = "text"; h = "0z80d9qgpbx88jrq8b4r478lrcrf52gxqkl94l13wrk7rszjpldh"; } + ]; + + propagatedBuildInputs = [ antlr-runtime_4_7 ]; + + meta = with stdenv.lib; { + description = "Adds support for JSON files to Eclipse"; + homepage = https://github.com/boothen/Json-Eclipse-Plugin; + license = licenses.epl10; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.7.1a"; + version = "4.7.2"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/org.eclipse.jdt-4.7.1a.zip; - sha256 = "1hpvpj8ghfk8aqbzfrpcxw3wxrczq6zd3bpx4sxjrsi926jsjaf4"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/org.eclipse.jdt-4.7.2.zip; + sha256 = "1yzqnjs88cdyyqv8f1g8fbfyccci29f3pzxxvaz7szxicwzn59mz"; }; meta = with stdenv.lib; { @@ -424,16 +532,16 @@ rec { spotbugs = buildEclipsePlugin rec { name = "spotbugs-${version}"; - version = "3.1.0.r201710241414-11c9895"; + version = "3.1.2.r201802250230-59118d9"; srcFeature = fetchurl { url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs"; + sha256 = "1p0pz7znpfi5h1wr60sl8clkpd7rzkh7krmc0nxc6w43gkgkg9h4"; }; srcPlugin = fetchurl { url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas"; + sha256 = "1z3jjbcjif4qip1gx2dhfcm9fyhps96ms7z3ngbdcakgw7wai9v4"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 9d5848f02637769433610ec271b8987808474fdc..832dc3c0e799734a203e3db513baaf03f5085027 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "ed-${version}"; version = "1.14.2"; @@ -11,27 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm"; }; - unpackCmd = "tar --lzip -xf"; - nativeBuildInputs = [ lzip ]; - /* FIXME: Tests currently fail on Darwin: - - building test scripts for ed-1.5... - testing ed-1.5... - *** Output e1.o of script e1.ed is incorrect *** - *** Output r3.o of script r3.ed is incorrect *** - make: *** [check] Error 127 - - */ - doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform); - - installFlags = [ "DESTDIR=$(out)" ]; - - configureFlags = [ - "--exec-prefix=${stdenv.cc.prefix}" - "CC=${stdenv.cc.prefix}cc" - ]; + doCheck = true; # not cross; meta = { description = "An implementation of the standard Unix editor"; @@ -54,4 +36,9 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; -} +} // stdenv.lib.optionalAttrs (hostPlatform != buildPlatform) { + # This may be moved above during a stdenv rebuild. + preConfigure = '' + configureFlagsArray+=("CC=$CC") + ''; +}) diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index e5e64a32e977990b4369ccd3576721707a153014..862739b4ed01836986b27fee1aad0a437787f143 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchurl, spidermonkey, unzip, curl, pcre, readline, openssl, perl, html-tidy }: +{ stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }: stdenv.mkDerivation rec { name = "edbrowse-${version}"; - version = "3.6.1"; + version = "3.7.3"; - nativeBuildInputs = [ unzip ]; - buildInputs = [ curl pcre readline openssl spidermonkey perl html-tidy ]; + buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; patchPhase = '' - substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\" for i in ./tools/*.pl do substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl" done ''; - NIX_CFLAGS_COMPILE = "-I${spidermonkey}/include/mozjs-31"; makeFlags = "-C src prefix=$(out)"; - src = fetchurl { - url = "http://edbrowse.org/${name}.zip"; - sha256 = "1grkn09r31nmvcnm76jkd8aclmd9n5141mpqvb86wndp9pa7gz7q"; + src = fetchFromGitHub { + owner = "CMB"; + repo = "edbrowse"; + rev = "v${version}"; + sha256 = "19qdxigp0qv5vyy0hpn0czcc8papvivsjrxx7p367ihizm39yzla"; }; meta = with stdenv.lib; { description = "Command Line Editor Browser"; @@ -35,6 +34,5 @@ stdenv.mkDerivation rec { homepage = http://edbrowse.org/; maintainers = [ maintainers.schmitthenner maintainers.vrthra ]; platforms = platforms.linux; - broken = true; # no compatible spidermonkey }; } diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 0267d3cba8a811c73076577e42eca07f6f46a319..958066e21066c4485828dc7b9d9e3fe8c919a9d2 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -54,10 +54,10 @@ }) {}; adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "adaptive-wrap"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.1.el"; - sha256 = "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll"; + url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.2.el"; + sha256 = "1qcf1cabn4wb34cdmlyk3rv5dl1dcrxrbaw38kly1prs6y4l22aw"; }; packageRequires = []; meta = { @@ -95,10 +95,10 @@ ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ahungry-theme"; - version = "1.8.0"; + version = "1.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar"; - sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar"; + sha256 = "14q5yw56n82qph09bk7wmj5b1snhh9w0nk5s1l7yn9ldg71xq6pm"; }; packageRequires = [ emacs ]; meta = { @@ -135,10 +135,10 @@ arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "arbitools"; - version = "0.71"; + version = "0.94"; src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.71.el"; - sha256 = "1ghf5yla126n7xpn2sc2vg7q8arp7iv2z5f9r9l38vxm6dvnxp50"; + url = "https://elpa.gnu.org/packages/arbitools-0.94.el"; + sha256 = "00iq8rr1275p48ic5mibcx657li723q8r7ax4g21w6bzwsj3gksd"; }; packageRequires = [ cl-lib ]; meta = { @@ -175,10 +175,10 @@ }) {}; auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auctex"; - version = "11.91.0"; + version = "12.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-11.91.0.tar"; - sha256 = "1yh182mxgngjmwpkyv2n9km3vyq95bqfq8mnly3dbv78nwk7f2l3"; + url = "https://elpa.gnu.org/packages/auctex-12.1.1.tar"; + sha256 = "10l96569dy9pfp8bm64pndhk1skg65kqhsyllwfa0zvb7mjkm70l"; }; packageRequires = []; meta = { @@ -239,6 +239,19 @@ license = lib.licenses.free; }; }) {}; + bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "bbdb"; + version = "3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bbdb-3.2.tar"; + sha256 = "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bbdb.html"; + license = lib.licenses.free; + }; + }) {}; beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "beacon"; version = "1.3.3"; @@ -387,10 +400,10 @@ }) {}; company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; - version = "0.9.4"; + version = "0.9.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.4.tar"; - sha256 = "1wm2nzjfn9cmjb6f5yvawrss7pg1r0swwwqqx602wg8hjrsiabay"; + url = "https://elpa.gnu.org/packages/company-0.9.6.tar"; + sha256 = "0w1jqhs87g0sqhv2iw6a5i8f4yjkrc65fb3h6vyv11sb8kfnhda7"; }; packageRequires = [ emacs ]; meta = { @@ -483,10 +496,10 @@ }) {}; csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "csv-mode"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.6.el"; - sha256 = "1v86qna1ypnr55spf6kjiqybplfbb8ak5gnnifh9vghsgb5jkb6a"; + url = "https://elpa.gnu.org/packages/csv-mode-1.7.el"; + sha256 = "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6"; }; packageRequires = []; meta = { @@ -551,10 +564,10 @@ debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }: elpaBuild { pname = "debbugs"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.14.tar"; - sha256 = "07wgcvg038l88gxvjr0gjpjhyk743w22x1rqghz3gkmif0g70say"; + url = "https://elpa.gnu.org/packages/debbugs-0.15.tar"; + sha256 = "1x7jw2ldgkknyxg7x9fhnqkary691icnysmi3xw0g2fjrvllzhqw"; }; packageRequires = [ cl-lib soap-client ]; meta = { @@ -700,10 +713,10 @@ ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "ebdb"; - version = "0.4.2"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.4.2.tar"; - sha256 = "1j9hgxa6csj3iz5vrl22xvhl9lxhig0n1cixgzhs1sb3z3nn2li6"; + url = "https://elpa.gnu.org/packages/ebdb-0.5.2.tar"; + sha256 = "09ff6kf74r6hg3m6lryrjr2rrczm9h702jpkap71xrj0fk4zfb5c"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -752,15 +765,15 @@ license = lib.licenses.free; }; }) {}; - el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: + el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.3.2"; + version = "1.6.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.3.2.tar"; - sha256 = "0lf0hk2pvy9yrb02sa3bg0hipshbgl9m4hx7db46jvmz5bf15nfq"; + url = "https://elpa.gnu.org/packages/el-search-1.6.5.tar"; + sha256 = "1iw13ifyrga2r2xz63zhjxiy541jy4p2rp3a8fgb22sjw1zi8n7w"; }; - packageRequires = [ emacs stream ]; + packageRequires = [ cl-print emacs stream ]; meta = { homepage = "https://elpa.gnu.org/packages/el-search.html"; license = lib.licenses.free; @@ -848,10 +861,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.15"; + version = "0.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.15.tar"; - sha256 = "1y7nqry9y0a99bsdqkk9f554vczfw4sz6raadw3138835qy697jg"; + url = "https://elpa.gnu.org/packages/exwm-0.18.tar"; + sha256 = "1shz5bf4v4gg3arjaaldics5qkg3aiiaf3ngys8lb6qyxhcpvh6q"; }; packageRequires = [ xelb ]; meta = { @@ -918,10 +931,10 @@ gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; - version = "0.3.3"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.3.3.tar"; - sha256 = "0h3ps26sy4wp1s9vpsj066fpqjqacjlprz3kb09macgsg88k2c1p"; + url = "https://elpa.gnu.org/packages/gited-0.4.3.tar"; + sha256 = "07sjrh7900v5gkjzac2hh05ygywp6k4803ikc3wj3x22yrc9l8bx"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -929,6 +942,20 @@ license = lib.licenses.free; }; }) {}; + gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "gle-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gle-mode-1.1.el"; + sha256 = "0p9glalhkf8i4486pjwvrb9z4lqxl6jcqfk6jrjl6b1xi72xmdi0"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gle-mode.html"; + license = lib.licenses.free; + }; + }) {}; gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnome-c-style"; version = "0.1"; @@ -945,10 +972,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.3.1"; + version = "1.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.3.1.tar"; - sha256 = "1g6xldkc6l6zlzd1slqizbbd5b9k4pbr66nrf5svidgiy7mlifw5"; + url = "https://elpa.gnu.org/packages/gnorb-1.4.2.tar"; + sha256 = "1892j8gdbcny6b9psxa1lwxsb1gkj9z9z00rfc62kdw8bffmx38y"; }; packageRequires = [ cl-lib ]; meta = { @@ -1013,10 +1040,10 @@ }) {}; hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "hook-helpers"; - version = "1.1"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hook-helpers-1.1.tar"; - sha256 = "0xvabl0lfc0ijr98clsyh0bqk2fdi1ncl0knn58j2p30gn9958i5"; + url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar"; + sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im"; }; packageRequires = [ emacs ]; meta = { @@ -1053,10 +1080,10 @@ }) {}; hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "hyperbole"; - version = "6.0.2"; + version = "7.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hyperbole-6.0.2.tar"; - sha256 = "0nyihi7j2061jpdzl4mf4pki840hkfpwj0m2sqz0nqxd689ckwpg"; + url = "https://elpa.gnu.org/packages/hyperbole-7.0.2.tar"; + sha256 = "1hgwa740941a9s5wf1cqf76h3af8qbiiw9sc76biz6m3vx0hy1zs"; }; packageRequires = [ emacs ]; meta = { @@ -1079,10 +1106,10 @@ }) {}; iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "iterators"; - version = "0.1"; + version = "0.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/iterators-0.1.el"; - sha256 = "0rljqdaj88cbhngj4ddd2z3bfd35r84aivq4h10mk4n4h8whjpj4"; + url = "https://elpa.gnu.org/packages/iterators-0.1.1.el"; + sha256 = "1r2cz2n6cr6wal5pqiqi5pn28pams639czgrvd60xcqmlr3li3g5"; }; packageRequires = [ emacs ]; meta = { @@ -1092,10 +1119,10 @@ }) {}; ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ivy"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.9.1.tar"; - sha256 = "1jfc3zf6ln7i8pp5j0fpsai2w847v5g77b5fzlxbgvj80g3v5887"; + url = "https://elpa.gnu.org/packages/ivy-0.10.0.tar"; + sha256 = "01m58inpd8jbfvzqsrwigzjfld9a66nf36cbya26dmdy7vwdm8xm"; }; packageRequires = [ emacs ]; meta = { @@ -1133,10 +1160,10 @@ js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "js2-mode"; - version = "20170721"; + version = "20180301"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20170721.tar"; - sha256 = "02w2hgk8qbmwkksqf1dmslpr3xn9zjp3srl3qh8730w8r8s8czni"; + url = "https://elpa.gnu.org/packages/js2-mode-20180301.tar"; + sha256 = "0kcs70iygbpaxs094q6agsjs56sz03jy4fwk178f9hr93x95pynx"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1359,10 +1386,10 @@ mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "mines"; - version = "1.2"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mines-1.2.tar"; - sha256 = "1xwnw2hyk1qz98mdnckk0i05li0gzygq12kkmrlidxnk7ngbq9vw"; + url = "https://elpa.gnu.org/packages/mines-1.6.tar"; + sha256 = "1199s1v4my0qpvc5aaxzbqayjn59vilxbqnywvyhvm7hz088aps2"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1396,14 +1423,29 @@ license = lib.licenses.free; }; }) {}; - multishell = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "mmm-mode"; + version = "0.5.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/mmm-mode-0.5.6.tar"; + sha256 = "1vwsi8sk1i16dvz940c6q7i75023hrw07sc4cpmcz06rj8r68gr0"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/mmm-mode.html"; + license = lib.licenses.free; + }; + }) {}; + multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { pname = "multishell"; version = "1.1.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/multishell-1.1.5.tar"; sha256 = "0g38p5biyxqkjdkmxlikvhkhkmafyy3ibd012q83skaf8fi4cv1y"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/multishell.html"; license = lib.licenses.free; @@ -1411,10 +1453,10 @@ }) {}; muse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "muse"; - version = "3.20"; + version = "3.20.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/muse-3.20.tar"; - sha256 = "0i5gfhgxdm1ripw7j3ixqlfkinx3fxjj2gk5md99h70iigrhcnm9"; + url = "https://elpa.gnu.org/packages/muse-3.20.2.tar"; + sha256 = "0g2ff6x45x2k5dnkp31sk3bjj92jyhhnar7l5hzn8vp22l0rv8wn"; }; packageRequires = []; meta = { @@ -1465,10 +1507,10 @@ nhexl-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "nhexl-mode"; - version = "0.2"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-0.2.el"; - sha256 = "0qrzpkxxdwi2b3136yj5agvaxwr9g2c58kpmjmjpfhpc6yyyx5x0"; + url = "https://elpa.gnu.org/packages/nhexl-mode-0.5.el"; + sha256 = "02z2mx39m96s7v5d8sh6hxb5p70qzbagjfa3lavfw10zjim8g9wl"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1517,10 +1559,10 @@ }) {}; num3-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "num3-mode"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/num3-mode-1.2.el"; - sha256 = "1nm3yjp5qs6rq4ak47gb6325vjfw0dnkryfgybgly0m6h4hhpbd8"; + url = "https://elpa.gnu.org/packages/num3-mode-1.3.el"; + sha256 = "0x2jpnzvpbj03pbmhsny5gygh63c4dbl4g3k0cfs3vh4qmp2dg6w"; }; packageRequires = []; meta = { @@ -1570,10 +1612,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20171113"; + version = "9.1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20171113.tar"; - sha256 = "0yynbzxbsjv0z12ydjgz81ysbg2irq37d9pzar8wspdjij15dypb"; + url = "https://elpa.gnu.org/packages/org-9.1.10.tar"; + sha256 = "01vvq6m7r2ifyflvq5ga241qvl4j62smz0zr6jljk56b6nqi20lm"; }; packageRequires = []; meta = { @@ -1621,6 +1663,19 @@ license = lib.licenses.free; }; }) {}; + paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "paced"; + version = "1.1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/paced-1.1.3.tar"; + sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/paced.html"; + license = lib.licenses.free; + }; + }) {}; parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "parsec"; @@ -1661,6 +1716,19 @@ license = lib.licenses.free; }; }) {}; + posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "posframe"; + version = "0.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/posframe-0.3.0.el"; + sha256 = "0q74lwklr29c50qgaqly48nj7f49kgxiv70lsvhdy8cg2v082v8k"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/posframe.html"; + license = lib.licenses.free; + }; + }) {}; psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "psgml"; version = "1.3.4"; @@ -1677,10 +1745,10 @@ python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; - version = "0.25.2"; + version = "0.26.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.25.2.el"; - sha256 = "1ac2ipyg49sb0lz3n0ykj2s6592abd38l5d1cpbmv73j13l8zq5i"; + url = "https://elpa.gnu.org/packages/python-0.26.1.el"; + sha256 = "1dpw2w2nk6ggr8pz293qysjkiya3i7k25i447fbycjil59anzpb3"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1716,10 +1784,10 @@ }) {}; rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "rainbow-mode"; - version = "0.13"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-0.13.el"; - sha256 = "1d3aamx6qgqqpqijwsr02ggwrh67gfink1bir0692alfkm3zdddl"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.el"; + sha256 = "1mg9dbgvg79sphpic56d11mrjwx668xffx5z5jszc9fdl5b8ygml"; }; packageRequires = []; meta = { @@ -1727,6 +1795,19 @@ license = lib.licenses.free; }; }) {}; + rbit = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "rbit"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rbit-0.1.el"; + sha256 = "0h0f9jx4xmkbyxk39wibrvnj65b1ylkz4sk4np7qcavfjs6dz3lm"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/rbit.html"; + license = lib.licenses.free; + }; + }) {}; rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "rcirc-color"; version = "0.3"; @@ -1756,10 +1837,10 @@ realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }: elpaBuild { pname = "realgud"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-1.4.4.tar"; - sha256 = "1nc8km339ip90h1j55ahfga03v7x7rh4iycmw6yrxyzir68vwn7c"; + url = "https://elpa.gnu.org/packages/realgud-1.4.5.tar"; + sha256 = "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24"; }; packageRequires = [ cl-lib @@ -1908,10 +1989,10 @@ sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "sml-mode"; - version = "6.7"; + version = "6.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sml-mode-6.7.el"; - sha256 = "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x"; + url = "https://elpa.gnu.org/packages/sml-mode-6.8.el"; + sha256 = "105fcrz5qp95f2n3fdm3awr6z58sbrjihjss6qnrg4lz2ggbc328"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1972,6 +2053,19 @@ license = lib.licenses.free; }; }) {}; + sql-indent = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "sql-indent"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sql-indent-1.1.tar"; + sha256 = "06q41msfir178f50nk8fnyc1rwgyq5iyy17pv8mq0zqbacjbp88z"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/sql-indent.html"; + license = lib.licenses.free; + }; + }) {}; stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "stream"; version = "2.2.4"; @@ -2201,10 +2295,10 @@ }) {}; vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "vlf"; - version = "1.7"; + version = "1.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vlf-1.7.tar"; - sha256 = "007zdr5szimr6nwwrqz9s338s0qq82r006pdwgcm8nc41jsmsx7r"; + url = "https://elpa.gnu.org/packages/vlf-1.7.1.tar"; + sha256 = "0cnwxk20573iqkwk0c0h7pyjk0rkr8l2qd0xmyqj8mvdxjb8nnkz"; }; packageRequires = []; meta = { @@ -2280,10 +2374,10 @@ }) {}; which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "which-key"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.0.2.tar"; - sha256 = "1s7bq7vq9xsf2pz1w03l743yzaxm9gk5qgympcwlkiq90ph13vcn"; + url = "https://elpa.gnu.org/packages/which-key-3.1.0.tar"; + sha256 = "17n09i92m7qdicybxl60j81c8fn7jcx25wds0sb7j8i364psjabq"; }; packageRequires = [ emacs ]; meta = { @@ -2347,10 +2441,10 @@ xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; - version = "0.12"; + version = "0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.12.tar"; - sha256 = "0i9n0f3ibj4a5pwcsvwrah9m0fz32m0x6a9wsmjn3li20v8pcb81"; + url = "https://elpa.gnu.org/packages/xelb-0.14.tar"; + sha256 = "09flnbjy9ck784kprz036rwg9qk45hpv0w5hz3pz3zhwyk57fv74"; }; packageRequires = [ cl-generic emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 0212451bef057d9e78de982b0f67f8a159e8c684..0cea8f0a7316cd96d4e4f713fbbb2564fb6aaf93 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -36,9 +36,12 @@ self: }; overrides = { + # upstream issue: missing footer + ebdb-i18n-chn = markBroken super.ebdb-i18n-chn; el-search = markBroken super.el-search; # requires emacs-25 iterators = markBroken super.iterators; # requires emacs-25 midi-kbd = markBroken super.midi-kbd; # requires emacs-25 + rcirc-menu = markBroken super.rcirc-menu; # Missing file header stream = markBroken super.stream; # requires emacs-25 cl-lib = null; # builtin tle = null; # builtin diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index 634c654d58fcc15e46ec7daec3765368a355aa57..8e1d7092e6a1c744c9de041a98eadb22665f6b78 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = http://emacs-w3m.namazu.org/; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix index 7b7004b72f306611bfb32d768a544e2b58c2d921..733393307d3ff3e0f2714a2f289b857c18de7d9c 100644 --- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix @@ -2,11 +2,11 @@ melpaBuild { pname = "font-lock-plus"; - version = "20170222.1755"; + version = "20180101.25"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/font-lock+.el"; - sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30"; + url = "https://www.emacswiki.org/emacs/download/font-lock%2b.el?revision=25"; + sha256 = "0197yzn4hbjmw5h3m08264b7zymw63pdafph5f3yzfm50q8p7kp4"; name = "font-lock+.el"; }; diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index f0d120dd8030ab293fa26c3a11ef8737621ce726..2277ebef4ff08cec531a2a8f7032fc2e34697362 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -2,25 +2,25 @@ let modules = [ - { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; } - { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; } - { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; } - { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; } - { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; } - { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; } - { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; } - { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; } - { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; } - { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; } - { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; } - { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; } - { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; } + { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; } + { name = "icicles-chg.el"; sha256 = "1kqlhisg5g9ycylzqiwxrmmgfw2jw599wisz26wvi48lac2icgg7"; } + { name = "icicles-cmd1.el"; sha256 = "17cpw798bl6p77cmjl7lwdnxa1qpw4z1wacjq2mdc8fh81cyw3am"; } + { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; } + { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } + { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } + { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } + { name = "icicles-fn.el"; sha256 = "1sn56z5rjsvqsy3vs7af7yai0c0qdjvcxvwwc59rhswrbi6zlxz5"; } + { name = "icicles-mac.el"; sha256 = "1wyvqzlpq5n70mggqijb8f5r5q9y1hxxngp64sixy0xszy5d12dk"; } + { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; } + { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } + { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; } + { name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; } ]; forAll = f: map f modules; in stdenv.mkDerivation rec { - version = "2017-10-28"; + version = "2018-04-16"; name = "icicles-${version}"; srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 2fcdf08aac4212699fa026212417d68632f5457d..aec089f43dee607463c7c85958eb5cf6734e7840 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -145,6 +145,27 @@ license = lib.licenses.free; }; }) {}; + abgaben = callPackage ({ f, fetchFromGitLab, fetchurl, lib, melpaBuild, pdf-tools, s }: + melpaBuild { + pname = "abgaben"; + version = "20171118.2246"; + src = fetchFromGitLab { + owner = "akoehn"; + repo = "abgaben"; + rev = "20d14830f07d66e2a04bcad1498a4a6fbf4b4451"; + sha256 = "0apcbfaa70kgrpjjsfbr0lg9lcfiijpx5bms4sbzc606vlnxxn0d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2b0aa60aa0edf33205e0fcb309be779ad8da08ec/recipes/abgaben"; + sha256 = "1xywghyp6aahzin1ygwzqfg9640dliycl4g02jz3gpix8hd3g8gy"; + name = "abgaben"; + }; + packageRequires = [ f pdf-tools s ]; + meta = { + homepage = "https://melpa.org/#/abgaben"; + license = lib.licenses.free; + }; + }) {}; abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abl-mode"; @@ -208,27 +229,6 @@ license = lib.licenses.free; }; }) {}; - ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-anaconda"; - version = "20160221.1123"; - src = fetchFromGitHub { - owner = "proofit404"; - repo = "ac-anaconda"; - rev = "94f66b4d4bf0fd9683ee77511833b1eceace0462"; - sha256 = "15xkwnadqjkbgvilyfldj7z5kz2wvw1dk2bcgphx2z9qwjc7wd5f"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda"; - sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf"; - name = "ac-anaconda"; - }; - packageRequires = [ anaconda-mode auto-complete dash ]; - meta = { - homepage = "https://melpa.org/#/ac-anaconda"; - license = lib.licenses.free; - }; - }) {}; ac-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-c-headers"; @@ -250,48 +250,6 @@ license = lib.licenses.free; }; }) {}; - ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-cake"; - version = "20140315.929"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-ac-cake"; - rev = "f34c9e3ba8cb962e4708c8f53b623e1922500176"; - sha256 = "1llpnb9vy612sg214i76rxnzcl3qx8pqnixczc5pik9kd3fdaz5f"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2257db76719cb1e3e2f79aff2b61073b655f9061/recipes/ac-cake"; - sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl"; - name = "ac-cake"; - }; - packageRequires = [ auto-complete cake ]; - meta = { - homepage = "https://melpa.org/#/ac-cake"; - license = lib.licenses.free; - }; - }) {}; - ac-cake2 = callPackage ({ auto-complete, cake2, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-cake2"; - version = "20140320.8"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-ac-cake2"; - rev = "ffbb679c0d5c261b05abde06d8d1d1e5d5990b6a"; - sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b8b728c2caed96d7505cafc42d0d7ed49d6cadcd/recipes/ac-cake2"; - sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy"; - name = "ac-cake2"; - }; - packageRequires = [ auto-complete cake2 ]; - meta = { - homepage = "https://melpa.org/#/ac-cake2"; - license = lib.licenses.free; - }; - }) {}; ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-capf"; @@ -320,8 +278,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "ac-cider"; - rev = "d8670939bbf88079263d5ace2b8bc04cf325be36"; - sha256 = "01g1h2j0rfih8v0yvvr5gjh3abcj2mz3jmfbis8a60ivmngab732"; + rev = "fa13e067dd9c8c76151c7d140a2803da1d109b84"; + sha256 = "1pklmjldnm8bf34f5q8x983d1m72l3kf51ns9vh6z704mkhv658f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8adefaf2e284ef91baec3dbd3e10c868de69926/recipes/ac-cider"; @@ -337,12 +295,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "20170615.838"; + version = "20180318.1124"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd"; - sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57"; + rev = "daddbea033d3c6f934e5043cc2fff8eca3b6e5f7"; + sha256 = "1hp3xpv0kwmilfivif2smbbgknjyk8kcgp399dghdcq71qsxz3wr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -383,8 +341,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859"; - sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym"; + rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; + sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -715,12 +673,12 @@ ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-octave"; - version = "20170220.1728"; + version = "20180405.2034"; src = fetchFromGitHub { owner = "coldnew"; repo = "ac-octave"; - rev = "f131ed6859a0945ac0c0520d2ab076f16ce7314c"; - sha256 = "0aigfydmfw284qkhajzxhnl5zx41v5z6ip0kjwmwgphqyxay7nih"; + rev = "fe0f931f2024f43de3c4fff4b1ace672413adeae"; + sha256 = "1yj5fapbp79k88k1cxrmmf91fb0j6s4s7f2dhk2afcf7z83mqkwb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave"; @@ -736,12 +694,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "20170110.2036"; + version = "20171201.134"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "217fc49cc8ededd96ab8b7f656ef80fb905c3f4a"; - sha256 = "0dg494qivcb8y87hzkby4qi1cr4pn7fl079yjwrwq54qpwq60jgw"; + rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115"; + sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -757,12 +715,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20171112.1900"; + version = "20180323.503"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "217fc49cc8ededd96ab8b7f656ef80fb905c3f4a"; - sha256 = "0dg494qivcb8y87hzkby4qi1cr4pn7fl079yjwrwq54qpwq60jgw"; + rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115"; + sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -803,8 +761,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "dadd74f015f89317ff77424be30a9accadeeb4a4"; - sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -880,6 +838,27 @@ license = lib.licenses.free; }; }) {}; + academic-phrases = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: + melpaBuild { + pname = "academic-phrases"; + version = "20180318.438"; + src = fetchFromGitHub { + owner = "nashamri"; + repo = "academic-phrases"; + rev = "0823ed8c24b26c32f909b896a469833ec4d7b656"; + sha256 = "0qfzsq8jh05w4zkr0cvq3i1hdn97bq344vcqjg46sib26x3wpz6r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe4323043fb875c0252861800e61fdd0a51ed453/recipes/academic-phrases"; + sha256 = "18y6lff7xwg6hczwgavwp32848gnlmc30afra9x7m8wmdddps1bh"; + name = "academic-phrases"; + }; + packageRequires = [ dash emacs ht s ]; + meta = { + homepage = "https://melpa.org/#/academic-phrases"; + license = lib.licenses.free; + }; + }) {}; ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-flyspell"; @@ -1009,12 +988,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20171109.1250"; + version = "20180308.100"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "3bc7a61a9d7923bb71066906e17cb8a0db415c24"; - sha256 = "0dalspw44ra9ik7f1lflmck76ar0v6qig700qczlml52lr9vf045"; + rev = "fae5d508ff519ba1fab21c51f46c0906fd82229f"; + sha256 = "118dp8w0z475j67gvl1dj137glbli2ykbm934vdvlz6q0k94vds7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1072,12 +1051,12 @@ ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-popup-menu"; - version = "20170518.2244"; + version = "20171231.2215"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "eae1b0ea1a56cc1da2543e95570867a1a026669d"; - sha256 = "1w1q0r104v9fngzi3q8l6gwzb0c9gdq2jmbjb372j7969py73ywc"; + rev = "7b436a0d9e896463d00afbeb7e49a59cc6670e9c"; + sha256 = "0ma5hq0v4kczf7mn1wkqj9pxjy47wryd697gg37l4sszl6ylcs9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1093,12 +1072,12 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20171109.1032"; + version = "20180123.1111"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "c875ffbe64f9193eff00ff779b7e1ae0195a4316"; - sha256 = "0pmiia3ydw632685lm834pps9hvibnkbrpaf08ny3c5yi9qyd08p"; + rev = "208ea2a4e809f0c91caf3354b44a8f4a4f1cbb73"; + sha256 = "1bkck2gbbgxhh1swzkdsyk5vp9h08dv8skc5hr4ncgxy2fq8m27g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1173,15 +1152,36 @@ license = lib.licenses.free; }; }) {}; + adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "adafruit-wisdom"; + version = "20180224.1652"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "adafruit-wisdom.el"; + rev = "aafc01726f1b3160321d40160298a0e1b054b382"; + sha256 = "18p55zghycsx88dn0iw610fklkhi5chzycrpjb4xzs5x1l5l2v08"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; + sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad"; + name = "adafruit-wisdom"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/adafruit-wisdom"; + license = lib.licenses.free; + }; + }) {}; add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-hooks"; - version = "20170705.2205"; + version = "20171216.1723"; src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "5e18cc3887477aeec41a34f608d9aa55bfa92d0e"; - sha256 = "05a0ayqjldl53s3zmfgmdqq8jf1qw1m2a2sj4qzn2bci0dgsakcp"; + rev = "1845137703461fc44bd77cf24014ba58f19c369d"; + sha256 = "02s9mv26ycypn4qfshrh17v1hsys2q9vffxj3g4lgq0lykplvkkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1302,12 +1302,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20170915.1249"; + version = "20180225.240"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "3b567902ccbec4ed9b8c5f5cd369be833e485e79"; - sha256 = "1ihhmz4ww6iqbjbv1cvssixn01bkd2cl8pij7p32dxyyd8jdwlkq"; + rev = "77b4f50c5372bf219da496567b2b867261f0d354"; + sha256 = "0kwp6bb8fwv76x9r35rz4mvwica1fsappp82rjr1xlhnwwdsc120"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1364,11 +1364,11 @@ }) {}; ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahg"; - version = "20171003.39"; + version = "20180125.944"; src = fetchhg { url = "https://bitbucket.com/agriggio/ahg"; - rev = "6a4cc7a7eee6"; - sha256 = "09c3rawxqxxbl648bq1akawmgwiwppzd9g2sspza0k52adsb3rps"; + rev = "622b519d8586"; + sha256 = "14jayh9bn8f6mjiln6h7ny404g0iy8zr7b6s6faqqhd840h519mz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg"; @@ -1405,12 +1405,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20171103.2238"; + version = "20180130.1928"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "9ec7fca8002b213c7eee1168258e36a683190d18"; - sha256 = "01gjmyxb0m6i321md77wscqrhy30gyhrk4fjcx7mg2z9hzxvzljb"; + rev = "a038d91ec593d1f1b19ca66a0576d59bbc24c523"; + sha256 = "0f86xp7l8bv4z5dgf3pamjgqyiq3kfx9gbi9wcw0m6lbza8db15a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1426,12 +1426,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20170623.958"; + version = "20180410.2106"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "0c0f8efbeaefa49ef04c0c4405b1ef79ecc5433e"; - sha256 = "08hkx5wf9qyh4d5s5z4v57d43qkzw6p8zsqijw92wy4kngv1gl78"; + rev = "8b528fbae0e557461315bed82883275d58df41f2"; + sha256 = "1xydgf9w0i2anpmjhy8m0zv1hql4gb37i11xfn6xzwna572z1ml9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1468,12 +1468,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "alchemist"; - version = "20171029.2307"; + version = "20180312.604"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "4beb4c9ceee0534a36f7669aa35fcbdfd6bef7b7"; - sha256 = "0k1k5rb95nyndzhin47r4nzap4fp3dr57gv557wzy3a6jpl88fgz"; + rev = "6f99367511ae209f8fe2c990779764bbb4ccb6ed"; + sha256 = "12f95rwxs11sqf1w9pnf6cxc2lh2jz4nqkq33p8b5yamnl8cq9kg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1493,8 +1493,8 @@ src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "ea0d3a25ca2b45d08c510ad55b3d8a5374b2ec43"; - sha256 = "18rfn6608sxwv8r0kdrzhag58kf1822xmy7h9gw1ci7mfpq2i1ns"; + rev = "2582122c41cd34d034b6bbe71469f5ceb1de40c7"; + sha256 = "11miyk48p09327ivmsk1hiw0brnx1pgjvdrfsdfhcwhbv2cafnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1510,12 +1510,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20170825.1009"; + version = "20180322.1408"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "ded94ab1421994aa863a4d7538ec7453768ec235"; - sha256 = "1616vkjgn5g4xf40p15847pkqyrlfzp9d143a4cyk7za50a175ll"; + rev = "f61eec647abd9981139c720811e1c4e2501f250c"; + sha256 = "0hfhk2bnhml2sc1i7i4py06x9sph1g7qa50x6bffkxx92ry4wvl0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1531,12 +1531,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20171024.1907"; + version = "20180403.38"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "206d7095c93a25bb41af17cd26fd3967ddd57e00"; - sha256 = "1lyvq0zkamlyv3z23x8hb8dirjd45bihqhmwdgilnw3y139vhm4l"; + rev = "667d9c7848c723eb392ab9bacae07966da3e3504"; + sha256 = "04nrl7kg5pprfdxjbqjyh7vw0vs22bplhhpaf30v3hw7k7nkc0ky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -1591,22 +1591,22 @@ license = lib.licenses.free; }; }) {}; - all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: + all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20171011.324"; + version = "20180125.757"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "b93707e3a3a7a4968b3e212b890edfe265dcd57d"; - sha256 = "09hyg0fs3qgyc6dbn23pw8p7w2m9xvkf5cz8v0f18a7fkvq2j2f9"; + rev = "52d1f2d36468146c93aaf11399f581401a233306"; + sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; name = "all-the-icons"; }; - packageRequires = [ emacs font-lock-plus memoize ]; + packageRequires = [ emacs memoize ]; meta = { homepage = "https://melpa.org/#/all-the-icons"; license = lib.licenses.free; @@ -1636,12 +1636,12 @@ all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-gnus"; - version = "20170726.619"; + version = "20180108.153"; src = fetchFromGitHub { owner = "nlamirault"; repo = "all-the-icons-gnus"; - rev = "45560293e42d02c17c332894f3764dd624d25444"; - sha256 = "1j0s3m54gyrl50bqss6xaijja1hdbm5285py750dn4ykrj5m3d3r"; + rev = "61830f1da0f8ad8e9235133f5470daeb50d2de41"; + sha256 = "19hjy14yalw736cjqbgm3dv4cly545k57ac16vj6c6jalb7wi0l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus"; @@ -1657,12 +1657,12 @@ all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-ivy"; - version = "20170508.25"; + version = "20180225.630"; src = fetchFromGitHub { owner = "asok"; repo = "all-the-icons-ivy"; - rev = "5357bccddfd30580d5859f3794248efb86a8a054"; - sha256 = "1n6c7vglxkib4irjjafiwdz6cifbb20229n2fpnxkv57hmdarivr"; + rev = "52b3f4a8a4a038998943afaffb5ff25054f65af4"; + sha256 = "1xkrqv6znf1savkg17w41d9rm7wrs8n3c4ad0arrmi522qgp78fr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy"; @@ -1678,12 +1678,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20161124.550"; + version = "20180111.602"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "11e27444692bbf0eb38ec28af6bd041618c5c091"; - sha256 = "1qcag5sjg2p64lllgy237j8gkm7vp2kxr6wppkps5wgkf7bn4q4z"; + rev = "01fd19e0d635ccaf8e812364d8720733f2e84126"; + sha256 = "040g07k2hcwqspansjqfpng0lxzkmip26ipz26q6mvkpwm2wilv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1729,12 +1729,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20161213.912"; + version = "20180207.945"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "8fbae3a9965f933c487f4cfdf2d881753d9feeb1"; - sha256 = "0knzfxdncb1x41zqknv70p62zwr4k5nxf8l108x9w043drxc10lw"; + rev = "366698400c555211c2082962a5d74f3dd79a78c8"; + sha256 = "1kzb15aqy7n2wxibmnihya7n6ajs34jxp9iin96n758nza92m59c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -1768,22 +1768,22 @@ license = lib.licenses.free; }; }) {}; - amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "amx"; - version = "20170923.835"; + version = "20180313.857"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "amx"; - rev = "88ab7ccb2a88b5cd3ecc4d703ae9373df3e4971c"; - sha256 = "1n1zsrlj272scl4xcbys86d6gxnaq08vp5frd96i47c1an75p0xw"; + rev = "f2b030121e59b9b3c8f05218e6c673bc6d69125e"; + sha256 = "10369f68wzpxb01bmk35yhm1z99wj0vm5d6ivdq5n6lard5afgvy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx"; sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap"; name = "amx"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/amx"; license = lib.licenses.free; @@ -1792,12 +1792,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20170924.704"; + version = "20180209.1147"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "89fc16d50b889a17521084347b28f3011b84e113"; - sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g"; + rev = "384f1c5995a96c2687cea7cf18ff5710d00a39c2"; + sha256 = "0qk1cd39pqjfm9hpgwm6xb205rgcka9jxfdkw3fcay3rmj3qyzws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1915,6 +1915,27 @@ license = lib.licenses.free; }; }) {}; + anki-editor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "anki-editor"; + version = "20180210.633"; + src = fetchFromGitHub { + owner = "louietan"; + repo = "anki-editor"; + rev = "a4a018d49e7c1fb01386216be6b8572b5ca33f94"; + sha256 = "15mwbg0yrv8vs2wgn7vb2psk6qw29vivq778hxg7k9f4ak7kn7ls"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8155d649e4b129d0c72da6bb2b1aac66c8483491/recipes/anki-editor"; + sha256 = "18c5p82llq11vg1svqvbjrcnm7695nbbc6pwwl9jdjplasar585l"; + name = "anki-editor"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/anki-editor"; + license = lib.licenses.free; + }; + }) {}; annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "annotate"; @@ -2086,12 +2107,12 @@ anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anti-zenburn-theme"; - version = "20160725.1559"; + version = "20180121.353"; src = fetchFromGitHub { owner = "m00natic"; repo = "anti-zenburn-theme"; - rev = "164122ebb7a39c41b953e90fe05cf440c5335d9e"; - sha256 = "1l3z6wi2im7cax08ml3gsaik5hvpf0nzxcl4zlchskmgjbzav704"; + rev = "c80cc51bb1aaf11dd53b9d08e01d61bc9b32622f"; + sha256 = "1c97d2jkh7iawgsbcg19gha9ffnxypbcfz0sgcsgf9vy4bvnc350"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f6f803dc99a1b1fdb5b4e79f1c9cf72b702d091/recipes/anti-zenburn-theme"; @@ -2167,194 +2188,6 @@ license = lib.licenses.free; }; }) {}; - anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything"; - version = "20170125.1710"; - src = fetchgit { - url = "http://repo.or.cz/r/anything-config.git"; - rev = "9e2259fc779eef1a3e947e74cc7d301d1cea0ca6"; - sha256 = "1rl60k9imk5wma2xnx1s0av7rzgjjbaw7nkb539vwk4pwj1kmqqq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything"; - sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj"; - name = "anything"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/anything"; - license = lib.licenses.free; - }; - }) {}; - anything-exuberant-ctags = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-exuberant-ctags"; - version = "20140316.1637"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "anything-exuberant-ctags"; - rev = "8ed688fd526751e044435bb77135f5315c8167e5"; - sha256 = "0dbf510gcd0m191samih0r4lx6d7sgk0ls0sx2jrdkyacy82ridy"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/66cae648d534468e5e9f125679847fb876935f68/recipes/anything-exuberant-ctags"; - sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk"; - name = "anything-exuberant-ctags"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-exuberant-ctags"; - license = lib.licenses.free; - }; - }) {}; - anything-git-files = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-git-files"; - version = "20130609.243"; - src = fetchFromGitHub { - owner = "tarao"; - repo = "anything-git-files-el"; - rev = "efeec4f8001e2a95f36a9c31181bb30f7561015c"; - sha256 = "0gj0p7420wx5c186kdccjb9icn656sg5b0zwnwy3fjvhsbbvrb2r"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7f69f8362790ef4a9200f99a8f7ac3770b402b97/recipes/anything-git-files"; - sha256 = "13giasg8lh5968plva449ki9nc3478a63700f8c0yghnwjb77asw"; - name = "anything-git-files"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-git-files"; - license = lib.licenses.free; - }; - }) {}; - anything-git-grep = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-git-grep"; - version = "20130608.1940"; - src = fetchFromGitHub { - owner = "mechairoi"; - repo = "anything-git-grep"; - rev = "6ee26e68bb8ec23ffacf5c5f9698c451a4bc905c"; - sha256 = "06fyvk7cjz1aag6fj52qraqmr23b0fqwml41yyid8gjxl4ygmkpv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/784a04ab60ef0862105d2bec309994d3a755c043/recipes/anything-git-grep"; - sha256 = "1kw88fvxil9l80w8zn16az7avqplyf2m0l7kp431wb5b1b1508jl"; - name = "anything-git-grep"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-git-grep"; - license = lib.licenses.free; - }; - }) {}; - anything-milkode = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, milkode }: - melpaBuild { - pname = "anything-milkode"; - version = "20140518.743"; - src = fetchFromGitHub { - owner = "ongaeshi"; - repo = "anything-milkode"; - rev = "d6b2be13a351c41793e9cc13c1320953939d3ac9"; - sha256 = "1jw6gqwcl3fx1m7w0a15w2pnzzlqyr1fbg0m81ay358s4w3jn6v7"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/124d55605500c30ca7b01ae31eec3f3da51a2c7e/recipes/anything-milkode"; - sha256 = "1apc865a01jyx602ldzj32rrjk6xmgnxdccpjpcfgh24h2aqpdan"; - name = "anything-milkode"; - }; - packageRequires = [ anything milkode ]; - meta = { - homepage = "https://melpa.org/#/anything-milkode"; - license = lib.licenses.free; - }; - }) {}; - anything-prosjekt = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }: - melpaBuild { - pname = "anything-prosjekt"; - version = "20140129.4"; - src = fetchFromGitHub { - owner = "abingham"; - repo = "prosjekt"; - rev = "a864a8be5842223043702395f311e3350c28e9db"; - sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6d359ec827573dd8c871c4f23df5d1737f1830e7/recipes/anything-prosjekt"; - sha256 = "15kgn0wrnbh666kchijdlssf2gp7spgbymr2nwgv6k730cb4mfa8"; - name = "anything-prosjekt"; - }; - packageRequires = [ anything prosjekt ]; - meta = { - homepage = "https://melpa.org/#/anything-prosjekt"; - license = lib.licenses.free; - }; - }) {}; - anything-replace-string = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-replace-string"; - version = "20140317.336"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "anything-replace-string"; - rev = "1962f24243d6013bcef7e8d23136277d42e13130"; - sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39b7f3a8de2f7728b374c09a1387beb3f7595d2e/recipes/anything-replace-string"; - sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71"; - name = "anything-replace-string"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-replace-string"; - license = lib.licenses.free; - }; - }) {}; - anything-sage = callPackage ({ anything, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }: - melpaBuild { - pname = "anything-sage"; - version = "20141005.413"; - src = fetchFromGitHub { - owner = "stakemori"; - repo = "anything-sage"; - rev = "370b4248935dd4527127954788a028399644f578"; - sha256 = "08xr6fkk1r4r5jqh349d4dfal9nbs2a8y2fp8zn3zlrj2cd0g80k"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/07be4b11bbddb376e11616525e7b226c5a9f2296/recipes/anything-sage"; - sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3"; - name = "anything-sage"; - }; - packageRequires = [ anything cl-lib sage-shell-mode ]; - meta = { - homepage = "https://melpa.org/#/anything-sage"; - license = lib.licenses.free; - }; - }) {}; - anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-tramp"; - version = "20170708.1834"; - 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 ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anzu"; @@ -2463,12 +2296,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20171022.2203"; + version = "20180318.1515"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "79422b610f2c3d9f52fb35449485a2fc541bc5a0"; - sha256 = "0i2k975szdgzmrbwkvcnhrk73ndvk0q215fn68sb5m4zf43ifwxz"; + rev = "d80ae8d80520786dd5527e53c0a9374534168d41"; + sha256 = "0v2bnndrhvdkk5qa3rzzdl83471i00s0cxbvrsl8ijcm6xpc0m1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2547,12 +2380,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20171010.1420"; + version = "20180223.1526"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "b4d5a2fedec176d3562943668609766fab0b23ff"; - sha256 = "0y31zx6npv03ygjywy23pvrpvjwi1fh1qhs1qzxsi25pbbk1hkq0"; + rev = "019ed5cf8f1e1abfead7adceeda88938dfe928b7"; + sha256 = "0x6iw9dr3zvy2xqxadlxkjhpkfgig009x0ilipdji20hpa0qhhgm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2568,11 +2401,11 @@ apt-sources-list = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apt-sources-list"; - version = "20171004.1143"; + version = "20180311.437"; src = fetchgit { url = "https://git.korewanetadesu.com/apt-sources-list.git"; - rev = "842c3896f660295e4c16938aa1fd195e5d377460"; - sha256 = "1d1v2h91vabqdrjcrdnzqj4xzmm7gbad4mxcphrj5yfnc4rrfc12"; + rev = "fd12fbacf245714be5ca20563572cb49e2f1eb45"; + sha256 = "0kfz9gj66a9wqcdrvxg4hzndmh1j01wqfqkdrblplgni4h7907a4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/141a22e593415302d64cf8ebd2635a1baf35eb38/recipes/apt-sources-list"; @@ -2648,22 +2481,22 @@ license = lib.licenses.free; }; }) {}; - arduino-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + arduino-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "arduino-mode"; - version = "20151017.2335"; + version = "20180305.1916"; src = fetchFromGitHub { - owner = "bookest"; + owner = "stardiviner"; repo = "arduino-mode"; - rev = "3e2bad4569ad26e929e6db2cbcff0d6d36812698"; - sha256 = "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c"; + rev = "40bc53149b517ebfa448b07f0b766f24d612f716"; + sha256 = "0rh8rmi7y1a4myf6pa51qhr9sa1arjfbrr6rzbsdlwcbzinfj83f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e21ef938877444097d6d9cb7769819e2acb77cff/recipes/arduino-mode"; - sha256 = "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2db785f52c2facc55459e945ccb4d4b088506747/recipes/arduino-mode"; + sha256 = "1amqah0sx95866ikdlc7h7n9hmrwaqizc0rj0gliv15kjjggv55v"; name = "arduino-mode"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/arduino-mode"; license = lib.licenses.free; @@ -2676,8 +2509,8 @@ src = fetchFromGitLab { owner = "ukaszg"; repo = "aria2"; - rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0"; - sha256 = "1xkgz3l7idw5bk1xlffdaddf5v1q6fm3grbryl4xvssrbwgnyisf"; + rev = "7a944c5100812269369225af7aa9580fedab175f"; + sha256 = "1pwnx6k7b35xhwqvzd3rl6rf5ydvbrrdmbadns8w0iyz2yafdxji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89a55e7c313066ae1bc0db0af5c289814c85fcb1/recipes/aria2"; @@ -2739,8 +2572,8 @@ src = fetchFromGitHub { owner = "sachac"; repo = "artbollocks-mode"; - rev = "4a907e470bf345b88c3802c1241ce2b8cf4123ee"; - sha256 = "1l1dwhdfd5bwx92k84h5v47pv9my4p4wj0wq8hrwvwzwlv8dzn2w"; + rev = "33a41ca4f8206f57e5498a526d3b0ea18d08bb93"; + sha256 = "06a2dp6nwy8xjr01k6d2c611qr2n9m7hdkrz9fci9r4rv1ikx5xv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode"; @@ -2840,12 +2673,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20171015.2239"; + version = "20180408.844"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "424ecd8a28cd59fe7d2de3cb4b37a4224e34c123"; - sha256 = "0zmbg3r6sykmchy8hhbw8glzl8xvki030rzg9r55v4g61k8qy13r"; + rev = "8bb64e398897d1cc000fc295c5157b4ad1a7bd5b"; + sha256 = "04384akcxirvfcl5rb07hj5xaw2crsgnhbnwyh1dkmy56qak60a1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -2924,12 +2757,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20170803.916"; + version = "20180305.1454"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "6ad96e25f8b46942380afbc33e3659a5e9fa09b1"; - sha256 = "06gf26r00yq1whrws9ilra8l2xfg2x89vxbgx3vgbwlvwx9wcsm6"; + rev = "7b73ab795286fe121d23026dcc94d6a0a211e4c4"; + sha256 = "1w5j773zg6lz8vq9yqfx2w5076h53k0narcnknni8hd8z4qg6b6q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2945,12 +2778,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "20171022.107"; + version = "20180322.301"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "1bd79fc940d2be82eaec20aca2069677e156a697"; - sha256 = "1j5brpmbahnrp8kxphq10g0l703czdalqa731y3s2p3m3gida54x"; + rev = "d6577d61981a8bf293928eddaa6b83d22d59bd8c"; + sha256 = "0qi5g5js885hp0xkwib12zbz84sganb8lnrps48097zlkcxppm3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -2963,6 +2796,27 @@ license = lib.licenses.free; }; }) {}; + attrap = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: + melpaBuild { + pname = "attrap"; + version = "20180218.1243"; + src = fetchFromGitHub { + owner = "jyp"; + repo = "attrap"; + rev = "0a733deccaf48350511346b2f5a51d328df4dfc8"; + sha256 = "1ck6m30m76jad7w4mwnpv2gl0kzsjpjvmgjblc5a4gw1wsz3i2iz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b7420eca80a8c1776d68b1f121511cc265cc70dc/recipes/attrap"; + sha256 = "1gxnrlsn9xcnnx0nhjxnhrz9bdpk2kpzjhj8jhjmwws9y361fimh"; + name = "attrap"; + }; + packageRequires = [ dash emacs f flycheck s ]; + meta = { + homepage = "https://melpa.org/#/attrap"; + license = lib.licenses.free; + }; + }) {}; auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; @@ -3047,24 +2901,45 @@ license = lib.licenses.free; }; }) {}; - auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: + aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "aurora-config-mode"; + version = "20180216.1502"; + src = fetchFromGitHub { + owner = "bdd"; + repo = "aurora-config-mode.el"; + rev = "8273ec7937a21b469b9dbb6c11714255b890f410"; + sha256 = "1dlhf35hhjgkd9bqbpwrb825g1z6nh14mg31jg2avv55s28j0riy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode"; + sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; + name = "aurora-config-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/aurora-config-mode"; + license = lib.licenses.free; + }; + }) {}; + auth-source-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "auth-password-store"; - version = "20171109.1045"; + pname = "auth-source-pass"; + version = "20180326.8"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "72f7b8827e3ce73a8e418e5c219b50856f48ac26"; - sha256 = "19rfaxcarikf5jwwyyzqpcrhphrr71nqs9cw0w3zjrp7z0cbzxsf"; + rev = "5690092e40c790384692d8e8da3451e6878d8c17"; + sha256 = "1dv202z8briifd4aqn8yvn4kd6zi1cabb2p86qcjj40lzkgn6w3p"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; - sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5"; - name = "auth-password-store"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass"; + sha256 = "0icwdwz2zy3f9ynksr81pgq482iapsbx8lpyssiklyw0xgd1k8ak"; + name = "auth-source-pass"; }; - packageRequires = [ cl-lib emacs password-store seq ]; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/auth-password-store"; + homepage = "https://melpa.org/#/auth-source-pass"; license = lib.licenses.free; }; }) {}; @@ -3113,12 +2988,12 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20170817.1437"; + version = "20180321.807"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a"; - sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa"; + rev = "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f"; + sha256 = "013vw4sgw6hpz7kskilndv7i7ik40asrkgicghjbygwk0lj5ran3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -3449,12 +3324,12 @@ auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-indent-mode"; - version = "20161118.1458"; + version = "20171221.2106"; src = fetchFromGitHub { owner = "mattfidler"; repo = "auto-indent-mode.el"; - rev = "7e939f3a7b092c6c32c97d63fd88aef6cc355cdb"; - sha256 = "18c9469b53kwydhrpd8kivwvs0w0ndfbwkyxixjz9wijp0wmpri1"; + rev = "28069360a7f89ad0286fd6a53db550752ec58488"; + sha256 = "14sqmv320ryfljpxbjw9xphj6bz1ccjk3ih4cm1r8aryyhxiacii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49af78177278e7072c70fde0eaa5bb82490ebe9d/recipes/auto-indent-mode"; @@ -3470,12 +3345,12 @@ auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-minor-mode"; - version = "20170917.1437"; + version = "20180401.245"; src = fetchFromGitHub { owner = "joewreschnig"; repo = "auto-minor-mode"; - rev = "07ea9df59c5364d1938beef3dfbba24afd46c230"; - sha256 = "007w6j6zhjv2647njh80vfbrhjzhmb8rx9yi9rf94fhf17z8pmk3"; + rev = "c0aa31d9385ec809969288d0029c7a6db319690f"; + sha256 = "0fzw91d1ysv82g2mfwc5f1a1zq1ih9f6i26hk9jyyqp5izx9ydfw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; @@ -3488,22 +3363,22 @@ license = lib.licenses.free; }; }) {}; - auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-org-md"; - version = "20160923.708"; + version = "20180213.1543"; src = fetchFromGitHub { owner = "jamcha-aa"; repo = "auto-org-md"; - rev = "7604c06c1b2f1d01c2e88f114bb0d2d00f21dabb"; - sha256 = "18js1pa60095fs8qjzhjhkx9sjwa2h2iribb27gqv59796qxkfsg"; + rev = "9318338bdb7fe8bd698d88f3af89b2d6413efdd2"; + sha256 = "1dzxc1f4yvj8xww5drcpzmn3fyi8ziimh1cmy6l3i399l1zl0njj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39f934f86b5dc04078c204bcbd268af60857e268/recipes/auto-org-md"; sha256 = "1yh9g8407kym6r0b8kr18qshxlrkw47ac17a9lvql0ksshfmnqvk"; name = "auto-org-md"; }; - packageRequires = [ emacs org ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/auto-org-md"; license = lib.licenses.free; @@ -3512,12 +3387,12 @@ auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-package-update"; - version = "20170803.1005"; + version = "20180323.1547"; src = fetchFromGitHub { owner = "rranelli"; repo = "auto-package-update.el"; - rev = "0b296970d09d7deb7f780cb041fcbc313d39aa5d"; - sha256 = "1nicx2sjnmf3i7dlzi788rh2kjc7mj9q69knp3g2x72zxqy8x07d"; + rev = "85c64d11ccfffd58527ef39cac390a88c5b6d979"; + sha256 = "0pg9qw63ii4268hwzz7sj9g6rkmxr956849fpa2rwbfzfhjmns2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update"; @@ -3614,6 +3489,27 @@ license = lib.licenses.free; }; }) {}; + auto-sudoedit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auto-sudoedit"; + version = "20171227.156"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "auto-sudoedit"; + rev = "5a6f7da018fbb880c4c51032b39d7628a478989c"; + sha256 = "190izcami97h2yzw267crs0xny494b9b58dmmb7bqslv38ayl396"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7cf6bc8bb7b618d74427622b9b2812daa79a3767/recipes/auto-sudoedit"; + sha256 = "1clp52fqxsilyi62p1cabhan55lbwax6fqlhccyjbl36yrdig3fh"; + name = "auto-sudoedit"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/auto-sudoedit"; + license = lib.licenses.free; + }; + }) {}; auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }: melpaBuild { pname = "auto-virtualenv"; @@ -3638,12 +3534,12 @@ auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }: melpaBuild { pname = "auto-virtualenvwrapper"; - version = "20170916.1304"; + version = "20180408.310"; src = fetchFromGitHub { owner = "robert-zaremba"; repo = "auto-virtualenvwrapper.el"; - rev = "0f2cc8ea8f211c7b88f852ae6ffe677914652b92"; - sha256 = "1vm2nf7i9v56v57r7ckz8i1y3fk5s302bcfglywqysm4b8k36mp8"; + rev = "e2628408d4e67e1b1714cf7682cff9405e735c81"; + sha256 = "1cj4a6yay02gvi04lyhnfb7gws8jrappprnv36mcqlq053202wij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; @@ -3680,12 +3576,12 @@ autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autobookmarks"; - version = "20171021.1532"; + version = "20180131.535"; src = fetchFromGitHub { owner = "Fuco1"; repo = "autobookmarks"; - rev = "b40c69f2d1c419adad516bee81b07b99110e5cc3"; - sha256 = "0dailajx26dixlibqps5wfh224ps7azm453lmzxjc2d10mgapi5v"; + rev = "93610f22500ac207f86e159d411de15082a8befb"; + sha256 = "1ydqc2ry43sibf8xa99w2w6prxh5gmlmcinp0z67yhdcz4dh4v2v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks"; @@ -3785,12 +3681,12 @@ autotest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autotest"; - version = "20150130.225"; + version = "20171128.1812"; src = fetchFromGitHub { owner = "zenspider"; repo = "elisp"; - rev = "164ae0f8302c1e1938a9e30597901b1164b43f96"; - sha256 = "1mgkwaa0q672r3lmw267ax54z4bvc3v3zji3q9asygni9bymkfyz"; + rev = "ee8a9c3052446876057ff853369d136aea7831f5"; + sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc2c4a590cbeccfb43003972a78f5d76ec4a9e7/recipes/autotest"; @@ -3890,12 +3786,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20171001.235"; + version = "20180406.2220"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "bf781eec7d46cce829ac5bdb114e728a110366e7"; - sha256 = "0bj51ii8vsd2gwyykxp1hvkp4r9kbc0b7ajskf8i5vb8qvpvkali"; + rev = "6abf91ecdaeb16a3a5529b0d5abef9756da1f68c"; + sha256 = "0hvg8yp7prfl1n71lkyr9l43f3zm1zsh8n2mh26rmdw2chippr4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes"; @@ -3911,12 +3807,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20171111.921"; + version = "20180415.1259"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "91032912146f16c09987d8d35083f09809d6afaa"; - sha256 = "15v05r8hnk2adywfsfkxglbankllq880d4rqw0z7yf30k9l2533k"; + rev = "08370cdbc35ff41646461a02d6d9758dfce30c20"; + sha256 = "08pgyj3mab6iqbb029wixvvjfc634iln0ij6lxnvpvgy4298iw9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -3953,12 +3849,12 @@ avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy-menu"; - version = "20170518.2245"; + version = "20171231.2220"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "c36e28cabbcea8fdd2ada723b9a28ecc35a2d6c0"; - sha256 = "14ci1saksmhnnk5a7dy2v9dbsw7c030524vwb3y1wpw0vv863zjh"; + rev = "b133564cc438870d9b5505c8104611c8998fd0d5"; + sha256 = "19xqs4hyd5wkh0vd3xfbfwhf8fhq5lbzrafx4fbvai24dhjn5rhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -3974,12 +3870,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20171031.915"; + version = "20180104.624"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "5598fd25e483d8521e6d5f691802fa125947d7cf"; - sha256 = "1gkn1qbywv8as3csp5s1fwmrp89bmbqgyl7av0c1v9ggx7gkhd5f"; + rev = "526494a2ae86b66a22848e5dc274480e3b4d04ca"; + sha256 = "04fkgiixfd0xgb2m0b48ngv2fmvz2vnjajfl1b59paczz8pnw96l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4034,18 +3930,39 @@ license = lib.licenses.free; }; }) {}; + aws-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "aws-snippets"; + version = "20180410.845"; + src = fetchFromGitHub { + owner = "baron42bba"; + repo = "aws-snippets"; + rev = "a2ebae582a8c8a5f5f16dbc42ecd2ded9d70fca8"; + sha256 = "08mbi5g321n4ir7a7ggxmh7qpl8pr06pg4rcsk8pklylvkf89k2w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets"; + sha256 = "1p2il4ig3nafsapa87hgghw6ri9d5qqi0hl8zjyypa06rcnag9g9"; + name = "aws-snippets"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/aws-snippets"; + license = lib.licenses.free; + }; + }) {}; axiom-environment = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; - version = "20171111.1152"; + version = "20180401.1257"; src = fetchgit { - url = "https://bitbucket.org/pdo/axiom-environment.git"; - rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5"; - sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0"; + url = "https://bitbucket.org/pdo/axiom-environment"; + rev = "6842fb7f85df839acde395093647e2f91cf62fdd"; + sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/axiom-environment"; - sha256 = "0lr2kdm6jr25mi6s6mpahb8r56d3800r7jgljjdiz4ab36zqvgz3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/axiom-environment"; + sha256 = "1hzfxdwhgv0z9136k7bdjhqjrkawsjmvqch6za6p7nkpd9ikr2zb"; name = "axiom-environment"; }; packageRequires = [ emacs ]; @@ -4124,6 +4041,27 @@ license = lib.licenses.free; }; }) {}; + backup-each-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "backup-each-save"; + version = "20180226.2157"; + src = fetchFromGitHub { + owner = "conornash"; + repo = "backup-each-save"; + rev = "3c414b9d6b278911c95c5b8b71819e6af6f8a02a"; + sha256 = "13pliz2ra020hhxcidkyhfa0767n188l1w5r0vpvv6zqyc2p414i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/caa478356d20b5b0e9a450f7b4a8b25937e583a4/recipes/backup-each-save"; + sha256 = "1l7lx3vd27qypkxa0cdm8zbd9fv08xn1bf6xj6g9c49ql95xbyiv"; + name = "backup-each-save"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/backup-each-save"; + license = lib.licenses.free; + }; + }) {}; backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "backup-walker"; @@ -4173,8 +4111,8 @@ src = fetchFromGitHub { owner = "ccann"; repo = "badger-theme"; - rev = "80fb9f8ace37b2e8807da639f7da499a53ffefd4"; - sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1"; + rev = "493d672d5a5478976da7d5ca752008cc7837c57f"; + sha256 = "0mrn3sl1xq19k6v4mw98zqgs11fidnarvidmxayx805k21pana6v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/298e43769c6cd855526d847e8e3b237912360777/recipes/badger-theme"; @@ -4208,15 +4146,36 @@ license = lib.licenses.free; }; }) {}; + banner-comment = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "banner-comment"; + version = "20180403.1438"; + src = fetchFromGitHub { + owner = "WJCFerguson"; + repo = "banner-comment"; + rev = "9b1c9a94f8b6789c890a7e7eedd6f60ad5aa4d52"; + sha256 = "02wsnmzbb60d4a8bsb5kywdwcfsqb6chcchs5v2d0s3sacakbmnl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment"; + sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc"; + name = "banner-comment"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/banner-comment"; + license = lib.licenses.free; + }; + }) {}; bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bar-cursor"; - version = "20160923.920"; + version = "20180226.1645"; src = fetchFromGitHub { owner = "ajsquared"; repo = "bar-cursor"; - rev = "afa1d4bc1937610cc30575d71aab85ea20ebf2ea"; - sha256 = "1cj28v48xajy1nsqk92vinaz2rh1crm5g58ma5gnibkdnkpq828s"; + rev = "20cb59bedc3532a712fe7feeff3660ebd72a8107"; + sha256 = "06b0nkcp8yjixps72nrgk2zmljc9f71cdr96jdpgssydfhn4pcdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/932e7b128f092ec724ebf18c9c5ca84e16edc82c/recipes/bar-cursor"; @@ -4229,15 +4188,36 @@ license = lib.licenses.free; }; }) {}; + bart-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bart-mode"; + version = "20180131.1829"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "bart-mode"; + rev = "6feeb8f9badbc2ce4b60499bf7bf4acdae4cfed7"; + sha256 = "1i1fcrwcswdqwb59154yzijccv7n0fqvm0ck3d8dqx5vczzmqixh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8f9cb09c07cb9fdef15de3e8dbfb6725d97dff6f/recipes/bart-mode"; + sha256 = "0wyfsf7kqfghnci9rlk9x0rkai6x7hy3vfzkgh7s2yz081p1kfam"; + name = "bart-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bart-mode"; + license = lib.licenses.free; + }; + }) {}; base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20171111.1245"; + version = "20180320.2254"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "cb75b17eeab07a79147fc3e600170e6c35c4b18d"; - sha256 = "0igwdq41y5bd2jd7x3rmaxjqrjfyxwp5xyl5zx8rp0gql8jbn6qb"; + rev = "69a96c1061d1d783a44f70fd811d49541762caf9"; + sha256 = "1mg158w81vivar7lrya8qk46zghs2b7inmdckjcs8qw7w078cwav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4253,12 +4233,12 @@ bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bash-completion"; - version = "20170924.1021"; + version = "20180303.1144"; src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "31bc1c1c21691668c6cc16a46361490d5bec303a"; - sha256 = "0iq9q0isaynrjhzgkm5hvw26162m52vbzwf12vic5nr9frxbxkv5"; + rev = "6aedd690006e07199b2fcd319b9b840a527650e5"; + sha256 = "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; @@ -4295,12 +4275,12 @@ basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "basic-mode"; - version = "20171027.1114"; + version = "20171204.1217"; src = fetchFromGitHub { owner = "dykstrom"; repo = "basic-mode"; - rev = "7a76ec2d45f6bc1e4b5a4c8996c4bf27a31741e6"; - sha256 = "02q9sxx9g8pqyiknbzy48qbmnvgl1pmcgsppbk7rybb68kq5zlqd"; + rev = "b7e851f844e9a5264e44936d1675133b4c3ed39c"; + sha256 = "0q29inrdk9i4rgx3a0km62lzn796hh24365cc3kzylx74g53a3qf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode"; @@ -4355,22 +4335,43 @@ license = lib.licenses.free; }; }) {}; - bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bazel-mode"; + version = "20180222.2253"; + src = fetchFromGitHub { + owner = "codesuki"; + repo = "bazel-mode"; + rev = "b7aa14516feaed40ee4910eafa81db719de0fe56"; + sha256 = "16yjxs62h8dm63nzc04i60bnbyhm2vrpvn98ap8rad6wib2ka3vj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode"; + sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586"; + name = "bazel-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bazel-mode"; + license = lib.licenses.free; + }; + }) {}; + bbcode-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbcode-mode"; - version = "20141103.1341"; + version = "20180326.1410"; src = fetchFromGitHub { - owner = "ejmr"; + owner = "lassik"; repo = "bbcode-mode"; - rev = "b6ff1bfb8041b1435ebfc0a7d8e5e34eeb1b6aae"; - sha256 = "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7"; + rev = "4a6df9eff9da9cb98d53164a585f2c69d8399e3a"; + sha256 = "1gzx7s96fd6r9xgzp29d1w102rxkyr1mywhyvzcdslszbcrjc0r1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/bbcode-mode"; - sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode"; + sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb"; name = "bbcode-mode"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/bbcode-mode"; license = lib.licenses.free; @@ -4378,11 +4379,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20171017.817"; + version = "20180330.2018"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/bbdb.git"; - rev = "339aa15f20e1f542db97a3f3d2d65a61ce5c0e93"; - sha256 = "00782y1vas8rd9g30jqhnc24bsqsy5c31qn85ipi1vc8lrbyfcg1"; + rev = "e0eff7e1ee5003f7c557a83d655a7fc0b6b45fcc"; + sha256 = "0qalxasfckqqgngsafplrp9j1pcism17bn0h53qs8pfj9gxkng5q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; @@ -4419,12 +4420,12 @@ bbdb-csv-import = callPackage ({ bbdb, dash, fetchFromGitLab, fetchurl, lib, melpaBuild, pcsv }: melpaBuild { pname = "bbdb-csv-import"; - version = "20140802.442"; + version = "20180121.1649"; src = fetchFromGitLab { owner = "iankelling"; repo = "bbdb-csv-import"; - rev = "dc9e722d1c1fcd55b71625ee3f05a4921851d186"; - sha256 = "0jkrznrfdh562bwy0adg1pzmqh6i766b5ki41g4pr9wcbmh937sn"; + rev = "dbc2e0fe9e8ae65e494011044d905ae79b3cee3e"; + sha256 = "0n52arydcsmarkpqqwxvw686cypl7iz73kzizirdjhcqmzimx9pl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/bbdb-csv-import"; @@ -4503,12 +4504,12 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20171007.722"; + version = "20180206.641"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "584af0efa4809252bb37cf165df029410198327e"; - sha256 = "17cmlc49y26j2salkmcsck9618s1p7y49phiy7hvzkipa13qmj9w"; + rev = "9f0de9cad13801891ffb590dc09f51ff9a7cb225"; + sha256 = "0q0i1j8ljfd61rk6d5fys7wvdbym9pz5nhwyfvmm0ijmy19d1ppz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac"; @@ -4566,12 +4567,12 @@ beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "beeminder"; - version = "20160209.1903"; + version = "20180413.1229"; src = fetchFromGitHub { owner = "Sodaware"; repo = "beeminder.el"; - rev = "a4e159250bac89bc25ced8523a5eac2a951cd5b6"; - sha256 = "0ki9q3ylssjabh15dr49k7dxv88snpj4564g0myp3c61qzyy82lk"; + rev = "3fcee7a7003a37171ddb59171c7f4b5dd4b34349"; + sha256 = "0phiyv4n5y052fgxngl3yy74akb378sr6manx21s360gnxzcblwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/beeminder"; @@ -4612,8 +4613,8 @@ src = fetchFromGitHub { owner = "dholm"; repo = "benchmark-init-el"; - rev = "8e4c32f32ec869fe521fb4d3c0a69406830b4178"; - sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2"; + rev = "7a0f263282bbc86b01b662636306f22813082647"; + sha256 = "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0/recipes/benchmark-init"; @@ -4692,12 +4693,12 @@ better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-shell"; - version = "20170215.1020"; + version = "20180209.1207"; src = fetchFromGitHub { owner = "killdash9"; repo = "better-shell"; - rev = "4ee06b8791f7363a19109d9ea6c5ee95ce998d33"; - sha256 = "08w3z4srbz478rmnnzjmbbd5bknady417x7s0r3nxszkxfpn3iy5"; + rev = "2e9f2f3e7945c27988c50d8de43e681662d6a467"; + sha256 = "1ccvfpfdkqb1ga7jqq0kgvifa5gqnilb4nn8ghlbxik1901xvr5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell"; @@ -4794,15 +4795,36 @@ license = lib.licenses.free; }; }) {}; + bibliothek = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pdf-tools }: + melpaBuild { + pname = "bibliothek"; + version = "20180327.1422"; + src = fetchFromGitHub { + owner = "cadadr"; + repo = "elisp"; + rev = "35424f7360f5110833b7a9f4f53907b9e222be85"; + sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek"; + sha256 = "011wnya65vfnn17fn1vhq0sk8c1mli81x0nb44yi6zl1hwxivb55"; + name = "bibliothek"; + }; + packageRequires = [ a emacs pdf-tools ]; + meta = { + homepage = "https://melpa.org/#/bibliothek"; + license = lib.licenses.free; + }; + }) {}; bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bibretrieve"; - version = "20170906.1036"; + version = "20171125.727"; src = fetchFromGitHub { owner = "pzorin"; repo = "bibretrieve"; - rev = "41b9a77e49d6c2e6e6f854fb8b1b45b2967c2f86"; - sha256 = "0rmb5qw9lj7xzwcw3haz6a22gpcb61cgkks194lq1w03gayj61rd"; + rev = "da7b8c49e723e2327ab1d8625824389fb5324a80"; + sha256 = "02rr46wfhv3mdmzlqznvxwms4rzq25xl1dqicbr75xwg5mjbg8si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve"; @@ -4902,16 +4924,16 @@ bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "bind-chord"; - version = "20170717.1152"; + version = "20171204.1210"; src = fetchFromGitHub { - owner = "waymondo"; - repo = "use-package-chords"; - rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026"; - sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds"; + owner = "jwiegley"; + repo = "use-package"; + rev = "512aa50b025018cb8574498d868814f73c02bb9b"; + sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord"; - sha256 = "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord"; + sha256 = "1hyhs3iypyg5730a20axcfzrrglm4nbgdz8x1ifkaa0iy5zc9hb0"; name = "bind-chord"; }; packageRequires = [ bind-key key-chord ]; @@ -4923,12 +4945,12 @@ bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bind-key"; - version = "20161218.1520"; + version = "20171210.2125"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc"; - sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l"; + rev = "512aa50b025018cb8574498d868814f73c02bb9b"; + sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5028,12 +5050,12 @@ bitbake = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, s }: melpaBuild { pname = "bitbake"; - version = "20160613.156"; + version = "20180326.58"; src = fetchFromGitHub { owner = "canatella"; repo = "bitbake-el"; - rev = "4d9f0a4ffb7b9c6cd4d8271f1b429ca1bb7e9130"; - sha256 = "0c8f6w8pgbr63g1zhgppfyh5g3sb0iv31ywqmvp6467766di4qh9"; + rev = "e5088c4b3dfb4feb96850fbc281b4207d23c7713"; + sha256 = "0x765j9vks8r34kkqr9chlfy7dng71rciighk12fgiksqsl82qb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da099b66180ed537f8962ab4ca727d2441f9691d/recipes/bitbake"; @@ -5130,6 +5152,27 @@ license = lib.licenses.free; }; }) {}; + blacken = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "blacken"; + version = "20180402.435"; + src = fetchFromGitHub { + owner = "proofit404"; + repo = "blacken"; + rev = "528527c832710aa1ceeb4c42ef85b5a37d2e213a"; + sha256 = "1my234bsv5db99hhr66n2yhh3knvv4xwg7q05y408qbhrcf3ya5l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/69d9802996a338be937d61678f2cadf3497f6b85/recipes/blacken"; + sha256 = "16lbs76jkhcq0vg09x1n8mrd4pgz5bdjsprr9260xr7g3dx8xacc"; + name = "blacken"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/blacken"; + license = lib.licenses.free; + }; + }) {}; blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "blgrep"; @@ -5277,6 +5320,27 @@ license = lib.licenses.free; }; }) {}; + bmx-mode = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "bmx-mode"; + version = "20180324.857"; + src = fetchFromGitHub { + owner = "josteink"; + repo = "bmx-mode"; + rev = "7450c29f5c1f5f67b02bca1c89f06cdf01855f41"; + sha256 = "0knxsmlp1agfs5sj5iz13b8igjx4gpk1lj36wzh1rdiwcxicnr49"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7f456d2b2b8f5a33bcb0f2ffd19e6e0276950f24/recipes/bmx-mode"; + sha256 = "04g8l4cw20k3yhbija9mz1l4nx3bzhzj7nb35s0xdyvwbc2mhrwb"; + name = "bmx-mode"; + }; + packageRequires = [ cl-lib company dash emacs s ]; + meta = { + homepage = "https://melpa.org/#/bmx-mode"; + license = lib.licenses.free; + }; + }) {}; bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bnfc"; @@ -5301,12 +5365,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "20161109.1647"; + version = "20180113.759"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "cf7817de3f37ce2404ee637a655f1a511b829585"; - sha256 = "0h166w8bg864ppwg64m0vhg649mmkclld85zcd0lmbqa9wfml5j5"; + rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611"; + sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -5319,15 +5383,36 @@ license = lib.licenses.free; }; }) {}; + bolt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bolt-mode"; + version = "20180310.10"; + src = fetchFromGitHub { + owner = "mpontus"; + repo = "bolt-mode"; + rev = "85a5a752bfbebb4aed884326c25db64c000e9934"; + sha256 = "03nxcmpm5n8jcca39ivrl7cjqz3gzsl3w6qc30hcp278qf2jq6va"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9e35f0e37db90d906fccd08fb25b673c88d3b8/recipes/bolt-mode"; + sha256 = "03x89k8v0m9kv1fhyys2gwympb70qlmg7gdib8wsmdxs34ys5igz"; + name = "bolt-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bolt-mode"; + license = lib.licenses.free; + }; + }) {}; bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bongo"; - version = "20170312.808"; + version = "20171118.1842"; src = fetchFromGitHub { owner = "dbrock"; repo = "bongo"; - rev = "1961b2e05c01c03d0dd6527988d1348610359d0d"; - sha256 = "0alm2kq32sxxc7708djxhgd3xnzlglynqjqp9af0y308ryajmdgn"; + rev = "3d246be1e8d14865f5253567ab8fee5d4e9c470c"; + sha256 = "1zxk6x08gmir3qv07xanlsd2fb777jdbfzdksv1qh6srxbk3qfjq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/692428769cd792dc0644641682c2793103dd00c6/recipes/bongo"; @@ -5406,12 +5491,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20170825.416"; + version = "20180319.526"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "13fca1929639e2239e9b4be060cbd4befd7921b4"; - sha256 = "0nbwmb4l2f6y58gx8bm42688y6sqc33l5sf0gh1vmn2ki2mq7jvh"; + rev = "b4cf42bbc531032404da88e8671c7495f0f7a5b0"; + sha256 = "163j41j29nm29w567iq662k9anivqc20yxghm8w49w7i5hsbq9dh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5424,6 +5509,27 @@ license = lib.licenses.free; }; }) {}; + borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "borg"; + version = "20180325.1457"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "borg"; + rev = "b03e8d19874809e813c9631d29260bac73f51e01"; + sha256 = "15djx2c0agpmmy5ls61p0hwnv2plvb8k190xrrj925w9ypg2qp92"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; + sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr"; + name = "borg"; + }; + packageRequires = [ dash emacs epkg magit ]; + meta = { + homepage = "https://melpa.org/#/borg"; + license = lib.licenses.free; + }; + }) {}; borland-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "borland-blue-theme"; @@ -5511,12 +5617,12 @@ bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bpr"; - version = "20170930.642"; + version = "20180220.1044"; src = fetchFromGitHub { owner = "ilya-babanov"; repo = "emacs-bpr"; - rev = "314b0d6f69ff5a9c2d25a1ce5a2109d67d4d9bb3"; - sha256 = "02qj8gnhxv39y8kvlw491cbiaknll3hg03pk4xx15rffl7dyrbds"; + rev = "af84a83dea09d86e77d87ac30604f2c5b4bf4117"; + sha256 = "1r2prq9j6fmzzkl1f3r9drn6lna2wzd9qv127x7z5g6n8pgb6ipx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr"; @@ -5595,12 +5701,12 @@ browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "browse-at-remote"; - version = "20170720.1518"; + version = "20180227.52"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "browse-at-remote"; - rev = "b5cff7971ca8bbb966e3acd9b7e5c4c007f94215"; - sha256 = "16ms9703m15dfxg6ap4mdw7msf8z5rzsdhba51dwivfpjxg7n52c"; + rev = "47bab994640f086939c30cc6416e770ad067e950"; + sha256 = "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote"; @@ -5616,12 +5722,12 @@ browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "browse-kill-ring"; - version = "20171016.1312"; + version = "20171219.1108"; src = fetchFromGitHub { owner = "browse-kill-ring"; repo = "browse-kill-ring"; - rev = "b746d01c888262e81d76f8949869cf9e02759b6a"; - sha256 = "177vbziv65jb3xla713iblng04m0f7hdq5d4hf0jaxn7pzm61n0d"; + rev = "8debc43e41d7e51532698331c6f283905890b904"; + sha256 = "18yg35raks0kbzg5wjay6liingdcv4glyzl9n14sgr9vzc7h96f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring"; @@ -5760,6 +5866,27 @@ license = lib.licenses.free; }; }) {}; + buckwalter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "buckwalter"; + version = "20180107.843"; + src = fetchFromGitHub { + owner = "joehakimrahme"; + repo = "buckwalter.el"; + rev = "2aa5451c3682c268adebc6b1191a796466732f53"; + sha256 = "0g270jyf2fd3x8p0jcd86j751spfphgsmwjxl61rk1x1kiql4icd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7dd38487731cc978e104afa39f8954cfc33ba27f/recipes/buckwalter"; + sha256 = "08pnmfy910n5l00kmkn4533x48m3scsxzyra0nl6iry2n39y2kr1"; + name = "buckwalter"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/buckwalter"; + license = lib.licenses.free; + }; + }) {}; buffer-buttons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-buttons"; @@ -5781,22 +5908,22 @@ license = lib.licenses.free; }; }) {}; - buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: + buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; - version = "20160811.713"; + version = "20180307.1451"; src = fetchFromGitHub { owner = "killdash9"; repo = "buffer-flip.el"; - rev = "386067141ca77848b266e068f8c6baf6b4c2ab5b"; - sha256 = "1bch4jk6d60aydvcc624026pwfby29fbcwm3zhrsksqc0d2qxdwq"; + rev = "e093360e05164c78255866c1ac8f966aa38ba514"; + sha256 = "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098"; name = "buffer-flip"; }; - packageRequires = [ key-chord ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/buffer-flip"; license = lib.licenses.free; @@ -5930,12 +6057,12 @@ bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bug-reference-github"; - version = "20131202.1303"; + version = "20180128.514"; src = fetchFromGitHub { owner = "arnested"; repo = "bug-reference-github"; - rev = "6f693e1f659d9a75abea3f23e95946c7f67138cd"; - sha256 = "0zr1raf0q5wi3vr66kglxcfxswlm8g2l501adm8c27clvqizpnrr"; + rev = "f570a0532bfb44f095b42cf68ab1f69799101137"; + sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github"; @@ -5951,12 +6078,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20170125.14"; + version = "20171215.930"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "2742bd1cd9e232cac68d5843e05c043827a2669f"; - sha256 = "00v0v00izzy749h0l22z0g0df96g3s4rbn06dvdara7h01599v00"; + rev = "af1a237b4d1ed31780dd37bcbef51fc8ca9b0603"; + sha256 = "1ccw90a68dahcrkr94xi9apnxjmvzjvd33w78bsr2jyfd82ggsw1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -6140,12 +6267,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20171029.1011"; + version = "20180223.937"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "bbbf6924ff214b518718687ead96ceec92bdbaba"; - sha256 = "0z05rr85mf9as2byj3k1ai9x5ci45a7g425svv0ywgz1lgv2vsi4"; + rev = "4106adc5051965a3d066dfb5594e3d3ba0303b3f"; + sha256 = "01pvga1b54p7l9fjj388hdvjkmmp2gf5la7l74xjaxfk7v5rrifv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6305,27 +6432,6 @@ license = lib.licenses.free; }; }) {}; - cake = callPackage ({ anything, cake-inflector, fetchFromGitHub, fetchurl, historyf, lib, melpaBuild }: - melpaBuild { - pname = "cake"; - version = "20140603.2131"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-cake"; - rev = "a7c9f3bee71eb3865060123d4d98e5397c2f967e"; - sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/86ed5054ee2392a0e384443c945a5d4824238e95/recipes/cake"; - sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr"; - name = "cake"; - }; - packageRequires = [ anything cake-inflector historyf ]; - meta = { - homepage = "https://melpa.org/#/cake"; - license = lib.licenses.free; - }; - }) {}; cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cake-inflector"; @@ -6347,36 +6453,36 @@ license = lib.licenses.free; }; }) {}; - cake2 = callPackage ({ anything, cake-inflector, dash, f, fetchFromGitHub, fetchurl, historyf, ht, json ? null, lib, melpaBuild, s }: + cakecrumbs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "cake2"; - version = "20140626.542"; + pname = "cakecrumbs"; + version = "20180222.1845"; src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-cake2"; - rev = "caffb646c86333b8747cefeba070d57ac4fbaf00"; - sha256 = "14q5hny3bdwcaq3ls6jlk8np4hf99jksxz84dhm2rdvnm18b1wk3"; + owner = "kuanyui"; + repo = "cakecrumbs.el"; + rev = "76cfbfacfaa9d2128fc9218338a0ba2bb47349ab"; + sha256 = "18ni6krymzm1af2vmw2n82s0ifny6pn1p0qifn3646xx4p210a4z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/18e38d9cdb9f1a8cc05545c52c3a76265a9aa2ab/recipes/cake2"; - sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x"; - name = "cake2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c970907affeb4a21fa1b7c350edf171dbdcd8de5/recipes/cakecrumbs"; + sha256 = "1s5j8w0y47qpdq4f34l7hmdhxp560wg1lgzqz6p3p3lg1l89sv47"; + name = "cakecrumbs"; }; - packageRequires = [ anything cake-inflector dash f historyf ht json s ]; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/cake2"; + homepage = "https://melpa.org/#/cakecrumbs"; license = lib.licenses.free; }; }) {}; cal-china-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cal-china-x"; - version = "20170122.1100"; + version = "20180211.1101"; src = fetchFromGitHub { owner = "xwl"; repo = "cal-china-x"; - rev = "2e9f8e17969a32268fa1c69b500d28590338a98e"; - sha256 = "1qqy0phjxqc8nw7aijlnfqybqicnl559skgiag5syvgnfh4965f0"; + rev = "e9b309065829af3a9a0c526509bd64d9228fdced"; + sha256 = "0wipcsr0dry2r9sw7lcz5hw16b5gpax7qr2nbdlcwj3j9axqipyg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1098d34012fa72f8c8c30d5f0f495fdbe1d3d65/recipes/cal-china-x"; @@ -6413,12 +6519,12 @@ calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw"; - version = "20170714.840"; + version = "20180117.1645"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; - sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + rev = "03abce97620a4a7f7ec5f911e669da9031ab9088"; + sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw"; @@ -6438,8 +6544,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; - sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + rev = "03abce97620a4a7f7ec5f911e669da9031ab9088"; + sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal"; @@ -6480,8 +6586,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; - sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + rev = "03abce97620a4a7f7ec5f911e669da9031ab9088"; + sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm"; @@ -6501,8 +6607,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; - sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + rev = "03abce97620a4a7f7ec5f911e669da9031ab9088"; + sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical"; @@ -6522,8 +6628,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; - sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + rev = "03abce97620a4a7f7ec5f911e669da9031ab9088"; + sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org"; @@ -6536,6 +6642,27 @@ license = lib.licenses.free; }; }) {}; + call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }: + melpaBuild { + pname = "call-graph"; + version = "20180403.2002"; + src = fetchFromGitHub { + owner = "beacoder"; + repo = "call-graph"; + rev = "31bfac00f33b8494fcf6c18a210dd7ed4b81a21d"; + sha256 = "00ajq1xkm9hmk92vrnvmgkrs65jlx1rl1hxghf9id4gx09yy011s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; + sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc"; + name = "call-graph"; + }; + packageRequires = [ cl-lib emacs hierarchy ivy tree-mode ]; + meta = { + homepage = "https://melpa.org/#/call-graph"; + license = lib.licenses.free; + }; + }) {}; calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calmer-forest-theme"; @@ -6581,12 +6708,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "20171020.1013"; + version = "20171209.1232"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "c5fe6932b2151d0e4426072b4df3510318bc4edc"; - sha256 = "1zd6rpp9275xh3bpr8rgj8mm70dxf30xhhj5h7vw2nj194d54lv6"; + rev = "fe9a5215948b3636161262b275eca8b98ff1967b"; + sha256 = "1nkqrbx86j2mj0jsap12jfihpw5lnrsxy711qn4g8n3abng4lnza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -6623,12 +6750,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20171026.13"; + version = "20171218.855"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "3ecf0b89b3d36874a301a7e2fb429fc026c73f35"; - sha256 = "1mv1a0z379mr7y8by5s1lnkvp1kamch01j0yn1aqgxjry3z789dd"; + rev = "ba652e464ccdd0860fbc5d932c2ae86c9a31a200"; + sha256 = "1wyk40c61hlkmx3v82hn89chvrx7fyyyc1j2wlhizi7x5cv3c497"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6686,12 +6813,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20170917.1107"; + version = "20180119.1906"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "eea660b78c05d70159067f5be8cd3bddb55df4c5"; - sha256 = "0i4f964nqyd260cgy9s9jnpyzwmpmypznwmpvnkijd9pl34yfl04"; + rev = "3cbb32d25ea5691e64bd150188643808846b3688"; + sha256 = "1jxqy8sb2asyck6wp68lbczffpf6b3bg87r965nhxac7kgqhvq4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6790,12 +6917,12 @@ cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cbm"; - version = "20160926.1150"; + version = "20171116.440"; src = fetchFromGitHub { owner = "akermu"; repo = "cbm.el"; - rev = "bf8cbbcef82e4643c5f0399f0198f606275af08c"; - sha256 = "1p88fx90xwjk7dmd5gmbqyajyxf859kjsjzqmzljwai91skbb3pm"; + rev = "5b41c936ba9f6d170309a85ffebc9939c1050b31"; + sha256 = "091ln3d0jhdgahbwfdm1042b19886n3kwipw5gk8d0jnq5vwrkws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm"; @@ -6955,24 +7082,66 @@ license = lib.licenses.free; }; }) {}; - centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + celestial-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "celestial-mode-line"; + version = "20171210.1045"; + src = fetchFromGitHub { + owner = "ecraven"; + repo = "celestial-mode-line"; + rev = "018b5eb215be58fbae971d9013599966eaa569dc"; + sha256 = "0d92k706qhv1bz11wvnkb5iaanxf2wraxwgzkx8kijpxl771zdqj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cdb1d057f76166ba32d5028f18eec7d09857f990/recipes/celestial-mode-line"; + sha256 = "1s6vn71mxfvvafjs25j12z1gnmxnkvnw716zy5ifx1bs8s5960kq"; + name = "celestial-mode-line"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/celestial-mode-line"; + license = lib.licenses.free; + }; + }) {}; + centered-cursor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "centered-cursor-mode"; + version = "20180112.755"; + src = fetchFromGitHub { + owner = "andre-r"; + repo = "centered-cursor-mode.el"; + rev = "00fb47d227f9e211ec1c58161a501a1550c3a60d"; + sha256 = "0yd78k28dp139a889q5nh8fdbc59jl227anasg5695bz8bkzavd1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode"; + sha256 = "1yy50p3xprkqiak3vfly5s5kpbbdmxmw6fhgz13fw97553hr3w5x"; + name = "centered-cursor-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/centered-cursor-mode"; + license = lib.licenses.free; + }; + }) {}; + centered-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "centered-window-mode"; - version = "20170528.25"; + pname = "centered-window"; + version = "20171127.149"; src = fetchFromGitHub { owner = "anler"; repo = "centered-window-mode"; - rev = "6f9e873f5a98f356cee41367f2eaf1f5f5cd96fc"; - sha256 = "0ih41g9haypr2ifi26kihwx2zfnzjh8n2898w2ljn7xzbd0nkx8c"; + rev = "24f7c5be9def20879f46659082d497e67b55d7af"; + sha256 = "0387x0z2l0yvbhkvh3rf3h2ddk7bvwgkpvpngwhhsjbc4hh4k3hz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode"; - sha256 = "08pmk3rqgbk5fzhxx1kd8rp2k5r5vd2jc9k2phrqg75pf89h3zf4"; - name = "centered-window-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/58bfd795d4d620f0c83384fb03008e129c71dc09/recipes/centered-window"; + sha256 = "0w6na4ld79bpmkiv6glbrphc32v6g2rcrpi28259i94jhgy1kxqk"; + name = "centered-window"; }; packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/centered-window-mode"; + homepage = "https://melpa.org/#/centered-window"; license = lib.licenses.free; }; }) {}; @@ -7042,12 +7211,12 @@ cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cfengine-code-style"; - version = "20131209.411"; + version = "20171115.1308"; src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "8f9876fca85df61451ec6ce08b39c3e9a3f3da42"; - sha256 = "0blh871a4gwn547bkbx1sdy9znys11d6mja7dqkvnk9vci0nlh5s"; + rev = "bb460ccf2348873b7a84e99930feb038d0f9a95b"; + sha256 = "1wgf2lpcpplxdabz0xbzq9j5va5zhxl22ns63d4jj7v86a77cg2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7147,12 +7316,12 @@ cg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cg"; - version = "20170911.610"; + version = "20171123.301"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "cg"; - rev = "f5d74973d2cf19fd31db485ee6bfaaebcf96af2d"; - sha256 = "0bmydpv3slv5fvy1admgsm1qlkfp4sdsd0caik48dn7bnghifggz"; + rev = "e19f3bf60b9c8dbcff053b008fa3ace17fc073fe"; + sha256 = "13j7x6ngjga2idixw02llmykzsrihsxnfdj5jkx5sdkvrmqymmfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/cg"; @@ -7168,12 +7337,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20171007.300"; + version = "20180223.644"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "b4cd8550dd6a26c4efd226156dff33e261e7a8cc"; - sha256 = "1m0ackx5wvwff0qpy9204rmpq7yr6hd3bfkwahjy6kwfrjavkfbv"; + rev = "8194c3ade7ba73f6ddfea7dec55f77b5b6fdbcab"; + sha256 = "0rsx9gqkxxkk597liyghw0sjrvmfid4j1kbmz5ff8irm259g7psy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7231,12 +7400,12 @@ char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "char-menu"; - version = "20170518.2247"; + version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "b4542123e8c9bc40de1328f9a8078a0704a9a98d"; - sha256 = "101r6gryj5ic3mbv400klcjw8zfpn1rwi8ayyki93a53pali5g96"; + rev = "82f0422179737bcb9f93481aebaf1071d54fc859"; + sha256 = "1r5nymx7yj4l4wjhsx6gxvh9rqx322x5n54cqg71mssxiwccpdv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -7357,12 +7526,12 @@ chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "chee"; - version = "20161212.1525"; + version = "20171123.1433"; src = fetchFromGitHub { owner = "eikek"; repo = "chee"; - rev = "19437183960ee525de1c0cde13dc2c8d8921abfb"; - sha256 = "0hrl7h2069g6r2b3i2b7sxizny6ihgf8qajfima32la3gsb0hd4k"; + rev = "669ff9ee429f24c3c2d03b83d9cb9aec5f86bb8b"; + sha256 = "1k64mjzqmjirsld40dvmpq4llpb7ggx80r1hvsjqazc4mr16pbri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; @@ -7609,12 +7778,12 @@ chruby = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chruby"; - version = "20170509.700"; + version = "20180114.852"; src = fetchFromGitHub { owner = "plexus"; repo = "chruby.el"; - rev = "3eddd2f5fc2ac979b496394c74e4aee436b64a28"; - sha256 = "15fihl38fa3jzn4r0abjpkqzibsrn0pnlvab6xba0ffr4sv4m0y2"; + rev = "42bc6d521f832eca8e2ba210f30d03ad5529788f"; + sha256 = "06pvjw40qk017py9km26vjrh90acycnkr5r04nxf664qqkjlg2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1989a3c6fa4cd7aaf6b0b202f197eb7db51936b9/recipes/chruby"; @@ -7627,15 +7796,36 @@ license = lib.licenses.free; }; }) {}; + chyla-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "chyla-theme"; + version = "20180302.858"; + src = fetchFromGitHub { + owner = "chyla"; + repo = "ChylaThemeForEmacs"; + rev = "ae5e7ecace2ab474151eb0ac5ef07fba2dc32f8a"; + sha256 = "1gqzwwr3fnhd9iqn7zmqpxgxvmrhq7g849ndjwizksk0bfj3b596"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c55eebf8df165360ce1e5d18e484c90f296fe52/recipes/chyla-theme"; + sha256 = "1mgr6483bjjwk8bi6kijyw61s52nq6g2svhy5n1jnffi3gaw7hl5"; + name = "chyla-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/chyla-theme"; + license = lib.licenses.free; + }; + }) {}; cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20171001.112"; + version = "20180413.51"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "946a9d44e0d3806f1e06ab68fd832f24dd152086"; - sha256 = "0fifp2cjspfqvwmy9l9sxm8na7jj3wxbiz0mpq0pj3jm4aa7v6cl"; + rev = "a01115242ba839465e16892383133c21c350d5bd"; + sha256 = "1b0p7dnrcgnjma4yk6fc3v21sxaz772wrc780sd5faa833z8wg16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7711,27 +7901,6 @@ license = lib.licenses.free; }; }) {}; - cider-profile = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "cider-profile"; - version = "20141120.625"; - src = fetchFromGitHub { - owner = "thunknyc"; - repo = "nrepl-profile"; - rev = "9aa7e404f53f5136ac8d15301ce8ca2924785cb3"; - sha256 = "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/440708bbf501e7b3d0aff1b9432ac71b5f9f8eab/recipes/cider-profile"; - sha256 = "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs"; - name = "cider-profile"; - }; - packageRequires = [ cider ]; - meta = { - homepage = "https://melpa.org/#/cider-profile"; - license = lib.licenses.free; - }; - }) {}; cider-spy = callPackage ({ cider, cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet }: melpaBuild { pname = "cider-spy"; @@ -7819,12 +7988,12 @@ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circadian"; - version = "20171022.724"; + version = "20180307.954"; src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; - rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee"; - sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk"; + rev = "26ffd83a5931bb3fb04f01cb780715a05c8dd33e"; + sha256 = "0z8jkbycvia8ha1yv9v8zrcpqn0jqlb5myqx3qcvykn9yysmv2lq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; @@ -7840,12 +8009,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20170929.1635"; + version = "20180223.929"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2"; - sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz"; + rev = "9aaad726ea0b0cce4d911eec92ab8fd2a6455fe6"; + sha256 = "1nyw9phrh1qpc7j6b8fkald18y3rldydb666r6ppphggly6lh4vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7861,12 +8030,12 @@ circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe-notifications"; - version = "20171001.2258"; + version = "20180102.1518"; src = fetchFromGitHub { owner = "eqyiel"; repo = "circe-notifications"; - rev = "4b93112b715714fc7b0ac2637df93adb90f35b40"; - sha256 = "1hfic3qrlskcf0zmd3w76sl1qgrd6myf6mwg06mnc9jy76backqk"; + rev = "291149ac12877bbd062da993479d3533a26862b0"; + sha256 = "18mva5nn919c86sgk6kdh437vdnlh9bk7fg10xqcpics1yv3viaw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications"; @@ -7879,6 +8048,27 @@ license = lib.licenses.free; }; }) {}; + citeproc = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, queue, s, string-inflection }: + melpaBuild { + pname = "citeproc"; + version = "20180325.2358"; + src = fetchFromGitHub { + owner = "andras-simonyi"; + repo = "citeproc-el"; + rev = "b15e3cadbcbbe777b809a32859e341e2ef212c13"; + sha256 = "1axl3b31ylp8y2vsf853j8d8wb1wsizwi605qfxj5aj8xafbgbb5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc"; + sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq"; + name = "citeproc"; + }; + packageRequires = [ dash emacs f queue s string-inflection ]; + meta = { + homepage = "https://melpa.org/#/citeproc"; + license = lib.licenses.free; + }; + }) {}; cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cl-format"; @@ -7924,12 +8114,12 @@ clang-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clang-format"; - version = "20170120.137"; + version = "20171202.1318"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "clang-format"; - rev = "7e22204dc5afe0859fb8853ff47942574541eaff"; - sha256 = "148wkr770ch6czn8s8mypbq6r0vnqqi026kqxshvzsql79i9l687"; + rev = "e2facf890156ad57a122ed5e79e5a40cc03c8cae"; + sha256 = "09pq0zf5im6kkjwyzdz3np3b4dd5va3as1syygvjnl5dlh6gkjcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format"; @@ -8071,12 +8261,12 @@ clipmon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clipmon"; - version = "20160926.329"; + version = "20180129.254"; src = fetchFromGitHub { owner = "bburns"; repo = "clipmon"; - rev = "3f985aa2a55fbfd8566425c90e1968998f57b8ee"; - sha256 = "0jkim6zdmqq8swq70yic7cypj89d1rks5lla1kq9qvrmll36x31w"; + rev = "95dc56c7ed84a654ec90f4740eb6df1050de8cf1"; + sha256 = "0mfb4k0i71y49hn0xk5a1mv4zaj249qcan0y0nzvgf7mmvr32n9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4dc92d73705ebb61ff8218f3483dd2da51ce8d32/recipes/clipmon"; @@ -8134,12 +8324,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 = "20170720.712"; + version = "20180411.43"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "f5295df68955c23fffd60718039fd386d13c77f5"; - sha256 = "14lp3jxxpjfm31rbrf2rb988fzh4xfacqdcwp15b87pixziln08x"; + rev = "adffc6a4c61a9555744634598b47631760e91488"; + sha256 = "19bi7pnsyqaahwsy6gr55k8kgjfimrjn3lriyzjh7jkhfsmm77bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8293,12 +8483,12 @@ clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "clojure-cheatsheet"; - version = "20161004.2328"; + version = "20180201.4"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-cheatsheet"; - rev = "57e877d9466934b5319989b542f93b42dffec9ae"; - sha256 = "1d61q50h4vxk8i3jwxf71rbqah7ydfsd0dny59zq0klszfz2q26b"; + rev = "85c382317a56bbdfac03ae95999c28fc0cde65d7"; + sha256 = "0w9l6nz583qyldz44jqdh4414rgm6n2fzbaj5hsr5j1bkdizq7xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet"; @@ -8314,12 +8504,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20171103.1150"; + version = "20180329.2109"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8"; - sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l"; + rev = "58e909365c89a4e31b5f6c790f261be788cac409"; + sha256 = "066w6mb37ihv92a5l7gwcld7divbylj29n619q02lazqfwbssfwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8335,12 +8525,12 @@ clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode-extra-font-locking"; - version = "20171102.1020"; + version = "20180114.911"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8"; - sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l"; + rev = "58e909365c89a4e31b5f6c790f261be788cac409"; + sha256 = "066w6mb37ihv92a5l7gwcld7divbylj29n619q02lazqfwbssfwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8377,12 +8567,12 @@ clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "clojure-snippets"; - version = "20170713.2310"; + version = "20180314.608"; src = fetchFromGitHub { owner = "mpenet"; repo = "clojure-snippets"; - rev = "36207f9d8738851f5b686dfe0225ad0553bf8e68"; - sha256 = "0fb4l4gjzpr5rij4kyvz0r705blv2a5w1rf1c92d34g8jyy2hmd5"; + rev = "6068dca90467a0f4ebc2cd39338a173d6f5ddc04"; + sha256 = "0vvadcydpsz4b17dlm1jd4fbddzfqibh3mlzv3k4gvp67vv10cqy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets"; @@ -8395,22 +8585,22 @@ license = lib.licenses.free; }; }) {}; - clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, simple-httpd }: melpaBuild { pname = "clomacs"; - version = "20170726.436"; + version = "20180211.421"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "8d3e12a2f73e81499fa18f30adaea8c861e4a9b1"; - sha256 = "01wpzbv4vjad0nvbydc0rwb3jdqbncwajs5xrng88n1xxhrajh1x"; + rev = "2fa47d068f4955424e810cbe94d861a103efc259"; + sha256 = "0m57hvq8s6cigv7ajmim71320bj06a2wk9v82pbvxpjqyyijpkym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh"; name = "clomacs"; }; - packageRequires = [ cider emacs s ]; + packageRequires = [ cider emacs s simple-httpd ]; meta = { homepage = "https://melpa.org/#/clomacs"; license = lib.licenses.free; @@ -8419,12 +8609,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20170919.455"; + version = "20180318.1222"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362"; - sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l"; + rev = "bfd5a5e4d32bc00e439c86f42859964d4fa91dc3"; + sha256 = "1ivdlabnkm5dsdjpi68mgvvif5bg8pc2igjyr2jrkwl7jnz51dz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -8545,12 +8735,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20171101.236"; + version = "20180413.329"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "114e2df27f79816f023a07e3e8024c7ab73603f0"; - sha256 = "1n7zv325kjvmz694r11sbz6650b8y22kv2mbx4yrdha9r6y2m1f7"; + rev = "3d4da16226e8d4e53613feeebb5e21e6a7defed5"; + sha256 = "1d0nxqhx6ssld92wlv8c40m655zpf622a0ns4v78397nfm135khq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8566,12 +8756,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "20160928.505"; + version = "20180104.1137"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "67c981fdc25e01ae52daa67c447a03fd05b40634"; - sha256 = "0yri0jg6k66w1qi7vi2f2ij3rfiibs0nzpqdm7gapf3q7nabyrg8"; + rev = "ccd17a557cbf8ada18207a72eea78d2adcc9d752"; + sha256 = "1i85zb5j3ckn5b9xybczf6k42vpwsyq3xyzzarq3w775iyjlnkfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8587,12 +8777,12 @@ cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-project"; - version = "20170725.912"; + version = "20171121.315"; src = fetchFromGitHub { owner = "alamaison"; repo = "emacs-cmake-project"; - rev = "ae763397663fbd35de0541a5d9f2de18a5de3305"; - sha256 = "0ynxcbf0jbn6b4dxswhk9qhijmhp05q6v925nglq67j0xjm8bicw"; + rev = "d3f408f226eff3f77f7e00dd519f4efc78fd292d"; + sha256 = "1r8a3arpkkn91k619z4b6ywnq15glc4n1ji33l0q2m59f5sfk8mp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0857c4db1027981ea73bc32bcaa15e5df53edea3/recipes/cmake-project"; @@ -8650,12 +8840,12 @@ cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cnfonts"; - version = "20170731.1611"; + version = "20171205.111"; src = fetchFromGitHub { owner = "tumashu"; repo = "cnfonts"; - rev = "cbe1ddd49e33b790a568c55351146aa5b909f173"; - sha256 = "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx"; + rev = "4583e30d5058773606b830072df38a038d40203a"; + sha256 = "04vc3p4320h3ncxm8s21ijv524w5m0j5gx1f5pyw91k3avvz9hbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts"; @@ -8668,6 +8858,27 @@ license = lib.licenses.free; }; }) {}; + cobalt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cobalt"; + version = "20180304.355"; + src = fetchFromGitHub { + owner = "cobalt-org"; + repo = "cobalt.el"; + rev = "634ace275697e188746ca22a30ff94380ec756be"; + sha256 = "1mrydmzldgabkkdpmlwfrfb6iddj4by7scc14k9bak5y6hj6ix7l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b2435d98e7564d333c8224b67ac6ad9c95debda1/recipes/cobalt"; + sha256 = "0r3fx1xx24x4qapbj2p8krc67rjmrjm88y89baf1x2swk7xdza92"; + name = "cobalt"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cobalt"; + license = lib.licenses.free; + }; + }) {}; cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cobra-mode"; @@ -8731,22 +8942,22 @@ license = lib.licenses.free; }; }) {}; - codesearch = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + codesearch = callPackage ({ elog, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "codesearch"; - version = "20160806.57"; + version = "20171122.431"; src = fetchFromGitHub { owner = "abingham"; - repo = "codesearch.el"; - rev = "7013d933cd9d3c04f19a6572176483b48a311807"; - sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp"; + repo = "emacs-codesearch"; + rev = "4e6a2382c26d1218a4a007d31de2bab8ef9d2e7c"; + sha256 = "030zbx1glr6m7sxy89c833iw1v3bgjkcg835c38hlazra1vq783p"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5aee771432c63fe2f0ec719ef000f2c5971947b5/recipes/codesearch"; - sha256 = "0z7zvain9n0rm6bvrh3j7z275l32fmp46p4b33mizqd1y86w89nx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0da1c6971ac2d3e9ee67731d00a9e8ca2d169826/recipes/codesearch"; + sha256 = "1zm7fqwiknk07c8aks1silnkxifkfbdzvbzg77wrap48k8mnw03l"; name = "codesearch"; }; - packageRequires = [ dash ]; + packageRequires = [ elog ]; meta = { homepage = "https://melpa.org/#/codesearch"; license = lib.licenses.free; @@ -8881,12 +9092,12 @@ color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-identifiers-mode"; - version = "20170814.1121"; + version = "20180308.1739"; src = fetchFromGitHub { owner = "ankurdave"; repo = "color-identifiers-mode"; - rev = "5750ee9e1ab8a6890381bb461982113b1eb98879"; - sha256 = "17ry98s4lcl6g63bj8a0wd1rmh8whlxlmzfdjhp8mapdybqplcql"; + rev = "2407ddea7873f55216d9512ca2fb5eef268d5eba"; + sha256 = "0zah7w0dhgzwlgspvlb3gzsg6d2dqpxnmqm1kjjjdh3y0qimmy0g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode"; @@ -9011,8 +9222,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-solarized"; - rev = "74a7065808f82dbdd9638ae33ed0e4f7a55da35c"; - sha256 = "1af6j8qyzcm4x5p2wkhfh6f62n5i4fapjfrii3rl3l9im39fl8jc"; + rev = "6dd1d67a8e88a7bd586572cabe519b99a90fc3ee"; + sha256 = "08bxyrpx7shgzgnmklshgdfa457imdmn5rv4j3pyp8pfwf0zg9h5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized"; @@ -9028,12 +9239,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20171106.634"; + version = "20180302.1412"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "a07c940b5e73ed67ff1e13f584065af7b577ec00"; - sha256 = "101h8nmj8r7zjhb8592fzv0mrh20q35llrjcip4q1q6k6ns8lj2w"; + rev = "6be4fea186f2865d6d027eade7d4a15d35e9a88b"; + sha256 = "1lil6n0fd3d8wajdr8qzgw5np1v3nzympsjrn3dk7zwwdf8b1zk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9070,12 +9281,12 @@ color-theme-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-x"; - version = "20160924.854"; + version = "20180226.1646"; src = fetchFromGitHub { owner = "ajsquared"; repo = "color-theme-x"; - rev = "7cba227f8bd4c82269405848550a4f4475057c65"; - sha256 = "053dq567iy9hkidsx76wjzgnq91z4gncx4870cj5lyp6j4g4mc8h"; + rev = "6c2264aa6c5d9a72caeae67ebaa4472090e70350"; + sha256 = "1fyz8bampcqzpbyg0l1g0nvv2m5n8000xy5yl05217dlxb448nnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/321900baf4149f8b58b075b9fb27716cf708f2a2/recipes/color-theme-x"; @@ -9301,12 +9512,12 @@ common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "common-lisp-snippets"; - version = "20170918.356"; + version = "20180226.723"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "common-lisp-snippets"; - rev = "cd46223fbc6ee99372a25ba455ffec4354895e45"; - sha256 = "0xii63fw3gx1hhx57yh8gr9mhkgb2vjkfs2sl5z9010myi9504is"; + rev = "1ddf808311ba4d9e8444a1cb50bd5ee75e4111f6"; + sha256 = "0zalsvs47hv33dmbs94srpb8q354sr52sxbad182p69dn1khlwyp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets"; @@ -9322,12 +9533,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20171017.1638"; + version = "20180415.2135"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "75b4daa545d55ecbf15a973ce5f63903d11ca7cf"; - sha256 = "0vbg3n2wm76xh522srzmj5w6hnqcpf67s6dzpi8l9c0bj2mgf9pi"; + rev = "46680da66a3ba70c7b2371832f8b8d9734dec554"; + sha256 = "03q76dvjka0xw91gzin848virwpm9dv71y3y2p3m168y7chk4g7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9343,12 +9554,12 @@ company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-anaconda"; - version = "20160809.705"; + version = "20171222.342"; src = fetchFromGitHub { owner = "proofit404"; repo = "company-anaconda"; - rev = "b268a00821c79d7e4c5da0d7035356afb389b3a7"; - sha256 = "0pjiiqads9xawcwldic4m7mfi533s3wmqafz4day92v9135xwczj"; + rev = "4519b1c9888b0d9665f0805e08362280a4945081"; + sha256 = "1vsh9m1q6jc4c9xy9xri1764n8fkpz8mz6np6gcmn86jfw5dk0fk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda"; @@ -9364,12 +9575,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "20170430.53"; + version = "20180401.640"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "2c30c3bdb8316b27d5c1832b944cb146d00de456"; - sha256 = "183hyy5vy7xs6hwsk8nrylck8w5czcqwzfx0wik4ppx8011jzis1"; + rev = "42753d43333c6e4ad83797f0234149b76b463369"; + sha256 = "1g93vnizl42k52ar47g7yn2csjyzsqvwb6siwbpfvjgbsr5d5d01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -9414,12 +9625,12 @@ company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-auctex"; - version = "20161025.24"; + version = "20180330.1118"; src = fetchFromGitHub { owner = "alexeyr"; repo = "company-auctex"; - rev = "d3727c9f5bb13c52b4a345bc8f895d3dbd9178b3"; - sha256 = "0bcf6vaq6bcp60wgfq0vr3mjzv74fn7jibndz5g1d9jkd1vj64xw"; + rev = "f24de90a14c46fc3b924875c658b319c7f209aff"; + sha256 = "0izi2p8whif6nlbippjw0zxkd0zilmgj2n0arx6k0zi7k4vbfsb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex"; @@ -9437,13 +9648,13 @@ pname = "company-axiom"; version = "20171024.1310"; src = fetchgit { - url = "https://bitbucket.org/pdo/axiom-environment.git"; - rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5"; - sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0"; + url = "https://bitbucket.org/pdo/axiom-environment"; + rev = "6842fb7f85df839acde395093647e2f91cf62fdd"; + sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/company-axiom"; - sha256 = "1qjy2idyfwa1a4z1v05ky26dzq8hs6aaszq4bifd7vymasvnamml"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/company-axiom"; + sha256 = "061n8zn11r5a9m96sqnw8kx252n1m401cmcyqla8n9valjbnvsag"; name = "company-axiom"; }; packageRequires = [ axiom-environment company emacs ]; @@ -9473,6 +9684,27 @@ license = lib.licenses.free; }; }) {}; + company-box = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-box"; + version = "20180413.1651"; + src = fetchFromGitHub { + owner = "sebastiencs"; + repo = "company-box"; + rev = "a27b632c1bb92de3415cea08c7885f3dc9ce30eb"; + sha256 = "1p71yalry5linxdb5xiyig8wlb9nw0c5nmlkdxc1l0gyhr8lrzci"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a54879f4dd4dcb6867680567731547d604ad02bb/recipes/company-box"; + sha256 = "0v39gja3jp8b2xfn9da93xsh8mihizwbg0gqp2yyczaxjm8ga23i"; + name = "company-box"; + }; + packageRequires = [ company dash dash-functional emacs ]; + meta = { + homepage = "https://melpa.org/#/company-box"; + license = lib.licenses.free; + }; + }) {}; company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-c-headers"; @@ -9515,15 +9747,36 @@ license = lib.licenses.free; }; }) {}; + company-childframe = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, posframe }: + melpaBuild { + pname = "company-childframe"; + version = "20180205.2236"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "company-childframe"; + rev = "fb799c3c8f8099a0ec7d21beb3b90136704c741e"; + sha256 = "121qqb797vfpfxxkk0gvh5x4p03lb6aarjfydl88ah6rw5087dij"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4fda072eb1e3f4feb9ad9834104f748f5b749a0d/recipes/company-childframe"; + sha256 = "1l8bd9fnw49apvwjgrlfywascbczavpaxns2ydymmb6ksj00rvzy"; + name = "company-childframe"; + }; + packageRequires = [ company emacs posframe ]; + meta = { + homepage = "https://melpa.org/#/company-childframe"; + license = lib.licenses.free; + }; + }) {}; company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20170615.1842"; + version = "20180307.510"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "642c0b5b539692242c476eb00af7bacc91d7fcc0"; - sha256 = "0mykqf03c7fbdb851fqdczb97cq6wq1lkinnjc2jaim5j4hc3gig"; + rev = "c2bd34f79472c27ee6f819820558c8b26f774748"; + sha256 = "1dvd7w93gly70x7j7dsn2n90w7n76k2bp96p4zlzxad94kvdj2a8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9567,12 +9820,12 @@ company-dict = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: melpaBuild { pname = "company-dict"; - version = "20160528.53"; + version = "20180216.156"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-company-dict"; - rev = "0589c2c3980a8f0df1705e3c0e5e075557eaac75"; - sha256 = "1bfl7b1lj4rgifqcpz4p8nhamxyyh29lbgl1g35rizw4nzv9sizq"; + rev = "7ab6331d8095e9b93c726da754102fd708c0002e"; + sha256 = "18lfqankivzdijsklyi49a1v6nqixbmk4d1m6syqd63qj849aixa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict"; @@ -9634,8 +9887,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859"; - sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym"; + rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; + sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9693,12 +9946,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20170325.810"; + version = "20180225.1359"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "339f502e46e7d9214b61498d539b17f8f0322d17"; - sha256 = "0w2b3fk0q3ia5fjxk8gxj4161rxg43jw0hxpihidl5aak4i6dxb9"; + rev = "76ef585c70d2a3206c2eadf24ba61e59124c3a16"; + sha256 = "0zs9cblnbkxa0dxw4lyllmybqizxcdx96gv8jlhx20nrjpi78piw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -9714,12 +9967,12 @@ company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: melpaBuild { pname = "company-flx"; - version = "20161228.1736"; + version = "20180102.2118"; src = fetchFromGitHub { owner = "PythonNut"; repo = "company-flx"; - rev = "0c9fddf7c11c918ed42bd6a5108f8969b37704d5"; - sha256 = "1nv2hlmjdd7y9d25n22gwl0qzrsc0qpfwyhf44g0xq6dg5lgbpkj"; + rev = "16ca0d2f84e8e768bf2db8c5cfe421230a00bded"; + sha256 = "09zaaqi8587n1fv5pxnrdmdll319s8f66xkc41p51gcs2p7qa5w1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f27d718ee67f8c91b208a35adbbcdac67bbb89ce/recipes/company-flx"; @@ -9802,8 +10055,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "e990796e68a2ebfc099afed20b99e26d6b64061a"; - sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3"; + rev = "d7aee89652f1bd8ca319c64d6dee1bc1dfd9b6ef"; + sha256 = "1mbz80y0qa6vyvjs33hxsrq5vc2mza5rjhi6rvbxzy2a3lrx4cig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9865,8 +10118,8 @@ src = fetchFromGitHub { owner = "hotpxl"; repo = "company-irony-c-headers"; - rev = "5bbd427a2d3d4445e3413f7516def9aa80543b2a"; - sha256 = "172wf0ywbvqn9smwnh4kgxx8gw9g2f76irg3fmcv4d8d53mi08wa"; + rev = "72c386aeb079fb261d9ec02e39211272f76bbd97"; + sha256 = "1f462v8xq2hdsr4ks4i79icpfz6fjpb4q7khnx6si55agxj3rvaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers"; @@ -9907,8 +10160,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "c0af876c967fc969d67c467bc6767210d19c5d87"; - sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9"; + rev = "ae90bd280588c96d540892d0f42247db5a126f51"; + sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean"; @@ -9921,22 +10174,22 @@ license = lib.licenses.free; }; }) {}; - company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: + company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20171113.105"; + version = "20180216.2325"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "f3b4a206ccb73ae95425e9d700c521402fcaaec1"; - sha256 = "12xdshkin0xp6sycmdjcr5alscs16xaibnnxyijzlymdvapn1k3s"; + rev = "4512d062c38922d8b8cf402ca6043c246e915694"; + sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l"; name = "company-lsp"; }; - packageRequires = [ company emacs lsp-mode s ]; + packageRequires = [ company dash emacs lsp-mode s ]; meta = { homepage = "https://melpa.org/#/company-lsp"; license = lib.licenses.free; @@ -9987,12 +10240,12 @@ company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }: melpaBuild { pname = "company-nand2tetris"; - version = "20161011.1748"; + version = "20171201.1013"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; - sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; + rev = "33acee34d24b1c6a87db833b7d23449cf858f64f"; + sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris"; @@ -10050,12 +10303,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20171111.757"; + version = "20171226.1924"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "217fc49cc8ededd96ab8b7f656ef80fb905c3f4a"; - sha256 = "0dg494qivcb8y87hzkby4qi1cr4pn7fl079yjwrwq54qpwq60jgw"; + rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115"; + sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10071,12 +10324,12 @@ company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-plsense"; - version = "20171016.1013"; + version = "20180117.1658"; src = fetchFromGitHub { owner = "CeleritasCelery"; repo = "company-plsense"; - rev = "68dd1ca0a0837990a2e6c2e36f6b10fdf4a9bb6d"; - sha256 = "07bqm1bg91r3vchy2q2pk3npngqfb73fh0b7mp1g9fj11h25mjfr"; + rev = "b48e3181e08ec597269621d621aa06636f02d883"; + sha256 = "14rawd5xfgnkhdpp43mz4a5mf480949ny5hr5w6v5djmsibqxw5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense"; @@ -10096,8 +10349,8 @@ src = fetchFromGitHub { owner = "lijunsong"; repo = "pollen-mode"; - rev = "de762bd7f9760185dae8ef025ca9a9126ae78de0"; - sha256 = "19bi50nlmwnh4kz3b1hrgc7ks0g84bld9aifws2l3wyc3xsj8cqa"; + rev = "df4eab5b490cb478a092e6bab6b07f9e2f9c6fad"; + sha256 = "0x8bnf0n109ard5zdmma04w0wv5jb1r7qh5smsa1kjvws98gnp57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/company-pollen"; @@ -10134,12 +10387,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "20170429.1052"; + version = "20180323.1200"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "432c62f034a5097d3f85d7f54afcdc016d7afa12"; - sha256 = "06ijf4ayqkmlmk5waxi7alinv3wpy23b8xm35llf3h1ncg99zwqj"; + rev = "1580b107ebecb98cf5c21a5b7185d4bfe761047d"; + sha256 = "0d237si89c4r325zirqvivq5k9b59hyahnfjlgc3fy9cnr07xqg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -10152,22 +10405,22 @@ license = lib.licenses.free; }; }) {}; - company-racer = callPackage ({ cl-lib ? null, company, dash, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-racer = callPackage ({ cl-lib ? null, company, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-racer"; - version = "20160722.1658"; + version = "20171204.1910"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "company-racer"; - rev = "c2afd3d989ec2bca7dac094b684063a1922905f6"; - sha256 = "0339p8ymyx8yjgv9lp8lrfzc5mp1mh71rg4m325ia084n81p773a"; + rev = "a00381c9d416f375f783fcb6ae8d40669ce1f567"; + sha256 = "13m3yzn4xbyl13z7h1cl6vqjbzikjycy7wydpy4a44yhr466zjr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4671a674dbc1620a41e0ff99508892a25eec2ad/recipes/company-racer"; sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4"; name = "company-racer"; }; - packageRequires = [ cl-lib company dash deferred emacs ]; + packageRequires = [ cl-lib company deferred emacs ]; meta = { homepage = "https://melpa.org/#/company-racer"; license = lib.licenses.free; @@ -10207,8 +10460,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "dadd74f015f89317ff77424be30a9accadeeb4a4"; - sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10242,6 +10495,27 @@ license = lib.licenses.free; }; }) {}; + company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, solidity-mode }: + melpaBuild { + pname = "company-solidity"; + version = "20180407.1344"; + src = fetchFromGitHub { + owner = "ssmolkin1"; + repo = "company-solidity"; + rev = "32bfe4c8fe282c30ebf4f5cf1f9285f151c8e6d4"; + sha256 = "0qgvxpij5zwwvdqzi2yf2f52vgmky4xwz9v4smrkcx29k88ivlg5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef246601ff6d92d6dfcd809f637e50d9838da0b8/recipes/company-solidity"; + sha256 = "076z5jqh486k2lkh9rgbhs71bws4fba68pjybr9yyf0sdc5m7kc6"; + name = "company-solidity"; + }; + packageRequires = [ cl-lib company solidity-mode ]; + meta = { + homepage = "https://melpa.org/#/company-solidity"; + license = lib.licenses.free; + }; + }) {}; company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; @@ -10249,8 +10523,8 @@ src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; - sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; + rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781"; + sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; @@ -10284,6 +10558,27 @@ license = lib.licenses.free; }; }) {}; + company-suggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-suggest"; + version = "20180325.931"; + src = fetchFromGitHub { + owner = "juergenhoetzel"; + repo = "company-suggest"; + rev = "e1679bd2cff0396bda0eba7dc48469332bd54251"; + sha256 = "00cy1lhnlwz99zmxhk7403qq4wi8abk483syw5z1xvhdx1fxgq04"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9579e3366db055364829e20d3ce228bf17060b0a/recipes/company-suggest"; + sha256 = "1w5fp4mydc4av14sjb8di6jjvzfqwnasnxpf9720pk0rsj05i972"; + name = "company-suggest"; + }; + packageRequires = [ company emacs ]; + meta = { + homepage = "https://melpa.org/#/company-suggest"; + license = lib.licenses.free; + }; + }) {}; company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }: melpaBuild { pname = "company-tern"; @@ -10308,12 +10603,12 @@ company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }: melpaBuild { pname = "company-terraform"; - version = "20170812.722"; + version = "20180131.1503"; src = fetchFromGitHub { owner = "rafalcieslak"; repo = "emacs-company-terraform"; - rev = "bd97342fa1b3b77bd19a3ff202a5ce5cbead36d4"; - sha256 = "0yv0hiskdxx2653g5crmb9yq6c8azrvdja56wnhm8i9kvhnhkggh"; + rev = "74dad245567e06e758e1112c0d75f3eccf48e32c"; + sha256 = "0y4giv3i947258j5pv6wpzk95zry8sn8ra66m1237lk0k9zhpfdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform"; @@ -10350,12 +10645,12 @@ company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "company-web"; - version = "20171111.1049"; + version = "20180402.455"; src = fetchFromGitHub { owner = "osv"; repo = "company-web"; - rev = "935c65de0411ebbcb4f2223f31e756e093eaae07"; - sha256 = "0kw0fc1lg7qd23fx26y9m543sql32n1dlvr4rg7bmq6im7dwz4hy"; + rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a"; + sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web"; @@ -10396,8 +10691,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "e8a6c2bb6cdc18645e2ebc6a8ede8f0c306f013d"; - sha256 = "0gijzvc6krz1228siysk4za3pwfgfmwh04b8zjc57qkccngibnf9"; + rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; + sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10431,22 +10726,22 @@ license = lib.licenses.free; }; }) {}; - composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }: + composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-runtime, request, s, seq }: melpaBuild { pname = "composer"; - version = "20170304.1647"; + version = "20180415.743"; src = fetchFromGitHub { owner = "emacs-php"; repo = "composer.el"; - rev = "43e50a5e626bedb3c46c875ac765daf615f18ce9"; - sha256 = "0vfr9v60dgynjfz1kpx4c17mhsfbyi9g68jzvjkw7y95pwqv8f0y"; + rev = "1d43edd8079e84df5e1b46c65e6783cb3ff9debd"; + sha256 = "0k6345mc2ppckbbmji4wkynlfgy00kr945ah8j2b62hqgm73h575"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer"; sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1"; name = "composer"; }; - packageRequires = [ emacs f request s seq ]; + packageRequires = [ emacs f php-runtime request s seq ]; meta = { homepage = "https://melpa.org/#/composer"; license = lib.licenses.free; @@ -10476,12 +10771,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "20171109.903"; + version = "20171122.716"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "64b804c33f2667e8232689770a9f2e332c2dd0ab"; - sha256 = "1w1p1m2d0mwi3frkah5cnphyqsix7fp1li8glhlwf923cg48cxfq"; + rev = "0bba56d80bb959a20838a024b174d1cf1e2cfd07"; + sha256 = "0gr3z9s4qzvkmh7wziw5x77w9vch1riqjv5g1kl995yv7v5lxmnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10578,6 +10873,27 @@ license = lib.licenses.free; }; }) {}; + conllu-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsec }: + melpaBuild { + pname = "conllu-mode"; + version = "20180304.637"; + src = fetchFromGitHub { + owner = "odanoburu"; + repo = "conllu-mode"; + rev = "5c1f4de04d5cba9ff4fc3246c507f74f50a2aa6c"; + sha256 = "0zr8pglciqc1af06qsvqjks823wbb7s33g3qvhajxlfcz10iyd98"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode"; + sha256 = "1wffvvs8d0xcnz6mcm9rbr8imyj4npyc148yh0gzfzlgjm0fiz1v"; + name = "conllu-mode"; + }; + packageRequires = [ cl-lib emacs parsec ]; + meta = { + homepage = "https://melpa.org/#/conllu-mode"; + license = lib.licenses.free; + }; + }) {}; connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "connection"; @@ -10623,12 +10939,12 @@ contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "contextual-menubar"; - version = "20170908.408"; + version = "20180204.2309"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "contextual-menubar"; - rev = "67ddb1c8eec62e2b26524c09585a4f25f03ebb11"; - sha256 = "06rfkv7q9brahjgaqvpixqb26v4a65hyphl7ymjx8qyyypzrzac5"; + rev = "f76f55232ac07df76ef9a334a0c527dfab97c40b"; + sha256 = "0zks4w99nbhz1xvr67isgg6yjghpzbh5s5wd839zi0ly30x4riqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar"; @@ -10686,12 +11002,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "20170603.945"; + version = "20171215.1616"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "fba9fe57a310a71c5aac90a26434df4c08214833"; - sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76"; + rev = "971957166fe64d914ec4be209b4f80efeeabbb19"; + sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -10707,12 +11023,12 @@ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copy-file-on-save"; - version = "20171019.347"; + version = "20180217.914"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84"; - sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs"; + rev = "1ad10401711a3bf0a0894eeed357b402238be113"; + sha256 = "1ydpsh5j9j168crn30lpzv73rw2z80prp0hn2rybgrhvqfs3rbx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; @@ -10833,12 +11149,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20171101.1121"; + version = "20180415.905"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "5009b8149a86949f9e6d7546479e998be2e14337"; - sha256 = "181bhxq2xscd9h1s0aix5lkp7gzg041q713157hrv200p2fnzb6d"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10854,12 +11170,12 @@ counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-bbdb"; - version = "20171016.1545"; + version = "20171129.1737"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-bbdb"; - rev = "298b48cb9e1186347fbcaf1ba354efa5fe2d7556"; - sha256 = "137iv77j9a7mxsfrjxk4fpbaxw964pk4yj15609wijfcwgdjprwd"; + rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1"; + sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; @@ -10872,6 +11188,27 @@ license = lib.licenses.free; }; }) {}; + counsel-css = callPackage ({ cl-lib ? null, counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-css"; + version = "20180302.236"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-counsel-css"; + rev = "0536af00236cdce1ed08b40dd46c917e8b4b8869"; + sha256 = "04qm5dqxnl4s0axbrin7a7dpj3h8rx096q01bwzfs10qsdx3l7c0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/519a05a9f0e43f3e1dfac75759346476bfc40772/recipes/counsel-css"; + sha256 = "1sckfq8kv68q1anqmslrvhcf83m7b5r0clny6q33b9x0qypkv9xp"; + name = "counsel-css"; + }; + packageRequires = [ cl-lib counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-css"; + license = lib.licenses.free; + }; + }) {}; counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }: melpaBuild { pname = "counsel-dash"; @@ -10896,12 +11233,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20171112.1500"; + version = "20180324.2005"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "be0a14afc4b79202513b74ede8c26e41a5612f09"; - sha256 = "1lpaxrlfn5a4hp56mzw59j2zbc3klv1vhw338ly4pp55y79ibg1y"; + rev = "267c071724fcc665359f2f4472392507facaab2c"; + sha256 = "0039l9pdndl0y06xjvxpgcc71kqpwhny2lhy5a68p6n1ndi958z9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -10935,6 +11272,27 @@ license = lib.licenses.free; }; }) {}; + counsel-notmuch = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, notmuch, s }: + melpaBuild { + pname = "counsel-notmuch"; + version = "20171223.145"; + src = fetchFromGitHub { + owner = "fuxialexander"; + repo = "counsel-notmuch"; + rev = "ac1aaead81c6860d7b8324cc1c00bcd52de5e9ca"; + sha256 = "19frcrz6bx7d7v1hkg0xv7zmbk2sydlsdzn1s96cqzjk1illchkz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54fe0be4e8e8b90cd2dc3cc8b9c573694c8f773b/recipes/counsel-notmuch"; + sha256 = "1n4jp9fa5fbv55am0w1b832ncdih8gi6xflwabpwqqj4k5mj94p1"; + name = "counsel-notmuch"; + }; + packageRequires = [ emacs ivy notmuch s ]; + meta = { + homepage = "https://melpa.org/#/counsel-notmuch"; + license = lib.licenses.free; + }; + }) {}; counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-osx-app"; @@ -10959,12 +11317,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20171107.1456"; + version = "20180316.1608"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "5ec2118cbb3a6c047638ce305e50b1cd11ef3c03"; - sha256 = "1zbcpin6s4hbbdcmdka55mnngadlisyzn342kak0hzk2s7j6r6r8"; + rev = "d428d08015f83fe91c058abf7f1fa95657e90483"; + sha256 = "177w7v9hxx7p5l25hap4n4x8axzvp019a4xhkla8r1i821bxbqjw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11001,12 +11359,12 @@ counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-spotify"; - version = "20170612.1132"; + version = "20180319.2022"; src = fetchFromGitHub { owner = "Lautaro-Garcia"; repo = "counsel-spotify"; - rev = "dba8c1bf92e15f34f12a9e22b5958a93f10b46c5"; - sha256 = "1j7rzf8mws2yzdvfz8a6k48b5x6cn11lfvfya5s4c90kyy92j8ag"; + rev = "9033e207dccdfea7fe590d2e102d50fcd2bd22e3"; + sha256 = "00mjcp3x558gh7f8yrj8y4ivq3pvml7y46rms8xah5zxavg6q52b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b386462518a5ebb6454f4d01582df98395239bcc/recipes/counsel-spotify"; @@ -11019,22 +11377,64 @@ license = lib.licenses.free; }; }) {}; - cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-tramp"; + version = "20180311.2327"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-counsel-tramp"; + rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa"; + sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; + sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5"; + name = "counsel-tramp"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-tramp"; + license = lib.licenses.free; + }; + }) {}; + counsel-world-clock = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }: + melpaBuild { + pname = "counsel-world-clock"; + version = "20171201.2337"; + src = fetchFromGitHub { + owner = "kchenphy"; + repo = "counsel-world-clock"; + rev = "04153fbb21e51b1cfd042bdfc6ed1e8355a1edd7"; + sha256 = "1gmsqhc6dsq823jbg9g19x7bsz5n7ssnqjzhsd8pnnm561g60dcm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9da8c45e7d06647f9591d80e83f851a7f3af85/recipes/counsel-world-clock"; + sha256 = "151vm7g7g0jwjlp0wrwlxrjnh9qsckc10whkfgaz9czzvvmsf4cv"; + name = "counsel-world-clock"; + }; + packageRequires = [ ivy s ]; + meta = { + homepage = "https://melpa.org/#/counsel-world-clock"; + license = lib.licenses.free; + }; + }) {}; + cov = callPackage ({ elquery, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cov"; - version = "20170405.1508"; + version = "20180415.1331"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "519239cc37d3ad0204fecac99f42e1694ce57d3d"; - sha256 = "1kb2rmxx91q4cwm1npzyiykwg5jxhhz7waykh5vqxr5y81hr5nza"; + rev = "e6731ddf16be343a24449cf7dca92f382c8a831b"; + sha256 = "09p61ni7vkwl679ysl9aibw0b7qi5v9vpgvg08vj00fp5a82rzsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; sha256 = "02wk8ikanl5lcwqb9wqc8xx5vwzhn2hpqpxdchg5mdi7fifa1rni"; name = "cov"; }; - packageRequires = [ emacs f s ]; + packageRequires = [ elquery emacs f s ]; meta = { homepage = "https://melpa.org/#/cov"; license = lib.licenses.free; @@ -11043,12 +11443,12 @@ coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }: melpaBuild { pname = "coverage"; - version = "20160222.114"; + version = "20180226.2057"; src = fetchFromGitHub { owner = "trezona-lecomte"; repo = "coverage"; - rev = "d68e5d20108e280b11a802a671bd009c7dcfff89"; - sha256 = "0glnvr10lwi17g44653qqswn9vnyh5r2nmpaa0y6lvfb952zn0k0"; + rev = "c73d984168955ca0f47f44b0464aa45282df42b6"; + sha256 = "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd70e138534551dd12ba4d165ba56fbd1e033241/recipes/coverage"; @@ -11166,6 +11566,27 @@ license = lib.licenses.free; }; }) {}; + cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "cquery"; + version = "20180413.938"; + src = fetchFromGitHub { + owner = "cquery-project"; + repo = "emacs-cquery"; + rev = "7f48de485c5f4ca0d55b93307763889ce2d7c5c4"; + sha256 = "1cb41f0can8mslg80v1np5wvq9c0vl0px5mgy0zyzhajf9zqszgn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; + sha256 = "01mw6aqiazpzcn6h5h5xcnra8a04yg1ibvpfajx70m5iw9f5w6l6"; + name = "cquery"; + }; + packageRequires = [ dash emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/cquery"; + license = lib.licenses.free; + }; + }) {}; crappy-jsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "crappy-jsp-mode"; @@ -11271,22 +11692,22 @@ license = lib.licenses.free; }; }) {}; - cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "20170726.504"; + version = "20171227.1607"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69"; - sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3"; + rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889"; + sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip"; name = "cricbuzz"; }; - packageRequires = [ dash enlive s ]; + packageRequires = [ dash enlive f s ]; meta = { homepage = "https://melpa.org/#/cricbuzz"; license = lib.licenses.free; @@ -11316,12 +11737,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20170801.1334"; + version = "20180113.251"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f"; - sha256 = "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd"; + rev = "3e07035660f953cb08847362378267f5859bbe69"; + sha256 = "07l49l5fb7sv2ncvakr7nq616vw6nwrpl9czvqi46dnwvcdpjaxl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -11337,12 +11758,12 @@ cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cryptol-mode"; - version = "20160819.1444"; + version = "20180321.1108"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "cryptol-mode"; - rev = "9bf28f865d30d23b8b4fdef16a79ab66abbcc41f"; - sha256 = "0ihhx4zp725g1qaxq6n2ah8rsg099ccyavqxgkk53rpwr8iia0i2"; + rev = "91f8ad617e5db2fad57a7be1da211f22f3b51550"; + sha256 = "12jd2wc5icnkbvxjam7kgr8bdjavxjsy79vwi0hi3gzwiirx4ifg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode"; @@ -11379,12 +11800,12 @@ crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "crystal-mode"; - version = "20171023.212"; + version = "20180306.1821"; src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = "emacs-crystal-mode"; - rev = "1e8061c049766c25f1c06d43e703d3133426f7c0"; - sha256 = "0w11s1vmp9b4dlq9kvnxi63j69c94bqpg3fn9w4jasnpz4w9nkcf"; + rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de"; + sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode"; @@ -11421,12 +11842,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20170927.816"; + version = "20180315.203"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "331b45df9c6e84601cea323638f82ce5e4a68b03"; - sha256 = "00i53c5a85n1i48jyxg78ab2yicx8maybfc6mzxw8s12j9hbw75i"; + rev = "79e0a606f60a2620631623285dbbbd8591cbd2f8"; + sha256 = "1h36ns0kcz8p7nafczdyz1bvbz8fp3ci72c7ikyl703kkyqpk0px"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11442,12 +11863,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20171025.401"; + version = "20180119.1726"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "5680a266a32c62e8d7ebd987bf6e5fd40033bbeb"; - sha256 = "1zlb7bwx82rayzphf4q5f1w6yhm3r267fzgn74xmckh50jyq917y"; + rev = "4fc4e77263d31604c86be799163d96cdad57c610"; + sha256 = "167s332b9pbbxv24kyhrx543954a86bffxngjhp0cl0slmd81g2m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -11460,6 +11881,27 @@ license = lib.licenses.free; }; }) {}; + css-autoprefixer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "css-autoprefixer"; + version = "20180311.900"; + src = fetchFromGitHub { + owner = "kkweon"; + repo = "emacs-css-autoprefixer"; + rev = "386a5defc8543a3b87820f1761c075c7d1d93b38"; + sha256 = "0ymba9bhzfi7kkrha4d4sn0hrc3sid4b5k8lhakwwdwafhym0jjb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/122e3813a5b8a57303345e9cd855f4d85eced6f0/recipes/css-autoprefixer"; + sha256 = "0q40k8jvs4nc57kcljsx5qzylz9ms0kbr3dic3mr3bj0w062b1qg"; + name = "css-autoprefixer"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/css-autoprefixer"; + license = lib.licenses.free; + }; + }) {}; css-comb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "css-comb"; @@ -11635,8 +12077,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "c3612560fa30cecc86902daf097c8dd77b9b0b7d"; - sha256 = "1jkg27wgbvgb7bynzrsncr17k9w888mhk36fzkpxdnj0skm6v6lf"; + rev = "bf8253f482917e390fe8b44ceaf308405afeefc6"; + sha256 = "1ff4gq1bjm0j1wi58lsv5fazkjcq4ay01n4k55nhd34pgk0rbnv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11656,8 +12098,8 @@ src = fetchFromGitHub { owner = "cubicle-model-checker"; repo = "cubicle"; - rev = "9d108b900e0123236b4991c2d06b5061f34feee8"; - sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr"; + rev = "c2fba597da83b9ddc1195f1c8710d5330db24735"; + sha256 = "0gprqhm38y5dcpkmhy1i6rv7pa5l8271b71284p1g90p2iyvm89g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode"; @@ -11736,12 +12178,12 @@ cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "cwl-mode"; - version = "20171030.230"; + version = "20171205.145"; src = fetchFromGitHub { owner = "tom-tan"; repo = "cwl-mode"; - rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9"; - sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59"; + rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7"; + sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; @@ -11841,12 +12283,12 @@ cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyphejor"; - version = "20170518.2255"; + version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "2d421507afead407f9daae694df254b160c4ff65"; - sha256 = "0rshg8b2wvw285j4b8f68hp4ilfsk324yh4inshj19c9lkbgqp39"; + rev = "df449180d28691c9bdbef7bcb25aee75b2af50ca"; + sha256 = "1bni88xdm69m4pq79wq2wb3n50c955amimvlbc63xs1ik3ih52q0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -11883,12 +12325,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "20170907.1648"; + version = "20180213.854"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "65ba9eec9adbabc385d88882b7d5fbd2b6292cc7"; - sha256 = "1n2krw36gkikmkbql5am7irx4gismfx2qgiz7lm29mj3kvhqcg64"; + rev = "29961acc1c64710127a5191af6c039cb1fa22203"; + sha256 = "00qwi8frmhas5qgs9i8hx067d60zpycnw3pbd4xgn9nis8fjjnw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11922,22 +12364,22 @@ license = lib.licenses.free; }; }) {}; - d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + d-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "d-mode"; - version = "20161022.717"; + version = "20180409.1043"; src = fetchFromGitHub { owner = "Emacs-D-Mode-Maintainers"; repo = "Emacs-D-Mode"; - rev = "a97c92ced57224287a84e7fc48ba9aac6b2afc08"; - sha256 = "0ln38lkl8qcnpcpjqck3i6hd5zjv43g7vka3kapz2bnz4s33jn3p"; + rev = "09745ba713e08a02fd81c01824aefa6731992a6f"; + sha256 = "0l1rpdfjhwbhzrs1z54s57j4zahx62mym9rdld0rb41ph3k4l49q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode"; sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2"; name = "d-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/d-mode"; license = lib.licenses.free; @@ -11985,6 +12427,27 @@ license = lib.licenses.free; }; }) {}; + daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "daemons"; + version = "20180408.301"; + src = fetchFromGitHub { + owner = "cbowdon"; + repo = "daemons.el"; + rev = "9e6868e2559ea7d70fbad8c419798124f406cc40"; + sha256 = "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons"; + sha256 = "14givkrw9p0m261hawahzi0n8jarapb63kv1s62faq57mqnq23jr"; + name = "daemons"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/daemons"; + license = lib.licenses.free; + }; + }) {}; dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dakrone-light-theme"; @@ -12030,12 +12493,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20171113.528"; + version = "20180327.254"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "27862b655ed04a6b6d1e0ba1a5b8c29e957fb7c7"; - sha256 = "152v2lfpp5asa2dyarig0x3mfy7q91ydkp600qgqbq7xc295r77a"; + rev = "ae26f45800d9e2ad5d76d50bf1902edc1e36d0f7"; + sha256 = "1b8mp4xhcswhzk2r5w0s84kkiil1wzl2s32nfbiphpqg7f0863dj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12048,22 +12511,22 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: + dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20171106.545"; + version = "20180414.1306"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "5d4b2a09d5681408225bb5b9189d37e8b3e95079"; - sha256 = "1m7k73m7qw0aqxx29c8y5liai93csmmhg749k6g0danqzy5dzn81"; + rev = "18a2c4a833f9ece01ccfb5910455fc2f0b0de986"; + sha256 = "09a8gwnh2281kjc1rk6ba5clk020hmz11pz36iy99y1bya043794"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; name = "dante"; }; - packageRequires = [ dash emacs f flycheck haskell-mode s ]; + packageRequires = [ dash emacs f flycheck haskell-mode lcr s ]; meta = { homepage = "https://melpa.org/#/dante"; license = lib.licenses.free; @@ -12093,12 +12556,12 @@ darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; - version = "20171104.425"; + version = "20171227.1045"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-darcula-theme"; - rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976"; - sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky"; + rev = "d9b82b58ded9014985be6658f4ab17e26ed9e93e"; + sha256 = "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -12240,12 +12703,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20171010.2057"; + version = "20171206.639"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "e7c13abeeb18f50658482c7df32701ae4ec375a0"; - sha256 = "09smbgql9ibgn9l729ylas747xj48ipm6as61l6a5pbch376qriw"; + rev = "dc90fc7d526d7e65256e050e3b373908a27b6c45"; + sha256 = "0rpg7mn8h47hqcm24avcy8r7v8k8by1wjk5xk9j24bbv77aswj9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12261,12 +12724,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dart-mode"; - version = "20171024.2137"; + version = "20180219.1614"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "adef2a5b672d503ae3e92b30bb80095879b030d0"; - sha256 = "0bb790rpijlv4cjdcwgqzb249rnz6br557lnn74rb9g52wpabl69"; + rev = "4feac341db7d2b80841fedcf1798dee9070d68bf"; + sha256 = "031f9lkxyhirasj7m0rj67gk8rh3ry640qcppw2p88k937kc6765"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; @@ -12282,12 +12745,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20171028.854"; + version = "20180413.30"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78"; - sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12324,12 +12787,12 @@ dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash-functional"; - version = "20171028.804"; + version = "20180107.818"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78"; - sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12345,12 +12808,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20170923.719"; + version = "20180328.807"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "8594c4f55448148b720eda5b72d51667fb7a8a39"; - sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"; + rev = "5be3f45b0f5e84aa7db3988827c5cf0a8134176d"; + sha256 = "10ac6d2b97jpqrkfd3rnxj1n6a0lzh1n2dxmmz5i2yy5pjfabc5q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12405,22 +12868,22 @@ license = lib.licenses.free; }; }) {}; - datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "20170928.815"; + version = "20180325.1004"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71"; - sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5"; + rev = "d8674ac11f9ebb702e5bbac10a4a6e5542958ef5"; + sha256 = "19d4wximzwdcs0i2r48k6m60wwxcx5f89jw75k4hr0wvx0352a82"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; - sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; + sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj"; name = "datetime"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs extmap ]; meta = { homepage = "https://melpa.org/#/datetime"; license = lib.licenses.free; @@ -12450,12 +12913,12 @@ datomic-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, yasnippet }: melpaBuild { pname = "datomic-snippets"; - version = "20130707.1315"; + version = "20180116.752"; src = fetchFromGitHub { owner = "magnars"; repo = "datomic-snippets"; - rev = "7116eac8e15a16fc72973b96fa855fd9784bbbb8"; - sha256 = "0ry7magy9x63xv2apjbpgszp0slch92g23gqwl4rd564qafajmf0"; + rev = "731fbd31b814ef1521bd7eb1558eeab6a4c2e01b"; + sha256 = "0sbrvd3z32wrpnmarwf9ya0b2c99pg82mxhvjw4b7hggxx65lqsj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4da8ec133ec5e1204966c1b12c9bc0ca1b50d643/recipes/datomic-snippets"; @@ -12597,12 +13060,12 @@ decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decide"; - version = "20170702.1617"; + version = "20180316.1101"; src = fetchFromGitHub { owner = "lifelike"; repo = "decide-mode"; - rev = "90133687118c236142b8110571c463304b3192f9"; - sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s"; + rev = "257f0e39ac60ca375942950b44eeaee04cb9d961"; + sha256 = "0hiv3wlqidj1qd8z5jy800spzrpbca2vgq4zg1lkzvbcmhqvcqqm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide"; @@ -12618,12 +13081,12 @@ decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decl"; - version = "20170314.23"; + version = "20171212.658"; src = fetchFromGitHub { owner = "preetpalS"; repo = "decl.el"; - rev = "b25825de88289fab5212dfd6d18874ca2748123f"; - sha256 = "1imz3w41vblw9gpw42v6hlrz2zdzd6kp5pfvb97v8dw8mc06pyvs"; + rev = "ff7f8a4f1225cbdf141c86172104e67a4cf58c86"; + sha256 = "1ns1ni6aalr541df3a0ylqy0gj68fcsxdfvm4m1ga5532kxnswnj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl"; @@ -12723,12 +13186,12 @@ define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "define-word"; - version = "20171001.1616"; + version = "20180327.1935"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "a425ffe44d62622b86477a622c6188a56bc2bd9a"; - sha256 = "02v9yzvinapr6m7pjxr4kcgqnlm7j21ygh1dhkabarz83v43awh3"; + rev = "f0da313420a3b27f761fcafd01ccd9e32b71bd0d"; + sha256 = "0xvsv2wzkgys99vx1x2by9isagihi97bwbxmrwhfrz47pphdmj5r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; @@ -12765,12 +13228,12 @@ deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deft"; - version = "20171031.530"; + version = "20180112.1155"; src = fetchFromGitHub { owner = "jrblevin"; repo = "deft"; - rev = "c7413a390ac22331ad5226a8c8c007bd08759bc8"; - sha256 = "1rdjffw8vw71ay93zlr2klbr8q4q1sjnw03gsfdyll1q4idbarg1"; + rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4"; + sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; @@ -12828,12 +13291,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20170628.1503"; + version = "20180403.2032"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "1e8b42ff6479fa541eeec5699b4727af136d40da"; - sha256 = "1x9crsc8n5pqyp60h46gz6wz98qaj3bygk11vd39qpfh2hxdxxi6"; + rev = "4f74e6f1bb6519587303e20fe59470853b1a0352"; + sha256 = "15j4f7jjjhrcjycxwzqnwqhm3fyvjnisd41k5lw13dnhbmp1gzx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -12951,22 +13414,22 @@ license = lib.licenses.free; }; }) {}; - dhall-mode = callPackage ({ ansi-color ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + dhall-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dhall-mode"; - version = "20171006.1233"; + version = "20180409.1255"; src = fetchFromGitHub { owner = "psibi"; repo = "dhall-mode"; - rev = "181e5b0df73ce729cf4b711fa76bb43c2581d29d"; - sha256 = "1jw4is9jxx60hsaqjkmravrkxdfn7ni6zl9wx9i7r2y2r5mmwx88"; + rev = "7c9bbb7c1f8ca7f700b45c26a64ca8e0143543ae"; + sha256 = "12swhpsl86pi21smvggqszn1wl71wrw15x7nybcmfgjb4d403716"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode"; sha256 = "1zkspjwllcw9k4nlnif6jdwzl08ki39vmx90apw029n87xhvx7mp"; name = "dhall-mode"; }; - packageRequires = [ ansi-color emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/dhall-mode"; license = lib.licenses.free; @@ -12993,22 +13456,22 @@ license = lib.licenses.free; }; }) {}; - dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: + dictcc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "dictcc"; - version = "20170318.1232"; + version = "20171213.1334"; src = fetchFromGitHub { owner = "cqql"; repo = "dictcc.el"; - rev = "24fb40d0822f97c3d796ae81cb6684cd97263248"; - sha256 = "1faj9c4x306s3ml430s01c9zcg9xgj9p34v630046y4lh4i25qc8"; + rev = "7b988413f7719820cd846827525142a23f401e50"; + sha256 = "0fiv0qgpqwp6ccakr1wh713pm2ylyvl2i54557fym80zgi9iff96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc"; sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm"; name = "dictcc"; }; - packageRequires = [ cl-lib dash emacs helm s ]; + packageRequires = [ cl-lib emacs ivy ]; meta = { homepage = "https://melpa.org/#/dictcc"; license = lib.licenses.free; @@ -13038,12 +13501,12 @@ diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20170709.2000"; + version = "20180201.355"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "bec9889de7bf48d28826039880cec9bfad24a628"; - sha256 = "0f9krv08jlw1sawjajdfy0cp5mzbq7hzvy478z8p54s1fwga6wxd"; + rev = "190622d3fa2c3237529ec073a8fa00aee06023a1"; + sha256 = "0jh270anr2ralixgwsc3wn48jnw3qwz6m18lg0sgwgzyajh0fpb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; @@ -13056,6 +13519,27 @@ license = lib.licenses.free; }; }) {}; + difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: + melpaBuild { + pname = "difflib"; + version = "20171227.718"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "difflib.el"; + rev = "b08850251812d71e62fd6956081299590acdf37b"; + sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib"; + sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6"; + name = "difflib"; + }; + packageRequires = [ cl-generic emacs ht s ]; + meta = { + homepage = "https://melpa.org/#/difflib"; + license = lib.licenses.free; + }; + }) {}; diffscuss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diffscuss-mode"; @@ -13146,8 +13630,8 @@ src = fetchFromGitHub { owner = "alezost"; repo = "dim.el"; - rev = "4b00587dfaabc1f2393b9a9f9993996c288d4445"; - sha256 = "0qvx81glmrsaafcikxz07ym60haxhb39dyspv5x95f2p345f03q4"; + rev = "79b81724b951fedffdd3113f473c18990af837a9"; + sha256 = "1fclhpcrsi09z2np7q3dq3hhb3pqxsvv1l2dqis27afxnb1zshr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim"; @@ -13163,12 +13647,12 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "20161023.1329"; + version = "20180318.1327"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "c91edab065f413910354940742b35bdffeb52029"; - sha256 = "0v4fgbh1byv89iiszifr31j4y2s95xwcq0g9iizxiww7mjrfggyi"; + rev = "788320fe089fafbdf1cb09d2ab4d29d64a804e21"; + sha256 = "0iyhjww7p274x418n1iw1xj2fkmn5k9icav0jyzbwmy83a2nmr52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; @@ -13202,6 +13686,27 @@ license = lib.licenses.free; }; }) {}; + dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dimmer"; + version = "20180217.2011"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "dimmer.el"; + rev = "d033fdda154e688e45cca35902dbff9915351b98"; + sha256 = "1d457029zyabfjhzrgayibdmxfmia5yr7rqn50kc16k3aavw32f7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; + sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r"; + name = "dimmer"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dimmer"; + license = lib.licenses.free; + }; + }) {}; dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: melpaBuild { pname = "dionysos"; @@ -13247,12 +13752,12 @@ dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-atool"; - version = "20160208.433"; + version = "20180302.2340"; src = fetchFromGitHub { owner = "HKey"; repo = "dired-atool"; - rev = "f188ccf6092330dbbefc0e75aa4fad3e7258749d"; - sha256 = "06m2p5sf47ykhkl958x4k0j0rxzrq0wfwf86mvnarlgc1215dbaf"; + rev = "b92e0106827d34fa686e189c7e9a537a3a947a8b"; + sha256 = "1i40zd7y1jf9skr3wi2zqv4awrgff244p1h89r707aq67v1j19yk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool"; @@ -13272,8 +13777,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13293,8 +13798,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13373,12 +13878,12 @@ dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-fdclone"; - version = "20170413.747"; + version = "20180402.2308"; src = fetchFromGitHub { owner = "knu"; repo = "dired-fdclone.el"; - rev = "f55b69e5cd1d45699a0f37468ac8e20fa7a0cff6"; - sha256 = "193mf90d5vds8hswkxasda267ifr6w55vn4pph15lkbmp33wa50n"; + rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c"; + sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone"; @@ -13419,8 +13924,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13440,8 +13945,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13566,8 +14071,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13587,8 +14092,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13625,12 +14130,12 @@ dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-rainbow"; - version = "20170922.817"; + version = "20171202.1448"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13646,12 +14151,12 @@ dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-ranger"; - version = "20160924.335"; + version = "20180401.1506"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13664,22 +14169,22 @@ license = lib.licenses.free; }; }) {}; - dired-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sidebar"; - version = "20171111.1540"; + version = "20180312.1715"; src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "8ccf915061d2fc460b198a102142013044ba4a90"; - sha256 = "1ha1djw2wdxj8y735hjqc9nwm50z4vlh8d6r810r66789gvn7fkp"; + rev = "df9d46615930ad3709303babd45bc12b96d0945c"; + sha256 = "0yj0jlm695v1kzdlvi0lqa0phafvgn1y9bwbin5cikygvn2wjjxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; sha256 = "19a4gsx9wmpc94jd992c7dj5mxfnnij2nc6qnb2lhk8ad69h1lmc"; name = "dired-sidebar"; }; - packageRequires = [ emacs ]; + packageRequires = [ dired-subtree emacs ]; meta = { homepage = "https://melpa.org/#/dired-sidebar"; license = lib.licenses.free; @@ -13713,8 +14218,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "7fbaaa2de73bd571de8eee86205f779340b13c69"; - sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -13772,12 +14277,12 @@ diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredfl"; - version = "20171014.1402"; + version = "20180210.1814"; src = fetchFromGitHub { owner = "purcell"; repo = "diredfl"; - rev = "085eabf2e70590ec8e31c1e66931d652d8eab432"; - sha256 = "19gjs90ai6fv4q7rhssrgc45d9g4frg680p1jgmbxzrd9jdy013w"; + rev = "9b2a89951cee8bdf5c0cb67f9c3ad6ac73abf9cb"; + sha256 = "0x4qhxysmcwllkbia6xkfmlpddxhfxxvawywp57zs8c00193nn1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; @@ -13814,12 +14319,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20170717.1049"; + version = "20180410.203"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "d181475192138b256e124a42660ac60ae62d11d0"; - sha256 = "09pcssxas9aqdnn2n9y61f016fip9qgxsr16nzljh66dk0lnbgrw"; + rev = "bb0de5e8f662c3f522b931c6e2c2340e4ed682af"; + sha256 = "1mk35k0iiyxk5s8ymcx94fhyz188i8r51r73vnndm868g86yslzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -13919,12 +14424,12 @@ disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disable-mouse"; - version = "20170929.1353"; + version = "20171226.1715"; src = fetchFromGitHub { owner = "purcell"; repo = "disable-mouse"; - rev = "81639930bcaeedadbcc19728e91719afcac84613"; - sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc"; + rev = "541363bd6353b8b05375552bab884a6315ea545c"; + sha256 = "1grs3cz2zdw49frvxy4vc1z3ld804kk5g2ad6ln5grprcd188bz9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse"; @@ -14063,6 +14568,27 @@ license = lib.licenses.free; }; }) {}; + disk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "disk"; + version = "20171115.2331"; + src = fetchFromGitHub { + owner = "kensanata"; + repo = "disk"; + rev = "283e54e3be7d08f959076240b2ab324e25632137"; + sha256 = "15fkfl9kjlpsg9p5g0xhm384ipvrzclwxvqk8vz1zixq0wam2ajm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e6e75695594ce17b618ad8786c8a04e283f68b11/recipes/disk"; + sha256 = "1jzkqgjw8xl0jc6ssl5bsdjp2dxw88nss6szvjv7frrhsncaq28h"; + name = "disk"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/disk"; + license = lib.licenses.free; + }; + }) {}; dispass = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dispass"; @@ -14212,12 +14738,12 @@ dizzee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dizzee"; - version = "20111009.616"; + version = "20171201.116"; src = fetchFromGitHub { owner = "davidmiller"; repo = "dizzee"; - rev = "37629f390afb8da03ef0ce81c2b3caff660e12f6"; - sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5"; + rev = "e3cf1c2ea5d0fc00747524b6f3c5b905d0a8c8e1"; + sha256 = "1i32msin8ra963w7af6612d038gxb25m1gj97kbjymjq1r8zbdrv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dizzee"; @@ -14314,6 +14840,27 @@ license = lib.licenses.free; }; }) {}; + djangonaut = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, pythonic, s }: + melpaBuild { + pname = "djangonaut"; + version = "20180403.302"; + src = fetchFromGitHub { + owner = "proofit404"; + repo = "djangonaut"; + rev = "501ecb3cd927975a19ed8beeacb326e01715b78c"; + sha256 = "1h47skyx9yfcgvj5k53h3c40am191dwjw5hyq9jgmc3fkg2dr95j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c1281f59add99abf57bc858d6e0f9b2ae5b3c5c/recipes/djangonaut"; + sha256 = "0038zqazzhxz82q8l1phxc3aiiwmzksz9c15by9v0apzwpmdkj38"; + name = "djangonaut"; + }; + packageRequires = [ emacs f magit-popup pythonic s ]; + meta = { + homepage = "https://melpa.org/#/djangonaut"; + license = lib.licenses.free; + }; + }) {}; dkdo = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dkdo"; @@ -14401,12 +14948,12 @@ dmenu = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dmenu"; - version = "20160228.627"; + version = "20180118.445"; src = fetchFromGitHub { owner = "lujun9972"; repo = "el-dmenu"; - rev = "8dffd614e37d3971f989cbce5849d04d84ee8c76"; - sha256 = "1xx4ccr3mfxay2j3wgd93qw5dpjasaq9mkmmjww3ibpf86ahf7l3"; + rev = "6e492cd4ee4fb39ecda92776707fc270f54d25e7"; + sha256 = "085ap58qfwr7gvrx68dy72z4ph1mvwka5i7ydx58m1a3bb9rshnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98bcdd71a160b9c04f83cc5b939031c9e7b5eb59/recipes/dmenu"; @@ -14485,12 +15032,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20170718.303"; + version = "20180416.911"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "4df5f94c78817a1f3755a7c9b1358349bf287270"; - sha256 = "05ggavxq61w55n6b8g76xpqasfka3rbf3326jwxjrd1p6wzs1d3d"; + rev = "6df5799e358cfd8714bf9aff8368865a5bcf9691"; + sha256 = "091p9wvrnhz42azg9g9ybc08s4gf1fxwjzxc3ar530wc56kdmd7p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14535,12 +15082,12 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "20170916.1438"; + version = "20180324.1052"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "f3c06a43d69dfe80041a82a9365281bd5c65a105"; - sha256 = "1fzz950wb95lp15ak8q4vzls21w9fc3qxqs5hlf50najdw36w52h"; + rev = "c9f131d2c90d652435d407fd36c40feebfed1dad"; + sha256 = "0d5d46i6hplmy7q2ihbvcrnk9jrwa2mswgbf8yca3m4k44wgk6la"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; @@ -14577,12 +15124,12 @@ dockerfile-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "dockerfile-mode"; - version = "20171105.435"; + version = "20180410.936"; src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; - rev = "69bfba7acc6bda0d0a5834c3774fffc145337a63"; - sha256 = "09s13cpldrw19m1n6dh17x85nm5kx1km4f5pmzryll23a3qwcm0x"; + rev = "818e6946fcf2d58438ab78ea06761a372cc5435a"; + sha256 = "0mqb09jcqi74hbn7869gng85sac38mc1hylzcwh7d5qlsyl9dg08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; @@ -14598,12 +15145,12 @@ dokuwiki = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "dokuwiki"; - version = "20170213.122"; + version = "20180101.1659"; src = fetchFromGitHub { owner = "accidentalrebel"; repo = "emacs-dokuwiki"; - rev = "a78289d99068ec3dfb4945877c32751e789d099d"; - sha256 = "0hynymx3gm9nqmpb0a9j8d9g298vsl0gxa9f1yx9xp60mq6y7l3r"; + rev = "594c4d4904dcc2796bbbd2c0845d9e7c09ccf6f7"; + sha256 = "0vqx8npw0i02dhw2yb7s4z7njw60r3xyncw4z8l6fj99pp6pfh15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dokuwiki"; @@ -14661,16 +15208,16 @@ doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom"; - version = "20160121.722"; + version = "20180301.1508"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "kensanata"; repo = "doom"; - rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730"; - sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73"; + rev = "e59040aefc92dd9b3134eb623624307fb9e4327b"; + sha256 = "14lwq30m0s7pkwkbn6vm5gdlkww7sszc6pdhxyinkhj67b0bxpin"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7e41ed64142be89a62fddeceee5e39603a18525c/recipes/doom"; - sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0960deb3b1d106ad2ffa95a44f34cb9efc026f01/recipes/doom"; + sha256 = "1ji2fdiw5b13n76nv2wvkz6v155b0qgh1rxwmv3m5nnrbmklfjh5"; name = "doom"; }; packageRequires = [ cl-lib ]; @@ -14682,12 +15229,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20171109.1437"; + version = "20180328.1556"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "00329ccd8d9fd1bbf31f043288bb087baffed7d0"; - sha256 = "0pdqpcmc6xlvmf03gx5wvfw8q05c5f3kyi53j7z2mc83kp7gq6zz"; + rev = "179c0836a12a37957569f904024b6e65597fb4b6"; + sha256 = "01jhds2si4bdm05vjdb9azd8ix75p9xi80qqrhcmp3asml50ha39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -14703,12 +15250,12 @@ dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dot-mode"; - version = "20161025.1037"; + version = "20180312.1600"; src = fetchFromGitHub { owner = "wyrickre"; repo = "dot-mode"; - rev = "cde2d593cb3f8e31db8778e434d3a4550707d2cc"; - sha256 = "1pvmypsz5c5jkx4g3hvznayyv9cs9yr5sgf251prxnqcl0ivc0y9"; + rev = "6ca22b73bcdae2363ee9641b822a60685df16a3e"; + sha256 = "10lmwra48ihxqxyl54m3yn1zy0q5w6cxqd2n5pbs4lva1yck0z4w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dot-mode"; @@ -14721,6 +15268,27 @@ license = lib.licenses.free; }; }) {}; + dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dotenv-mode"; + version = "20180207.1114"; + src = fetchFromGitHub { + owner = "preetpalS"; + repo = "emacs-dotenv-mode"; + rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea"; + sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode"; + sha256 = "1lwfzfri6vywcjkc9wassrz0rdrg0kvljxsm6b4smlnphp6pdbbs"; + name = "dotenv-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dotenv-mode"; + license = lib.licenses.free; + }; + }) {}; dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dotnet"; @@ -14745,12 +15313,12 @@ download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "download-region"; - version = "20160430.1116"; + version = "20180123.1733"; src = fetchFromGitHub { owner = "zk-phi"; repo = "download-region"; - rev = "eb9e557529a73b4cfc8281c70dd0d95db333fffa"; - sha256 = "0v52djg39b6k2snizd9x0qc009ws5y0ywqsfwhqgcbs5ymzh7dsc"; + rev = "bbba3ecd80818d5d940d41fe89a6e2ec5dd2c53c"; + sha256 = "1cwlbdmdils5rzhjpc3fqjmd3dhalk6i7bxskpahbrr9xxfq0iw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7801d9fac121f213609a802fe9d88bdc5364d1f3/recipes/download-region"; @@ -14850,12 +15418,12 @@ dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dracula-theme"; - version = "20170412.845"; + version = "20180416.652"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "62df5de68c73d34faaa0191a92ce3ebce589bf24"; - sha256 = "0wpbscqaszr2mg0hijamcz6l9nknsi12mwdbib16ghlh6y9mj4ia"; + rev = "74094e6fd5d0f15b92d82c73b3b3d9f13949d5dd"; + sha256 = "0apimfivs0g4m9qy1m3c8id6ycr2lwxdpd00crxbka284g440nzj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -14997,12 +15565,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20170926.38"; + version = "20171120.1509"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "b0ca2c39650136f7e5672461e64397b9add30b92"; - sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6"; + rev = "47fda0a38a5b197f4606137d9c3b7d44aaeaa886"; + sha256 = "1rg46prsymxc9lyhk7cbr53089p970mmmybiir2qsyx2s4m6mnfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -15081,12 +15649,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "20171001.1233"; + version = "20180319.648"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "7fd55af3b0311ea24b68397054e705c835fa5ef1"; - sha256 = "1sgmd1zqdwa1f6y8d6vaacyipkqn2ivvaim1xndbkihgmhyn4kf0"; + rev = "0ac070c9576e4ebab12cd6800ac2ac3abcecc2c1"; + sha256 = "0dambn5l0wvbhccvhh5hbz9hw66y4mp1la3wj85dl9kgr7hq1ry7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -15144,12 +15712,12 @@ dumb-diff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dumb-diff"; - version = "20171106.1659"; + version = "20171211.1322"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-diff"; - rev = "a89162a41be228f587f6d778ce2a350ee0b61792"; - sha256 = "1wznlaphsdh6bz5zppwabnmbsymz09b6aqadwr8b3l1r841s4y9v"; + rev = "1a2331d283049b71a07c1b06b1e0627a950d55f4"; + sha256 = "05gmpp4s9y2ql27vb5vpqn3xh35qjfxgq9gzyvg86df43qfl8wvl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf7fa0b4235247d82569ed078f92774f10afa45c/recipes/dumb-diff"; @@ -15165,12 +15733,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20171105.1624"; + version = "20180323.1942"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "ce4eaa49b629140806a8808712356a5a09c2abad"; - sha256 = "1bjpqghfp1jprhaciqjm11n6bdy5wzph625p2v0xcd59pr8jsj6p"; + rev = "9e4090ac9108da9a794194b831dc6226998c623b"; + sha256 = "1hablgysv2a2jlwnp7hgxglraznbc992ikd3myxfspqr3f6rzm9q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15249,11 +15817,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20171012.1339"; + version = "20171211.722"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "9e446540a794"; - sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi"; + rev = "87db00b912be"; + sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -15350,22 +15918,22 @@ license = lib.licenses.free; }; }) {}; - e2ansi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + e2ansi = callPackage ({ face-explorer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "e2ansi"; - version = "20150220.1513"; + version = "20180403.1215"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "e2ansi"; - rev = "bd047d3d6ad02a0679582d5786afe9aee656da90"; - sha256 = "0d18kdpw4zfbq4bkqh19cf42xlinxqa71lr2d994phaxqxqq195w"; + rev = "f886e687d50ff58063a92d40623f2400fa913af0"; + sha256 = "0wg16hdmhbhll0ffp2hrqmr12ddai2s6gql52q6pz9k3lw6v0d5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e655a3fdfae80ea120cdb2ce84dd4fd36f9a71e/recipes/e2ansi"; sha256 = "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94"; name = "e2ansi"; }; - packageRequires = []; + packageRequires = [ face-explorer ]; meta = { homepage = "https://melpa.org/#/e2ansi"; license = lib.licenses.free; @@ -15542,12 +16110,12 @@ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "eacl"; - version = "20171109.40"; + version = "20180308.1656"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "0ee57b495036b6c1b54d668e84be373f8a1c8d9a"; - sha256 = "1fizb09g0dc9rzlj34n26vi12h3gk4mn96iyrsa60in5c9yn9f04"; + rev = "80113a9f6cc246cef67e3e20ec052788c38ab116"; + sha256 = "1pwppn0m288d6j9b7cdshgc3rxv0nfs94klc1fpsyfxqx0a6f23z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -15602,27 +16170,48 @@ license = lib.licenses.free; }; }) {}; - easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "easy-hugo"; - version = "20171025.1516"; + version = "20180416.749"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0"; - sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i"; + rev = "b01585991ca1885e9cf10dc41481116feb091c89"; + sha256 = "1nac2al4hi4lcarj325957jgkkfgfkgpw6mzmbcqzqvy02r2v7g4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g"; name = "easy-hugo"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs popup ]; meta = { homepage = "https://melpa.org/#/easy-hugo"; license = lib.licenses.free; }; }) {}; + easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "easy-jekyll"; + version = "20180416.811"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-easy-jekyll"; + rev = "670c289d7dabc9e991ba78cdde17fb659f23eb50"; + sha256 = "1myqhny6v5xdz55xi1ayfash5r3ihkyy2cykwhjkrpp339695bxf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; + sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv"; + name = "easy-jekyll"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/easy-jekyll"; + license = lib.licenses.free; + }; + }) {}; easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill"; @@ -15689,12 +16278,12 @@ ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "20170810.631"; + version = "20171231.2216"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "65a131b95a1e934c0cab384ef533b0ac58961f0c"; - sha256 = "1b8i7qh743lhmkrmw1ac486i8nk8fdxl0ayxjs2sfb8fk4621rfr"; + rev = "1740118125ae7aa6ba82d36e1fe0e69065a6fcaa"; + sha256 = "1i5r8m34zf7ya1kzgm8hsx707phq5smf2x6y2a1ykbnfkk39gmbf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -15731,12 +16320,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20171110.1"; + version = "20180416.350"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "ab9596e03b749785919857f9785dc37c3c5dfc4e"; - sha256 = "0xn1dna7bwk5m144z53lpv0fxh5mg42gk8a7mgfz9d6yj890k33w"; + rev = "22709d2b5e973b321dc8412f9a26acb156a076e1"; + sha256 = "1xh7gmshn1ra027pqbvc06qxjs49ijby0kiz37qdqz7rvq2xgl6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15773,12 +16362,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20171024.1038"; + version = "20171113.1754"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859"; - sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym"; + rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; + sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15815,12 +16404,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "20171110.627"; + version = "20171216.408"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "c8092db08be5337ff3f3dd2857bfa94e360945d2"; - sha256 = "1dkinyigacb4yxqikd9za4inbh7yz7pl8bhrpihrxzabxirmvw55"; + rev = "3a77ba9f1064c2bca47b401974c009e65727c46e"; + sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -16151,12 +16740,12 @@ edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-server"; - version = "20170725.859"; + version = "20180120.752"; src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; - rev = "3ba9de868cb8ed37d8a0982fb99cf023d76b3c90"; - sha256 = "0jknhdg33f1vgcfflp4bmvbnbh12h9vxnbyyf9dnibcln56nhar5"; + rev = "e1f86b4ff0b8b872a121287bde4875a7c3c4f8e2"; + sha256 = "0vxahv098bh3bk8iphj7nvvajf31mc5yr9l1fzs127qvy2x62b0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; @@ -16193,12 +16782,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20171107.301"; + version = "20180408.2210"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "2ec90f13ad98481c5324eea4877de7a80d814d86"; - sha256 = "160f7ciy8yp75gja3abm4rjy61wmk2b7b0k032qimiawkvg57bx2"; + rev = "35e94de8223c407901548989cf4c9547ba692ffa"; + sha256 = "16d8njpvcsc845mbjyzjskkdgbvcy7m4lvy87sl14fznb12fims6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16214,12 +16803,12 @@ editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig-charset-extras"; - version = "20170712.108"; + version = "20180222.2057"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-charset-extras-el"; - rev = "bf2d23c57a485ee41d21a9a0015d5bd52baabf85"; - sha256 = "0qgg2v9xpr8bm97pj4pxd9q6j8i6h94gb1j7lla0sn80cwymxwrx"; + rev = "ddf60923c6f4841cb593b2ea04c9c710a01d262f"; + sha256 = "1v5a6s4x7cm6i0bxaqdpsg8vqj479lp5h45glx4ipk0icdq8cvd9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras"; @@ -16394,8 +16983,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "61df217004a753cbbd046319f9d2617b88f574bf"; - sha256 = "12scqa9s413vvpfkvxyly1v9d3y6bq7b18bdd599q7nd786d1vvj"; + rev = "2f8f744bd0a8d1c307922c6636f1c337d45a55bc"; + sha256 = "1ds0fxi12z3cls0wavyq5anw2jfhmc2a6mx3g4mnxfr39sjr4q2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16411,12 +17000,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20170601.817"; + version = "20180228.1704"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "93ccd450d2d9e5db27aebb024a1b2ed56d5131dc"; - sha256 = "0izxsckmkdw70cz3ljar2r4iv784c43mnzjkayly08hlabq1g6b6"; + rev = "719809679c1a60887735db41abae53b61f08ef59"; + sha256 = "10f179kl53la4dyikzl1xysccx4gk04skzwaw3w1pgr8f5fjppxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego"; @@ -16431,15 +17020,15 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20170906.1216"; + version = "20180330.1330"; src = fetchgit { - url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; - rev = "25f9af215781163b10d411fe2b5674033eb24165"; - sha256 = "0mwy5a67hap9bx1klk2pzfaav65drd6mfkkhnk2045z4jvzgkn70"; + url = "https://git.tuxfamily.org/eide/emacs-ide.git"; + rev = "4023c7b19ed75e0e2a58af7b737aff23589ab6f9"; + sha256 = "0j3gdsnk64xnk028rrc3ngyzjrzsyafpdg1kxnf1p10jrig6pwyy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide"; - sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide"; + sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni"; name = "eide"; }; packageRequires = []; @@ -16472,12 +17061,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20171107.1314"; + version = "20180414.1838"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "f63451ca038d6e6c68cfc511836a37d697d0d459"; - sha256 = "05ch2nll2359klq0picm51hkl82chv39npc6jdlc6y7mvvjicqvp"; + rev = "ed4ae8006ca58c39c5e09925fb51c0f3529cb199"; + sha256 = "0clww9329ysipdby8d3qwkx7pmrls075j0kpsqw3h8mm9hb48wgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16542,30 +17131,22 @@ license = lib.licenses.free; }; }) {}; - ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: + ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20171019.1304"; + version = "20180328.623"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "bd5e3f334044c8b33e2a0a2e0d8767aa6f0e03b8"; - sha256 = "1pyvpsi4krbmdx2739nnw5g71x3y209xwjl5a7xqbczy9qqxs18n"; + rev = "dac78aa9fd1979a0c6caccbe3698cad5f0e32d9f"; + sha256 = "099lkldwxnw7ghpj42z07i1bv7jz8438xq7mv4vz6s2d6qwc07lq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx"; name = "ejc-sql"; }; - packageRequires = [ - auto-complete - cider - clomacs - dash - direx - emacs - spinner - ]; + packageRequires = [ auto-complete clomacs dash direx emacs spinner ]; meta = { homepage = "https://melpa.org/#/ejc-sql"; license = lib.licenses.free; @@ -16595,12 +17176,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20170813.1436"; + version = "20180126.1603"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "07c75d259d89dabb34878d6085a94fb11aef1947"; - sha256 = "1b1cgfh7wzcw5m32mhn9w6gzllr09hfv2ghdb4wwaw567xcqd4qh"; + rev = "e065feaa545087dd49f690a838237fe6239b00f6"; + sha256 = "18hd7x3rk335r8ps1mpg1lpymywaswpg3w2s3m36khd56m3vd4yf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16739,22 +17320,22 @@ license = lib.licenses.free; }; }) {}; - el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }: + el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-spice"; - version = "20140805.1138"; + version = "20180128.921"; src = fetchFromGitHub { owner = "vedang"; repo = "el-spice"; - rev = "65d9ec84b581a5867eebbc58de93958e992ca80d"; - sha256 = "1sba405h1sy5vxg4ki631p4979gyaqv8wnwbgca5jp2pm8l3viri"; + rev = "4e0852ebf5d8e9cbb3eaaa6ae9c53d126b53f58c"; + sha256 = "08mkn4qfxax3fgppw79117phm05hihifwj4pgll9ivrilbf75lb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice"; sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg"; name = "el-spice"; }; - packageRequires = [ thingatpt-plus ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/el-spice"; license = lib.licenses.free; @@ -16809,8 +17390,8 @@ src = fetchFromGitHub { owner = "sigma"; repo = "el-x"; - rev = "417851972dd967ab82a772256c3d9c1b343e7f82"; - sha256 = "0vm40044b4r132py9l12d8d1nwp4553xj8a4w2wfrg651wkwp3g8"; + rev = "e7c333d4fc31a90f4dca951efe21129164b42605"; + sha256 = "00wp2swrmalcifx9fsvhz9pgbf6ixvn8dpz1lq6k6pj9h24pq7wh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0346f6349cf39a0414cd055b06d8ed193f4972d4/recipes/el-x"; @@ -16847,12 +17428,12 @@ el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2org"; - version = "20170804.2142"; + version = "20180311.855"; src = fetchFromGitHub { owner = "tumashu"; repo = "el2org"; - rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e"; - sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b"; + rev = "81f1c97db8911f5bdf92c729630ab509de4ec73f"; + sha256 = "152y6a6qjch2w84axghzcqiswhx1cq5bq1r1gjfffh41wsddqb53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; @@ -16865,6 +17446,69 @@ license = lib.licenses.free; }; }) {}; + elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "elbank"; + version = "20180316.627"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "Elbank"; + rev = "28143b3076f2ac64a9db84a53e9af0ad43fe4322"; + sha256 = "0gdhdq3g34m1jqpq4m12pbf70sl5jrmj8wbakj36vh540p12f0ph"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; + sha256 = "1ry84aiajyrnrspf7w4yjm0rmdam8ijrz0s7291yr8c70hslc997"; + name = "elbank"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/elbank"; + license = lib.licenses.free; + }; + }) {}; + elcontext = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, osx-location, uuidgen }: + melpaBuild { + pname = "elcontext"; + version = "20180225.2211"; + src = fetchFromGitHub { + owner = "rollacaster"; + repo = "elcontext"; + rev = "d34e68f0580cc3d3eda8c85fc446c71094fc52fc"; + sha256 = "05z0xfy9s0iqzvy63bnfhdpqc04yikwairb8b00k9xkspd3sdfdl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12bcb0bfc89c1f235e4ac5d7e308e41905725dc6/recipes/elcontext"; + sha256 = "1firdsrag7r02qb3kjxc3j8l9psvh117z3qwycazhxdz82z0isw7"; + name = "elcontext"; + }; + packageRequires = [ emacs f ht hydra osx-location uuidgen ]; + meta = { + homepage = "https://melpa.org/#/elcontext"; + license = lib.licenses.free; + }; + }) {}; + elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elcord"; + version = "20180411.1207"; + src = fetchFromGitHub { + owner = "Mstrodl"; + repo = "elcord"; + rev = "0cef4ca13b00d79507292d5591be8ffb7df5a9ca"; + sha256 = "1571r8iwrf4dagjr2pv7dgs1i0f20nq6jdkxm2dlwvkblcnlx3fm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord"; + sha256 = "0a1f99mahaixx6j3lylc7w2zlq8f614m6xhd0x927afv3a6n50l6"; + name = "elcord"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elcord"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -16886,24 +17530,24 @@ license = lib.licenses.free; }; }) {}; - eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }: + eldoc-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }: melpaBuild { - pname = "eldoc-overlay-mode"; - version = "20170909.651"; + pname = "eldoc-overlay"; + version = "20171219.140"; src = fetchFromGitHub { owner = "stardiviner"; - repo = "eldoc-overlay-mode"; - rev = "4512e5499cd4f647ad3b5212b853f0299d6cff47"; - sha256 = "1dp7pjr89bq0fjjqvha2smw54aymy4pyjx643qp0x1dhpwa7bv5h"; + repo = "eldoc-overlay"; + rev = "a391396f4cdf30a2f27a4c426b58b44ab3d0f0d0"; + sha256 = "1g1sp6ws4y28536jkf5crbkmnrl7jcbh5s3ysyys6xn8gvz0vm17"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eldoc-overlay-mode"; - sha256 = "09rhh8rj9rcdnl1jfnjlyzcdr56h9yhmfsb27i4v59g06x8qc954"; - name = "eldoc-overlay-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f865b248002d6d3ba9653c2221072a4aa54cd740/recipes/eldoc-overlay"; + sha256 = "0nn6i89xbw8vkd5ybsnc1zpnf3ra4s8pf01jdj2i59ayjs64s28x"; + name = "eldoc-overlay"; }; packageRequires = [ emacs inline-docs quick-peek ]; meta = { - homepage = "https://melpa.org/#/eldoc-overlay-mode"; + homepage = "https://melpa.org/#/eldoc-overlay"; license = lib.licenses.free; }; }) {}; @@ -16931,12 +17575,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20171022.625"; + version = "20180322.506"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "278086fcffa1a4607392ca2b0ad57522e492b52c"; - sha256 = "1kf1281igi6pzg04fsiqwhwrlqv56c1fi56a4z6ch76wh5s63vj3"; + rev = "d47149a8027907b67dfe4787a53b247be34ad4cb"; + sha256 = "0ipzhmv105621lhwjm7dvc12ap38hcg62z8z805czn6yinw6wydg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17015,12 +17659,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20171103.737"; + version = "20180222.746"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "312b3bf4ca542dd84e3cc502c5297498d4c1f7ef"; - sha256 = "0633gvyk1xh5624g0lp3sriqmrzdhb8dbc6xvmnwqrcqdb3yrigv"; + rev = "8668227f93a46fdd8d5d8746d428dd2da061e253"; + sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17036,12 +17680,12 @@ elfeed-goodies = callPackage ({ ace-jump-mode, cl-lib ? null, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, popwin, powerline }: melpaBuild { pname = "elfeed-goodies"; - version = "20160926.209"; + version = "20171126.2251"; src = fetchFromGitHub { owner = "algernon"; repo = "elfeed-goodies"; - rev = "f3f2595c845a8001d1bb28a185cc05cf984998ef"; - sha256 = "1qfny4qmhy2cb0yxjpzn039kmzhy3n29mik0am0csx9a71gii109"; + rev = "fc0c3e72f9fcd7bbf5237f6f2323bc666e8240b4"; + sha256 = "16qkh3cp764hayj4n003sm1q673bq7b3rzf1mii5f3xp6n8i84b7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ebb8d23961fd9bfe101f7917caa3b405493f31/recipes/elfeed-goodies"; @@ -17064,12 +17708,12 @@ elfeed-org = callPackage ({ cl-lib ? null, dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "elfeed-org"; - version = "20171113.356"; + version = "20180129.507"; src = fetchFromGitHub { owner = "remyhonig"; repo = "elfeed-org"; - rev = "1a2bacc160d4e164f012ebf23f3ecccac85df18f"; - sha256 = "0g8hhcfg2rahq6mry4aqqggkc7s26q8is9akzrxwi7dlbhc1ljd4"; + rev = "b9d09a554127244d4807a3d2d90e062df63b2fd5"; + sha256 = "0szij299pfxbgqfps8njnxa2w862zzn40crsbc1ppww267dbp60j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elfeed-org"; @@ -17082,15 +17726,36 @@ license = lib.licenses.free; }; }) {}; + elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elfeed-protocol"; + version = "20180409.813"; + src = fetchFromGitHub { + owner = "fasheng"; + repo = "elfeed-protocol"; + rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec"; + sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; + sha256 = "1gd2ny764qsnnqf3j7rbdqhh7hqd5c0fzwxx6wacd0dpbq4w56qi"; + name = "elfeed-protocol"; + }; + packageRequires = [ cl-lib elfeed emacs ]; + meta = { + homepage = "https://melpa.org/#/elfeed-protocol"; + license = lib.licenses.free; + }; + }) {}; elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20170709.954"; + version = "20180121.1036"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "312b3bf4ca542dd84e3cc502c5297498d4c1f7ef"; - sha256 = "0633gvyk1xh5624g0lp3sriqmrzdhb8dbc6xvmnwqrcqdb3yrigv"; + rev = "8668227f93a46fdd8d5d8746d428dd2da061e253"; + sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17103,6 +17768,27 @@ license = lib.licenses.free; }; }) {}; + elgrep = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elgrep"; + version = "20180302.527"; + src = fetchFromGitHub { + owner = "TobiasZawada"; + repo = "elgrep"; + rev = "5e982024250e75fe02aee358a542ae3ed2a472d5"; + sha256 = "0bkiay3mmk00lay2cv91qmas346ffhb2nlrg6xw083s5vk45fbbv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep"; + sha256 = "0b8dma52zv57sh1jbrabfy6k5lzixs7f541s8dsqyrg0fzlq460j"; + name = "elgrep"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elgrep"; + license = lib.licenses.free; + }; + }) {}; elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }: melpaBuild { pname = "elhome"; @@ -17124,6 +17810,27 @@ license = lib.licenses.free; }; }) {}; + elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "elisp-def"; + version = "20180410.224"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "elisp-def"; + rev = "ff0730b8110f776862b29bf0b66e396fab2aaafb"; + sha256 = "1zdbb1mgmb8hkzsmp6l4mv61831bw8ybfsfcwalnvrw5fvfwpaik"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def"; + sha256 = "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz"; + name = "elisp-def"; + }; + packageRequires = [ dash emacs f s ]; + meta = { + homepage = "https://melpa.org/#/elisp-def"; + license = lib.licenses.free; + }; + }) {}; elisp-depend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-depend"; @@ -17187,43 +17894,43 @@ license = lib.licenses.free; }; }) {}; - elisp-lint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-lint"; - version = "20150430.1558"; + version = "20180224.1242"; src = fetchFromGitHub { - owner = "nschum"; + owner = "gonewest818"; repo = "elisp-lint"; - rev = "1168b12575f1ed54ee523d34a90757459a6e42a3"; - sha256 = "1ci6nyk1vvb3wgxzarbf6448i9rjb74zzrhcmls634gfxbryxdyy"; + rev = "04b0d36ec0e4dc1bb54c2bf4c2d16b2af8cf6a39"; + sha256 = "04hxpfgvkh4ivaxqbhnp3j68i1kqzg1v19bssnvcagll2mm4r3xg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3744ee1bbde7ec8cecf2796d6ee875c327eb698c/recipes/elisp-lint"; - sha256 = "102hrxdw72bm11a29i15g09lv7jlnd7vkv7292fm3mcxf5f4hkw9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint"; + sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63"; name = "elisp-lint"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/elisp-lint"; license = lib.licenses.free; }; }) {}; - elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: + elisp-refs = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20170831.1347"; + version = "20180331.1206"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "9ac6c1a45c620a6d7e0fae3739558fa08b3758a3"; - sha256 = "1yniapnkr3124isnfkv1j4mqwdmb1xb7xngjwprhjlg3k1zj3rfl"; + rev = "788f6f65d5171b1887b3ff9e4cad900e8046b2b1"; + sha256 = "0c7hcbjqynw6k5idpmfxn6xbr192ahhk8a2g72npap97flpw6cdq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx"; name = "elisp-refs"; }; - packageRequires = [ dash f list-utils loop s ]; + packageRequires = [ dash loop s ]; meta = { homepage = "https://melpa.org/#/elisp-refs"; license = lib.licenses.free; @@ -17278,8 +17985,8 @@ src = fetchFromGitHub { owner = "elixir-lang"; repo = "emacs-elixir"; - rev = "861788186f4dbd500209656dcf38a15b3efe74dd"; - sha256 = "1py8slpda3vsw88v1wp1imnn3r17hz54621c6ks8xm75lnhn60ra"; + rev = "e928aaf118e399fca2df47c91712b9a469eb1764"; + sha256 = "0x0ip0mh7zn6lmzj3p3v3jlc9x1j0afrq5rfgi22zk40zkyh26zn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode"; @@ -17316,12 +18023,12 @@ elm-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "elm-mode"; - version = "20171111.2331"; + version = "20180114.9"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "527c269543f203cfaf87f406369137424f791a5a"; - sha256 = "0az7x05ds98ccr4lp6n4zqmhd9bkqxlzh7g9k1va8l9mq862fy8r"; + rev = "09c6e62e14a2c9afaad03a867c7a268b6bc68ab0"; + sha256 = "0vc0m5rg9py01w07pifg3fp2z9cna6y21k2xmfns7p6i5c5fjj2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17526,12 +18233,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "20171012.15"; + version = "20180228.1636"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "f4a84f71368dc343d09093312d1b2c2e9a5a3987"; - sha256 = "07j3bsv3vinpkxxbw4fyfgb5jb1kcd068821l59pk9yrw145kb96"; + rev = "6ca78e3fb69ef582da1a01f1d193e07ae8223142"; + sha256 = "0s0c5qqg1cl63kig7kc4fx9rz4kgchxc3w3ywgh5csmgwlkpg0id"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -17547,12 +18254,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20171110.657"; + version = "20180415.1232"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "6c10424da59909e9b7f7e6bd345522fc4c011b2d"; - sha256 = "0cwz6xgrd827798gq46l08wsc3l1kh8bh5zp3vdik3cqdcqk7lxz"; + rev = "911d1c58df1c0ff9ce8057d07b13c06759f2e0e4"; + sha256 = "0cyk2467gcxz0vf63p0db9y6rij9hb7251lv6s054mzy3kbcn7zm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17573,6 +18280,27 @@ license = lib.licenses.free; }; }) {}; + elpygen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "elpygen"; + version = "20171225.936"; + src = fetchFromGitHub { + owner = "vkazanov"; + repo = "elpygen"; + rev = "21929c997a05968f9eefe52b85a76ceaab3b0d81"; + sha256 = "093ck4dkdvbgafb1bmkmszg1ba81ns5kjbk2iq2b5p9dvfcjjr3k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e670bd79a85c4e2a9ca3355feb8aaefa709f49cb/recipes/elpygen"; + sha256 = "01fak1dz9mna3p4c2r0scb0j10qk3lvpq270jy6rvzlcbwri4akl"; + name = "elpygen"; + }; + packageRequires = [ emacs yasnippet ]; + meta = { + homepage = "https://melpa.org/#/elpygen"; + license = lib.licenses.free; + }; + }) {}; elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elquery"; @@ -17594,22 +18322,22 @@ license = lib.licenses.free; }; }) {}; - elscreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + elscreen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen"; - version = "20160613.251"; + version = "20180320.1902"; src = fetchFromGitHub { owner = "knu"; repo = "elscreen"; - rev = "35c68a7503179fa618639e1c90b43bec9812a988"; - sha256 = "0gvhnhcchrzlj0kbi48rzmqx2nz68d5lyp7f8jk0lbbbdrdv36ka"; + rev = "02164afab2c5fbff6e4aa7c59e0daedc6c504772"; + sha256 = "1jzp7w2c9xl8x8kdxcchgp8s3ygvj70pi2vwwg1qilkya7yv61p0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6140694c1dea0a573586d23d1f63d46c9b22936/recipes/elscreen"; sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s"; name = "elscreen"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/elscreen"; license = lib.licenses.free; @@ -17765,12 +18493,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20170805.449"; + version = "20180324.936"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; - sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; + rev = "cf1000f5d214363fe545a4ce849166194b8fb2c8"; + sha256 = "0k62qcmhav7pshrn1f55sar6lz37l26aqaqlkkd20h60fhbqp9aj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -17867,85 +18595,85 @@ license = lib.licenses.free; }; }) {}; - emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: + emacsql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20170807.1901"; + version = "20180205.1835"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; - sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax"; name = "emacsql"; }; - packageRequires = [ cl-generic cl-lib emacs finalize ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/emacsql"; license = lib.licenses.free; }; }) {}; - emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: + emacsql-mysql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-mysql"; - version = "20170410.1008"; + version = "20171218.1827"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; - sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy"; name = "emacsql-mysql"; }; - packageRequires = [ cl-generic cl-lib emacs emacsql ]; + packageRequires = [ emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-mysql"; license = lib.licenses.free; }; }) {}; - emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: + emacsql-psql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-psql"; - version = "20170410.1008"; + version = "20171218.1827"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; - sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3"; name = "emacsql-psql"; }; - packageRequires = [ cl-generic cl-lib emacs emacsql pg ]; + packageRequires = [ emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-psql"; license = lib.licenses.free; }; }) {}; - emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: + emacsql-sqlite = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "20170806.1551"; + version = "20180128.1252"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; - sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; - sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; + sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x"; name = "emacsql-sqlite"; }; - packageRequires = [ cl-generic cl-lib emacs emacsql ]; + packageRequires = [ emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-sqlite"; license = lib.licenses.free; @@ -18038,12 +18766,12 @@ ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ember-mode"; - version = "20161105.855"; + version = "20171208.559"; src = fetchFromGitHub { owner = "madnificent"; repo = "ember-mode"; - rev = "3e45cf3e290ac422c1b9713f3e7db5c634bcdaf2"; - sha256 = "0g6xmqrjqzwl67ij05lwk72fdhm77p3b45jf7vc8xfn050nvn06l"; + rev = "755256782478cb724edd8f111225d7c8d342f90c"; + sha256 = "02x12b26l9qyq9cmg56ys222qxbc8zldw40scq3mfhfqqk4b43g7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode"; @@ -18143,11 +18871,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20171105.502"; + version = "20180412.639"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "11954d51e976a83635971fc000a163b0e7056134"; - sha256 = "1dfyc0f6wfvw90lw135mf6vx5yqx7nwbi5b3a3c6dzsm060dzsqx"; + rev = "9b7b50a89bc4f9df7f9edd6e939508288f0ffa9b"; + sha256 = "0v271gk6q77zs0gdp9asbqd8alrn6ifxzzjkqb3hd4xdafv35sf3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18160,6 +18888,27 @@ license = lib.licenses.free; }; }) {}; + emms-bilibili = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "emms-bilibili"; + version = "20180102.2018"; + src = fetchFromGitHub { + owner = "0xDEATHCODE"; + repo = "emms-bilibili"; + rev = "294bca3dfc42fe3a55fb326ab39bc0fcfc8c5090"; + sha256 = "0q8z3q1agwgb3d0kpvac7a98p3q4ljjnv404cf9kihjjfxvh4vm5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/533f96d1e68eda20b2d2e7f8eb3e7fa118904970/recipes/emms-bilibili"; + sha256 = "1mx3fn2x526np8awjn0ydsqh59b4aznf3sig410fbr6wk6pa6y47"; + name = "emms-bilibili"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/emms-bilibili"; + license = lib.licenses.free; + }; + }) {}; emms-info-mediainfo = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-info-mediainfo"; @@ -18226,12 +18975,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "20170628.303"; + version = "20180415.1958"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "8c72282c98f9b10601e9a6901277040cda4b33aa"; - sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6"; + rev = "c7efefd0b41fa910436a91eb3bca4db3a85ad940"; + sha256 = "0h40nhrzndzhdq3ra8bzqg3gczbmjf010n0nan6dril427qvxdjw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -18247,12 +18996,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 = "20171102.811"; + version = "20180325.417"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "57924973b9e7a3b059b6dd40decb194abc596875"; - sha256 = "0q1sfb2rgzpvxbpq0d3zl03bc8abyzq2d5pvy8z0ighwbhabkrrs"; + rev = "f6b37f5878c741124d5fca43c5b80af873541edd"; + sha256 = "1sxzh1bhdwln7kcn07agayyhmgyrbmmhgc3f85336xybc6ljpqs8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -18268,12 +19017,12 @@ emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-simple-mpv"; - version = "20170930.2216"; + version = "20180316.849"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-simple-mpv"; - rev = "1af7838037c86872e897bea872d279ff080c28c6"; - sha256 = "1xgkpw89pyn4p37l5rz9dw8yg065slzq8l5z69n6nam9hndcnjsh"; + rev = "101d120ccdee1c2c213fd2f0423c858b21649c00"; + sha256 = "1i6rxkm0ra0jbkkwgkwxg3vk5xfl794h1gkgnlpscynz0v94b6ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv"; @@ -18415,12 +19164,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20171018.744"; + version = "20180320.1933"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "001c3adcc521223f6b53a2243635528b2cb7f7e8"; - sha256 = "0hsrlzx8bslzhpipryxxqrdaiw66cgak14p8v47l0ylvwmxxqn13"; + rev = "a86afc14e20ec7287c2b37f5b64318c209c9bbd3"; + sha256 = "08z699ycyidm2c1yi0zhrg6nhhdf3gqx3yi6h9z4n61ns0irg8r5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -18433,6 +19182,27 @@ license = lib.licenses.free; }; }) {}; + emojify-logos = callPackage ({ emojify, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "emojify-logos"; + version = "20171125.214"; + src = fetchFromGitHub { + owner = "mxgoldstein"; + repo = "emojify-logos"; + rev = "96c74383a7c69e839ba41de3507154ca4ad564a1"; + sha256 = "1z2rhs2kvafcfqqvq78yb5zp0pnn9s0mhng0rymfghi704cdifm6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/114d5596a7b36f47c150c413c6ecc74de36ca239/recipes/emojify-logos"; + sha256 = "0kgci1svi80xnz44bvh19si8bcjllrkm9rbd8761h77iylkqs3q5"; + name = "emojify-logos"; + }; + packageRequires = [ emojify ]; + meta = { + homepage = "https://melpa.org/#/emojify-logos"; + license = lib.licenses.free; + }; + }) {}; empos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "empos"; @@ -18532,12 +19302,12 @@ engine-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "engine-mode"; - version = "20170812.2007"; + version = "20180401.946"; src = fetchFromGitHub { owner = "hrs"; repo = "engine-mode"; - rev = "408932727bb723017eaf6338e50cb6d1266b8df8"; - sha256 = "1wl172ldmdw6gcdzbbf7dln7m55112kq42jzs42xbihm0v1x8xlb"; + rev = "fd5a235b2c93b95143d676e6b654e388d7cdd956"; + sha256 = "0lynwd7s1mjppynh8424qk30jzcr384wvr21bqy6ylsxs19kqg0w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode"; @@ -18553,12 +19323,12 @@ enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20171101.1638"; + version = "20180403.1251"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "9467cd7fc8b6bb3caf644b223e3046fc32013ccb"; - sha256 = "0spsgfkka6sld8ac3m2biydyp8xj84vxa0w7apqvhhmfk3klbbhf"; + rev = "fd50e71913e4dc714f71020701ab398a18b524b6"; + sha256 = "0al8bbhfjxqh40hkpiaziz5vsfy2m5saj7wcvs6xivz1ph5ass0b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -18637,12 +19407,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20171027.1433"; + version = "20180320.230"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "483e94546d9b1de5841b8853882d5644cc419479"; - sha256 = "0dd6agcjpncd3vkdx405ql03rpfacwda0njcz69f1cp7z8rc5cdz"; + rev = "4ee365c35a34a41c31c262d4360132037461a60a"; + sha256 = "0919ifs4xm7s7axpjrlb6ymv5xy647pbfczw03z0xwm5gx7fmra3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18750,12 +19520,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20171024.651"; + version = "20180318.1221"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "6114b78b84cd8a96a117b7652d1e5138eee4b896"; - sha256 = "1fmvy8h3ng2ykfmr2n0zms2h3csq24f23ldf5zdxyg34riag4nl2"; + rev = "432312b9583ed7b88ad9644fd1bf2183765a892e"; + sha256 = "0d882kahn7a0vri7a9r15lvmfx1zn2hsga6jfcc6jv0hqbswlb2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -18771,12 +19541,12 @@ epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; - version = "20150517.433"; + version = "20180205.1249"; src = fetchFromGitHub { owner = "cask"; repo = "epl"; - rev = "83797835f729f39b80acba4c7e83d73a2e410e26"; - sha256 = "1rgxvmz9nv7922c30xz8ax3cwj8mmwxfni3xjwnhpfa744in4441"; + rev = "78ab7a85c08222cd15582a298a364774e3282ce6"; + sha256 = "0ksilx9gzdazngxfni5i632jpb1nprcxplsbhgqirs2xdl53q8v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; @@ -18855,12 +19625,12 @@ eproject = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "eproject"; - version = "20151205.2130"; + version = "20180312.942"; src = fetchFromGitHub { owner = "jrockway"; repo = "eproject"; - rev = "fdff000d601eb8bdb165db3dc4925c6797308b78"; - sha256 = "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2"; + rev = "068218d2cf2138cb2e8fc29b57e773a0097a7e8b"; + sha256 = "110b8gn47m5kafmvxr8q9zzrj0pdn6ikw9xsx4z1rc58i02jy307"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7e82668617a9b599f8994c720f3f123ba1e008a/recipes/eproject"; @@ -18938,12 +19708,12 @@ erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-hl-nicks"; - version = "20160202.1150"; + version = "20180415.1246"; src = fetchFromGitHub { owner = "leathekd"; repo = "erc-hl-nicks"; - rev = "be181920ce6af0ab5d00d1c638e4e598b3998643"; - sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7"; + rev = "756c4438a8245ccd3e389bf6c9850ee8453783ec"; + sha256 = "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks"; @@ -18959,12 +19729,12 @@ erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-image"; - version = "20170909.312"; + version = "20180407.1545"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; - rev = "15805aa7ed4b13eeaaa4ec294443ef0f9d21c0c2"; - sha256 = "0ja8iv4wp58xab190mf3pj1bbaz25w8pvns03ayajzrflpkhjs79"; + rev = "4ad26a06c8faf106172a0f8e472c677adca60542"; + sha256 = "0280pijlnm071c2lh9z55w1xzgphfjq4zbl29r7igscy7q5dc60z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; @@ -19019,6 +19789,27 @@ license = lib.licenses.free; }; }) {}; + erc-status-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "erc-status-sidebar"; + version = "20171223.1324"; + src = fetchFromGitHub { + owner = "drewbarbs"; + repo = "erc-status-sidebar"; + rev = "9e972f4e31287362020daa81dc7af26999ea6c5b"; + sha256 = "0g7m5r5f01i73k05wny0xycrjcyhzwc314a5lb8h09kglwnmisgv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/29631de8ec4140a8e35cc500902b58115faa3955/recipes/erc-status-sidebar"; + sha256 = "04qh70ih74vbavq7ccwj1ixpd8s3g8rck9bxv6zhm1yv34bslw5d"; + name = "erc-status-sidebar"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/erc-status-sidebar"; + license = lib.licenses.free; + }; + }) {}; erc-terminal-notifier = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-terminal-notifier"; @@ -19211,12 +20002,12 @@ eredis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eredis"; - version = "20160809.2053"; + version = "20180221.1313"; src = fetchFromGitHub { owner = "justinhj"; repo = "eredis"; - rev = "0d7d524592be488309c7c339d137ba836e52bfff"; - sha256 = "0hj8czwqzdjs7ciyg4xf0imdqfv423c6q862gy83ni09zk5ncm3i"; + rev = "8a96034805fe0664132ce2e12deb9936503af2d4"; + sha256 = "1w4z98vr7iy6yxdk3lha7flk48ckxl2baaq8kx7abkirzfl8j4hh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63f06713d06911f836fe2a4bf199b0794ac89cf0/recipes/eredis"; @@ -19295,12 +20086,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20170913.604"; + version = "20180323.612"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "19245b1ac7bf881319950adb973ff2ce24fea23e"; - sha256 = "1av39vwqbd3j7gbm9371sqczds20d0iybqbc1w9hxlr860mig3nn"; + rev = "40dc6b9fed7d51a204e0d69b7bba7e8cb6496ae5"; + sha256 = "1ndzx4alfwc437d4j0bifgc0pignxs0nvwp4i2fdrpljcf0x0nxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19316,12 +20107,12 @@ eros = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eros"; - version = "20161221.826"; + version = "20180414.2318"; src = fetchFromGitHub { owner = "xiongtx"; repo = "eros"; - rev = "a42e45c9b2397156c684330b0fc90ee0eba773f5"; - sha256 = "0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4"; + rev = "dd8910279226259e100dab798b073a52f9b4233a"; + sha256 = "08chj3a0lw4ygi2sv7wj0i6ihfbi8jhylr8p92inif8b88r6wg3k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eros"; @@ -19379,11 +20170,11 @@ ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-junit"; - version = "20161018.1217"; + version = "20180407.1243"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "c4cd27b60f9e7ccd05fd8a2097cde947eb250599"; - sha256 = "0zm71kv4wxs6yf70qwrfavxc1845bg4aqqk36zypy17g1x40bms7"; + rev = "8d7d703332e3a41bfc59de44fa8832435ff1633b"; + sha256 = "1mbbv18pviirf220wjzfjlig8i3jwcl1bpv5awzvyzg2lm3h1nbc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; @@ -19420,12 +20211,12 @@ ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "ert-runner"; - version = "20171111.451"; + version = "20180215.857"; src = fetchFromGitHub { owner = "rejeep"; repo = "ert-runner.el"; - rev = "80ff435058f0e9815d0ac8c7a53143c474e00db3"; - sha256 = "1mgbrfgdvby25aaw3l9d0h4b7h5zap6s1m1vlxmmv20fhxza7wbc"; + rev = "0de42343a9de834320397d169c81725b2827e41f"; + sha256 = "0jc7n6mdv1kka47wmjjhgfw46l16mqlj5kkkyw16gd9g8dwcf6sr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner"; @@ -19462,12 +20253,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170915.801"; + version = "20180212.1425"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "511eaf59123c2dc4f900cd31d3c30c5bf98599ea"; - sha256 = "1ldyf39z7faizbg2nzh2myd5yld9iwxi9r5260sp1dv0ab2im4gy"; + rev = "c5ad728ce3fc2c513108e0ada2cd0c08ab94f870"; + sha256 = "0drmxxqgml36fymn4gqxbjimh8dgmm4yr68hsmsd0iz1lxglgda1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -19504,12 +20295,12 @@ esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esa"; - version = "20170427.845"; + version = "20180403.825"; src = fetchFromGitHub { owner = "nabinno"; repo = "esa.el"; - rev = "8bd011cd1861113f54ad155d3c62725e1dcd37e7"; - sha256 = "1a5mrz3m0gy5r7dcw31s488jgfhrp4axcnsmma40q2x3harp0hsk"; + rev = "417e0ac55abe9b17e0b7165d0df26bc018aff42e"; + sha256 = "0hib8q9fslvw02i1y19z78fv6yy88q09lhfdfmbdyn6yal21855q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa"; @@ -19522,24 +20313,24 @@ license = lib.licenses.free; }; }) {}; - escreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "escreen"; - version = "20170613.1534"; + pname = "esh-autosuggest"; + version = "20171223.1855"; src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "escreen"; - rev = "153dc05b2b7e6e2d4cbd7b6cbe8b10d6a70f73f3"; - sha256 = "0xz3dkvgrbgv91dxgdfcir9zld5qsqpzrmp4q6fxqa548advn9ak"; + owner = "dieggsy"; + repo = "esh-autosuggest"; + rev = "2fd996c1a29b21e60854a3c90d7d4fc3d5b0aded"; + sha256 = "1vkbyhkvvj5h63ybxg795m61c4157jm2v01y9m98jm4pxysmls7m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c64c21a42fd8436bd60e490980ad4ed824b212d1/recipes/escreen"; - sha256 = "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54"; - name = "escreen"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest"; + sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx"; + name = "esh-autosuggest"; }; - packageRequires = []; + packageRequires = [ company emacs ]; meta = { - homepage = "https://melpa.org/#/escreen"; + homepage = "https://melpa.org/#/esh-autosuggest"; license = lib.licenses.free; }; }) {}; @@ -19714,12 +20505,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20171020.2207"; + version = "20180109.2234"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "9b1a49853909c4fae95d32bb9a68cace471c161e"; - sha256 = "03sr68mfi52ajqb6d9k3lpcrapjkqx9yynpfwin9y2328pmriaib"; + rev = "1d8825dcc005b488c6366d0b3015fc6686194eea"; + sha256 = "1nqzd24wwvyzf3bn7m7vd4xqmj4p8z51h8cnli07yja17cr5gwx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -19795,22 +20586,22 @@ license = lib.licenses.free; }; }) {}; - eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "20170711.552"; + version = "20180407.911"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "895d70be11ccdbcdf0b44d5ae2a85d4ccac2920c"; - sha256 = "1h43l4jvp3wbyyda3745m6c6ik6pn4k7pmq94ia9fbp4zqh4hsvr"; + rev = "97e8aa9b106e3e4b3a44c775ca972bdd2feda9ec"; + sha256 = "1g6bv58m1052x2f5ffs17ryyqv0ay8vii5bwqs7dyfhlpppsn6c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v"; name = "eslintd-fix"; }; - packageRequires = []; + packageRequires = [ dash emacs ]; meta = { homepage = "https://melpa.org/#/eslintd-fix"; license = lib.licenses.free; @@ -19903,12 +20694,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20171112.1151"; + version = "20180416.631"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "a218dec600c25687a81419e42b555141911504c6"; - sha256 = "0wl90xiifn83clm25ya953pa91734h0sav1426y5czrmswzw7mj1"; + rev = "27b55440d15ff532da86dfae6d030e76d1e6d518"; + sha256 = "1sjnky11lhmiqcqrmdfi8xaf40jlm43kzbnviq031apwfxrvifi5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20008,12 +20799,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20170923.1328"; + version = "20180325.2152"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "a589005a9a888537deef94d6fe38a9b8790c97c7"; - sha256 = "04lxmd0h7mfjjl0qghrycgff0vcv950j1wqv0dbkr61jxp64n5fv"; + rev = "fb061cf49bea47ba80090775d93388dc9b1b495e"; + sha256 = "1ygn927d71dxh07si38ii48l4myg42vb7xl09nbbz9c0df4m8q0a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -20029,12 +20820,12 @@ esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esxml"; - version = "20170903.150"; + version = "20171129.7"; src = fetchFromGitHub { owner = "tali713"; repo = "esxml"; - rev = "6d58e047b7c1e3e8cab87cf7ee15e039e8a22510"; - sha256 = "0bkbp3bycb4vrk0y5n7013yqqzz7rjvfwkr9lppa6sixilhc8h66"; + rev = "5548ceba17deae0c3c6d0092672edc4de3c75ce3"; + sha256 = "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml"; @@ -20068,6 +20859,27 @@ license = lib.licenses.free; }; }) {}; + eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: + melpaBuild { + pname = "eterm-256color"; + version = "20180308.1615"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "eterm-256color"; + rev = "dab96af559deb443c4c9c00e23389926e1607192"; + sha256 = "0ysxblc90kjcz84siprnyxwh94scflivqbxylzkvjm7hbx93rsh1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; + sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b"; + name = "eterm-256color"; + }; + packageRequires = [ emacs f xterm-color ]; + meta = { + homepage = "https://melpa.org/#/eterm-256color"; + license = lib.licenses.free; + }; + }) {}; ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ethan-wspace"; @@ -20134,12 +20946,12 @@ eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "eval-in-repl"; - version = "20171112.1854"; + version = "20171122.543"; src = fetchFromGitHub { owner = "kaz-yos"; repo = "eval-in-repl"; - rev = "5f8da66b7bc697e3b86abbe0a4e103f82ce4d038"; - sha256 = "0nh8hshh4fvyax11sffk1gjs4cicm46chcdgzdfkpr26icg6ka5h"; + rev = "fea05a5b81d74ac53cb2a83aa83a73d9526bcc42"; + sha256 = "0xm1ggdaihy1cyg4b3b9x1n93bp4qiv30p1mfzmmqm6w89z1agf0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl"; @@ -20239,12 +21051,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20171112.519"; + version = "20180408.1423"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "5337d2b3d2f739b4b5b4a73bc0e66363be6b71f9"; - sha256 = "1hdpkqz8nnzap0d7dnv8nkj66mj1y4w00ibzari500sg9xb4gc49"; + rev = "49ebf2dce325bc7fe0941dc4112226c291ff9670"; + sha256 = "0vjbyh77d4z9ahk0w8fmb4fdd98hq19ijy11b1y4n029yl1yrwvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20383,6 +21195,27 @@ license = lib.licenses.free; }; }) {}; + evil-collection = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-collection"; + version = "20180416.146"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "evil-collection"; + rev = "aca031a7f313d4380a1dbaa2158a9908a2ce9415"; + sha256 = "1mzgi8bdd767g6xfkznpm5v8gjx8wp99drlxggi0vgp1rm3zslsz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection"; + sha256 = "1fggdlssb8sai00vbrxph8cama3r0f7w8qhmiajj4cy2il7jgmhy"; + name = "evil-collection"; + }; + packageRequires = [ cl-lib emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-collection"; + license = lib.licenses.free; + }; + }) {}; evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-commentary"; @@ -20428,12 +21261,12 @@ evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-easymotion"; - version = "20170110.2004"; + version = "20180113.2254"; src = fetchFromGitHub { owner = "PythonNut"; repo = "evil-easymotion"; - rev = "f9b5aa52f238ea14c2b16982e56c3b2c8f739101"; - sha256 = "098x03vlz3gvkaa3wahi1557l9x39n1v8jclj5aqxvjdzapi6myi"; + rev = "79c13ed3bce018ac09d358e642e5bd7025e93603"; + sha256 = "0496dnbciq8gbivihas1y58gwd4nbfz767rr98zpwgkz8l2jvy73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion"; @@ -20530,6 +21363,27 @@ license = lib.licenses.free; }; }) {}; + evil-expat = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-expat"; + version = "20180302.657"; + src = fetchFromGitHub { + owner = "edkolev"; + repo = "evil-expat"; + rev = "523edb0d1fd6ad17b777c1893cbe1f4857469a4d"; + sha256 = "10irfd546pz0sz0ckfms1md37ni44p7i12imii5ck13hga7grv7i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat"; + sha256 = "03niji6wymhlfkvdg90gasccs4683djxcj925c8k0vdgmfr8sx32"; + name = "evil-expat"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-expat"; + license = lib.licenses.free; + }; + }) {}; evil-extra-operator = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-extra-operator"; @@ -20596,12 +21450,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20171103.2328"; + version = "20180414.2306"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "75d124851fd31bb7014036e969300a0259128557"; - sha256 = "0184y95d52nbldpn3khxk6f3dlh36v0mjsvhhgg557gwhg5psasi"; + rev = "bc318ad4b7711837c21405d49a0ce4097f3a70a9"; + sha256 = "0vy6skhp6skr3hvkc0dzfn1dridwzybjm9mg2h90srvg76c8966p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -20785,12 +21639,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20171018.722"; + version = "20180410.804"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a"; - sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3"; + rev = "9bd91561e7d0bfe3198d0860bae1785a543f2eee"; + sha256 = "1jhna9lyic4c28kcdhbqid6gyv9gawznf2ga470vnfnyghd4f757"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -20827,12 +21681,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20171101.2202"; + version = "20180328.2351"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "fb5807c0965f3689b9e37f5e5b0fce022938bb43"; - sha256 = "02yz4m9nzn0dql279xbgaxbrwhn6xxb30kf0pyjqyxg2njzfihid"; + rev = "51d8b268e597693aa9d02f2dda66840562998621"; + sha256 = "1b1iymyb2f8913xgzr13pslqcvhwyyl3370kjs43acpbgnhn2zzj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -20890,12 +21744,12 @@ evil-mu4e = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mu4e"; - version = "20170911.122"; + version = "20171127.1214"; src = fetchFromGitHub { owner = "JorisE"; repo = "evil-mu4e"; - rev = "64b663c3b31d14c4260921a7ec4b8d475d5ed339"; - sha256 = "1cms5kvgkhaq1gb6yai5ykn3mkb3vjs99b75f7lyl6da89k9kx9w"; + rev = "234f8a7b24e3b21b6d849d209c006a258ae056ce"; + sha256 = "0gl8gfdnq61lx6qjyswgxhbg5m3p26cps0pix3rssqb64v7lrxci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332f3f9c6dc106e58345abbc2d8fd99056d518c0/recipes/evil-mu4e"; @@ -20911,12 +21765,12 @@ evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-multiedit"; - version = "20170623.1135"; + version = "20180209.1819"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-multiedit"; - rev = "e135fd8662406807bc0d9d0f2688e7dbe89b98c8"; - sha256 = "1dw3mf3dckjhnzvwj7jcwlgzkh592njvcg2xbs2wv1456rnnqaz3"; + rev = "ea3d9177b74ab0bc65e55df9cc0a0b42e4ef815d"; + sha256 = "17zm35r474z8ras4xy7124pcb972d385pbdv4jxyj5vq042vq07w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit"; @@ -20929,22 +21783,22 @@ license = lib.licenses.free; }; }) {}; - evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-nerd-commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20171106.1510"; + version = "20180411.640"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "6a05c86bdf668fa2bb8a9daf76f3d7b241d7ba3d"; - sha256 = "0nbgrg1d8g2v7lfdwnd26wm1n4qpwci4a0x3qawngcjkyj9df4q5"; + rev = "34d411715ead5829d6d8969511047feb703b067e"; + sha256 = "0ax846dy2hbrbvkj7nzfkcl5i1x9rga8bvg0ln55ivhq0iiy1lkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d"; name = "evil-nerd-commenter"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/evil-nerd-commenter"; license = lib.licenses.free; @@ -20995,12 +21849,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-org"; - version = "20171107.1159"; + version = "20180323.1606"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "e38cf914de6627fed6405004555e0c04fcf39906"; - sha256 = "1nzbwvhq9k554x6i7qjy4y9s9r4h6lwcmc7na6ic14ybmxv60dl3"; + rev = "b6d652a9163d3430a9e0933a554bdbee5244bbf6"; + sha256 = "176hrw7y7nczffbyhsa167b8rvfacsmcafm2gpkrdjqlrikbmrhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21076,6 +21930,27 @@ license = lib.licenses.free; }; }) {}; + evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-replace-with-char"; + version = "20180324.1506"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "evil-replace-with-char"; + rev = "ed4a12d5bff11163eb03ad2826c52fd30f51a8d3"; + sha256 = "1nhnwl39wsi7akzcjqszxxw2b6j9i5y4qabcd8p387zajjpgscwk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char"; + sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r"; + name = "evil-replace-with-char"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-replace-with-char"; + license = lib.licenses.free; + }; + }) {}; evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-replace-with-register"; @@ -21142,12 +22017,12 @@ evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "evil-smartparens"; - version = "20171103.941"; + version = "20171210.713"; src = fetchFromGitHub { owner = "expez"; repo = "evil-smartparens"; - rev = "9fe4eed1c6327197afe6c13bb0771e18908aff00"; - sha256 = "1di4qz5fbrlwbg16c2j0m7y8zqfxw027qd7zqmc3rwk9znbhg7wl"; + rev = "026d4a3cfce415a4dfae1457f871b385386e61d3"; + sha256 = "05habba44zls2d20kgzshrq2psagay16cnvcnkqgrbhvj1rxfmrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens"; @@ -21163,12 +22038,12 @@ evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20170903.603"; + version = "20180317.233"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "69adb46546a871beb54a445cb22652ac276555c1"; - sha256 = "1g6whd2zg880wxxyn269q4b0697aybj1lc936gi7nrxvm6fnaiwc"; + rev = "37ca9749bf5604040e745d65143cb0667f052542"; + sha256 = "172zqf7qmdhyhlj48nxyxpn0cnqb9v045536sf6gfvcrv81wps0c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -21202,15 +22077,36 @@ license = lib.licenses.free; }; }) {}; + evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }: + melpaBuild { + pname = "evil-string-inflection"; + version = "20180313.1055"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "evil-string-inflection"; + rev = "00b62fb82de36e9c7b44bd644c7e11ae88f35f62"; + sha256 = "0f24722vl3sqri389hi6qj7hhfalqpjvyq4ain5hhr0gsx2dznw4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection"; + sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh"; + name = "evil-string-inflection"; + }; + packageRequires = [ emacs evil string-inflection ]; + meta = { + homepage = "https://melpa.org/#/evil-string-inflection"; + license = lib.licenses.free; + }; + }) {}; evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20171004.600"; + version = "20180102.601"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "822a0f61c3fd7c55cda4e04c8590ae5144401c26"; - sha256 = "0xd87whrznwk1hggb0jrx6n1m5sbj0014qv26qvvc3f11vrrda2x"; + rev = "2af81ab3ac64e4b0515a157a672d8cb89f0172b9"; + sha256 = "00bcz353cc82wpk5cai5ni99z2la4gwm0k1fvanysx1amg8vxvfy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -21289,12 +22185,12 @@ evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-test-helpers"; - version = "20171002.135"; + version = "20180109.1040"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "5337d2b3d2f739b4b5b4a73bc0e66363be6b71f9"; - sha256 = "1hdpkqz8nnzap0d7dnv8nkj66mj1y4w00ibzari500sg9xb4gc49"; + rev = "49ebf2dce325bc7fe0941dc4112226c291ff9670"; + sha256 = "0vjbyh77d4z9ahk0w8fmb4fdd98hq19ijy11b1y4n029yl1yrwvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21419,8 +22315,8 @@ src = fetchFromGitHub { owner = "alexmurray"; repo = "evil-vimish-fold"; - rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15"; - sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn"; + rev = "c617fecb91303f8c63f85a6101a503fdc88aae84"; + sha256 = "05zm0gngdamfs5cqnjq4lh7253hdj0lggdgfphl56ynblhf8qf36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold"; @@ -21559,15 +22455,36 @@ license = lib.licenses.free; }; }) {}; + exato = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "exato"; + version = "20180305.242"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "exato"; + rev = "88266fa7fcfbef704032f671b94f756f2f98bd4f"; + sha256 = "0nmm7pvs81429a4zpal6aidfd1n58yavv3skscrav5r0wnlbz773"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato"; + sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn"; + name = "exato"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/exato"; + license = lib.licenses.free; + }; + }) {}; exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exec-path-from-shell"; - version = "20170508.4"; + version = "20180323.1904"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "5e355fbc50913d1ffe48bf86df0bcecd8b369ffb"; - sha256 = "1flkhbyxa7mi97vj4w6c2anzq7qz51sac6yqk308blfvd9z3pf95"; + rev = "54ea2f9c3c81d18b96e4d33c4c547e02eee420dc"; + sha256 = "193d9wf8x1cl1q5bzpdm9508a37m6nwlsjzn2mxbiqkb8p9psj73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; @@ -21603,12 +22520,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20171113.128"; + version = "20180212.1529"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "5d7657029c89ee38b95223e9c2b887387f915e89"; - sha256 = "0whb82q8jwda3l7zhdljcgzs0qsx3q5b2q0qqm8mg9dvmi9mlyrx"; + rev = "ff3ef4f6fa38c93b99becad977c7810c990a4d2f"; + sha256 = "1kp6q55g3dcya4y79x877vqwxa4z2rkkvhs49pkwr3wljf4af2pd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -21645,12 +22562,12 @@ expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-region"; - version = "20170514.1309"; + version = "20171217.2125"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; - rev = "2357f1d5efd9d5b9e37f3513342237fec2629291"; - sha256 = "0sggq57q8fxzd0my2kwbb2li91zq13cyhxn789bafzxq2d5fpk9h"; + rev = "f99b7630efcdb47c9c6182489c55fba3bcaee521"; + sha256 = "0sdk9qqxd8dkjf554p7ch2w8pd8a7c4q64c5yd8gphc8fmzc32rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; @@ -21708,12 +22625,12 @@ extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "extempore-mode"; - version = "20160620.1813"; + version = "20180104.2221"; src = fetchFromGitHub { owner = "extemporelang"; repo = "extempore-emacs-mode"; - rev = "ce052da4899ea85ee33792a344359fdd19bc653b"; - sha256 = "163in2pbvqyknsm3la5zqinlw018crx0f0cvr9caal86v5gx65cr"; + rev = "ae5f40d4b0883a4519e460cd7720e5fcc3a68fa5"; + sha256 = "1f888h7xv6zz6kq38ak1vpwjrjr2sqgwpfxwb9x0ldf3kkx4wf1w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bd3e57171f5283604e9375613a7a94416ee99a7/recipes/extempore-mode"; @@ -21747,15 +22664,57 @@ license = lib.licenses.free; }; }) {}; + extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "extmap"; + version = "20180205.1047"; + src = fetchFromGitHub { + owner = "doublep"; + repo = "extmap"; + rev = "3860b69fb19c962425d4e271ee0a24547b67d323"; + sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap"; + sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j"; + name = "extmap"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/extmap"; + license = lib.licenses.free; + }; + }) {}; + exwm-surf = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "exwm-surf"; + version = "20171204.340"; + src = fetchFromGitHub { + owner = "ecraven"; + repo = "exwm-surf"; + rev = "6c17e2c1597fe4b7b454a1dac23b9127ac951e94"; + sha256 = "0rb921fq3pyzv0w1s6n0zx4j7cvv68mb50hfa8nqnppz5ii1k0lb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4fc27fae2b58c7af87dadba9217cc05f8ab4890c/recipes/exwm-surf"; + sha256 = "066qbn1w63irh9b03qs0fv77x71cind22kdj6wygaznrpgwr0kny"; + name = "exwm-surf"; + }; + packageRequires = [ emacs exwm ]; + meta = { + homepage = "https://melpa.org/#/exwm-surf"; + license = lib.licenses.free; + }; + }) {}; exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170916.2015"; + version = "20180227.257"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "abb210ff56134cc6a285d91b875f3115bc951ad0"; - sha256 = "1l7578jfn3va6bpkjfbazygsn8asxhc7cpss32mnsrzkm1ix6sz8"; + rev = "4f7946db67d6599baba6b3961e8f543a68707742"; + sha256 = "00lcn5106xig2y9gyir1f1gzyp2i05rwq1lbbbah8aipkdi3z9xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -21779,12 +22738,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "20170318.1418"; + version = "20171216.944"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20"; - sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn"; + rev = "ad94b5bed74a74769775e937e167d301f4ea70e3"; + sha256 = "1f1b70fyq9j19i41rsishrdkslwnx0af7gzwirhs25sgkpsqz2hr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -21842,12 +22801,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20171007.939"; + version = "20180414.329"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "909a84dc5959aac982d1c296e82d687d172d3ecd"; - sha256 = "0mw9h55f708mv0ngixmdn7976yrhqjcnzac80f6mzddpwavgrhd6"; + rev = "96595833110cd64c391e0ccd5230782a8f0a4e08"; + sha256 = "0nvwgxlrbfhchb7z2qnw1lj66xpzn2b6yb6mhx0k31xdfr173wch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -21863,12 +22822,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "20171107.1248"; + version = "20180106.122"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "3623a4577c89740cfad8d961f3201d3222c79ff6"; - sha256 = "0vwczzrck2gmjb16ais1bvcl307kfvzrfp27wnrmqnznjhnpwj59"; + rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48"; + sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; @@ -21884,12 +22843,12 @@ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "f3"; - version = "20170728.1120"; + version = "20180130.358"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "f3"; - rev = "1ed0ac4368a9f631f6dfad7ad17e9f7434a42bd6"; - sha256 = "03crpcb1jbbc12nz912qdkipmm94xlrpzr2cgckya0cj8sdgv9fz"; + rev = "000009ce4adf7a57eae80512f29c4ec2a1391ce5"; + sha256 = "0q3ylw0i1bg7pzsv4gj72jcfjjfh57vsb3fnfnhhh5i5vladiqsf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; @@ -21905,12 +22864,12 @@ fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fabric"; - version = "20160907.215"; + version = "20171115.2256"; src = fetchFromGitHub { owner = "nlamirault"; repo = "fabric.el"; - rev = "2d436122243bcdd64ec5700e42d88ea9d363aefc"; - sha256 = "0g083jbxqzzg0pja1fhqshg6dv7p22ymnlsg02l073059sfy4c94"; + rev = "df79be341d0b34ed23850f9894136092fa5fea8c"; + sha256 = "1mnz81k1jz2sa3zj68ihzgq66l9fcxvzb67ad62p8bvi2aksxx7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83939d2a4d5874244a4916eee9ae6b327af18b5d/recipes/fabric"; @@ -21989,12 +22948,12 @@ faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faff-theme"; - version = "20170522.1219"; + version = "20180322.1005"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "e79dc142d99bc5a455a46345d3aba6f95f3f3f42"; - sha256 = "0j5vdbwwpav09v3kkx7cn5qd41inam0jd7smx8133hqpnirsh8mv"; + rev = "d123161586397fb74a928bb1b22e2b507f1beed5"; + sha256 = "136gq45c0w0c3i0fzk3js67z8p7r9k81d31s48flpsb982bf7nfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; @@ -22115,12 +23074,12 @@ fasd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fasd"; - version = "20161216.831"; + version = "20180203.745"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "emacs-fasd"; - rev = "5940b84dfa1ea7225b740d3a8dd215290d964873"; - sha256 = "1wqh7x0c1i0w5lfh0j7xilvp5vmwvbsblp2jd6bz3n5j2ydgpc00"; + rev = "f6393895bddbe9a1c77d4f6963a7e7ec6ff18bc4"; + sha256 = "1bjb20p2sp1avjmr57b3zf15w01fi7h4dd46zahhap1lrk9sxgx9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd"; @@ -22178,16 +23137,16 @@ faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faust-mode"; - version = "20170908.542"; + version = "20180205.126"; src = fetchFromGitHub { - owner = "magnetophon"; + owner = "rukano"; repo = "emacs-faust-mode"; - rev = "0f099007574d1430bb0cf73f73dcc284d9d3a190"; - sha256 = "0rmq6ca75x47hk2bpsk1j2ja62kpplgyanpiqq4hk6q259rd4lyv"; + rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c"; + sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode"; - sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode"; + sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z"; name = "faust-mode"; }; packageRequires = []; @@ -22199,15 +23158,15 @@ faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faustine"; - version = "20170908.658"; + version = "20171122.402"; src = fetchgit { - url = "https://bitbucket.org/yassinphilip/faustine"; - rev = "ae67cd9d1a2625d80726dace9dd83539e71d1b36"; - sha256 = "1wvf37g2bb9xbxi0qxn1sfq0ygaqxfzsnzdbnail6f29qyl541al"; + url = "https://bitbucket.org/yphil/faustine"; + rev = "07a38963111518f86123802f9d477be0d4689a3f"; + sha256 = "0dj35hwkm5v8758c4ssl873vkvplba5apjsh7l23nsmnzdji99zg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine"; - sha256 = "0pkjxfzgdhkjjx38d1c2kw8m5cw5ryhfj7lykpym79wsa471hf9s"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine"; + sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s"; name = "faustine"; }; packageRequires = [ emacs faust-mode ]; @@ -22279,6 +23238,27 @@ license = lib.licenses.free; }; }) {}; + feebleline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "feebleline"; + version = "20180322.1401"; + src = fetchFromGitHub { + owner = "tautologyclub"; + repo = "feebleline"; + rev = "56cd8fe336b619840991dc66d9cca973ddd8500c"; + sha256 = "0p8d31942c3xlymjm2r9qppr07c8vg0842f87lzqh84sc3z7r5ql"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/782295d8c530878bd0e20cde7e7f7f8f640953dd/recipes/feebleline"; + sha256 = "0c604ahhv9c89r3hj7091zhhfpbykh4c23sn6ymqw4pp0dq4pgkj"; + name = "feebleline"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/feebleline"; + license = lib.licenses.free; + }; + }) {}; fetch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fetch"; @@ -22364,12 +23344,12 @@ fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; - version = "20170905.1008"; + version = "20171209.1124"; src = fetchFromGitHub { owner = "alpaker"; repo = "Fill-Column-Indicator"; - rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779"; - sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y"; + rev = "d2536b1c48f78679e15a2b50cd5d8c0ffde4b155"; + sha256 = "0f8h32n8mnrwijz3lrslbx521f0fkhn24cwd16r8hcjk976l5kbp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; @@ -22382,6 +23362,27 @@ license = lib.licenses.free; }; }) {}; + fill-function-arguments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fill-function-arguments"; + version = "20180331.1023"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "fill-function-arguments"; + rev = "50ea2e4ec943993f54ef72a5deccd62dad5bb7a4"; + sha256 = "0s6kw87p1w3xwk354lbj5br07x0l63x3dcgfcxcvmy7k820f0iq6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments"; + sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0"; + name = "fill-function-arguments"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/fill-function-arguments"; + license = lib.licenses.free; + }; + }) {}; fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fillcode"; @@ -22410,8 +23411,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-finalize"; - rev = "0496a7b8f2f8b197010d8602b5fc529f5104704a"; - sha256 = "1canhfvqjkm0bbr9g50pi0cibhq3mf7g79k2m18d8zarc9jljrjm"; + rev = "846731531e7d1d80451787992e07bfe7dedbe9ff"; + sha256 = "0kqsqmfvnh0slx0hmrsw66rh62sgzyhzck7ii9zylkq72wj60fgl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize"; @@ -22427,12 +23428,12 @@ find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: melpaBuild { pname = "find-by-pinyin-dired"; - version = "20170206.208"; + version = "20180209.1818"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "find-by-pinyin-dired"; - rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f"; - sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h"; + rev = "3b4781148dddc84a701ad76c0934ed991ecd59d5"; + sha256 = "03fw1si115padxss6zb9fr0dsyq1bxlhxikgh4i5swp4jd4331k5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired"; @@ -22448,12 +23449,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20171025.1943"; + version = "20180405.713"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "a3ecd28182ba3102fefdc080e807866464153edc"; - sha256 = "08dk8jjg63rs15hq4rb32368nja2iwdsp8dxwb3isza96lsfkwmx"; + rev = "5691beb79f78c6a0ef1a18460df9fd1571ec3361"; + sha256 = "0mvli1r7ml596y6v9qsip76j78f58q6jnwb18j8c7rngsrg08rc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22676,15 +23677,36 @@ license = lib.licenses.free; }; }) {}; + firrtl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "firrtl-mode"; + version = "20180221.1555"; + src = fetchFromGitHub { + owner = "ibm"; + repo = "firrtl-mode"; + rev = "1ac00d526018945389bcb2292dbdd8395381774a"; + sha256 = "02xznsiij39lhjr261vl7yz4k4i76vshh5kwa7ax95zpj2zbs0v6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbf9ab9db03410c35b8b73a23bf8062b10f0815/recipes/firrtl-mode"; + sha256 = "11n3wjr9sinqafjs88bznb5rppnignwkn4m4ppixi6xr31v3i4ws"; + name = "firrtl-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/firrtl-mode"; + license = lib.licenses.free; + }; + }) {}; fish-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-completion"; - version = "20171104.1509"; + version = "20180329.2137"; src = fetchFromGitHub { owner = "Ambrevar"; repo = "emacs-fish-completion"; - rev = "547fe4f61b8e311e5db17be9f6d277d08523beba"; - sha256 = "0qkq23fad7apm2q1xn3b7agkkv3pvcwv012kvma568zk4jcfw3zg"; + rev = "3e3ed1f19fa778b7c35ad88e033dce5a6b1fc153"; + sha256 = "1zi5cgzwy1wkvc8352s3l24p4i4fh87f9pyir6jji3hy424pm6w4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/832bae268cd08d7ebfd4b7a8d0570af8549cdbd6/recipes/fish-completion"; @@ -22700,12 +23722,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "20170430.623"; + version = "20180306.818"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "888d037008272f6001207a2990e51ba87fe187e6"; - sha256 = "1r2clxm68nq8jhgc5cly51i6axjmi720r5m34dhf6zblwib4lfdp"; + rev = "bac709ac1235751952d6022dddc6307d9135d096"; + sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -22721,12 +23743,12 @@ fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-input"; - version = "20170518.2311"; + version = "20171231.2220"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "a0fd233bba6206854c5d7365d7182aaae842f210"; - sha256 = "1zwbysh9fq6dbdi93cdzgrsp2azy8b3j0gz32ih0vbs9xyysbhlz"; + rev = "37bc0734a2e71d66245ee3960879577e5ef906bb"; + sha256 = "04k4wqsdbwxbq5a4dxvr3mqqsa5y3c0238llh2wig1r763ligm3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -22763,12 +23785,12 @@ fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-word"; - version = "20170518.2343"; + version = "20171231.2215"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "7df98ac9f9b0e6e09d7999d83e678cb22248be77"; - sha256 = "13i604lmx30r0kk0s998dp4czzazqavyqqi3kx6lh6mj2csgkgda"; + rev = "8e66b6a7b599c6c5098490e83ef4e69acf307603"; + sha256 = "1p8hz66fyzivvwwya0br3v7dx0fqna9jw9291zgshvhxbin867fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -22809,6 +23831,27 @@ license = lib.licenses.free; }; }) {}; + flame = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flame"; + version = "20180303.1216"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "flame"; + rev = "a749b2a77b87e505572d0f1f5d59fac76348bb73"; + sha256 = "1l9jbzavyi75li64jqfs000s1m8iw9xvsv8mg0bw1div6bc7vq7s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b7a14c14368de722855286c088020a5657f7cf8b/recipes/flame"; + sha256 = "1br9c48anscq9vbssr0gq8f5kbq755hjaglbljwwh9nd5riycv5v"; + name = "flame"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/flame"; + license = lib.licenses.free; + }; + }) {}; flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flappymacs"; @@ -22875,12 +23918,12 @@ flatland-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flatland-theme"; - version = "20140805.305"; + version = "20171113.721"; src = fetchFromGitHub { owner = "gchp"; repo = "flatland-emacs"; - rev = "b2c2df1fc20a3a23787644f91f8121d9353f9bf9"; - sha256 = "0cl8m1i1aaw4zmkrkhfchhp0gxhpvhcmpjglsisjni47y5mydypf"; + rev = "a98a6f19ad4dff0fa3fad1ea487b7d0ef634a19a"; + sha256 = "02gbzxd1v003aaj5rn3vr00n4390bhdx2jhpa7nb430fg3s1ppdy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a081fd0c5598fdf5bc0ab92f4d009f32132a29e/recipes/flatland-theme"; @@ -22959,12 +24002,12 @@ flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-compile"; - version = "20171107.1257"; + version = "20171213.1019"; src = fetchFromGitHub { owner = "plandes"; repo = "flex-compile"; - rev = "82e217aaab34dfd1faf7d03c82eca49706190232"; - sha256 = "1zp0gki61g487x6bypxlkbjzi972y80pzmhqdisl6qx9yrmk60vy"; + rev = "1952f6deee9d95196906f46fea2b24882cc614b6"; + sha256 = "0wx0857f25k2rr5y6mikhi0czgvf6r1667fy8hjgl6gk0fyi960f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile"; @@ -23000,12 +24043,12 @@ flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flim"; - version = "20161210.1728"; + version = "20180328.1624"; src = fetchFromGitHub { owner = "wanderlust"; repo = "flim"; - rev = "3510d32e5820b2c22b4e9c9f29177beea42c5bfb"; - sha256 = "0ggr8fkzwa6k0i7gl41qxkvkvnzpqzbhnd6klbk6j6j0rw1pmgn8"; + rev = "faaa2b1f2bb8fcf835ddfb8981654e4d3b2bdbc6"; + sha256 = "0hr4qi5vhq3ravgky95k2n7hin97jln7fmkgbx45fcyiz8jbpz2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim"; @@ -23039,6 +24082,27 @@ license = lib.licenses.free; }; }) {}; + fliptext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fliptext"; + version = "20171124.1256"; + src = fetchFromGitHub { + owner = "andre-r"; + repo = "fliptext.el"; + rev = "fd821f645ffebae6ae3894afa7ba7fc06f91afc6"; + sha256 = "1jf63kp1myxihv6r13cddxgr8cchxcnnmylj5dx50y42595ia4yh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e36776cbed8eab151f69d0edd5217a7bba7c2451/recipes/fliptext"; + sha256 = "1wbrvqrvrpk2lx7b6y30rrshr7a25b2191bnx4v8lm3cv16gv8p7"; + name = "fliptext"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fliptext"; + license = lib.licenses.free; + }; + }) {}; floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; @@ -23063,12 +24127,12 @@ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "20170916.312"; + version = "20180315.1124"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "93184633933b5aa62e6e92b7fe1311261012e591"; - sha256 = "1laainsc5l4l4r5j17hblv7b1ppxrgfak73ama1qn7kb14y1jfrf"; + rev = "6c782a3fe3f810484009d87813b88804beafafac"; + sha256 = "1awf44fyjwzlxjavk31lha8iknm8nxr2r6z07sxhzyy23ff127mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; @@ -23081,6 +24145,27 @@ license = lib.licenses.free; }; }) {}; + flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flower"; + version = "20180316.1052"; + src = fetchFromGitHub { + owner = "PositiveTechnologies"; + repo = "flower"; + rev = "98c53b03da698833058b9ad6b6eb8be46cfd00f6"; + sha256 = "08wq66gvqy14mcpm8x14xz3hvw4h7rcd5ivynma91d4358qrmqap"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; + sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd"; + name = "flower"; + }; + packageRequires = [ clomacs emacs ]; + meta = { + homepage = "https://melpa.org/#/flower"; + license = lib.licenses.free; + }; + }) {}; fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }: melpaBuild { pname = "fluxus-mode"; @@ -23109,8 +24194,8 @@ src = fetchFromGitHub { owner = "lewang"; repo = "flx"; - rev = "ae0981b253b17b52dec666e2f739f889e7952291"; - sha256 = "0csflhd69vz3wwq5j7872xx2l62hwiz1f5nggl5nz7h7v9anjx3r"; + rev = "46040d0b096a0340d91235561f27a959a61d0fef"; + sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx"; @@ -23126,12 +24211,12 @@ flx-ido = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: melpaBuild { pname = "flx-ido"; - version = "20151030.1112"; + version = "20180117.719"; src = fetchFromGitHub { owner = "lewang"; repo = "flx"; - rev = "ae0981b253b17b52dec666e2f739f889e7952291"; - sha256 = "0csflhd69vz3wwq5j7872xx2l62hwiz1f5nggl5nz7h7v9anjx3r"; + rev = "46040d0b096a0340d91235561f27a959a61d0fef"; + sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx-ido"; @@ -23147,12 +24232,12 @@ flx-isearch = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: melpaBuild { pname = "flx-isearch"; - version = "20160105.1217"; + version = "20180102.2114"; src = fetchFromGitHub { owner = "PythonNut"; repo = "flx-isearch"; - rev = "54ae0a5a31e6a07b68823d486ff4ec9e4c558588"; - sha256 = "1cmjw1zrb1nq9nx0d634ajli1di8x48k6s88zi2s2q0mbi28lzz1"; + rev = "f132fd6367e369885ab3a865fbfe20eee989bc0b"; + sha256 = "1dcvfl4fyhgw0rhfhixzlzjfr99fisa83f7lmlwzz2zs96myhhkz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd1438cc0821b8ae1d01e2a3bc8f07ca8a79134/recipes/flx-isearch"; @@ -23168,12 +24253,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20171109.216"; + version = "20180415.1527"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "d309432efb0a4646ab6ef55759c0e9d07d70a8f2"; - sha256 = "0y0ds64ij4idm27wm5k2c505m8l7azw8w6r2q8ipshpapnpmdhlj"; + rev = "1eecec814debc6994b1aa8b6760cbfbbdf71e219"; + sha256 = "1in3sanhyd0cmivq7c5xxqpb5frzq77zp7rdyyki9pczpf9yv58a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23315,12 +24400,12 @@ flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-clang-analyzer"; - version = "20170704.2333"; + version = "20180225.2039"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-clang-analyzer"; - rev = "a33752224cb1da13b35d0d60b2017fe73d167781"; - sha256 = "1f6nb92fg1lgf4xz8x1i61njwnqrab94p88kliaa7g9r4hfhgv8j"; + rev = "adc9e7663bafcc9b740c09b691898413627e74ab"; + sha256 = "10c45myq9vgsssp5v3vnip4klj9dxk8dh42zap44f9lw99ascx2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer"; @@ -23382,8 +24467,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "squiggly-clojure"; - rev = "2a0e96889b128808866a1e2e98694be1b251fd37"; - sha256 = "1yw9ky7720hx6z401623bw7h6rr2b837a7x8gfw6shq4k26kirzb"; + rev = "0fe57ab9c0d6262a3c0dbc9c28a9ca98390a6016"; + sha256 = "1495d09vr8dlf9q6127fa46ghhgyw5bmzx22wdzzrfvc70m041a1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure"; @@ -23399,12 +24484,12 @@ flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-color-mode-line"; - version = "20171020.2128"; + version = "20171121.2307"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-color-mode-line"; - rev = "157b1edd79b44c26ef18862160e0ab50db27352e"; - sha256 = "0lrk2b6xa12zcv18z4j1lpl7b36sl7saz14warxc1fw3p7dr4hm4"; + rev = "cc474804d4e8088a627485faaf4217a5781aec7d"; + sha256 = "0lk8p0wb7g9lvxjv9rl59hd9f0m0ksw9rgspis8qshpz8pj5785f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line"; @@ -23459,6 +24544,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-crystal"; + version = "20180306.1821"; + src = fetchFromGitHub { + owner = "crystal-lang-tools"; + repo = "emacs-crystal-mode"; + rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de"; + sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal"; + sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn"; + name = "flycheck-crystal"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-crystal"; + license = lib.licenses.free; + }; + }) {}; flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-css-colorguard"; @@ -23630,12 +24736,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20170816.648"; + version = "20180321.1546"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "5a2e65fbae90e1dd69cfa78e4af0bda25c7db973"; - sha256 = "1zh6yb5snjrp09zh24fip97pqq7vk472g8nmjjqk0iq8m9i8sphs"; + rev = "995132ced9c0e4464a36c4435ae8248c23fc0511"; + sha256 = "0k0dlbpz3vys373cng2gqlpbzlzbls9dl613rxvnba8d8ndz7ri4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -23669,15 +24775,36 @@ license = lib.licenses.free; }; }) {}; + flycheck-dtrace = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-dtrace"; + version = "20180126.1135"; + src = fetchFromGitHub { + owner = "juergenhoetzel"; + repo = "flycheck-dtrace"; + rev = "a328c38aea855c0fd02f901c141c100c24b27d7f"; + sha256 = "1cl50ckvjjgx9m7p7fpijk61mw737qigbh9glm5b3slmgkyfq2mq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cdcdd10fbcd58a5c67e4d07632212e7dedf42dbe/recipes/flycheck-dtrace"; + sha256 = "14sg7zkq9f5zbcfn8app8m9mdc8cnwcxh7h4glsz32yaqc1dj7h8"; + name = "flycheck-dtrace"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-dtrace"; + license = lib.licenses.free; + }; + }) {}; flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-elixir"; - version = "20160629.59"; + version = "20171122.507"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-elixir"; - rev = "05cbad6657dc02f527be061e1709a53abb46bd8f"; - sha256 = "0pnm1v1m535r27br6h00ijiljjybkipvrvlrj1p9mbhwvvvmmwp6"; + rev = "1f19a739cdb93851c6b01b1e188e215d035cd4a1"; + sha256 = "01820hm6231z3zaq97jmmvdrpnyp38cb0m6xms5ihq2r1fqx8z2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da2ab73ab1426f71ea2b2bea2b418941856b3454/recipes/flycheck-elixir"; @@ -23735,12 +24862,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20171018.327"; + version = "20180216.1156"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "2e21ec3c4eacdc100b1a45e97884350f53b832d3"; - sha256 = "0ijazydkz9lwxbnsvanpv3202k35a4knipp08inlw3pm3k16p3mj"; + rev = "8173accf0e389f7ba0936d399da84839a7f887af"; + sha256 = "14g3mi8i4iy5f3fd3f7yx8ha18zi0kxqgn3sxkvdnk9rp1cdfnk1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -23795,15 +24922,36 @@ license = lib.licenses.free; }; }) {}; + flycheck-gradle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-gradle"; + version = "20180403.33"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "flycheck-gradle"; + rev = "a14b45183e50993e8b28a4c57ad5db82b789faef"; + sha256 = "1n3i0fh0rvy29gykqamxayfbbv5jy3h6l375pw4ckydcqlp0dgxk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/382d9afd2bbb0c137719c308a67d185b86d84331/recipes/flycheck-gradle"; + sha256 = "0zd92lx0mqjqwzclvvhfwwahq80qspyv9k7qcxjc0bl3avjk6a47"; + name = "flycheck-gradle"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-gradle"; + license = lib.licenses.free; + }; + }) {}; flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20171107.1420"; + version = "20180321.1340"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "ff21330a5a7db4e42d6ccf4410ef4a3231e5f19a"; - sha256 = "0vdm6bmvqvf5s7cvadkl0l88cza429xcy21icv55ii5iw1k4hywf"; + rev = "ef91cfd2766724adf6dd48f7d1dfaeed46dde570"; + sha256 = "0qv2kzplqpnhgalqibb7ligsbxanv07wjjb5cshlsn2l0dimq4w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -23879,6 +25027,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-jest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-jest"; + version = "20180410.2028"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "flycheck-jest"; + rev = "08f27c5ed97c83c445f99fab58f0b6c826f14449"; + sha256 = "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/31e2ac9de5f28ee9d847097cdeb60afa99476a51/recipes/flycheck-jest"; + sha256 = "19dg8v0xzni7x6zn472n4ach1c1jv4syzarfi8ba8r6n26vz9ss4"; + name = "flycheck-jest"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-jest"; + license = lib.licenses.free; + }; + }) {}; flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-joker"; @@ -23945,12 +25114,12 @@ flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-ledger"; - version = "20140605.1146"; + version = "20180125.31"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-ledger"; - rev = "2944c56ad72945f78f88fa363e0239b40650d829"; - sha256 = "16zfa0npi6jmyvjalsiqk11zp41vc5bfpgz5ssh1xa8v9fk6rxaj"; + rev = "044f28d126d1bce55c4b78ba6d5bc92e1f6cfd69"; + sha256 = "1k14jwz79mjsm0cfig5lc0byfrhvm495wrkybdl36b56q4qhxf58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger"; @@ -23963,6 +25132,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-lilypond = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-lilypond"; + version = "20171203.532"; + src = fetchFromGitHub { + owner = "hinrik"; + repo = "flycheck-lilypond"; + rev = "cc1b7677a932c42e5dab1661ad7b923d4aae744c"; + sha256 = "1yfsg52z4nhbh33fbsig24c9s0mc4xm72ll36h6ibld9fvqsgv6k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/da99de90193c9ad362afdbbae28dfba52ef3676e/recipes/flycheck-lilypond"; + sha256 = "0yx0jbilr8z58df13wcssp3p95skcvl8mnhhr6lijak44sd7klbf"; + name = "flycheck-lilypond"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-lilypond"; + license = lib.licenses.free; + }; + }) {}; flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-liquidhs"; @@ -24026,6 +25216,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-mmark"; + version = "20180203.932"; + src = fetchFromGitHub { + owner = "mmark-md"; + repo = "flycheck-mmark"; + rev = "7fdcc48ff6ffa5e7db126a76f4948ab08b9eb8d4"; + sha256 = "0g6a8nm5mxgca7psyi127ky68mal0lj7n486fgrwsg3bxglbsk5m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2fd10423ab80e32245bb494005c8f87a8987fffb/recipes/flycheck-mmark"; + sha256 = "0lnw7pz40hijcpi9b92vjxvvyh9v50ww2f2r8z9pyhl9mjy2245x"; + name = "flycheck-mmark"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-mmark"; + license = lib.licenses.free; + }; + }) {}; flycheck-mypy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-mypy"; @@ -24092,12 +25303,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "20171014.651"; + version = "20180410.422"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "29a9eb320d62400564360986f7ad400b74070d8e"; - sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; + rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5"; + sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -24155,12 +25366,12 @@ flycheck-perl6 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-perl6"; - version = "20150414.1832"; + version = "20171231.445"; src = fetchFromGitHub { owner = "hinrik"; repo = "flycheck-perl6"; - rev = "6a9a929ffb58595bbe9fe3d7c2e78617c8e9bb5a"; - sha256 = "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3"; + rev = "7a69ddbb54dc0748734ace95f598c69e9882aa94"; + sha256 = "1bsbw5pjin7m556pnphq8plgfjvbp1pl738lf5qc85jcvinv998m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f/recipes/flycheck-perl6"; @@ -24278,6 +25489,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, posframe }: + melpaBuild { + pname = "flycheck-posframe"; + version = "20180321.2307"; + src = fetchFromGitHub { + owner = "alexmurray"; + repo = "flycheck-posframe"; + rev = "61bdfd4b04e1651163fdcaa7dc631ad073b3e513"; + sha256 = "1r5cwmrszp5cvzlcc4dyhajxd0zrgxjpc0arhr2jkw1fc3d611x9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/124f2a7833e3386a0bf57c8111d782ae7a7ee02e/recipes/flycheck-posframe"; + sha256 = "02ym2isn761w2nsfxiqjh0jk4md9wy3hk9na2aw7pyycm5cgmfwp"; + name = "flycheck-posframe"; + }; + packageRequires = [ emacs flycheck posframe ]; + meta = { + homepage = "https://melpa.org/#/flycheck-posframe"; + license = lib.licenses.free; + }; + }) {}; flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-purescript"; @@ -24302,12 +25534,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "20171110.48"; + version = "20180402.1039"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "6f7c6d7db4d3209897c4b15511bfaed4562ac5e4"; - sha256 = "0mg2165zsrkn8w7anjyrfgkr66ynhm1fv43f5p8wg6g0afss9763"; + rev = "facb6e6cff7baaf38cf4e76a3e27a508225fc3f7"; + sha256 = "061iahihq348ncbx9zh8ihca6j2fkc1nygk5f7v2q4j2g7kmfv8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -24369,8 +25601,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "dadd74f015f89317ff77424be30a9accadeeb4a4"; - sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24386,12 +25618,12 @@ flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-rust"; - version = "20170404.842"; + version = "20180327.945"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "a89c0298f5e8fdcb0c33833ca1eca64632cec053"; - sha256 = "1h2n1y69fxj2naxlyl7056rhggbpmh13ny2rcf0jjr1qnrrq756n"; + rev = "a722204cff5bffe26b8f127c7003cfc9ed00e34b"; + sha256 = "1z0zkf4dxkma6qz83ysyhbfvr0sg2cwxvsapc9j9l1x9nskybv2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; @@ -24428,12 +25660,12 @@ flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "20170923.1439"; + version = "20180330.1625"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "e85072a04f4277a48d90364b8e48fcb26a650d38"; - sha256 = "12k0nakwv7z90fprpzfrsnmha0w5zsvpq7qiv0md3k3h41b5mgfv"; + rev = "61e93ac41847d27b8eea3a334ced2d1783687b77"; + sha256 = "104zz9fihvd5klzdcaxsdmmfp0q5qisq5bbff48rfwdxnlp8dskr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; @@ -24470,12 +25702,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20170926.317"; + version = "20180411.652"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; - sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; + rev = "06a6f98d7e498860b345bbd03e96bfe59608f508"; + sha256 = "0h1n4x0fvqfb6jcapbab1ck6bj4d7irbn9zz2hxv2rlrkqxfsmh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -24488,6 +25720,48 @@ license = lib.licenses.free; }; }) {}; + flycheck-swiftlint = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-swiftlint"; + version = "20180312.1656"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "flycheck-swiftlint"; + rev = "8496fd4499ef5c0e0cfeb65f4d76c6f9dd8991f3"; + sha256 = "0d2s9brccv7lgw2vnglhhaq29mxb3pxiclhx4w28gb76x8r2rsf7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7e2a979726507e974a0a19dfc2ca6884157025be/recipes/flycheck-swiftlint"; + sha256 = "1nwxv4l3ml9hlc8qf8a8x1bnnvdj80sb8nfbkcfiqwak315wihr4"; + name = "flycheck-swiftlint"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-swiftlint"; + license = lib.licenses.free; + }; + }) {}; + flycheck-tcl = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-tcl"; + version = "20180327.559"; + src = fetchFromGitHub { + owner = "nwidger"; + repo = "flycheck-tcl"; + rev = "7ca23f4673e178b9f5dcc8a82b86cf05b15d7236"; + sha256 = "17mmj0yx7d7cwyq35ll1lw4j0yyha172375apvanrkpgpzjpnvrq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fafc86df6c15348711f16302bb86c0ee08c08454/recipes/flycheck-tcl"; + sha256 = "0rmc7rk0n4mgk11jgza1dn1nkjyi7rqs79d3p0cj1081znyj56f3"; + name = "flycheck-tcl"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-tcl"; + license = lib.licenses.free; + }; + }) {}; flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; @@ -24533,12 +25807,12 @@ flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-vale"; - version = "20170619.2322"; + version = "20180308.2243"; src = fetchFromGitHub { owner = "abingham"; repo = "flycheck-vale"; - rev = "97df981468120aaedeaa4cf8ecfd68b07046d998"; - sha256 = "1zic9mirz2xi25pcj3d6r9sclambyn9q5dp7v9jvvxqkml3vy88c"; + rev = "7777e0d4cf961b6ee6ae4ef917636121d18b3ee8"; + sha256 = "1k0bhyy2r9c79lld7mbhw8n4c1hlzwr5qp5wmcxzya0fnp3s6g9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale"; @@ -24551,6 +25825,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-xcode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-xcode"; + version = "20180121.2251"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "flycheck-xcode"; + rev = "6147ab777e2c08e4f5ffdbd85d3013ca700fa835"; + sha256 = "1jwd7xhg7gfjppimf1kxwxwsgzkqc8w86wgp7kqphp79ydd4jgp8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc66203fdd1721bf1a6f8dcec51694c57d2e690/recipes/flycheck-xcode"; + sha256 = "0n86hn6rf0mrx1385pwxgkx28xrbnksarlzb07h9d63s0yb5shaa"; + name = "flycheck-xcode"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-xcode"; + license = lib.licenses.free; + }; + }) {}; flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-yamllint"; @@ -24575,12 +25870,12 @@ flycheck-yang = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yang-mode }: melpaBuild { pname = "flycheck-yang"; - version = "20170915.1308"; + version = "20180312.1131"; src = fetchFromGitHub { owner = "andaru"; repo = "flycheck-yang"; - rev = "c5f65fe3f710f73d56e04d077868719afc1ebfaf"; - sha256 = "00w91mif3wnxgj93qag51yyadnfcsyxik96vf91qlfvwh4wi6ii7"; + rev = "47881fc42ef0163c47064b72b5d6dbef4f83d778"; + sha256 = "0bkbl1pas44bl6s3xjdb5zjbd6bmfjk39md5ds1ix4wchnkjm3iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e58b4f4294d11424918b399898c0044f5b76ab14/recipes/flycheck-yang"; @@ -24596,12 +25891,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20170614.1434"; + version = "20180207.843"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "e8a6c2bb6cdc18645e2ebc6a8ede8f0c306f013d"; - sha256 = "0gijzvc6krz1228siysk4za3pwfgfmwh04b8zjc57qkccngibnf9"; + rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; + sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -25041,8 +26336,8 @@ src = fetchFromGitHub { owner = "benprew"; repo = "flymake-puppet"; - rev = "9579e5c736cb890195464fabf51df113313de88d"; - sha256 = "1bk16l8rbvrwmcd0zd2yg8xmfn7b036716niy21wfizmar0pk7p7"; + rev = "8a772395f4ccc59d883712ab53a92a17c1d9a429"; + sha256 = "00w87qa7r8rigmpv58vpjwpn9x13sv7db5m6z4cqh76qkgkghgqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/302dbe34e7949da9c65e9c7bf2ab924db91b968f/recipes/flymake-puppet"; @@ -25268,12 +26563,12 @@ flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct"; - version = "20170213.700"; + version = "20171205.940"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; - sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -25293,8 +26588,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; - sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -25314,8 +26609,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; - sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -25335,8 +26630,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; - sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -25352,12 +26647,12 @@ flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-lazy"; - version = "20141222.652"; + version = "20180224.1306"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "flyspell-lazy"; - rev = "31786fe04a4732d2f845e1c7e96fcb030182ef10"; - sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm"; + rev = "3ebf68cc9eb10c972a2de8d7861cbabbbce69570"; + sha256 = "1n67y90vm041mz172gjqypw3b5za5f18sic54h7wz4a9naynwyb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/flyspell-lazy"; @@ -25391,27 +26686,6 @@ license = lib.licenses.free; }; }) {}; - fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fm"; - version = "20130126.1618"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fm"; - rev = "555bcebdf47ea3b1d9d1e152af7237b9daa62d59"; - sha256 = "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e4a74b87c05b408433545a2236000ac081af36bf/recipes/fm"; - sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f"; - name = "fm"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fm"; - license = lib.licenses.free; - }; - }) {}; fm-bookmarks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fm-bookmarks"; @@ -25440,8 +26714,8 @@ src = fetchFromGitHub { owner = "troyp"; repo = "fn.el"; - rev = "2dc78b7ef9e24f9fe872d40c8fe6050f7ce819cf"; - sha256 = "0nvhis3myclgvazhiljv7fgis1x5hwr5rr8rhxx3290fgsgdp0bw"; + rev = "f685fd0c08ec3b1d1b9974b37e62edd78a000cb8"; + sha256 = "1k8pwlpcvlwr4pavg85ja8hdc7rrbafqs1mhhqr5gbq8cp822sja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn"; @@ -25457,12 +26731,12 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "20170612.743"; + version = "20171203.2103"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "a84ade00a2b57e47430d5b2df5246069f197356f"; - sha256 = "0qz52gak45nbi6pgsdl3h2a01d89gbzm0glpv1jjy5dvabr98835"; + rev = "045ee6175e9340f873db03445c74ff9eefa35a27"; + sha256 = "1hrx8bj4gf0dqbfxgvis62zxnkiyms6v730s55vd8711zxdl0pw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -25517,27 +26791,6 @@ license = lib.licenses.free; }; }) {}; - fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fold-dwim"; - version = "20140208.837"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fold-dwim"; - rev = "c46f4bb2ce91b4e307136320e72c28dd50b6cd8b"; - sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim"; - sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d"; - name = "fold-dwim"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fold-dwim"; - license = lib.licenses.free; - }; - }) {}; fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: melpaBuild { pname = "fold-dwim-org"; @@ -25562,12 +26815,12 @@ fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fold-this"; - version = "20150601.342"; + version = "20180224.40"; src = fetchFromGitHub { owner = "magnars"; repo = "fold-this.el"; - rev = "90b41d7b588ab1c3295bf69f7dd87bf31b543a6a"; - sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn"; + rev = "4fb509a4176e950d083a5321ad62742f2e9bcb7b"; + sha256 = "1csazxx6wnnriklbrdqxmf7nc67gqb7c5zppr797bk4j4calskgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this"; @@ -25688,12 +26941,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20170924.1440"; + version = "20180106.920"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "02829f582d03c149d0aace9a0bdf2bd405b2e4a2"; - sha256 = "0rvwhvmv9b6ma6jf5gbmmy9ahrsli4qflc8z2n2whl743rbcfpk6"; + rev = "35424f7360f5110833b7a9f4f53907b9e222be85"; + sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -25709,12 +26962,12 @@ foreign-regexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "foreign-regexp"; - version = "20160318.907"; + version = "20180224.321"; src = fetchFromGitHub { owner = "k-talo"; repo = "foreign-regexp.el"; - rev = "e368c4dbd3b7a95a14cbc3c25617b5f1bc5a7fb4"; - sha256 = "1459hy5kgp0dkzy1jab41aibixgmrk9lk6ysn1801spd8gwph371"; + rev = "2ec5c44f27c2396ee487aa0ed77ae47d143fa5aa"; + sha256 = "0zww0q8x99sfwzf05pk7blsi3v8xiw4xgmlwnv1qlf2qxjkz1xhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05514013948a520cf0dcaf1dc2ef2300dd55e98/recipes/foreign-regexp"; @@ -25877,12 +27130,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20170728.507"; + version = "20180410.732"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "34402a27430f8297d157ac3fba3adb09bd3e0d7f"; - sha256 = "0ci46n4gy5dprz8998xf8dybi5182wv3h65wb2g4h2zhi1n5053i"; + rev = "1efbdbba6cb52c8bc2e70ca2636935d2b1ea8d98"; + sha256 = "16hlywji8ny8b7dc6wq9vfxp6b1fbm1m4f3mzxgngs3gjv6vic82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -25961,12 +27214,12 @@ frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frames-only-mode"; - version = "20170802.455"; + version = "20180114.1048"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "d2e6a825e2079adb58012e9677c494d317494724"; - sha256 = "1x8w2788yaqfi5ys541kp4wi3rcfa2lvbhnxgd8dwr9h0da332xa"; + rev = "0f42139a41e97bb0a2ebc320d41cec071c034ca0"; + sha256 = "0bfgqlfdjmxz8fq34ad9m6avja5z5pvw9cjxlfxd3k716ga1nc06"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; @@ -25979,6 +27232,27 @@ license = lib.licenses.free; }; }) {}; + frameshot = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "frameshot"; + version = "20180228.408"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "frameshot"; + rev = "4e7b252e9fd9227de8b25f384af2c855ec45279a"; + sha256 = "020irzkqr7gs99xsvdd0haja0jvw46dk40xi7ab0m3cq7957srjh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot"; + sha256 = "1z5f988m9s25miyxbhaxk6m4af9afvblb2p5mdidva04szjklr70"; + name = "frameshot"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/frameshot"; + license = lib.licenses.free; + }; + }) {}; framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "framesize"; @@ -26137,12 +27411,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20171105.1108"; + version = "20180324.2211"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "742e427068b5a8568f257585db3fc89c2c6c620e"; - sha256 = "1id41sw15cvazrh7rfb3b840n2ff42qspfr7pm1sfb3v0g7cq6i6"; + rev = "9b948a4ff5d54b5f72c7b004146121ab7d1b9018"; + sha256 = "1r6dgi029hybsbkjbgb2bhsr4ashpfcx3x3sp3gb1ypg2nlck463"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -26166,12 +27440,12 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170805.2030"; + version = "20180224.1411"; src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "d2f3977768f5588b9467cc73c12d9a1de204d9e8"; - sha256 = "1cx1fyr372zhkf35mjvl46c3zim7whz8z2ax88dqavh67h92ai9h"; + rev = "9b2eac2942d777572e330ba5231e1ee3c0a4eea8"; + sha256 = "1sz3n3dfrga2zgwmn7fy21vhgfw51ma8pbgr459hfq9ay96yvd94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26268,6 +27542,27 @@ license = lib.licenses.free; }; }) {}; + fuo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fuo"; + version = "20180314.948"; + src = fetchFromGitHub { + owner = "cosven"; + repo = "emacs-fuo"; + rev = "5318bef9d935b53031e6312652554920def69af2"; + sha256 = "02f4kl1y277pry13hz1jscdh2nrbn3xp7zm1dmqyn8yfhn1s1yx2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/25fb625becf7f582d2a8d53726d6f01d9ea89ecc/recipes/fuo"; + sha256 = "02mvgz2cxrdn5kp5dw0c57rl5nfavqli5yqbxczmbsih164ljdxf"; + name = "fuo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/fuo"; + license = lib.licenses.free; + }; + }) {}; furl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "furl"; @@ -26292,12 +27587,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20171026.722"; + version = "20180416.830"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "50fcb5d6885cf9b38a3d242cf5d4f869af74d2ef"; - sha256 = "02nhv4a02v0xgv8y4qxgh1q55mjplz8mj7c34292iz02mbxmzbyj"; + rev = "314e43c80fc31e15741136e61f3ee5f793ba190c"; + sha256 = "1i9rs9cb9l7hp678rf4w9r47zqy1pakyy7alfli192mm650w07l1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26355,12 +27650,12 @@ fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fwb-cmds"; - version = "20160523.535"; + version = "20180318.1519"; src = fetchFromGitHub { owner = "tarsius"; repo = "fwb-cmds"; - rev = "57973f99cf4a185b5cccbf941478fad25e8428c3"; - sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b"; + rev = "90258a5c7dbbaa2ac227e0fb4ff6c7d5aec3628f"; + sha256 = "1xwvv8wjgdaz96v1x1xc5w697bfvcanlcixd0n5qbx6ryakqrb72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds"; @@ -26418,12 +27713,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "20171026.554"; + version = "20180102.1712"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "ef1dc851077913a327261a6b971fab5f5f657831"; - sha256 = "12zbvr7806xiyx2q944nfnqqfnm43v9ziaihkb9n10s2sp6ippb7"; + rev = "b750cccae7c37a9ee4d40d928bb508cc3234bfbf"; + sha256 = "0a1g7bv4qakzzrvvsh5m5ic3yhha57fj3d09gmr7rb5b3p2kl5cz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -26436,22 +27731,22 @@ license = lib.licenses.free; }; }) {}; - gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + gams-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20170309.2204"; + version = "20180416.206"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "ce51aa1afec78bf96aedb4badf33463383b7593e"; - sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5"; + rev = "3022e9f8411628e6a210fb5843d858b15a7513f5"; + sha256 = "06hc8yy1g2vyvib8yrhwzs8fvgxnrxlw6iyzi7phjp9fgr3cp504"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci"; name = "gams-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/gams-mode"; license = lib.licenses.free; @@ -26518,6 +27813,27 @@ license = lib.licenses.free; }; }) {}; + gdscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gdscript-mode"; + version = "20180117.2056"; + src = fetchFromGitHub { + owner = "AdamBark"; + repo = "gdscript-mode"; + rev = "31af5283eaec207bc864022a28e2824132471eaf"; + sha256 = "0f24zsklkhhvj6qdyid2j1qcyhjnncxjma93zhr0klvn5j1z3aar"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/52f99eafb2e80a7fa13a98add98b03a147f35e8b/recipes/gdscript-mode"; + sha256 = "0v4ab5xxpq1kya2is5qq61fmfgxgvbigyz7wp907z3mc00kg2818"; + name = "gdscript-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gdscript-mode"; + license = lib.licenses.free; + }; + }) {}; geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; @@ -26584,12 +27900,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20171102.1825"; + version = "20180413.1646"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "da22a526c1f683a90bb60840d05a6bb5f3a74ffe"; - sha256 = "101v0hfsdzksc3pr6vds7ypwmrpxvslmwmskwm9i94sxs39j067c"; + rev = "ec3d0ea34081789da44f0b11b2cf05627a1e9b8e"; + sha256 = "0g79vz9b73p7g2zy8ml0glwiivq48d64yq3kd6wmq1qpx3zflrf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -26605,12 +27921,12 @@ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20171106.818"; + version = "20180406.944"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "4b75854316d3db0cd143dcf874a56f90a252f506"; - sha256 = "0g8fq1ny2c1gjshr8wckgdg0qp4lg1m6430cr5zxazhqf1m59qcp"; + rev = "d8fb9f69c9d66279316b096929454ebf242aa721"; + sha256 = "025dakpmp2232n15rjz6kbs0vn1gazi4qkaagkm8fra703sx4v4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -26710,12 +28026,12 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "20170918.1838"; + version = "20171203.1553"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "6293c438a4a7aae08b8f5dd5fc0082d3da0aa530"; - sha256 = "0rb293wjnc36gjy1vvvqsy605nn0vli1b1w210vvcjbg7zgcsak1"; + rev = "eec392d2d639030c5a51bce8431f2815ad8e7bc5"; + sha256 = "0mlva84zbi93jrvvd3bgyndc68iib27zsjsd2f52df89198brjqs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -26728,22 +28044,22 @@ license = lib.licenses.free; }; }) {}; - gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: + gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache }: melpaBuild { pname = "gh"; - version = "20170512.2049"; + version = "20180308.1338"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "76255942ccc84d5cf918a2b6411a8ac98a7c8585"; - sha256 = "09b09zqawll6lbrhl352x7g62s4spq97rd8x32shn9m01w6paz9r"; + rev = "f029fc11f345ef04ab62ee91c38657e29c462fea"; + sha256 = "1rgdpi8ld5hi2rp30p8sxbrl6z95nvq80jfp3zsr7cmsniwz0vv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0"; name = "gh"; }; - packageRequires = [ dash emacs logito marshal pcache s ]; + packageRequires = [ emacs logito marshal pcache ]; meta = { homepage = "https://melpa.org/#/gh"; license = lib.licenses.free; @@ -26773,12 +28089,12 @@ ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ghc"; - version = "20170613.1212"; + version = "20180121.418"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "06515c44830788254602af90118de07ae2effb12"; - sha256 = "1ymjq9nsqzf8vhrzniwqzszwbdlq5y2nmr8pgbwhmh3bvfbpj7ff"; + rev = "39b96c475090f91e4f717197c96e083fdb2ccaf7"; + sha256 = "0f9qzk3czamqjb42xg2bmx70hafza8cn84zylx60bw8yx4i0q7nx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -26836,12 +28152,12 @@ gherkin-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gherkin-mode"; - version = "20140107.804"; + version = "20171224.553"; src = fetchFromGitHub { owner = "candera"; repo = "gherkin-mode"; - rev = "ff9e47350c5ba319feb6b87fe20695519681fa64"; - sha256 = "0dbdms3ddsfhscwy7jj0cfpn3jdxnzynrfz5jps2l91adx2g011y"; + rev = "0313492e7da152f0aa73ddf96c0287ded8f51253"; + sha256 = "15m9a2dcxgmbj0ni2qcxg3vpxvs50pyjvlacm3xd2xhm9wd484hr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d80becedead8db441eed6f7856ca64d78815e2/recipes/gherkin-mode"; @@ -26896,22 +28212,22 @@ license = lib.licenses.free; }; }) {}; - ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20170803.601"; + version = "20180414.1654"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "7c52e9063ad10f76d45d816a92c65cf1f6c7b9af"; - sha256 = "1iynfqza146mnkvsgfjnfmja4m42m71s0nw015iks428nzrrkf1j"; + rev = "27e7b17473d17b684ddf873e4281f2595c05ca65"; + sha256 = "00yjgz8c03l8v99gi2ly08iwp10bv5s6hhhlvw1kyg00mflgn4m9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; - sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; + sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps"; name = "ghub"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs let-alist ]; meta = { homepage = "https://melpa.org/#/ghub"; license = lib.licenses.free; @@ -26920,12 +28236,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20171019.944"; + version = "20180330.1738"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "e04050f81106029c342deb7adbfc67b2a888ec58"; - sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6"; + rev = "3f609f5d8277e4282bf2b93366c9f911e0f721a8"; + sha256 = "01a6sgzmyc3m4adik1sgvp19z12rap51xj72hjywgh116l9cqn52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -26938,15 +28254,36 @@ license = lib.licenses.free; }; }) {}; + gif-screencast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gif-screencast"; + version = "20180309.242"; + src = fetchFromGitHub { + owner = "Ambrevar"; + repo = "emacs-gif-screencast"; + rev = "825e606950ec842304bf75cf85baef707b853b03"; + sha256 = "0xdzfw19zll8v9kpvay2rm8piq92ksz574m2gb6b63nm3z7sia1j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b149509fb245975b450d15470c7d915e3c7b474d/recipes/gif-screencast"; + sha256 = "12kjr76b1180g3grfycghmgr3xf4vmhlhks8x3ri1gigdf0j8vaa"; + name = "gif-screencast"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gif-screencast"; + license = lib.licenses.free; + }; + }) {}; gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gift-mode"; - version = "20170809.130"; + version = "20180204.1358"; src = fetchFromGitHub { owner = "csrhodes"; repo = "gift-mode"; - rev = "573e4a8001e9585d347a99323a1649c2055ae5ff"; - sha256 = "0qhhgwhj5nghlq5nrz7ycy2y5s1q10xzsahlh41fm5givm0rb650"; + rev = "b8dcb86c7f83df0fbdc0da4f80c187423c936e50"; + sha256 = "01x87aam43xmhx7np9rvrdhln3pwn4zfn4d8s38rdpi77n9prw5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode"; @@ -26983,12 +28320,12 @@ gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "gist"; - version = "20170604.1834"; + version = "20171127.2006"; src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "a03f142455e8b39f77fbd57ee1c1e44478c1f9e2"; - sha256 = "1xisjaxr54zrxzxj8cp8f90kzphd5v3j56d14534fm5r1f5343vp"; + rev = "314fe6ab80fae35b95f0734eceb82f72813b6f41"; + sha256 = "0vbyzww9qmsvdpdc6d6wq6drlq1r9y92807fjhs0frgzmq6dg0rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; @@ -27043,6 +28380,27 @@ license = lib.licenses.free; }; }) {}; + git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "git-attr"; + version = "20180204.15"; + src = fetchFromGitHub { + owner = "arnested"; + repo = "emacs-git-attr"; + rev = "c03078637a00ea301cbcc7ae301ae928b10af889"; + sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr"; + sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi"; + name = "git-attr"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/git-attr"; + license = lib.licenses.free; + }; + }) {}; git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-auto-commit-mode"; @@ -27109,12 +28467,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20171007.346"; + version = "20180411.1649"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "1c69e9e9107ac9c881c763f69d11a3686d201a74"; - sha256 = "1qi32vplmjwnqpcrxgvf1qgzrkbgqi3wgngixwl67dm8xv7di799"; + rev = "16785d7962cf84df12cf1e498b2c96519e84d235"; + sha256 = "0ifzqqsyqk5x3d8zvq0yspcfhlndl7ppv6yxzz8w27pgb4h0jqwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27253,15 +28611,36 @@ license = lib.licenses.free; }; }) {}; + git-io = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "git-io"; + version = "20180317.1052"; + src = fetchFromGitHub { + owner = "tejasbubane"; + repo = "emacs-git-io"; + rev = "48753acba73b48b997bb678fb5e2a938ae63b5d6"; + sha256 = "1zw24j6l0ap761q1knxjaxzdfz11kmfq29aag5av4n87m86rxzr8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a713197f227e3c43de3609dd505cf7cd226d94b9/recipes/git-io"; + sha256 = "1acwc9iqchvlvx98fxh4xf3xphv0xzrnxpv8kkl8qaly41izfj0v"; + name = "git-io"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/git-io"; + license = lib.licenses.free; + }; + }) {}; git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-lens"; - version = "20170517.144"; + version = "20180328.717"; src = fetchFromGitHub { owner = "pidu"; repo = "git-lens"; - rev = "91bf19d6dd7368de5cad373a8155c48c4e254723"; - sha256 = "1gszcsji3n42xpshz1pzyvlrd0hxjh14fr4n0ixqv2igk3fywxr3"; + rev = "ea49e2e005af977a08331f8caa8f64d102b3b932"; + sha256 = "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens"; @@ -27316,15 +28695,36 @@ license = lib.licenses.free; }; }) {}; + git-msg-prefix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "git-msg-prefix"; + version = "20180118.646"; + src = fetchFromGitHub { + owner = "kidd"; + repo = "git-msg-prefix.el"; + rev = "848f2c7475f5e4937b09f55e85ea89a3be5f8588"; + sha256 = "0ab6qjq5nky15vj88j5s8sh7gp9lbwgxrfqsc08bg6gdf2rx2dvx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bd37811d17beaa54e08eb4968791da960d37b391/recipes/git-msg-prefix"; + sha256 = "0vicaj91yhbzda76wrwmbfby2ikaja52bcm923jx8brjh1wd99wr"; + name = "git-msg-prefix"; + }; + packageRequires = [ dash emacs s ]; + meta = { + homepage = "https://melpa.org/#/git-msg-prefix"; + license = lib.licenses.free; + }; + }) {}; git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-ps1-mode"; - version = "20170102.1944"; + version = "20180413.247"; src = fetchFromGitHub { owner = "10sr"; repo = "git-ps1-mode-el"; - rev = "e41c630f5d04cb1a4d38a4b500d7a154a96a4655"; - sha256 = "11bg953nk5x501vkr0jrz710pz3qxla27bgrd4gp503fbygnixkz"; + rev = "6a06bf57cbe614ab26032b153d3dcf4fb4bfa7ee"; + sha256 = "1lgvzla1bg7gmkj41hmzhiqcbdmdw9ycpzfvpl6xl0sm0fk3j3rj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea177b5ea168828881bd8dcd29ef6b4cb81317f0/recipes/git-ps1-mode"; @@ -27340,12 +28740,12 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "20170325.220"; + version = "20180307.414"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "7cb0d03bc370d3e734c8ee23b809a4e768b01743"; - sha256 = "11yjw08dp8m25psl27qfgk8c9m9v51rbiyq3lp0mp9mhr17wdp9d"; + rev = "dbcb92ffaa5f8350d47f4fbd74512f4000b8c043"; + sha256 = "1ml06jfjyrcqmbpr5hqvbpi3yy6l2aa836jq8qjla1h74g9qka7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -27382,12 +28782,12 @@ gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitattributes-mode"; - version = "20170118.1613"; + version = "20180318.1256"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -27424,12 +28824,12 @@ gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitconfig-mode"; - version = "20170627.854"; + version = "20180318.1256"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -27610,6 +29010,27 @@ license = lib.licenses.free; }; }) {}; + github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: + melpaBuild { + pname = "github-stars"; + version = "20180328.433"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "github-stars.el"; + rev = "15cbf15cdd3fbd2139b5c128a173bb8f6a4ef496"; + sha256 = "10hyjkdbf5b792vfm072g9wizkszwghxs2x5k1hi1q0c4gw5w518"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/58df7d536f9711e10ecaa6e0a37b9ad255e8fca5/recipes/github-stars"; + sha256 = "1vljmrjid5xxmq5yfmsaq09js7zd75nmm4gd0kwm3lf71pb3lp6f"; + name = "github-stars"; + }; + packageRequires = [ emacs ghub ]; + meta = { + homepage = "https://melpa.org/#/github-stars"; + license = lib.licenses.free; + }; + }) {}; github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-theme"; @@ -27634,12 +29055,12 @@ gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitignore-mode"; - version = "20160319.302"; + version = "20180318.1256"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -27652,15 +29073,36 @@ license = lib.licenses.free; }; }) {}; + gitignore-templates = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gitignore-templates"; + version = "20180327.626"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "gitignore-templates.el"; + rev = "b0705b8de4cbdd631c64c4e0024d62ba4ad68052"; + sha256 = "1f0lcyw7yrdfmv0h8b87kz0pdrzhy28fzv688z4aaw964qn8jz0k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c9aa71eac2e68eb1925ed00a2c659c4375bd39c/recipes/gitignore-templates"; + sha256 = "17zx52pmpd4yqlnj39v7ym728i710mdl0by3lc8zk6ljfz77933w"; + name = "gitignore-templates"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gitignore-templates"; + license = lib.licenses.free; + }; + }) {}; gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "gitlab"; - version = "20170710.724"; + version = "20180312.947"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "67567a354a1888419331b79862f151817d9747c5"; - sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; + rev = "68318aca3206d50701039c9aae39734ca29a49f9"; + sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab"; @@ -27673,6 +29115,48 @@ license = lib.licenses.free; }; }) {}; + gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }: + melpaBuild { + pname = "gitlab-ci-mode"; + version = "20180401.252"; + src = fetchFromGitLab { + owner = "joewreschnig"; + repo = "gitlab-ci-mode"; + rev = "19a377aa42cd8a8bea74ae900fedc2ac74a323a5"; + sha256 = "0wjz87nhcwzp201jxv3qlj88hn7p8nvq20924y06gra2d656znar"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; + sha256 = "1jg6ihrgccrcwg30ysyqw9k7rmvfmsrp70skr2057hfamvccwn4f"; + name = "gitlab-ci-mode"; + }; + packageRequires = [ emacs yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/gitlab-ci-mode"; + license = lib.licenses.free; + }; + }) {}; + gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }: + melpaBuild { + pname = "gitlab-ci-mode-flycheck"; + version = "20180401.255"; + src = fetchFromGitLab { + owner = "joewreschnig"; + repo = "gitlab-ci-mode-flycheck"; + rev = "adc5658fe3c90ff944b6ca481773b316a6016e86"; + sha256 = "111clb37329c7v0lv1lwypb8bv7qb9f495f2cy45j2n711vymdna"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck"; + sha256 = "19ixd60yynsvmaj7mkppp6k73793x794vrnhx3hh6n7dap1rsjdh"; + name = "gitlab-ci-mode-flycheck"; + }; + packageRequires = [ emacs flycheck gitlab-ci-mode ]; + meta = { + homepage = "https://melpa.org/#/gitlab-ci-mode-flycheck"; + license = lib.licenses.free; + }; + }) {}; gitolite-clone = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: melpaBuild { pname = "gitolite-clone"; @@ -27718,12 +29202,12 @@ gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "gitter"; - version = "20161203.9"; + version = "20180122.56"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "gitter.el"; - rev = "3ff1c72ee85be4e3b648b4c52b0638129f3cf7a6"; - sha256 = "19vd81pdjjbmiq3md1052x1lf43c8q9pfpq2b8lrdpz6qaphk6f6"; + rev = "11cb9b4b45f67bdc24f055a9bfac21d2bd19ea1a"; + sha256 = "14ri86kxqz9qfhcr0bkgfyggy4bgg9imk9akhw6dfzqkl90gn2gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter"; @@ -27757,22 +29241,22 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "glab"; - version = "20170924.359"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "glab"; - rev = "9848182275e0448390ccdd8dcd8e1e3a1853950c"; - sha256 = "1fw1ck85y9r6z331g1wj7rix29fwy6gwbm7vqj3wff0lszy208ba"; + version = "20180319.828"; + src = fetchFromGitHub { + owner = "magit"; + repo = "ghub"; + rev = "27e7b17473d17b684ddf873e4281f2595c05ca65"; + sha256 = "00yjgz8c03l8v99gi2ly08iwp10bv5s6hhhlvw1kyg00mflgn4m9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; - sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab"; + sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8"; name = "glab"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs ghub ]; meta = { homepage = "https://melpa.org/#/glab"; license = lib.licenses.free; @@ -27928,12 +29412,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20170406.732"; + version = "20180129.2300"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "d79e519308727dec897f2574c938c6425b9a30c2"; - sha256 = "1dr9wcj697d68dxg1026ggxvyvpxjdvydilmym3fhczijdpwm33y"; + rev = "fa569827c916ed46e410e9f28e4b4d28f8567654"; + sha256 = "0x1i1xcd3d34c9c87isd39d9ra69ywd01ag0hgkkgdzrk44znshj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -28054,12 +29538,12 @@ gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-summary-ext"; - version = "20160704.1120"; + version = "20180113.516"; src = fetchFromGitHub { owner = "vapniks"; repo = "gnus-summary-ext"; - rev = "2298b0eca887a9df1e2d7c61d92176bb175ea482"; - sha256 = "1df85xwrr9wciwa83m2qfkfcbi1p623pdhqxm56005x4rmxg0rqr"; + rev = "025fd853fe9280ae696a89ec2c2cac9befd010aa"; + sha256 = "07ww2nc03daz70f2ajw7b2gin22xa306001zclhrxkm1cpjif2fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext"; @@ -28142,8 +29626,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "e990796e68a2ebfc099afed20b99e26d6b64061a"; - sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3"; + rev = "d7aee89652f1bd8ca319c64d6dee1bc1dfd9b6ef"; + sha256 = "1mbz80y0qa6vyvjs33hxsrq5vc2mza5rjhi6rvbxzy2a3lrx4cig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28261,6 +29745,27 @@ license = lib.licenses.free; }; }) {}; + go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "go-fill-struct"; + version = "20171224.1931"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "go-fill-struct"; + rev = "a613d0b378473eef39e8fd5724abe790aea84321"; + sha256 = "16bgfykvqc61hlx1hj55z15y83zgpavhb853sblds75m8w7mndqg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct"; + sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7"; + name = "go-fill-struct"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/go-fill-struct"; + license = lib.licenses.free; + }; + }) {}; go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "go-gen-test"; @@ -28310,8 +29815,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; - sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; + rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b"; + sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -28345,15 +29850,36 @@ license = lib.licenses.free; }; }) {}; + go-imports = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "go-imports"; + version = "20180325.1918"; + src = fetchFromGitHub { + owner = "yasushi-saito"; + repo = "go-imports"; + rev = "7955b820668af7380e65b418e66e445729ea8ef3"; + sha256 = "0yykpnnrxjp4zf66l6pcx9xx4v26b6468gyqyf77kr5890ry9sl1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4118ebf0db84cc047fab311c789bfbffd6eb2d92/recipes/go-imports"; + sha256 = "0xxlh4rmyvfxiynsdqng6wd3js7h3azhb8ii0ch7n0hhqkcnda4x"; + name = "go-imports"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/go-imports"; + license = lib.licenses.free; + }; + }) {}; go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20170726.555"; + version = "20180327.830"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; - sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; + rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b"; + sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -28436,8 +29962,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; - sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; + rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b"; + sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -28474,12 +30000,12 @@ go-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "go-snippets"; - version = "20170831.2302"; + version = "20180112.2211"; src = fetchFromGitHub { owner = "toumorokoshi"; repo = "go-snippets"; - rev = "7e38fc0ddf2cc786cdb273882ff9b3563abc3c7a"; - sha256 = "0dsbp0x8qmv2k649x7l264zc8cv08dlrxz09lv643fchm56rsljm"; + rev = "d437df148879566ffe7f2e503a3cf2602aa9fb28"; + sha256 = "0rs2yj9bh0snf13hfj9bvyawl16j8416naz6h52l21q72ymd4b0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca9f3022e7f4d5391be394cd56f6db75c9cff3b6/recipes/go-snippets"; @@ -28513,6 +30039,27 @@ license = lib.licenses.free; }; }) {}; + go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-tag"; + version = "20180226.2011"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "emacs-go-tag"; + rev = "59b243f2fa079d9de9d56f6e2d94397e9560310a"; + sha256 = "0r72qk79q8yyidpxgq4r0295fm73id946p1r4s65bwyzii76rjyi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; + sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f"; + name = "go-tag"; + }; + packageRequires = [ emacs go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-tag"; + license = lib.licenses.free; + }; + }) {}; gobgen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gobgen"; @@ -28537,12 +30084,12 @@ god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "god-mode"; - version = "20151005.925"; + version = "20180117.334"; src = fetchFromGitHub { owner = "chrisdone"; repo = "god-mode"; - rev = "6cf0807b6555eb6fcf8387a4e3b667071ef38964"; - sha256 = "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix"; + rev = "344167ed9b4c212273dd056e7481cf1373b461d0"; + sha256 = "0y7phh7amrdphv9dkf0304z2knyas745ir59ybngh1a55dfc2mf4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2dff8dc08583048f9b7b4cb6d8f05a18dd4e8b42/recipes/god-mode"; @@ -28639,15 +30186,36 @@ license = lib.licenses.free; }; }) {}; + goldendict = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "goldendict"; + version = "20180121.120"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "goldendict.el"; + rev = "1aac19daaec811deb9afe45eea4929309c09ac8b"; + sha256 = "1il432f6ayj2whl4s804n5wykgs51jhbx4xkcbfgqra58cbjrjhi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/af87026905478d9134a4a036e792f6afd9c10768/recipes/goldendict"; + sha256 = "0zvrlz169pg9bj1bmks4lh5zn8cygqzwiyzg49na2a7wf2sk9m1f"; + name = "goldendict"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/goldendict"; + license = lib.licenses.free; + }; + }) {}; golint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "golint"; - version = "20150414.1730"; + version = "20180221.1215"; src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "6aaf7c34af0f4c36a57e0c429bace4d706d8e931"; - sha256 = "1z1j2l0j5175xvin5v56nsq7byg5nfpfvl9xgjszparchkyr8ndz"; + rev = "85993ffd0a6cd043291f3f63d45d656d97b165bd"; + sha256 = "0kag4ki3dx9xnm41gj4q77wcl77785id4qqb8kb7k5rhfrs29psz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -28705,12 +30273,12 @@ google-c-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-c-style"; - version = "20140929.1118"; + version = "20180130.936"; src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "664829b970331224a697b1e766fafee729d773ee"; - sha256 = "12qvhjak3bjm7c164capr9k5wwjfxlbv0hzrp1w85c4n2japjxik"; + rev = "1b206ee36263b16ec18f7b2f86a2b770b7490844"; + sha256 = "0vwx5h7b0f4yv5aqznw8zq2fnwwdmrcfa270v16dzdfr5a7n3pj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -28873,12 +30441,12 @@ gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: melpaBuild { pname = "gotest"; - version = "20170823.141"; + version = "20180319.137"; src = fetchFromGitHub { owner = "nlamirault"; repo = "gotest.el"; - rev = "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9"; - sha256 = "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7"; + rev = "ad0d617887eed837eed72f7d3daba40d1bb7cba8"; + sha256 = "1lsc6bri8rqkqrmhdslqpph2rdad4b3x8zabg55d9msc4fh25jlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest"; @@ -28915,12 +30483,12 @@ goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "goto-chg"; - version = "20170917.1200"; + version = "20180105.1033"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "goto-chg"; - rev = "81fca94d2592cf32bab451c39a9cd2d9b03fbd6b"; - sha256 = "033msplvpahkva9ha09gsg9232fyz2bjihrdxaa2z9g4yzql8jkq"; + rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4"; + sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; @@ -28978,12 +30546,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20171108.1429"; + version = "20180402.2025"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "46c79c93aa37681c9cdb8bcda3f56f707dde4fb7"; - sha256 = "1x3ipkl1v66351xpx87j16f08x079a8q8abzi22bf6fl77ypsalf"; + rev = "d3ae3004773719bcc413ff8e3396f2ce6bf0827b"; + sha256 = "0l06li4d7mppj7r7xvx4dpvi0asdcazwj3nil6kd1in2pfq3hh4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29020,12 +30588,12 @@ grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-mac-link"; - version = "20170822.2321"; + version = "20180328.745"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-mac-link.el"; - rev = "fa23db288c93ff12d804939aa3c78e809169523e"; - sha256 = "1r2rcxcipyxdr16m8y93yc86vqxcmxamvkj60dg6ljsxg2lgvbx4"; + rev = "35edb57d136c2a9726fd14e6a59cce4fc0248771"; + sha256 = "1c3g6ygi71qm3lqvhjjzxkpdhwkpx4qwm8mhinwffcib5hagrafn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; @@ -29041,12 +30609,12 @@ grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-x-link"; - version = "20161130.2147"; + version = "20180205.346"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-x-link"; - rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76"; - sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1"; + rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c"; + sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; @@ -29108,8 +30676,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; - sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; + rev = "0aea74def58791b2343a8f0139c2f2a6a0941877"; + sha256 = "0aih46rk2zzxhbx4k65w1lmg3ibxnkimdfpyxc5qfdcr4kyfg06i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29146,12 +30714,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20170507.104"; + version = "20180131.1439"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "2f7e607cde9dd38ad4a95f3f3ad6cd85eba09f7b"; - sha256 = "0mc29g3hz7fb2a91rr24z2fnlqdwnq1q3lh14qyd7i9zpy5965dl"; + rev = "823232a83a51e8a3f7b4db09e23658fc1a1c93ca"; + sha256 = "0a1svfbxw7g31rnf3lcjsy2x21s14c2gpbrzjpl06qa0p3cnn4db"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -29167,12 +30735,12 @@ graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: melpaBuild { pname = "graphene"; - version = "20170810.640"; + version = "20171125.854"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene"; - rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe"; - sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz"; + rev = "9dbd50e532ca45076e03db0f96a57d21528fc460"; + sha256 = "0sqxnjmfbr0plahdmp87j8xpl3qkyimf9vkqall4ccljx8irdl6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene"; @@ -29218,22 +30786,22 @@ license = lib.licenses.free; }; }) {}; - graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "graphql-mode"; - version = "20171102.1606"; + version = "20180303.1558"; src = fetchFromGitHub { owner = "davazp"; repo = "graphql-mode"; - rev = "1f3bd34b18a41dbda75a0baee38aa0f0f1fffb7a"; - sha256 = "16cqncjyai3kak9p108c85d8jp0n83jpfijkwjv8nx2s5wyw57dx"; + rev = "36b1a4ed9fe78ccd1f386111644e69a5424a1a7b"; + sha256 = "1azq0igx07aff9r7fbl0l4vbr44c4ylfq41g5rahbc70spd85bk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode"; sha256 = "074dc8fgbrikb5inv837n9bpmz1ami7aaxsqcci1f94x3iw8i74i"; name = "graphql-mode"; }; - packageRequires = [ emacs request ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/graphql-mode"; license = lib.licenses.free; @@ -29325,12 +30893,12 @@ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "20171005.1641"; + version = "20180322.1903"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122"; - sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka"; + rev = "8a03687a2b8b55c5dc7f099086019278d505d8d8"; + sha256 = "07j5sv8dskqxpbzr5f58n75cziyqm9v01c3f7wmwfs8jl7h5nc4m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -29367,12 +30935,12 @@ green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-screen-theme"; - version = "20170824.728"; + version = "20171130.234"; src = fetchFromGitHub { owner = "rbanffy"; repo = "green-screen-emacs"; - rev = "05a9641d4f7354be7ff1b8dd34cbe5ef7054348c"; - sha256 = "036l9rbp7p9bf7wb85zr4ykyxiippiwlq53vk30lvkpwbv9vc5qz"; + rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0"; + sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; @@ -29385,6 +30953,27 @@ license = lib.licenses.free; }; }) {}; + gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gregorio-mode"; + version = "20170705.751"; + src = fetchFromGitHub { + owner = "jsrjenkins"; + repo = "gregorio-mode"; + rev = "736fd3d05fb67f707cca1a7ce24e3ee7ca5e9567"; + sha256 = "1w13a3irak6i74kl7va8d2simd2kjvw5253s8jvapi1mg4ifw379"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/34cdc536cd0509c5a151c16f44f4db2c5b44365f/recipes/gregorio-mode"; + sha256 = "1x3z4gc88h13miz72a597lz9hcn2lxps9jvldl2j62s6nvr88pff"; + 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"; @@ -29406,6 +30995,27 @@ license = lib.licenses.free; }; }) {}; + grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "grep-context"; + version = "20180415.435"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "grep-context"; + rev = "4c63d0f2654dee1e249c2054d118d674a757bd45"; + sha256 = "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context"; + sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g"; + name = "grep-context"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/grep-context"; + license = lib.licenses.free; + }; + }) {}; greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "greymatters-theme"; @@ -29488,22 +31098,22 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20171024.221"; + version = "20180412.538"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; - sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; + rev = "0aea74def58791b2343a8f0139c2f2a6a0941877"; + sha256 = "0aih46rk2zzxhbx4k65w1lmg3ibxnkimdfpyxc5qfdcr4kyfg06i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; name = "groovy-mode"; }; - packageRequires = [ s ]; + packageRequires = [ dash emacs s ]; meta = { homepage = "https://melpa.org/#/groovy-mode"; license = lib.licenses.free; @@ -29554,12 +31164,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20171113.157"; + version = "20180313.1451"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "26d15c090be64aca07b14cc0cf69d78736973288"; - sha256 = "15pq889d3wvbz3fhf5cw3bida49qd3zl2riz3j0ia91pfb275zwm"; + rev = "dd5e5ad109cf0b5db6c5d9ba279337a799e12b89"; + sha256 = "17ga9qrjmvyjj7i77k6k0riy1jc3lvjvc3v631yvza4qi28492fv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -29617,16 +31227,16 @@ gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gtk-pomodoro-indicator"; - version = "20170517.900"; + version = "20171230.840"; src = fetchFromGitHub { owner = "abo-abo"; repo = "gtk-pomodoro-indicator"; - rev = "0fa0e682b3bd1595f230275d73ca231e93c6d28a"; - sha256 = "1jm7kcray6qd867hacyhs5c7hhdm0fyfa1jx35sh09g5c9xa4x2f"; + rev = "eb59b229de0dde307b20654075a9bbac69899a66"; + sha256 = "0dmaazcscg9mdsmij26873af5jl2np4q9xf2klw1jmcl61wzggb0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator"; - sha256 = "0fg227yhj85xy0s32xzwg2ka9kc9ygl0wd33wypp6jban13ldasr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a58f1acaafc459e055d751acdb68427e4b11275e/recipes/gtk-pomodoro-indicator"; + sha256 = "1lkz1bk3zl51jdgp7pg6sr57drdwz8mlvl9ryky3iv73kr5i0q6c"; name = "gtk-pomodoro-indicator"; }; packageRequires = []; @@ -29698,22 +31308,22 @@ license = lib.licenses.free; }; }) {}; - guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: + guix = callPackage ({ bui, dash, edit-indirect, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20171106.1127"; + version = "20180414.1025"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "e9e9e0212005cb4c8d8772891df127312de56ccf"; - sha256 = "1m4lsmnjjd37y9g4a09snmjiq5nqnwf22ppxhx41jn63abga9jna"; + rev = "00c87a9cafa3d74840be02efa2516286515b6f93"; + sha256 = "0mbri7p7hm5bfqw8i8wl5yc5av13sd77bs15af44nv8p5gqx7wng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9"; name = "guix"; }; - packageRequires = [ bui dash emacs geiser magit-popup ]; + packageRequires = [ bui dash edit-indirect emacs geiser magit-popup ]; meta = { homepage = "https://melpa.org/#/guix"; license = lib.licenses.free; @@ -29869,12 +31479,12 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "20170930.1313"; + version = "20180220.419"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "520e8dca91b8c2bc1de852f577af46ed1b7cabcd"; - sha256 = "0951vb08sjpxx28cpaa8njirjw6fml60m91wa146cnxpngd68w6b"; + rev = "309c60c974eb5af4554e0675d4285baa77d89e54"; + sha256 = "0gz5f17654bbjwydznpcy6aqzxbv2infbb4wd8zawf9dmb0wxc3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -30205,12 +31815,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20171022.26"; + version = "20180406.2222"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "9018ad5cac0b1b1b5e0a51586027fb0ca4076b1a"; - sha256 = "0aj6mjv1i8m18klj9mp690fkmwc81wxh2q69cxjf78fdpgbrhcwl"; + rev = "d71cca7f5ddc8178f5fe331563edcefe91cc0bcb"; + sha256 = "1amg9k50nw90b1dci6bylhrdkfmwminxcx3hlxxwvfvdgszfs2s4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30267,12 +31877,12 @@ hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hasky-extensions"; - version = "20170830.625"; + version = "20180107.2112"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa"; - sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7"; + rev = "6909022bccb7e5c26d1c4e5fa20cbc6b65c62d69"; + sha256 = "0s5y84ih5hy6m5krmbgbr027xzhw0vybha0pdi0njjyggagirgxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -30288,12 +31898,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "20170928.359"; + version = "20180331.208"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "a3f890fb8570369898ee9718b128d4e7123a6585"; - sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c"; + rev = "3e17ce07dd6b0207474e4ff14ad7b8c467382947"; + sha256 = "0cdsdlgapf9xxj928hlb7ch9x8rznayrvj7n8j2vzfa0kfmg7qwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -30476,12 +32086,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20171106.429"; + version = "20180413.335"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "42a03cc1f4da09b3a513c4175c913314856122e2"; - sha256 = "1nqj1syqv75y7hk2s8c650abxzq8cvp4dpnbmjjiwxranwsfz6zq"; + rev = "b72baa1183fabf5213e4d50a38358288f7af5a86"; + sha256 = "0q89c9axk8a7w3hncl7wak0z3yg022vwf3lwfmww6xkn9daxldjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30620,36 +32230,15 @@ license = lib.licenses.free; }; }) {}; - helm-anything = callPackage ({ anything, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { - pname = "helm-anything"; - version = "20141126.231"; - src = fetchFromGitHub { - owner = "rubikitch"; - repo = "helm-anything"; - rev = "0ec578922928b7c75cf034d1b7a956b5f36107ea"; - sha256 = "153zq1q3s3ihjh15wyci9qdic3pin8f1j1gq2qlzyhmy0njlvgjb"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0d844b790661258bc9b73985ad7a7da37ba339ab/recipes/helm-anything"; - sha256 = "0yjlwsiahb7n4q3522d68xrdb8caad9gpnglz5php245yqy3n5vx"; - name = "helm-anything"; - }; - packageRequires = [ anything helm ]; - meta = { - homepage = "https://melpa.org/#/helm-anything"; - license = lib.licenses.free; - }; - }) {}; helm-aws = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-aws"; - version = "20151124.133"; + version = "20171227.132"; src = fetchFromGitHub { owner = "istib"; repo = "helm-aws"; - rev = "512fb7edcdc6c65303b9641bfc737f836939e5e9"; - sha256 = "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af"; + rev = "d69a0241601d170c034e3b69e8df0b1fec72bff7"; + sha256 = "0975a0nwxlnpln7vrq4hqq4xamrhp1zc4bkwnzpw06dk95s23cb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/421182006b8af17dae8b5ad453cc11e2d990a053/recipes/helm-aws"; @@ -30665,12 +32254,12 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "20170807.1239"; + version = "20171204.2357"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; - rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb"; - sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w"; + rev = "a2c0fa16113e628500d6822c6605280b94e24038"; + sha256 = "0j4dkz9za2zng43dx8ph688gl5973isxr89v5bw160c65n4lbc6w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -30686,12 +32275,12 @@ helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bbdb"; - version = "20170505.2338"; + version = "20180412.807"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-bbdb"; - rev = "c0e6b83911598fe334c51b12f51ff1a8252ed11d"; - sha256 = "084m23w4088njk2c8z6yxi2851dakdq71jhpazlzms85i2dlwg21"; + rev = "1f182900207cff383d62d91e839b48dd4874f2a5"; + sha256 = "0m08zb1i6m8i0n590f1717p8dxb7w9d4mh3wnkd829zjhycradrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb"; @@ -30707,12 +32296,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20171022.220"; + version = "20180328.1147"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "54de08577f9c19354cc303ee52836263aef486fb"; - sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0"; + rev = "5be84d36758ed7d5838cc5c8796a6ff427ba7043"; + sha256 = "1pqg49mj22izilx8x9rshflpyiw1q9zrp881nasp5lvbihwydvrg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -30938,12 +32527,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-cider"; - version = "20170708.1525"; + version = "20180306.2058"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "9480e969d5387efdd5e66c6db089e02a296b2025"; - sha256 = "0ci0z1zaypbdnjxk6bhf83kx808j4xi5ikqwq4w5mlsbz8f5iqx1"; + rev = "9363cc537f06233345aa3af5cd46aa5681ad607b"; + sha256 = "0vfn4smqba1vsshz48ggkj8gs94la0sxb1sq4shrb41qj2x3dci7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; @@ -31043,12 +32632,12 @@ helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-codesearch"; - version = "20161214.548"; + version = "20180203.2033"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116"; - sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6"; + rev = "87a68168b7c1490769305db0df60035e47799a75"; + sha256 = "0wiyz0kh2m2mpjhnl2mvsx2gvhkmmk0xaw432mxr48zz9jjnlha9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; @@ -31085,12 +32674,12 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "20170608.1029"; + version = "20180213.1405"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; repo = "helm-company"; - rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048"; - sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90"; + rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d"; + sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; @@ -31106,12 +32695,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20171103.2225"; + version = "20180414.2257"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "42a03cc1f4da09b3a513c4175c913314856122e2"; - sha256 = "1nqj1syqv75y7hk2s8c650abxzq8cvp4dpnbmjjiwxranwsfz6zq"; + rev = "b72baa1183fabf5213e4d50a38358288f7af5a86"; + sha256 = "0q89c9axk8a7w3hncl7wak0z3yg022vwf3lwfmww6xkn9daxldjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31169,12 +32758,12 @@ helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }: melpaBuild { pname = "helm-ctest"; - version = "20171101.934"; + version = "20180125.2058"; src = fetchFromGitHub { owner = "danlamanna"; repo = "helm-ctest"; - rev = "6de962e355e12a69e4aeaf6484f497e28b2e8a68"; - sha256 = "0nd1ij7iqf02hni4d77mndbxi8w27vawjd9b3d7fia22vdsha040"; + rev = "034927a922f40d9f5978786feed9bc9fe1f7655f"; + sha256 = "0mbsxlc0isfzqlwvwqxyjkcdvpn9a6qsa29r7mqqihy0jkqi4473"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc85ff5554df10fc2066eec4d90de3b25536923/recipes/helm-ctest"; @@ -31190,12 +32779,12 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "20171017.342"; + version = "20171120.446"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "08961190b3982dcb8c359e633daba556a6d92ce3"; - sha256 = "1vdrfykhcfnmm254gd3aqypk9hfl0fcml1nc0wxmdjlimlsxadc3"; + rev = "13dcc176556a7dd0970790e96dbbf9105dc395de"; + sha256 = "1cxfmlf2ddx9rm5f70r1sh9vwmn5s1a6m5in41skspvpm0avc8vi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; @@ -31211,12 +32800,12 @@ helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-descbinds"; - version = "20160916.713"; + version = "20180411.2215"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-descbinds"; - rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c"; - sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq"; + rev = "cc000b1bf580577d032c9f0563168b6bbdd6d290"; + sha256 = "1z5z0yfj1h3852zn4sh0p9dl3viyfiqpw28jczqgm8rcng94rvbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds"; @@ -31400,12 +32989,12 @@ helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emms"; - version = "20170517.1010"; + version = "20180405.2228"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; - rev = "b1c7d03e80c3012e327f0d518258508acf980c1c"; - sha256 = "18fpsr6kaw2m1bvj05i5qayq6d01v54jw98489bgwshp9wmhsy9m"; + rev = "d3f9bdef8ff0d093eaf6e26af50ea905ab53fdec"; + sha256 = "0bdb8xp0yp3gijpa9i2rc17gfzjhzlm92vdzw93i10qpd1xhj4aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; @@ -31442,12 +33031,12 @@ helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ext"; - version = "20171101.1231"; + version = "20171218.1543"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "helm-ext"; - rev = "c8ac56918b200239b3f73a4e6a031deecc2c5646"; - sha256 = "08c6n4zr6s3h7y0kk6g51xqs6hs29hkfmn55jfjw6hpimbk3vi1j"; + rev = "bdc0d86d43d965dda5ac94ec9c3fdcaa1e71aab1"; + sha256 = "1qfawx9k74rhm9rxcdrx9gpxqrvpgpiv3dz8qgl06mdr0hxrcrrb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext"; @@ -31460,6 +33049,27 @@ license = lib.licenses.free; }; }) {}; + helm-exwm = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-exwm"; + version = "20180301.958"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-exwm"; + rev = "9eec927d7fa092762b467d400d996b66c1f6d9c2"; + sha256 = "131xb40y8n3laivzbx4pjynbv0c5v09ihvq4r9c3m1d7qmq6x3kh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdf9e00cf19fabbeade12a66d66cd010561366/recipes/helm-exwm"; + sha256 = "0g15c4bg794vqigafl9g2w85jbs1lbw9qplaf8ffx0az4qwhnvqz"; + name = "helm-exwm"; + }; + packageRequires = [ emacs exwm helm ]; + meta = { + homepage = "https://melpa.org/#/helm-exwm"; + license = lib.licenses.free; + }; + }) {}; helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }: melpaBuild { pname = "helm-filesets"; @@ -31505,12 +33115,12 @@ helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }: melpaBuild { pname = "helm-flx"; - version = "20170404.1230"; + version = "20180102.2116"; src = fetchFromGitHub { owner = "PythonNut"; repo = "helm-flx"; - rev = "c8650d9b34afbc236c28aee12cbee998fda8d810"; - sha256 = "0400maq605qq631a766lzmphyaxwq0lfvb6x29j6aqd6pgxxrjs5"; + rev = "6640fac5cb16bee73c95b8ed1248a4e5e113690e"; + sha256 = "1fh1dy6xpc476hs87mn9fwxhxi97h7clfnnm7dxb7hg43xmgsjjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx"; @@ -31820,12 +33430,12 @@ helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-gitlab"; - version = "20160519.303"; + version = "20180312.947"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "67567a354a1888419331b79862f151817d9747c5"; - sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; + rev = "68318aca3206d50701039c9aae39734ca29a49f9"; + sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab"; @@ -31859,22 +33469,22 @@ license = lib.licenses.free; }; }) {}; - helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }: + helm-google = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-google"; - version = "20170722.710"; + version = "20180212.240"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; - rev = "4530a375a46880d53e5d7e906028f71c040de946"; - sha256 = "1xj3q6hyjcqbr3dglcba4impsdgb707zi9w7prpn1m735xhsis01"; + rev = "f9b5f0dfd51e16278eba70d8fc94a599563dab61"; + sha256 = "1s2y4fyax4487bz7p16jhgwsjjnzqrjz7pq22p8h23jzcvgh6wzx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32"; name = "helm-google"; }; - packageRequires = [ google helm ]; + packageRequires = [ helm ]; meta = { homepage = "https://melpa.org/#/helm-google"; license = lib.licenses.free; @@ -32030,12 +33640,12 @@ helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hunks"; - version = "20170625.1523"; + version = "20171217.1133"; src = fetchFromGitHub { owner = "torgeir"; repo = "helm-hunks.el"; - rev = "56731db3968a57fbb2473529227c2998b7f404b0"; - sha256 = "1kszp6jy4r39r71jjrr8p3nfpylbqyphrsfb4dghh6kl0zxic38j"; + rev = "6392bf716f618eac23ce81140aceb0dfacb9c6d0"; + sha256 = "1ih2pgyhshv8nl7hhchd4h0pbjgj45irp5dy1fq2gy05v4rn7wi4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks"; @@ -32237,22 +33847,22 @@ license = lib.licenses.free; }; }) {}; - helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lastpass"; - version = "20170914.142"; + version = "20180114.937"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-lastpass"; - rev = "ae5d1252d60450082a5c26af3ad2be43994201ec"; - sha256 = "0qlcy8g9m3mfnr6p7kax6i1bq0dsxpz22vy5zjp24farx96mj5mi"; + rev = "65ac0a80b5908b43ecd6a89c17f22f5c9c6734b0"; + sha256 = "18ncb6lnw06amwr1avh53gqifwg0wpwf2849z2k781dls3n5j4hr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass"; sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57"; name = "helm-lastpass"; }; - packageRequires = [ csv emacs helm-core ]; + packageRequires = [ csv emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-lastpass"; license = lib.licenses.free; @@ -32265,8 +33875,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "c0af876c967fc969d67c467bc6767210d19c5d87"; - sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9"; + rev = "ae90bd280588c96d540892d0f42247db5a126f51"; + sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean"; @@ -32279,6 +33889,27 @@ license = lib.licenses.free; }; }) {}; + helm-lib-babel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-lib-babel"; + version = "20180225.1322"; + src = fetchFromGitHub { + owner = "dfeich"; + repo = "helm-lib-babel"; + rev = "69bce58c1ef109dd33cc7f7696ad02a536f1b215"; + sha256 = "0x39ds3hziabizaa3hrqfbz2a9by4s25dndp8ymxbl8jjvqgdi3a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d6718da5d8849a8c3ec17188b89a1273cf963047/recipes/helm-lib-babel"; + sha256 = "0ddj6xrhz4n0npplkjmblqb43jnd6fmr4i4vv1cigrgb7zj6bjx4"; + name = "helm-lib-babel"; + }; + packageRequires = [ cl-lib emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-lib-babel"; + license = lib.licenses.free; + }; + }) {}; helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lobsters"; @@ -32303,12 +33934,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20170727.1238"; + version = "20180415.2336"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "d116bb96b6ea946f633ed7735fbf38a63e611a3a"; - sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg"; + rev = "c63c27f10d0cc409ab528d20700bccc52abbab26"; + sha256 = "1xmrg49b7r3ry85gizllnll4v6wk3qxmhwrd7d0jifx5df9v13f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -32366,12 +33997,12 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20171103.1155"; + version = "20180322.1251"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "feae8df22bc4b20705ea08ac9adfc2b43bb348d0"; - sha256 = "1y2v77mmd1bfkkz51cnk1l0dg3lvvxc39wlamnm7wjns66dbvlam"; + rev = "51dfe9871ae2851d8d82530346c8e0a846cdfd94"; + sha256 = "0zipg6zv62839n0px8sil86jdv9qlqy877kj1m8x3dln3c7pf0x3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -32555,12 +34186,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20170807.611"; + version = "20180207.1539"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "502ea1285b8ce858a3acbc39dd4f54ff1af5b7e3"; - sha256 = "1j87fd9qv7pl7s52ksj7iy023lw76qy4mkgjc4w5rljvm5bdnrgp"; + rev = "f4936509b4a5658ea325fc9f941f2e2e9e3018cf"; + sha256 = "020jg7mwyibd6c3lrzdsrc5jbn7vh6y6iyxfc6r28k8bwv4fggv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -32594,27 +34225,6 @@ license = lib.licenses.free; }; }) {}; - helm-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { - pname = "helm-package"; - version = "20170216.2002"; - src = fetchFromGitHub { - owner = "syohex"; - repo = "emacs-helm-package"; - rev = "0f3ac5623cc6220a65f3c9ec0f587225101e96d5"; - sha256 = "0z45gj2rb4n26khkk9lg445s69c1jwks0hcyqww63asch6ydizgj"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package"; - sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y"; - name = "helm-package"; - }; - packageRequires = [ emacs helm ]; - meta = { - homepage = "https://melpa.org/#/helm-package"; - license = lib.licenses.free; - }; - }) {}; helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-pages"; @@ -32636,22 +34246,22 @@ license = lib.licenses.free; }; }) {}; - helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: + helm-pass = callPackage ({ auth-source-pass, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: melpaBuild { pname = "helm-pass"; - version = "20170627.1124"; + version = "20180415.2038"; src = fetchFromGitHub { owner = "jabranham"; repo = "helm-pass"; - rev = "bf5e1ea85ca531f07372eb8e7b9a8812ff3d3a5e"; - sha256 = "1l3dbgl65rcvw7cgqfxm3kvpfj65pj8jhkp9pg4yykli5y0wsbdx"; + rev = "ebcbef1a962795a36e3491ae926e2a4b8a8b0ebb"; + sha256 = "13far24blzmcjyxkwnsqbx0g865p233bx21885nw59rp28frg538"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass"; sha256 = "11yknsch0avdl8jmj54xk45nba3qh8bhsdrc2rds084i7d5gmqia"; name = "helm-pass"; }; - packageRequires = [ auth-password-store helm password-store ]; + packageRequires = [ auth-source-pass emacs helm password-store ]; meta = { homepage = "https://melpa.org/#/helm-pass"; license = lib.licenses.free; @@ -32765,12 +34375,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20170926.1123"; + version = "20180407.1842"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "4466adbcada8be19ec97b9dba52e12b8da3da849"; - sha256 = "1a4s3vs2vh2dz31an7jjrbyli1dsqwl7qcd1r63ak87klzpqn98b"; + rev = "213339b896eebff6d61778b2b1816301ab583081"; + sha256 = "1wjlm3i0ygcgy37nn1ljaxx9w7nw3pfczrmv5ibm2dyna88kafr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -32870,12 +34480,12 @@ helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-qiita"; - version = "20170821.609"; + version = "20180301.635"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-qiita"; - rev = "f00a61fc802d0f6442f07e7bd1c55fedf60f3895"; - sha256 = "0z5xyb4kh3hwv8a869kgfx7hdzmja4ksvfkmc7v0xmxzjcg3nb7j"; + rev = "3ccb85640bf54491ed3c3c8110d454ae181650dc"; + sha256 = "03km0hm3jy6qcs8szqsmzpdmhfmyh121i5f68cf60am8y616f0kp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita"; @@ -32891,12 +34501,12 @@ helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-rage"; - version = "20170422.510"; + version = "20180118.732"; src = fetchFromGitHub { owner = "bomgar"; repo = "helm-rage"; - rev = "3cae7f309b45cc6e40507be68c0cc2e5595c1392"; - sha256 = "0j8yvxvd78lcfpss327xc6rahkqva66rrqjjx5cmdl82xncb53vz"; + rev = "5d0aefb53d859186181d4bdcfeff7d315339c7b8"; + sha256 = "0msj3rrv9bwhhwz7r1ayr6qvnxjsq7374j0xfhqbrx49pix4qf3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage"; @@ -32993,6 +34603,27 @@ license = lib.licenses.free; }; }) {}; + helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, pcre2el }: + melpaBuild { + pname = "helm-rg"; + version = "20180220.731"; + src = fetchFromGitHub { + owner = "cosmicexplorer"; + repo = "helm-rg"; + rev = "cbce7b4f1afefa1e9a505b45c1b58c688a42f3b9"; + sha256 = "1z8ijiqih902mzfc7kbnfbdhjwfqh5yzg4w3v4mxac0ys5j4z6sg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg"; + sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v"; + name = "helm-rg"; + }; + packageRequires = [ cl-lib dash emacs helm pcre2el ]; + meta = { + homepage = "https://melpa.org/#/helm-rg"; + license = lib.licenses.free; + }; + }) {}; helm-rhythmbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-rhythmbox"; @@ -33063,8 +34694,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "dadd74f015f89317ff77424be30a9accadeeb4a4"; - sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33161,6 +34792,27 @@ license = lib.licenses.free; }; }) {}; + helm-selected = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, selected }: + melpaBuild { + pname = "helm-selected"; + version = "20171222.1810"; + src = fetchFromGitHub { + owner = "takaxp"; + repo = "helm-selected"; + rev = "6743ede584571319e4c29204197e9ff6b7ee97cf"; + sha256 = "199a1ycv6pi4kljv7ln0i59l85yr6ngvd3acjakq3416nnjlvhzh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/acc087661e614d9f30c23fe4a65c020bd3656a29/recipes/helm-selected"; + sha256 = "0ksyh0r59y4abwls6v6v519yxmcjnaryfnxlam48fqqfrsxv1j0h"; + name = "helm-selected"; + }; + packageRequires = [ emacs helm selected ]; + meta = { + homepage = "https://melpa.org/#/helm-selected"; + license = lib.licenses.free; + }; + }) {}; helm-sheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-sheet"; @@ -33248,12 +34900,12 @@ helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }: melpaBuild { pname = "helm-spotify-plus"; - version = "20170320.609"; + version = "20180107.338"; src = fetchFromGitHub { owner = "wandersoncferreira"; repo = "helm-spotify-plus"; - rev = "847dfafbb5e5d65a44464b0ec8e2b7d88864a9aa"; - sha256 = "0i1vnaiqcs220nc1mjbx0959aa0nbjxhrqkvbrj3zy7ybsya22gq"; + rev = "895f241f1259891d5c89cd42023f119f9fa121d6"; + sha256 = "1sjw0bapik01f3lfnsirpayn7b0169lbjhppb2mqzr3xjxm58wbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus"; @@ -33290,12 +34942,12 @@ helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; - version = "20170923.2127"; + version = "20180215.354"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-swoop"; - rev = "66a951700e0ef0621cc705791bdd6699488ab121"; - sha256 = "1j1qmbj4g5z891i1xyz8p34mk63ckpl1j80pznbhvb9ffl9aw976"; + rev = "c66336b8245ddc51c4206f19c119f1081920985c"; + sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; @@ -33308,15 +34960,36 @@ license = lib.licenses.free; }; }) {}; + helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: + melpaBuild { + pname = "helm-system-packages"; + version = "20180412.2325"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-system-packages"; + rev = "986b7bd360a705053500c4ce2c9bea03dd7b24a6"; + sha256 = "19iklhpxgh5xx6h4dysf58nd46lmyb46xj601lf7kbwl6yq0y61f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; + sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4"; + name = "helm-system-packages"; + }; + packageRequires = [ emacs helm seq ]; + meta = { + homepage = "https://melpa.org/#/helm-system-packages"; + license = lib.licenses.free; + }; + }) {}; helm-systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, with-editor }: melpaBuild { pname = "helm-systemd"; - version = "20160517.2333"; + version = "20180130.2034"; src = fetchFromGitHub { owner = "lompik"; repo = "helm-systemd"; - rev = "0892535baa405a2778be2f0f013bac768e72b1f9"; - sha256 = "1yqwq8a5pw3iaj69kqvlgn4hr18ssx39lnm4vycbmsg1bi2ygfzw"; + rev = "96f5cd3ee3412539c2f8d145201f47c4f8e53b4f"; + sha256 = "0wyabh76q2lighd7qxpkzp35fkblxlz8g7p4lpgfwvjid0ixmnvq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-systemd"; @@ -33353,12 +35026,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "20170708.320"; + version = "20180311.2157"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1"; - sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y"; + rev = "34cc68bededd3ff6cbec8140f33c530fd3206a64"; + sha256 = "1lway52ssh6zn6jw8157fp8d4brrkdln03vgll2r53bd69i2ipmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -33479,12 +35152,12 @@ helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-xref"; - version = "20170822.1708"; + version = "20171209.346"; src = fetchFromGitHub { owner = "brotzeit"; repo = "helm-xref"; - rev = "af55df844aa65275c8f75d3a8705e13717fd3ee6"; - sha256 = "0srjmz3xm6ycx5grjl7iqrnx5qlmg7n42i9wrb3i01zrjrjbqi7x"; + rev = "ad98c3f6e5404e44e7e87210b5827bef75e16a25"; + sha256 = "1z1343lp9n0kn3y4z08bwnxlfvg5pchznnfqy2xhjjbm9ndlhc16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref"; @@ -33518,6 +35191,27 @@ license = lib.licenses.free; }; }) {}; + helm-z = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-z"; + version = "20171203.1925"; + src = fetchFromGitHub { + owner = "yynozk"; + repo = "helm-z"; + rev = "37212220bebea8b9c238cb1bbacd8332b7f26c03"; + sha256 = "1vz958yiva01yl1qj2pz84savcx8jgkvbywhcp4c3a8x3fikf0yl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/48c9b83fff8fc428d9d1ecf0005d47f2adb8cb00/recipes/helm-z"; + sha256 = "1m268zsr4z7a9l5wj0i8qpimv0kyl8glgm0yb3f08959538nlmd1"; + name = "helm-z"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-z"; + license = lib.licenses.free; + }; + }) {}; helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-zhihu-daily"; @@ -33539,22 +35233,22 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20171112.1321"; + version = "20180407.351"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "a703e0837756871ed333a9a40c00a625e5d61387"; - sha256 = "02672bd8ka3nrkcd0d7nfz90sin0qfavdz5yhghh5rijirg8jm0f"; + rev = "5e9f90776ddfa64e11823c98406362bfabc03a3c"; + sha256 = "1zwnh03ifkmq5r78m714yxha9d0j7bflb78f5jak58f3ympnms76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; name = "helpful"; }; - packageRequires = [ dash elisp-refs emacs s ]; + packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ]; meta = { homepage = "https://melpa.org/#/helpful"; license = lib.licenses.free; @@ -33647,12 +35341,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20170702.1915"; + version = "20180223.1944"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "201c795ded01d96690ceadc1dd068744aceaeda8"; - sha256 = "0rj5lcmlghxm4d1vx8jxdhw53famzjxzp1bx38zgrqlhwakyghab"; + rev = "ff21ab2d95e13666f36a243989ffea2027842191"; + sha256 = "1g7i4vlpac7npx8c7f7i9w3f30is7q7zsxp0sqwp7x7rsa5783nn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -33770,6 +35464,27 @@ license = lib.licenses.free; }; }) {}; + hide-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hide-mode-line"; + version = "20180302.1110"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-hide-mode-line"; + rev = "86b9057391edad75467261c2e579603567e608f9"; + sha256 = "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2af28365f9fbc6ae71043a67966490c5d18a6095/recipes/hide-mode-line"; + sha256 = "0yl6aicpib5h1ckqi3gyilh2nwvp8gf1017n1w1755j01gw1p9hl"; + name = "hide-mode-line"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hide-mode-line"; + license = lib.licenses.free; + }; + }) {}; hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hideshow-org"; @@ -33794,12 +35509,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "20171017.1103"; + version = "20171221.351"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "cd65d149b8910edfa5536eeda26988aabcfd511a"; - sha256 = "0746wn62vwgnn4hg8ag0hq80hv7lwv929pjk5cccqqz4s0kp0c80"; + rev = "06f21d3fc16c44c1fa45dc9c91d10100b4db9355"; + sha256 = "1sp59nc82qb40n8p08hr0j4ig7ypc2icvgz74057vs1q042asqqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -33812,6 +35527,27 @@ license = lib.licenses.free; }; }) {}; + highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "highlight"; + version = "20180131.1216"; + src = fetchFromGitHub { + owner = "steckerhalter"; + repo = "highlight.el"; + rev = "bb8694b8e642a45f07ce8897de0785c5a776441c"; + sha256 = "0s4fkxnd4x3j864mgaiv95iwdjmps4xj2mlaljljc8y04k9q5l9k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/89c619b90665385c8f5408935105c52b4d0290ab/recipes/highlight"; + sha256 = "0hc515042gpwqj2wqa3lmbgmccb3im5d313nk5lma9sphqi2yx9q"; + name = "highlight"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/highlight"; + license = lib.licenses.free; + }; + }) {}; highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-blocks"; @@ -33878,12 +35614,12 @@ highlight-escape-sequences = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-escape-sequences"; - version = "20161028.1617"; + version = "20171117.437"; src = fetchFromGitHub { owner = "dgutov"; repo = "highlight-escape-sequences"; - rev = "c3f28f2003638e88e5cf0b03835412af7814f3b0"; - sha256 = "052r7bxdflgvygpvc5p63kkv11l9f7vfn16b1094af7xnniv8i3i"; + rev = "08d846a7aa748209d65fecead2b6a766c3e5cb41"; + sha256 = "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd087f2c5a9524986b0f2c7fd7efd1f296363101/recipes/highlight-escape-sequences"; @@ -33920,12 +35656,12 @@ highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indent-guides"; - version = "20170516.1355"; + version = "20180404.1216"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "b51744bde1287979f2d948f46501bd6ed0897f69"; - sha256 = "17xbd1kiww762dibws48gwn682g1bxy5rb7np5alqhiiw1l13wdw"; + rev = "a968436711520d4728c0b6c64279eb5eae7e0e5d"; + sha256 = "0cbdhxmd2a2pygnr4fb246dxyqggv2h8f5q2sflbq05jb81k5fal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; @@ -33941,12 +35677,12 @@ highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indentation"; - version = "20170502.43"; + version = "20171218.137"; src = fetchFromGitHub { owner = "antonj"; repo = "Highlight-Indentation-for-Emacs"; - rev = "5c7717a2224372f7113d13640515df3650388a37"; - sha256 = "13d85qbq6q9pz3yrwpn6rjlrbrjs0fnskkbb5liczyxyk8rzj924"; + rev = "35e2c1d4f8f368685893128f77f90454cb9c2708"; + sha256 = "1rmqi8k8p0f3aawh2l119hsfnnd060bv9hhjx13pabid8xhhvs73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation"; @@ -34213,12 +35949,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "20170609.126"; + version = "20171215.848"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "889e1655c6eb170e0d30c3c1173f7fba87041736"; - sha256 = "012h82m1x2iva2mh3q0rr5s3y8hm1kmnybngnaakzphhshdph32p"; + rev = "6f6db40cca1b759f78d7e4b971111e40833c3aa0"; + sha256 = "05xlk8pq19vh61cvpbp6156pd5ynnp8zqnj09j0hp8k6kd3wq62z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34297,12 +36033,12 @@ historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "historian"; - version = "20170722.1714"; + version = "20180210.2119"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d"; - sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w"; + rev = "ec3dfa8786473e52ffc5ca9be95dbc59a9a87ff7"; + sha256 = "1bxigdg3pmgc0s4il1spdw0p8y98k4hwwd89m4i3y97l43asy6p1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; @@ -34462,36 +36198,15 @@ license = lib.licenses.free; }; }) {}; - hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "hl-sexp"; - version = "20101130.443"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "hl-sexp"; - rev = "0606100422321c18db51ceda80f25cd7717c2e01"; - sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp"; - sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm"; - name = "hl-sexp"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-sexp"; - license = lib.licenses.free; - }; - }) {}; hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "20170621.1257"; + version = "20180327.1716"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "961db3116f1396dc4f903e3a59824a40e0bbb6a2"; - sha256 = "0w847g7lvzk9br9r73n7rf2ba6wafqrapyigp91f62jicz28lvm1"; + rev = "54d6562ba33182b16a7225c5fe6bb17a68025302"; + sha256 = "1jkxvik625rqbazbm8r83pcdmd288g26a4vvchsp4717k82sklkj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -34507,12 +36222,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20171101.1139"; + version = "20171201.1156"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "70f4d9c44077eea13bdcb5688475e0c90578e085"; - sha256 = "0j4pk2qr93pxgg8smzhxmlpk9b0rv9w20n1dz5lw42641xx8frnf"; + rev = "594ce27f898ba027cb7f326179ff7875072b03e0"; + sha256 = "1jla31az52qygabd99m8ibq60f4almkbjlg1z63kz7zl98hfxnw7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -34650,6 +36365,27 @@ license = lib.licenses.free; }; }) {}; + honcho = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sudo-edit }: + melpaBuild { + pname = "honcho"; + version = "20180319.1441"; + src = fetchFromGitHub { + owner = "emacs-pe"; + repo = "honcho.el"; + rev = "fd3306f5cb870b557fc7d700fcb0a560feb3fbc7"; + sha256 = "0pdpnn206nfkc8pl36lxc2jfrmii8ai1gvf21ycx0r37g9q64qhq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/76487b6776d148325c0200d2f788815f115feac9/recipes/honcho"; + sha256 = "1ywx67dmvackfx19p4fvrb8mm27a7pri3m3bwr2acwd29lrrid2x"; + name = "honcho"; + }; + packageRequires = [ emacs sudo-edit ]; + meta = { + homepage = "https://melpa.org/#/honcho"; + license = lib.licenses.free; + }; + }) {}; hookify = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hookify"; @@ -34671,6 +36407,27 @@ license = lib.licenses.free; }; }) {}; + horoscope = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "horoscope"; + version = "20180408.2341"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "horoscope.el"; + rev = "f4c683e991adce0a8f9023f15050f306f9b9a9ed"; + sha256 = "17k4j4q19l4ahxlzzic1jlbbh7l378j9vgnrcrvpm0lxa9ipclk0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/180248c19160940a208b32fa7a9660a838f68de5/recipes/horoscope"; + sha256 = "1y2nzhdl7ghi5l3iyzb04xics7gr5981jmb5z5y8y1z04xhqpfs6"; + name = "horoscope"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/horoscope"; + license = lib.licenses.free; + }; + }) {}; hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "hound"; @@ -34737,11 +36494,11 @@ howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "howm"; - version = "20160928.439"; + version = "20180225.205"; src = fetchgit { url = "https://scm.osdn.net/gitroot/howm/howm.git"; - rev = "e0237b07f60011a1926b36848c73340ae46cdb3e"; - sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq"; + rev = "b932fa603f074049637907d35594f73c3fba45d0"; + sha256 = "189j3061g2s1286434x3zyh6xyjycfrd2sqxx655biicy1xxyk52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm"; @@ -34757,12 +36514,12 @@ ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20171112.1405"; + version = "20180129.1434"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "ce65ce5d535cc86698ad6012f60fb56d7d80d8db"; - sha256 = "07yd5fqh5y3bbr6capc3x562kl4ia39d55qvz521yxdnzmwsdpq7"; + rev = "5a665d00dc8fda77bad2a43277d8809c23e46ab8"; + sha256 = "0w0zi393ixgi154c6dq2i1kf3kraqyfw8alfxcn6fhhxy1g9p02y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -34883,12 +36640,12 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "20171017.141"; + version = "20180412.1244"; src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "a0b55cba65a225df8d9e17a3ac448ce9e8ec962d"; - sha256 = "0k23xz34ksd6n9xa8anbpvx07fymflyxdggy2is2kp0vqg66pv5q"; + rev = "315a8f23cfd3e87642ff9e30ae3300c7a84244d5"; + sha256 = "0pjiid5a16xx9n5bvfff612mpli00y9nbzjapn9f1y79yl99yvxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -35072,12 +36829,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20171030.1023"; + version = "20180411.1231"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "afb1610b0f78e059ee1a034048a876ece70118f1"; - sha256 = "14b5dk7n9727dwyi9p80rcwm0f6i21y1x10rj05bal1s3lxq7frp"; + rev = "d72192e36aeeae1c7784c95569cc330981465714"; + sha256 = "1ld1q06i2srnwz1vkwf023vmcranb76xvskhclb8bmwk7gimz95s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35097,8 +36854,8 @@ src = fetchFromGitHub { owner = "iquiw"; repo = "hyai"; - rev = "e9a7e945fed12d8e664e898cf8b434b0376d5d80"; - sha256 = "1sbn4h74crawdy8yjdjklxh1q6js5y9ip5qxf6dfi85h82qizpa8"; + rev = "286cece5ca187ebb9d5fba5ac86e452cc638b8d3"; + sha256 = "1gycq2jp6540kiggv3fhmgqsyqvc36jwbyydx1i6w1brpcwvc6dx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai"; @@ -35156,12 +36913,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20170924.2259"; + version = "20180226.1116"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "df3025f7e3cf3899168ae8ced1e9b734df2b32a0"; - sha256 = "1sbj699956vxbzbdagw5hbx168sx9cfrc5vx6m6s89v2rkq8fw8k"; + rev = "62e0f374623df15c1eabebe78f4100850d708227"; + sha256 = "1ydipk4fkc7dlfjr7isadgap9mfnmi1lj6n7ckrnzia22vyi9i7r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -35214,6 +36971,27 @@ license = lib.licenses.free; }; }) {}; + ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ialign"; + version = "20180322.848"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "interactive-align"; + rev = "0f3b412dc7688d99ea8c8810dd5e57a70d580b59"; + sha256 = "1hqblgk14qrjd339p9hm640q11mixkhk5jd72sjja74xhbaxciab"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; + sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j"; + name = "ialign"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ialign"; + license = lib.licenses.free; + }; + }) {}; iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iasm-mode"; @@ -35259,12 +37037,12 @@ ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "ibuffer-projectile"; - version = "20171103.2004"; + version = "20180324.2025"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-projectile"; - rev = "6f03040a93d116b73f9fd3d6b52102b57bfaf597"; - sha256 = "0jmb4s4n8yxyavvvd4msr58708jlha7jd8hm5djl91fgf87r3ys3"; + rev = "1e89bfa7cae0629d29f24af3d81774b88b3cede0"; + sha256 = "0y0pvjic5n5wmkrjzjjnhz2xaknib6w5p01vgv2jf5ylwq84wray"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile"; @@ -35298,6 +37076,27 @@ license = lib.licenses.free; }; }) {}; + ibuffer-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ibuffer-sidebar"; + version = "20180218.1731"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "ibuffer-sidebar"; + rev = "7ddf1b5a158b33e9a7d3fe5dad7ea626a464d2bc"; + sha256 = "18rl379bfilzvyi4f4kmy74l4vq2q8hhy5i8kflcgvn0ibipwqjz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19c7c36af8e30b9a9ccc4afda2a7b7e39e8d32ff/recipes/ibuffer-sidebar"; + sha256 = "0rzdybkqaf8r6v19isgw4wv0mwdqxvf55gq1ig4shscjc7ys22wp"; + name = "ibuffer-sidebar"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ibuffer-sidebar"; + license = lib.licenses.free; + }; + }) {}; ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-tramp"; @@ -35305,8 +37104,8 @@ src = fetchFromGitHub { owner = "svend"; repo = "ibuffer-tramp"; - rev = "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4"; - sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq"; + rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3"; + sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp"; @@ -35511,12 +37310,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20170820.3"; + version = "20180222.1504"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "e2ea358725f03ae623ae03ed90715efb92a61030"; - sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn"; + rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec"; + sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -35574,12 +37373,12 @@ ido-flex-with-migemo = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, migemo }: melpaBuild { pname = "ido-flex-with-migemo"; - version = "20170319.431"; + version = "20180323.456"; src = fetchFromGitHub { owner = "ROCKTAKEY"; repo = "ido-flex-with-migemo"; - rev = "c620934f50b9713693eba8e23f88c2aaa8510708"; - sha256 = "0aymvbf36ph0zaff38r5vd7q0z3kv8wl3ivakhaybpsa2zvsgvxf"; + rev = "9684ffc47d838e82d611d0955b390d8387cf5741"; + sha256 = "06wi05bqwr1va589vzcyakjvh2z3vnn17ccbx0cgb7b3l8md73qs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo"; @@ -35784,12 +37583,12 @@ ido-sort-mtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-sort-mtime"; - version = "20170705.712"; + version = "20171121.59"; src = fetchFromGitHub { owner = "pkkm"; repo = "ido-sort-mtime"; - rev = "5f4ec2c562f79b7fb2d1480c88db1fa8a812d814"; - sha256 = "1fqqkpz0x3q7fqmax90vxkpn14valkb0lprqs0w641cbq8a4wqm7"; + rev = "f638ff0c922af862f5211779f2311a27fde428eb"; + sha256 = "0isy3rmw69664fsypg58rs42ql43drf27l90yvplnbcqd7nnnb21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36d2f7f1bb0d0694a25c1e83340781e08bee814b/recipes/ido-sort-mtime"; @@ -35823,27 +37622,6 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: - melpaBuild { - pname = "ido-ubiquitous"; - version = "20170923.842"; - src = fetchFromGitHub { - owner = "DarwinAwardWinner"; - repo = "ido-completing-read-plus"; - rev = "e2ea358725f03ae623ae03ed90715efb92a61030"; - sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; - sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; - name = "ido-ubiquitous"; - }; - packageRequires = [ cl-lib ido-completing-read-plus ]; - meta = { - homepage = "https://melpa.org/#/ido-ubiquitous"; - license = lib.licenses.free; - }; - }) {}; ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-vertical-mode"; @@ -35910,12 +37688,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20170722.1339"; + version = "20180210.400"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "5c01039112a8c52a0275560575f1f542f3966cf5"; - sha256 = "0r3fbp2c8qhmsnpd63r9fjz1vxjsa054x69d9716pbp1jk3qsjsv"; + rev = "cc35d124332aba84dc3e4da94433127a12459351"; + sha256 = "056yfgfqxzcfmlk2kj34r1dpjxi0xllcllkhrc9v8d9cib7hjqqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -35952,12 +37730,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20170916.1024"; + version = "20180207.219"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "5b14cc9fcaef509c50f25cff872fba5d70b2c799"; - sha256 = "1vlfqh616id2kh35diwig6jswq5q5z22zwrpbdxkginag3sq8732"; + rev = "412490db4387ad9d040bfb5854f25de4c40c2146"; + sha256 = "1995j0yvvls5i7zfxw8zwfk05in8b0n82k05qdrap29v6nq2v4bx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; @@ -35994,12 +37772,12 @@ iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iflipb"; - version = "20171102.1336"; + version = "20171113.1244"; src = fetchFromGitHub { owner = "jrosdahl"; repo = "iflipb"; - rev = "3a1ec69ffe7802794fe46baeecbf11846cbdc3ed"; - sha256 = "1wamzkmndmghvsw8ffbqmllp4nd7yxamym7m62pz22blyh1sj97m"; + rev = "a5ad1fbd1173cff5228dab265515c92c0778f86a"; + sha256 = "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb"; @@ -36139,12 +37917,12 @@ imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imake"; - version = "20171006.450"; + version = "20180318.1559"; src = fetchFromGitHub { owner = "tarsius"; repo = "imake"; - rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca"; - sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg"; + rev = "7df5fb9684a0288313ef5f64594078d477105959"; + sha256 = "0xc19ir5ak1bfq0ag48ql5rj58zd565csgxhpa30s9lvvkc8kvr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake"; @@ -36160,12 +37938,12 @@ imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; - version = "20161008.1357"; + version = "20180318.1327"; src = fetchFromGitHub { owner = "tarsius"; repo = "imapfilter"; - rev = "a879ddc36fedc30311693f308f414c520fdfc370"; - sha256 = "0rx4r6822iwl4gb9j0fii0sqinqvp3lzrc768rasgicgpklaqkjs"; + rev = "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea"; + sha256 = "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter"; @@ -36202,12 +37980,12 @@ imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-list"; - version = "20170728.632"; + version = "20171120.1255"; src = fetchFromGitHub { owner = "bmag"; repo = "imenu-list"; - rev = "27170d27c9594989587c03c23f753a809f6a0e10"; - sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx"; + rev = "0d3d445ce60a77a6c7bcbdbf1ae62cc20d2b5575"; + sha256 = "0q7124qaa3kmag3p3a1wq4axj59dvcsd7ydsh6cl9np2p18illvx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list"; @@ -36241,27 +38019,6 @@ license = lib.licenses.free; }; }) {}; - imgur = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "imgur"; - version = "20120307.225"; - src = fetchFromGitHub { - owner = "myuhe"; - repo = "imgur.el"; - rev = "ed952eb8f556c6fc0d982e2a689083504558cffb"; - sha256 = "0nzgfj083im8lc62ifgsh1pmbw0j9wivimjgih7k6ny3jgw834rs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d889f470cb81ac8a5f27e054755152867904feac/recipes/imgur"; - sha256 = "0hr2zz7nq65jig2036g5sa8q2lhb42jv40ijikcz8s4f5v3y14i7"; - name = "imgur"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/imgur"; - license = lib.licenses.free; - }; - }) {}; immortal-scratch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "immortal-scratch"; @@ -36306,16 +38063,16 @@ impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "impatient-mode"; - version = "20170505.1921"; + version = "20180124.1828"; src = fetchFromGitHub { - owner = "netguy204"; - repo = "imp.el"; - rev = "48e6c4842b1fc2657a3c6c23029f89e35fafc859"; - sha256 = "0srjgzcmdgvdi9fm127wlj7zsbq00wsmb3fkzzpy05nvmm2dgng5"; + owner = "skeeto"; + repo = "impatient-mode"; + rev = "4099906914cee4991907fc501799fb80cafa3f7d"; + sha256 = "1j9s5zpdi03qvvga59izxx3389k0g1vk2hiiivc8bph6zyr52fw0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode"; - sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode"; + sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j"; name = "impatient-mode"; }; packageRequires = [ cl-lib htmlize simple-httpd ]; @@ -36411,12 +38168,12 @@ indent-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indent-info"; - version = "20171105.153"; + version = "20171216.1509"; src = fetchFromGitHub { owner = "terlar"; repo = "indent-info.el"; - rev = "2340739dee51e6c45f04053881a2d8c4452fb5ba"; - sha256 = "0afhx8j7nrkjirq7xr3bcrjm5wcs24slkb6yzi6cw09080s5hlxc"; + rev = "e63a918b16d6d1986dd9123670a762e49102ce2b"; + sha256 = "0smh7x49cl8zhhjfvcgbcnr1a4n5rck7cpg797xwi3vr00b4bzv8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1274c0d871c51e358b3de577372dae8e3a04ead0/recipes/indent-info"; @@ -36432,12 +38189,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20171103.750"; + version = "20180124.408"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "6e8e9a8cf9efe4a8624e52f45cb5faa5fe8ec996"; - sha256 = "1hh4r4axnbmi12hk2d3pynvq3nldgbik8jf73v5ddmv06kqlsxya"; + rev = "b650b2ca82ccd9ccb4f3142afa0da4737ddd364f"; + sha256 = "01xkkrdfn3c8ivs2wc3ck2278m75gq73wv59fchb6gw1a9d6xj7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; @@ -36474,12 +38231,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20171106.916"; + version = "20180410.457"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "c15f5a2b4a48fd53b446e0fa291bdb8323b80c27"; - sha256 = "07fzsjmbbq4nx2w23pbb0z88iqmclm156yd87nxsdivndmzvsgw2"; + rev = "3b758dff8a5153d6ad8c0d08385e5bcdd69232e4"; + sha256 = "1yv2nz8x7i0dv2g9485hqq8b5qq397fa5yxv5d8bn5msvj81vl6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -36516,12 +38273,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20171029.40"; + version = "20180402.1403"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "b04f05d2c735795b68a10cc7e699b676a8acc811"; - sha256 = "16xsrny70f5lr6hr4sipyrnry813cvbhy25jxfx90kp2f9kkak53"; + rev = "59868ff0433f7631c362ce25879bd4271d350ebc"; + sha256 = "1xh901krzwmvkj0rdq0hjbf41vsf92mr0w9vjb9ki660wnnjw8wc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -36534,15 +38291,36 @@ license = lib.licenses.free; }; }) {}; + inf-crystal = callPackage ({ crystal-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inf-crystal"; + version = "20180118.1811"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "inf-crystal.el"; + rev = "02007b2a2a3bea44902d7c83c4acba1e39d278e3"; + sha256 = "18627gvpgw2ay7zcbglw6gwpslgh69hbvynwcyqln4c17fk9h0kw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ff84c742eebb84577f362b2739f4bcf1434d58ac/recipes/inf-crystal"; + sha256 = "09ssq7i5c2fxxbrsp3nn1f1ah1yv2nb19n5s1iqyykkk316k2q26"; + name = "inf-crystal"; + }; + packageRequires = [ crystal-mode emacs ]; + meta = { + homepage = "https://melpa.org/#/inf-crystal"; + license = lib.licenses.free; + }; + }) {}; inf-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-mongo"; - version = "20160815.216"; + version = "20180408.638"; src = fetchFromGitHub { owner = "tobiassvn"; repo = "inf-mongo"; - rev = "649dc6ea8e468f1d8109568548eb222c71486dbf"; - sha256 = "19n0ddzgbqhbz3qjpvvw4nasrn2qvkczrdd8kk9h28v8xix5grzp"; + rev = "2e498d1c88bd1904eeec18ed06b1a0cf8bdc2a92"; + sha256 = "1m6skisj6r3fbxadpwwgf3a3934b2qvwb7zj975qksxq56ij0wkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b27d5354d4b30cc9dd3be730d79e5a5bc1f74/recipes/inf-mongo"; @@ -36558,12 +38336,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20170615.335"; + version = "20180309.433"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "674a2a837fccea88ada6634e981a656b41d16d8e"; - sha256 = "09am0gq1sx0wv7bvcs7pp118brjj19qr7mis7cxjvrxbryc1mxf4"; + rev = "57710da5c8c146fef805deb7dc6a2cd8ccbc11d4"; + sha256 = "0kwxa8mpn3drvn1rnfh4g1hvin8l2sa1gns01dshf1qqaa829jkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -36639,6 +38417,27 @@ license = lib.licenses.free; }; }) {}; + info-colors = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-colors"; + version = "20180205.350"; + src = fetchFromGitHub { + owner = "ubolonton"; + repo = "info-colors"; + rev = "a8ebb7b8efa314c08ea8110d8b1876afb562bb45"; + sha256 = "0wvyf2w5s184kwacs6lbpjryx6hziayvdrl3crxir8gmg2kcv07m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors"; + sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x"; + name = "info-colors"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/info-colors"; + license = lib.licenses.free; + }; + }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -36768,12 +38567,12 @@ inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; - version = "20171106.640"; + version = "20171217.144"; src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-inkpot-theme"; - rev = "046d0bb361500e14c718b00930d31c73890929cb"; - sha256 = "02qlqh6fvk8cgf8mrl9m4bmaar45i5kpsjngkqqpl3kgxvycbsk8"; + rev = "8d59548ff5171bf6be6acc58d111674579646124"; + sha256 = "0r63rb99nm7fpw8yn3gkbfka12jqwzkdhv97hm89nvdrxdnbggfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; @@ -36852,12 +38651,12 @@ insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "insert-shebang"; - version = "20170825.438"; + version = "20180403.514"; src = fetchFromGitHub { owner = "psachin"; repo = "insert-shebang"; - rev = "adfa473f07443b231914d277c20a3419b30399b6"; - sha256 = "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1"; + rev = "7bfea92ba1dae9d13d442e2f84f9fb6c05a0a9bd"; + sha256 = "01f2p58qsny7p9l6vrra0i2m2g1k05p39m0bzi906zm5awx7l0rr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang"; @@ -36977,12 +38776,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20171023.1102"; + version = "20180409.1854"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "5697c86fde2b6131629e8d1c69f9b2363dadc7ae"; - sha256 = "1zwvmchk8rymxfciiip78zf69p3f8jpbr7fqqj43cxv0lq9w284s"; + rev = "37af01509e55341ffcc81b56d1f30032a055d1e5"; + sha256 = "0fqm6r73lk2ysv2zif6mi7zkdzsxar8dxgc5g6j64426hp6jc5m0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37205,6 +39004,27 @@ license = lib.licenses.free; }; }) {}; + ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ipython-shell-send"; + version = "20171212.318"; + src = fetchFromGitHub { + owner = "jackkamm"; + repo = "ipython-shell-send-el"; + rev = "36523a387c15ee1652a5b0e291d4d4838da5e912"; + sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send"; + sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8"; + name = "ipython-shell-send"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ipython-shell-send"; + license = lib.licenses.free; + }; + }) {}; iqa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iqa"; @@ -37271,12 +39091,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20171110.1151"; + version = "20180408.429"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "1d865c71fefeab952a2f61184d7f77371706954a"; - sha256 = "0xkl9wm63dxwb1s3sd3skbzvsdhva6gfbfz27m7z1j5zdc94x64x"; + rev = "94856c65ea9242aee5f57a66212ad12f5f39252b"; + sha256 = "1n6malmrxfzrzc9m44ycgp122x3hqkm6yhgiyna53z7bmx6whq70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -37355,12 +39175,12 @@ isend-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isend-mode"; - version = "20170208.110"; + version = "20171118.745"; src = fetchFromGitHub { owner = "ffevotte"; repo = "isend-mode.el"; - rev = "95ba9e71390858bf706b148276f37428dd2774d2"; - sha256 = "0njfglyspdl7jzybvi67wlqrdfbqhfv36fx48yz5v16018pd856h"; + rev = "88d4576e70e5874115c305ab2767d181dfda5985"; + sha256 = "0pnzy5000m34f20q97my8ahcsgr0fqyhmfzbmds5bc269vsnbr6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef6e4dab78a4c333647a85ed07a81da8083ec0c/recipes/isend-mode"; @@ -37397,12 +39217,12 @@ isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isortify"; - version = "20170726.1254"; + version = "20180312.2132"; src = fetchFromGitHub { owner = "proofit404"; repo = "isortify"; - rev = "28699f29cfc0d9d78b636d0ecadcf9139173bc6f"; - sha256 = "0r7hbvsnn590wfydwibvpdihcah5jj6ylqhqq7w1a1nljzwk6d4h"; + rev = "2e53c9ce3fa1ef80b08a8568cdae19a3669f3056"; + sha256 = "1l2py65xr0m3w9lc6qp2jcc9477kjhkfnjdnkgfimz6aqlg1p9xg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify"; @@ -37481,12 +39301,12 @@ iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iter2"; - version = "20171111.1104"; + version = "20171128.1211"; src = fetchFromGitHub { owner = "doublep"; repo = "iter2"; - rev = "ac1b4f10203d8093ae9f897039be97fd5ec65969"; - sha256 = "098bsm5wc7nqk06awak2ar4nwd3xpqsdc9pb2n0px20ql6lxh4bh"; + rev = "b0e8ecebe2d6807403a5eb1c75d68a4706259d4e"; + sha256 = "038z7scy572n6cx0z59kiz59v7zqvn70wg2bwka5f3pglr67wzhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2"; @@ -37565,12 +39385,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20171106.1142"; + version = "20180415.905"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "5009b8149a86949f9e6d7546479e998be2e14337"; - sha256 = "181bhxq2xscd9h1s0aix5lkp7gzg041q713157hrv200p2fnzb6d"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37586,12 +39406,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20171022.220"; + version = "20180328.1147"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "54de08577f9c19354cc303ee52836263aef486fb"; - sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0"; + rev = "5be84d36758ed7d5838cc5c8796a6ff427ba7043"; + sha256 = "1pqg49mj22izilx8x9rshflpyiw1q9zrp881nasp5lvbihwydvrg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -37628,12 +39448,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170709.2151"; + version = "20180311.558"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "acd6322571cb0820868a6febdc5326782a29b729"; - sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33"; + rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6"; + sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -37646,15 +39466,36 @@ license = lib.licenses.free; }; }) {}; + ivy-feedwrangler = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-feedwrangler"; + version = "20171121.1306"; + src = fetchFromGitHub { + owner = "asimpson"; + repo = "ivy-feedwrangler"; + rev = "ad4f94f8cc4557876ea0b0fb9b519f16ce23e96a"; + sha256 = "1w312qh6ng4xrj3xmpm4pzfswj3kpwzjb3vbad0pig8cp0zrc39c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1c112939545f6d157111eabcb573738b09ef7c/recipes/ivy-feedwrangler"; + sha256 = "1mxm37biix8c0s32gfv4pidffvlgdz5i9325zk71fhgfzqwkf5vx"; + name = "ivy-feedwrangler"; + }; + packageRequires = [ ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-feedwrangler"; + license = lib.licenses.free; + }; + }) {}; ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-gitlab"; - version = "20160519.312"; + version = "20180312.947"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "67567a354a1888419331b79862f151817d9747c5"; - sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; + rev = "68318aca3206d50701039c9aae39734ca29a49f9"; + sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab"; @@ -37674,8 +39515,8 @@ src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d"; - sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w"; + rev = "ec3dfa8786473e52ffc5ca9be95dbc59a9a87ff7"; + sha256 = "1bxigdg3pmgc0s4il1spdw0p8y98k4hwwd89m4i3y97l43asy6p1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; @@ -37691,12 +39532,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20170703.2350"; + version = "20180208.912"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "5009b8149a86949f9e6d7546479e998be2e14337"; - sha256 = "181bhxq2xscd9h1s0aix5lkp7gzg041q713157hrv200p2fnzb6d"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37712,12 +39553,12 @@ ivy-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-lobsters"; - version = "20170903.445"; + version = "20171202.1241"; src = fetchFromGitHub { owner = "julienXX"; repo = "ivy-lobsters"; - rev = "49923d6b59fc8ede5d930317f63f00577fef60b9"; - sha256 = "1z593062phsxn7y408zj82w4xc8l5y4x6kj919hm8a0d3nf28kg7"; + rev = "4364df4b3685fd1b50865ac9360fb948c0288dd1"; + sha256 = "1cfcy2ks0kb04crwlfp02052zcwg384cgz7xjyafwqynm77d35l0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9774fbf133ce8db3ce996b1a40c586309a2fec6/recipes/ivy-lobsters"; @@ -37730,6 +39571,27 @@ license = lib.licenses.free; }; }) {}; + ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }: + melpaBuild { + pname = "ivy-mpdel"; + version = "20180401.1207"; + src = fetchFromGitHub { + owner = "mpdel"; + repo = "ivy-mpdel"; + rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d"; + sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel"; + sha256 = "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r"; + name = "ivy-mpdel"; + }; + packageRequires = [ emacs ivy libmpdel mpdel ]; + meta = { + homepage = "https://melpa.org/#/ivy-mpdel"; + license = lib.licenses.free; + }; + }) {}; ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-pages"; @@ -37772,6 +39634,48 @@ license = lib.licenses.free; }; }) {}; + ivy-phpunit = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, phpunit }: + melpaBuild { + pname = "ivy-phpunit"; + version = "20180219.115"; + src = fetchFromGitHub { + owner = "12pt"; + repo = "ivy-phpunit"; + rev = "ffedb0138d36564e8e36a28fd9bc71ea8944681f"; + sha256 = "0kf1k3jqg2r20x985h6brg92sg7y47c5vkfjky8xp11gqyqw47bi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/93822c5588f81683e3d43f690785b80c207d331d/recipes/ivy-phpunit"; + sha256 = "1spvcf41lvjdmiwp6058wrpp0hfg1cjld6b7zm28m2ys6mn35ycs"; + name = "ivy-phpunit"; + }; + packageRequires = [ emacs ivy phpunit ]; + meta = { + homepage = "https://melpa.org/#/ivy-phpunit"; + license = lib.licenses.free; + }; + }) {}; + ivy-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, posframe }: + melpaBuild { + pname = "ivy-posframe"; + version = "20180309.132"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "ivy-posframe"; + rev = "b9b9a45455692d06b89d4fbf40bba6852b9a109a"; + sha256 = "1sc8mwk5ans3l0p465wl3blvchfmkhyg06x95b0dnkjldzkk2v6a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe"; + sha256 = "1sv4xvdvb1g8g5m4f1f159lxbxaz96drsmvhh0k43hp1dh3bhj3b"; + name = "ivy-posframe"; + }; + packageRequires = [ emacs ivy posframe ]; + meta = { + homepage = "https://melpa.org/#/ivy-posframe"; + license = lib.licenses.free; + }; + }) {}; ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: melpaBuild { pname = "ivy-purpose"; @@ -37796,12 +39700,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20171106.2334"; + version = "20180314.1909"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "565ea4128741f68727df9d54dee40c9a89b63885"; - sha256 = "1mqg406gs8blzsay5jmdvr894l5iy4z4q2rmv5f89fvanmnl9d0h"; + rev = "69314197b6563b87d145eb13ea16efd5b20513a6"; + sha256 = "1a09mf51nbjvz8i91vx09rricvnlpmnh1znwhrxi5iiwa1pd0dlh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -37821,8 +39725,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "dadd74f015f89317ff77424be30a9accadeeb4a4"; - sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -37838,12 +39742,12 @@ ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-todo"; - version = "20170315.334"; + version = "20171208.809"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ivy-todo"; - rev = "7c72deff0ffa15c7d9a3389bd4386aec2dec9372"; - sha256 = "1y6ilcwzz2rbsdy0fj6yjs75mxks6asha8cv5i129ylcapj9ygdy"; + rev = "964e347cea1a6097854d7113f5b07f6c5ef81df0"; + sha256 = "07208qdk1a77dgh9qmpn164x5mgkzvprsdvb7y35ax12r2q541b8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97909da7899d4187e8eb6b3284f6225ebec7fa51/recipes/ivy-todo"; @@ -37877,6 +39781,27 @@ license = lib.licenses.free; }; }) {}; + ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-xref"; + version = "20180405.1721"; + src = fetchFromGitHub { + owner = "alexmurray"; + repo = "ivy-xref"; + rev = "5c21aa14c81df1b75a4c7090729a41f755b74916"; + sha256 = "0qw3yqbs340k4mv0wy42nrn7r1wx537ypnr2idrll4v8fppfz24n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref"; + sha256 = "1p5a0x83b0bc7b654j1d207s7vifffgwmp26pya2mz0czd68ywy8"; + name = "ivy-xref"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-xref"; + license = lib.licenses.free; + }; + }) {}; ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: melpaBuild { pname = "ivy-youtube"; @@ -37884,8 +39809,8 @@ src = fetchFromGitHub { owner = "squiter"; repo = "ivy-youtube"; - rev = "23e1089d4c4fc32db20df14ba10078aabf117e87"; - sha256 = "0m70vxjj49kf8bzni2qchgzgx808z1fcfh02cflkhjcb77dkq8d6"; + rev = "8168dc1f26521830dfd99466d35ab93159afd004"; + sha256 = "1yds7ffqd9rd87vypvnpzl4i7678f6879hdj4whr9zn47hsbdfzn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube"; @@ -37943,12 +39868,12 @@ j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "j-mode"; - version = "20171103.845"; + version = "20171224.1056"; src = fetchFromGitHub { owner = "zellio"; repo = "j-mode"; - rev = "6f7f598eaa1a32ccf06b707631f2d539a2315fba"; - sha256 = "1qldmcawi94pxv62zb2qgr27kr8lwhsql6wi67g0f5dlihpzc8dq"; + rev = "e8725ac8af95498faabb2ca3ab3bd809a8f148e6"; + sha256 = "0icrwny3cif0iwgyf9i25sj9i5gy056cn9ic2wwwbzqjqb4xg6dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode"; @@ -38319,12 +40244,12 @@ jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jbeans-theme"; - version = "20171108.1431"; + version = "20180309.825"; src = fetchFromGitHub { owner = "synic"; repo = "jbeans-emacs"; - rev = "9a5095d65de8355c88b102831b81a525d507612a"; - sha256 = "0fm7sl6i5i65y82qsg2s7bdarc6r28qbyffdl43c55bjzxs4xk19"; + rev = "3caa95998d8492a2ca6c17971de499ca15609871"; + sha256 = "0k8bd5j09753czl55dcwijs4j1vxir4zwcwlgsxli4b4f8sl2z8r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme"; @@ -38361,12 +40286,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }: melpaBuild { pname = "jdee"; - version = "20171007.835"; + version = "20180218.919"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "ebe5d2e36a6a367376ed6cde590d5f805830ec9e"; - sha256 = "0rq8vp3pmnyabqzzplc91dk2ka48k809is9v4q486xv7y43013jh"; + rev = "07afc434bb502d85fc8b882f62fc4d237d23f34e"; + sha256 = "0pnf80l5v0sn24p64pb36lrajs9b7p4y9m984hm52k2ah8kjg2n5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -38529,12 +40454,12 @@ jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jetbrains"; - version = "20171107.847"; + version = "20180228.2102"; src = fetchFromGitHub { owner = "emacs-php"; repo = "jetbrains.el"; - rev = "8d0851793d0658cc39bca455dc14c89f78ab8335"; - sha256 = "1k3zb3c5h8bqa7yxl3by4vxlzabh3wl5sz6ynpi01pmqf75qxa4s"; + rev = "56f71a17d455581c10d48f6dbb31d9e2126227bf"; + sha256 = "0v948k7xjm66px20ad331pskc7svpcrcffh3hbkjsksd4k0pggds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains"; @@ -38697,12 +40622,12 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "20161128.748"; + version = "20180407.1048"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "5c081859def7510dafc6b14449f5285916898f15"; - sha256 = "14421p9k6b02syb8irprz527dcqbh1r4i2m86pi94sv6ffzbs0gg"; + rev = "72ea5e35e0a66c7275cf4fe4af25a619761653d7"; + sha256 = "0xgkmadbbs3zid11pn6silb25kyng424ikgx0wib48yzcra0kdw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -38760,12 +40685,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "20171031.1819"; + version = "20180123.830"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "5ba81cd7cdd09d41a8e9c9d53d370497bf64edbd"; - sha256 = "113ppyfvly6i03j8kmyd3i6218v0r2f449wk3zbx9vf2d6plzc8v"; + rev = "6bd44162ac422304803f606278bb0c08ab940a5d"; + sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -38799,22 +40724,22 @@ license = lib.licenses.free; }; }) {}; - js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20170808.527"; + version = "20171129.2056"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "eb4744122724b24e492c2171fff438e3ee2045a8"; - sha256 = "1bbzbv1dasqxkljq06qngb4l22x7gpgncz7jmn0pqixnhqj5k66y"; + rev = "83e932e4a83d1a69098ee87e0ab911d299368e60"; + sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1"; name = "js-comint"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/js-comint"; license = lib.licenses.free; @@ -38928,12 +40853,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20171107.333"; + version = "20180331.2247"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "eba9797444b7549c1ed210f8fa59903917df151c"; - sha256 = "0jk2jxmh96sgpb01fpa2xp9z70a52cpi8arxcbvyrkfs7ccrx2cs"; + rev = "d76b4df4427e7bf4dfb2ba7b5dfff3c2aea52459"; + sha256 = "0m6pv3a6ji5dxjc8wp4z40rms63y4wz5k0bbl0ayi0k6miliik0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -38949,12 +40874,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20171109.921"; + version = "20180410.201"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "35db9111d49536f41e005560e8e90fd93836e8e4"; - sha256 = "059ib04l6ycar7bz515x3nkxbgvr781isba632fvz0a87vdcbqsm"; + rev = "391e06c80e9197581c9d0b04edb5a65ffc149dcf"; + sha256 = "1w6pjhvcc8i7rmg85nxbnch3yxfcz81i7d1kdpbyra0i2ls7ikvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -39054,12 +40979,12 @@ json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }: melpaBuild { pname = "json-navigator"; - version = "20170606.34"; + version = "20171220.19"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "json-navigator"; - rev = "d005a253fa73ed2c6c0b3ebbc7dc41be9270c304"; - sha256 = "1dklr166p5gx5y3nzkh758wwr6jvw50c3si05m71247kirhs0f89"; + rev = "7a1fec93500c46ccba4086d10115d8188607d0d0"; + sha256 = "03gjvzlyf90sh2q735qfbbjyqx4z9c3yc8jjp2sjpmp5fjvdm9yf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator"; @@ -39096,12 +41021,12 @@ json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "json-rpc"; - version = "20170402.955"; + version = "20180104.728"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-json-rpc"; - rev = "e77a62012e4d6c946666eed3a17454d5c6f83367"; - sha256 = "1pwa1ifz0c83lwwpj75h10wj7jyghsxg6wpdlfy4dp8102wr8nhg"; + rev = "0992ae71964055230aa5d4d934a1b93b5dfd7eb4"; + sha256 = "0nfccwxss3dz1ig6i3dig703xpsy90m7i96bm3pysrw2jfp4by9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82c6b97cdfe2970f028a00146b01e5734710291b/recipes/json-rpc"; @@ -39138,12 +41063,12 @@ jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jsonnet-mode"; - version = "20171005.24"; + version = "20180310.2256"; src = fetchFromGitHub { owner = "mgyucht"; repo = "jsonnet-mode"; - rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1"; - sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29"; + rev = "4eb52cff8ce6020f5a6309a1c0465b5cdd6c698e"; + sha256 = "0l9q6g00yxz5j1hchd2vim33n39zshv7qmmga1zf8qcn20yxz7mm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode"; @@ -39241,12 +41166,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20170916.628"; + version = "20171116.642"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "115d4dc8a07445301772da8376b232fa8c7168f4"; - sha256 = "1is4dcv6blslpzbjcg8l2jpxi8xj96q4cm0nxjxsyswpm8bw8ki0"; + rev = "2ef6992125a85674532a1e37dacd5c60bee4feeb"; + sha256 = "0vjsaws0rqrkv1mqxwf9lp8qmaq92piippybsf4ncizxwbnh8x6d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -39262,12 +41187,12 @@ julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-repl"; - version = "20171101.424"; + version = "20171116.46"; src = fetchFromGitHub { owner = "tpapp"; repo = "julia-repl"; - rev = "ec1ea3296acea3721ac0f371c6b955135d75bb1d"; - sha256 = "0xvm7filzmjmg88if1yjsyifkkji4bkm073x79w05sph35c8d8a2"; + rev = "f808a12e7ebe403f82036899c2dace640be73154"; + sha256 = "1lh4pbxrnld205ga58036jwnxkmgabdd8hyr6g7fahw94llq2cpa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; @@ -39518,8 +41443,8 @@ src = fetchFromGitHub { owner = "listx"; repo = "kakapo-mode"; - rev = "67d516138172fd60782df94454b3d0bd247e84f3"; - sha256 = "0r2n410arr48skcwm39c6mjhzsia117lb8xd7pc4854y0rbrvrvs"; + rev = "292e07203c676361a1d918deb5acf2123cd70eaf"; + sha256 = "00rl5y7wra7kyp867ps2inx0vng9jrmym0sm4jhnk6pqj50c8i9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode"; @@ -39617,12 +41542,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20171113.209"; + version = "20180416.401"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "08e13adfab07c9cf7b0df313c77eac8fb393b284"; - sha256 = "0wijf5493wmp219ypbvhp0c4q76igrxijzdalbgkyp2gf8xvq6b4"; + rev = "2afd1be2a431b59e82ce22353b57bb7def851da5"; + sha256 = "19y5j2jha3q3i0l06bzywgxbc8q34sc1rh76j0wfvm6r6yxq1bwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -39638,12 +41563,12 @@ kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "kaomoji"; - version = "20170311.2151"; + version = "20171226.2040"; src = fetchFromGitHub { owner = "kuanyui"; repo = "kaomoji.el"; - rev = "91ab93cc7455486182d5e7f88e03d0de44c9953e"; - sha256 = "19l3r2fbp895c46cklrjfwwa5d7i959nd6jc3gk14jyi35gjypyy"; + rev = "90a1490743b2a30762f5454c9d9309018eff83dd"; + sha256 = "1jc796nyrck3k50x6jb1wsaawk396y4gk87gkwb8yd5qks7ci35q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/140c65cb3cdf6c197b085ccf8ba079e1efd15f38/recipes/kaomoji"; @@ -39680,12 +41605,12 @@ kdeconnect = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kdeconnect"; - version = "20161022.700"; + version = "20180126.1540"; src = fetchFromGitHub { owner = "carldotac"; repo = "kdeconnect.el"; - rev = "a91a045cd4aabd671b689361efa10f2e01ad8e8e"; - sha256 = "0j9j3mlzkr8zw03fghpmvkb3i8r1ar0rarjcmvh9k6m4dk7l0g2d"; + rev = "ca0cbf9a628ba7b519b43fa85e0d988ca26bf853"; + sha256 = "07aqzfg2nn35bkikrmk1lszqkc6h8vn2551m22mwc19lmdx94p2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c363866d30fb86ae636d30def8c3847711ada762/recipes/kdeconnect"; @@ -39824,15 +41749,36 @@ license = lib.licenses.free; }; }) {}; + keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "keycast"; + version = "20180318.1321"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "keycast"; + rev = "46370b8a72922902921d3ed2fa194564568053dc"; + sha256 = "0wgicba3v5l7a0wmmr3awf026vhf4grrn8c4i2hipi9ij3wckqzc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast"; + sha256 = "19qq5y1zjp3029kfq0c59xl9xnxqmdn2pd04sblznchcr9jdy5id"; + name = "keycast"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/keycast"; + license = lib.licenses.free; + }; + }) {}; keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keychain-environment"; - version = "20170118.626"; + version = "20180318.1523"; src = fetchFromGitHub { owner = "tarsius"; repo = "keychain-environment"; - rev = "7c08e8c4c3ea4d6eaee12d710a56793771f837c5"; - sha256 = "1mnqa69f584qzb62nn01bb4nz08gi7ra8b6xr0x7aphfqzk86kzy"; + rev = "d3643196de6dc79ea77f9f4805028350fd76100b"; + sha256 = "0wzs77nwal6apinc39d4arj3lralv2cb9aw9gkikk46fgk404hwj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4382c9e7e8dee2cafea9ee49965d0952ca359dd5/recipes/keychain-environment"; @@ -39890,12 +41836,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "20170614.1134"; + version = "20180318.1537"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "0130f32e5ade649dd2738206a80570e450906ef6"; - sha256 = "1bq7zihdj67j94yyv6655mcrxhz99szbf2zi64nwsl60bxz0znb8"; + rev = "1ad766dbc111ec78b1a292da97b9bd4856cd2ff7"; + sha256 = "0imx8zp21bm066bzdynvasylrlhw0gr8mpk2bwkz8j1y5lsp54v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -40016,12 +41962,12 @@ kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-or-bury-alive"; - version = "20170518.2358"; + version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "415de48695efd30163a015063873b03f4ca5b743"; - sha256 = "1jsgvwi3zy22wirxgzkbbjzk4q6f6mxf3223cf5pkk7x2prv6fcn"; + rev = "0ba8f44efe60058ef66b10a059fd30489b42546f"; + sha256 = "09y6905ig6qphfwjk1xn79sv4qxx75gnrmnwd9i80ig3lfp8ps2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -40104,8 +42050,8 @@ src = fetchFromGitHub { owner = "tungd"; repo = "kite-mini.el"; - rev = "48734092e735033ad7664a9933acd4556e095f79"; - sha256 = "0ralsdjzj09g6nsa04jvyyzr6cgsi0d7gi1ji77f52m31dl0b8cw"; + rev = "a68619dbc109c7989f3448426d8c1ee9e797c11f"; + sha256 = "1qmg5mdf3zhmpa4kdvkh62y6if6mj4ag885dg7y6461dg2y6ymlh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b76d0ee09efc6652d0541cf72c9623760dda66/recipes/kite-mini"; @@ -40125,8 +42071,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "b242c7053e2a1dd7d963fcacd6a428143f09f5a6"; - sha256 = "06gzspzqxiqsfpa0zyhrgizcxghn6al73dhj5vn5j219cmpiyy7a"; + rev = "94d623f914745aab67715356db6731860a3e37e1"; + sha256 = "1hs69p79f27rdy8v4dld46qdnsszm7f4xx0nqlvz1pgy0wm3lq71"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40205,12 +42151,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20171008.2226"; + version = "20180223.1905"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "479075d96857696cf029cd1f482b9f2f31d82452"; - sha256 = "0kvx43ny49j115kj6zpy1i5g87bjgiimfgj9xp2fn9830adymc24"; + rev = "aa8c8bb8e64f1f61fadeb4e93973b14dfe19e4a9"; + sha256 = "1gsaw4yfv68ilf0z130rf13300lnz1fdgi2x8rm8hc0q0dlsp1a6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -40310,12 +42256,12 @@ kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kotlin-mode"; - version = "20171009.1301"; + version = "20180219.853"; src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; repo = "kotlin-mode"; - rev = "ebcf6f3730f455894ebb7ed8e42950f66e8e1c1d"; - sha256 = "1345ahc8i69sl2d9v03gdgrdcj7qkbzrl0pl957hjn3vbvmhrz00"; + rev = "a2c2628d55c4e8b018ffe9f55ca38d89302a1bbc"; + sha256 = "12zng3rq134f0d49fr2rsf0jgmxl3qc7kkhziy7r27hx6ny9h8z2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; @@ -40394,12 +42340,12 @@ kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "kubernetes"; - version = "20170523.1517"; + version = "20171122.1819"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "kubernetes-el"; - rev = "560b65baef1c4f2bedffd8e767774b55dfc35594"; - sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw"; + rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c"; + sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes"; @@ -40415,12 +42361,12 @@ kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }: melpaBuild { pname = "kubernetes-evil"; - version = "20170523.1517"; + version = "20171122.1819"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "kubernetes-el"; - rev = "560b65baef1c4f2bedffd8e767774b55dfc35594"; - sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw"; + rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c"; + sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil"; @@ -40457,12 +42403,12 @@ kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; - version = "20170808.602"; + version = "20180401.521"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "kurecolor"; - rev = "3e8b63e89e294179e42a14a4a357c29a72669a22"; - sha256 = "0pj8252x5s61bwsfrhi5qvwk8jia3kc67r82v5m4a900zpmx3a7k"; + rev = "a27153f6a01f38226920772dc4917b73166da5e6"; + sha256 = "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor"; @@ -40583,12 +42529,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "20170917.2154"; + version = "20180409.316"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "bae4bdd240583b2253b4ff03af5295146e285103"; - sha256 = "0zwaddpmvkq7v5nnyzacmx0ql5zjlisvkqwa2knw3pihngr160cd"; + rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe"; + sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -40625,12 +42571,12 @@ lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "lastpass"; - version = "20170801.1214"; + version = "20171208.216"; src = fetchFromGitHub { owner = "storvik"; repo = "emacs-lastpass"; - rev = "264250725b3ba23412919ec10cfa7390473b534c"; - sha256 = "1qqmg59vbwb31nx3vi88d53484gy3sg8wnq45xrra45drpjka3ry"; + rev = "a4529ce70b8187ed9ac4972997df152af58ef2eb"; + sha256 = "1h4h7swww2is7qblqi5r1vh26a9lfl52c0yq7rgwd1pqclffgc8m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass"; @@ -40708,12 +42654,12 @@ latex-preview-pane = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-preview-pane"; - version = "20151023.1303"; + version = "20180222.951"; src = fetchFromGitHub { owner = "jsinglet"; repo = "latex-preview-pane"; - rev = "1a0539ab70eaf5dd31c2c94773dddd6f437fed41"; - sha256 = "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa"; + rev = "e7dbe0df3ca938128ab394cdf04f3e40eb5b139e"; + sha256 = "1i8mc2qdyyg04rm946vqmmw021c4v8aq7yvxsgl53mfbx9snm3dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3227f2e35d701915a8d3479d20581dcbe3a778/recipes/latex-preview-pane"; @@ -40747,6 +42693,27 @@ license = lib.licenses.free; }; }) {}; + latexdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "latexdiff"; + version = "20171225.1623"; + src = fetchFromGitHub { + owner = "galaunay"; + repo = "latexdiff.el"; + rev = "665aa65707d0e8c5778de70f38a42be4ba1def5d"; + sha256 = "1ppxmcbkscsdsnm5vf7lmhzq1y0vkkg8dpp4gh0hmsvqvh7d67bp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d164cf118a2c928c04e4d5cbfd47ac732e626fe0/recipes/latexdiff"; + sha256 = "002frvk31q3plrqa6lldadchck51bch4n126y5l33fyfs0ipspfa"; + name = "latexdiff"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/latexdiff"; + license = lib.licenses.free; + }; + }) {}; launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "launch"; @@ -40852,36 +42819,36 @@ license = lib.licenses.free; }; }) {}; - ldap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ldap-mode"; - version = "20091203.1015"; + pname = "lcr"; + version = "20180414.1256"; src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "ldap-mode"; - rev = "8761a835e90b990fb5fe70173ecdcd6f4b776cb0"; - sha256 = "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3"; + owner = "jyp"; + repo = "lcr"; + rev = "49a59d80a4b55cc421cb55430ff8258887382c3d"; + sha256 = "1fds0s0if9m155v5hk5l0ihc6wr331qif5bc013w04hrlkn4v5jh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/169243eedf4ee97fe01811a686f0798f2573fa0a/recipes/ldap-mode"; - sha256 = "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq"; - name = "ldap-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; + sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k"; + name = "lcr"; }; - packageRequires = []; + packageRequires = [ dash emacs ]; meta = { - homepage = "https://melpa.org/#/ldap-mode"; + homepage = "https://melpa.org/#/lcr"; license = lib.licenses.free; }; }) {}; lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "lean-mode"; - version = "20171102.754"; + version = "20180123.413"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "c0af876c967fc969d67c467bc6767210d19c5d87"; - sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9"; + rev = "ae90bd280588c96d540892d0f42247db5a126f51"; + sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode"; @@ -40918,12 +42885,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170901.2039"; + version = "20180416.105"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "24b43e34dd34de23e54d7ddaa2a147efda6af03d"; - sha256 = "0cdcd2hpv34yhpplgqljiyncs2q0i321f4xwfkb2inqbv9q4byhk"; + rev = "fa09a3bdd25a532b8ee1335e22b7427eb0d231e9"; + sha256 = "0hp7p6nmxp4ass17vnlx0r73k9gc4z8aknsmpwpyw1radx26vy1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -41195,8 +43162,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "2880c8a2a7fe998238b6490fe3e3c484b5c5985e"; - sha256 = "1xcnh1hk815wizhp7h1mik3npm7zpbvg4554nwbj072gnbb9j1nx"; + rev = "5faa7106419263689bfc0bc08a7451ccb1fba718"; + sha256 = "010l1xz9wa6wm7fnajxcdxjl1nmbkwxxwszd4h14xmhj830560ph"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -41230,6 +43197,27 @@ license = lib.licenses.free; }; }) {}; + libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "libmpdel"; + version = "20180403.816"; + src = fetchFromGitHub { + owner = "mpdel"; + repo = "libmpdel"; + rev = "6e9b1bd6c3439c8e15be0f85eff94f95d1e987f6"; + sha256 = "03qcr2nc8x8h3cgb7fzk7r69b5fqpq63a3x8vd4fr6nps8bsb8gd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel"; + sha256 = "0qi9g3czwzi9hhp7gjczpzjx9vgzz52xi91332l0sxcxmwbawjp1"; + name = "libmpdel"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/libmpdel"; + license = lib.licenses.free; + }; + }) {}; lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lice"; @@ -41272,6 +43260,27 @@ license = lib.licenses.free; }; }) {}; + line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "line-up-words"; + version = "20180219.224"; + src = fetchFromGitHub { + owner = "janestreet"; + repo = "line-up-words"; + rev = "bbefa954510801725070be50a7e13de6dc38f49a"; + sha256 = "165sg8j69lxqjfx9avbcclsw6n57x4qrkhd74zbmzs35xnji9w5q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words"; + sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79"; + name = "line-up-words"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/line-up-words"; + license = lib.licenses.free; + }; + }) {}; lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lingr"; @@ -41317,12 +43326,12 @@ link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link-hint"; - version = "20170923.855"; + version = "20180407.1440"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "0294df85aee10b47fcf6c2c9bfe7e1038660fa21"; - sha256 = "0ixfrp6pfljgy5ja79cka0fa6a9ganwhh5myz6czqj4ykjzlyi2c"; + rev = "b350015ec4ebea9e84f73dcac808dd79b2882966"; + sha256 = "10gqpqq1xgjji7plljjkqzi0p63q65avjya0fsalrwvakzsx6xlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; @@ -41380,12 +43389,12 @@ linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "linum-relative"; - version = "20160510.118"; + version = "20180124.247"; src = fetchFromGitHub { owner = "coldnew"; repo = "linum-relative"; - rev = "b8a99dcfe38a491172a8193053fb7849634b43c0"; - sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s"; + rev = "c74a6981b688a5e1e6b8e0809363963ff558ce4d"; + sha256 = "0svxi1l3s4rg1k1apfw25gzi127rsks56b5yfg79a48b5rf1xmkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative"; @@ -41469,15 +43478,36 @@ license = lib.licenses.free; }; }) {}; + lispxmp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lispxmp"; + version = "20170925.1723"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "lispxmp"; + rev = "7ad077b4ee91ce8a42f84eeddb9fc7ea4eac7814"; + sha256 = "1156jynii783v9sjj3a7s20ysa26mqaq22zk5nbia949hwbibx16"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/lispxmp"; + sha256 = "1a641v5cx4wy2v8a2swxzn1y9cz4g2bp4mn9q290n3ifpn5356dl"; + name = "lispxmp"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/lispxmp"; + license = lib.licenses.free; + }; + }) {}; lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20171112.44"; + version = "20180415.1117"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "1d3684a2ff211d81b080bab2cfcffc6dfc911dfb"; - sha256 = "1dcqr6zcfk48yna99kp2zzkm29n2ilwg1bkrjwp7i7pid3zz41i2"; + rev = "582c9994688fcbbda454207e4112ad4a0cd80970"; + sha256 = "02frf3r2m0hfz3xf3vvcccxi4gvkl9fz5asrgrc0f6v45850mdv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -41514,12 +43544,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20170907.926"; + version = "20180414.1952"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "522fd8dcce23b2719c758e64f99b64591406f2f5"; - sha256 = "0sbqw585lv5j3w13zq2adrcqybw88y36qnnd2vp8nk9kgzvl4p62"; + rev = "d2491462647fc6cffcc8f40c2a518a4948f2afcb"; + sha256 = "029jg6nggk5qvrskvlgb52ymgbakd56cnva1mgb10invr0wpswqq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -41574,27 +43604,6 @@ license = lib.licenses.free; }; }) {}; - list-register = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "list-register"; - version = "20091203.1015"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "list-register"; - rev = "f8bec5dc3765174de1089549947d9ca9a1cdbe5f"; - sha256 = "1pr7vmjmyildg44n7psg0zmj8a3kfsw5xmgh600fhs95wqxn3sag"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/list-register"; - sha256 = "0kza9xfhmxc8qia5yixx5z2y9j4wb1530rcvgxn545b903fs55kv"; - name = "list-register"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/list-register"; - license = lib.licenses.free; - }; - }) {}; list-unicode-display = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "list-unicode-display"; @@ -41787,12 +43796,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20171109.2007"; + version = "20180330.1758"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "f5da8df21ae2aa704ddca4473b6f9400ba12d30c"; - sha256 = "1w0xc0bc5jl0q9yi9jhvy4xgdyrz9l402v9qv8mmrp2iqf5cdblm"; + rev = "ab2f9bea32dbad11a6464a4880e5487645a0f65a"; + sha256 = "0w3kpszsrh0gj0a62iqhnhm3flmmgq0pl0d6w5r61mvlq9wck5dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -41889,26 +43898,6 @@ license = lib.licenses.free; }; }) {}; - llvm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "llvm-mode"; - version = "20150910.644"; - src = fetchgit { - url = "https://llvm.org/git/llvm"; - rev = "377a566dcea87ba5b29ce196a677aaac7b738d64"; - sha256 = "0g3v6z3s471wiqszshy9xl0lzyyn1vi304a3awkh8d7lyx9qw10m"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; - sha256 = "0jxwa7gaxv9kkgjp87ggzlfqbf6xs19z0s9ycnv2h5hlxpnzrlnb"; - name = "llvm-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/llvm-mode"; - license = lib.licenses.free; - }; - }) {}; lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lms"; @@ -42138,6 +44127,26 @@ license = lib.licenses.free; }; }) {}; + lognav-mode = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lognav-mode"; + version = "20171230.1052"; + src = fetchhg { + url = "https://bitbucket.com/ellisvelo/lognav-mode"; + rev = "a9b53f2da040"; + sha256 = "0ka92x63zfgraby5ycypn3ri2s3s2b1m2j7fpb4r37bk9xkf90v4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad86b93f4982a0c6291c771e12c8f42ace3b88f9/recipes/lognav-mode"; + sha256 = "1941scifg3nn7gmnki3sa9zvwsbb84w5lw2xjmdx0sh8rbxaw8gb"; + name = "lognav-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lognav-mode"; + license = lib.licenses.free; + }; + }) {}; logstash-conf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logstash-conf"; @@ -42162,12 +44171,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170928.820"; + version = "20180216.1445"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f"; - sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63"; + rev = "9ec279d933923dab2d8d1f140adc43073dab6433"; + sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -42309,12 +44318,12 @@ lsp-go = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-go"; - version = "20171021.336"; + version = "20180330.255"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-go"; - rev = "d270b7c0bd893fdc73a97763e07706830756cad2"; - sha256 = "0i9l56dmkxcycn9a2ddj1zwa9cmzb5lpj6qn5x1k9q9yfk9hsc6b"; + rev = "00cbaac9419efc641fbe9e27ad0315d2c9a3ecb5"; + sha256 = "1n08vr2rkasz1w1bc43fi6zqg11vg7fa2a4sgp2cdrsn5hcp8nnh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go"; @@ -42330,12 +44339,12 @@ lsp-hack = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-hack"; - version = "20171108.1813"; + version = "20171128.1238"; src = fetchFromGitHub { owner = "jra3"; repo = "lsp-hack"; - rev = "a69bd0340039570d55fdea326a1086b958647ea1"; - sha256 = "19rsjyklhd2lgll4204l5rzqbv4jvsh1yd3mcv5g4p3s3xpfp9is"; + rev = "f299555ad5206f13d7cfe75a3c76607b1f0d6da5"; + sha256 = "1z3cca395v5kv7h1w7vnb7c42sq2aczv7sznx9nc2gjjabmrd8vy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a70d8442c653554d28dc87425913424ab42ab5c8/recipes/lsp-hack"; @@ -42351,12 +44360,12 @@ lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-haskell"; - version = "20171021.330"; + version = "20180131.459"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "16ca9fa975e64e840e062485ed30e4b297d72424"; - sha256 = "03zrk3h76hpacrqw7lchjbslh0lg081jqkgf9n5nhxj2jg60v3vd"; + rev = "aa421f9702056a89cd4e63c0dcf5543acb62840f"; + sha256 = "1m0diap909jn9w54j9462zg972xhwxivcda59jmb6isgjpyi1yyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -42372,12 +44381,12 @@ lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-java"; - version = "20171023.650"; + version = "20180330.30"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "5176f63e80e8f971563c0b98658db7dc72404369"; - sha256 = "07g259bx3vra2gf9mhxyd3qv1jb2s0lc0hndf0kvrcjdy29wwi52"; + rev = "35ad849fdd445be127f8df59ef1bb68effd0b7ff"; + sha256 = "0id9rjjzwybcyfa9ns3fm1py3zsm0z1l88dwlfh8pgkfjy7zkc34"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java"; @@ -42393,12 +44402,12 @@ lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "lsp-javacomp"; - version = "20171024.1547"; + version = "20180218.2334"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "ed23aaeee27e6253bed5752fb8fbb7a5fa61967c"; - sha256 = "096rbyv0qwa454p1ns7g0py9lni5r6h1gw85wm5mwr00shjzq23n"; + rev = "cb080824e1fc08e2724d6ecde7034f1acfd565f0"; + sha256 = "0ihb4bld8pzw2mxfwygxldsv2hclvmzkr7cp8nimzjam1nlgjhic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; @@ -42414,12 +44423,12 @@ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-javascript-typescript"; - version = "20171027.1005"; + version = "20180403.743"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "8a565260906f90bb39f2da54cdb6179ec27005a6"; - sha256 = "1dx0b7sq6wn309l1iy8s3ccn21hkv0xs061jbm53hz40pn30sjqc"; + rev = "2c1f2f4cb24c30fcefb2d07dad3f40b058c90c1f"; + sha256 = "0pjzywlg981pvg4015w11b1dzrvqm1h3fjdl6qp6pv7iq2x9hxdp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -42432,22 +44441,22 @@ license = lib.licenses.free; }; }) {}; - lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20171111.1203"; + version = "20180416.622"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "27b78dfbf117035f4b276f716e16dfb37d5fb7d4"; - sha256 = "0l37ss2mp4byxs3h2wln3kg4w094mbc0cjf838cj5z57y8ar141z"; + rev = "34a669b76ac0aa45b4917f882687ca7577814249"; + sha256 = "091ph46y6mb9rf0saar0vb230z1kf8w74f3dkcm7hs7b1k7khj3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9"; name = "lsp-mode"; }; - packageRequires = [ emacs flycheck ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/lsp-mode"; license = lib.licenses.free; @@ -42474,15 +44483,36 @@ license = lib.licenses.free; }; }) {}; + lsp-php = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-php"; + version = "20180214.624"; + src = fetchFromGitHub { + owner = "tszg"; + repo = "lsp-php"; + rev = "ff5f5ba417342aa05869a1a9c6a0fc2d42c8acc3"; + sha256 = "05rq7sqb6chymzfqvk5xk9bgi7nsdf1ldimams8df9ml6242zjsg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/be00893ec6db70624acf1b4527cca05486d6b090/recipes/lsp-php"; + sha256 = "1fpmg8mbp0r8krlbp4j0bk6kslmm88lrpki0w961s4gqrqxw287c"; + name = "lsp-php"; + }; + packageRequires = [ emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-php"; + license = lib.licenses.free; + }; + }) {}; lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-python"; - version = "20171021.254"; + version = "20180404.819"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-python"; - rev = "5acea5f921dc396ea092ee253ec01b45dee3cbfd"; - sha256 = "0nz0n7k0i0h77fn8w0d49b4pkljw7l15hzvjym16jh4gr1n098ar"; + rev = "e2fb53d191344dd73e26ffaaa4ac95cd6686dbd9"; + sha256 = "0s0w6sx7k7ys9i1w8zcf3hp9v3qzmcm4gl5pdnwr08ln73d3as9g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; @@ -42495,36 +44525,85 @@ license = lib.licenses.free; }; }) {}; - lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + lsp-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, markdown-mode, melpaBuild, rust-mode }: melpaBuild { pname = "lsp-rust"; - version = "20171021.241"; + version = "20180305.508"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "239e0cb8912749266a6226b68c6bc3b4362876c1"; - sha256 = "0ki66lcdc67hxx3llzw5x8vrsfi1p5m509jpcvkhrrxs1sqr4bqn"; + rev = "ecc889cc8735b280e0e6e84d2f4526b0048148b3"; + sha256 = "0wmci5lij5721xpfsj3mnvr3z1j8b9s0w76dhzd0lnyaknvyv1rs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28"; name = "lsp-rust"; }; - packageRequires = [ lsp-mode ]; + packageRequires = [ dash emacs lsp-mode markdown-mode rust-mode ]; meta = { homepage = "https://melpa.org/#/lsp-rust"; license = lib.licenses.free; }; }) {}; + lsp-ui = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: + melpaBuild { + pname = "lsp-ui"; + version = "20180412.1807"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-ui"; + rev = "146efa7414a91090c494e24fac364011bc884f31"; + sha256 = "0076kjv1wpw079mbv35v0j609xhis7xrvx6jg54hnb7y5h5rkqqz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; + sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; + name = "lsp-ui"; + }; + packageRequires = [ + dash + dash-functional + emacs + flycheck + lsp-mode + markdown-mode + ]; + meta = { + homepage = "https://melpa.org/#/lsp-ui"; + license = lib.licenses.free; + }; + }) {}; + lsp-vue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-vue"; + version = "20180129.1805"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-vue"; + rev = "faf976ee9b333919653b4b98e2886b488707e866"; + sha256 = "1d6sw5jsjhwd5bbl2p8k6hdwpg1pmnsmvbq8g33h80qlg05fwj60"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9eb7699630fd7e11f38b4ba278a497633c9733/recipes/lsp-vue"; + sha256 = "1df3dva31livffy9bzassgqpps3bf9nbqmhngzh8bnhjvvrbj5ic"; + name = "lsp-vue"; + }; + packageRequires = [ emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-vue"; + license = lib.licenses.free; + }; + }) {}; lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20170130.435"; + version = "20180323.321"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "652e299cb967fccca827dda381d61a9c144d97de"; - sha256 = "1k64cjzylmfw89pyfjza8s9sxijraknwg573vh619wvnggflc7lb"; + rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd"; + sha256 = "04m9njcpdmar3njjz4x2qq26xk0k6qprcfzx8whlmvapqf8w19iz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -42582,12 +44661,12 @@ lusty-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lusty-explorer"; - version = "20150508.1557"; + version = "20180127.1443"; src = fetchFromGitHub { owner = "sjbach"; repo = "lusty-emacs"; - rev = "a6e78cafc193050a493d16d07eae107a2436c293"; - sha256 = "1r1xfn0dyc4m49064g9n6hpwn4r763kpbg3dgprsv30i5ska61qa"; + rev = "3df794ed4829e353ee3c1e3c6686440f9e868ef6"; + sha256 = "1z2nzjlmmcnin3h0713kqaaikyc0h4iiazv50lsvrp0agjbmhcqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efedaa3b1de5f6406c7dcd842eee42eefaf8ab50/recipes/lusty-explorer"; @@ -42624,12 +44703,12 @@ lyrics = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "lyrics"; - version = "20160920.1945"; + version = "20180123.2004"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "lyrics.el"; - rev = "1378d534614793a51ebbed661c59eb8818299182"; - sha256 = "10mp9vavmbkhgb133n490kjfbk63j2b0plvaf57w432nalxcwf5n"; + rev = "fb35b387796f64f48b4daa5a163f4a576210f200"; + sha256 = "17al49f633h3fsa6aq9v5c1r8dp2gj97f46z1fhmgxbijmpfzs0w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b04c8f3dfa9fc07cc0ff3df5c4069f864b6db92e/recipes/lyrics"; @@ -42792,12 +44871,12 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "20161214.1017"; + version = "20180219.752"; src = fetchFromGitHub { owner = "emacs-php"; repo = "magic-filetype.el"; - rev = "9a20137474697063898902b43a40423daa4eb64d"; - sha256 = "1r16qlm2pqcph0zwy3fhzdjywdrfcwvldqk809vbhw71qkq4a54i"; + rev = "019494add5ff02dd36cb3f500142fc51125522cc"; + sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype"; @@ -42831,26 +44910,28 @@ license = lib.licenses.free; }; }) {}; - magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: + magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20171112.348"; + version = "20180416.852"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "1c69e9e9107ac9c881c763f69d11a3686d201a74"; - sha256 = "1qi32vplmjwnqpcrxgvf1qgzrkbgqi3wgngixwl67dm8xv7di799"; + rev = "16785d7962cf84df12cf1e498b2c96519e84d235"; + sha256 = "0ifzqqsyqk5x3d8zvq0yspcfhlndl7ppv6yxzz8w27pgb4h0jqwn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; - sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; + sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga"; name = "magit"; }; packageRequires = [ async dash emacs + ghub git-commit + let-alist magit-popup with-editor ]; @@ -42862,12 +44943,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20170913.659"; + version = "20180120.1534"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "895c229c2b0d822a4debb302d8638105ecb4ee20"; - sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh"; + rev = "44eaef7d55647d5d4bd466742b738d7a9563d07f"; + sha256 = "1wka4aj9jv4i8a8aj1wffg8aba23qgg02636fx7ky919jr97f3za"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -42946,12 +45027,12 @@ magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }: melpaBuild { pname = "magit-gh-pulls"; - version = "20161020.249"; + version = "20171117.226"; src = fetchFromGitHub { owner = "sigma"; repo = "magit-gh-pulls"; - rev = "7eb4491d889c4de2e3169b91d34e7d863edf94b7"; - sha256 = "180vqxyxv6jvp14qa0ks692c42rkf8wj0vk8nqx5j211f9gkh7vl"; + rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7"; + sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls"; @@ -42988,12 +45069,12 @@ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-imerge"; - version = "20170805.819"; + version = "20180329.1950"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c"; - sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg"; + rev = "f337f178a1b4d2e4c1199fa02338febe216ab902"; + sha256 = "1x0714qxryj3fg9qwnsxrksdja1q98vvjpdwn8h9anifxa0wknh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -43027,6 +45108,27 @@ license = lib.licenses.free; }; }) {}; + magit-org-todos = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magit-org-todos"; + version = "20180412.1542"; + src = fetchFromGitHub { + owner = "danielma"; + repo = "magit-org-todos.el"; + rev = "0bfa36bbc50e62de0a3406031cb93e2f57dcdc55"; + sha256 = "07r5x256k1fjjxs1yfg41kc94nwvnjlk2vvknkra3j8v9p0j88m7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/84480cad490cab2f087a484ed7b9d3d3064bbd29/recipes/magit-org-todos"; + sha256 = "0yywgzm2jzvsccm9h0a0s1q8fag9dfajnznwk6iqz5pywq5mxijr"; + name = "magit-org-todos"; + }; + packageRequires = [ emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magit-org-todos"; + license = lib.licenses.free; + }; + }) {}; magit-p4 = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild, p4 }: melpaBuild { pname = "magit-p4"; @@ -43051,16 +45153,16 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20171109.1438"; + version = "20180329.1302"; src = fetchFromGitHub { owner = "magit"; - repo = "magit"; - rev = "1c69e9e9107ac9c881c763f69d11a3686d201a74"; - sha256 = "1qi32vplmjwnqpcrxgvf1qgzrkbgqi3wgngixwl67dm8xv7di799"; + repo = "magit-popup"; + rev = "a0b22e30d135d4f83a9227b3fa13b1377f9be0df"; + sha256 = "0sn9gi0qm3q6c63f1jd67pkc54r2gqk8bzh21x48n2x2v4f84s63"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; - sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; + sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv"; name = "magit-popup"; }; packageRequires = [ async dash emacs ]; @@ -43069,36 +45171,15 @@ license = lib.licenses.free; }; }) {}; - magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { - pname = "magit-rockstar"; - version = "20170703.704"; - src = fetchFromGitHub { - owner = "tarsius"; - repo = "magit-rockstar"; - rev = "a65042e3445008b55190f1258ae54bd78e12174b"; - sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar"; - sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n"; - name = "magit-rockstar"; - }; - packageRequires = [ dash magit ]; - meta = { - homepage = "https://melpa.org/#/magit-rockstar"; - license = lib.licenses.free; - }; - }) {}; magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-stgit"; - version = "20160224.703"; + version = "20171115.754"; src = fetchFromGitHub { owner = "magit"; repo = "magit-stgit"; - rev = "1b064485d512ab547d606dcea9ad4298f355095c"; - sha256 = "01mgnm5nr2yg377pk4bwlzzgbabsx611wrpx2vzsbiwd97yppdqf"; + rev = "0e44df69d7c0c793808a5278bed35b2c6ec39f7f"; + sha256 = "1zr3ir9426yg5vrsi3k56vzdhajddn5c0p2ygw587gscnr7fgv5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; @@ -43135,12 +45216,12 @@ magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-tbdiff"; - version = "20170725.1850"; + version = "20180120.1553"; src = fetchFromGitHub { owner = "magit"; repo = "magit-tbdiff"; - rev = "1d1333af9d76b9e832212e9da152397df65f7205"; - sha256 = "1rhjqvdg43n0qa9qdq9rlq4v8msy48y912m9dcjdvsaw45hh8062"; + rev = "aaa040037c38f13c0e6bbce83e38959ef30c1925"; + sha256 = "1hc2mkmd4cni0sgkypp32xlsn749c6i2lz8l3crmgk48q6qx2i18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff"; @@ -43177,12 +45258,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20171111.623"; + version = "20180410.1351"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "098209b84a1204d7014aa061294e223a40030248"; - sha256 = "0jlclxyahcl0dl1yl83a34kr0xlfzdyplkabjzz1p29xj94ivw9y"; + rev = "76b0156323c9953a8c6f36ff483a2d528d8df9bc"; + sha256 = "0xg0284ca7w1clfyrd7lhiick6izj00bi9zn0hdq01h9lifardxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -43198,12 +45279,12 @@ magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magma-mode"; - version = "20160304.408"; + version = "20180413.727"; src = fetchFromGitHub { owner = "ThibautVerron"; repo = "magma-mode"; - rev = "528c96a269980dcc6b65e2e973510ff07e6b9fc4"; - sha256 = "1pq6ckxp3dcb2f6xfsd4jwd43r9d0920m30ammp39glgc39p9lsq"; + rev = "d8e41b3c0bc7d37be78fdbcabf6c13c9e182dfaa"; + sha256 = "1wlwgbj3hslfxl21nz5s7g0p4kdpc5ph58jp7mrz0dws5cw3sj02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59764a0aab7c3f32b5a872a3d10a7e144f273a7e/recipes/magma-mode"; @@ -43237,27 +45318,6 @@ license = lib.licenses.free; }; }) {}; - main-line = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "main-line"; - version = "20151120.1806"; - src = fetchFromGitHub { - owner = "emacsfodder"; - repo = "emacs-mainline"; - rev = "2ef3175854f5b6c85f2e1bed26507cdca2f6ad16"; - sha256 = "1zkm51gp1lkaz6n8ixf31rwjqms49mi8qdq10a7nibdzivpj8mg7"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/main-line"; - sha256 = "06rihx9h2h8ayrirbx74d9qdf26laz9yxffvxyldzm9hymlbzadd"; - name = "main-line"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://melpa.org/#/main-line"; - license = lib.licenses.free; - }; - }) {}; majapahit-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "majapahit-theme"; @@ -43324,12 +45384,12 @@ make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20170328.216"; + version = "20180128.1307"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "1f2015cb131d69ffd7994dcc153abef969999027"; - sha256 = "0brqh1dis4ahxxa4q8zsqr039l6k7arxkji4bx9yh65aimp8ckcd"; + rev = "bc3b01d6b9ed6ff66ebbd524234f9d6df60dd4be"; + sha256 = "0833bzlscpnkvjnrg3g54yr246afbjwri8n5wxk8drnsq6acvd8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; @@ -43345,12 +45405,12 @@ makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "makefile-executor"; - version = "20171017.438"; + version = "20180410.30"; src = fetchFromGitHub { owner = "thiderman"; repo = "makefile-executor.el"; - rev = "a950438c93dc2fdcb867ac25174c773deda95aff"; - sha256 = "1vpa24k8gm9zr8mpam76k1wbzc1zama5s5ch1f8c1h539l8i8cl9"; + rev = "054c5460616d1903499d49190ac79074e9bd1c52"; + sha256 = "0axqm8hd2hz1a4qh02p7kyvrb0mab8iswpypij3q05s5yxidv1vv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor"; @@ -43387,12 +45447,12 @@ malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }: melpaBuild { pname = "malinka"; - version = "20170723.1635"; + version = "20171202.221"; src = fetchFromGitHub { owner = "LefterisJP"; repo = "malinka"; - rev = "8072d159dae04f0f1a87b117ff03f9f1eb33f6cb"; - sha256 = "0s5dcm11nw88j1n4asqpm92z0csjv3jvh06f4qqghfvcym8qv44h"; + rev = "d4aa517c7a9022eae16c758c7efdb3a0403542d7"; + sha256 = "1rnzvx1nc01sw9fklm36lyllqm6dizj64gnlqbs4nammx7z0spi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka"; @@ -43534,12 +45594,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20171002.12"; + version = "20180403.406"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "77647573331c602847b06b9e21de69f72cd7bad5"; - sha256 = "0yqxsls9phvd4dgzb908xds4x437rqpm3ddy07pq3qq7ghri1cnv"; + rev = "f230c871de8aab1be7b7a9718cd930548a90baa8"; + sha256 = "1zqshxwbsyz60bag6dcabmx8a49nmnpad5kvpy1c6gvqhjr8axvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -43555,12 +45615,12 @@ mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }: melpaBuild { pname = "mandoku-tls"; - version = "20170822.1138"; + version = "20171117.1840"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku-tls"; - rev = "82b1b39305da3259b53a2200260713500d7a9ec5"; - sha256 = "0xkycqwv5bczz111zlfai2y3m9shwv237dhgyjmhd1j6blpp59jw"; + rev = "ffeebf5bd451ac1806ddfe1744fbbd036a56f902"; + sha256 = "16399qifjj4hnfw4a62jwxfwnc7k8lmiy3bz8iwzlc91jjic7zdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/mandoku-tls"; @@ -43686,36 +45746,15 @@ license = lib.licenses.free; }; }) {}; - markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { - pname = "markdown-edit-indirect"; - version = "20170607.1244"; - src = fetchFromGitHub { - owner = "emacs-pe"; - repo = "markdown-edit-indirect.el"; - rev = "a789320354eab2b2275a308c38b1390e6d2cc41b"; - sha256 = "067rp6h2wax242zmykz5iv2v30cj327dh9vz6c69im02lsn65ib3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fa4da9d5c63da3bd777101098168696f5c4d3fbc/recipes/markdown-edit-indirect"; - sha256 = "19038vb6ph7l9w1yv8pszyd13ac38l44vb46l9jmgyby773m7644"; - name = "markdown-edit-indirect"; - }; - packageRequires = [ edit-indirect emacs markdown-mode ]; - meta = { - homepage = "https://melpa.org/#/markdown-edit-indirect"; - license = lib.licenses.free; - }; - }) {}; markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20171112.1835"; + version = "20180124.138"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "e3e7069e340ba18965d4b58d913efd3ea6e3ab38"; - sha256 = "123ixjar4zk6hsjclz5rgm82gz5a1v0jwbb3x0l17gnbbkmcvym7"; + rev = "668de4a965980d618637a3b5754e721b54c51e83"; + sha256 = "00biiz0s5mwq092qxdh9943f6qf6k6n7dhrrj7nvj2b8iciid9as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -43773,12 +45812,12 @@ markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "20170820.459"; + version = "20171121.2323"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "134fd336750b8b3165bc906f0a7161c25eb6f589"; - sha256 = "0j1jdvmn8psarjdl1j4d3rsjmnb3gcissh2l78xj2c8vckmp2g24"; + rev = "4ec15183fc9fadb9368902c9b77a2d0e1196d1c6"; + sha256 = "1zvpcnn0lafd6pvp5d42rid20dqi7zrpyai1q0kagpv3grbbyzc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode"; @@ -43906,12 +45945,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "20171018.932"; + version = "20180124.439"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "406ea2f60c7e4aeafd384b8d6696d726b3d8f611"; - sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s"; + rev = "f038689cbd5b3680b80b44edd0c7a63ca3038e26"; + sha256 = "1n79im1r7h1ilvppn9alqwl96zhyxbm5hk7kbmqh022dggw0cx15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -43948,12 +45987,12 @@ mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mastodon"; - version = "20170619.1050"; + version = "20180305.1909"; src = fetchFromGitHub { owner = "jdenen"; repo = "mastodon.el"; - rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318"; - sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp"; + rev = "ae8dabda04e377a6ac22cb854e4844f68073f533"; + sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; @@ -43969,12 +46008,12 @@ material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "material-theme"; - version = "20160908.1538"; + version = "20171123.1040"; src = fetchFromGitHub { owner = "cpaulik"; repo = "emacs-material-theme"; - rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40"; - sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0"; + rev = "b66838d220ad380a16da1d8878936974b26f815d"; + sha256 = "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme"; @@ -44032,15 +46071,15 @@ matlab-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "matlab-mode"; - version = "20160902.459"; + version = "20180125.1010"; src = fetchgit { url = "https://git.code.sf.net/p/matlab-emacs/src"; - rev = "3b3c48ac0c27039e0bef89c643f0ee4c0b53d3d0"; - sha256 = "0kizmzpmc8iw15n6xkrf7m5kbjcs5rwdrxyrfij6cj43szlnkf1z"; + rev = "50266ff812607e55bddacd71a46d1b96e36fb0bd"; + sha256 = "1spyfnkw6j0v947m6yj6mv6ni1za0a9m9iycpjycpcb42q7d9rlg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/matlab-mode"; - sha256 = "128v4rwc99dwyfgi5crbr5649fz4l7dwh4lid8w2mwpknyxaxy28"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f78cff288077e04f8c9e4c2e5be9f3c33d8ff49/recipes/matlab-mode"; + sha256 = "1q3sdmahf915ix4lrv65cxsfh6hrs91c8pmyixbqmbhifqi33d0q"; name = "matlab-mode"; }; packageRequires = []; @@ -44178,12 +46217,12 @@ mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mbsync"; - version = "20170320.503"; + version = "20171130.335"; src = fetchFromGitHub { owner = "dimitri"; repo = "mbsync-el"; - rev = "046a745ea1ea85152e27efd4c83fd3487aacffaa"; - sha256 = "1s5zxv4qvy2lqh090lb2bc61y4y67mr22j0b02y69wd61s1w3ppx"; + rev = "911d9ac255e8f7fb4bd21c0e816e44abfeb59128"; + sha256 = "05qqb7399bmjdkfr5gdkf7fpg6xziyd9345x00vz5cbq859p128p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync"; @@ -44238,6 +46277,27 @@ license = lib.licenses.free; }; }) {}; + md4rd = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild, request, s, tree-mode }: + melpaBuild { + pname = "md4rd"; + version = "20180123.1244"; + src = fetchFromGitHub { + owner = "ahungry"; + repo = "md4rd"; + rev = "be0fc4951b2d1f5194ffa1fcaac706dbac560500"; + sha256 = "1i93shx5x192gd7cl2r6gvcvhhwyi1k08abi5w3izv1hn3pmksgq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/48d4a3b3337e16e68631409d1de0ce67ae22b837/recipes/md4rd"; + sha256 = "0ayr5qw0cz7bd46djfhm8slr2kfgssi5bsnzqcasr8n4lyg9jvfc"; + name = "md4rd"; + }; + packageRequires = [ cl-lib dash emacs hierarchy request s tree-mode ]; + meta = { + homepage = "https://melpa.org/#/md4rd"; + license = lib.licenses.free; + }; + }) {}; mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; @@ -44262,12 +46322,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170723.1724"; + version = "20180405.1845"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5"; - sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8"; + rev = "5479b42efe3ed504e3a0824e039e8365ebc0b788"; + sha256 = "1jn4cpd6y310c8kkk7w0lpchac0rd3f8ri3lmy369gi1sb2xsk94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -44476,8 +46536,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "e882ac7f7658dd9507aca0ff88c88fcf74618252"; - sha256 = "0h8zg2nvb0yn0z8xv1101r8rjxgs05k08j3n71inr7n118sa98bj"; + rev = "4e7aae56e5abf6deaadbda84fd5ec4e3e19c22be"; + sha256 = "0nb64i9ikkcbb6s21rzc2d5i84dpy0zvqk7f3zynlprzaqy11b7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -44535,12 +46595,12 @@ metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "metaweblog"; - version = "20170626.750"; + version = "20171216.1840"; src = fetchFromGitHub { owner = "punchagan"; repo = "metaweblog"; - rev = "c039d1ffb618d19d160bde835fab389e9a7433a3"; - sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k"; + rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a"; + sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog"; @@ -44556,12 +46616,12 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20170508.22"; + version = "20180329.2022"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "36b36a154dab22e112cc19675cfd73478f2a5956"; - sha256 = "01wqa5pf6zjxgsgzqw0pnp278vfd7livfgyqvc24xfqr519k2ifq"; + rev = "abe7f589adc5eef0d53e1eeaba9ab28d01c91231"; + sha256 = "1bn78w2mslsh02m6rzrqdm70cfgx1kgw10ifnrcslc1vn6lwvd0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -44595,15 +46655,36 @@ license = lib.licenses.free; }; }) {}; + mgmtconfig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mgmtconfig-mode"; + version = "20180222.1257"; + src = fetchFromGitHub { + owner = "purpleidea"; + repo = "mgmt"; + rev = "754480a9b6f2d62093fb7a264a5c4ac42fc57997"; + sha256 = "1z7gaij17yxk3ikxljlb54cvdcz0lhnm8wl0bpzpiycpnfkqxcy4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode"; + sha256 = "0bdjaqfk68av4lfc4cpacrl2mxvimplfkbadi9l6wb65vlqz6sil"; + name = "mgmtconfig-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mgmtconfig-mode"; + license = lib.licenses.free; + }; + }) {}; mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mhc"; - version = "20171016.335"; + version = "20180314.3"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "03a50a7dd5f90fb981b72e4b9e9385e4d1fe3be3"; - sha256 = "17p6gkf6xmx6sflzd3pyc3p3x7ma8p497hmj1yc7w863kqm8jclk"; + rev = "f7bce7f5504093737071e2fc79ae6bc95dd37af5"; + sha256 = "0sash77j2k1gpi35miyaf96g0zfx3d5hjqag8vcwc692lx1sf06c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -44744,12 +46825,12 @@ mingus = callPackage ({ fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild }: melpaBuild { pname = "mingus"; - version = "20171112.115"; + version = "20171124.238"; src = fetchFromGitHub { owner = "pft"; repo = "mingus"; - rev = "9ebe7a2a0fee1f0e39fffc5c67a260bc596fb27e"; - sha256 = "15c7l9sbmxmxcwihq54mfwh0n8lx89zkwy6yaydpgd7a1knqka5p"; + rev = "93827f564145a598838d3c3232202a60d681bd49"; + sha256 = "09aj6h2zfww95h9ym5pw2p6p7hz57l7zlx4v492ga2vkcsjis7gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6699927f1ded5c97f2ce1861f8e54a5453264cca/recipes/mingus"; @@ -44909,6 +46990,27 @@ license = lib.licenses.free; }; }) {}; + minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "minions"; + version = "20180321.749"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "minions"; + rev = "acac7fb0b04ffdf243775231690956d163474177"; + sha256 = "1065asbg1h2chd34cbja2pir93r5y8gp3wv3jv6sf5csa6yqk6c7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions"; + sha256 = "0ximlj93yp6646bh99r2vnayk15ky26sibrmrqqysfw1pzs4a940"; + name = "minions"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/minions"; + license = lib.licenses.free; + }; + }) {}; minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minitest"; @@ -44933,12 +47035,12 @@ minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minizinc-mode"; - version = "20170708.358"; + version = "20180201.650"; src = fetchFromGitHub { owner = "m00nlight"; repo = "minizinc-mode"; - rev = "b621b9e106edbe094bcc8e609d9398a60c2ac8b5"; - sha256 = "15d90fsrpc7qcnblgwjcqrqyyphbfjvdnkwj6dnv79d0m4n58m1c"; + rev = "2512521ba7f8e263a06db88df663fc6b3cca7e16"; + sha256 = "1yrawvvn3ndzzrllh408v4a5n0y0n5p1jczdm9r8pbxqgyknbk1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode"; @@ -44951,6 +47053,27 @@ license = lib.licenses.free; }; }) {}; + minor-mode-hack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "minor-mode-hack"; + version = "20170925.1734"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "minor-mode-hack"; + rev = "9688994e23ccb2de568225ef125b41c46e5667c3"; + sha256 = "0f6kafr7zqgdlw914bxh2390a1bjz5zy3h30yrfpavz283ycvrrw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/minor-mode-hack"; + sha256 = "07ga48xvbi641i053bykv9v4wxhka6jhhg76b1ll24rys02az526"; + name = "minor-mode-hack"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/minor-mode-hack"; + license = lib.licenses.free; + }; + }) {}; mip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mip-mode"; @@ -44975,12 +47098,12 @@ mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mips-mode"; - version = "20170310.2149"; + version = "20180321.211"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-mips-mode"; - rev = "a13d1fc5b583a29f059f7794f2d83e59da439fa1"; - sha256 = "0ncvp52dnicy84wmnbxhm6djxhc8njrbxy6zwz2vylmy24z9948w"; + rev = "e6c25201a3325b555e64388908d584f3f81d9e32"; + sha256 = "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; @@ -44996,12 +47119,12 @@ mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mixed-pitch"; - version = "20170723.955"; + version = "20180410.917"; src = fetchFromGitHub { owner = "jabranham"; repo = "mixed-pitch"; - rev = "6a4fbb9c48fc345d4d40228e8b686f6f2e585f8a"; - sha256 = "14hpcx75rb41fya8i8qk6cg388wgkhhxnj64ywar3pycngm8jwl9"; + rev = "b6b1601c7a3eb9ab23e33192bc479bccc4dd5e7b"; + sha256 = "0g3mcbsjgcwg196ygj21i454ifyf0898r0xlkar1fqdl8lckb8zj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch"; @@ -45076,36 +47199,15 @@ license = lib.licenses.free; }; }) {}; - mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mmm-mode"; - version = "20171004.336"; - src = fetchFromGitHub { - owner = "purcell"; - repo = "mmm-mode"; - rev = "7661968fa6974996e58dfa28da33bca0cbde777d"; - sha256 = "066qp884qw0bqcglncxvag89i1z5rmqjc73y7ksr7ll3309y1969"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; - sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw"; - name = "mmm-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mmm-mode"; - license = lib.licenses.free; - }; - }) {}; mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; - version = "20170519.4"; + version = "20171231.2219"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "5cc5d1ee3efe675fa49d62fe0ae6b483d7ad9392"; - sha256 = "1vkj28351si30l3szjpkdgjlmp2vfjp6jxk3dvlbxicfqd1k823p"; + rev = "e860009ce531ee05d2902309db5f804326596b45"; + sha256 = "1l0jh657ndypi9n7dxac8hqc61fxp9c10li3w23c1r9pad4zisy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -45184,12 +47286,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20171016.903"; + version = "20180321.1622"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "0f74ecf500f833f7f959187a375dacdd33d4d569"; - sha256 = "03ixygw28hzn00136747mv2r3vii3n0gif1wqgg3k7ajh7c45f5b"; + rev = "33e1b521a8a8d0225df353b51f1e8a4588ee32d0"; + sha256 = "1ln6wz452sfxy7ii211ha9p0n3pygxyzyk0raczfla3ln8dh989q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -45230,8 +47332,8 @@ src = fetchFromGitHub { owner = "sigma"; repo = "mocker.el"; - rev = "a1ddf87150f67306ae8da927117063c75588be30"; - sha256 = "1jjp3sllm41hszfj7gs90zx16ww8791dvvsfck4flxcm12bmi1c1"; + rev = "6a1d7c9189bd721debd1a60707526e43a733f537"; + sha256 = "0i96fn5ji1z78in4nr316sgfp2mc8lmxijslw3k9q1v50j91bcya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a4fe34a6f354d396c24ff13e15157510202259/recipes/mocker"; @@ -45247,12 +47349,12 @@ modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modalka"; - version = "20170519.32"; + version = "20171231.2213"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "88935a26318a574adeeb2301ae8d010f0102b1d3"; - sha256 = "1zibawwflf2wx7hzg2ld7qvmlpljfd6nb86998ckzbx75s5yb20a"; + rev = "297d5e66628bbd788f8673656ab5f2da29f7c40b"; + sha256 = "1agb500fc3cmhfq423bii7mz83hwnfas5xs6c1qjv3d89v7wxp69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -45286,15 +47388,36 @@ license = lib.licenses.free; }; }) {}; + mode-line-bell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mode-line-bell"; + version = "20171231.1939"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "mode-line-bell"; + rev = "dcfad0929a606af0e836d93e78be989a8ac16f87"; + sha256 = "0vpi3x60izvwwcck6scdm4386bc67693nqwwll0mbzf8n9args4v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/26f19808655b0242a1e9e5e5d41f7f794542e243/recipes/mode-line-bell"; + sha256 = "1ri771hb91b7hd203f8zp83h5hcndh8ccc1y8shhqmak6a6l04wk"; + name = "mode-line-bell"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/mode-line-bell"; + license = lib.licenses.free; + }; + }) {}; mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-line-debug"; - version = "20150307.512"; + version = "20180318.1525"; src = fetchFromGitHub { owner = "tarsius"; repo = "mode-line-debug"; - rev = "da44422eeb6a1f055b4ec2f822962c5162fce001"; - sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1"; + rev = "a0fcc394b07d2414bd6f722da10f1c7567333f6b"; + sha256 = "04vsb0lniy90bhnqb590dap9y4wac64xz0lc2rlfczic0nrqd1aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0080ab9ef1eca5dd19b3fd9af536d8aa17773a2/recipes/mode-line-debug"; @@ -45310,12 +47433,12 @@ modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modern-cpp-font-lock"; - version = "20170625.1306"; + version = "20180110.1231"; src = fetchFromGitHub { owner = "ludwigpacifici"; repo = "modern-cpp-font-lock"; - rev = "b0a45dc1d7c49854988103c2570c783f46f44566"; - sha256 = "1gh7l6c4xznpjialbmswhfm1cmmbzkl2s6acjcway0nb52rshgr6"; + rev = "9b10e1831bac34685be89e32e83ed969c4bac683"; + sha256 = "0csaky9k24hd3qjhb3kyraycvlsdkjhmw6bbd36z0q0ac56sd2sg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock"; @@ -45352,12 +47475,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20170914.2111"; + version = "20180314.2108"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e"; - sha256 = "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2"; + rev = "c3ec67b02d55b5072ef4d32ff412019e5940d988"; + sha256 = "1kjyv8mypcpqhhrmbnzjfrf4i40zws9sysaar8f7i08cr79idjj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -45370,6 +47493,26 @@ license = lib.licenses.free; }; }) {}; + molecule = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "molecule"; + version = "20180120.1514"; + src = fetchgit { + url = "https://git.daemons.it/drymer/molecule.el/"; + rev = "f3a1b19d2e0312bbb9ada00146994df84576abd2"; + sha256 = "0didxv3v3qnn3szxfnm1cmgpx0bhmjccdja3fhbhhdmp948904cy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7421b67dc51abf13bb028e467bb4c83f857a342e/recipes/molecule"; + sha256 = "0kdwmn4gb382igy979y7x2fdqcnfxlb4dvqvm6w7ghs564grzgj4"; + name = "molecule"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/molecule"; + license = lib.licenses.free; + }; + }) {}; molokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "molokai-theme"; @@ -45499,12 +47642,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20171013.236"; + version = "20180402.221"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "019e07947426f0192fc3458f3f72c19031b607de"; - sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz"; + rev = "1143c072f5153ae1a69807e5e8af163069b947d2"; + sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -45517,15 +47660,36 @@ license = lib.licenses.free; }; }) {}; + monotropic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "monotropic-theme"; + version = "20180218.357"; + src = fetchFromGitHub { + owner = "caffo"; + repo = "monotropic-theme"; + rev = "b46e94a712e01cebe69a6f7d950e91d7c7dd1b66"; + sha256 = "0lmyfqi6c5f2cr9ha1l2qnc4ayigb1zj9gz8xi5xxadhad3zymwh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/38222d109ece0030b0bfafb242aa100694b2bfcf/recipes/monotropic-theme"; + sha256 = "129yqjh4gaab1kjijzkzbw50alzdiwmpv9cl3lsy04m8zk02shl8"; + name = "monotropic-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/monotropic-theme"; + license = lib.licenses.free; + }; + }) {}; monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20170623.103"; + version = "20180116.817"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "2bb59ac84e030f7047e7443e2df25185b397a5d3"; - sha256 = "0jcyidk62djd47dv4m53k7wky92982pzz87n8zq1fijqic63iib9"; + rev = "609dfd82897c14324a99206ebf450377e5c6257e"; + sha256 = "07qyxc7mjly0j2x7aqbpnn7nd5fp2pck02ks25m62gn4a1sq4v3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -45538,6 +47702,27 @@ license = lib.licenses.free; }; }) {}; + moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "moody"; + version = "20180403.549"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "moody"; + rev = "adf652f35cba1bb3d0f254e1905e2deeeb0fbdba"; + sha256 = "1zspq29n60r0kd9fy7d50zdypljigwcjb0qa5gkwiipnhpcnf9bp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody"; + sha256 = "095241sjw330fb5lk48aa4zx8xbzk8s4ml22n6a8bzr99nkhn5jy"; + name = "moody"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/moody"; + license = lib.licenses.free; + }; + }) {}; moonscript = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moonscript"; @@ -45583,12 +47768,12 @@ morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "morlock"; - version = "20161008.1358"; + version = "20180318.1323"; src = fetchFromGitHub { owner = "tarsius"; repo = "morlock"; - rev = "5845b60c705e8db88ce790b0b12cd8b917e1e5a5"; - sha256 = "1a6kwpanwcnipsq0dc99r4iiz9xa2k883syj0kbk544dxgf338xj"; + rev = "b883d48024ddfffebe2d0dd69f5ed54c617f8834"; + sha256 = "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock"; @@ -45713,8 +47898,8 @@ src = fetchFromGitHub { owner = "emacsfodder"; repo = "move-text"; - rev = "bdaf3e3a0d33cd528cad1d10facbdf0635232e4d"; - sha256 = "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1"; + rev = "7cbc941a9150468609010a93c429117da2523903"; + sha256 = "1irrcbqi1m6pcsjkbd3nqri158qhl0bcynciwwxdfqb45i67a1m9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text"; @@ -45734,8 +47919,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "bca452544b5e200034d0505a767090a975a21a28"; - sha256 = "07bjkcgy2qvnkrlb5ypgbf969ka0pchz305326r7vfswlvkvihdg"; + rev = "6121b7d4aacd18f7b24da226e61dbae054e50a7c"; + sha256 = "16j3y4hffnv2rg97p49hqz3x1icp7qkpcjxhalny5l4gysx9mfqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -45793,12 +47978,12 @@ mozc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mozc"; - version = "20160102.1506"; + version = "20180101.0"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "4767ce2f2b6a63f1f139daea6e98bc7a564d5e4e"; - sha256 = "1azx128zsr7mlg2k538483c3qi1zmm8cc4z8sk06534wnx7wxs88"; + rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8"; + sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -45895,6 +48080,48 @@ license = lib.licenses.free; }; }) {}; + mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }: + melpaBuild { + pname = "mpdel"; + version = "20180405.148"; + src = fetchFromGitHub { + owner = "mpdel"; + repo = "mpdel"; + rev = "82f98b94d0bfcb48b8ed9985ef8bf9202c8917f7"; + sha256 = "1fhcf1mm7pjjy9nyjr3lkqhn0xsp8bpykzk2pxdzfkidb1ca47bf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel"; + sha256 = "1py6zk16yl7pyql2qxzd770clzszw7c769hw70n963kns1qmpif8"; + name = "mpdel"; + }; + packageRequires = [ emacs libmpdel ]; + meta = { + homepage = "https://melpa.org/#/mpdel"; + license = lib.licenses.free; + }; + }) {}; + mpmc-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }: + melpaBuild { + pname = "mpmc-queue"; + version = "20180303.1229"; + src = fetchFromGitHub { + owner = "smizoe"; + repo = "mpmc-queue"; + rev = "df07d6bef7468edb1d73ef73b8331b94d0e5d0ca"; + sha256 = "17817l3afghg9z8jxkj61yg85plmr74ki3wf4hz685llx8fr69w0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c/recipes/mpmc-queue"; + sha256 = "08jcmhfl87nsg6zgv582yfs152bqihbcssh085gxxqn2x99li354"; + name = "mpmc-queue"; + }; + packageRequires = [ emacs queue ]; + meta = { + homepage = "https://melpa.org/#/mpmc-queue"; + license = lib.licenses.free; + }; + }) {}; mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }: melpaBuild { pname = "mpv"; @@ -45919,12 +48146,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "20170610.1044"; + version = "20171225.738"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577"; - sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk"; + rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3"; + sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -45940,12 +48167,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20170925.1338"; + version = "20180129.1637"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "546a62ada70aa89d325cc3941c8c9379a4c21553"; - sha256 = "1gbgsfd04jdw6jrsp13h13jkkac5ndrn684pl18q0wjgx9kk11b6"; + rev = "4eeb1a5115d60d064dcd79b9e0dd48619cd2ee4c"; + sha256 = "16qmqqq7297idr2x4fr22ihhx6z91484x0hpmskbh6fn05bvls2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -45982,12 +48209,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20170901.1027"; + version = "20180304.2246"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "ef90cd0f0fb6c841f326db5cad276567eb5f96b5"; - sha256 = "0sym7mp1via65h883f5h45cbfxq58qck7ypcvcfdmnmn9jnl3j9d"; + rev = "96a293b28646f4620e257f24748becc4a06843cd"; + sha256 = "01rgsd958shph01ialk0lp3snxqydvjkiik170jshfls1jric1di"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert"; @@ -46024,12 +48251,12 @@ mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20170217.40"; + version = "20171119.1125"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; - rev = "485438c466464fd4fe0c4b3305cd3110455f0f05"; - sha256 = "1rj5vcb5f2xs5wvb3z5wd4866cjdzn8lmkbk6xflqq9wrakzl1kh"; + rev = "c3ebeedd5c12e190949aed53c3040d51d21de58f"; + sha256 = "19a95f0sp5psq00mgnbw3azn9c3db3gafax3svih1qk1ff4yf3hp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-maildirs-extension"; @@ -46126,26 +48353,47 @@ license = lib.licenses.free; }; }) {}; - multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: + multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20170604.1514"; + version = "20171217.1211"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "04eeab45d19b"; - sha256 = "11mn36m40i93wig79kj1jp2i3ggck1qsfw2z9q24a1zxj2gns12i"; + rev = "a6e7c1542c0b"; + sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x"; name = "multi-project"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/multi-project"; license = lib.licenses.free; }; }) {}; + multi-run = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }: + melpaBuild { + pname = "multi-run"; + version = "20180122.709"; + src = fetchFromGitHub { + owner = "sagarjha"; + repo = "multi-run"; + rev = "3c5e44afd69aac2e0a5be118cf6249b757e2889a"; + sha256 = "0jknx6b973wlhmg01nymncqr2809kmjhchv75v92fas5yvn1pb3w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; + sha256 = "1iv4a49czdjl0slp8590f1ya0vm8g2ycnkwrdpqi3b55haaqp91h"; + name = "multi-run"; + }; + packageRequires = [ emacs window-layout ]; + meta = { + homepage = "https://melpa.org/#/multi-run"; + license = lib.licenses.free; + }; + }) {}; multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-term"; @@ -46233,12 +48481,12 @@ multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multiple-cursors"; - version = "20170908.1452"; + version = "20180406.1350"; src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "10752700084595bb24712c27ba70a2326302e45b"; - sha256 = "1hg693xq45bjxdla4drn6qn0np417hyvw6x3bmhfykg6lpibslz6"; + rev = "75dd6bf83af4eff83dc22e278c47264c1a41cd66"; + sha256 = "0cw6xcc1m4r0gdqrlj5w6kbyjwqbhhpvrrr7p4b1mhd4c2a7lhiv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; @@ -46254,12 +48502,12 @@ multitran = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multitran"; - version = "20161122.1323"; + version = "20180320.956"; src = fetchFromGitHub { owner = "zevlg"; repo = "multitran.el"; - rev = "c0ce2e1b3706263946f9240a47c3f65ed4fc0afa"; - sha256 = "1dd82jlc865achy70ldjwkjx45p11sjj0snvf85r1dj4aywci6i5"; + rev = "d826eff6ada28799a9ff6c8a4c2884b2ef1e36fb"; + sha256 = "0rk8fidq8fp9k4m21wvkld3w8g13nbfpxnj10g35c16n5wa0ydkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d665759fa6491b77103920a75c18a561f6800c1c/recipes/multitran"; @@ -46401,12 +48649,12 @@ mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; - version = "20161004.647"; + version = "20180227.852"; src = fetchFromGitHub { owner = "alezost"; repo = "mwim.el"; - rev = "e53da113b88a7e0693fd8f91862ce5948ad80a5b"; - sha256 = "0vm6iynkx328zc4ww6zjibj7impiz53g2cqzxfa8bjfs2src2sw3"; + rev = "462207227b98a6a4356d51419f5ad5ba9356e5cf"; + sha256 = "06lw6064i82daasgm87gm58d142pypqc1q3cnx1cm35hyj4skd32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; @@ -46485,12 +48733,12 @@ mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "mysql-to-org"; - version = "20170205.1306"; + version = "20180123.714"; src = fetchFromGitHub { owner = "mallt"; repo = "mysql-to-org-mode"; - rev = "d87e9b6117fc0db4b156e8a12550cf9ee4bd692a"; - sha256 = "10wz20842j6yj4k9kg7pd93pzppsc31klbfzlvlkfywqv6j311cz"; + rev = "2526205ad484ad3fa38d41e7d537ace38c27645c"; + sha256 = "1yinix08mzr7v2jm3yx1j3h15cw7i202wi100nmnmvqrylpd9zr2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org"; @@ -46531,8 +48779,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "3edcef051f882342ca769b84527bf92dfb755e14"; - sha256 = "0g9vyy639aqnk0g9rmrlszc7i0rl2f2ygnzfs4pwakgfiwig5r0c"; + rev = "aae4f50f9f22d374eaaac2ce95e522f13dcc8fc0"; + sha256 = "08xgzrpp5l5d43j1b8ai3d41jzk9i70r2pqdcj53h79ml56bicgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; @@ -46653,12 +48901,12 @@ nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nameless"; - version = "20161012.1214"; + version = "20180215.1421"; src = fetchFromGitHub { owner = "Malabarba"; repo = "Nameless"; - rev = "108f16e743aecd35401c0e914c896572cf1d5082"; - sha256 = "110bxdn2sqxlxqffaxp0yc6g2hglbv91az00mmgc01n6hjxcrc3h"; + rev = "79d7ba8e9b8f3093e93172bdb4c5a4d31b0fa3e0"; + sha256 = "11xghz03csj5w3qfbjyr48liaxr08gl6gy73hmmrq2bl57six5n0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless"; @@ -46674,12 +48922,12 @@ names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "names"; - version = "20171012.1214"; + version = "20180321.455"; src = fetchFromGitHub { owner = "Malabarba"; repo = "names"; - rev = "1d45ec50568eb2f5b55973f7ed0b48c68f9f13aa"; - sha256 = "1z0zdi9r6x6pqy2qfj9krkmbmlw9rlrgdvgn4dppfzrmrig8libr"; + rev = "d8baba5360e5253938a25d3e005455b6d2d86971"; + sha256 = "11wyha2q8y7bzqq3jrzix8n97ywvsibvddrahqcps1a1yqk4hzfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names"; @@ -46716,12 +48964,12 @@ nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nand2tetris"; - version = "20170306.1827"; + version = "20171201.1013"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; - sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; + rev = "33acee34d24b1c6a87db833b7d23449cf858f64f"; + sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris"; @@ -46737,12 +48985,12 @@ nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }: melpaBuild { pname = "nand2tetris-assembler"; - version = "20161109.1637"; + version = "20171201.1013"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; - sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; + rev = "33acee34d24b1c6a87db833b7d23449cf858f64f"; + sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler"; @@ -46778,12 +49026,12 @@ naquadah-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "naquadah-theme"; - version = "20160819.121"; + version = "20180212.440"; src = fetchFromGitHub { owner = "jd"; repo = "naquadah-theme"; - rev = "37e822ccea0ff4a6eb79ea6615a1fd6dc6c72d51"; - sha256 = "1z6fy97x9753fprvrmnmplnqwr6xl8hgvwkpi6fp6awcb0wrza3d"; + rev = "999056526db5095ce600c83672fc80cb744bd93e"; + sha256 = "1f10598m4vcpr4md6hpdvv46zi6159rajxyzrrlkiz0g94v8y6rl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/naquadah-theme"; @@ -46988,12 +49236,12 @@ ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ncl-mode"; - version = "20170903.2355"; + version = "20180128.2303"; src = fetchFromGitHub { owner = "yyr"; repo = "ncl-mode"; - rev = "84599a730169b9b19f9dcc532e20dcdc9648bbaa"; - sha256 = "0sqbrvlx9n7abn71r4hb5fgps7nm6cfyg84hjwdbkrw0cgy2w1hc"; + rev = "602292712a9e6b7e7c25155978999e77d06b7338"; + sha256 = "0sv44hn2ylick7ywpcbij8h2vxdj06zridjdmcfgpv5d090dbl9n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode"; @@ -47030,12 +49278,12 @@ neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neato-graph-bar"; - version = "20170731.2341"; + version = "20171230.1753"; src = fetchFromGitLab { owner = "RobertCochran"; repo = "neato-graph-bar"; - rev = "3ebd5168c9b8cc56cc4163206c03864b9b802f27"; - sha256 = "133k1lwmb7ky91ij03nd4vipkivvx4bz56m4waf1pdmaynsidy6j"; + rev = "c59f15ed9a40aecc174aa22c4bbfa7978e182705"; + sha256 = "0bdgsxdlwpkd3hjnw1jmj30slakzmj2pinj3pyr5qqba9apxnvri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar"; @@ -47055,8 +49303,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "847d1343e63c0a2d25a43f8432c4d750e4e9e7d0"; - sha256 = "0wriamdich72h1m0rmhx1s38ph6q8ak0rfd39kyycw7v8bvwgv08"; + rev = "59b28607968a9bee060b42eac55c69c37d1c0e69"; + sha256 = "1anbzlm7ccgd9ss6fqfq1gyvnpnjsxi9y9q3fk6c6cwd11dyq16g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle"; @@ -47072,12 +49320,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "20170711.501"; + version = "20180406.456"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "9c23289c0c8ed17d1596cfb95a5ade57df7db5f7"; - sha256 = "0q5niz0di1r0wl0lsq8hcsz854xdwpzw798sl42qc1r5mdpz3ghz"; + rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d"; + sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -47153,6 +49401,27 @@ license = lib.licenses.free; }; }) {}; + network-watch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "network-watch"; + version = "20171123.346"; + src = fetchFromGitHub { + owner = "jamiguet"; + repo = "network-watch"; + rev = "958dd0d419e4f9402648a86b754091ba346e01b8"; + sha256 = "1xqp7aghc8xd1733azl27mjf57qvm0036qbkqmaks2ip8s8c6arj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e129679b3e2074af3e3de1b2ccce53a2fa5e9f65/recipes/network-watch"; + sha256 = "0y3vjrh9vlfg44c01ylkszisliwfy5zb8c5z3qrmf3yj4q096f42"; + name = "network-watch"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/network-watch"; + license = lib.licenses.free; + }; + }) {}; never-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "never-comment"; @@ -47219,12 +49488,12 @@ ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "ng2-mode"; - version = "20170504.2007"; + version = "20180216.743"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "adbfe16a47cf26edeb1b508cbedae5307b4efbf6"; - sha256 = "0ll850wpr4dyh25mq41afwbz17mqz82i53hfn970n9vw2icf36py"; + rev = "d41ed14f276f1f08fb7eaacc863f471654e2c2fa"; + sha256 = "0rys2gnbw9d32i1gqqf46mbf36x2s9lz7v144yw901b2i8p6c5ja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; @@ -47300,15 +49569,35 @@ license = lib.licenses.free; }; }) {}; + nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nikola"; + version = "20170703.1321"; + src = fetchgit { + url = "https://git.daemons.it/drymer/nikola.el/"; + rev = "964715ac30943c9d6976999cad208dc60d09def0"; + sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef4f7c2f1c48edd7b4a6fdcda51908d216c631c/recipes/nikola"; + sha256 = "1d0a80y910klayb9jf0ahn5lj9l6xdhwcp2in3ridmqislavrcnv"; + name = "nikola"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://melpa.org/#/nikola"; + license = lib.licenses.free; + }; + }) {}; nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20171028.2219"; + version = "20180212.1040"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "10296ac3d9ee70bf31180b5158ac3b4a58f45d22"; - sha256 = "0mswc1f141xif3h4zshza0ar64s99fp6j3l795c67a3yvmc7l50v"; + rev = "bff7065f6d2419ec517d247f0f3aaf935820064e"; + sha256 = "0iqsm843msw41jxhfi7dbsj6x4qanvd84xhg2j6wl6ncabdmwnjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -47324,12 +49613,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20171110.1011"; + version = "20180410.307"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "d10740a6b9e787e7d56dc1d58b11b768cc4f79bc"; - sha256 = "1h5myqvlrniylgcrpxrsih7qkmjhh8y74ysda89p0r7ky61977r8"; + rev = "6b0c1ef6e6cec93b0d17a714406830edab8cb995"; + sha256 = "1h5c5fsg610mqi7m0ddnkvc0l4952hdjic3hpbnmjaicnhszdgfw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -47349,8 +49638,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "e234a7bdb6c42f4539c0ab09b624f191287c2c10"; - sha256 = "01hsabhvp1yilzdss3mkvrskkvxw41xxch6lkwlcrr6h5f70szi2"; + rev = "ca041d88f4d610332aa48c801342edfafb622ccb"; + sha256 = "05wipm7cvhyf1fsd5awi44yzndllfsmg0i3xzdmml545ypdimk3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -47366,12 +49655,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "20170809.1128"; + version = "20180212.718"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "b922497ea0af39fdf1a7e856d0cd2ce81d98d76f"; - sha256 = "1db0cjsq99b1z6786g3j8y39vj3gga7x6yzkilxdp7z6scs1qdwr"; + rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099"; + sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -47387,12 +49676,12 @@ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "20170831.1721"; + version = "20180403.1741"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "3294f8a2f83ace2d71f16c274a262ff76be412dc"; - sha256 = "1p1dka9v8fm6rklspkscj5rs5f21dwi3bq44d3hjqw6xva4q7bx4"; + rev = "cc23fd6a0e394aeeed603e2bfeb4a5ebc63db660"; + sha256 = "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -47531,15 +49820,36 @@ license = lib.licenses.free; }; }) {}; + no-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "no-emoji"; + version = "20171214.2310"; + src = fetchFromGitHub { + owner = "ecraven"; + repo = "no-emoji"; + rev = "329b4093bf38f3f4b0e4760c70270d3b45ee554e"; + sha256 = "1799wh6qy2yaadkdvnvp37320wxkhal8vlnj47d32a1bv8l8s91q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/af6b04c1f95468254f2cf361964df9fd25d23586/recipes/no-emoji"; + sha256 = "1lr6bzjxwn3yzw0mq36h2k2h8bqb1ngin42swhv022yx6a022zn2"; + name = "no-emoji"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/no-emoji"; + license = lib.licenses.free; + }; + }) {}; no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20171015.2358"; + version = "20180414.503"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "79c18c7efffd80446d81201b4c7dd92dde6cac3a"; - sha256 = "1xganpzb7sy5dlazjzrx9cif1r1n8lf3za0jwlq806w7601g5nym"; + rev = "9bffebc0f4858a06ba374f1d48a7dffd3537b93e"; + sha256 = "02dhplz597r5qp1mljy1npx2kzg07l938d2xivwy9cd6jlkj35ya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -47699,15 +50009,36 @@ license = lib.licenses.free; }; }) {}; + nofrils-acme-theme = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nofrils-acme-theme"; + version = "20180227.1353"; + src = fetchFromGitLab { + owner = "esessoms"; + repo = "nofrils-theme"; + rev = "0bb6f199ace1488613884075fe588f02000bb0ab"; + sha256 = "1aslhxk5mp6khf66ac4c441vywhiqpb4kyajagb8b1p10z8hrqva"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme"; + sha256 = "01xqsn8whczv34lfa9vbm5rpvrvsrlpav8pzng10jvax1a9wdp3a"; + name = "nofrils-acme-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nofrils-acme-theme"; + license = lib.licenses.free; + }; + }) {}; nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nord-theme"; - version = "20171005.1039"; + version = "20180102.1001"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-emacs"; - rev = "be32879416bbed1d6524f7c30ac53fbfa5a0e024"; - sha256 = "0q347f9bjayfl8y8vz83kjamf1lp58386nhy0iacjxsq4riwpric"; + rev = "b5c1dc762fe3acaa88a0ce9640085d45d0109c43"; + sha256 = "0j1cbwlh646gkjp70maqbq7izchgc23wdax50ykgkw3mxhjrlsf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; @@ -47720,6 +50051,27 @@ license = lib.licenses.free; }; }) {}; + nordless-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nordless-theme"; + version = "20180328.516"; + src = fetchFromGitHub { + owner = "lthms"; + repo = "nordless-theme.el"; + rev = "31cf52bfa81cf312421533ccc4a26f79b03b6976"; + sha256 = "120d5wajjcimfzdmqn1kxav5l6ylpggg9rjhv0n65nmh829f1msm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3de9da6cb8c1a75ff1d41a69e156c21be00713b6/recipes/nordless-theme"; + sha256 = "1ylvqh5hf7asdx2mn57fsaa7ncfgfzq1ss50k9665k32zvv3zksx"; + name = "nordless-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/nordless-theme"; + license = lib.licenses.free; + }; + }) {}; nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nose"; version = "20140520.948"; @@ -47741,15 +50093,15 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170927.415"; + version = "20180324.1609"; src = fetchgit { - url = "git://git.notmuchmail.org/git/notmuch"; - rev = "cf08295c503a2cefc4c51c5398f3fc1159521ff1"; - sha256 = "1vc49c5n5jdkhvy436avklcvpw6nhdk9kw9gybd6izjbrcjgy62c"; + url = "https://git.notmuchmail.org/git/notmuch"; + rev = "5d510221d17862a252955d98046508bebcd14573"; + sha256 = "1pls4wny8f5pdfgmdg4c3cpsdy046hwmlaqlf90x5x9hp2jyibnz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; - sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; + sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7"; name = "notmuch"; }; packageRequires = []; @@ -47782,12 +50134,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "20171104.1641"; + version = "20180317.345"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "7d14b6a2aa649e2213348883893a24a6a6083cb9"; - sha256 = "0l8b4847rig76d974akpkbb43i7pnhx75wmlgczqscmripspdxyb"; + rev = "b4959103619d94a7a1d5fe1d9a15887fc2b12b8f"; + sha256 = "18kqw9c2a6si1q55r7w8mmwhqfnajdxvrv9dckwxkc4pbgpjkk8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -47908,12 +50260,12 @@ nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }: melpaBuild { pname = "nu-mode"; - version = "20171112.1324"; + version = "20180220.1315"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "110f6382ca8f4a1742aa42bc1caf8eb7841b49d2"; - sha256 = "03znxrmqya446qqjp8c7fr6dx6gkx9v6v984hdp1jbki5i9i2h8j"; + rev = "9c9fcb1395a3bd317cb5433c6c4defaa9bb3c7dd"; + sha256 = "0snynh8mk1ivdphrrpznh16szw2jcagxl7w056wv7j2zmb17agcx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -48061,12 +50413,12 @@ nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nvm"; - version = "20170513.1501"; + version = "20171217.836"; src = fetchFromGitHub { owner = "rejeep"; repo = "nvm.el"; - rev = "61590e7fdeb19b1d866d26e48aef1af4767e5709"; - sha256 = "04z8zkgp0km575ijijpvmrqs0aa2f0878c5n4rl91hs1grq93mjf"; + rev = "bc0a33257ec16e9f575bb6914b5949199897ada9"; + sha256 = "07fb6xxnij3nyhvf1yfv58zglawijfr0apmgx22qgaray53rp3nw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm"; @@ -48187,12 +50539,12 @@ ob-async = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-async"; - version = "20170705.2131"; + version = "20180410.2058"; src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "fce7355a7982089c11e264ca29ab320a7e792dd1"; - sha256 = "03lgi83ym0509q1y4ar7s0d7yi80m85m1sb1rsmsv5awbsw2cym8"; + rev = "703159f106ba918ccd4e3c053eb887840aea8e5f"; + sha256 = "06aax8k3p9h49sdy47v73a851b6xwkvz97xgcrplhrpi2w77p7ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; @@ -48210,13 +50562,13 @@ pname = "ob-axiom"; version = "20171103.1548"; src = fetchgit { - url = "https://bitbucket.org/pdo/axiom-environment.git"; - rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5"; - sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0"; + url = "https://bitbucket.org/pdo/axiom-environment"; + rev = "6842fb7f85df839acde395093647e2f91cf62fdd"; + sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/ob-axiom"; - sha256 = "0ks0q4ych3770gqds7kmccvx27fay7gfygi3a9n7c01p4snfai8l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/ob-axiom"; + sha256 = "17qh4hsr3aw4d0p81px3qcbax6dv2zjhyn5n9pxqwcp2skm5vff5"; name = "ob-axiom"; }; packageRequires = [ axiom-environment emacs ]; @@ -48270,12 +50622,12 @@ ob-cfengine3 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-cfengine3"; - version = "20170915.634"; + version = "20180102.1012"; src = fetchFromGitHub { owner = "nickanderson"; repo = "ob-cfengine3"; - rev = "f38f87256efcb2b02f5c7042900087be941c1ddc"; - sha256 = "09xn84d2vy3kxk2xihjml8zzrhv2cz2jy20dg7w6ll9wn38gs33h"; + rev = "93ebcfceec3734f4bd187ae123686187d66fd401"; + sha256 = "0cyjdg8vzaf31gqsgmz5znw7v2p36jiz3sj1jvw7vhr8s4iar81i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3"; @@ -48288,6 +50640,27 @@ license = lib.licenses.free; }; }) {}; + ob-clojurescript = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ob-clojurescript"; + version = "20180406.1128"; + src = fetchFromGitLab { + owner = "statonjr"; + repo = "ob-clojurescript"; + rev = "17ee1558aa94c7b0246fd03f684884122806cfe7"; + sha256 = "1an4m7mpr345xw4fanyf2vznxm1dxbv35987caq1wq9039mzfaxr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9ccc0d2d034944cb9688d5e184fa5df95f6b31/recipes/ob-clojurescript"; + sha256 = "0h4qjz65k8m1ms7adrm5ypmjcjxx1nws1jmda88c4jjwjyz40jjf"; + name = "ob-clojurescript"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/ob-clojurescript"; + license = lib.licenses.free; + }; + }) {}; ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-coffee"; @@ -48309,22 +50682,22 @@ license = lib.licenses.free; }; }) {}; - ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ob-coffeescript = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-coffeescript"; - version = "20170719.121"; + version = "20180125.2319"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-coffeescript"; - rev = "b70f3d822c707cb02333fcb739ba4874614cad2a"; - sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd"; + rev = "5a5bb04aea9c2a6eab5b05f90f5c7cb6de7b4261"; + sha256 = "0yy20w1127xmz0mx2swbr294vg0jh8g0ibj5bpdf55xwdnv6im2l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript"; sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p"; name = "ob-coffeescript"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ob-coffeescript"; license = lib.licenses.free; @@ -48333,12 +50706,12 @@ ob-crystal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-crystal"; - version = "20171101.347"; + version = "20180125.2318"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-crystal"; - rev = "9d58b880b74e0ad83b37596bb44635e5d7ae5c3f"; - sha256 = "11qly91h6cm0qdj2dx8lvmfgp7bakrvvwf106rqh4f98y1qv22xh"; + rev = "d84c1adee4b269cdba06a97caedb8071561a09af"; + sha256 = "1fny4fj4407lcp4k3379gbixk3wd171snw49p1kny2mvxrliz22h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal"; @@ -48400,8 +50773,8 @@ src = fetchFromGitHub { owner = "mzimmerm"; repo = "ob-dart"; - rev = "2e463d83a3fe1c9c86f2040e0d22c06dfa49ecbf"; - sha256 = "0qkyyrrgs0yyqzq6ks1xcb8iwm1qfxwan1n8ichmrsbhwsc05jd3"; + rev = "04d63b922a5469506560ca0c00678e57131e0269"; + sha256 = "1r0r0dqsr44kcbj2w96rbx8alvkkfzc98ac35zb4ncy1bf71jhfb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3219b9623587365f56e9eeb4bd97f3dc449a11/recipes/ob-dart"; @@ -48463,8 +50836,8 @@ src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "ob-fsharp"; - rev = "65ec2b626ac55313d8a04e746940370f615fed1e"; - sha256 = "12k6z3zsh8av3avhl2a62v475bpxpcdy56v8i248bv1wgd3ma2mi"; + rev = "0b2fdd9bb4f38af8b5cf4914627af52f5b43d9f7"; + sha256 = "1z1m2dqnvyyv9ff289p8x1hajnz9n0mmfkrkyl1zvipaqd9mgljw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89bc8c5fe6db0573109e82b3d1350d33d6d8aff5/recipes/ob-fsharp"; @@ -48501,12 +50874,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "20170920.2251"; + version = "20180416.822"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "c4da6d47b3f96c31c00f9eaaf712b59afe00daef"; - sha256 = "0rhxp7gw4d5yp6yvjcp80in22wckj4zl9siykalj0jm97hkwqmzz"; + rev = "b68a0187e4f67e57891a3faae384d650a1cf31fc"; + sha256 = "0107xn1z2im8672lwsw4r7blza1gamgihy9aahxyf27jc0a2zvfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -48522,12 +50895,12 @@ ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-hy"; - version = "20171101.344"; + version = "20180125.2316"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-hy"; - rev = "a3512f274709dc4ab6c18d7955d361f8715505f0"; - sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw"; + rev = "44b1afb42c8a72febdbe68b6816134bc5957e5ba"; + sha256 = "0j34fsyqz28qjpggibbaqfwja10f06d9gh3pndlj6ghfx8i0plrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; @@ -48543,12 +50916,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20171111.740"; + version = "20180224.153"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "0cd6f75657df904637fbef7b540344ef5c559c3f"; - sha256 = "1rmlc6xnj6nh39rscz9963k5wlppiysibby32r314lxk6n03gj0l"; + rev = "7147455230841744fb5b95dcbe03320313a77124"; + sha256 = "1a10fc2jk37ni5sjjvf87s5nyaz2a6h2mlj5dxh4dhv5sd3bb85p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -48666,36 +51039,15 @@ license = lib.licenses.free; }; }) {}; - ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { - pname = "ob-php"; - version = "20171017.2206"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-php"; - rev = "c281c1e17f0fd7de4adb6c3e6029dc2bd76beca1"; - sha256 = "1c0967cpimmr5j7ymr4654y62f615dfrv1h3385i7n57jsvqr6bs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php"; - sha256 = "0n6m6rpd0rsk6idhxs9qf5pb6p9ch2immczj5br7h5xf1bc7x2fp"; - name = "ob-php"; - }; - packageRequires = [ org ]; - meta = { - homepage = "https://melpa.org/#/ob-php"; - license = lib.licenses.free; - }; - }) {}; ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; - version = "20170126.921"; + version = "20180328.1034"; src = fetchFromGitHub { owner = "ljos"; repo = "ob-prolog"; - rev = "e70a9f9b96fd0fedcc30de7768c870f4b0ee1ae9"; - sha256 = "0vpxnvvmfxqwq1i6wl1gv76dgavcl4sg3f1ma42sq2bldpdn8am7"; + rev = "8e34b273730423f267138e9f9a0abe7718f3a5fa"; + sha256 = "0kn4dph1wfigh9l8r8ghxgnixjxawfh335kh4ypab1hb528pdq2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; @@ -48708,27 +51060,6 @@ license = lib.licenses.free; }; }) {}; - ob-redis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { - pname = "ob-redis"; - version = "20160411.2013"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-redis"; - rev = "244a21569499a3d8cb39f651fbf00ce26accf983"; - sha256 = "1f8qz5bwz5yd3clvjc0zw3yf9m9fh5vn2gil69ay1a2n00qwkq78"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/26477b37952bc050d8904929b3a5b027a59842e6/recipes/ob-redis"; - sha256 = "1xsz4cc8cqx03ckpcwi7dc3l6v4c5mdbby37a9i0n5q6wd4r92mm"; - name = "ob-redis"; - }; - packageRequires = [ org ]; - meta = { - homepage = "https://melpa.org/#/ob-redis"; - license = lib.licenses.free; - }; - }) {}; ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }: melpaBuild { pname = "ob-restclient"; @@ -48792,27 +51123,6 @@ license = lib.licenses.free; }; }) {}; - ob-smiles = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, smiles-mode }: - melpaBuild { - pname = "ob-smiles"; - version = "20160717.421"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-smiles"; - rev = "c23c318bf8bbe2e266967388221893fbecdd2fd5"; - sha256 = "1iz8dli9i027wcg39rfabr6fx2b45waplx9mzkk1ri787rmapkpn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e377955c0c36459698aae429df0a78e84793798f/recipes/ob-smiles"; - sha256 = "0d07ph6mlbcwmw0rd18yfd35bx9w3f5mb3nifczjg7xwlm8gd7jb"; - name = "ob-smiles"; - }; - packageRequires = [ org smiles-mode ]; - meta = { - homepage = "https://melpa.org/#/ob-smiles"; - license = lib.licenses.free; - }; - }) {}; ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }: melpaBuild { pname = "ob-sml"; @@ -48834,27 +51144,6 @@ license = lib.licenses.free; }; }) {}; - ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }: - melpaBuild { - pname = "ob-spice"; - version = "20170801.2222"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-spice"; - rev = "b296232e28f61366265084fafb2f47876d987069"; - sha256 = "1s2jyx75xkqbkm9g4i3h1f0rz9ms5dbs7zqavdiswq9mr8qx1kwq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice"; - sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2"; - name = "ob-spice"; - }; - packageRequires = [ org spice-mode ]; - meta = { - homepage = "https://melpa.org/#/ob-spice"; - license = lib.licenses.free; - }; - }) {}; ob-sql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-sql-mode"; @@ -49156,8 +51445,8 @@ src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "002e047d848beb0e0b77538f0674dd171efc9d66"; - sha256 = "1al44f7nrh4jbx4vdpbps92pk6px0my43b24brinck186j8d7vc4"; + rev = "9bbd079199ef7308d4fa3cf0fafd2d7d8b4bf2d4"; + sha256 = "117xwqxnmg2f2np1zqyc8hhnxmrrd2gcixqclb5lkwk68kisjmi5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -49299,12 +51588,12 @@ olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20171102.1906"; + version = "20180308.638"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "cd2fdca25935a47a5d3b0417a206f886579f8c45"; - sha256 = "0cm630yvsdib868xl9x1ng3i64dcyzvq8pzhhaz99b7zc7wfayvh"; + rev = "b1759abbb2be27107c0c09beae10ca5e4c556b56"; + sha256 = "0zdxvd3xh5p9j8si2kfmavzdjwpz9352nr6i0c550m10lrnixnv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -49443,36 +51732,15 @@ license = lib.licenses.free; }; }) {}; - omniref = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "omniref"; - version = "20160225.1424"; - src = fetchFromGitHub { - owner = "dotemacs"; - repo = "omniref.el"; - rev = "3ab7a8b10f611f8e9e7922e7e2b42d1c73e93594"; - sha256 = "03x150c60fsw65n22ajpvjnb2w9jisds9xbxl2pwgcmvfdnxmhw9"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/163d77d2b0d7759f3747239089d8761a7db13a9e/recipes/omniref"; - sha256 = "0lgw1knqppdg046zqx4m7nbzvsasr89wa9i4594hf46w1094dabj"; - name = "omniref"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/omniref"; - license = lib.licenses.free; - }; - }) {}; 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 = "20171105.912"; + version = "20180121.702"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "ad4a19c60f7dc3d52a5b11febdcc9b78930a1e7d"; - sha256 = "0jc2ap9l0cc636kssld1bqalbriib57sw1rzz45s8r19jqa8w5gm"; + rev = "c00a3a9157432c578fffb79169232e4a81d4ad31"; + sha256 = "0ghwqf1wbiywzdx0qlgs4y94z4ivlgac8rpg1bimlb8xfx62sia0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49520,12 +51788,12 @@ on-parens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "on-parens"; - version = "20150702.1506"; + version = "20180202.1441"; src = fetchFromGitHub { owner = "willghatch"; repo = "emacs-on-parens"; - rev = "16a145bf73550d5000ffbc2725c541a8458d0d3c"; - sha256 = "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y"; + rev = "7a41bc02bcffd265f8a69ed4b4e0df3c3009aaa4"; + sha256 = "0pkc05plbjqfxrw54amlm6pzg9gcsz0nvqzprplr6rhh7ss419zn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ea1eb5eb5a40e95ba06b0a4ac89ad8843c9cc2c/recipes/on-parens"; @@ -49854,12 +52122,12 @@ org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "org-alert"; - version = "20170724.2116"; + version = "20180413.2111"; src = fetchFromGitHub { owner = "groksteve"; repo = "org-alert"; - rev = "3b7417ac12f2710e88f8dff538670621064ef8bc"; - sha256 = "1hyl4b2r7wzdfr2m7x8pgpylia3z15fihn679xdiyc32rzy7k5vk"; + rev = "85fd01f5bde7cb3adb167a8e37e52865d49c9579"; + sha256 = "1isb6ym8c22f9y2wph6zy90x9nl4g51fal68vfklg8bq1pywzj7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert"; @@ -49875,12 +52143,12 @@ org-attach-screenshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-attach-screenshot"; - version = "20160928.258"; + version = "20180330.1139"; src = fetchFromGitHub { owner = "dfeich"; repo = "org-screenshot"; - rev = "1aabac1a2885d31a3d862cbeb31a635c3d68b9ab"; - sha256 = "04fylcv782sl00g5y30hjcg9z8q00lkzf89wq9g9za6dx013z33q"; + rev = "5eeb2eef690a02b95dfe171d38ec66c954719d65"; + sha256 = "10mzlqk7in6gjh6x9q0gc5slx536hc2dz2kndm77f8qaf9z7hw79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f545cd8d1da39e7fbd61020e178de30053ba774b/recipes/org-attach-screenshot"; @@ -49959,12 +52227,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20170507.858"; + version = "20180226.1136"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "2978aee8981a2ff5c09104b2d8b055957b277078"; - sha256 = "1vbpwzzrl5vq0vwkwn0cr1w9wkfbjd9rmxbpsddm0sbx7k4m3am9"; + rev = "eef4cd47ea221dcdc352b5af578007bcde5f3e6a"; + sha256 = "1sj5n2gynwc14kl6cjmdg8mvs0nc187nfj4czd3rbz4yqq818l3b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -50001,12 +52269,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20171004.1305"; + version = "20180411.1157"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "35d46695ceffff4069e66fa2a4f039509f1a3c7e"; - sha256 = "0c0jps0gxsk3m8s78yp8141wh7g2nx8acd1jc0v4ffmlr8qi2csj"; + rev = "6857c9dcf11135eef40b8f1f86d10a71cecc86ac"; + sha256 = "092rl3vfkbj7vcn49bibc1s3m0479l0isbhb2w7xb06dh8k8j9ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -50022,12 +52290,12 @@ org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-bullets"; - version = "20140918.1137"; + version = "20171127.526"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "org-bullets"; - rev = "b70ac2ec805bcb626a6e39ea696354577c681b36"; - sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w"; + rev = "5b096148bc37306f73b27da838dca751d5b1936f"; + sha256 = "1yxikvbsbrqv9kjh1dc55w3xm44x4s7gamxq4f6jm045p8abfqrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6/recipes/org-bullets"; @@ -50043,12 +52311,12 @@ org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-caldav"; - version = "20170615.724"; + version = "20180403.1336"; src = fetchFromGitHub { owner = "dengste"; repo = "org-caldav"; - rev = "07e6ccda6756754a115d567f2ad3a760514b731d"; - sha256 = "0gaqkbdqkb7v6k2bg21c8c7c38g9rkgk8gy79s4gi6hzd4j717mp"; + rev = "8d3492c27a09f437d2d94f2736c56d7652e87aa0"; + sha256 = "19q83xgbdabkidx26xvff1x7kixk2wllplnwfsy7kggdj9wqpm9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav"; @@ -50089,8 +52357,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "8cec702f602b18da90b3d6207888a887b8e07750"; - sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; + rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6"; + sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; @@ -50103,6 +52371,27 @@ license = lib.licenses.free; }; }) {}; + org-chef = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-chef"; + version = "20180325.628"; + src = fetchFromGitHub { + owner = "Chobbes"; + repo = "org-chef"; + rev = "36fc59b4181456d7bd4c8227c34edbad600b08f3"; + sha256 = "0yvrxl24a0q4wbhmx2azsylwapih0xf6a5rhch3ppzhy4vyrdjcf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/23b9e64887a290fca7c7ab2718f627f8d728575f/recipes/org-chef"; + sha256 = "1xzbdrv5z31lxnzzgbp50l10lzlvx6j7kc7ssg76fma49wfpnra5"; + name = "org-chef"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-chef"; + license = lib.licenses.free; + }; + }) {}; org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-cliplink"; @@ -50148,12 +52437,12 @@ org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-clock-csv"; - version = "20170904.1745"; + version = "20180313.1957"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6"; - sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm"; + rev = "4a6e9e4895799afa0b994f4a908c1e3c2043451f"; + sha256 = "1f7xvarimv82xwiw5cavnak7av0yi4afn94nhhp60pyfh8azls50"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; @@ -50253,12 +52542,12 @@ org-dashboard = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-dashboard"; - version = "20160929.941"; + version = "20171223.1124"; src = fetchFromGitHub { owner = "bard"; repo = "org-dashboard"; - rev = "f9cd3b979166a3713aea48b1a1e6aaea2e7c7a05"; - sha256 = "1n78775h5mvqki2idkbwais37g2alblz1fzrsrgr3vvcd83g3i98"; + rev = "02c0699771d199075a286e4502340ca6e7c9e831"; + sha256 = "0zi23xgv5fq827dljhzp6m2v7ggr3pdw3fpgq8515gs9q4f12v1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11ce0ba772672d9cbae5713ebaf3798eec5fdb3c/recipes/org-dashboard"; @@ -50316,12 +52605,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20171107.1115"; + version = "20180327.1429"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "c75095778c02e70fc7efa2aac5c77936b56d04db"; - sha256 = "0c38npgy17v93yw4zixvwyx89mpy4j86rk7911bjwivn8xp3vjk2"; + rev = "a57beffd0f09b218a9487d1750960878c1d5b12c"; + sha256 = "1disqqfwjl366kv6xgc28w7zbc4xl9a0jmdj7w27mb00sxzfk3vb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -50337,12 +52626,12 @@ org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-dp"; - version = "20160326.603"; + version = "20180311.123"; src = fetchFromGitHub { owner = "tj64"; repo = "org-dp"; - rev = "d9a18e8fb04c94d5d35236b37ee7db0afcb7d580"; - sha256 = "0misv6g1cql7qc3xhy56cn79pzvn811fvhvivvq0bdx4g0hpp2fg"; + rev = "334fefd06eb925c86b1642787b2a088aa0932bab"; + sha256 = "0cjx9428ypadvrlbfnfj6zwnfhdcay82q2f9x8v5gaffa6wrr7j3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f337375082da316ed07b8ce9c775b484b8cdbf6/recipes/org-dp"; @@ -50355,22 +52644,22 @@ license = lib.licenses.free; }; }) {}; - org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }: + org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-drill-table"; - version = "20170408.1205"; + version = "20180115.209"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "org-drill-table"; - rev = "5662511e98697e086149a223a64f9f01fabf7330"; - sha256 = "1bd9wifw57v31bihqrq5305a5xmjq980crlnqak0l9pksjkbw2bx"; + rev = "096387d929bcf3eb479e0a9d5da9cf32c756a759"; + sha256 = "1a8ygrcag8i9hdpy2vsn0sh8lwhl9b56rv91j3rddy1jv5qx1ipb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3347da186765877826b224e1f5d1b585ebd3692c/recipes/org-drill-table"; sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69"; name = "org-drill-table"; }; - packageRequires = [ cl-lib dash emacs org-plus-contrib s ]; + packageRequires = [ cl-lib dash emacs org s ]; meta = { homepage = "https://melpa.org/#/org-drill-table"; license = lib.licenses.free; @@ -50484,12 +52773,12 @@ org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: melpaBuild { pname = "org-evil"; - version = "20171102.556"; + version = "20180416.953"; src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "org-evil"; - rev = "90a82ec72fb688ef98d1343c02dc3c6da9e4bbee"; - sha256 = "0fl9m1bgcmvxpdmb05lbna9snfrd8gbrn16c2w72b3asxx7acq94"; + rev = "4e1f949a6fb225e79e69cb8684c0629671b6b8e3"; + sha256 = "1nrcwjl50nycyraac2zwlx3346az7521icf1h718hqqw4r799ggk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; @@ -50502,23 +52791,24 @@ license = lib.licenses.free; }; }) {}; - org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: + org-fancy-priorities = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "org-fstree"; - version = "20090723.819"; - src = fetchgit { - url = "http://repo.or.cz/r/org-fstree.git"; - rev = "24e305c6443be9f45198185772eecfddc390a9ce"; - sha256 = "0ydsmjjc64r50qilgazmv5gzdv67vszlid67wskc2zii5ss0y01m"; + pname = "org-fancy-priorities"; + version = "20180328.1631"; + src = fetchFromGitHub { + owner = "harrybournis"; + repo = "org-fancy-priorities"; + rev = "819bb993b71e7253cefef7047306ab4e0f9d0a86"; + sha256 = "13cyzlx0415i953prq6ch7r5iy23c1pz116bdxi5yqags4igh4wv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/org-fstree"; - sha256 = "11ddkfddmsy26mmhgw24757f753ssh056v9vxn89pxp4qypxidfz"; - name = "org-fstree"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/712902ae1cf967ceb2052266ed3244e92998f8a7/recipes/org-fancy-priorities"; + sha256 = "13rljgi5fbzlc16cxqj49yg47a5qpyxzj0lswhdyhgzncp1fyq7p"; + name = "org-fancy-priorities"; }; packageRequires = []; meta = { - homepage = "https://melpa.org/#/org-fstree"; + homepage = "https://melpa.org/#/org-fancy-priorities"; license = lib.licenses.free; }; }) {}; @@ -50606,6 +52896,27 @@ license = lib.licenses.free; }; }) {}; + org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-index"; + version = "20180414.208"; + src = fetchFromGitHub { + owner = "marcihm"; + repo = "org-index"; + rev = "0dfe0a67979279345378ca006ab4f727df378aca"; + sha256 = "16wjzskq000grkanaw9zca2qbw9yzpndhfd2g0b0if2mf1g31mkv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index"; + sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5"; + name = "org-index"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-index"; + license = lib.licenses.free; + }; + }) {}; org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }: melpaBuild { pname = "org-iv"; @@ -50627,48 +52938,69 @@ license = lib.licenses.free; }; }) {}; - org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "org-jira"; - version = "20171105.2011"; + version = "20180103.1813"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "acad51a1efbdab58975aebe7cb69bdd6556bc44f"; - sha256 = "1y183bsjdxlfi22xd7kd1w5xa3qnmgf7063083f977sf5z9afsyy"; + rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7"; + sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib"; name = "org-jira"; }; - packageRequires = [ cl-lib emacs request ]; + packageRequires = [ cl-lib emacs request s ]; meta = { homepage = "https://melpa.org/#/org-jira"; license = lib.licenses.free; }; }) {}; - org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-journal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20171113.53"; + version = "20180402.536"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "44a52a20a154d5c1a78684ef720972c4fe36b64a"; - sha256 = "0c4jwh53mgy4qpv7aiwbsbvjjhchyfjb0ca5ny5875ljvkq59qz6"; + rev = "f24d6c5e71954fd1a748e719b9b4b51f77879800"; + sha256 = "10cqri6k3lvsngwg060nj4n15ip54h3ldlyxgnknmp6wl0vjsjr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b"; name = "org-journal"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/org-journal"; license = lib.licenses.free; }; }) {}; + org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-kanban"; + version = "20180410.1258"; + src = fetchFromGitHub { + owner = "gizmomogwai"; + repo = "org-kanban"; + rev = "d5f6c82c1f4072f5800b01b724ee980ea0373d0a"; + sha256 = "1xqx3iqv627wkpyz8b3frxgdm2y2zicfd5ansxw9yg2q7dxs6bff"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban"; + sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41"; + name = "org-kanban"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/org-kanban"; + license = lib.licenses.free; + }; + }) {}; org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-link-minor-mode"; @@ -50735,12 +53067,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20171105.1440"; + version = "20180407.1820"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "64a3f56651369b2a8b0a601abea1cf1216db2ded"; - sha256 = "0jvknbiilik3dwkz1kpjf7ac1fqkdh74pljzpyxxyg3slqha0d50"; + rev = "41ea9818b4e35555fac5d287a3f8bbf84c694005"; + sha256 = "148mw7wik58756k072p3frlb0hdy6sc2jsqgjzhp5pqsmd1chg7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -50756,12 +53088,12 @@ org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-mind-map"; - version = "20171109.1238"; + version = "20171206.645"; src = fetchFromGitHub { owner = "theodorewiles"; repo = "org-mind-map"; - rev = "9d6e262bedd94daf9de269f4d56de277275677cb"; - sha256 = "0jgkkgq7g64zckrmjib0hvz0qy3ynz5vz13qbmlpf096l3bb65wn"; + rev = "d7854dbd30d565d3087d2810d6a77cc882988eae"; + sha256 = "0jkm6ar07m399hqanjpw6y7bxdr59j72skmi9ncgjyb81ch70g36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map"; @@ -50798,12 +53130,12 @@ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mru-clock"; - version = "20171101.506"; + version = "20180219.359"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832"; - sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q"; + rev = "18301b6ffe1149e373dc07d5047b67b9e1faec64"; + sha256 = "13x25fk2wnddzgx11rmkrhpvaava0knaqhlhk36c6pyldbhbhbxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -50844,8 +53176,8 @@ src = fetchFromGitHub { owner = "Rahi374"; repo = "org-notebook"; - rev = "d90c4aeca2442161e6dd89de175561af85aace03"; - sha256 = "15hf0x0v4fz6gxj8qx9pfm6xic7qni33nn4ga6cxbdgpwgyr61wz"; + rev = "86042d866bf441e2c9bb51f995e5994141b78517"; + sha256 = "0znxn6zzc9645m3wmkryf4xwjskf7gwylrg6z2kmr1wpjlpfwb01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook"; @@ -50858,6 +53190,27 @@ license = lib.licenses.free; }; }) {}; + org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-noter"; + version = "20180331.1231"; + src = fetchFromGitHub { + owner = "weirdNox"; + repo = "org-noter"; + rev = "32cdf41079ca67c5906a10215eb7fbaefebab994"; + sha256 = "11hhw8fk1qn63hwdx49h9h58p2hmxhmni6qdazd0ipk68finmy8f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; + sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf"; + name = "org-noter"; + }; + packageRequires = [ cl-lib emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-noter"; + license = lib.licenses.free; + }; + }) {}; org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }: melpaBuild { pname = "org-octopress"; @@ -50974,11 +53327,11 @@ org-password-manager = callPackage ({ dash, fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-password-manager"; - version = "20170701.919"; + version = "20180227.1010"; src = fetchgit { url = "https://git.leafac.com/org-password-manager"; - rev = "3e7058586b2ab96b12e9b1195b1db1e66e704f20"; - sha256 = "0ac0nd84y8lckapyckbdvc1wdflwz5nxm7isxcc8cp92pgqy49r2"; + rev = "4b30a36e71182553a02e4dd415369290d98ec03a"; + sha256 = "1a6i3g032c5xzsnaf7rprn22kk68y1ay3w21p3q52p3lvlzhnfis"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; @@ -50994,12 +53347,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20161130.1053"; + version = "20180225.206"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "9de96eef6f187a10cd910e3bc3eb274d38856819"; - sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"; + rev = "09ef4bf8ff8319c1ac78046c7e6b89f6a0beb82c"; + sha256 = "15zxdq6f6w3l8pzg3b58cj37z61dx106jwslpqni71m8wczdqkz1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview"; @@ -51036,12 +53389,12 @@ org-present = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-present"; - version = "20141109.1756"; + version = "20180303.1530"; src = fetchFromGitHub { owner = "rlister"; repo = "org-present"; - rev = "1b519cfd5abf44bed307cac576dc9fd61eb2c35f"; - sha256 = "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm"; + rev = "d13acd70eff6a1608bc991920232146a0de76b21"; + sha256 = "0jz8xiny3rv9ql0p623byz32pip1b82j2c2nyfz2wd114kiabb6q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aba18f15fbaab115456e6afc9433074558a379f5/recipes/org-present"; @@ -51082,8 +53435,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "8cec702f602b18da90b3d6207888a887b8e07750"; - sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; + rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6"; + sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -51103,8 +53456,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "8cec702f602b18da90b3d6207888a887b8e07750"; - sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; + rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6"; + sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; @@ -51138,15 +53491,36 @@ license = lib.licenses.free; }; }) {}; + org-radiobutton = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-radiobutton"; + version = "20180321.1535"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "org-radiobutton"; + rev = "15777e9b389cd93eab6c3c2f967e64a5b7f247b0"; + sha256 = "1mysrs3m9bmw66r4hrh2bssfhgp56rbhnkcc4rm4d5slsbak10fz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/105043d8cfcb62ed89ddf9870f615519e6f415e7/recipes/org-radiobutton"; + sha256 = "16ly42iyfh7d34yz4bvdpj3zrlwkw3kmh82gwr25a05mlsdc1d93"; + name = "org-radiobutton"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/org-radiobutton"; + license = lib.licenses.free; + }; + }) {}; org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "20170404.318"; + version = "20180312.104"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "8b784ff0419fcaa2467991bc670e0e8e31be62c0"; - sha256 = "14lsc6a9ddfd69x06z3ia9mlvac2p8iwvxbfnbmn2m49lijs8724"; + rev = "8357350a66bbc4e0e5cb590acc104d39870cf736"; + sha256 = "1cl1abgflbnnmvakb1z69rpr2gsm3hyg20iggwl6pn2fl0pf5wf5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -51159,6 +53533,27 @@ license = lib.licenses.free; }; }) {}; + org-randomnote = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-randomnote"; + version = "20171210.557"; + src = fetchFromGitHub { + owner = "mwfogleman"; + repo = "org-randomnote"; + rev = "c89eb4cf625ea7e7624b6a2d3d5676ce25ab03d7"; + sha256 = "05ap1kbq5cwak70jlm3m0pvbax75kg3281qxs5flz3qbkfsbg3h2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d92cb392b23701948176ba12516df5ae6608e950/recipes/org-randomnote"; + sha256 = "06i42ig7icap1i1mqzv5cqwhnmsrzpjmjbjjn49nv26ljr3mjw0b"; + name = "org-randomnote"; + }; + packageRequires = [ dash f ]; + meta = { + homepage = "https://melpa.org/#/org-randomnote"; + license = lib.licenses.free; + }; + }) {}; org-readme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }: melpaBuild { pname = "org-readme"; @@ -51228,15 +53623,15 @@ license = lib.licenses.free; }; }) {}; - org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: + org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, htmlize, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20171019.724"; + version = "20180409.813"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "8fb1275b4c0e2dd46593754e497940c49fd9da6b"; - sha256 = "0jha5qlab3gsyl8iysf1kqn2f15afvqjvnl2nyzh47llqng8yskj"; + rev = "57e14a9e1c91c47fc46eb63b51e0b6585dfec977"; + sha256 = "129g1yzx5qkmy4s44czmmdk5ffvv9kdn0kpxcky56ndsyvnkz35p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51249,6 +53644,7 @@ f helm helm-bibtex + htmlize hydra ivy key-chord @@ -51263,12 +53659,12 @@ org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-repo-todo"; - version = "20160307.1029"; + version = "20171227.1719"; src = fetchFromGitHub { owner = "waymondo"; repo = "org-repo-todo"; - rev = "b164bacefcd3c55dd40cd1a9e91ffefd315b400d"; - sha256 = "0as82hf81czks9fcmhy9wjwl8d4mbylrm13c02y8abp0am41r28f"; + rev = "f73ebd91399c5760ad52c6ad9033de1066042003"; + sha256 = "0c74zwmac8x1y8jimdx473v0falpky2kfig8pnaxavz415gb315q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo"; @@ -51302,6 +53698,27 @@ license = lib.licenses.free; }; }) {}; + org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-rich-yank"; + version = "20180325.1218"; + src = fetchFromGitHub { + owner = "unhammer"; + repo = "org-rich-yank"; + rev = "ba7eb7ba8d25dbf053b1f746061a4442375da437"; + sha256 = "0c6prl8wk9cf9rnr9ymwj50zv0gahbrwqjdqn0a46sflsaycb07i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank"; + sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y"; + name = "org-rich-yank"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-rich-yank"; + license = lib.licenses.free; + }; + }) {}; org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }: melpaBuild { pname = "org-rtm"; @@ -51344,15 +53761,36 @@ license = lib.licenses.free; }; }) {}; + org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "org-send-ebook"; + version = "20180401.1015"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "org-send-ebook"; + rev = "efa80f3c1a26347097a16eca4dda2610627fcdf0"; + sha256 = "097cpr9v0c03117z76cy0b9faq3zjvi45anvgrw4bkbgs5mh9x2l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook"; + sha256 = "0gvnrl4rfqn3zd0wmj4bhd63zkjk68lwwcgmsqrfw7af22wlfv3d"; + name = "org-send-ebook"; + }; + packageRequires = [ cl-lib emacs seq ]; + meta = { + homepage = "https://melpa.org/#/org-send-ebook"; + license = lib.licenses.free; + }; + }) {}; org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; - version = "20170706.646"; + version = "20180402.237"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "9dea733006ae53902e6ec91fb11ff058229afe84"; - sha256 = "0gyhhcr54myg0r4pjc5z4mkmpc2xnw3ymykz3m0sm589q1i1ym34"; + rev = "0ce09a3c27f6ea862b6dd121cb16a192cee0e9c4"; + sha256 = "07hx4d8a2m7kj151zjc0920l6h0c0d7jgvravp2n5rgcb76yrlnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; @@ -51410,12 +53848,12 @@ org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync"; - version = "20150817.754"; + version = "20180221.1127"; src = fetchFromGitHub { owner = "arbox"; repo = "org-sync"; - rev = "7f02167ef805cd76def274be4d3bd0c6e41d9af8"; - sha256 = "18v56lrscpzxq5prigd1pjkx990xf57pzf1d2yj6r1grqfz235yy"; + rev = "095335063b306871970f981898a220f62ad0ae4e"; + sha256 = "0p4xmlhv9xsa111yrgmfl5laznmj9ijpsifqcxmplrf5ckzqbdkn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync"; @@ -51620,12 +54058,12 @@ org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-tree-slide"; - version = "20160513.2325"; + version = "20171129.2238"; src = fetchFromGitHub { owner = "takaxp"; repo = "org-tree-slide"; - rev = "fed7ec7e6df59cffcdb4c13a9345f4d828404dd8"; - sha256 = "0b97jqskn5c2cbah3qj9bi5was31sijrp01dca36g5y53lpz7n79"; + rev = "9f1b898223f3dafd15a384e0d06da8f09bd55cb0"; + sha256 = "097p6wyx8fabwmsg8nvv8zlmk6fr8wgbckn5pz8vdzjwp0kbi3s5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6160c259bc4bbcf3b98c220222430f798ee6463f/recipes/org-tree-slide"; @@ -51641,12 +54079,12 @@ org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: melpaBuild { pname = "org-trello"; - version = "20170225.1247"; + version = "20180330.2331"; src = fetchFromGitHub { owner = "org-trello"; repo = "org-trello"; - rev = "d7885038d7e160a64f561f8abc942206d582faa6"; - sha256 = "091hznr9pznm26p5vm0kav69qkji6hihf6bil0a314d8k0kaj5bc"; + rev = "e2e8a3d45057645e4caae7d46a79d2d9be2894bd"; + sha256 = "12yw54hg1lhfxw6mvxjsvbiv7cg1zwm3ccsl7g127vbf0yp2dhrl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello"; @@ -51683,12 +54121,12 @@ org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wc"; - version = "20170727.1911"; + version = "20180415.2219"; src = fetchFromGitHub { owner = "tesujimath"; repo = "org-wc"; - rev = "d294ad7117c150445e6166fc0d88c14a8386f34e"; - sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl"; + rev = "d22b4cff3e1157ca468b186eb789ca62b9214abd"; + sha256 = "0ysnydpm6lviak3mrqifim4zs2lffbjiv9nvb33qs8mi1dq2igji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc"; @@ -51701,27 +54139,48 @@ license = lib.licenses.free; }; }) {}; - org-web-tools = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: + org-web-tools = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-web-tools"; - version = "20171014.804"; + version = "20180117.1915"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-web-tools"; - rev = "e9583248e838806271643770102e786671fabaf5"; - sha256 = "07kdgkkl3f7w1nxdw1j7vcm2f05sdpd06dlw7vpdd77pdbwafp3h"; + rev = "8d2e7556947f6647f55e41ed3ad3710878631fb3"; + sha256 = "1wx85ah89x2fg69kn2ilk950dnz5asmq205kar95c3rrxymf4yia"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools"; sha256 = "19zpspap85fjqg5a20ps34rcigb0ws986pj6dzd7xik8s6ia29s7"; name = "org-web-tools"; }; - packageRequires = [ dash emacs org s ]; + packageRequires = [ dash emacs esxml org s ]; meta = { homepage = "https://melpa.org/#/org-web-tools"; license = lib.licenses.free; }; }) {}; + org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-wild-notifier"; + version = "20180221.2025"; + src = fetchFromGitHub { + owner = "akhramov"; + repo = "org-wild-notifier.el"; + rev = "d0df145d9bbb72b2c315b7d8007cb6a59fea2095"; + sha256 = "1xcnb5x539776b6ljd9qyl9jadp2r4qg805m4m8yfz9sk00dv7yl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; + sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; + name = "org-wild-notifier"; + }; + packageRequires = [ alert dash emacs ]; + meta = { + homepage = "https://melpa.org/#/org-wild-notifier"; + license = lib.licenses.free; + }; + }) {}; org-wunderlist = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred, s }: melpaBuild { pname = "org-wunderlist"; @@ -51746,12 +54205,12 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20170826.1843"; + version = "20171218.1911"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "62a6400746847f246e12493271f0bb52f7465a92"; - sha256 = "1xnb6yd5ny5i6hvzxfsnga5m75si5y8vc1j3vfs42r99s2ns8yid"; + rev = "aa7a5730f4a58a53c41370dcde7bec43d5c1a2cd"; + sha256 = "1ivf156186myr84rqbd8rn6wa8qjrip7la6sgc8k6ggg6lzvkqac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; @@ -51923,12 +54382,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20170731.1003"; + version = "20180318.1301"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663"; - sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf"; + rev = "d909f92d3b1b42184143fd5e6d4c6a2762477ab7"; + sha256 = "1jdc874bxkpbfpllak3vmfsn82p930s565bzff341vzv7aw2528c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -51944,12 +54403,12 @@ orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglink"; - version = "20161104.1800"; + version = "20180318.1323"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "50debcf3508d2252bdce35c8822af1b3a81fd2dd"; - sha256 = "1b86c4pyc7cs02lrhnk93gh3czp9wajm17wd9mhszcbdn996rnhz"; + rev = "e9e90e16ddaceaf99c9b251a215d6338b9762b4d"; + sha256 = "0vqyidi54rbpqwqi6iv1xaqkr9gfr0pfhr1msxckh8jy6avgy319"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; @@ -51962,22 +54421,22 @@ license = lib.licenses.free; }; }) {}; - orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org, org-mac-link }: + orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglue"; - version = "20150503.114"; + version = "20171220.426"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "orglue"; - rev = "1274652d527cb6afe45d1acb79f41be5a2886ee4"; - sha256 = "0qf2k89nldfm3njcnygh8ak8fz5m9ykmpzfx1cnfffxcyi139s9f"; + rev = "ae2a45c19b52e45db7891093a3ff17ba2e51c507"; + sha256 = "0h3b37wz4hlk022c0sq7c9p5z3v4n6cljhy8g1qjhnxac8y7mkr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue"; sha256 = "1kj62y3cf3as2d5s207s6kg5alm09jmw0aag1z6lblrjlzbi1p2j"; name = "orglue"; }; - packageRequires = [ epic org org-mac-link ]; + packageRequires = [ epic org ]; meta = { homepage = "https://melpa.org/#/orglue"; license = lib.licenses.free; @@ -52088,22 +54547,22 @@ license = lib.licenses.free; }; }) {}; - origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + origami = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "origami"; - version = "20170129.805"; + version = "20180101.753"; src = fetchFromGitHub { owner = "gregsexton"; repo = "origami.el"; - rev = "5630536d04613476e13b413fe05fd0bbff4107ca"; - sha256 = "1w6cyyvjw6x4x0a7mbybw37f70cdnwajv8snvmnrqd73vggm70fd"; + rev = "1f38085c8f9af7842765ed63f7d6dfe4dab59366"; + sha256 = "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami"; sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr"; name = "origami"; }; - packageRequires = [ dash emacs s ]; + packageRequires = [ cl-lib dash emacs s ]; meta = { homepage = "https://melpa.org/#/origami"; license = lib.licenses.free; @@ -52235,27 +54694,6 @@ license = lib.licenses.free; }; }) {}; - osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "osx-plist"; - version = "20101130.448"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "osx-plist"; - rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0"; - sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f3686dc818bd12be247bad915c01736a95690041/recipes/osx-plist"; - sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8"; - name = "osx-plist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/osx-plist"; - license = lib.licenses.free; - }; - }) {}; osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-pseudo-daemon"; @@ -52319,6 +54757,27 @@ license = lib.licenses.free; }; }) {}; + other-emacs-eval = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "other-emacs-eval"; + version = "20180408.648"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "other-emacs-eval"; + rev = "8ace5acafef65daabf0c6619eff60733d7f5d792"; + sha256 = "1pry1xw2p01b18ks5n0xs895qqqci7v2nrwjiil2vr3m1ys92ymc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/75b6391726b0d5069e036930c2c5fa177c4e3422/recipes/other-emacs-eval"; + sha256 = "07sr5bb6x9w450cvfg32darg6jlwg11n7c1qhhk0ijcrnlsm09n7"; + name = "other-emacs-eval"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://melpa.org/#/other-emacs-eval"; + license = lib.licenses.free; + }; + }) {}; outline-magic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outline-magic"; @@ -52382,6 +54841,27 @@ license = lib.licenses.free; }; }) {}; + outlook = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "outlook"; + version = "20180330.458"; + src = fetchFromGitHub { + owner = "asavonic"; + repo = "outlook.el"; + rev = "77f5199f573a67700cb8d4f736cea5b6bda8ab0c"; + sha256 = "0rhivgwqnfdvcl5vh9lmg6yaz36bhkvfmj590qxcq18zj1529mfh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5ce3e6800213b117578a1022f25407f2ec1604f/recipes/outlook"; + sha256 = "0yq9zl7dr8kkm4rps5np4dwvjfhzsxq9wd1af7zwcmms4l3qry6k"; + name = "outlook"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/outlook"; + license = lib.licenses.free; + }; + }) {}; outorg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outorg"; @@ -52406,12 +54886,12 @@ outrespace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outrespace"; - version = "20170904.511"; + version = "20180126.857"; src = fetchFromGitHub { owner = "articuluxe"; repo = "outrespace"; - rev = "cf2a397971f82c87dcfbe3400e3e7c2de79fa68e"; - sha256 = "1rxyyvax3f0fh3k8majkhpdrnlqg4pg7hl68q61csiccayx04213"; + rev = "5c3e036e0d72889b5084c67eeac317e88b1bf2f6"; + sha256 = "025lgvy8m70m72zxzdsdxgsayi3hr0hfp076mf0b97zfcw6h87c3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace"; @@ -52466,15 +54946,36 @@ license = lib.licenses.free; }; }) {}; + overcast-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "overcast-theme"; + version = "20180315.1243"; + src = fetchFromGitHub { + owner = "myTerminal"; + repo = "overcast-theme"; + rev = "009257956522dedf07d9e136ee41ac0b1b0b3518"; + sha256 = "1g3s44n839s7fw3spkph31m0a5walilj151v0jyp302mjfn396nh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme"; + sha256 = "1v8hdnvc4pfmadkvdm6b8z0cy20pminvhjdlr13q5m9immr88a4r"; + name = "overcast-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/overcast-theme"; + license = lib.licenses.free; + }; + }) {}; overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "overseer"; - version = "20170207.2241"; + version = "20180225.2219"; src = fetchFromGitHub { owner = "tonini"; repo = "overseer.el"; - rev = "6be1f2a4df1b7a20298865b85502ee89e327898d"; - sha256 = "0ipq5gflymvznb8xzfl524l09sj90787bzga9ymjjpc4rn9zmqlb"; + rev = "02d49f582e80e36b4334c9187801c5ecfb027789"; + sha256 = "0q4ai7ividy8xv09s342y49s97ismhfdfsjk70zif60fp0ajfzfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer"; @@ -52553,12 +55054,12 @@ ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }: melpaBuild { pname = "ox-clip"; - version = "20170805.505"; + version = "20180305.1940"; src = fetchFromGitHub { owner = "jkitchin"; repo = "ox-clip"; - rev = "b596760aec2ab4e10b18807c01839047aa209d6e"; - sha256 = "0bd5vbbz0p0dg5v7s54a88ba7aca53xwr8niirshfkm916lc8mpy"; + rev = "594c90953a91948505bb394350adf110e041f19a"; + sha256 = "1alm6hh7qg8sv50cm5p03icx47za2g7b2nvbwzx6kxkrgmgqfq6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip"; @@ -52574,12 +55075,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "20171105.0"; + version = "20171202.1713"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "31ed40ad3f0b3166cb3e772f8689b12d7f2cfe1b"; - sha256 = "1p9pdm3mhwf5ldl0g4c8kf8iqwzqg0f88qd0nmw33mm8mvikvv1h"; + rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d"; + sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -52637,12 +55138,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20171111.2310"; + version = "20180403.1111"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "f770883072e80c619204e586218b6543cda5e24b"; - sha256 = "1az3ivzs5x6d49kqc1l6d2g3ypp3x2rc5dq5ys5bw6mcl26ykq0k"; + rev = "15a6df059f5eac0964c075c1386ce1c83cfe979d"; + sha256 = "11vndvwq64s7kc8a706favp7x7jc59sqwgs00sknfzznmpyy0xki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -52718,36 +55219,15 @@ license = lib.licenses.free; }; }) {}; - ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ox-latex-chinese"; - version = "20171014.1532"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "ox-latex-chinese"; - rev = "3af3872c5435b6d4feccd0fd2bac32cd156724dd"; - sha256 = "06b3k3c407dvj0gx73w8wspy2mndl1q2s9wlq4g6hs2v4i2pd9dd"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese"; - sha256 = "138yprik36jxhm6dnj42gaynqd84w7ya3s0kbnxhbizrfl4n4ck7"; - name = "ox-latex-chinese"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://melpa.org/#/ox-latex-chinese"; - license = lib.licenses.free; - }; - }) {}; ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ox-mediawiki"; - version = "20161228.850"; + version = "20180105.1354"; src = fetchFromGitHub { owner = "tomalexander"; repo = "orgmode-mediawiki"; - rev = "9e13392fe88817564f46a7a9f1eadebf54a2c346"; - sha256 = "1x584gbwr1jhbxgzmjr6z801lqzqcaqzypkz25zz2spmh4n8fz9f"; + rev = "a9327150293e370e500ba55bddfe5fc435c6bf9b"; + sha256 = "0dsq86hli24imdkgsf45asx23kriw9di3d0cf5z8axfpkcbkn770"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24244d146306ce965df382c8958c7574c74313f2/recipes/ox-mediawiki"; @@ -52763,12 +55243,12 @@ ox-minutes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-minutes"; - version = "20170323.835"; + version = "20180202.934"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-minutes"; - rev = "ad9632f35524ac546c6d55dfa827e8597669e1e1"; - sha256 = "07knwl6d85sygqyvc7pm23y7v4nraiq1wl1b7szkzi2knd8wzi0s"; + rev = "27c29f3fdb9181322ae56f8bace8d95e621230e5"; + sha256 = "10rw12gmg3d6fvkqijmjnk5bdpigvm8fy34435mwg7raw0gmlq75"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/162d0dacbb7252508147edb52fe33b1927a6bd69/recipes/ox-minutes"; @@ -52809,8 +55289,8 @@ src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "55861adfceeae436deeae8402f545b771ad3484b"; - sha256 = "1pvijswwx3a4bb1z32kk9x70ba07zr2wjr913ri8gp81kj84zb0x"; + rev = "cd3c59f6c0ea49e0cac31d8392a5bbac02886d8f"; + sha256 = "04wppfxjm43bc5c8i5l5kbpln7rhifgqrmbjbxdbqd3vl4lpcnzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc"; @@ -52889,12 +55369,12 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20171004.1553"; + version = "20180314.1713"; src = fetchFromGitHub { owner = "msnoigrs"; repo = "ox-rst"; - rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928"; - sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj"; + rev = "a74b60883b0d844c80efb364dac1560b85f2548f"; + sha256 = "0smgz2q7bjj2svx1gdr187m58yxq1hs878bciz9h6jcp03a9sb61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst"; @@ -52910,12 +55390,12 @@ ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-textile"; - version = "20170907.351"; + version = "20180110.516"; src = fetchFromGitHub { owner = "yashi"; repo = "org-textile"; - rev = "04bcaa64a0c5a099bd7adae5e6584cfa685b2b67"; - sha256 = "1z1574n6br5rabv9g5qcwk49lx05a4j1gzl3hc2axkxdrrm4m6kk"; + rev = "0af57d17c93049bf7533061863f711d13fbed891"; + sha256 = "17jgb5bn3c4q4gasb2xas5bs3mrd1drnizgbqpnc50c8jfmcr4kd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a68a7a99ecce8f1afa03e72ff1f636edaf5868/recipes/ox-textile"; @@ -53078,12 +55558,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20171020.1419"; + version = "20180414.938"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "e4d174870ea40275a8bc35996416326cf28051f9"; - sha256 = "00p7hrcb2ivk6sjxqccbpswjsk5rj02nyd29d2nd6b8r3fskskzp"; + rev = "cf202c0a93bd5aabea59d16ad7ddf8c292c05990"; + sha256 = "18icx58yqig4c7zdvjz8jrhilbv5ygdyl56473mz1zyhvb3q42xy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -53120,12 +55600,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20171006.1846"; + version = "20180416.100"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "ff64e1171e8330972c26bf547042429927aed7c7"; - sha256 = "11hsxvla2vq944zfd8kr0wynvkr7n90jv714ll6f7yhn10nrraks"; + rev = "6929545b6c116bd3eb12d3481a78f381c759e6fc"; + sha256 = "19fj94i4ai1gzj2y2b2klw7xdsh4aki8zr4840lffn4a0f16nc7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -53180,22 +55660,22 @@ license = lib.licenses.free; }; }) {}; - package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restart-emacs }: melpaBuild { pname = "package-utils"; - version = "20170222.2352"; + version = "20180317.1134"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "3cbbc2ff50ecb5e6fb20a309cb07d74ca10d4d42"; - sha256 = "1bp04c2ljcgxf590yv05wzvqz7b7ih22h343g7rwdd5l3cli43km"; + rev = "652531caf1a1df916d2185e7f47085bd0509c940"; + sha256 = "0lmz4szrfs2445q8nyqnh9hgm69bwdf7q78sfqyxiw1fqaj205si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r"; name = "package-utils"; }; - packageRequires = []; + packageRequires = [ restart-emacs ]; meta = { homepage = "https://melpa.org/#/package-utils"; license = lib.licenses.free; @@ -53204,12 +55684,12 @@ packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "20170819.942"; + version = "20180318.1029"; src = fetchFromGitHub { owner = "emacscollective"; repo = "packed"; - rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a"; - sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm"; + rev = "c41c3dfda86ae33832ffc146923e2a4675cbacfa"; + sha256 = "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; @@ -53267,12 +55747,12 @@ page-break-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "page-break-lines"; - version = "20171020.108"; + version = "20171210.31"; src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "ae1c0065984429c7364a667abb9180e80134c4c0"; - sha256 = "1j2fw5p5cwyxpb3clym59jbma06r7la83n62xmz0q1z41llmwx4j"; + rev = "fd3b7e38ad8747cd009ead7ef1bb150849ccc693"; + sha256 = "0ik5v2kd0l5a6sznld5ncdb4lsyqbbw7axs0qwxc968b540k9zq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines"; @@ -53372,12 +55852,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20170927.1048"; + version = "20180415.48"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "c840a8f941940bb8e694c635995566faee995c7b"; - sha256 = "0wqnzgkcwhrgxdkrlk6i469gcas9477pbkv878cqq9ifsjwvf42n"; + rev = "8fa25d06fb2ae6d992e738a10d8b2150e109d9bf"; + sha256 = "0p50cfmwgwahb1czqvgx2kvnd3k46zl0pybvxlyf45y4c4kr8wjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -53390,6 +55870,27 @@ license = lib.licenses.free; }; }) {}; + panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "panda-theme"; + version = "20180203.2318"; + src = fetchFromGitHub { + owner = "jamiecollinson"; + repo = "emacs-panda-theme"; + rev = "f93ad6ded20d71cab9bf29a0c7040e07e1ba4f05"; + sha256 = "1y9yppkprbnqf59p94kkpxsma2s7z8cp195na05mdgcs0pmbs6l7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme"; + sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7"; + name = "panda-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/panda-theme"; + license = lib.licenses.free; + }; + }) {}; pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pandoc"; @@ -53414,12 +55915,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20170720.127"; + version = "20180122.108"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "58f893d54c0916ad832097a579288ef8ce405da5"; - sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i"; + rev = "883e131c53a6351a239c422f05027aa526181ddb"; + sha256 = "1qb50m4zyk57hs8siwiz21q5qymhl585crmhgqnvkspk6dg0063s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -53453,22 +55954,22 @@ license = lib.licenses.free; }; }) {}; - paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }: + paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paper-theme"; - version = "20170924.1231"; + version = "20180125.926"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "02829f582d03c149d0aace9a0bdf2bd405b2e4a2"; - sha256 = "0rvwhvmv9b6ma6jf5gbmmy9ahrsli4qflc8z2n2whl743rbcfpk6"; + rev = "35424f7360f5110833b7a9f4f53907b9e222be85"; + sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; sha256 = "1ph6c6g907cnxzl74byc754119qia8rs8y7wvaj8i6q3fz2658zr"; name = "paper-theme"; }; - packageRequires = [ emacs hexrgb ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/paper-theme"; license = lib.licenses.free; @@ -53477,16 +55978,16 @@ paperless = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "paperless"; - version = "20170213.503"; + version = "20180224.445"; src = fetchFromGitHub { owner = "atgreen"; repo = "paperless"; - rev = "4e8c5d147db5c8ef0a3914e95b4030b28d29c6bb"; - sha256 = "1lnxbn6mwbpfsn8qf8rdn1v7f00jjsk0h1bn4syvzik37x51f2hh"; + rev = "b3b6c05da393f6b1292a3d5937bc4499baabd0b6"; + sha256 = "1b2gm823qd6bllgp9qg2vgskzg4rpdvh8bgic8708hkq6lwpdv70"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/921ba9059183a57e08f9c79af2b28bb77a210508/recipes/paperless"; - sha256 = "02jbqdhbq4b3yb9lrqkwaxmyymvcqrjswhzp4sbccw6arla4q7wg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/500be17952ffb6b8d1e524b5b3d316878202fabc/recipes/paperless"; + sha256 = "182arnx2fz0dww6bvg6m70a1picqd3czmzwv92x0rb4ghwrnq2dq"; name = "paperless"; }; packageRequires = [ cl-lib emacs f s ]; @@ -53498,12 +55999,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "20161117.502"; + version = "20180216.334"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245"; - sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r"; + rev = "e5dd26f67ba8fa8ab1631a00ddea4117805b3fd0"; + sha256 = "09x8glw949hivbzikki5blgjkzyws69hck501ym99663k4irdir1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -53518,11 +56019,11 @@ }) {}; paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paredit"; - version = "20170405.1149"; + version = "20171126.1805"; src = fetchgit { url = "https://mumble.net/~campbell/git/paredit.git"; - rev = "99829aa423c9e8dd1be8d64c4b68982cf4c1559b"; - sha256 = "13h5gd9s1ajgqzq6ylzcmz4irb071wyhh9qj195ld177irkxi9wd"; + rev = "acbe10fdd85d2e91831adf70b6a828bc7e900da0"; + sha256 = "1c7ag0cvd6rl5fsj3dpfcjpyb8xjd26d864z98a74cirn8pc8f7l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit"; @@ -53601,12 +56102,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "20161028.1127"; + version = "20180318.1325"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; - sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; + rev = "a45d111153a76c481fa0b36d6172ac90e073dfc4"; + sha256 = "1cr0vnm57lxs48z17ddcv7qlfvks7wdsp01zsw0c7i3h5ajl8myp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -53643,12 +56144,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20170710.821"; + version = "20180226.2134"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "23ac701e2a1a1364ca96d267437c3413986a4497"; - sha256 = "1kbwmdhv8fpw613yk8sgh3yz4rcrh2aygqkv3c46d5fr0xm04a80"; + rev = "5bfc915c4a91da740f3216798327b5676d227569"; + sha256 = "0zz4l7k2blbxcg1ni3amfys58szw51fvrjk7dbjxp7vsgpp7x3ji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -53685,12 +56186,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "20170501.347"; + version = "20180116.627"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3"; - sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"; + rev = "683c970a6fb51591bc88ee80e295fedee876e044"; + sha256 = "0mpgyy9qfb5x4fvlmb274hgayjbwf0bgk65dxyx31zikjwpcd56p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -53706,12 +56207,12 @@ parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsec"; - version = "20170508.1500"; + version = "20171202.2031"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "8755c60826efaa8603b0d4300bfba9abaa072584"; - sha256 = "03yzs4l53j4fvviqfhdn3cxc710yrg4wdbnl7r69yn69r4di9bfj"; + rev = "72c1897a42b3b0b59505b3562e8f46c6354faec1"; + sha256 = "0yg35fs9gr07j6x7xi4f3v11xdanmkhr5sr9lqim0m10aglv7vwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; @@ -53724,15 +56225,36 @@ license = lib.licenses.free; }; }) {}; + parseclj = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "parseclj"; + version = "20180225.2233"; + src = fetchFromGitHub { + owner = "clojure-emacs"; + repo = "parseclj"; + rev = "af6102c4a80693cc3b40c4eb5c340358ab4b9696"; + sha256 = "1m1yvskgvm4np6r36c5gjg5whi1dyg6c1xd0nfqgc0cw9awwxp6b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj"; + sha256 = "077qigx0qyjyvm3437ffnv05rmnpqxvpxf69yyfdgnay1xclv172"; + name = "parseclj"; + }; + packageRequires = [ a emacs ]; + meta = { + homepage = "https://melpa.org/#/parseclj"; + license = lib.licenses.free; + }; + }) {}; pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pasp-mode"; - version = "20170803.1301"; + version = "20180404.1000"; src = fetchFromGitHub { owner = "santifa"; repo = "pasp-mode"; - rev = "6511193677d6113fec1171f476c0db3be242ee15"; - sha256 = "1fk87iiqnyfwblw8fgqhw2mg61w2pl7id1dm8lb75pqrjq8kvjbg"; + rev = "59385eb0e8ebcfc8c11dd811fb145d4b0fa3cc92"; + sha256 = "1ar4vws3izzmir7m870mccci620ns3c5j26dcmwaxavhgw45wcmf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode"; @@ -53748,12 +56270,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: melpaBuild { pname = "pass"; - version = "20171010.410"; + version = "20180201.451"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "0f4ff034fb31b18f387e67f1de4029826db6cd0b"; - sha256 = "084497na8qql638qjhgad02rvhwyzz81xwh70p6rxxwfzj0i1p17"; + rev = "da08fed8dbe1bac980088d47b01f90154dbb8d8b"; + sha256 = "1j5fdcqmqw62zvmwd80bjvkrr5vg59l5k6673hvvhjx77c8nvidv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -53857,8 +56379,8 @@ src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "7252e8b3cf829e908179913daad16ff2b8bdefdd"; - sha256 = "1wmayp7wjlfxdjb0wlmjqyxqa95ssrhhxhkiy0ip3bgip77s7rbw"; + rev = "fab65bda88ea979dbbc49f3d856a1d14ee4f1296"; + sha256 = "0yicj227h21lqa97kcaa1pw4xyaakjqh9ynr2pynixkafalfkxhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; @@ -54000,12 +56522,12 @@ pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pastery"; - version = "20171112.851"; + version = "20171113.1949"; src = fetchFromGitHub { owner = "diasbruno"; repo = "pastery.el"; - rev = "245779100e7d1c1a10b67fe7b9055343d3a8229c"; - sha256 = "1wn53ncs0nivmdqlryvidqkksky8w4ymmfsqm1ha62jkxcwqf26h"; + rev = "4493be98b743b4d062cb4e00760125e394a55022"; + sha256 = "0bmm18d84lrkclg4md46k1ma03w7a97s10hrvjcm9yj8xbrjqqsc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery"; @@ -54105,12 +56627,12 @@ pc-bufsw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pc-bufsw"; - version = "20150923.13"; + version = "20180107.1040"; src = fetchFromGitHub { owner = "ibukanov"; repo = "pc-bufsw"; - rev = "a76120bca9821c355069f135b4e6978351b66bc2"; - sha256 = "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m"; + rev = "b99ba484e18ebf2b88654704146746490bb7625f"; + sha256 = "184nnkfh7n6vbbmvykvklr1dn3dcwjj3w800irdg55bbnkxxzkj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2bbd34d673935846c286e73a1e2efaa00ab01a/recipes/pc-bufsw"; @@ -54130,8 +56652,8 @@ src = fetchFromGitHub { owner = "sigma"; repo = "pcache"; - rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740"; - sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248"; + rev = "1f8086077d770e524492e6fa59b07856e85a6fea"; + sha256 = "09z5295f8051ag13ndq8rhxgg2m0gim45yfpjv4xkbmdcfkfinc2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcache"; @@ -54228,22 +56750,22 @@ license = lib.licenses.free; }; }) {}; - pcmpl-pip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + pcmpl-pip = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "pcmpl-pip"; - version = "20171109.1932"; + version = "20171201.33"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "pcmpl-pip"; - rev = "50345753df4420f1ca4d1b8cb56b0f8d29d2969c"; - sha256 = "0svl0xxh3amc52kj73m3mi732gm3907l2gk7i91iy0ynp6v3f0rz"; + rev = "8b001b579fc015f80ee0e4f3211058b830bf7c47"; + sha256 = "0f8s2gn82dhyrnv0j688697xy0ig2yhn5m94gwhcllxq5a3yhbdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-pip"; sha256 = "19a3np5swpqvrx133yvziqnr2pvj8zi0b725j8kxhp2bj1g1c6hr"; name = "pcmpl-pip"; }; - packageRequires = []; + packageRequires = [ f s seq ]; meta = { homepage = "https://melpa.org/#/pcmpl-pip"; license = lib.licenses.free; @@ -54252,12 +56774,12 @@ pcomplete-extension = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcomplete-extension"; - version = "20140604.947"; + version = "20180322.28"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "pcomplete-extension"; - rev = "839740c90de857e18db2f578d6660951522faab5"; - sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6"; + rev = "3d7dac3de9e81604e4ed93c344cf4d44ebae3bf7"; + sha256 = "1qrlp066rbcafn67mmbg48fkxw7ai6ni8b3asmm8w623xhd63v1g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cb8a938418f84a5b0ede92e84a516f38e4b1011/recipes/pcomplete-extension"; @@ -54336,12 +56858,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20171012.2226"; + version = "20180109.1234"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "0f99f0c06514acf51445e7e4cb0f638fa0c75ee5"; - sha256 = "1gc7n5r60ib65bnkgpac3bn71pxnm58sxajnwjfkwi9xzgw72acv"; + rev = "9241a79bbf159ba0b079ebdbfa8ad1b3e69cf8c0"; + sha256 = "00v2rqrh3z93s651j1i1z9i6chr0lxw1kbnkpr56pqrh5rbvy0q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -54441,11 +56963,11 @@ pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pelican-mode"; - version = "20171001.503"; + version = "20180401.148"; src = fetchgit { url = "https://git.korewanetadesu.com/pelican-mode.git"; - rev = "64d41f0ee5970b2d875880994eb287b97cad24a1"; - sha256 = "0xivc8sdp6h3fajyj7g73xnyfqlkhfpm2cs9x3mpyr42502lmn2c"; + rev = "c48bd6c3b7369787a09923c53b452d9ec460399c"; + sha256 = "0b5sizmbf05kiwrq0n45scg95jg33qar70gi2vsqp4aaqryipccs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; @@ -54478,6 +57000,27 @@ license = lib.licenses.free; }; }) {}; + perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + melpaBuild { + pname = "perl6-mode"; + version = "20161228.430"; + src = fetchFromGitHub { + owner = "perl6"; + repo = "perl6-mode"; + rev = "4867c6d268545f5356111d72c4ae77917d34cb21"; + sha256 = "1bpq2wa27rlmyx13vg0ig2nzzivzxzh9hdmhyw285dcn8agashnp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e912dccdee12f745272d26ea10d5f106a27cabc/recipes/perl6-mode"; + sha256 = "0r5q2nggb9kbjcdfv81d7sm41jqz040j9z52fnck4b9mlz2dy6d0"; + name = "perl6-mode"; + }; + packageRequires = [ emacs pkg-info ]; + meta = { + homepage = "https://melpa.org/#/perl6-mode"; + license = lib.licenses.free; + }; + }) {}; perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "perlbrew"; @@ -54523,12 +57066,12 @@ persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-scratch"; - version = "20170110.546"; + version = "20180414.1044"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d"; - sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz"; + rev = "85d753a27c198cc3611845ca144150d3baf4e3d8"; + sha256 = "08iypb0pbscbqcvg6p81rmazr5b7kdavjg2z9l37jha4vcb3nbcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; @@ -54562,22 +57105,22 @@ license = lib.licenses.free; }; }) {}; - persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: + persp-fr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: melpaBuild { pname = "persp-fr"; - version = "20170908.44"; + version = "20180103.642"; src = fetchFromGitHub { owner = "rocher"; repo = "persp-fr"; - rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0"; - sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8"; + rev = "aeb3b5de6135269091bb9aa0396973766c27fc88"; + sha256 = "0l6hlgn54iw2f6ry0gw79rsbz1r4svxf2xwffi580vi68wrcnvf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2"; name = "persp-fr"; }; - packageRequires = [ emacs persp-mode ]; + packageRequires = [ dash emacs persp-mode ]; meta = { homepage = "https://melpa.org/#/persp-fr"; license = lib.licenses.free; @@ -54586,12 +57129,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20171014.111"; + version = "20180104.843"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "ccf87da2c230c3a91e627105b0f034a954e6842a"; - sha256 = "1dv3ghl9falw888bl1w0d5pzp0jz8qsbisd7kfd887bsyn7x7jqw"; + rev = "eef754ce06159e220a9f3c99db3809925f41b8f1"; + sha256 = "1x4s1nlnvab3sgzm0glkazfpc7lkh64af5nc4jjz1jzin8v0m055"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -54670,12 +57213,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170916.404"; + version = "20171203.221"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "525f2f25358f17c7269c3750d56bfb8a6d59b5e6"; - sha256 = "17nv33nl60jdn6cz6abbj6jxnvjcshaq4a22lkssxczp968k1qn3"; + rev = "edb70c530bda50ff3d1756e32a703d5fef5e5480"; + sha256 = "12h0kj96s4h8z4kqalp7hccnlnqn5lrax3df75gz16pskx2dwxqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen"; @@ -54691,12 +57234,12 @@ pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pfuture"; - version = "20170726.1502"; + version = "20171116.812"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb"; - sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m"; + rev = "d55a764b5beee803e489974be2408dbe236fc482"; + sha256 = "1p6prnjh9pnz6q7fmlb5wjm2jzdm2jikkp6qfll8v7m3l19xwrmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; @@ -54880,12 +57423,12 @@ phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-search"; - version = "20170310.237"; + version = "20180321.1829"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-search"; - rev = "a81c4ea203fcb572f6cc37cc658d6b01453bef9d"; - sha256 = "1z3640walrdk2c90hj47xvlpm6xd5iblxvn7i16krdfz735i4rr5"; + rev = "9a089b8271cb1cff9640848850298c9ec855286c"; + sha256 = "1gr5plcbrfdc4pglfj905s89hf8x0kc083h30wcnd81bnw9jwz1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0274300c33f19ca6f868e1d570ffee513dbdf7/recipes/phi-search"; @@ -55111,12 +57654,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20171107.826"; + version = "20180412.1002"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "1e9ec6411e6ad3c85225e724215c28b01232fe18"; - sha256 = "0c8gdy6hc03c9al91j1py6xg0c6qzbhkcyzn4423lnkakv33iiwp"; + rev = "ef69a8b63f70a89694087ab0f97545d103ad952c"; + sha256 = "0njhhlpv93rkskhzj6wyxyvvx839saix6d96x0ipairxv1arcj3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -55129,36 +57672,15 @@ license = lib.licenses.free; }; }) {}; - php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "php-plus--mode"; - version = "20171027.921"; - src = fetchFromGitHub { - owner = "echosa"; - repo = "phpplus-mode"; - rev = "523e7e50f9978ba74b8a324f9f896cd9b5dfd9de"; - sha256 = "0xf79pxsrfr9bi3138hdq2ccrh391sci8lvmvzcs3vnzw0hrzbfh"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode"; - sha256 = "1wl15l4m68xng1b87a19fm21qwr230ckjz1iwi3y1xl184zliv8p"; - name = "php-plus--mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/php+-mode"; - license = lib.licenses.free; - }; - }) {}; php-refactor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-refactor-mode"; - version = "20160417.1446"; + version = "20171123.2235"; src = fetchFromGitHub { owner = "keelerm84"; repo = "php-refactor-mode.el"; - rev = "de47bb705c58e7ac06bdb1b403697013c77306ae"; - sha256 = "01i552ch8r8i6nzw8prwxcafzrq6xnzyc4cn36w3my1xq0k2ljvz"; + rev = "7a794b0618df2882b1bd586fdd698dba0bc5130d"; + sha256 = "12kjyzmicay7y37znk0znpn81lszmnydq5fkl5pk57bxblwwiivg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad4a9bb43e131e2eb0d8b09b13245bc268c524a5/recipes/php-refactor-mode"; @@ -55174,12 +57696,12 @@ php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-runtime"; - version = "20170901.1106"; + version = "20180110.934"; src = fetchFromGitHub { owner = "emacs-php"; repo = "php-runtime.el"; - rev = "e1bca88ab5472e9b520b4ce915cd27d1e7803c2d"; - sha256 = "1krnfzck9j5wmda1rkmzhl9lcdzxfw324xfy4lz92nwb92mgw8gq"; + rev = "fa4312863245511462b75cb31df2f8558288f4df"; + sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime"; @@ -55237,12 +57759,12 @@ phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "phpunit"; - version = "20161219.320"; + version = "20171127.301"; src = fetchFromGitHub { owner = "nlamirault"; repo = "phpunit.el"; - rev = "5ca5ee53e16b2cf0939dbeacbf1dffa13b41b48f"; - sha256 = "0gmb5fxnllkjg45cmqpr2gy2k6qhg1r6j2w67qbpir0x4h3q2x6x"; + rev = "a13706733f98be3639c47311fc820b3b50f4bc33"; + sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit"; @@ -55258,12 +57780,12 @@ pianobar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pianobar"; - version = "20120128.1301"; + version = "20180409.1906"; src = fetchFromGitHub { owner = "agrif"; repo = "pianobar.el"; - rev = "9193e3888a8097dbe7ee58e4658cc6ec2a76b160"; - sha256 = "053jqzl0sp3dnl4919vi30xqrdcpi9jsqx5hndj1bprf7926w11d"; + rev = "9eb9b7fcb4790b11726302cbcec1b7951fbc8b0e"; + sha256 = "0y41hfml5l28i40fk279m6yngylkwrlv5wldhq3y1sp4ryahwl6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5659b4c7be20572aabe75caba866301393db012/recipes/pianobar"; @@ -55276,6 +57798,27 @@ license = lib.licenses.free; }; }) {}; + pickle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pickle"; + version = "20180218.1840"; + src = fetchFromGitHub { + owner = "ahungry"; + repo = "pickle-mode"; + rev = "d672186129a19581c908bae3063e09baa815869c"; + sha256 = "10jl9xinljzb8nra59r6wyrmsr8sbbl40yahpzn4558nmmdckcnb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4cb71882f074d3fef1f5a7b504dafcb6adff8ed4/recipes/pickle"; + sha256 = "0fryzmrs6bn6r590qp08jyzx9g6jakf1pahxhcfglsv9k3jbfp13"; + name = "pickle"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/pickle"; + license = lib.licenses.free; + }; + }) {}; picolisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "picolisp-mode"; @@ -55468,12 +58011,12 @@ pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pip-requirements"; - version = "20171109.1439"; + version = "20180306.1522"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pip-requirements.el"; - rev = "d6d0437794e5de205a5fb03e0ff0a4a1b9e04eea"; - sha256 = "01j33xlrh8zflzib7gngjhkgg8fvyx2yz57clxzbjkd4377f22c2"; + rev = "88c764ad5d988a3ed0d2b6f0b7dd22308b03a058"; + sha256 = "01gl4nzqpmczprsdg13yvcj8d1p49wdwskmkm8nzssrshir6xdxl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa/recipes/pip-requirements"; @@ -55486,6 +58029,27 @@ license = lib.licenses.free; }; }) {}; + pipenv = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "pipenv"; + version = "20180402.2127"; + src = fetchFromGitHub { + owner = "pwalsh"; + repo = "pipenv.el"; + rev = "7f1fb3dd1704e535e67860c58080e55fc89e07f4"; + sha256 = "1z1hdh6m10gam86zyhdfjksj2jxjrichdcz8qs3290lxy59f7agq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; + sha256 = "110ddg6yjglp49rgn1ck41rl97q92nm6zx86mxjmcqq35cxmc6g1"; + name = "pipenv"; + }; + packageRequires = [ emacs f s ]; + meta = { + homepage = "https://melpa.org/#/pipenv"; + license = lib.licenses.free; + }; + }) {}; pippel = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pippel"; @@ -55612,22 +58176,22 @@ license = lib.licenses.free; }; }) {}; - plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + plain-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "20170625.1100"; + version = "20171123.2010"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "7c376f5bf9d653bf12e414176284736cbdd19108"; - sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a"; + rev = "2609a811335d58cfb73a65d6307c156fe09037d3"; + sha256 = "0g5vl4xigdm2pn2mnkwgj1kxdjr66w7ynr77bchy3ij6qvzdzkqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8"; name = "plain-theme"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/plain-theme"; license = lib.licenses.free; @@ -55636,12 +58200,12 @@ plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plan9-theme"; - version = "20170529.2212"; + version = "20180102.1852"; src = fetchFromGitHub { owner = "john2x"; repo = "plan9-theme.el"; - rev = "cdc50195f6579e6c3e6e8060142ce25b609f7949"; - sha256 = "17grr5rvazh448qzrksxrgp0yclp32s2rxs4h5pygky7knb5vf3v"; + rev = "2a31fb9251922667692337c867612947d2139696"; + sha256 = "0g01a34q3dsn23s7s94xxmrvqalmvzi3hdz2hgh4swn4hrp4bzqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme"; @@ -55682,8 +58246,8 @@ src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "fce628885b54635b0287b3337626752b2725369d"; - sha256 = "1pcxl00iwhrsi57s6gbf3bch00pkdxbg46p8xryn1w5r16xzd9pm"; + rev = "cfb408fc840dae80a7d05d5648d27c18f04c00a9"; + sha256 = "1w2f953glxqfg8ilv537qznxj4kv4ddi011wyhkn27sv4wnky82c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode"; @@ -55696,6 +58260,27 @@ license = lib.licenses.free; }; }) {}; + plaster = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "plaster"; + version = "20180127.1250"; + src = fetchFromGitHub { + owner = "Shirakumo"; + repo = "plaster"; + rev = "c6c9c223d634041411d111b4397574f65e140585"; + sha256 = "0pzdw9jb1p1bi5zc59sjvwxzczg8laz5vlsrs73ah1pk9jckqwf5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7e363cffa021e649c052f38cedb7cc01dbe9e24a/recipes/plaster"; + sha256 = "0vfixc0f5n4flsmdf1iqlbx03yv28w3nqm1ycz2fx6p5jvhkvfqk"; + name = "plaster"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/plaster"; + license = lib.licenses.free; + }; + }) {}; platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "platformio-mode"; @@ -55717,6 +58302,27 @@ license = lib.licenses.free; }; }) {}; + play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "play-crystal"; + version = "20180114.224"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "play-crystal.el"; + rev = "0b4810a9025213bd11dbcbfd38b3ca928829e0a5"; + sha256 = "15gqr11paz5qmx43qb0f95wc87nn2snr7my22b0n6jwbk5djf402"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal"; + sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf"; + name = "play-crystal"; + }; + packageRequires = [ dash emacs request ]; + meta = { + homepage = "https://melpa.org/#/play-crystal"; + license = lib.licenses.free; + }; + }) {}; play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "play-routes-mode"; @@ -55741,12 +58347,12 @@ playerctl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "playerctl"; - version = "20170414.156"; + version = "20180301.554"; src = fetchFromGitHub { owner = "thomasluquet"; repo = "playerctl.el"; - rev = "8354352813cd206efb60002f2af4427957bf8894"; - sha256 = "1138jcn2yjfhg0abkiwzzrf69pc5nddppf2hj35mn8b0rr7zs4bq"; + rev = "3eee541423c2e5eb9f23a26fa9aa88c9c5a19ad1"; + sha256 = "16qvn1mss5j8vpf1qpq4lwl4hwng64caw3c3shixsncfmgw25z6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6db0d82c2eef7c5bef5f9f2c15969da4c404b62d/recipes/playerctl"; @@ -55759,6 +58365,27 @@ license = lib.licenses.free; }; }) {}; + playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "playground"; + version = "20180319.243"; + src = fetchFromGitHub { + owner = "akirak"; + repo = "emacs-playground"; + rev = "f1b87ba65d8be28c4a8fc0fd8480d2da00e52406"; + sha256 = "0fqja170pbdrj1lz8dfpi53l07bf4vk18maa1kzcd2nyd569xxvi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground"; + sha256 = "1xjmxkl8h4l87fvv1sr478r6mkmy9gkzw2fxmzqn5fcsahzkyg4d"; + name = "playground"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/playground"; + license = lib.licenses.free; + }; + }) {}; plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plenv"; @@ -55888,8 +58515,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "981c523ddbd1462970335a1069573ca3bdd3df5e"; - sha256 = "1aq95scp0lg5r1fsn62r54dqamm3174wzrr0h3vxx75m3iycsxxi"; + rev = "071d155f83e2c9c917db43f5452822a6dc30250a"; + sha256 = "1whbjblizl478gc7yc2yj0spwskzq8d9inpxian441a6jj9biah3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -55905,12 +58532,12 @@ pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pocket-api"; - version = "20170818.533"; + version = "20180402.1809"; src = fetchFromGitHub { owner = "lujun9972"; repo = "pocket-api.el"; - rev = "26e4583311ebc472f7bba59a1189f04938f2c03e"; - sha256 = "04cf97mwkp5rw0dvnspdbrycywjdv4mljl6lbjhbvlijj745d5xm"; + rev = "3eb9430b9db90bc02e736e433eb86389f7655189"; + sha256 = "0k6a9zzdi02g677cc699llk04i06yb7ddnlnmxndap5jszfyqwfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api"; @@ -55947,12 +58574,12 @@ pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }: melpaBuild { pname = "pocket-mode"; - version = "20170327.438"; + version = "20171201.515"; src = fetchFromGitHub { owner = "lujun9972"; repo = "pocket-mode"; - rev = "4338e869862a057e7ad1e53953e8c4a2c0f12a46"; - sha256 = "0c23np33g9hndppyfvvh9qb8xdh2v92r8rvcsi2cbwwm4z7xsvra"; + rev = "229de7d35b7e5605797591c46aa8200d7efc363c"; + sha256 = "0j3axac4lp7p00a7mf7frryqg1y3jwqaw0s475gz606642vg9l45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode"; @@ -55965,15 +58592,15 @@ license = lib.licenses.free; }; }) {}; - pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: + pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: melpaBuild { pname = "pocket-reader"; - version = "20171023.737"; + version = "20171127.335"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-reader.el"; - rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574"; - sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp"; + rev = "6a35d531f2425e2e187f5107047f3dc7625f3623"; + sha256 = "0pankd0wvmfaws6xm9yvaddf592nj5hphqfq5dmwvzcp5ywx62n4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; @@ -55983,6 +58610,7 @@ packageRequires = [ dash emacs + ht kv org-web-tools ov @@ -56016,6 +58644,27 @@ license = lib.licenses.free; }; }) {}; + poet-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "poet-theme"; + version = "20180415.2212"; + src = fetchFromGitHub { + owner = "kunalb"; + repo = "poet"; + rev = "70b514373ea32c20ce4e46809b3336af1a69d2c8"; + sha256 = "0jsgd4fgz6xliyfq46xn3ky7hr5ma4577h8kgshsbdidzwmp6xrr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/40bbe29dee56f7989d8e87c03f4842e2b191acc3/recipes/poet-theme"; + sha256 = "0pllyp4spj30g6ihzc91hzvnrvcg2zb49adj8wcmbzvq3hxnvls1"; + name = "poet-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/poet-theme"; + license = lib.licenses.free; + }; + }) {}; point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-pos"; @@ -56082,12 +58731,12 @@ pollen-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pollen-mode"; - version = "20160808.2000"; + version = "20180404.612"; src = fetchFromGitHub { owner = "lijunsong"; repo = "pollen-mode"; - rev = "de762bd7f9760185dae8ef025ca9a9126ae78de0"; - sha256 = "19bi50nlmwnh4kz3b1hrgc7ks0g84bld9aifws2l3wyc3xsj8cqa"; + rev = "df4eab5b490cb478a092e6bab6b07f9e2f9c6fad"; + sha256 = "0x8bnf0n109ard5zdmma04w0wv5jb1r7qh5smsa1kjvws98gnp57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/pollen-mode"; @@ -56145,12 +58794,12 @@ pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomidor"; - version = "20170925.2301"; + version = "20180320.1252"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "16bed77ff933cb5f8430b6eacf27509631d22072"; - sha256 = "1w2ql67arjzzjakqm34gbs3vf6w9yzkw5kzi5vrvkcwajqq8qq56"; + rev = "30004b21714b53d22041514d905e1876c5cedd4b"; + sha256 = "0nis9dx73y90lqnh24j5ywrdmjf7aa1jrdgwxm53wjl4sfmk85r1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -56397,12 +59046,12 @@ popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "popup-switcher"; - version = "20161130.656"; + version = "20171205.51"; src = fetchFromGitHub { owner = "kostafey"; repo = "popup-switcher"; - rev = "86809fbd3c3c3d566043043b6577ccf8133ac855"; - sha256 = "1r8g3wxyklkck9af1x7rg7hyj8fnf28fd34p12vv17mhnqzb4x4y"; + rev = "f5788a31918e37bb5c04139048c667bcec9f1b62"; + sha256 = "0gfi8dlgynciv3q5a208c7gd66g2r99b3zn0i31ibpppjqy2vcsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7d1897c4c4a6f4b4527279e6dad976219d7b78/recipes/popup-switcher"; @@ -56478,15 +59127,36 @@ license = lib.licenses.free; }; }) {}; + posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "posframe"; + version = "20180308.1627"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "posframe"; + rev = "c29228eb2100503a0fda39252d4f11c1eb5acc56"; + sha256 = "1k92gzzy6ys2f86jzggqlz3x6v665hwkafj3frj4mgmxp7yxsiw0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe"; + sha256 = "02chwkc7gn7fxaaxsz9msmrhrd62bji5hhb71kdm019x8d84z06w"; + name = "posframe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/posframe"; + license = lib.licenses.free; + }; + }) {}; postcss-sorting = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "postcss-sorting"; - version = "20170531.1858"; + version = "20180211.156"; src = fetchFromGitHub { owner = "P233"; repo = "postcss-sorting.el"; - rev = "1320d74abd8ee7f0a09b5f7920d554650a7047a6"; - sha256 = "0071al1nwqazv8rhr7qm799rmizbqwgcrb5in3lm0sz88fbs9vnk"; + rev = "deb0c935d2904c11a965758a9aee5a0e905f21fc"; + sha256 = "03kng7i09px5vizvmmrar7rj3bk27y43bi8hlzxax0ja27k0c66c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fae97430f211786f615f7450936f823e2a04ec4/recipes/postcss-sorting"; @@ -56544,12 +59214,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20171023.750"; + version = "20180321.1948"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "fda4fb96984607d4a6502b1d8c8898e56d10cf6c"; - sha256 = "1lz3kr8w9z9xx5amqqvim85asjji13q84d4r1cb5x77wajmj1p21"; + rev = "af5ef31a33c3589a9be0b2a55a2741582e605efd"; + sha256 = "0zynj4pl9717xbj8g1mac3haiybdndb034bnqk03bb42iyrwy767"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -56628,12 +59298,12 @@ prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prassee-theme"; - version = "20170406.1953"; + version = "20180105.1644"; src = fetchFromGitHub { owner = "prassee"; repo = "prassee-emacs-theme"; - rev = "7ce96272a514caa8598aa3c7227ade8a21e20daa"; - sha256 = "033qmd1rfjpiz27zz34b96dyc2lil08qdf9nn13sa915gc6704ps"; + rev = "b68d13f929364b9bb087f8f587798144218f7dc6"; + sha256 = "08r22xsrlycl0lyqg5qi5wv5w4zhdawmi8ikdgvn5776qaixb6r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme"; @@ -56670,12 +59340,12 @@ preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "preseed-generic-mode"; - version = "20170802.1753"; + version = "20180209.2100"; src = fetchFromGitHub { owner = "suntong"; repo = "preseed-generic-mode"; - rev = "341d85f8ecdc8834956a0352ece542f45def88db"; - sha256 = "1p486absi0mlcangpbh6hs36wvlmm9s6f4ag0lzmw7w3ikhp88kn"; + rev = "3aa8806c4a659064baa01751400c53fbaf847f66"; + sha256 = "02yb5xkgwqxpwghhjmxf2gx0faifi04w2jd8cvfsiwzwqmqyhmv7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/preseed-generic-mode"; @@ -56691,12 +59361,12 @@ prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettier-js"; - version = "20170823.159"; + version = "20180108.2326"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "6cc79cc933968f9ecae988ed79398d9dc97790e2"; - sha256 = "01k1k68rwwpjdajc12dvpjr8jfncvj8lli2l6065jwbq8ldg2ja0"; + rev = "fac9dd29720f8417bd8cd5dd8ab5138c6dd7d701"; + sha256 = "00bgwzvha2i2sfi05jdzgpxvbjfpjhj5gv2vn3bnalgd1z3cz89r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -56901,12 +59571,12 @@ prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "prodigy"; - version = "20171107.1159"; + version = "20180329.1357"; src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "9c6c494ffdabd3125980c98824bc3af800176624"; - sha256 = "0dy185gdkxscm3lwxcgaw6ad636wcha7kwi3zfmxkjm9zd90jfd1"; + rev = "a07c611862ae6dad6cdf9186a7813e701dc6e072"; + sha256 = "1addcwmgd2i9jp327ccsw5vgiixw6k1jks2fwg328llln0gv18ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy"; @@ -56940,6 +59610,27 @@ license = lib.licenses.free; }; }) {}; + prog-fill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "prog-fill"; + version = "20180128.2019"; + src = fetchFromGitHub { + owner = "ahungry"; + repo = "prog-fill"; + rev = "ad38e2f6a45a8dd7eb08c407506256dd2e045de1"; + sha256 = "13dsihqs0wc2bjxgyiqb5xbav9va432qqkpl84a0rdrwndpc7lpc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/90d680ed481688c9899adb28fbd9a22a17fa8943/recipes/prog-fill"; + sha256 = "0wnqzkzhaywcyw93z86pngpycsrd1mi79psmck6qbhms1aia79p3"; + name = "prog-fill"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/prog-fill"; + license = lib.licenses.free; + }; + }) {}; prognth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prognth"; @@ -57089,12 +59780,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20171109.240"; + version = "20180324.2226"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "7dccd879f62c6a8386734ff6ffe57d73c435b332"; - sha256 = "1fw8fqhnid3psfz7maq3l229icwlxrjypxc4p4fmdqgvsnhr01ds"; + rev = "fba757dcee67479e579c164ec0f4f930793de6cd"; + sha256 = "1c3lvq9n501dcvxa8xz9cg4hm7bazbamb5rbfxlqjk9b4gbf8hby"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -57110,16 +59801,16 @@ projectile-codesearch = callPackage ({ codesearch, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projectile-codesearch"; - version = "20151228.20"; + version = "20171129.600"; src = fetchFromGitHub { owner = "abingham"; - repo = "codesearch.el"; - rev = "7013d933cd9d3c04f19a6572176483b48a311807"; - sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp"; + repo = "emacs-codesearch"; + rev = "4e6a2382c26d1218a4a007d31de2bab8ef9d2e7c"; + sha256 = "030zbx1glr6m7sxy89c833iw1v3bgjkcg835c38hlazra1vq783p"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/aa69679a71495a9ebaa8fcaac42f6682a5167d00/recipes/projectile-codesearch"; - sha256 = "0jgvs9is59q45wh2a7k5sb6vj179ixqgj5dlndj9r6fh59qgrzdk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6b1b1d3e356c6b9bffdcf98848918efe2fdfa8c7/recipes/projectile-codesearch"; + sha256 = "1457dhmpgrq1qafr3v4ccw26ix10m60c5vlrpyqsfz8vh8lv0bb8"; name = "projectile-codesearch"; }; packageRequires = [ codesearch projectile ]; @@ -57152,12 +59843,12 @@ projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projectile-git-autofetch"; - version = "20170612.1011"; + version = "20171129.1447"; src = fetchFromGitHub { owner = "andrmuel"; repo = "projectile-git-autofetch"; - rev = "51b40134000a2411c6342e865e63f74c950a9310"; - sha256 = "0g4g4sjinmigyxs1irxv0yg524iq2hy8za09ksm3wbnbfa7w35ml"; + rev = "da02069d906e6e7f28ea1dd6a9196529315a5cba"; + sha256 = "106kj49rxsrdh6awvql3zyr3ramdcn0aaq4rmbmd45hz9ij7x1wh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch"; @@ -57194,12 +59885,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20171103.1004"; + version = "20180327.433"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "ff5f63df4e1403f5ab1286f1099a072a5f6694d9"; - sha256 = "0qxnpz0nmh3rxrqmw93abmxjf0fnhl0nyalywa8crhzfrd7qff79"; + rev = "b5e516ef6a336bde32e4594408be15fd96b07e1b"; + sha256 = "06qwhf04wy67ils5wn9hyc1z2j1pq0kb1mvxkxzqglwdnaca00l7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -57215,12 +59906,12 @@ projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }: melpaBuild { pname = "projectile-ripgrep"; - version = "20170211.857"; + version = "20180301.651"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d"; - sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx"; + rev = "a1f8f030bf5daea92dd13b953720a6c13dd3557c"; + sha256 = "0mpysjcbw9qxy1lcwsd2rqf72xahpdpn88xcq0cnk1y2jam8gjkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; @@ -57383,12 +60074,12 @@ promise = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "promise"; - version = "20170215.2204"; + version = "20180409.252"; src = fetchFromGitHub { owner = "chuntaro"; repo = "emacs-promise"; - rev = "d3cad4e1f7825404828cd9f5b887f18d3fd83c56"; - sha256 = "1cn1xcp6yfxp642yibknngf456v29s2qq3y8bsc67ydxjkr5w4gz"; + rev = "f623fa7466983fd1ba7034371f599434c03da723"; + sha256 = "1ffk5scab9whn27xz4wyik5vl235ngvhx30fd05abq97d6l7hndl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise"; @@ -57534,8 +60225,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "8cf53f8dfca43b0347efcc1052033c96aa3f626c"; - sha256 = "1as1bj77zffc103wyw75wnng61z7bnnmbl9ds8glnq383gzqd99n"; + rev = "320d56c833f835f40c56bdaf2a375768cdd1b334"; + sha256 = "0waqwqcwwv99rl0ays9maqv0y6l06vx6k8ygap21i69dn7mrj5nl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -57572,12 +60263,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20171031.129"; + version = "20180404.215"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "d28c33f65318a475133afc2f42e103db9251d2a2"; - sha256 = "19f9aw675d6crhd9j9jvqya39ddsf4f6hcwb03525k307syvg62y"; + rev = "de22a50eb031d11c4771e62f8c705298bc5636d6"; + sha256 = "1sn2lw37382kl5d69c8wdghcr10cwwx7g5dgxgnmmfhspbkz6v95"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; @@ -57624,12 +60315,12 @@ psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "20171107.2313"; + version = "20180409.1056"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "d087644db226e2c66481d3c248e26afa9e4eb670"; - sha256 = "1hb8cs8kkqpd96fb5dc8fysgg29fvay0ky83n9nawwzq516396ag"; + rev = "faea8e5b3873a4c62a03c76a057cd0fd6fb0434e"; + sha256 = "1i1rjk72cwvfgxvqsiw2sqfwhsc8n4q89p94c96f3wm10rvlv7k2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; @@ -57642,27 +60333,6 @@ license = lib.licenses.free; }; }) {}; - psvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "psvn"; - version = "20151103.1042"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "psvn"; - rev = "23048d302858fc3a52c118652bd83491a4956410"; - sha256 = "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3690f9af15a6470b76d953c349eed82833b79a7c/recipes/psvn"; - sha256 = "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n"; - name = "psvn"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/psvn"; - license = lib.licenses.free; - }; - }) {}; psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psysh"; @@ -57708,12 +60378,12 @@ pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20171018.829"; + version = "20171208.2029"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "9dcebdb10c50620a3a5c6d71361d53bf482a482e"; - sha256 = "1rkbk8apd612ixksyssmmkrhswks6gbxl9kxhrbaxszfrrhqx86v"; + rev = "894a86d0ae4e855ae6044af6d7e106f8996c97c2"; + sha256 = "0phf9y5rcahhavbvnsh6hfm3ig7vr3fs7m503zv1sac9is5zxypi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -57813,12 +60483,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20170928.1007"; + version = "20171220.2249"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "e04f041386ebfe29fc67c3407e85b577b820df4f"; - sha256 = "0hcp7hmxri62qcx80zqphlhwrhzapzi0c07kk4l2cm75xfy20a2l"; + rev = "b3ed5057166a4f49dfa9be638523a348b55a2fd2"; + sha256 = "0sgws5cl4vc8707l66lq0zi1p6pxik0474ihg9jczh2xxnq4clsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -57834,12 +60504,12 @@ purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "purescript-mode"; - version = "20170926.242"; + version = "20180120.709"; src = fetchFromGitHub { owner = "dysinger"; repo = "purescript-mode"; - rev = "e2d6519a9669a1443db1040cf098bc3ea30ec861"; - sha256 = "1k8q32ipa684hvk7iwpdzqwikimw8g3j6gkmz9yi5fxflq6z1swr"; + rev = "b76c7f37f1a3527e8ace66bbd584851e1f803cc8"; + sha256 = "0nnrfs1siz4wwn56razlig6cvi8fqgcgk5wv5b0iyizq8a8wwia7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode"; @@ -58148,12 +60818,12 @@ pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pydoc"; - version = "20170429.1158"; + version = "20180302.2041"; src = fetchFromGitHub { owner = "statmobile"; repo = "pydoc"; - rev = "916153516382e5546b59b46342c58ed76cf27faf"; - sha256 = "18ba5mcp030l6ywdq70ryvbwn7af28kp0xi8h1bma5mwcxj2sg2c"; + rev = "146a006493f5284fdf23b42ef90454f1be25d0c1"; + sha256 = "1wk9zkwqi7vf0jpsf5y7hz0z198x4k9xp2fpqggkqfbv007ks1qq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc"; @@ -58193,8 +60863,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "pyenv-mode"; - rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820"; - sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn"; + rev = "eabb1c66f9e0c0500fef4d089508aad246d81dc0"; + sha256 = "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode"; @@ -58210,12 +60880,12 @@ pyenv-mode-auto = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pyenv-mode, s }: melpaBuild { pname = "pyenv-mode-auto"; - version = "20160122.2341"; + version = "20180216.2352"; src = fetchFromGitHub { owner = "ssbb"; repo = "pyenv-mode-auto"; - rev = "714e322319ad7a8f5f2a3691aa431537b8a1b26c"; - sha256 = "1sclhzv3w9fg54dg4qhlfbc0p1z5clyr8phrckhypvlwfgbar4b4"; + rev = "08f319efbc31571f391e032379169ab90fa71418"; + sha256 = "089n0s0vhwysgrkpjidy7gsl6skmzz2lg011mgiskfvqwijj2vyx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto"; @@ -58256,8 +60926,8 @@ src = fetchFromGitHub { owner = "JackCrawley"; repo = "pygen"; - rev = "430e2a059b6e2b0d76700cf79a3de55d9deefd9b"; - sha256 = "1blb9j3y1vfph0gxsslr4gw2diyqqb6xbkrkkcp8vzmx4jr06ki3"; + rev = "9019ff44ba49d7295b1476530feab91fdadb084b"; + sha256 = "01gmggjv36jc8660xfpfy70cydabhymd17q3z16cjqvsxapbj7nf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e761724e52de6fa4d92950751953645dd439d340/recipes/pygen"; @@ -58270,22 +60940,22 @@ license = lib.licenses.free; }; }) {}; - pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: + pyim = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20170916.2024"; + version = "20180324.2310"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a"; - sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w"; + rev = "78fe2db87d38fc64879621802e2fcf8b54b8acb7"; + sha256 = "1w5qswz1ybfzk1g5w8qlid836n6nsd5zpblfkijmss4nlkwxczgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; name = "pyim"; }; - packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ]; + packageRequires = [ async emacs popup pyim-basedict ]; meta = { homepage = "https://melpa.org/#/pyim"; license = lib.licenses.free; @@ -58357,12 +61027,12 @@ pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "pyimport"; - version = "20170808.346"; + version = "20180308.952"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "50789ef8c5e19997bd5b0d4c47acb7660d128e76"; - sha256 = "1g4kp6m9bqpvyp0wy1bjx8246mqvdy5jznl1ash1qn7gr07kb34s"; + rev = "a6f63cf7ed93f0c0f7c207e6595813966f8852b9"; + sha256 = "1q5gqhvh4zq5dy8vns694warcz48j1hdnxg16sjck4gsi9xivbvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; @@ -58403,8 +61073,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "7f6bae953ad2515b5849b90a9b7b3a64f52ea3c6"; - sha256 = "0iz3f94kghda379sspv4k8s23ykhwc70q877j12l5msq1b858gcv"; + rev = "56b5da6efd3a7ac934adbadf4d85abfc1d324d71"; + sha256 = "09c14bsfglvlbz0y7sx0di50p1iw033g5y8f3qxbwrxba3213pkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -58417,6 +61087,27 @@ license = lib.licenses.free; }; }) {}; + pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pynt"; + version = "20180410.1715"; + src = fetchFromGitHub { + owner = "ebanner"; + repo = "pynt"; + rev = "313dd24248f26ee1257b8b20885c593d8fb19d58"; + sha256 = "05ik3807pv6g8rc66wyybwgnscjwgl2dn9yssn35rvb95cavqq77"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; + sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3"; + name = "pynt"; + }; + packageRequires = [ deferred ein emacs epc ]; + meta = { + homepage = "https://melpa.org/#/pynt"; + license = lib.licenses.free; + }; + }) {}; pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pytest"; @@ -58546,12 +61237,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20171113.324"; + version = "20180319.344"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "7c4683ff12e32844f53bb31db2b3feab56cd7164"; - sha256 = "0abxip189gyhqkchwsbnylrcgxn1py9fyvrxjvrkfr24qr9m30qq"; + rev = "85b61649b5f66e966d55ffbaf90160c2b60ff410"; + sha256 = "173i3k0nvjri1g1mkgkc2i9c9mpnsvxf1ldmm12yhadl5gl2ah07"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -58564,6 +61255,34 @@ license = lib.licenses.free; }; }) {}; + python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: + melpaBuild { + pname = "python-pytest"; + version = "20180307.844"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-python-pytest"; + rev = "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70"; + sha256 = "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; + sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4"; + name = "python-pytest"; + }; + packageRequires = [ + dash + dash-functional + emacs + magit-popup + projectile + s + ]; + meta = { + homepage = "https://melpa.org/#/python-pytest"; + license = lib.licenses.free; + }; + }) {}; python-switch-quotes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-switch-quotes"; @@ -58609,12 +61328,12 @@ python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; - version = "20171006.336"; + version = "20180218.1447"; src = fetchFromGitHub { owner = "wavexx"; repo = "python-x.el"; - rev = "9bf0d16cfe7b5f24b98d6b33cbc8763edaceb174"; - sha256 = "0x255lnfyv2i7yz6ipx5adazqmvgmf4mdcixzs1wv85gazmbgfc5"; + rev = "35d6719953e809a07c0bb8f770deb5fa712d00e5"; + sha256 = "1s24a9ji549nhlanm13gq7ghnz0zj6mwpbbmbqk8igsw3arx2nvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x"; @@ -58630,12 +61349,12 @@ pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pythonic"; - version = "20160221.1123"; + version = "20180208.214"; src = fetchFromGitHub { owner = "proofit404"; repo = "pythonic"; - rev = "87475def246b84339f464e80c76c7e7fcc2e780a"; - sha256 = "1j93c4rx7llyfvfvvvcrcpsj47zb56kkdii1lnyzay4n5zakhjhf"; + rev = "e8102636cdd44a65638e3752fac9834a4ea87504"; + sha256 = "1v8qq9g9hdyia2hjkwwhsaikz528xkcirqpkgv6m9glbd3831h21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic"; @@ -58651,12 +61370,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20171005.1106"; + version = "20180415.614"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "9f528449dfc35516647118689a2104603f23b49c"; - sha256 = "11yznfndkbyl6cmi7blxrr5yw9b32qw01abhvsj8jz1g1wnxhn45"; + rev = "d7f89bd4fd3d3be7f6ef82caed51b4e7d1d754fa"; + sha256 = "1dmj4yfbwlp9259is8av9ggsx08dfhqj2jd18hvvpxbhfqcybi8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -58690,6 +61409,27 @@ license = lib.licenses.free; }; }) {}; + ql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ql"; + version = "20180404.943"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "ql-el"; + rev = "c885d125d8972374b408f6eddf031e44dc6fa0c6"; + sha256 = "1l1jdvz1913m03ikcf9g3dsraaajqac1kzfy9c9xhzx8w7bbl80c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303/recipes/ql"; + sha256 = "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z"; + name = "ql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ql"; + license = lib.licenses.free; + }; + }) {}; qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "qml-mode"; @@ -58732,36 +61472,15 @@ license = lib.licenses.free; }; }) {}; - quack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "quack"; - version = "20160410.207"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "quack"; - rev = "c1c8e448d295cc1b5752104a63a5759a9c5fdf6d"; - sha256 = "0vhzwr2adkprjibi3x4lnsvjxishysma7fhpwzgg28l21qjqc0nm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cb571caa41ea51ebbfe952526785287d913d2836/recipes/quack"; - sha256 = "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii"; - name = "quack"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/quack"; - license = lib.licenses.free; - }; - }) {}; quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quasi-monochrome-theme"; - version = "20170124.136"; + version = "20180307.458"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-quasi-monochrome"; - rev = "7d3afe41c2696ee25e3e4bcce987af1f589208d6"; - sha256 = "0bn1yzxzj6r1k3xcp45l04flq4avzlh0sbjfyiw4nglfhliyvwcf"; + rev = "7c1217521616f568a1c9aba76cc87a7381b833a4"; + sha256 = "1yg3dg6ldlpxgsxxd15qgpda0jivj4g4cyy631hakdrp5skvpmk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme"; @@ -58774,22 +61493,22 @@ license = lib.licenses.free; }; }) {}; - quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: + quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quelpa"; - version = "20170727.557"; + version = "20180325.1338"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "c095fa14046c1313b97df4ec102bdea5a981ff1d"; - sha256 = "159pkv7q0kz3slc34489gnfbyw07g3iphkx6mvzqkxql8k2iw0v7"; + rev = "1e57420158c158275c5a098951aca25651a41bc7"; + sha256 = "1lnvzl9a7pa0v1jzcf6n4qik4swmsm99y7bz9cscmy6i1hcd35b5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; sha256 = "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs"; name = "quelpa"; }; - packageRequires = [ emacs package-build ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/quelpa"; license = lib.licenses.free; @@ -58802,8 +61521,8 @@ src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa-use-package"; - rev = "f276555d6bead02a0d869149f03a545d4d4265ad"; - sha256 = "0cmpfjkwx5mpiyssyglfnrfkfg7c4qr01b598z50vc1lyg6198i1"; + rev = "cd4820a34819516f26df0fe2e4d416bdea468e89"; + sha256 = "0wbmf0ihxldgrx43c3wiaapssn8qimcyaa3hg2x2j1q05c2qlgcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b581e411ef5ea3954acc2cd997c87b3b86777333/recipes/quelpa-use-package"; @@ -59005,22 +61724,22 @@ license = lib.licenses.free; }; }) {}; - racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: + racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20170218.516"; + version = "20171211.1548"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "6e0d1b3ebd54497c0cc995a92f09328ff101cd33"; - sha256 = "0sz78cnx6gifsgd1r1l1p8bkjc5jwfh57yvwabc9zzgivfimhcb5"; + rev = "cb74060bbaff8e505ba36e20e4a3a763ee7dd4c8"; + sha256 = "1azhvwm42sracyg9vj51k72pq3mm2gfimdvrbz50p5ijmirmllja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi"; name = "racer"; }; - packageRequires = [ dash emacs f rust-mode s ]; + packageRequires = [ dash emacs f pos-tip rust-mode s ]; meta = { homepage = "https://melpa.org/#/racer"; license = lib.licenses.free; @@ -59029,12 +61748,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20171110.1153"; + version = "20180401.1803"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "b4eb09a794ba31dbe545553a54a0f232ec30e082"; - sha256 = "1wwdzal764v9fy6n05y8swsmv92nn5d15d1qxd0pjp3sqhkrsivk"; + rev = "aea74aceddf112cdfb918aa5ddb9842f0d56c744"; + sha256 = "0cqzj8qjcqwakikklx0yb193gyqvj5fvcr2acmlqzy8xwr0v65jd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -59071,12 +61790,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "20170314.146"; + version = "20180131.2246"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "bd6e385752c89760fdee7bdf331e24d1d80ee7e9"; - sha256 = "17vr2mbz1v20w7r52iqb7hicy131yaqhifbksvknx8xnm6z27pnm"; + rev = "6312f01470dcc73537dbdaaccabd59c4d18d23a9"; + sha256 = "1fqpqgkpn36kj3fb4na0w4cjwln05rvy6w1q5czas8z37rk2bs33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -59176,12 +61895,12 @@ rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rake"; - version = "20170921.801"; + version = "20180212.208"; src = fetchFromGitHub { owner = "asok"; repo = "rake"; - rev = "a27322262ebcce7765574b577000f6f939400206"; - sha256 = "1fzlll8s5vri5hmqsx5ilbrms73b0rsn3k6m5dgq6rhgn5z5k6r1"; + rev = "9c204334b03b4e899fadae6e59c20cf105404128"; + sha256 = "09k2fqkmqr6g19rvqr5x2kpj1cn3wkncxg50hz02vmsrbgmzmnja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake"; @@ -59491,12 +62210,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "20170915.1200"; + version = "20180127.1006"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "25cc3c8902f16191496b549705b00ffc7dff51f1"; - sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy"; + rev = "164136d05505275d42d1ca3a390f55fcc89694b8"; + sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -59638,12 +62357,12 @@ real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "real-auto-save"; - version = "20170918.730"; + version = "20180107.1850"; src = fetchFromGitHub { owner = "chillaranand"; repo = "real-auto-save"; - rev = "780d6c1c219e1f1efde1159a99af97b1c54c005d"; - sha256 = "1wcyvyc3nwr9a89v8i4wmqvy2fwf7x7f3kcj7a8kdnp2albkvwsa"; + rev = "d813632c1e754539cc92953ac4c3609105f9af58"; + sha256 = "0gz0w7zxl865shz9mf5xv8xi5mjq969600jqh4laazvhyk32skmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save"; @@ -59659,12 +62378,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20171006.1840"; + version = "20180327.1634"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "081f7edc79a8e510d47e10c6ce4306b2f850df1f"; - sha256 = "0nj95w5jfck0lhnrrnrl6h31cvgnpizbhnr52k7mf360vwrsjil6"; + rev = "096bd8732ea0661f10d7f7c1c91ad1ca4cf51207"; + sha256 = "1mjbhnzq4j7pfapmxqhy6lx3f6py2wbj2xrri16npmn1qqmkmbjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -59686,12 +62405,12 @@ realgud-byebug = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-byebug"; - version = "20160805.732"; + version = "20180308.1923"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-byebug"; - rev = "cb75d6bd9abbe04afa4c74a7ce9c66852814e0c3"; - sha256 = "04fn27a079zsdrf08w4rrvw9xd473ni1bh57gbizdznnvgjldfkr"; + rev = "de603d58aa9ef72a2619247a0234fccf6bc2cc9a"; + sha256 = "1hk2z7axy1v5yvx4xgkisfk00varq5rf8j88f0l63ywylyw1fwhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug"; @@ -59791,12 +62510,12 @@ rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebecca-theme"; - version = "20170730.943"; + version = "20180324.121"; src = fetchFromGitHub { owner = "vic"; repo = "rebecca-theme"; - rev = "add349748d0f648587bf17d14036677570f081aa"; - sha256 = "1932ga5j5cv3w32iwxjdjs2jdz20sw5ai10dnxb6bdzh68kkw4f3"; + rev = "9ac0c71c2858b76dc5499f62c7c7fb7f9e8f16bc"; + sha256 = "0a0qf118gj2fag3j57zmli47939rn1jayvs2fwa4l280ipfvp2m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; @@ -59830,6 +62549,48 @@ license = lib.licenses.free; }; }) {}; + recentf-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "recentf-ext"; + version = "20170925.1735"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "recentf-ext"; + rev = "450de5f8544ed6414e88d4924d7daa5caa55b7fe"; + sha256 = "1jylpqgngbl594a1qvd305m9lda48cib4dsasimdqxp20d4c56iy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/recentf-ext"; + sha256 = "122kns45l75cdwxbfjznks3kvm5jc89ik714ij2qx14qyik0xmni"; + name = "recentf-ext"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/recentf-ext"; + license = lib.licenses.free; + }; + }) {}; + recentf-remove-sudo-tramp-prefix = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "recentf-remove-sudo-tramp-prefix"; + version = "20180204.2156"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "recentf-remove-sudo-tramp-prefix"; + rev = "6d23ebc3f52b0a66236c171c45cc77a4d3aba541"; + sha256 = "0rzs9fmy1iqips6px0v57wnplbxmm3sbnk6xcszwhkwwp563hk32"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0bf1761715ee4917ba0823adbda03859d5b8131a/recipes/recentf-remove-sudo-tramp-prefix"; + sha256 = "01kdpx7kqd39a5hjym5plcj5d8szzghigq9mq186mggayg8q44cr"; + name = "recentf-remove-sudo-tramp-prefix"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/recentf-remove-sudo-tramp-prefix"; + license = lib.licenses.free; + }; + }) {}; recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recompile-on-save"; @@ -59980,12 +62741,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20171030.1346"; + version = "20180320.1312"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "6688fa7e190d5512b2bfc4ac70e6ba2f3bcc6462"; - sha256 = "0vj4mbndpawvm5sm7b0pvbi5nnd1vsvzk2qk3h9ln7i04lilsxmd"; + rev = "8b9309f6344cddf9b5ef4b9c1fde9d910672e913"; + sha256 = "04n4nhxh3v8wjav67i1wl0qi626s2xpi001bn8qbxqipnfpidk9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -59998,6 +62759,27 @@ license = lib.licenses.free; }; }) {}; + redshank = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: + melpaBuild { + pname = "redshank"; + version = "20180128.1348"; + src = fetchFromGitHub { + owner = "emacsattic"; + repo = "redshank"; + rev = "f3eef7d4891570e6bcb74eb52c73edb765a639b8"; + sha256 = "00mihmjd0amr9wzb3qsz69bp7y5iqx9vvh1hg77i57zlm88x6ma6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2677a5cf74ebace6510517f47eaa43b35f736683/recipes/redshank"; + sha256 = "0p18rkn09qb4ssr6jix13kqc3jld407qr2z2k8z78i3xy4bfzr5f"; + name = "redshank"; + }; + packageRequires = [ paredit ]; + meta = { + homepage = "https://melpa.org/#/redshank"; + license = lib.licenses.free; + }; + }) {}; redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; @@ -60022,12 +62804,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20170322.1527"; + version = "20180315.1528"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "55984dbd570c361e7d56d85f2d4ecfbcc567bda1"; - sha256 = "0amj5i69cgk0p0c3wlm68dgrav8in5n19msglnks210mbfd1vzhj"; + rev = "0a99439a0b4ed6f79b9a240ea1270140a9e328bc"; + sha256 = "1scw449mbmr70kb0r2ymhph9j0s5ym77ijp5fpwph9bri46cad3g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -60110,8 +62892,8 @@ src = fetchFromGitHub { owner = "zonuexe"; repo = "right-click-context"; - rev = "10578576f6cb2945aed00fdcd585fc65cd2c5c31"; - sha256 = "07bhw6ll2ad5725rq6jlvp2v8aqhlrbsywjng5ypmcvds5dhgbsk"; + rev = "2f8195fb81b8d27aeb42bdc4055ebce37c09717b"; + sha256 = "05fr1gg5xfwp4rmyyn181vxn2mhmb3aca1g1rp2nk36v7lfzgpxv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert"; @@ -60171,13 +62953,13 @@ pname = "related"; version = "20161002.2310"; src = fetchgit { - url = "https://bitbucket.org/lyude/related"; + url = "https://bitbucket.org/julien-montmartin/related"; rev = "0065a2e16eeaa9bface49f7f0815b9cf9719f441"; sha256 = "0gaj1mqv77dahw6zfqlf8q624b2ba589chgaa22vy4vg3lz6qzks"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a39b2fd835f6911e3dd2b42987f65d5bbea36091/recipes/related"; - sha256 = "098rd8rvlx9shbh05zdw7lnrawfkbk4cfan1i963h994538sda1w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6248cbbb6c977c9c9332a34b449eb090dd9322b3/recipes/related"; + sha256 = "0nm2dnmz4a5z187mzggsj8xrdy1x84lxx79rmwcrkh1d7jzjhi6f"; name = "related"; }; packageRequires = [ cl-lib ]; @@ -60228,22 +63010,22 @@ license = lib.licenses.free; }; }) {}; - remark-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + remark-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "remark-mode"; - version = "20151004.955"; + version = "20171217.2356"; src = fetchFromGitHub { owner = "torgeir"; repo = "remark-mode.el"; - rev = "a7e22eaf17673bd5cbf2f80bdfb219c89c1ea74b"; - sha256 = "0w40cx58c0hmc0yzs8maq1389hwha0qwfbz76pc6kpcx14v1gkhh"; + rev = "e8a95f25d865d6165a7fdb1cadf5e6f0bb5ee73b"; + sha256 = "01qdaby7mn5d8y95wcbqzwzcbjmf2329g6yjbvmdd1gn6s7qzs0b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/161a45835a153c6ac81b99311482f5dd36507da1/recipes/remark-mode"; sha256 = "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0"; name = "remark-mode"; }; - packageRequires = [ markdown-mode ]; + packageRequires = [ emacs markdown-mode ]; meta = { homepage = "https://melpa.org/#/remark-mode"; license = lib.licenses.free; @@ -60420,12 +63202,12 @@ req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "20170826.2252"; + version = "20180121.2100"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "179ab70bb3d4f7a94401dace64f695c50acfe389"; - sha256 = "1j54l002vq8hz1pghyas4aalqhsnma5czjh4fh5s5cs4v7v6d7s8"; + rev = "699d5aa9204c07905db4574406f771c69aa5752c"; + sha256 = "15q8lsld2k8yd8wqrn0hsnj8xvmwj9zgpbrqzjda452jdqsznfcm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -60567,12 +63349,12 @@ restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restclient"; - version = "20170727.825"; + version = "20180316.851"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518"; - sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra"; + rev = "859d944796ce298b5779d9d256bd8d271d57e221"; + sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -60592,8 +63374,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518"; - sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra"; + rev = "859d944796ce298b5779d9d256bd8d271d57e221"; + sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -60609,12 +63391,12 @@ restclient-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }: melpaBuild { pname = "restclient-test"; - version = "20160618.315"; + version = "20180106.1246"; src = fetchFromGitHub { owner = "simenheg"; repo = "restclient-test.el"; - rev = "a21e41b905b423e762eeb4da3a236c8b1aea8c49"; - sha256 = "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih"; + rev = "4518561bc9661fedacb6fb352e9677207f45c418"; + sha256 = "0hbilpn77w0vykga9p4dkwaygipyna7mwn24y2kwfcahcr39pqjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82e3078fc1f96d276fd288c3d7b91df5df4717a6/recipes/restclient-test"; @@ -60651,12 +63433,12 @@ reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; - version = "20170721.940"; + version = "20180213.525"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "63fb1edee017177c44f8b663a707201b3dd78345"; - sha256 = "1ha4ldfcnw57rg15mbxspymgs6b2b50f6s0fcb6d7k9xai5idmnp"; + rev = "16931909115a922b1cf3846b1f60509b6590001f"; + sha256 = "0ccpnd1n9z18wpf8m9xyx5gps2xh5kxv8s1q2zan2zs9f46sz9pc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -60693,12 +63475,12 @@ review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "review-mode"; - version = "20171029.650"; + version = "20180312.535"; src = fetchFromGitHub { owner = "kmuto"; repo = "review-el"; - rev = "115cd06558c01889f89feaa659e0d7513a2ad21e"; - sha256 = "0162gg3hf633zhr5jwj222lx143xvph001qmpmlbbqdxc0sgw5hv"; + rev = "bf38b0ce8be2eef1cf810ac6f3664d2190bb9ef7"; + sha256 = "0vmv19qvpba715xqx18dmlxq9kgkzvkf6jfd03bdcj2lh804y3pb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode"; @@ -60735,12 +63517,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20171018.1317"; + version = "20180404.315"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14"; - sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g"; + rev = "d50bd106275f3ef7f77d0147857412fb065eef47"; + sha256 = "0zjhak534j1n03z6p9wjmgc48yy40icrp2x8y9vbvg4hgx8xh9lm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -60802,8 +63584,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4"; - sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b"; + rev = "a50d9b2fd059f6a0e5b22063a5375851a087f61a"; + sha256 = "126slgxa786rcbxdnazyn7svkwk31hy1c2ab7kzswf8f0k81fqk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -60903,12 +63685,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "20170810.1118"; + version = "20180323.920"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d"; - sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx"; + rev = "a1f8f030bf5daea92dd13b953720a6c13dd3557c"; + sha256 = "0mpysjcbw9qxy1lcwsd2rqf72xahpdpn88xcq0cnk1y2jam8gjkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -60945,12 +63727,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20171029.1156"; + version = "20180409.902"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "4c10dcd764ade8e3d5dc235c26ba9299576a513d"; - sha256 = "034hrzcvbnsrr9cxy2wzggnsax708hd231hfkixwffzrrwdlhwz8"; + rev = "a0231e76808e94eb842c502fc9e10b53d3307ea8"; + sha256 = "0i6yzxfwyvbmfy1x5pymmjdli91ya6jgfq6wdjnwyrknbf6p76w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -60966,12 +63748,12 @@ robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; - version = "20170611.1755"; + version = "20171116.1249"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; - rev = "9305fa042c40a32a2fcf60f935c0796dc67b5c55"; - sha256 = "0jx3pnz9m9bxlga867qdb6midz82mfl4wzn9dsfihkl399hbj46j"; + rev = "7829f4fdda41eee0add8868646ab86e6b17de4b4"; + sha256 = "1h526m21g0yqpry8dh42aj8nv4lp74dc1cmcyfb16sx5rrk0vx27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; @@ -61176,12 +63958,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20171027.1028"; + version = "20180224.1658"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "dadd74f015f89317ff77424be30a9accadeeb4a4"; - sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -61197,12 +63979,12 @@ rtm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtm"; - version = "20160116.927"; + version = "20180329.808"; src = fetchFromGitHub { owner = "pmiddend"; repo = "emacs-rtm"; - rev = "08dc10458b56e72f1512896192b2114ef57e58c5"; - sha256 = "1ajks5dmsb5cyj0hzxbp3r305liwaayb8jds0wdnw4nk5anlsbnr"; + rev = "3e3d09387cb84801343ecca8fb02e82f213e7bbe"; + sha256 = "0cc07lhh27i1ra4alrwb6w322ddi6hw0498nkzf388arhn10h3wv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rtm"; @@ -61215,6 +63997,27 @@ license = lib.licenses.free; }; }) {}; + rubik = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rubik"; + version = "20180222.1214"; + src = fetchFromGitHub { + owner = "Kurvivor19"; + repo = "rubik-mode"; + rev = "c8dab1726463dbc9042a0b00186e4a8df02eb868"; + sha256 = "13razzmk70h5sd69ms0a3ljr285zcad0wnrqkfxbgi5rnppqlkh1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik"; + sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267"; + name = "rubik"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/rubik"; + license = lib.licenses.free; + }; + }) {}; rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; @@ -61320,6 +64123,27 @@ license = lib.licenses.free; }; }) {}; + ruby-extra-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ruby-extra-highlight"; + version = "20171106.1133"; + src = fetchFromGitHub { + owner = "Lindydancer"; + repo = "ruby-extra-highlight"; + rev = "83942d18eae361998d24c1c523b308eea821f048"; + sha256 = "18mq0ap7f0b22cdp2wdj0y2fqsahm2ngf7fvdy0mkkfs3818awlp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/73488b0aea4eb470a1f235fece0753797bfd7e35/recipes/ruby-extra-highlight"; + sha256 = "0dybf39yv0yzy8bsz9k5s64033id6hq4v268m11la4bp5fbv5r37"; + name = "ruby-extra-highlight"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ruby-extra-highlight"; + license = lib.licenses.free; + }; + }) {}; ruby-factory = callPackage ({ fetchFromGitHub, fetchurl, inflections, lib, melpaBuild }: melpaBuild { pname = "ruby-factory"; @@ -61344,12 +64168,12 @@ ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-hash-syntax"; - version = "20171013.50"; + version = "20180323.1909"; src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "bc05c3130a5d3237f04c6064297e56de5f73887d"; - sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414"; + rev = "89fc364a837d7a78ecce34380f09c073a83e30e0"; + sha256 = "1nwf3681fa6lfqr14n9wihckpi220hvamv1ppzmrhn4k49vxljy8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -61467,15 +64291,36 @@ license = lib.licenses.free; }; }) {}; + rum-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rum-mode"; + version = "20180126.1622"; + src = fetchFromGitHub { + owner = "rumlang"; + repo = "rum-mode"; + rev = "893b1a26244ef6ea82833a9afbc13cb82c0cfb53"; + sha256 = "0lgahv25a9b2dfgkcm9ipyziiqnr3sb9l2dvzm35khwf3m8dwxgq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9f8ce2dee376f1f34e89e9642c472a148fca77/recipes/rum-mode"; + sha256 = "1838w8rk5pgp1hn7a0m83mfw9jin4qv5mkyl68hl3gj7g9lhn7sd"; + name = "rum-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rum-mode"; + license = lib.licenses.free; + }; + }) {}; run-stuff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "run-stuff"; - version = "20170813.1957"; + version = "20180208.2348"; src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-run-stuff"; - rev = "2e23a78c26f62141142c743febd57ec54c78c0e3"; - sha256 = "04m7hpda5hbmr0dni4cnpdjxwzk3sygpr5m158gswhbwh2p4r0j4"; + rev = "ed42a7bc9a197ccf1ca87f9937bf98f0a9ed3f92"; + sha256 = "1w49v868n3723q6887y4bc5q8spd7xync5d581vvxdpi75qgvr0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6e9ce2acd859b887f7e161f4b9969be1a0b8ef/recipes/run-stuff"; @@ -61554,12 +64399,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20171106.510"; + version = "20180322.127"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "04e3078ffc5f4b95e0a62960e36866d4bf1a9537"; - sha256 = "1gj3wyb0bdz7a80bysji241pw47gy20k5f1jif3m2j186ki6f2s5"; + rev = "07e16c6364bf0362f76c6aa46604453dec3ac640"; + sha256 = "0xjbv9q3mz7chjaz889hyji4xaff8ql2wmk0wir6bnyg6g2k58d1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -61575,12 +64420,12 @@ rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "rust-playground"; - version = "20170211.5"; + version = "20180317.1434"; src = fetchFromGitHub { owner = "grafov"; repo = "rust-playground"; - rev = "ff4149489c30a65817750428847217368bd995ba"; - sha256 = "04d5z33pv1xqsn539nfkyjh7dvf0kc0rwili1zr6817z0406k1qn"; + rev = "cbb8a32c5f69b5acd5e04519f55465b2b241c0a0"; + sha256 = "0791msvihb99ghknkvmmbjkp1zcvn39463y3qg6xj049h2xl9skk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground"; @@ -61600,8 +64445,8 @@ src = fetchFromGitHub { owner = "senny"; repo = "rvm.el"; - rev = "8e45a9bad8e317ff195f384dab14d3402497dc79"; - sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm"; + rev = "134497bc460990c71ab8fa75431156e62c17da2d"; + sha256 = "1z5psj8mfp0fw8fx6v1sibf8cxhz30yyiwjw17w80f9c24g0j4ii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/rvm"; @@ -61617,12 +64462,12 @@ ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ryo-modal"; - version = "20170217.1021"; + version = "20180331.118"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ryo-modal"; - rev = "f6073b56c43a8bc4fc01eb27faba3335d556606a"; - sha256 = "1pq8c79qrs2zwp8q89rhm5lmcpl48axnc9mwl10gq4jy2rlzfrks"; + rev = "42f874467dfdce59b511f883496ce2624b133dd7"; + sha256 = "0k9nmi014vb9c8rymy3w8xbnj1q85xlslpblacz78iqn1kr6wy1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; @@ -61638,12 +64483,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20171102.227"; + version = "20180406.108"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "5e9a6857d42015c67681616aa3519f599f97b8d8"; - sha256 = "00g7nvcbf1291npid30pih72209l5hv2fpv6s6m5i1vg94z081fg"; + rev = "03410e6a7a2b11e47e1fea3b7d9899c7df26435e"; + sha256 = "074ny8y68fhnknkjxvrijrk534xzdiwip8wkifxfbwv3va315x83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; @@ -61698,6 +64543,27 @@ license = lib.licenses.free; }; }) {}; + s3ed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "s3ed"; + version = "20180204.549"; + src = fetchFromGitHub { + owner = "mattusifer"; + repo = "s3ed"; + rev = "13503cb057bed29cb00a14dffe4472b5cb7748ad"; + sha256 = "1ak5nmay12s4ipmvm1a36kyny05xhzmj7wp6dry391db9n7g2wy0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/32ba78167bd6908b49f340f6da48643ac38f25f2/recipes/s3ed"; + sha256 = "08scv3aqnidz28rad5npz7b4pz9dx05rs72qkp3ybkk2vhqf2qwa"; + name = "s3ed"; + }; + packageRequires = [ dash emacs seq ]; + meta = { + homepage = "https://melpa.org/#/s3ed"; + license = lib.licenses.free; + }; + }) {}; sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sackspace"; @@ -61722,12 +64588,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20171103.333"; + version = "20180215.35"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "75b84fdba1e0f4511e518b7e56c816f1ace49024"; - sha256 = "1mysq81xnwarcqvwda17n90fy25mp57gvijrccnxw91ni2wncyl4"; + rev = "9f07ff835e8d19afe571dbe414afb690c7b1cb5c"; + sha256 = "07al41ir1ab0z2m2acvx63scr33bfp3asshjl05shs4j9d4bkmdp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -61740,6 +64606,27 @@ license = lib.licenses.free; }; }) {}; + sailfish-scratchbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sailfish-scratchbox"; + version = "20171202.532"; + src = fetchFromGitHub { + owner = "vityafx"; + repo = "sailfish-scratchbox.el"; + rev = "bb5ed0f0b0cd72f2eb1af065b7587ec81866b089"; + sha256 = "1b53mdqgcmjay3i3fnxnycv8crqi20yvyv57ybgs2ikfl3v282h2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e76261e7dffcb607839440843b085709c2c90b26/recipes/sailfish-scratchbox"; + sha256 = "1s0glsi4fm6is7fv9vy1h14frq8a4bgahkc8w08vqfnpiin2r567"; + name = "sailfish-scratchbox"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sailfish-scratchbox"; + license = lib.licenses.free; + }; + }) {}; salesforce-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "salesforce-utils"; @@ -61764,12 +64651,12 @@ salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: melpaBuild { pname = "salt-mode"; - version = "20170702.246"; + version = "20180118.1754"; src = fetchFromGitHub { owner = "glynnforrest"; repo = "salt-mode"; - rev = "a41c07660199cfad3f9dd928d5674d2727508035"; - sha256 = "0y7z4lfvhd1aiyhy0yhrx9jdjsy2k1di6y747rjmf0rlwcq2gb2q"; + rev = "e46c28ef77663391519646c79641c9d177f70d35"; + sha256 = "13zk20bif05qgpqsx9hf6ri7qkxqq7nicp2lb84dg7id24md22x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; @@ -61932,12 +64819,12 @@ sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sayid"; - version = "20170509.1215"; + version = "20180404.1139"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "20a92323c3edc060c521aa93edab9dad47646b4f"; - sha256 = "0h0wn5c1n2y3cyslz3kbhksvwy1rnwvb1995949b6qkkzwf0cb4l"; + rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f"; + sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; @@ -61953,12 +64840,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20171111.1558"; + version = "20180314.1511"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "84c3d178a1f2c580f620fd8f03a05ac6413086a3"; - sha256 = "1ndxylb2jbnfrrsbbs5vcxygrqd3ssf3az01nh694hv6lkcidw5k"; + rev = "aebea880b3d3de606d8d8c8d65bc6a5040f52d1f"; + sha256 = "1iqbigqdv1g12q2bg0f6j7xl0z1ra7vy4k8h1wfqxvlb9fqfqr1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -61974,12 +64861,12 @@ scad-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scad-mode"; - version = "20170219.2003"; + version = "20180108.1809"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "7cb1e939b78c9f489d0c79812fe6c2a582113cfa"; - sha256 = "0mjdkc468w58x398ysgchshhv600px95sz7i8yfrjrhpdfn4yg5l"; + rev = "9bd8e87da64ffbdb1a41763a92e7feaf78652010"; + sha256 = "1sasl3r7fx3vy8w636sx7ahih7w6ihwzhnczi2vyxf5hyf478js9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -62180,6 +65067,27 @@ license = lib.licenses.free; }; }) {}; + scp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "scp"; + version = "20171203.1851"; + src = fetchFromGitHub { + owner = "tszg"; + repo = "emacs-scp"; + rev = "447305db246d9c9240678dd9c734ed920300463a"; + sha256 = "0f8dv17rjknlkw32dd4xmdxbkwby5dn8mychaqwlk8vanhm74n7w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/62f5c9284de51373a4015cf053d66977cf00d175/recipes/scp"; + sha256 = "1q7v2cr89syw682zqxhavaggv6aqi69rl94vm8bmn745a868gliw"; + name = "scp"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/scp"; + license = lib.licenses.free; + }; + }) {}; scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "scpaste"; @@ -62393,12 +65301,12 @@ scss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scss-mode"; - version = "20150107.1400"; + version = "20180123.908"; src = fetchFromGitHub { owner = "antonj"; repo = "scss-mode"; - rev = "b010d134f499c4b4ad33fe8a669a81e9a531b0b2"; - sha256 = "113pi7nsaksaacy74ngbvrvr6qcl7199xy662nj58bz5307yi9q0"; + rev = "cf58dbec5394280503eb5502938f3b5445d1b53d"; + sha256 = "0raja19l0igwr0pn0ghr1pj1d8i9k3m3764ma4r8nwzxcj9qw4ja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/scss-mode"; @@ -62414,12 +65322,12 @@ sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: melpaBuild { pname = "sdcv"; - version = "20171002.210"; + version = "20180211.833"; src = fetchFromGitHub { owner = "stardiviner"; repo = "sdcv.el"; - rev = "1aad9defb871dc07e27f603092bb81413be54cf2"; - sha256 = "1ij7inm1f59hmn9s1iqnywk1acfm0pqiim2s36vwrljy9lnb4ls8"; + rev = "7cb1f8ec0fa4bb25669534d62bff58df38a992a8"; + sha256 = "09i7zsizwq5k79wi5sgcfqdlbx0nazrnw3nd6hkn2vfrcffb7pf1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; @@ -62516,21 +65424,21 @@ license = lib.licenses.free; }; }) {}; - secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }: + secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "secretaria"; - version = "20170828.945"; + version = "20180104.720"; src = fetchgit { url = "https://bitbucket.org/shackra/secretaria.el"; - rev = "1cd32d957864be1ba5c44a3f505f662832169a28"; - sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg"; + rev = "e9d59d264ba30f8055a1ee1576fe9296d5b41055"; + sha256 = "10ijr9babki05j3wlhwsym85q868kirivsml7jlmi1csnn2y3c6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria"; sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv"; name = "secretaria"; }; - packageRequires = [ alert emacs f org s ]; + packageRequires = [ alert emacs f s ]; meta = { homepage = "https://melpa.org/#/secretaria"; license = lib.licenses.free; @@ -62665,12 +65573,12 @@ semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }: melpaBuild { pname = "semi"; - version = "20160816.239"; + version = "20180204.1448"; src = fetchFromGitHub { owner = "wanderlust"; repo = "semi"; - rev = "6b9c62a76f22caf1476c837ee1976eaf0eaf38e7"; - sha256 = "0h0f6w13kiyy90vnsa4jlfdlsnd04wq6b0vrbmz74q1krfs8b0kz"; + rev = "44aa82ecf78273d8ff4c84f2121b885fb7149f41"; + sha256 = "1wl12gsz9pn4wzgbffv3ymr49kcxjggc2jx19kxqyjmwdnw004yf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi"; @@ -62728,12 +65636,12 @@ sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sentence-navigation"; - version = "20160830.1840"; + version = "20180408.919"; src = fetchFromGitHub { owner = "noctuid"; repo = "emacs-sentence-navigation"; - rev = "f9aedbfc2b8d7957f427dac87558948c80582429"; - sha256 = "13413jpk84hs5hy05rlgkcr7h8diw46xhb9zdj1p9lh145s7si8w"; + rev = "7c5d2edeaed01196aec25031782e89adeaa089f0"; + sha256 = "15za4fg7c8fsih86wz1npyx6gdmw0xhizklfsyfh84416dsmgswp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d097cf9b6c9c1606505d3988a2afdd7b066abc8/recipes/sentence-navigation"; @@ -62749,12 +65657,12 @@ seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20170320.1311"; + version = "20180412.1643"; src = fetchFromGitHub { owner = "anandpiyer"; repo = "seoul256-emacs"; - rev = "8afaf6aa2c63a003e2899e3e5ba8be85f6fdd350"; - sha256 = "0viwqym1vns2l3lrxv0sdrbvadn6apk8gip26a3ln4pzq1723qxh"; + rev = "fb7dd994f9fed518693475b2b6de67d518417783"; + sha256 = "0arg66j25ixvmbhlgdjw12gzwsa5wmif7qw1mzfzd0sghgdbmj0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme"; @@ -62788,6 +65696,27 @@ license = lib.licenses.free; }; }) {}; + sequential-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sequential-command"; + version = "20170925.1740"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "sequential-command"; + rev = "a48cbcbe273b33edd3ae56e68f44b4100fa3a48a"; + sha256 = "1f05amz22klvs2yqyw7n5bmivgdn5zc7vkv5x6bgc9b5k977lggj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/sequential-command"; + sha256 = "0qhrpwcgn89sqdj8yhgax0qk81ycdanlgwx25cxy8wnxkqqcvh9m"; + name = "sequential-command"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sequential-command"; + license = lib.licenses.free; + }; + }) {}; servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }: melpaBuild { pname = "servant"; @@ -62917,12 +65846,12 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "20171011.536"; + version = "20171125.1212"; src = fetchFromGitHub { owner = "voloyev"; repo = "sexy-monochrome-theme"; - rev = "9fb835606088a0d24600faa12fe24d85cb2c0731"; - sha256 = "182wzr7lisrszivxpjp29m7vjxxi429mshp2labf2abqkfrb9jv4"; + rev = "529a1c75196391d7f2f1f42cf9d9f4a52c7d9007"; + sha256 = "0myrdmp5r2lr1n54cmrn8p0xi4kjizx8nclxaqxn99bc7g6wlcf1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; @@ -62938,12 +65867,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "20171018.1120"; + version = "20171209.1401"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "0cee957bc0bfbdee5ea3f3e430e94cdcd87ed0c3"; - sha256 = "18zhrn18asbpanmlgasy271gfh6qywr947fx2svxz5b1w40hhyr0"; + rev = "4189c1c773aab533969b587f7801ffbcd1d7d613"; + sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -62980,12 +65909,12 @@ shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shader-mode"; - version = "20171108.916"; + version = "20180105.1500"; src = fetchFromGitHub { owner = "midnightSuyama"; repo = "shader-mode"; - rev = "29118fc483bd6ad3fa42cb80867fae9dbd613fff"; - sha256 = "1hybqwaicdy99wp8chaxjxyhqd8fwqvq1fh7w49wdy83lwr5g3a0"; + rev = "c141841feeee48299cff6651ed2e201a052e0570"; + sha256 = "177kn9zrnzsayx9n9ym9k9a1rrbn8sycv1v67knpca05wkxg53zi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4396f3c10a38f91d5f98684efbeb02812e479209/recipes/shader-mode"; @@ -63316,12 +66245,12 @@ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20171018.131"; + version = "20180201.2145"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e"; - sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8"; + rev = "4b9664bab3794379af42d549d9540735c16b5a25"; + sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; @@ -63337,12 +66266,12 @@ shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shm"; - version = "20170523.238"; + version = "20180326.1757"; src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "bd08a0b2297667e2ac7896e3b480033ae5721d4d"; - sha256 = "14rl739z19ns31h9fj48sx9ppca4g4mqkc7ccpacagwwf55m259c"; + rev = "7f9df73f45d107017c18ce4835bbc190dfe6782e"; + sha256 = "1jcc30048j369jgsbbmkb63whs4wb37bq21jrm3r6ry22izndsqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; @@ -63547,12 +66476,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20171108.910"; + version = "20180310.1748"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "aa2fda2419b6e2540f1e6eb3789b6a247c319050"; - sha256 = "1imnpbc1wkx8gwac1v3ailycjxs4yxwhbhifgn20jib85nn8s66i"; + rev = "b33b23097ad34177e4179e9d3731ec5db30c6391"; + sha256 = "0vlgm1aix074ifi9gvp4c0ygdmzplydj4gdsl46173qbd8lfi2rj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -63673,12 +66602,12 @@ silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "silkworm-theme"; - version = "20160217.509"; + version = "20180301.637"; src = fetchFromGitHub { owner = "mswift42"; repo = "silkworm-theme"; - rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b"; - sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91"; + rev = "4a297f952401cfe894dcb24174f6eda05e00fada"; + sha256 = "00kjibpn3ry7j1s6kqmakybialpcx4919344lxks7wij5l6qqxx0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme"; @@ -63736,12 +66665,12 @@ simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-call-tree"; - version = "20161007.1913"; + version = "20180224.1256"; src = fetchFromGitHub { owner = "vapniks"; repo = "simple-call-tree"; - rev = "431206e9c2b88cbab9cfe9ebf3f6cb73f5e6740f"; - sha256 = "1qwswf5i060j396gfsr60zid0lqwf5xkrq3q0c1s6nz9wxlhayjw"; + rev = "20059eb5549408def76aeb03d0d20839903dedef"; + sha256 = "0gvhn2r7h6jz7a3i3a8gwlmghv1xfzj0sdib25kz645iylazji4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree"; @@ -63757,12 +66686,12 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20171004.938"; + version = "20180218.538"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "e7775d3bc5c6b73255814d0a62dc954e23a12c15"; - sha256 = "0pjhxhzzxrpcczwvd7b6a6q1nfmsr6m6mnlxn13nwf3r270grz87"; + rev = "868ec06abdc23c69597bc3a12da7aa2e5c0ad9c5"; + sha256 = "1grq5a74arng2nn5q1xjm7gl5gk55a1js2r22wsahm8gd0fn0jdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -63778,12 +66707,12 @@ simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "simple-mpc"; - version = "20161103.1219"; + version = "20180224.1801"; src = fetchFromGitHub { owner = "jorenvo"; repo = "simple-mpc"; - rev = "61b39d02313fa51a1dd7326fe24871666c64a077"; - sha256 = "1g8s37misx0kl32ngffqgqdzphz22v25k39q571jz4q1dibhmsyz"; + rev = "ad74cb621e04838f8725ab7dc8716f0f38c90413"; + sha256 = "1g3pb0n5j0s4q85zgjqnw1idvpvq3kwrakv8d6if7xb066v21ng9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc"; @@ -63796,6 +66725,27 @@ license = lib.licenses.free; }; }) {}; + simple-paren = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "simple-paren"; + version = "20180205.1141"; + src = fetchFromGitHub { + owner = "andreas-roehler"; + repo = "simple-paren"; + rev = "f5cc9b4325a07efe92379a11a1a61035c9a1e8c4"; + sha256 = "1p931vqdnh6agrrzxf55x34ikb1x53mz1a17kskzlqchlzfmc3da"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren"; + sha256 = "0bmw8pkh9864gymy36r3w5yw08pq894gb1n80wfqls4a78zyvkm3"; + name = "simple-paren"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/simple-paren"; + license = lib.licenses.free; + }; + }) {}; simple-rtm = callPackage ({ dash, fetchFromGitLab, fetchurl, lib, melpaBuild, rtm }: melpaBuild { pname = "simple-rtm"; @@ -63820,12 +66770,12 @@ simple-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-screen"; - version = "20141023.758"; + version = "20161009.220"; src = fetchFromGitHub { owner = "wachikun"; repo = "simple-screen"; - rev = "4fcbdb4575310c0a2b4dd17fc8aeb4d7e6e9ffae"; - sha256 = "0zf9wgyp0n00i00zl1lxr0d60569zgcjdnmdvgpcibvny5s1fp2i"; + rev = "596e3a451d9af24730ab31a8fe15c91a4264d09d"; + sha256 = "0mqlwrkipgf977s0gx57fv5xrqli67hixprvra6q64isapr86yh1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02db9a649002ed9dec03661a518f74f3c7a176d9/recipes/simple-screen"; @@ -63883,12 +66833,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20170618.644"; + version = "20171201.1806"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "78ab3d818633c0d6575cd1895c119bd690003bf6"; - sha256 = "0z9zary8apzjsx031fhy94ggqancm94mjhj335kr743s8zr3511g"; + rev = "0fd6dbd0566af29964078e4b74baf69c2f52381a"; + sha256 = "0qlwmxrz2kngri7ywy64bja0najq9m6asq2gr53ns0mkq1ngf0l8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -63971,8 +66921,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "7df248a4b7ec2eb0f3cabcbdfb052593d1f86590"; - sha256 = "07l90cqcngwy8vxx4yxx7i72lp10wzv44ypn07zwyrl69bcmf2q8"; + rev = "c8fc64300cbe85896f6e0719ef2c91bfba9c4fcd"; + sha256 = "1rl5rmvq0qgdr8zrzbdvahf8rxsdajj7zbyzxyqfmyqr83c9yrz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -63992,8 +66942,8 @@ src = fetchFromGitHub { owner = "NateEag"; repo = "skewer-reload-stylesheets"; - rev = "27c5a64785cd61419c1fe5bf53da46cc278f251d"; - sha256 = "0pc0mnrgd47cq61s8xrc9mcizfc3cj4ln7r5ixqk6jq59img27fh"; + rev = "b9cc5635230ac3c0603a6da690c6e632d0a7490a"; + sha256 = "0c8dpbl0z45w1brllcysibmpbnk8yqjgi3iywmqnhrycb7lrda4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeaa2c89b995f1ab0b0f96493db0cda44cc851ee/recipes/skewer-reload-stylesheets"; @@ -64051,12 +67001,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20171017.822"; + version = "20180410.2035"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "c8f4c3312b574b8f4cd5ddaaa6ec7710893a9ff0"; - sha256 = "01aibrnkzyi40b7bfz5wfl34wwjil4nylg6llkhrmzc6mfqabnjy"; + rev = "411b1ec8385c431d2ad1a56525a981d8d63e1700"; + sha256 = "0ghnhcr9z7av9iwhdq1ww3fc0i11637xrri8l4w69dx3j435virg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -64114,12 +67064,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20171106.1331"; + version = "20180413.1720"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "55fc578ed829b95a63c31cec242bd86a6e0be39e"; - sha256 = "1bgmk0kr0y15lm2cmkmzw529r2k98j4c3n8v1k4rsxw1rj8961n3"; + rev = "26695c66162dcbb9dfd083c6e3b329c468e14ed9"; + sha256 = "1fj096yhvxnj47qvc0b3pw3vf7icxv2jdfa3nvap9aksj453xndb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -64132,22 +67082,22 @@ license = lib.licenses.free; }; }) {}; - slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: + slime-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-company"; - version = "20161229.743"; + version = "20180119.1043"; src = fetchFromGitHub { owner = "anwyn"; repo = "slime-company"; - rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb"; - sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g"; + rev = "4c2e2805540dea700130607fa235018a87e4a070"; + sha256 = "0ihwchp6hc1rxmahrhaly1cnhqs6k6ks32iiywwsyw7fjc34alc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company"; sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2"; name = "slime-company"; }; - packageRequires = [ company slime ]; + packageRequires = [ company emacs slime ]; meta = { homepage = "https://melpa.org/#/slime-company"; license = lib.licenses.free; @@ -64282,12 +67232,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20171111.1604"; + version = "20180412.355"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "83c88318bca48b1269924cd5c76b9777ecf84f11"; - sha256 = "0s6y54mi4p336cmky9kvfhwrwfkhvl8awy73knf27zfhclhjfh7c"; + rev = "7d12c47bc573c5497487cfba60ccb30bd66514d7"; + sha256 = "15wkra725r1sqzgpqgjs6shw5njlv116xinw4di9b41ih9qg98k1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -64303,12 +67253,12 @@ sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-company"; - version = "20160308.557"; + version = "20180212.1653"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-company"; - rev = "08aef69394fbef31dfeb3d3bb72a4557df9d7624"; - sha256 = "128gb6hsb7zig4czwgwjcm58lgqk6rmj7qi17a9cz5gsnggjcwii"; + rev = "dfe18218e4b2ee9874394b50f82f5172f41c462c"; + sha256 = "1bj8w2wfq944cnhsk5xx41mfrjv89scrg4w98kqgda5drkpdf8a7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/sly-company"; @@ -64405,6 +67355,27 @@ license = lib.licenses.free; }; }) {}; + sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: + melpaBuild { + pname = "sly-repl-ansi-color"; + version = "20171020.816"; + src = fetchFromGitHub { + owner = "PuercoPop"; + repo = "sly-repl-ansi-color"; + rev = "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048"; + sha256 = "0fgcn6bwgz8yyjza07kfi86siargvpq4kp4j20hs6b67ckxjxx0x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/981e01f562c40e02cb6d56dc1347e922fbad9c18/recipes/sly-repl-ansi-color"; + sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi"; + name = "sly-repl-ansi-color"; + }; + packageRequires = [ cl-lib sly ]; + meta = { + homepage = "https://melpa.org/#/sly-repl-ansi-color"; + license = lib.licenses.free; + }; + }) {}; smart-backspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-backspace"; @@ -64450,12 +67421,12 @@ smart-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-compile"; - version = "20171104.2333"; + version = "20180315.2030"; src = fetchFromGitHub { owner = "zenitani"; repo = "elisp"; - rev = "2a0c9b33bd97461d100e24df0103d4e5526a30d6"; - sha256 = "1h0d1rbaprxrwgwi8pq2q93xf9j8q8qy7p42iyywav9ilc6sak6p"; + rev = "16ebc3c570f1949b8198fcc8663d6d26df32717a"; + sha256 = "0i5g7inbr90l3n1rsf4152ax4wkbw2q41ks9j3x6a956zxn8q92w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93562afd7b62d7535b8010179ba6ac7e8e6280d0/recipes/smart-compile"; @@ -64572,6 +67543,27 @@ license = lib.licenses.free; }; }) {}; + smart-jump = callPackage ({ dumb-jump, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smart-jump"; + version = "20180121.2252"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "smart-jump"; + rev = "5431fcd2052918d85507ac31c40256adb67eb77e"; + sha256 = "12224rfgb9193dmjgshcaxac70fprfl7r0m64p4aw0f6cxfr0pqp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump"; + sha256 = "14c7p6xqasd0fgn70zj1jlpwjxldzqx44bcdqdk6nmjihw0rk632"; + name = "smart-jump"; + }; + packageRequires = [ dumb-jump emacs ]; + meta = { + homepage = "https://melpa.org/#/smart-jump"; + license = lib.licenses.free; + }; + }) {}; smart-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-mark"; @@ -64596,12 +67588,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "20171013.849"; + version = "20180323.648"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "1facbe9816b602c640ddb23602e30588d6d904ca"; - sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc"; + rev = "9e261a2bb6ade7f8a4428bc6cb27789878b2844c"; + sha256 = "1hfngb60n3nbfx1p662p76kz7v4mjcppf0ygbqlhrlbv6a9n8ll5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -64621,8 +67613,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "1facbe9816b602c640ddb23602e30588d6d904ca"; - sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc"; + rev = "9e261a2bb6ade7f8a4428bc6cb27789878b2844c"; + sha256 = "1hfngb60n3nbfx1p662p76kz7v4mjcppf0ygbqlhrlbv6a9n8ll5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -64785,12 +67777,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20171112.902"; + version = "20180325.438"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "7a8dff4c6f0eb433c3f2bb92b04b5aac5d06d416"; - sha256 = "11gbswaisi5qn07s5acxazasdmsn1qb3wrz011cn06md6swg5i6x"; + rev = "6eea872207c331c3df70caac49577b01926be45a"; + sha256 = "02qx8clgwwaggm2xmrsr0bxcapiipryyb5d4csm05xpbm19q7xv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -64869,12 +67861,12 @@ smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smbc"; - version = "20160706.1522"; + version = "20171229.1008"; src = fetchFromGitHub { owner = "sakshamsharma"; repo = "emacs-smbc"; - rev = "c377b806118d82140197d9cb1095548477e00497"; - sha256 = "16cj6jsy1psmcjshxb46i44sf1zb9s4mfiagl5cr22njy01ajq1h"; + rev = "10538e3d575ba6ef3c94d555af2744b42dfd36c7"; + sha256 = "0b2fndvp9kzlr65b0gr0z5hmapa4y96a6zvc2nrlijffkgyk05nn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc"; @@ -65121,12 +68113,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20171030.1016"; + version = "20180320.2029"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "990d6d8e98b96b9afe5b9b340507b1aecd8de1ce"; - sha256 = "1bd6kwzkk8vfhfc7m384y40lh6rdw90g6624c0hlfrs9zwihmvs3"; + rev = "43a4b37b1374de50e2022885077968af6d0e30a5"; + sha256 = "1xjhg3921gpgnxwr2grcrw9j9ar9faggppv030lyc4i7cx5qj357"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -65331,12 +68323,12 @@ solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solaire-mode"; - version = "20171109.1215"; + version = "20180328.343"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "ce91b8709124738abb4a1612d4801e16f1d0faec"; - sha256 = "1aval7m02m05w9is496za6kasp071jkwj29n1jsyixjzsfpbkrzi"; + rev = "9307486ceee18f4b622406b8d600360419e6d742"; + sha256 = "0j8vl26vpzmsfbpx23wj5c9b7ia6fdyr8advnk6vcbkcwgj8r9q2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -65352,12 +68344,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20171103.52"; + version = "20180316.859"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "d06bf199f0e590708452ba32009d069dafa3d347"; - sha256 = "0zpwf8gf72i74rnmr0ywaynyasj5a8bxqag1kj70pigb4jxdwwyn"; + rev = "1a46af3ff988e656a12b93c503fff87324b7420b"; + sha256 = "1w8rw2fqrf5xmy2i5pr7bxlr6n21vzfhcgd65jknbp2229nggkrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -65373,12 +68365,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20171001.926"; + version = "20180409.853"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "d0a09c68912fcd03e384b0b2a9746f4e002d0df8"; - sha256 = "0zs16af2j6l0vypgikvs78x82cq8m5yfdfpi550cymkv7mjydj4v"; + rev = "051128d7b7f217263c1aee5cb602338803d44ecb"; + sha256 = "1lfa1jbl5rfmvsk2cvsa5z4glvvg3qnhphksvkhinaha23369vhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -65394,12 +68386,12 @@ sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }: melpaBuild { pname = "sonic-pi"; - version = "20171011.503"; + version = "20171205.405"; src = fetchFromGitHub { owner = "repl-electric"; repo = "sonic-pi.el"; - rev = "6b362bbdfacf7aabeb494c3e22f6fd3f48ca9738"; - sha256 = "0xk03swaclhm41vnwzmwil05mgabkb23lrp28wvl6qxzhd3hmrwq"; + rev = "3cf101b3b299735ed91658c7791ea4f04164e076"; + sha256 = "1x2w7qcx9xcvagb47hlc5vsf5aj5mr0mzvnazyd7ajjilbzn48yr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi"; @@ -65461,8 +68453,8 @@ src = fetchFromGitHub { owner = "omouse"; repo = "emacs-sos"; - rev = "01b5e25814b2e76db3814a967e25edf85d33bcac"; - sha256 = "1w1fdf5ppz22aq40w5wmi2619sgkvw97rr8zqigw1acva0pxysaa"; + rev = "1573adca912b88b5010d99a25c83a5b2313bd39c"; + sha256 = "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos"; @@ -65482,8 +68474,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-clojure"; - rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32"; - sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv"; + rev = "a480c887b53cb007b7b099c5ffcab89b9e59d7bc"; + sha256 = "1gf5fsrjigzxabd9k47lb98y3wdjwpw02x9ldnjzrgxfjfbxgqm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure"; @@ -65590,12 +68582,12 @@ sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "sourcekit"; - version = "20170126.353"; + version = "20180101.34"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; - sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; + rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781"; + sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; @@ -65695,12 +68687,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20171111.334"; + version = "20180412.526"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "ca20430271f80d46892d62cb7624b4dee6cafe72"; - sha256 = "1a9my43y64y4k7bizvxc0pdr7194vcf167jdiyyl577wxq1z640p"; + rev = "ca85233b443216f8519c401c58af6807b6d31740"; + sha256 = "1ssbvp8xc1i7bf51rb2n0pkbhqs741dq0i0akwc3qqjg2sblckk1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -65737,12 +68729,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20171102.1009"; + version = "20180319.736"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "ce45974252536af726e67515271186f92d47e3cc"; - sha256 = "16gkphggpkach7w1s4qx08i2p53g1w9ps0r0i8a0qfk6rv0myvgh"; + rev = "3c1a613a36e80d10ecd4a536d690dca672d41242"; + sha256 = "0arg3sw1rrlkn12kag5zyx8jgn4xgfffj7ysxpyqag8as7i5mcwi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -65821,12 +68813,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20171030.528"; + version = "20180320.1102"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "e220a0c0c478fee0be3622442651981cdd82090c"; - sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4"; + rev = "a00bb622c54086ac1ee96c265bf7fbef12c68089"; + sha256 = "0f919alnqbp5dnc4krgmnc9acqg84xs64fmzjc78gpbmfn0kyi0m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -65860,18 +68852,19 @@ license = lib.licenses.free; }; }) {}; - speechd-el = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: + speechd-el = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speechd-el"; - version = "20160710.359"; - src = fetchgit { - url = "git://git.freebsoft.org/git/speechd-el"; - rev = "ec344edd498f95e3c945958475b31bae6505c34c"; - sha256 = "1ycq2ncixkm6imnhp2iqdray5f1mngnzfb3f2i3f0pi9k6xgavkb"; + version = "20180105.1217"; + src = fetchFromGitHub { + owner = "brailcom"; + repo = "speechd-el"; + rev = "0b25d3eb7ae219d2af9a7e9df2f3334652156bf5"; + sha256 = "00b2851pgrzvcl828l48gxrmy779w8s1k4ngf8pf0sh1y9bd2715"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d28c4550ae3b0f7e5fc032754d698cccda6ac0c/recipes/speechd-el"; - sha256 = "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/96669a664122c2fb69acd4cad2d7bf75d3e8272d/recipes/speechd-el"; + sha256 = "0p8zih9s2x6l2xcfjbzriyhsicaiwxz54iq9h3c8szlzq708mayc"; name = "speechd-el"; }; packageRequires = []; @@ -65880,27 +68873,48 @@ license = lib.licenses.free; }; }) {}; - speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + speed-type = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speed-type"; - version = "20161230.815"; + version = "20171230.847"; src = fetchFromGitHub { owner = "parkouss"; repo = "speed-type"; - rev = "9940383d94688e7f130b01f9872182ab59edf00f"; - sha256 = "0gfiw3rmqyargc1prkrglmzvzxm03nszqqba1q9zd7cs0m315pmm"; + rev = "7a67fcd7bf825eee890097bd4a1b3c4f531a1135"; + sha256 = "0nlmqgf4rg5qmkhpsal7j18wr5h74971k6d0wzw7rmjmpnjqhzvc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06"; name = "speed-type"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/speed-type"; license = lib.licenses.free; }; }) {}; + speeddating = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "speeddating"; + version = "20180319.23"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "emacs-speeddating"; + rev = "df69db0560f19636a66a74f3d88c793bbb18b21e"; + sha256 = "0mhzjia900irv0ndiw6w2vzin1gvyaf48pghi16r562ci4lr963w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/01e23a3e2a2495e86aba60302dbd06f3b25768b4/recipes/speeddating"; + sha256 = "0b5lcb1inkcx94grib5ssv1qkbzxqryzm115qizlgfs04k8cwz09"; + name = "speeddating"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/speeddating"; + license = lib.licenses.free; + }; + }) {}; sphinx-doc = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "sphinx-doc"; @@ -65946,12 +68960,12 @@ sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sphinx-mode"; - version = "20170607.1436"; + version = "20180316.856"; src = fetchFromGitHub { owner = "Fuco1"; repo = "sphinx-mode"; - rev = "0a9fcd60639f1f4235b4747e8449b9f48651705f"; - sha256 = "05kn45gh4l1wrj06qb3qzphx8mfqn3zqb8v73awhn5p7a1asb8kr"; + rev = "95a14a288b50db70ee10598f83e5b087ba693bfb"; + sha256 = "0c8p65jwrbn9pmk6j87g99p6fqcahfrc6wngmx94zw5m2wvxca2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode"; @@ -65985,24 +68999,24 @@ license = lib.licenses.free; }; }) {}; - spike-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }: melpaBuild { - pname = "spike-theme"; - version = "20160530.733"; + pname = "spiral"; + version = "20180223.340"; src = fetchFromGitHub { - owner = "m31271n"; - repo = "spike-theme"; - rev = "7a7766be0b6197103840644bb074f864d0d91cd8"; - sha256 = "0ah19a68d6fda3g5zzvqz28cms0yiadykkx7p8hiid4s4mdl41hj"; + owner = "unrepl"; + repo = "spiral"; + rev = "907b9792467139a942ba7b07ca0276b90770baf9"; + sha256 = "1rggzzvya26abbzd8bc2kpv59kzgm75wqv1vwqnj9c8im1jvs1na"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cd64f15c3fb7eee1bfdd0d7db5affa5c10052a6f/recipes/spike-theme"; - sha256 = "06pv0zzw0w12xlafyhakf09cl0hkyzis0g2bh2jn3pv4ac2kmwkp"; - name = "spike-theme"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral"; + sha256 = "18rww2nfy5s22czabk71wqzrb53r0p2635872vr44b6kfwlb6qcw"; + name = "spiral"; }; - packageRequires = []; + packageRequires = [ a avy clojure-mode emacs highlight treepy ]; meta = { - homepage = "https://melpa.org/#/spike-theme"; + homepage = "https://melpa.org/#/spiral"; license = lib.licenses.free; }; }) {}; @@ -66097,8 +69111,8 @@ src = fetchFromGitLab { owner = "iankelling"; repo = "spray"; - rev = "df326991acb2bd64af373bcf09816df9c6424d0d"; - sha256 = "1jk7qyj7yvbcs9m977fi73ypgp9bgsckgrqcf95wsfcfviajf8z4"; + rev = "00638bc916227f2f961013543d10e85a43a32e29"; + sha256 = "1avbfr32dvff26kgvd5vgan99nb5c6al9kv5xbmy2rcls17py7r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4f5053aa4e1af3f636febe9c3ce8c6ae20c090d/recipes/spray"; @@ -66216,6 +69230,27 @@ license = lib.licenses.free; }; }) {}; + sql-clickhouse = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sql-clickhouse"; + version = "20180302.755"; + src = fetchFromGitHub { + owner = "leethargo"; + repo = "sql-clickhouse"; + rev = "2edccd94145c55a040a3a87193793f06cf01f64f"; + sha256 = "0zajd35i02h869mg6n2pn2fnb80ddny6ss1kap21b75p2gw79lb7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a0ef23e6825924094eb69bd8526a95d8fab210c1/recipes/sql-clickhouse"; + sha256 = "083i9aaf69yk71mndl5x0pimn3bkkhp3mfppxvy0f5lzf2847q2j"; + name = "sql-clickhouse"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/sql-clickhouse"; + license = lib.licenses.free; + }; + }) {}; sql-impala = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sql-impala"; @@ -66321,6 +69356,27 @@ license = lib.licenses.free; }; }) {}; + srcery-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "srcery-theme"; + version = "20180414.636"; + src = fetchFromGitHub { + owner = "roosta"; + repo = "emacs-srcery"; + rev = "6eea761e039a9511cb49b2cd3967b498b06db979"; + sha256 = "0gqh4vn8f9d1jy1z8qw6qq5lgmbqywb9nbg1c3jrffgxcn1r414b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1df48441ecf6abd272ff154722b9ce0e2546c284/recipes/srcery-theme"; + sha256 = "1r8srxhznli3sskwppk7fyapyx0qixagkwm0fllgsbm4nwkzq9pn"; + name = "srcery-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/srcery-theme"; + license = lib.licenses.free; + }; + }) {}; srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; @@ -66345,12 +69401,12 @@ ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssass-mode"; - version = "20170817.1216"; + version = "20180413.2303"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ssass-mode"; - rev = "d17d2de381ffc96e62e77435fb7b387bf59aceec"; - sha256 = "1vw2mzn8yczgyspgmv4f621d7h10qxa8hfzalb14bvwqn4h37spy"; + rev = "511fb0b7c41b5a479f9ea4b65f38b14454cb1401"; + sha256 = "199v7n8l9784hv2iqhqwf2na9gw20l22bf9dmi22sjmfsk8l9s7l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode"; @@ -66387,12 +69443,12 @@ ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-agency"; - version = "20170807.1152"; + version = "20180403.1638"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; - rev = "e572e031852561f98a7053afcdc9a3796dde2137"; - sha256 = "0z2ywkiwv983vz4bk5vc62p3xapp15a4715l9sp5c8x70nlq02y3"; + rev = "bd4f655adce484bfceee4bb816429b96bc35113f"; + sha256 = "0d3ppp4qs4n3rh0sla1x1kkrwl4fhlz1gvc9472vnlhva38ffxsn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; @@ -66408,12 +69464,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20171109.1549"; + version = "20180224.251"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "7824d5f8baf2c97856f5bc7b1ef88befbb1978f3"; - sha256 = "1jqb6d83saliq11q9zkq0ndgpxgyfqjk41srwwnpg66nq031zdxq"; + rev = "e4596accfc29f34388b701c1dd5ebffcb8c70154"; + sha256 = "1jcfhxm2px19b9yy53napj4d22v8s1q76gy68c47yimkbabhmzir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode"; @@ -66426,22 +69482,22 @@ license = lib.licenses.free; }; }) {}; - ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20171031.2204"; + version = "20180411.2201"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23"; - sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw"; + rev = "d0be94676f44078fd29668c6e1a790cc0cc02f88"; + sha256 = "0gc3pjzjgvznla5bl9n0yahsj8whs8jnicah5kv5zjgv99wslvb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm"; name = "ssh-deploy"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ssh-deploy"; license = lib.licenses.free; @@ -66492,12 +69548,12 @@ stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stan-mode"; - version = "20161023.1958"; + version = "20180110.1441"; src = fetchFromGitHub { owner = "stan-dev"; repo = "stan-mode"; - rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac"; - sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"; + rev = "a8e88473ef996b455523dc3fbcf2d8520659652f"; + sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode"; @@ -66517,8 +69573,8 @@ src = fetchFromGitHub { owner = "stan-dev"; repo = "stan-mode"; - rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac"; - sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"; + rev = "a8e88473ef996b455523dc3fbcf2d8520659652f"; + sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets"; @@ -66534,12 +69590,12 @@ standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "standoff-mode"; - version = "20170609.134"; + version = "20171115.931"; src = fetchFromGitHub { owner = "lueck"; repo = "standoff-mode"; - rev = "b194fde6bf31ddc77409275e134aacba27e88043"; - sha256 = "0l48dij62d5cvw7kry0739i8zixkbmj80ghhixb30l6g0wg8k48g"; + rev = "cf84b14066d63694d931395c6026fd0245d8a62b"; + sha256 = "0dbcaz3faw8knx91yjsrb988sn2d9k0i5byhs1bi1ww36y6hmgs6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode"; @@ -66681,12 +69737,12 @@ stem-english = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stem-english"; - version = "20170113.24"; + version = "20180108.1958"; src = fetchFromGitHub { owner = "kawabata"; repo = "stem-english"; - rev = "c8d9ccf1ea38ea403ba360b79b1042b0fd449a70"; - sha256 = "15bwbqapr3kfazpxagpzy6fpkgc669mb8n8psz7gaqhlpxsliwiz"; + rev = "c9fc4c6ed6bf82382e479dae80912f4ae17d31f4"; + sha256 = "1bkmgjfp7xir6d0yf782xkjvf595blrqhr3hack26jg5zl8qsrya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8e97e70e7a86b9f5e55bdd2db492994e8abdd5/recipes/stem-english"; @@ -66699,6 +69755,48 @@ license = lib.licenses.free; }; }) {}; + stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stgit"; + version = "20171130.759"; + src = fetchFromGitHub { + owner = "ctmarinas"; + repo = "stgit"; + rev = "ffd7fb7a67b4c90b38f6caa7ce14448e11cbc86e"; + sha256 = "01rxlg2qqqw1bvzdqdmhikag02sp9f6fira0zhwzxmrp5gsvbh3a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit"; + sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g"; + name = "stgit"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/stgit"; + license = lib.licenses.free; + }; + }) {}; + sticky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sticky"; + version = "20170925.1736"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "sticky"; + rev = "fec4e1af38f17f5cd80eca361d8e8ef8772db366"; + sha256 = "126zs059snzpg83q9mrb51y0pqawwrj9smr3y7rza4q4qkdp1nk0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/sticky"; + sha256 = "0g98qagqchwq9j5nvdz315wak8fvdw1l972cfh0fr4yyg7gxi6xr"; + name = "sticky"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sticky"; + license = lib.licenses.free; + }; + }) {}; stickyfunc-enhance = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stickyfunc-enhance"; @@ -66744,12 +69842,12 @@ strace-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "strace-mode"; - version = "20160710.2134"; + version = "20171116.1239"; src = fetchFromGitHub { owner = "pkmoore"; repo = "strace-mode"; - rev = "6a69b4b06db6797af56f33eda5cb28af94e59f11"; - sha256 = "1lbk2kzdznf2bkfazizfbimaxxzfzv00lrz1ran9dc2zqbc0bj9f"; + rev = "2901baa968d5180ab985ac40ca22cc20914d01f5"; + sha256 = "1jd930nc2g562n4cqq1ppl2d8dq7bxkr3fh9f0gjms7bcm106kz9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2003bee9992d9e79124d95d30b573c8a6bdbfe/recipes/strace-mode"; @@ -66807,12 +69905,12 @@ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-inflection"; - version = "20170419.1638"; + version = "20180102.643"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "297aaf68e666381521b02d433fcd28d8b51c48de"; - sha256 = "1621lwda3j3pwfxqwfa2gp4fxz869bc0ib87v71mrab8p1qsdizg"; + rev = "d506eeeac59ea71601a901c311a874949a25372f"; + sha256 = "0mp9h42qrgdlk34m9ffdqmhyy65slna5vw71bpw1883aic4agq70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; @@ -67054,6 +70152,27 @@ license = lib.licenses.free; }; }) {}; + sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sudden-death"; + version = "20180216.1623"; + src = fetchFromGitHub { + owner = "yewton"; + repo = "sudden-death.el"; + rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb"; + sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death"; + sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh"; + name = "sudden-death"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sudden-death"; + license = lib.licenses.free; + }; + }) {}; sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; @@ -67120,12 +70239,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20171016.1420"; + version = "20180214.1523"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "345e00569333095eb24e61239a80b0f0c77b2d11"; - sha256 = "0npqvhnfmrx7jq1slz489rh2l4rnfhqhbi6ybdzw5rism8r3jqwb"; + rev = "66051b2fd3d21a8e103928782a8c926ea434beba"; + sha256 = "1xj3jzsh44ymah8nvjvm7i8g81vkq6wk7mcq2rm2qvaxin4l1bcp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -67162,12 +70281,12 @@ sunburn-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunburn-theme"; - version = "20171101.1126"; + version = "20180414.2312"; src = fetchFromGitHub { owner = "mvarela"; repo = "Sunburn-Theme"; - rev = "c57190f87e2e6c5ef6c7fbfd40964eb8f11b32ca"; - sha256 = "1b2d0iky9w8f0sww4wish55j2s2j1y2v4bjf3lk0yg2ysbspy3vq"; + rev = "995b389b7aa18b511718e9dcc68d7e1d9a2891a9"; + sha256 = "0skmxv4qmdncp79jd0kh5rsx7ff98r8kmzii9l9d0da3xmkvgx1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme"; @@ -67204,12 +70323,12 @@ sunshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunshine"; - version = "20160410.1317"; + version = "20180325.548"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "sunshine.el"; - rev = "11e49846a116bdec6e2e463bed2db4c2df9c8ad2"; - sha256 = "0jv1shacpxqbw6pv9rlkk8z84si85alhillhb9a2s6s36kjmybk0"; + rev = "ecaccac91010f8d464646a0360b1676be71e6600"; + sha256 = "0n9ppy22ijc2cgs5xix8nks7abn0shvh0v0f2ir1j7v1ckjsklc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0ff9a4ef4bbe8de722a4f77f4a56a851497ff1/recipes/sunshine"; @@ -67372,12 +70491,12 @@ swap-regions = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swap-regions"; - version = "20160413.1023"; + version = "20180116.253"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "swap-regions.el"; - rev = "2789091b6f34c0d4b82546eb39c4e73dc96e8679"; - sha256 = "1m0apxjcj6xhbic36il1mbbril6pw2h6d9kmsb0jhibyy6mc8r78"; + rev = "6e7a1bc68f11afe00809c8e27c13bca08393a91c"; + sha256 = "02z552qsc96big3davdj3yaz6f4fg72ljpn7nvzccp2wwchzfa1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6805c7710618ed1178ffd3488295d4d6b33e8ebe/recipes/swap-regions"; @@ -67390,36 +70509,15 @@ license = lib.licenses.free; }; }) {}; - swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "swbuff"; - version = "20041012.18"; - src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "swbuff"; - rev = "dcde4ddc7beafef3150e8c645724bdbbf8596028"; - sha256 = "1hxwa3hdhdx3ikfkblda748assm0k5mgwpdjv3jif37n0lw0f435"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff"; - sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk"; - name = "swbuff"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/swbuff"; - license = lib.licenses.free; - }; - }) {}; sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; - version = "20151207.916"; + version = "20180401.1715"; src = fetchFromGitHub { owner = "CestDiego"; repo = "sweetgreen.el"; - rev = "a456dd7948a25da8ff007a142cf1325b4855d908"; - sha256 = "10blwlwg1ry9jznf1a6iss5s0z8sj9gc02ayf5qv92mgxvjhrhdn"; + rev = "ffd7a7497db05e64031eaaffe170741b40ed753a"; + sha256 = "0whciwh6avhfb2qhpxfl63x3z097hcm7hwhypx8symydy3r4cbqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63812707948e6dcc00e00ebc3c423469593e80fd/recipes/sweetgreen"; @@ -67435,12 +70533,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "20170918.51"; + version = "20180222.232"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0"; - sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc"; + rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29"; + sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -67477,12 +70575,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20171107.1041"; + version = "20180402.1857"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "5009b8149a86949f9e6d7546479e998be2e14337"; - sha256 = "181bhxq2xscd9h1s0aix5lkp7gzg041q713157hrv200p2fnzb6d"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67498,12 +70596,12 @@ swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }: melpaBuild { pname = "swiper-helm"; - version = "20151116.330"; + version = "20180131.944"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper-helm"; - rev = "57012ab626486fcb3dfba0ee6720b0625e489b8c"; - sha256 = "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b"; + rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008"; + sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm"; @@ -67537,22 +70635,22 @@ license = lib.licenses.free; }; }) {}; - switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + switch-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "20170718.1932"; + version = "20180222.1731"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "67113287ba61ce1951363a49f54148743dcea51e"; - sha256 = "06s1zdy2mlw63w3rnyja9jkvq4m5b46mvi8qjwxcpgqjdihj6f6m"; + rev = "680182240012c2ad8fb35479f915e653315b4803"; + sha256 = "0fkz29spgfbx7d1hi1xm71wa1glk448v7gidqgrdylsmbzwkj1y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2"; name = "switch-window"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/switch-window"; license = lib.licenses.free; @@ -67603,12 +70701,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20170521.1832"; + version = "20180212.1101"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "8f1e3346286cfa5a5299ef192cc5aca3f37a7745"; - sha256 = "1ans6l0rv71w2vq0v4137jr0jhgzhkk62l7cq6b5m83v4ld9gr09"; + rev = "833435fbf90d1c9e927d165b155f3b1ef39271de"; + sha256 = "1369xaxq1vy3d9yh862ddnhddikdpg2d0wv1ly00pnvdp9v4cqgd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -67624,12 +70722,12 @@ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symbol-overlay"; - version = "20171103.2306"; + version = "20180412.339"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "305ef1d283923d2b0f1cd751f57f71754ab714e6"; - sha256 = "0j5542283mmdl30syk0k5p6ybb0w3xlnamjrrafdaj618v3anvgv"; + rev = "b76f510037eb8e0ea018272495f356c71ff5b758"; + sha256 = "0dlb7rm4adm2ccqga5a1w6m2jvs4ics9ihf76hqyx4px9m9ca1ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -67642,6 +70740,27 @@ license = lib.licenses.free; }; }) {}; + symbolword-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "symbolword-mode"; + version = "20180401.727"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "symbolword-mode"; + rev = "3857c42696e20f49f274ff8bc45a6f3ee26884d4"; + sha256 = "0pk20glbf73lpfky0jz6dqvxzaqvig3m11xca0786ni0g1yc4g0g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/be2018e0206c3f39c1b67e83000b030d70a72ceb/recipes/symbolword-mode"; + sha256 = "1fs1irnmlbrn76b4gdsy0v65nz8av85iqm0b7g9nm2rm8azcr050"; + name = "symbolword-mode"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/symbolword-mode"; + license = lib.licenses.free; + }; + }) {}; symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symon"; @@ -67729,12 +70848,12 @@ synonymous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "synonymous"; - version = "20160721.2255"; + version = "20180325.1117"; src = fetchFromGitHub { owner = "toroidal-code"; repo = "synonymous.el"; - rev = "1cbdc016c70ed3834c514621f9a33adc93707024"; - sha256 = "1lsn2x6mk36pl0j3z419jq2g6sxxl0hylpz0xl8aiqzsbmwnc6r1"; + rev = "2cb9a674d84fddf3f1b00c9d6b13a853576acb87"; + sha256 = "1l0skavpj96x5gdrx9l8dqj4mrb7zcilv3jj335ak11p2i4ckcq2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf2c44c63e9f41f1733849bdef0d0c301485580/recipes/synonymous"; @@ -67750,12 +70869,12 @@ synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "synosaurus"; - version = "20170621.957"; + version = "20180125.1034"; src = fetchFromGitHub { owner = "hpdeifel"; repo = "synosaurus"; - rev = "acc4c634eb7c7f6dd9bce8610efa7fc900e9c47b"; - sha256 = "0q8ggyfzvclgxvma2nvkfc89870hmii9cc8022ff0n7729rfj7m0"; + rev = "8bf95b935976ec0a1964cf175ed57cc5f6f93bdb"; + sha256 = "06dssdq0fwmr5fw56f17hysy4ysvljlvh6np4szv7lc8bhvykki0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus"; @@ -67792,12 +70911,12 @@ syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20171004.1037"; + version = "20180211.538"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "e2cd1f332d111b0e90d9a72f35bc969c7638b7cf"; - sha256 = "18fq9v1kb6bx0xxd1cic2f3gfwv82y4mjs5qg7q2ra1cz5d502w9"; + rev = "5ba592366b0b29b724b1cbda952cc8e25ef8b239"; + sha256 = "0b4lhvd3dsg95hpdnjmyhxrcaqkmigg7k5n98f9fb9b8k6gfdsan"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -67851,22 +70970,22 @@ license = lib.licenses.free; }; }) {}; - system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20170831.1239"; + version = "20180415.2039"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "ccc2a6b3794b6ada59905ee609fe9e1d973622aa"; - sha256 = "0hs00y8wvsagnc8ckd8izxvigsli7230hgxf5xmrdknj9h4icrgw"; + rev = "9e5532bbed819e6736922d2da2615a2fa4433cea"; + sha256 = "1blncv4cdf3ayq9d5ymdiacavma23smrmwh46130pscbjb4iyppy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1"; name = "system-packages"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/system-packages"; license = lib.licenses.free; @@ -67896,12 +71015,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20171006.1352"; + version = "20180414.1111"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "22f024fe8f433af7b6a6b99520cea1e766894fe5"; - sha256 = "11h1nr9gz0mw2gwlplv00i06s9ziw77a7zfcrrzd01rmanz1m4fa"; + rev = "e97f78ee11f4d4738aaa646e48bb39565d88abd6"; + sha256 = "16ffz0m964g8j6hi1drjvzaz2nxjm1z7r1y1j0g9bmn1dksz7vl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -68189,12 +71308,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20170718.2306"; + version = "20171221.1001"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "321dad4278776b63f8dcd1e67ad387531c472ed4"; - sha256 = "0w78ssd5qj5a1l3yhi2r2dhmls5jfw2p3ic1iinsqwimkwmvh8aa"; + rev = "a97df8c51d77696787aaf55c67207f19c803fabe"; + sha256 = "1djp4gbs6gr956a5hpkwh5laasc7pypqip32l7djd7405vx5ixp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -68207,6 +71326,27 @@ license = lib.licenses.free; }; }) {}; + taskpaper-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "taskpaper-mode"; + version = "20180416.754"; + src = fetchFromGitHub { + owner = "saf-dmitry"; + repo = "taskpaper-mode"; + rev = "0e4f11d3aa07ea1602df0566f28bb2dc172f70f5"; + sha256 = "048hw8kbvdxihd9qsr16gzjlvjm3plvwlqb216mxbx60ig8vlhfx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode"; + sha256 = "0gayhzakiwlrkysmh24499pyzdfy3rmf8d68vamih7igxpl57gim"; + name = "taskpaper-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/taskpaper-mode"; + license = lib.licenses.free; + }; + }) {}; tawny-mode = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tawny-mode"; @@ -68214,8 +71354,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "a8fc8300481a1e033a3811ccda54e552392d1689"; - sha256 = "1lkldr6rr21f97vp6kms2ha8hsszhmba4sn07is4k55lpvlnxd49"; + rev = "3d353a435c7fcb0d9edae3094a9ece81914ba34e"; + sha256 = "14kb6pzj23zrxwfkcxnra1j4fxzm94a3fym0nx1gf7bx362yqn5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -68378,12 +71518,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20171109.1616"; + version = "20180404.1614"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "b3eaf4b8254bb1031f85ce7ac73ffdc856059d9a"; - sha256 = "1g2gpfqxs3mxwskrkdszab02mxfmwfli0h0yw8b5izb4g2a4gkiz"; + rev = "c9aca6ce030fac893793558c74a957e7bd0e6034"; + sha256 = "081mj24h301vljb0d8bn5d9ibrgm1im2r5slzadd699h4zyyldcc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -68630,12 +71770,12 @@ terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "terminal-here"; - version = "20171022.552"; + version = "20180208.944"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "terminal-here"; - rev = "b3659e13d3d41503b4fc59dd2c7ea622631fc3ec"; - sha256 = "1z3ngwgv8ybwq42lkpavk51a25zdkl6v9xdfi41njpxdpbfcmx8z"; + rev = "e769d3741d1023af4f965609f75e3567c89de6f0"; + sha256 = "0g0y8haw1476jr0pd1s9jckf78da11aigdkd9akzlawsvvx8z864"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; @@ -68655,8 +71795,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd"; - sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri"; + rev = "ae83725819286d3f134a6b9956f1117b341e1040"; + sha256 = "049xbwnd7qswvpqka1nsgj0zchmwqvg5dx52xg3kl6mf223xd5n7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -68676,8 +71816,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd"; - sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri"; + rev = "ae83725819286d3f134a6b9956f1117b341e1040"; + sha256 = "049xbwnd7qswvpqka1nsgj0zchmwqvg5dx52xg3kl6mf223xd5n7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -68798,12 +71938,12 @@ test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-kitchen"; - version = "20161115.1418"; + version = "20171129.1235"; src = fetchFromGitHub { owner = "jjasghar"; repo = "test-kitchen-el"; - rev = "9213e55e0334c2a3bb31f8cebf9b40022ca12db8"; - sha256 = "11nnc6s3ryfdrlvkf9rfya9m66l4x1d0zm4p9w1gf0vnyb5x7mfq"; + rev = "0fc0ca4808425f03fbeb8125246043723e2a179a"; + sha256 = "1pip15ysya8nsk1xgz6k6gcjm6g60922r0im2anq4j2gjzdja79k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen"; @@ -68858,6 +71998,27 @@ license = lib.licenses.free; }; }) {}; + texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "texfrag"; + version = "20180318.1647"; + src = fetchFromGitHub { + owner = "TobiasZawada"; + repo = "texfrag"; + rev = "8bb74e2d38139d6497545581a3507c6f7b4fa5e2"; + sha256 = "03pqbx2mwz2lz7027da0aiyh12f2jifdfvxh0s83qshsnw6sipmk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag"; + sha256 = "195vdpwqzypz35v8hc7ai9xpv1flrik60lgrk5m7xypnlp7mpr2x"; + name = "texfrag"; + }; + packageRequires = [ auctex emacs ]; + meta = { + homepage = "https://melpa.org/#/texfrag"; + license = lib.licenses.free; + }; + }) {}; textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textile-mode"; @@ -68966,12 +72127,12 @@ theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-changer"; - version = "20161130.1440"; + version = "20171221.1127"; src = fetchFromGitHub { owner = "hadronzoo"; repo = "theme-changer"; - rev = "60e3dd7cbd237225fef34179168006501a27b06b"; - sha256 = "06y36i3h5m85d6b47cr0hghhbkd8kv23lm6ipc9swkmq0hl3pxfg"; + rev = "61945695a30d678e6a5d47cbe7c8aff59a8c30ea"; + sha256 = "14xc36jfgj8896pklrkpg394fgikir051rh9vm70v132n6i9j0cn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer"; @@ -68991,8 +72152,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "0feeed3c93fc54305499bda5953112487f25a3a0"; - sha256 = "18fkfr7cihnkxbz7r2p6dl5w2yzaibx3qxgwqgmx3g47lb1g13gc"; + rev = "875c2cfc84b3c143d3b14a7aba38905e35559157"; + sha256 = "145gbjizkkmdil1mmhsppmda22xg6blz81zqfsrd5aznwpiyw36q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; @@ -69117,8 +72278,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "95d5fb3a1e38125b9eabcbe9cda1a6c7bbe3e93d"; - sha256 = "0xz5s63d5v8xmm4z99pg6cf37s28h2s7264r7rykkpggyd57i0sl"; + rev = "c564651dd404d7e9ff6bf7e5b343f429b9e52082"; + sha256 = "19i37mhyvg80d6j2zdxi5iljv28fbx5mjnayc6p14rqhk93xm856"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -69155,12 +72316,12 @@ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tickscript-mode"; - version = "20171106.1731"; + version = "20171218.1803"; src = fetchFromGitHub { owner = "msherry"; repo = "tickscript-mode"; - rev = "40d6c9dc574503fc8525f0bdaee160ae30ba31bf"; - sha256 = "0hmak9g9cfna6jwhjj82r7n22jwrabb7dadwlpw0ccqf1ccmka9n"; + rev = "f0579f38ff14954df5002ce30ae6d4a2c978d461"; + sha256 = "0b3rbsd978ch0hiv45sqg9g4zsxhjn557j5f72vjql8cx1h5d8s4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; @@ -69173,15 +72334,36 @@ license = lib.licenses.free; }; }) {}; + tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: + melpaBuild { + pname = "tidal"; + version = "20180410.1245"; + src = fetchFromGitHub { + owner = "tidalcycles"; + repo = "Tidal"; + rev = "f8af7bdbda547ebd12cf5c0ee1327f33cd9aa93f"; + sha256 = "0y7a4bxsgpbg1sbsi4xdp4k9x3l0vh7acm5i3k87acpcpfb9aq5y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; + sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a"; + name = "tidal"; + }; + packageRequires = [ emacs haskell-mode ]; + meta = { + homepage = "https://melpa.org/#/tidal"; + license = lib.licenses.free; + }; + }) {}; tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20171111.1922"; + version = "20180416.755"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "e7ffcdcf9f68205d1498137e84a731c7ffb86263"; - sha256 = "0lym5jb2fxv4zjhik4q5miazrsi96pljl6fw5jjh0i9p8xs0yp4x"; + rev = "e9a19bf500ee9c1a31d420055c159da44ada92db"; + sha256 = "0kfcllkkhknqx69h407v5v6b0p8g0xpd5ashh2smhz9zdnxwx1m8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -69437,12 +72619,12 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20171023.1929"; + version = "20180122.312"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "fe1bd5cee3d30741c816f3ccc118b94105ceba4c"; - sha256 = "1hdkrgv03w968qf8fm7c35k5pahk9wfwz5vy8xz6568ci1af47h3"; + rev = "398b197c8d2238628b07e1b32d0f373876279f4c"; + sha256 = "0iq7qlis6c6r2qkdpncrhh5vsihkhvy5x4y1y8cjb7zxkh62w33f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; @@ -69563,12 +72745,12 @@ toggle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toggle"; - version = "20160331.100"; + version = "20180315.1703"; src = fetchFromGitHub { owner = "zenspider"; repo = "elisp"; - rev = "164ae0f8302c1e1938a9e30597901b1164b43f96"; - sha256 = "1mgkwaa0q672r3lmw267ax54z4bvc3v3zji3q9asygni9bymkfyz"; + rev = "ee8a9c3052446876057ff853369d136aea7831f5"; + sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd02426ce7ab46361363c7a6c56b1575642003e0/recipes/toggle"; @@ -69749,6 +72931,27 @@ license = lib.licenses.free; }; }) {}; + total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "total-lines"; + version = "20171227.439"; + src = fetchFromGitHub { + owner = "hinrik"; + repo = "total-lines"; + rev = "c762f08d039c8103f71c747e00304f209c2254f4"; + sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines"; + sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh"; + name = "total-lines"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/total-lines"; + license = lib.licenses.free; + }; + }) {}; totd = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "totd"; @@ -69835,12 +73038,12 @@ traad = callPackage ({ dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; - version = "20171112.1435"; + version = "20180104.2351"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "843556bfa573d7e8837651b6e9765483cfdd321f"; - sha256 = "0q99wb6nz8752z1m8gikqln6jrjk01pcp0cnm96kxj3qwfy9ifcx"; + rev = "ad160e32f4cc9849aa570ed8e29269a0845921ae"; + sha256 = "0rj8fg66rzrw1hv707p0dmf025c1dymp373z87ryy5sxs24vn3j5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -69863,12 +73066,12 @@ tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tracking"; - version = "20151129.319"; + version = "20171210.1302"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2"; - sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz"; + rev = "9aaad726ea0b0cce4d911eec92ab8fd2a6455fe6"; + sha256 = "1nyw9phrh1qpc7j6b8fkald18y3rldydb666r6ppphggly6lh4vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -69909,8 +73112,8 @@ src = fetchFromGitHub { owner = "raghavgautam"; repo = "tramp-hdfs"; - rev = "b64f24d0419a80dffaa2c4ecec317aa2bba56e35"; - sha256 = "1bfqzwn19w6fs5npslw0sjqrwdswsv5m3wcdnk438pz1lp199wfy"; + rev = "f8406f77bf83b66306ced693a5e4aaf606f46762"; + sha256 = "15zr1fcmjk4mzjvmfbbkz5v9ryfgcjk0ag6rwxk8rp6wzwxcxvvl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs"; @@ -69926,12 +73129,12 @@ tramp-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tramp-term"; - version = "20141104.1345"; + version = "20180223.727"; src = fetchFromGitHub { owner = "randymorris"; repo = "tramp-term.el"; - rev = "983ed67ee65d26a51c641f306fa6b921ec83eeaf"; - sha256 = "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip"; + rev = "7c29f888de0385a676dbf9a4e17bac0111f5c10a"; + sha256 = "1ch9y632kggl3q6yx3g685j3dfbhy7yiwqh8cbxs3wja3rvml8xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c84660c641f0bdf3cca8ad2a0f8f6e5d18b59c3/recipes/tramp-term"; @@ -69947,12 +73150,12 @@ transfer-sh = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "transfer-sh"; - version = "20160828.424"; + version = "20180317.1022"; src = fetchFromGitHub { owner = "Brillow"; repo = "transfer-sh.el"; - rev = "70cd5c50b56ed2597221796014298417f503d10f"; - sha256 = "1s4c70z54pc1kcqzqg3z07vw4v0d0f68w7nzifcmbx6s1l5211wf"; + rev = "3f0344358081bcaa3c129b401ee18ecaeecda4d9"; + sha256 = "0flsdkqhmrclnwwbxxqraawj4xv0240bwh5pbi4hgwdl5l9ihc4j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f74dd06d4d5249beaf67b2befec4251c8c18ed/recipes/transfer-sh"; @@ -69968,12 +73171,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20171029.1210"; + version = "20180201.1506"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "d78ae51fdc9292cc0b77dfb18279b38b6ccbf480"; - sha256 = "01k0nppxvkd2cy13hjcvihgh6j9c4by92yxv4jv8zvaz35fqf92n"; + rev = "03a36853f141387654b7cb9217c7417db096a083"; + sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -70070,22 +73273,22 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20171112.422"; + version = "20180410.1230"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "fd5c893ce920082b4fcfc764feecc47096500ae2"; - sha256 = "10g1kvx7rlfczbq2jlkh6dljkm5g1n3f0j9p0qwk36vwaw80a5s9"; + rev = "51f4aeccdae03885cb118ac5a4894550172abe79"; + sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; - sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs"; + sha256 = "1wcsn0kzrbawyyhxmsmrsxr1vp0llkxw6r7zx53pwyc82ia64nlv"; name = "treemacs"; }; - packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ]; + packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ]; meta = { homepage = "https://melpa.org/#/treemacs"; license = lib.licenses.free; @@ -70094,16 +73297,16 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20170925.2232"; + version = "20180203.416"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "fd5c893ce920082b4fcfc764feecc47096500ae2"; - sha256 = "10g1kvx7rlfczbq2jlkh6dljkm5g1n3f0j9p0qwk36vwaw80a5s9"; + rev = "51f4aeccdae03885cb118ac5a4894550172abe79"; + sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; - sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil"; + sha256 = "1i2mxqwnqb2jz775qg3z4lf7pk4mgi646fyyi2la5gdcnq6a46mg"; name = "treemacs-evil"; }; packageRequires = [ evil treemacs ]; @@ -70115,16 +73318,16 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "20170903.1235"; + version = "20180203.416"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "fd5c893ce920082b4fcfc764feecc47096500ae2"; - sha256 = "10g1kvx7rlfczbq2jlkh6dljkm5g1n3f0j9p0qwk36vwaw80a5s9"; + rev = "51f4aeccdae03885cb118ac5a4894550172abe79"; + sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; - sha256 = "0y7mq466c9cigyd6imzjnh54aq9kcsikhr7llga5gsclf35fc5ld"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile"; + sha256 = "1vyifik30673bwlfvbmw8pzz7f3wd4q6zzssvbj8d23zhk8kh8vc"; name = "treemacs-projectile"; }; packageRequires = [ projectile treemacs ]; @@ -70136,12 +73339,12 @@ treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "treepy"; - version = "20170721.913"; + version = "20170722.355"; src = fetchFromGitHub { owner = "volrath"; repo = "treepy.el"; - rev = "b2191139d67d024e4666b6039e39a23b15b1aba2"; - sha256 = "170xgvwgnnqkr259d0wv6l4kcp62mb1y1wq6rnk8gp39djsqw01q"; + rev = "282fbc94747fe2a00d36e2a74d147c8fa0ac4be7"; + sha256 = "0acw6c073h2a0fy8gx2xc2d1fw0yhaqikqrvs2iq53fqcqrrq81r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy"; @@ -70323,12 +73526,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20171109.1615"; + version = "20180325.47"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "15bda87571bc597ef4853b4ad270946c7a4e8102"; - sha256 = "1qmripm9kyrmpqfd61vzh5ijyrs3dcxqwmxwg1m3f2a53dgnq00k"; + rev = "fcf578a6aa2af815bc93fb48f374b8c3798a3e9a"; + sha256 = "0zmrmkcz019ny1cwqssyy327zmqpjmrn05xikcz4xqwy7ij8xifp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -70404,22 +73607,22 @@ license = lib.licenses.free; }; }) {}; - turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "turing-machine"; - version = "20170512.1438"; + version = "20180221.2038"; src = fetchFromGitHub { owner = "therockmandolinist"; repo = "turing-machine"; - rev = "4b5901a13b38028b05ce19cecc78bcd2f708f97d"; - sha256 = "1avsqqpsbzlm0wi6fc5lgnmhps5wcr6gp05d4hw51sd5r0vx00dk"; + rev = "fa60b76a5bac1f54b7a1b3dc55aae7602c7e385b"; + sha256 = "0k1r0zkcr44kiki8cvdqwx09xpvpz7nkbq9w6i4gqy5h78zy5k79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine"; sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn"; name = "turing-machine"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/turing-machine"; license = lib.licenses.free; @@ -70554,12 +73757,12 @@ twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twittering-mode"; - version = "20170312.735"; + version = "20180107.412"; src = fetchFromGitHub { owner = "hayamiz"; repo = "twittering-mode"; - rev = "63c96fb029033b1a300b90aa922e167c7c405bcb"; - sha256 = "0kax42y0f1pa1pgybz3f57ig9g8fvmgcw8j7zl9nsw70dar4amqk"; + rev = "c27d9b5b1dd20a1600e89909ac9c0ccd08af9bf9"; + sha256 = "00vir1vfkprxm23if6cfjvliiwbza18n7gmh74bdnp1zkg2xy0hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode"; @@ -70596,12 +73799,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20171109.727"; + version = "20180409.422"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "5b0487aae890e7e9f7105a679deecc50428e912d"; - sha256 = "08qx9g40aws9s9cpmayc6r3bjrvx8sy32vfy0rz3jkpjyqc6485x"; + rev = "5350c45aec10bcdffe16ec9273d04298e576f1e1"; + sha256 = "0121gik1ksmwyx8lrr1pgpim0kyay189rg3cfa9l4hpwm425prp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -70614,6 +73817,27 @@ license = lib.licenses.free; }; }) {}; + typing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "typing"; + version = "20171115.2331"; + src = fetchFromGitHub { + owner = "kensanata"; + repo = "typing"; + rev = "1ada06484695b8959f4a7c41cacf7f78c2aad998"; + sha256 = "0mh1y960zd7878j7nhrjijck6jxxqnbmxr579s095k7yk2ynpkkg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e6e75695594ce17b618ad8786c8a04e283f68b11/recipes/typing"; + sha256 = "0k2lplqzq3323nn7rybcs377sr87kbww8ci99rrka3yyb5bh1fa1"; + name = "typing"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/typing"; + license = lib.licenses.free; + }; + }) {}; typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typing-game"; @@ -70638,12 +73862,12 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "20170519.51"; + version = "20180317.107"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5"; - sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj"; + rev = "4fe50d616fc60e77eb9b5a824c0a1ca4010b0746"; + sha256 = "0j5s86s9wb33fqw415mmkysdasyj3vdx9l8l6ca6f89ps6znr636"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -70659,12 +73883,12 @@ typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typo"; - version = "20171005.1045"; + version = "20171209.223"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "typoel"; - rev = "73c8d960e9dcbb77a4ad6166b4685122a0f208ee"; - sha256 = "1zlnfjav11842am9n043j3hk23134hp92k1pg86jvnsj5mwmp9ij"; + rev = "9dad93b6f367f02f52c8d9bf15d446d922cec294"; + sha256 = "1xaikwl265v67b7hilrhjgwzr6bcha9idnp82f27msqzdfdzxf0f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo"; @@ -70764,12 +73988,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170905.1505"; + version = "20180214.824"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "d08fe8e01db6df151b38c3001fba239a9a22369a"; - sha256 = "1a93pd7c2fgdy4vhhwy0lm7plyrwfqa9177m2x5kfblz0q51n6y8"; + rev = "bf724ce7806a738d2043544061e5f9bbfc56e674"; + sha256 = "0pz26q5qfq4wiqcpfkq26f19q5gyiv8q71sq4k77hkss5a5b5fqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -70827,12 +74051,12 @@ undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }: melpaBuild { pname = "undercover"; - version = "20170502.912"; + version = "20180403.752"; src = fetchFromGitHub { owner = "sviridov"; repo = "undercover.el"; - rev = "d947e6410a3b269c657645b499a413d90d4b69ca"; - sha256 = "0c4i8qfa6mzbnjmdk9zqgw324fxyjnq5dm6bmxfadsnvnhjmn7y5"; + rev = "3fc54ef92f0b4b7d26d962d6ed29a81d526a3a66"; + sha256 = "0iqj1a6nj1ka5ahcy4rrn7k427bs1ifv0v0i7gj79m7isjj15qc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover"; @@ -70887,26 +74111,6 @@ license = lib.licenses.free; }; }) {}; - undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "undo-tree"; - version = "20170706.246"; - src = fetchgit { - url = "http://www.dr-qubit.org/git/undo-tree.git"; - rev = "e9a9102f515acd7523158f20e83f300600374989"; - sha256 = "07y1pn0dzwh1avkd3dm96lcjisvnr7p02wbhxf1m3dgaxf059mcn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/undo-tree"; - sha256 = "0vrjxprpk854989wcp4wjb07jhhxqi25p6c758gz264z3xa8g9cr"; - name = "undo-tree"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/undo-tree"; - license = lib.licenses.free; - }; - }) {}; undohist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "undohist"; @@ -71128,22 +74332,22 @@ license = lib.licenses.free; }; }) {}; - unidecode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + unidecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unidecode"; - version = "20140317.2118"; + version = "20180312.1226"; src = fetchFromGitHub { owner = "sindikat"; repo = "unidecode"; - rev = "9e279e88a689584027d5a1b088fe5def25d0f75c"; - sha256 = "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw"; + rev = "5502ada9287b4012eabb879f12f5b0a9df52c5b7"; + sha256 = "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2a5265b00464bcd2bb397229e87385d172856474/recipes/unidecode"; - sha256 = "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9ba8e425e37e80a2236832c3f12568546d4c7c9/recipes/unidecode"; + sha256 = "0vhghnyj8a5mcqq5rzajrm1izzfry77pd1wxhmra5yp9ribw2sv5"; name = "unidecode"; }; - packageRequires = [ cl-lib ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/unidecode"; license = lib.licenses.free; @@ -71152,12 +74356,12 @@ unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unify-opening"; - version = "20171108.33"; + version = "20171122.1212"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "unify-opening"; - rev = "0599ff999293f31b7208343db6d85faddf722117"; - sha256 = "0k7czn1mfav6xbyngymq4x3gh0qahyvvfhw2j61irfydckiyyfwf"; + rev = "502469ddba6d8d52159f53976265f7d956b6b17c"; + sha256 = "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening"; @@ -71233,6 +74437,27 @@ license = lib.licenses.free; }; }) {}; + universal-emotions-emoticons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "universal-emotions-emoticons"; + version = "20171209.1820"; + src = fetchFromGitHub { + owner = "grettke"; + repo = "universal-emotions-emoticons"; + rev = "c89063a4f8e00f8e9c4dc6c252474b6d4bfc4e01"; + sha256 = "0wgff3bbjgskbm1c4cww6akia93hd5sqr9md5szkqm6iiqi3q95z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/57f913112c98db2248cf69e44deb69fd09cee042/recipes/universal-emotions-emoticons"; + sha256 = "1aj3k3yrvasn3zmfwz5si046hlyhnjdmxh7i8li6rc0v0qwl7p86"; + name = "universal-emotions-emoticons"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/universal-emotions-emoticons"; + license = lib.licenses.free; + }; + }) {}; unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unkillable-scratch"; @@ -71278,12 +74503,12 @@ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "20170830.533"; + version = "20180416.623"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "c2c1b44b16a0fd873193b17c580ef3dfdacea580"; - sha256 = "1rq4m77fydkawdwkbw8125ihmvv6aisr03nwb1857k3hxhrg0gwv"; + rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c"; + sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -71338,22 +74563,43 @@ license = lib.licenses.free; }; }) {}; - use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: + usage-memo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "usage-memo"; + version = "20170925.1737"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "usage-memo"; + rev = "88e15a9942a3e0a6e36e9c3e51e3edb746067b1a"; + sha256 = "1aalrgyk8pwsc07qmczqhgccjli6mcckkbgpass3kvrkcfxdl2zk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/usage-memo"; + sha256 = "0fv96xd6gk12nv98zccwncr00qms0pmrp0cv7iipbz54s20g0745"; + name = "usage-memo"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/usage-memo"; + license = lib.licenses.free; + }; + }) {}; + use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20171030.1428"; + version = "20180314.1143"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc"; - sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l"; + rev = "512aa50b025018cb8574498d868814f73c02bb9b"; + sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; - sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; + sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp"; name = "use-package"; }; - packageRequires = [ bind-key diminish ]; + packageRequires = [ bind-key emacs ]; meta = { homepage = "https://melpa.org/#/use-package"; license = lib.licenses.free; @@ -71362,16 +74608,16 @@ use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }: melpaBuild { pname = "use-package-chords"; - version = "20170717.1152"; + version = "20180127.1413"; src = fetchFromGitHub { - owner = "waymondo"; - repo = "use-package-chords"; - rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026"; - sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds"; + owner = "jwiegley"; + repo = "use-package"; + rev = "512aa50b025018cb8574498d868814f73c02bb9b"; + sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords"; - sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords"; + sha256 = "1217l0gpxcp8532p0d3g1xd2015qpx2g5xm0kwsbxdmffqqdaar3"; name = "use-package-chords"; }; packageRequires = [ bind-chord bind-key key-chord use-package ]; @@ -71380,15 +74626,78 @@ license = lib.licenses.free; }; }) {}; + use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: + melpaBuild { + pname = "use-package-el-get"; + version = "20180130.2105"; + src = fetchFromGitHub { + owner = "edvorg"; + repo = "use-package-el-get"; + rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947"; + sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get"; + sha256 = "0sg9ijkjax6w25p0q7rw5rjn8r2i83z5jfzjkvy8pxil5cg8zyh0"; + name = "use-package-el-get"; + }; + packageRequires = [ use-package ]; + meta = { + homepage = "https://melpa.org/#/use-package-el-get"; + license = lib.licenses.free; + }; + }) {}; + use-package-ensure-system-package = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, system-packages, use-package }: + melpaBuild { + pname = "use-package-ensure-system-package"; + version = "20180316.1307"; + src = fetchFromGitHub { + owner = "jwiegley"; + repo = "use-package"; + rev = "512aa50b025018cb8574498d868814f73c02bb9b"; + sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package"; + sha256 = "1cl61nwgsz5dh3v9rdiww8mq2k1sbx27gr6izb4ij4pnzjp7aaj6"; + name = "use-package-ensure-system-package"; + }; + packageRequires = [ system-packages use-package ]; + meta = { + homepage = "https://melpa.org/#/use-package-ensure-system-package"; + license = lib.licenses.free; + }; + }) {}; + usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "usql"; + version = "20180305.1523"; + src = fetchFromGitHub { + owner = "nickbarnwell"; + repo = "usql.el"; + rev = "bfaf428b366a9a185eef84f0d645a98dc918fe3d"; + sha256 = "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql"; + sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84"; + name = "usql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/usql"; + license = lib.licenses.free; + }; + }) {}; utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; - version = "20170508.2343"; + version = "20180228.305"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "599fa4ff640d731927415a44679e5b07d9553acd"; - sha256 = "030wmzi51hya4180m411afy8i2vkq63r630cms3apdqd2bkjjjqs"; + rev = "1b4bd052c6513d38f6cc626c24665637d25fdc07"; + sha256 = "05pv6nj88im1jf9nngv56z362wrp9pmkzrjn3nm846rdzbc5f21j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -71635,12 +74944,12 @@ vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-fossil"; - version = "20171018.2216"; + version = "20180215.835"; src = fetchFromGitHub { owner = "venks1"; repo = "emacs-fossil"; - rev = "abdb5487831e641c291c0dcb3848f539ca11f400"; - sha256 = "024bf8cjf3srz0zrxk90c63yz9v525m83znb2fscwa1fwvnnpqkn"; + rev = "7c5af95181213db38f81f5f9586f3334301a3ea0"; + sha256 = "1c18ywvs0l5w7ip2igksjy48awzas8mph7plpvp1v8c67a3a3m2m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil"; @@ -71863,15 +75172,36 @@ license = lib.licenses.free; }; }) {}; + vertica-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "vertica-snippets"; + version = "20180208.154"; + src = fetchFromGitHub { + owner = "baron42bba"; + repo = "vertica-snippets"; + rev = "5959d86c77d4b8f67383f65f7f6ca3e0db2a9529"; + sha256 = "0hmvd2kly7k51qfhkg6rzcq0a5ksskr1r0x07i0imz0idm77g29z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c8cb5c0fdbb6820a08091d8936dd53a3c43c56/recipes/vertica-snippets"; + sha256 = "0044qcf6dyxp2h14ij6w19zs7ikx9xalfrz6jqbl8sy35wcihmhn"; + name = "vertica-snippets"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/vertica-snippets"; + license = lib.licenses.free; + }; + }) {}; vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vertigo"; - version = "20160429.2105"; + version = "20180408.920"; src = fetchFromGitHub { owner = "noctuid"; repo = "vertigo.el"; - rev = "70b56a57c3a37735cc9e92ffaa6dc27c64437738"; - sha256 = "044vy6yi9yfk3h2gd3a718w50py02h1b5fr0i7a08rjlq4l3srka"; + rev = "117450dfad5d5ad45d40995cdf9a626cf9c2b136"; + sha256 = "1bxf2kzdj4xmy6wmajwvn40msp2q4szp25ylah49biw92dwi2bzw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1957e7fa03b6b8eb2f3250bd814d707bce3cfa3/recipes/vertigo"; @@ -72034,12 +75364,12 @@ vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "20170730.2206"; + version = "20171231.2212"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "5e2875c18e2d8ef27f594e0ea1ca15a2f759be42"; - sha256 = "1a24diw5xwk10d9y8dr1bgpc78d36f3swvlll0igl5b91q4x86dn"; + rev = "c904cd3e8515e76fb836615305e174369211f6df"; + sha256 = "1kwd6f2qi3p41kryd8z01lkiw7ikpgywgpfy9zbjyb5x6z2hn35s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -72097,12 +75427,12 @@ virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "virtualenvwrapper"; - version = "20171022.1831"; + version = "20180211.1744"; src = fetchFromGitHub { owner = "porterjamesj"; repo = "virtualenvwrapper.el"; - rev = "b4fd61aa5fddd47d33b147ffa1c873d8b20db724"; - sha256 = "04qhxg2gghb9bbvabrjbwj89jl154hhk00s07mzgg93js75ipx6z"; + rev = "bf13158dde071bdf4901709ed101aba6b8a25f7f"; + sha256 = "003nj9i6kfjyw1bdz1y3dssp3ff7irhsfq21r430xvdfnzrby4ky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; @@ -72164,8 +75494,8 @@ src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "57c2a72d46900117ea92e0a01b97e19481800503"; - sha256 = "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y"; + rev = "d97017e9bcca79e6a0f3ef63414a954319feb879"; + sha256 = "11w3krp5z6yxchqlz45kqiqf0y9drplmanixw3q4r5cwaspx94qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; @@ -72220,36 +75550,15 @@ license = lib.licenses.free; }; }) {}; - vkill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "vkill"; - version = "20091203.1022"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "vkill"; - rev = "8ffe640ed03ddcc23db1c74c76d1acbf25250ad9"; - sha256 = "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1fe8711711d5c7e1dfdf81b8153a193e6940a16c/recipes/vkill"; - sha256 = "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm"; - name = "vkill"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/vkill"; - license = lib.licenses.free; - }; - }) {}; vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "20170830.1148"; + version = "20180201.1454"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "df677c128f8abc764b51d2a0ed26071618e686de"; - sha256 = "1fx2ngjh3y69ynih328jiy8132z9y7q7s91rzw8mgpf3hnfmaqly"; + rev = "31b292dc85a374fb343789e217015683bfbdf5f1"; + sha256 = "18ll47if9ajv0jj2aps8592bj7xqhxy74sbsqn07x9ywinxxi9mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -72265,12 +75574,12 @@ vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vmd-mode"; - version = "20161106.125"; + version = "20180223.556"; src = fetchFromGitHub { owner = "blak3mill3r"; repo = "vmd-mode"; - rev = "e3b27f4f179002984643895292bb207c3e221a5c"; - sha256 = "0gpamwnsszhna9crhbg2zcvr9hrq7lackhgclq63lsvcm0z2ynfz"; + rev = "24e38a20951dfad6e3e985c7cc6286c1e271da5f"; + sha256 = "00anpbnf0h6iikhpqz4mss507j41xwvv27svw41kpgcwsnrmrqwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vmd-mode"; @@ -72349,12 +75658,12 @@ vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vue-html-mode"; - version = "20170928.1057"; + version = "20180104.1421"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-html-mode"; - rev = "9218c61ff1ab2bdc6a6711d21ad760198d3511a8"; - sha256 = "1xpbr2fajn0nk53abb2x9m0qs0ygxfl62gdxd2iqfcwj56fswj9y"; + rev = "3fa65f8ac8a4c54f13c32fd43c9865c92c22ce07"; + sha256 = "00mj1qmcsfndnk7vif7aa9nqy7hd3cnbmn6fhik1mmsqrazcbp0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; @@ -72370,12 +75679,12 @@ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20171029.1905"; + version = "20180410.1157"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "a34f8a14fe6a680bb18cfa4519f7984d8071a4e3"; - sha256 = "08c3sgd80aszfpc4zbh0rsn7717nwwjhr38lfbsbxmgmlvqalxzk"; + rev = "eab311f535ac922086466dba3e6f0d428fcff3f2"; + sha256 = "0j7qbrx0z6kvm9r2swyb2khhn9gciq4yjxg199ckg7k5p8iqlzlq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -72412,12 +75721,12 @@ w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20171019.1734"; + version = "20180221.2059"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e"; - sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8"; + rev = "4b9664bab3794379af42d549d9540735c16b5a25"; + sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; @@ -72433,12 +75742,12 @@ wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wacspace"; - version = "20140826.2232"; + version = "20180311.1650"; src = fetchFromGitHub { owner = "shosti"; repo = "wacspace.el"; - rev = "4a11168d58c9c129cfcd04a1c9581962565eca4a"; - sha256 = "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4"; + rev = "54d19aab6fd2bc5945b7ffc58104e695064927e2"; + sha256 = "1nfx1qsl2gxjqbbc5xsr8f3xz2qyb4wnz3634k3hglb1jpa78j3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58e5ff4c5853c5350d0534894ddb358daa83cee9/recipes/wacspace"; @@ -72516,12 +75825,12 @@ wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wand"; - version = "20171103.513"; + version = "20180112.454"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; - rev = "83c0c723dae7d8a37e67a9d9f2d00e005b5486ca"; - sha256 = "0wc1gmaz02bfbapwrmmc5r7rcfwqlfr52x3jqk6bhxpiav141yq4"; + rev = "e8939812e03255fff3e15c5d0f9d4da849aaf07b"; + sha256 = "0l79vhf0s5rz9s02bmcfyx7yn4pvn3dnxkr50qfhqajrvfx1105g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; @@ -72558,12 +75867,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20171019.550"; + version = "20180331.105"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "15a8ca7a28d086066d148ca8bfbd454e32cc5f77"; - sha256 = "1a7xm3x8zyax6crrj8fj932yicwds12774znv991yggjzw5kcwcd"; + rev = "afecc04e806c8338e553bdbdb716328fa9f2227a"; + sha256 = "1sf1mck6pk2xnlfcr4rh47brpgl6dsla7zir8lxpa0224dvy0bvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -72789,12 +76098,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20171112.1324"; + version = "20180416.240"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "39896c2a4ce8eda0f211afab14b1686bdc5ed1e9"; - sha256 = "05jx0sqnyl1qy0h9x4p60l236qlhw5cqywzcgfbymdg28d034k3m"; + rev = "370fba5fefc819b863909330fa17b6b0e8b20080"; + sha256 = "0rsksx6gbff2l26rcfrxjq51pnl3l61r0vsnwq9ax70djrpk804m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -72856,8 +76165,8 @@ src = fetchFromGitHub { owner = "xuchunyang"; repo = "web-search.el"; - rev = "410c490ecf82a3693db3eb62003302233471ff84"; - sha256 = "0hib0ffwikdydkm5asmvzj6l49pd9694psnn2c010j3ixw6i8gsl"; + rev = "bdf590e7d6d62e874810aa4c5017c48e4e93f823"; + sha256 = "0fwxjmnhkpla6gb58nkcazjh1q9b92w89rfi12pw7qj0449rmihb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search"; @@ -72891,6 +76200,27 @@ license = lib.licenses.free; }; }) {}; + webkit-color-picker = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, posframe }: + melpaBuild { + pname = "webkit-color-picker"; + version = "20180325.36"; + src = fetchFromGitHub { + owner = "osener"; + repo = "emacs-webkit-color-picker"; + rev = "765cac80144cad4bc0bf59025ea0199f0486f737"; + sha256 = "0a6nirdn1l7cymjycbns38ja9an1z4l5lwjk5h428aly3pmkvdqj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/af9d2e39385c6833eff6b7c7e5a039238563c00f/recipes/webkit-color-picker"; + sha256 = "1i9244zghabyavxhz86d22fn40qspzdn2sjql8pl3mm8ks7a49a3"; + name = "webkit-color-picker"; + }; + packageRequires = [ emacs posframe ]; + meta = { + homepage = "https://melpa.org/#/webkit-color-picker"; + license = lib.licenses.free; + }; + }) {}; weblogger = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "weblogger"; @@ -72915,12 +76245,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20171025.956"; + version = "20180127.1434"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "f047313c656e0ea85033bacc564d02ae6f4605ff"; - sha256 = "00mawa0n415dcnrldqmgwwjcj2rv59wblrbzkc2g9i388nl41rp5"; + rev = "14fd97bc3c8554d9394b698610dca1186ff68b03"; + sha256 = "1q7pqkww6ggh9sdnqa4vbq6nzivw0w011w3mvwx1mi4zp0dv50zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -72936,12 +76266,12 @@ websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "websocket"; - version = "20170829.457"; + version = "20180402.2042"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "33d0406901f7306b326928190b6ad94247d01a5f"; - sha256 = "0lw7s121jfqaqrl3b2w9jbx3adh3nq0mkh911c40s4ydxm6xcnk3"; + rev = "e9d148fbb6425c35dc7f76cccdec70aba7fafacf"; + sha256 = "1gyp67sdi4pwrzdkgslnd9l0sjw7nbkqlh7j4zi423yrb5zxh4wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; @@ -72978,12 +76308,12 @@ weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; - version = "20161211.259"; + version = "20180112.1217"; src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; - rev = "2edf75a8405680ba94528864668b226102dd37c5"; - sha256 = "14p8q2bjpgka3mdfphllz13kp6l85aghn2l64fwbcpy0i4xgicbg"; + rev = "4842e966a557e13fa4f16052cb60d221cdb886cf"; + sha256 = "0y4vdsm4rb221hmr2a2sn0kj51jsgndkmhwcjiryqxzn2giy9siw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat"; @@ -73167,12 +76497,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20170817.1107"; + version = "20180321.331"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031"; - sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88"; + rev = "bc97659029bffda0861a418da092656b379dd0cd"; + sha256 = "0j1kpykqz691f8dlb2grfgv5rafr9xvb64yfc9pb07r4f8791fgc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -73272,12 +76602,12 @@ whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whizzml-mode"; - version = "20171015.938"; + version = "20180411.1636"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22"; - sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b"; + rev = "cfe081c957ad6e70e1fd32c7836008851198431a"; + sha256 = "1qipmr0v6l6r2ggdp7lbrc14hwfjs6j835ii53y99knmbp7cnci1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; @@ -73293,12 +76623,12 @@ whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whole-line-or-region"; - version = "20170815.212"; + version = "20180324.2119"; src = fetchFromGitHub { owner = "purcell"; repo = "whole-line-or-region"; - rev = "1220974153b7eaca5192ed87f86182d121e228e4"; - sha256 = "1n44nn0zkk55cnwlincv5i8s36nymnh3bm6jd85h6m97jssxd85l"; + rev = "944290d443a395ef0578531929186d6274ab03e9"; + sha256 = "04hbs8hrm5csnjxvxkfbd9fky0rd6xpr105cy0bvya5c14anzcd4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region"; @@ -73360,8 +76690,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "b05d584a4b3e0db168c3b920ce4a270b3908d842"; - sha256 = "0shgxd08da8a7ij37k5ybmvyqbqzq4nqxdyfbbpgnh1vgw61gr6c"; + rev = "aafd8a262599571f2de06e3aa75933d8a09e2d35"; + sha256 = "0663631mxw4mrzlb144fbvry6yffg9hic9jbns147zfgvsp1xcf7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -73419,12 +76749,12 @@ wilt = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wilt"; - version = "20151105.518"; + version = "20180220.54"; src = fetchFromGitHub { owner = "sixty-north"; repo = "emacs-wilt"; - rev = "5febe367c6c3729848654358af4d17ee2987da8d"; - sha256 = "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd"; + rev = "04dbe37fa35d0b24c791421785d2c97a8cbfe2cc"; + sha256 = "197kqp22pyy1in2rq063mahvrf00vrfvgnfkqp0zy7hpkhiiqvim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eea4f2ca8b4f9ea93cc02151fdda6cfee5b68b70/recipes/wilt"; @@ -73737,8 +77067,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "e80659fcc896"; - sha256 = "01cmwv6xafk19gg6ixgiw9szmhmqk19i2jha5yafaa93pwgnc40v"; + rev = "dbb4f5d19925"; + sha256 = "1ng4p0yf8lp3nhdz8l3m4zhl13x3bpb9prckw8nghqf2hc96l2dj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -73775,12 +77105,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20171006.352"; + version = "20180414.757"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "ee39f232f2daf997498a4030d104c35ae397f457"; - sha256 = "17m5b7g5sdh0iy6lpj2inv9akscyw83nyx9hl71disdk7diq15hn"; + rev = "ad5bb005ed3afec2d8b9b2bc1df19fb9b5e2dd84"; + sha256 = "0hq2dy8djxf45ajk9di1grhgzly0qrijcjfdah8xj5zkwvn9cvlh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -73877,6 +77207,27 @@ license = lib.licenses.free; }; }) {}; + wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "wolfram-mode"; + version = "20180306.1613"; + src = fetchFromGitHub { + owner = "kawabata"; + repo = "wolfram-mode"; + rev = "be680190cac6ccf579dbce107deaae495928d1b3"; + sha256 = "1cvdw28gvhbr9l65xkv8ld12rb0pcf53jd55gns2b0abz1lg1jc4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/40ded2302e413e233d867caa4776c54a778b8b99/recipes/wolfram-mode"; + sha256 = "0rc39vvpyhpn0m52i4hs23j6avqfddmrkhjqg339apfq7z35fpli"; + name = "wolfram-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/wolfram-mode"; + license = lib.licenses.free; + }; + }) {}; wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }: melpaBuild { pname = "wonderland"; @@ -73922,12 +77273,12 @@ wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordnut"; - version = "20151002.1457"; + version = "20180312.2143"; src = fetchFromGitHub { owner = "gromnitsky"; repo = "wordnut"; - rev = "6e223dced5b865e9d38af6f9b7e57b3a56d362bb"; - sha256 = "1w4037jplkl8sr6b7qj4cb5qcrjwz6vnfxfshdjimilwgc3ihs16"; + rev = "feac531404041855312c1a046bde7ea18c674915"; + sha256 = "1jl0b6g64a9w0q7bfvwha67vgws5xd15b7mkfyb5gkz3pymqhfxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut"; @@ -73964,12 +77315,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20171002.1118"; + version = "20180408.36"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "cf2f382b368bcb3c8ba4785a7fac8ee9300e80b5"; - sha256 = "0rnvmwdks8m4f6dwnyinv9rli58mlvlnrg7swpdjfh0g3bqgr7w5"; + rev = "90f0e5f7a596ead7fc3b5106684ab118ee857340"; + sha256 = "1yfvknn4nbc6qig0pa4gks1085l91v79cg8hjg7776plz0cwmn08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -74136,8 +77487,8 @@ src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "80dabd5d158929e8433e46207bb521282b21e4f3"; - sha256 = "0s4kfg2ga3qa6gb2ji1jv73fv66d9vn054cl0mif7n16kic4bkr4"; + rev = "52321b99be69aa1b661da7743c4421a30d8b6bcb"; + sha256 = "1b6hxhwhzs6xq12w0jmvvjw0bx4czw71xzj3qizq9gx0q4n7a0qf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler"; @@ -74234,27 +77585,6 @@ license = lib.licenses.free; }; }) {}; - x-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "x-dict"; - version = "20091203.1023"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "x-dict"; - rev = "920b2430bff9fb8c4bb7944aa358622545c00cee"; - sha256 = "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0567fcc7b7aff08094095292fb701da3be8403c3/recipes/x-dict"; - sha256 = "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc"; - name = "x-dict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/x-dict"; - license = lib.licenses.free; - }; - }) {}; x-path-walker = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "x-path-walker"; @@ -74279,12 +77609,12 @@ x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x509-mode"; - version = "20170909.632"; + version = "20180313.153"; src = fetchFromGitHub { owner = "jobbflykt"; repo = "x509-mode"; - rev = "240b5045dcce18190bdabd91d74f48d3610a6fe2"; - sha256 = "0pi5hi0n6f2hif5hz1g04rk509rb4jlw6nrlhc8fg5k6x4n7ci3p"; + rev = "d59058608bea1840fdba44810d7184b47bc88410"; + sha256 = "1srqlzgrp75spygw360d1h2jfhlhmgszfsz9kyn8h564mlc3m35k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode"; @@ -74300,12 +77630,12 @@ x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x86-lookup"; - version = "20161215.448"; + version = "20180321.1802"; src = fetchFromGitHub { owner = "skeeto"; repo = "x86-lookup"; - rev = "544a1ad4e8551c60e58e6c431470b6ef4ce7c5cb"; - sha256 = "1w2fhi5x0amjyzzdndp9lvm6i279pcjjs6zfhssly2lbxw4dpaky"; + rev = "a72e282d3db72fc1078623f405c2874bd48b9205"; + sha256 = "0ayjdq50kd3karg0rc9ffxdn8pv0fbf7yfbq5vics8p5w7fl55x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup"; @@ -74321,12 +77651,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20170821.400"; + version = "20180405.1521"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "7167c7a9a0f0dcc167dafa833efd43a0c9ae4307"; - sha256 = "1iychyj79g9mxpr688f2a9w8bbsgm2r88rr11b42gagal0kgk8q4"; + rev = "5b630c3a706d7b692e04e44c571ff9c1076be2c3"; + sha256 = "0di2pyd1b4a0lyz1xi260dha3n6wa8d4nlb59inaxcj4nfw7sv15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode"; @@ -74342,12 +77672,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170828.1"; + version = "20180402.2139"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "6e94446566df206911afa107d06aec50ac3a56fc"; - sha256 = "028y8dlb5b4vclg03imcipjp56l1m4klgj69f0n7ir0rr6xwl3f6"; + rev = "95ec296ec6e059e0f802b919fcaeae521714fd68"; + sha256 = "19hjw9bcq2qsc0m47303r5r1nr144sbsrs0lwzzadxvfyfwpm1q4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode"; @@ -74363,12 +77693,12 @@ xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20170821.358"; + version = "20180310.450"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "6b7a60d6210d42559b46f0e17d7a0e4a2607f887"; - sha256 = "11whm7cnz6z61lycm5w6qmvbbl5f2c2lpgmk5c5whks7v3bkq6n6"; + rev = "0cd985675c286bfa5f07ab9d00231f8a23505537"; + sha256 = "01h5wdbzf7swrmddai2vsakr8rsqg447w9bnp7akxla426fsr8wg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find"; @@ -74384,12 +77714,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20171101.1546"; + version = "20180412.2300"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "c007dee9faeae7b4ef1cfd21c97952768f520f8e"; - sha256 = "1vkfff3w09h3gbwz9wqlrab29558ms03x5cgzzdxs0mjaq40pvnz"; + rev = "e7181d40cc4bf30eed2672cb97255a8451031002"; + sha256 = "0lhakj8hr2wg7n3nqc5bqwgxb9lf6yvknryll9xw9lq4q9yha7rg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -74447,12 +77777,12 @@ xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20170905.849"; + version = "20180328.1515"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "fcdfbed46ff81c8da84422611e0009c6b267e359"; - sha256 = "01s4fhnp4zqh2cmqbp2sh1sbdcyq4i5hy1r8manqa26m041xk2z0"; + rev = "6e240b83bd3bc19b0edf8a85413b216dbf27f441"; + sha256 = "1ff3r1a3jgvv33sahi9ajs04m4sch9cmqwx0dlwkn1595smwk8k5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input"; @@ -74846,12 +78176,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20170102.1525"; + version = "20180202.1518"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "5873477fd7bd6e54142ab35fbc623ea9b55200aa"; - sha256 = "1328avc28barirwipasnhq81sn4nw6w6x6fffgqcxayv2r5bl1d8"; + rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c"; + sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -74864,27 +78194,6 @@ license = lib.licenses.free; }; }) {}; - xterm-frobs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "xterm-frobs"; - version = "20161207.1609"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "xterm-frobs"; - rev = "0832d588598dbf6bd8aa8e05c611d7c098c3f9d8"; - sha256 = "0snrylgv2d6r3d6nv05vqs6ng3sgrxkvqpx7m4ga2y7a1m5lmxkw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bb3be63b798967f5525cf118579a1cc756ee1a/recipes/xterm-frobs"; - sha256 = "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf"; - name = "xterm-frobs"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/xterm-frobs"; - license = lib.licenses.free; - }; - }) {}; xterm-keybinder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "xterm-keybinder"; @@ -74906,27 +78215,6 @@ license = lib.licenses.free; }; }) {}; - xterm-title = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "xterm-title"; - version = "20091203.1023"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "xterm-title"; - rev = "b6ea73d297d191d48bba7dd1e2adc23bbdfa1c3c"; - sha256 = "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bc25d156c8631b552a463f5088a99a3370166e03/recipes/xterm-title"; - sha256 = "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6"; - name = "xterm-title"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/xterm-title"; - license = lib.licenses.free; - }; - }) {}; xtest = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xtest"; @@ -74951,12 +78239,12 @@ xwidgete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xwidgete"; - version = "20161029.1112"; + version = "20171118.1316"; src = fetchFromGitHub { owner = "tuhdo"; repo = "xwidgete"; - rev = "adcf3f84772f4a382ba791a6584fa7dddfafdcdd"; - sha256 = "17zlbrnxyc0lgsy5g8zqz13mqizhaqpp4i975x9m4ilpl5ycaqqx"; + rev = "e4e8410fe32176df85b46234717824519443fb04"; + sha256 = "04j4xwcdxlnrwxs89605zmwxszbi2j0z67v80651pshgnhj5p19i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xwidgete"; @@ -75060,8 +78348,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "45987672d51ea2aac0131a11f3c6bacf103a4e10"; - sha256 = "0rri0cwxkydw19psaqkiad14pgp5v9h5605y2whqf9d6siyh3mjb"; + rev = "673f033c05b4984f5159526db2d7f4a32dd57b6d"; + sha256 = "1iwmwff538zw95mlrq4jhwaikx2hs6jqcx94rypn6znymrfsf0hp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -75098,12 +78386,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20170727.1531"; + version = "20180408.2307"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "28c34033194130d452d5c958b5241c88d42ca02b"; - sha256 = "1m3fr19sfkr7d94qzqkl7x1jmhpar2hnhq6mjscd3lfcqkifh6kv"; + rev = "40067a10ac1360f0b9533f0bbbb2eea128e2574d"; + sha256 = "0v7646vdsbbhxh9ywsypq2ycdsrf6m7wv788qaircbjgn1pk4v7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -75161,12 +78449,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "20170323.1104"; + version = "20180306.407"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695"; - sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv"; + rev = "340aec635e359609b22f7e94df15af1af2b070f6"; + sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -75182,12 +78470,12 @@ yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20170607.819"; + version = "20180415.350"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "70e755fcf58e37092de2c335355eab93d5f1fb44"; - sha256 = "1ijd3vpym573p96dh81pw9rzlmman7dvamhvnf0jqp8mmy4g4bml"; + rev = "a804f145d17b4b68490ee62ba9a9c4fc7faad130"; + sha256 = "1m9zal19s7v6djrma1xbqwx1n271y0ik44wx9sscmrynmhdlis04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -75203,12 +78491,12 @@ yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yapfify"; - version = "20170519.115"; + version = "20180105.1447"; src = fetchFromGitHub { owner = "JorisE"; repo = "yapfify"; - rev = "492eb038b35f49b1012fb843d880bccc40f2260b"; - sha256 = "1jj1j525xlwhylsysay52f4rdrwz3r72ghx4iggkxqiqbv919ia4"; + rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f"; + sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; @@ -75329,12 +78617,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170923.1646"; + version = "20180319.607"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "35a4df769cbdebd10d043f16d680bdb16ee858ed"; - sha256 = "0rkk39bm12d3d4gf8r99a2ipjaf1yb0b57rpg44bsqz5jada4a86"; + rev = "fa6a71c42de7fecd58193e2fd3681a0225b71dc5"; + sha256 = "0zxwqc2ksk43p47svhcxsbw8fazl7krarfj8d1i1r9nkwhx5sqqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -75350,12 +78638,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20171106.447"; + version = "20180408.446"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "6b6dcd9eca4d6d3e982bbc241b51cd6562ef600e"; - sha256 = "07zblniw1rc24zyaw1xbam46yz8cac4wl6qf6l1ynkbpj5k0x1g5"; + rev = "4bbe565b7c9c7286f7ac465f0cc79c3fe5796c0b"; + sha256 = "0rak66wmj0x4zmksckniamslvcaxsz0dgysrzv22jijmjjqpfd2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -75371,12 +78659,12 @@ yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yatemplate"; - version = "20161108.1305"; + version = "20180114.734"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "07da11de32feb6cbce0f8c140c0304e3ba1b42c0"; - sha256 = "10af3pa8rh3rs0vpm436vm5wlwvqkfa3zpqyhdf2i3q4gaqfb902"; + rev = "4ab835c5ee90a1dbc31c4275a563a9e741a78c6a"; + sha256 = "119i1p1rj329yh7d5a1wizrwhbvnildzzhl2bv50vkswg9nvg3na"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -75391,15 +78679,15 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20171030.502"; + version = "20180223.2345"; src = fetchhg { - url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "16763e5b7481"; - sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; + url = "https://www.yatex.org/hgrepos/yatex"; + rev = "af4601ee3c6a"; + sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; - sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; + sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0"; name = "yatex"; }; packageRequires = []; @@ -75457,8 +78745,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "e8a6c2bb6cdc18645e2ebc6a8ede8f0c306f013d"; - sha256 = "0gijzvc6krz1228siysk4za3pwfgfmwh04b8zjc57qkccngibnf9"; + rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; + sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -75523,6 +78811,27 @@ license = lib.licenses.free; }; }) {}; + yoficator = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yoficator"; + version = "20180129.1252"; + src = fetchFromGitLab { + owner = "link2xt"; + repo = "yoficator"; + rev = "e0dc076cb0d1999cb41585b5f36322681109fe86"; + sha256 = "1vq07ndxrdry26dx3ci4yz1a1qdcr20yznj62y2f0wkyccrai9y9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator"; + sha256 = "0b6lv6wk5ammhb9rws9kig02wkm84i5avm7a1vd4sb7wkgm9nj9r"; + name = "yoficator"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yoficator"; + license = lib.licenses.free; + }; + }) {}; yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yoshi-theme"; @@ -75589,12 +78898,12 @@ zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zeal-at-point"; - version = "20170427.2042"; + version = "20180131.1554"; src = fetchFromGitHub { owner = "jinzhu"; repo = "zeal-at-point"; - rev = "50a1bd4240ff0db7c8f2046c3b00c5a8e14b9d2f"; - sha256 = "1xy9nbbk0fkd9dm8n0c0gy52vi34s6vgzbnab0hrghn6whs89ig8"; + rev = "0fc3263f44e95acd3e9d91057677621ce4d297ee"; + sha256 = "0aq9w9pjyzdgf63hwffhph6k43vv3cxmffklrjkjj3hqv796k8yd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point"; @@ -75652,12 +78961,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20171109.926"; + version = "20180222.1757"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "613f4c69513c7ffe7cb00a6c477cd5e8e6378d40"; - sha256 = "03n3ixkzfva5r2a7qdkl0b9254q56f9fh202lrkcgg135ynhkrhc"; + rev = "af752f46306eb710158904b89c1bf0d6786d0a4d"; + sha256 = "0w3s3c1h7s5j02h7jgbnnh85cx1cmqb5jd8w6fgsp4jna6wn5627"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -75696,13 +79005,13 @@ pname = "zenity-color-picker"; version = "20160302.354"; src = fetchgit { - url = "https://bitbucket.org/Soft/zenity-color-picker.el.git"; + url = "https://bitbucket.org/Soft/zenity-color-picker.el"; rev = "4f4f46676a461ebc881487fb70c8c181e323db5e"; sha256 = "14i2k52qz77dv04w39fyp9hfq983fwa3803anqragk608xgwpf4s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e7c8f99ac93f2b828ded420a2fbcd18356ea641e/recipes/zenity-color-picker"; - sha256 = "1v6ks922paacdgpv5v8cpic1g66670x73ixsy2nixs5qdw241wzl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/zenity-color-picker"; + sha256 = "0rim1mbhlb2lj302c58rs5l7bd168nxg1jpir6cbpf8rp0k35ldb"; name = "zenity-color-picker"; }; packageRequires = [ emacs ]; @@ -75735,12 +79044,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20171016.59"; + version = "20180308.957"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "ccadcfba1a708352508d4c0857359df7425e7574"; - sha256 = "1mg1dhda9zvdinxizckvz454633lrl62a382vdm838295gvc40wm"; + rev = "2a240de8cd89c741612d807a521d6b3e51088324"; + sha256 = "10r806hzmgwnysjgg5lx252ychnhyma1bpwm980pf46vlywws5a0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -75756,16 +79065,16 @@ zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zig-mode"; - version = "20170920.802"; + version = "20180309.1458"; src = fetchFromGitHub { - owner = "AndreaOrru"; + owner = "zig-lang"; repo = "zig-mode"; - rev = "814657c5b6b0600ace78a7bbd216c3e90d611cfd"; - sha256 = "0nhx2wsk3qpdplvwxmdzwlka9255x46ca9vcjb58zbpb5wbfckzx"; + rev = "4f281e4748a4eae64efaa98d9dfd9b7c163fbed8"; + sha256 = "0pip0kgbxh4cf60j2kzgb9lvrm5vksg83mllk1pcs9mkbxdgjyww"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/33895b0ff559ffd18a62c04736597188f55419ee/recipes/zig-mode"; - sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5cba49d25ebbaa9240d5d87d0c7ca48d928b2e4b/recipes/zig-mode"; + sha256 = "005lsgnsaj8rjkzbhi23g99xy9zln4ggkad11xqmn4xa6g199wly"; name = "zig-mode"; }; packageRequires = [ emacs ]; @@ -75945,12 +79254,12 @@ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom"; - version = "20171110.715"; + version = "20180310.421"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "d4f417b24fe022b6512a1a0ffebf898044393250"; - sha256 = "0qksgg0c4z5c293avc87q2hgwnvr550rycwgnvrp574n3qmvqjmd"; + rev = "a72714bb14eb32c1c5e7ad1cb4bdeb208450e507"; + sha256 = "176fbhsh2rk6rn8fisfq4ja71lqvf1zbb393wzfsgg68df39mqyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; @@ -76050,12 +79359,12 @@ zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "zotxt"; - version = "20170109.2040"; + version = "20180218.1053"; src = fetchFromGitLab { owner = "egh"; repo = "zotxt-emacs"; - rev = "1a010ea5db617269adc132e4cc028a44d9b629bd"; - sha256 = "10i5hq0mkb0b88n9lb40ad4d98fwv5inbdfiyxyrflvl4qj0q60r"; + rev = "5b3715bab55c9f17f134a8fada5b68c07aa66cad"; + sha256 = "1hz1m4190yi6knz3y088ql8wy3pmsl8lsznqby2vpnn9p74fvl37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; @@ -76071,12 +79380,12 @@ zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoutline"; - version = "20170722.651"; + version = "20180314.1059"; src = fetchFromGitHub { owner = "abo-abo"; repo = "zoutline"; - rev = "e86e739b53a1c8a0a2cf6de43dffabb15d465507"; - sha256 = "0ycri5d61pbwhwpwh9qx9m22mb4ab7bgniwgdbi9s8rzqs4q1p91"; + rev = "b3ee0f0e0b916838c2d2c249beba74ffdb8d5699"; + sha256 = "0sd0017piw0dis6dhpq5dkqd3acisxqgipl7dj8gmc1vnswhdwr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline"; @@ -76092,11 +79401,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: melpaBuild { pname = "zpresent"; - version = "20171008.2152"; + version = "20180224.2212"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "eb6f5bf71b00"; - sha256 = "1q3xz4gwqb7ac49w0nq7zvl4n790wk6r97by1kldv54y2fj0ja9g"; + rev = "e2e34c061ff5"; + sha256 = "00rj8lgp5b856csvlrin1vwas1109nmywbrnpny4qck4yghv6zqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; @@ -76112,12 +79421,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20170223.1014"; + version = "20180409.1322"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "febc2d02373312ce69f56c9dbe54cabea3e0813c"; - sha256 = "0sj30f87gvxbqwi1k7xxqc1h0w7n53630d04csqayiwvc6a2z2sz"; + rev = "487957664cedc61d70feccc881092eef6746977b"; + sha256 = "1hvqx1dfh253iin59j9i1x85xfnhljgwsrvn9pq3lxfvy82zjlc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; @@ -76175,12 +79484,12 @@ zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zzz-to-char"; - version = "20170519.335"; + version = "20171231.2219"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "96dfe16a990474267cd290498cf9ac6dd6b3e7c0"; - sha256 = "1jvysrq9ya77x2xg0wqy1q27y0r43578d10bdhihpj2281nxng1y"; + rev = "db8d9e660ad18a15159779efe34d7a98ef0df535"; + sha256 = "1wlzlhabq75iqrhg9p2xx8l7rnfzpcjjflxmgyhaxhq188bwrqk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index a13093d964e8452a15911a4dbb6c7452a43bafc7..c21db447e397a9f61fb190d7b71ee76d7fba3dfe 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -36,6 +36,9 @@ self: }); overrides = { + # Expects bash to be at /bin/bash + ac-rtags = markBroken super.ac-rtags; + # upstream issue: mismatched filename ack-menu = markBroken super.ack-menu; @@ -46,10 +49,16 @@ self: # upstream issue: missing file header bufshow = markBroken super.bufshow; + # part of a larger package + caml = dontConfigure super.caml; + # part of a larger package # upstream issue: missing package version cmake-mode = markBroken (dontConfigure super.cmake-mode); + # Expects bash to be at /bin/bash + company-rtags = markBroken super.company-rtags; + # upstream issue: missing file header connection = markBroken super.connection; @@ -66,19 +75,27 @@ self: # upstream issue: missing file header elmine = markBroken super.elmine; + # upstream issue: missing dependency redshank + emr = markBroken super.emr; + ess-R-data-view = super.ess-R-data-view.override { inherit (self.melpaPackages) ess ctable popup; }; - ess-R-object-popup = super.ess-R-object-popup.override { - inherit (self.melpaPackages) ess popup; - }; + # upstream issue: missing dependency highlight + evil-search-highlight-persist = markBroken super.evil-search-highlight-persist; + + # upstream issue: missing dependency highlight + floobits = markBroken super.floobits; # missing OCaml flycheck-ocaml = markBroken super.flycheck-ocaml; - # upstream issue: missing file header - fold-dwim = markBroken super.fold-dwim; + # Expects bash to be at /bin/bash + flycheck-rtags = markBroken super.flycheck-rtags; + + # upstream issue: missing dependency + fold-dwim-org = markBroken super.fold-dwim-org; # build timeout graphene = markBroken super.graphene; @@ -86,14 +103,17 @@ self: # upstream issue: mismatched filename helm-lobsters = markBroken super.helm-lobsters; - # upstream issue: missing file header - helm-words = markBroken super.helm-words; + # Expects bash to be at /bin/bash + helm-rtags = markBroken super.helm-rtags; # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; # upstream issue: missing file header - initsplit = markBroken super.initsplit; + initsplit = super.initsplit; + + # Expects bash to be at /bin/bash + ivy-rtags = markBroken super.ivy-rtags; # upstream issue: missing file header jsfmt = markBroken super.jsfmt; @@ -101,15 +121,15 @@ self: # upstream issue: missing file header link = markBroken super.link; - # upstream issue: mismatched filename - link-hint = markBroken super.link-hint; - - # part of a larger package - llvm-mode = dontConfigure super.llvm-mode; - # upstream issue: missing file header maxframe = markBroken super.maxframe; + # version of magit-popup needs to match magit + # https://github.com/magit/magit/issues/3286 + magit = super.magit.override { + inherit (self.melpaPackages) magit-popup; + }; + # missing OCaml merlin = markBroken super.merlin; @@ -126,8 +146,8 @@ self: # missing OCaml ocp-indent = markBroken super.ocp-indent; - # upstream issue: missing file header - perl-completion = markBroken super.perl-completion; + # upstream issue: missing dependency + org-readme = markBroken super.org-readme; # upstream issue: truncated file powershell = markBroken super.powershell; @@ -138,15 +158,12 @@ self: # upstream issue: missing file header qiita = markBroken super.qiita; - # upstream issue: missing package version - quack = markBroken super.quack; - - # upstream issue: missing file header - railgun = markBroken super.railgun; - # upstream issue: missing file footer seoul256-theme = markBroken super.seoul256-theme; + # upstream issue: missing dependency highlight + sonic-pi = markBroken super.sonic-pi; + spaceline = super.spaceline.override { inherit (self.melpaPackages) powerline; }; @@ -157,6 +174,9 @@ self: # upstream issue: missing file header stgit = markBroken super.stgit; + # upstream issue: missing file header + tawny-mode = markBroken super.tawny-mode; + # upstream issue: missing file header textmate = markBroken super.textmate; @@ -166,11 +186,11 @@ self: # upstream issue: missing file header voca-builder = markBroken super.voca-builder; - # upstream issue: missing file header - window-numbering = markBroken super.window-numbering; + # upstream issue: missing dependency + weechat-alert = markBroken super.weechat-alert; # upstream issue: missing file header - zeitgeist = markBroken super.zeitgeist; + window-numbering = markBroken super.window-numbering; w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 7836f12ed9127f069ff873dc4c4e29b9fa394fd1..ff9967e51b352a12d5148e10c6990944cf39cb28 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -125,69 +125,6 @@ license = lib.licenses.free; }; }) {}; - ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-anaconda"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "proofit404"; - repo = "ac-anaconda"; - rev = "d0dec5c026235f65f9fd6594540df8886ed1b6a8"; - sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda"; - sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf"; - name = "ac-anaconda"; - }; - packageRequires = [ anaconda-mode auto-complete dash ]; - meta = { - homepage = "https://melpa.org/#/ac-anaconda"; - license = lib.licenses.free; - }; - }) {}; - ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-cake"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-ac-cake"; - rev = "f01b3da7e2d20ea5a62daf62412c7dc1ad0130ff"; - sha256 = "12z8nq797hjy0bq5vzpcm7z7bdn0ixc3ma4cj3v51xnwmgknzk6c"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2257db76719cb1e3e2f79aff2b61073b655f9061/recipes/ac-cake"; - sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl"; - name = "ac-cake"; - }; - packageRequires = [ auto-complete cake ]; - meta = { - homepage = "https://melpa.org/#/ac-cake"; - license = lib.licenses.free; - }; - }) {}; - ac-cake2 = callPackage ({ auto-complete, cake2, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-cake2"; - version = "1.0.1"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-ac-cake2"; - rev = "ffbb679c0d5c261b05abde06d8d1d1e5d5990b6a"; - sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b8b728c2caed96d7505cafc42d0d7ed49d6cadcd/recipes/ac-cake2"; - sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy"; - name = "ac-cake2"; - }; - packageRequires = [ auto-complete cake2 ]; - meta = { - homepage = "https://melpa.org/#/ac-cake2"; - license = lib.licenses.free; - }; - }) {}; ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-capf"; @@ -233,12 +170,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "1.9.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd"; - sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57"; + rev = "daddbea033d3c6f934e5043cc2fff8eca3b6e5f7"; + sha256 = "1hp3xpv0kwmilfivif2smbbgknjyk8kcgp399dghdcq71qsxz3wr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -527,12 +464,12 @@ ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-octave"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "coldnew"; repo = "ac-octave"; - rev = "f131ed6859a0945ac0c0520d2ab076f16ce7314c"; - sha256 = "0aigfydmfw284qkhajzxhnl5zx41v5z6ip0kjwmwgphqyxay7nih"; + rev = "6d09b94a86f43de84c60e9a699b5e1be61c0f138"; + sha256 = "1kg5q0bw0ymynsn3j7bjavb6wr8b0bjwm6jfj254g80y1inn4bp4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave"; @@ -548,12 +485,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "1.8.1"; + version = "2.0.4"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; - sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; + rev = "326721527b2f88df7227cdc41708912b2f9c8494"; + sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -569,12 +506,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "1.8.1"; + version = "2.0.4"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; - sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; + rev = "326721527b2f88df7227cdc41708912b2f9c8494"; + sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -611,12 +548,12 @@ ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "ac-rtags"; - version = "2.15"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; - sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -758,12 +695,12 @@ ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-jump-zap"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "waymondo"; repo = "ace-jump-zap"; - rev = "0acdd83a5abd59606495e67a4ee01f7856e5d359"; - sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca"; + rev = "1a9bf779d8f9225ede9ec482b840942bb58111df"; + sha256 = "0r875w4aq3p091hcrpkpqsivn1q9hmq2ppa1rvxzdaq0rhl9kfz4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap"; @@ -902,15 +839,36 @@ license = lib.licenses.free; }; }) {}; + adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "adafruit-wisdom"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "adafruit-wisdom.el"; + rev = "2b353f9029f359eb4eb4f0364bd2fbbedf081e42"; + sha256 = "0zyqnwmrj7yigk1z9baqxmzxnwhpxfjz9r1gl090harl69hdp67d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; + sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad"; + name = "adafruit-wisdom"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/adafruit-wisdom"; + license = lib.licenses.free; + }; + }) {}; add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-hooks"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; - sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; + rev = "a1043b7cdb1ea98055a2c99f8d37584a553ca362"; + sha256 = "1jv9fpcsm572zg0j1mbpbfkqgdlqapy89xhhj19pswkhjns1y2wl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1073,12 +1031,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476"; - sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg"; + rev = "45bf75f17752c8e8dd4c8a4531c0aa419cdccb84"; + sha256 = "03xypgq6vy7819r42g23kgn7p775bc0v9blzhi0zp5c61p4cw8v3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1196,22 +1154,22 @@ license = lib.licenses.free; }; }) {}; - all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: + all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "bb69345ead914345faad582723a2b61618f13289"; - sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf"; + rev = "52d1f2d36468146c93aaf11399f581401a233306"; + sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; name = "all-the-icons"; }; - packageRequires = [ emacs font-lock-plus memoize ]; + packageRequires = [ emacs memoize ]; meta = { homepage = "https://melpa.org/#/all-the-icons"; license = lib.licenses.free; @@ -1523,12 +1481,12 @@ anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anti-zenburn-theme"; - version = "2.4"; + version = "2.5.1"; src = fetchFromGitHub { owner = "m00natic"; repo = "anti-zenburn-theme"; - rev = "53591a18aee564c6d08a5be69b4060a299903255"; - sha256 = "06cn81sksvl88l1g3cfgp1kf8xzfv00b31j2rf58f45zlbl5ckv9"; + rev = "c80cc51bb1aaf11dd53b9d08e01d61bc9b32622f"; + sha256 = "1c97d2jkh7iawgsbcg19gha9ffnxypbcfz0sgcsgf9vy4bvnc350"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f6f803dc99a1b1fdb5b4e79f1c9cf72b702d091/recipes/anti-zenburn-theme"; @@ -1562,110 +1520,6 @@ license = lib.licenses.free; }; }) {}; - anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything"; - version = "1.3.9"; - src = fetchgit { - url = "http://repo.or.cz/r/anything-config.git"; - rev = "6b9718fba257e6c2912ba70f9895251ab1926928"; - sha256 = "040znq4qv6rqjw05klriasysvsx6s6xn00ssc3acbqdqjgjk8l2a"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything"; - sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj"; - name = "anything"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/anything"; - license = lib.licenses.free; - }; - }) {}; - anything-exuberant-ctags = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-exuberant-ctags"; - version = "0.1.2"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "anything-exuberant-ctags"; - rev = "97fa91eb04df11bdf4558fe7bb2f6aebf8be0d6c"; - sha256 = "01lw9159axg5w9bpdy55m4zc902zmsqvk213ky1nmgnln0fvq3rd"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/66cae648d534468e5e9f125679847fb876935f68/recipes/anything-exuberant-ctags"; - sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk"; - name = "anything-exuberant-ctags"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-exuberant-ctags"; - license = lib.licenses.free; - }; - }) {}; - anything-replace-string = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anything-replace-string"; - version = "0.9.2"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "anything-replace-string"; - rev = "1962f24243d6013bcef7e8d23136277d42e13130"; - sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39b7f3a8de2f7728b374c09a1387beb3f7595d2e/recipes/anything-replace-string"; - sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71"; - name = "anything-replace-string"; - }; - packageRequires = [ anything ]; - meta = { - homepage = "https://melpa.org/#/anything-replace-string"; - license = lib.licenses.free; - }; - }) {}; - anything-sage = callPackage ({ anything, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }: - melpaBuild { - pname = "anything-sage"; - version = "0.0.1"; - src = fetchFromGitHub { - owner = "stakemori"; - repo = "anything-sage"; - rev = "8335657d3f0611bd5fc8858160bbe87dfdbaf0f2"; - sha256 = "1bcvin2694ypqgiw0mqk82riq7gw6ra10vbkzng1yp9jp2qr6wmm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/07be4b11bbddb376e11616525e7b226c5a9f2296/recipes/anything-sage"; - sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3"; - name = "anything-sage"; - }; - packageRequires = [ anything cl-lib sage-shell-mode ]; - meta = { - homepage = "https://melpa.org/#/anything-sage"; - 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"; @@ -1732,12 +1586,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "5d25972192cd34553997ba193c09eab093a2b870"; - sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0"; + rev = "7935275ee45f0359d887b8563ffd1d002f0c618e"; + sha256 = "1p6sj46135dh7fgpzrfzsp5zkmx5si5lndwc7pnk30fbz5pindsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2002,36 +1856,57 @@ license = lib.licenses.free; }; }) {}; - auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: + aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "auth-password-store"; - version = "2.0.0"; + pname = "aurora-config-mode"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "bdd"; + repo = "aurora-config-mode.el"; + rev = "0a7ca7987c3a0824e25470389c7d25c337a81593"; + sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode"; + sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; + name = "aurora-config-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/aurora-config-mode"; + license = lib.licenses.free; + }; + }) {}; + auth-source-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auth-source-pass"; + version = "4.0.1"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "5ca6a838489c1175de3df7af025751559eb13cb3"; - sha256 = "10y6grxwp8sw24fv8i9f50lc83qcdxnkw2bm1v983fw6di4i3a8w"; + rev = "5690092e40c790384692d8e8da3451e6878d8c17"; + sha256 = "1dv202z8briifd4aqn8yvn4kd6zi1cabb2p86qcjj40lzkgn6w3p"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; - sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5"; - name = "auth-password-store"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass"; + sha256 = "0icwdwz2zy3f9ynksr81pgq482iapsbx8lpyssiklyw0xgd1k8ak"; + name = "auth-source-pass"; }; - packageRequires = [ cl-lib emacs password-store seq ]; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/auth-password-store"; + homepage = "https://melpa.org/#/auth-source-pass"; license = lib.licenses.free; }; }) {}; auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a"; - sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa"; + rev = "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f"; + sha256 = "013vw4sgw6hpz7kskilndv7i7ik40asrkgicghjbygwk0lj5ran3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -2533,15 +2408,36 @@ license = lib.licenses.free; }; }) {}; + banner-comment = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "banner-comment"; + version = "2.5"; + src = fetchFromGitHub { + owner = "WJCFerguson"; + repo = "banner-comment"; + rev = "9b1c9a94f8b6789c890a7e7eedd6f60ad5aa4d52"; + sha256 = "02wsnmzbb60d4a8bsb5kywdwcfsqb6chcchs5v2d0s3sacakbmnl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment"; + sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc"; + name = "banner-comment"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/banner-comment"; + license = lib.licenses.free; + }; + }) {}; base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1"; - sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv"; + rev = "10180e88d6d9434cec367b6c91222dd2fc3bd8ae"; + sha256 = "01w89g413s1da6rf94y1xnhw79cjy2bqb01yfjs58cy492cm0vr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -2575,19 +2471,40 @@ license = lib.licenses.free; }; }) {}; + bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bazel-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "codesuki"; + repo = "bazel-mode"; + rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25"; + sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode"; + sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586"; + name = "bazel-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bazel-mode"; + license = lib.licenses.free; + }; + }) {}; bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbcode-mode"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "ejmr"; + owner = "lassik"; repo = "bbcode-mode"; - rev = "e693ab09c3f34cabfd185e7c249c0b5403f0a7e0"; - sha256 = "1xvxz9sk9l57a4kiiavxxdp0v241mfgiy2lg5ilacq1cd6xrrhky"; + rev = "73c56a40301c8b017d3e64c08dccc80d1dc47e59"; + sha256 = "0g0dxk33pz18awv7ncv64c2a4lmdx9sigppkvq2mb9za47azk8dh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/bbcode-mode"; - sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode"; + sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb"; name = "bbcode-mode"; }; packageRequires = []; @@ -2680,22 +2597,22 @@ license = lib.licenses.free; }; }) {}; - beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "beeminder"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Sodaware"; repo = "beeminder.el"; - rev = "54cc1277f2a7667a7b0d999dc49ceffcf2862b44"; - sha256 = "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q"; + rev = "3e95a669474e27cd51a16caea030456377f83062"; + sha256 = "1bj9yzjvglnb0f4glh8fg478xlm5nqmd9jqm1casdj5m30i4kafn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/beeminder"; sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww"; name = "beeminder"; }; - packageRequires = []; + packageRequires = [ org ]; meta = { homepage = "https://melpa.org/#/beeminder"; license = lib.licenses.free; @@ -2722,6 +2639,27 @@ license = lib.licenses.free; }; }) {}; + benchmark-init = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "benchmark-init"; + version = "1.0"; + src = fetchFromGitHub { + owner = "dholm"; + repo = "benchmark-init-el"; + rev = "7a0f263282bbc86b01b662636306f22813082647"; + sha256 = "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0/recipes/benchmark-init"; + sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal"; + name = "benchmark-init"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/benchmark-init"; + license = lib.licenses.free; + }; + }) {}; benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "benchstat"; @@ -2767,12 +2705,12 @@ better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-shell"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "killdash9"; repo = "better-shell"; - rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7"; - sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd"; + rev = "f231404b6f8efce33b48e31e5b1566108d0ba000"; + sha256 = "1g5bljvigga856ksyvgix9hk0pp9nzic088kp0bqx0zqvcl82v0b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell"; @@ -2998,12 +2936,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "cf7817de3f37ce2404ee637a655f1a511b829585"; - sha256 = "0h166w8bg864ppwg64m0vhg649mmkclld85zcd0lmbqa9wfml5j5"; + rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611"; + sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -3079,6 +3017,27 @@ license = lib.licenses.free; }; }) {}; + borg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "borg"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "borg"; + rev = "34eac585d6829e17ce59b09fe6ad5d675302c096"; + sha256 = "1q7k2c7pxcywg6xjk8awg73skyw59a6w4aa9sxbsz9vdj2zn04k9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; + sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr"; + name = "borg"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/borg"; + license = lib.licenses.free; + }; + }) {}; boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; @@ -3163,22 +3122,22 @@ license = lib.licenses.free; }; }) {}; - buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: + buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; - version = "1.2"; + version = "2.1"; src = fetchFromGitHub { owner = "killdash9"; repo = "buffer-flip.el"; - rev = "386067141ca77848b266e068f8c6baf6b4c2ab5b"; - sha256 = "1bch4jk6d60aydvcc624026pwfby29fbcwm3zhrsksqc0d2qxdwq"; + rev = "e093360e05164c78255866c1ac8f966aa38ba514"; + sha256 = "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098"; name = "buffer-flip"; }; - packageRequires = [ key-chord ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/buffer-flip"; license = lib.licenses.free; @@ -3292,12 +3251,12 @@ bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bug-reference-github"; - version = "0.2.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "arnested"; repo = "bug-reference-github"; - rev = "671d32083aad5cf813a5e61075b70889bc95dec5"; - sha256 = "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v"; + rev = "f570a0532bfb44f095b42cf68ab1f69799101137"; + sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github"; @@ -3418,12 +3377,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "1.9"; + version = "1.11"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "18a887957b0e22d3cc8873796bd27f06b2493a03"; - sha256 = "0y0wg0yqmvqjyhjs4dx8yw44hl19k227krd9mds220w0dx8wmhay"; + rev = "8d27bb99463bc230a76dee96378dd337622988f5"; + sha256 = "0s5vfzcfsiqb6bc6jh95a2dyy23b4bvhdpzn2fcq8awldbpx51fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -3478,27 +3437,6 @@ license = lib.licenses.free; }; }) {}; - cake = callPackage ({ anything, cake-inflector, fetchFromGitHub, fetchurl, historyf, lib, melpaBuild }: - melpaBuild { - pname = "cake"; - version = "1.4.3"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-cake"; - rev = "a7c9f3bee71eb3865060123d4d98e5397c2f967e"; - sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/86ed5054ee2392a0e384443c945a5d4824238e95/recipes/cake"; - sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr"; - name = "cake"; - }; - packageRequires = [ anything cake-inflector historyf ]; - meta = { - homepage = "https://melpa.org/#/cake"; - license = lib.licenses.free; - }; - }) {}; cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cake-inflector"; @@ -3520,27 +3458,6 @@ license = lib.licenses.free; }; }) {}; - cake2 = callPackage ({ anything, cake-inflector, dash, f, fetchFromGitHub, fetchurl, historyf, ht, json ? null, lib, melpaBuild, s }: - melpaBuild { - pname = "cake2"; - version = "2.1.0"; - src = fetchFromGitHub { - owner = "k1LoW"; - repo = "emacs-cake2"; - rev = "0a9d0b3a1c49ba1730088416f50507f53221c70b"; - sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/18e38d9cdb9f1a8cc05545c52c3a76265a9aa2ab/recipes/cake2"; - sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x"; - name = "cake2"; - }; - packageRequires = [ anything cake-inflector dash f historyf ht json s ]; - meta = { - homepage = "https://melpa.org/#/cake2"; - license = lib.licenses.free; - }; - }) {}; calendar-norway = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calendar-norway"; @@ -3667,6 +3584,27 @@ license = lib.licenses.free; }; }) {}; + call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }: + melpaBuild { + pname = "call-graph"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "beacoder"; + repo = "call-graph"; + rev = "0bbe292b1b9c7ba1d8a65ed5e475f6a53f5f9f27"; + sha256 = "0kckjs7yg8d04nir5z3f00k05272kgma98794g0ycgfn1vrck0h0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; + sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc"; + name = "call-graph"; + }; + packageRequires = [ cl-lib emacs hierarchy ivy tree-mode ]; + meta = { + homepage = "https://melpa.org/#/call-graph"; + license = lib.licenses.free; + }; + }) {}; camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "camcorder"; @@ -3691,12 +3629,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.0"; + version = "4.7.0beta2"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "0d68080b95016f747b7cb63dd36ccdd42d40016e"; - sha256 = "1dxg82xqjx4yh4sg2dy48ybn4czv9yq0q3zpr29sxp1grvwvrg2b"; + rev = "c0bd6a27e138911560f43dc75d5fde2ade4d6cfe"; + sha256 = "0z08mpvfa5jvbdxkx9wlarn1zpp01aaxasmy63cz452jr8zg0nll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -3754,12 +3692,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "58f641960bcb152b33fcd27d41111291702e2da6"; - sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; + rev = "ccfe38ae133cc843865f87607d3f4f3960b76870"; + sha256 = "1bv0lganh5xhjp2r84js596p1sqndvxnhn3q6l7m7lcdxrjckcy8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -3857,12 +3795,12 @@ cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cbm"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "akermu"; repo = "cbm.el"; - rev = "bf8cbbcef82e4643c5f0399f0198f606275af08c"; - sha256 = "1p88fx90xwjk7dmd5gmbqyajyxf859kjsjzqmzljwai91skbb3pm"; + rev = "5b41c936ba9f6d170309a85ffebc9939c1050b31"; + sha256 = "091ln3d0jhdgahbwfdm1042b19886n3kwipw5gk8d0jnq5vwrkws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm"; @@ -4193,12 +4131,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1"; - sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h"; + rev = "74f7901b416efbd032bb4f8b5c25f57fdf731115"; + sha256 = "0n2b6q8r2gzr3ghyvg5sawir47rk7jmsslvxx6by27bn77h4nzil"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -4256,7 +4194,7 @@ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circadian"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; @@ -4277,12 +4215,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6"; - sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j"; + rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484"; + sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -4316,6 +4254,27 @@ license = lib.licenses.free; }; }) {}; + citeproc = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, queue, s, string-inflection }: + melpaBuild { + pname = "citeproc"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "andras-simonyi"; + repo = "citeproc-el"; + rev = "6d68f52ebd150e035b33dcaa59d9e2aceab69b84"; + sha256 = "04xz3y3j8k1pv5v6v9wqscqlpmgqi85fs3igrv8c9y0xagild29k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc"; + sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq"; + name = "citeproc"; + }; + packageRequires = [ dash emacs f queue s string-inflection ]; + meta = { + homepage = "https://melpa.org/#/citeproc"; + license = lib.licenses.free; + }; + }) {}; cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cl-format"; @@ -4604,12 +4563,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362"; - sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l"; + rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d"; + sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -4688,12 +4647,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.10.0pre5"; + version = "3.11.0"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "78f5d571e4b07cc71d44c78ff36a335693298ccb"; - sha256 = "1wrbpcfmvhmamxbv7iar6w29i7axzi1im99xd4vrhy4fc1rkk566"; + rev = "61fd4c742013a7f9139db190f936703b656540ff"; + sha256 = "1iiyysw16asqj1c077gk6s9pqy8qij6d83kwxc59swc7xgcy1g0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5003,12 +4962,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56"; - sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa"; + rev = "4711695af3df93f1bbceee165c505fea5bfc49ac"; + sha256 = "0x8zwq88k85ikzr0klm6nfa6i1wbykzfa790cg9cmi7wrsywimm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -5045,12 +5004,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "2c30c3bdb8316b27d5c1832b944cb146d00de456"; - sha256 = "183hyy5vy7xs6hwsk8nrylck8w5czcqwzfx0wik4ppx8011jzis1"; + rev = "42753d43333c6e4ad83797f0234149b76b463369"; + sha256 = "1g93vnizl42k52ar47g7yn2csjyzsqvwb6siwbpfvjgbsr5d5d01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -5315,22 +5274,22 @@ license = lib.licenses.free; }; }) {}; - company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: + company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "1.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "86fda23d29b732ba3987bf20901034da1515b077"; - sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y"; + rev = "4512d062c38922d8b8cf402ca6043c246e915694"; + sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l"; name = "company-lsp"; }; - packageRequires = [ company emacs lsp-mode s ]; + packageRequires = [ company dash emacs lsp-mode s ]; meta = { homepage = "https://melpa.org/#/company-lsp"; license = lib.licenses.free; @@ -5402,12 +5361,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "1.8.1"; + version = "2.0.4"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; - sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; + rev = "326721527b2f88df7227cdc41708912b2f9c8494"; + sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -5471,12 +5430,12 @@ company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "company-rtags"; - version = "2.15"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; - sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -5597,12 +5556,12 @@ company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "company-web"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "osv"; repo = "company-web"; - rev = "935c65de0411ebbcb4f2223f31e756e093eaae07"; - sha256 = "0kw0fc1lg7qd23fx26y9m543sql32n1dlvr4rg7bmq6im7dwz4hy"; + rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a"; + sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web"; @@ -5741,6 +5700,27 @@ license = lib.licenses.free; }; }) {}; + conllu-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsec }: + melpaBuild { + pname = "conllu-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "odanoburu"; + repo = "conllu-mode"; + rev = "993fd6bc2b5c7b70815a3ecede1642f607513615"; + sha256 = "0x6ga4h084qcf9h6nak7c66qq1slq907n64sqx41gnd3zbscmwxa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode"; + sha256 = "1wffvvs8d0xcnz6mcm9rbr8imyj4npyc148yh0gzfzlgjm0fiz1v"; + name = "conllu-mode"; + }; + packageRequires = [ cl-lib emacs parsec ]; + meta = { + homepage = "https://melpa.org/#/conllu-mode"; + license = lib.licenses.free; + }; + }) {}; connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "connection"; @@ -5807,12 +5787,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "fba9fe57a310a71c5aac90a26434df4c08214833"; - sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76"; + rev = "971957166fe64d914ec4be209b4f80efeeabbb19"; + sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -5828,12 +5808,12 @@ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copy-file-on-save"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84"; - sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs"; + rev = "aaa847b43af225ccb282aab2d9cddafe500d9f62"; + sha256 = "0n2z91g7p9i724xqx2qq4s5xnxnf4vjccnvy1i706cddpjn02d6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; @@ -5912,12 +5892,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; - sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; + rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; + sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -5930,22 +5910,22 @@ license = lib.licenses.free; }; }) {}; - counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-bbdb"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-bbdb"; - rev = "f95e4812cd17e5f8069c9209241396780d414680"; - sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73"; + rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1"; + sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; name = "counsel-bbdb"; }; - packageRequires = []; + packageRequires = [ emacs ivy ]; meta = { homepage = "https://melpa.org/#/counsel-bbdb"; license = lib.licenses.free; @@ -5975,12 +5955,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "1.3.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "ad70ab89861d17b648a798c234153269eacf90b5"; - sha256 = "0jzk5sdh6kax1gvrdrldvqlbgbsx8p938qnzn1mpkd2nmjga3v3c"; + rev = "307638efaa172539e77fe425626eac99f7abf654"; + sha256 = "0c0fqn9hin9738bcxib354al6pd64arj2pccacjiyg1sa5h3mwj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -6014,15 +5994,57 @@ license = lib.licenses.free; }; }) {}; + counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + melpaBuild { + pname = "counsel-projectile"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "ericdanan"; + repo = "counsel-projectile"; + rev = "536872f022f449548bdb97faa1776d1d44499d73"; + sha256 = "0pm5sqhr24n2ffycazxgl3d3dl7gai8svwz01vc0pgx9c0x75kl8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; + sha256 = "1gshphxaa902kq878rnizn3k1zycakwqkciz92z3xxb3bdyy0hnl"; + name = "counsel-projectile"; + }; + packageRequires = [ counsel projectile ]; + meta = { + homepage = "https://melpa.org/#/counsel-projectile"; + license = lib.licenses.free; + }; + }) {}; + counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-tramp"; + version = "0.4.1"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-counsel-tramp"; + rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa"; + sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; + sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5"; + name = "counsel-tramp"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-tramp"; + license = lib.licenses.free; + }; + }) {}; coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }: melpaBuild { pname = "coverage"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "trezona-lecomte"; repo = "coverage"; - rev = "f7e78bb9502d3893ef876274c992743f49c0a1a7"; - sha256 = "01545iy2gaxyd4i8gawgxqi9gbkrjk20djhvc59finnjrblzccn3"; + rev = "c73d984168955ca0f47f44b0464aa45282df42b6"; + sha256 = "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd70e138534551dd12ba4d165ba56fbd1e033241/recipes/coverage"; @@ -6119,22 +6141,22 @@ license = lib.licenses.free; }; }) {}; - cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "0.2.10"; + version = "0.3.5"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69"; - sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3"; + rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889"; + sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip"; name = "cricbuzz"; }; - packageRequires = [ dash enlive s ]; + packageRequires = [ dash enlive f s ]; meta = { homepage = "https://melpa.org/#/cricbuzz"; license = lib.licenses.free; @@ -6203,6 +6225,27 @@ license = lib.licenses.free; }; }) {}; + crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "crystal-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "crystal-lang-tools"; + repo = "emacs-crystal-mode"; + rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10"; + sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode"; + sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk"; + name = "crystal-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/crystal-mode"; + license = lib.licenses.free; + }; + }) {}; csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; @@ -6227,12 +6270,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "877c7c9d5bdc6a2acf4ac1a10e9e24ba1bd3cc76"; - sha256 = "1vsngs42n8xp72701ppvmwyy6b90vnj39fq12yvp7x9zqf29lmq1"; + rev = "5a892e6ad72e7844e8e14c0da04fcb6bc125fe5e"; + sha256 = "1gzg2r7agllz2asp7dbxykydpnw3861whs2pfhr3fwwb39xf1pva"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -6350,6 +6393,27 @@ license = lib.licenses.free; }; }) {}; + cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cubicle-mode"; + version = "1.1.2"; + src = fetchFromGitHub { + owner = "cubicle-model-checker"; + repo = "cubicle"; + rev = "b043b0247bf9b144a5c3360e5096a4b141dd1fb6"; + sha256 = "0zsfz1h68xpbgdb1ln8l081vwrgd7i01ap4rjlyrsk8j3q3ry5wz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode"; + sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv"; + name = "cubicle-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/cubicle-mode"; + license = lib.licenses.free; + }; + }) {}; cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cuda-mode"; @@ -6374,12 +6438,12 @@ cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "cwl-mode"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "tom-tan"; repo = "cwl-mode"; - rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9"; - sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59"; + rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7"; + sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; @@ -6437,12 +6501,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.27.3"; + version = "0.28.2"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "8ad16fc871be075f889d5e7c2892db3e4c8ce978"; - sha256 = "144mqqyaid6w9qx38m88snd3c8qm2k1a73vs21h9cmnp19gigfby"; + rev = "93e3bb9b7558d597d10c4cb8aa1dd887ed37dc2b"; + sha256 = "1cywxcfrb2j33ncldylimqhj7r7yzlb6ghy5i8c9784vfvxd56yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -6497,15 +6561,36 @@ license = lib.licenses.free; }; }) {}; + daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "daemons"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "cbowdon"; + repo = "daemons.el"; + rev = "9e6868e2559ea7d70fbad8c419798124f406cc40"; + sha256 = "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons"; + sha256 = "14givkrw9p0m261hawahzi0n8jarapb63kv1s62faq57mqnq23jr"; + name = "daemons"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/daemons"; + license = lib.licenses.free; + }; + }) {}; dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "6b260611dc08468fca9b9af132a00783dd2cf8d9"; - sha256 = "0s5wi010sn3ng9fr7fqbc11kmjqirr28wya3rnnzzb3m5gyxs8id"; + rev = "1a25bf26ee8d9878ce858cfaff84b083339056d6"; + sha256 = "0kvsx9n8qm9s2w9bz167jzcb1b3d4fgc807w1miwil9dcyar6rkk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -6526,7 +6611,7 @@ owner = "fommil"; repo = "emacs-darcula-theme"; rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976"; - sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky"; + sha256 = "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -6560,22 +6645,22 @@ license = lib.licenses.free; }; }) {}; - dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dart-mode"; - version = "0.15"; + version = "1.0.3"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "e6635b390235cf16a8081763768cf925ca2d9133"; - sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx"; + rev = "f3a7c7b71fb12d02fa02700bc10426cb10010d01"; + sha256 = "1g0c37qfqki7v1a5rxf6sy7k07i529rw3f1wmjl7g1zhd9bwsml2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla"; name = "dart-mode"; }; - packageRequires = [ cl-lib dash flycheck ]; + packageRequires = [ cl-lib dash emacs flycheck s ]; meta = { homepage = "https://melpa.org/#/dart-mode"; license = lib.licenses.free; @@ -6584,12 +6669,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "4ae329aa2160411c8b47794de067fcf29bc38a22"; - sha256 = "12gvpn0a07kgbj2lrzw1vv4njp1w4gl38rl68yh0jp3rhvacbsg0"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -6605,12 +6690,12 @@ dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash-functional"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "4ae329aa2160411c8b47794de067fcf29bc38a22"; - sha256 = "12gvpn0a07kgbj2lrzw1vv4njp1w4gl38rl68yh0jp3rhvacbsg0"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -6686,22 +6771,22 @@ license = lib.licenses.free; }; }) {}; - datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "0.3"; + version = "0.4.1"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71"; - sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5"; + rev = "d8674ac11f9ebb702e5bbac10a4a6e5542958ef5"; + sha256 = "19d4wximzwdcs0i2r48k6m60wwxcx5f89jw75k4hr0wvx0352a82"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; - sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; + sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj"; name = "datetime"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs extmap ]; meta = { homepage = "https://melpa.org/#/datetime"; license = lib.licenses.free; @@ -6836,12 +6921,12 @@ deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deft"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "jrblevin"; repo = "deft"; - rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40"; - sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n"; + rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4"; + sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; @@ -6980,6 +7065,27 @@ license = lib.licenses.free; }; }) {}; + difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: + melpaBuild { + pname = "difflib"; + version = "0.3.8"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "difflib.el"; + rev = "b08850251812d71e62fd6956081299590acdf37b"; + sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib"; + sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6"; + name = "difflib"; + }; + packageRequires = [ cl-generic emacs ht s ]; + meta = { + homepage = "https://melpa.org/#/difflib"; + license = lib.licenses.free; + }; + }) {}; diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diffview"; @@ -7046,12 +7152,12 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "c91edab065f413910354940742b35bdffeb52029"; - sha256 = "0v4fgbh1byv89iiszifr31j4y2s95xwcq0g9iizxiww7mjrfggyi"; + rev = "788320fe089fafbdf1cb09d2ab4d29d64a804e21"; + sha256 = "0iyhjww7p274x418n1iw1xj2fkmn5k9icav0jyzbwmy83a2nmr52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; @@ -7085,6 +7191,27 @@ license = lib.licenses.free; }; }) {}; + dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dimmer"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "dimmer.el"; + rev = "12fc52a6570ec25020281735f5a0ca780a9105af"; + sha256 = "1jv9rrv15nb5hpwcaqlpjj932gyisrkwbv11czkg3v0bn7qn6yif"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; + sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r"; + name = "dimmer"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dimmer"; + license = lib.licenses.free; + }; + }) {}; dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: melpaBuild { pname = "dionysos"; @@ -7151,12 +7278,12 @@ dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-fdclone"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "knu"; repo = "dired-fdclone.el"; - rev = "8144c013d46c55b0471f31cdc3b5ead303286cbf"; - sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0"; + rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c"; + sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone"; @@ -7198,7 +7325,7 @@ owner = "xuhdev"; repo = "dired-icon"; rev = "dbace8d2250f84487d31b39050fcdc260fcde804"; - sha256 = "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki"; + sha256 = "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon"; @@ -7261,7 +7388,7 @@ owner = "xuhdev"; repo = "dired-quick-sort"; rev = "fe39cfb2d4a7ba6b30f98134548b4e4bac67c469"; - sha256 = "1a9r1kz5irpvb2byabbf27sy7rjzaygfpqimpag41sj955wlgy9a"; + sha256 = "014frvpszixn8cx7rdx704glmjbslv3py3kw0pb0xqf50k4scynf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort"; @@ -7361,12 +7488,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "1.2.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa"; - sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867"; + rev = "03c4edffba45722a9511d6d10992578f140d095f"; + sha256 = "1b8xp0yprpy1sc8hmim6jcdmgpc8yj6wjzgj4rdy77k7l96016v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -7570,12 +7697,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c"; - sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz"; + rev = "9ffeff244318ed119279d0a44784b7f690d1393d"; + sha256 = "13c7x9pf6690w8l1jqnjf0bi9np9ndzmw1n6imy9cks8bpqbkdyd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -7599,12 +7726,12 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "ae25b0e01394f94995f4b0ceaab1e04eb4b9acbd"; - sha256 = "14xri92dcj52vw1vhrnicibrn9y010zv8w7jw6j3q9lrpmr073lr"; + rev = "7f4cd0b1718df2ab93d51bd395b2f37df9482265"; + sha256 = "1fbcxwfvm33xcdj3cs26d9i1zyrryyjjkv7sc3mfxd45nq8d3ivj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; @@ -7685,14 +7812,14 @@ pname = "doom"; version = "1.3"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "kensanata"; repo = "doom"; rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730"; sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7e41ed64142be89a62fddeceee5e39603a18525c/recipes/doom"; - sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0960deb3b1d106ad2ffa95a44f34cb9efc026f01/recipes/doom"; + sha256 = "1ji2fdiw5b13n76nv2wvkz6v155b0qgh1rxwmv3m5nnrbmklfjh5"; name = "doom"; }; packageRequires = [ cl-lib ]; @@ -7704,12 +7831,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "1.2.5"; + version = "2.1.1"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "d04875c9c7ce21d5f51dfc541a5d03efddac7728"; - sha256 = "0lfldrsfldrnw9g59dnsmyyp7j3v3kqv0d39h4kzs9dhm5v9dpbr"; + rev = "98120f9b362b53983e932f126cf92848297b745a"; + sha256 = "03pnnbqa09iqyypgbgwlkxr6w1j46rla6pivbq7fy366yk2x03x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -7722,6 +7849,27 @@ license = lib.licenses.free; }; }) {}; + dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dotenv-mode"; + version = "0.2.4"; + src = fetchFromGitHub { + owner = "preetpalS"; + repo = "emacs-dotenv-mode"; + rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea"; + sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode"; + sha256 = "1lwfzfri6vywcjkc9wassrz0rdrg0kvljxsm6b4smlnphp6pdbbs"; + name = "dotenv-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dotenv-mode"; + license = lib.licenses.free; + }; + }) {}; downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "downplay-mode"; @@ -7872,12 +8020,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "0.3"; + version = "0.7"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c"; - sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq"; + rev = "0ac070c9576e4ebab12cd6800ac2ac3abcecc2c1"; + sha256 = "0dambn5l0wvbhccvhh5hbz9hw66y4mp1la3wj85dl9kgr7hq1ry7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -7914,12 +8062,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "64c0759432334465ccea115d83600b468f86e3be"; - sha256 = "00vhxd7z7fw2cwdzgvfbdzfp668dfaw83c95kkicmmdzlabiz50i"; + rev = "260054500d4731c36574b6cbc519de29fdd22f43"; + sha256 = "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -7938,8 +8086,8 @@ version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "9e446540a794"; - sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi"; + rev = "87db00b912be"; + sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -8123,12 +8271,12 @@ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "eacl"; - version = "1.0.3"; + version = "1.1.2"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "ef58d13fbff4b5c49f934cfb9e3fd6ee219ef4b2"; - sha256 = "0xxxzdr6iddxwx8z4lfay4n9r1ry8571lj2gadz5ycff6f6bxmhb"; + rev = "80113a9f6cc246cef67e3e20ec052788c38ab116"; + sha256 = "1pwppn0m288d6j9b7cdshgc3rxv0nfs94klc1fpsyfxqx0a6f23z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -8141,27 +8289,48 @@ license = lib.licenses.free; }; }) {}; - easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "easy-hugo"; - version = "2.0.16"; + version = "3.2.24"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0"; - sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i"; + rev = "fbcd7dfd737e6ec90f7bee6a911ff66e86577a64"; + sha256 = "1yabqf8mksadfab7pfk87a3yimda3x6la2kvrxf76kbzbl23h3dx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g"; name = "easy-hugo"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs popup ]; meta = { homepage = "https://melpa.org/#/easy-hugo"; license = lib.licenses.free; }; }) {}; + easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "easy-jekyll"; + version = "1.6.13"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-easy-jekyll"; + rev = "742366a2eb8bdb3d91e108e701ca8a1e83084671"; + sha256 = "1i3pxg5mskbk2zmcavbd78sr9l45qqcjjfp3p0i8q5kbm9zjr5fm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; + sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv"; + name = "easy-jekyll"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/easy-jekyll"; + license = lib.licenses.free; + }; + }) {}; easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill"; @@ -8270,12 +8439,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.11.6"; + version = "2.11.8"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6"; - sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20"; + rev = "fb43f9354f9f9c4c65091ae15732b1d941475186"; + sha256 = "16l6l2qpkq10wkd95vbch2f7qcsb0jw4rjdf0gck2q8si8i2xi9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -8312,12 +8481,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "0.6.16"; + version = "0.6.17"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "c8092db08be5337ff3f3dd2857bfa94e360945d2"; - sha256 = "1dkinyigacb4yxqikd9za4inbh7yz7pl8bhrpihrxzabxirmvw55"; + rev = "3a77ba9f1064c2bca47b401974c009e65727c46e"; + sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -8480,12 +8649,12 @@ edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-server"; - version = "1.13"; + version = "1.15"; src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; - rev = "f0db18f0d6e9885e4aef3ace8342fd6f635fadf6"; - sha256 = "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn"; + rev = "4e959de2f78268b348d2eaac4e43c846792d345f"; + sha256 = "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; @@ -8627,12 +8796,12 @@ egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egison-mode"; - version = "3.7.0"; + version = "3.7.10"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "accb84375895946f0d0bed3917e0193074bd4131"; - sha256 = "0adxbjbmph186amkyhyl9syypfawarxmyk80zz4c0b6bgxy15rc1"; + rev = "b7c073e0a29c9632d82b501849e270d62304e22f"; + sha256 = "13p6nfsjnbhw0cgy1s28ww9dk4hmwmanf2j6ydhcafvbynp964zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -8649,13 +8818,13 @@ pname = "eide"; version = "2.1.2"; src = fetchgit { - url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; + url = "https://git.tuxfamily.org/eide/emacs-ide.git"; rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3"; sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide"; - sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide"; + sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni"; name = "eide"; }; packageRequires = []; @@ -8667,12 +8836,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd"; - sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za"; + rev = "fcf9bff0af071f5e2020ac77d9a9473325e4c5bb"; + sha256 = "1xk7k4av9hy0i7zqwpzis0rjp5myvxs52k45ah00zg8wi5hybq1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -8842,22 +9011,22 @@ license = lib.licenses.free; }; }) {}; - el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }: + el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-spice"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "vedang"; repo = "el-spice"; - rev = "53921ffe9a84d9395eea90709309d3d5529921ea"; - sha256 = "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i"; + rev = "972dace20ec61cd27b9322432d0c7a688c6f061a"; + sha256 = "1wrb46y4s4v0lwwyriz2qn1j1l804jyb4dmadf462jxln85rml70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice"; sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg"; name = "el-spice"; }; - packageRequires = [ thingatpt-plus ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/el-spice"; license = lib.licenses.free; @@ -8905,6 +9074,27 @@ license = lib.licenses.free; }; }) {}; + elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "elbank"; + version = "1.2"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "Elbank"; + rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5"; + sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; + sha256 = "1ry84aiajyrnrspf7w4yjm0rmdam8ijrz0s7291yr8c70hslc997"; + name = "elbank"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/elbank"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -8971,12 +9161,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "79077efc34aad25bb43cf46a28a69a308196c972"; - sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; + rev = "00b25d974abc4f3e61676068397758035bfdfc30"; + sha256 = "0qivqhz2mhjyqrqkfjrv8q6387cbzwvmyay2jbws5vibwbxjciwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -8989,15 +9179,36 @@ license = lib.licenses.free; }; }) {}; + elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elfeed-protocol"; + version = "0.5.3"; + src = fetchFromGitHub { + owner = "fasheng"; + repo = "elfeed-protocol"; + rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec"; + sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; + sha256 = "1gd2ny764qsnnqf3j7rbdqhh7hqd5c0fzwxx6wacd0dpbq4w56qi"; + name = "elfeed-protocol"; + }; + packageRequires = [ cl-lib elfeed emacs ]; + meta = { + homepage = "https://melpa.org/#/elfeed-protocol"; + license = lib.licenses.free; + }; + }) {}; elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "79077efc34aad25bb43cf46a28a69a308196c972"; - sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; + rev = "00b25d974abc4f3e61676068397758035bfdfc30"; + sha256 = "0qivqhz2mhjyqrqkfjrv8q6387cbzwvmyay2jbws5vibwbxjciwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -9010,6 +9221,48 @@ license = lib.licenses.free; }; }) {}; + elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "elisp-def"; + version = "1.0"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "elisp-def"; + rev = "5e0d766a5db537f4e7145c2053c22829d736ceba"; + sha256 = "0l9az09yw40rr2xrvf01c3idfqplddr1kk880qscnzj8v9p06l4x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def"; + sha256 = "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz"; + name = "elisp-def"; + }; + packageRequires = [ dash emacs f s ]; + meta = { + homepage = "https://melpa.org/#/elisp-def"; + license = lib.licenses.free; + }; + }) {}; + elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elisp-lint"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "elisp-lint"; + rev = "9d894e99377859171ee54cb7d2b2e7f2cc7c267c"; + sha256 = "11pvqskjhxxsyxmy8wllqwa0qg0j9280h0m5rzjghgsdcnlisyvq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint"; + sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63"; + name = "elisp-lint"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elisp-lint"; + license = lib.licenses.free; + }; + }) {}; elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; @@ -9202,12 +9455,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "9cf096448b69c795b20aab89557e9add6029b13c"; - sha256 = "05la1v1p7wyrjflh8lv3pwr7ywm2rvvzhh8phr24w31jfs2kp4gf"; + rev = "83a38b5721c459d311833522903de96f874e1a4e"; + sha256 = "0j2nk1nhbihfqajkmzp3501mhv5617qhb7qbj46qz8azs8a1dvri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -9220,15 +9473,15 @@ license = lib.licenses.free; }; }) {}; - elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: + elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.17.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "99f0b6401bff25d40b9f58123533271f7870a286"; - sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j"; + rev = "8b04039b8112fd18392861718dc30ba011626dee"; + sha256 = "0yyn1a8sdn8avmwmlg98365irr9b2rx2jrjxs3y93d1bhlmr816i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -9237,6 +9490,7 @@ }; packageRequires = [ company + emacs find-file-in-project highlight-indentation pyvenv @@ -9248,6 +9502,27 @@ license = lib.licenses.free; }; }) {}; + elscreen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elscreen"; + version = "2018snapshot3snapshot21"; + src = fetchFromGitHub { + owner = "knu"; + repo = "elscreen"; + rev = "02164afab2c5fbff6e4aa7c59e0daedc6c504772"; + sha256 = "1jzp7w2c9xl8x8kdxcchgp8s3ygvj70pi2vwwg1qilkya7yv61p0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e6140694c1dea0a573586d23d1f63d46c9b22936/recipes/elscreen"; + sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s"; + name = "elscreen"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elscreen"; + license = lib.licenses.free; + }; + }) {}; elscreen-fr = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elscreen-fr"; @@ -9314,12 +9589,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.1.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; - sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; + rev = "c5fb4853d8a7d266c8d484522cbaa6b31e745695"; + sha256 = "1lc9kdflssp4j220p252hskd5ikl0fbvhqp6fksfynrj1j02p4jg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -9395,85 +9670,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 = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; + sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; }; 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 = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; + sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; }; 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 = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; + sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; }; 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 = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; + sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; - sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; + sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x"; 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; @@ -9607,12 +9882,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "0.0.12"; + version = "0.1.0"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "8c72282c98f9b10601e9a6901277040cda4b33aa"; - sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6"; + rev = "ccc0090ba1ebaad6bd3b079d6d810e9a051218b3"; + sha256 = "1jy7zc26ypwl46ag26gbspbn7p4lf3jxgb34l8blqzk8qn8fxz0c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -9712,12 +9987,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "0.4"; + version = "1.0"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "4eccfc7ce43d4dfd3cf65ea86b2975abb4b4e9ad"; - sha256 = "1n5pmcd6d71pcgjwkqnmh6midcyp7ahc5yry3r38my3shrwirqc2"; + rev = "9fac58de9b8f7539bfd4c6983bc826e27d060b30"; + sha256 = "1z5j4nr9c6806f6ys4p3b2byxca7zc34ap1bysai8nvzxz02rzf6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -9785,12 +10060,12 @@ enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20171101"; + version = "20180330"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "9467cd7fc8b6bb3caf644b223e3046fc32013ccb"; - sha256 = "0spsgfkka6sld8ac3m2biydyp8xj84vxa0w7apqvhhmfk3klbbhf"; + rev = "c9c39ff07f8cf45814071a77b559477bd57bc3b1"; + sha256 = "1w563cnxadmjbfnwbazqazrpmw2k5xyk4yaxgfk2glxahk4dr0fn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -9848,12 +10123,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "34c7719c9739d1e5d55c3f776e8f32a417b4eea6"; - sha256 = "1dpj31krw0vwrb1pimpbpdm3k2ivqmr6kbgaw8p2dwwwqk1s6nbg"; + rev = "3d3ab18436ad6089496b3bce1d49c64a86965431"; + sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -9940,12 +10215,12 @@ epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "cask"; repo = "epl"; - rev = "a76ec344a7fee3ca7e7dfb98b86ebc3b8c1a3837"; - sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr"; + rev = "fd906d3f92d58ecf24169055744409886ceb06ce"; + sha256 = "0d3z5z90ln8ipk1yds1n1p8fj9yyh2kpspqjs7agl38indra3nb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; @@ -10023,12 +10298,12 @@ erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-hl-nicks"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "leathekd"; repo = "erc-hl-nicks"; - rev = "be181920ce6af0ab5d00d1c638e4e598b3998643"; - sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7"; + rev = "756c4438a8245ccd3e389bf6c9850ee8453783ec"; + sha256 = "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks"; @@ -10170,12 +10445,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.1.5"; + version = "20.3.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "84f29ab803e8f36ef058a47f4c2b224f4dd58220"; - sha256 = "02y02m5cv29nr6icih7f5772657swnwan279scgcw02wm9lnm0vh"; + rev = "c5ee502e6031986983d3596745cad7fd547fd9c2"; + sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10334,6 +10609,27 @@ license = lib.licenses.free; }; }) {}; + esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "esh-autosuggest"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "esh-autosuggest"; + rev = "a8a9381e76ea2e0d934bc70caa47f23209bcc155"; + sha256 = "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest"; + sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx"; + name = "esh-autosuggest"; + }; + packageRequires = [ company emacs ]; + meta = { + homepage = "https://melpa.org/#/esh-autosuggest"; + license = lib.licenses.free; + }; + }) {}; esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-help"; @@ -10523,22 +10819,22 @@ license = lib.licenses.free; }; }) {}; - eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "555fdad8ebee4ca0d990b8c80151c77c8bd6b773"; - sha256 = "0xmlr98gyq56vas02nnjdfv7x6zjddy4b1qpy3zz770jnpnrgq33"; + rev = "97e8aa9b106e3e4b3a44c775ca972bdd2feda9ec"; + sha256 = "1g6bv58m1052x2f5ffs17ryyqv0ay8vii5bwqs7dyfhlpppsn6c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v"; name = "eslintd-fix"; }; - packageRequires = []; + packageRequires = [ dash emacs ]; meta = { homepage = "https://melpa.org/#/eslintd-fix"; license = lib.licenses.free; @@ -10652,12 +10948,12 @@ esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esxml"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "tali713"; repo = "esxml"; - rev = "08fcc5d76abb90c194e181f267cf1d2a149b7a7c"; - sha256 = "034lxfqn5yh78hz7i568vw8kyv3hlb699z2d1dffjiigc1lblgip"; + rev = "5548ceba17deae0c3c6d0092672edc4de3c75ce3"; + sha256 = "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml"; @@ -10670,6 +10966,27 @@ license = lib.licenses.free; }; }) {}; + eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: + melpaBuild { + pname = "eterm-256color"; + version = "0.3.13"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "eterm-256color"; + rev = "dab96af559deb443c4c9c00e23389926e1607192"; + sha256 = "0ysxblc90kjcz84siprnyxwh94scflivqbxylzkvjm7hbx93rsh1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; + sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b"; + name = "eterm-256color"; + }; + packageRequires = [ emacs f xterm-color ]; + meta = { + homepage = "https://melpa.org/#/eterm-256color"; + license = lib.licenses.free; + }; + }) {}; ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ethan-wspace"; @@ -11009,12 +11326,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "2.2.3"; + version = "2.2.6"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b"; - sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp"; + rev = "50bb88241983f0bf06d35a455a87c04eddc11c83"; + sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -11069,22 +11386,22 @@ license = lib.licenses.free; }; }) {}; - evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-nerd-commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "3.1.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "76fd0c5692e9852a2d6fc6c0ce0e782792c28ddd"; - sha256 = "1bydqdk52q8777m234jxp03y2zz23204r1fyq39ks9h9bpglc561"; + rev = "34d411715ead5829d6d8969511047feb703b067e"; + sha256 = "0ax846dy2hbrbvkj7nzfkcl5i1x9rga8bvg0ln55ivhq0iiy1lkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d"; name = "evil-nerd-commenter"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/evil-nerd-commenter"; license = lib.licenses.free; @@ -11174,6 +11491,27 @@ license = lib.licenses.free; }; }) {}; + evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-replace-with-char"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "evil-replace-with-char"; + rev = "dddbbafdd620cc48dd0a257baf4010e1b415ebe8"; + sha256 = "0gcmva2q1bxqp3p8cl1nf19kh4nkgfdm64havyzhnkwq18q84pxi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char"; + sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r"; + name = "evil-replace-with-char"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-replace-with-char"; + license = lib.licenses.free; + }; + }) {}; evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-rsi"; @@ -11279,15 +11617,36 @@ license = lib.licenses.free; }; }) {}; + evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }: + melpaBuild { + pname = "evil-string-inflection"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "evil-string-inflection"; + rev = "f6a3eca0f0fa8e56e6938e1dd48537eef1fae05f"; + sha256 = "1akk0yylwcw4f91hprrrsijhbdcmrx1nnpgfyzpl4k5d4b30y8d5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection"; + sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh"; + name = "evil-string-inflection"; + }; + packageRequires = [ emacs evil string-inflection ]; + meta = { + homepage = "https://melpa.org/#/evil-string-inflection"; + license = lib.licenses.free; + }; + }) {}; evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839"; - sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031"; + rev = "f6162a7b5a65a297c8ebb8a81ce6e1278f958bbc"; + sha256 = "0kqkji4yn4khfrgghwkzgbh687fs3p07lj61x4i7w1ay1416lvn9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -11300,6 +11659,27 @@ license = lib.licenses.free; }; }) {}; + evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-swap-keys"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "evil-swap-keys"; + rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a"; + sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; + sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6"; + name = "evil-swap-keys"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/evil-swap-keys"; + license = lib.licenses.free; + }; + }) {}; evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-test-helpers"; @@ -11489,6 +11869,27 @@ license = lib.licenses.free; }; }) {}; + exato = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "exato"; + version = "0.0.6"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "exato"; + rev = "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6"; + sha256 = "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato"; + sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn"; + name = "exato"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/exato"; + license = lib.licenses.free; + }; + }) {}; exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exec-path-from-shell"; @@ -11614,22 +12015,51 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: + extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "extmap"; + version = "1.0"; + src = fetchFromGitHub { + owner = "doublep"; + repo = "extmap"; + rev = "3860b69fb19c962425d4e271ee0a24547b67d323"; + sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap"; + sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j"; + name = "extmap"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/extmap"; + license = lib.licenses.free; + }; + }) {}; + exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "1.7.2"; + version = "1.8.1"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5"; - sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds"; + rev = "4f7946db67d6599baba6b3961e8f543a68707742"; + sha256 = "00lcn5106xig2y9gyir1f1gzyp2i05rwq1lbbbah8aipkdi3z9xl"; }; 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 ]; + packageRequires = [ + bind-key + cl-lib + counsel + exwm + ivy + swiper + switch-window + ]; meta = { homepage = "https://melpa.org/#/exwm-x"; license = lib.licenses.free; @@ -11638,12 +12068,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "0.7.5"; + version = "0.7.7"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20"; - sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn"; + rev = "7294ed5fbf5f38407b599a10a335b8c4ec15a8d5"; + sha256 = "1lhpf88042mg9q328w2d328ka9pild4ppdynbn3rsib9zgxp8waq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -11659,12 +12089,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "0.4.5"; + version = "1.0"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "4a79230739cfaa607f39fbfe53339692b83c3933"; - sha256 = "0cdaayp2ca6wcqh11snmc50p4gl6sika58jxvn5dklsipzxv75v8"; + rev = "a2bdda95f840c15240975c32b66d4d1e0682a1e1"; + sha256 = "1z0m3pzhyif1rx8g4gzg1wfdqdkxdaahjjq8hx2fj4k4l16bia99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -11680,12 +12110,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "541cb518afa5010029492847292c248f88b3ea42"; - sha256 = "1j6gc2pp5w3iwyjm4h3d0ahzs0ac3pah8lzfhpg4nkibl0nc1bcg"; + rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48"; + sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; @@ -11698,6 +12128,27 @@ license = lib.licenses.free; }; }) {}; + f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "f3"; + version = "0.1"; + src = fetchFromGitHub { + owner = "cosmicexplorer"; + repo = "f3"; + rev = "19120dda2d760d3dd6c6aa620121d1de0a40932d"; + sha256 = "1qg48zbjdjqimw4516ymrsilz41zkib9321q0caf9474s9xyp2bi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; + sha256 = "099wibgp9k6sgglaqigic5ay6qg7aqijnis5crwjl7b81ddqp610"; + name = "f3"; + }; + packageRequires = [ cl-lib emacs helm ]; + meta = { + homepage = "https://melpa.org/#/f3"; + license = lib.licenses.free; + }; + }) {}; fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fabric"; @@ -11740,6 +12191,27 @@ license = lib.licenses.free; }; }) {}; + faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "faff-theme"; + version = "2.0"; + src = fetchFromGitHub { + owner = "WJCFerguson"; + repo = "emacs-faff-theme"; + rev = "0835c25b5e4ae7a79f0c1c4c44867f2d2e73b642"; + sha256 = "0msh7w8qmrd9977zamyh0qifzf5bwl6g1012gc8lsr995c6gwm87"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; + sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g"; + name = "faff-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/faff-theme"; + license = lib.licenses.free; + }; + }) {}; fancy-battery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fancy-battery"; @@ -11827,16 +12299,16 @@ faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faust-mode"; - version = "0.3"; + version = "0.6"; src = fetchFromGitHub { - owner = "magnetophon"; + owner = "rukano"; repo = "emacs-faust-mode"; - rev = "5e7390479d6f4c12186b39fd5c642050e1c62e40"; - sha256 = "1g3xzzcnswh03plmrhcn6ib68kcx5b37af3lqfbfa6s0rwwldxap"; + rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c"; + sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode"; - sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode"; + sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z"; name = "faust-mode"; }; packageRequires = []; @@ -11848,15 +12320,15 @@ faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faustine"; - version = "0.3"; + version = "0.4"; src = fetchgit { - url = "https://bitbucket.org/yassinphilip/faustine"; - rev = "43cf31284eabf0d831f8185a5ed217e56fdc2023"; - sha256 = "1v78raszh8scac5m04g10rrc9cdflhgmkpbbqpf28zxk3dxcjpxm"; + url = "https://bitbucket.org/yphil/faustine"; + rev = "f186461e2bc38ec8ae38bd5ab727cc769218a168"; + sha256 = "16p7qmljjki4svci3mxzydmvpxaprbnfq6794b3adyyixkmgr6k7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine"; - sha256 = "0pkjxfzgdhkjjx38d1c2kw8m5cw5ryhfj7lykpym79wsa471hf9s"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine"; + sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s"; name = "faustine"; }; packageRequires = [ emacs faust-mode ]; @@ -11910,12 +12382,12 @@ fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; - version = "1.89"; + version = "1.90"; src = fetchFromGitHub { owner = "alpaker"; repo = "Fill-Column-Indicator"; - rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779"; - sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y"; + rev = "f7b3f99b41ff017f50a21ad53eed16f8ef5ab7ee"; + sha256 = "0snjznxdwwfdgccdcvrnk467416r244r2r5qcm2sga8l0ha9gw9z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; @@ -11928,6 +12400,27 @@ license = lib.licenses.free; }; }) {}; + fill-function-arguments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fill-function-arguments"; + version = "0.9"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "fill-function-arguments"; + rev = "e819fca19a138ae67201220e41fe1d4384fb2a42"; + sha256 = "102aalb7bfvjgf1klqsx6mn5a4vfjq63kwn7wqs9cmlib1mp8vnf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments"; + sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0"; + name = "fill-function-arguments"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/fill-function-arguments"; + license = lib.licenses.free; + }; + }) {}; finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "finalize"; @@ -11973,12 +12466,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.4.3"; + version = "5.6.4"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663"; - sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v"; + rev = "5691beb79f78c6a0ef1a18460df9fd1571ec3361"; + sha256 = "0mvli1r7ml596y6v9qsip76j78f58q6jnwb18j8c7rngsrg08rc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -12099,12 +12592,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "22aabbccd564883684f6d224b8e0a512f334be41"; - sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24"; + rev = "bac709ac1235751952d6022dddc6307d9135d096"; + sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -12271,27 +12764,48 @@ license = lib.licenses.free; }; }) {}; - flow-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "0.1"; + version = "0.3"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458"; - sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp"; + rev = "50dded94ad201fdc9453656a8b15179981cd5acd"; + sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s"; name = "flow-minor-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/flow-minor-mode"; license = lib.licenses.free; }; }) {}; + flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flower"; + version = "0.4.1"; + src = fetchFromGitHub { + owner = "PositiveTechnologies"; + repo = "flower"; + rev = "98c53b03da698833058b9ad6b6eb8be46cfd00f6"; + sha256 = "08wq66gvqy14mcpm8x14xz3hvw4h7rcd5ivynma91d4358qrmqap"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; + sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd"; + name = "flower"; + }; + packageRequires = [ clomacs emacs ]; + meta = { + homepage = "https://melpa.org/#/flower"; + license = lib.licenses.free; + }; + }) {}; flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flx"; @@ -12481,22 +12995,43 @@ license = lib.licenses.free; }; }) {}; - flycheck-dmd-dub = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-crystal"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "crystal-lang-tools"; + repo = "emacs-crystal-mode"; + rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10"; + sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal"; + sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn"; + name = "flycheck-crystal"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-crystal"; + license = lib.licenses.free; + }; + }) {}; + flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "0.9"; + version = "0.12"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "e8744adaba010415055ac15c702f780dd6e13e14"; - sha256 = "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh"; + rev = "41a839e18eb7159175c59a2f8b2f5f283191e33f"; + sha256 = "0a78np6nb9ciz440n9ks6kybwggkq99knzv7swbmvngvhg96khbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm"; name = "flycheck-dmd-dub"; }; - packageRequires = [ flycheck ]; + packageRequires = [ f flycheck ]; meta = { homepage = "https://melpa.org/#/flycheck-dmd-dub"; license = lib.licenses.free; @@ -12691,6 +13226,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-mmark"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "mmark-md"; + repo = "flycheck-mmark"; + rev = "b73b40cb9c5cf6bc6fa501aa87a4c30b210c0c5f"; + sha256 = "1w75accl67i0qwadwp7dgpxaj0i8zwckvv5isyn93vknzw5dz66x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2fd10423ab80e32245bb494005c8f87a8987fffb/recipes/flycheck-mmark"; + sha256 = "0lnw7pz40hijcpi9b92vjxvvyh9v50ww2f2r8z9pyhl9mjy2245x"; + name = "flycheck-mmark"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-mmark"; + license = lib.licenses.free; + }; + }) {}; flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }: melpaBuild { pname = "flycheck-nimsuggest"; @@ -12715,12 +13271,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "29a9eb320d62400564360986f7ad400b74070d8e"; - sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; + rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5"; + sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -12841,12 +13397,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "0.4"; + version = "0.8"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "a3d39139dbe5cdaa64dda90907bb8653f196c71e"; - sha256 = "1i1kliy0n9b7b0rby419030n35f59xb8952widaszz4z8qb7xw9k"; + rev = "facb6e6cff7baaf38cf4e76a3e27a508225fc3f7"; + sha256 = "061iahihq348ncbx9zh8ihca6j2fkc1nygk5f7v2q4j2g7kmfv8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -12883,12 +13439,12 @@ flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }: melpaBuild { pname = "flycheck-rtags"; - version = "2.15"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; - sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -12946,12 +13502,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; - sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; + rev = "06a6f98d7e498860b345bbd03e96bfe59608f508"; + sha256 = "0h1n4x0fvqfb6jcapbab1ck6bj4d7irbn9zz2hxv2rlrkqxfsmh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -13531,27 +14087,6 @@ license = lib.licenses.free; }; }) {}; - fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fm"; - version = "1.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fm"; - rev = "6266840de17ac396dd7275a71da72cd5120c35a6"; - sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e4a74b87c05b408433545a2236000ac081af36bf/recipes/fm"; - sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f"; - name = "fm"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fm"; - license = lib.licenses.free; - }; - }) {}; fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fn"; @@ -13594,27 +14129,6 @@ license = lib.licenses.free; }; }) {}; - fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fold-dwim"; - version = "1.2"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fold-dwim"; - rev = "4764b0246a722d37eb8ec9f204ffaccaad1755d0"; - sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim"; - sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d"; - name = "fold-dwim"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fold-dwim"; - license = lib.licenses.free; - }; - }) {}; fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: melpaBuild { pname = "fold-dwim-org"; @@ -13762,15 +14276,36 @@ license = lib.licenses.free; }; }) {}; + fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fortune-cookie"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "andschwa"; + repo = "fortune-cookie"; + rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6"; + sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie"; + sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78"; + name = "fortune-cookie"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fortune-cookie"; + license = lib.licenses.free; + }; + }) {}; fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.3.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "37289bb68f01dd49b1192032ade6b0741d024a54"; - sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5"; + rev = "8269066a9035fcf50eb835de3745a62c1cb96660"; + sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -13804,6 +14339,27 @@ license = lib.licenses.free; }; }) {}; + frameshot = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "frameshot"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "frameshot"; + rev = "4e7b252e9fd9227de8b25f384af2c855ec45279a"; + sha256 = "020irzkqr7gs99xsvdd0haja0jvw46dk40xi7ab0m3cq7957srjh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot"; + sha256 = "1z5f988m9s25miyxbhaxk6m4af9afvblb2p5mdidva04szjklr70"; + name = "frameshot"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/frameshot"; + license = lib.licenses.free; + }; + }) {}; free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "free-keys"; @@ -13983,12 +14539,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "0.1.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "2a7d824f7265a35bb928bf4de8e46d02e0a56a12"; - sha256 = "0dkx9xl39k0bcspyx37410rb5ngphw9svinwjw1kgq0pqhc2qxdf"; + rev = "784e3147196bfe82ea9499628467335ea1d036f9"; + sha256 = "07dqqpacvap034jzvdvnpjyryzicbvjx2imnsghsxw9m52jsb9wn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -14046,12 +14602,12 @@ fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fwb-cmds"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "fwb-cmds"; - rev = "57973f99cf4a185b5cccbf941478fad25e8428c3"; - sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b"; + rev = "90258a5c7dbbaa2ac227e0fb4ff6c7d5aec3628f"; + sha256 = "1xwvv8wjgdaz96v1x1xc5w697bfvcanlcixd0n5qbx6ryakqrb72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds"; @@ -14106,22 +14662,22 @@ license = lib.licenses.free; }; }) {}; - gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + gams-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "6.2"; + version = "6.5"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "ce51aa1afec78bf96aedb4badf33463383b7593e"; - sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5"; + rev = "3022e9f8411628e6a210fb5843d858b15a7513f5"; + sha256 = "06hc8yy1g2vyvib8yrhwzs8fvgxnrxlw6iyzi7phjp9fgr3cp504"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci"; name = "gams-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/gams-mode"; license = lib.licenses.free; @@ -14193,12 +14749,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "8ef6a9321d81ff478cfd376023eb84b8a819a991"; - sha256 = "08aha9lxdxix1jq0vc3am9wsyivj6vjpfs8frm797aca3bwaam0j"; + rev = "775d1d734a677274fbbf4af780592bb3768d3f9b"; + sha256 = "086qlii1w7sqxwnxwxvc4d6d71p829jabhgwvi0l0bjkxn7bx8pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -14379,22 +14935,22 @@ license = lib.licenses.free; }; }) {}; - ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "da60fa2316bf829cab18676afd5a43088ac06b60"; - sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs"; + rev = "ae37bef2eb3afb8232bb0a6f7306a8da2390abf4"; + sha256 = "1k8bim7yk3swpzsx5lwm6qbjfqf2lsssir0zlqzrkid61d3ixfgy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; - sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; + sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps"; name = "ghub"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs let-alist ]; meta = { homepage = "https://melpa.org/#/ghub"; license = lib.licenses.free; @@ -14403,12 +14959,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "e04050f81106029c342deb7adbfc67b2a888ec58"; - sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6"; + rev = "8cfdaf42446a68e6aa4eb0655d43563407cb5636"; + sha256 = "0acfqf1219bnzyf64sv68fvpi4a13nc0wv8dz5a8h6r1j0ysx6qj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -14484,6 +15040,27 @@ license = lib.licenses.free; }; }) {}; + git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "git-attr"; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "arnested"; + repo = "emacs-git-attr"; + rev = "c03078637a00ea301cbcc7ae301ae928b10af889"; + sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr"; + sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi"; + name = "git-attr"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/git-attr"; + license = lib.licenses.free; + }; + }) {}; git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-auto-commit-mode"; @@ -14529,12 +15106,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.11.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5"; - sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym"; + rev = "44508d71fb400910adb5d0594b56d3c34aa3a5de"; + sha256 = "0cpcdrikfcmkb6sj13bvznilyk8yc054pq5md874s3j224bdxcnx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -14547,7 +15124,7 @@ license = lib.licenses.free; }; }) {}; - git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: + git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, lib, melpaBuild, projectile, s }: melpaBuild { pname = "git-commit-insert-issue"; version = "0.3.1"; @@ -14555,14 +15132,14 @@ owner = "emacs-stuff"; repo = "git-commit-insert-issue"; rev = "5f08c17bf93b17915415d435ee41923d924fe20b"; - sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas"; + sha256 = "1gffjf6byasisa9jdcv9n4n5zqalvzfsxv7z75zl0g3ph7wc7bbm"; }; 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 ]; + packageRequires = [ bitbucket github-issues gitlab projectile s ]; meta = { homepage = "https://melpa.org/#/git-commit-insert-issue"; license = lib.licenses.free; @@ -14655,12 +15232,12 @@ git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-lens"; - version = "0.4.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "pidu"; repo = "git-lens"; - rev = "2d1d94fd2e8a17025224ae2224c5f44d8482dc64"; - sha256 = "1d0vk8344n4lcdcqxkv44qc7f3753mpy76hmgf8xi60kyajvjrd7"; + rev = "ea49e2e005af977a08331f8caa8f64d102b3b932"; + sha256 = "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens"; @@ -14736,22 +15313,22 @@ license = lib.licenses.free; }; }) {}; - git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "3.0"; + version = "4.5"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "7c66a878ee89861dcd59b5dfc598520daa156052"; - sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3"; + rev = "dbcb92ffaa5f8350d47f4fbd74512f4000b8c043"; + sha256 = "1ml06jfjyrcqmbpr5hqvbpi3yy6l2aa836jq8qjla1h74g9qka7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq"; name = "git-timemachine"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/git-timemachine"; license = lib.licenses.free; @@ -14781,12 +15358,12 @@ gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitattributes-mode"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -14823,12 +15400,12 @@ gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitconfig-mode"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -14949,12 +15526,12 @@ gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitignore-mode"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; + sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -14988,6 +15565,48 @@ license = lib.licenses.free; }; }) {}; + gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }: + melpaBuild { + pname = "gitlab-ci-mode"; + version = "20180306.1"; + src = fetchFromGitLab { + owner = "joewreschnig"; + repo = "gitlab-ci-mode"; + rev = "313431fa5b8b5ce4512909dfc15675bb99395f6f"; + sha256 = "0wjz87nhcwzp201jxv3qlj88hn7p8nvq20924y06gra2d656znar"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; + sha256 = "1jg6ihrgccrcwg30ysyqw9k7rmvfmsrp70skr2057hfamvccwn4f"; + name = "gitlab-ci-mode"; + }; + packageRequires = [ emacs yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/gitlab-ci-mode"; + license = lib.licenses.free; + }; + }) {}; + gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }: + melpaBuild { + pname = "gitlab-ci-mode-flycheck"; + version = "20180304.1"; + src = fetchFromGitLab { + owner = "joewreschnig"; + repo = "gitlab-ci-mode-flycheck"; + rev = "388fd05f3ea88ed3ebafb09868fc021f6ecc7625"; + sha256 = "111clb37329c7v0lv1lwypb8bv7qb9f495f2cy45j2n711vymdna"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck"; + sha256 = "19ixd60yynsvmaj7mkppp6k73793x794vrnhx3hh6n7dap1rsjdh"; + name = "gitlab-ci-mode-flycheck"; + }; + packageRequires = [ emacs flycheck gitlab-ci-mode ]; + meta = { + homepage = "https://melpa.org/#/gitlab-ci-mode-flycheck"; + license = lib.licenses.free; + }; + }) {}; gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitpatch"; @@ -15051,22 +15670,22 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "glab"; - version = "1.1.1"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "glab"; - rev = "5ced0214622450930bcea105b9aac785c594609d"; - sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "ghub"; + rev = "ae37bef2eb3afb8232bb0a6f7306a8da2390abf4"; + sha256 = "1k8bim7yk3swpzsx5lwm6qbjfqf2lsssir0zlqzrkid61d3ixfgy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; - sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab"; + sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8"; name = "glab"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs ghub ]; meta = { homepage = "https://melpa.org/#/glab"; license = lib.licenses.free; @@ -15282,6 +15901,27 @@ license = lib.licenses.free; }; }) {}; + go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-dlv"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "benma"; + repo = "go-dlv.el"; + rev = "45a9e8a047c9995eb7c802268d96b3e527569f41"; + sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv"; + sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8"; + name = "go-dlv"; + }; + packageRequires = [ go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-dlv"; + license = lib.licenses.free; + }; + }) {}; go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-eldoc"; @@ -15324,6 +15964,27 @@ license = lib.licenses.free; }; }) {}; + go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "go-fill-struct"; + version = "0.1"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "go-fill-struct"; + rev = "3c97c92e78f3629a7a1069404c7c641881c16d0e"; + sha256 = "0ara9qqv31pr7dpcby6xp24llf79m0dmwrx4yv6w0bhxi197fmlx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct"; + sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7"; + name = "go-fill-struct"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/go-fill-struct"; + license = lib.licenses.free; + }; + }) {}; go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-guru"; @@ -15450,6 +16111,27 @@ license = lib.licenses.free; }; }) {}; + go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-tag"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "emacs-go-tag"; + rev = "8dbcb7d42dccac046c7beb31bdf79bb09a0fef40"; + sha256 = "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; + sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f"; + name = "go-tag"; + }; + packageRequires = [ emacs go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-tag"; + license = lib.licenses.free; + }; + }) {}; godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; @@ -15621,12 +16303,12 @@ goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "goto-chg"; - version = "1.7"; + version = "1.7.2"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "goto-chg"; - rev = "171b1331022caf12d8c3593e9b5075f87ee958d4"; - sha256 = "1jcnrin4j1x8p63fd9r37dq1vr5a7a1nvzk6kp0bdsgn9vbjmapc"; + rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4"; + sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; @@ -15684,12 +16366,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "7d879bac14d09f2f2a45a0477c1e45fbf52240f5"; - sha256 = "09fllx7l2hsjrv1jl7g06xngjy0xwn5n5zng6x8dspgsl6kblyqp"; + rev = "123ed177021588bac57b5c87c1a84270ddf2eca8"; + sha256 = "0m144lpjbyil8cs57dw9q72abjhrd8cfwbalvzyaldgnx10j8gkc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -15726,12 +16408,12 @@ grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-x-link"; - version = "0.4.1"; + version = "0.5"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-x-link"; - rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76"; - sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1"; + rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c"; + sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; @@ -15789,12 +16471,12 @@ grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grails-mode"; - version = "1.0.2"; + version = "2.0"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555"; - sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9"; + rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24"; + sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -15831,12 +16513,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d"; - sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7"; + rev = "22c8df52c0fb8899fa748fa2980947ab38b53380"; + sha256 = "08556ci80iycm4qkvbnrci55wyv91b4fh6sjp0im0ywndmrq3yyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -15852,12 +16534,12 @@ graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: melpaBuild { pname = "graphene"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene"; - rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe"; - sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz"; + rev = "9dbd50e532ca45076e03db0f96a57d21528fc460"; + sha256 = "0sqxnjmfbr0plahdmp87j8xpl3qkyimf9vkqall4ccljx8irdl6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene"; @@ -15968,12 +16650,12 @@ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "0.0.3"; + version = "0.0.6"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122"; - sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka"; + rev = "8a03687a2b8b55c5dc7f099086019278d505d8d8"; + sha256 = "07j5sv8dskqxpbzr5f58n75cziyqm9v01c3f7wmwfs8jl7h5nc4m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -15989,12 +16671,12 @@ green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-screen-theme"; - version = "1.0.0.1"; + version = "1.0.24"; src = fetchFromGitHub { owner = "rbanffy"; repo = "green-screen-emacs"; - rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e"; - sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn"; + rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0"; + sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; @@ -16007,6 +16689,27 @@ license = lib.licenses.free; }; }) {}; + grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "grep-context"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "grep-context"; + rev = "4c63d0f2654dee1e249c2054d118d674a757bd45"; + sha256 = "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context"; + sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g"; + name = "grep-context"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/grep-context"; + license = lib.licenses.free; + }; + }) {}; grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grin"; version = "1.0"; @@ -16068,22 +16771,22 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "1.0.2"; + version = "2.0"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555"; - sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9"; + rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24"; + sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; name = "groovy-mode"; }; - packageRequires = []; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/groovy-mode"; license = lib.licenses.free; @@ -16134,12 +16837,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "1.12.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "e57f494fd94e49321a6396f530b8a13bae8b57df"; - sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly"; + rev = "b6d93d25faff573a7f7712bc33fce1fe422473e0"; + sha256 = "1j8ivqhzrz5kaq1as4s5vljjpan8adqdc5s2ms8p3p83b2kg55si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -16218,12 +16921,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "54bd174b514c5de11e82c4263ac2723addb0fe87"; - sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2"; + rev = "a43828f6e5d6dc4e623a4b78e0dfdddbf5b20185"; + sha256 = "0c19njb5cg6g3fav9322hkbl4h9zwcbymhc5wr0k9yqi7pv8gz0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -16349,7 +17052,7 @@ owner = "iain"; repo = "hamburger-menu-mode"; rev = "fd37f013c2f2619a88d3ed5311a9d1308cc82614"; - sha256 = "196ydb57h4mjagjaiflvb20my561i6mdc6v6694ibdik2yns2inm"; + sha256 = "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8017730403cc0e613e3939017f85074753c3778/recipes/hamburger-menu"; @@ -16595,12 +17298,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "0.6.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "a3f890fb8570369898ee9718b128d4e7123a6585"; - sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c"; + rev = "3e17ce07dd6b0207474e4ff14ad7b8c467382947"; + sha256 = "0cdsdlgapf9xxj928hlb7ch9x8rznayrvj7n8j2vzfa0kfmg7qwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -16658,12 +17361,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.8.5"; + version = "2.9.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "2385b81edc706f7efc74f2aff4854399254cde17"; - sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m"; + rev = "d5b9404176c41b16dffe522d45d08bdc7cb60e28"; + sha256 = "0mr5jllsargsbw6xrqpacxi40nx472sd5qhbaf5a6ydc6l1qyqyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -16886,22 +17589,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 = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "a24ef274e382c1a158a76eae2570f1f007031cb8"; - sha256 = "062abfb4sfpcc6fx3nrf3j0bisglrhyrg7rxwhhcqm9jhalksmdl"; + rev = "9a948b834dd31b3f60d4701d6dd0ecfab0adbb72"; + sha256 = "0wssd9jv6xighjhfh3p8if1anz3rcrjr71a4j063v6gyknb7fv27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x"; name = "helm-cider"; }; - packageRequires = [ cider emacs helm-core seq ]; + packageRequires = [ cider emacs helm-core ]; meta = { homepage = "https://melpa.org/#/helm-cider"; license = lib.licenses.free; @@ -16973,12 +17676,12 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; repo = "helm-company"; - rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048"; - sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90"; + rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d"; + sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; @@ -16994,12 +17697,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.8.5"; + version = "2.9.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "2385b81edc706f7efc74f2aff4854399254cde17"; - sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m"; + rev = "d5b9404176c41b16dffe522d45d08bdc7cb60e28"; + sha256 = "0mr5jllsargsbw6xrqpacxi40nx472sd5qhbaf5a6ydc6l1qyqyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -17645,12 +18348,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "1.4.2"; + version = "1.5.1"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "26749ff9f34b2abddf7c47ff71b1046942e38398"; - sha256 = "1q969rlqj706wdzd3s54pqpfpqkg18bzl5srl7xkw43cfzxpcpj2"; + rev = "ecf5ad53bef572e38d8c8d93b516f8eab8c4dfe5"; + sha256 = "14020ws87m64bfxqw30c9hc88zb7w4kxs5svd2a10y00lgrg2m93"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -17684,27 +18387,6 @@ license = lib.licenses.free; }; }) {}; - helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { - pname = "helm-package"; - version = "0.3"; - src = fetchFromGitHub { - owner = "syohex"; - repo = "emacs-helm-package"; - rev = "117f5f26c96c0854aadaf9c52aaec961195d5798"; - sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package"; - sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y"; - name = "helm-package"; - }; - packageRequires = [ cl-lib helm ]; - meta = { - homepage = "https://melpa.org/#/helm-package"; - license = lib.licenses.free; - }; - }) {}; helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-pages"; @@ -17957,6 +18639,27 @@ license = lib.licenses.free; }; }) {}; + helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-rg"; + version = "0.1"; + src = fetchFromGitHub { + owner = "cosmicexplorer"; + repo = "helm-rg"; + rev = "96dcbeb366caa0b158668384113458ee5f7c4dfd"; + sha256 = "1k9yv9iw694alf5w7555ygk2i1b26i90rqq7ny63a4nd3y5cbs5f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg"; + sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v"; + name = "helm-rg"; + }; + packageRequires = [ cl-lib dash emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-rg"; + license = lib.licenses.free; + }; + }) {}; helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-robe"; @@ -17981,12 +18684,12 @@ helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: melpaBuild { pname = "helm-rtags"; - version = "2.15"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; - sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -18086,12 +18789,12 @@ helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; - version = "1.7.2"; + version = "1.7.4"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-swoop"; - rev = "6d3fdcfb6dea06242efc8ff4cafff9917e558bfc"; - sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72"; + rev = "c66336b8245ddc51c4206f19c119f1081920985c"; + sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; @@ -18104,6 +18807,27 @@ license = lib.licenses.free; }; }) {}; + helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: + melpaBuild { + pname = "helm-system-packages"; + version = "1.9.0"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-system-packages"; + rev = "f1aeafd3de4d434fb89b9f65b863c9a53a7d2feb"; + sha256 = "194f2in1k4g9fm66q63ayqmrg5shj807nq4phmkgfm02p1hj7v5w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; + sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4"; + name = "helm-system-packages"; + }; + packageRequires = [ emacs helm seq ]; + meta = { + homepage = "https://melpa.org/#/helm-system-packages"; + license = lib.licenses.free; + }; + }) {}; helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-themes"; @@ -18128,12 +18852,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "0.5.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1"; - sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y"; + rev = "34cc68bededd3ff6cbec8140f33c530fd3206a64"; + sha256 = "1lway52ssh6zn6jw8157fp8d4brrkdln03vgll2r53bd69i2ipmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -18230,22 +18954,22 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "0.2"; + version = "0.9"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "b9a06978b6ffcd7f0ea213a6f534fa39318f0050"; - sha256 = "1czqvmlca3w7n28c04dl3ljn8gbvfc565lysxlrhvgmv08iagnxm"; + rev = "c527d0a9f66b50c28dfc44b88c5dd634c770ade2"; + sha256 = "0mbqwxnk689mx58yjqs6dyyfkcgakginm35nqzp3kdwsvwvvkxzb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; name = "helpful"; }; - packageRequires = [ dash elisp-refs emacs s ]; + packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ]; meta = { homepage = "https://melpa.org/#/helpful"; license = lib.licenses.free; @@ -18314,6 +19038,27 @@ license = lib.licenses.free; }; }) {}; + hide-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hide-mode-line"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-hide-mode-line"; + rev = "86b9057391edad75467261c2e579603567e608f9"; + sha256 = "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2af28365f9fbc6ae71043a67966490c5d18a6095/recipes/hide-mode-line"; + sha256 = "0yl6aicpib5h1ckqi3gyilh2nwvp8gf1017n1w1755j01gw1p9hl"; + name = "hide-mode-line"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hide-mode-line"; + license = lib.licenses.free; + }; + }) {}; hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; @@ -18485,12 +19230,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "5.2.4"; + version = "5.2.5"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "e18ec3f55e288883f8042065190572e91651733d"; - sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z"; + rev = "cba1110ca413a41a443b8368d63d295d7d36de7a"; + sha256 = "020dj6q483b7fabspgvnjqw0rhrgj3q1ncdcpafmyn1fgip5y0zq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -18629,36 +19374,15 @@ license = lib.licenses.free; }; }) {}; - hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "hl-sexp"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "hl-sexp"; - rev = "0606100422321c18db51ceda80f25cd7717c2e01"; - sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp"; - sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm"; - name = "hl-sexp"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-sexp"; - license = lib.licenses.free; - }; - }) {}; hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "961db3116f1396dc4f903e3a59824a40e0bbb6a2"; - sha256 = "0w847g7lvzk9br9r73n7rf2ba6wafqrapyigp91f62jicz28lvm1"; + rev = "fbe311b3be34cb5719e612f71d46a87b99954309"; + sha256 = "0f7dsp2b0hzzz6klcmawwlid1jyl90ax0p2ph7bh2791jhywq60k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -18800,12 +19524,12 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "1.51"; + version = "1.53"; src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "88e2cb6588827893d7bc619529393887c264d15a"; - sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n"; + rev = "1bc2f1b0feb852fa5a289a1d72646b16ac84adf1"; + sha256 = "0dr235c0z8is3pi5xdgqyqljg6px0b2aya6qb79zkyi477bmz4ip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -19007,6 +19731,27 @@ license = lib.licenses.free; }; }) {}; + ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ialign"; + version = "0.4.2"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "interactive-align"; + rev = "7ad88c8f7922adc616b8f060b65fa1add8952ea1"; + sha256 = "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; + sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j"; + name = "ialign"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ialign"; + license = lib.licenses.free; + }; + }) {}; ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "ibuffer-projectile"; @@ -19028,6 +19773,27 @@ license = lib.licenses.free; }; }) {}; + ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ibuffer-tramp"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "svend"; + repo = "ibuffer-tramp"; + rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3"; + sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp"; + sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32"; + name = "ibuffer-tramp"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ibuffer-tramp"; + license = lib.licenses.free; + }; + }) {}; ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-vc"; @@ -19136,12 +19902,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "4.5"; + version = "4.7"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345"; - sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih"; + rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; + sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -19238,27 +20004,6 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: - melpaBuild { - pname = "ido-ubiquitous"; - version = "4.5"; - src = fetchFromGitHub { - owner = "DarwinAwardWinner"; - repo = "ido-completing-read-plus"; - rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345"; - sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; - sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; - name = "ido-ubiquitous"; - }; - packageRequires = [ cl-lib emacs ido-completing-read-plus ]; - meta = { - homepage = "https://melpa.org/#/ido-ubiquitous"; - license = lib.licenses.free; - }; - }) {}; ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-vertical-mode"; @@ -19367,12 +20112,12 @@ iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iflipb"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "jrosdahl"; repo = "iflipb"; - rev = "2e0d1719abeec7982341761ee5dabb01574e6862"; - sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki"; + rev = "a5ad1fbd1173cff5228dab265515c92c0778f86a"; + sha256 = "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb"; @@ -19469,15 +20214,36 @@ license = lib.licenses.free; }; }) {}; + imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "imake"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "imake"; + rev = "7df5fb9684a0288313ef5f64594078d477105959"; + sha256 = "0xc19ir5ak1bfq0ag48ql5rj58zd565csgxhpa30s9lvvkc8kvr5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake"; + sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34"; + name = "imake"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/imake"; + license = lib.licenses.free; + }; + }) {}; imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "imapfilter"; - rev = "a879ddc36fedc30311693f308f414c520fdfc370"; - sha256 = "0rx4r6822iwl4gb9j0fii0sqinqvp3lzrc768rasgicgpklaqkjs"; + rev = "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea"; + sha256 = "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter"; @@ -19579,14 +20345,14 @@ pname = "impatient-mode"; version = "1.0.0"; src = fetchFromGitHub { - owner = "netguy204"; - repo = "imp.el"; + owner = "skeeto"; + repo = "impatient-mode"; rev = "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0"; sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode"; - sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode"; + sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j"; name = "impatient-mode"; }; packageRequires = [ cl-lib htmlize simple-httpd ]; @@ -19682,12 +20448,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "c15f5a2b4a48fd53b446e0fa291bdb8323b80c27"; - sha256 = "07fzsjmbbq4nx2w23pbb0z88iqmclm156yd87nxsdivndmzvsgw2"; + rev = "5ece767ea30a350dcdb1a4defaca174e85efedc5"; + sha256 = "1djkzjxv7idqg5pmbqf60lmvibp3ccvgdkdwb48wzn2yvnqr2vw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -19703,12 +20469,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "956b22e7941d71216799ca4e8d5244e94fad9558"; - sha256 = "1wakfwmb43na3g2yqign764kwi791x7ikzmf76pkdpky70a5dkhz"; + rev = "247ca70f8ba5104be292aea20fbde6adb37e359f"; + sha256 = "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -19721,6 +20487,27 @@ license = lib.licenses.free; }; }) {}; + inf-crystal = callPackage ({ crystal-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inf-crystal"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "inf-crystal.el"; + rev = "71a330f2d29e2fb4f51d223cf6230b88620a80af"; + sha256 = "0vija33n2j4j5inzm29qk1bjzaxjm97zn263j15258pqxwkbddv3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ff84c742eebb84577f362b2739f4bcf1434d58ac/recipes/inf-crystal"; + sha256 = "09ssq7i5c2fxxbrsp3nn1f1ah1yv2nb19n5s1iqyykkk316k2q26"; + name = "inf-crystal"; + }; + packageRequires = [ crystal-mode emacs ]; + meta = { + homepage = "https://melpa.org/#/inf-crystal"; + license = lib.licenses.free; + }; + }) {}; inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; @@ -19784,6 +20571,27 @@ license = lib.licenses.free; }; }) {}; + info-colors = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-colors"; + version = "0.2"; + src = fetchFromGitHub { + owner = "ubolonton"; + repo = "info-colors"; + rev = "13dd9b6a7288e6bb692b210bcb9cd72016658dae"; + sha256 = "1h2q19574sc1lrxm9k78668pwcg3z17bnbgykmah01zlmbs264sx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors"; + sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x"; + name = "info-colors"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/info-colors"; + license = lib.licenses.free; + }; + }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -19996,12 +20804,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.23"; + version = "0.1.29"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "3865aad923559bee140eaede20c3510890979930"; - sha256 = "1q6q2hnqf78kxd61nic4zjx7crbv8p25p4aq0h4vihamm8r0v7vm"; + rev = "73997cf10277e9781682768113ebd87eeb6d2882"; + sha256 = "1mf2ddpgnyjiq2km1qc4l926xp8mj9vrszlizh39hn3acxqlac7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -20056,6 +20864,27 @@ license = lib.licenses.free; }; }) {}; + ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ipython-shell-send"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "jackkamm"; + repo = "ipython-shell-send-el"; + rev = "36523a387c15ee1652a5b0e291d4d4838da5e912"; + sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send"; + sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8"; + name = "ipython-shell-send"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ipython-shell-send"; + license = lib.licenses.free; + }; + }) {}; ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ir-black-theme"; @@ -20122,12 +20951,12 @@ iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iter2"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "doublep"; repo = "iter2"; - rev = "ac1b4f10203d8093ae9f897039be97fd5ec65969"; - sha256 = "098bsm5wc7nqk06awak2ar4nwd3xpqsdc9pb2n0px20ql6lxh4bh"; + rev = "b0e8ecebe2d6807403a5eb1c75d68a4706259d4e"; + sha256 = "038z7scy572n6cx0z59kiz59v7zqvn70wg2bwka5f3pglr67wzhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2"; @@ -20143,12 +20972,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; - sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; + rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; + sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -20206,12 +21035,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "acd6322571cb0820868a6febdc5326782a29b729"; - sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33"; + rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6"; + sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -20248,12 +21077,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; - sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; + rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; + sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -20266,6 +21095,27 @@ license = lib.licenses.free; }; }) {}; + ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }: + melpaBuild { + pname = "ivy-mpdel"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "mpdel"; + repo = "ivy-mpdel"; + rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d"; + sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel"; + sha256 = "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r"; + name = "ivy-mpdel"; + }; + packageRequires = [ emacs ivy libmpdel mpdel ]; + meta = { + homepage = "https://melpa.org/#/ivy-mpdel"; + license = lib.licenses.free; + }; + }) {}; ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-pages"; @@ -20311,12 +21161,12 @@ ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }: melpaBuild { pname = "ivy-rtags"; - version = "2.15"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; - sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -20666,12 +21516,12 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "3237634ab42566eb50f54e4b7f3896ffd20a8e53"; - sha256 = "063j0kfp2ybaw5r9hvn9rrksh874xpm9xvpiycv33lf7kdsp5lh3"; + rev = "8384a1926cc22000e5e42f86f28d807fd6149f8e"; + sha256 = "0fa84jln0vddrc218s8scz6hx12ym0wimh6dm58wqxias7gm9fgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -20687,12 +21537,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb"; - sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j"; + rev = "6bd44162ac422304803f606278bb0c08ab940a5d"; + sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -20705,22 +21555,22 @@ license = lib.licenses.free; }; }) {}; - js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "2c19fafed953ea0972ff086614f86614f4d5dc13"; - sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp"; + rev = "83e932e4a83d1a69098ee87e0ab911d299368e60"; + sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1"; name = "js-comint"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/js-comint"; license = lib.licenses.free; @@ -20771,12 +21621,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170721"; + version = "20180301"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc"; - sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy"; + rev = "38e425785d5ea4600c3642f6500062ecedf694a4"; + sha256 = "1afvm8cp9h0v0pk7v3jwag6f608v1787l7m7a9541ld616cgb5x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -21128,12 +21978,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.0.5"; + version = "1.3.2"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "08e13adfab07c9cf7b0df313c77eac8fb393b284"; - sha256 = "0wijf5493wmp219ypbvhp0c4q76igrxijzdalbgkyp2gf8xvq6b4"; + rev = "0a80628e083db6e9d4b4af73be5d917d7d667330"; + sha256 = "1brb0l39xkl19h9xslvmms9vcziygfp244xs5r3n4dqn43c7rr68"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -21230,15 +22080,36 @@ license = lib.licenses.free; }; }) {}; + keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "keycast"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "keycast"; + rev = "46370b8a72922902921d3ed2fa194564568053dc"; + sha256 = "0wgicba3v5l7a0wmmr3awf026vhf4grrn8c4i2hipi9ij3wckqzc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast"; + sha256 = "19qq5y1zjp3029kfq0c59xl9xnxqmdn2pd04sblznchcr9jdy5id"; + name = "keycast"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/keycast"; + license = lib.licenses.free; + }; + }) {}; keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keychain-environment"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "keychain-environment"; - rev = "7c08e8c4c3ea4d6eaee12d710a56793771f837c5"; - sha256 = "1mnqa69f584qzb62nn01bb4nz08gi7ra8b6xr0x7aphfqzk86kzy"; + rev = "d3643196de6dc79ea77f9f4805028350fd76100b"; + sha256 = "0wzs77nwal6apinc39d4arj3lralv2cb9aw9gkikk46fgk404hwj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4382c9e7e8dee2cafea9ee49965d0952ca359dd5/recipes/keychain-environment"; @@ -21296,12 +22167,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "0130f32e5ade649dd2738206a80570e450906ef6"; - sha256 = "1bq7zihdj67j94yyv6655mcrxhz99szbf2zi64nwsl60bxz0znb8"; + rev = "1ad766dbc111ec78b1a292da97b9bd4856cd2ff7"; + sha256 = "0imx8zp21bm066bzdynvasylrlhw0gr8mpk2bwkz8j1y5lsp54v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -21506,12 +22377,12 @@ kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "kubernetes"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "kubernetes-el"; - rev = "560b65baef1c4f2bedffd8e767774b55dfc35594"; - sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw"; + rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c"; + sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes"; @@ -21527,12 +22398,12 @@ kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }: melpaBuild { pname = "kubernetes-evil"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "kubernetes-el"; - rev = "560b65baef1c4f2bedffd8e767774b55dfc35594"; - sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw"; + rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c"; + sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil"; @@ -21548,12 +22419,12 @@ kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "kurecolor"; - rev = "eb894bcb0769ce73404734f14f7582661abe02c8"; - sha256 = "118csp4pi1dxm9grmd006d9wmdplnx8gnk02hbfrl639k7hnnd8z"; + rev = "a27153f6a01f38226920772dc4917b73166da5e6"; + sha256 = "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor"; @@ -21590,12 +22461,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "1.6.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "d976e4f0cadb2309b798540429558936f8f45889"; - sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh"; + rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe"; + sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -21637,7 +22508,7 @@ owner = "latex-math-preview"; repo = "latex-math-preview"; rev = "c1c87c4c5501f98b97af19f7e3454a2369265edc"; - sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw"; + sha256 = "1mp6bpl8992pi40vs6b86q922h4z8879mrjalldv5dyz57ym5fsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview"; @@ -21692,6 +22563,27 @@ license = lib.licenses.free; }; }) {}; + lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lcr"; + version = "0.9"; + src = fetchFromGitHub { + owner = "jyp"; + repo = "lcr"; + rev = "3bc341205bba437c8fec4fefefaf39793c0405ae"; + sha256 = "0jvdnb3fn33wq7ixb7ayrallq1j5gc9nh3i3nmy03yg11h60h1am"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; + sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k"; + name = "lcr"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/lcr"; + license = lib.licenses.free; + }; + }) {}; leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: melpaBuild { pname = "leanote"; @@ -21818,6 +22710,27 @@ license = lib.licenses.free; }; }) {}; + libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "libmpdel"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "mpdel"; + repo = "libmpdel"; + rev = "abb748b6cb35de4652df80ce8539bfc63189619d"; + sha256 = "0ccqcn85131pywzga4644f0azxrsl5ay69m6jz27zzvshs7gzzjv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel"; + sha256 = "0qi9g3czwzi9hhp7gjczpzjx9vgzz52xi91332l0sxcxmwbawjp1"; + name = "libmpdel"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/libmpdel"; + license = lib.licenses.free; + }; + }) {}; lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lice"; @@ -21839,6 +22752,27 @@ license = lib.licenses.free; }; }) {}; + line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "line-up-words"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "janestreet"; + repo = "line-up-words"; + rev = "54d2c51c1c3da7e06be47b829bf465bf467ab53f"; + sha256 = "0qda9i5yjjf2x5cpg6nxkzqwa8fzzjxk0yyc4295kbawwd83vglr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words"; + sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79"; + name = "line-up-words"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/line-up-words"; + license = lib.licenses.free; + }; + }) {}; lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lingr"; @@ -21905,12 +22839,12 @@ linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "linum-relative"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "coldnew"; repo = "linum-relative"; - rev = "b8a99dcfe38a491172a8193053fb7849634b43c0"; - sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s"; + rev = "896df4b40c1e1eb59f55fcee48a1543f0ccd724e"; + sha256 = "0b3n1gk2w1p72x0zfdz9l70winq2fnjpjrgq0awxx730xk7ypp5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative"; @@ -22122,12 +23056,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.19.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "f5da8df21ae2aa704ddca4473b6f9400ba12d30c"; - sha256 = "1w0xc0bc5jl0q9yi9jhvy4xgdyrz9l402v9qv8mmrp2iqf5cdblm"; + rev = "ab2f9bea32dbad11a6464a4880e5487645a0f65a"; + sha256 = "0w3kpszsrh0gj0a62iqhnhm3flmmgq0pl0d6w5r61mvlq9wck5dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -22289,12 +23223,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.8.2"; + version = "0.9"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f"; - sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63"; + rev = "9ec279d933923dab2d8d1f140adc43073dab6433"; + sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -22349,6 +23283,27 @@ license = lib.licenses.free; }; }) {}; + lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lsp-mode"; + version = "4.1"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-mode"; + rev = "065c36f1fceb6322b7ff8fd4bc623aa0cf6136ba"; + sha256 = "0129h8h2abc7vcv0h5b2lsr6swa0zq597s5r7zcfj3macga7iifr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; + sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9"; + name = "lsp-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lsp-mode"; + license = lib.licenses.free; + }; + }) {}; lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-ocaml"; @@ -22478,12 +23433,12 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "emacs-php"; repo = "magic-filetype.el"; - rev = "0dfe3d9e0e22c7b06e34c8338f110e337306e3fd"; - sha256 = "1yjn2w0ykczhlj4q3dnfw2z4q66201dn3jz31yw7hh8bxjlsvwfh"; + rev = "019494add5ff02dd36cb3f500142fc51125522cc"; + sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype"; @@ -22496,26 +23451,28 @@ license = lib.licenses.free; }; }) {}; - magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: + magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.11.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5"; - sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym"; + rev = "44508d71fb400910adb5d0594b56d3c34aa3a5de"; + sha256 = "0cpcdrikfcmkb6sj13bvznilyk8yc054pq5md874s3j224bdxcnx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; - sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; + sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga"; name = "magit"; }; packageRequires = [ async dash emacs + ghub git-commit + let-alist magit-popup with-editor ]; @@ -22611,12 +23568,12 @@ magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }: melpaBuild { pname = "magit-gh-pulls"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "sigma"; repo = "magit-gh-pulls"; - rev = "e4a73781e3c1c7e4a09232b25e3474463cdf77b6"; - sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z"; + rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7"; + sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls"; @@ -22653,12 +23610,12 @@ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-imerge"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c"; - sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg"; + rev = "f337f178a1b4d2e4c1199fa02338febe216ab902"; + sha256 = "1x0714qxryj3fg9qwnsxrksdja1q98vvjpdwn8h9anifxa0wknh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -22671,45 +23628,45 @@ license = lib.licenses.free; }; }) {}; - magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + magit-org-todos = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { - pname = "magit-popup"; - version = "2.11.0"; + pname = "magit-org-todos"; + version = "0.1.2"; src = fetchFromGitHub { - owner = "magit"; - repo = "magit"; - rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5"; - sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym"; + owner = "danielma"; + repo = "magit-org-todos.el"; + rev = "0bfa36bbc50e62de0a3406031cb93e2f57dcdc55"; + sha256 = "07r5x256k1fjjxs1yfg41kc94nwvnjlk2vvknkra3j8v9p0j88m7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; - sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj"; - name = "magit-popup"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/84480cad490cab2f087a484ed7b9d3d3064bbd29/recipes/magit-org-todos"; + sha256 = "0yywgzm2jzvsccm9h0a0s1q8fag9dfajnznwk6iqz5pywq5mxijr"; + name = "magit-org-todos"; }; - packageRequires = [ async dash emacs ]; + packageRequires = [ emacs magit ]; meta = { - homepage = "https://melpa.org/#/magit-popup"; + homepage = "https://melpa.org/#/magit-org-todos"; license = lib.licenses.free; }; }) {}; - magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "magit-rockstar"; - version = "1.0.6"; + pname = "magit-popup"; + version = "2.12.3"; src = fetchFromGitHub { - owner = "tarsius"; - repo = "magit-rockstar"; - rev = "a65042e3445008b55190f1258ae54bd78e12174b"; - sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn"; + owner = "magit"; + repo = "magit-popup"; + rev = "32e6da899abd6657c098534c5775fc7177047f49"; + sha256 = "0nrvs7gwd9kn4n808akrydn7zggvy9zyk38yrcmm561kw0h0h903"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar"; - sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n"; - name = "magit-rockstar"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; + sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv"; + name = "magit-popup"; }; - packageRequires = [ dash magit ]; + packageRequires = [ async dash emacs ]; meta = { - homepage = "https://melpa.org/#/magit-rockstar"; + homepage = "https://melpa.org/#/magit-popup"; license = lib.licenses.free; }; }) {}; @@ -22797,22 +23754,22 @@ license = lib.licenses.free; }; }) {}; - magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: + magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794"; - sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i"; + rev = "08a1c1341d0982248ec86e1697fa1b6418cd80f5"; + sha256 = "062xghazkm8lh207fpqp7csd3nwgkz47g831hqa94iz28n97x0pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab"; name = "magithub"; }; - packageRequires = [ emacs ghub-plus magit s ]; + packageRequires = [ emacs ghub-plus git-commit magit markdown-mode s ]; meta = { homepage = "https://melpa.org/#/magithub"; license = lib.licenses.free; @@ -23143,12 +24100,12 @@ mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mastodon"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "jdenen"; repo = "mastodon.el"; - rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac"; - sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7"; + rev = "ae8dabda04e377a6ac22cb854e4844f68073f533"; + sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; @@ -23164,12 +24121,12 @@ material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "material-theme"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "cpaulik"; repo = "emacs-material-theme"; - rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40"; - sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0"; + rev = "b66838d220ad380a16da1d8878936974b26f815d"; + sha256 = "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme"; @@ -23332,12 +24289,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.8.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5"; - sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8"; + rev = "5479b42efe3ed504e3a0824e039e8365ebc0b788"; + sha256 = "1jn4cpd6y310c8kkk7w0lpchac0rd3f8ri3lmy369gi1sb2xsk94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -23416,7 +24373,7 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; @@ -23479,12 +24436,12 @@ metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "metaweblog"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "punchagan"; repo = "metaweblog"; - rev = "2200eacde17edb66bbdde9c0b6b65481f40d498b"; - sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k"; + rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a"; + sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog"; @@ -23518,6 +24475,27 @@ license = lib.licenses.free; }; }) {}; + mgmtconfig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mgmtconfig-mode"; + version = "0.0.15"; + src = fetchFromGitHub { + owner = "purpleidea"; + repo = "mgmt"; + rev = "3ad7097c8aa7eab7f895aab9af22338c0cf82986"; + sha256 = "04sq8qn6wpsn5yxyf1g2cxv74v3r7n1n32jv174qdn4qknc9khkv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode"; + sha256 = "0bdjaqfk68av4lfc4cpacrl2mxvimplfkbadi9l6wb65vlqz6sil"; + name = "mgmtconfig-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mgmtconfig-mode"; + license = lib.licenses.free; + }; + }) {}; mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mhc"; @@ -23665,6 +24643,27 @@ license = lib.licenses.free; }; }) {}; + minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "minions"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "minions"; + rev = "4fa1b333ecc13f577fab84ee64b8ee385a214b1e"; + sha256 = "0gzp1n0jpjmlskbw8mpdpql0d050qdcxwkcw1bfpp07xbs071w0l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions"; + sha256 = "0ximlj93yp6646bh99r2vnayk15ky26sibrmrqqysfw1pzs4a940"; + name = "minions"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/minions"; + license = lib.licenses.free; + }; + }) {}; minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minitest"; @@ -23689,12 +24688,12 @@ mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mips-mode"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-mips-mode"; - rev = "dcde079176c1419ec24df08b62dd77a897892437"; - sha256 = "0jvbcld3abm45qzsbcaf6f1zd71hgdg5y47v6c0ri4xgwgcwqrvc"; + rev = "e6c25201a3325b555e64388908d584f3f81d9e32"; + sha256 = "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; @@ -23748,27 +24747,6 @@ license = lib.licenses.free; }; }) {}; - mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mmm-mode"; - version = "0.5.4"; - src = fetchFromGitHub { - owner = "purcell"; - repo = "mmm-mode"; - rev = "4085494df67e0a3207839a175ac62673dfd0acc1"; - sha256 = "097s4xnwfy8d1wzmz65g2f8bnjjjlj67w1yzwn4d3yasb171nbv8"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; - sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw"; - name = "mmm-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mmm-mode"; - license = lib.licenses.free; - }; - }) {}; mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; @@ -23898,12 +24876,12 @@ mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-line-debug"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "mode-line-debug"; - rev = "da44422eeb6a1f055b4ec2f822962c5162fce001"; - sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1"; + rev = "a0fcc394b07d2414bd6f722da10f1c7567333f6b"; + sha256 = "04vsb0lniy90bhnqb590dap9y4wac64xz0lc2rlfczic0nrqd1aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0080ab9ef1eca5dd19b3fd9af536d8aa17773a2/recipes/mode-line-debug"; @@ -23961,12 +24939,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.4.0"; + version = "3.5.3"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "019e07947426f0192fc3458f3f72c19031b607de"; - sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz"; + rev = "1143c072f5153ae1a69807e5e8af163069b947d2"; + sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -24000,15 +24978,36 @@ license = lib.licenses.free; }; }) {}; + moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "moody"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "moody"; + rev = "db27ba168503bd6e6c98c313e73699dc403a10aa"; + sha256 = "1y0zg0flcv3sawyqvwilh1ysvbn1bsnkn0b2n89lj00zyb5dj5z8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody"; + sha256 = "095241sjw330fb5lk48aa4zx8xbzk8s4ml22n6a8bzr99nkhn5jy"; + name = "moody"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/moody"; + license = lib.licenses.free; + }; + }) {}; morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "morlock"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "morlock"; - rev = "5845b60c705e8db88ce790b0b12cd8b917e1e5a5"; - sha256 = "1a6kwpanwcnipsq0dc99r4iiz9xa2k883syj0kbk544dxgf338xj"; + rev = "b883d48024ddfffebe2d0dd69f5ed54c617f8834"; + sha256 = "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock"; @@ -24087,12 +25086,12 @@ mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mowedline"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "832e81b7f90f6c2e753f89737c0b57a260544424"; - sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5"; + rev = "c17501b48ded8261d815ab60bf14cddf7040be72"; + sha256 = "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -24168,6 +25167,48 @@ license = lib.licenses.free; }; }) {}; + mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }: + melpaBuild { + pname = "mpdel"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "mpdel"; + repo = "mpdel"; + rev = "3786dd31a9f0a3355c967889323742cfe61f4141"; + sha256 = "0fqdhjmywyw9yd97glrw12j962kmq062djgz2ymv6kspy2g1xv9y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel"; + sha256 = "1py6zk16yl7pyql2qxzd770clzszw7c769hw70n963kns1qmpif8"; + name = "mpdel"; + }; + packageRequires = [ emacs libmpdel ]; + meta = { + homepage = "https://melpa.org/#/mpdel"; + license = lib.licenses.free; + }; + }) {}; + mpmc-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }: + melpaBuild { + pname = "mpmc-queue"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "smizoe"; + repo = "mpmc-queue"; + rev = "4775ddcb120528828ef1fcb7ee761524a0907a31"; + sha256 = "0fbrx288vpd0vx2cph7kfclr7hhplqjgynr6csmkh8jaskv26p79"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c/recipes/mpmc-queue"; + sha256 = "08jcmhfl87nsg6zgv582yfs152bqihbcssh085gxxqn2x99li354"; + name = "mpmc-queue"; + }; + packageRequires = [ emacs queue ]; + meta = { + homepage = "https://melpa.org/#/mpmc-queue"; + license = lib.licenses.free; + }; + }) {}; mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }: melpaBuild { pname = "mpv"; @@ -24192,12 +25233,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577"; - sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk"; + rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3"; + sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -24315,6 +25356,47 @@ license = lib.licenses.free; }; }) {}; + multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "multi-project"; + version = "0.0.26"; + src = fetchhg { + url = "https://bitbucket.com/ellisvelo/multi-project"; + rev = "a6e7c1542c0b"; + sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; + sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x"; + name = "multi-project"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/multi-project"; + license = lib.licenses.free; + }; + }) {}; + multi-run = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }: + melpaBuild { + pname = "multi-run"; + version = "1"; + src = fetchFromGitHub { + owner = "sagarjha"; + repo = "multi-run"; + rev = "87d9eed414999fd94685148d39e5308c099e65ca"; + sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; + sha256 = "1iv4a49czdjl0slp8590f1ya0vm8g2ycnkwrdpqi3b55haaqp91h"; + name = "multi-run"; + }; + packageRequires = [ emacs window-layout ]; + meta = { + homepage = "https://melpa.org/#/multi-run"; + license = lib.licenses.free; + }; + }) {}; multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-term"; @@ -24423,12 +25505,12 @@ mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "alezost"; repo = "mwim.el"; - rev = "d7885c32ad54f5b5698b48abea392a8eae2567a8"; - sha256 = "1kssmryl44m4cq05ff98blwdvqafb9x7v3bvb1z70rrvdvw3l024"; + rev = "462207227b98a6a4356d51419f5ad5ba9356e5cf"; + sha256 = "06lw6064i82daasgm87gm58d142pypqc1q3cnx1cm35hyj4skd32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; @@ -24738,12 +25820,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; - sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; + rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d"; + sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -24864,12 +25946,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "749f48b510d0fd47dac67850f4089119fbff142a"; - sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25"; + rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099"; + sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -24885,12 +25967,12 @@ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "d5e839692a1273b128003eaed543318e7e5965a7"; - sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz"; + rev = "cc23fd6a0e394aeeed603e2bfeb4a5ebc63db660"; + sha256 = "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -24927,12 +26009,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.11"; + version = "0.5.13"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2"; - sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g"; + rev = "57bf044e2f779a03c7bb80c9131d31286ca9660d"; + sha256 = "0fdsm6d3v2hjcyl2kcrzv1fzy17qy8l5a5kpkrv3xq3s25l7dqx1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -24987,6 +26069,27 @@ license = lib.licenses.free; }; }) {}; + nofrils-acme-theme = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nofrils-acme-theme"; + version = "0.1.0"; + src = fetchFromGitLab { + owner = "esessoms"; + repo = "nofrils-theme"; + rev = "7825f88cb881a84eaa5cd1689772819a18eb2943"; + sha256 = "1aslhxk5mp6khf66ac4c441vywhiqpb4kyajagb8b1p10z8hrqva"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme"; + sha256 = "01xqsn8whczv34lfa9vbm5rpvrvsrlpav8pzng10jvax1a9wdp3a"; + name = "nofrils-acme-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nofrils-acme-theme"; + license = lib.licenses.free; + }; + }) {}; nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nord-theme"; @@ -25029,15 +26132,15 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.25.2"; + version = "0.26.1"; src = fetchgit { - url = "git://git.notmuchmail.org/git/notmuch"; - rev = "83f266136369452b859393429b8530efac2e09fb"; - sha256 = "0idim2yslpjzbzy5hh9qhw1gy0h9p92rs0jrr8d2l9y8nsnh6zzr"; + url = "https://git.notmuchmail.org/git/notmuch"; + rev = "ea690a44d1a5af3da496b0d9482471cbd9623231"; + sha256 = "0c9ihkwg2p2sq1zkribbc4k60sl5zdi3sgcy0v2amydsk5kkfy3r"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; - sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; + sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7"; name = "notmuch"; }; packageRequires = []; @@ -25070,12 +26173,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "19ab463864f137b43704b4f34173349c88e84d8e"; - sha256 = "00f5hhw157nwdwy26yn6l3z2hgk6xxvx5xl0hasskj1l9rg0zgh2"; + rev = "e7bb37334ca85ce0e3f5c980464f652266a11218"; + sha256 = "1lymf4ir9kja0dpifbx230cq3n1li25kcdn3x3bh8fskiil1pqm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -25298,6 +26401,27 @@ license = lib.licenses.free; }; }) {}; + ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-coffeescript"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "ob-coffeescript"; + rev = "b70f3d822c707cb02333fcb739ba4874614cad2a"; + sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd"; + }; + 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-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; @@ -25319,15 +26443,36 @@ license = lib.licenses.free; }; }) {}; + ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-hy"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "ob-hy"; + rev = "a3512f274709dc4ab6c18d7955d361f8715505f0"; + sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; + sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7"; + name = "ob-hy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ob-hy"; + license = lib.licenses.free; + }; + }) {}; ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ljos"; repo = "ob-prolog"; - rev = "7e94309d3a21d7e265f3a85b41801397f286af00"; - sha256 = "0qxpgnjrx04dl43i949vcwv70sc7i23ivyvfk82hdvl8c2lwfd7w"; + rev = "efa86bb70fd1907806f3e43705aff54d35582442"; + sha256 = "0g25nn2h7djgc9rp59spx9096jdypsizd0vfzwj96cpq90lkysjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; @@ -25382,27 +26527,6 @@ license = lib.licenses.free; }; }) {}; - ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }: - melpaBuild { - pname = "ob-spice"; - version = "0.4.2"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-spice"; - rev = "790faa67b0c57ca76e8814a1fa60b4dd774412c0"; - sha256 = "0rn3j88ry38500vfaj0myx148nd5kh1jwja6j221ydd6v5wqws6d"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice"; - sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2"; - name = "ob-spice"; - }; - packageRequires = [ org spice-mode ]; - meta = { - homepage = "https://melpa.org/#/ob-spice"; - license = lib.licenses.free; - }; - }) {}; ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }: melpaBuild { pname = "ob-translate"; @@ -25550,22 +26674,22 @@ license = lib.licenses.free; }; }) {}; - olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "9bd41082a593ba90f3e9e34d3ffc29bbb276b674"; - sha256 = "0j33wn2kda5fi906h6y0zd5d0ygw0jg576kdndc3zyb4pxby96dn"; + rev = "35d275d8bdfc5107c25db5a4995b65ba936f1d56"; + sha256 = "00havcpsbk54xfcys9lhm9sv1d753jk3cmvssa2c52pp5frpxz3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd"; name = "olivetti"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/olivetti"; license = lib.licenses.free; @@ -25679,12 +26803,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "ad4a19c60f7dc3d52a5b11febdcc9b78930a1e7d"; - sha256 = "0jc2ap9l0cc636kssld1bqalbriib57sw1rzz45s8r19jqa8w5gm"; + rev = "c00a3a9157432c578fffb79169232e4a81d4ad31"; + sha256 = "0ghwqf1wbiywzdx0qlgs4y94z4ivlgac8rpg1bimlb8xfx62sia0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -26212,48 +27336,90 @@ license = lib.licenses.free; }; }) {}; - org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-index"; + version = "5.8.8"; + src = fetchFromGitHub { + owner = "marcihm"; + repo = "org-index"; + rev = "0dfe0a67979279345378ca006ab4f727df378aca"; + sha256 = "16wjzskq000grkanaw9zca2qbw9yzpndhfd2g0b0if2mf1g31mkv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index"; + sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5"; + name = "org-index"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-index"; + license = lib.licenses.free; + }; + }) {}; + org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "org-jira"; - version = "2.7.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "ab86b343634acaaa04b81ecea511a38e975977d1"; - sha256 = "19sd42w91gzhd0qxgymi09ms0kn6yhv3kdpky1n6l5mkpbv3kp39"; + rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7"; + sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib"; name = "org-jira"; }; - packageRequires = [ cl-lib emacs request ]; + packageRequires = [ cl-lib emacs request s ]; meta = { homepage = "https://melpa.org/#/org-jira"; license = lib.licenses.free; }; }) {}; - org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-journal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.12.3"; + version = "1.13.3"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "44a52a20a154d5c1a78684ef720972c4fe36b64a"; - sha256 = "0c4jwh53mgy4qpv7aiwbsbvjjhchyfjb0ca5ny5875ljvkq59qz6"; + rev = "f24d6c5e71954fd1a748e719b9b4b51f77879800"; + sha256 = "10cqri6k3lvsngwg060nj4n15ip54h3ldlyxgnknmp6wl0vjsjr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b"; name = "org-journal"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/org-journal"; license = lib.licenses.free; }; }) {}; + org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-kanban"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "gizmomogwai"; + repo = "org-kanban"; + rev = "2f0909f6f988f5185026a46a9cc929404652672f"; + sha256 = "08imw445bic3r8x7wls78dqskgx9ny5lixdksrvnp806vixq0f94"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban"; + sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41"; + name = "org-kanban"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/org-kanban"; + license = lib.licenses.free; + }; + }) {}; org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-link-travis"; @@ -26299,12 +27465,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "0.0.9"; + version = "0.1.1"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "62791db188fa6a9a6b4e53c5c29fb4fa46582b98"; - sha256 = "1l1fyyyyyi8nj4vpkyhpvz1yyqa2vn7042kp9443kqcswdfc9660"; + rev = "0752659f7a19cead182584fabc9544464f69b83e"; + sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -26359,6 +27525,27 @@ license = lib.licenses.free; }; }) {}; + org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-noter"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "weirdNox"; + repo = "org-noter"; + rev = "32cdf41079ca67c5906a10215eb7fbaefebab994"; + sha256 = "11hhw8fk1qn63hwdx49h9h58p2hmxhmni6qdazd0ipk68finmy8f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; + sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf"; + name = "org-noter"; + }; + packageRequires = [ cl-lib emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-noter"; + license = lib.licenses.free; + }; + }) {}; org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-outlook"; @@ -26529,12 +27716,12 @@ org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "0.5"; + version = "0.5.2"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "14a065e1d376838f16a6ba32ed8710304542a4e6"; - sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir"; + rev = "60364c18725d2f3898a9099e7e546ae406dd6578"; + sha256 = "0k86hqmqilvkam886mb85v991ivwnglallwj4l9ghszl7awy207m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -26603,12 +27790,12 @@ org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-repo-todo"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "waymondo"; repo = "org-repo-todo"; - rev = "904a26089d87db59a40421d6f857b189e70dfbe3"; - sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9"; + rev = "cba6145c6821fd2bbd96a1c9ef2346c281b76ad2"; + sha256 = "0b57qy87sa8qcki16rgh16ldziay57yd7f98cpinaq0adcrqywy0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo"; @@ -26621,15 +27808,36 @@ license = lib.licenses.free; }; }) {}; + org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-rich-yank"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "unhammer"; + repo = "org-rich-yank"; + rev = "ffa90b29604e27a60ad341c06d0e43769af19715"; + sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank"; + sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y"; + name = "org-rich-yank"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-rich-yank"; + license = lib.licenses.free; + }; + }) {}; org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; - version = "1.0.3"; + version = "1.1.2"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "1a63f7eb0682a73126b534458b403ad0858273e8"; - sha256 = "13k8rqh8r48hhdn8z580g379m6mgyc3jnh8a2kk0b22vlx6c3zap"; + rev = "ab4ad93a23e5402b5276c061945872dd6d586e75"; + sha256 = "07j4gyw22372nlfbaf94w6a7pza01zp6ivsg9iq2hcnx5pniv7hz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; @@ -26855,12 +28063,12 @@ org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: melpaBuild { pname = "org-trello"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "org-trello"; repo = "org-trello"; - rev = "32dd866e830836a72a3b96b96e0d00d044d0eaf7"; - sha256 = "0m5hyhb6211hdmyp1bq6f3fklfgw3957knd96bfdafj727vdnlzm"; + rev = "c38c36159cdeb2348c4e9ca75246aa9cc1dfd76c"; + sha256 = "02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello"; @@ -26894,22 +28102,43 @@ license = lib.licenses.free; }; }) {}; - org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: + org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-wild-notifier"; + version = "0.2.4"; + src = fetchFromGitHub { + owner = "akhramov"; + repo = "org-wild-notifier.el"; + rev = "5da63fc00db20b60eb46a241cc8308547d85b3ad"; + sha256 = "1269az078d6d0x7ims2qa6wdv8ql2hn70fwigfqw116v9602ywjr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; + sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; + name = "org-wild-notifier"; + }; + packageRequires = [ alert dash emacs ]; + meta = { + homepage = "https://melpa.org/#/org-wild-notifier"; + license = lib.licenses.free; + }; + }) {}; + org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "e266ff4296661de520b73e6e18f201fb6378ba05"; - sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461"; + rev = "bd2028b6a79daa63fc5481deaed63c4efc681be0"; + sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40"; name = "org2blog"; }; - packageRequires = [ metaweblog org xml-rpc ]; + packageRequires = [ htmlize metaweblog org xml-rpc ]; meta = { homepage = "https://melpa.org/#/org2blog"; license = lib.licenses.free; @@ -26990,12 +28219,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663"; - sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf"; + rev = "d909f92d3b1b42184143fd5e6d4c6a2762477ab7"; + sha256 = "1jdc874bxkpbfpllak3vmfsn82p930s565bzff341vzv7aw2528c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -27011,12 +28240,12 @@ orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglink"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "50debcf3508d2252bdce35c8822af1b3a81fd2dd"; - sha256 = "1b86c4pyc7cs02lrhnk93gh3czp9wajm17wd9mhszcbdn996rnhz"; + rev = "e9e90e16ddaceaf99c9b251a215d6338b9762b4d"; + sha256 = "0vqyidi54rbpqwqi6iv1xaqkr9gfr0pfhr1msxckh8jy6avgy319"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; @@ -27134,27 +28363,6 @@ license = lib.licenses.free; }; }) {}; - osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "osx-plist"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "osx-plist"; - rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0"; - sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f3686dc818bd12be247bad915c01736a95690041/recipes/osx-plist"; - sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8"; - name = "osx-plist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/osx-plist"; - license = lib.licenses.free; - }; - }) {}; osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-pseudo-daemon"; @@ -27197,6 +28405,27 @@ license = lib.licenses.free; }; }) {}; + outlook = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "outlook"; + version = "0.1"; + src = fetchFromGitHub { + owner = "asavonic"; + repo = "outlook.el"; + rev = "5847c6f13b106cb54529080e9050be5b8b5be867"; + sha256 = "13wlfklk342gv5fmzpnz69mc07vm8x6xmh7li1w7f13ci3v4s045"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5ce3e6800213b117578a1022f25407f2ec1604f/recipes/outlook"; + sha256 = "0yq9zl7dr8kkm4rps5np4dwvjfhzsxq9wd1af7zwcmms4l3qry6k"; + name = "outlook"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/outlook"; + license = lib.licenses.free; + }; + }) {}; outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outorg"; @@ -27260,6 +28489,27 @@ license = lib.licenses.free; }; }) {}; + overcast-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "overcast-theme"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "myTerminal"; + repo = "overcast-theme"; + rev = "009257956522dedf07d9e136ee41ac0b1b0b3518"; + sha256 = "1g3s44n839s7fw3spkph31m0a5walilj151v0jyp302mjfn396nh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme"; + sha256 = "1v8hdnvc4pfmadkvdm6b8z0cy20pminvhjdlr13q5m9immr88a4r"; + name = "overcast-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/overcast-theme"; + license = lib.licenses.free; + }; + }) {}; overseer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "overseer"; @@ -27305,12 +28555,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "0.2.4"; + version = "0.3"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "4b4585264a28152f2eda0f7e5ceed132f9d23e16"; - sha256 = "1k3lv4qqkp87piwlwl3gahac1zpjzv397f65g4khbpby2kgg8dpi"; + rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d"; + sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -27347,12 +28597,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "0.6"; + version = "0.8"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "1213df6c6d9adcd706306523a5ce0c66d118b4c7"; - sha256 = "1j4b7f5bgpc8vhmxprqriy3688i3lp3fgvxcnnnb2v0sjq1pbac8"; + rev = "9751d34e1133b89a533a978c085b0715f85db648"; + sha256 = "11h464cyc28ld0b0zridgm4drydc1qjxbm1y24zrwlkyqqjk6yr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -27452,12 +28702,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "940c991ccd0dab53bd7c120601b3db35669c5e73"; - sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp"; + rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00"; + sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -27533,22 +28783,22 @@ license = lib.licenses.free; }; }) {}; - package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restart-emacs }: melpaBuild { pname = "package-utils"; - version = "0.5.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "e00df8a85fb3d0cfe9dde5a683d81e1a89570e29"; - sha256 = "14zcg9rc2nif8kv8pfmv9arbq0i8glviyvxgxr0lfiif2n4cfg9s"; + rev = "652531caf1a1df916d2185e7f47085bd0509c940"; + sha256 = "0lmz4szrfs2445q8nyqnh9hgm69bwdf7q78sfqyxiw1fqaj205si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r"; name = "package-utils"; }; - packageRequires = []; + packageRequires = [ restart-emacs ]; meta = { homepage = "https://melpa.org/#/package-utils"; license = lib.licenses.free; @@ -27557,12 +28807,12 @@ packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "2.0.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "packed"; - rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a"; - sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm"; + rev = "c41c3dfda86ae33832ffc146923e2a4675cbacfa"; + sha256 = "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; @@ -27617,6 +28867,27 @@ license = lib.licenses.free; }; }) {}; + panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "panda-theme"; + version = "0.1"; + src = fetchFromGitHub { + owner = "jamiecollinson"; + repo = "emacs-panda-theme"; + rev = "ae24179e7a8a9667b169f00dbd891257530c1d22"; + sha256 = "05vv4idl9h59jd089hpd09xcy1ix30bq0c4fif2b66170aychvii"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme"; + sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7"; + name = "panda-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/panda-theme"; + license = lib.licenses.free; + }; + }) {}; pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pandoc"; @@ -27744,12 +29015,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; - sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; + rev = "a45d111153a76c481fa0b36d6172ac90e073dfc4"; + sha256 = "1cr0vnm57lxs48z17ddcv7qlfvks7wdsp01zsw0c7i3h5ajl8myp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -27807,12 +29078,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3"; - sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"; + rev = "c8d59deb20552f9a1885297b5ae0b8f753d191a5"; + sha256 = "1b1iiiy184czp014gg1bb3jks9frmkw8hs5z2l2lnzjmfjr6jm6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -27996,12 +29267,12 @@ pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pastery"; - version = "0.1.15"; + version = "0.2.1"; src = fetchFromGitHub { owner = "diasbruno"; repo = "pastery.el"; - rev = "245779100e7d1c1a10b67fe7b9055343d3a8229c"; - sha256 = "1wn53ncs0nivmdqlryvidqkksky8w4ymmfsqm1ha62jkxcwqf26h"; + rev = "4493be98b743b4d062cb4e00760125e394a55022"; + sha256 = "0bmm18d84lrkclg4md46k1ma03w7a97s10hrvjcm9yj8xbrjqqsc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery"; @@ -28519,12 +29790,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "1.18.2"; + version = "1.19.0"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "e41a44f39d5d78acc2bd59d2a614f5fc9ff80cd3"; - sha256 = "0ykdi8k6qj97r6nx9icd5idakksw1p10digfgl8r8z4qgwb00gcr"; + rev = "c68013a583e2f0bd0792e0988ff9ce3e6deae531"; + sha256 = "0ycqf8fr3f4flgww9ffiga2hkj8l6ikcdj93iafp7qxqs1bzjxfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -28537,6 +29808,27 @@ license = lib.licenses.free; }; }) {}; + php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "php-runtime"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "php-runtime.el"; + rev = "fa4312863245511462b75cb31df2f8558288f4df"; + sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime"; + sha256 = "0dvnwajrjsgyqzglzpkx9vwx3f55mrag6dsbdjqc9vvpvxhmgfwb"; + name = "php-runtime"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/php-runtime"; + license = lib.licenses.free; + }; + }) {}; phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "phpcbf"; @@ -28561,12 +29853,12 @@ phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "phpunit"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "phpunit.el"; - rev = "5ca5ee53e16b2cf0939dbeacbf1dffa13b41b48f"; - sha256 = "0gmb5fxnllkjg45cmqpr2gy2k6qhg1r6j2w67qbpir0x4h3q2x6x"; + rev = "a13706733f98be3639c47311fc820b3b50f4bc33"; + sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit"; @@ -28726,22 +30018,22 @@ license = lib.licenses.free; }; }) {}; - plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + plain-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "7"; + version = "8"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "7c376f5bf9d653bf12e414176284736cbdd19108"; - sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a"; + rev = "2609a811335d58cfb73a65d6307c156fe09037d3"; + sha256 = "0g5vl4xigdm2pn2mnkwgj1kxdjr66w7ynr77bchy3ij6qvzdzkqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8"; name = "plain-theme"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/plain-theme"; license = lib.licenses.free; @@ -28789,6 +30081,27 @@ license = lib.licenses.free; }; }) {}; + play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "play-crystal"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "play-crystal.el"; + rev = "86b54346e7c832c14f8e5654a462f6490a6b11d7"; + sha256 = "0kvkr24f8r21pahm2lsvbr9bg53770wxwpdfmmjljs2zmgxf2c40"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal"; + sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf"; + name = "play-crystal"; + }; + packageRequires = [ dash emacs request ]; + meta = { + homepage = "https://melpa.org/#/play-crystal"; + license = lib.licenses.free; + }; + }) {}; play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "play-routes-mode"; @@ -28964,6 +30277,27 @@ license = lib.licenses.free; }; }) {}; + pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pomidor"; + version = "0.2"; + src = fetchFromGitHub { + owner = "TatriX"; + repo = "pomidor"; + rev = "5780ce2aaa98882a79e92f5eefaaf10fd8dbee3a"; + sha256 = "19bz3pg3s265wpcwb458i84138z170rgd1qybn6vrll2brvwsf8b"; + }; + 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; + }; + }) {}; pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "pony-snippets"; @@ -29596,12 +30930,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.4.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "b04e5cba356212e4e8c66c61bbe0c3a20537c5b9"; - sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; + rev = "b5fbb742af122b565925987e65c08957739976a7"; + sha256 = "14gq6rnv03zvcb5hym240z4yqiphrmd5y4zx9a77n37rwvfgx5qy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -29656,22 +30990,22 @@ license = lib.licenses.free; }; }) {}; - psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "3488f7777486aa6c85ebc04d011860163d3cf0fc"; - sha256 = "0v9pg9ywwdqmahmmhg4gwzmibznlbmiyz4hf90brb59ns013jb53"; + rev = "c48b0574e1477437b4427e78d018f858b49fd0ff"; + sha256 = "1ffgnkdvrryc84cw1m5k37zx22dd5l7z882zgfh1p3dfzh8rqpqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a"; name = "psession"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ async cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/psession"; license = lib.licenses.free; @@ -29748,7 +31082,7 @@ owner = "elzair"; repo = "punctuality-logger"; rev = "708cae8e67dbae293c7c4be0ca5e49d76fac6714"; - sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py"; + sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/punctuality-logger"; @@ -29971,22 +31305,22 @@ license = lib.licenses.free; }; }) {}; - pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: + pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "1.6.4"; + version = "1.7"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a"; - sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w"; + rev = "3b1c5fbdf3b910f96771935785e28cf33d8d54cc"; + sha256 = "1ijfsnjvyys941kgcq00d5dgnkbzj14gb7c9pks0x11bsdl0vr6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; name = "pyim"; }; - packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ]; + packageRequires = [ async cl-lib emacs popup pyim-basedict ]; meta = { homepage = "https://melpa.org/#/pyim"; license = lib.licenses.free; @@ -30055,6 +31389,27 @@ license = lib.licenses.free; }; }) {}; + pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "pynt"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ebanner"; + repo = "pynt"; + rev = "bc750cd244141005ea3b7bb87f75c6f6c5a5778f"; + sha256 = "0mj8lkc40iv8d6afl4dba7gsbi0mgnx9ivanvczq6pxp5d4kgfsn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; + sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3"; + name = "pynt"; + }; + packageRequires = [ deferred ein emacs epc helm ]; + meta = { + homepage = "https://melpa.org/#/pynt"; + license = lib.licenses.free; + }; + }) {}; python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-environment"; @@ -30084,7 +31439,7 @@ owner = "python-mode-devs"; repo = "python-mode"; rev = "a0a534639bc6142c2c2f44bd7ca5878ad5f79518"; - sha256 = "0sj2hfjwpcdg9djsgl3y5aa3gnvl4s87477x6a9d14m11db3p7ml"; + sha256 = "173i3k0nvjri1g1mkgkc2i9c9mpnsvxf1ldmm12yhadl5gl2ah07"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -30097,6 +31452,34 @@ license = lib.licenses.free; }; }) {}; + python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: + melpaBuild { + pname = "python-pytest"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-python-pytest"; + rev = "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70"; + sha256 = "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; + sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4"; + name = "python-pytest"; + }; + packageRequires = [ + dash + dash-functional + emacs + magit-popup + projectile + s + ]; + meta = { + homepage = "https://melpa.org/#/python-pytest"; + license = lib.licenses.free; + }; + }) {}; python-x = callPackage ({ fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; @@ -30142,12 +31525,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "1.10"; + version = "1.13"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55"; - sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh"; + rev = "70a755d79b04964bdb969e41166f2473e21f277e"; + sha256 = "1sim74ccvwifradjdq726jbfcbw52cizbj1vh8q7c75qis6nhb7x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -30181,6 +31564,27 @@ license = lib.licenses.free; }; }) {}; + ql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ql"; + version = "1.0"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "ql-el"; + rev = "c885d125d8972374b408f6eddf031e44dc6fa0c6"; + sha256 = "1l1jdvz1913m03ikcf9g3dsraaajqac1kzfy9c9xhzx8w7bbl80c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303/recipes/ql"; + sha256 = "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z"; + name = "ql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ql"; + license = lib.licenses.free; + }; + }) {}; qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "qml-mode"; @@ -30562,12 +31966,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "25cc3c8902f16191496b549705b00ffc7dff51f1"; - sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy"; + rev = "164136d05505275d42d1ca3a390f55fcc89694b8"; + sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -30622,22 +32026,28 @@ license = lib.licenses.free; }; }) {}; - realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: + realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "6dc971269f6f9435e5159c2cfe66fc5e4b296df2"; - sha256 = "1pl758xp2gfy8h313ggpmqv7sjb8h6qdrqj68ypxch70k9vq76z8"; + rev = "09431a4561921bece36a6083b6e27ac4dc82432d"; + sha256 = "00dgdiiwnwynlyyh6pfhljrl363s8zd5ynbx9mhd2y8c3gmvfab0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15"; name = "realgud"; }; - packageRequires = [ load-relative loc-changes test-simple ]; + packageRequires = [ + cl-lib + emacs + load-relative + loc-changes + test-simple + ]; meta = { homepage = "https://melpa.org/#/realgud"; license = lib.licenses.free; @@ -30982,12 +32392,12 @@ req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "30f76a9c52994562191c90c315002410706f6c0b"; - sha256 = "0qdr2pshfq6v75s9hx9wgvn56pd7b65vaqaa64dryr7v4yzd4r15"; + rev = "0c0ac7451149dac6bfda2adfe959d1df1c273de6"; + sha256 = "0sx3kw1gpliifbc0gh2z1lvig68v3gwqjbj0izgn77js8kqxad84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -31171,12 +32581,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14"; - sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g"; + rev = "d50bd106275f3ef7f77d0147857412fb065eef47"; + sha256 = "0zjhak534j1n03z6p9wjmgc48yy40icrp2x8y9vbvg4hgx8xh9lm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -31297,12 +32707,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "79bedb1d188e209be5cfef3bea8906df9c509ab8"; - sha256 = "1dh76r9hy1d1f9xhdywslgv0w3c9nhsbwvpd8icgp300x5c6a3zh"; + rev = "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0"; + sha256 = "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -31444,12 +32854,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.15"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; - sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -31462,6 +32872,27 @@ license = lib.licenses.free; }; }) {}; + rubik = callPackage ({ calc, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rubik"; + version = "1.2"; + src = fetchFromGitHub { + owner = "Kurvivor19"; + repo = "rubik-mode"; + rev = "7ec955639865ca8e99a941843e19b12be5015a47"; + sha256 = "0fdjg6gpg45m5myq517vkprmvh50xw10dqa8vwr9hfz2z8dy18ja"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik"; + sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267"; + name = "rubik"; + }; + packageRequires = [ calc cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/rubik"; + license = lib.licenses.free; + }; + }) {}; rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; @@ -31885,12 +33316,12 @@ sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sayid"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "b44b6d346604f8d1ef9b9180be359ce1e601a298"; - sha256 = "0ggk60l132qgscgqbx4fdhzx6nlv2k7gbrjapkdl15slz2kyq03d"; + rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f"; + sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; @@ -31906,12 +33337,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "84c3d178a1f2c580f620fd8f03a05ac6413086a3"; - sha256 = "1ndxylb2jbnfrrsbbs5vcxygrqd3ssf3az01nh694hv6lkcidw5k"; + rev = "a70899661861cf40f54f773c3066fe5b5e9fb71d"; + sha256 = "0gnqy88qi751pzpg8ga3j2yx0x9cz5inkqpv2451n5b0gjfps9yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -32240,12 +33671,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "55df581cdb3cfaf9ebf9c54d8849f8f5775cf74b"; - sha256 = "1s59v6fnyzvgnbjcd1gpll4xp8316dqmdpi77382w0vjfcrsvbih"; + rev = "4189c1c773aab533969b587f7801ffbcd1d7d613"; + sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -32552,7 +33983,7 @@ license = lib.licenses.free; }; }) {}; - shrink-path = callPackage ({ dash, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: + shrink-path = callPackage ({ dash, emacs, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "shrink-path"; version = "0.3.1"; @@ -32560,14 +33991,14 @@ owner = "bennya"; repo = "shrink-path.el"; rev = "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b"; - sha256 = "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki"; + sha256 = "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path"; sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb"; name = "shrink-path"; }; - packageRequires = [ dash f s ]; + packageRequires = [ dash emacs f s ]; meta = { homepage = "https://melpa.org/#/shrink-path"; license = lib.licenses.free; @@ -32618,12 +34049,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.12"; + version = "0.0.14"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "aa45e7b586b1215ca1af05c14984ce872571b5f7"; - sha256 = "0ya7vbp71vmvli35rwcwspbclss5ngr1ck9074i2gg1dzrqyxijn"; + rev = "b33b23097ad34177e4179e9d3731ec5db30c6391"; + sha256 = "0vlgm1aix074ifi9gvp4c0ygdmzplydj4gdsl46173qbd8lfi2rj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -33059,12 +34490,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "8fd76a66abe4d37925e3d6152c6bd1e8648a293a"; - sha256 = "1176fxrzzk4fyp4wjyp0xyqrga74j5csr5x37mlgplh9790248dx"; + rev = "5aca51956fae55d7310c1f96b5d128201087864a"; + sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -33080,12 +34511,12 @@ smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }: melpaBuild { pname = "smart-mode-line-powerline-theme"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "8fd76a66abe4d37925e3d6152c6bd1e8648a293a"; - sha256 = "1176fxrzzk4fyp4wjyp0xyqrga74j5csr5x37mlgplh9790248dx"; + rev = "5aca51956fae55d7310c1f96b5d128201087864a"; + sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -33143,12 +34574,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "7841b2f02a1a99e1cb166d595f24f16a514ccbb5"; - sha256 = "062g6y8an4kvfym2w56qy2iqd4ngxdxba38136ph0ckkzl0yrl7l"; + rev = "4873352b5d0a1c5142658122de1b6950b8fe7e4d"; + sha256 = "0zij2f2rjjym98w68jkp10n1ckpfprlkk217c3fg16hz5nq4vnm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -33332,12 +34763,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "22b3efd741e26f59e18c9fd28691d8b84c9130ab"; - sha256 = "0hjp5ci7miggw0gs2y8q867gi7p3dq2yyfkckkh52isrp0yvz0wf"; + rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7"; + sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -33437,12 +34868,12 @@ solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solaire-mode"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "0f467e5f309e5a36280e06b40c0e6bbe90e06358"; - sha256 = "1jka6213sw3rqan6s31s1ndyd0h2gwxvl0rcfm4jqc68mfyikzma"; + rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2"; + sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -33476,6 +34907,27 @@ license = lib.licenses.free; }; }) {}; + solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "solidity-mode"; + version = "0.1.9"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "emacs-solidity"; + rev = "d0ff4dea49540f37301d869f2797fca2492f55d5"; + sha256 = "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; + sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx"; + name = "solidity-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/solidity-mode"; + license = lib.licenses.free; + }; + }) {}; sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "sos"; @@ -33668,12 +35120,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "3.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "e220a0c0c478fee0be3622442651981cdd82090c"; - sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4"; + rev = "2837b97244111515c61fb3823c1479bc126a458b"; + sha256 = "0hqp8r24wvzrkl630wbm0lynrcrnawv2yn2a3xgwqwwhwgva35rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -33917,6 +35369,27 @@ license = lib.licenses.free; }; }) {}; + srcery-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "srcery-theme"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "roosta"; + repo = "emacs-srcery"; + rev = "385809e78a2494ee617782430415048d91a11444"; + sha256 = "1r6k042jipqz04nlr9gfpq6p80k33k4aqxsn03p1sicnpakzpixg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1df48441ecf6abd272ff154722b9ce0e2546c284/recipes/srcery-theme"; + sha256 = "1r8srxhznli3sskwppk7fyapyx0qixagkwm0fllgsbm4nwkzq9pn"; + name = "srcery-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/srcery-theme"; + license = lib.licenses.free; + }; + }) {}; srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; @@ -33959,22 +35432,22 @@ license = lib.licenses.free; }; }) {}; - ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "1.3"; + version = "1.5"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23"; - sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw"; + rev = "aef539bb4feefe927fa48d01736dfadb7b3d7930"; + sha256 = "0vra7y2icid9sdyp7iygwkp4xaas249nm1lcbcyfpaad250g2pn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm"; name = "ssh-deploy"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ssh-deploy"; license = lib.licenses.free; @@ -34064,6 +35537,27 @@ license = lib.licenses.free; }; }) {}; + stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stgit"; + version = "0.18"; + src = fetchFromGitHub { + owner = "ctmarinas"; + repo = "stgit"; + rev = "3df606d14f6673fede6cdf5fad921a664c03e108"; + sha256 = "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit"; + sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g"; + name = "stgit"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/stgit"; + license = lib.licenses.free; + }; + }) {}; string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-edit"; @@ -34088,12 +35582,12 @@ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-inflection"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5"; - sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5"; + rev = "a150e7bdda60b7824d3a936750ce23f73b0e4edd"; + sha256 = "1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; @@ -34252,6 +35746,48 @@ license = lib.licenses.free; }; }) {}; + sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sudden-death"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "yewton"; + repo = "sudden-death.el"; + rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb"; + sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death"; + sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh"; + name = "sudden-death"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sudden-death"; + license = lib.licenses.free; + }; + }) {}; + sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sudo-edit"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "nflath"; + repo = "sudo-edit"; + rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b"; + sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; + sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4"; + name = "sudo-edit"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/sudo-edit"; + license = lib.licenses.free; + }; + }) {}; suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; @@ -34357,27 +35893,6 @@ license = lib.licenses.free; }; }) {}; - swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "swbuff"; - version = "3.3"; - src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "swbuff"; - rev = "8d5b2bec12503509554f9dd83b97c198b259db2b"; - sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff"; - sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk"; - name = "swbuff"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/swbuff"; - license = lib.licenses.free; - }; - }) {}; sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; @@ -34385,8 +35900,8 @@ src = fetchFromGitHub { owner = "CestDiego"; repo = "sweetgreen.el"; - rev = "9de3916023872ab054e1c7301175fa27fdb1de0c"; - sha256 = "1h56qkbx5abz1l94wrdpbzspiz24mfgkppzfalvbvx5qwl079cvs"; + rev = "e40d2821ff941695e50a9b003a8c96d32c19bfdc"; + sha256 = "1gw09x5d4yqlmknjsrhgygp9bch315cnmyqp3679i3hza0l7fds6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63812707948e6dcc00e00ebc3c423469593e80fd/recipes/sweetgreen"; @@ -34402,12 +35917,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "3.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0"; - sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc"; + rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29"; + sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -34444,12 +35959,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; - sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; + rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; + sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -34465,12 +35980,12 @@ swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }: melpaBuild { pname = "swiper-helm"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper-helm"; - rev = "f3d6dba865629eed8fb14f92dab1fad50734891b"; - sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64"; + rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008"; + sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm"; @@ -34567,6 +36082,27 @@ license = lib.licenses.free; }; }) {}; + symbolword-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "symbolword-mode"; + version = "1.0"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "symbolword-mode"; + rev = "273dece5b04f7abc4c35048b2f64f04b33774b87"; + sha256 = "0gpm0zy1kwqxkakvfdgh1lylp99msyamwvi19c53g9jl01m9avyd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/be2018e0206c3f39c1b67e83000b030d70a72ceb/recipes/symbolword-mode"; + sha256 = "1fs1irnmlbrn76b4gdsy0v65nz8av85iqm0b7g9nm2rm8azcr050"; + name = "symbolword-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/symbolword-mode"; + license = lib.licenses.free; + }; + }) {}; symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symon"; @@ -34671,6 +36207,27 @@ license = lib.licenses.free; }; }) {}; + system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "system-packages"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "jabranham"; + repo = "system-packages"; + rev = "fff67d190440fb076104f0f52d55a5e098207e31"; + sha256 = "0ia4nnyhk84dkahsan8l8dslmqiv0afs5abc1w2fnql7zhsiac6q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; + sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1"; + name = "system-packages"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/system-packages"; + license = lib.licenses.free; + }; + }) {}; system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-specific-settings"; @@ -35325,12 +36882,12 @@ thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thrift"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "b2a4d4ae21c789b689dd162deb819665567f481c"; - sha256 = "1b1fnzhy5qagbzhphgjxysad64kcq9ggcvp0wb7c7plrps72xfjh"; + rev = "327ebb6c2b6df8bf075da02ef45a2a034e9b79ba"; + sha256 = "1scv403g5a2081awg5za5d3parj1lg63llnnac11d6fn7j7ms99p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -35346,12 +36903,12 @@ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tickscript-mode"; - version = "0.4"; + version = "0.4.1"; src = fetchFromGitHub { owner = "msherry"; repo = "tickscript-mode"; - rev = "9acf389dd055ae77c92170802769838810472490"; - sha256 = "1v60y244papzrirwqk9c2wcwgz4qp9h7m3887kvgr5ffn5imjss8"; + rev = "6e7564593d7735acc9f3fa670ec6512991cb73a1"; + sha256 = "173zk9nzjds0rkypmaq8xv5qianivgk16jpzgk0msdsn9kjbd8s9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; @@ -35364,15 +36921,36 @@ license = lib.licenses.free; }; }) {}; + tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: + melpaBuild { + pname = "tidal"; + version = "0.9.8"; + src = fetchFromGitHub { + owner = "tidalcycles"; + repo = "Tidal"; + rev = "f8af7bdbda547ebd12cf5c0ee1327f33cd9aa93f"; + sha256 = "0y7a4bxsgpbg1sbsi4xdp4k9x3l0vh7acm5i3k87acpcpfb9aq5y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; + sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a"; + name = "tidal"; + }; + packageRequires = [ emacs haskell-mode ]; + meta = { + homepage = "https://melpa.org/#/tidal"; + license = lib.licenses.free; + }; + }) {}; tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.6.1"; + version = "2.8.1"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "e7ffcdcf9f68205d1498137e84a731c7ffb86263"; - sha256 = "0lym5jb2fxv4zjhik4q5miazrsi96pljl6fw5jjh0i9p8xs0yp4x"; + rev = "0db094ba1748e3add4e152fa34d64b25eb07bdd2"; + sha256 = "113lg22aaagh3bbabxp65460cfwa9whjg3yzafd5n8azkinq8s6k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -35469,6 +37047,27 @@ license = lib.licenses.free; }; }) {}; + total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "total-lines"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "hinrik"; + repo = "total-lines"; + rev = "58a9fb0ffca63e3dfb3b27c7d91b4630e422903b"; + sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines"; + sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh"; + name = "total-lines"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/total-lines"; + license = lib.licenses.free; + }; + }) {}; tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tox"; @@ -35513,12 +37112,12 @@ tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tracking"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6"; - sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j"; + rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484"; + sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -35534,12 +37133,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.12"; + version = "0.12.1"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "0de5a5fa2438890ae9c2ca61999042ab175df3e9"; - sha256 = "1wqlbbm71s1hvglsdp1qs7nvj6gnkjkai4rr8hhp1lliiyd5vmia"; + rev = "03a36853f141387654b7cb9217c7417db096a083"; + sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -35573,22 +37172,22 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.12.3"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "8959ef2546b7124a3e8d41cfba2912b748149d0c"; - sha256 = "1xy8r0cp7c5zc4xzqmzcp7g4pr09xkfii9xh8mkmpqf27sghj5rd"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; - sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs"; + sha256 = "1wcsn0kzrbawyyhxmsmrsxr1vp0llkxw6r7zx53pwyc82ia64nlv"; name = "treemacs"; }; - packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ]; + packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ]; meta = { homepage = "https://melpa.org/#/treemacs"; license = lib.licenses.free; @@ -35597,16 +37196,16 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.12.3"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "8959ef2546b7124a3e8d41cfba2912b748149d0c"; - sha256 = "1xy8r0cp7c5zc4xzqmzcp7g4pr09xkfii9xh8mkmpqf27sghj5rd"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; - sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil"; + sha256 = "1i2mxqwnqb2jz775qg3z4lf7pk4mgi646fyyi2la5gdcnq6a46mg"; name = "treemacs-evil"; }; packageRequires = [ evil treemacs ]; @@ -35618,16 +37217,16 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.12.3"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "8959ef2546b7124a3e8d41cfba2912b748149d0c"; - sha256 = "1xy8r0cp7c5zc4xzqmzcp7g4pr09xkfii9xh8mkmpqf27sghj5rd"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; - sha256 = "0y7mq466c9cigyd6imzjnh54aq9kcsikhr7llga5gsclf35fc5ld"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile"; + sha256 = "1vyifik30673bwlfvbmw8pzz7f3wd4q6zzssvbj8d23zhk8kh8vc"; name = "treemacs-projectile"; }; packageRequires = [ projectile treemacs ]; @@ -35636,6 +37235,27 @@ license = lib.licenses.free; }; }) {}; + treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "treepy"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "volrath"; + repo = "treepy.el"; + rev = "282fbc94747fe2a00d36e2a74d147c8fa0ac4be7"; + sha256 = "0acw6c073h2a0fy8gx2xc2d1fw0yhaqikqrvs2iq53fqcqrrq81r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy"; + sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72"; + name = "treepy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/treepy"; + license = lib.licenses.free; + }; + }) {}; trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "trr"; @@ -35783,22 +37403,22 @@ license = lib.licenses.free; }; }) {}; - turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "turing-machine"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "therockmandolinist"; repo = "turing-machine"; - rev = "41bfe79ecf8a44dcbaf308c33cbdf324f7c806ae"; - sha256 = "04j4nw526mxlm4fd2a28p0pa2ss4b4vznjvpk0f0wlf61ymvy884"; + rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047"; + sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine"; sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn"; name = "turing-machine"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/turing-machine"; license = lib.licenses.free; @@ -36170,12 +37790,12 @@ unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unify-opening"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "unify-opening"; - rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf"; - sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a"; + rev = "502469ddba6d8d52159f53976265f7d956b6b17c"; + sha256 = "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening"; @@ -36212,12 +37832,12 @@ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "07bcd6517243c9c9f61172202d33718bd9b2a850"; - sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n"; + rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c"; + sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -36241,8 +37861,8 @@ sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; - sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; + sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp"; name = "use-package"; }; packageRequires = [ bind-key diminish ]; @@ -36251,15 +37871,57 @@ license = lib.licenses.free; }; }) {}; + use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: + melpaBuild { + pname = "use-package-el-get"; + version = "0.1"; + src = fetchFromGitHub { + owner = "edvorg"; + repo = "use-package-el-get"; + rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947"; + sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get"; + sha256 = "0sg9ijkjax6w25p0q7rw5rjn8r2i83z5jfzjkvy8pxil5cg8zyh0"; + name = "use-package-el-get"; + }; + packageRequires = [ use-package ]; + meta = { + homepage = "https://melpa.org/#/use-package-el-get"; + license = lib.licenses.free; + }; + }) {}; + usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "usql"; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "nickbarnwell"; + repo = "usql.el"; + rev = "bfaf428b366a9a185eef84f0d645a98dc918fe3d"; + sha256 = "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql"; + sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84"; + name = "usql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/usql"; + license = lib.licenses.free; + }; + }) {}; utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "599fa4ff640d731927415a44679e5b07d9553acd"; - sha256 = "030wmzi51hya4180m411afy8i2vkq63r630cms3apdqd2bkjjjqs"; + rev = "1b4bd052c6513d38f6cc626c24665637d25fdc07"; + sha256 = "05pv6nj88im1jf9nngv56z362wrp9pmkzrjn3nm846rdzbc5f21j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -36574,7 +38236,7 @@ owner = "iankelling"; repo = "visible-mark"; rev = "c1852e13b6b61982738b56977a452ec9026faf1b"; - sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv"; + sha256 = "1rsi9irv9i03627cmfaqz03f9cvpm7555ga8n2gs622lzp6bb3jf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark"; @@ -36653,12 +38315,12 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43"; - sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng"; + rev = "a01e9ed416cd81ccddebebbf05d4ca80060b07dc"; + sha256 = "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -36926,12 +38588,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "15"; + version = "16"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "aef2a32f6e5e2fdb7f38a650b009a737c67959e2"; - sha256 = "14x91pngh9i7r66inssc4jaqvzv2kb3bnbks5x2bhsidvls7s28r"; + rev = "3ff506aae50a47b277f2b95ff7b7a7c596664e6a"; + sha256 = "17dw6a8d0p304f2sa4f9zwd8r48w2wbkc3fvbmxwlg4w12h7cwf0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -36989,12 +38651,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "aed3e00b6332a068d53ce482f5139a95c3dcd245"; - sha256 = "1p4sgn0rh8a5f0f6f1njq329zwgs6yp8j3zqs0yfz4kaikw1xw10"; + rev = "2da60b8857d107721b089346121a7d51296a58bf"; + sha256 = "1r945qz7z5z80qvzlqvz985mz51zy3pj3fk36y0flc380y4ap6hd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -37007,22 +38669,22 @@ license = lib.licenses.free; }; }) {}; - websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "websocket"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "a9b8e74fa190024cd450ef4f832482e8438674fa"; - sha256 = "0yi6g7wmjsgv0dmpyf8cpin0icw3ymb7vbr3f9s01xs2w6kp8p13"; + rev = "7d2adf218743c52578c8e8fd5584a5e54732e256"; + sha256 = "0k8n710ip4av51n6l9ap1254qkifj987a6k86pgj3y6bw76ry08f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg"; name = "websocket"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/websocket"; license = lib.licenses.free; @@ -37178,12 +38840,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031"; - sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88"; + rev = "7559a79e95aada65601f7413a1c3f08bfa34557b"; + sha256 = "1l9m04hypk8j5qkg7rlhsknj9hx5l3zjy97s3kv7wbcwvcx3yxhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -37475,8 +39137,8 @@ version = "0.9.8"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "e80659fcc896"; - sha256 = "01cmwv6xafk19gg6ixgiw9szmhmqk19i2jha5yafaa93pwgnc40v"; + rev = "d04938232934"; + sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -37513,12 +39175,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.7.0"; + version = "2.7.2"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "99d3278b1c79718de16dd4f57dcc8c4aa31a4051"; - sha256 = "1mcfinr1wv87hqn2787dcyn7lkgfni4xfgsji50pwj3zfgg0yqyr"; + rev = "ff3e96929d4532e33422a5980a6e3ca9f2fcf032"; + sha256 = "1fhn2wd0wszbnfpvnjmlw8gxqzy8f4q7dg7r16jpa1cmk0fpcdi0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -37996,12 +39658,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "ed3d0f4ccb2b28ff034192c50f244a97197d3911"; - sha256 = "0djh18lm3xn9h4fa5ra0jrlzdzwhvhcalipj73j5gmmfaif4ya9q"; + rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c"; + sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -38101,12 +39763,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "0.9.4"; + version = "0.9.8"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "bcf698acbdb4df91f587942348739b407a8b0807"; - sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs"; + rev = "340aec635e359609b22f7e94df15af1af2b070f6"; + sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -38140,6 +39802,27 @@ license = lib.licenses.free; }; }) {}; + yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yapfify"; + version = "0.0.6"; + src = fetchFromGitHub { + owner = "JorisE"; + repo = "yapfify"; + rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f"; + sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; + sha256 = "0scl8lk1c5i7jp1qj5gg8zf3zyi8lkb57ijkmvcs4czzlyv3y9bm"; + name = "yapfify"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yapfify"; + license = lib.licenses.free; + }; + }) {}; yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yard-mode"; @@ -38224,22 +39907,22 @@ license = lib.licenses.free; }; }) {}; - yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yatemplate"; - version = "2.0"; + version = "3.0"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "90c14d2e2b8247eeba464a52560af484f8542558"; - sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is"; + rev = "c1de31d2b16d98af197a4392b6481346ab4e8d57"; + sha256 = "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q"; name = "yatemplate"; }; - packageRequires = [ yasnippet ]; + packageRequires = [ emacs yasnippet ]; meta = { homepage = "https://melpa.org/#/yatemplate"; license = lib.licenses.free; @@ -38249,13 +39932,13 @@ pname = "yatex"; version = "1.80"; src = fetchhg { - url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "16763e5b7481"; - sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; + url = "https://www.yatex.org/hgrepos/yatex"; + rev = "af4601ee3c6a"; + sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; - sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; + sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0"; name = "yatex"; }; packageRequires = []; @@ -38597,7 +40280,7 @@ owner = "egh"; repo = "zotxt-emacs"; rev = "43c0c6d23b31126bac6b14bb85608180fd9c866f"; - sha256 = "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp"; + sha256 = "1hz1m4190yi6knz3y088ql8wy3pmsl8lsznqby2vpnn9p74fvl37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 03121edada0a1ddceefabab31b175b600e3bc5ea..33473ecad3f02b68f3eb5120c908aebbe82193ba 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -38,6 +38,9 @@ self: # upstream issue: mismatched filename ack-menu = markBroken super.ack-menu; + # Expects bash to be at /bin/bash + ac-rtags = markBroken super.ac-rtags; + airline-themes = super.airline-themes.override { inherit (self.melpaPackages) powerline; }; @@ -45,10 +48,16 @@ self: # upstream issue: missing file header bufshow = markBroken super.bufshow; + # part of a larger package + caml = dontConfigure super.caml; + # part of a larger package # upstream issue: missing package version cmake-mode = markBroken (dontConfigure super.cmake-mode); + # Expects bash to be at /bin/bash + company-rtags = markBroken super.company-rtags; + # upstream issue: missing file header connection = markBroken super.connection; @@ -65,19 +74,30 @@ self: # upstream issue: missing file header elmine = markBroken super.elmine; + # upstream issue: missing dependency redshank + emr = markBroken super.emr; + ess-R-data-view = super.ess-R-data-view.override { inherit (self.melpaPackages) ess ctable popup; }; - ess-R-object-popup = super.ess-R-object-popup.override { - inherit (self.melpaPackages) ess popup; - }; + # upstream issue: doesn't build + eterm-256color = markBroken super.eterm-256color; + + # upstream issue: missing dependency highlight + evil-search-highlight-persist = markBroken super.evil-search-highlight-persist; + + # upstream issue: missing dependency highlight + floobits = markBroken super.floobits; # missing OCaml flycheck-ocaml = markBroken super.flycheck-ocaml; - # upstream issue: missing file header - fold-dwim = markBroken super.fold-dwim; + # Expects bash to be at /bin/bash + flycheck-rtags = markBroken super.flycheck-rtags; + + # upstream issue: missing dependency + fold-dwim-org = markBroken super.fold-dwim-org; # build timeout graphene = markBroken super.graphene; @@ -85,12 +105,21 @@ self: # upstream issue: mismatched filename helm-lobsters = markBroken super.helm-lobsters; + # Expects bash to be at /bin/bash + helm-rtags = markBroken super.helm-rtags; + # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; # upstream issue: missing file header initsplit = markBroken super.initsplit; + # upstream issue: recipe fails + insert-shebang = markBroken super.insert-shebang; + + # Expects bash to be at /bin/bash + ivy-rtags = markBroken super.ivy-rtags; + # upstream issue: missing file header jsfmt = markBroken super.jsfmt; @@ -119,6 +148,9 @@ self: # missing OCaml ocp-indent = markBroken super.ocp-indent; + # upstream issue: missing file header + po-mode = markBroken super.po-mode; + # upstream issue: truncated file powershell = markBroken super.powershell; @@ -134,6 +166,9 @@ self: # upstream issue: missing file header stgit = markBroken super.stgit; + # upstream issue: missing file header + tawny-mode = markBroken super.tawny-mode; + # upstream issue: missing file header textmate = markBroken super.textmate; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index a5624490b96ed457fddfea4c1220bfb036f2f42b..c0223e17a567ea53c038710dbf560fc6d1c63de0 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 = "20171113"; + version = "20180416"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20171113.tar"; - sha256 = "0lip21hxq912ya2cgfls3c4clks9knsf2cma9dabbdkiz9jmw1xq"; + url = "https://orgmode.org/elpa/org-20180416.tar"; + sha256 = "05rbkrs93zd9kvldwvypb8fwwaysajy5n7b2k9c8xm2cx2nayv8m"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20171113"; + version = "20180416"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20171113.tar"; - sha256 = "1yy24rgdfvs99rj0zi74djb7l4wmj3w1i6m6j8z6xkqnhixwg5w7"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180416.tar"; + sha256 = "1f5zdfsa1fcf66hk3w57wh5385069yg0b86h57jgkcbmxkcmj6ij"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index 1cdcb9b85544661118fd3a63f47d4d3dc1c8094a..de72b24f87acbd2068ac309a643246d48d5bb7b4 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (rec { name = "ProofGeneral-unstable-${version}"; - version = "2017-11-06"; + version = "2018-01-30"; src = fetchFromGitHub { owner = "ProofGeneral"; repo = "PG"; - rev = "2eab72c33751768c8a6cde36b978ea4a36b91843"; - sha256 = "1l3n48d6d4l5q3wkhdyp8dc6hzdw1ckdzr57dj8rdm78j87vh2cg"; + rev = "945cada601c5729edd16fcc989a3969c8b34d20a"; + sha256 = "1zjmbhq6c8g8b93nnsvr5pxx6mlcndb0fz152b2h80vfh9663cn8"; }; buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index af3298a5883ea3abdb800c0fd7d021358c0689df..ba243629cc3e320bfd506d53d5f45056483037ad 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, gsettings_desktop_schemas ? null -, withXwidgets ? false, webkitgtk24x-gtk3 ? 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 }: @@ -36,9 +36,19 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = - [ ./clean-env.patch ] - ++ lib.optional stdenv.isDarwin ./at-fdcwd.patch; + patches = [ + ./clean-env.patch + ] ++ lib.optionals stdenv.isDarwin [ + ./at-fdcwd.patch + + # Backport of the fix to + # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html + # Should be removed when switching to Emacs 26.1 + (fetchurl { + url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch"; + sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj"; + }) + ]; nativeBuildInputs = [ pkgconfig ] ++ lib.optionals srcRepo [ autoconf automake texinfo ] @@ -51,9 +61,9 @@ stdenv.mkDerivation rec { [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] ++ lib.optional (withX && withGTK2) gtk2 - ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ] + ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 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/site-start.el b/pkgs/applications/editors/emacs/site-start.el index b41ca92db086b808683f855a42265afb0733aef1..cc1ab1d0e3039af1dc72207dd9a64c479dca2fef 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -1,18 +1,39 @@ -;;; NixOS specific load-path -(setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (or (getenv "NIX_PROFILES") "")))) - load-path)) +(defun nix--profile-paths () + "Returns a list of all paths in the NIX_PROFILES environment +variable, ordered from more-specific (the user profile) to the +least specific (the system profile)" + (reverse (split-string (or (getenv "NIX_PROFILES") "")))) + +;;; Extend `load-path' to search for elisp files in subdirectories of +;;; all folders in `NIX_PROFILES'. Also search for one level of +;;; subdirectories in these directories to handle multi-file libraries +;;; like `mu4e'.' +(require 'seq) +(let* ((subdirectory-sites (lambda (site-lisp) + (when (file-exists-p site-lisp) + (seq-filter (lambda (f) (file-directory-p (file-truename f))) + ;; Returns all files in `site-lisp', excluding `.' and `..' + (directory-files site-lisp 'full "^\\([^.]\\|\\.[^.]\\|\\.\\..\\)"))))) + (paths (apply #'append + (mapcar (lambda (profile-dir) + (let ((site-lisp (concat profile-dir "/share/emacs/site-lisp/"))) + (cons site-lisp (funcall subdirectory-sites site-lisp)))) + (nix--profile-paths))))) + (setq load-path (append paths load-path))) + ;;; Make `woman' find the man pages (eval-after-load 'woman '(setq woman-manpath - (append (reverse (mapcar (lambda (x) (concat x "/share/man/")) - (split-string (or (getenv "NIX_PROFILES") "")))) + (append (mapcar (lambda (x) (concat x "/share/man/")) + (nix--profile-paths)) woman-manpath))) ;;; Make tramp work for remote NixOS machines (eval-after-load 'tramp + ;; TODO: We should also add the other `NIX_PROFILES' to this path. + ;; However, these are user-specific, so we would need to discover + ;; them dynamically after connecting via `tramp' '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) ;;; C source directory @@ -22,9 +43,9 @@ ;;; from: /nix/store/-emacs-/share/emacs/site-lisp/site-start.el ;;; to: /nix/store/-emacs-/share/emacs//src/ (let ((emacs - (file-name-directory ;; .../emacs/ - (directory-file-name ;; .../emacs/site-lisp - (file-name-directory load-file-name)))) ;; .../emacs/site-lisp/ + (file-name-directory ; .../emacs/ + (directory-file-name ; .../emacs/site-lisp + (file-name-directory load-file-name)))) ; .../emacs/site-lisp/ (version (file-name-as-directory (concat diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 10816e0a283fef44bb2c51e120905c54d7d8a045..b01532ae2881361fde813a3eb94d95f32a019fd1 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.6.7"; + version = "1.6.12"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "10rqzinr6yd6ca06rklg34kdc08a3xgygfzmprsfg7gdsybfay5z"; + sha256 = "0vcr9dhfsdls2x493klv7w5kn08iqqfg2jwjcbz274mcnd07bpqj"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Simple, distraction-free writing environment"; license = licenses.gpl3Plus; maintainers = with maintainers; [ madjar ]; - platforms = platforms.all; + platforms = platforms.linux; homepage = https://gottcode.org/focuswriter/; }; } diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 5ff5c0845d00c5bb3de8d6a9d6ddf89c4baa91da..bedc299ee6732b3e7c6be471a0bdaebc768e892c 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: +{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl }: with stdenv.lib; let - version = "1.32"; + version = "1.33"; in stdenv.mkDerivation rec { @@ -11,12 +11,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "8b7be10b95d0614eb07f845ba2280f7c026eacd5739d8fac4d5d26606f8c3c2d"; + sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2"; }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool libintl ]; buildInputs = [ gtk2 which file ]; doCheck = true; @@ -50,7 +48,7 @@ stdenv.mkDerivation rec { - Simple project management - Plugin interface ''; - homepage = http://www.geany.org/; + homepage = https://www.geany.org/; license = "GPL"; maintainers = []; platforms = platforms.all; diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7a0399ea0f845d98d31661333323810fe8d2be76 --- /dev/null +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, qmake, pkgconfig, qtwebkit, hunspell }: + +stdenv.mkDerivation rec { + pname = "ghostwriter"; + version = "1.6.2"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "wereturtle"; + repo = pname; + rev = "v${version}"; + sha256 = "0251563zy0q69fzfacvalpx43y15cshb0bhshyd4w37061gh1c12"; + }; + + nativeBuildInputs = [ qmake pkgconfig ]; + + buildInputs = [ qtwebkit hunspell ]; + + meta = with stdenv.lib; { + description = "A cross-platform, aesthetic, distraction-free Markdown editor"; + homepage = src.meta.homepage; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index 5c0f2ee18e1f73c15eca2de8ef6e737b42105246..22cc4d47e680705308e918d4b5f72a945427e232 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ncurses }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, ncurses }: stdenv.mkDerivation rec { name = "hexcurse-${version}"; @@ -11,6 +11,18 @@ stdenv.mkDerivation rec { sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk"; }; buildInputs = [ ncurses ]; + patches = [ + # gcc7 compat + (fetchpatch { + url = https://github.com/LonnyGomes/hexcurse/commit/d808cb7067d1df067f8b707fabbfaf9f8931484c.patch; + sha256 = "0h8345blmc401c6bivf0imn4cwii67264yrzxg821r46wrnfvyi2"; + }) + # gcc7 compat + (fetchpatch { + url = https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch; + sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix"; + }) + ]; meta = with lib; { description = "ncurses-based console hexeditor written in C"; diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 112eebfaf6f61f48c3e5dfaf318155f8bb9c7940..63864bc581df892f4c0a198d2a0c16cc373fdff3 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + patches = [ ./gcc7.patch ]; + meta = with lib; { description = "File editor/viewer/analyzer for executables"; homepage = http://hte.sourceforge.net; diff --git a/pkgs/applications/editors/ht/gcc7.patch b/pkgs/applications/editors/ht/gcc7.patch new file mode 100644 index 0000000000000000000000000000000000000000..a90deaac698dd38ad06fb87fc0f0de406fb4df61 --- /dev/null +++ b/pkgs/applications/editors/ht/gcc7.patch @@ -0,0 +1,11 @@ +--- ht-2.1.0.org/htapp.cc 2014-09-14 16:55:26.000000000 +0100 ++++ ht-2.1.0/htapp.cc 2018-03-10 12:48:07.158533800 +0000 +@@ -3023,7 +3023,7 @@ + { + uint a = 2; + uint b = u/a; +- while (abs(a - b) > 1) { ++ while (abs((int)(a - b)) > 1) { + a = (a+b)/2; + b = u/a; + } diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index a7ac367f048acc9b72dc9065377ddde9a3252d6e..7715de153981d9ad241fa0fec77e8f6151ebcc3d 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip -, coreutils, gnugrep, which, git, python, unzip }: +, coreutils, gnugrep, which, git, python, unzip, libsecret +}: { name, product, version, src, wmClass, jdk, meta } @ attrs: @@ -65,7 +66,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { --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 + stdenv.cc.cc.lib libsecret ]}" \ --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 746da7534e681fb5b45f9eff9ed6d4288dba7fd4..84ba32c41256ff78b72e52158f6745e78d47663b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf , coreutils, gnugrep, which, git, python, unzip, p7zip -, androidsdk, jdk, cmake, libxml2, zlib, python2, ncurses +, androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses }: assert stdenv.isLinux; @@ -41,11 +41,19 @@ let patchelf --set-interpreter $interp \ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \ bin/lldb/bin/lldb-server - patchelf --set-interpreter $interp \ + + for i in LLDBFrontend lldb lldb-argdumper; do + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ + "bin/lldb/bin/$i" + done + + patchelf \ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ - bin/lldb/LLDBFrontend + bin/lldb/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so + patchelf \ - --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python2 ]}:$lldbLibPath" \ + --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \ bin/lldb/lib/liblldb.so patchelf --set-interpreter $interp bin/gdb/bin/gdb @@ -77,15 +85,15 @@ let }; }); - buildGogland = { name, version, src, license, description, wmClass, update-channel }: + buildGoland = { name, version, src, license, description, wmClass, update-channel }: lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; - product = "Gogland"; + product = "Goland"; 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 + Goland 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 @@ -96,9 +104,9 @@ let }) (attrs: { postFixup = (attrs.postFixup or "") + '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv - chmod +x $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv ''; }); @@ -203,7 +211,7 @@ let }); buildWebStorm = { name, version, src, license, description, wmClass, update-channel }: - (mkJetBrainsProduct { + lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; meta = with stdenv.lib; { @@ -217,8 +225,13 @@ let maintainers = with maintainers; [ abaldeau ]; platforms = platforms.linux; }; + }) (attrs: { + patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' + # Webstorm tries to use bundled jre if available. + # Lets prevent this for the moment + rm -r jre64 + ''; }); - in { @@ -226,12 +239,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.2.3"; /* updated by script */ + version = "2018.1"; /* 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 = "02hyndyfcrvfbi4q8vmmj0xh2bggwc2azggm24g3m03iffa7j6fx"; /* updated by script */ + sha256 = "1mwajah0qghkw2f4hap5f35x826h8318a0bjbn9lpknffgfi0zc3"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -239,38 +252,38 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.2.2"; /* updated by script */ + version = "2017.3.7"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1l8y65fw9g5ckzwpcgigm2qwy8fhpw2hil576rphsnx6qvnh4swn"; /* updated by script */ + sha256 = "1pmkv1yd8xwqa4kdffg0vvk3whmnvrs9js7vnq4ilm39zzksqmpa"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; - update-channel = "datagrip_2017_2"; + update-channel = "datagrip_2017_3"; }; - gogland = buildGogland rec { - name = "gogland-${version}"; - version = "173.2696.28"; /* updated by script */ + goland = buildGoland rec { + name = "goland-${version}"; + version = "2018.1"; /* 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 = "07nz2pf7fnjxsvc82vihk2i880cji349czxzshr1dk50ixlydq7n"; /* updated by script */ + sha256 = "0r008q3dn30zbn9zzyjj6pz3myxrb9i1s96kinj9vy0cj7gb0aai"; /* updated by script */ }; - wmClass = "jetbrains-gogland"; - update-channel = "gogland_1.0_EAP"; + wmClass = "jetbrains-goland"; + update-channel = "goland_release"; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.2.6"; /* updated by script */ + version = "2018.1"; /* updated by script */ 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 = "150zq3wk7gsn1ibx5nkq9smfcf9n1lk347vj47yb1nwzcq0vmj2p"; /* updated by script */ + sha256 = "08dlyf2zfgcbbbnadx5x0n877diyglg9h7h39njcw4ajh4aninyq"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -278,12 +291,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.2.6"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1g0qcv14rn9kzf0yv17ca3w1ihl1274216n7niwkqwcjp5mvj030"; /* updated by script */ + sha256 = "1483w692n29v22f5vchh8fbizwn74wlznd5pvlscxs4ly9af7935"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -291,25 +304,25 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.2.4"; /* updated by script */ + version = "2017.3.6"; /* updated by script */ 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 = "0hn3x5wid2z7s2mhnxfqh2yhdkscccpbz7qgsxkjvmkxcynazrvy"; /* updated by script */ + sha256 = "00g86fggh8wfm02k9wwn33yqmbfr2b1x3vnvyn9gdpycdk46lqgw"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; - update-channel = "PS2017.2"; + update-channel = "PS2017.3"; }; pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2017.2.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "193f44s9vh5ksd7hs586h0j66lcqsh29wwxr5yhl05lq931la857"; /* updated by script */ + sha256 = "0f3chibs7lp3kgkd0ah6d7z1lf3n4scalmadpxcn0fd6bap5mnjb"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -317,12 +330,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2017.2.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0n1nps8jfk77i796yr90bvrx9j1vcdnl25sr4b5n4xznjrix4gki"; /* updated by script */ + sha256 = "0lq5bqnfxj02sbd4yaf3ma6nps7cnf0d11dzqjv9m6b41y55dp0k"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -330,38 +343,38 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2017.1.2"; /* updated by script */ + version = "2017.3.1"; /* 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/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0kphjxibrs4ss6hpxbssvs3n35xh9zzw7a1q09x79ibvvk73gwqh"; /* updated by script */ + sha256 = "0k9yc00lmk826pylfs9jyxqnlczk9vhq7bs61b8nyfam1dqbgikv"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "rider_2017_1"; + update-channel = "rider_2017_3"; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.1.5"; /* updated by script */ + version = "2017.3.3"; /* 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 */ + sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; - update-channel = "rm2017.1"; + update-channel = "rm2017.3"; }; webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.2.5"; /* updated by script */ + version = "2018.1"; /* updated by script */ 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 = "0apsfwcj8qfjwya794848h5iqfg9fay3h8bxqwclkw7lid9qwv7n"; /* updated by script */ + sha256 = "1lx852gycrzajh58k1r2wfpwwjna6y3fsd5srw5fgzw58f120vn4"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index d6c87c4991b95cb333e565c4e220c70be0517b91..b2ace8accd8a99ec6c5fff596ba6ea078b7fe0d2 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "4.4"; + version = "4.6"; name = "joe-${version}"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; - sha256 = "0y898r1xlrv75m00y598rvwwsricabplyh80wawsqafapcl4hw55"; + sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9"; }; meta = with stdenv.lib; { description = "A full featured terminal-based screen editor"; - homepage = http://joe-editor.sourceforge.net; + homepage = https://joe-editor.sourceforge.io; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 3d623d3f3bda0c0da5e637a7dd408abda735a260..c24866671f9bae326d8e035dc01c9c365e51eb96 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx, +{ 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, ctags }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { openssl libxml2 gnome3.gtksourceview - at_spi2_core + at-spi2-core pcre epoxy boost diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 067aff5ee69b4de2bf84dc00f08c9b7b82aff296..868dfaf3d12a9d54847157fce650ccad968250be 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt }: +{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt, pkgconfig }: with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-unstable-${version}"; - version = "2017-04-12"; + version = "2018-03-22"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "7482d117cc85523e840dff595134dcb9cdc62207"; - sha256 = "08j611y192n9vln9i94ldlvz3k0sg79dkmfc0b1vczrmaxhpgpfh"; + rev = "f8e297acef1be0657b779fea5256f606a6c6a3a3"; + sha256 = "14xmw3lkwzppm9bns55nmyb1lfihzhdyisf6xjqlszdj4mcf94jl"; }; - buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; postPatch = '' export PREFIX=$out diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 1a164ec08de973a39e31abe1db9616d22730e77e..41d1a6262ed594a3263b3ffc597d930f7fb84e84 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -3,7 +3,7 @@ , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons -, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info +, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info , libksysguard, konsole, llvmPackages, makeWrapper }: @@ -34,7 +34,7 @@ mkDerivation rec { kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons + kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons ]; postInstall = '' diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index 78881b21018ccb244e0cf830ac8daf7cc71aab99..88164c2c4585176986c747255a2e74d1b0e9e2e0 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { libkomparediff2 ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { maintainers = [ maintainers.ambrop72 ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index a0e941289099adb99a4d0a43b5438dba8e0c22df..b03abc2146aaab2c8bc36637e12d1bd0d4c2f1aa 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper , # Patchelf dependencies: - alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, mesa -, openssl, xlibs, xorg, zlib + alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined +, openssl, xorg, zlib }: let @@ -55,7 +55,7 @@ in $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" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGLU_combined}/lib:${openssl.out}/lib" \ $out/resources/app/extensions/krom/Krom/linux/Krom patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index b05bbd053c1fae16c7d3ce311b9a3f3c8ebc51e6..2084a047a086ae8b461426ecdcf077bb81ea7557 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -1,20 +1,29 @@ -{ stdenv, python3Packages, fetchFromGitHub, makeWrapper, makeDesktopItem }: +{ stdenv, python3, libsForQt56, fetchFromGitHub, makeWrapper, makeDesktopItem }: +let + packageOverrides = self: super: { + pyqt56 = libsForQt56.callPackage ../../../development/python-modules/pyqt/5.x.nix { + pythonPackages = self; + }; + }; + + pythonPackages = (python3.override { inherit packageOverrides; }).pkgs; +in stdenv.mkDerivation rec { name = "leo-editor-${version}"; - version = "5.5"; + version = "5.6"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr"; + sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j"; }; dontBuild = true; - nativeBuildInputs = [ makeWrapper python3Packages.python ]; - propagatedBuildInputs = with python3Packages; [ pyqt5 ]; + nativeBuildInputs = [ makeWrapper python3 ]; + propagatedBuildInputs = with pythonPackages; [ pyqt56 docutils ]; desktopItem = makeDesktopItem rec { name = "leo-editor"; @@ -50,7 +59,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/leo-editor mv * $out/share/leo-editor - makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \ + makeWrapper ${python3.interpreter} $out/bin/leo \ --set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \ --add-flags "-O $out/share/leo-editor/launchLeo.py" ''; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 74a83c1278afdf0cefb5fbab53919e4487ea08d5..c5f8278f649d9f66818a79bb2c95d3d83a853473 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem -, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index f4bdee830e199ffc79f6de19385c00878d58a292..d0367d7c3051dab8966d35a69600750d17efee32 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mg-${version}"; - version = "20170828"; + version = "20171014"; src = fetchurl { url = "http://homepage.boetes.org/software/mg/${name}.tar.gz"; - sha256 = "139nc58l5ifj3d3478nhqls0lic52skmxfxggznzxaz9camqd20z"; + sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f1c1e3dcac70bd91618b148051cf0fa905748a79 --- /dev/null +++ b/pkgs/applications/editors/micro/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "micro-${version}"; + version = "1.4.0"; + + goPackagePath = "github.com/zyedidia/micro"; + + src = fetchFromGitHub { + owner = "zyedidia"; + repo = "micro"; + rev = "v${version}"; + sha256 = "0w1rmh81h28n1jlb05k89i751h498i6p883hrsjr70hvrwq5zjpb"; + fetchSubmodules = true; + }; + + subPackages = [ "cmd/micro" ]; + + buildFlagsArray = [ "-ldflags=" "-X main.Version=${version}" ]; + + meta = with stdenv.lib; { + homepage = https://micro-editor.github.io; + description = "Modern and intuitive terminal-based text editor"; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index a1506eb9d6ccf3e0299992aa097dd79f4c4aaf72..751b78ab674ba565394bcb6d4a339c04dc8a6531 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { sha256 = "1wsfzy0iia0c89wnx1ilzw54wqcmlp2nz8mkpvc393z0zagrx48q"; }; + prePatch = '' + substituteInPlace window_vector.cc --replace \ + "insert( 0U, 1," \ + "insert( 0U, 1U," + ''; + nativeBuildInputs = [ lzip ]; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 53ea9741c03ca831b79c35ef779a08cee5adf10b..e8e529b63abcf657ae4b679fdb38a581e0ba3ffc 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, fetchNuGet -, autoconf, automake, pkgconfig, shared_mime_info, intltool +, autoconf, automake, pkgconfig, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake shared_mime_info intltool + autoconf automake shared-mime-info intltool mono gtk-sharp-2_0 gnome-sharp unzip dotnetPackages.NUnit dotnetPackages.NUnitRunners diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 0663cca53b9f4d247d3ce472372c1aa9d7f35749..9ff1c44dceb074f9eb861db7a552f396bfb1451f 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.0"; + version = "2.9.4"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "17hjgvig59a2ha2b0494bprrci3d33sayjqvxjhsnlzgr8whrlyj"; + sha256 = "0nm3zy4azr5rkxjq7jfybbj3cnddmvxc49rxyqm9cp2zfdp75y9c"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -42,6 +42,8 @@ in stdenv.mkDerivation rec { cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ ''; + enableParallelBuilding = true; + meta = { homepage = https://www.nano-editor.org/; description = "A small, user-friendly console text editor"; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index cc6e8f005e766dd995340b728c565ad1caf23517..149f7804a79911b7dfc5c8582fa9f5ba50dd2a90 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,15 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey , libtool, libuv, luaPackages, ncurses, perl, pkgconfig -, unibilium, makeWrapper, vimUtils, xsel, gperf - -, withPython ? true, pythonPackages, extraPythonPackages ? [] -, withPython3 ? true, python3Packages, extraPython3Packages ? [] +, unibilium, vimUtils, xsel, gperf, callPackage , withJemalloc ? true, jemalloc -, withRuby ? true, bundlerEnv - -, withPyGUI ? false -, vimAlias ? false -, configure ? null }: with stdenv.lib; @@ -40,54 +32,20 @@ let description = "VT220/xterm/ECMA-48 terminal emulator library"; homepage = http://www.leonerd.org.uk/code/libvterm/; license = licenses.mit; - maintainers = with maintainers; [ nckx garbas ]; + maintainers = with maintainers; [ garbas ]; platforms = platforms.unix; }; }; - rubyEnv = bundlerEnv { - name = "neovim-ruby-env"; - gemdir = ./ruby_provider; - }; - - 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 ++ 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 ++ pluginPython3Packages; - ignoreCollisions = true; - }; - python3Wrapper = ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" ''; - pythonFlags = optionalString (withPython || withPython3) ''--add-flags "${ - (optionalString withPython pythonWrapper) + - (optionalString withPython3 python3Wrapper) - }"''; - neovim = stdenv.mkDerivation rec { - name = "neovim-${version}"; - version = "0.2.1"; + name = "neovim-unwrapped-${version}"; + version = "0.2.2"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "19ppj0i59kk70j09gap6azm0jm4y95fr5fx7n9gx377y3xjs8h03"; + sha256 = "1dxr29d0hyag7snbww5s40as90412qb61rgj7gd9rps1iccl9gv4"; }; enableParallelBuilding = true; @@ -107,7 +65,6 @@ let nativeBuildInputs = [ cmake gettext - makeWrapper pkgconfig ]; @@ -128,21 +85,12 @@ let substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - echo patching $out/bin/nvim + postInstall = stdenv.lib.optionalString stdenv.isLinux '' + sed -i -e "s|'xsel|'${xsel}/bin/xsel|" $out/share/nvim/runtime/autoload/provider/clipboard.vim + '' + stdenv.lib.optionalString (withJemalloc && stdenv.isDarwin) '' install_name_tool -change libjemalloc.1.dylib \ ${jemalloc}/lib/libjemalloc.1.dylib \ $out/bin/nvim - sed -i -e "s|'xsel|'${xsel}/bin/xsel|" $out/share/nvim/runtime/autoload/provider/clipboard.vim - '' + optionalString withPython '' - ln -s ${pythonEnv}/bin/python $out/bin/nvim-python - '' + optionalString withPyGUI '' - makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \ - --prefix PATH : "$out/bin" - '' + optionalString withPython3 '' - ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3 - '' + optionalString (withPython || withPython3 || withRuby) '' - wrapProgram $out/bin/nvim ${rubyWrapper + pythonFlags} ''; meta = { @@ -167,20 +115,5 @@ let }; }; -in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation { - name = "neovim-${neovim.version}-configured"; - inherit (neovim) version meta; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin - for item in ${neovim}/bin/*; do - ln -s $item $out/bin/ - done - '' + optionalString vimAlias '' - ln -s $out/bin/nvim $out/bin/vim - '' + optionalString (configure != null) '' - wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" - ''; -} +in + neovim diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index dcb79095aa672aeb0e91fc55d6b7945e76fac17d..87b011c4f8b40c184bff1c50073cac592a2cc725 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,11 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.1.0) - neovim (0.5.1) + msgpack (1.2.2) + multi_json (1.13.1) + neovim (0.6.2) msgpack (~> 1.0) + multi_json (~> 1.0) PLATFORMS ruby diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index 9d0ecb2788ed36b729e0ec917c632a2ed3975889..aefecbf5ba83adc0be7f80e9d3003063bf86fd09 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,18 +2,26 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck7w17d6b4jbb8inh1q57bghi9cjkiaxql1d3glmj1yavbpmlh7"; + sha256 = "1ai0sfdv9jnr333fsvkn7a8vqvn0iwiw83yj603a3i68ds1x6di1"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.2"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; }; neovim = { - dependencies = ["msgpack"]; + dependencies = ["msgpack" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08xn7r4g13wl4bhvkmp4hx3x0ppvifs1x2iiqh8jl9f1jb4jhfcp"; + sha256 = "15r3j9bwlpm1ry7cp6059xb0irvsvvlmw53i28z6sf2khwfj5j53"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix new file mode 100644 index 0000000000000000000000000000000000000000..a27b5a41ac70b88bce78a43fee0e04589db3be37 --- /dev/null +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -0,0 +1,110 @@ +{ stdenv, lib, makeDesktopItem, makeWrapper +, vimUtils +, bundlerEnv, ruby +, pythonPackages +, python3Packages +}: +with stdenv.lib; + +neovim: + +let + wrapper = { + name ? "neovim" + , withPython ? true, extraPythonPackages ? [] + , withPython3 ? true, extraPython3Packages ? [] + , withRuby ? true + , withPyGUI ? false + , vimAlias ? false + , viAlias ? false + , configure ? null + }: + let + + rubyEnv = bundlerEnv { + name = "neovim-ruby-env"; + gemdir = ./ruby_provider; + postBuild = '' + ln -sf ${ruby}/bin/* $out/bin + ''; + }; + + 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 ++ pluginPythonPackages; + ignoreCollisions = true; + }; + + pluginPython3Packages = if configure == null then [] else builtins.concatLists + (map ({ python3Dependencies ? [], ...}: python3Dependencies) + (vimUtils.requiredPlugins configure)); + python3Env = python3Packages.python.buildEnv.override { + extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages ++ pluginPython3Packages; + ignoreCollisions = true; + }; + + in + stdenv.mkDerivation { + inherit name; + buildCommand = let bin="${neovim}/bin/nvim"; in '' + if [ ! -x "${bin}" ] + then + echo "cannot find executable file \`${bin}'" + exit 1 + fi + + makeWrapper "$(readlink -v --canonicalize-existing "${bin}")" \ + "$out/bin/nvim" --add-flags " \ + --cmd \"${if withPython then "let g:python_host_prog='$out/bin/nvim-python'" else "let g:loaded_python_provider = 1"}\" \ + --cmd \"${if withPython3 then "let g:python3_host_prog='$out/bin/nvim-python3'" else "let g:loaded_python3_provider = 1"}\" \ + --cmd \"${if withRuby then "let g:ruby_host_prog='$out/bin/nvim-ruby'" else "let g:loaded_ruby_provider=1"}\" " \ + --unset PYTHONPATH \ + ${optionalString withRuby '' --suffix PATH : ${rubyEnv}/bin --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' } + + '' + + optionalString (!stdenv.isDarwin) '' + # copy and patch the original neovim.desktop file + mkdir -p $out/share/applications + substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ + --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ + --replace 'Name=Neovim' 'Name=WrappedNeovim' + '' + + optionalString withPython '' + ln -s ${pythonEnv}/bin/python $out/bin/nvim-python + '' + optionalString withPython3 '' + ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3 + '' + optionalString withRuby '' + ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby + '' + + optionalString withPyGUI '' + makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \ + --prefix PATH : "$out/bin" + '' + optionalString vimAlias '' + ln -s $out/bin/nvim $out/bin/vim + '' + optionalString viAlias '' + ln -s $out/bin/nvim $out/bin/vi + '' + optionalString (configure != null) '' + wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" + '' + ; + + preferLocalBuild = true; + + buildInputs = [makeWrapper]; + passthru = { unwrapped = neovim; }; + + meta = neovim.meta // { + description = neovim.meta.description; + hydraPlatforms = []; + # prefer wrapper over the package + priority = (neovim.meta.priority or 0) - 1; + }; + }; +in + lib.makeOverridable wrapper diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index b508521790bf4f8662e3931c50986fb8a0ba14eb..0943513a4d12607ce5e9c40f6ce8f925c09b1936 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl -, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts, unzip, ant, jdk -, gnumake, makeWrapper, pandoc +{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost +, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts +, unzip, ant, jdk, gnumake, makeWrapper, pandoc }: let - version = "1.1.383"; + verMajor = "1"; + verMinor = "1"; + verPatch = "442"; + version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "1.5"; gwtVer = "2.7.0"; in @@ -15,50 +18,34 @@ stdenv.mkDerivation rec { buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ]; - src = fetchurl { - url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; - sha256 = "06680l9amq03b4jarmzfr605bijhb79fip9rk464zab6hgwqbp3f"; + src = fetchFromGitHub { + owner = "rstudio"; + repo = "rstudio"; + rev = "v${version}"; + sha256 = "0drqh2brfs9w8dfh4r7j3fsqdsg63s6pvj2bbg5xwwc0yf220ahs"; }; # Hack RStudio to only use the input R. - patches = [ - ./r-location.patch - (fetchpatch { - url = https://aur.archlinux.org/cgit/aur.git/plain/socketproxy-openssl.patch?h=rstudio-desktop-git; - sha256 = "0ywq9rk14s5961l6hvd3cw70jsm73r16h0bsh4yp52vams7cwy9d"; - }) - ]; + patches = [ ./r-location.patch ]; postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; - inherit ginVer; ginSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm"; }; - inherit gwtVer; gwtSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; sha256 = "1cs78z9a1jg698j2n35wsy07cy4fxcia9gi00x0r0qc3fcdhcrda"; }; - hunspellDictionaries = builtins.attrValues hunspellDicts; + hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts); mathJaxSrc = fetchurl { 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"; @@ -71,29 +58,31 @@ stdenv.mkDerivation rec { preConfigure = '' + export RSTUDIO_VERSION_MAJOR=${verMajor} + export RSTUDIO_VERSION_MINOR=${verMinor} + export RSTUDIO_VERSION_PATCH=${verPatch} + GWT_LIB_DIR=src/gwt/lib - mkdir -p $GWT_LIB_DIR/gin/$ginVer - unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer + mkdir -p $GWT_LIB_DIR/gin/${ginVer} + unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer} - unzip $gwtSrc + unzip ${gwtSrc} mkdir -p $GWT_LIB_DIR/gwt - mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer + mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer} mkdir dependencies/common/dictionaries - for dict in $hunspellDictionaries; do - for i in "$dict/share/hunspell/"* - do ln -sv $i dependencies/common/dictionaries/ - done + for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do + for i in "$dict/share/hunspell/"*; do + ln -sv $i dependencies/common/dictionaries/ + done done - unzip $mathJaxSrc -d dependencies/common/mathjax-26 - unzip $rmarkdownSrc -d dependencies/common/rmarkdown - unzip $rsconnectSrc -d dependencies/common/rsconnect + unzip ${mathJaxSrc} -d dependencies/common/mathjax-26 mkdir -p dependencies/common/libclang/3.5 - unzip $rstudiolibclang -d 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 + unzip ${rstudiolibclangheaders} -d dependencies/common/libclang/builtin-headers mkdir -p dependencies/common/pandoc cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ @@ -124,7 +113,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of integrated tools for the R language"; - homepage = http://www.rstudio.com/; + homepage = https://www.rstudio.com/; license = licenses.agpl3; maintainers = with maintainers; [ ehmry changlinli ciil ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 0c716ed63c14ac21084d41cd9e87949d512af171..a6f454deaf5c737ccfc3addf76456be9c07ebdef 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.7"; + version = "0.9.9"; src = fetchFromGitHub { - sha256 = "17m2f7pj2sx5rxrbry6wk1lvviy8fi2m270h47sisywnrhddarh7"; + sha256 = "01pvc7k54mx5c7h1qiw92d4j459psv7n9xg94qbinf8vmpvkrcbw"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/2/default.nix similarity index 100% rename from pkgs/applications/editors/sublime/default.nix rename to pkgs/applications/editors/sublime/2/default.nix diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix new file mode 100644 index 0000000000000000000000000000000000000000..7185a82a9601d0efdaed52a2c567a5c07d85fc05 --- /dev/null +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -0,0 +1,119 @@ +{buildVersion, x32sha256, x64sha256}: + +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, + pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, + gksuSupport ? false, gksu, unzip, zip, bash}: + +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +assert gksuSupport -> gksu != null; + +let + + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango]; + redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] + ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; +in let + archSha256 = + if stdenv.system == "i686-linux" then + x32sha256 + else + x64sha256; + + arch = + if stdenv.system == "i686-linux" then + "x32" + else + "x64"; + + # package with just the binaries + sublime = stdenv.mkDerivation { + name = "sublimetext3-${buildVersion}-bin"; + src = + fetchurl { + name = "sublimetext-${buildVersion}.tar.bz2"; + url = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2"; + sha256 = archSha256; + }; + + dontStrip = true; + dontPatchELF = true; + buildInputs = [ makeWrapper zip unzip ]; + + # 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 -q ../Packages/Default.sublime-package + substituteInPlace "exec.py" --replace \ + "[\"/bin/bash\"" \ + "[\"$out/sublime_bash\"" + zip -q ../Packages/Default.sublime-package **/* + ) + rm -r Default.sublime-package-fix + ''; + + buildPhase = '' + for i in sublime_text plugin_host crash_reporter; do + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + $i + done + + # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary. + sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_text + ''; + + installPhase = '' + # Correct sublime_text.desktop to exec `sublime' instead of /opt/sublime_text + sed -e "s,/opt/sublime_text/sublime_text,$out/sublime_text," -i sublime_text.desktop + + 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} + + # Without this, plugin_host crashes, even though it has the rpath + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + ''; + }; +in stdenv.mkDerivation (rec { + name = "sublimetext3-${buildVersion}"; + + phases = [ "installPhase" ]; + + inherit sublime; + + installPhase = '' + mkdir -p $out/bin + + cat > $out/bin/subl <<-EOF + #!/bin/sh + exec $sublime/sublime_text "\$@" + EOF + chmod +x $out/bin/subl + + ln $out/bin/subl $out/bin/sublime + ln $out/bin/subl $out/bin/sublime3 + mkdir -p $out/share/applications + ln -s $sublime/sublime_text.desktop $out/share/applications/sublime_text.desktop + ln -s $sublime/Icon/256x256/ $out/share/icons + ''; + + meta = with stdenv.lib; { + description = "Sophisticated text editor for code, markup and prose"; + homepage = https://www.sublimetext.com/; + maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ]; + license = licenses.unfree; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix new file mode 100644 index 0000000000000000000000000000000000000000..01445ade4732165327526de62a7b5810492100c9 --- /dev/null +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -0,0 +1,18 @@ +{ callPackage }: + +let + common = opts: callPackage (import ./common.nix opts); +in + rec { + sublime3-dev = common { + buildVersion = "3162"; + x32sha256 = "190il02hqvv64w17w7xc1fz2wkbhk5a5y96jb25dvafmslm46d4i"; + x64sha256 = "1nsjhjs6zajhx7m3dk7i450krg6pb03zffm1n3m1v0xb9zr37xz3"; + } {}; + + sublime3 = common { + buildVersion = "3143"; + x32sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; + x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; + } {}; + } diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix deleted file mode 100644 index 9c8a75320a617ec5202504de6c8632e9fd508762..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/sublime3/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, - pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, - gksuSupport ? false, gksu, unzip, zip, bash }: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -assert gksuSupport -> gksu != null; - -let - build = "3143"; - libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango]; - redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] - ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; -in let - # package with just the binaries - sublime = stdenv.mkDerivation { - name = "sublimetext3-${build}-bin"; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - name = "sublimetext-${build}.tar.bz2"; - url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; - } - else - fetchurl { - name = "sublimetext-${build}.tar.bz2"; - url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; - }; - - dontStrip = true; - dontPatchELF = true; - buildInputs = [ makeWrapper zip unzip ]; - - # 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 -q ../Packages/Default.sublime-package - substituteInPlace "exec.py" --replace \ - "[\"/bin/bash\"" \ - "[\"$out/sublime_bash\"" - zip -q ../Packages/Default.sublime-package **/* - ) - rm -r Default.sublime-package-fix - ''; - - buildPhase = '' - for i in sublime_text plugin_host crash_reporter; do - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ - $i - done - - # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary. - sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_text - ''; - - installPhase = '' - # Correct sublime_text.desktop to exec `sublime' instead of /opt/sublime_text - sed -e "s,/opt/sublime_text/sublime_text,$out/sublime_text," -i sublime_text.desktop - - 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} - - # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so - ''; - }; -in stdenv.mkDerivation { - name = "sublimetext3-${build}"; - - phases = [ "installPhase" ]; - - inherit sublime; - - installPhase = '' - mkdir -p $out/bin - - cat > $out/bin/subl <<-EOF - #!/bin/sh - exec $sublime/sublime_text "\$@" - EOF - chmod +x $out/bin/subl - - ln $out/bin/subl $out/bin/sublime - ln $out/bin/subl $out/bin/sublime3 - mkdir -p $out/share/applications - ln -s $sublime/sublime_text.desktop $out/share/applications/sublime_text.desktop - ln -s $sublime/Icon/256x256/ $out/share/icons - ''; - - meta = with stdenv.lib; { - description = "Sophisticated text editor for code, markup and prose"; - homepage = https://www.sublimetext.com/; - maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ]; - license = licenses.unfree; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix new file mode 100644 index 0000000000000000000000000000000000000000..ec2498aa69b9aa2e43108f683c04339879d4390d --- /dev/null +++ b/pkgs/applications/editors/texmacs/common.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: +rec { + extraFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; + sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7"; + }; + + fullFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz"; + sha256 = "1yxzjpqpm7kvx0ly5jmfpzlfhsh41b0ibn1v84qv6xy73r2vis2f"; + }; + + chineseFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-chinese-fonts.tar.gz"; + sha256 = "0yprqjsx5mfsaxr525mcm3xqwcadzxp14njm38ir1325baada2fp"; + }; + + japaneseFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-japanese-fonts.tar.gz"; + sha256 = "1dn6zvsa7gk59d61xicwpbapab3rm6kz48rp5w1bhmihxixw21jn"; + }; + + koreanFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-korean-fonts.tar.gz"; + sha256 = "07axg57mqm3jbnm4lawx0h3r2h56xv9acwzjppryfklw4c27f5hh"; + }; + + postPatch = (if tex == null then '' + gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -) + '' else if extraFonts then '' + gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -) + '' else "") + + (if chineseFonts then '' + gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -) + '' else "") + + (if japaneseFonts then '' + gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -) + '' else "") + + (if koreanFonts then '' + gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -) + '' else ""); + + + meta = { + description = "WYSIWYW editing platform with special features for scientists"; + longDescription = + '' GNU TeXmacs is a free wysiwyw (what you see is what you want) + editing platform with special features for scientists. The software + aims to provide a unified and user friendly framework for editing + structured documents with different types of content (text, + graphics, mathematics, interactive content, etc.). The rendering + engine uses high-quality typesetting algorithms so as to produce + professionally looking documents, which can either be printed out or + presented from a laptop. + + The software includes a text editor with support for mathematical + formulas, a small technical picture editor and a tool for making + presentations from a laptop. Moreover, TeXmacs can be used as an + interface for many external systems for computer algebra, numerical + analysis, statistics, etc. New presentation styles can be written + by the user and new features can be added to the editor using the + Scheme extension language. A native spreadsheet and tools for + collaborative authoring are planned for later. + ''; + homepage = http://texmacs.org/; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix new file mode 100644 index 0000000000000000000000000000000000000000..e319ccf39b1b1639c1627ef5168b71ff61795fb5 --- /dev/null +++ b/pkgs/applications/editors/texmacs/darwin.nix @@ -0,0 +1,59 @@ +{ stdenv, callPackage, fetchurl, makeWrapper, + guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript, + tex ? null, + aspell ? null, + netpbm ? null, + imagemagick ? null, + extraFonts ? false, + chineseFonts ? false, + japaneseFonts ? false, + koreanFonts ? false }: +let + version = "1.99.4"; + common = callPackage ./common.nix { + inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; + }; +in +stdenv.mkDerivation { + name = "TeXmacs-${version}"; + + src= fetchurl { + url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; + sha256 = "1z8sj0xd1ncbl7ipzfsib6lmc7ahgvmiw61ln5zxm2l88jf7qc1a"; + }; + + patches = [ ./darwin.patch ]; + + buildInputs = [ guile_1_8.dev qt4 freetype CoreFoundation Cocoa gettext libiconv ghostscript ]; + + GUILE_CPPFLAGS="-D_THREAD_SAFE -I${guile_1_8.dev}/include -I${guile_1_8.dev}/include/guile "; + + NIX_LDFLAGS="${zlib}/lib/libz.dylib"; + + buildPhase = '' + substituteInPlace Makefile \ + --replace 'find -d $(MACOS_PACKAGE_TEXMACS)' 'find $(MACOS_PACKAGE_TEXMACS) -depth' \ + --replace '$(MACOS_PACKAGE_SRC)/bundle-libs.sh' 'true' + make MACOS_BUNDLE + ''; + + installPhase = '' + mkdir -p $out/Applications + cp -R ../distr/TeXmacs-${version}.app $out/Applications + ''; + + inherit (common) postPatch; + + postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " + + "${ghostscript}/bin:" + + (if aspell == null then "" else "${aspell}/bin:") + + (if tex == null then "" else "${tex}/bin:") + + (if netpbm == null then "" else "${netpbm}/bin:") + + (if imagemagick == null then "" else "${imagemagick}/bin:"); + + enableParallelBuilding = true; + + meta = common.meta // { + platforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/applications/editors/texmacs/darwin.patch b/pkgs/applications/editors/texmacs/darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..2cb33fbbef3003ab29890996862844694490aa67 --- /dev/null +++ b/pkgs/applications/editors/texmacs/darwin.patch @@ -0,0 +1,29 @@ +--- a/configure ++++ b/configure +@@ -7461,7 +7461,7 @@ $as_echo "final adjustments for cygwin host" >&6; } + CONFIG_QTPIPES="yes" + CONFIG_CXXFLAGS="-I${prefix}/include" + CONFIG_BSHARED="" +- CONFIG_BFLAGS="-framework Cocoa -framework IOKit" ++ CONFIG_BFLAGS="-framework Cocoa -framework IOKit -framework CoreFoundation" + CONFIG_BPATH="" + CONFIG_SO="dylib" + CONFIG_LIB_PATH="DYLD_LIBRARY_PATH" +@@ -8281,6 +8281,7 @@ _ASEOF + if $QMAKE ${additional_qmake_flags} ; then :; else + as_fn_error $? "Calling $QMAKE failed." "$LINENO" 5 + fi ++ echo "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10" >> $pro_file + # Try to compile a simple Qt app. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a simple Qt app" >&5 + $as_echo_n "checking whether we can build a simple Qt app... " >&6; } +--- a/src/Plugins/Unix/unix_sys_utils.cpp ++++ b/src/Plugins/Unix/unix_sys_utils.cpp +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + // for thread safe strings + #include diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index e51813459c6f5b08780737cb14cd7a85f74480f3..447e729d4f9b5e5667db87414ed213c44f0c336b 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -1,41 +1,21 @@ -{stdenv, fetchurl, guile_1_8, qt4, zlib, xmodmap, which, makeWrapper, freetype, - tex ? null, - aspell ? null, - ghostscriptX ? null, - extraFonts ? false, - chineseFonts ? false, - japaneseFonts ? false, - koreanFonts ? false }: - -let +{ stdenv, callPackage, + fetchurl, guile_1_8, qt4, zlib, xmodmap, which, makeWrapper, freetype, + tex ? null, + aspell ? null, + ghostscriptX ? null, + extraFonts ? false, + chineseFonts ? false, + japaneseFonts ? false, + koreanFonts ? false }: + +let pname = "TeXmacs"; version = "1.99.2"; - extraFontsSrc = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; - sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7"; - }; - - fullFontsSrc = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz"; - sha256 = "1yxzjpqpm7kvx0ly5jmfpzlfhsh41b0ibn1v84qv6xy73r2vis2f"; - }; - - chineseFontsSrc = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-chinese-fonts.tar.gz"; - sha256 = "0yprqjsx5mfsaxr525mcm3xqwcadzxp14njm38ir1325baada2fp"; - }; - - japaneseFontsSrc = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-japanese-fonts.tar.gz"; - sha256 = "1dn6zvsa7gk59d61xicwpbapab3rm6kz48rp5w1bhmihxixw21jn"; - }; - - koreanFontsSrc = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-korean-fonts.tar.gz"; - sha256 = "07axg57mqm3jbnm4lawx0h3r2h56xv9acwzjppryfklw4c27f5hh"; + common = callPackage ./common.nix { + inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { @@ -45,56 +25,21 @@ stdenv.mkDerivation rec { buildInputs = [ guile_1_8 qt4 makeWrapper ghostscriptX freetype ]; - patchPhase = (if tex == null then '' - gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -) - '' else if extraFonts then '' - gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if chineseFonts then '' - gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if japaneseFonts then '' - gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if koreanFonts then '' - gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -) - '' else ""); - postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " + (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") + (if aspell == null then "" else "${aspell}/bin:") + (if tex == null then "" else "${tex}/bin:") + "${xmodmap}/bin:${which}/bin"; + inherit (common) postPatch; + postFixup = '' bin="$out/libexec/TeXmacs/bin/texmacs.bin" rpath=$(patchelf --print-rpath "$bin") patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin" ''; - meta = { - description = "WYSIWYW editing platform with special features for scientists"; - longDescription = - '' GNU TeXmacs is a free wysiwyw (what you see is what you want) - editing platform with special features for scientists. The software - aims to provide a unified and user friendly framework for editing - structured documents with different types of content (text, - graphics, mathematics, interactive content, etc.). The rendering - engine uses high-quality typesetting algorithms so as to produce - professionally looking documents, which can either be printed out or - presented from a laptop. - - The software includes a text editor with support for mathematical - formulas, a small technical picture editor and a tool for making - presentations from a laptop. Moreover, TeXmacs can be used as an - interface for many external systems for computer algebra, numerical - analysis, statistics, etc. New presentation styles can be written - by the user and new features can be added to the editor using the - Scheme extension language. A native spreadsheet and tools for - collaborative authoring are planned for later. - ''; - homepage = http://texmacs.org/; - license = stdenv.lib.licenses.gpl2Plus; + meta = common.meta // { maintainers = [ stdenv.lib.maintainers.roconnor ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 76c8e4ae0e44365b65650a05631e3e51ff0ee55f..c5f691e95c2470055f062464c3f7fdb9c3487308 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,23 +1,26 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig, poppler }: +{ stdenv, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }: stdenv.mkDerivation rec { pname = "texmaker"; - version = "4.5"; + version = "5.0.2"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${name}.tar.bz2"; - sha256 = "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c"; + sha256 = "0y81mjm89b99pr9svcwpaf4iz2q9pc9hjas5kiwd1pbgl5vqskm9"; }; - buildInputs = [ qt4 poppler_qt4 zlib ]; - nativeBuildInputs = [ pkgconfig poppler qmake4Hook ]; + buildInputs = [ qtbase qtscript poppler zlib ]; + nativeBuildInputs = [ pkgconfig poppler qmake ]; NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; preConfigure = '' - qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps" + qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps METAINFODIR=$out/share/metainfo" ''; + + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "TeX and LaTeX editor"; longDescription='' diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 52223dafeb7f18eccc58e5e3ab28398f0ba814ab..938f3817479669077697f60d3703881501f57d8d 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig}: +{ stdenv, fetchFromGitHub, qt5, poppler_qt5, zlib, pkgconfig}: stdenv.mkDerivation rec { pname = "texstudio"; - version = "2.12.4"; + version = "2.12.8"; name = "${pname}-${version}"; - altname="Texstudio"; - src = fetchurl { - url = "mirror://sourceforge/texstudio/${name}.tar.gz"; - sha256 = "03917faqyy0a1k6b86blc2fcards5a1819ydgkc4jlhwiaym4iyw"; + src = fetchFromGitHub { + owner = "${pname}-org"; + repo = pname; + rev = version; + sha256 = "0f1az7398rnxmm3m9b2jcz7pd9x445fjsv8w85k2j261n5cyfqx2"; }; - nativeBuildInputs = [ qmake4Hook pkgconfig ]; - buildInputs = [ qt4 poppler_qt4 zlib ]; + nativeBuildInputs = [ qt5.qmake pkgconfig ]; + buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://texstudio.sourceforge.net; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ cfouche ]; }; } diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index d1c0ab274f061d006bb108d0f189979c70ee9914..8444ff6eaecc42934f2f95bd134b235ca449e194 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake , python, qtbase, qttools, zlib }: -let -# qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "1.0.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "1j8307h7xkxqwr8rpr9fn1svm5h10k61w6zxr4sgph1hiv8x33aa"; + sha256 = "0ln8lis9g23wp3w70xwbkzqmmbkd02cdx6z7msw9lrpkjzkj7mlr"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -26,7 +24,7 @@ in stdenv.mkDerivation rec { bsd2 # libtiled and tmxviewer gpl2Plus # all the rest ]; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux; - maintainers = [ maintainers.nckx ]; }; } diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index b20a6e5ec45ce6c42318196dea69e935c9b32471..7c6d186b88302fd070059933e5f7244a30394fbb 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.38"; + version = "0.9.44"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "bf6a069c5da4a7dc289bdb3c8d27e7a81daeaee99488d4d3b512c6b673780557"; + sha256 = "9442c090bf2619d270890228abd7dabb9e217c0b200615f8ed3cb255efd122d5"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "edd092e96ebf69503cf6b39b77a61ec5e3185f8a1447da0bed063fa11861c1b9"; + sha256 = "ae228ca946d03940b85df30c995c4de3f942a780e32d4dcab872dec671c66ef3"; } ; diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix index 273ef33250fc0e496a3cd926da28841d6c10d4d7..98f45f6be02d2b56e80a5648d450ef026c1f00e8 100644 --- a/pkgs/applications/editors/vanubi/default.nix +++ b/pkgs/applications/editors/vanubi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, vala_0_26, which, autoconf, automake +{ stdenv, fetchurl, pkgconfig, vala_0_28, which, autoconf, automake , libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_26 which autoconf automake + buildInputs = [ vala_0_28 which autoconf automake libtool glib gtk3 libwnck3 asciidoc gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index becb5ccc29a188a2644100f8b793f96fa6018390..8d3a5353c9891057ba8aaa4d6cbc4928818ad3eb 100644 --- a/pkgs/applications/editors/vbindiff/default.nix +++ b/pkgs/applications/editors/vbindiff/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "vbindiff-${version}"; - version = "3.0_beta4"; + version = "3.0_beta5"; buildInputs = [ ncurses ]; src = fetchurl { - url = "http://www.cjmweb.net/vbindiff/${name}.tar.gz"; - sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx"; + url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz"; + sha256 = "1f1kj4jki08bnrwpzi663mjfkrx4wnfpzdfwd2qgijlkx5ysjkgh"; }; meta = { description = "A terminal visual binary diff viewer"; - homepage = http://www.cjmweb.net/vbindiff/; + homepage = https://www.cjmweb.net/vbindiff/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 417f2d805163d600c4a6365a274f29869bae0b07..5b4f631987f2519678119f634e6d3ea610361c8d 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.0.1257"; + version = "8.0.1655"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1y4c7wn5gr7n4c2ni36kadr26aldydxlf06yj7nsmw22ywwg78ig"; + sha256 = "1c6raqjaxgsjazn4l7wqg2cscd5i4bz9m2g2xhn9ba1injs7mps1"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 2f110749277cc43a04f0eea36b53079885365647..067179974b1ea59e7fff6985cb81ada95c2ed365 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { "vim_cv_toupper_broken=no" "--with-tlib=ncurses" "vim_cv_terminfo=yes" + "vim_cv_tgetent=zero" # it does on native anyway "vim_cv_tty_group=tty" "vim_cv_tty_mode=0660" "vim_cv_getcwd_broken=no" diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 144fb5428a51ed4a012a133a9a964158bbf828d1..b6c03a57b561cdc6b886ec2816fcb955141eb62c 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + broken = true; # needs ruby 2.2 description = "Vim - the text editor - for macOS"; homepage = https://github.com/b4winckler/macvim; license = licenses.vim; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index eef1746ff380b39750f9b9b62fd3c8edac755970..7825188fea9bc9be0bd40f48617f2c21c000ac8a 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vis-${version}"; - version = "0.3"; + version = "0.5"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk"; + sha256 = "1vhq6hprkgj90iwl5vl3pxs3xwc01mx8yhi6c1phzry5agqqp8jb"; repo = "vis"; owner = "martanne"; }; @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { libselinux ]; + postPatch = '' + patchShebangs ./configure + ''; + LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;"; LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua"; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 66ff8b5a91c81d7a821870f38490fd0609ca2d4f..5c10f6fb3bbca059ddf961673de3c9605fa85dcb 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.18.0"; + version = "1.22.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0xwfnw15792lxr5npc71yyw5yyaqi3nifqgv6vpi8ibl6c8zs97d"; - "x86_64-linux" = "0qzj2qrzbdk27mggh0f9fs3s99bffvnrnbsparbzdag5jjmry2py"; - "x86_64-darwin" = "1g5rf6g9q9hh4gzg6nb37pyq9dpjj0wapivv5dsvmn0j3cp69cv4"; + "i686-linux" = "17iqqg6vdccbl1k4k2ks3kkgg7619j6qdvca4k27pjfqm17mvw5n"; + "x86_64-linux" = "1ng2jhhaghsf7a2dmrimazh817jh0ag88whija179ywgrg3i6xam"; + "x86_64-darwin" = "083hizigzxm45hcy6yqwznj9ibqdaxg2xv8rsyas4ig9x55irrcj"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; @@ -79,7 +79,7 @@ in patchelf \ --set-rpath "${rpath}" \ - $out/lib/vscode/resources/app/node_modules/keytar/build/Release/keytar.node + $out/lib/vscode/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0 ''; diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode/with-extensions.nix similarity index 100% rename from pkgs/applications/editors/vscode-with-extensions/default.nix rename to pkgs/applications/editors/vscode/with-extensions.nix diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index ad294480e60b7707cfaefd31f529dba3f9294c2b..85d9b0546d62587925265bc56e247b3ff4af4f4c 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,25 +1,35 @@ -{ stdenv, fetchurl, wxGTK, autoconf, automake, libtool, python, gettext, bash }: +{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext, bash }: stdenv.mkDerivation rec { name = "wxHexEditor-${version}"; - version = "v0.22"; + version = "v0.24"; - src = fetchurl { - url = "mirror://sourceforge/wxhexeditor/${name}-src.tar.bz2"; - sha256 = "15ir038g4lyw1q5bsay974hvj0nkg2yd9kccwxz808cd45fp411w"; + src = fetchFromGitHub { + repo = "wxHexEditor"; + owner = "EUA"; + rev = version; + sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; buildInputs = [ wxGTK autoconf automake libtool python gettext ]; - patchPhase = '' - substituteInPlace Makefile --replace "/usr/local" "$out" + preConfigure = "patchShebangs ."; + + prePatch = '' + substituteInPlace Makefile --replace "/usr" "$out" substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out" - substituteInPlace udis86/autogen.sh --replace "/bin/bash" "${bash}/bin/bash" ''; + patches = [ + # https://github.com/EUA/wxHexEditor/issues/90 + (fetchpatch { + url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch; + sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj"; + }) + ]; + buildPhase = '' make OPTFLAGS="-fopenmp" - ''; meta = { diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix deleted file mode 100644 index bcf262957bc5216e97784ab041ff9139722f342c..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/zed/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv, buildEnv, fetchgit, makeWrapper, writeScript, fetchurl, zip, pkgs -, node_webkit }: - -let - name = "zed-${version}"; - version = "1.1.0"; - - nodePackages = import ./node.nix { - inherit pkgs; - system = stdenv.system; - }; - - node_env = buildEnv { - name = "node_env"; - paths = [ nodePackages."body-parser-~1.6.3" nodePackages."express-~4.8.3" - nodePackages."request-~2.34.0" nodePackages."tar-~0.1.19" - nodePackages."ws-~0.4.32" ]; - pathsToLink = [ "/lib" ]; - ignoreCollisions = true; - }; - - zed = stdenv.mkDerivation rec { - inherit name version; - - src = fetchgit { - url = "git://github.com/zedapp/zed"; - rev = "refs/tags/v${version}"; - sha256 = "1zvlngv73h968jd2m42ylr9vfhf35n80wzy616cv2ic7gmr1fl9p"; - }; - - buildInputs = [ makeWrapper zip ]; - - dontBuild = true; - - installPhase = '' - export NWPATH="${node_webkit}/share/node-webkit"; - - mkdir -p $out/zed - - cd ${src}/app; zip -r $out/zed/app.nw *; cd .. - - cat $NWPATH/nw $out/zed/app.nw > $out/zed/zed-bin - cp $NWPATH/nw.pak $out/zed/ - cp nw/zed-linux $out/zed/zed - chmod +x $out/zed/zed* - cp Zed.desktop.tmpl Zed.svg Zed.png $out/zed - rm $out/zed/app.nw - ''; - - postFixup = '' - wrapProgram $out/zed/zed-bin \ - --prefix NODE_PATH : ${node_env}/lib/node_modules - ''; - }; - - zed_script = writeScript "zed.sh" '' - if [[ $1 == http://* ]] || [[ $1 == https://* ]]; then - PROJECT=$1 - elif [ "" != "$1" ]; then - PROJECT=$(readlink -f $1) - fi - ${zed}/zed/zed-bin $PROJECT - ''; - -in stdenv.mkDerivation rec { - inherit name version; - - src = zed; - - installPhase = '' - mkdir -p $out/bin - ln -s ${zed_script} $out/bin/zed - ''; - - meta = with stdenv.lib; { - description = "A fully offline-capable, open source, keyboard-focused, text and code editor for power users"; - license = licenses.mit; - homepage = http://zedapp.org/; - maintainers = with maintainers; [ matejc ma27 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/editors/zed/deps.json b/pkgs/applications/editors/zed/deps.json deleted file mode 100644 index d3a7708d156f3cc432f400c7506f840bb1da9d8d..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/zed/deps.json +++ /dev/null @@ -1,6 +0,0 @@ -[ { "body-parser": "~1.6.3" } -, { "express": "~4.8.3" } -, { "request": "~2.34.0" } -, { "tar": "~0.1.19" } -, { "ws": "~0.4.32" } -] diff --git a/pkgs/applications/editors/zed/deps.sh b/pkgs/applications/editors/zed/deps.sh deleted file mode 100755 index 6d2bf29532e9dfa19074e62ab05cd6e8869f70f3..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/zed/deps.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix - -node2nix -6 -i deps.json \ - -e ../../../development/node-packages/node-env.nix \ - --no-copy-node-env \ - -c node.nix diff --git a/pkgs/applications/editors/zed/node-packages.nix b/pkgs/applications/editors/zed/node-packages.nix deleted file mode 100644 index 5aaa75b6c914898f0cd049b0dce9cf7a3a4e527e..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/zed/node-packages.nix +++ /dev/null @@ -1,877 +0,0 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = { - "bytes-1.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; - sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; - }; - }; - "depd-0.4.4" = { - name = "depd"; - packageName = "depd"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz"; - sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662"; - }; - }; - "iconv-lite-0.4.4" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"; - sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8"; - }; - }; - "media-typer-0.2.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz"; - sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984"; - }; - }; - "on-finished-2.1.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"; - sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d"; - }; - }; - "qs-2.2.2" = { - name = "qs"; - packageName = "qs"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz"; - sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c"; - }; - }; - "raw-body-1.3.0" = { - name = "raw-body"; - packageName = "raw-body"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"; - sha1 = "978230a156a5548f42eef14de22d0f4f610083d1"; - }; - }; - "type-is-1.3.2" = { - name = "type-is"; - packageName = "type-is"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz"; - sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb"; - }; - }; - "ee-first-1.0.5" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"; - sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0"; - }; - }; - "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"; - }; - }; - "accepts-1.0.7" = { - name = "accepts"; - packageName = "accepts"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz"; - sha1 = "5b501fb4f0704309964ccdb048172541208dab1a"; - }; - }; - "buffer-crc32-0.2.3" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"; - sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921"; - }; - }; - "debug-1.0.4" = { - name = "debug"; - packageName = "debug"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; - sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; - }; - }; - "escape-html-1.0.1" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; - sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; - }; - }; - "finalhandler-0.1.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz"; - sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa"; - }; - }; - "methods-1.1.0" = { - name = "methods"; - packageName = "methods"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz"; - sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f"; - }; - }; - "parseurl-1.3.2" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; - sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; - }; - }; - "path-to-regexp-0.1.3" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; - sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; - }; - }; - "proxy-addr-1.0.1" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; - sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; - }; - }; - "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"; - }; - }; - "send-0.8.5" = { - name = "send"; - packageName = "send"; - version = "0.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.8.5.tgz"; - sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7"; - }; - }; - "serve-static-1.5.4" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz"; - sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782"; - }; - }; - "vary-0.1.0" = { - name = "vary"; - packageName = "vary"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz"; - sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176"; - }; - }; - "cookie-0.1.2" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; - sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; - }; - }; - "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"; - }; - }; - "cookie-signature-1.0.4" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz"; - sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca"; - }; - }; - "merge-descriptors-0.0.2" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; - sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; - }; - }; - "utils-merge-1.0.0" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - }; - "negotiator-0.4.7" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; - sha1 = "a4160f7177ec806738631d0d3052325da42abdc8"; - }; - }; - "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"; - }; - }; - "ipaddr.js-0.1.2" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; - sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; - }; - }; - "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.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"; - }; - }; - "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"; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - }; - "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"; - }; - }; - "tough-cookie-2.3.3" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; - }; - }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - }; - "tunnel-agent-0.3.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; - sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; - }; - }; - "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.3.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; - }; - }; - "hawk-1.0.0" = { - name = "hawk"; - packageName = "hawk"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; - sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; - }; - }; - "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"; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - }; - "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"; - }; - }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - }; - "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"; - }; - }; - "asn1-0.1.11" = { - name = "asn1"; - packageName = "asn1"; - version = "0.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - }; - "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"; - }; - }; - "block-stream-0.0.9" = { - name = "block-stream"; - packageName = "block-stream"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; - sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; - }; - }; - "fstream-0.1.31" = { - name = "fstream"; - packageName = "fstream"; - version = "0.1.31"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; - sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "graceful-fs-3.0.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "3.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz"; - sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "rimraf-2.6.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; - }; - }; - "natives-1.1.0" = { - name = "natives"; - packageName = "natives"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz"; - sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "glob-7.1.2" = { - name = "glob"; - packageName = "glob"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "brace-expansion-1.1.8" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; - }; - }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "commander-2.1.0" = { - name = "commander"; - packageName = "commander"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; - sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; - }; - }; - "nan-1.0.0" = { - name = "nan"; - packageName = "nan"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; - sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; - }; - }; - "tinycolor-0.0.1" = { - name = "tinycolor"; - packageName = "tinycolor"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; - sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; - }; - }; - "options-0.0.6" = { - name = "options"; - packageName = "options"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; - }; - }; - }; -in -{ - "body-parser-~1.6.3" = nodeEnv.buildNodePackage { - name = "body-parser"; - packageName = "body-parser"; - version = "1.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz"; - sha1 = "82306becadf44543e826b3907eae93f0237c4e5c"; - }; - dependencies = [ - sources."bytes-1.0.0" - sources."depd-0.4.4" - sources."iconv-lite-0.4.4" - sources."media-typer-0.2.0" - sources."on-finished-2.1.0" - sources."qs-2.2.2" - sources."raw-body-1.3.0" - sources."type-is-1.3.2" - sources."ee-first-1.0.5" - sources."mime-types-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js body parsing middleware"; - homepage = https://github.com/expressjs/body-parser; - license = "MIT"; - }; - production = true; - }; - "express-~4.8.3" = nodeEnv.buildNodePackage { - name = "express"; - packageName = "express"; - version = "4.8.8"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.8.8.tgz"; - sha1 = "6aba348ccdfa87608040b12ca0010107a0aac28e"; - }; - dependencies = [ - sources."accepts-1.0.7" - sources."buffer-crc32-0.2.3" - sources."debug-1.0.4" - sources."depd-0.4.4" - sources."escape-html-1.0.1" - sources."finalhandler-0.1.0" - sources."media-typer-0.2.0" - sources."methods-1.1.0" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.3" - sources."proxy-addr-1.0.1" - sources."qs-2.2.2" - sources."range-parser-1.0.0" - sources."send-0.8.5" - sources."serve-static-1.5.4" - sources."type-is-1.3.2" - sources."vary-0.1.0" - sources."cookie-0.1.2" - sources."fresh-0.2.2" - sources."cookie-signature-1.0.4" - sources."merge-descriptors-0.0.2" - sources."utils-merge-1.0.0" - sources."mime-types-1.0.2" - sources."negotiator-0.4.7" - sources."ms-0.6.2" - sources."ipaddr.js-0.1.2" - sources."destroy-1.0.3" - sources."mime-1.2.11" - sources."on-finished-2.1.0" - sources."ee-first-1.0.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fast, unopinionated, minimalist web framework"; - homepage = http://expressjs.com/; - license = "MIT"; - }; - production = true; - }; - "request-~2.34.0" = nodeEnv.buildNodePackage { - name = "request"; - packageName = "request"; - version = "2.34.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.34.0.tgz"; - sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; - }; - dependencies = [ - sources."qs-0.6.6" - sources."json-stringify-safe-5.0.1" - sources."forever-agent-0.5.2" - sources."node-uuid-1.4.8" - sources."mime-1.2.11" - sources."tough-cookie-2.3.3" - sources."form-data-0.1.4" - sources."tunnel-agent-0.3.0" - sources."http-signature-0.10.1" - sources."oauth-sign-0.3.0" - sources."hawk-1.0.0" - sources."aws-sign2-0.5.0" - sources."punycode-1.4.1" - sources."combined-stream-0.0.7" - sources."async-0.9.2" - sources."delayed-stream-0.0.5" - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - sources."hoek-0.9.1" - sources."boom-0.4.2" - sources."cryptiles-0.2.2" - sources."sntp-0.2.4" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Simplified HTTP request client."; - homepage = https://github.com/mikeal/request; - license = "Apache, Version 2.0"; - }; - production = true; - }; - "tar-~0.1.19" = nodeEnv.buildNodePackage { - name = "tar"; - packageName = "tar"; - version = "0.1.20"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; - sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; - }; - dependencies = [ - sources."block-stream-0.0.9" - sources."fstream-0.1.31" - sources."inherits-2.0.3" - sources."graceful-fs-3.0.11" - sources."mkdirp-0.5.1" - sources."rimraf-2.6.2" - sources."natives-1.1.0" - sources."minimist-0.0.8" - sources."glob-7.1.2" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "tar for node"; - homepage = https://github.com/isaacs/node-tar; - license = "BSD"; - }; - production = true; - }; - "ws-~0.4.32" = nodeEnv.buildNodePackage { - name = "ws"; - packageName = "ws"; - version = "0.4.32"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; - sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; - }; - dependencies = [ - sources."commander-2.1.0" - sources."nan-1.0.0" - sources."tinycolor-0.0.1" - sources."options-0.0.6" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "simple to use, blazing fast and thoroughly tested websocket client, server and console for node.js, up-to-date against RFC-6455"; - homepage = https://github.com/einaros/ws; - }; - production = true; - }; -} \ No newline at end of file diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix deleted file mode 100644 index ff0bf1eb80565698dc31daca06c665a3234f76ce..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/zed/node.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} \ No newline at end of file diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 3382bb3e56d7d8d3f0d897a96fd218c874af9e2e..b2404df8e56ee3d27cd6fc7f3d83d5f35fd66591 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages +, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS }: stdenv.mkDerivation { - name = "grass-7.0.2"; + name = "grass-7.2.2"; src = fetchurl { - url = http://grass.osgeo.org/grass70/source/grass-7.0.2.tar.gz; - sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf"; + url = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz; + sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ] + readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas + libLAS ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); + # On Darwin the installer tries to symlink the help files into a system + # directory + patches = [ ./no_symbolic_links.patch ]; + configureFlags = [ "--with-proj-share=${proj}/share/proj" "--without-opengl" @@ -22,12 +27,19 @@ stdenv.mkDerivation { "--with-wxwidgets" "--with-netcdf" "--with-geos" - "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/" + "--with-postgres" + "--with-postgres-libs=${postgresql.lib}/lib/" # it complains about missing libmysqld but doesn't really seem to need it - "--with-mysql" "--with-mysql-includes=${stdenv.lib.getDev mysql.client}/include/mysql" + "--with-mysql" + "--with-mysql-includes=${mysql.connector-c}/include/mysql" + "--with-mysql-libs=${mysql.connector-c}/lib/mysql" "--with-blas" + "--with-liblas=${libLAS}/bin/liblas-config" ]; + # Otherwise a very confusing "Can't load GDAL library" error + makeFlags = stdenv.lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; + /* Ensures that the python script run at build time are actually executable; * otherwise, patchShebangs ignores them. */ postConfigure = '' @@ -40,17 +52,20 @@ stdenv.mkDerivation { scripts/r.pack/r.pack.py \ scripts/r.tileset/r.tileset.py \ scripts/r.unpack/r.unpack.py \ - scripts/v.krige/v.krige.py \ scripts/v.rast.stats/v.rast.stats.py \ scripts/v.to.lines/v.to.lines.py \ scripts/v.what.strds/v.what.strds.py \ scripts/v.unpack/v.unpack.py \ scripts/wxpyimgview/*.py \ gui/wxpython/animation/g.gui.animation.py \ + gui/wxpython/datacatalog/g.gui.datacatalog.py \ gui/wxpython/rlisetup/g.gui.rlisetup.py \ gui/wxpython/vdigit/g.gui.vdigit.py \ temporal/t.rast.accumulate/t.rast.accumulate.py \ temporal/t.rast.accdetect/t.rast.accdetect.py \ + temporal/t.rast.algebra/t.rast.algebra.py \ + temporal/t.rast3d.algebra/t.rast3d.algebra.py \ + temporal/t.vect.algebra/t.vect.algebra.py \ temporal/t.select/t.select.py for d in gui lib scripts temporal tools; do patchShebangs $d @@ -58,11 +73,12 @@ stdenv.mkDerivation { ''; postInstall = '' - wrapProgram $out/bin/grass70 \ + wrapProgram $out/bin/grass72 \ --set PYTHONPATH $PYTHONPATH \ --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass-*/lib $out/lib + ln -s $out/grass-*/include $out/include ''; enableParallelBuilding = true; @@ -72,6 +88,6 @@ stdenv.mkDerivation { description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; - broken = true; + maintainers = with stdenv.lib.maintainers; [mpickering]; }; } diff --git a/pkgs/applications/gis/grass/no_symbolic_links.patch b/pkgs/applications/gis/grass/no_symbolic_links.patch new file mode 100644 index 0000000000000000000000000000000000000000..ef09b97b70371a8978e807fd5580ae1af9c32165 --- /dev/null +++ b/pkgs/applications/gis/grass/no_symbolic_links.patch @@ -0,0 +1,37 @@ +diff --git a/include/Make/Install.make b/include/Make/Install.make +index 0aba138..8ba74bc 100644 +--- a/include/Make/Install.make ++++ b/include/Make/Install.make +@@ -116,11 +116,6 @@ real-install: | $(INST_DIR) $(UNIX_BIN) + -$(INSTALL) config.status $(INST_DIR)/config.status + -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null + +-ifneq ($(findstring darwin,$(ARCH)),) +- @# enable OSX Help Viewer +- @/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR) +-endif +- + $(INST_DIR) $(UNIX_BIN): + $(MAKE_DIR_CMD) $@ + +diff --git a/macosx/app/build_html_user_index.sh b/macosx/app/build_html_user_index.sh +index 04e63eb..c9d9c2c 100755 +--- a/macosx/app/build_html_user_index.sh ++++ b/macosx/app/build_html_user_index.sh +@@ -140,7 +140,6 @@ else + # echo "$BASENAME $SHORTDESC" >> $FULLINDEX + # make them local to user to simplify page links + echo "$BASENAME $SHORTDESC" >> $FULLINDEX +- ln -sf "$HTMLDIRG/$i" global_$i + done + done + fi +@@ -183,8 +182,3 @@ echo " + " > $i.html + done + +-# add Help Viewer links in user docs folder +- +-mkdir -p $HOME/Library/Documentation/Help/ +-ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER-addon +-ln -sfh $GISBASE/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7b79cd062a8c1514e265c0fadb0cd3a58904348d --- /dev/null +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchFromGitHub, gdal, cmake, ninja, proj, clipper, zlib, qtbase, qttools + , qtlocation, qtsensors, doxygen, cups, makeWrapper, qtimageformats +}: + +stdenv.mkDerivation rec { + name = "OpenOrienteering-Mapper-${version}"; + version = "0.8.1.2"; + + buildInputs = [ gdal qtbase qttools qtlocation qtimageformats + qtsensors clipper zlib proj doxygen cups]; + + nativeBuildInputs = [ cmake makeWrapper ninja ]; + + src = fetchFromGitHub { + owner = "OpenOrienteering"; + repo = "mapper"; + rev = "v${version}"; + sha256 = "0f7zxzl2n46qy86k6n3f6a7l1nhba58i28l8ngp3drf74qffaa33"; + }; + + cmakeFlags = + [ + # Required by the build to be specified + "-DPROJ4_ROOT=${proj}" + + # Building the manual and bundling licenses fails + "-DLICENSING_PROVIDER:BOOL=OFF" + "-DMapper_MANUAL_QTHELP:BOOL=OFF" + ] ++ + (stdenv.lib.optionals stdenv.isDarwin + [ + # Usually enabled on Darwin + "-DCMAKE_FIND_FRAMEWORK=never" + # FindGDAL is broken and always finds /Library/Framework unless this is + # specified + "-DGDAL_INCLUDE_DIR=${gdal}/include" + "-DGDAL_CONFIG=${gdal}/bin/gdal-config" + "-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib" + # Don't bundle libraries + "-DMapper_PACKAGE_PROJ=0" + "-DMapper_PACKAGE_QT=0" + "-DMapper_PACKAGE_ASSISTANT=0" + "-DMapper_PACKAGE_GDAL=0" + ]); + + + postInstall = + stdenv.lib.optionalString stdenv.isDarwin '' + # Fixes "This application failed to start because it could not find or load the Qt + # platform plugin "cocoa"." + wrapProgram $out/Mapper.app/Contents/MacOS/Mapper \ + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms \ + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtimageformats}/${qtbase.qtPluginPrefix} + mkdir -p $out/bin + ln -s $out/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper + ''; + + meta = with stdenv.lib; { + description = '' + OpenOrienteering Mapper is an orienteering mapmaking program + and provides a free alternative to the existing proprietary solution. + ''; + homepage = https://www.openorienteering.org/apps/mapper/; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [mpickering]; + }; +} diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index a008835f59fff35f1aef8ff089a4fca2b0050521..896387b1f7f4c7cf18d577ea4800447ee3d80ce2 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,21 +1,30 @@ { 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 +, qjson, qca2, txt2tags, openssl, darwin, pkgconfig +, withGrass ? true, grass, IOKit, ApplicationServices }: stdenv.mkDerivation rec { - name = "qgis-2.18.13"; + name = "qgis-2.18.17"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla - fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ + fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig ] + ++ + (stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]) + ++ (stdenv.lib.optional withGrass grass) ++ + (stdenv.lib.optional (stdenv.isDarwin && withGrass) darwin.apple_sdk.libs.utmp) ++ (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]); - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + # `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`: # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory - #enableParallelBuilding = true; + enableParallelBuilding = false; + + preConfigure = '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libspatialindex)" + ''; # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. @@ -25,22 +34,49 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "033l3wg3l7hv4642wmsdycjca1dw8p89sk9xyc51wpb3id17vgv2"; + sha256 = "1nxwl5lwibbiz9v3qaw3px7iyxg113zr4j8d99yj07mhk2ap082y"; }; - cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system + # installed frameworks + # QGIS_MACAPP_BUNDLE=0 stops the installer copying the Qt binaries into the + # installation which causes havoc + # Building RelWithDebInfo allows QGIS_DEBUG to print debugging information + cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}" + ++ stdenv.lib.optional stdenv.isDarwin + (["-DCMAKE_FIND_FRAMEWORK=never"] + ++ ["-DQGIS_MACAPP_BUNDLE=0"]); +# ++ ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"]; - postInstall = '' - wrapProgram $out/bin/qgis \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} - ''; + + + postInstall = + (stdenv.lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/qgis \ + --set PYTHONPATH $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} + '') + + (stdenv.lib.optionalString stdenv.isDarwin '' + # Necessary for QGIS to find the correct default GRASS path + # Plugins look for gdal tools like deminfo on the PATH + ${stdenv.lib.optionalString withGrass "ln -sf ${grass} $out/QGIS.app/Contents/MacOS/grass"} + for file in $(find $out -type f -name "QGIS"); do + wrapProgram "$file" \ + --prefix DYLD_LIBRARY_PATH : "${qwt}/lib" \ + --prefix DYLD_LIBRARY_PATH : "${qscintilla}/lib" \ + --prefix PATH : "${gdal}/bin" \ + ${stdenv.lib.optionalString withGrass "--prefix PATH : ${grass}/bin"} \ + --set PYTHONPATH $PYTHONPATH + done + mkdir -p $out/bin + ln -s $out/QGIS.app/Contents/MacOS/QGIS $out/bin/qgis + ''); meta = { description = "User friendly Open Source Geographic Information System"; homepage = http://www.qgis.org; license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [viric mpickering]; }; } diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 4d229450a4a72e7b0c29439e84ec3f4dba47be52..a0f2e007555e31523aa09d53f1c04f30aa4b077e 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -2,15 +2,15 @@ libharu, opencv, vigra, postgresql }: stdenv.mkDerivation rec { - name = "saga-5.0.0"; + name = "saga-6.3.0"; buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ]; enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/project/saga-gis/SAGA%20-%205/SAGA%20-%205.0.0/saga-5.0.0.tar.gz"; - sha256 = "9be997209737e80262d9f13fd9b9797194a9f2facb10e5b9bd756d8cda675089"; + url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.3.0/saga-6.3.0.tar.gz"; + sha256 = "0hyjim8fcp3mna1hig22nnn4ki3j6b7096am2amcs99sdr09jjxv"; }; meta = { diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 973e7f88e800972ca743a5247ca59dd33a159b68..410c74ac6cfa874155f7c7e10da42f84485cfee0 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-9"; - sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w"; + version = "7.0.7-27"; + sha256 = "04v7m1s2a89xi57fpxbq30hzxqg3fawr3lms6wfmaq4j2ax0qw6k"; patches = []; }; in @@ -24,13 +24,10 @@ stdenv.mkDerivation rec { name = "imagemagick-${version}"; inherit (cfg) version; - src = fetchurl { - urls = [ - "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" - # the original source above removes tarballs quickly - "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" - "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz" - ]; + src = fetchFromGitHub { + owner = "ImageMagick"; + repo = "ImageMagick"; + rev = cfg.version; inherit (cfg) sha256; }; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 507912ee43eae462c3bb5c55ce4c58071e12c477..4bbc34bb7bb68dc6daaaab2801a040ba0b0271e2 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-21"; - sha256 = "0241g3c207rawn61bz8rc5gz55k5mi2b0n3zlwa0jv9xczlkd6a9"; + version = "6.9.9-34"; + sha256 = "0sqrgyfi7i7x1akna95c1qhk9sxxswzm3pkssfi4w6v7bn24g25g"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. @@ -36,13 +36,10 @@ stdenv.mkDerivation rec { name = "imagemagick-${version}"; inherit (cfg) version; - src = fetchurl { - urls = [ - "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" - # the original source above removes tarballs quickly - "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" - "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz" - ]; + src = fetchFromGitHub { + owner = "ImageMagick"; + repo = "ImageMagick6"; + rev = cfg.version; inherit (cfg) sha256; }; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 2d42a479999ba65a10d53952dcfe70bbdadd2864..5fb7e0078065d9d8937799e3258052952ca5d714 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,31 +1,41 @@ -{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, - gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip, - librsvg, gst_all_1, autoreconfHook, makeWrapper }: +{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, + gtkmm2, glibmm, libxml2, libsecret, curl, libzip, + librsvg, gst_all_1, autoreconfHook, makeWrapper, + useUnrar ? false, unrar +}: + +assert useUnrar -> unrar != null; stdenv.mkDerivation rec { name = "ahoviewer-${version}"; - version = "1.4.9"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ahodesuka"; repo = "ahoviewer"; rev = version; - sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx"; + sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig"; }; - enableParallelBuilding = true; - + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 - libsecret curl unrar libzip librsvg - gst_all_1.gstreamer - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav - gst_all_1.gst-plugins-base ]; - + buildInputs = [ + glibmm libconfig gtkmm2 glibmm libxml2 + libsecret curl libzip librsvg + gst_all_1.gstreamer + gst_all_1.gst-plugins-good + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + ] ++ stdenv.lib.optional useUnrar unrar; + + # https://github.com/ahodesuka/ahoviewer/issues/60 + # Already fixed in the master branch + # TODO: remove this next release + makeFlags = [ ''LIBS=-lssl -lcrypto'' ]; + postPatch = ''patchShebangs version.sh''; - + postInstall = '' wrapProgram $out/bin/ahoviewer \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ @@ -37,7 +47,9 @@ stdenv.mkDerivation rec { description = "A GTK2 image viewer, manga reader, and booru browser"; maintainers = with maintainers; [ skrzyp xzfc ]; license = licenses.mit; - platforms = platforms.allBut [ "darwin" "cygwin" ]; + # Unintentionally not working on Darwin: + # https://github.com/ahodesuka/ahoviewer/issues/62 + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index b7d9f4a81599fbc4162a239646e6e63e683eaaba..334a5a33dadf8382802b3a66ad66c8406e974f7b 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, libpng, python3, boost, mesa, qtbase, ncurses, cmake, flex, lemon }: +{ stdenv, fetchFromGitHub, libpng, python3, boost, libGLU_combined, qtbase, ncurses, cmake, flex, lemon }: let - gitRev = "e8480c718e8c49ae3cc2d7af10ea93ea4c2fff9a"; + gitRev = "020910c25614a3752383511ede5a1f5551a8bd39"; gitBranch = "master"; - gitTag = "0.9.2"; -in + gitTag = "0.9.3"; +in stdenv.mkDerivation rec { name = "antimony-${version}"; version = gitTag; @@ -13,7 +13,7 @@ in owner = "mkeeter"; repo = "antimony"; rev = gitTag; - sha256 = "0fpgy5cb4knz2z9q078206k8wzxfs8b9g76mf4bz1ic77931ykjz"; + sha256 = "1vm5h5py8l3b8h4pbmm8s3wlxvlw492xfwnlwx0nvl0cjs8ba6r4"; }; patches = [ ./paths-fix.patch ]; @@ -24,7 +24,7 @@ in buildInputs = [ libpng python3 (boost.override { python = python3; }) - mesa qtbase ncurses + libGLU_combined qtbase ncurses ]; nativeBuildInputs = [ cmake flex lemon ]; diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index 990fee8cc37c94f85036264c2abff1a1da2a1ca5..f51777bdbf7343ed3d13e775ea7881be4bed9867 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchgit, cmake, ninja, boost, libpng, glfw3, epoxy, guile, pkgconfig -, mesa, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext +, libGLU_combined, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext , libXinerama, libXxf86vm, libXcursor, libXfixes }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake ninja boost libpng glfw3 epoxy guile mesa libX11 + cmake ninja boost libpng glfw3 epoxy guile libGLU_combined libX11 libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm libXcursor libXfixes ]; @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; # Some parts can be extracted and used under LGPL2+ maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 9b1dd4c25aeb576c71e779ec5798df19fcb20cb1..459e07f9838b3c4344c183a5bb2c0f6caa38251f 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index f190b421b0566588832d991c2f1ece550dc07e71..f7a813f360612979f9a5deb00ccadde382b05ab4 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -15,6 +15,7 @@ let name = "qtnproperty"; inherit src; sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; + patches = [ ./qtnproperty-parallel-building.patch ]; buildInputs = [ qtscript qtbase qtdeclarative ]; nativeBuildInputs = [ qmake flex bison ]; postInstall = '' @@ -46,6 +47,10 @@ in stdenv.mkDerivation rec { --run "cd $d" ''; + # $ cd Sources; qmake; make ../workdir/linux-g++-dgb-gl4/obj/glwidget.o + # fatal error: properties/ImageProperties.peg.h: No such file or directory + enableParallelBuilding = false; + meta = { homepage = https://github.com/kmkolasinski/AwesomeBump; description = "A program to generate normal, height, specular or ambient occlusion textures from a single image"; diff --git a/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch b/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch new file mode 100644 index 0000000000000000000000000000000000000000..b3f8e68dd1adf25ac15725aaab164585dcdb3a6f --- /dev/null +++ b/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch @@ -0,0 +1,9 @@ +--- a/PEG/Flex.pri ++++ b/PEG/Flex.pri +@@ -1,5 +1,6 @@ + flex.name = Flex ${QMAKE_FILE_IN} + flex.input = FLEX_SOURCES ++flex.depends = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp + flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp + + win32:flex.commands = win_flex --wincompat -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 74631e88ebfb611b14e66b0453c73a42ef39c851..7e1c6d7c8c4bcf0da3f3c0eeac0c793830e7b305 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "c3d"; - version = "1.1.0"; + version = "2018-10-04"; src = fetchgit { url = "https://git.code.sf.net/p/c3d/git"; - rev = "3453f6133f0df831dcbb0d0cfbd8b26e121eb153"; - sha256 = "1xgbk20w22jwvf7pa0n4lcbyx35fq56zzlslj0nvcclh6vx0b4z8"; + rev = "351929a582b2ef68fb9902df0b11d38f44a0ccd0"; + sha256 = "0mpv4yl6hdnxgvnwrmd182h64n3ppp30ldzm0jz6jglk0nvpzq9w"; }; nativeBuildInputs = [ cmake ]; @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.gpl2; + broken = true; }; } diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 22ac473bdd95afef4cbd2772f0c8e902944ac831..d46128c62c026f97cf6f453bea3b646542baaa56 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -2,7 +2,7 @@ flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, perlXMLParser, pythonPackages, gettext, intltool, babl, gegl, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, - mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : + libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : let inherit (pythonPackages) python pygtk; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl - gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa + gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk ]; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 8c1db9c039e72606f2f5978677df22f64f3a50db..d81fea5ea398ec917c1b485560178a294d8539b9 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,34 +1,28 @@ -{ stdenv, fetchurl, libsoup, graphicsmagick, SDL, json_glib -, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib -, libgnome_keyring, gtk3, ilmbase, intltool, lcms, lcms2 -, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg -, libpng, libpthreadstubs, librsvg, libtiff, libxcb -, openexr, osm-gps-map, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg -, mesa, lua, pugixml, colord, colord-gtk, libxshmfence, libxkbcommon -, epoxy, at_spi2_core, libwebp, libsecret, wrapGAppsHook, gnome3 +{ stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook +, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib +, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg +, libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt +, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 }: -assert stdenv ? glibc; - stdenv.mkDerivation rec { - version = "2.2.5"; + version = "2.4.2"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3"; + sha256 = "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r"; }; - buildInputs = - [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk3 - ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif - libglade libgphoto2 libjpeg libpng libpthreadstubs - librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt - libsoup graphicsmagick SDL json_glib openjpeg mesa lua pugixml - colord colord-gtk libxshmfence libxkbcommon epoxy at_spi2_core - libwebp libsecret wrapGAppsHook gnome3.adwaita-icon-theme - osm-gps-map - ]; + nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; + + buildInputs = [ + cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif + libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt + libsoup graphicsmagick json-glib openjpeg lua pugixml + colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme + osm-gps-map + ]; cmakeFlags = [ "-DBUILD_USERMANUAL=False" @@ -49,6 +43,6 @@ stdenv.mkDerivation rec { homepage = https://www.darktable.org; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu maintainers.rickynils maintainers.flosse ]; + maintainers = with maintainers; [ goibhniu rickynils flosse mrVanDalo ]; }; } diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index a62940ff7038528420fa1215ff92f182fd92412c..633a1d9bd6e6d7a8a566ea13020443c9cfdc6661 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch # For `digitaglinktree` , perl, sqlite @@ -34,7 +34,7 @@ , libqtav , libusb1 , marble -, mesa +, libGLU_combined , mysql , opencv3 , pcre @@ -50,11 +50,13 @@ mkDerivation rec { name = "digikam-${version}"; - version = "5.7.0"; + version = "5.9.0"; - src = fetchurl { - url = "mirror://kde/stable/digikam/${name}.tar.xz"; - sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; + src = fetchFromGitHub { + owner = "KDE"; + repo = "digikam"; + rev = "v${version}"; + sha256 = "09diw273h9i7rss89ba82yrfy6jb2njv3k0dknrrg7bb998vrw2d"; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; @@ -74,8 +76,7 @@ mkDerivation rec { liblqr1 libqtav libusb1 - mesa - mysql + libGLU_combined opencv3 pcre @@ -99,8 +100,6 @@ mkDerivation rec { threadweaver ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 80d2b2903678edd499dc6a4312cab04b5560c6b5..9984c0222a0211fa849d4bba1ad38762803dd016 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -1,15 +1,15 @@ {buildPythonPackage, stdenv, fetchurl, pkgconfig - , libXext, libXxf86vm, libX11, libXrandr, libXinerama + , libXext, libXxf86vm, libX11, libXrandr, libXinerama, libXScrnSaver , argyllcms, wxPython, numpy }: buildPythonPackage { - name = "displaycal-3.2.4.0"; + name = "displaycal-3.5.0.0"; enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/project/dispcalgui/release/3.2.4.0/DisplayCAL-3.2.4.0.tar.gz; - sha256 = "0swkhv338d1kmfxyf30zzdjs5xpbha40pg2zysiipcbasc0xhlb8"; + url = mirror://sourceforge/project/dispcalgui/release/3.5.0.0/DisplayCAL-3.5.0.0.tar.gz; + sha256 = "1j496sv8pbhby5hkkbp07k6bs3f7mb1l3dijmn2iga3kmix0fn5q"; }; propagatedBuildInputs = [ @@ -18,6 +18,7 @@ buildPythonPackage { libX11 libXrandr libXinerama + libXScrnSaver argyllcms wxPython numpy @@ -49,7 +50,7 @@ buildPythonPackage { meta = { description = "Display Calibration and Characterization powered by Argyll CMS"; - homepage = http://displaycal.net/; + homepage = https://displaycal.net/; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f95370e39e7220db358e06218d3e60016c9cd142 --- /dev/null +++ b/pkgs/applications/graphics/dosage/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "dosage"; + version = "2018.04.08"; + PBR_VERSION = version; + + src = fetchFromGitHub { + owner = "webcomics"; + repo = "dosage"; + rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; + sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; + }; + buildInputs = with pythonPackages; [ pytest responses ]; + propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; + + disabled = pythonPackages.pythonOlder "3.3"; + + checkPhase = '' + py.test tests/ + ''; + + meta = { + description = "A comic strip downloader and archiver"; + homepage = http://dosage.rocks/; + }; +} diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 17334c5b366c4da003b08d648ccac25dbddc8ea8..9ab43ff9433706e8c232b6d60b5b99fc7ed6dc5a 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, dpkg, makeWrapper, gcc, mesa, xdg_utils, +{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, 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, @@ -59,7 +59,7 @@ stdenv.mkDerivation { sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr"; }; - libPath = stdenv.lib.makeLibraryPath [ gcc.cc mesa xdg_utils + libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined 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 diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 3386d75e81e19b4625ac7f7b08b232d1881ba709..e698fb8f234184c105cca670aa43a3b820f7b01f 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, mesa, openexr_ctl }: +{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }: assert fltk.glSupport; stdenv.mkDerivation { - name ="openexr_viewers-2.2.0"; + name ="openexr_viewers-2.2.1"; src = fetchurl { - url = "mirror://savannah/openexr/openexr_viewers-2.2.0.tar.gz"; - sha256 = "1s84vnas12ybx8zz0jcmpfbk9m4ab5bg2d3cglqwk3wys7jf4gzp"; + url = "mirror://savannah/openexr/openexr_viewers-2.2.1.tar.gz"; + sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8"; }; configurePhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openexr fltk mesa openexr_ctl ]; + buildInputs = [ openexr fltk libGLU_combined openexr_ctl ]; meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 2943b5ef94c0e705fa4ffaa927c180e8b1c53f39..2e91f7873501dfa7399139e9085a3e098eada46a 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler, lirc }: +, epoxy, poppler, mesa_noglu, lirc }: stdenv.mkDerivation rec { name = "fbida-2.13"; @@ -11,8 +11,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff - libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ]; + buildInputs = [ + libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp + imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc + mesa_noglu + ]; makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index b447fa7810f449cf02ec9e955ef80fc9a2804f88..475c8de97b9128c573c96f947ce1821c76d13024 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.22.2"; + version = "2.26"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1kcflv4jb4250g94nqn28i98xqvvci8w7vqpfr62gxlp16z1za05"; + sha256 = "11kckzwk3b734l0n4j41k40liq1v2lbbj1gzir5qc386g7fvzmmi"; }; outputs = [ "out" "man" "doc" ]; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; - preBuild = '' - makeFlags="PREFIX=$out exif=1" - ''; + makeFlags = [ + "PREFIX=$(out)" "exif=1" + ] ++ optional stdenv.isDarwin "verscmp=0"; postBuild = '' pushd man diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 80f893e7c3c96597f01e6f98a2ce87e7ffdce62b..d517306c1d613d93074457a2bb642c4001427f20 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper }: +, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper, makeDesktopItem }: let pythonPackages = python27Packages; @@ -32,8 +32,40 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \ --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 + + mkdir -p $out/share/mime/packages + cat << EOF > $out/share/mime/packages/freecad.xml + + + + + FreeCAD Document + + + + EOF + + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications/ + for entry in $out/share/applications/*.desktop; do + substituteAllInPlace $entry + done ''; + desktopItem = makeDesktopItem { + name = "freecad"; + desktopName = "FreeCAD"; + genericName = "CAD Application"; + comment = meta.description; + exec = "@out@/bin/FreeCAD %F"; + categories = "Science;Education;Engineering;"; + startupNotify = "true"; + mimeType = "application/x-extension-fcstd;"; + extraEntries = '' + Path=@out@/share/freecad + ''; + }; + meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; homepage = https://www.freecadweb.org/; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index e6d8a06a5193020b32d3f57717f7ec1be07761ae..0bd3421f1b10feee5c386511003d1e3f26cf034f 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng, +{ stdenv, fetchurl, libjpeg, libGLU_combined, freeglut, zlib, cmake, libX11, libxml2, libpng, libXxf86vm }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; - buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng + buildInputs = [ libjpeg libGLU_combined freeglut zlib cmake libX11 libxml2 libpng libXxf86vm ]; postPatch = '' diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..355acf7681a09c302c215b31dbbe6321f0d2d3c1 --- /dev/null +++ b/pkgs/applications/graphics/fstl/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}: +stdenv.mkDerivation rec { + name = "fstl-${version}"; + version = "0.9.3"; + + buildInputs = [qtbase mesa_glu]; + + prePatch = '' + sed -i "s|/usr/bin|$out/bin|g" qt/fstl.pro + ''; + + preBuild = '' + qmake qt/fstl.pro + ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv fstl.app $out/Applications + ''; + + src = fetchFromGitHub { + owner = "mkeeter"; + repo = "fstl"; + rev = "v" + version; + sha256 = "1j0y9xbf0ybrrnsmfzgpyyz6bi98xgzn9ivani424j01vffns892"; + }; + + meta = with stdenv.lib; { + description = "The fastest STL file viewer"; + homepage = "https://github.com/mkeeter/fstl"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ tweber ]; + }; +} diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index afad1e6c3af07cdaf7fa6fa97a116917be7c3712..09d1a86db8e3e2148fa22987c8962e15ce05c9d8 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } : +{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } : let version = "2.2"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr"; }; - nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ]; + nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ]; buildInputs = [ gtk3 ]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 1e8f0e209c06f24cfe9c2b72987031ee7b405517..d034f5d64d9384165a9079cc60b8889e07b04285 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2 -, lcms, intltool, gettext, fbida +{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool +, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida }: stdenv.mkDerivation rec { name = "geeqie-${version}"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "http://geeqie.org/${name}.tar.xz"; - sha256 = "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb"; + sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; }; - preConfigure = "./autogen.sh"; + # Do not build the changelog as this requires markdown. + patches = [ ./geeqie-no-changelog.patch ]; - configureFlags = [ "--enable-gps" ]; + preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ]; buildInputs = [ - autoconf automake gtk2 libpng exiv2 lcms intltool gettext + gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida ]; postInstall = '' @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH' ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Lightweight GTK+ based image viewer"; @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://geeqie.sourceforge.net; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ jfrankenau pSub ]; platforms = platforms.gnu; }; } diff --git a/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch new file mode 100644 index 0000000000000000000000000000000000000000..1b8833b135f359090232ef06b6f696eeacb9fbcf --- /dev/null +++ b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch @@ -0,0 +1,14 @@ +--- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500 ++++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500 +@@ -10,9 +10,9 @@ + readmedir = @readmedir@ + + if HAVE_MARKDOWN +-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html ++readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html + else +-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html ++readme_DATA = README.md COPYING TODO README.lirc AUTHORS + endif + + desktopdir = $(datadir)/applications diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index ff87b70a0c1eb36603ae9e7b97b65580ec2b7f1e..3802fff2ad21aac8358433ded9c6e4b2e515c504 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python2Packages, libart_lgpl, libexif, gettext, xorg +, python2Packages, libexif, gettext, xorg , AppKit, Cocoa, gtk-mac-integration }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libart_lgpl libexif gettext xorg.libXpm + python pygtk libexif gettext xorg.libXpm wrapPython ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; @@ -46,8 +46,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib" - + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; + NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib"; meta = { description = "The GNU Image Manipulation Program"; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 92e6084ce673a506b2275bcce9cdb98d9a6b15ab..dea3fd4e3c613a06424d992d7c4b3bc8683c48f1 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, - pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }: + pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }: stdenv.mkDerivation rec { name = "giv-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { prePatch = '' sed -i s,/usr/bin/perl,${perl}/bin/perl, doc/eperl - sed -i s,/usr/local,$out, SConstruct + sed -i s,/usr/local,$out, SConstruct ''; patches = [ ./build.patch ]; @@ -25,15 +25,14 @@ stdenv.mkDerivation rec { installPhase = "scons install"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff - json_glib ]; + nativeBuildInputs = [ scons pkgconfig vala perl gob2 ]; + buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ]; - meta = { + meta = with stdenv.lib; { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 6dcf8223777a0c5d90111ced8b88740c88ca679e..c1f15904818ff42916d6d8227be1815abdaaaa15 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook -, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book +, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book , intltool, itstool, makeWrapper, pkgconfig, which }: @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; buildInputs = [ - barcode gtk3 gtk_doc gnome3.yelp_tools - gnome3.gnome_common gnome3.gsettings_desktop_schemas + barcode gtk3 gtk-doc gnome3.yelp-tools + gnome3.gnome-common gnome3.gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool ]; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2b391710907c85ebe134837ebb5eec4f576c0462 --- /dev/null +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig +}: + +stdenv.mkDerivation rec { + name = "gnuclad"; + version = "0.2.4"; + + src = fetchurl { + url = "https://launchpad.net/gnuclad/trunk/0.2/+download/${name}-${version}.tar.gz"; + sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/gnuclad; + description = "gnuclad tries to help the environment by creating trees. It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project."; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mog ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 6fe37d605ae1239ea7414b4b66cbc61e14c98654..98a32ad1899547e393d45a6c277ed74818cb5739 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, tk }: stdenv.mkDerivation rec { - name = "gocr-0.50"; + name = "gocr-0.51"; src = fetchurl { url = "http://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; - sha256 = "1dgmcpapy7h68d53q2c5d0bpgzgfb2nw2blndnx9qhc7z12149mw"; + sha256 = "14i6zi6q11h6d0qds2cpvgvhbxk5xaa027h8cd0wy1zblh7sxckf"; }; buildFlags = [ "all" "libs" ]; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8df630d582cc65188a27a8131a7fd5cf7d69914f --- /dev/null +++ b/pkgs/applications/graphics/goxel/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook +, glfw3, gtk3, libpng12 }: + +stdenv.mkDerivation rec { + name = "goxel-${version}"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "guillaumechereau"; + repo = "goxel"; + rev = "v${version}"; + sha256 = "114s1pbv3ixc2gzkg7n927hffd6ly5gg59izw4z6drgjcdhd7xj9"; + }; + + nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; + buildInputs = [ glfw3 gtk3 libpng12 ]; + + buildPhase = '' + make release + ''; + + installPhase = '' + install -D ./goxel $out/bin/goxel + ''; + + meta = with stdenv.lib; { + description = "Open Source 3D voxel editor"; + homepage = https://guillaumechereau.github.io/goxel/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ tilpner ]; + }; +} diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index c8c9ac8f26efa79572627a05df46f2bde019a2b7..f086a8f5ba608b51b8caaedd49a5eeabc073b4c1 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.26"; in +let version = "1.3.28"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v"; + sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall"; }; patches = [ diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index d9e0f42e53e385050d2fcefd6ddadb00c2ff6d88..7dc69bceda921380b44e49b5d288fd8ebf48aaa1 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,28 +1,43 @@ { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, - exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret, - libchamplain, librsvg, libwebp, json_glib, webkit, lcms2, bison, - flex, hicolor_icon_theme, wrapGAppsHook }: + exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret, + libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison, + flex, wrapGAppsHook, shared-mime-info }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let pname = "gthumb"; - version = "${major}.3"; - major = "3.5"; + version = "3.6.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "0hka1b3l8mf94zsk7jff87wsb8bz4pj5pixjrs0w2j8jbsa9sggk"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1vj26gw9b5y4bmb2m49wplqg0md568g3gxin500v3slggzhzkaww"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ]; - buildInputs = with gnome3; - [ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf - exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain - librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme defaultIconTheme ]; + buildInputs = with gnome3; [ + glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base + exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain + librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme + ]; enableParallelBuilding = true; + configureFlags = [ + "--enable-libchamplain" + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/gthumb; description = "Image browser and viewer for GNOME"; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 9acd8357cb714243b45ced6d6a815bdd98b55715..8107ed8aa4497a5a9c11b56508fb3fce4ad1a3e4 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,20 +1,20 @@ { stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi -, libXmu, mesa, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib +, libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib }: stdenv.mkDerivation rec { - name = "hugin-2017.0.0"; + name = "hugin-2018.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46"; + sha256 = "1jv5wpqbq49fhbl5g521g1qxhdm1rm7acxd18fr3n3n5d830vbyk"; }; buildInputs = [ boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg - libpng libtiff libX11 libXi libXmu mesa openexr panotools sqlite vigra + libpng libtiff libX11 libXi libXmu libGLU_combined openexr panotools sqlite vigra wxGTK zlib ]; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 889d710f043fa09c0810cd2148a63e5d4776f635..47452eb43e88be8c7c02b4c2e076f955c5325890 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { - name = "inkscape-0.92.2"; + name = "inkscape-0.92.3"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2"; - sha256 = "1lyghk6yarcv9nwkh6k366p6hb7rfilqcvbyji09hki59khd0a56"; + sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6"; }; unpackPhase = '' diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 2b1b1f8da8a687f47d36a3ef90fe830769d2535f..dbd209a57a2f840b760706df831466a08f950fbb 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ipe-7.1.10"; + name = "ipe-7.2.7"; src = fetchurl { - url = "https://dl.bintray.com/otfried/generic/ipe/7.1/${name}-src.tar.gz"; - sha256 = "0kwk8l2jasb4fdixaca08g661d0sdmx2jkk3ch7pxh0f4xkdxkkz"; + url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; + sha256 = "08lzqhagvr8l69hxghyw9akf5dixbily7hj2gxhzzrp334k3yvfn"; }; # changes taken from Gentoo portage @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { done ''; + patches = [ ./xlocale.patch ]; + #TODO: make .desktop entry meta = { diff --git a/pkgs/applications/graphics/ipe/xlocale.patch b/pkgs/applications/graphics/ipe/xlocale.patch new file mode 100644 index 0000000000000000000000000000000000000000..b440831d81b46ddd7e7a7307bf87a81dc044b32f --- /dev/null +++ b/pkgs/applications/graphics/ipe/xlocale.patch @@ -0,0 +1,10 @@ +--- ipe-7.2.7/src/ipelib/ipeplatform.cpp 2016-12-09 15:09:04.000000000 +0100 ++++ ipe-7.2.7/src/ipelib/ipeplatform.cpp 2017-11-23 17:13:11.152395834 +0100 +@@ -38,7 +38,6 @@ + #include + #else + #include +-#include + #include + #endif + #ifdef __APPLE__ diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index b7063a0c4e7f24032be66f606d39d0cee4ea3222..b428be1a1ba39666c41168b8d576324b0b8d033c 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.4"; + version = "1.4.6"; name = "jpegoptim-${version}"; src = fetchurl { url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz"; - sha256 = "1cn1i0g1xjdwa12w0ifbnzgb1vqbpr8ji6h05vxksj79vyi3x849"; + sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8"; }; # There are no checks, it seems. diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index ce315ebc512095beed96c9c90c1107608804bd1d..996d495d87c1a3f8f9b7c06fb0f10649b3608284 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc -, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: @@ -20,24 +20,25 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false"; + cmakeFlags = [ + "-DK3D_BUILD_DOCS=false" + "-DK3D_BUILD_GUIDE=false" + ]; preConfigure = '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)" ''; + nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ]; + buildInputs = [ - cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng - boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff - gettext intltool perl unzip ftgl glew asciidoc - gtkmm2 glibmm gtkglext pangox_compat libXmu + libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng + boost cairomm imagemagick libjpeg libtiff + ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu ]; #doCheck = false; - enableParallelBuilding = true; - meta = { description = "A 3D editor with support for procedural editing"; homepage = http://www.k-3d.org/; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index a9c238ead3c15350df40402db1cc4cba6f41a5b1..5af0e627d7d855d72c2171444926e5bb90d31aa2 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -9,11 +9,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "3.3.2"; + version = "4.0.1"; src = fetchurl { - url = https://download.kde.org/stable/krita/3.3.2/krita-3.3.2.1.tar.xz; - sha256 = "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5"; + url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; + sha256 = "0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; @@ -29,7 +29,7 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; meta = with lib; { - description = "A free an open source painting application"; + description = "A free and open source painting application"; homepage = https://krita.org/; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 5f27cb4469947feb5f742af903720061d6d0fb84..ada55f0351e14450797fb7f593661a4cff396b36 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -7,13 +7,13 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "17.02"; + version = "18.02"; src = fetchFromGitHub { owner = "leozide"; repo = "leocad"; rev = "v${version}"; - sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc"; + sha256 = "0rb4kjyrr9ry85cfpbk52l19vvwn7lrh2kmj2lwq531smnygn5m3"; }; nativeBuildInputs = [ qmake4Hook ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CAD program for creating virtual LEGO models"; - homepage = http://www.leocad.org/; + homepage = https://www.leocad.org/; license = licenses.gpl2; - inherit (qt4.meta) platforms; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 30d34a88d90a232b9e6a2331889f156f200364ba..867c0a5583822405423ede28ec792af6f95b0a82 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,28 +1,21 @@ -{ stdenv, cmake, fetchurl, fetchpatch, pkgconfig, boost, exiv2, fftwFloat, gsl +{ stdenv, cmake, fetchurl, pkgconfig, boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr -, qtbase, qtdeclarative, qttools, qtwebkit +, qtbase, qtdeclarative, qttools, qtwebengine }: stdenv.mkDerivation rec { - name = "luminance-hdr-2.4.0"; + name = "luminance-hdr-2.5.1"; src = fetchurl { url = "mirror://sourceforge/qtpfsgui/${name}.tar.bz2"; - sha256 = "00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l"; + sha256 = "15hnyk9yjkkc97dmnrg2ipfgwqxprlcyv2kyvbls4d54zc56x658"; }; - patches = [(fetchpatch { - name = "fix-qt53-build.diff"; - url = "http://anonscm.debian.org/cgit/pkg-phototools/luminance-hdr.git/" - + "plain/debian/patches/51_qt5_printsupport.diff?id=00c869a860062dac181303f2c03a3513c0e210bc"; - sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl"; - })]; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ - qtbase qtdeclarative qttools qtwebkit + qtbase qtdeclarative qttools qtwebengine boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix index ac2a194b7ca4a92d893f39102f885d737e23e7db..c25c1277ee0b96c82b28822ea2d6da921bf325df 100644 --- a/pkgs/applications/graphics/meh/default.nix +++ b/pkgs/applications/graphics/meh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A minimal image viewer using raw XLib"; - homepage = http://www.johnhawthorn.com/meh/; + homepage = https://www.johnhawthorn.com/meh/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2fddc39e0d0734dd6af412f4379e8ab3c000523b --- /dev/null +++ b/pkgs/applications/graphics/meme/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "meme-unstable-${version}"; + version = "2017-09-10"; + + owner = "nomad-software"; + repo = "meme"; + goPackagePath = "github.com/${owner}/${repo}"; + + src = fetchFromGitHub { + inherit owner repo; + rev = "a6521f2eecb0aac22937b0013747ed9cb40b81ea"; + sha256 = "1gbsv1d58ck6mj89q31s5b0ppw51ab76yqgz39jgwqnkidvzdfly"; + }; + + meta = with stdenv.lib; { + description = "A command line utility for creating image macro style memes"; + homepage = "https://github.com/nomad-software/meme"; + license = licenses.mit; + maintainers = [ maintainers.fgaz ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index d73697673bfe2a840b735c49b050b3a2bf45f271..eaaabe8fd395722ef2a0c158d6b6c84aa409e73d 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,51 +1,66 @@ -{ stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip, vcg }: +{ stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }: -stdenv.mkDerivation rec { - name = "meshlab-1.3.3"; +let + meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; + vcglibRev = "a8e87662b63ee9f4ded5d4699b28d74183040803"; +in stdenv.mkDerivation { + name = "meshlab-2016.12"; - src = fetchurl { - url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz"; - sha256 = "03wqaibfbfag2w1zi1a5z6h546r9d7pg2sjl5pwg24w7yp8rr0n9"; - }; + srcs = + [ + (fetchFromGitHub { + owner = "cnr-isti-vclab"; + repo = "meshlab"; + rev = meshlabRev; + sha256 = "0srrp7zhi86dsg4zsx1615gr26barz38zdl8s03zq6vm1dgzl3cc"; + name = "meshlab-${meshlabRev}"; + }) + (fetchFromGitHub { + owner = "cnr-isti-vclab"; + repo = "vcglib"; + rev = vcglibRev; + sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; + name = "vcglib-${vcglibRev}"; + }) + ]; - # I don't know why I need this; without this, the rpath set at the beginning of the - # buildPhase gets removed from the 'meshlab' binary - dontPatchELF = true; + sourceRoot = "meshlab-${meshlabRev}"; - patches = [ ./include-unistd.diff ]; + patches = [ ./fix-2016.02.patch ]; hardeningDisable = [ "format" ]; + enableParallelBuilding = true; buildPhase = '' - mkdir -p "$out/include" + # MeshLab has ../vcglib hardcoded everywhere, so move the source dir + mv ../vcglib-${vcglibRev} ../vcglib + + cd src export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" - cd meshlab/src + pushd external qmake -recursive external.pro - make + buildPhase popd qmake -recursive meshlab_full.pro - make + buildPhase ''; installPhase = '' - mkdir -p $out/opt/meshlab $out/bin $out/lib - pushd distrib - cp -R * $out/opt/meshlab - popd + mkdir -p $out/opt/meshlab $out/bin + cp -Rv distrib/* $out/opt/meshlab ln -s $out/opt/meshlab/meshlab $out/bin/meshlab + ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ''; - sourceRoot = "."; - - buildInputs = [ qt4 unzip vcg ]; + buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ]; meta = { - description = "System for the processing and editing of unstructured 3D triangular meshes"; - homepage = http://meshlab.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; + description = "A system for processing and editing 3D triangular meshes."; + homepage = http://www.meshlab.net/; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - broken = true; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/graphics/meshlab/fix-2016.02.patch b/pkgs/applications/graphics/meshlab/fix-2016.02.patch new file mode 100644 index 0000000000000000000000000000000000000000..ebccccc00a296a5170f5510d5a3777b9f898b91d --- /dev/null +++ b/pkgs/applications/graphics/meshlab/fix-2016.02.patch @@ -0,0 +1,88 @@ +From 0fd17cd2b6d57e8a2a981a70115c2565ee076d0f Mon Sep 17 00:00:00 2001 +From: Marco Callieri +Date: Mon, 9 Jan 2017 16:06:14 +0100 +Subject: [PATCH 1/3] resolved ambiguity for abs overloads + + +diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp +index 364d53bf..ef3d4a2d 100644 +--- a/src/meshlabplugins/edit_quality/eqhandle.cpp ++++ b/src/meshlabplugins/edit_quality/eqhandle.cpp +@@ -83,7 +83,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) + setCursor(Qt::OpenHandCursor); + + QPointF newPos = event->scenePos(); +- qreal handleOffset = abs(newPos.x()-pos().x()); ++ qreal handleOffset = std::fabs(newPos.x()-pos().x()); + + if (handleOffset >= std::numeric_limits::epsilon()) + { +-- +2.15.0 + + +From 33cfd5801e59b6c9e34360c75112e6dcb88d807b Mon Sep 17 00:00:00 2001 +From: Marco Callieri +Date: Tue, 10 Jan 2017 10:05:05 +0100 +Subject: [PATCH 2/3] again, fabs ambiguity + + +diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp +index ef3d4a2d..d29f8c45 100644 +--- a/src/meshlabplugins/edit_quality/eqhandle.cpp ++++ b/src/meshlabplugins/edit_quality/eqhandle.cpp +@@ -30,6 +30,7 @@ FIRST RELEASE + #include "eqhandle.h" + #include + #include ++#include + + EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position, + EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox, +@@ -83,7 +84,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) + setCursor(Qt::OpenHandCursor); + + QPointF newPos = event->scenePos(); +- qreal handleOffset = std::fabs(newPos.x()-pos().x()); ++ qreal handleOffset = fabs(newPos.x()-pos().x()); + + if (handleOffset >= std::numeric_limits::epsilon()) + { +-- +2.15.0 + + +From d717e44f4134ebee03322a6a2a56fce626084a3c Mon Sep 17 00:00:00 2001 +From: Patrick Chilton +Date: Mon, 4 Dec 2017 21:27:23 +0100 +Subject: [PATCH 3/3] io_TXT -> io_txt + + +diff --git a/src/meshlab_full.pro b/src/meshlab_full.pro +index 6ea7f1db..2a95c127 100644 +--- a/src/meshlab_full.pro ++++ b/src/meshlab_full.pro +@@ -16,7 +16,7 @@ SUBDIRS = common \ + meshlabplugins/io_x3d \ + meshlabplugins/io_expe \ + meshlabplugins/io_pdb \ +- plugins_experimental/io_TXT \ ++ plugins_experimental/io_txt \ + # Filter plugins + meshlabplugins/filter_aging \ + meshlabplugins/filter_ao \ +diff --git a/src/plugins_experimental/io_TXT/io_txt.cpp b/src/plugins_experimental/io_txt/io_txt.cpp +similarity index 100% +rename from src/plugins_experimental/io_TXT/io_txt.cpp +rename to src/plugins_experimental/io_txt/io_txt.cpp +diff --git a/src/plugins_experimental/io_TXT/io_txt.h b/src/plugins_experimental/io_txt/io_txt.h +similarity index 100% +rename from src/plugins_experimental/io_TXT/io_txt.h +rename to src/plugins_experimental/io_txt/io_txt.h +diff --git a/src/plugins_experimental/io_TXT/io_txt.pro b/src/plugins_experimental/io_txt/io_txt.pro +similarity index 100% +rename from src/plugins_experimental/io_TXT/io_txt.pro +rename to src/plugins_experimental/io_txt/io_txt.pro +-- +2.15.0 + diff --git a/pkgs/applications/graphics/meshlab/include-unistd.diff b/pkgs/applications/graphics/meshlab/include-unistd.diff deleted file mode 100644 index 74f28a4d211959e062937984c2b6e17d48e92926..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/meshlab/include-unistd.diff +++ /dev/null @@ -1,13 +0,0 @@ -*** old/vcglib/wrap/ply/plystuff.h 2013-02-09 00:00:04.110705851 -0500 ---- new/vcglib/wrap/ply/plystuff.h 2013-02-09 15:20:53.482205183 -0500 -*************** -*** 75,80 **** ---- 75,81 ---- - #define pb_close _close - #define DIR_SEP "\\" - #else -+ #include - #define pb_mkdir(n) mkdir(n,0755) - #define pb_access access - #define pb_stat stat - diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index ac0060ec7f8e5916d411bef285a3dadefdbd8292..675c4e6a49ef727602e064f0495508ae2af160fd 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -4,7 +4,7 @@ , makeWrapper , pkgconfig , wrapGAppsHook -, gsettings_desktop_schemas +, gsettings-desktop-schemas , qtbase , qttools @@ -18,12 +18,12 @@ }: stdenv.mkDerivation rec { - version = "3.6.1"; + version = "3.8.1"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44"; + sha256 = "1irms980d7acdqrfn8isw55vgc4d9n26ff86887vk7xfvxs0ayla"; }; name = "nomacs-${version}"; @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */ImageLounge) ''; - patches = [./fix-appdata-install.patch]; - nativeBuildInputs = [cmake pkgconfig wrapGAppsHook]; @@ -48,7 +46,7 @@ stdenv.mkDerivation rec { libraw libtiff quazip - gsettings_desktop_schemas]; + gsettings-desktop-schemas]; cmakeFlags = ["-DENABLE_OPENCV=ON" "-DENABLE_RAW=ON" diff --git a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch deleted file mode 100644 index cdeed56f496dd21f3ab0afd13ae07226bbf3dad4..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index b4402c7d1043382ccc3c461be895213537828933..49835298f132b733f673f4acec53141f257b0c9a 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,20 +4,20 @@ stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.7.17"; + version = "1.8.9"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0vx2pndgyfbnziwn36aylvq4jd889dvibzhw9ajzkm378l43lly9"; + sha256 = "0xyfb41arvi3cc5jvgj2m8skzjrb0xma8sml74svygjgagxfj65h"; }; outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ - boost ilmbase libjpeg libpng + boost ilmbase libjpeg libpng libtiff opencolorio openexr unzip ]; @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "A library and tools for reading and writing images"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index e7a05c522ca2e9d724dcc8ac1a45077ad6772313..33fddf6c8d0121ff06509f727e9d5b9843a32beb 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, mesa, glew, opencsg, cgal +{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext }: stdenv.mkDerivation rec { - version = "2015.03-1"; + version = "2015.03-3"; name = "openscad-${version}"; src = fetchurl { url = "http://files.openscad.org/${name}.src.tar.gz"; - sha256 = "61e0dd3cd107e5670d727526700104cca5ac54a1f0a84117fcc9e57bf3b6b279"; + sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; }; buildInputs = [ - qt4 qmake4Hook bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib + qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib pkgconfig harfbuzz qscintilla gettext ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://openscad.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; + maintainers = with stdenv.lib.maintainers; [ bjornfor raskin the-kenny ]; }; } diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 730f809eef404bf183b7080dbd7eb36bde08133f..e5385c7528040cb379ec60adabbf5e0affcbc02b 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,9 +1,12 @@ -{stdenv, fetchFromGitHub, cmake -,full, python, mesa, libXt }: +{ +stdenv, fetchFromGitHub, cmake, makeWrapper +,qtbase, qttools, python, libGLU_combined +,libXt, qtx11extras, qtxmlpatterns +}: stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.4.0"; + version = "5.4.1"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -11,14 +14,15 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "0h1vkgwm10mc5mnr3djp81lxr5pi0hyj776z77hiib6xm5596q9n"; + sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74"; fetchSubmodules = true; }; - cmakeFlags = [ - "-DPARAVIEW_ENABLE_PYTHON=ON" - "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" - ]; + cmakeFlags = [ + "-DPARAVIEW_ENABLE_PYTHON=ON" + "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" + "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" + ]; # During build, binaries are called that rely on freshly built # libraries. These reside in build/lib, and are not found by @@ -29,18 +33,32 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake - python - mesa - libXt + nativeBuildInputs = [ + cmake + makeWrapper + ]; - # theoretically the following should be fine, but there is an error - # due to missing libqminimal when not using qt5.full - - # qtbase qtx11extras qttools - full - ]; + buildInputs = [ + python + python.pkgs.numpy + libGLU_combined + libXt + qtbase + qtx11extras + qttools + qtxmlpatterns + ]; + # Paraview links into the Python library, resolving symbolic links on the way, + # so we need to put the correct sitePackages (with numpy) back on the path + postInstall = '' + wrapProgram $out/bin/paraview \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + wrapProgram $out/bin/pvbatch \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + wrapProgram $out/bin/pvpython \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + ''; meta = { homepage = http://www.paraview.org/; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index f7175f9d2b87063dfa57df40d050b373858406b2..0e52190af420085f8a2b4276c4d4c9232085a1b5 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,36 +1,104 @@ -{ stdenv, fetchurl, makeWrapper, xulrunner }: +{ stdenv, fetchurl, lib, makeWrapper, + # build dependencies + alsaLib, atk, cairo, cups, dbus, expat, fontconfig, + freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg, + glibc, udev +}: stdenv.mkDerivation rec { - version = "2.0.21"; + version = "3.0.4"; name = "pencil-${version}"; src = fetchurl { - url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; - sha256 = "0xq3gczqy7gzf1997qxdql5z7qqk1vabr0rzgakmsi4dq2q4d3kq"; + url = "http://pencil.evolus.vn/dl/V${version}/Pencil_${version}_amd64.deb"; + sha256 = "58e2b794c615ea8715d8374f177e19c87f7071e359826ec34a59836d537a62fd"; }; - buildPhase = ""; + sourceRoot = "."; - buildInputs = [ makeWrapper ]; + unpackCmd = '' + ar p "$src" data.tar.xz | tar xJ + ''; + + buildPhase = ":"; + + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p "$out" - cp -r usr/* "$out" - sed -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \ - -i "$out/bin/pencil" - sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \ - -e "s|Icon=.*|Icon=$out/share/evolus-pencil/skin/classic/icon.svg|" \ - -i "$out/share/applications/pencil.desktop" - - wrapProgram $out/bin/pencil \ - --prefix PATH ":" ${xulrunner}/bin + mkdir -p $out/bin + cp -R usr/share opt $out/ + + # fix the path in the desktop file + substituteInPlace \ + $out/share/applications/pencil.desktop \ + --replace /opt/ $out/opt/ + + # symlink the binary to bin/ + ln -s $out/opt/Pencil/pencil $out/bin/pencil + ''; + + + preFixup = let + packages = [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + nspr + nss + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + stdenv.cc.cc.lib + stdenv.cc.cc + glibc + ]; + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; + libPath = "${libPathNative}:${libPath64}"; + in '' + # patch executable + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/opt/Pencil" \ + $out/opt/Pencil/pencil + + # patch libnode + patchelf \ + --set-rpath "${libPath}" \ + $out/opt/Pencil/libnode.so + + # libffmpeg is for some reason not executable + chmod a+x $out/opt/Pencil/libffmpeg.so + + # fix missing libudev + ln -s ${udev}/lib/systemd/libsystemd-shared.so $out/opt/Pencil/libudev.so.1 + wrapProgram $out/opt/Pencil/pencil \ + --prefix LD_LIBRARY_PATH : $out/opt/Pencil ''; meta = with stdenv.lib; { description = "GUI prototyping/mockup tool"; - homepage = https://github.com/prikhi/pencil; - license = licenses.gpl2; # Commercial license is also available - maintainers = with maintainers; [ bjornfor prikhi ]; - platforms = platforms.linux; + homepage = "https://pencil.evolus.vn/"; + license = licenses.gpl2; # Commercial license is also available + maintainers = with maintainers; [ bjornfor prikhi mrVanDalo ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 0d1adcff6e8345f825a99fbe00556f87a224d53f..73bbd5003bd88312c3e3e78d792fa0ef257a39f6 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ffef558e84dd816ad0b9e231b4968d8ce15699a7 --- /dev/null +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobjectIntrospection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }: + +stdenv.mkDerivation { + name = "photoflow-unstable-2018-03-06"; + + src = fetchFromGitHub { + owner = "aferrero2707"; + repo = "PhotoFlow"; + rev = "f9bbea183fa02412d1d17075955d2284eeaf8174"; + sha256 = "1fsk7kdmlkd64wcswbxrl87aqwmzqak6p3s38ggxzx2h51fa7lmf"; + }; + + nativeBuildInputs = [ + gettext + glib + libxml2 + pkgconfig + swig + automake + gobjectIntrospection + cmake + ninja + ]; + + buildInputs = [ + libtiff + libjpeg + fftw + exiv2 + lensfun + gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3 + # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803 + libraw + lcms2 + libexif + vips + expat + pcre + pugixml + ]; + + cmakeFlags = [ + "-DBUNDLED_EXIV2=OFF" + "-DBUNDLED_LENSFUN=OFF" + "-DBUNDLED_GEXIV2=OFF" + ]; + + meta = with stdenv.lib; { + description = "A fully non-destructive photo retouching program providing a complete RAW image editing workflow"; + homepage = https://aferrero2707.github.io/PhotoFlow/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.MtP ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 82e8793199b603a9f2c1a0aa9e91a67f634943f0..01affbbbd94cccc864ce32873bd81dad7beccdee 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; src = fetchurl { - url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz"; + url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://photoqt.org/; + homepage = https://photoqt.org/; description = "Simple, yet powerful and good looking image viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index f4a4b6bb9d85d273cbf1b1fbbce3245d4c0248bf..a3151238438bba1fcc39ba702c0bdc90db930a2c 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -56,9 +56,9 @@ buildDotnetPackage rec { ''; makeWrapperArgs = [ - ''--prefix MONO_GAC_PREFIX ':' "${gtksharp}"'' - ''--prefix LD_LIBRARY_PATH ':' "${gtksharp}/lib"'' - ''--prefix LD_LIBRARY_PATH ':' "${gtksharp.gtk.out}/lib"'' + ''--prefix MONO_GAC_PREFIX : ${gtksharp}'' + ''--prefix LD_LIBRARY_PATH : ${gtksharp}/lib'' + ''--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib'' ]; postInstall = '' diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 202bbb5b13f4d371aca77fc3ab1b29d963bf6250..757ce52e9c4c8e296970b2a0de67d6564a3270d4 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchFromGitHub, getopt, which, pkgconfig, gtk2 } : +{ stdenv, fetchFromGitHub, pkgconfig +, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler +}: stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.9"; + version = "2.10.3"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "1xncf6aq52zpxpmz3ikmlkinz7y3nmbpgfxjb7q40sqs00n0mfsd"; + sha256 = "16nhnv0dcp242jf1099pjr5dwnc65i40cnb3dvx1avdhidcmsx01"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ getopt which gtk2 ]; + buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ]; prePatch = "patchShebangs ."; meta = with stdenv.lib; { - description = "Rewrite of qiv (quick image viewer)"; + description = "Powerful image viewer with minimal UI"; homepage = http://www.pberndt.com/Programme/Linux/pqiv; license = licenses.gpl3; maintainers = [ maintainers.ndowens ]; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix deleted file mode 100644 index 12ff5c77240244deef96e52120518c125ffc8e9e..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/processing/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ fetchurl, stdenv, ant, jdk, makeWrapper, libXxf86vm, which }: - -stdenv.mkDerivation rec { - name = "processing-${version}"; - version = "2.2.1"; - - src = fetchurl { - url = "https://github.com/processing/processing/archive/processing-0227-${version}.tar.gz"; - sha256 = "1r8q5y0h4gpqap5jwkspc0li6566hzx5chr7hwrdn8mxlzsm50xk"; - }; - - # Stop it trying to download its own version of java - patches = [ ./use-nixpkgs-jre.patch ]; - - buildInputs = [ ant jdk makeWrapper libXxf86vm which ]; - - buildPhase = "cd build && ant build"; - - installPhase = '' - mkdir -p $out/${name} - mkdir -p $out/bin - cp -r linux/work/* $out/${name}/ - makeWrapper $out/${name}/processing $out/bin/processing \ - --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \ - --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - makeWrapper $out/${name}/processing-java $out/bin/processing-java \ - --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \ - --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - ln -s ${jdk} $out/${name}/java - ''; - - meta = with stdenv.lib; { - description = "A language and IDE for electronic arts"; - homepage = https://processing.org; - license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch b/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch deleted file mode 100644 index 8f6a5e2018e172d3aefd9cba7893d37be389c03c..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch +++ /dev/null @@ -1,88 +0,0 @@ -From d1fb63255ff028ecc9cc66d5a6b21b24031b4b4a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= -Date: Tue, 26 Aug 2014 00:07:58 +0200 -Subject: [PATCH] patch - ---- - build/build.xml | 42 +++++++++++++++++++++--------------------- - 1 file changed, 21 insertions(+), 21 deletions(-) - -diff --git a/build/build.xml b/build/build.xml -index 4d0f0b2..c3f5c09 100755 ---- a/build/build.xml -+++ b/build/build.xml -@@ -640,10 +640,11 @@ - value="jre-tools-6u37-linux${sun.arch.data.model}.tgz" /> - --> - -+ - -- -+ - - -- -- -- -+ -+ -+ - - -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - --- -2.1.0 - diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4ef078fdbac604b918b558f1d287c662701976fc --- /dev/null +++ b/pkgs/applications/graphics/processing3/default.nix @@ -0,0 +1,53 @@ +{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm }: + +stdenv.mkDerivation rec { + version = "3.3.7"; + name = "processing3-${version}"; + + src = fetchFromGitHub { + owner = "processing"; + repo = "processing"; + rev = "processing-0264-3.3.7"; + sha256 = "0a20z19lmc4xarfnr7xshcmlv3xkc2dgjxknis0iv79gxnwlqhpq"; + }; + + nativeBuildInputs = [ ant rsync makeWrapper ]; + buildInputs = [ jdk ]; + + buildPhase = '' + # use compiled jogl to avoid patchelf'ing .so files inside jars + rm core/library/*.jar + cp ${javaPackages.jogl_2_3_2}/share/java/*.jar core/library/ + + # suppress "Not fond of this Java VM" message box + substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \ + --replace 'Messages.showWarning' 'if (false) Messages.showWarning' + + ( cd build + substituteInPlace build.xml --replace "jre-download," "" # do not download jre1.8.0_144 + mkdir -p linux/jre1.8.0_144 # fake dir to avoid error + ant build ) + ''; + + installPhase = '' + mkdir $out + cp -dpR build/linux/work $out/${name} + + rmdir $out/${name}/java + ln -s ${jdk} $out/${name}/java + + makeWrapper $out/${name}/processing $out/bin/processing \ + --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ + --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + makeWrapper $out/${name}/processing-java $out/bin/processing-java \ + --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ + --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + ''; + + meta = with stdenv.lib; { + description = "A language and IDE for electronic arts"; + homepage = https://processing.org; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index c4f4f6472ed67dfe85d6eb9a098d7b58763a70af..fafc76a76ffeb80812ba5ab262b20dafe89b0374 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dos2unix, which, qt }: +{ stdenv, fetchurl, dos2unix, which, qt, Carbon }: stdenv.mkDerivation rec { name = "qscreenshot-1.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx"; }; - buildInputs = [ dos2unix which qt ]; + buildInputs = [ dos2unix which qt ] + ++ stdenv.lib.optional stdenv.isDarwin Carbon; # Remove carriage returns that cause /bin/sh to abort preConfigure = '' diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index 451eaae79b2e4ee648324c5ebc07cf0844bc85c3..b300c0071faead67312b53931ae0cf9ebc1c3fee 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline -, qtbase, qmake, mesa_glu +, qtbase, qmake, libGLU }: stdenv.mkDerivation rec { @@ -22,12 +22,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ]; + buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline libGLU ]; meta = with stdenv.lib; { license = licenses.gpl3; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; description = ''Constructive solid geometry package''; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake deleted file mode 100644 index 7be7cb63f70178c57f96724be600d6d997cd7f71..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(GIT_BRANCH master) -set(GIT_VERSION 4.2.1115) -set(GIT_CHANGESET 0821eea7b6a4ac2fce1fcf644e06078e161e41e3) -set(GIT_TAGDISTANCE 1115) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 91a34a505f2fb26c17f6bd0bb7e9e182761bbbd5..eb97a2b9b3b6d071bc23b0c557478ae9b78f585d 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook +, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook , lensfun }: stdenv.mkDerivation rec { - version = "5.3"; + version = "5.4"; name = "rawtherapee-" + version; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7"; + sha256 = "1h2x5biqsb4kfwsffqkyk8ky22qv2a0cjs1s445x9farcr3kwk99"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; buildInputs = [ - cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun + pixman libpthreadstubs gtkmm3 libXau libXdmcp + lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun ]; cmakeFlags = [ diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix deleted file mode 100644 index fb73feb4a09971b9784e1c1b88ad60218c70e081..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/rawtherapee/dev.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx -}: - -stdenv.mkDerivation rec { - name = "rawtherapee-git-2016-10-10"; - - src = fetchFromGitHub { - owner = "Beep6581"; - repo = "RawTherapee"; - rev = "0821eea7b6a4ac2fce1fcf644e06078e161e41e3"; - sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ]; - - NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result"; - - # Copy generated ReleaseInfo.cmake so we don't need git. File was - # generated manually using `./tools/generateReleaseInfo` in the - # source folder. Make sure to regenerate it when updating. - preConfigure = '' - cp ${./ReleaseInfo.cmake} ./ReleaseInfo.cmake - ''; - - enableParallelBuilding = true; - - meta = { - description = "RAW converter and digital photo processing software"; - homepage = http://www.rawtherapee.com/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch b/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch deleted file mode 100644 index 3c87ce64e26b08484ea9cae5ed4e5aa132534c37..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ca0afa8d5f3cc7d09b6bab32d155a87c550f0d7b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fl=C3=B6ssie?= -Date: Sat, 1 Oct 2016 12:38:24 +0200 -Subject: [PATCH] Fix incompatibility with glibmm 2.50 (#3440) - -Kudos to @Hombre57 for the suggestion. ---- - rtgui/dirbrowser.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc -index d3fc8bf..6f25f0f 100644 ---- a/rtgui/dirbrowser.cc -+++ b/rtgui/dirbrowser.cc -@@ -59,7 +59,7 @@ std::vector listSubDirs (const Glib::RefPtr& dir, bool - } catch (const Glib::Exception& exception) { - - if (options.rtSettings.verbose) { -- std::cerr << "Failed to list subdirectories of \"" << dir << "\": " << exception.what () << std::endl; -+ std::cerr << "Failed to list subdirectories of \"" << dir->get_basename() << "\": " << exception.what () << std::endl; - } - - } diff --git a/pkgs/applications/graphics/renderdoc/custom_swig.patch b/pkgs/applications/graphics/renderdoc/custom_swig.patch new file mode 100644 index 0000000000000000000000000000000000000000..e6ed05ea97a541e27e8a294ba3721b51ed0fd843 --- /dev/null +++ b/pkgs/applications/graphics/renderdoc/custom_swig.patch @@ -0,0 +1,32 @@ +diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt +index 2df9ffa5..66bafaba 100644 +--- a/qrenderdoc/CMakeLists.txt ++++ b/qrenderdoc/CMakeLists.txt +@@ -65,16 +65,6 @@ include(ExternalProject) + # Need bison for swig + find_package(BISON) + +-# Compile our custom SWIG that will do scoped/strong enum classes +-ExternalProject_Add(custom_swig +- # using an URL to a zip directly so we don't clone the history etc +- URL ${RENDERDOC_SWIG_PACKAGE} +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1 +- COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null +- BUILD_COMMAND $(MAKE) > /dev/null 2>&1 +- INSTALL_COMMAND $(MAKE) install > /dev/null 2>&1) +- + # Lastly find PySide 2, optionally, for Qt5 Python bindings + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") + +@@ -186,9 +176,8 @@ foreach(in ${swig_interfaces}) + get_filename_component(swig_file ${in} NAME_WE) + + add_custom_command(OUTPUT ${swig_file}_python.cxx ${swig_file}.py +- COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} ++ COMMAND $ENV{NIXOS_CUSTOM_SWIG} -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${in} +- DEPENDS custom_swig + DEPENDS ${RDOC_REPLAY_FILES} + DEPENDS ${QRD_INTERFACE_FILES}) + diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index d69f9a676c1b100c9d8049d670c9824fa2f762d0..2bd3ab89161f5b3d2209dd723eb5f38c1434cb9a 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,31 +1,57 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig -, qtbase, qtx11extras, vulkan-loader, xorg +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, qtbase, qtx11extras, qtsvg, makeWrapper, python3, bison +, pcre, vulkan-loader, xorg, autoreconfHook }: +let + custom_swig = stdenv.mkDerivation { + name = "renderdoc-custom-swig"; + src = fetchFromGitHub { + owner = "baldurk"; + repo = "swig"; + rev = "renderdoc-modified-1"; + sha256 = "1whymd3vamwnp4jqfc9asls3dw9wsdi21xhm1d2a4vx9nql8if1x"; + }; + + nativeBuildInputs = [ autoreconfHook pcre ]; + + autoreconfPhase = '' + patchShebangs autogen.sh + ./autogen.sh + ''; + }; +in stdenv.mkDerivation rec { name = "renderdoc-${version}"; - version = "0.34pre"; + version = "0.91"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; - rev = "5e2717daec53e5b51517d3231fb6120bebbe6b7a"; - sha256 = "1zpvjvsj5c441kyjpmd2d2r0ykb190rbq474nkmp1jk72cggnpq0"; + rev = "2d8b2cf818746b6a2add54e2fef449398816a40c"; + sha256 = "07yc3fk7j2nqmrhc4dm3v2pgbc37scd7d28nlzk6v0hw99zck8k0"; }; buildInputs = [ - qtbase xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader + qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + + nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison ]; cmakeFlags = [ - "-DBUILD_VERSION_HASH=${src.rev}-distro-nix" + "-DBUILD_VERSION_HASH=${src.rev}" + "-DBUILD_VERSION_DIST_NAME=NixOS" + "-DBUILD_VERSION_DIST_VER=0.91" + "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc" + "-DBUILD_VERSION_DIST_STABLE=ON" # 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 @@ -35,8 +61,14 @@ stdenv.mkDerivation rec { 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 ''; + + # Set path to custom swig binary + NIXOS_CUSTOM_SWIG = "${custom_swig}/bin/swig"; + enableParallelBuilding = true; + patches = [ ./custom_swig.patch ]; + meta = with stdenv.lib; { description = "A single-frame graphics debugger"; homepage = https://renderdoc.org/; @@ -48,6 +80,6 @@ stdenv.mkDerivation rec { Windows 7 - 10, Linux or Android. ''; maintainers = [maintainers.jansol]; - platforms = platforms.linux; + platforms = ["i686-linux" "x86_64-linux"]; }; } diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 3ef23142b2ed5ef49c4ef0bd536a6b4f00ee89b5..2ca1fead84c8988fa5599671f7e268cf40ebdc4f 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, avahi, libjpeg, libusb1, libv4l, net_snmp +, avahi, libjpeg, libusb1, libv4l, net_snmp, libpng , gettext, pkgconfig # List of { src name backend } attibute sets - see installFirmware below: @@ -24,7 +24,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0" ; - buildInputs = [ avahi libusb1 libv4l net_snmp ]; + buildInputs = [ avahi libusb1 libv4l net_snmp libpng ]; nativeBuildInputs = [ gettext pkgconfig ]; enableParallelBuilding = true; @@ -71,7 +71,7 @@ stdenv.mkDerivation { homepage = http://www.sane-project.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx peti ]; + maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix index dbf79bf20acbd2c1665e7b3e82c839687e3321dc..e746f83e5d49ccbf9bf11d700f61e2d0cf4b92be 100644 --- a/pkgs/applications/graphics/sane/backends/git.nix +++ b/pkgs/applications/graphics/sane/backends/git.nix @@ -1,10 +1,10 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // { - version = "2016-06-11"; + version = "2017-12-01"; src = fetchgit { - sha256 = "0jpavig7bg7l72drlwipmsg03j6qdy5aq2r3kj6a2h6ahpnm2549"; - rev = "5ba37467e88ca8052973b37128ce8fd36ad5d61d"; + sha256 = "0qf7d7268kdxnb723c03m6icxhbgx0vw8gqvck2q1w5b948dy9g8"; + rev = "e895ee55bec8a3320a0e972b32c05d35b47fe226"; url = "git://alioth.debian.org/git/sane/sane-backends.git"; }; }) diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix new file mode 100644 index 0000000000000000000000000000000000000000..bea4fe9b2c6c0b4ad7583c377b828d0da5c4623f --- /dev/null +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, makeDesktopItem +, cmake, libjpeg, libpng, libtiff, boost +, qtbase, qttools }: + +stdenv.mkDerivation rec { + name = "scantailor-advanced-${version}"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "4lex4"; + repo = "scantailor-advanced"; + rev = "v${version}"; + sha256 = "1h7lng0hxkjcvwbdf1yx59a382kiwn9bpll42acqs71nsvw65p28"; + }; + + nativeBuildInputs = [ cmake qttools ]; + buildInputs = [ libjpeg libpng libtiff boost qtbase ]; + + postInstall = '' + mkdir -p $out/share/icons/hicolor/scalable/apps + cp $src/resources/appicon.svg $out/share/icons/hicolor/scalable/apps/scantailor.svg + + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications/ + for entry in $out/share/applications/*.desktop; do + substituteAllInPlace $entry + done + ''; + + desktopItem = makeDesktopItem { + name = "scantailor-advanced"; + exec = "scantailor %f"; + icon = "scantailor"; + comment = meta.description; + desktopName = "Scan Tailor Advanced"; + genericName = "Scan Processing Software"; + mimeType = "image/png;image/tif;image/jpeg;"; + categories = "Graphics;"; + startupNotify = "true"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/4lex4/scantailor-advanced; + description = "Interactive post-processing tool for scanned pages"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jfrankenau ]; + platforms = platforms.gnu; + }; +} diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index e97278148f990315e63612927c45c41a7c08d9c5..80987a8c74117fc6eee442ead87709c1cb4c65db 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, wxGTK, itk, mesa, libXft, libXext, libXi, zlib, libXmu, +{ fetchurl, stdenv, cmake, wxGTK, itk, libGLU_combined, libXft, libXext, libXi, zlib, libXmu, libuuid }: assert (stdenv ? glibc); @@ -47,7 +47,7 @@ stdenv.mkDerivation { exit 1 ''; - buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu libuuid ]; + buildInputs = [ cmake wxGTK itk libGLU_combined 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 b0a6f7caf8852e3219205af0457e7da2c1083a93..1ebc2f88ec5da247563c5c052d0b169754bc8c47 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,37 +1,43 @@ -{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala_0_28, sqlite -, webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib -, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook -, gnome_doc_utils, hicolor_icon_theme, itstool, libgdata }: +{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite +, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib +, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook +, gobjectIntrospection, itstool, libgdata }: -# for dependencies see http://www.yorba.org/projects/shotwell/install/ +# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling -stdenv.mkDerivation rec { - version = "${major}.${minor}"; - major = "0.27"; - minor = "1"; - name = "shotwell-${version}"; +let + pname = "shotwell"; + version = "0.28.2"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0pa7lb33i4hdnz7hr7x938d48ilrnj47jzb99la79rmm08yyin8n"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; + nativeBuildInputs = [ + meson ninja vala pkgconfig itstool gettext desktop-file-utils wrapGAppsHook gobjectIntrospection + ]; - configureFlags = [ "--disable-gsettings-convert-install" ]; + buildInputs = [ + gtk3 libexif libgphoto2 libsoup libxml2 sqlite webkitgtk + gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee + libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas + libraw json-glib glib gdk_pixbuf librsvg gnome3.rest + gnome3.gcr gnome3.defaultIconTheme libgdata + ]; - preConfigure = '' - patchShebangs . + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala_0_28 sqlite webkitgtk - 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 - gnome_doc_utils gnome3.rest gnome3.gcr - gnome3.defaultIconTheme itstool libgdata ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index a8b4973203d1897e19448e99ba33ccbff658a486..2cc127a3fc6fa97c5d9bce3365542ebc49fbd847 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -8,6 +8,7 @@ let ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo + EncodeLocale TryTiny TypesSerialiser LWPMediaTypes ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 43d6229ab2bc90c57334dd593b4d58aaf01602c2..a1d0316631fa848564f57e668c8a960a044dd868 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype -, json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre +, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre +, wrapGAppsHook }: stdenv.mkDerivation rec { name = "solvespace-2.3-20170808"; @@ -11,11 +12,13 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig cmake wrapGAppsHook + ]; buildInputs = [ - cmake zlib libpng cairo freetype - json_c fontconfig gtkmm3 pangomm glew mesa_glu - xlibs.libpthreadstubs xlibs.libXdmcp pcre + zlib libpng cairo freetype + json_c fontconfig gtkmm3 pangomm glew libGLU + xorg.libpthreadstubs xorg.libXdmcp pcre ]; enableParallelBuilding = true; @@ -38,11 +41,11 @@ stdenv.mkDerivation rec { --replace /usr/bin/ $out/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "A parametric 3d CAD program"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ edef ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.edef ]; + platforms = platforms.linux; homepage = http://solvespace.com; }; } diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index 53bdbcd12740bb39caf4b555e057c5c9e0288337..94666531c0c89c0f5c1c504b2d97a41439757523 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -57,6 +57,5 @@ stdenv.mkDerivation rec { homepage = http://swingsane.com/; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 68597a23ca650996dffeea2aa94db098b8b0bd69..7f118b6adc9a45c62641c898a7b3a95acc63a7f7 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, libX11, imlib2, giflib, libexif, conf ? null }: +{ stdenv, fetchFromGitHub, libXft, imlib2, giflib, libexif, conf ? null }: with stdenv.lib; stdenv.mkDerivation rec { name = "sxiv-${version}"; - version = "1.3.2"; + version = "24"; src = fetchFromGitHub { owner = "muennich"; repo = "sxiv"; rev = "v${version}"; - sha256 = "1f4gz1qjhb44bbb3q5fqk439zyipkwnr19zhg89yq2pgmzzzqr2h"; + sha256 = "020n1bdxbzqncprh8a4rnjzc4frp335yxbqh5w6dr970f7n5qm8d"; }; postUnpack = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ libX11 imlib2 giflib libexif ]; + buildInputs = [ libXft imlib2 giflib libexif ]; postInstall = '' mkdir -p $out/share/applications/ diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 31908dcfd9f0b96b2e5238e86ee2d77891af1bcd..f1adc6bd10eaf0c017a16f03a83c26530f9b259f 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -22,7 +22,7 @@ let else if stdenv.system == "i686-linux" then "x86" else - abort "Unsupported platform"; + throw "Unsupported platform ${stdenv.system}"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index e951f3a7a9379e41c6b305a3cb1bc0266ae5c19f..c655cadef400866abaac7a92ecd504cd04e4510d 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms -, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}: +, intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}: stdenv.mkDerivation rec { name = "viewnior-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext - shared_mime_info glib gdk_pixbuf perl + shared-mime-info glib gdk_pixbuf perl ]; preFixup = '' diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index 38f63bdb38362a7219da1e81146cbc7cfd9c9df5..538931c1040ef8f917962a4ea519a417171b0fab 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, hicolor_icon_theme, defaultIconTheme +, hicolor-icon-theme, defaultIconTheme # Test requirements , dbus, xvfb_run, xdotool @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ hicolor_icon_theme defaultIconTheme librsvg ]; + buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index dcb7c512ddef508c59d646faca87860e8f44b0df..a8b4038b11f3cdf7cabd78ca4dd4b851bea3c376 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.17.1"; + version = "3.17.2"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "0fk1gai7yghfmfvx1rfzdnpwihbq6hqzncyk6zkpqdrf6zz576nl"; + sha256 = "0wpfvd3jqxgjk3xqkamvlg7rk0w0pmrv7srjfqns447ccc3i7qg2"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 52a17f5cbeb94ff13fddb321f32770fd6f4a49d2..0ed958b4e770d3dd8b50fa5dc82fb86d624effb0 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime }: @@ -10,7 +10,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch new file mode 100644 index 0000000000000000000000000000000000000000..1b5e12c7ec3243e6f7c0aeb154aef0dd307e48e4 --- /dev/null +++ b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch @@ -0,0 +1,49 @@ +From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 +From: gnidorah +Date: Fri, 22 Dec 2017 17:36:03 +0300 +Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" + +This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. +--- + CMakeLists.txt | 3 --- + KF5AkonadiConfig.cmake.in | 6 +++--- + 2 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9788bea94..15bad00fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -285,9 +285,6 @@ configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR +- AKONADI_INCLUDE_DIR +- KF5Akonadi_DATA_DIR + ) + + install(FILES +diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in +index 75abede50..10f039376 100644 +--- a/KF5AkonadiConfig.cmake.in ++++ b/KF5AkonadiConfig.cmake.in +@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@") + find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@") + find_dependency(Qt5Network "@QT_REQUIRED_VERSION@") + +-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") +-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") ++set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") ++set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") + + find_dependency(Boost "@Boost_MINIMUM_VERSION@") + +@@ -22,4 +22,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) + + # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed +-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") ++set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") +-- +2.15.1 + diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index bb7dac1b62a0662d3091c7290df74f3a93be31a5..cba0b1e59e3adb88435105650ddff01a82eacb77 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,6 +1,6 @@ { mkDerivation, copyPathsToStore, lib, kdepimTeam, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, }: @@ -12,20 +12,20 @@ mkDerivation { maintainers = kdepimTeam; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n kiconthemes kio kwindowsystem qttools ]; propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; - 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=""'' + CXXFLAGS = [ + ''-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 index 9e067f0a0008d16cd26362a6dcfc36e263dbec62..f828d503cc7701ed37baf34b1a603abac4e59f48 100644 --- a/pkgs/applications/kde/akonadi/series +++ b/pkgs/applications/kde/akonadi/series @@ -1,2 +1,3 @@ akonadi-paths.patch akonadi-timestamps.patch +0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix index 3d7bf26c794e3778f1e6fd0dd36c365fa60ca347..1470406d5a43e20808803724ec42ebfa4a1b03a4 100644 --- a/pkgs/applications/kde/akonadiconsole.nix +++ b/pkgs/applications/kde/akonadiconsole.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion, kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim, - ktextwidgets, kxmlgui, messagelib, qtbase, + ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian }: mkDerivation { @@ -16,6 +16,6 @@ mkDerivation { buildInputs = [ akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui - messagelib qtbase libkdepim + messagelib qtbase libkdepim akonadi-search xapian ]; } diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 54a834cba002a0d2e7d33c142c8f727b82387078..36dd1773b39eac78f4bd645d4d20d5f66817ae2a 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -63,7 +63,6 @@ let kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ]; }; in { - kdelibs = callPackage ./kdelibs { inherit attica phonon; }; akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar.nix {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; @@ -85,6 +84,7 @@ let incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; + kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; kate = callPackage ./kate.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; @@ -94,6 +94,7 @@ let kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; kdav = callPackage ./kdav.nix {}; + kdebugsettings = callPackage ./kdebugsettings.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; @@ -101,7 +102,9 @@ let kdepim-runtime = callPackage ./kdepim-runtime.nix {}; kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; + kdialog = callPackage ./kdialog.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; + kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; kholidays = callPackage ./kholidays.nix {}; @@ -124,9 +127,12 @@ let kontactinterface = callPackage ./kontactinterface.nix {}; korganizer = callPackage ./korganizer.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; + ksmtp = callPackage ./ksmtp {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; + kruler = callPackage ./kruler.nix {}; + ksystemlog = callPackage ./ksystemlog.nix {}; ktnef = callPackage ./ktnef.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; libgravatar = callPackage ./libgravatar.nix {}; @@ -134,6 +140,7 @@ let libkdcraw = callPackage ./libkdcraw.nix {}; libkdepim = callPackage ./libkdepim.nix {}; libkexiv2 = callPackage ./libkexiv2.nix {}; + libkgapi = callPackage ./libkgapi.nix {}; libkipi = callPackage ./libkipi.nix {}; libkleo = callPackage ./libkleo.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; @@ -153,8 +160,6 @@ let print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; syndication = callPackage ./syndication.nix {}; - - l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; }); }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 1542b9c25190a865385b76c9c85c5976d3a9259b..9ad488f63ab44a4c1ff11d0020bbd97696f51ffa 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.08.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch index 6275bb84c17b08ba15460d127ec53a3ad9451d23..fe8b15febf2eb5022f6a5de79df924446d682daa 100644 --- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch +++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch @@ -11,11 +11,72 @@ Index: grantleetheme-17.04.0/src/grantleetheme_p.h QString author; QString email; -Index: grantleetheme-17.04.0/src/grantleetheme.cpp +Index: grantleetheme-17.04.0/src/grantleetheme.h +=================================================================== +--- grantleetheme-17.04.0.orig/src/grantleetheme.h ++++ grantleetheme-17.04.0/src/grantleetheme.h +@@ -50,11 +50,14 @@ public: + QStringList displayExtraVariables() const; + QString dirName() const; + QString absolutePath() const; ++ QStringList absolutePaths() const; + QString author() const; + QString authorEmail() const; + + QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); + ++ void addThemeDir(const QString&); ++ + static void addPluginPath(const QString &path); + + private: +Index: grantleetheme-17.04.0/src/grantleethememanager.cpp =================================================================== ---- grantleetheme-17.04.0.orig/src/grantleetheme.cpp -+++ grantleetheme-17.04.0/src/grantleetheme.cpp -@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr +--- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp ++++ grantleetheme-17.04.0/src/grantleethememanager.cpp +@@ -142,25 +142,18 @@ public: + + for (const QString &directory : qAsConst(themesDirectories)) { + QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); +- QStringList alreadyLoadedThemeName; + while (dirIt.hasNext()) { + dirIt.next(); + const QString dirName = dirIt.fileName(); + GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + QString themeName = theme.name(); +- if (alreadyLoadedThemeName.contains(themeName)) { +- int i = 2; +- const QString originalName(theme.name()); +- while (alreadyLoadedThemeName.contains(themeName)) { +- themeName = originalName + QStringLiteral(" (%1)").arg(i); +- ++i; +- } +- theme.d->name = themeName; ++ QMap::iterator i = themes.find(dirName); ++ if (i != themes.end()) { ++ i.value().addThemeDir(dirIt.filePath()); ++ } else { ++ themes.insert(dirName, theme); + } +- alreadyLoadedThemeName << themeName; +- themes.insert(dirName, theme); +- //qDebug()<<" theme.name()"<addDir(directory); +@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con + GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + if (dirName == themeName) { +- return theme.absolutePath(); ++ return theme.absolutePaths().first(); + } + } + } +--- src/grantleetheme.cpp.orig 2017-12-22 16:11:39.863598126 +0300 ++++ ./src/grantleetheme.cpp 2017-12-22 16:16:14.045664607 +0300 +@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePr , description(other.description) , name(other.name) , dirName(other.dirName) @@ -24,7 +85,7 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp , author(other.author) , email(other.email) , loader(other.loader) -@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine() +@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine() void ThemePrivate::setupLoader() { @@ -38,13 +99,13 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp + templateDirs << dir.absolutePath(); + } - loader = QSharedPointer::create(); + loader = QSharedPointer::create(); - loader->setTemplateDirs({ dir.absolutePath() }); + loader->setTemplateDirs(templateDirs); loader->setTheme(dirName); if (!sEngine) { -@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c +@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, c KConfigGroup group(&config, QStringLiteral("Desktop Entry")); if (group.isValid()) { d->dirName = dirName; @@ -53,7 +114,7 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp d->name = group.readEntry("Name", QString()); d->description = group.readEntry("Description", QString()); d->themeFileName = group.readEntry("FileName", QString()); -@@ -141,7 +142,7 @@ Theme::~Theme() +@@ -140,7 +143,7 @@ Theme::~Theme() bool Theme::operator==(const Theme &other) const { @@ -62,7 +123,7 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp } Theme &Theme::operator=(const Theme &other) -@@ -185,7 +186,12 @@ QString Theme::dirName() const +@@ -184,7 +187,12 @@ QString Theme::dirName() const QString Theme::absolutePath() const { @@ -76,7 +137,7 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp } QString Theme::author() const -@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem +@@ -223,6 +231,13 @@ QString Theme::render(const QString &tem return result; } @@ -90,66 +151,3 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp void Theme::addPluginPath(const QString &path) { if (!ThemePrivate::sEngine) { -Index: grantleetheme-17.04.0/src/grantleetheme.h -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleetheme.h -+++ grantleetheme-17.04.0/src/grantleetheme.h -@@ -50,11 +50,14 @@ public: - QStringList displayExtraVariables() const; - QString dirName() const; - QString absolutePath() const; -+ QStringList absolutePaths() const; - QString author() const; - QString authorEmail() const; - - QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); - -+ void addThemeDir(const QString&); -+ - static void addPluginPath(const QString &path); - - private: -Index: grantleetheme-17.04.0/src/grantleethememanager.cpp -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp -+++ grantleetheme-17.04.0/src/grantleethememanager.cpp -@@ -142,25 +142,18 @@ public: - - for (const QString &directory : qAsConst(themesDirectories)) { - QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); -- QStringList alreadyLoadedThemeName; - while (dirIt.hasNext()) { - dirIt.next(); - const QString dirName = dirIt.fileName(); - GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - QString themeName = theme.name(); -- if (alreadyLoadedThemeName.contains(themeName)) { -- int i = 2; -- const QString originalName(theme.name()); -- while (alreadyLoadedThemeName.contains(themeName)) { -- themeName = originalName + QStringLiteral(" (%1)").arg(i); -- ++i; -- } -- theme.d->name = themeName; -+ QMap::iterator i = themes.find(dirName); -+ if (i != themes.end()) { -+ i.value().addThemeDir(dirIt.filePath()); -+ } else { -+ themes.insert(dirName, theme); - } -- alreadyLoadedThemeName << themeName; -- themes.insert(dirName, theme); -- //qDebug()<<" theme.name()"<addDir(directory); -@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con - GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - if (dirName == themeName) { -- return theme.absolutePath(); -+ return theme.absolutePaths().first(); - } - } - } diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index b032de8487943c09e21869b9634f1c8e35db615f..9b16485cfa770bf968539c09beb664c4342e78be 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -1,5 +1,5 @@ { mkDerivation, lib -, extra-cmake-modules, kdoctools, makeWrapper, shared_mime_info +, extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info , qtwebkit , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , flac, lame, libmad, libmpcdec, libvorbis @@ -16,7 +16,7 @@ mkDerivation { platforms = platforms.linux; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - propagatedBuildInputs = [ + buildInputs = [ # qt qtwebkit # kde @@ -28,15 +28,21 @@ mkDerivation { # cd/dvd cdparanoia libdvdcss libdvdread # others - ffmpeg libmusicbrainz3 shared_mime_info + ffmpeg libmusicbrainz3 shared-mime-info ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = - let k3bPath = lib.makeBinPath [ - cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode - vcdimager - ]; + let + binPath = lib.makeBinPath [ + cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode + vcdimager flac + ]; + libraryPath = lib.makeLibraryPath [ + cdparanoia + ]; in '' - wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}" + wrapProgram "$out/bin/k3b" \ + --prefix PATH : "${binPath}" \ + --prefix LD_LIBRARY_PATH : ${libraryPath} ''; } diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix new file mode 100644 index 0000000000000000000000000000000000000000..9978e7ff66749290e77666a212f92c45c3d78ea1 --- /dev/null +++ b/pkgs/applications/kde/kalarm.nix @@ -0,0 +1,37 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + + kauth, kcodecs, kcompletion, kconfig, kconfigwidgets, kdbusaddons, kdoctools, + kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio, + knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon, + + kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalcore, kcalutils, + kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime, + pimcommon, kpimtextedit, kdepim-apps-libs, messagelib, + + qtx11extras, + + kdepim-runtime +}: + +mkDerivation { + name = "kalarm"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.rittelle ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kauth kcodecs kcompletion kconfig kconfigwidgets kdbusaddons kdoctools + kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio + knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon + + kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalcore kcalutils + kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime + pimcommon kpimtextedit kdepim-apps-libs messagelib + + qtx11extras + ]; + propagatedUserEnvPkgs = [ kdepim-runtime ]; +} diff --git a/pkgs/applications/kde/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix deleted file mode 100644 index daf0a55b19e5f135c450f6b9437fc71e83c1fd65..0000000000000000000000000000000000000000 --- a/pkgs/applications/kde/kde-locale-4.nix +++ /dev/null @@ -1,27 +0,0 @@ -name: args: - -{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }: - -mkDerivation (args // { - sname = "kde-l10n-${name}"; - name = "kde-l10n-${name}-qt4"; - - outputs = [ "out" ]; - - nativeBuildInputs = - [ automoc4 cmake gettext perl ] - ++ (args.nativeBuildInputs or []); - buildInputs = - [ kdelibs ] - ++ (args.buildInputs or []); - - preConfigure = '' - sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt - ${args.preConfigure or ""} - ''; - - preFixup = '' - propagatedBuildInputs= - propagatedNativeBuildInputs= - ''; -}) diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix new file mode 100644 index 0000000000000000000000000000000000000000..a58e1b25a2ee837e2fe3a0883f3291284f8ac8d2 --- /dev/null +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + gettext, + kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, + python +}: + +mkDerivation { + name = "kdebugsettings"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.rittelle ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python + ]; + propagatedUserEnvPkgs = [ ]; +} diff --git a/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch deleted file mode 100644 index b7d7300e9a84d34fc36b43bb5420ee447adc976c..0000000000000000000000000000000000000000 --- a/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 7 Sep 2015 13:54:57 -0500 -Subject: [PATCH 1/2] old kde4 cmake policies - ---- - cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - -diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake -index 7d54b9b..c435571 100644 ---- a/cmake/modules/FindKDE4Internal.cmake -+++ b/cmake/modules/FindKDE4Internal.cmake -@@ -345,6 +345,39 @@ - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -+# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below -+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) -+# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3) -+cmake_policy(VERSION 2.4.5) -+ -+# CMake 2.6, set compatibility behaviour to cmake 2.4 -+# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above -+# resets the policy settings, so we get a lot of warnings -+ -+# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough -+cmake_policy(SET CMP0000 OLD) -+# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests -+cmake_policy(SET CMP0002 OLD) -+# CMP0003: add the link paths to the link command as with cmake 2.4 -+cmake_policy(SET CMP0003 OLD) -+# CMP0005: keep escaping behaviour for definitions added via add_definitions() -+cmake_policy(SET CMP0005 OLD) -+# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file -+# where this is done, macros and functions are executed with the policies as they -+# were when the were defined. Keep the OLD behaviour so we can set the policies here -+# for all KDE software without the big warning -+cmake_policy(SET CMP0011 OLD) -+ -+# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files -+# in this directory over those from CMAKE_MODULE_PATH -+cmake_policy(SET CMP0017 NEW) -+ -+# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake -+if (POLICY CMP0026) -+ cmake_policy(SET CMP0026 OLD) -+endif (POLICY CMP0026) -+ -+ - # Only do something if it hasn't been found yet - if(NOT KDE4_FOUND) - --- -2.5.0 - diff --git a/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch b/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch deleted file mode 100644 index ff0306ea1488b12fe67eaee4edfd6bf5c4a8e672..0000000000000000000000000000000000000000 --- a/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 7 Sep 2015 13:56:03 -0500 -Subject: [PATCH 2/2] polkit install path - ---- - kdecore/auth/ConfigureChecks.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake -index 7cf9cb5..c8334ae 100644 ---- a/kdecore/auth/ConfigureChecks.cmake -+++ b/kdecore/auth/ConfigureChecks.cmake -@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1") - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) --- -2.5.0 - diff --git a/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch deleted file mode 100644 index a79d7b2b7d16860df62268a10c679b7f438a5530..0000000000000000000000000000000000000000 --- a/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp -index ab8f76d..2ae5089 100644 ---- a/kdecore/kernel/kstandarddirs.cpp -+++ b/kdecore/kernel/kstandarddirs.cpp -@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults() - else - { - xdgdirList.clear(); -- xdgdirList.append(QString::fromLatin1("/etc/xdg")); --#ifdef Q_WS_WIN -- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); --#else -- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); --#endif - } - - QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); -@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults() - } - } else { - xdgdirList = kdedirDataDirs; --#ifndef Q_WS_WIN -- xdgdirList.append(QString::fromLatin1("/usr/local/share/")); -- xdgdirList.append(QString::fromLatin1("/usr/share/")); --#endif - } - - localXdgDir = readEnvPath("XDG_DATA_HOME"); -diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp -index 4c9cad9..6849d45 100644 ---- a/solid/solid/xdgbasedirs.cpp -+++ b/solid/solid/xdgbasedirs.cpp -@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource ) - { - if ( qstrncmp( "data", resource, 4 ) == 0 ) { - if ( instance()->mDataDirs.isEmpty() ) { -- instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" ); -+ instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" ); - } - return instance()->mDataDirs; - } else if ( qstrncmp( "config", resource, 6 ) == 0 ) { - if ( instance()->mConfigDirs.isEmpty() ) { -- instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" ); -+ instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" ); - } - return instance()->mConfigDirs; - } diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix deleted file mode 100644 index 31e578e228a981554d74f7c9d8f426e4930132c3..0000000000000000000000000000000000000000 --- a/pkgs/applications/kde/kdelibs/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - 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 -}: - -mkDerivation { - name = "kdelibs"; - - outputs = [ "out" "dev" ]; - - outputInclude = "out"; - - setOutputFlags = false; - - nativeBuildInputs = [ - automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info - ]; - buildInputs = [ - attica attr avahi giflib libdbusmenu_qt libjpeg libxml2 - polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre - ]; - propagatedBuildInputs = [ qt4 soprano phonon strigi ]; - - patches = [ - ./0001-old-kde4-cmake-policies.patch - ./0002-polkit-install-path.patch - ./0003-remove_xdg_impurities.patch - ]; - - # cmake does not detect path to `ilmbase` - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - - cmakeFlags = [ - "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" - "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - "-DWITH_SOLID_UDISKS2=ON" - "-DKDE_DEFAULT_HOME=.kde" - ]; - - meta = { - platforms = lib.platforms.linux; - homepage = http://www.kde.org; - license = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 17d7da7b702c537715ad29909f38f7ce138dec47..b5eca47d6c0eb5791786b3d9b7a486898633d6cd 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -21,7 +21,7 @@ , kplotting , ktextwidgets , mlt -, shared_mime_info +, shared-mime-info , libv4l , kfilemetadata , ffmpeg @@ -62,7 +62,7 @@ mkDerivation { qtquickcontrols qtscript qtwebkit - shared_mime_info + shared-mime-info libv4l ffmpeg ]; diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index 0fde861a023783a9bdb113e3a9fc208eeccd50c3..b3cfed91dd45c73342ec7dbe75294db36cfa5582 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -1,11 +1,11 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - shared_mime_info, + shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - pimcommon, qtwebengine, + pimcommon, qtwebengine, libkgapi }: mkDerivation { @@ -14,12 +14,12 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine - pimcommon + pimcommon libkgapi ]; # Attempts to build some files before dependencies have been generated enableParallelBuilding = false; diff --git a/pkgs/applications/kde/kdialog.nix b/pkgs/applications/kde/kdialog.nix new file mode 100644 index 0000000000000000000000000000000000000000..df301af0cbac8b451f0016d156b5f7f8910424ff --- /dev/null +++ b/pkgs/applications/kde/kdialog.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kinit, kguiaddons, kwindowsystem +}: + +mkDerivation { + name = "kdialog"; + + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = with lib.maintainers; [ peterhoeg ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + propagatedBuildInputs = [ kinit kguiaddons kwindowsystem ]; +} diff --git a/pkgs/applications/kde/kget.nix b/pkgs/applications/kde/kget.nix new file mode 100644 index 0000000000000000000000000000000000000000..6a50f1d08d1ce34825001e319eb41930d0cf712b --- /dev/null +++ b/pkgs/applications/kde/kget.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme, + kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui +}: + +mkDerivation { + name = "kget"; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + buildInputs = [ + kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme + kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui + ]; + + meta = with lib; { + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index a78da6f48ca2d9a958534ba19ce2a0cdc432dcbd..13585848317b90aa1de030f8ce6433e1ca256921 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -1,5 +1,5 @@ { - mkDerivation, 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, @@ -12,11 +12,11 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support kpty libmtp libssh openexr openslp phonon qtsvg samba solid ]; - NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; + CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix index 9f3d5e2ea0190870dafc898982caf5ddb6c615e4..f380315cce903a8aac28e840e00784cd8f4839a7 100644 --- a/pkgs/applications/kde/kmail-account-wizard.nix +++ b/pkgs/applications/kde/kmail-account-wizard.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, shared_mime_info, + extra-cmake-modules, kdoctools, shared-mime-info, akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo, pimcommon, qttools, @@ -12,7 +12,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index 19ce2ba94f30ac8c0db2e6c45dd9360431ed3070..c4b7c0ab4327a545900c28c4584961cec32184dc 100644 --- a/pkgs/applications/kde/kmailtransport.nix +++ b/pkgs/applications/kde/kmailtransport.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, + akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ akonadi kcmutils ki18n kio ]; + buildInputs = [ akonadi kcmutils ki18n kio ksmtp ]; propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index b18a3f7fdc1e4c35e4f6f896e86c401632fb8763..4523a69fc1be016edb76f3581f21e95ec0a6b3d7 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -10,7 +10,7 @@ mkDerivation { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules ki18n ]; - buildInputs = [ kcodecs qtbase ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcodecs ki18n qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index d6de2521533958d56b5813c16a7c6f0f05c037ec..d2b96bf6100e816925e83e1e12f4e1d2f5a3e124 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kdelibs4support, kdnssd, libvncserver, libXtst, qtx11extras + kdelibs4support, kdnssd, libvncserver, libXtst, libXdamage, qtx11extras }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { maintainers = with lib.maintainers; [ jerith666 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ libvncserver libXtst qtx11extras ]; + buildInputs = [ libvncserver libXtst libXdamage qtx11extras ]; propagatedBuildInputs = [ kdelibs4support kdnssd ]; } diff --git a/pkgs/applications/kde/kruler.nix b/pkgs/applications/kde/kruler.nix new file mode 100644 index 0000000000000000000000000000000000000000..2018245cfcb2b6649620f5fca87b3e700f60e590 --- /dev/null +++ b/pkgs/applications/kde/kruler.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + knotifications, kwindowsystem, kxmlgui, qtx11extras +}: + +mkDerivation { + name = "kruler"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.vandenoever ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kwindowsystem knotifications kxmlgui qtx11extras + ]; +} diff --git a/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch new file mode 100644 index 0000000000000000000000000000000000000000..74e83761eb7d5ab15cd974fc44d5e0cfbfea6b38 --- /dev/null +++ b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch @@ -0,0 +1,25 @@ +From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001 +From: gnidorah +Date: Fri, 22 Dec 2017 19:32:47 +0300 +Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 83c2bcb..5f6d47c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS + REQUIRED_HEADERS KSMTP_HEADERS + ) + +-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h +-- +2.15.1 + diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6a5f51a17bfe9864af766a9b6fcfe5d7d7e28aab --- /dev/null +++ b/pkgs/applications/kde/ksmtp/default.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kcoreaddons, kio, kmime, cyrus_sasl +}: + +mkDerivation { + name = "ksmtp"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcoreaddons kio kmime ]; + propagatedBuildInputs = [ cyrus_sasl ]; + patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ]; +} diff --git a/pkgs/applications/kde/ksystemlog.nix b/pkgs/applications/kde/ksystemlog.nix new file mode 100644 index 0000000000000000000000000000000000000000..bec92d55966d8a62d077bc3987ca4a7455c5cb20 --- /dev/null +++ b/pkgs/applications/kde/ksystemlog.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, + extra-cmake-modules, gettext, kdoctools, + karchive, kconfig, kio +}: + +mkDerivation { + name = "ksystemlog"; + + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; + propagatedBuildInputs = [ karchive kconfig kio ]; + + meta = with lib; { + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix deleted file mode 100644 index 10a8472d5a9ed4c6208984d387c3f78cf9a99771..0000000000000000000000000000000000000000 --- a/pkgs/applications/kde/l10n.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ callPackage, recurseIntoAttrs, lib }: - -let - - kdeLocale4 = import ./kde-locale-4.nix; - -in - -lib.mapAttrs (name: attr: recurseIntoAttrs attr) { - ar = { - qt4 = callPackage (kdeLocale4 "ar" {}) {}; - }; - bg = { - qt4 = callPackage (kdeLocale4 "bg" {}) {}; - }; - bs = { - qt4 = callPackage (kdeLocale4 "bs" {}) {}; - }; - ca = { - qt4 = callPackage (kdeLocale4 "ca" {}) {}; - }; - ca_valencia = { - qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {}; - }; - cs = { - qt4 = callPackage (kdeLocale4 "cs" {}) {}; - }; - da = { - qt4 = callPackage (kdeLocale4 "da" {}) {}; - }; - de = { - qt4 = callPackage (kdeLocale4 "de" {}) {}; - }; - el = { - qt4 = callPackage (kdeLocale4 "el" {}) {}; - }; - en_GB = { - qt4 = callPackage (kdeLocale4 "en_GB" {}) {}; - }; - eo = { - qt4 = callPackage (kdeLocale4 "eo" {}) {}; - }; - es = { - qt4 = callPackage (kdeLocale4 "es" {}) {}; - }; - et = { - qt4 = callPackage (kdeLocale4 "et" {}) {}; - }; - eu = { - qt4 = callPackage (kdeLocale4 "eu" {}) {}; - }; - fa = { - qt4 = callPackage (kdeLocale4 "fa" {}) {}; - }; - fi = { - qt4 = callPackage (kdeLocale4 "fi" {}) {}; - }; - fr = { - qt4 = callPackage (kdeLocale4 "fr" {}) {}; - }; - ga = { - qt4 = callPackage (kdeLocale4 "ga" {}) {}; - }; - gl = { - qt4 = callPackage (kdeLocale4 "gl" {}) {}; - }; - he = { - qt4 = callPackage (kdeLocale4 "he" {}) {}; - }; - hi = { - qt4 = callPackage (kdeLocale4 "hi" {}) {}; - }; - hr = { - qt4 = callPackage (kdeLocale4 "hr" {}) {}; - }; - hu = { - qt4 = callPackage (kdeLocale4 "hu" {}) {}; - }; - ia = { - qt4 = callPackage (kdeLocale4 "ia" {}) {}; - }; - id = { - qt4 = callPackage (kdeLocale4 "id" {}) {}; - }; - is = { - qt4 = callPackage (kdeLocale4 "is" {}) {}; - }; - it = { - qt4 = callPackage (kdeLocale4 "it" {}) {}; - }; - ja = { - qt4 = callPackage (kdeLocale4 "ja" {}) {}; - }; - kk = { - qt4 = callPackage (kdeLocale4 "kk" {}) {}; - }; - km = { - qt4 = callPackage (kdeLocale4 "km" {}) {}; - }; - ko = { - qt4 = callPackage (kdeLocale4 "ko" {}) {}; - }; - lt = { - qt4 = callPackage (kdeLocale4 "lt" {}) {}; - }; - lv = { - qt4 = callPackage (kdeLocale4 "lv" {}) {}; - }; - mr = { - qt4 = callPackage (kdeLocale4 "mr" {}) {}; - }; - nb = { - qt4 = callPackage (kdeLocale4 "nb" {}) {}; - }; - nds = { - qt4 = callPackage (kdeLocale4 "nds" {}) {}; - }; - nl = { - qt4 = callPackage (kdeLocale4 "nl" {}) {}; - }; - nn = { - qt4 = callPackage (kdeLocale4 "nn" {}) {}; - }; - pa = { - qt4 = callPackage (kdeLocale4 "pa" {}) {}; - }; - pl = { - qt4 = callPackage (kdeLocale4 "pl" {}) {}; - }; - pt = { - qt4 = callPackage (kdeLocale4 "pt" {}) {}; - }; - pt_BR = { - qt4 = callPackage (kdeLocale4 "pt_BR" {}) {}; - }; - ro = { - qt4 = callPackage (kdeLocale4 "ro" {}) {}; - }; - ru = { - qt4 = callPackage (kdeLocale4 "ru" {}) {}; - }; - sk = { - qt4 = callPackage (kdeLocale4 "sk" {}) {}; - }; - sl = { - qt4 = callPackage (kdeLocale4 "sl" {}) {}; - }; - sr = { - qt4 = callPackage (kdeLocale4 "sr" { - preConfigure = '' - patchShebangs \ - 4/sr/sr@latin/scripts/ts-pmap-compile.py \ - 4/sr/scripts/ts-pmap-compile.py \ - 4/sr/data/resolve-sr-hybrid \ - 4/sr/sr@ijekavian/scripts/ts-pmap-compile.py \ - 4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py - ''; - }) {}; - }; - sv = { - qt4 = callPackage (kdeLocale4 "sv" {}) {}; - }; - tr = { - qt4 = callPackage (kdeLocale4 "tr" {}) {}; - }; - ug = { - qt4 = callPackage (kdeLocale4 "ug" {}) {}; - }; - uk = { - qt4 = callPackage (kdeLocale4 "uk" {}) {}; - }; - wa = { - qt4 = callPackage (kdeLocale4 "wa" {}) {}; - }; - zh_CN = { - qt4 = callPackage (kdeLocale4 "zh_CN" {}) {}; - }; - zh_TW = { - qt4 = callPackage (kdeLocale4 "zh_TW" {}) {}; - }; -} diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix index edd9732d051bca1f0f4d9b3d4275d78c1e0e5f18..3fd486056542899b2625daf5dd5990219b0bcb4a 100644 --- a/pkgs/applications/kde/libkcddb.nix +++ b/pkgs/applications/kde/libkcddb.nix @@ -8,8 +8,8 @@ mkDerivation { license = with licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ qtbase ]; propagatedBuildInputs = [ kcodecs ki18n kio kwidgetsaddons libmusicbrainz5 diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix new file mode 100644 index 0000000000000000000000000000000000000000..7ff3a1f04b09931902e376d6c41ecf31ece2bf47 --- /dev/null +++ b/pkgs/applications/kde/libkgapi.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + qtwebengine, kio, kcalcore, kcontacts +}: + +mkDerivation { + name = "libkgapi"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ qtwebengine kio kcalcore kcontacts ]; +} diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 1217c29032b40f6162c8bc983eb4de89c935ffa7..e0e80b05ebcec67e1cc080a0b65ad1496da3c790 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -1,7 +1,7 @@ { mkDerivation, lib , extra-cmake-modules, kdoctools , qtscript, qtsvg, qtquickcontrols, qtwebkit -, krunner, shared_mime_info, kparts, knewstuff +, krunner, shared-mime-info, kparts, knewstuff , gpsd, perl }: @@ -10,7 +10,7 @@ mkDerivation { meta.license = with lib.licenses; [ lgpl21 gpl3 ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; propagatedBuildInputs = [ - qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts + qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts knewstuff gpsd ]; } diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix index aa637d440bd9df01f9c034cd1cacfdf154dec794..0704003353aed4d63cf0967fddcc6c55ec6df3f0 100644 --- a/pkgs/applications/kde/mbox-importer.nix +++ b/pkgs/applications/kde/mbox-importer.nix @@ -14,7 +14,4 @@ mkDerivation { buildInputs = [ akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib ]; - preHook = '' - set -x - ''; } diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index fd628a7aacfd48880e6fd31e1ca723c383999ad7..efe850ab414d48acdc9e08f51621fb14ab6cf94d 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -1,5 +1,5 @@ { mkDerivation -, lib, extra-cmake-modules +, lib, extra-cmake-modules, gettext, python , drumstick, fluidsynth , kcoreaddons, kcrash, kdoctools , qtquickcontrols2, qtsvg, qttools @@ -12,11 +12,13 @@ mkDerivation { maintainers = with maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; + propagatedBuildInputs = [ drumstick fluidsynth kcoreaddons kcrash qtquickcontrols2 qtsvg qttools ]; + enableParallelBuilding = true; } diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index 422968be35a53fd749212701ad800876169f5f47..0ac8ddebc75d704a3381fb2d72ab880f5e161c2f 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, qtscript, kconfig, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, - shared_mime_info + shared-mime-info }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { maintainers = with lib.maintainers; [ peterhoeg ]; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; - buildInputs = [ shared_mime_info ]; + buildInputs = [ shared-mime-info ]; propagatedBuildInputs = [ kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 karchive kcrash diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 64511aabf7c0998f1be1a4ae25b17f8b1594a72d..5f6f28c95b0827e115d294b9f503aa24d673105f 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -1,25 +1,27 @@ { - mkDerivation, lib, + stdenv, 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, phonon, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver + chmlib ? null, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, + kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, + kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, + kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5, + qtdeclarative, qtsvg, threadweaver }: 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; + discount djvulibre ebook_tools kactivities karchive kbookmarks + kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons + kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet + kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 + qtdeclarative qtsvg threadweaver + ] ++ lib.optional (!stdenv.isAarch64) chmlib; + meta = with lib; { homepage = http://www.kde.org; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; + license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; + maintainers = with maintainers; [ ttuegel ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 2edfb0d79bb3926acbd4f627f01ef39cbed0f8c4..d61784805e45386ef7d9b708b48f37a54c421446 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,2235 +3,1691 @@ { akonadi = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-17.08.3.tar.xz"; - sha256 = "01sn0c5b679v76djpd7rx3cgzn3idpsjc3m3wgrvjzfyqs18f2al"; - name = "akonadi-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz"; + sha256 = "006cb98k3kxd51d0d07984aj4d0km0bn0v3rigpa3sw5s07w8dfi"; + name = "akonadi-17.12.3.tar.xz"; }; }; akonadi-calendar = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-17.08.3.tar.xz"; - sha256 = "1w14a27k0hw4i9vnv2bkh12jpvb6jh31i6jd4hxaxvvmmjwl68b6"; - name = "akonadi-calendar-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-17.12.3.tar.xz"; + sha256 = "0ffrnpwyjmvx80qziajdkihdzl5pyp0zbm8qg8wkcr8nxs3fgv6a"; + name = "akonadi-calendar-17.12.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-tools-17.08.3.tar.xz"; - sha256 = "19b5my6svq32nwagkq5p0al7mzf844d4pp0764irgdcfk6ciakkw"; - name = "akonadi-calendar-tools-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz"; + sha256 = "0836al499pd0bmwgaqzmbbmas3jmn44hv37y9k6j6ab71gpkjjy9"; + name = "akonadi-calendar-tools-17.12.3.tar.xz"; }; }; akonadiconsole = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadiconsole-17.08.3.tar.xz"; - sha256 = "1ccmdarzb60f22ypnfmr1gzrc7byw08c2h3zhni9g1jab327i2vk"; - name = "akonadiconsole-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/akonadiconsole-17.12.3.tar.xz"; + sha256 = "0xny4y5i03sj93dxaafnqiyczichjnzjrx1h4z13fn62flz8fn1b"; + name = "akonadiconsole-17.12.3.tar.xz"; }; }; akonadi-contacts = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-contacts-17.08.3.tar.xz"; - sha256 = "0fh9rja4dlvambx6ig4gszgr26rrxfhmgdn0541fsg5hpkpifsx9"; - name = "akonadi-contacts-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/akonadi-contacts-17.12.3.tar.xz"; + sha256 = "0jbxyzvpp2lan8pi212adwflqx38paqvr661ia4zmdjnkhdvi95v"; + name = "akonadi-contacts-17.12.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-import-wizard-17.08.3.tar.xz"; - sha256 = "1hza7bl6anzxp32dpw79v73lgqssmdw32qhkinnacws7x9kcvpag"; - name = "akonadi-import-wizard-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/akonadi-import-wizard-17.12.3.tar.xz"; + sha256 = "0knddbgirj55l24njak7s8ixg1v9i6g5nx6ijh6cnnbr2zl6aws4"; + name = "akonadi-import-wizard-17.12.3.tar.xz"; }; }; akonadi-mime = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-mime-17.08.3.tar.xz"; - sha256 = "1374wvyh29ba5s60m8przch5rmxvxzc2kjfw1gxhkrl7k8hfi4k8"; - name = "akonadi-mime-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/akonadi-mime-17.12.3.tar.xz"; + sha256 = "0n04x37palp2k6mq20p97k89qi2zfncaapn5pcf4372bzvzi9vj2"; + name = "akonadi-mime-17.12.3.tar.xz"; }; }; akonadi-notes = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-notes-17.08.3.tar.xz"; - sha256 = "0bnr6j8pqqx6hg8hq51yzaky5hyym5lxyj9rwcsmm75x2c29wxb7"; - name = "akonadi-notes-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/akonadi-notes-17.12.3.tar.xz"; + sha256 = "0lwnyl12a5sc3ijmahqy3prdzh9352rsqp2jpw2y58xpa2sx0w3g"; + name = "akonadi-notes-17.12.3.tar.xz"; }; }; akonadi-search = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akonadi-search-17.08.3.tar.xz"; - sha256 = "16d6v2d1irh02kd4dcvjhv17sqkps4xq4dpa4x1wb3q5qzxhmqcr"; - name = "akonadi-search-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/akonadi-search-17.12.3.tar.xz"; + sha256 = "0npnbnras7lxs4r1g0v2nynpdni7wni7y9hy30k61lbif06ghm9x"; + name = "akonadi-search-17.12.3.tar.xz"; }; }; akregator = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/akregator-17.08.3.tar.xz"; - sha256 = "1jd48yj9sl4z46qfk3qkm98q33f1qblsyjdr7ff8znxkg2pw5xg6"; - name = "akregator-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/akregator-17.12.3.tar.xz"; + sha256 = "0032jg05xwk29hpqscb5xfk7ipcpprhw8m28ksfx7v77fb025dsp"; + name = "akregator-17.12.3.tar.xz"; }; }; analitza = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/analitza-17.08.3.tar.xz"; - sha256 = "1j0z63sfah2ypjb3szcr7dqndw18lcy8l9440q8kzq0gyl83cn3v"; - name = "analitza-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/analitza-17.12.3.tar.xz"; + sha256 = "0xyr5s69768l0lp1qkp68jvny8mfh36q1xpz8msdhcn4513bw5sw"; + name = "analitza-17.12.3.tar.xz"; }; }; ark = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ark-17.08.3.tar.xz"; - sha256 = "1qz333nd23x4ldx675cxs7ka2vz45xmkfsakdg8m3x26i7jnl86x"; - name = "ark-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ark-17.12.3.tar.xz"; + sha256 = "0hjnzcn6ijpgqld7034gwzyl9m0i5nwac457f010ibzf0qp10gdi"; + name = "ark-17.12.3.tar.xz"; }; }; artikulate = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/artikulate-17.08.3.tar.xz"; - sha256 = "13hg9cjdwhfya57xan96ma55msani0lx7v55zh0hv0jab9fxgv1n"; - name = "artikulate-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/artikulate-17.12.3.tar.xz"; + sha256 = "0ynbq0m7rk4mm3khjsh0bl744g7m6l2cq9v2a4slg7n4dq8gr8zx"; + name = "artikulate-17.12.3.tar.xz"; }; }; audiocd-kio = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/audiocd-kio-17.08.3.tar.xz"; - sha256 = "0n1xfypn2m56iw65p52yfbbqn17c6kc1x8syh35ifg9c1147y8ar"; - name = "audiocd-kio-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/audiocd-kio-17.12.3.tar.xz"; + sha256 = "0916igzdp1v9zafq5jwhwsfja5h9zsbqgwq97mnkmx9bnd4d2r26"; + name = "audiocd-kio-17.12.3.tar.xz"; }; }; baloo-widgets = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/baloo-widgets-17.08.3.tar.xz"; - sha256 = "031yhv8ivqzr63maylsin60hfv45awry6xigfy0kfqj06q63944g"; - name = "baloo-widgets-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/baloo-widgets-17.12.3.tar.xz"; + sha256 = "1gn18raxqwjx09l54a4gaisxlv4i2vf7pnpv8fqfdk49wc06b58h"; + name = "baloo-widgets-17.12.3.tar.xz"; }; }; blinken = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/blinken-17.08.3.tar.xz"; - sha256 = "15nnsyqy73inqqys1r8khh1vvl24ljmgjpxlqg8vlfb6d8dsc8yx"; - name = "blinken-17.08.3.tar.xz"; - }; - }; - blogilo = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/blogilo-17.08.3.tar.xz"; - sha256 = "18vbvs5cih9vcxfqsia35q8bzc4ldzaajvnv9iqmisg060fxfwi9"; - name = "blogilo-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/blinken-17.12.3.tar.xz"; + sha256 = "0lda34yw7h867jzfqi071yw0g47916cmr145x1gz71nclg9sdgr0"; + name = "blinken-17.12.3.tar.xz"; }; }; bomber = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/bomber-17.08.3.tar.xz"; - sha256 = "1rmjlhyc46jxjsc303zl56c3k15q1qvp4yfl78v5l2pwmk8vdxzn"; - name = "bomber-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/bomber-17.12.3.tar.xz"; + sha256 = "14iyn9901canzd4hpsb4xwxd67j01wn54asplvlizmwy3jhpfx9s"; + name = "bomber-17.12.3.tar.xz"; }; }; bovo = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/bovo-17.08.3.tar.xz"; - sha256 = "1npzzjgzhgbv7pnz3j9if2c5qa5b9ghzj7llp8yndf6dz31qibps"; - name = "bovo-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/bovo-17.12.3.tar.xz"; + sha256 = "15zaf8017zqfj4z0mlc321lvfnfhda8n648zlsxxap1lj6icr3s9"; + name = "bovo-17.12.3.tar.xz"; }; }; calendarsupport = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/calendarsupport-17.08.3.tar.xz"; - sha256 = "1ii3h42jkskrizg29ii17jkdxgsqs3lwzsd7ypgw1k8gk9fyyqxh"; - name = "calendarsupport-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/calendarsupport-17.12.3.tar.xz"; + sha256 = "020ra0sbc8pmibff5ffyzhqwww8qdi1wlmn6h9qh0z2sjk9hrs84"; + name = "calendarsupport-17.12.3.tar.xz"; }; }; cantor = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/cantor-17.08.3.tar.xz"; - sha256 = "0yz71lxwzl5r9k2fzs4iyhyx811rc77m6n1lqagd2c29hnnchn9w"; - name = "cantor-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/cantor-17.12.3.tar.xz"; + sha256 = "08jhbm54vv5s14ig2adw83fkk1r0p98aifhiq0sc4xga7gkx032w"; + name = "cantor-17.12.3.tar.xz"; }; }; cervisia = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/cervisia-17.08.3.tar.xz"; - sha256 = "0272zf51rn1a9k796fspp456zq6j21bddfn7r350pd6ra19ay7j8"; - name = "cervisia-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/cervisia-17.12.3.tar.xz"; + sha256 = "04qvgpaa5mf9jmlqd60r1df3r9rscaqasfa9c39cfmahrnvm4yyr"; + name = "cervisia-17.12.3.tar.xz"; }; }; dolphin = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/dolphin-17.08.3.tar.xz"; - sha256 = "02bb66411jy03s4wicalnsl6sxmslhdb3wxsqh7sdyh63llna5b5"; - name = "dolphin-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/dolphin-17.12.3.tar.xz"; + sha256 = "0fd4c7kwdvjpx7q9yb2razdlv6q7y74nkk99jg20jsng0px9dp20"; + name = "dolphin-17.12.3.tar.xz"; }; }; dolphin-plugins = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/dolphin-plugins-17.08.3.tar.xz"; - sha256 = "1s2rjrvfs5i87gx3fsz0mqdr7106ds5747wq6n2sfzjkvippygay"; - name = "dolphin-plugins-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/dolphin-plugins-17.12.3.tar.xz"; + sha256 = "0bdvwsl83bilm1jhgmcl0b8iyh4vbfg3imara2rmizfxl5g6jccf"; + name = "dolphin-plugins-17.12.3.tar.xz"; }; }; dragon = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/dragon-17.08.3.tar.xz"; - sha256 = "0fxzwfg0l7lnsswb51h8gmh4wngmng9sgm5nhn6wmwhfbhbzgagq"; - name = "dragon-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/dragon-17.12.3.tar.xz"; + sha256 = "1j5li70fyz1ynykmxb63i2na3n964lsdkyilj1vhdzb55592b1s4"; + name = "dragon-17.12.3.tar.xz"; }; }; eventviews = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/eventviews-17.08.3.tar.xz"; - sha256 = "0j1r833kzf9sparvqnfn8r7klf4j0z8jwrgclf87rggmx0dn2v4y"; - name = "eventviews-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/eventviews-17.12.3.tar.xz"; + sha256 = "0v712sisa0bic6zbl7gb4jvh11wf7krsfpxffxgxc3i8zmvw9jfc"; + name = "eventviews-17.12.3.tar.xz"; }; }; ffmpegthumbs = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ffmpegthumbs-17.08.3.tar.xz"; - sha256 = "19bkpc316wlhswgrbszpj65lrzsdp443c1174hqknm0srvp6fbvv"; - name = "ffmpegthumbs-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ffmpegthumbs-17.12.3.tar.xz"; + sha256 = "18f2yxbfxrf4598xwzjd6fws35ipnvnsljv5jwy9lmq400iqpii5"; + name = "ffmpegthumbs-17.12.3.tar.xz"; }; }; filelight = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/filelight-17.08.3.tar.xz"; - sha256 = "06j6api909shraflfpn0cyvxaa57s2dq178kshkfv5yppxjpfpja"; - name = "filelight-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/filelight-17.12.3.tar.xz"; + sha256 = "1k8vibkxv8m8f2q4hj3g4jvk96zkkd0wpxhag5jycla6v50q9anf"; + name = "filelight-17.12.3.tar.xz"; }; }; granatier = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/granatier-17.08.3.tar.xz"; - sha256 = "1z2gs73k8ymz09x72hvyylwqs6pxbnivz86hbb9pb1mlb7x5fgvs"; - name = "granatier-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/granatier-17.12.3.tar.xz"; + sha256 = "1zysqf68d2zzhii587a3qdqqf1zhi2k3008f626r59a0yb2bdz9x"; + name = "granatier-17.12.3.tar.xz"; }; }; grantlee-editor = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/grantlee-editor-17.08.3.tar.xz"; - sha256 = "1cb77qmzzk64mkbzvywksvpfqw88mwmg7sqrni4apsasvg9mvygx"; - name = "grantlee-editor-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/grantlee-editor-17.12.3.tar.xz"; + sha256 = "03v4yrmbkpa6w8kq54iv0a6rx0q7zv1jmwka103iv89qf9d332j4"; + name = "grantlee-editor-17.12.3.tar.xz"; }; }; grantleetheme = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/grantleetheme-17.08.3.tar.xz"; - sha256 = "0zag5gmaqi068hw8s71ascj7s8clg1sickrfpzjf3nhcf6y669rp"; - name = "grantleetheme-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/grantleetheme-17.12.3.tar.xz"; + sha256 = "0q6s5h236a61q015g9238jandibfhpw9yrx7s367qagk5wi4phsx"; + name = "grantleetheme-17.12.3.tar.xz"; }; }; gwenview = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/gwenview-17.08.3.tar.xz"; - sha256 = "05c96y5yrdgh7228bw3agn344g02hylnb2fw8crjcdapsiya4v1w"; - name = "gwenview-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/gwenview-17.12.3.tar.xz"; + sha256 = "03gz5a4531xhmr0m5x7nzwzfr3j61xy8yw6pk06i6q7azbxxr1rr"; + name = "gwenview-17.12.3.tar.xz"; }; }; incidenceeditor = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/incidenceeditor-17.08.3.tar.xz"; - sha256 = "0qfcycivlgzjx8j4b2bd4qjp3x8wbiax477bmz56sfv7q0vp1dgm"; - name = "incidenceeditor-17.08.3.tar.xz"; - }; - }; - jovie = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/jovie-17.08.3.tar.xz"; - sha256 = "1a4v97p3yfwr5zn5qkfkw1ln7liz47f3bnhdb6yzzi03s5xfrk1z"; - name = "jovie-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/incidenceeditor-17.12.3.tar.xz"; + sha256 = "19jl8mpabxm8gk7krpby1c0kcrss1nvxl5blpviy0m4ccq5jsbka"; + name = "incidenceeditor-17.12.3.tar.xz"; }; }; juk = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/juk-17.08.3.tar.xz"; - sha256 = "0735rdrn80akfb8viq8y77kxa28y1rg5infp26q7cy5cd4r6fvsi"; - name = "juk-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/juk-17.12.3.tar.xz"; + sha256 = "1zzzvwn3ahzwkd7gdavz6k72js2xh79wf1w06vfjx9h35j54smb6"; + name = "juk-17.12.3.tar.xz"; }; }; k3b = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/k3b-17.08.3.tar.xz"; - sha256 = "0kshb3j4djb9npkia0m0ffyrwja3drsyxw7hpgyxxswik6kwbvgk"; - name = "k3b-17.08.3.tar.xz"; - }; - }; - kaccessible = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kaccessible-17.08.3.tar.xz"; - sha256 = "0sfrs57npp4y1yyw16chgrvyp6bnf4jymffblj5h7pb4bv0xlsmk"; - name = "kaccessible-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz"; + sha256 = "1i74c8x72qx36wl9vc7wcz5rpyd6410n3w8bas7hb5j4bfaapl3l"; + name = "k3b-17.12.3.tar.xz"; }; }; kaccounts-integration = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kaccounts-integration-17.08.3.tar.xz"; - sha256 = "0cir87m7f8sf70vvr8sxfhklgxigvv6npijphbbim7fnzc4z37m0"; - name = "kaccounts-integration-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kaccounts-integration-17.12.3.tar.xz"; + sha256 = "0c3jx2wr7qxkh5i3fmhsd1r0aqf133443nc7l7krymjzd54y6db9"; + name = "kaccounts-integration-17.12.3.tar.xz"; }; }; kaccounts-providers = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kaccounts-providers-17.08.3.tar.xz"; - sha256 = "1y3ykj4q6m14q2lskliv0qy0ml0j9i9svhq06g2j25zd5wwlhbp5"; - name = "kaccounts-providers-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kaccounts-providers-17.12.3.tar.xz"; + sha256 = "1h2asblaqmyhy4qfzcl7mxinfg0djghr9xrcvl2xyd85jkk428h5"; + name = "kaccounts-providers-17.12.3.tar.xz"; }; }; kaddressbook = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kaddressbook-17.08.3.tar.xz"; - sha256 = "1dq3lgrvg7s65mc2x2sgkwpz623ygb0by0y571dqjaz219j03955"; - name = "kaddressbook-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kaddressbook-17.12.3.tar.xz"; + sha256 = "1ys2hrpqpbwpml3arw076gng7ygdvvkwy489lnq7d345y79501bq"; + name = "kaddressbook-17.12.3.tar.xz"; }; }; kajongg = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kajongg-17.08.3.tar.xz"; - sha256 = "00xb764nxzihz9kh7a82cm7slrj78zjl3s5qb90s03y375q4bha6"; - name = "kajongg-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kajongg-17.12.3.tar.xz"; + sha256 = "1p39qjj05p1zjlz9f49pvwzvlsa61h549r74ravj4xdl6fqvdgfa"; + name = "kajongg-17.12.3.tar.xz"; }; }; kalarm = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kalarm-17.08.3.tar.xz"; - sha256 = "0rmdxx59iykn6f746dw9p0dyk96wds4kqr6w2y8fscp889i05g2a"; - name = "kalarm-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kalarm-17.12.3.tar.xz"; + sha256 = "0n3cdj630q96rvljph3raz0f698pwrh2rx81xzsyp2lk917737h7"; + name = "kalarm-17.12.3.tar.xz"; }; }; kalarmcal = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kalarmcal-17.08.3.tar.xz"; - sha256 = "0g4vxkjkc38p2aigmfr2q2qd6x8pr4fj53jkvjq314vqg9sbak9c"; - name = "kalarmcal-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kalarmcal-17.12.3.tar.xz"; + sha256 = "13bg69qsyzjaabghq6n33y211i5mz9pnnc26kqyhg87za526j7km"; + name = "kalarmcal-17.12.3.tar.xz"; }; }; kalgebra = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kalgebra-17.08.3.tar.xz"; - sha256 = "0hcrl205z2m5108g1kgxnmkrrg6x2m2p59cmdkbsd0ly0jnfc9w2"; - name = "kalgebra-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kalgebra-17.12.3.tar.xz"; + sha256 = "1vm64azi46zgxg0kjg8ch7gxbb8wb3bafsfgxmv4x1hqy45crkv7"; + name = "kalgebra-17.12.3.tar.xz"; }; }; kalzium = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kalzium-17.08.3.tar.xz"; - sha256 = "142lcm1d7v8xknmqg00cgdz3iaydr6c9wblpij3wykffd53x7ind"; - name = "kalzium-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kalzium-17.12.3.tar.xz"; + sha256 = "1zha7iy2wg8dyrajijnc3vy7wb0k4kli4q2xkv6ryc6klrp2910h"; + name = "kalzium-17.12.3.tar.xz"; }; }; kamera = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kamera-17.08.3.tar.xz"; - sha256 = "0zrny1f27z0drsna2lpw9sr4y7z479lys3vzcysgf1fv8b8jdjdh"; - name = "kamera-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kamera-17.12.3.tar.xz"; + sha256 = "1xk2cclavzkjifzznd9kx4nq8dysmns2ni9w865s0vvl98z6jbg9"; + name = "kamera-17.12.3.tar.xz"; }; }; kanagram = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kanagram-17.08.3.tar.xz"; - sha256 = "1v5k67dw47i3n8635w1sc63n7f63hd9wvb44yxaw88clk46acn0k"; - name = "kanagram-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kanagram-17.12.3.tar.xz"; + sha256 = "05dl248lvskh46mii5glvxpspf6gw1m4z2g6lpb9acafr8cqvz8k"; + name = "kanagram-17.12.3.tar.xz"; }; }; kapman = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kapman-17.08.3.tar.xz"; - sha256 = "0gici0v3ya16nk0b33cm5n95gdfhjqpy8wjg5y8bj12dby1d0n2w"; - name = "kapman-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kapman-17.12.3.tar.xz"; + sha256 = "04ngab85hsx4z9h45z32s1arahfzyxkyb4i9w6x51jmm3a7cnp4z"; + name = "kapman-17.12.3.tar.xz"; }; }; kapptemplate = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kapptemplate-17.08.3.tar.xz"; - sha256 = "16j1lx6rp0lqmcd8fyaishc0i2670v0map270z9575101338cyvm"; - name = "kapptemplate-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kapptemplate-17.12.3.tar.xz"; + sha256 = "11v108jqmqp4xcmf6nz41fl7avmcpd26w4pdgfk70dzjwpzf1hl3"; + name = "kapptemplate-17.12.3.tar.xz"; }; }; kate = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kate-17.08.3.tar.xz"; - sha256 = "1yjzhf0a1skxz6iipac3z1p2wswn8bfjfr3k8qb6lhwlhbapc33x"; - name = "kate-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kate-17.12.3.tar.xz"; + sha256 = "041ax9mvmgi9aj3759411bv1yj0a0v08djmwmn6kbvl8nv6a7dp5"; + name = "kate-17.12.3.tar.xz"; }; }; katomic = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/katomic-17.08.3.tar.xz"; - sha256 = "0y00la43lc1352fipzglyvaf1cqalf0vkygg8r9vizm8vycp7hp9"; - name = "katomic-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/katomic-17.12.3.tar.xz"; + sha256 = "1ljc8h2ngsc3cqz58dal3kkn7ymwa23ikxhjakn0nsg07fbqkdjl"; + name = "katomic-17.12.3.tar.xz"; }; }; kblackbox = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kblackbox-17.08.3.tar.xz"; - sha256 = "18lz0nb8zp95higssscgcr2cj1ni71bckk1wazyryxkmmmqk2rdn"; - name = "kblackbox-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kblackbox-17.12.3.tar.xz"; + sha256 = "1nc15k4rlpjb9p5y3g6jhi1j8nnwzxv4cymg7m7p356xr5k0m5qm"; + name = "kblackbox-17.12.3.tar.xz"; }; }; kblocks = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kblocks-17.08.3.tar.xz"; - sha256 = "1nf3ws0dzzwqc87v6jqi1x5zm7w56cgfingr5plpp3cj8wv8jnvw"; - name = "kblocks-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kblocks-17.12.3.tar.xz"; + sha256 = "04yyz71a4nr8g6fnb3mfsnlisnsw2c28z39w1hn54msmi32wyvi2"; + name = "kblocks-17.12.3.tar.xz"; }; }; kblog = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kblog-17.08.3.tar.xz"; - sha256 = "0cnbn0wmva8xm2i05w5pdikw5mbx3z6mim3k98v2r954qml7xqdk"; - name = "kblog-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kblog-17.12.3.tar.xz"; + sha256 = "0169m2h60iygy021j5w7fqww4ljal3gzffmj8f7arf6fin9myhwb"; + name = "kblog-17.12.3.tar.xz"; }; }; kbounce = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kbounce-17.08.3.tar.xz"; - sha256 = "12yj5jmpvhj5cxr4i818lp9cbcrdrvq9r7s202nzx5znxs11bbf6"; - name = "kbounce-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kbounce-17.12.3.tar.xz"; + sha256 = "0m0hvb8dv2z5s80c8i0ivkwnp9xaqprvgkgnrfmispj1splpzlvw"; + name = "kbounce-17.12.3.tar.xz"; }; }; kbreakout = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kbreakout-17.08.3.tar.xz"; - sha256 = "14d4cx91vv8bvvpjwbrwcvjczzs8j58yzazsfgqwhrj47cwhya43"; - name = "kbreakout-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kbreakout-17.12.3.tar.xz"; + sha256 = "04n01c36dbfq8khklc7jp2d80zxyhfy7v3x4dqpknnq22a8x8f6c"; + name = "kbreakout-17.12.3.tar.xz"; }; }; kbruch = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kbruch-17.08.3.tar.xz"; - sha256 = "0jxlybkmzs24482fmy7hhk2apyq26fpdblpnpdbqnydz95707475"; - name = "kbruch-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kbruch-17.12.3.tar.xz"; + sha256 = "1m3cdifm13gyfkhnab3nmw762kvbz64fyfw8py7lqy7i023yg35r"; + name = "kbruch-17.12.3.tar.xz"; }; }; kcachegrind = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcachegrind-17.08.3.tar.xz"; - sha256 = "0xmnpbli7ndlv0532hpnqgvbkpw8y176jydhs6hy73ywwm416mvs"; - name = "kcachegrind-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kcachegrind-17.12.3.tar.xz"; + sha256 = "1nsx813dsngf5agdw04cdrw3h8cj4g2na28i5anxbscn7fm715hd"; + name = "kcachegrind-17.12.3.tar.xz"; }; }; kcalc = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcalc-17.08.3.tar.xz"; - sha256 = "0ck1hjv1v9fj7ckl4blpmfxzjx61ihc6av71m710nk7iv6gncsfm"; - name = "kcalc-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kcalc-17.12.3.tar.xz"; + sha256 = "0w4rqkjsl24528bqkqansk985iq6nk78bm0pinagm1fqrarjqk8j"; + name = "kcalc-17.12.3.tar.xz"; }; }; kcalcore = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcalcore-17.08.3.tar.xz"; - sha256 = "0iy6dwzrcwzhjcz8yajp4mvbxr6vkxp4bnbnh9k2zvxgmg4y63h5"; - name = "kcalcore-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kcalcore-17.12.3.tar.xz"; + sha256 = "125qdd3gp6bwm6lqc1ib4icv3sa8sd0n5fjbgwr4klx8xsxzr03z"; + name = "kcalcore-17.12.3.tar.xz"; }; }; kcalutils = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcalutils-17.08.3.tar.xz"; - sha256 = "1vs6qnv31s01i7wb7kz86v17z0wrymcclmwx2hj7vl4jqr532zdq"; - name = "kcalutils-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kcalutils-17.12.3.tar.xz"; + sha256 = "1cag7pg9qd8w7xmvplkqr6p6pscnjzlzlin9fi6yjhhsq8bi2rxb"; + name = "kcalutils-17.12.3.tar.xz"; }; }; kcharselect = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcharselect-17.08.3.tar.xz"; - sha256 = "1ib3rqd43yprnp07vvmg029a44dimisycv030j3qd87r3yw06phs"; - name = "kcharselect-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kcharselect-17.12.3.tar.xz"; + sha256 = "1chxa1nsczk525hvwyw6cbzdr73i21zw9jngp9c79frcnpb5hdi4"; + name = "kcharselect-17.12.3.tar.xz"; }; }; kcolorchooser = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcolorchooser-17.08.3.tar.xz"; - sha256 = "17aa2k8z7i7ds2s3ampkci4n0003rsbx4fj3l773ylb11fyl3b2f"; - name = "kcolorchooser-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kcolorchooser-17.12.3.tar.xz"; + sha256 = "1yf8bizxd65h9pzai51l7piw5p4rlcl2bmw3qf9s73xii9cxz8yl"; + name = "kcolorchooser-17.12.3.tar.xz"; }; }; kcontacts = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcontacts-17.08.3.tar.xz"; - sha256 = "0dsx0bgf6rcqrl31xcklh368lr93pn2ylipw81svpnqya1ry31dk"; - name = "kcontacts-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz"; + sha256 = "08gzaznb6nazqcd5v755cs6fvxq4y1ywa7qbff7fb28sbkz6sdjl"; + name = "kcontacts-17.12.3.tar.xz"; }; }; kcron = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kcron-17.08.3.tar.xz"; - sha256 = "0xmd25dfhpkaa6zzmc7xdfn4fv0awfqjv2r166hmqd32gnx70bry"; - name = "kcron-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kcron-17.12.3.tar.xz"; + sha256 = "0kdd0kzx26jhwrz9ism9fc5gbf1fh0qsb6h3gmx524r40wzr45bf"; + name = "kcron-17.12.3.tar.xz"; }; }; kdav = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdav-17.08.3.tar.xz"; - sha256 = "1v7xclq8qz4pmvp1asavammlfwi2pg1y0fabapqpnglx194rbwic"; - name = "kdav-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdav-17.12.3.tar.xz"; + sha256 = "141a2fk3n18554qh8h00dnik33pf4jmvp1z94gbhscgkza1xdlx4"; + name = "kdav-17.12.3.tar.xz"; }; }; kdebugsettings = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdebugsettings-17.08.3.tar.xz"; - sha256 = "1gfcnwpmx6dd12d9kycf0khi5s85932b1wvyw1mr5dhlqyyqf1s4"; - name = "kdebugsettings-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdebugsettings-17.12.3.tar.xz"; + sha256 = "0y71ay5b7fly5rbl7fii6glkhmdkrk6fxmyx5ick5jgjgnmzjkdr"; + name = "kdebugsettings-17.12.3.tar.xz"; }; }; kde-dev-scripts = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-dev-scripts-17.08.3.tar.xz"; - sha256 = "1dydd198jfcjm58m5qk071kx18gbgnbwf9mcx20ibanq17cdh3px"; - name = "kde-dev-scripts-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kde-dev-scripts-17.12.3.tar.xz"; + sha256 = "1mipi7fchmf6rmivlpbncx106axaw9hi9r1kd7ibn5jqz0raa554"; + name = "kde-dev-scripts-17.12.3.tar.xz"; }; }; kde-dev-utils = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-dev-utils-17.08.3.tar.xz"; - sha256 = "184sx4i5k8rnx5572460v2jnd0abdr2i5gp74khbjlgagkdvcj07"; - name = "kde-dev-utils-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kde-dev-utils-17.12.3.tar.xz"; + sha256 = "05a8h9bdg81zlaf1zqk8vdqp1d2lkymdg82ppxvm2sxg00rrzgp6"; + name = "kde-dev-utils-17.12.3.tar.xz"; }; }; kdeedu-data = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdeedu-data-17.08.3.tar.xz"; - sha256 = "12vy656ng14gq93cw30bwdg15jvwr6qvlsjk0vfmljvcbc9171ww"; - name = "kdeedu-data-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdeedu-data-17.12.3.tar.xz"; + sha256 = "17xdhkaavz1b5f2iqw64b7891qc8l2i3f90zr2byw4j05gfm24wr"; + name = "kdeedu-data-17.12.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-mobipocket-17.08.3.tar.xz"; - sha256 = "1rfi44lh25knc0jf02fazh6s4wy1h8m76i9njcjxbjrz7x518cfj"; - name = "kdegraphics-mobipocket-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-mobipocket-17.12.3.tar.xz"; + sha256 = "16l5s4ha93h7bvb07kx60674i0j1n26c16w8q3drl8jmkmmf2h4j"; + name = "kdegraphics-mobipocket-17.12.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-thumbnailers-17.08.3.tar.xz"; - sha256 = "0irsa4x6pi5jq36yz1kgkdv8946w05mr19afydpz1jpa2knhkc6i"; - name = "kdegraphics-thumbnailers-17.08.3.tar.xz"; - }; - }; - kde-l10n-ar = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ar-17.08.3.tar.xz"; - sha256 = "0j06r39gam92bxm25vc8x7bxm6143pww42d9ala13akh3gh56wmy"; - name = "kde-l10n-ar-17.08.3.tar.xz"; - }; - }; - kde-l10n-ast = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ast-17.08.3.tar.xz"; - sha256 = "1kmv0ajbd9dws1al4qx9k2hnsqf2dwkj2ww12xn3flrqg71kgnpb"; - name = "kde-l10n-ast-17.08.3.tar.xz"; - }; - }; - kde-l10n-bg = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bg-17.08.3.tar.xz"; - sha256 = "0dv2hdki9mbc6kq6b1gzpqijgq31ffz4la9aprzj57mk4l14vkp1"; - name = "kde-l10n-bg-17.08.3.tar.xz"; - }; - }; - kde-l10n-bs = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bs-17.08.3.tar.xz"; - sha256 = "0makcag2kjns6528ldrjr52r412yi1y947lqq5db8ya6i8bxlsl2"; - name = "kde-l10n-bs-17.08.3.tar.xz"; - }; - }; - kde-l10n-ca = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca-17.08.3.tar.xz"; - sha256 = "13n0y9rmcnaka5hnmjp6x99pdvx19bb5f7m0wmnkkq0v8xs0cr53"; - name = "kde-l10n-ca-17.08.3.tar.xz"; - }; - }; - kde-l10n-ca_valencia = { - version = "ca_valencia-17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca@valencia-17.08.3.tar.xz"; - sha256 = "0h4iznjvzy4lvb91vpb4f7jlrvi3a9z56i7j3xm0ihf1qmgxxzmj"; - name = "kde-l10n-ca_valencia-17.08.3.tar.xz"; - }; - }; - kde-l10n-cs = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-cs-17.08.3.tar.xz"; - sha256 = "0dadsgmg7pvagpq0nj4hs889zvk2lw085wlv2mw6jfminjav4c2d"; - name = "kde-l10n-cs-17.08.3.tar.xz"; - }; - }; - kde-l10n-da = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-da-17.08.3.tar.xz"; - sha256 = "04w1clqk3p0zkv01406iwkwp572vwfpn94x8g7hxraaz2rzs2qnf"; - name = "kde-l10n-da-17.08.3.tar.xz"; - }; - }; - kde-l10n-de = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-de-17.08.3.tar.xz"; - sha256 = "1cxpdwvpymf1yqgs54v6f8hgxwyblv0i0zpm5w5wrimmg8lnbrc8"; - name = "kde-l10n-de-17.08.3.tar.xz"; - }; - }; - kde-l10n-el = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-el-17.08.3.tar.xz"; - sha256 = "1csskz68dsrlvkr5iri8w0wx2g5h7db18dpnlcmbl076l9ds9nmv"; - name = "kde-l10n-el-17.08.3.tar.xz"; - }; - }; - kde-l10n-en_GB = { - version = "en_GB-17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-en_GB-17.08.3.tar.xz"; - sha256 = "1vf6h68biiqr9vzqlig34z47clkdk6ncr3mhan7rajsk1dlp6qwy"; - name = "kde-l10n-en_GB-17.08.3.tar.xz"; - }; - }; - kde-l10n-eo = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eo-17.08.3.tar.xz"; - sha256 = "0a7wk6xfhq7zj02zjadnp7ml97r5vvgjvlm5yajz6l4q5l0vsdnn"; - name = "kde-l10n-eo-17.08.3.tar.xz"; - }; - }; - kde-l10n-es = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-es-17.08.3.tar.xz"; - sha256 = "1b7jzccicb58s3v796x0k2fwyfq8qmqyb5b26y5x9xknk7mv3fkz"; - name = "kde-l10n-es-17.08.3.tar.xz"; - }; - }; - kde-l10n-et = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-et-17.08.3.tar.xz"; - sha256 = "1d10yq8d5fjhgc0zvz3izl1c15i9g8vw5kgs2mvciwhaj6sqgk78"; - name = "kde-l10n-et-17.08.3.tar.xz"; - }; - }; - kde-l10n-eu = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eu-17.08.3.tar.xz"; - sha256 = "1r6nyjibagqfk4s1c2sylxlsq3jv7vhc01bbwpdl314rhcv67lkq"; - name = "kde-l10n-eu-17.08.3.tar.xz"; - }; - }; - kde-l10n-fa = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fa-17.08.3.tar.xz"; - sha256 = "0slrrsp8wgh33zv779mqdf3km4h88mzqfzdds08g8hr3mimp8ibj"; - name = "kde-l10n-fa-17.08.3.tar.xz"; - }; - }; - kde-l10n-fi = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fi-17.08.3.tar.xz"; - sha256 = "10axj320my3bgfqn1rpwpn4nii3bh39afsvqkbz6xh01sci4z47w"; - name = "kde-l10n-fi-17.08.3.tar.xz"; - }; - }; - kde-l10n-fr = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fr-17.08.3.tar.xz"; - sha256 = "0gqmq0hwxmj2awjyhhy81nwrks4mlqdnbfinxsrsj1kmklsx8pdg"; - name = "kde-l10n-fr-17.08.3.tar.xz"; - }; - }; - kde-l10n-ga = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ga-17.08.3.tar.xz"; - sha256 = "0p7jy5sh2x1fc6mfacs1f5brq86hw6xk7bccc30k5c8b0kfbvdf4"; - name = "kde-l10n-ga-17.08.3.tar.xz"; - }; - }; - kde-l10n-gl = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-gl-17.08.3.tar.xz"; - sha256 = "185yw84i04llag4kpi3lmmy9niis2z3rd5ch2x7y4jyq3kdpwhi4"; - name = "kde-l10n-gl-17.08.3.tar.xz"; - }; - }; - kde-l10n-he = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-he-17.08.3.tar.xz"; - sha256 = "0dx0mvl4vapkyir8a0a1dgv2h1hjsr5n2ykjihk21ykf7axvqqd4"; - name = "kde-l10n-he-17.08.3.tar.xz"; - }; - }; - kde-l10n-hi = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hi-17.08.3.tar.xz"; - sha256 = "0f6p7bwvvqj7jdaqsn4nxjsb5cdna9q4cp59wfy05ppi685qqp4v"; - name = "kde-l10n-hi-17.08.3.tar.xz"; - }; - }; - kde-l10n-hr = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hr-17.08.3.tar.xz"; - sha256 = "0yd4sqfa59ca57ig55x46fp59pjxby6ha5bhkzhcd1d2baa4a672"; - name = "kde-l10n-hr-17.08.3.tar.xz"; - }; - }; - kde-l10n-hu = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hu-17.08.3.tar.xz"; - sha256 = "1s3vgjslnffxivrx69dnz4c2iyjf2awv51k8bbbfjw271422wvfg"; - name = "kde-l10n-hu-17.08.3.tar.xz"; - }; - }; - kde-l10n-ia = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ia-17.08.3.tar.xz"; - sha256 = "1jpvla8h5ji9lcdhk7rinixkyr6wax30wp9wvqqqd8p9dp18i0cp"; - name = "kde-l10n-ia-17.08.3.tar.xz"; - }; - }; - kde-l10n-id = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-id-17.08.3.tar.xz"; - sha256 = "191x45jv4bzkglyng7fp3fblcbirp9k94h9r54sk32idwqkiwngx"; - name = "kde-l10n-id-17.08.3.tar.xz"; - }; - }; - kde-l10n-is = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-is-17.08.3.tar.xz"; - sha256 = "1h3pw9rnssf6wh1n5r01gqnz7riqz6hismndd67xw4pnq7vqpjkm"; - name = "kde-l10n-is-17.08.3.tar.xz"; - }; - }; - kde-l10n-it = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-it-17.08.3.tar.xz"; - sha256 = "0n4ivcyjcb47h3455wnzhnlkf26h29r2f9j1dgw9rw32aczb8l68"; - name = "kde-l10n-it-17.08.3.tar.xz"; - }; - }; - kde-l10n-ja = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ja-17.08.3.tar.xz"; - sha256 = "0qxf7c8l61xwkhn81phyw4849frzrc032fnbphlgq1nc9kqygara"; - name = "kde-l10n-ja-17.08.3.tar.xz"; - }; - }; - kde-l10n-kk = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-kk-17.08.3.tar.xz"; - sha256 = "0wlzv9kgpa2ah2j8dd4vn5gr9jkbmzl6ph3lm5mr7rf0pl14qws2"; - name = "kde-l10n-kk-17.08.3.tar.xz"; - }; - }; - kde-l10n-km = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-km-17.08.3.tar.xz"; - sha256 = "07arvlwxq59xjlgmf348rdrm1gfbzx9yds6qj667mrbk7h1n5ibr"; - name = "kde-l10n-km-17.08.3.tar.xz"; - }; - }; - kde-l10n-ko = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ko-17.08.3.tar.xz"; - sha256 = "0cw6v0iqq79hc4llw37s630gf36npc7ngsihqlia4y3pn4mzabwf"; - name = "kde-l10n-ko-17.08.3.tar.xz"; - }; - }; - kde-l10n-lt = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lt-17.08.3.tar.xz"; - sha256 = "0mv31nqdxp9wcnwch0sqrgz5pp1y3gmv25p8jvbrfrivpbkmhwv3"; - name = "kde-l10n-lt-17.08.3.tar.xz"; - }; - }; - kde-l10n-lv = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lv-17.08.3.tar.xz"; - sha256 = "0lyh2lj1h5ihhy22hh0is3s3qd8x88wgbwrqkq9802vksy7f587l"; - name = "kde-l10n-lv-17.08.3.tar.xz"; - }; - }; - kde-l10n-mr = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-mr-17.08.3.tar.xz"; - sha256 = "1zpciw63xk0s6jpkw4fpw0d17fcc4h1fdl6v1d3w3c1rs7dmmw9y"; - name = "kde-l10n-mr-17.08.3.tar.xz"; - }; - }; - kde-l10n-nb = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nb-17.08.3.tar.xz"; - sha256 = "024ii25iz8lf2g6k1nrr1lmian3wzq4ljx3y8ss1vz244m047xss"; - name = "kde-l10n-nb-17.08.3.tar.xz"; - }; - }; - kde-l10n-nds = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nds-17.08.3.tar.xz"; - sha256 = "0bp9ap276z86mxldasq6cdskrwkh48z9yfrblgffhh94941i0gcn"; - name = "kde-l10n-nds-17.08.3.tar.xz"; - }; - }; - kde-l10n-nl = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nl-17.08.3.tar.xz"; - sha256 = "00mzrk682r30i8x3navpad3b9jm15h5mp81v92q5cmcmblvvaw0l"; - name = "kde-l10n-nl-17.08.3.tar.xz"; - }; - }; - kde-l10n-nn = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nn-17.08.3.tar.xz"; - sha256 = "0d45g2n7hvk7p2n84674fqdnsz26hk0scczr6w3kzb2zk95x5734"; - name = "kde-l10n-nn-17.08.3.tar.xz"; - }; - }; - kde-l10n-pa = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pa-17.08.3.tar.xz"; - sha256 = "0sg35fmw0rs3nzyrhkfvh8b5nm86w5qkjgic4ymrib0grjxbdjcj"; - name = "kde-l10n-pa-17.08.3.tar.xz"; - }; - }; - kde-l10n-pl = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pl-17.08.3.tar.xz"; - sha256 = "0sk19zh9ykldm66d51k8pkmyql5cfxvgpzp8q3c3n9g60cdx510x"; - name = "kde-l10n-pl-17.08.3.tar.xz"; - }; - }; - kde-l10n-pt = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt-17.08.3.tar.xz"; - sha256 = "135g0wq2cfkgvwv1y1w9wnnz2bsdf5sdijqnvazkb6j3is4fz2pw"; - name = "kde-l10n-pt-17.08.3.tar.xz"; - }; - }; - kde-l10n-pt_BR = { - version = "pt_BR-17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt_BR-17.08.3.tar.xz"; - sha256 = "0ww3rhijqs1h9ihszkqvxdi0d4185zpm336837741nwqg601dik0"; - name = "kde-l10n-pt_BR-17.08.3.tar.xz"; - }; - }; - kde-l10n-ro = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ro-17.08.3.tar.xz"; - sha256 = "1d45j7xx1mzzgjwqw5svhkcb5v0hqbbzcwg1x1j7xqcggdlx4075"; - name = "kde-l10n-ro-17.08.3.tar.xz"; - }; - }; - kde-l10n-ru = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ru-17.08.3.tar.xz"; - sha256 = "10py3cz4mpgcaskrsbbr26arg01c3im26zqmjcdwjnkgp8s780pj"; - name = "kde-l10n-ru-17.08.3.tar.xz"; - }; - }; - kde-l10n-sk = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sk-17.08.3.tar.xz"; - sha256 = "01607982ms2smr05nslp79x6fjqhvlpjdkkv8fs4vwxvii9wd77w"; - name = "kde-l10n-sk-17.08.3.tar.xz"; - }; - }; - kde-l10n-sl = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sl-17.08.3.tar.xz"; - sha256 = "10ljgz3jrgbgb06ijq1sp46qc3d7dbyz8dql56zcgz1pbv6pyxqz"; - name = "kde-l10n-sl-17.08.3.tar.xz"; - }; - }; - kde-l10n-sr = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sr-17.08.3.tar.xz"; - sha256 = "1m12x7w0m4n97crmy9ad6szx92z3cqsvm6fbh99naaaf033962jn"; - name = "kde-l10n-sr-17.08.3.tar.xz"; - }; - }; - kde-l10n-sv = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sv-17.08.3.tar.xz"; - sha256 = "1qqry4xakc4qp140jr5306xfp58d33rxp44mrvmdngzh30bqs6g2"; - name = "kde-l10n-sv-17.08.3.tar.xz"; - }; - }; - kde-l10n-tr = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-tr-17.08.3.tar.xz"; - sha256 = "1as31vjsig32s31qxnx6ykfgpyya3s362ml576ndiyrj84znzby0"; - name = "kde-l10n-tr-17.08.3.tar.xz"; - }; - }; - kde-l10n-ug = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ug-17.08.3.tar.xz"; - sha256 = "1jx2g5xczybfz9915py30g9rqds0191bsaywnj241nzqizy20csz"; - name = "kde-l10n-ug-17.08.3.tar.xz"; - }; - }; - kde-l10n-uk = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-uk-17.08.3.tar.xz"; - sha256 = "14c30x7j8inswccjfb3yslwxjp0ispp1wzq6j4nl5zzj24lkicf8"; - name = "kde-l10n-uk-17.08.3.tar.xz"; - }; - }; - kde-l10n-wa = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-wa-17.08.3.tar.xz"; - sha256 = "0mz0g6hf4z59vb4i0zkvmyx85mxz7fpwi6yyng03iqzlbpdq0qj7"; - name = "kde-l10n-wa-17.08.3.tar.xz"; - }; - }; - kde-l10n-zh_CN = { - version = "zh_CN-17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_CN-17.08.3.tar.xz"; - sha256 = "1l60z9wicf5ka9ik5b85qh0z3n7g9msjv3ckwzm2kj41q9r30559"; - name = "kde-l10n-zh_CN-17.08.3.tar.xz"; - }; - }; - kde-l10n-zh_TW = { - version = "zh_TW-17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_TW-17.08.3.tar.xz"; - sha256 = "1br778qbxnbsrdpvd34g2m3xc1v725ib4689kw5g36pm1jlf55h0"; - name = "kde-l10n-zh_TW-17.08.3.tar.xz"; - }; - }; - kdelibs = { - version = "4.14.38"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdelibs-4.14.38.tar.xz"; - sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p"; - name = "kdelibs-4.14.38.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-thumbnailers-17.12.3.tar.xz"; + sha256 = "1xak3c76bwprmb0anjvw5p620lm9hxyn6dzw2vh1di899b1p60n4"; + name = "kdegraphics-thumbnailers-17.12.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdenetwork-filesharing-17.08.3.tar.xz"; - sha256 = "0vy2cyd9ifxrqw9zk4hyidiprd7730q7hm1gc44l6b4siimxyb4x"; - name = "kdenetwork-filesharing-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdenetwork-filesharing-17.12.3.tar.xz"; + sha256 = "0hkvmv0wiyhh4b036sdqx4f69ihxwl4m3mnmwc58va3cj5p32pyh"; + name = "kdenetwork-filesharing-17.12.3.tar.xz"; }; }; kdenlive = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdenlive-17.08.3.tar.xz"; - sha256 = "1nh6cmxkr47zlpvcrjm8dfylsdmncb5qhyvb86rypr1qqmbifg5x"; - name = "kdenlive-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdenlive-17.12.3.tar.xz"; + sha256 = "0gjhiwjh5h727v4lcs3yy526sr4sr563acg9xc54q76hcl1qc7rp"; + name = "kdenlive-17.12.3.tar.xz"; }; }; kdepim-addons = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdepim-addons-17.08.3.tar.xz"; - sha256 = "1r0qgrliw2g82vgj63l00x0visjclxh2fafngl8ga4dk411nfg4x"; - name = "kdepim-addons-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdepim-addons-17.12.3.tar.xz"; + sha256 = "13562gn2jc049pfkq8kw2w5lnmh6s6z6r57p3rpjr880izw9707h"; + name = "kdepim-addons-17.12.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdepim-apps-libs-17.08.3.tar.xz"; - sha256 = "0706ndzw315szab2qg30x7a6f50iv439rrpdpy321q7ay5fm0f2p"; - name = "kdepim-apps-libs-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdepim-apps-libs-17.12.3.tar.xz"; + sha256 = "178iq1kjynid2hfnlh5pbcq2z46rl55xfvvsnpbwbk80j81mpj24"; + name = "kdepim-apps-libs-17.12.3.tar.xz"; }; }; kdepim-runtime = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdepim-runtime-17.08.3.tar.xz"; - sha256 = "0qc6kkc5rsg9l5plciass6p1ym7arlp6yk7x5ycy53k7fbsh4ak7"; - name = "kdepim-runtime-17.08.3.tar.xz"; - }; - }; - kde-runtime = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kde-runtime-17.08.3.tar.xz"; - sha256 = "15nfkfz2wwlr1rp93sl1kmxl35wpnlf86225ihl43nhwn6pihb38"; - name = "kde-runtime-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdepim-runtime-17.12.3.tar.xz"; + sha256 = "1r30wp4n020hh83znv6889w3vm0flyn31b92pmrgvsxm8yzphgwn"; + name = "kdepim-runtime-17.12.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdesdk-kioslaves-17.08.3.tar.xz"; - sha256 = "11akksc09mzxnjiqcsxwgwcxzcjpw50cr277lp7p6rx1hdbwlk7a"; - name = "kdesdk-kioslaves-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdesdk-kioslaves-17.12.3.tar.xz"; + sha256 = "022yp5glg3dxfm5lgv4095dimw9nwbdh559y2vvvlx06pyi0b1qa"; + name = "kdesdk-kioslaves-17.12.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdesdk-thumbnailers-17.08.3.tar.xz"; - sha256 = "1hhsskrhkq3z6phjkvc43gzsmx0apcpr4sjr9zqqfy847zqsvfm2"; - name = "kdesdk-thumbnailers-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdesdk-thumbnailers-17.12.3.tar.xz"; + sha256 = "0qndm22x7f4w8nmai4zxrxmxkism25xh7cf8vfsihlpqj1qs7wci"; + name = "kdesdk-thumbnailers-17.12.3.tar.xz"; }; }; kdf = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdf-17.08.3.tar.xz"; - sha256 = "1s291c4g51y92wplrqkl528py83xfviyvv1qjyp3c7nyf6g2jvwq"; - name = "kdf-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdf-17.12.3.tar.xz"; + sha256 = "18q0581jaqc6w2cbdq1crxgrn97p89ah205mv253pd58w9qc4xlp"; + name = "kdf-17.12.3.tar.xz"; }; }; kdialog = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdialog-17.08.3.tar.xz"; - sha256 = "1n6n06sqgq1s2781pnsbfyczc68l5xx6l0idymj3pmniz3q4svp8"; - name = "kdialog-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdialog-17.12.3.tar.xz"; + sha256 = "1smz7q09ss963c9snsvb6biimn1d2c9yyx9lhxszfl9155cgd9x4"; + name = "kdialog-17.12.3.tar.xz"; }; }; kdiamond = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kdiamond-17.08.3.tar.xz"; - sha256 = "1czhmxs3k7mx82r1k88h8riwn9jxlz6w60mi4jx8b29qcm532f53"; - name = "kdiamond-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kdiamond-17.12.3.tar.xz"; + sha256 = "1k4mlajxwpbn4y6dlkz5psxy6iqfjj5qif7i5sfn0c3gsgm76pxc"; + name = "kdiamond-17.12.3.tar.xz"; }; }; keditbookmarks = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/keditbookmarks-17.08.3.tar.xz"; - sha256 = "115ys7703m611dw6ap2kqv4rgzxp15dsscg1y2gx09afc8fg2i62"; - name = "keditbookmarks-17.08.3.tar.xz"; - }; - }; - kfilereplace = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kfilereplace-17.08.3.tar.xz"; - sha256 = "1ksv9igzq65wgsam6ynbbzzyriacbk7y48dzh190p8k2bdf6gij6"; - name = "kfilereplace-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/keditbookmarks-17.12.3.tar.xz"; + sha256 = "066ia9n648p53g4451zfn5nram821rlbjlnfi9ny9p0j4dl6wwya"; + name = "keditbookmarks-17.12.3.tar.xz"; }; }; kfind = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kfind-17.08.3.tar.xz"; - sha256 = "16f27ykh52vphq6wjyi1vy6vrzshj0cawmc8fy7y1j5yzzdkx1hk"; - name = "kfind-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kfind-17.12.3.tar.xz"; + sha256 = "1xf1sw422sg3ki1phy097lwma14drdnjbgc1m5rap3dg0za25c9s"; + name = "kfind-17.12.3.tar.xz"; }; }; kfloppy = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kfloppy-17.08.3.tar.xz"; - sha256 = "1d5xn0rxc92k60hc1860mji8dzq932gg4by42gylwldcvgdija14"; - name = "kfloppy-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kfloppy-17.12.3.tar.xz"; + sha256 = "0gjp2l5jm16v1v4xwzaandplabz6rjdiimcf3b0r5d9prbiwry3p"; + name = "kfloppy-17.12.3.tar.xz"; }; }; kfourinline = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kfourinline-17.08.3.tar.xz"; - sha256 = "1bxzlx55i6vbk8cmpx38g1xdx0swqwd73lw5z584affw464ps1n9"; - name = "kfourinline-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kfourinline-17.12.3.tar.xz"; + sha256 = "1l10fj1vhxj1d647mcxp7a2bbilrhs3sf7cwkr57vavfzsp7diyw"; + name = "kfourinline-17.12.3.tar.xz"; }; }; kgeography = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kgeography-17.08.3.tar.xz"; - sha256 = "19k39rjm9lwbv3p6iifam80li5bhw4xf2g4i4hj0h7gyrj9gb1mp"; - name = "kgeography-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kgeography-17.12.3.tar.xz"; + sha256 = "1dl3k4zlchpdhvjb459wb44iyq30ngki6x198pyc23j15mjfdrih"; + name = "kgeography-17.12.3.tar.xz"; }; }; kget = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kget-17.08.3.tar.xz"; - sha256 = "01z3ij4iv3kgwy0fcnrf4qpfgapflx1pgv2hiaykgsj6ij24fx6a"; - name = "kget-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kget-17.12.3.tar.xz"; + sha256 = "1kaxvid76s8rx07hza56s83l785dxi5whhkqzkv132z2dm01yzww"; + name = "kget-17.12.3.tar.xz"; }; }; kgoldrunner = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kgoldrunner-17.08.3.tar.xz"; - sha256 = "1k09pw7lm17702p0lliyl767zwk4n3gkkzj441cq3fqjnwm93lx4"; - name = "kgoldrunner-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kgoldrunner-17.12.3.tar.xz"; + sha256 = "1ihj48kvr9xpw4rajiyq3kng1dn6l60dmii5pnyjmxlfs08apayx"; + name = "kgoldrunner-17.12.3.tar.xz"; }; }; kgpg = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kgpg-17.08.3.tar.xz"; - sha256 = "1g06n6i9qqvalmpg2zan7qg7j7dp4rn152pashs3jxij29n1bw7h"; - name = "kgpg-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kgpg-17.12.3.tar.xz"; + sha256 = "19yacv7l6kynyznb8ixn3697h04mhh4fhx02n4frdy9pnzv94hyp"; + name = "kgpg-17.12.3.tar.xz"; }; }; khangman = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/khangman-17.08.3.tar.xz"; - sha256 = "1fny78d3vaaz67css4i14pnvkm5p586ib8mwrs2rglc931c89dqq"; - name = "khangman-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/khangman-17.12.3.tar.xz"; + sha256 = "0hnm499qs1l2yzfqxhmkyc5lp0qb5j29h1knap1vmv4qy0qnmnjk"; + name = "khangman-17.12.3.tar.xz"; }; }; khelpcenter = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/khelpcenter-17.08.3.tar.xz"; - sha256 = "089aahdr1yibff4y0l78m0wzz7m0mc090g4fp4aj4gp56wz6i5jn"; - name = "khelpcenter-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/khelpcenter-17.12.3.tar.xz"; + sha256 = "0z5hrwqsi9ifraivz59nbq247x481hx90wiyfbls9lwv56y1zi7n"; + name = "khelpcenter-17.12.3.tar.xz"; }; }; kholidays = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kholidays-17.08.3.tar.xz"; - sha256 = "17razwvskf6i5hidlfp98bmfrijp8hn5gxrqcjxc49wpkhlj70jm"; - name = "kholidays-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kholidays-17.12.3.tar.xz"; + sha256 = "0w886443zzvpwqznnn7ymw5bxzdnigfz9j45qrl1qvdd6q8710di"; + name = "kholidays-17.12.3.tar.xz"; }; }; kidentitymanagement = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kidentitymanagement-17.08.3.tar.xz"; - sha256 = "0k926vwdhrk4ilpn0zhkcn26j1h7nqlzzi9mimybz1sp4fzxa83v"; - name = "kidentitymanagement-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz"; + sha256 = "0my4r8k8gadkda3z1myarrq4x72qz6wxsy6lj9rzkj4y549bm93y"; + name = "kidentitymanagement-17.12.3.tar.xz"; }; }; kig = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kig-17.08.3.tar.xz"; - sha256 = "0wf03fm7fpph52ilxckz02ikn6mq486ps8p8byq2vvfwh6z0w6wg"; - name = "kig-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kig-17.12.3.tar.xz"; + sha256 = "0liv94y90bfd5pi003bd3jryc1dal5mwxhqy94c2n3ay8yz8kxid"; + name = "kig-17.12.3.tar.xz"; }; }; kigo = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kigo-17.08.3.tar.xz"; - sha256 = "1k850vmsifvab14aaqkivgrw8794yhvn7d10c5ib2zf6447cl8m5"; - name = "kigo-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kigo-17.12.3.tar.xz"; + sha256 = "1z01w5zsbwn8h0mgr5liqagsmlppqclkjs4z5rdys75sxm142fzh"; + name = "kigo-17.12.3.tar.xz"; }; }; killbots = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/killbots-17.08.3.tar.xz"; - sha256 = "0ds391xx2d792069kl998f84qym26964ph5bja6bwkhgvws84r9g"; - name = "killbots-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/killbots-17.12.3.tar.xz"; + sha256 = "14xgh9qhagq9c01xbv0n4g5b3q9r6qr0dsc5ilindr66psspx7an"; + name = "killbots-17.12.3.tar.xz"; }; }; kimagemapeditor = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kimagemapeditor-17.08.3.tar.xz"; - sha256 = "0clzk2d63hy1vvkdpxa1j5pp7y28x467wd9zfvv6k2vw703ghqlx"; - name = "kimagemapeditor-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kimagemapeditor-17.12.3.tar.xz"; + sha256 = "1s9929wb3lclbn85rk3zd0nai64mrwgqdqnkw2dys98snq12r3hn"; + name = "kimagemapeditor-17.12.3.tar.xz"; }; }; kimap = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kimap-17.08.3.tar.xz"; - sha256 = "0c5inldmlwc5x2q1vhvj0wv61h6986m068a2k4xrrbirpb4pcwls"; - name = "kimap-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kimap-17.12.3.tar.xz"; + sha256 = "1prilnf01s73ml7542s7qh0ki9gqvgq7xqzxq2mz17k4d3irdvxw"; + name = "kimap-17.12.3.tar.xz"; }; }; kio-extras = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kio-extras-17.08.3.tar.xz"; - sha256 = "0gq187435yd0251znqicpcn0r89aar7a64bjpf6x0zhdlli8n9jc"; - name = "kio-extras-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kio-extras-17.12.3.tar.xz"; + sha256 = "1ifi09hv5aqx62x1cjnsxxh7xji9m0mmk3gfn43la9vw4rhxzlks"; + name = "kio-extras-17.12.3.tar.xz"; }; }; kiriki = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kiriki-17.08.3.tar.xz"; - sha256 = "1cbijn0358gpr21yfab84gybf5vqxwilwbhfl6nj8qmppp2bpjqd"; - name = "kiriki-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kiriki-17.12.3.tar.xz"; + sha256 = "1zl8mq1ya3x67y1pj1ir98v5lbxwccwyni8i02wc7mbgmxbk6p9q"; + name = "kiriki-17.12.3.tar.xz"; }; }; kiten = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kiten-17.08.3.tar.xz"; - sha256 = "0v00q9hs94p5r6x7s7i12814pfydd5y1bzp6sm5x0vx1ixdnkx89"; - name = "kiten-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kiten-17.12.3.tar.xz"; + sha256 = "1p1s20ks3r2zfd7wig1j2lbxbf3ch9gbykw2cgadip4nyn9nyll5"; + name = "kiten-17.12.3.tar.xz"; }; }; kjumpingcube = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kjumpingcube-17.08.3.tar.xz"; - sha256 = "13ifm6drw4m1dzssfalazmnsr5f8z9gla3aypb9ny1xm9ahlgfwh"; - name = "kjumpingcube-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kjumpingcube-17.12.3.tar.xz"; + sha256 = "07fakw1nq3bickj05cvb39wyb02fpfph0ia1wfm8wf43rd34c76l"; + name = "kjumpingcube-17.12.3.tar.xz"; }; }; kldap = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kldap-17.08.3.tar.xz"; - sha256 = "0bnx5fc48ppsykpqwjgsqjd7s4azgzk82k9xgaw566nxqqvgpzsv"; - name = "kldap-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kldap-17.12.3.tar.xz"; + sha256 = "02adfzjlvxjff33cpyihsf9z9zm7nvgmnipg9dmkpc0cwl25a8jy"; + name = "kldap-17.12.3.tar.xz"; }; }; kleopatra = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kleopatra-17.08.3.tar.xz"; - sha256 = "0vglphfxq37pxdrrchgzkdlzlzr18qlfwy9g64njyddnsv48pfx8"; - name = "kleopatra-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kleopatra-17.12.3.tar.xz"; + sha256 = "1417j1jh7bs0020laaimpwmmng508k85kp24k923ad2v65i51agd"; + name = "kleopatra-17.12.3.tar.xz"; }; }; klettres = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/klettres-17.08.3.tar.xz"; - sha256 = "14jxbvil45hc2kqky7yhxrgzpv4094lk9ri0j05i1av6784s9555"; - name = "klettres-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/klettres-17.12.3.tar.xz"; + sha256 = "0npp2dkwi3g36scipdra5xj5lf0xga3l8h8pk6isx7l86xsv3ds0"; + name = "klettres-17.12.3.tar.xz"; }; }; klickety = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/klickety-17.08.3.tar.xz"; - sha256 = "01hqf41m8pviziq1x562rd85357kkfgd0x0ba1vasimjddg6v6qa"; - name = "klickety-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/klickety-17.12.3.tar.xz"; + sha256 = "0f8gxqcfanxbqjqrq1j598nbis3djxxps61hdl1wd9xki1a86xy8"; + name = "klickety-17.12.3.tar.xz"; }; }; klines = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/klines-17.08.3.tar.xz"; - sha256 = "1s0krcqbqii9fqrymm4bb9ssznzyv8bijk5lcngwgxs24igl0g4d"; - name = "klines-17.08.3.tar.xz"; - }; - }; - klinkstatus = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/klinkstatus-17.08.3.tar.xz"; - sha256 = "0bv5ahcnss6ziccx9mmvf5bdsff9drjqpmq9ln51524bjn4x58ic"; - name = "klinkstatus-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/klines-17.12.3.tar.xz"; + sha256 = "0kp7c8qxkwgf13cwa7x5wik5w7snq6830zpah6lsk4ls5jw5mln0"; + name = "klines-17.12.3.tar.xz"; }; }; kmag = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmag-17.08.3.tar.xz"; - sha256 = "0dadzzrmd982y7apjk783wm5q302y03ydai74pzyqy0awnjdm09d"; - name = "kmag-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmag-17.12.3.tar.xz"; + sha256 = "0n9dxf5mcz6rlfr91r6yd7sxfmshgdc8znxfbncd1a9j523vba3w"; + name = "kmag-17.12.3.tar.xz"; }; }; kmahjongg = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmahjongg-17.08.3.tar.xz"; - sha256 = "09j2pmqc66zi851fsl4ijrcgq3y35arx9272p6z07bg0z9ja5vgb"; - name = "kmahjongg-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmahjongg-17.12.3.tar.xz"; + sha256 = "0ai6jlny4fi69psiizix5adz3kga4plf70y322a3ybl8g9c44m1a"; + name = "kmahjongg-17.12.3.tar.xz"; }; }; kmail = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmail-17.08.3.tar.xz"; - sha256 = "1ibpq0alnk70ha1smfyw8gc91k5q4x1gw7zddwgzw1pjr4v1bqdc"; - name = "kmail-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmail-17.12.3.tar.xz"; + sha256 = "02hjrk1c4mk3jrmyhn4ppar6vdlg51j79fqcjzfs1d8s4w0swwbs"; + name = "kmail-17.12.3.tar.xz"; }; }; kmail-account-wizard = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmail-account-wizard-17.08.3.tar.xz"; - sha256 = "0mkw6skpf9kc2h34ww85g18cljln77n5dsg5cyfyqc3i52m1halk"; - name = "kmail-account-wizard-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmail-account-wizard-17.12.3.tar.xz"; + sha256 = "1qdwqd763k5dq8mmwibnvgqjb7l6br9dqwxfsi7q8bhjxipijvdx"; + name = "kmail-account-wizard-17.12.3.tar.xz"; }; }; kmailtransport = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmailtransport-17.08.3.tar.xz"; - sha256 = "0cfyzvsn5x03i6kprqm7y6j6qsfys4yz2s3f4wb5igpdm25nclq1"; - name = "kmailtransport-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmailtransport-17.12.3.tar.xz"; + sha256 = "131yy2xa61fi2dmrb3qapf589lf4s9v2rkk2js0bi1827yg097f0"; + name = "kmailtransport-17.12.3.tar.xz"; }; }; kmbox = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmbox-17.08.3.tar.xz"; - sha256 = "0mf0005fs15vgmmikdsa44ig4hxrnysl13mrn168crk96h3sk8qi"; - name = "kmbox-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmbox-17.12.3.tar.xz"; + sha256 = "15x9cdwcbwrjaj3rzphwmpayhy45j45pwj88sz0drqz3mwc55jgm"; + name = "kmbox-17.12.3.tar.xz"; }; }; kmime = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmime-17.08.3.tar.xz"; - sha256 = "17ziw8g1wdys4iy2yqavqy7wj4kw617m80fg77zlf1cscswhg23d"; - name = "kmime-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmime-17.12.3.tar.xz"; + sha256 = "0251szs8dcpnwhqk72c211mp7h0xhn0f8z21mdm6k94ij43da9cm"; + name = "kmime-17.12.3.tar.xz"; }; }; kmines = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmines-17.08.3.tar.xz"; - sha256 = "14b0klnlbxkvln3q9fliw6cijc2xmsfmvm6sfikdzzgj59jcylzp"; - name = "kmines-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmines-17.12.3.tar.xz"; + sha256 = "0r9rs97s92z5854xdampgp6igmppzp3mhaw9rscrdwvvq4xpsll9"; + name = "kmines-17.12.3.tar.xz"; }; }; kmix = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmix-17.08.3.tar.xz"; - sha256 = "0fd38banrbgpp8g5gz09w6wny8mdi9szvddl1rv7yx67zf112g67"; - name = "kmix-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmix-17.12.3.tar.xz"; + sha256 = "12fwimqr21hgwqscihaxwh1f39xm8k21f95f7b3gwwa5lbj0l9mp"; + name = "kmix-17.12.3.tar.xz"; }; }; kmousetool = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmousetool-17.08.3.tar.xz"; - sha256 = "0y2zavs442wpz438p1kyzrqlv9qgvxd4l5gw1pmmx8lkvjjdi91v"; - name = "kmousetool-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmousetool-17.12.3.tar.xz"; + sha256 = "0gbvzywnxbcb4iw7pgf70ljz0qd8xl8825srpp3fj7lv0kh9ni9z"; + name = "kmousetool-17.12.3.tar.xz"; }; }; kmouth = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmouth-17.08.3.tar.xz"; - sha256 = "0gzc6apskfpvih7aap5mfv45q3pg70nfis1vh5ywidia36wbf26i"; - name = "kmouth-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmouth-17.12.3.tar.xz"; + sha256 = "012lpy904n2isj8msxivgk0ssy56qajgjxn1hz2jy9jjyyi77f2n"; + name = "kmouth-17.12.3.tar.xz"; }; }; kmplot = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kmplot-17.08.3.tar.xz"; - sha256 = "1ann38zzzd5pds889mc5vw8xw80qlpm9l9nmkczkqyhkfvwxd605"; - name = "kmplot-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kmplot-17.12.3.tar.xz"; + sha256 = "0plblgv243ymmcbpb8rs4clilwlsggn7219yqrh064lzbfblhxa9"; + name = "kmplot-17.12.3.tar.xz"; }; }; knavalbattle = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/knavalbattle-17.08.3.tar.xz"; - sha256 = "1zj6pki0v3p4xg25ivl45mb877p5xh47d066442pahkf8l3wnsh5"; - name = "knavalbattle-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/knavalbattle-17.12.3.tar.xz"; + sha256 = "07z0h0h6fmd99x0kqjlwlkpxndypa2svdvmjv8vmwcdp45hik90f"; + name = "knavalbattle-17.12.3.tar.xz"; }; }; knetwalk = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/knetwalk-17.08.3.tar.xz"; - sha256 = "0i32f54z5hinafy1v5s1j8ahnbw30721lxa2mvh5qcbr21fan3mc"; - name = "knetwalk-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/knetwalk-17.12.3.tar.xz"; + sha256 = "1iz819dsrdf5fck6qx0s4d0k7sz58pbxp5kk4aczszmvpnn2197k"; + name = "knetwalk-17.12.3.tar.xz"; }; }; knotes = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/knotes-17.08.3.tar.xz"; - sha256 = "0ly9gpji3nl3i53nzqd5z27li8qnc1asfv1d1kawchz077da02xy"; - name = "knotes-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/knotes-17.12.3.tar.xz"; + sha256 = "1iy6rmhlh7jgryxrwqrqaqaajfimdlqcw0x3yizbqalpw1k6f8m3"; + name = "knotes-17.12.3.tar.xz"; }; }; kolf = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kolf-17.08.3.tar.xz"; - sha256 = "1wc6x1hgkniwzb53bcph3alk0fxlb91s6j39blhync6713x8b4g0"; - name = "kolf-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kolf-17.12.3.tar.xz"; + sha256 = "1zc1i36a302rpvv2lbfv8q8glh1brjk95mjkwxbplv8gmdbd71cj"; + name = "kolf-17.12.3.tar.xz"; }; }; kollision = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kollision-17.08.3.tar.xz"; - sha256 = "14ama8cfi4d7whgck0gywm7869gpargq1lrkq8ik4k914pharkzi"; - name = "kollision-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kollision-17.12.3.tar.xz"; + sha256 = "019ibb9190k6qf07kgjy88lzyawvbh9hb7df96l96ilgssxxhnvz"; + name = "kollision-17.12.3.tar.xz"; }; }; kolourpaint = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kolourpaint-17.08.3.tar.xz"; - sha256 = "1y44q14f6brdmccnmf8143kjjqais8ps15z31dpx2935qzjxw8sc"; - name = "kolourpaint-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kolourpaint-17.12.3.tar.xz"; + sha256 = "15vd3ykixfkbwg3dk4plfpf72k2cknwpk6ip7rnw4h41r0rg838w"; + name = "kolourpaint-17.12.3.tar.xz"; }; }; kompare = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kompare-17.08.3.tar.xz"; - sha256 = "0fi3s02rsaa3xl7j69lq2qvg9jn9hxdp44ns89q94s06rqkbjyr1"; - name = "kompare-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kompare-17.12.3.tar.xz"; + sha256 = "0kfrxwx2dnvbvy7ykm3dxm0873g2136jllakav8pxgf75z4iwryl"; + name = "kompare-17.12.3.tar.xz"; }; }; konqueror = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/konqueror-17.08.3.tar.xz"; - sha256 = "1b2hs0fp0a51y87dl8rnv47b8kzjylsps9nczgi8zsipg03z9ja7"; - name = "konqueror-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/konqueror-17.12.3.tar.xz"; + sha256 = "0dhm22p4mx244pd2wnl7xxhkh4yc3dsl126ndmajj62i0si0y0hw"; + name = "konqueror-17.12.3.tar.xz"; }; }; konquest = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/konquest-17.08.3.tar.xz"; - sha256 = "1k5s9cvlsx3j2774i6p6xx2sfg75aafj9a4imvm7mzvn3gvmkm3q"; - name = "konquest-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/konquest-17.12.3.tar.xz"; + sha256 = "1jdwa4b9224x2m3r3v3sgk7796kvlayf7gjpsdvby0xggpihsqli"; + name = "konquest-17.12.3.tar.xz"; }; }; konsole = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/konsole-17.08.3.tar.xz"; - sha256 = "07v9nbikzpanpggglp07slkbn6h0cl2anz7735f9b0lg55fydv42"; - name = "konsole-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/konsole-17.12.3.tar.xz"; + sha256 = "1g3c7wl10n5qhs5bnm1d92qsv7jh8gn3d1l0wivj29cn9b0rf2gs"; + name = "konsole-17.12.3.tar.xz"; }; }; kontact = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kontact-17.08.3.tar.xz"; - sha256 = "1hj6vgvn73bzf43ckk4cm24m1n0a4c9c6p14q95hbfbcp5bdra1i"; - name = "kontact-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kontact-17.12.3.tar.xz"; + sha256 = "0gik5h84mx3izdlml0sl1y68n7h9w8196h2l09lxnf10mmya3yas"; + name = "kontact-17.12.3.tar.xz"; }; }; kontactinterface = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kontactinterface-17.08.3.tar.xz"; - sha256 = "1ncy0fz0jyklckimm9jjfv2j88aibk49ismz5z6xlasn44vn7l9c"; - name = "kontactinterface-17.08.3.tar.xz"; - }; - }; - kopete = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kopete-17.08.3.tar.xz"; - sha256 = "1v5gmh521si3zbxgcm9m4rcp0csqy52xgvpjpb8j7iq9m0fcqv7q"; - name = "kopete-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kontactinterface-17.12.3.tar.xz"; + sha256 = "15nigzawl5rzd0s6l9xqv3sldah3wc9m6zd3avbsb3ydmi0f1hks"; + name = "kontactinterface-17.12.3.tar.xz"; }; }; korganizer = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/korganizer-17.08.3.tar.xz"; - sha256 = "1nsj03h1r5mnz2dvdmydvqz2fspgw2ybs5z05gg0f903sq1gz80l"; - name = "korganizer-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/korganizer-17.12.3.tar.xz"; + sha256 = "0gplnra98ivhsqcrdy44ghak0h9x0fn481irqh2y11f8kjaf6z40"; + name = "korganizer-17.12.3.tar.xz"; }; }; kpat = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kpat-17.08.3.tar.xz"; - sha256 = "0l5s5rrn67lbf8hjqyyxvxij935pb1fd9x9dlskxyc2w7n6acmn2"; - name = "kpat-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kpat-17.12.3.tar.xz"; + sha256 = "0nkqfnxrnik4ma7xrskqjsmcmbmxszyn9ckf3rql338d485h8awh"; + name = "kpat-17.12.3.tar.xz"; }; }; kpimtextedit = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kpimtextedit-17.08.3.tar.xz"; - sha256 = "1xyfzvmsfikx2xnhgwx9wkdhvfq72f3mz67hlw2jsbm3ir889ysb"; - name = "kpimtextedit-17.08.3.tar.xz"; - }; - }; - kppp = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kppp-17.08.3.tar.xz"; - sha256 = "00y19x306r3pnax1b2cv8bndd6vq1qp30r1hrgw8npy5mm4mn8jw"; - name = "kppp-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz"; + sha256 = "0b6f1hsh3q183lkinaz9f94akaf1z2g1pb7sm83f6c4yjn9qfg9c"; + name = "kpimtextedit-17.12.3.tar.xz"; }; }; kqtquickcharts = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kqtquickcharts-17.08.3.tar.xz"; - sha256 = "0w8hlnhdgqrmad4ii07f9hsyx6vlaqnvlc54prnah1bqzymvc2ms"; - name = "kqtquickcharts-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kqtquickcharts-17.12.3.tar.xz"; + sha256 = "0gigdramz5kmjyzd7yff8j0c3sisblqy0xjc301hkhh7ss93r2d0"; + name = "kqtquickcharts-17.12.3.tar.xz"; }; }; krdc = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/krdc-17.08.3.tar.xz"; - sha256 = "13rmn1p495dzx49d1y22na25vrpzk9mcc2axg412pv038iphf8id"; - name = "krdc-17.08.3.tar.xz"; - }; - }; - kremotecontrol = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kremotecontrol-17.08.3.tar.xz"; - sha256 = "1p23q7bvppv8fabvpwi793zplb4kry8njczma7c4nya4mkdk9370"; - name = "kremotecontrol-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/krdc-17.12.3.tar.xz"; + sha256 = "1flk8pvnr4kf273xzfxb7pcsam3mb056pbvmva1k864kbb6bzdps"; + name = "krdc-17.12.3.tar.xz"; }; }; kreversi = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kreversi-17.08.3.tar.xz"; - sha256 = "0ma0y1n38hw5rawzazlaqfa4vsawgvaq8j2pa5n7z23nwckh19wd"; - name = "kreversi-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kreversi-17.12.3.tar.xz"; + sha256 = "1hmh80dpg25ay06dmd1g6a0a7zcd2di99s989msi85wzgk6vh0fg"; + name = "kreversi-17.12.3.tar.xz"; }; }; krfb = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/krfb-17.08.3.tar.xz"; - sha256 = "1k7rziw0l0bdjxi5i92w1zsjbakzbklc95dyn2jsnm36jljjqpv1"; - name = "krfb-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/krfb-17.12.3.tar.xz"; + sha256 = "0anfcb1xsr638k3d3ljy9khbxf7v9sj5vbksyhfjrzsifj4m2skv"; + name = "krfb-17.12.3.tar.xz"; }; }; kross-interpreters = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kross-interpreters-17.08.3.tar.xz"; - sha256 = "1pqlm14xr9p18dfh8pczg8fjskpvzxh5s5n7nxj9q31yz6kbxzrb"; - name = "kross-interpreters-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kross-interpreters-17.12.3.tar.xz"; + sha256 = "0v3ly21lc8riv4by87kjilab5zqd6wvwl92a983ybd5bivl1a98s"; + name = "kross-interpreters-17.12.3.tar.xz"; }; }; kruler = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kruler-17.08.3.tar.xz"; - sha256 = "1qizjvysfnh5x3fa8hav3y9pyaiq8hpwi1grw9dd921cbb16cww4"; - name = "kruler-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kruler-17.12.3.tar.xz"; + sha256 = "0r12vwg9jsvg8bldrfdnmcygn6rkx9dp8r0948jhf662qs7a0jsa"; + name = "kruler-17.12.3.tar.xz"; }; }; - ksaneplugin = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksaneplugin-17.08.3.tar.xz"; - sha256 = "0y7f269wv0alcvx906nill92nzlld5b1sg6q3xki89b6b9fgliig"; - name = "ksaneplugin-17.08.3.tar.xz"; - }; - }; - kscd = { - version = "17.08.3"; + kshisen = { + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kscd-17.08.3.tar.xz"; - sha256 = "08r9zhp7d7xf8iyi56hvlm5vyjqrjpj9dc8ynda0n7hyngxrbvm0"; - name = "kscd-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kshisen-17.12.3.tar.xz"; + sha256 = "1an28mxgc1ic6acj3r59q9nnmq267fy6k48xzdxqdxhivs74bjx0"; + name = "kshisen-17.12.3.tar.xz"; }; }; - kshisen = { - version = "17.08.3"; + ksirk = { + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kshisen-17.08.3.tar.xz"; - sha256 = "18nwnxn7i0p2b78cxv8ppsl4lrzdm4ck6hqqdf738npli271shq0"; - name = "kshisen-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ksirk-17.12.3.tar.xz"; + sha256 = "07y300qk3jls8cscf0xxgq52gxmc4j5rkn2pxhxymm0yr07ip1xz"; + name = "ksirk-17.12.3.tar.xz"; }; }; - ksirk = { - version = "17.08.3"; + ksmtp = { + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksirk-17.08.3.tar.xz"; - sha256 = "1601fh93jcy7x622hpvdrb9ddb262n9ivakxli054cz2bq3dbpim"; - name = "ksirk-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ksmtp-17.12.3.tar.xz"; + sha256 = "1dws2jrizixi108mw1lgb7jz6dgs5xvvmj16bkf9x54rhvjb7r9b"; + name = "ksmtp-17.12.3.tar.xz"; }; }; ksnakeduel = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksnakeduel-17.08.3.tar.xz"; - sha256 = "1a7xki783799ala0zx1jngvhsky994sk32xyza2lfir5ym1w0pkm"; - name = "ksnakeduel-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ksnakeduel-17.12.3.tar.xz"; + sha256 = "0w4nw1pyznn4dkcqgf2d5c2r7z5xg5gc97whw1i67wqq9sbi98hy"; + name = "ksnakeduel-17.12.3.tar.xz"; }; }; kspaceduel = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kspaceduel-17.08.3.tar.xz"; - sha256 = "1wskg788mc51dh3hv0d7hrqyy14gnzzw2sqhc0pd65jj8hra7kh2"; - name = "kspaceduel-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kspaceduel-17.12.3.tar.xz"; + sha256 = "13pqdb3f0zjnv71y93kha3wkq9kivl8g01sa5g9ydjmnxahzhqc6"; + name = "kspaceduel-17.12.3.tar.xz"; }; }; ksquares = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksquares-17.08.3.tar.xz"; - sha256 = "04bc3ppiai39v8dq02r7nzr4nvpzjj90glg6qssxqyxwrz18kk20"; - name = "ksquares-17.08.3.tar.xz"; - }; - }; - kstars = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kstars-17.08.3.tar.xz"; - sha256 = "0i165snb4wnw2kzbhcawgwwqppgq5fmw23rqa4q2k3alaz9smcdn"; - name = "kstars-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ksquares-17.12.3.tar.xz"; + sha256 = "19cbmc2mnljlndijb11k9l67q2cmdd5yjsjwv61rawq25xwfh667"; + name = "ksquares-17.12.3.tar.xz"; }; }; ksudoku = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksudoku-17.08.3.tar.xz"; - sha256 = "1dmqss272z7s7vbh71zg7s5drn66a2yyrv53f34yk3d93mhk8dq2"; - name = "ksudoku-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ksudoku-17.12.3.tar.xz"; + sha256 = "0c335klnzq4bf91c2iib3iqhx24nf264p86mypk2as2mbcr02j9n"; + name = "ksudoku-17.12.3.tar.xz"; }; }; ksystemlog = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ksystemlog-17.08.3.tar.xz"; - sha256 = "0smhbdpj2xf9q8l8cjhk4x80qq6apn6mmf7dna9hznp6nd6jrsgv"; - name = "ksystemlog-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ksystemlog-17.12.3.tar.xz"; + sha256 = "0lnjdiwq3xlqi2lw0p9vj6fbqzmmqf0y6aivyxb7lbrjgjvh64lr"; + name = "ksystemlog-17.12.3.tar.xz"; }; }; kteatime = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kteatime-17.08.3.tar.xz"; - sha256 = "0pp08b2rjz329kdaqq5a490r353n346ah0ag6wfxmpchqy11lr3r"; - name = "kteatime-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kteatime-17.12.3.tar.xz"; + sha256 = "0f7cf0p7cnmw6mpc3135wk9l2j63yfd2fz06vngnl0zdysf4iwfz"; + name = "kteatime-17.12.3.tar.xz"; }; }; ktimer = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktimer-17.08.3.tar.xz"; - sha256 = "15k1rfih9k7zpcsdyiwl60jmp1w1svwb8c6cykjzqpc9acyfpba5"; - name = "ktimer-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktimer-17.12.3.tar.xz"; + sha256 = "1ghh3433wai87ifspvsvmjvamzminf9i73vbpf61ph5qgahx804x"; + name = "ktimer-17.12.3.tar.xz"; }; }; ktnef = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktnef-17.08.3.tar.xz"; - sha256 = "0fh0ybb3nijhxhkwcmcygw413blkmra83az1jhkmlpp6q5459jin"; - name = "ktnef-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktnef-17.12.3.tar.xz"; + sha256 = "13irgbcq6g363n65i92c2ciw35rxmq1x5hdlrdbidp718n44n84n"; + name = "ktnef-17.12.3.tar.xz"; }; }; ktouch = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktouch-17.08.3.tar.xz"; - sha256 = "0z21wb82m3sds4sjkkadb48zxcfj1qbab07i3cs3g3a730zdj5ld"; - name = "ktouch-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktouch-17.12.3.tar.xz"; + sha256 = "04frgq9lyk51p66lv48pgk8b4f4jxh73fpr907dnwbsyqkg6l795"; + name = "ktouch-17.12.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-accounts-kcm-17.08.3.tar.xz"; - sha256 = "17h75xkavyl2920j57nm6zp81l70ksyjndrrrqxv8clig1bqfc89"; - name = "ktp-accounts-kcm-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-accounts-kcm-17.12.3.tar.xz"; + sha256 = "0fi3065yq38pn2x7r5a0fynbq7xyklbzvlp4gwr4bhg41fqm74hm"; + name = "ktp-accounts-kcm-17.12.3.tar.xz"; }; }; ktp-approver = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-approver-17.08.3.tar.xz"; - sha256 = "0dvwwpy50ixylacrxnfh4aqpsbc4nfsqkwr358917w5mambfji42"; - name = "ktp-approver-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-approver-17.12.3.tar.xz"; + sha256 = "06x1ycp5biapalf5yk0lh9wwda1mx5a4ssv1p3q9kb7f7v1i8wkp"; + name = "ktp-approver-17.12.3.tar.xz"; }; }; ktp-auth-handler = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-auth-handler-17.08.3.tar.xz"; - sha256 = "0pm0bvivwlaq083sql74qq5wrlm7wix1k9i4cr3fck73am9h526b"; - name = "ktp-auth-handler-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-auth-handler-17.12.3.tar.xz"; + sha256 = "03vha3rf7989wi47hn004g4m1lgi236in395yl4f2bl2h0qq1g21"; + name = "ktp-auth-handler-17.12.3.tar.xz"; }; }; ktp-call-ui = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-call-ui-17.08.3.tar.xz"; - sha256 = "1kwprh9g97hraywjcv2ppddaxh7cw6gsy4zs8mjvh0zpnn3cy7xm"; - name = "ktp-call-ui-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-call-ui-17.12.3.tar.xz"; + sha256 = "0l85q8xykz0vj26yvcqcm3l6w84iada8hr32sn71151rv6palv0m"; + name = "ktp-call-ui-17.12.3.tar.xz"; }; }; ktp-common-internals = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-common-internals-17.08.3.tar.xz"; - sha256 = "10r5flyy4vph1x39dp2mskqksnf5h0qvskl31ln65vz9m8zrhq3w"; - name = "ktp-common-internals-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-common-internals-17.12.3.tar.xz"; + sha256 = "0vzppfy2ik3j9aw2rzb272h8q57vv6z3pqycfwbsd4j751hccx80"; + name = "ktp-common-internals-17.12.3.tar.xz"; }; }; ktp-contact-list = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-list-17.08.3.tar.xz"; - sha256 = "04j2swlqwzppxsbqnwyrz60lgi9l8d7x8hf4xmmhrv1al6vzmb5q"; - name = "ktp-contact-list-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-list-17.12.3.tar.xz"; + sha256 = "1clyfaabjjafmazw3gli10b00v0yb8m05bd6lwia7anslhs9pjfb"; + name = "ktp-contact-list-17.12.3.tar.xz"; }; }; ktp-contact-runner = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-runner-17.08.3.tar.xz"; - sha256 = "1sh0arsy3z413ng0b89sc6a4rh2rnh50k2mhkrdzcvfbwlf74bhw"; - name = "ktp-contact-runner-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-runner-17.12.3.tar.xz"; + sha256 = "0rj7l0dr0kqcijaxwq06chbmjb5xr12zcs02mjc08af5kc2girsq"; + name = "ktp-contact-runner-17.12.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-desktop-applets-17.08.3.tar.xz"; - sha256 = "03m834rh9v6ash8vm1cs2jpyxma6jaag61h5a51s3ykp0rgv984c"; - name = "ktp-desktop-applets-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-desktop-applets-17.12.3.tar.xz"; + sha256 = "16n8gj6x9cbk9bbpdf8zchrjajpw0dh2n5vf2ngyhw59w3rlwisj"; + name = "ktp-desktop-applets-17.12.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-filetransfer-handler-17.08.3.tar.xz"; - sha256 = "0vpl977p9lv58p04v6f9v0g4fda7xkhdggf3n4sjnwhis3n0nnx6"; - name = "ktp-filetransfer-handler-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-filetransfer-handler-17.12.3.tar.xz"; + sha256 = "1l2w39k9gmlnysphh4scc0krmxf0s9h1frj9blml9qfd8n92v5y8"; + name = "ktp-filetransfer-handler-17.12.3.tar.xz"; }; }; ktp-kded-module = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-kded-module-17.08.3.tar.xz"; - sha256 = "0mzzbi50ad2z11wi77957fhmwmqnqhfwjll4s7bj4fq6i3kpncmb"; - name = "ktp-kded-module-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-kded-module-17.12.3.tar.xz"; + sha256 = "1752m9sr7mb7hgrbarr2vnllvd67n6c059i3k2ds4npajvcdszhp"; + name = "ktp-kded-module-17.12.3.tar.xz"; }; }; ktp-send-file = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-send-file-17.08.3.tar.xz"; - sha256 = "1al9w5n0w6i3x0izylx2jviakj3j19izlys9j7phc2gnm99g8mfa"; - name = "ktp-send-file-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-send-file-17.12.3.tar.xz"; + sha256 = "02z13fy21v8yl3q164lw9265k3mw5mdhmr8f0dlpkx2x3mgdgjch"; + name = "ktp-send-file-17.12.3.tar.xz"; }; }; ktp-text-ui = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktp-text-ui-17.08.3.tar.xz"; - sha256 = "1ib9hskw3qdrpnb0caj12wqkzg0vh2i9wlx582zchn4k4hqkwsxw"; - name = "ktp-text-ui-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktp-text-ui-17.12.3.tar.xz"; + sha256 = "0zhqhq7zq4xp44df77fms1jp14pfz1gdandblgcbyx55fqgkx38v"; + name = "ktp-text-ui-17.12.3.tar.xz"; }; }; ktuberling = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/ktuberling-17.08.3.tar.xz"; - sha256 = "1jvyg09c5458m066sd0x6p2z41rpgbdvkgmw1f6wiybqwxg82h43"; - name = "ktuberling-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/ktuberling-17.12.3.tar.xz"; + sha256 = "1rqn9fzniyz3nnrjk6qjpbcs7m0gfnl2m671dgj87pwfsddicyr4"; + name = "ktuberling-17.12.3.tar.xz"; }; }; kturtle = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kturtle-17.08.3.tar.xz"; - sha256 = "1ral1y1s2jsc8zm1bwiliblywlpsb7q79cjqafz31r6cb72rkcs4"; - name = "kturtle-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kturtle-17.12.3.tar.xz"; + sha256 = "1m7pppqy1c6kscy95hx284p0iinx00iafpihii8hl4bvvam2sws8"; + name = "kturtle-17.12.3.tar.xz"; }; }; kubrick = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kubrick-17.08.3.tar.xz"; - sha256 = "02hzlkqrb55dc45zgqx3r58r7syb3kr2dfwws3s96j5i4q1bp5p8"; - name = "kubrick-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kubrick-17.12.3.tar.xz"; + sha256 = "0ls51xvkvxpr6pzpj67jmfbcwx7wrc9lyb149y59bmfbckc1cimp"; + name = "kubrick-17.12.3.tar.xz"; }; }; kwalletmanager = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kwalletmanager-17.08.3.tar.xz"; - sha256 = "1ggrswys6ip3lxj6qjy32i36rlmzn2cxddjildlb2b2hk6c3k36r"; - name = "kwalletmanager-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kwalletmanager-17.12.3.tar.xz"; + sha256 = "1lwslsx15ymyssnwl9yam26j3m5153sjyc4cvv5sxflk5wghaad1"; + name = "kwalletmanager-17.12.3.tar.xz"; }; }; kwave = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kwave-17.08.3.tar.xz"; - sha256 = "0gxmmz5ry6gjfrxwksrxvqyff8f3p807q5s4rcpfh975f10ixqqi"; - name = "kwave-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kwave-17.12.3.tar.xz"; + sha256 = "1wqhjdjc1cf1zjbgpxmiw60bxlxld7mikv1lkph750wygjkmnrng"; + name = "kwave-17.12.3.tar.xz"; }; }; kwordquiz = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/kwordquiz-17.08.3.tar.xz"; - sha256 = "0bzfil8pml6jmc0zgszxybyxvkdgzzq37l97z2qvhmjw8pfk0zsr"; - name = "kwordquiz-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/kwordquiz-17.12.3.tar.xz"; + sha256 = "1w1z5hjg36jyzl247ff1xk4xhr49qhnkmcxhnyp8fsj5hq9in6xx"; + name = "kwordquiz-17.12.3.tar.xz"; }; }; libgravatar = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libgravatar-17.08.3.tar.xz"; - sha256 = "0xx9xik5xcg9gs2hjf0z24v7bqqf5qk8x0743qlspyc35i8jq7hx"; - name = "libgravatar-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libgravatar-17.12.3.tar.xz"; + sha256 = "1862yzcmk1w9y1k83hkh749mhk9hlba7hdlsbbj8hmf3jb7hrczm"; + name = "libgravatar-17.12.3.tar.xz"; }; }; libkcddb = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkcddb-17.08.3.tar.xz"; - sha256 = "0yhs9acv87i8635dw79hpsiywgxcbnaa4vx0l95v50r3v2pknx7h"; - name = "libkcddb-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkcddb-17.12.3.tar.xz"; + sha256 = "1qwizxb8y35qddiqvf0469gnjid2bc80dfnv4qixxs3ba094c2pi"; + name = "libkcddb-17.12.3.tar.xz"; }; }; libkcompactdisc = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkcompactdisc-17.08.3.tar.xz"; - sha256 = "0r0w7qwi1pqcs9fv5rnpf7d2zjvaqd3yj2x12z2vc81qz4vrdr19"; - name = "libkcompactdisc-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkcompactdisc-17.12.3.tar.xz"; + sha256 = "1brz12j45vfb4xixr3lhn9fs1hbf723kc46psdg24yghfmx5j28v"; + name = "libkcompactdisc-17.12.3.tar.xz"; }; }; libkdcraw = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkdcraw-17.08.3.tar.xz"; - sha256 = "0hnbphkdmz3yd0callcwk2bqnkr2i9ljck63rz6yn4adnfdclkad"; - name = "libkdcraw-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkdcraw-17.12.3.tar.xz"; + sha256 = "11p25ldv3ry4khb52mfay85wlfbrsvk6f52yx8shzvbzxyzxf0nc"; + name = "libkdcraw-17.12.3.tar.xz"; }; }; libkdegames = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkdegames-17.08.3.tar.xz"; - sha256 = "1sc6y01z0alxdgrm3rlki6n5a3gblrim7cbxj9xbsghy6s8s3pn0"; - name = "libkdegames-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkdegames-17.12.3.tar.xz"; + sha256 = "1kh1wpdajzd1i3j0kr79npzq4w41gisn27k8v26dq1wy727vy4kd"; + name = "libkdegames-17.12.3.tar.xz"; }; }; libkdepim = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkdepim-17.08.3.tar.xz"; - sha256 = "19njszdhca7lk6cmkj4nnvj8zk7nakb9gq8bg34dqhhiq3nc6si5"; - name = "libkdepim-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkdepim-17.12.3.tar.xz"; + sha256 = "0zz86mnz73jj78gdfh0s19wfypb0xwxsvjcijbkr340diri5862q"; + name = "libkdepim-17.12.3.tar.xz"; }; }; libkeduvocdocument = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkeduvocdocument-17.08.3.tar.xz"; - sha256 = "0q978wn4brcszlf47iqnc93fqgcsvfcw2292n2hapf0cv8j8vzbm"; - name = "libkeduvocdocument-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkeduvocdocument-17.12.3.tar.xz"; + sha256 = "0yqilmf61izbh44rsmspslnikawikxsq8nk8a4lvq9206yy6h11v"; + name = "libkeduvocdocument-17.12.3.tar.xz"; }; }; libkexiv2 = { - version = "17.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkexiv2-17.08.3.tar.xz"; - sha256 = "0j906k63j30sajb70kqglhz9lhai98bh9x2bcwma711b2f30q2r2"; - name = "libkexiv2-17.08.3.tar.xz"; - }; - }; - libkface = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkface-17.08.3.tar.xz"; - sha256 = "0im9k72rxpk17m8ckl06rvylsxwjhgh3yxji1visvxljwkdscbmx"; - name = "libkface-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkexiv2-17.12.3.tar.xz"; + sha256 = "1xzrq9dn4x8afsf21sxqbsz1sk2vzp2g1ri5d5rz4vd1gj0sk3lg"; + name = "libkexiv2-17.12.3.tar.xz"; }; }; libkgapi = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkgapi-17.08.3.tar.xz"; - sha256 = "1yw00c16g2h59x5wzaaicv8b9dvdhbp0mqv49m8krnw07awh7isz"; - name = "libkgapi-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkgapi-17.12.3.tar.xz"; + sha256 = "015g1l4fkc5j403f0hak03iz2qi62gx4wlldm59hi1vgqq1xfp1y"; + name = "libkgapi-17.12.3.tar.xz"; }; }; libkgeomap = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkgeomap-17.08.3.tar.xz"; - sha256 = "0k0ndgwwm78z8hybyi0clfpkvmrpaj9b3xyda57c410m73fbdr0m"; - name = "libkgeomap-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkgeomap-17.12.3.tar.xz"; + sha256 = "1064yl3whr8g9qyirpgzvag2z4lal4qyljvlapfq3mpa3jxpcwdi"; + name = "libkgeomap-17.12.3.tar.xz"; }; }; libkipi = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkipi-17.08.3.tar.xz"; - sha256 = "0c0bhw0wpm6y21wj15cs73150dh0vxddl4lypj3xjpknxspiv32x"; - name = "libkipi-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkipi-17.12.3.tar.xz"; + sha256 = "0qqvrg1nvzcrxjvm1grxzm0vk7s9j1kzf73dk41cmvgwv9wirlgq"; + name = "libkipi-17.12.3.tar.xz"; }; }; libkleo = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkleo-17.08.3.tar.xz"; - sha256 = "1nyf7c1q7dngk28852lkhz3h1cvi5xy4ydshkm376h32ps905yb7"; - name = "libkleo-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkleo-17.12.3.tar.xz"; + sha256 = "0pp72ba58vwl1m9i72gdghbk3r5sa0pm8y7q9hz4a5qv919iny2k"; + name = "libkleo-17.12.3.tar.xz"; }; }; libkmahjongg = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkmahjongg-17.08.3.tar.xz"; - sha256 = "1w7fzvp44dl74m5pl206mrwxpj3fh4fd0fwfinxps616jx1q76fd"; - name = "libkmahjongg-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkmahjongg-17.12.3.tar.xz"; + sha256 = "10j9r8mb5x90zv91m32q0in2brqcwl3h7kv7lr6dqhd6jjmrx4gd"; + name = "libkmahjongg-17.12.3.tar.xz"; }; }; libkomparediff2 = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libkomparediff2-17.08.3.tar.xz"; - sha256 = "01bd04av3jnsc2kxirfi4d8k2baaskdk2kasmbih1gml2mw9sbff"; - name = "libkomparediff2-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libkomparediff2-17.12.3.tar.xz"; + sha256 = "0w6p8lvm2rn7y4qz0x3s87lwh1758xnyhwkkkng55n8v9rpjjw7l"; + name = "libkomparediff2-17.12.3.tar.xz"; }; }; libksane = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libksane-17.08.3.tar.xz"; - sha256 = "1skmqiw3j8jsdaj2haridslkx27wf55swjkzgjk4cxsk96j7y4ib"; - name = "libksane-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libksane-17.12.3.tar.xz"; + sha256 = "1rnxywpljiw4fb6djlm486z98l5f7vlwca0i0q99rj17gkxlddk2"; + name = "libksane-17.12.3.tar.xz"; }; }; libksieve = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/libksieve-17.08.3.tar.xz"; - sha256 = "1nphwghis0mmmb92nr4f5d364nd5jyi1has9dc1hx6qz8p0wphwg"; - name = "libksieve-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/libksieve-17.12.3.tar.xz"; + sha256 = "1cp1bfw2xd5fsnw5z061vfg8wbvv1bqk2lvcyvxgvm1im7892433"; + name = "libksieve-17.12.3.tar.xz"; }; }; lokalize = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/lokalize-17.08.3.tar.xz"; - sha256 = "0d4ym1vif1ggdlbs2k3ralc6lsm81xnlfp3z3mlkvg0vv77sfbra"; - name = "lokalize-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/lokalize-17.12.3.tar.xz"; + sha256 = "0n5f7myv45446kfpcaw7y278xsjxq5hnamfhc20h24m9pflp7bp9"; + name = "lokalize-17.12.3.tar.xz"; }; }; lskat = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/lskat-17.08.3.tar.xz"; - sha256 = "07vhmk03z2jw6mlfv5mdhzafcqa06skzm6ssk70y3whkwkck385b"; - name = "lskat-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/lskat-17.12.3.tar.xz"; + sha256 = "0n4kma0llqbgzcqsm7rb5rjidn8wlal9ay26041mic9hk51s3bm0"; + name = "lskat-17.12.3.tar.xz"; }; }; mailcommon = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/mailcommon-17.08.3.tar.xz"; - sha256 = "1zgy8sjng40w8m0b8fdy62p9sng7nld84py1k8zjw8mzhqqzqxs5"; - name = "mailcommon-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/mailcommon-17.12.3.tar.xz"; + sha256 = "17m54i4a9kn8lmpj3b42q2q9gqrympl9z2lgbhsacmak9aqrv94f"; + name = "mailcommon-17.12.3.tar.xz"; }; }; mailimporter = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/mailimporter-17.08.3.tar.xz"; - sha256 = "0h3wsbca2lhw1zjv2l1q6fhdwnx9kznyiykcn7jgzsh6f7grzqa8"; - name = "mailimporter-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/mailimporter-17.12.3.tar.xz"; + sha256 = "1q93lc98ak5kzz762ih906g0jj0vnib97x39sqq4awspy4a825pc"; + name = "mailimporter-17.12.3.tar.xz"; }; }; marble = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/marble-17.08.3.tar.xz"; - sha256 = "0qmzy9b1gd40xzw4i978315dxf1ay1937wplb9nc670gmlrqnzy2"; - name = "marble-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/marble-17.12.3.tar.xz"; + sha256 = "1pgqnvdmx7s33m2wyz73lwlpbjh9qfc3aqk532lznz3ncc54n07i"; + name = "marble-17.12.3.tar.xz"; }; }; mbox-importer = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/mbox-importer-17.08.3.tar.xz"; - sha256 = "1nlzjvzwp4jalqbql39q9lszfxg9cba5bcbi4wgiv580pyq38h28"; - name = "mbox-importer-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/mbox-importer-17.12.3.tar.xz"; + sha256 = "16gkjgqjh91kx2rgjz4idm888q6fxycqdmwy6bmks825260426rp"; + name = "mbox-importer-17.12.3.tar.xz"; }; }; messagelib = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/messagelib-17.08.3.tar.xz"; - sha256 = "1nxi79dyavjvgn83bjjrdwg0ry298ib126dxyl7inx7qgc4nhddn"; - name = "messagelib-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/messagelib-17.12.3.tar.xz"; + sha256 = "1pmdzyd8jka9wrflzv7lrr03nqf4r4vli2imhmg5hhjknn2b0ald"; + name = "messagelib-17.12.3.tar.xz"; }; }; minuet = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/minuet-17.08.3.tar.xz"; - sha256 = "1jg47mb5wnpw60is5zmdrqhjwsq6bnd5vw0pfiiw1arws50rv2h6"; - name = "minuet-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/minuet-17.12.3.tar.xz"; + sha256 = "1ahrcpkbs49kyhq0l5fcacn49pqfczy1b9zvydxmld5kxlpz7w8b"; + name = "minuet-17.12.3.tar.xz"; }; }; okteta = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/okteta-17.08.3.tar.xz"; - sha256 = "1zs0g5mnlj2fd0wipxgajnvbl5s24a37v6zdkixck5fmvlj6g14v"; - name = "okteta-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/okteta-17.12.3.tar.xz"; + sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; + name = "okteta-17.12.3.tar.xz"; }; }; okular = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/okular-17.08.3.tar.xz"; - sha256 = "1zalj2v9fgxc50b339i3j4n3gpf87pjnnqbgvkmd041apsv6jbnk"; - name = "okular-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/okular-17.12.3.tar.xz"; + sha256 = "0786kr75ly0h2jwabhzz3fc15swn8n90g1w3l27kphch5nf584ha"; + name = "okular-17.12.3.tar.xz"; }; }; palapeli = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/palapeli-17.08.3.tar.xz"; - sha256 = "1i689gycqlpi83wfy9l2dqzdypaizdx7cx069fbm4akv8r4xfjfz"; - name = "palapeli-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/palapeli-17.12.3.tar.xz"; + sha256 = "11kjj85axc7l1l1ip0gcf5p7f7g9rfwyn476wz25prsr2g2ijgln"; + name = "palapeli-17.12.3.tar.xz"; }; }; parley = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/parley-17.08.3.tar.xz"; - sha256 = "0crrf7k8p9rz72q4zfbyxxfza5dm0z4nhhc4jqafra8vvbjyja2j"; - name = "parley-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/parley-17.12.3.tar.xz"; + sha256 = "0swb7371vz9cxr2588hgcdxa5bmdb9n7h1yvmw28fbzgz98ax7g6"; + name = "parley-17.12.3.tar.xz"; }; }; picmi = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/picmi-17.08.3.tar.xz"; - sha256 = "0zj3ang96rwzpjr3y8lig1dhqxd2ipcs3q873plra0lxmlhnzq6b"; - name = "picmi-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/picmi-17.12.3.tar.xz"; + sha256 = "04cza4rvgzzvrzzw27n74k7kiwm7amcg12k97fr1rvlpd5irh2vn"; + name = "picmi-17.12.3.tar.xz"; }; }; pimcommon = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/pimcommon-17.08.3.tar.xz"; - sha256 = "0d1avdhm78kfjvl8sybjqsmp7k1wl961bqlzgbxk9wq6411p9r8r"; - name = "pimcommon-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/pimcommon-17.12.3.tar.xz"; + sha256 = "1yav8flw6rf5qdwgys3zkmijp81p56hwn6cd71ckfzdrjm11kikq"; + name = "pimcommon-17.12.3.tar.xz"; }; }; pim-data-exporter = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/pim-data-exporter-17.08.3.tar.xz"; - sha256 = "0afn6rjz7vmz9q16a487ssns6nj7sbqbz4ydbhh1i3c8xhlnxg1m"; - name = "pim-data-exporter-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/pim-data-exporter-17.12.3.tar.xz"; + sha256 = "0j5ynb0y602lnl571i247dbxna7xjqfphl7bcfqmg09ipjhxvk5b"; + name = "pim-data-exporter-17.12.3.tar.xz"; }; }; pim-sieve-editor = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/pim-sieve-editor-17.08.3.tar.xz"; - sha256 = "0fw976hdrvw68025bs1bff47d4cs95ws7p4viacmz4na9m0cag7n"; - name = "pim-sieve-editor-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/pim-sieve-editor-17.12.3.tar.xz"; + sha256 = "0bkd5qsrabwg5imnif8z0hvhsk00a2n23238f9y14g963bhyw4pp"; + name = "pim-sieve-editor-17.12.3.tar.xz"; }; }; poxml = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/poxml-17.08.3.tar.xz"; - sha256 = "0vgh77rdqp8pq5k20794fl8m12azx6r2pkl0rijmwar2ln5k0k25"; - name = "poxml-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/poxml-17.12.3.tar.xz"; + sha256 = "0r8wm2x13ayb3mi69c35plvwzw7r9525idk3indsxc0rhv5qkhfp"; + name = "poxml-17.12.3.tar.xz"; }; }; print-manager = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/print-manager-17.08.3.tar.xz"; - sha256 = "0ncda47pk225hn45rv1wwibn0s974mm4s5fpi54hyanba6ganll5"; - name = "print-manager-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/print-manager-17.12.3.tar.xz"; + sha256 = "0w1snq5ca7hza3x4gp17skia6g8yvarn9g3qacfwp13vad4v8zj7"; + name = "print-manager-17.12.3.tar.xz"; }; }; rocs = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/rocs-17.08.3.tar.xz"; - sha256 = "1nvwjxsfqccrig25m9qkivrjn302g6blb6h2p3q1qnlszcw8b9wd"; - name = "rocs-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/rocs-17.12.3.tar.xz"; + sha256 = "1dfg0klvix2mgnvw3dkh13694iac5jf0jk8rm9ssxcaljvix7h46"; + name = "rocs-17.12.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/signon-kwallet-extension-17.08.3.tar.xz"; - sha256 = "0hpalgz4xfd9qh5mxgrs638v0as4x0a5133caci6lwaydrhgwrxg"; - name = "signon-kwallet-extension-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/signon-kwallet-extension-17.12.3.tar.xz"; + sha256 = "0r9whz7p6v9wgbycdxzgxfm1ngxhjk4dzir5k5fqvmb6wrg05v4m"; + name = "signon-kwallet-extension-17.12.3.tar.xz"; }; }; spectacle = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/spectacle-17.08.3.tar.xz"; - sha256 = "18z0sqd38146nc73kmwvshjxl0wgm1fh4zzxai1hcp7yiipndzm6"; - name = "spectacle-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/spectacle-17.12.3.tar.xz"; + sha256 = "12g976ys2ga88n0a45zqkai28bmxw0vxy2qlgdmx7mxvkpwlccyr"; + name = "spectacle-17.12.3.tar.xz"; }; }; step = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/step-17.08.3.tar.xz"; - sha256 = "1gnsfn2iz2lax30pdyqvm6s5b8zjsn4gs031dlr1xgsd98c1xq87"; - name = "step-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/step-17.12.3.tar.xz"; + sha256 = "161r0abz18s32xpn8x2j5diwb6p4hggvlnv7p9yk1z3qm3fyj46v"; + name = "step-17.12.3.tar.xz"; }; }; svgpart = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/svgpart-17.08.3.tar.xz"; - sha256 = "07i3ny0bl1fjfia2rbrb7n4qycdpz4gjpvx6v540ghq58dy7nfgw"; - name = "svgpart-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/svgpart-17.12.3.tar.xz"; + sha256 = "1rcfdkpinqdbz7js7p9h0lxmnvln4y95af1icq2871w7mg4fzsf5"; + name = "svgpart-17.12.3.tar.xz"; }; }; sweeper = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/sweeper-17.08.3.tar.xz"; - sha256 = "0jymkz024ywss8y2xpyndpr7pk89v7bbgr5anpnywfkgx3lv06xn"; - name = "sweeper-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/sweeper-17.12.3.tar.xz"; + sha256 = "1pwjv4knj0by0sn8j788cxg3sl3vm0gql49yv47bansrvs458n4x"; + name = "sweeper-17.12.3.tar.xz"; }; }; syndication = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/syndication-17.08.3.tar.xz"; - sha256 = "0yakzq927prd9pd1g7gld90pz1cxjwzic2c2cw9bw17x19yr748h"; - name = "syndication-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/syndication-17.12.3.tar.xz"; + sha256 = "1bq220ir09sszj31xi8sk116k9xkhkmnmahigc73qc3hvgq0x808"; + name = "syndication-17.12.3.tar.xz"; }; }; umbrello = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/umbrello-17.08.3.tar.xz"; - sha256 = "1g149nkp02b1sgsq83r0p3vfii8jsc4kx79znglcjlf20dg89j70"; - name = "umbrello-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/umbrello-17.12.3.tar.xz"; + sha256 = "0j3qwisq9aqvgpqx54jd4idspbgvl72xffb8qn3wwyky9jpnmhr0"; + name = "umbrello-17.12.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.08.3"; + version = "17.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.3/src/zeroconf-ioslave-17.08.3.tar.xz"; - sha256 = "14prm7qjqh4xrgdxzbs8z8a8p2jjf2amcx7r1qx62fkhfbh6gw01"; - name = "zeroconf-ioslave-17.08.3.tar.xz"; + url = "${mirror}/stable/applications/17.12.3/src/zeroconf-ioslave-17.12.3.tar.xz"; + sha256 = "1glhci1vivkx3nvk6zwf2z09dii81vr5lcp3xf0aafl4p1vlxi3i"; + name = "zeroconf-ioslave-17.12.3.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/airspy/default.nix b/pkgs/applications/misc/airspy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9b6771a3925bf09371b900d5918b9efe4b79b310 --- /dev/null +++ b/pkgs/applications/misc/airspy/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub +, cmake , pkgconfig, libusb +}: + +let + version = "1.0.9"; +in + stdenv.mkDerivation { + name = "airspy-${version}"; + + src = fetchFromGitHub { + owner = "airspy"; + repo = "airspyone_host"; + rev = "v${version}"; + sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x"; + }; + + postPatch = '' + substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d" + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libusb ]; + + cmakeFlags = + lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/airspy/airspyone_host; + description = "Host tools and driver library for the AirSpy SDR"; + license = licenses.free; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ markuskowa ]; + }; + } diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..18f47b7652f8a503c12b5881480057323e9f9832 --- /dev/null +++ b/pkgs/applications/misc/airtame/default.nix @@ -0,0 +1,100 @@ +{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper +, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg, fontconfig, freetype +, gdk_pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite +, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender +, libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264 +}: + +let libPath = lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + curl + dbus + expat + ffmpeg + fontconfig + freetype + gdk_pixbuf + glib + glibc + gnome2.GConf + gtk2 + libopus + nspr + nss + pango + stdenv.cc.cc + udev + x264 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libpulseaudio + libxcb +]; +in stdenv.mkDerivation rec { + pname = "airtame"; + version = "3.1.1"; + name = "${pname}-${version}"; + longName = "${pname}-application"; + + src = fetchurl { + url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz"; + sha256 = "1am1qz280r5g9i0vwwx5lr24fpdl5lazhpr2bhb34nlr5d8rsmzr"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + desktopItem = makeDesktopItem rec { + name = "airtame"; + exec = longName; + comment = "Airtame Streaming Client"; + desktopName = "Airtame"; + icon = name; + genericName = comment; + categories = "Application;Network;"; + }; + + installPhase = '' + opt="$out/opt/airtame" + mkdir -p "$opt" + cp -R . "$opt" + mkdir -p "$out/bin" + ln -s "$opt/${longName}" "$out/bin/" + mkdir -p "$out/share" + cp -r "${desktopItem}/share/applications" "$out/share/" + mkdir -p "$out/share/icons" + ln -s "$opt/icon.png" "$out/share/icons/airtame.png" + + # Flags and rpath are copied from launch-airtame.sh. + interp="$(< $NIX_CC/nix-support/dynamic-linker)" + vendorlib="$opt/resources/app.asar.unpacked/streamer/vendor/airtame-core/lib" + rpath="${libPath}:$opt:$vendorlib:$opt/resources/app.asar.unpacked/encryption/out/lib" + rm $vendorlib/libcurl.so* + find "$opt" \( -type f -executable -o -name "*.so" -o -name "*.so.*" \) \ + -exec patchelf --set-rpath "$rpath" {} \; + # The main binary also needs libudev which was removed by --shrink-rpath. + patchelf --set-interpreter "$interp" $opt/${longName} + wrapProgram $opt/${longName} --add-flags "--disable-gpu --enable-transparent-visuals" + ''; + + dontPatchELF = true; + + meta = with stdenv.lib; { + homepage = https://airtame.com/download; + description = "Wireless streaming client for Airtame devices"; + license = licenses.unfree; + maintainers = with maintainers; [ thanegill ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index bb934ff4812cbf170f7cff830549f3beedcf8784..a5db33a0bb5a003481f042a7c53e6c98c833886e 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -12,6 +12,8 @@ libXcursor, libXxf86vm, libXi, + libXrandr, + libGL, xclip }: with rustPlatform; @@ -24,22 +26,24 @@ let libX11 libXcursor libXxf86vm + libXrandr + libGL libXi ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "2017-11-12"; + version = "2018-03-04"; # At the moment we cannot handle git dependencies in buildRustPackage. # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. src = fetchgit { url = https://github.com/Mic92/alacritty.git; rev = "rev-${version}"; - sha256 = "0096fzrfzj0a2n2n531r4b6c8rlfj5qc90d6i4iin5axalk3i1h4"; + sha256 = "0pxnc6r75c7rwnsqc0idi4a60arpgchl1i8yppibhv0px5w11mwa"; fetchSubmodules = true; }; - cargoSha256 = "10blch8pzk1zk3w27sbcszhcnq908xh1q55vqgy8iv5x47rpl02q"; + cargoSha256 = "0q2yy9cldng8znkmhysgrwi43z2x7a8nb1bnxpy9z170q8ds0m0j"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 5abd8953a4439ea93e7cacfea89ea59ce44a2442..250590d0d302ef902ca85673a345d5c3d2645e79 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,15 +1,15 @@ -{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtdeclarative, qtsvg, qtx11extras, muparser, - cmake, python3 }: +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, + qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }: mkDerivation rec { name = "albert-${version}"; - version = "0.14.7"; + version = "0.14.15"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "1ryjrbrbgignhkvsv4021l4am8ml7g8v4bs5cp5jj288k4p2rf4n"; + sha256 = "1rjp0bmzs8b9blbxz3sfcanyhgmds882pf1g3jx5qp85y64j8507"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index f1d84a91972436639685a7f56eb81d0e21a91081..eb35eb9cf73b90d54f2db1c0432de36c9dd5b958 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch"; sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j"; }) + # fix build with gcc7 + (fetchpatch { + url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch"; + sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi"; + }) ]; installPhase = '' @@ -58,7 +63,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.ardumont ]; }; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index cfd4d6b32de35c5e13c144e0eabc76e4ee5126fe..f69152820e43e48e8dd11e88d382d98526146496 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }: +{ stdenv, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation rec { name = "artha-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib gtk2 wordnet ]; + buildInputs = [ dbus-glib gtk2 wordnet ]; meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 71196e919915c639d4b6902d11941c5c7188c14c..0689843af61207a5716098417daaf7584a82253d 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://aa-project.sourceforge.net/bb; description = "AA-lib demo"; license = licenses.gpl2; - maintainers = maintainers.rnhmjoj; - platforms = platforms.unix; + maintainers = [ maintainers.rnhmjoj ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 196db45d9057ea4a9cd26e4e9b75e172d051214e..f0dce54675cd0fde09844a5472978aa8f4fd2652 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -1,13 +1,13 @@ { stdenv, pythonPackages, fetchurl }: pythonPackages.buildPythonApplication rec { name = "bleachbit-${version}"; - version = "1.12"; + version = "2.0"; namePrefix = ""; src = fetchurl { url = "mirror://sourceforge/bleachbit/${name}.tar.bz2"; - sha256 = "1x58n429q1c77nfpf2g3vyh6yq8wha69zfzmxf1rvjvcvvmqs62m"; + sha256 = "0ps98zx4n13q92bq7ykqi6hj3i7brdqgm87i9gk6ibvljp1vxdz9"; }; buildInputs = [ pythonPackages.wrapPython ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index b348f253b3503e29c8b47eb9d602c1ce76171374..c4c57380be994179d46ed5633e3b428742e71edb 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,29 +1,33 @@ { stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python +, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd , jackaudioSupport ? false, libjack2 , cudaSupport ? false, cudatoolkit , colladaSupport ? true, opencollada +, enableNumpy ? false, makeWrapper }: with lib; +let python = pythonPackages.python; in + stdenv.mkDerivation rec { - name = "blender-2.79"; + name = "blender-2.79b"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9"; + sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"; }; buildInputs = [ boost cmake ffmpeg gettext glew ilmbase libXi libX11 libXext libXrender - freetype libjpeg libpng libsamplerate libsndfile libtiff mesa openal + freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) + makeWrapper ] ++ optional jackaudioSupport libjack2 ++ optional cudaSupport cudatoolkit @@ -70,6 +74,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = optionalString enableNumpy + '' + wrapProgram $out/bin/blender \ + --prefix PYTHONPATH : ${pythonPackages.numpy}/lib/python${python.majorVersion}/site-packages + ''; + meta = with stdenv.lib; { description = "3D Creation/Animation/Publishing System"; homepage = https://www.blender.org; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 8aa191c0f3c25f78871ec89bc30031432733510e..83ba02933fd510f6bf07a2e4fcb4fe3a19497d1d 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,17 +1,22 @@ -{ stdenv, python3, fetchFromGitHub }: +{ stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "3.4"; - name = "buku-${version}"; + version = "3.7"; + pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0"; + sha256 = "0qc6xkrhf2phaj9fhym19blr4rr2vllvnyljjz909xr4vsynvb41"; }; - nativeBuildInputs = [ + patches = fetchpatch { + url = https://github.com/jarun/Buku/commit/495d6eac4d9371e8ce6d3f601e2bb9e5e74962b4.patch; + sha256 = "0py4l5qcgdzqr0iqmcc8ddld1bspk8iwypz4dcr88y70j86588gk"; + }; + + checkInputs = [ pytestcov pytest-catchlog hypothesis @@ -33,7 +38,9 @@ with python3.pkgs; buildPythonApplication rec { # Disables a test which requires internet substituteInPlace tests/test_bukuDb.py \ - --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" + --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \ + --replace "self.assertEqual(shorturl, 'http://tny.im/yt')" "" \ + --replace "self.assertEqual(url, 'https://www.google.com')" "" ''; installPhase = '' @@ -50,7 +57,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = https://github.com/jarun/Buku; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 3f22d1629e27b2950ddba061a68a5768f0785a80..8800ebd83ca000faecb75e1868c6868fb9d05b37 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -1,20 +1,26 @@ -{stdenv, fetchurl, ncurses, gettext, python3, makeWrapper }: +{ stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }: stdenv.mkDerivation rec { name = "calcurse-${version}"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { url = "http://calcurse.org/files/${name}.tar.gz"; - sha256 = "0il0y06akdqgy0f9p40m4x6arn66nh7sr1w1i41bszycs7div266"; + sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i"; }; - buildInputs = [ncurses gettext python3 ]; + buildInputs = [ ncurses gettext python3 ]; nativeBuildInputs = [ makeWrapper ]; + # Build Python environment with httplib2 for calcurse-caldav + pythonEnv = python3Packages.python.buildEnv.override { + extraLibs = [ python3Packages.httplib2 ]; + }; + propagatedBuildInputs = [ pythonEnv ]; + postInstall = '' - makeWrapper ${python3}/bin/python3 $out/bin/calcurse-caldav - ''; + substituteInPlace $out/bin/calcurse-caldav --replace /usr/bin/python3 ${pythonEnv}/bin/python3 + ''; meta = with stdenv.lib; { description = "A calendar and scheduling application for the command line"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d81e9ed4bbef91189679cce1893af68de2739582..479aa26a19ea61e591174b5102c5cf9fb765f848 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,28 +5,20 @@ }: stdenv.mkDerivation rec { - version = "3.12.0"; + version = "3.22.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq"; + sha256 = "1nd8pbcfpfw9b26511mhvsvjyfmgnfpdmzwhi7wpkx36wpa4sask"; }; patches = [ # Patches from Debian that: # - disable plugin installation (very insecure) + ./disable_plugins.patch # - 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 = "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"; - sha256 = "16xwa2fa47jvs954fjrwr8rhh89aljgi1d1wrfxa40sknlmfwxif"; - }) + ./no_updates_dialog.patch # the unrar patch is not from debian ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; @@ -49,7 +41,7 @@ stdenv.mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (with python2Packages; [ - apsw cssselect cssutils dateutil html5-parser lxml mechanize netifaces pillow + apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow python pyqt5 sip regex msgpack # the following are distributed with calibre, but we use upstream instead diff --git a/pkgs/applications/misc/calibre/disable_plugins.patch b/pkgs/applications/misc/calibre/disable_plugins.patch new file mode 100644 index 0000000000000000000000000000000000000000..9ef1dd04251dfd1b71275dffef54ec03dcdb7283 --- /dev/null +++ b/pkgs/applications/misc/calibre/disable_plugins.patch @@ -0,0 +1,17 @@ +Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code. +Author: Martin Pitt +Bug-Debian: http://bugs.debian.org/640026 + +Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py +=================================================================== +--- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py 2011-12-16 05:49:14.000000000 +0100 ++++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py 2011-12-20 19:29:04.798468930 +0100 +@@ -28,8 +28,6 @@ + pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config) + cm('welcome wizard', _('Run welcome wizard'), + icon='wizard.png', triggered=self.gui.run_wizard) +- cm('plugin updater', _('Get plugins to enhance calibre'), +- icon='plugins/plugin_updater.png', triggered=self.get_plugins) + if not DEBUG: + pm.addSeparator() + cm('restart', _('Restart in debug mode'), icon='debug.png', diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch new file mode 100644 index 0000000000000000000000000000000000000000..4d37c3b642f5c7323211664b5376f7a53a541c4a --- /dev/null +++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch @@ -0,0 +1,27 @@ +diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py +--- calibre-2.9.0.orig/src/calibre/gui2/main.py 2014-11-09 20:09:54.081231882 +0800 ++++ calibre-2.9.0/src/calibre/gui2/main.py 2014-11-09 20:15:48.193033844 +0800 +@@ -37,8 +37,9 @@ + help=_('Start minimized to system tray.')) + parser.add_option('-v', '--verbose', default=0, action='count', + help=_('Ignored, do not use. Present only for legacy reasons')) +- parser.add_option('--no-update-check', default=False, action='store_true', +- help=_('Do not check for updates')) ++ parser.add_option('--update-check', dest='no_update_check', default=True, ++ action='store_false', ++ help=_('Check for updates')) + parser.add_option('--ignore-plugins', default=False, action='store_true', + help=_('Ignore custom plugins, useful if you installed a plugin' + ' that is preventing calibre from starting')) +diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py +--- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-09 20:09:54.082231864 +0800 ++++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115 +0800 +@@ -154,6 +154,8 @@ + self.update_checker.signal.update_found.connect(self.update_found, + type=Qt.QueuedConnection) + self.update_checker.start() ++ else: ++ self.update_checker = None + + def recalc_update_label(self, number_of_plugin_updates): + self.update_found(self.last_newest_calibre_version, number_of_plugin_updates) diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix deleted file mode 100644 index d90e8a6dba667734a6b3d9ab287554ec9c2290be..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/camlistore/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, go, fetchgit, git, buildGoPackage }: - -buildGoPackage rec { - name = "camlistore-${version}"; - version = "0.9"; - - src = fetchgit { - url = "https://github.com/camlistore/camlistore"; - rev = "refs/tags/${version}"; - sha256 = "1ypplr939ny9drsdngapa029fgak0wic8sbna588m79cbl17psya"; - leaveDotGit = true; - }; - - buildInputs = [ git ]; - - goPackagePath = ""; - buildPhase = '' - cd go/src/camlistore - go run make.go - ''; - - installPhase = '' - mkdir -p $bin/bin - rm bin/README - cp bin/* $bin/bin - ''; - - meta = with stdenv.lib; { - description = "A way of storing, syncing, sharing, modelling and backing up content"; - homepage = https://camlistore.org; - license = licenses.asl20; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index e48b32a783d729a62a811b404cccda50ffa9dc95..f2aac4326cbf365a3700df02f718e0bcc3e77e39 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://cgg.bzatek.net/; description = "a simple static web photo gallery, designed to be clean and easily usable"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 0c71b3ffb0addb9ae2416950e963c9d0a098855b..01511b41b08d1de4770899f768c876ef9f90e005 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cbatticon-${version}"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "valr"; repo = "cbatticon"; rev = version; - sha256 = "0rm1rpq81cxjwd4f11c3ivg5hwsd08qm47vdn16yr1cmm2cw4r2d"; + sha256 = "16g26vin1693dbdr9qsnw36fdchx394lp79gvp7gcbw0w1ny9av6"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index a46485c5ef732f5972a2ca01f0eb930c4161bff9..ad3f653465938fd87b821c1fa788bf38d11e586b 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -1,20 +1,26 @@ -{ stdenv, python3Packages, fetchurl }: +{ stdenv, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "cheat"; - version = "2.2.1"; + version = "2.2.3"; - propagatedBuildInputs = with python3Packages; [ docopt pygments ]; + propagatedBuildInputs = [ docopt pygments ]; - src = fetchPypi { - inherit pname version; - sha256 = "0w4k1h02p2gjv5wcr1c7r0ynb7v50qajx4hpyxz0ndh96f6x30pl"; + src = fetchFromGitHub { + owner = "chrisallenlane"; + repo = "cheat"; + rev = version; + sha256 = "1p9a54fax3b1ilqcwdlccy08ww3igwsyzcyikqivaxj5p6mqq6wl"; }; # no tests available doCheck = false; + postInstall = '' + install -D man1/cheat.1.gz $out/share/man/man1/cheat.1.gz + ''; + meta = with stdenv.lib; { description = "cheat allows you to create and view interactive cheatsheets on the command-line"; maintainers = with maintainers; [ mic92 ]; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 324fa12dc463f37fcac7233d534335d28095d558..ff1712f12fec1634d9f1cf7887637e12d4e2b161 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "cherrytree-${version}"; - version = "0.37.6"; + version = "0.38.4"; src = fetchurl { url = "http://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "0x4cgsimpwh7wfbzbzw2f5ipxxjizpi4wa99s1cwizynfjr38y5s"; + sha256 = "1zazyxkrli77wahn4c1z24qyz5bwlayl335f2kdxb44dicrx58g2"; }; buildInputs = with pythonPackages; diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 673ecdc85496e0a28dceb0b748ee425e0fddab08..22d659dd10e445d7b6e62401c1e73c15339e2a5b 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20170714"; + version = "20180412"; src = fetchurl { url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "1pglsmc0pf50w7df4vv30z5hmdxy4aqjl3qrv8kfiax7rld21gcy"; + sha256 = "17wpxqzifz6grw9xzg9q9vr58vm2xd50fhd64c3ngdhxcnq2dpj9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 8b24df1bee92775b0c21591e7ba5a5c54e209f50..7aecc8f823ee4153b40de5dff4018f1ae451775c 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { - version = "1.6"; + version = "1.7"; name = "cli-visualizer-${version}"; src = fetchFromGitHub { owner = "dpayne"; repo = "cli-visualizer"; rev = version; - sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc"; + sha256 = "06z6vj87xjmacppcxvgm47wby6mv1hnbqav8lpdk9v5s1hmmp1cr"; }; postPatch = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dpayne/cli-visualizer; description = "CLI based audio visualizer"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index d9ea487a83bb6974caf3269ce028162848f9256c..4477cbbcc06a9d6300eac131550b67046af76154 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor_icon_theme }: +{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "clipit-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ]; + buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ]; meta = with stdenv.lib; { description = "Lightweight GTK+ Clipboard Manager"; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index de18a211c45002091b10fb82c93a1c3570ca3ccd..661a00a066161ac2db77cca03f2dc65162e20c1e 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qt4, qmake4Hook }: -let version = "0.6.1"; in +let version = "0.6.4"; in stdenv.mkDerivation { name = "confclerk-${version}"; src = fetchurl { url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; - sha256 = "1wprndshmc7k1919n7k93c4ha2jp171q31gx7xsbzx7g4sw6432g"; + sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"; }; buildInputs = [ qt4 ]; @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = http://www.toastfreeware.priv.at/confclerk; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ehmry ]; - inherit (qt4.meta) platforms; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 985a418e158260d8e0a36501e1b5d43deff4bd53..f4ad3a1c538200a185c75966ea36a0ea09c57722 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchgit, qtbase, qtquick1, qmltermwidget, +{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget, qtquickcontrols, qtgraphicaleffects, qmake }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.0.1"; name = "cool-retro-term-${version}"; - src = fetchgit { - url = "https://github.com/Swordfish90/cool-retro-term.git"; - rev = "refs/tags/v${version}"; - sha256 = "19sf9ppp2xzwfjwmdqgq9pils4yafsz662n1h65sv5aq04c7gmxs"; - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "Swordfish90"; + repo = "cool-retro-term"; + rev = version; + sha256 = "1ah54crqv13xsg9cvlwmgyhz90xjjy3vy8pbn9i0vc0ljmpgkqd5"; }; patchPhase = '' diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 37afea2bb6f600a2ea2781924dbb246b3a7a1f15..75a402ba2319d25e33bfca2d58ca407e9dfc6d54 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.1.2"; + version = "3.3.1"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl"; + sha256 = "1jjb979dwdnkjca95yxzapbjpd6hr97hxz7sn614whvdv4vvpnyc"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 150c900ba9fbb92371488ade0441b3cf77b27dbf..33b16e3242c66c5e4e9d56eb24362333721539b0 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -13,7 +13,7 @@ , miniupnpc , libmicrohttpd , gmp -, mesa +, libGLU_combined , extraCmakeFlags ? [] }: stdenv.mkDerivation rec { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { miniupnpc libmicrohttpd gmp - mesa + libGLU_combined ]; dontStrip = true; @@ -80,5 +80,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ artuuge ]; platforms = platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 0123e0c38d74a6f493deedc137cbf73b6f0899fd..f8927319a0110515d40b5a3922248cd28f75e34a 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://ctodo.apakoh.dk/; description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 1012f187497ac19b82032b06ea6fd5fd60d0c4ea..edb10a0f6671774a3e1ee948951835c9087192de 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { name = "cura-${version}"; - version = "3.0.3"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0ks8bb3mif6kyvb01ddhpn1c2l31s8fxivi70kmpm743sqv4kjaa"; + sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp"; }; buildInputs = [ qtbase qtquickcontrols ]; @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = "https://github.com/Ultimaker/Cura"; + homepage = https://github.com/Ultimaker/Cura; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..439b0fc2568488183711e33381cf01c2b86937fb --- /dev/null +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -0,0 +1,76 @@ +{ stdenv, lib, fetchurl, python, pythonPackages, unzip }: + +# This package uses a precompiled "binary" distribution of CuraByDagoma, +# distributed by the editor. +# +# To update the package, follow the links on https://dist.dagoma.fr/: +# * Cura By Dagoma +# * Linux +# * 64 bits +# * Genric archive +# +# I made the arbitrary choice to compile this package only for x86_64. +# I guess people owning a 3D printer generally don't use i686. +# If, however, someone needs it, we certainly can find a solution. + +stdenv.mkDerivation rec { + name = "curabydagoma-${version}"; + # Version is the date, UNIX format + version = "1520506579"; + # Hash of the user's choice: os, arch, package type... + hash = "58228cce5bbdcf764b7116850956f1e5"; + + src = fetchurl { + url = "https://dist.dagoma.fr/get/zip/CuraByDagoma/${version}/${hash}"; + sha256 = "16wfipdyjkf6dq8awjzs4zgkmqk6230277mf3iz8swday9hns8pq"; + }; + unpackCmd = "unzip $curSrc && tar zxf CuraByDagoma_amd64.tar.gz"; + nativeBuildInputs = [ unzip ]; + buildInputs = [ python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ]; + + # Compile all pyc files because the included pyc files may be older than the + # py files. However, Python doesn't realize that because the packages + # have all dates set to epoch. + buildPhase = '' + python -m compileall -f curabydago + ''; + + # * Simply copy the stuff there + # * Create an executable with the correct path etc + # * Create a .desktop file to have a launcher in the desktop environments + installPhase = '' + mkdir $out + cp -r * $out/ + + mkdir $out/bin + cat > $out/bin/curabydago < $out/share/applications/curabydago.desktop <!'"$out/bin"'/&!g' dmenu_run - ''; - - preConfigure = [ - ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk'' - ]; - - meta = { - description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = http://tools.suckless.org/dmenu; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index cfe76701cebbd37cbac81d56e6944151a023dda4..3888c4ce0a0dbac38a35e0843d4fd6fb4deda3bc 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pythonPackages, gnome2, keybinder }: pythonPackages.buildPythonApplication rec { - ver = "0.92"; + ver = "0.93"; name = "dockbarx-${ver}"; src = fetchFromGitHub { owner = "M7S"; repo = "dockbarx"; rev = ver; - sha256 = "17n7jc3bk3f2i0i1ddpp05bakifc8y5xppads7ihpkj3qw9g35vl"; + sha256 = "1h1g2vag5vnx87sa1f0qi8rq7wlr2ymvkrdr08kk7cma4wk0x6hg"; }; postPatch = '' diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 1393af67bf8c539f0225493cf6fe9660d7de03fb..bd7fbe863163150fc2935357dff5284d551d8444 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,22 +1,23 @@ -{ stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }: +{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "doomseeker-1.1"; + name = "doomseeker-${version}"; + version = "2018-03-03"; - src = fetchurl { - url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2"; - sha256 = "0nmq8s842z30ngzikrmfx0xpnk4klxdv37y26chs002rnj010r7h"; + src = fetchFromBitbucket { + owner = "Doomseeker"; + repo = "doomseeker"; + rev = "072110a8fe0643c4a72461e7768560813bb0a62b"; + sha256 = "1w4g5f7yifqk2d054dqrmy8qj4n5hxdan7n59845m1xh2f2r8i0p"; }; - buildInputs = [ qt4 zlib bzip2 ]; + patches = [ ./fix_paths.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake qttools pkgconfig ]; - patchPhase = '' - substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; diff --git a/pkgs/applications/misc/doomseeker/fix_paths.patch b/pkgs/applications/misc/doomseeker/fix_paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..08654c2384cb3b9f94733f1f646b75b3a207f3ae --- /dev/null +++ b/pkgs/applications/misc/doomseeker/fix_paths.patch @@ -0,0 +1,40 @@ +diff -ru3 source-old/src/core/datapaths.cpp source-new/src/core/datapaths.cpp +--- source-old/src/core/datapaths.cpp 1970-01-01 03:00:01.000000000 +0300 ++++ source-new/src/core/datapaths.cpp 2018-03-04 00:10:25.247262567 +0300 +@@ -335,7 +335,7 @@ + paths.append(workingDirectory()); + paths.append("./"); + #ifndef Q_OS_WIN32 +- paths.append(INSTALL_PREFIX "/" INSTALL_LIBDIR "/doomseeker/"); ++ paths.append(INSTALL_PREFIX "/lib/doomseeker/"); + #endif + paths = uniquePaths(paths); + return Strings::combineManyPaths(paths, "engines/"); +diff -ru3 source-old/src/core/pathfinder/pathfinder.cpp source-new/src/core/pathfinder/pathfinder.cpp +--- source-old/src/core/pathfinder/pathfinder.cpp 1970-01-01 03:00:01.000000000 +0300 ++++ source-new/src/core/pathfinder/pathfinder.cpp 2018-03-04 00:09:34.862556976 +0300 +@@ -128,9 +128,7 @@ + << DataPaths::programFilesDirectory(DataPaths::x64) + << DataPaths::programFilesDirectory(DataPaths::x86); + #else +- paths << "/usr/bin" << "/usr/local/bin" << "/usr/share/bin" +- << "/usr/games/" << "/usr/local/games/" +- << "/usr/share/games/" << gDefaultDataPaths->workingDirectory() << "."; ++ paths << gDefaultDataPaths->workingDirectory() << "."; + #endif + QStringList pathsCopy(paths); + foreach (const QString &path, pathsCopy) +diff -ru3 source-old/src/core/pathfinder/wadpathfinder.cpp source-new/src/core/pathfinder/wadpathfinder.cpp +--- source-old/src/core/pathfinder/wadpathfinder.cpp 1970-01-01 03:00:01.000000000 +0300 ++++ source-new/src/core/pathfinder/wadpathfinder.cpp 2018-03-04 00:09:56.822865339 +0300 +@@ -84,10 +84,6 @@ + QStringList defaultPaths() + { + QStringList paths; +- #ifdef Q_OS_UNIX +- paths << "/usr/local/share/games/doom/" +- << "/usr/share/games/doom/"; +- #endif + return paths; + } + }; diff --git a/pkgs/applications/misc/dump1090/default.nix b/pkgs/applications/misc/dump1090/default.nix index 3e9fe133d93c07a469e25d1f2c7d4bf5eaf5e5a0..29f6c60856028de1065a5166878fc975134ba050 100644 --- a/pkgs/applications/misc/dump1090/default.nix +++ b/pkgs/applications/misc/dump1090/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ libusb rtl-sdr ]; - makeFlags = [ "PREFIX=$out" ]; + makeFlags = [ "PREFIX=$(out)" ]; installPhase = '' mkdir -p $out/bin $out/share - cp -v dump1090 $out/bin/dump1090 + cp -v dump1090 view1090 $out/bin cp -vr public_html $out/share/dump1090 ''; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 919ad10fa706f48c22d919ebaba20c29896abf04..9906b1fd8587a6c833fef2b2db21ec720797d9b3 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,34 +1,39 @@ { stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, which, perl, gtk2, xrandr -, cairo, dbus, gdk_pixbuf, glib, libX11, libXScrnSaver +, pkgconfig, which, perl, libXrandr +, cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver , libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg }: stdenv.mkDerivation rec { name = "dunst-${version}"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "0jncnb4z4hg92ws08bkf52jswsd4vqlzyznwbynhh2jh6q0sl18b"; + sha256 = "0i518v2z9fklzl5w60gkwwmg30yz3bd0k4rxjrxjabx73pvxm1mz"; }; - nativeBuildInputs = [ perl pkgconfig which ]; + nativeBuildInputs = [ perl pkgconfig which systemd ]; buildInputs = [ cairo dbus gdk_pixbuf glib libX11 libXScrnSaver - libXinerama libnotify libxdg_basedir pango xproto librsvg gtk2 xrandr + libXinerama libnotify libxdg_basedir pango xproto librsvg libXrandr ]; outputs = [ "out" "man" ]; - makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ]; + makeFlags = [ + "PREFIX=$(out)" + "VERSION=$(version)" + "SERVICEDIR_DBUS=$(out)/share/dbus-1/services" + "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user" + ]; meta = with stdenv.lib; { description = "Lightweight and customizable notification daemon"; - homepage = http://www.knopwob.org/dunst/; + homepage = https://dunst-project.org/; license = licenses.bsd3; # NOTE: 'unix' or even 'all' COULD work too, I'm not sure platforms = platforms.linux; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 56c1a8168a820262b10a589514bd240df7383f03..76b61de56088cc60dbfed3eabf207a52c0c59f2f 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,24 +1,31 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3Packages, qtbase }: -python2Packages.buildPythonApplication rec { - version = "2.9.4"; +let + + python = python3Packages.python; + +in + +python3Packages.buildPythonApplication rec { + version = "3.1.6"; name = "electron-cash-${version}"; src = fetchurl { - url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz"; + url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz"; # Verified using official SHA-1 and signature from # https://github.com/fyookball/keys-n-hashes - sha256 = "1y8mzwa6bb8zj4l92wm4c2icnr42wmhbfz6z5ymh356gwll914vh"; + sha256 = "062k5iw0jcp10zxrffvgiyfg51c5xzs7gmm638icx01yy67d58dm"; }; - propagatedBuildInputs = with python2Packages; [ - dns + propagatedBuildInputs = with python3Packages; [ + dnspython ecdsa - jsonrpclib + jsonrpclib-pelix + matplotlib pbkdf2 pyaes pycrypto - pyqt4 + pyqt5 pysocks qrcode requests @@ -29,18 +36,25 @@ python2Packages.buildPythonApplication rec { trezor ]; + postPatch = '' + # Remove pyqt5 check + sed -i '/pyqt5/d' setup.py + ''; + preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc4 icons.qrc -o gui/qt/icons_rc.py + pyrcc5 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 ''; + doCheck = false; + postInstall = '' # Despite setting usr_share above, these files are installed under # $out/nix ... - mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out - rm -rf $out/lib/python2.7/site-packages/nix + mv $out/${python.sitePackages}/nix/store"/"*/share $out + rm -rf $out/${python.sitePackages}/nix substituteInPlace $out/share/applications/electron-cash.desktop \ --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u" @@ -60,6 +74,7 @@ python2Packages.buildPythonApplication rec { of the blockchain. ''; homepage = https://www.electroncash.org/; + platforms = platforms.linux; maintainers = with maintainers; [ lassulus ]; license = licenses.mit; }; diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix deleted file mode 100644 index e7a5a1be1979b52b3edc5cb994ad5cceefcec7cc..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, python2Packages }: - -python2Packages.buildPythonApplication rec { - name = "electrum-dash-${version}"; - version = "2.4.1"; - - src = fetchurl { - url = "https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz"; - sha256 = "02k7m7fyn0cvlgmwxr2gag7rf2knllkch1ma58shysp7zx9jb000"; - }; - - propagatedBuildInputs = with python2Packages; [ - dns - ecdsa - pbkdf2 - protobuf - pyasn1 - pyasn1-modules - pycrypto - pyqt4 - qrcode - requests - slowaes - tlslite - x11_hash - mnemonic - - # plugins - trezor - ]; - - preInstall = '' - mkdir -p $out/share - sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py - pyrcc4 icons.qrc -o gui/qt/icons_rc.py - ''; - - meta = with stdenv.lib; { - description = "Electrum DASH"; - homepage = https://github.com/dashpay/electrum-dash; - license = licenses.gpl3; - maintainers = with maintainers; [ np ]; - }; -} diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix deleted file mode 100644 index bb41f8665e57886cd1ddcf55c842073b363a6be7..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ 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 - protobuf - 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/dash.nix b/pkgs/applications/misc/electrum/dash.nix new file mode 100644 index 0000000000000000000000000000000000000000..c98efa547b393c1750156e9adf0156d90acd9db2 --- /dev/null +++ b/pkgs/applications/misc/electrum/dash.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, python2Packages }: + +python2Packages.buildPythonApplication rec { + version = "2.9.3.1"; + name = "electrum-dash-${version}"; + + src = fetchurl { + url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz"; + #"https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz"; + sha256 = "9b7ac205f63fd4bfb15d77a34a4451ef82caecf096f31048a7603bd276dfc33e"; + }; + + propagatedBuildInputs = with python2Packages; [ + dnspython + ecdsa + pbkdf2 + protobuf + pyasn1 + pyasn1-modules + pycrypto + pyqt4 + qrcode + requests + pyaes + tlslite + x11_hash + mnemonic + jsonrpclib + + # plugins + trezor + ]; + + preInstall = '' + mkdir -p $out/share + sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py + pyrcc4 icons.qrc -o gui/qt/icons_rc.py + ''; + + meta = with stdenv.lib; { + description = "Electrum DASH"; + homepage = https://github.com/dashpay/electrum-dash; + license = licenses.gpl3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index abe8d0dde84b081594ccc5ed957c4a769f8fc53d..383f73b62994b300b005b79aec824089735a389e 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3, python3Packages, zbar, fetchpatch }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.9.3"; + version = "3.1.3"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2"; + sha256 = "05m28yd3zr9awjhaqikf4rg08j5i4ygm750ip1z27wl446sysniy"; }; - propagatedBuildInputs = with python2Packages; [ - dns + propagatedBuildInputs = with python3Packages; [ + dnspython ecdsa - jsonrpclib + jsonrpclib-pelix matplotlib pbkdf2 protobuf pyaes pycrypto - pyqt4 + pyqt5 pysocks qrcode requests @@ -35,21 +35,24 @@ python2Packages.buildPythonApplication rec { preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc4 icons.qrc -o gui/qt/icons_rc.py + pyrcc5 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 + sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" lib/qrscanner.py ''; postInstall = '' # Despite setting usr_share above, these files are installed under # $out/nix ... - mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out - rm -rf $out/lib/python2.7/site-packages/nix + mv $out/${python3.sitePackages}/nix/store"/"*/share $out + rm -rf $out/${python3.sitePackages}/nix substituteInPlace $out/share/applications/electrum.desktop \ --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" ''; + doCheck = false; + doInstallCheck = true; installCheckPhase = '' $out/bin/electrum help >/dev/null diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix new file mode 100644 index 0000000000000000000000000000000000000000..7852e6eb790e02f4858ac68330fe47a1d3eb5801 --- /dev/null +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchurl +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + name = "electrum-ltc-${version}"; + version = "3.1.2.1"; + + src = fetchurl { + url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; + sha256 = "0sdql4k8g3py941rzdskm3k4hkwam4hzvg4qlvs0b5pw139mri86"; + }; + + propagatedBuildInputs = with python3Packages; [ + pyaes + ecdsa + pbkdf2 + requests + qrcode + py_scrypt + pyqt5 + protobuf + dnspython + jsonrpclib-pelix + pysocks + ]; + + preBuild = '' + sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py + pyrcc5 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.linux; + maintainers = with maintainers; [ asymmetric ]; + }; +} + diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index 7248fe2c875414bf6891a8c02a526642b944e79b..d447e7f50d527f341ba6a155c668b967ea1a1c9f 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.48"; + version = "0.2.50"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "0l68qqjh8lbqb2yqvggiga9qz2j32h3qklcfkycmcffn6l1nlqnq"; + sha256 = "18x3s3jrph8k3pc75jgwkfqazygpsx93zjxx68zms58my17cybh1"; }; phases = [ "buildPhase" "installPhase" ]; diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix index 170e2385d4af1aeac4ce3b44d8ef21ef3613a9c9..69767c11d6aab7934bfb06885b05f63019e218fd 100644 --- a/pkgs/applications/misc/evopedia/default.nix +++ b/pkgs/applications/misc/evopedia/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 qt4 libX11 ]; nativeBuildInputs = [ qmake4Hook ]; + postInstall = '' + # Patch the `evopedia.desktop' file. + substituteInPlace $out/share/applications/evopedia.desktop \ + --replace '/usr/bin/evopedia' $out/bin/evopedia + ''; + meta = with stdenv.lib; { description = "Offline Wikipedia Viewer"; homepage = http://www.evopedia.info; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index d0b98863d2036fb9bdb90e41b2c6a60f3e3198bf..74aab5e7e130e937a4b79a97751273ad85fb5556 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.4.0"; + version = "2.4.1"; goPackagePath = "github.com/exercism/cli"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "1hl13sr4ymqg9sjhkxdmhf8cfw69cic3bysw34xfv2j6bjjxfwaa"; + sha256 = "1nab4459zi2gkh18k9vsm54bz39c2sb60v2xy0i72j1vd99axjjj"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch index 68a16b196fa31e914f55270c5fd198ed05d7fcb1..a50070c4eadd45e562a9f80ead42975394f2b01d 100644 --- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch +++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch @@ -77,9 +77,9 @@ index 0000000..1bd9bb5 + + + -+ -+ -+ ++ ++ ++ + + + @@ -91,6 +91,7 @@ index 0000000..1bd9bb5 + + + ++ + + + diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 7bd876f1d4aa0312f675e41d9d096af52be6a107..9ddd39981cc2902fa2a40f5d2f8df8fe3e9f8285 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: with stdenv.lib; stdenv.mkDerivation rec { - rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26"; - build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}"; + rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a"; + build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = rev; - sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05"; + sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index add46f8871d571f19c006b71e08d7db4e0a8329c..93e5d297ffb3012d42f803ae61eecb47e4878d95 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc -, keybinder3, clutter_gtk, libnotify +, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc +, keybinder3, clutter-gtk, libnotify , libxkbcommon, xorg, udev , bashInteractive }: @@ -19,8 +19,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; buildInputs = [ - vala_0_23 gtk3 gnome3.gnome_common gnome3.libgee - gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify + vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee + gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon ] ++ optionals stdenv.isLinux [ udev ]; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 6d67d3a340f5d3bfc970f191ae2089ac8f3790c6..be853e4213bc771ec48262e30189153e759b7e49 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool, - pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool, - librsvg, vala_0_34, gnome3, wrapGAppsHook +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, + pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool, + librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -15,19 +15,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - makeWrapper pkgconfig automake autoconf libtool file intltool vala_0_34 - gnome3.yelp_tools + gnome3.yelp-tools wrapGAppsHook + # For setup hook + gobjectIntrospection ]; buildInputs = [ libxml2 - json_glib + json-glib sqlite itstool librsvg diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 939b38ca29f76bed62306427042b651105ce9e13..f05514f3fc58a7cc8457184d4f4000ccfe570454 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gammu-${version}"; - version = "1.38.2"; + version = "1.39.0"; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; rev = version; - sha256 = "1rk3p3sjyy6n6mlqs4qgyxna4swrh1zm7b77npxv8j341wxj3khv"; + sha256 = "1hr053z2l5mjgip83fsxnd1rqsp5gwywzagzrgdg243apn1nz0gs"; }; patches = [ ./bashcomp-dir.patch ./systemd.patch ]; diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 1b29def11ad89846a610a61880aea3d3ba32ff31..2257b2a98fb78296c84e6d3a63005524901582ae 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -51,6 +51,5 @@ stdenv.mkDerivation rec { # ‘GPL3-compatible’. See ${downloadPage} for detailed information. license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..67bb5feff8c7f896fe6701cdf888a2de1e2ae6e6 --- /dev/null +++ b/pkgs/applications/misc/gcal/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, ncurses }: + +stdenv.mkDerivation rec { + name = "gcal-${version}"; + version = "4.1"; + + src = fetchurl { + url = "mirror://gnu/gcal/${name}.tar.xz"; + sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci"; + }; + + enableParallelBuilding = true; + + buildInputs = [ ncurses ]; + + meta = { + description = "Program for calculating and printing calendars"; + longDescription = '' + Gcal is the GNU version of the trusty old cal(1). Gcal is a + program for calculating and printing calendars. Gcal displays + hybrid and proleptic Julian and Gregorian calendar sheets. It + also displays holiday lists for many countries around the globe. + ''; + homepage = https://www.gnu.org/software/gcal/; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index b6bb3c2fd83d40a99d3fdd4d836b1e73107e8908..ab4159790de0e049420455a0c0fe0c2fa01d3717 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,35 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses, libiconv, libintlOrEmpty -, withBuildColors ? true +{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gtk, gettext, libiconv, libintl }: -assert withBuildColors -> ncurses != null; - stdenv.mkDerivation rec { name = "girara-${version}"; - version = "0.2.7"; + version = "0.2.9"; src = fetchurl { - url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq"; + url = "http://pwmt.org/projects/girara/download/${name}.tar.xz"; + sha256 = "0lkxrfna818wkkr2f6mdzf15y5z8xl1b9592ylmzjbqsqya3w7x8"; }; - preConfigure = '' - substituteInPlace colors.mk \ - --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)' - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk gettext libintlOrEmpty ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - makeFlags = [ - "PREFIX=$(out)" - (if withBuildColors - then "TPUT=${ncurses.out}/bin/tput" - else "TPUT_AVAILABLE=0") - ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + buildInputs = [ libintl libiconv ]; + propagatedBuildInputs = [ glib gtk ]; meta = with stdenv.lib; { homepage = https://pwmt.org/projects/girara/; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index b9cbf8064a0758fb8a5dcabec374640215486bba..b4fac899f66f838b61cbb0b196cdb85134261a60 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = http://gkrellm.srcbox.net; license = licenses.gpl3Plus; maintainers = [ ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 509a54881cce7c9b8685f286865b81751f024a22..d4f2a056a9f6ce765011e1b22355d75a6a66ac96 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, - intltool, libstartup_notification, gtk_doc, wrapGAppsHook + intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool gtk_doc wrapGAppsHook + pkgconfig intltool gtk-doc wrapGAppsHook ]; buildInputs = [ - gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring + gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index dfe61b57b43ddde280d96b67a70792e84619b71f..bb1556c7c4dc43807a207c5c82401f184d5be0fd 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -1,22 +1,26 @@ { stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 -, gsettings_desktop_schemas, wrapGAppsHook +, gsettings-desktop-schemas, wrapGAppsHook }: -let version = "1.3.10"; in +let version = "1.3.11"; in stdenv.mkDerivation { name = "gmtp-${version}"; src = fetchurl { url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz"; - sha256 = "b21b9a8e66ae7bb09fc70ac7e317a0e32aff3917371a7241dea73c41db1dd13b"; + sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ]; + buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; enableParallelBuilding = true; + preFixup = '' + gappsWrapperArgs+=(--add-flags "--datapath \"$out/share\""); + ''; + meta = { description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; homepage = https://gmtp.sourceforge.io; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f99344b83d64fde59ad7df6b6dd2236b7e1c742b --- /dev/null +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gettext +, libxml2, desktop-file-utils, wrapGAppsHook +, glib, gtk3, libgtop, gnome3 }: + +let + pname = "gnome-usage"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0130bwinpkz307nalw6ndi5mk38k5g6jna4gbw2916d54df6a4nq"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ]; + + buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ]; + + postPatch = '' + chmod +x build-aux/meson/postinstall.sh + patchShebangs build-aux/meson/postinstall.sh + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = ""; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio-ais/default.nix deleted file mode 100644 index a67a8a44fcedbc85d4d730e55de52b85d635a135..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/gnuradio-ais/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, cppunit, gnuradio-osmosdr -, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - name = "gnuradio-ais-${version}"; - version = "2016-08-26"; - - src = fetchFromGitHub { - owner = "bistromath"; - repo = "gr-ais"; - rev = "1863d1bf8a7709a8dfedb3ddb8e2b99112e7c872"; - sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - meta = with stdenv.lib; { - description = "Gnuradio block for ais"; - homepage = https://github.com/bistromath/gr-ais; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio-gsm/default.nix deleted file mode 100644 index bbdc74510eaa8c1c95e00c87e0d381b9421617ff..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/gnuradio-gsm/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, cppunit, libosmocore, gnuradio-osmosdr -, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - name = "gnuradio-gsm-${version}"; - version = "2016-08-25"; - - src = fetchFromGitHub { - owner = "ptrkrysik"; - repo = "gr-gsm"; - rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d"; - sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gnuradio-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") - done - ''; - - meta = with stdenv.lib; { - description = "Gnuradio block for gsm"; - homepage = https://github.com/ptrkrysik/gr-gsm; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio-nacl/default.nix deleted file mode 100644 index cd3630c842c30c253b789e93d071738d3cba6ef8..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/gnuradio-nacl/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd -, makeWrapper, libsodium, cppunit -, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - name = "gnuradio-nacl-${version}"; - version = "2015-11-05"; - - src = fetchFromGitHub { - owner = "stwunsch"; - repo = "gr-nacl"; - rev = "d6dd3c02dcda3f601979908b61b1595476f6bf95"; - sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio uhd makeWrapper libsodium cppunit - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - meta = with stdenv.lib; { - description = "Gnuradio block for encryption"; - homepage = https://github.com/stwunsch/gr-nacl; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix deleted file mode 100644 index e2d3e808476e75ebe823a03bb7ed5911c0873581..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd -, makeWrapper, hackrf -, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - name = "gnuradio-osmosdr-${version}"; - version = "0.1.4"; - - src = fetchgit { - url = "git://git.osmocom.org/gr-osmosdr"; - rev = "refs/tags/v${version}"; - sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - meta = with stdenv.lib; { - description = "Gnuradio block for OsmoSDR and rtl-sdr"; - homepage = http://sdr.osmocom.org/trac/wiki/GrOsmoSDR; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor the-kenny ]; - }; -} diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio-rds/default.nix deleted file mode 100644 index 3d09441a7f0359d188641c620d0943156a7aed82..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/gnuradio-rds/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - name = "gnuradio-rds-${version}"; - version = "2016-08-27"; - - src = fetchFromGitHub { - owner = "bastibl"; - repo = "gr-rds"; - rev = "5246b75180808d47f321cb26f6c16d7c7a7af4fc"; - sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio makeWrapper - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - meta = with stdenv.lib; { - description = "Gnuradio block for radio data system"; - homepage = https://github.com/bastibl/gr-rds; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/applications/misc/gnuradio/ais.nix b/pkgs/applications/misc/gnuradio/ais.nix new file mode 100644 index 0000000000000000000000000000000000000000..dfb8415219c7123b43c28ff3f0a53676fdd091f8 --- /dev/null +++ b/pkgs/applications/misc/gnuradio/ais.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, cppunit, gnuradio-osmosdr +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-ais-${version}"; + version = "2015-12-20"; + + src = fetchFromGitHub { + owner = "bistromath"; + repo = "gr-ais"; + # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 + "rev" = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; + "sha256" = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Gnuradio block for ais"; + homepage = https://github.com/bistromath/gr-ais; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 0156122ec79a54b98fb7439d3ef0d7c43d84953f..58d8e9fae61804bb4a998346e8c35c6f1c2d200e 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -1,41 +1,51 @@ -{ stdenv, fetchurl -# core dependencies +{ stdenv, fetchFromGitHub, writeText, makeWrapper +# Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html +# => core dependencies , cmake, pkgconfig, git, boost, cppunit, fftw -# python wrappers +# => python wrappers +# May be able to upgrade to swig3 , python, swig2, numpy, scipy, matplotlib -# grc - the gnu radio companion +# => grc - the gnu radio companion , cheetah, pygtk -# gr-wavelet: collection of wavelet blocks +# => gr-wavelet: collection of wavelet blocks , gsl -# gr-qtgui: the Qt-based GUI -, qt4, qwt, pyqt4 #, pyqwt -# gr-wxgui: the Wx-based GUI +# => gr-qtgui: the Qt-based GUI +, qt4, qwt, pyqt4 +# => gr-wxgui: the Wx-based GUI , wxPython, lxml -# gr-audio: audio subsystems (system/OS dependent) -, alsaLib -# uhd: the Ettus USRP Hardware Driver Interface +# => gr-audio: audio subsystems (system/OS dependent) +, alsaLib # linux 'audio-alsa' +, CoreAudio # darwin 'audio-osx' +# => uhd: the Ettus USRP Hardware Driver Interface , uhd -# gr-video-sdl: PAL and NTSC display +# => gr-video-sdl: PAL and NTSC display , SDL +# Other , libusb1, orc, pyopengl -, makeWrapper }: stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.11"; + version = "3.7.11.1"; - src = fetchurl { - url = "https://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "1m2jf8lafr6pr2dlm40nbvr6az8gwjfkzpbs4fxzv3l5hcqvmnc7"; + src = fetchFromGitHub { + owner = "gnuradio"; + repo = "gnuradio"; + rev = "6d2221196082a4954c249dc6955e33d5832a56f2"; + sha256 = "1fkrb8cnjbriy2x94lz73q6aqxar1rkvfbafp266ykdpm29b4xgm"; + fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake git boost cppunit fftw python swig2 orc lxml qt4 - qwt alsaLib SDL libusb1 uhd gsl makeWrapper + nativeBuildInputs = [ + cmake pkgconfig git makeWrapper cppunit orc ]; + buildInputs = [ + boost fftw python swig2 lxml qt4 + qwt SDL libusb1 uhd gsl + ] ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ]; + propagatedBuildInputs = [ cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl ]; @@ -48,22 +58,46 @@ stdenv.mkDerivation rec { --replace BOOST_CONSTEXPR_OR_CONST const ''; + # Enables composition with nix-shell + grcSetupHook = writeText "grcSetupHook.sh" '' + addGRCBlocksPath() { + addToSearchPath GRC_BLOCKS_PATH $1/share/gnuradio/grc/blocks + } + addEnvHooks "$targetOffset" addGRCBlocksPath + ''; + + setupHook = [ grcSetupHook ]; + + # patch wxgui and pygtk check due to python importerror in a headless environment preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable -std=c++11" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}" + sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt + sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt + find . -name "CMakeLists.txt" -exec sed -i '1iadd_compile_options($<$:-std=c++11>)' "{}" ";" ''; + # Framework path needed for qwt6_qt4 but not qwt5 + cmakeFlags = + stdenv.lib.optionals stdenv.isDarwin [ "-DCMAKE_FRAMEWORK_PATH=${qwt}/lib" ]; + # - Ensure we get an interactive backend for matplotlib. If not the gr_plot_* # programs will not display anything. Yes, $MATPLOTLIBRC must point to the # *dirname* where matplotlibrc is located, not the file itself. # - GNU Radio core is C++ but the user interface (GUI and API) is Python, so # we must wrap the stuff in bin/. + # Notes: + # - May want to use makeWrapper instead of wrapProgram + # - may want to change interpreter path on Python examples instead of wrapping + # - see https://github.com/NixOS/nixpkgs/issues/22688 regarding use of --prefix / python.withPackages + # - see https://github.com/NixOS/nixpkgs/issues/24693 regarding use of DYLD_FRAMEWORK_PATH on Darwin postInstall = '' printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc" for file in $(find $out/bin $out/share/gnuradio/examples -type f -executable); do wrapProgram "$file" \ --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ - --set MATPLOTLIBRC "$out/share/gnuradio" + --set MATPLOTLIBRC "$out/share/gnuradio" \ + ${stdenv.lib.optionalString stdenv.isDarwin "--set DYLD_FRAMEWORK_PATH /System/Library/Frameworks"} done ''; @@ -80,7 +114,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.gnuradio.org; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/applications/misc/gnuradio/gsm.nix b/pkgs/applications/misc/gnuradio/gsm.nix new file mode 100644 index 0000000000000000000000000000000000000000..6e0856ce66aa80fa14ab9c62bda688bd0ae0e364 --- /dev/null +++ b/pkgs/applications/misc/gnuradio/gsm.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, cppunit, libosmocore, gnuradio-osmosdr +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-gsm-${version}"; + version = "2016-08-25"; + + src = fetchFromGitHub { + owner = "ptrkrysik"; + repo = "gr-gsm"; + rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d"; + sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gnuradio-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Gnuradio block for gsm"; + homepage = https://github.com/ptrkrysik/gr-gsm; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio/nacl.nix b/pkgs/applications/misc/gnuradio/nacl.nix new file mode 100644 index 0000000000000000000000000000000000000000..28836958e98c09ea5eba51f04cc7134aed894531 --- /dev/null +++ b/pkgs/applications/misc/gnuradio/nacl.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd +, makeWrapper, libsodium, cppunit +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-nacl-${version}"; + version = "2015-11-05"; + + src = fetchFromGitHub { + owner = "stwunsch"; + repo = "gr-nacl"; + rev = "d6dd3c02dcda3f601979908b61b1595476f6bf95"; + sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost gnuradio uhd makeWrapper libsodium cppunit + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Gnuradio block for encryption"; + homepage = https://github.com/stwunsch/gr-nacl; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio/osmosdr.nix b/pkgs/applications/misc/gnuradio/osmosdr.nix new file mode 100644 index 0000000000000000000000000000000000000000..355ca0e9544994dcc010b66e84d57130fa7d9fc0 --- /dev/null +++ b/pkgs/applications/misc/gnuradio/osmosdr.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd +, makeWrapper, hackrf, airspy +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-osmosdr-${version}"; + version = "0.1.4"; + + src = fetchgit { + url = "git://git.osmocom.org/gr-osmosdr"; + rev = "refs/tags/v${version}"; + sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf airspy + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Gnuradio block for OsmoSDR and rtl-sdr"; + homepage = https://sdr.osmocom.org/trac/wiki/GrOsmoSDR; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ bjornfor the-kenny ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio/rds.nix b/pkgs/applications/misc/gnuradio/rds.nix new file mode 100644 index 0000000000000000000000000000000000000000..44ed89d9002ddf2b92f4b4126a1839190c64d4b3 --- /dev/null +++ b/pkgs/applications/misc/gnuradio/rds.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-rds-${version}"; + version = "2016-08-27"; + + src = fetchFromGitHub { + owner = "bastibl"; + repo = "gr-rds"; + rev = "5246b75180808d47f321cb26f6c16d7c7a7af4fc"; + sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost gnuradio makeWrapper + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Gnuradio block for radio data system"; + homepage = https://github.com/bastibl/gr-rds; + license = licenses.gpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix index db2b453913f44f28f02668fb2d102d63918c6eb7..ffed3da03187e812ad1d5cc8f75eab125f5d873a 100644 --- a/pkgs/applications/misc/gnuradio/wrapper.nix +++ b/pkgs/applications/misc/gnuradio/wrapper.nix @@ -1,7 +1,6 @@ -{ stdenv, gnuradio, makeWrapper, python -, extraPackages ? [] }: +{ stdenv, gnuradio, makeWrapper, python, extraPackages ? [] }: -with stdenv.lib; +with { inherit (stdenv.lib) appendToName makeSearchPath; }; stdenv.mkDerivation { name = (appendToName "with-packages" gnuradio).name; @@ -11,13 +10,15 @@ stdenv.mkDerivation { mkdir -p $out/bin ln -s "${gnuradio}"/bin/* $out/bin/ - for file in $(find $out/bin -type f -executable); do - wrapProgram "$file" \ - --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" - (map (path: "$(toPythonPath ${path})") extraPackages)} \ - --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} + for file in $(find -L $out/bin -type f); do + if test -x "$(readlink -f "$file")"; then + wrapProgram "$file" \ + --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" + (map (path: "$(toPythonPath ${path})") extraPackages)} \ + --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} + fi done - ''; + inherit (gnuradio) meta; } diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 358d9dff44a6b6fc8f9c0b895401208a83960e34..efd3bfe73dd9265131333ad4520ab34dd26290b6 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + + # RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm' + enableParallelBuilding = false; + meta = { description = "Performance software for cyclists, runners and triathletes"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index df8cb71d6f9eea5f5498166da048c78315e83562..f8ba66c4197c23fed590f05debfc7d64611c746f 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv +{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 , zlib, fontconfig, dpkg }: @@ -6,7 +6,7 @@ let arch = if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.system == "i686-linux" then "i386" - else abort "Unsupported architecture"; + else throw "Unsupported system ${stdenv.system}"; sha256 = if arch == "amd64" then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" @@ -19,7 +19,7 @@ let libICE libXi libXv - mesa + libGLU_combined libXrender libXrandr libXfixes diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 026457fb8571ae8a051a560d27ba2e3c82cfa76c..3b8b08c1b660c9cb3657b19ab0d9436a89fc93e0 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, python}: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.5"; name = "googler-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "googler"; rev = "v${version}"; - sha256 = "0gkzgcf0qss7fskgswryk835vivlv1f99ym1pbxy3vv9wcwx6a43"; + sha256 = "0z5cngg1kr3b484zddqlg9yn7crbmnd78pdb8vzd32mkp3fahcxa"; }; propagatedBuildInputs = [ python ]; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 8936d3f222f38549aecd32fb463d3ee26e61fda1..464e0ba53346df1fb2467c47e92c1555b2e890c5 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation { prePatch = '' sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} ''; + + patches = [ ./pointer_int_comparison.patch ]; + patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol meta = with stdenv.lib; { description = "Open Street Map viewer"; diff --git a/pkgs/applications/misc/gosmore/pointer_int_comparison.patch b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch new file mode 100644 index 0000000000000000000000000000000000000000..4a715b6d8591323f0dcc690a26b87b62ca47071d --- /dev/null +++ b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch @@ -0,0 +1,11 @@ +--- blah_/jni/gosmore.cpp 1970-01-01 01:00:01.000000000 +0100 ++++ /dev/stdin 2018-03-18 00:21:08.474217132 +0100 +@@ -1273,7 +1273,7 @@ + if (deg[i] < -180 || deg[i] > 180) break; + if (i == 0 && (strncasecmp (t, "lat", 3) == 0 || + strncasecmp (t, "lon", 3) == 0)) { // lat=-25.7 lon=28.2 +- for (t += 3; t != '\0' && !isalnum (*t); t++) {} ++ for (t += 3; *t != '\0' && !isalnum (*t); t++) {} + } + if (i == 1) { // Success ! + //printf ("%lf %lf %u\n", deg[lonFirst ? 1 : 0], deg[lonFirst ? 0 : 1], diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 46278f42e7bb0bc5684f9cb9f16d9cf6708290a5..77e7b592f6470a1f3bb6a82be1715d28c44736bc 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.11"; + name = "gphoto2-2.5.15"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r"; + sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf"; }; nativeBuildInputs = [ pkgconfig gettext libtool ]; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index a7485c4ee6815ca17bb9aa196a2d5331fc52b38f..1810d6d5c476aa5de0e4f6c7b5a8977e405db076 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }: +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gpx-viewer-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig - shared_mime_info # For update-mime-database - desktop_file_utils # For update-desktop-database + shared-mime-info # For update-mime-database + desktop-file-utils # For update-desktop-database wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ]; diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9fef9381949239adf6336ddce92bc15b3bd9580a --- /dev/null +++ b/pkgs/applications/misc/gpx/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "gpx-${version}"; + version = "2.5.2"; + + nativeBuildInputs = [ autoreconfHook ]; + + src = fetchFromGitHub { + owner = "markwal"; + repo = "GPX"; + rev = version; + sha256 = "1yab269x8qyf7rd04vaxyqyjv4pzz9lp4sc4dwh927k23avr3rw5"; + }; + + meta = { + description = "Gcode to x3g conversion postprocessor"; + homepage = https://github.com/markwal/GPX/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.leo60228 ]; + }; +} diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 00735624ad96732458b497573d4a80b52b447417..d87ac459d0210cfe5b31ec14ffa4145a2b58fedb 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "4.14"; + version = "4.19"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0yv3hcs5b8a88mp24h8r2sn69phwrahdff5pp74lz24270il3jgb"; + sha256 = "1xjf2aawf633c1ydhpcsjhdlfkjkfsjbcgjd737xpfv1wjz99l4l"; }; nativeBuildInputs = [ qmake qttools ]; @@ -26,11 +26,14 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://tumic.wz.cz/gpxsee; + homepage = http://www.gpxsee.org/; description = "GPX viewer and analyzer"; + longDescription = '' + GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, + TCX, KML, FIT, IGC and NMEA files. + ''; license = licenses.gpl3; maintainers = [ maintainers.womfoo ]; platforms = platforms.linux; }; - } diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index 27bda1e209285761fe23c05e2e2e0e27b42225e2..5c449451e704a0a6083081953b5590220cf7e7e1 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.8"; + version = "2.11.4"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "0niy4c05886mhbfmix93j2bnj4kzdh9bvrmymawl6z28glyz5d3c"; + sha256 = "0a5w9b3fi4f95j34cqsbzxks0d9hmrz4cznc8pi9b0pwvx13hqhm"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 8b66b23df01a3993692b264f17fe21551dde7e73..5f219dc4752c75cd1c6961b388d44fb4c5a9cc32 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, - pango, gsettings_desktop_schemas, +{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, + pango, gsettings-desktop-schemas, gobjectIntrospection, wrapGAppsHook, # Optional packages: enableOSM ? true, osm-gps-map }: @@ -7,25 +7,23 @@ let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { - version = "4.2.6"; + version = "4.2.8"; name = "gramps-${version}"; - buildInputs = [ intltool gtk3 ] + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ intltool gtk3 gobjectIntrospection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map ; - # Currently broken - doCheck = false; - src = fetchFromGitHub { owner = "gramps-project"; repo = "gramps"; rev = "v${version}"; - sha256 = "0k0bx6msc2kvkg0nwa9v2mp3qy7lmnxjd97n6a1zdzlq8yzw29f1"; + sha256 = "17y6rjvvcz7lwjck4f5nmhnn07i9k5vzk5dp1jk7j3ldxjagscsd"; }; - pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ]; + pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. @@ -51,13 +49,6 @@ in buildPythonApplication rec { runHook postInstall ''; - # gobjectIntrospection package, wrap accordingly - preFixup = '' - wrapProgram $out/bin/gramps \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; - meta = with stdenv.lib; { description = "Genealogy software"; homepage = http://gramps-project.org; diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 21a551bd63146cce538ac60b7852032587f73ac3..17837c6c254ea4196af55c820c5248abb521cde7 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -1,76 +1,38 @@ -/* Beware! -After starting Guake it will give the error message "Guake can not init! Gconf Error. Have you installed guake.schemas properly?", -which will have to be resolved manually, because I have not found a way to automate this, without being impure. - -If you have Guake installed, you can use `nix-build -A gnome3.guake` to get the path to the build directory in the nix store, -which then can be used in the following command to install the schemas file of Guake: -gconftool-2 --install-schema-file /path/returned/by/nix-build/share/gconf/schemas/guake.schemas - -It can be removed again by the following command: -gconftool-2 --recursive-unset /apps/guake -*/ -{ stdenv, fetchurl, lib -, pkgconfig, libtool, intltool, makeWrapper -, dbus, gtk2, gconf, python2Packages, libutempter, vte, keybinder, gnome2, gnome3 }: - -with lib; +{ stdenv, fetchFromGitHub, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales +, gtk3, keybinder3, libnotify, libutempter, vte }: let - inherit (python2Packages) python; - inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome_common ]; - pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); - in stdenv.mkDerivation rec { + version = "3.2.0"; +in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; - version = "0.8.3"; + format = "other"; - src = fetchurl { - url = "https://github.com/Guake/guake/archive/${version}.tar.gz"; - sha256 = "1lbmdz3i9a97840h8239s360hd37nmhy3hs6kancxbzl1512ak1y"; + src = fetchFromGitHub { + owner = "Guake"; + repo = "guake"; + rev = version; + sha256 = "1qghapg9sslj9fdrl2mnbi10lgqgqa36gdag74wn7as9wak4qc3d"; }; - nativeBuildInputs = [ pkgconfig libtool intltool makeWrapper ]; - - buildInputs = inputs ++ (with python2Packages; [ pyGtkGlade pyxdg ]); + nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; - propagatedUserEnvPkgs = [ gconf.out ]; + buildInputs = [ gtk3 keybinder3 libnotify python3 vte ]; - patchPhase = '' - patchShebangs . - ''; + propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 ]; - configureScript = "./autogen.sh"; + LC_ALL = "en_US.UTF-8"; # fixes weird encoding error, see https://github.com/NixOS/nixpkgs/pull/38642#issuecomment-379727699 - configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--disable-schemas-install" - ]; + PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var - installFlags = [ - # Configuring the installation to not install gconf schemas is not always supported, - # therefore gconftool-2 has this variable, which will make gconftool-2 not update any of the databases. - "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" + makeFlags = [ + "prefix=$(out)" ]; - postInstall = '' - mkdir -p $out/share/gconf/schemas - cp data/guake.schemas $out/share/gconf/schemas - ''; - - postFixup = '' - for bin in $out/bin/{guake,guake-prefs}; do - substituteInPlace $bin \ - --replace '/usr/bin/env python2' ${python.interpreter} - wrapProgram $bin \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \ - --prefix PYTHONPATH : "$out/${python.sitePackages}:${pyPath}:$PYTHONPATH" - done + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libutempter ]}") ''; - meta = { + meta = with stdenv.lib; { description = "Drop-down terminal for GNOME"; homepage = http://guake-project.org; license = licenses.gpl2; diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7a04bd7194f2f50e3d1401676ef1f90104da5f7f --- /dev/null +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, rustPlatform, cmake, CoreServices, cf-private }: + +rustPlatform.buildRustPackage rec { + name = "gutenberg-${version}"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "Keats"; + repo = "gutenberg"; + rev = "v${version}"; + sha256 = "03zhbwxp4dbqydiydx0hpp3vpg769zzn5i95h2sl868mpfia8gyd"; + }; + + cargoSha256 = "0441lbmxx16aar6fn651ihk3psrx0lk3qdbbyih05xjlkkbk1qxs"; + + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; + + postInstall = '' + install -D -m 444 completions/gutenberg.bash \ + -t $out/share/bash-completion/completions + install -D -m 444 completions/_gutenberg \ + -t $out/share/zsh/site-functions + install -D -m 444 completions/gutenberg.fish \ + -t $out/share/fish/vendor_completions.d + ''; + + meta = with stdenv.lib; { + description = "An opinionated static site generator with everything built-in"; + homepage = https://www.getgutenberg.io; + license = licenses.mit; + maintainers = []; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 3fad634b18b7bc04fb5d9f1f475287148ee5c29f..b13e7ae5232c03e643ace59839726964e8b35ab9 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }: +{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: let name = "gv-3.7.4"; @@ -11,7 +11,18 @@ stdenv.mkDerivation { sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; - buildInputs = [ Xaw3d ghostscriptX perl ]; + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + "--enable-SIGCHLD-fallback" + ]; + + buildInputs = [ + Xaw3d + ghostscriptX + perl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + pkgconfig + libiconv + ]; patchPhase = '' sed 's|\|${ghostscriptX}/bin/gs|g' -i "src/"*.in @@ -32,6 +43,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 51a14fb20d0b0f86b8ae528ce11937d69210609a..105f7beb98fe3dc73014e06a6300f519a421e824 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome_doc_utils -, intltool, dbus_glib, gnome_python, dbus -, hicolor_icon_theme +{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils +, intltool, dbus-glib, gnome_python, dbus +, hicolor-icon-theme }: # TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { }; buildInputs = [ - docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme + docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme ]; propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index dc771fc2d5e4135b6cc2b4fd7b14b1355a6878c0..624c15e118a2e0dd5ec557dc27cf01594e867f22 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python }: -pythonPackages.buildPythonApplication rec { - version = "0.4.2"; - name = "haxor-news-${version}"; +with python.pkgs; - src = fetchurl { - url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz"; - sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs"; +buildPythonApplication rec { + pname = "haxor-news"; + version = "0.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = [ click colorama requests @@ -18,11 +20,19 @@ pythonPackages.buildPythonApplication rec { six ]; + doCheck = false; + + checkInputs = [ mock ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests -v + ''; + meta = with stdenv.lib; { homepage = https://github.com/donnemartin/haxor-news; description = "Browse Hacker News like a haxor"; license = licenses.asl20; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index b3ce98895e6f9911091341e08057c004f71a2ffe..097386547f57082de07ed0cca45cc891eed48088 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ -{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }: +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }: let ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" "/run/opengl-driver/lib" (stdenv.lib.makeLibraryPath [ - mesa_glu + libGLU xorg.libXmu xorg.libXi xorg.libXext @@ -29,11 +29,11 @@ let license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { - version = "16.0.671"; + version = "16.5.405"; name = "houdini-runtime-${version}"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz"; - sha256 = "1d3c1a1128szlgaf3ilw5y20plz5azwp37v0ljawgm80y64hq15r"; + sha256 = "14i0kzv881jqd5z9jshri1fxxi3pkxdmi5l4p2b51c9i3apsxmw6"; 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: diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 2fd56e3c55529ea549f0e7818175ad783bb62517..6b0926db047630b1c2d589ee1eaefc4e98190447 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/LuRsT/hr; description = "A horizontal bar for your terminal"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 3c4f409d18f18a3c52a7923ace1147b0da4da036..db50b0d2169a027edfc4e2a892cbe44b38a84282 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,15 +1,12 @@ { stdenv, fetchurl, readline, ncurses }: -let - version = "1.23"; -in stdenv.mkDerivation rec { - - name = "hstr-${version}"; + name = "hstr-${version}"; + version = "1.24"; src = fetchurl { url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv"; + sha256 = "0w8is777fwq6r17zhl9xwrv9f7vanllzjiasx1pg6pxvppq7rh0x"; }; buildInputs = [ readline ncurses ]; @@ -18,7 +15,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dvorka/hstr; description = "Shell history suggest box - easily view, navigate, search and use your command history"; license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; # Cannot test others }; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 91cf494d2574a555b9b2b74d47ee74464e63013b..2b6e58a6ab366a0a6e27c99ab131d6ec3ead1c7c 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE, libXext -, freetype, libXrender, fontconfig, libXft, libXinerama, libnotify, glib -, gtk3, libappindicator-gtk3, curl }: +{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE +, libXext , freetype, libXrender, fontconfig, libXft, libXinerama +, libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 +, curl }: let - version = "1.2.14-36df5e3"; + version = "1.3.1-ff75f26"; rpath = stdenv.lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3 - curl ]; + curl libXfixes libXScrnSaver ]; in @@ -18,16 +19,16 @@ stdenv.mkDerivation { src = fetchurl { url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh"; - sha256 = "0yzhxk9zppj94llnf8naa6ca61f7c8jaj6b1m25zffnnz37m1sdb"; + sha256 = "0jm5l34r6lkfkg8vsdfqbr0axngxznhagwcl9y184lnyji91fmdl"; }; nativeBuildInputs = [ unzip makeWrapper ]; unpackCmd = '' # MojoSetups have a ZIP file at the end. ZIP’s magic string is - # most often PK\x03\x04. This *should* work for future updates, + # most often PK\x03\x04. This has worked for all past updates, # but feel free to come up with something more reasonable. - dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text $'PK\x03\x04' $curSrc | cut -d: -f1) + dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text ''$'PK\x03\x04' $curSrc | cut -d: -f1) dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null unzip -q data.zip "data/*" rm data.zip @@ -38,17 +39,18 @@ stdenv.mkDerivation { installPhase = '' # TODO: handle 32-bit arch? rm -r x86 + rm -r x86_64/lib64 opt=$out/opt/hubstaff mkdir -p $out/bin $opt cp -r . $opt/ - prog=$opt/x86_64/HubstaffClient.bin.x86_64 + for f in "$opt/x86_64/"*.bin.x86_64 ; do + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $f + wrapProgram $f --prefix LD_LIBRARY_PATH : ${rpath} + done - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $prog - wrapProgram $prog --prefix LD_LIBRARY_PATH : ${rpath} - - ln -s $prog $out/bin/HubstaffClient + ln -s $opt/x86_64/HubstaffClient.bin.x86_64 $out/bin/HubstaffClient # Why is this needed? SEGV otherwise. ln -s $opt/data/resources $opt/x86_64/resources diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 0dfc725b9ea67ac58d618227c550011975adf1f7..f984cb712c7a002ff7baad2e8a4f0b93f7372369 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,23 +2,23 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.29"; + version = "0.36.1"; goPackagePath = "github.com/gohugoio/hugo"; src = fetchFromGitHub { - owner = "gohugoio"; - repo = "hugo"; - rev = "v${version}"; - sha256 = "1vklws05534ig9rj55cqnxpqfsvns64kfdg6zjyrcpz7l0z07a33"; + owner = "gohugoio"; + repo = "hugo"; + rev = "v${version}"; + sha256 = "179lzkd6f81rssgcwlngx2mhr9nvbj0rsh6yjbf1fsrpxfzr2q9z"; }; goDeps = ./deps.nix; - meta = { + meta = with stdenv.lib; { description = "A fast and modern static website engine."; homepage = https://gohugo.io; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ schneefux ]; }; } diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 35faf6b5704774b27eeb1d20ffefdbf6caa4b95e..cf55ef4b64b259843b9a0f8e2183c55d57d7d15d 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,3 +1,4 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { goPackagePath = "github.com/BurntSushi/toml"; @@ -13,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/purell"; - rev = "b938d81255b5473c57635324295cb0fe398c7a58"; - sha256 = "0d44lrg04g9nibhdlagwq9n8g5ka1784pm0jzyl6cfpq8nc1ppj8"; + rev = "1c4bec281e4bbc75b4f4a1bd923bdf1bd989a969"; + sha256 = "05aif0xf3i6j6r0ivas8ywagkz92iynsa0xnkbrif4w1chzalx0f"; }; } { @@ -22,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/urlesc"; - rev = "bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5"; - sha256 = "13r896yy71i6jj1cwv2pjp53wjfxkg7bh884fggv6y79ly0qr63j"; + rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; }; } { @@ -31,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "b0295f66bdb7c61d54906003d7649185794e21b4"; - sha256 = "1hnvv13nphbzr9xm21fys7lgm0kd6qlbk58vc8fi802lxzsfmdis"; + rev = "df4ec264daccb2ecb17bde9134830100701199c5"; + sha256 = "1snw7byfkfvvw0579jc0yxk79j1v1rb0jdcvivfsalh064zmjdvd"; }; } { @@ -49,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/chaseadamsio/goorgeous"; - rev = "098da33fde5f9220736531b3cb26a2dec86a8367"; - sha256 = "1cwag5vzgrzy22rvcp12whzgqbgrmdmaxar0fl4nwqxdhy90s67k"; + rev = "dcf1ef873b8987bf12596fe6951c48347986eb2f"; + sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb"; }; } { @@ -58,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "23709d0847197db6021a51fdb193e66e9222d4e7"; - sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f"; + rev = "48d8747a2ca13185e7cc8efe6e9fc196a83f71a5"; + sha256 = "01hpll16rvxhnvv35vs3z8p51x54c5jyl1gjdm0g7kwfwp2chvjx"; }; } { @@ -72,12 +73,12 @@ }; } { - goPackagePath = "github.com/dchest/cssmin"; + goPackagePath = "github.com/disintegration/imaging"; fetch = { type = "git"; - url = "https://github.com/dchest/cssmin"; - rev = "fb8d9b44afdc258bfff6052d3667521babcb2239"; - sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; + url = "https://github.com/disintegration/imaging"; + rev = "1884593a19ddc6f2ea050403430d02c1d0fc1283"; + sha256 = "13wlkidihz7gc36hd1vy7i81d0v1rbnw97118z3slq1kv1j56zll"; }; } { @@ -85,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/dlclark/regexp2"; - rev = "487489b64fb796de2e55f4e8a4ad1e145f80e957"; - sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; + rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1"; + sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2"; }; } { @@ -94,26 +95,35 @@ fetch = { type = "git"; url = "https://github.com/eknkc/amber"; - rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448"; - sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a"; + rev = "cdade1c073850f4ffc70a829e31235ea6892853b"; + sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; }; } { - goPackagePath = "github.com/fortytw2/leaktest"; + goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; - url = "https://github.com/fortytw2/leaktest"; - rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513"; - sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } { - goPackagePath = "github.com/fsnotify/fsnotify"; + goPackagePath = "github.com/gobuffalo/envy"; fetch = { type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "4da3e2cfbabc9f751898f250b49f2439785783a1"; - sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3"; + url = "https://github.com/gobuffalo/envy"; + rev = "50fabbbaf1e65fc9b739f37a00590c396485d84d"; + sha256 = "0js2hggb1gybk28pk3hcsb1m6rswfdzvvr194z4my4za09ly5jax"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "19c076cdf202b3d1c0489bdfa2f2f289f634474b"; + sha256 = "0176psz3m0pks0ka6pb62g7ccq5izzj0i7c0j20lb7dp3kawphxs"; }; } { @@ -121,8 +131,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf"; - sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi"; + rev = "f37d1588608ec036fa9b0b7b8afbde47dc06aea9"; + sha256 = "1y0z7k4yi8aaw6yjm8s92hvbkyc51b5azpiywminjj1a84czvzvq"; }; } { @@ -130,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "8aac2701530899b64bdea735a1de8da899815220"; - sha256 = "032w4pk4gd5lwwgnvhh52xnrgyp7lgmlxsfs47gnxkgkya1x7lw6"; + rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf"; + sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv"; }; } { @@ -139,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/golang-lru"; - rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; - sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; + sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; }; } { @@ -148,17 +158,8 @@ 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"; + rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; + sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; }; } { @@ -166,17 +167,17 @@ fetch = { type = "git"; url = "https://github.com/jdkato/prose"; - rev = "c24611cae00c16858e611ef77226dd2f7502759f"; - sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1"; + rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be"; + sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7"; }; } { - goPackagePath = "github.com/kardianos/osext"; + goPackagePath = "github.com/joho/godotenv"; fetch = { type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + url = "https://github.com/joho/godotenv"; + rev = "6bb08516677f8c8274c557fc801bee9ab564ab2c"; + sha256 = "0jqczq5x5zwgs29vrmq87335c99gi5jrvxkwcpidz98yqg95db4f"; }; } { @@ -184,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/kyokomi/emoji"; - rev = "ddd4753eac3f6480ca86b16cc6c98d26a0935d17"; - sha256 = "16vnpj8zxg3gg9ljwmvrlmdf4dqbxjagi8mldpq1cr481r35dsqh"; + rev = "2e9a9507333f3ee28f3fab88c2c3aba34455d734"; + sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a"; }; } { @@ -193,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "be5ece7dd465ab0765a9682137865547526d1dfb"; - sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8"; + rev = "2c9e9502788518c97fe44e8955cd069417ee89df"; + sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl"; }; } { @@ -202,8 +203,17 @@ fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "6cacb66d100482ef7cc366289ccb156020e57e76"; - sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2"; + rev = "80fa1ea41b0dc859816314ab0b85f07a6bc57923"; + sha256 = "0fmpfcz8g0qsb6h94yqpcms2bdb68qac706b54x0k1crfzl1d1mj"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; }; } { @@ -211,8 +221,17 @@ fetch = { type = "git"; url = "https://github.com/miekg/mmark"; - rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"; - sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; + rev = "057eb9e3ae87944c038036d046101dec0c56e21f"; + sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; }; } { @@ -220,8 +239,17 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; + rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; + sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + }; + } + { + goPackagePath = "github.com/muesli/smartcrop"; + fetch = { + type = "git"; + url = "https://github.com/muesli/smartcrop"; + rev = "c2a0373a193bac1daf8b6691e2ece069c5d7ac7f"; + sha256 = "1jv68g9wddm2a1kf838anjnr4w17k7sqzz01h4z2lfashw3nanar"; }; } { @@ -229,8 +257,17 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "3e70a1a463008cea6726380c908b1a6a8bdf7b24"; - sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i"; + rev = "ec04da47793482067e2e376d810e1622277368e4"; + sha256 = "1c7ip5jidvssr8d4dbx9nchf99m13wblgaz630f7wm73y99dc3lr"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "b8a9be070da40449e501c3c4730a889e42d87a9e"; + sha256 = "1z9frlk9avqhzjv6zz2rg7mvdhzcr9acdgagblijwwkx01f02hw7"; }; } { @@ -238,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "69d355db5304c0f7f809a2edc054553e7142f016"; - sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm"; + rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; + sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; }; } { @@ -247,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; - sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; + rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5"; + sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; }; } { @@ -256,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5"; - sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5"; + rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; + sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; }; } { @@ -265,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; - sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; + rev = "bbf41cb36dffe15dff5bf7e18c447801e7ffe163"; + sha256 = "19jgsm6y1yp99h0fr77rhamdsn34r8545if7y9q377l3phrz2s0l"; }; } { @@ -274,8 +311,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cast"; - rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"; - sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; }; } { @@ -283,8 +320,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "34594c771f2c18301dc152640ad40ece28795373"; - sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38"; + rev = "be77323fc05148ef091e83b3866c0d47c8e74a8b"; + sha256 = "0kl0psbdg8cyznwvq13sva6r4ggmhwzfxdjmkl2vqhy83xq3a6yn"; }; } { @@ -301,8 +338,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "0efa5202c04663c757d84f90f5219c1250baf94f"; - sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs"; + rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; + sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; }; } { @@ -319,8 +356,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; - sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; + rev = "ee5fd03fd6acfd43e44aea0b4135958546ed8e73"; + sha256 = "1fgb1ph3vrqcpdvypp3c1fwj15r587l9yvv5wqcq08shln5rbsnk"; }; } { @@ -328,17 +365,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7"; - sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "05e8a0eda380579888eb53c394909df027f06991"; - sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv"; + rev = "aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5"; + sha256 = "089balmspfs2x68wr4riwh7qvhf0b061wqqqfw8j4p9pxvwrxsdc"; }; } { @@ -355,8 +383,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "426cfd8eeb6e08ab1932954e09e3c2cb2bc6e36d"; - sha256 = "0zbqvkn7amq9bnq38pxjqyn1xggphrisaw98x7diw3i0a5phk93r"; + rev = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7"; + sha256 = "017xpcshrj1r2w20xvpcx0rklpfmbz6h16msv12l3x0w6vy0800s"; }; } { @@ -364,8 +392,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f"; - sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k"; + rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; + sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; + sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; }; } { @@ -373,8 +410,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695"; - sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n"; + rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; + sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; }; } { @@ -382,8 +419,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720"; - sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1"; + rev = "9e2b64d659da1afe07ce1c9c1dfefc09d188f21e"; + sha256 = "00ichxdybvs76gj805j828qxg7x4h4v64pq1s56ydaw07ja6lmry"; }; } { @@ -391,8 +428,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; - sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; }; } ] diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 9349c07a62e9614f065fce38136057f9c6b59045..75d18c7a774dbf23e1218fb8f51c1aa2655bfee0 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -12,11 +12,11 @@ let ]; in stdenv.mkDerivation rec { - version = "1.4.8"; + version = "2.0.0"; name = "hyper-${version}"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; - sha256 = "0v31z3p5h3qr8likifbq9kk08fpfyf8g1hrz6f6v90z4b2yhkf51"; + sha256 = "04241kjy65pnp5q9z901910rmvcx18x0qaqfl31i0l4c2xj83ws0"; }; buildInputs = [ dpkg ]; unpackPhase = '' diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2295e15cc3d3c18916be72eded0709fdd1ee7e9d --- /dev/null +++ b/pkgs/applications/misc/icesl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: +let + lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ]; +in +stdenv.mkDerivation rec { + name = "iceSL-${version}"; + version = "2.1.10"; + + src = if stdenv.system == "x86_64-linux" then fetchzip { + url = "https://gforge.inria.fr/frs/download.php/file/37268/icesl${version}-amd64.zip"; + sha256 = "0dv3mq6wy46xk9blzzmgbdxpsjdaxid3zadfrysxlhmgl7zb2cn2"; + } else if stdenv.system == "i686-linux" then fetchzip { + url = "https://gforge.inria.fr/frs/download.php/file/37267/icesl${version}-i386.zip"; + sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr"; + } else throw "Unsupported architecture"; + + buildInputs = [ makeWrapper ]; + installPhase = '' + cp -r ./ $out + mkdir $out/oldbin + mv $out/bin/IceSL-slicer $out/oldbin/IceSL-slicer + runHook postInstall + ''; + + postInstall = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${lpath}" \ + $out/oldbin/IceSL-slicer + makeWrapper $out/oldbin/IceSL-slicer $out/bin/icesl --prefix PATH : ${dialog}/bin + ''; + + meta = with lib; { + description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing."; + homepage = http://shapeforge.loria.fr/icesl/index.html; + license = licenses.inria-icesl; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ mgttlinger ]; + }; +} diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index af67db3f654a194b6a410994b6e8e1206415b7ff..2efd0ee969f14704201c1912f34077a4711655b6 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -2,12 +2,13 @@ stdenv.mkDerivation rec { name = "ipmicfg-${version}"; - version = "1.27.0"; - buildVersion = "170620"; + version = "1.27.1"; + buildVersion = "170901"; src = fetchzip { url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; - sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5"; + sha256 = "11xhzw36pg4has8857pypf44cni8m2mg8qsqi1s4bfjbxlfgxgwk"; + extraPostFetch = "chmod u+rwX,go-rwx+X $out/"; }; installPhase = '' diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index f907847599410a82497a2b8659c80493fe2cd338..ebc13766cccbb993caa843623ae6b565befafe2e 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc }: +{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }: assert stdenv.isLinux; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildPhase = with xorg; '' patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so - patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so + patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java ''; diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index 9896fd15b85c37fe9bc642b3bd1f28ad79005ce6..f24951624c5894248446816d634e1dd6e0ba4863 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.15"; + version = "2.16"; src = fetchFromGitHub { owner = "enkore"; repo = "j4-dmenu-desktop"; rev = "r${version}"; - sha256 = "1yn45i3hpim2hriaqkq7wmawwsmkynvy2xgz7dg6p5r0ikw5bn1r"; + sha256 = "0714cri8bwpimmiirhzrkbri4xi24k0za6i1aw94d3fnblk2dg9f"; }; postPatch = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "A wrapper for dmenu that recognize .desktop files"; homepage = "https://github.com/enkore/j4-dmenu-desktop"; license = licenses.gpl3; - maintainer = with maintainers; [ ericsagnes ]; - platforms = with platforms; unix; + maintainers = with maintainers; [ ericsagnes ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile deleted file mode 100644 index 97ebb9705bd683ea4916e85ee26b5e1423c1ac95..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/jekyll/Gemfile +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index da4be83382fb3c503ad223810268d230d482e7a7..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/jekyll/Gemfile.lock +++ /dev/null @@ -1,59 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - 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-feed (0.9.1) - jekyll (~> 3.3) - jekyll-paginate (1.1.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.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.2.0.1) - rouge (1.11.1) - safe_yaml (1.0.4) - sass (3.4.23) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth - jekyll - jekyll-feed - jekyll-paginate - minima - rdiscount - -BUNDLED WITH - 1.14.4 diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile b/pkgs/applications/misc/jekyll/basic/Gemfile new file mode 100644 index 0000000000000000000000000000000000000000..2d3446a8113467571db6239544ad31368c12c5ac --- /dev/null +++ b/pkgs/applications/misc/jekyll/basic/Gemfile @@ -0,0 +1,10 @@ +source "https://rubygems.org" +gem "jekyll" +# jekyll alone might be enough for most use-cases +gem "rouge" +gem "activesupport", "~> 4.2" +gem "jekyll-avatar" +gem "jekyll-mentions" +gem "jekyll-seo-tag" +gem "jekyll-sitemap" +gem "jemoji" diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock new file mode 100644 index 0000000000000000000000000000000000000000..f231df3d8e76b3ef6ccf72a5d372b13216f66904 --- /dev/null +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -0,0 +1,101 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + colorator (1.1.0) + concurrent-ruby (1.0.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.5) + ffi (1.9.23) + forwardable-extended (2.6.0) + gemoji (3.0.0) + html-pipeline (2.7.1) + activesupport (>= 2) + nokogiri (>= 1.4) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.8.0) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + jekyll-avatar (0.6.0) + jekyll (~> 3.0) + jekyll-mentions (1.3.0) + activesupport (~> 4.0) + html-pipeline (~> 2.3) + jekyll (~> 3.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-seo-tag (2.4.0) + jekyll (~> 3.3) + jekyll-sitemap (1.2.0) + jekyll (~> 3.3) + jekyll-watch (2.0.0) + listen (~> 3.0) + jemoji (0.9.0) + activesupport (~> 4.0, >= 4.2.9) + gemoji (~> 3.0) + html-pipeline (~> 2.2) + jekyll (~> 3.0) + kramdown (1.16.2) + liquid (4.0.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + mercenary (0.3.6) + mini_portile2 (2.3.0) + minitest (5.11.3) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + pathutil (0.16.1) + forwardable-extended (~> 2.6) + public_suffix (3.0.2) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rouge (3.1.1) + ruby_dep (1.5.0) + safe_yaml (1.0.4) + sass (3.5.6) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + +PLATFORMS + ruby + +DEPENDENCIES + activesupport (~> 4.2) + jekyll + jekyll-avatar + jekyll-mentions + jekyll-seo-tag + jekyll-sitemap + jemoji + rouge + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix new file mode 100644 index 0000000000000000000000000000000000000000..7c6ac55c2012feaaafba584513e2bbed66a2cb6a --- /dev/null +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -0,0 +1,326 @@ +{ + activesupport = { + dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + type = "gem"; + }; + version = "4.2.10"; + }; + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + colorator = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72"; + type = "gem"; + }; + version = "1.1.0"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + type = "gem"; + }; + version = "1.0.5"; + }; + em-websocket = { + dependencies = ["eventmachine" "http_parser.rb"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3"; + type = "gem"; + }; + version = "0.5.1"; + }; + eventmachine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + type = "gem"; + }; + version = "1.2.5"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + type = "gem"; + }; + version = "1.9.23"; + }; + forwardable-extended = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v"; + type = "gem"; + }; + version = "2.6.0"; + }; + gemoji = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d"; + type = "gem"; + }; + version = "3.0.0"; + }; + html-pipeline = { + dependencies = ["activesupport" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; + type = "gem"; + }; + version = "2.7.1"; + }; + "http_parser.rb" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + type = "gem"; + }; + version = "0.9.5"; + }; + jekyll = { + dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as"; + type = "gem"; + }; + version = "3.8.0"; + }; + jekyll-avatar = { + dependencies = ["jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; + type = "gem"; + }; + version = "0.6.0"; + }; + jekyll-mentions = { + dependencies = ["activesupport" "html-pipeline" "jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn"; + type = "gem"; + }; + version = "1.3.0"; + }; + jekyll-sass-converter = { + dependencies = ["sass"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk"; + type = "gem"; + }; + version = "1.5.2"; + }; + jekyll-seo-tag = { + dependencies = ["jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f9b2mvmx57zj49afb3x8cmzdmb1kh4rbpbv3v7w5bh47g2c9big"; + type = "gem"; + }; + version = "2.4.0"; + }; + jekyll-sitemap = { + dependencies = ["jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xy93ysl1q8r4xhbnffycvsslja0dskh2z2pl1jnykwsy27dc89n"; + type = "gem"; + }; + version = "1.2.0"; + }; + jekyll-watch = { + dependencies = ["listen"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp"; + type = "gem"; + }; + version = "2.0.0"; + }; + jemoji = { + dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b"; + type = "gem"; + }; + version = "0.9.0"; + }; + kramdown = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za"; + type = "gem"; + }; + version = "1.16.2"; + }; + liquid = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y"; + type = "gem"; + }; + version = "4.0.0"; + }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; + type = "gem"; + }; + version = "3.1.5"; + }; + mercenary = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; + type = "gem"; + }; + version = "0.3.6"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + type = "gem"; + }; + version = "2.3.0"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + type = "gem"; + }; + version = "5.11.3"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq"; + type = "gem"; + }; + version = "1.8.2"; + }; + pathutil = { + dependencies = ["forwardable-extended"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz"; + type = "gem"; + }; + version = "0.16.1"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + type = "gem"; + }; + version = "3.0.2"; + }; + rb-fsevent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + type = "gem"; + }; + version = "0.10.3"; + }; + rb-inotify = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + type = "gem"; + }; + version = "0.9.10"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3"; + type = "gem"; + }; + version = "3.1.1"; + }; + ruby_dep = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5"; + type = "gem"; + }; + version = "1.5.0"; + }; + safe_yaml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; + }; + sass = { + dependencies = ["sass-listen"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; + type = "gem"; + }; + version = "3.5.6"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + type = "gem"; + }; + version = "4.0.0"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + type = "gem"; + }; + version = "1.2.5"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index f3661030a2ba90fc79cb6a4cd165e1ab2ef9bded..ce3c318f678053bb1bab729ea383e569de594cfc 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -1,19 +1,36 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby +, withOptionalDependencies ? false +}: +# Bundix: +# nix-shell -p bundix zlib bundlerEnv rec { - name = "jekyll-${version}"; + name = pname + "-" + version; + pname = "jekyll"; + version = (import + (if withOptionalDependencies + then ./full/gemset.nix + else ./basic/gemset.nix)) + .jekyll.version; - version = (import gemset).jekyll.version; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = if withOptionalDependencies + then ./full + else ./basic; meta = with lib; { - description = "Simple, blog aware, static site generator"; - homepage = http://jekyllrb.com/; + description = "A blog-aware, static site generator, written in Ruby"; + longDescription = '' + Jekyll is a simple, blog-aware, static site generator, written in Ruby. + Think of it like a file-based CMS, without all the complexity. Jekyll + takes your content, renders Markdown and Liquid templates, and spits out a + complete, static website ready to be served by Apache, Nginx or another + web server. Jekyll is the engine behind GitHub Pages, which you can use to + host sites right from your GitHub repositories. + ''; + homepage = https://jekyllrb.com/; license = licenses.mit; - maintainers = with maintainers; [ pesterhazy ]; + maintainers = with maintainers; [ primeos pesterhazy ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile new file mode 100644 index 0000000000000000000000000000000000000000..aba5e06e376944a6a4dbfbc2d7a6be0c38221302 --- /dev/null +++ b/pkgs/applications/misc/jekyll/full/Gemfile @@ -0,0 +1,30 @@ +source "https://rubygems.org" +gem "jekyll" +gem "rouge" +gem "activesupport", "~> 4.2" +gem "jekyll-avatar" +gem "jekyll-mentions" +gem "jekyll-seo-tag" +gem "jekyll-sitemap" +gem "jemoji" +# Optional dependencies: +gem "coderay", "~> 1.1.0" +gem "jekyll-coffeescript" +#gem "jekyll-docs" +gem "jekyll-feed", "~> 0.9" +gem "jekyll-gist" +gem "jekyll-paginate" +gem "jekyll-redirect-from" +gem "kramdown", "~> 1.14" +gem "mime-types", "~> 3.0" +gem "rdoc", RUBY_VERSION >= "2.2.2" ? "~> 6.0" : "~> 5.1" +gem "tomlrb", "~> 1.2" + +platform :ruby, :mswin, :mingw, :x64_mingw do + gem "classifier-reborn", "~> 2.2.0" + gem "liquid-c", "~> 3.0" + gem "pygments.rb", "~> 1.0" + gem "rdiscount", "~> 2.0" + gem "redcarpet", "~> 3.2", ">= 3.2.3" + gem "yajl-ruby", "~> 1.3.1" +end diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock new file mode 100644 index 0000000000000000000000000000000000000000..45bd34187ca99f9ded903b419764170b68b908dc --- /dev/null +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -0,0 +1,157 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + classifier-reborn (2.2.0) + fast-stemmer (~> 1.0) + coderay (1.1.2) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.11.1) + colorator (1.1.0) + concurrent-ruby (1.0.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.5) + execjs (2.7.0) + faraday (0.15.0) + multipart-post (>= 1.2, < 3) + fast-stemmer (1.0.2) + ffi (1.9.23) + forwardable-extended (2.6.0) + gemoji (3.0.0) + html-pipeline (2.7.1) + activesupport (>= 2) + nokogiri (>= 1.4) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.8.0) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + jekyll-avatar (0.6.0) + jekyll (~> 3.0) + jekyll-coffeescript (1.1.1) + coffee-script (~> 2.2) + coffee-script-source (~> 1.11.1) + jekyll-feed (0.9.3) + jekyll (~> 3.3) + jekyll-gist (1.5.0) + octokit (~> 4.2) + jekyll-mentions (1.3.0) + activesupport (~> 4.0) + html-pipeline (~> 2.3) + jekyll (~> 3.0) + jekyll-paginate (1.1.0) + jekyll-redirect-from (0.13.0) + jekyll (~> 3.3) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-seo-tag (2.4.0) + jekyll (~> 3.3) + jekyll-sitemap (1.2.0) + jekyll (~> 3.3) + jekyll-watch (2.0.0) + listen (~> 3.0) + jemoji (0.9.0) + activesupport (~> 4.0, >= 4.2.9) + gemoji (~> 3.0) + html-pipeline (~> 2.2) + jekyll (~> 3.0) + kramdown (1.16.2) + liquid (4.0.0) + liquid-c (3.0.0) + liquid (>= 3.0.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + mercenary (0.3.6) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.3.0) + minitest (5.11.3) + multi_json (1.13.1) + multipart-post (2.0.0) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + octokit (4.8.0) + sawyer (~> 0.8.0, >= 0.5.3) + pathutil (0.16.1) + forwardable-extended (~> 2.6) + public_suffix (3.0.2) + pygments.rb (1.2.1) + multi_json (>= 1.0.0) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rdiscount (2.2.0.1) + rdoc (6.0.3) + redcarpet (3.4.0) + rouge (3.1.1) + ruby_dep (1.5.0) + safe_yaml (1.0.4) + sass (3.5.6) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) + thread_safe (0.3.6) + tomlrb (1.2.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + yajl-ruby (1.3.1) + +PLATFORMS + ruby + +DEPENDENCIES + activesupport (~> 4.2) + classifier-reborn (~> 2.2.0) + coderay (~> 1.1.0) + jekyll + jekyll-avatar + jekyll-coffeescript + jekyll-feed (~> 0.9) + jekyll-gist + jekyll-mentions + jekyll-paginate + jekyll-redirect-from + jekyll-seo-tag + jekyll-sitemap + jemoji + kramdown (~> 1.14) + liquid-c (~> 3.0) + mime-types (~> 3.0) + pygments.rb (~> 1.0) + rdiscount (~> 2.0) + rdoc (~> 6.0) + redcarpet (~> 3.2, >= 3.2.3) + rouge + tomlrb (~> 1.2) + yajl-ruby (~> 1.3.1) + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix new file mode 100644 index 0000000000000000000000000000000000000000..b45ea5b9d0799dc94d868fa19ce647cc5f9b1641 --- /dev/null +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -0,0 +1,538 @@ +{ + activesupport = { + dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + type = "gem"; + }; + version = "4.2.10"; + }; + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + classifier-reborn = { + dependencies = ["fast-stemmer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04nxmm5b7j7r0ij9pcpdr7xqpig559gfzrw042ycxcfyav2pv6ij"; + type = "gem"; + }; + version = "2.2.0"; + }; + coderay = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + type = "gem"; + }; + version = "1.1.2"; + }; + coffee-script = { + dependencies = ["coffee-script-source" "execjs"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + type = "gem"; + }; + version = "2.4.1"; + }; + coffee-script-source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xfshhlz808f8639wc88wgls1mww35sid8rd55vn0a4yqajf4vh9"; + type = "gem"; + }; + version = "1.11.1"; + }; + colorator = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72"; + type = "gem"; + }; + version = "1.1.0"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + type = "gem"; + }; + version = "1.0.5"; + }; + em-websocket = { + dependencies = ["eventmachine" "http_parser.rb"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3"; + type = "gem"; + }; + version = "0.5.1"; + }; + eventmachine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + type = "gem"; + }; + version = "1.2.5"; + }; + execjs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; + type = "gem"; + }; + version = "2.7.0"; + }; + faraday = { + dependencies = ["multipart-post"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa"; + type = "gem"; + }; + version = "0.15.0"; + }; + fast-stemmer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh"; + type = "gem"; + }; + version = "1.0.2"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + type = "gem"; + }; + version = "1.9.23"; + }; + forwardable-extended = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v"; + type = "gem"; + }; + version = "2.6.0"; + }; + gemoji = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d"; + type = "gem"; + }; + version = "3.0.0"; + }; + html-pipeline = { + dependencies = ["activesupport" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; + type = "gem"; + }; + version = "2.7.1"; + }; + "http_parser.rb" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + type = "gem"; + }; + version = "0.9.5"; + }; + jekyll = { + dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as"; + type = "gem"; + }; + version = "3.8.0"; + }; + jekyll-avatar = { + dependencies = ["jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; + type = "gem"; + }; + version = "0.6.0"; + }; + jekyll-coffeescript = { + dependencies = ["coffee-script" "coffee-script-source"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06qf4j9f6ysjb4bq6gsdaiz2ksmhc5yb484v458ra3s6ybccqvvy"; + type = "gem"; + }; + version = "1.1.1"; + }; + jekyll-feed = { + dependencies = ["jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kr3kyaq4z3jixn6ay8h16bxxlv6slvvp7nqnl05jdymhkl0bmm9"; + type = "gem"; + }; + version = "0.9.3"; + }; + jekyll-gist = { + dependencies = ["octokit"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03wz9j6yq3552nzf4g71qrdm9pfdgbm68abml9sjjgiaan1n8ns9"; + type = "gem"; + }; + version = "1.5.0"; + }; + jekyll-mentions = { + dependencies = ["activesupport" "html-pipeline" "jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn"; + type = "gem"; + }; + version = "1.3.0"; + }; + jekyll-paginate = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8"; + type = "gem"; + }; + version = "1.1.0"; + }; + jekyll-redirect-from = { + dependencies = ["jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1crm5xqgv5asbbbaxfgky4ppib5rih59yzpa3yc94gh8b9cjixrj"; + type = "gem"; + }; + version = "0.13.0"; + }; + jekyll-sass-converter = { + dependencies = ["sass"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk"; + type = "gem"; + }; + version = "1.5.2"; + }; + jekyll-seo-tag = { + dependencies = ["jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f9b2mvmx57zj49afb3x8cmzdmb1kh4rbpbv3v7w5bh47g2c9big"; + type = "gem"; + }; + version = "2.4.0"; + }; + jekyll-sitemap = { + dependencies = ["jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xy93ysl1q8r4xhbnffycvsslja0dskh2z2pl1jnykwsy27dc89n"; + type = "gem"; + }; + version = "1.2.0"; + }; + jekyll-watch = { + dependencies = ["listen"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp"; + type = "gem"; + }; + version = "2.0.0"; + }; + jemoji = { + dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b"; + type = "gem"; + }; + version = "0.9.0"; + }; + kramdown = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za"; + type = "gem"; + }; + version = "1.16.2"; + }; + liquid = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y"; + type = "gem"; + }; + version = "4.0.0"; + }; + liquid-c = { + dependencies = ["liquid"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a5n7q314ma32y7v9a1g6ps60b14zfn2q4nip4j5aknblz51v7gi"; + type = "gem"; + }; + version = "3.0.0"; + }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; + type = "gem"; + }; + version = "3.1.5"; + }; + mercenary = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; + type = "gem"; + }; + version = "0.3.6"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + 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"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + type = "gem"; + }; + version = "2.3.0"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + type = "gem"; + }; + version = "5.11.3"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; + multipart-post = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + type = "gem"; + }; + version = "2.0.0"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq"; + type = "gem"; + }; + version = "1.8.2"; + }; + octokit = { + dependencies = ["sawyer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg"; + type = "gem"; + }; + version = "4.8.0"; + }; + pathutil = { + dependencies = ["forwardable-extended"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz"; + type = "gem"; + }; + version = "0.16.1"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + type = "gem"; + }; + version = "3.0.2"; + }; + "pygments.rb" = { + dependencies = ["multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbvnwvz770ambm4d6lxgc2097rydn5rcc5d6986bnkzyxfqqjnv"; + type = "gem"; + }; + version = "1.2.1"; + }; + rb-fsevent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + type = "gem"; + }; + version = "0.10.3"; + }; + rb-inotify = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + type = "gem"; + }; + version = "0.9.10"; + }; + rdiscount = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3"; + type = "gem"; + }; + version = "2.2.0.1"; + }; + rdoc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a"; + type = "gem"; + }; + version = "6.0.3"; + }; + redcarpet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + type = "gem"; + }; + version = "3.4.0"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3"; + type = "gem"; + }; + version = "3.1.1"; + }; + ruby_dep = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5"; + type = "gem"; + }; + version = "1.5.0"; + }; + safe_yaml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; + }; + sass = { + dependencies = ["sass-listen"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; + type = "gem"; + }; + version = "3.5.6"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + type = "gem"; + }; + version = "4.0.0"; + }; + sawyer = { + dependencies = ["addressable" "faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; + type = "gem"; + }; + version = "0.8.1"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tomlrb = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09gh67v8s1pr7c37490sjp782gi4wf9k9cadp4l926h1sp27bcgz"; + type = "gem"; + }; + version = "1.2.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + type = "gem"; + }; + version = "1.2.5"; + }; + yajl-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rn4kc9fha990yd252wglh6rcyh35cavm1vpyfj8krlcwph09g30"; + type = "gem"; + }; + version = "1.3.1"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix deleted file mode 100644 index 5b1a35209aebb3aa5ffcf5d9e7b5e4a3437e1647..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/jekyll/gemset.nix +++ /dev/null @@ -1,183 +0,0 @@ -{ - addressable = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; - type = "gem"; - }; - version = "2.5.0"; - }; - colorator = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72"; - type = "gem"; - }; - 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"; - type = "gem"; - }; - version = "1.1.0"; - }; - 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"; - type = "gem"; - }; - version = "3.0.6"; - }; - listen = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l0y7hbyfiwpvk172r28hsdqsifq1ls39hsfmzi1vy4ll0smd14i"; - type = "gem"; - }; - version = "3.0.8"; - }; - mercenary = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; - type = "gem"; - }; - version = "0.3.6"; - }; - minima = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s7ks9fqfvqx7qicnkrg76wavg9mjas52f7iyhr89lz9mqiy7p39"; - type = "gem"; - }; - version = "2.1.0"; - }; - pathutil = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0f444wx6vjd30lkkb2zn1k5a6g33lidrpyy7lmgy66n1gsiipzn7"; - type = "gem"; - }; - version = "0.14.0"; - }; - public_suffix = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; - type = "gem"; - }; - version = "2.0.5"; - }; - 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"; - type = "gem"; - }; - 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/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh new file mode 100755 index 0000000000000000000000000000000000000000..528f1062c733f212708d69ba15378aa2f6205393 --- /dev/null +++ b/pkgs/applications/misc/jekyll/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bundix zlib + +set -o errexit +set -o nounset + +readonly BASEDIR="$(dirname $(readlink -f $0))" + +for directory in "basic" "full"; do + pushd "$BASEDIR/$directory" + rm -f Gemfile.lock gemset.nix + bundix --magic + rm -rf .bundle vendor + popd +done diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 54a383c31c2821f4da18007505df7d8cdcafbb99..ffb898b265c20c1b989a3ae04bb42fe06195a9d4 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jgmenu-${version}"; - version = "0.7.4"; + version = "0.8.2"; src = fetchFromGitHub { owner = "johanmalm"; repo = "jgmenu"; rev = "v${version}"; - sha256 = "0vim7balxrxhbgq4jvf80lbh57xbw3qmhapy7n2iyv443ih4a7hi"; + sha256 = "0nflj4fcpz7rcd1s0zlyi5ikxjykkmz3p5w4gzica1fdbyn2l7x3"; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/johanmalm/jgmenu; description = "Small X11 menu intended to be used with openbox and tint2"; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 46263f7d83b8717e54030baa2bb9a04e395469a6..6c14c93c83daf9cb0b1a3b0870fb6020f179c941 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 = "13053"; + version = "13576"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6"; + sha256 = "0pw7srvds8zs53ibvj779vj505h2gfrn7xqx13hkbacdg441jkd4"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 015ef8760648c3143d5370e979f2b4fe05af8f7e..ad2381394f4691844617aff46adbdb24329a1c53 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig -, zlib, libpng +, zlib, libpng, openjpeg , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { mupdf_modded = mupdf.overrideAttrs (attrs: { name = "mupdf-1.10a"; src = fetchurl { - url = "http://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"; + url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"; sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; }; # Excluded the pdf-*.c files, since they mostly just broke the #includes @@ -40,11 +40,7 @@ stdenv.mkDerivation rec { # Patches from previous 1.10a version in nixpkgs 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"; - }) + ./load-jpx.patch (fetchurl { name = "CVE-2017-5896.patch"; @@ -64,6 +60,14 @@ stdenv.mkDerivation rec { # Don't remove mujs because upstream version is incompatible rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} ''; + postPatch = let + # OpenJPEG version is hardcoded in package source + openJpegVersion = with stdenv; + lib.concatStringsSep "." (lib.lists.take 2 + (lib.splitString "." (lib.getVersion openjpeg))); + in '' + sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c + ''; }); leptonica_modded = leptonica.overrideAttrs (attrs: { prePatch = '' diff --git a/pkgs/applications/misc/k2pdfopt/load-jpx.patch b/pkgs/applications/misc/k2pdfopt/load-jpx.patch new file mode 100644 index 0000000000000000000000000000000000000000..02a3799d040ae3ef4a2a0a2c2e0a02a58ffe22d3 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/load-jpx.patch @@ -0,0 +1,29 @@ +--- a/source/fitz/load-jpx.c ++++ b/source/fitz/load-jpx.c +@@ -484,12 +484,16 @@ + /* Without the definition of OPJ_STATIC, compilation fails on windows + * due to the use of __stdcall. We believe it is required on some + * linux toolchains too. */ ++#ifdef __cplusplus ++extern "C" ++{ + #define OPJ_STATIC + #ifndef _MSC_VER + #define OPJ_HAVE_STDINT_H + #endif ++#endif + +-#include ++#include + + /* OpenJPEG does not provide a safe mechanism to intercept + * allocations. In the latest version all allocations go +@@ -971,4 +975,8 @@ + fz_drop_pixmap(ctx, img); + } + ++#ifdef __cplusplus ++} ++#endif ++ + #endif /* HAVE_LURATECH */ diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index bf1b77534ce681aed3b325754cc86958e02ce5f4..ba048761367cdd5bc8963f47b979ff6b29a8f102 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { message = '' Nix can't download kdb+ for you automatically. Go to http://kx.com and download the free, 32-bit version for - Linux. Then run "nix-prefetch-url file:///linux.zip" in the - directory where you saved it. Note you need version 3.3. + Linux. Then run "nix-prefetch-url file://\$PWD/linux.zip" in + the directory where you saved it. Note you need version 3.3. ''; name = "linux.zip"; sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940"; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index a95dd6adbce632bc154f804b6fb0d672a7044d95..0d02dbba69eb038a7ff7677d3cd198c73cafd3dc 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -13,26 +13,33 @@ , libfakekey , libXtst , qtx11extras +, sshfs +, makeWrapper +, kwayland }: stdenv.mkDerivation rec { pname = "kdeconnect"; - version = "1.2"; + version = "1.3.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz"; - sha256 = "0w3rdldnr6md70r4ch255vk712d37vy63ml7ly2fhr4cfnk2i1ay"; + sha256 = "0gzv55hks6j37pf7d18l40n1q6j8b74j9qg3v44p8sp0gnglwkcm"; }; buildInputs = [ libfakekey libXtst ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications - qca-qt5 qtx11extras + qca-qt5 qtx11extras makeWrapper kwayland ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + postInstall = '' + wrapProgram $out/lib/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]} + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/misc/keepass-plugins/keefox/default.nix b/pkgs/applications/misc/keepass-plugins/keefox/default.nix deleted file mode 100644 index 0215c5a71c2fa26e42544d451de35da898949484..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/keepass-plugins/keefox/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildEnv, fetchurl, mono, unzip }: - -let - version = "1.6.4"; - drv = stdenv.mkDerivation { - name = "keefox-${version}"; - src = fetchurl { - url = "https://github.com/luckyrat/KeeFox/releases/download/v${version}/${version}.xpi"; - sha256 = "0nj4l9ssyfwbl1pxgxvd2h9q0mqhx7i0yzm4a2xjqlqwam534d1w"; - }; - - meta = { - description = "Keepass plugin for keefox Firefox add-on"; - homepage = http://keefox.org; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.mjanczyk ]; - }; - - buildInputs = [ unzip ]; - - pluginFilename = "KeePassRPC.plgx"; - - unpackCmd = "unzip $src deps/$pluginFilename "; - sourceRoot = "deps"; - - 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/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b2980bcd8aeaff7e1468f5a2a269ea2c23a2ae1c --- /dev/null +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildEnv, fetchurl, mono }: + +let + version = "1.7.3.1"; + drv = stdenv.mkDerivation { + name = "keepassrpc-${version}"; + src = fetchurl { + url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; + sha256 = "1y9b35qg27caj3pbaqqzrqpk61hbbd8617ziwdc9vl799i786m9k"; + }; + + meta = with stdenv.lib; { + description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords"; + homepage = https://github.com/kee-org/keepassrpc; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl2; + maintainers = with maintainers; [ mjanczyk svsdep ]; + }; + + pluginFilename = "KeePassRPC.plgx"; + + unpackCmd = '' + mkdir deps/ + cp -p $src deps/$pluginFilename + ''; + sourceRoot = "deps"; + + 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/default.nix b/pkgs/applications/misc/keepass/default.nix index 49e4711550dae870f609d5f05260d7d43e508228..5e492fc621fef38a7e686ecb770630278a3b7fac 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,24 +1,34 @@ -{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, gtk2, plugins ? [] }: +{ stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, + unzip, icoutils, gtk2, xorg, xdotool, xsel, plugins ? [] }: -# KeePass looks for plugins in under directory in which KeePass.exe is -# located. It follows symlinks where looking for that directory, so -# buildEnv is not enough to bring KeePass and plugins together. -# -# This derivation patches KeePass to search for plugins in specified -# plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.37"; + version = "2.38"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "1wfbpfjng1blzkbjnxsdnny544297bm9869ianbr6l0hrvcgv3qx"; + sha256 = "0m33gfpvv01xc28k4rrc8llbyk6qanm9rsqcnv8ydms0cr78dbbk"; }; sourceRoot = "."; buildInputs = [ unzip makeWrapper icoutils ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + xsel = "${xsel}/bin/xsel"; + xprop = "${xorg.xprop}/bin/xprop"; + xdotool = "${xdotool}/bin/xdotool"; + }) + ]; + + # KeePass looks for plugins in under directory in which KeePass.exe is + # located. It follows symlinks where looking for that directory, so + # buildEnv is not enough to bring KeePass and plugins together. + # + # This derivation patches KeePass to search for plugins in specified + # plugin derivations in the Nix store and nowhere else. pluginLoadPathsPatch = let outputLc = toString (add 7 (length plugins)); patchTemplate = readFile ./keepass-plugins.patch; diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/applications/misc/keepass/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..318f8a358985bf39cc3b9d4550a9ac622350429a --- /dev/null +++ b/pkgs/applications/misc/keepass/fix-paths.patch @@ -0,0 +1,87 @@ +diff --git a/KeePass/Native/NativeMethods.Unix.cs b/KeePass/Native/NativeMethods.Unix.cs +index 7495a1c..4ef4727 100644 +--- a/KeePass/Native/NativeMethods.Unix.cs ++++ b/KeePass/Native/NativeMethods.Unix.cs +@@ -128,7 +128,7 @@ namespace KeePass.Native + try + { + Application.DoEvents(); // E.g. for clipboard updates +- string strOutput = NativeLib.RunConsoleApp("xdotool", strParams); ++ string strOutput = NativeLib.RunConsoleApp("@xdotool@", strParams); + Application.DoEvents(); // E.g. for clipboard updates + return (strOutput ?? string.Empty); + } +diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs +index e93a22a..3fd9a2b 100644 +--- a/KeePass/Util/ClipboardUtil.Unix.cs ++++ b/KeePass/Util/ClipboardUtil.Unix.cs +@@ -62,7 +62,7 @@ namespace KeePass.Util + // "-out -selection clipboard"); + // if(str != null) return str; + +- string str = NativeLib.RunConsoleApp("xsel", ++ string str = NativeLib.RunConsoleApp("@xsel@", + "--output --clipboard", null, XSelFlags); + if(str != null) return str; + +@@ -83,10 +83,10 @@ namespace KeePass.Util + if(string.IsNullOrEmpty(str)) + { + // xsel with an empty input can hang, thus use --clear +- if(NativeLib.RunConsoleApp("xsel", "--clear --primary", ++ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary", + null, XSelFlags) != null) + { +- NativeLib.RunConsoleApp("xsel", "--clear --clipboard", ++ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard", + null, XSelFlags); + return; + } +@@ -97,10 +97,10 @@ namespace KeePass.Util + } + + // xsel does not support --primary and --clipboard together +- if(NativeLib.RunConsoleApp("xsel", "--input --primary", ++ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary", + str, XSelFlags) != null) + { +- NativeLib.RunConsoleApp("xsel", "--input --clipboard", ++ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard", + str, XSelFlags); + return; + } +diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs +index ddd8f57..150eb82 100644 +--- a/KeePassLib/Native/ClipboardU.cs ++++ b/KeePassLib/Native/ClipboardU.cs +@@ -27,7 +27,7 @@ namespace KeePassLib.Native + { + internal static class ClipboardU + { +- private const string XSel = "xsel"; ++ private const string XSel = "@xsel@"; + private const string XSelV = "--version"; + private const string XSelR = "--output --clipboard"; + private const string XSelC = "--clear --clipboard"; +diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs +index 0da7019..f6a1022 100644 +--- a/KeePassLib/Utility/MonoWorkarounds.cs ++++ b/KeePassLib/Utility/MonoWorkarounds.cs +@@ -41,7 +41,7 @@ namespace KeePassLib.Utility + { + public static class MonoWorkarounds + { +- private const string AppXDoTool = "xdotool"; ++ private const string AppXDoTool = "@xdotool@"; + + private static Dictionary g_dForceReq = new Dictionary(); + private static Thread g_thFixClip = null; +@@ -303,7 +303,7 @@ namespace KeePassLib.Utility + // } + // else { Debug.Assert(false); } + +- string strWmClass = (NativeLib.RunConsoleApp("xprop", ++ string strWmClass = (NativeLib.RunConsoleApp("@xprop@", + "-id " + strHandle + " WM_CLASS") ?? string.Empty); + + if(strWmClass.IndexOf("\"" + PwDefs.ResClass + "\"", diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/applications/misc/keepass/keepass-plugins-load.patch index b7bea38e4c81b8c4dc1129cf5d188e395f7b6c60..ca52e7ef191a9d7322606e0747fd0cd6671940d3 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins-load.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins-load.patch @@ -1 +1 @@ -+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); ++ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch index 1793f04a1708f67114ccf61c62a5ff3310e11c44..cde6e7252bc3b63bc3d1d37f63450945dcbfb1f1 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -1,46 +1,13 @@ ---- old/KeePass/Forms/MainForm.cs -+++ new/KeePass/Forms/MainForm.cs -@@ -386,42 +386,$OUTPUT_LC$ @@ namespace KeePass.Forms +diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs +index 3d5fca0..4c3f3d4 100644 +--- a/KeePass/Forms/MainForm.cs ++++ b/KeePass/Forms/MainForm.cs +@@ -406,7 +406,$OUTPUT_LC$ @@ namespace KeePass.Forms + m_pluginManager.Initialize(m_pluginDefaultHost); + m_pluginManager.UnloadAllPlugins(); - if(AppPolicy.Current.Plugins) - { -- string[] vExclNames = new string[] { -- AppDefs.FileNames.Program, AppDefs.FileNames.XmlSerializers, -- AppDefs.FileNames.NativeLib32, AppDefs.FileNames.NativeLib64, -- AppDefs.FileNames.ShInstUtil -- }; -- -- string strPlgRoot = UrlUtil.GetFileDirectory( -- WinUtil.GetExecutable(), false, true); -- m_pluginManager.LoadAllPlugins(strPlgRoot, SearchOption.TopDirectoryOnly, -- vExclNames); -- -- if(!NativeLib.IsUnix()) -- { -- string strPlgSub = UrlUtil.EnsureTerminatingSeparator(strPlgRoot, -- false) + AppDefs.PluginsDir; -- m_pluginManager.LoadAllPlugins(strPlgSub, SearchOption.AllDirectories, -- vExclNames); -- } -- else // Unix -- { -- try -- { -- DirectoryInfo diPlgRoot = new DirectoryInfo(strPlgRoot); -- foreach(DirectoryInfo diSub in diPlgRoot.GetDirectories()) -- { -- if(diSub == null) { Debug.Assert(false); continue; } -- -- if(string.Equals(diSub.Name, AppDefs.PluginsDir, -- StrUtil.CaseIgnoreCmp)) -- m_pluginManager.LoadAllPlugins(diSub.FullName, -- SearchOption.AllDirectories, vExclNames); -- } -- } -- catch(Exception) { Debug.Assert(false); } -- } -- } -$DO_LOADS$+ } +- if(AppPolicy.Current.Plugins) m_pluginManager.LoadAllPlugins(); +$DO_LOADS$+ // Delete old files *after* loading plugins (when timestamps // of loaded plugins have been updated already) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 72d9c7d2fb5d107cae2ad7bf8484f8b1ebaf1e18..0e1aecaab1d19d694a2fdfc36db5d238dc4e4f2d 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,26 +1,64 @@ -{ stdenv, fetchFromGitHub, fetchpatch, - cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras -, withKeePassHTTP ? true +{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools + +, curl +, libargon2 +, libgcrypt +, libsodium +, zlib +, libmicrohttpd +, libXtst +, qtbase +, libgpgerror +, glibcLocales +, libyubikey +, yubikey-personalization +, libXi +, qtx11extras +, qtmacextras + +, withKeePassBrowser ? true +, withKeePassSSHAgent ? true +, withKeePassHTTP ? false +, withKeePassNetworking ? false }: with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.2.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "01pqpa3vzk2q1vrj2lqayr7a3nzpnj176yhnqbrwlm3s9rga4wzn"; + sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87"; }; - cmakeFlags = [ - "-DWITH_GUI_TESTS=ON" + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ + "-Wno-old-style-cast" + "-Wno-error" + "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" + ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/local/bin" "../bin" \ + --replace "/usr/local/share/man" "../share/man" + ''; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + patches = [ ./darwin.patch ]; + + cmakeFlags = [ + "-DKEEPASSXC_BUILD_TYPE=Release" + "-DWITH_GUI_TESTS=ON" "-DWITH_XC_AUTOTYPE=ON" "-DWITH_XC_YUBIKEY=ON" - ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON"); + ] + ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") + ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON") + ++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") + ++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); doCheck = true; checkPhase = '' @@ -28,13 +66,37 @@ stdenv.mkDerivation rec { make test ARGS+="-E testgui --output-on-failure" ''; - buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ]; + nativeBuildInputs = [ cmake makeWrapper qttools ]; + + buildInputs = [ + curl + glibcLocales + libXi + libXtst + libargon2 + libgcrypt + libgpgerror + libmicrohttpd + libsodium + libyubikey + qtbase + qtx11extras + yubikey-personalization + zlib + ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; + + postInstall = optionalString stdenv.isDarwin '' + # Make it work without Qt in PATH. + wrapProgram $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC \ + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; 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."; - homepage = https://github.com/keepassxreboot/keepassxc; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ]; - platforms = with stdenv.lib.platforms; linux; + description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; + longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI and via CLI. Includes optional http-interface to allow browser-integration with plugins like PassIFox (https://github.com/pfn/passifox)."; + homepage = https://keepassxc.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ s1lvester jonafato ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassx/darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..1edf0a573a31675ae04fcd0aa6f85de73500afa0 --- /dev/null +++ b/pkgs/applications/misc/keepassx/darwin.patch @@ -0,0 +1,52 @@ +Remove the use of macdeployqt to avoid copying dependencies and +reduce installation size from 90 MB to 9 MB. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -250,8 +250,8 @@ else() + set(PROGNAME keepassxc) + endif() + +-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local") +- set(CMAKE_INSTALL_PREFIX "/Applications") ++if(APPLE AND WITH_APP_BUNDLE) ++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") + set(CMAKE_INSTALL_MANDIR "/usr/local/share/man") + endif() + +@@ -262,7 +262,7 @@ if(MINGW) + set(PLUGIN_INSTALL_DIR ".") + set(DATA_INSTALL_DIR "share") + elseif(APPLE AND WITH_APP_BUNDLE) +- set(CLI_INSTALL_DIR "/usr/local/bin") ++ set(CLI_INSTALL_DIR "../bin") + set(PROXY_INSTALL_DIR "/usr/local/bin") + set(BIN_INSTALL_DIR ".") + set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 69526967..38f7c5d4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE) + set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}") + include(CPack) + +- add_custom_command(TARGET ${PROGNAME} +- POST_BUILD +- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src +- COMMENT "Deploying app bundle") + endif() + + install(TARGETS ${PROGNAME} +diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt +index 08c53278..b833b692 100644 +--- a/src/autotype/mac/CMakeLists.txt ++++ b/src/autotype/mac/CMakeLists.txt +@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE) + add_custom_command(TARGET keepassx-autotype-cocoa + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR} +- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src + COMMENT "Deploying autotype plugin") + else() diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix deleted file mode 100644 index b12c9fe25510e47333065232a191ef9be2c32460..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/kgocode/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchgit, stdenv, cmake, kdelibs4, automoc4 } : - -stdenv.mkDerivation rec { - name = "kgocode-0.0.1"; - - buildInputs = [ cmake kdelibs4 automoc4 ]; - - src = fetchgit { - url = https://bitbucket.org/lucashnegri/kgocode.git; - rev = "024536e4b2f371db4f51c1d80fb6b444352ff6a6"; - sha256 = "10q4nvx3wz5wl3wwpfprz26j4x59s41bpdgafbg6604im58hklal"; - }; - - meta = with stdenv.lib; { - description = "Go code completion for Kate, KDevelop and others"; - longDescription = '' - A plugin for KTextEditor (Kate, KDevelop, among others) that provides - basic code completion for the Go programming language. - Uses gocode as completion provider. - ''; - homepage = https://bitbucket.org/lucashnegri/kgocode/overview; - maintainers = with maintainers; [ qknight ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 91e583e2af4e41bd3c3d25637bfba12b7e04dbcf..5351cd41b2518dbea7835bce0a9b88777b742058 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -40,6 +40,6 @@ buildPythonApplication rec { homepage = http://lostpackets.de/khal/; description = "CLI calendar application"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 3a87e854dc1f54d1353b92744b7502ab5a16deec..c626aaca66bd4ad9e947c75be6301bbd4d32fa8c 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.11.4"; + version = "0.12.2"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "1hngg3z5cdjny7wdf2mf9wv35ffx7ivpq6mx7kgqf40fr5905l0r"; + sha256 = "0lxcvzmafpvqcifgq2xjh1ca07z0vhihn5jnw8zrpmsqdc9p6b4j"; }; # setup.py reads the UTF-8 encoded readme. @@ -19,7 +19,9 @@ python3Packages.buildPythonApplication rec { configobj vobject argparse - pyyaml + ruamel_yaml + ruamel_base + unidecode ]; # Fails; but there are no tests anyway. @@ -29,6 +31,6 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/scheibler/khard; description = "Console carddav client"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index e1afac735d8e29f905009419c67c113bd112ad56..52f1c9fb1a1db6a6e25fa0a01c2cec6f4c9ea4d6 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, glew, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper }: +{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, + fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, + libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, + libxkbcommon, libXi, libXext }: with python3Packages; buildPythonApplication rec { - version = "0.4.2"; + version = "0.8.2"; name = "kitty-${version}"; format = "other"; @@ -10,13 +13,21 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "058676r2b83mjggbfc701v3vlviaslf7qciz8sm8lcda82k01wfp"; + sha256 = "08s8l59bib363ykg4djcxrc1968n5j1cjlp6fwwv7xmf18wd1a6c"; }; - buildInputs = [ glew fontconfig glfw ncurses libunistring ]; + buildInputs = [ + fontconfig glfw ncurses libunistring harfbuzz libX11 + libXrandr libXinerama libXcursor libxkbcommon libXi libXext + ]; nativeBuildInputs = [ pkgconfig ]; + postPatch = '' + substituteInPlace kitty/utils.py \ + --replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'" + ''; + buildPhase = '' python3 setup.py linux-package ''; @@ -25,7 +36,7 @@ buildPythonApplication rec { runHook preInstall mkdir -p $out cp -r linux-package/{bin,share,lib} $out - wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick ]}" + wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}" runHook postInstall ''; @@ -33,6 +44,7 @@ buildPythonApplication rec { homepage = https://github.com/kovidgoyal/kitty; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; + platforms = platforms.linux; maintainers = with maintainers; [ tex ]; }; } diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 8479c4e16ace59b96b74ff6a96b3e1eec86e50fe..699cb2fd09863897d9479676671ded985122a8ec 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc -, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib +, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , xapian, ctpp2, zimlib }: @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ - --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ + --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ --suffix PATH : ${aria2}/bin ''; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index f3bb825cbf7430466b169122989e662849d4cc38..bb55fc2d4a8b7d38bb7602a23c3174a17ee99db5 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -3,11 +3,12 @@ , fetchurl , intltool , python3Packages +, gobjectIntrospection , gtk3 , dbus , libwnck3 , keybinder3 -, hicolor_icon_theme +, hicolor-icon-theme , wrapGAppsHook }: @@ -22,8 +23,12 @@ buildPythonApplication rec { sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92"; }; - nativeBuildInputs = [ wrapGAppsHook intltool ]; - buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ]; + nativeBuildInputs = [ + wrapGAppsHook intltool + # For setup hook + gobjectIntrospection + ]; + buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; configurePhase = '' diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 2695ac1ef7d51d3977d675fbf1af4c39d3b6bd3d..1867ec3a9c623093eee14c6eee75ff705a3076a8 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub , extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }: -let version = "0.7.1"; in +let version = "0.7.4"; in mkDerivation { name = "latte-dock-${version}"; @@ -10,7 +10,7 @@ mkDerivation { owner = "psifidotos"; repo = "Latte-Dock"; rev = "v${version}"; - sha256 = "0vdmsjj1qqlzz26mznb56znv5x7akbvw65ybbzakclp4q1xrsrm2"; + sha256 = "0w4fphgpdvql31wrypxyfahmr4cv5ap96wjc4270yyawnrqrx0y6"; }; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 47bcbb6fce915566ca8597f641392f0d4f426ff6..4f1745c0d8ceda3bcaa7f5b1d3358ae4371bd746 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -1,31 +1,37 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pcsclite, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, pcsclite, talloc, python2 }: stdenv.mkDerivation rec { name = "libosmocore-${version}"; - version = "0.9.0"; + version = "0.9.6"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; - rev = "8649d57f507d359c99a89654aac7e19ce22db282"; - sha256 = "08mcpy9ljwb1i3l4cmlwn024q2psk5gg9f0ylgh99hy1ffx0n7am"; + rev = "3cc757df1822114bf446dc2d5f6a95da92321a25"; + sha256 = "0dk7065qcy2kjra0p8q2124p73jcyvvzz3cmhid1kx5scyxmr017"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + propagatedBuildInputs = [ + talloc + ]; + + nativeBuildInputs = [ + autoreconfHook pkgconfig + ]; + buildInputs = [ - pcsclite + pcsclite python2 ]; - preConfigure = '' - autoreconf -i -f - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "libosmocore"; homepage = https://github.com/osmocom/libosmocore; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mog ]; }; } diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 3729978dddb0007d9fa0923ccf59abda6650a579..36527cdbe7c3b477d1e0fd048cd9cb45d70e1c69 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; homepage = http://lilyterm.luna.com.tw/; license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres profpatsch ]; + maintainers = with maintainers; [ AndersonTorres Profpatsch ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 837a221be946cde6cd877b8fda6da626182de2ca..959ed6b11babf63bc434244b0b43c4d839b00631 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -6,12 +6,12 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "26b"; + version = "2018-03-02"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "v${version}"; - sha256 = "1w8g1fp1c20sl34cx20plhnbghbsx2fwgp4vyhd1x0za29lw62nj"; + rev = "0ab1fbbf142b6df6d6bae782e3af2ec50f32dec9"; + sha256 = "1h0hrmxwm7ripgp051788p8ad0q38dc9nvjx87mdwlkwk9qc0dis"; fetchSubmodules = false; }; @@ -21,7 +21,6 @@ in stdenv.mkDerivation rec { dontStrip = true; configurePhase = '' - sed -i -e 's+fz_set_use_document_css (state.ctx, usedoccss);+/* fz_set_use_document_css (state.ctx, usedoccss); */+' link.c sed -i -e 's+ocamlc --version+ocamlc -version+' build.sh sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0a2a051223acc18db4b0b56f453623c375b365c9 --- /dev/null +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte +, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs +}: + +let version = "0.3.1"; in + +stdenv.mkDerivation rec { + name = "lxterminal-${version}"; + + src = fetchurl { + url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; + sha256 = "e91f15c8a726d5c13227263476583137a2639d4799c021ca0726c9805021b54c"; + }; + + configureFlags = [ + "--enable-man" + "--enable-gtk3" + ]; + + nativeBuildInputs = [ + automake autoconf intltool pkgconfig + libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs + ]; + + buildInputs = [ gtk3 vte ]; + + patches = [ + ./respect-xml-catalog-files-var.patch + ]; + + preConfigure = '' + ./autogen.sh + ''; + + doCheck = true; + + meta = { + description = "The standard terminal emulator of LXDE"; + longDescription = '' + LXTerminal is the standard terminal emulator of LXDE. The terminal is a + desktop-independent VTE-based terminal emulator for LXDE without any + unnecessary dependencies. + ''; + homepage = https://wiki.lxde.org/en/LXTerminal; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.velovix ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch new file mode 100644 index 0000000000000000000000000000000000000000..598f506118f295b6dcfedb8528339afe1b1bdea7 --- /dev/null +++ b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch @@ -0,0 +1,15 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index be626c5..b449b1b 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3 + ])dnl diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index e3c4943cb2fee835b0ba94e3c15cb9f7ebe49ac2..092ad6bf4780c188171a00aec91d223477c4858a 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.3"; + version = "2.3.0"; name = "lyx-${version}"; src = fetchurl { - url = "ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${name}.tar.xz"; - sha256 = "0mrbr24xbdg25gd7w8g76gpmy0a10nrnz0mz47mdjwi441yfpjjg"; + url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${name}.tar.xz"; + sha256 = "0axri2h8xkna4mkfchfyyysbjl7s486vx80p5hzj9zgsvdm5a3ri"; }; # 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 index af8d00b59bfb3d4659091bf1c348e26c401d7679..787ce7231f30f0d693f29f06afb255fb0541853e 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -26,6 +26,6 @@ buildGoPackage rec { homepage = https://github.com/McKael/madonctl; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 76d23f1a8f08cbc36fdf2676bea65a4607fac53b..5ea49f28afd8d6f0193683b11a34068b1fd28142 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: let - version = "4.3.61"; + version = "4.3.89"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm"; + sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; }; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index f627a3cda22f6f7b2b675785dfc2805ca178e1f5..fd0a8ea1fe4e5db00c6cca7a49656fdab161971d 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.10"; + version = "1.0.12"; name = "mdp-${version}"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; rev = version; - sha256 = "1swp1hqryai84c8dpzsvjpgg5rz2vnn2vrp0dhwy8r0qgpmby2nn"; + sha256 = "04izj9i9rxmgswjh2iawqs6qglfv44zfv042smmcvfh1pm43361i"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/visit1985/mdp; description = "A command-line based markdown presentation tool"; - maintainers = with maintainers; [ matthiasbeyer vrthra ]; + maintainers = with maintainers; [ vrthra ]; license = licenses.gpl3; platforms = with platforms; unix; }; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 0167132db7897b7c8bf8f95c8291f39a592982f3..4fa3b4ee43535e28161dbb878a8d4f74f7f3239d 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK -, desktop_file_utils, libSM, imagemagick }: +, desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "17.10"; + version = "18.03.1"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c"; + sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libzen libmediainfo wxGTK desktop_file_utils libSM + buildInputs = [ libzen libmediainfo wxGTK desktop-file-utils libSM imagemagick ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index e6175356348f39545805a36c3e7bcfdeee90ddcd..dcc2a1bf43ce3ef10839b1000097d890fd7533b9 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 = "17.10"; + version = "18.03.1"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c"; + sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fc1c08dc2b2cb56cfdfcdbc22f9a50b56bd104b2 --- /dev/null +++ b/pkgs/applications/misc/memo/default.nix @@ -0,0 +1,38 @@ +{ fetchFromGitHub, ag, tree, stdenv, ... }: + +stdenv.mkDerivation rec { + + name = "memo-${version}"; + + version = "0.2"; + + src = fetchFromGitHub { + owner = "mrVanDalo"; + repo = "memo"; + rev = "${version}"; + sha256 = "0mww4w5m6jv4s0krm74cccrz0vlr8rrwiv122jk67l1v9r80pchs"; + }; + + installPhase = '' + mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions} + substituteInPlace memo \ + --replace "ack " "${ag}/bin/ag " \ + --replace "tree " "${tree}/bin/tree " + mv memo $out/bin/ + mv doc/memo.1 $out/share/man/man1/memo.1 + mv completion/memo.bash $out/share/bash-completion/completions/memo.sh + ''; + + meta = { + description = "A simple tool written in bash to memorize stuff"; + longDescription = '' + A simple tool written in bash to memorize stuff. + Memo organizes is structured through topics which are folders in ~/memo. + ''; + homepage = http://palovandalo.com/memo/; + downloadPage = https://github.com/mrVanDalo/memo/releases; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.mrVanDalo ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/misc/mencal/default.nix b/pkgs/applications/misc/mencal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..df0a4db7fc70342dc394abd7f6a06d7f099c5b94 --- /dev/null +++ b/pkgs/applications/misc/mencal/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "mencal-3.0"; + + src = fetchurl { + url = "http://kyberdigi.cz/projects/mencal/files/${name}.tar.gz"; + sha256 = "9328d0b2f3f57847e8753c5184531f4832be7123d1b6623afdff892074c03080"; + }; + + installPhase = '' + mkdir -p $out/bin + cp mencal $out/bin/ + ''; + + buildInputs = [ perl ]; + + meta = with stdenv.lib; { + description = "Menstruation calendar"; + longDescription = '' + Mencal is a simple variation of the well-known unix command cal. + The main difference is that you can have some periodically repeating + days highlighted in color. This can be used to track + menstruation (or other) cycles conveniently. + ''; + homepage = "http://www.kyberdigi.cz/projects/mencal/english.html"; + license = licenses.gpl2; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index 8f18f166d4a38027820607e52a89c348b6dc5b76..602d4a032efda266c789808040add8e8480621dd 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "a graphical mass renaming program for files and folders"; homepage = "https://github.com/metamorphose/metamorphose2"; license = with licenses; gpl3Plus; - maintainer = with maintainers; [ ramkromberg ]; + maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index d8d1cff6040b261c14ab76c8f9ba9aa9c674d914..09c4d1db2904f3353007086975b560daa31c32ea 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, clang, gcc }: +{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: stdenv.mkDerivation rec { name = "milu-nightly-${version}"; @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's#/usr/bin/##g' Makefile - sed -i "s#-lclang#-L$(clang --print-search-dirs | - sed -ne '/libraries:/{s/libraries: =//; s/:/ -L/gp}') -lclang#g" Makefile ''; installPhase = '' @@ -28,8 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib unzip - clang - gcc + llvmPackages.libclang ]; meta = { diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..acf0731f0aeb61b66d25b21c21b725162d5813ef --- /dev/null +++ b/pkgs/applications/misc/minergate/default.nix @@ -0,0 +1,39 @@ +{ fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: + +assert stdenv.system == "x86_64-linux"; + +stdenv.mkDerivation rec { + version = "8.1"; + name = "minergate-${version}"; + src = fetchurl { + url = "https://minergate.com/download/ubuntu"; + sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + pgm=$out/opt/minergate/minergate + + interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + patchelf --set-interpreter "$interpreter" $pgm + + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" + + rm $out/usr/bin/minergate + mkdir -p $out/bin + ln -s $out/opt/minergate/minergate $out/bin + ''; + + meta = with stdenv.lib; { + description = "Minergate CPU/GPU mining software"; + homepage = https://www.minergate.com/; + license = licenses.unfree; + maintainers = with maintainers; [ bfortz ]; + platforms = [ "x86_64-linux" ]; +}; +} + diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 1317c0357923498e349a5070516d3ac1837c46fe..701e4b2e052d474fcde9a8449682a2d894d37bee 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.8.0"; + version = "3.8.4"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "00dzx5rqsp73shgvn2jvgk85v3lirby06wxkqjcm1i1xwigidq3b"; + sha256 = "07ih7953pr1jr99rayjn57ba5a0cr3niqkmvy9n59lcc1qwcrwf9"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix deleted file mode 100644 index ed2049ee5abed952167fe45a104dd5673c6dcd38..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/monero/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }: - -let - version = "0.11.1.0"; -in -stdenv.mkDerivation { - name = "monero-${version}"; - - src = fetchFromGitHub { - owner = "monero-project"; - repo = "monero"; - rev = "v${version}"; - sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ boost miniupnpc openssl unbound ]; - - # these tests take a long time and don't - # always complete in the build environment - postPatch = "sed -i '/add_subdirectory(tests)/d' CMakeLists.txt"; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; - - doCheck = false; - - installPhase = '' - install -Dt "$out/bin/" \ - bin/monerod \ - bin/monero-blockchain-export \ - bin/monero-blockchain-import \ - bin/monero-wallet-cli \ - bin/monero-wallet-rpc - ''; - - meta = with stdenv.lib; { - description = "Private, secure, untraceable currency"; - homepage = https://getmonero.org/; - license = licenses.bsd3; - maintainers = [ maintainers.ehmry ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index c95f935b8555230f1f2854c003433914428b7b03..42f1b58061ef09b8d32cb69297ce5a61c815a3e5 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "moonlight-embedded-${version}"; - version = "2.4.2"; + version = "2.4.6"; # fetchgit used to ensure submodules are available src = fetchgit { url = "git://github.com/irtimmer/moonlight-embedded"; rev = "refs/tags/v${version}"; - sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr"; + sha256 = "0vs6rjmz8058s9lscagiif6pcizwfrvfpk9rxxgacfi0xisfgmf1"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fdb236194f9c29e1afee9d0c05601e0b1de8215d --- /dev/null +++ b/pkgs/applications/misc/mucommander/default.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre }: + +let + version = "0.9.2"; + name = "mucommander-${version}"; + + src = fetchFromGitHub { + owner = "mucommander"; + repo = "mucommander"; + rev = version; + sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8"; + }; + + postPatch = '' + # there is no .git anyway + substituteInPlace build.gradle \ + --replace "git = org.ajoberstar.grgit.Grgit.open(file('.'))" "" \ + --replace "revision = git.head().id" "revision = 'abcdefgh'" + + # disable gradle plugins with native code and their targets + perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle + perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar)/ ... /^}/" build.gradle + + # fix source encoding + find . -type f -name build.gradle \ + -exec perl -i.bak3 -pe "s#(repositories\.jcenter\(\))# + \1 + compileJava.options.encoding = 'UTF-8' + compileTestJava.options.encoding = 'UTF-8' + #" {} \; + ''; + + # fake build to pre-download deps into fixed-output derivation + deps = stdenv.mkDerivation { + name = "${name}-deps"; + inherit src postPatch; + nativeBuildInputs = [ gradle_3_5 perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --no-daemon build + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "199a9rc1pp9jjwpy83743qhjczfz0d1mkbic6si9bh8l62nw8qc7"; + }; + +in stdenv.mkDerivation { + inherit name src postPatch; + nativeBuildInputs = [ gradle_3_5 perl makeWrapper ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + + # point to offline repo + find . -type f -name build.gradle \ + -exec perl -i.bak3 -pe "s#repositories\.jcenter\(\)# + repositories { mavenLocal(); maven { url '${deps}' } } + #" {} \; + + gradle --offline --no-daemon build + ''; + + installPhase = '' + mkdir $out + tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1 + wrapProgram $out/bin/mucommander --set JAVA_HOME ${jre} + ''; + + meta = with stdenv.lib; { + homepage = http://www.mucommander.com/; + description = "Cross-platform file manager"; + license = licenses.gpl3; + maintainers = with maintainers; [ volth ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix index 24a8b0c46a647ffe66176e787dea23e72cd04f59..99d511d413c0293fba2220232ca504e413004288 100644 --- a/pkgs/applications/misc/multimon-ng/default.nix +++ b/pkgs/applications/misc/multimon-ng/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }: let - version = "1.0.0"; + version = "1.1.5"; in stdenv.mkDerivation { name = "multimon-ng-${version}"; @@ -8,8 +8,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "EliasOenal"; repo = "multimon-ng"; - rev = "4cc984f35f859539c94aa56d3fc6218a6de51148"; - sha256 = "12z6f0ra2k0qh56pcvnwvlxd3msvr6yr97jvs7w5kf42jqbxdsga"; + rev = "${version}"; + sha256 = "00h884hn5afrx5i52xmngpsv3204hgb7xpw9my3lm8sajmfrjj1g"; }; buildInputs = [ qt4 libpulseaudio ]; diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/pkgs/applications/misc/mupdf/darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..e0c7d6a7a6769195a55820a80b0cfb3d42e4373a --- /dev/null +++ b/pkgs/applications/misc/mupdf/darwin.patch @@ -0,0 +1,35 @@ +diff --git a/Makerules b/Makerules +--- a/Makerules ++++ b/Makerules +@@ -81,22 +81,10 @@ HAVE_GLUT ?= yes + SYS_GLUT_CFLAGS := -Wno-deprecated-declarations + SYS_GLUT_LIBS := -framework GLUT -framework OpenGL + +-CC = xcrun cc +-AR = xcrun ar +-LD = xcrun ld +-RANLIB_CMD = xcrun ranlib $@ +- +-# Linux uses pkg-config for system libraries. +-else ifeq "$(OS)" "Linux" +- + HAVE_PTHREAD := yes + SYS_PTHREAD_CFLAGS := + SYS_PTHREAD_LIBS := -lpthread + +-HAVE_GLUT := yes +-SYS_GLUT_CFLAGS := +-SYS_GLUT_LIBS := -lglut -lGL +- + ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes" + HAVE_LIBCRYPTO := yes + SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) +@@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl) + SYS_CURL_DEPS += $(shell pkg-config --libs openssl) + endif + endif +-SYS_CURL_DEPS += -lpthread -lrt ++SYS_CURL_DEPS += -lpthread + + ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" + HAVE_X11 := yes diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index b50d99466f89d772bef359702567776972afa5b0..000a916b737ad7b331b20ee361b6c1d307f4528d 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,68 +1,109 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig -, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg -, enableX11 ? true, libX11, libXext +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +, jbig2dec, libjpeg , darwin +, enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl +, enableGL ? true, freeglut, libGLU }: -stdenv.mkDerivation rec { - version = "1.11"; +let + + # OpenJPEG version is hardcoded in package source + openJpegVersion = with stdenv; + lib.concatStringsSep "." (lib.lists.take 2 + (lib.splitString "." (lib.getVersion openjpeg))); + + +in stdenv.mkDerivation rec { + version = "1.12.0"; name = "mupdf-${version}"; src = fetchurl { - url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "02phamcchgsmvjnb3ir7r5sssvx9fcrscn297z73b82n1jl79510"; + url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz"; + sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw"; }; patches = [ # Compatibility with new openjpeg (fetchpatch { - 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"; + name = "mupdf-1.12-openjpeg-version.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306"; + sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk"; }) - - (fetchurl { - 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"; + (fetchpatch { + name = "CVE-2018-6544.1.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d"; + sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i"; }) - (fetchpatch { - name = "mupdf-1.11-shared_libs-1.patch"; - url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch"; - sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j"; + name = "CVE-2018-6544.2.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7"; + sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627"; }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-14685.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=ab1a420613dec93c686acbee2c165274e922f82a"; - sha256 = "120xapwj0af333n3a32ypxk0jmjv2ia476jg8pzsfqk9a5qqkx46"; + (fetchpatch { + # Bugs 698804/698810/698811, 698819: Keep PDF object numbers below limit. + name = "CVE-2017-17858.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=55c3f68d638ac1263a386e0aaa004bb6e8bde731"; + sha256 = "1bf683d59i5009cv1hhmwmrp2rsb75cbf98qd44dk39cpvq8ydwv"; }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-14686.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1"; - sha256 = "0pkn7mfqhmnsyia4rh4mw4q435bzvlc22crqa1bxpaa0gcyky51c"; + (fetchpatch { + # Bug 698825: Do not drop borrowed colorspaces. + name = "CVE-2018-1000051.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=321ba1de287016b0036bf4a56ce774ad11763384"; + sha256 = "0jbcc9j565q5y305pi888qzlp83zww6nhkqbsmkk91gim958zikm"; }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-14687.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2b16dbd8f73269cb15ca61ece75cf8d2d196ed28"; - sha256 = "01v41cwrdnz3k32fcadk2gk4knqrm3mavzp6pxhn19nwgmqkshjd"; + (fetchpatch { + # Bug 698908 preprecondition: Add portable pseudo-random number generator based on the lrand48 family. + name = "CVE-2018-6187.0.1.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2d5b4683e912d6e6e1f1e2ca5aa0297beb3e6807"; + sha256 = "028bxinbjs5gg9myjr3vs366qxg9l2iyba2j3pxkxsh1851hj728"; }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-15587.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=82df2631d7d0446b206ea6b434ea609b6c28b0e8"; - sha256 = "04kfww7y0wazg6372g44fa2k5kiiigq4616ihkvmp18rz86903n9"; + (fetchpatch { + # Bug 698908 precondition: Fix "being able to search for redacted text" bug. + name = "CVE-2018-6187.0.2.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=25593f4f9df0c4a9b9adaa84aaa33fe2a89087f6"; + sha256 = "195y69c3f8yqxcsa0bxrmxbdc3fx1dzvz8v66i56064mjj0mx04s"; + }) + (fetchpatch { + # Bug 698908: Resize object use and renumbering lists after repair. + name = "CVE-2018-6187.1.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=3e30fbb7bf5efd88df431e366492356e7eb969ec"; + sha256 = "0wzbqj750h06q1wa6vxbpv5a5q9pfg0cxjdv88yggkrjb3vrkd9j"; + }) + (fetchpatch { + # Bug 698908: Plug PDF object leaks when decimating pages in pdfposter. + name = "CVE-2018-6187.2.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a71e7c85a9f2313cde20d4479cd727a5f5518ed2"; + sha256 = "1pcjkq8lg6l2m0186rl79lilg79crgdvz9hrmm3w60gy2gxkgksc"; }) - ]; + (fetchpatch { + # Bug 698916: Indirect object numbers must be in range. + name = "CVE-2018-6192.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=5e411a99604ff6be5db9e273ee84737204113299"; + sha256 = "134zc07fp0p1mwqa8xrkq3drg4crajzf1hjf4mdwmcy1jfj2pfhj"; + }) + ] + + # Use shared libraries to decrease size + ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.12-shared_libs-1.patch + + ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch + ; + + postPatch = '' + sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c + ''; makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ] - ++ lib.optionals enableX11 [ libX11 libXext ] - ++ lib.optionals enableCurl [ curl openssl ]; + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] + ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] + ++ lib.optionals enableCurl [ curl openssl ] + ++ lib.optionals enableGL ( + if stdenv.isDarwin then + with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] + else + [ freeglut libGLU ]) + ; outputs = [ "bin" "dev" "out" "man" "doc" ]; preConfigure = '' @@ -105,6 +146,6 @@ stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; maintainers = with maintainers; [ viric vrthra fpletz ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/mupdf/default.upstream b/pkgs/applications/misc/mupdf/default.upstream index 07cafdb0c2a410ecf02cd34df714b6585fcb3c32..852233633ca57a7063c18d61c1cf447831b74a51 100644 --- a/pkgs/applications/misc/mupdf/default.upstream +++ b/pkgs/applications/misc/mupdf/default.upstream @@ -1,4 +1,4 @@ -url http://mupdf.com/downloads/archive/ +url https://mupdf.com/downloads/archive/ do_overwrite(){ ensure_hash ensure_version diff --git a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch new file mode 100644 index 0000000000000000000000000000000000000000..b39f005ed74a179f008498347fe56989ff55c5ee --- /dev/null +++ b/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch @@ -0,0 +1,41 @@ +--- mupdf-1.12.0-source.orig/Makefile 2017-12-13 15:00:30.000000000 +0100 ++++ mupdf-1.12.0-source/Makefile 2017-12-31 00:05:23.003277481 +0100 +@@ -14,7 +14,7 @@ + # Do not specify CFLAGS or LIBS on the make invocation line - specify + # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that + # set a variable that was set on the command line. +-CFLAGS += $(XCFLAGS) -Iinclude ++CFLAGS += $(XCFLAGS) -Iinclude -fPIC + LIBS += $(XLIBS) -lm + + LIBS += $(FREETYPE_LIBS) +@@ -312,9 +312,9 @@ + + # --- Library --- + +-MUPDF_LIB = $(OUT)/libmupdf.a +-THIRD_LIB = $(OUT)/libmupdfthird.a +-THREAD_LIB = $(OUT)/libmuthreads.a ++MUPDF_LIB = $(OUT)/libmupdf.so ++THIRD_LIB = $(OUT)/libmupdfthird.so ++THREAD_LIB = $(OUT)/libmuthreads.so + + MUPDF_OBJ := \ + $(FITZ_OBJ) \ +@@ -343,11 +343,14 @@ + + THREAD_OBJ := $(THREAD_OBJ) + +-$(MUPDF_LIB) : $(MUPDF_OBJ) ++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB) ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined + $(THIRD_LIB) : $(THIRD_OBJ) ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined + $(THREAD_LIB) : $(THREAD_OBJ) ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread + +-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) ++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) + + # --- Tools and Apps --- + diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 2faf082197c843323f6f2878a982eb45348eb2d3..02c18109abc23d72033510642597a315b16db216 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.3"; + version = "0.7.4"; name = "mwic-${version}"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; - sha256 = "0baa2pnaba954k169p9rpzc66mhz9zqdd3lz9q95rp9dgygvchzn"; + sha256 = "0c0xk7wx4vaamlry6srdixw1q6afmqznvxdzcg1skr0qjypw5i5q"; }; makeFlags=["PREFIX=\${out}"]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://jwilk.net/software/mwic; description = "spell-checker that groups possible misspellings and shows them in their contexts"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index e8c6c9f24300b649b54360971a1b5a617a9b05ed..76517f874642209246276cfa15258c355e563385 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, glibc, gnome_keyring, gtk, gtkmm, pcre, swig, sudo +, glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo , mysql, libxml2, libctemplate, libmysqlconnectorcpp , vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs -, libXdmcp, libuuid, libzip, libgnome_keyring, file +, libXdmcp, libuuid, libzip, libgnome-keyring, file , pythonPackages, jre, autoconf, automake, libtool , boost, glibmm, libsigcxx, pangomm, libX11, openssl , proj, cairo, libglade @@ -21,9 +21,9 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo + buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file - libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf + libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl proj cairo cairo.dev makeWrapper libglade ] ; @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/mysql-workbench" \ --prefix LD_LIBRARY_PATH : "${python}/lib" \ --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ - --prefix PATH : "${gnome_keyring}/bin" \ + --prefix PATH : "${gnome-keyring}/bin" \ --prefix PATH : "${python}/bin" \ --set PYTHONPATH $PYTHONPATH \ --run ' diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 51b29a5c04c44db096e79621f237c1ed1bc00445..92269e03e58d48a4dd11964d87ec6dc603097ffc 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, +{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined, libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: stdenv.mkDerivation rec { name = "navit-svn-3537"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image mesa + buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ]; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix index 74e7c694ea462ae6ac07c8f99fa855a25b9eede0..f25180505e87c86ad2f108295bde6b545b8e30c9 100644 --- a/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "netsurf-buildsystem-${version}"; - version = "1.5"; + version = "1.6"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz"; - sha256 = "0wdgvasrjik1dgvvpqbppbpyfzkqd1v45x3g9rq7p67n773azinv"; + sha256 = "0p5k708lcq8dip9xxck6hml32bjrbyipprm22bbsvdnsc0pqm71x"; }; makeFlags = [ diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix index 02bb593ce71053314861e10a3cfb8df4029d877b..e97452249bcf14e2f05462a7b7a668c96c03e52d 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; + NIX_CFLAGS_COMPILE=[ "-Wno-error=implicit-fallthrough" ]; + meta = with stdenv.lib; { homepage = http://www.netsurf-browser.org/; description = "Cascading Style Sheets library for netsurf browser"; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4ac152c26694511a51e1640057812f1bdb70844a --- /dev/null +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -0,0 +1,43 @@ +{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}: + +mkDerivation rec { + name = "nixnote2-${version}"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "baumgarr"; + repo = "nixnote2"; + rev = "v${version}"; + sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; + }; + + buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake ]; + + postPatch = '' + # Fix location of poppler-qt5.h + for f in threads/indexrunner.cpp html/noteformatter.cpp utilities/noteindexer.cpp gui/plugins/popplerviewer.h gui/plugins/pluginfactory.h gui/plugins/popplerviewer.cpp ; do + substituteInPlace $f \ + --replace '#include ' '#include ' + done + + substituteInPlace help/about.html --replace '__VERSION__' '${version}' + + substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' + ''; + + postInstal = '' + cp images/windowIcon.png $out/share/pixmaps/nixnote2.png + ''; + + meta = with stdenv.lib; { + description = "An unofficial client of Evernote"; + homepage = http://www.nixnote.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ htr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index a2e96593ae2ef6eda24bac281df0a33e624496c5..ae1c178e5716a0e0c8fa2b9a6d7f86e5633d6a92 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "10gcbklh0cp12293lzlwcplj0in90p95x4fyvg1smg4cxamkibvn"; + sha256 = "03cgsdj4l19gla5fx9d1ydqirpsah9d7gx9jaik73x38zqsabr89"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 2aa04ce83e536ae0b9e4a2a7a10f582e798fd715..8e8126192ddaf2fb9c97a3a16602a8a709b21612 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus_glib, makeWrapper, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "notify-osd-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib libwnck3 libnotify dbus_glib makeWrapper - gnome3.gsettings_desktop_schemas + glib libwnck3 libnotify dbus-glib makeWrapper + gnome3.gsettings-desktop-schemas ]; configureFlags = "--libexecdir=$(out)/bin"; diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..69f74d66dd019ce3b2ef0e4471976b9fb14d3284 --- /dev/null +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, + autoconf, automake, libtool, cmake, + rtl-sdr, libao, fftwFloat +} : +let + src_faad2 = fetchFromGitHub { + owner = "dsvensson"; + repo = "faad2"; + rev = "b7aa099fd3220b71180ed2b0bc19dc6209a1b418"; + sha256 = "0pcw2x9rjgkf5g6irql1j4m5xjb4lxj6468z8v603921bnir71mf"; + }; + + version = "1.0"; + +in stdenv.mkDerivation { + name = "nrsc5-${version}"; + + src = fetchFromGitHub { + owner = "theori-io"; + repo = "nrsc5"; + rev = "v${version}"; + sha256 = "09zzh3h1zzf2lwrbz3i7rif2hw36d9ska8irvxaa9lz6xc1y68pg"; + }; + + postUnpack = '' + export srcRoot=`pwd` + export faadSrc="$srcRoot/faad2-prefix/src/faad2_external" + mkdir -p $faadSrc + cp -r ${src_faad2}/* $faadSrc + chmod -R u+w $faadSrc + ''; + + postPatch = '' + sed -i '/GIT_REPOSITORY/d' CMakeLists.txt + sed -i '/GIT_TAG/d' CMakeLists.txt + sed -i "s:set (FAAD2_PREFIX .*):set (FAAD2_PREFIX \"$srcRoot/faad2-prefix\"):" CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake autoconf automake libtool ]; + buildInputs = [ rtl-sdr libao fftwFloat ]; + + cmakeFlags = [ "-DUSE_COLOR=ON" "-DUSE_FAAD2=ON" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/theori-io/nrsc5; + description = "HD-Radio decoder for RTL-SDR"; + platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ markuskowa ]; + }; +} + diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index ad3d72e9ef50eb5de554cdc62dea4fae7e98b768..35931707ed6bed22e6fb9e7a76e065674372be64 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -53,7 +53,7 @@ pythonPackages.buildPythonApplication rec { description = "Open source document analysis and OCR system"; license = licenses.asl20; homepage = https://github.com/tmbdev/ocropy/; - maintainers = with maintainers; [ domenkozar nckx viric ]; + maintainers = with maintainers; [ domenkozar viric ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index a6d40c75c1c004017238f03c4d10b7787a2d245f..ca381e14dd173a62669d6dfc1bb83348ec8add37 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -54,14 +54,13 @@ let in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; - version = "1.3.5"; - # 1.3.5, 2017-10-16, 77753ca02602d3a798d6b0a22535e6fd69ff448a + version = "1.3.6"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "13krv9i6gm4jn4cb327q4qma4xwwashjnc0dia8vlnbjbbvkrni4"; + sha256 = "0pgpkjw5zjnks5bky51gjaksq8mhrzkl52kpgf799hl35pd08xr3"; }; # We need old Tornado @@ -70,7 +69,7 @@ in pythonPackages.buildPythonApplication rec { 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 dateutil futures wrapt + scandir chainmap future dateutil futures wrapt monotonic emoji ]; buildInputs = with pythonPackages; [ nose mock ddt ]; @@ -95,13 +94,16 @@ in pythonPackages.buildPythonApplication rec { -e 's,pyserial>=[^"]*,pyserial,g' \ -e 's,semantic_version>=[^"]*,semantic_version,g' \ -e 's,wrapt>=[^"]*,wrapt,g' \ + -e 's,python-dateutil>=[^"]*,python-dateutil,g' \ + -e 's,emoji>=[^"]*,emoji,g' \ + -e 's,futures>=[^"]*,futures,g' \ setup.py ''; checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = http://octoprint.org/; + homepage = https://octoprint.org/; description = "The snappy web interface for your 3D printer"; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 9db6042e60f6df699f214d69ff442baae3c16518..9e460bf2611a41771ac202b3232b10b20bfa7a11 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ola-${version}"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "OpenLightingProject"; repo = "ola"; rev = version; - sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al"; + sha256 = "1qazhkcakvzkf1dvav0alk33aaklawf8vckgwpf6fvwf7g2kyh63"; }; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A framework for controlling entertainment lighting equipment."; maintainers = [ maintainers.globin ]; - licenses = with licenses; [ lgpl21 gpl2Plus ]; + license = with licenses; [ lgpl21 gpl2Plus ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d4847e4ce493e6022f4955ded00b512473df376d --- /dev/null +++ b/pkgs/applications/misc/onboard/default.nix @@ -0,0 +1,156 @@ +{ fetchurl +, stdenv +, aspellWithDicts +, at-spi2-core ? null +, atspiSupport ? true +, bash +, glib +, glibcLocales +, gnome3 +, gobjectIntrospection +, gsettings-desktop-schemas +, gtk3 +, hunspell +, hunspellDicts +, hunspellWithDicts +, intltool +, isocodes +, libcanberra-gtk3 +, libudev +, libxkbcommon +, pkgconfig +, procps +, python3 +, wrapGAppsHook +, xorg +, yelp +}: + +let + customHunspell = hunspellWithDicts [hunspellDicts.en-us]; + majorVersion = "1.4"; + version = "${majorVersion}.1"; +in python3.pkgs.buildPythonApplication rec { + name = "onboard-${version}"; + src = fetchurl { + url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${name}.tar.gz"; + sha256 = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865"; + }; + + patches = [ + # Allow loading hunspell dictionaries installed in NixOS system path + ./hunspell-use-xdg-datadirs.patch + ]; + + # For tests + LC_ALL = "en_US.UTF-8"; + doCheck = false; + checkInputs = [ + # for Onboard.SpellChecker.aspell_cmd doctests + (aspellWithDicts (dicts: with dicts; [ en ])) + + # for Onboard.SpellChecker.hunspell_cmd doctests + customHunspell + + # for Onboard.SpellChecker.hunspell doctests + hunspellDicts.en-us + hunspellDicts.es-es + hunspellDicts.it-it + + python3.pkgs.nose + ]; + + propagatedBuildInputs = [ + glib + python3 + python3.pkgs.dbus-python + python3.pkgs.distutils_extra + python3.pkgs.pyatspi + python3.pkgs.pycairo + python3.pkgs.pygobject3 + python3.pkgs.systemd + ]; + + buildInputs = [ + bash + gnome3.dconf + gsettings-desktop-schemas + gtk3 + hunspell + isocodes + libcanberra-gtk3 + libudev + libxkbcommon + wrapGAppsHook + xorg.libXtst + xorg.libxkbfile + ] ++ stdenv.lib.optional atspiSupport at-spi2-core; + + nativeBuildInputs = [ + glibcLocales + intltool + pkgconfig + ]; + + propagatedUserEnvPkgs = [ + gnome3.dconf + ]; + + preBuild = '' + # Unnecessary file, has been removed upstream + # https://github.com/NixOS/nixpkgs/pull/24986#issuecomment-296114062 + rm -r Onboard/pypredict/attic + + substituteInPlace ./scripts/sokSettings.py \ + --replace "#!/usr/bin/python3" "" \ + --replace "PYTHON_EXECUTABLE," "\"$out/bin/onboard-settings\"" \ + --replace '"-cfrom Onboard.settings import Settings\ns = Settings(False)"' "" + + chmod -x ./scripts/sokSettings.py + + patchShebangs . + + substituteInPlace ./Onboard/LanguageSupport.py \ + --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \ + --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + + substituteInPlace ./Onboard/Indicator.py \ + --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + + substituteInPlace ./gnome/Onboard_Indicator@onboard.org/extension.js \ + --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + + substituteInPlace ./Onboard/SpellChecker.py \ + --replace "/usr/lib" "$out/lib" + + substituteInPlace ./data/org.onboard.Onboard.service \ + --replace "/usr/bin" "$out/bin" + + substituteInPlace ./Onboard/utils.py \ + --replace "/usr/share" "$out/share" + substituteInPlace ./onboard-defaults.conf.example \ + --replace "/usr/share" "$out/share" + substituteInPlace ./Onboard/Config.py \ + --replace "/usr/share/onboard" "$out/share/onboard" + + substituteInPlace ./Onboard/WordSuggestions.py \ + --replace "/usr/bin" "$out/bin" + + # killall is dangerous on non-gnu platforms. Use pkill instead. + substituteInPlace ./setup.py \ + --replace '"killall",' '"${procps}/bin/pkill", "-x",' + ''; + + postInstall = '' + cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override + + glib-compile-schemas $out/share/glib-2.0/schemas/ + ''; + + meta = { + homepage = https://launchpad.net/onboard; + description = "An onscreen keyboard useful for tablet PC users and for mobility impaired users."; + maintainers = with stdenv.lib.maintainers; [ johnramsden ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch b/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch new file mode 100644 index 0000000000000000000000000000000000000000..2463c8d5f5acdaab52941a9c62d3d5536fe0d084 --- /dev/null +++ b/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch @@ -0,0 +1,20 @@ +diff --git a/Onboard/SpellChecker.py b/Onboard/SpellChecker.py +index 6a92757..46e755e 100644 +--- a/Onboard/SpellChecker.py ++++ b/Onboard/SpellChecker.py +@@ -506,6 +506,10 @@ class hunspell(SCBackend): + if dicpath: + paths.extend(dicpath.split(pathsep)) + ++ datadirs = os.getenv("XDG_DATA_DIRS") ++ if datadirs: ++ paths.extend(map(lambda datadir: os.path.join(datadir, 'hunspell'), datadirs.split(pathsep))) ++ + paths.extend(LIBDIRS) + + home = os.getenv("HOME") +@@ -723,4 +727,3 @@ class aspell_cmd(SCBackend): + _logger.error(_format("Failed to execute '{}', {}", \ + " ".join(args), e)) + return [id for id in dict_ids if id] +- diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..58e80e7f7264ac44043df641188dfc541451601d --- /dev/null +++ b/pkgs/applications/misc/oneko/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, xorg, x11 }: + +stdenv.mkDerivation rec { + version = "1.2.sakura.5"; + vname = "1.2.5"; + name = "oneko-${vname}"; + src = fetchurl { + url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz"; + sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; + }; + buildInputs = [ xorg.imake xorg.gccmakedep x11 ]; + + configurePhase = "xmkmf"; + + installPhase = '' + make install BINDIR=$out/bin + make install.man MANPATH=$out/share/man + ''; + + meta = with stdenv.lib; { + description = "Creates a cute cat chasing around your mouse cursor"; + longDescription = '' + Oneko changes your mouse cursor into a mouse + and creates a little cute cat, which starts + chasing around your mouse cursor. + When the cat is done catching the mouse, it starts sleeping. + ''; + homepage = "http://www.daidouji.com/oneko/"; + license = licenses.publicDomain; + maintainers = [ maintainers.xaverdh ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 4aebd3bb2a96b3fb1f29b4db1b999ddee85f6401..b8b6e42d5cf540785f5638c8c61dbabd82e85531 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, mesa }: +{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU_combined }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { install -Dm644 reference.brf $out/share/openBrf/reference.brf patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \ + --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU_combined ]}" \ $out/share/openBrf/openBrf mkdir -p "$out/bin" diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 3420d6365b4bc46b0a0d2f6a16d6b1514b61a747..1c5fde9353aa073dd464ebd863247d5e53cfd6f7 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "opencpn-${version}"; - version = "4.2.0"; + version = "4.8.2"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; rev = "v${version}"; - sha256 = "1m6fp9lf9ki9444h0dq6bj0vr7d0pcxkbjv3j2v76p0ksk2l8kw3"; + sha256 = "0r6a279xhhf4jrmjb2xi5arxb4xd5wvqbs4hyyildlgpr1x7bd09"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8a941a719f29b9ef956090512a46f6fdacb8fc3f --- /dev/null +++ b/pkgs/applications/misc/opentx/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub +, cmake, gcc-arm-embedded, python +, qt5, SDL, gmock +, dfu-util, avrdude +}: + +let + + version = "2.2.1"; + +in stdenv.mkDerivation { + + name = "opentx-${version}"; + + src = fetchFromGitHub { + owner = "opentx"; + repo = "opentx"; + rev = version; + sha256 = "01lnnkrxach21aivnx1k1iqhih02nixh8c4nk6rpw408p13him9g"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = with qt5; [ + gcc-arm-embedded + python python.pkgs.pyqt4 + qtbase qtmultimedia qttranslations + SDL gmock + ]; + + postPatch = '' + sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' + sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|' + ''; + + cmakeFlags = [ + "-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations" + # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. + #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" + #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" + ]; + + meta = with stdenv.lib; { + description = "OpenTX Companion transmitter support software"; + longDescription = '' + OpenTX Companion is used for many different tasks like loading OpenTX + firmware to the radio, backing up model settings, editing settings and + running radio simulators. + ''; + homepage = https://open-tx.org/; + license = stdenv.lib.licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ elitak ]; + }; + +} diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..109c0afa12d0a11863dafab9b2927f4d43009954 --- /dev/null +++ b/pkgs/applications/misc/orca/default.nix @@ -0,0 +1,73 @@ +{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication +, autoreconfHook, wrapGAppsHook +, intltool, yelp-tools, itstool, libxmlxx3 +, python, pygobject3, gtk3, gnome3, substituteAll +, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg +, xkbcomp, gsettings-desktop-schemas, liblouis +, speechd, brltty, setproctitle, gst_all_1, gst-python +}: + +with lib; +let + pname = "orca"; + version = "3.28.0"; +in buildPythonApplication rec { + name = "${pname}-${version}"; + + format = "other"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1jy2zxs50ah1rg4zgiaj2l2sm1zyyvs37phws0hwmy3xd90ljfc2"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + xkbcomp = "${xkbcomp}/bin/xkbcomp"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 + intltool yelp-tools itstool + ]; + + propagatedBuildInputs = [ + pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle + ]; + + buildInputs = [ + python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; + + # Run intltoolize to create po/Makefile.in.in + preConfigure = '' + intltoolize + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = { + homepage = https://wiki.gnome.org/Projects/Orca; + description = "Screen reader"; + longDescription = '' + A free, open source, flexible and extensible screen reader that provides + access to the graphical desktop via speech and refreshable braille. + It works with applications and toolkits that support the Assistive + Technology Service Provider Interface (AT-SPI). That includes the GNOME + Gtk+ toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and + WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. + + Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. + ''; + maintainers = with maintainers; [ berce ] ++ gnome3.maintainers; + license = licenses.lgpl21; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/orca/fix-paths.patch b/pkgs/applications/misc/orca/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..d3e77773f28f4a747a27c1306c1e099bd532e5c6 --- /dev/null +++ b/pkgs/applications/misc/orca/fix-paths.patch @@ -0,0 +1,29 @@ +--- a/src/orca/orca.py ++++ b/src/orca/orca.py +@@ -239,7 +239,7 @@ + + def _setXmodmap(xkbmap): + """Set the keyboard map using xkbcomp.""" +- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], ++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], + stdin=subprocess.PIPE, stdout=None, stderr=None) + p.communicate(xkbmap) + +@@ -297,7 +297,7 @@ + """ + + global _originalXmodmap +- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-']) ++ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-']) + + def _restoreXmodmap(keyList=[]): + """Restore the original xmodmap values for the keys in keyList. +@@ -309,7 +309,7 @@ + + global _capsLockCleared + _capsLockCleared = False +- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], ++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], + stdin=subprocess.PIPE, stdout=None, stderr=None) + p.communicate(_originalXmodmap) + diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5787adef2a3e8d5d50c17a313f9cb01a7c740ef6 --- /dev/null +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } : + +stdenv.mkDerivation rec { + name = "osm2xmap-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w"; + repo = "osm2xmap"; + owner = "sembruk"; + rev = "v${version}"; + }; + + makeFlags = [ + "GIT_VERSION=$(version)" + "GIT_TIMESTAMP=" + "SHAREDIR=$(out)/share/" + "INSTALL_BINDIR=$(out)/bin" + "INSTALL_MANDIR=$(out)/share/man/man1" + "INSTALL_SHAREDIR=$(out)/share/" + ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + buildInputs = [ libroxml proj libyamlcpp boost ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/sembruk/osm2xmap"; + description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format."; + license = licenses.gpl3; + maintainers = [ maintainers.mpickering ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..46e00a979900a0681ffc0104d3869b5df7610c68 --- /dev/null +++ b/pkgs/applications/misc/overmind/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, tmux, makeWrapper }: + +buildGoPackage rec { + name = "overmind-${version}"; + version = "1.1.1"; + goPackagePath = "github.com/DarthSim/overmind"; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux ]}" + ''; + + src = fetchFromGitHub { + owner = "DarthSim"; + repo = "overmind"; + rev = "v${version}"; + sha256 = "0gdsbm54ln07jv1kgg53fiavx18xxw4f21lfcdl74ijk6bx4jbzv"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/DarthSim/; + description = "Process manager for Procfile-based applications and tmux"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.adisbladis ]; + }; +} diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 060d4899f4c73b6c16db7cca9fc43be67351e1ec..7448b8e6648b927dcb3f63054a74eee8867c2f8f 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: +{ stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: -stdenv.mkDerivation { - name = "pcmanx-gtk2-1.3"; - src = fetchurl { - url = "https://github.com/pcman-bbs/pcmanx/archive/1.3.tar.gz"; - sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; +stdenv.mkDerivation rec { + name = "pcmanx-gtk2-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "pcman-bbs"; + repo = "pcmanx"; + rev = version; + sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -12,6 +16,8 @@ stdenv.mkDerivation { preConfigure = '' ./autogen.sh + # libtoolize generates configure script which uses older version of automake, we need to autoreconf it + cd libltdl; autoreconf; cd .. ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 691f3188b08c59ff92f13a90d168eab1bebdc814..47be9dc8200ec954ea4e9e5d2bfc79c34d3be638 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib +{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib , mono, gtk-sharp-2_0, gnome-sharp, hyena , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp + gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 8e0fc6137210ef98014299bc9da9ec0441646cfa..515127e12ebbe34a24f0599ff576f5e0a9925230 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,19 +1,23 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }: +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobjectIntrospection }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.7"; + version = "4.1"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c"; + sha256 = "02cp0x5prqrizxdp0sf2sk5ip0363vyw6fxsb3zwyx4dw0vz4g96"; }; - nativeBuildInputs = [ cmake pkgconfig vala ]; + nativeBuildInputs = [ + cmake pkgconfig vala + # For setup hook + gobjectIntrospection + ]; buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler libpthreadstubs makeWrapper librsvg pcre ]; diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix index e01956e36119f9cadb16cc966c64ae92c73a0fc6..e06f4407534b6fee8d2185c2d09f1685fb270c58 100644 --- a/pkgs/applications/misc/pdfshuffler/default.nix +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn , wrapGAppsHook, makeWrapper, gettext , python3Packages, gtk3, poppler_gi -, gnome3, gsettings_desktop_schemas, shared_mime_info, +, gnome3, gsettings-desktop-schemas, shared-mime-info, }: python3Packages.buildPythonApplication rec { @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ]; buildInputs = [ - gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme + gtk3 gsettings-desktop-schemas poppler_gi gnome3.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; doCheck = false; # no tests diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix index ad2ab147340ea3c8d64b9cab04520b1efb2c7ad5..d55c7a2af12bbf20a7aca3d0d9a3fa22a2b31f88 100644 --- a/pkgs/applications/misc/pell/default.nix +++ b/pkgs/applications/misc/pell/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { pname = "pell"; - version = "0.0.2"; + version = "0.0.4"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; repo = pname; - rev = "ec14de0a9b666433954184167bf3b82cf21193f8"; - sha256 = "0r2gbb4l9rr5x99m62zicknsp1gf9fr124xpyd8ak9izr5hvskn9"; + rev = "f251625ece6bb5517227970287119e7d2dfcea8b"; + sha256 = "0k8m1lv2kyrs8fylxmbgxg3jn65g57frf2bndc82gkr5svwb554a"; }; installPhase = '' mkdir -p $out/bin mkdir -p $out/share cp pell $out/bin - cp resources/notification.mp3 $out/share + cp resources/online.mp3 $out/share + cp resources/offline.mp3 $out/share chmod +x $out/bin/pell ''; @@ -24,7 +25,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/pell --replace "/usr/bin/env scsh" "${scsh}/bin/scsh" substituteInPlace $out/bin/pell --replace "(play " "(${sox}/bin/play " substituteInPlace $out/bin/pell --replace "(notify-send " "(${libnotify}/bin/notify-send " - substituteInPlace $out/bin/pell --replace "/usr/share/pell/notification.mp3" "$out/share/notification.mp3" + substituteInPlace $out/bin/pell --replace "/usr/share/pell/online.mp3" "$out/share/online.mp3" + substituteInPlace $out/bin/pell --replace "/usr/share/pell/offline.mp3" "$out/share/offline.mp3" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..746a319c2e1e11a7d3a325ab9b55f1ea9d47efca --- /dev/null +++ b/pkgs/applications/misc/perkeep/default.nix @@ -0,0 +1,72 @@ +{ stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }: + +# When perkeep is updated all deps in the let block should be removed +let + gopherjs = fetchFromGitHub { + owner = "gopherjs"; + repo = "gopherjs"; + # Rev matching https://github.com/perkeep/perkeep/commit/2e46fca5cc1179dbd90bec49fec3870e6eca6c45 + rev = "b40cd48c38f9a18eb3db20d163bad78de12cf0b7"; + sha256 = "0kniz8dg5bymb03qriizza1h3gpymf97vsgq9vd222282pdj0vyc"; + }; + + gotool = fetchFromGitHub { + owner = "kisielk"; + repo = "gotool"; + rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + + gcimporter15 = fetchgit { + url = "https://go.googlesource.com/tools"; + rev = "f8f2f88271bf2c23f28a09d288d26507a9503c97"; + sha256 = "1pchwizx1sdli59g8r0p4djfjkchcvh8msfpp3ibvz3xl250jh0n"; + }; + +in +stdenv.mkDerivation rec { + name = "perkeep-${version}"; + version = "20170505"; + + src = fetchzip { + url = "https://perkeep.org/dl/monthly/camlistore-${version}-src.zip"; + sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa"; + }; + + # When perkeep is updated postPatch should be removed + postPatch = '' + rm -r ./vendor/github.com/gopherjs/gopherjs/ + cp -a ${gopherjs} ./vendor/github.com/gopherjs/gopherjs + mkdir -p ./vendor/github.com/kisielk/ + cp -a ${gotool} ./vendor/github.com/kisielk/gotool + mkdir -p ./vendor/golang.org/x/tools/go + cp -a ${gcimporter15}/go/gcimporter15 ./vendor/golang.org/x/tools/go/gcimporter15 + + substituteInPlace vendor/github.com/gopherjs/gopherjs/build/build.go \ + --replace '"github.com/fsnotify/fsnotify"' 'fsnotify "camlistore.org/pkg/misc/fakefsnotify"' + + substituteInPlace ./make.go \ + --replace "goVersionMinor = '8'" "goVersionMinor = '9'" \ + --replace "gopherJSGoMinor = '8'" "gopherJSGoMinor = '9'" + ''; + + buildInputs = [ git go ]; + + goPackagePath = ""; + buildPhase = '' + go run make.go + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; + + meta = with stdenv.lib; { + description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; + homepage = https://perkeep.org; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index fd66ce8fc31cf644bc35d12fb936809fed5b7559..7da71df7814cb2e80e4c7510f34f3715cd745e82 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,15 +2,23 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.0.2"; + version = "10.1.1"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a"; + sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc"; }; + patchPhase = '' + patchShebangs src/configure + ''; + + configurePhase = '' + ./configure --prefix $out + ''; + buildInputs = [ postgresql openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 6d0a348b1f76e9ce1a1d8f8b3955d1d23e5c4ec2..1085fed0956531fadc236f5bcfffdb8b0e77614b 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { # homepage needed you to login to download the tarball - url = "http://pkgs.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2" + url = "http://src.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2" + "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2"; sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j"; }; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 3f39a356312eb76675b427e02ae413e0071117ff..9fb15aab2d450e03ec6849457d6e9b077c10dfb8 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -48,9 +48,9 @@ let ld32 = if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" - else abort "Unsupported platform for PlayOnLinux: ${stdenv.system}"; + else throw "Unsupported platform for PlayOnLinux: ${stdenv.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; - libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ]; + libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xorg.libX11 ]; in stdenv.mkDerivation { name = "playonlinux-${version}"; diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index 2472b05a2e0b730cbf8150f334bdf9165646df18..b14bb445b5d1d01a35961e45bf1a4cf654c94eb2 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmenu-${version}"; - version = "2017-04-10"; + version = "2018-01-01"; src = fetchFromGitLab { owner = "o9000"; repo = "pmenu"; - rev = "87fec9ddf594f1046d03348de2bafcfa6e94cfd1"; - sha256 = "0ynhml46bi5k52v7fw2pjpcac9dswkmlvh6gynvnyqjp4p153fl4"; + rev = "f98a5bdf20deb0b7f0543e5ce6a8f5574f695e07"; + sha256 = "131nqafbmbfpgsgss27pz4cyb9fb29m5h1ai1fyvcn286rr9dnp2"; }; nativeBuildInputs = [ python2Packages.wrapPython ]; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index e88a49740745bce341d09ab0117b050105249c61..a3b87fd34f6829686f170c13e087ccba15f1d92c 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.5"; + version = "3.1.0"; src = fetchgit { url = "https://github.com/jaagr/polybar"; - rev = "4e2e2a7a5e0fe81669031ade0f60e1d379b6516d"; - sha256 = "1iiks9q13pbkgbjhdns18a5zgr6d40ydcm4qn168m73fs6ivf1vn"; + rev = "bf16a4d415ea7d8845f578544de0c71e56ad314e"; + sha256 = "1jcvqxl0477j0snvh1rzqsm1dkfsybix2lgrlsgiczdxfknwz8iy"; }; meta = with stdenv.lib; { @@ -39,14 +39,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.afldcr ]; platforms = platforms.unix; }; - # This patch should be removed with next stable release. - patches = [ - (fetchpatch { - name = "polybar-remove-curlbuild.patch"; - url = "https://github.com/jaagr/polybar/commit/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch"; - sha256 = "14xr65vsjvd51hzg9linj09w0nnixgn26dh9lqxy25bxachcyzxy"; - }) - ]; buildInputs = [ cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 1347840ee674cedcb21ca25ce4ae5a5c21bd8a02..6cb00fb1525c91b2d6a18932fb10a9bd370799d4 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = http://posterazor.sourceforge.net/; description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ stdenv.lib.maintainers.madjar ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index b62c6b77cac3043403c8de31b2e5b507c6aae84b..cd3a46ab09ba8d892dd3fc215587c7a07129d3e9 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -3,7 +3,14 @@ stdenv.mkDerivation { name = "procmail-3.22"; - patches = [ ./CVE-2014-3618.patch ]; + patches = [ + ./CVE-2014-3618.patch + (fetchurl { + url = https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30; + sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq"; + name = "CVE-2017-16844"; + }) + ]; # getline is defined differently in glibc now. So rename it. # Without the .PHONY target "make install" won't install anything on Darwin. diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5ba8e1b6e3134dc723ddd436a38d1e509adc1b42 --- /dev/null +++ b/pkgs/applications/misc/projectlibre/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }: + +stdenv.mkDerivation rec { + name = "projectlibre-${version}"; + version = "1.7.0"; + + src = fetchgit { + url = "https://git.code.sf.net/p/projectlibre/code"; + rev = "0c939507cc63e9eaeb855437189cdec79e9386c2"; # version 1.7.0 was not tagged + sha256 = "0vy5vgbp45ai957gaby2dj1hvmbxfdlfnwcanwqm9f8q16qipdbq"; + }; + + buildInputs = [ ant jdk makeWrapper ]; + buildPhase = '' + export ANT_OPTS=-Dbuild.sysclasspath=ignore + ${ant}/bin/ant -f openproj_build/build.xml + ''; + + resourcesPath = "openproj_build/resources"; + desktopItem = "${resourcesPath}/projectlibre.desktop"; + + installPhase = '' + mkdir -p $out/share/{applications,projectlibre/samples,pixmaps,doc/projectlibre} $out/bin + + substitute $resourcesPath/projectlibre $out/bin/projectlibre \ + --replace "\"/usr/share/projectlibre\"" "\"$out/share/projectlibre\"" + chmod +x $out/bin/projectlibre + wrapProgram $out/bin/projectlibre \ + --prefix PATH : "${jre}/bin:${coreutils}/bin:${which}/bin" + + cp -R openproj_build/dist/* $out/share/projectlibre + cp -R openproj_build/license $out/share/doc/projectlibre + cp $desktopItem $out/share/applications + cp $resourcesPath/projectlibre.png $out/share/pixmaps + cp -R $resourcesPath/samples/* $out/share/projectlibre/samples + ''; + + meta = with stdenv.lib; { + homepage = "http://www.projectlibre.com/"; + description = "Project-Management Software similar to MS-Project"; + maintainers = [ maintainers.Mogria ]; + license = licenses.cpal10; + }; +} diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index a13f2bef0c65d043e2329db5ef557c2adfa32b8a..556889e126c035475d0421987c2291103e9c89b7 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Show the set of running processes as a tree"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index abb1fb596fac56f2f3248eb09a513ceed57a2015..af74ea570ab36cb81ba9799230bd50798f1ee31b 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://wpitchoune.net/ptask/; description = "GTK-based GUI for taskwarrior"; license = licenses.gpl2; - maintainer = [ maintainers.spacefrogg ]; + maintainers = [ maintainers.spacefrogg ]; }; } diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index ecc4c341a686707b2c9688b5d315b52680e6b540..dcbd14198f766702c5332b7a14b857ea907b5806 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, perl, python2Packages, sqlite, gpsbabel +{ stdenv, fetchFromGitHub, perl, python, sqlite, gpsbabel , withWebKit ? false }: let # Pytrainer needs a matplotlib with GTK backend. Also ensure we are # using the pygtk with glade support as needed by pytrainer. - matplotlibGtk = python2Packages.matplotlib.override { + matplotlibGtk = python.pkgs.matplotlib.override { enableGtk2 = true; - pygtk = python2Packages.pyGtkGlade; + pygtk = python.pkgs.pyGtkGlade; }; in -python2Packages.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { name = "pytrainer-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "pytrainer"; repo = "pytrainer"; rev = "v${version}"; - sha256 = "1x4f1ydjql0aisvxs5kyi9lx35b4q3768dx42fyzq1nxdwzaqyvy"; + sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581"; }; namePrefix = ""; @@ -35,8 +35,13 @@ python2Packages.buildPythonApplication rec { ./pytrainer-webkit.patch ]; - propagatedBuildInputs = with python2Packages; [ - dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate + postPatch = '' + substituteInPlace ./setup.py \ + --replace "'mysqlclient'," "" + ''; + + propagatedBuildInputs = with python.pkgs; [ + dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy sqlalchemy_migrate psycopg2 ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ]; buildInputs = [ perl gpsbabel sqlite ]; @@ -45,6 +50,10 @@ python2Packages.buildPythonApplication rec { dontPatchELF = true; dontStrip = true; + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + meta = with stdenv.lib; { homepage = https://github.com/pytrainer/pytrainer/wiki; description = "Application for logging and graphing sporting excursions"; diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch index 359e28c41c34f4ec9d1e15238f6a264e6c618aa1..761064077a98aaf65f1732565940f962aa1ade41 100644 --- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch +++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch @@ -1,7 +1,7 @@ -diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py ---- pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py 1980-01-02 00:00:00.000000000 +0100 -+++ pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py 2017-09-30 18:56:43.127016847 +0200 -@@ -69,7 +69,7 @@ class ActivityTest(unittest.TestCase): +diff -Nurp source.orig/pytrainer/test/core/test_activity.py source/pytrainer/test/core/test_activity.py +--- source.orig/pytrainer/test/core/test_activity.py 2018-02-27 22:15:32.078243354 +0100 ++++ source/pytrainer/test/core/test_activity.py 2018-02-27 22:16:33.936867052 +0100 +@@ -92,7 +92,7 @@ class ActivityTest(unittest.TestCase): self.assertEquals(self.activity.time, self.activity.duration) def test_activity_starttime(self): @@ -10,10 +10,10 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1 def test_activity_time_tuple(self): self.assertEquals(self.activity.time_tuple, (2, 3, 46)) -diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py ---- pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py 1980-01-02 00:00:00.000000000 +0100 -+++ pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py 2017-09-30 18:55:45.078128980 +0200 -@@ -23,7 +23,7 @@ class GarminTCXv2Test(unittest.TestCase) +diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrainer/test/imports/test_garmintcxv2.py +--- source.orig/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:15:32.079243364 +0100 ++++ source/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:17:10.778333751 +0100 +@@ -39,7 +39,7 @@ class GarminTCXv2Test(unittest.TestCase) self.fail() def test_workout_summary(self): @@ -22,9 +22,18 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrai try: current_path = os.path.dirname(os.path.abspath(__file__)) data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/" -diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py ---- pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py 1980-01-02 00:00:00.000000000 +0100 -+++ pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py 2017-09-30 18:56:23.448720166 +0200 +@@ -52,7 +52,7 @@ class GarminTCXv2Test(unittest.TestCase) + self.fail() + + def test_summary_in_database(self): +- summary = [(0, True, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')] ++ summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] + activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1') + self.ddbb.session.add(activity) + self.ddbb.session.commit() +diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py +--- source.orig/pytrainer/test/lib/test_date.py 2018-02-27 22:15:32.079243364 +0100 ++++ source/pytrainer/test/lib/test_date.py 2018-02-27 22:16:33.936867052 +0100 @@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase def test_getDateTime(self): utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 60a8cf2c6cd17fda2c2bb96f6e34f017547a98e8..e162d0d317f7f89830b61bf57caf64ea31aa8884 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { name = "qlcplus-${version}"; - version = "4.11.0"; + version = "4.11.1"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "0a45ww341yjx9k54j5s8b5wj83rgbwxkdvgy0v5jbbdf9m78ifrg"; + sha256 = "0lb1mdp7kbnkja14phgyknr65irwkxcmzk96rqacysvwrvzvfzyd"; }; nativeBuildInputs = [ qmake pkgconfig ]; @@ -34,5 +34,6 @@ mkDerivation rec { maintainers = [ maintainers.globin ]; license = licenses.asl20; platforms = platforms.all; + homepage = "http://www.qlcplus.org/"; }; } diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index 7330dfa4f1998080395821d1403582d38dad8996..3b9e76aee4b85cc08f056e73cf42b2fe999bcadb 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchFromBitbucket, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }: +{ stdenv, fetchurl, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }: stdenv.mkDerivation rec { name = "qmapshack-${version}"; - version = "1.9.1"; + version = "1.11.1"; - src = fetchFromBitbucket { - owner = "maproom"; - repo = "qmapshack"; - rev = "V%20${version}"; - sha256 = "1yswdq1s9jjhwb3wfiy3kkiiaqzagw28vjqvl13jxcnmq7y763sr"; + src = fetchurl { + url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; + sha256 = "0yqilfldmfw8m18jbkffv4ar1px6kjs0zlgb216bnhahcr1y8r9y"; }; nativeBuildInputs = [ cmake ]; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home; description = "Plan your next outdoor trip"; license = licenses.gpl3; - maintainter = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix index 932d8156a79affadd9f18a9d196630dfa1b06f7e..49993f2f7ea7515e0a991872a5bd25eee8ce70ba 100644 --- a/pkgs/applications/misc/qmetro/default.nix +++ b/pkgs/applications/misc/qmetro/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Worldwide transit maps viewer"; license = licenses.gpl3; - maintainter = with maintainers; [ orivej ]; + maintainers = with maintainers; [ orivej ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index bc909742c6df9f9e70fc21c0e4f3658fe406e826..6ae8f380fe28bacd574e40dbd24b48631aa15b77 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,8 +1,9 @@ -{ mkDerivation, stdenv, lib, fetchFromGitHub, procps ? null +{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps , qtbase, qtwebengine, qtwebkit , cmake -, syncthing, syncthing-inotify ? null -, preferQWebView ? false }: +, syncthing +, preferQWebView ? false +, preferNative ? true }: mkDerivation rec { version = "0.5.8"; @@ -16,17 +17,23 @@ mkDerivation rec { }; buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit; + nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"; + cmakeFlags = [ ] + ++ lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1" + ++ lib.optional preferNative "-DQST_BUILD_NATIVEBROWSER=1"; - patches = [ ./qsyncthingtray-0.5.8-qt-5.6.3.patch ]; + patches = [ (fetchpatch { + name = "support_native_browser.patch"; + url = "https://patch-diff.githubusercontent.com/raw/sieren/QSyncthingTray/pull/225.patch"; + sha256 = "0w665xdlsbjxs977pdpzaclxpswf7xys1q3rxriz181lhk2y66yy"; + }) ] ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch; 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' ''} @@ -60,6 +67,8 @@ mkDerivation rec { 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; + # but qt > 5.6 works when only using the native browser + # https://github.com/sieren/QSyncthingTray/issues/223 + broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative); }; } diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 3a2ec62222f02c9d3640771252b74f05b9f89106..90908c67b4e0cacb55a31d89daf995b4e0d6efe0 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, qt5 }: let - version = "1.10.01"; + version = "1.40.13"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; src = fetchurl { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; - sha256 = "0pgj8rsk9yxvls7yjpzblzbci2vvd0mlf9c7wdbjhwf6qyi7dfi3"; + sha256 = "0d6b9ls742nghzg5y97dx7myvv8i88f0s27lhr52yy4833hdxdwn"; }; buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index d300e411c94266f81312ee488800455c28ff07af..e03dd65b9eb372cf9d5dbb357e24d16f0a600431 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -2,32 +2,29 @@ stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "1.1.6"; + version = "1.2.1"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "0jq5a1cvqvsjwld0nldl6kmcz9g59hiccmbg98xwji04n8174y7j"; + sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8"; }; + patches = [ ./hidpi.patch ]; + buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; nativeBuildInputs = [ makeWrapper qmake ]; - preConfigure = '' - qmakeFlags="$qmakeFlags DESTDIR=$out" - ''; - - installPhase = '' - mkdir $out/bin - mv $out/qtpass $out/bin - install -D {,$out/share/applications/}qtpass.desktop - install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg - runHook postInstall + postPatch = '' + substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main" + substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src" ''; postInstall = '' + install -D qtpass.desktop $out/share/applications/qtpass.desktop + install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg wrapProgram $out/bin/qtpass \ --suffix PATH : ${git}/bin \ --suffix PATH : ${gnupg}/bin \ diff --git a/pkgs/applications/misc/qtpass/hidpi.patch b/pkgs/applications/misc/qtpass/hidpi.patch new file mode 100644 index 0000000000000000000000000000000000000000..629bcbb5baca8084d9d1317c6047f3625781dfda --- /dev/null +++ b/pkgs/applications/misc/qtpass/hidpi.patch @@ -0,0 +1,13 @@ +diff --git a/main/main.cpp b/main/main.cpp +index 8a18409c..1cddd911 100644 +--- a/main/main.cpp ++++ b/main/main.cpp +@@ -35,7 +35,7 @@ + * @return + */ + int main(int argc, char *argv[]) { +- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); ++ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QString text = ""; + for (int i = 1; i < argc; ++i) { + if (i > 1) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index f3198085b9abc6da73113b95fc0f76a1473c3c2e..b13bc4cb7af24ce99e6ca7481fcdca5347eec9cb 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, file, less +{ stdenv, fetchFromGitHub, pythonPackages, file, less , imagePreviewSupport ? true, w3m ? null}: with stdenv.lib; @@ -6,18 +6,14 @@ with stdenv.lib; assert imagePreviewSupport -> w3m != null; pythonPackages.buildPythonApplication rec { - name = "ranger-1.8.1"; - - meta = { - description = "File manager with minimalistic curses interface"; - homepage = http://ranger.nongnu.org/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - }; - - src = fetchurl { - url = "http://ranger.nongnu.org/${name}.tar.gz"; - sha256 = "1d11qw0mr9aj22a7nhr6p2c3yzf359xbffmjsjblq44bjpwzjcql"; + name = "ranger-${version}"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "ranger"; + repo = "ranger"; + rev = "v${version}"; + sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj"; }; checkInputs = with pythonPackages; [ pytest ]; @@ -50,4 +46,11 @@ pythonPackages.buildPythonApplication rec { --replace "set preview_images false" "set preview_images true" \ ''; + meta = with stdenv.lib; { + description = "File manager with minimalistic curses interface"; + homepage = http://ranger.github.io/; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.magnetophon ]; + }; } diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 59d22b967b57db77fea780ac749c42ee5fdfd3f0..7a4348260fd38135d0847867f3c0e67a088e097c 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchgit, pkgconfig , libssh2 +{ stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols -, qtsvg, qttools, qtquick1 +, qtsvg, qttools, qtquick1, qtcharts , qmake }: @@ -15,30 +15,31 @@ in stdenv.mkDerivation rec { name = "redis-desktop-manager-${version}"; - version = "0.8.3"; + version = "0.9.1"; src = fetchgit { url = "https://github.com/uglide/RedisDesktopManager.git"; fetchSubmodules = true; rev = "refs/tags/${version}"; - sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr"; + sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f"; }; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats - qtquick1 qtquickcontrols qtsvg qttools + qtquick1 qtquickcontrols qtsvg qttools qtcharts ]; dontUseQmakeConfigure = true; + # Disable annoying update reminder + postPatch = '' + sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp + ''; + buildPhase = '' srcdir=$PWD - substituteInPlace src/resources/qml/ValueTabs.qml \ - --replace "import QtQuick.Controls 1.4" \ - "import QtQuick.Controls 1.2" - cat < src/version.h #ifndef RDM_VERSION #define RDM_VERSION "${version}-120" @@ -71,7 +72,7 @@ EOF meta = with lib; { description = "Cross-platform open source Redis DB management tool"; - homepage = http://redisdesktop.com/; + homepage = https://redisdesktop.com/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/misc/redshift/575.patch b/pkgs/applications/misc/redshift/575.patch new file mode 100644 index 0000000000000000000000000000000000000000..d731d8ec43ad4a987a5c2dcb98fc834489187c3d --- /dev/null +++ b/pkgs/applications/misc/redshift/575.patch @@ -0,0 +1,51 @@ +From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001 +From: Yegor Timoshenko +Date: Tue, 16 Jan 2018 11:43:46 +0000 +Subject: [PATCH] Fix Autoconf script + +gettext/intltool macros are not used correctly, see: +https://bugs.launchpad.net/inkscape/+bug/1418943 +--- + bootstrap | 6 +----- + configure.ac | 5 +---- + 2 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/bootstrap b/bootstrap +index 0599cf5..40b1dca 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -1,7 +1,3 @@ + #!/bin/sh + +-# change to root directory +-cd $(dirname "$0") +- +-autopoint --force && \ +- AUTOPOINT="intltoolize --automake --copy" autoreconf --force --install --verbose ++autoreconf --force --install && intltoolize +diff --git a/configure.ac b/configure.ac +index be0b51a..a2e7c42 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,7 @@ AC_PROG_OBJC # For macOS support modules + AC_LANG([C]) + + AC_PROG_INTLTOOL([0.50]) ++AC_SUBST(LIBINTL) + + AC_CANONICAL_HOST + +@@ -51,10 +52,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ + ]) + AC_LANG_POP([Objective C]) + +-# Checks for libraries. +-AM_GNU_GETTEXT_VERSION([0.17]) +-AM_GNU_GETTEXT([external]) +- + GETTEXT_PACKAGE=redshift + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) +-- +2.15.1 + diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 3fe0503d7f9d1c39f2660ce9972a714e19254af7..b7ab092bbc040208726b1da22282a3b3c69daed5 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,68 +1,65 @@ -{ fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig -, geoclue2 -, guiSupport ? true, hicolor_icon_theme, librsvg, gtk3, python, pygobject3, pyxdg -, drmSupport ? true, libdrm -, randrSupport ? true, libxcb -, vidModeSupport ? true, libX11, libXxf86vm -}: +{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool +, libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection +, gtk3, python, pygobject3, pyxdg, libdrm, libxcb, hicolor-icon-theme }: -let - mkFlag = flag: name: if flag - then "--enable-${name}" - else "--disable-${name}"; -in stdenv.mkDerivation rec { name = "redshift-${version}"; version = "1.11"; - src = fetchurl { - sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh"; - url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"; + src = fetchFromGitHub { + owner = "jonls"; + repo = "redshift"; + rev = "v${version}"; + sha256 = "0jfi4wqklqw2rm0r2xwalyzir88zkdvqj0z5id0l5v20vsrfiiyj"; }; - buildInputs = [ geoclue2 ] - ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme librsvg gtk3 - python pygobject3 pyxdg ] - ++ stdenv.lib.optionals drmSupport [ libdrm ] - ++ stdenv.lib.optionals randrSupport [ libxcb ] - ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ]; - nativeBuildInputs = [ gettext intltool makeWrapper pkgconfig ]; + patches = [ + # https://github.com/jonls/redshift/pull/575 + ./575.patch + ]; - configureFlags = [ - (mkFlag guiSupport "gui") - (mkFlag drmSupport "drm") - (mkFlag randrSupport "randr") - (mkFlag vidModeSupport "vidmode") + nativeBuildInputs = [ + autoconf + automake + gettext + intltool + libtool + pkgconfig + wrapGAppsHook + wrapPython ]; - enableParallelBuilding = true; + buildInputs = [ + geoclue2 + gobjectIntrospection + gtk3 + libdrm + libxcb + python + hicolor-icon-theme + ]; + + pythonPath = [ pygobject3 pyxdg ]; - preInstall = stdenv.lib.optionalString guiSupport '' - substituteInPlace src/redshift-gtk/redshift-gtk \ - --replace "/usr/bin/env python3" "${python}/bin/${python.executable}" - ''; - postInstall = stdenv.lib.optionalString guiSupport '' - wrapProgram "$out/bin/redshift-gtk" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share" + preConfigure = "./bootstrap"; - install -Dm644 {.,$out/share/doc/redshift}/redshift.conf.sample - ''; + postFixup = "wrapPythonPrograms"; + + enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Gradually change screen color temperature"; + description = "Screen color temperature manager"; longDescription = '' - The color temperature is set according to the position of the - sun. A different color temperature is set during night and - daytime. During twilight and early morning, the color - temperature transitions smoothly from night to daytime - temperature to allow your eyes to slowly adapt. + Redshift adjusts the color temperature according to the position + of the sun. A different color temperature is set during night and + daytime. During twilight and early morning, the color temperature + transitions smoothly from night to daytime temperature to allow + your eyes to slowly adapt. At night the color temperature should + be set to match the lamps in your room. ''; license = licenses.gpl3Plus; homepage = http://jonls.dk/redshift; platforms = platforms.linux; - maintainers = with maintainers; [ mornfall nckx ]; - }; + maintainers = with maintainers; [ yegortimoshenko ]; + }; } diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c1b1cfb48a281d0a96975588a840c2794ed789a0 --- /dev/null +++ b/pkgs/applications/misc/regextester/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchFromGitHub +, gettext +, libxml2 +, pkgconfig +, gtk3 +, granite +, gnome3 +, cmake +, ninja +, vala +, elementary-cmake-modules +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "regextester-${version}"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "artemanufrij"; + repo = "regextester"; + rev = version; + sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n"; + }; + + XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ + "${granite}/share" + "${gnome3.libgee}/share" + ]; + + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + vala + cmake + ninja + gettext + libxml2 + elementary-cmake-modules + ]; + buildInputs = [ + gtk3 + granite + gnome3.libgee + ]; + + meta = with stdenv.lib; { + description = "A desktop application to test regular expressions interactively"; + homepage = https://github.com/artemanufrij/regextester; + maintainers = with maintainers; [ samdroid-apps ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 8b93dd51406b3087dad5cfd2c3d69a8cfb449a9c..57cdfd08d5b024b5faddd34322d4431950d14e93 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,39 +5,32 @@ let if stdenv.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "0nkbi05pr5kznj4vjqhsrxcqdmjdf2zsbirslxgm4jbh87skl6fm"; + sha256 = "06q1jwqsrjvlj820dd4vl80jznwafsqshsg0p6si8qx4721blryz"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "1xjwaqz0gs12ndgw7c2f1nkvj0nqcl0bxhd54pwk0dwrx9pn9avz"; + sha256 = "0b56iglg8g45biddwsdn1hmx9gsz4kxr64civwyy7f69f022ppab"; }; - -in - -stdenv.mkDerivation { +in stdenv.mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.9.11.1300"; + name = "rescuetime-2.10.0.1322"; inherit src; buildInputs = [ dpkg makeWrapper ]; + # avoid https://github.com/NixOS/patchelf/issues/99 + dontStrip = true; unpackPhase = '' mkdir pkg dpkg-deb -x $src pkg sourceRoot=pkg ''; - installPhase = let - - lib = p: stdenv.lib.makeLibraryPath [ p ]; - - in '' + installPhase = '' mkdir -p $out/bin cp usr/bin/rescuetime $out/bin ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${lib.makeLibraryPath [ qt4 libXtst libXext libX11 libXScrnSaver ]}" \ $out/bin/rescuetime - - wrapProgram $out/bin/rescuetime \ - --prefix LD_PRELOAD : ${lib qt4}/libQtGui.so.4:${lib qt4}/libQtCore.so.4:${lib libXtst}/libXtst.so.6:${lib libXext}/libXext.so.6:${lib libX11}/libX11.so.6:${lib libXScrnSaver}/libXss.so.1 ''; meta = with lib; { description = "Helps you understand your daily habits so you can focus and be more productive"; diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index fc7ff48423948be9e51600c895220e1689712374..8928ee18064db2844337f912a1708bf3ad7dcd09 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { 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/robo3t + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robo3t mkdir $out/bin @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://robomongo.org/; description = "Query GUI for mongodb"; - platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64; + platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.eperuffo ]; }; diff --git a/pkgs/applications/misc/rofi/config.patch b/pkgs/applications/misc/rofi/config.patch new file mode 100644 index 0000000000000000000000000000000000000000..46982d51e00cd592e426880ceab90709dc829c71 --- /dev/null +++ b/pkgs/applications/misc/rofi/config.patch @@ -0,0 +1,54 @@ +diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector +index 0646e4bc..f827dbfe 100755 +--- a/script/rofi-theme-selector ++++ b/script/rofi-theme-selector +@@ -42,34 +42,7 @@ function find_themes() + DIRS=${XDG_DATA_DIRS} + OLDIFS=${IFS} + IFS=: +- if [ -z "${XDG_DATA_DIRS}" ] +- then +- echo "XDG_DATA_DIRS needs to be set for this script to function correctly." +- echo -n "Using dirs from \$PATH: " +- DIRS= +- # Iterate over items in $PATH +- for p in ${PATH}; do +- # Remove trailing / if exists. +- x=${p%/} +- # remove both /bin and /sbin and /games from end +- x=${x%/bin} +- x=${x%/sbin} +- x=${x%/games} +- # Add /share +- x=${x}/share +- # Check if entry exists Prepend : so :${x}: matches nicely +- case ":${DIRS}" in +- *$x:*);; +- *) DIRS+="$x:";; +- esac +- done +- # Remove trailing : +- DIRS=${DIRS%:} +- echo "${DIRS}" +- fi +- # Add user dir. +- DIRS+=":${HOME}/.local/share/" +- DIRS+=":${HOME}/.config/" ++ DIRS+=":%ROFIOUT%/" + for p in ${DIRS}; do + p=${p%/} + TD=${p}/rofi/themes +@@ -164,7 +137,12 @@ Current theme: ${CUR}""" + ### + function set_theme() + { +- CDIR="${HOME}/.config/rofi/" ++ if [ -d "${XDG_CONFIG_HOME}" ]; then ++ CDIR="${XDG_CONFIG_HOME}/rofi/" ++ else ++ CDIR="${HOME}/.config/rofi/" ++ fi ++ + if [ ! -d "${CDIR}" ] + then + mkdir -p ${CDIR} diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index bdf14c03bcc2feb29ee120e836215b28120abe56..7da721e9f3740c373c9dbdc13e88c49f51016636 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -4,31 +4,39 @@ }: stdenv.mkDerivation rec { - version = "1.4.2"; - name = "rofi-${version}"; + version = "1.5.1"; + name = "rofi-unwrapped-${version}"; src = fetchurl { - url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz"; - sha256 = "0ys7grazqz5hw3nx2393df54ykcd5gw0zn66kik5fvzijpg3qfcx"; + url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz"; + sha256 = "1dc33zf33z38jcxb0lxpyd31waalpf6d4cd9z5f9m5qphdk1g679"; }; + # config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781 + patches = [ ./config.patch ]; + preConfigure = '' patchShebangs "script" # root not present in build /etc/passwd sed -i 's/~root/~nobody/g' test/helper-expand.c ''; + postFixup = '' + substituteInPlace "$out"/bin/rofi-theme-selector \ + --replace "%ROFIOUT%" "$out/share" + ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; - doCheck = true; + doCheck = false; meta = with stdenv.lib; { description = "Window switcher, run dialog and dmenu replacement"; homepage = https://davedavenport.github.io/rofi; license = licenses.mit; - maintainers = with maintainers; [ mbakke garbas ]; + maintainers = with maintainers; [ mbakke garbas ma27 ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix new file mode 100644 index 0000000000000000000000000000000000000000..44c6f892bf582c6149926b9203be0186fa675841 --- /dev/null +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -0,0 +1,17 @@ +{ stdenv, rofi-unwrapped, makeWrapper, theme ? null, lib }: + +stdenv.mkDerivation { + name = "rofi-${rofi-unwrapped.version}"; + buildInputs = [ makeWrapper ]; + preferLocalBuild = true; + passthru = { unwrapped = rofi-unwrapped; }; + buildCommand = '' + mkdir -p $out/bin + ln -s ${rofi-unwrapped}/bin/rofi $out/bin/rofi + ${lib.optionalString (theme != null) ''wrapProgram $out/bin/rofi --add-flags "-theme ${theme}"''} + ''; + + meta = rofi-unwrapped.meta // { + priority = (rofi-unwrapped.meta.priority or 0) - 1; + }; +} diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index cbf602b75dabd2f71e4d9a3e5824d60df4d49e51..1d0c7d28de6e4599a2fa49c97637724a8dccfcb1 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext -, gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme +{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext +, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper , pkgconfig, python, pythonPackages, vte , wrapGAppsHook}: @@ -22,11 +22,11 @@ in stdenv.mkDerivation rec { buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib - gdk_pixbuf gsettings_desktop_schemas gtk3 - hicolor_icon_theme vte ]; + makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib + gdk_pixbuf gsettings-desktop-schemas gtk3 + hicolor-icon-theme vte ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" + NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6ee9966401b5fd630be15c4fa967243d4638c623 --- /dev/null +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -0,0 +1,28 @@ +{ + mkDerivation, fetchurl, lib, + extra-cmake-modules, kdoctools, + knotifyconfig, kidletime, kwindowsystem, ktextwidgets, kcrash +}: + +let + pname = "rsibreak"; + version = "0.12"; + revision = ".8"; +in mkDerivation rec { + name = "rsibreak-${version}${revision}"; + + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${version}/${name}.tar.xz"; + sha256 = "1qn9xdjx9zzw47jsj7f4nkqmrangfhdgafm2jxm7cm6z6kcvzr28"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ knotifyconfig kidletime kwindowsystem ktextwidgets kcrash ]; + + meta = with lib; { + description = "RSIBreak takes care of your health and regularly breaks your work to avoid repetitive strain injury (RSI)"; + license = licenses.gpl2; + homepage = https://www.kde.org/applications/utilities/rsibreak/; + maintainers = with maintainers; [ vandenoever ]; + }; +} diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix index 652dd9d5e650696ca9b907398437a7ddc09885e1..f1c3cbc55577612804b59e44744f2ca1a80fea2a 100644 --- a/pkgs/applications/misc/rtl-sdr/default.nix +++ b/pkgs/applications/misc/rtl-sdr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # /etc/udev/rules.d/, and there is no option to install elsewhere. So install # rules manually. # * Propagate libusb-1.0 dependency in pkg-config file. - postInstall = '' + postInstall = stdenv.lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d/" cp ../rtl-sdr.rules "$out/etc/udev/rules.d/99-rtl-sdr.rules" @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/applications/misc/rtl_433/default.nix b/pkgs/applications/misc/rtl_433/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..819c6c9391a986a0deb8bf781df874fb498121c6 --- /dev/null +++ b/pkgs/applications/misc/rtl_433/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }: +stdenv.mkDerivation rec { + + version = "2018-02-23"; + name = "rtl_433-${version}"; + + src = fetchFromGitHub { + owner = "merbanan"; + repo = "rtl_433"; + rev = "51d275c"; + sha256 = "1j443wmws5xgc18s47bvw3pqljk747izypz52rmlrvs16v96cg2g"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libusb1 rtl-sdr ]; + + meta = with stdenv.lib; { + description = "Decode traffic from devices that broadcast on 433.9 MHz"; + homepage = https://github.com/merbanan/rtl_433; + license = licenses.gpl2; + maintainers = with maintainers; [ earldouglas ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 02af4c28d593b1324846ca8ea52994444ef3ee60..ed54e523c8f8f9d64277f944053f0e5ac2433f8e 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with pythonPackages; buildPythonApplication rec { - version = "1.19.0"; + version = "1.22.1"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "19rnw9cac06ns10vqn2cj0v61ycrj9g1ysa3hncamwxxibmkycp7"; + sha256 = "1jil8cwhnpf2mclgah7s79j4c38hzm0j6di2mffrqhlsnn2vxbf4"; }; # Tests try to access network @@ -48,6 +48,6 @@ buildPythonApplication rec { homepage = https://github.com/michael-lazar/rtv; description = "Browse Reddit from your Terminal"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ]; + maintainers = with maintainers; [ jgeerds wedens ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 281f2176833a14a235cd5ce2db4f480d59ea2187..4ee9f461760cecaac8b8152faff257ed712c9c40 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (rec { inherit description; homepage = http://software.schmorp.de/pkg/rxvt-unicode.html; downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; - maintainers = [ maintainers.mornfall ]; + maintainers = [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d216a695a3c5a982989437f3c2a9a7ed9fb15a2d --- /dev/null +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -0,0 +1,71 @@ +{ lib, python3Packages, gobjectIntrospection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg +}: + +let inherit (python3Packages) python buildPythonApplication fetchPypi; + +in buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "safeeyes"; + version = "2.0.5"; + namePrefix = ""; + + src = fetchPypi { + inherit pname version; + sha256 = "1q52ncqn18wb3d42dzsm7lh301w6g053a685i1cnismvp86amvfl"; + }; + + buildInputs = [ + gtk3 + gobjectIntrospection + gnome3.defaultIconTheme + gnome3.adwaita-icon-theme + ]; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + propagatedBuildInputs = with python3Packages; [ + Babel + psutil + xlib + pygobject3 + dbus-python + + libappindicator-gtk3 + libnotify + xprintidle-ng + ]; + + # patch smartpause plugin + postPatch = '' + sed -i \ + -e 's!xprintidle!xprintidle-ng!g' \ + safeeyes/plugins/smartpause/plugin.py + + sed -i \ + -e 's!xprintidle!xprintidle-ng!g' \ + safeeyes/plugins/smartpause/config.json + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + + # safeeyes images + --prefix XDG_DATA_DIRS : "$out/lib/${python.libPrefix}/site-packages/usr/share" + ) + ''; + + doCheck = false; # no tests + + meta = { + homepage = http://slgobinath.github.io/SafeEyes; + description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ srghma ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 17798bb01e2d24637ab177fd960be02d9ebe09c0..7c74bb6cd45926ca246fa4e3caf6e0f6fbb241fb 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sakura-${version}"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1vj07xnkalb8q6ippf4bmv5cf4266p1j9m80sxb6hncx0h8paj04"; + sha256 = "0fhcn3540iw22l5zg3njh5z8cj0g2n9p6fvagjqa5zc323jfsc7b"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index c093a75160315c9ad2e0639f347314f16214ea7a..acd79859901a8eddf89b1b8ff80e96bfa49a0044 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.7.0"; name = "sc-im-${version}"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj"; + sha256 = "0xi0n9qzby012y2j7hg4fgcwyly698sfi4i9gkvy0q682jihprbk"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildPhase = '' cd src + sed 's/LDLIBS += -lm/& -lncurses/' -i Makefile + sed -e "\|^prefix = /usr/local| s|/usr/local|$out|" \ -e "\|^#LDLIBS += -lxlsreader| s|^#|| " \ -e "\|^#CFLAGS += -DXLS| s|^#|| " \ @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/andmarti1424/sc-im; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; license = licenses.bsdOriginal; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; # Cannot test others }; diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index bf2de3a5f1b95e8039afd37e6e00d6c51f605330..cc8c30043b2931cc12e9a42cb574211b2d80d876 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -16,17 +16,16 @@ stdenv.mkDerivation rec { buildInputs = [ glib gettext readline ]; preInstall = '' - touch locale + mkdir locale ''; - NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__" - + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; + NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; meta = with stdenv.lib; { homepage = https://dushistov.github.io/sdcv/; description = "Console version of StarDict"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2c8753efcd745279e55ab809288d5a44ae9870f5 --- /dev/null +++ b/pkgs/applications/misc/sequeler/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub +, cmake, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook +, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2 }: + + +let + version = "0.5.4"; + sqlGda = libgda.override { + mysqlSupport = true; + postgresSupport = true; + }; + +in stdenv.mkDerivation rec { + name = "sequeler-${version}"; + + src = fetchFromGitHub { + owner = "Alecaddd"; + repo = "sequeler"; + rev = "v${version}"; + sha256 = "05c7y6xdyq3h9bn90pbz03jhy9kabmgpxi4zz0i26q0qphljskbx"; + }; + + nativeBuildInputs = [ cmake ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook ]; + + buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 ]; + + meta = with stdenv.lib; { + description = "Friendly SQL Client"; + longDescription = '' + Sequeler is a native Linux SQL client built in Vala and Gtk. It allows you + to connect to your local and remote databases, write SQL in a handy text + editor with language recognition, and visualize SELECT results in a + Gtk.Grid Widget. + ''; + homepage = https://github.com/Alecaddd/sequeler; + license = licenses.gpl3; + maintainers = [ maintainers.etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..936b1a389f1eee83fa1d43327eb0d7d741179542 --- /dev/null +++ b/pkgs/applications/misc/sigal/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonApplication, fetchPypi, pythonPackages, ffmpeg }: + +buildPythonApplication rec { + version = "1.4.0"; + pname = "sigal"; + + src = fetchPypi { + inherit version pname; + sha256 = "0da0n8jhjp2swr18zga87xc77r8c7qwqf5sp222ph9sn3yyyc35i"; + }; + + buildInputs = with pythonPackages; [ pytest ]; + propagatedBuildInputs = with pythonPackages; [ + jinja2 + markdown + pillow + pilkit + clint + click + blinker + ]; + + makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ]; + + # No tests included + doCheck = false; + + meta = with lib; { + description = "Yet another simple static gallery generator"; + homepage = http://sigal.saimon.org/en/latest/index.html; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; +} + diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7367c82070544f50d09ca4d2c579b212400230a8..513c5facc6b2efdfe5dba2168bf3c11dce5b3196 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,25 +1,26 @@ { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: stdenv.mkDerivation rec { name = "simplenote-${pkgver}"; - pkgver = "1.0.6"; + pkgver = "1.1.3"; src = fetchurl { - url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-x64.${pkgver}.tar.gz"; - sha256 = "18wj880iw92yd57w781dqaj7iv9j3bqhyh2cbikqrl4m5w9xkla8"; + url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-${pkgver}.tar.gz"; + sha256 = "1z92yyjmg3bgfqfdpnysf98h9hhhnqzdqqigwlmdmn3d7fy49kcf"; }; buildCommand = let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf + xorg.libxcb ]; libPathNative = lib.makeLibraryPath packages; diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index 712b5a7e750f9b736183d17ae6051e1717da735e..fc6be074a079e726d1b46944d447bbd21ad1e443 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Doom editor"; homepage = http://slade.mancubus.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix new file mode 100644 index 0000000000000000000000000000000000000000..9ee30d347b0a819e2d678a3d354578b026cb5754 --- /dev/null +++ b/pkgs/applications/misc/slade/git.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: + +stdenv.mkDerivation { + name = "slade-git-3.1.2.2018.01.29"; + + src = fetchFromGitHub { + owner = "sirjuddington"; + repo = "SLADE"; + rev = "f7409c504b40c4962f419038db934c32688ddd2e"; + sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld"; + }; + + cmakeFlags = ["-DNO_WEBVIEW=1"]; + nativeBuildInputs = [ cmake pkgconfig zip ]; + buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Doom editor"; + homepage = http://slade.mancubus.net/; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ ertes ]; + }; +} diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cf5c4625c952ac31e682c1d092897911f8d0bfdd --- /dev/null +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchgit, qt5, zlib, libGLU, libX11 }: + +let + name = "sleepyhead-${version}"; + version = "1.0.0-beta-git"; +in stdenv.mkDerivation { + inherit name; + + src = fetchgit { + url = https://gitlab.com/sleepyhead/sleepyhead-code.git; + rev = "9e2329d8bca45693231b5e3dae80063717c24578"; + sha256 = "0448z8gyaxpgpnksg34lzmffj36jdpm0ir4xxa5gvzagkx0wk07h"; + }; + + buildInputs = [ + qt5.qtbase qt5.qtwebkit qt5.qtserialport + zlib + libGLU + libX11 + ]; + + patchPhase = '' + patchShebangs configure + ''; + + installPhase = '' + mkdir -p $out/bin + cp sleepyhead/SleepyHead $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://sleepyhead.jedimark.net/; + description = "Review and explore data produced by CPAP and related machines"; + longDescription = '' + SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. + ''; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.krav ]; + }; + +} diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix new file mode 100644 index 0000000000000000000000000000000000000000..1ee2bfab94c3cd7dcdea0d6281a1601213375879 --- /dev/null +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, + boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU, + glew, eigen }: +let + AlienWxWidgets = perlPackages.buildPerlPackage rec { + name = "Alien-wxWidgets-0.69"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; + sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr"; + }; + propagatedBuildInputs = [ + pkgconfig perlPackages.ModulePluggable perlPackages.ModuleBuild + gtk2 gtk3 wxGTK30 + ]; + }; + + Wx = perlPackages.Wx.overrideAttrs (oldAttrs: { + propagatedBuildInputs = [ + perlPackages.ExtUtilsXSpp + AlienWxWidgets + ]; + }); + + WxGLCanvas = perlPackages.buildPerlPackage rec { + name = "Wx-GLCanvas-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; + sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; + }; + propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ]; + doCheck = false; + }; +in +stdenv.mkDerivation rec { + name = "slic3r-prusa-edition-${version}"; + version = "1.39.1"; + + enableParallelBuilding = true; + + buildInputs = [ + cmake + perl + makeWrapper + eigen + glew + tbb + which + Wx + WxGLCanvas + ] ++ (with perlPackages; [ + boost + ClassXSAccessor + EncodeLocale + ExtUtilsMakeMaker + ExtUtilsTypemapsDefault + ExtUtilsXSpp + GrowlGNTP + ImportInto + IOStringy + locallib + LWP + MathClipper + MathConvexHullMonotoneChain + MathGeometryVoronoi + MathPlanePath + ModuleBuildWithXSpp + Moo + NetDBus + OpenGL + threads + XMLSAX + ]); + + prePatch = '' + sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp + ''; + + postInstall = '' + echo 'postInstall' + wrapProgram "$out/bin/slic3r-prusa3d" \ + --prefix PERL5LIB : "$out/lib/slic3r-prusa3d:$PERL5LIB" + + # it seems we need to copy the icons... + mkdir -p $out/bin/var + cp ../resources/icons/* $out/bin/var/ + cp -r ../resources $out/bin/ + ''; + + src = fetchFromGitHub { + owner = "prusa3d"; + repo = "Slic3r"; + sha256 = "0frkjgzmiy788ijkcqz3baxcrncqmk9s2vcd99hb8p2q13cg51ff"; + rev = "version_${version}"; + }; + + meta = with stdenv.lib; { + description = "G-code generator for 3D printer"; + homepage = https://github.com/prusa3d/Slic3r; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ tweber ]; + }; +} diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bc855db29ecc8ba9d0c9db7c4b5293b283c093a7 --- /dev/null +++ b/pkgs/applications/misc/slstatus/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, pkgconfig, writeText, libX11, conf ? null }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "slstatus-${version}"; + version = "unstable-2018-03-28"; + + src = fetchgit { + url = https://git.suckless.org/slstatus; + rev = "faa52bdcc0221de2d8fae950e409a8ac5e05bfcd"; + sha256 = "0i8k7gjvx51y0mwxjlqhyk2dpvkb2d3y8x4l6ckdnyiy5632pn76"; + }; + + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = { + homepage = https://tools.suckless.org/slstatus/; + description = "status monitor for window managers that use WM_NAME like dwm"; + license = licenses.isc; + maintainers = with maintainers; [ geistesk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 5fffa6681cb213cd8a7c92124afcf5525941a97d..6fa594dec046f403e8d16b18ece237f15c850801 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,16 +1,16 @@ -{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop_file_utils -, shared_mime_info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer -, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }: +{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils +, shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer +, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2, hicolor-icon-theme, adwaita-icon-theme }: stdenv.mkDerivation rec { name = "spacefm-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "IgnorantGuru"; repo = "spacefm"; rev = "${version}"; - sha256 = "06askkrwls09d1x382zjrmnvcm0ghfgz4cms2qbhdkazfyy0ff65"; + sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx"; }; configureFlags = [ @@ -23,13 +23,17 @@ stdenv.mkDerivation rec { postInstall = '' rm -f $out/etc/spacefm/spacefm.conf - ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf + ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf + ''; + + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 udev desktop_file_utils shared_mime_info intltool - wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks + gtk3 udev desktop-file-utils shared-mime-info intltool + wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 ] ++ (if ifuseSupport then [ ifuse ] else []); # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 59e67fc65e2e70a498398f5ab3747278a23b4679..3562a4f9b1682c9c0e8884b7dd6bae07765ccb7f 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft -, fontconfig, conf ? null, patches ? [], extraLibs ? []}: +{ stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext +, libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}: with stdenv.lib; let patches' = if patches == null then [] else patches; in stdenv.mkDerivation rec { - name = "st-0.7"; + name = "st-0.8.1"; src = fetchurl { - url = "http://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000"; + url = "https://dl.suckless.org/st/${name}.tar.gz"; + sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4"; }; - patches = patches' ++ [ ./st-fix-deletekey.patch ]; + patches = patches'; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out + wrapProgram "$out/bin/st" --prefix PATH : "${dmenu}/bin" ''; meta = { diff --git a/pkgs/applications/misc/st/st-fix-deletekey.patch b/pkgs/applications/misc/st/st-fix-deletekey.patch deleted file mode 100644 index cf009322053935b79418e54af0633c01f0cc837c..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/st/st-fix-deletekey.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 1896246..b41747f 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -315,8 +315,8 @@ static Key key[] = { - { XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, - { XK_Delete, ShiftMask, "\033[2K", -1, 0, 0}, - { XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0}, -- { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0}, -- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0}, -+ { XK_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0}, -+ { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0}, - { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0}, - { XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0}, - { XK_Home, ShiftMask, "\033[2J", 0, -1, 0}, diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix deleted file mode 100644 index 69794b1cffbdff52b8fe319c98b31b7a752a36b5..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/st/wayland.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, writeText -, ncurses, wayland, wld, libxkbcommon, fontconfig, pixman -, conf ? null, patches ? [] }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "st-wayland-${version}"; - version = "git-2015-08-29"; - rev = "61b47b76a09599c8093214e28c48938f5b424daa"; - - src = fetchurl { - url = "https://github.com/michaelforney/st/archive/${rev}.tar.gz"; - sha256 = "7164da135f02405dba5ae3131dfd896e072df29ac6c0928f3b887beffb8a7d97"; - }; - - inherit patches; - - configFile = optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses wayland wld libxkbcommon fontconfig pixman ]; - - NIX_LDFLAGS = "-lfontconfig"; - - installPhase = '' - TERMINFO=$out/share/terminfo make install PREFIX=$out - ''; - - meta = { - homepage = http://st.suckless.org/; - 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 index 877990861fd7997fb0cd35dba25cf783358aa172..b63a41bb915627d5a6c7084c2ea27fc47ed63ab2 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/pkgs/applications/misc/st/xst.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { homepage = https://github.com/neeasade/xst; description = "Simple terminal fork that can load config from Xresources"; license = licenses.mit; - maintainers = maintainers.vyp; + maintainers = [ maintainers.vyp ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index ebb50e685da73204880923186124134e64cb10d7..6d6382faccd45eb97dadae94e0cfde1a5c9b11ad 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = https://github.com/seenaburns/stag; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index 5701997fd299ec8580e9028d31e97c53c40a950e..f6286bfece3d27014d3fef41c642f48a64c2c0f1 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: stdenv.mkDerivation rec { - name = "stupidterm-2017-03-15"; + name = "stupidterm-2018-03-10"; nativeBuildInputs = [ pkgconfig ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "esmil"; repo = "stupidterm"; - rev = "752316a783f52317ffd9f05d32e208dbcafc5ba6"; - sha256 = "1d8fyhr9sgpxgkwzkyiws0kvhmqfwwyycvcr1qf2wjldiax222lv"; + rev = "0463519a96c9e4f9ce9fdc99d8e776499346ccba"; + sha256 = "1vbk53xyjn33myb3fix6y7sxb1x3rndrkk5l9qa60qaw2ivkr965"; }; makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm"; diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 2cdf047a10fc7236db97779e5579c0429262b8ba..f9779beec0f4a83c01496061b839737481742742 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "styx-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "styx-static"; repo = "styx"; rev = "v${version}"; - sha256 = "044zpj92w96csaddf1qnnc2w2w9iq4b7rzlqqsqnd1s0a87lm1qd"; + sha256 = "01lklz7l9klqmmsncikwjnk3glzyz15c30118s82yd1chwpwhpfl"; }; server = "${caddy.bin}/bin/caddy"; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 051b67bc972c83cbdc0bc7bc1a96bc59b18e719a..5e1e7bf32258eed1bef3743700282d9c9c905c1e 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake , curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib -, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit +, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: let - version = "4.7.2"; + version = "4.7.5"; libdc = stdenv.mkDerivation rec { name = "libdivecomputer-ssrf-${version}"; src = fetchurl { url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; - sha256 = "04wadhhva1bfnwk0kl359kcv0f83mgym2fzs441spw5llcl7k52r"; + sha256 = "1xsgnmgc7yb46lflx8ynkbdxg2f6sny6xg6caqgx7rf0x1jmjj4x"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -32,24 +32,25 @@ let googlemaps = stdenv.mkDerivation rec { name = "googlemaps-${version}"; - version = "2017-09-17"; + version = "2017-12-18"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35"; - sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84"; + rev = "79f3511d60dc9640de02a5f24656094c8982b26d"; + sha256 = "11334w0bnfb97sv23vvj2b5hcwvr0171hxldn91jms9y12l5j15d"; }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtlocation ]; + buildInputs = [ qtbase qtlocation libXcomposite ]; pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; installPhase = '' - mkdir $out $(dirname ${pluginsSubdir}) - mv plugins ${pluginsSubdir} + mkdir -p $out $(dirname ${pluginsSubdir}/geoservices) + mkdir -p ${pluginsSubdir}/geoservices + mv *.so ${pluginsSubdir}/geoservices mv lib $out/ ''; @@ -69,7 +70,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; - sha256 = "06f215xx1nc2q2qff2ihcl86fkrlnkvacl1swi3fw9iik6nq3bjp"; + sha256 = "0qqmnrmj2alr4rc2nqkv8sbdp92xb6j4j468wn6yqvgb23n77b82"; }; buildInputs = [ diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 009eb488d7b4e77bf27e0c0082a480317ea6c896..68a192d78b8400a2589554f3813a596d77c0e84f 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }: +, gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }: let @@ -36,7 +36,7 @@ let patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' ant furniture textures help @@ -54,7 +54,7 @@ let cp "${sweethome3dItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 37623caa1d4e1a3fb3706c9b66753a56afe1303d..6c4b32ca9aa6a62f69575963fbba31a2c051b0e5 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }: +, gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }: let @@ -26,7 +26,7 @@ let categories = "Application;Graphics;2DGraphics;3DGraphics;"; }; - buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ]; + buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; patchPhase = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml @@ -43,7 +43,7 @@ let cp ${module}-${version}.jar $out/share/java/. cp "${editorItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 2533014c56079990663fd1bc386eafaf22864b0e..0da0b83d64abd16f1239e9294b54d49a8aee8eeb 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,35 +1,37 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json_glib, zeitgeist, vala_0_23, hicolor_icon_theme +{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee +, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobjectIntrospection }: -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "synapse-0.2.99.1"; +let + version = "0.2.99.4"; +in stdenv.mkDerivation rec { + name = "synapse-${version}"; src = fetchurl { - url = "https://launchpad.net/synapse-project/0.3/0.2.99.1/+download/${name}.tar.xz"; - sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220"; + url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; + sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig gettext vala_0_38 + # For setup hook + gobjectIntrospection + ]; buildInputs = [ - intltool glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist - vala_0_23 hicolor_icon_theme + glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist + hicolor-icon-theme ]; - meta = { - longDescription = '' - Semantic launcher written in Vala that you can use to start applications - as well as find and access relevant documents and files by making use of - the Zeitgeist engine - ''; - description = '' - Semantic launcher to start applications and find relevant files - ''; - homepage = https://launchpad.net/synapse-project; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ mahe ]; - platforms = with stdenv.lib.platforms; all; + meta = with stdenv.lib; { + longDescription = '' + Semantic launcher written in Vala that you can use to start applications + as well as find and access relevant documents and files by making use of + the Zeitgeist engine + ''; + description = "Semantic launcher to start applications and find relevant files"; + homepage = https://launchpad.net/synapse-project; + license = licenses.gpl3; + maintainers = with maintainers; [ mahe ]; + platforms = with platforms; all; }; } diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 23252d0c4807384ec1ce907235fd8e8f94920037..c5429b6c8510ba7f0bd79add15537a99fde32166 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -7,6 +7,7 @@ bundlerEnv { gemdir = ./.; meta = { + broken = true; # needs ruby 2.0 description = "A modern and powerful project management tool"; homepage = http://taskjuggler.org/; license = lib.licenses.gpl2; diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 1b3ca7dfc03c0b8c509b954313b3cb7c69553b72..3f3956961617398ebe428d90050cd43b96ee0520 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,48 +1,42 @@ -{ stdenv, fetchurl, taskwarrior, perl, ncurses }: +{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses, taskwarrior }: stdenv.mkDerivation rec { - version = "0.8"; + version = "2017-05-15"; name = "tasknc-${version}"; - src = fetchurl { - url = "https://github.com/mjheagle8/tasknc/archive/v${version}.tar.gz"; - sha256 = "0max5schga9hmf3vfqk2ic91dr6raxglyyjcqchzla280kxn5c28"; + src = fetchFromGitHub { + owner = "lharding"; + repo = "tasknc"; + rev = "c41d0240e9b848e432f01de735f28de93b934ae7"; + sha256 = "0f7l7fy06p33vw6f6sjnjxfhw951664pmwhjl573jvmh6gi2h1yr"; }; + nativeBuildInputs = [ + makeWrapper + perl # For generating the man pages with pod2man + ]; + + buildInputs = [ ncurses ]; + hardeningDisable = [ "format" ]; - # - # I know this is ugly, but the Makefile does strange things in this package, - # so we have to: - # - # 1. Remove the "doc" task dependency from the "all" target - # 2. Remove the "tasknc.1" task dependency from the "install" target - # 3. Remove the installing of the tasknc.1 file from the install target as - # we just removed the build target for it. - # - # TODO : One could also provide a patch for the doc/manual.pod file so it - # actually builds, but I'm not familiar with this, so this is the faster - # approach for me. We have no manpage, though. - # - preConfigure = '' - sed -i -r 's,(all)(.*)doc,\1\2,' Makefile - sed -i -r 's,(install)(.*)tasknc\.1,\1\2,' Makefile - sed -i -r 's,install\ -D\ -m644\ tasknc\.1\ (.*),,' Makefile - ''; + buildFlags = [ "VERSION=${version}" ]; installPhase = '' - mkdir $out/bin/ -p - mkdir $out/share/man1 -p - mkdir $out/share/tasknc -p - DESTDIR=$out PREFIX= MANPREFIX=share make install + mkdir -p $out/bin/ + mkdir -p $out/share/man/man1 + mkdir -p $out/share/tasknc + + DESTDIR=$out PREFIX= MANPREFIX=/share/man make install + + wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior}/bin ''; - buildInputs = [ taskwarrior perl ncurses ]; - meta = { - homepage = https://github.com/mjheagle8/tasknc; + meta = with stdenv.lib; { + homepage = https://github.com/lharding/tasknc; description = "A ncurses wrapper around taskwarrior"; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = stdenv.lib.platforms.linux; # Cannot test others + maintainers = with maintainers; [ infinisil ]; + platforms = platforms.linux; # Cannot test others }; } diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 11bc7620368901672fc1b3de0de1ec8725eb3f65..f64d25471982de7aa04868f8c1d79f6c5ee8f427 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "REPL for taskwarrior"; homepage = http://tasktools.org; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 74ef55ee8cc8d9bdc5bf806c27d7b0b1ad28fa38..80e1b9b69efbddcc464bd63a42bb6d59e68435a0 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p "$out/share/bash-completion/completions" - ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/" + ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash" mkdir -p "$out/share/fish/vendor_completions.d" ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/" ''; diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index 3959ad88ece90f282cee9802af7ac2c9e47ed506..2fef852ace9f5758dc8e5172fc840115533b58e9 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, pythonPackages, pango, keybinder, vte, gettext, intltool, file +{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobjectIntrospection +, libnotify, wrapGAppsHook, gnome3 }: -pythonPackages.buildPythonApplication rec { +python2.pkgs.buildPythonApplication rec { name = "terminator-${version}"; - version = "1.0"; + version = "1.91"; src = fetchurl { - url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz"; - sha256 = "1pfspcxsbax8a835kcld32fax6vcxsn1fmkny9zzvi4icplhkal8"; + url = "https://launchpad.net/terminator/gtk3/${version}/+download/${name}.tar.gz"; + sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69"; }; - nativeBuildInputs = [ file intltool ]; - - pythonPath = with pythonPackages; [ - pygtk pygobject2 vte keybinder notify gettext pango psutil - ]; + nativeBuildInputs = [ file intltool wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ]; + propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' patchShebangs . @@ -32,7 +31,7 @@ pythonPackages.buildPythonApplication rec { quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports). ''; - homepage = http://gnometerminator.blogspot.no/p/introduction.html; + homepage = https://gnometerminator.blogspot.no/p/introduction.html; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor globin ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..67ca05fdb10fa5b41214cbd6cdf2bfa322a6a6bf --- /dev/null +++ b/pkgs/applications/misc/terminus/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo +, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr +, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver +, libxcb, makeWrapper, nodejs +, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: + +let + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb + libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio + ]; +in +stdenv.mkDerivation rec { + version = "1.0.0-alpha.42"; + name = "terminus-${version}"; + src = fetchurl { + url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb"; + sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb"; + }; + buildInputs = [ dpkg makeWrapper ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = '' + mkdir -p "$out/bin" + mv opt "$out/" + ln -s "$out/opt/Terminus/terminus" "$out/bin/terminus" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Terminus/terminus" + mv usr/* "$out/" + wrapProgram $out/bin/terminus --prefix PATH : ${lib.makeBinPath [ nodejs ]} + ''; + dontPatchELF = true; + meta = with lib; { + description = "A terminal for a more modern age"; + homepage = https://eugeny.github.io/terminus/; + maintainers = with maintainers; [ jlesquembre ]; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index cf99304473c1120f5cd34a23b462dd1c1fcf4b44..46276bbb03fbf72f6f14444e069d9c3e281724aa 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -3,16 +3,19 @@ }: let - version = "12"; + version = "13"; termite = stdenv.mkDerivation { name = "termite-${version}"; src = fetchgit { url = "https://github.com/thestinger/termite"; rev = "refs/tags/v${version}"; - sha256 = "0s6dyg3vcqk5qcx90bs24wdnd3p56rdjdcanx4pcxvp6ksjl61jz"; + sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj"; }; + # https://github.com/thestinger/termite/pull/516 + patches = [ ./url_regexp_trailing.patch ]; + postPatch = "sed '1i#include ' -i termite.cc"; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/misc/termite/url_regexp_trailing.patch b/pkgs/applications/misc/termite/url_regexp_trailing.patch new file mode 100644 index 0000000000000000000000000000000000000000..96deaa073d71b6a9225173af0ad4b39c7fa664c5 --- /dev/null +++ b/pkgs/applications/misc/termite/url_regexp_trailing.patch @@ -0,0 +1,27 @@ +Based on https://github.com/thestinger/termite/pull/516 +Modified to apply to v13 + +From 65a454ffa8e681f3f14729cba7c42e1570a85e8a Mon Sep 17 00:00:00 2001 +From: Paul Baecher +Date: Thu, 7 Sep 2017 22:58:51 +0200 +Subject: [PATCH] Do not match punctuation at the end of URLs + +Punctuation at the end of URLs is most likely part of natural language +or markup (for example in Markdown). Do not match it as part of the URL. +--- + url_regex.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/url_regex.hh b/url_regex.hh +index 2ec6be8..3039b53 100644 +--- a/url_regex.hh ++++ b/url_regex.hh +@@ -9,7 +9,7 @@ + #define PORT "(?:\\:[[:digit:]]{1,5})?" + #define SCHEME "(?:[[:alpha:]][+-.[:alnum:]]*:)" + #define USERPASS USERCHARS_CLASS "+(?:\\:" PASSCHARS_CLASS "+)?" +-#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*)?" ++#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*(? -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 2c23ab9261f692c48da3d7a420e5c1834d3ae2dc..838e26463cd0d09d6f4ebd4fbeadcacd95930c8c 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre , glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage , libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp -, libstartup_notification, hicolor_icon_theme, wrapGAppsHook +, libstartup_notification, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "15.3"; + version = "16.2"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "1d83ppwckc2yix1grw8w31rlkyz6naa40pd3dg7n6nidx00zwn91"; + sha256 = "1fp9kamb09qbply8jn0gqwgnv9xdds81jzpl0lkziz8dydyis4wm"; }; enableParallelBuilding = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs - libXdmcp libstartup_notification hicolor_icon_theme ]; + libXdmcp libstartup_notification hicolor-icon-theme ]; postPatch = '' substituteInPlace CMakeLists.txt --replace /etc $out/etc diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index eebab6643a68bd905d2ed30b668f100420885f3a..6cf1f27a104b074e3c52b5a12508db3235788573 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.4.15"; + version = "1.4.17"; name = "tnef-${version}"; src = fetchFromGitHub { owner = "verdammelt"; repo = "tnef"; rev = version; - sha256 = "0wm5ylppkjg518ldb9kzlx58a9l8z66gpz9ljalmyq6a77khd7pj"; + sha256 = "0cq2xh5wd74qn6k2nnw5rayxgqhjl3jbzf4zlc4babcwxrv32ldh"; }; doCheck = true; diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..049a9eff347c798c11e8a76221aa685c9fef9e79 --- /dev/null +++ b/pkgs/applications/misc/todiff/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "todiff-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Ekleog"; + repo = "todiff"; + rev = version; + sha256 = "0n3sifinwhny651q1v1a6y9ybim1b0nd5s1z26sigjdhdvxckn65"; + }; + + cargoSha256 = "0mxdpn98fvmxrp656vwxvzl9vprz5mvqj7d1hvvs4gsjrsiyp0fy"; + + meta = with stdenv.lib; { + description = "Human-readable diff for todo.txt files"; + homepage = "https://github.com/Ekleog/todiff"; + maintainers = with maintainers; [ ekleog ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..61e10b6d1a6abb9e403c907faeb74384f3457315 --- /dev/null +++ b/pkgs/applications/misc/todolist/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "todolist-${version}"; + version = "0.8"; + + goPackagePath = "github.com/gammons/todolist"; + + src = fetchFromGitHub { + owner = "gammons"; + repo = "todolist"; + rev = "${version}"; + sha256 = "0agv9a44q81qr960b7m1jxk0pb8ahk6lvmzmijvw4v6mbip2720z"; + }; + + meta = with stdenv.lib; { + description = "Simple GTD-style todo list for the command line"; + homepage = "http://todolist.site"; + license = licenses.mit; + maintainers = with maintainers; [ uvnikita ]; + }; +} diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index d1b1daa26d6fd0580e87eecbcda96fc91447d151..e282e752b31807ed1272ec55adb7a0760f94981b 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { - version = "0.15.0"; +python3Packages.buildPythonApplication rec { + version = "0.17.1"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "08k913gw0ip2q686z9k63bcn1n5s4w6b7jj6jmmamm427xmibkph"; + sha256 = "05fzsakm089bn03z8gip6yp4xfmwa054v40x2f3gqpl04r504gis"; }; - checkInputs = with pythonPackages; [ pytest ]; + checkInputs = with python3Packages; [ pytest ]; - propagatedBuildInputs = with pythonPackages; + propagatedBuildInputs = with python3Packages; [ requests beautifulsoup4 future ]; checkPhase = '' @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 853cc51710533d6915206ca6a97de2fab8e01181..8e8a22ed4e4166965bb5900e9d5393b5cb9dc0f5 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -1,101 +1,38 @@ -{ stdenv, fetchFromGitHub, curl, fribidi, mpv, less, rlwrap, gawk, bash, emacs, groff, ncurses, pandoc }: +{ stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.4"; + version = "0.9.6.7"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; - rev = "v" + version; - sha256 = "166zhic3k4z37vc8p1fnhc4xx7i7q0j30nr324frmp1mrnwrdib8"; + rev = "v${version}"; + sha256 = "0krcidjh32xwybr1v4nykgf0jjnffjqx125bvn3jh2a44cikyq3n"; }; - phases = [ "buildPhase" "installPhase" "postFixup" ]; + buildInputs = [ makeWrapper ]; - buildPhase = '' - mkdir -p $out/bin - mkdir -p $out/share - mkdir -p $out/share/man/man1 - ''; - - installPhase = '' - cp $src/translate $out/bin/trans - cp $src/translate $out/bin/translate - cp $src/translate $out/bin/translate-shell - - cp $src/translate.awk $out/share/translate.awk - cp $src/build.awk $out/share/build.awk - cp $src/metainfo.awk $out/share/metainfo.awk - cp $src/test.awk $out/share/test.awk - - cp -r $src/include $out/share - cp -r $src/test $out/share - cp $src/man/trans.1 $out/share/man/man1 - - chmod +x $out/bin/translate - chmod +x $out/share/translate.awk - chmod +x $out/share/build.awk - chmod +x $out/share/metainfo.awk - chmod +x $out/share/test.awk - ''; - - postFixup = '' - substituteInPlace $out/bin/trans --replace "/bin/sh" "${bash}/bin/bash" - substituteInPlace $out/bin/trans --replace "gawk " "${gawk}/bin/gawk " - substituteInPlace $out/bin/trans --replace "translate.awk" "$out/share/translate.awk" - - substituteInPlace $out/bin/translate --replace "/bin/sh" "${bash}/bin/bash" - substituteInPlace $out/bin/translate --replace "gawk " "${gawk}/bin/gawk " - substituteInPlace $out/bin/translate --replace "translate.awk" "$out/share/translate.awk" - - substituteInPlace $out/bin/translate-shell --replace "/bin/sh" "${bash}/bin/bash" - substituteInPlace $out/bin/translate-shell --replace "gawk " "${gawk}/bin/gawk " - substituteInPlace $out/bin/translate-shell --replace "translate.awk" "$out/share/translate.awk" - - substituteInPlace $out/share/translate.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk" - substituteInPlace $out/share/translate.awk --replace "metainfo" "$out/share/metainfo" - substituteInPlace $out/share/translate.awk --replace "include/" "$out/share/include/" - - substituteInPlace $out/share/build.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk" - substituteInPlace $out/share/build.awk --replace "include/" "$out/share/include/" - substituteInPlace $out/share/build.awk --replace "metainfo.awk" "$out/share/metainfo.awk" - - substituteInPlace $out/share/metainfo.awk --replace "translate.awk" "$out/share/translate.awk" - - substituteInPlace $out/share/test.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk" - substituteInPlace $out/share/test.awk --replace "include/" "$out/share/include/" - substituteInPlace $out/share/test.awk --replace "test/" "$out/share/test/" - - substituteInPlace $out/share/include/Translators/\*.awk --replace "include/" "$out/share/include/" - - substituteInPlace $out/share/test/Test.awk --replace "test/" "$out/share/test/" - substituteInPlace $out/share/test/TestUtils.awk --replace "include/" "$out/share/include/" - substituteInPlace $out/share/test/TestParser.awk --replace "include/" "$out/share/include/" - substituteInPlace $out/share/test/TestCommons.awk --replace "\"gawk\"" "\"${gawk}/bin/gawk\"" - substituteInPlace $out/share/test/TestCommons.awk --replace "Commons.awk" "$out/share/include/Commons.awk" - - substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses.out}/bin/tput\"" - substituteInPlace $out/share/include/Help.awk --replace "\"groff\"" "\"${groff}/bin/groff\"" - substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi\"" "\"${fribidi}/bin/fribidi\"" - substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi " "\"${fribidi}/bin/fribidi " - substituteInPlace $out/share/include/Utils.awk --replace "\"rlwrap\"" "\"${rlwrap}/bin/rlwrap\"" - substituteInPlace $out/share/include/Utils.awk --replace "\"emacs\"" "\"${emacs}/bin/emacs\"" - substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl.bin}/bin/curl\"" - - substituteInPlace $out/share/build.awk --replace "\"pandoc " "\"${pandoc}/bin/pandoc " - - substituteInPlace $out/share/include/Translate.awk --replace "\"mpv " "\"${mpv}/bin/mpv " - substituteInPlace $out/share/include/Translate.awk --replace "\"less " "\"${less}/bin/less " + installFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/trans \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + gawk + curl + ncurses + rlwrap + groff + fribidi + ]} ''; meta = with stdenv.lib; { homepage = https://www.soimort.org/translate-shell; description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium"; - license = licenses.publicDomain; - maintainers = [ maintainers.ebzzry ]; + license = licenses.unlicense; + maintainers = with maintainers; [ ebzzry infinisil ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index bcf43514f45e54fff1d467befc95a8a7f5e3ec18..ea79e29ff020cebf8d70d6e2682bfc8e76947081 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,28 +1,34 @@ { stdenv, fetchFromGitHub, asciidoc-full, gettext -, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg -, pythonPackages, udisks2, wrapGAppsHook }: - -pythonPackages.buildPythonApplication rec { +, gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg +, udisks2, wrapGAppsHook +, buildPythonApplication +, docopt +, pygobject3 +, pyyaml +, ... +}: + +buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1p732gi6lhwcqxvsa0pknb6jmhy3kgv3yzz7xzmdzhy47m312965"; + sha256 = "1yv1faq81n3vspf3jprcs5v21l2fchy3m3pc7lk8jb0xqlnh60x4"; }; buildInputs = [ asciidoc-full # For building man page. - hicolor_icon_theme + hicolor-icon-theme wrapGAppsHook librsvg # required for loading svg icons (udiskie uses svg icons) ]; propagatedBuildInputs = [ - gettext gobjectIntrospection gtk3 libnotify pythonPackages.docopt - pythonPackages.pygobject3 pythonPackages.pyyaml udisks2 + gettext gobjectIntrospection gtk3 libnotify docopt + pygobject3 pyyaml udisks2 ]; postBuild = "make -C doc"; diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index faf373092d5711c07a2e3ac093c1b8847872493c..d2463616d6773071e8e2d851d00b2c9c9b3ae42c 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "1.7.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "00l1zs3qw89z1hlylprzrpf6nf7h22h0nw43h97gv775vaqqgczv"; + sha256 = "0mnnrxm49s77s1qg7zbfciw0525ipsl010sciqdw8a22jg1rfjh8"; }; buildInputs = [ hackrf rtl-sdr ]; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; description = "Universal Radio Hacker: investigate wireless protocols like a boss"; license = licenses.asl20; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 7c4def952104a979400b4b7aae348d5482c6776d..c3071647c40a437b4d928610b253a850fdf11588 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -1,20 +1,23 @@ { stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - name = "urlscan-${version}"; - version = "0.8.6"; + pname = "urlscan"; + version = "0.8.7"; src = fetchFromGitHub { owner = "firecat53"; - repo = "urlscan"; + repo = pname; rev = version; - sha256 = "1v26fni64n0lbv37m35plh2bsrvhpb4ibgmg2mv05qfc3df721s5"; + sha256 = "1jxjcq869jimsq1ihk2fbjhp5lj7yga0hbp0msskxyz92afl1kz8"; }; propagatedBuildInputs = [ python3Packages.urwid ]; + doCheck = false; # No tests available + meta = with stdenv.lib; { description = "Mutt and terminal url selector (similar to urlview)"; + homepage = https://github.com/firecat53/urlscan; license = licenses.gpl2; maintainers = with maintainers; [ dpaetzel jfrankenau ]; }; diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index 0a651906cd8ffe861d14f6bce29329d8cb035cf9..8764c41c8a4c1b9ff2ab315bf63cbf2c26460158 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Extract URLs from text"; - homepage = http://packages.qa.debian.org/u/urlview.html; - licencse = stdenv.lib.licenses.gpl2; + homepage = https://packages.qa.debian.org/u/urlview.html; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/valauncher/default.nix b/pkgs/applications/misc/valauncher/default.nix index f780e5469d0279d4c04b6462177db60cf6270230..38c4055a10bb8af91428416624deeeb1928e936b 100644 --- a/pkgs/applications/misc/valauncher/default.nix +++ b/pkgs/applications/misc/valauncher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3 }: +{ stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3, gobjectIntrospection }: stdenv.mkDerivation rec { version = "1.3.1"; @@ -11,8 +11,12 @@ stdenv.mkDerivation rec { sha256 = "18969v870737jg1q0l3d05pb9mxsrcpdi0mnyz94rwkspszvxxqi"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gtk3 vala gnome3.libgee ]; + nativeBuildInputs = [ + cmake vala pkgconfig + # For setup hook + gobjectIntrospection + ]; + buildInputs = [ gtk3 gnome3.libgee ]; meta = with stdenv.lib; { description = "A fast dmenu-like gtk3 application launcher"; diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f5c0e1fe1a3c319af46dd7ddf91a51aa01ace300 --- /dev/null +++ b/pkgs/applications/misc/valentina/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchhg +, qmake, qttools +, qtbase, qtsvg, qtxmlpatterns +, poppler_utils +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "valentina-${version}"; + version = "0.6.0.0a"; + + src = fetchhg { + url = "https://bitbucket.org/dismine/valentina"; + rev = "ccd68eba533a82aeb2dd3702124899a37c23ded5"; + sha256 = "1qmxm6pwwass2kpyg41nhkmyq0g74pyk517sq68dcgs6340ii7fs"; + }; + + postPatch = '' + substituteInPlace common.pri \ + --replace '$$[QT_INSTALL_HEADERS]/QtXmlPatterns' '${getDev qtxmlpatterns}/include/QtXmlPatterns' \ + --replace '$$[QT_INSTALL_HEADERS]/QtSvg' '${getDev qtsvg}/include/QtSvg' \ + --replace '$$[QT_INSTALL_HEADERS]/' '${getDev qtbase}/include/' \ + --replace '$$[QT_INSTALL_HEADERS]' '${getDev qtbase}' + substituteInPlace src/app/tape/tape.pro \ + --replace '$$[QT_INSTALL_BINS]/rcc' '${getDev qtbase}/bin/rcc' + substituteInPlace src/app/translations.pri \ + --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${getDev qttools}/bin/lrelease' + substituteInPlace src/app/valentina/mainwindowsnogui.cpp \ + --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${getBin poppler_utils}/bin/pdftops"' + substituteInPlace src/app/valentina/dialogs/dialogsavelayout.h \ + --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${getBin poppler_utils}/bin/pdftops"' + ''; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtbase qtsvg qtxmlpatterns poppler_utils ]; + + configurePhase = '' + qmake PREFIX=/ Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" + ''; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + postInstall = '' + mv $out/usr/share $out/ + rmdir $out/usr + + mkdir -p $out/share/man/man1 + gzip -9c dist/debian/valentina.1 > $out/share/man/man1/valentina.1.gz + gzip -9c dist/debian/tape.1 > $out/share/man/man1/tape.1.gz + + mkdir -p $out/share/mime/packages + cp dist/debian/valentina.sharedmimeinfo $out/share/mime/packages/valentina.xml + cp dist/debian/valentina.mime $out/share/mime/packages/valentina + ''; + + enableParallelBuilding = true; + + meta = { + description = "An open source sewing pattern drafting software"; + homepage = https://valentinaproject.bitbucket.io/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 86924d9b3ca9f25faee618250b41f10f0d2dd1d1..1c5c4d1dcaac41ae41b391a7927e22180c7192c7 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "veracrypt-${version}"; - version = "1.21"; + version = "1.22"; src = fetchurl { url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "0n036znmwnv70wy8r2j3b55bx2z3cch5fr83vnwjvzyyp0j7swa4"; + sha256 = "0w5qyxnx03vn93ach1kb995w2mdg43s82gf1isbk206sxp00qk4y"; }; unpackPhase = @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Open-Source filesystem on-the-fly encryption"; - homepage = https://veracrypt.codeplex.com/; + homepage = https://www.veracrypt.fr/; license = "VeraCrypt License"; maintainers = with maintainers; [ dsferruzza ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index ffeca99cf9cb5b8191e15ec5df01704ed7cd3b15..ebc951c5bb93184accc28ce0005db669e1221293 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.9"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - sha256 = "1zd72vcgir3g9rhs2iyca13qf5fc0b1f22y20f5gy92c3sfwj45b"; + sha256 = "1cz7vjjmghgdxd1lvsdwv85gvx4kz8idq14qijpwkpfrf2va9f98"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin garbas ]; platforms = platforms.linux; license = licenses.gpl2; - downloadPage = "http://vifm.info/downloads.shtml"; - homepage = http://vifm.info/; + downloadPage = "https://vifm.info/downloads.shtml"; + homepage = https://vifm.info/; inherit version; updateWalker = true; }; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 5af675a82acf7186c755ff21e55dfc0818b62f65..d090878f976878f6ff8a8e6bac2ef7700734a38f 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl -, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper +, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils + buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite ]; diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index d8dea641c3addb2aa5e0cdd3a3d1d05974f76887..37d7aeb88e6178323d55fdf526d3d9374d67c109 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "Visual Interactive Taskwarrior"; - maintainers = with pkgs.lib.maintainers; [ matthiasbeyer ]; + maintainers = with pkgs.lib.maintainers; [ ]; platforms = pkgs.lib.platforms.linux; license = pkgs.lib.licenses.gpl3; }; diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index 27b2a8f7134fcf63c41abdb477f621a4a0143708..166811fb4ae37c7a845378ebab4e902255516588 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg -, dbus_glib, autoreconfHook, wrapGAppsHook }: +, dbus-glib, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { name = "volnoti-unstable-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ - dbus gdk_pixbuf glib libX11 gtk2 dbus_glib librsvg + dbus gdk_pixbuf glib libX11 gtk2 dbus-glib librsvg ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 90fa016615430919ff03eab4f9c5ccfa918f7949..544c1252ff411b31719ab68625d52c0535c72b1b 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://fungi.yuggoth.org/weather; description = "Quick access to current weather conditions and forecasts"; license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; # my only platform }; } diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d705de1a8cd6ca44190581789f39bb8554f57809 --- /dev/null +++ b/pkgs/applications/misc/welle-io/default.nix @@ -0,0 +1,47 @@ +{ stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig +, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 +, faad2, rtl-sdr, libusb, fftwSinglePrec }: +let + + version = "1.0-rc2"; + +in stdenv.mkDerivation { + + name = "welle-io-${version}"; + + src = fetchFromGitHub { + owner = "AlbrechtL"; + repo = "welle.io"; + rev = "V${version}"; + sha256 = "01x4ldq6lvmdrmxi857594nj9xpn2h7848vvf3f54sh1zrawn4k4"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + faad2 + fftwSinglePrec + libusb + qtbase + qtcharts + qtmultimedia + qtquickcontrols + qtquickcontrols2 + rtl-sdr + ]; + + cmakeFlags = [ + "-DRTLSDR=true" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A DAB/DAB+ Software Radio"; + homepage = http://www.welle.io/; + maintainers = with maintainers; [ ck3d ]; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; + }; + +} diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index dfd3c487713b14417a29ea7a94d95b1d33dcac50..68f6c4df15936559e892326e533a8c43bacd8ce9 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "wmname-0.1"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Prints or set the window manager name property of the root window"; - homepage = http://tools.suckless.org/wmname; + homepage = https://tools.suckless.org/wmname; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index b93295850bcd6ebc4141f7ef044c8d5d18af4ea6..71d95e138927589d37f2e6588698f290d6241560 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { for computational linguistics and natural language processing. ''; - homepage = http://wordnet.princeton.edu/; + homepage = https://wordnet.princeton.edu/; maintainers = [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 0d38f1b93e7364c65d92e18d10aa1c5463f2d6a2..968539336a9cb5cce992eac97001931ad3a140c4 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.8.5"; + version = "3.15.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw"; + sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 8c554da036216455b121b7e7bb881ed29e5f3ba2..6e92e98481ea0e2f9bb01dcbf71bf32324bbb7b3 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,39 +1,30 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, autoconf, automake, gettext, intltool, libtool, pkgconfig +{ stdenv, fetchFromGitHub, wrapGAppsHook +, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig , libICE, libSM, libXScrnSaver, libXtst, cheetah -, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm -, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: +, gobjectIntrospection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo +, cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base +, gst-plugins-good, libsigcxx }: stdenv.mkDerivation rec { name = "workrave-${version}"; - version = "1.10.7"; + version = "1.10.20"; src = let in fetchFromGitHub { - sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb"; + sha256 = "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941"; rev = with stdenv.lib; "v" + concatStringsSep "_" (splitString "." version); repo = "workrave"; owner = "rcaelers"; }; - patches = [ - # Building with gtk{,mm}3 works just fine, but let's be conservative for once: - (fetchpatch { - name = "workrave-fix-compilation-with-gtk2.patch"; - url = "https://github.com/rcaelers/workrave/commit/" - + "271efdcd795b3592bfede8b1af2162af4b1f0f26.patch"; - sha256 = "1a3d4jj8516m3m24bl6y8alanl1qnyzv5dv1hz5v3hjgk89fj6rk"; - }) - ]; - nativeBuildInputs = [ - autoconf automake gettext intltool libtool pkgconfig + autoconf autoconf-archive automake gettext intltool libtool pkgconfig wrapGAppsHook ]; buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah - glib glibmm gtkmm2 atk pango pangomm cairo cairomm - dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx + gobjectIntrospection glib glibmm gtkmm3 atk pango pangomm cairo cairomm + dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx ]; preConfigure = "./autogen.sh"; @@ -50,7 +41,7 @@ stdenv.mkDerivation rec { homepage = http://www.workrave.org/; downloadPage = https://github.com/rcaelers/workrave/releases; license = licenses.gpl3; - maintainers = with maintainers; [ nckx prikhi ]; + maintainers = with maintainers; [ prikhi ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8a23134e3ed0bae0ea65f3d4c3a6346b13e4c92d --- /dev/null +++ b/pkgs/applications/misc/wsjtx/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, + docbook_xsl, fftw, fftwFloat, gfortran, libtool, libpulseaudio, qtbase, + qtmultimedia, qtserialport, texinfo, libusb1 }: + +stdenv.mkDerivation rec { + name = "wsjtx-${version}"; + version = "1.8.0"; + + # This is a composite source tarball containing both wsjtx and a hamlib fork + src = fetchurl { + url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz"; + sha256 = "21603ad4d5f43cd9c79a6e8cf468bde88c554654012b2c6c1ef9144cfbf668ce"; + }; + + # Hamlib builds with autotools, wsjtx builds with cmake + # Omitting pkgconfig because it causes issues locating the built hamlib + nativeBuildInputs = [ + asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool + texinfo + ]; + buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ]; + + # Composite build has its own patch step after it extracts the inner archives + postPatch = "cp ${./wsjtx.patch} wsjtx.patch"; + + meta = with stdenv.lib; { + description = "Weak-signal digital communication modes for amateur radio"; + longDescription = '' + WSJT-X implements communication protocols or "modes" called FT8, JT4, JT9, + JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for + detecting and measuring your own radio signals reflected from the Moon. + These modes were all designed for making reliable, confirmed ham radio + contacts under extreme weak-signal conditions. + ''; + homepage = http://physics.princeton.edu/pulsar/k1jt/wsjtx.html; + # Older licenses are for the statically-linked hamlib + license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ]; + platforms = platforms.linux; + maintainers = [ maintainers.lasandell ]; + }; +} diff --git a/pkgs/applications/misc/wsjtx/wsjtx.patch b/pkgs/applications/misc/wsjtx/wsjtx.patch new file mode 100644 index 0000000000000000000000000000000000000000..a5bd7ec3e196095c02c834d59430767aa3c5d91b --- /dev/null +++ b/pkgs/applications/misc/wsjtx/wsjtx.patch @@ -0,0 +1,12 @@ +Index: wsjtx/CMakeLists.txt +=================================================================== +--- wsjtx/CMakeLists.txt (revision 8382) ++++ wsjtx/CMakeLists.txt (working copy) +@@ -866,6 +866,7 @@ + find_package (Qt5Widgets 5 REQUIRED) + find_package (Qt5Multimedia 5 REQUIRED) + find_package (Qt5PrintSupport 5 REQUIRED) ++find_package (Qt5SerialPort 5 REQUIRED) + + if (WIN32) + add_definitions (-DQT_NEEDS_QTMAIN) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 2d2c2e2bff25784bef54cb39489e0cc57700ff52..270380a8c3fb120b04bf8700acfe22c406587a33 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,15 +1,13 @@ { mkDerivation, lib, fetchurl, pkgconfig, which , libtool, openssl, qtbase, qttools }: -with lib; - mkDerivation rec { name = "xca-${version}"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/xca/${name}.tar.gz"; - sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84"; + sha256 = "11niik2m4yswkp71hrdh54z5kgkvdg8y0b6wdqbrn6vy1n8gz63q"; }; enableParallelBuilding = true; @@ -22,10 +20,9 @@ mkDerivation rec { meta = with lib; { description = "Interface for managing asymetric keys like RSA or DSA"; - homepage = http://xca.sourceforge.net/; - platforms = platforms.all; - license = licenses.bsd3; + homepage = http://xca.sourceforge.net/; + license = licenses.bsd3; maintainers = with maintainers; [ offline peterhoeg ]; - broken = builtins.compareVersions qtbase.version "5.7.0" == 0; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 78e1d15481ba276fa5a96d2c1269438fab5a3ca1..444ab802673e61c3098994542c789df26a632beb 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { - name = "xfe-1.37"; + name = "xfe-1.42"; src = fetchurl { url = "mirror://sourceforge/xfe/${name}.tar.gz"; - sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd"; + sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 7d22a160574095c0947d78fa19445fb9a8ec82fe..5d2b70a80ee415bec83b893874f2f184abaca773 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -1,14 +1,14 @@ # This program used to come with xorg releases, but now I could only find it -# at http://www.x.org/releases/individual/. +# at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg {stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: stdenv.mkDerivation rec { - name = "xfontsel-1.0.5"; + name = "xfontsel-1.0.6"; src = fetchurl { url = "mirror://xorg/individual/app/${name}.tar.bz2"; - sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p"; + sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; nativeBuildInputs = [ pkgconfig ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.x.org/; + homepage = https://www.x.org/; description = "Allows testing the fonts available in an X server"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 54d61a047a78b90d82f2e5a4927da46cbe3f4831..bb7b22c40a26b13cd76f49cedb6fb13f423675e2 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -3,28 +3,29 @@ , intltool , docbook2x, docbook_xml_dtd_412, libxslt , sword, clucene_core, biblesync -, gnome_doc_utils +, gnome-doc-utils , libgsf, gconf , gtkhtml, libglade, scrollkeeper , webkitgtk -, dbus_glib, enchant, isocodes, libuuid, icu +, dbus-glib, enchant, isocodes, libuuid, icu +, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "xiphos-${version}"; - version = "4.0.6"; + name = "xiphos-${version}"; + version = "4.0.7"; src = fetchFromGitHub { owner = "crosswire"; repo = "xiphos"; rev = "${version}"; - sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f"; + sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt - sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml - libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ]; + sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml + libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ]; prePatch = '' patchShebangs .; @@ -34,11 +35,11 @@ stdenv.mkDerivation rec { export CLUCENE_HOME=${clucene_core}; export SWORD_HOME=${sword}; ''; - + configurePhase = '' python waf configure --prefix=$out --enable-webkit2 ''; - + buildPhase = '' python waf build ''; @@ -50,10 +51,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GTK Bible study tool"; longDescription = '' - Xiphos (formerly known as GnomeSword) is a Bible study tool - written for Linux, UNIX, and Windows using GTK, offering a rich - and featureful environment for reading, study, and research using - modules from The SWORD Project and elsewhere. + Xiphos (formerly known as GnomeSword) is a Bible study tool + written for Linux, UNIX, and Windows using GTK, offering a rich + and featureful environment for reading, study, and research using + modules from The SWORD Project and elsewhere. ''; homepage = http://www.xiphos.org/; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..38bda9a8f560e32d53d2686dcdb82fd56d44a97e --- /dev/null +++ b/pkgs/applications/misc/xkbmon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libX11 }: + +stdenv.mkDerivation rec { + name = "xkbmon-${version}"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "xkbmon"; + repo = "xkbmon"; + rev = version; + sha256 = "1smyqsd9cpbzqaplm221a8mq0nham6rg6hjsm9g5gph94xmk6d67"; + }; + + buildInputs = [ libX11 ]; + + installPhase = "install -D -t $out/bin xkbmon"; + + meta = with stdenv.lib; { + homepage = https://github.com/xkbmon/xkbmon; + description = "Command-line keyboard layout monitor for X11"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c24e1b0c2f1f31af33ea66c681b3c46ec421efa0 --- /dev/null +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +, opencl-headers, ocl-icd, hwloc, cudatoolkit +, devDonationLevel ? "0.0" +, cudaSupport ? false +, openclSupport ? true +}: + +stdenv.mkDerivation rec { + name = "xmr-stak-${version}"; + version = "2.4.3"; + + src = fetchFromGitHub { + owner = "fireice-uk"; + repo = "xmr-stak"; + rev = "${version}"; + sha256 = "0plks4yyd9gjnfg7sfsgsvdgczkbghf5xjwb8bzv01f0fndn10r1"; + }; + + NIX_CFLAGS_COMPILE = "-O3"; + + cmakeFlags = lib.optional (!cudaSupport) "-DCUDA_ENABLE=OFF" + ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libmicrohttpd openssl hwloc ] + ++ lib.optional cudaSupport cudatoolkit + ++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; + + postPatch = '' + substituteInPlace xmrstak/donate-level.hpp \ + --replace 'fDevDonationLevel = 2.0' 'fDevDonationLevel = ${devDonationLevel}' + ''; + + meta = with lib; { + description = "Unified All-in-one Monero miner"; + homepage = "https://github.com/fireice-uk/xmr-stak"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..42d9e448991a2e15e1f530765d820a284cf38be1 --- /dev/null +++ b/pkgs/applications/misc/xmrig/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd +, donateLevel ? 0 +}: + +stdenv.mkDerivation rec { + name = "xmrig-${version}"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "xmrig"; + repo = "xmrig"; + rev = "v${version}"; + sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libuv libmicrohttpd ]; + + postPatch = '' + substituteInPlace src/donate.h --replace "kDonateLevel = 5;" "kDonateLevel = ${toString donateLevel};" + ''; + + installPhase = '' + install -vD xmrig $out/bin/xmrig + ''; + + meta = with lib; { + description = "Monero (XMR) CPU miner"; + homepage = "https://github.com/xmrig/xmrig"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix new file mode 100644 index 0000000000000000000000000000000000000000..248f629f2e912e37fcbe4784256a7e7844d29705 --- /dev/null +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, libuuid +, donateLevel ? 0 +}: + +stdenv.mkDerivation rec { + name = "xmrig-proxy-${version}"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "xmrig"; + repo = "xmrig-proxy"; + rev = "v${version}"; + sha256 = "1x10mrr58lc207zppzkjnhwah83kpxrqpa3idv01lyasv8mfkxzc"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libuv libmicrohttpd libuuid ]; + + # Set default donation level to 0%. Can be increased at runtime via --donate-level option. + postPatch = '' + substituteInPlace src/donate.h --replace "kDonateLevel = 2;" "kDonateLevel = ${toString donateLevel};" + ''; + + installPhase = '' + install -vD xmrig-proxy $out/bin/xmrig-proxy + ''; + + meta = with lib; { + description = "Monero (XMR) Stratum protocol proxy"; + homepage = "https://github.com/xmrig/xmrig-proxy"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ aij ]; + }; +} diff --git a/pkgs/applications/misc/xpdf/cmake_version.patch b/pkgs/applications/misc/xpdf/cmake_version.patch new file mode 100644 index 0000000000000000000000000000000000000000..59a51f7506d51d8d26477422d69930f5017b295c --- /dev/null +++ b/pkgs/applications/misc/xpdf/cmake_version.patch @@ -0,0 +1,15 @@ + +Fix "No known features for CXX compiler", see +https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at +https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + # + #======================================================================== + +-cmake_minimum_required(VERSION 2.8.8) ++cmake_minimum_required(VERSION 3.1.0) + + project(xpdf) + diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index ef031c4b9f4de558cd51ad08287123c20db86a4d..3cb416a5f7cb7bfb418cf6db96040c0fd51524a1 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,9 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false , stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null -, cmake, qtbase ? null +, cmake, qtbase ? null, qtsvg ? null, makeWrapper }: -assert enableGUI -> qtbase != null && freetype != null; +assert enableGUI -> qtbase != null && qtsvg != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; @@ -17,7 +17,12 @@ stdenv.mkDerivation { sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz"; }; - nativeBuildInputs = [ cmake ]; + # Fix "No known features for CXX compiler", see + # https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at + # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html + patches = stdenv.lib.optional stdenv.isDarwin ./cmake_version.patch; + + nativeBuildInputs = [ cmake makeWrapper ]; cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"]; @@ -31,6 +36,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableGUI) '' + wrapProgram $out/bin/xpdf \ + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix} + ''; + meta = { homepage = http://www.foolabs.com/xpdf/; description = "Viewer for Portable Document Format (PDF) files"; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 9e64557838eb7dfdd26cac4356d36ecb449e122c..bcaf89797b446a119e6e8631042c578581f7e0d5 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper +{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper , enableDecLocator ? true }: stdenv.mkDerivation rec { - name = "xterm-330"; + name = "xterm-332"; src = fetchurl { - url = "http://invisible-mirror.net/archives/xterm/${name}.tgz"; - sha256 = "1psnfmqd23v9gxj8a98nzrgvymrk0p1whwqi92gy15bbkzrgkvks"; + urls = [ + "ftp://ftp.invisible-island.net/xterm/${name}.tgz" + "https://invisible-mirror.net/archives/xterm/${name}.tgz" + ]; + sha256 = "0zdjiik4ravc3zld5c9i2ndrvazjmwiwbgl2c21348762wki2jsx"; }; buildInputs = @@ -17,7 +20,12 @@ stdenv.mkDerivation rec { patches = [ ./sixel-256.support.patch - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + name = "posix-ptys.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; + sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; + }); configureFlags = [ "--enable-wide-chars" @@ -56,7 +64,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://invisible-island.net/xterm; - license = "BSD"; + license = with stdenv.lib.licenses; [ mit ]; maintainers = with stdenv.lib.maintainers; [viric vrthra]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix index eae5240129a51600ec104842d340651abe3bfc3b..ae31ebd1ca7e978e36c7af7a8997f9b96cd78871 100644 --- a/pkgs/applications/misc/xtermcontrol/default.nix +++ b/pkgs/applications/misc/xtermcontrol/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; name = "xtermcontrol-${version}"; src = fetchurl { url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; - sha256 = "1v2c1cnx43apmspga7icssh5ndbhzy5h82y6vm8fda40flq9mxj5"; + sha256 = "1g81v9gfn08gjn1269j0qx12x36s9j6x39gl91ycay391flgzr5l"; }; meta = { diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix index d273d27944a85324dcbbca8c24f76965707f6a4a..0794b2b6dbe93b59d5d4a702783ec3a3eaca4c73 100644 --- a/pkgs/applications/misc/yaft/default.nix +++ b/pkgs/applications/misc/yaft/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/uobikiemukot/yaft; description = "Yet another framebuffer terminal"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 0eb33c845c39ed1c18d7d6a58c07b0317e0e4629..676cfc12eb0fc868af02a4223f330312b6c7010f 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -20,12 +20,12 @@ mkDerivation rec { pname = "yakuake"; - version = "3.0.4"; + version = "3.0.5"; name = "${pname}-${version}"; src = fetchurl { url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1q31p1cqhz8b2bikqjrr7fww86kaq723ib4ys2zwablfa1ybbqhh"; + sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8"; }; buildInputs = [ diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index bd891ff8493f7c4220faffa542cced38e35ea600..53d427e61c2c2cccad80e2a9a691ca6b13215855 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yate-${version}"; - version = "5.4.2-1"; + version = "6.0.0-1"; src = fetchurl { - url = "http://voip.null.ro/tarballs/yate5/${name}.tar.gz"; - sha256 = "08gwz0gipc5v75jv46p2yg8hg31xjp6x7jssd0rrgsa3szi5697n"; + url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz"; + sha256 = "05qqdhi3rp5660gq1484jkmxkm9vq81j0yr765h0gf0xclan1dqa"; }; # TODO zaptel ? postgres ? @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's@,/dev/null@@' configure + patchShebangs configure ''; # --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why? @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { # OpenH323 and PWlib (licensed under MPL). license = ["GPL" "MPL"]; maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..dec861009eb4ea3965622aa030e66c823ecd8fdf --- /dev/null +++ b/pkgs/applications/misc/yokadi/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, buildPythonApplication, dateutil, + sqlalchemy, setproctitle, icalendar, pycrypto }: + +buildPythonApplication rec { + pname = "yokadi"; + version = "1.1.1"; + + src = fetchurl { + url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2"; + sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17"; + }; + + propagatedBuildInputs = [ + dateutil + sqlalchemy + setproctitle + icalendar + pycrypto + ]; + + # Yokadi doesn't have any tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A command line oriented, sqlite powered, todo-list"; + homepage = https://yokadi.github.io/index.html; + license = licenses.gpl3Plus; + maintainers = [ maintainers.nipav ]; + }; +} diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 8a460f890167132183a9c29e162b19cb126aaed1..84dc144515324179f53fd4ce62c75d43365b5596 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig -, gtk, girara, ncurses, gettext, docutils -, file, sqlite, glib, texlive -, synctexSupport ? true +{ stdenv, fetchurl, fetchpatch, meson, ninja, makeWrapper, pkgconfig +, appstream-glib, desktop-file-utils, python3 +, gtk, girara, ncurses, gettext, libxml2 +, file, sqlite, glib, texlive, libintl, libseccomp +, gtk-mac-integration, synctexSupport ? true }: assert synctexSupport -> texlive != null; @@ -9,48 +10,42 @@ assert synctexSupport -> texlive != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "zathura-core-${version}"; - version = "0.3.7"; + name = "zathura-core-${version}"; + version = "0.3.9"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "1w0g74dq4z2vl3f99s2gkaqrb5pskgzig10qhbxj4gq9yj4zzbr2"; + url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"; + sha256 = "0z09kz92a2n8qqv3cy8bx5j5k612g2f9mmh4szqlc7yvi39aax1g"; }; - icon = ./icon.xpm; + patches = [ + (fetchpatch { + url = https://git.pwmt.org/pwmt/zathura/commit/4223464db68529f9a2064ed760fb7746b3c0df6b.patch; + sha256 = "004j68b7c8alxzyx0d80lr5i43cgh7lbqm5fx3d77ihci7hdmxnw"; + }) + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - file gtk girara - gettext makeWrapper sqlite glib - ] ++ optional synctexSupport texlive.bin.core; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - makeFlags = [ - "PREFIX=$(out)" - "RSTTOMAN=${docutils}/bin/rst2man.py" - "VERBOSE=1" - "TPUT=${ncurses.out}/bin/tput" - (optionalString synctexSupport "WITH_SYNCTEX=1") + nativeBuildInputs = [ + meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx + gettext makeWrapper libxml2 ]; + buildInputs = [ + file gtk girara libintl libseccomp + sqlite glib + ] ++ optional synctexSupport texlive.bin.core + ++ optional stdenv.isDarwin [ gtk-mac-integration ]; + postInstall = '' wrapProgram "$out/bin/zathura" \ - --prefix PATH ":" "${makeBinPath [ file ]}" \ - --prefix XDG_CONFIG_DIRS ":" "$out/etc" - - install -Dm644 $icon $out/share/pixmaps/pwmt.xpm - mkdir -pv $out/etc - echo "set window-icon $out/share/pixmaps/pwmt.xpm" > $out/etc/zathurarc - echo "Icon=pwmt" >> $out/share/applications/zathura.desktop + --prefix PATH ":" "${makeBinPath [ file ]}" ''; meta = { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura/; description = "A core component for zathura PDF viewer"; - license = licenses.zlib; - platforms = platforms.linux; + license = licenses.zlib; + platforms = platforms.unix; maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/applications/misc/zathura/core/icon.xpm b/pkgs/applications/misc/zathura/core/icon.xpm deleted file mode 100644 index a863c5ddb090c546c7da638aa4e773bac78bc1fd..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/zathura/core/icon.xpm +++ /dev/null @@ -1,120 +0,0 @@ -/* XPM */ -static char *freeimage[] = { -/* width height num_colors chars_per_pixel */ -"16 16 96 2", -/* colors */ -" c #1e1e1e", -" . c #222222", -" X c #212121", -" o c #535353", -" O c #a4a4a4", -" + c #202020", -" @ c #252525", -" # c #3c3c3c", -" $ c #292929", -" % c #979797", -" & c #cccccc", -" * c #303030", -" = c #1f1f1f", -" - c #494949", -" ; c #dddddd", -" : c #696969", -" > c #232323", -" , c #262626", -" < c #adadad", -" 1 c #bbbbbb", -" 2 c #1d1d1d", -" 3 c #1c1c1c", -" 4 c #5e5e5e", -" 5 c #e8e8e8", -" 6 c #9c9c9c", -" 7 c #242424", -" 8 c #b1b1b1", -" 9 c #b3b3b3", -" 0 c #090909", -" q c #161616", -" w c #131313", -" e c #4d4d4d", -" r c #dedede", -" t c #afafaf", -" y c #282828", -" u c #393939", -" i c #c4c4c4", -" p c #dcdcdc", -" a c #9a9a9a", -" s c #a2a2a2", -" d c #ababab", -" f c #313131", -" g c #a7a7a7", -" h c #e4e4e4", -" j c #f2f2f2", -" k c #eaeaea", -" l c #e2e2e2", -" z c #f0f0f0", -" x c #d5d5d5", -" c c #737373", -" v c #323232", -" b c #808080", -" n c #7a7a7a", -" m c #d3d3d3", -" M c #e5e5e5", -" N c #8a8a8a", -" B c #cbcbcb", -" V c #b5b5b5", -" C c #b9b9b9", -" Z c #272727", -" A c #b4b4b4", -" S c #bababa", -" D c #2d2d2d", -" F c #414141", -" G c #444444", -" H c #f4f4f4", -" J c #838383", -" K c #cfcfcf", -" L c #fafafa", -" P c #efefef", -" I c #e3e3e3", -" U c #8d8d8d", -" Y c #656565", -" T c #ffffff", -" R c #fbfbfb", -" E c #e9e9e9", -" W c #bdbdbd", -" Q c #e1e1e1", -" ! c #dfdfdf", -" ~ c #646464", -" ^ c #3a3a3a", -" / c #a1a1a1", -" ( c #999999", -" ) c #c0c0c0", -" _ c #3b3b3b", -" ` c #acacac", -" ' c #050505", -" ] c #151515", -" [ c #1b1b1b", -" { c #1a1a1a", -" } c #b2b2b2", -" | c #a5a5a5", -". c #c5c5c5", -".. c #a6a6a6", -".X c #bfbfbf", -".o c #747474", -/* pixels */ -" ", -" . . . X X X X . o O + X . . ", -" . . X @ # $ . @ % & * = . . ", -" . . - ; : > , < 1 2 X . . ", -" . . 3 4 5 6 7 7 8 9 0 q q 3 ", -" . + w e r t y u i p a s d 4 ", -" X f g h j k p l z z x g c v ", -" X f b n m M N c B V 3 , > X ", -" X X w V C $ Z A S + $ , . ", -" D F G u S H 1 J K L P I U @ ", -" Y T T T R E & W Q ! d g ~ 7 ", -" ^ / 6 ( ; ) _ 2 ` 8 ' ] [ X ", -" + > 7 { A } 7 @ |. $ + . . ", -" X X X ].. 8 Z 7 n.X + X . . ", -" . . . { n.o 7 . @ y X X . . ", -" " -}; - diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 34508da0e371c89f38b757657bd41b635db710aa..58985dced4255826efe69edbf75052082a8075b0 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,29 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.2.5"; + name = "zathura-djvu-0.2.8"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ djvulibre gettext zathura_core gtk girara ]; - patches = [ ./gtkflags.patch ]; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with stdenv.lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-djvu/; description = "A zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the djvulibre library. ''; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/applications/misc/zathura/djvu/gtkflags.patch b/pkgs/applications/misc/zathura/djvu/gtkflags.patch deleted file mode 100644 index 2a2fe298a7b9d6a3709b2fc6744ec68a611b7f05..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/zathura/djvu/gtkflags.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/config.mk 2012-05-14 01:13:09.009740082 +0400 -+++ b/config.mk 2012-05-14 01:13:50.400525700 +0400 -@@ -11,6 +11,9 @@ - LIBDIR ?= ${PREFIX}/lib - - # libs -+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) -+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0) -+ - CAIRO_INC ?= $(shell pkg-config --cflags cairo) - CAIRO_LIB ?= $(shell pkg-config --libs cairo) - -@@ -29,8 +32,8 @@ - PLUGINDIR = ${LIBDIR}/zathura - endif - --INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC} --LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} -+INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC} ${GTK_INC} -+LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${GTK_LIB} - - # flags - CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index c9472f35667270eb898257c1bc0658d8a462aae4..86fe453465a5156c2cec54bb7862716414113e2b 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,29 +1,35 @@ -{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl -, libjpeg, jbig2dec, openjpeg, fetchpatch }: +{ stdenv, lib, meson, ninja, fetchurl, pkgconfig, zathura_core, cairo, +gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec, +openjpeg, fetchpatch }: stdenv.mkDerivation rec { - version = "0.3.1"; + version = "0.3.3"; name = "zathura-pdf-mupdf-${version}"; src = fetchurl { - url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz"; - sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr"; + url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.xz"; + sha256 = "1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + buildInputs = [ + zathura_core girara mupdf cairo + ] ++ stdenv.lib.optional stdenv.isDarwin [ + gtk-mac-integration + ]; + + PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-pdf-mupdf/; description = "A zathura PDF plugin (mupdf)"; longDescription = '' The zathura-pdf-mupdf plugin adds PDF support to zathura by using the mupdf rendering library. ''; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 2dda88f409b50992d72be81d181ad357d2a5cb3e..663e798ee0b4140cce4e30d8520b3575fd4d56ed 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,28 +1,28 @@ -{ stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }: +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }: stdenv.mkDerivation rec { - version = "0.2.6"; + version = "0.2.9"; name = "zathura-pdf-poppler-${version}"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "1p4jcny0jniygns78mcf0nlm298dszh49qpmjmackrm6dq8hc25y"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ poppler zathura_core girara ]; + nativeBuildInputs = [ meson ninja pkgconfig zathura_core ]; + buildInputs = [ poppler girara ]; - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-pdf-poppler/; description = "A zathura PDF plugin (poppler)"; longDescription = '' - The zathura-pdf-poppler plugin adds PDF support to zathura by + The zathura-pdf-poppler plugin adds PDF support to zathura by using the poppler rendering library. ''; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ cstrahan garbas ]; }; } diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index a415cde3c7ee9ea1e894c6f53c1a87bc0d8f1144..07e4c5d715b7f7178fa07d66cc92c5cd381b4005 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,29 +1,27 @@ -{ stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }: +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.2.3"; + name = "zathura-ps-0.2.6"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libspectre gettext zathura_core gtk girara ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + buildInputs = [ libspectre zathura_core girara ]; - patches = [ ./gtkflags.patch ]; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-ps/; description = "A zathura PS plugin"; longDescription = '' The zathura-ps plugin adds PS support to zathura by using the libspectre library. ''; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ cstrahan garbas ]; }; } diff --git a/pkgs/applications/misc/zathura/ps/gtkflags.patch b/pkgs/applications/misc/zathura/ps/gtkflags.patch deleted file mode 100644 index 7c944a12f0ef9e9394138e7faaa3dcf75d1fed59..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/zathura/ps/gtkflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/config.mk b/config.mk.new -index c3a7b37..0cbce67 100644 ---- a/config.mk -+++ b/config.mk -@@ -10,6 +10,9 @@ ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERS - PREFIX ?= /usr - - # libs -+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) -+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0) -+ - CAIRO_INC ?= $(shell pkg-config --cflags cairo) - CAIRO_LIB ?= $(shell pkg-config --libs cairo) - -@@ -26,8 +29,8 @@ ZATHURA_INC ?= $(shell pkg-config --cflags zathura) - PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura) - PLUGINDIR ?= ${PREFIX}/lib/zathura - --INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC} --LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} -+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC} ${GTK_INC} -+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${GTK_LIB} - - # flags - CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 55ac9bd187a75f9dc24cab704750b3631614ef43..64f617782f2d6354db7d0323c0a1e09fab1723fd 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -1,7 +1,7 @@ { symlinkJoin, lib, makeWrapper, zathura_core, plugins ? [] }: let - pluginsPath = lib.makeLibraryPath plugins; + pluginsPath = lib.makeSearchPath "lib/zathura" plugins; in symlinkJoin { name = "zathura-with-plugins-${zathura_core.version}"; @@ -11,12 +11,11 @@ in symlinkJoin { buildInputs = [ makeWrapper ]; postBuild = '' - wrapProgram $out/bin/zathura \ - --add-flags --plugins-dir=${pluginsPath} + wrapProgram $out/bin/zathura --add-flags --plugins-dir=${pluginsPath} ''; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura/; description = "A highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the @@ -25,7 +24,7 @@ in symlinkJoin { as well as an easy usage that mainly focuses on keyboard interaction. ''; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers;[ garbas smironov ]; }; } diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d593947f3e624d4bad29dc846c517f4580a61c55 --- /dev/null +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, xorg, jre, makeWrapper, makeDesktopItem }: + +let + rpath = stdenv.lib.makeLibraryPath (with xorg; [ + libXtst + ]); + + desktopItem = makeDesktopItem { + name = "apache-directory-studio"; + exec = "ApacheDirectoryStudio"; + icon = "apache-directory-studio"; + comment = "Eclipse-based LDAP browser and directory client"; + desktopName = "Apache Directory Studio"; + genericName = "Apache Directory Studio"; + categories = "Java;Network"; + }; + +in +stdenv.mkDerivation rec { + name = "apache-directory-studio-${version}"; + version = "2.0.0.v20170904-M13"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "mirror://apache/directory/studio/${version}/ApacheDirectoryStudio-${version}-linux.gtk.x86_64.tar.gz"; + sha256 = "1jfnm6m0ijk31r30hhrxxnizk742dm317iny041p29v897rma7aq"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "mirror://apache/directory/studio/${version}/ApacheDirectoryStudio-${version}-linux.gtk.x86.tar.gz"; + sha256 = "1bxmgram42qyhrqkgp5k8770f5mjjdd4c6xl4gj09smiycm1qa4n"; + } + else throw "Unsupported system: ${stdenv.system}"; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + dest="$out/libexec/ApacheDirectoryStudio" + mkdir -p "$dest" + cp -r . "$dest" + + mkdir -p "$out/bin" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$dest/ApacheDirectoryStudio" + makeWrapper "$dest/ApacheDirectoryStudio" \ + "$out/bin/ApacheDirectoryStudio" \ + --prefix PATH : "${jre}/bin" \ + --prefix LD_LIBRARY_PATH : "${rpath}" + install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" + install -D -t "$out/share/applications" ${desktopItem}/share/applications/* + ''; + + meta = with stdenv.lib; { + description = "Eclipse-based LDAP browser and directory client"; + homepage = "https://directory.apache.org/studio/"; + license = licenses.asl20; + # Upstream supports macOS and Windows too. + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix index 3fa7fe180402af3739d5a71cd5aa511c571b75e7..eb988471c8c737efa817ef25238a2cb08e302cfb 100644 --- a/pkgs/applications/networking/bittorrentsync/generic.nix +++ b/pkgs/applications/networking/bittorrentsync/generic.nix @@ -4,8 +4,9 @@ let arch = { "x86_64-linux" = "x64"; "i686-linux" = "i386"; - }.${stdenv.system}; + }.${stdenv.system} or throwSystem; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; + throwSystem = throw "Unsupported system: ${stdenv.system}"; in stdenv.mkDerivation rec { @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz" "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz" ]; - sha256 = sha256s.${stdenv.system}; + sha256 = sha256s.${stdenv.system} or throwSystem; }; dontStrip = true; # Don't strip, otherwise patching the rpaths breaks diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 54fee5847e18f8b0e6d49c80a77f26676c3a9b2b..e35d894e0e7eb6a9532e5993249ad56318fe7f2e 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -50,6 +50,6 @@ mkChromiumDerivation (base: rec { maintainers = with maintainers; [ chaoflow bendlas ]; license = licenses.bsd3; platforms = platforms.linux; - hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else []; + hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 82c2c6aa53fc74f76efe4d57e7491369b479658a..b591d5d7ba0cdbd2ccdee45034c9182c59538237 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, ninja, which, nodejs, fetchurl, gnutar +{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -11,8 +11,8 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, gtk3, dbus_glib -, libXScrnSaver, libXcursor, libXtst, mesa +, glib, gtk2, gtk3, dbus-glib +, libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups , ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 @@ -25,7 +25,7 @@ , enableHotwording ? false , enableWideVine ? false , gnomeSupport ? false, gnome ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null @@ -44,6 +44,15 @@ let # source tree. extraAttrs = buildFun base; + gentooPatch = name: sha256: fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}"; + inherit sha256; + }; + githubPatch = commit: sha256: fetchpatch { + url = "https://github.com/chromium/chromium/commit/${commit}.patch"; + inherit sha256; + }; + mkGnFlags = let # Serialize Nix types into GN types according to this document: @@ -64,9 +73,8 @@ let # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* # "re2" # fails with linker errors # "ffmpeg" # https://crbug.com/731766 - ] ++ optionals (versionRange "62" "63") [ - "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together - # so we can't build with one from system and other from source + # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source ]; opusWithCustomModes = libopus.override { @@ -80,9 +88,8 @@ let xdg_utils yasm minizip libwebp libusb1 re2 zlib ffmpeg libxslt libxml2 - ] ++ optionals (versionRange "62" "63") [ - harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together - # so we can't build with one from system and other from source + # harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source ]; # build paths and release info @@ -122,36 +129,40 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 gtk3 dbus_glib - libXScrnSaver libXcursor libXtst mesa + glib gtk2 gtk3 dbus-glib + libXScrnSaver libXcursor libXtst libGLU_combined pciutils protobuf speechd libXdamage - ] ++ optional gnomeKeyringSupport libgnome_keyring3 + ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; 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 - ] # As major versions are added, you can trawl the gentoo and arch repos at + # As major versions are added, you can trawl the gentoo and arch repos at # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags - ++ optionals (versionRange "62" "63") [ - ./patches/chromium-gn-bootstrap-r17.patch - ./patches/chromium-gcc5-r3.patch - ./patches/chromium-glibc2.26-r1.patch - ] - ++ optionals (versionRange "63" "64") [ - ./patches/chromium-gcc5-r4.patch - ./patches/include-math-for-round.patch - ] - ++ optionals (versionAtLeast version "64") [ - ./patches/gn_bootstrap_observer.patch - ] - ++ optional enableWideVine ./patches/widevine.patch; + # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") + ] ++ optionals (versionRange "66" "67") [ + (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd") + (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4") + # GCC 7 fixes + (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv") + (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj") + (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj") + (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj") + (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw") + (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z") + (fetchpatch { + ## see https://groups.google.com/a/chromium.org/forum/#!msg/chromium-packagers/So-ojMYOQdI/K66hndtdCAAJ + url = "https://bazaar.launchpad.net/~chromium-team/chromium-browser/bionic-stable/download/head:/addmissingblinktools-20180416203514-02f50sz15c2mn6ei-1/add-missing-blink-tools.patch"; + sha256 = "0dc4cmd05qjqyihrd4qb34kz0jlapjgah8bzgnvxf9m4791w062z"; + }) + ] ++ optional enableWideVine ./patches/widevine.patch + ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [ + ./patches/skia_buildfix.patch + ]; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX @@ -200,6 +211,9 @@ let \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ -delete done + '' + optionalString stdenv.isAarch64 '' + substituteInPlace build/toolchain/linux/BUILD.gn \ + --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' ''; gnFlags = mkGnFlags ({ @@ -211,6 +225,7 @@ let proprietary_codecs = false; use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; + ## FIXME remove use_gconf after chromium 65 has become stable use_gconf = gnomeSupport; use_gio = gnomeSupport; enable_nacl = enableNaCl; @@ -269,15 +284,14 @@ let ninja -C "${buildPath}" \ -j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \ "${target}" - '' + optionalString (target == "mksnapshot" || target == "chrome") '' - paxmark m "${buildPath}/${target}" - '' + optionalString (versionAtLeast version "63") '' ( source chrome/installer/linux/common/installer.include PACKAGE=$packageName MENUNAME="Chromium" process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1" ) + '' + optionalString (target == "mksnapshot" || target == "chrome") '' + paxmark m "${buildPath}/${target}" ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 911b55b115f9fde03c4c6b05a5098f7b225b4afb..1458a1816569e7103fc6820b4513489227cef861 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, stdenv, makeWrapper, makeDesktopItem, ed -, glib, gtk3, gnome3, gsettings_desktop_schemas +, glib, gtk3, gnome3, gsettings-desktop-schemas # package customization , channel ? "stable" @@ -75,7 +75,7 @@ in stdenv.mkDerivation { makeWrapper ed # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk3 + gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS gnome3.defaultIconTheme @@ -90,7 +90,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - ${commandLineArgs} \ + --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ed -v -s "$out/bin/chromium" << EOF @@ -117,13 +117,19 @@ in stdenv.mkDerivation { ln -s "$out/bin/chromium" "$out/bin/chromium-browser" mkdir -p "$out/share/applications" - for f in '${chromium.browser}'/share/*; do + for f in '${chromium.browser}'/share/*; do # hello emacs */ ln -s -t "$out/share/" "$f" done cp -v "${desktopItem}/share/applications/"* "$out/share/applications" ''; - inherit (chromium.browser) meta packageName; + inherit (chromium.browser) packageName; + meta = chromium.browser.meta // { + broken = if enableWideVine then + builtins.trace "WARNING: WideVine is not functional, please only use for testing" + true + else false; + }; passthru = { inherit (chromium) upstream-info browser; diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch deleted file mode 100644 index 7605df6b145afcd08fd342186ce794eaaf8c5906..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include -+#include - #include - #include - ---- a/gpu/ipc/common/mailbox_struct_traits.h -+++ b/gpu/ipc/common/mailbox_struct_traits.h -@@ -15,7 +15,7 @@ namespace mojo { - template <> - struct StructTraits { - static base::span name(const gpu::Mailbox& mailbox) { -- return mailbox.name; -+ return base::make_span(mailbox.name); - } - static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); - }; ---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -@@ -134,7 +134,7 @@ struct StructTraits { - static base::span matrix(const cc::FilterOperation& operation) { - if (operation.type() != cc::FilterOperation::COLOR_MATRIX) - return base::span(); -- return operation.matrix(); -+ return base::make_span(operation.matrix()); - } - - static base::span shape( ---- a/services/viz/public/cpp/compositing/quads_struct_traits.h -+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h -@@ -284,7 +284,7 @@ - - static base::span vertex_opacity(const cc::DrawQuad& input) { - const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input); -- return quad->vertex_opacity; -+ return base::make_span(quad->vertex_opacity); - } - - static bool y_flipped(const cc::DrawQuad& input) { ---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp -+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp -@@ -480,7 +480,7 @@ WebString AccessControlErrorString( - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch deleted file mode 100644 index cb978d58a060bb7302a13a9c66c63e2f5690400a..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include -+#include - #include - #include - ---- a/gpu/ipc/common/mailbox_struct_traits.h -+++ b/gpu/ipc/common/mailbox_struct_traits.h -@@ -15,7 +15,7 @@ namespace mojo { - template <> - struct StructTraits { - static base::span name(const gpu::Mailbox& mailbox) { -- return mailbox.name; -+ return base::make_span(mailbox.name); - } - static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); - }; ---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -@@ -134,7 +134,7 @@ struct StructTraits { - static base::span matrix(const cc::FilterOperation& operation) { - if (operation.type() != cc::FilterOperation::COLOR_MATRIX) - return base::span(); -- return operation.matrix(); -+ return base::make_span(operation.matrix()); - } - - static base::span shape( ---- a/services/viz/public/cpp/compositing/quads_struct_traits.h -+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h -@@ -303,7 +303,7 @@ struct StructTraits { - static base::span vertex_opacity(const viz::DrawQuad& input) { - const viz::TextureDrawQuad* quad = - viz::TextureDrawQuad::MaterialCast(&input); -- return quad->vertex_opacity; -+ return base::make_span(quad->vertex_opacity); - } - - static bool y_flipped(const viz::DrawQuad& input) { ---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp -+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp -@@ -480,7 +480,7 @@ WebString AccessControlErrorString( - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch deleted file mode 100644 index ec37a2816d5194553f4aae0184fa502ea12530e6..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch +++ /dev/null @@ -1,220 +0,0 @@ -diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -index c80724d..052ce37 100644 ---- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -36,19 +36,19 @@ namespace google_breakpad { - - // Minidump defines register structures which are different from the raw - // structures which we get from the kernel. These are platform specific --// functions to juggle the ucontext and user structures into minidump format. -+// functions to juggle the ucontext_t and user structures into minidump format. - - #if defined(__i386__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_ESP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_EIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__x86_64) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RSP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__ARM_EABI__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_ARM_FULL; - - out->iregs[0] = uc->uc_mcontext.arm_r0; -@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { - - #elif defined(__aarch64__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; - -@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__mips__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - #if _MIPS_SIM == _ABI64 - out->context_flags = MD_CONTEXT_MIPS64_FULL; - #elif _MIPS_SIM == _ABIO32 -diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -index b6e77b4..2de80b7 100644 ---- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -39,23 +39,23 @@ - - namespace google_breakpad { - --// Wraps platform-dependent implementations of accessors to ucontext structs. -+// Wraps platform-dependent implementations of accessors to ucontext_t structs. - struct UContextReader { -- static uintptr_t GetStackPointer(const struct ucontext* uc); -+ static uintptr_t GetStackPointer(const ucontext_t* uc); - -- static uintptr_t GetInstructionPointer(const struct ucontext* uc); -+ static uintptr_t GetInstructionPointer(const ucontext_t* uc); - -- // Juggle a arch-specific ucontext into a minidump format -+ // Juggle a arch-specific ucontext_t into a minidump format - // out: the minidump structure - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp); - #elif defined(__aarch64__) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); - #else -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); - #endif - }; - -diff --git a/breakpad/src/client/linux/handler/exception_handler.cc b/breakpad/src/client/linux/handler/exception_handler.cc -index 586d84e..05936d2 100644 ---- a/breakpad/src/client/linux/handler/exception_handler.cc -+++ b/breakpad/src/client/linux/handler/exception_handler.cc -@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { - // Fill in all the holes in the struct to make Valgrind happy. - memset(&g_crash_context_, 0, sizeof(g_crash_context_)); - memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); -- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); -+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); - #if defined(__aarch64__) -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context* fp_ptr = - (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { -@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { - } - #elif !defined(__ARM_EABI__) && !defined(__mips__) - // FP state is not part of user ABI on ARM Linux. -- // In case of MIPS Linux FP state is already part of struct ucontext -+ // In case of MIPS Linux FP state is already part of ucontext_t - // and 'float_state' is not a member of CrashContext. -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - if (uc_ptr->uc_mcontext.fpregs) { - memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, - sizeof(g_crash_context_.float_state)); -@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { - // ExceptionHandler::HandleSignal(). - siginfo.si_code = SI_USER; - siginfo.si_pid = getpid(); -- struct ucontext context; -+ ucontext_t context; - getcontext(&context); - return HandleSignal(sig, &siginfo, &context); - } -diff --git a/breakpad/src/client/linux/handler/exception_handler.h b/breakpad/src/client/linux/handler/exception_handler.h -index daba57e..25598a2 100644 ---- a/breakpad/src/client/linux/handler/exception_handler.h -+++ b/breakpad/src/client/linux/handler/exception_handler.h -@@ -191,11 +191,11 @@ class ExceptionHandler { - struct CrashContext { - siginfo_t siginfo; - pid_t tid; // the crashing thread. -- struct ucontext context; -+ ucontext_t context; - #if !defined(__ARM_EABI__) && !defined(__mips__) - // #ifdef this out because FP state is not part of user ABI for Linux ARM. - // In case of MIPS Linux FP state is already part of struct -- // ucontext so 'float_state' is not required. -+ // ucontext_t so 'float_state' is not required. - fpstate_t float_state; - #endif - }; -diff --git a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc -index 3764eec..80ad5c4 100644 ---- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc -+++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc -@@ -593,7 +593,7 @@ class MicrodumpWriter { - - void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } - -- const struct ucontext* const ucontext_; -+ const ucontext_t* const ucontext_; - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; - #endif -diff --git a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc -index d11ba6e..c716143 100644 ---- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc -+++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc -@@ -1323,7 +1323,7 @@ class MinidumpWriter { - const int fd_; // File descriptor where the minidum should be written. - const char* path_; // Path to the file where the minidum should be written. - -- const struct ucontext* const ucontext_; // also from the signal handler -+ const ucontext_t* const ucontext_; // also from the signal handler - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; // ditto - #endif diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch deleted file mode 100644 index 6cfd08d58c237c5bc4f2a20f426a3d45bbf32302..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options): - - write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h', - { -+ 'ENABLE_LOCATION_SOURCE': 'false', - 'ENABLE_PROFILING': 'false', - 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false' - }) -@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options): - - write_gn_ninja(os.path.join(tempdir, 'build.ninja'), - root_gen_dir, options) -- cmd = ['ninja', '-C', tempdir] -+ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err'] - if options.verbose: - cmd.append('-v') - -@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/metrics/bucket_ranges.cc', - 'base/metrics/field_trial.cc', - 'base/metrics/field_trial_param_associator.cc', -+ 'base/metrics/field_trial_params.cc', - 'base/metrics/histogram.cc', - 'base/metrics/histogram_base.cc', - 'base/metrics/histogram_functions.cc', -@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/task_scheduler/scheduler_lock_impl.cc', - 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc', - 'base/task_scheduler/scheduler_worker.cc', -+ 'base/task_scheduler/scheduler_worker_pool.cc', - 'base/task_scheduler/scheduler_worker_pool_impl.cc', - 'base/task_scheduler/scheduler_worker_pool_params.cc', - 'base/task_scheduler/scheduler_worker_stack.cc', -@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/third_party/icu/icu_utf.cc', - 'base/third_party/nspr/prtime.cc', - 'base/threading/post_task_and_reply_impl.cc', -+ 'base/threading/scoped_blocking_call.cc', - 'base/threading/sequence_local_storage_map.cc', - 'base/threading/sequenced_task_runner_handle.cc', - 'base/threading/sequenced_worker_pool.cc', -@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/unguessable_token.cc', - 'base/value_iterators.cc', - 'base/values.cc', -- 'base/value_iterators.cc', - 'base/vlog.cc', - ]) - -@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options): - static_libraries['base']['sources'].extend([ - 'base/memory/shared_memory_handle_posix.cc', - 'base/memory/shared_memory_posix.cc', -- 'base/memory/shared_memory_tracker.cc', - 'base/nix/xdg_util.cc', - 'base/process/internal_linux.cc', - 'base/process/memory_linux.cc', -@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options): - cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args] - check_call(cmd) - -- cmd = ['ninja', '-C', build_dir] -+ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err'] - if options.verbose: - cmd.append('-v') - cmd.append('gn') diff --git a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch deleted file mode 100644 index 9f187752ea675096bae8b5f52892f0682010f52c..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch +++ /dev/null @@ -1,98 +0,0 @@ -From aab2cc3a20af9ebe9ddb8dfd15089f131f95817f Mon Sep 17 00:00:00 2001 -From: Tomas Popela -Date: Fri, 20 Oct 2017 14:06:42 +0200 -Subject: [PATCH] Fix the build of base/numerics with GCC - -Initialize the uninitialized variables where the build is failing. - -BUG=776705 - -Change-Id: I5782e18086a752b3676f8738930bf0553f3f97ad ---- - base/numerics/checked_math_impl.h | 6 +++--- - base/numerics/clamped_math_impl.h | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h -index 2926b37b5e..e083389ebf 100644 ---- a/base/numerics/checked_math_impl.h -+++ b/base/numerics/checked_math_impl.h -@@ -67,7 +67,7 @@ struct CheckedAddOp::value) { - presult = static_cast(x) + static_cast(y); -@@ -127,7 +127,7 @@ struct CheckedSubOp::value) { - presult = static_cast(x) - static_cast(y); -@@ -183,7 +183,7 @@ struct CheckedMulOp::is_supported) { - // The fast op may be available with the promoted type. -diff --git a/base/numerics/clamped_math_impl.h b/base/numerics/clamped_math_impl.h -index 7b5e4346f2..303a7e945a 100644 ---- a/base/numerics/clamped_math_impl.h -+++ b/base/numerics/clamped_math_impl.h -@@ -87,7 +87,7 @@ struct ClampedAddOp(IsValueNegative(y)); -- V result; -+ V result = {}; - return BASE_NUMERICS_LIKELY((CheckedAddOp::Do(x, y, &result))) - ? result - : saturated; -@@ -114,7 +114,7 @@ struct ClampedSubOp(!IsValueNegative(y)); -- V result; -+ V result = {}; - return BASE_NUMERICS_LIKELY((CheckedSubOp::Do(x, y, &result))) - ? result - : saturated; -@@ -136,7 +136,7 @@ struct ClampedMulOp::is_supported) - return ClampedMulFastOp::template Do(x, y); - -- V result; -+ V result = {}; - const V saturated = - CommonMaxOrMin(IsValueNegative(x) ^ IsValueNegative(y)); - return BASE_NUMERICS_LIKELY((CheckedMulOp::Do(x, y, &result))) -@@ -156,7 +156,7 @@ struct ClampedDivOp::type; - template - static constexpr V Do(T x, U y) { -- V result; -+ V result = {}; - if (BASE_NUMERICS_LIKELY((CheckedDivOp::Do(x, y, &result)))) - return result; - // Saturation goes to max, min, or NaN (if x is zero). -@@ -176,7 +176,7 @@ struct ClampedModOp::type; - template - static constexpr V Do(T x, U y) { -- V result; -+ V result = {}; - return BASE_NUMERICS_LIKELY((CheckedModOp::Do(x, y, &result))) - ? result - : x; --- -2.14.2 - 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 deleted file mode 100644 index 093598465c47e6c64e6aaa19e1abf460747e937f..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch +++ /dev/null @@ -1,77 +0,0 @@ -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/patches/gn_bootstrap_observer.patch b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch deleted file mode 100644 index f1207439bb4da7d04016b984e7a2b79f1d775255..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py 2017-11-07 23:06:09.000000000 +0000 -+++ b/tools/gn/bootstrap/bootstrap.py 2017-11-08 12:17:16.569216182 +0000 -@@ -481,6 +481,7 @@ - 'base/metrics/sample_vector.cc', - 'base/metrics/sparse_histogram.cc', - 'base/metrics/statistics_recorder.cc', -+ 'base/observer_list_threadsafe.cc', - 'base/path_service.cc', - 'base/pending_task.cc', - 'base/pickle.cc', - diff --git a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch deleted file mode 100644 index 530493dcd0f6e70974925b0db1bd68c975c64cec..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Fri, 13 Oct 2017 15:49:32 +0200 -Subject: [PATCH] IWYU: Include math.h for round(3). - -math.h was being implicitly included, which can break the build with -alternative libc implementations. - -Bug: None -Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952 -Reviewed-on: https://webrtc-review.googlesource.com/9384 -Reviewed-by: Tommi -Commit-Queue: Raphael Kubo da Costa (rakuco) -Cr-Commit-Position: refs/heads/master@{#20292} ---- - p2p/base/port.cc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/third_party/webrtc/p2p/base/port.cc b/third_party/webrtc/p2p/base/port.cc -index a1b478d11..81aa0aadb 100644 ---- a/third_party/webrtc/p2p/base/port.cc -+++ b/third_party/webrtc/p2p/base/port.cc -@@ -10,6 +10,8 @@ - - #include "p2p/base/port.h" - -+#include -+ - #include - #include - --- -2.15.0 - diff --git a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch new file mode 100644 index 0000000000000000000000000000000000000000..5348b9ac905b2ec68c679c0823830f60dee58af8 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch @@ -0,0 +1,22 @@ +Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp +=================================================================== +--- chromium-browser-65.0.3325.73.orig/third_party/skia/src/jumper/SkJumper_stages.cpp ++++ chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp +@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) { + } + + SI F from_half(U16 h) { +-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. ++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. + return vcvt_f32_f16(h); + + #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) +@@ -686,7 +686,7 @@ SI F from_half(U16 h) { + } + + SI U16 to_half(F f) { +-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. ++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. + return vcvt_f16_f32(f); + + #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index d9adad1189f8cf8a7c8af3f969664277c36d6142..f0862aebafe522c516ee3a8e63c121a6ad19cf95 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,6 +1,10 @@ { stdenv , jshon +, glib +, nspr +, nss , fetchzip +, patchelfUnstable , enablePepperFlash ? false , enableWideVine ? false @@ -45,6 +49,8 @@ let src = upstream-info.binary; + nativeBuildInputs = [ patchelfUnstable ]; + phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; unpackCmd = let @@ -63,14 +69,12 @@ let ! find -iname '*.so' -exec ldd {} + | grep 'not found' ''; - patchPhase = '' - for sofile in libwidevinecdm.so libwidevinecdmadapter.so; do - chmod +x "$sofile" - patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" "$sofile" - done + PATCH_RPATH = mkrpath [ stdenv.cc.cc glib nspr nss ]; - patchelf --set-rpath "$out/lib:${mkrpath [ stdenv.cc.cc ]}" \ - libwidevinecdmadapter.so + patchPhase = '' + chmod +x libwidevinecdm.so libwidevinecdmadapter.so + patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so + patchelf --set-rpath "$out/lib:$PATCH_RPATH" libwidevinecdmadapter.so ''; installPhase = let @@ -94,12 +98,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "27.0.0.187"; + version = "29.0.0.140"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "102z9aflm0a29klc26jch3wl4y8hdrxzqdqvf5yj0bnibx3hwpsy"; + sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix index 3b9ea39664730a7582cff454bb67d94f671876e9..277ad29abe297bdd006016993be87c0ef4dfd47f 100644 --- a/pkgs/applications/networking/browsers/chromium/update.nix +++ b/pkgs/applications/networking/browsers/chromium/update.nix @@ -145,7 +145,7 @@ in rec { outputHashMode = "flat"; outputHashAlgo = "md5"; - buildInputs = [ curl ]; + nativeBuildInputs = [ curl ]; preferLocalBuild = true; buildCommand = '' @@ -178,7 +178,7 @@ in rec { getHash = path: import (runCommand "gethash.nix" { inherit path; - buildInputs = [ nix ]; + nativeBuildInputs = [ nix ]; } '' sha256="$(nix-hash --flat --base32 --type sha256 "$path")" echo "\"$sha256\"" > "$out" diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 6e3ba922d25f808856c901ea4c8b3600a7e209ee..d55cc12c165adee226ec433a9f8bf26a701e2572 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 = "1pk6ssvriqmckf61lafkbwyy98ylpaz0mq3g0zrifbhxzwkk01ni"; - sha256bin64 = "0svdxgszy377hm3lzys90xj8qna93r4xz3d89sy086c9sq1ncsr0"; - version = "63.0.3239.40"; + sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp"; + sha256bin64 = "067gpmiwnpdaqarkz740plg0ixpp7642xf4qqkq32w9v8flx3y57"; + version = "66.0.3359.117"; }; dev = { - sha256 = "0kpn5w1qvjlkxqhsc7lz269mxp7i0z9k92ay178kgsph3ygncm0x"; - sha256bin64 = "1pvnkhvks3yvpdh2qg9iqg6xmi5bxrl1n6mp9akywv1d5wsba7kg"; - version = "64.0.3260.2"; + sha256 = "0058g5dm5nfm7wdpd9y4fn0dmi8bq013l0ky5fsn4j7msm55rrg5"; + sha256bin64 = "1ag8kg3jjv6jsxdjq33h4ksqhhhfaz5aqw9jaaqhfma908c5mc9y"; + version = "67.0.3396.10"; }; stable = { - sha256 = "1m2qjm4x789s3hx255gmmihqrqfx8f608fap3khsp2phgck4vg6a"; - sha256bin64 = "1wxszymlv2y1dk4f0hpgq9b86fzqb7x8q87rfbq7dvfj8g4vipz1"; - version = "62.0.3202.94"; + sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp"; + sha256bin64 = "1ycfq6pqk7a9kyqf2112agcxav360rxbqqdc1yil0qkmz51i9zdg"; + version = "66.0.3359.117"; }; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 4da4c74d1c37ceb1927f58fef737986a50dc52fb..ded2b688815c3addd76d1ed32f0e367ecc0ef403 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, unzip, firefox, makeWrapper }: +{ stdenv, fetchgit, unzip, firefox-esr, makeWrapper }: stdenv.mkDerivation rec { pkgname = "conkeror"; - version = "1.0.3"; + version = "1.0.4"; name = "${pkgname}-${version}"; src = fetchgit { url = git://repo.or.cz/conkeror.git; rev = "refs/tags/${version}"; - sha256 = "06fhfk8km3gd1lc19543zn0c71zfbn8wsalinvm1dbgi724f52pd"; + sha256 = "10c57wqybp9kcjpkb01wxq0h3vafcdb1g5kb4k8sb2zajg59afv8"; }; buildInputs = [ unzip makeWrapper ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/libexec/conkeror cp -r * $out/libexec/conkeror - makeWrapper ${firefox}/bin/firefox $out/bin/conkeror \ + makeWrapper ${firefox-esr}/bin/firefox $out/bin/conkeror \ --add-flags "-app $out/libexec/conkeror/application.ini" ''; diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix deleted file mode 100644 index 137b463a1e1d54cf4ae15245b05b9897ddbfd4f0..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls -, json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }: - -stdenv.mkDerivation { - name = "dwb-2016-03-21"; - - src = fetchgit { - url = "https://bitbucket.org/portix/dwb"; - rev = "7fb82bc1db36a5d1d2436088c9b58054d2c51f96"; - sha256 = "1wg7pslcx7z4fw595a3nbnygxy2bwfj0h377i48mxhddvl3wzzbq"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gsettings_desktop_schemas libsoup - 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"''; - - preFixup='' - wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" - wrapProgram "$out/bin/dwbem" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" - ''; - - meta = with stdenv.lib; { - homepage = http://portix.bitbucket.org/dwb/; - description = "A lightweight web browser based on the webkit web browser engine and the gtk toolkit"; - platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ pSub ]; - license = licenses.gpl3; - }; -} diff --git a/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch new file mode 100644 index 0000000000000000000000000000000000000000..347fb8e128770f30c9a0809823d994844e2acbf2 --- /dev/null +++ b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch @@ -0,0 +1,35 @@ +From b51b63b78c9ff1639f5f65ccfdd54681f1cadc1d Mon Sep 17 00:00:00 2001 +From: Sam Parkinson +Date: Tue, 26 Dec 2017 14:46:27 +1100 +Subject: [PATCH] Extend the python path; rather than replacing it + +Some distros (i.e. NixOS) require the special PYTHONPATH, so that +the web extension has access to the python packages it wants (i.e. gi). + +Previously, the PYTHONPATH was replaced with the web extension path; +meaning it would crash on NixOS. This instead prepends the web +extension path to the PYTHONPATH. +--- + eolie/application.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/eolie/application.py b/eolie/application.py +index 3c21542..bed4e55 100644 +--- a/eolie/application.py ++++ b/eolie/application.py +@@ -340,7 +340,11 @@ class Application(Gtk.Application): + self.settings = Settings.new() + + # Init extensions +- GLib.setenv("PYTHONPATH", self.__extension_dir, True) ++ current_path = GLib.getenv("PYTHONPATH") ++ new_path = self.__extension_dir ++ if current_path: ++ new_path = new_path + ':' + current_path ++ GLib.setenv("PYTHONPATH", new_path, True) + + # Create favicon path + if not GLib.file_test(self.__FAVICONS_PATH, GLib.FileTest.IS_DIR): +-- +2.15.0 + diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9d4c858298d68dd507b42bd0c6ff142d7cbda4b8 --- /dev/null +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook +, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3, gobjectIntrospection +, gtkspell3, libsecret, python36, python36Packages, webkitgtk }: + +stdenv.mkDerivation rec { + name = "eolie-${version}"; + version = "0.9.16"; + + src = fetchgit { + url = https://gitlab.gnome.org/gnumdk/eolie; + rev = version; + sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b"; + }; + + nativeBuildInputs = [ + intltool + itstool + meson + ninja + pkgconfig + wrapGAppsHook + gobjectIntrospection + ]; + + buildInputs = [ + glib + glib-networking + gsettings-desktop-schemas + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + gtk3 + gtkspell3 + libsecret + python36 + python36Packages.pygobject3 + python36Packages.pycairo + python36Packages.dateutil + python36Packages.dbus-python + python36Packages.beautifulsoup4 + python36Packages.pycrypto + python36Packages.requests + webkitgtk + ]; + + wrapPrefixVariables = [ "PYTHONPATH" ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + patches = [ + ./0001-Extend-the-python-path-rather-than-replacing-it.patch + ]; + + meta = with stdenv.lib; { + description = "A new GNOME web browser"; + homepage = https://wiki.gnome.org/Apps/Eolie; + license = licenses.gpl3; + maintainers = [ maintainers.samdroid-apps ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 9356794bb5d69f63d4e2ae83436bc0eba53189ff..de56a0605b86277a0be15790a00f0bafd21af9b8 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -2,16 +2,14 @@ , libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: stdenv.mkDerivation rec { - # Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a - # release but it is basically 2.1.2 with the falkon name - name = "falkon-${version}.1"; - version = "2.1.2"; + name = "falkon-${version}"; + version = "3.0.0"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; - rev = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db"; - sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy"; + rev = "v${version}"; + sha256 = "148idxvx32iwg18m3b7s22awcijnbrywz9r8gnfrq6gpwr0m2jna"; }; preConfigure = '' @@ -21,8 +19,6 @@ stdenv.mkDerivation rec { export FALKON_PREFIX=$out ''; - dontUseCmakeConfigure = true; - buildInputs = [ libpthreadstubs libxcb libXdmcp kwallet @@ -31,8 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; - # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm' - enableParallelBuilding = false; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "QtWebEngine based cross-platform web browser"; @@ -40,6 +35,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; - broken = true; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 16b59debdd424f8ccc8a22dbca39bfb8ccff62f8..d8afbf9aa193a969b30ad9553b4d11f94e26d954 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,985 @@ { - version = "57.0b14"; + version = "60.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ach/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "07c3398805092ba5d252adcdb690a144f8143a8827e70e3be3cb71175735c9c37c9d0edb93936f8cd1af16ad7a6f988b8e8fe9eaed7e36bbb85abab0137893b6"; + sha512 = "f45033523be148f3cf43d800ec7186791045104eba8c6eb10bb427a5048e826152c4d129bf97a4efda41281b5854643f239b9a124b488740c1cd2bc55acb2504"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/af/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "fd954a1ddae090d6bd2c76922d4ec53ef249749c27996fbeb1276d2d82284540a000ad4fe6efbd690bb5e73b6923016d5c9c98d34ac5748c29791187417dd8c6"; + sha512 = "8d4ca433ad148cd3ac62cb142009a64c8aa09e49d04a060040d42c9e5720ec3619f1896a7b2e91f9bc0f4a78be0dbfa30fef7f19c233b78228413335cbfc9a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/an/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "c57c10028a99df1694897966f54aa6f8b85a6b2d0ed23699542a7a2bbe458e26d622e2de398bf7559bc33e7e4172d23d5aff8402048174a39804247dd8516e0d"; + sha512 = "16d132420f991376b3dc15d43f118aa12d1d617cadb65d16d645b1a82a65cc7a17a4fa36a03a4280a6e6c3d05d5f4c6d97d5f1df24fbb4d6420a16d271dffcd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ar/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "a4417b95c1bec25f148c57c42895e84024153065536a303f8eef7a0d9a7d39d4de8bf287f3af815e8ccb7ec7ec797f098416f78775acc8d778c91975d6268014"; + sha512 = "2a362ddb4a263a228b93494b8b39071b85cdf05264ef1541df5dd75a84f7d7391b0d68c19e76ee68fb0a4cab7e4de6c1b39d2f97f8f16e6d7c06ad1b630562c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/as/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "5b624b9d0a4ee345d5c7b79913a8cdb48acebae32f088479c0745acee925d58c826b5125186ffa7c017ff3524983bfa06fe5061ee9423c37fb6f0e7323cac85c"; + sha512 = "b9172bb80eec38221065e89e0e244c1a93f52e2a5754c0b0d93e78b338783188460fdb4aad13eb69a205f7af1b831451f07b19a9633ab1737e1d48e88108647c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ast/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "efb5ac3daa79a88425401f2bf5df6c0fba90fefd21840723cedc8ebae149816198b727dae67c3f74406c47e01dd2365d1eeb92c39a549f1acba4ba65dab704b4"; + sha512 = "c1b665bf08317624aec791a4cf97a240c8bd192f28b31a3a4283846628216bb98b60b50a44d7a14b37b0339fa7cf51af9f3a47cc1ced764f560567eb19c31d56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/az/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "703332727a0db4a51a39859209ce76120cbdde5a00d32a931e118e478dbb5f4a4e8f3d06abfa9bc97bf66a411f533c23b7375599fc0a7f0c13c9d7f518cb8990"; + sha512 = "fefa5958fd2bd47125b5a8601fbd0834b6498a4ef4b38c73246575b090b94981d39f086534fa5844432554134f590ef28fd9ba0a9e656a4be16c82e4dc368f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/be/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d8ad4ba538e2e3f86ad8564e2418cbd34f33d4e89233fa6638acf10a3e10eafc0b81d6c20b585b872c5c00bb6fa2af1ea4097c19de01446a6811e4843c99fbf2"; + sha512 = "3ad059b65ac9a5d6e8af9745df0ff35ecacdd0af756fc1d5a22a272fd94c49b163d62c7a59ba5cf485d860dfc096209ebd814673b909c047a5c0a8fe3b551701"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bg/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "cb6af38306ab8bcd9229cf1dbcfaaf310108c31e28dbae6b9fc21a4cbdd82baf9fa785a9a94bdacb779c8679721903bc721a0e7ca2a1a09995fa97f1486a8232"; + sha512 = "0eae9cbaba7eebe0fbbac423538afc7dbf439c55d1d29eea9f14468764febbb3f1141fde29642f485f5d7c690ac1ba3b91c9fa436f1cfa50fa87191f1b76d6d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-BD/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "1739ab1c4c1a7387dab56fb89762b26d8cf279c14a7bbfb1f7f888e9c2c714eaec84aba12f1384defc7974e207b506e206f980a8a68be7f274cccf7232f30e32"; + sha512 = "0c056092cac3a3660d8397a5f14f2ea0cfadf7253d23d97280d7ab3c6086ef1292bcd5cf42fcff3b1ac6bc55e98ba5aae707d5b205472bab9c37d4fc7869485d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-IN/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "358f8e3c1e9774fabd6bd8faff4cd2903c0e0cae6e5e6ee6f2ceb228ce7d489ed9112eb729a4f7d0ea25c377a2a54772279ea1343cec449b949688dfe19a69a0"; + sha512 = "f98a1efb8dc56319429a06e9b52d0431591ed70573c76e80a4b4c419c47a2d810ad9f3f9ea1c9a5457cd55e8f98155165b7922000d750033503eacab2e8b40bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/br/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "df0c34c951d81d500a0720c2a9cfda76831564dc45d2e34d37b677702414b2f53710fe4eb7f63257658fd058ffa648a904aaad4d864a325a1b1e1ddfee2faf32"; + sha512 = "475d9a65a6041570a4bed8c96e63aba067a7eb659a1f303b0ebf27e55478dbe3597ec7d968329f352498a58a5256b2fb36505e09e35d1af9ac1219adaf0e607a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bs/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "091cffc15f609bfab74061f13c526d4c13946e7b79d3a190ced0ffe2fb9aed457e1e1780d9c152699f4b42aa920d9bc77701eb944d9f9671b70da3278fabde8d"; + sha512 = "ceea5a1b8fd3f8ef3d719acb62c5653ee00a3fdf7ffb2e81cfc22936aed53e726d447564a7173e53f27946f55d37816a7bb01abde95e8a6c1718d0f7cea35437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ca/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "cd485d1202daeee2e24ca812350ce348ba93a0bf389741b13ad6aa6a81ae4c57007ea0b312e401fed8c268c8a86b5ccbf62ee25d2c1d8d787f16e92467f3c136"; + sha512 = "97b687e518ea024c510365b18a220ff22fa0f722645c927519778bb8ccbce55b1bc3a909d4d06b3cfb1ed20b3dfa3761593b7967f516623b4ddc8b26e97359aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cak/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "c5573576cc70d776f3d40a2451295ad8a6230b0de280b0a2a3dae7ecc2c1fcc2eee5fd5e4df91a2b1c9a63411263a4a55f0bfa605a0688cbfb10c341dfe4eaa0"; + sha512 = "6e846c894d67da44f5734f409b6822afc043bd02ac6bd3801daf47891fbb1b3bab10ded1f980f11c7f41a8ce4d59b6d99b20eecc33fb60d189cc15df9bfd63f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cs/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "771141fa3d846651448b158d8ad583a45dd2fc05ca5e3ff2ca19687431a140744707260b3ad9e304bb2062757ef333815f69e10a48e72308a802f9088e24b22b"; + sha512 = "4c647b30775cd27e6955e8ebc4e9b375283ecf0b068fc7a49d3a3f99212a8f318a83879f975d85c6c83a88735e9851296869374edcb43dcaa167c2b954edf939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cy/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "7fd6f5eb9473b3ee68a7a2a98128c205df6654bab21e4c19f6ecc1e427dcdca3b93e9ff22239ebb652a545a3cb8892782e34cb876ada78d604bc48816960f897"; + sha512 = "f1d742720553ce31bef0881fe5da8c20d5bb2ca99710a882c8805b26c35e2677653ad2d4ec91371dc724410d0edeb884813f8d88ceb0f9019963cc98121e6bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/da/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "30df907a7e99f41f9291d2e677e124363a8c2f702e90db870e2ccc1bbabec2266f0c64fa3daac66c5da1543056d1e3e1e8458dd4627cecfc0a9090ab0aee13ae"; + sha512 = "ff07e1c11f23091084361ff20404cd154e89d483b98b3d960b2e72567adf66192debe1862c1dd461477469d8c6b07a02a6dfbb9f0ff644c6743380159df5fe30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/de/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "bce375636ad043e2a9e331ecf84154f5e329217b6c1697ddcf17301115f39c6f35b88083cbec132f92fc30d93b414a8a913ddf02ff0c406295047d5d11a7a3e1"; + sha512 = "2338b344b5507478c36f900f76e264580ed7f62e46d042252ea90251c1c80a9262746dfe7d40c6bb593de89737c848527fe33d555dd7aa7fa3971fd0d4483e9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/dsb/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "0b75a555b9b02759b4315d3f77d78e71f2106db1b2901457b54e7a487b9f35a0aed3b6f47e7363257b2bbcd42104783fe14bc4171d658515b72fb61bdf9b0fd4"; + sha512 = "72cbf626c69a54d18d8c63895e59c2464e7e2f9e0c6f78e58548a8f861e7b2033533c3569ddc2ec3a2e4fe54d0e064a855a23485a68c08e1ea672e2499183258"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/el/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f4592a580dd7fa207943d071c92816c1f6583f579e8a8fb6564da6e95c0edff1c7dac24c581e25f874b354b55aabdb8fba17a2f4d9677b653e957a66360fabc0"; + sha512 = "ee3ba405eeb7ee4d0622af5ed377e39ee4049b33637d122b1395cb00a9db8558454d8d371ee16ced37e1a9f5df7c07b8df5c0db67822117287c58a7b08d45fc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-GB/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "56731ee2e83a591201471bd6236a247a3a5713607344ae8a5c03efcad4f69eeec010dd89c1fdd6329325768a4b9a83ecbc278fc503a8d61244523748d0a8fd06"; + sha512 = "203e6881ebfe4e1c238b83ceee8e59666856640417dfb27478027ba204823f78400b03e7e060c8e070207654f522893c321a9efe3671a212fc3d93519bf6c960"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-US/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "cbe3a6ae2dc8d89ebd935d2c58d3f735ce08f45418c31f1faa9f75d75255a07fa87d9b7d53f571bfd876701b566e27cb8bd761cd167749e2019b1f3bc1fb569f"; + sha512 = "51690eb72296dfe440216bcc85f31312da6c10feb251a94396944af3fcecefa9cc07a4a278775214df2841a3530575fd385ade2dacce18b33231ea7abbfadb75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-ZA/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "f5c32cbea6753f4325c7cfdc99bacc4565b58b0ffb7cdc8db6d559922b8402493b502e7a05fda4e08746d48dfa50ca7b70ac27e152ceed3fadb9d2af2ac0f639"; + sha512 = "2c802cba2c2d9c6627136f83fa3bf31ac2a1da1a8803a0d816ebcb16ed36111ace5fd229617e88a9a6e25818dc350261650969f05f3b2c3e7bd252a0d29ee54f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eo/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "89d278965fb4c7899abdf17f2fd1dbde201c959b623c46ba4db51628a3a09c5e054a614b8657f7f190ca5e9cdecced24f126978425bb38d14c84770958466bb0"; + sha512 = "407f5e44710733635f1508ac205186a182891415615be886da185b856903fd3c5d4b61c55c89f4d9a5ddc5e275918dc9e2881a2d3c1b5f038e1d7f7d490334d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-AR/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d21ed37e2d6461f31519d08040b271e9a6d476e7132f5db406fa3eb3fdce67384af376a89d740426fba12a5602c20a4d315c0e337f0707ed7b91d739b648ad63"; + sha512 = "f6d00c92c423e09c61f23ce9c743c91efbc4f24a140d136f0b567fae3ecb45168eaf3ad5d886a1f15bf269c63cf8d8ed4f35468fb887371610ef55ea71322a62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-CL/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "bd0dd077e732c996de27e5fabd22933aa1c1ff448425bc757be909ccfdf7a8a2f32944721a248e4998bf9d455fcce13c22a89dbb780c3a61d8fb06745075b122"; + sha512 = "4f8fe24bbda036402225b42b27bb48b46166bd9fe1963f0c802ecba2f186bc72c300d59e10a0fae384448ee2374ae88f311606d69b939669441c33dbde352795"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-ES/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7abe774d7c2baa9e055c382fbe4612244e9ce5c778185e86c1b4e8422ab8af4f99a949bc8560109e6995d8101f8563e6251643a5c6e4ff1ca9675b064e1da580"; + sha512 = "e3051d9beb78b3ff9fc2ea969ea9e8b672b03162f94a5cd290c8953c08f106d4bf141b749f3ea8c2d38a2d4711d3585fd0a358a45862b4968f6b1a1b38bccee9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-MX/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "4f4c6a5cb3fb25a030a44f3b7c60d6a1af77b083ca4cd04711ed4663e276f03ac92f4b8be697554af7a4721641fc7588b005e27f2ed2c5c1efb947a64cfae8a1"; + sha512 = "a1b7c28fde683783d5e36ade55ae051bddfdb829f6568a0ede19d038ad9e5cf25fce0e5669d7fee50cecd8b476dc9f0d4d401c9d6b30f2c4589bb086731fc5b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/et/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f23d6cdaac6a412c28c633fcd304833bb341c159090575b8f8cd7bed6068a3ca3497cae072d831b1ac40ebc98853fec978a09009d3eaa5c1f6aa6bd4f8c3b956"; + sha512 = "70f839dca4b337a3161b71ae8e2007e8075a0b8fbb1b17ccc0e78c9e1f34e50b5711e5678f183cb3fb14fb6b961fad82fbe32393f15c1476e57ecdf58881d1d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eu/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "1f7f209e1faafd254e607c7bfceb5b1913c59361d55bfde394d2af4f745e0be54b7d119cf71a88c577dc76f0ca9a96fa52cdb38b27ed5dd6d270eef5efca2501"; + sha512 = "e242ec15f4b6d136d9018df3edebc2eb94ab9e02f0ec1737e10ad3f17a2c24696a0cc2d0314e3b09e07d979a2f0fbaed5a8ac10b9954d5c54cac0dd0a2b01ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fa/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e175dfa91bda0daac8854d999cf3770332d61dc11ba338ba8a9c42718e7d470e07dab656a3a13ff25f4295df648196549b4a3f4b273061c278f03e0a76815213"; + sha512 = "4fb727e5d8b8c3519fba218a8d4bd49a58ea4d7c20f3143b183fb6ab5d1b17cb373933da645c5d3856906a97bfe6648964495ff7a85bb85e01938abf79139f45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ff/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "243c09586248988625ae347ad10b691cb5f93ad78562c3223a244403a5ad41b138289a992edfce91a8744f45ff8a2feb008ef3dfeca608fa2cf44e39746bf794"; + sha512 = "ee25d95b8f9a5db60fa5adb7c656e8f39a1420b380ddabb3b39fa2a50322fa104934380b6698cd4f6d941d9b63e77a98e5cb002ba9dd3548111c9e6d6741f7b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fi/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "66ac96ceef9d36ab4c16a288da714c9bb9dd72b12cd814dcdb3740135ce6d19f18ee564c31050b619a1af207d086674ea4f60ee01de3a18eb854f35af5d3fb8c"; + sha512 = "5344184aee16ccdd0b8de303c788134b8435364a760c1ea0a706c44f36d344ca6b25dc5dc6821c84cdff2c5f0a8a7da8427ef4234d94d649e951c901200c087e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fr/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7a9398f8753c0b3d6777a5dab4c28fbacc493883e5326fcac0cb0a0f62509169768355a5c5db377afa6a1ec79676b8de53ccabc49666ac9830d588ad2c8bd8eb"; + sha512 = "67f5f6d342262e8bd3eb9ac0561b7bbf170b3f8dbe861e8b9c0607b087410a24c1e4b453502f77eebb5a045d5980bc9e1680bb0c6585223d4aa809c872fb9d3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fy-NL/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b309d91af97a94246c9450eea61f81cd8f6e8564bd089caab7e1238df4855aea54568ae8d40c3c59e09729779623f1f488e2b18f05094ad79d7d773a82196eee"; + sha512 = "b4a3d6a3be694d00809de9d78a1b36958f9150714b8ec068fdf9e79982bff82d3dc7c54f9857812b2ea9b2708aa0290d4fdf787993697f99ff719b213e50b0f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ga-IE/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "f3b699c8cddca58a8610aade833b470e006a804606ecf13f166239f32ec7fdf0ae57e6f91d3a104efd08fa9cb34c7d78026753d0cc235cabad8aed8ae85ccb22"; + sha512 = "14411beefc9729e07b80f1f036ac651312fa4d257479882841f82b0c5c10ccfaf83f31b2597c9076dedd3af4dcdcd62ee660a38d48a864c09519bb1c75728e34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gd/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "261b14e52513485a14d4c92f580a9deb228dd730f77911dde25785b8eb7974a1fc6d39b6d377a3dabf3f488f9d29892aed86c38a115aa4c9660b27a229a512f7"; + sha512 = "a6e40bbcda17d41a9972e56794847fad10bdd14d3e09d9ceda82b09d0d8c65559667b69afa2807fb9ecd26b8daeebe29a8cef6975bfa9e769886bcb94526f14f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gl/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "6028afc50364a4bc0e21fcf82181b3d6ab44a985d7ed55fc090544d25c0bd65ba8737e1b653e9cf860f201c6c3aded33693c2ee7cb7229b899007e9a607a39fd"; + sha512 = "39d93aad369a22207d052611355b8868159b8fcef54fb86bd7bb1323ffad34d90ddf870d4cf21fcd3db0418b7e12335043d683c5f533454e19201ba6b9090c77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gn/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a189db0e527b1a69d1f42b23b5898224313f73b269ece12bcafdaa9204cecc2424660ff3543098cd6036ca17c724436fc6cce9fa7f38376dbd35c943f56cb559"; + sha512 = "83f4351f9c7217aae381b2ba3ff8cd00d1e60ac0a05e87598633ebcf70804d8aa235f0b6af0f5218b90292970a5f18ba923a1a20b6343b3a8a5fb67195034d58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gu-IN/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "59c9e99ce0da07aefa433b76a961cf8b9294b30c4c3198ac7c8cee5d430c89a10058f614f0955ef768d1e0c12e583fb98612caad4cd48389454b9878bbb08667"; + sha512 = "82a3f443e757dfbe47cba8c6fd0099b55537eb290529a3d93569d7f044147e37518e6be82bfdf1b9bf13541615007c11d12ae7feea6c20c35e5cf74e00aac1d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/he/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "101f7135364f544517674f8c0bae2d16aa600798ec7755f4e02d0827df6920a60c19fb0d2ab3dc20febe1e9dfecd192a64fddfb2697b825ac940de530383ad7c"; + sha512 = "71bea5afbb118e32e2e8c88f2eb88a044124068115301e1eccd892293fa59b2296d548cb662f6b67c6b52d8d9dcac6c7f395e70183c2881b72b7fd3fcf1fa759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hi-IN/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "dfabec31fc6170e3390a313a6f201ee51930c1e1c884a5e1b0b2107a2a3c1d19753c91404146dbbad9dc572f9828e3196e6fc1002a9b318b3648b1dffe2a9cf8"; + sha512 = "3cd583e0bf4d646fcea81b4c20a25731b9b69dacc61384e8aca6bbb3e1cbd795e31ff980f4079a51ce76f71d84c5cc6a3e486ff23f1ef2447d249aba48af9434"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hr/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "2dec6c07adeda8008e3d85b6552f29f882b1bb9b89a5e03422126067ebf9eda03e0272f31464c42f8b9deaea174c26b1571c1c416f1fab63a7e67cc0bfc2c136"; + sha512 = "79393657fda529897b2f13e842f44f1bb76b2f90889bc86511a23238fe930eaa8abb55eb5541640fb214119ee2e0472b3688e75bd5f00c87f5b47b193bce8e70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hsb/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b5dce6117e1c964a612708263adc5533d8a063ad6586030fda1a214c6df887995f7ae7782039f063786bb332732857781392c16c646c29d9ffc53fc3c8cac8fe"; + sha512 = "b391dd863b6d336cc6c9c60c287e9f85f73c91cdc8463f1b3ded0239953ff7e0bf04cd8daf12185277175a71b55ba002ec74cc1256882e453fede8034c9a9a34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hu/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "fe5654e089d50c099aa3cc9279c0a4a3e975a3e10d15b9b832249d082f95d461cbaa51f5851c3f4a680419e293fc9137b1ddf275ad376e073090db37ed92d888"; + sha512 = "ecc51ff78e3343c72bd1337a025ffe81fbd62e98bf1028f892ef59591a3893bf99bc0f58dec5e183672c6ff9a7fe36ab140a8dbfd892bcb99206b7683b7f7189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hy-AM/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "9678679c8bdd32131fb7397a88098028a955624a68d59746d073671298a3ecbd8d2933675ba564fed0650f44add7fc1135f441a3edf2ea932cfe6fe5b2ef5d13"; + sha512 = "e0fe7721850ce3dc21aa5fb587e205d3833fcbf1b513df3fe67e9e3326ed57411920c6ba7d8872bd92a5df073362f67b101ae865e0954731549c7b25cc34400e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/id/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2"; + locale = "ia"; + arch = "linux-x86_64"; + sha512 = "fa1f58e589f1d5453e8b349f87bd798a0b7fbf396890b6531c433fd27043d3a599f218093398de09387b2bd1d98ab50e92bed3c211617cfea700bafa0c846f80"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c863c503ecbd71f17c311f99d94a86af12a57bc1ce0beed6fd0d0ccc5c814c25e5636de9127610b768fb947a0ee48ea585e1a205e1646ab20d2f6c2044b67618"; + sha512 = "73a0214561b02b4b30e495c5e62c1883409cc20b8f26c7aaa2bc32edbe197e8aed2e4165122ae84dd3035d36296d91a30c4460e9a5a319fb222f0d813601486b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/is/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "7fe2398dfc0da2bd215867414d765729e2b30620930ee1f50b98a348f6e6fc098c952d0c5ee200dbb51a84ec82f4ee2fe8b01c4a6fc879d2ebebd95f39f825ba"; + sha512 = "ff6d9319998a1c9d394fec7c484b96cda4a473e374b193b47de3c473ba91684000d5a909e5bc460b83fd92562e225476671d42781968051a9701a5e0f760a385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/it/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "043b409173d097ce49eda0e16144b3f50ba7f7a83ed679f8fd09c26d18914681e15b68308ec6c65aa09f26afd195b6f8e5afb4e2276a5717b716280450dc403b"; + sha512 = "3b31ae6a9d84266007d7a61840782f3e1621a5d4b5dc05c7352e682132ede5225990712b4371edd59edd47004a87319e11c347b18a39e4477afc267186b2f1e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ja/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "9c4391e27831ae034624f22e8643922324b7940f2b6c739d1c6b5c47449b83f2c8756b11efca47a42820a867248efc023876e1218327f1c8e80cda0c960734a5"; + sha512 = "d5342196a66b2feb19352b5792bea6579e1921b573d583ea8223a3ec1e7c59df375a3ebe83345330bf42e6a01c54a5947111d0951025f6c57e55bf374bec1c52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ka/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "490c43518d3cf1320d9a3e8f28c70908b31a5f9ed01b211f4e53aef67baa279eaf129f06ec6c21efe2fd4a89364f55ccda95847f058cb2f83fd1f92c466263dd"; + sha512 = "ab045e67a005d31da572c30c6a90266e82a892c3c99af55ba97de6dba0f2be029d58d6ea259ee13d63e15b27f124dac528879109ae4342dcbfb46eb376021846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kab/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "bffa144bd5c6c0d3fcf9c8d44c679f22af1127734ac8934a5cad4d5e6726978133cc99c61dde870143fcfa0b07c146c4d7a84117178e01083a0c37d9b4810184"; + sha512 = "aef5375d4d9ec0f34cc3417d68cfefd7f4ecb489a66bd668ce1bdad9ab804fea267557439bdab5d6685007a3d16cff85c9e92f7c1434e3a76bfcc94bea8353b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kk/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "5b49760338013954ffcc3ae2c9c79b0d9ebd92f1a148188249559723bf23338a7b606b26f5326b48e2acb15e7ce023f4dd2a536c0cbf5b7af8eacfc33f3be670"; + sha512 = "d3c86d1afc103a1db53e1a03ae36f3c7da7a1dcddcb5ff9e2c8ec06ffe60a8e4f767a012e375191063f0c40a80bea08b66ab0a2db3ceccf796de15bcf232f04f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/km/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "7ea92ede74eda15d9a77b6b22a02a634364b60bff135da5356991644f474a47c16283670d24f2cc28d112c97f3b49fcfacb1c618f9caa16fb013c3c650b50feb"; + sha512 = "0effdf51a9ecb2312f34e14edcaa7ef40d392f6f969c46b1dc204471da276ba5b73416ede2cf6ea69205f67ef44df815e6038137c2400df2e2581564cde5b1b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kn/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "e3d3ad10a374421603068c420e2c5c28ee8a9f9b822df556a1237eccc54a778ca572e09795aa9022cfa373652cf2913c621c2fab82484f7eba77f56305ed6aab"; + sha512 = "f57499563c17f119472fcb48afd54d4df98c85c854814f872e12e5ef4d3dac3192905f43453849ca7f024b4ae9a96528c2f9a55866133e3ba0651d046fc4ee8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ko/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "a681d5e49952f1e671e0c86854102979e052b84140002b968f791f4a325858985751a3872446ae2495802ea0c1df884291c8559a573cdb236cadb7cd706ce718"; + sha512 = "50defae5a904a2dccfe8cd34aa2ddffa05a18a8b8b7181029f7b5b2a6bf612445bee2c3a4cb4c4f272bb97dfaaa487f2ed31dabf200631c53d963bc5f66fec1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lij/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "b33522bc78b07958a3b5b80bc0833673b1516652de2a165f5bc7ef54575a21af20a922e207be02c4531f64503e97279dca4ad4833d2eb86a6c04f3fd1fdae7f7"; + sha512 = "9bee6742358a2c726b23e5c51d79fafa92ab8a3df7ac4acd2ebcf9b0d6a3661ee65d6335ec91b4e02a0f8cc3c3b452ff642ff2682788a647fc5d29c80b8a6d16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lt/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ec27a8aabc0736b410509a9fb9706627e06316b34a241639ae27108ba3c4945b4ae675fd85da390ae053603a0a13a124c0638c11c0750c665c8226446435bfec"; + sha512 = "1c2d6e3f62ff24b4590163da626a92e461b9e7035346309bc7cbf1185f21ce318ef6e072902249da5c59d1f37724e4079b1d673492d2dd94ba0f50c38af818a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lv/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "bc4b125320ba7033946a290e0d974cd4a4f517ae9c9e2a24d86d28307476fbcb4372ec0cfc567d984e90d105cf692a08100bcec81e4ab615fff19ec0ced0096f"; + sha512 = "be9704ccfae945863ddd60ac9a4cf4bd2642bfb11fe3adc20d396c9fb0a85189fdd31200e59f06aa4a1c50f46c799ab07864e7f677bec2133b9e2e60ebe3175f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mai/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "2aca4d6ce673fcb71a8c6228e243157e597573d152d05bebdf8b9df3bdb479dcce1708cdaf2462902c5ed0b7eac83a9dca523bc55a6bf6b2a9fd1d4582a3d68b"; + sha512 = "0bfb640ce98b3e16b01b12db7c28753d9d90d46beb7ca7f205fcfb9d90537eeeab6b29ee999108e549b257c26ec4e13d64e470ab79531f83895403ca7ebe7d0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mk/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "22fd8e59aad75508702ea3fd37af4261f864a76e943cf6d07789d4f1d094d7e0d5e76e5d4c92b6dc642e0f30047d4515d8520bab667c05c16aa4ffb60f0fa168"; + sha512 = "7f8ee664f3f4f91c3b13f2e9f0cfc8d575f9a0da263370b0575a16e6e9bc7ba9e449f62df6494ee9837fd8e4620c2d4848d0cb7d99a3cd675a87bd65c1ae96e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ml/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "f96568186cf49bde7ceaf36805277c0cf4d75da2d5930227e625e2abddd5b740df4207ce53abac24c77dc755f52132204b945fcd7706de4e3075505635eae9fe"; + sha512 = "1161e096b7d01fa4de5ae618045cd0528715f961434eaa569f8492a7ef0c059c2369f2dca348ffe0f24376cf6ed529be9b7077bffada3b0812a4aaa6677a6c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mr/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "82fbe7593e52299dbebe38fb97126b91f57e48968c7235d8adba93776ea6c6883dd8eb5df3345cae55d156a7bde2004f1f446339e46de90c85f1525eb1334147"; + sha512 = "cefca3f2f8c94cafea0e473a44a1068ab7a26956b9bf2eb3cd0dbdef851288df0bfc05ec0cfd6cd804963d1fbed7b5226cd1171d2fbe86372c977c22b162df4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ms/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3ece240f01f8322a86d1b8861be25e895fdbfc9a024406727400e0d6cee8efe88a11cbd6799e4b7d0d8396cad80a6a7438d4f0e3b641f94396a7d2e80be06e02"; + sha512 = "7b6801cde7734c77318de91dfbfcb3e039012d048fd83014e66079d797a9d4b4c7394b7a39f330a24c82c0761436bfe6d7d5915e26e4ca18f4095fc68c728caa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/my/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "9e670ecd9628c8822f634031dc7b6ea2610687df8967591ff44a3fc2922fc11bf84575811e9e0f51997764d67c357de5020619e3f637e31c3421e64b533930dc"; + sha512 = "c4257963ea60c4d932326dc5fd468b96bfb6a35b35ef3c7950981ba92f6ba07dda586177ebfe20c386fb8b61d0ad406e102163f43a2f96e9710a4b0e7c241245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nb-NO/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "298d7d24c92a5f56f00d7d615ffcaa1b483882f5845f3de4bc8be2811ec6b5808a2bb813ee9d9b8aaac84a6c6f7bc600b45b7c22480e6c4c111fbe815d46e70f"; + sha512 = "6061bc7c8c0fea22bcaadebd2a264f0726b43c71b9f4b8c4b33ded9dea7ce9765e88fd1e4dd47935ceb5791a43785db5f4381fd2bd0181a281e62b6de025ef13"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2"; + locale = "ne-NP"; + arch = "linux-x86_64"; + sha512 = "ad4b705bcf4ce2b819f92b45e4fcdaa2003b37dd6823e75caa153ecf5afb1940ef79984c8602c94e96ee2be025d46a52956a78de57e3261bdacfdbde605f568c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nl/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c59787d50bb14ecee498e9c454e3ab79571656160761e95a53b41ae8196093f6dec3f435d9a69f064b9c4aff0bef332e2d5334153d98c8984041e26c82ef04a6"; + sha512 = "d74352e12bd6f7a948f9ef8cc383811f361c8b68eaa060ed9859d3680674c07a4ff922c818bc502fda85dd94ffefea679e6f9ddc927fd193ead7685f40beba75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nn-NO/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c7c9965a5810bcaac0f1b0d08ab6a9d660a00e40368369998101c2cf043837459e6e65078906c0278564412655a76987f30b671bd90edb25820362c3a846b1eb"; + sha512 = "7fdfb976b9c586cc5cafda4cae0e6d379eed5ab0524bfe5cd5384612667a2949e5cf1e741786828b30e8ba67a4150bf34c4f10f2cd2c7aa89caede413501adc4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2"; + locale = "oc"; + arch = "linux-x86_64"; + sha512 = "3a967f09b09bdb3b0009dee7896cfe787b65ae15095e88be6acacbe79f69411afc6d90638f0cd82171a4f8f858e366821d3b3f3cbe0fd50b03172768ad2525d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/or/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "bbdad4aa7743a1af3c31eb81003612d0729ceeea5a0303f129f24e352219007b55f40a931a0140fe1b1b4cff694572d1141779238881376e77f30a3f3675512f"; + sha512 = "2f9d078b65e479427c1a91714aa7290a2aec04cf3a6414df82ddeb5e830210575656d7e3cb35304c2d1fbbad264d85ccbea2e2408a477a396c368fcd4aab95ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pa-IN/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "99f5ba6937e08c2cb0f05be9b8f2e87e1f27d5ad610540b3011cc2fcd11c2a7a84a1cdaea9b6133d1c9a38311eaa13221ba57bdb444c9aa343c446abc41c986b"; + sha512 = "bc3b65a2db74bd04e31082b9dbf3aad9434c9db2021d28f6a058ce78ade53b6ead38b9a7f123bf58e8a25f25d76a0e5fdff6372b04e34c88f4cf7e58ef80daea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pl/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "956648b1f331356f8ee31158758fa0ca7cc7685aa7b20c1833d87828f5f4d695fb3fdbebc55f4862c0f76afe72ea6035261c9ebaaec2561d728d61a4bf53ca9c"; + sha512 = "e1910f17681e058fca270e37939e5b6003195499080d747f3bc5a4ee9dbb960919a440a7f627050dbd0b66988067f32e41599d72fd6bf38f07e23ad317f83938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-BR/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "528a30c7ec5c7485d0a64b6787e0c14c66f832b2289884ff234799631f4e9c6d620c3312ca3d1872e28c80c7a192b8e0e4d0b9d88dbad610268e9d3fb37b3a05"; + sha512 = "a5993b73b475483deab792e4f657a27994aea194c716246707a0612a7b5c4f6b8b7a23befafd7c6fe50855a11fef8513b5bf16cfc6125a786b7fc0d50b102687"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-PT/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c70eb4dd653d035fbcb7de8bcc78cc1855f7d6dde8296a825d733a26e9c44e38c8e77ad54c63f806f12b90c601508bd6376aa620a1e0948c0b265dde3c2443ce"; + sha512 = "306c7f964d09d8d73b7c35161e28dc856917e7798c1a6a57bae7ccead2abce5a6a6a151f8e5a66473d3ffac43e0d0e2e4dd9d1bfcf66b23818e6bec246bd547f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/rm/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "c9b9f0e3ea90fe7e2d5c2907d82e7ea5abd5f30212f1fc5e726dfe72adbe3835107cc836e310ee4bcbbcb6ed6a08bc8bea06d3bda08d1fe7a08ae20b6a22bbdf"; + sha512 = "fb29e90b0728b2a0b23e2d87c8baeb6140301cd0d6d89fcaa3e047da25c8333f5eda67a5a1582f98c6711f894cc08542a6e8ab0a326726e02c08195cd88131c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ro/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "6246be75562143b57f27de69e39f9c82c7aea3e60d515cbab0ed5e32228f5b33abd61cb2fa7f3c4e73c65a6dab5ed446a0eaaa94767e0196d5b337e6b5a410a6"; + sha512 = "8cc66ac0b88632bc40d92764f0efdb71a69949d29a14a2ea06907356fecac5faf472399fa2c55dd515579ed8c3501925286db600f9239a82a4963aafba2b56b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ru/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "467a4adb72e27ea95d324f52007e18c3ea307b7ff158a4e58bba69859f5369fca8e7243329e2bacf590f35315402af10d8071c34886a7fdc3cfd6e0548653aba"; + sha512 = "d346b5e10da51dd30b1b404f567673fec759ba0f8e44f0f0dcad1375df212aee58d34147599beef8eb78d12ff6911ba703ecbc3daf8edf206d19a3566a83cd49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/si/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "47b11ccc3bdc373f3591ee73b84edcb9afe915f1bdf5b7abe65eb2ea675da44316a4ee5087c0c4e69a90dc337d43e201ac15b98d04a0ad970f8017d737e4f738"; + sha512 = "ec97cbfb74a86d96e05c70f73ac2e45448720c25845cf24e9c45d8d3174fe540911b691fa12fa96ed4b82cbf291a539311247d2b2c8073f790e1a3054997f50c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sk/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c7696394b76668733814f1b2cc1c41cbfd962d4d58e424c041fd419b3da2559b1f4057a8aee328e0698ec8b350e7909ce5da3770f287ba485dfbcbeb3d1de9ea"; + sha512 = "86676135408c0d9c268f93a271d959dc250d6cbd9e47273abafef0e5d8ba86a03e560539008034b5895ee0e9c415748c10586be538adfaeb5c7fac5f3f54a4f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sl/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "aea6c90fe73f9aa1340de0ba8207089deebdfea21d5fbd5d5c0ada6df26a4acb4349eee4a7ce09f9088439cf059fb7fcd6169cb1c34c83a33c909bdb3ed7af43"; + sha512 = "7fd5bbc7c046a09ab05f8751015d9c04f01d8cea0cd5252ad49f7dae612ac87d65d5992e840bc7701b3d99c90869143c721e690e51f45ac0311e27c45471b23f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/son/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "6d3a9b05ea14ad1281c51d99757475b6642a5411b7b409f2acba695c3c0a5719f4feaecd0c56713899475501fad3413fe46f4a3efd482111aae2395df22b1e25"; + sha512 = "b1fb2a67f132d420cf47707e0f8c4cac748b2c010ae5df7720921e742c13af851b7962c6808316db3eddb31520fdc84367f9dcd4cd0549bfc5a0aafc02cd9b4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sq/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9e7639f9fce27b4c3b3fa265e0662b31360313569f1fad798c89ad1eca1944827c3aae23c283f4e153d3f81a73d235b5fac56598cc02dfe2dcb38aca806203a7"; + sha512 = "979ba11bdc4a19cd0ff71c6626ec9bacd18738758b1748218206590c29474532ecf28aa9284e94e57db72b24330632913df89128a6e4297582ee64ed47e63065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sr/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d84980d2b454f33a33fdd9b44ea7e2c41a73a351492fa7bd951a8e4ec288a7aa4d12ae362443a664abfb554693e8a8f5428843b28ed48429de3d32575f94ea74"; + sha512 = "65fc8854f5dbe87f0f548eb755b08f9dde3141c765eb6e891fc85cb91814a72edfd09d0aeeec2d98949a788a11a775e49a8ab16829358d8499b5ee27565da4bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sv-SE/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "b26deb242735a3fa662687efbb8a293e76561821540ad701091a8b7033c9c1047459fac955815790ed026e4f69a51d2b0396a21102a79623b72f5ef8cbbd06e4"; + sha512 = "2ed2dc8618c8864497174245c50f6e4c64cb00225c7ce77c04a81619bf56fc5e93bbdaf7c215576e521a7951aae5d22ef606f8b93fb5d5a302bde3e92d2bfda8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ta/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1e98d86b9df418542dd15a204ed70732dc8111d8fdf34edbfee8217460e04467a822b66804e9876e28f15e9167ec5a6dc1551c4159c136006392feb7ca218009"; + sha512 = "f8bacb758829611b730ae584107964b4fdb3e202e45ce5ddceae9d6697c655377242a1550884051c7d6c18126fa24f8859ec9a8527368bb28348d16e69ab656f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/te/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "d22b7c8b45d37631434007b196c63044a860912826cb301a218b0aebab5ae8283370924a703cebb16a98a589336e024b31ad580b6fb57ccf3ed53f238e361704"; + sha512 = "b20773a0ee3be91af9635e4bc92b148c91f1cc62597294f5b37608368b1c5fccda1fc203938a8ad7f2f59274dd6dd74e98d1436e74b6e4cd8ea21a6cf2263cbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/th/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "8a806b68e3e5d4ba884bb9f72bf07c2bcdcf33a8111236fe837a41738e997116d092ffe73e4028dd7429c4bb0f097270fec7a20ff3b5bb316fde0a90af92d22e"; + sha512 = "ea05713f6f615280317d3deb14a5f8c3ab6895333333da165aac253c7cd9d62e6b913b56a850e82c0713abd1fa92c9f447771755b557d0056e10f39e54b5c663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/tr/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9b1e73d28f5f1fc352f830aa59612170b72dffd7ae060a8f2422ce14ec46f9e646fe625ce36dc4d380fb58ba0300c68a83f2d8aa8282100f6ff33a43ca79d807"; + sha512 = "73a8207478a59a2cf2291ae848dd1e8edc7274b4de4feaff4703279750406bfb9f74a3928f717d0d2274f0475b449c8327cdbbfe367a31f35499fe3401029f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uk/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "96d471b413e980ced87be210faccd8cb6b796c17b871cf785c34f10ebc04c4c76ce4756bec0dbe121b689bab2f777e54eef6ea43750e31c1c83524d0825d0fc7"; + sha512 = "7a6f6ab7e282150b7020bdcc4d025883709088206df00f1eb47979a937f5b7f1b1f7984c3e9148e14ea669bcb4b9022c885816e52aeaf695098f55d9c00739e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ur/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "0724b881cd4aa040b249882d41cf55260d6aca1f4876c89a42f717f00cecf40b32fa60451685b7a182d2ebb11dd08af7e0327bb5c9fe94b2a6f03ba8c9b4d02c"; + sha512 = "b8f7af681ee9f83d6f0ef76f860a399612a4431447f77b16750cc09c03e2b78b98f2b2ccd9b661221a17a2a45a3e383a12346215fc3970d6105c44ba4e655e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uz/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "bedf1751786c828779fb719edfaec466a299ec706e40dda5f886bffe911d425b82e9f9a3cbf5a0deadff7ee77fd63c73f38ce3462aa7203316fc0569a4423927"; + sha512 = "85978c209c7519862d72adc61065c52a2f7e2d3f37fa5fbc10190fc896506737a42bb33fca3f7532805617932e7f824bef010c43f51510b8c9e0609560c1918d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/vi/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3ed1b4f71d75d0e863da048edf60ee3cbcc5239d4a8ebaf69fa6d3a8e8be20e556dc838155d7b99ab2776ffed60e578ce253c8e6f57491dc84ef3b68049cf929"; + sha512 = "c7dce64af32f44b09811fd42c2edbc58556c931d9e4d11e763b27d969e74d860a682108b5011335fc75f1ceb09107dc27ef1e4c0b196f0048fe8b3541bad8f59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/xh/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "23db4e5df5432094b7f31a688b84d23304c7890d0ef99cd9c992d7a108a08199b6f6f94bf3574668b9b0a915ac49d2c0e8c6b0c37ecb145da3f5e2a5660d6d9f"; + sha512 = "b63e73be6f0f7667fea700592407adf7599935c5a25ed93d140565d17f563fdc5c7e0cb688733916312287952b95f16e82496905c187d92832e0da296d925164"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-CN/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "bf08e65cf257f789dee34891818f94368fe89bb500138ffc72855da7acc62cc08a4eec3f4d32a637f59fd0eaf072994ba4d5691da300d75738e3274e4db3ff45"; + sha512 = "8b1de2e32b3450c84184d20df16991ad0a84cefc745ef110c93697841fa5cb3f4bbd9d3f21c8df6807d6cacf97dea1b856cf651567858b4c7403738e7c8445bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-TW/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "6b924c8ad6b86cf07b6b2f01a6138636391acc519c469b7c1dd96ee5c707e1b81c656fe87df31519413ad60e56e06da46c0f762b26249426428dafa0420a5b97"; + sha512 = "4dacea538fe5885bc5030512ade78787be53db7625ca4a006c48787e6d62c4ac82b0c7d40976767ac483a6b88e4f44abe5339e7909b211cf1f720d584105de89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ach/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "56d847a9417a134af10f53ac5630f7b4a7108b177444327df97511494e2a28a279990ad37d48fe1fc482f34b45db66f1c8d458162f253faef3ea2e66e42e7166"; + sha512 = "6a2681ba41f8449503b9a55d551ca72a94c51903865062baf0f80e29a4cd98953ebfb239c72706e42795dc1a49d087822e4f13790298a78b0d12a0a08468691d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/af/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "98d55bc29423eaa62b1c5f179887ac95e8aa228ded6e077cc645660a048ee3e42da7966adb9dad5f168477262638456bd9509aeaabfb2a754f0435b60e9b3a46"; + sha512 = "7835ee1925c7e097cd16c92a9455e331573baa0a7c5150df27698199b423cfe0e511400955be5fecfe342d537b8a0d66e10042bfbe1f411b5b9563dfcd2f4875"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/an/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "0478d738826d3d9b0898ab93e25527b4dae789652a65a7b16ec5796b8e48e575387fa3b7474d7092ad851e107c03f9c58d8dbe738277371f2e881c56c9f727f3"; + sha512 = "bcad9e4ce854ae1a36ffcf82690cd8f2240aa04f0a525c1c0d9149e5ebed1e78813488a4eb8330b39e61399907fd421542f1b10c616819b2567215e5ff5f972b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ar/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "4c884b86e8ef6b554d85151f1eb780edbee0bee6b60f2ae3b30ff9be74591c4f4df07e5834d0ca5cad456c574abac712a8e856e07892df652f7db510618d231a"; + sha512 = "205217f6214d77d0d8a9c33f5d09abc7c32488bdbb7f5e5221968ed490c10f634dc2ae561700f63408ac38d020f6d17937af2b711f2451585ff34affd52dd25f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/as/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "a58c8f47fea197a5b9a397f8e58f73e381ffae3426c83872407481f079b62a585230d2f389245d5eca6308e8832fc95d8dbb7da97d25551faa44c20f6e032bfc"; + sha512 = "7fff85971ce1150b1ba030b11b637c51f166ddc038acd78297aea2251b3b2383fec376fce58610bfa3579825ba66d9859a8f3e7d2e33939c82d4e692d9df5b24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ast/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "fa4f10093602f03b759502d76ed1d7636ca2fb0f83174869e3cdaec3503fae625e6d49a07c011dfdf6964aca7e8ba81861677cb387ab8c638a5a671864451dd9"; + sha512 = "f3bc3e70cbc691ff611b6bac2900d7e547d80ac84b3e1caad250c11e3b3776d9ab4db7fca8db0c6888378a540f966aa57e100becb810b1a3fa5b0e8944ae81a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/az/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "8560bb32c0c3aec695d86d1c0ab6491ba0c2dfd0a936e7cddfb8d3cd35890db31ea233afc74d19974fa693614bfe7728e69b8d1ee47a34331b07674b0b57f118"; + sha512 = "e9c25cedcc9684b88f442918e0a5606c1bc8986edb8c1ac8e885b00241a792c115f118799d425a876c462aa25abb36708b819ac712ed0c854e114a835998e30c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/be/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "026e1ecbddc4972cbf1a2a930fa1488b4e649ca7c811ad243a3c068f8cd6b57e5a73d193a3feb4cb49f012dfe3b5af9002f30609cd1551abc1ccc5e89476440f"; + sha512 = "0e27ac6e9ef47d8e54ed5da4e88b02468596869613dd214066bee13c11c5a3f614fce3dc92f6e4b49250a175195a14fa4e11e0a576e24a550c02fc64187a7da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bg/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "9d145f71f46e12f071e8e181f6511d20a6ca5f1f1950cb076ca25b929893da7546b950450f7fcb41021c4591238738f9b8797395a86c599a907f0df687cf0282"; + sha512 = "06a1a97d89230b344d72544e7d16cf9249b608d5a8957efbd5fc72eeea09ca791cf17d040d3a8adb64493d2eb10dc9cc1c334a0236aa41b087b9dade15345f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-BD/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "846001c844e9ee3d9305eb5be18438af65d5920363f19935a60b503d4a31c0fecf1d7e6fd286cb7ee4b7e26455496b1d27fbf6ccdf2d2a432ec2e2472ebc9c75"; + sha512 = "6acec4d29d2a40e0d946fcd72ff1f623d54daf9d9c5c00099560fbb286dc91f1e2ba341153e97bdcf62f54fe616bfcf38ff1e6c0b774a7917653a7e422e26320"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-IN/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "712ae023c09681b1ee9f41240d12a1641df5c4fd7eeff15d157c379e5b5779c65b93719b238fb121fdb9e5ce10809b21125a6eae23a77e1806daa0b2b13e4372"; + sha512 = "b492f32f37ed40ab42fd628cd01d063a4705c8fd14ea599327f417231951a610b307cf1035cc81edaae2e784e38c55dda17275f77921e1a63936872d48944ae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/br/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "b99c48b8971dfdd0e642cf76cf890706402079122311b1b6af77d658b03acf87feb67918cb83e5435cbf0746e2c2a7c49bf7283969685d0b4bd616d4ec3066b4"; + sha512 = "e4a2432e279ee0046606ebbe84f0249afc225fc1276cd28bbe989049ac59b8c2fd09ef787fbf269367b45ff9c8092c6779cbafa45a05382976dfde3479527148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bs/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "2203e66bcf453f22848df010cade83d6982178c8ccc023e05ff8fa60aa3f7e583f9d8e33a313fb70a696e149773d567be8228084708ca8d01b3cabc431a7576d"; + sha512 = "c8172442b52b48396b57b36a9099c3dbfac36020769101c6c2fbe0a1e857700817dadea56a775d62f127fe8f86b714be0d1be63c9dbd8a2aff15b6698fca84eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ca/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "75ce6cb2bd7c1d79b4260dfc19237a1344fbefdff9775a7e557f9a31dd9fc6235f58ca8bb8430b80bf0f25c14be5dc2509e86b41b7ff7814e2fc1baa63f187a9"; + sha512 = "e199d2b24e0a1f559a551bef9f0658d23dd69b0a6f9e1c2b02885eaeade95144bea2a29bbdbdb0cf7e34cf9f7c6ceb49c407c34ef61f855e260b2b84436e38e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cak/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "b4f0a11030bad0cd177db357bc49b6f745cd429d3a8dd9bb09e99db1dffd32ce8c21a94c0b98b6db703fdbe16750b4574b3378dfd40a358bc0c7957fd2cbbe2a"; + sha512 = "32552d0a4ec557950d64b0e67c572a7696ea7e58a99960b192e5b383ee30a39382c5b80e0fdb1b14f3643ec8c48a422098dbee1d99ad6b2c9eef1bdc3d0dba91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cs/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5ee1dbd826801dc5b029c8eadcfe8d040f000527a6ff7f2a40713a137c59a144456adbb35cb202d7883d831486a0ad56079d07f681ce294a5e97825b7effd69c"; + sha512 = "07f772b65b234ecdac971fd0a4c0ba049d17e148701b286223e972cfc77fbfb28c357e60e2311519459806b48ee8f10f5df96686a360b5148ad88c6e9de3d545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cy/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7116bf1dbec5603d22546b1927a6038812c2abe1e9e7e1ae556919e62f04af422950efd808e28eb7f8b349a9d79bf01b9280d6a6aab94bda8c0f6e2a8968b841"; + sha512 = "1ae9d11b2911997ecbdf06c66072ba5584c70b33024a18aa348a50ce91019c62c862ad201d6cb7b427397eeaf0c7133136047241cc61fcba4cc761d9665bce00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/da/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "538ddf539a6d9dd22bc2dbf9f712773c1d7896ce2a49632d4acc2e5716dda95dc9d10393bacdf2fb7d24342c8a93c39eee139f32edfb429b0bbf7053b7bb3240"; + sha512 = "71786ab9acb16d3d2bb102863efb79e716a67ab0b32c6a6475bdcf93211d9517b862939576d258b98b543be9301c26e210c9f420ae084233e56d497ab49b8763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/de/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "ff33af1ffb0549951baa32e423eac3828b15bbce18ee03cfcdffb57504fb0e592db2721f7008e84562e5c1ad297311a1b3d4fd5ab41e3d8346a2d1ca50e54c35"; + sha512 = "36067646d3459c6893f3504d5e9a7ae3fffa7291fc32969e98d4ce3223b09ccdf7e0b04a6b73fa2584f9aa45e9b38a8135fa243a88a50fa2cf745b17e7c17de7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/dsb/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6dce022b035bf9c5d76c45492e29617668e0000f5f3981e3f132ca1595bb54b504cffa92d220e118fbefe8088f3749f4d077c591a12657ce9266b88aab8019c1"; + sha512 = "e6fbb31e7db958d00a937a8565e691c4a65b975c0cd3f852c9eb13e97ed195dff660bf36c40764d3f9169059884e384fdea25ec55e49226a02b693b9e2fc3c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/el/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b917927c48189bd26289fabe3a51f59965c8a421aa941732a50aa9aa3769ce085ee69bb04202c21699f5ebd6ec2cff75ea2446246d89916127be9418bb00f47b"; + sha512 = "15d300f31ce324e89f7927e66e39c25a0437609817f321185b385ad4026eb2646f065f81a1cdd0ae1f7b120582603c83e8c2b845530a6d44871741a23f219261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-GB/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "17257657f8366c5efab1a0c47aeb6129e624c883222a6bc3bbb097bb49b531894cdbfd39898d0d83981a1609fd3ea5dd101419819a1f156668fd3cdb3758b8d9"; + sha512 = "7ee1708cea3282fb0de47147bc54d5738ec4420c3d8e41af445e138fe88b453572d6848de2edb7e48258bf3ac25e03fdcf22d768b220af6998e97fd16d4588d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-US/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c86cce7893fbaaf4d3b00b961b07a2f2d680ec07451b735449a501b2d9fcfb2fcbc0cb29150866805ad38f6a4aa1b6c4cd87f5872b8c735791953f3646600703"; + sha512 = "2dd63530379b00312b310ddf63f7796b6eec97edfe6638dcc82dbc2648c42e9e96932c73f16518687f922cb1d45212b82b04abd39b2e6e7aed54fa4924a5da34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-ZA/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "0b278c62b2185a4a6cafb7015062693a0dad610ada1123d07e162456e4d942f02a0566ce525e68b639fd152c420b925ee3e934fd3c42ba25524b18cdeeb9af5b"; + sha512 = "a04e3c3202e12f7f53b11107e0db92282bb5d8fc6627f3bc8729c520481d9a3566d39c68c283a97959020fc62ce1095c5b19d8dd85577bd5b0b171f7b67abec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eo/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a681db144a631e6584340febc3de05803921b757f7c1d39ad5b8ff3d119ed8b71a4d70a43ac1e3a121e04102770d2796103aa127886753b2bbea723e22df7000"; + sha512 = "87afb472bc3cf46a4af7d7bef7b063a09208927fce7060824575ddf7197e6f58810e5e36631402deed1cfd5d921323ba9326547a57792e0c8f4166c061214018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-AR/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "40f5a7d9ba055f7eef155601f8a57e566c0829f32c92df48ea2ecebf6e10dd80885881a98d18a693643e2c00f8734218a7ef8908652eba1c4d4288f95a34cde3"; + sha512 = "c963b697c4ecbde0432170a068143d03486156622294ab46e1426e3a3535031ce4c8e2b49d5a5b0de721cf1dde2abd60b6619fd4f8dfea90b12ce64ad4744ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-CL/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "be1e5b8c6e184519d0b10fe67736d7635b6fe8ad71ab78014e53ce9a1f1342a83aa1b18f535ecde2406e8be7a8633ea58af9adb355ad2b19ce0879c62f70bd40"; + sha512 = "f88736bd06a98e2a03550b7134ed4b6dfd06ea0506f83f0974d1c4b3226a3a37c1fbc5ffb085c5cb044dd282c594ec8899ddd3aa1ab153f9a5214432ffafdf4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-ES/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "be0d2b2cb5f82fbaf10be63aa76a5ff9b9111b4caf0ef5222b3ad7d67d39f25dafc125352c00bd91bb1eef50a6f57e996f6a10618d50c5d1340604883bffecd0"; + sha512 = "ae0368b758e8a19c96a4344a0519b2b5c645e6bb19a3babc0b0fce9c7b43df83a5586406144d08df049fa984ace65f86282bbd14307364d99139549e0873be4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-MX/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "439f679ddd8169d51e1c1f9ad32185fc9b33df0a1301af7bdf8982dbfc5410cf82edb4dfce3dedc214ab258d714da91661882e45b8220895aafcca171fa9bb02"; + sha512 = "a003622d0b5b048087e80baaee0776ef0f41189bbab81441bd31f430947521149ef8671aeef02308049192d4184d2fa0dabea8c4b29eeff6abb005992278da7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/et/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "2b80629eba503ca034fc4e9d873707aaa7668b2d4563792e3500acf89b35153fbd7f6406d12497b1ff1423e7ddc3bb4e0f3f63cc759758e544145f31aaea5a03"; + sha512 = "71a81507a18ee16d947441f76daaff9c35a7d1f509ec4699143a7018534524f5d0c64340541efebacdbc7a163955ae06a143a165ac178a5d26c1b87b2479d669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eu/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "03047624365bb4fc5bae68a5bec91a396da7d404731cbe09d89baf3079be0c4a9a2c7ff73d231f39e98689d5c4dc7290d2401fe14cb564ea53d063f79d7c151c"; + sha512 = "d9fbed6bd402b3d21eb2ba032c4776888629e68f9dca68421418e1d293e4eac154bc26b0d8297e814dca2cc754e69b33e307e9a896bfa8edc0f2da7a75a8cef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fa/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8758735d6bce447b8492f9a395da6f58c63537fcc946b17b8173554b6eaf32a41137011bbd44842b16e8053d55642feb880e9cd52dbe75fbd55dc592724a98a0"; + sha512 = "bb024088948f3be6d37418eaa0e987ddf4d9854e7d06513e1691c4944e1d8ad8fff1e65118e9f45557601a238f0adf07a1596e82293728f2b011d0f1784a8afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ff/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "5d6a1b45f69135dce282fc411237db713538830b00f6361f86a95da199d56f2bb351de9e59fb1d61a4b617c79e8a80adce3c3e57ba837187d4c368b79e414dad"; + sha512 = "e3f21493b6dff7cea9564ee067445076b2a9967b752530a0f922a70794fd5dd120982833574240d0ef854734a397651eb77a8edd0715da6c8e1710c3515e40e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fi/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f35de96ff1b8542206fb8e9942333397050a6e88bd0e6bca3c1e56fc4dc754dfac0b554b74188d316e6c820881ded2812efd9221b2c3d6497826ff29b89382ec"; + sha512 = "9ad7444691a95c1b21fe149ab4468031a6886a42738f31d5aa81e2321c737d2c53a6d817523de2722394a47eeecf514d218d7e41158f42a80b9bf2ac3515a0b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fr/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "118d6ae69eb686ed1d791463bb2ba025749068017de94a9d002d22b195ccb9e0cf0d042e613ca88c310e685070612a070308971e12eeb318b26b2335b13a6a33"; + sha512 = "d3eade70bde9bae372fa275912f3c1970c10978ac9e83f84c018b02443d341c21441b100f723c6856a5b61b742285606c5049328838444e7813e7427e1a0feb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fy-NL/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "79a22424fddf0add63c3a3528a63ea4c0c9d39f3bf9e35e18fc9ad4a57be7e7f675087f1a491698868d5ce57cdd149aabddc224b7b3078ad3a81e6ee6dc35b2b"; + sha512 = "412a873708341e94fefcbb5fd72661559a83b4c897f5bea8a17051759afc0ba214dbb9732f65d5f4d9dfdff98498106a3cce73cb4c6314ec7f7bebafd8e63113"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ga-IE/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "04b87f564be35d19135973a0e17c2db1670aa804ad8c76b40c8f3ccd670e0c64456d84cfec276dfc55dfa29db5fc0bc70826752bba756cdb597c7fc12da1d30e"; + sha512 = "59f0b8e533575841f768cd80390d8237c2db3fc2f2e99bd87011a8868fdc76ee8e5a87401c029f55c990fb0775fabc163ad4d9ad1531dfdb7bf9fbb9b601e08b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gd/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f2a66ee64ef80dfaf2c16af952be22ba9c11b3a2859b6a861e04ccc2e7863ed5bb1421338c1ce30ad9ca4506d6223190ab5feb194ee445e9fb09a11aa99a465f"; + sha512 = "29cfb3bb6bffe5960968cae3096c63d92e50c514fcde9a26940e8304b688a869d6b03ce7479df514281fc609ea767c69fa66fc1f42e9b0f3cfe3be9ea0efad7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gl/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f59b462819ee53e8727863b3e4cc240b83ec5828860e3a0428b012eb4047ac837760157a7db60bd85486cfb9945185a2b8f637581e489d90bf140bef873dd9f4"; + sha512 = "f7b425e76607833cf4ed8e4381da101667c94d2942fa06a9be94193da350d03e8bd0f1f6d500ed0c231bddc3db5e458e9e94bd8ff77580ceb321ffdbd8a5e320"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gn/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "17499a923e6f7d0e63e4ff0ebee17f02c99f614da02d0ff8a737a37ecdcf69ba1798139c1b824d187b67b443e54701b1046b59fc6bac3757f86fd6303a778c57"; + sha512 = "4f4a07552616989448bf5eb12d0a0ddbfb12b10b8f876d8a08f86bf58f113436b364f99ec26a20fc29eeef1030eb81546e0db1e92a8c86f46f6db1e60e784698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gu-IN/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "605ef03bab50ab1438be938bd8aadd917c742a5ac0bebd14dc8388a6e5cd844b52e0ef23670537dc50c2f3b4ca20814a9e559e667f3baaf292ce3fa16ded26a4"; + sha512 = "5510e8a069b7444c20af0c95258e21d5d7e35baea46b83ed7fa3546af41e76299191fb8e14beb459c79a4a2aa5f195f6c99240f5f54a54291e2bd7256e8a9979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/he/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "51bb0b64426ed0d46bb2265b18138dd0d5fdc58c2782d3bff4dd8ae13bbfb354648b346e07bfe2795a4fc31cff2df54d94ceb42ba0342a59218eb5444e9fc12f"; + sha512 = "c3b140194ef9fefe85f2aff0cfb44c49ddbfa3bef89b9b53d4fd92eea4532753d19617a57809c7d5413833e8055547daa1296e4cdc8f6d2a1cc792adfff65a79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hi-IN/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "74c921e0bcefd0c81616b8685ac3a0fc85129a950a917ec37c724fbd92df8099e79726639cf18235379ebd345f78de754e4b4e87d859e696aec6e780c607839d"; + sha512 = "34e457813bdb5201b862dac75309ed6e0f4d7915111e9956517de12a809cf7cdf8f18238dea9e480434334d61f0e02cb1d3b7b63ee1e83f4854bc76507093838"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hr/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8c4b634cbacfe34a2031c1edf196201fbbf13f7bf22be2910f27788e56b0647598d805953b888869644f4ec3547a0813377d517676e732770684b057e5f76028"; + sha512 = "b65b6560c82225baed727e8831c549512d0d900f41c337a759d941b6d78462221649f6ccf2a3cbf889a838518c773cadc034d70cc34ae1253afe74af8e173220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hsb/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "59ed77d9722413d8d75c8474de28660fe59d8990deb3c1743fca4fb1c18529173e0e7bb171cdd98df961792ca6368b91db26d6ebeb461543473ee5ce8eb7da82"; + sha512 = "c0966d7b799648a279dc1e53729bb1eb740eda31cbe008623e617085ebd2c6e76fcba68ad038b6b25e9f22032ca6075a66dd3fc068de7edcc9a297ced0353793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hu/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "de8d917b533941220763d011fc9b38f0c0f8f32f09d999fdbe985017a002c3375b592865420e58fdc4a3d56f73206ddbbac568fb506ccd2e3cf4d2507e8ed315"; + sha512 = "d324a1a87dd4ce1d39691e1f5bce35b0576abdcff72786703f9a1c336706faae885b7cf3578fd5436d3a6c5e30aea2f80276cbde72c38bfc546fbfda60ba29e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hy-AM/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ea76bd2eff30277dd06d606b0568dedb0f01c6330118da99fd6952f9bd5c8060a621687c66853b46554560b56f1ad2401e87e66bd44d1a85831805caf7ccebe2"; + sha512 = "7aea87a05327f9d322931c79f39635d4b395a648af26177cbf2b4bf261d2fce0c756668f0de5ea6d3bbeb1fd51f7d4673882573a5f67ebb4406434ab42dae86a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/id/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2"; + locale = "ia"; + arch = "linux-i686"; + sha512 = "cb0a81af96aa96923a49ce75c5dd6ece2597c1c7741127b9727df9f403437e41da674958dc3680d60ff599bdcfe7320d3c18fabb7cf28ea1db27a321e25506b9"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "024ba211754ca36470ff316d626f46cfc2763b94dbfe027fec9dd628a0c617fbc9050ce7af336d22c962bcbb9190f1980b1381c5d3509485b4f7bb5780c6d15b"; + sha512 = "546a0f63b7221de9bbba1d055d9d27a220d61527957b236031a062a092d73a55dbc8699154c6cae7d24cdee4715080fc99c4d15d592a7dd6af8a1f05811199d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/is/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "d53d4d7545bca63ce99dc691481b890846c33f5efb802734514ba493e1b31e3b4ee9632a4389dc388c77692ceefa9eab4e9f85de1298d0337a6756ceb27d55a7"; + sha512 = "8ad727a32508f339880f10cfb059c7f3efdd2a195490586d59566e622f99d58a9f0e72d2975453e795a51c6087b0e400c7deac34fcd250510eb85094df08128d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/it/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "960bdeabd29fd9bfe72f9e2b5dcefc1c9577490636e9cacee964b8646ee29ce2cc4c9cb87a93f057e2a6371cb734920928bbab90e6c6738a19098e9e5a4dab75"; + sha512 = "21d1b28d39098f9580f8573a85e50c2ad9aceee4c9183dd4a6c9ec673cdfb1411c743c44a26737a662fcf9b4acd9193ffba69016a8ad1ad8a2e85eb1723aa55a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ja/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f9d889ff8a25259bcc28b1178ca511ad7cb0ad9d0882c8b3f6a04e98d5f4b63ad9b190cc66c184f93fc96e0f869bdb10cdabaeb7b9807d49c3f72b7c62efe3c0"; + sha512 = "71bc02ba091f38f0cbeb76c14e0009152a37a6f0adbac5886918fd2b6e75d04f3be3fcfb85230cc88664199422c15041d44991d476b8d5e827e502b145751fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ka/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "1ece76f8237065e712b9835d0ea15f2b7318f420f8e4d6f73496bd1dd9cc5fbbb4125a04b4b4cc5c36bedaac39fb844a101653efbb5d0555bd13c3a4ea3e9d28"; + sha512 = "dde038391cacfa4acdb25b3c703cc16a98c1a6115f82907d5dc40dc9512c904772f73e8f27651ea0dccdaf703bbe1dc4fa8f8249937933ae7ddbb51d0787d9cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kab/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "67d22ff37a79716869d7b59e95806c4a9b89bb2e256e0f1549fe5d3bc9fb3909f7d1c23111e8bb84a9cdfb4e029414908a79a8512c49847fb1d4b20263ccb43c"; + sha512 = "5879b59629f09cc265a1ab6a477899538f1ddaafefe6357fbe655698096d084df9e0f0cb7c7b4387e3ba14d3997cb36744c7e9f92e8967a44124df59cf1d00d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kk/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "b9cc2b1c31ea4bfbf17c2c7b0452bebb830cd3b8cedfcf2739360dba562119e0eede3b660a403420f367287e94e0bb34f072ea13b1cd1b58681302267f299464"; + sha512 = "fe41667306010fd00ad3611b4c426373617c5eb64345ca3b08d86f0a28fa2055f61c1ce3320fc5b26223b851eef19168a2f43ed2e4e00167ab937d1a1f3133fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/km/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "afb6985ad592ad2d634c3f84b1d573bb87c59bad892f066ddc1bafb5cce7109c59403f3c1394b2f65da0fcd29ec897a3144ce1ed410f623354410c27e386ce06"; + sha512 = "5520a9cbabd270113dedda63162a21af2d284e0df6a9eb9b5b9a55d11989eb1ab72e6b0cde32245716de15e7d89ff54f26ea67b56871c4ab94de690a015c80c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kn/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "cc85e9d276e4833fc962554e44a54ba8f5d56c387c37ea78f2f8deb1b845eae8ecaba1761726e209275d24c4192bd61e409c9d87320c1315665c095fb5231a9f"; + sha512 = "e9f33a0476c90be99f3e66da6f4c244496a5b20a45dd81b8294446cab71e423e8a6a77442b2af268b87b62b329525690200b54996856039cdd857e5ba4e07f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ko/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3934a012853c70b77fb02689141efcba7679e87d115d80d1c7f5945027f082986e679f146a6acbc97ff5b5be6b0d057e3b3f8dc292c4e66a37d5c3972fe865c9"; + sha512 = "e021722d534ab811c632fd472ac1b3cc24a49865fc625476db9e142b8210dad7d9eca87aac1537b1447f38f2264b7f61ac7a780edca4929637f78587378fb66c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lij/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "571334620261a36127ae1e7a03c6142ed22fe49a95e28534030882c47a7325ba8200b8350904fa0e501cbe0801c2bb1968b456e9982bef165d3db0e82ad34b89"; + sha512 = "c7e8e77b2a71e57d8114ea0f4aa3f9653bf5fa695091211534ec1eae3185b68c557550e8cf7a506b361310b95274e4a5f21073957af25ea4d19c8fee33b07c50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lt/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "3a7a0f09b52991a4d8cc6009c2fb91f3f908989d8178b4b9909bfd90f29db6ba11f29ffb35f3f1e578f96d6be10eb0fb337d28188dc792e6d024e42a5a16af8a"; + sha512 = "c82b411a66b0385ec8e9708ecb9e68a3c6cccb4088d299727b639adcdc41edb740b79721025c6ff17b8e3b3f9783ad7405ffe1da3c3e844f82e640ccf076dae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lv/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "7e5153caca960317e039f8ad44f6eee4ac8f582ff2b957f70c9eb3d6967d62fb94e4b13611006d746bcb4611ec1b0a003bbf610d412f9e41f86a8ea19096b70c"; + sha512 = "a45966d7dd15c325588705d209409730ec21f828c5dd690e705a8540b58f278f4ec67d3ea17c4fa0c94f2de9765de7fff71c2fa2d3dac851f01bc5df856f6c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mai/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "07cbb84ad4537482ae8b1ddb00a86197552d3a80f6432779952bc9b1577c920de07e60f78272b1ee3889b031fff1c5a34e1c1a69d3fa0621fc53413242f80242"; + sha512 = "bd205990181115edb1b9134c5a7ddc7725699ade854737b8d27018b80c4d6d5d0774ae92e6d64c5bb160f85bbe8a3cff7033893dbb698adcd4bca0a189b6dd20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mk/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "230ba5c56d60d1ec08092e9f6ae396fa836df56dff1aaed933a706014318fb13328db5d6b0bc3dcc030daab5f906d7760bb3a6af3c03422f724d627ab8b9d48d"; + sha512 = "0cf7a3617c4cc9e8fe6753b1a6eb2199b3ddc8739efac499c45f41b79f319c4cedbf8c9e522c13150a7afd622c569c66057f934ff03176ca33cd35cf51a792c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ml/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "e4aff215ab6b3bbdbe08f7cc698f11b12bfdab232ddcf995681ef62dd9808789541e8ac7b9b71c003775b78451c06f79ebc45d5a85562385a2e449679db346f4"; + sha512 = "a65f9f11ad6dbd82b64576a1dae5b76d30a353478932b5f8afd046764f9fb438c10d631935ede3743155ecc05612247766a1b3b603e3a9206538e68e015b6eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mr/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "b2b44d4a205e39d82b453a35569da1a3f428610551d322a1c57e64da42d96ca2f199e8e01769a24628506cbf3b621cd734923f9760305de8e480d51f360f79e0"; + sha512 = "3385e2cbee86b9fbb44a1cf719a3fc6dcfebcb67f8adc884bf207e887651befa00f55aad6c74e009bbd4b1e07fcf39bd299abd3ff9d1c9f44f9ab33a1f4bd129"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ms/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3646303c3858e4c2a7dbb555495f5f06b1867a04a37cb8ce95bdfd998e7bc96d8afb8c83b1df7d945bdc8327cc8d7be3f3bd7199efbe23e58cc3e38608ff8313"; + sha512 = "0c3a323e1e72cc8fcfa153def5ce4b2fb90d69e16ca4e4b6472561b72d7cfddc28e8ee3f90f5b9909837330f6521cee5b1ee86329ff0db245c0ba94cbc87da9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/my/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "afbcd9f8dce81267614855d4d59da02f87d369c2c0af78e28ebf25de18ea4eaa1412999fcf3d414ebd030f9448d71e48500a4e90aae03b3905ba69f2670b17d6"; + sha512 = "18e7e4fabb8a42491bf083863b2979ddab9a3a914ae476b2cbb8a290179d3685164543e637bfdf905655c482634b1914903253d7ac120bb18d122d0e60ae1f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nb-NO/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "747dbaa1919c1cec14d4e085f8c8f284fc49508ce82cdf9a97538a85aeb9b901eb9e160e03346a769ef760bdb2108b33a25a967a527dfd3758f25cf11bad2e31"; + sha512 = "2f7a98b86c52b35ec5cac1b866b844474020eb0076cb5a2fab4abf6bd12ab3882a54b7b324ee3491ea173c206655aec3f854a9f0a29d934405359c56a34bc9b0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2"; + locale = "ne-NP"; + arch = "linux-i686"; + sha512 = "18b8472b4af585b65995b3d25e6fe290d5758a06b1cc1dfea4ed3a6512a8c250c2d3e0157a274a35677183b2e4a89d1b0970d310e8dc319ec8aa8f1c02a6b70b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nl/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d882e7c1a49ba670535f17fc9ea99e7be4505d6dbd5d90855e4614cef319c38718da445afc411f1951ec3fc5d9a3b8799c64459a7adb588a29a126d1cd16d8fa"; + sha512 = "f62dd81c30ae0201d1f7f98804c10e8e431bf19ea3249b4a4edc71ad2103ecb63efdddd5153059837dcf4d70499bcef5b874aa69a15a391255af0d7c37a65b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nn-NO/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "8bc137f953b13a447dfd419b9ee0e4005134437892f214e49e18f98e080d5413d1dc655bf0bf417cd7c8a09811d3e7850967662b9d0be0d3b72cbc92db7e2307"; + sha512 = "955b9faf5f17f598c13d51d9845c4c520b5cc93c0c0433da189cfc43d177665f47f2894f77d2dcc195da7ebb16870200d49703e45eec6769624d6f4c52d85879"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2"; + locale = "oc"; + arch = "linux-i686"; + sha512 = "6a400ceada231224f3e38d4583ab064fb6a2aaaa89b886f21eb51435ecca32c5cc0bf4c67041a3e04ff2006b1d12899679e0cd6e425e39b005ddb5ca80e4aaaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/or/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "34bbba4bf288f62654f88afc461155a27cc0316a920d7b8e42198054d5800360401c933624140cd569bb9864f9eeaa5616fe2530888e4717c964506ce66cce0d"; + sha512 = "ef19a79b8ccf2c5418009abb06131a46b7205899a71b48baac0958062f73c54fe000ccee3984c42cc2fec2ceb2aff3644ee260754af5ff40317c375e22edd9c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pa-IN/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "1403e23fb95cf8449a149ecd698e768897a3733718dc1f6eb4590685263e2a1b54aaa3e557a968cfe71c5172bbdf7d24f3eb9fcdbeb431e31a1a26c0b9738e9e"; + sha512 = "590785f0a3cfca1f8f7518cd6cf93398d71f1bd01e5bb6add5c79e3acb7fe8322d37b77994ac33d4ca33e19a81dce016dd0dd479fc38a7ba611d7a4d8fc30955"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pl/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a2d99c00bdb839e4ce89d1bd6a0334bee4b6c6d426c3054257824c46abb1eb3c1f283aa0a4a030f1865fea350a7032cfcba86e231d11ce06ec3066f5ac4d47fa"; + sha512 = "77d6741dc35da55b92cd3eb5ebd3a32a96cde805e53314cdd64ac0ecca6a74bbb042af6cb778d344cfe01e88ef5005c067f964609404e55d4076f1427479d629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-BR/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "5768a805aa0b7780b55fecbd9bd349c6cd78efcbb3595acc7cab18d3356835e53e63e58e352c30c79b349e0b0c80be59509fa684be21f541cc67aa320e654f44"; + sha512 = "1aac86496779b9b6b570a7e7b0b4c8b443c4ac13e5dc548290d33dfc64ad940d6058afb7cf062d8e89baabbba5d55f285d1724322006c15476005cb0a04c163e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-PT/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ca4dc2c76af2db4d9a44f8ce9f29adf7188a799d00d2e8cb1bac807dc90930b06cc5329097ef771e4f070969cf42c3cfd65b32dfd3112f59efdb0071bc6292e2"; + sha512 = "3ae95a9255c6dccc8551d59b5428345a672b9c39fc08dd6e5b509ddb64ae0af197e6f1823e1bee08a2393c54c17077529a474757aa0a4bb70de3d868ca934023"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/rm/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "86af2317c04244c63f8182f46eb95abb1a113223c6d503c6b85c2fa9b596f44959e86323da0ad3a708f6c94aea4180246bb562f26c64a8c9b27d9a490d65a291"; + sha512 = "41d5e3a61b7d8ede3c040720fd6be629f948a8fb55617a9cc6333c275c00304e990e6a0924d2eb4fc16544d855208cb2bbfa633ff829fdc37385b51492e49416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ro/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "2120d05bdf2dd8a702726e232fb3f94838befaedeedcb7c651d8d07047759b885904220173bfaaaa6d55b71e52085ce23156ad030992e8ae3981d47b41de046e"; + sha512 = "bc409d8cb772d57ac8729ec61d5fb71b7df32d20ec9836cb1c2870bda85ac8f1d6263f607ab0be0e2818795969bdd4fe41b48c9fac5827b363868505867dcf87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ru/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "221b4170254ed9acd7edb256ae560060f640c7e6c02236e1925e38489e387f839c14b5cdfa2a0e4a0173e8b98a2ab57b7733a6fa361172166097fc84b260bba3"; + sha512 = "4c2c6342a08da3991c4b6a436cc638be0f600b34e7fe02d75fbb6c10d297e693d2aee44624e6ef8543164f36b11a466f4f7c7bec709682aeb870e591523d72b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/si/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ea216290852677ae93bdbfee42b65473f9e00797175b7e36f4766a251fb302fd69009888f36efca7d04ef29fb0d66e75bbfddbf25f7f59dbe1d6767ffeb0c543"; + sha512 = "6708d0ad517b3551302f0b3533b8e365a8c27489b781f375fb469e45b8e9c84df11e0ff4299154ff7e3132e233b5b64f9e41432f61a399ade7ee0409fb1c5654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sk/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "92071604add2392aa144caf61ad747d98be52c3fbb82c86f903772d470928f71748d8def2f367a8b6bfe04ac6769fc57f8de29210ae50bc45b75b94f5005b564"; + sha512 = "cfcb6141b3bc780f2bd27f9226f5b0f82d86ef9f22a15066ce57f8f156727f437b67b3f165c2b450fbf0c0492a2c9d246f2fcef417a511164ca29a4a7fbef6ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sl/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "94341abe0210c9632ebabc47325c55577e9e6a5f54b4cfb0ba9d19298dea1b3d6f70a68c3f82f6a4c371f8ddd6e088b18ea56282faeda0c824040e6c4cee0db1"; + sha512 = "2df73ada8ee40a4a6f01143c4dcef7fc5b5efd486a20057e86c1036d68018651c2451e02c10ba127a110fcf8bf88f43928ed8b65958b1c7598b81973b79ef9f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/son/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "537a57fb00d61b0566d9fd344919b65486f7c767c93d0aec9595467cf9a081d63c8ee7d3c7c3a3409ddb08d57f36ae078e3defc79826779954641c895079c1da"; + sha512 = "75f0025e6d7f6d63fd4e017ec68dab3de9cda824944d73319580861bc3be599d5ed6e4e81b7b4b4fb8bc8be7d530ccc52dfcfa920ca160682ea20e499a863b20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sq/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "a4ad413f8bf4ea8333b3c182a5c02283886e395e58b6ac5a53a298afba0938ec38648b67af3009a44468ab6fa89b6684d86b4d83525f0dcbb470f078584b6dea"; + sha512 = "763bb5692bbb818688ce3ec8ea78a9734b4de8ee29ec9ca8516c33e406913907affe211cf7146428b176c230353f0468824bef69c4f5ccff69b75ef7c302a1b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sr/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "15990e14d69bc0f043f7bcba54c5c27b7562c8fa68c5c14e7df695382303ee6ad40eb6b22319e8f9110b59f51209e0c8a6357e257862a50d8d515ea7f414ae74"; + sha512 = "eb0eeb897688fc2f2c29ddf31b76e8e67a40e620f7892bcf2379f2d28dd033070fad749d58770709f73610dbfa512331bc090ef5f4a8c561b196485e30dd27da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sv-SE/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "690e94fc46c94710e488b1a8cd096927756026d0d6ea49f983883092e32f9dc0d2fdbaf6efe4c236cf750873b7907807fcec6826d2ce8b2473d0c4ef5461a1e3"; + sha512 = "6860fa25a9b2a1933784f0d4bf2cce6066049586a7968fcf3dcf1078f1964027fddd28c4c18842073befdfa34ef5b9a470d6ad06f014d86677e548e1b4b6de98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ta/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "839ac81dd6cde69b05e934a4bfb943fa5c65f86d4c7d64c58eb86e7911f81d93a85abc3ad732ae0baa9c7df76a906826a109ea15cb4ee85e802248b99b9ef1fb"; + sha512 = "b060723474d8075a3b0dcc32387983a4fd159f7399de7a4dc606a11dadacf2b6b8af059238045fda70597c1530ba6007b7a07e065ce153a5b992965d1889a964"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/te/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "58b1225e50a0d3aef4b1d2da5d494b41e5ee41f53e2878a4945daf308d452348deed4cf87641aa51e9c061393c239109d02523596efb8ef7c675c885d80298aa"; + sha512 = "ddb772b303412b1275dbe563b991038fb5b860a7cafe3c79ca4a85070cfd1eec1394850c6478e3e2c89353c1d90e7d99ada1b2adeb35d5b55c7b190881c1a920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/th/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6d0cd2b6cd315ca50445f3f87d1d2d2977bc34246481a58239f06a90253bbb810c0de488d064e80d3d2bcc475d34481c1f59ef0499ff59057b77c0cd67e71c7f"; + sha512 = "91e4108240ee7e2573935c5db84ecc3a6d1ffce5f508f6a725e66d7d633c23f48d20797bb664a6e079e0ba6f4ad6a12abbf80a43cd51cfbc925a2b10e0ac0473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/tr/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "291f0c8f1241120a4fe4c2754ac82f443ef6f0d354f8b71b25b2020948a4de5b7ddbc87bbe2fc08b09ab1ec491a34fbbc69e6d472dc0114e369a99f967bf27c7"; + sha512 = "e4ca27faf36e60fd8db2d338d6cd2bc57c27d0c446e7e434279c8c663235b69b16dc2a957ddd0f025ec71650647459152dcc289a72b90f8b94b9e50d69ef2989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uk/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a6db7a4daa79d614b2d7c94372aacc50b4068ad437b38aab72cce99aba668fb230d5b81691678e09efb645282118dedf25e0c94e9d9cd9ef6a692c43a288e119"; + sha512 = "bfac00d8b23fe24da516c22e2e200f68ac8057b09fb3d93969622d4c703d2a74e64f86d6a0d942c32eee4cd6fb50f1324035a6d9be9e6f8d98781eba28d582e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ur/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "cb69cf2aab416490b866e9b15b3706dfb81b003887456ad83907047424285f46d1a4b727766b78a633b33c6418c3f24dd9b53a90b151a1752709191328c0e227"; + sha512 = "3548acbf07cd5012fb75f739f78d2b4c63f01253a06f094d0433f7b631f8e3ab33f887459afeae7f855193c5c9802ed96f862d41e937f517c6f84edead88a624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uz/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "bb29f30171804b14aed28e5953bdda7bc94e2e1d23eb9af54c36937f90ff7bfd068abe4c065690aeab2ea61df08a59a5ed808e1f41e7d055b81235f8662d35ac"; + sha512 = "ff30ce6eae9d2e78aba595a5a8c3a6579243ec585f705f949402cbf930f7f375b2dbaa36df40e888151831d2a2feefcfd91eb698330df0c8ae67bf469e782ed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/vi/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b91dade05c291572c257be0a33d685fb48079c4c1dceb95d6b51601430717c5bdd4f962b9047c2f2a22dad38578a041025ad59b424efd1260ddf6f9d9e4d92b8"; + sha512 = "1d052d53ebae70c01c9aff7295d20323403a067275b59e6f66980718654a3858d55271d31fb0812a22a5dbd7cc8a1db8737aab1e696f4fcc99cd9bba42cbc812"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/xh/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "771335861bfdb99f17ae6c8607e784e3901f637d8e4a06385bd2bab4797589377e8c1b875600e9d8434d6ce5a7003ba4ca154dced98228b85c6f70272c0b8616"; + sha512 = "fe0c271d4af2236ce8d2b489eedbeebe185da434d0b4080bae2ecd222bf95b4b3828860c3186cb79434ee60ffd379399b15045c8231ddd56aa5c210b8c52c856"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-CN/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d48c546975b92cc5c130e50b9fb3c84116235aaaed6ae8e04e975d8ed3605540b9ad640bc995fed23e42d271b9b2b598613b14822358c7487852030c5802dca6"; + sha512 = "4ef2464fd35bb71ebe6d86d0e213e9e5d33a756ba139d38ccf903ae852dc025e5bc34727cf4a8c3a8a851634c975044b9c9f91ce64adec8cace79ae1d3e67093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-TW/firefox-57.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9e731700c738f0db2390478ba293f78a98496c374cd871a0ae483c3911685f0cca1b89531c06177f739fda77ee94fba03f2d93ad4669ce219d215cac8429819a"; + sha512 = "da7d14a85785ec5ff6fc01bf6c18b7468aee74d5cae30f11515588ad403a3cd571890843f4a11beab08577eaf78ae3af6bfd757cdfa628c36aa95feaea6e5a5e"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 347ceba9ab4ab1c332d49ccebf0a3edf4592606e..5b01daeef510084cc12471b07eb61315aaedfda9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, config, wrapGAppsHook +{ lib, stdenv, fetchurl, config, wrapGAppsHook , alsaLib , atk , cairo , curl , cups -, dbus_glib +, dbus-glib , dbus_libs , fontconfig , freetype @@ -27,11 +27,11 @@ , libXinerama , libXrender , libXt -, libcanberra_gtk2 +, libcanberra-gtk2 , libgnome , libgnomeui , defaultIconTheme -, mesa +, libGLU_combined , nspr , nss , pango @@ -87,12 +87,12 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib - alsaLib.dev + (lib.getDev alsaLib) atk cairo curl cups - dbus_glib + dbus-glib dbus_libs fontconfig freetype @@ -115,16 +115,16 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra_gtk2 + libcanberra-gtk2 libgnome libgnomeui - mesa + libGLU_combined nspr nss pango libheimdal libpulseaudio - libpulseaudio.dev + (lib.getDev libpulseaudio) systemd ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc @@ -174,6 +174,8 @@ stdenv.mkDerivation { passthru.ffmpegSupport = true; passthru.gssSupport = true; + # update with: + # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; baseUrl = diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 2f3e8c40a3e56ca5210d2dd49b9b6676eb309784..bf7e7cfe9d3f8e5d34017dbeccd7c2df46b8bf55 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,985 @@ { - version = "58.0b2"; + version = "60.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ach/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "6ffa1c861a68b6bd7e65b0883c734baa1161c3ff827cff2fabd2e38b5de64bf973034f40958471c12fbaec806978a74b3e2a5a4c2e23caf87dbe747cf75d0a1a"; + sha512 = "3cfc027c422936911f669825d03be090788fb94a33e0e67b2b7d58aed52b719eab4ff1a7e19ac368543a4b662766a41062971b9a5fb5588b76029fd8a78dcb1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/af/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "4bf2e416ff864e6062a76c14d70d60da9c3c3261b2d401e4e0cb1abdec77f0c21878b36b863f3d11316e6114e358af200b762c4f1c7cb7cc84cb12c8c95d240e"; + sha512 = "a8d96e9d9529b4c068371cda82219bb334d54e069b3e63caa6de4054cf917eea2aec9e8767d64999ce72323ced179477e07791ec8bb23d8231fe268f92c72042"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/an/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "d1136b831820dd7f9bcd2d5d20d68ba66bdccc610bc9d26b59937b2ba017fff7fa1be1d616ff5586e136a16d1a2023255eb430d78ab7c97f35bad2b6172056b9"; + sha512 = "18b5d0188d6ddd22c2de16c02a3b3f8eeffc25cee1c1afcb2bc9f80c722bca7c15f9561c9215e65a5390b45989c235f5720cfdf01005d7ef7e1ab1119a7ee294"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ar/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ab9dc901df22fe84d01cfbc7b251ffb50eea784c2cff1a38c404b75ac58349f312ca7b602c107ea8b08bab7dee292b99ca33d3651fe43479357b57ef2d36a07f"; + sha512 = "8f8c83b0f4f0031dad8d3fef2db67ed7ee19e794a7c20525dd91f5024cbc1b7d1b0c9c847173b2aa187050b8bbf68f537b7ef91ad7bdf557759a3ecb4ae7a98f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/as/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "f7af5fc1e80cbca6227266c5f7945c665499f5be36436e7135721d67efcfb3d2b101e1749c03101ef491c231f96cc746a6bbae25fc5818f1790d61f59e4fdf2c"; + sha512 = "866bc322de99f428e09ce5cafa26dadf77117ead452a527fcaa536da749e9eeda0a82f4d1c5e1aceb202fe931a79fc99d2512acc643a88638c5f37c48e19454f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ast/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "ac9fe13f073358dd71f81583e6d831617be46b65781da099fac48db37a942c31bfad3b72422ef8a14e65c5de28939cdfbb1c580f3db5cdd54819a0da0257e151"; + sha512 = "e91d908997d5924be2f5f7e7afd30a1e5d16d2227ea066a3136a12976fca7fcc89989160a3249ba47145518b53c4285cc7a9d39440cf8953c1729179efc1c690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/az/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "05e30463e29723157815f91c02f7d6e323fad0443d59ef9b6abe2110998170894aa95467d5f05f78daa43fdf05f3e72af5c9656134529aadc9cf165b201acbe1"; + sha512 = "2dbb8d8df8177b4f4f7c69d321817b3ffb4f4430fd8e8250c2cc3678d758c01d9568873270b7aef2368145b6f5ffb0e358ed6c74864c9b883b6c04e11709fff5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/be/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "5aeac6d316409651180bb00de74ceb48bf8bffeb027491c1d42830390aa11d64d13e6748a6bd5519c5132d902e0bdb06dab35ae76d6ecf2a8e769503587c7660"; + sha512 = "6728628f6b71a6d495b49dd32472a64ddb3c41e2d9e2923cd033a37f19d1149ba5d3594598209ff5b59f0aaf6b0c2fcfd4313fcf34c9ddf3d5b6bda034dcb6c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bg/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "6cce86d49c53498611c85505b5996c6db92b5a5aca9319b18ea0e5ab19dee2842cc4ca036ccd9b1bb7131aa539e38037c0363281e170182ad81e59141150f20f"; + sha512 = "1b71d585449f3da51da9c9934c9f5bf15b618bfd6a80e5054137c15c16b245eddcd50458cff69fb70ba2ac050b7fb6f316825bbb49e2ed640d63055a4b80f145"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bn-BD/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "b177f5531f887bea5a8b47da45a4ec1477a9adfe48de02ede1aa49761fedaff4ab06603ea004ccfc0991e9598982077dc2f30945e1042ad8098d8cd6eed7fa41"; + sha512 = "a84a384debb371c3cd7b4c4a30cd66f69cccd658c089c10339c0fc7c0b0badbe8600f18451bec4352cde253ba7c4cc9566def047d7df9551214dfe88d0965ef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bn-IN/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "5475cc9261e666aa11915f70599a281dc5bbba7a88527646fc932b6272b70a936186077254d147c68bec28fee4f79859567256c327043ffa5504feedc76e3eb9"; + sha512 = "b2f2c879b067d752c69a841c40b319db0d36a2805d441ee832246da199a0099cd359c0e925996c152d67e7d5f733ddcc776a393d86090c455f4c5cdfe79752da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/br/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ace1027ea7d5115ce7654a8b12609c4c78da5a6dbf8a08544d467d4a8766f39df557659c9c54fd2ee613c403ac523cf4fa8fe241544112e7c7999c572f45d656"; + sha512 = "db7d9c6e991b3be123f80e62f5b1f9107ae537f3a298d65f910c71397183129a4527e324f75273605a5b945516ac5d2bcde05a3fa3de9748fb880bf0582d4e74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bs/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "d8256bcaca634f53c60fa8fc4189c68fc14dc1aa7941beeb28692f76e4ed62465290fb0234236a684ac489634f71577dfd5d5e613d710f1e191cb3021b2971a0"; + sha512 = "df4dbb35c37726af2d5fa1dbcabd8d926f171896b5dda453a07989cede18f58705617e67f9b0702623ee4cbfe570cb81fd5cd9b93a050d2b75e28843fa5a81ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ca/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "0fee3a02c437015679460682325c7fadb211bd5d4a3f5f1ee04c978eefb0694ccae7b840801a9453f8ca0d383079fc0481cc157741281ba09be32a1012ceb2d0"; + sha512 = "2386672d892863c4d1ad4a063270125703aeeb2f2afa8bc09cd6d813088c9c80f5837096207c8a662d28025f9c457903f036f79aca3fc3b7ba97660ae861f1b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cak/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "ece5f44da4de5370701ca57f6d3bfa68df19568ef07ad515a2937a49b77e63ab9752ac9d31b1da837e914ccf9805528e7727e04765cb77909e33c576358c6912"; + sha512 = "6f6d1604cd1060a5efa633cb09ef8525369245ef753fa7894f17299d0df2b3bd62c7d2ac8cacb93cf93961dbbf9b240a43d47a0c73cbcc7ea09a2cea2b86755a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cs/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "48fea82e0062a91b89e868c0f3baef3869987b9465314d40f9df109b573c24d826bd87a474e81d43b5aa9dd02cc1968f438c4c93924c06ddc133dcca592ab095"; + sha512 = "5b8dd67086cfa08fb76b066e2c10be109e0a4eddeb5e4579aa9366dff50642f5e56f6aec37f9aa21299fab0ae7005ae0e6ab4db05e079870e2f4620a4d96c54b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cy/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "15cf8a4ee6016f4dc81cc1a4287ec1b7d26fe8eab613087bb3b95c7feac4adf89fc25777961682e5f85a158a5c1afe3d41d8c5bdc455a0ce0739c59885d0a2ee"; + sha512 = "31347a1cb6fa703ccbf444830fa88f8535a2717da85fee09f6a544ee8aba1aaea093f4ab1368f0dc4fd7b0dcc3570bbd60bf8855de06a8725d2ee1b345242bad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/da/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "7e66d426d4837999faef4f8259c30720a39448b81ccaced2698be4051311cd7b7fec08eb0ebd738af7bef3474ad4059e2e90e9c8d12d829c8cbe7d758296343d"; + sha512 = "20785e095d45c22ebab25f4a2fc224aa6e4a4b7c86db1e94a304c41598cba74ce1d1200effd78bd185e5bc90a11bb66f223e28c0cc65d6663229bb724ad1c791"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/de/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "cda87407ecd86d825dcc15dfea4c1dd2f56d3bcaa6af2cbdbb8b209ea280c60dbb72b68db71f84e94783f7c263ad4dec503603b650411c72b38c1a5a470deefa"; + sha512 = "e070625687172f84d1d5d82ec2ef385291a60c2bf011a4a075892413ded629ac16b7688d2ccc698ace07cde309e782a1b7b16707bc42d2b47ef9394a0deb6872"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/dsb/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "db9da2c7397d64d1d5944f6dab29b29325b6773f85af1a4d5e87d06dcc580cc1157b4f7092e7fd9bde250f332d26983b7ac2c7662b240f4e97f2ee1404ad4b1d"; + sha512 = "38df16c7aa84fe2cfbff1e19e702b2c1ea4e2c5f1523cd3094144685fa1d5d561e00270881d0a113b14e926f540b25ceeb1562ecf4876cc35cd93fb794de448c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/el/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "51c02952a6a1f94f25dae1de9138a9a39203eec9b02c3f90084e319f8e3e17c436937dc5525709229db22a27de5f79abc1cdd8502631b6ba280770d91151d5d5"; + sha512 = "e9846b81293eef5d593eb5175d9d73b7a42de7316c23251d94015da0554ec15981932fcbade6a5fcd726f6a89c6db461564f7ab9351342b9c4d8d915eb768219"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-GB/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "b5925d08497647afb8f6cb6bfe5ea5fd899e55ed77f3709ae007e2359d1b7c38fd5e7cedc56f12d68e660b5d9f10c56bd65cccb92a645d25cc617f188da88a65"; + sha512 = "53cc5276c35d94f263cdb4ee4a92dbbd356eeff382c2a69dba006f6b5a3ce022c528b4e6102374b97c618e70ef7ad692b1799f6ee3987b26378b742c18145cac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-US/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "b40a42713892b760d659c4fe5ca002b8ccb5309319b57d89b5f9af37c84a021ad67601f5c7f5b02a445dec7a00d671a28df6ab701775f59b1a7be7dda93d673e"; + sha512 = "2b0e15a85f5d9a7fe6e8ac198c86d3746d880f96ec13f8e78d69d4618d86e73f76e64bc8dca214a73f2ed95a12ba674f57c697e54f0b869760129176dfae14fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-ZA/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "1765b79663475ff97dacaf441cf127256be5097205f52f3ecd5648b5d15087a9e43fc97e165cec714d452a3c802d798b89650eb3e9b33c00e739a1ca2684dfd2"; + sha512 = "c751b4ec0567c5fdcf3b8660ab7bf100366b9c819f78c957c79f217a0e7658d1a7c4bd141baced6e7ba36596a8c07c89b825ade20becf380249d90e0517e1096"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/eo/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e1d30c41b6ba56604539a5b527effd16c7a40f85691fafc04d8e006f2d09c9531f70f5e3305aea8eff8840487acd87657a0aae66a3275d5b64ce84ee151ba3e8"; + sha512 = "d556386436ad4c226f0986500de244a2efc5cf57ac8d792f328616deabb5884cbd3127d0530add7f7a9dc5c2ac61512456abecd6b1cb8c84c74b2d2bf18d9113"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-AR/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "6830e829c86a4860a3ae461e16d4d63feeb141cdf65fdeb29c4cdd4e4fbd1887a5425b81eae9a34a28d750fbe27e70f065acd70d0cffa6c9d1cfede023e43f07"; + sha512 = "1fdfea27dd45fbec3727804c49c8db28e624e8240a8589d28621b4f03ca12d184395632db2f629032eebbcd6f0d0f514eb3944d60c2b54bef3c187e06b9add92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-CL/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ea55c8fda45368ab7adc12891c3cc19d27124e8740ccbcda6b2b7edecd3310dfe068344f856d97b5c8cff066427dd21baf2d242397ef249a7590d01989be274b"; + sha512 = "fc171dc5fad703344d0ec1a9d1800650d0469b1d4f10533e102031c776aaf14d5df7b9375a73583112b9bbd1d1e7df267873da0cb3e7937f5473b2d4652f19d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-ES/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ba2776ad1a474183d828fc73c4a3e3f8036159c8ba08ea8b6bcfe562aac0808adc015c94f4375dab850fa61df6ce94d6bb684e028db07385486ecc2964f9834e"; + sha512 = "7d8f9c31417bb03d02278c5567eff23d07cc2d9de93a5874938db0108c8c0eca0c0e3f924eb8d9887b14d7c058bf4b4fbe1aee1925f0a150212e76e11a0b587c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-MX/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "14b755e01ce982a3aacab5cc70c086c877f16df8b46e46aca46faf0950eeab61e2cbc90de0f9dc452c6f27f8e4367e4fd70209491721c04a88af9fe8edf92b10"; + sha512 = "95b43192a707943cda58d98fba2bbb96b745d6997932113c1807f12de7fe3fe165c9dff7c000dafdf21192b24eaa42c874f068e3cef6a2e7c6cabb8f0e1fcc32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/et/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d211c2958e9927c2852801331ced3986a5a9f75b9fe3d734a5b380e807a6f91e3c328c48817e21b43ca2b6fc48986f80f5d5f3cf4c0bd03257c046b5a930c985"; + sha512 = "3e379c3389fe3a1a97dd3d6ad39abca49273e6e36bfcc9b5b6b2eda948529bf6e744fb9550b89edce2d9ea9145a2c7a0a5d9466f2975d4c2193696871b32ec58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/eu/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d9f53b988a86a48df41a691742975096343a3b4905e5ae78ec9bfe5580ff71cc56457fbfad2fa8512d3a3124989532f21caddfb920d886c6891b2a1d82e26b6f"; + sha512 = "a1b6197535661193818b0ece5d28112073fa03824aa4bf4de999b554acf751da7117b073c875c7b2265b05af0bbbba7307b59c0f4ea02258e7ed438bc6e0bfaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fa/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "43ad5afa9cca9944203c33ef053bc86cc36e50497992ecbb7959edce25d54d588b736f56684af04fba8f10750b450a613ca4008715ec5edc2cc70d31a5288296"; + sha512 = "28927abe6b2e33868c37473378b5915ca325ab26e87b6c83566cf9a6974eef28a1ff1a800c164d2d79d613ab1482c0e563597aba20de2179b8645e8dfc5b40d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ff/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "64a11c61a3104e5fa06c802e25ebb293e9fbe58b3d4af50a36a9919d213d75ecb1e1aff8d164f111398b0e4efb46a2574d05f23f39ffe845729e0fe18ec27720"; + sha512 = "07e3f102f8324d3b613c972651b80f83575129a3d23fddea3d02d3880bb66d3697c1d7c9cb47fb2b8dfb24acb4bf9029080675a5295d3ea1d2f7b31114ce4d13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fi/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "0c739ae31197dc3c9c10a40ee97eb4bd623ac3551f67bd2dd0527a4e6efabb47bab6c31c15925925d5670611b82de921e0d068491819b9a580c8062cd0a794cb"; + sha512 = "90bfbe9cd103b981413d57f74d416098ee1bb284e871bc40676fd8f8240a7fea891b4d68a079c1d23d2c62e6f84dbeddc884b4ba31e446dc59fcc4d1b3422469"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fr/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7fa98e4e5fd8174043d6d85ee63aa22130a9191dabd40ad8935f233559eeb2dc46bdf27047975251f4d843770f900eb1756161e2d5dfd91e95c4b03b0841af82"; + sha512 = "a71571118b26ffb823da9723a6c84a2f10c04c4f52b0a5aa9dc6832ca008071bca761adc71b67959fad643711f1ff859b7e1093b5df8a6f26fb03b01de8c234c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fy-NL/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "412827dd52dc04d0a342bc0ae0871108264048b13f3476af0295b9304efea3eb24719b5ed034407dd25f7d7faef635ed08056b12de78d6fb1ec0a30acc1a1392"; + sha512 = "371d1292c4b9fb561bddfbda150eafe227f9c0c6525f5b9bc4ecb178c2768c2e837ae6f213cbf0dd4f64e16d51e56fbb0775d4df1b019587d5bb51428f21fe22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ga-IE/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "02272dfcf04b9ee4bf6ea5f1b03f59892526e0df14cab0dfa1b090678e9ea45a76962bbbb35ab5ee13a6bc919bb5849d5e401f8157f0e5119c265a53759177d4"; + sha512 = "2477da8f55c599acfd8091a420885f795841f55bb7a0b399c2dfa51db860d9ef03626cf62c6ed99c7c89d7549d1d0b5053c44580894d0c896169fc23dd2568e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gd/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "64a89548064d36cbca0a0572319e979a565470b4cc63aef5005f520e58f37e7a54e7ab5380ee5e0947d1a1b051825a5fe223a8ad5cfc833636ae9f9653b33779"; + sha512 = "b9849c5d545c40bdcb7bae8d5e3447894a7637d59b1b413f7a42f9fbfe3509a45afb03b20bbee3ce1a625a08404f903a1b79bde183f51b043326d560794e501b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gl/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "b69ab34709258444c957dc55f55bfcfe5965b31e984fb911d2fb8b8499a62044c5d24e68e93880454b09888f68e3e80c68c0e37a424de53786fcbe1ea8142ab0"; + sha512 = "f5c014f18422c09f96d63efbd1dd3cd5e880ee5f4c1cb6a2a0eaf939a755a952ace065237b74ed8c4e70508062f69ec545d24aa55b21416cbdc449e840e8bdb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gn/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "25f3c7753bfe47a5198e770def91596f904f5b4de0658ee49c2209afbcf53fda35c8058465ae21876aa733daf35bf58c14f464f2e125996e27952759671cf351"; + sha512 = "e35e1d007c0f1371fa4e95ea6498a87949f9f0fde93dbc960f44ad14fb8f2d4587a08fd456bd6898ba864153344a2ac8093f45264d7305a5db88fc920a8e79db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gu-IN/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "f20a7cf31dca9f635b96b5a95b24fef039f3a856e64a34b681d75e19e1f997bf41f7a8a49163ec1a63ea2d2a500eba174a3e8f5c931e4b7b9ec0857c908c5aca"; + sha512 = "cc8740fd82ca6cb4aff2a5bb2bcc02d6d3457cf7f10c619b087c94d278f79a80da26a7f5f5a995fd77915c95789e1d263feec9bf1b52a9e511835565861e0bdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/he/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c2de1b8b8cd2af04efb78b432b865df564fdb70e41b3ae7ee17bd66f438bd8ae60b49774265ae9efc3e5e17d8ff947f50de4872e6004e497b3ad073c096d5110"; + sha512 = "7547c1099276b4683012cf286482f37af3d8e3c0afa6f95aff2e2030b7ef81c5accb4116ea178134c916f9ff09cf9aebee30c0a698c8f88cdac6f91af64ee66c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hi-IN/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "9f513d17bc01dd34b1a07939d8d4858b5c525d99a0bab1eb7ed5f205de3442e3f9dea90e5bf2a7743f6b624757dd3b182ad976d5b32771e99b8c62b016aab594"; + sha512 = "ff3db0fa7c76764d836b94b7a8e7028a2c3f39c6a3340e90cd1396564bcbf9540b9adb9b235206146c3fde2b8845968817e5eb34095aa5d27cf5ce7cff885504"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hr/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0f43806af6aca2980e358fb7bb39b2970d9d7c32175ff9dd4a3af5765866fb68a1e4a5ea7071aaaeef4a70b502c5df86dd88e9a4fb5e6db00f5e11f9d99b324e"; + sha512 = "c13fde2cc3d39d87203239e442feeeb9caa7a0fa03fa1b98f7c49eddf79ed60b88fcd4ceaf5a3d70fd48b64270ee770bc03bf0bc4fbda15fa72090d0e0b3ce03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hsb/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "4397b1ff3a113f7591ea8c2211fb7b15edc3af9d2d8883a720eb68d5f19024488262818795d9f14b67c91649337e8884ea12d6dff6fcd0650c31d2f917cef493"; + sha512 = "e688ecdbcbdab4a821ca17aaae031874c454b8e78cda40ab8d2ac8258a71730c656c6ea5e8542fe3bba975f8203c63bbc82a45f47a4af4da606a446a5a9c0d75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hu/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d7dd0be61fe7ac795817b7e2eca9f9ce1c312e49e851e068b410fb9076fb83bfb82928eaf7e1bb11f7647890a0b74dd16b93ede8e8672f7a70e9d0482a859646"; + sha512 = "72d6977d4709f04b282301b6f1b803e924f1b1f1b6488b871206cb323457c9cfc01d0a683dc24b3cb16b26d160271d4f234e5f8308f01cb7c8183059e3036415"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hy-AM/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "a924053e4df4b5e036dd25e3f663239bce6e6879e0cd0060fe62a5f06c573bfbd25ded2be37940c14a13c493ff421127245dea88ef183ca9f496bc8a89d1eeb9"; + sha512 = "380bb6c5e7dba01547fc64e10e20234e571ea1aab0dff8ef8fba971a25038ea99694e235269321b38b346872314d64bc31529aae8623cd21c934dfdf82f2f87f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/id/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2"; + locale = "ia"; + arch = "linux-x86_64"; + sha512 = "12cbea767896b7e20b0c717666b87d7de9f6f818c4f35920d5a0eaf847fc6fd29911d1e8f3cd8bced453e38493359f4e3e644d9c1d92e91285caf9e9b8e75cdd"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "cd83da2536a067120783df1a5a04ef3e16aa87a47fbfc4c50d0009983652506e10688f05e2da66034051fbe8518754e025489b29e013cb07b9829dfb2c70cff6"; + sha512 = "3be7d341d036d4899dccaa6a92fdf117a46a441b4eb481b65f8a94e32b15f5d98662a4bd5ac0c45985142027af811cfa0bed9ea1d7d1ec45439df5b9b6210be2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/is/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "87e6c6111b9a30de82235201e9d341cf2ceed3d4599d94815d807edb252dea937d7870cfd229d7fb47af8c822201567f3ab990b15731f9fef243edbbb5ff918c"; + sha512 = "67f9ae05aef3eb743559401bfe1abe662f748ac11f788fe1407b9d77f6fc2974e8e4ca9e107d2b9500e01283f07a06d35dcd7a1a7223c92e09aa38022e077b88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/it/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "bfded5c6a7aabd2120cc56c756d900b2b71766d4ea6cc6c5cc9905ec14068cc98f10a8ee54862f8223b6d7ae43b09346dae87e5b146df8bae1a63dc84686ec69"; + sha512 = "e529d48adce27340bafa07dfd7da2b6eef3559ba2caf2be59fc953028b48c3ead9974632ceaa1ae1a3c6983d2bd7a0b3beb094e8aa0cb5bb28a9e4166a8c50b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ja/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "e74df1de9adccd46ac36675084a16c7d07bfa48025802ef3c932b291bba76955de14f52282bf2cce2d69a355393e97aea946cbd3314c5cc97e699afa610c2afe"; + sha512 = "35fbee4fe54f18627a647a610b178a5387428375ce743c8c91caf24ebcd37062183dd8d64b090925343e77530a0dd3a384ed5e4b2f8bccf9eba2815213721a46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ka/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "fd729433c08e2c569e0c72859d38f70fd62293b5f1a97bb41ee01950845c4480c6f48e80cec6ffd9fd81d34e357d2fbfd67515a44c9db02acd5f79acb55886f7"; + sha512 = "5298adaa040804ae5311da123475f746beb2890406c47d0a15d530ad1754f78fd695c0355b3709e7416537dc1965ea8d714feb12865d183788f0962104a169e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kab/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "edb999b2b27885422defea989e41c845b0f7a50d47e4f6e7ff2690fae9b911b9c0dd93e40a7420b1920790b5443800990836999e3044457acddb55781fb8a7a7"; + sha512 = "0729b8a96b8cb56b2e57fe29355792b70ba253aa1bcc34e13aa6f8c1e63358c9b315c2193c3f72ed40f47544c14f2f05768a293270bd07a2b735af9bb000ab5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kk/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "21eba1ee7a9fa51cb9967ecb4250fa305e3e516d0d69285a90b1ccecda6add2793fa035ef434626f4d9620374e91f1db4d8489a1454e4d611a529e693e46d09b"; + sha512 = "4df76c0efd75cb75da4756add7a95dfba2a8a2834c90639687e4a963072e30d22dfeb4e9f5cfd4ea471bf97926844e561a2043423957baa1d60a64b9f1d152ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/km/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "565028e6aa408c734684518d7f3d033639ebf6ab3dbc74b682f291933f1141fbb7b758b0c1e8fed555067db0981e8a4f5d5c4e2e9c53d2ad066b8df269ff489f"; + sha512 = "7d44c52fd2b384a6212e3a5ad11ab1523d0689a61562b05fcbfd7578e47fa39368bc1fd605bc6f4a27a382f4a62bb5301a103a5cdee7e5f8353596e80edf3723"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kn/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "1f6dd3187c140ece200c16a4e80ff848131165603fcb38385842e8feeec5fd13db3d1ae415a8f428f2d22f20289a856bb3afc96d853cb9e31c5d1445a1a63dda"; + sha512 = "953f22af390aeb1f13a10a47003f0f97051e83d3cd0a8f30fc9e3f7e99b82519da6ce0afdfae5f89e88b6bd017af858010aab624e1de8ab39ff9787b9d804dc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ko/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "103a51778565afbd6423a043340e9bad47156fad51776106aa0342fca022ca6481f7b13b8f2a51d2e9e8b1982f50f377ade1d73bf6b152dd61c329fd3456a1ba"; + sha512 = "4cde6ff0a032c6c222e2f36e33398d6acf72b0e944d9d9b6c75c34893082fe3847ac87e837848b3866e55819fed1f41c0a1807ea2c2dcd264f793df9548a5ec0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lij/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "4c92f4803f094bb5d64c58c6d8315e51e764fc80c1886e9c18a58f93a93f8794a00a4319ed90ba60ecc9ec4dbcc37f3e8960a8b67261673806a19c8bfac8d989"; + sha512 = "d6ffcad6fdfdaadef0b8225f30d9d0a80e7f918d6b2ff6468f4e460643034286cd561dd63391f79c3b32222d783c09842fe4979c6d94dfce4ebab41fcc6580be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lt/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "83dcc50c0f7eb41ca6fb41a1b036b80a8ab4993334a632e60b9523eb8a4306db427beaf2527bc4bdd1143ebe6c0f4b406b1b9768ef8f3c03ce375e33cae6cc11"; + sha512 = "8814f08d6d26a05e7f003280a0272886a44fcf3b88da93d0088f0d2a9e517c34c264229ad8ccea8efdf15247631e3cd28f82b589afc4d2d3973127e1227c6c67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lv/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "27daf42869ae64f31d8d83f52e9d3f951e1277352276eb8436c2885e1a1de023b3985a0057687dca48ba69aed0ef03cf27770099e45a0fed5461de8cbaa0205c"; + sha512 = "b80fdf0b0ac0f8decc7e4329a23f8ee1005aecc70f7d0d8a000eade3d406221ffff8015beb99c77403f903487ec71870dafa92003aca86f5b0cfdd8ee1f297eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mai/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "9b7c38d7d23f6604963f280132b16c0a949530d7df88f47a5328d1ced1bfe4cf8f12fd6540b54a4608aa0efe09f35f870f18c49d4a8cf1a95e800b541f534b79"; + sha512 = "63b69aae0a219ad993e557d7125cf91ccbe8a19310a17a09536d5c2a80e7f3292e3aace28342a4b8eb73042ac2ce5d728af5a745416b4b6401d29fae95c7f9ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mk/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "1cb4b8304888fb9a4adadcf23b0c624c1ece8fb96a972f6d788f1b8936f05f8ab331df7bb949a4883673d193238a80919f728b985e0a9601f7c59c519fcf9501"; + sha512 = "18ddb3ff53baf7efd11ccb432d87dcb7a89260c080f29691785bd44999a43e8f9fed99b636b26bd21e557921b82ad9e69d729c498bfcb45077adcfedcc3208fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ml/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "e801dbb5f71922d09563149bb12461d4661eb877bb862f04fea418b9fd488dfb871deb97c131aa680d551de5d46e2801545d01f17fde06179290e12288e5f74f"; + sha512 = "2164dc4beed74c24bd3015d9d294ff0361bd5912728fb64854ce5146188414d4e8402d4ba88ac20944e499e24be103853b4820433a99d6aa8e4e48bed5b3abcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mr/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "41eff5af28b452069fed8c8408dfe47b46ce192b6d0a996c6c5b0600e862424580c50251fbfbaaeed64d387367413f69ee2ed9819bebebf9fa67b2ff50e4417d"; + sha512 = "476e3031b7a850cd52f2f20ec712b1fd0f4f55dc74ac10985c5957ab74b303b1eb4cb00ed1303a820ad4a6cea1729d282794e9b8f6b425280a05b413d86f8975"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ms/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "544e03a7a03b26a5b2f9da0284325234149faa5bafda74895f6ea29743471e302cc33b5398bb5d3e0f2d14dc82b6e8a8d02927e2a2e2c2364b3e2d1f20bc3354"; + sha512 = "25d07f7f5013a1bd7de9bf977a1b16d193446e0003000362073d26f982139ff8bf0d17990173e77b40a808f845fd590543b7ef1de5a41d3bacc9491438d4aa36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/my/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "28dc75be5d3eccdff87eb738a909195b5832cd4deeab9f4f29915e372462e24c9160e0dad4ec9fc80cd14179bd1eb08e79ed96afed74ce053a43731b0a95ffbf"; + sha512 = "131dc61a6c8a07c593e304cb5c1c887794a597a3ed98ccee1188081da0002bb2ea29a946b12fce1ac7287c5df74864bd881e9f99c2c485b2fbf7684196489248"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nb-NO/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "6c9dbe11b53af3ef09b9520df28c2ae606fc8ef552518b8bbe3816a871333a061f504b113e05086ecf590041182e3baa134bf6d84a45b6a5eb3c2fa43cbeaf8f"; + sha512 = "115698e54318f4107c565337c266109925310d79cfd2f1908fd5a6114128ffe827e8e81db630665907a942300664af2ece8cb6888be80f009d6fc2d8d065cdd3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ne-NP/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "80b819ade71f4ba3034d04d3f5178b1f4221ef5930d5f5429c5cf255ade70ccfeda42d87da3f4e227446576405362dcade34db285addf1bc2474404d98f96a94"; + sha512 = "b89572ed1e0620ec29a762e49394ebaebc98ec964a9d98e8896927eda35155403883e734880ffed51d13405641c569085824ec36356cb2c3e8d57090b5f0301a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nl/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a617fcf15d972552b2cb659fadf695ab5ef6953c7c81273ca7cfb5ef02d681c80d245ffa62c25a0ef6a894c9f1413245c50bff375c97e34b8a16ae30fcdf217d"; + sha512 = "4a62b79d27361b324269488d1dceb4405f469d8e9a5f4764cf46a2ca31561d759e3f63ba5c23b21b45a43e07181aabd06f01aa699b04b9d1b75f0ca338e161c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nn-NO/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e124e1b983dae9ce9b595423949767980289169b9b3609033c34176bd8d6fec9e7cb13504a8d03c0d42359aaf045fbe0ba66aadf0566acbc80840861676ae9ec"; + sha512 = "d8407d6930a11e73e1338e13f980f7575df5233dccd633625175c21387c5c697c5ad3fca95db99d52b50248b257586145fac8d57ddcab8d4bb7dc97dd7dc6dbb"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2"; + locale = "oc"; + arch = "linux-x86_64"; + sha512 = "1e963bf3f340dba469ae928d87fae73c112be3d8df0bd5b0667c5d7ba3a140d919b96bee2cb1a40a235bc1b80a174ba8a8615dc4ffcfad156fe87e1da2ab0fed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/or/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f7b8643f83ef6ccc0d6d3de8629808372625d7cd75d0bed8d8993d4fcfbf37764bb29ab1b2a2d3519cb6e5fe2d43af33e407a6295b1f770cef4672f20f1aa9ec"; + sha512 = "60c29bd2eb3a4abb984d495ac7e1679a66e951022b975b57ce1f5c23db3f2c43363f22626842d0a2750b7275ddb711f7ff868ddb209d37f3d790460169c5ac29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pa-IN/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f3cfeb091d875fa35f2b76d5fd33c4766fc3d37dd4041b23e400e223d6be4e791a797cf95f534b935e6f40c28ba58b4394fed28c3beca7a097eb5616feb02924"; + sha512 = "de2c7b09e0973a6b2c86bda0f5fe2a5e29b4a18fdb53cd73301a135fef2212c0fc792c532dda5131cc9a1ee2b097e9a40d5ff4fa4e07f8b640422f9bd2e14490"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pl/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "a0f5e040ce4614d82f5ff7fb5b6e16920299290840a961b8e71c5fcf9c9aad88092d519739b21bbd330d03aefeb25cb0c8ddb9d75792297b970ec741043c6ff5"; + sha512 = "2a999ee49e7152227bcc18fcb0c17047df73b27c6330eba701ce12c4283dcd7643d824310cde1bf7571da403e3d3e9db8c34ec04ece7a3e72aa55a8e21da483a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pt-BR/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d9de5bd80a4658a4b7fbda8b22dcea6104a77034e62ac66ee4906c2f71f9048c9f8f3b85bce38a0a4c6f9d0243e23ad4ccd6db8ccadcd3a1d79a034554b5035c"; + sha512 = "c62b8aefcd8b5fe59d0e2e643a73b0f6e4c8e6334ba5c223d44e14bead88e81f3622b717afb5af24b7f3d668852572942d555e5a38a577c242534d4328269b68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pt-PT/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ee24357ea59c9936f8bd4f2ccab32d73012b9bdc0f6416350a30a0c3a726a817eff5a275f689dce78c0256816f644b56e68ce8642632ff2394bb89719873962d"; + sha512 = "c0738d209d9686dbd28e8219fbb40d497ee418450210613749355c57a64578b5591a78f38b78bd3dc2d838e65738ae91d6c69a13d9eeff5e2721be46e7ebd66f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/rm/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "3fc05929e41b1da505831fd29ddc590b11c8cc68d656e6a29ceb36a8d4f1718d3e2c651bbe57dc6587d6cce08a71b2131e6310e3ea688f2950a5edf4dda5f14f"; + sha512 = "925db7b71d25a8e1c5485c92a4c0ba420d541a5c8c919bfd55a7a40357e83ee9728488bfc38eab789ff205513110f6c8f5894ec02d9fc5f47f9ae829a34a71d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ro/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "8d204165cb4a8b4861f2bdfdee197a621db698c767443ecfe25751345fb651be01d3d2d18de8cba10e684f203a6276ee71ed5b1b99a43d1df943a9b5147e2fd6"; + sha512 = "c718cee842c5bd456282b1daa7b697a7a1bd5eb63108a5ff63dc4dc8f4ce67fcf0b433e65b6128877636f8a2bcfb469d7340052a9347d3b43ab5d87c03b82b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ru/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "7b12852be30cba66d33b345fb8976d1edca871eac490d3c49f0ed89c48a772d48a4094dc1e52a32e103a3196f6bb12264b3fe46bf53a14ca0e5ed3eb49164d0c"; + sha512 = "fb650b4ad152cf230c23a4c849671e2fc96982d01785261ac643375e51eda259a9ac725d668b6d7fb50d3db14e7a2dc26babe208774a37444ee25eedaeb8b414"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/si/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7079174fdf891f983d0415cb802470899af11e792e3abdc00f8503116a007cec1177fc71f96f8b0b8d15576d2046690824d152cf7b5577f5cfbe0aece16c36d3"; + sha512 = "f2fb270f51fe996b829e1d49bfed793ab6ef61bccedcc6f3cedf02b2a50aa214e2942c9f90676f3339de8aac977b561879376513c0815e1157c510ecad29f2d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sk/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "820e8465d6b9bae28a572cf7ee3d2b8594fdb6fe54879151ab327f93a1313cb2019687ac335ecdb64c5047421832db50c05b01b0b52303a0cf71d4a320900557"; + sha512 = "533bcb8ce4d54fec85f0c74e04c6ab6635ccdc462bbd80771919700220e2fa48a12e1d5afa684a2cf4d00bd892fb3ccf219dd288926a16c13eb79dd64b9c7bcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sl/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d1e55e5cb55c1894a39ec3eb11657c1ffb491f165af8e645f28d2af6e3ae481a04177345a76e91b769a68fcb2a84dc425363c153820be564ad015eaf27ba77d8"; + sha512 = "d0e3d28147a6ef4e33b25790c9c205016d7495c0342221dbe3e3c56cc7de34c8fb4f319fcc8ca39fe14365c2ebc44bef4571e42b9254b6f093ec3eaf4e28b3aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/son/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "1b46e24fab45edf3aa81535f282b73c8b7e5975b6f329f751a3f3300c7bb01fc77e08660eb01158473bc1c8ce2c1cb831da316d39ef4e89370b26d6fddd68fd3"; + sha512 = "a883303cf4805a251344be37563ceb16197fe41c5120f549449e507383b0737bf8a7ffab58cce6c13e57432e4c452a8cea8abfe4e776cf962436621f16ab1692"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sq/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3e6ac70fb3f1c7dd7617caf254abd3f4c725019d56d6ccb15a8dffb6d5e5046ade6e6b50be8cf8239208a4c4458063c435de63ba7e9c6de4b93ebf3d3b7a8ca5"; + sha512 = "9b2cefd313e9bed5d21dd937c6427313cb186f268449521af18bb48077f241f2c7fcc2a62145287dbcc9ad3e6532beb46a58fe3a05c195ece2eb5c2b9be9a76c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sr/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "fe2164cd54ec4ae280432e26310be2ff167a990a578ec1b6ddbdbdc14563c0e49f87dcd6358b745aaf6acb258b385dae97afb2a1fd6106e5dc269a0845740114"; + sha512 = "6da0c24c43ae42e1ee778ce6f190b3159824d16b9072f72af13b9a33e43bc08551b66e7f0f6f101c2845bbd8bc0b88603390205888b640a01c36a61925eddf35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sv-SE/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c79e3ff3c3a2cecde79e2e5b24bb9806df816a4a1fc3d0f0aae67471e4b107bbdcf6686414fad8e3626799f12f8d818023f0b71bb393b1770eff38d6169d70c9"; + sha512 = "17ec7de363cd11814d4de5df4c88350bca1a30033f98fdcd415c408f40b34aed5c0c10cfea0d94e1a31f0325878319b7b8cfdeb787bde0e65320f4d914c7a3dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ta/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8266408b1f4e0fc2b96c0cde463619675f7038824c3ebb2c97186e79736431b77b35e0ae62fe09064fe631f07b77eb19becf6e435d4fbc096f41020bec291384"; + sha512 = "821564902471cc3b36bc14a9f168262dee1b4e527445f93f8f8c39b7db2af71c80eb4637da2471247983c600c50ba44f6581d6fdf792ef5774fdb08bbe357aa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/te/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "110dcbd4c13f9d917f78094914a25c8f7d80d44aee9553421130dc526c0d6c29bbead1e5fb2f778d955bf65436d983fea429de6f73b9328066541841f7475e02"; + sha512 = "0757f19aab0c1b9fdc9d80e82fa5eedeb43e7302903add9b4c7f68e030de42527237d2f5d1b1b0fc7d88c3de670aef25c3014546e01783b65cc6b25fa8a75217"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/th/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "1533d96c6f0e23f38c113515e7fff3caf99915035050cddab0ca021b176d7184b80e9bd5ac79d809a0d31b3be987f9e31367874b4c35adbcf62a2ce685d41338"; + sha512 = "811815fc732896e6e90a860647152c1c9196ad7280cf7274b8d224aa5ffff6ccee1c10c127d6750c4bf5b8ccef5659eebf43241db32b516ed1f95e3d2af99a52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/tr/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "da6ce35769007f140b9732d7d429def5267f733d8674a7a80b11aa89aaa7514743a61d1f22210bb7368416f570d7f0748609b31ac72ab80ffe0ef7fea3397bb3"; + sha512 = "bc07e863014d7be3a783a90b4373794ce491b57fc47ceb55382c816cd47c8b19e9b71d209217ff4af79e0b333953c4b791025e3760c7a04d7f8d2c672d9e36f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/uk/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "df03b9d2bc39c4d620d1886dc1d22eb70289fe8d6fd7ef429beb8170a95b5fb1fa15526b9b68bf774a3f09170d0573f642173a6302f8dc9acc41bd9f2604773b"; + sha512 = "1d48c99480c0db287b4ac3b7f183a6b708b61b1ebeb542aac37133bcb3dce61aaa2ab38b4fcf08130ca068c79494f6e1896ed3f0d26d88ee364f5c48842d8ddd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ur/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "a0914042713f9fb91e52e35eafe4b6a666b670e951b4e6c3ed3945804a5640d06c5634eda943927a84ba274871242a4495b754280e4c601fd69c9e054f1b8175"; + sha512 = "ae2c95bcd342bf2362266e460cc6303653771926789cf3ae689bbef6bb4d59c24baa3537329315ecf91d7a483f1f97a961049c2e866112978602096470cd28d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/uz/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "22eb91f33b22b43a81cb0039aa2f11bccf6d83433897d0607d5a52c127366a3b75c18d1df2ab985090a724b278bc703e80370b8ac765bd891981620b0ae36a4c"; + sha512 = "6c349ead6a53f417bb693dce2fc06664796a1781ec78a38e4b2df72505808cc63fdb5629a9264c9bc93c3a8f61be6a832b42a0a1ae56c38e064c61d105ecc09e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/vi/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e6801f622d134be7811212ee8ed47bec259eea1463baeac098ec59e5687cd2ebe42d77d42fa0b18f4a054c7a392efcb6121ddba000323998901f46ace3a7fe4a"; + sha512 = "df4a98d33d15d1e4cd8fef2f5ef80c8db43a47c7715c4f5ef8c3a8e3afa7515193557c5a779dbd93b905ede42563d6c266506dc881bae5b534dd2f5d091f593f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/xh/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "0c0ec3f3112ba5cb7a8df9c9c69714dfc585539b4a13632bba94c8e58b7e5a44a25ec4206c7d656fb31c883454a337e5c3cf24ba67d758fbe9841207c4b84249"; + sha512 = "853dd4a017b7f53b32c08a3984ab3e0584ea461e3fccf18fafaa461ca07fa40450d248c9b5df38800c8978d2d74b024861ab11e385b6edd99fe6637c2af6fe1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/zh-CN/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "789602749a56379b7edba5bf5ea9acd1d950782408f07f0ecf505575ef5cc94f580a601d26c4225c40d49eced4d844fe4213be2df52c83db7788b4a42fc10952"; + sha512 = "76f72bb1563001978c39de8b44a01167d1c8a4bbef7d6fa34f2f904ca039ccb00534e4856413fceb0e49d2afaba06d40ba7b92c8c2cf9cdf55412755dfd8382a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/zh-TW/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "44b7d87e066ffd2cb83c33dda0ea3edb18cb0439c3ffb45d78fc07109e370b6b8cb7e95379423162928e9f81d5be773377716af774f8b3378d9214049bc73917"; + sha512 = "df08afbc8bfa7d82d9ea2e5e212494198270cf9f401aeab34d31cd36df8311f92d8cba0cdf46d6f82afec42897a3ddbee0d949d73a17ae962efcee72be728d3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ach/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "586c8cb8baaea42e694dd5f9886df52c4a34ec8224863127bd3b87bbe2594420b90a644c7b414b85db98714eaaecae88d8b91fe78351cf0e113dcef89d3e0087"; + sha512 = "9dcefe6cd21b403bf51a54addcbc4776db92aa1e722f592ed5bc2cb39a52a1255c88134500ae0905193dadec89147ff7bf95499180678177e29fc872bb71e5cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/af/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "5d66112bd0b361b7a064efc184bf51d498a61a58ac97ff4a6d542b7c6be6f1802ec7da9cf89fc554f8d3e8ecea28d3d1c694cf47b628a15ddce6bb24589be525"; + sha512 = "ec5a3058b71d81c2e30804942d8d39ecb2ed4f8cf801c0464993b4521ad5992dc9c6bc2aaa63b646f7202a19a4243e37f32e1af095827a63d7ec044e9c47754d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/an/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "3726fa3ebc4d21b02a7165d12b0ef8fe2c3ab5b204fdcf6e8b71994ff48897631dfd220708da0365cb875de8b6e20ea0db416654d0de471989f8cc57f427e64a"; + sha512 = "814de6c9e194b42d2d4b6f5f1c0b88d5bba4f64f92a4819f8fead0c3806c52a3b9d8bcafb11c02abaab6a37253fa27efefba5133587e60ec25b76c94a004fa35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ar/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "ba99e30e7cd10dad54df7331087a2667d8ee1397c1b184f7deee3ed15f7c6d6b111592e74be320808bf67846d1cb7278270a47cdaf9db1d0fd671387371a203c"; + sha512 = "ba5afe64785c45fcbc7577e519bd996dbc324cf1da87f0e3044db968f9e67d16cf2958346ece84b57bf34775b05f27cecdb6043bd09bbd594dbbc277624787ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/as/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "db6035cc1b2a6c04ae79e4179dc5f1a64a910a0c8646e8cb93af63460b5d8bb5a07369b93dd4c703d09a39693a07c3bfb913e4ba6d45aaf3e125c407b38f6d6b"; + sha512 = "fdf9cefa473363a7bd7027b05f412a260aa69742743cd121900f1bc5f2ca45c45011d068a6db01b6c5849d53719beefa4da659aadf7116e9c2b17ea251188586"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ast/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "42496b6755ef735527419453fab12497a8d6762d176faa8b0af7338c2e62cba2f2560ba0f7a22d6eaf10badeb2caeb6367773b19d2717c1bdad64149d74d0f98"; + sha512 = "f6236d368e813b3aa88847cea48510be3c2be2fb7ff054eff0c1458205db70f645d83f6ef20285f774686ade01f58751cb082fdb2dd632511089ef2c63209253"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/az/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "c16fe3c909a0793cd91f320f94fe309e1f0b559cc84fb01ece5bfe455a1854701b259821f79fa6db8cdb6dd630a477e55e51793947661e0b3fb8aa26f3c4e22b"; + sha512 = "74658505a2462cfd26032a837db50bcdd092a927f8f8427bfa3182301f25a15da346091d73689ffcb0c0e7c59b154da343b7be917e1ef4e1761948bbfe1bcc7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/be/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "5bc3b984ad38f105a922d1c614e1783d32a84956848f51797d4f1b3b5b9daafeff0730d103bb27313840b07ee97be73c30d6674a527f57ea7d95542742a06a00"; + sha512 = "c168ac1509e7fcd3715b8f1eea47c64999028256b442f11ebfacb7809d61553f251fb1e3fb80bbe4050c7fd0371e6f1a417b7fcb3eeefdd0b2e30e547da3b8a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bg/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "50f64269f264fe1c31970b43d6a0a8860a563154b8913b9a6d186398a6e6d80baf37bc0f091a6ff49115d44d01fca550cf1d65c16dc77d6498a236595be2779e"; + sha512 = "a2440702f8382ff965b17641e9d9dbc6cfb4d536427f92f51a3b8df63ae61ec869760d6eaa38202a7f19acc0ebd6895f1c57a27a5ece8bd1f6a29781d5a298da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bn-BD/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "be9cf4bfba0a65d491a586a1ea2ed6a2dd1946bfa715401763b3067c3388b02a86a1d53a7295ea6ed6b47cabdfa342d0f0ac6598e62f396baff74db5858f0c8f"; + sha512 = "c1aa573de2ed71b85392bff6b8c9279633a142ce51bc26e690c02ed059f6f7db47cdde3fecff902617d27fecca1824b8ebad1b10a7889b918de2056991921c76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bn-IN/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "f448f52a639102c82396633f62741861cb2a3a0434a0e7185c8ed6e70b24153e606a5ed22ff003ea7ac2aaf6996135e7094e5d0226bbb8f143f0f3871daf5ad1"; + sha512 = "a728779adf7644f3fe8363080d93a8180ef2ba09fb78f0d05989fa57585f77897757c5b587a318886eb54d805ee8de625c7cbee44908badc14b47dfbe2dd2885"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/br/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "f52471ee4b82c820813accebfd6563494d41ce7949449ecfbb86da45c0a4f36c0894b830ac33f96894b02e6785cb8389a965d638f75cdd04018730cbae41c7d2"; + sha512 = "5bf79cb726263b8aab120c6b826a09524594bfd8ab7c6464937d23f02e866e353cf8ce71adc8dcb621d6df71e4e7d9dc8d60eeba4023cc3d7c8358eae2058d40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bs/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "9df7d37a1cd531c43cdba491ac5fb844c20f335058858cda88bd9934bea097d9d170e18b3b29ef0fbe5ca2808469b75a4eab767b37ed2e29ac7cf2141ade8f38"; + sha512 = "84f717ea9067ea2ae636aa15fae1821e2660c84db5c6d3f1f656d9170312b31e44abcdaa1298a29adfed9b221e72301faf2fb1253672729c7fe7ce275cf37b45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ca/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "43fb2e6b9945a4586070d433fe080cd2b9b8c0923c12ca084d6d21dc3e22164f470a3c791b5af181aedbe1d76e78cee3981c7fd1872f45815a8db267a9ccd74c"; + sha512 = "66a6ca250c2d916503b825c05dc108e865ef63aaa851a658198869a0fecbad3e31b7572873b2b39f53220c0c1472e30d5822700512675cc9b1df9cda782185de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cak/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "7a76be4291a5d3f6bf150f09701df4390d7f74c0046694a220f4511468a815404713062ad560f75d35643548065a2340bc70c439e23ae14272fbc20375f5901d"; + sha512 = "c953bde75215054be5be2364394aa89bebc4489dfd930ce1088ea770fe5b94ef9682f8a17065674dc674303a558dfbc77973c751b7e52d975b2138ba5be823cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cs/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d0a8c61960d2289b5402f718db28a6ff355fcdbcda77124949c420c3023b57595559305dc763165550f0453ae0e4a01cbbd3fc37e6af9540c80f857c8b4da00a"; + sha512 = "d2ef4e665ce29f2df4ea9a9322962bf934b4e8eb8f2396fe532e2873a68a3d7124c53f3afafc541ac67799f01b8e75595de849a2a7d5bb7f552e0893add7ffab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cy/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "85d9dd9fbaa72ff350d464015f2ca2e810a66d2917f19a7830ef50548ea3b5de1a4e818fcdacaaf9e5c7009cef391bfd3818e196d89483abc43a1badadcfd41b"; + sha512 = "e5f8b77ca5fa59d5236984e6141b909e2d232a5d279a295eee7fb83eeadf17d0078c936d2c560bdd9ce9df5809b0138547946d9052842d93e699fb7ad7161062"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/da/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f7a87024c27c0b7fcdaf5cee4c31235043c1c506003e04c71e60792dbc9a4cb3fdb972b335c3b6eb10fc9774b36dbb2f6b415ca90f4547c6979bf4568876075b"; + sha512 = "f241d4d26266231e063bd556d07b34477eb5d93452ce29a1c0518a5414eeba3398bfba5b6113a9c7cbc7ff3dc5371cd2eb470de4a00891a97a9e8f5a6ffb6d3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/de/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "b4f1fabe3de50583afcdc27a3599dfe9d2a08f2e8b1942aa0045df6059e9686d2f2f1fb3462c2e21d9e6fa1ef5a7849bffe2cbfe1d18bc70879a98ce8fad8718"; + sha512 = "2e72ba457794ae8c40f0cc84a7f8f4ec66a2157a61853fa9ac7fb088e9320b85ca6d2b32653266dd4042b786596b9e03abdaa8f3f26157d354c070e3bd3cce52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/dsb/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0d85cd11ad6c28c87d6df4dd9f5f16dfc37f885b1686ff85ea051bddd6f5b2db43db0a6b2f71998eed707533416b6af5e4dba209b43586a76e74c03ba26cecdf"; + sha512 = "b3bfa0ebfe62ddaebaaa35a90e220e6092b269ade846a07f45f12ba78050ff1d9c430ae98c84467dcb4449eec93c8216aaf9046a40a74b23d289beef89c347af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/el/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "014ff2a89bd240bd32399732647b4c0cbb47ddb9e5a7705be56eee3df8c8b2c95339be61ed35893c4a4fe03afbff3e48c9e03d44f0cedd5c3694ead76d4ddd19"; + sha512 = "d85b8c718e82115f1d653e4cbaa87e5713dbf4046e7c81701b6d9f7d7d3020142de5ff181bb3a46916a65954a743716f0b2898d098b8b582a14703a7a0169abd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-GB/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e8746eac5d253cb2e5968b0d2da6b596a3b14baa967622528d03db684f9b507cbcde59fc0ed6ceb64d4eaf5e1767abf1fd8e8b651bfbec1beb9b7a5019c8ae4a"; + sha512 = "ad456cf1fb209f0a7f3f567fb79684657074eaf9f40bfe46716e52c482fd3f6e63cd4ff2bccf9d47a2a70d59c02c1953ecd70eff89f95608c25caf100be31f02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-US/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ad0b071d92c3a882f81b7ac3e295e4234b9912bdca1ab70cae0d79f17b3f5fe04d30c70e91f5639b8c8e0f6759988f0f7bca3a0d4771ba3b60c63b08bbc71c8b"; + sha512 = "c70393c2ff8eb5bfaefc5bb646a327f685d16ddf5e9f6839d9d064fe51b51ef12e82716dc247fe9533f97bd33641d242049d1cb09130d29bd72faf497f989bad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-ZA/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "4434b81ad8cba0b9c380a73feef18eeb1f1c043842b24a13dbe1059285dd0d4c6168f358a38a31a143e2b0f7c2d19bea08734d02a5f7deecd2a185226ae6d694"; + sha512 = "6a4260b28a9d3f1bf118f4e32a64395a636395a98e0cf33546530d3439d74bcb773dd4493c9634c16f455cd7d034235d2c1f06830371033940a8cceef7a786f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/eo/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1f3ab8f6e3969cb9aafb4fc8ec1e8af9d2f883e4013851d822bce47153a1d06fd689e0e2230ebb0fb3eea81f140f4cf984a4b5286325a576bbf5668d5c247346"; + sha512 = "e0a0812ac3a24a0b9358f68a63d136b4dd0d140bd299bbc7b9b4c7a72e88c6ecbd149d1419478642b0b9bb662d625f9134febe5d6d210f9856fe99a6bd566832"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-AR/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b609c22e7cab67feb44be92f8ea3cdc86a512ee96c56c82273013a02c795bcd8da4ef40f586c94133118ef5ccc7968f21a27cbfef499bcd61be069e55c6f9567"; + sha512 = "171772bdf3fd38225db4f1dd0321f7c47101f804d94ad6b558423761ac0a3e464ff992b23e118c2ee05e053213ebf27807413007c5dab0bd9429e6612e52acc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-CL/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b6bdd2abeff665239e8f246940ee65bfcb54f1831d34aee5264b3e7714ad6819a5dbe9e3107d169cbf8f2532bef1d68bc40d185c281977efd8a3f8d918b06388"; + sha512 = "c7f96bc59b36c6ba7c4cd1d2ad0ce4e572dd489edadd39690aadf4cbb7e4573353fd73cfff94b2defdb6923a8a23d1857ec16621130cc106bdb6000fc054f98e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-ES/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "672afad688d5a03a1aba52d9ca29073dd2e7636ad049f98552978cc98285b5794b5ab854c78d169a14825455933413e5dea5d4779f5ef24447c1a414361fba37"; + sha512 = "b4f28a2c5b303af01f1fab300a3c09554496cdae9ea15a0a6ab816411e7493a8a8fac2360e12a39be050a8de9ff2bde5bc4f6f8e0b6dc25cd8adad49a0d7514f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-MX/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d10de0d07161e4cca3a7ca42fa7ec3941062db191f2d80325770f55ebc080be2c8ff9b3b8b52c47cd8422f6811696fd6dcad51cf1c2c4fd6c976bd197dd39251"; + sha512 = "d847c11a5f207a27221a6b022cbb78e770a6d060eeb05065bd770101bc0238c0309bf4aaa063d070e23c1e8ab8c955c4318c09215bec8184b279f653ea05838b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/et/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "c3ea53b3422a9cf101eb737d2cb511270fa4b0370453dee86c74f6cf9f36f6d7a2c4f36b85b760ddd089bf655f540f8d12a1d59c259e8beb26b69ab345569785"; + sha512 = "9a0a608abdf8040be460483ce8c291eaa5cfa5ff719ac113c03bb1092ace9017f9beb10cc78edf8a6169452f6f46169673f856dd58f6d8eb7cdb49d9378c82cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/eu/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "1221a19d5fb265cc86fbe3a1f03d99d0d5a5088432d89624ce7c00f26dcaca5571f8b136be8fa65f4c829e6b5a371d22d49dc7bfd0c31f3c168a4abd7d49e8ba"; + sha512 = "ca8e503ae4c7e6e457dce0674116a9beaa6360ba50df5d97d0b56375794c940c91028bbc1424f5f7628a80560220a169c8a8ff59a3739e2555bd9b091842d7dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fa/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "575757d295a420921db0528a8833cc69a7aafb13e4a51c63804b8c76517497f63e84aeb4972bdae0e7139233be50613c26179b6d7cd066beaec2d8ecdf429d95"; + sha512 = "842bf6fa0d8b6ad46a17e1f1d54207522cc6d65051138e73063fbc0c9623ef56d0861f524d441105ff606753e95a072124c3538dbf87ce333d22bdc1a448bc3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ff/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "a729c190bb3579ef4fca48c837c886f152bfcb550c29fe01a65f6f1186b7e80b71dde3a4f45ab80f282b04868cbc1291e1949a908b7075752fe0af7409c3fdfd"; + sha512 = "f83218ecd31e86ce402b47cd00abec4065355e64e9d884fb5aacbde86977cf8e0ead693fd939f27c735d74b8b483ec18d4b185d7023c2124993fc52109238234"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fi/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ac7a6844df3a0183d9516e3f526d6e8729b831f241926add256eb790be4d05ab58c62726940eece24b0be6dde8530c62280c744b00117312e937bc024b16d197"; + sha512 = "5d00e98297f9a9d768467c981bd789fa15945a5c70ffcb2f402f68cf13efea72106de8aa947963d58e25365d17456538e6e76c8bf4ae62f8ea5c0aef0b4d109f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fr/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "f46400d33f72dc888ce686e270c981b0fb11b68207d89297288010df325a71b29f48200c34322a5d9ff493d9540aadcf5f30282fc1da0dff75cc63548534378e"; + sha512 = "a30c6c7d0f50cc1db0505ec34ae1d5714737305c3e8e1e1660b6f519aabb699ba2a2bb14ecb77e1deda1d30cfd50ee69de3a308be004ca6a4b9e6df50eeb94de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fy-NL/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "17e6da89a57a34e4609acbffdda18679fb446c3d931bf5277e10099f3ceaade22bd9db41e9d38da6db09d9150888544c6619a818a50737b429a6f03def94479b"; + sha512 = "9f3a5a32d4be8c9941293eb1d8c18968502eaa28fad44ae89df20c2170809b850a7a0460a95f6aa189c148c2c54a881ab138d12f3029f21a863c5307e4aa11e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ga-IE/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "5671564000d63a401e40db275a9ac2f131c9a0811b0165cf1f1d3769324eb481b2de95a29f4b3cb8935ba9808ece9bae4e7760c14764c8521cba1517bfa69626"; + sha512 = "93547d639642d8c0ed10f23344ea01a66b43f99ecdcdd7a0e2e1a9b2a895a1fc10b44231db8c6d948a19a84b820a8dbbaa9ecec4df0bfc4555cfa62385ece6f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gd/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f7c280869b2468c173f0c45a92301c16252365e5cd1fac0b3ec7a3e779325f0cb6a31bb89761e37b697dc5f1a5dcd8160d935769a683dc656f89ffc29995e782"; + sha512 = "73c501b9a4a329acf953881a795444baf4291ca6dd152cc05c698f661b2ad1f979fa7f45f4cbd6abb6b79b6b41ca0079658d32c1b5cfb6dd166eff486f0ff067"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gl/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "75e161834e33a4d9e761f85b2cf1de2da88113503c1235d26a2db0a0ebd815ec12e6d5673aeffb368dc6f75877c52d67e59f27ee44e9eddea8f7efa17b4b040a"; + sha512 = "b505c3ef839778b713c42ba61ab2616d389184e6268313537ec12e648c341c8ff57b739622ec118daaad900b54fb4f8eb57f43526f711f59f368db88f788aa51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gn/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "5aeffab6468ba08c15d74cbbda355a8c51132d8f09f5d603e61c6caa04f1c57a3cd659463454d967a8fd68a17bda9185a0d281368381bed772d1b7e8c5722fad"; + sha512 = "744247e1441b2c44cd427179e5008ec2a25bf4b6d4e3195c910e8943c76deabd63dd5ce5c5ce6de2968d5f00e67990d8fce2322d901d2a5bcba6b2fbfb4f51df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gu-IN/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "89d204f7b931897a9a782eaf99b5cda7a049d35f7e4f3336b3f941d6234ae3984130c59a352052878a72602d6fd21e9725ec51fc2bf990ab395bfccc1ce202cb"; + sha512 = "1784177b07a777972dbbe14b259af9c0f5e4e8453d82ed0a9dfc7c0f548f6909cd9a986b4a03c2c40a5d1e88bcaea32c75909e5f085c652637512e8cc56ce38e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/he/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "7e3bfa2d8fc1ab1640bd2310c596451afc25ebdbf5b0827e218afcc7144b126220bd4cc94c8c769c20b6f00c6ab338adf4602dc271a3480caa1db69b28e41409"; + sha512 = "7a56deb3e7014ab4ed95f70e537c1613fdbca8a0a538820f903808e8d881a7259033ec6d0c8512ee17dca4b55dd5bf54789be78a6018f6c21f5176e7d9cef09e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hi-IN/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "803312f7e912059d05c88a1a6f448fdeede2aee53532fd67d685ad64c4961dd125c81ca9792a2ee781269221da738fdd7c76119a3b9d4ce6b9a5cf579af90388"; + sha512 = "d47f44b37418d61131cf1b804e2914b6dbfcb8bb30efa771d2d41d0e3768e20660bc4c8c3b36b1611ea3e992825cbb9548a4c3b975578d6c218fe10f743d37a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hr/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "bd4c68ee7fd5d7ae80907111f184825b94b1f12d02019cdf1511ec76ea98098b1935953b5c5759f28538f110a71cc7804b2161d29b8b3835a481f6f025b70448"; + sha512 = "8e9229d45bd3484c76fcabfa66845b41de87b33c1dafadc9a06ff6d36396cdd9a1d5d86a7e85728b9b658c39197962f20f374453c594cb92b82f0a14536522be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hsb/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "6d9d67e98cb39884b54e068b471d5e16e38897105ed890f14d322568a910fa29c5a3a927a31215133a8635e47800f8863afcfb7d88243b8cf9414b450c70f44e"; + sha512 = "f656f3bbc00dd0c3c4a0a9c4a7d5d74f2049c343284b891ea455ac093f15ef24bcb4acb244213516272b730cd42798115ce3e9013cc7ac6bcd648e97aaf6ef3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hu/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2f07c74f085e7490ba851448db019d7e0d5deef9a74e53c7e0e3bc13d4be5ba341032b9c63d5f2a7f631883858046d84eae5612166e966c330bd14777015a6ff"; + sha512 = "de412f63269b4e89bea1fc854c9a0ac9f37ef73d19ec900f32aef0fb444fb49daac0bb2e1df9ad01ec01810f64eb8f9d96d17816e7f062f5f3a324406a863efe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hy-AM/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "91440eb5832be50208473b6474c0f13d794cc24a37b2f9a160b2f173fadba946b934fe0c0867b7e3bab605da6011f32fe834825f2ef229e0a20813f58097ef7f"; + sha512 = "5b6a9f82c85318e21a4a4bb44e74db28e690372d3fd93c8ad8ab4db8b1efcd9014fe365df1c95cae4ab4e7a3abde9ab4dc8873e8d9440c3a5716cce8b38407c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/id/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2"; + locale = "ia"; + arch = "linux-i686"; + sha512 = "8a44046e7a0c0345575fd9b715dddfb88bff2cae6b674421724056e9142570b3499c645691c4c0bf37cb4ed59026a6e4827801b32fc865e6e2f9ed7653e13c30"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b0a2504f562b902bf0ff11363c44bc6fece5c327d0acf9eb8f0b17d5750846df1ad1414c17387a39bae5f1ac33de9198b05c55b0f2a97590a29e6b9c243ff20b"; + sha512 = "57dd98bc122a433f4f2bc0a07d167344087a26bc7dbf728a9d9770b61b108f953826d88889e73c2c6599fba5edfeeca3dd6eee2377faab254bd7f741ae30939b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/is/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e3518d927758c3e6c0bf73026b3896ec44cd5bb0abc3e0a8e280e458c66b70a32b15d53a27b97671335fa3a00cc7a88032f11458962e48cb1e984aec6c22dea5"; + sha512 = "58e47133a1a1e018ef4eb64cf099abc7676a63d3edc86024d024ce3e95e2c007e37480dd9e015bf45fa7c53fc46f9ee95214199d25cf57dce8dbac6a56356c22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/it/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "617dacd7122d8920c9b51974136b7834c079adf0486e9476f4e203805621864c47138a6bb79f05496f075071d37e45baf6279815e17a3640a805e80b7489b61a"; + sha512 = "7825ff6f4f2645e4577dc472cba3e4cb0cbd8f7881671f99f48df03fd509489ae74c000705b212fd5033b7da7345b09aafd68171009f5ebc40753f7da43e36de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ja/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "a0e21fe3a2eb933ebbf379294eebcf3c9f59f5331d4ad7959f5a1241aa4c0a90aa018c901d715274b12b2bde9533571ff164bdf71f081024dc0810e838f73fc0"; + sha512 = "0401f4890ba1f21c7dc1139046f0aa6e218891c69de964c7e0ea32c50ace9cf743990548b6d544c8047719b189f4af4594231c2c30abc48a8dbb888c9f6ff339"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ka/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "1f33af1629bd806aea449d429d7348362dcce82a5a02ed4930375e9701c700eebfe5773ef492fd303f68d86dd3ce47cd7c3f73e1a5bbf3d82bda1095e696cb55"; + sha512 = "f54ca89091125043d38ce7a197ea2e1675cd3f308ca0f93b0d57cd1ad8e341e2f8fc41dba925c85c12947cce4cc4ebae13e248a48fe5fb229e4e06e4ed0e1436"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kab/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "84f8b464d56f70ece330d6cb5dcc9d7c65b201b4365bc030c02c4b9892ba8641e8686e0f0419da40d620397842c4dcf0de58e9cc6776108e99e9659fe0997a75"; + sha512 = "c6aeb9254c51fcaaeeabb973ba7c6b7cbbdf1547300b8149abac8b35bf9d319a3d1efd7a9d252b23d6fdcfffe0f311014c17c475b27bfedc15798fdd8fa08fc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kk/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "83774a6b52db454e9a8b18b1ca7199f52ff215e5e35fe7cf0d86de6ae61af3846eb25510fdc7dbe670fc227688ee97b1ac6f25fb6860575431500a0b02eeb4ae"; + sha512 = "f3451dc01dad8018b4709a6af7c8829d41ee3de4e028b3529be556480e0c5a48b257dc33ada9527b88550b2f68985bb71b1fe7cb6fb84e505ef3165a58d94c1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/km/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "6d64e1ad6f6ae88c4d32b6ce96c7f72c03cdb1d13fd25c819e8aabfed07b16bc1ea308f991c8671b6812ae2f91114ca14ef8049bf0a95dfa4b79d11a38bc8afa"; + sha512 = "3364456a57641e1bb20bc2255c0eeced49b67043eafef74867fdffb6e6abc3eeb3871159859bbd9ff4aa823f8060409db068fbe2f44a16c09ec2170a6b8f858b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kn/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "46bc7f686d971754d1ca3040fafa5573c1b4c6df63d91511beed6848b15717e4820b1a1ef842ef5704dac42e51cd6102102f0566807a2b1ed86f8fc5d8e1cf2e"; + sha512 = "e206b0ff442462a150b60a72ed29653e64e2d277d887e622f31fddf2332cef1f75b6d6ddc27bd9c5dc89bfd87b67ce3fed72491e4d29a77809f4f901a2e87c18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ko/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "1eecec7d2ba6c2052f26177082384a48505ea2b88fbc5a3880166b11ca061ce77f9e08055776b9904d1d677ce072a87bd9f703dda51667f3fb50b62b42d6bc03"; + sha512 = "a0873fc6ed8c69e205d4c01783ecabbc403317d94ea7fd21077e00f8cdc264424c00e32b6dd27202b2d6ed8ac08299eb6693a38c288cf9b9a24c722745ab0eb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lij/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "20a4f1a52da9e853a40049d7fbed2435ddd48f748a453ae94c9ea14bfae3082aebf032c8f573104eb07317db4ebb970992db667010d0d8e0af6eef995c6481ad"; + sha512 = "95183a50d86bd9463ae2ceff374c2c16d563cde9c2bd7395ac900195fc7f663239289baea37ecf9941abd0d8b43b5c63214fd40b8eade0419e2ffef2aad51095"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lt/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b427ef0a9af8c10b52d4ad55da69d314a55da4de8c68572c57a0983f3e8d566f1604f28c06267736e1d3921cf81912a8829bceddd0cf72b60c08cbb49a190c6f"; + sha512 = "758cf8c198165c0579207ad8d67d998eaa81c32a8ddd269ce1c76a05082349cdfe38c0fd969188e7d4e86eb128b88cf88daa9e3c283820311972773b075bda10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lv/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "ff70e130c43b3a5e6b378aa4c048e5b92488a75b8c22a4df4a08ff1a100d63f02dd1bcfa5d4713dec79f65bbac31d3078f786143497c6b0a3d49b545ff43613a"; + sha512 = "b38a18191221d6fdf1386c72ec07e198d10dfb2cb33bca34aa5d960f5c7be2ae61fb543409559e3308db188ec949261eac4949391f8b699f63948fe3177a2ec7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mai/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "cfb436e43c1eaa7c5d7b0e4102b79a4e68833591a3c3b09df084533c0ac445bc6ad9a7f4e6f3e3fd0c4ef10c5c177ed7149c992742aa3512c0761a15a64e808c"; + sha512 = "f0b09948695397b53cb3fc500d6ae47aabc4f84da9314867816e2c4f21e4228e601731756b1b87253d2a2d5f6057fa115bf667d115de5d54ef4baa1a5dc181e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mk/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "59c02906c3ae7f810d53b04d8eb1ff6255d62dc3062d5938453a37d50bd35565215e6df9cd13eedd552d9121c415ea94f6a7b507c50b510433c41b6451f1f61d"; + sha512 = "46ef2273ff40e516c9deabe4b42bbb57abbc813a6717b0ecde42720e9d54ef3b332df05f48a5db516f8030aa984bbb0d91afbe3f0b84c604f9d106c39e124bde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ml/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "84c005fa8b3310ee98ec57e882205a465349481bf4cdd3d2daaecc7104ed82882d93df133f6945a2bab2e0b03ef444435438670674d426f7902ef55ead3ad4d8"; + sha512 = "43a1803e07b496571f35e005b8ba0adfd9281c9c907b00b92bd0fcf37e9b4c8236af90d145456725feaf3ef2c7baa12f9e5651e88a239795d90cb401079ca4d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mr/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "0bd928955589fe29d3801cd4995d9b20c816262549f96e894d06aea026dfcb621aea12abd161af991ee533491408660e38dd8c95af2cb91f24ae1cd6de949c07"; + sha512 = "4a79bd0bb319c8851828a4a395d7a3f12df8ac812582048758ab007a61ec656785322687dadc46b023caf6fdde6226b25fb31e2c08ced97e73832517196c5b1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ms/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b9486a558d50b1afd2f7b2dce4a932f233635c2c15c08ca39ca80e83b1319ee1db59aeba679cedee109e4bebe8082017aa7c61ab79bb39238e3c231435a24399"; + sha512 = "5c5c465daedb590f848415ac1781909d3645a3634da35ffe76c8e91b9a154f3f848efe23f348e0da4e2e7b79d92b41f98988fb68e59b54103ddcde913a7c8cb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/my/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "d3caac45f5923c01c5c2f7515f2d813351fc8941b8ab11e856b69353f7147bc8c8b06c535642b8c04945c50f923533ac06f87fe3b3a5a818024cd42c08b71a03"; + sha512 = "338af2c5ff8fc81401cbdd4559b8371bc18a77f07c28c87d71da2d4a164a697aa6f4651e631a507c94adb962059dd6ce772d78d75b2b9224e22e555687422b9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nb-NO/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "56dd91a54b47451bebbd2fdddd5550ee2f8d4339bf46a38d16598e68d54bb853bcc03bd5db946fb800d501c1aa4630f8ed35cd0d8789ce260c78dac0823d7308"; + sha512 = "95c2dcf9a5f9abd0c2f12e9a40f9f0828a1f05c20b981d0b6c66d85b6e57c689fc443e8ca7504f592baf2e89dceb7e01c0aa9bf34fc06165bb1dcdeeaf5062bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ne-NP/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "93667ea20de391de78cb8d2a0e06c9015998d00fd4a9fd112912ba93855cae49ce0456fb562bba8b2a32875d4e891ed5e5253517d05ef2b8e6a48bb884f55dc2"; + sha512 = "89c255dd709b9215d2fc933b6d09b0205495455ceceff96dcb9e2ea5b12c98b9fda258aaa12f5aa0a1806067cef1a8434c865c0d7a53c039b1612e0c8d548aa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nl/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9255942bc49f5fd871b4d1c701175a4b74cf555ebba1b89bc8d5d78b9d1db9fc5409c162c2434b78f3094062eb204765a55f235695e6a8c2dfefd70c14cf9fc9"; + sha512 = "39e6043e5caff0925e1f9d475c3a3e1281023336eb79cdfece1a8a5a73d973589258719b517cd6686cfd69400eeedc7b744287286e055e4cbdcb188818c3e94a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nn-NO/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "1a72ee04194b5fd4c0799363eb55bba6f993ec51fd920f5a7fe68c06622aa8d92ab7e014275b66fe4406c1f44276d01b34c843c84d16e523632fe2697661a228"; + sha512 = "570fbffe7e1b70cfc0613e4b230e3dc0bace2225bf52b9b5ddea4812d1a9795aa385ff97e2471209e9a6aa3c5c03fa861741bc8f4dc499a2cd3ffe5cfffa0c0e"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2"; + locale = "oc"; + arch = "linux-i686"; + sha512 = "bb58207314655f500418321d6c04f9849a6263495b0406ad0ae53b43de395dec471ca401dfadd157307d942da3cfd94df8f112cdd4aa37ed249920fc64c8d4a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/or/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "8b0230279f6d2563e43a0fce11b86c302d852c8acf72a1d27e77d6480d63252518ff5b83ee94b7e5188f687f75bf8929118d01e42e4a7335c0fb5c721bc991af"; + sha512 = "744a0b481604d7f5ce312f0d9cd979e768e5c53c4b251bf3e9e6d97c67450d951bcd5bf4f4e38e830a17a08e6fc98aee30fc862db27013909592ea1e953a57dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pa-IN/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "d7feaf16ea00a77ab91a9b1017f3589e6ddca518cfdf09634fd74142d0a4ce0a87c06ce373a7dd356236aaed6673b3d274bb59fad6113a10cb285abc663ef6a2"; + sha512 = "baa1bbbc3c813a168b742a4b20c209c66bdba60b799cc307b99bf08e8975c72deebd5ae6a9aad53d7172305eb2a09cc6292d9f9533f3318de4061a8744e9686e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pl/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "4da447f1beb6eefab3af199090382a1305332802a9e466532a3237271540dc8d1d7b32795196c17a7b41e9884276beef294159db35ca52e3a289e171844838d5"; + sha512 = "06840fb56bebc72b391907853474b29104107d7b7e2ee719ba48a2197cb166507f95d69ff215f29cfb806350e588c84d5f289460ae8743ba03c7d6c212b91b0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pt-BR/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "77bd9d6d893f9c89bbfd6feed241155ce1b6b2d6c3e31985e64fbecac7b254dcae3c4ec7418752d2dc0a9dd820b4358e77011087a61414f320bbf18e93d0ec74"; + sha512 = "48e4c56091a1cece6ac3f93e769760b71b8e79cf223ead1f2ed4ac3de89c309cf50bf9a6e86c9b7a22b8d84befee91d65d909c1fa2bba8b04cc7502dd0a57e5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pt-PT/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "29c6bb56aa2652aec25bc46f46aef5743ea6023106a109e50878528755e31ddcb6e641841729415453161c6c3ffea1a2888fddc046077a76aa723b393ae1c90f"; + sha512 = "8a1af26ab745b2efd03ea44a850cdc8a9f2e4259de8c568db40e54fcf57d902b898eaa7240a5d2621a7f456a8ec717875d1a2e4abe4f8a0c67e9bcd1bd9b4d77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/rm/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "0d28de9c90068bcf336959588e2f202fedc2e5ff47d08fc15b4baf127ea79162d89080ad933cc7e57c03270a5d86100073a403229ccefe590369df4b085eeda2"; + sha512 = "784a233f3098ca62ba0edc67a27af8fceb49f778f500c825cbca54c595d9c5f4a918a16c9bc6d121838981dc006a28bf53d3e3e0531861f261f8ffeb638c0ee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ro/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "a31114b63d5570327302cad0c1e77d7e6ade42a65f53dda70434e3043d1d5188d96791572433d9fb2acbaa1ff5110c9c24cd022c1696867ff6c2999571568076"; + sha512 = "a585d1c972a039f82fb69268f4a7a6daa9bcab77db9d045720f5a98cd788ee1be0128bb9f112098536975cfc9533d369e6b6b0ccbe5a1e43e93406eff45da5cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ru/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ee8aaa73834322c22b239297738eb2ced76a1c2eb7431288ebfcf100966599eacac11ba7e00fa9211fad6c8e624a0f0988552ff1674ac0395ce96c755228cc1a"; + sha512 = "93d5fd02be91c5e9b0304badbbe360b8755eb5e383168555712ab316ac353c2c8853a9f34ab1a028ede4f31b6b49499c5c31a0e992a0e349b6eafe6fe523285f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/si/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "22bdfb93f5f153d5ec5556fb8c0e04183c892bffd616eac296d2f2b0bd8ff32bc04bd204e1e62a56a52c1fa00c9d8a309bccbc353179cf3ef1b8d74a4e0c7168"; + sha512 = "d5e197e5727cdec1d83b05a823e4379fa229673adb3d3c2c0125b028cc229747302de8f423bc0972190e01a5658f843c1baf3e1bbc268d541dc07889e8c8ef62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sk/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "3a3cf394d15b11dd95fc0e597fd327d391f06d7a0731b3b57f7a9bea1a05c39b6b65b8a1092f44edd16f08ad2ca8cbd63730650531d1697fdd3fc55a1dcb6c01"; + sha512 = "6b285afe17533f9cff61eb7001b5099128bf475a999a393d21f94f6ef734b123824bd5fd6d3fc77437943145865cfbf3469b23104bcb509707594c1a5a718960"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sl/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "cc27b4356c292b41756eba6debad5b4b18e24435d90c4d2b8afa622328ab96fcc0c854cca03d6ff6fd648d3322bf01a57f9a83fdf5966a7467575dfb1c227db9"; + sha512 = "b14bf0b48de19048a6c8188ff064e4012055d3b6ff21eeac10a19c03b6aa85208e7dcc1f2fd28a01b6ffe87eecc968d62082e7fa5ae9b2e5391730fb794e8a97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/son/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "7dd44cfdd59e0e1bb71aa3b2ae8243751bafad89e6639d13d0efe4a3ab99ef34d87ac27f249d768c457e6ddd01d574beaa8ba689a7b85e9c1ce841f2506c55f2"; + sha512 = "771e77e3533c9273ccc08cd88dcda7a07cbf89cd1b5939daceebd24944b3c336c7c203ca1b0d1f7ea2236775099b0edf91d75064b07e4ca76c1bc7eb3b5bb816"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sq/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "60d7b94a02b6eed876aa7d8cdad849bf384d0f62efaa0590d19907d18d9f42cab2b77b0ac93ba2eaa721d44237e1256fe092429f7c95de4c38c97e8e3d7cd2e3"; + sha512 = "75da529909fc77d0ad288f63d0e89103d63ce3f815eb8d713b43b712e122255ee4dcc059276dc8c53abb64693de650c8674302987999be5155c19001d8e95ed2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sr/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "268fe1e88100cd55fe5ca1b3c2a028e436de0360e0c9e95ae2f77176e67f975f1609e97447eb98eefe82d188a804ffb04c05eae69ef9f6e405296f99794e5f33"; + sha512 = "a6ebf4ecaddbb57cca585eb0d2883336b98a0c1c7249e2db78a8f2042140d2d01c787444331f5c9d98efc7fc4b5ccf63ff50c4214263ce242b9c37c943a6079b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sv-SE/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "39c049e89a7e48f9f1d965d8fe43499856c3cd1ff5d86005d90d486b1cd04adddc5ef5246c71908ea38aae995456aae22124386b5a45d53e86e3e74380193bd8"; + sha512 = "e6bddf3f932171acd6560bb3a69129f71db73805dcbf01743940d652613ac4cc40875c684cb8ca46b6fd0b2baaf05710e18f1457ec41e9fe4fec08b7dad6193d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ta/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "bc4fc2ea66fb0701d77ebc31c92d0a72775af52ed8ea7273a470783f972576349db571c861835d78fd201cb28d80fe4ccc5fc566af61502e74cc8e72cc1ac3a5"; + sha512 = "863142d61d13085023eed212bc8fd24ef919e22141a560e06deb78b61a822c3af0d9f38c2dfe1574e80f04942682aa1bc0c10361c08e781dcf1ad8b4ef13b108"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/te/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "73090fb7df13733d6dee28cb6b9bf40aedf19ffa85149a5d0afb24732b9420f13b8d9860494f83a908c54db9d6e864eb73ca80cac549333f6e3a24b87c8f7337"; + sha512 = "40eb771258cfffb080462e465dc0daa0b6a3bae27ef6b5cf3e8b9e1fdec47ebc7c00f8af392a421971d2e3463456839d3fd0a5fb50d7226e5e27e3346a32b828"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/th/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "d6f9e42773736a179ed85ab2767f74270d868adb749286c1221484296f269c5087074e40678bf3abd5b420de3487d934982e53f7d094b98b1faf84ae9b19b7ed"; + sha512 = "08426effef46a0b26a35dd0bd37d5021a1968d2a7edfa7617e44bd561502722dc7a98c7fd63be853dc21c29241f0767a7ef31e07d3e8ba1241adc9537edc26d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/tr/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "f9714e0d2340ed9c76a67c733936485810cdf2e3b38c32e1958fabdefcca989102c175c77a34eab30fce1270076a81127ae14b68b8371aa86bc2be2051db4a0c"; + sha512 = "c86de3b4b96d3520e7c4483e86aacaa1c3c56f524ac37dbfa7558a372c12130ff2b55a89bcebf3fc48d361a9e5204c059dd5ce70ca04343ae913b565eb4f193a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/uk/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "784692df6d887e23480cc66730a2e487440d22812398415e412e2d8bdd1f1f9f0235a85be0f1dc55037d3c964996f57a1739f1ae54fc8857d211715a20a40c5d"; + sha512 = "2445e60d7dc548e1da0b79c4518bbf1aa16777ce1e944d8c70599c3c78ab9c4ae24a3c58c7c02734b0d0bf4f4bfe0a777671b82857a95dda69b8d584e6b77a54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ur/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "103d50b878d74827f11c79005f008fb8291cfb8c062e136e2d965bc61200fb6c82998ef3bd9c186a7ce5ae1371e5f21ee6cc6d664fbd60f737b7d05a85abad2f"; + sha512 = "c69f7306906fdb8f7757e2e814103467c859aa7da852e3a2e77a8b10d37d327b78ae79fd0e9170593bf82e1975126efb6296a48683e30474bc43fbe026cea046"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/uz/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "869230cc3f649a9ab78a2de7dd68cd6c0d416de0f27640c1b2bdd80c88acf71b653bb9ad51a8cc7a8c2be9bcd7cbf5ebe5574577ad00cdec542a85e19902ecfa"; + sha512 = "b550a887851e2efa5c31da29b83b4152faac726bf64c2fc334ebb72b2fdfc8e74ef6ef2471e431a0efcf2491c22b0c98dd43d1d41373425b0e70216f6a58ada5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/vi/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f80a57dc3d505701ba4a79819988133a74913918ba96692ed6e6d4479672e28b5c4acb06b978be3e7494ff868737992b8a34223964b737a7346fecf2a93eec5d"; + sha512 = "0b84043d07e62e5a7ba38a769f9949cef05cde65852e90b21e27a09b3d40fbfcbee66c74dbb50e463b3f01e3a07b1c137496feae1856c1c3ba2f4c27ee17b3a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/xh/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "662b14f48738d32b88c14bab1730e73ab208e85317a4abe8215419642299020a491d22299196091b40af41e88fa4fdd6794385152d9eea49f2aa9d6cf800c8bf"; + sha512 = "bedfadc5e0c075c284f33a5463b207fd5056117c8de9b5d0b89134be6a5489a43c95e2e741688026b21b09f3e95d3216361bbf767533173d23d5b394025ea82a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/zh-CN/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "42562df31b9f69b0370c01f281f289bb7bde34f5c82e43d46cf22084dfd12ecfea7a340116ac16744d5f6af04bbb9eb48d31b610dde34def50860327b9caa9fa"; + sha512 = "3a6f79a49f183e920740d306483c697ce4b315b5a25e06c2b74faff74082d632078997f78caacbfdf7b97f598d1510fe1ad4f7a0c57e7eebbf543a263f46f279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/zh-TW/firefox-58.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "71965696cd645d00cc0c2f212e89bc63e023f6c36c3182ed0169839550752559d8c1a04ad47c832e5113c321a54209e00ff598dae7cf5a46edb169176f3cd86d"; + sha512 = "c445fa9f12599a11aa5c13f5c88e5a510ac4ba99e852976504c5030008193e00194603971e1f4078d8e370f74bd3134b3702a5c97be3e6a0e4fb841e24b609e7"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index edb19b1701a81e8d996713d07a071185375204bf..3dd7d9e8e6591fc80767ada0f4e8a9b47cb6b306 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,955 +1,975 @@ { - version = "57.0"; + version = "59.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ach/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ach/firefox-59.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "dd75abc1ff917398dbb8dd6821f6cff4d925870fb4eb654f18329ceabefc537ae3c908abfdf2f2f836aacdef67ca251645bca2a14c7b39ddd7e57b9eda537503"; + sha512 = "6242d81b96456c52a25af82049ffae548f7b5e14e47e2e643cea94f338e10027270d67b13c27a4a77fddc378b1e0869b5a0f897b9b269fecbe1d55336dfa4718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/af/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/af/firefox-59.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "eab1f1eb0e5931adc06525fbc68960b70b80fc070077c10c7eaf7fbe4be8d4db404aa74e35b83d5c1faac6a78782725cff8328d99f20d2a35f1527eb47c3bce7"; + sha512 = "e2aa156326a38c4ac55b4ebcbcd460ce64d5e9abc210bd53d484cb97bded59bd73045fb7b3099ff3301f0262938ce8b4b90f5b0f807f73d9b7637a826a5055d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/an/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/an/firefox-59.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "384b37825ec8a55d91467a26ff9b14a1c707babb9ef5cd8ad0a73581dfe42ccce5915f3f0fa8e3afe41b870f858b4c27b3ad95a2bb34106b0412a7ee53d606bc"; + sha512 = "2946fdb675ac86e32e91b3a6cf4c26d14a5c977f22a587315a1c5a03db69f84efcd5057d7bd7f8b37e7433f53d915e9e9e5ab0c9d35739ce82e1c3183b1c4d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ar/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ar/firefox-59.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "a6ded39d52ec035cb71b816c6c61b81236f808a95538e578faf1e61ce72fdf4869845e23094351da2d4d2bdb3e01814d864f257730742b807b92cab008a472d6"; + sha512 = "2d497f930358fdd36ae5e708bd73e151461497f8715b11efd5a2b6c23b71fbf985faeeb2bfa5cc2816982e81f27091705f849923cb724078764b50fa684374f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/as/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/as/firefox-59.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a9e77c4dcb3672f917212baa11417cb5e947a561d4f3e5a2695640183c51b521dd8cae0d269c9cb7df1f608d2e82d620d2dc284c1fccd67fa857612b092c37ef"; + sha512 = "a1d51a99f8a5b47668c74414372d11120160f264762a3bfb988be2aaeb958ad5d3897472618a86a4a8422850c46f2895cf426fe9d064938c263bca96a9592eb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ast/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ast/firefox-59.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "07ea65e0c973248c4ed63525e24d09868c879f1eebe2530e8511767867e7954ce3bda16492835187013b134cc085a44d5de3205b1272aab65d16d77573274745"; + sha512 = "dcd450fb49cce376f27e8135f8c27400af1c2cf139120602c000091231703db2cac791c82de157c9335fb09050cd4e4ee6013da3068b1527dcd9e0aedda16c5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/az/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/az/firefox-59.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2810713aef462af14be0729488bd05e2992f263940dc11bf544eace53b639f63267ba8468c50b0a00748e8498a64bfb3d42110debf92e0aa4968baea47617038"; + sha512 = "fb004315a6ad15cc9ccb6d3b36901c4c495ea21fe146df3869711fc7ae8fb625a109fc416079e85163e79524bb987b366b2d057cd0808d0dfc61f78910fbef96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/be/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/be/firefox-59.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d8856fea5d7f52ce22ff6bf2af600695494f458214a5d2de254509fac7d4208b816583068fabfd5d2a1460bff9cecd13d1c0ba0880470b4975eca1f7a7a2eeae"; + sha512 = "ba51003823e74734726f655cfd20fe968ebe5feacd0c985f7c8b2cf9766d7b68fe74dafc8baa0605b8fb46b22312a593218c5a57fdfabddea6a51491de74cc13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/bg/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bg/firefox-59.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "caae904094224b1c0374a07c22240bf06629b81f475c71ad38835c12cd59de016d05690b1744d5e44384db4c1ca86ab8cca4be6101987c34cb5903d920813f72"; + sha512 = "f9df1a70c569f853b94c912d8cdbc7cf98a57eda9d461777f9f94c776f4db0a70b6093478ae1e7c87e80f37cfc5a39af3d2b37897ca60496f0d00ac9b45c1713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/bn-BD/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-BD/firefox-59.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "68004a769f2cb81d8f76b66ce713377a83445ca56aa6baf5adfc2617b85ed54cdcd4b410f415b27368c5437f3af5be882cfc701e10ad77938ab7dc2bd9ac87f4"; + sha512 = "85758a1ac327b067a59358d3faa0663244a24a4769ac0dfe03bf9dddd5a680503ea4bc9313294d9771bc7e4f3341904c68e0059d912b563aba8061dd0b6cc793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/bn-IN/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-IN/firefox-59.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "c1cecadd1ba310335cee4fd31a2754c469a8b70725e01e4b33359878cb104a700d6f8c64b8575d09faf843a635a7c26630cc9ed68daf1a9d93a5e075b25a8caa"; + sha512 = "895d63b62be42947e955ce426e03f7f8cbf8333d77fd3ff4ca6623db18cc740fb1ea6c41aefbc75aa79d60fca2f00b75f1b2e6b5b0bb1ddcec61f9c0772dedfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/br/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/br/firefox-59.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ba39b82ac0872a958d9fe4c9a20bd7e797c6f20ead48bdc379b56a1d227a6fd6d3f2bae9333a133da8bf86973e98af945431e98d8e18941164c0c6ee10923c84"; + sha512 = "e62f445437a07f9fa070335328064355715d2e5ef81e5572f04a8644f47dd1c8cf8a3a7ac6fa88038c4e996229ab695e692aa1c0b0b3becf214579aaa76a5569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/bs/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bs/firefox-59.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "99e891b6507cfe76700576211e5ca98bec8172c59733102fcc60fcfb036b9e44e44ec8bb50ea568baaad8777aa09b364aed0c419568c3de15d5abaf6e9fba07a"; + sha512 = "d3adea6061daa0fd54d5cd7d9d8a00f8b88db8ed36545f9fcaee7520c1cfe58534d1fb57e8297fdc8b4f348bd6c728891f6a88f1d4d36f59a7f2ffbe0e4eb229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ca/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ca/firefox-59.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "87189530b94e49588c323ef388a34f6e3391d31bb7255109d0f25ad256f298576ebf3b3adb436605c1068d6ccb1fd4bd9350d2c48c5ce1a545ad4e28f11d0bdb"; + sha512 = "5bab1fe909680ff6eacf8fadc9aba7786d801379a2e79e5da04e973a3a218de8807c3d08f7641be554fd49c592028949e30b262fcda52413303d9044e161a60e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/cak/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cak/firefox-59.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "91727c8e30bf12faad978cea98ff2b71c600ec6cbd85ffa603b8de7a70d0d93aafa364275061c7960b4d15e9ac729066fd0b600c1518c73dc1c78d13c93595aa"; + sha512 = "f54a09501c7311890542d91b0ec96dfa5cb634685af4ef0fcc69e633157183f0c5ef906a205fadba6e132c9ee657f7161879a83ea382bbe400694e92c065de64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/cs/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cs/firefox-59.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "32d9b6e425bac23ca99ce024668995068cf31b2252dd622886bdae395c10a5e4705b9a3bdcf5f72a090fdaf07d4f1f7264f6dcc16be3909d74b51fbc48bac969"; + sha512 = "28f17b2ef72356a058976da30960af1c8d4f2a02a946aec57b3671d71887573a98375eecca4a2f0f21b37bcbe0dd189ce4ee17ccb9af8fc60d63e9bd20ca44b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/cy/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cy/firefox-59.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "aa206dec14352a4289612c6a0e8f11ba9daf3c48cd3943413cf9a2528b81bf25addc9392c47922ba806a29fd717e4c9885f6f0335ed0f4c8e6b2c38c4567983b"; + sha512 = "36c8a1ac125a55db15d0bf7c8d8fed1ca3b0031a9421437b683adf7691fca281a499af6812cccd608e65bbcda3e1e94469b16ead2a9093708c8c2daf4ea7d588"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/da/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/da/firefox-59.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "af047d43a7898c3f2897d6356d60264b3843fa03c1de95d334a346e5c713303f591dda01d2067677cb3e7d2da465ec4cffc195dfcc5f49ee30e354ebdef0e271"; + sha512 = "fd8c669362fcf945b6280d103d1b9524741993db8d38b78e494ae14106309999d09f4b13d55b8521612cac9e5dad622ef361fa16f197389405ff620b3eeac467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/de/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/de/firefox-59.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "009ee8f67aac1639437e340f5f6a67b7e881751923af24d45abc0a458ee1186a4dae6a2b049378855e3982aa01de23d063c0090840d55b966130024cae9b8a6b"; + sha512 = "32cbc3d054628a11959ccc7b553fdcf98f863a86373307bf8f558a78482de0161e533b71cbfc03142b0ac7aded506e53e821213e42c574d28132fd2f98a753e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/dsb/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/dsb/firefox-59.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "49ac45a821d203e1915536b0c478fb4fffe905b4efba50361f10eadb824337bc44d4be0e9a83dc6d0e8cbcc24bc69ed8b2609b766b893432dfe14c19d7f0804e"; + sha512 = "4e7c2f6b980dd4872850f7dfcc068c7e40a8bc896e27ede759029bf0324e1189e605ffdd2291d2e6a4a0c61e56bff6cd760b77e232209127e9a90a38b012e4fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/el/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/el/firefox-59.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "055946765db4b9b0b028a94a49cfa21174fa4628c1a6d3d9cdee61fc418f7a0c49fb14515ef57ca802ed4ee90618d5fb3bcf2266f368be1e2c02905e3070298c"; + sha512 = "ecf743c23ef70e92e1f7ddfd2f1862b5b60b446f0e1020778a79ec11af94ce5f03ffea9b0b7048a7ee0861602d5c32f4f4bc8cd4b7171ae306987e1ca9993ddf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/en-GB/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-GB/firefox-59.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "e9e017ac8f12032928f16e698f61f7a1d9b7ca274c0c365873e1853cb70189a08f5bb424351d46568a13412851c639b6b355a7e34af53a2ac68f42acfa45fdcb"; + sha512 = "ddec1dfcf976f93d1eb310ccacd9e04dac8e0b075d37b54be1402531d12c11ee9dce2be7d0bfa92c9b654192c71781fd2631cad24c8153275e786552b9ab11e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/en-US/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-US/firefox-59.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "53918eb367fa58b4e54496d186f918a6b9f8dba7dbe3b19608a2a49cc6f5abd656998ac5006845d75a900ccffdc8595bbcee7c365792f80c3322fe2a09e1f6fd"; + sha512 = "3257084102282621f15207af04e6dcbb98887b13a8be911069572c151d8ad96f90e7c083e571b4ecd4d4d4ff3bfeee1dc539042d8e5bc6a0fbd7f36c427da402"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/en-ZA/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-ZA/firefox-59.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "bd3f538c644c5164f21d7f14bb1d118b1d788b487158aabf085b43a9a10af4df9079ddbad13427d381566f8841198c16f14ec949b8b4c94edb51e5572685993a"; + sha512 = "35d2f29daddfb6ba439b160644869bf806ce7a2e36c26d4dc9ef2ff2eb5079e0bda9095edd727fca9c64c3be5a5646e56892bd7ff76b2c67300c1ec7f074d98f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/eo/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eo/firefox-59.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e149060c094d856b98fc6fbe3dcea5ff632f2886e872e753e4416a9461956e1ae62491a052d115c4bae879382915d8df8d15c4b1aa6ccd4aa25464e2a2da8a4c"; + sha512 = "867ac54d47f2266ad357d1666c9206c00e45d7184f6b3a0199c2474b63829ad1d41e95491d2c977885e878d36e2d7e93d215c53e629886e7cb04abc198a06e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/es-AR/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-AR/firefox-59.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "34b4d77e53ac80dbead9b4bcc32a6de1a08cadd23efbc203318f3b9c312334efddfa5c0cc15b21fd7c21f64fe74f52e4aeb27f9dc5039599f19faa87143a0cca"; + sha512 = "3d577099cb28dd4c4d1349141a715783215510d015f7b2b02739d530222ece5229ab3e6cfe481be4e9d1d17c40aaacac10af9d9c2be37f7956620924e56c87e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/es-CL/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-CL/firefox-59.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "8d379162adce9913f14c4ba9e6bca43fec2e49db6543adde894d1735ed8dc548970a61b2338e088f65a1c9410722bc683436c11f7f62ea46bb8f5a1565b25faf"; + sha512 = "821738beffdb260b6b3d8b5c3a1395b6b7d58db6b05a744899c0eb83a291855152f5055c3ca6d9a460bd032d5e72829198cb72dedfcf6614aafe1d7b8189dc26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/es-ES/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-ES/firefox-59.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "8b3ab31799d6b636bdb8dd78a2e7e3c482169b9e09dc5b8d403e080c41404fe0a803d315b00b4c047adfb7871ba29fd1aa93c600e3b76747bc3091f1613c48c9"; + sha512 = "10ae818fd27acc38a5386d06cd7d890d4eaa44407fe6334b81cdbe3f43ded90be72e749f075e165105e9a6f02e08014aabd7cd783860d6790b67eb2889718e5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/es-MX/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-MX/firefox-59.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "fdd08f2e2fa4cfa2f88edcdb1781f06b87a8deed929eae5fcad733ceca93db5bf750c83d0d5b5e37eb1094ecd68f5958e65fb5f905e2ff401433b3c6ea4ff869"; + sha512 = "239d3c287eeface29994c8c2bb9bacd739d638cb277e18e57dc729e35cc0c11f6c7168673c110206f3e931c850bfebaf1a26d4f690d8f3ff6f85a61147522941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/et/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/et/firefox-59.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "21f4cd8a7f8964f25013c3d3e2c261489790c9ae54ca765da3199c71c887cce955a710eed744b4f763d123bcaaa86c6bb154b1a6f9c933cb4e799cfced8ae153"; + sha512 = "824b63c3c596191f1f1c60734bbed70058cb9bf71959dbba759a2b2e75a76d0b0c50ead203c093d568a18bb622372ae112ac22da0a33e4cfe89e5a42d7329b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/eu/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eu/firefox-59.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "dc8337134ebd464d990ebafb4c04a0a57f84f5a013f7a3dd535be454d0588e62d1df796891593c5e48c4475f4b863cdedccce6548294e1799b8fb8548bf17651"; + sha512 = "01e0991d3a1926f41708353bd98e3aa00d3cc71dc7635b9cce52c3699aa5ee670818db76e9d82de4afce338165fa01bb0e88c3e8b86ab2d92d1b8d3845183510"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/fa/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fa/firefox-59.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "a8464c89ea4d9df863eb02850fb4a27b2dc5f65c5e85849f4ce302d4a7c0531e1bd0b3c1f2a6696ec101c509a8cdc87c91fb1bcbedb0dffe0cab9359e7d584b2"; + sha512 = "726100abc12832418c5cdc15b9e9083d88d72a70a0f6a1a567ce781173a554cc4495da0e53539185e6ec27143bae98e952a5002dea91fceaa5f8d8e51b6d6a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ff/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ff/firefox-59.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "92fc49c3f38a3bec9608c1a5aac89eda97e970f64a6ee0f90e1cb1e8ac98a4261307b18d3bb906bb66a20adf161118744a297f2072900b11a17e548c31b8baa8"; + sha512 = "1a0d97e27008ff5f3bf3fe85cb14c303320a3015cf928b2ea4c2e115a5a1cfd809743d801157f53d6ffdfcc359c3738f2e2a0e12e5ca7ac8e3f2b93253654e8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/fi/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fi/firefox-59.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8c03f59ee65e22299aa04296530f6d21f036ae495862f80c4fa0ec97fe728fe440c723599bf0a66f088050bf40518ff15f62b526c3491c26812ffc72336019a7"; + sha512 = "ba0278c06463d0ef44308f46326a3fb9dfc0cc4243086dd9acb856e54465ad672bcfac68afd9ff81d08a1d0c924a044e0ac5afb299be9d06b657c159f6c8ceec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/fr/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fr/firefox-59.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3ae19adc3840c503f762e1625cee9b7b009f8b577f1e498ec1f2b05dac0ca827c957b9ac239a4877e151f8e6f4167111630f0f0bfeb4068c8e892d4ead9f13b5"; + sha512 = "bd8ca7884937574f0d6b4dc5399771135778aef06bd09aac275ca11c2a8dff580be45ffbea5ceb58f8baa7d7007587aa07c3ddedd407f0852c1a3940e7ccfc8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/fy-NL/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fy-NL/firefox-59.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "fc4485f1bcdc129e8199a6e46b8bc4df9a3db3940efde49be569d8d56bd77a932ad69d512d875742e2a2653dfe11c933c83c22303838483ae64e038b947e531c"; + sha512 = "9e5fa467a99cd7a9ab102eb2a50ef14a4402d03ad3dec5b6d511c7da3843e779b1492b1ba22cc72f83070ff88353ffdbf1a9d26636462c0e3bdaa6dccd6a6200"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ga-IE/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ga-IE/firefox-59.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "b306831c247b8db75db2b7faedfc382b0da7d9eb54fe25b1b540b65a1127ac1e672aa56e3c87089d6bbbedc984e2f571611cab0fb2c1d839aa1710ebb2868ec7"; + sha512 = "1226faa2c14196824f31da863aca7d076972a47d71a971847c09c66d268d07a9aa2677fa0a7e8f11f149b77261636d62c39e7a382db3abb2917bbbac74330d45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/gd/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gd/firefox-59.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "8d0d4c03ac39fb0b29e328a2cb6a1dec6de0fc9fd956ec5a0c6e431b739e3e98583e42c1bd6a37efe0813fb1d76eb9a881d4e1946ecb98416486e8a6e5d0b181"; + sha512 = "eb0dd803b7ba91574a044503d2edbf633e08c834f8eaa5e546975d91ac7254b3fd4357710fe4627d742a2ea3e64f568a5ef1a893363c516f958e4a153f528f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/gl/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gl/firefox-59.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "d7acaba4ea2ee4a22ee64bb918083eb652db21be450fe3415aeb2e4591624b4aff364d37cab51f718c832838a2f775f42cb517e9ef6a81aef6aa283ebae35297"; + sha512 = "e789fdf2452043165df90c83ce4bc0ca641366ffe5f89026bb763480973073d79c097313b744c3b2017be3d80f690d18459d1b8969538ce310b802163a2eec45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/gn/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gn/firefox-59.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "65c97e250d7dfef68fb5c9479e2a5af25e90bed2608ed4f573591483e1c8db2267c035180064adcc11049a14e6b56b19456cf46a1072ecc9ce054ed0b76c17af"; + sha512 = "c368f07013b7b4fcc74e88d68a07d5d0a1fb5133991fb343d5b1a86145108e14a762962f3a3d5c7188d8cd75188cba7f26bee5555d3a5e7cfb9741e2e11ed42a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/gu-IN/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gu-IN/firefox-59.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "88780984a9f83da05f7bfeb469442796b78c4c1148fd554bb57c2e55d6c56a49c77412358ada670f857e0b1a2b10dc9021bab84ffff2f7d252679c50fd6ea5a3"; + sha512 = "34795309248224a31ef64cef9ff335f357505684f38edc06b9365dc0da98c5b96aa38f21e317e5f0cff0d3d3fa94ef7f8aea6c27f67501aeac68c3112b63cc43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/he/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/he/firefox-59.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a412169599e4fbe019932751abb67a538870cc3b4c2398d3d021d6176224a8d699291b4b48e5399156a8de8595077bfffea2bd987916c6bcec24487c4dbc916b"; + sha512 = "05e21abbec43babe818f28f2f12e55159e413b0e6e0871fee76f50c380085ea129620864642d3d26e80e039a50a8434015ed348c51341b6d87190c627b90bb82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/hi-IN/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hi-IN/firefox-59.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "4956f4086e061bb162b024ea249db8192b1179313aa7735bd42b46483939c4773ab2d3d43ffc056a12500c1873b45a5a6251cd1c89647d375dc605ea8e7b0c1a"; + sha512 = "f6964340a688305ac3855efa57280e3b5eb64f22e11445d76fe28edbe04216318a16c1fd02009b8a66ccc2ec689d8e0bc374e485bc03e964dd5b65ad27e535e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/hr/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hr/firefox-59.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e0acfa0d4a1b0a228d8f612a742b71b88d9ef569ee263cf0c47d6e7bde108496f36fc60113a3be27a52d45c07ac3878da2bc1c6a47c1a6ef7efe47eea99090db"; + sha512 = "e0966ea4bfa256eb3a255eab7c89fc9073789512941311863199d96db4014f657acbd1e403a6a4dfc8165dc39d54fb1f9ef48790e942eadaf90f0cb7ffe15ef4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/hsb/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hsb/firefox-59.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "689592f815ebad0cb2b347ba214c30ececf13e56c48e57dfbbcb16e39cbb09b5689daa5e90fd5adcedc927cc2c5906f313ead51658a2ffb9ccbaeccd503bfb88"; + sha512 = "e8ac60e1b925e7530884777a4ae05037e5c577fe6dc834ff8a007f473846b052290787d3d2f0c19b56e573385b6471336208d360c4c13a3ea3dd686429c28fe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/hu/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hu/firefox-59.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "1cd1aa3a62426fcae8879013937ea1059b172c9b1800be9c7aac7a5d716651f2fae270ed99b61a7794d28ef86fcd79f3712f97446136a2f5b06ec3eca8d6818f"; + sha512 = "737634b022794a37223779592ec948015a90c6c96c952acff5821c3af9c060e7fc60c988f17d87d5faa822fb860e6697e233601c7fb910ab5596935fce12ba49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/hy-AM/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hy-AM/firefox-59.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "03709c45ab2771f88ca0ccc2caf3ebf7371d8ef4b52dfb3847f258081ecad6811b4c9885f4f652ad995c41850e322b19078ee5e8019398a015db0dae8ba2e1cf"; + sha512 = "53d3a10011e8cbd22bbe86c6ed256775de580f7b8094ce30d8337268362cffa2df85267fe11432f659a012047a164a63d1c143014c0dd26ff865760119223f5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/id/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ia/firefox-59.0.2.tar.bz2"; + locale = "ia"; + arch = "linux-x86_64"; + sha512 = "5d1ba2fa31d3c5ee692d3bf8ae0995ab166ea0c31044e056b4806bca141d34f93ed5117630c311c072d22cf65d12efefa812203a8237464cc9a285c236439810"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/id/firefox-59.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "1dbb481b7863bfbdb0ec7c85bb8ebbc3766799de8f8fc6b6f073d2601771ffdc523d9206d83db9831e8f62e5ef81af2d96b166269e5bbf0dfea9bcb05ff504c5"; + sha512 = "b94a086208cff6fa7b4b3f7eb4d681e77d2042ef1c6b21af322ef7316b8551344aa72c3d7a39b86826b8c6d69f847b9d20f60143a048ee28db88847dedfd1d37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/is/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/is/firefox-59.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "bd21c60715943ac698d2e1dd062328f63d3f5a706efa7d0f31948fc4293b8d644897b0f62352965944324780dcc5e19a0d582aaf699b2c79b5dbb0530aaddb32"; + sha512 = "9767dcbe58dd91364b313f4b7b8f85e1768148080ff97220fa1dfb3dc8d5a69e6fb8fbd607a92411d5f4adbfb856c101bc80f922b0b1ce8b63a79039e84c329b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/it/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/it/firefox-59.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "65d991e4be62df38110f301acacc042a56cbdfeb20d6e5d9d52a7a610a5d0ccbb26d7a79b581c1e654400a4f162c09487afa7a8de313b4f483fabc2d9e2428be"; + sha512 = "f8ffccb521f97f0f18f70a0cd2cecc1c31162072bbbd929a1952823275d7b7d07f36e64bf6811e1aaba64b880c432b1dd342483b9ad5a594971a0bd068c45197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ja/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ja/firefox-59.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ed3ba62d9e158a4d8aeeca8a9b2528146c5970c473e4ce9e088a80aede8b98c5e4d822ccf9996868588b08eac51b946aed202a130b38b2cf408a332dfc932c7e"; + sha512 = "bd97cbffe8c4c1ca0fd8e44615a6e04dc5929c8ab896952911a04da3796a9132f797a4e32ee262af7a2d8bad294a30e11349731306d86ad18200715408337437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ka/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ka/firefox-59.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "31180f189e68863a54ef6530befd184abae6e6590117ca6a89fcbe8a24a8b8d180d9500bc931ba0b5adb13a7d0173cda9a6b2f7bddea8f7ab3781620c2ca3077"; + sha512 = "1b5a69053263a0571227e614e0ed05ca1cf8bfd7a6294fb82778c2bc99b209fc68b7d644cafa223686ae2a54ee125036a91a3a847a753c194982c0f2327b3b49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/kab/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kab/firefox-59.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "55d5de7a1cc6f5133f3031154f25d8e74b253410808acf8020b63a67833a427467d3a4bff74d2cc32bc5f9cbd5c6a1d06d1378281889d4ec78313c3390c8e6d4"; + sha512 = "33805bf3976c9ff6699767ef69336f06eb86f08b540b54b33c8997b6af42eaac6be7b9dc8f29d3099ca9530209516ef84e819fcf98f3a7bef3e8d47be8d372b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/kk/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kk/firefox-59.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "e7c3244cececbda5b36b07ad3e9ba3bf3bd17aa11bf3e39f4ba112f1a9cb51d75819d299fe5e027c29f9e8ad115d1722a0ce318288193379f0b0c7d562f21e5d"; + sha512 = "c2bc89ceadb7ea2c81ee2b4d72bfbeac8a34cd1838f0c2201d7ef0c819e597b87a935a0e6be0831b997ecd290e286de7a1c9b903a10daaa5dfc0fdec2309b260"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/km/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/km/firefox-59.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c56b3f1b1bbf610abf38f8751da86a092b57e1caf771548b232049041e9bfe252a5204a1e7bd5035444807b4990fc2631b9fec39dc7f25ccd33f93299708c490"; + sha512 = "cb1919f31651b38a77683850077cccd73c27496e1f9b4354accfc35f294d479b92549ebbfa173fdfadf95b03bbb45cf1baa0c8a4e51f132448ffb9fb2293a67b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/kn/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kn/firefox-59.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "5f3e23febcbcf6d71210c4bc77d684c2deaff72f1bbc6bc2d0a5d0f340ecc063dc332464c4b9d8a6e9539723ad44042aeda88bbc872ea7c0bf93b6c5fee5f5d5"; + sha512 = "4293747292be73ccf60a19744120f9cc13b45a7be0c5de4243dacb5a2258eb88391d6dc6b240420ca5097ff5f5e2d5d36240289f6a5c51ba7d0fd31729d342fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ko/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ko/firefox-59.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3e129cbf532ebd3cfd3067b666c87118054fb5ff12dbf08f4f2f752c4a36cbe5938fa825fb16d9c1f6b39fbcb44f1a36c0a44f9de9b3a62937c931cd46629782"; + sha512 = "1a4723d890649ae29e9030ed2fe3208e44ed10adbe35c25877003a6adc21e033278874241bf5fc971b93f94d33fb4b503dda438153a8bc80b187b584841423ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/lij/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lij/firefox-59.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "71ee2a3fc0fbdfb96010dda366a0fbaf446a7082459c8e221e6e9bc8d6e8ecf94088db26a3605aa59a0205e5e2eec7fb6a246c2728de6f15874e350f35d4b64e"; + sha512 = "564260546bc6436dc47ebe6b413abad6d2d25dd7a64d9b5ddbd52fdec49af951b9ce26f3aeccc330aa9601605bec7b3b1f8701668d2b01ee06a228f723600fc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/lt/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lt/firefox-59.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f8396adc3ea3e924dc2a74f4a2a0ab6f02f5e6985dd92825746c35834bf9d2375b5d6fcb73e3195e08961a0d71e7a56bfff857e436702bdc57a1fff3ec64f387"; + sha512 = "0aa6b9bb99ae8284f7287def5048af21372d03211a279f2226de7a739523fe189b3e06e207660be7ab35751b5ccc6aaa1b53dc293417971300a4a8e7cc162b6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/lv/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lv/firefox-59.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9a03ee1f41168f427f995134ca83c707e7168fc7106405befac319620c9fb0e8a3754ad8072e8bec5a4bc6ba8fcf250cdeb03f4a776a5e5958b401e88bd1cc27"; + sha512 = "f63955b57e40d2d49d5d1b276ad5b2bdd5122daf476c560dc64e82afa36e4a649e384957c69609e74ff96935004ddbd45c8043a27991d082e59e0f42e7221aac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/mai/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mai/firefox-59.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "1bea3eb0befe931908b47fe7220a240c245df6d87001d87476c63f40856c9757ba76a8032b184b71792d746adf1e4a126e1cd735a47916c1fad461b3bf6a0cc3"; + sha512 = "7e857033b14656e972ecbb6f60454cc63f79a9c775bb1fdc669f44af3bde4e1d04ceac3f7028eaab17fccd8136c417d937009b6fc0e80c45200b279660924bd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/mk/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mk/firefox-59.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "27fae01181f2c0ca2a2abe3902425c54115dad27d771700ed37d2f7c7e6f1ee23f63c688305eb33475f257605bf3897e9ce080e60be7e4e4aa40883a33fc25da"; + sha512 = "8f7bf3418145af3ab47372af8e131b4a8b350dcfa8a7f74720a96812563327a4e4816976c2fd655fbaced91fadeb98489bf0fd043e103e5e0923b9c2ee408188"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ml/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ml/firefox-59.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "52dcbb17a6dcdf25f6791664a3b0cd58c605a768e29cc50cb6b82b1e84b69dfe8aac9ee533492cf85620521cbd9cc9d7883f0a6f98fb42a72e26a6e813bac1b7"; + sha512 = "b9e65dd54f8b4c1da28f6079938320f9943ff94ea0a0a7857192805ff84b53e7de6b762d05f8a66b6dee9f8586623932c5cac7163db2829fe41a13b3c73c27a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/mr/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mr/firefox-59.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "68fbff994395426996d8481598f4dbbd9d1d599b62578622e154393257682624deeab680544d69fc89eb3eec3f5258e1766563267d4ae30eddd874d28be8ac43"; + sha512 = "80e20cc4d30dd2ce2a7d5c40b4c98271a0c0834cff7bf201c3db8df4bece056becbe71dce7056d24b837d16889cb15ec73be7e853384d88447d9d00eada4fcd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ms/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ms/firefox-59.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "5ed20dbb422470379e4a9746c184560143d39e8fa17d60b346080b800f7bd0cc8a9000bc4c07c5e84f9513a08ba7af07a4425b89a403db41c842940f94603a34"; + sha512 = "ab4e6a3c244a7e1c4683f58252d02865cc9e8be51a2fe189d8bf555c968260dde63af130a491a8c3b093776a1d1d6b883e32b4054c19a20a9d1856685b4cbe35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/my/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/my/firefox-59.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "f41e5e44178e1744ac26749dc47b091eaab5cd6538fe341bccf9f0fe32f87439007df1fa1625652ed37e4e81da1b74dbf0b6597074442aad9057df1ed143ffec"; + sha512 = "aef82a1dff4adc9d93c967ca4fa3e4601772e8b748c3d41a08d2893667bc661a0c640b02450bfa647d35b9c097919ce90a4a4034f83cf4ec51d2341651205aab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/nb-NO/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nb-NO/firefox-59.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f23d6595d69f656fe7c6f2508b16fc0964eed25444d4fe7601f5b2ced86e732ad4cc5e9e8b11744c9cb84652f4447b1138d664815a026e3476c09886493099a8"; + sha512 = "edd9601c678f8f551fa379d7f3c31d2e4c68434d9d3401b40f2945622e6c844993fcf3aaf010ec5b3bc13eb8c8cbe951d76b66a908b4824526b8da368361a347"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ne-NP/firefox-59.0.2.tar.bz2"; + locale = "ne-NP"; + arch = "linux-x86_64"; + sha512 = "6d7a5d81e0551e675d8dee4be7fc0b8a39afb37b74949d408f197562bb8d7866706dd1b9fad60de4410cac9bc91a4ecdb92aa75a60b2fc2e2b7cc51fc9e46c60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/nl/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nl/firefox-59.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "ac09484341ec63241a5f36d96fcb3fad70d91a5ee1dd76c1262916f9a6d955800abef91f74f533521db9f79d9f73e81320dc8486cdb740ff52a84dfb42b2f922"; + sha512 = "3d4c3714c7d1c7d4865bace3827df94068bf0cfa4037af130cb7ce0a5f6cf7eaa0e37d091fb36758b13f52a5307288e5480ddcae50bd8645cec527481c03d7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/nn-NO/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nn-NO/firefox-59.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "df79f4edba46642470d7a63bba6095540db649193acb36573edb2e53028919830b68ea3240d3fd6d2ac6f6eea423af806e2935a6158b1f2647f06cd72ebb2c2a"; + sha512 = "753e792e3402a5b75043899a5f50f5926ce31d2439ee1eed16193932e962338cddd974194ac94f7aa1ef0df548d95f901a50988abbf9f3e9820f89ac372e39d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/or/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/or/firefox-59.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "990c0c81ce39d2295e035b03b704245fc68c79be7a6969fa9f1229eaa1e4a2f8dfd36bbc532b8e8809204320eec793754dac4941dec2be86a1014dc7db3d4f57"; + sha512 = "ac0068afcdd2b6bf5416298e1be065387606bb0b79cffa364aeef9011535ca5c155d1d28fec0715a648f065628efd2c847f47785ac7f27415ceda1902da1add8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/pa-IN/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pa-IN/firefox-59.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "ee7055df27ffc800d30833468de7fa7013caddf19ed8bfd770ccc456069c8076a9fc307be5e320dae3476bc17aaf9095e0d4c8ab2d306579dc7a2088de0545e1"; + sha512 = "fe77072b374c34f5026de80ffae16fd4b30705969a795079ef9e81dcf66dddddfe01287dd44bb4f0001427935671d2753d22a8b80469f9c4e896e215400dd9f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/pl/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pl/firefox-59.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "83d698d4a1e4808ec9d5fabd158516e4db9824edbda5f17f85cc0473f033900c86b9a2119bb3533664e29949fa999761bea2f47e61325e37344cb91b86746772"; + sha512 = "e4b05ab04418e65880f989d642478023bde4ba5ce17627f806b223d19005b4e6825d8a9d5c532c878a397b3cbd8220c4aa4c2627b17b83fd6f4acc395c0a1923"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/pt-BR/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-BR/firefox-59.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "be1e97f4b7c95615598e734f7e09778046e2639b336b404e4b4dfcfc47a2fc9a50f95836dc9b4ebc57a84ca47ae8fe783d352992c6d1dfc256a4eb85fb60bf39"; + sha512 = "9d67c1264b90dc58ac62fa094792955b75724791b7941354d5836cecf2c5c13ec279cad12f93287e524f0f0dfc2302f68f7585dd783998630007dac806f7e2d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/pt-PT/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-PT/firefox-59.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "b3690a9c0e0319273c2f0b2f20eab8b296321e55035f83082cb30581c50030bd4f04ac2d91aaadb9c94bb4c6aa397ee133856c0c322afb884dbe20dcc693c044"; + sha512 = "a241e003b6d1a3537b5232fc793aa6dce194433028987753bbeaa5c21cdec58b326e12bd4136656cb35bae3cdece5dac100f912151aeee7548420de2d3875e93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/rm/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/rm/firefox-59.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "2aa88ec2aec0f18a81ba3db642ca2ad7ec4ef522950539a5238a7ddc1779355749f890852dac03678ff2802423584b671c0b10a7d4d3bf67f333a711bd9792e2"; + sha512 = "87ada5bbfeb43e3a42f1eaa44c58e025f66ddce965e1c97de8ca0df190ca18106eacd2d1f28c959a104e79df583672206c047eb79c51a32f431f8cb6fd68bccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ro/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ro/firefox-59.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "011eb6813084b482943237f6ea354400dfd141a17b8415a6c6a65c847b699f1f4f1e3178201014cc787090f88716f3a7d418e080f57df7e4071ed70dc12eed26"; + sha512 = "97c5d69e1e40bcb779ce058820b0a4afa4000b3c12170c63ecff1ad4b5994f71ddf36c49536280edefb971fafa6be52a3b436a405ca9a1762aa08d2cd61022c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ru/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ru/firefox-59.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9ca6f6d611f0ea2f9e866aab1b62a648114ad35baef2624281d7cbd1da70e7eaef5371d37ed4bdaaac06d90ff88a5b68bb0211056aeff12da35d9f0003eda47b"; + sha512 = "74fb10b42eef3a2391aeab0e3dd1ce463b58cadba5c42e2fc8a5e0bdb1f9df122aec65a662c9ecb8a14b1ee76bb060c64de93f116a37d207b4cc0887ecc0e2bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/si/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/si/firefox-59.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "171ea0277b6b96b63aaab0b58eaa401920e7245f60dda6e8b22f7261e788626e6a00f34b6e549def0e09f796a81b98524c1009b4053f11743311717da3dbab2a"; + sha512 = "d63503345ef7896e9d9a3ecfc80395b6ced67c38b02c19f7afcf94a9efde01f3ac53f1d581b8151d78eed6c7f8eb69f9edccaa3be49133aa3abf2a1eb759a02e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/sk/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sk/firefox-59.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "402330695a3ba72b1c7b286862b7cdb677799b2eb3d2e2408da0f7e2d1efa1f2fed197d15bf9f18deda19fac01fd91a89d63d535b859b4fc4a1796e7d2457564"; + sha512 = "1020baafadd4a1de8118bbdf4e281c704595730937d3aca9c8185a6ada54f4a72b8efcc7c493200c32a6a11e7121ef52d7aace68c47784eb5d17ed7fdda32d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/sl/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sl/firefox-59.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "840a062dfd292f27b9aed42682c326e8326294817c44b5269e6ff53bfb7f639f35a100dc031f321f4ba9d90e468eab1483118ea8ded4084cc7df927bd8d2731f"; + sha512 = "a93e20498b5b3a2b5d19197bbeb48c4502217e44a25c48372f8855a49f762e89438262ccf5dde1fea24af1199bc8cc5c935b1bc886e0bb581d698d10a59d60e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/son/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/son/firefox-59.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d9e8e3490147571c5fa1418e44e9d2739ad3d3efb303cbfe9afe7884af89c4ac185abcd7e2514dad09c880c9a134c1aaea46cfae01b10ff36a2d01e54658aed1"; + sha512 = "24411644b553e6f3c305b8a893a7bcd4ed59568a6fb7001b999be114a3e88f30d40ac6f3351c28b3287bd2a9e6aec461c54433caa45fdd349aea07e83401fc2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/sq/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sq/firefox-59.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "996a7e70c32ac0102b087fa11b269f98166a5f53bae4d075db2602e40df40f3c4cbb4b73015c626ee0b856b934dd5da7171a510f297d86995e182632a34f65b5"; + sha512 = "40ec8fdcc4fcec937a710e5d19077243d0ff5cd832bd20365817e4f4ff1cae5eeb2a664906ce7f60a5184fb053735df5825ffddce41276797fcce3a11548f4db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/sr/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sr/firefox-59.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5af926ee5e008b4192af127fecbc7f841886aa0bf9742bec3701ea0e954edf36a605191905981ab5ab4d1bc4dc16a27adce74c05adc5fa03295a06c588e1fa4c"; + sha512 = "e538596cf0de4a9d8af4e801d7c17d00c1e63c56775cef0d087a77e320cda2269cca74f0c73f679208a184c6cbf4b20c56d1d222e8846f15fc4a91c16ae3ea5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/sv-SE/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sv-SE/firefox-59.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a2b860bcad1b1ca27b3e086333496c0a3bec5ef12d138765817445cec52f4ca6e5580da5c60f1182676dd577afeee01560b50a15fb8399ec84d97b4c3144c58d"; + sha512 = "3466f482ec04f5e8827f437c9456908f04e78c67ffd299b841f2f82cdc2c38a61a566c8d85405312c144aa5c45698b5f6e81190aaee739adf4384f95c81f9e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ta/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ta/firefox-59.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8c379738b92b525b9ba166d0b40a76d1ea20d2c756113588e6253adf53c62d4d0d5657162bb71a68c449553d127b6ee9a2e77ace547f29558072fdc2f5b0d779"; + sha512 = "7598994ca03afb1c2933b640298453a618d140791fe20255789081babb0d9788c4f3ab34d5ede82e1d688f5dc0486fa0f842f1d125dc5a955580d14b1efb6489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/te/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/te/firefox-59.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "90e36b08e06bfa6740e57e31cdc44e250facb4d85927f74be61beba13261942276add3abafb5b57c72126e7dbfbd82541e38198c605fba7157e9714917b5d854"; + sha512 = "759be69dcd9b795f7b1b8192928e27799061d83d86e0234cd2a1fdda0d922a7a9d958b19655bbe976d409297f2e2fb2d2a6a525f90f77fa53071d510ffdc6438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/th/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/th/firefox-59.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "698d255326a277ec4dd92f9d91221e04794c9f68c1ff9b6c1b1254afb32220b35505df49bdd66f14fb044b6747295cffe15bd145ed8bf9d8c78cdec69ac86869"; + sha512 = "a46d7eae4a2670615e100707ec3e340d48502b63d6f6f98d4a3140c1bc9d0826b44001bd8ef940c4e786ba5d3f8a00e350faa18d30fcc7663f9c29f20e7a20fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/tr/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/tr/firefox-59.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "de399243e17cf1598467532f2cdda5f87569f07956cadfcf72806e1972c0495a0da11b6cd8a3823076658ee5e8b56ae1e6664296b0e06f9d20000001f216605d"; + sha512 = "ec5ecf9c76315d1fdc508c94023cdd60edaeba44ef6ee49859ba0689413819f11f54c9ba787000a166b0fd7f628e3c2b42f42c9014f9e7823da257d0abe88cba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/uk/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uk/firefox-59.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "12cf4c40f3f8b2040db20c72fc0a604fe79ca328197ad05bee4b8652ed7769238f15d5ed7d026dc7d51f35c76067d814d873b96efca7a641701099f49963bf30"; + sha512 = "430cbe8281803ca0a4e124fb62a8d2dcafb751ae20441e22dbfd45e544cf906371eef4889f16df5c1be91a4eafa193303e053f75ff15fbe82a836df3ef19a5ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ur/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ur/firefox-59.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "8524c2e24d48645d03b3f6f60c38cb69d16f8d9b665517ef86dd4f1d79d1a83301197784e1e27cfeb9ed0e978c2dd9a5602b3be3c6cf6fdb2e51a0d8f4bde264"; + sha512 = "b293eaea548f8d1e96087e111e96fa35940254477599a3c2aec9bbe005347cdcfdcd79f9e3e6d22829fe52b091d6d18dc04ce768724f9709a6e397838974c45a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/uz/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uz/firefox-59.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "930df760aea0d9f40414e7d2025c81e3e9752e5d338e0799012b888f10fc5ae2cfc4871a49502bd18ccada0a64c3381c3800bf851bd98d61f8380be2db126eb1"; + sha512 = "dc0a6b771469b89cca470a50afe47c642fe6bae284599c876c51c2c5834147cec435508c101f33d76d1e4ce5760f52f3a59592495c82db314de426a9602097ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/vi/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/vi/firefox-59.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0e8fdc9ad8aeeda7ab905a81925b8cee9f3aae65516d34f1adfe9e5f8cfe1d392ef98e86cf361503d4d2dc21ea761f878595237039e4adcec2609800ed52152d"; + sha512 = "6f7b9acc584e41be34b884da9b9f2d7aae602958cbac9843d73dada11d1a584101e603f9111c24983dc3ca0b70462091cbcf755c93b7811469b179aa2b3ecc60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/xh/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/xh/firefox-59.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e4300974b54297361e3e43a20dc790a1ccf54c23d6cf10eb9d8bc4e43347399d90c7bc1e9eaebc262a882250a38ffe4d0008b69426d2179d50dfbc2970fbcb2a"; + sha512 = "7623715582708bf3e18ce924aa6e1d0fc6c8bf38503691d3ede092070860db3a116b2f39ee1e467d286e0566bad594679b489b39d2c5b5885321982689b8a56a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/zh-CN/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-CN/firefox-59.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1647f1f31d0bae5aba3e2823293abf755cd5108f8bbd9ab28c5d2794644995fd394c0ada3b28a2df3f3903741b5ea863624b099c9a99c8714022813165759093"; + sha512 = "9d0e41df6cf6a7244c4aa29913ac664c67463ad50b91ffa1e7e345601eaeba76d8553523b322ae477ef0f0c5fce55ad2e1cf5bfc5fd777d9433ebedcd2474d98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/zh-TW/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-TW/firefox-59.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "55ce566e70a1479bc81542b6205724febad35f61a32a11124558af2132881f0cea6b52d590befb2835fca4af6d31d0ee44c8e55ec2809989a247742c062c9241"; + sha512 = "c65832ecb353527c6b9e11dacccc9e3d1cbfbb16db1872c8afb4472f632a0e2b4f994af43144e430aa8c8ba6aa6a579d3c024c9111fcbfa6531a4b2b7377414c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ach/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ach/firefox-59.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "1b9e00b08e50a56c2531656e7deaf3cfbe87928e634459f9c4fb04c8a206457294e16850498cfeee0261a26f4303f863a51bcb025812c8fe1620307f710b1a23"; + sha512 = "468b25a5e90b385514b0f486bc3fd09a1e7c8c7230b8e31b04dc4bd18027396078b525fc5b51c9747e642d1bc60be49a7e2cfafafd528d95f08033abd12b0757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/af/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/af/firefox-59.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a0c9190d0864d4424be8ea703aa9f5b8abddcbcaf66a0e38a2a13d991ae34a62e926ddaefceaced72cab6c1c03329ca76279051ab40ebfc9274fef6658bd4336"; + sha512 = "a3b92e792d1ef58e029fc097eb354940094c8a94da97dd39b1f69610ffdb9a1a6527b01da2b6716c6c199d85886b6e05aa084bab30f8a2d0ba33ad4c2f6c36ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/an/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/an/firefox-59.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7c1f7dbed7e600fba0c24e0426c53cce1bad28ab260ffa5461045485f1898483127de4622733e9694dbb06af058ef7abdb77d26e3f7297c856d4fe254eb1b18b"; + sha512 = "9fcb76d123b657b9eb7c62c53c703ea27afa2f41b5107cd67dc01923ffb9dc6d3f334f5d801058f05925b18afea289eac03dfc3c2b188bd2059f4dd0c40710fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ar/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ar/firefox-59.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "0d945bc6df592e1ba2cbf6183fe40b2feffc4b747312860780a99be3e4fa9cb1dcfeb18f2fe21a3b4a5f4c382040da2b292ffe45a5869366a67dda639e2bb969"; + sha512 = "eee65b88c2269081dd04fbb37d360b0738e6527581e60dfef60093719a3a15b44d0d594321b4865a35784d2f378e8d86f308736d8be76c1cb7d39152b916bbc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/as/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/as/firefox-59.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "7a28131e997812f9689ca7afd63c3c72f9ad324e996eaf981e066dd8f125895813a5bc63a97f83345d73e04a7a3e0538163f9d7c878197329bdd2e5684fe679a"; + sha512 = "f2e54d00258b6f1c55bd8a1deed5e9c9b1e6f1579447ad832f348b50bec8fce66e50c78b2ee6e05c885359a6b2b1f9d298e907fe99478536967103708143f24a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ast/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ast/firefox-59.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "f0b4e167696f4fa02a1e433914636cbd3d9c3ce4c8c3c61410b54670512d0c7d0c2ead7a1ac880181a6c5b5db262ab5bb14ef10341bcac2eb4b81afa4367bca7"; + sha512 = "4f23798708447a4a3801b392a2ac27207df7d2b722291d3836163b3900c7745404399cb700873cf6afa70121c429ba31bbd8b0b1f597e8c91b2f970d0d6421e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/az/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/az/firefox-59.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "71c2313cd4c7f809e9ca4d999ef5a2f8311ff6d14623c76ac53ed74bbd876c816f5d9cc56145f53b6c2a64d924945038a77ab23047b20e866f9ee3a490cac77a"; + sha512 = "2f12c45870d5ac1a6baea455bda954cf3b112b0a3b46249a23b7cfc064c6eb00cf0ed2952deb220777cc084fa2345368b95388e143dad6e45042e7863c6c3038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/be/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/be/firefox-59.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "d38d69409618e158cb926c21cff4b30b0e5e6643a4f955e5e16d975d8ed23ee7e5589269603979f9332206d19b676696fb2ebef6cf916789e9f016a2945fc9e0"; + sha512 = "f70af6a6f464b6098802e65226b198f670e5d9ecb2fd56f9c375cabec1e602211c4cf7d80e430f961bb56694cb1d546aa116c7a5aaeb06d13319ed41e3e69ddb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/bg/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bg/firefox-59.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "74c9b878c937b29062d8a2f92a89e5e3197e0326a1f629b44739e7d896d753552fb12045b5369881f0106d50d231a56f837fbd2363e2e8f8eb616e61324c1eda"; + sha512 = "87377e96a52ed8866be4a3e6ee9c20c6d8acfaaccb53de0d2a4fd553060166c20b3677a2cd3322523f3b3f7d03618e6a6c27e485113184698207cd4b88b7e699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/bn-BD/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-BD/firefox-59.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "bd5858cadad888d9392c756eb7c88e4dfbfc42f71459c2a10b992b7be51a08ed22cf5f038ae93b39abf298c47d7063e2dcf91148c080bbb2d56187cfa480dd3f"; + sha512 = "0d275fdd76d8ee85615f67a11ef46bbf8b718c54a09cf6f3c7f2336098e0bc282caf429a4b228e31e7c3622be41f41384af174da9fa856fe36dc46271f55ed1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/bn-IN/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-IN/firefox-59.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "ee30dbe25537c8376debc9f7d0012034ab05a9034a03b147d242d0d19a2eb31990b8fd68fd14807ec92b3040e469384b191faa002dc8e9956ce4eb8aa79274b3"; + sha512 = "b77374481f21f37e246eb325ee41202fed9916ce36065a88f51e28fe5a015e2df341417b3420d2bff0df93437a56adb4e1fae0422bb094918a19157c655fa34d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/br/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/br/firefox-59.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "435225909135570713c333887cc0a31667261710ebc05077aa96d11fc6a9506c8524eab15e6ce09b125a57c25447d8f107556c3808fdccc794714a09dc5948c8"; + sha512 = "ba071fe6a668ebc7c00baec930a568a90d03c866a0b5f0011b25e8427f40fd32d54fd770e94610da43775a882eb27eff6359c67d65670fa0fc6179e788cd1394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/bs/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bs/firefox-59.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "c702e9f765010f1fd2b17d5790411e7322e78e8b3e86c41f1fa7667e953f805b46a2249e5ce35f3c58dfcd3fb8a93fda6ede6a04284e9d9786bd912c5d5ef71e"; + sha512 = "de70dff3aa71422c96e17e637bd56c18d4b74c8cf1ef5834f1f077249f6d7d1e95703f55063737b464916b2aa87eb4469d197e3fe772d168d184e72979712e65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ca/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ca/firefox-59.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "89f93e3681627fc3b170e48f8e2e133609a91eab9eb9026a280359a49d650100bdd482ab0e28c89b80b9a751f5fedd29cdea27c332a5d41ca0d4567f81dba828"; + sha512 = "e197d847b044a9ff4e09b67c64a2e4bca5eb2a1770ed4cd9ba965342106b7ec809950d611367308fe2c556c4b413640f050cbbaa00532402d71b59d51c4b60c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/cak/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cak/firefox-59.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "91c822ca0be8366e452c8c40558f1f8235a214c6925dc36e6ab7ebfd93ac158be6a71cb424d3f99ea169b27466a44feaa4621af7ed48dd6681f4035948868b27"; + sha512 = "a716ff884d1d5260b9ed830877223eff731ad301c1349c9f1dcfea5b9dbed0770269c27aa8a336516270386c4b896a87721e3a5e433e92bd579e0d88311271e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/cs/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cs/firefox-59.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a75ed999a18061f53d3ddf7591b6c342d7eafaec68bb14b0144fa790d2919e1c0426cf46e6c1a30be568f9530951f0b42e65ead2a35dfa747d72ce5feb63c5a7"; + sha512 = "d66e5f440b2bcece18013499129462ed20d85d9b27ec803ed27bb7d4302d2369331b2320970d256b6e61ba77d93e362171ed012843ec926047c281223218a25a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/cy/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cy/firefox-59.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7ca858d8db178d7e7d2cebd69ac4bdcddd76da3fd893003fc90d24fdcc41329526b3c2cb5099b1e0adcb078a86e1a4e1841376b907a042547efc7870d15d9fb6"; + sha512 = "87c2c1056bb56b5fc3d1fa9aaf8a1d99a5ad5558016b3953d0dd1f7c70b989863fd1d66f6a8d7a0d14fff351dee8f436b89d5dc593e610721068fe187055aca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/da/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/da/firefox-59.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "1895d076abdb32096a94b8f74a879b9a94b474d6a9f12ccdb5bf6281210529cd2df3b28ae4ec243f79f79a537f50ff2c6e2b99ee847ab799d1c4763942599394"; + sha512 = "6243867a2a5a7a30176c4698888e7998c35ad84790a75a86808e6490f013990890a8137579928573564ac7dadaee6efe921579423773a0c25aa57db17a216eeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/de/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/de/firefox-59.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "bcf7b391d1bf74b9440455461c68736490b63484f842efd9f8e631430e480858c4b3c540f7072a163f56cea32cda75d568de5a957474a90b923b837227a78cd6"; + sha512 = "d21c6a44def103db09a072ad72fc42d3876fee9095c5b660fd491084301e2d3bbe383b4c7f9419d666dbf280bec59743a034b4f576cd618142dc7f498fc69e5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/dsb/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/dsb/firefox-59.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "1d09a9229db6879710d36b1e7c9e2aa606fe837e69f0107dafb7c1ad18b4c6cfa0540338aaad2c404f739d8060fea7c317a691c695ed57eca8220081ae43534d"; + sha512 = "34446bdb17e81da9ec3689eac248b2ca0fb11ceff7a153bb502a5e0d62a16d2d4a090f9a29e4ff61ae1f87ec68f2fef94be53895a409678d14ad99331058495c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/el/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/el/firefox-59.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "767fd415fe7d35ddb7a54925568c334ed693d84208ec2338940e1cce887b80fb552ab51c0b11b2c29e2bcc41a5d8663b761529e5d44e652ad2887fac9778c31e"; + sha512 = "f5d73ccbe24e30eed81546b6132dc70f08feaac68dffb749ecd7af14052b343aaa4de7bf0ff73924b28b4c5b86c29ca1f6a69caf85ee77d4c4088b925547825b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/en-GB/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-GB/firefox-59.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "35e7f16f208eaa6d5cb3a3135c566913bdfe7c9e47aa5c68afcf805ba64a368f0fee7791b85e07f151ed7610ec70a78b457d047eaa01e2010210bc6885d5bfeb"; + sha512 = "4dbf56a7aa86341c2d08b799d76c7e0dde04d418539657f74e18a088df29d390ee10b60c1b9625bdf46ffc4f458b6ca3e86aa93b1a2d948f10b7d7bb6ac250d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/en-US/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-US/firefox-59.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "4d257cc3fba63195c0d74c1ec5c94768dbb29d5f86bb6e9339af4da20bab24000573b33103693cc32f003d974085c4c028f525668cd3e62481b97d2c665d592a"; + sha512 = "15e93c9d069d0e4761520cefa508fdd7e06cca979ddb9cfa1762d70d104f5758fdccfecb531c6099f9372f112abc88dd273a29a67f720cbfa1be5c440378363e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/en-ZA/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-ZA/firefox-59.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "4fde656e27840b0763cadd7c833873b5f012f920ba988953e864a89eaae2fe70482ed32221cbd6e9fff770dd4b6b5d93cfcf5226f70a26c12a3fd66abee232fc"; + sha512 = "772ca9b0318e1175e455d2243ea537a5bfab8d84541a7ee306b3670084240b9eb165935f41ef874650c3b1f5e4632ad2d5c0bce3f29a05a0676ed3ddf133cbd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/eo/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eo/firefox-59.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "2aa40148adc4a0997d370099b2a624b44d4c995aa2d150c8bbbb91b9bef49f5424a572585faa3f0756588b6013e7369d5bcfeb051ce80182fbad175e3cac2905"; + sha512 = "cc3c98e80c343b065ac8f6af6875d1b2146113303ebaac42c5866d03ff254aebab2cafe398aa1fe38ef8c9d4fb8ece87345e09114145e06a2a7d6c783f1ef601"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/es-AR/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-AR/firefox-59.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "da078fe38e47025e9130c0512bcbc31410a8e42cc32037e462b7f5ff185029d160e921577e31f52fbd3e43a1962a07133e1fa3f24f950915bd456a752bd8dc0d"; + sha512 = "fea909cd16c4558ed05602cab2c3a22186d727da969143b77deb9515ef4d87dd41e59e7fc6a322e924f0b809b6205f37297576106a50b5896b4920cdab2e4749"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/es-CL/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-CL/firefox-59.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "bac5ec18e2f78fcd67533bd8c3a8483a2234f40a9bcfad66ba7772f9b896d16fd492a229e359ab851db829c37cd72604e209cdc9825670301411e5edf5a0a548"; + sha512 = "5015cdb3a1d803abed9a143fca7a118a239e37a38a65898de7ae60981066113f270260fe8e9b83822385115c2b5e378cc58ed68949ef6297e0f7fc1e28c9c8e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/es-ES/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-ES/firefox-59.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ce8f14d68c9aad9ac5d92bd8793a8a07d7e4e08c4ea57ff11511a50a2b815e5e3844fa0a4ea5353883db071789eb61a011806fdd8c45237dc48d678ffdf2f484"; + sha512 = "81fe49a2f31913c030cb801180daf730855dedc5f6adbd39d7d1d8a4b359a3aeee063d7fef0ce35641f163f5f8c965603bc549a1ae3b2458682c390d16a0faf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/es-MX/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-MX/firefox-59.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "3bb2f44e0a00ce26c527397c639dadb7c9c459e40345359728876eec23084463cb89383e27c97c971dc9a1b0bf2fcea4c1fe4ce37c84d59265e0d7d029cafac9"; + sha512 = "24bff972bb2f27530b18cb7a640f2f85190977725cd82b1e86c1b47578f1d3058fcb7387d19cb2e1dece49b72c17048829bf6a66aabee2592a4b9503e3c4e546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/et/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/et/firefox-59.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "948a05c36edf1662ffb6af1ee090b85408a739b330b81ebc4705ae2fe7803da209ea50bd36da79b48691061bc1eef66213e3a15dbbd958a55527c83d3839210a"; + sha512 = "d60b637f9d78a2b9e53dbab8e6db27aafa701af3cde841e056158d3de53d1c0c1032c5381f7c388edf59b1476078e0dc8166e82f39f7c006fc28c5d897f0e1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/eu/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eu/firefox-59.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "5f994613b3d6f6489c6d9b8fe13a4bcccf93d5663cc493b22d902a0f34bc1a94b7913f3e0e0d5af19b451f44d8a7117da9588c6fb318b610aa306f49804af2a7"; + sha512 = "47ed51fa6f27e8b7bd9dd0c3556af3d85e6b004d5c6a5868db8c844ba97a06eba4d3998295058ef92c4a49dad31fca0a3c24b19603e1fafccbf6b7d461596080"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/fa/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fa/firefox-59.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "1fc669a66daef43e94e1534d0d25b55b60099e60c437761c7f623529e4d5d39975de0629ecdf4606fc3dd67ff19092e59b7cd14d13426a0c5fbc143c1bf158d4"; + sha512 = "8919e1daf708630e397200f09b3e9810b3aa40feb87769af5e1f0ae44ab49c63fcda1982cae5ac4753c600164b34f533054e055293a87e5a8fcf55809cda61c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ff/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ff/firefox-59.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "5745915b80c46e983845be25a17ac07db8ffce0b688dfaa5329855ec37839a4f00cbfccdcbc88862d51dd97ca7c54c4405190c1d2fc05426412301b3d576f5bb"; + sha512 = "b0a6f5a974750f3ee5b485872d1e7c51a3d894c4118de139b718e85eab94624be302ce2603233fdc3a75df3f12242d4d57c9a96ca1f429bf9e0613d2b299ee86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/fi/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fi/firefox-59.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "5ff972e73f132f11684bae62a52ec0439378442b578c96d55a1768e45cb2cfcccbcfecd484cfe1297a956f8c6be8a1f63308ebe3e2c3f7b508c19c5485a14cbb"; + sha512 = "7dc300de36cd860d566a9b84de0ce2c4fdd5eeda4bf641a45e40779e98087c7dc881d2c623c99f8551c08bc84b98b1ab4547ab8144b1a22795710f57112285c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/fr/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fr/firefox-59.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "f7147fcfd193b58d0e777e3563edbbf44a9f4b299ba5e8cf0cf2c6932a69ed04b5ce35d108049175680ca5fe3e5c32a3916ec32d5b5b647f4a10e12ec1161bd3"; + sha512 = "ff793e4873e8895259b2657d613513404953d27d81bcb0c26ac97c3c2ef2c1ed8db3ec909ecb744dcaa7d194b4fa0660885daf96932270f1382742dd55e0f5b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/fy-NL/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fy-NL/firefox-59.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "4a5bb7f0c8035a4b6a0286f242b65e2a025a55a05fd861da84b6e11c1d33756f3c5e831cb665608e1ba403d7b24e7c3a2b51256c272fcd3b8c5af3b8ec17fc4e"; + sha512 = "cbb9bf54a401aad2bc8bb869f8680ee4c00e5ae206ca9b7db732c955ee256e4ad226ccb8ffa320cb3e08aaaa787032b3dbed06aad548e733ba43ec87ddb52bb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ga-IE/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ga-IE/firefox-59.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "d93e6a13384110eb1b8452a9b890ed63ebb96bf1044bda8e0b58ba6c1a19b77ea8e41b4275e4d6d9efa327a6f3d95040336e21e7e6b1109fa2f961409944b40e"; + sha512 = "bdfc3de17be432cb55219bf3f2a3d1371f3fe4776f452a0fb37ce4f5259fadb46487778ec63f6065dfec2cce43758be2e5ed8c5f75394f1604f3318e96f56363"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/gd/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gd/firefox-59.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "d0a1a5f637e59d25a4014be203142ae31a976eaee97591ab3d7a50593c87e235406ddd2136364948c17ee2de9cd8739cbaae6ed817da45e199f81072cfa1dd30"; + sha512 = "008548e75853625b690bd92e60cea25c1d9b302f7f78f42fdb4536413c10b8203f337c8384b45c3c9b729e6541f57a22e12ba264594ccfa82742373df571ebff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/gl/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gl/firefox-59.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5cfd266d1e9ece838bbd45d6e4de824e8956325c097c9c91bf22ceeb31d5e2e6f4f6b2f14a1a124b91d2bec054f12f0aa57ef4c4374bd5d1cb759202d6767850"; + sha512 = "212ce344a4592ff36006e4671c29b7a4734e513d5267c4ed0e7c50c6d0b794547cb042d543feeb55a48ced69bf001670683df159354f152f9d45786cc7184c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/gn/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gn/firefox-59.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "b1fa5b9960eafd78d0a9e1e21f0a25cdb527ea69f088db035ca1da97d3b785a570070b0854b368cf73758437acd3047efcc87e1c7295d8cc34eedc93ff340968"; + sha512 = "6f60fe0c208b6447b4ee9f8c550805f070f4b3209632de91fd0a60853cdba70aa9e6653a29429ea4686dff3ccfe5dcc5a1fedd6495c7d7c38b623f31c2cfe19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/gu-IN/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gu-IN/firefox-59.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "d86f0baadd1dfe89f753fed204cff18867ced55ee0acdb8228d821a8f324da84df2bc79a75a7e50d6be0c3b1c8bcd4e02f8cd2adf66067ce495e0e7b3908fc24"; + sha512 = "0ec6bdefeffbbd52655d332b9c21be2b372f6ee260684cd28216679aa1af267d0408d5ba641a5dcee145b80c357936a090700427520f9ee7d712e20eec13c57f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/he/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/he/firefox-59.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "da29910b1c43d71a674268ea2f8ca2d5345265a5226dff48292da471d340fa3b1885232ffe93af61148a93b6da04563752598acbdcfabed59534657788909cf8"; + sha512 = "2a4a76c674fd53eed5a73f3ef5d143138752e9d52db5c69d56fd5d0dff1c19349afba6987c4736d53391bc602245c1d4ac9f5c9b60a0c1d561f4162c859ae3b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/hi-IN/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hi-IN/firefox-59.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f76ad192f1ba83f29f99b0dad313660abf85384803e3d1ee8164d6a917e30b3eec12b64b8a475c27b21134cc394102ac934b283102129947ddb63da3bb8608c2"; + sha512 = "34d932f073e803678990098623149dc0ea427a70ed3e604651fb622a87404ddaf25c3a79503f4e343315101704f5cd1db058a262ed47ae02eba85f102a64f780"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/hr/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hr/firefox-59.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "5f58ad50c9c287f3722447f95631c5e80523332c64dc7ec9589a669ae68392abc3a7e8ec7a1f822141cb94101ce437b36b74ccf07b6a9535cc659ac5cffdd101"; + sha512 = "474f5d71087f8eb2646750bb6a14c993b2d3708234a09b4ecee7b43e2ed75a8b9d249749f16408751a019b9a32ed8be57c5d61f9fdc36ad0f1e7aa7b5863ab9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/hsb/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hsb/firefox-59.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "236232af403496442820285b817ea1c0cfd6a48cc9ebf77cefdc4a242e26248e055e5e6dded371e27257d3d1155f2a45fa183311898a8a386308c0d1f2063836"; + sha512 = "9b9127af72f9f4d780714c41a54d26ac3e8065c8ec42e0ed1318013896a3e8d920786713c79ba626f4930c92d44f2acad72ac600b5735122470fa3e3ea317965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/hu/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hu/firefox-59.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "e053b499fbf7e4b134f5f1035377e7c639ffc5dcd31fc5df2192733360616b8f7e818e58befb4f597d101d22b2fabc2d550a9b2872205059944b0639270987f9"; + sha512 = "cec7b19e6e3fc11708c4b67105b191433880b53da8316fc8fa4d6af9eea23cf17423bbfa2f6283490815ee5c7ab33ba8e66ee7bdc201e3eef39808db34d572e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/hy-AM/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hy-AM/firefox-59.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "f6fc4218af3dff916c0117dc6c5fca77fb84ae24d3b39430007f1e1468aba74d2bc6340f3bd48737bac5de0cc76ba01b15875ccaf591691256128e473d495767"; + sha512 = "4c25802601dadbac82dc260e329db69dff3b69d1eb9237fff76ae6de98a00a79dde0702d4cecfe67016a26e2a7ea4b1f15ce70eb82f422ea3bb8afb9810313bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/id/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ia/firefox-59.0.2.tar.bz2"; + locale = "ia"; + arch = "linux-i686"; + sha512 = "99b3d9c4533d376ee7a9f8fd364b9b44a8f0b9f235346a60755f144fae4550a6d51993952736b58e28ed3d07a549cd1d2da5223d7af28f187c78b41959e5d733"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/id/firefox-59.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "f78efcda46d3f672fb083329f810f174eb5af1da78f601d76a22ae3fa02ad412a383845368d69938fe8d6b3e4e67a86aa111187fed6ea0d8ff4b40f622ebba63"; + sha512 = "27275c8e2deb6716c8492fbc4ff56b8a2061be51101a2a7085c0a4bdf35c0bfec77af1f650236d13096ad204b93df695d5ab238ff6c312f9092f4d8adbc8d431"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/is/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/is/firefox-59.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9c73ac9d89bd7a45b338b74c8cafac4b27e46bd6bdf8162f21ed7d11e114202b1b5b6789ab1c4a6edca65af257b73ae7a962c9d402e4e59b5ebe08437a3de242"; + sha512 = "54b6be973aab07231843455b3e0adf8f7dbc19ecd1e484795af7d6a3e346ae717621d0950297379c88a955bd75af0a19497f55015cc624609510fc3ff7b8355e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/it/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/it/firefox-59.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "03b905de20e336a49372b51e9e1e977e861359f8e9f515e19151599bf27769cdfe74567e041f3a75b5c8039066686edaad2e2899a3df46513aef64d2963024db"; + sha512 = "bea36ccf3c3202bb41d09ef07cf4a30d8f3b7d64a96e4955f1e62c6ce1c252726991bb3dbd1d41b840ad7d626ca2abc83eca59a1997325d0f54231daea95ff06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ja/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ja/firefox-59.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5769e414b18f095b5f1bc446d8fc68bc16467683f44f4711db9b6d6feaf6d60b801b2760fe6d046c062d30ac4ca7e08d633484a79c64cf218c4df8380d7c6abb"; + sha512 = "bfc409fd6487ff113045732d1826589f8020597958cad12d2b821f496eeb53e65cd4e1b1d002527f6255350254b60a96d9d04c47bcde8bac89483b04270f5b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ka/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ka/firefox-59.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "244446f400a8270a1c01a3abe73da8840d28e2660233bc5f5d34a654fe78099d0634d7a927c2b46f2127c5f0131acf5f5b3c8518ff892b0b3832b71af9df016d"; + sha512 = "f62ff3d950324b140238dc9e521e6a038a64dcc22c2679b36b59900b0f58b15d774084fdea7a1f82125a7d09d1b5c831808424e63612aac9e0a61320f6a3e4f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/kab/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kab/firefox-59.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "da679fa35fd7454c820ff5c2fd461f545ecad30cc13891a026244ffdc92867cec7aad71e53a32f98dc06e3679d7571824467b4f6ab70896167cbd762f71113cd"; + sha512 = "573b7cbca69294ac56fd714308caed1549dbaff2c3716887765cf968c20d0ed37b1e0f2849af2481ef237d7c617c6641c42ecf0337fb0fc18afba82c89def034"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/kk/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kk/firefox-59.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "ff79b1aa99c452e475b61d7e6c773c8471fcd04d8e9fd3eb5427ad1e09db97ffdfede5f706b8c7a5fa82aad2e89341771318a36be55fbe1761bf4dfa4e944295"; + sha512 = "0503e33fc8716dd94c455a0a6201334ad2bbe1f3ad9cbce057d69ec77d65bdda48a126464335cee62117b3638be636e8f2908a003951dd2866908c964a9f889d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/km/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/km/firefox-59.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "cf073c84edc57468a28fb5a1d7c8efd1a7ba00e09783e6660374423a466aa9260e314d6f94140aaa3d5b42985fcfb1295edd0cb3b093487998eccb516c6f9220"; + sha512 = "15797d366faf6f4daa60191e4c91cd9feab242e0879204ae8114ca5824a78fc42941c79d190526e1387ec28d2c150d008d4f69c78c450fa6c6aa9d3cbbd151c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/kn/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kn/firefox-59.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "8e7727b77e6cbcad8c5c87aa12d983b18ebc79dca7b727ce20320a7e384b23281968542eae9ea3207cdcc39d2eaaefaf4c90866071b08f9f944c26e6fd6383d4"; + sha512 = "53908d7a78feb6b4ac8365aeacfa7cc845af5f324b57e0fed6bce78eb4298b316ccad268d022e9adc409eb9be49b9777c7f01197dad4ab79746b8805877c1706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ko/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ko/firefox-59.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9f7db828c0c1525d30558b543ac0cc6306ef34d83ed6fd3a25f5899b3fc6e6e2b8355f22b6fcd0f58c8bf7c634243ef878f67c039243b3828be43beff68c7938"; + sha512 = "ee4bc8ffdbd1a329df5dac2580122d883895418b93c69146206ae4e516ba1e5e993b23870ff487fb26df198b3ad73b708f9cd1f8c3f6a9f60dab73dea6ecd373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/lij/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lij/firefox-59.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9a308c8f7d2000608adf33954ccc2b82b92275563096f801cce4ded8333d786a1c879833f6768b9749dd1d718b33586b84e180971b92ff29387ce53741028381"; + sha512 = "a3e92d13e071ec8e76c9a4b946fadc146664263b5176ecd56dc6d412d4a0b8165b67c6be568805455e2179dacb2dc9d5d917981e3b6d52b8ce994d4062d7aae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/lt/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lt/firefox-59.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c1a57ee983fc10155813431845a1ebb46071da4748a44b2bb4578ac6c4e1d743341df5a8ed0c0c02343c360bcd6f50b13b2ab62b760e079830ea0a82d781b0de"; + sha512 = "47c6066bea50fa958812ac3389efa3408b2c35ace30c99d9ffb91ae037f1a2444933eb081992b97e3419554ef6ede9aff7c445b5262a59a324e7c1301059f149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/lv/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lv/firefox-59.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "64fd05ef07e08677efff3f57f2c863bb1b070e9dcc088fa7d5217b59fee9db5b9af58086088b488c34734e3a6e53c683d26a8c5755b71e7af17b8a515854edfe"; + sha512 = "090db495b0e0883e0e378d992a855aee03e2f2fa02ea257522485742e5a879ca42231029c2e36b8a8c31425e343ea0fcc2568a9a961752ca709737c3b3bc32ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/mai/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mai/firefox-59.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ca33c7b7f812f6cb8c9b56e969c7f67ade456d9ac6555ffbebd8096e3083d6afd3c1e0bb86ab14ec244c1cb6aa87c55b15d34d06ea0c994867f9e52b38389422"; + sha512 = "b073c397f8d5196e14d0bbd45485532ac11cd01c42fba883c6d2f3b8f831b6cd6ce095f44e279b17ec60a12e48b776004edbc22ab76fde69af875842a48fb2c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/mk/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mk/firefox-59.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ce4e7d7693e0229a83aab9970d1678c621b58dd481d4c6aa4ffe2d478f15d72984968349ad3e4febb38e96c30847631f0bdd7abd8eb09dfcb2d4092e1539ba97"; + sha512 = "eb20befd569cf18a9bd8455d56d152e48b194e6703cc21457af6407348f5db0405d9fa6a7b503b8c72c96b9cda953c3e0167e5803f6f62947751e042562ad427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ml/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ml/firefox-59.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "0383725a278add1e0b78c8c75bb7d541967726d90bcf7264118349615e96ab9db83b8b363bc68f1e9fb220078385de4f92f726555c10c8793aa1a190d5869dea"; + sha512 = "d91c916c45e9ac2abeb655bb318030553139294859701ad99cbaed1c946a24b71ebe63b7efc2d66f995cefe09b7d04bc5bda17784713d8e4a5f27702c4ac7797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/mr/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mr/firefox-59.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "f50849e45b52a34b7cbb02edf3fefdea3c9a9c5a60f8517cbc852cdc5209fe281efd7d182a53e4a793447478d32a79bf529097f1041165d6b1ed37459e4b02bd"; + sha512 = "9d925c4828a427bc77631b28ffd6857f5adc38266731be58e283aa99b2fb4ed304ab464b32f33bce4ce1506c13c76947264891eabd7e63dfdbd020605bb1e8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ms/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ms/firefox-59.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "f8ec236546a7dede2b502a254c010724c636b69a1f4b7dc73e2684f9d314b1e4d79cab8a0f9ba2a1942c6afbe0b44152c133bb5c94cf8d1f0ef33c08df38a1dc"; + sha512 = "2e0f463f9db9f6c0e44e354ea495cc06f5dda8c92af586745744434c112073f4f46eab7576d1e26c93a7a8b739deb09930b10cca01eea70f6bc245a44d58fa74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/my/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/my/firefox-59.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "ffae5d1763fa88c57961c3d11c71cb1e3540f109bd553ef0ef86eb5537b3599154943365c7368f4f06a1d5911aec17c52013bc414d899325a5dea8aaa9b92817"; + sha512 = "3e279289928231a02436cb344f1629b990b220c22df04e4cd3583a4995e59901a0062763e246e8cbc44ec696c7a94eb8e25ab7534a9f32b957f1332228af9b7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/nb-NO/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nb-NO/firefox-59.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c8e569886b7470c1856e6b3b6fb756b05d14b21a57dd7337d490d5c7cacec603e9670ca3be8d34b1e8194ef053232d5d758e824a48b66205a5e26698751b0fb2"; + sha512 = "abf3048155dff62d4225471531568292410bae499f10a7f51caa493bf3c66d45a30fd3fe62db2bc21447259aa75e024681abd8b1f8567fd7647202b7399b256e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ne-NP/firefox-59.0.2.tar.bz2"; + locale = "ne-NP"; + arch = "linux-i686"; + sha512 = "a0a9a872bb6f92cc1f5fbf17e8ffa06fe841d5c0f50bfc543779caf10726e1a0a18bd003aef9619b25110b5a37510375de077461c3fab276cd58b319f4107a1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/nl/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nl/firefox-59.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d55277a2e99a63e0a2e7343bfb5250ee70443bec1be8629b858ee17e574e0124d37c6d15a03eea58b0f9122ce17042af94498430517cacb0e59058d53f251aaa"; + sha512 = "0b0a0b5df01a72c4a433938dd8f750c60594e393108564ba20745205fa87e30231e8518e28bedb770d5b988c3684ea80f27f7de28d864a26da69fda3a5c39617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/nn-NO/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nn-NO/firefox-59.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "ed01cae9dd21e46a6fae031994e38980b72fbad6dc521571f5d21d8a23c9a2b4f4606ec92435d2aa2deb441b7f9e15d61f443fc6e557bbbc6b36d4c226f2ace3"; + sha512 = "0a8c474d2e0103dad61e7efbfe8bdabcf246395e7abc213a6b195aff79ae28d843c4dbcfcdbb1740c6d49e2329a1afbbde8e798dc50044be4924450c7f024396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/or/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/or/firefox-59.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "2007dcbb344395d80ba05a8a4f87c2f7c19254966cfc08c728ee7363cb763a93c50d616756ab3e601d7a98114e89a6bf97e76e88fbc1ec48decfe028f5aa04b9"; + sha512 = "3b97c26b98859f1fa6e8cd682908c46fcfac7bc4aa6d6e8b0495bcdd4e1ddb53f924d4436499dcf0f059ab24d516439c2c8b4881c938d74ebb7c0e2b30911a14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/pa-IN/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pa-IN/firefox-59.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "bcf6175628c4ee73746ec8337fe3dd2ab329ed971ee3044684d5ea92bb500b4c708dbed46c97848e56026f00cf26659402cf2f213e106b0b7eece28b87b26ff5"; + sha512 = "978e0143198910d4c8c47764f7fce401cace00018318e5deb71a22666d7f94df735304354dd07ec2ca4386898ed4c15c8cd3efb1104dd054a4c1c11661b7619a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/pl/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pl/firefox-59.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "b8f51a95786571aabf58cb81e4cd52edabfca23686a481157a11de47adbf14cb39c317c02e9f4ec313bfe282f326d70e531f83735095c51df40ed58ebf068a7f"; + sha512 = "618f2dd7460090dd0b1c0edff4b33d5ae51f1298f20ec5ccf845e5e6e5e4128c55b937496257ef49064806a720b5c8326cedca9764702824391447a83ed2118c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/pt-BR/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-BR/firefox-59.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "f53076ea2a933f2c30aa93e222cad9a73d981ff0e7ca9fb98df0f1db97ea4393a1b5a37388549e63ebf7a7f44fcaecace20725ce6c7cbb33626de9c9754ab999"; + sha512 = "7e12f0f18562fb628b994df2e2c2a9bac4fe85ad593a0de37f3e1c3b1dce60406d2f28606aec5cf84ecec05570b38e7dd95d6f348dbadee09bf27ac34d52b47e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/pt-PT/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-PT/firefox-59.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3032b7338b6540086edc86a8c5f1298ad546b77982c02013ba96df564c4c99670db6eefffac8f56f540fee6c3a8887e81fff5de2391cb5b29a8429f72b9ada64"; + sha512 = "80d9c00f741ab177a5d0ffd94a8462077240c07a56dfb49213e222264224d5df5f4f964dac55d097b0ba9d658dd42ed50761ca86fc087c29cc4ef9d2972956ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/rm/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/rm/firefox-59.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "7dcc1f088c20687d322f83e6eece96d48fd43a63cfa44816e729e623f161867af3725ee88fe0904ea826640c89f0c84d6f46d7bf847dfef51a671dd2dfc2c044"; + sha512 = "9ef01b038cb0971b41fbb19d250db4ca96adc31f0a9cf8b7197ebe700acfab69b2dae35f2c3487ae1983df0793cacd5a7aca7d9fdec8b7fa94cb245ff1308338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ro/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ro/firefox-59.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "b8f6f3f5b10755ec2b13fb68d1add7cbdabe799dca9077036be3750c7f4f753c89c5a0382e45f1b02da5b3842ab095153ec1f48029515f6513d35bb28012be02"; + sha512 = "d60ec8a9bddaabdae7b210c7b8f4229b10ae1080a89a3a661b6ffbffae479c81ec8f620b82655d92a792e31d4f1fad9477d195005dfdc803a7f3998d4a091413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ru/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ru/firefox-59.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7aaec71a4dd8588ad432ccd2f8a44aafe0d5b502f2a15b11e25065c9a04cce5c76e48492f99c6a14ead274d6180564cca3eef7d9bb9e98cee2960d0433cbef71"; + sha512 = "8a42c89e4a0ac8f26421450637c2781c2dac2fd4469080f5d17a86cbbaa2c1cae56cc641797e6c1efb1576467c2d9e960b8a486f4b79556eba1d8a099d82e567"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/si/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/si/firefox-59.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "6d9032566a45fab13a685258f94bbe9eb937219655924224873635a41fae3d9973f762eeba206b72f3990b5517a96cd984464c86d30618130c1e3429ccd0b00b"; + sha512 = "230b155c90db9c05a8f896357c1cb2baca0f96cada2a62fced73caa94a49116459b4ae42a4f61ce03dd08d9ce03541067a5cc64a53ad17cd63debbfe645a2614"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/sk/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sk/firefox-59.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "6f5359765802799631ca6654a32f74bb27fcb8d81bdc23cfc912805fd10ad9ecd80ac0d24f23e4fc28bcb104891a0846ce7be1a1fd80d7b91e1b3b89f3644c8a"; + sha512 = "1072c117830b85c54e7c1ead8ca552e92ce0c1971f26a28d27490802ceeb15fc105323599fd768a8ecd94597b3f51f8efdfb3e91743395c19b52a152ffb383d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/sl/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sl/firefox-59.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "d18cb826761333b7fbf1e7d056cfdc4bf2871f39da0ff93d89efc97e808dd79bb8837b9a2656688bd1658737933d60d5cb069d6ce832e72a7d83836887672e7d"; + sha512 = "5580f6777ce0acd2d47af993a8bec2e23ef16d77e6fb653147637e1efa08e82006a41108b94b213e7bb6d57b9dc27e8cc2bc1f0a26e9c2cf766e9c82dcc673d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/son/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/son/firefox-59.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "90e86f1cc8b35d28e96f417589d69f2ca016495297d54c74d0243daeeb39b9564cb56e4b66685ba708463284b004b17bb157bd55bde3cc962457d56cdd1dcee0"; + sha512 = "0f930af28da8a3643d424dc957643682909d86f83d2cde87656abb33fd5d9c5277a46cf46d4ed28a790eaa0b5681f48cc43a2184c8273cb85c821359d07ad46e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/sq/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sq/firefox-59.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5c90e9dd76aceaf1ca6995349ab2cae5425764eef75303b3d803544d156b67ce5d353429f3acb15b55d32d5a9f37c6f753dd1a1081cd073ea27b3f88972928ec"; + sha512 = "08589b3b4bfb670a912045614bb408a856b48aee4184b98e475101b1ff0ce3f6659c13ae4ffeb981e28f0b7243ba6b340065224dae0cef85e6f5877b0b150db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/sr/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sr/firefox-59.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "32cc44f8aeafa861004326dde6ea99690be06c4960436c4eece48353b4de11b1691d347628ee239d7bcebfed14bf1da20180c04ffc5d62096172cbb183e4ad3f"; + sha512 = "2abe8a5c502564823ffeaf59925d6749463e4aa0fcb0732f0c68acd8243b5a1bf5a71834fd9e519df8aa4b7b32fe69336ed9976b1ffb2ca67068cbe47f9b6987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/sv-SE/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sv-SE/firefox-59.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c9d0f7eb815474fb866e519a00b6adbe47b6e86b6ee16af3d3d72ba9ea52eac202b3c36aad3245abf25ca88845c65d079a1fba219dd77a5da161a667c06676ed"; + sha512 = "ff79a7639d654cc2714f75e619c0c6c5862c1e4216fe7e2eeaf3876c47e16a6555dfa28e9be6b8215fe9e308e4c8753c5d70bcc6f3979c8a70fd7330652126ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ta/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ta/firefox-59.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "af662b476aa060895e50cb43d49d2b509af24ed3294d5f15d1a5c5d7f00021cc60bfcb77476375e0146f6d247243e2f3701a271a246f08a3ef408cd9cac42753"; + sha512 = "fb4d4c6def12ffe32eb9517858488921f1c77380f3d1d35a8652ebe7b9e14429709debffa6dd6a1008fee71c664fd8f582db1052a203dc1d7c10ba418222f7fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/te/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/te/firefox-59.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "e7d7fd6b38d654c72b34b186fea49b7707b2051600d87628a3a8ea02c48bbc810153928bfd556bb88aa9134c1bdac7fdd6f47954519391bc83e478ea5bfedac2"; + sha512 = "ae97d60ac98c6cd9bad620a7c5dba8d51bdb2b035132daa0d915d1fc1e04802a25137bbbac82009ec51c0d858346e2f5c43f9981c48e991cc094cf11711fdeef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/th/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/th/firefox-59.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6bc2827c5de337c7fee9ac97ae31911361661ce107231da80ccc13afba8606944976003bd013ca01adf91c5282dbb956791b47e94363c0f18f25eb40159b2871"; + sha512 = "695fae213cc6705ec130c4dc08dd1c28f6ad605e0a2d0e92deef13737cc2780cd420dd883dc5153bf9cd174e1740effbc817054b16417fed90d04be04f21ab24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/tr/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/tr/firefox-59.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b03f28b336b1c59ba4a2f5b061f950e9e0491ab6b7173864b3dfb5588d52c397120dc86e9a8beaea47184c6b519ed42380ee6d94d30edd02b8ea8166e9e9f33b"; + sha512 = "f79e1f5027a84b772358d25f0441744036f60da7de5c0b26428ebd81900977e70d2c36b454e73f7026b7e20c058830502c92bdb8cc7d55c3ab40df43b7380d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/uk/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uk/firefox-59.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bf9f67458a280a1ce7c27119680a5b5d37c2aeaef3fc79967a61d0e06b0a688faf3c591d843b8783eac203b60886d298c68d6bf2cd318b982fa91abd98551236"; + sha512 = "30b7661e84a875ff356284a87d1dc00a9e8fc1c03c953c471d785445e78cf4568450fec97bb16a1c63b092931719119510f33f55f02ff56e38adf4fb3be3f2c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ur/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ur/firefox-59.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "069ca0a5ccf90f6a8be96b2db90534473045241abb55be13611ddce7815d37db4cf82fbeab753b3c04a898574a3ca6ecf954e30b860b6d70395c0b24ac9b8a1c"; + sha512 = "9ef6fed1bea2857fc60e22eb9a87db8261316ba0852a3c5d35d65c3ead474ae34ee532588e25942f76be2f13a341c9bd9b672e5b192db1d3ccfee3f6a6787b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/uz/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uz/firefox-59.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "45b1f0eecf3b6c05be541d764608964db65861f937e94ac011d10befd0e71c7942658a5a02c0a482a22abd164730dffb45b28aa9b8ca4ac87a21a32050b183a2"; + sha512 = "ab75b5c8e81b6bfc12b07b4fb2872cf2297c7249c352f5b66d95d867698f3e9a601f273e708bcb8855505eaba87b384e2b62f9d0b85e5976acf1c948e5e5a3e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/vi/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/vi/firefox-59.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "4d1c3418dfae7b8929ab117efb1febca6c7569f163ae0d805a27592c00aecdc9f7956aa56c01e898cdc09bffc5d9a55654d5d98712a9ab685ac1f6061c03680e"; + sha512 = "d08e244d22c92c0e64c1104d5bbaaa19fa3b0d8f7a3616ae0df71d8f141039f1e7e87480f52d319f57d545f58c7095da643d4bac150e47c3e595b27cb793076f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/xh/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/xh/firefox-59.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "a79e103d319ed72e28b011a658436a3036d1f280b733db2433e36c6c25bd5192a8e44527f591b92e0d6836ec17e23decb9d41ec50623e051484e7fbd20733cc1"; + sha512 = "b956f01619afc421ed23ac644af51f62fa9f5cffcd7f5b6bf640014d1326583f8ba871e4e4f5cf8e81ab0a2b46335b5e921243e71ed16d51b2c89f0a7d1a1280"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/zh-CN/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-CN/firefox-59.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d27040490378d8c61d68359715ebfc06bbcce8637936fe399b42c4e38c0935f0bdad34e379c852d00961c22fe97d2b43c0214cc951855acb41cc5c7ef3824e8f"; + sha512 = "80f3c557a7fa2d51f5ba2d07adef2bd6980a4cd256b95702ee4fac2967d039476ea3b828ce951b354be9fea9508ecae2ea12a8b29f8feb0101b2101d741bf633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/zh-TW/firefox-57.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-TW/firefox-59.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "99efd3df2a3dc1a3e4950add00c6768d694b6d349ca7c36c7c7ba5c53650fb553942795923c40c7bc0fadf76e209e9b5f357ab9648f57bc3ae1f30c85878fb65"; + sha512 = "50668a428310083cd175ce0dd9d09742866143d56efb0b13d11de1905d5b1d9f61e441bf1364e518aa87ebc790a335cc3b69d2438d3a4f92b4802345b8a443fa"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index ac3f7d1380c5ce36d2ef7a445d1d9f96c3895ee3..df928f88c386c1674b15684dd178e11507bca38d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -37,7 +37,7 @@ in writeScript "update-${name}" '' # versions or removes release versions if we are looking for beta # versions # - this line pick up latest release - version=`xidel -q $url --extract "//a" | \ + version=`xidel -s $url --extract "//a" | \ sed s"/.$//" | \ grep "^[0-9]" | \ sort --version-sort | \ diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index ccf762afbec3222e17a82187984b2b7756ea3c51..e8e1862d7f836d4c2be03585eb7188e1f92a86a4 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -3,9 +3,9 @@ , isTorBrowserLike ? false }: { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg +, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper +, yasm, libGLU_combined, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , cairo, icu, libpng, jemalloc , autoconf213, which, gnused, cargo, rustc, llvmPackages @@ -29,22 +29,37 @@ # Set to `privacySupport` or `false`. , webrtcSupport ? !privacySupport -, googleAPISupport ? !privacySupport +, geolocationSupport ? !privacySupport +, googleAPISupport ? geolocationSupport , crashreporterSupport ? false +, safeBrowsingSupport ? false , drmSupport ? false ## other -# If you want the resulting program to call itself -# "Firefox"/"Torbrowser" instead of "Nightly" or whatever, enable this -# option. However, in Firefox's case, those binaries may not be -# distributed without permission from the Mozilla Foundation, see -# http://www.mozilla.org/foundation/trademarks/. -, enableOfficialBranding ? isTorBrowserLike +# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at +# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we +# have permission to use the official firefox branding. +# +# Fur purposes of documentation the statement of @sylvestre: +# > As the person who did part of the work described in the LWN article +# > and release manager working for Mozilla, I can confirm the statement +# > that I made in +# > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006 +# > +# > @garbas shared with me the list of patches applied for the Nix package. +# > As they are just for portability and tiny modifications, they don't +# > alter the experience of the product. In parallel, Rok also shared the +# > build options. They seem good (even if I cannot judge the quality of the +# > packaging of the underlying dependencies like sqlite, png, etc). +# > Therefor, as long as you keep the patch queue sane and you don't alter +# > the experience of Firefox users, you won't have any issues using the +# > official branding. +, enableOfficialBranding ? true }: -assert stdenv.cc ? libc && stdenv.cc.libc != null; +assert stdenv.cc.libc or null != null; let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; @@ -58,9 +73,9 @@ stdenv.mkDerivation (rec { buildInputs = [ gtk2 perl zip libIDL libjpeg zlib bzip2 - dbus dbus_glib pango freetype fontconfig xorg.libXi + dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - nspr libnotify xorg.pixman yasm mesa + nspr libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx /* cairo */ @@ -85,23 +100,26 @@ stdenv.mkDerivation (rec { rm -f configure rm -f js/src/configure rm -f .mozconfig* - - # this will run autoconf213 + '' + (if lib.versionAtLeast version "58" + # this will run autoconf213 + then '' + configureScript="$(realpath ./mach) configure" + '' else '' make -f client.mk configure-files - configureScript="$(realpath ./configure)" - + '') + '' cxxLib=$( echo -n ${gcc}/include/c++/* ) archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml - - 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 + echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga + configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") + '' + lib.optionalString (lib.versionOlder version "58") '' + cd obj-* ''; configureFlags = [ @@ -128,11 +146,14 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" ] - ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration - "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib" + "--with-libclang-path=${llvmPackages.libclang}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] + ++ lib.optionals (lib.versionAtLeast version "57") [ + "--enable-webrender=build" + ] # TorBrowser patches these ++ lib.optionals (!isTorBrowserLike) [ @@ -141,7 +162,7 @@ stdenv.mkDerivation (rec { ] # and wants these - ++ lib.optionals isTorBrowserLike [ + ++ lib.optionals isTorBrowserLike ([ "--with-tor-browser-version=${version}" "--enable-signmar" "--enable-verify-mar" @@ -151,7 +172,9 @@ stdenv.mkDerivation (rec { # possibilities on other platforms. # Lets save some space instead. "--with-system-nspr" - ] + ] ++ flag geolocationSupport "mozril-geoloc" + ++ flag safeBrowsingSupport "safe-browsing" + ) ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" @@ -159,7 +182,6 @@ stdenv.mkDerivation (rec { ++ flag gssSupport "negotiateauth" ++ lib.optional (!ffmpegSupport) "--disable-gstreamer" ++ flag webrtcSupport "webrtc" - ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga" ++ flag crashreporterSupport "crashreporter" ++ lib.optional drmSupport "--enable-eme=widevine" @@ -170,6 +192,16 @@ stdenv.mkDerivation (rec { ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; + # Before 58 we have to run `make -f client.mk configure-files` at + # the top level, and then run `./configure` in the obj-* dir (see + # above), but in 58 we have to instead run `./mach configure` at the + # top level and then run `make` in obj-*. (We can also run the + # `make` at the top level in 58, but then we would have to `cd` to + # `make install` anyway. This is ugly, but simple.) + postConfigure = lib.optionalString (lib.versionAtLeast version "58") '' + cd obj-* + ''; + preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) '' buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser") ''; @@ -189,7 +221,7 @@ stdenv.mkDerivation (rec { postInstall = '' # For grsecurity kernels - paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container} + paxmark m $out/lib/firefox*/{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-* @@ -201,8 +233,8 @@ stdenv.mkDerivation (rec { 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 + }/lib:$(patchelf --print-rpath "$out"/lib/firefox*/libxul.so)" \ + "$out"/lib/firefox*/libxul.so ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch b/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch new file mode 100644 index 0000000000000000000000000000000000000000..1c3c3294894459a0c6af9908c31e30a2718c2857 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch @@ -0,0 +1,26 @@ +Yep, it's a "return code was ignored" bug. +diff --git a/media/libcubeb/src/cubeb_pulse.c b/media/libcubeb/src/cubeb_pulse.c +index aaaaaaaaaaa..bbbbbbbbbbb 100644 +--- a/media/libcubeb/src/cubeb_pulse.c ++++ b/media/libcubeb/src/cubeb_pulse.c +@@ -473,6 +473,8 @@ + static int + pulse_context_init(cubeb * ctx) + { ++ int r; ++ + if (ctx->context) { + assert(ctx->error == 1); + pulse_context_destroy(ctx); +@@ -486,9 +488,9 @@ + WRAP(pa_context_set_state_callback)(ctx->context, context_state_callback, ctx); + + WRAP(pa_threaded_mainloop_lock)(ctx->mainloop); +- WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL); ++ r = WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL); + +- if (wait_until_context_ready(ctx) != 0) { ++ if (r < 0 || wait_until_context_ready(ctx) != 0) { + WRAP(pa_threaded_mainloop_unlock)(ctx->mainloop); + pulse_context_destroy(ctx); + ctx->context = NULL; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 440119358de7ebfcb6d57fba05258020fd6f578d..07495e7d4707d5c5a1c9dfa588380ce4478a16ad 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,23 +1,32 @@ { lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }: -let common = opts: callPackage (import ./common.nix opts); in +let + + common = opts: callPackage (import ./common.nix opts); + + nixpkgsPatches = [ + ./env_var_for_system_dir.patch + + # this one is actually an omnipresent bug + # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 + ./fix-pa-context-connect-retval.patch + ]; + +in rec { firefox = common rec { pname = "firefox"; - version = "57.0"; + version = "59.0.2"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "bd99ff97a2a6f824e6fbd36fd00193903159e309506b1e6945dcbc43a17a95aaa54a05f32131c56872e8860878ba6063008667955550f03aa8c7084f834d14fc"; + url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2"; + sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv"; }; - patches = - [ ./no-buildconfig.patch ./env_var_for_system_dir.patch ] - ++ lib.optional stdenv.isi686 (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; - sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; - }); + patches = nixpkgsPatches ++ [ + ./no-buildconfig.patch + ]; meta = { description = "A web browser built from Firefox source tree"; @@ -32,14 +41,13 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.5.0esr"; + version = "52.7.3esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "fe724108ba538e590b87a5c1b817471d3cca9b038ba2755642e4d7b8ebb6174322be1fe074f24ef181946f9a027106b50b500d2fa541d8a99ef44905822eda18"; + sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw"; }; - patches = - [ ./env_var_for_system_dir.patch ]; + patches = nixpkgsPatches; meta = firefox.meta // { description = "A web browser built from Firefox Extended Support Release source tree"; @@ -82,15 +90,18 @@ rec { 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. + It will clash with firefox binary if you install both. But it + should not be a problem because 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. + + Or just use `tor-browser-bundle` package that packs this + `tor-browser` back into a sanely-built bundle. ''; homepage = https://www.torproject.org/projects/torbrowser.html; platforms = lib.platforms.linux; @@ -99,43 +110,57 @@ rec { in rec { - tor-browser-6-5 = common (rec { + tor-browser-7-0 = common (rec { pname = "tor-browser"; - version = "6.5.2"; + version = "7.0.1"; isTorBrowserLike = true; - extraConfigureFlags = [ "--disable-loop" ]; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; - repo = "tor-browser"; - # branch "tor-browser-45.8.0esr-6.5-2" - rev = "e4140ea01b9906934f0347e95f860cec207ea824"; - sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60"; + repo = "tor-browser"; + # branch "tor-browser-52.5.0esr-7.0-1-slnos"; + rev = "830ff8d622ef20345d83f386174f790b0fc2440d"; + sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5"; }; - } // commonAttrs) { - stdenv = overrideCC stdenv gcc5; - ffmpegSupport = false; - gssSupport = false; - }; - tor-browser-7-0 = common (rec { + patches = nixpkgsPatches; + } // commonAttrs) {}; + + tor-browser-7-5 = common (rec { pname = "tor-browser"; - version = "7.0.1"; + version = "7.5.2"; + isTorBrowserLike = true; + + # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb + src = fetchFromGitHub { + owner = "SLNOS"; + repo = "tor-browser"; + # branch "tor-browser-52.7.3esr-7.5-1-slnos"; + rev = "62e77aa47d90c10cfc9c6f3b7358a6bdc3167182"; + sha256 = "09pyqicv6z0h4lmjdybx56gj3l28gkl0bbpk0pnmlzcyr9vng7zj"; + }; + + patches = nixpkgsPatches; + } // commonAttrs) {}; + + tor-browser-8-0 = common (rec { + pname = "tor-browser"; + version = "8.0.1"; isTorBrowserLike = true; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - rev = "tor-browser-52.3.0esr-7.0-1-slnos"; - sha256 = "0szbf8gjbl4dnrb4igy4mq5858i1y6ki4skhdw63iqqdd8w9v4yv"; + # branch "tor-browser-52.7.0esr-8.0-1-slnos"; + rev = "58314ccb043882e830ee9a21c37a92d6e0d34e94"; + sha256 = "09gb7chw2kly53b599xwpi75azj00957rnxly9fqv8zi3n5k2pdb"; }; - patches = - [ ./env_var_for_system_dir.patch ]; + patches = nixpkgsPatches; } // commonAttrs) {}; - tor-browser = tor-browser-7-0; + tor-browser = tor-browser-7-5; }) diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 0f465122806981552f1cab536faa73f793b28108..997bccbe9a95dd0a3f7381b27973522a61153258 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -22,13 +22,15 @@ writeScript "update-${attrPath}" '' # - removes trailing slash # - sorts everything with semver in mind # - picks up latest release - version=`xidel -q $url --extract "//a" | \ + version=`xidel -s $url --extract "//a" | \ grep "^[0-9.]*${versionSuffix}/$" | \ sed s/[/]$// | \ sort --version-sort | \ tail -n 1` + source_url=`curl --silent $url$version/SOURCE | grep -o 'https://.*\.tar\.bz2'` + shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1` - update-source-version ${attrPath} "$version" "$shasum" + update-source-version ${attrPath} "$version" "$shasum" "$source_url" '' diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 7daa96ed87333bddcb1ef5dc83cdc23d2fa7e62e..8f07415db5f2e4b9ad526d318ae16aaf5b38d312 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,154 +2,174 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 -, supportsJDK, jrePlugin, icedtea_web +, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2 +, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader -, google_talk_plugin, fribid, gnome3/*.gnome_shell*/ +, google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , vlc_npapi +, browserpass, chrome-gnome-shell , libudev , kerberos }: ## configurability of the wrapper itself + browser: -{ browserName ? browser.browserName or (builtins.parseDrvName browser.name).name -, name ? (browserName + "-" + (builtins.parseDrvName browser.name).version) -, desktopName ? # browserName with first letter capitalized - (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) -, nameSuffix ? "" -, icon ? browserName -}: let - cfg = stdenv.lib.attrByPath [ browserName ] {} config; - enableAdobeFlash = cfg.enableAdobeFlash or false; - ffmpegSupport = browser.ffmpegSupport or false; - gssSupport = browser.gssSupport or false; - jre = cfg.jre or false; - icedtea = cfg.icedtea or false; - - plugins = - assert !(jre && icedtea); - ([ ] - ++ lib.optional enableAdobeFlash flashplayer - ++ lib.optional (cfg.enableDjvu or false) (djview4) - ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) - ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional icedtea icedtea_web - ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin - ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid - ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell - ++ lib.optional (cfg.enableTrezor or false) trezor-bridge - ++ lib.optional (cfg.enableBluejeans or false) bluejeans - ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader - ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin - ++ lib.optional (cfg.enableVLC or false) vlc_npapi - ); - nativeMessagingHosts = - ([ ] - ); - libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) - ++ lib.optional gssSupport kerberos - ++ lib.optionals (cfg.enableQuakeLive or false) - (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 ]; - gtk_modules = [ libcanberra_gtk2 ]; - -in stdenv.mkDerivation { - inherit name; - - desktopItem = makeDesktopItem { - name = browserName; - exec = "${browserName}${nameSuffix} %U"; - inherit icon; - comment = ""; - desktopName = "${desktopName}${nameSuffix}"; - genericName = "Web Browser"; - categories = "Application;Network;WebBrowser;"; - mimeType = stdenv.lib.concatStringsSep ";" [ - "text/html" - "text/xml" - "application/xhtml+xml" - "application/vnd.mozilla.xul+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - "x-scheme-handler/ftp" - ]; - }; - - buildInputs = [makeWrapper] - ++ lib.optional (!ffmpegSupport) gst-plugins - ++ lib.optional (browser ? gtk3) browser.gtk3; - - buildCommand = '' - if [ ! -x "${browser}/bin/${browserName}" ] - then - echo "cannot find executable file \`${browser}/bin/${browserName}'" - exit 1 - fi - - makeWrapper "$(readlink -v --canonicalize-existing "${browser}/bin/${browserName}")" \ - "$out/bin/${browserName}${nameSuffix}" \ - --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ - --suffix LD_LIBRARY_PATH ':' "$libs" \ - --suffix-each GTK_PATH ':' "$gtk_modules" \ - --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ - --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ - --suffix PATH ':' "$out/bin" \ - --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ - --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ - ${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" - ln -s "${browser}/share/icons" "$out/share/icons" - else - mkdir -p "$out/share/icons/hicolor/128x128/apps" - ln -s "${browser}/lib/${browserName}-"*"/browser/icons/mozicon128.png" \ - "$out/share/icons/hicolor/128x128/apps/${browserName}.png" - fi - - install -D -t $out/share/applications $desktopItem/share/applications/* - - mkdir -p $out/lib/mozilla - for ext in ${toString nativeMessagingHosts}; do - ${lndir}/bin/lndir -silent $ext/lib/mozilla $out/lib/mozilla - done - - # For manpages, in case the program supplies them - mkdir -p $out/nix-support - echo ${browser} > $out/nix-support/propagated-user-env-packages - ''; - - preferLocalBuild = true; - - # Let each plugin tell us (through its `mozillaPlugin') attribute - # where to find the plugin in its tree. - plugins = map (x: x + x.mozillaPlugin) plugins; - libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs; - gtk_modules = map (x: x + x.gtkModule) gtk_modules; - - passthru = { unwrapped = browser; }; - - disallowedRequisites = [ stdenv.cc ]; - - meta = browser.meta // { - description = - browser.meta.description - + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)) - + ")"; - hydraPlatforms = []; - priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package - }; -} + wrapper = + { browserName ? browser.browserName or (builtins.parseDrvName browser.name).name + , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version) + , desktopName ? # browserName with first letter capitalized + (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) + , nameSuffix ? "" + , icon ? browserName + , extraPlugins ? [] + , extraNativeMessagingHosts ? [] + }: + + let + cfg = config.${browserName} or {}; + enableAdobeFlash = cfg.enableAdobeFlash or false; + ffmpegSupport = browser.ffmpegSupport or false; + gssSupport = browser.gssSupport or false; + jre = cfg.jre or false; + icedtea = cfg.icedtea or false; + supportsJDK = + stdenv.system == "i686-linux" || + stdenv.system == "x86_64-linux" || + stdenv.system == "armv7l-linux" || + stdenv.system == "aarch64-linux"; + + plugins = + assert !(jre && icedtea); + ([ ] + ++ lib.optional enableAdobeFlash flashplayer + ++ lib.optional (cfg.enableDjvu or false) (djview4) + ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) + ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin + ++ lib.optional icedtea icedtea_web + ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin + ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid + ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell + ++ lib.optional (cfg.enableTrezor or false) trezor-bridge + ++ lib.optional (cfg.enableBluejeans or false) bluejeans + ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader + ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin + ++ lib.optional (cfg.enableVLC or false) vlc_npapi + ++ extraPlugins + ); + nativeMessagingHosts = + ([ ] + ++ lib.optional (cfg.enableBrowserpass or false) browserpass + ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell + ++ extraNativeMessagingHosts + ); + libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) + ++ lib.optional gssSupport kerberos + ++ lib.optionals (cfg.enableQuakeLive or false) + (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 true) libpulseaudio; + gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; + gtk_modules = [ libcanberra-gtk2 ]; + + in stdenv.mkDerivation { + inherit name; + + desktopItem = makeDesktopItem { + name = browserName; + exec = "${browserName}${nameSuffix} %U"; + inherit icon; + comment = ""; + desktopName = "${desktopName}${nameSuffix}"; + genericName = "Web Browser"; + categories = "Application;Network;WebBrowser;"; + mimeType = stdenv.lib.concatStringsSep ";" [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + "x-scheme-handler/ftp" + ]; + }; + + buildInputs = [makeWrapper] + ++ lib.optional (!ffmpegSupport) gst-plugins + ++ lib.optional (browser ? gtk3) browser.gtk3; + + buildCommand = '' + if [ ! -x "${browser}/bin/${browserName}" ] + then + echo "cannot find executable file \`${browser}/bin/${browserName}'" + exit 1 + fi + + makeWrapper "$(readlink -v --canonicalize-existing "${browser}/bin/${browserName}")" \ + "$out/bin/${browserName}${nameSuffix}" \ + --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ + --suffix LD_LIBRARY_PATH ':' "$libs" \ + --suffix-each GTK_PATH ':' "$gtk_modules" \ + --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ + --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ + --suffix PATH ':' "$out/bin" \ + --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ + --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ + ${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" + ln -s "${browser}/share/icons" "$out/share/icons" + else + for res in 16 32 48 64 128; do + mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" + ln -s "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" \ + "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png" + done + fi + + install -D -t $out/share/applications $desktopItem/share/applications/* + + mkdir -p $out/lib/mozilla + for ext in ${toString nativeMessagingHosts}; do + ${lndir}/bin/lndir -silent $ext/lib/mozilla $out/lib/mozilla + done + + # For manpages, in case the program supplies them + mkdir -p $out/nix-support + echo ${browser} > $out/nix-support/propagated-user-env-packages + ''; + + preferLocalBuild = true; + + # Let each plugin tell us (through its `mozillaPlugin') attribute + # where to find the plugin in its tree. + plugins = map (x: x + x.mozillaPlugin) plugins; + libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs; + gtk_modules = map (x: x + x.gtkModule) gtk_modules; + + passthru = { unwrapped = browser; }; + + disallowedRequisites = [ stdenv.cc ]; + + meta = browser.meta // { + description = + browser.meta.description + + " (with plugins: " + + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)) + + ")"; + hydraPlatforms = []; + priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package + }; + }; +in + lib.makeOverridable wrapper diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 9a4d90701b28ff0b01a6c6f60fdffee0d6cebcd3..d2d26190ce058eab0013c6b596aa6dbcc070e289 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, patchelf, bash +{ stdenv, fetchurl, patchelf, makeWrapper # 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, gtk3, gdk_pixbuf, gcc-unwrapped +, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk +, kerberos # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -32,19 +33,18 @@ # Only needed for getting information about upstream binaries , chromium -, gsettings_desktop_schemas +, gsettings-desktop-schemas , gnome2, gnome3 }: with stdenv.lib; -with chromium.upstream-info; - let opusWithCustomModes = libopus.override { withCustomModes = true; }; + version = chromium.upstream-info.version; gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; @@ -57,7 +57,8 @@ let libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd - bzip2 libcap + bzip2 libcap at-spi2-atk + kerberos ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; @@ -68,13 +69,13 @@ in stdenv.mkDerivation rec { name = "google-chrome${suffix}-${version}"; - src = binary; + src = chromium.upstream-info.binary; buildInputs = [ - patchelf + patchelf makeWrapper # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk + gsettings-desktop-schemas glib gtk # needed for XDG_ICON_DIRS gnome.defaultIconTheme @@ -119,14 +120,11 @@ in stdenv.mkDerivation rec { mv "$icon_file" "$logo_output_path/google-$appname.png" done - cat > $exe << EOF - #!${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 + makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \ + --prefix LD_LIBRARY_PATH : "$rpath" \ + --prefix PATH : "$binpath" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --add-flags ${escapeShellArg commandLineArgs} for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do patchelf --set-rpath $rpath $elf @@ -139,6 +137,6 @@ in stdenv.mkDerivation rec { homepage = https://www.google.com/chrome/browser/; license = licenses.unfree; maintainers = [ maintainers.msteen ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index e013f54a39ea73edf27b6f68395d5d813c855694..26a7e883c60ca36fb39a5858381bff76c686c971 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper -, gsettings_desktop_schemas }: +{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib-networking, makeWrapper +, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "jumanji-${version}"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ girara gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; + buildInputs = [ girara gtk webkitgtk makeWrapper gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup='' wrapProgram "$out/bin/jumanji" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index f097d748d48c161e1ec87159f700eacb332787e2..7c007e228f81a1c3099b5eb279b7c9decc751a9a 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.14"; + version = "2.15"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp"; + sha256 = "1jp3xyvp87a188b4kg5ycqahrazj7928zncgsznzn54w8d5iqahy"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7142ba6140b4e793b1a89371c38c6af14c233965 --- /dev/null +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -0,0 +1,61 @@ +{stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook, makeWrapper +,help2man, lua5, luafilesystem, luajit, sqlite +,webkitgtk, gtk3, gst_all_1}: + +let + lualibs = [luafilesystem]; + getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; + getLuaPath = lib : getPath lib "lua"; + getLuaCPath = lib : getPath lib "so"; + luaPath = stdenv.lib.concatStringsSep ";" (map getLuaPath lualibs); + luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs); + +in stdenv.mkDerivation rec { + + name = "luakit-${version}"; + version = "2017.08.10"; + src = fetchFromGitHub { + owner = "luakit"; + repo = "luakit"; + rev = "${version}"; + sha256 = "09z88b50vf2y64vj79cymknyzk3py6azv4r50jng4cw9jx2ray7r"; + }; + + nativeBuildInputs = [pkgconfig help2man wrapGAppsHook makeWrapper]; + + buildInputs = [webkitgtk lua5 luafilesystem luajit sqlite gtk3 + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + ]; + + postPatch = + #Kind of ugly seds here. There must be a better solution. + '' + patchShebangs ./build-utils + sed -i "2 s|require \"lib.lousy.util\"|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/docgen/gen.lua; + sed -i "3 s|require \"lib.markdown\"|dofile(\"./lib/markdown.lua\")|" ./build-utils/docgen/gen.lua; + sed -i "1,2 s|require(\"lib.lousy.util\")|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/find_files.lua; + ''; + + buildPhase = '' + make DEVELOPMENT_PATHS=0 USE_LUAJIT=1 INSTALLDIR=$out PREFIX=$out USE_GTK3=1 + ''; + + installPhase = let + luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua"; + in '' + make DEVELOPMENT_PATHS=0 INSTALLDIR=$out PREFIX=$out XDGPREFIX=$out/etc/xdg USE_GTK3=1 install + wrapProgram $out/bin/luakit \ + --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \ + --set LUA_PATH '${luaKitPath};${luaPath};' \ + --set LUA_CPATH '${luaCPath};' + ''; + + meta = with stdenv.lib; { + description = "Fast, small, webkit based browser framework extensible in Lua"; + homepage = "http://luakit.org"; + license = licenses.gpl3; + platforms = platforms.linux; # Only tested linux + }; +} diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 0f6c4ed36d40ad12f54d0cd9fbebd06025a76dd7..9cad2838a39b20e9e1f71584c6689528dfba99b2 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { version = "2.8.9dev.16"; src = fetchurl { - url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"; + urls = [ + "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" + "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" + ]; sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84"; }; @@ -22,9 +25,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; - nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig - ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc - ++ [ nukeReferences ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ nukeReferences ] + ++ stdenv.lib.optional sslSupport pkgconfig; buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index ce9ac961c92a8f97e29b55bcb87bb6834e854d47..f7d4f1a694171c952ff46ce8d8057a31bcf0c81d 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_23, wrapGAppsHook +{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook , gtk3, webkitgtk, librsvg, libnotify, sqlite -, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3 -, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core +, glib-networking, gsettings-desktop-schemas, libsoup, pcre, gnome3 +, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core , zeitgeistSupport ? false, zeitgeist ? null }: @@ -29,13 +29,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook cmake intltool + pkgconfig wrapGAppsHook cmake intltool vala_0_34 ]; buildInputs = [ - vala_0_23 - gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr - libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core + gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr + libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core (libsoup.override {gnomeSupport = true; valaSupport = true;}) ] ++ stdenv.lib.optionals zeitgeistSupport [ zeitgeist @@ -50,6 +49,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS="-lX11"; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules") ''; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index ecd4026821a856faffb761a907cb4a121b7c364f..162dd88054c75331c09de918b07714c00a5e946d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,25 +73,25 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "27.0.0.187"; + version = "29.0.0.140"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_npapi_linux_debug.${arch}.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/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 - "1ii97fa1diyggarh1gkg43ia42ws7x84hpjzvrdhxcf6s47lh2ld" + "0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p" else - "1gphlgy64ddzn4bbgr2k1kh8xwq9ghf0z0c6zilry0nq33i64xa1" + "16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh" else if arch == "x86_64" then - "1hfcphcvdam62k983rm6r42mnkih4nfwyrnx0v88z3nw14mjr4c3" + "10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7" else - "06jb4jd5840w125wd4l35f0b1iqjak07ajy02k9j8srglwi0ffmw"; + "0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1"; }; 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 92e73e475581cf52ebce3b861e51369222dcaea7..42d7aa2f56f06e81307713db1b043fd3b9699ba5 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,19 +55,19 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "27.0.0.187"; + version = "29.0.0.140"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux_debug.x86_64.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux_debug.x86_64.tar.gz" else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz"; + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1857g4yy62pj02pnw7p9bpqazp98jf17yv2xdh1fkqiibzahjc6m" + "1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5" else - "0kywx7c3qb1hfljc14ddzm1cyhvwygbbdfxp1rdhqw8s3b6ns0hw"; + "08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 461db272b12e9b9ba8807a13fe0b1453102b8361..a320321ea171a1957bb6b1fb2d6df280dca8d891 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, rpm, cpio, mesa_noglu, xorg, cairo +{ stdenv, fetchurl, rpm, cpio, libGL, xorg, cairo , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl -, dbus_glib, alsaLib, libpulseaudio, systemd, pango +, dbus-glib, alsaLib, libpulseaudio, systemd, pango }: with stdenv.lib; @@ -10,7 +10,7 @@ let baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; rpathPlugin = makeLibraryPath - [ mesa_noglu + [ libGL xorg.libXt xorg.libX11 xorg.libXrender @@ -36,7 +36,7 @@ let stdenv.cc.cc alsaLib libpulseaudio - dbus_glib + dbus-glib systemd curl pango diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index 008c359648322826e709ead570417f195966cf8f..fa455eb0b7a418fd0d0585831cc7c8becc47cb30 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = ''A wrapper to run browser plugins out-of-process''; homepage = http://nspluginwrapper.org/; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x64_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.raskin ]; inherit (srcData) version; }; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 0852b5c9d43490064b57fc603b46ae5c3b0ef00f..b98d1d415c665564995f986b01020df5baddb59e 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -37,7 +37,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "48.0.2685.52"; + version = "50.0.2762.45"; rpath = stdenv.lib.makeLibraryPath [ @@ -89,7 +89,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "027njqh2as4d0xsnvzamqiplghb8cxqnc19y0vqkvjnsw57v828p"; + sha256 = "1ajdr6yzqc9xkvdcgkps6j5996n60ibjhj518gmminx90da6x5dy"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0a8efb3aace963a7a0f46ebe4639c54a50a6b4c2 --- /dev/null +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -0,0 +1,25 @@ +{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub +, qtbase, qtmultimedia, qtwebengine +, version ? "0.9.96" +, sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p" +}: +stdenv.mkDerivation { + name = "otter-browser-${version}"; + + src = fetchFromGitHub { + owner = "OtterBrowser"; + repo = "otter-browser"; + rev = "v${version}"; + sha256 = sourceSha; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase qtmultimedia qtwebengine ]; + + meta = with stdenv.lib; { + license = licenses.gpl3Plus; + description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5"; + maintainers = with maintainers; [ lheckemann ]; + }; +} diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index e24c21b535bf8393315ca13ae87bbe9a7ba58cb9..0c0ef501e9963cfefe7e969e57fc0b16a9846ce7 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,28 +1,29 @@ { stdenv, fetchFromGitHub, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus_glib, file, fontconfig, freetype +, dbus, dbus-glib, file, fontconfig, freetype , gstreamer, gst-plugins-base, gst_all_1 , gtk2, hunspell, icu, libevent, libjpeg, libnotify -, libstartup_notification, libvpx, makeWrapper, mesa +, libstartup_notification, libvpx, makeWrapper, libGLU_combined , nspr, nss, pango, perl, python, libpulseaudio, sqlite -, unzip, xlibs, which, yasm, zip, zlib +, unzip, xorg, which, yasm, zip, zlib }: stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.6.0"; + version = "27.8.3"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "1v5rbam93fcc7c1l69clr9chi2l0zv0dhjq12v535n8vv9lhahhl"; + sha256 = "1v3wliq8k5yq17ms214fhwka8x4l3sq8kja59dx4pbvczzb1zyzh"; }; desktopItem = makeDesktopItem { name = "palemoon"; exec = "palemoon %U"; + icon = "palemoon"; desktopName = "Pale Moon"; genericName = "Web Browser"; categories = "Application;Network;WebBrowser;"; @@ -38,12 +39,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype + alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 hunspell icu libevent libjpeg libnotify libstartup_notification - libvpx makeWrapper mesa nspr nss pango perl pkgconfig python + libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python libpulseaudio sqlite unzip which yasm zip zlib - ] ++ (with xlibs; [ + ] ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver libXt pixman scrnsaverproto xextproto ]); @@ -59,18 +60,23 @@ stdenv.mkDerivation rec { echo > $MOZ_CONFIG " . $src/build/mozconfig.common ac_add_options --prefix=$out + ac_add_options --with-pthreads ac_add_options --enable-application=browser ac_add_options --enable-official-branding ac_add_options --enable-optimize="-O2" + ac_add_options --enable-release + ac_add_options --enable-devtools ac_add_options --enable-jemalloc ac_add_options --enable-shared-js + ac_add_options --enable-strip ac_add_options --disable-tests + ac_add_options --disable-installer + ac_add_options --disable-updaters " ''; patchPhase = '' chmod u+w . - sed -i /status4evar/d browser/installer/package-manifest.in ''; buildPhase = '' @@ -81,16 +87,34 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications + + for n in 16 22 24 32 48 256; do + size=$n"x"$n + mkdir -p $out/share/icons/hicolor/$size/apps + cp $src/browser/branding/official/default$n.png \ + $out/share/icons/hicolor/$size/apps/palemoon.png + done + cd $builddir $src/mach install ''; meta = with stdenv.lib; { description = "A web browser"; + longDescription = '' + Pale Moon is an Open Source, Goanna-based web browser focusing on + efficiency and customization. + + Pale Moon offers you a browsing experience in a browser completely built + from its own, independently developed source that has been forked off from + Firefox/Mozilla code a number of years ago, with carefully selected + features and optimizations to improve the browser's stability and user + experience, while offering full customization and a growing collection of + extensions and themes to make the browser truly your own. + ''; homepage = https://www.palemoon.org/; license = licenses.mpl20; - maintainers = with maintainers; [ rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj AndersonTorres ]; platforms = platforms.linux; }; - } diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4f0e891dc496bf353a46df22020376cbe6ab9e22..2e31f625f2e78c9ad0202a0651c49695a8f83e37 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,41 +1,41 @@ -{ 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 ? null -, attrs +{ stdenv, lib, fetchurl, fetchzip, python3Packages +, makeWrapper, wrapGAppsHook, qtbase, glib-networking +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 +, libxslt, gst_all_1 ? null +, withPdfReader ? true +, withMediaPlayback ? true , withWebEngineDefault ? true }: -assert (! withWebEngineDefault) -> qtwebkit-plugins != null; +assert withMediaPlayback -> gst_all_1 != null; let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; version = "1.7.225"; - src = fetchurl { + src = fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "1n8ylmv60r0qbw2vilp640a87l4lgnrsi15z3iihcs6dj1n1yy67"; + sha256 = "0bsmbz7bbh0zpd70dlhss4fjdw7zq356091wld9s7kxnb2rixqd8"; + stripRoot = false; }; - nativeBuildInputs = [ unzip ]; - buildCommand = '' mkdir $out - unzip -d $out $src + cp -r $src $out ''; }; -in buildPythonApplication rec { - name = "qutebrowser-${version}${fix_postfix}"; - fix_postfix = "-1"; - version = "1.0.3"; +in python3Packages.buildPythonApplication rec { + name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; + version = "1.2.1"; + versionPostfix = ""; + # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "04d6hg2yf2wjwn0sd05bpx3zngnb93g7rizbdq17bbpmnwxchzap"; + sha256 = "1svbski378x276033v07jailm81b0i6hxdakbiqkwvgh6hkczrhw"; }; # Needs tox @@ -43,21 +43,25 @@ in buildPythonApplication rec { buildInputs = [ qtbase - gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav - glib_networking - ] - ++ lib.optional (! withWebEngineDefault) qtwebkit-plugins; + glib-networking + ] ++ lib.optionals withMediaPlayback (with gst_all_1; [ + gst-plugins-base gst-plugins-good + gst-plugins-bad gst-plugins-ugly gst-libav + ]) ++ lib.optional (!withWebEngineDefault) python3Packages.qtwebkit-plugins; nativeBuildInputs = [ - makeWrapper 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 pyopengl attrs + propagatedBuildInputs = with python3Packages; [ + pyyaml pyqt5 jinja2 pygments + pypeg2 cssutils pyopengl attrs ]; postPatch = '' sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py + '' + lib.optionalString withPdfReader '' sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; @@ -76,6 +80,8 @@ in buildPythonApplication rec { install -Dm644 icons/qutebrowser.svg \ "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* + install -Dm755 -t "$out/share/qutebrowser/scripts/" \ + scripts/{importer.py,dictcli.py,keytester.py,open_url_in_instance.sh,utils.py} ''; postFixup = lib.optionalString (! withWebEngineDefault) '' diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 1aa9bf044b05bff5f82cf6b7476319ce27c64ac0..88680414d1c67ab0cd43fdbcd0b0cd7bdac98e7e 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, wrapGAppsHook -, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk +, glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , patches ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ]; + buildInputs = [ glib glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; inherit patches; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 1b6bf2ac30028c695d07394475249bb9e078441f..8a8abb42f55e1f71e34600d684f47bc013df24a6 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -9,7 +9,7 @@ , atk , cairo , dbus -, dbus_glib +, dbus-glib , fontconfig , freetype , gdk_pixbuf @@ -42,8 +42,8 @@ # Wrapper runtime , coreutils , glibcLocales -, hicolor_icon_theme -, shared_mime_info +, hicolor-icon-theme +, shared-mime-info # Whether to disable multiprocess support to work around crashing tabs # TODO: fix the underlying problem instead of this terrible work-around @@ -62,7 +62,7 @@ let atk cairo dbus - dbus_glib + dbus-glib fontconfig freetype gdk_pixbuf @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.10"; + version = "7.5.3"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0d1yvb1gmswlzyivr53xxfbd58bvr7nyangd85j36kar4bzbzvhh"; + sha256 = "0vgw1qsd6rqbbgnsw9zwcv5m308abh7wp1p12mp8g04xndxnzw0d"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0mjw8z76pbm1hshz875shkmjmxqhpan5la52r3y20v6rc0gfd9p5"; + sha256 = "0scjy51zmyn7za0gii0dvndq06slip64nd0ik2cjyq232agvbxmr"; }; }; in @@ -261,8 +261,8 @@ stdenv.mkDerivation rec { EOF WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - hicolor_icon_theme - shared_mime_info + hicolor-icon-theme + shared-mime-info ]} # Generate wrapper diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 508ab6ec432eec58030343d0ee23b374d932f970..65ebaa3f80c571c162361757b0b195d93c720b6d 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -8,8 +8,8 @@ # Wrapper runtime , coreutils -, hicolor_icon_theme -, shared_mime_info +, hicolor-icon-theme +, shared-mime-info , noto-fonts , noto-fonts-emoji @@ -197,8 +197,8 @@ stdenv.mkDerivation rec { # Generate a suitable wrapper wrapper_PATH=${makeBinPath [ coreutils ]} wrapper_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - hicolor_icon_theme - shared_mime_info + hicolor-icon-theme + shared-mime-info ]} ${optionalString audioSupport '' diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 6ac8d9f1f6e7f1f84a0f627925caf5d9a82f7477..8c9f23996ede60783084c1e850269d5a0448101b 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python3, makeWrapper -, webkit, glib_networking, gsettings_desktop_schemas, python2Packages +, webkit, glib-networking, gsettings-desktop-schemas, python2Packages }: # This package needs python3 during buildtime, # but Python 2 + packages during runtime. @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preFixup = '' for f in $out/bin/*; do wrapProgram $f \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" done @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 makeWrapper ]; - buildInputs = [ gsettings_desktop_schemas webkit ]; + buildInputs = [ gsettings-desktop-schemas webkit ]; propagatedBuildInputs = with python2Packages; [ pygtk six ]; } diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index c654723f4c2c0fecd7a05af378aa7ef76922dd98..251315619cfd46dddfdd8835baf67c069f75f432 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib_networking -, gsettings_desktop_schemas, makeWrapper +{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib-networking +, gsettings-desktop-schemas, makeWrapper }: stdenv.mkDerivation rec { name = "vimb-${version}"; - version = "2.11"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz"; - sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f"; + sha256 = "1gws028c2v1zh6r142hmjvi2m447lwqqh65m6z3dzcar2yw35z3f"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup = '' wrapProgram "$out/bin/vimb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { editor and also easily configurable during runtime. Vimb is mostly keyboard driven and does not detract you from your daily work. ''; - homepage = http://fanglingsu.github.io/vimb/; + homepage = https://fanglingsu.github.io/vimb/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.rickynils ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index e6275b2f9592d141c9b3b514337f407c938b70a3..54abc7dedff4daee5c539da7edfde2d9caa17698 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk2, libsoup, libX11, perl, - pkgconfig, webkit, gsettings_desktop_schemas }: +{ stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl, + pkgconfig, webkit, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "1.4.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings-desktop-schemas ]; hardeningDisable = [ "format" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/vimprobable2" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 410e886636083c7567c4d7855d90683cd1199546..6bd9614e08de6ed49296d147e4b8ff764dae8dad 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 -, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3 +, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3 , nss, nspr , patchelf, makeWrapper , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.12.955.38-1"; + version = "1.14.1077.45-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "1bq1ss6vkpr6rw5n0sw9zipxx19vficvxys1lra9symcxk1b4gqw"; + sha256 = "0b4iviar927jx6xqyrzgzb3p4p617zm4an1np8jnldadq2a0p56d"; }; unpackPhase = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { 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 + atk at-spi2-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 ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 542bcbc41b0d7b9e1ab46f43966b54aff92f26d9..11aa0ce706d665acf35d7cafcfb86a5b8782afe6 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch -, dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss +, dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss , pciutils, pkgconfig, python2, xdg_utils }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; nativeBuildInputs = [ - dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig + dbus-glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig python2 xdg_utils ]; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index f65e2fe1851b3802a0ce1c4b6240b5510e1de96d..c71ccdf8a0d205b474af263f2cc4091dbf76974e 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -53,8 +53,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = "--with-ssl=${openssl.dev} --with-gc=${boehmgc.dev}" - + optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb"; + configureFlags = + [ "--with-ssl=${openssl.dev}" "--with-gc=${boehmgc.dev}" ] + ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ac_cv_func_setpgrp_void=yes" + ] + ++ optional graphicsSupport "--enable-image=${optionalString x11Support "x11,"}fb"; preConfigure = '' substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path @@ -70,7 +74,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://w3m.sourceforge.net/; description = "A text-mode web browser"; - maintainers = [ maintainers.mornfall maintainers.cstrahan ]; + maintainers = [ maintainers.cstrahan ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 33a1e8a5c08e28334b29dcc89ad3b38f28c6aac5..242abc2ece79745635092296938c1083b0215046 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -1,17 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "c14-cli-unstable-${version}"; - version = "2017-05-15"; - rev = "97f437ef5133f73edd551c883db3076c76cb1f6b"; + name = "c14-cli-${version}"; + version = "0.3"; goPackagePath = "github.com/online-net/c14-cli"; src = fetchFromGitHub { owner = "online-net"; repo = "c14-cli"; - inherit rev; - sha256 = "1b44bh0zhh6rhw4d3nprnnxhjgaskl9kzp2cvwwyli5svhjxrfdj"; + rev = "${version}"; + sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix index 1caf1ce0bc8e6e23395e626ce1ee8fe61dbe2f29..aac0dd10e15abb475388255eadcc1d4563ed40e9 100644 --- a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix +++ b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "0mm2sb1p5zz6b0z2s4zhdlix6fafydsxmqjy8zbkwzw4f6lazzyl"; - buildInputs = [ curl ]; + nativeBuildInputs = [ curl ]; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7fd4cd9fa824ddc8f88f500b37c27092d7b0f398 --- /dev/null +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -0,0 +1,28 @@ +{ darwin, fetchFromGitHub, rustPlatform, stdenv }: + +with rustPlatform; + +buildRustPackage rec { + name = "click-${version}"; + version = "0.3.1"; + rev = "b5dfb4a8f8344330a098cb61523695dfe0fd296a"; + + src = fetchFromGitHub { + owner = "databricks"; + repo = "click"; + sha256 = "0a2hq4hcxkkx7gs5dv7sr3j5jy2dby4r6y090z7zl2xy5wydr7bi"; + inherit rev; + }; + + cargoSha256 = "03vgbkv9xsnx44vivbbhjgxv9drp0yjnimgy6hwm32x74r00k3hj"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + meta = with stdenv.lib; { + description = ''The "Command Line Interactive Controller for Kubernetes"''; + homepage = https://github.com/databricks/click; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.mbode ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index a7205f1bc7af8030b98fc40d2907c68aea812ead..0f232772f076548373ecdbb5ef6f537d44ca65fd 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -2,28 +2,25 @@ stdenv.mkDerivation rec { name = "cni-${version}"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "cni"; rev = "v${version}"; - sha256 = "0n2sc5xf1h0i54am80kj7imrvawddn0kxvgi65w0194dpmyrg5al"; + sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y"; }; buildInputs = [ go ]; - outputs = ["out" "plugins"]; - buildPhase = '' patchShebangs build.sh ./build.sh ''; installPhase = '' - mkdir -p $out/bin $plugins + mkdir -p $out/bin mv bin/cnitool $out/bin - mv bin/* $plugins/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix new file mode 100644 index 0000000000000000000000000000000000000000..9f6b6fcb7e112a28d1671469b16d21e4761181cc --- /dev/null +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, go }: + +stdenv.mkDerivation rec { + name = "cni-plugins-${version}"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "containernetworking"; + repo = "plugins"; + rev = "v${version}"; + sha256 = "0m885v76azs7lrk6m6n53rwh0xadwvdcr90h0l3bxpdv87sj2mnf"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + patchShebangs build.sh + ./build.sh + ''; + + installPhase = '' + mkdir -p $out/bin + mv bin/* $out/bin + ''; + + meta = with lib; { + description = "Some standard networking plugins, maintained by the CNI team"; + homepage = https://github.com/containernetworking/plugins; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 95ad83cb3b17a98e61eda9ea2f92887f76b438ae..d67d9d5851cfa1b364f18f5d25048359c54371cc 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.12.2"; + version = "0.14.0"; goPackagePath = "github.com/docker/machine"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "0ikgjb6x6h7f43vjabxnqgrrlq516zsz7vj945hca1w919jpdwhf"; + sha256 = "0hd5sklmvkhhpfn318hq9w0f7x14165h1l2mdn9iv4447z1iibff"; }; postInstall = '' diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve-deps.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve-deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..99cb7b98f5cc8881e4b568c402551031901ba5a5 --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve-deps.nix @@ -0,0 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/docker/machine"; + fetch = { + type = "git"; + url = "https://github.com/docker/machine"; + rev = "5b274558ea6ca822c06dd407a4e774a0105c3f60"; + sha256 = "1wdq9h4bx7awgclh969gvmcnl9jvgv7ldfklnclh5iv47mi7q22d"; + }; + } + { + goPackagePath = "github.com/zchee/libhyperkit"; + fetch = { + type = "git"; + url = "https://github.com/zchee/libhyperkit"; + rev = "1a19a7693fac32b46ec6cdd22da6fbec974447fc"; + sha256 = "119f5gcl24znwnmi837jk667asd3lirx32jldpd4mbyb3sm9nz24"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix new file mode 100644 index 0000000000000000000000000000000000000000..6b0440eb84aec57fe5b7065c8943a96b7e17dc90 --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, Hypervisor, vmnet }: + +buildGoPackage rec { + name = "docker-machine-xhyve-${version}"; + version = "0.3.3"; + + goPackagePath = "github.com/zchee/docker-machine-driver-xhyve"; + goDeps = ./xhyve-deps.nix; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "zchee"; + repo = "docker-machine-driver-xhyve"; + sha256 = "0rj6pyqp4yv4j28bglqjs95rip5i77vv8mrkmqv1rxrsl3i8aqqy"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ Hypervisor vmnet ]; + + meta = with stdenv.lib; { + homepage = https://github.com/zchee/docker-machine-driver-xhyve; + description = "Xhyve driver for docker-machine."; + license = licenses.bsd3; + maintainers = with maintainers; [ periklis ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f394df3391ac23333f7642cf3daf71ea4b30266b --- /dev/null +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, makeWrapper, jre +, version ? "1.4" }: + +let + versionMap = { + "1.3" = { + flinkVersion = "1.3.2"; + scalaVersion = "2.11"; + sha256 = "0mf4qz0963bflzidgslvwpdlvj9za9sj20dfybplw9lhd4sf52rp"; + hadoopBundle = "-hadoop27"; + }; + "1.4" = { + flinkVersion = "1.4.2"; + scalaVersion = "2.11"; + sha256 = "0x3cikys5brin0kx9zr69xfp8k5w6g8141yrrr26ks7gpss2x636"; + hadoopBundle = ""; + }; + }; +in + +with versionMap.${version}; + +stdenv.mkDerivation rec { + name = "flink-${flinkVersion}"; + + src = fetchurl { + url = "mirror://apache/flink/${name}/${name}-bin${hadoopBundle}-scala_${scalaVersion}.tgz"; + inherit sha256; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ jre ]; + + installPhase = '' + rm bin/*.bat + + mkdir -p $out/bin $out/opt/flink + mv * $out/opt/flink/ + makeWrapper $out/opt/flink/bin/flink $out/bin/flink \ + --prefix PATH : ${jre}/bin + + cat <> $out/opt/flink/conf/flink-conf.yaml + env.java.home: ${jre}" + env.log.dir: /tmp/flink-logs + EOF + ''; + + meta = with stdenv.lib; { + description = "A distributed stream processing framework"; + homepage = https://flink.apache.org; + downloadPage = https://flink.apache.org/downloads.html; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ mbode ]; + repositories.git = git://git.apache.org/flink.git; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 6767a0bd724064e648a9a96e753e4b410e0dd510..a49ff486d961d85c0a486dd73b409e4f74ed76e8 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, kubernetes }: +{ stdenv, fetchurl, kubectl }: let - arch = if stdenv.isLinux + isLinux = stdenv.isLinux; + arch = if isLinux then "linux-amd64" else "darwin-amd64"; - checksum = if stdenv.isLinux - then "1i22givr52kgr76dd2azcg9avgh70wiw5dcpmmyychms2ynxi42y" - else "0phhy3si86ilc6051zfgn8jnniy5lygf1r2gysjpcyfbrc5pw3hj"; + checksum = if isLinux + then "1lr2s66kln6rp3sb156br9nfx51bdy654vdjr4vnncz4kp3mljv1" + else "04y4ii0w4s00z831q1wzxz6qkc8qfrhwzdrq3wwvrcl0413cza50"; pname = "helm"; - version = "2.6.1"; + version = "2.8.2"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -21,7 +22,7 @@ stdenv.mkDerivation { buildInputs = [ ]; - propagatedBuildInputs = [ kubernetes ]; + propagatedBuildInputs = [ kubectl ]; phases = [ "buildPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d24c307fcce5422e8c17e46b625d1caaf320b4ae --- /dev/null +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "heptio-ark-${version}"; + version = "0.7.1"; + + goPackagePath = "github.com/heptio/ark"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "heptio"; + repo = "ark"; + sha256 = "0j3x9zxcffxhlw0fxq2cw9ph37bqw90cbmf9xshmnj8yl9rbxp7y"; + }; + + postInstall = "rm $bin/bin/generate"; + + meta = with stdenv.lib; { + description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + homepage = https://heptio.github.io/ark/; + license = licenses.asl20; + maintainers = [maintainers.mbode]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ff0f664154aa87bcabfe3f017c4d864793c3d41e --- /dev/null +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "kompose-${version}"; + version = "1.9.0"; + + goPackagePath = "github.com/kubernetes/kompose"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "kubernetes"; + repo = "kompose"; + sha256 = "00yvih5gn67sw9v30a0rpaj1zag7k02i4biw1p37agxih0aphc86"; + }; + + meta = with stdenv.lib; { + description = "A tool to help users who are familiar with docker-compose move to Kubernetes"; + homepage = https://github.com/kubernetes/kompose; + license = licenses.asl20; + maintainers = with maintainers; [thpham]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..56cbef7f00553830ef8f5c02835d90632aa3bc41 --- /dev/null +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -0,0 +1,35 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "kontemplate-${version}"; + version = "1.4.0"; + goPackagePath = "github.com/tazjin/kontemplate"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "tazjin"; + repo = "kontemplate"; + rev = "v${version}"; + sha256 = "11aqc9sgyqz3pscx7njnb3xghl7d61vzdgl3bqndady0dxsccrpj"; + }; + + meta = with lib; { + description = "Extremely simple Kubernetes resource templates"; + homepage = "http://kontemplate.works"; + downloadPage = "https://github.com/tazjin/kontemplate/releases"; + license = licenses.gpl3; + maintainers = with maintainers; [ mbode tazjin ]; + platforms = platforms.unix; + repositories.git = git://github.com/tazjin/kontemplate.git; + + longDescription = '' + Kontemplate is a simple CLI tool that can take sets of + Kubernetes resource files with placeholders and insert values + per environment. + + It can be used as a simple way of deploying the same set of + resources to different Kubernetes contexts with context-specific + configuration. + ''; + }; +} diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..db2692a79e72b2fd4dd96bf72f38ba1cc54ac37a --- /dev/null +++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix @@ -0,0 +1,111 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"; + sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "e039e20e500c2c025d9145be375e27cf42a94174"; + sha256 = "1yhpyzq6ghwl0242phjpbc9358fcw63pxrcxsyv9n4dm0w15va3m"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/aokoli/goutils"; + fetch = { + type = "git"; + url = "https://github.com/aokoli/goutils"; + rev = "3391d3790d23d03408670993e957e8f408993c34"; + sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "3959339b333561bf62a38b424fd41517c2c90f40"; + sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "d806ba8c21777d504a2090a2ca4913c750dd3a33"; + sha256 = "12n3lfbfxvnag916c6dpxl48j29s482zwsqjc6wk4vb68qbz2nl3"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"; + sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "ab89591268e0c8b748cbe4047b00197516011af5"; + sha256 = "1cbg8wlv1hmdps9ksa4kym5zy0mb2yjykw4ns7yqv7nmz4s5xajr"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; + sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; + sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index ff7cb245ae2a083aaa1ae63690a5854aa1fb0ea4..ddb8951740cb8456dd1511189e986a7c34c90390 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.7.1"; + version = "1.8.1"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd"; + sha256 = "12nyr0iw1xwp60apli3nlq2vyn4jk3qjrb404m2syx2mqbnn47my"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 7f17bd57c19469c56a58f146449ccbecff6a7912..73a28325f52d7495e11dd64aaa86545487cc7b7d 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.5.0"; in +let version = "0.6.0"; in buildGoPackage { name = "kubecfg-${version}"; @@ -9,7 +9,7 @@ buildGoPackage { owner = "ksonnet"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "1s8w133p8qkj3dr73jimajm9ddp678lw9k9symj8rjw5p35igr93"; + sha256 = "12kv1p707kdxjx5l8rcikd1gjwp5xjxdmmyvlpnvyagrphgrwpsf"; }; goPackagePath = "github.com/ksonnet/kubecfg"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e8686ade59008e88a01189e59fe35bf25d1a8d18..2b55543532701c590778514ffecfcffec83b653b 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync , iptables, coreutils , components ? [ "cmd/kubeadm" @@ -8,8 +8,6 @@ "cmd/kube-controller-manager" "cmd/kube-proxy" "plugin/cmd/kube-scheduler" - "federation/cmd/federation-apiserver" - "federation/cmd/federation-controller-manager" "test/e2e/e2e.test" ] }: @@ -18,19 +16,35 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.7.9"; + version = "1.9.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0lxagvv8mysw6n0vp5vsccl87b628dgsjrf298dx2dqx7wn7zjgi"; + sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk"; }; - buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; + # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373 + buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ]; outputs = ["out" "man" "pause"]; + patches = [ + # patch is from https://github.com/kubernetes/kubernetes/pull/58207 + (fetchpatch { + url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch"; + sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w"; + }) + (fetchpatch { + # https://github.com/kubernetes/kubernetes/pull/60978 + # Fixes critical kube-proxy failure on iptables-restore >= 1.6.2 and + # non-critical failures on prior versions. + url = "https://github.com/kubernetes/kubernetes/commit/34ce573e9992ecdbc06dff1b4e3d0e9baa8353dd.patch"; + sha256 = "1sd9qgc28zr6fkk0441f89bw8kq2kadys0qs7bgivy9cmcpw5x5p"; + }) + ]; + postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" @@ -49,7 +63,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin" + mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" "$man/share/man" "$pause/bin" cp _output/local/go/bin/* "$out/bin/" cp build/pause/pause "$pause/bin/pause" @@ -60,10 +74,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl + $out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl ''; preFixup = '' - find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + + find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_9} '{}' + ''; meta = { diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 9092422739301956d41985e734b4708d357d0a0b..961c0afc5c50dcb611df74f81b8011a910e46945 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -4,6 +4,7 @@ , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables, maven , bash, autoreconfHook +, withJava ? !stdenv.isDarwin }: let @@ -14,6 +15,8 @@ let # src/common/command_utils.cpp # https://github.com/NixOS/nixpkgs/issues/13783 tarWithGzip = lib.overrideDerivation gnutar (oldAttrs: { + # Original builder is bash 4.3.42 from bootstrap tools, too old for makeWrapper. + builder = "${bash}/bin/bash"; buildInputs = (oldAttrs.buildInputs or []) ++ [ makeWrapper ]; postInstall = (oldAttrs.postInstall or "") + '' wrapProgram $out/bin/tar --prefix PATH ":" "${gzip}/bin" @@ -21,7 +24,7 @@ let }); in stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; name = "mesos-${version}"; enableParallelBuilding = true; @@ -29,7 +32,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "0c08kd226nrjwm2z2drpq4vi97h9r8b1xkdvkgh1114fxg7cyvys"; + sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr"; }; patches = [ @@ -44,11 +47,13 @@ in stdenv.mkDerivation rec { autoreconfHook ]; buildInputs = [ - makeWrapper curl sasl jdk + makeWrapper curl sasl python wrapPython boto setuptools leveldb - subversion apr glog openssl libevent maven + subversion apr glog openssl libevent ] ++ lib.optionals stdenv.isLinux [ libnl + ] ++ lib.optionals withJava [ + jdk maven ]; propagatedBuildInputs = [ @@ -179,6 +184,7 @@ in stdenv.mkDerivation rec { "--with-libevent=${libevent.dev}" "--with-protobuf=${pythonProtobuf.protobuf}" "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar" + (if withJava then "--enable-java" else "--disable-java") ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" "--with-nl=${libnl.dev}" @@ -188,16 +194,6 @@ in stdenv.mkDerivation rec { rm -rf $out/var rm $out/bin/*.sh - mkdir -p $out/share/java - cp src/java/target/mesos-*.jar $out/share/java - - MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} - - mkdir -p $out/nix-support - touch $out/nix-support/setup-hook - echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - # Inspired by: pkgs/development/python-modules/generic/default.nix pushd src/python mkdir -p $out/lib/${python.libPrefix}/site-packages @@ -216,6 +212,16 @@ in stdenv.mkDerivation rec { --old-and-unmanageable \ --prefix="$out" popd + '' + stdenv.lib.optionalString withJava '' + mkdir -p $out/share/java + cp src/java/target/mesos-*.jar $out/share/java + + MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} + + mkdir -p $out/nix-support + touch $out/nix-support/setup-hook + echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook + echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook ''; postFixup = '' @@ -246,6 +252,6 @@ in stdenv.mkDerivation rec { license = licenses.asl20; description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; maintainers = with maintainers; [ cstrahan kevincox offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix index 642c660edb69e4385a7968f5322626210397693d..1cf819870f4ef1c65d2d3d0c66766a25dadcb44c 100644 --- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix +++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly"; - buildInputs = [ curl ]; + nativeBuildInputs = [ curl ]; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 00ee3a3771eb47af2a91a9906ef4dfcbfe965f26..53b24552d373d682db68ac4730a2ff2a83c4fdd2 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, kubernetes, libvirt, qemu, docker-machine-kvm, - gpgme, makeWrapper }: + gpgme, makeWrapper, hostPlatform, vmnet }: let binPath = [ kubernetes ] @@ -15,15 +15,15 @@ let # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # currently https://storage.googleapis.com/minikube/k8s_releases.json - localkube-version = "1.8.0"; + localkube-version = "1.10.0"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "09mv1g9i0d14brvvp2wxgmfqvgp0na5dbm4z76a660q1fxszvgqc"; + sha256 = "02lkl2g274689h07pkcwnxn04swy6aa3f2z77n421mx38bbq2kpd"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.23.0"; + version = "0.26.0"; goPackagePath = "k8s.io/minikube"; @@ -31,12 +31,16 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h"; + sha256 = "1wc2gvmgb59yh0ldm2plvh6s8mvxvysrxp6w75z16ii86jmi3wr6"; }; + patches = [ + ./localkube.patch + ]; + # 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 gpgme ]; + buildInputs = [ go-bindata makeWrapper kubernetes gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet; subPackages = [ "cmd/minikube" ]; preBuild = '' @@ -61,6 +65,8 @@ in buildGoPackage rec { postInstall = '' mkdir -p $bin/share/bash-completion/completions/ MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube + mkdir -p $bin/share/zsh/site-functions/ + MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube ''; postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}"; diff --git a/pkgs/applications/networking/cluster/minikube/localkube.patch b/pkgs/applications/networking/cluster/minikube/localkube.patch new file mode 100644 index 0000000000000000000000000000000000000000..2d69cded555f928017d9dc1b5598edec908e516e --- /dev/null +++ b/pkgs/applications/networking/cluster/minikube/localkube.patch @@ -0,0 +1,20 @@ +diff --git a/pkg/minikube/bootstrapper/localkube/localkube.go b/pkg/minikube/bootstrapper/localkube/localkube.go +index 1c4b5000..c9f120d4 100644 +--- a/pkg/minikube/bootstrapper/localkube/localkube.go ++++ b/pkg/minikube/bootstrapper/localkube/localkube.go +@@ -113,14 +113,9 @@ func (lk *LocalkubeBootstrapper) UpdateCluster(config bootstrapper.KubernetesCon + + copyableFiles := []assets.CopyableFile{} + var localkubeFile assets.CopyableFile +- var err error + + //add url/file/bundled localkube to file list +- lCacher := localkubeCacher{config} +- localkubeFile, err = lCacher.fetchLocalkubeFromURI() +- if err != nil { +- return errors.Wrap(err, "Error updating localkube from uri") +- } ++ localkubeFile = assets.NewBinDataAsset("out/localkube", "/usr/local/bin/", "localkube", "0777") + copyableFiles = append(copyableFiles, localkubeFile) + + // user added files diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index e39bc59709e5c211da3ff33f95e5e740a82e2306..8486f0d53067019e6c5aef7f82aeb1326b98924d 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.6.2"; + version = "0.7.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "12bxqn7yldri5cwyxybd1lwg4c66mxd7g9syf54va5788c0hj8ij"; + sha256 = "0hn80dqzxkwvk1zjk6px725mb2i3c06smqfj0yyjz96vgf7qbqy2"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index fdc97733c77326ad1978cc8f1d668141b666e8e7..07c9e9ba6784a8efa69091232c383d3d3889ffca 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,12 +1,24 @@ -{ stdenv, fetchFromGitHub, which, buildGoPackage, utillinux, coreutils }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux +, iptables, coreutils, kerberos, clang +, components ? [ + "cmd/oc" + "cmd/openshift" + ] +}: + +with lib; let - version = "3.6.0"; + version = "3.9.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; -in buildGoPackage rec { + gitCommit = "191fece"; + # version is in vendor/k8s.io/kubernetes/pkg/version/base.go + k8sversion = "v1.9.1"; + k8sgitcommit = "a0ce1bc657"; +in stdenv.mkDerivation rec { name = "openshift-origin-${version}"; inherit version; @@ -14,40 +26,53 @@ in buildGoPackage rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r"; - }; + sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78"; +}; + + # go > 1.10 + # [FATAL] [14:44:02+0000] Please install Go version go1.9 or use PERMISSIVE_GO=y to bypass this check. + buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata kerberos clang ]; - buildInputs = [ which ]; + outputs = [ "out" ]; - goPackagePath = null; patchPhase = '' patchShebangs ./hack - substituteInPlace pkg/bootstrap/docker/host/host.go \ + + substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' - substituteInPlace pkg/bootstrap/docker/host/host.go \ + substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' - substituteInPlace pkg/bootstrap/docker/host/host.go \ + substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' ''; buildPhase = '' - 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=v${version} - export OS_GIT_MAJOR=${versionMajor} - export OS_GIT_MINOR=${versionMinor} - make build + echo "OS_GIT_VERSION=v${version}" >> os-version-defs + echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs + echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs + echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs + echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs + echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs + echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs + export OS_VERSION_FILE="os-version-defs" + export CC=clang + make all WHAT='${concatStringsSep " " components}' ''; installPhase = '' - mkdir -p "$bin/bin" - cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" + mkdir -p "$out/bin" + cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" + ''; + + preFixup = '' + find $out/bin -type f -exec remove-references-to -t ${go_1_9} '{}' + ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 6a8fe2834912a4f277a2609421bfc521b8cb17bc..1c2e2ccac27be815f38489b2565a794905d44023 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + broken = true; # needs ruby 2.1 homepage = https://github.com/CenturyLinkLabs/panamax-api; description = "The API behind The Panamax UI"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index 4a6481e3e5ee22c4e64cc9e725a43bd62b04c44c..2f60942f014babdda2440c494609a2e0555dffbe 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + broken = true; # needs ruby 2.1 homepage = https://github.com/CenturyLinkLabs/panamax-ui; description = "The Web GUI for Panamax"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index 49c57b470289ff990c1ebef648b1cb2cf71fdcd9..45dcfb1738c1e1c2f82c05de2d0592d420baa8d1 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "pig-0.14.0"; + name = "pig-0.16.0"; src = fetchurl { url = "mirror://apache/pig/${name}/${name}.tar.gz"; - sha256 = "183in34cj93ny3lhqyq76g9pjqgw1qlwakk5v6x847vrlkfndska"; + sha256 = "0p79grz5islnq195lv7pqdxb5l3v4y0k0w63602827qs70zpr508"; }; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 79500a33bf8039d4c0f6af53bc96649c663fab2d..2b36d7c5647a5e0f08ce07e13f74c34f261c0880 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, jre, pythonPackages +{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils , RSupport? true, R , mesosSupport ? true, mesos , version @@ -6,13 +6,9 @@ let versionMap = { - "1.6.3" = { - hadoopVersion = "cdh4"; - sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn"; - }; - "2.2.0" = { + "2.2.1" = { hadoopVersion = "hadoop2.7"; - sparkSha256 = "0wjjn2pgalrcji8avhj5d48kl1mf7rhrdxhzf29dbiszq4fkx0s6"; + sparkSha256 = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c"; }; }; in @@ -57,6 +53,7 @@ stdenv.mkDerivation rec { for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do makeWrapper "$n" "$out/bin/$(basename $n)" + substituteInPlace "$n" --replace dirname ${coreutils.out}/bin/dirname done ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java ''; diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix index 313e1af707b89a40b0d5ddf1488d92416e0451ad..1510dc575cc9ecbc7271c86e75b7ab3498404efb 100644 --- a/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/pkgs/applications/networking/cluster/taktuk/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl , openssh}: stdenv.mkDerivation rec { - version = "3.7.5"; + version = "3.7.7"; name = "taktuk-${version}"; buildInputs = [ perl ]; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz"; - sha256 = "d96ef6c63d77f32339066f143ef7e0bc00041e10724254bf15787746ad1f1070"; + sha256 = "0w0h3ynlcxvq2nzm8hkj20g0805ww3vkw53g0qwj7wvp7p3gcvnr"; }; preBuild = '' diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile new file mode 100644 index 0000000000000000000000000000000000000000..c4f9a5511de94c60d0959546eb131137310c6acc --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'terraform_landscape' diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock new file mode 100644 index 0000000000000000000000000000000000000000..047ddaadad072619d04776a4c8a484cab01477ed --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock @@ -0,0 +1,25 @@ +GEM + remote: https://rubygems.org/ + specs: + colorize (0.8.1) + commander (4.4.4) + highline (~> 1.7.2) + diffy (3.2.0) + highline (1.7.10) + polyglot (0.3.5) + terraform_landscape (0.1.17) + colorize (~> 0.7) + commander (~> 4.4) + diffy (~> 3.0) + treetop (~> 1.6) + treetop (1.6.9) + polyglot (~> 0.3) + +PLATFORMS + ruby + +DEPENDENCIES + terraform_landscape + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/applications/networking/cluster/terraform-landscape/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a0dca341ff3e37e9927be06c90a86209289af272 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/default.nix @@ -0,0 +1,19 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "terraform-landscape-${version}"; + + version = (import gemset).terraform_landscape.version; + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "Improve Terraform's plan output to be easier to read and understand"; + homepage = https://github.com/coinbase/terraform-landscape; + license = with licenses; apsl20; + maintainers = with maintainers; [ mbode ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix new file mode 100644 index 0000000000000000000000000000000000000000..38321b9d37aafff8d95b3e78fb115513e41d6221 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix @@ -0,0 +1,61 @@ +{ + colorize = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; + type = "gem"; + }; + version = "0.8.1"; + }; + commander = { + dependencies = ["highline"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "165yr8qzan3gnk241mnwxsvdfwp6p1afg13z0mqdily6lh95acl9"; + type = "gem"; + }; + version = "4.4.4"; + }; + diffy = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "015nn9zaciqj43mfpjlw619r5dvnfkrjcka8nsa6j260v6qya941"; + type = "gem"; + }; + version = "3.2.0"; + }; + highline = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + type = "gem"; + }; + version = "1.7.10"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + terraform_landscape = { + dependencies = ["colorize" "commander" "diffy" "treetop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bx8nfqbpxb2hnxnnl1m4sq6jlzf451c85m047jfq04b6w9691fl"; + type = "gem"; + }; + version = "0.1.17"; + }; + treetop = { + dependencies = ["polyglot"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd"; + type = "gem"; + }; + version = "1.6.9"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..34a3be55f305932288a41223343273addc4643bc --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix @@ -0,0 +1,47 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }: + +# USAGE: +# install the following package globally or in nix-shell: +# +# (terraform.withPlugins (old: [terraform-provider-libvirt])) +# +# configuration.nix: +# +# virtualisation.libvirtd.enable = true; +# +# terraform-provider-libvirt does not manage pools at the moment: +# +# $ virsh --connect "qemu:///system" pool-define-as default dir - - - - /var/lib/libvirt/images +# $ virsh --connect "qemu:///system" pool-start default +# +# pick an example from (i.e ubuntu): +# https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples + +buildGoPackage rec { + name = "terraform-provider-libvirt-${version}"; + version = "0.3"; + + goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; + + src = fetchFromGitHub { + owner = "dmacvicar"; + repo = "terraform-provider-libvirt"; + rev = "v${version}"; + sha256 = "004gxy55p5cf39f2zpah0i2zhvs4x6ixnxy8z9v7314604ggpkna"; + }; + + buildInputs = [ libvirt pkgconfig makeWrapper ]; + + goDeps = ./deps.nix; + + propagatedBuildInputs = [ cdrtools ]; + + meta = with stdenv.lib; { + homepage = https://github.com/dmacvicar/terraform-provider-libvirt; + description = "Terraform provider for libvirt"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ mic92 ]; + }; +} + diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..fdf394073ab893c0ebcce2810d862b19b7c67212 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix @@ -0,0 +1,12 @@ +# 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 = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0"; + sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..135e5402929a70982a513a93ab0063ab9e2ac5e5 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage rec { + name = "terraform-provider-nixos-${version}"; + version = "0.0.1"; + goPackagePath = "github.com/tweag/terraform-provider-nixos"; + src = fetchFromGitHub { + owner = "tweag"; + repo = "terraform-provider-nixos"; + sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; + rev = "v${version}"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-nixos{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform plugin for outputting NixOS configuration files from Terraform resources."; + homepage = "https://github.com/tweag/terraform-provider-nixos"; + license = licenses.mpl20; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index e6e3585a4d13b7316f14675dd064133aeef2ab0a..5879c0e83974dc6037d64e051558e8faa6701ac0 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -44,6 +44,9 @@ let let actualPlugins = plugins terraform.plugins; + # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries + wrapperInputs = lib.unique (lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins))); + passthru = { withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins); @@ -64,7 +67,8 @@ let buildCommand = '' mkdir -p $out/bin/ makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \ - --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin" + --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin" \ + --prefix PATH : "${lib.makeBinPath wrapperInputs}" ''; inherit passthru; @@ -72,7 +76,7 @@ let in withPlugins (_: []); plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; }; -in { +in rec { terraform_0_8_5 = generic { version = "0.8.5"; sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09"; @@ -91,9 +95,20 @@ in { }; terraform_0_10 = pluggable (generic { - version = "0.10.7"; - sha256 = "0gjvrra255m973nzi7rpqp5dn5npnd79cnv8vjcs7wmkdj1hli0l"; + version = "0.10.8"; + sha256 = "11hhij0hq99xhwlg5dx5nv7y074x79wkr8hr3wc6ln0kwdk5scdf"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); + + terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; + + terraform_0_11 = pluggable (generic { + version = "0.11.6"; + sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l"; + patches = [ ./provider-path.patch ]; + passthru = { inherit plugins; }; + }); + + terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues; } diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index d29bd964860976fc7c6e2de9e45396cfb2559168..0a0b20bfd15d25fad11356282028407f0f2b2583 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,15 +4,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "0.1.0"; - sha256 = "199zrpmi1hqy80nrvdhh5pn7vlcvpjcsf0hpwgzb1r9vnydpz7cj"; + version = "1.9.0"; + sha256 = "19jqyzpcnlraxzn8bvrjzsh81j7dfadswgxfsiqzxll9xbm0k2bv"; }; archive = { owner = "terraform-providers"; repo = "terraform-provider-archive"; - version = "1.0.0"; - sha256 = "0z85fpd70m2w59vxp82d8ipylaazf6l890rkjca4dm14rkq352zn"; + version = "1.0.3"; + sha256 = "1il8v9zi838naprr8dqzipk6ns71l8vdqidarxklnn8wdwxmacg4"; }; arukas = { @@ -32,13 +32,13 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.0.0"; - sha256 = "1x3ldlx2iryxwfaws8ng9n0k06p7n8xqc6sjyxw73jdasxbh8wgi"; + version = "1.13.0"; + sha256 = "09ba2r3avqbl85s8llmgkk6gwgfkzm83994kd965r481xcnfv1ny"; }; - azure = + azure-classic = { owner = "terraform-providers"; - repo = "terraform-provider-azure"; + repo = "terraform-provider-azure-classic"; version = "0.1.1"; sha256 = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1"; }; @@ -46,15 +46,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "0.2.2"; - sha256 = "1jdkj1zylrlcd2qkfkl81i0ybdpmvbvvsk0f4ahafiqp550srf2d"; + version = "1.3.1"; + sha256 = "1qpf2h9qnhki4lg9pv77r0sc4acj08m0fqqagkvkinq46ypsfbp4"; }; bitbucket = { owner = "terraform-providers"; repo = "terraform-provider-bitbucket"; - version = "0.1.0"; - sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43"; + version = "1.0.0"; + sha256 = "0gi8p1q0y8x5y8lqihijkpqs3v152h0q7icv7ixk33xsdcvb418y"; }; chef = { @@ -84,19 +84,26 @@ version = "0.1.0"; sha256 = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq"; }; + cloudscale = + { + owner = "terraform-providers"; + repo = "terraform-provider-cloudscale"; + version = "1.0.0"; + sha256 = "0yqiz4xywbd3568hl6va8da81fbc1hnynlz4z0vqxgi3bs8hhdhz"; + }; cloudstack = { owner = "terraform-providers"; repo = "terraform-provider-cloudstack"; - version = "0.1.1"; - sha256 = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb"; + version = "0.1.4"; + sha256 = "1dj6zkwv0bix31b8sjad9gil43m8c2c5d1dr10qza40f9z4agaxa"; }; cobbler = { owner = "terraform-providers"; repo = "terraform-provider-cobbler"; - version = "0.1.0"; - sha256 = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz"; + version = "1.0.1"; + sha256 = "1z0iijfrbbdrgszvc7jlcr4105zragbc0iq8x48vi24yipqgf5a8"; }; consul = { @@ -109,15 +116,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "0.1.1"; - sha256 = "0nyqybi3fl9qlhpx2n0vjz7kn3bqhf4wy93zhq3j3853zxpcjpzc"; + version = "1.0.3"; + sha256 = "0nh2dww3hx6jrkcd9lq5hpnqr3grp9cmqi4nwmxlrc5azf8x0mii"; }; digitalocean = { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - version = "0.1.2"; - sha256 = "0wn2bx9zk0fqvrn7a76rffin7f1b70p66h5bs9073szhr3zph7hg"; + version = "0.1.3"; + sha256 = "10crxciw7y2gnm8vqp007vw0k7c1a1xk2z2zsjr5rksk6qlnri4k"; }; dme = { @@ -144,15 +151,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "0.1.0"; - sha256 = "1nacxkyy12w4rj1bdf5ayqmmm47nwh362pcksr227rkwmsjlmg1m"; + version = "0.1.1"; + sha256 = "02lhbl34dq7lsby3g32969i4g9l3z6xw1v00shljd3amgyz2l2r2"; }; dyn = { owner = "terraform-providers"; repo = "terraform-provider-dyn"; - version = "1.0.0"; - sha256 = "0ph3516syca8f1zxmz66mh6y5kd8sc74kl0n8zixcgd6rvq0dysr"; + version = "1.1.0"; + sha256 = "0sx4h3drb230m69lsmafyfd2cfvwnb9gld8s6ky54115kd3nckml"; }; external = { @@ -165,50 +172,50 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.1.2"; - sha256 = "1z7nsgqqzvily9rxr79yjv6jfx56896c9lxb8flmzwjz6b6mvnz7"; + version = "0.1.4"; + sha256 = "0x8s11c30k9a95mafyb2zl3wh9hgbdm7jgajzy5y4xnnr96ca13k"; }; github = { owner = "terraform-providers"; repo = "terraform-provider-github"; - version = "0.1.1"; - sha256 = "0f6nk9nb8h8247rz7x1w11amp0qdcmy1alr8jgd2chrjv9f8nif0"; + version = "1.0.0"; + sha256 = "0nca90s4bangraly1pcn3jfkfksaw0g2chs5ba6m7z6bhkrj2ylb"; }; gitlab = { owner = "terraform-providers"; repo = "terraform-provider-gitlab"; - version = "0.1.0"; - sha256 = "1xjhpaq2agdshrl5jbq9ak2nxdy86iay5bw16zww2qc5ah21sdg2"; + version = "1.0.0"; + sha256 = "1kxmzdzdb6fc64i2bzch6020zfk0ygms9gh5mm1bypsyqmj4qc6r"; }; google = { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.0.1"; - sha256 = "0l0bpcfjnzlgf3g60iyfr3axw0244w99cf04z7y3bcszk5njipri"; + version = "1.8.0"; + sha256 = "1n01gj9572hhskbl4bsg0fqyg9slv8fpvzp3avmwvg5b2hsj4snh"; }; grafana = { owner = "terraform-providers"; repo = "terraform-provider-grafana"; - version = "0.1.0"; - sha256 = "1m2anc5cyn2p3yh4zn0y6wvzb0s2fz3sfdqm9psvx53266c2c81q"; + version = "1.0.1"; + sha256 = "1dvd7dy039ranlkvnbililk2lzr6cffwc4jsgs6lk3hfxhrq8bns"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "0.1.0"; - sha256 = "1f72lm95bnkhaf2accypdn7xsxcgkqri5fq5mriya4n34c61z3l6"; + version = "0.1.2"; + sha256 = "0dmq5v4bwzndy6l6vx29m5ykn2zhnnbmnla00ad8i7djm1sj1fbg"; }; http = { owner = "terraform-providers"; repo = "terraform-provider-http"; - version = "1.0.0"; - sha256 = "1lks997sxfydm6a9s6vfyljs3j1r7qpg1k1s5ilpg5ckv77nad6g"; + version = "1.0.1"; + sha256 = "1bnqrx4xya3lm5wp4byy6npazll6w1g6bv4rawgncswsgx08zqng"; }; icinga2 = { @@ -228,15 +235,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-influxdb"; - version = "0.1.0"; - sha256 = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5"; + version = "1.0.0"; + sha256 = "1w1izzs22b2w2qmpdxbhaj9kvnfyw0wlq3nigrigwwvqav43knh9"; }; kubernetes = { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - version = "1.0.0"; - sha256 = "1kh7a83f98v6b4v3zj84ddhrg2hya4nmvrw0mjc26q12g4z2d5g6"; + version = "1.1.0"; + sha256 = "1lhdmglc6nd24ss7z41qqbpsiy71ajvixhq4pfiq0b19hwj6awgn"; }; librato = { @@ -249,8 +256,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-local"; - version = "1.0.0"; - sha256 = "1dxdpmai8f0g1gj6khgv769lhg6ssfmgqskg4c5qf1jnv8yn8mkd"; + version = "1.1.0"; + sha256 = "1qxfyyg8k43rw0gny4dadamc2a9hk3x6ybdivifjc17m7il0janc"; }; logentries = { @@ -259,6 +266,13 @@ version = "0.1.0"; sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa"; }; + logicmonitor = + { + owner = "terraform-providers"; + repo = "terraform-provider-logicmonitor"; + version = "1.1.0"; + sha256 = "16blwfbvx80j5s6809wrlfnkq0qvjasz0zi4ykwzvkqxh00igj7r"; + }; mailgun = { owner = "terraform-providers"; @@ -270,29 +284,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-mysql"; - version = "0.1.0"; - sha256 = "0vjr97xf15va9qypjb9318h1nxr0sd6ydcy7ijnqb8538v3581mv"; + version = "1.1.0"; + sha256 = "06alk5vd20wzf493dw8hb80q0sx0kw4j8g1sd0193fhni0k4rflw"; }; newrelic = { owner = "terraform-providers"; repo = "terraform-provider-newrelic"; - version = "0.1.1"; - sha256 = "1fqgxcspkgm3ncsqbvw79h5n09agba7q80nz0mrq09x0pyk8y051"; + version = "1.0.0"; + sha256 = "1bcxq4f50qci54gckx4yax2v2qpazp10n5vcci4cba0bf5l8zx62"; }; nomad = { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - version = "1.0.0"; - sha256 = "01fvw7yw8dhjclipnn9h1blagbp2849ahmnqj3ysh13i0x1qbq4r"; + version = "1.2.0"; + sha256 = "1z3knyjn5ymbk4vaja4ka9zn57cgl7vr7hqv6ybqw0q9i2ykaici"; }; ns1 = { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - version = "0.1.0"; - sha256 = "1in9ggrvxfb3maxhgiv997hndkpnqpgx1c1365lfizhp7km5ncvj"; + version = "1.0.0"; + sha256 = "0zjdhz6miwlg3b68pbd99c6nw7hhyzxy736734xz8g3w89xn18f5"; }; null = { @@ -305,22 +319,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-oneandone"; - version = "0.1.0"; - sha256 = "18bbpcprjib4d4skjdr76xjxi9091h5b3dls68y6bxkk6sh6av1i"; + version = "1.0.0"; + sha256 = "0q14r36iyn1c1wfky42imkzvkys5znj1yzq27iaxnrsqp4hh7pl2"; }; opc = { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "0.1.3"; - sha256 = "00h531pikjrmra2sr24lnx2z0dvycshd0qpz3wa733mkvvm47p07"; + version = "1.1.0"; + sha256 = "19yip5v00b57j3h7870hw51nsxcwib7mlhdzzn276z74af6zirsr"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "0.2.2"; - sha256 = "1027pqv1cvyvakn4kgivd720g9na38nam5bb5fjyd4d04xpq9v90"; + version = "1.3.0"; + sha256 = "0pyp95i6z6il2kl28cvilqi81wqs076d6f0zacjyvmn1d0blqrnx"; + }; + opentelekomcloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-opentelekomcloud"; + version = "1.0.0"; + sha256 = "1wra9a6cjgsyvbfldvi2xnjk6y9zqv3y06pbq8c8dyjzssd5j591"; }; opsgenie = { @@ -329,33 +350,47 @@ version = "0.1.0"; sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm"; }; + oraclepaas = + { + owner = "terraform-providers"; + repo = "terraform-provider-oraclepaas"; + version = "1.0.0"; + sha256 = "1h66ijnq172zk0bkv68iq0sy5l6jlasa2pi9q8fq54ib9sxnfkk2"; + }; ovh = { owner = "terraform-providers"; repo = "terraform-provider-ovh"; - version = "0.1.0"; - sha256 = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr"; + version = "0.2.0"; + sha256 = "12dpgx0fpmqw64v5a70fihbgixyw71bdjbdi17gal7s2pj1xw159"; }; packet = { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "1.0.0"; - sha256 = "0ibz9k1yfqkfsmqmv1pl2jwzbld0l6f7zd8y80iw0v5wswclswya"; + version = "1.2.0"; + sha256 = "0jk8wwm7srjxc3mspqd9szlq8fd63bhdgkzwdjr2fvv4ivj17xp4"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "0.1.2"; - sha256 = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm"; + version = "1.0.0"; + sha256 = "113anbcpp8ab111jm19h7d9i5sds76msgnk8xvwk8qf6500ivfqa"; + }; + panos = + { + owner = "terraform-providers"; + repo = "terraform-provider-panos"; + version = "1.0.0"; + sha256 = "1pslp8pas1p90bmxp1yqmackqkbxrw2sgcm88ibz8l4k43vwks76"; }; postgresql = { owner = "terraform-providers"; repo = "terraform-provider-postgresql"; - version = "0.1.0"; - sha256 = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j"; + version = "0.1.1"; + sha256 = "0ls5z02vaalcrbaq375qnk0267pb17rpsx4s3plfnr7qclv21pwn"; }; powerdns = { @@ -368,8 +403,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - version = "0.1.2"; - sha256 = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp"; + version = "1.1.1"; + sha256 = "0sn48adgpjw20a6jwagarnh5jasq0v36zsbd204j0vx4iam3vm9m"; }; rabbitmq = { @@ -382,15 +417,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - version = "1.0.0"; - sha256 = "1fs8p0l8f79b1s2g0p5zlq1has9i7w3bmv76vrm79076v7w2v0d6"; + version = "1.2.0"; + sha256 = "0xxff4mh4cv27mignvanhsz5sf5476ljk7q4h67fy4y0gzyxwpzw"; }; random = { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "1.0.0"; - sha256 = "0im4dsnbpbc9qln92lxcrygm9d705bvlhigpx492172cq1fqnw61"; + version = "1.1.0"; + sha256 = "1mal0pg37a99q0sjqbccwc2ipwvxm8lqp93lg8i96f868hiv4yzl"; }; rundeck = { @@ -403,8 +438,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "0.1.1"; - sha256 = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6"; + version = "1.2.0"; + sha256 = "123rjvslq7gy2m96rikm0i2298jjpsnyh9civbyvbxj3h47z9h4v"; }; softlayer = { @@ -438,22 +473,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-terraform"; - version = "1.0.0"; - sha256 = "0icyyi4h48yh5235p5svm4p0jzbqqm1f3846dqy37czhjfcrn3gh"; + version = "1.0.2"; + sha256 = "1aj6g6l68n9kqmxfjlkwwxnac7fhha6wrmvsw4yylf0qyssww75v"; }; tls = { owner = "terraform-providers"; repo = "terraform-provider-tls"; - version = "1.0.0"; - sha256 = "063ai5zipmkwq0nr5c25gqsr970r8aba12ynxg9x8cnay0zn9s95"; + version = "1.1.0"; + sha256 = "1kzq6al9rzpmk98bmxcf5gjx5s28gfjp1xvdsnd4a113pljn0ddb"; }; triton = { owner = "terraform-providers"; repo = "terraform-provider-triton"; - version = "0.2.1"; - sha256 = "0ds2anr65xx9kdjv6x68lcxgl3js6l0m2cbx3kwx5465m01m3gxz"; + version = "0.4.2"; + sha256 = "0nid5sp8xskw5wmc0dbkw6m87bmyb37p9ck9xm74nrvdzqjxz5ml"; }; ultradns = { @@ -466,8 +501,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "0.1.0"; - sha256 = "1rr4gaqfr6panjjdb5xx9vbq7701zjps0l75zi526kij1pph98p1"; + version = "1.0.0"; + sha256 = "1v4b8zs0s48gqgsh719hwi69i4h8i5vvp2g5m881z5yzv7n7haqw"; }; vcd = { @@ -480,7 +515,7 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "0.4.1"; - sha256 = "0afxvjx9zb9ym0cs8j15s6nfp20rmmifjdc098wcfjmgnw6p7f01"; + version = "1.3.3"; + sha256 = "1z6v8hagpjm8573d36v3nak5h7hn3jyq2f4m93k1adygvs3n9yx7"; }; } diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index 8d41df24d8cecb343c4c5085cd81b27c79012c46..40117b4585506c2c47a3d008a3f4ee98f8a8181b 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -11,11 +11,15 @@ let inherit owner repo sha256; rev = "v${version}"; }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/${repo}{,_v${version}}"; }; maybeDrv = name: data: - # vsphere is currently broken - if name == "vsphere" then null + # azure-classic is an archived repo + if name == "azure-classic" then null else toDrv data; in lib.mapAttrs maybeDrv list diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index d857e4f187003d340287c9ff41e9cc58a748cbfa..16eb6004e3eef324f19745f512cfc9f036f3c8f6 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -71,7 +71,7 @@ fi org=terraform-providers -repos=$(get_org_repos "$org" | grep terraform-provider- | sort) +repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | sort) # Get all the providers with index diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index adbe2ab5a54f4fbe615b82c2fc17d8ae08cef7d4..996c994cf4cfeb53632777cbb299050cc71e090d 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform-full, makeWrapper }: buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.13.0"; + version = "0.14.6"; goPackagePath = "github.com/gruntwork-io/terragrunt"; src = fetchFromGitHub { - rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "18jbz3vchdp5f3f4grl968k706fdcvj71syf7qmriwdyw4ns83wv"; + rev = "v${version}"; + sha256 = "14zg1h76wfg6aa78llcnza7kapnl5ks6m2vg73b90azfi49fmkwz"; }; goDeps = ./deps.nix; @@ -23,7 +23,7 @@ buildGoPackage rec { postInstall = '' wrapProgram $bin/bin/terragrunt \ - --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform + --set TERRAGRUNT_TFPATH ${lib.getBin terraform-full}/bin/terraform ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index ac6bae693952f41e17757a56f845ce236b1ecad9..8432a8366b7afb32357eaea6692b3d719ec92765 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "df374c20d53ed082b8cf0d0da52b1a181abf387b"; - sha256 = "0my26kjx1inh0ajh85n34wrl18mizx627cl0xhxlhcyw01p24792"; + rev = "25253087ea42da08900c4c1fc34c04bdb4a97d5a"; + sha256 = "0p6mf53f4l9b26yc4qlm1s7yls73hsw8klyfhmnxhk2mq8k6ix4m"; }; } { @@ -23,8 +23,17 @@ fetch = { type = "git"; url = "https://github.com/go-errors/errors"; - rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105"; - sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa"; + rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; + sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; + sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; }; } { @@ -32,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "6aae8e4e2dee8131187c6a54b52664796e5a02b0"; - sha256 = "0hxjwph0ghx0732xq62bszk18wb18hdq6vzb6b6bdn3rsdva1d68"; + rev = "64040d90d4ab861e7e833d689dc76a0f176d8dec"; + sha256 = "0g25nx42z6ykd7jqzlrxf161h8lqrpxpddmbspl4w3a84wphhgms"; }; } { @@ -41,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-version"; - rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77"; - sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik"; + rev = "23480c0665776210b5fbbac6eaaee40e3e6a96b7"; + sha256 = "056zs67diq3m7skmmq3pnz6wymfcg55dfs5zf86xkfqqpj10kyf7"; }; } { @@ -50,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; - sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; + rev = "f40e974e75af4e271d97ce0fc917af5898ae7bda"; + sha256 = "1w5w3m40xv85gngw8g1kjbcgah1vl4ardbpg2cxgj1svf80zazxx"; }; } { @@ -59,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab"; - sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx"; + rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; + sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; }; } { @@ -77,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/go-testing-interface"; - rev = "9a441910b16872f7b8283682619b3761a9aa2222"; - sha256 = "0gfi97m6sadrwbq56as3d368c3ipcn3wz8pxqkk7kkba0h5wjc7v"; + rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28"; + sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx"; }; } { @@ -86,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; + rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; + sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; }; } { @@ -95,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "05e8a0eda380579888eb53c394909df027f06991"; - sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv"; + rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; + sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; }; } { @@ -113,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2"; - sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr"; + rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; + sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; }; } ] diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..749b94f7b7ec5740acd856af7c2d8c85bbc00a1d --- /dev/null +++ b/pkgs/applications/networking/compactor/default.nix @@ -0,0 +1,52 @@ +{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, gcc, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }: + +stdenv.mkDerivation rec { + name = "compactor-${version}"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "dns-stats"; + repo = "compactor"; + rev = "${version}"; + sha256 = "1zn6w99xqq5igaz0n89429i78a5pj4nnfn1mm5yv1yfbn1lm0y3l"; + }; + + # cbor-diag, cddl and wireshark-cli are only used for tests. + nativeBuildInputs = [ autoconf automake libtool pkgconfig cbor-diag cddl wireshark-cli ]; + buildInputs = [ + boost + libpcap + openssl + libtins + lzma + ]; + + patchPhase = '' + patchShebangs test-scripts/ + ''; + + preConfigure = '' + sh autogen.sh + substituteInPlace configure \ + --replace "/usr/bin/file" "${file}/bin/file" + ''; + CXXFLAGS = "-std=c++11"; + configureFlags = [ + "--with-boost-libdir=${boost.out}/lib" + "--with-boost=${boost.dev}" + ]; + + doCheck = true; + preCheck = '' + substituteInPlace test-scripts/check-live-pcap.sh \ + --replace "/usr/sbin/tcpdump" "${tcpdump}/bin/tcpdump" + ''; + + meta = with stdenv.lib; { + description = "Tools to capture DNS traffic and record it in C-DNS files"; + homepage = http://dns-stats.org/; + license = [ licenses.boost licenses.mpl20 licenses.openssl ]; + maintainers = with maintainers; [ fdns ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 54fc72fbfae4dcf90019c278277c4c576ac1de0c..56947d6650e480bc9db450c52810ec590b30fe4f 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -1,32 +1,36 @@ -{ stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32 -, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook -, glib_networking }: +{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40 +, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobjectIntrospection +, glib-networking }: stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.4"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "1g6wkzrl6j0mmgafpv0jpqa906s1x7p5hmiqdgs9qwm7q2wlwrqd"; + sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n"; }; - preConfigure = '' - ./autogen.sh - ''; - - nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ + meson ninja vala_0_40 pkgconfig wrapGAppsHook + gobjectIntrospection # for setup hook + ]; buildInputs = [ - gtk3 json_glib sqlite libsoup gettext vala_0_32 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 ]); + glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]); + + postPatch = '' + chmod +x data/meson_post_install.py # patchShebangs requires executable file + patchShebangs data/meson_post_install.py + ''; meta = { description = "Native Gtk+ Twitter client for the Linux desktop"; longDescription = "Corebird is a modern, easy and fun Twitter client."; - homepage = http://corebird.baedert.org; + homepage = https://corebird.baedert.org/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.jonafato ]; diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 93ff39bde64f75e762e3b3fa656934480b61dd0f..62fe4e2e662e1c77dddba5d0cf5351d66d44d3b0 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.nix similarity index 100% rename from pkgs/applications/networking/dropbox-cli/default.nix rename to pkgs/applications/networking/dropbox/cli.nix diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index e9d6c5f306f07c52963c45505291fe5cbc346ed4..2d364450677a61831df3fe95997134ad9ad06947 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "38.4.27"; + version = "40.4.46"; arch = { "x86_64-linux" = "x86_64"; @@ -32,7 +32,7 @@ in buildFHSUserEnv { name = "dropbox"; - targetPkgs = pkgs: with pkgs; with xlibs; [ + targetPkgs = pkgs: with pkgs; with xorg; [ libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXxf86vm libxcb xkeyboardconfig curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt @@ -54,7 +54,7 @@ buildFHSUserEnv { do_install=1 else installed_version=$(cat "$HOME/.dropbox-dist/VERSION") - latest_version=$(printf "${version}\n$installed_version\n" | sort -V | head -n 1) + latest_version=$(printf "${version}\n$installed_version\n" | sort -rV | head -n 1) if [ "x$installed_version" != "x$latest_version" ]; then do_install=1 fi diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 7d815c8fad0813cc2ddf74822588a0da8d48343a..feb6a0ab126582364ca88f87e181c57c21a00d3b 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "errbot-${version}"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "mirror://pypi/e/errbot/${name}.tar.gz"; - sha256 = "1r9w7pmdw77h1hwxns6d0sdg8cndsq1lwkq0y5qiiqr91jz93ajm"; + sha256 = "0nkfq6fx87g7kvxrb5lp8gkb75658cmyffnacpy8jq3a16py3jrr"; }; disabled = !pythonPackages.isPy3k; @@ -15,7 +15,9 @@ pythonPackages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace dnspython3 dnspython + --replace dnspython3 dnspython \ + --replace 'cryptography<2.1.0' cryptography \ + --replace 'pyOpenSSL<17.3.0' pyOpenSSL ''; # tests folder is not included in release @@ -24,7 +26,7 @@ pythonPackages.buildPythonApplication rec { buildInputs = [ glibcLocales ]; propagatedBuildInputs = with pythonPackages; [ webtest bottle threadpool rocket-errbot requests jinja2 - pyopenssl colorlog Yapsy markdown ansi pygments dns pep8 + pyopenssl colorlog Yapsy markdown ansi pygments dnspython pep8 daemonize pygments-markdown-lexer telegram irc slackclient sleekxmpp hypchat pytest ]; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index b7bc2c6c67a0e9ec40c0f66a4da6f9d19bfbca38..80984208460b20523066e361d88dcdb1444ab049 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: +{ stdenv, fetchFromGitHub, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation rec { - name = "esniper-2.33.0"; + name = "esniper-2.33.0.2017-11-06"; - src = fetchurl { - url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz"; - sha256 = "1pck2x7mp7ip0b21v2sjvq86fz12gzw6kig4vvbrghz5xw5b3f69"; + src = fetchFromGitHub { + owner = "yhfudev"; + repo = "esniper"; + rev = "c95140d376db3c991300a7462e6c172b0ccf3eb5"; + sha256 = "1dfb5hmcrvm3yg9ask362c6s5ylxs21szw23dm737a94br37j890"; }; buildInputs = [ openssl curl ]; diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix deleted file mode 100644 index b681f74ed222a23e05b524472ef9003c34bfc402..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses -, gettext, libiconv, makeWrapper, perl, fetchpatch }: - -stdenv.mkDerivation rec { - name = "newsbeuter-2.9"; - - src = fetchurl { - url = "http://www.newsbeuter.org/downloads/${name}.tar.gz"; - sha256 = "1j1x0hgwxz11dckk81ncalgylj5y5fgw5bcmp9qb5hq9kc0vza3l"; - - }; - - buildInputs - # use gettext instead of libintlOrEmpty so we have access to the msgfmt - # command - = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl libiconv ] - ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; - - preBuild = '' - sed -i -e 110,114d config.sh - sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl - export LDFLAGS=-lncursesw - ''; - - patches = [ - (fetchpatch { - url = "https://github.com/akrennmair/newsbeuter/commit/cdacfbde9fe3ae2489fc96d35dfb7d263ab03f50.patch"; - sha256 = "1lhvn63cqjpikwsr6zzndb1p5y140vvphlg85fazwx4xpzd856d9"; - }) - (fetchpatch { - url = "https://github.com/akrennmair/newsbeuter/commit/33577f842d9b74c119f3cebda95ef8652304db81.patch"; - sha256 = "1kwhp6k14gk1hclgsr9w47qg7hs60p23zsl6f6vw13mczp2naqlb"; - }) - # https://github.com/akrennmair/newsbeuter/issues/598 / CVE-2017-14500 - (fetchpatch { - url = "https://github.com/akrennmair/newsbeuter/commit/26f5a4350f3ab5507bb8727051c87bb04660f333.patch"; - sha256 = "1jjxj4z3s4f1n8rfpwyd42a40gjnziykqas6a26s1lsdkklnbp6q"; - }) - # https://github.com/akrennmair/newsbeuter/issues/591 / CVE-2017-12904 - (fetchpatch { - url = "https://github.com/akrennmair/newsbeuter/commit/d1460189f6f810ca9a3687af7bc43feb7f2af2d9.patch"; - sha256 = "1a8k73ckziszsbdwdhcmkfvlmgy955gssg9v4sqvg20v91l5rmai"; - }) - ]; - - installFlags = [ "DESTDIR=$(out)" "prefix=" ]; - - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" - done - ''; - - meta = { - homepage = http://www.newsbeuter.org; - description = "An open-source RSS/Atom feed reader for text terminals"; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..24fed4ca85217b50ff7040c39658877cbf071410 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses +, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }: + +stdenv.mkDerivation rec { + name = "newsboat-${version}"; + version = "2.11.1"; + + src = fetchurl { + url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; + sha256 = "1krpxl854h5dwmpr81m1s84cwk8zivdzvw0s5s0i4dba736pvdma"; + }; + + prePatch = '' + substituteInPlace Makefile --replace "|| true" "" + # Allow other ncurses versions on Darwin + substituteInPlace config.sh \ + --replace "ncurses5.4" "ncurses" + ''; + + nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ] + ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ]; + + buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]; + + makeFlags = [ "prefix=$(out)" ]; + + doCheck = true; + checkTarget = "test"; + + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + + postInstall = '' + cp -r contrib $out + '' + stdenv.lib.optionalString stdenv.isDarwin '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" + done + ''; + + meta = with stdenv.lib; { + homepage = https://newsboat.org/; + description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console."; + maintainers = with maintainers; [ dotlambda nicknovitski ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 72a98a9960460f6141c3bb03254b2a8f014c3369..3a5983c2e276a0a6e580dfdbb8f5b5f2668ba533 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -18,6 +18,5 @@ python2Packages.buildPythonApplication rec { description = "RSS Aggregator Without Delusions Of Grandeur"; license = licenses.gpl2; 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 index 99517b478c32aed7591526152b4dfcf6efa9c755..4152c2772e1042a15031b7cffbd208b6a253a7fd 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -14,16 +14,34 @@ buildPythonApplication rec { sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5"; }; + outputs = [ "out" "man" "doc" ]; + + postPatch = '' + # sendmail executable is called from PATH instead of sbin by default + sed -e 's|/usr/sbin/sendmail|sendmail|' \ + -i rss2email/config.py + ''; + postInstall = '' - install -Dm 644 r2e.1 $out/share/man/man1/r2e.1 + install -Dm 644 r2e.1 $man/share/man/man1/r2e.1 # an alias for better finding the manpage - ln -s -T r2e.1 $out/share/man/man1/rss2email.1 + ln -s -T r2e.1 $man/share/man/man1/rss2email.1 + + # copy documentation + mkdir -p $doc/share/doc/rss2email + cp AUTHORS COPYING CHANGELOG README $doc/share/doc/rss2email/ ''; + # The tests currently fail, see + # https://github.com/rss2email/rss2email/issues/14 + # postCheck = '' + # env PYTHONPATH=.:$PYTHONPATH python ./test/test.py + # ''; + 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 ]; + maintainers = with maintainers; [ jb55 Profpatsch ]; }; } diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index b25d4e109ebc5d2566cb2c98fa9b7feb977b580d..297703cde696e4dfb62fb41482d46821015aa3cb 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "rssguard-${version}"; - version = "3.4.2"; + name = "${pname}-${version}"; + pname = "rssguard"; + version = "3.5.6"; - src = fetchgit { - url = https://github.com/martinrotter/rssguard; - rev = "refs/tags/${version}"; - sha256 = "0iy0fd3qr2dm0pc6xr7sin6cjfxfa0pxhxiwzs55dhsdk9zir62s"; - # Submodules are required only for Windows (and one of them is a huge binary - # package ~400MB). See project wiki for more details. - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "martinrotter"; + repo = pname; + rev = version; + sha256 = "1pdas7hg3nzykm3qi951fk25c9s6gjb7my82b9xzjn2yd7ks71by"; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index fd349b320d28c32a93786ad4ff8d244de149e623..a7fd31cac2ffe4d87f9c85f645c0b58161c6cfb1 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { homepage = http://www.vanheusden.com/rsstail/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index cf41ca1b0b3b142068ee46ababcc5ca7140e0bd8..9efe20b3ee95ec8bbfaa8c29569bd2e9012ff242 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -2,8 +2,8 @@ , autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils , kmod, nettools, procps, tcpdump, traceroute, utillinux, whois -# Just install FireQOS without FireHOL -, onlyQOS ? true +# If true, just install FireQOS without FireHOL +, onlyQOS ? false }: stdenv.mkDerivation rec { @@ -52,6 +52,35 @@ stdenv.mkDerivation rec { AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ '') + + # put firehol config files in /etc/firehol (not $out/etc/firehol) + # to avoid error on startup, see #35114 + (pkgs.writeText "firehol-sysconfdir.patch" + '' + --- a/sbin/install.config.in.in + +++ b/sbin/install.config.in.in + @@ -4 +4 @@ + -SYSCONFDIR="@sysconfdir_POST@" + +SYSCONFDIR="/etc" + '') + + # we must quote "$UNAME_CMD", or the dash in /nix/store/...-coreutils-.../bin/uname + # will be interpreted as IFS -> error. this might be considered an upstream bug + # but only appears when there are dashes in the command path + (pkgs.writeText "firehol-uname-command.patch" + '' + --- a/sbin/firehol + +++ b/sbin/firehol + @@ -10295,7 +10295,7 @@ + kmaj=$1 + kmin=$2 + + - set -- $($UNAME_CMD -r) + + set -- $("$UNAME_CMD" -r) + eval $kmaj=\$1 $kmin=\$2 + } + kernel_maj_min KERNELMAJ KERNELMIN + '') ]; nativeBuildInputs = [ autoconf automake ]; @@ -71,7 +100,7 @@ stdenv.mkDerivation rec { FireHOL, an iptables stateful packet filtering firewall for humans! FireQOS, a TC based bandwidth shaper for humans! ''; - homepage = http://firehol.org/; + homepage = https://firehol.org/; license = licenses.gpl2; maintainers = with maintainers; [ geistesk ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 105239aca024478f5d8afa33754133ec18c053ae..9a71f8911c2591dd1fbbc6b7323708dbe7a1eac9 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,79 +1,72 @@ -{ lib -, fetchFromGitHub -, python -, transmission -, deluge -, config +{ lib, python +, delugeSupport ? true, deluge ? null }: -with python.pkgs; +assert delugeSupport -> deluge != null; + +# Flexget have been a trouble maker in the past, +# if you see flexget breaking when updating packages, don't worry. +# The current state is that we have no active maintainers for this package. +# -- Mic92 + +let + python' = python.override { inherit packageOverrides; }; + + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { + version = "1.1.10"; + src = old.src.override { + inherit version; + sha256 = "1lvb14qclrx0qf6qqx8a8hkx5akk5lk3dvcqz8760v9hya52pnfv"; + }; + }); + }; + +in + +with python'.pkgs; buildPythonApplication rec { - version = "2.10.82"; - name = "FlexGet-${version}"; + pname = "FlexGet"; + version = "2.13.5"; - src = fetchFromGitHub { - owner = "Flexget"; - repo = "Flexget"; - rev = version; - sha256 = "15508ihswfjbkzhf1f0qhn2ar1aiibz2ggp5d6r33icy8xwhpv09"; + src = fetchPypi { + inherit pname version; + sha256 = "1lkmxwy7k4zlcqpigwk8skc2zi8a70vrw21pz80wvmf9yg0wc9z9"; }; - 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 = '' - substituteInPlace requirements.txt \ - --replace "chardet==3.0.3" "chardet" \ - --replace "rebulk==0.8.2" "rebulk" \ - --replace "cherrypy==10.2.2" "cherrypy" \ - --replace "portend==1.8" "portend" \ - --replace "sqlalchemy==1.1.10" "sqlalchemy" \ - --replace "zxcvbn-python==4.4.15" "zxcvbn-python" \ - --replace "flask-cors==3.0.2" "flask-cors" \ - --replace "certifi==2017.4.17" "certifi" \ - --replace "apscheduler==3.3.1" "apscheduler" \ - --replace "path.py==10.3.1" "path.py" \ - --replace "tempora==1.8" "tempora" \ - --replace "cheroot==5.5.0" "cheroot" \ - --replace "six==1.10.0" "six" \ - --replace "aniso8601==1.2.1" "aniso8601" + # remove dependency constraints + sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt ''; - checkPhase = '' - export HOME=. - py.test --disable-pytest-warnings -k "not test_quality_failures \ - and not test_group_quality \ - and not crash_report \ - and not test_multi_episode \ - and not test_double_episodes \ - and not test_inject_force \ - and not test_double_prefered \ - and not test_double \ - and not test_non_ascii" - ''; + # ~400 failures + doCheck = false; - buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ]; propagatedBuildInputs = [ - feedparser sqlalchemy pyyaml chardet - beautifulsoup4 html5lib PyRSS2Gen pynzb - rpyc jinja2 jsonschema requests dateutil jsonschema + feedparser sqlalchemy pyyaml + chardet beautifulsoup4 html5lib + PyRSS2Gen pynzb rpyc jinja2 + jsonschema requests dateutil pathpy guessit_2_0 APScheduler terminaltables colorclass - cherrypy flask flask-restful flask-restplus - flask-compress flask_login flask-cors - pyparsing safe future zxcvbn-python - werkzeug tempora cheroot rebulk portend + cherrypy flask flask-restful + flask-restplus flask-compress + flask_login flask-cors safe + pyparsing future zxcvbn-python + werkzeug tempora cheroot rebulk + portend transmissionrpc aniso8601 + babelfish certifi click futures + idna itsdangerous markupsafe + plumbum pytz six tzlocal urllib3 + webencodings werkzeug 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; + ++ lib.optional delugeSupport deluge; - meta = { - homepage = https://flexget.com/; + meta = with lib; { + homepage = https://flexget.com/; description = "Multipurpose automation tool for content like torrents"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ domenkozar tari ]; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 210d78369da6456b3ff85976185ffe674cb824f2..49ac1d26dda601009a52d3a032a7f95a4c8c5ae8 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.29.0"; in +let version = "3.31.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "0najf2w6p5j4qc8jmglx6j63mph749s5p90lz2nkmwwwy5sfvlga"; + sha256 = "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l"; }; configureFlags = [ diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index b3a9634c8a16f103fe9a8832ee0014387d409824..c3085519ec4cdc5cdff912730ca2f182f7f3bbdc 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "gmailieer"; - version = "0.3"; + version = "0.6"; src = fetchFromGitHub { owner = "gauteh"; repo = "gmailieer"; rev = "v${version}"; - sha256 = "1app783gf0p9p196nqsgbyl6s1bp304dfav86fqiq86h1scld787"; + sha256 = "1z7r78ck81l8xdpjynjv8dfm4j0p6a1cbzgdckp41id27sq1vc76"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 72ffbb6e6d3a135909022f2553e65e61892ea252..74287dc6af4e17a26e61748ba4c62b528f04541e 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,30 +1,33 @@ { callPackage, stdenv }: let - stableVersion = "2.1.0"; - previewVersion = "2.1.0rc4"; # == 2.1.0 + stableVersion = "2.1.5"; + # Currently there is no preview version. + previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; + guiSrcHash = "1d7pwm36bqjm0d021z5qnx49v8zf4yi9jn5hn6zlbiqbz53l1x7l"; + serverSrcHash = "002pqm4jcm5qbbw1vnhjdrgysh7d6xmdl66605wz1vbp7xn5s961"; in { guiStable = mkGui { stable = true; - sha256Hash = "0fms8469daa8jhmsdqnadm18gc27g18q4m974wjfpz9n1rn78sjk"; + sha256Hash = guiSrcHash; }; guiPreview = mkGui { stable = false; - sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s"; + sha256Hash = guiSrcHash; }; serverStable = mkServer { stable = true; - sha256Hash = "1s66qnkhd9rqak13m57i266bgrk8f1ky2wxdha1jj0q9gxdsqa39"; + sha256Hash = serverSrcHash; }; serverPreview = mkServer { stable = false; - sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd"; + sha256Hash = serverSrcHash; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 59380cf6965e0b1c6a0c7be20d382da7924921c8..24050314c413b8fb3184940becc8ce92f923ec15 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -4,39 +4,31 @@ let pythonPackages = python3Packages; - # TODO: Not sure if all these overwrites are really required... - # Upstream seems to have some reasons (bugs, incompatibilities) though. - multidict_3_1_3 = - (stdenv.lib.overrideDerivation pythonPackages.multidict (oldAttrs: + aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp + (oldAttrs: rec { - pname = "multidict"; - version = "3.1.3"; - name = "${pname}-${version}"; + pname = "aiohttp"; + version = "2.3.10"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "04kdxh19m41c6vbshwk8jfbidsfsqn7mn0abvx09nyg78sh80pw7"; + sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; }; - doInstallCheck = false; })); - yarl = (stdenv.lib.overrideDerivation pythonPackages.yarl - (oldAttrs: - { propagatedBuildInputs = [ multidict_3_1_3 ]; })); - aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp + aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs: rec { - pname = "aiohttp"; - version = "2.2.5"; + pname = "aiohttp-cors"; + version = "0.5.3"; name = "${pname}-${version}"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1g6kzkf5in0briyscwxsihgps833dq2ggcq6lfh1hq95ck8zsnxg"; + sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in"; }; - propagatedBuildInputs = [ yarl multidict_3_1_3 ] - ++ (with pythonPackages; [ async-timeout chardet ]); + propagatedBuildInputs = [ aiohttp ] + ++ stdenv.lib.optional + (pythonPackages.pythonOlder "3.5") + pythonPackages.typing; })); - aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors - (oldAttrs: - { propagatedBuildInputs = [ aiohttp ]; })); in pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "gns3-server"; @@ -48,21 +40,18 @@ in pythonPackages.buildPythonPackage rec { sha256 = sha256Hash; }; - propagatedBuildInputs = [ yarl aiohttp aiohttp-cors ] + propagatedBuildInputs = [ aiohttp-cors ] ++ (with pythonPackages; [ + yarl aiohttp multidict jinja2 psutil zipstream raven jsonschema typing prompt_toolkit ]); - postPatch = '' - sed -i 's/yarl>=0.11,<0.12/yarl/g' requirements.txt - ''; - # Requires network access doCheck = false; postInstall = '' - rm $out/bin/gns3loopback # For windows only + rm $out/bin/gns3loopback # For Windows only ''; meta = with stdenv.lib; { description = "Graphical Network Simulator 3 server (${branch} release)"; diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index ddc9df759996821cde54b069b23b070176015f56..87ef5f2a41a20e171da0d17942811eb654a885e0 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchFromGitHub, zlib -, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: +, ocaml, jbuilder, opam, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; - version = "0.6.21"; + version = "0.6.25"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "14qvhz18pzxdgxk5vcs024ajbkxccfwc9p3z5r6vfkc9mm851v59"; + sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp"; }; - nativeBuildInputs = [ ocamlbuild ]; + nativeBuildInputs = [ jbuilder opam ]; buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ]; - configurePhase = "ocaml setup.ml -configure --prefix \"$out\""; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + buildPhase = "jbuilder build @install"; + installPhase = "mkdir $out && jbuilder install --prefix $out"; meta = { homepage = http://gdfuse.forge.ocamlcore.org/; diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 7ae3e8c73611647e20008033d1e14cecca6a7787..577252bc69e0cd25e54f8be016d3e17eb5a7bd11 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -2,11 +2,11 @@ , geoip, gperftools, python, swig }: stdenv.mkDerivation rec { - name = "bro-2.5.2"; + name = "bro-2.5.3"; src = fetchurl { url = "http://www.bro.org/downloads/${name}.tar.gz"; - sha256 = "0w5rynw278nl6pdl5s7gsmxjwkl6z1g5pcm6byg930k26yyb35db"; + sha256 = "09b227j1c0ggihbhbyphd7lnh26mpz07z1s0h148dg6fwqagm13k"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 5261bd451e0b1319e999bb349cdeb15db86f224b..8f4b54cec86ab5bff4de1021a3a107fc7d79b5c4 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { - name = "daq-2.0.6"; + name = "daq-2.2.2"; src = fetchurl { name = "${name}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; - sha256 = "1jz7gc9n6sr677ssv61qvcxybdrmsll4z7g6hsmax2p0fc91s3ml"; + sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w"; }; buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 434ae803f0acf1b22f417e04d88d570ccccc08f8..e3a917a12eb37dd8cfe15c24d2412aeec4bea567 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}: stdenv.mkDerivation rec { - version = "2.9.8.2"; + version = "2.9.11.1"; name = "snort-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; - sha256 = "0cwk02jan0vw6r3jl3vrf31vfp7i4c1r4yhb42h4gyhd6lnh2xa0"; + sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz"; }; buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ]; diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9ec9a3451befd0a7edeba1835c6841b807c7104a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, boost }: + +stdenv.mkDerivation rec { + name = "SkypeExport-${version}"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "Temptin"; + repo = "SkypeExport"; + rev = "v${version}"; + sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + + preConfigure = "cd src/SkypeExport/_gccbuild/linux"; + installPhase = "install -Dt $out/bin SkypeExport"; + + meta = with stdenv.lib; { + description = "Export Skype history to HTML"; + homepage = https://github.com/Temptin/SkypeExport; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ yegortimoshenko ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 10f246957d7a8fa35980597cb602cdb870d73a46..225d622c69f9b66321777b17b8a0a3dd6b2eb486 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,11 +4,11 @@ , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { - version = "0.5.6"; + version = "0.5.8"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "036hvl652zndqj3kmkv8z9pv7r4d1jxq8b7rg8jf0hh82vpyz38l"; + sha256 = "0qk6y83mm7cz4j66d7zy72l7890k7ifqnqbqnjd3bjfn1yjivwfr"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [zlib openssl libre librem diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..00636c7c1e9a41399c872bc58e7f30b8e000e2e6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "bitlbee-discord-2017-12-27"; + + src = fetchFromGitHub { + rev = "6a03db169ad44fee55609ecd16e19f3c0f99a182"; + owner = "sm00th"; + repo = "bitlbee-discord"; + sha256 = "1ci9a12c6zg8d6i9f95pq6dal79cp4klmmsyj8ag2gin90kl3x95"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ bitlbee glib ]; + + preConfigure = '' + export BITLBEE_PLUGINDIR=$out/lib/bitlbee + ./autogen.sh + ''; + + meta = { + description = "Bitlbee plugin for Discord"; + + homepage = https://github.com/sm00th/bitlbee-discord; + license = licenses.gpl2Plus; + maintainers = [ maintainers.lassulus ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 94490d9f03416c70fd6edc5ae5a857d5268c9fcc..9793fd234a18de96fe58dbf514ae0cb1a0f114c1 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json_glib }: +{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - buildInputs = [ bitlbee glib json_glib ]; + buildInputs = [ bitlbee glib json-glib ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index fd05948864c0d24c8323a523a06685c954688d26..1477d0674642971f7701aab88d87479cf0464c9a 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -2,13 +2,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-steam-2015-09-10"; + version = "1.4.2"; + name = "bitlbee-steam-${version}"; src = fetchFromGitHub { - rev = "011375b2d3c67c15d51ca203de0ecaab3b4b7587"; - owner = "jgeboski"; + rev = "v${version}"; + owner = "bitlbee"; repo = "bitlbee-steam"; - sha256 = "1m91x3208z9zxppz998i6060alcalfly9ix9jxismj45xyp6mdx7"; + sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index f0b74370c3c709bf13cb88ad32295c5b3da85ecd..63dec91dad9010a6f7fe6a78e650e3c907380297 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, pythonPackages, libvncserver, zlib +{ stdenv, fetchdarcs, pythonPackages, libvncserver, zlib , gnutls, libvpx, makeDesktopItem }: pythonPackages.buildPythonApplication rec { name = "blink-${version}"; - version = "2.0.0"; + version = "3.0.3"; - src = fetchurl { - url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; - sha256 = "07hvy45pavgkvdlh4wbz3shsxh4fapg96qlqmfymdi1nfhwghb05"; + src = fetchdarcs { + url = http://devel.ag-projects.com/repositories/blink-qt; + rev = "release-${version}"; + sha256 = "1vj6zzfvxygz0fzr8bhymcw6j4v8xmr0kba53d6qg285j7hj1bdi"; }; patches = [ ./pythonpath.patch ]; @@ -15,7 +16,7 @@ pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages; [ pyqt4 cjson sipsimple twisted ]; + propagatedBuildInputs = with pythonPackages; [ pyqt5 cjson sipsimple twisted google_api_python_client ]; buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ]; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 5f868fc9858481464bcf8e6516e3cf2d88a7543d..5b70d747926914170368195413dbdc9286d06d33 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -16,9 +16,10 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ]; - meta = { + meta = with stdenv.lib; { description = "a safe and secure chat client"; homepage = https://coy.im/; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 80e6af9c1ef53956cf502b60e4cf09ee02a8b3bf..fd253c389a27322bcbd473fb9b260ab1cb45d8b1 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub -, vala, cmake, wrapGAppsHook, pkgconfig, gettext -, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking +, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext +, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup , libgcrypt , epoxy -, at_spi2_core +, at-spi2-core , sqlite , dbus , gpgme @@ -13,26 +13,27 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2017-09-26"; + name = "dino-unstable-2018-03-10"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "9d8e1e88ec61403659a8cc410d5c4414e3bd3a96"; - sha256 = "1p8sda99n8zsb49qd6wzwb8hddlgrzr2hp7il5v7yqxjjm2vgqfl"; + rev = "4ccdc1d0920a93b313d81b4014b6f45efb49b1fe"; + sha256 = "0d9698zi09s107zva6cgip7xxmdby0zfmqvka4n0khxrsnii5awq"; fetchSubmodules = true; }; nativeBuildInputs = [ vala cmake + ninja pkgconfig wrapGAppsHook ]; buildInputs = [ gobjectIntrospection - glib_networking + glib-networking glib gnome3.libgee gnome3.defaultIconTheme @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { libXdmcp libxkbcommon epoxy - at_spi2_core + at-spi2-core dbus gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 853a6c96a7a481b0c999c8885b8c6e62f29399e7..76d68880263657211ae2340841d3cf50e2d3000a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,17 +7,18 @@ stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.2"; + version = "0.0.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "0sb7l0rrpqxzn4fndjr50r5xfiid1f81p22gda4mz943yv37mhfz"; + sha256 = "1alw9rkv1vv0s1w33hd9ab1cgj7iqd7ad9kvn1d55gyki28f8qlb"; }; nativeBuildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ + libcxx systemd libpulseaudio stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender @@ -28,15 +29,12 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,opt/discord,share/pixmaps} mv * $out/opt/discord - # Copying how adobe-reader does it, - # see pkgs/applications/misc/adobe-reader/builder.sh - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/opt/discord:$libPath" \ + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ $out/opt/discord/Discord paxmark m $out/opt/discord/Discord - wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib:${libpulseaudio}/lib" + wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : ${libPath} ln -s $out/opt/discord/Discord $out/bin/ ln -s $out/opt/discord/discord.png $out/share/pixmaps diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 283d38ef5c7489ec819fed4a5dba845b06f88b7e..003ffbfc7d1eb1af37d7045be934bb72c4981d9b 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,7 +1,7 @@ { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool -, perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook -, libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret -, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme +, perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook +, libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret +, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool - perl perlXMLParser evolution_data_server gnome_doc_utils avahi - libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite + perl perlXMLParser evolution-data-server gnome-doc-utils avahi + libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite gnome3.libsoup glib gnome3.defaultIconTheme boost autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret libXrandr randrproto which libxslt libtasn1 diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index b01c6497fb238a6f70a1304fc2aa336bf2f35ced..3fd8b932283ec7e9f0796d7c99bfe47f415d395d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,133 +1,67 @@ -{ stdenv, fetchurl, autoreconfHook, python, intltool, pkgconfig, libX11 -, ldns, pythonPackages - -# Test requirements -, xvfb_run - -, enableJingle ? true, farstream ? null, gst-plugins-bad ? null -, libnice ? null -, enableE2E ? true -, enableRST ? true -, enableSpelling ? true, gtkspell2 ? null -, enableNotifications ? false -, enableOmemoPluginDependencies ? true -, extraPythonPackages ? pkgs: [] +{ buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook +, python, gtk3, gobjectIntrospection +, nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow +, xvfb_run, dbus +, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly +, enableE2E ? true, pycrypto, python-gnupg +, enableSecrets ? true, libsecret +, enableRST ? true, docutils +, enableSpelling ? true, gspell +, enableUPnP ? true, gupnp-igd +, enableOmemoPluginDependencies ? true, python-axolotl, qrcode +, extraPythonPackages ? pkgs: [], pythonPackages }: -assert enableJingle -> farstream != null && gst-plugins-bad != null - && libnice != null; -assert enableE2E -> pythonPackages.pycrypto != null; -assert enableRST -> pythonPackages.docutils != null; -assert enableSpelling -> gtkspell2 != null; -assert enableNotifications -> pythonPackages.notify != null; +with lib; -with stdenv.lib; - -stdenv.mkDerivation rec { +buildPythonApplication rec { name = "gajim-${version}"; - version = "0.16.8"; + majorVersion = "1.0"; + version = "${majorVersion}.1"; src = fetchurl { - name = "${name}.tar.bz2"; - url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?" - + "ref=${name}"; - sha256 = "009cpzqh4zy7hc9pq3r5m4lgagwawhjab13rjzavb0n9ggijcscb"; + url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; + sha256 = "16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c"; }; - patches = let - # An attribute set of revisions to apply from the upstream repository. - cherries = { - #example-fix = { - # rev = ""; - # sha256 = ""; - #}; - }; - in (mapAttrsToList (name: { rev, sha256 }: fetchurl { - name = "gajim-${name}.patch"; - url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff"; - inherit sha256; - }) cherries) - ++ [./fix-tests.patch]; # https://dev.gajim.org/gajim/gajim/issues/8660 - postPatch = '' - sed -i -e '0,/^[^#]/ { - /^[^#]/i export \\\ - GST_PLUGIN_PATH="'"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}${"" - }$GST_PLUGIN_PATH"'" - }' scripts/gajim.in - - # requires network access + # This test requires network access echo "" > test/integration/test_resolver.py - - # We want to run tests in installCheckPhase rather than checkPhase to test - # whether the *installed* version of Gajim works rather than just whether it - # works in the unpacked source tree. - sed -i -e '/sys\.path\.insert.*gajim_root.*\/src/d' test/lib/__init__.py - '' + optionalString enableSpelling '' - sed -i -e 's|=.*find_lib.*|= "${gtkspell2}/lib/libgtkspell.so"|' \ - src/gtkspell.py ''; buildInputs = [ - python libX11 - ] ++ optionals enableJingle [ farstream gst-plugins-bad libnice ]; + gobjectIntrospection gtk3 gnome3.defaultIconTheme + ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] + ++ optional enableSecrets libsecret + ++ optional enableSpelling gspell + ++ optional enableUPnP gupnp-igd; nativeBuildInputs = [ - autoreconfHook pythonPackages.wrapPython intltool pkgconfig - # Test dependencies - xvfb_run + gettext wrapGAppsHook ]; - autoreconfPhase = '' - sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash - ''; + propagatedBuildInputs = [ + nbxmpp pyasn1 pygobject3 dbus-python pillow + ] ++ optionals enableE2E [ pycrypto python-gnupg ] + ++ optional enableRST docutils + ++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] + ++ extraPythonPackages pythonPackages; - propagatedBuildInputs = with pythonPackages; [ - libasyncns - pygobject2 pyGtkGlade - pyasn1 - pyxdg - nbxmpp - pyopenssl dbus-python - ] ++ optional enableE2E pythonPackages.pycrypto - ++ optional enableRST pythonPackages.docutils - ++ optional enableNotifications pythonPackages.notify - ++ optionals enableOmemoPluginDependencies (with pythonPackages; [ - cryptography python-axolotl python-axolotl-curve25519 qrcode - ]) ++ extraPythonPackages pythonPackages; + checkInputs = [ xvfb_run dbus.daemon ]; - postFixup = '' - install -m 644 -t "$out/share/gajim/icons/hicolor" \ - "icons/hicolor/index.theme" - - buildPythonPath "$out" - - for i in $out/bin/*; do - name="$(basename "$i")" - if [ "$name" = "gajim-history-manager" ]; then - name="history_manager" - fi - - patchPythonScript "$out/share/gajim/src/$name.py" - done + checkPhase = '' + xvfb-run dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + ${python.interpreter} test/runtests.py ''; - doInstallCheck = true; - installCheckPhase = '' - XDG_DATA_DIRS="$out/share/gajim''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" \ - PYTHONPATH="test:$out/share/gajim/src:''${PYTHONPATH:+:}$PYTHONPATH" \ - xvfb-run make test - ''; - - enableParallelBuilding = true; - meta = { homepage = http://gajim.org/; description = "Jabber client written in PyGTK"; license = licenses.gpl3Plus; - maintainers = [ maintainers.raskin maintainers.aszlig ]; + maintainers = with maintainers; [ raskin aszlig abbradar ]; downloadPage = "http://gajim.org/downloads.php"; updateWalker = true; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch deleted file mode 100644 index cb866bb2d7392afa372de4505d7c4f3abb54fb8c..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 4e116e685c6077aafbb47449698927e68bcc1317..dd1ce2264d5f7bf6cdfaeae299679505d0cb7ac7 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, mesa_noglu, xcbutilkeysyms, xdg_utils, libtool }: +, libGL, xcbutilkeysyms, xdg_utils, libtool }: let - version = "4.30.0.1663"; + version = "4.30.4.1672"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -37,14 +37,14 @@ let expat xcbutilkeysyms systemd - mesa_noglu + libGL ] + ":${stdenv.cc.cc.lib}/lib64"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "13mh49nx75pvaygzi70sg96iad3mn9ym0p4p3ja46amkxbdkq7h7"; + sha256 = "1xrwndhbyhcmjcg8h1ib8lp1g51f7jxdhc6p7776zmhlfw94n3rx"; } else throw "HipChat is not supported on ${stdenv.system}"; @@ -78,8 +78,8 @@ stdenv.mkDerivation { --replace /opt/HipChat4/bin/HipChat4 $out/bin/hipchat makeWrapper $d/HipChat.bin $out/bin/hipchat \ - --set HIPCHAT_LD_LIBRARY_PATH '"$LD_LIBRARY_PATH"' \ - --set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"' \ + --run 'export HIPCHAT_LD_LIBRARY_PATH=$LD_LIBRARY_PATH' \ + --run 'export HIPCHAT_QT_PLUGIN_PATH=$QT_PLUGIN_PATH' \ --set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \ --set QTWEBENGINEPROCESS_PATH $d/QtWebEngineProcess diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 6545b90980e326b24ef414fdd1e48b6d8ab2aef9..9f85c940c1bc24c8f5a25ddd3654d64691b17c3d 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -1,28 +1,29 @@ -{stdenv, fetchFromGitHub, ocamlPackages, opam}: +{ stdenv, fetchFromGitHub, ocamlPackages }: assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { - version = "2017-08-17"; + version = "2017-12-24"; name = "jackline-${version}"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "26688f07c3edc3b83e7aa0b9136cd1e9dcb58ed5"; - sha256 = "0yspgjhp7zy9rzvwl4pxppf5wkpa07y0122s7n09kvr0fzsh6aqf"; + rev = "8678e8a1a06e641218a31ae25150040202f89289"; + sha256 = "05z9kvd7gwr59ic7hnmbayhwyyqd41xxz01cvdlcgplk3z7zlwg5"; }; + patches = [ ./tls-0.9.0.patch ]; + buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib topkg ppx_sexp_conv erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring - ptime notty sexplib_p4 hex uutf opam + ptime notty sexplib hex uutf ]; - buildPhase = with ocamlPackages; - "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build --pinned true"; + buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; - installPhase = "opam-installer --prefix=$out --script | sh"; + inherit (ocamlPackages.topkg) installPhase; meta = with stdenv.lib; { homepage = https://github.com/hannesm/jackline; diff --git a/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch b/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..38f38a03a802422238aa8feadaa08f6b17725aa4 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch @@ -0,0 +1,29 @@ +diff --git a/cli/cli_config.ml b/cli/cli_config.ml +index 991ee77..59a0edb 100644 +--- a/cli/cli_config.ml ++++ b/cli/cli_config.ml +@@ -207,7 +207,9 @@ let configure term () = + ask above "CA file: " (fun x -> x) (fun x -> if Sys.file_exists x then `Ok x else `Invalid) term >>= fun trust_anchor -> + Lwt_unix.access trust_anchor [ Unix.F_OK ; Unix.R_OK ] >>= fun () -> + X509_lwt.certs_of_pem trust_anchor >>= fun tas -> +- (match X509.Validation.valid_cas ~time:(Unix.time ()) tas with ++ let time = match Ptime.of_float_s (Unix.time ()) ++ with Some time -> time | None -> assert false in ++ (match X509.Validation.valid_cas ~time tas with + | [] -> Lwt.fail (Invalid_argument "trust anchor file is empty!") + | _ -> Lwt.return (`Trust_anchor trust_anchor)) + | Some fp -> Lwt.return (`Fingerprint fp) ) >>= fun authenticator -> +diff --git a/cli/cli_state.ml b/cli/cli_state.ml +index d5db502..91540c9 100644 +--- a/cli/cli_state.ml ++++ b/cli/cli_state.ml +@@ -262,7 +262,8 @@ module Connect = struct + (match config.Xconfig.authenticator with + | `Trust_anchor x -> X509_lwt.authenticator (`Ca_file x) + | `Fingerprint fp -> +- let time = Unix.gettimeofday () in ++ let time = match Ptime.of_float_s (Unix.gettimeofday ()) ++ with Some time -> time | None -> assert false in + let fp = + Nocrypto.Uncommon.Cs.of_hex + (String.map (function ':' -> ' ' | x -> x) fp) diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index c4cb25dfe987579b6eea4642e9ca3cf4988ee324..1d03c2f47c89a212792a1b9f6c4fcf8c165251c3 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ khumba ndowens ]; + maintainers = with maintainers; [ ndowens ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch deleted file mode 100644 index bb2d2d39d25a5c8d64e4b6f73fffb2a97418324b..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt ---- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2012-08-30 16:13:17.000000000 +0200 -+++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2014-02-15 10:20:33.368716013 +0100 -@@ -26,7 +26,7 @@ - get_filename_component (_basename ${_current_MOC} NAME_WE) - set (_header ${_abs_FILE}) - set (_moc ${_abs_PATH}/${_current_MOC}) -- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "") -+ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "") - MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc}) - endforeach (_current_MOC_INC) - endif (_match) -Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~ diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix deleted file mode 100644 index d5595fc85aff01ae76d5955ce952c5fe5895908b..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11, - alsaLib, aspell, libidn, qca2, phonon, pkgconfig }: - -stdenv.mkDerivation { - - name = "kadu-0.12.3"; - - src = fetchurl { - url = http://download.kadu.im/stable/kadu-0.12.3.tar.bz2; - sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon - ]; - - configureFlags = "CPPFLAGS=-DQT_NO_DEBUG"; - - preConfigure = '' - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig" - ''; - - cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'"; - - prePatch = '' - patchShebangs . - ''; - - # Disable the kadu plugins I wasn't able to get to work - patchPhase = '' - sed -i -e '/mpd_mediaplayer/d' \ - -e '/encryption_ng/d' \ - -e '/encryption_ng_simlite/d' Plugins.cmake - patch -p1 < ${./cmake.patch} - ''; - - NIX_LDFLAGS="-lX11"; - - meta = { - description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)"; - homepage = http://www.kadu.net/w/English:Main_Page; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.piotr ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 55187f335981ccc7effc2a1b2e8f1bcc90686a29..e0aecd2c810286cf58edbadac552980eab16da7d 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,29 +1,33 @@ { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev -, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip +, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake , libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl +, python, graphviz, belcard }: stdenv.mkDerivation rec { baseName = "linphone"; - version = "3.10.2"; + version = "3.12.0"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "053gad4amdbq5za8f2n9j5q59nkky0w098zbsa3dvpcqvv7ar16p"; + sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; }; buildInputs = [ readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip - bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango + bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango bzrtp belcard ]; - nativeBuildInputs = [ intltool pkgconfig makeWrapper cmake doxygen ]; + nativeBuildInputs = [ + intltool pkgconfig makeWrapper cmake doxygen graphviz + (python.withPackages (ps: [ ps.pystache ps.six ])) + ]; NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/ diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8405769582f7ef759b3a3a983bf1859fb3b2d2ab --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchFromGitHub, fetchurl, cmake, doxygen, lmdb, qt5 }: + +let + json_hpp = fetchurl { + url = https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp; + sha256 = "fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733"; + }; + + variant_hpp = fetchurl { + url = https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp; + sha256 = "1vjiz1x5l8ynqqyb5l9mlrzgps526v45hbmwjilv4brgyi5445fq"; + }; + + matrix-structs = stdenv.mkDerivation rec { + name = "matrix-structs-git"; + + src = fetchFromGitHub { + owner = "mujx"; + repo = "matrix-structs"; + rev = "91bb2b85a75d664007ef81aeb500d35268425922"; + sha256 = "1v544pv18sd91gdrhbk0nm54fggprsvwwrkjmxa59jrvhwdk7rsx"; + }; + + postUnpack = '' + cp ${json_hpp} "$sourceRoot/include/json.hpp" + cp ${variant_hpp} "$sourceRoot/include/variant.hpp" + ''; + + patches = [ ./fetchurls.patch ]; + + nativeBuildInputs = [ cmake doxygen ]; + }; + + tweeny = fetchFromGitHub { + owner = "mobius3"; + repo = "tweeny"; + rev = "b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf"; + sha256 = "1wyyq0j7dhjd6qgvnh3knr70li47hmf5394yznkv9b1indqjx4mi"; + }; + + lmdbxx = fetchFromGitHub { + owner = "bendiken"; + repo = "lmdbxx"; + rev = "0b43ca87d8cfabba392dfe884eb1edb83874de02"; + sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; + }; +in +stdenv.mkDerivation rec { + name = "nheko-${version}"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "mujx"; + repo = "nheko"; + rev = "v${version}"; + sha256 = "1dqd698p6wicz0x1lb6mzlwcp68sjkivanb9lwz3yy1mlmy8i3jn"; + }; + + # This patch is likely not strictly speaking needed, but will help detect when + # a dependency is updated, so that the fetches up there can be updated too + patches = [ ./external-deps.patch ]; + + cmakeFlags = [ + "-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a" + "-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs" + "-DTWEENY_INCLUDE_DIR=${tweeny}/include" + "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Desktop client for the Matrix protocol"; + maintainers = with maintainers; [ ekleog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch new file mode 100644 index 0000000000000000000000000000000000000000..661ae756a4dde6dd73cf2eb0749301a469a87e6c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch @@ -0,0 +1,94 @@ +diff --git a/cmake/LMDBXX.cmake b/cmake/LMDBXX.cmake +index 3b9817d..e69de29 100644 +--- a/cmake/LMDBXX.cmake ++++ b/cmake/LMDBXX.cmake +@@ -1,23 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build lmdbxx. +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(LMDBXX_ROOT ${THIRD_PARTY_ROOT}/lmdbxx) +- +-set(LMDBXX_INCLUDE_DIR ${LMDBXX_ROOT}) +- +-ExternalProject_Add( +- lmdbxx +- +- GIT_REPOSITORY https://github.com/bendiken/lmdbxx +- GIT_TAG 0b43ca87d8cfabba392dfe884eb1edb83874de02 +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${LMDBXX_ROOT} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +-) +diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake +index cef00f6..e69de29 100644 +--- a/cmake/MatrixStructs.cmake ++++ b/cmake/MatrixStructs.cmake +@@ -1,33 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build matrix-structs. +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs) +-set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include) +-set(MATRIX_STRUCTS_LIBRARY matrix_structs) +- +-link_directories(${MATRIX_STRUCTS_ROOT}) +- +-set(WINDOWS_FLAGS "") +- +-if(MSVC) +- set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64") +-endif() +- +-ExternalProject_Add( +- MatrixStructs +- +- GIT_REPOSITORY https://github.com/mujx/matrix-structs +- GIT_TAG 91bb2b85a75d664007ef81aeb500d35268425922 +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${MATRIX_STRUCTS_ROOT} +- CONFIGURE_COMMAND ${CMAKE_COMMAND} +- -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT} +- ${WINDOWS_FLAGS} +- BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release +- INSTALL_COMMAND "" +-) +diff --git a/cmake/Tweeny.cmake b/cmake/Tweeny.cmake +index 537ac92..e69de29 100644 +--- a/cmake/Tweeny.cmake ++++ b/cmake/Tweeny.cmake +@@ -1,23 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build tweeny +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(TWEENY_ROOT ${THIRD_PARTY_ROOT}/tweeny) +- +-set(TWEENY_INCLUDE_DIR ${TWEENY_ROOT}/include) +- +-ExternalProject_Add( +- Tweeny +- +- GIT_REPOSITORY https://github.com/mobius3/tweeny +- GIT_TAG b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${TWEENY_ROOT} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch new file mode 100644 index 0000000000000000000000000000000000000000..e2f72f600ed868591fdc150cb07a49864f6b4343 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 077ac37..c639d71 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,16 +18,6 @@ include(Doxygen) + # + include(CompilerFlags) + +-file(DOWNLOAD +- "https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp" +- ${PROJECT_SOURCE_DIR}/include/json.hpp +- EXPECTED_HASH SHA256=fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733) +- +-file(DOWNLOAD +- "https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp" +- ${PROJECT_SOURCE_DIR}/include/variant.hpp +- EXPECTED_MD5 "be0ce322cdd408e1b347b9f1d59ea67a") +- + include_directories(include) + + set(SRC diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index fbfd36a5928292b8094f1188707c70bc0f1f8eed..457e76d0a82cbf6fac3a245f3b9f55bfa621173a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } : +{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json-glib, nss, nspr, libgnome-keyring } : stdenv.mkDerivation rec { name = "pidgin-opensteamworks-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/ ''; - buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ]; + buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ]; meta = with stdenv.lib; { homepage = https://github.com/EionRobb/pidgin-opensteamworks; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 7ab9b194791553b270a6ae329afec1414d299039..6e589febe6d939ed97b8890bc64a43a45ecb6cfa 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { name = "pidgin-skypeweb-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib ]; + buildInputs = [ pidgin json-glib ]; makeFlags = [ "PLUGIN_DIR_PURPLE=/lib/pidgin/" diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index c69de60c6cf5dc5e6d2e7a3ff8e6a6666a44ce03..f482e12a4bc97527a32d7b8052757070be4dbaea 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pidgin } : let - version = "0.7"; + version = "0.8"; in stdenv.mkDerivation rec { name = "pidgin-xmpp-receipts-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "noonien-d"; repo = "pidgin-xmpp-receipts"; rev = "release_${version}"; - sha256 = "1ackqwsqgy1nfggl9na4jicv7hd542aazkg629y2jmbyj1dl3kjm"; + sha256 = "13kwaymzkymjsdv8q95byd173i4vanj211vgx9cm0y8ag2r3cjsb"; }; buildInputs = [ pidgin ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e41aea497a8594f961029377d2d711bbfb99c6f8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: + +stdenv.mkDerivation rec { + name = "purple-discord-${version}"; + version = "unstable-2018-04-10"; + + src = fetchFromGitHub { + owner = "EionRobb"; + repo = "purple-discord"; + rev = "9a97886d15a1f028de54b5e6fc54e784531063b0"; + sha256 = "0dc344zh1v4yh9c8javcw5ylzwc1wpx0ih8bww8p8cjmhr8kcl32"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin json_glib ]; + + makeFlags = [ + "DESTDIR=$(out)" + ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "/share"; + + meta = with stdenv.lib; { + homepage = https://github.com/EionRobb/purple-discord; + description = "Discord plugin for Pidgin"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ sna ]; + }; +} 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 632f2543f57c10cb19d8c65989a63d6f8a0096e4..37b490304c4f2993b716ef23dfd2c81b6e86cc16 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json_glib, mercurial, autoreconfHook } : +{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, mercurial, autoreconfHook } : let @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [pidgin glib json_glib mercurial]; + buildInputs = [pidgin glib json-glib mercurial]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 07cf66e572a706f9498b53bde5e66b136ff106b6..e304c139eea54fec802403e16e3c9c3e4165bc30 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchhg, pidgin, glib, json_glib, protobuf, protobufc }: +{ stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: stdenv.mkDerivation rec { name = "purple-hangouts-hg-${version}"; - version = "2017-10-08"; + version = "2018-03-28"; src = fetchhg { url = "https://bitbucket.org/EionRobb/purple-hangouts/"; - rev = "5e769791d282a6e5ae4d94dc66a1ff9d6904ec9c"; - sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1"; + rev = "0e137e6bf9e95c5a0bd282f3ad4a5bd00a6968ab"; + sha256 = "04vjgz6qyd9ilv1c6n08r45vc683vxs1rgfwhh65pag6q4rbzlb9"; }; - buildInputs = [ pidgin glib json_glib protobuf protobufc ]; + buildInputs = [ pidgin glib json-glib protobuf protobufc ]; installPhase = '' install -Dm755 -t $out/lib/pidgin/ libhangouts.so diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 2bf67f44c948d4a5ba674d0fd9fda3c60328626e..a6d893fd95a47d84f5f3868b07472b4474ce5ac1 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, pidgin, json_glib, glib, http-parser } : +{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } : let version = "2016-07-11"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib glib http-parser ]; + buildInputs = [ pidgin json-glib glib http-parser ]; installPhase = '' install -Dm755 -t $out/lib/pidgin/ libmatrix.so 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 75251b21aea1aa5505dd977c9730430221c92703..73346888a3358ad284edb9ea2a28d97edfdd509a 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.23.0"; in +let version = "1.23.2"; in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; src = fetchurl { url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz"; - sha256 = "795811ced33fcc5affae259828f6452bfc0e0b02737ea68483e1bd9ec0459013"; + sha256 = "1xj4nn5h103q4agar167xwcp98qf8knrgs918nl07qaxp9g4558w"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index d02c437945e08d693b4c813dba6560a55b985b78..ddb9217d5e225cb6cec4dcb56d6cc514e4855d6d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus -, dbus_glib }: +, dbus-glib }: stdenv.mkDerivation rec { name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus_glib ]; + buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus-glib ]; meta = { homepage = https://github.com/novas0x2a/skype4pidgin; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 68083a7b9d251d4aa49f85abf6fe0e734736dc7a..8527593c1a20d0b26643724fe0752f0750a4ac49 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin libwebp libgcrypt gettext ]; preConfigure = '' - sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/pidgin/server.tglpub|g" telegram-purple.c + sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/purple-2/server.tglpub|g" telegram-purple.c echo "#define GIT_COMMIT \"${builtins.substring 0 10 src.rev}\"" > commit.h ''; installPhase = '' - mkdir -p $out/lib/pidgin/ - cp bin/*.so $out/lib/pidgin/ #*/ - cp tg-server.tglpub $out/lib/pidgin/server.tglpub + mkdir -p $out/lib/purple-2/ + cp bin/*.so $out/lib/purple-2/ #*/ + cp tg-server.tglpub $out/lib/purple-2/server.tglpub mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16 cp imgs/telegram22.png $out/pixmaps/pidgin/protocols/22 diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index cf1893b198e566977685db3b145d4626cf2a3a7e..3ec45702b1754275e859241fa319b6f740e00dda 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell , gst_all_1, startupnotification, gettext , perl, perlXMLParser, libxml2, nss, nspr, farstream -, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn +, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn , lib, python, libICE, libXext, libSM +, cyrus_sasl ? null , openssl ? null , gnutls ? null , libgcrypt ? null @@ -32,8 +33,8 @@ let unwrapped = stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr farstream libXScrnSaver ncurses python - avahi dbus dbus_glib intltool libidn - libICE libXext libSM + avahi dbus dbus-glib intltool libidn + libICE libXext libSM cyrus_sasl ] ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) @@ -55,6 +56,7 @@ let unwrapped = stdenv.mkDerivation rec { "--disable-nm" "--disable-tcl" ] + ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); enableParallelBuilding = true; @@ -78,4 +80,3 @@ in if plugins == [] then unwrapped inherit stdenv makeWrapper symlinkJoin plugins; pidgin = unwrapped; } - diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 002d0345a00075c8a9f4e5a7270450e25efd99ca..5d463648bd8bc2bcf1a82b4397440979d2ab98ae 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -2,7 +2,6 @@ fetchgit, fetchhg, fetchbzr, fetchsvn }: let - isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64; gui = true; # Might be implemented with nixpkgs config. in buildGoPackage rec { @@ -22,11 +21,11 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ trousers gtk3 gtkspell3 ] - ++ stdenv.lib.optional isx86_64 dclxvi + ++ stdenv.lib.optional stdenv.hostPlatform.isx86_64 dclxvi ++ stdenv.lib.optionals gui [ wrapGAppsHook ]; buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui"; excludedPackages = "\\(appengine\\|bn256cgo\\)"; - postPatch = stdenv.lib.optionalString isx86_64 '' + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isx86_64 '' grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ -e "s,bn256\.,bn256cgo.,g" diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 74dc36bc7ac0da20117a0f6ee82d891d7ff2c5a0..327b02b235263611de48ec0b866390572e5ce242 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode -, ncurses, libotr, curl, readline, libuuid +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl +, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid +, cmocka, libmicrohttpd, stabber, expat, libmesode , autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null , notifySupport ? false, libnotify ? null, gdk_pixbuf ? null @@ -20,18 +21,22 @@ stdenv.mkDerivation rec { name = "profanity-${version}"; version = "0.5.1"; - src = fetchurl { - url = "http://www.profanity.im/profanity-${version}.tar.gz"; - sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3"; + src = fetchFromGitHub { + owner = "boothj5"; + repo = "profanity"; + rev = "${version}"; + sha256 = "1ppr02wivhlrqr62r901clnycna8zpn6kr7n5rw8y3zfw21ny17z"; }; + patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ]; + enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook glibcLocales pkgconfig ]; buildInputs = [ - readline libuuid libmesode - glib openssl expat ncurses libotr curl + expect readline libuuid glib openssl expat ncurses libotr + curl libmesode cmocka libmicrohttpd stabber ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ optionals notifySupport [ libnotify gdk_pixbuf ] ++ optionals traySupport [ gnome2.gtk ] @@ -45,6 +50,20 @@ stdenv.mkDerivation rec { ++ optionals pgpSupport [ "--enable-pgp" ] ++ optionals pythonPluginSupport [ "--enable-python-plugins" ]; + preAutoreconf = '' + mkdir m4 + ''; + + doCheck = true; + + LC_ALL = "en_US.utf8"; + + NIX_CFLAGS_COMPILE = [ ] + ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ]; + + LDFLAGS = [ ] + ++ optionals pythonPluginSupport [ "-L${python}/lib" "-lpython${python.majorVersion}m" ]; + meta = { description = "A console based XMPP client"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch new file mode 100644 index 0000000000000000000000000000000000000000..77bfc5e78bd0c6991922ae9c4be399e0ecd0c374 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch @@ -0,0 +1,11 @@ +diff --git a/configure.ac b/configure.ac +index 1e55b1cc..0832a387 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,6 @@ AC_CANONICAL_HOST + PLATFORM="unknown" + AS_CASE([$host_os], + [freebsd*], [PLATFORM="freebsd"], +- [darwin*], [PLATFORM="osx"], + [cygwin], [PLATFORM="cygwin"], + [PLATFORM="nix"]) diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch new file mode 100644 index 0000000000000000000000000000000000000000..9ef4e7bebe54784c420c391c9b6d7d648a183d65 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch @@ -0,0 +1,40 @@ +diff --git a/configure.ac b/configure.ac +index 1e55b1cc..0832a387 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,12 +81,12 @@ elif test "x$enable_python_plugins" != xno; then + AM_CONDITIONAL([BUILD_PYTHON_API], [true]) + AC_DEFINE([HAVE_PYTHON], [1], [Python support]) + else +- if test "x$enable_python_plugins" = xyes; then +- AC_MSG_ERROR([Python not found, cannot enable Python plugins.]) +- else +- AM_CONDITIONAL([BUILD_PYTHON_API], [false]) +- AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.]) +- fi ++ AS_IF( ++ [test "x$enable_python_plugins" = xyes], ++ [], ++ [AM_CONDITIONAL([BUILD_PYTHON_API], [false]) ++ AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])] ++ ) + fi + AS_IF([test "x$PLATFORM" = xosx], [rm -f Python.framework]) + else +@@ -107,7 +105,7 @@ else + [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])], + [AS_IF( + [test "x$enable_c_plugins" = xyes], +- [AC_MSG_ERROR([dl library needed to run C plugins])], ++ [], + [AM_CONDITIONAL([BUILD_C_API], [false])]) + ]) + else +@@ -116,7 +114,6 @@ else + fi + + # threading +-ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])]) + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ]) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index c4d13ac7643dff595a32582d449709c4e03682d2..7c6f33935dc0c257d138e19f6691dc418f3a91cb 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "psi-plus-${version}"; - version = "0.16.575.639"; + version = "1.2.235"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = "${version}"; - sha256 = "0mn24y3y4qybw81rjy0hr46y7y96dvwdl6kk61kizwj32z1in8cg"; + sha256 = "0rc65gs6m3jxg407r99kikdylvrar5mq7x5m66ma604yk5igwg47"; }; resources = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 0e052e847ccb9932a8c4f56fe5480b90211d2bd7..654c343caa8b50bf44147d9fae0ee58c48b9d4fd 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8"; }; - propagatedBuildInputs = with pythonPackages; [ msgpack pyqt4 numpy pyopencl ] ++ [ openssl ]; + propagatedBuildInputs = with pythonPackages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 9cf6f4f2a40876c28f648f818dd0e4042c00db52..bbad5a68180727751ca8a252dd60af821415d7d7 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -3,17 +3,17 @@ libpthreadstubs, libXdmcp, libXScrnSaver, qtbase, qtsvg, qttools, qttranslations, ffmpeg, filter-audio, libexif, libsodium, libopus, - libvpx, openal, opencv, pcre, qrencode, sqlcipher }: + libvpx, openal, pcre, qrencode, sqlcipher }: mkDerivation rec { name = "qtox-${version}"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; rev = "v${version}"; - sha256 = "1l1k8s10jj6nm9i33m8xhjwdhikvp7csdp6x1gxjxdj526aak8q9"; + sha256 = "08x71p23d0sp0w11k8z3wf3k56iclmdq9x652n8ggidgyrdi9f6y"; }; buildInputs = [ @@ -21,7 +21,7 @@ mkDerivation rec { libpthreadstubs libXdmcp libXScrnSaver qtbase qtsvg qttranslations ffmpeg filter-audio libexif libopus libsodium - libvpx openal opencv pcre qrencode sqlcipher + libvpx openal pcre qrencode sqlcipher ]; nativeBuildInputs = [ cmake pkgconfig qttools ]; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 08625d3212350cd942f0ab4e2144dd65b3c46126..768ab24c2f390c9c625b49ba90c1c3260ac6c35c 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,29 +1,29 @@ -{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, cmake }: - -mkDerivation rec { - name = "quaternion-git-${version}"; - version = "2017-10-07"; - - # 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 = "1007f2ca4ad5e8cc5dba437d6a0cdea07d1f1332"; - sha256 = "0hvc81ld7fcwyrxsr2q3yvzh0rzhgmflby4nmyzcbjds7b7pv0xq"; - fetchSubmodules = true; +{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake, libqmatrixclient }: + +stdenv.mkDerivation rec { + name = "quaternion-${version}"; + version = "0.0.5"; + + # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source + + src = fetchFromGitHub { + owner = "QMatrixClient"; + repo = "Quaternion"; + rev = "v${version}"; + sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd"; }; - buildInputs = [ qtbase qtquickcontrols ]; + buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; + nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-Wno-dev" - ]; + enableParallelBuilding = true; + + # take the source from libqmatrixclient + postPatch = '' + rm -rf lib + ln -s ${libqmatrixclient.src} lib + ''; postInstall = '' substituteInPlace $out/share/applications/quaternion.desktop \ diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 543bf64252509d16f238bb3b15ac146fc0a714d4..594004fd2949b0d551b145cdb586f05214406e0e 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha, auth0ClientID, auth0Domain }: +{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha +, auth0ClientID, auth0Domain, disableTooltips }: stdenv.mkDerivation rec { name = "rambox-bare-${version}"; @@ -20,7 +21,8 @@ stdenv.mkDerivation rec { sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4"; }; - patches = [ ./hide-check-for-updates.patch ./isDev.patch ]; + patches = [ ./hide-check-for-updates.patch ./isDev.patch ] + ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ]; configurePhase = '' echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 05e1d902dd7bdcd9c668dcb01e1dc3ec025c2fce..a601db8c8da5d2d9f30d1b4a0a7e7eeeb074a64d 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,16 +1,14 @@ { stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem -# These credentials are only for this derivation. If you want to get credentials -# for another distribution, go to https://auth0.com. If you want to reuse the same -# domain, drop a line at yegortimoshenko@gmail.com! , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" -, auth0Domain ? "nixpkgs.auth0.com" }: +, auth0Domain ? "nixpkgs.auth0.com" +, disableTooltips ? false }: let callPackage = newScope self; self = { fetchNodeModules = callPackage ./fetchNodeModules.nix {}; rambox-bare = callPackage ./bare.nix { - inherit auth0ClientID auth0Domain; + inherit auth0ClientID auth0Domain disableTooltips; }; sencha = callPackage ./sencha {}; }; diff --git a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch new file mode 100644 index 0000000000000000000000000000000000000000..5ddaa9d51771b965ac98b07a5ecbbe2dc8b57179 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch @@ -0,0 +1,19 @@ +--- index.html.orig 2017-12-16 20:06:03.401298402 +0300 ++++ ./index.html 2017-12-16 20:06:21.474484436 +0300 +@@ -43,14 +43,14 @@ + + + +- --> + + + diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 053e8a9c97399a812f3f644c749f20c679d4b971..5d004db60e3ad10dc51bb7383cbdbc9209d2a885 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -1,28 +1,34 @@ -{ stdenv, fetchurl, libtoxcore +{ stdenv, fetchgit, libtoxcore , conf ? null }: with stdenv.lib; +let + configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); +in + stdenv.mkDerivation rec { - name = "ratox-0.2.1"; + name = "ratox-0.4"; - src = fetchurl { - url = "http://git.2f30.org/ratox/snapshot/${name}.tar.gz"; - sha256 = "0xnw3zcz9frmcxqhwg38hhnsy1g5xl9yc19nl0vwi5awz8wqqy19"; + src = fetchgit { + url = "git://git.2f30.org/ratox.git"; + rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c"; + sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5"; }; + patches = [ ./ldlibs.patch ]; + buildInputs = [ libtoxcore ]; - configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h"; - preBuild = "makeFlags=PREFIX=$out"; + makeFlags = [ "PREFIX=$(out)" ]; - meta = - { description = "FIFO based tox client"; - homepage = http://ratox.2f30.org/; - license = licenses.isc; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; - }; + meta = { + description = "FIFO based tox client"; + homepage = http://ratox.2f30.org/; + license = licenses.isc; + maintainers = with maintainers; [ ehmry ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch new file mode 100644 index 0000000000000000000000000000000000000000..1406e714310709085c440b3a779decf911b281b7 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch @@ -0,0 +1,5 @@ +--- a/config.mk ++++ b/config.mk +@@ -13 +13 @@ LDFLAGS = -L/usr/local/lib +-LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread ++LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 050eb7765906cd1c90f65df06393231f8d1a1b67..c99130f28a391c35f00a47bd669d33f7e93eea77 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation rec { cp icons/ricochet.png $out/share/pixmaps/ricochet.png ''; + # RCC: Error in 'translation/embedded.qrc': Cannot find file 'ricochet_en.qm' + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "Anonymous peer-to-peer instant messaging"; homepage = https://ricochet.im; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 0632e787c700e1aa14d622f0926d6de1d2f8b515..024902a9c486faae0b02c5437ae73dd5c293a014 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -24,7 +24,7 @@ , gnutls , zlib , jsoncpp -, xlibs +, xorg , libargon2 , cryptopp , openssl @@ -77,7 +77,7 @@ let "${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}"; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { zlib jsoncpp restbed - xlibs.libX11 + xorg.libX11 libargon2 cryptopp openssl @@ -145,5 +145,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch ]; platforms = platforms.linux; + # pjsip' fails to compile with the supplied patch set, see: https://hydra.nixos.org/build/68667921/nixlog/4 + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index db0d874c5897b6cd4977e80ee1934e6501f92bfb..0d3342e6668793a02f2df88430bbab735496f5f8 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch, writeText, conf ? null }: +let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.12.6"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "00hxjhnsm4622hv46xm7lc81kbnzi2iz77qppwma14cbh63jbilv"; + sha256 = "0san8d3dghjkqqv0ypampgl7837mxk9w64ci6fzy1k5d5dmdgvsi"; }; installPhase = '' mkdir -p $out/ cp -R . $out/ + ${lib.optionalString (conf != null) "ln -s ${configFile} $out/config.json"} ''; meta = { diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix new file mode 100644 index 0000000000000000000000000000000000000000..7d6854460d635cdd8f920e37fd41a709df93702f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix @@ -0,0 +1,92 @@ +{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype, +fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, +libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, +nspr, alsaLib, cups, expat, udev +}: +let + rpath = lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + nspr + nss + stdenv.cc.cc + udev + xorg.libxcb + ]; + +in + stdenv.mkDerivation rec { + name = "signal-desktop-${version}"; + + version = "1.1.0-beta.5"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; + sha256 = "1kllym2iazp9i5afrh0vmsqqlh5b8i6f929p5yhl8bl4zd17zwpx"; + } + else + throw "Signal for Desktop is not currently supported on ${stdenv.system}"; + + phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ dpkg ]; + unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p $out + cp -R opt $out + cp -R usr/share $out/share + + chmod -R g-w $out + + # Patch signal + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}:$out/opt/Signal Beta" \ + "$out/opt/Signal Beta/signal-desktop-beta" + + # Symlink to bin + mkdir -p $out/bin + ln -s "$out/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta + + # Fix the desktop link + substituteInPlace $out/share/applications/signal-desktop-beta.desktop \ + --replace "/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta + ''; + + meta = { + description = "Signal Private Messenger for the Desktop (Beta version)"; + homepage = https://signal.org/; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ixmatus benley ]; + platforms = [ + "x86_64-linux" + ]; + # Marked as broken on 2018-04-17. Reason: The most recent version is + # 1.8.0-beta.1, while this is still 1.1.0-beta.5 (2017-12-09). The stable + # package (signal-desktop) should be used instead (currently at version + # 1.7.1, i.e. up-to-date). + broken = true; + }; + } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 0376fb79c9be320596562703b71e19bef3e1ec0d..d524be287cd22c5fa8e62c9b9cfa6f1ad875fedc 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype, -fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr, +fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }: @@ -33,20 +33,20 @@ let nss stdenv.cc.cc udev - xlibs.libxcb + xorg.libxcb ]; in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.0.35"; + version = "1.7.1"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "d9f9d4d54f4121efc8eadf1cf0ff957828088b313e53b66dc540b851c44c1860"; + sha256 = "02zx8ynbvvs260mrvqbsg0fi561da4ni3i9f4bjh53vqn92vhvvq"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; @@ -79,9 +79,10 @@ in meta = { description = "Signal Private Messenger for the Desktop."; - homepage = https://signal.org/; - license = lib.licenses.gpl3; - platforms = [ + homepage = https://signal.org/; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.ixmatus ]; + platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index bfccc4bfcb6c9a9438a9a265dc03f3a5834b2d83..fc8a601f1bea33d0a88b2aff4b17e2a9e43cfa38 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchurl, dpkg, makeWrapper -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2, libsecret -, libnotify, nspr, nss, systemd, xorg, libv4l, libstdcxx5 }: +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2 +, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, systemd, xorg }: let - version = "5.5.0.1"; + # Please keep the version x.y.0.z and do not update to x.y.76.z because the + # source of the latter disappears much faster. + version = "8.18.0.6"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -17,22 +19,23 @@ let fontconfig freetype glib - libsecret glibc - libstdcxx5 + libsecret gnome2.GConf gnome2.gdk_pixbuf gnome2.gtk gnome2.pango - gnome2.gnome_keyring + gnome2.gnome-keyring libnotify + libpulseaudio nspr nss stdenv.cc.cc systemd + libstdcxx5 libv4l xorg.libxkbfile @@ -54,7 +57,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1r65qlsjwp0n0fmlhvbp71h03b3x73r26jk9f4q687sjqnzmkvcr"; + sha256 = "193icz1s385d25qzm5vx58h66m4hfwwmkavn0p3w6631gj617hig"; } else throw "Skype for linux is not supported on ${stdenv.system}"; @@ -82,8 +85,8 @@ in stdenv.mkDerivation { postFixup = '' for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true done ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" @@ -92,15 +95,13 @@ in stdenv.mkDerivation { 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 ]; + maintainers = with stdenv.lib.maintainers; [ panaeon jraygauthier ]; 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 8f107c4f3c378acd09eab4bc4c9968e2336a472a..b1339f6a6948ccdc7a55a4f3aa1285f286dbd556 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ let - version = "2.8.2"; + version = "3.1.0"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -46,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 = "019gzij6m1y9bv561nhbhgf2njp2svjqi5hs907pdjf7xwciwrkm"; + sha256 = "1y8xxfpqvz4q6y1zkna4cp3rqi7p03w5xgr8h1cmym8z66bj7dq3"; } else throw "Slack is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0bcf3493d29eefde6b26247f576ff346ae466f8a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig +, freetype, gdk_pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }: +let + fullPath = stdenv.lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + nspr + nss + pango + udev + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + ] + ":${stdenv.cc.cc.lib}/lib64"; +in +stdenv.mkDerivation rec { + version = "1.8.18"; + name = "stride-${version}"; + + src = fetchurl { + url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb"; + sha256 = "0hpj3i3xbvckxm7fphqqb3scb31w2cg4riwp593y0gnbivpc0hym"; + }; + + dontBuild = true; + dontFixup = true; + + buildInputs = [ dpkg ]; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase ='' + mkdir "$out" + mv usr/* "$out/" + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${fullPath}:\$ORIGIN" \ + "$out/bin/stride" + ''; + + meta = with stdenv.lib; { + description = "Desktop client for Atlassian Stride"; + homepage = https://www.stride.com/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ puffnfresh ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index c14c9ade2dda886366c09481e7c75d0c6221ebc0..ea2030e964b9aac689915b910f616d6b48445527 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { name = "teamspeak-client-${version}"; - version = "3.1.6"; + version = "3.1.8"; 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 "0ncqs5ykk1zsn2lqarf7pr39rbp4h54vaqq1sgqi5irpj6yagzak" - else "222e8abb24de9e3ea00fca10be32340ad88859a4d811afa644c5096aada4996d"; + then "0yav71sfklqg2k3ayd0bllsixd486l0587s5ygjlc9gnchw3zg6z" + else "1agf6jf5hkyxazxqcnvcjfb263p5532ahi7h4rkifnnvqay36v5i"; }; # grab the plugin sdk for the desktop icon @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { free = false; }; maintainers = [ stdenv.lib.maintainers.lhvwb ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index 29026ccdc5ad8120e8f03c5b62e646209de3811e..77a8d57f8b6ffd99970cb05b405772dbc2ff8050 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { description = "Telegram client forked from sigram"; homepage = http://aseman.co/en/products/cutegram/; license = licenses.gpl3; - maintainers = with maintainers; [ profpatsch AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } -#TODO: appindicator, for system tray plugin (by @profpatsch) +#TODO: appindicator, for system tray plugin 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 ec2e65dc4997b6f609ca404126e96af31b4bb890..49368da708e9ad70c66902af71b75d31f6c58378 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 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A fork of libqtelegram by Aseman, using qmake"; homepage = src.meta.homepage; license = licenses.gpl3; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 3f438c6250887fe24878fbfc213e99b051b65bec..c47ce04f1f7dfbcb8ec9f3f9172ac6ef7bf0f88f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,110 +1,18 @@ -{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake -, qtbase, qtimageformats -, gtk3, libappindicator-gtk3, dee -, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio -, gcc -}: - -mkDerivation rec { - name = "telegram-desktop-${version}"; - version = "1.1.23"; - - # Submodules - src = fetchgit { - url = "git://github.com/telegramdesktop/tdesktop"; - rev = "v${version}"; - sha256 = "0pdjrypjg015zvg8iydrja8kzvq0jsi1wz77r2cxvyyb4rkgyv7x"; - fetchSubmodules = true; - }; - - tgaur = fetchgit { - url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; - rev = "885d0594d8dfa0a17c14140579a3d27ef2b9bdd0"; - sha256 = "0cdci8d8j3czhznp7gqn16w32j428njmzxr34pdsv40gggh0lbpn"; - }; - - buildInputs = [ - gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip - libopus alsaLib libpulseaudio - ]; - - nativeBuildInputs = [ pkgconfig gyp cmake gcc ]; - - patches = [ "${tgaur}/tdesktop.patch" ]; - - enableParallelBuilding = true; - - GYP_DEFINES = lib.concatStringsSep "," [ - "TDESKTOP_DISABLE_CRASH_REPORTS" - "TDESKTOP_DISABLE_AUTOUPDATE" - "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" - ]; - - 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; - - preConfigure = '' - - pushd "Telegram/ThirdParty/libtgvoip" - patch -Np1 -i "${tgaur}/libtgvoip.patch" - popd - - sed -i Telegram/gyp/telegram_linux.gypi \ - -e 's,/usr,/does-not-exist,g' \ - -e 's,appindicator-0.1,appindicator3-0.1,g' \ - -e 's,-flto,,g' - - sed -i Telegram/gyp/qt.gypi \ - -e "s,/usr/bin/moc,moc,g" - sed -i Telegram/gyp/qt_rcc.gypi \ - -e "s,/usr/bin/rcc,rcc,g" - - gyp \ - -Dbuild_defines=${GYP_DEFINES} \ - -Gconfig=Release \ - --depth=Telegram/gyp \ - --generator-output=../.. \ - -Goutput_dir=out \ - --format=cmake \ - Telegram/gyp/Telegram.gyp - - cd out/Release - - NUM=$((`wc -l < CMakeLists.txt` - 2)) - sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt - - export ASM=$(type -p gcc) - ''; - - 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/telegram-desktop.desktop > $out/share/applications/telegram-desktop.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" - done - ''; - - meta = with lib; { - description = "Telegram Desktop messaging app"; - license = licenses.gpl3; - platforms = platforms.linux; - homepage = https://desktop.telegram.org/; - maintainers = with maintainers; [ abbradar garbas ]; +{ qt5, stdenv }: + +let + mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; + stableVersion = { + stable = true; + version = "1.2.17"; + sha256Hash = "1lswjn3rnrbps1pd2xhnhggcn1z0i7y71dpr0v9wb1yc8qhh4pi0"; + # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk + archPatchesRevision = "310557"; + archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk"; }; +in { + stable = mkTelegram stableVersion; + preview = mkTelegram (stableVersion // { + stable = false; + }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix new file mode 100644 index 0000000000000000000000000000000000000000..2588340de1deb8ca0e812e0a0395a5a43baaba7b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -0,0 +1,140 @@ +{ stable, version, sha256Hash, archPatchesRevision, archPatchesHash }: + +{ mkDerivation, lib, fetchgit, fetchsvn +, pkgconfig, pythonPackages, cmake, wrapGAppsHook +, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify +, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +}: + +with lib; + +mkDerivation rec { + name = "telegram-desktop-${version}"; + inherit version; + + # Telegram-Desktop with submodules + src = fetchgit { + url = "git://github.com/telegramdesktop/tdesktop"; + rev = "v${version}"; + sha256 = sha256Hash; + fetchSubmodules = true; + }; + + # Arch patches (svn export telegram-desktop/trunk) + archPatches = fetchsvn { + url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; + rev = archPatchesRevision; + sha256 = archPatchesHash; + }; + + # TODO: libtgvoip.patch no-gtk2.patch + patches = [ "${archPatches}/tdesktop.patch" ]; + + postPatch = '' + substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ + --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' + substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \ + --replace '"notify"' '"${libnotify}/lib/libnotify.so"' + ''; + + nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook ]; + + # We want to run wrapProgram manually (with additional parameters) + dontWrapGApps = true; + + buildInputs = [ + qtbase qtimageformats gtk3 libappindicator-gtk3 + dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + ]; + + enableParallelBuilding = true; + + GYP_DEFINES = concatStringsSep "," [ + "TDESKTOP_DISABLE_CRASH_REPORTS" + "TDESKTOP_DISABLE_AUTOUPDATE" + "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + ]; + + NIX_CFLAGS_COMPILE = [ + "-DTDESKTOP_DISABLE_CRASH_REPORTS" + "-DTDESKTOP_DISABLE_AUTOUPDATE" + "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + "-I${minizip}/include/minizip" + # See Telegram/gyp/qt.gypi + "-I${getDev qtbase}/mkspecs/linux-g++" + ] ++ concatMap (x: [ + "-I${getDev qtbase}/include/${x}" + "-I${getDev qtbase}/include/${x}/${qtbase.version}" + "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}" + "-I${getDev libopus}/include/opus" + "-I${getDev alsaLib}/include/alsa" + "-I${getDev libpulseaudio}/include/pulse" + ]) [ "QtCore" "QtGui" "QtDBus" ]; + CPPFLAGS = NIX_CFLAGS_COMPILE; + + preConfigure = '' + pushd "Telegram/ThirdParty/libtgvoip" + patch -Np1 -i "${archPatches}/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,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \ + -e 's,\d+",\d+" | head -n1,g' + sed -i Telegram/gyp/qt_moc.gypi \ + -e "s,/usr/bin/moc,moc,g" + sed -i Telegram/gyp/qt_rcc.gypi \ + -e "s,/usr/bin/rcc,rcc,g" + + gyp \ + -Dbuild_defines=${GYP_DEFINES} \ + -Gconfig=Release \ + --depth=Telegram/gyp \ + --generator-output=../.. \ + -Goutput_dir=out \ + --format=cmake \ + Telegram/gyp/Telegram.gyp + + cd out/Release + + NUM=$((`wc -l < CMakeLists.txt` - 2)) + sed -i "$NUM r $archPatches/CMakeLists.inj" CMakeLists.txt + + export ASM=$(type -p gcc) + ''; + + installPhase = '' + install -Dm755 Telegram $out/bin/telegram-desktop + + mkdir -p $out/share/applications $out/share/kde4/services + install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop" + sed "s,/usr/bin,$out/bin,g" $archPatches/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" + done + ''; + + postFixup = '' + # This is necessary to run Telegram in a pure environment. + # We also use gappsWrapperArgs from wrapGAppsHook. + wrapProgram $out/bin/telegram-desktop \ + "''${gappsWrapperArgs[@]}" \ + --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \ + --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" + sed -i $out/bin/telegram-desktop \ + -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," + ''; + + meta = { + description = "Telegram Desktop messaging app " + + (if stable then "(stable version)" else "(pre-release)"); + license = licenses.gpl3; + platforms = [ "x86_64-linux" "i686-linux" ]; + homepage = https://desktop.telegram.org/; + maintainers = with maintainers; [ primeos abbradar garbas ]; + }; +} 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 c8d24c9b28c1e24aadc77fdaf5efaf61a043adda..0efa7bee1d0ba16e3d3033246b5981f88c96f522 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Telegram API tools for QtQml and Qml"; homepage = src.meta.homepage; license = licenses.gpl3; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 32266d7b42d5b98ab4958b729fddaab37de67b39..2d880bef753e51682c13326a7c884cbd388adf0e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { - name = "telepathy-gabble-0.18.2"; + name = "telepathy-gabble-0.18.4"; src = fetchurl { - url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz"; - sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9"; + url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; + sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls telepathy_glib.python ] + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ] ++ stdenv.lib.optional doCheck dbus_daemon; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://telepathy.freedesktop.org; + homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/; description = "Jabber/XMPP connection manager for the Telepathy framework"; + license = licenses.lgpl21Plus; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 4e4a2a9b6a967ca26e82c0218891fb52d3ab9409..a1669183bb3b7302d28f062664e001bca35dd240 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }: +{ stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; - buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ]; + buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ]; nativeBuildInputs = [ pkgconfig libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index b4fd71b01d44230297138e928e08d8d3c8449b9d..7894554eee4f80070170d491dcc1fb2beb028ce6 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus_glib, telepathy_glib, libxslt, makeWrapper }: +{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 0bd6c2e5f2b5072694fd09f7b7777b9fe3ffbce2..111970ab71126d77fe8c326fa50af93dd54d6572 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig +{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig , gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: stdenv.mkDerivation rec { project = "telepathy-logger"; - name = "${project}-0.8.0"; + name = "${project}-0.8.2"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; }; - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - - nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt - gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; + nativeBuildInputs = [ + makeWrapper pkgconfig intltool libxslt gobjectIntrospection + ]; + buildInputs = [ + dbus-glib libxml2 sqlite telepathy-glib + dbus_libs telepathy-glib.python + ]; configureFlags = "--enable-call"; @@ -24,10 +26,11 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = { + meta = with stdenv.lib; { description = "Logger service for Telepathy framework"; - homepage = http://telepathy.freedesktop.org/wiki/Logger ; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # Arbitrary choice + homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; + license = licenses.lgpl21; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.gnu; # Arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 87ae0210bdae48c918255b6dca908926eff97a56..18b3bb06e98fee0ad44933cae4d12abd63e9e274 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper, upower }: +{ stdenv, fetchurl, pkgconfig, gnome3, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { - name = "${pname}-5.16.3"; + name = "${pname}-5.16.4"; pname = "telepathy-mission-control"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi"; + sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"; }; - buildInputs = [ telepathy_glib telepathy_glib.python makeWrapper /*upower*/ ]; # ToDo: optional stuff missing - # 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it + buildInputs = [ telepathy-glib telepathy-glib.python ]; # ToDo: optional stuff missing - nativeBuildInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkgconfig libxslt makeWrapper ]; doCheck = true; @@ -24,8 +23,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An account manager and channel dispatcher for the Telepathy framework"; - homepage = http://telepathy.freedesktop.org/wiki/; + homepage = https://telepathy.freedesktop.org/components/telepathy-mission-control/; license = licenses.lgpl21; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index cbae6af97b8528d46c4a1fb953b5fb6736fa0c86..e060eaabf2819069ef49ed9016779e5647bd7142 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup +{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup , libuuid, openssl, pcre, sqlite, pkgconfigUpstream }: stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { }; # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 - buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl - sqlite pcre telepathy_glib.python ]; + buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl + sqlite pcre telepathy-glib.python ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ]; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 0571946061bc3a2e4c259d5848714ce572a39244..c6b930fc590fe6409dd59ec051c6fc2df3c2f010 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: +# we now have libqmatrixclient so a future version of tensor that supports it +# should use that + stdenv.mkDerivation rec { name = "tensor-git-${version}"; version = "2017-02-21"; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 700fab061164033fc436ddb67dcaaf116a77af3e..06bcd7a0400ecb4eea44c86aeeb45b561964602a 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; platforms = platforms.unix; - broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index d7e960d2329eed75fbaaaa1be3b3960a3f9144df..3c164820019b6c4b396bf343e75e8c20f81cf793 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,6 +1,6 @@ {fetchurl, stdenv, dpkg, makeWrapper, alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, - libpulseaudio, libxml2, libxslt, mesa, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... + libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: assert stdenv.system == "x86_64-linux"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libpulseaudio libxml2 libxslt - mesa + libGLU_combined nspr nss openssl diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b6a4e7944d3ce8e316c7b11cb14f30dc08d28f4e..03b4b980929c807b80444960c28349d977239e5c 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, system, makeWrapper, +{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem, alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: + libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: let @@ -59,7 +59,7 @@ in stdenv.mkDerivation { ]; installPhase = '' - $preInstallHooks + runHook preInstall packagePath=$out/share/zoom-us mkdir -p $packagePath @@ -88,9 +88,19 @@ in stdenv.mkDerivation { Prefix = $packagePath EOF - $postInstallHooks + runHook postInstall ''; + postInstall = (makeDesktopItem { + name = "zoom-us"; + exec = "$out/bin/zoom-us %U"; + icon = "$out/share/zoom-us/application-x-zoom.png"; + desktopName = "Zoom"; + genericName = "Video Conference"; + categories = "Network;Application;"; + mimeType = "x-scheme-handler/zoommtg;"; + }).buildCommand; + meta = { homepage = https://zoom.us/; description = "zoom.us video conferencing application"; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 93efdb74c0836dec801b55c9bc317aae5393111f..cf3725c35e3d555eea1e3cc58c32b06f1489d51e 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "insync-${version}"; - version = "1.3.17.36167"; + version = "1.3.22.36179"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; - sha256 = "0mvg22psiy4x9g7k1fm9pigz2a70jmin7zg2nfzapfnqjlnrbw3n"; + sha256 = "0jmycpbmfvvpilcycyg6zgpjz6449bs17d2w4jx7m1rvzmpkk140"; } else throw "${name} is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 74c19b07aaa91832343016ffb0ee3106ad03d725..4153d527b9ff60950f0a5541ad360195112ab8a7 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.13"; + version = "0.4.14"; rev = "v${version}"; goPackagePath = "github.com/ipfs/go-ipfs"; @@ -10,7 +10,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "150lhf5999jz0nck5s0fs0fp3pgaj85s7dndh68h9caw1fwpwb4f"; + sha256 = "0gad5y5clkrk5jsjj9gmrlnx8kbn2vg50vka1b8jg7b55hdvvlcg"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "103mlsnqfnnqxh4phr192haaiv98d1bwpvca1sqrxz1216r5x0ik"; + sha256 = "0wvjw8jziwhvfwhksg26qlj2irznl5bs2yll9jkv335pnwb5qi3v"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index a79df085e6bbacb6aa46244f072ab501cb83584a..7c40a4e12a66ddb640d56170c7edd517ed4fa2cf 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ]; meta = { description = "An IRC proxy (bouncer)"; diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index baa0b10fd756a78d8785e93e6c6836bb76825896..b9860fa4227320e079cc766250adf40ee3dbc16c 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 -, libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy +, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy , libsexy, enchant, libnotify, openssl, intltool -, desktop_file_utils, hicolor_icon_theme +, desktop-file-utils, hicolor-icon-theme , autoconf, automake, autoconf-archive }: @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 lua perl python2 pciutils dbus_glib libcanberra_gtk2 libproxy - libsexy libnotify openssl desktop_file_utils hicolor_icon_theme + gtk2 lua perl python2 pciutils dbus-glib libcanberra-gtk2 libproxy + libsexy libnotify openssl desktop-file-utils hicolor-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index c6bb2479bfc1b1e8e25a34d3a797754cb14915db..4807f3419d15a3fcd9c2887d514b79440cff7103 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ii-1.7"; - + name = "ii-1.8"; + src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "176cqwnn6h7w4kbfd66hzqa243l26pqp2b06bii0nmnm0rkaqwis"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; + sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; }; installPhase = '' @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://tools.suckless.org/ii/; + homepage = https://tools.suckless.org/ii/; license = stdenv.lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 75c4f9ac5c930a79f40e723667ca8ffa04cc9b50..b03673a00b667162f17517b393c254b1115233f0 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.1.1"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "1lasb8flic4qc1sd3pvfg9aig5skcxlyx6iy9bk73147r8vzaq75"; + sha256 = "09a9p1yfg0m3w7n2a4axvn8874002ly8x0b543sxihzqk29radpa"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses glib openssl perl libintlOrEmpty ]; + buildInputs = [ ncurses glib openssl perl libintl ]; configureFlags = [ "--with-proxy" diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 5b86e79e99a19b8be073a223447760e9184f7ec3..96218ef87b5f2f03cdd3bce955b2197f082a5715 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -29,13 +29,13 @@ let pname = "konversation"; - version = "1.7.2"; + version = "1.7.4"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0616h59bsw5c3y8lij56v3fhv9by0rwdfcaa83yfxqg4rs26xyaz"; + sha256 = "0y4rj4fcl1wsi3y1fhnzad9nf4llwrnipfm9mfm55kqnx1zmpvqp"; }; buildInputs = [ diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 78646f7a8b2f32257f71a86a22c2df7460500a67..7c685b9df6b9bf92fca6bc63b1adcd23be38858e 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -74,7 +74,7 @@ in with stdenv; mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://quassel-irc.org/; + homepage = https://quassel-irc.org/; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; longDescription = '' Quassel IRC is a cross-platform, distributed IRC client, diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 6f48f44214cccf4462a9b5d43716c254b8d3cbd6..cf72bef62b1774a0435ee67fcb1c4fb44701c030 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; src = fetchurl { - url = "http://dl.suckless.org/tools/sic-${version}.tar.gz"; + url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; }; meta = { description = "Simple IRC client"; - homepage = http://tools.suckless.org/sic/; + homepage = https://tools.suckless.org/sic/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 1b730af54fea4aa27401e5669deb34e3aad46905..b2ea28f0cf8579d55f90cebb4fb40ba57b1b6c82 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -11,7 +11,7 @@ , rubySupport ? true, ruby , tclSupport ? true, tcl , extraBuildInputs ? [] -, configure ? null +, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } , runCommand }: let @@ -29,23 +29,14 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "1.9.1"; + version = "2.0"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1"; + sha256 = "0jd1l67k2k44xmfv0a71im3j4v0gss3a6bd5s84nj3f7lqnfmqdn"; }; - patches = [ - # TODO: Remove this patch when weechat is updated to a release that - # incorporates weechat/weechat#971 - (fetchpatch { - url = https://github.com/lheckemann/weechat/commit/45a4f0565cc745b9c6e943f20199015185696df0.patch; - sha256 = "0x7vv7g0k3b2hj444x2cinyv1mq5bkr6m18grfnyy6swbymzc9bj"; - }) - ]; - outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; enableParallelBuilding = true; @@ -81,6 +72,11 @@ let meta = { homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; + longDescription = '' + You can find more documentation as to how to customize this package + (eg. adding python modules for scripts that would require them, etc.) + on https://nixos.org/nixpkgs/manual/#sec-weechat . + ''; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ]; platforms = stdenv.lib.platforms.unix; @@ -121,9 +117,12 @@ in if configure == null then weechat else ln -s $plugin $out/plugins done ''; - in writeScriptBin "weechat" '' + in (writeScriptBin "weechat" '' #!${stdenv.shell} export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/weechat "$@" - '' + '') // { + unwrapped = weechat; + meta = weechat.meta; + } diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index db36c8dca6170f804b17950f1e8c4fa4c121db04..ec67321400dc6b8ecd141120d7f76bdef2867c39 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -1,18 +1,50 @@ -{ fetchurl, stdenv, ant }: +{ fetchurl, stdenv, jre, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "jmeter-2.11"; + name = "jmeter-${version}"; + version = "4.0"; src = fetchurl { url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; - sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944"; + sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4"; }; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' mkdir $out - cp ./* $out/ -R + + rm bin/*.bat bin/*.cmd + + cp -R * $out/ + + substituteInPlace $out/bin/create-rmi-keystore.sh --replace \ + "keytool -genkey" \ + "${jre}/lib/openjdk/jre/bin/keytool -genkey" + + # Prefix some scripts with jmeter to avoid clobbering the namespace + for i in heapdump.sh mirror-server mirror-server.sh shutdown.sh stoptest.sh create-rmi-keystore.sh; do + mv $out/bin/$i $out/bin/jmeter-$i + wrapProgram $out/bin/jmeter-$i \ + --prefix PATH : "${jre}/bin" + done + + wrapProgram $out/bin/jmeter --set JAVA_HOME "${jre}" + wrapProgram $out/bin/jmeter.sh --set JAVA_HOME "${jre}" + ''; + + doInstallCheck = true; + + checkInputs = [ coreutils ]; + + installCheckPhase = '' + $out/bin/jmeter --version 2>&1 | grep -q "${version}" + $out/bin/jmeter-heapdump.sh > /dev/null + $out/bin/jmeter-shutdown.sh > /dev/null + $out/bin/jmeter-stoptest.sh > /dev/null + timeout --kill=1s 1s $out/bin/jmeter-mirror-server.sh || test "$?" = "124" ''; - meta = { + meta = with stdenv.lib; { description = "A 100% pure Java desktop application designed to load test functional behavior and measure performance"; longDescription = '' The Apache JMeter desktop application is open source software, a 100% @@ -20,9 +52,9 @@ stdenv.mkDerivation rec { measure performance. It was originally designed for testing Web Applications but has since expanded to other test functions. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.garbas ]; + license = licenses.asl20; + maintainers = [ maintainers.garbas ]; priority = 1; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/kget/default.nix b/pkgs/applications/networking/kget/default.nix deleted file mode 100644 index 0dc37d10d1ae5914db361328563c836dea406150..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/kget/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, lib, fetchFromGitHub, - extra-cmake-modules, kdoctools, makeWrapper, - kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme, - kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui -}: - -let - pname = "kget"; - version = "20170903"; - -in mkDerivation { - name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "KDE"; - repo = pname; - rev = "739c0b399faf5a393c7436c0771662596b840fdc"; - sha256 = "0rn6a4xd9zmf9sdjd5b4rh8yky6qm6ffjgjpn4snkdjsn6vm6y43"; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - - buildInputs = [ - kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme - kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui - ]; - - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e2b3d073dd33246a2d808ff6b72a3365eeda7c4f --- /dev/null +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pythonPackages, notmuch }: + +pythonPackages.buildPythonApplication rec { + pname = "afew"; + version = "1.3.0"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz"; + }; + + buildInputs = with pythonPackages; [ setuptools_scm ]; + + propagatedBuildInputs = with pythonPackages; [ + pythonPackages.notmuch chardet dkimpy + ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32; + + makeWrapperArgs = [ + ''--prefix PATH ':' "${notmuch}/bin"'' + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/afewmail/afew; + description = "An initial tagging script for notmuch mail"; + license = licenses.isc; + maintainers = with maintainers; [ garbas andir flokli ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 0324012b278b540d09112568bec8b4eafc356b4f..610b16dab5bc5ba21b78d068799c321c5d58c0d5 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings_desktop_schemas ]; + notmuch boost gnome3.gsettings-desktop-schemas ]; buildPhase = "scons --propagate-environment --prefix=$out build"; installPhase = "scons --propagate-environment --prefix=$out install"; diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..762c6222b58e05381599368b74d52c66dd17358d --- /dev/null +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls, + webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme, + libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection, + hicolor-icon-theme, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "balsa-${version}"; + version = "2.5.5"; + + src = fetchurl { + url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2"; + sha256 = "0p4w81wvdxqhynkninzglsgqk6920x1zif2zmw8bml410lav2azz"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + gobjectIntrospection + hicolor-icon-theme + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + gmime + gnutls + webkitgtk + openssl + libnotify + enchant + gpgme + libcanberra-gtk3 + gtksourceview + libsecret + libesmtp + ]; + + configureFlags = [ + "--with-canberra" + "--with-gpgme" + "--with-gtksourceview" + "--with-libsecret" + "--with-ssl" + "--with-unique" + "--without-gnome" + ]; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://pawsa.fedorapeople.org/balsa/; + description = "An e-mail client for GNOME"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index cccfdbc75608721351c38fabdaa24214f3931863..10daeeab8e13d92bda6c1cc6caa27f42271d8972 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, wrapGAppsHook -, curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme -, libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk24x-gtk2 -, glib_networking, gsettings_desktop_schemas, libSM, libytnef +, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme +, libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager +, openldap , perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 +, glib-networking, gsettings-desktop-schemas, libSM, libytnef # Build options # TODO: A flag to build the manual. @@ -32,34 +32,32 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "claws-mail-${version}"; - version = "3.15.1"; + version = "3.16.0"; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "0hlm2jipyr4z6izlrpvabpz4ivh49i13avnm848kr1nv68pkq2cd"; + sha256 = "1awpr3s7n8bq8p3w10a4j6lg5bizjxyiqp4rqzc2j8cn7lyi64n2"; }; outputs = [ "out" "dev" ]; patches = [ ./mime.patch ]; - hardeningDisable = [ "format" ]; - postPatch = '' substituteInPlace src/procmime.c \ - --subst-var-by MIMEROOTDIR ${shared_mime_info}/share + --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = - [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme - libetpan perl python glib_networking libSM libytnef + [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas hicolor-icon-theme + libetpan perl python glib-networking libSM libytnef ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra_gtk2 + ++ optional enablePluginNotificationSounds libcanberra-gtk2 ++ optional enablePluginNotificationDialogs libnotify ++ optional enablePluginFancy libsoup ++ optional enablePluginRssyl libxml2 @@ -90,7 +88,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; postInstall = '' @@ -103,6 +101,6 @@ stdenv.mkDerivation rec { homepage = http://www.claws-mail.org/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ khumba fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 0aa95ee9532d1870ba98ae632954c1486a01042f..4d0c09c2dcc28b8247227c19a1c7d06f4d6d3752 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "imapfilter-${version}"; - version = "2.6.10"; + version = "2.6.11"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "1011pbgbaz43kmxcc5alv06jly9wqmqgr0b64cm5i1md727v3rzc"; + sha256 = "0cjnp7vqmgqym2zswabkmwlbj21r063vw7wkwxglj08z5qyjl5ps"; }; makeFlagsArray = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c0f015944b0abdac0a372b596d95541c052263a0 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -0,0 +1,84 @@ +{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }: + +stdenv.mkDerivation rec { + name = "inboxer-${version}"; + version = "1.1.2"; + + meta = with stdenv.lib; { + description = "Unofficial, free and open-source Google Inbox Desktop App"; + homepage = "https://denysdovhan.com/inboxer"; + maintainers = [ maintainers.mgttlinger ]; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; + + src = fetchurl { + url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; + sha256 = "100185j10dj044mg5p9xlq7fj7n7xki9qw5xn845dgq0dpj8rkrm"; + }; + + unpackPhase = '' + ar p $src data.tar.xz | tar xJ + ''; + buildInputs = [ binutils patchelf makeWrapper ]; + + preFixup = with stdenv.lib; let + lpath = makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + nss + nspr + freetype + fontconfig + gtk2-x11 + xorg.libX11 + xorg.libXcursor + xorg.libXdamage + xorg.libXi + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libXrender + xorg.libXcomposite + xorg.libXtst + xorg.libXScrnSaver + xorg.libxcb + gdk_pixbuf + glib + gnome2.pango + gnome2.GConf + expat + stdenv.cc.cc.lib + libpulseaudio + libudev + ]; + in '' + patchelf \ + --set-rpath "$out/opt/Inboxer:${lpath}" \ + $out/opt/Inboxer/libnode.so + patchelf \ + --set-rpath "$out/opt/Inboxer:${lpath}" \ + $out/opt/Inboxer/libffmpeg.so + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$out/opt/Inboxer:${lpath}" \ + $out/opt/Inboxer/inboxer + + wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}" + ''; + + installPhase = '' + mkdir -p $out/bin + cp -R usr/share opt $out/ + # fix the path in the desktop file + substituteInPlace \ + $out/share/applications/inboxer.desktop \ + --replace /opt/ $out/opt/ + # symlink the binary to bin/ + ln -s $out/opt/Inboxer/inboxer $out/bin/inboxer + ''; +} diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 2c1678e994fb7f39561974907717d5e813aa39b9..79deab46912bcfe70a50181b4e86d29e68bec4eb 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -1,20 +1,42 @@ -{ stdenv, fetchurl, pkgconfig, lua5_2, file, ncurses, gmime, pcre-cpp -, perl, perlPackages }: +{ stdenv, fetchurl, pkgconfig, lua, file, ncurses, gmime, pcre-cpp +, perl, perlPackages, makeWrapper +, debugBuild ? false +, alternativeGlobalConfigFilePath ? null +}: let - version = "2.9"; + version = "3.1"; + binaryName = if debugBuild then "lumail2-debug" else "lumail2"; + alternativeConfig = builtins.toFile "lumail2.lua" + (builtins.readFile alternativeGlobalConfigFilePath); + + globalConfig = if isNull alternativeGlobalConfigFilePath then '' + mkdir -p $out/etc/lumail2 + cp global.config.lua $out/etc/lumail2.lua + for n in ./lib/*.lua; do + cp "$n" $out/etc/lumail2/ + done + '' else '' + ln -s ${alternativeConfig} $out/etc/lumail2.lua + ''; + + getPath = type : "${lua}/lib/?.${type};"; + luaPath = getPath "lua"; + luaCPath = getPath "so"; in stdenv.mkDerivation { name = "lumail-${version}"; src = fetchurl { url = "https://lumail.org/download/lumail-${version}.tar.gz"; - sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc"; + sha256 = "0vj7p7f02m3w8wb74ilajcwznc4ai4h2ikkz9ildy0c00aqsi5w4"; }; - nativeBuildInputs = [ pkgconfig ]; + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ - lua5_2 file ncurses gmime pcre-cpp + lua file ncurses gmime pcre-cpp perl perlPackages.JSON perlPackages.NetIMAPClient ]; @@ -29,16 +51,26 @@ stdenv.mkDerivation { sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy ''; + buildFlags = if debugBuild then "lumail2-debug" else ""; + + installPhase = '' + mkdir -p $out/bin || true + install -m755 ${binaryName} $out/bin/ + '' + + globalConfig + + '' + wrapProgram $out/bin/${binaryName} \ + --prefix LUA_PATH : "${luaPath}" \ + --prefix LUA_CPATH : "${luaCPath}" + ''; + makeFlags = [ "LVER=lua" "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" + "LUMAIL_LIBS=$(out)/etc/lumail2" ]; - postInstall = '' - cp lumail2.user.lua $out/etc/lumail2/ - ''; - meta = with stdenv.lib; { description = "Console-based email client"; homepage = https://lumail.org/; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index b1ca80fc7e474eae9008c0c7fe1dd264c59205ae..75f34952394eb1462b75de46900cc7420a50963f 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 -, libgnome_keyring3, networkmanager +, libgnome-keyring3, networkmanager , wrapGAppsHook, gnome3 # otherwise passwords are stored unencrypted , withGnomeKeyring ? true @@ -22,7 +22,7 @@ in pythonPackages.buildPythonApplication rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gnome3.defaultIconTheme - ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3; + ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; nativeBuildInputs = [ wrapGAppsHook diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 9c2ab08babcf28b5721d98a85dffe5bcc30690ac..36dc94951d5c883499d9b5c489b7f460ccb53156 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchgit, python2Packages, gnupg1orig, makeWrapper, openssl }: +{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, makeWrapper, openssl, git }: python2Packages.buildPythonApplication rec { name = "mailpile-${version}"; - version = "0.4.1"; + version = "1.0.0rc2"; - src = fetchgit { - url = "git://github.com/pagekite/Mailpile"; - rev = "refs/tags/${version}"; - sha256 = "118b5zwfwmzj38p0mkj3r1s09jxg8x38y0a42b21imzpmli5vpb5"; + src = fetchFromGitHub { + owner = "mailpile"; + repo = "Mailpile"; + rev = "${version}"; + sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj"; }; - patchPhase = '' - substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${python2Packages.python.libPrefix}/site-packages/' + dir" + postPatch = '' + patchShebangs scripts ''; + nativeBuildInputs = with python2Packages; [ pbr git ]; + PBR_VERSION=version; + propagatedBuildInputs = with python2Packages; [ - makeWrapper pillow jinja2 spambayes python2Packages.lxml - pgpdump gnupg1orig + appdirs + cryptography + fasteners + gnupg1orig + jinja2 + pgpdump + pillow + python2Packages.lxml + spambayes ]; postInstall = '' wrapProgram $out/bin/mailpile \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" \ + --set-default MAILPILE_SHARED "$out/share/mailpile" ''; # No tests were found diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ff4507991e4043c18389ca67ae37ce8ee68240da --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libiconv }: + +stdenv.mkDerivation rec { + name = "mblaze-${version}"; + version = "0.3.2"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + + src = fetchFromGitHub { + owner = "chneukirchen"; + repo = "mblaze"; + rev = "v${version}"; + sha256 = "0sgzcf7lpgdix7x4p6wp1jjv9h62rrkca6325c7a9j8r0dbg1fdg"; + }; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/chneukirchen/mblaze; + description = "Unix utilities to deal with Maildir"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = [ maintainers.ajgrf ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index b3a68a7fcb988f13be5e99992c232dfd6d569227..bbd56b188dfd1acd35ddc938be0160051bc24684 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, ncurses, which, perl +{ stdenv, fetchurl, fetchpatch, ncurses, which, perl , gdbm ? null , openssl ? null , cyrus_sasl ? null +, gnupg ? null , gpgme ? null , kerberos ? null , headerCache ? true , sslSupport ? true , saslSupport ? true +, smimeSupport ? false +, gpgSupport ? false , gpgmeSupport ? true , imapSupport ? true , withSidebar ? true @@ -16,22 +19,25 @@ assert headerCache -> gdbm != null; assert sslSupport -> openssl != null; assert saslSupport -> cyrus_sasl != null; -assert gpgmeSupport -> gpgme != null; +assert smimeSupport -> openssl != null; +assert gpgSupport -> gnupg != null; +assert gpgmeSupport -> gpgme != null && openssl != null; with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.9.1"; + version = "1.9.5"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "1c8vv4anl555a03pbnwf8wnf0d8pcnd4p35y3q8f5ikkcflq76vl"; + sha256 = "0lsp72lm3cw490x7lhzia7h8f591bab2mr7qpscaj22fmrj7wqdz"; }; - patchPhase = optionalString (openssl != null) '' - sed -i 's#/usr/bin/openssl#${openssl}/bin/openssl#' smime_keys.pl - ''; + patches = optional smimeSupport (fetchpatch { + url = "https://sources.debian.net/src/mutt/1.7.2-1/debian/patches/misc/smime.rc.patch"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }); buildInputs = [ ncurses which perl ] @@ -64,6 +70,22 @@ stdenv.mkDerivation rec { ++ optional gssSupport "--with-gss" ++ optional saslSupport "--with-sasl"; + postPatch = optionalString (smimeSupport || gpgmeSupport) '' + sed -i 's#/usr/bin/openssl#${openssl}/bin/openssl#' smime_keys.pl + ''; + + postInstall = optionalString smimeSupport '' + # S/MIME setup + cp contrib/smime.rc $out/etc/smime.rc + sed -i 's#openssl#${openssl}/bin/openssl#' $out/etc/smime.rc + echo "source $out/etc/smime.rc" >> $out/etc/Muttrc + '' + optionalString gpgSupport '' + # GnuPG setup + cp contrib/gpg.rc $out/etc/gpg.rc + sed -i 's#\(command="\)gpg #\1${gnupg}/bin/gpg #' $out/etc/gpg.rc + echo "source $out/etc/gpg.rc" >> $out/etc/Muttrc + ''; + meta = { description = "A small but very powerful text-based mail client"; homepage = http://www.mutt.org; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index e0e2a42c4b5bc38f1bd5cc7beb6a1016756ada3f..7bd0ea70dc63387af07c2b0a628925aa9f2cdedb 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, which, autoreconfHook, makeWrapper, writeScript, -ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, -lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42 }: +{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript +, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }: let muttWrapper = writeScript "mutt" '' @@ -15,28 +15,32 @@ let ''; in stdenv.mkDerivation rec { - version = "20171027"; + version = "20180323"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0pwc5zdxc9h23658dfkzndfj1ld3ijyvcxmsiv793y3i4dig0s3n"; + sha256 = "0wxk1fqxk9pf2s43mw7diixv3hpwdry1cyr2xh119gqjc27lrc5w"; }; buildInputs = [ cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb + mime-types ]; nativeBuildInputs = [ - autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which makeWrapper + docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which ]; enableParallelBuilding = true; postPatch = '' + substituteInPlace contrib/smime_keys \ + --replace /usr/bin/openssl ${openssl}/bin/openssl + for f in doc/*.{xml,xsl}* ; do substituteInPlace $f \ --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl \ @@ -44,23 +48,26 @@ in stdenv.mkDerivation rec { done # allow neomutt to map attachments to their proper mime.types if specified wrongly + # and use a far more comprehensive list than the one shipped with neomutt substituteInPlace sendlib.c \ - --replace /etc/mime.types $out/etc/mime.types + --replace /etc/mime.types ${mime-types}/etc/mime.types + + # The string conversion tests all fail with the first version of neomutt + # that has tests (20180223) as well as 20180323 so we disable them for now. + # I don't know if that is related to the tests or our build environment. + # Try again with a later release. + sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c ''; configureFlags = [ - "--enable-debug" - "--enable-gpgme" - "--enable-notmuch" - "--with-curses" - "--with-gss" + "--gpgme" + "--gss" + "--lmdb" + "--notmuch" + "--ssl" + "--sasl" "--with-homespool=mailbox" - "--with-idn" - "--with-lmdb" "--with-mailpath=" - "--with-sasl" - "--with-ssl" - # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail "ac_cv_path_SENDMAIL=sendmail" ]; @@ -72,10 +79,13 @@ in stdenv.mkDerivation rec { postInstall = '' cp ${muttWrapper} $out/bin/mutt - mv $out/share/doc/neomutt/mime.types $out/etc - wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt" + wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" ''; + doCheck = true; + + checkTarget = "test"; + meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.neomutt.org; diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3e235400498f3413c9f15b57ebabd0f221a6d92e --- /dev/null +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, + gettext, openssl +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "notbit-${version}"; + version = "2018-01-09"; + + src = fetchFromGitHub { + owner = "bpeel"; + repo = "notbit"; + rev = "8b5d3d2da8ce54abae2536b4d97641d2c798cff3"; + sha256 = "1623n0lvx42mamvb2vwin5i38hh0nxpxzmkr5188ss2x7m20lmii"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ openssl gettext ]; + + meta = { + description = "A minimal Bitmessage client"; + homepage = https://github.com/bpeel/notbit; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch deleted file mode 100644 index be094c9a397f65a15f2c5be305b6270af409db1d..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a736c0dfd22cd4ab0da86c30a664c91843df1b98 Mon Sep 17 00:00:00 2001 -From: Adam Ruzicka -Date: Sat, 29 Jul 2017 12:16:29 +0200 -Subject: [PATCH] notmuch-0.25 compatibility fix - ---- - notmuch-addrlookup.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/notmuch-addrlookup.c b/notmuch-addrlookup.c -index c5cf5b4..a95ded0 100644 ---- a/notmuch-addrlookup.c -+++ b/notmuch-addrlookup.c -@@ -171,6 +171,13 @@ create_queries (notmuch_database_t *db, - count += tmp; - if (notmuch_query_count_messages_st (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS) - count += tmp; -+#elif LIBNOTMUCH_MAJOR_VERSION >= 5 -+ unsigned int count = 0; -+ unsigned int tmp; -+ if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; -+ if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; - #else - unsigned int count = notmuch_query_count_messages (queries[0]) - + notmuch_query_count_messages (queries[1]); -@@ -233,6 +240,13 @@ run_queries (notmuch_database_t *db, - #if LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3 - if (notmuch_query_search_messages_st (queries[i], &messages) != NOTMUCH_STATUS_SUCCESS) - continue; -+#elif LIBNOTMUCH_MAJOR_VERSION >= 5 -+ unsigned int count = 0; -+ unsigned int tmp; -+ if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; -+ if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; - #else - if (!(messages = notmuch_query_search_messages (queries[i]))) - continue; --- -2.13.3 - diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index f5d48d03c96ae9155db6494d5625a1ffcbc10622..c2cce227576a5a5ee24e5c04bdfb880a35bdd9e0 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -1,32 +1,28 @@ { stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }: +let + version = "9"; +in stdenv.mkDerivation rec { name = "notmuch-addrlookup-${version}"; - version = "7"; src = fetchFromGitHub { owner = "aperezdc"; repo = "notmuch-addrlookup-c"; rev ="v${version}"; - sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk"; + sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib notmuch ]; - # Required until notmuch-addrlookup can be compiled against notmuch >= 0.25 - patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ]; - - installPhase = '' - mkdir -p "$out/bin" - cp notmuch-addrlookup "$out/bin" - ''; + installPhase = "install -D notmuch-addrlookup $out/bin/notmuch-addrlookup"; meta = with stdenv.lib; { description = "Address lookup tool for Notmuch in C"; homepage = https://github.com/aperezdc/notmuch-addrlookup-c; maintainers = with maintainers; [ mog garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 93d180a327b779ec56462fd7af7c91a01f613048..d89219cce5f32b22ea25afdbea5f6bbbaf2a8f7d 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.25"; + version = "0.26.1"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "02z6d87ip1hkipz8d7w0sfklg8dd5fd5vlgp768640ixg0gqvlk5"; + sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk"; }; nativeBuildInputs = [ pkgconfig ]; @@ -40,26 +40,26 @@ stdenv.mkDerivation rec { ++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies postPatch = '' - find test -type f -exec \ + patchShebangs configure + + find test/ -type f -exec \ sed -i \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ - -e "s|gpg |${gnupg}/bin/gpg |" \ - -e "s| gpg| ${gnupg}/bin/gpg|" \ - -e "s|gpgsm |${gnupg}/bin/gpgsm |" \ - -e "s| gpgsm| ${gnupg}/bin/gpgsm|" \ - -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg|" \ "{}" ";" for src in \ - crypto.c \ - notmuch-config.c \ - emacs/notmuch-crypto.el + util/crypto.c \ + notmuch-config.c do substituteInPlace "$src" \ --replace \"gpg\" \"${gnupg}/bin/gpg\" done ''; + # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and + # friends + setOutputFlags = false; + enableParallelBuilding = true; makeFlags = "V=1"; preFixup = optionalString stdenv.isDarwin '' @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { [[ -s "$lib" ]] || die "couldn't find libnotmuch" badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')" - goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')" + goodname="$(find "${talloc}/lib" -name 'libtalloc.*.*.*.dylib')" [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary" [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store" @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; - maintainers = with maintainers; [ chaoflow garbas ]; + maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index b865622efe42ff72417affdab5b66f6f045c4a01..e25dfe834f65fa89d1d26b0adb74b5222d1fa036 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -2,19 +2,20 @@ , notmuch, openssl, pkgconfig, sqlite, xapian, zlib }: stdenv.mkDerivation rec { - version = "2"; + version = "5"; name = "muchsync-${version}"; passthru = { inherit version; }; src = fetchurl { url = "http://www.muchsync.org/src/${name}.tar.gz"; - sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1"; + sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ notmuch openssl sqlite xapian zlib ]; meta = { description = "Synchronize maildirs and notmuch databases"; + homepage = "http://www.muchsync.org/"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ocharles ]; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index 4c768325fee900cf9d6f378f7b47631f52dd882a..766aab39ce307080f7f86275a49ec2ff632fbc53 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -5,7 +5,7 @@ , coreutils , cups , dbus -, desktop_file_utils +, desktop-file-utils , expat , fontconfig , freetype @@ -14,7 +14,7 @@ , glib , gnome2 , libgcrypt -, libgnome_keyring +, libgnome-keyring , libnotify , makeWrapper , nodejs @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb"; + url = "https://edgehill.s3.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb"; sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada"; } else @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { coreutils cups dbus - desktop_file_utils + desktop-file-utils expat fontconfig freetype @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { glib gnome2.GConf gnome2.gtk - libgnome_keyring + libgnome-keyring libnotify nodejs nspr @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gnome2.gnome_keyring ]; + buildInputs = [ gnome2.gnome-keyring ]; nativeBuildInputs = [ makeWrapper ]; @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ $out/share/nylas-mail/nylas - wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome_keyring}/lib"; + wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome-keyring}/lib"; # Fix path to bash so apm can install plugins. substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \ diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index a63bedfb29d2360adf92ac05d55aac21cb81dd88..22bfddc5b570efd9f17bff048c725beed6d9fe44 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,38 +1,36 @@ -{ stdenv, fetchurl, pkgconfig, gtk2 -, openssl ? null -, gpgme ? null -, sslSupport ? true -, gpgSupport ? true -}: +{ stdenv, fetchurl, pkgconfig, gtk2, openssl ? null, gpgme ? null +, gpgSupport ? true, sslSupport ? true }: -with stdenv.lib; - -assert sslSupport -> openssl != null; assert gpgSupport -> gpgme != null; +assert sslSupport -> openssl != null; + +with stdenv.lib; stdenv.mkDerivation rec { name = "sylpheed-${version}"; - version = "3.5.1"; + version = "3.7.0"; src = fetchurl { - url = "http://sylpheed.sraoss.jp/sylpheed/v3.5/${name}.tar.bz2"; - sha256 = "11qhbfyvi5hxv1f448zgbzgrdjj3a4mxj2bfpk6k4bqf7ahh8nis"; + url = "http://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz"; + sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = - [ gtk2 ] - ++ optional sslSupport openssl - ++ optional gpgSupport gpgme; - configureFlags = optional sslSupport "--enable-ssl" - ++ optional gpgSupport "--enable-gpgme"; + buildInputs = [ gtk2 ] + ++ optionals gpgSupport [ gpgme ] + ++ optionals sslSupport [ openssl ]; + + configureFlags = [ + (optional gpgSupport "--enable-gpgme") + (optional sslSupport "--enable-ssl") + ]; meta = { homepage = http://sylpheed.sraoss.jp/en/; - description = "A lightweight and user-friendly e-mail client"; - maintainers = [ maintainers.eelco ]; + description = "Lightweight and user-friendly e-mail client"; + maintainers = with maintainers; [ eelco ]; platforms = platforms.linux ++ platforms.darwin; - license = "GPL"; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 4f714cabf79b0e9266494aca41eb5e053c3e7e7f..9dbc99cac7d0e091482bf72fa588439779aca279 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, config, makeWrapper , gconf , alsaLib -, at_spi2_atk +, at-spi2-atk , atk , cairo , cups , curl -, dbus_glib +, dbus-glib , dbus_libs , fontconfig , freetype @@ -27,11 +27,11 @@ , libXinerama , libXrender , libXt -, libcanberra_gtk2 +, libcanberra-gtk2 , libgnome , libgnomeui , defaultIconTheme -, mesa +, libGLU_combined , nspr , nss , pango @@ -82,12 +82,12 @@ stdenv.mkDerivation { [ stdenv.cc.cc gconf alsaLib - at_spi2_atk + at-spi2-atk atk cairo cups curl - dbus_glib + dbus-glib dbus_libs fontconfig freetype @@ -108,10 +108,10 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra_gtk2 + libcanberra-gtk2 libgnome libgnomeui - mesa + libGLU_combined nspr nss pango diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 7ac8091e1c11f4a7f9032803f56e87fc96489a1b..24b16744ff65dc8bb4040dd58c5e119abf1bf5cf 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,595 @@ { - version = "52.4.0"; + version = "52.7.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ar/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ar/thunderbird-52.7.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "28a0114c665250f419d77f1f3898af6533e1b8b82b546ecd3ca9baf801751fd189239093eaecdabab9a9318fd47020b647086a31676158a21656ff7c477dbbf8"; + sha512 = "af887818b7859b8bfc87e0ac7ff26c1fbb98a50968d18d174bce37c2132a5957a8c5153f0364aa3ec0f636831313dd3bac6512dd6e7f932ed5cc99ed2016e9b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ast/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ast/thunderbird-52.7.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f7b9d53202597ef666ca87eb1f8cbb439af386eb78460558e8bef33502a7eac591d43751beb52319d046d780fb38a78e685fa8cb3baaa6abfef439bed6ab3d1a"; + sha512 = "dcf8ab98558b7d2b8e5d2a97406eb13cc93900fcd60502ea4d8469179d08c55d91e66c7b99a024fbc6705e339750b41d9537d4d81f53f8d1f83461b986a6487a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/be/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/be/thunderbird-52.7.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "a9a39cf4477e469774f2ce7b7012948911009ff2ab26948a177f3efa9e8ccbcb7d7f3d3ab609742fe1d177253dcdeacb78f7b4a9874f3156f6f54203d0ed42ef"; + sha512 = "021f531995db9a0993e830fa8f1da6089d0703424dd8993c23e59939091f58c4baae5ecb6cf51770ff73743c227129ac3215ec46d7181d88cd52a39b2e0e41ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bg/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bg/thunderbird-52.7.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "38fc89a687344467f98cb2e31967aa53f3c502a8f288b5d65e6aa91a578b250c17750ea998d32d58511920a0a5a1224e77e2691a381b7526585e341712d82cbd"; + sha512 = "a60f13e7b2760e19592e99eef1bc52593cabcf1b70b7803dd4262b2743e3c755cb4381ccaf1e75f41d4360897dcac3edd7e79648a6f4e81da4a1e83d67bb3ffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bn-BD/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bn-BD/thunderbird-52.7.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "437d943339c4955b5264f95bdd4aaa2a91d448a393e6561bbb41c078a960100962c1d51bad73172c5f5cd691f713ab34c218ff5c3e3cde3641d8a6ad604f6d75"; + sha512 = "a73074fa5dfaf121b8f12e86dfc29189e9700a71a868f68a70ccd17c47df3a8512700893f981e065c5c20f9432ca764f3c59d4726a2c6abf3fd25530eca0d9a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/br/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/br/thunderbird-52.7.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "5c43e3cc4366792b7c7a44ae36fe2bd9e6b459f540868dcee767193826648b03a4e4a447f83f5787036e48c96e75639a305304e050a91f0925d9ee4db97e5b75"; + sha512 = "28f4bff69059dbd1077641e888b234b0db95feb11bcb1db1ed047f3ab12282b9f95138835cca5f7eeb87a15ec1057b60587cadcb5fd658fbbe4c556d7eeed47a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ca/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ca/thunderbird-52.7.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "c2243ee5f160f786ebced364432b4a3b489699a3f024a8da327cfaa3c5e2d0d58884870311416fcb019723d5bfec8294440c701c6c453c15346f5f765c4449c0"; + sha512 = "a9e45eda2b36bb12321140854e685fe4e203c7f56c1c8184a776c38d984f8381c6553cb5f601677f8e0e74ad497a040a18f5f392b99bdbe9535e19aa9afdcb7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cs/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cs/thunderbird-52.7.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "332faf549d1d988defdce1531fb4cc81e5f1565423f3e24ebfe16581275224539ed50857dec04c8aa66cc55372a76b676816831d08842bbafd227ca3058f9b5b"; + sha512 = "2c0f60ccc5c9a9fd66526af3aedbe2749f35a5fa7509c93b7b60d9babb1b4968eac6bff48d042ac8112793fe2825467de4d0efc42afda19547e8c6803b723119"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cy/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cy/thunderbird-52.7.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "bfe220ed1e1d8d156f0c1cf7ea11b0778bc0b23f7335b90c65bf581c9e2cd22db9a7f5d48d7a6a95f1d21693714a216d2a24249f36aed7ce097f205d4d05d6f3"; + sha512 = "611ffc3d156ce4cedec0679bd9af3e8376dca5b20af2457a75d83dac7c71640a23a6cd544c190551480d6b37bcb9a9ec91342c2bca95cf10acb642d067056a04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/da/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/da/thunderbird-52.7.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "dcff4359821cb6b24ba129671a1716394afd642a5c4b887a1905baf82cf5d2a94512a547780cd42b1478f443f59db5a3363a52d719824af050dd69af54f97a02"; + sha512 = "0b858b5be09e038983a21715f58a215ea70fd811f7c8acd4ddb89611dd5590599339ab26913865b2ba75f4538cc95bd3e38e28646c281c041b0b08002aef033a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/de/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/de/thunderbird-52.7.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "f5071c052814eab801f3d2c98751c05486b211f23b511b27a1ad5810634b763ada3bd890288e4934c16a28742ef023ef089de9d84a188f6e19d07f471b289583"; + sha512 = "cfcdbaec0a026ab246d45e00232f5d5f3f240f4957bbe41d70cfb421be438cbf8986920784d4d0350a274284b39ec42c20d33883f3f7fabf3b51df3a062fac15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/dsb/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/dsb/thunderbird-52.7.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "522d365f32b28620a7936cf5a8fb230db6fee8c1ae055a27e6649cff8559811684168eacf019ec16d6268e405607a576d46e1d5ba4759c1e3fd10736d7560370"; + sha512 = "52ef4b0dda8fe163675d46e7233b935b38a5899763012b0b9befb1ddd015f0a8d265de2adb4924856a4bc7753b3eaac2dc7861c5b75d8b231e667d29a583d673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/el/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/el/thunderbird-52.7.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ecf3dcadb1a82310494063cc317ee248b91c30594ba89a9c58a71349a423cf9e66c5bd06be4d1488ee6cd5027187bae1364144037b9ac3cd4bc8af7cd4396810"; + sha512 = "ab92343651598eea5f8010829bde589eb88a795ad0a3d0dbd1a5889d162b966e0e9bdf7bd32f49c59eb49b29261a075da1f4e75de49f87aa3fbf95796281062a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-GB/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-GB/thunderbird-52.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "8ddde6cd0270cffc26cdb4c4513213405b71ea4315d69a3b1bef602bbd58eca30bc09d0ddd41996cd77881e2d678dd13a93d07fa833210780dba146a931db383"; + sha512 = "1b0e11a1f8daba6a57ac619d764a60e9af6874cf7468c9487e55cc4be7c981d9dd375931b8956ee307754eb846900d4831c313fbdd3eba4658eaf77940e4436e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-US/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-US/thunderbird-52.7.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "edf130b3b061f15137e6eb83c9674642f0f475de56b293d4acde60f1e7ebcf0d262085fa2a513787ac201ceec5552c029167cec5ad0556baa7b0dd3b52ae4c3f"; + sha512 = "a8f4cb2238c3bf0ea6e4f8b444991bf0d6a4fe42cf7c0e38ae3738167900ac52debc0daf8bf4d7fb1e63326626072fc498db6b227337eab82ea48f2fcd561334"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-AR/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-AR/thunderbird-52.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "931644cbf5e7b4f032f607a52a78f553a7a2ee8fc77fb7d0e73e6d276a6a1ba4a724cc91921c5ef5ac5ad21a3536ffbff264b80eb8d8a658133a24ca0b869456"; + sha512 = "adddbaee6899434a0eb1fb955cd99c33786dc9c7376f1e84bb8036ed41d5731c48917ddd5d677a9dcefe3e7f382bcbbd51921afe1e6e119a4d32fe2cf9ae23cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-ES/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-ES/thunderbird-52.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c2673d9f6b347493e3fc807cec86f55300a6e894c9c1edd7f7bec63cb073fdda2e9cf7794269f02f744280788bbcb8e42ee6249c317aabc57f91cbaa3635492f"; + sha512 = "aaafff39c8f5566056f5339310c8f633e48f78c57d2b4730a13377aa5c09e9698295e59e7b137def2706a3dbff9b48710e25a0db24e60dec75c06f9d0713cead"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/et/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/et/thunderbird-52.7.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "dd634f76848fb990b4fb1bd28e2cceafca651280ece9ead3aad6b9746d0eaeef76b5ad925163a68367d84f66949e799e2649cf358ad0949ee4f2538c71b8914b"; + sha512 = "8eab1f67c3f56a39e21734cfefd11e84fea60fdbd3e470c1e777b607535923c451d7318c2bd7958435ae137928e14f97559781458d8bd6cb2e1e88d47dabfc2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/eu/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/eu/thunderbird-52.7.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "1c9f04cc1b32ffb21bfacb186f327aa945f36f12ae316a9cff8b2a4f8584ff8847ac5be1c8bd898ea1a71fbf3294a2f54b270eb6f0b63abb3da3178c6a125600"; + sha512 = "be2dd281a0a219e031cc485c21341d259aeeb56d34f79a9db82033d1e17647cf8c8617a2fcbc6a46b2025842a46f1117e43ca769a449a64577df691bdfa18801"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fi/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fi/thunderbird-52.7.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "03880d8334ede087a419443e9fb56bcf6727c652f435a366b4b49fb6116a62225686297ba82f298378e03267dc1aa50e90d75b81ea277a7afeb93331c45c3459"; + sha512 = "21535608a1197744f9385b3eca5c7dbef8f3a05f9639b5011f8abf0bbc0143db17954ca4ce1bfc9ba1f5c4659a4a0a74351e30e5f57c1d416d7bf11273211f61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fr/thunderbird-52.7.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "6f9909df3329a32d6d0c2203b484fdaa8b54a17849283bffcb04298601a284a6fe30eac20ec6b3a97ad2e8e3d4e0360c6145e87baa2af11049ae0d94fe9dcd44"; + sha512 = "ddda6457d4bd737778105d0bc7086e64ba58d9fb23a083977b456873fafd3170df495a2d81fa19c6b12a06d32e448a2cd224263f4773c0d165226c6f56cfbcec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fy-NL/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fy-NL/thunderbird-52.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b20f130ad4a9b0f8448707945773cc76198e04854a0114a06379fd33c3d5abd9abb1f14e4f145df9c1c46e5d1e09522af640ded99f4f20543fd444e365d81fb9"; + sha512 = "aa3844d3d17a8fdc201e55352f52fa7805328e9f0b105b729cc8cbcde117885a6a6671d343469e7fad61fd9a5ebd8d87faec8f4a214744771ec4d2b43015c975"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ga-IE/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ga-IE/thunderbird-52.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "3fd6839351470d65f14165e3633c80950270ede2c4c9e658c001424126ffbf29c7bde86a720ca33e50cbe9a5306f0339c5cd491371e3ad03a6ee575c75889d63"; + sha512 = "30e88160a0c19fa58d6d86f916a86d95362bb8b8d073b1ac0e17608c0c5bd9ac040402dc950579602f5124e40a814e582ad98cf0853ecd8c7b11a7418bf0441d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gd/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gd/thunderbird-52.7.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a7aae188c866586606f9adb82d5110bc2b89a6bd757191e798b9b2dc799916ae56cbc82932f4b8da76e88a3c1f5ffc828c58aee0cd8f83ede19bde2be2164b79"; + sha512 = "7458c820056c89b15988424325785ef4e525c2fb970b6c7c04d8c3e8b09cf7a3592e16b5c15862c84bcf95e2b399e37874f2c099c61bbc76293e4d5d8ed5980d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gl/thunderbird-52.7.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "3cdab0c553f1d09cdb4dfd1160371eec3d1f878329dcf2f81a177f17647f8dd9b73566a56427d2a593f70f6aecfec951e3dfc2a389c838a4069e5f4db68c10eb"; + sha512 = "6be48b4ac248cff0842a5b78023dcb9787588c74ce1db89bb03a9a99ac0a2ac24a6949ae125219e99caf93260574d1c84355ca8f0f9c76ed15731d8a4950c98c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/he/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/he/thunderbird-52.7.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b71593a5c7cf8fe3960c701f5bce270366f5717b7ccd2a5f20dcdf402d1435b79db06662629deb4bd28e24b251fd2fa1a71a9e932f132e2df7a25ab5a8849de3"; + sha512 = "3dca324d7b3b00a2cc98f8949165d178be7bd68b118ae66383a0d3705925e3f6bda14aa25475886c1f9810cd15a48a79e81924b8ebccfb528ad4bd21e36ebf8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hr/thunderbird-52.7.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "d55deeebb9605565ae3c062c8617d7e351f2f514c13f00507d75a5da4ef8e8d845247147d2aa111d4e78c57ceb01404ed3ac2bb69883bddab7b59ce0ff5eff35"; + sha512 = "23d5b2b0cb48fd274856a60dd9f916d294c8ec133771ff624e88cbdec214182c443ed5fd2d424475ed748113f84b74c732092f51061571104b1a62c301affabe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hsb/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hsb/thunderbird-52.7.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c177a0e3c6074eef1abf086fa34e95b09f39a1529ce640927b7be6ee8b7ee8c740ba4e2afbadefe3fa83314cb7c3223499b1a5f08e3b4e381b60bee1ffbdac7c"; + sha512 = "7360e964d5322e433014eb10f369f27a6e4ff688ed441671ddaaa3526b70d212509c16624ca854e988ca581d0f60ccf31db1bb49b5c93521a5d07e697be84a4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hu/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hu/thunderbird-52.7.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "1442a03fa4367d1f33337d0e88a193de8a6992ab8aa91e28e4a46b8f1860a3cc346d15c00d745b5074b8dec1beca5dba182b5fe2e87827e7ea83b82aba28b721"; + sha512 = "5aaaf22f17015026a32c3648323fbca16b3845c0f52ebfd3414c11e1d7cd1a0e72a8319e924b9eea67bd9c1448b87585709d3b99a8783ed580e11020a762eb31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hy-AM/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hy-AM/thunderbird-52.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "c01325976516765a14a196ff04eb3296a2dfd81670cbf4d693682e78795b14b54f4d2801566f0ccd52c52f0b7100b6040f4e3540c4f3cb8c8b92038e059df45d"; + sha512 = "7159dcfddf5981e1ddec5ac11613a7b30c513e0319249f08196ec88fe3e2256b52f3e1e418e46e276c1f35195f15d778b83d27e3186b2b8571e0b374844f6248"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/id/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/id/thunderbird-52.7.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "db56686b1d8713da9584e03633bcb2b14706c0b44d24484d6625de638eddcbdad1b1afacecf7dba52db6d18b2bbaaa15ea5f4d492366c24c5e2e212050f16c12"; + sha512 = "9cf647ea244bcd046f73cfcca97c5b5f2dc3f5b0991d6edb100b4c4263ab75d8b5d07a418b906b66b50d9c4f29360637ff4ce605dbed7bd85c9b624d33331ae6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/is/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/is/thunderbird-52.7.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "5423202ebccaddd114393e5a2038b2efbe93fd528dc3d7b659987ab5aa2a4ad82921b3b835249285135be67216eed03de6d58b72800d9c7bf87ec812a37f21ab"; + sha512 = "d567dd894926e7a5288da3f7a2837ded333772c799acf6f27489327b3e50236561dd0a9d04e3623d23a6d00e7b35c7b8572c611bf1e767b4f43f7d5164ea3787"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/it/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/it/thunderbird-52.7.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "b64e31155c73f13cd84bb4488e63df5c95473957c792f63f8cf25308d2b860b084aa6beb519a7666fde83d3db25e28ffb1064ddd0abca73ff631924cfa83d7f6"; + sha512 = "e3511d7fed2617cb6cd59b1b56189a5f70db7f98cf889ce0be31d6931d0500a61b7d6a7f9907009bdaf37ad968b50aebae0930467cd5b0b70a6d2caaf89bc5ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ja/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ja/thunderbird-52.7.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8852c526663f69b038ded6bb1382e02de700eab741cb04ccb8d3e329ee4534477a6ea402134a76fe82a020bad279c66e70bc06b0ed8d0fbaea9aaeaafa051b44"; + sha512 = "0a4cac4b246542a42534e2b028a84cfef470c884143a08c489b56906a1d167ef66de82d326874e49d22a64c259aeac21b76f4cc2b20acf2885040db35decbc41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/kab/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/kab/thunderbird-52.7.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "b08dc52afb713142e11805c5b99f73a11bd3c16756dc5bbb6a0c3de13cc801f27438887d8733cf4b97d70d4741abcb0d8782b9e6f6ffc359f38318f1702fcb7f"; + sha512 = "9b6939d454dd5f0635d6fa3cd78d57d4c3461df67108a9c20a85cded552bffb68ca9f8e9af037150a0cb31588fcc663a0f1a8b91183fd257eec5e144516b5ca6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ko/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ko/thunderbird-52.7.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "0de39397e4401ad939dbce0c02e35505c593398bc2078ad19d680a797a8cfa3f0950a810c8650634e3d40ea3b5265f9e193b77408f1588b51575d87446a336c9"; + sha512 = "c965abf90339a3b8dbaffacd61b33729a0312052ced29cd8300cd5dbb577b7b663a314a5d27528f9e03ca55753ee96b392ae745558e59eeebec80857dcf34b3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/lt/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/lt/thunderbird-52.7.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "13842d9f210dd192e2072c138d8d0778e85d028dde92b08e616dff6ba62f84b6aa36363a259dca69bb006850de2fb8c42fd93874a4befa970d817aad34d47b57"; + sha512 = "f8724c9f29d2965e23a90156586ea85721b5c5693c56fbc5932ee367c87a4531fdd318968cb38046f748dd60f4ef0ebb4636a2034f061e3e5926826aaccff410"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nb-NO/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nb-NO/thunderbird-52.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ec9c96abe94ac17139e9fa83ac2d7ca8ddc6889e7286a4d31e61625db6daea3969fcbaa0796ae0bea41e3a433ed3e170a73c4be1a177bedcbfcf705e306e28e9"; + sha512 = "87bd58ae4dcd766c0b3403e578c41ddc46b5801bd743747a23802770099ce37f55daed7beca134835f0f16939784d7d082b8d6903fdcc993cec56846b1d55c5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nl/thunderbird-52.7.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "52e117078f1871bfc7b549a47617d277c763267f7033136c9715223d8f876184c0b5012b193a5f497e1fdba78b902a3c38651e0115829b0f5ca7f0cbb1c439d3"; + sha512 = "3f332437788bd314e8a19fe3263631c2000cdaf30505129b37693fbf499fac3d15736b51d2838e49daad8e9225094a92bf3638fee6a6e33f2cfff6357f1a1597"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nn-NO/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nn-NO/thunderbird-52.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "24258bbf5e3643544ba5db26fab9678f7e2a44b390ee993be4a304d148b5a57674158afd308d6ef93a86c8e525b37e1aee55ed07be6953301f164a2da00688d4"; + sha512 = "4bd2918e59a87ad0afcba3e82640a0c729fdf672c1d977cce62f3bb7d92e14e008c83fc362a5c162090a3d4c0a5608262f5859ced2327274231ff534b6768694"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pa-IN/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pa-IN/thunderbird-52.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "e9d8b4e6019d4cf1ce562e6cc9b9aeac0e93d8b9ac9283c7e8f260b4d611fe2bd0bf6d71c9f82c9d2cbfba5770659d21cfb03fc2deb36b80be0a424178a65936"; + sha512 = "f0c448cf25471b1aa4387208a8d0bd7e41531fca86dc7118f4467d2db101835af3be9ba79713bcbd8d8556895efe4a2af68606df18fbd506734359950e00ebe9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pl/thunderbird-52.7.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "81ced2424282fe6dc7ca6f5e043f6c42ae87cddef900b73fddfe6cd8c488a90e3099824b57d0971816a60c3f43ce66e1799195ae21369958b2e8085018017267"; + sha512 = "5f9bbd0a1be4d0ac5c50c281ae75025f4b12d8781a73463876f26861c9289c51165cb68ab4438401ded5ea484477c1fe862f5d57430624bc11871f0b36e2c50c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-BR/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-BR/thunderbird-52.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "4120b94c13a9fcf1aa31a2abc3fdde27ef8c0354550ae8511b61641745cdd5eaec16e1ddd1d22193ca6680f070b71c188d94cdc75a40fa1596fa88ed59545b28"; + sha512 = "afb4ed9a2739e0d590ace16f4dc8c4b1d19d05537fcdbd1f23e404218387d2c016715a074b630885a903588b8bd4a8329190d6ddb9231805a8538b4199513a6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-PT/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-PT/thunderbird-52.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a89dd739da5262713c99aa9aa28544e48710e80b83770810b240681ff0546c3b3faa37b48ae56c018a6d1d625f0411df557ced12eddfb3a1198eea474418eb68"; + sha512 = "d907bee397dcfac8763c7dfd18d5bdb5bd99afbef554a98f625c36aedde922fa03c5f79e46acca4ecb07f9adf6eb59c869b1694c68e88ed759e04abab13a210d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/rm/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/rm/thunderbird-52.7.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "3665bad7a0d1f2d725d0a44ad55918228c2d9cef49112fb19d2c3d885d1ec62af89c15aa0ce96ddebdabf97c8a5e10fdd58d892c085e5b9d17bab6658e7bf444"; + sha512 = "61c70149b717b193e541e49614027a5cc5c4f5a0a4642bb5445843b2c53165ae29088773498245de3e8d3324c26d6d96cd225d9e3e2e491f06d0b60586f23d2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ro/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ro/thunderbird-52.7.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "07afa28b22705e0e84e17026d04111cb9a5283838fcb94225e2c05da1fa0692770b17052c52d8cfcdb7bd3372fdbba9cd9ed9bc16f6f59f2e3ab6f4308543d91"; + sha512 = "d9d604216c4805fbaa0444c5f61c7e1f8dc5609adde7bd8fc301e4ff0577b73a255cc95aa07f13543ce82b5487212b9b0e4284be47b2eb897a5c1880ed9fcaa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ru/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ru/thunderbird-52.7.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "189c40a8d950496d62f980180502ad342621caf3a2ddffb0fe4f813c9c2d4a25aa375d8ad70c8b7e8ff85f09607bc2ced3366524346a70eed731bd8d9409e5d2"; + sha512 = "e385a46635372660a304d4cceb86be56d2a07b767a4eb17b131d67eb33494c878ed4e4cf3da3a1a198a9f3cab7c541161e325cbd9d5957c8af56d2a62118ffec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/si/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/si/thunderbird-52.7.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0b6ee1e5ca86472a5cc67cdc242a6b62aeea50609661e369c8dd3dfac5a774f50eaf0a68973b1fe5d6d9bdf6a385c52a90b8711c80facbf9fb301981a7aae395"; + sha512 = "952e89769e201e9320929f0562f27ca2de25a7bf4f0098964df6974831ef342f228de0278dd2de55a0d11c36804d04f42b9c9714f2c1ad44f5d68da1ae184d54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sk/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sk/thunderbird-52.7.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "9c1f164a2da43aeb51e8b64115618590ba0e9284f3eca8b16d3792b33e269a0acc253314ab7943cbaee94ffc2ae321247b4982798d9d48608e85a935afcb6faf"; + sha512 = "827243b12ae2eafbb0da9673f914e26755dd3a54931e41a85ce89ab236b56bdf4ac4c256769865928509be4b998dac4a4924895ba583192d95b7271788185822"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sl/thunderbird-52.7.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "5d4698be05af9f9181af63eb3ca6718feb1c74c81f0a6fbc82217791c911dc5f14ab433d32f6484ced2cd75d5db4b76aff3bbe420d619afcddfcbcaef25873e7"; + sha512 = "d4063aa855abd1701feb078471e628728e3bb61e8799ac186c75b325b4db14a81734befe4782d75cd07170cceaa37b83de90d1d1ba73f950f7f76e24265cf49f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sq/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sq/thunderbird-52.7.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "32d62e6dfe28c67cc7b0e2cd27c96fd7c7e1079790eb73a8731af44e8a62f8fd1ea2e7298dc772e3014fc8255f022f38bbd5478430629140d0dca9ba0daa401e"; + sha512 = "a90f3446a0a759fd9cdac2ea0251c676539f5dea56099d0e515fdcac72e881f54a95506f257da91b87d4be547b4377cfe8a7345e5087ff63d24e8bd2fc6742bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sr/thunderbird-52.7.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6aca04c1b4378489239cef6b5032ef6dfd6d39d84308c335d03e97ea7c48acf021f6cffe35d652e117f71e6ae3f31f54e5ca73a44b4dc51dedcb3f5faf7d016f"; + sha512 = "f313d71b58efbe34f96ecdccb0ed14977899b6038d2a5d0d7c3138881a7668e8282e4c927f106fdfd1d74774404734e57d97d0004086997ace4ca53921321adb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sv-SE/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sv-SE/thunderbird-52.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "099e22013b8d6791857c378c0f94373ca42d35bbc442cf273c9de2360ab8e64d712eccaedd5a13915ee19a195b6c9f04748ba738e7bbf9b8153edc4c66070d31"; + sha512 = "0889f3c2917b01211dbb5d28262726a3dd077dfd5327fe1f3dd4742cd45aab9ab8d7bfeb141a5a2c120239c522182e46a263ad0d6cb8c2d71d4c9c004d734a68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ta-LK/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ta-LK/thunderbird-52.7.0.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "d3c95f37ffbbc5ef78b7c050a4e091bd9f36fa9529ed7c38e25f5495694c1b792d0bfcf53d15b74b52239acb21bd0d235ceb07c7f68f99e1b31e59e6f6282aaf"; + sha512 = "49bd7127f1412a48aa7e66bbd2957cbdb4f02d4f43cf856b8b796562e945a1016852d695773351b30b65ee0d2d4b65c9aff4c347e9a5c2b64bc3818cce65ae54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/tr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/tr/thunderbird-52.7.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2f79b9d45d747424a65271033a75a86ff503694d88a30238452fbf817ba153c4638395d3e59f5f6cc662ab3361d2304d5a4c925957d9d6e6d7bddf34947acdf7"; + sha512 = "6b50781107d219c7a86bce30b51c5e791627fd6305d1573d4fda98321e8476c3978a3b8d388005bb6d05ceb0ed0c6c119f9baf1d057b1f6d533d0e42baa90a51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/uk/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/uk/thunderbird-52.7.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e0d891b4cc082e32d3f6af318f9224e996a8ed3c7e1385bb86a5e2f963239999712c444fed00d779320f6b06efb38f3eb97023e353f91eeb7831b44a870c6394"; + sha512 = "58e7e921d7d2ad46237ff66bf0f2cb0de448f68668968b56779ee874d0a9eb29ffc46876b6aab4a0c30e4aba597039c73939e6d454c8feb56cbb6b4215791016"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/vi/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/vi/thunderbird-52.7.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "5a9e13e126c7bc8ef435b8edde1896b9773ce1dfc39fe3fe1bb31e54fe4f592acdb3db360fe0890eb35b1896aeed0954bbd051fde6116b07cb513b1390ee56e7"; + sha512 = "5a2bee3035e76deb55d24d5043967e51dbb9d79dbc7cdb5dd9f59cfa2311391fc25017f08c709e7d33a5fa7ca0d8ae375ba074ae382a67f46b04e36eed504f53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-CN/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-CN/thunderbird-52.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b0374f022c2a259076d52bc0dc142098975f9f1d3a886192332fd1c1b2a5c9dabc0d3fc1a7fc0f28f6f17979931b9c78a9682be1226ff751446c5427a5219a51"; + sha512 = "73983afdd0e07a394029f64f1fba5f24ae0bce80ef7f9fa3f5374af3b5e6a094bb41d7428a252396b433ca59a092e5d19b20eeefc5867d68bef00a1894437159"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-TW/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-TW/thunderbird-52.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "7e289afc737339be5a3db5869125d891da65fb75a62b7670c3880943ae11bda33122f81cab46bfa95223c45662684b8fb66ec11cfc5f375e024f4d57be098684"; + sha512 = "71ba36ffb59a94191ffd6bd24a00d3e35422601310b70a6f411b8ad0175d7f67efe9ccb8d0a2a7c1d47263d5d1cbd0a4f790ef54cd174875d0c0bafa86481457"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ar/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ar/thunderbird-52.7.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "872ceb5933a562d352cb3bfc6e9cc95a7485625e5256380cae367d38a560f75bd7964fed1becfa5359db3befbe4aa249f114df307cf14e2db75dd047d87e5c53"; + sha512 = "fc69ea6bc9393f55e247a78eb747c4ae6ae0c30efad8188d50eb52f4bc3f2e47e328788cf329966e8184b468a58bb923fdfdc736ff7b7b37cbbfa31bc619e065"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ast/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ast/thunderbird-52.7.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "9955dde6ae54c096dbc5e5a28729963a72997fda97505657ccec6e0b5f95f35508815fe663f266932c79ef91463ef6c5da79ace4c19149b17dde9655dbe8017f"; + sha512 = "74a6ed4829522c0ac7a4411ab4d269f557391c53d1313eb1b70bb6e3fbba30217343945e60d46bb7c5fcfb20a40b2e6bc0c40cb66bb72259be4f9ad78796bedd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/be/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/be/thunderbird-52.7.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "94106fb12bf932f3a8217f3252b4f76394f13cb19c602d1b4a67e4477c3a0c781c3481ac973e40af7b306fdb32c88d4c70f8302b14e693c7270e2afab0dc2539"; + sha512 = "ba645d2eaf0eaf90a0c1f2f24aa87c6783405fab00b2608aa1e3f88f1f81877c4927e93e2090509b9e06c8e2655a4aa731bed47ecf8992bf12b9c5dcb189c0eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bg/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bg/thunderbird-52.7.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "194a420d07f952f7d088cb15fd14dce30e352dac13e543321e94fc60b7780678ea1ba51d450aac2d7566a8f23a583cba70e3aed373602ac896e0be13d234f8f2"; + sha512 = "62dabdc80e0e3d46b42c69462d18964e584b54fee80bd632c0a3be19fceabf6bbcb80ee6b200472e52998f90252a7e62355cfa9d7d8ba3b3bd0f7bf247557c59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bn-BD/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bn-BD/thunderbird-52.7.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "08a439a7fe40121f318131b035e7a5a1b44a56a6f3434b2854136103b0e11fd720540352ed04bde23f33c7ef75cb57eabbe86425c8f2e440f92c9260ddf1a902"; + sha512 = "11acf4d6546aa3b3b1ee3159fb54e0769617664155d1dde4ec7d5af28335e90b428559b80e570d2b1829153f2edf8472e37e8e2cbf1d72567258e0c76aab4704"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/br/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/br/thunderbird-52.7.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "68984b8fb564e24f3e331504a0c8a2e88cc1021319b2a47beeffd145eb42a19bd555aca495ac60612efb191830c273c473e0c3cd5844f109e78a4908834926b1"; + sha512 = "1056f78922c277ba64e3dad8e41ebed516495d41c07be4026271a2ca97d314218ce5a46c8b29be38645507a9f2070663cc6bb5deb194ee2d57df01809cb2d3ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ca/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ca/thunderbird-52.7.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2202c43a63bb283d9eef16c27e0d6125d43284b9c1acdb8cbbdc71f3a9d6f6d527c4a03363dced911321f28399a86ef25defd294befddb8fae41912e17c2fdef"; + sha512 = "f50bdc6d1bdfbe4bbfd8aa8ce3938e2ca6963d0fbc0fd47d23505158bccfe328195e45c0215dfcd354847e5e3a0897941790a7cc1f1db31ec29cbfaa1cae7a33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cs/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cs/thunderbird-52.7.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d01c6ba52794d3850656c1538e46b64eb69a7c1e3a17347ab5cfda9fb1e91976a4bfc7096f7d12bdf2f15625387aec7066b0a25879d979687c955058b92ce6c7"; + sha512 = "7d8c6d9be08bff6fcea06a994c637ea83576377975476edc01dbb152c8cc8768b00bab4295d5f13ca01451344aa64af6ad227e359f3d11bcc0228b31fd13c1f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cy/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cy/thunderbird-52.7.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3d056c91e1599e91249774cb21d8fbc887b7bab38546aca1815ca9c49fbf4d641bab2427f03ea993a72dc29793feb1cb0cb26217a4f6827e9e0d9d3cb5e3ca0c"; + sha512 = "8bc583a05e872f36df9512ffd5c06cafcee81c632358b5bb13d8a920689b030e8ed4996bfc265c074d5d7959a1e75c7180900b51adb30ff3181de496cd34a4eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/da/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/da/thunderbird-52.7.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "c940d26284c8ab0a45bc6a55b67b467df7ac160c8774f0e2e2deb9082ea9500142a1d3c8851031a7e7a1763fdf5348c14de57d7168c3f1bb23fed3cf31a1b09e"; + sha512 = "ccef5bffe4a807d55924ebc8b36f0065891f03520fbb015547da1264997e95cb9e919aa5af838686af070715ffb314ddf6abda0e99e1e06657a2ea6fbc956441"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/de/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/de/thunderbird-52.7.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "b1b63590885f30797ae9825f2286deca69a82a73e7c407be87fa92280b904c0605e7047a402bf6ce1e13936933a27efaa2b35d534b23f745a2ab4a9538d31b47"; + sha512 = "02061b7572ad3b784a28926da15abea9fd9c93b4df9c40a5435190e6d872d356b6001cf0666e4cef0696da32c76e64cadfbeca28f6f894b1b230033d451fe105"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/dsb/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/dsb/thunderbird-52.7.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "fc81fbfcc6533d34fde2e08351dea6d7e2a561a3620a6d0d225dc1081f59d9927ceb0abfca7c2d21b1cc727c0319646a2f386c022524178e90aa6bba344371c3"; + sha512 = "458785317a61ff0fba04524b13cd72e22d4cdeee69bb99c849f4b12385a19f3236b586ab6a12cf9c8042a444553d1a3f82bef1f51fa9cd11639ec3911eff0013"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/el/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/el/thunderbird-52.7.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "baf8d0a52fbb12afdccd003209614ce8d5b4062336744ee783a6c3e7eb5a542c4da233fb680f320226f3681b440ab1d0717616a3664051d231b6638729903b00"; + sha512 = "5b8fdd6a65b4057eff462c5ae8cee366ced8ee482892c0457a6fbc52303b8dad96437230f18f560a3bef3f392eec43194b89715071b559623ada47fd031680a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-GB/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-GB/thunderbird-52.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0f5fac2fd3da05cbdece404fe3d170ef49574b5abff07a17120d189338140fadbc0971c7be05656544819df2b1987fd86c0f9fdfcd312e540035e70877212342"; + sha512 = "0c32a412f9c7ad9195e113ab994ed8e0d80a14bcfdd70b3fc51399eca7e34241a265a7d81d5cdeb8a7217a0c694ebceed45c3b038de0656ee3a03bfde1887b3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-US/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-US/thunderbird-52.7.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "1f3a640d140fa305e115158d98aadf95d180b396aa3935de4505f0f94f510d206ae6e45adf36572cb160175383d0aaad11c3244003e4a99dae613e1a749430cf"; + sha512 = "f7f8bf3f74052310987b546bba0f986abcfd65e53125c2cbde4bc4744e27de054f21eba8080313c28c9c3b44de1d773e4471facc9b71f520b6085c32cfe721c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-AR/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-AR/thunderbird-52.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "42525a75e154fdf263f276330a998f127de697519a79b447d4860403c40ca2a6caec0a225a978461ae776e56218313a3fa31441817cbb13db34cd47afb9a5eb8"; + sha512 = "0187b3cb9b91d43d6faf217dca8566429103f2bb3c04bfb59e842da9c464cfba3f542be3789bf0fd46e6ca4c355d632f50b16b01667671e41231b8ca8d5b75d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-ES/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-ES/thunderbird-52.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "86b47481b760206b49f87d15a917754d875203d83613c0c8b83e181f95986e6252ff26cd6dd6f7c6545f9d4da4801f6f236fa82dcce0d0172f19228b4eb5fe33"; + sha512 = "876de2da5068acdb546d5091c64bf3edc4269a3e6dde2c2d928cd05439570773db4272819fcf8e12c63f94cdc41f0721412e108f078d1cd11501dc31966ee3d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/et/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/et/thunderbird-52.7.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "4bbfa1fde3a6270b49989747b4b27c284abb89819c46119cc3f2f90f0cad1648e49a2e1e01a35ef193eed4cf504a3e027138ea30a225c3d75347aa062d56afeb"; + sha512 = "2ff7a791390e955cb2489c685504b5a118396d99d225e616e9bbc09b4f7be70d7a2f1a925d5cdc38b944e2476904604356d9e3e0dbc497258a133ec80ab499cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/eu/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/eu/thunderbird-52.7.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "292fd0f2db956e5bc86a84d5edf51e3e36141610c99f75b1dd8af0f086fa8bc4a4e5a4e1c3d085587b6bf2d6e3435bc70ee66d379809886a391d67e2c243d762"; + sha512 = "bef88a12c122f2d275e1fa24a92f5cc6fbc11534414ebd151e7d53d95d1c5ab06045270221ceb46629160eafd60bc1fd8a8928c13915493c83db231785507c21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fi/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fi/thunderbird-52.7.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b8df95d4ca36efdc4370821068590b1d7e3fb9f348afeb18a0a02c977027312457aaa59c38ee02908e944f166d485576522ea0cb087b28fa857963107e43ced7"; + sha512 = "d2c1be7209706fa96dc20af9c30be61557e0bf82da575c7b95fa8b5d2fc7ac6b7b2101bdf0db169694fde66cd1da60edcd4b505b849b1949ee72f12d7dbef200"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fr/thunderbird-52.7.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7880654b4133e50ee248b6e287d52ba867361b900fbbdd149c6f06c9d5df1d0b57ce6d9d9bed3e1ab68e90b0ddf874d0b2427553b24ea39f267f576c63357bca"; + sha512 = "194711b687ec4ededcb9140c7c1c3e1a0ccb47759cd00ba56819a3a7d9be66f9a7a29e2a91db0b1d573d584953871a37781877f43e734a8e39599dc6e8027622"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fy-NL/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fy-NL/thunderbird-52.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "4784b06aeb705141d84103bf46635e6ba6a7f7795b40e654f63c783a63ee19d54843c211eac90c4246c5131ecc8808940e560f2fd2a2543522cef13bf3828938"; + sha512 = "7b9ef6651166e66c6abb88b79628a0c51f576f2ccf2dc5eaefd1c01100a492ca9fe1657aa2d6745079e0f422e0f2692d24389577b47248ec6713817e51543c6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ga-IE/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ga-IE/thunderbird-52.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "91b4145d82a4748ef2cfe6d4d46c9e92c3a54a55f72ab1c28135363471d68ee028064ec0c0bb334fb731c6577305177a06d85b2a9d820d9e2a44fb01ac961beb"; + sha512 = "801af21d297c95505afb3bb6cc79edf72057ffbb9ee9da56c1f283043e6df921239a4ac8eb3d7442286b27265d3462569f79e29adc88b7674f7e9d8396ff3109"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gd/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gd/thunderbird-52.7.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "4e979ce305a014de612c0f3797b9f8c8d89445f05972a24d8c13cd01160aa2c15007b0e505f9a0cb354f8cf65e286ba52eae8a6bbdcf4c7cf4e89809e0ce530a"; + sha512 = "f778ff74408d3d9c7ba9c62cfa2c9447932b15446801df1c5363cf7c2059e1aa89539c1270fadbfc482c42b5c1845376e2fe037741fc267461d0b22f8edaf859"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gl/thunderbird-52.7.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b3081eee4473c097b37b9070cdcdd8eb48e1cf69ee63fd76f1eee0d5ed84009b69d0b31fb38c36f7d5137b78d0ab32087a8e668f1ad01e6ef96984ecd973af11"; + sha512 = "ce541ef081ee8f8946f71b07a820ec31c4241730e565a8bf781a844a79fbfb0258d2f0d371ae3f4690067b6c520a103f4df996e8085d2a8afb997a4f1fefd288"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/he/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/he/thunderbird-52.7.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "2781cc8fcac549ea394629ba1d7c43c683ea25b4d3c5807f7a4da50541e47ba18ed4d4080e7f3c785be8e71e0a8e2ae0cb9a24e348f830b71b7398efd06863e5"; + sha512 = "ec3cef4bd411f6604e1ec3486272208aaa41b1154dad1473c6fbb483ec2d3960aaadc11cb592777f49571bba35a0812f4f0a14c0edf9eb8a7b1fc70d56fcd4a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hr/thunderbird-52.7.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "d42587bb96454e3ee24b964dee1de0f51283b2c3316dd25e798a8809d2289306bf6eba6078f664f87720e7038b14f009640fdb4d3acf211195dc881e6e207c6c"; + sha512 = "f27bd94723f65c4972ee41cf6a9397098cfbf9097e3eeb06b7b41d50b4f0143711fcd0ad59a04f23ab9acb42d3f9515900c067f9532366ae3333ecae2a54f965"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hsb/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hsb/thunderbird-52.7.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "49e3ee2559c124db79e2dbb2fe74291a377ccf1fbd75b450c8d4913000a055cea855fad03369e7420391faf114e160e35b02d432de847e673e352b731986bb84"; + sha512 = "7caad57604b9d83e64e8e30e03e89c4661e8d81d2ce833a6908e2d662d4d6c7ffbbb8b071e8657fabb0ebc0c0f84b07617ac878c9bbcfb400b711654e36f66d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hu/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hu/thunderbird-52.7.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "fad46a1ea3e8a1df49e4ba836c68b1744577fdfec319d9dc0b2bd8756d4dc859cb5af7484791b83f2260bd40d1ae64f19539f8f4b3977252a1f559b7df9fef35"; + sha512 = "382d79b8513ad28f06233af3473c2fef995d72c9913f64adce5a86528ae0ead883e94f91b4d394cf30541e690da5aad77dc48b8c2a4a84ea6c5fef86c22a4159"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hy-AM/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hy-AM/thunderbird-52.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6a34e03e5e272c847f674bd8c48cee66fb659cbf88251debe505c54011b029cea7b7e8a9722c61b3e603d66aaa4313a5971fdbf2035fd06d305cf229cd8b2afa"; + sha512 = "3a4e5878e4fcc9c493cf1de1393da8efe85ff86d96702f57f085da42cac990290b054a3998e96cce69dca17ada849301a6724fd6ae245bf4aa396db5ce76aac4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/id/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/id/thunderbird-52.7.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1cce3d3653b474219f00f4555990406b661a14c4198f3d246624def4e5a3ad3ea393a74f6c80e0f17b5799784e212778ccb8b56bda31c5e48a55193bef09c417"; + sha512 = "dca16b2c0b5034e1be2831a1992ca47f6a7c614382e781e86095df11f34193f13868bdd7f972f54e72d7f844cb24172057155d5457fc6ec98ee476ed01d8899c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/is/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/is/thunderbird-52.7.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "f3604e918502d16ba92e65e9def425efbb829a261d2c433ce83ec89d6ebfebbfcddd1b01508f953ec3c26166c6d01112486cdab6d1a0fe1e6a582f0566900b89"; + sha512 = "181868826a0da43deeb2ef68a307ba195fa7a470651d4a08e904bde994320e832a04c44fa355cdaa94bd4c8258471e6849cf06dae8284d43f43defc7a3976816"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/it/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/it/thunderbird-52.7.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "458bc19bd6b08f6834e310f7ec4591ad4e84067ae2373864ca9019c20551abbcbc067467fffada229000dda01369da3c28967df522182d8eda1a147d136b6315"; + sha512 = "88c906753878c7b8b0a3d60de21813017ae6ba63b6be9c5d24b6072f1a4aa3a1cc01e56433f960c02f33317cb113266200fbeedc397cd3a5587aa592fdaaacfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ja/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ja/thunderbird-52.7.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "05faf43b8b0f616bf552988a577891e816fe36b208b7d6292c9896a6946386815e117278feef33063b4f2eb7b5ec89aebc59e1d4432021969bf3b95e750defa3"; + sha512 = "0e53d3f877793afa9c3ecb48f73640ff3974633bd28ce036b96c7ed29f3b9a4af47e1fca89da9d594c879f534e7c4dc27ca05ece8ec33909fe2dfd57800b3a11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/kab/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/kab/thunderbird-52.7.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "594669d5518b0be87095527b3013799812c9f45254434523903ad19edb2ebd4bc32409df6f646b1d1e953098e126673427400238a056e0a8c44b672009a12a2c"; + sha512 = "feeef278ab269f6e33b479b38f32004a5ece2a37ed2aad97c87e68dd0a8195ffe3428ac9dce0a3e72349d3c136b6b5bfdc25916bc57f4fa043eecffc64bafc3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ko/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ko/thunderbird-52.7.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "db3e6c9efbeeed833384256814a713a5bf3d2a220a74c88fd28f91ec0dd6c7600d77e18ce66c9dc9f1929f5da7452c5904f012fa8f5e4fa04084892e17b2647f"; + sha512 = "c138dcbb692780cc1598906a630e90c8102d6a562f922ee28bc88e25624eb88aea20bf3d6fa6b87719f2a9fda0962bc413ce7e6d07147efb47dee7fd670a5c76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/lt/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/lt/thunderbird-52.7.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "2b8e8b74bbba2a72dc88a8dba457189cad1c902c0bf2cbc54bf989c6444c8b164238f1d9e21c2c8e470df5198d8586cd613b40292b737c04f4c2d834d298dc13"; + sha512 = "96e5cbd33b57fe02134aac190347f0ac37fdb9f847ad74a44f59004cb739579b9309442605e3c9c2693bbc484372505aeff9378bb7bccfe8e1432da7a5508ff4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nb-NO/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nb-NO/thunderbird-52.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "bf99756bb7bc5fa699cae5ef3da5a3614e57483b2892e2f6f769699ef3478e22847ddeaf63fc0c521cd1fbcccbdf9bc5054430a5cdbb50e26e371818cae404fb"; + sha512 = "913a731cf2c063be645cca94ea4beab6601e2536baad9369f9804af663e7b1a024024ff2b5befda1ac8169db0e8cf9ce5c9ca5d0ce650fe629e606c221776e8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nl/thunderbird-52.7.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "80170d51276bb77de4af8d45d5869069c7d9c6db7ad6d5786fd4c2c5cfb0a20ceb1cdce7b5dbf99a79dca329efa5d9a53d4ed738cbe7f77bdcb65a8b6e2e7511"; + sha512 = "79ceea0143319e4b883d2c59949fe3ddc62af70e9fe6653b745fedd2e683aaaf4c6f10d55688b83085abcd36672242f21ea0c592930cdcc7cfef7e32dcc72230"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nn-NO/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nn-NO/thunderbird-52.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f223dd33108a750563a498e92b53cd3e68e3d50fdb1a08e295a9c3e893c20908ea56c9c5312874469b2f96d1046f754df55bc38d1595d5b811b7ed659e267d98"; + sha512 = "c524517c417b977e9e8c3b0d3b9a8f1b256c68360f70e61ba4d1b2f887fe550222843de1f9c42081db935e27b3ec63ed8b1a1b5658f48f9534eb787d4fc28d54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pa-IN/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pa-IN/thunderbird-52.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "a418fea2521ff6971d68d975823bd0917580450a7ff38975455b891c8e3cbcfdf51c40502fa072ebc1f43ce93a3b07ce93db369edfbd511beee5dfc5041a0a84"; + sha512 = "10e8c6a1faf395371421387ec1cc6891d8e0bc9f69f37f2e4fc414dd9a5e4c10246f279e15804280a550ab7acc265b8a3691ef1d089459cb58cbf06896f88806"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pl/thunderbird-52.7.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "05adc7298c91853b373756944d360589caeef6a999f6c5ea9babe3b12ff9409909040b69b641b69b78bd17bddda59f9828e294f5cd5f7d7061cc3f51eb3c48b3"; + sha512 = "13afd039d50bc7c6ead72e9d69f5dd6dafa0fc2b5d1f18a207a15192cda4473ca8706386eba98b522667cd036ded38bfcb67fb3dd8c2e50629c3db9a1243c3e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-BR/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-BR/thunderbird-52.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "4a2503e3a1daf5b9cb26acf25720c4d0fdc7a170bd454a185e4cf2cd9c9429dcbdee4c13e59e11a2a275d88513b1ae31dffae8bdf70c3196249e432360fbe705"; + sha512 = "9c024bfa1733d144ff4fa58e7ce8a2127528d7fe05e64142a3b1d8a0fdaeda1b1c02998089fd219804571cae4072db984a74a40c4a22bcc18dfb68c849aa37cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-PT/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-PT/thunderbird-52.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "cb02054a64a74c2e1f936594f001dd721e3016cc68cf705c0413a732153bbe45aaa14736d38b22358bda5f3d059f7306087c27faf040d91bd7f92066403e65c1"; + sha512 = "ed4d7117bc87cb2ec6df65667f554a83f2fcddbf4eafd6a587082ad42cab69fab5c1d9fc36e132660911840fe85dcc18ab4b23e83b9b57317b900db820483b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/rm/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/rm/thunderbird-52.7.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "8e745e5d1e5a4d3f432bf8c5f90906a22c8d2fe4c6d77ec032cb7eccae1f2f9e7cf0620dd3ef378414d6f34cc25346ff44b7fbee05016f34c49a0c8c5959184c"; + sha512 = "d1e1e48c47866b89e05c975cc6d4d70120173066457a4c05de1ab9222dee87b0d562959c63afbe024681b0a3f9f8cb3c836f2f0a0e910507e5211a430b1f9bab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ro/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ro/thunderbird-52.7.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "20d9b9666704c87f73f4c8cbe8d09cf79349e811f4c4da93f2754886cc89fabf7c2388430f9f072a3918b38984742adab48ada320dd75761a7443f3be1198a8e"; + sha512 = "c1929be134d8127433eb4b26468379a631456681a6dc3d98bf9ec313576a4c951d5fa7f08ae2d3bc5e8563eecda0a71c412c62a970a0cec618e06d5cdcbc46fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ru/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ru/thunderbird-52.7.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ff7c64ed9a4403e24b7f0f9fb06bc4b96153fbe7d30b94ea7e145d33dc24bb1b2807db8d6e3398dc84e13f68d9c5c4fbaacc3027cd46ee58fecaa8b7b17b27a7"; + sha512 = "aa7893b8ea0f44f625afca61adc5942dfaf2eadc6cc7ead569a3536ad827a9b4f88f225dd01a9c5e375eb24a9940de6f65413ab6d93ec2bd736f0bca711739a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/si/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/si/thunderbird-52.7.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "b2358e6df5f5cda477c530dddd9d27e35a8919aa346b66521336fb0cddd2821bb7dd867f4ad005c135ce040a1eb64ad9f1feef81a268a299ca2170312f7c89ef"; + sha512 = "ed425325419e0598e3cc5abd0d2b2898ef781c4be847aa8d9c93596f6dca0b718cb7035479d4013d3213b97a440dea2560549619c3ca330df9bda7b287cea673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sk/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sk/thunderbird-52.7.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fc3eae35914d2a2ec6d44bf6348f71872f7ccb09d25ed974843b8010526f219437e6530c4d86825d027f1593da0943e0b9a5557bf41d4095e4e9d37108a94c3a"; + sha512 = "bd576b29abe39634c864a27f5ab8d59ada34bfd069a7eb9fbe6af1cd79f2e0fdd61ab4fe06cc3944a92b06634bde9faa68ad6d56399085999df5e7827dd121bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sl/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sl/thunderbird-52.7.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "532b87d22bd05194470801cccf242ffbae57685e69a836c8179e2fc562bdf2aba196f214b7a66006ef90d7fb1781d66e1ea62c2cf95820402deb9a73122ad143"; + sha512 = "98abc990d644a991abd9f513e205556974905c82c93e0fe8171608ec4d1aac7883ecdab5bf86ed287f43e6c5e45661b79ad012a4dda7b1e5cf6c3411dce7ea2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sq/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sq/thunderbird-52.7.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b621973b1f76f2d789afa854917e20b7b48e3381344da29e07b8c5bfd469162c47d51e9552ab2428895c45dab9662d8fdc2704e65c96faa4afbddc4649a77dec"; + sha512 = "d45920069f8c0808b4965118be5ba6e4cf36b99bac9add6d1ac2e20051e95ebf09eaaa9ac559515803b655a61608bb4afab0d69d720ca74f57ec5a643b151f24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sr/thunderbird-52.7.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "d26812c232168c30c6a76dad5f3f7e20fe88cd75fc63f863bca255fa353928b8d3988c56abbb649266e52b8d31d70182c59ded496607aae17d7d2d0409ecc53a"; + sha512 = "7d77124de3cdd684f13fb824a0bcf7a9440ec7c626ba34deeb04478950bfc908494bc97de5f2d8d8dc0b0abfaa3f7c88b3948a10b7fd31de092702c755cacf25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sv-SE/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sv-SE/thunderbird-52.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "294e141cabec4edab0695e7c8e29149543e4cf4d451cfe9ba038a6997a822e02f223045ac3a8ac25b99a1e847740fac4d9d5c0b5ce0c5d69d331d823bf8e4899"; + sha512 = "e16fdb819ca8ae5c8392eae50115d6b6853678c002de3a18fff25ae0e7e7fa2af06dab17a6a2dff31440608373a5268197efedeaf36f0012c2763080f4b51cc5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ta-LK/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ta-LK/thunderbird-52.7.0.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "9c9b79cf21e64461b8a78dd0f7816346ada2cce0ef4bce4da291497c9fd1aa414c199d57265390e5b885828b1efa38f9883882870b84a5b3a64ffffb47da79e1"; + sha512 = "3c8429d8a31771452e108c0a7b16070138ea1e82aa16536bad4d7570117f0790045e9a34fb9f7546eb3d749e0d94b2a1a7a65b93198909189cbd2f1bf872af94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/tr/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/tr/thunderbird-52.7.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "61a671ae2804b06143e636c9e8ae0badb460bf9cbb3555213bf43aa2d56b2a9f13ca3a13362f2a9b7ecafb4b03451093ea2f817a104cc7d4555e11b1ffb18103"; + sha512 = "effe30bec8c4b0fc1428681888ea1e0a79eefa1f60fc3964e08142d00c6db065ff9a2acf989765497520f27504b4ea3c8104a084f63abe4358d165c5bfecc680"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/uk/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/uk/thunderbird-52.7.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "629ede67d8bbfd6b1233d2030234fed7f99915045131caa11edce99b6e9c314b7cfd6ef457d26a0e628b525bb78c05426e8c078364ade5e606dfaba90200feee"; + sha512 = "92cca4a0b9ac66bd4c0e14d0c04a162dbe2a3aac3a9fa95e26e6eef8ef1716fc21832967323ca5b46df19b28843de6e4781ea323120bac37a9821745f7ca9af7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/vi/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/vi/thunderbird-52.7.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "728644651b7eff73be44bceccf8038bca79e020fbaad87d74fb1ff4856554766e6494e1e16a0d93187615f5f8cb663fc3233855d66e8cf0996fe597c9645273c"; + sha512 = "b470364cac631fe944e7c06a27299e8ddf65605aaa1550d0736ab6088e38cf008d224b920111a17f6d87aceda3b95ad0ebb01351ed2339680530629a70fca1b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-CN/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-CN/thunderbird-52.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ef5a81e04ed973fd2ed576d1654f1ada7d9cefb6943bf604bee53053fedc4b2127c780ac2ff3c9b568813699f29f744950e899bc71733cd8d385368e1d0c07c2"; + sha512 = "1840d47835805c0ab854dde0a08fed90c785377d14b8f53b303fbd65bc5dc8e967146ae5d26ef4a0693df89679cff27ccbad0cabde27356dff97701fd3c91579"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-TW/thunderbird-52.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-TW/thunderbird-52.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "ddf5a00621d6916c6033f81589c9376a8aaba3bf12810a2fd41358af323d9f6354384a5b938f299855d27a1272d36e99ca3f45a8ab8299aa7afc118d942ae624"; + sha512 = "aaaef2821bb128218a6c9bbf07b1f017574f39a20664e0e82a396ddebeb4b2ac754fa1ece956ab70b1f55ef5e2a750d612cd6ebbd2a747d28f9c24a5b994c730"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 2e1f8ed5070174d57c5d407be9584c434a0ecb41..1bf37edf1af9fef556ddcb1924e485d7b607ba73 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg +, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip +, yasm, libGLU_combined, sqlite, unzip , hunspell, libevent, libstartup_notification , cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc , autoconf213, which, m4 @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.4.0"; + version = "52.7.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "6ac39cecca9e53b51754d7a8bd7cae228d197eb234b03a2386c16fd665f4f7a67f10bbdf981c20b3f7a21a5ef67e2771154a3dd9f249c6a884c48a9e59bcfc78"; + sha512 = "875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21"; }; # New sed no longer tolerates this mistake. @@ -39,9 +39,9 @@ in stdenv.mkDerivation rec { # from firefox, but without sound libraries buildInputs = [ gtk2 zip libIDL libjpeg zlib bzip2 - dbus dbus_glib pango freetype fontconfig xorg.libXi + dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - nspr nss libnotify xorg.pixman yasm mesa + nspr nss libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip hunspell libevent libstartup_notification /* cairo */ @@ -72,7 +72,6 @@ in stdenv.mkDerivation rec { "--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 @@ -141,7 +140,7 @@ in stdenv.mkDerivation rec { exec = "thunderbird %U"; desktopName = "Thunderbird"; icon = "$out/lib/thunderbird-${version}/chrome/icons/default/default256.png"; - genericName = "Main Reader"; + genericName = "Mail Reader"; categories = "Application;Network"; mimeType = stdenv.lib.concatStringsSep ";" [ # Email diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index a611e2cf3ee88aac1585a30b4ef39ba29e310d70..d8029f02a6f0bf86cfcf130d5802f4c06b99239b 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, pkgconfig +{ stdenv, fetchurl, fetchgit, fetchpatch, pkgconfig , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python , jackSupport ? false, libjack2 ? null @@ -17,7 +17,7 @@ let generic = overrides: source: stdenv.mkDerivation (source // overrides // { name = "${overrides.type}-${source.version}"; - patches = optional jackSupport ./mumble-jack-support.patch; + patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; nativeBuildInputs = [ pkgconfig python ] ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmake ]; }."qt${toString source.qtVersion}" @@ -90,7 +90,7 @@ let mkdir -p $out/share/icons{,/hicolor/scalable/apps} cp icons/mumble.svg $out/share/icons - ln -s $out/share/icon/mumble.svg $out/share/icons/hicolor/scalable/apps + ln -s $out/share/icons/mumble.svg $out/share/icons/hicolor/scalable/apps ''; } source; @@ -116,17 +116,24 @@ let url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz"; sha256 = "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh"; }; + + # Fix compile error against boost 1.66 (#33655): + patches = singleton (fetchpatch { + url = "https://github.com/mumble-voip/mumble/commit/" + + "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch"; + sha256 = "1r50dc8dcl6jmbj4abhnay9div7y56kpmajzqd7ql0pm853agwbh"; + }); }; gitSource = rec { - version = "2017-05-25"; + version = "2018-01-12"; qtVersion = 5; # Needs submodules src = fetchgit { url = "https://github.com/mumble-voip/mumble"; - rev = "3754898ac94ed3f1e86408114917d1b4c06f17b3"; - sha256 = "1qh49x3y7m0c0h0gcs6amkf8nb75p6g611zwn19mbplwmi7h9y8f"; + rev = "e348e47f4af68eaa8e0f87d1d9fc28c5583e421e"; + sha256 = "12z41qfaq6w3i4wcw8pvyb8wwwa8gs3ar5zx6aqx6yssc6513lr3"; }; }; in { diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 93e10fbe5664a125ef3ca51694019ad010d35044..0b8a584fc6a623426477d9b3c043543516a72042 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook -, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1 -, libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg -, gobjectIntrospection, glib_networking +, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1 +, libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg +, gobjectIntrospection, glib-networking }: let pname = "liferea"; - version = "1.12-rc3"; + version = "1.12.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0dd6hisqvc4ps6dx9ly34qx49ab1qa5h826b7dvf64mjqxa2v3kr"; + sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; buildInputs = [ - glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas - libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection - librsvg glib_networking libnotify + glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas + libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection + librsvg glib-networking libnotify ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 pycairo ]; preFixup = '' + rm "$out/share/icons/hicolor/icon-theme.cache" buildPythonPath "$out $pythonPath" gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 63d7f29d7de658a75d7ea699023d1b5d51198c2c..1d913118433ed9ec99a2d223d34e0826cfa64918 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,23 +1,38 @@ { spellChecking ? true -, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null -, perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify +, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null +, perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls +, makeWrapper, gnupg +, gnomeSupport ? true, libgnome-keyring3 }: -assert spellChecking -> gtkspell2 != null; +assert spellChecking -> gtkspell3 != null; -let version = "0.139"; in +let version = "0.144"; in stdenv.mkDerivation { name = "pan-${version}"; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz"; + sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 perl gmime gettext intltool dbus_glib libnotify ] - ++ stdenv.lib.optional spellChecking gtkspell2; + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ] + ++ stdenv.lib.optional spellChecking gtkspell3 + ++ stdenv.lib.optional gnomeSupport libgnome-keyring3; + + configureFlags = [ + "--with-dbus" + "--with-gtk3" + "--with-gnutls" + "--enable-libnotify" + ] ++ stdenv.lib.optional spellChecking "--with-gtkspell" + ++ stdenv.lib.optional gnomeSupport "--enable-gkr"; + + postInstall = '' + wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 5ebd01f38c413a864a14c0c39f10a02d22e1b072..7bd50a47f813d9588f3007351119338e6aca6a4e 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.8"; + version = "0.18.10"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "09mdxpv04zycrip1p5w6947348xfraicijddvxsr7d498r59b7ff"; + sha256 = "1bv5aw6fscrwlycirvzm6fvbwmg8lbd1ycldkwbvybhjyfjaxkpm"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 081f765a3e878e1067893a37caad3a35086445cb..6ed5e63cd0f1a158be3a0b5c110509b70aa5ed48 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite -, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }: +{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite +, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome-keyring }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchgit { url = "git://github.com/nextcloud/client_theming.git"; - rev = "1ee750d1aeaaefc899629e85c311594603e9ac1b"; - sha256 = "0dxyng8a7cg78z8yngiqypsb44lf5c6vkabvkfch0cl0cqmarc1a"; + rev = "ab40efe1e1475efddd636c09251d8917627261da"; + sha256 = "19a1kqydgx47sa1a917j46zlbc5g9nynsanasyad9c8sqi0qvyip"; fetchSubmodules = true; }; + patches = [ ./find-sql.patch ]; + patchFlags = "-d client -p1"; + nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ qtbase qtwebkit qtkeychain sqlite ] + buildInputs = [ qtbase qtwebkit qtkeychain qttools sqlite ] ++ stdenv.lib.optional stdenv.isLinux inotify-tools ++ stdenv.lib.optional withGnomeKeyring makeWrapper; @@ -33,9 +36,12 @@ stdenv.mkDerivation rec { "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" ]; - postInstall = stdenv.lib.optionalString (withGnomeKeyring) '' + postInstall = '' + sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \ + $out/share/applications/nextcloud.desktop + '' + stdenv.lib.optionalString (withGnomeKeyring) '' wrapProgram "$out/bin/nextcloud" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome-keyring ]} ''; meta = with stdenv.lib; { @@ -43,6 +49,6 @@ stdenv.mkDerivation rec { homepage = https://nextcloud.com; license = licenses.gpl2; maintainers = with maintainers; [ caugner ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/nextcloud-client/find-sql.patch b/pkgs/applications/networking/nextcloud-client/find-sql.patch new file mode 100644 index 0000000000000000000000000000000000000000..baf6a4fbf49170f1283f0e6598bbc525f6ef2955 --- /dev/null +++ b/pkgs/applications/networking/nextcloud-client/find-sql.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake +index 5bd853c84..93ddf3cf8 100644 +--- a/cmake/modules/QtVersionAbstraction.cmake ++++ b/cmake/modules/QtVersionAbstraction.cmake +@@ -17,6 +17,7 @@ if( Qt5Core_FOUND ) + message(STATUS "Found Qt5 core, checking for further dependencies...") + find_package(Qt5Network REQUIRED) + find_package(Qt5Xml REQUIRED) ++ find_package(Qt5Sql REQUIRED) + find_package(Qt5Concurrent REQUIRED) + if(UNIT_TESTING) + find_package(Qt5Test REQUIRED) diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 75ed084c285345392762f3228dc1b0f12ae7743a..d499916c7b6c2e1d64505cd09f9ab30c14c39686 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -8,18 +8,14 @@ stdenv.mkDerivation { cp offrss $out/bin ''; - crossAttrs = { - propagatedBuildInputs = [ curl.crossDrv libmrss.crossDrv ]; - preConfigure = '' - sed 's/^PDF/#PDF/' -i Makefile - ''; - }; - - buildInputs = [ curl libmrss podofo ] + buildInputs = [ curl libmrss ] + ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; configurePhase = stdenv.lib.optionalString (!stdenv.isLinux) '' sed 's/#EXTRA/EXTRA/' -i Makefile + '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + sed 's/^PDF/#PDF/' -i Makefile ''; src = fetchurl { @@ -32,6 +28,6 @@ stdenv.mkDerivation { description = "Offline RSS/Atom reader"; license="AGPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 41e64d7b721fd8c58b42eb9522d814a2c17f585e..c03202517747d7926fb361c1c6c7d8f24595d2d0 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "ostinato-${version}"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; rev = "v${version}"; - sha256 = "1b5a5gypcy9i03mj6md3lkrq05rqmdyhfykrr1z0sv8n3q48xca3"; + sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx"; }; ostinatoIcon = fetchurl { - url = "http://ostinato.org/images/site-logo.png"; + url = "https://ostinato.org/images/site-logo.png"; sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; }; @@ -54,6 +54,10 @@ stdenv.mkDerivation rec { EOF ''; + # `cd common; qmake ostproto.pro; make pdmlreader.o`: + # pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "A packet traffic generator and analyzer"; homepage = http://ostinato.org; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 814dc1bf69a967371f3f1e5259b08edc9143f513..94e3b7d0ba6a40b31deace7a109764ef6c1fa1df 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "1r5ddln1wc9iyjizgqb104i0r6qhzsmm2wdnxfaif119cv0vphda"; + sha256 = "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49"; }; + patches = [ ../nextcloud-client/find-sql.patch ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 7f8594b8bbb1c4707beb3ff32451c21da8b3dad8..c6e5d0f3cb31e54d9a0f7bf06873f23034969da7 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar_1_0, pythonPackages }: +{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { name = "deluge-${version}"; version = "1.3.15"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { }; propagatedBuildInputs = with pythonPackages; [ - pyGtkGlade libtorrentRasterbar_1_0 twisted Mako chardet pyxdg pyopenssl service-identity + pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity ]; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 8a159f033aec8ba37dca0911e747dc6a8ece1241..7279994140205e296705fc0d3062507f08be8a12 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,24 +1,80 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: -with stdenv.lib; +let + version = "6.6.3-build-253"; + name = "frostwire-desktop-${version}"; -stdenv.mkDerivation rec { - version = "6.4.5"; - name = "frostwire-${version}"; + src = fetchFromGitHub { + owner = "frostwire"; + repo = "frostwire"; + rev = name; + sha256 = "1bqv942hfz12i3b3nm1pfwdp7f58nzjxg44h31f3q47719hh8kd7"; + }; + + desktopItem = makeDesktopItem { + name = "frostwire"; + desktopName = "FrostWire"; + genericName = "P2P Bittorrent client"; + exec = "frostwire"; + icon = "frostwire"; + comment = "Search and explore all kinds of files on the Bittorrent network"; + categories = "Network;FileTransfer;P2P;"; + }; - src = fetchurl { - url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; - sha256 = "01nq1vwkqdidmprlnz5d3c5412r6igv689barv64dmb9m6iqg53z"; + # fake build to pre-download deps into fixed-output derivation + deps = stdenv.mkDerivation { + name = "${name}-deps"; + inherit src; + buildInputs = [ gradle perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + ( cd desktop + gradle --no-daemon build + ) + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0p279i41q7pn6nss8vndv3g4qzrvj3pmhdxq50kymwkyp2kly3lc"; }; +in stdenv.mkDerivation { + inherit name src; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gradle ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + ( cd desktop + substituteInPlace src/com/frostwire/gui/player/MediaPlayerLinux.java \ + --replace /usr/bin/mplayer ${mplayer}/bin/mplayer + substituteInPlace build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' + gradle --offline --no-daemon build + ) + ''; installPhase = '' - mkdir -p $out/share/java - mv $(ls */*.jar) $out/share/java + mkdir -p $out/lib $out/share/java + + cp desktop/build/libs/frostwire.jar $out/share/java/frostwire.jar + + cp ${ { x86_64-darwin = "desktop/lib/native/*.dylib"; + x86_64-linux = "desktop/lib/native/libjlibtorrent.so"; + i686-linux = "desktop/lib/native/libjlibtorrentx86.so"; + }.${stdenv.system} or (throw "unsupported system ${stdenv.system}") + } $out/lib + + cp -dpR ${desktopItem}/share $out - makeWrapper $out/share/java/frostwire $out/bin/frostwire \ - --prefix PATH : ${jre}/bin/ + makeWrapper ${jre}/bin/java $out/bin/frostwire \ + --add-flags "-Djava.library.path=$out/lib -jar $out/share/java/frostwire.jar" ''; meta = with stdenv.lib; { @@ -26,6 +82,6 @@ stdenv.mkDerivation rec { description = "BitTorrent Client and Cloud File Downloader"; license = licenses.gpl2; maintainers = with maintainers; [ gavin ]; - platforms = platforms.all; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix new file mode 100644 index 0000000000000000000000000000000000000000..84ed1ff92591343c3ae83d788822a4b033899458 --- /dev/null +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "6.6.5"; + name = "frostwire-${version}"; + + src = fetchurl { + url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; + sha256 = "0qxh5288mxd7ksd3zl0i8avkyzh8lj06x3jqya8znfq1c1wg0fph"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/java + mv $(ls */*.jar) $out/share/java + + makeWrapper $out/share/java/frostwire $out/bin/frostwire \ + --prefix PATH : ${jre}/bin/ + ''; + + meta = with stdenv.lib; { + homepage = http://www.frostwire.com/; + description = "BitTorrent Client and Cloud File Downloader"; + license = licenses.gpl2; + maintainers = with maintainers; [ gavin ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 6d204de9ac438f80f7e72c8d99e5d25b0382d779..400600751a2e284d162208819a7b2e0b7b331136 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern and lightweight direct connect client with a friendly ncurses interface"; - homepage = http://dev.yorhel.nl/ncdc; + homepage = https://dev.yorhel.nl/ncdc; license = licenses.mit; platforms = platforms.linux; # arbitrary maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 03178b5cb75d35747f98f2b88d4d558d66514c6e..90d68a96e5c0324a784df93d66a9beda399d38ff 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, qtbase, qttools +, boost, libtorrentRasterbar, qtbase, qttools, qtsvg , debugSupport ? false # Debugging , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI @@ -10,16 +10,16 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.3.16"; + version = "4.0.4"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0mxyn2pajvb55bhcaz55v64p2xzy15p0yy174s62b5y3f8cac27a"; + sha256 = "13sw0sdw2agm49plp9xvkg6wva274drpvgz76dqj4j2kfxx9s2jk"; }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ boost libtorrentRasterbar qtbase qttools ] + buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ] ++ optional guiSupport dbus_libs; # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist. @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Software alternative to µtorrent"; - homepage = http://www.qbittorrent.org/; + homepage = https://www.qbittorrent.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ viric ]; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 0d7a41735ea4d67ccad5e6a303fd8ec52a9a749f..950187ed9c60beee0f0db8fa0169b8df8c058639 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools + speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg ]; diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..315106ea85255bf9f1bb6e982c8e025dd578e07a --- /dev/null +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchurl +, dbus +, expat, zlib, fontconfig +, libpng, libX11, libxcb, libXau, libXdmcp, freetype, libbsd +}: + +with stdenv.lib; +let + libPath = makeLibraryPath + [ stdenv.cc.cc dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd ]; + + version = "2016-1-17"; + + mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit"); + srcs = { + "i686-linux" = fetchurl { + url = "https://www.dropbox.com/s/kebk1b5ib1m3xxw/${mainbin}.tgz"; + sha256 = "0r9rhnfslkgbw3l7fnc0rcfqjh58amgh5p33kwam0qvn1h1frnir"; + }; + + "x86_64-linux" = fetchurl { + url = "https://www.dropbox.com/s/7qh902qv2sxyp6p/${mainbin}.tgz"; + sha256 = "05l3smpdvw8xdhv4v8a28j0yi1kvzhrha2ck23g4bl7x9wkay4cc"; + }; + }; + +in stdenv.mkDerivation rec { + + name = "soulseekqt-${version}"; + inherit version; + src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); + + sourceRoot = "."; + buildPhase = ":"; # nothing to build + + installPhase = '' + mkdir -p $out/bin + cp ${mainbin} $out/bin/soulseekqt + ''; + + fixupPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath} \ + $out/bin/soulseekqt + ''; + + meta = with stdenv.lib; { + description = "Official Qt SoulSeek client"; + homepage = http://www.soulseekqt.net; + license = licenses.unfree; + maintainers = [ maintainers.genesis ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index d37f5293ef806f6ae9e088e8e4ecdcccef09140a..9f47f8464a132c3d08b632f92f65cfdb47e4d755 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, glib, zlib, dbus, dbus_glib, gtk2, gdk_pixbuf, cairo, pango }: +{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk_pixbuf, cairo, pango }: stdenv.mkDerivation rec { name = "tixati-${version}"; - version = "2.55"; + version = "2.57"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "02mha6lfcb0mg0y977bxa6xg8krpbsbzpm4b5xw6y6wign4d8a8w"; + sha256 = "0z6znh62ry4fmc6c54zq79pk1b5bwkz93bxsfgvxpf6sajpyf9n7"; }; installPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus_glib gtk2 gdk_pixbuf cairo pango ]} \ + --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk_pixbuf cairo pango ]} \ tixati install -D tixati $out/bin/tixati install -D tixati.desktop $out/share/applications/tixati.desktop diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index a33f85551f3d85b4281fed20677de6319da13410..f047b630ec409ee7a11a45898d960a570a5a94f0 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -3,12 +3,12 @@ libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { name = "transgui-5.0.1-svn-r${revision}"; - revision = "986"; + revision = "988"; src = fetchsvn { url = "https://svn.code.sf.net/p/transgui/code/trunk/"; rev = revision; - sha256 = "0z83hvlhllm6p1z4gkcfi1x3akgn2xkssnfhwp74qynb0n5362pi"; + sha256 = "1i6ysxs6d2wsmqi6ha10rl3n562brmhizlanhcfad04i53y8pyxf"; }; nativeBuildInputs = [ pkgconfig ]; @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { substituteInPlace restranslator.pas --replace /usr/ $out/ ''; + patches = [ + ./r988-compile-fix.patch + ]; + makeFlags = [ "FPC=fpc" "PP=fpc" diff --git a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..4b070d0cbe8a348404a20196b27dceac02888900 --- /dev/null +++ b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch @@ -0,0 +1,22 @@ +diff --git a/utils.pas b/utils.pas +index eb8b828..1ff2440 100644 +--- a/utils.pas ++++ b/utils.pas +@@ -100,7 +100,7 @@ uses + {$ifdef CALLSTACK} + lineinfo2, + {$endif CALLSTACK} +- LazFileUtils, LazUtf8, StdCtrls, Graphics; ++ LazFileUtils, LazUtf8, StdCtrls, Graphics, FileUtil; + + {$ifdef windows} + function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle; +@@ -235,7 +235,7 @@ end; + + function ParamStrUTF8(Param: Integer): utf8string; + begin +- Result:=FileUtil.ParamStrUTF8(Param); ++ Result:=LazUtf8.ParamStrUTF8(Param); + end; + + function ParamCount: integer; diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 20c3540b7f45fe920257a4755faa702614239cf2..eb88d1c24c207d5408901e4d8aaa7adcf72f5914 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,6 +1,6 @@ { stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig -, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib -, hicolor_icon_theme }: +, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib +, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pkgconfig intltool autoconf-archive appstream-glib ]; - buildInputs = [ gtk3 json_glib curl glib hicolor_icon_theme ]; + 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 9b448f86736d2bc8e213182f4889abf79e894106..cf825b724962ecbf1aaf70090bd32cbbda14298e 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook , openssl, curl, libevent, inotify-tools, systemd, zlib , enableGTK3 ? false, gtk3 , enableSystemd ? stdenv.isLinux @@ -6,23 +6,21 @@ , enableCli ? true }: -let - version = "2.92"; -in - let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "transmission-" + optionalString enableGTK3 "gtk-" + version; + version = "2.93"; src = fetchurl { - url = "https://transmission.cachefly.net/transmission-${version}.tar.xz"; - sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"; + url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.93.tar.xz"; + sha256 = "8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ optionals enableGTK3 [ wrapGAppsHook ]; buildInputs = [ intltool file openssl curl libevent zlib ] - ++ optionals enableGTK3 [ gtk3 makeWrapper ] + ++ optionals enableGTK3 [ gtk3 ] ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.isLinux [ inotify-tools ]; @@ -41,10 +39,8 @@ stdenv.mkDerivation rec { ++ optional enableSystemd "--with-systemd-daemon" ++ optional enableGTK3 "--with-gtk"; - preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ '' + preFixup = optionalString enableGTK3 '' rm "$out/share/icons/hicolor/icon-theme.cache" - wrapProgram "$out/bin/transmission-gtk" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 9d26a74f8bb1b65e3c48f17a17c66d51557d3c90..f6828fe6f317519d0ec1b8e3764ec155315bac5d 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tribler"; name = "${pname}-${version}"; - version = "7.0.0-rc3"; + version = "7.0.1"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0f1f8mzbk1ygkh8lv9y1s9mvslv12d94mxvmp3b4s2vm8w4syza7"; + sha256 = "0cqg6319x2lid5la5vdlj6lwja8g712196j39jzv5yiaq8d0zym4"; }; buildInputs = [ @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = with maintainers; [ xvapx ]; - homepage = http://www.tribler.org/; + homepage = https://www.tribler.org/; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index bceabc2a64a915bdbd5a960c21f42c1a39cbec74..2a4991b9318f8f1bf35acddee4b223b6927c20e1 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -2,15 +2,19 @@ stdenv.mkDerivation rec { name = "pjsip-${version}"; - version = "2.6"; + version = "2.7.2"; src = fetchurl { url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig"; + sha256 = "0wiph6g51wanzwjjrpwsz63amgvly8g08jz033gnwqmppa584b4w"; }; buildInputs = [ openssl libsamplerate alsaLib ]; + preConfigure = '' + export LD=$CC + ''; + postInstall = '' mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua @@ -25,7 +29,7 @@ stdenv.mkDerivation rec { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; homepage = http://pjsip.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric olynch]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..305aceec62b51a3f71b3e068020adbff6a25ea88 --- /dev/null +++ b/pkgs/applications/networking/protocol/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub }: + +buildPythonApplication rec { + pname = "protocol"; + version = "20171226"; + + src = fetchFromGitHub { + owner = "luismartingarcia"; + repo = "protocol"; + rev = "d450da7d8a58595d8ef82f1d199a80411029fc7d"; + sha256 = "1g31s2xx0bw8ak5ag1c6mv0p0b8bj5dp3lkk9mxaf2ndj1m1qdkw"; + }; + + meta = with stdenv.lib; { + description = "An ASCII Header Generator for Network Protocols"; + homepage = https://github.com/luismartingarcia/protocol; + license = licenses.gpl3; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index f6be80e4a1d4d23ded6a4db206833b11c6ef0632..d5982f33e78e7f3c34b6a0516c4012bf9b63c28e 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -15,7 +15,7 @@ , cairo , pango , gnome3 -, xlibs +, xorg , libpng12 , freetype , fontconfig @@ -67,9 +67,31 @@ let patch = "0"; x64hash = "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91"; x86hash = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # Fix when updating version x64suffix = "10276927"; x86suffix = "10276925"; + homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html; + }; + + "13.8.0" = { + major = "13"; + minor = "8"; + patch = "0"; + x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931"; + x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7"; + x64suffix = "10299729"; + x86suffix = "10299729"; + homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-138.html; + }; + + "13.9.0" = { + major = "13"; + minor = "9"; + patch = "0"; + x64hash = "00l18s7i9yky3ddabwljwsf7fx4cjgjn9hfd74j0x1v4gl078nl9"; + x86hash = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag"; + x64suffix = "102"; + x86suffix = "102"; + homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; }; }; @@ -121,11 +143,11 @@ let cairo pango gnome3.dconf - xlibs.libX11 - xlibs.libXext - xlibs.libXrender - xlibs.libXinerama - xlibs.libXfixes + xorg.libX11 + xorg.libXext + xorg.libXrender + xorg.libXinerama + xorg.libXfixes libpng12 libidn zlib @@ -158,7 +180,7 @@ let ./${prefixWithBitness}/hinst # Run the installer... - ./${prefixWithBitness}/hinst CDROM "`pwd`" + bash ./${prefixWithBitness}/hinst CDROM "`pwd`" echo "Deleting broken links..." for link in `find $ICAInstDir -type l ` @@ -191,7 +213,7 @@ let 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 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" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 31e1a860ac98dab308b44960e28c13009671250b..872d9b018ff7bbbca5a9e90edff3a038cd60ca52 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, ffmpeg_2, glib, openssl, pcre, zlib +, alsaLib, ffmpeg, glib, openssl, pcre, zlib , libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv , libxkbcommon, libxkbfile , wayland -, gstreamer, gst-plugins-base, gst-plugins-good +, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc , libpulseaudio ? null , cups ? null , pcsclite ? null @@ -13,14 +13,14 @@ }: stdenv.mkDerivation rec { - name = "freerdp-git-${version}"; - version = "20170724"; + name = "freerdp-${version}"; + version = "2.0.0-rc2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; - rev = "2.0.0-rc0"; - sha256 = "0ngwdy0lfv2k59z1z8yq1wj5zbhqigpyfqbgh38m9p35yzh33lv1"; + rev = version; + sha256 = "01cm9g4xqihnnc5d2w1zs8gabkv59p7fyjwi1cwpzv6s198xwbfs"; }; # outputs = [ "bin" "out" "dev" ]; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ''; buildInputs = with lib; [ - alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib - gstreamer gst-plugins-base gst-plugins-good + alsaLib cups ffmpeg glib openssl pcre pcsclite libpulseaudio zlib + gstreamer gst-plugins-base gst-plugins-good libunwind orc libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv libxkbcommon libxkbfile wayland @@ -46,17 +46,19 @@ stdenv.mkDerivation rec { cmake pkgconfig ]; + enableParallelBuilding = true; + doCheck = false; cmakeFlags = with lib; [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DWITH_CUNIT=OFF" "-DWITH_OSS=OFF" - ] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON" - ++ optional (cups != null) "-DWITH_CUPS=ON" - ++ optional (pcsclite != null) "-DWITH_PCSC=ON" - ++ optional buildServer "-DWITH_SERVER=ON" - ++ optional optimize "-DWITH_SSE2=ON"; + ] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON" + ++ optional (cups != null) "-DWITH_CUPS=ON" + ++ optional (pcsclite != null) "-DWITH_PCSC=ON" + ++ optional buildServer "-DWITH_SERVER=ON" + ++ optional (optimize && stdenv.isx86_64) "-DWITH_SSE2=ON"; meta = with lib; { description = "A Remote Desktop Protocol Client"; diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 4179cc3058e862431ccea09d03d2b983995804c1..4caa9ae63f759de989b9b1704042b5f96d4d4716 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, libX11} : +{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig} : stdenv.mkDerivation (rec { pname = "rdesktop"; @@ -10,12 +10,12 @@ stdenv.mkDerivation (rec { sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8"; }; - buildInputs = [openssl libX11]; + nativeBuildInputs = [pkgconfig]; + buildInputs = [openssl libX11 libgssglue]; configureFlags = [ "--with-ipv6" "--with-openssl=${openssl.dev}" - "--disable-credssp" "--disable-smartcard" ]; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 5cbee68551e5c8cd3d26750c52f48963da5af300..6d32036def550415080b78a0bc379f0a1f19d9a6 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook -, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11 +, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core -, openssl, gsettings_desktop_schemas +, libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core +, openssl, gsettings-desktop-schemas # The themes here are soft dependencies; only icons are missing without them. -, hicolor_icon_theme, adwaita-icon-theme +, hicolor-icon-theme, adwaita-icon-theme }: let - version = "1.2.0-rcgit.17"; + version = "1.2.0-rcgit.24"; desktopItem = makeDesktopItem { name = "remmina"; @@ -29,17 +29,17 @@ in stdenv.mkDerivation { owner = "FreeRDP"; repo = "Remmina"; rev = "v${version}"; - sha256 = "1vfg8sfpj83ircp7ny6xsbn2ba5xbp3xrdl5wwyfcg1zrpdmi7f1"; + sha256 = "1x7kygl9a5nh7rf2gfrk0wwv23mbw7rrjms402l3zp1w53hrhwmg"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake wrapGAppsHook gsettings_desktop_schemas - glib gtk3 gettext libxkbfile libgnome_keyring libX11 + buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas + glib gtk3 gettext libxkbfile libgnome-keyring libX11 freerdp libssh libgcrypt gnutls pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret spice_protocol spice_gtk epoxy at_spi2_core - openssl hicolor_icon_theme adwaita-icon-theme ]; + libsecret spice-protocol spice-gtk epoxy at-spi2-core + openssl hicolor-icon-theme adwaita-icon-theme ]; cmakeFlags = [ "-DWITH_VTE=OFF" diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index d15d0afa63cd01fde163842e6568583005d14dae..260500e9d337df15f0e76b28f59d17e195ace7cf 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -4,25 +4,25 @@ let ld32 = if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" - else abort "Unsupported architecture"; + else throw "Unsupported system ${stdenv.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); - deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]); + deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xorg; [ 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.76279"; + version = "12.0.90041"; 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 = "15yhx66zxbjk0x3dpfg39gb1f2ajcp9kbp4zi58bfnvby277jl00"; + url = "https://dl.tvcdn.de/download/version_12x/teamviewer_${version}_i386.deb"; + sha256 = "19gf68xadayncrbpkk3v05xm698zavv8mz8ia6jhadrh5s6i0bwg"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 3edf45d9acd9053632cc60557758227243245948..904a6812c489eb0041ccbc5761f2d7164a7530b2 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { homepage = http://x2go.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index b6b1f6542af30f4b55302adf61049a2234a4971e..ed1abfcba99def4aff2e49a674efb101af38e4b7 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -3,13 +3,13 @@ let xorgxrdp = stdenv.mkDerivation rec { name = "xorgxrdp-${version}"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "0l1b38j3q9mxyb8ffpdplbqs6rnabj92i8wngrwlkhfh2c88szn1"; + sha256 = "05ix0bvbgpg0l0f6pyxp64a4785yv16dxf522y7k84b0rag4bxr7"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; @@ -34,7 +34,7 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.3"; + version = "0.9.5"; name = "xrdp-${version}"; src = fetchFromGitHub { @@ -42,7 +42,7 @@ let repo = "xrdp"; rev = "refs/heads/runtime-cfg-path-${version}"; # 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 patched already fetchSubmodules = true; - sha256 = "0xqyg3m688fj442zgg9fqmbz7nnzvqpd7a9ki2cwh1hyibacpmz7"; + sha256 = "1sm994dic72zvxgwxw9z6an6050976nlnnn2my42pnzj9l5842d8"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 7622cb76ad2afad60f21e62fd8a7ca23a88d0585..46de1d532dd4a13f76181681c99d05ad172d4f51 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -4,18 +4,18 @@ let arch = { "x86_64-linux" = "x64"; "i686-linux" = "i386"; - }.${stdenv.system}; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.5.2"; + version = "2.5.12"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192"; - "i686-linux" = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8"; + "x86_64-linux" = "176gf5704wh22kqig8n0gg83048w71grw7h37k2qvxjaf4vypnc7"; + "i686-linux" = "15m2s2cqrkpb7ladbwimbs9agqb4ww9jr4gf0ifjwzm2grv5ffnh"; }.${stdenv.system}; }; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 74f5ecb6b75f8e7345079dc1d60e73e358aa3898..35926836e30d84eba11e8262afc8a62b074cde33 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, writeScript, pkgconfig, cmake, qtbase, qttools +{ stdenv, fetchFromGitHub, writeScript, pkgconfig, cmake, qtbase, qttools , seafile-shared, ccnet, makeWrapper , withShibboleth ? true, qtwebengine }: with stdenv.lib; stdenv.mkDerivation rec { - version = "6.1.0"; + version = "6.1.7"; name = "seafile-client-${version}"; - src = fetchurl { - url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; - sha256 = "16rn6b9ayaccgwx8hs3yh1wb395pp8ffh8may8a8bpcc4gdry7bd"; + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seafile-client"; + rev = "v${version}"; + sha256 = "1wf258sxn4pqdn1xypqwlxbnls771k2c6whpbinpns3knv5zvgaq"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; @@ -30,6 +32,6 @@ stdenv.mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.calrama ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/applications/networking/sniffers/wireshark/cmake.patch b/pkgs/applications/networking/sniffers/wireshark/cmake.patch new file mode 100644 index 0000000000000000000000000000000000000000..890fffedce031975d2996b3f08a2894bd504701d --- /dev/null +++ b/pkgs/applications/networking/sniffers/wireshark/cmake.patch @@ -0,0 +1,19 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + # + ++cmake_minimum_required(VERSION 3.7) + project(Wireshark C CXX) + + # Updated by make-version.pl +@@ -40,7 +41,7 @@ + # Needed for GREATER_EQUAL operator + cmake_minimum_required(VERSION 3.7) + else() +- cmake_minimum_required(VERSION 2.8.8) ++ cmake_minimum_required(VERSION 3.7) + endif() + + # Needs to be set after cmake_minimum_required or cmake_policy(VERSION) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 2ed87c71a90600c4f6d90621992a38d35311cc4e..d8ff5f3100acbcdcd98b759c1a9cb1401eab7adc 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib -, libssh, zlib, cmake, extra-cmake-modules, fetchpatch -, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null +, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper +, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.2"; + version = "2.4.6"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,10 +20,15 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0zglapd3sz08p2z9x8a5va3jnz17b3n5a1bskf7f2dgx6m3v5b6i"; + sha256 = "1znmjg40pf81ks9lnm6ilx0cy32xan5g19gbqkkhj35whb95z5lf"; }; - cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; + cmakeFlags = [ + "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}" + "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" + "-DENABLE_QT5=${if withQt then "ON" else "OFF"}" + "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" + ]; nativeBuildInputs = [ bison cmake extra-cmake-modules flex pkgconfig @@ -31,15 +36,37 @@ in stdenv.mkDerivation { buildInputs = [ gettext pcre perl libpcap lua5 libssh openssl libgcrypt - libgpgerror gnutls geoip c-ares python glib zlib + libgpgerror gnutls geoip c-ares python glib zlib makeWrapper ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) - ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ] + ++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ] ++ optionals stdenv.isLinux [ libcap libnl ] - ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; + ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] + ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); + + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ] + # https://code.wireshark.org/review/#/c/23728/ + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "fix-timeout.patch"; + url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0"; + sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv"; + }) + ++ stdenv.lib.optional stdenv.isDarwin ./cmake.patch; + + postInstall = if stdenv.isDarwin then '' + ${optionalString withQt '' + mkdir -p $out/Applications + mv $out/bin/Wireshark.app $out/Applications/Wireshark.app - patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; + for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do + install_name_tool $so -change libwireshark.10.dylib $out/lib/libwireshark.10.dylib + install_name_tool $so -change libwiretap.7.dylib $out/lib/libwiretap.7.dylib + install_name_tool $so -change libwsutil.8.dylib $out/lib/libwsutil.8.dylib + done - postInstall = optionalString (withQt || withGtk) '' + wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \ + --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix} + ''} + '' else optionalString (withQt || withGtk) '' ${optionalString withGtk '' install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop ''} @@ -66,7 +93,7 @@ in stdenv.mkDerivation { experts. It runs on UNIX, macOS and Windows. ''; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index d6fe0d9114c2da626d6a7641a8a75fc86990e7de..c1f3d62af73707b3a3e6152f238057fd50e96b3d 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -4,16 +4,16 @@ }: let - arch = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "i386" + arch = if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "x86" else throw "Spideroak client for: ${stdenv.system} not supported!"; interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Spideroak client for: ${stdenv.system} not supported!"; - sha256 = if stdenv.system == "x86_64-linux" then "0k87rn4aj0v79rz9jvwspnwzmh031ih0y74ra88nc8kl8j6b6gjm" - else if stdenv.system == "i686-linux" then "1wbxfikj8f7rx26asswqrfp9vpk8w5941s21y1pnaff2gcac8m3z" + sha256 = if stdenv.system == "x86_64-linux" then "a88e5a8fe4a565ac500668bd53cf5784752d7c9253304ddce39ee7b01d078533" + else if stdenv.system == "i686-linux" then "668f3b83a974a3877d16c8743c233a427ea0a44ab84b7f9aec19a2995db66c16" else throw "Spideroak client for: ${stdenv.system} not supported!"; ldpath = stdenv.lib.makeLibraryPath [ @@ -21,14 +21,14 @@ let libX11 libXext libXrender zlib ]; - version = "6.1.9"; + version = "7.1.0"; in stdenv.mkDerivation { name = "spideroak-${version}"; src = fetchurl { - name = "spideroak-${version}-${arch}"; - url = "https://spideroak.com/getbuild?platform=slackware&arch=${arch}&version=${version}"; + name = "SpiderOakONE-${version}-slack_tar_${arch}.tgz"; + url = "https://spideroak.com/release/spideroak/slack_tar_${arch}"; inherit sha256; }; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index ccd08e2844eb9499a000cfe0da447cb8980dae6c..fae838a7d5f837a0f8a385720a176cf97973d6b0 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -3,7 +3,7 @@ let inherit (python3Packages) python dbus-python keyring; in stdenv.mkDerivation rec { - version = "1.1.12"; + version = "1.1.24"; name = "backintime-common-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a"; + sha256 = "0g6gabnr60ns8854hijdddbanks7319q4n3fj5l6rc4xsq0qck18"; }; buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ]; diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix index ef8f028274985c66be4805af2c5301df822a77c4..b8f388c63eb53e25e56acb5b67ccbae6a4d4dcd6 100644 --- a/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/pkgs/applications/networking/sync/backintime/qt4.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, makeWrapper, gettext, pkgconfig, libtool, backintime-common, python3, python3Packages }: stdenv.mkDerivation rec { - inherit (backintime-common) version src installFlags meta; + inherit (backintime-common) version src installFlags; name = "backintime-qt4-${version}"; @@ -22,4 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${backintime-common}/bin:$PATH" ''; + meta = with stdenv.lib; { + broken = true; + }; } diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index a7cf26ea7aeabe3de5065a504213ce15a41c7c40..e4bdec668a022ed5db07573687ff2bbc34750877 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lsyncd-${version}"; - version = "2.1.6"; + version = "2.2.2"; src = fetchFromGitHub { owner = "axkibe"; repo = "lsyncd"; rev = "release-${version}"; - sha256 = "1cab96h4qfyapk7lb682j1d8k0hpv7h9pl41vdgc0vr4bq4c3ij2"; + sha256 = "1q2ixp52r96ckghgmxdbms6xrq8dbziimp8gmgzqfq4lk1v1w80y"; }; patchPhase = '' diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index ad51703bd6fed507ba1960ff3d8f4ddc95af5067..aa2a971b15f660808052ffa3231068ef6b5e4f95 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.38"; + version = "1.40"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "0f56qm4lz55anzqf6dmjfywmvqy10zi5cl69zz8lda8lmvrpjm1d"; + sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index a95835610d52dc10bbc013bee31814162e94dedf..abc1f27e4f60aa81512a53cbd10c61e94ef62181 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: rec { - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc"; + sha256 = "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m"; }; - patches = fetchurl { + upstreamPatchTarball = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; - sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd"; + sha256 = "167vk463bb3xl9c4gsbxms111dk1ip7pq8y361xc0xfa427q9hhd"; }; meta = with stdenv.lib; { - homepage = http://rsync.samba.org/; + description = "Fast incremental file transfer utility"; + homepage = https://rsync.samba.org/; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 1f5e9601ff22d04a5d95e30f5b78f5fe31d3238b..f1e3f6b7301cd5feaf85b24e076a32f49c3d06da 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libiconv, zlib, popt +{ stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt , enableACLs ? true, acl ? null , enableCopyDevicesPatch ? false }: @@ -6,14 +6,14 @@ assert enableACLs -> acl != null; let - base = import ./base.nix { inherit stdenv fetchurl; }; + base = import ./base.nix { inherit stdenv fetchurl fetchpatch; }; in stdenv.mkDerivation rec { name = "rsync-${base.version}"; mainSrc = base.src; - patchesSrc = base.patches; + patchesSrc = base.upstreamPatchTarball; srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc; patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 7563b0ea1950ff8615a9d7eb1c209987de6f180d..bc2a6eb9c3cb658c49e0b314f06d558648357203 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, perl, rsync }: +{ stdenv, fetchurl, fetchpatch, perl, rsync }: let - base = import ./base.nix { inherit stdenv fetchurl; }; + base = import ./base.nix { inherit stdenv fetchurl fetchpatch; }; in stdenv.mkDerivation rec { name = "rrsync-${base.version}"; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4eecf7f4a1f8c8d5b14696f959fd35a924eaefc5 --- /dev/null +++ b/pkgs/applications/networking/syncplay/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, python2Packages }: + +python2Packages.buildPythonApplication rec { + name = "syncplay-${version}"; + version = "1.5.3"; + + format = "other"; + + src = fetchurl { + url = https://github.com/Syncplay/syncplay/archive/v1.5.3.tar.gz; + sha256 = "1yk0aajskhk6czpjshf9a9pzp3rafh5cgdcyyz8pwpk4ca9zyzfv"; + }; + + propagatedBuildInputs = with python2Packages; [ pyside twisted ]; + + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + postInstall = '' + mkdir -p $out/lib/python2.7/site-packages + mv $out/lib/syncplay/syncplay $out/lib/python2.7/site-packages/ + ''; + + meta = with stdenv.lib; { + homepage = http://syncplay.pl/; + description = "Free software that synchronises media players"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ enzime ]; + }; +} diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ae715aa4321c0afb6e543b21ce03c2053a4dd8e5 --- /dev/null +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: + +buildPythonApplication rec { + version = "0.9.2.7"; + name = "syncthing-gtk-${version}"; + + src = fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing-gtk"; + rev = "v${version}"; + sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + # For setup hook populating GI_TYPELIB_PATH + gobjectIntrospection + ]; + + buildInputs = [ + gtk3 librsvg + libnotify + # Schemas with proxy configuration + gnome3.gsettings-desktop-schemas + ]; + + propagatedBuildInputs = [ + dateutil pyinotify pygobject3 bcrypt + ]; + + patches = [ + ./disable-syncthing-binary-configuration.patch + (substituteAll { + src = ./paths.patch; + killall = "${psmisc}/bin/killall"; + syncthing = "${syncthing}/bin/syncthing"; + }) + ]; + + postPatch = '' + substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" + substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share" + substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share" + substituteInPlace syncthing_gtk/uisettingsdialog.py --replace "/usr/share" "$out/share" + substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share" + substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk" + ''; + + meta = with stdenv.lib; { + description = "GTK3 & python based GUI for Syncthing"; + maintainers = with maintainers; [ ]; + platforms = syncthing.meta.platforms; + homepage = https://github.com/syncthing/syncthing-gtk; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch new file mode 100644 index 0000000000000000000000000000000000000000..6c516e98acb1ee7d94fff36123b4226b44c07ec9 --- /dev/null +++ b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch @@ -0,0 +1,77 @@ +--- a/find-daemon.glade ++++ b/find-daemon.glade +@@ -112,6 +112,7 @@ + + True + True ++ False + 20 + + +@@ -126,6 +127,7 @@ + _Browse... + True + True ++ False + True + True + 0.51999998092651367 +--- a/syncthing_gtk/configuration.py ++++ b/syncthing_gtk/configuration.py +@@ -168,6 +168,8 @@ + yield k + + def get(self, key): ++ if key == "syncthing_binary": ++ return self.REQUIRED_KEYS[key][1] + return self.values[key] + + def set(self, key, value): +--- a/syncthing_gtk/finddaemondialog.py ++++ b/syncthing_gtk/finddaemondialog.py +@@ -163,7 +163,7 @@ + self["lblDownloadProgress"].set_markup(_("Download failed.")) + self["btDownload"].set_visible(True) + self["pbDownload"].set_visible(False) +- self["vsyncthing_binary"].set_sensitive(True) ++ self["vsyncthing_binary"].set_sensitive(False) + self["btBrowse"].set_sensitive(True) + self["btSave"].set_sensitive(True) + +@@ -179,7 +179,7 @@ + + def cb_extract_finished(self, downloader, *a): + """ Called after extraction is finished """ +- self["vsyncthing_binary"].set_sensitive(True) ++ self["vsyncthing_binary"].set_sensitive(False) + self["btBrowse"].set_sensitive(True) + self["vsyncthing_binary"].set_text(downloader.get_target()) + self["lblDownloadProgress"].set_markup("" + _("Download finished.") + "") +--- a/syncthing_gtk/wizard.py ++++ b/syncthing_gtk/wizard.py +@@ -60,7 +60,6 @@ + self.quit_button.connect("clicked", lambda *a : self.emit("cancel")) + # Pages + self.add_page(IntroPage(self)) +- self.add_page(FindDaemonPage()) + self.add_page(GenerateKeysPage()) + self.add_page(HttpSettingsPage()) + self.add_page(SaveSettingsPage()) +--- a/ui-settings.glade ++++ b/ui-settings.glade +@@ -943,6 +943,7 @@ + _Browse... + True + True ++ False + True + True + 0.51999998092651367 +@@ -974,6 +975,7 @@ + + True + True ++ False + True + + diff --git a/pkgs/applications/networking/syncthing-gtk/paths.patch b/pkgs/applications/networking/syncthing-gtk/paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..0ba5a4f2db84e168125d3f77e9c82e8366173be1 --- /dev/null +++ b/pkgs/applications/networking/syncthing-gtk/paths.patch @@ -0,0 +1,22 @@ +--- a/syncthing_gtk/configuration.py ++++ b/syncthing_gtk/configuration.py +@@ -30,7 +30,7 @@ + "autokill_daemon" : (int, 2), # 0 - never kill, 1 - always kill, 2 - ask + "daemon_priority" : (int, 0), # uses nice values + "max_cpus" : (int, 0), # 0 for all cpus +- "syncthing_binary" : (str, "/usr/bin/syncthing"), ++ "syncthing_binary" : (str, "@syncthing@"), + "syncthing_arguments" : (str, ""), + "minimize_on_start" : (bool, False), + "folder_as_path" : (bool, True), +--- a/syncthing_gtk/tools.py ++++ b/syncthing_gtk/tools.py +@@ -303,7 +303,7 @@ + return False + # signal 0 doesn't kill anything, but killall exits with 1 if + # named process is not found +- p = Popen(["killall", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) ++ p = Popen(["@killall@", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) + p.communicate() + return p.returncode == 0 + else: diff --git a/pkgs/applications/networking/syncthing/add-stcli-target.patch b/pkgs/applications/networking/syncthing/add-stcli-target.patch new file mode 100644 index 0000000000000000000000000000000000000000..58ac15253aed782fa04268f462527a2fea16efd1 --- /dev/null +++ b/pkgs/applications/networking/syncthing/add-stcli-target.patch @@ -0,0 +1,17 @@ +diff --git i/build.go w/build.go +index 7d400d6f..1b5e1d25 100644 +--- i/build.go ++++ w/build.go +@@ -175,6 +175,12 @@ var targets = map[string]target{ + {src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644}, + }, + }, ++ "stcli": { ++ name: "stcli", ++ description: "Syncthing CLI", ++ buildPkg: "github.com/syncthing/syncthing/cmd/stcli", ++ binaryName: "stcli", // .exe will be added automatically for Windows builds ++ }, + } + + func init() { diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index ecdecd07eeb9d2870bcbf0979493aa4f5b000fc3..531a1d5d0a1774ca4b9719f0d040af8ccbaadff1 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,57 +1,103 @@ -{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: +{ stdenv, lib, go, procps, removeReferencesTo, fetchFromGitHub }: -stdenv.mkDerivation rec { - version = "0.14.40"; - name = "syncthing-${version}"; +let + common = { stname, target, patches ? [], postInstall ? "" }: + stdenv.mkDerivation rec { + version = "0.14.46"; + name = "${stname}-${version}"; - src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing"; - rev = "v${version}"; - sha256 = "0fd4k09sb91d1bjqj2v1fh7raq98fdw45aaa58kramwhidsf9sy5"; - }; + src = fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing"; + rev = "v${version}"; + sha256 = "0lv8n5id40iy2gfccy8g45fjzlnbnvi7nlvj25pri22dq2bd5svm"; + }; + + inherit patches; + + buildInputs = [ go ]; + nativeBuildInputs = [ removeReferencesTo ]; + + buildPhase = '' + # Syncthing expects that it is checked out in $GOPATH, if that variable is + # set. Since this isn't true when we're fetching source, we can explicitly + # unset it and force Syncthing to set up a temporary one for us. + env GOPATH= BUILD_USER=nix BUILD_HOST=nix go run build.go -no-upgrade -version v${version} build ${target} + ''; + + installPhase = '' + install -Dm755 ${target} $out/bin/${target} + runHook postInstall + ''; + + inherit postInstall; - buildInputs = [ go removeReferencesTo ]; + preFixup = '' + find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+' + ''; - buildPhase = '' - mkdir -p src/github.com/syncthing - ln -s $(pwd) src/github.com/syncthing/syncthing - export GOPATH=$(pwd) + meta = with lib; { + homepage = https://www.syncthing.net/; + description = "Open Source Continuous File Synchronization"; + license = licenses.mpl20; + maintainers = with maintainers; [ pshendry joko peterhoeg andrew-d ]; + platforms = platforms.unix; + }; + }; - # Syncthing's build.go script expects this working directory - cd src/github.com/syncthing/syncthing +in { + syncthing = common { + stname = "syncthing"; + target = "syncthing"; - go run build.go -no-upgrade -version v${version} build - ''; + postInstall = '' + # This installs man pages in the correct directory according to the suffix + # on the filename + for mf in man/*.[1-9]; do + mantype="$(echo "$mf" | awk -F"." '{print $NF}')" + mandir="$out/share/man/man$mantype" + install -Dm644 "$mf" "$mandir/$(basename "$mf")" + done - installPhase = '' - mkdir -p $out/lib/systemd/{system,user} + '' + lib.optionalString (stdenv.isLinux) '' + mkdir -p $out/lib/systemd/{system,user} - install -Dm755 syncthing $out/bin/syncthing + substitute etc/linux-systemd/system/syncthing-resume.service \ + $out/lib/systemd/system/syncthing-resume.service \ + --replace /usr/bin/pkill ${procps}/bin/pkill - '' + lib.optionalString (stdenv.isLinux) '' - substitute etc/linux-systemd/system/syncthing-resume.service \ - $out/lib/systemd/system/syncthing-resume.service \ - --replace /usr/bin/pkill ${procps}/bin/pkill + substitute etc/linux-systemd/system/syncthing@.service \ + $out/lib/systemd/system/syncthing@.service \ + --replace /usr/bin/syncthing $out/bin/syncthing - substitute etc/linux-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/lib/systemd/user/syncthing.service \ + --replace /usr/bin/syncthing $out/bin/syncthing + ''; + }; + + syncthing-cli = common { + stname = "syncthing-cli"; + + patches = [ ./add-stcli-target.patch ]; + target = "stcli"; + }; + + syncthing-discovery = common { + stname = "syncthing-discovery"; + target = "stdiscosrv"; + }; - substitute etc/linux-systemd/user/syncthing.service \ - $out/lib/systemd/user/syncthing.service \ - --replace /usr/bin/syncthing $out/bin/syncthing - ''; + syncthing-relay = common { + stname = "syncthing-relay"; + target = "strelaysrv"; - preFixup = '' - find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+' - ''; + postInstall = lib.optionalString (stdenv.isLinux) '' + mkdir -p $out/lib/systemd/system - meta = with stdenv.lib; { - homepage = https://www.syncthing.net/; - description = "Open Source Continuous File Synchronization"; - license = licenses.mpl20; - maintainers = with maintainers; [ pshendry joko peterhoeg ]; - platforms = platforms.unix; + substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ + $out/lib/systemd/system/strelaysrv.service \ + --replace /usr/bin/strelaysrv $out/bin/strelaysrv + ''; }; } diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix deleted file mode 100644 index e5e554db67b8e583635510ef44721b829f3d2e8c..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/syncthing/inotify-deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/syncthing/syncthing"; - fetch = { - type = "git"; - url = "https://github.com/syncthing/syncthing"; - rev = "d0061c172caecd3baf61f3ff720f56fdb805186e"; - sha256 = "08cn0ym4arjppbnfn2b37crarwmiqbj4yjr7kinhdxx9gqm5wkj1"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - 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 deleted file mode 100644 index e33501a17158534ff164d07e43bce13f0d85ce5d..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "syncthing-inotify-${version}"; - version = "0.8.6"; - - goPackagePath = "github.com/syncthing/syncthing-inotify"; - - src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing-inotify"; - rev = "v${version}"; - sha256 = "0z1zpb7av4q5nj2d4yda9jcbjdz4yj3823c29y73yf0gfp26lppl"; - }; - - goDeps = ./inotify-deps.nix; - - postInstall = '' - mkdir -p $bin/lib/systemd/{system,user} - - substitute $src/etc/linux-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/lib/systemd/user/syncthing-inotify.service \ - --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/syncthing/syncthing-inotify; - description = "File watcher intended for use with Syncthing"; - license = licenses.mpl20; - maintainers = with maintainers; [ joko peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix deleted file mode 100644 index 4b5359555f4adf758d072b200297893a2bbf3646..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/syncthing012/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "syncthing-${version}"; - version = "0.12.15"; - rev = "v${version}"; - - goPackagePath = "github.com/syncthing/syncthing"; - - src = fetchFromGitHub { - inherit rev; - owner = "syncthing"; - repo = "syncthing"; - sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1"; - }; - - goDeps = ./deps.nix; - - postPatch = '' - # Mostly a cosmetic change - sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go - ''; - - preBuild = '' - export buildFlagsArray+=("-tags" "noupgrade release") - ''; -} diff --git a/pkgs/applications/networking/syncthing012/deps.nix b/pkgs/applications/networking/syncthing012/deps.nix deleted file mode 100644 index 44e18c2f606dcbce8e1b3829b6864fe643ae08e3..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/syncthing012/deps.nix +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; - sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; - sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; - }; - } - { - goPackagePath = "github.com/bkaradzic/go-lz4"; - fetch = { - type = "git"; - url = "https://github.com/bkaradzic/go-lz4"; - rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; - sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; - }; - } - { - goPackagePath = "github.com/calmh/luhn"; - fetch = { - type = "git"; - url = "https://github.com/calmh/luhn"; - rev = "0c8388ff95fa92d4094011e5a04fc99dea3d1632"; - sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; - sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; - }; - } - { - goPackagePath = "github.com/vitrun/qart"; - fetch = { - type = "git"; - url = "https://github.com/vitrun/qart"; - rev = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0"; - sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8"; - }; - } - { - goPackagePath = "github.com/calmh/du"; - fetch = { - type = "git"; - url = "https://github.com/calmh/du"; - rev = "3c0690cca16228b97741327b1b6781397afbdb24"; - sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"; - }; - } - { - goPackagePath = "github.com/calmh/xdr"; - fetch = { - type = "git"; - url = "https://github.com/calmh/xdr"; - rev = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e"; - sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"; - }; - } - { - goPackagePath = "github.com/juju/ratelimit"; - fetch = { - type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "772f5c38e468398c4511514f4f6aa9a4185bc0a0"; - sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"; - }; - } - { - goPackagePath = "github.com/thejerf/suture"; - fetch = { - type = "git"; - url = "https://github.com/thejerf/suture"; - rev = "99c1f2d613756768fc4299acd9dc621e11ed3fd7"; - sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; - sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0"; - sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"; - }; - } -] diff --git a/pkgs/applications/networking/syncthing013/default.nix b/pkgs/applications/networking/syncthing013/default.nix deleted file mode 100644 index b6d318011aa18179e9e19d0fb38a6b1069fe05f2..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/syncthing013/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchgit, go }: - -stdenv.mkDerivation rec { - version = "0.13.10"; - name = "syncthing-${version}"; - - src = fetchgit { - url = https://github.com/syncthing/syncthing; - rev = "refs/tags/v${version}"; - sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7"; - }; - - buildInputs = [ go ]; - - buildPhase = '' - mkdir -p src/github.com/syncthing - ln -s $(pwd) src/github.com/syncthing/syncthing - export GOPATH=$(pwd) - - # Syncthing's build.go script expects this working directory - cd src/github.com/syncthing/syncthing - - go run build.go -no-upgrade -version v${version} install all - ''; - - installPhase = '' - mkdir -p $out/bin - cp bin/* $out/bin - ''; - - meta = { - homepage = https://www.syncthing.net/; - description = "Open Source Continuous File Synchronization"; - license = stdenv.lib.licenses.mpl20; - maintainers = with stdenv.lib.maintainers; [pshendry]; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; - }; -} diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix index 79bc32dfa40d00462cae1237851834f2decc1f69..8a056e21692be0c8b8d531d599e88100ce6b0d81 100644 --- a/pkgs/applications/networking/tcpkali/default.nix +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -1,6 +1,6 @@ {stdenv, autoreconfHook, fetchFromGitHub, bison}: -let version = "0.9"; in +let version = "1.1.1"; in stdenv.mkDerivation rec { name = "tcpkali-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "machinezone"; repo = "tcpkali"; rev = "v${version}"; - sha256 = "03cbmnc60wkd7f4bapn5cbm3c4zas2l0znsbpci2mn8ms8agif82"; + sha256 = "09ky3cccaphcqc6nhfs00pps99lasmzc2pf5vk0gi8hlqbbhilxf"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bison]; diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index dc7c961856d635ecb13f68060e688007eb62c2bc..5a548d5ff65f064d7796f315d92df0b18f31b919 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,35 +1,42 @@ -{ stdenv, fetchFromGitHub, pkgs }: +{ stdenv, fetchFromGitHub, makeWrapper, lib +, dnsutils, coreutils, openssl, nettools, utillinux, procps }: -stdenv.mkDerivation rec { - version = "2.9.5-1"; +let + version = "2.9.5-5"; + +in stdenv.mkDerivation rec { name = "testssl.sh-${version}"; src = fetchFromGitHub { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "0hz6g685jwl0c0jrdca746425xpwiwc8lnlc2gigga5hkcq8qzl9"; + sha256 = "0zgj9vhd8fv3a1cn8dxqmjd8qmgryc867gq7zbvbr41lkqc06a1r"; }; - nativeBuildInputs = with pkgs; [ - makeWrapper + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + coreutils # for pwd and printf + dnsutils # for dig + nettools # for hostname + openssl # for openssl + procps # for ps + utillinux # for hexdump ]; - patches = [ ./testssl.patch ]; - - pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; - opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; postPatch = '' - sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ - -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ - -e "s|OPENSSL:-\"\"|OPENSSL:-\"${opensslBinPath}\"|g" \ - testssl.sh + substituteInPlace testssl.sh \ + --replace /bin/pwd pwd \ + --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" ''; installPhase = '' - mkdir -p $out/bin $out/etc - cp -r etc/ $out/ - cp testssl.sh $out/bin/testssl.sh + install -Dt $out/bin testssl.sh + + wrapProgram $out/bin/testssl.sh \ + --prefix PATH ':' ${lib.makeBinPath buildInputs} + + cp -r etc $out ''; meta = with stdenv.lib; { @@ -40,6 +47,6 @@ stdenv.mkDerivation rec { ''; homepage = https://testssl.sh/; license = licenses.gpl2; - maintainers = [ maintainers.etu ]; + maintainers = with maintainers; [ etu ]; }; } diff --git a/pkgs/applications/networking/testssl/testssl.patch b/pkgs/applications/networking/testssl/testssl.patch deleted file mode 100644 index d5269c737084585ca42df48888ebf6d7b619efa2..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/testssl/testssl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- testssl/testssl.sh 2017-09-24 16:53:29.395263437 +0200 -+++ testssl-new/testssl.sh 2017-09-24 16:53:41.221154492 +0200 -@@ -165,6 +165,7 @@ - # following variables make use of $ENV, e.g. OPENSSL= ./testssl.sh - # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help - declare -x OPENSSL OPENSSL_TIMEOUT -+OPENSSL=${OPENSSL:-""} - FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production - COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all - COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index c3424e2fc779eaa689ab482c4c968a45efe140da..e38ba36b9253c7d27e368e5eee3781fdedeb400d 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "vnstat-${version}"; - version = "1.17"; + version = "1.18"; src = fetchurl { - sha256 = "0wbrmb4zapblb3b61180ryqy6i0c7gcacqz0y3r1x7nafqswbr0q"; + sha256 = "1mc7qqvrnl0zyhgh8n7wx1g1cbwq74xpvbz8rfjmyi77p693a6fp"; url = "http://humdi.net/vnstat/${name}.tar.gz"; }; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ''; homepage = http://humdi.net/vnstat/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 88d1ae7fae139fdc8dc82566e02aee1a32415de3..b1e2258271bf0f2a623c9a5eb4a2cf1fda006cc8 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "http://znc.in/releases/archive/${name}.tar.gz"; - sha256 = "1jia6kq6bp8yxfj02d5vj9vqb4pylqcldspyjj6iz82kkka2a0ig"; + sha256 = "09cmsnxvi7jg9a0dicf60fxnxdff4aprw7h8vjqlj5ywf6y43f3z"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 2923a30b2ef0717aee6b9b3b8c6c4b33e2f25f00..4b68285c3f1a5735c7bb6e8a998e458b0e739bd2 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -15,6 +15,26 @@ let in rec { + backlog = zncDerivation rec { + name = "znc-backlog-${version}"; + version = "git-2017-06-13"; + module_name = "backlog"; + + src = fetchFromGitHub { + owner = "FruitieX"; + repo = "znc-backlog"; + rev = "42e8f439808882d2dae60f2a161eabead14e4b0d"; + sha256 = "1k7ifpqqzzf2j7w795q4mx1nvmics2higzjqr3mid3lp43sqg5s6"; + }; + + meta = with stdenv.lib; { + description = "Request backlog for IRC channels."; + homepage = https://github.com/fruitiex/znc-backlog/; + license = licenses.asl20; + maintainers = with maintainers; [ infinisil ]; + }; + }; + clientbuffer = zncDerivation rec { name = "znc-clientbuffer-${version}"; version = "git-2015-08-27"; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 1563cdf3d056f83babf0fec6a4d8ff7451b888d0..8dd127715aebf0a557069be3df7ca0587be71c4e 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi +{ stdenv, fetchurl, pkgconfig, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, makeWrapper, iconTheme +, boost, libxslt, goffice, wrapGAppsHook, iconTheme }: stdenv.mkDerivation rec { @@ -8,29 +8,30 @@ stdenv.mkDerivation rec { version = "3.0.2"; src = fetchurl { - url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz"; + url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz"; sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg"; }; enableParallelBuilding = true; patches = [ - ./patches/fix-13791.patch + # https://bugzilla.abisource.com/show_bug.cgi?id=13791 + (fetchurl { + url = https://bugzilla.abisource.com/attachment.cgi?id=5860; + sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al"; + }) ]; - buildInputs = - [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme - ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - postFixup = '' - wrapProgram "$out/bin/abiword" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + buildInputs = [ + gtk3 librsvg bzip2 fribidi libpng popt + libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme + ]; meta = with stdenv.lib; { description = "Word processing program, similar to Microsoft Word"; - homepage = http://www.abisource.com/; + homepage = https://www.abisource.com/; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ylwghst ]; diff --git a/pkgs/applications/office/abiword/patches/fix-13791.patch b/pkgs/applications/office/abiword/patches/fix-13791.patch deleted file mode 100644 index 98004f01bcbaf8918b6ede44f5676f3b45670a3f..0000000000000000000000000000000000000000 --- a/pkgs/applications/office/abiword/patches/fix-13791.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 46388f407c893123d9b3824a7570b050fc3b049b Mon Sep 17 00:00:00 2001 -From: James Cameron -Date: Thu, 17 Aug 2017 15:05:39 +1000 -Subject: [PATCH] Fix flickering -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- in GR_Caret::s_blink_timeout, avoid repeated calls by stopping the - timer, it will be restarted when needed, - -- in GR_Caret::s_enable, avoid extra unnecessary _blink calls when blink - is enabled, as they serve no purpose, - -- in XAP_UnixFrameImpl::_fe::expose, use the Cairo clip rectangle - instead of the expose event area, thanks to Hubert Figuière in - 865c1dda7e13deff04573ffc42028b71fee07f9c, - -- in XAP_UnixFrameImpl::_fe::expose, do not return FALSE, as other - handlers will need to handle the draw event, - -- in GR_UnixCairoGraphics::flush, fix excessive draw events; - gtk_widget_queue_draw only marks the widget as needing redrawing, - which causes a draw event for each call to flush, therefore every - caret blink, so use gdk_flush instead, - -Fixes AbiSource #13791. -Fixes Debian #851052. -Fixes Fedora #1287835. -Fixes Ubuntu LP: #1574278. -Fixes Sugar Labs #4915. - -Signed-off-by: James Cameron ---- - src/af/gr/gtk/gr_UnixCairoGraphics.cpp | 4 +--- - src/af/gr/xp/gr_Caret.cpp | 13 ++++--------- - src/af/xap/gtk/xap_UnixFrameImpl.cpp | 27 ++++++++++++++++++--------- - src/af/xap/gtk/xap_UnixFrameImpl.h | 2 +- - 4 files changed, 24 insertions(+), 22 deletions(-) - -diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -index 509bd37..7c3c06f 100644 ---- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -+++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint() - - void GR_UnixCairoGraphics::flush(void) - { -- if (m_Widget) { -- gtk_widget_queue_draw(m_Widget); -- } -+ gdk_flush(); - } - - bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const -diff --git a/src/af/gr/xp/gr_Caret.cpp b/src/af/gr/xp/gr_Caret.cpp -index 5d5d116..a8aa451 100644 ---- a/src/af/gr/xp/gr_Caret.cpp -+++ b/src/af/gr/xp/gr_Caret.cpp -@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w) - { - GR_Caret * c = static_cast(_w->getInstanceData()); - -+ c->m_enabler->stop(); - c->m_worker->stop(); -- c->_blink(true); -- if (!c->m_bCursorIsOn) -- c->_blink(true); // blink again -- else -- { -- c->_blink(true); // ?? - MARCM -- c->_blink(true); -- } - c->m_worker->start(); -- c->m_enabler->stop(); -+ c->_blink(true); - } - - void GR_Caret::s_blink_timeout(UT_Worker * _w) - { - GR_Caret * c = static_cast(_w->getInstanceData()); -+ -+ c->m_blinkTimeout->stop(); - if (c->isEnabled()) - c->disable(); - } -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -index 780000e..e81961a 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g - } - - #if GTK_CHECK_VERSION(3,0,0) --gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) -+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) - #else - gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - #endif - { - XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); - FV_View * pView = static_cast(pUnixFrameImpl->getFrame()->getCurrentView()); -+ double x, y, width, height; - #if GTK_CHECK_VERSION(3,0,0) -- GdkEventExpose *pExposeEvent = reinterpret_cast(gtk_get_current_event()); -+ cairo_clip_extents (cr, &x, &y, &width, &height); -+ width -= x; -+ height -= y; -+#else -+ x = pExposeEvent->area.x; -+ y = pExposeEvent->area.y; -+ width = pExposeEvent->area.width; -+ height = pExposeEvent->area.height; - #endif - /* Jean: commenting out next lines since the zoom update code does draw only - * part of what needs to be updated. */ -@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - UT_Rect rClip; - if (pGr->getPaintCount () > 0) - return TRUE; -- xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height)); -- rClip.left = pGr->tlu(pExposeEvent->area.x); -- rClip.top = pGr->tlu(pExposeEvent->area.y); -- rClip.width = pGr->tlu(pExposeEvent->area.width)+1; -- rClip.height = pGr->tlu(pExposeEvent->area.height)+1; --#if GTK_CHECK_VERSION(3,0,0) -+ rClip.left = pGr->tlu(x); -+ rClip.top = pGr->tlu(y); -+ #if GTK_CHECK_VERSION(3,0,0) -+ rClip.width = pGr->tlu(width); -+ rClip.height = pGr->tlu(height); - static_cast(pGr)->setCairo(cr); - pView->draw(&rClip); - static_cast(pGr)->setCairo(NULL); - #else -+ rClip.width = pGr->tlu(width)+1; -+ rClip.height = pGr->tlu(height)+1; - pView->draw(&rClip); - #endif - } -- return FALSE; -+ return TRUE; - } - - static bool bScrollWait = false; -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h -index 30ee5d8..26fbb2e 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.h -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h -@@ -152,7 +152,7 @@ protected: - static gint key_release_event(GtkWidget* w, GdkEventKey* e); - static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); - #if GTK_CHECK_VERSION(3,0,0) -- static gint draw(GtkWidget * w, cairo_t * cr); -+ static gboolean draw(GtkWidget * w, cairo_t * cr); - #else - static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); - #endif --- -2.11.0 - diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 9cee31b01eb71e4a3f5666f7f507c2e5238bf8c8..cfd7a4eda2022eeefd7f8ee47cbecfdc9c75c520 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-10-31"; + name = "bean-add-2018-01-08"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "9ac64272a17e76f8292bd94deb5aee45c14130d2"; - sha256 = "1vcwbbi2jsf87yq8f2hyf7nz9br1973sb20qjnsx5fxlmcpn47jh"; + rev = "660c657f295b019d8dbc26375924eb17bf654341"; + sha256 = "0vzff2hdng8ybwd5frflhxpak0yqg0985p1dy7vpvhr8kbqqzwdz"; }; propagatedBuildInputs = with python3Packages; [ python ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # The (only) source file states: # License: "Do what you feel is right, but don't be a jerk" public license. - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix deleted file mode 100644 index efc61dba7a49f9227a89873d4cf4e20cd511cca6..0000000000000000000000000000000000000000 --- a/pkgs/applications/office/beancount/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchhg, pkgs, pythonPackages }: - -pythonPackages.buildPythonApplication rec { - version = "2.0rc1"; - name = "beancount-${version}"; - namePrefix = ""; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/beancount/${name}.tar.gz"; - sha256 = "12vlkck4q3dax9866krp6963c6d845b7inkkwrlkk4njh84n71wf"; - }; - - buildInputs = with pythonPackages; [ nose ]; - - # Automatic tests cannot be run because it needs to import some local modules for tests. - doCheck = false; - checkPhase = '' - nosetests - ''; - - propagatedBuildInputs = with pythonPackages; [ - beautifulsoup4 - bottle - chardet - dateutil - google_api_python_client - lxml - ply - python_magic - ]; - - meta = { - homepage = http://furius.ca/beancount/; - description = "Double-entry bookkeeping computer language"; - longDescription = '' - A double-entry bookkeeping computer language that lets you define - financial transaction records in a text file, read them in memory, - generate a variety of reports from them, and provides a web interface. - ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; - }; -} - diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix deleted file mode 100644 index 959a44a35c102ea15c5f62acb96bb47cce01bf6c..0000000000000000000000000000000000000000 --- a/pkgs/applications/office/calligra/2.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen -, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg -, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql -, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs -, kactivities, okular, git, oxygen-icons5, makeWrapper -# TODO: not found -#, xbase, openjpeg -# TODO: package libWPS, Spnav, m2mml, LibEtonyek -}: - -stdenv.mkDerivation rec { - name = "calligra-2.9.11"; - - src = fetchurl { - url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di"; - }; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ]; - - buildInputs = [ - kdelibs4 lcms2 libpng eigen - exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg - libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql - freetds fftw glew libkdcraw opencolorio kdepimlibs - kactivities okular git - ]; - - enableParallelBuilding = true; - - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i \ - --prefix PATH ':' "${pstoedit.out}/bin" \ - --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share" - done - ''; - - meta = with stdenv.lib; { - description = "A suite of productivity applications"; - longDescription = '' - Calligra Suite is a set of applications written to help - you to accomplish your work. Calligra includes efficient - and capable office components: Words for text processing, - Sheets for computations, Stage for presentations, Plan for - planning, Flow for flowcharts, Kexi for database creation, - Krita for painting and raster drawing, and Karbon for - vector graphics. - ''; - homepage = http://calligra.org; - maintainers = with maintainers; [ phreedom ebzzry ]; - inherit (kdelibs4.meta) platforms; - license = licenses.gpl2; - broken = true; - }; -} diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index bec19d675cb0adfb2caaa018aec2b96e19d06257..8449cdf05def4e4855012f706778c2419a925a59 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,6 +1,6 @@ { - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, - boost, qtwebkit, qtx11extras, shared_mime_info, + mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper, + boost, qtwebkit, qtx11extras, shared-mime-info, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross, @@ -23,10 +23,20 @@ mkDerivation rec { sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5"; }; + enableParallelBuilding = true; + + patches = [ + (fetchpatch { + name = "calligra-build-with-newer-kcalcore.patch"; + url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff"; + sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ - boost qtwebkit qtx11extras shared_mime_info + boost qtwebkit qtx11extras shared-mime-info kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 1004733a18b5235841cdfe7a122c0479677b8480..813608a386a4ce2eeb384e03ee7e98627ae97600 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "cb2bib"; - version = "1.9.2"; + version = "1.9.7"; src = fetchurl { url = "http://www.molspaces.com/dl/progs/${name}.tar.gz"; - sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin"; + sha256 = "0gr8vmlz1ikw0jiwwac2ays20z26cdv3bjdx9m1nc450hl6m5s7s"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index fdbf9183d7518918fc55b2ed7eb47f9003346d7b..9c8f39d52f1d33b045dbe37242a322f309dac3f7 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,12 +5,12 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.6"; + version = "1.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0iif4imx76ra0lsisksrq5vf54wbivnrb3xqz6mkx9lik3pp5sbx"; + sha256 = "c4eba4203bddaa7bc9d54971d2afeeebab0bc80ce89be1375a41a07c4e82b62f"; }; doCheck = false; @@ -23,7 +23,7 @@ buildPythonApplication rec { homepage = https://beancount.github.io/fava; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 3421abc557fc530eaf5267b051c5dc5dc482b7fd..c768f4c7fa34a78beba66506a657852fb94e159b 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -1,6 +1,7 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile -, intltool, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice -, webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file +{ fetchurl, fetchpatch, stdenv, intltool, pkgconfig, file, makeWrapper +, libxml2, libxslt, perl, perlPackages, gconf, guile +, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice +, webkit, glibcLocales, gsettings-desktop-schemas, dconf , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers , pango, gdk_pixbuf }: @@ -13,21 +14,31 @@ Two cave-ats right now: */ stdenv.mkDerivation rec { - name = "gnucash-2.6.12"; + name = "gnucash-2.6.18-1"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "0x84f07p30pwhriamv8ifljgw755cj87rc12jy1xddf47spyj7rp"; + sha256 = "1794qi7lkn1kbnhzk08wawacfcphbln3ngdl3q0qax5drv7hnwv8"; }; + patches = [ + (fetchpatch { + sha256 = "11nlf9j7jm1i37mfcmmnkplxr3nlf257fxd01095vd65i2rn1m8h"; + name = "fix-brittle-test.patch"; + url = "https://github.com/Gnucash/gnucash/commit/42ac55e03a1a84739f4a5b7a247c31d91c0adc4a.patch"; + }) + ]; + + nativeBuildInputs = [ intltool pkgconfig file makeWrapper ]; + buildInputs = [ # general - intltool pkgconfig libxml2 libxslt glibcLocales file gettext swig enchant + libxml2 libxslt glibcLocales gettext swig enchant bzip2 isocodes # glib, gtk... glib gtk2 goffice webkit # gnome... - dconf gconf libgnomecanvas gsettings_desktop_schemas + dconf gconf libgnomecanvas gsettings-desktop-schemas # financial libofx aqbanking gwenhywfar # perl @@ -36,12 +47,10 @@ stdenv.mkDerivation rec { guile slibGuile # database backends libdbi libdbiDrivers - # build - makeWrapper ]; - patchPhase = '' - patchShebangs ./src + postPatch = '' + patchShebangs ./src ''; configureFlags = [ diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index f6c4728eb531b6ba9dfd8fa3abc1f995787fe17c..d17cd2a7ab75e9842e9e6f775484b50c51b4d3c6 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar ]; + propagatedUserEnvPkgs = [ gconf ]; configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index c6458e477186bcd7f9cb3a200f4d342a7c4120d4..badc02a36463144a712249956b8e1077865dceb5 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -9,11 +9,11 @@ let isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; }; isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; }; in stdenv.mkDerivation rec { - name = "gnumeric-1.12.35"; + name = "gnumeric-1.12.39"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "77b1e3ce523578a807767ad71680fb865ac021d7bfadf93eada99ae094c06c0a"; + sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f"; }; configureFlags = "--disable-component"; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 29c30204ddbec31e2ba36b641832ffa8a59304dc..62dcf5dd8a880d6f2d3e2cbed90e53369b721972 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook -, hicolor_icon_theme, libsoup, gnome3 }: +, hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { name = "grisbi-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup + buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 1d90e8be282ae545b24b6a319ab1c37b6bd7d101..28b85936a281d838204bc05ff631faf0d882ee46 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,15 +1,15 @@ { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook -, hicolor_icon_theme, libsoup, gnome3 }: +, hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.1.6"; + name = "homebank-5.1.8"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1q4h890g6a6pm6kfiavbq9sbpsnap0f854sja2y5q3x0j0ay2q98"; + sha256 = "0fzjmwz2pgi0nw49xljp1za3vp67kjh88gf688d9ig4wc2ygr0qh"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup + buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix index b8844391c7d9a7d2add937b9b57508a098fc357b..59ecb5a5c3b762c2d828d056d644fd6dee29fe3b 100644 --- a/pkgs/applications/office/ib/tws/default.nix +++ b/pkgs/applications/office/ib/tws/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { Download the TWS from https://download2.interactivebrokers.com/download/unixmacosx_latest.jar, rename the file to ${name}, and add it to the nix store with - "nix-prefetch-url file://${name}". + "nix-prefetch-url file://\$PWD/${name}". ''; sha256 = "1a2jiwwnr5g3xfba1a89c257bdbnq4zglri8hz021vk7f6s4rlrf"; }; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 59249d1a6eb0ca408c854d1b062f9e554a42ceed..92feb6618c9e9c103c08c4f65c538f9601d2c5dc 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, python2, makeWrapper, lib -, mesa, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }: +, libGLU_combined, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }: let - version = "0.11.1"; + version = "0.12.0"; pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]); in stdenv.mkDerivation { # This project was formerly known as KeyJNote. @@ -12,7 +12,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "0b3rmy6acp2vmf5nill3aknxvr9a5aawk1vnphkah61anxp62gsr"; + sha256 = "0zaqq3yvd296mfr5bxpj2hqlk7vrb0rsbgd4dc1l5ag46giqvivx"; }; buildInputs = [ makeWrapper pythonEnv ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index e7b82183454600243548e3c081ba9743236278d3..5dfd03570121fb9013c7e79ab00addbbbc0f29d5 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings_desktop_schemas }: +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.8.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { exec = "jabref"; }; - buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ]; unpackPhase = "#"; diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 66aee6bd96280af5dd98422f96490813b52577c4..8463703c01791b518907e5683ea2f864c5901cd4 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -4,7 +4,7 @@ breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, kwidgetsaddons, kxmlgui, - kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql + kdb, kproperty, kreport, lcms2, mysql, marble, postgresql }: mkDerivation rec { @@ -24,7 +24,7 @@ mkDerivation rec { breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets kwidgetsaddons kxmlgui - kdb kproperty kreport lcms2 libmysql marble postgresql + kdb kproperty kreport lcms2 mysql.connector-c marble postgresql ]; propagatedUserEnvPkgs = [ kproperty ]; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 2d66fe4b309ec832454c4df64a57e0af6e1603cc..bb6e529f5d29970463bf95fc825093fe08ccda3f 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://ledger-cli.org/; + homepage = https://ledger-cli.org/; description = "A double-entry accounting system with a command-line reporting interface"; license = licenses.bsd3; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index cc3329bdcc9ded01b58eb9f427f98c962dd07509..f8742253c519045eac0aa8f2b93c40e867b82bae 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -1,17 +1,17 @@ { fetchurl }: rec { - major = "5"; - minor = "4"; - patch = "1"; - tweak = "2"; + major = "6"; + minor = "0"; + patch = "2"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0c17193vcf4nj8l5k9q87byv27px74kzp0hvgr1dfz5700cv086k"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "0qga01lhh09jf2gx3czk66i5c854gzzjxgkrmj5d7m4ci2zaxfsd"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 830ae68fd1b98042b732d59631ddece4ebd18b28..89af45814bffb1b93f4ef27ff6f0a34c2573eaa4 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip +{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis -, openssl, gperf, cppunit, GConf, ORBit2, poppler -, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw +, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven +, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 -, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas +, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme -, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] +, langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ] , withHelp ? true , kdeIntegration ? false }: @@ -29,27 +29,27 @@ let langsSpaces = lib.concatStringsSep " " langs; fetchSrc = {name, sha256}: fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; inherit sha256; }; srcs = { third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { - url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; + url = "https://dev-www.libreoffice.org/extern/${md5}-${name}"; sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs.nix)); translations = fetchSrc { name = "translations"; - sha256 = "1ir1f5jgjhpnxsw6izsryp4wg52ifzmcqyc0gdp9zh03rjf5i4cg"; + sha256 = "1fx9xkf1ppap77b8zdr8qawbikgp607z5w9b7jk3rilcqs7xbkwl"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1apgc57a8q6lsjfq2f7pzdn7wanqm8zkkrkbq2nd4hidp6avgm6f"; + sha256 = "0zphmhl4a8pd5l7ma4bzhrwgbv037j8p5m1ilvb1blgbqv53v38a"; }; }; @@ -106,6 +106,11 @@ in stdenv.mkDerivation rec { # BLFS patch for Glibc 2.23 renaming isnan sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx + + # This is required as some cppunittests require fontconfig configured + cp "${fontsConf}" fonts.conf + sed -e '/include/i${carlito}/etc/fonts/conf.d' -i fonts.conf + export FONTCONFIG_FILE="$PWD/fonts.conf" ''; # fetch_Download_item tries to interpret the name as a variable name @@ -115,11 +120,13 @@ in stdenv.mkDerivation rec { sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile # unit test sd_tiledrendering seems to be fragile - # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # this I actually hate, this should be a data consistency test! + sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # rendering-dependent test sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME @@ -138,6 +145,8 @@ in stdenv.mkDerivation rec { sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx + sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx + sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; @@ -147,9 +156,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildPhase = '' - # This is required as some cppunittests require fontconfig configured - export FONTCONFIG_FILE=${fontsConf} - # This to avoid using /lib:/usr/lib at linking sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk @@ -166,10 +172,6 @@ in stdenv.mkDerivation rec { 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 : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - ; done ln -s $out/bin/soffice $out/bin/libreoffice @@ -233,8 +235,10 @@ in stdenv.mkDerivation rec { "--without-system-liblangtag" "--without-system-libmspub" "--without-system-libpagemaker" - "--without-system-libgltf" "--without-system-libstaroffice" + "--without-system-libepubgen" + "--without-system-libqxp" + "--without-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" ]; @@ -246,32 +250,33 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base gsettings_desktop_schemas glib + libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer + gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool - libxshmfence libatomic_ops graphite2 harfbuzz gpgme + libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper + libodfgen CoinMP librdf_rasqal defaultIconTheme gettext gdb ] ++ lib.optional kdeIntegration kdelibs4; + nativeBuildInputs = [ wrapGAppsHook ]; passthru = { - inherit srcs; + inherit srcs jdk; }; requiredSystemFeatures = [ "big-parallel" ]; meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; - homepage = http://libreoffice.org/; + homepage = https://libreoffice.org/; license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py index dcda0ff782dc79949c8480c52f616cd3afb3493e..636f36cb383b3c195e01f42d93d26a72456e92d7 100755 --- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py +++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py @@ -256,7 +256,7 @@ def interpret(x): Output: One of 1. Dict with keys 'name' and 'attrs' 2. 'unrecognized' (if interpretation failed) """ - for f in [interpret_md5, interpret_sha256, interpret_tarball_with_md5, interpret_tarball]: + for f in [interpret_md5, interpret_sha256, interpret_tarball_with_md5, interpret_tarball, interpret_jar]: result = f(x) if result is not None: return result @@ -296,6 +296,13 @@ def interpret_tarball(x): return {'name': match.group(1), 'attrs': {'tarball': x['value'], 'brief': True}} +def interpret_jar(x): + match = re.match('^(.*)_JAR$', x['key']) + + if match: + return {'name': match.group(1), + 'attrs': {'tarball': x['value'], 'brief': True}} + def interpret_tarball_with_md5(x): """ diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index 478c6c4d906210c355581e66a0867fbac1d98d13..e82fa241c00c9a4251143aa7af4937bdc3419057 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -3,43 +3,43 @@ name = "libabw-0.1.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; - md5 = "7a3815b506d064313ba309617b6f5a0b"; - md5name = "7a3815b506d064313ba309617b6f5a0b-libabw-0.1.1.tar.bz2"; + md5 = ""; + md5name = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199-libabw-0.1.1.tar.bz2"; } { name = "commons-logging-1.2-src.tar.gz"; url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; - md5 = "ce977548f1cbf46918e93cd38ac35163"; - md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz"; + md5 = ""; + md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; - md5 = "98492e965963f852ab29f9e61b2ad700"; - md5name = "98492e965963f852ab29f9e61b2ad700-apr-1.5.2.tar.gz"; + md5 = ""; + md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; - md5 = "866825c04da827c6e5f53daff5569f42"; - md5name = "866825c04da827c6e5f53daff5569f42-apr-util-1.5.4.tar.gz"; + md5 = ""; + md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_60_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2"; - sha256 = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b"; - md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe"; - md5name = "65a840e1a0b13a558ff19eeb2c4f0cbe-boost_1_60_0.tar.bz2"; + name = "boost_1_63_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2"; + sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"; + md5 = ""; + md5name = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0-boost_1_63_0.tar.bz2"; } { name = "breakpad.zip"; url = "http://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; - md5 = "415ce291aa6f2ee1d5db7b62bf62ade8"; - md5name = "415ce291aa6f2ee1d5db7b62bf62ade8-breakpad.zip"; + md5 = ""; + md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.14.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz"; - sha256 = "613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252"; - md5 = "23a0b2f0235431d35238df1d3a517fdb"; - md5name = "23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz"; + name = "cairo-1.14.8.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz"; + sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20"; + md5 = ""; + md5name = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20-cairo-1.14.8.tar.xz"; } { name = "libcdr-0.1.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2"; sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d"; - md5 = "e369f30b5b861ee0fc4f9e6cbad701fe"; - md5name = "e369f30b5b861ee0fc4f9e6cbad701fe-libcdr-0.1.3.tar.bz2"; + md5 = ""; + md5name = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d-libcdr-0.1.3.tar.bz2"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -80,15 +80,15 @@ name = "libcmis-0.5.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; - md5 = "3270154f0f40d86fce849b161f914101"; - md5name = "3270154f0f40d86fce849b161f914101-libcmis-0.5.1.tar.gz"; + md5 = ""; + md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz"; } { name = "CoinMP-1.7.6.tgz"; url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; - md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; - md5name = "1cce53bf4b40ae29790d2c5c9f8b1129-CoinMP-1.7.6.tgz"; + md5 = ""; + md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { name = "collada2gltf-master-cb1d97788a.tar.bz2"; @@ -98,11 +98,11 @@ md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; } { - name = "cppunit-1.13.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz"; - sha256 = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f"; - md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; - md5name = "d1c6bdd5a76c66d2c38331e2d287bc01-cppunit-1.13.2.tar.gz"; + name = "cppunit-1.14.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; + sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; + md5 = ""; + md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; @@ -115,15 +115,22 @@ 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"; + md5 = ""; + md5name = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae-curl-7.52.1.tar.gz"; } { name = "libe-book-0.1.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; - md5 = "6b48eda57914e6343efebc9381027b78"; - md5name = "6b48eda57914e6343efebc9381027b78-libe-book-0.1.2.tar.bz2"; + md5 = ""; + md5name = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850-libe-book-0.1.2.tar.bz2"; + } + { + name = "libepoxy-1.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2"; + sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64"; + md5 = ""; + md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2"; } { name = "epm-3.7.tar.gz"; @@ -136,29 +143,29 @@ name = "libetonyek-0.1.6.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; - md5 = "77ff46936dcc83670557274e7dd2aa33"; - md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2"; + md5 = ""; + md5name = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78-libetonyek-0.1.6.tar.bz2"; } { name = "expat-2.2.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2"; sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f"; - md5 = "f053af63ef5f39bd9b78d01fbc203334"; - md5name = "f053af63ef5f39bd9b78d01fbc203334-expat-2.2.3.tar.bz2"; + md5 = ""; + md5name = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f-expat-2.2.3.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; - md5 = "821260b61dafc22899d1464d4e91ee6a"; - md5name = "821260b61dafc22899d1464d4e91ee6a-Firebird-3.0.0.32483-0.tar.bz2"; + md5 = ""; + md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.8.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; - sha256 = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"; - md5 = "77e15a92006ddc2adbb06f840d591c0e"; - md5name = "77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + name = "fontconfig-2.12.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2"; + sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3"; + md5 = ""; + md5name = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3-fontconfig-2.12.1.tar.bz2"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -241,29 +248,22 @@ name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; - md5 = "919389b307ee8696288ea3b8210ab974"; - md5name = "919389b307ee8696288ea3b8210ab974-EmojiOneColor-SVGinOT-1.3.tar.gz"; + md5 = ""; + md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; } { name = "libfreehand-0.1.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; - md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; - md5name = "8cf70c5dc4d24d2dc4a107f509d2d6d7-libfreehand-0.1.1.tar.bz2"; - } - { - name = "freetype-2.4.8.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; - sha256 = "a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71"; - md5 = "dbf2caca1d3afd410a29217a9809d397"; - md5name = "dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; + md5 = ""; + md5name = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877-libfreehand-0.1.1.tar.bz2"; } { - name = "glew-1.12.0.zip"; - url = "http://dev-www.libreoffice.org/src/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; - sha256 = "6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4"; - md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; - md5name = "3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + name = "freetype-2.7.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2"; + sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88"; + md5 = ""; + md5name = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88-freetype-2.7.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -272,19 +272,26 @@ md5 = "bae83fa5dc7f081768daace6e199adc3"; md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; } + { + name = "gpgme-1.8.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2"; + sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33"; + md5 = ""; + md5name = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33-gpgme-1.8.0.tar.bz2"; + } { name = "graphite2-minimal-1.3.10.tgz"; url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; - md5 = "9c499b8ec9f1b81fd0bb6a3b986f4b0f"; - md5name = "9c499b8ec9f1b81fd0bb6a3b986f4b0f-graphite2-minimal-1.3.10.tgz"; + md5 = ""; + md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.3.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2"; - sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027"; - md5 = "5986e1bfcd983d1f6caa53ef64c4abc5"; - md5name = "5986e1bfcd983d1f6caa53ef64c4abc5-harfbuzz-1.3.2.tar.bz2"; + name = "harfbuzz-1.4.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.4.8.tar.bz2"; + sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131"; + md5 = ""; + md5name = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131-harfbuzz-1.4.8.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -392,25 +399,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "jpegsrc.v9a.tar.gz"; - url = "http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz"; - sha256 = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"; - md5 = "3353992aecaee1805ef4109aadd433e7"; - md5name = "3353992aecaee1805ef4109aadd433e7-jpegsrc.v9a.tar.gz"; - } - { - name = "libjpeg-turbo-1.4.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.4.2.tar.gz"; - sha256 = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e"; - md5 = "86b0d5f7507c2e6c21c00219162c3c44"; - md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz"; + name = "libjpeg-turbo-1.5.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz"; + sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c"; + md5 = ""; + md5name = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c-libjpeg-turbo-1.5.1.tar.gz"; } { - name = "language-subtag-registry-2017-04-19.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2"; - sha256 = "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a"; - md5 = "59a3595c1052c5b51f996f44fe9994b9"; - md5name = "59a3595c1052c5b51f996f44fe9994b9-language-subtag-registry-2017-04-19.tar.bz2"; + name = "language-subtag-registry-2017-12-14.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; + sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; + md5 = ""; + md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -420,25 +420,32 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz"; - sha256 = "5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"; - md5 = "f4c08d38ceade4a664ebff7228910a33"; - md5name = "f4c08d38ceade4a664ebff7228910a33-lcms2-2.6.tar.gz"; + name = "lcms2-2.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; + sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; + md5 = ""; + md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; + } + { + name = "libassuan-2.4.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2"; + sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71"; + md5 = ""; + md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2"; } { name = "libatomic_ops-7_2d.zip"; url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; - md5 = "c0b86562d5aa40761a87134f83e6adcf"; - md5name = "c0b86562d5aa40761a87134f83e6adcf-libatomic_ops-7_2d.zip"; + md5 = ""; + md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip"; } { name = "libeot-0.01.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; - md5 = "aa24f5dd2a2992f4a116aa72af817548"; - md5name = "aa24f5dd2a2992f4a116aa72af817548-libeot-0.01.tar.bz2"; + md5 = ""; + md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { name = "libexttextcat-3.4.4.tar.bz2"; @@ -448,32 +455,39 @@ md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; } { - name = "libgltf-0.0.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2"; - sha256 = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b"; - md5 = "d63a9f47ab048f5009d90693d6aa6424"; - md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2"; + name = "libgltf-0.1.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz"; + sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da"; + md5 = ""; + md5name = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da-libgltf-0.1.0.tar.gz"; + } + { + name = "libgpg-error-1.26.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2"; + sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69"; + md5 = ""; + md5name = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69-libgpg-error-1.26.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; - md5 = "284f120247323a35122ab32b4b359c45"; - md5name = "284f120247323a35122ab32b4b359c45-liblangtag-0.6.2.tar.bz2"; + md5 = ""; + md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { name = "ltm-1.0.zip"; url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; - md5 = "da283d2e3e72137d0c600ac36b991c9d"; - md5name = "da283d2e3e72137d0c600ac36b991c9d-ltm-1.0.zip"; + md5 = ""; + md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.23.tar.gz"; - url = "http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz"; - sha256 = "41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f"; - md5 = "86b1daaa438f5a7bea9a52d7b9799ac0"; - md5name = "86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz"; + name = "xmlsec1-1.2.24.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz"; + sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc"; + md5 = ""; + md5name = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc-xmlsec1-1.2.24.tar.gz"; } { name = "libxml2-2.9.4.tar.gz"; @@ -507,29 +521,29 @@ name = "mdds-1.2.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2"; sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d"; - md5 = "8855cf852a6088cfdc792c6f7ceb0243"; - md5name = "8855cf852a6088cfdc792c6f7ceb0243-mdds-1.2.2.tar.bz2"; + md5 = ""; + md5name = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d-mdds-1.2.2.tar.bz2"; } { name = "mDNSResponder-576.30.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; - md5 = "940057ac8b513b00e8e9ca12ef796762"; - md5name = "940057ac8b513b00e8e9ca12ef796762-mDNSResponder-576.30.4.tar.gz"; + md5 = ""; + md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; } { name = "libmspub-0.1.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; - md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; - md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2"; + md5 = ""; + md5name = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a-libmspub-0.1.2.tar.bz2"; } { - name = "libmwaw-0.3.9.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2"; - sha256 = "11a1f318431a052e1d623385351c8e659377d36db3e71e188af55da87ce9461f"; - md5 = "d8532ad5630d3f3b2189a7ec5639151b"; - md5name = "d8532ad5630d3f3b2189a7ec5639151b-libmwaw-0.3.9.tar.bz2"; + name = "libmwaw-0.3.11.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz"; + sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a"; + md5 = ""; + md5name = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a-libmwaw-0.3.11.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -556,15 +570,15 @@ name = "nss-3.29.5-with-nspr-4.13.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz"; sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4"; - md5 = "e55ee06b22687df68fafc6a30c0554b2"; - md5name = "e55ee06b22687df68fafc6a30c0554b2-nss-3.29.5-with-nspr-4.13.1.tar.gz"; + md5 = ""; + md5name = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4-nss-3.29.5-with-nspr-4.13.1.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; - md5 = "32572ea48d9021bbd6fa317ddb697abc"; - md5name = "32572ea48d9021bbd6fa317ddb697abc-libodfgen-0.1.6.tar.bz2"; + md5 = ""; + md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; @@ -584,43 +598,50 @@ name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; - md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; - md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2"; + md5 = ""; + md5name = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4-OpenCOLLADA-master-6509aa13af.tar.bz2"; } { name = "openldap-2.4.44.tgz"; url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz"; sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400"; - md5 = "693ac26de86231f8dcae2b4e9d768e51"; - md5name = "693ac26de86231f8dcae2b4e9d768e51-openldap-2.4.44.tgz"; + md5 = ""; + md5name = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400-openldap-2.4.44.tgz"; } { - name = "openssl-1.0.2h.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz"; - sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; - md5 = "9392e65072ce4b614c1392eefc1f23d0"; - md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz"; + name = "openssl-1.0.2k.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz"; + sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"; + md5 = ""; + md5name = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0-openssl-1.0.2k.tar.gz"; } { name = "liborcus-0.12.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz"; sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908"; - md5 = "d0ad3a2fcf7008e5b33604bab33df3ad"; - md5name = "d0ad3a2fcf7008e5b33604bab33df3ad-liborcus-0.12.1.tar.gz"; + md5 = ""; + md5name = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908-liborcus-0.12.1.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; - md5 = "593f0aa47bf2efc0efda2d28fae063b2"; - md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + md5 = ""; + md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { name = "libpagemaker-0.0.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2"; sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33"; - md5 = "5c4985a68be0b79d3f809da5e12b143c"; - md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2"; + md5 = ""; + md5name = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33-libpagemaker-0.0.3.tar.bz2"; + } + { + name = "pdfium-3064.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2"; + sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883"; + md5 = ""; + md5name = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883-pdfium-3064.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -633,15 +654,15 @@ name = "libpng-1.6.28.tar.gz"; url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz"; sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2"; - md5 = "897ccec1ebfb0922e83c2bfaa1be8748"; - md5name = "897ccec1ebfb0922e83c2bfaa1be8748-libpng-1.6.28.tar.gz"; + md5 = ""; + md5name = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2-libpng-1.6.28.tar.gz"; } { - name = "poppler-0.49.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.49.0.tar.xz"; - sha256 = "14485f0e1e43dcddf49cfc02c2ccb92910ba3e0e91e06f4bd2642ec00cb3a79f"; - md5 = "9e057ed8eee1f9979fa75d8f044783b8"; - md5name = "9e057ed8eee1f9979fa75d8f044783b8-poppler-0.49.0.tar.xz"; + name = "poppler-0.56.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz"; + sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173"; + md5 = ""; + md5name = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173-poppler-0.56.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -650,19 +671,12 @@ md5 = "c0b4799ea9850eae3ead14f0a60e9418"; md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; } - { - name = "Python-3.3.5.tgz"; - url = "http://dev-www.libreoffice.org/src/Python-3.3.5.tgz"; - sha256 = "916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168"; - md5 = "803a75927f8f241ca78633890c798021"; - md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz"; - } { name = "Python-3.5.4.tgz"; url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz"; sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44"; - md5 = "2ed4802b7a2a7e40d2e797272bf388ec"; - md5name = "2ed4802b7a2a7e40d2e797272bf388ec-Python-3.5.4.tgz"; + md5 = ""; + md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz"; } { name = "raptor2-2.0.15.tar.gz"; @@ -689,8 +703,8 @@ name = "librevenge-0.0.4.tar.bz2"; url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; - md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; - md5name = "5b9ac52ec77d4d19157cf5962ebc0aea-librevenge-0.0.4.tar.bz2"; + md5 = ""; + md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; @@ -703,15 +717,15 @@ name = "serf-1.2.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; - md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; - md5name = "4f8e76c9c6567aee1d66aba49f76a58b-serf-1.2.1.tar.bz2"; + md5 = ""; + md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2"; - sha256 = "f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899"; - md5 = "4012950240c2bf768c9b29ad376123d7"; - md5name = "4012950240c2bf768c9b29ad376123d7-libstaroffice-0.0.2.tar.bz2"; + name = "libstaroffice-0.0.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz"; + sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6"; + md5 = ""; + md5name = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6-libstaroffice-0.0.3.tar.xz"; } { name = "swingExSrc.zip"; @@ -731,29 +745,29 @@ name = "libvisio-0.1.5.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; - md5 = "cbee198a78b842b2087f32d33c522818"; - md5name = "cbee198a78b842b2087f32d33c522818-libvisio-0.1.5.tar.bz2"; + md5 = ""; + md5name = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e-libvisio-0.1.5.tar.bz2"; } { name = "libwpd-0.10.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; - md5 = "79b56bcc349264d686a67994506ad199"; - md5name = "79b56bcc349264d686a67994506ad199-libwpd-0.10.1.tar.bz2"; + md5 = ""; + md5name = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d-libwpd-0.10.1.tar.bz2"; } { name = "libwpg-0.3.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; - md5 = "dfd066658ec9d2fb2262417039a8a1c3"; - md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2"; + md5 = ""; + md5name = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59-libwpg-0.3.1.tar.bz2"; } { - name = "libwps-0.4.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.4.tar.bz2"; - sha256 = "387c46d9543bb566381fddb8991e2838599fc500ee132fef9631a704c5cbed73"; - md5 = "dcfd1d18bfa9818cf3ab21663ba857a3"; - md5name = "dcfd1d18bfa9818cf3ab21663ba857a3-libwps-0.4.4.tar.bz2"; + name = "libwps-0.4.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz"; + sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0"; + md5 = ""; + md5name = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0-libwps-0.4.6.tar.xz"; } { name = "xsltml_2.1.2.zip"; @@ -763,17 +777,17 @@ md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { - name = "zlib-1.2.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz"; - sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d"; - md5 = "44d667c142d7cda120332623eab69f40"; - md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz"; + name = "zlib-1.2.11.tar.xz"; + url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; + sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; + md5 = ""; + md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { name = "libzmf-0.0.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2"; sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b"; - md5 = "c611df8664240de0276ab95670f413d8"; - md5name = "c611df8664240de0276ab95670f413d8-libzmf-0.0.1.tar.bz2"; + md5 = ""; + md5name = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b-libzmf-0.0.1.tar.bz2"; } ] diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index d20ec2d0cc80dc187c68f2a409ec23d29c4fdb8f..28c06b65869f81f2959cad8d8b5f173c5f731c8a 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -1,45 +1,45 @@ [ { - name = "libabw-0.1.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; - sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; + name = "libabw-0.1.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; + sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; md5 = ""; - md5name = "-libabw-0.1.1.tar.bz2"; + md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; md5 = ""; - md5name = "-commons-logging-1.2-src.tar.gz"; + md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; md5 = ""; - md5name = "-apr-1.5.2.tar.gz"; + md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; md5 = ""; - md5name = "-apr-util-1.5.4.tar.gz"; + md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_63_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2"; - sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"; + name = "boost_1_65_1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2"; + sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; md5 = ""; - md5name = "-boost_1_63_0.tar.bz2"; + md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2"; } { name = "breakpad.zip"; url = "http://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; md5 = ""; - md5name = "-breakpad.zip"; + md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.14.8.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz"; - sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20"; + name = "cairo-1.14.10.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz"; + sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09"; md5 = ""; - md5name = "-cairo-1.14.8.tar.xz"; + md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz"; } { - name = "libcdr-0.1.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2"; - sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d"; + name = "libcdr-0.1.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz"; + sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d"; md5 = ""; - md5name = "-libcdr-0.1.3.tar.bz2"; + md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -81,28 +81,21 @@ url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; md5 = ""; - md5name = "-libcmis-0.5.1.tar.gz"; + md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz"; } { name = "CoinMP-1.7.6.tgz"; url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; md5 = ""; - md5name = "-CoinMP-1.7.6.tgz"; - } - { - name = "collada2gltf-master-cb1d97788a.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; - sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb"; - md5 = "4b87018f7fff1d054939d19920b751a0"; - md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { name = "cppunit-1.14.0.tar.gz"; url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; md5 = ""; - md5name = "-cppunit-1.14.0.tar.gz"; + md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; @@ -112,25 +105,25 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.52.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz"; - sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae"; + name = "curl-7.58.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz"; + sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115"; md5 = ""; - md5name = "-curl-7.52.1.tar.gz"; + md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz"; } { - name = "libe-book-0.1.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; - sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; + name = "libe-book-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; + sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"; md5 = ""; - md5name = "-libe-book-0.1.2.tar.bz2"; + md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { name = "libepoxy-1.3.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2"; sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64"; md5 = ""; - md5name = "-libepoxy-1.3.1.tar.bz2"; + md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2"; } { name = "epm-3.7.tar.gz"; @@ -140,32 +133,39 @@ md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { - name = "libetonyek-0.1.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; - sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; + name = "libepubgen-0.1.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2"; + sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633"; md5 = ""; - md5name = "-libetonyek-0.1.6.tar.bz2"; + md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2"; } { - name = "expat-2.2.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2"; - sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f"; + name = "libetonyek-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz"; + sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac"; md5 = ""; - md5name = "-expat-2.2.3.tar.bz2"; + md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz"; + } + { + name = "expat-2.2.5.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; + sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + md5 = ""; + md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; md5 = ""; - md5name = "-Firebird-3.0.0.32483-0.tar.bz2"; + md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.12.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2"; - sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3"; + name = "fontconfig-2.12.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2"; + sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017"; md5 = ""; - md5name = "-fontconfig-2.12.1.tar.bz2"; + md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -216,20 +216,6 @@ md5 = "e7a384790b13c29113e22e596ade9687"; md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } - { - name = "open-sans-font-ttf-1.10.tar.gz"; - url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; - sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8"; - md5 = "7a15edea7d415ac5150ea403e27401fd"; - md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; - } - { - name = "pt-serif-font-1.0000W.tar.gz"; - url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; - sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa"; - md5 = "c3c1a8ba7452950636e871d25020ce0d"; - md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; - } { name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; @@ -249,21 +235,77 @@ url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; md5 = ""; - md5name = "-EmojiOneColor-SVGinOT-1.3.tar.gz"; + md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; + } + { + name = "noto-fonts-20171024.tar.gz"; + url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; + sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; + md5 = ""; + md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; + } + { + name = "culmus-0.131.tar.gz"; + url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; + sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; + md5 = ""; + md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; + } + { + name = "libre-hebrew-1.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; + sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a"; + md5 = ""; + md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz"; + } + { + name = "alef-1.001.tar.gz"; + url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; + sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52"; + md5 = ""; + md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; + } + { + name = "amiri-0.109.zip"; + url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip"; + sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6"; + md5 = ""; + md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip"; + } + { + name = "ttf-kacst_2.01+mry.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; + sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; + md5 = ""; + md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; } { - name = "libfreehand-0.1.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; - sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; + name = "ReemKufi-0.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz"; + sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b"; md5 = ""; - md5name = "-libfreehand-0.1.1.tar.bz2"; + md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz"; } { - name = "freetype-2.7.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2"; - sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88"; + name = "Scheherazade-2.100.zip"; + url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; + sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"; md5 = ""; - md5name = "-freetype-2.7.1.tar.bz2"; + md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; + } + { + name = "libfreehand-0.1.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; + sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"; + md5 = ""; + md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; + } + { + name = "freetype-2.8.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; + sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; + md5 = ""; + md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -273,25 +315,25 @@ md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; } { - name = "gpgme-1.8.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2"; - sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33"; + name = "gpgme-1.9.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; + sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; md5 = ""; - md5name = "-gpgme-1.8.0.tar.bz2"; + md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { name = "graphite2-minimal-1.3.10.tgz"; url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; md5 = ""; - md5name = "-graphite2-minimal-1.3.10.tgz"; + md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.3.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2"; - sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027"; + name = "harfbuzz-1.7.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2"; + sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029"; md5 = ""; - md5name = "-harfbuzz-1.3.2.tar.bz2"; + md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -301,11 +343,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - 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 = "hunspell-1.6.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz"; + sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4"; + md5 = ""; + md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -315,11 +357,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-58_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz"; - sha256 = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309"; - md5 = "1901302aaff1c1633ef81862663d2917"; - md5name = "1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz"; + name = "icu4c-60_2-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz"; + sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418"; + md5 = ""; + md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz"; + } + { + name = "icu4c-60_2-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip"; + sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9"; + md5 = ""; + md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -399,18 +448,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-1.5.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz"; - sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c"; + name = "libjpeg-turbo-1.5.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz"; + sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528"; md5 = ""; - md5name = "-libjpeg-turbo-1.5.1.tar.gz"; + md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - name = "language-subtag-registry-2017-04-19.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2"; - sha256 = "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a"; + name = "language-subtag-registry-2017-12-14.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; + sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; md5 = ""; - md5name = "-language-subtag-registry-2017-04-19.tar.bz2"; + md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -424,84 +473,77 @@ url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; md5 = ""; - md5name = "-lcms2-2.8.tar.gz"; + md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; } { name = "libassuan-2.4.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2"; sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71"; md5 = ""; - md5name = "-libassuan-2.4.3.tar.bz2"; + md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2"; } { name = "libatomic_ops-7_2d.zip"; url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; md5 = ""; - md5name = "-libatomic_ops-7_2d.zip"; + md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip"; } { name = "libeot-0.01.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; md5 = ""; - md5name = "-libeot-0.01.tar.bz2"; + md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { - name = "libexttextcat-3.4.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; - sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163"; - md5 = "10d61fbaa6a06348823651b1bd7940fe"; - md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; - } - { - name = "libgltf-0.1.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz"; - sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da"; + name = "libexttextcat-3.4.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; + sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; md5 = ""; - md5name = "-libgltf-0.1.0.tar.gz"; + md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { - name = "libgpg-error-1.26.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2"; - sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69"; + name = "libgpg-error-1.27.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; + sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; md5 = ""; - md5name = "-libgpg-error-1.26.tar.bz2"; + md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; md5 = ""; - md5name = "-liblangtag-0.6.2.tar.bz2"; + md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { name = "ltm-1.0.zip"; url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; md5 = ""; - md5name = "-ltm-1.0.zip"; + md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.24.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz"; - sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc"; + name = "xmlsec1-1.2.25.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz"; + sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2"; md5 = ""; - md5name = "-xmlsec1-1.2.24.tar.gz"; + md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; } { - name = "libxml2-2.9.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; - sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c"; - md5 = "ae249165c173b1ff386ee8ad676815f5"; - md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + name = "libxml2-2.9.7.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.7.tar.gz"; + sha256 = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c"; + md5 = ""; + md5name = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c-libxml2-2.9.7.tar.gz"; } { - name = "libxslt-1.1.29.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; - sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"; - md5 = "a129d3c44c022de3b9dcf6d6f288d72e"; - md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; + name = "libxslt-1.1.32.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz"; + sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"; + md5 = ""; + md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -518,32 +560,32 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.2.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2"; - sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d"; + name = "mdds-1.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2"; + sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1"; md5 = ""; - md5name = "-mdds-1.2.2.tar.bz2"; + md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2"; } { name = "mDNSResponder-576.30.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; md5 = ""; - md5name = "-mDNSResponder-576.30.4.tar.gz"; + md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; } { - name = "libmspub-0.1.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; - sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; + name = "libmspub-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz"; + sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97"; md5 = ""; - md5name = "-libmspub-0.1.2.tar.bz2"; + md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz"; } { - name = "libmwaw-0.3.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz"; - sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a"; + name = "libmwaw-0.3.13.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz"; + sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea"; md5 = ""; - md5name = "-libmwaw-0.3.11.tar.xz"; + md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -560,32 +602,32 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.30.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; - sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd"; - md5 = "231adebe5c2f78fded3e3df6e958878e"; - md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + name = "neon-0.30.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; + sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; + md5 = ""; + md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.29.5-with-nspr-4.13.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz"; - sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4"; + name = "nss-3.33-with-nspr-4.17.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz"; + sha256 = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4"; md5 = ""; - md5name = "-nss-3.29.5-with-nspr-4.13.1.tar.gz"; + md5name = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4-nss-3.33-with-nspr-4.17.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; md5 = ""; - md5name = "-libodfgen-0.1.6.tar.bz2"; + md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34"; - md5 = "a084cd548b586552cb7d3ee51f1af969"; - md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf"; + md5 = ""; + md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; } { name = "officeotron-0.7.4-master.jar"; @@ -595,53 +637,46 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; - sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; + name = "openldap-2.4.45.tgz"; + url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; + sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; md5 = ""; - md5name = "-OpenCOLLADA-master-6509aa13af.tar.bz2"; + md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openldap-2.4.44.tgz"; - url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz"; - sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400"; + name = "openssl-1.0.2m.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz"; + sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f"; md5 = ""; - md5name = "-openldap-2.4.44.tgz"; + md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz"; } { - name = "openssl-1.0.2k.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz"; - sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"; + name = "liborcus-0.13.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz"; + sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937"; md5 = ""; - md5name = "-openssl-1.0.2k.tar.gz"; - } - { - name = "liborcus-0.12.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz"; - sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908"; - md5 = ""; - md5name = "-liborcus-0.12.1.tar.gz"; + md5name = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937-liborcus-0.13.1.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; md5 = ""; - md5name = "-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { - name = "libpagemaker-0.0.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2"; - sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33"; + name = "libpagemaker-0.0.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; + sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; md5 = ""; - md5name = "-libpagemaker-0.0.3.tar.bz2"; + md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3064.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2"; - sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883"; + name = "pdfium-3235.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2"; + sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f"; md5 = ""; - md5name = "-pdfium-3064.tar.bz2"; + md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -651,18 +686,18 @@ md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { - name = "libpng-1.6.28.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz"; - sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2"; + name = "libpng-1.6.34.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz"; + sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"; md5 = ""; - md5name = "-libpng-1.6.28.tar.gz"; + md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; } { - name = "poppler-0.56.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz"; - sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173"; + name = "poppler-0.59.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz"; + sha256 = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641"; md5 = ""; - md5name = "-poppler-0.56.0.tar.xz"; + md5name = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641-poppler-0.59.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -676,7 +711,14 @@ url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz"; sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44"; md5 = ""; - md5name = "-Python-3.5.4.tgz"; + md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz"; + } + { + name = "libqxp-0.0.1.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz"; + sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73"; + md5 = ""; + md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; @@ -704,7 +746,7 @@ url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; md5 = ""; - md5name = "-librevenge-0.0.4.tar.bz2"; + md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; @@ -718,14 +760,14 @@ url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; md5 = ""; - md5name = "-serf-1.2.1.tar.bz2"; + md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz"; - sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6"; + name = "libstaroffice-0.0.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz"; + sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982"; md5 = ""; - md5name = "-libstaroffice-0.0.3.tar.xz"; + md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz"; } { name = "swingExSrc.zip"; @@ -742,32 +784,32 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; - sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; + name = "libvisio-0.1.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; + sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; md5 = ""; - md5name = "-libvisio-0.1.5.tar.bz2"; + md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; } { - name = "libwpd-0.10.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; - sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; + name = "libwpd-0.10.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz"; + sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610"; md5 = ""; - md5name = "-libwpd-0.10.1.tar.bz2"; + md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz"; } { - name = "libwpg-0.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; - sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; + name = "libwpg-0.3.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz"; + sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33"; md5 = ""; - md5name = "-libwpg-0.3.1.tar.bz2"; + md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz"; } { - name = "libwps-0.4.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz"; - sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0"; + name = "libwps-0.4.8.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz"; + sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e"; md5 = ""; - md5name = "-libwps-0.4.6.tar.xz"; + md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz"; } { name = "xsltml_2.1.2.zip"; @@ -781,13 +823,13 @@ url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; md5 = ""; - md5name = "-zlib-1.2.11.tar.xz"; + md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { - name = "libzmf-0.0.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2"; - sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b"; + name = "libzmf-0.0.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; + sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22"; md5 = ""; - md5name = "-libzmf-0.0.1.tar.bz2"; + md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } ] diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 82133cdf68139e5eb59533db08166cc8c986402f..b1aa10800d6feeaabc645b69fc572d4701ed82f8 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -2,16 +2,16 @@ rec { major = "5"; - minor = "3"; + minor = "4"; patch = "6"; - tweak = "1"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "023a7hr7v5cf0ipga4ijhyl58ncgbjrp500qq5fwf65j8g2c3apz"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index a3991b8b35c1ff5b65800f8dcb445da2431b8fd6..b4139d54af50995c8d227dee0d962847fcd069d3 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -2,18 +2,18 @@ , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, libcmis +, icu, boost, jdk, ant, cups, xorg, libcmis, carlito , openssl, gperf, cppunit, GConf, ORBit2, poppler -, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven -, libatomic_ops, graphite2, harfbuzz, libodfgen +, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 -, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas -, defaultIconTheme, glib, ncurses -, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] +, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook +, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme +, langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ] , withHelp ? true , kdeIntegration ? false }: @@ -29,27 +29,27 @@ let langsSpaces = lib.concatStringsSep " " langs; fetchSrc = {name, sha256}: fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; inherit sha256; }; srcs = { third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { - url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; + url = "https://dev-www.libreoffice.org/extern/${md5}-${name}"; sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs-still.nix)); translations = fetchSrc { name = "translations"; - sha256 = "0mvfc33pkyrdd7h4kyi6lnzydaka8b5vw0ns50rw08kg9iirig4i"; + sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0yflll24yd4nxqxisb6mx1qgqk4awkwwi41wxmdaiq8las59sk95"; + sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc"; }; }; @@ -65,16 +65,15 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; + # And LO refers to gpgme++ by no-path name + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. configureScript = "./autogen.sh"; dontUseCmakeConfigure = true; - patches = [ - ./xdg-open.patch - ]; + patches = [ ./xdg-open-brief.patch ]; postUnpack = '' mkdir -v $sourceRoot/src @@ -84,6 +83,10 @@ in stdenv.mkDerivation rec { ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} ''; + postPatch = '' + sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx + ''; + QT4DIR = qt4; # Fix boost 1.59 compat @@ -103,6 +106,11 @@ in stdenv.mkDerivation rec { # BLFS patch for Glibc 2.23 renaming isnan sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx + + # This is required as some cppunittests require fontconfig configured + cp "${fontsConf}" fonts.conf + sed -e '/include/i${carlito}/etc/fonts/conf.d' -i fonts.conf + export FONTCONFIG_FILE="$PWD/fonts.conf" ''; # fetch_Download_item tries to interpret the name as a variable name @@ -112,7 +120,7 @@ in stdenv.mkDerivation rec { sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile # unit test sd_tiledrendering seems to be fragile - # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk # one more fragile test? @@ -120,11 +128,11 @@ in stdenv.mkDerivation rec { # rendering-dependent test sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME - sed -e 's@rtl::OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx # rendering-dependent: on my computer the test table actually doesn't fit… # interesting fact: test disabled on macOS by upstream sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx - # Segfault on DB access + # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx @@ -134,6 +142,7 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; @@ -162,10 +171,6 @@ in stdenv.mkDerivation rec { 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 : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - ; done ln -s $out/bin/soffice $out/bin/libreoffice @@ -191,6 +196,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" @@ -241,31 +247,33 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base gsettings_desktop_schemas glib + libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer + gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib - mdds bluez5 glibc libcmis libwps libabw libzmf - libxshmfence libatomic_ops graphite2 harfbuzz - librevenge libe-book libmwaw glm glew ncurses - libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper + mdds bluez5 glibc libcmis libwps libabw libzmf libtool + libxshmfence libatomic_ops graphite2 harfbuzz gpgme + librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy + libodfgen CoinMP librdf_rasqal defaultIconTheme + gdb ] ++ lib.optional kdeIntegration kdelibs4; + nativeBuildInputs = [ wrapGAppsHook ]; passthru = { - inherit srcs; + inherit srcs jdk; }; requiredSystemFeatures = [ "big-parallel" ]; meta = with lib; { description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; - homepage = http://libreoffice.org/; + homepage = https://libreoffice.org/; license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix new file mode 100644 index 0000000000000000000000000000000000000000..8566bd76e1e22f4fa70d082f7ec8b21132d232a0 --- /dev/null +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -0,0 +1,16 @@ +{ libreoffice, runCommand, dbus, bash }: +let + jdk = libreoffice.jdk; +in +(runCommand "${libreoffice.name}" { + inherit dbus libreoffice jdk bash; +} '' + mkdir -p "$out/bin" + ln -s "${libreoffice}/share" "$out/share" + substituteAll "${./wrapper.sh}" "$out/bin/soffice" + chmod a+x "$out/bin/soffice" + + for i in $(ls "${libreoffice}/bin/"); do + test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")" + done +'') // { inherit libreoffice dbus; } diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh new file mode 100644 index 0000000000000000000000000000000000000000..52cd91e8030eae6ea685ac639e8efd5cec2415e6 --- /dev/null +++ b/pkgs/applications/office/libreoffice/wrapper.sh @@ -0,0 +1,18 @@ +#!@bash@/bin/bash +export JAVA_HOME="${JAVA_HOME:-@jdk@}" +export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" + +if uname | grep Linux > /dev/null && + ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then + dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" + mkdir "$dbus_tmp_dir" + dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" + "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 & + export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" +fi + +"@libreoffice@/bin/$(basename "$0")" "$@" +code="$?" + +test -n "$dbus_socket_dir" && rm -rf "$dbus_socket_dir" +exit "$code" diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index c5dc9198740f9f8a6209d448b5868f4829682e68..7f6d93a11ae23d0e3fab0dd31124b34cc1d3e545 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.11"; + version = "0.0.12"; src = fetchurl { url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "06kka6kxrj35w23n34in6ks3vax9arl756jg720jhfy14vavyk0f"; + sha256 = "0pljjkis9vb819d0akqmqnyakwgnvc3qqyg20yr13xms9a5iqv32"; }; sourceRoot = "."; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 6ce003ff25d979c1f846a6e20f2ccfb9de795fda..a8664e6820a4b20e551a3fd7346c1e3924220977 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, dpkg, which , makeWrapper , alsaLib -, desktop_file_utils +, desktop-file-utils , dbus , libcap , fontconfig @@ -15,16 +15,23 @@ , orc , nss , nspr -, qt5 +, qtbase +, qtsvg +, qtdeclarative +, qtwebchannel +, qtquickcontrols +, qtwebkit +, qtwebengine , sqlite , xorg -, xlibs , zlib # The provided wrapper does this, but since we don't use it # we emulate the behavior. The downside is that this # will leave entries on your system after uninstalling mendeley. # (they can be removed by running '$out/bin/install-mendeley-link-handler.sh -u') , autorunLinkHandler ? true +# Update script +, writeScript }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -37,23 +44,23 @@ let then "i386" else "amd64"; - shortVersion = "1.17.11-stable"; + shortVersion = "1.17.13-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 "033855ix5qj1gwd3pa6qws5k94hgbp6rvibrrxl3rn5bvhrvvbkq" - else "09h6br8qhvphkvzy28y1pnh7dhyigb3w41w3kjwqj6027i46chi7"; + then "0q4x62k00whmq8lskphpcxc610cvclxzcr5k0v7pxjxs9sx5yx43" + else "01ylyily1hip35z0d4qkdpbzp5yn4r015psc5773xsqlgrnlwjm3"; deps = [ - qt5.qtbase - qt5.qtsvg - qt5.qtdeclarative - qt5.qtwebchannel - qt5.qtquickcontrols - qt5.qtwebkit - qt5.qtwebengine + qtbase + qtsvg + qtdeclarative + qtwebchannel + qtquickcontrols + qtwebkit + qtwebengine alsaLib dbus freetype @@ -70,7 +77,7 @@ let orc sqlite xorg.libX11 - xlibs.xcbutilkeysyms + xorg.xcbutilkeysyms xorg.libxcb xorg.libXcomposite xorg.libXext @@ -96,6 +103,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ dpkg which ] ++ deps; + propagatedUserEnvPkgs = [ gconf ]; + unpackPhase = "true"; installPhase = '' @@ -119,17 +128,20 @@ stdenv.mkDerivation { # Patch up link handler script wrapProgram $out/bin/install-mendeley-link-handler.sh \ - --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop_file_utils ] } + --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop-file-utils ] } ''; dontStrip = true; dontPatchElf = true; - meta = { + updateScript = import ./update.nix { inherit writeScript; }; + + meta = with stdenv.lib; { homepage = http://www.mendeley.com; description = "A reference manager and academic social network"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix new file mode 100644 index 0000000000000000000000000000000000000000..9ac82615c56169a623428579744cebf238283c23 --- /dev/null +++ b/pkgs/applications/office/mendeley/update.nix @@ -0,0 +1,60 @@ +{ writeScript }: + +writeScript "update-mendeley" '' + function follow() { + local URL=$1 + while true; do + NEWURL=$(curl -m20 -sI "$URL" -o /dev/null -w '%{redirect_url}') + [ -z "$NEWURL" ] && break + [[ $NEWURL = $URL ]] && (echo "redirect loop?!"; exit 1) + echo "Following $URL -> $NEWURL ..." >&2 + URL=$NEWURL + done + + echo $URL + } + + amd64URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/amd64/mendeleydesktop-latest) + amd64V=$(basename $amd64URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+") + i386URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/i386/mendeleydesktop-latest) + i386V=$(basename $i386URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+") + + echo "amd64 version: $amd64V" + echo "i386 version: $i386V" + if [[ $amd64V != $i386V ]]; then + echo "Versions not the same!" + exit 1 + fi + + if grep -q -F "$amd64V" ${./default.nix}; then + echo "No new version yet, nothing to do." + echo "Have a nice day!" + exit 0 + fi + + amd64OldHash=$(nix-instantiate --eval --strict -A "mendeley.src.drvAttrs.outputHash" --argstr system "x86_64-linux"| tr -d '"') + i386OldHash=$(nix-instantiate --eval --strict -A "mendeley.src.drvAttrs.outputHash" --argstr system "i686-linux"| tr -d '"') + + echo "Prefetching amd64..." + amd64NewHash=$(nix-prefetch-url $amd64URL) + echo "Prefetching i386..." + i386NewHash=$(nix-prefetch-url $i386URL) + + # Don't actually update, just report that an update is available + cat < 0.10.2) - sequel (~> 4.0.0) + sequel (~> 4.43.0) sqlite3 (~> 1.3.3) PLATFORMS diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index e68c753750f5826836425e46fa3ca684ed62603c..3564454a67414b0a50f870ea23c393761d6e4298 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,14 +1,17 @@ { stdenv, lib, bundlerEnv, ruby }: -bundlerEnv { - name = "timetrap-1.10.0"; +bundlerEnv rec { + name = "timetrap-${version}"; + version = (import gemset).timetrap.version; inherit ruby; gemdir = ./.; + gemset = ./gemset.nix; - meta = { + meta = with lib; { description = "A simple command line time tracker written in ruby"; homepage = https://github.com/samg/timetrap; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = [ maintainers.jerith666 ]; }; } diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix index cbf90f8018ce26302f1c9d1b8871cd24f376fe8e..5764016573fcc51394d59e03efd7b74a910c10bc 100644 --- a/pkgs/applications/office/timetrap/gemset.nix +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -10,25 +10,26 @@ sequel = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17kqm0vd15p9qxbgcysvmg6a046fd7zvxl3xzpsh00pg6v454svm"; + sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0"; type = "gem"; }; - version = "4.0.0"; + version = "4.43.0"; }; sqlite3 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny"; + sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; type = "gem"; }; - version = "1.3.11"; + version = "1.3.13"; }; timetrap = { + dependencies = ["chronic" "sequel" "sqlite3"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rdaa27zvdgmbsbwa59g3dvfwb95nz7x1wycmviby94j5lywyzfc"; + sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd"; type = "gem"; }; - version = "1.10.0"; + version = "1.15.1"; }; } \ No newline at end of file diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 31774b6b55c1e68ecbb1927e880f0f645733b951..51d5b083e6bd627b373a00e30b40b9b987b9d59d 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -4,10 +4,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "tryton-${version}"; - version = "4.2.1"; + version = "4.6.2"; src = fetchurl { url = "mirror://pypi/t/tryton/${name}.tar.gz"; - sha256 = "1ry3kvbk769m8rwqa90pplfvmmgsv4jj9w1aqhv892smia8f0ybm"; + sha256 = "0bamr040np02gfjk8c734rw3mbgg75irfgpdcl2npgkdzyw1ksf9"; }; propagatedBuildInputs = with python2Packages; [ chardet diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index e77287faae2541fb677a4fc8b3f7869d550504b6..efa7f2a410d75bc8adb353758eb8b22e09991a21 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -5,10 +5,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "trytond-${version}"; - version = "4.2.1"; + version = "4.6.2"; src = fetchurl { url = "mirror://pypi/t/trytond/${name}.tar.gz"; - sha256 = "1ijjpbsf3s0s7ksbi7xgzss4jgr14q5hqsyf6d68l8hwardrwpj7"; + sha256 = "0asc3pd37h8ky8j66iqxr0fv0k6mpjcwxwm0xgm5hrdi32l5cdda"; }; # Tells the tests which database to use diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index 76ad47950c491c0d772279a2e31a029017b167b7..dea3ea9731b0e8bbd0b68cf6fe8664d4c5afc497 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "tudu-${version}"; - version = "0.10"; + version = "0.10.2"; src = fetchurl { - url = "http://code.meskio.net/tudu/${name}.tar.gz"; - sha256 = "0571wh5hn0hgadyx34zq1zi35pzd7vpwkavm7kzb9hwgn07443x4"; + url = "https://code.meskio.net/tudu/${name}.tar.gz"; + sha256 = "1xsncvd1c6v8y0dzc5mspy9rrwc89pabhz6r2lihsirk83h2rqym"; }; buildInputs = [ ncurses ]; meta = { description = "ncurses-based hierarchical todo list manager with vim-like keybindings"; - homepage = http://code.meskio.net/tudu/; + homepage = https://code.meskio.net/tudu/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index a1fcfd5de700d9806ea062c02740a16460d59602..e0f0c58b45063ef707ff00c9489bbc595d015227 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,13 +1,14 @@ -{ stdenv, pythonPackages }: +{ stdenv, pythonPackages, fetchpatch }: -pythonPackages.buildPythonApplication rec { +with pythonPackages; + +buildPythonApplication rec { pname = "td-watson"; - name = "${pname}-${version}"; - version = "1.4.0"; + version = "1.5.2"; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit version pname; - sha256 = "1py0g4990jmvq0dn7jasda7f10kzr41bix46hnbyc1rshjzc17hq"; + sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8"; }; # uses tox, test invocation fails @@ -15,8 +16,16 @@ pythonPackages.buildPythonApplication rec { checkPhase = '' py.test -vs tests ''; - checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; - propagatedBuildInputs = with pythonPackages; [ requests click arrow ]; + + patches = [ + (fetchpatch { + url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch; + sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g"; + }) + ]; + + checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; + propagatedBuildInputs = [ requests click arrow ]; meta = with stdenv.lib; { homepage = https://tailordev.github.io/Watson/; @@ -24,4 +33,4 @@ pythonPackages.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ mguentner ] ; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 67f7e2816a48a8bd71b76153330ab9bb22d5c6d4..8efe9b368a078fbc825d4ae6366355c396ad92eb 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -1,24 +1,31 @@ { stdenv, fetchFromGitHub, pkgconfig, makeWrapper -, lua52Packages, libXft, ncurses, readline, zlib }: +, lua52Packages, libXft, ncurses, ninja, readline, zlib }: stdenv.mkDerivation rec { name = "wordgrinder-${version}"; - version = "0.6-db14181"; + version = "0.7.1"; src = fetchFromGitHub { repo = "wordgrinder"; owner = "davidgiven"; - rev = "db141815e8bd1da6e684a1142a59492e516f3041"; - sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2"; + rev = "${version}"; + sha256 = "19n4vn8zyvcvgwygm63d3jcmiwh6a2ikrrqqmkm8fvhdvwkqgr9k"; }; makeFlags = [ "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" - ]; + ] ++ stdenv.lib.optional stdenv.isLinux "XFT_PACKAGE=--libs=\{-lX11 -lXft\}"; + + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ + pkgconfig + makeWrapper + ninja + ]; buildInputs = [ libXft @@ -29,11 +36,12 @@ stdenv.mkDerivation rec { ]; # To be able to find - NIX_CFLAGS_COMPILE = "-I${libXft.dev}/include/X11"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; # Binaries look for LuaFileSystem library (lfs.so) at runtime postInstall = '' wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; + '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; ''; @@ -41,7 +49,7 @@ stdenv.mkDerivation rec { description = "Text-based word processor"; homepage = https://cowlark.com/wordgrinder; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with maintainers; [ ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 2130e64a2a3a7e1b1f9c144761a8b7d0b4ad5539..f8785616c5e662b2ac37e9af5b3ad267023427e9 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - fetchurl, fetchpatch, + fetchFromGitHub, extra-cmake-modules, qtbase, boost, akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap, @@ -9,22 +9,16 @@ mkDerivation rec { pname = "zanshin"; - version = "0.4.1"; + version = "2017-11-25"; name = "${pname}-${version}"; - src = fetchurl { - url = "https://files.kde.org/${pname}/${name}.tar.bz2"; - sha256 = "1llqm4w4mhmdirgrmbgwrpqyn47phwggjdghf164k3qw0bi806as"; + src = fetchFromGitHub { + owner = "KDE"; + repo = "zanshin"; + rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89"; + sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m"; }; - patches = [ - (fetchpatch { - name = "zanshin-fix-qt59-build.patch"; - url = "https://phabricator.kde.org/R4:77ad64872f69ad9f7abe3aa8e103a12b95e100a4?diff=1"; - sha256 = "0p497gqd3jmhbmqzh46zp6zwf6j1q77a9jp0in49xhgc2kj5ar7x"; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 48b278cc1dfb144c4c9bd55b7b2d74bc5595e195..9f7048f36462ba781bce0b6c46def9951bca2264 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.67"; + version = "0.68"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "1gdbzy9qyzj3rn9fsl0ss7lbk9kyka99656bphx2dah694yyyz5k"; + sha256 = "05fzb24a2s3pm89zb6gwa48wb925an5i652klx8yk9pn23h1h5fr"; }; propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b259623bf91e87713049836bf31fe018b2d2ad71..2f9999ab856c757cc3c98dcad7d2681d905bf68a 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings_desktop_schemas, gtk3, gnome3 }: +{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }: let -version = "5.0.25"; +version = "5.0.35.1"; meta = with stdenv.lib; { homepage = https://www.zotero.org; description = "Collect, organize, cite, and share your research sources"; @@ -15,10 +15,10 @@ zoteroSrc = stdenv.mkDerivation rec { src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "1y3q5582xp4inpz137x0r9iscs1g0cjlqcfjpzl3klsq3yas688k"; + sha256 = "0d2imvp84svllrnja1dl4nldp634z632g5xkm2q9v7j3dwbzw1hw"; }; - buildInputs= [ wrapGAppsHook gsettings_desktop_schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; + buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; phases = [ "unpackPhase" "installPhase" "fixupPhase"]; installPhase = '' @@ -31,8 +31,8 @@ zoteroSrc = stdenv.mkDerivation rec { fhsEnv = buildFHSUserEnv { name = "zotero-fhs-env"; - targetPkgs = pkgs: with pkgs; with xlibs; [ - gtk3 dbus_glib + targetPkgs = pkgs: with pkgs; with xorg; [ + gtk3 dbus-glib libXt nss ]; }; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index fe6a3a41a236c13932cb9b833498574cd818f67d..589625cc18f98ccc75ddb59933682b5c5acc4128 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, mesa, pkgconfig, perl, autoreconfHook, glib, cairo +, lua, libGLU_combined, pkgconfig, perl, autoreconfHook, glib, cairo , pango, gdk_pixbuf, atk }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa lua + buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU_combined lua perl autoreconfHook ]; patchPhase = '' @@ -56,12 +56,10 @@ stdenv.mkDerivation { patch -Np1 -i "${gcc47Patch}" ''; - configureFlags = "--with-gtk --with-lua=${lua}"; - CPPFLAGS = "-DNDEBUG"; - CFLAGS = "-O2 -fsigned-char"; - CXXFLAGS = "-O2 -fsigned-char"; - GTK_CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk.dev}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"; - GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"; + configureFlags = [ + "--with-gtk" + "--with-lua=${lua}" + ]; installPhase = ''make MKDIR_P="mkdir -p" install''; @@ -69,7 +67,7 @@ stdenv.mkDerivation { meta = { description = "Free space simulation"; - homepage = http://www.shatters.net/celestia/; + homepage = https://celestia.space/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9bacf6d90417ffec94846ba5662f56abbe9333b0 --- /dev/null +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, intltool +, gtk3, glib, curl, goocanvas2, gpsd +, hamlib, wrapGAppsHook +}: + +let + version = "2.2.1"; +in stdenv.mkDerivation { + name = "gpredict-${version}"; + + src = fetchurl { + url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2"; + sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; + }; + + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; + + meta = with stdenv.lib; { + description = "Real time satellite tracking and orbit prediction"; + longDescription = '' + Gpredict is a real time satellite tracking and orbit prediction program + written using the Gtk+ widgets. Gpredict is targetted mainly towards ham radio + operators but others interested in satellite tracking may find it useful as + well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the + NORAD Keplerian elements. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + homepage = http://gpredict.oz9aec.net/; + maintainers = [ maintainers.markuskowa maintainers.cmcdragonkai ]; + }; +} diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 5903edd337df4aab68bd63f1a2a8a113c1823b19..d572dd55b2b2092da5227bbc15a4c9fe01576a0c 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, mesa, libpng, lua5, autoconf, automake }: +{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU_combined, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { name = "gravit-0.5.1"; @@ -8,11 +8,18 @@ stdenv.mkDerivation rec { sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; }; - buildInputs = [ mesa SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; + buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; nativeBuildInputs = [ autoconf automake ]; - preConfigure = "./autogen.sh"; + preConfigure = '' + ./autogen.sh + + # Build fails on Linux with windres. + export ac_cv_prog_WINDRES= + ''; + + enableParallelBuilding = true; meta = { homepage = http://gravit.slowchop.com; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 32eaa37375f8ecf35e044a4b0d6a105e18467dc9..3c7af809b884a455d80bc38f845213d0942cdd0c 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl -, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv +, cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv , qtscript, qtserialport, qttools , qtmultimedia, qtlocation }: @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ - freetype libpng mesa openssl libiconv qtscript qtserialport qttools + freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools qtmultimedia qtlocation ]; diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..20d88eb3aafb9d7f442d75aa9753fad8d052d681 --- /dev/null +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, itk, fftwFloat, gsl }: + +stdenv.mkDerivation rec { pname = "EZminc"; + name = "${pname}-2017-08-29"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "4e017236cb6e7f6e07507446b18b759c584b6fc3"; + sha256 = "1pg06x42pgsg7zy7dz9wf6ajakkm2n8by64lg9z64qi8qqy82b8v"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ itk libminc bicpl fftwFloat gsl ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" + "-DEZMINC_BUILD_TOOLS=TRUE" + "-DEZMINC_BUILD_MRFSEG=TRUE" + "-DEZMINC_BUILD_DD=TRUE" ]; + + checkPhase = "ctest --output-on-failure ../tests/"; # but ctest doesn't find the tests ... + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/BIC-MNI/${pname}"; + description = "Collection of Perl and shell scripts for processing MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/applications/science/biology/N3/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c14846beec2fd5913d778130acb5f6e0fb8f932a --- /dev/null +++ b/pkgs/applications/science/biology/N3/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper, + perl, MNI-Perllib, GetoptTabular, + libminc, EBTKS }: + +stdenv.mkDerivation rec { + pname = "N3"; + name = "${pname}-2017-09-18"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "2fdd939f0f2b24a4039bc6a8ade4a190a1d8e75d"; + sha256 = "13z21c4r09hna3q1csvcn4i7ws5ixbdaja6ch421xv6nydjh2w5g"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc EBTKS ]; + propagatedBuildInputs = [ perl MNI-Perllib GetoptTabular ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ]; + + checkPhase = "ctest --output-on-failure"; + # don't run the tests as they fail at least due to missing program wrappers in this phase ... + + postFixup = '' + for p in $out/bin/*; do + wrapProgram $p --prefix PERL5LIB : $PERL5LIB + done + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/BIC-MNI/${pname}"; + description = "MRI non-uniformity correction for MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index db12fc00c87cde0c0254fdad46ab1ee88ee1a008..1ad1647c70e56e0580615a11dabb19b9908aefaa 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,18 +1,16 @@ -{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, bash }: +{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - version = "1.6"; + version = "1.8"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "10prgmf09a13mk18840938ijqgfc9y92hfc7sa2gcv07ddri0c19"; + sha256 = "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa"; }; - nativeBuildInputs = [ perl ]; - - buildInputs = [ htslib zlib bzip2 lzma curl ]; + buildInputs = [ htslib zlib bzip2 lzma curl perl python ]; makeFlags = [ "HSTDIR=${htslib}" diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index d6e00659c1a9d1709e41a8f475f1f09a83e8fc3d..406f42e9ad7b633d75bb7bb594dc4a129992a7cc 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bedtools-${version}"; - version = "2.26.0"; + version = "2.27.1"; src = fetchFromGitHub { owner = "arq5x"; repo = "bedtools2"; rev = "v${version}"; - sha256 = "1j2ia68rmcw3qksjm5gvv1cb84bh76vmln59mvncr2an23f5a3ss"; + sha256 = "1pk68y052rm2m24yfmy82ms8p6kd6xcqxxgi7n0a1sbh89wllm6s"; }; buildInputs = [ zlib python ]; diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 05a85cafedf12dd16ab0e6eff723b2a345bbf40c..829672d64cc2c4134dc254bf9a3bf9162996d4cc 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.3.3.1"; + version = "2.3.4.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "1pcyks76bnnkq6h0gqjw4fkdddjjnw7k5ibim7ajkbvfw58a99y0"; + sha256 = "07cvcy6483araayj41arjzpxjmf4fmn4iqyl6gp6zmrbzw72wwzj"; }; buildInputs = [ zlib tbb ]; diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index bc13032f1aac5cae4258b8c317b9f4cf26b0eba9..d1dbacf053fb69f48a3d06d04a9fe34d3e67a7d0 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bwa-${version}"; - version = "0.7.16a"; + version = "0.7.17"; src = fetchurl { url = "mirror://sourceforge/bio-bwa/${name}.tar.bz2"; - sha256 = "0w61zxh6b4isydw5qp6pdb1mc50jg1h8vhahw2xm24w7i1gxpv4g"; + sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy"; }; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..781ceb3df59e68a83570a031d9c78f38deaf121c --- /dev/null +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchFromGitHub +, cmake +, libyamlcpp +}: + +stdenv.mkDerivation rec { + version = "1.0.20170130"; + name = "dcm2niix-${version}"; + + src = fetchFromGitHub { + owner = "rordenlab"; + repo = "dcm2niix"; + rev = "v${version}"; + sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libyamlcpp ]; + + meta = with stdenv.lib; { + description = "dcm2niix DICOM to NIfTI converter"; + longDescription = '' + dcm2niix is a designed to convert neuroimaging data from the + DICOM format to the NIfTI format. + ''; + homepage = https://www.nitrc.org/projects/dcm2nii; + license = licenses.bsd3; + maintainers = [ maintainers.ashgillman ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index a2a40f0acc80cf45d1552aafb15884a532a702fa..bf963958406d7cb0f7fcced5a666790e3421f674 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.3.98"; + version = "2.4.10"; src = fetchurl { - url = "http://data.broadinstitute.org/igv/projects/downloads/IGV_${version}.zip"; - sha256 = "1bjdsvx8jsbcry6v7yfclh3vrlsvaw38f3s9587lklj63zj638l2"; + url = "http://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; + sha256 = "1wyv3ny06m6ipb83hi3pzcc50v49zms69c5714iixh0nqpd826f2"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f17143ad06bbc0bc590f65d7a8774ae3d9ad9ac2 --- /dev/null +++ b/pkgs/applications/science/biology/inormalize/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper, + perl, GetoptTabular, MNI-Perllib, + libminc, EBTKS }: + +stdenv.mkDerivation rec { + pname = "inormalize"; + name = "${pname}-2014-10-21"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "79cea9cdfe7b99abfd40afda89ab2253b596ad2f"; + sha256 = "1ahqv5q0ljvji99a5q8azjkdf6bgp6nr8lwivkqwqs3jm0k5clq7"; + }; + + patches = [ ./lgmask-interp.patch ./nu_correct_norm-interp.patch ]; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc EBTKS ]; + propagatedBuildInputs = [ perl GetoptTabular MNI-Perllib ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ]; + + checkPhase = "ctest --output-on-failure"; # but no tests + + postFixup = '' + for p in $out/bin/*; do + wrapProgram $p --prefix PERL5LIB : $PERL5LIB + done + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/BIC-MNI/${pname}"; + description = "Program to normalize intensity of MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/applications/science/biology/inormalize/lgmask-interp.patch b/pkgs/applications/science/biology/inormalize/lgmask-interp.patch new file mode 100644 index 0000000000000000000000000000000000000000..953bce9a184881623ab4a1ab49eeb7d6a12984a3 --- /dev/null +++ b/pkgs/applications/science/biology/inormalize/lgmask-interp.patch @@ -0,0 +1,10 @@ +diff --git a/lgmask.in b/lgmask.in +index 17dbe4d..2195d91 100644 +--- a/lgmask.in ++++ b/lgmask.in +@@ -1,4 +1,4 @@ +-#! @PERL@ ++#! /usr/bin/env perl + + #--------------------------------------------------------------------------- + #@COPYRIGHT : diff --git a/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch b/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch new file mode 100644 index 0000000000000000000000000000000000000000..75dc46a799cebd56bdf433061492a8a1adbae200 --- /dev/null +++ b/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch @@ -0,0 +1,10 @@ +diff --git a/nu_correct_norm.in b/nu_correct_norm.in +index 1dc84ac..1bc6235 100644 +--- a/nu_correct_norm.in ++++ b/nu_correct_norm.in +@@ -1,4 +1,4 @@ +-#! @PERL@ ++#! /usr/bin/perl + + #--------------------------------------------------------------------------- + #@COPYRIGHT : diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d80ffea9a780b25ae4954a84670a3d944262c6b2 --- /dev/null +++ b/pkgs/applications/science/biology/kallisto/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, hdf5, zlib }: + +stdenv.mkDerivation rec { + name = "kallisto-${version}"; + version = "0.43.1"; + + src = fetchFromGitHub { + repo = "kallisto"; + owner = "pachterlab"; + rev = "v${version}"; + sha256 = "04697pf7jvy7vw126s1rn09q4iab9223jvb1nb0jn7ilwkq7pgwz"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ hdf5 zlib ]; + + meta = with stdenv.lib; { + description = "kallisto is a program for quantifying abundances of transcripts from RNA-Seq data"; + homepage = https://pachterlab.github.io/kallisto; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.arcadio ]; + }; +} diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index aae0cf40cee36d937d9ce1cfaca20cec1926113f..8e1f74686d1f8f419a4129b476b6a1d206cfacbb 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,26 +1,37 @@ -{ stdenv, fetchurl, perl, cmake, flex, bison, libminc }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, libminc, libjpeg, zlib }: stdenv.mkDerivation rec { - _name = "minc-tools"; - name = "${_name}-2.3.00"; + pname = "minc-tools"; + name = "${pname}-2017-09-11"; - src = fetchurl { - url = "https://github.com/BIC-MNI/${_name}/archive/${_name}-2-3-00.tar.gz"; - sha256 = "1d457vrwy2fl6ga2axnwn1cchkx2rmgixfzyb1zjxb06cxkfj1dm"; + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "5b7c40425cd4f67a018055cb85c0157ee50a3056"; + sha256 = "0zkcs05svp1gj5h0cdgc0k20c7lrk8m7wg3ks3xc5mkaiannj8g7"; }; - nativeBuildInputs = [ cmake flex bison ] ++ (if doCheck then [ perl ] else [ ]); - buildInputs = [ libminc ]; + nativeBuildInputs = [ cmake flex bison makeWrapper ]; + buildInputs = [ libminc libjpeg zlib ]; + propagatedBuildInputs = [ perl TextFormat ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; - checkPhase = "ctest"; - doCheck = false; + checkPhase = "ctest --output-on-failure"; # still some weird test failures though + + postFixup = '' + for prog in minccomplete minchistory mincpik; do + wrapProgram $out/bin/$prog --prefix PERL5LIB : $PERL5LIB + done + ''; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://github.com/BIC-MNI/minc-tools; description = "Command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; + license = licenses.free; }; } diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9084dfb2e1c32a4eccdcd8f5f3dea9520632002f --- /dev/null +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper, + perl, GetoptTabular, MNI-Perllib, + libminc, octave, coreutils, minc_tools }: + +stdenv.mkDerivation rec { + pname = "minc-widgets"; + name = "${pname}-2016-04-20"; + + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "f08b643894c81a1a2e0fbfe595a17a42ba8906db"; + sha256 = "1b9g6lf37wpp211ikaji4rf74rl9xcmrlyqcw1zq3z12ji9y33bm"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc ]; + propagatedBuildInputs = [ perl GetoptTabular MNI-Perllib octave coreutils minc_tools ]; + + postFixup = '' + for p in $out/bin/*; do + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}"; + done + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/BIC-MNI/${pname}"; + description = "Collection of Perl and shell scripts for processing MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..076ecd03a1b145bf699147852cc110532ae0cf70 --- /dev/null +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper, perl, GetoptTabular, MNI-Perllib, libminc }: + +stdenv.mkDerivation rec { + pname = "mni_autoreg"; + name = "${pname}-2017-09-22"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "ab99e29987dc029737785baebf24896ec37a2d76"; + sha256 = "0axl069nv57vmb2wvqq7s9v3bfxwspzmk37bxm4973ai1irgppjq"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc ]; + propagatedBuildInputs = [ perl GetoptTabular MNI-Perllib ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ]; + # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc + + postFixup = '' + for prog in autocrop mritoself mritotal xfmtool; do + echo $out/bin/$prog + wrapProgram $out/bin/$prog --prefix PERL5LIB : $PERL5LIB; + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/BIC-MNI/mni_autoreg; + description = "Tools for automated registration using the MINC image format"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} + diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9cbabc7ab37ed835ff0581c337e71e04612ebb73 --- /dev/null +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + _name = "muscle"; + name = "${_name}-${version}"; + version = "3.8.31"; + + src = fetchurl { + url = "https://www.drive5.com/muscle/downloads${version}/${_name}${version}_src.tar.gz"; + sha256 = "1b89z0x7h098g99g00nqadgjnb2r5wpi9s11b7ddffqkh9m9dia3"; + }; + + patches = [ + ./muscle-3.8.31-no-static.patch + ]; + + preBuild = '' + cd ./src/ + patchShebangs mk + ''; + + installPhase = '' + install -vD muscle $out/bin/muscle + ''; + + meta = with stdenv.lib; { + description = "A multiple sequence alignment method with reduced time and space complexity"; + license = licenses.publicDomain; + homepage = https://www.drive5.com/muscle/; + maintainers = [ maintainers.unode ]; + # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails. + # Anyone with access to these platforms is welcome to give it a try + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch new file mode 100644 index 0000000000000000000000000000000000000000..7f4b2129518d38e15d812bf6f8f03d72bb0f9b78 --- /dev/null +++ b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch @@ -0,0 +1,21 @@ +--- a/src/mk 2010-05-02 01:15:42.000000000 +0200 ++++ b/src/mk 2018-01-27 17:07:23.539092748 +0100 +@@ -5,14 +5,14 @@ + rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt + for CPPName in $CPPNames + do +- echo $CPPName >> /dev/tty ++ echo $CPPName + g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt + done + + LINK_OPTS= +-if [ `uname -s` == Linux ] ; then +- LINK_OPTS=-static +-fi ++#if [ `uname -s` == Linux ] ; then ++# LINK_OPTS=-static ++#fi + g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt + tail muscle.make.stderr.txt + diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 589c2809a931f8debc91f5722ff10aa9b86a7726..bfadf9e704a74dc2a99857dc233b461a71a2ec56 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.9c"; + version = "4.9g"; name = "paml-${version}"; src = fetchurl { url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; - sha256 = "18a1l47223l7jyjavm8a8la84q9k9kbxwmj7kz4z3pdx70qrl04j"; + sha256 = "1kxkl47azkrsmdxiymnc76c2ccc514vlfnjvvm7lwch5l43j029h"; }; preBuild = '' diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 3f17825202eaf3dadc7584723e9abf6fd14dcbf7..7af1669dc45e8055d418e373ea205083a0c094fb 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.7.1"; + version = "2.18.2"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0rcfcvy9zacqmh7nyqlm93hzsx6gfygmcf8d2p02h5l69gvygnb9"; + sha256 = "0w3b2jz4n9irslsg85r4x9dc3y4ziykn8fs4iqqiq4sfdcz259fz"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0bac6c778049a4555fafdbd1b0d8f597682ccd14 --- /dev/null +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +, zlib +, pkgs +, mpi ? false +}: + +stdenv.mkDerivation rec { + pname = "RAxML"; + version = "8.2.11"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "stamatak"; + repo = "standard-${pname}"; + rev = "v${version}"; + sha256 = "08fmqrr7y5a2fmmrgfz2p0hmn4mn71l5yspxfcwwsqbw6vmdfkhg"; + }; + + buildInputs = if mpi then [ pkgs.openmpi ] else []; + + # TODO darwin, AVX and AVX2 makefile targets + buildPhase = if mpi then '' + make -f Makefile.MPI.gcc + '' else '' + make -f Makefile.SSE3.PTHREADS.gcc + ''; + + installPhase = if mpi then '' + mkdir -p $out/bin && cp raxmlHPC-MPI $out/bin + '' else '' + mkdir -p $out/bin && cp raxmlHPC-PTHREADS-SSE3 $out/bin + ''; + + meta = with stdenv.lib; { + description = "A tool for Phylogenetic Analysis and Post-Analysis of Large Phylogenies"; + license = licenses.gpl3; + homepage = https://sco.h-its.org/exelixis/web/software/raxml/; + maintainers = [ maintainers.unode ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 640f32671bbd20ef85b99fa5d2252da9a0a4b979..87e708526ef7506a4f1156fa381ed374474eccf4 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - version = "1.6"; + version = "1.8"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "17p4vdj2j2qr3b2c0v4100h6cg4jj3zrb4dmdnd9d9aqs74d4p7f"; + sha256 = "05myg7bs90i68qbqab9cdg9rqj2xh39azibrx82ipzc5kcfvqhn9"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch b/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch new file mode 100644 index 0000000000000000000000000000000000000000..a7782a1a0264c44bf82c92da807e55e61da67903 --- /dev/null +++ b/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch @@ -0,0 +1,22 @@ +diff --git a/Makefile b/Makefile +index 2f51bfc..395d6f1 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + CC= gcc + CFLAGS= -g -Wall -O2 + #LDFLAGS= -Wl,-rpath,\$$ORIGIN/../lib +-DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE -D_CURSES_LIB=1 ++DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE # -D_CURSES_LIB=1 + KNETFILE_O= knetfile.o + LOBJS= bgzf.o kstring.o bam_aux.o bam.o bam_import.o sam.o bam_index.o \ + bam_pileup.o bam_lpileup.o bam_md.o razf.o faidx.o bedidx.o \ +@@ -15,7 +15,7 @@ PROG= samtools + INCLUDES= -I. + SUBDIRS= . bcftools misc + LIBPATH= +-LIBCURSES= -lcurses # -lXCurses ++LIBCURSES= # -lcurses # -lXCurses + + .SUFFIXES:.c .o + .PHONY: all lib diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix new file mode 100644 index 0000000000000000000000000000000000000000..a811bc4412f2b8a32124d35d490989259707bf9c --- /dev/null +++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "samtools"; + version = "0.1.19"; + + src = fetchurl { + url = "mirror://sourceforge/samtools/${name}.tar.bz2"; + sha256 = "d080c9d356e5f0ad334007e4461cbcee3c4ca97b8a7a5a48c44883cf9dee63d4"; + }; + + patches = [ + ./samtools-0.1.19-no-curses.patch + ]; + + buildInputs = [ zlib ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man + + cp samtools $out/bin + cp samtools.1 $out/share/man + ''; + + meta = with stdenv.lib; { + description = "Tools for manipulating SAM/BAM/CRAM format"; + license = licenses.mit; + homepage = http://samtools.sourceforge.net/; + platforms = platforms.unix; + maintainers = [ maintainers.unode ]; + }; +} diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index 844374fceb954f0ca8f2fa38aa54cb56816bdbde..9c2d273b0881346fc151ebc25d67129a18670e9c 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "snpeff-${version}"; - version = "4.3p"; + version = "4.3q"; src = fetchurl { - url = "mirror://sourceforge/project/snpeff/snpEff_v4_3p_core.zip"; - sha256 = "1xb3k0yxd634znw2q083ligm2ww4p6v64041r9sdy3930lhjvxb1"; + url = "mirror://sourceforge/project/snpeff/snpEff_v4_3q_core.zip"; + sha256 = "0sxz8zy8wrzcy01hyb1cirwbxqyjw30a2x3q6p4l7zmw2szi7mn1"; }; buildInputs = [ unzip jre makeWrapper ]; diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1642739140d685572d98fc8f74131e326136c4b1 --- /dev/null +++ b/pkgs/applications/science/biology/star/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, zlib }: + +stdenv.mkDerivation rec { + name = "star-${version}"; + version = "2.5.3a"; + + src = fetchFromGitHub { + repo = "STAR"; + owner = "alexdobin"; + rev = version; + sha256 = "1fd9xl7i1zxgsxn2qf6gz8s42g2djm29qmp6qb35d8nnxh8ns54x"; + }; + + sourceRoot = "source/source"; + + postPatch = "sed 's:/bin/rm:rm:g' -i Makefile"; + + buildInputs = [ zlib ]; + + buildPhase = "make STAR STARlong"; + + installPhase = '' + mkdir -p $out/bin + cp STAR STARlong $out/bin + ''; + + meta = with stdenv.lib; { + description = "Spliced Transcripts Alignment to a Reference"; + homepage = https://github.com/alexdobin/STAR; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.arcadio ]; + }; +} diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 878dfde8f4e2d9486621be42522c80956932c8b2..78cda9d115ce6d08fd2a10dab2fca1d816683940 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11, doxygen }: +{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU_combined, libX11, doxygen }: stdenv.mkDerivation rec { name = "avogadro-1.1.1"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; }; - buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; + buildInputs = [ qt4 eigen zlib openbabel libGLU_combined libX11 ]; nativeBuildInputs = [ cmake pkgconfig doxygen ]; - NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h"; + NIX_CFLAGS_COMPILE = "-include ${libGLU_combined}/include/GL/glu.h"; meta = { description = "Molecule editor and visualizer"; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1472b4b2af9e82e0ed54033fbc9f0b1c5056e1cd --- /dev/null +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, which, gfortran, libGLU, xorg } : + +stdenv.mkDerivation rec { + version = "5.7"; + name = "molden-${version}"; + + src = fetchurl { + url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; + sha256 = "0gaq11gm09ax25lvgfrvxv9dxvi76hps116fp6k7sqgvdd68vf0s"; + }; + + nativeBuildInputs = [ which ]; + buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ]; + + postPatch = '' + substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \ + --replace '-I/usr/X11R6/include' "" \ + --replace '/usr/local/' $out/ \ + --replace 'sudo' "" \ + --replace '-C surf depend' '-C surf' + sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Display and manipulate molecular structures"; + homepage = http://www.cmbi.ru.nl/molden/; + license = { + fullName = "Free for academic/non-profit use"; + url = http://www.cmbi.ru.nl/molden/CopyRight.html; + free = false; + }; + platforms = platforms.linux; + maintainers = with maintainers; [ markuskowa ]; + }; +} + diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2ff20fef40e89a0483c934c65cda111ed97fe700 --- /dev/null +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, symlinkJoin, gfortran, perl, procps +, libyaml, libxc, fftw, openblas, gsl +}: + +let + version = "7.2"; + fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; + +in stdenv.mkDerivation { + name = "octopus-${version}"; + + src = fetchurl { + url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; + sha256 = "03zzmq72zdnjkhifbmlxs7ig7x6sf6mv8zv9mxhakm9hzwa9yn7m"; + }; + + nativeBuildInputs = [ perl procps fftw.dev ]; + buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out ]; + + configureFlags = '' + --with-yaml-prefix=${libyaml} + --with-blas=-lopenblas + --with-lapack=-lopenblas + --with-fftw-prefix=${fftwAll} + --with-gsl-prefix=${gsl} + --with-libxc-prefix=${libxc} + ''; + + doCheck = false; + checkTarget = "check-short"; + + postPatch = '' + patchShebangs ./ + ''; + + postConfigure = '' + patchShebangs testsuite/oct-run_testsuite.sh + ''; + + meta = with stdenv.lib; { + description = "Real-space time dependent density-functional theory code"; + homepage = http://octopus-code.org; + maintainers = with maintainers; [ markuskowa ]; + license = licenses.gpl2; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix new file mode 100644 index 0000000000000000000000000000000000000000..e1db7131a65b0f61982e0604a853541188dce5db --- /dev/null +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -0,0 +1,70 @@ +{ atk +, buildFHSUserEnv +, cairo +, dpkg +, fetchurl +, gdk_pixbuf +, glib +, gtk2-x11 +, makeWrapper +, pango +, stdenv +, writeTextFile +, xorg +}: + +{ src, toolName, version, ... } @ attrs: +let + wrapBinary = libPaths: binaryName: '' + wrapProgram "$out/bin/${binaryName}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}" + ''; + pkg = stdenv.mkDerivation (rec { + inherit (attrs) version src; + + name = "${toolName}-${version}"; + + meta = with stdenv.lib; { + homepage = http://bitscope.com/software/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ + vidbina + ]; + } // (attrs.meta or {}); + + buildInputs = [ + dpkg + makeWrapper + ]; + + libs = attrs.libs or [ + atk + cairo + gdk_pixbuf + glib + gtk2-x11 + pango + xorg.libX11 + ]; + + dontBuild = true; + + unpackPhase = attrs.unpackPhase or '' + dpkg-deb -x ${attrs.src} ./ + ''; + + installPhase = attrs.installPhase or '' + mkdir -p "$out/bin" + cp -a usr/* "$out/" + ${(wrapBinary libs) attrs.toolName} + ''; + }); + fhs = target: buildFHSUserEnv { + inherit (pkg) name; + runScript = target; + }; +in buildFHSUserEnv { + name = "${attrs.toolName}-${attrs.version}"; + runScript = "${pkg.outPath}/bin/${attrs.toolName}"; +} // { inherit (pkg) meta name; } diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix new file mode 100644 index 0000000000000000000000000000000000000000..c10e9de851a4cb46701376e9a82cc170a190c3b9 --- /dev/null +++ b/pkgs/applications/science/electronics/bitscope/packages.nix @@ -0,0 +1,153 @@ +{ buildFHSUserEnv +, callPackage +, fetchurl +, makeWrapper +, stdenv +}: + +let + wrapBinary = libPaths: binaryName: '' + wrapProgram "$out/bin/${binaryName}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}" + ''; + mkBitscope = callPackage (import ./common.nix) { }; +in { + chart = let + toolName = "bitscope-chart"; + version = "2.0.FK22M"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Multi-channel waveform data acquisition and chart recording application"; + homepage = "http://bitscope.com/software/chart/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "08mc82pjamyyyhh15sagsv0sc7yx5v5n54bg60fpj7v41wdwrzxw"; + }; + }; + + console = let + toolName = "bitscope-console"; + version = "1.0.FK29A"; + in mkBitscope { + # NOTE: this is meant as a demo by BitScope + inherit toolName version; + + meta = { + description = "Demonstrative communications program designed to make it easy to talk to any model BitScope"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "00b4gxwz7w6pmfrcz14326b24kl44hp0gzzqcqxwi5vws3f0y49d"; + }; + }; + + display = let + toolName = "bitscope-display"; + version = "1.0.EC17A"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Display diagnostic application for BitScope"; + homepage = "http://bitscope.com/software/display/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "05xr5mnka1v3ibcasg74kmj6nlv1nmn3lca1wv77whkq85cmz0s1"; + }; + }; + + dso = let + toolName = "bitscope-dso"; + version = "2.8.FE22H"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Test and measurement software for BitScope"; + homepage = "http://bitscope.com/software/dso/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "0fc6crfkprj78dxxhvhbn1dx1db5chm0cpwlqpqv8sz6whp12mcj"; + }; + }; + + logic = let + toolName = "bitscope-logic"; + version = "1.2.FC20C"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Mixed signal logic timing and serial protocol analysis software for BitScope"; + homepage = "http://bitscope.com/software/logic/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "0lkb7z9gfkiyxdwh4dq1zxfls8gzdw0na1vrrbgnxfg3klv4xns3"; + }; + }; + + meter = let + toolName = "bitscope-meter"; + version = "2.0.FK22G"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Automated oscilloscope, voltmeter and frequency meter for BitScope"; + homepage = "http://bitscope.com/software/logic/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "0nirbci6ymhk4h4bck2s4wbsl5r9yndk2jvvv72zwkg21248mnbp"; + }; + }; + + proto = let + toolName = "bitscope-proto"; + version = "0.9.FG13B"; + in mkBitscope rec { + inherit toolName version; + # NOTE: this is meant as a demo by BitScope + # NOTE: clicking on logo produces error + # TApplication.HandleException Executable not found: "http://bitscope.com/blog/DK/?p=DK15A" + + meta = { + description = "Demonstrative prototype oscilloscope built using the BitScope Library"; + homepage = "http://bitscope.com/blog/DK/?p=DK15A"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "1ybjfbh3narn29ll4nci4b7rnxy0hj3wdfm4v8c6pjr8pfvv9spy"; + }; + }; + + server = let + toolName = "bitscope-server"; + version = "1.0.FK26A"; + in mkBitscope { + inherit toolName version; + + meta = { + description = "Remote access server solution for any BitScope"; + homepage = "http://bitscope.com/software/server/"; + }; + + src = fetchurl { + url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb"; + sha256 = "1079n7msq6ks0n4aasx40rd4q99w8j9hcsaci71nd2im2jvjpw9a"; + }; + }; +} diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index e866b947fbc21add0df1fc544d760a244b93f4f3..671c53365aba4ae69c7e32c17c4b7d42af872add 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.86"; + version = "3.3.89"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1l1hikhhk7drkbpdmj9qg7c3lj1b86z7f5rnwagrql8bss2j80fx"; + sha256 = "1j7byy0kmapa66dp17gjvs4pa4gckjccljydixswdknpxs5ma45g"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index dc13f751b89faf8c4fbb5141a280bd76aa5016ee..8e98bad55c3dfb20ffa950603c60539869cea646 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: +{ stdenv, fetchurl, fetchbzr, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: stdenv.mkDerivation rec { name = "kicad-${version}"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ]; + buildInputs = [ cmake libGLU_combined wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ]; # They say they only support installs to /usr or /usr/local, # so we have to handle this. diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix new file mode 100644 index 0000000000000000000000000000000000000000..7209ee3edf60dc322e5513db8993ee5b5b74b408 --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -0,0 +1,56 @@ +{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib +, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig +, doxygen, pcre, libpthreadstubs, libXdmcp + +, oceSupport ? true, opencascade_oce +, ngspiceSupport ? true, libngspice +, scriptingSupport ? true, swig, python, wxPython +}: + +assert ngspiceSupport -> libngspice != null; + +with lib; +stdenv.mkDerivation rec { + name = "kicad-unstable-${version}"; + version = "2018-03-10"; + + src = fetchFromGitHub { + owner = "KICad"; + repo = "kicad-source-mirror"; + rev = "17c0917dac12ea0be50ff95cee374a0cd8b7f862"; + sha256 = "1yn5hj5hjnpb5fkzzlyawg62a96fbfvha49395s22dcp95riqvf0"; + }; + + postPatch = '' + substituteInPlace CMakeModules/KiCadVersion.cmake \ + --replace no-vcs-found ${version} + ''; + + cmakeFlags = + optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ] + ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON" + ++ optionals (scriptingSupport) [ + "-DKICAD_SCRIPTING=ON" + "-DKICAD_SCRIPTING_MODULES=ON" + "-DKICAD_SCRIPTING_WXPYTHON=ON" + # nix installs wxPython headers in wxPython package, not in wxwidget + # as assumed. We explicitely set the header location. + "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" + ]; + + nativeBuildInputs = [ cmake doxygen pkgconfig ]; + buildInputs = [ + libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs + cairo curl openssl boost + ] ++ optional (oceSupport) opencascade_oce + ++ optional (ngspiceSupport) libngspice + ++ optionals (scriptingSupport) [ swig python wxPython ]; + + meta = { + description = "Free Software EDA Suite, Nightly Development Build"; + homepage = http://www.kicad-pcb.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ berce ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ea0ebd52b3ebd2bc2515934db04b91da5a0d2365 --- /dev/null +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, libGLU_combined, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "librepcb-${version}"; + version = "20171229"; + + src = fetchFromGitHub { + owner = "LibrePCB"; + repo = "LibrePCB"; + fetchSubmodules = true; + rev = "4efb06fa42755abc5e606da4669cc17e8de2f8c6"; + sha256 = "0r33fm1djqpy0dzvnf5gv2dfh5nj2acaxb7w4cn8yxdgrazjf7ak"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtbase ]; + + # LibrePCB still supports QT below 5.9. But some code lines break the build, so they are removed by this patch so that the software builds. + patches = [ ./fix-2017-12.patch ]; + + qmakeFlags = ["-r"]; + + meta = with stdenv.lib; { + description = "A free EDA software to develop printed circuit boards"; + homepage = http://librepcb.org/; + maintainers = with maintainers; [ luz ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch b/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch new file mode 100644 index 0000000000000000000000000000000000000000..75fc590ad7febe6633630c95a0974712810f2124 --- /dev/null +++ b/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch @@ -0,0 +1,29 @@ +--- a/libs/librepcb/common/fileio/serializableobjectlist.h ++++ b/libs/librepcb/common/fileio/serializableobjectlist.h +@@ -374,26 +374,6 @@ + } // namespace librepcb + + /***************************************************************************************** +- * Prevent from using SerializableObjectList in a foreach loop because it always would +- * create a deep copy of the list! You should use C++11 range based for loops instead. +- ****************************************************************************************/ +- +-#if (QT_VERSION > QT_VERSION_CHECK(5, 9, 0)) +-#define QFOREACHCONTAINER_TEMPLATE QtPrivate::QForeachContainer +-#else +-#define QFOREACHCONTAINER_TEMPLATE QForeachContainer +-#endif +- +-template +-class QFOREACHCONTAINER_TEMPLATE> { public: +- ~QForeachContainer() = delete; +-}; +-template +-class QFOREACHCONTAINER_TEMPLATE> { public: +- ~QForeachContainer() = delete; +-}; +- +-/***************************************************************************************** + * End of File + ****************************************************************************************/ + diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index ee7c0a5844d4a595698bc7d5a99172b7ac57fbaf..96025e8faa62e8755e2322d15759bed8da6b9f76 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,22 +1,23 @@ -{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}: +{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext, fftw}: stdenv.mkDerivation { - name = "ngspice-26"; + name = "ngspice-27"; src = fetchurl { - url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz"; - sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108"; + url = "mirror://sourceforge/ngspice/ngspice-27.tar.gz"; + sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c"; }; - buildInputs = [ readline libX11 flex bison libICE libXaw libXext ]; + nativeBuildInputs = [ flex bison ]; + buildInputs = [ readline libX11 libICE libXaw libXext fftw ]; - configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ]; + configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ]; meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = http://ngspice.sourceforge.net; license = with licenses; [ "BSD" gpl2 ]; - maintainers = with maintainers; [ viric rongcuid ]; + maintainers = with maintainers; [ bgamari viric rongcuid ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 6b792310e8b42cd0740b638892a6363795497a09..b9bbcd695f1722cb3a81c8365848b08cb13d14d5 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex +, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined +, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg +}: stdenv.mkDerivation rec { name = "pcb-${version}"; @@ -10,7 +13,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; + buildInputs = [ + gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper + libGLU_combined tcl shared-mime-info tk + gnome2.gtkglext pangox_compat gd xorg.libXmu + ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index a3f3b6b8933f4f27386713958f6485d4dab608b7..4e86d1d917f884b3a1c20473074dfbbdaa9b52b7 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "pulseview-0.4.0"; src = fetchurl { - url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz"; + url = "https://sigrok.org/download/source/pulseview/${name}.tar.gz"; sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 31c2d4f6475eef29728739da9696f0779e9b0706..75e99dcf6594f85eaf09c0dafe70c842b157b6b2 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "3.900"; + version = "3.922"; src = fetchurl { url = "http://www.veripool.org/ftp/${name}.tgz"; - sha256 = "0yvbibcysdiw6mphda0lfs56wz6v450px2420x0hbd3rc7k53s2b"; + sha256 = "1srv8d1w3mwblfydznl3frswg98i3dkylx8x18c4807wsjk8vflg"; }; enableParallelBuilding = true; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast and robust (System)Verilog simulator/compiler"; - homepage = "http://www.veripool.org/wiki/verilator"; + homepage = "https://www.veripool.org/wiki/verilator"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 968404362fcd0ca06ca48a73eb43ac8a4aca241b..7d71a56fa23e917f50ddccd79293e5e247b9ba80 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abella-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "http://abella-prover.org/distributions/${name}.tar.gz"; - sha256 = "1hnccjlyzwgz7kqsr4xmx9y4wmalbxsj0g6fxdk6xrgpc84ihw2c"; + sha256 = "0bry4pj6p9y7sg79ygdksynml4rdsjhqi959vnnwwsbaysa3bci0"; }; buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index bd4ccea231b3cc502e59f54327c4c5d222563c4d..9e6243c54980a68833b3d2b38cb659fb778d0e2f 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -21,15 +21,17 @@ stdenv.mkDerivation { }; buildInputs = with ocamlPackages; [ - ocaml findlib camlp4 ansiterminal biniou bolt ocaml_cairo2 dypgen easy-format ocf yojson + ocaml findlib camlp4 ansiterminal biniou bolt cairo2 dypgen easy-format ocf yojson ]; patches = [ ./install-emacs-to-site-lisp.patch ./use-nix-ocaml-byteflags.patch ]; - postPatch = stdenv.lib.optionalString (camlp4 != null) '' + postPatch = optionalString (camlp4 != null) '' substituteInPlace src/Makefile.master.in \ --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/" + '' + optionalString (versionAtLeast (stdenv.lib.getVersion ocamlPackages.yojson) "1.4") '' + substituteInPlace src/scripting/Makefile.in --replace yojson.cmo yojson.cma ''; # The bytecode executable is dependent on the dynamic library provided by diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index ee9e580a7b87f6909fe63d3f461d91888ac1ccc7..5e1a448a7cf99b14cf020b3ec447570e786beef4 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -1,34 +1,46 @@ -{ stdenv, fetchFromGitHub, zlib, boost, glucose }: +{ stdenv, fetchurl, fetchFromGitHub, zlib, boost, glucose }: + +let + glucose' = fetchurl { + url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz"; + sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld"; + }; +in + stdenv.mkDerivation rec { - name = "aspino-2016-01-31"; + name = "aspino-unstable-2017-03-09"; src = fetchFromGitHub { owner = "alviano"; repo = "aspino"; - rev = "d28579b5967988b88bce6d9964a8f0a926286e9c"; - sha256 = "0r9dnkq3rldv5hhnmycmzqyg23hv5w3g3i5a00a8zalnzfiyirnq"; + rev = "e31c3b4e5791a454e6602439cb26bd98d23c4e78"; + sha256 = "0annsjs2prqmv1lbs0lxr7yclfzh47xg9zyiq6mdxcc02rxsi14f"; }; buildInputs = [ zlib boost ]; - patchPhase = '' + postPatch = '' substituteInPlace Makefile \ --replace "GCC = g++" "GCC = c++" + + patchShebangs . ''; preBuild = '' - cp ${glucose.src} patches/glucose-syrup.tgz + cp ${glucose'} patches/glucose-syrup.tgz ./bootstrap.sh ''; installPhase = '' + runHook preInstall mkdir -p $out/bin install -m0755 build/release/{aspino,fairino-{bs,ls,ps},maxino-2015-{k16,kdyn}} $out/bin + runHook postInstall ''; meta = with stdenv.lib; { description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose"; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner ma27 ]; platforms = platforms.unix; license = licenses.asl20; homepage = http://alviano.net/software/maxino/; diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 379224c73f89fc1ab9811128a6d238202ac51d87..218006e15d5c6c46e5cd59d6ec9c17d9c7b84f58 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -12,7 +12,25 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake zlib boost.out boost.dev ]; - NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ] + # Squelch endless stream of warnings on same few things + ++ stdenv.lib.optionals stdenv.cc.isClang [ + "-Wno-empty-body" + "-Wno-tautological-compare" + "-Wc++11-compat-deprecated-writable-strings" + "-Wno-deprecated" + ]; + + prePatch = '' + sed -i -e '1i#include ' abc/src/bdd/dsd/dsd.h + substituteInPlace abc/src/bdd/dsd/dsd.h --replace \ + '((Child = Dsd_NodeReadDec(Node,Index))>=0);' \ + '((intptr_t)(Child = Dsd_NodeReadDec(Node,Index))>=0);' + + patch -p1 -d minisat -i ${./minisat-fenv.patch} + patch -p1 -d glucose -i ${./glucose-fenv.patch} + ''; + patches = [ ./0001-no-static-boost-libs.patch ]; diff --git a/pkgs/applications/science/logic/avy/glucose-fenv.patch b/pkgs/applications/science/logic/avy/glucose-fenv.patch new file mode 100644 index 0000000000000000000000000000000000000000..dd19f7ec80e7ba4a33759ecad3d4337286ff1788 --- /dev/null +++ b/pkgs/applications/science/logic/avy/glucose-fenv.patch @@ -0,0 +1,65 @@ +From d6e0cb60270e8653bda3f339e3a07ce2cd2d6eb0 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 17 Oct 2017 23:01:36 -0500 +Subject: [PATCH] glucose: use fenv to set double precision + +--- + core/Main.cc | 8 ++++++-- + simp/Main.cc | 8 ++++++-- + utils/System.h | 2 +- + 3 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/core/Main.cc b/core/Main.cc +index c96aadd..994132b 100644 +--- a/core/Main.cc ++++ b/core/Main.cc +@@ -96,8 +96,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("c WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/simp/Main.cc b/simp/Main.cc +index 4f4772d..70c2e4b 100644 +--- a/simp/Main.cc ++++ b/simp/Main.cc +@@ -97,8 +97,12 @@ int main(int argc, char** argv) + + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/utils/System.h b/utils/System.h +index 004d498..a768e99 100644 +--- a/utils/System.h ++++ b/utils/System.h +@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #define Glucose_System_h + + #if defined(__linux__) +-#include ++#include + #endif + + #include "glucose/mtl/IntTypes.h" +-- +2.14.2 + diff --git a/pkgs/applications/science/logic/avy/minisat-fenv.patch b/pkgs/applications/science/logic/avy/minisat-fenv.patch new file mode 100644 index 0000000000000000000000000000000000000000..686d5a1c5b4997e14d9bc377112f31fdfdfbbce4 --- /dev/null +++ b/pkgs/applications/science/logic/avy/minisat-fenv.patch @@ -0,0 +1,65 @@ +From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 17 Oct 2017 22:57:02 -0500 +Subject: [PATCH] use fenv instead of non-standard fpu_control + +--- + core/Main.cc | 8 ++++++-- + simp/Main.cc | 8 ++++++-- + utils/System.h | 2 +- + 3 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/core/Main.cc b/core/Main.cc +index 2b0d97b..8ad95fb 100644 +--- a/core/Main.cc ++++ b/core/Main.cc +@@ -78,8 +78,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/simp/Main.cc b/simp/Main.cc +index 2804d7f..39bfb71 100644 +--- a/simp/Main.cc ++++ b/simp/Main.cc +@@ -79,8 +79,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/utils/System.h b/utils/System.h +index 1758192..c0ad13a 100644 +--- a/utils/System.h ++++ b/utils/System.h +@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #define Minisat_System_h + + #if defined(__linux__) +-#include ++#include + #endif + + #include "mtl/IntTypes.h" +-- +2.14.2 + diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..da0e9bf1c1dd4a2ea155ab659869f820e3545bb2 --- /dev/null +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, ocamlPackages, omake }: + +stdenv.mkDerivation { + name = "beluga-20180403"; + + src = fetchFromGitHub { + owner = "Beluga-lang"; + repo = "Beluga"; + rev = "046aa59f008be70a7c4700b723bed0214ea8b687"; + sha256 = "0m68y0r0wdw3mg2jks68bihaww7sg305zdfnic1rkndq2cxv0mld"; + }; + + nativeBuildInputs = with ocamlPackages; [ findlib ocamlbuild omake ]; + buildInputs = with ocamlPackages; [ ocaml ulex ocaml_extlib ]; + + installPhase = '' + mkdir -p $out + cp -r bin $out/ + + mkdir -p $out/share/beluga + cp -r tools/ examples/ $out/share/beluga + + mkdir -p $out/share/emacs/site-lisp/beluga/ + cp -r tools/beluga-mode.el $out/share/emacs/site-lisp/beluga + ''; + + meta = { + description = "A functional language for reasoning about formal systems"; + homepage = http://complogic.cs.mcgill.ca/beluga/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.bcdarwin ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 2b40995b74338283438e235a8f1fea7287c5164a..aa815e48db4118b0e84626c64d4ace2a00316088 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, writeShellScriptBin }: stdenv.mkDerivation rec { name = "boolector-${version}"; @@ -8,6 +8,24 @@ stdenv.mkDerivation rec { sha256 = "0mdf7hwix237pvknvrpazcx6s3ininj5k7vhysqjqgxa7lxgq045"; }; + prePatch = + let + lingelingPatch = writeShellScriptBin "lingeling-patch" '' + sed -i -e "1i#include " lingeling/lglib.h + + ${crossFix}/bin/crossFix lingeling + ''; + crossFix = writeShellScriptBin "crossFix" '' + # substituteInPlace not available here + sed -i $1/makefile.in \ + -e 's@ar rc@$(AR) rc@' \ + -e 's@ranlib@$(RANLIB)@' + ''; + in '' + sed -i -e 's@mv lingeling\* lingeling@\0 \&\& ${lingelingPatch}/bin/lingeling-patch@' makefile + sed -i -e 's@mv boolector\* boolector@\0 \&\& ${crossFix}/bin/crossFix boolector@' makefile + ''; + installPhase = '' mkdir $out mv boolector/bin $out diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 1f7ef571eaf90284c0c9cb617a82026e35f6cfc9..64b0f85aed2ad6a840e9c110d024ca30b8ce1995 100644 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ b/pkgs/applications/science/logic/coq/8.4.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { fi } - envHooks=(''${envHooks[@]} addCoqPath) + addEnvHooks "$targetOffset" addCoqPath ''; passthru = { diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix deleted file mode 100644 index 968ea74e2960ba9417ffd686922bafa9f8c75bc0..0000000000000000000000000000000000000000 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ /dev/null @@ -1,81 +0,0 @@ -# - 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, ocamlPackages_4_02, ncurses, buildIde ? true, csdp ? null}: - -let - version = "2017-02-03"; - coq-version = "8.6"; - 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-unstable-${version}"; - - inherit coq-version; - inherit ocaml camlp5 findlib; - - src = fetchgit { - url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "078598d029792a3d9a54fae9b9ac189b75bc3b06"; - sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; - - postPatch = '' - UNAME=$(type -tp uname) - RM=$(type -tp rm) - substituteInPlace configure --replace "/bin/uname" "$UNAME" - substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - substituteInPlace configure.ml --replace "\"Darwin\"; \"FreeBSD\"; \"OpenBSD\"" "\"Darwinx\"; \"FreeBSD\"; \"OpenBSD\"" - ${csdpPatch} - ''; - - setupHook = writeText "setupHook.sh" '' - addCoqPath () { - if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then - export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/" - fi - } - - envHooks=(''${envHooks[@]} addCoqPath) - ''; - - preConfigure = '' - configureFlagsArray=( - -opt - ${ideFlags} - ) - ''; - - prefixKey = "-prefix "; - - buildFlags = "revision coq coqide"; - - meta = with stdenv.lib; { - description = "Coq proof assistant"; - longDescription = '' - Coq is a formal proof management system. It provides a formal language - to write mathematical definitions, executable algorithms and theorems - together with an environment for semi-interactive development of - machine-checked proofs. - ''; - homepage = http://coq.inria.fr; - license = licenses.lgpl21; - branch = coq-version; - maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index cdfd035c7139696f568443ca88b246e63fe527d8..2b35c91d10c4a10a48309f3751c94b76caf89543 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , ocamlPackages, ncurses , buildIde ? true , csdp ? null -, version ? "8.6.1" +, version }: let @@ -19,8 +19,10 @@ let "8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw"; "8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4"; "8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l"; - "8.7+beta2" = "1r274m44z774xigvj43g211ms9z9bwgyp1g43rvq4fswb3gzxc4b"; "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; + "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; + "8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w"; + "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; @@ -32,11 +34,9 @@ let self = stdenv.mkDerivation { name = "coq-${version}"; - inherit coq-version; - inherit camlp5; - inherit (ocamlPackages) ocaml; passthru = { - inherit (ocamlPackages) findlib; + inherit coq-version camlp5; + inherit (ocamlPackages) ocaml findlib num; emacsBufferSetup = pkgs: '' ; Propagate coq paths to children (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") @@ -91,7 +91,8 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ]; + buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.num ] + ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; postPatch = '' UNAME=$(type -tp uname) @@ -109,12 +110,11 @@ self = stdenv.mkDerivation { fi } - envHooks=(''${envHooks[@]} addCoqPath) + addEnvHooks "$targetOffset" addCoqPath ''; preConfigure = '' configureFlagsArray=( - -opt ${ideFlags} ) ''; @@ -123,8 +123,11 @@ self = stdenv.mkDerivation { buildFlags = "revision coq coqide bin/votour"; + createFindlibDestdir = true; + postInstall = '' cp bin/votour $out/bin/ + ln -s $out/lib/coq $OCAMLFIND_DESTDIR/coq ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 47077c2e255b66aee764232f25f1a3914c5d2437..3257977f5b5a90d527f4a08dfae0d7ac6cdafe8f 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cryptoverif-${version}"; - version = "1.22"; + version = "1.28"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "17fbmv0askgfnhs5a0ilhizvrr93jkmq82ybm3cgyxhh2zrk0rq1"; + sha256 = "0vssz751g1nn8wclkiwgghpm475jl00xkivc164vgbr9acxsr7n7"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 6b213226635dbd367824ddc56034a770bc1a1378..403eff216f53cc0569dea3a64fadeb4a124b9364 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -22,10 +22,17 @@ stdenv.mkDerivation rec { "--with-boost=${boost.dev}" ]; + prePatch = '' + patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat + patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat + ''; + preConfigure = '' patchShebangs ./src/ ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; homepage = http://cvc4.cs.nyu.edu/web/; diff --git a/pkgs/applications/science/logic/cvc4/minisat-fenv.patch b/pkgs/applications/science/logic/cvc4/minisat-fenv.patch new file mode 100644 index 0000000000000000000000000000000000000000..686d5a1c5b4997e14d9bc377112f31fdfdfbbce4 --- /dev/null +++ b/pkgs/applications/science/logic/cvc4/minisat-fenv.patch @@ -0,0 +1,65 @@ +From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 17 Oct 2017 22:57:02 -0500 +Subject: [PATCH] use fenv instead of non-standard fpu_control + +--- + core/Main.cc | 8 ++++++-- + simp/Main.cc | 8 ++++++-- + utils/System.h | 2 +- + 3 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/core/Main.cc b/core/Main.cc +index 2b0d97b..8ad95fb 100644 +--- a/core/Main.cc ++++ b/core/Main.cc +@@ -78,8 +78,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/simp/Main.cc b/simp/Main.cc +index 2804d7f..39bfb71 100644 +--- a/simp/Main.cc ++++ b/simp/Main.cc +@@ -79,8 +79,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/utils/System.h b/utils/System.h +index 1758192..c0ad13a 100644 +--- a/utils/System.h ++++ b/utils/System.h +@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #define Minisat_System_h + + #if defined(__linux__) +-#include ++#include + #endif + + #include "mtl/IntTypes.h" +-- +2.14.2 + diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..50454847baf1b7d92c6ffd47f7378b193826737c --- /dev/null +++ b/pkgs/applications/science/logic/drat-trim/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "drat-trim-2017-08-31"; + + src = fetchFromGitHub { + owner = "marijnheule"; + repo = "drat-trim"; + rev = "37ac8f874826ffa3500a00698910e137498defac"; + sha256 = "1m9q47dfnvdli1z3kb1jvvbm0dgaw725k1aw6h9w00bggqb91bqh"; + }; + + postPatch = '' + substituteInPlace Makefile --replace gcc cc + ''; + + installPhase = '' + install -Dt $out/bin drat-trim + ''; + + meta = with stdenv.lib; { + description = "A proof checker for unSAT proofs"; + longDescription = '' + DRAT-trim is a satisfiability proof checking and trimming + utility designed to validate proofs for all known satisfiability + solving and preprocessing techniques. DRAT-trim can also emit + trimmed formulas, optimized proofs, and TraceCheck+ dependency + graphs. + + DRAT-trim has been used as part of the judging process in the + annual SAT Competition in recent years, in order to check + competing SAT solvers' work when they claim that a SAT instance + is unsatisfiable. + ''; + homepage = https://www.cs.utexas.edu/~marijn/drat-trim/; + license = licenses.mit; + maintainers = with maintainers; [ kini ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a59528b86b0aa7ace184ac2288f7d3336ac8e8dc --- /dev/null +++ b/pkgs/applications/science/logic/elan/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "elan-${version}"; + version = "0.3.2"; + + cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2"; + + src = fetchFromGitHub { + owner = "kha"; + repo = "elan"; + rev = "v${version}"; + sha256 = "13r110382dh7848lpn3mrhc5bgmj373sbpx1326ryx3wl5kfp8rs"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ curl zlib openssl ]; + + cargoBuildFlags = [ "--features no-self-update" ]; + + postInstall = '' + pushd $out/bin + mv elan-init elan + for link in lean leanpkg leanchecker; do + ln -s elan $link + done + popd + + # tries to create .elan + export HOME=$(mktemp -d) + mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + $out/bin/elan completions bash > "$out/share/bash-completion/completions/elan" + $out/bin/elan completions fish > "$out/share/fish/vendor_completions.d/elan.fish" + $out/bin/elan completions zsh > "$out/share/zsh/site-functions/_elan" + ''; + + meta = with stdenv.lib; { + description = "Small tool to manage your installations of the Lean theorem prover"; + homepage = "https://github.com/Kha/elan"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 79c3b74e496be54578113fdcf23724b34a3ee773..44328eeb6bbb78a38eaa9b20dd86c0faae091acf 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, which }: + stdenv.mkDerivation rec { name = "eprover-${version}"; version = "2.0"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ which ]; preConfigure = '' - sed -e 's/ *CC *= gcc$//' -i Makefile.vars + sed -e 's/ *CC *= *gcc$//' -i Makefile.vars ''; configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man"; diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix index fd59a53fd2aeb4e108680910fc542482dd6d7b5b..30af3216737cb7b28626cc503f8b6df6a81cfd65 100644 --- a/pkgs/applications/science/logic/glucose/syrup.nix +++ b/pkgs/applications/science/logic/glucose/syrup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glucose }: +{ stdenv, zlib, glucose }: stdenv.mkDerivation rec { name = "glucose-syrup-${version}"; version = glucose.version; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index b3f0b3259277fe67a873ea9ddd5c0895ac3d35f0..095aa5a7f8c87e9f22c840aa71e6fd50f8d622c2 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0irh9b4haz0pzzxrb4hwcss91a0xb499kjrcrmr2s59p3zq8bbd9"; }; - buildInputs = [ gmp cmake ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ gmp ]; enableParallelBuilding = true; preConfigure = '' diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix index f0947fa0ed6e214239c6842d28299236ae3439e9..f33152a8767c5e662edb2801b5159973542a34b8 100644 --- a/pkgs/applications/science/logic/ltl2ba/default.nix +++ b/pkgs/applications/science/logic/ltl2ba/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ltl2ba-${version}"; - version = "1.1"; + version = "1.2b1"; src = fetchurl { url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${name}.tar.gz"; - sha256 = "16z0gc7a9dkarwn0l6rvg5jdhw1q4qyn4501zlchy0zxqddz0sx6"; + sha256 = "1f4jnkfkyj8lcc5qfqbiypfc11rhhpqqi6xs9xx5dysg6r6303wm"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index c9016a5ee0ce0d457cef5dbf5ef2c239d73c8e81..6e8797fcc40bfcd71b6ba871aba903cfecbb7786 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost, +{stdenv, fetchurl, cmake, subversion, libGLU_combined, qt5, boost, python27, python27Packages}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; - buildInputs = [ cmake mesa qt5.qtbase boost ]; + buildInputs = [ cmake libGLU_combined qt5.qtbase boost ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index b10ec814ff55226cf1aa548d6dd08c9d104073fb..6fcc8f9c111ff39f7fc28e55849abca7b86bcede 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -1,18 +1,18 @@ -# - coqide compilation can be disabled by setting lablgtk to null; - -{stdenv, fetchurl, pkgconfig, ocaml, camlp5}: +{ stdenv, fetchFromGitHub, pkgconfig, ocaml }: stdenv.mkDerivation rec { name = "ott-${version}"; - version = "0.25"; + version = "0.27"; - src = fetchurl { - url = "http://www.cl.cam.ac.uk/~pes20/ott/ott_distro_${version}.tar.gz"; - sha256 = "0i8ad1yrz9nrrgpi8db4z0aii5s0sy35mmzdfw5nq183mvbx8qqd"; + src = fetchFromGitHub { + owner = "ott-lang"; + repo = "ott"; + rev = version; + sha256 = "12hzpyinswqaxwp6y793h7ywrv6289cw4911ah2yzq04ji095pfb"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml camlp5 ]; + buildInputs = [ ocaml ]; installPhase = '' mkdir -p $out/bin @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/ott.opt $out/bin/ott mkdir -p $out/share/emacs/site-lisp - cp emacs/ottmode.el $out/share/emacs/site-lisp + cp emacs/ott-mode.el $out/share/emacs/site-lisp ''; meta = { diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index e026cfad218ee880feec0d8f23d5f219b384b63c..638996e853b8156425ec6021fd449dbcd1af5718 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -9,8 +9,19 @@ stdenv.mkDerivation rec { sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm"; }; + prePatch = '' + substituteInPlace picosat.c --replace "sys/unistd.h" "unistd.h" + + substituteInPlace makefile.in \ + --replace 'ar rc' '$(AR) rc' \ + --replace 'ranlib' '$(RANLIB)' + ''; + configurePhase = "./configure.sh --shared --trace"; + makeFlags = stdenv.lib.optional stdenv.isDarwin + "SONAME=-Wl,-install_name,$(out)/lib/libpicosat.so"; + installPhase = '' mkdir -p $out/bin $out/lib $out/share $out/include/picosat cp picomus picomcs picosat picogcnf "$out"/bin diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index a73feba97b641194e17bb59b46d94c4e3537a243..6bf19a2a2f4d78fc32218acbfb102299df9a3e19 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -1,23 +1,26 @@ -{stdenv, fetchurl, cmake}: +{ stdenv, fetchzip, cmake }: + stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "clingo"; version = "5.2.2"; - src = fetchurl { - url = "https://github.com/potassco/clingo/releases/v${version}.tar.gz"; - sha256 = "1kxzb385g8p9mqm1x9wvjrigifa09w6vj0wl7kradibm5qagh7ns"; + src = fetchzip { + url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz"; + sha256 = "04rjwpna37gzm8vxr09z3z6ay8y8cxbjd8lga7xvqfpn2l178zjm"; }; buildInputs = []; nativeBuildInputs = [cmake]; + cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ]; + meta = { inherit version; description = "ASP system to ground and solve logic programs"; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = "https://potassco.org/"; downloadPage = "https://github.com/potassco/clingo/releases/"; }; diff --git a/pkgs/applications/science/logic/sapic/default.nix b/pkgs/applications/science/logic/sapic/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..27efe865a9d96adbe48fd75cdf1cfeb469d5b748 --- /dev/null +++ b/pkgs/applications/science/logic/sapic/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip, ocaml }: + +stdenv.mkDerivation rec { + name = "sapic-${version}"; + version = "0.9"; + + src = fetchurl { + url = "http://sapic.gforge.inria.fr/${name}.zip"; + sha256 = "1ckl090lpyfh90mkjhnpcys5grs3nrl9wlbn9nfkxxnaivn2yx9y"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ ocaml ]; + patches = [ ./native.patch ]; # create a native binary, not a bytecode one + + buildPhase = "make depend && make"; + installPhase = '' + mkdir -p $out/bin + cp ./sapic $out/bin + ''; + + meta = { + description = "Stateful applied Pi Calculus for protocol verification"; + homepage = http://sapic.gforge.inria.fr/; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/logic/sapic/native.patch b/pkgs/applications/science/logic/sapic/native.patch new file mode 100644 index 0000000000000000000000000000000000000000..6e0b98113df2ef63d6e5b18ac7866d517cd25027 --- /dev/null +++ b/pkgs/applications/science/logic/sapic/native.patch @@ -0,0 +1,38 @@ +diff --git a/Makefile b/Makefile +index a1de94d..f9e2eb8 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,8 @@ + TARGET = sapic +-OBJS=lexer.cmo apip.cmo firsttranslation.cmo main.cmo #secondtranslation.cmo thirdtranslation.cmo main.cmo ++OBJS=lexer.cmx apip.cmx firsttranslation.cmx main.cmx + + sapic: $(OBJS) +- ocamlc -o $@ $(OBJS) ++ ocamlopt.opt -o $@ $(OBJS) + + depend: + ocamldep *.ml *.mli > .depend +@@ -13,17 +13,17 @@ clean: + rm -rf *.cmi *.cmo $(TARGET) + rm -rf apip.ml apip.mli lexer.ml lexer.mli + +-.SUFFIXES: .ml .mli .mll .mly .cmo .cmi ++.SUFFIXES: .ml .mli .mll .mly .cmo .cmi .cmx + +-.ml.cmo: +- ocamlc -c $< ++.ml.cmx: ++ ocamlopt.opt -c $< + .mli.cmi: +- ocamlc -c $< ++ ocamlopt.opt -c $< + .mll.ml: + ocamllex $< + .mly.ml: + ocamlyacc $< + .ml.mli: +- ocamlc -i $< > $@ ++ ocamlopt.opt -i $< > $@ + + -include .depend diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 8c0b82cc549c6d6d18ca93a8809be53b34de41f0..081dc788163b40c6a2874e59d292e26e8b30d43e 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -23,9 +23,13 @@ stdenv.mkDerivation rec { ) ''; + # `make -f lib/Interface/CMakeFiles/cppinterface.dir/build.make lib/Interface/CMakeFiles/cppinterface.dir/cpp_interface.cpp.o`: + # include/stp/AST/UsefulDefs.h:41:29: fatal error: stp/AST/ASTKind.h: No such file or directory + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "Simple Theorem Prover"; - maintainers = with maintainers; [ mornfall ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.mit; }; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 53e1a90f5b6a5bc1bd1576bfb786b8715aa5ce12..98acebcf2cc5012289f74bf1e9482fa711dd848e 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "symbiyosys-${version}"; - version = "2017.11.05"; + version = "2018.03.21"; src = fetchFromGitHub { - owner = "cliffordwolf"; + owner = "yosyshq"; repo = "symbiyosys"; - rev = "db9c7e97b8f84ef7e9b18ae630009897c7982a08"; - sha256 = "0pyznkjm0vjmaf6mpwknmh052qrwy2fzi05h80ysx1bxc51ns0m0"; + rev = "76a624a363bc44df102359595d34f29370c6668b"; + sha256 = "1ikax1yiqgj5442wcgp1iigw8wiyw7k848z4ykn7k068kbc320bm"; }; buildInputs = [ python3 yosys ]; @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" ''; meta = { - description = "Yosys verification tools for Hardware Definition Languages"; + description = "Tooling for Yosys-based verification flows"; homepage = https://symbiyosys.readthedocs.io/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7a9dcc231929fe4fd2c7e93bfe484ac286f7508f --- /dev/null +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -0,0 +1,90 @@ +{ haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib +# the following are non-haskell dependencies +, makeWrapper, which, maude, graphviz, sapic +}: + +let + version = "1.3.1"; + src = fetchFromGitHub { + owner = "tamarin-prover"; + repo = "tamarin-prover"; + rev = "120c7e706f3e1d4646b233faf2bc9936834ed9d3"; + sha256 = "064blwjjwnkycwgsrdn1xkjya976wndpz9h5pjmgjqqirinc8c5x"; + }; + + # tamarin has its own dependencies, but they're kept inside the repo, + # no submodules. this factors out the common metadata among all derivations + common = pname: src: { + inherit pname version src; + + license = lib.licenses.gpl3; + homepage = https://tamarin-prover.github.io; + description = "Security protocol verification in the symbolic model"; + maintainers = [ lib.maintainers.thoughtpolice ]; + }; + + # tamarin use symlinks to the LICENSE and Setup.hs files, so for these sublibraries + # we set the patchPhase to fix that. otherwise, cabal cries a lot. + replaceSymlinks = '' + cp --remove-destination ${src}/LICENSE .; + cp --remove-destination ${src}/Setup.hs .; + ''; + + tamarin-prover-utils = mkDerivation (common "tamarin-prover-utils" (src + "/lib/utils") // { + patchPhase = replaceSymlinks; + libraryHaskellDepends = with haskellPackages; [ + base base64-bytestring binary blaze-builder bytestring containers + deepseq dlist fclabels mtl pretty safe SHA syb time transformers + ]; + }); + + tamarin-prover-term = mkDerivation (common "tamarin-prover-term" (src + "/lib/term") // { + patchPhase = replaceSymlinks; + libraryHaskellDepends = (with haskellPackages; [ + attoparsec base binary bytestring containers deepseq dlist HUnit + mtl process safe + ]) ++ [ tamarin-prover-utils ]; + }); + + tamarin-prover-theory = mkDerivation (common "tamarin-prover-theory" (src + "/lib/theory") // { + patchPhase = replaceSymlinks; + doHaddock = false; # broken + libraryHaskellDepends = (with haskellPackages; [ + aeson aeson-pretty base binary bytestring containers deepseq dlist + fclabels mtl parallel parsec process safe text transformers uniplate + ]) ++ [ tamarin-prover-utils tamarin-prover-term ]; + }); + +in +mkDerivation (common "tamarin-prover" src // { + isLibrary = false; + isExecutable = true; + + # strip out unneeded deps manually + doHaddock = false; + enableSharedExecutables = false; + postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; + + # wrap the prover to be sure it can find maude, sapic, etc + executableToolDepends = [ makeWrapper which maude graphviz sapic ]; + postInstall = '' + wrapProgram $out/bin/tamarin-prover \ + --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]} + # so that the package can be used as a vim plugin to install syntax coloration + install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim + install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim + ''; + + checkPhase = "./dist/build/tamarin-prover/tamarin-prover test"; + + executableHaskellDepends = (with haskellPackages; [ + base binary binary-orphans blaze-builder blaze-html bytestring + cmdargs conduit containers deepseq directory fclabels file-embed + filepath gitrev http-types HUnit lifted-base mtl parsec process + resourcet safe shakespeare tamarin-prover-term + template-haskell text threads time wai warp yesod-core yesod-static + ]) ++ [ tamarin-prover-utils + tamarin-prover-term + tamarin-prover-theory + ]; +}) diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b1eb171b20b1a4dbce88cc35b4ab1528ff69b8dd --- /dev/null +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, jdk, jre, ant +}: + +stdenv.mkDerivation rec { + name = "tlaplus-${version}"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "tlaplus"; + repo = "tlaplus"; + rev = "refs/tags/v${version}"; + sha256 = "0966mvgxamknj4hsp980qbxwda886w1dv309kn7isxn0420lfv4f"; + }; + + buildInputs = [ makeWrapper jdk ant ]; + + buildPhase = "ant -f tlatools/customBuild.xml compile dist"; + installPhase = '' + mkdir -p $out/share/java $out/bin + cp tlatools/dist/*.jar $out/share/java + + makeWrapper ${jre}/bin/java $out/bin/tlc2 \ + --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC" + makeWrapper ${jre}/bin/java $out/bin/tla2sany \ + --add-flags "-cp $out/share/java/tla2tools.jar tla2sany.SANY" + makeWrapper ${jre}/bin/java $out/bin/pcal \ + --add-flags "-cp $out/share/java/tla2tools.jar pcal.trans" + makeWrapper ${jre}/bin/java $out/bin/tla2tex \ + --add-flags "-cp $out/share/java/tla2tools.jar tla2tex.TLA" + ''; + + meta = { + description = "An algorithm specification language with model checking tools"; + homepage = http://lamport.azurewebsites.net/tla/tla.html; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix new file mode 100644 index 0000000000000000000000000000000000000000..9a78c1df8b17c2691cdf722f073d527370d841c6 --- /dev/null +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -0,0 +1,56 @@ +{ lib +, fetchurl +, makeWrapper +, stdenv +, ocaml, gawk, isabelle, cvc3, perl, wget, which +}: + +stdenv.mkDerivation rec { + name = "tlaps-${version}"; + version = "1.4.3"; + src = fetchurl { + url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz"; + sha256 = "1w5z3ns5xxmhmp8r4x2kjmy3clqam935gmvx82imyxrr1bamx6gf"; + }; + + buildInputs = [ ocaml isabelle cvc3 perl wget which ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -pv "$out" + export HOME="$out" + export PATH=$out/bin:$PATH + + pushd zenon + ./configure --prefix $out + make + make install + popd + + pushd isabelle + isabelle build -b Pure + popd + + pushd tlapm + ./configure --prefix $out + make all + make install + ''; + + meta = { + description = "Mechanically check TLA+ proofs"; + longDescription = '' + TLA+ is a general-purpose formal specification language that is + particularly useful for describing concurrent and distributed + systems. The TLA+ proof language is declarative, hierarchical, + and scalable to large system specifications. It provides a + consistent abstraction over the various “backend” verifiers. + ''; + homepage = https://tla.msr-inria.inria.fr/tlaps/content/Home.html; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.badi ]; + }; + +} diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix new file mode 100644 index 0000000000000000000000000000000000000000..5ce359dea0ec9201d81511e35322d0472901213d --- /dev/null +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -0,0 +1,77 @@ +{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv +, jre, swt, gtk, libXtst, glib +}: + +let + version = "1.5.6"; + arch = "x86_64"; + + desktopItem = makeDesktopItem rec { + name = "TLA+Toolbox"; + exec = "tla-toolbox"; + icon = "tla-toolbox"; + comment = "IDE for TLA+"; + desktopName = name; + genericName = comment; + categories = "Application;Development"; + extraEntries = '' + StartupWMClass=TLA+ Toolbox + ''; + }; + + +in stdenv.mkDerivation { + name = "tla-toolbox-${version}"; + src = fetchzip { + url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; + sha256 = "1h63mcbrkf4jcg6qncpqffdi0x665z0wlfdq43d67p411xcqmbw9"; + }; + + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p "$out/bin" + cp -r "$src" "$out/toolbox" + chmod +w "$out/toolbox" "$out/toolbox/toolbox" + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/toolbox/toolbox" + + makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ + --run "set -x; cd $out/toolbox" \ + --add-flags "-data ~/.tla-toolbox" \ + --prefix PATH : "${jre}/bin" \ + --prefix LD_LIBRARY_PATH : "${swt}/lib:${gtk}/lib:${libXtst}/lib:${glib}/lib" + + echo -e "\nCreating TLA Toolbox icons..." + pushd "$src" + for icon_in in $(find . -path "./plugins/*/icons/full/etool16/tla_launch_check_wiz_*.png") + do + icon_size=$(echo $icon_in | grep -Po "wiz_\K[0-9]+") + icon_out="$out/share/icons/hicolor/$icon_size""x$icon_size/apps/tla-toolbox.png" + mkdir -p "$(dirname $icon_out)" + cp "$icon_in" "$icon_out" + done + popd + + echo -e "\nCreating TLA Toolbox desktop entry..." + cp -r "${desktopItem}/share/applications"* "$out/share/applications" + ''; + + meta = { + homepage = http://research.microsoft.com/en-us/um/people/lamport/tla/toolbox.html; + description = "IDE for the TLA+ tools"; + longDescription = '' + Integrated development environment for the TLA+ tools, based on Eclipse. You can use it + to create and edit your specs, run the PlusCal translator, view the pretty-printed + versions of your modules, run the TLC model checker, and run TLAPS, the TLA+ proof system. + ''; + # http://lamport.azurewebsites.net/tla/license.html + license = with lib.licenses; [ mit ]; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.badi ]; + }; +} diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 16ef277e930032fcfd1132db8b611fea49002582..a1d613e6295e90079f78ca263dee8752703d15d3 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "TPTP-${version}"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { url = [ "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz" "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}.tgz" ]; - sha256 = "13rm76lqlgbv15p8as0dpc74z2dfv5xydkhnd0hm3hhi3mn39dk9"; + sha256 = "0slqbqv4y43wz6wnh72s4n540ssapah0d12mndi0c7xr04kf2v2d"; }; buildInputs = [ tcsh yap perl patchelf ]; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 54c8caa99d8696aa07d03ff10e4b1dad179950aa..202d52f0cc0e9828b0cc4b242b7887a6e7300610 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "0.88.1"; + version = "0.88.3"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37185/why3-0.88.1.tar.gz; - sha256 = "1qj00963si0vdrqjp79ai27g9rr8sqvly6n6nwpga6bnss98xqkw"; + url = https://gforge.inria.fr/frs/download.php/file/37313/why3-0.88.3.tar.gz; + sha256 = "0limdqy9l5bjzwhdalcfdyh0b6laxgiphhvr4bby9p0030agssiy"; }; buildInputs = (with ocamlPackages; [ diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9ae5d75c45774d9f63831132ce6bfd1b50207c95 --- /dev/null +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkgs, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + name = "workcraft-${version}"; + version = "3.1.9"; + + src = fetchurl { + url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; + sha256 = "0d1mi8jffwr7irp215j9rfpa3nmwxrx6mv13bh7vn0qf6i0aw0xi"; + }; + + buildInputs = [ makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/share + cp -r * $out/share + mkdir $out/bin + makeWrapper $out/share/workcraft $out/bin/workcraft \ + --set JAVA_HOME "${jre}" \ + --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=gasp'; + ''; + + meta = { + homepage = http://workcraft.org/; + description = "Framework for interpreted graph modeling, verification and synthesis"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ timor ]; + inherit version; + }; +} diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index be25738a6076a1cad195cb67b064ba0c3e40e6a4..5eda2da6056617ac98ef5888694fb6f0dcbbbd55 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }: +{ stdenv, fetchFromGitHub, python, fixDarwinDylibNames }: -let - python = python2; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "z3-${version}"; - version = "4.5.0-2017-11-06"; + version = "4.6.0"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; - rev = "3350f32e1f2c01c9df63b7d71899796a18ce2272"; - sha256 = "00jn0njn5h9v49pl67yxj6225m6334ndrx6mp37vcqac05pdbpw7"; + rev = "b0aaa4c6d7a739eb5e8e56a73e0486df46483222"; + sha256 = "1cgwlmjdbf4rsv2rriqi2sdpz9qxihxrcpm6a4s37ijy437xg78l"; }; buildInputs = [ python fixDarwinDylibNames ]; + propagatedBuildInputs = [ python.pkgs.setuptools ]; enableParallelBuilding = true; configurePhase = '' diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 9d736694cbdc18cdd20f279be2925508955f4a37..0ac40b1e7d42aecf90c880337a9523299038c3b9 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig +{ stdenv, lib, fetchFromGitHub, fetchpatch, ccache, cmake, ctags, swig # data, compression , bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy # maths @@ -14,7 +14,6 @@ assert pythonSupport -> pythonPackages != null; assert opencvSupport -> opencv != null; stdenv.mkDerivation rec { - pname = "shogun"; version = "6.0.0"; name = pname + "-" + version; @@ -27,6 +26,18 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "Fix-meta-example-parser-bug-in-parallel-builds.patch"; + url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch"; + sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n"; + }) + (fetchpatch { + url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; + sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s"; + }) + ]; + CCACHE_DIR=".ccache"; buildInputs = with lib; [ @@ -41,11 +52,14 @@ stdenv.mkDerivation rec { ++ (optional (opencvSupport) "-DOpenCV=ON") ; + # Previous attempts to fix parallel builds (see patch above) were not entirely successful. + # Sporadic build failures still exist. Dislable parallel builds for now. + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; license = licenses.gpl3; maintainers = with maintainers; [ edwtjo ]; }; - } diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 91adb5283fdce11589fdcc911ca7058286c99411..a4247eac627b91df8605b43cccdd3c96219da69f 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -131,6 +131,7 @@ let name = "sundown"; src = "${distro_src}/pkg/sundown"; rockspec = "rocks/${name}-scm-1.rockspec"; + meta.broken = true; # 2018-04-11 }; cwrap = buildLuaRocks rec { @@ -289,6 +290,7 @@ let rev = "1e9e4f1e0bf589a0ed39f58acc185ec5e213d207"; sha256 = "1i1fpy9v6r4w3lrmz7bmf5ppq65925rv90gx39b3pykfmn0hcb9c"; }; + meta.broken = true; # 2018-04-11 }; luuid = stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index fd0ff24d58b3e885a382580e4179a91396e458fa..a9b2de1a00c5fdd2899b6ee5cba8cd18845f3dcb 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, fetchpatch +, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false }: stdenv.mkDerivation rec { - name = "R-3.4.2"; + name = "R-3.4.4"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0r0cv2kc3x5z9xycpnxx6fbvv22psw2m342jhpslbxkc8g1307lp"; + sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk"; }; buildInputs = [ @@ -19,10 +19,14 @@ stdenv.mkDerivation rec { pango pcre perl readline texLive xz zlib less texinfo graphviz icu pkgconfig bison imake which jdk openblas curl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch ]; + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" + ''; + preConfigure = '' configureFlagsArray=( --disable-lto @@ -40,8 +44,8 @@ stdenv.mkDerivation rec { --enable-R-shlib AR=$(type -p ar) AWK=$(type -p gawk) - CC=$(type -p gcc) - CXX=$(type -p g++) + CC=$(type -p cc) + CXX=$(type -p c++) FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" JAVA_HOME="${jdk}" RANLIB=$(type -p ranlib) @@ -50,9 +54,9 @@ stdenv.mkDerivation rec { --without-tcltk --without-aqua --disable-R-framework - CC="clang" - CXX="clang++" OBJC="clang" + CPPFLAGS="-isystem ${libcxx}/include/c++/v1" + LDFLAGS="-L${libcxx}/lib" '' + '' ) echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib" diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/pkgs/applications/science/math/R/setup-hook.sh index 09a775db9bf5b5d5c741cc98b285e8ace4c23081..6951e2a4b61bdab2f6df7aed0333d0d394c3cd2f 100644 --- a/pkgs/applications/science/math/R/setup-hook.sh +++ b/pkgs/applications/science/math/R/setup-hook.sh @@ -1,5 +1,7 @@ addRLibPath () { - addToSearchPath R_LIBS_SITE $1/library + if [[ -d "$1/library" ]]; then + addToSearchPath R_LIBS_SITE "$1/library" + fi } -envHooks+=(addRLibPath) +addEnvHooks "$targetOffset" addRLibPath diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fb76699b0c83cda18b018f9562abcf84cc0fa142 --- /dev/null +++ b/pkgs/applications/science/math/almonds/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, ncurses, pillow, pytest }: + +let + version = "1.25b"; +in + +buildPythonApplication { + name = "almonds-${version}"; + src = fetchFromGitHub { + owner = "Tenchi2xh"; + repo = "Almonds"; + rev = version; + sha256 = "0j8d8jizivnfx8lpc4w6sbqj5hq35nfz0vdg7ld80sc5cs7jr3ws"; + }; + + nativeBuildInputs = [ pytest ]; + buildInputs = [ ncurses ]; + propagatedBuildInputs = [ pillow ]; + + checkPhase = "py.test"; + + meta = with stdenv.lib; { + description = "Terminal Mandelbrot fractal viewer"; + homepage = https://github.com/Tenchi2xh/Almonds; + # No license has been specified + license = licenses.unfree; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8db4bd157df690549191c8a88187a814f241453f --- /dev/null +++ b/pkgs/applications/science/math/bcal/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "bcal-${version}"; + version = "1.8"; + + src = fetchFromGitHub { + owner = "jarun"; + repo = "bcal"; + rev = "v${version}"; + sha256 = "0jdn46wzwq7yn3x6p1xyqarp52pcr0ghnfhkm7nyxv734g1abw7r"; + }; + + nativeBuildInputs = [ python3Packages.pytest ]; + + doCheck = true; + checkPhase = '' + python3 -m pytest test.py + ''; + + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = { + description = "Storage conversion and expression calculator"; + homepage = https://github.com/jarun/bcal; + license = licenses.gpl3; + platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 8dc3e3ce43dca2ad7b1bff6456cb5534b1c856c3..d7357c5048d52d1a070c294172a384c9ef1408be 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -7,17 +7,19 @@ , hdf5-cpp , leveldb , lmdb -, opencv +, opencv3 , protobuf , snappy -, atlas , doxygen +, openblas , cudaSupport ? true, cudatoolkit , cudnnSupport ? false, cudnn ? null +, ncclSupport ? false, nccl ? null , pythonSupport ? false, python ? null, numpy ? null }: assert cudnnSupport -> cudaSupport; +assert ncclSupport -> cudaSupport; assert pythonSupport -> (python != null && numpy != null); stdenv.mkDerivation rec { @@ -35,14 +37,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen ]; - cmakeFlags = [ - "-DCUDA_ARCH_NAME=All" - (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") - ] ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON"; + cmakeFlags = + [ (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") + "-DBLAS=open" + ] ++ (if cudaSupport then [ + "-DCUDA_ARCH_NAME=All" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ] else [ "-DCPU_ONLY=ON" ]) + ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; - buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ] + buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv3 openblas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn + ++ lib.optional ncclSupport nccl ++ lib.optionals pythonSupport [ python numpy ]; propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 5787cb3d6b8b06499657499dfb33fbcdf36422be..efd38f053451ee0d6cde5952fba861dcb956c48a 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "calc-${version}"; - version = "2.12.6.3"; + version = "2.12.6.6"; src = fetchurl { url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"; - sha256 = "01m20s5zs74zyb23x6zg6i13gc30a2ay2iz1rdbkxram01cblzky"; + sha256 = "03sg1xhin6qsrz82scf96mmzw8lz1yj68rhj4p4npp4s0fawc9d5"; }; buildInputs = [ makeWrapper readline ncurses utillinux ]; diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 7643c912db4b9a03e90e9cc9048f9899407378b5..6de77d81be6f89ff27591cbe30dc4eb10783e55d 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2 }: stdenv.mkDerivation { - name = "cbc-2.9.5"; + name = "cbc-2.9.9"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.5.tgz"; - sha256 = "0kmsg9qpajh5jhnql04m6akpdjzlppxfz99q320vw5bkzgl3i18w"; + url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz"; + sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a"; }; configureFlags = "-C"; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 89ed0582b37efde4efee8f160f1b20d4a5311ec5..07740f4c8aeac2b33479d0d7199a2b3913927c40 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -12,28 +12,22 @@ let cub = fetchFromGitHub { owner = "NVlabs"; repo = "cub"; - rev = "1.4.1"; - sha256 = "1lcdwblz03c0yq1lxndg566kg14b5qm14x5qixjbmz6wq85kgmqc"; + rev = "1.7.4"; + sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66"; }; in stdenv.mkDerivation rec { name = "CNTK-${version}"; - version = "2.2"; + version = "2.4"; # Submodules src = fetchgit { url = "https://github.com/Microsoft/CNTK"; rev = "v${version}"; - sha256 = "0q4knrwiyphb2fbqf9jzqvkz2jzj6jmbmang3lavdvsh7z0n8zz9"; + sha256 = "0m28wb0ljixcpi14g3gcfiraimh487yxqhd9yrglgyvjb69x597y"; }; - patches = [ - # Fix "'exp' was not declared" - (fetchpatch { - url = "https://github.com/imriss/CNTK/commit/ef1cca6df95cc507deb8471df2c0dd8cbfeef23b.patch"; - sha256 = "0z7xyrxwric0c4h7rfs05f544mcq6d10wgs0vvfcyd2pcf410hy7"; - }) - ]; + patches = [ ./fix_std_bind.patch ]; nativeBuildInputs = [ cmake ]; @@ -48,8 +42,10 @@ in stdenv.mkDerivation rec { "--with-boost=${boost.dev}" "--with-protobuf=${protobuf}" "--with-mpi=${openmpi}" + "--cuda=${if cudaSupport then "yes" else "no"}" + # FIXME + "--asgd=no" ] ++ lib.optionals cudaSupport [ - "--cuda=yes" "--with-cuda=${cudatoolkit}" "--with-gdk-include=${cudatoolkit}/include" "--with-gdk-nvml-lib=${nvidia_x11}/lib" @@ -85,13 +81,10 @@ in stdenv.mkDerivation rec { cp bin/cntk $out/bin ''; - hardeningDisable = [ "format" ]; - - # on 2.2: fatal error: tensorboard/tensorboard.pb.h: No such file or directory - enableParallelBuilding = false; + enableParallelBuilding = true; meta = with lib; { - homepage = "https://github.com/Microsoft/CNTK"; + homepage = https://github.com/Microsoft/CNTK; description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/science/math/cntk/fix_std_bind.patch b/pkgs/applications/science/math/cntk/fix_std_bind.patch new file mode 100644 index 0000000000000000000000000000000000000000..df97a0c6666955f9bb722658461ecd3d478f60fd --- /dev/null +++ b/pkgs/applications/science/math/cntk/fix_std_bind.patch @@ -0,0 +1,11 @@ +diff -ru3 CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h +--- CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 1970-01-01 03:00:01.000000000 +0300 ++++ CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 2018-02-25 18:16:16.330269647 +0300 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + #include "CNTKLibrary.h" + #include "CNTKLibraryC.h" diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 44dc7af98c1af0878f29d3dad1c23b551d34e7db..7b768f7077e70b04645cd00a851db08fab3c78fb 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -2,7 +2,7 @@ let pname = "ecm"; - version = "6.4.4"; + version = "7.0.4"; name = "${pname}-${version}"; in @@ -10,8 +10,8 @@ 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/36224/ecm-${version}.tar.gz"; + sha256 = "0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc"; }; # See https://trac.sagemath.org/ticket/19233 diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index ccdd666e90bd5013808380012ba9ba9e7cfd0b3f..553905c21957b5da67baec741ffc9684b615f5ad 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: let - version = "1.3.1"; + version = "1.3.3"; name = "fricas-" + version; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://sourceforge.net/projects/fricas/files/fricas/${version}/${name}-full.tar.bz2"; - sha256 = "0c2wgj1c3mh5f8msx1ckxpnhm0dyq7dqf1wk6aiyysh8xn57cjkx"; + sha256 = "1avp9mbl5yn192c7kz5c2d18k33hay9lwii363b0v5hj3qgq2hhl"; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 3d9e06527c9d5aa41158f9f76d0cfc4cff267062..2927701dbd7158282c4bf608fc9badf4f530c01b 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,29 +1,80 @@ -{ stdenv, fetchurl, m4, gmp }: - -let - baseName = "gap"; - version = "4r8p3"; - - pkgVer = "2016_03_19-22_17"; -in +{ stdenv +, fetchurl +, fetchpatch +, m4 +, gmp +# don't remove any packages -- results in a ~1.3G size increase +# see https://github.com/NixOS/nixpkgs/pull/38754 for a discussion +, keepAllPackages ? true +}: stdenv.mkDerivation rec { - name = "${baseName}-${version}"; + pname = "gap"; + # https://www.gap-system.org/Releases/ + # newer versions (4.9.0) are available, but still considered beta (https://github.com/gap-system/gap/wiki/GAP-4.9-release-notes) + version = "4r8p10"; + pkgVer = "2018_01_15-13_02"; + name = "${pname}-${version}"; - src = fetchurl { - url = "ftp://ftp.gap-system.org/pub/gap/gap48/tar.gz/${baseName}${version}_${pkgVer}.tar.gz"; - sha256 = "1rmb0lj43avv456sjwb7ia3y0wwk5shlqylpkdwnnqpjnvjbnzv6"; + src = let + # 4r8p10 -> 48 + majorminor = stdenv.lib.replaceStrings ["r"] [""] ( + builtins.head (stdenv.lib.splitString "p" version) # 4r8p10 -> 4r8 + ); + in + fetchurl { + url = "https://www.gap-system.org/pub/gap/gap${majorminor}/tar.bz2/gap${version}_${pkgVer}.tar.bz2"; + sha256 = "0wzfdjnn6sfiaizbk5c7x44rhbfayis4lf57qbqqg84c7dqlwr6f"; }; + # remove all non-essential packages (which take up a lot of space) + preConfigure = stdenv.lib.optionalString (!keepAllPackages) '' + find pkg -type d -maxdepth 1 -mindepth 1 \ + -not -name 'GAPDoc-*' \ + -not -name 'autpgrp*' \ + -exec echo "Removing package {}" \; \ + -exec rm -r {} \; + ''; + configureFlags = [ "--with-gmp=system" ]; buildInputs = [ m4 gmp ]; - + + patches = [ + # fix infinite loop in writeandcheck() when writing an error message fails. + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/writeandcheck.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "1r1511x4kc2i2mbdq1b61rb6p3misvkf1v5qy3z6fmn6vqwziaz1"; + }) + ]; + + doCheck = true; + checkTarget = "testinstall"; + # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min. + # tests are run twice, once with all packages loaded and once without + # checkTarget = "teststandard"; + + preCheck = '' + # gap tests check that the home directory exists + export HOME="$TMP/gap-home" + mkdir -p "$HOME" + ''; + + postCheck = '' + # The testsuite doesn't exit with a non-zero exit code on failure. + # It leaves its logs in dev/log however. + + # grep for error messages + if grep ^##### dev/log/*; then + exit 1 + fi + ''; + postBuild = '' pushd pkg bash ../bin/BuildPackages.sh popd ''; - + installPhase = '' mkdir -p "$out/bin" "$out/share/gap/" @@ -31,7 +82,7 @@ stdenv.mkDerivation rec { sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" - ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin" + ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin/gap" ''; meta = with stdenv.lib; { @@ -42,6 +93,10 @@ stdenv.mkDerivation rec { chrisjefferson ]; platforms = platforms.all; + # keeping all packages increases the package size considerably, wchich + # is why a local build is preferable in that situation. The timeframe + # is reasonable and that way the binary cache doesn't get overloaded. + hydraPlatforms = stdenv.lib.optionals (!keepAllPackages) meta.platforms; license = licenses.gpl2; homepage = http://gap-system.org/; }; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index ef6b266eaaf2b4230b247a862602df083899d088..9e2c55d567cbf6704609f31db9bb8a1e9741097f 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5-0-382-0"; + version = "5-0-444-0"; preferLocalBuild = true; src = fetchurl { urls = [ - "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - - # Fallback for 5-0-382-0 - # To avoid breaks when latest geogebra version is - # removed from `download.geogebra.org` - "http://web.archive.org/web/20170818191250/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-382-0.tar.bz2" + "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "http://web.archive.org/web/20180325075100/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "0xqln1ssm35q8ry4a0ly8rkgw41brmrhn26l6q6r0qqrnw85cnyv"; + sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p"; }; srcIcon = fetchurl { diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 9a9a1ff762f191145739124f83ea9ccd6459fc2f..65d551f39a71047024b9c63c453707148dcaea23 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "gfan"; - version = "0.6"; + version = "0.6.2"; src = fetchurl { url = "http://home.math.au.dk/jensen/software/gfan/gfan${version}.tar.gz"; - sha256 = "02d6dvzfwy0lnidfgf98052jfqwy285nfm1h5nnx7jbgic1nnpgz"; + sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56"; }; makeFlags = ''PREFIX=$(out) CC=cc CXX=c++ cddnoprefix=1''; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 4ef00d56f1822e8a07c196bf71a969a65cd6cada..dd92e264889f1fd57c6b89e80a067c0e84dcefa1 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchurl, texlive, bison, flex +{ stdenv, fetchurl, fetchpatch, texlive, bison, flex , gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas , readline, gettext, libpng, libao, gfortran, perl -, enableGUI ? false, mesa ? null, xorg ? null, fltk ? null +, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null }: -assert enableGUI -> mesa != null && xorg != null && fltk != null; +assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; stdenv.mkDerivation rec { name = "${attr}-${version}"; attr = if enableGUI then "giac-with-xcas" else "giac"; - version = "1.4.9"; + version = "1.4.9-59"; src = fetchurl { - url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/giac-${version}.tar.bz2"; - sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai"; + url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; + sha256 = "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk"; }; + patches = stdenv.lib.optionals (!enableGUI) [ + # when enableGui is false, giac is compiled without fltk. That means some + # outputs differ in the make check. Patch around this: + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26"; + sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw"; + }) + ]; + postPatch = '' for i in doc/*/Makefile*; do substituteInPlace "$i" --replace "/bin/cp" "cp"; @@ -29,15 +38,19 @@ stdenv.mkDerivation rec { # perl is only needed for patchShebangs fixup. buildInputs = [ gmp mpfr pari ntl gsl blas mpfi liblapackWithAtlas - readline gettext libpng libao gfortran perl + readline gettext libpng libao perl + # gfortran.cc default output contains static libraries compiled without -fPIC + # we want libgfortran.so.3 instead + (stdenv.lib.getLib gfortran.cc) ] ++ stdenv.lib.optionals enableGUI [ - mesa fltk xorg.libX11 + libGLU_combined fltk xorg.libX11 ]; - outputs = [ "out" ]; + outputs = [ "out" "doc" ]; + + doCheck = true; enableParallelBuilding = true; - hardeningDisable = [ "format" "bindnow" "relro" ]; configureFlags = [ "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" @@ -54,6 +67,13 @@ stdenv.mkDerivation rec { for file in $(find $out -name Makefile) ; do sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ; done; + + # reference cycle + rm "$out/share/giac/doc/el/"{casinter,tutoriel}/Makefile + + mkdir -p "$doc/share/giac" + mv "$out/share/giac/doc" "$doc/share/giac" + mv "$out/share/giac/examples" "$doc/share/giac" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 1956ebdcb0f13c6177368d4ba053d35cc222fe78..944460de9c7540510edd7367866e2287c7d4d8b5 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: stdenv.mkDerivation rec { - name = "ginac-1.7.2"; + name = "ginac-1.7.4"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "1dyq47gc97jn1r5sy0klxs5b4lzhckyjqgsvwcs2a9ybqmhmpdr4"; + sha256 = "1vvqv73yk9klbq0mz239zzw77rlp72qcvzci4j1v6rafvji1616n"; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 3e4c8c70286951c4c8e35c9edc45b79afef639b0..798141b6b43838f73761f13768f3b494ceb2cbd2 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, mesa, freeglut +{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut , mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut mesa mysql.lib mpfr gmp + buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index bb24ac9bd49903e3510f87125487b4612b178e97..33b458ba30a31a4031bb30be3b3107b4672c3300 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg -, zlib, mesa, mesa_glu, xorg }: +, zlib, libGLU_combined, libGLU, xorg }: -let version = "3.0.5"; in +let version = "3.0.6"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "ae39ed81178d94b76990b8c89b69a5ded8910fd8f7426b800044d00373d12a93"; + sha256 = "0ywqhr0zmdhn8dvi6l8z1vkfycyv67fdrz6b95mb39np832bq04p"; }; # The original CMakeLists tries to use some version of the Lapack lib # that is supposed to work without Fortran but didn't for me. patches = [ ./CMakeLists.txt.patch ]; - buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa - mesa_glu xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext + buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib libGLU_combined + libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE ]; diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index a30343dd0b9edff573ed73a0c0a8dd66cef18fb7..2925e601e32bc067d963e69bf49e11729fd2bca1 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gfortran, openblas}: stdenv.mkDerivation rec { - name = "JAGS-4.1.0"; + name = "JAGS-4.3.0"; src = fetchurl { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; - sha256 = "08pmrnbwibc0brgn5cx860jcl0s2xaw4amw7g45649r1bcdz7v25"; + sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; }; buildInputs = [gfortran openblas]; configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ]; diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index efa0c1751d4c2dd9aa13de92c3520eea15147a2e..0cf834c8cdeac7e077153aebce95ce7177080c19 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "lp_solve-${version}"; - version = "5.5.2.0"; + version = "5.5.2.5"; src = fetchurl { url = "mirror://sourceforge/project/lpsolve/lpsolve/${version}/lp_solve_${version}_source.tar.gz"; - sha256 = "176c7f023mb6b8bfmv4rfqnrlw88lsg422ca74zjh19i2h5s69sq"; + sha256 = "12pj1idjz31r7c2mb5w03vy1cmvycvbkx9z29s40qdmkp1i7q6i0"; }; patches = [ ./isnan.patch ]; diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9e02b08c8ad07e81787bd73b941ce80b78d85e58 --- /dev/null +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromBitbucket +, fetchpatch +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "1.2"; + pname = "lrcalc"; + name = "${pname}-${version}"; + + src = fetchFromBitbucket { + owner = "asbuch"; + repo = "lrcalc"; + rev = "lrcalc-${version}"; + sha256 = "1c12d04jdyxkkav4ak8d1aqrv594gzihwhpxvc6p9js0ry1fahss"; + }; + + doCheck = true; + + nativeBuildInputs = [ + autoreconfHook + ]; + + patches = [ + # Fix include syntax: + # For private includes, use `#include "..."` instead of `#include <...>` + (fetchpatch { + url = "https://bitbucket.org/asbuch/lrcalc/commits/226981a0/raw/"; + sha256 = "02kaqx5s3l642rhh28kn2wg9wr098vzpknxyl4pv627lqa3lv9vm"; + }) + ]; + + meta = with stdenv.lib; { + description = "Littlewood-Richardson calculator"; + homepage = http://math.rutgers.edu/~asbuch/lrcalc/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index d6d3b505e35bbf46ad18a12724438ff1b1bfc08f..c3eeddef6694d408f07e74de53587642290fa5b3 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null, -tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false +{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null +, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false }: let @@ -11,6 +11,7 @@ let (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]); in stdenv.mkDerivation ({ + inherit version; name = "${name}-${version}"; src = fetchurl { @@ -18,8 +19,9 @@ stdenv.mkDerivation ({ sha256 = "0x0n81z0s4pl8nwpf7ivlsbvsdphm9w42250g7qdkizl0132by6s"; }; - buildInputs = stdenv.lib.filter (x: x != null) - [sbcl ecl texinfo perl python makeWrapper]; + buildInputs = stdenv.lib.filter (x: x != null) [ + sbcl ecl texinfo perl python makeWrapper + ]; postInstall = '' # Make sure that maxima can find its runtime dependencies. @@ -36,6 +38,39 @@ stdenv.mkDerivation ({ '') ; + patches = [ + # fix path to info dir (see https://trac.sagemath.org/ticket/11348) + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x"; + }) + + # fix https://sourceforge.net/p/maxima/bugs/2596/ + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; + }) + + # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca, see see https://trac.sagemath.org/ticket/13364#comment:93 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; + }) + + # upstream bug https://sourceforge.net/p/maxima/bugs/2520/ (not fixed) + # introduced in https://trac.sagemath.org/ticket/13364 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0xa0b6cr458zp7lc7qi0flv5ar0r3ivsqhjl0c3clv86di2y522d"; + }) + ] ++ stdenv.lib.optionals ecl-fasl [ + # build fasl, needed for ECL support + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; + }) + ]; + # Failures in the regression test suite won't abort the build process. We run # the suite only so that potential errors show up in the build log. See also: # http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933. @@ -57,10 +92,5 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; - broken = ecl != null; }; -} // (stdenv.lib.optionalAttrs ecl-fasl { - preConfigure = '' - sed -e '/c::build-program "binary-ecl\/maxima"/i(c::build-fasl "binary-ecl\/maxima.fasl" :lisp-files obj :ld-flags (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" (find-package "MAXIMA"))))) (if (and x (not (string= x ""))) (list x))))' -i src/maxima.system - ''; -})) +}) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index d2f3d0c5f33748ad5b5adf6fe8e2497ab4fc76dc..ce9c214b3f0cb3de87f9d130bff3462450502a1c 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -8,7 +8,7 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { name = "mxnet-${version}"; - version = "0.11.0"; + version = "1.1.0"; # Submodules needed src = fetchgit { @@ -23,9 +23,12 @@ stdenv.mkDerivation rec { ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; - cmakeFlags = [ - (if cudaSupport then "-DCUDA_ARCH_NAME=All" else "-DUSE_CUDA=OFF") - ] ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; + cmakeFlags = + (if cudaSupport then [ + "-DCUDA_ARCH_NAME=All" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ] else [ "-DUSE_CUDA=OFF" ]) + ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; installPhase = '' install -Dm755 libmxnet.so $out/lib/libmxnet.so @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; - homepage = "https://mxnet.incubator.apache.org/"; + homepage = https://mxnet.incubator.apache.org/; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8efe8d9da94117b446e1f938fab47a461f671fe4 --- /dev/null +++ b/pkgs/applications/science/math/nasc/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, bash +, gnused +, fetchFromGitHub +, gettext +, pkgconfig +, gtk3 +, granite +, gnome3 +, cmake +, ninja +, vala +, libqalculate +, elementary-cmake-modules +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "nasc-${version}"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "parnold-x"; + repo = "nasc"; + rev = version; + sha256 = "01n4ldj5phrsv97vb04qvs9c1ip6v8wygx9llj704hly1il9fb54"; + }; + + XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ + "${granite}/share" + "${gnome3.libgee}/share" + ]; + + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + vala + cmake + gettext + ]; + buildInputs = [ + libqalculate + gtk3 + granite + gnome3.libgee + gnome3.libsoup + gnome3.gtksourceview + ]; + + prePatch = '' + substituteInPlace ./libqalculatenasc/libtool \ + --replace "/bin/bash" "${bash}/bin/bash" \ + --replace "/bin/sed" "${gnused}/bin/sed" + substituteInPlace ./libqalculatenasc/configure.inc \ + --replace 'ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"' 'ac_default_path=$PATH' + ''; + + meta = with stdenv.lib; { + description = "Do maths like a normal person"; + longDescription = '' + It’s an app where you do maths like a normal person. It lets you + type whatever you want and smartly figures out what is math and + spits out an answer on the right pane. Then you can plug those + answers in to future equations and if that answer changes, so does + the equations it’s used in. + ''; + homepage = https://github.com/parnold-x/nasc; + maintainers = with maintainers; [ samdroid-apps ]; + platforms = platforms.linux; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 0bae807820591b1511c0c4f82b5c479d01871ba9..a1ddbd9ab17d4750c6de3e121a118fd8be94a7cb 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "pari-${version}"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7"; + sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g"; }; buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ]; diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index 007514e65528891af326b3ae239ef88845f2c1bc..b3e36b6bf20608543c3bb7311370a4bbfe1f42a3 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gp2c-${version}"; - version = "0.0.10"; + version = "0.0.10pl1"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz"; - sha256 = "1xhpz5p81iw261ay1kip283ggr0ir8ydz8qx3v24z8jfms1r3y70"; + sha256 = "16hgmdvzxbmv63x1f72q1xgfyh0qhx7kaf9nbaamy0gdawxjxcav"; }; buildInputs = [ pari perl ]; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 278194d57fa4a9545d7b94d70520f4bfe2323f01..ce3f975b85b82dd6c81220cf9118211cbf69e78e 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.1.0"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz"; - sha256 = "14q89l6laa7v7d9qx7v71a0r2m65saxqgr9r871fasm400a9x8pw"; + sha256 = "0j5wp6bmnwkyxlvqci6ddg478a0ms93gicvycw0c6bkvs2gd77az"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 24dc4436b0fd538bef20e6ec966cacb2e910b382..b74bcc3d63772426e449e1b0f78650d8fe6d64a3 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -18,21 +18,28 @@ # - https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath { stdenv +, bash , fetchurl , perl -, gfortran +, gfortran6 , python , autoreconfHook , gettext , which , texlive +, texinfo , hevea +, buildDocs ? false +, optimize ? false # optimize sage to the current system (obviously impure) }: stdenv.mkDerivation rec { - version = "8.0"; + version = "8.1"; name = "sage-${version}"; + # Modified version of patchShebangs that patches to the sage-internal version if possible + # and falls back to the system version if not. + patchSageShebangs = ./patchSageShebangs.sh; src = fetchurl { # Note that the source is *not* fetched from github, since that doesn't # the upstream folder with all the source tarballs of the spkgs. @@ -70,28 +77,31 @@ stdenv.mkDerivation rec { "http://www-ftp.lip6.fr/pub/math/sagemath/src/sage-${version}.tar.gz" "http://ftp.ntua.gr/pub/sagemath/src/sage-${version}.tar.gz" ]; - sha256 = "1a9rhb8jby6fdqa2s7n2fl9jwqqlsl7qz7dbpbwvg6jwlrvni7fg"; + sha256 = "1cpcs1mr0yii64s152xmxyd450bfzjb22jjj0zh9y3n6g9alzpyq"; }; postPatch = '' substituteAllInPlace src/bin/sage-env + bash=${bash} substituteAllInPlace build/bin/sage-spkg ''; installPhase = '' # Sage installs during first `make`, `make install` is no-op and just takes time. ''; - outputs = [ "out" "doc" ]; + outputs = [ "out" ] ++ stdenv.lib.optionals (buildDocs) [ "doc" ]; buildInputs = [ + bash # needed for the build perl # needed for the build python # needed for the build - gfortran # needed to build giac + gfortran6 # needed to build giac, openblas autoreconfHook # needed to configure sage with prefix gettext # needed to build the singular spkg - hevea # needed to build the docs of the giac spkg which # needed in configure of mpir - # needed to build the docs of the giac spkg + texinfo # needed to build maxima + ] ++ stdenv.lib.optionals(buildDocs) [ + hevea # needed to build the docs of the giac spkg (texlive.combine { inherit (texlive) scheme-basic collection-pstricks # needed by giac @@ -102,18 +112,22 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ gfortran6 perl which ]; + patches = [ # fix usages of /bin/rm ./spkg-singular.patch # help python find the crypt library - ./spkg-python2.patch - ./spkg-python3.patch + # patches python3 and indirectly python2, since those installation files are symlinked + ./spkg-python.patch # fix usages of /usr/bin/perl ./spkg-git.patch # fix usages of /bin/cp and add necessary argument to function call ./spkg-giac.patch # environment ./env.patch + # adjust wrapper shebang and patch shebangs after each spkg build + ./shebangs.patch ]; enableParallelBuilding = true; @@ -123,13 +137,15 @@ stdenv.mkDerivation rec { # TODO could be patched with `sed s|printf(ctime(\(.*\)))|%s... or fixed upstream ]; + configureFlags = stdenv.lib.optionals(buildDocs) [ "--docdir=$(doc)" ]; preConfigure = '' - export SAGE_NUM_THREADS=$NIX_BUILD_CORES - export SAGE_ATLAS_ARCH=fast + export SAGE_NUM_THREADS="$NIX_BUILD_CORES" - export HOME=$out/sage-home - mkdir -p $out/sage-home + export HOME=/tmp/sage-home + export SAGE_ROOT="$PWD" + export SAGE_SRC="$PWD" + mkdir -p "$HOME" mkdir -p "$out" # we need to keep the source around @@ -137,25 +153,56 @@ stdenv.mkDerivation rec { cd .. mv "$dir" "$out/sage-root" + export SAGE_SPKG_INSTALL_DOCS='no' cd "$out/sage-root" # build in target dir, since `make` is also `make install` + '' + + stdenv.lib.optionalString (buildDocs) '' + mkdir -p "$doc" + export SAGE_DOC="$doc" + export SAGE_DOCBUILD_OPTS="--no-pdf-links -k" + '' + + stdenv.lib.optionalString (!optimize) '' + export SAGE_FAT_BINARY=yes ''; + buildFlags = if (buildDocs) then "doc" else "build"; + # for reference: http://doc.sagemath.org/html/en/installation/source.html preBuild = '' - # TODO do this conditionally - export SAGE_SPKG_INSTALL_DOCS='no' - patchShebangs build + # symlink python to make sure the shebangs are patched to the sage path + # while still being able to use python before building it + # (this is important because otherwise sage will try to install python + # packages globally later on) + ln -s "${python}/bin/python2" $out/bin/python2 + ln -s "$out/bin/python2" $out/bin/python + touch $out/bin/python3 + bash $patchSageShebangs . ''; postBuild = '' + # Clean up rm -r "$out/sage-root/upstream" # don't keep the sources of all the spkgs - rm -r "$out/sage-root/src/build" - rm -rf "$out/sage-root/src/.git" + rm -rf "$out/sage-root/src/build" + rm -rf "$out/sage-root/src/autom4te.cache" + rm -rf "$out/sage-root/src/config" + rm -rf "$out/sage-root/src/m4" + rm -rf "$out/sage-root/.git" rm -r "$out/sage-root/logs" + rm -r "$out"/lib/python*/test # Fix dependency cycle between out and doc + rm -f "$out/sage-root/config.log" rm -f "$out/sage-root/config.status" rm -f "$out/sage-root/build/make/Makefile-auto" rm -f "$out/sage-home/.sage/gap/libgap-workspace-"* + # Make sure unnessessary packages don't end up in the build closure + find "$out" \ + -iname 'config.log' \ + -delete \ + -or -iname 'Makefile' \ + -delete + rm -f "$out/lib/R/etc/Renviron" + # Make sure all shebangs are properly patched + bash $patchSageShebangs $out ''; # TODO there are some doctest failures, which seem harmless. @@ -177,7 +224,7 @@ stdenv.mkDerivation rec { Mission: Creating a viable free open source alternative to Magma, Maple, Mathematica and Matlab. ''; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = ["x86_64-linux" "i686-linux"]; maintainers = with stdenv.lib.maintainers; [ timokau ]; }; } diff --git a/pkgs/applications/science/math/sage/patchSageShebangs.sh b/pkgs/applications/science/math/sage/patchSageShebangs.sh new file mode 100644 index 0000000000000000000000000000000000000000..6ddf93af01147f64627f16de351d0aee5e3150eb --- /dev/null +++ b/pkgs/applications/science/math/sage/patchSageShebangs.sh @@ -0,0 +1,51 @@ +# This is a slightly modified version of nix's default patchShebangs + +dir="$1" + +echo "patching sage internal script interpreter paths in $( readlink -f "$dir")" + +find "$dir" -type f -perm -0100 | while read f; do + if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then + # missing shebang => not a script + continue + fi + + oldInterpreterLine=$(head -1 "$f" | tail -c+3) + read -r oldPath arg0 args <<< "$oldInterpreterLine" + + if $(echo "$oldPath" | grep -q "/bin/env$"); then + # Check for unsupported 'env' functionality: + # - options: something starting with a '-' + # - environment variables: foo=bar + if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then + echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" + exit 1 + fi + executable="$arg0" + else + if [ "$oldPath" = "" ]; then + # If no interpreter is specified linux will use /bin/sh. Set + # oldpath="/bin/sh" so that we get /nix/store/.../sh. + oldPath="/bin/sh" + fi + executable="$(basename "$oldPath")" + args="$arg0 $args" + fi + + newPath="$(echo "$out/bin/$executable $args" | sed 's/[[:space:]]*$//')" + if [[ ! -x "$newPath" ]] ; then + newPath="$(command -v "$executable" || true)" + fi + + # Strip trailing whitespace introduced when no arguments are present + newInterpreterLine="$(echo "$newPath $args" | sed 's/[[:space:]]*$//')" + + if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then + if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then + echo "$f: sage interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" + # escape the escape chars so that sed doesn't interpret them + escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g') + sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" + fi + fi +done diff --git a/pkgs/applications/science/math/sage/shebangs.patch b/pkgs/applications/science/math/sage/shebangs.patch new file mode 100644 index 0000000000000000000000000000000000000000..96ed5a4bc6c3a18d00756e5d8ec9670ccb50166d --- /dev/null +++ b/pkgs/applications/science/math/sage/shebangs.patch @@ -0,0 +1,36 @@ +diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg +index 83e61a7e0d..942ba206c7 100755 +--- a/build/bin/sage-spkg ++++ b/build/bin/sage-spkg +@@ -648,8 +648,12 @@ if ! sage-apply-patches; then + error_msg "Error applying patches" + exit 1 + fi ++ ++@bash@/bin/bash @patchSageShebangs@ . ++ + cd .. + ++ + ################################################################## + # The package has been extracted, prepare for installation + ################################################################## +@@ -671,7 +675,7 @@ write_script_wrapper() { + local tmpscript="$(dirname "$script")/.tmp-${script##*/}" + + cat > "$tmpscript" <<__EOF__ +-#!/usr/bin/env bash ++#! @bash@/bin/bash + + export SAGE_ROOT="$SAGE_ROOT" + export SAGE_SRC="$SAGE_SRC" +@@ -833,6 +837,9 @@ if [ "$UNAME" = "CYGWIN" ]; then + sage-rebase.sh "$SAGE_LOCAL" 2>/dev/null + fi + ++@bash@/bin/bash @patchSageShebangs@ . ++@bash@/bin/bash @patchSageShebangs@ "$out/bin" ++ + echo "Successfully installed $PKG_NAME" + + if [ "$SAGE_CHECK" = "yes" ]; then diff --git a/pkgs/applications/science/math/sage/spkg-giac.patch b/pkgs/applications/science/math/sage/spkg-giac.patch index 15b91433d25442cda39c99e72e93c813e4ab1c2f..c79d4422133d71aa4ce0089c7292e8710de40db9 100644 --- a/pkgs/applications/science/math/sage/spkg-giac.patch +++ b/pkgs/applications/science/math/sage/spkg-giac.patch @@ -1,10 +1,19 @@ ---- old/build/pkgs/giac/spkg-install 2017-07-21 14:10:00.000000000 -0500 -+++ new/build/pkgs/giac/spkg-install 2017-10-15 15:55:55.321237645 -0500 -@@ -4,6 +4,8 @@ +diff --git a/build/pkgs/giac/spkg-install b/build/pkgs/giac/spkg-install +index bdd8df6cb8..3fd7a3ef8a 100644 +--- a/build/pkgs/giac/spkg-install ++++ b/build/pkgs/giac/spkg-install +@@ -2,6 +2,15 @@ ## Giac ########################################### -+find . -type f -exec sed -e 's@/bin/cp@cp@g' -i '{}' ';' && echo "Patching input parser" && find . -iname 'input_parser.cc' ++# Fix hardcoded paths, while making sure to only update timestamps of actually ++# changed files (otherwise confuses make) ++grep -rlF '/bin/cp' . | while read file ++do ++ sed -e 's@/bin/cp@cp@g' -i "$file" ++done ++ ++# Fix input parser syntax +sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc' if [ "$SAGE_LOCAL" = "" ]; then diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch index ff9a7b2e491a2de61d7f751f395afebfbe635a56..74f552dd3c3693494f1da261d9925613656c40e1 100644 --- a/pkgs/applications/science/math/sage/spkg-git.patch +++ b/pkgs/applications/science/math/sage/spkg-git.patch @@ -1,12 +1,17 @@ diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install -index 8469cb58c2..d0dc9a1db9 100755 +index 87874de3d8..b0906245fa 100644 --- a/build/pkgs/git/spkg-install +++ b/build/pkgs/git/spkg-install -@@ -35,6 +35,8 @@ fi +@@ -33,6 +33,13 @@ fi cd src -+find . -type f -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';' ++# Fix hardcoded paths, while making sure to only update timestamps of actually ++# changed files (otherwise confuses make) ++grep -rlF '/usr/bin/perl' . | while read file ++do ++ sed -e 's@/usr/bin/perl@perl@g' -i "$file" ++done + # We don't want to think about Fink or Macports export NO_FINK=1 diff --git a/pkgs/applications/science/math/sage/spkg-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch new file mode 100644 index 0000000000000000000000000000000000000000..e39981b6552a85bc0a291b50ff439fea239bd088 --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-python.patch @@ -0,0 +1,13 @@ +diff --git a/build/pkgs/python3/spkg-build b/build/pkgs/python3/spkg-build +index 56db087ae5..b450703c5f 100644 +--- a/build/pkgs/python3/spkg-build ++++ b/build/pkgs/python3/spkg-build +@@ -27,6 +27,8 @@ fi + export EXTRA_CFLAGS="`testcflags.sh -Wno-unused` $CFLAGS" + unset CFLAGS + ++export LDFLAGS="$LDFLAGS -lcrypt" ++ + if [ "$UNAME" = Darwin ]; then + PYTHON_CONFIGURE="--disable-toolbox-glue $PYTHON_CONFIGURE" + diff --git a/pkgs/applications/science/math/sage/spkg-python2.patch b/pkgs/applications/science/math/sage/spkg-python2.patch deleted file mode 100644 index 5d92d3f8beafc60e8b735affb5d6d029e6d89385..0000000000000000000000000000000000000000 --- a/pkgs/applications/science/math/sage/spkg-python2.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- old/build/pkgs/python2/spkg-install 2017-07-21 14:10:00.000000000 -0500 -+++ new/build/pkgs/python2/spkg-install 2017-10-15 11:26:54.823134067 -0500 -@@ -22,6 +22,9 @@ - - cd src - -+LDFLAGS="-lcrypt $LDFLAGS" -+export LDFLAGS -+ - if [ "$SAGE_DEBUG" = "yes" ]; then - echo "Building Python with pydebug" - PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug" diff --git a/pkgs/applications/science/math/sage/spkg-python3.patch b/pkgs/applications/science/math/sage/spkg-python3.patch deleted file mode 100644 index 51827fd11be05a082e382dfffdbecb3fee396dbf..0000000000000000000000000000000000000000 --- a/pkgs/applications/science/math/sage/spkg-python3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- old/build/pkgs/python3/spkg-install 2017-07-21 14:10:00.000000000 -0500 -+++ new/build/pkgs/python3/spkg-install 2017-10-15 13:11:17.769261404 -0500 -@@ -22,6 +22,9 @@ - - cd src - -+LDFLAGS="-lcrypt $LDFLAGS" -+export LDFLAGS -+ - if [ "$SAGE_DEBUG" = "yes" ]; then - echo "Building Python with pydebug" - PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug" diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch index d561768600b4be3effdca799a98f6287d5e82cda..606ffcd3ad4ed6a89c99c08f642d708039ec284c 100644 --- a/pkgs/applications/science/math/sage/spkg-singular.patch +++ b/pkgs/applications/science/math/sage/spkg-singular.patch @@ -1,11 +1,17 @@ ---- old/build/pkgs/singular/spkg-install 2017-10-15 10:35:41.826540964 -0500 -+++ new/build/pkgs/singular/spkg-install 2017-10-15 10:36:40.613743443 -0500 -@@ -4,6 +4,9 @@ +diff --git a/build/pkgs/singular/spkg-install b/build/pkgs/singular/spkg-install +index 8caafb1699..3c34e6608a 100644 +--- a/build/pkgs/singular/spkg-install ++++ b/build/pkgs/singular/spkg-install +@@ -2,6 +2,13 @@ ## Singular ########################################### -+find . -type f -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';' -+#echo '#!/usr/bin/env bash\nIgnoring missing $1' > src/build-aux/missing ++# Fix hardcoded paths, while making sure to only update timestamps of actually ++# changed files (otherwise confuses make) ++grep -rlF '/bin/rm' . | while read file ++do ++ sed -e 's@/bin/rm@rm@g' -i "$file" ++done + if [ -z "$SAGE_LOCAL" ]; then echo >&2 "Error: SAGE_LOCAL undefined -- exiting..." diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index f6e255ee46e4accbde6d8836225a486c981942de..154f1ba39e3c6d80ec2f0365bb049b825bf5e133 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, xlibs }: +{ stdenv, fetchurl, lib, xorg }: let name = "scilab-bin-${ver}"; @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ stdenv.cc.cc - xlibs.libX11 - xlibs.libXext - xlibs.libXi - xlibs.libXrender - xlibs.libXtst - xlibs.libXxf86vm + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + xorg.libXxf86vm ]; phases = [ "unpackPhase" "fixupPhase" "installPhase" ]; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 8cd9355a0f6318f8c18d3352f6d958f1fef7c3e1..882d481a7f98bf610762c61cf0edfcecd13f997c 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,23 +1,52 @@ { stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig -, asLibsingular ? false +, autoreconfHook +, flint +, ntl +, cddlib +, enableFactory ? true +, enableGfanlib ? true }: stdenv.mkDerivation rec { - name = "singular-${version}"; - version="3-1-7"; + name = "singular-${version}${patchVersion}"; + version = "4.1.1"; + patchVersion = "p1"; + urlVersion = builtins.replaceStrings [ "." ] [ "-" ] version; src = fetchurl { - url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version}/Singular-${version}.tar.gz"; - sha256 = "1j4mcpnwzdp3h4qspk6ww0m67rmx4s11cy17pvzbpf70lm0jzzh2"; + url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${urlVersion}/singular-${version}${patchVersion}.tar.gz"; + sha256 = "0wvgz7l1b7zkpmim0r3mvv4fp8xnhlbz4c7hc90rn30snlansnf1"; }; - buildInputs = [ gmp perl ncurses readline ]; - nativeBuildInputs = [ autoconf bison pkgconfig ]; + configureFlags = stdenv.lib.optionals enableFactory [ + "--enable-factory" + ] ++ stdenv.lib.optionals enableGfanlib [ + "--enable-gfanlib" + ]; + + postUnpack = '' + patchShebangs . + ''; + + # For reference (last checked on commit 75f460d): + # https://github.com/Singular/Sources/blob/spielwiese/doc/Building-Singular-from-source.md + # https://github.com/Singular/Sources/blob/spielwiese/doc/external-packages-dynamic-modules.md + buildInputs = [ + # necessary + gmp + # by upstream recommended but optional + ncurses + readline + ntl + flint + ] ++ stdenv.lib.optionals enableGfanlib [ + cddlib + ]; + nativeBuildInputs = [ autoconf bison perl pkgconfig autoreconfHook ]; preConfigure = '' find . -type f -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';' find . -type f -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';' - ${stdenv.lib.optionalString asLibsingular ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DLIBSINGULAR"''} ''; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; @@ -27,17 +56,21 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out" - cp -r Singular/LIB "$out/LIB" - make install${stdenv.lib.optionalString asLibsingular "-libsingular"} - - binaries="$(find "$out"/* \( -type f -o -type l \) -perm -111 \! -name '*.so' -maxdepth 1)" - ln -s "$out"/*/{include,lib} "$out" - mkdir -p "$out/bin" - for b in $binaries; do - bbn="$(basename "$b")" - echo -e '#! ${stdenv.shell}\n"'"$b"'" "$@"' > "$out/bin/$bbn" - chmod a+x "$out/bin/$bbn" - done + cp -r Singular/LIB "$out/lib" + make install + + # Make sure patchelf picks up the right libraries + rm -rf libpolys factory resources omalloc Singular + ''; + + # simple test to make sure singular starts and finds its libraries + doInstallCheck = true; + installCheckPhase = '' + $out/bin/Singular -c 'LIB "freegb.lib"; exit;' + if [ $? -ne 0 ]; then + echo >&2 "Error loading the freegb library in Singular." + exit 1 + fi ''; enableParallelBuilding = true; @@ -47,7 +80,7 @@ stdenv.mkDerivation rec { 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; + homepage = http://www.singular.uni-kl.de; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; }; } diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 18cb268906343c6ab9945926b9ac81ed462233c2..3bfb22dad93634682cea92f2668efdfdf2c29cf5 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -1,35 +1,31 @@ -{ stdenv, fetchurl, jre, unzip }: +{ stdenv, fetchurl, jre, unzip, makeWrapper }: stdenv.mkDerivation rec { name = "weka-${version}"; - version = "3.8.1"; + version = "3.9.2"; src = fetchurl { url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip"; - sha256 = "16n1a74d1cispp0a22zyiivi78izi354y67gmbyvv2lv9sc45wmk"; + sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; - buildInputs = [ unzip ]; + buildInputs = [ unzip makeWrapper ]; # The -Xmx1000M comes suggested from their download page: # http://www.cs.waikato.ac.nz/ml/weka/downloading.html installPhase = '' - mkdir -pv $out/share/weka $out/bin + mkdir -pv $out/share/weka cp -Rv * $out/share/weka - cat > $out/bin/weka << EOF - #!${stdenv.shell} - ${jre}/bin/java -Xmx1000M -jar $out/share/weka/weka.jar - EOF - - chmod +x $out/bin/weka + makeWrapper ${jre}/bin/java $out/bin/weka \ + --add-flags "-Xmx1000M -jar $out/share/weka/weka.jar" ''; meta = { homepage = http://www.cs.waikato.ac.nz/ml/weka/; description = "Collection of machine learning algorithms for data mining tasks"; license = stdenv.lib.licenses.gpl2Plus; - maintainer = [stdenv.lib.maintainers.mimadrid]; + maintainers = [ stdenv.lib.maintainers.mimadrid ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 6c866a8d21640a4a5b29ec5cdc2a4211d8f706c8..67cdaa4055ac8c70d587198315806bc9d2bd81cd 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,28 +1,26 @@ { stdenv, fetchFromGitHub -, wrapGAppsHook, autoreconfHook, gettext +, wrapGAppsHook, cmake, gettext , maxima, wxGTK, gnome3 }: stdenv.mkDerivation rec { name = "wxmaxima-${version}"; - version = "17.10.1"; + version = "18.02.0"; src = fetchFromGitHub { owner = "andrejv"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "088h8dlc9chkppwl4ck9i0fgf2d1dcpi5kq8qbpr5w75vhwsb6qm"; + sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa"; }; buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; - nativeBuildInputs = [ wrapGAppsHook autoreconfHook gettext ]; + nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; preConfigure = '' gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; - doCheck = true; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index d8e8d49bb706a31ee2da283a1e7c168a8569ff22..ff25bc97490073235d3ccd156168026ee9abe2b5 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, mesa }: +{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU_combined }: with stdenv.lib; stdenv.mkDerivation { @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; postInstall = let - libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ]; + libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU_combined ]; in '' ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 716d6d9687c59535e9fa61710e2a26f84cb96fb0..a1b8769617c9fc0a21ee2eeddde5ed2a41851742 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, -mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, +libGLU_combined, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; buildInputs = [ - curl mesa libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver + curl libGLU_combined libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver libnotify patchelf libX11 libxcb xcbutil ]; diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index d5ffe9cd9ba89d6dcae35069f9901010ee306956..36c7884d108bf215f6f5e40ae2e7db8ab2fdd2b4 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.5.1"; + version = "3.6.1"; src = fetchurl { url = "http://chianti.ucsd.edu/${name}/${name}.tar.gz"; - sha256 = "1dvv0f7sc7q7lwmpd7xkcx86dd8lxh2il3wiwkij44gh7ni1qkfm"; + sha256 = "1pkdilv1nw6vvdxk71bwjngr8yafrsqwaqvlakhp8yb342r1jd4s"; }; buildInputs = [jre makeWrapper]; diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 6736ce7589733e5feda49b6957ccb8c2f742bd60..3a0bcb66813e2329e9d90fa3de2fdf3f431c350a 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -1,37 +1,64 @@ -{stdenv, fetchurl, jdk}: +{ stdenv, fetchFromGitHub, callPackage, jdk, maven, javaPackages }: -with stdenv.lib; +let + version = "0.9.2"; -let version = "0.9.1"; in -stdenv.mkDerivation { - name = "gephi-${version}"; - - src = fetchurl { - url = "https://github.com/gephi/gephi/releases/download/v${version}/gephi-${version}-linux.tar.gz"; - sha256 = "f1d54157302df05a53b94e1518880c949c43ba4ab21e52d57f3edcbdaa06c7ee"; + src = fetchFromGitHub { + owner = "gephi"; + repo = "gephi"; + rev = "v${version}"; + sha256 = "0kqp2nvnsb55j1axb6hk0mlw5alyaiyb70z0mdybhpqqxyw2da2r"; }; - meta = { - inherit version; - description = "A platform for visualizing and manipulating large graphs"; - homepage = https://gephi.org; - license = licenses.gpl3; - maintainers = [maintainers.taeer]; - platforms = platforms.linux; + # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) + deps = stdenv.mkDerivation { + name = "gephi-${version}-deps"; + inherit src; + buildInputs = [ jdk maven ]; + buildPhase = '' + while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do + echo "timeout, restart maven to continue downloading" + done + ''; + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif"; }; +in +stdenv.mkDerivation rec { + name = "gephi-${version}"; + + inherit src; - buildInputs = [jdk]; + buildInputs = [ jdk maven ]; - configurePhase = " - echo \"jdkhome=${jdk}\" >> etc/gephi.conf - "; + buildPhase = '' + # 'maven.repo.local' must be writable so copy it out of nix store + mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + ''; - dontBuild = true; + installPhase = '' + cp -r modules/application/target/gephi $out - installPhase = " - mkdir $out - for a in ./*; do - mv $a $out - done - "; + # remove garbage + find $out -type f -name .lastModified -delete + find $out -type f -regex '.+\.exe' -delete + + # use self-compiled JOGL to avoid patchelf'ing .so inside jars + rm $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-{jogl,gluegen}/*.jar + cp ${javaPackages.jogl_2_3_2}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/ + cp ${javaPackages.jogl_2_3_2}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/ + + echo "jdkhome=${jdk}" >> $out/etc/gephi.conf + ''; + + meta = with stdenv.lib; { + description = "A platform for visualizing and manipulating large graphs"; + homepage = https://gephi.org; + license = licenses.gpl3; + maintainers = [ maintainers.taeer ]; + platforms = [ "x86_64-linux" ]; + }; } diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 5fe72e44842d2bf7d03cda94b57d49828d7728e8..5b210fa4bf6bf4ab5c74c68987d3c645dde2a0a5 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, fetchgit -, wxGTK, perl, python2, zlib, mesa, libX11 +, wxGTK, perl, python2, zlib, libGLU_combined, libX11 , automake, autoconf }: let @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [autoconf automake]; buildInputs = [ - wxGTK perl python2 zlib mesa libX11 + wxGTK perl python2 zlib libGLU_combined libX11 ]; # Link against Python explicitly as it is needed for scripts diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index f4bf24a734338226f8705690708ad0ce206671aa..8ecbf656a821355270fc66f7c37237a4d3ffb0ca 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, wxGTK, perl, python2, zlib, mesa, libX11}: +{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}: stdenv.mkDerivation rec { baseName="golly"; version = "3.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - wxGTK perl python2 zlib mesa libX11 + wxGTK perl python2 zlib libGLU_combined libX11 ]; setSourceRoot = '' diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index c8f89c398b12677b94715a6b904f7c58800c6799..8b6c7497e547cbc0ee314cd93bb55c61e563afb8 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal +{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU_combined, glew, gdal_1_11, cgal , proj, boost, cmake, python2, doxygen, graphviz, gmp }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 + qt4 qwt6_qt4 libGLU_combined glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ]; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index fb3b0a29724b90ef982ff9acc68aff88d5affa64..b139f30b3d18776f91426ab0c6c14d8ea9e233f7 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ mdaiter ]; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 177f8ca256493237e75b669e0faa52ceb37f3268..ef539ac9c8df36a33928527b20d17670cc2c58c5 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -3,14 +3,13 @@ , gmp, mpfr, glog, google-gflags, libjpeg_turbo }: stdenv.mkDerivation rec { - name = "openmvs-unstable-2017-05-01"; + name = "openmvs-unstable-2018-05-26"; src = fetchFromGitHub { owner = "cdcseacave"; repo = "openmvs"; - - rev = "a3b360016660a1397f6eb6c070c2c19bbb4c7590"; - sha256 = "170ff4ipix2kqq5rhb1yrrcvc79im9qgp5hiwsdr23xxzdl21221"; + rev = "939033c55b50478339084431aac2c2318041afad"; + sha256 = "12dgkwwfdp24581y3i41gsd1k9hq0aw917q0ja5s0if4qbmc8pni"; }; buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 676395d03d539fd2408e65317aff33ec262bd8b6..00ca1d2c7abe88504e15bcccca81eb172dbd918c 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lz4, lzma, gsl, xxHash +, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.10.08"; + version = "6.12.06"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "12mddl6pqwwc9nr4jqzp6h1jm4zycazd3v88dz306m1nmk97dlic"; + sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d0a4f74924c5e00a2edebae4c4def5d9418a3c98 --- /dev/null +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -0,0 +1,60 @@ +{lib, fetchgit, gcc, python}: + +let + xhtml2pdf = import ./xhtml2pdf.nix { inherit lib; + fetchPypi = python.pkgs.fetchPypi; + buildPythonPackage = python.pkgs.buildPythonPackage; + html5lib = python.pkgs.html5lib; + httplib2 = python.pkgs.httplib2; + nose = python.pkgs.nose; + pillow = python.pkgs.pillow; + pypdf2 = python.pkgs.pypdf2; + reportlab = python.pkgs.reportlab; +}; + +in + +python.pkgs.buildPythonApplication rec { + pname = "sasview"; + version = "4.1.2"; + + buildInputs = with python.pkgs; [ + pytest + unittest-xml-reporting]; + + propagatedBuildInputs = with python.pkgs; [ + bumps + gcc + h5py + libxslt + lxml + matplotlib + numpy + pyparsing + periodictable + pillow + pylint + pyopencl + reportlab + sasmodels + scipy + six + sphinx + wxPython + xhtml2pdf]; + + src = fetchgit { + url = "https://github.com/SasView/sasview.git"; + rev = "v${version}"; + sha256 ="05la54wwzzlkhmj8vkr0bvzagyib6z6mgwqbddzjs5y1wd48vpcx"; + }; + + patches = [./pyparsing-fix.patch ./local_config.patch]; + + meta = { + homepage = https://www.sasview.org; + description = "Fitting and data analysis for small angle scattering data"; + maintainers = with lib.maintainers; [ rprospero ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/applications/science/misc/sasview/local_config.patch b/pkgs/applications/science/misc/sasview/local_config.patch new file mode 100644 index 0000000000000000000000000000000000000000..91972a913bc4e5915fc2d5125caaa36ddbcf1521 --- /dev/null +++ b/pkgs/applications/science/misc/sasview/local_config.patch @@ -0,0 +1,10 @@ +--- a/src/sas/_config.py ++++ b/src/sas/_config.py +@@ -70,2 +70,2 @@ +- logger.critical("Error loading %s: %s", path, exc) +- sys.exit() ++ import sas.sasview.local_config ++ return sas.sasview.local_config +-- +2.15.0 + diff --git a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..7729292cb3441a99b907e20cee3486f65a78425f --- /dev/null +++ b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch @@ -0,0 +1,8 @@ +--- a/setup.py ++++ b/setup.py +@@ -5,1 +5,1 @@ +- 'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing<2.0.0', ++ 'bumps>=0.7.5.9', 'periodictable>=1.5.0', +-- +2.15.0 + diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix new file mode 100644 index 0000000000000000000000000000000000000000..0b3d438843da87f46f831d07e03516c2d042dec5 --- /dev/null +++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix @@ -0,0 +1,32 @@ +{lib, fetchPypi, buildPythonPackage, html5lib, httplib2, nose, pillow, pypdf2, reportlab}: + +let + #xhtml2pdf specifically requires version "1.0b10" of html5lib + html5 = html5lib.overrideAttrs( oldAttrs: rec{ + version = "1.0b10"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1yd068a5c00wd0ajq0hqimv7fd82lhrw0w3s01vbhy9bbd6xapqd"; + }; + }); +in + +buildPythonPackage rec { + pname = "xhtml2pdf"; + version = "0.2.1"; + + buildInputs = [html5]; + propagatedBuildInputs = [httplib2 nose pillow pypdf2 reportlab html5]; + + src = fetchPypi { + inherit pname version; + sha256 = "1n9r8zdk9gc2x539fq60bhszmd421ipj8g78zmsn3njvma1az9k1"; + }; + + meta = { + description = "A pdf converter for the ReportLab Toolkit"; + homepage = https://github.com/xhtml2pdf/xhtml2pdf; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 8a3645705ab5c1ef0b806531cea34d856ef9c8be..34ff510e1d8b91aa6bc2256afdc41aff683456db 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,75 +1,106 @@ -{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_3, graphviz, libsigcxx -, libunwind, elfutils, python3, doxygen +{ stdenv, fetchFromGitHub, cmake, elfutils, perl, python3, boost, valgrind +# Optional requirements +# Lua 5.3 needed and not available now +#, luaSupport ? false, lua5 +, fortranSupport ? false, gfortran +, buildDocumentation ? false, transfig, ghostscript, doxygen +, buildJavaBindings ? false, openjdk +, modelCheckingSupport ? false, libunwind, libevent # Inside elfutils - , libelf, libevent, libdw +, debug ? false +, moreTests ? false }: -stdenv.mkDerivation rec { - version = "3.15"; - name = "simgrid-${version}"; +# helpers for options +let optionals = stdenv.lib.optionals; + optionalString = stdenv.lib.optionalString; + optionOnOff = option: "${if option then "on" else "off"}"; +in - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/36621/${name}.tar.gz"; - sha256 = "1s595wc4z8hkvim3ypfdxy16pply6ckjg10v84cc0lx9pz6i3r6i"; +stdenv.mkDerivation rec { + major_version = "3"; + minor_version = "17"; + version = "v${major_version}.${minor_version}"; + tagged_version = "${major_version}_${minor_version}"; + name = "simgrid"; + + src = fetchFromGitHub { + owner = "simgrid"; + repo = "simgrid"; + rev = "v3_17"; + sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4"; + #rev = "master"; + #sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm"; }; - buildInputs = [ cmake perl ruby boost lua5_3 graphviz libsigcxx libunwind - elfutils python3 doxygen - ]; + nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind] + ++ optionals fortranSupport [gfortran] + ++ optionals buildJavaBindings [openjdk] + ++ optionals buildDocumentation [transfig ghostscript doxygen] + ++ optionals modelCheckingSupport [libunwind libevent]; + + #buildInputs = optional luaSupport lua5; preConfigure = # Make it so that libsimgrid.so will be found when running programs from # the build dir. - '' export LD_LIBRARY_PATH="$PWD/src/.libs" - export cmakeFlags="-Dprefix=$out" - - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE - -isystem $(echo "${libsigcxx}/lib/"sigc++*/include) - -isystem $(echo "${libsigcxx}/include"/sigc++* ) - " - export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${libsigcxx}/lib/"sigc++*)" - - # Enable more functionality. - export cmakeFlags="$cmakeFlags -Denable_tracing=on -Denable_jedule=on - -Denable_latency_bound_tracking=on -Denable_lua=on - -Denable_ns3=off -Denable_gtnets=on - " + '' + export LD_LIBRARY_PATH="$PWD/build/lib" ''; - makeFlags = "VERBOSE=1"; + # Release mode is not supported in SimGrid + cmakeBuildType = "Debug"; + + # Disable/Enable functionality + # Note: those packages are not packaged in Nixpkgs yet so some options + # are disabled: + # - papi: for enable_smpi_papi + # - ns3: for enable_ns3 + # - lua53: for enable_lua + # + # For more information see: + # http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list + cmakeFlags= '' + -Denable_documentation=${optionOnOff buildDocumentation} + -Denable_java=${optionOnOff buildJavaBindings} + -Denable_fortran=${optionOnOff fortranSupport} + -Denable_model-checking=${optionOnOff modelCheckingSupport} + -Denable_ns3=off + -Denable_lua=off + -Denable_lib_in_jar=off + -Denable_maintainer_mode=off + -Denable_mallocators=on + -Denable_debug=on + -Denable_smpi=on + -Denable_smpi_ISP_testsuite=${optionOnOff moreTests} + -Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests} + -Denable_compile_warnings=${optionOnOff debug} + -Denable_compile_optimizations=${optionOnOff (!debug)} + -Denable_lto=${optionOnOff (!debug)} + ''; + #-Denable_lua=${optionOnOff luaSupport} + #-Denable_smpi_papi=${optionOnOff moreTests} + + makeFlags = optionalString debug "VERBOSE=1"; preBuild = - /* Work around this: - - [ 20%] Generating _msg_handle_simulator.c, _msg_handle_client.c, _msg_handle_server.c - cd /tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/build/teshsuite/gras/msg_handle && ../../../bin/gras_stub_generator msg_handle /tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/teshsuite/gras/msg_handle/msg_handle.xml - ../../../bin/gras_stub_generator: error while loading shared libraries: libsimgrid.so.3.5: cannot open shared object file: No such file or directory - make[2]: *** [teshsuite/gras/msg_handle/_msg_handle_simulator.c] Error 127 - make[2]: Leaving directory `/tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/build' - - */ - '' export LD_LIBRARY_PATH="$PWD/lib:$LD_LIBRARY_PATH" - echo "\$LD_LIBRARY_PATH is \`$LD_LIBRARY_PATH'" + '' + # Some perl scripts are called to generate test during build which + # is before the fixupPhase of nix, so do this manualy here: + patchShebangs .. ''; - patchPhase = - '' for i in "src/smpi/"* - do - test -f "$i" && - sed -i "$i" -e's|/bin/bash|/bin/sh|g' - done + doCheck = true; + checkPhase = '' + runHook preCheck - for i in $(grep -rl /usr/bin/perl .) - 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. - doCheck = false; + ctest --output-on-failure -E smpi-replay-multiple - meta = { - description = "Simulator for distributed applications in heterogeneous environments"; + runHook postCheck + ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { + description = "Framework for the simulation of distributed applications"; longDescription = '' SimGrid is a toolkit that provides core functionalities for the simulation of distributed applications in heterogeneous distributed @@ -78,12 +109,9 @@ stdenv.mkDerivation rec { scheduling on distributed computing platforms ranging from simple network of workstations to Computational Grids. ''; - homepage = http://simgrid.gforge.inria.fr/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = with maintainers; [ mickours ]; + platforms = platforms.x86_64; + license = licenses.lgpl2Plus; }; } diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 9b8035fcefe70e9995e06d2ca68d12fa7c5be1e5..8560d900a4fa27e59168a5ae3b70bb32fa4791d9 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,16 +1,16 @@ -{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 +{ fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4 , cmake, makeWrapper, libjpeg, python }: -let version = "4.9.0"; in +let version = "5.1.0"; in stdenv.mkDerivation rec { name = "tulip-${version}"; src = fetchurl { url = "mirror://sourceforge/auber/${name}_src.tar.gz"; - sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3"; + sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h"; }; - buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ]; + buildInputs = [ libxml2 freetype glew libGLU_combined qt4 libjpeg python ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 510c56b66c88356f015ea61968fca75eb29f376f..64482ddd74bcce0dfd8f3c011c228d3ab5ad68b7 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -1,4 +1,4 @@ -{ fetchsvn, stdenv, cmake, qt4, mesa }: +{ fetchsvn, stdenv, cmake, qt4, libGLU_combined }: # ViTE 1.1 has several bugs, so use the SVN version. let @@ -23,7 +23,7 @@ stdenv.mkDerivation { ln -sv "${externals}" externals ''; - buildInputs = [ cmake qt4 mesa ]; + buildInputs = [ cmake qt4 libGLU_combined ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 351bcccd45d8cfd538e3bd563d9108bb1c8defd2..ae21af65584c60913bd9fc3cb38280100e433af9 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { - name = "gromacs-4.6.7"; + name = "gromacs-2018"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.7.tar.gz"; - sha256 = "6afb1837e363192043de34b188ca3cf83db6bd189601f2001a1fc5b0b2a214d9"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.tar.gz"; + sha256 = "1sfh3wdrw07797xm86fq10r0024ym585yyrnhdh0qam596vx1dfy"; }; buildInputs = [cmake fftw] diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 8ed8e0e73b000ff5b75225852b90e6564e0513d5..3bfb70f5ce8ecd0a895b63b00c578c9c331bcf95 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}: stdenv.mkDerivation { - name = "fdr-4.2.0"; + name = "fdr-4.2.3"; src = fetchurl { - url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3754-linux-x86_64.tar.gz; - sha256 = "d24492485db9b8b95c62c53a6396094f836ee079cfc743688a397503c3ec9bf8"; + url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz; + sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88"; }; libPath = stdenv.lib.makeLibraryPath [ @@ -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}/$qtPluginPrefix $out/lib/qt_plugins + ln -s ${qtbase.bin}/${qtbase.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/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index eb157e8b99f553d7bbf37c1e191e17b8067c8b96..f46f7afb659c789af43f78de2dfcdaf6e4350fb8 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free cross-platform programming exerciser"; - Homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/; + homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/; license = licenses.gpl3; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 98ec39eb206422d39aeacd141da14b161d8d1f0a..95462c02eb5b784b58f1ac57363522d089eac7df 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake +{ stdenv, fetchgit, git, espeak, SDL2, udev, doxygen, cmake , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns -, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake +, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech , makeWrapper, lndir , gst_all_1, qt-gstreamer1, pkgconfig, glibc -, version ? "2.9.4" }: stdenv.mkDerivation rec { name = "qgroundcontrol-${version}"; + version = "3.3.0"; qtInputs = [ qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg - qtquick1 qtquickcontrols qtgraphicaleffects + qtquick1 qtquickcontrols qtgraphicaleffects qtspeech ]; gstInputs = with gst_all_1; [ @@ -19,72 +19,54 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs; + buildInputs = [ SDL2 udev doxygen git ] ++ gstInputs ++ qtInputs; nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; - patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; - postPatch = '' - sed '1i#include ' -i src/Vehicle/Vehicle.cc \ - -i src/comm/{QGCFlightGearLink,QGCJSBSimLink}.cc \ - -i src/{uas/UAS,ui/QGCDataPlot2D}.cc - ''; - preConfigure = '' mkdir build cd build ''; - qmakeFlags = [ "../qgroundcontrol.pro" ]; + qmakeFlags = [ + # Default install tries to copy Qt files into package + "CONFIG+=QGC_DISABLE_BUILD_SETUP" + "../qgroundcontrol.pro" + ]; installPhase = '' cd .. + mkdir -p $out/share/applications - cp -v qgroundcontrol.desktop $out/share/applications - + cp -v deploy/qgroundcontrol.desktop $out/share/applications + mkdir -p $out/bin - cp -v build/release/qgroundcontrol "$out/bin/" - + cp -v build/release/QGroundControl "$out/bin/" + mkdir -p $out/share/qgroundcontrol cp -rv resources/ $out/share/qgroundcontrol - + mkdir -p $out/share/pixmaps cp -v resources/icons/qgroundcontrol.png $out/share/pixmaps - - # 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/qt-$qtCompatVersion $out/etc/xdg - for pkg in $qtInputs; 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 - done - fi - done ''; - postInstall = '' wrapProgram "$out/bin/qgroundcontrol" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; - # TODO: package mavlink so we can build from a normal source tarball src = fetchgit { url = "https://github.com/mavlink/qgroundcontrol.git"; rev = "refs/tags/v${version}"; - sha256 = "0isr0zamhvr853c94lblazkilil6zzmvf7afs3mxgn07jn9wrqz3"; + sha256 = "0abjm0wywp24qlgg9w8g35ijprjg5csq4fgba9caaiwvmpfbhmpw"; fetchSubmodules = true; }; - meta = { + meta = with stdenv.lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = http://qgroundcontrol.org/; - 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 + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ pxc ]; }; } diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index 76b05c8a3a7189b81bc2345e328573d89dbedf93..98576cfd09175f8ddfbe4c341d0b7ddae3b68e47 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "yarp-${version}"; - version = "2.3.68"; + version = "2.3.70.2"; src = fetchFromGitHub { owner = "robotology"; repo = "yarp"; rev = "v${version}"; - sha256 = "1ksz2kv4v14fqgz3fsvvmdk2sikhnxr11jhhf7c2547x6jbzhda6"; + sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a"; }; buildInputs = [ cmake ace ]; diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 0952b61551e31cd535b52eca1e4c7a73f370af86..4b3ef167d53275c94bb5a0a171bb8da204e3767d 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchPypi, unzip, buildPythonApplication, makeDesktopItem # mandatory -, qtpy, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil -, pyflakes, rope, sphinx, nbconvert, mccabe +, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil +, pyflakes, rope, sphinx, nbconvert, mccabe, pyopengl, cloudpickle # optional , numpy ? null, scipy ? null, matplotlib ? null # optional @@ -10,17 +10,21 @@ buildPythonApplication rec { pname = "spyder"; - version = "3.2.4"; - namePrefix = ""; + version = "3.2.8"; src = fetchPypi { inherit pname version; - sha256 = "028hg71gfq2yrplwhhl7hl4rbwji1l0zxzghblwmb0i443ki10v3"; + sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5"; }; + # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing? + postPatch = '' + substituteInPlace setup.py --replace 'pyqt5;python_version>="3"' ' ' + ''; + propagatedBuildInputs = [ - jedi pycodestyle psutil qtpy pyflakes rope numpy scipy matplotlib pylint - numpydoc qtconsole qtawesome nbconvert mccabe + jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint + numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle ]; # There is no test for spyder diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index f6df5fc496d79bea464b82728380bf98d4c2ab1d..adf0f51fc4cc51d6bba6f8e5ca3f986d6c91e124 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils, - gnome3, pythonPackages, wrapGAppsHook }: +{ stdenv, fetchurl, file, which, intltool, gobjectIntrospection, + findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme, + wrapGAppsHook +}: pythonPackages.buildPythonApplication rec { majorver = "1.4"; - minorver = "2"; + minorver = "4"; version = "${majorver}.${minorver}"; - name = "catfish-${version}"; + pname = "catfish"; src = fetchurl { - url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${name}.tar.bz2"; - sha256 = "0j3by9yfs4j9za3s5qdxrsm7idmps69pimc9d0mjyakvviy0izm3"; + url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${pname}-${version}.tar.gz"; + sha256 = "1mw7py6si6y88jblmzm04hf049bpww7h87k2wypq07zm1dw55m52"; }; nativeBuildInputs = [ @@ -17,6 +19,7 @@ pythonPackages.buildPythonApplication rec { file which intltool + gobjectIntrospection wrapGAppsHook ]; @@ -26,6 +29,7 @@ pythonPackages.buildPythonApplication rec { pythonPackages.pyxdg pythonPackages.ptyprocess pythonPackages.pycairo + hicolor-icon-theme ]; propagatedBuildInputs = [ @@ -35,17 +39,20 @@ pythonPackages.buildPythonApplication rec { findutils ]; - preFixup = '' - rm "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.pyc" - for f in \ - "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \ - "$out/share/applications/catfish.desktop" - do - substituteInPlace $f --replace "${pythonPackages.python}" "$out" - done + # Explicitly set the prefix dir in "setup.py" because setuptools is + # not using "$out" as the prefix when installing catfish data. In + # particular the variable "__catfish_data_directory__" in + # "catfishconfig.py" is being set to a subdirectory in the python + # path in the store. + postPatch = '' + sed -i "/^ if self.root/i\\ self.prefix = \"$out\"" setup.py ''; + # Disable check because there is no test in the source distribution + doCheck = false; + meta = with stdenv.lib; { + homepage = https://launchpad.net/catfish-search; description = "A handy file search tool"; longDescription = '' Catfish is a handy file searching tool. The interface is @@ -53,9 +60,8 @@ pythonPackages.buildPythonApplication rec { You can configure it to your needs by using several command line options. ''; - homepage = https://launchpad.net/catfish-search; license = licenses.gpl2Plus; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index 3a9df15057423af8680f80f9cbd682a9157a7228..ba9fbee5d96967ab8e7fc35819d15010fd45f51c 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { buildInputs = [ libextractor gettext ]; src = fetchurl { - url = "http://grothoff.org/christian/doodle/download/${name}.tar.gz"; + url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz"; sha256 = "0ayx5q7chzll9sv3miq35xl36r629cvgdzphf379kxzlzhjldy3j"; }; meta = { - homepage = http://grothoff.org/christian/doodle/; + homepage = https://grothoff.org/christian/doodle/; description = "Tool to quickly index and search documents on a computer"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..69fc0e76932cae8ba405d639044d57a4c567c8dc --- /dev/null +++ b/pkgs/applications/search/grepcidr/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "grepcidr-${version}"; + version = "2.0"; + + src = fetchurl { + url = "http://www.pc-tools.net/files/unix/${name}.tar.gz"; + sha256 = "1yzpa1nigmmp4hir6377hrkpp0z6jnxgccaw2jbqgydbglvnm231"; + }; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Filter IPv4 and IPv6 addresses matching CIDR patterns"; + homepage = http://www.pc-tools.net/unix/grepcidr/; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.fadenb ]; + }; +} diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 649b34e7569282eef65ffe8ff04d75a1a24c54cd..ade8af254496bd42352165e90cf73eb6175f808c 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -7,45 +7,54 @@ assert stdenv.system != "powerpc-linux"; stdenv.mkDerivation rec { - ver = "1.23.1"; + ver = "1.23.7"; name = "recoll-${ver}"; src = fetchurl { url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz"; - sha256 = "0si407qm47ndy0l6zv57lqb5za4aiv0lyghnzb211g03szjkfpg8"; + sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn"; }; - configureFlags = [ "--with-inotify" ]; + configureFlags = [ "--enable-recollq" ] ++ + (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); - buildInputs = [ qt4 xapian file python bison]; + buildInputs = [ qt4 xapian file python bison ]; + + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am + sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.in + ''; # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with # the absolute path to the filtering command. postInstall = '' for f in $out/share/recoll/filters/* ; do - substituteInPlace $f --replace antiword ${lib.getBin antiword}/bin/antiword - substituteInPlace $f --replace awk ${lib.getBin gawk}/bin/awk - substituteInPlace $f --replace catppt ${lib.getBin catdoc}/bin/catppt - substituteInPlace $f --replace djvused ${lib.getBin djvulibre}/bin/djvused - substituteInPlace $f --replace djvutxt ${lib.getBin djvulibre}/bin/djvutxt - substituteInPlace $f --replace egrep ${lib.getBin gnugrep}/bin/egrep - substituteInPlace $f --replace groff ${lib.getBin groff}/bin/groff - substituteInPlace $f --replace gunzip ${lib.getBin gzip}/bin/gunzip - substituteInPlace $f --replace iconv ${lib.getBin libiconv}/bin/iconv - substituteInPlace $f --replace lyx ${lib.getBin lyx}/bin/lyx - substituteInPlace $f --replace pdftotext ${lib.getBin poppler_utils}/bin/pdftotext - substituteInPlace $f --replace pstotext ${lib.getBin ghostscript}/bin/ps2ascii - substituteInPlace $f --replace sed ${lib.getBin gnused}/bin/sed - substituteInPlace $f --replace tar ${lib.getBin gnutar}/bin/tar - substituteInPlace $f --replace unzip ${lib.getBin unzip}/bin/unzip - substituteInPlace $f --replace xls2csv ${lib.getBin catdoc}/bin/xls2csv - substituteInPlace $f --replace xsltproc ${lib.getBin libxslt}/bin/xsltproc - substituteInPlace $f --replace unrtf ${lib.getBin unrtf}/bin/unrtf - substituteInPlace $f --replace untex ${lib.getBin untex}/bin/untex - substituteInPlace $f --replace wpd2html ${lib.getBin libwpd}/bin/wpd2html - substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl + if [[ ! "$f" =~ \.zip$ ]]; then + substituteInPlace $f --replace '"antiword"' '"${lib.getBin antiword}/bin/antiword"' + substituteInPlace $f --replace '"awk"' '"${lib.getBin gawk}/bin/awk"' + substituteInPlace $f --replace '"catppt"' '"${lib.getBin catdoc}/bin/catppt"' + substituteInPlace $f --replace '"djvused"' '"${lib.getBin djvulibre}/bin/djvused"' + substituteInPlace $f --replace '"djvutxt"' '"${lib.getBin djvulibre}/bin/djvutxt"' + substituteInPlace $f --replace '"egrep"' '"${lib.getBin gnugrep}/bin/egrep"' + substituteInPlace $f --replace '"groff"' '"${lib.getBin groff}/bin/groff"' + substituteInPlace $f --replace '"gunzip"' '"${lib.getBin gzip}/bin/gunzip"' + substituteInPlace $f --replace '"iconv"' '"${lib.getBin libiconv}/bin/iconv"' + substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"' + substituteInPlace $f --replace '"pstotext"' '"${lib.getBin ghostscript}/bin/ps2ascii"' + substituteInPlace $f --replace '"sed"' '"${lib.getBin gnused}/bin/sed"' + substituteInPlace $f --replace '"tar"' '"${lib.getBin gnutar}/bin/tar"' + substituteInPlace $f --replace '"unzip"' '"${lib.getBin unzip}/bin/unzip"' + substituteInPlace $f --replace '"xls2csv"' '"${lib.getBin catdoc}/bin/xls2csv"' + substituteInPlace $f --replace '"xsltproc"' '"${lib.getBin libxslt}/bin/xsltproc"' + substituteInPlace $f --replace '"unrtf"' '"${lib.getBin unrtf}/bin/unrtf"' + substituteInPlace $f --replace '"untex"' '"${lib.getBin untex}/bin/untex"' + substituteInPlace $f --replace '"wpd2html"' '"${lib.getBin libwpd}/bin/wpd2html"' + substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl + fi done + '' + stdenv.lib.optionalString stdenv.isLinux '' + substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' ''; enableParallelBuilding = true; diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix index 72d6999fa1d7ba181cd95b4bf3ff49a0dcd8b01d..5883e51f712e37c0fe3a329638a77097de91b750 100644 --- a/pkgs/applications/taxes/aangifte-2006/default.nix +++ b/pkgs/applications/taxes/aangifte-2006/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2006"; - url = "http://www.belastingdienst.nl/download/1341.html"; + homepage = "http://www.belastingdienst.nl/download/1341.html"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix index 15c826feb6e7174607c92dc4729bfcc4a6f06cb1..43fb26d811a3863af13ff0200cc9ee708e06f532 100644 --- a/pkgs/applications/taxes/aangifte-2007/default.nix +++ b/pkgs/applications/taxes/aangifte-2007/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2007"; - url = "http://www.belastingdienst.nl/download/1341.html"; + homepage = "http://www.belastingdienst.nl/download/1341.html"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix index 905471cb76b80dd4f0befff2e792fc006d465df0..b9fad2fa10bd254a2701f381ba8b9453cb1636d3 100644 --- a/pkgs/applications/taxes/aangifte-2008/default.nix +++ b/pkgs/applications/taxes/aangifte-2008/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html; + homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index c944fc3d68b3490fb5994799f13263db68401c4d..d4230d426ece63897aa0f3e5a1402d734002f129 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/particulier/aangifte2009/download/; + homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix index b5a85415c376af4ba37767249790c94e153ca3ae..602368d2017bd906678a238492036a7ae9696b14 100644 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ b/pkgs/applications/taxes/aangifte-2010/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/particulier/aangifte2009/download/; + homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix index a38bc4254bbe84ff2b1584baad0879defab5d5b5..80c772705142039cbbffa95fed551609df0f1087 100644 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ b/pkgs/applications/taxes/aangifte-2011/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/particulier/aangifte2009/download/; + homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix index 2e51ef9ed4cf6080ba10198c719d1ddd759a415b..8066c86742c1d0b7e8122b274a3d1cfbedbe58bb 100644 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ b/pkgs/applications/taxes/aangifte-2012/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/particulier/aangifte2012/download/; + homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix index 5ee0edb4b5e5abd249a53dfd39fc9ce5b72d25fa..6f8e6d6429d34c86aea45974e280aa7baa71aa0e 100644 --- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix +++ b/pkgs/applications/taxes/aangifte-2013-wa/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; + homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix index 3cf85961a9bbc069feea3bd6a3d2b00ebc0ee544..d75b60c8367337dbe4f05e41fd8bb3fe8f930005 100644 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ b/pkgs/applications/taxes/aangifte-2013/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; + homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix index 78bb8214257f7c3f99f6bb07798c839beb49405d..38124677f9a5a69707beaca5f981e7d18cdd40b3 100644 --- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix +++ b/pkgs/applications/taxes/aangifte-2014-wa/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; + homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix index 0151cca52b2c721fd09ea4badc1ec5173b1e6fcc..33b6f8853aa2a61a868dc256811862124d6fe28b 100644 --- a/pkgs/applications/taxes/aangifte-2014/default.nix +++ b/pkgs/applications/taxes/aangifte-2014/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)"; - url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; + homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 47d667a0c067c5a4cf652e5e9cfa60239d758ccb..72e010fd283c839f6ffd589d20c6a34b00eec65a 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, python2Packages +, fetchpatch , withSFTP ? true }: @@ -17,8 +18,15 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = [] ++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ]; - # Bazaar can't find the certificates alone - patches = [ ./add_certificates.patch ]; + patches = [ + # Bazaar can't find the certificates alone + ./add_certificates.patch + (fetchpatch { + url = "https://bazaar.launchpad.net/~brz/brz/trunk/revision/6754"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + name = "CVE-2017-14176.patch"; + }) + ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix index 6301acdf13424d32bc6e64c3dcb2175d4bb7b3c9..7c41a60a7253eea6828bfc7773a77c37b1dfd103 100644 --- a/pkgs/applications/version-management/bugseverywhere/default.nix +++ b/pkgs/applications/version-management/bugseverywhere/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { homepage = http://www.bugseverywhere.org/; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index a330db6a8d677b06457cf7773c82fac94787294b..8a729c28da9a1f864cd8d994b79606dbb2b8e5b8 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nano }: +{ stdenv, fetchurl, fetchpatch, nano }: stdenv.mkDerivation { name = "cvs-1.12.13"; @@ -12,6 +12,10 @@ stdenv.mkDerivation { ./getcwd-chroot.patch ./CVE-2012-0804.patch ./CVE-2017-12836.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/24118ec737c7/cvs/vasnprintf-high-sierra-fix.diff"; + sha256 = "1ql6aaia7xkfq3vqhlw5bd2z2ywka82zk01njs1b2szn699liymg"; + }) ]; hardeningDisable = [ "fortify" "format" ]; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 80c4401f17085fdd9a71d28246bd2601f4f6a653..cadc72f0f87b90de688c5454bd894b12d00300f6 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "fossil-${version}"; - version = "2.3"; + version = "2.5"; src = fetchurl { urls = @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${name}.tar.gz"; - sha256 = "0paalvb4rdyr79v6rwspaha5n4dqb92df9irijha13m3apsanwzh"; + sha256 = "1lxawkhr1ki9fqw8076fxib2b1w673449yzb6vxjshqzh5h77c7r"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 54693f3c5f01a5df8ae5fdfd519cae2346eb9d25..0475a8ae76ca9d9c8f5560345c6428a479e1c340 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "gerrit-${version}"; - version = "2.14.3"; + version = "2.14.6"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "1hxrlhp5l5q4lp5b5bq8va7856cnm4blfv01rgqq3yhvn432sq6v"; + sha256 = "0fsqwfsnyb4nbxgb1i1mp0vshl0mk8bwqlddzqr9x2v99mbca28q"; }; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1j1afxv7yj2fxaw0wy8kmxi6sl9fwj8xsxs5kzg9qz5gzayb26kp"; + outputHash = "1qrmvqqnlbabqz4yx06vi030ci12v0063iq2palxmbj3whrzv9la"; buildCommand = '' mkdir -p "$out"/webapps/ diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index b2a4bc66c69921fd238ce393ac49ca08d1f58bee..7bf83b5621b5ca1b0c89f8a61d8a0e447ad4e54f 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: let - version = "1.12.15"; + version = "1.13.0"; jarName = "bfg-${version}.jar"; mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}"; in @@ -12,7 +12,7 @@ in src = fetchurl { url = mavenUrl; - sha256 = "17dh25jambkk55khknlhy8wa9s1i1xmh9hdgj72j1lzyl0ag42ik"; + sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 3c7d0a86be04d7759023ec642378367be7f52bd0..d890001489ff54bc7862b2808f5f77e34ae207e0 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xml_xslt, pkgconfig, luajit , gzip, bzip2, xz +, python, wrapPython, pygments, markdown }: stdenv.mkDerivation rec { @@ -20,10 +21,11 @@ stdenv.mkDerivation rec { sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit ]; + pythonPath = [ pygments markdown ]; postPatch = '' sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ @@ -50,6 +52,8 @@ stdenv.mkDerivation rec { a2x --no-xmllint -f manpage cgitrc.5.txt mkdir -p "$out/share/man/man5" cp cgitrc.5 "$out/share/man/man5" + + wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" ''; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 75b53d2cfe0963131a69b1a2e043bb49a65e2695..73659a32f4bf25ea1bfb8bde1fb3151b903ac11a 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -15,7 +15,6 @@ let perlPackages.MIMEBase64 perlPackages.AuthenSASL perlPackages.DigestHMAC ]; - gitwebPerlLibs = with perlPackages; [ CGI HTMLParser ]; }; in @@ -51,6 +50,10 @@ rec { git-annex = pkgs.haskellPackages.git-annex; gitAnnex = git-annex; + git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui { + inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; + }; + git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { }; git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { }; @@ -96,10 +99,16 @@ rec { gitflow = callPackage ./gitflow { }; + grv = callPackage ./grv { }; + hub = callPackage ./hub { inherit (darwin) Security; }; + hubUnstable = callPackage ./hub/unstable.nix { + inherit (darwin) Security; + }; + qgit = qt5.callPackage ./qgit { }; stgit = callPackage ./stgit { @@ -111,11 +120,14 @@ rec { git = gitSVN; }; - svn2git_kde = callPackage ./svn2git-kde { }; + svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { }; tig = callPackage ./tig { }; topGit = callPackage ./topgit { }; transcrypt = callPackage ./transcrypt { }; + + # aliases + svn_all_fast_export = svn-all-fast-export; } 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 5878f3a8b74c4cd6af2f3149d7728423c06f5292..988911d2eb7b805dbe906875108ba86b639813f4 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "1hgppp8ngjbjzbi96529p36hzi0ysdndrh6d6m71gs21am8v4m9r"; + sha256 = "0j8dxfl4js7agwdpcvxwigzpp0lik33h7s3vsjg0pd413h2j4mvz"; }; # Perl is needed here for patchShebangs diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ba64a065d2812c576b5d8fd44e02f1d4971dca62 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }: + +buildPythonApplication rec { + name = "git-annex-metadata-gui-${version}"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "alpernebbi"; + repo = "git-annex-metadata-gui"; + rev = "v${version}"; + sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam"; + }; + + prePatch = '' + substituteInPlace setup.py --replace "'PyQt5', " "" + ''; + + propagatedBuildInputs = [ pyqt5 git-annex-adapter ]; + + meta = with stdenv.lib; { + homepage = https://github.com/alpernebbi/git-annex-metadata-gui; + description = "Graphical interface for git-annex metadata commands"; + maintainers = with maintainers; [ dotlambda ]; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + }; +} 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 d38529e92e606f8c68ef509dcd08f8c094098516..c368dcd487e8e32ffb0b08d01ea88ea11f3822da 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.5"; + version = "0.6"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "DanielDent"; repo = "git-annex-remote-rclone"; - sha256 = "1353b6q3lnxhpdfy9yd2af65v7aypdhyvgn7ziksmsrbi12lb74i"; + sha256 = "0j0hlxji8d974fq7zd4xc02n0jpi31ylhxc7z4zp8iiwad5mkpxp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 4ed9c5c0509c090ca554ded473a58db9c3f7c142..c14a027b4abeaa20eeb73fb4fce4705889eada0f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://git.fishsoup.net/cgit/git-bz/; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix index 07e0ce80c5d68ff34574216b396e82ee75b66beb..206a4af91212d4dfc575f673c60ee1995c68e4ab 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { name = "git-codeowners-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "softprops"; repo = "git-codeowners"; rev = "v${version}"; - sha256 = "0imxbi6y1165bi2rik0n98v79fkgp8alb615qh41idg1p2krzyy5"; + sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq"; }; - cargoSha256 = "0h831rf5vlvpzfm4sr3fvwlc0ys776fqis90y414mczphkxvz437"; + cargoSha256 = "0rdmv9s86xba1zkl2j5rgix6k7pkkxqmpar03sak2fjrd7mh8iz0"; meta = with lib; { homepage = "https://github.com/softprops/git-codeowners"; 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 8e3c6b8d9d023cf511bbdf4e2a0cb937cbb2e00c..31504d542d266dda4c19f6098f4f5d055793f468 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 @@ -4,13 +4,13 @@ let inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock; in buildPythonApplication rec { name = "git-cola-${version}"; - version = "2.11"; + version = "3.0"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "1prv8ib9jdkj5rgixj3hvkivwmbz5xvh8bmllrb1sb301yzi1s0g"; + sha256 = "0jc360agrlhp1w9i725ffksvc6v95jnzzppjvza7ssip65gplrkx"; }; buildInputs = [ git gettext ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 6fb9f5e36f1ad655951eb5c9ebd723646160733d..41096441b8e755fbe12fa898266a11dd5447ddd0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -41,6 +41,6 @@ buildRustPackage rec { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; license = licenses.gpl2; - maintainers = with maintainers; [ profpatsch matthiasbeyer ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index abd9013b6b032a1032bed288de603efba0f9d391..e4db75c8ad7ade3f558ca91c3547e8e3ed0cf141 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "git-extras-${version}"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0vb8syyr5nbvmkj5g4rb1p8rqxb2hyl25gbyf4rd0b972d7iihhn"; + sha256 = "059680bvblbhrlkybg1yisr5zq62pir1rnaxz5izhfsw2ng9s2fb"; }; dontBuild = true; diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 4ec83af916070d087aad2b707eccc70ec7c84ce1..b4c3baecd417ec9d2f82fb86f843e711986e1e50 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace Makefile --replace rst2man rst2man.py patchShebangs . ''; @@ -40,7 +39,6 @@ stdenv.mkDerivation rec { directly through the Git command line. ''; license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; + platforms = platforms.all; }; } 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 index 5272e2be07cf2f0258a251cd32ec4a95eb65e095..dc3fbbed19951f124c2610d9b0278b6ab99a0858 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "git-open-${version}"; - version = "1.3.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-open"; rev = "v${version}"; - sha256 = "1klj41vqgyyigqzi6s1ykz9vd8wvaq3skin63pi989dlsjf7igyr"; + sha256 = "0lprzrjsqrg83gixfaiw26achgd8l7s56jknsjss4p7y0w1fxm05"; }; buildInputs = [ makeWrapper ]; 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 1bf7a14932ecdd82b99474e012891f43401311ce..d72df802875916fdb409092eba6f46c6547acc4b 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,13 +2,13 @@ stdenv.mkDerivation rec { name = "git-radar-${version}"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "michaeldfallen"; repo = "git-radar"; rev = "v${version}"; - sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9"; + sha256 = "0c3zp8s4w7m4s71qgwk1jyfc8yzw34f2hi43x1w437ypgabwg81j"; }; dontBuild = true; 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 index ae1139e99937917e33da90ff3adc9d9401c91bba..0272d44146074b3140c21dbf21b31780ba1423ee 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -11,13 +11,13 @@ let ++ stdenv.lib.optional (utillinux != null) utillinux); in stdenv.mkDerivation rec { name = "git-recent-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-recent"; rev = "v${version}"; - sha256 = "0rckjjrw2xmvmbqaf66i36x59vs1v4pfnmvbinx5iggp7vjly1a4"; + sha256 = "0dbnm5b2v04fy0jgzphm3xvz9scx0n4p10fw8wjd0cy56308h79k"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index ba2b71138067c8c63af76dea9dc3b3edda1e365b..5e41db0e03f843d90d9ec01f9c7c7582d089b1fb 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -2,24 +2,19 @@ stdenv.mkDerivation rec { name = "git-remote-gcrypt-${version}"; - version = "1.0.0"; + version = "1.0.3"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "0c8ig1pdqj7wjwldnf62pmm2x29ri62x6b24mbsl2nxzkqbwh379"; + sha256 = "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1"; }; outputs = [ "out" "man" ]; - buildInputs = [ docutils makeWrapper ]; - - # The install.sh script expects rst2man, but here it's named rst2man.py - patchPhase = '' - sed -i 's/rst2man/rst2man.py/g' install.sh - ''; + nativeBuildInputs = [ docutils makeWrapper ]; installPhase = '' prefix="$out" ./install.sh diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 3f64d9d86bb66c15f34667919521aa3688e7afdc..02dc7f86fb3fcae1dc67b62b4bac18d3980d964e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }: let - version = "0.2.2"; + version = "0.2.3"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "0vn9jibp97z7kc828wka1k0d7a9wx4skd6cnqy60kagfc00l0bzh"; + sha256 = "1swgw91zzs9n582500a34cppyngrqrqrnl80d1vd7i93xx1lkmv6"; }; buildInputs = [ makeWrapper ]; 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 5e42992cbe22fe1adba0bfcbc9530a270f3c3c30..cf44cf5ef981977a60ab5c57484acdedc2f08874 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,9 +1,9 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc -, gzip, openssh, pcre2 +, openssh, pcre2 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv -, svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs +, svnSupport, subversionClient, perlLibs, smtpPerlLibs , guiSupport , withManual ? true , pythonSupport ? true @@ -13,7 +13,7 @@ }: let - version = "2.15.0"; + version = "2.16.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,9 +22,11 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h"; + sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; + outputs = [ "out" "gitweb" ]; + hardeningDisable = [ "format" ]; patches = [ @@ -32,6 +34,7 @@ stdenv.mkDerivation { ./symlinks-in-bin.patch ./git-sh-i18n.patch ./ssh-path.patch + ./git-send-email-honor-PATH.patch ]; postPatch = '' @@ -56,7 +59,8 @@ stdenv.mkDerivation { makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") - + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ "); + + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ") + + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else ""); # build git-credential-osxkeychain if darwin postBuild = stdenv.lib.optionalString stdenv.isDarwin '' @@ -129,15 +133,8 @@ stdenv.mkDerivation { substituteInPlace $out/libexec/git-core/git-sh-i18n \ --subst-var-by gettext ${gettext} - # gzip (and optionally bzip2, xz, zip) are runtime dependencies for - # gitweb.cgi, need to patch so that it's found - sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ - $out/share/gitweb/gitweb.cgi - # Give access to CGI.pm and friends (was removed from perl core in 5.22) - for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do - sed -i -e "/use CGI /i use lib \"$p/lib/perl5/site_perl\";" \ - "$out/share/gitweb/gitweb.cgi" - done + # put in separate package for simpler maintenance + mv $out/share/gitweb $gitweb/ # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch new file mode 100644 index 0000000000000000000000000000000000000000..9a484262b7b27c6cec51aac4f0d4ff866bb3e68b --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -0,0 +1,28 @@ +diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt +index 8060ea35c..c81067a19 100644 +--- a/Documentation/git-send-email.txt ++++ b/Documentation/git-send-email.txt +@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'. + specify a full pathname of a sendmail-like program instead; + the program must support the `-i` option. Default value can + be specified by the `sendemail.smtpServer` configuration +- option; the built-in default is to search for `sendmail` in +- `/usr/sbin`, `/usr/lib` and $PATH if such program is ++ option; the built-in default is to search in $PATH if such program is + available, falling back to `localhost` otherwise. + + --smtp-server-port=:: +diff --git a/git-send-email.perl b/git-send-email.perl +index edcc6d346..8e357aeab 100755 +--- a/git-send-email.perl ++++ b/git-send-email.perl +@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { + } + + if (!defined $smtp_server) { +- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); +- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; ++ my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH}; + foreach (@sendmail_paths) { + if (-x $_) { + $smtp_server = $_; diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 97f50064bc3f0c0da696fcd5c26d4d25c22fd979..216c0e56b44c5277ee2b7942ebed5dd6f83786b8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -6,15 +6,15 @@ -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "@@USE_GETTEXT_SCHEME@@" +-if test -n "$GIT_GETTEXT_POISON" +-then +- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison +-elif test -n "@@USE_GETTEXT_SCHEME@@" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -then - : no probing necessary --elif test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison -elif type gettext.sh >/dev/null 2>&1 -then - # GNU libintl's gettext.sh 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 5e24c19f0fee8eea08271a551ded60c908cdb898..addb1dbc5e066632cd240ef49a20540a2828045d 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 @@ -1,21 +1,21 @@ diff --git a/connect.c b/connect.c -index fd7ffe1..20cd992 100644 +index c3a014c5b..fbca3262b 100644 --- a/connect.c +++ b/connect.c -@@ -768,7 +768,7 @@ +@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, + + ssh = getenv("GIT_SSH"); + if (!ssh) +- ssh = "ssh"; ++ ssh = "@ssh@"; + variant = determine_ssh_variant(ssh, 0); + } - ssh = getenv("GIT_SSH"); - if (!ssh) -- ssh = "ssh"; -+ ssh = "@ssh@"; - 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 +index 480a6b30d..781720424 100644 --- a/git-gui/lib/remote_add.tcl +++ b/git-gui/lib/remote_add.tcl -@@ -139,7 +139,7 @@ +@@ -139,7 +139,7 @@ method _add {} { # 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/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0358f850c9abb6d9001d7dc06e709359edfc153a --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -0,0 +1,37 @@ +{ stdenv, git, gzip, perlPackages, fetchFromGitHub +, gitwebTheme ? false }: + +let + gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; + gitwebThemeSrc = fetchFromGitHub { + owner = "kogakure"; + repo = "gitweb-theme"; + rev = "049b88e664a359f8ec25dc6f531b7e2aa60dd1a2"; + sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p"; + }; +in stdenv.mkDerivation { + name = "gitweb"; + + src = git.gitweb; + + installPhase = '' + mkdir $out + mv * $out + + # gzip (and optionally bzip2, xz, zip) are runtime dependencies for + # gitweb.cgi, need to patch so that it's found + sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ + $out/gitweb.cgi + # Give access to CGI.pm and friends (was removed from perl core in 5.22) + for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do + sed -i -e "/use CGI /i use lib \"$p/lib/perl5/site_perl\";" \ + "$out/gitweb.cgi" + done + + ${stdenv.lib.optionalString gitwebTheme "cp ${gitwebThemeSrc}/* $out/static"} + ''; + + meta = git.meta // { + maintainers = with stdenv.lib.maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..be5b58c57334116f849c31b37862c382f4c41da2 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }: +let + version = "0.1.2"; +in +buildGoPackage { + name = "grv-${version}"; + + buildInputs = [ ncurses readline curl libgit2_0_25 ]; + nativeBuildInputs = [ pkgconfig ]; + + goPackagePath = "github.com/rgburke/grv"; + + src = fetchFromGitHub { + owner = "rgburke"; + repo = "grv"; + rev = "v${version}"; + sha256 = "1i8cr5xxdacpby60nqfyj8ijyc0h62029kbds2lq26rb8nn9qih2"; + fetchSubmodules = true; + }; + + buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ]; + + meta = with stdenv.lib; { + description = " GRV is a terminal interface for viewing git repositories"; + homepage = https://github.com/rgburke/grv; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/hub/unstable.nix b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix new file mode 100644 index 0000000000000000000000000000000000000000..7e83c2cfb6741f35e97a6152d53dbb26391bdfe5 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }: + +stdenv.mkDerivation rec { + name = "hub-${version}"; + version = "2.3.0-pre10"; + + src = fetchgit { + url = https://github.com/github/hub.git; + rev = "refs/tags/v${version}"; + sha256 = "07sz1i6zxx2g36ayhjp1vjw523ckk5b0cr8b80s1qhar2d2hkibd"; + }; + + buildInputs = [ go ronn groff utillinux ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + buildPhase = '' + mkdir bin + ln -s ${ronn}/bin/ronn bin/ronn + + patchShebangs . + make all man-pages + ''; + + installPhase = '' + prefix=$out sh -x < script/install.sh + ''; + + meta = with stdenv.lib; { + description = "Command-line wrapper for git that makes you better at GitHub"; + + license = licenses.mit; + homepage = https://hub.github.com/; + maintainers = with maintainers; [ the-kenny ]; + platforms = with platforms; unix; + }; +} 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 7da45e2d3f96a21cb9ac0fd9564517f94651f0bc..188e5a4faafa8db733f58099b239e20e1b143a36 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, cmake, qtbase }: +{ stdenv, fetchgit, cmake, qtbase }: stdenv.mkDerivation rec { - name = "qgit-2.6"; + name = "qgit-2.7"; - src = fetchurl { - url = "http://libre.tibirna.org/attachments/download/12/${name}.tar.gz"; - sha256 = "1brrhac6s6jrw3djhgailg5d5s0vgrfvr0sczqgzpp3i6pxf8qzl"; + src = fetchgit { + url = "http://repo.or.cz/qgit4/redivivus.git"; + rev = name; + sha256 = "0c0zxykpgkxb8gpgzz5i6b8nrzg7cdxikvpg678x7gsnxhlwjv3a"; }; buildInputs = [ qtbase ]; nativeBuildInputs = [ cmake ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { license = licenses.gpl2; homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 7130e057d971897de05cba57dbf521d68e1ee33f..64e700273d126429b22845483521237aa94b5dc7 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, python2, git }: let - name = "stgit-0.17.1"; + name = "stgit-${version}"; + version = "0.18"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://download.gna.org/stgit/${name}.tar.gz"; - sha256 = "1pka0ns9x0kabn036zsf0mwmwiynckhnva51kgxsch9fqah6acyl"; + url = "https://github.com/ctmarinas/stgit/archive/v${version}.tar.gz"; + sha256 = "19fk6vw3pgp2a98wpd4j3kyiyll5dy9bi4921wq1mrky0l53mj00"; }; buildInputs = [ python2 git ]; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2dfa61952a57538659e1a9aff2ecb558d4c9e799 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }: + +let + version = "1.0.11"; +in +stdenv.mkDerivation { + name = "svn-all-fast-export-${version}"; + + src = fetchFromGitHub { + owner = "svn-all-fast-export"; + repo = "svn2git"; + rev = version; + sha256 = "0lhnw8f15j4wkpswhrjd7bp9xkhbk32zmszaxayzfhbdl0g7pzwj"; + }; + + # https://github.com/svn-all-fast-export/svn2git/pull/40 + patches = [ + (fetchpatch { + name = "pr40.patch"; + sha256 = "0mwncklzncsifql9zlxlbj3clsif5p2v1xs8nmxrw44mqvaysjw3"; + url = https://github.com/svn-all-fast-export/svn2git/compare/f00d5a5...flokli:nixos-20180326.patch; + }) + ]; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ apr.dev subversion.dev qtbase ]; + + qmakeFlags = [ + "VERSION=${version}" + "APR_INCLUDE=${apr.dev}/include/apr-1" + "SVN_INCLUDE=${subversion.dev}/include/subversion-1" + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/svn-all-fast-export/svn2git; + description = "A fast-import based converter for an svn repo to git repos"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.flokli ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix deleted file mode 100644 index e52fdb6375bfd8ac23bdb04054140f59cea9914d..0000000000000000000000000000000000000000 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchgit, qt4, qmake4Hook, subversion, apr }: - -stdenv.mkDerivation rec { - name = "svn2git-kde-1.0.5"; - - src = fetchgit { - url = http://git.gitorious.org/svn2git/svn2git.git; - rev = "149d6c6e14a1724c96999328683a9264fc508264"; - sha256 = "0gjxhnraizlwyidn66rczwc01f6sfx4ndmsj86ssqml3p0d4sl6q"; - }; - - NIX_CFLAGS_COMPILE = [ "-I${apr.dev}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ]; - - patchPhase = '' - sed -i 's|/bin/cat|cat|' ./src/repository.cpp - ''; - - installPhase = '' - mkdir -p $out/bin - cp svn-all-fast-export $out/bin - ''; - - buildInputs = [ subversion apr qt4 ]; - - nativeBuildInputs = [ qmake4Hook ]; - - meta.broken = true; -} diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index d613e97d550cb348b6822c2f94018dd505ccffe5..d00fdd0c29e07b09973b28abbc08f1778a81e15b 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, ruby, makeWrapper, git }: let - version = "2.3.2"; + version = "2.4.0"; in stdenv.mkDerivation { name = "svn2git-${version}"; src = fetchurl { url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz"; - sha256 = "1484mpcabqf9kr6xdpdgb1npkqav1bcah3w5lxj2djjx4bjf2g3y"; + sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41"; }; buildInputs = [ ruby makeWrapper ]; 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 bed0ef3582715f3dd5f310223d9681c1b27cf437..597429c0cc7a83f09337159336ad293cc753da95 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.3.0"; + version = "2.3.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "04qw3fyamm1lka9vh7adrkr2mcnwcch9ya5sph51jx6d4jz1lih5"; + sha256 = "1gw5ia6cl5b0q91kv4vfg35my2p49np23aikxqf5gn00zhqrkfap"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; 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 6238cf9c97543e4a73894be9e6cc06c80409eb0c..d04f0d5792b283fd280090f9a485a02d56808b26 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.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; - sha256 = "05q0rgcsphrkavmcsm3qghsl1pkgshvhdf6zpwkn1qcj288h8gkc"; + sha256 = "1hvg4ipsxm27n5yn5jpk43qyvvx5gx3z3cczw1z3r6hrs4n8d5rz"; }; buildInputs = [ git makeWrapper openssl ]; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index c9251b987e938cc4eae54f067ca4a27dc80e4bce..21ceccf9f351f9059df3a1068b99a863dae317e6 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { name = "git-review-${version}"; - version = "1.25.0"; + version = "1.26.0"; # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { src = fetchurl rec { url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz"; - sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce"; + sha256 = "106nk6p7byf5vi68b2fvmwma5nk7qrv39nfj9p1bfxmb1gjdixhc"; }; propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ]; diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a0d7382de3419b07f8a3750065b45c5512bc66a4 --- /dev/null +++ b/pkgs/applications/version-management/git-sizer/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "git-sizer"; + name = "${pname}-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/github/git-sizer"; + + src = fetchFromGitHub { + owner = "github"; + repo = pname; + rev = "v${version}"; + sha256 = "11rvqpsyl41ph0fgm62k5q2p33zgnwj1jd91rd4lkaarpcd1sg5h"; + }; + + meta = with lib; { + description = "Compute various size metrics for a Git repository"; + license = licenses.mit; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 4b6ba9398b488bca977c99107dc2c7db66c0612e..45c97868c4bf8cbac95e583e6c89f6eec7570739 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -31,5 +31,6 @@ python2Packages.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; + broken = true; # Incompatible with Git 2.15 object store. }; } diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile index 7e8f9f2b255773a1e2a8aea94273fdb1c1561908..2b95446161b8203fdbe2c6954a21109288501ec1 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitaly/Gemfile @@ -1,9 +1,18 @@ source 'https://rubygems.org' gem 'github-linguist', '~> 4.7.0', require: 'linguist' -gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly' -gem 'activesupport' +gem 'gitlab-markup', '~> 1.6.2' +gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly' +gem 'activesupport', '~> 5.0.2' +gem 'rdoc', '~> 4.2' +gem 'gollum-lib', '~> 4.2', require: false +gem 'gollum-rugged_adapter', '~> 0.4.4', require: false +gem 'grpc', '~> 1.8.0' + +# Locked until https://github.com/google/protobuf/issues/4210 is closed +gem 'google-protobuf', '= 3.5.1' group :development, :test do gem 'gitlab-styles', '~> 2.0.0', require: false + gem 'rspec', require: false end diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock index 5ea14855b97f075f9e161083b9ced76df11e7957..cb53bb10122ac5ce3078a5416c267d92bcd6c9d7 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitaly/Gemfile.lock @@ -1,20 +1,23 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.0.0.1) + activesupport (5.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) ast (2.3.0) charlock_holmes (0.7.5) concurrent-ruby (1.0.5) + diff-lcs (1.3) escape_utils (1.1.1) - faraday (0.12.2) + faraday (0.14.0) multipart-post (>= 1.2, < 3) - gitaly-proto (0.37.0) + gemojione (3.3.0) + json + gitaly-proto (0.83.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -22,24 +25,48 @@ GEM escape_utils (~> 1.1.0) mime-types (>= 1.19) rugged (>= 0.23.0b) + github-markup (1.6.1) + gitlab-grit (2.8.2) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (>= 1.16) + posix-spawn (~> 0.3) + gitlab-markup (1.6.3) gitlab-styles (2.0.0) rubocop (~> 0.49) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.15) - google-protobuf (3.4.0.2) - googleauth (0.5.3) + gollum-grit_adapter (1.0.1) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.2.7) + gemojione (~> 3.2) + github-markup (~> 1.6) + gollum-grit_adapter (~> 1.0) + nokogiri (>= 1.6.1, < 2.0) + rouge (~> 2.1) + sanitize (~> 2.1) + stringex (~> 2.6) + gollum-rugged_adapter (0.4.4) + mime-types (>= 1.15) + rugged (~> 0.25) + google-protobuf (3.5.1) + googleapis-common-protos-types (1.0.1) + google-protobuf (~> 3.0) + googleauth (0.6.2) faraday (~> 0.12) - jwt (~> 1.4) + jwt (>= 1.4, < 3.0) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.6.0) + grpc (1.8.7) google-protobuf (~> 3.1) - googleauth (~> 0.5.1) + googleapis-common-protos-types (~> 1.0.0) + googleauth (>= 0.5.1, < 0.7) i18n (0.8.1) - jwt (1.5.6) + json (2.1.0) + jwt (2.1.0) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -48,18 +75,37 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) + mini_portile2 (2.3.0) minitest (5.9.1) - multi_json (1.12.1) + multi_json (1.13.1) multipart-post (2.0.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) os (0.9.6) parallel (1.12.0) parser (2.4.0.0) ast (~> 2.2) + posix-spawn (0.3.13) powerpack (0.1.1) - public_suffix (2.0.5) + public_suffix (3.0.1) rainbow (2.2.2) rake rake (12.1.0) + rdoc (4.3.0) + rouge (2.2.1) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) rubocop (0.50.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -73,11 +119,14 @@ GEM rubocop (>= 0.50.0) ruby-progressbar (1.8.3) rugged (0.26.0) - signet (0.7.3) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) + stringex (2.7.1) thread_safe (0.3.6) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -87,10 +136,17 @@ PLATFORMS ruby DEPENDENCIES - activesupport - gitaly-proto (~> 0.37.0) + activesupport (~> 5.0.2) + gitaly-proto (~> 0.83.0) github-linguist (~> 4.7.0) + gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.0.0) + gollum-lib (~> 4.2) + gollum-rugged_adapter (~> 0.4.4) + google-protobuf (= 3.5.1) + grpc (~> 1.8.0) + rdoc (~> 4.2) + rspec BUNDLED WITH - 1.15.4 + 1.16.1 diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 63e5758107f768fcdc2e85cd2bac7b289227d0bd..7a8ba0fda7442aaf97e9f026c0ee2d6063d26a41 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.43.1"; + version = "0.81.0"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq"; + sha256 = "01sw5y201xbd21k9r7xmzqiiypb924ac95nqqfhzplqnssa98n9y"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix index 57480f3f337efb36672e252cdb7efad1a7e0e698..efe786216628433b5d47d60c123172b72a7fb9f9 100644 --- a/pkgs/applications/version-management/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitaly/gemset.nix @@ -3,19 +3,19 @@ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vgjr48yiynwf9rh2nsxa8w134na0805l40chf9g9scii9k70rj9"; + sha256 = "0g85lqq0smj71g8a2dxb54ajjzw59c9snana4p61knryc83q3yg6"; type = "gem"; }; - version = "5.0.0.1"; + version = "5.0.6"; }; addressable = { dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.2"; }; ast = { source = { @@ -41,6 +41,14 @@ }; version = "1.0.5"; }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; escape_utils = { source = { remotes = ["https://rubygems.org"]; @@ -53,19 +61,28 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2"; + sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr"; + type = "gem"; + }; + version = "0.14.0"; + }; + gemojione = { + dependencies = ["json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; type = "gem"; }; - version = "0.12.2"; + version = "3.3.0"; }; gitaly-proto = { dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqp9ib00q55ig8zf1r6ldf3xkqw0874ra1mbcsm8sl46l84lx11"; + sha256 = "0z3asy104q36sshq9zhmgcm32sg8qr8jvy0mi19nakkq7prrkwqv"; type = "gem"; }; - version = "0.37.0"; + version = "0.83.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -76,6 +93,31 @@ }; version = "4.7.6"; }; + github-markup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq"; + type = "gem"; + }; + version = "1.6.1"; + }; + gitlab-grit = { + dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4"; + type = "gem"; + }; + version = "2.8.2"; + }; + gitlab-markup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki"; + type = "gem"; + }; + version = "1.6.3"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -85,31 +127,67 @@ }; version = "2.0.0"; }; + gollum-grit_adapter = { + dependencies = ["gitlab-grit"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; + type = "gem"; + }; + version = "1.0.1"; + }; + gollum-lib = { + dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq"; + type = "gem"; + }; + version = "4.2.7"; + }; + gollum-rugged_adapter = { + dependencies = ["mime-types" "rugged"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0khfmakp65frlaj7ajs6ihqg4xi7yc9z96kpsf1b7giqi3fqhhv4"; + type = "gem"; + }; + version = "0.4.4"; + }; google-protobuf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl"; + sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi"; + type = "gem"; + }; + version = "3.5.1"; + }; + googleapis-common-protos-types = { + dependencies = ["google-protobuf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck"; type = "gem"; }; - version = "3.4.0.2"; + version = "1.0.1"; }; googleauth = { dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; + sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.2"; }; grpc = { - dependencies = ["google-protobuf" "googleauth"]; + dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52"; + sha256 = "02b80pyg4rgkiafyh1jqnfh6xp9abpd1x0a9c2h98f0851scw28b"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.7"; }; i18n = { source = { @@ -119,13 +197,21 @@ }; version = "0.8.1"; }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; type = "gem"; }; - version = "1.5.6"; + version = "2.1.0"; }; little-plugger = { source = { @@ -169,6 +255,14 @@ }; version = "3.2016.0521"; }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + type = "gem"; + }; + version = "2.3.0"; + }; minitest = { source = { remotes = ["https://rubygems.org"]; @@ -180,10 +274,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.1"; }; multipart-post = { source = { @@ -193,6 +287,15 @@ }; version = "2.0.0"; }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021"; + type = "gem"; + }; + version = "1.8.1"; + }; os = { source = { remotes = ["https://rubygems.org"]; @@ -218,6 +321,14 @@ }; version = "2.4.0.0"; }; + posix-spawn = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; + type = "gem"; + }; + version = "0.3.13"; + }; powerpack = { source = { remotes = ["https://rubygems.org"]; @@ -229,10 +340,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.1"; }; rainbow = { dependencies = ["rake"]; @@ -251,6 +362,66 @@ }; version = "12.1.0"; }; + rdoc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c"; + type = "gem"; + }; + version = "4.3.0"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs"; + type = "gem"; + }; + version = "2.2.1"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18np8wyw2g79waclpaacba6nd7x60ixg07ncya0j0qj1z9b37grd"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "028ifzf9mqp3kxx40q1nbwj40g72g9zk0wr78l146phblkv96w0a"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nv6jkxy24sag1i9w9wi3850k6skk2fm6yhcrgnmlz6vmwxvizp8"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-support = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050paqqpsml8w88nf4a15zbbj3vvm471zpv73sjfdnz7w21wnypb"; + type = "gem"; + }; + version = "3.6.0"; + }; rubocop = { dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { @@ -294,14 +465,31 @@ }; version = "0.26.0"; }; + sanitize = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; + type = "gem"; + }; + version = "2.1.0"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; + type = "gem"; + }; + version = "0.8.1"; + }; + stringex = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv"; type = "gem"; }; - version = "0.7.3"; + version = "2.7.1"; }; thread_safe = { source = { diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index d4afdd7b3cd4d1f15effbe79208e024516a36c48..da9ee9b40811f430f69f990869fbde8b09dac4a1 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.2.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0v24q14xzmqgwk10m7rqyn6pahd630v3bnc646ij4w8fbgr8hzja"; + sha256 = "07fbcd134n7giwxpqli5hfywmi0vb8awgdh3gyiwyzhjwwzfrxkq"; }; patches = [ ./static-root-path.patch ]; @@ -43,7 +43,7 @@ buildGoPackage rec { meta = { description = "Git with a cup of tea"; - homepage = http://gitea.io; + homepage = https://gitea.io; license = licenses.mit; maintainers = [ maintainers.disassembler ]; }; diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch index 06ce521e9e8d50ae667caf9262d47105f04df643..7c36afdff84c4afd49e91109b0f4e8aeb70a12c2 100644 --- a/pkgs/applications/version-management/gitea/static-root-path.patch +++ b/pkgs/applications/version-management/gitea/static-root-path.patch @@ -2,12 +2,12 @@ diff --git i/modules/setting/setting.go w/modules/setting/setting.go index aafe2d1b..1e4a8064 100644 --- i/modules/setting/setting.go +++ w/modules/setting/setting.go -@@ -683,7 +683,7 @@ func NewContext() { +@@ -730,7 +730,7 @@ func NewContext() { LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL) OfflineMode = sec.Key("OFFLINE_MODE").MustBool() DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() -- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) +- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath) + StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") - AppDataPath = sec.Key("APP_DATA_PATH").MustString("data") + AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data")) EnableGzip = sec.Key("ENABLE_GZIP").MustBool() EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false) diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index eea5242e6bcc9b8c1252e348fad6f3d5666b16c0..2428c6cebddd3be5abbb9043a74f425f03f15ef0 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -11,6 +11,10 @@ python2Packages.buildPythonApplication rec { name = name + "-src"; }; + checkInputs = with python2Packages; [ + unittest2 + ]; + meta = with stdenv.lib; { homepage = https://github.com/ejwa/gitinspector; description = "Statistical analysis tool for git repositories"; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c7f7a4b02e4d172c221c01083c031b4d3e1d0317..1e29b458a314545d539024aa951548fca5c23624 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,29 +1,33 @@ -{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib +{ 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 +, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus , dpkg, makeDesktopItem }: with stdenv.lib; +let + curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; +in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "2.7.0"; + version = "3.4.0"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "0088vdn47563f0v9zhk1vggn3c2cfg8rhmifc6nw4zbss49si5gp"; + sha256 = "0jj3a02bz30xa7p4migyhvxd9s0cllymsp1rdh2pbh40p79g1fp1"; }; libPath = makeLibraryPath [ stdenv.cc.cc.lib - curl + curlWithGnuTls udev libX11 libXext libXcursor libXi + libxcb glib libXScrnSaver libxkbfile @@ -47,7 +51,7 @@ stdenv.mkDerivation rec { libXrender gtk2 gnome2.GConf - libgnome_keyring + libgnome-keyring ]; nativeBuildInputs = [ makeWrapper ]; @@ -66,27 +70,25 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; + unpackPhase = "true"; + buildCommand = '' + mkdir -p $out + dpkg -x $src $out + substituteInPlace $out/usr/share/applications/gitkraken.desktop \ + --replace /usr/share/gitkraken $out/bin + cp -av $out/usr/* $out + rm -rf $out/etc $out/usr $out/share/lintian + chmod -R g-w $out - installPhase = '' - mkdir -p "$out/opt/gitkraken" - cp -r usr/share/gitkraken/* "$out/opt/gitkraken" + 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 ${libPath}:$out/share/gitkraken $file || true + done - mkdir -p "$out/share/applications" - cp $desktopItem/share/applications/* "$out/share/applications" + find $out/share/gitkraken -name "*.node" -exec patchelf --set-rpath "${libPath}:$out/share/gitkraken" {} \; - 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 : "${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" + rm $out/bin/gitkraken + ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken ''; meta = { diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index ac05ca4c4847a446bcc4873d425f94ebece3decd..ca5b8a84fbf9894593d1cb772bab813fb38ce4b7 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,19 +1,17 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "5.9.3"; + version = "6.0.3"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p"; + sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk"; }; - buildInputs = [ - ruby bundler go - ]; + buildInputs = [ ruby bundler go ]; patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ]; @@ -32,29 +30,9 @@ stdenv.mkDerivation rec { # code by default which doesn't work in nixos because it's a # read-only filesystem postPatch = '' - substituteInPlace lib/gitlab_config.rb --replace\ - "File.join(ROOT_PATH, 'config.yml')"\ - "ENV['GITLAB_SHELL_CONFIG_PATH']" - - # Note that we're running gitlab-shell from current-system/sw - # because otherwise updating gitlab-shell won't be reflected in - # the hardcoded path of the authorized-keys file: - substituteInPlace lib/gitlab_keys.rb --replace\ - "\"#{ROOT_PATH}/bin/gitlab-shell"\ - "\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} /run/current-system/sw/bin/gitlab-shell" - - # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key - # environment because we need it in gitlab_configrb - # . unsetenv_others will remove that so we're not doing it for - # now. - # - # TODO: Are there any security implications? The commit adding - # unsetenv_others didn't mention anything... - # - # Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'GL_ID' => ENV['GL_ID']}, *args, unsetenv_others: true) - substituteInPlace lib/gitlab_shell.rb --replace\ - " *args, unsetenv_others: true)"\ - " *args)" + substituteInPlace lib/gitlab_config.rb --replace \ + "File.join(ROOT_PATH, 'config.yml')" \ + "'/run/gitlab/shell-config.yml'" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch index 1c694266e470490bcfb9097abe2fbdace351d001..b0ee31cf39dd8c359277125b4af8a57f4671281e 100644 --- a/pkgs/applications/version-management/gitlab-shell/fixes.patch +++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch @@ -1,12 +1,11 @@ diff --git a/support/go_build.rb b/support/go_build.rb -index 82f94d2..40ba35e 100644 +index 30a6b71..46b4dfa 100644 --- a/support/go_build.rb +++ b/support/go_build.rb -@@ -25,9 +25,8 @@ module GoBuild - def run!(env, cmd) +@@ -26,8 +26,8 @@ module GoBuild raise "env must be a hash" unless env.is_a?(Hash) raise "cmd must be an array" unless cmd.is_a?(Array) -- + - if !system(env, *cmd) - abort "command failed: #{env.inspect} #{cmd.join(' ')}" - end diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch index dd1ecafb8bf836c1cc81eca058eac3e2b5ac67a0..bc1aa8583867b303ae496abe076b297852ed0ebf 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -1,26 +1,26 @@ -diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb -index 0b11ce3..ffc3faf 100644 ---- a/lib/gitlab_projects.rb -+++ b/lib/gitlab_projects.rb -@@ -8,7 +8,7 @@ require_relative 'gitlab_metrics' - require_relative 'gitlab_metrics' +diff --git a/go/internal/config/config.go b/go/internal/config/config.go +index c57b4de..88cfc95 100644 +--- a/go/internal/config/config.go ++++ b/go/internal/config/config.go +@@ -27,7 +27,7 @@ func New() (*Config, error) { + } + cfg.RootDir = dir - class GitlabProjects -- GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks') -+ GLOBAL_HOOKS_DIRECTORY = ENV['GITLAB_SHELL_HOOKS_PATH'] || File.join(ROOT_PATH, 'hooks') - - # Project name is a directory name for repository with .git at the end - # It may be namespaced or not. Like repo.git or gitlab/repo.git +- configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile)) ++ configBytes, err := ioutil.ReadFile("/run/gitlab/shell-config.yml") + if err != nil { + return nil, err + } diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb -index e7d0254..181ec8a 100644 +index 1452f95..2b40327 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb -@@ -188,7 +188,8 @@ class GitlabShell +@@ -180,7 +180,8 @@ class GitlabShell end # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. - Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) -+ # Except we don't, because we're already in the right directory on nixos ! ++ # Except we don't, because we're already in the right directory on nixos! + Kernel::exec(env, *args, unsetenv_others: true) end diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 1f3407eddcf50efe8ade84b7f46e7b60c9eac165..6bb696406c9d405d2f0059a59e2f11c34c96b047 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "3.2.0"; + version = "3.6.0"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r"; + sha256 = "1vcxm9m82m1dcc86r29k5v8cp3zvpby4kszbkavl3frm3ws0w9lz"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index b4a457bff6e524fa093eea8bfb531f949aad04c4..97d40857e117c78dcfcd84bd291a968f0532549d 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.2.8' +gem 'rails', '4.2.10' gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with @@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', '~> 3.0.0' # Supported DBs -gem 'mysql2', '~> 0.4.5', group: :mysql +gem 'mysql2', '~> 0.4.10', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres gem 'rugged', '~> 0.26.0' @@ -25,7 +25,7 @@ gem 'devise', '~> 4.2' gem 'doorkeeper', '~> 4.2.0' gem 'doorkeeper-openid_connect', '~> 1.2.0' gem 'omniauth', '~> 1.4.2' -gem 'omniauth-auth0', '~> 1.4.1' +gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' @@ -69,7 +69,15 @@ gem 'net-ldap' # Git Wiki # Required manually in config/initializers/gollum.rb to control load order +# Before updating this gem, check if +# https://github.com/gollum/gollum-lib/pull/292 has been merged. +# If it has, then remove the monkey patch for update_page, rename_page and raw_data_in_committer +# in config/initializers/gollum.rb gem 'gollum-lib', '~> 4.2', require: false + +# Before updating this gem, check if +# https://github.com/gollum/rugged_adapter/pull/28 has been merged. +# If it has, then remove the monkey patch for tree_entry in config/initializers/gollum.rb gem 'gollum-rugged_adapter', '~> 0.4.4', require: false # Language detection @@ -78,7 +86,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API gem 'grape', '~> 1.0' gem 'grape-entity', '~> 0.6.0' -gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' +gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' @@ -90,7 +98,7 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.6.1' # Files attachments -gem 'carrierwave', '~> 1.1' +gem 'carrierwave', '~> 1.2' # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' @@ -102,7 +110,7 @@ gem 'fog-google', '~> 0.5' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.1.0' +gem 'fog-aliyun', '~> 0.2.0' # for Google storage gem 'google-api-client', '~> 0.13.6' @@ -111,7 +119,7 @@ gem 'google-api-client', '~> 0.13.6' gem 'unf', '~> 0.1.4' # Seed data -gem 'seed-fu', '~> 2.3.5' +gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' @@ -128,7 +136,7 @@ gem 'asciidoctor-plantuml', '0.0.7' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.1' +gem 'nokogiri', '~> 1.8.2' # Diffs gem 'diffy', '~> 3.1.0' @@ -171,7 +179,7 @@ gem 're2', '~> 1.1.1' gem 'version_sorter', '~> 2.1.0' # Cache -gem 'redis-rails', '~> 5.0.1' +gem 'redis-rails', '~> 5.0.2' # Redis gem 'redis', '~> 3.2' @@ -229,6 +237,9 @@ gem 'charlock_holmes', '~> 0.7.5' # Faster JSON gem 'oj', '~> 2.17.4' +# Faster blank +gem 'fast_blank' + # Parse time & duration gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' @@ -245,7 +256,7 @@ gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.1.0' +gem 'jquery-rails', '~> 4.3.1' gem 'request_store', '~> 1.3' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' @@ -263,6 +274,8 @@ gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.2.0' gem 'gettext', '~> 3.2.2', require: false, group: :development +gem 'batch-loader', '~> 1.2.1' + # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' @@ -281,7 +294,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta18' + gem 'prometheus-client-mmap', '~> 0.9.1' gem 'raindrops', '~> 0.18' end @@ -309,14 +322,14 @@ group :development, :test do gem 'fuubar', '~> 2.2.0' gem 'database_cleaner', '~> 1.5.0' - gem 'factory_girl_rails', '~> 4.7.0' + gem 'factory_bot_rails', '~> 4.8.2' gem 'rspec-rails', '~> 3.6.0' gem 'rspec-retry', '~> 0.4.5' gem 'spinach-rails', '~> 0.2.1' gem 'spinach-rerun-reporter', '~> 0.0.2' gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-set', '~> 0.1.3' - gem 'rspec-parameterized' + gem 'rspec-parameterized', require: false # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.7.0' @@ -324,26 +337,28 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.4' - gem 'capybara', '~> 2.15.0' + gem 'capybara', '~> 2.15' gem 'capybara-screenshot', '~> 1.0.0' - gem 'poltergeist', '~> 1.9.0' + gem 'selenium-webdriver', '~> 3.5' gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-spinach', '~> 1.1.0' - gem 'rubocop', '~> 0.49.1', require: false - gem 'rubocop-rspec', '~> 1.15.1', require: false - gem 'rubocop-gitlab-security', '~> 0.1.0', require: false - gem 'scss_lint', '~> 0.54.0', require: false + gem 'gitlab-styles', '~> 2.3', require: false + # Pin these dependencies, otherwise a new rule could break the CI pipelines + gem 'rubocop', '~> 0.52.1' + gem 'rubocop-rspec', '~> 1.22.1' + + gem 'scss_lint', '~> 0.56.0', require: false gem 'haml_lint', '~> 0.26.0', require: false gem 'simplecov', '~> 0.14.0', require: false - gem 'flay', '~> 2.8.0', require: false + gem 'flay', '~> 2.10.0', require: false gem 'bundler-audit', '~> 0.5.0', require: false gem 'benchmark-ips', '~> 2.3.0', require: false - gem 'license_finder', '~> 2.1.0', require: false + gem 'license_finder', '~> 3.1', require: false gem 'knapsack', '~> 1.11.0' gem 'activerecord_sane_schema_dumper', '0.2' @@ -377,9 +392,6 @@ gem 'ruby-prof', '~> 0.16.2' # OAuth gem 'oauth2', '~> 1.4' -# Soft deletion -gem 'paranoia', '~> 2.3.1' - # Health check gem 'health_check', '~> 2.6.0' @@ -398,16 +410,20 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly' +# Locked until https://github.com/google/protobuf/issues/4210 is closed +gem 'google-protobuf', '= 3.5.1' gem 'toml-rb', '~> 0.3.15', require: false # Feature toggles -gem 'flipper', '~> 0.10.2' -gem 'flipper-active_record', '~> 0.10.2' +gem 'flipper', '~> 0.11.0' +gem 'flipper-active_record', '~> 0.11.0' +gem 'flipper-active_support_cache_store', '~> 0.11.0' # Structured logging gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' -gem 'activerecord-nulldb-adapter' +# Asset synchronization +gem 'asset_sync', '~> 2.2.0' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index fd3aab2d54ad13cddf0c05ef480862d52dba4242..4022e2896116ae0c64fa52b546ba8a4b4ba8e42a 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -4,40 +4,38 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - actionmailer (4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.8) - actionview (= 4.2.8) - activesupport (= 4.2.8) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) 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) + actionview (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.8) - activesupport (= 4.2.8) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.8) - activesupport (= 4.2.8) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.8) - activemodel (= 4.2.8) - activesupport (= 4.2.8) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activerecord-nulldb-adapter (0.3.7) - activerecord (>= 2.0.0) activerecord_sane_schema_dumper (0.2) rails (>= 4, < 5) - activesupport (4.2.8) + activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -60,6 +58,11 @@ GEM asciidoctor (1.5.3) asciidoctor-plantuml (0.0.7) asciidoctor (~> 1.5) + asset_sync (2.2.0) + activemodel (>= 4.1.0) + fog-core + mime-types (>= 2.99) + unf ast (2.3.0) atomic (1.1.99) attr_encrypted (3.0.3) @@ -75,6 +78,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) babosa (1.0.2) base32 (0.3.2) + batch-loader (1.2.1) bcrypt (3.1.11) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) @@ -85,6 +89,7 @@ GEM bindata (2.4.1) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) + blankslate (2.1.2.4) bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) @@ -109,18 +114,19 @@ GEM capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy - carrierwave (1.1.0) + carrierwave (1.2.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) charlock_holmes (0.7.5) + childprocess (0.7.0) + ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) chronic_duration (0.10.6) numerizer (~> 0.1.1) chunky_png (1.3.5) citrus (3.0.2) - cliver (0.3.2) coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) @@ -189,10 +195,10 @@ GEM excon (0.57.1) execjs (2.6.0) expression_parser (0.9.0) - factory_girl (4.7.0) + factory_bot (4.8.2) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) @@ -201,22 +207,26 @@ GEM faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json + fast_blank (1.0.0) fast_gettext (1.4.0) ffaker (2.4.0) ffi (1.9.18) - flay (2.8.1) + flay (2.10.0) erubis (~> 2.7.0) path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flipper (0.10.2) - flipper-active_record (0.10.2) + flipper (0.11.0) + flipper-active_record (0.11.0) activerecord (>= 3.2, < 6) - flipper (~> 0.10.2) + flipper (~> 0.11.0) + flipper-active_support_cache_store (0.11.0) + activesupport (>= 3.2, < 6) + flipper (~> 0.11.0) flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.1.0) + fog-aliyun (0.2.0) fog-core (~> 1.27) fog-json (~> 1.0) ipaddress (~> 0.8) @@ -275,7 +285,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.39.0) + gitaly-proto (0.84.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -293,14 +303,18 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.6.2) + gitlab-markup (1.6.3) + gitlab-styles (2.3.2) + rubocop (~> 0.51) + rubocop-gitlab-security (~> 0.1.0) + rubocop-rspec (~> 1.19) gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.2.7) @@ -326,7 +340,9 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.4.0.2) + google-protobuf (3.5.1) + googleapis-common-protos-types (1.0.1) + google-protobuf (~> 3.0) googleauth (0.5.3) faraday (~> 0.12) jwt (~> 1.4) @@ -353,9 +369,10 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.6.0) + grpc (1.8.3) google-protobuf (~> 3.1) - googleauth (~> 0.5.1) + googleapis-common-protos-types (~> 1.0.0) + googleauth (>= 0.5.1, < 0.7) haml (4.0.7) tilt haml_lint (0.26.0) @@ -396,7 +413,8 @@ GEM json (~> 1.8) multi_xml (>= 0.5.2) httpclient (2.8.2) - i18n (0.8.6) + i18n (0.9.1) + concurrent-ruby (~> 1.0) ice_nine (0.11.2) influxdb (0.2.3) cause @@ -407,7 +425,7 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) - jquery-rails (4.1.1) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -449,11 +467,13 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.0) + license_finder (3.1.1) bundler httparty rubyzip thor + toml (= 0.1.2) + with_env (> 1.0) xml-simple licensee (8.7.0) rugged (~> 0.24) @@ -468,8 +488,8 @@ GEM railties (>= 4, < 5.2) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) mail_room (0.9.1) memoist (0.16.0) memoizable (0.4.2) @@ -482,7 +502,6 @@ GEM mini_mime (0.1.4) mini_portile2 (2.3.0) minitest (5.7.0) - mmap2 (2.2.7) mousetrap-rails (1.4.6) multi_json (1.12.2) multi_xml (0.6.0) @@ -490,11 +509,11 @@ GEM mustermann (1.0.0) mustermann-grape (1.0.0) mustermann (~> 1.0.0) - mysql2 (0.4.5) + mysql2 (0.4.10) net-ldap (0.16.0) net-ssh (4.1.0) netrc (0.11.0) - nokogiri (1.8.1) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) numerizer (0.1.1) oauth (0.5.1) @@ -510,8 +529,8 @@ GEM omniauth (1.4.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.1) - omniauth-oauth2 (~> 1.1) + omniauth-auth0 (2.0.0) + omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.1) omniauth-oauth2 (~> 1.3, >= 1.3.1) omniauth-azure-oauth2 (0.0.9) @@ -564,12 +583,12 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (0.9.6) - parallel (1.12.0) - paranoia (2.3.1) - activerecord (>= 4.0, < 5.2) - parser (2.4.0.0) - ast (~> 2.2) - path_expander (1.0.1) + parallel (1.12.1) + parser (2.4.0.2) + ast (~> 2.3) + parslet (1.5.0) + blankslate (~> 2.0) + path_expander (1.0.2) peek (1.0.1) concurrent-ruby (>= 0.9.0) concurrent-ruby-ext (>= 0.9.0) @@ -603,11 +622,6 @@ GEM pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) - poltergeist (1.9.0) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) posix-spawn (0.3.13) powerpack (0.1.1) premailer (1.10.4) @@ -622,8 +636,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta18) - mmap2 (~> 2.2, >= 2.2.7) + prometheus-client-mmap (0.9.1) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -640,7 +653,7 @@ GEM rack (>= 0.4) rack-attack (4.4.1) rack - rack-cors (0.4.0) + rack-cors (1.0.2) rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) @@ -653,16 +666,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.8) - actionmailer (= 4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) - activemodel (= 4.2.8) - activerecord (= 4.2.8) - activesupport (= 4.2.8) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.8) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -675,15 +688,18 @@ GEM rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) - railties (4.2.8) - actionpack (= 4.2.8) - activesupport (= 4.2.8) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake raindrops (0.18.0) - rake (12.1.0) + rake (12.3.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rbnacl (4.0.2) @@ -697,25 +713,25 @@ GEM json recursive-open-struct (1.0.0) redcarpet (3.4.0) - redis (3.3.3) - redis-actionpack (5.0.1) + redis (3.3.5) + redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) - redis-store (>= 1.1.0, < 1.4.0) - redis-activesupport (5.0.1) + redis-store (>= 1.1.0, < 2) + redis-activesupport (5.0.4) activesupport (>= 3, < 6) - redis-store (~> 1.2.0) + redis-store (>= 1.3, < 2) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) - redis-rack (1.6.0) - rack (~> 1.5) - redis-store (~> 1.2.0) - redis-rails (5.0.1) - redis-actionpack (~> 5.0.0) - redis-activesupport (~> 5.0.0) - redis-store (~> 1.2.0) - redis-store (1.2.0) - redis (>= 2.2) + redis-rack (2.0.4) + rack (>= 1.5, < 3) + redis-store (>= 1.2, < 2) + redis-rails (5.0.2) + redis-actionpack (>= 5.0, < 6) + redis-activesupport (>= 5.0, < 6) + redis-store (>= 1.2, < 2) + redis-store (1.4.1) + redis (>= 2.2, < 5) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -770,21 +786,21 @@ GEM pg rails sqlite3 - rubocop (0.49.1) + rubocop (0.52.1) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.4.0.2, < 3.0) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-gitlab-security (0.1.0) - rubocop (>= 0.47.1) - rubocop-rspec (1.15.1) - rubocop (>= 0.42.0) + rubocop-gitlab-security (0.1.1) + rubocop (>= 0.51) + rubocop-rspec (1.22.1) + rubocop (>= 0.52.1) ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (0.16.2) - ruby-progressbar (1.8.1) + ruby-progressbar (1.9.0) ruby-saml (1.4.1) nokogiri (>= 1.5.10) ruby_parser (3.9.0) @@ -798,7 +814,11 @@ GEM safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.4.22) + sass (3.5.5) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -808,15 +828,18 @@ GEM sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - scss_lint (0.54.0) + scss_lint (0.56.0) rake (>= 0.9, < 13) - sass (~> 3.4.20) + sass (~> 3.5.3) securecompare (1.0.0) - seed-fu (2.3.6) + seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) select2-rails (3.5.9.3) thor (~> 0.14) + selenium-webdriver (3.5.0) + childprocess (~> 0.5) + rubyzip (~> 1.0) sentry-raven (2.5.3) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) @@ -825,11 +848,11 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.0.4) + sidekiq (5.0.5) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (~> 3.3, >= 3.3.3) + redis (>= 3.3.4, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) @@ -867,7 +890,7 @@ GEM sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -898,12 +921,14 @@ GEM tilt (2.0.6) timecop (0.8.1) timfel-krb5-auth (0.8.3) + toml (0.1.2) + parslet (~> 1.5.0) toml-rb (0.3.15) citrus (~> 3.0, > 3.0) truncato (0.7.10) htmlentities (~> 4.3.1) nokogiri (~> 1.8.0, >= 1.7.0) - tzinfo (1.2.3) + tzinfo (1.2.4) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -948,13 +973,11 @@ GEM hashdiff webpack-rails (0.9.10) railties (>= 3.2.0) - websocket-driver (0.6.3) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) wikicloth (0.8.1) builder expression_parser rinku + with_env (1.1.0) xml-simple (1.1.5) xpath (2.1.0) nokogiri (~> 1.3) @@ -965,7 +988,6 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) - activerecord-nulldb-adapter activerecord_sane_schema_dumper (= 0.2) acts-as-taggable-on (~> 4.0) addressable (~> 2.5.2) @@ -974,10 +996,12 @@ DEPENDENCIES asana (~> 0.6.0) asciidoctor (~> 1.5.2) asciidoctor-plantuml (= 0.0.7) + asset_sync (~> 2.2.0) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) babosa (~> 1.0.2) base32 (~> 0.3.0) + batch-loader (~> 1.2.1) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) better_errors (~> 2.1.0) @@ -988,9 +1012,9 @@ DEPENDENCIES browser (~> 2.2) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.15.0) + capybara (~> 2.15) capybara-screenshot (~> 1.0.0) - carrierwave (~> 1.1) + carrierwave (~> 1.2) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) @@ -1009,13 +1033,15 @@ DEPENDENCIES dropzonejs-rails (~> 0.7.1) email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) - factory_girl_rails (~> 4.7.0) + factory_bot_rails (~> 4.8.2) faraday (~> 0.12) + fast_blank ffaker (~> 2.4) - flay (~> 2.8.0) - flipper (~> 0.10.2) - flipper-active_record (~> 0.10.2) - fog-aliyun (~> 0.1.0) + flay (~> 2.10.0) + flipper (~> 0.11.0) + flipper-active_record (~> 0.11.0) + flipper-active_support_cache_store (~> 0.11.0) + fog-aliyun (~> 0.2.0) fog-aws (~> 1.4) fog-core (~> 1.44) fog-google (~> 0.5) @@ -1030,15 +1056,17 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.39.0) + gitaly-proto (~> 0.84.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) + gitlab-styles (~> 2.3) gitlab_omniauth-ldap (~> 2.0.4) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) google-api-client (~> 0.13.6) + google-protobuf (= 3.5.1) gpgme grape (~> 1.0) grape-entity (~> 0.6.0) @@ -1055,14 +1083,14 @@ DEPENDENCIES influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.1.0) + jquery-rails (~> 4.3.1) json-schema (~> 2.8.0) jwt (~> 1.5.6) kaminari (~> 1.0) knapsack (~> 1.11.0) kubeclient (~> 2.2.0) letter_opener_web (~> 1.3.0) - license_finder (~> 2.1.0) + license_finder (~> 3.1) licensee (~> 8.7.0) lograge (~> 0.5) loofah (~> 2.0.3) @@ -1070,15 +1098,15 @@ DEPENDENCIES method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) - mysql2 (~> 0.4.5) + mysql2 (~> 0.4.10) net-ldap net-ssh (~> 4.1.0) - nokogiri (~> 1.8.1) + nokogiri (~> 1.8.2) oauth2 (~> 1.4) octokit (~> 4.6.2) oj (~> 2.17.4) omniauth (~> 1.4.2) - omniauth-auth0 (~> 1.4.1) + omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.1) omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) @@ -1093,7 +1121,6 @@ DEPENDENCIES omniauth-twitter (~> 1.2.0) omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) - paranoia (~> 2.3.1) peek (~> 1.0.1) peek-gc (~> 0.0.2) peek-host (~> 1.0.0) @@ -1104,16 +1131,15 @@ DEPENDENCIES peek-redis (~> 1.2.0) peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) - poltergeist (~> 1.9.0) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta18) + prometheus-client-mmap (~> 0.9.1) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) - rack-cors (~> 0.4.0) + rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) rack-proxy (~> 0.6.0) - rails (= 4.2.8) + rails (= 4.2.10) rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 4.0.9) rainbow (~> 2.2) @@ -1127,7 +1153,7 @@ DEPENDENCIES redcarpet (~> 3.4) redis (~> 3.2) redis-namespace (~> 1.5.2) - redis-rails (~> 5.0.1) + redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) rouge (~> 2.0) @@ -1137,9 +1163,8 @@ DEPENDENCIES rspec-retry (~> 0.4.5) rspec-set (~> 0.1.3) rspec_profiling (~> 0.0.5) - rubocop (~> 0.49.1) - rubocop-gitlab-security (~> 0.1.0) - rubocop-rspec (~> 1.15.1) + rubocop (~> 0.52.1) + rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.16.2) ruby_parser (~> 3.8) @@ -1147,9 +1172,10 @@ DEPENDENCIES rugged (~> 0.26.0) sanitize (~> 2.0) sass-rails (~> 5.0.6) - scss_lint (~> 0.54.0) - seed-fu (~> 2.3.5) + scss_lint (~> 0.56.0) + seed-fu (~> 2.3.7) select2-rails (~> 3.5.9) + selenium-webdriver (~> 3.5) sentry-raven (~> 2.5.3) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) @@ -1189,4 +1215,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.15.4 + 1.16.1 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index bc3ca9192bcb8ba8e557f9c4896271a00126e8d2..7cfaeff3382726f389b82bf986af62979779361b 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv -, ruby, tzdata, git, procps, dpkg, nettools +, ruby, tzdata, git, ps, dpkg, nettools }: /* When updating the Gemfile add `gem "activerecord-nulldb-adapter"` @@ -18,11 +18,11 @@ let }; }; - version = "10.1.1"; + version = "10.5.6"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "0xvzxcygy6ffqm24rk6v9gs6g9r744vpwwvk9d00wjla7hwmq3w2"; + sha256 = "1kml7iz4q9g5gcfqqarivlnkmkmq9250wgm95yi4rgzynb5jndd0"; }; in @@ -30,20 +30,19 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - buildInputs = [ - rubyEnv ruby bundler tzdata git procps dpkg nettools - ]; - src = fetchFromGitHub { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "0p118msad6l12pd4q3vkvjggiiasbkh6pnl94riqyb5zkb7yrb1a"; + sha256 = "059h63jn552fcir2dgsjv85zv1ihbyiwzws4h2j15mwj2cdpjkh0"; }; + buildInputs = [ + rubyEnv ruby bundler tzdata git ps dpkg nettools + ]; + patches = [ ./remove-hardcoded-locations.patch - ./nulladapter.patch ./fix-36783.patch ]; @@ -57,7 +56,9 @@ stdenv.mkDerivation rec { rm config/initializers/gitlab_shell_secret_token.rb substituteInPlace app/controllers/admin/background_jobs_controller.rb \ - --replace "ps -U" "${procps}/bin/ps -U" + --replace "ps -U" "${ps}/bin/ps -U" + + sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake # required for some gems: cat > config/database.yml < gitlab-deb-data.tar + tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu + tar -xf gitlab-deb-data.tar + mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public rm -rf opt diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 4fb4c48b0dee9197bdc4e8b2b43cd84f1c272ca8..4a021f5f2d97c4921f3025f451c023fad59de363 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -19,64 +19,55 @@ dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pr3cmr0bpgg5d0f6wy1z6r45n14r9yin8jnr4hi3ssf402xpc0q"; + sha256 = "1ivyjsapqgn1xfb2p8yqjrg2jldqm5r7hxrjxq6kdr05gk4fsg59"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09fbazl0ja80na2wadfp3fzmdmdy1lsb4wd2yg7anbj0zk0ap7a9"; + sha256 = "0l6agrxdaishxjx2zc2x8md95plfp39bfskzgs6v9gsdp2y2arpx"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; actionview = { dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mg4a8143q2wjhjq4mngl69jkv249z5jvg0jkdribdv4zkg586rp"; + sha256 = "1jrx2pmkywk70z7n17gw3jrcdw3n03wdzvg45bnq8wxshl1lmbhv"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kazbpfgzz6cdmwjnlb9m671ps4qgggwv2hy8y9xi4h96djyyfqz"; + sha256 = "10jsa5pqklcsd2npicqxr5abjlwi53di2brpzgz35k557fkpc1z8"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; activemodel = { dependencies = ["activesupport" "builder"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11vhh7zmp92880s5sx8r32v2p0b7xg039mfr92pjynpkz4q901ld"; + sha256 = "0c4vj9xajxa906bqbcjpni74nya6rh2nbb15gl8xm0vl9zf3ll9v"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kk4dhn8jfhqfsf1dmb3a183gix6k46xr6cjkxj0rp51w2za1ns0"; + sha256 = "1lws9y4p9c2vnmv3ddfpv8jh6azlddppl3fi31vahaz14ifxjk5s"; type = "gem"; }; - version = "4.2.8"; - }; - activerecord-nulldb-adapter = { - dependencies = ["activerecord"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dxk26drn3s0mpyk8ir30k1pg5fqndrnsdjkkncn0acylq4ja27z"; - type = "gem"; - }; - version = "0.3.7"; + version = "4.2.10"; }; activerecord_sane_schema_dumper = { dependencies = ["rails"]; @@ -91,10 +82,10 @@ dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wibdzd2f5l5rlsw1a1y3j3fhw2imrrbkxggdraa6q9qbdnc66hi"; + sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -173,6 +164,15 @@ }; version = "0.0.7"; }; + asset_sync = { + dependencies = ["activemodel" "fog-core" "mime-types" "unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "044nqqnbib1bpld33j5jxcql06d6fr6zmhq8hlm69zqd0xd509p0"; + type = "gem"; + }; + version = "2.2.0"; + }; ast = { source = { remotes = ["https://rubygems.org"]; @@ -248,6 +248,14 @@ }; version = "0.3.2"; }; + batch-loader = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nvmwzn8q6dkp2n8wz47z7gldj3yrj7h6syy0cwrkzi19bfvxba2"; + type = "gem"; + }; + version = "1.2.1"; + }; bcrypt = { source = { remotes = ["https://rubygems.org"]; @@ -298,6 +306,14 @@ }; version = "0.7.2"; }; + blankslate = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx"; + type = "gem"; + }; + version = "2.1.2.4"; + }; bootstrap-sass = { dependencies = ["autoprefixer-rails" "sass"]; source = { @@ -387,10 +403,10 @@ dependencies = ["activemodel" "activesupport" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nms4w6vkm7djghdxwi9qzykhc2ynjwblgqwk87w61fhispqlq2c"; + sha256 = "012b5jks7hxis1agiy7rbra5h4zhmwhy95gck3kr22nwdxfk71ii"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; cause = { source = { @@ -408,6 +424,15 @@ }; version = "0.7.5"; }; + childprocess = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rqf595gv0bb48awck2cvipk78jy5pj08p1r4xbrfpd0i60jb9hd"; + type = "gem"; + }; + version = "0.7.0"; + }; chronic = { source = { remotes = ["https://rubygems.org"]; @@ -441,14 +466,6 @@ }; version = "3.0.2"; }; - cliver = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7"; - type = "gem"; - }; - version = "0.3.2"; - }; coderay = { source = { remotes = ["https://rubygems.org"]; @@ -786,23 +803,23 @@ }; version = "0.9.0"; }; - factory_girl = { + factory_bot = { dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xzl4z9z390fsnyxp10c9if2n46zan3n6zwwpfnwc33crv4s410i"; + sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx"; type = "gem"; }; - version = "4.7.0"; + version = "4.8.2"; }; - factory_girl_rails = { - dependencies = ["factory_girl" "railties"]; + factory_bot_rails = { + dependencies = ["factory_bot" "railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hzpirb33xdqaz44i1mbcfv0icjrghhgaz747llcfsflljd4pa4r"; + sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2"; type = "gem"; }; - version = "4.7.0"; + version = "4.8.2"; }; faraday = { dependencies = ["multipart-post"]; @@ -831,6 +848,14 @@ }; version = "0.0.6"; }; + fast_blank = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56"; + type = "gem"; + }; + version = "1.0.0"; + }; fast_gettext = { source = { remotes = ["https://rubygems.org"]; @@ -859,27 +884,36 @@ dependencies = ["erubis" "path_expander" "ruby_parser" "sexp_processor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x563gyx292ka3awps6h6hmswqf71zdxnzw0pfv6p2mhd2zwxaba"; + sha256 = "0rzggr9w6z2jvs3mv0bp7d64yjivpp93ww9g4j9azzcfjqnh9hn3"; type = "gem"; }; - version = "2.8.1"; + version = "2.10.0"; }; flipper = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1gbvd4j0rkr7qc3mnjdw4r9p6lffnwv7rvm1cyr8a0avjky34n8p"; + sha256 = "0j3zn54x0a6vvjmyhggl992df7zpcrhzv9ibr6af5gkcx502pg87"; type = "gem"; }; - version = "0.10.2"; + version = "0.11.0"; }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "053lq791z8bf3xv6kb14nq3yrzjpmlyhzq3kvys978dc8yw78ld7"; + sha256 = "0bm1wh1nrl6zbrcqk1nyqbrpddd5fvi72jyqv1j7y2df5sqwfj91"; type = "gem"; }; - version = "0.10.2"; + version = "0.11.0"; + }; + flipper-active_support_cache_store = { + dependencies = ["activesupport" "flipper"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w11dmby55cyd4azic1nsb7h632y6nx3ka8ndlrd1g6g28afvfb"; + type = "gem"; + }; + version = "0.11.0"; }; flowdock = { dependencies = ["httparty" "multi_json"]; @@ -894,10 +928,10 @@ dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i76g8sdskyfc0gcnd6n9i757s7dmwg3wf6spcr2xh8wzyxkm1pj"; + sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; type = "gem"; }; - version = "0.1.0"; + version = "0.2.0"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; @@ -1071,10 +1105,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irc3yfyr5li2ki6w03znsklnk0qx3srk4wrb7jav042c4kw325k"; + sha256 = "05ql75gbcw8px03y4pjvbnfy272mh68777f4m3sfajr1jjjp4lw8"; type = "gem"; }; - version = "0.39.0"; + version = "0.84.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1114,10 +1148,19 @@ gitlab-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "114jfbyyfwad609k1l1fcmbzszb3frdchh83gdwndkglllvprhjz"; + sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki"; type = "gem"; }; - version = "1.6.2"; + version = "1.6.3"; + }; + gitlab-styles = { + dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m0ihbp7kjis03pcdx5310j7nzsxh22hfailnz0j467zab9jiap0"; + type = "gem"; + }; + version = "2.3.2"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -1132,10 +1175,10 @@ dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11plkgyl3w9k4y2scc1igvpgwyz4fnmsr63h2q4j8wkb48nlnhak"; + sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38"; type = "gem"; }; - version = "0.3.7"; + version = "0.4.1"; }; gollum-grit_adapter = { dependencies = ["gitlab-grit"]; @@ -1185,10 +1228,19 @@ google-protobuf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl"; + sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi"; + type = "gem"; + }; + version = "3.5.1"; + }; + googleapis-common-protos-types = { + dependencies = ["google-protobuf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck"; type = "gem"; }; - version = "3.4.0.2"; + version = "1.0.1"; }; googleauth = { dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; @@ -1245,13 +1297,13 @@ version = "1.7.0"; }; grpc = { - dependencies = ["google-protobuf" "googleauth"]; + dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52"; + sha256 = "0fpbxzqacmc78m7whbv3vyfsfyk3cnfbppsy4789mwrlnbnfnp1j"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.3"; }; haml = { dependencies = ["tilt"]; @@ -1401,12 +1453,13 @@ version = "2.8.2"; }; i18n = { + dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3aqvzfsj786kwjj70jsjpxm6ffw5pwhalzr2abjfv2bdc7k9kw"; + sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s"; type = "gem"; }; - version = "0.8.6"; + version = "0.9.1"; }; ice_nine = { source = { @@ -1454,10 +1507,10 @@ dependencies = ["rails-dom-testing" "railties" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1asbrr9hqf43q9qbjf87f5lm7fp12pndh76z89ks6jwxf1350fj1"; + sha256 = "02ii77vwxc49f2lrkbdzww2168bp5nihwzakc9mqyrsbw394w7ki"; type = "gem"; }; - version = "4.1.1"; + version = "4.3.1"; }; json = { source = { @@ -1582,13 +1635,13 @@ version = "1.3.0"; }; license_finder = { - dependencies = ["httparty" "rubyzip" "thor" "xml-simple"]; + dependencies = ["httparty" "rubyzip" "thor" "toml" "with_env" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "092rwf1yjq1l63zbqanmbnbky8g5pj7c3g30mcqbyppbqrsflx80"; + sha256 = "12p18a34q8dgzjwi2plgv889kxnxqnnmrqhvjs3ng2z26hv2zfag"; type = "gem"; }; - version = "2.1.0"; + version = "3.1.1"; }; licensee = { dependencies = ["rugged"]; @@ -1643,13 +1696,13 @@ version = "2.0.3"; }; mail = { - dependencies = ["mime-types"]; + dependencies = ["mini_mime"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9"; + sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz"; type = "gem"; }; - version = "2.6.6"; + version = "2.7.0"; }; mail_room = { source = { @@ -1733,14 +1786,6 @@ }; version = "5.7.0"; }; - mmap2 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rgf4zhqa6632nbqj585hc0x69iz21s5c91mpijcr9i5wpj9p1s6"; - type = "gem"; - }; - version = "2.2.7"; - }; mousetrap-rails = { source = { remotes = ["https://rubygems.org"]; @@ -1793,10 +1838,10 @@ mysql2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kh96xp396swyaddz5l2zqjxi3cvyqv62scak9b3f98j14ynfscl"; + sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq"; type = "gem"; }; - version = "0.4.5"; + version = "0.4.10"; }; net-ldap = { source = { @@ -1826,10 +1871,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021"; + sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq"; type = "gem"; }; - version = "1.8.1"; + version = "1.8.2"; }; numerizer = { source = { @@ -1886,10 +1931,10 @@ dependencies = ["omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dhfl01519q1cp4w0ml481j1cg05g7qvam0x4ia9jhdz8yx6npfs"; + sha256 = "0id5gn14av81kh41cq4q6c9knyvzl7vc4rs3m4pmpd43g2z6jdw2"; type = "gem"; }; - version = "1.4.1"; + version = "2.0.0"; }; omniauth-authentiq = { dependencies = ["omniauth-oauth2"]; @@ -2063,36 +2108,36 @@ parallel = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd"; + sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; type = "gem"; }; - version = "1.12.0"; + version = "1.12.1"; }; - paranoia = { - dependencies = ["activerecord"]; + parser = { + dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibdga0a0px8rf82qnmgm59z3z4s27r11i2i24087f0yh8z8bd7z"; + sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0.2"; }; - parser = { - dependencies = ["ast"]; + parslet = { + dependencies = ["blankslate"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq"; + sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3"; type = "gem"; }; - version = "2.4.0.0"; + version = "1.5.0"; }; path_expander = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0hklnfb0br6mx6l25zknz2zj6r152i0jiy6fn6ki220x0l5m2h59"; + sha256 = "0wsymhprfjazdkmfv02kski3iwjjkciwxqjg9brh56sbymcgk34a"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; peek = { dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"]; @@ -2192,15 +2237,6 @@ }; version = "1.0.1"; }; - poltergeist = { - dependencies = ["capybara" "cliver" "multi_json" "websocket-driver"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fnkly1ks31nf5cdks9jd5c5vynbanrr8pwp801qq2i8bg78rwc0"; - type = "gem"; - }; - version = "1.9.0"; - }; posix-spawn = { source = { remotes = ["https://rubygems.org"]; @@ -2253,13 +2289,12 @@ version = "0.0.3"; }; prometheus-client-mmap = { - dependencies = ["mmap2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fgkilpiha338mvfkj5rwhny3vld0nb3v1vgbrlxbhnvch26wakh"; + sha256 = "1p3xkk9zal95di5v999mk7sq02fk0fimg633ixvhvv70ph6c8dhn"; type = "gem"; }; - version = "0.7.0.beta18"; + version = "0.9.1"; }; pry = { dependencies = ["coderay" "method_source" "slop"]; @@ -2333,10 +2368,10 @@ rack-cors = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1sz9d9gjmv2vjl3hddzk269hb1k215k8sp37gicphx82h3chk1kw"; + sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013"; type = "gem"; }; - version = "0.4.0"; + version = "1.0.2"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"]; @@ -2378,10 +2413,10 @@ dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpbf3ybzbhqqkwg5vi60121860cr8fybvchrxk5wy3f2jcj0mch"; + sha256 = "15vbdlkmlh470g7msqhmcmhxhi4finv3cjg595x9viafvphnf40l"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; rails-deprecated_sanitizer = { dependencies = ["activesupport"]; @@ -2423,10 +2458,10 @@ dependencies = ["actionpack" "activesupport" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bavl4hj7bnl3ryqi9rvykm410kflplgingkcxasfv1gdilddh4g"; + sha256 = "0snymfqj2cql0gp51i6a44avcirdridc15yggnxjj9raa9f3229p"; type = "gem"; }; - version = "4.2.8"; + version = "4.2.10"; }; rainbow = { dependencies = ["rake"]; @@ -2448,10 +2483,27 @@ rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw"; + sha256 = "190p7cs8zdn07mjj6xwwsdna3g0r98zs4crz7jh2j2q5b0nbxgjf"; + type = "gem"; + }; + version = "12.3.0"; + }; + rb-fsevent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; type = "gem"; }; - version = "12.1.0"; + version = "0.10.2"; + }; + rb-inotify = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + type = "gem"; + }; + version = "0.9.10"; }; rblineprof = { dependencies = ["debugger-ruby_core_source"]; @@ -2533,28 +2585,28 @@ redis = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0kdj7511l6kqvqmaiw7kw604c83pk6f4b540gdsq1bf7yxm6qx6g"; + sha256 = "0i415x8gi0c5vsiy6ikvx5js6fhc4x80a5lqv8iidy2iymd20irv"; type = "gem"; }; - version = "3.3.3"; + version = "3.3.5"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gnkqi7cji2q5yfwm8b752k71pqrb3dqksv983yrf23virqnjfjr"; + sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; redis-activesupport = { dependencies = ["activesupport" "redis-store"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i0r23rv32k25jqwbr4cb73alyaxwvz9crdaw3gv26h1zjrdjisd"; + sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.4"; }; redis-namespace = { dependencies = ["redis"]; @@ -2569,28 +2621,28 @@ dependencies = ["rack" "redis-store"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fbxl5gv8krjf6n88gvn44xbzhfnsysnzawz7zili298ak98lsb3"; + sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb"; type = "gem"; }; - version = "1.6.0"; + version = "2.0.4"; }; redis-rails = { dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04l2y26k4v30p3dx0pqf9gz257q73qzgrfqf3qv6bxwyv8z9f5hm"; + sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; redis-store = { dependencies = ["redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1da15wr3wc1d4hqy7h7smdc2k2jpfac3waa9d65si6f4dmqymkkq"; + sha256 = "00yh8rhv91vxjlqs4ylic99m9npjxmgib2vjj8hgzk1174y6vcmq"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.1"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -2769,28 +2821,28 @@ dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mqyylfzch0967w7nfnqza84sqhljijd9y4bnq8hcmrscch75cxw"; + sha256 = "0d22rr1jnjfkw10rbnqb8plyd7kzf553nm3sbv14xil65s4mkijf"; type = "gem"; }; - version = "0.49.1"; + version = "0.52.1"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy"; + sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; rubocop-rspec = { dependencies = ["rubocop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "16qgakivl2vqbx82fm78999cximbb10jbz3ix1ga4a2rns5xxlf3"; + sha256 = "18rd3w2q07vkfdk9nl8apkpyjfw1478qg82zgfnd4hn3r40jkbcx"; type = "gem"; }; - version = "1.15.1"; + version = "1.22.1"; }; ruby-fogbugz = { dependencies = ["crack"]; @@ -2812,10 +2864,10 @@ ruby-progressbar = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm"; + sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; ruby-saml = { dependencies = ["nokogiri"]; @@ -2894,12 +2946,22 @@ version = "2.1.0"; }; sass = { + dependencies = ["sass-listen"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; + type = "gem"; + }; + version = "3.5.5"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy"; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; type = "gem"; }; - version = "3.4.22"; + version = "4.0.0"; }; sass-rails = { dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"]; @@ -2923,10 +2985,10 @@ dependencies = ["rake" "sass"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01lwbrz7637j79jkm6yaq4wsd4cqgzn0r74whn85v7j9dir73l98"; + sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g"; type = "gem"; }; - version = "0.54.0"; + version = "0.56.0"; }; securecompare = { source = { @@ -2940,10 +3002,10 @@ dependencies = ["activerecord" "activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nkp1pvkdydclbl2v4qf9cixmiycvlqnrgxd61sv9r85spb01z3p"; + sha256 = "0x6gclryl0hds3zms095d2iyafcvm2kfrm7362vrkxws7r2775pi"; type = "gem"; }; - version = "2.3.6"; + version = "2.3.7"; }; select2-rails = { dependencies = ["thor"]; @@ -2954,6 +3016,15 @@ }; version = "3.5.9.3"; }; + selenium-webdriver = { + dependencies = ["childprocess" "rubyzip"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w6r0k1w7hpk853qfw18lipyzxs0r0d6xr70zqsjfdn2dwr0rb30"; + type = "gem"; + }; + version = "3.5.0"; + }; sentry-raven = { dependencies = ["faraday"]; source = { @@ -3001,10 +3072,10 @@ dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nazi3a9aq7c7cxk749qz9ilp7dv39r9n3zsbjg4frc96bb85s9w"; + sha256 = "0mmmv6k4l5rd74zw4xmwsadi0pbbcyzk1cm73zd8fzwra6nfz7sh"; type = "gem"; }; - version = "5.0.4"; + version = "5.0.5"; }; sidekiq-cron = { dependencies = ["rufus-scheduler" "sidekiq"]; @@ -3141,10 +3212,10 @@ dependencies = ["actionpack" "activesupport" "sprockets"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zr9vk2vn44wcn4265hhnnnsciwlmqzqc6bnx78if1xcssxj6x44"; + sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; type = "gem"; }; - version = "3.2.0"; + version = "3.2.1"; }; sqlite3 = { source = { @@ -3295,6 +3366,15 @@ }; version = "0.8.3"; }; + toml = { + dependencies = ["parslet"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v"; + type = "gem"; + }; + version = "0.1.2"; + }; toml-rb = { dependencies = ["citrus"]; source = { @@ -3317,10 +3397,10 @@ dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r81lk7q7275rdq7xipfm0yxgqyd2ggh73xpc98ypngcclqcscl"; + sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.4"; }; u2f = { source = { @@ -3476,31 +3556,22 @@ }; version = "0.9.10"; }; - websocket-driver = { - dependencies = ["websocket-extensions"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9"; - type = "gem"; - }; - version = "0.6.3"; - }; - websocket-extensions = { + wikicloth = { + dependencies = ["builder" "expression_parser" "rinku"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "07qnsafl6203a2zclxl20hy4jq11c471cgvd0bj5r9fx1qqw06br"; + sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s"; type = "gem"; }; - version = "0.1.2"; + version = "0.8.1"; }; - wikicloth = { - dependencies = ["builder" "expression_parser" "rinku"]; + with_env = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s"; + sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; type = "gem"; }; - version = "0.8.1"; + version = "1.1.0"; }; xml-simple = { source = { diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch deleted file mode 100644 index 3b30ff03346b8b4ed35b754aa80d2673381a082c..0000000000000000000000000000000000000000 --- a/pkgs/applications/version-management/gitlab/nulladapter.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/Gemfile b/Gemfile -index 4861171ef5..f6e701c548 100644 ---- a/Gemfile -+++ b/Gemfile -@@ -1,5 +1,7 @@ - source 'https://rubygems.org' - -+gem 'activerecord-nulldb-adapter' -+ - gem 'rails', '4.2.8' - gem 'rails-deprecated_sanitizer', '~> 1.0.3' - -diff --git a/Gemfile.lock b/Gemfile.lock -index 38944248f9..08ce4486ba 100644 ---- a/Gemfile.lock -+++ b/Gemfile.lock -@@ -33,6 +33,8 @@ GEM - activemodel (= 4.2.8) - activesupport (= 4.2.8) - arel (~> 6.0) -+ activerecord-nulldb-adapter (0.3.7) -+ activerecord (>= 2.0.0) - activerecord_sane_schema_dumper (0.2) - rails (>= 4, < 5) - activesupport (4.2.8) -@@ -963,6 +965,7 @@ PLATFORMS - DEPENDENCIES - RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.1.0) -+ activerecord-nulldb-adapter - activerecord_sane_schema_dumper (= 0.2) - acts-as-taggable-on (~> 4.0) - addressable (~> 2.5.2) diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 39c7c28847c477f413547bf83ca9d87b1865d888..7a2bfea0c109c180503b75b5347d77b0ae81c83e 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -1,8 +1,8 @@ diff --git a/config/environments/production.rb b/config/environments/production.rb -index c5cbfcf64c..e40f10e25f 100644 +index c5cbfcf64c..4d01f6fab8 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb -@@ -70,14 +70,16 @@ Rails.application.configure do +@@ -70,10 +70,10 @@ Rails.application.configure do config.action_mailer.delivery_method = :sendmail # Defaults to: @@ -11,23 +11,17 @@ index c5cbfcf64c..e40f10e25f 100644 - # # arguments: '-i -t' - # # } + config.action_mailer.sendmail_settings = { -+ location: '/run/wrappers/bin/sendmail', ++ location: '/usr/sbin/sendmail', + arguments: '-i -t' + } config.action_mailer.perform_deliveries = true config.action_mailer.raise_delivery_errors = true - config.eager_load = true - - config.allow_concurrency = false -+ -+ config.active_record.dump_schema_after_migration = false - end diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index 0b33783869..cd4e41d9bd 100644 +index bd696a7f2c..44e3863736 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -574,7 +574,7 @@ production: &base +@@ -590,7 +590,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: @@ -37,10 +31,10 @@ index 0b33783869..cd4e41d9bd 100644 ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb -index 8ddf8e4d2e..559cf9adf7 100644 +index 0bea8a4f4b..290248547b 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb -@@ -252,7 +252,7 @@ Settings.gitlab['user'] ||= 'git' +@@ -255,7 +255,7 @@ Settings.gitlab['user'] ||= 'git' Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir rescue ArgumentError # no user configured @@ -49,7 +43,7 @@ index 8ddf8e4d2e..559cf9adf7 100644 end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? -@@ -491,7 +491,7 @@ Settings.backup['upload']['storage_class'] ||= nil +@@ -507,7 +507,7 @@ Settings.backup['upload']['storage_class'] ||= nil # Git # Settings['git'] ||= Settingslogic.new({}) @@ -58,38 +52,42 @@ index 8ddf8e4d2e..559cf9adf7 100644 # Important: keep the satellites.path setting until GitLab 9.0 at # least. This setting is fed to 'rm -rf' in +diff --git a/lib/api/api.rb b/lib/api/api.rb +index e953f3d2ec..3a8d9f076b 100644 +--- a/lib/api/api.rb ++++ b/lib/api/api.rb +@@ -2,7 +2,7 @@ module API + class API < Grape::API + include APIGuard + +- LOG_FILENAME = Rails.root.join("log", "api_json.log") ++ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log") + + NO_SLASH_URL_PART_REGEX = %r{[^/]+} + PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb -index 59b21149a9..4f4a39a06c 100644 +index a42e312b5d..ccaab9229e 100644 --- a/lib/gitlab/logger.rb +++ b/lib/gitlab/logger.rb -@@ -13,7 +13,7 @@ +@@ -26,7 +26,7 @@ module Gitlab end - def self.read_latest -- path = Rails.root.join("log", file_name) -+ path = File.join(ENV["GITLAB_LOG_PATH"], file_name) - - return [] unless File.readable?(path) - -@@ -22,7 +22,7 @@ + def self.full_log_path +- Rails.root.join("log", file_name) ++ File.join(ENV["GITLAB_LOG_PATH"], file_name) end - def self.build -- new(Rails.root.join("log", file_name)) -+ new(File.join(ENV["GITLAB_LOG_PATH"], file_name)) - end - end - end + def self.cache_key diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb -index b5f4124052..f72c556983 100644 +index 7d7400bdab..cb25211d44 100644 --- a/lib/gitlab/uploads_transfer.rb +++ b/lib/gitlab/uploads_transfer.rb @@ -1,7 +1,7 @@ module Gitlab class UploadsTransfer < ProjectTransfer def root_dir -- File.join(CarrierWave.root, FileUploader.base_dir) -+ ENV['GITLAB_UPLOADS_PATH'] || File.join(CarrierWave.root, FileUploader.base_dir) +- FileUploader.root ++ ENV['GITLAB_UPLOADS_PATH'] || FileUploader.root end end end @@ -107,7 +105,7 @@ index 3e0c436d6e..28cefc5514 100644 end end diff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rb -index 7026d0ba07..6d88b8b9fb 100644 +index 7026d0ba07..c56e1f7ed9 100644 --- a/lib/system_check/app/uploads_directory_exists_check.rb +++ b/lib/system_check/app/uploads_directory_exists_check.rb @@ -4,12 +4,13 @@ module SystemCheck @@ -122,7 +120,7 @@ index 7026d0ba07..6d88b8b9fb 100644 + uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads') try_fixing_it( - "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads" -+ "sudo -u #{gitlab_user} mkdir #{uploads_dir}" ++ "sudo -u #{gitlab_user} mkdir #{uploads_dir}" ) for_more_information( see_installation_guide_section 'GitLab' @@ -152,14 +150,3 @@ index b276a81eac..070e3ebd81 100644 end end end ---- a/lib/api/api.rb 1970-01-01 01:00:01.000000000 +0100 -+++ b/lib/api/api.rb 2017-09-28 19:37:24.953605705 +0200 -@@ -2,7 +2,7 @@ - class API < Grape::API - include APIGuard - -- LOG_FILENAME = Rails.root.join("log", "api_json.log") -+ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log") - - use GrapeLogging::Middleware::RequestLogger, - logger: Logger.new(LOG_FILENAME), diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d062c32d018ed5b85e0ff7d5a8bc64b560288127 --- /dev/null +++ b/pkgs/applications/version-management/gitless/default.nix @@ -0,0 +1,26 @@ +{ fetchFromGitHub, pythonPackages, stdenv }: + +pythonPackages.buildPythonApplication rec { + ver = "0.8.6"; + name = "gitless-${ver}"; + + src = fetchFromGitHub { + owner = "sdg-mit"; + repo = "gitless"; + rev = "v${ver}"; + sha256 = "1q6y38f8ap6q1livvfy0pfnjr0l8b68hyhc9r5v87fmdyl7y7y8g"; + }; + + propagatedBuildInputs = with pythonPackages; [ sh pygit2 clint ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://gitless.com/; + description = "A version control system built on top of Git"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.cransom ]; + }; +} + diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 5e1feacd83d40783c9397a1f47eff652a0831c3a..78b59f59e949ad630045ea5913c136b5132628c8 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, git, nettools, perl }: +{ stdenv, fetchFromGitHub, git, nettools, perl }: stdenv.mkDerivation rec { name = "gitolite-${version}"; - version = "3.6.3"; + version = "3.6.7"; - src = fetchurl { - url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz"; - sha256 = "16cxifjxnri719qb6zzwkdf61x5y957acbdhcgqcan23x1mfn84v"; + src = fetchFromGitHub { + owner = "sitaramc"; + repo = "gitolite"; + rev = "9123ae44b14b9df423a7bf1e693e05865ca320ac"; + sha256 = "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb"; }; buildInputs = [ git nettools perl ]; @@ -26,6 +28,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin perl ./install -to $out/bin + echo ${version} > $out/bin/VERSION ''; meta = with stdenv.lib; { @@ -33,6 +36,6 @@ stdenv.mkDerivation rec { homepage = http://gitolite.com/gitolite/index.html; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice maintainers.lassulus ]; + maintainers = [ maintainers.thoughtpolice maintainers.lassulus maintainers.tomberek ]; }; } diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index a86a7f96e097f9561792b399b1c1c8ae521091a1..508c8b3fb6de9a5215bec615c1cb2b2a0a326d27 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gogs-${version}"; - version = "0.11.29"; + version = "0.11.34"; src = fetchFromGitHub { owner = "gogits"; repo = "gogs"; rev = "v${version}"; - sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0"; + sha256 = "15xwcw3k7wbahdgp796gly79qkka21p7kvm84zfjgcsjjri0kdnz"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 25a85f4b92d7e32cfd2d2d22b4d1fdb1992b0d7a..d617d363fa0c37158bab8419204630304b839390 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,26 +1,25 @@ { stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre -, SDL2_image, freetype, glew, mesa, boost, glm +, SDL2_image, freetype, glew, libGLU_combined, boost, glm }: stdenv.mkDerivation rec { - version = "0.47"; + version = "0.48"; name = "gource-${version}"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz"; - sha256 = "1llqwdnfa1pff8bxk27qsqff1fcg0a9kfdib0rn7p28vl21n1cgj"; + sha256 = "04qxcm05qiyr9rg2kv6abfy7kkzqr8ziw4iyp1d14lniv93m61dp"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa + glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined boost glm freetype ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; - NIX_CFLAGS_COMPILE = "-fpermissive " + # fix build with newer gcc versions - "-std=c++11"; # fix build with glm >= 0.9.6.0 + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://gource.io/; @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { Mercurial and Bazaar and SVN. Gource can also parse logs produced by several third party tools for CVS repositories. ''; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index bfaa62ebb66d7ba8c4f90aa4fda114406a8bd6d6..ded0d5e398634d8f8b69588a36adaa5dc3826c78 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { branch = "net.venge.monotone.guitone"; }; + patches = [ ./parallel-building.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ qt4 qmake4Hook graphviz ]; @@ -24,6 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 based GUI for monotone"; homepage = http://guitone.thomaskeller.biz; + downloadPage = https://code.monotone.ca/p/guitone/; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/version-management/guitone/parallel-building.patch b/pkgs/applications/version-management/guitone/parallel-building.patch new file mode 100644 index 0000000000000000000000000000000000000000..f0e924cbfb812226ae82b925d23d4edab600d3c0 --- /dev/null +++ b/pkgs/applications/version-management/guitone/parallel-building.patch @@ -0,0 +1,7 @@ +Without this `make tmp/AttributesView.o` fails with +src/view/dialogs/AddEditAttribute.h:22:35: fatal error: ui_add_edit_attribute.h: No such file or directory +--- a/guitone.pro ++++ b/guitone.pro +@@ -215 +215,2 @@ help.commands = @echo Available targets: $${QMAKE_EXTRA_TARGETS} + QMAKE_EXTRA_TARGETS += help ++CONFIG += depend_includepath diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 05db6d964c3a11a0600ad5fc157e80b81f379b34..e3cafe6b646494fff2b563d454ca17c7aabe7518 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, itstool, python2Packages, intltool, wrapGAppsHook +{ stdenv, fetchurl, itstool, python3Packages, intltool, wrapGAppsHook , libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file }: let - minor = "3.16"; - version = "${minor}.4"; - inherit (python2Packages) python buildPythonApplication pycairo pygobject3; + pname = "meld"; + version = "3.18.0"; + inherit (python3Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { - name = "meld-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; - sha256 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4"; }; buildInputs = [ intltool wrapGAppsHook itstool libxml2 - gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo + gnome3.gtksourceview gnome3.gsettings-desktop-schemas pycairo cairo gnome3.defaultIconTheme gnome3.dconf file ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; @@ -41,6 +41,14 @@ in buildPythonApplication rec { pythonPath = [ gtk3 ]; + doCheck = false; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Visual diff and merge tool"; homepage = http://meldmerge.org/; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 774aa1082bc8ee11660517adebfebfc40313f6e7..a00393abf270bdf5bdf25e3ecf00b876acdd0c10 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.3.2"; + version = "4.5.2"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,17 +13,17 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "0j6djq584rcj9ghz59ddqzrfq49lykg3wqwap5fnzp9apa4gcnqg"; + sha256 = "14732hhw2ibvy5khqxjc8a983z3rib5vp9lqfbws80lm3kyryjm4"; }; inherit python; # pass it so that the same version can be used in hg2git - buildInputs = [ makeWrapper docutils unzip ]; + buildInputs = [ makeWrapper docutils unzip ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; - propagatedBuildInputs = [ hg-git dulwich ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices cf-private ]; + propagatedBuildInputs = [ hg-git dulwich ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postInstall = (stdenv.lib.optionalString guiSupport '' @@ -34,9 +34,9 @@ in python2Packages.buildPythonApplication { hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py EOF # setting HG so that hgk can be run itself as well (not only hg view) - WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\" - --set HG \"$out/bin/hg\" - --prefix PATH : \"${tk}/bin\" " + WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} + --set HG $out/bin/hg + --prefix PATH : ${tk}/bin " '') + '' for i in $(cd $out/bin && ls); do diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index c2006e9dd6bf639e1af430624378cf070dcbb711..c24d80e3f2efa15ffe871d3f8bda52d1fd6856bc 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -22,15 +22,15 @@ stdenv.mkDerivation rec { patchFlags = ["-p0"]; patches = [ (fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch"; + url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch"; sha256 = "0risfy8iqmkr209hmnvpv57ywbd3rvchzzd0jy2lfyqrrrm6zknw"; }) (fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch"; + url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch"; sha256 = "16bj0ppzqd45an154dr7sifjra7lv4m9anxfw3c56y763jq7fafa"; }) (fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch"; + url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch"; sha256 = "1gfp82rc7pawb5x4hh2wf7xh1l1l54ib75930xgd1y437la4703r"; }) ]; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index c3ed61f31a237827f8646e8277c94304633eba3e..18fb672226f2c65b8fca72eb55147d8146e1755f 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -1,9 +1,9 @@ -{lib, python2Packages, git, mercurial, coreutils}: +{lib, python2Packages, fetchFromGitHub, fetchurl, git, mercurial, coreutils}: with python2Packages; buildPythonApplication rec { name = "${pname}-${version}"; - version = "0.3.0"; + version = "0.3.1"; pname = "nbstripout"; # Mercurial should be added as a build input but because it's a Python @@ -12,11 +12,30 @@ buildPythonApplication rec { buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; - src = fetchPypi { - inherit pname version; - sha256 = "126xhjma4a0k7gq58hbqglhb3rai0a576azz7g8gmqjr3kl0264v"; + # PyPI source is currently missing tests. Thus, use GitHub instead. + # See: https://github.com/kynan/nbstripout/issues/73 + # Use PyPI again after it has been fixed in a release. + src = fetchFromGitHub { + owner = "kynan"; + repo = pname; + rev = version; + sha256 = "1jifqmszjzyaqzaw2ir83k5fdb04iyxdad4lclawpb42hbink9ws"; }; + patches = [ + ( + # Fix git diff tests by using --no-index. + # See: https://github.com/kynan/nbstripout/issues/74 + # + # Remove this patch once the pull request has been merged and a new + # release made. + fetchurl { + url = "https://github.com/jluttine/nbstripout/commit/03e28424fb788dd09a95e99814977b0d0846c0b4.patch"; + sha256 = "09myfb77a2wh8lqqs9fcpam97vmaw8b7zbq8n5gwn6d80zbl7dn0"; + } + ) + ]; + # for some reason, darwin uses /bin/sh echo native instead of echo binary, so # force using the echo binary postPatch = '' @@ -25,7 +44,7 @@ buildPythonApplication rec { # ignore flake8 tests for the nix wrapped setup.py checkPhase = '' - PATH=$PATH:$out/bin:${mercurial}/bin pytest --ignore=nix_run_setup.py . + PATH=$PATH:$out/bin:${mercurial}/bin pytest . ''; meta = { diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..27e029d39d1e129f9f7e10a3542ebc89ab48407f --- /dev/null +++ b/pkgs/applications/version-management/p4v/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, makeWrapper }: + +stdenv.mkDerivation rec { + name = "p4v-${version}"; + version = "2017.3.1601999"; + + src = fetchurl { + url = "https://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; + sha256 = "f317607f1bc8877db01ff020b8b0857c2d0f8600474d152749264aea0be66b21"; + }; + + dontBuild = true; + nativeBuildInputs = [makeWrapper]; + + ldLibraryPath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + qtbase + qtmultimedia + qtscript + qtsensors + qtwebkit + openssl + ]; + + installPhase = '' + mkdir $out + cp -r bin $out + mkdir -p $out/lib/p4v + cp -r lib/p4v/P4VResources $out/lib/p4v + + for f in $out/bin/*.bin ; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f + + wrapProgram $f \ + --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ + --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb \ + --suffix QT_PLUGIN_PATH : ${qtbase.bin}/${qtbase.qtPluginPrefix} + done + ''; + + meta = { + description = "Perforce Visual Client"; + homepage = https://www.perforce.com; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.nioncode ]; + }; +} diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 01369b9685dc23b652692b0a42affb96aed1ad7d..3ac52a5c440303e137bb5f8638da2dd4902a4a5d 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "peru-${version}"; - version = "1.1.0"; + version = "1.1.3"; src = fetchFromGitHub { owner = "buildinspace"; repo = "peru"; rev = "${version}"; - sha256 = "0hvp6pvpsz0f98az4f1wl93gqlz6wj24pjnc5zs1har9rqlpq8y8"; + sha256 = "02kr3ib3ppbmcsjy8i8z41vp9gw9gdivy2l5aps12lmaa3rc6727"; }; propagatedBuildInputs = with python3Packages; [ pyyaml docopt ]; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 019296550819ab9134c5a458f39f90ec9bd49d07..d3b027fada68b4c602fe0e8278780781690f1536 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: python2Packages.buildPythonApplication rec { name = "rabbitvcs-${version}"; - version = "0.16"; + version = "0.17.1"; namePrefix = ""; src = fetchFromGitHub { owner = "rabbitvcs"; repo = "rabbitvcs"; rev = "v${version}"; - sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly"; + sha256 = "01cr16zf3gzsci1hhfli79m34fcx5m1pvswl16rkxxn212yc9fhy"; }; pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; @@ -30,6 +30,8 @@ python2Packages.buildPythonApplication rec { wrapPythonProgramsIn $cli "$out $pythonPath" ''; + doCheck = false; + meta = { description = "Graphical tools for working with version control systems"; homepage = http://rabbitvcs.org/; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..84211543c3b38441a6c8338d5d20577f11ed60c2 --- /dev/null +++ b/pkgs/applications/version-management/sit/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "sit-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "sit-it"; + repo = "sit"; + rev = "v${version}"; + sha256 = "1si4fg02wxi35hpkr58na06h19yjw6qd9c5mbb9xfkkzgz5mnssj"; + }; + + cargoSha256 = "083p7z7blj064840ddgnxvqjmih4bmy92clds3qgv5v7lh63wfmn"; + + meta = with stdenv.lib; { + description = "Serverless Information Tracker"; + homepage = http://sit-it.org/; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index d39c8140010035a461abc1ea321f5fe3040fd4a7..a34afbab55e6c09b78438876a244b45076d22658 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 = "17_1_1"; + version = "17_1_4"; src = fetchurl { - url = "http://www.syntevo.com/static/smart/download/smartgit/smartgit-linux-${version}.tar.gz"; - sha256 = "1zc1cs9gxv9498jp1nhi9z70dv9dzv0yh5f3bd89wi5zvcwly3d0"; + url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz"; + sha256 = "1x8s1mdxg7m3fy3izgnb1smrn4ng3q31x0sqnjlchkb5vx7gp5rh"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index e75223c6c363e67ae169cbafc89e6ba4c234599a..4a4879600aeb91db3fb7374f151acb59100bfe70 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "src-${version}"; - version = "1.13"; + version = "1.18"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "0l13ld8nxm1c720ns22lyx3q1bq2c2zn78vi5w92b7nl6p2nncy8"; + sha256 = "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c"; }; buildInputs = [ python rcs git makeWrapper ]; @@ -24,9 +24,17 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple single-file revision control"; - homepage = http://www.catb.org/~esr/src/; + longDescription = '' + SRC, acronym of Simple Revision Control, is RCS/SCCS reloaded with a + modern UI, designed to manage single-file solo projects kept more than one + to a directory. Use it for FAQs, ~/bin directories, config files, and the + like. Features integer sequential revision numbers, a command set that + will seem familiar to Subversion/Git/hg users, and no binary blobs + anywhere. + ''; + homepage = http://www.catb.org/esr/src/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ calvertvl ]; + maintainers = with maintainers; [ calvertvl AndersonTorres ]; }; } diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index 424a402780af913ebab08cad9bd6f665c2378ccc..4d41cad0d8e66bcde2799ffa3d8f3a8aa6a120ad 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec { src = fetchurl { urls = [ "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz" - "http://pkgs.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" + "http://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" ]; sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh"; }; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 44d1ad0cd3578f32db5a603feaee8fe574d95485..3f33410f1b1ba08a7c06016a6c9c383937a5f7fe 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,18 +2,18 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.3.1"; + version = "4.5.2"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n"; + sha256 = "0q12zjpgafdch4ns31k4afy25g837xm7v2qwj62806l2dz4rm4h9"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; - doCheck = false; + doCheck = false; # tests fail with "thg: cannot connect to X server" dontStrip = true; buildPhase = ""; installPhase = '' @@ -23,6 +23,11 @@ python2Packages.buildPythonApplication rec { ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias ''; + checkPhase = '' + echo "test: thg version" + $out/bin/thg version + ''; + meta = { description = "Qt based graphical tool for working with Mercurial"; homepage = http://tortoisehg.bitbucket.org/; diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 77663e858ef2db301db45925cc68f5de8bfa2918..0f0eec7ef9cd0bc6e9e679c43dadce6d726b642f 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,29 +1,22 @@ -{ stdenv, fetchpatch, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }: +{ stdenv, fetchFromGitHub, which, git, ronn, perl, ShellCommand +, TestMost, TestDifferences, TestDeep, TestException, TestWarn +}: stdenv.mkDerivation rec { - version = "1.20170226"; # date of commit we're pulling + version = "1.20170915"; # date of commit we're pulling name = "vcsh-${version}"; src = fetchFromGitHub { owner = "RichiH"; repo = "vcsh"; - rev = "36a7cedf196793a6d99f9d3ba2e69805cfff23ab"; - sha256 = "16lb28m4k7n796cc1kifyc1ixry4bg69q9wqivjzygdsb77awgln"; + rev = "eadb8df6aa71a76e5be36492edcadb118bd862ac"; + sha256 = "1wfzp8167lcq6akdpbi8fikjv0z3h1i5minh3423dljc04q0klm1"; }; - 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"; - }) - ]; - - buildInputs = [ which git ronn perl ShellCommand TestMost ]; + buildInputs = [ + which git ronn perl ShellCommand TestMost TestDifferences TestDeep + TestException TestWarn + ]; installPhase = "make install PREFIX=$out"; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index f0185e187bbec24569c96b309b9deb45ab800023..8b2d6fcc8c3859166f2d0e80ba55eb44c7be9d2e 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.07"; in +let version = "1.12.0"; in stdenv.mkDerivation { name = "yadm-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = "${version}"; - sha256 = "0kkxrvw17pmrx1dq0dq53jb9pm545firakrxc48znfw54n2036fw"; + sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6"; }; buildCommand = '' diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index ebc1249dc11de679bdcdc2fdaf4a402651cd1185..3dd0cc5adc291839865bac5c244191dd45643c5f 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , libX11, wxGTK , libiconv, fontconfig, freetype -, mesa +, libGLU_combined , libass, fftw, ffms , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , icu, boost, intltool # New dependencies @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include ' -i src/utils.cpp"; buildInputs = with stdenv.lib; - [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa + [ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU_combined libass fftw ffms ffmpeg zlib icu boost boost.out libiconv ] ++ optional spellcheckSupport hunspell @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { # but they are linked against GPL'd softwares # - so the resulting program will be GPL maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/avidemux/bootstrap_logging.patch b/pkgs/applications/video/avidemux/bootstrap_logging.patch new file mode 100644 index 0000000000000000000000000000000000000000..8f45251d26c257b5022ee0ba3d811c6ebb32b426 --- /dev/null +++ b/pkgs/applications/video/avidemux/bootstrap_logging.patch @@ -0,0 +1,26 @@ +diff --git a/bootStrap.bash b/bootStrap.bash +index 646a5e048..6429199ba 100644 +--- a/bootStrap.bash ++++ b/bootStrap.bash +@@ -4,6 +4,7 @@ + # + # By default we use qt5 now + # ++set -e # hard fail if something fails + packages_ext="" + rebuild=0 + do_core=1 +@@ -66,10 +67,10 @@ Process() + fi + cd $BUILDDIR + cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $BUILD_QUIRKS $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ +- make $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR" +- if [ "x$PKG" != "x" ] ; then ++ make $PARAL ++ if [ "x$PKG" != "x" ] ; then + $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package +- fi ++ fi + # we need the make install so that other packcges can be built against this one + make install DESTDIR=$FAKEROOT_DIR + } diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 7f70818bb141afb420873798d62199a857bdc473..991842ba0dc15f03d0c6f33ba6bb9f3bdb206668 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,6 +1,8 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir +{ stdenv, lib, fetchurl, fetchpatch, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite -, yasm, freetype, fontconfig, fribidi, gtk3, qt4 +, yasm, freetype, fontconfig, fribidi +, makeWrapper, libXext, libGLU, qttools, qtbase +, alsaLib , withX265 ? true, x265 , withX264 ? true, x264 , withXvid ? true, xvidcore @@ -11,9 +13,18 @@ , withFAAD ? true, faad2 , withOpus ? true, libopus , withVPX ? true, libvpx +, withQT ? true +, withCLI ? true +, default ? "qt5" +, withPlugins ? true }: -let +assert withQT -> qttools != null && qtbase != null; +assert default != "qt5" -> default == "cli"; +assert !withQT -> default != "qt5"; + +stdenv.mkDerivation rec { + name = "avidemux-${version}"; version = "2.7.0"; src = fetchurl { @@ -21,112 +32,63 @@ let sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy"; }; - common = { - inherit version src; - - patches = [ ./dynamic_install_dir.patch ]; - - enableParallelBuilding = false; - - nativeBuildInputs = [ cmake pkgconfig yasm ]; - buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype ] - ++ lib.optional withX264 x264 - ++ lib.optional withX265 x265 - ++ lib.optional withXvid xvidcore - ++ lib.optional withLAME lame - ++ lib.optional withFAAC faac - ++ lib.optional withVorbis libvorbis - ++ lib.optional withPulse libpulseaudio - ++ lib.optional withFAAD faad2 - ++ lib.optional withOpus libopus - ++ lib.optional withVPX libvpx - ; - - meta = { - homepage = http://fixounet.free.fr/avidemux/; - description = "Free video editor designed for simple video editing tasks"; - maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - }; - }; - - core = stdenv.mkDerivation (common // { - name = "avidemux-${version}"; - - preConfigure = '' - cd avidemux_core - ''; - }); - - buildPlugin = args: stdenv.mkDerivation (common // { - name = "avidemux-${args.pluginName}-${version}"; - - buildInputs = (args.buildInputs or []) ++ common.buildInputs ++ [ lndir ]; - - cmakeFlags = [ "-DPLUGIN_UI=${args.pluginUi}" ]; - - passthru.isUi = args.isUi or false; - - buildCommand = '' - unpackPhase - cd "$sourceRoot" - patchPhase - - mkdir $out - lndir ${core} $out - - export cmakeFlags="$cmakeFlags -DAVIDEMUX_SOURCE_DIR=$(pwd)" - - for i in ${toString (args.buildDirs or [])} avidemux_plugins; do - ( cd "$i" - cmakeConfigurePhase - buildPhase - installPhase - ) - done - - fixupPhase - ''; - - meta = common.meta // args.meta or {}; - }); - -in { - avidemux_core = core; - - avidemux_cli = buildPlugin { - pluginName = "cli"; - pluginUi = "CLI"; - isUi = true; - buildDirs = [ "avidemux/cli" ]; - }; - - avidemux_qt4 = buildPlugin { - pluginName = "qt4"; - buildInputs = [ qt4 ]; - pluginUi = "QT4"; - isUi = true; - buildDirs = [ "avidemux/qt4" ]; - }; - - avidemux_gtk = buildPlugin { - pluginName = "gtk"; - buildInputs = [ gtk3 ]; - pluginUi = "GTK"; - isUi = true; - buildDirs = [ "avidemux/gtk" ]; - # Code seems unmaintained. - meta.broken = true; - }; - - avidemux_common = buildPlugin { - pluginName = "common"; - pluginUi = "COMMON"; - }; - - avidemux_settings = buildPlugin { - pluginName = "settings"; - pluginUi = "SETTINGS"; + patches = [ + ./dynamic_install_dir.patch + ./bootstrap_logging.patch + # glibc 2.27 compat + (fetchpatch { + url = https://github.com/mean00/avidemux2/commit/afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d.patch; + sha256 = "0mf8vpfdqybziqsfyvxwcdm3zsmnp64293icinhvfpq9xp5b6vn6"; + }) + ]; + + nativeBuildInputs = [ yasm cmake pkgconfig ]; + buildInputs = [ + zlib gettext libvdpau libva libXv sqlite fribidi fontconfig + freetype alsaLib libXext libGLU makeWrapper + ] ++ lib.optional withX264 x264 + ++ lib.optional withX265 x265 + ++ lib.optional withXvid xvidcore + ++ lib.optional withLAME lame + ++ lib.optional withFAAC faac + ++ lib.optional withVorbis libvorbis + ++ lib.optional withPulse libpulseaudio + ++ lib.optional withFAAD faad2 + ++ lib.optional withOpus libopus + ++ lib.optionals withQT [ qttools qtbase ] + ++ lib.optional withVPX libvpx; + + buildCommand = '' + unpackPhase + cd "$sourceRoot" + patchPhase + + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXext}/lib" + ${stdenv.shell} bootStrap.bash \ + --with-core \ + ${if withQT then "--with-qt" else "--without-qt"} \ + ${if withCLI then "--with-cli" else "--without-cli"} \ + ${if withPlugins then "--with-plugins" else "--without-plugins"} + + mkdir $out + cp -R install/usr/* $out + + for i in $out/bin/*; do + wrapProgram $i \ + --set ADM_ROOT_DIR $out \ + --prefix LD_LIBRARY_PATH ":" "${libXext}/lib" + done + ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux" + + fixupPhase + ''; + + meta = with stdenv.lib; { + homepage = http://fixounet.free.fr/avidemux/; + description = "Free video editor designed for simple video editing tasks"; + maintainers = with maintainers; [ viric abbradar ma27 ]; + # "CPU not supported" errors on AArch64 + platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/video/avidemux/wrapper.nix b/pkgs/applications/video/avidemux/wrapper.nix deleted file mode 100644 index 7f05b81baec77ea7d7e27553d177b08577030566..0000000000000000000000000000000000000000 --- a/pkgs/applications/video/avidemux/wrapper.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ symlinkJoin, avidemux_unwrapped, makeWrapper -# GTK version is broken upstream, see https://bugzilla.redhat.com/show_bug.cgi?id=1244340 -, withUi ? "qt4" -}: - -let ui = builtins.getAttr "avidemux_${withUi}" avidemux_unwrapped; in - -assert ui.isUi; - -symlinkJoin { - name = "avidemux-${withUi}-${ui.version}"; - - paths = [ ui avidemux_unwrapped.avidemux_common avidemux_unwrapped.avidemux_settings ]; - - buildInputs = [ makeWrapper ]; - - postBuild = '' - for i in $out/bin/*; do - wrapProgram $i --set ADM_ROOT_DIR $out - done - ''; - - meta = ui.meta; -} diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 06dcaf31b443f791fa57779d9ff6a624d8257d35..3a595da96d07b3e4c685c6553e8b0d2de28d9f88 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel viric ]; platforms = platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 40d9aa2f22824a361a8b1a8b2cb1868a243b34f1..e3ba331e437a201582548ccd6670654e6f1042e9 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -1,7 +1,12 @@ { stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons, mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg, -enca, pkgconfig }: +enca, pkgconfig, fetchpatch }: +let fetchPatchFromAur = {name, sha256}: +fetchpatch { + inherit name sha256; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c"; +}; in stdenv.mkDerivation rec { name = "bombono-${version}"; version = "1.2.4"; @@ -12,6 +17,17 @@ stdenv.mkDerivation rec { sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9"; }; + patches = map fetchPatchFromAur [ + {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} + {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} + {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} + {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";} + {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";} + {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} + {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} + {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} + ]; + nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; buildInputs = [ @@ -20,9 +36,11 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - scons PREFIX=$out + scons PREFIX=$out -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; + enableParallelBuilding = true; + installPhase = '' scons install ''; @@ -31,5 +49,6 @@ stdenv.mkDerivation rec { description = "a DVD authoring program for personal computers"; homepage = "http://www.bombono.org/"; license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ symphorien ]; }; } diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index a9e2654f731b172355a3c20df5d66399b63dd8c0..671d67946354fc5370b48ecc2555981bd7024795 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which -, libX11, libxcb, mesa +, libX11, libxcb, libGLU_combined , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , libchardet , ffmpeg @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ libX11 libxcb - mesa + libGLU_combined qtbase qtx11extras qtdeclarative diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index b00aae61d36d4a591026fe7324c13159e17137d3..ea8cb5aa3ffac9f5228f1ba765abf713dd7089a6 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which gnome3.gnome_common glib intltool libtool cairo gtk3 xorg.xwininfo ] + buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with stdenv.lib; { diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 21b3f557776551847949623d70a15ebc7e292fba..4adbdbdadb2a87dde1a4a59d9101acb06fa9e662 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -50,11 +50,9 @@ stdenv.mkDerivation { fontconfig intltool ]; - # Note: the build may fail with e.g.: - # CXX edl.o + # $ make -C cinelerra edl.o # edl.C:50:25: fatal error: versioninfo.h: No such file or directory - # #include "versioninfo.h" - enableParallelBuilding = true; + enableParallelBuilding = false; meta = { description = "Video Editor"; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 69f58fe94bd867fdf2d40faaf322e52047766ec1..031202ad646cba11bcf8fb7c63ac0c915b3fad76 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.6.2"; + version = "3.6.8"; src = fetchurl { - sha256 = "0n7bhwkzknjpp54h54hxv1s8nsmmb7cwwf1aqpbcsnd7y6cv28nm"; + sha256 = "0agp97g79mlqcwfz2xk5rdxw4kx0hm92xikdspbpxlfji1mkh10p"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { homepage = https://clipgrab.org/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 8ceb7875be4d39f8cf2058ad2a916622e61989d6..1e671b4ea7bf2a27a4396fea14e72f2d676c70e5 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = https://linuxtv.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index e59469c704cb633e9c7dba3c2d0f7ab5f27f40d4..f89aa04e01464c03725add3907e7ccb5fdf9a481 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { name = "dvdstyler-${version}"; srcName = "DVDStyler-${version}"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2"; - sha256 = "1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q"; + sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi"; }; nativeBuildInputs = diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index ba72e085bf7c47ba04471c76b5c65c2df717f04a..fd8cc8d86306bf5a9f499b509d0556f1e2d69424 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,20 +1,33 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk2, dbus, dbus_glib, GConf}: +{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib +, libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "gnome-mplayer-1.0.4"; + name = "gnome-mplayer-${version}"; + version = "1.0.9"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz"; - sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; + src = fetchFromGitHub { + owner = "kdekorte"; + repo = "gnome-mplayer"; + rev = "v${version}"; + sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk2 dbus dbus_glib GConf]; + nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; - hardeningDisable = [ "format" ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + mencoder = "${mplayer}/bin/mencoder"; + mplayer = "${mplayer}/bin/mplayer"; + }) + ]; - meta = { - homepage = http://kdekorte.googlepages.com/gnomemplayer; + meta = with stdenv.lib; { description = "Gnome MPlayer, a simple GUI for MPlayer"; + homepage = https://sites.google.com/site/kdekorte2/gnomemplayer; + license = licenses.gpl2; + maintainers = with maintainers; []; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/applications/video/gnome-mplayer/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..ede4991c4662cb7a1909837b4f77d534ec4775ca --- /dev/null +++ b/pkgs/applications/video/gnome-mplayer/fix-paths.patch @@ -0,0 +1,87 @@ +--- a/src/gui.c ++++ b/src/gui.c +@@ -7470,7 +7470,7 @@ + filename = g_strdup_printf("%s/00000001.jpg", dirname); + g_free(basepath); + // run mplayer and try to get the first frame and convert it to a jpeg +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + av[ac++] = g_strdup_printf("-vo"); + av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname); + av[ac++] = g_strdup_printf("-ao"); +--- a/src/property_page_common.c ++++ b/src/property_page_common.c +@@ -80,7 +80,7 @@ + MetaData *ret; + ret = g_new0(MetaData, 1); + +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + av[ac++] = g_strdup_printf("-vo"); + av[ac++] = g_strdup_printf("null"); + av[ac++] = g_strdup_printf("-ao"); +--- a/src/support.c ++++ b/src/support.c +@@ -566,7 +566,7 @@ + } else { + playlist = FALSE; + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -728,7 +728,7 @@ + playlist = FALSE; + // run mplayer and try to get the first frame and convert it to a jpeg + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -825,7 +825,7 @@ + playlist = FALSE; + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -1251,7 +1251,7 @@ + gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name); + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -1532,7 +1532,7 @@ + return 0; + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -1597,7 +1597,7 @@ + + if (control_id == 0) { + ac = 0; +- av[ac++] = g_strdup_printf("mencoder"); ++ av[ac++] = g_strdup_printf("@mencoder@"); + av[ac++] = g_strdup_printf("-ovc"); + av[ac++] = g_strdup_printf("copy"); + av[ac++] = g_strdup_printf("-oac"); +@@ -2830,7 +2830,7 @@ + gboolean ret = TRUE; + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix index c93510cb1a7000f193d0d65079ecc718bd0d1e97..1bb77ffc4a8081868aee4fa0dad4c7818a4fad56 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -1,24 +1,30 @@ -{ stdenv, fetchurl -, intltool, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitHub, meson, ninja +, gettext, pkgconfig, desktop-file-utils, wrapGAppsHook , appstream-glib, epoxy, glib, gtk3, mpv }: stdenv.mkDerivation rec { name = "gnome-mpv-${version}"; - version = "0.9"; + version = "0.13"; - src = fetchurl { - sha256 = "06pgxl6f3kkgxv8nlmyl7gy3pg55sqf8vgr8m6426mlpm4p3qdn0"; - url = "https://github.com/gnome-mpv/gnome-mpv/releases/download/v${version}/${name}.tar.xz"; + src = fetchFromGitHub { + owner = "gnome-mpv"; + repo = "gnome-mpv"; + rev = "0d73b33d60050fd32bf8fae77d831548970a0b69"; # upstream forgot to update appdata + # rev = "v${version}"; + sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4"; }; - nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ appstream-glib epoxy glib.dev gtk3 mpv ]; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ]; + buildInputs = [ epoxy glib gtk3 mpv ]; enableParallelBuilding = true; + postPatch = '' + patchShebangs . + sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py + ''; + doCheck = true; meta = with stdenv.lib; { @@ -31,6 +37,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/gnome-mpv/gnome-mpv; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 7d0cfb455306d881673fd0c105adbe54ca8000ff..904401c5e913d886a8aeeca7d241d12b0477c77f 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -13,13 +13,15 @@ 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, + libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, + lame, libdvdread, libdvdnav, libbluray, mp4v2, mpeg2dec, x264, x265, libmkv, - fontconfig, freetype, hicolor_icon_theme, + fontconfig, freetype, hicolor-icon-theme, glib, gtk3, intltool, libnotify, - gst_all_1, dbus_glib, udev, libgudev, libvpx, - useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null + gst_all_1, dbus-glib, udev, libgudev, libvpx, + useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null, + useFfmpeg ? false, libav_12 ? null, ffmpeg ? null, + useFdk ? false, fdk_aac ? null }: stdenv.mkDerivation rec { @@ -35,20 +37,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python2 pkgconfig yasm autoconf automake libtool m4 - ] ++ (lib.optionals useGtk [ + ] ++ 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 + libogg libopus libtheora libvorbis libdvdcss a52dec libmkv lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx - ] ++ (lib.optionals useGtk [ + ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify - gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev + gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev - ]); + ] ++ (if useFfmpeg then [ ffmpeg ] else [ libav_12 ]) + ++ lib.optional useFdk fdk_aac; dontUseCmakeConfigure = true; @@ -75,8 +78,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-df-fetch" "--disable-df-verify" - "--enable-fdk-aac" (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") + (if useFdk then "--enable-fdk-aac" else "") ]; NIX_LDFLAGS = [ diff --git a/pkgs/applications/video/kazam/bug_1190693.patch b/pkgs/applications/video/kazam/bug_1190693.patch deleted file mode 100644 index 9f00c6b607915ab9022b3c02af30407bb26b9a5a..0000000000000000000000000000000000000000 --- a/pkgs/applications/video/kazam/bug_1190693.patch +++ /dev/null @@ -1,14 +0,0 @@ -=== modified file 'kazam/frontend/indicator.py' ---- a/kazam/frontend/indicator.py 2013-01-26 01:53:53 +0000 -+++ b/kazam/frontend/indicator.py 2013-06-13 18:18:37 +0000 -@@ -291,3 +291,9 @@ - def start_recording(self): - logger.debug("Recording started.") - self.indicator.set_from_icon_name("kazam-recording") -+ -+ def hide_it(self): -+ self.indicator.set_visible(False) -+ -+ def show_it(self): -+ self.indicator.set_visible(True) - diff --git a/pkgs/applications/video/kazam/datadir.patch b/pkgs/applications/video/kazam/datadir.patch deleted file mode 100644 index 114d4228be2dfb66647365f4bc8152a6465696bf..0000000000000000000000000000000000000000 --- a/pkgs/applications/video/kazam/datadir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/bin/kazam 2014-02-03 23:11:38.465614061 +0100 -+++ b/bin/kazam-1 2014-02-03 23:12:28.447058700 +0100 -@@ -68,7 +68,7 @@ - # when base install path is not /usr - curpath = os.path.abspath(__file__) - curpath = os.path.realpath(curpath) -- datadir = curpath.split('bin/')[0] + "share/kazam/" -+ datadir = os.path.realpath(os.path.join(curpath, "./../../", "share/kazam/")) - - try: - import platform diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 8653305f908aa16a28e2da458b857415f013eb7f..9ffd62d068aee4845c5f8948b4c37da00df0c568 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,50 +1,45 @@ -{ stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection -, gtk3, libwnck3, keybinder, intltool, libcanberra_gtk2 }: +{ stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobjectIntrospection +, gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio }: - -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { name = "kazam-${version}"; - version = "1.4.3"; + version = "1.4.5"; namePrefix = ""; src = fetchurl { url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz"; - sha256 = "00bcn0yj9xrv87sf6xd3wpilsjgjpsj15zzpjh351ffpjnr0ica8"; + sha256 = "1qygnrvm6aqixbyivhssp70hs0llxwk7lh3j7idxa2jbkk06hj4f"; }; - # TODO: keybinder, appindicator3 - buildInputs = with python3Packages; - [ pygobject3 pyxdg pycairo gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gobjectIntrospection gtk3 libwnck3 distutils_extra - intltool dbus-python ]; - - # TODO: figure out why PYTHONPATH is not passed automatically for those programs - pythonPath = with python3Packages; - [ pygobject3 pyxdg pycairo dbus-python ]; - - patches = [ ./datadir.patch ./bug_1190693.patch ]; - prePatch = '' - rm setup.cfg - substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra_gtk2}/bin/canberra-gtk-play" - ''; + nativeBuildInputs = [ gobjectIntrospection python3.pkgs.distutils_extra intltool wrapGAppsHook ]; + buildInputs = [ + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck3 + keybinder3 libappindicator-gtk3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ]; + + patches = [ + # Fix paths + (substituteAll { + src = ./fix-paths.patch; + libcanberra = libcanberra-gtk3; + inherit libpulseaudio; + }) + # Fix compability with Python 3.4 + (fetchurl { + url = https://sources.debian.org/data/main/k/kazam/1.4.5-2/debian/patches/configparser_api_changes.patch; + sha256 = "0yvmipnh98s7y07cp1f113l0qqfw65k13an96byq707z3ymv1c2h"; + }) + ]; # no tests doCheck = false; - preFixup = '' - wrapProgram $out/bin/kazam \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ gtk3 gst_all_1.gstreamer keybinder ]}" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share" \ - --set GST_REGISTRY "/tmp/kazam.gstreamer.registry"; - ''; - - meta = with stdenv.lib; { - description = "Cross-platform, Friend-2-Friend and secure decentralised communication platform"; + description = "A screencasting program created with design in mind"; homepage = https://code.launchpad.net/kazam; - #license = licenses.bsd2; + license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; }; diff --git a/pkgs/applications/video/kazam/fix-paths.patch b/pkgs/applications/video/kazam/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..43e360830ab576fe6f9eccc77baecc6ed3ccd328 --- /dev/null +++ b/pkgs/applications/video/kazam/fix-paths.patch @@ -0,0 +1,22 @@ +--- a/kazam/backend/grabber.py ++++ b/kazam/backend/grabber.py +@@ -72,7 +72,7 @@ + # + if prefs.shutter_sound and (not self.god): + soundfile = os.path.join(prefs.datadir, 'sounds', prefs.sound_files[prefs.shutter_type]) +- subprocess.call(['/usr/bin/canberra-gtk-play', '-f', soundfile]) ++ subprocess.call(['@libcanberra@/bin/canberra-gtk-play', '-f', soundfile]) + + if self.xid: + if prefs.capture_borders_pic: +--- a/kazam/pulseaudio/ctypes_pulseaudio.py ++++ b/kazam/pulseaudio/ctypes_pulseaudio.py +@@ -20,7 +20,7 @@ + # MA 02110-1301, USA. + + from ctypes import * +-PA = CDLL('libpulse.so.0') ++PA = CDLL('@libpulseaudio@/lib/libpulse.so.0') + + # + # Pulse Audio constants and defines diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index da90f681f7a833235c6de5d882c36b967ef3593c..64119d2dfc5567ce057d26b6846ecd11e90ae28f 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -8,18 +8,17 @@ , libXt, libXmu, libXext, xextproto , libXinerama, libXrandr, randrproto , libXtst, libXfixes, fixesproto, systemd -, SDL, SDL2, SDL_image, SDL_mixer, alsaLib -, mesa, glew, fontconfig, freetype, ftgl +, alsaLib, libGLU_combined, glew, fontconfig, freetype, ftgl , libjpeg, jasper, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt , lzo, libcdio, libmodplug, libass, libbluray -, sqlite, mysql, nasm, gnutls, libva, wayland +, sqlite, mysql, nasm, gnutls, libva, libdrm, wayland , curl, bzip2, zip, unzip, glxinfo, xdpyinfo , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp -, libplist, p11_kit, zlib +, libplist, p11-kit, zlib , dbusSupport ? true, dbus_libs ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -44,6 +43,7 @@ assert vdpauSupport -> libvdpau != null; # - cmake is no longer in project/cmake # - maybe we can remove auto{conf,make} and libtool from inputs # - check if dbus support PR has been merged and add dbus as a buildInput +# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches) let kodiReleaseDate = "20171115"; @@ -78,7 +78,8 @@ let preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . ''; - buildInputs = [ gnutls libidn libtasn1 p11_kit zlib ]; + buildInputs = [ gnutls libidn libtasn1 p11-kit zlib libva ] + ++ lib.optional vdpauSupport libvdpau; nativeBuildInputs = [ cmake nasm pkgconfig ]; }; @@ -117,20 +118,19 @@ in stdenv.mkDerivation rec { src = kodi_src; buildInputs = [ - gnutls libidn libtasn1 nasm p11_kit + gnutls libidn libtasn1 nasm p11-kit libxml2 yasm python2 boost libmicrohttpd - gettext pcre-cpp yajl fribidi libva + gettext pcre-cpp yajl fribidi libva libdrm openssl gperf tinyxml2 taglib libssh swig jre libX11 xproto inputproto libXt libXmu libXext xextproto libXinerama libXrandr randrproto libXtst libXfixes fixesproto - SDL SDL_image SDL_mixer alsaLib - mesa glew fontconfig freetype ftgl - libjpeg jasper libpng libtiff libva wayland + alsaLib libGLU_combined glew fontconfig freetype ftgl + libjpeg jasper libpng libtiff wayland libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray - sqlite mysql.lib avahi lame + sqlite mysql.connector-c avahi lame curl bzip2 zip unzip glxinfo xdpyinfo libcec libcec_platform dcadec libuuid libgcrypt libgpgerror libunistring @@ -140,7 +140,7 @@ in stdenv.mkDerivation rec { # libdvdcss libdvdnav libdvdread ] ++ lib.optional dbusSupport dbus_libs - ++ lib.optionals joystickSupport [ cwiid SDL2 ] + ++ lib.optionals joystickSupport [ cwiid ] ++ lib.optional nfsSupport libnfs ++ lib.optional pulseSupport libpulseaudio ++ lib.optional rtmpSupport rtmpdump @@ -189,7 +189,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/$p \ --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 ]}" done substituteInPlace $out/share/xsessions/kodi.desktop \ diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index e98500f8e76c82ca249deb9cc8db084ec02c06db..01e134afee6f92beafcf365d9751feaff2e99cfc 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,5 +1,5 @@ { stdenv, lib, callPackage, fetchurl, fetchFromGitHub, unzip -, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun }: +, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }: with (callPackage ./commons.nix {}); @@ -149,14 +149,14 @@ rec { joystick = mkKodiABIPlugin rec { namespace = "peripheral.joystick"; - version = "1.3.6"; + version = "1.3.2"; plugin = namespace; src = fetchFromGitHub { owner = "kodi-game"; repo = namespace; - rev = "5b480ccdd4a87f2ca3283a7b8d1bd69a114af0db"; - sha256 = "1zf5zwghx96bqk7bx53qra27lfbgfdi1dsk4s3hwixr8ii72cqpp"; + rev = "96171dd32899553ffe8fc775fca66e8df5ff5cf1"; + sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh"; }; meta = with stdenv.lib; { @@ -264,7 +264,7 @@ rec { meta = with stdenv.lib; { homepage = https://forum.kodi.tv/showthread.php?tid=187421; - descritpion = "A comic book reader"; + description = "A comic book reader"; maintainers = with maintainers; [ edwtjo ]; }; }; @@ -314,4 +314,28 @@ rec { extraBuildInputs = [ jsoncpp libhdhomerun ]; }; + + pvr-iptvsimple = mkKodiABIPlugin rec { + + plugin = "pvr-iptvsimple"; + namespace = "pvr.iptvsimple"; + version = "2.4.14"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.iptvsimple"; + rev = "2a649d7e21b64c4fa4a8b14c2cc139261eebc7e8"; + sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kodi-pvr/pvr.iptvsimple; + description = "Kodi's IPTV Simple client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + }; + + extraBuildInputs = [ zlib ]; + }; } diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 9c6a49c5513696afe0ea76fcbfb4b8edf386cd7a..d0376ca7e3de4481b12d550a78e1cd3e53741cbc 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv -, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, mesa_glu +, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU , nvidia_cg_toolkit, zlib, openssl, portaudio }: let @@ -11,7 +11,7 @@ let libjpeg_original glib gnome2.pango - mesa_glu + libGLU nvidia_cg_toolkit zlib openssl diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index ae7625d1972ab7ece1bf533fc4cdbe69678136bf..a4b08e1ce47c96fe8be56a12c75bf9aba80db7c3 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl -, openssl, qt4, mesa, zlib, pkgconfig, libav +, openssl, qt4, libGLU_combined, zlib, pkgconfig, libav }: stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.10.7"; + ver = "1.10.8"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac"; + sha256 = "b7861aa7b03203f50d2ce3130f805c4b0406d13aec597648050349fa8b084b29"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654"; + sha256 = "d17cfd916a9bdda35b1065bce86a48a987caf9ffb4d6861609458f9f312603c7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [openssl qt4 mesa zlib libav]; + buildInputs = [openssl qt4 libGLU_combined zlib libav]; - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl mesa qt4 zlib ] + libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt4 zlib ] + ":" + stdenv.cc.cc + "/lib64"; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index f70c142ab41d0cf1db39486db2afd6bde9abe6d9..8b94204cd627497bf8df5f7bbd5990feeaebf6a7 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -33,9 +33,8 @@ stdenv.mkDerivation rec { you an endless video stream. Minitube is not about cloning the YouTube website, it aims to create a new TV-like experience. ''; - homepage = http://flavio.tordini.org/minitube; + homepage = https://flavio.tordini.org/minitube; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 3a297abb15c4f27760fb4ac281581c6fbe82d4fc..b3cfe21b7d699b11272f5ee0523080b9aae95e09 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk24x-gtk2, libsoup , taglib, sqlite -, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas +, libtorrentRasterbar, glib-networking, gsettings-desktop-schemas , gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg , enableBonjour ? false, avahi ? null }: @@ -65,13 +65,13 @@ in buildPythonApplication rec { mv "$out/bin/miro.real" "$out/bin/miro" wrapProgram "$out/bin/miro" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [ pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk24x-gtk2 libsoup - taglib gsettings_desktop_schemas sqlite + taglib gsettings-desktop-schemas sqlite ]; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix index 2c5d3d365c12b01dd2417dc4d98c608d943681ea..2d5d2d3b102c2ec016827cc616bf7e2981ab89a2 100644 --- a/pkgs/applications/video/mkcast/default.nix +++ b/pkgs/applications/video/mkcast/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' for f in $out/bin/*; do #*/ - wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin" + wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome-terminal ]}:$out/bin" done rm -r screenkey/.bzr diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 183722beed818fccc23550cbfbfbb3d35fca7461..3a3a009d18f1f1629d40c62e937b0c3d0919f649 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,32 +1,36 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libiconv -, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost -, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt +{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv +, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost +, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark , withGUI ? true + , qtbase ? null + , qtmultimedia ? null }: -assert withGUI -> qt5 != null; +assert withGUI -> qtbase != null && qtmultimedia != null; with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "17.0.0"; + version = "22.0.0"; - src = fetchFromGitHub { - owner = "mbunkus"; - repo = "mkvtoolnix"; - rev = "release-${version}"; - sha256 = "1v74rxf9wm0sn2illy0hp36hpwz7q04y0k32wq6wn7qrnzkzcc88"; + src = fetchFromGitLab { + owner = "mbunkus"; + repo = "mkvtoolnix"; + rev = "release-${version}"; + sha256 = "07nggqkpl6dkfcqli8y9dn0jbznldz03nqj2l3fgj3vhqa0phlab"; }; - nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; + nativeBuildInputs = [ + pkgconfig autoconf automake gettext + drake ruby docbook_xsl libxslt + ]; buildInputs = [ - expat file xdg_utils boost libebml zlib libmatroska libogg - libvorbis flac - ] - ++ optional stdenv.isDarwin libiconv - ++ optionals withGUI [qt5.qtbase qt5.qtmultimedia]; + expat file xdg_utils boost libebml zlib + libmatroska libogg libvorbis flac cmark + ] ++ optional stdenv.isDarwin libiconv + ++ optionals withGUI [ qtbase qtmultimedia ]; preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "drake -j $NIX_BUILD_CORES"; diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index d52154887071609807ca89a4bb584d981ee59a2f..67c91168fa2de66cbff852a0e646a93ec5bfd033 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { name = "motion-${version}"; - version = "4.0.1"; + version = "4.1.1"; + src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; rev = "release-${version}"; - sha256 = "172bn2ny5r9fcb4kn9bjq3znpgl8ai84w4b99vhk5jggp2haa3bb"; + sha256 = "1prbgl9wb9q7igsb6n11c25m0p0z246fxr1q8n1vcjr4rcb65y38"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libjpeg ffmpeg ]; + meta = with stdenv.lib; { homepage = http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome; description = "Monitors the video signal from cameras"; diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..559972d9e793b43d3ad7ddb5a78ca01bb0f935e2 --- /dev/null +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }: + +stdenv.mkDerivation rec { + name = "mpc-qt-${version}"; + version = "18.03"; + + src = fetchFromGitHub { + owner = "cmdrkotori"; + repo = "mpc-qt"; + rev = "v${version}"; + sha256 = "0mhzdgjgv08cvnscbfndpr0s8ndbcf91b61zfqspa1qv4wlqd716"; + }; + + nativeBuildInputs = [ pkgconfig qmake qttools ]; + + buildInputs = [ mpv qtx11extras ]; + + qmakeFlags = [ "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" ]; + + meta = with stdenv.lib; { + description = "Media Player Classic Qute Theater"; + homepage = https://github.com/cmdrkotori/mpc-qt; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 24c5b4335c46cd168ffeeb67e5e0ce7bf1fb0ad0..f2d40c2ac8084334bb3e6c5bcf68308352b1f238 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -2,7 +2,7 @@ , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null -, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null +, x11Support ? true, libX11 ? null, libXext ? null, libGLU_combined ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -32,7 +32,7 @@ assert fontconfigSupport -> (fontconfig != null); assert (!fontconfigSupport) -> (freefont_ttf != null); assert fribidiSupport -> (fribidi != null); -assert x11Support -> (libX11 != null && libXext != null && mesa != null); +assert x11Support -> (libX11 != null && libXext != null && libGLU_combined != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); assert alsaSupport -> alsaLib != null; @@ -102,13 +102,14 @@ stdenv.mkDerivation rec { rm -rf ffmpeg ''; - nativeBuildInputs = [ buildPackages.stdenv.cc pkgconfig yasm ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkgconfig yasm ]; buildInputs = with stdenv.lib; [ freetype ffmpeg ] ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi - ++ optionals x11Support [ libX11 libXext mesa ] + ++ optionals x11Support [ libX11 libXext libGLU_combined ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 680cad1ec252e161f479329817359296f409c744..421e0dbb8a3932a63ff68d534441de6ee85fd57e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeWrapper +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs -, lua, lua5_sockets, libuchardet, libiconv ? null, darwin +, lua, luasocket, libuchardet, libiconv ? null, darwin , x11Support ? true, - mesa ? null, + libGLU_combined ? null, libX11 ? null, libXext ? null, libXxf86vm ? null @@ -13,25 +13,26 @@ wayland ? null, libxkbcommon ? null -, rubberbandSupport ? !stdenv.isDarwin, rubberband ? null +, rubberbandSupport ? true, rubberband ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , sdl2Support ? true, SDL2 ? null -, alsaSupport ? !stdenv.isDarwin, alsaLib ? null +, alsaSupport ? true, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? true, libvdpau ? null -, dvdreadSupport ? !stdenv.isDarwin, libdvdread ? null -, dvdnavSupport ? dvdreadSupport, libdvdnav ? null +, dvdreadSupport ? true, libdvdread ? null +, dvdnavSupport ? true, libdvdnav ? null , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null , cacaSupport ? true, libcaca ? null , libpngSupport ? true, libpng ? null , youtubeSupport ? true, youtube-dl ? null , vaapiSupport ? true, libva ? null -, drmSupport ? !stdenv.isDarwin, libdrm ? null +, drmSupport ? true, libdrm ? null +, openalSupport ? true, openalSoft ? null , vapoursynthSupport ? false, vapoursynth ? null , archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null @@ -45,7 +46,7 @@ with stdenv.lib; let available = x: x != null; in -assert x11Support -> all available [mesa libX11 libXext libXxf86vm]; +assert x11Support -> all available [libGLU_combined libX11 libXext libXxf86vm]; assert waylandSupport -> all available [wayland libxkbcommon]; assert rubberbandSupport -> available rubberband; assert xineramaSupport -> x11Support && available libXinerama; @@ -59,6 +60,7 @@ assert dvdnavSupport -> available libdvdnav; assert bluraySupport -> available libbluray; assert speexSupport -> available speex; assert theoraSupport -> available libtheora; +assert openalSupport -> available openalSoft; assert pulseSupport -> available libpulseaudio; assert bs2bSupport -> available libbs2b; assert cacaSupport -> available libcaca; @@ -73,24 +75,31 @@ assert drmSupport -> available libdrm; let # Purity: Waf is normally downloaded by bootstrap.py, but # for purity reasons this behavior should be avoided. - wafVersion = "1.9.8"; + wafVersion = "1.9.15"; waf = fetchurl { urls = [ "http://waf.io/waf-${wafVersion}" "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; - sha256 = "1gsd3zza1wixv2vhvq3inp4vb71i41a1kbwqnwixhnvdmcmw8z8n"; + sha256 = "0qrnlv91cb0v221w8a0fi4wxm99q2hpz10rkyyk4akcsvww6xrw5"; }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.27.0"; + version = "0.27.2"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "0746kmsg69675y5c70vn8imcr9d1zpjz97f27xr1vx00yjpd518v"; + sha256 = "1ivyyqajkxq5c1zxp0dm7pljvianhgvwl3dbghgpzyrch59k5wnr"; }; - patchPhase = '' + patches = [ + (fetchpatch { + url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch"; + sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb"; + }) + ]; + + postPatch = '' patchShebangs ./TOOLS/ ''; @@ -106,6 +115,7 @@ in stdenv.mkDerivation rec { (enableFeature archiveSupport "libarchive") (enableFeature dvdreadSupport "dvdread") (enableFeature dvdnavSupport "dvdnav") + (enableFeature openalSupport "openal") (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") (enableFeature stdenv.isLinux "dvbin") @@ -115,14 +125,15 @@ in stdenv.mkDerivation rec { python3 ${waf} configure --prefix=$out $configureFlags ''; - nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ]; + nativeBuildInputs = [ + docutils makeWrapper perl + pkgconfig python3 which + ]; buildInputs = [ ffmpeg freetype libass libpthreadstubs - lua lua5_sockets libuchardet - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - libiconv Cocoa CoreAudio ]) - ++ optional alsaSupport alsaLib + lua luasocket libuchardet + ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora ++ optional xineramaSupport libXinerama @@ -135,6 +146,8 @@ in stdenv.mkDerivation rec { ++ optional vdpauSupport libvdpau ++ optional speexSupport speex ++ optional bs2bSupport libbs2b + ++ optional openalSupport openalSoft + ++ optional (openalSupport && stdenv.isDarwin) darwin.apple_sdk.frameworks.OpenAL ++ optional libpngSupport libpng ++ optional youtubeSupport youtube-dl ++ optional sdl2Support SDL2 @@ -144,8 +157,11 @@ in stdenv.mkDerivation rec { ++ optional vapoursynthSupport vapoursynth ++ optional archiveSupport libarchive ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] - ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] - ++ optionals waylandSupport [ wayland libxkbcommon ]; + ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm ] + ++ optionals waylandSupport [ wayland libxkbcommon ] + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libiconv Cocoa CoreAudio + ]); enableParallelBuilding = true; @@ -153,7 +169,14 @@ in stdenv.mkDerivation rec { python3 ${waf} build ''; - installPhase = '' + installPhase = + let + getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + + "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; + luaPath = getPath "lua"; + luaCPath = getPath "so"; + in + '' python3 ${waf} install # Use a standard font @@ -162,10 +185,12 @@ in stdenv.mkDerivation rec { # Ensure youtube-dl is available in $PATH for MPV wrapProgram $out/bin/mpv \ --add-flags "--scripts=${concatStringsSep "," scripts}" \ + --prefix LUA_PATH : "${luaPath}" \ + --prefix LUA_CPATH : "${luaCPath}" \ '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' - --prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH" + --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" '' + '' cp TOOLS/umpv $out/bin @@ -187,5 +212,3 @@ in stdenv.mkDerivation rec { ''; }; } -# TODO: investigate caca support -# TODO: investigate lua5_sockets bug diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index d8f18f97ad9a89a64d675109bb2765277004f336..faa21326fc0e8945324b42cd9f906d014b921ef3 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, lib -, yad, mkvtoolnix, libnotify }: +, yad, mkvtoolnix-cli, libnotify }: stdenv.mkDerivation { name = "mpv-convert-script-2016-03-18.lua"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { substituteInPlace convert_script.lua \ ${subs "NOTIFY_CMD" "notify-send" "${libnotify}/bin/notify-send"} \ ${subs "YAD_CMD" "yad" "${yad}/bin/yad"} \ - ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix}/bin/mkvmerge"} + ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix-cli}/bin/mkvmerge"} ''; dontBuild = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Convert parts of a video while you are watching it in mpv"; homepage = https://gist.github.com/Zehkul/25ea7ae77b30af959be0; - maintainers = [ lib.maintainers.profpatsch ]; + maintainers = [ lib.maintainers.Profpatsch ]; longDescription = '' When this script is loaded into mpv, you can hit Alt+W to mark the beginning and Alt+W again to mark the end of the clip. Then a settings window opens. diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 71bb0405111c7c5aed8d042762364a7caa73b048..1be4fc252fd0123690fe099f511008179eee37a7 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,32 +1,37 @@ -{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec -, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig -, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu -, yasm, libuuid, taglib, libtool, autoconf, automake, file +{ stdenv, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype +, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm +, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2 +, linuxHeaders }: stdenv.mkDerivation rec { name = "mythtv-${version}"; - version = "0.27.4"; + version = "29.1"; - src = fetchurl { - url = "https://github.com/MythTV/mythtv/archive/v${version}.tar.gz"; - sha256 = "0nrn4fbkkzh43n7jgbv21i92sb4z4yacwj9yj6m3hjbffzy4ywqz"; + src = fetchFromGitHub { + owner = "MythTV"; + repo = "mythtv"; + rev = "v${version}"; + sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x"; }; - sourceRoot = "${name}/mythtv"; + setSourceRoot = ''sourceRoot=$(echo */mythtv)''; buildInputs = [ - freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec - libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu - libuuid taglib + freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined + perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC + libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 ]; nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; + configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; + meta = with stdenv.lib; { homepage = https://www.mythtv.org/; description = "Open Source DVR"; license = licenses.gpl2; - meta.platforms = platforms.linux; + platforms = platforms.linux; maintainers = [ maintainers.titanous ]; }; } diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 518cd3d94bacd1116f40ffef5b296cc3c647aadf..1eb725d10bbc88d1a2254a521ba7f8ac21ac59c3 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio, - qmake4Hook, libpng, mesa_noglu, lndir }: + qmake4Hook, libpng, libGL, lndir }: let minorVersion = "2.1"; @@ -68,7 +68,7 @@ let sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu + libpng ffmpeg openexr opencolorio openimageio boost libGL seexpr ]; }) @@ -76,7 +76,7 @@ let pluginName = "misc"; sha256 = "02h79jrll0c17azxj16as1mks3lmypm4m3da4mms9sg31l3n82qi"; buildInputs = [ - mesa_noglu + libGL ]; preConfigure = '' cp ${CImgh} CImg/CImg.h diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 5d82a8c5d096efb4df8f6b6eeff9d2df47c8cdc4..f3e2072d6dac55e057c1889f1bf258da7988c5a5 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -29,13 +29,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "20.1.0"; + version = "21.1.1"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "1366nl301rhz8cfbq89ixiq1hdxdn8iimz9xyln274anghz02sbr"; + sha256 = "11gr4szjypihp0562r23pvkmaln6vjz1z4y4ls34bmc8n9ixrdcv"; }; patches = [ ./find-xcb.patch ]; @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/obs \ - --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib" + --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 83e69495b03a304a137f5c2106432746f6586b4b..221f4fc0e5c3c9d6b92895e7bad260647b344f93 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ogmtools-1.5"; src = fetchurl { - url = "http://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2"; + url = "https://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2"; sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { (ogmdemux) or creation of (ogmmerge) OGG media streams. Includes dvdxchap tool for extracting chapter information from DVD. ''; - homepage = http://www.bunkus.org/videotools/ogmtools/; + homepage = https://www.bunkus.org/videotools/ogmtools/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 29345f7548d5f9569bf9a852923fa9748e725184..825bfe7955a83cd81282924e2afdb7cdaa15027f 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -49,7 +49,7 @@ let crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.prefix}" + "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" "--target_os=linux" "--arch=${hostPlatform.arch}" diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 86b8dab7f1f290a499aca4d9fff759239cf78fd8..aa9643416485ddf684af9c6edda0b4ebad1e076e 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { name = "openshot-qt-${version}"; - version = "2.3.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "026zxvg5mij49g021hipv3hspsx8m5bs4v9pm2axqw6rvszjk90z"; + sha256 = "182dldj9ybs6aqjfrc9dqx1mifdyhv0rf3ifxcp52cm9rz5yv8ml"; }; nativeBuildInputs = [ doxygen wrapGAppsHook ]; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 6591af9d0d875e8cf50a613384d45cb0455f8e67..a0118bea92f4f7291455474f48050dd8695c4a2f 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-audio-${version}"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "07615vacbvi08pzm4lxfckfwib2xcfdjaggpda58hy8nr0677fzq"; + sha256 = "0rn87jxyfq1yip1lb2255l5ilkakkqg9rn0lr0h6dn2xrmlbmg8l"; }; nativeBuildInputs = diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 02a19c935e7357dc3b2c6461f469b627475c124a..f84e2e83761a7dcde95b66952e4d5b9eda8234b7 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "1dk40qild8d3s99p2kkm0mjvxfxrz2wns7ij1brzqmcdnaxqdhlp"; + sha256 = "0c7q5cfnp481ysyvgzznvix7j4licq9knwrb83g3xqs4cx573xr3"; }; patchPhase = '' diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..728f6387ffa916c403cb47e39458287ff784e9b4 --- /dev/null +++ b/pkgs/applications/video/peek/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook +, gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg +}: + +stdenv.mkDerivation rec { + name = "peek-${version}"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "phw"; + repo = "peek"; + rev = version; + sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb"; + }; + + preConfigure = '' + gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]}) + ''; + + nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; + + buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/phw/peek; + description = "Simple animated GIF screen recorder with an easy to use interface"; + license = licenses.gpl3; + maintainers = with maintainers; [ puffnfresh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index c4d80344080def717c28c48404e93da257bb2f1a..48074a86b552f9abbb25ec49a10e1a755a463d8a 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook -, python3Packages, gst, gtk3, hicolor_icon_theme +, python3Packages, gst, gtk3, hicolor-icon-theme , gobjectIntrospection, librsvg, gnome3, libnotify # for gst-transcoder: , which, meson, ninja @@ -34,9 +34,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gobjectIntrospection gtk3 librsvg gnome3.gnome_desktop + gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas libnotify + gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst; [ gstreamer gst-editing-services diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..13f93800f6e24375b3b16f7d7e1f0cd6ddcdbd23 --- /dev/null +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "QMediathekView"; + version = "2017-04-16"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "adamreichold"; + repo = pname; + rev = "8c69892b95bf6825bd06a8c594168a98fe7cb2d1"; + sha256 = "1wca1w4iywd3hmiwcqx6fv79p3x5n1cgbw2liw3hs24ch3z54ckm"; + }; + + postPatch = '' + substituteInPlace ${pname}.pro \ + --replace /usr "" + ''; + + buildInputs = [ qtbase qttools xz boost ]; + + nativeBuildInputs = [ qmake pkgconfig ]; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + meta = with stdenv.lib; { + description = "An alternative Qt-based front-end for the database maintained by the MediathekView project"; + inherit (src.meta) homepage; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 8b2a69acfcc8d4994612fc1223eebf88f0b32dbc..c3204cc9c0ce81734d6cd79b0d0df2cf66a44e7a 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://quvi.sf.net; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index 6f4e60913390cec0237ca5474f87597c22e29658..603534be4c8be54524f40f72cc07a7cfce370e8f 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = http://quvi.sf.net; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 3f99258737c2ab81c94a1d4c337103a38282cfa1..333f4e6ab4de9cff1ec272727f08fc06e6b5cd6d 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://quvi.sf.net; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5638fad39e5dea180a4a240afcfbc5ec57910fcd --- /dev/null +++ b/pkgs/applications/video/screenkey/default.nix @@ -0,0 +1,60 @@ +{ lib +, substituteAll +, buildPythonApplication +, fetchFromGitHub +, distutils_extra +, setuptools-git +, intltool +, pygtk +, libX11 +, libXtst +, wrapGAppsHook +, defaultIconTheme +, hicolor_icon_theme +}: +buildPythonApplication rec { + pname = "screenkey"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "wavexx"; + repo = "screenkey"; + rev = "screenkey-${version}"; + sha256 = "14g7fiv9n7m03djwz1pp5034pffi87ssvss9bc1q8vq0ksn23vrw"; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + inherit libX11 libXtst; + }) + ]; + + nativeBuildInputs = [ + distutils_extra + setuptools-git + intltool + + wrapGAppsHook + ]; + + buildInputs = [ + defaultIconTheme + hicolor_icon_theme + ]; + + propagatedBuildInputs = [ + pygtk + ]; + + # screenkey does not have any tests + doCheck = false; + + meta = with lib; { + homepage = https://www.thregr.org/~wavexx/software/screenkey/; + description = "A screencast tool to display your keys inspired by Screenflick"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.rasendubi ]; + }; +} diff --git a/pkgs/applications/video/screenkey/paths.patch b/pkgs/applications/video/screenkey/paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..7e5ed47fc19da889f91fc34240c947da5e7c72f7 --- /dev/null +++ b/pkgs/applications/video/screenkey/paths.patch @@ -0,0 +1,20 @@ +--- a/Screenkey/xlib.py ++++ b/Screenkey/xlib.py +@@ -6,7 +6,7 @@ + from ctypes import * + + ## base X11 +-libX11 = CDLL('libX11.so.6') ++libX11 = CDLL('@libX11@/lib/libX11.so.6') + + # types + Atom = c_ulong +@@ -278,7 +278,7 @@ + + + ## record extensions +-libXtst = CDLL('libXtst.so.6') ++libXtst = CDLL('@libXtst@/lib/libXtst.so.6') + + # types + XPointer = String \ No newline at end of file diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 447518d008b4180212bd860a6e4280eb3b52c7b1..0ae9de0468018a3a2c73414f49a61c86ec63623f 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext -, libXfixes, mesa, pkgconfig, libpulseaudio, qt4 +, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qt4, cmake, ninja }: stdenv.mkDerivation rec { name = "simplescreenrecorder-${version}"; - version = "0.3.8"; + version = "0.3.10"; src = fetchurl { url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; - sha256 = "0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg"; + sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g"; }; patches = [ ./fix-paths.patch ]; postPatch = '' - # #455 - sed '1i#include ' -i src/Benchmark.cpp - for i in scripts/ssr-glinject src/AV/Input/GLInjectInput.cpp; do substituteInPlace $i \ --subst-var out \ @@ -24,14 +21,12 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa + nativeBuildInputs = [ pkgconfig cmake ninja ]; + buildInputs = [ + alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined libpulseaudio qt4 ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A screen recorder for Linux"; homepage = http://www.maartenbaert.be/simplescreenrecorder; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index e7deccee0d9f11351bb5dc5a255bf9b3148d1ddd..ef614d41d00d4dda5d1c2863d67fb5827c5650be 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-17.9.0"; + name = "smplayer-18.3.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0s9856cmwl829d2xc2ycf97phpv4a2d39ybmnbhsrb07jq5hkw1a"; + sha256 = "0y7kwcngd0d2d863wnppfvjm1n1l60nn6lsf9r0g4hsf19gkrd46"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index b058879670935cf4dd604b82bf178dd6cf948767..32610d08f339b4deeae78d9c33e69dae807a92c1 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "17.5.0"; + version = "18.3.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "13m0ll18n1da8i4r4b7gn0jjz9dgrkkyk9mpfas4rgnjw92m5jld"; + sha256 = "05r7xmzc7i95nwzgcn7p0kwlhybryf7f0dpadgdnbz6xinz9a0mb"; }; makeFlags = [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 9fd07febbfce2d43db465690c0ad30a7b727e53c..9ff54bd681f8a7d2be18fda3ae11c25a382acde1 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,17 +1,17 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "0.9.0"; + version = "0.10.0"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "11jczkar3aqsbl5amkm7lsv4fz6xdaydd5izn222wjzsbvnzrcgd"; + sha256 = "1p9gkwcvqlnv09ihqh71nh82nnmq9ybp1v8d8kd2vhkg1vm5ximn"; }; - buildInputs = with pythonPackages; [ pytest mock ]; + checkInputs = with pythonPackages; [ pytest mock requests-mock ]; propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client ]) ++ [ rtmpdump ffmpeg ]; diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..32bd731f16e9403e514b0c605b0f19b2269735d0 --- /dev/null +++ b/pkgs/applications/video/subdl/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + name = "subdl-0.0pre.2017.11.06"; + + src = fetchFromGitHub { + owner = "alexanderwink"; + repo = "subdl"; + rev = "4cf5789b11f0ff3f863b704b336190bf968cd471"; + sha256 = "0kmk5ck1j49q4ww0lvas2767kwnzhkq0vdwkmjypdx5zkxz73fn8"; + }; + + meta = { + homepage = https://github.com/alexanderwink/subdl; + description = "A command-line tool to download subtitles from opensubtitles.org"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.exfalso ]; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + install -vD subdl $out/bin/subdl + ''; +} diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 88768b3cb8f66f4ab6abb78ea9954bde24e61596..3683973824a3fe99266689cd0de06f2662460002 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,29 +1,24 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, desktop_file_utils, - enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx, - xdg_utils, isocodes, wrapGAppsHook +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, + desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme, + libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: let - ver_maj = "0.53"; - ver_min = "0"; + version = "0.54.0"; in stdenv.mkDerivation rec { - name = "subtitle-editor-${ver_maj}.${ver_min}"; + name = "subtitleeditor-${version}"; - src = fetchurl { - url = "http://download.gna.org/subtitleeditor/${ver_maj}/subtitleeditor-${ver_maj}.${ver_min}.tar.gz"; - sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g"; + src = fetchFromGitHub { + owner = "kitone"; + repo = "subtitleeditor"; + rev = version; + sha256 = "0vxcscc9m6gymgj173ahk2g9hlk9588z5fdaavmkpyriqdlhwm11"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/s/subtitleeditor/0.53.0-2/debian/patches/03-fix-build-gstreamermm-1.8.0.patch"; - sha256 = "0di2i34id5dqnd3glibhifair1kdfnv8ay3k64lirad726ardw2c"; - }) - ]; - nativeBuildInputs = [ + autoreconfHook pkgconfig intltool file @@ -31,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - desktop_file_utils + desktop-file-utils enchant gnome3.gtk gnome3.gtkmm @@ -39,7 +34,7 @@ stdenv.mkDerivation rec { gst_all_1.gstreamermm gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - hicolor_icon_theme + hicolor-icon-theme libsigcxx libxmlxx xdg_utils @@ -48,11 +43,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # disable check because currently making check in po fails - doCheck = false; - - hardeningDisable = [ "format" ]; - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; configureFlags = [ "--disable-debug" ]; @@ -65,9 +55,9 @@ stdenv.mkDerivation rec { and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices. ''; - homepage = http://home.gna.org/subtitleeditor; + homepage = http://kitone.github.io/subtitleeditor/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.plcplc ]; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.plcplc ]; }; } diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b465379c50edeccfa60e63eab3e4faa78b17b763..44c4d317d36aaac3ed3367c82afd4ecb4842d00e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -7,7 +7,6 @@ , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth -, onlyLibVLC ? false , qt4 ? null , withQt5 ? false, qtbase ? null, qtx11extras ? null , jackSupport ? false @@ -21,21 +20,13 @@ assert (!withQt5 -> qt4 != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.2.6"; + version = "2.2.8"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4"; + sha256 = "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-9300.patch"; - url = "https://git.videolan.org/?p=vlc/vlc-2.2.git;a=patch;h=55a82442cfea9dab8b853f3a4610f2880c5fadf3;hp=dbe888f9ca9c3b102478b4a16a3d1d985c267899"; - sha256 = "0l0fwqkn31lggwc5dkhb58gkv8pc6ng51y0izjigqvfqvhwdnzxn"; - }) - ]; - # Comment-out the Qt 5.5 version check, as we do apply the relevant patch. # https://trac.videolan.org/vlc/ticket/16497 postPatch = if (!withQt5) then null else @@ -76,8 +67,7 @@ stdenv.mkDerivation rec { "--enable-vdpau" "--enable-dvdnav" "--enable-samplerate" - ] - ++ optional onlyLibVLC "--disable-vlc"; + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix index 59ba63b32eeb198c91424e1a223b8169e98d6dd5..2bf74da3d0f22cff14b50832deddcd679e219525 100644 --- a/pkgs/applications/video/w_scan/default.nix +++ b/pkgs/applications/video/w_scan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "w_scan-${version}"; - version = "20161022"; + version = "20170107"; src = fetchurl { url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2"; - sha256 = "0y8dq2sm13xn2r2lrqf5pdhr9xcnbxbg1aw3iq1szds2idzsyxr0"; + sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q"; }; meta = { diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bb519ef3dab041eceb8e2d1438fd4a44d2752727 --- /dev/null +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -0,0 +1,88 @@ +{ + alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype, + gdk_pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor, + libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, + libxcb, nspr, nss, stdenv, udev +}: + + let + rpath = stdenv.lib.makeLibraryPath ([ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libxcb + nspr + nss + stdenv.cc.cc + udev + ]); + in stdenv.mkDerivation rec { + name = "webtorrent-desktop-${version}"; + version = "0.19.0"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.19.0/webtorrent-desktop_${version}-1_amd64.deb"; + sha256 = "0v4fgvf8qgxjwg5kz30pcxl71pi9rri0l3cy20pid07rdd6r4sgd"; + } + else + throw "Webtorrent is not currently supported on ${stdenv.system}"; + phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ dpkg ]; + unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p $out + cp -R opt $out + + mv ./usr/share $out/share + mv $out/opt/webtorrent-desktop $out/libexec + chmod +x $out/libexec/WebTorrent + rmdir $out/opt + + chmod -R g-w $out + + # Patch WebTorrent + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${rpath}:$out/libexec $out/libexec/WebTorrent + + # Symlink to bin + mkdir -p $out/bin + ln -s $out/libexec/WebTorrent $out/bin/WebTorrent + + # Fix the desktop link + substituteInPlace $out/share/applications/webtorrent-desktop.desktop \ + --replace /opt/webtorrent-desktop/WebTorrent $out/bin/WebTorrent + ''; + + meta = with stdenv.lib; { + description = "Streaming torrent app for Mac, Windows, and Linux."; + homepage = https://webtorrent.io/desktop; + license = licenses.mit; + maintainers = [ maintainers.flokli ]; + platforms = [ + "x86_64-linux" + ]; + }; + } diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index b417489c14c0b5a1cd6dbd19edc9fc4cb0721df5..b75145a3e4a3c1a6f5484cd5ef95dc95e0ffec8c 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl -, lirc, shared_mime_info, libjpeg }: +, lirc, shared-mime-info, libjpeg }: stdenv.mkDerivation rec { - name = "xine-ui-0.99.9"; + name = "xine-ui-0.99.10"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd"; + sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a"; }; - nativeBuildInputs = [ pkgconfig shared_mime_info ]; + nativeBuildInputs = [ pkgconfig shared-mime-info ]; buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index fcf569a762a709a38578264e04b61847da29ea99..ee4ea4346e4abe445d4ca79aaf9ff36ed1ee93d4 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,11 +1,13 @@ -{ stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }: +{ stdenv, lib, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }: let - targetArch = if stdenv.isi686 then - "Ia32" + projectDscPath = if stdenv.isi686 then + "OvmfPkg/OvmfPkgIa32.dsc" else if stdenv.isx86_64 then - "X64" + "OvmfPkg/OvmfPkgX64.dsc" + else if stdenv.isAarch64 then + "ArmVirtPkg/ArmVirtQemu.dsc" else throw "Unsupported architecture"; @@ -14,7 +16,7 @@ let src = edk2.src; in -stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { +stdenv.mkDerivation (edk2.setup projectDscPath { name = "OVMF-${version}"; inherit src; @@ -36,28 +38,45 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { ln -sv "$file" . done - ${if (seabios == false) then '' - ln -sv ${src}/OvmfPkg . - '' else '' + ${if stdenv.isAarch64 then '' + ln -sv ${src}/ArmPkg . + ln -sv ${src}/ArmPlatformPkg . + ln -sv ${src}/ArmVirtPkg . + ln -sv ${src}/EmbeddedPkg . + ln -sv ${src}/OvmfPkg . + '' else if seabios != null then '' cp -r ${src}/OvmfPkg . chmod +w OvmfPkg/Csm/Csm16 cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin - ''} + '' else '' + ln -sv ${src}/OvmfPkg . + ''} - ${if (secureBoot == true) then '' - ln -sv ${src}/SecurityPkg . - ln -sv ${src}/CryptoPkg . - '' else '' - ''} - ''; + ${lib.optionalString secureBoot '' + ln -sv ${src}/SecurityPkg . + ln -sv ${src}/CryptoPkg . + ''} + ''; - buildPhase = if (seabios == false) then '' - build ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""} + buildPhase = if stdenv.isAarch64 then '' + build -n $NIX_BUILD_CORES + '' else if seabios == null then '' + build -n $NIX_BUILD_CORES ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"} '' else '' - build -D CSM_ENABLE -D FD_SIZE_2MB ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""} + build -n $NIX_BUILD_CORES -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"} ''; - postFixup = '' + postFixup = if stdenv.isAarch64 then '' + mkdir -vp $fd/FV + mkdir -vp $fd/AAVMF + mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV + + # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec + # FIXME: why is it different from Debian dir layout? https://anonscm.debian.org/cgit/pkg-qemu/edk2.git/tree/debian/rules + dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=/dev/zero bs=1M count=64 + dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=$fd/FV/QEMU_EFI.fd conv=notrunc + dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M count=64 + '' else '' mkdir -vp $OUTPUT_FD/FV mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV ''; @@ -68,6 +87,6 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { description = "Sample UEFI firmware for QEMU and KVM"; homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF; license = stdenv.lib.licenses.bsd2; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; }; }) diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 4ad8f0213261e20118448fe18deef6d4b34e1d16..f9d7128330fbbe7a338eff5fd73a7b6f55a52727 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, libtool -, gtk2, mesa, readline, libX11, libXpm +, gtk2, libGLU_combined, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null , termSupport ? true, ncurses ? null @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./bochs-2.6.9-glibc-2.26.patch ]; buildInputs = with stdenv.lib; - [ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] + [ pkgconfig libtool gtk2 libGLU_combined readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix index d02d786065451398a661339e287dc6176484653b..e10d5414897762481b2705bee66a88cd35cc4684 100644 --- a/pkgs/applications/virtualization/cbfstool/default.nix +++ b/pkgs/applications/virtualization/cbfstool/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "cbfstool-${version}"; - version = "4.5"; + version = "4.7"; src = fetchgit { url = "http://review.coreboot.org/p/coreboot"; rev = "refs/tags/${version}"; - sha256 = "0sc2h440x4sfp1lqnmh3xfgymf7j0rqfx00v6jqf0svfbp8a6cq5"; + sha256 = "02k63013vf7wgsilslj68fs1x81clvqpn91dydaqhv5aymh73zpi"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 3316633e437839cd529397852e4bf720b5be1c73..53372103457554b6a4cb206fcf93d6ba37060d3d 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,23 +1,38 @@ { stdenv, lib, fetchFromGitHub, removeReferencesTo -, go, libapparmor, apparmor-parser, libseccomp }: +, go, libapparmor, apparmor-parser, libseccomp, btrfs-progs }: with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "0.2.9"; + version = "1.0.3"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552"; + sha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; }; - buildInputs = [ removeReferencesTo go ]; + hardeningDisable = [ "fortify" ]; + + buildInputs = [ removeReferencesTo go btrfs-progs ]; + buildFlags = "VERSION=v${version}"; + + BUILDTAGS = [] + ++ optional (btrfs-progs == null) "no_btrfs"; + + preConfigure = '' + # Extract the source + cd "$NIX_BUILD_TOP" + mkdir -p "go/src/github.com/containerd" + mv "$sourceRoot" "go/src/github.com/containerd/containerd" + export GOPATH=$NIX_BUILD_TOP/go:$GOPATH +''; preBuild = '' - ln -s $(pwd) vendor/src/github.com/containerd/containerd + cd go/src/github.com/containerd/containerd + patchShebangs . ''; installPhase = '' diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 48bb512e1341d551d4247be1fc247573656f2d7c..61899d12974fbd343f3a6793517ba0ee3b9801e5 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -13,18 +13,8 @@ rec { , runcRev, runcSha256 , containerdRev, containerdSha256 , tiniRev, tiniSha256 - } : stdenv.mkDerivation rec { - inherit version rev; - - name = "docker-${version}"; - - src = fetchFromGitHub { - owner = "docker"; - repo = "docker-ce"; - rev = "v${version}"; - sha256 = sha256; - }; - + } : + let docker-runc = runc.overrideAttrs (oldAttrs: rec { name = "docker-runc"; src = fetchFromGitHub { @@ -36,6 +26,7 @@ rec { # docker/runc already include these patches / are not applicable patches = []; }); + docker-containerd = containerd.overrideAttrs (oldAttrs: rec { name = "docker-containerd"; src = fetchFromGitHub { @@ -45,12 +36,11 @@ rec { sha256 = containerdSha256; }; - # This should go into the containerd derivation once 1.0.0 is out - preBuild = '' - mkdir $(pwd)/vendor/src - mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ - '' + oldAttrs.preBuild; + hardeningDisable = [ "fortify" ]; + + buildInputs = [ removeReferencesTo go btrfs-progs ]; }); + docker-tini = tini.overrideAttrs (oldAttrs: rec { name = "docker-init"; src = fetchFromGitHub { @@ -68,32 +58,50 @@ rec { "-DMINIMAL=ON" ]; }); + in + stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) rec { + + inherit docker-runc docker-containerd docker-proxy docker-tini; + + DOCKER_BUILDTAGS = [] + ++ optional (systemd != null) [ "journald" ] + ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" + ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper" + ++ optional (libseccomp != null) "seccomp"; + + }) // rec { + inherit version rev; + + name = "docker-${version}"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "docker-ce"; + rev = "v${version}"; + sha256 = sha256; + }; # Optimizations break compilation of libseccomp c bindings hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper removeReferencesTo go-md2man go - sqlite devicemapper btrfs-progs systemd libtool libseccomp + makeWrapper removeReferencesTo go-md2man go libtool + ] ++ optionals (stdenv.isLinux) [ + sqlite devicemapper btrfs-progs systemd libseccomp ]; dontStrip = true; - DOCKER_BUILDTAGS = [] - ++ optional (systemd != null) [ "journald" ] - ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper" - ++ optional (libseccomp != null) "seccomp"; - - buildPhase = '' + buildPhase = (optionalString (stdenv.isLinux) '' # build engine cd ./components/engine export AUTO_GOPATH=1 export DOCKER_GITCOMMIT="${rev}" + export VERSION="${version}" ./hack/make.sh dynbinary cd - - + '') + '' # build cli cd ./components/cli # Mimic AUTO_GOPATH @@ -110,27 +118,20 @@ rec { # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd patchPhase = '' + substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" "" + '' + optionalString (stdenv.isLinux) '' patchShebangs . substituteInPlace ./components/engine/hack/make.sh --replace libsystemd-journal libsystemd substituteInPlace ./components/engine/daemon/logger/journald/read.go --replace libsystemd-journal libsystemd - substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" "" - ''; + ''; outputs = ["out" "man"]; - extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; + extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]); - installPhase = '' - install -Dm755 ./components/cli/docker $out/libexec/docker/docker - - if [ -d "./components/engine/bundles/${version}" ]; then - install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd - else - install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd - fi + installPhase = optionalString (stdenv.isLinux) '' + install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $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" @@ -143,6 +144,11 @@ rec { # systemd install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + '' + '' + install -Dm755 ./components/cli/docker $out/libexec/docker/docker + + makeWrapper $out/libexec/docker/docker $out/bin/docker \ + --prefix PATH : "$out/libexec/docker:$extraPath" # completion (cli) install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker @@ -174,41 +180,43 @@ rec { ''; preFixup = '' - find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' + + find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' + + '' + optionalString (stdenv.isLinux) '' + find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' + ''; meta = { homepage = https://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; [ nequissimus offline tailhook vdemeester ]; - platforms = platforms.linux; + maintainers = with maintainers; [ nequissimus offline tailhook vdemeester periklis ]; + platforms = with platforms; linux ++ darwin; }; - }; + }); # Get revisions from - # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits - - docker_17_09 = dockerGen rec { - version = "17.09.0-ce"; - rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit - sha256 = "03g0imdcxqx9y4hhyymxqzvm8bqg4cqrmb7sjbxfdgrhzh9kcn1p"; - runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64"; - runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq"; - containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; - containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; + # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* + + docker_18_03 = dockerGen rec { + version = "18.03.0-ce"; + rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit + sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g"; + runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; + runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; + containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c"; + containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_17_10 = dockerGen rec { - version = "17.10.0-ce"; - rev = "f4ffd2511ce93aa9e5eefdf0e912f77543080b0b"; # git commit - sha256 = "07x47cfdaz4lhlga1pchcbqqy0nd2q6zch0ycag18vzi99w4gmh2"; - runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d"; - runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0"; - containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; - containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; + docker_18_04 = dockerGen rec { + version = "18.04.0-ce"; + rev = "3d479c0af67cb9ea43a9cfc1bf2ef097e06a3470"; # git commit + sha256 = "1askbk8b92cdv7vlm688g2f1v2xjhmx77578318x76dydfql3jfl"; + runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; + runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; + containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; + containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker/distribution.nix similarity index 100% rename from pkgs/applications/virtualization/docker-distribution/default.nix rename to pkgs/applications/virtualization/docker/distribution.nix diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix index 811e5cf47c3b7e1bf1e097f7ef061384e0563f9c..8b590cff96405e37482c8d8865463d3ccae5375e 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dynamips"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "12c45jcp9isz57dbshxrvvhqbvmf9cnrr7ddac5m6p34in4hk01n"; + sha256 = "1jrwvrpl61rqbjjphv8v7ryhdwfjrpps76dbvkpl43hpn5hqqis2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 9ca73747c45954181bb0e424043a6341c979d520..8d5ecfce9fd2801e860eca972c39a8c529f9e9dd 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: stdenv.mkDerivation rec { - name = "lkl-2017-11-10"; - rev = "52a6a643c7d1dd3031c0cbec75e1ac7a999f3d57"; + name = "lkl-2018-03-10"; + rev = "8772a4da6064444c5b70766b806fe272b0287c31"; outputs = [ "dev" "lib" "out" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "1i5ywrfxqpykjjalwh9g4rwd4s186cqk3j806d327a67xb2ivxnp"; + sha256 = "1m6gh4zcx1q7rv05d0knjpk3ivk2b3kc0kwjndciadqc45kws4wh"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { 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 tools/lkl/{cptofs,fs2tar,lklfuse} $out/bin + ln -s cptofs $out/bin/cpfromfs cp -r tools/lkl/include $dev/ cp tools/lkl/liblkl*.{a,so} $lib/lib ''; @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { overhead ''; homepage = https://github.com/lkl/linux/; - platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it + platforms = [ "x86_64-linux" "aarch64-linux" ]; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ copumpkin ]; }; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bd014dd60d37160842144acadf606c5947579414 --- /dev/null +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub +, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig +, libX11, freefont_ttf +}: + +stdenv.mkDerivation rec { + name = "looking-glass-client-${version}"; + version = "a10"; + + src = fetchFromGitHub { + owner = "gnif"; + repo = "LookingGlass"; + rev = version; + sha256 = "10jxnkrvskjzkg86iz3hnb5v91ykzx6pvcnpy1v4436g5f2d62wn"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig + libX11 freefont_ttf + ]; + + enableParallelBuilding = true; + + sourceRoot = "source/client"; + + installPhase = '' + mkdir -p $out + mv bin $out/ + ''; + + meta = with stdenv.lib; { + description = "A KVM Frame Relay (KVMFR) implementation"; + longDescription = '' + Looking Glass is an open source application that allows the use of a KVM + (Kernel-based Virtual Machine) configured for VGA PCI Pass-through + without an attached physical monitor, keyboard or mouse. This is the final + step required to move away from dual booting with other operating systems + for legacy programs that require high performance graphics. + ''; + homepage = https://looking-glass.hostfission.com/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.pneumaticat ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index c7f8ea696b579432c4a139f465c9b2fe4ca0c6f5..e42c1d5dd1e49f3771c80da2409b5e1108557e44 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { better management of, and seamless user interactions with, guests. ''; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ joamaki ]; }; } diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix deleted file mode 100644 index 21cb4906d0347debec04d97ef40d1fa4b78b55b7..0000000000000000000000000000000000000000 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, python2Packages, sqlite, which, strace }: - -python2Packages.buildPythonApplication rec { - name = "glance-${version}"; - version = "11.0.0"; - namePrefix = ""; - - PBR_VERSION = "${version}"; - - src = fetchurl { - url = "https://github.com/openstack/glance/archive/${version}.tar.gz"; - sha256 = "05rz1lmzdmpnw8sf87vvi0l6q9g6s840z934zyinw17yfcvmqrdg"; - }; - - # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt - propagatedBuildInputs = with python2Packages; [ - pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate - httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste - jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python - WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile - - # oslo componenets - oslo-config oslo-context oslo-concurrency oslo-service oslo-utils oslo-db - oslo-i18n oslo-log oslo-messaging oslo-middleware oslo-policy oslo-serialization - MySQL_python - ]; - - buildInputs = with python2Packages; [ - Babel coverage fixtures mox3 mock oslosphinx requests testrepository pep8 - testresources testscenarios testtools psutil_1 oslotest psycopg2 - sqlite which strace - ]; - - patchPhase = '' - # it's not a test, but a class mixin - sed -i 's/ImageCacheTestCase/ImageCacheMixin/' glance/tests/unit/test_image_cache.py - - # these require network access, see https://bugs.launchpad.net/glance/+bug/1508868 - sed -i 's/test_get_image_data_http/noop/' glance/tests/unit/common/scripts/test_scripts_utils.py - sed -i 's/test_set_image_data_http/noop/' glance/tests/unit/common/scripts/image_import/test_main.py - sed -i 's/test_create_image_with_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py - sed -i 's/test_upload_image_http_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py - - # TODO: couldn't figure out why this test is failing - sed -i 's/test_all_task_api/noop/' glance/tests/integration/v2/test_tasks_api.py - ''; - - postInstall = '' - # check all binaries don't crash - for i in $out/bin/*; do - case "$i" in - *glance-artifacts) # https://bugs.launchpad.net/glance/+bug/1508879 - : - ;; - *) - $i --help - esac - done - - cp etc/*-paste.ini $out/etc/ - ''; - - meta = with stdenv.lib; { - homepage = http://glance.openstack.org/; - description = "Services for discovering, registering, and retrieving virtual machine images"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix deleted file mode 100644 index 39c54f0d204b07a89aaaecf8ba11f77675c6bdf0..0000000000000000000000000000000000000000 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, python2Packages, xmlsec, which, openssl }: - -python2Packages.buildPythonApplication rec { - name = "keystone-${version}"; - version = "8.0.0"; - namePrefix = ""; - - PBR_VERSION = "${version}"; - - src = fetchurl { - url = "https://github.com/openstack/keystone/archive/${version}.tar.gz"; - sha256 = "1xbrs7xgwjzrs07zyxxcl2lq18dh582gd6lx1zzzji8c0qmffy0z"; - }; - - # remove on next version bump - patches = [ ./remove-oslo-policy-tests.patch ]; - - # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt - propagatedBuildInputs = with python2Packages; [ - pbr webob eventlet greenlet PasteDeploy paste routes cryptography six - sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached - keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack - xmlsec MySQL_python - - # oslo - oslo-cache oslo-concurrency oslo-config oslo-context oslo-messaging oslo-db - oslo-i18n oslo-log oslo-middleware oslo-policy oslo-serialization oslo-service - oslo-utils - ]; - - buildInputs = with python2Packages; [ - coverage fixtures mock subunit tempest-lib testtools testrepository - ldap ldappool webtest requests oslotest pep8 pymongo which - ]; - - makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"]; - - postInstall = '' - # install .ini files - mkdir -p $out/etc - cp etc/* $out/etc - - # check all binaries don't crash - for i in $out/bin/*; do - $i --help - done - ''; - - meta = with stdenv.lib; { - homepage = http://keystone.openstack.org/; - description = "Authentication, authorization and service discovery mechanisms via HTTP"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch b/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch deleted file mode 100644 index d7a2caa2bdea15033d363aabfa41c543a3c10d99..0000000000000000000000000000000000000000 --- a/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 3aefdf4de76fdcdc02093bc631e339f9ecd4c707 Mon Sep 17 00:00:00 2001 -From: James Page -Date: Fri, 18 Sep 2015 16:38:47 +0100 -Subject: Add compatibility with iproute2 >= 4.0 - -The ip netns list command adds additional id data in more recent -versions of iproute2 of the format: - - qdhcp-35fc068a-750d-4add-b1d2-af392dbd8790 (id: 1) - -Update parsing to deal with old and new formats. - -Change-Id: I0d3fc4262284172f5ad31e4f2f78ae1fb33b4228 -Closes-Bug: 1497309 ---- - neutron/agent/linux/ip_lib.py | 6 +++--- - neutron/tests/functional/agent/test_l3_agent.py | 2 +- - neutron/tests/unit/agent/linux/test_ip_lib.py | 15 +++++++++++++++ - 3 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py -index 551341a..a717bf6 100644 ---- a/neutron/agent/linux/ip_lib.py -+++ b/neutron/agent/linux/ip_lib.py -@@ -208,7 +208,7 @@ class IPWrapper(SubProcessBase): - @classmethod - def get_namespaces(cls): - output = cls._execute([], 'netns', ('list',)) -- return [l.strip() for l in output.split('\n')] -+ return [l.split()[0] for l in output.splitlines()] - - - class IPDevice(SubProcessBase): -@@ -819,8 +819,8 @@ class IpNetnsCommand(IpCommandBase): - output = self._parent._execute( - ['o'], 'netns', ['list'], - run_as_root=cfg.CONF.AGENT.use_helper_for_ns_read) -- for line in output.split('\n'): -- if name == line.strip(): -+ for line in [l.split()[0] for l in output.splitlines()]: -+ if name == line: - return True - return False - -diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py -index ffa20e6..84b16df 100644 ---- a/neutron/tests/functional/agent/test_l3_agent.py -+++ b/neutron/tests/functional/agent/test_l3_agent.py -@@ -790,7 +790,7 @@ class L3HATestFramework(L3AgentTestFramework): - get_ns_name = mock.patch.object( - namespaces.RouterNamespace, '_get_ns_name').start() - get_ns_name.return_value = "%s%s%s" % ( -- namespaces.RouterNamespace._get_ns_name(router_info['id']), -+ 'qrouter-' + router_info['id'], - self.NESTED_NAMESPACE_SEPARATOR, self.agent.host) - router1 = self.manage_router(self.agent, router_info) - -diff --git a/neutron/tests/unit/agent/linux/test_ip_lib.py b/neutron/tests/unit/agent/linux/test_ip_lib.py -index 2de408d..bdfc9d7 100644 ---- a/neutron/tests/unit/agent/linux/test_ip_lib.py -+++ b/neutron/tests/unit/agent/linux/test_ip_lib.py -@@ -27,6 +27,11 @@ NETNS_SAMPLE = [ - 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', - 'cccccccc-cccc-cccc-cccc-cccccccccccc'] - -+NETNS_SAMPLE_IPROUTE2_4 = [ -+ '12345678-1234-5678-abcd-1234567890ab (id: 1)', -+ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb (id: 0)', -+ 'cccccccc-cccc-cccc-cccc-cccccccccccc (id: 2)'] -+ - LINK_SAMPLE = [ - '1: lo: mtu 16436 qdisc noqueue state UNKNOWN \\' - 'link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 promiscuity 0', -@@ -279,6 +284,16 @@ class TestIpWrapper(base.BaseTestCase): - - self.execute.assert_called_once_with([], 'netns', ('list',)) - -+ def test_get_namespaces_iproute2_4(self): -+ self.execute.return_value = '\n'.join(NETNS_SAMPLE_IPROUTE2_4) -+ retval = ip_lib.IPWrapper.get_namespaces() -+ self.assertEqual(retval, -+ ['12345678-1234-5678-abcd-1234567890ab', -+ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', -+ 'cccccccc-cccc-cccc-cccc-cccccccccccc']) -+ -+ self.execute.assert_called_once_with([], 'netns', ('list',)) -+ - def test_add_tuntap(self): - ip_lib.IPWrapper().add_tuntap('tap0') - self.execute.assert_called_once_with([], 'tuntap', --- -cgit v0.11.2 - diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix deleted file mode 100644 index 9ee586cf040915d300fdd8589c03d97e099d3714..0000000000000000000000000000000000000000 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, python2Packages, xmlsec, which, dnsmasq }: - -python2Packages.buildPythonApplication rec { - name = "neutron-${version}"; - version = "7.0.0"; - namePrefix = ""; - - PBR_VERSION = "${version}"; - - src = fetchurl { - url = "https://github.com/openstack/neutron/archive/${version}.tar.gz"; - sha256 = "02ll081xly7zfjmgkal81fy3aplbnn5zgx8xfy3yy1nv3kfnyi40"; - }; - - # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt - propagatedBuildInputs = with python2Packages; [ - pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests - jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six - stevedore pecan ryu networking-hyperv MySQL_python - - # clients - keystoneclient neutronclient novaclient - - # oslo components - oslo-concurrency oslo-config oslo-context oslo-db oslo-i18n oslo-log oslo-messaging - oslo-middleware oslo-policy oslo-rootwrap oslo-serialization oslo-service oslo-utils - oslo-versionedobjects - ]; - - # make sure we include migrations - prePatch = '' - echo "graft neutron" >> MANIFEST.in - substituteInPlace etc/neutron/rootwrap.d/dhcp.filters --replace "/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" - ''; - patches = [ ./neutron-iproute-4.patch ]; - - buildInputs = with python2Packages; [ - cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository - testtools testresources testscenarios webtest oslotest os-testr tempest-lib - ddt pep8 - ]; - - postInstall = '' - # requires extra optional dependencies - # TODO: package networking_mlnx, networking_vsphere, bsnstacklib, XenAPI - rm $out/bin/{neutron-mlnx-agent,neutron-ovsvapp-agent,neutron-restproxy-agent,neutron-rootwrap-xen-dom0} - - # check all binaries don't crash - for i in $out/bin/*; do - case "$i" in - *neutron-pd-notify|*neutron-rootwrap-daemon|*neutron-rootwrap) - : - ;; - *) - $i --help - esac - done - ''; - - meta = with stdenv.lib; { - homepage = http://neutron.openstack.org/; - description = "Virtual network service for Openstack"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - # Marked as broken due to needing an update for security issues. - # See: https://github.com/NixOS/nixpkgs/issues/18856 - broken = true; - }; -} diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix deleted file mode 100644 index ef3eb2fb084297e922d69bed21aa7a4f9b628b0a..0000000000000000000000000000000000000000 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchurl, python2Packages, openssl, openssh }: - -python2Packages.buildPythonApplication rec { - name = "nova-${version}"; - version = "12.0.0"; - namePrefix = ""; - - PBR_VERSION = "${version}"; - - src = fetchurl { - url = "https://github.com/openstack/nova/archive/${version}.tar.gz"; - sha256 = "175n1znvmy8f5vqvabc2fa4qy8y17685z4gzpq8984mdsdnpv21w"; - }; - - # otherwise migrate.cfg is not installed - patchPhase = '' - echo "graft nova" >> MANIFEST.in - - # remove transient error test, see http://hydra.nixos.org/build/40203534 - rm nova/tests/unit/compute/test_{shelve,compute_utils}.py - ''; - - # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt - 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 requests six - stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql - keystonemiddleware MySQL_python - - # oslo components - oslo-rootwrap oslo-reports oslo-utils oslo-i18n oslo-config oslo-context - oslo-log oslo-serialization oslo-middleware oslo-db oslo-service oslo-messaging - oslo-concurrency oslo-versionedobjects - - # clients - cinderclient neutronclient glanceclient - ]; - - buildInputs = with python2Packages; [ - coverage fixtures mock mox3 subunit requests-mock pillow oslosphinx - oslotest testrepository testresources testtools tempest-lib bandit - oslo-vmware pep8 barbicanclient ironicclient openssl openssh - ]; - - postInstall = '' - cp -prvd etc $out/etc - - # check all binaries don't crash - for i in $out/bin/*; do - case "$i" in - *nova-dhcpbridge*) - : - ;; - *nova-rootwrap*) - : - ;; - *) - $i --help - ;; - esac - done - ''; - - meta = with stdenv.lib; { - homepage = http://nova.openstack.org/; - description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch b/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch deleted file mode 100644 index 3cdc27a2d2af2e46998407f82fe48bcc213847fc..0000000000000000000000000000000000000000 --- a/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6016d017004acaae288312b196ef07ea98e9962d Mon Sep 17 00:00:00 2001 -From: Brant Knudson -Date: Mon, 12 Oct 2015 15:12:45 -0500 -Subject: [PATCH] Remove oslo.policy implementation tests from keystone - -oslo.policy 0.12.0 contains a change to use requests to do the http -check rather than urllib. This change caused keystone tests to fail -because the keystone tests were mocking urllib, making assumptions -about how oslo.policy is implemented. Keystone doesn't need to test -internal features of oslo.policy, so these tests are removed. - -Change-Id: I9d6e4950b9fe75cbb94100c8effdcec002642027 -Closes-Bug: 1505374 ---- - keystone/tests/unit/test_policy.py | 24 ------------------------ - 1 file changed, 24 deletions(-) - -diff --git a/keystone/tests/unit/test_policy.py b/keystone/tests/unit/test_policy.py -index b2f0e52..686e2b7 100644 ---- a/keystone/tests/unit/test_policy.py -+++ b/keystone/tests/unit/test_policy.py -@@ -16,10 +16,8 @@ - import json - import os - --import mock - from oslo_policy import policy as common_policy - import six --from six.moves.urllib import request as urlrequest - from testtools import matchers - - from keystone import exception -@@ -118,28 +116,6 @@ def test_enforce_good_action(self): - action = "example:allowed" - rules.enforce(self.credentials, action, self.target) - -- def test_enforce_http_true(self): -- -- def fakeurlopen(url, post_data): -- return six.StringIO("True") -- -- action = "example:get_http" -- target = {} -- with mock.patch.object(urlrequest, 'urlopen', fakeurlopen): -- result = rules.enforce(self.credentials, action, target) -- self.assertTrue(result) -- -- def test_enforce_http_false(self): -- -- def fakeurlopen(url, post_data): -- return six.StringIO("False") -- -- action = "example:get_http" -- target = {} -- with mock.patch.object(urlrequest, 'urlopen', fakeurlopen): -- self.assertRaises(exception.ForbiddenAction, rules.enforce, -- self.credentials, action, target) -- - def test_templatized_enforcement(self): - target_mine = {'project_id': 'fake'} - target_not_mine = {'project_id': 'another'} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index cb0f772ada3a44ea7668ddcedafa9c51ced1d5df..f5cd661fbecba9645f62a24cb8c0b2cff2a28e05 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,31 +4,40 @@ , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile -, numaSupport ? stdenv.isLinux, numactl +, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio -, sdlSupport ? !stdenv.isDarwin, SDL +, sdlSupport ? !stdenv.isDarwin, SDL2 +, gtkSupport ? !xenSupport, gtk3, gettext, gnome3 , vncSupport ? true, libjpeg, libpng -, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol +, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen -, x86Only ? false +, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm +, virglSupport ? openGLSupport, virglrenderer +, hostCpuOnly ? false , nixosTestRunner ? false }: with stdenv.lib; let - version = "2.10.1"; - sha256 = "1a3bjr0ygx4r2qd4nx5jf77jhh4xis3zga27lfryn0b4ap3hn14f"; + version = "2.11.1"; + sha256 = "1jrcff0szyjxc3vywyiclwdzk0xgq4cxvjbvmcfyjcpdrq9j5pyr"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; + + hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" + else if stdenv.isi686 then "i386-softmmu" + else if stdenv.isArm then "arm-softmmu" + else if stdenv.isAarch64 then "aarch64-softmmu" + else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; in stdenv.mkDerivation rec { name = "qemu-" + stdenv.lib.optionalString xenSupport "xen-" - + stdenv.lib.optionalString x86Only "x86-only-" + + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-" + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-" + version; @@ -46,18 +55,45 @@ stdenv.mkDerivation rec { ++ optionals seccompSupport [ libseccomp ] ++ optionals numaSupport [ numactl ] ++ optionals pulseSupport [ libpulseaudio ] - ++ optionals sdlSupport [ SDL ] + ++ optionals sdlSupport [ SDL2 ] + ++ optionals gtkSupport [ gtk3 gettext gnome3.vte ] ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice ] + ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] - ++ optionals xenSupport [ xen ]; + ++ optionals xenSupport [ xen ] + ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] + ++ optionals virglSupport [ virglrenderer ]; enableParallelBuilding = true; - patches = [ ./no-etc-install.patch ] + outputs = [ "out" "ga" ]; + + patches = [ ./no-etc-install.patch ./statfs-flags.patch (fetchpatch { + name = "glibc-2.27-memfd.patch"; + url = "https://git.qemu.org/?p=qemu.git;a=patch;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0"; + sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch - ++ optional pulseSupport ./fix-hda-recording.patch; + ++ optional pulseSupport ./fix-hda-recording.patch + ++ optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch; + sha256 = "1xfdjs1jlvs99hpf670yianb8c3qz2ars8syzyz8f2c2cp5y4bxb"; + }) + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch; + sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; + }) + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch; + sha256 = "1ar6r1vpmhnbs72v6mhgyahcjcf7b9b4xi7asx17sy68m171d2g6"; + }) + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch; + sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; + }) + ]; hardeningDisable = [ "stackprotector" ]; @@ -75,26 +111,35 @@ stdenv.mkDerivation rec { ++ optional seccompSupport "--enable-seccomp" ++ optional spiceSupport "--enable-spice" ++ optional usbredirSupport "--enable-usb-redir" - ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" + ++ optional hostCpuOnly "--target-list=${hostCpuTargets}" ++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isLinux "--enable-linux-aio" - ++ optional xenSupport "--enable-xen"; + ++ optional gtkSupport "--enable-gtk" + ++ optional xenSupport "--enable-xen" + ++ optional openGLSupport "--enable-opengl" + ++ optional virglSupport "--enable-virglrenderer"; postFixup = '' for exe in $out/bin/qemu-system-* ; do paxmark m $exe done + # copy qemu-ga (guest agent) to separate output + mkdir -p $ga/bin + cp $out/bin/qemu-ga $ga/bin/ ''; + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = - '' - # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. - p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" - if [ -e "$p" ]; then - makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" - fi - ''; + if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else ""; + + passthru = { + qemu-system-i386 = "bin/qemu-system-i386"; + }; meta = with stdenv.lib; { homepage = http://www.qemu.org/; diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix new file mode 100644 index 0000000000000000000000000000000000000000..2159ad4b4dc9c63ffcab3bb64aea944efbf392eb --- /dev/null +++ b/pkgs/applications/virtualization/qemu/riscv.nix @@ -0,0 +1,30 @@ +{ qemu, fetchFromGitHub, lib }: let + src = fetchFromGitHub { + owner = "riscv"; + repo = "riscv-qemu"; + rev = "f733c7b5f86147216e14aff90c03ccdd76056bef"; + sha256 = "1ppr9qqwi7qqh8m6dgk1hrzg8zri240il27l67vfayd8ijagb9zq"; + fetchSubmodules = true; + }; + version = "2.11.92"; + revCount = "60378"; + shortRev = builtins.substring 0 9 src.rev; + targets = [ "riscv32-linux-user" "riscv32-softmmu" + "riscv64-linux-user" "riscv64-softmmu" + ]; +in lib.overrideDerivation qemu (orig: { + name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}"; + inherit src; +# <<<<<<< HEAD +# # https://github.com/riscv/riscv-qemu/pull/109 +# patches = [ ./no-etc-install.patch ./statfs-flags.patch ./riscv-initrd.patch ]; +# ======= + # The pulseaudio and statfs patches are in 2.12.0+, which this is based on + patches = [ + ./force-uid0-on-9p.patch + ./no-etc-install.patch + ]; + + configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ]; + postInstall = null; +}) diff --git a/pkgs/applications/virtualization/qemu/statfs-flags.patch b/pkgs/applications/virtualization/qemu/statfs-flags.patch new file mode 100644 index 0000000000000000000000000000000000000000..52a470a2869af42ffeec9c2f42eafa7c64a14aea --- /dev/null +++ b/pkgs/applications/virtualization/qemu/statfs-flags.patch @@ -0,0 +1,197 @@ +commit 909fe47c7009aa9a75fe9470c5f8d3dd5b50917a +Author: Shea Levy +Date: Sun Feb 18 13:50:11 2018 -0500 + + linux-user: Support f_flags in statfs when available. + + Signed-off-by: Shea Levy + +diff --git a/configure b/configure +index 913e14839d..52fe2bf941 100755 +--- a/configure ++++ b/configure +@@ -5303,6 +5303,22 @@ if compile_prog "" "" ; then + have_utmpx=yes + fi + ++########################################## ++# Check for newer fields of struct statfs on Linux ++ ++if test "$linux_user" = "yes"; then ++ cat > $TMPC < ++ ++int main(void) { ++ struct statfs fs; ++ fs.f_flags = 0; ++} ++EOF ++ if compile_object ; then ++ have_statfs_flags=yes ++ fi ++fi + ########################################## + # checks for sanitizers + +@@ -6518,6 +6534,10 @@ if test "$have_utmpx" = "yes" ; then + echo "HAVE_UTMPX=y" >> $config_host_mak + fi + ++if test "$have_statfs_flags" = "yes" ; then ++ echo "HAVE_STATFS_FLAGS=y" >> $config_host_mak ++fi ++ + if test "$ivshmem" = "yes" ; then + echo "CONFIG_IVSHMEM=y" >> $config_host_mak + fi +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 82b35a6bdf..77481eca2c 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -9534,6 +9534,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, + __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]); + __put_user(stfs.f_namelen, &target_stfs->f_namelen); + __put_user(stfs.f_frsize, &target_stfs->f_frsize); ++#ifdef HAVE_STATFS_FLAGS ++ __put_user(stfs.f_flags, &target_stfs->f_flags); ++#endif + memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare)); + unlock_user_struct(target_stfs, arg2, 1); + } +diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h +index a35c52a60a..64aa49d3c5 100644 +--- a/linux-user/syscall_defs.h ++++ b/linux-user/syscall_defs.h +@@ -362,7 +362,14 @@ struct kernel_statfs { + int f_ffree; + kernel_fsid_t f_fsid; + int f_namelen; ++#ifdef HAVE_STATFS_FLAGS ++ int f_frsize; ++ int f_flags; ++ int f_spare[4]; ++#else + int f_spare[6]; ++#endif ++ + }; + + struct target_dirent { +@@ -2223,7 +2230,12 @@ struct target_statfs { + /* Linux specials */ + target_fsid_t f_fsid; + int32_t f_namelen; ++#ifdef HAVE_STATFS_FLAGS ++ int32_t f_flags; ++ int32_t f_spare[5]; ++#else + int32_t f_spare[6]; ++#endif + }; + #else + struct target_statfs { +@@ -2239,7 +2251,12 @@ struct target_statfs { + /* Linux specials */ + target_fsid_t f_fsid; + abi_long f_namelen; ++#ifdef HAVE_STATFS_FLAGS ++ abi_long f_flags; ++ abi_long f_spare[5]; ++#else + abi_long f_spare[6]; ++#endif + }; + #endif + +@@ -2255,7 +2272,12 @@ struct target_statfs64 { + uint64_t f_bavail; + target_fsid_t f_fsid; + uint32_t f_namelen; ++#ifdef HAVE_STATFS_FLAGS ++ uint32_t f_flags; ++ uint32_t f_spare[5]; ++#else + uint32_t f_spare[6]; ++#endif + }; + #elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \ + defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \ +@@ -2271,7 +2293,12 @@ struct target_statfs { + target_fsid_t f_fsid; + abi_long f_namelen; + abi_long f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ abi_long f_flags; ++ abi_long f_spare[4]; ++#else + abi_long f_spare[5]; ++#endif + }; + + struct target_statfs64 { +@@ -2285,7 +2312,12 @@ struct target_statfs64 { + target_fsid_t f_fsid; + abi_long f_namelen; + abi_long f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ abi_long f_flags; ++ abi_long f_spare[4]; ++#else + abi_long f_spare[5]; ++#endif + }; + #elif defined(TARGET_S390X) + struct target_statfs { +@@ -2299,7 +2331,13 @@ struct target_statfs { + kernel_fsid_t f_fsid; + int32_t f_namelen; + int32_t f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ int32_t f_flags; ++ int32_t f_spare[4]; ++#else + int32_t f_spare[5]; ++#endif ++ + }; + + struct target_statfs64 { +@@ -2313,7 +2351,12 @@ struct target_statfs64 { + kernel_fsid_t f_fsid; + int32_t f_namelen; + int32_t f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ int32_t f_flags; ++ int32_t f_spare[4]; ++#else + int32_t f_spare[5]; ++#endif + }; + #else + struct target_statfs { +@@ -2327,7 +2370,12 @@ struct target_statfs { + target_fsid_t f_fsid; + uint32_t f_namelen; + uint32_t f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ uint32_t f_flags; ++ uint32_t f_spare[4]; ++#else + uint32_t f_spare[5]; ++#endif + }; + + struct target_statfs64 { +@@ -2341,7 +2389,12 @@ struct target_statfs64 { + target_fsid_t f_fsid; + uint32_t f_namelen; + uint32_t f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ uint32_t f_flags; ++ uint32_t f_spare[4]; ++#else + uint32_t f_spare[5]; ++#endif + }; + #endif + diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index a99e6f569564379676547610c70ac7d52167a17e..40eadad68d09fd64b844b95591bfb1ae2187db1f 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.2"; + version = "2.4"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5"; + sha256 = "14zcpzpdb5gxkxvckcdwq3mfv8b18zirbdskzddhqxjddkzayckz"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { RemoteBox aims to fill this gap by providing a graphical VirtualBox client which is able to manage a VirtualBox server installation. ''; - maintainers = with maintainers; [ nckx ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 452f082e20e7f4989b5fb0846da5369f064b4ebe..777dc6fe9304a8ee7b2ab7a1f5cd0576f22c8d53 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.29.0"; + version = "1.30.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "0wnhii15pr4z190iladfcl4jzj9sgyl1bn5v63a3yy6nkmz9cfda"; + sha256 = "0dqf83b7iin1np8k8k1m8i99ybga8vx932q7n2q64yghkw7p6i00"; }; stage1BaseImage = fetchurl { @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/ wrapProgram $out/bin/rkt \ - --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib \ + --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \ --prefix PATH : ${iptables}/bin ''; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 4fdb7421c3cb58b57c713a0532bfa1b95cdb8533..b0fd42f4efb13bb1760d27b12253ac10e78f9337 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "runc-${version}"; - version = "1.0.0-rc4"; + version = "1.0.0-rc5"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "0dh24x0zw90hs7618pnqvjhd2nx8dpz3b5jwc1vbs8dawj8prir2"; + sha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index 6b40b1da3a0d90516e387aa6d748b74747e9212e..5aa73528e9d72f569ff0121ff390f9c08fac2b06 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "seabios-${version}"; - version = "1.9.3"; + version = "1.11.0"; src = fetchurl { url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz"; - sha256 = "13b7n20qfc2cc8v70jvl9r51m563rss9lbk1aflirvnd9705vs0s"; + sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2"; }; buildInputs = [ iasl python ]; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index ddd8cf72b93db9d98a83733d939609d24ca6d7bb..d6913a94432b2452186cfaa7ba7542d55aff5748 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -1,20 +1,55 @@ { stdenv , fetchFromGitHub -, autoreconfHook }: +, autoreconfHook +, gnutar +, which +, gnugrep +, coreutils +, python +, e2fsprogs +, makeWrapper +, squashfsTools +, gzip +, gnused +, curl +, utillinux + }: stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.2"; + version = "2.4.6"; + + enableParallelBuilding = true; + + patches = [ ./env.patch ]; + + preConfigure = '' + sed -i 's/-static//g' src/Makefile.am + patchShebangs . + ''; + + configureFlags = "--localstatedir=/var"; + installFlags = "CONTAINER_MOUNTDIR=dummy CONTAINER_FINALDIR=dummy CONTAINER_OVERLAY=dummy SESSIONDIR=dummy"; + + fixupPhase = '' + patchShebangs $out + for f in $out/libexec/singularity/helpers/help.sh $out/libexec/singularity/cli/*.exec $out/libexec/singularity/bootstrap-scripts/*.sh ; do + chmod a+x $f + sed -i 's| /sbin/| |g' $f + sed -i 's| /bin/bash| ${stdenv.shell}|g' $f + wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath buildInputs} + done + ''; src = fetchFromGitHub { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px"; + sha256 = "0bs1jqm7v7wv1kdxq8kyqn3gl5m76j0wwwgjyjnndrhczlsh5m1d"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux ]; meta = with stdenv.lib; { homepage = http://singularity.lbl.gov/; diff --git a/pkgs/applications/virtualization/singularity/env.patch b/pkgs/applications/virtualization/singularity/env.patch new file mode 100644 index 0000000000000000000000000000000000000000..bc3be363bb818885b8b452762247b320fe217924 --- /dev/null +++ b/pkgs/applications/virtualization/singularity/env.patch @@ -0,0 +1,21 @@ +diff --git a/libexec/functions b/libexec/functions +index bc68107..6c2211c 100644 +--- a/libexec/functions ++++ b/libexec/functions +@@ -29,16 +29,6 @@ if [ -z "${SINGULARITY_MESSAGELEVEL:-}" ]; then + SINGULARITY_MESSAGELEVEL=5 + fi + +-if [ -z "${USER:-}" ]; then +- USER=`id -un` +- export USER +-fi +-if [ -z "${HOME:-}" ]; then +- HOME=`getent passwd "$USER" | cut -d : -f 6` +- export HOME +-fi +- +- + message() { + LEVEL="${1:-}" + MESSAGE="${2:-}" diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 74da6c4ab16731eefae78c8b35d5289d23c85abe..15ae244b3291a1c5a33faba32bc25ef5d4bc2792 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib, +{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, systemd}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib spice_protocol glib + buildInputs = [ alsaLib spice-protocol glib libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 0d4aa4783c6b8f08cfe8c974c40fe48e6519c21a..c027541c01c10e5dafccb859b9452de571e75bf1 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.16.1"; + version = "0.17.0"; name = "tini-${version}"; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; rev = "v${version}"; - sha256 ="1abvjwjk7xhsbx60niy4ykcj3xvrxcl6zx8z1v827jsn47wzpikp"; + sha256 ="0y16xk89811a6g2srg63jv5b2221dirzrhha7mj056a6jq5ql2f0"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 13dbf544c9279f54b5727da100f5e06f52adb5dc..d0e2705588743dc6cb5bee7d134031d3b84e7a23 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,34 +1,35 @@ { stdenv, fetchurl, python2Packages, intltool, file -, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf +, wrapGAppsHook, gtkvnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt -, gsettings_desktop_schemas, glib, libosinfo, gnome3 -, spiceSupport ? true, spice_gtk ? null +, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 +, spiceSupport ? true, spice-gtk ? null }: with stdenv.lib; python2Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.4.2"; + version = "1.5.1"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23"; + sha256 = "1ardmd4sxdmd57y7qpka44gf09c1yq2g0xs074d3k1h925crv27f"; }; - nativeBuildInputs = [ wrapGAppsHook intltool file ]; + nativeBuildInputs = [ + wrapGAppsHook intltool file + gobjectIntrospection # for setup hook populating GI_TYPELIB_PATH + ]; buildInputs = - [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi - gsettings_desktop_schemas libosinfo - ] ++ optional spiceSupport spice_gtk; + [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi + gsettings-desktop-schemas libosinfo gtk3 + ] ++ optional spiceSupport spice-gtk; 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 + [ + pygobject3 ipaddr libvirt libxml2 requests ]; patchPhase = '' @@ -60,6 +61,8 @@ python2Packages.buildPythonApplication rec { manages Xen and LXC (linux containers). ''; license = licenses.gpl2; + # exclude Darwin since libvirt-glib currently doesn't build there + platforms = platforms.linux; 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 f386b457fc50886fc0270007f8646aa2422ae8ed..c8af6a1ccf5564be4241d266e7b61a62f5d4d19c 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,32 +1,30 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtmultimedia, qtsvg -, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol +, qtbase, qtmultimedia, qtsvg, qttools, krdc +, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol }: mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.45.75"; + version = "0.60.88"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n"; + sha256 = "0hd5d8zdghc5clv8pa4h9zigshdrarfpmzyvrq56rjkm13lrdz52"; }; cmakeFlags = [ "-DBUILD_QT_VERSION=5" + "-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5" ]; buildInputs = [ - # virt-manager-qt currently does not compile with qtermwidget-0.8.0 - qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1 - libvirt libvncserver pixman spice_gtk spice_protocol + qtbase qtmultimedia qtsvg krdc + libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkgconfig qttools ]; meta = with lib; { homepage = https://f1ash.github.io/qt-virt-manager; @@ -38,5 +36,6 @@ mkDerivation rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index f411ea5c83e63a5f1a58180f750023330590fc02..493307d0d07837685dde9d7c0774dde0f71de6a2 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, ocamlPackages }: +{ stdenv, fetchgit, ocamlPackages, autoreconfHook }: stdenv.mkDerivation rec { name = "virt-top-${version}"; - version = "1.0.8"; + version = "2017-11-18-unstable"; - src = fetchurl { - url = "https://people.redhat.com/~rjones/virt-top/files/virt-top-${version}.tar.gz"; - sha256 = "04i1sf2d3ghilmzvr2vh74qcy009iifyc2ymj9kxnbkp97lrz13w"; + src = fetchgit { + url = git://git.annexia.org/git/virt-top.git; + rev = "18a751d8c26548bb090ff05e30ccda3092e3373b"; + sha256 = "0c4whjvw7p3yvd476i4ppdhi8j821r5y6caqrj2v9dc181cnp01i"; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt ocaml_gettext curses csv xml-light ]; buildPhase = "make opt"; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 3b8d0a7cf63e58dc4f09b19701516277dfbad4d3..eb48e1d3d300658bb39238be4a086f48ec48566c 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,32 +1,36 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen -, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl +, 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 +, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null }: assert spiceSupport -> - spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null; + spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null; with stdenv.lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "5.0"; + version = "6.0"; name = "${baseName}-${version}"; src = fetchurl { url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b"; + sha256 = "1chqrf658niivzfh85cbwkbv9vyg8sv1mv3i31vawkfsfdvvsdwh"; }; nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - 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 ]; + glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info + libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib + libcap_ng numactl libapparmor + ] ++ optionals stdenv.isx86_64 [ + xen + ] ++ optionals spiceSupport [ + spice-gtk spice-protocol libcap gdbm + ]; postInstall = '' for f in "$out"/bin/*; do diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 0952fd1af08011c22f2a043567f9bd33f8788f27..29cb7c192b560e119bb5186fd51aec8a39ba1637 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2 , libXrandr, libXinerama -, which, alsaLib, curl, libvpx, gawk, nettools, dbus -, xorriso, makeself, perl, pkgconfig +, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 +, alsaLib, curl, libvpx, gawk, nettools, dbus +, xorriso, makeself, perl , javaBindings ? false, jdk ? null , pythonBindings ? false, python2 ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null @@ -19,10 +20,11 @@ let python = python2; buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! - extpack = "005ba9211862643e2516d549e98b80942918047f1f6c55fcfe08c490dd1947bc"; - extpackRev = "118431"; - main = "0m6y98pvkngprw5iaswvkbbfxmzvfl8yvgi984p1866zwap77z16"; - version = "5.2.0"; + # Do not forget to update the hash in ./guest-additions/default.nix! + extpack = "355ea5fe047f751534720c65398b44290d53f389e0f5f66818f3f36746631d26"; + extpackRev = "121009"; + main = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8"; + version = "5.2.8"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { @@ -51,10 +53,12 @@ in stdenv.mkDerivation { outputs = [ "out" "modsrc" ]; + nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ]; + buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu libpng patchelfUnstable python ] + libXmu libpng patchelfUnstable python ] ++ optional javaBindings jdk ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio @@ -88,8 +92,11 @@ in stdenv.mkDerivation { set +x ''; - patches = optional enableHardening ./hardened.patch - ++ [ ./qtx11extras.patch ]; + patches = + optional enableHardening ./hardened.patch + ++ [ ./qtx11extras.patch ]; + + postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ @@ -197,8 +204,9 @@ in stdenv.mkDerivation { meta = { description = "PC emulator"; - homepage = http://www.virtualbox.org/; - maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.linux; + license = licenses.gpl2; + homepage = https://www.virtualbox.org/; + maintainers = with maintainers; [ flokli sander ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 87b89a98e7801ec2fb0ec82f2fd4d1f89bf3eda1..96e8404b3ef9937ce575ef96ad8636b06d3578ad 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,12 +19,14 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1r6dybr3pfclffk7gppf7n8gwj3ziw7pmfvbwwkdw00q9ah7h5l4"; + sha256 = "04q8d2dxhkkqbghqidcwv6mx57fqpp92smh7gnaxb7vqqskb9dl0"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; + patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ]; + patches = [ ./fix_kerndir.patch ./fix_kernincl.patch @@ -34,7 +36,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - buildInputs = [ patchelf cdrkit makeWrapper dbus ]; + buildInputs = [ patchelf cdrkit makeWrapper dbus ] ++ kernel.moduleBuildDependencies; installPhase = '' mkdir -p $out diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch index e7feed853b1292eb4a4060cc080c6eda1bf21075..0be949f63c92d2e1f028f21fed3dc18b903ddee6 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch @@ -1,7 +1,7 @@ -diff --git a/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header +diff --git a/vboxsf/Makefile.include.header b/vboxsf/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header +--- a/vboxsf/Makefile.include.header ++++ b/vboxsf/Makefile.include.header @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) endif # neq($(KERNELRELEASE),) @@ -11,10 +11,10 @@ index 8df1eb4d25..5a3e5604e7 100644 $(error Error: unable to find the headers of the Linux kernel to build against. \ Specify KERN_VER= and run Make again) -diff --git a/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header +diff --git a/vboxguest/Makefile.include.header b/vboxguest/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header +--- a/vboxguest/Makefile.include.header ++++ b/vboxguest/Makefile.include.header @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) endif # neq($(KERNELRELEASE),) @@ -24,10 +24,10 @@ index 8df1eb4d25..5a3e5604e7 100644 $(error Error: unable to find the headers of the Linux kernel to build against. \ Specify KERN_VER= and run Make again) -diff --git a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +--- a/vboxvideo/Makefile.include.header ++++ b/vboxvideo/Makefile.include.header @@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),) endif # neq($(KERNELRELEASE),) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch index 251394e5d13e4f2a46bc1b36b478a465a860cd6d..e59e2e98c1b3b1f49563602833ef1599e9646dfd 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch @@ -1,7 +1,7 @@ -diff --git a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header index 8df1eb4d25..5a3e5604e7 100644 ---- a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header -+++ b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header +--- a/vboxvideo/Makefile.include.header ++++ b/vboxvideo/Makefile.include.header @@ -122,7 +122,6 @@ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes) Specify KERN_VER= and run Make again) endif diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix new file mode 100644 index 0000000000000000000000000000000000000000..c3280cbda94bfb4fe3767a1fcb1a7a4929b4668a --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -0,0 +1,176 @@ +{ 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, glib, python2 +, ... } @ 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; + }); + + xsa = import ./xsa-patches.nix { inherit fetchpatch; }; + + qemuDeps = [ + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir + alsaLib glib python2 + ]; +in + +callPackage (import ./generic.nix (rec { + version = "4.10.0"; + + src = fetchurl { + url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; + sha256 = "0i38ap5b5m1kix6xb0vn9ya1yab35adyc98bzfnbq4lb7w1afqh2"; + }; + + # 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}"; + # use revision hash - reproducible but must be updated with each new version + rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2"; + sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w"; + }; + buildInputs = qemuDeps; + postPatch = '' + # needed in build but /usr/bin/env is not available in sandbox + substituteInPlace scripts/tracetool.py \ + --replace "/usr/bin/env python" "${python2}/bin/python" + ''; + 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}"; + # use revision hash - reproducible but must be updated with each new version + rev = "c8ea0457495342c417c3dc033bba25148b279f60"; + sha256 = "0v5nl3c08kpjg57fb8l191h1y57ykp786kz6l525jgplif28vx13"; + }; + 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 = with xsa; flatten [ + XSA_252 + XSA_253 + XSA_255_1 + XSA_255_2 + XSA_256 + ]; + + # 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 + # Makefile didn't include previous PKG_CONFIG_PATH so glib wasn't found + substituteInPlace tools/Makefile \ + --replace 'PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config' 'PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config:$(PKG_CONFIG_PATH)' + ''; + + passthru = { + qemu-system-i386 = if withInternalQemu + then "lib/xen/bin/qemu-system-i386" + else throw "this xen has no qemu builtin"; + }; + +})) args diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 308913adf89c2156bc436abf840e3c31c4c0ed39..bb6209ce47fbc189ec740fb8742a91fb48ad08be 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -9,7 +9,7 @@ , withLibHVM ? true # qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir , alsaLib , ... } @ args: @@ -29,7 +29,7 @@ let }); qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib ]; @@ -39,6 +39,10 @@ in callPackage (import ./generic.nix (rec { version = "4.5.5"; + meta = { + knownVulnerabilities = [ "Security support ended in January 2018" ]; + }; + src = fetchurl { url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2"; @@ -230,6 +234,12 @@ callPackage (import ./generic.nix (rec { XSA_243_45 XSA_244_45 XSA_245 + XSA_246_45 + XSA_247_45 + XSA_248_45 + XSA_249 + XSA_250_45 + XSA_251_45 ]; # Fix build on Glibc 2.24. @@ -242,4 +252,10 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; + passthru = { + qemu-system-i386 = if withInternalQemu + then "lib/xen/bin/qemu-system-i386" + else throw "this xen has no qemu builtin"; + }; + })) ({ ocamlPackages = ocamlPackages_4_02; } // args) diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 259dd72a960cf9c644c07c474073ce20207b1a05..79be1be11908eaf93da1f9d1dc8be8dce5da1c08 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -8,7 +8,7 @@ , withLibHVM ? true # qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir , alsaLib , ... } @ args: @@ -29,18 +29,36 @@ let xsa = import ./xsa-patches.nix { inherit fetchpatch; }; + xenlockprofpatch = (fetchpatch { + name = "xenlockprof-gcc7.patch"; + url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=f49fa658b53580cf2ad354d2bf1796766cc11222"; + sha256 = "1lvzfvkqirknivm8q4cg5byfqz49s16zjk65fkwl3kwb03chky70"; + }); + + xenpmdpatch = (fetchpatch { + name = "xenpmd-gcc7.patch"; + url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=2d78f78a14528752266982473c07118f1bc336e3"; + sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq"; + }); + + qemuMemfdBuildFix = fetchpatch { + name = "xen-4.8-memfd-build-fix.patch"; + url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; + }; + qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib ]; in callPackage (import ./generic.nix (rec { - version = "4.8.2"; + version = "4.8.3"; src = fetchurl { url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; - sha256 = "1ydgwbn8ab0s16jrbi3wzaa6j0y3zk0j8pay458qcgayk3qc476b"; + sha256 = "0vhkpyy5x7kc36hnav95fn194ngsmc3m2xcc78vccs00gdf6m8q9"; }; # Sources needed to build tools and firmwares. @@ -49,15 +67,12 @@ callPackage (import ./generic.nix (rec { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; rev = "refs/tags/qemu-xen-${version}"; - sha256 = "1v19pp86kcgwvsbkrdrn4rlaj02i4054avw8k70w1m0rnwgcsdbs"; + sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4"; }; - buildInputs = qemuDeps; patches = [ - (xsaPatch { - name = "216-qemuu"; - sha256 = "06w2iw1r5gip2bpbg19cziws965h9in0f6np74cr31f76yy30yxn"; - }) + qemuMemfdBuildFix ]; + buildInputs = qemuDeps; meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { @@ -144,20 +159,15 @@ callPackage (import ./generic.nix (rec { ++ optional (withInternalOVMF) "--enable-ovmf"; patches = with xsa; flatten [ - XSA_231 - XSA_232 - XSA_233 - XSA_234_48 - XSA_236 - XSA_237_48 - XSA_238 - XSA_239 - XSA_240_48 - XSA_241 - XSA_242 - XSA_243_48 - XSA_244 - XSA_245 + # XSA_231 to XSA-251 are fixed in 4.8.3 (verified with git log) + XSA_252_49 + # 253: 4.8 not affected + # 254: no patch supplied by xen project (Meltdown/Spectre) + XSA_255_49_1 + XSA_255_49_2 + XSA_256_48 + xenlockprofpatch + xenpmdpatch ]; # Fix build on Glibc 2.24. @@ -170,4 +180,10 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; + passthru = { + qemu-system-i386 = if withInternalQemu + then "lib/xen/bin/qemu-system-i386" + else throw "this xen has no qemu builtin"; + }; + })) args diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 9efcc45be3595b8285a740b74549cb36299987e9..0cbf30bea7415095ed3f85a29b4b09d69f9c0c7c 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -154,12 +154,12 @@ stdenv.mkDerivation (rec { substituteInPlace tools/xenstat/Makefile \ --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h - ${optionalString (config.version >= "4.8") '' + ${optionalString (builtins.compareVersions config.version "4.8" >= 0) '' substituteInPlace tools/hotplug/Linux/launch-xenstore.in \ --replace /bin/mkdir mkdir ''} - ${optionalString (config.version < "4.6") '' + ${optionalString (builtins.compareVersions config.version "4.6" < 0) '' # 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 @@ -221,6 +221,7 @@ stdenv.mkDerivation (rec { done ''; + # TODO(@oxij): Stop referencing args here meta = { homepage = http://www.xen.org/; description = "Xen hypervisor and related components" @@ -231,5 +232,5 @@ stdenv.mkDerivation (rec { + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.''); platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ]; - }; + } // (config.meta or {}); } // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 8f5262acb024dc714a6a6387df3e06fa36662900..791a3b91818a99a911d8496783a2d35e69f76107 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -2,7 +2,7 @@ , stdenv, overrideCC, gcc49 }: -# TODO on new Xen version: generalize this to generate [vanilla slim +# TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim # light] for each ./.nix. rec { @@ -58,10 +58,6 @@ 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 = '' @@ -107,8 +103,54 @@ rec { }; }; - xen-vanilla = xen_4_5-vanilla; - xen-slim = xen_4_5-slim; - xen-light = xen_4_5-light; + xen_4_10-vanilla = callPackage ./4.10.nix { + 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_10-slim = xen_4_10-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_10-light = xen_4_10-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_8-vanilla; + xen-slim = xen_4_8-slim; + xen-light = xen_4_8-light; } diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix index fd85c85f22bbd6401fb6eed3d9a82ecae36a2747..727546b69fb02966ad0ea3569180b21b2d758d05 100644 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -771,4 +771,166 @@ in rec { sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8"; }) ]; + + # 4.5 - 4.7 + XSA_246_45 = [ + (xsaPatch { + name = "246-4.7"; + sha256 = "13rad4k8z3bq15d67dhgy96kdbrjiq9sy8px0jskbpx9ygjdahkn"; + }) + ]; + + # 4.8 - 4.9 + XSA_246 = [ + (xsaPatch { + name = "246-4.9"; + sha256 = "0z68vm0z5zvv9gm06pxs9kxq2q9fdbl0l0cm71ggzdplg1vw0snz"; + }) + ]; + + # 4.8 + XSA_247_48 = [ + (xsaPatch { + name = "247-4.8/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu"; + sha256 = "0kvjrk90n69s721c2qj2df5raml3pjk6bg80aig353p620w6s3xh"; + }) + (xsaPatch { + name = "247-4.8/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas"; + sha256 = "1s9kv6h6dd8psi5qf5l5gpk9qhq8blckwhl76cjbldcgi6imb3nr"; + }) + ]; + + # 4.5 + XSA_247_45 = [ + (xsaPatch { + name = "247-4.5/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu"; + sha256 = "0h1mp5s9si8aw2gipds317f27h9pi7bgnhj0bcmw11p0ch98sg1m"; + }) + (xsaPatch { + name = "247-4.5/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas"; + sha256 = "0vjjybxbcm4xl26wbqvcqfiyvvlayswm4f98i1fr5a9abmljn5sb"; + }) + ]; + + # 4.5 + XSA_248_45 = [ + (xsaPatch { + name = "248-4.5"; + sha256 = "0csxg6h492ddsa210b45av28iqf7cn2dfdqk4zx10zwf1pv2shyn"; + }) + ]; + + # 4.8 + XSA_248_48 = [ + (xsaPatch { + name = "248-4.8"; + sha256 = "1ycw29q22ymxg18kxpr5p7vhpmp8klssbp5gq77hspxzz2mb96q1"; + }) + ]; + + # 4.5 .. 4.9 + XSA_249 = [ + (xsaPatch { + name = "249"; + sha256 = "0v6ngzqhkz7yv4n83xlpxfbkr2qyg5b1cds7ikkinm86hiqy6agl"; + }) + ]; + # 4.5 + XSA_250_45 = [ + (xsaPatch { + name = "250-4.5"; + sha256 = "0pqldl6qnl834gvfp90z247q9xcjh3835s2iffnajz7jhjb2145d"; + }) + ]; + # 4.8 ... + XSA_250 = [ + (xsaPatch { + name = "250"; + sha256 = "1wpigg8kmha57sspqqln3ih9nbczsw6rx3v72mc62lh62qvwd7x8"; + }) + ]; + # 4.5 + XSA_251_45 = [ + (xsaPatch { + name = "251-4.5"; + sha256 = "0lc94cx271z09r0mhxaypyd9d4740051p28idf5calx5228dqjgm"; + }) + ]; + # 4.8 + XSA_251_48 = [ + (xsaPatch { + name = "251-4.8"; + sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq"; + }) + ]; + # 4.8 + XSA_252_49 = [ + (xsaPatch { + name = "252-4.9"; + sha256 = "03sbn90nlkk5ba1n168rxjkc7x3mqj7rfqvspbwblmwikfbnms2n"; + }) + ]; + # 4.8 + XSA_255_49_1= [ + (xsaPatch { + name = "255-4.9-1"; + sha256 = "0gbin7yxbkq40lvm3gvj1vffavvbng3zpd2m8l1kqyz0rv4vm9zc"; + }) + ]; + # 4.8 + XSA_255_49_2= [ + (xsaPatch { + name = "255-4.9-2"; + sha256 = "0fyg5nnyfpfr80qq83pr64zjp5w1nx94bdblzsjap8gaqcahyr12"; + }) + ]; + # 4.8 + XSA_256_48= [ + (xsaPatch { + name = "256-4.8"; + sha256 = "1w84f717kxwx0h3rw18r4f8pl0l1h5xlj5fy80sr0ws4xkp1qdn4"; + }) + ]; + + + # 4.10 + XSA_252 = [ + (xsaPatch { + name = "252"; + sha256 = "0v4sg20dnvnwrjh3x69gk81v2kmcql7g2s044vg3wcxhzvij1rrn"; + }) + ]; + + # 4.10 + XSA_253 = [ + (xsaPatch { + name = "253"; + sha256 = "0445vzlzy3gd499xraqh5r4qjar6qr0y3813h22jy1n84nhxz27i"; + }) + ]; + + # 4.10 + XSA_255_1 = [ + (xsaPatch { + name = "255-1"; + sha256 = "05g2f3ji1rrjlw3yw4nrns50pnmsib8ybrf64scr1817mj0q9myr"; + }) + ]; + + # 4.10 + XSA_255_2 = [ + (xsaPatch { + name = "255-2"; + sha256 = "08wbngw5z0f9g8di59hww3hhi7j9z49bpc4xlwn5akfcwbgf0961"; + }) + ]; + + # 4.10 + XSA_256 = [ + (xsaPatch { + name = "256"; + sha256 = "1hicwhbwj6k25px55f4ncx1c5xiihi8pfvsb3kv57k7kaicb7pza"; + }) + ]; + } diff --git a/pkgs/applications/window-managers/awesome/3.5.nix b/pkgs/applications/window-managers/awesome/3.5.nix index 3a2a030b8a4d8eccb161ba0ffe765f3dda93b679..f3d43d15efba7c2ed0f3d3e928deb8b62fbb442f 100644 --- a/pkgs/applications/window-managers/awesome/3.5.nix +++ b/pkgs/applications/window-managers/awesome/3.5.nix @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/awesome \ - --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 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" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index ec73150a50694f9998cd0183ddbd1e5d17fa2146..c23284d0b527a296b3bf9801df2ab36a437e0338 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,13 +4,13 @@ , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs -, libxkbcommon, xcbutilxrm, hicolor_icon_theme +, libxkbcommon, xcbutilxrm, hicolor-icon-theme }: with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; version = "4.2"; - + src = fetchFromGitHub { owner = "awesomewm"; repo = "awesome"; @@ -25,11 +25,11 @@ with luaPackages; stdenv.mkDerivation rec { imagemagick makeWrapper pkgconfig - xmlto docbook_xml_dtd_45 + xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs ]; - - propagatedUserEnvPkgs = [ hicolor_icon_theme ]; + + propagatedUserEnvPkgs = [ hicolor-icon-theme ]; buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection git lgi libpthreadstubs libstartup_notification libxdg_basedir lua nettools pango xcb-util-cursor @@ -41,7 +41,6 @@ with luaPackages; stdenv.mkDerivation rec { #cmakeFlags = "-DGENERATE_MANPAGES=ON"; cmakeFlags = "-DOVERRIDE_VERSION=${version}"; - LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; @@ -49,10 +48,9 @@ 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"' \ + --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ + --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" wrapProgram $out/bin/awesome-client \ diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 16c624b09ccf2e296fb28d9122af3b2a5ffd4065..c494ee266be31f9f04740d97fc6e5419e095f574 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "144g0vg0jsy0lja2jv1qbdps8k05nk70pc7vslj3im61a21vnbis"; + sha256 = "1srgsszp184zg123wdij0zp57c16m7lmal51rhflyx2c9fiiqm9l"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 17baffbe8c73e426d6fc2dff3d2ecbc89f9f69ec..d79d8c3325d70514bd91bfa01526b7ed7f4a9018 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45 , docbook_xsl, libxslt, libxml2, makeWrapper -, dbus, libconfig, libdrm, mesa_noglu, pcre, libX11, libXcomposite, libXdamage +, dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage , libXinerama, libXrandr, libXrender, libXext, xwininfo }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pcre libconfig dbus - mesa_noglu + libGL ]; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index 159468f79047e57691a0915ed937dd77153fc7a8..53bcd158aedd65a8455953491c73b6590ebe721a 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, - docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre, + docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre, pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, libXrandr, libXrender, xwininfo }: @@ -33,7 +33,7 @@ stdenv.mkDerivation { libdrm libxml2 libxslt - mesa + libGLU_combined pcre ]; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 9f6c89375182aed33914a72ea5b4e2a5fe4598b7..f18afb93527852df875853ab6a9eb91acab6794d 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://dl.suckless.org/dwm/${name}.tar.gz"; + url = "https://dl.suckless.org/dwm/${name}.tar.gz"; sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildPhase = " make "; meta = { - homepage = http://suckless.org/; + homepage = https://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/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 19aa89a7f7e75b7cc701f2ca3d60ddfe619de92a..46c87b0b189e2c94046d63429ed188f06414b121 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.14.1"; + version = "4.15"; src = fetchurl { - url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "1cazmfbbx6n8c81h6x6pdayq3mxs2ml3adz165z8vapkc72kl1nh"; + url = "https://i3wm.org/downloads/${name}.tar.bz2"; + sha256 = "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index b322c7da193aa2e0a305f350dc751f88ba9211c4..d6668cde2bdcc16a758556967d71a2c482b102f5 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideDerivation (super : rec { name = "i3-gaps-${version}"; - version = "4.14.1"; - releaseDate = "2017-09-24"; + version = "4.15.0.1"; + releaseDate = "2018-03-13"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "11fnkg4halplcnannfw3ishzwwbxbnjafmkxsim199jhlyjjd8j7"; + sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal"; }; nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index a589e21be98ba1abd42e63132af0f8cc4ae02080..edaa88bde23d859d0e1ed829fea1c900a9192cae 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchFromGitHub, which, pkgconfig, libxcb, xcbutilkeysyms -, xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb, + xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, + libxkbfile, libjpeg_turbo +}: stdenv.mkDerivation rec { - version = "2.9.1-c"; + version = "2.10.1-1-c"; name = "i3lock-color-${version}"; src = fetchFromGitHub { - owner = "chrjguill"; + owner = "PandorasFox"; repo = "i3lock-color"; - rev = version; - sha256 = "0qnw71qbppgp3ywj1k07av7wkl9syfb8j6izrkhj143q2ks4rkvl"; + rev = "01476c56333cccae80cdd3f125b0b9f3a0fe2cb3"; + sha256 = "06ca8496fkdkvh4ycg0b7kd3r1bjdqdwfimb51v4nj1lm87pdkdf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11 - libev cairo libxkbcommon libxkbfile ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11 + libev cairo libxkbcommon libxkbfile libjpeg_turbo ]; makeFlags = "all"; preInstall = '' @@ -31,6 +34,6 @@ stdenv.mkDerivation rec { # Needs the SSE2 instruction set. See upstream issue # https://github.com/chrjguill/i3lock-color/issues/44 - platforms = platforms.i686 ++ platforms.x86_64; + platforms = platforms.x86; }; } diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 6c53c51551ac0a8dd8b4b05aecf37e621b02ac69..e28a9cf75be89e7f183e1a828df8895c6285a513 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - rev = "546ce2e71bd2339f2134904c7d22062e86105b46"; - name = "i3lock-fancy-unstable-2016-10-13_rev${builtins.substring 0 7 rev}"; + rev = "3734fba160166006521e513f5734eb76ac6aa48f"; + name = "i3lock-fancy-unstable-2017-12-14_rev${builtins.substring 0 7 rev}"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; inherit rev; - sha256 = "1pbxydwdfd7jlw3b8cnlwlrkqlyh5jyanfhjybndqmacd3y8vplb"; + sha256 = "1bg4xds2hmbq8rp6azbdqvgp1aaq5y1bp05cfwqqm6y3sjw7ywzl"; }; patchPhase = '' sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock sed -i -e "s| awk | ${gawk}/bin/awk |" lock - sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock - sed -i -e 's|ICON="$SCRIPTPATH/icons/lockdark.png"|ICON="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock - sed -i -e 's|ICON="$SCRIPTPATH/icons/lock.png"|ICON="'$out'/share/i3lock-fancy/icons/lock.png"|' lock + sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" lock + sed -i -e 's|icon="$scriptpath/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock + sed -i -e 's|icon="$scriptpath/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' lock sed -i -e "s|getopt |${getopt}/bin/getopt |" lock sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock - sed -i -e "s|SHOT=(import -window root)|SHOT=(${scrot}/bin/scrot -z)|" lock + sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" lock ''; installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy/icons diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 20df6566b23fc8b904a182e90d0d5440284694fa..4d572e8c040d4b7e21f55b12fa2692c317867358 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "i3lock-${version}"; - version = "2.9.1"; + version = "2.10"; src = fetchurl { url = "https://i3wm.org/i3lock/${name}.tar.bz2"; - sha256 = "1467ha4ssbfjk1jh0ya2i5ljzm554ln18nyrppvsipg8shb1cshh"; + sha256 = "1vn8828ih7mpdl58znfnzpdwdgwksq16rghm5qlppbbz66zk5sr9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 68e77a54b5ada4e7d49f2d702881b6d2ca3c213e..1fed92764c10b65d60463661602f8a7608a345c5 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl, libpulseaudio, python3Packages, extraLibs ? [] }: +{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }: python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; - version = "3.35"; + # i3pystatus moved to rolling release: + # https://github.com/enkore/i3pystatus/issues/584 + version = "unstable-2018-04-11"; pname = "i3pystatus"; disabled = !python3Packages.isPy3k; - src = fetchurl { - url = "mirror://pypi/i/${pname}/${name}.tar.gz"; - sha256 = "0g5m05rbqvq1qrspm6fyzky9xfhaz5pvc4hfzgdxrzijn8nfc860"; + src = fetchFromGitHub + { + owner = "enkore"; + repo = "i3pystatus"; + rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc"; + sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ @@ -16,7 +20,8 @@ python3Packages.buildPythonApplication rec { libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ]; ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\""; - makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually + # LC_TIME != C results in locale.Error: unsupported locale setting + makeWrapperArgs = [ "--set LC_TIME C" ldWrapperSuffix ]; # libpulseaudio.so is loaded manually postInstall = '' makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 05965fc371740335515c7e3047253e5e2c229356..014434011af0c2a4402808615516373460b35096 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "i3status-rust-${version}"; - version = "0.9.0.2017-11-09"; + version = "0.9.0.2018-03-31"; src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "5daf2cdd611bed3db804d011d5d5af34b558e615"; - sha256 = "0j6h7x5mm3m7wq0if20qxc9z3qw29xgf5qb3sqwdbdpz8ykpqdgk"; + rev = "18f99299bcd5b63da4e315c8d78622c4bbf59c45"; + sha256 = "1pfcq3f724ri6jzchkgf96zd7lb5mc882r64ffx634gqf3n8ch41"; }; cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h"; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 19c9f8c9835125d9869733d3e6d43485a6446cdb..b54f6e8def338400d291ab5a9b161dd28d9a298a 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "i3status-2.11"; src = fetchurl { - url = "http://i3wm.org/i3status/${name}.tar.bz2"; + url = "https://i3wm.org/i3status/${name}.tar.bz2"; sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq"; }; diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix new file mode 100644 index 0000000000000000000000000000000000000000..39bd62cd5aa92bf09c912893541eccb2b4bd09c7 --- /dev/null +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +python2Packages.buildPythonApplication rec { + pname = "i3-wk-switch"; + version = "2017-08-21"; + + # https://github.com/tmfink/i3-wk-switch/commit/484f840bc4c28ddc60fa3be81e2098f7689e78fb + src = fetchFromGitHub { + owner = "tmfink"; + repo = pname; + rev = "484f840"; + sha256 = "0nrc13ld5bx07wrgnpzgpbaixb4rpi93xiapvyb8srd49fj9pcmb"; + }; + + propagatedBuildInputs = with python2Packages; [ i3-py ]; + + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p "$out/bin" + cp i3-wk-switch.py "$out/bin/i3-wk-switch" + ''; + + meta = with stdenv.lib; { + description = "XMonad-like workspace switching for i3"; + maintainers = with maintainers; [ synthetica ]; + platforms = platforms.linux; + license = licenses.mit; + homepage = https://travisf.net/i3-wk-switcher; + }; +} diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index ffd1d995e87bf0c6d32ca564529b679bdbf9a6c5..8406736541c04b65ab9c326b694241be80089a4d 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { export cmakeFlags="-DPREFIX=$out -DCFGDIR=/etc/icewm" ''; + patches = [ ./fix-strlcat_strlcpy.patch ] ++ + stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl.patch; + + patchFlags = [ "-p0" ]; + meta = { description = "A simple, lightweight X window manager"; longDescription = '' @@ -34,6 +39,6 @@ stdenv.mkDerivation rec { homepage = http://www.icewm.org/; license = licenses.lgpl2; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch b/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch new file mode 100644 index 0000000000000000000000000000000000000000..9721e125b051175bab505fbbf6efbba5349ef6bb --- /dev/null +++ b/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch @@ -0,0 +1,236 @@ +--- src/apppstatus.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/apppstatus.cc 2017-08-09 09:12:54.332052762 +0200 +@@ -366,7 +366,7 @@ + sscanf(p, "%s %s %s %s %s", val[0], val[1], val[2], val[3], val[4]); + for (i = 0; i < 4; i++) { + if (strncmp(val[i+1], "?", 1) != 0) +- strlcpy(phoneNumber, val[i+1], sizeof phoneNumber); ++ my_strlcpy(phoneNumber, val[i+1], sizeof phoneNumber); + } + } + +--- src/base.h 2017-07-30 10:59:06.000000000 +0200 ++++ src/base.h 2017-08-09 09:11:13.082025484 +0200 +@@ -44,9 +44,9 @@ + /*** String Functions *********************************************************/ + + /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ +-size_t strlcpy(char *dest, const char *from, size_t dest_size); ++size_t my_strlcpy(char *dest, const char *from, size_t dest_size); + /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ +-size_t strlcat(char *dest, const char *from, size_t dest_size); ++size_t my_strlcat(char *dest, const char *from, size_t dest_size); + + char *newstr(char const *str); + char *newstr(char const *str, int len); +--- src/gnome2.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/gnome2.cc 2017-08-09 09:11:21.819027846 +0200 +@@ -158,8 +158,8 @@ + const int plen = strlen(fPath); + + char tmp[256]; +- strlcpy(tmp, fPath, sizeof tmp); +- strlcat(tmp, "/.directory", sizeof tmp); ++ my_strlcpy(tmp, fPath, sizeof tmp); ++ my_strlcat(tmp, "/.directory", sizeof tmp); + + if (isDir && !stat(tmp, &sb)) { // looks like kde/gnome1 style + +@@ -279,8 +279,8 @@ + + while ((file = readdir(dir)) != NULL) { + char fullpath[256]; +- strlcpy(fullpath, dirname, sizeof fullpath); +- strlcat(fullpath, file->d_name, sizeof fullpath); ++ my_strlcpy(fullpath, dirname, sizeof fullpath); ++ my_strlcat(fullpath, file->d_name, sizeof fullpath); + GnomeDesktopItem *ditem = + gnome_desktop_item_new_from_file(fullpath, + (GnomeDesktopItemLoadFlags)0, +--- src/icehelp.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/icehelp.cc 2017-08-09 09:11:31.490030459 +0200 +@@ -1790,8 +1790,8 @@ + const size_t size = 9 + strlen(cfmt) + strlen(cstr) + strlen(crea); + char *cbuf = (char *)malloc(size); + snprintf(cbuf, size, cfmt, cstr); +- strlcat(cbuf, ":\n ", size); +- strlcat(cbuf, crea, size); ++ my_strlcat(cbuf, ":\n ", size); ++ my_strlcat(cbuf, crea, size); + + node *root = new node(node::div); + flist nodes(root); +--- src/icesm.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/icesm.cc 2017-08-09 09:13:12.946057758 +0200 +@@ -28,10 +28,10 @@ + wordexp_t w; + if (wordexp(trim(buf), &w, 0) != 0 || w.we_wordc == 0) + return false; +- size_t len = strlcpy(buf, trim(w.we_wordv[0]), bufsiz); ++ size_t len = my_strlcpy(buf, trim(w.we_wordv[0]), bufsiz); + for (size_t k = 1; k < w.we_wordc && len < bufsiz; ++k) { +- strlcat(buf, " ", bufsiz); +- len = strlcat(buf, trim(w.we_wordv[k]), bufsiz); ++ my_strlcat(buf, " ", bufsiz); ++ len = my_strlcat(buf, trim(w.we_wordv[k]), bufsiz); + } + wordfree(&w); + if (len >= bufsiz) +@@ -39,7 +39,7 @@ + #else + char *str = trim(buf); + if (str > buf) +- strlcpy(buf, str, bufsiz); ++ my_strlcpy(buf, str, bufsiz); + #endif + if (buf[0] == '#' || buf[0] == '=') + buf[0] = 0; +--- src/icesound.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/icesound.cc 2017-08-09 09:11:26.686029161 +0200 +@@ -145,8 +145,8 @@ + char * findSample(int sid) { + char basefname[1024]; + +- strlcpy(basefname, gui_events[sid].name, sizeof basefname); +- strlcat(basefname, ".wav", sizeof basefname); ++ my_strlcpy(basefname, gui_events[sid].name, sizeof basefname); ++ my_strlcat(basefname, ".wav", sizeof basefname); + + return findSample(basefname); + } +--- src/misc.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/misc.cc 2017-08-09 09:13:39.372064834 +0200 +@@ -448,7 +448,7 @@ + #endif + + /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ +-size_t strlcpy(char *dest, const char *from, size_t dest_size) ++size_t my_strlcpy(char *dest, const char *from, size_t dest_size) + { + const char *in = from; + if (dest_size > 0) { +@@ -463,12 +463,12 @@ + } + + /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ +-size_t strlcat(char *dest, const char *from, size_t dest_size) ++size_t my_strlcat(char *dest, const char *from, size_t dest_size) + { + char *to = dest; + char *const stop = to + dest_size - 1; + while (to < stop && *to) ++to; +- return to - dest + strlcpy(to, from, dest_size - (to - dest)); ++ return to - dest + my_strlcpy(to, from, dest_size - (to - dest)); + } + + char *newstr(char const *str) { +--- src/strtest.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/strtest.cc 2017-08-09 09:13:24.395060823 +0200 +@@ -286,63 +286,63 @@ + strtest tester("strlc"); + char d[10] = "@"; + size_t n; +- n = strlcpy(d, "", 0); ++ n = my_strlcpy(d, "", 0); + sequal(d, "@"); + assert(d, n == 0); + +- n = strlcpy(d, "a", 0); ++ n = my_strlcpy(d, "a", 0); + sequal(d, "@"); + assert(d, n == 1); + +- n = strlcpy(d, "", 1); ++ n = my_strlcpy(d, "", 1); + sequal(d, ""); + assert(d, n == 0); + +- n = strlcpy(d, "a", 1); ++ n = my_strlcpy(d, "a", 1); + sequal(d, ""); + assert(d, n == 1); + +- n = strlcpy(d, "a", 2); ++ n = my_strlcpy(d, "a", 2); + sequal(d, "a"); + assert(d, n == 1); + +- n = strlcpy(d, "ab", 2); ++ n = my_strlcpy(d, "ab", 2); + sequal(d, "a"); + assert(d, n == 2); + +- n = strlcpy(d, "ab", 3); ++ n = my_strlcpy(d, "ab", 3); + sequal(d, "ab"); + assert(d, n == 2); + +- n = strlcpy(d, "abc", sizeof d); ++ n = my_strlcpy(d, "abc", sizeof d); + sequal(d, "abc"); + assert(d, n == 3); + +- n = strlcat(d, "def", 4); ++ n = my_strlcat(d, "def", 4); + sequal(d, "abc"); + assert(d, n == 6); + +- n = strlcat(d, "def", sizeof d); ++ n = my_strlcat(d, "def", sizeof d); + sequal(d, "abcdef"); + assert(d, n == 6); + +- n = strlcat(d, "ghijkl", sizeof d); ++ n = my_strlcat(d, "ghijkl", sizeof d); + sequal(d, "abcdefghi"); + assert(d, n == 12); + +- n = strlcpy(d, "123", sizeof d); ++ n = my_strlcpy(d, "123", sizeof d); + sequal(d, "123"); + assert(d, n == 3); + +- n = strlcpy(d, d + 1, sizeof d); ++ n = my_strlcpy(d, d + 1, sizeof d); + sequal(d, "23"); + assert(d, n == 2); + +- n = strlcpy(d, d + 1, sizeof d); ++ n = my_strlcpy(d, d + 1, sizeof d); + sequal(d, "3"); + assert(d, n == 1); + +- n = strlcpy(d, d + 1, sizeof d); ++ n = my_strlcpy(d, d + 1, sizeof d); + sequal(d, ""); + assert(d, n == 0); + } +@@ -418,7 +418,7 @@ + while (a.next()) { + const char *e = a.entry(); + assert(e, strcoll(buf, e) < 0); +- strlcpy(buf, e, sizeof buf); ++ my_strlcpy(buf, e, sizeof buf); + } + assert(buf, strcoll(buf, "~~~~~~~~~") < 0); + } +@@ -437,7 +437,7 @@ + cstring c(s.entry()); + const char *e = c.c_str(); + assert(e, strcoll(buf, e) < 0); +- strlcpy(buf, e, sizeof buf); ++ my_strlcpy(buf, e, sizeof buf); + } + assert(buf, strcoll(buf, "~~~~~~~~~") < 0); + } +--- src/udir.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/udir.cc 2017-08-09 09:13:28.346061883 +0200 +@@ -66,7 +66,7 @@ + if (impl) { + DirPtr dirp(impl); + if (dirp.next()) { +- strlcpy(fEntry, dirp.name(), sizeof fEntry); ++ my_strlcpy(fEntry, dirp.name(), sizeof fEntry); + return true; + } + } diff --git a/pkgs/applications/window-managers/icewm/musl.patch b/pkgs/applications/window-managers/icewm/musl.patch new file mode 100644 index 0000000000000000000000000000000000000000..e7d18e3128742a3693a26665a22258b8071e786a --- /dev/null +++ b/pkgs/applications/window-managers/icewm/musl.patch @@ -0,0 +1,23 @@ +--- src/ylocale.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/ylocale.cc 2017-08-09 08:15:50.938841549 +0200 +@@ -55,6 +55,8 @@ + int const codesetItems[] = { + #ifdef CONFIG_NL_CODESETS + CONFIG_NL_CODESETS ++#elif !defined(__GLIBC__) ++ CODESET, 0 + #else + CODESET, _NL_CTYPE_CODESET_NAME, 0 + #endif +--- src/globit.c 2017-07-30 10:59:06.000000000 +0200 ++++ src/globit.c 2017-08-09 08:17:18.691824584 +0200 +@@ -143,7 +143,9 @@ + } else if (*pattern == '~') { + /* yes, tilde */ + is_absolute = 2; ++#if defined(__GLIBC__) + glob_flags |= GLOB_TILDE; ++#endif + /* any slash in the pattern? */ + while (*cp && *cp != '/') + ++cp; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index fbea1d4e9a41a5f77ff91742129c43b7102f2c6a..05f89728f6a7d518493311e19f7929a8ebd41395 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 = "1651"; + version = "1653"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "097wqipg1h7h19a5bqdx7iq60fkjrx2niwsgg1f8cfz106yhbp6q"; + sha256 = "09ci3g97xmif66pp9n4sdvdmlxpw67pwp8lbjynxhdvha5pwwpv5"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 1c6b8a84c952346eea06808ec730c0129f532bfa..7aa604690f9a72e3b298914b7d09733dad807bac 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, dbus_glib, autoreconfHook, xorg }: +{ stdenv, fetchgit, pkgconfig, dbus-glib, autoreconfHook, xorg }: stdenv.mkDerivation rec { name = "kbdd"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ xorg.libX11 dbus_glib ]; + buildInputs = [ xorg.libX11 dbus-glib ]; meta = { description = "Simple daemon and library to make per window layout using XKB"; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 27cb564d2c6b6025cfffbbffcc2b84b025514453..ed34e75f35dbb36499345d4d4e4b8c41ba31dd33 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libxcb }: stdenv.mkDerivation rec { - name = "lemonbar-1.2"; + name = "lemonbar-1.3"; src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v1.2.tar.gz"; - sha256 = "1smz8lh930bnb6a4lrm07l3z2k071kc8p2pljk5wsrch3x2xhimq"; + url = "https://github.com/LemonBoy/bar/archive/v1.3.tar.gz"; + sha256 = "0zd3v8ys4jzi60pm3wq7p3pbbd5y0acimgiq46qx1ckmwg2q9rza"; }; buildInputs = [ libxcb perl ]; diff --git a/pkgs/applications/window-managers/orbment/bemenu.nix b/pkgs/applications/window-managers/orbment/bemenu.nix new file mode 100644 index 0000000000000000000000000000000000000000..065b81948c2d02872b148058355d5f83ac3cf194 --- /dev/null +++ b/pkgs/applications/window-managers/orbment/bemenu.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, pango, wayland, libxkbcommon }: + +stdenv.mkDerivation rec { + name = "bemenu-2017-02-14"; + + src = fetchFromGitHub { + owner = "Cloudef"; + repo = "bemenu"; + rev = "d6261274cf0b3aa51ce8ea7418a79495b20ad558"; + sha256 = "08bc623y5yjbz7q83lhl6rb0xs6ji17z79c260bx0fgin8sfj5x8"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ pango wayland libxkbcommon ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A dynamic menu library and client program inspired by dmenu"; + homepage = src.meta.homepage; + license = with licenses; [ gpl3 lgpl3 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix index 8071bc4bb4264725c1855dbabd2eb455aedbf8d0..46130680af42d94e6afd598395fcada39b579cfa 100644 --- a/pkgs/applications/window-managers/orbment/default.nix +++ b/pkgs/applications/window-managers/orbment/default.nix @@ -1,9 +1,12 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig +{ lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage , wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng , libdrm, libX11 +, westonLite }: -stdenv.mkDerivation rec { +let + bemenu = callPackage ./bemenu.nix {}; +in stdenv.mkDerivation rec { name = "orbment-${version}"; version = "git-2016-08-13"; @@ -14,13 +17,20 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11 libdrm ]; + postFixup = '' + wrapProgram $out/bin/orbment \ + --prefix PATH : "${stdenv.lib.makeBinPath [ bemenu westonLite ]}" + ''; + + enableParallelBuilding = true; + meta = { description = "Modular Wayland compositor"; homepage = src.url; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index d2bf1e5a96de207745b99bd878fd586b33ea3683..13eef1c045a499d46673def5cf7ff5213ade59a1 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A really minimalistic X window manager"; - homepage = http://www.oroborus.org/; + homepage = https://www.oroborus.org/; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch index e3c88a5fa55151a8a85d85c6c6f0491352bce665..71d3d9cafaa3fa4294eba54e4f34f29852d7a3bb 100644 --- a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch +++ b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch @@ -1,15 +1,5 @@ -From 00c5af939567429d40877845dc52b54fde2d8a50 Mon Sep 17 00:00:00 2001 -From: "Alexander V. Nikolaev" -Date: Thu, 26 Nov 2015 10:53:12 +0200 -Subject: [PATCH 1/3] Substitution vars for absolute paths - ---- - libqtile/pangocffi.py | 6 +++--- - libqtile/xcursors.py | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - diff --git a/libqtile/pangocffi.py b/libqtile/pangocffi.py -index 27691d1..25f690d 100644 +index 1e8f5c04..e860d43a 100644 --- a/libqtile/pangocffi.py +++ b/libqtile/pangocffi.py @@ -58,9 +58,9 @@ except ImportError: @@ -26,18 +16,15 @@ index 27691d1..25f690d 100644 def CairoContext(cairo_t): diff --git a/libqtile/xcursors.py b/libqtile/xcursors.py -index e0e55e1..59b6428 100644 +index f1133555..3e61204a 100644 --- a/libqtile/xcursors.py +++ b/libqtile/xcursors.py -@@ -114,7 +114,7 @@ class Cursors(dict): +@@ -112,7 +112,7 @@ class Cursors(dict): def _setup_xcursor_binding(self): try: - xcursor = ffi.dlopen('libxcb-cursor.so') + xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so') except OSError: - self.log.warning("xcb-cursor not found, fallback to font pointer") + logger.warning("xcb-cursor not found, fallback to font pointer") return False --- -2.6.3 - diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch index b620bfb25014404c562d4ca58445ba6a33066e12..7d184838fbaabde55eb850d0e5a8d14395c2bf82 100644 --- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch +++ b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch @@ -1,57 +1,52 @@ -From f299a0aa0eefcf16bb4990f00ac3946727f43ef3 Mon Sep 17 00:00:00 2001 -From: "Alexander V. Nikolaev" -Date: Fri, 27 Nov 2015 10:49:48 +0200 -Subject: [PATCH 2/3] Restore PATH and PYTHONPATH - ---- - bin/qtile | 1 + - bin/qtile-run | 1 + - bin/qtile-session | 2 ++ - libqtile/utils.py | 7 +++++++ - 4 files changed, 11 insertions(+) - +diff --git a/bin/qshell b/bin/qshell +index 2ba7e61c..0ac2a2ef 100755 +--- a/bin/qshell ++++ b/bin/qshell +@@ -28,5 +28,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) + sys.path.insert(0, base_dir) + + if __name__ == '__main__': ++ __import__("importlib").import_module("libqtile.utils").restore_os_environment() + from libqtile.scripts import qshell + qshell.main() diff --git a/bin/qtile b/bin/qtile -index 66034fe..ce3fcd1 100755 +index 3e82814d..335b5cea 100755 --- a/bin/qtile +++ b/bin/qtile -@@ -131,6 +131,7 @@ def make_qtile(): - +@@ -29,5 +29,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) + sys.path.insert(0, base_dir) - if __name__ == "__main__": + if __name__ == '__main__': + __import__("importlib").import_module("libqtile.utils").restore_os_environment() - rename_process() - q = make_qtile() - try: + from libqtile.scripts import qtile + qtile.main() diff --git a/bin/qtile-run b/bin/qtile-run -index ccedb96..646a476 100755 +index e4b121be..1c203bc9 100755 --- a/bin/qtile-run +++ b/bin/qtile-run -@@ -50,6 +50,7 @@ def main(): - proc.wait() +@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) + sys.path.insert(0, base_dir) - if __name__ == "__main__": + if __name__ == '__main__': + __import__("importlib").import_module("libqtile.utils").restore_os_environment() - try: - main() - except KeyboardInterrupt: -diff --git a/bin/qtile-session b/bin/qtile-session -index 84f6a2d..da31b12 100755 ---- a/bin/qtile-session -+++ b/bin/qtile-session -@@ -25,6 +25,8 @@ - Qtile session manager. - """ + from libqtile.scripts import qtile_run + qtile_run.main() +diff --git a/bin/qtile-top b/bin/qtile-top +index 5316e0e7..272c6430 100755 +--- a/bin/qtile-top ++++ b/bin/qtile-top +@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) + sys.path.insert(0, base_dir) -+__import__("importlib").import_module("libqtile.utils").restore_os_environment() -+ - from libqtile.log_utils import init_log - import logging - import os + if __name__ == '__main__': ++ __import__("importlib").import_module("libqtile.utils").restore_os_environment() + from libqtile.scripts import qtile_top + qtile_top.main() diff --git a/libqtile/utils.py b/libqtile/utils.py -index 284089b..ec3539e 100644 +index 36ed0a58..bca9eab3 100644 --- a/libqtile/utils.py +++ b/libqtile/utils.py -@@ -227,3 +227,11 @@ def describe_attributes(obj, attrs, func=None): +@@ -240,3 +240,11 @@ def describe_attributes(obj, attrs, func=None): pairs.append('%s=%s' % (attr, value)) return ', '.join(pairs) diff --git a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch index d9377897fc69f26606a080a51a402bbfd471960a..c9ae57c8615ce94bfca0c234fe6a748079ad6dc8 100644 --- a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch +++ b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch @@ -1,17 +1,8 @@ -From b560c11078fecc35df2c62f34beda06c4e80a10d Mon Sep 17 00:00:00 2001 -From: "Alexander V. Nikolaev" -Date: Fri, 27 Nov 2015 10:54:35 +0200 -Subject: [PATCH 3/3] Restart executable - ---- - libqtile/manager.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/libqtile/manager.py b/libqtile/manager.py -index b1a38e2..110f7d8 100644 +index 36518a74..9b6bdd02 100644 --- a/libqtile/manager.py +++ b/libqtile/manager.py -@@ -1339,7 +1339,7 @@ class Qtile(command.CommandObject): +@@ -1386,7 +1386,7 @@ class Qtile(command.CommandObject): argv = [s for s in argv if not s.startswith('--with-state')] argv.append('--with-state=' + buf.getvalue().decode()) @@ -19,7 +10,4 @@ index b1a38e2..110f7d8 100644 + self.cmd_execute(os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:]) def cmd_spawn(self, cmd): - """ --- -2.6.3 - + """Run cmd in a shell. diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 8f4d4858ca11bb9414ff1a65f4d694e331de6126..f889bf29f71a04dbc11541a0feb70f082d5a2bec 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, python27Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }: let cairocffi-xcffib = python27Packages.cairocffi.override { - pythonPath = [ python27Packages.xcffib ]; + withXcffib = true; }; in python27Packages.buildPythonApplication rec { name = "qtile-${version}"; - version = "0.10.4"; + version = "0.10.7"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "0rwklzgkp3x242xql6qmfpfnhr788hd3jc1l80pc5ybxlwyfx59i"; + sha256 = "18szgplyym0b65vnaa8nqzadq6q0mhsiky9g5hqhn7xzf4kykmj8"; }; patches = [ @@ -36,11 +36,13 @@ python27Packages.buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/qtile \ - --set QTILE_WRAPPER '$0' \ - --set QTILE_SAVED_PYTHONPATH '$PYTHONPATH' \ - --set QTILE_SAVED_PATH '$PATH' + --run 'export QTILE_WRAPPER=$0' \ + --run 'export QTILE_SAVED_PYTHONPATH=$PYTHONPATH' \ + --run 'export QTILE_SAVED_PATH=$PATH' ''; + doCheck = false; # Requires X server. + meta = with stdenv.lib; { homepage = http://www.qtile.org/; license = licenses.mit; @@ -49,4 +51,3 @@ python27Packages.buildPythonApplication rec { maintainers = with maintainers; [ kamilchm ]; }; } - diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index d18ffb50795622fee8fcbbf31a5d57ee43c1749b..c219c81c2a50b524df164c7ef24b649d0afd8f1a 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sawfish-${version}"; - version = "1.12.0"; + version = "1.12.90"; sourceName = "sawfish_${version}"; src = fetchurl { url = "http://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; - sha256 = "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4"; + sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 215b8c38ece4916fb033cd6e6c7836e86f7095e1..117d4fe1d6a8f7cc930a94e107202986dd8f5276 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit sbcl lispPackages; + inherit sbcl lispPackages contrib; }; meta = with stdenv.lib; { @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 1e1072e49604e6f71b7e5372202ca90470ca6d3d..89e7b9dd08800398243b4b5ea9bdc47d3dc008be 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "sway-${version}"; - version = "0.15.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh"; + sha256 = "1p9j5gv85lsgj4z28qja07dqyvqk41w6mlaflvvm9yxafx477g5n"; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = "-DVERSION=${version}"; + cmakeFlags = "-DVERSION=${version} -DLD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib"; meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland"; diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index cca9f1c6ac583677a6be5c66e138c3f61b99a517..86c91347f253a06ec41031c40bef209f0a7fb6be 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "sxhkd-${version}"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "baskerville"; repo = "sxhkd"; rev = version; - sha256 = "0vnm0d2ckijsp8kc2v8jz4raamb487vg62v58v01a3rb9gzzgl06"; + sha256 = "0cw547x7vky55k3ksrmzmrra4zhslqcwq9xw0y4cmbvy4s1qf64v"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 279ba68eae8b9b8379e7b1b39b826fcef125d6d0..5e1098e97064e150394aaa7962fc436cb1b95d59 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "tabbed-20160425"; src = fetchgit { - url = http://git.suckless.org/tabbed; + url = https://git.suckless.org/tabbed; rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164"; sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://tools.suckless.org/tabbed; + homepage = https://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; maintainers = with maintainers; [ viric vrthra ]; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 020a7bbb3577a9750eeef35df714ae77af0f0db8..5aec0973a7c6375f9ec10a6dc8e57d7cf68d6767 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }: stdenv.mkDerivation rec { - name = "trayer-1.1.7"; + name = "trayer-1.1.8"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gdk_pixbuf gtk2 ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "sargon"; repo = "trayer-srg"; rev = name; - sha256 = "06lpgralggh5546qgvpilzxh4anshli2za41x68x2zbaizyqb09a"; + sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg"; }; preConfigure = '' diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix index 789f074aecdfd7065d7a79259690110b688e2a90..0b430693eeed9237c14676af0c7f9095e5bcfa8b 100644 --- a/pkgs/applications/window-managers/velox/default.nix +++ b/pkgs/applications/window-managers/velox/default.nix @@ -1,25 +1,53 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig -, swc, libxkbcommon -, wld, wayland, pixman, fontconfig +{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, newScope +, libxkbcommon +, wayland, pixman, fontconfig +, stConf ? null, stPatches ? [] }: -stdenv.mkDerivation rec { +let + callPackage = newScope self; + self = { + swc = callPackage ./swc.nix {}; + wld = callPackage ./wld.nix {}; + dmenu-velox = callPackage ./dmenu.nix {}; + st-velox = callPackage ./st.nix { + conf = stConf; + patches = stPatches; + }; + }; +in with self; stdenv.mkDerivation rec { name = "velox-${version}"; - version = "git-2015-11-03"; - repo = "https://github.com/michaelforney/velox"; - rev = "53b41348df7e37886cab012609923255e4397419"; + version = "git-2017-07-04"; - src = fetchurl { - url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "e49583efbbe62ea30f0084491ff757dff683f35eef6e9b68aa413e0b50c4bf20"; + src = fetchFromGitHub { + owner = "michaelforney"; + repo = "velox"; + rev = "0b1d3d62861653d92d0a1056855a84fcef661bc0"; + sha256 = "0p5ra5p5w21wl696rmv0vdnl7jnri5iwnxfs6nl6miwydhq2dmci"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ swc libxkbcommon wld wayland pixman fontconfig ]; + propagatedUserEnvPkgs = [ swc ]; + makeFlags = "PREFIX=$(out)"; - installPhase = "PREFIX=$out make install"; + preBuild = '' + substituteInPlace config.c \ + --replace /etc/velox.conf $out/etc/velox.conf + ''; + installPhase = '' + PREFIX=$out make install + mkdir -p $out/etc + cp velox.conf.sample $out/etc/velox.conf + ''; + postFixup = '' + wrapProgram $out/bin/velox \ + --prefix PATH : "${stdenv.lib.makeBinPath [ dmenu-velox st-velox ]}" + ''; + + enableParallelBuilding = true; meta = { description = "velox window manager"; diff --git a/pkgs/applications/window-managers/velox/dmenu.nix b/pkgs/applications/window-managers/velox/dmenu.nix new file mode 100644 index 0000000000000000000000000000000000000000..01360e5af0b35b7e5133e65e1d52475dc614b44d --- /dev/null +++ b/pkgs/applications/window-managers/velox/dmenu.nix @@ -0,0 +1,37 @@ +{stdenv, fetchFromGitHub #, libX11, libXinerama, enableXft, libXft, zlib +, swc, wld, wayland, libxkbcommon, pixman, fontconfig +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "dmenu-velox-${version}"; + version = "git-2017-04-07"; + + src = fetchFromGitHub { + owner = "michaelforney"; + repo = "dmenu"; + rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70"; + sha256 = "14j8jv0nlybinhzkgd6dplvng9zy8p292prlx39w0k4fm6x5nv6y"; + }; + + buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ]; + + postPatch = '' + sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run + ''; + + preConfigure = [ + ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk'' + ]; + + enableParallelBuilding = true; + + meta = { + description = "A generic, highly customizable, and efficient menu for the X Window System"; + homepage = https://tools.suckless.org/dmenu; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ ]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/applications/window-managers/velox/st.nix b/pkgs/applications/window-managers/velox/st.nix new file mode 100644 index 0000000000000000000000000000000000000000..2d73df65046328c520b251f967840de3d1bda9a6 --- /dev/null +++ b/pkgs/applications/window-managers/velox/st.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, pkgconfig, writeText +, ncurses, wayland, wayland-protocols, wld, libxkbcommon, fontconfig, pixman +, conf, patches }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "st-velox-${version}"; + version = "git-2016-12-22"; + + src = fetchFromGitHub { + owner = "michaelforney"; + repo = "st"; + rev = "b27f17da65f74b0a923952601873524e03b4d047"; + sha256 = "17aa4bz5g14jvqghk2c8mw77hb8786s07pv814rmlk7nnsavmp3i"; + }; + + inherit patches; + + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses wayland wayland-protocols wld libxkbcommon fontconfig pixman ]; + + NIX_LDFLAGS = "-lfontconfig"; + + installPhase = '' + TERMINFO=$out/share/terminfo make install PREFIX=$out + ''; + + enableParallelBuilding = true; + + meta = { + homepage = https://st.suckless.org/; + license = licenses.mit; + maintainers = with maintainers; [ ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/window-managers/velox/swc.nix b/pkgs/applications/window-managers/velox/swc.nix new file mode 100644 index 0000000000000000000000000000000000000000..a2f98b8b65e719afb7a67f58982d5c4e6138bba9 --- /dev/null +++ b/pkgs/applications/window-managers/velox/swc.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig +, wld, wayland, wayland-protocols, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm +}: + +stdenv.mkDerivation rec { + name = "swc-${version}"; + version = "git-2017-06-28"; + + src = fetchFromGitHub { + owner = "michaelforney"; + repo = "swc"; + rev = "5b20050872f8ad29cfc97729f8af47b6b3df5393"; + sha256 = "1lxpm17v5d8png6ixc0zn0w00xgrhz2n5b8by9vx6800b18246z8"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ wld wayland wayland-protocols fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ]; + + prePatch = '' + substituteInPlace launch/local.mk --replace 4755 755 + ''; + + makeFlags = "PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + enableParallelBuilding = true; + + meta = { + description = "A library for making a simple Wayland compositor"; + homepage = src.meta.homepage; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/applications/window-managers/velox/wld.nix b/pkgs/applications/window-managers/velox/wld.nix new file mode 100644 index 0000000000000000000000000000000000000000..d85f8212ec478ee313b06f710497ebd53b737b78 --- /dev/null +++ b/pkgs/applications/window-managers/velox/wld.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig +, wayland, fontconfig, pixman, freetype, libdrm +}: + +stdenv.mkDerivation rec { + name = "wld-${version}"; + version = "git-2017-10-31"; + + src = fetchFromGitHub { + owner = "michaelforney"; + repo = "wld"; + rev = "b4e902bbecb678c45485b52c3aa183cbc932c595"; + sha256 = "0j2n776flnzyw3vhxl0r8h1c48wrihi4g6bs2z8j4hbw5pnwq1k6"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ wayland fontconfig pixman freetype libdrm ]; + + makeFlags = "PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + enableParallelBuilding = true; + + meta = { + description = "A primitive drawing library targeted at Wayland"; + homepage = src.meta.homepage; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/applications/window-managers/way-cooler/bar.diff b/pkgs/applications/window-managers/way-cooler/bar.diff new file mode 100644 index 0000000000000000000000000000000000000000..e60ebabe98337afdaee0d53b27b64d0bed4eecda --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/bar.diff @@ -0,0 +1,37 @@ +--- bar.py.txt.orig 2017-12-05 18:10:20.108569182 +0300 ++++ ./bar.py.txt 2017-12-10 21:42:10.622781945 +0300 +@@ -5,6 +5,7 @@ import datetime + import json + from time import sleep + from pydbus import SessionBus ++from glob import glob + + BUS = SessionBus() + LAYOUT = BUS.get(bus_name='org.way-cooler', object_path='/org/way_cooler/Layout') +@@ -32,7 +33,7 @@ def main(): + output += func() + print(output) + sys.stdout.flush() +- sleep(.1) ++ sleep(1) + + def get_workspaces(layout_json): + """Gets the workspace names from the layout json""" +@@ -49,9 +50,14 @@ def get_time(): + return datetime.datetime.now().strftime(' %a %b %d %H:%M ') + + def get_battery(): +- with open("/sys/class/power_supply/BAT0/capacity", "r") as f: +- bat = f.readlines() +- return bat[0].strip() + "% Battery" ++ try: ++ [path] = glob("/sys/class/power_supply/BAT?/capacity") ++ with open(path, "r") as f: ++ bat = f.readlines() ++ result = bat[0].strip() + "% Battery" ++ except Exception: ++ result = "" ++ return result + + def format_workspaces(layout, workspaces, active_workspace): + workspaces = " " + workspaces.replace(" ", " ") + " " diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix old mode 100755 new mode 100644 index 75c9e6ecf8c890742d206bfdc7ff4761b8eb3be6..c8b67ec047ae334b04bbb1a4f019fbf67f55ec59 --- a/pkgs/applications/window-managers/way-cooler/default.nix +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -1,27 +1,93 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig -, wayland, xwayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon }: +{ stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides +, wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf +}: -with rustPlatform; +let + # refer to + # https://github.com/way-cooler/way-cooler.github.io/blob/master/way-cooler-release-i3-default.sh + # for version numbers + fakegit = writeShellScriptBin "git" '' + echo "" + ''; + way-cooler = (((callPackage ./way-cooler.nix {}).way_cooler { builtin-lua = true; }).override { + crateOverrides = defaultCrateOverrides // { -buildRustPackage rec { - name = "way-cooler-${version}"; - version = "0.5.2"; + way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk_pixbuf wayland ]; }; + };}).overrideAttrs (oldAttrs: rec { + nativeBuildInputs = [ makeWrapper ]; - src = fetchFromGitHub { - owner = "way-cooler"; - repo = "way-cooler"; - rev = "v${version}"; - sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb"; - }; + postBuild = '' + mkdir -p $out/etc + cp -r config $out/etc/way-cooler + ''; + postFixup = '' + cd $out/bin + mv way_cooler way-cooler + ''; + }); + wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec { + nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "06qivlybmmc49ksv4232sm1r4hp923xsq4c2ksa4i2azdzc1csdc"; + postFixup = '' + makeWrapper $out/bin/wc_bg $out/bin/wc-bg \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}" + ''; + }); + wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec { + postFixup = '' + cd $out/bin + mv wc_grab wc-grab + ''; + }); + wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override { + crateOverrides = defaultCrateOverrides // { + + wc-lock = attrs: { buildInputs = [ pam ]; }; + };}).overrideAttrs (oldAttrs: rec { + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ]; + postFixup = '' + makeWrapper $out/bin/wc_lock $out/bin/wc-lock \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}" + ''; + }); + # https://github.com/way-cooler/way-cooler/issues/446 + wc-bar-bare = stdenv.mkDerivation { + name = "wc-bar-bare-2017-12-05"; - nativeBuildInputs = [ pkgconfig ]; + src = fetchurl { + url = "https://github.com/way-cooler/way-cooler/files/1529701/bar.py.txt"; + sha256 = "1n1rf1k02i6vimr9n0iksf65phhyy96i5wh5d0rrx7yqki3dh6ka"; + }; + + unpackPhase = "cat $src > bar.py.txt"; + + # https://github.com/way-cooler/way-cooler/issues/446#issuecomment-350567833 + patches = [ ./bar.diff ]; + + pythonPath = with python3Packages; [ pydbus ]; + nativeBuildInputs = with python3Packages; [ python wrapPython ]; + + installPhase = '' + install -Dm755 bar.py.txt $out/bin/bar.py + patchShebangs $out/bin/bar.py + wrapPythonPrograms + ''; + }; + wc-bar = writeShellScriptBin "lemonbar" '' + SELECTED="#000000" + SELECTED_OTHER_WORKSPACE="#555555" + BACKGROUND="#4E2878" + # https://github.com/way-cooler/way-cooler/issues/446#issuecomment-349471439 + sleep 5 + ${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d + ''; +in symlinkJoin rec { + version = "0.8.0"; + name = "way-cooler-with-extensions-${version}"; + paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ]; meta = with stdenv.lib; { - broken = true; description = "Customizable Wayland compositor (window manager)"; longDescription = '' Way Cooler is a customizable tiling window manager written in Rust diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix new file mode 100644 index 0000000000000000000000000000000000000000..9ba6db36772023d97bdfa29ab178939386aa099d --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/way-cooler.nix @@ -0,0 +1,1862 @@ +# Generated by carnix 0.6.5: carnix -o way-cooler.nix Cargo.lock +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); +in +rec { + way_cooler = f: way_cooler_0_8_0 { features = way_cooler_0_8_0_features { way_cooler_0_8_0 = f; }; }; + aho_corasick_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.5.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; } ]; + inherit dependencies buildDependencies features; + }; + bitflags_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.4.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c"; + inherit dependencies buildDependencies features; + }; + bitflags_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.6.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.9.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; + inherit dependencies buildDependencies features; + }; + bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; + inherit dependencies buildDependencies features; + }; + c_vec_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "c_vec"; + version = "1.2.1"; + authors = [ "Guillaume Gomez " ]; + sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd"; + inherit dependencies buildDependencies features; + }; + cairo_rs_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cairo-rs"; + version = "0.2.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "0bcbhbyips15b7la4r43p4x57jv1w2ll8iwg9lxwvzz5k6c7iwvd"; + libName = "cairo"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + cairo_sys_rs_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cairo-sys-rs"; + version = "0.4.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "062nxihlydci65pyy2ldn7djkc9sm7a5xvkl8pxrsxfxvfapm5br"; + libName = "cairo_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; + inherit dependencies buildDependencies features; + }; + dbus_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus"; + version = "0.4.1"; + authors = [ "David Henningsson " ]; + sha256 = "0qw32qj2rys318h780klxlznkwg93dfimbn8mc34m4940l8v00g9"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + dbus_macros_0_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus-macros"; + version = "0.0.6"; + authors = [ "Antoni Boucher " ]; + sha256 = "1nymk2hzzgyafyr5nfa4r4frx4hml3wlwgzfr9b69vmcvn3d2jyd"; + inherit dependencies buildDependencies features; + }; + dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.3.1"; + authors = [ "Victor Berger " ]; + sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; + inherit dependencies buildDependencies features; + }; + dlib_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.4.0"; + authors = [ "Victor Berger " ]; + sha256 = "08sy43rji5dyhyz8r4i0dz6zan1r1dz8sh6fk3c1jyhy8v8s96jr"; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; + inherit dependencies buildDependencies features; + }; + dummy_rustwlc_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dummy-rustwlc"; + version = "0.7.1"; + authors = [ "Snirk Immington " "Preston Carpenter " ]; + sha256 = "13priwnxpjvmym6yh9v9x1230ca04cba7bzbnn21pbvqngis1y88"; + inherit dependencies buildDependencies features; + }; + env_logger_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "env_logger"; + version = "0.3.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1mvxiaaqsyjliv1mm1qaagjqiccw11mdyi3n9h9rf8y6wj15zycw"; + inherit dependencies buildDependencies features; + }; + fixedbitset_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fixedbitset"; + version = "0.1.8"; + authors = [ "bluss" ]; + sha256 = "18qr6w8jlfvhq825dr0mv9k0xqgb43sshdihbarc9khi9cz910a2"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.2"; + authors = [ "Raph Levien " ]; + sha256 = "1zhxksplv52nlqd4j21h8462b5s913ngnhd303qsxsxn8dpaxgkq"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_sys_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.2"; + authors = [ "Raph Levien " ]; + sha256 = "0p8mrhg8pxk4kpzziv6nlxd8xgkj916gsg2b0x2mvf9dxwzrqhnk"; + inherit dependencies buildDependencies features; + }; + gcc_0_3_54_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gcc"; + version = "0.3.54"; + authors = [ "Alex Crichton " ]; + sha256 = "07a5i47r8achc6gxsba3ga17h9gnh4b9a2cak8vjg4hx62aajkr4"; + inherit dependencies buildDependencies features; + }; + gdk_pixbuf_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gdk-pixbuf"; + version = "0.2.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "082z1s30haa59ax35wsv06mj8z8bhhq0fac36g01qa77kpiphj5y"; + libName = "gdk_pixbuf"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + gdk_pixbuf_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gdk-pixbuf-sys"; + version = "0.4.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "1r98zdqqik3hh1l10jmhhcjx59yk4m0bs9pc7hnkwp2p6gm968vp"; + libName = "gdk_pixbuf_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + getopts_0_2_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "getopts"; + version = "0.2.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "14wm893ihscwwbwpd1xvjm23slaidridbl2p2ghwkx69xfzm9333"; + inherit dependencies buildDependencies features; + }; + gio_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gio-sys"; + version = "0.4.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "064lv6h3qfgjzc6pbbxgln24b2fq9gxzh78z6d7fwfa97azllv2l"; + libName = "gio_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + glib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glib"; + version = "0.3.1"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "00s3n0pd8by1fk2l01mxmbnqq4ff6wadnkcf9jbjvr1l9bzgyqbl"; + inherit dependencies buildDependencies features; + }; + glib_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glib-sys"; + version = "0.4.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "153i1zmk824hdf8agkaqcgddlwpvgng71n7bdpaav5f4zzlfyp2w"; + libName = "glib_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + gobject_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gobject-sys"; + version = "0.4.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "00zmcbzqfhn9w01cphhf3hbq8ldd9ajba7x07z59vv1gdq6wjzli"; + libName = "gobject_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.4"; + authors = [ "David Tolnay " ]; + sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + inherit dependencies buildDependencies features; + }; + json_macro_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "json_macro"; + version = "0.1.1"; + authors = [ "Denis Kolodin " ]; + sha256 = "0hl2934shpwqbszrq035valbdz9y8p7dza183brygy5dbvivcyqy"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.11"; + authors = [ "Marvin Löbel " ]; + sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; + inherit dependencies buildDependencies features; + }; + lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "1.0.0"; + authors = [ "Marvin Löbel " ]; + sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; + inherit dependencies buildDependencies features; + }; + libc_0_2_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.34"; + authors = [ "The Rust Project Developers" ]; + sha256 = "11jmqdxmv0ka10ay0l8nzx0nl7s2lc3dbrnh1mgbr2grzwdyxi2s"; + inherit dependencies buildDependencies features; + }; + libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.3.4"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + libloading_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.4.3"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1cgb6xbadm59gc3cq733wrzsp59914hrjam0fan5gn1z100b6319"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + log_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.9"; + authors = [ "The Rust Project Developers" ]; + sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2"; + inherit dependencies buildDependencies features; + }; + log_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.4.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0d6m7c1cr6sj3kk47801zyjgnzyl94yh2ra9gxc3waljza7wvx92"; + inherit dependencies buildDependencies features; + }; + memchr_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "0.1.11"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8"; + inherit dependencies buildDependencies features; + }; + nix_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nix"; + version = "0.6.0"; + authors = [ "Carl Lerche " ]; + sha256 = "1bgh75y897isnxbw3vd79vns9h6q4d59p1cgv9c4laysyw6fkqwf"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + nix_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nix"; + version = "0.9.0"; + authors = [ "The nix-rust Project Developers" ]; + sha256 = "00p63bphzwwn460rja5l2wcpgmv7ljf7illf6n95cppx63d180q0"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_41_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.41"; + authors = [ "The Rust Project Developers" ]; + sha256 = "134gv890n1gv8v0jys55k0940gqp2hibgf1fs8q9jmyk2xp1jp9m"; + inherit dependencies buildDependencies features; + }; + ordermap_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ordermap"; + version = "0.3.2"; + authors = [ "bluss" ]; + sha256 = "13zw8i0gf3snihmg9xvd63sd3ffdhhv8bmgfwbwf4shqxh6h3sac"; + inherit dependencies buildDependencies features; + }; + petgraph_0_4_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "petgraph"; + version = "0.4.10"; + authors = [ "bluss" "mitchmindtree" ]; + sha256 = "1fdh2hwkrbf716qxdiasjn8jspvshhykclj8mwafdd8h241159sj"; + inherit dependencies buildDependencies features; + }; + phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; + inherit dependencies buildDependencies features; + }; + phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; + inherit dependencies buildDependencies features; + }; + phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + rand_0_3_19_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.19"; + authors = [ "The Rust Project Developers" ]; + sha256 = "19zx65w7rrrfnjifmjp2i80w9bc6ld7pcwnk5hmr9xszmmvhk8zp"; + inherit dependencies buildDependencies features; + }; + regex_0_1_80_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "0.1.80"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.3.9"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; + inherit dependencies buildDependencies features; + }; + rlua_0_9_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rlua"; + version = "0.9.7"; + authors = [ "kyren " ]; + sha256 = "1671b5ga54aq49sqx69hvnjr732hf9jpqwswwxgpcqq8q05mfzgp"; + inherit dependencies buildDependencies features; + }; + rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-serialize"; + version = "0.3.24"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn"; + inherit dependencies buildDependencies features; + }; + rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc_version"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; + inherit dependencies buildDependencies features; + }; + rustwlc_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustwlc"; + version = "0.7.0"; + authors = [ "Snirk Immington " "Timidger " ]; + sha256 = "0gqi9pdw74al33ja25h33q68vnfklj3gpjgkiqqbr3gflgli5h1i"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.1.20"; + authors = [ "The Rust Project Developers" ]; + sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; + inherit dependencies buildDependencies features; + }; + serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "0.9.15"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b"; + inherit dependencies buildDependencies features; + }; + serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "0.9.10"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; + inherit dependencies buildDependencies features; + }; + siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + authors = [ "Frank Denis " ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + inherit dependencies buildDependencies features; + }; + target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "target_build_utils"; + version = "0.3.1"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + thread_id_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread-id"; + version = "2.0.0"; + authors = [ "Ruud van Asseldonk " ]; + sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3"; + inherit dependencies buildDependencies features; + }; + thread_local_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.2.7"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7"; + inherit dependencies buildDependencies features; + }; + token_store_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "token_store"; + version = "0.1.2"; + authors = [ "Victor Berger " ]; + sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "0.1.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; + inherit dependencies buildDependencies features; + }; + uuid_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "uuid"; + version = "0.3.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "16ak1c84dfkd8h33cvkxrkvc30k7b0bhrnza8ni2c0jsx85fpbip"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + way_cooler_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "way-cooler"; + version = "0.8.0"; + authors = [ "Snirk Immington " "Timidger " ]; + sha256 = "1xg7sg0ssc7a8nx7g6pjdfz9ndf0l7p2n0ydh3sqym3k5ifxi965"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_scanner_0_12_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-scanner"; + version = "0.12.4"; + authors = [ "Victor Berger " ]; + sha256 = "043s30i7da64a7inmwiib36ax681vw7zr0pfl54alcyc6pgyanb1"; + inherit dependencies buildDependencies features; + }; + wayland_server_0_12_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-server"; + version = "0.12.4"; + authors = [ "Victor Berger " ]; + sha256 = "0m8565848l8f1h3mwlyxy3nfqv11vpl50y9qcpmp60hw8w2vw124"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.6.0"; + authors = [ "Victor Berger " ]; + sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.9.10"; + authors = [ "Victor Berger " ]; + sha256 = "011q7lfii222whvif39asvryl1sf3rc1fxp8qs8gh84kr4mna0k8"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_12_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.12.4"; + authors = [ "Victor Berger " ]; + sha256 = "1q9qyjl6bz356kh50lzvk48qbs87zbaqh5mhm6nlngkg1qrbvi6c"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + xcb_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xcb"; + version = "0.8.1"; + authors = [ "Remi Thebault " ]; + sha256 = "12jk8rbbmw3h9w0c7idvjph5bx0qpjgrv0nql2cfwy571j9qxb7j"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + xml_rs_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xml-rs"; + version = "0.7.0"; + authors = [ "Vladimir Matveev " ]; + sha256 = "12rynhqjgkg2hzy9x1d1232p9d9jm40bc3by5yzjv8gx089mflyb"; + libPath = "src/lib.rs"; + libName = "xml"; + crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; + inherit dependencies buildDependencies features; + }; + aho_corasick_0_5_3 = { features?(aho_corasick_0_5_3_features {}) }: aho_corasick_0_5_3_ { + dependencies = mapFeatures features ([ memchr_0_1_11 ]); + }; + aho_corasick_0_5_3_features = f: updateFeatures f (rec { + aho_corasick_0_5_3.default = (f.aho_corasick_0_5_3.default or true); + memchr_0_1_11.default = true; + }) [ memchr_0_1_11_features ]; + bitflags_0_4_0 = { features?(bitflags_0_4_0_features {}) }: bitflags_0_4_0_ { + features = mkFeatures (features.bitflags_0_4_0 or {}); + }; + bitflags_0_4_0_features = f: updateFeatures f (rec { + bitflags_0_4_0.default = (f.bitflags_0_4_0.default or true); + }) []; + bitflags_0_6_0 = { features?(bitflags_0_6_0_features {}) }: bitflags_0_6_0_ {}; + bitflags_0_6_0_features = f: updateFeatures f (rec { + bitflags_0_6_0.default = (f.bitflags_0_6_0.default or true); + }) []; + bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; + bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); + }) []; + bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { + features = mkFeatures (features.bitflags_0_9_1 or {}); + }; + bitflags_0_9_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); + bitflags_0_9_1.example_generated = + (f.bitflags_0_9_1.example_generated or false) || + (f.bitflags_0_9_1.default or false) || + (bitflags_0_9_1.default or false); + }) []; + bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ { + features = mkFeatures (features.bitflags_1_0_1 or {}); + }; + bitflags_1_0_1_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = (f.bitflags_1_0_1.default or true); + bitflags_1_0_1.example_generated = + (f.bitflags_1_0_1.example_generated or false) || + (f.bitflags_1_0_1.default or false) || + (bitflags_1_0_1.default or false); + }) []; + c_vec_1_2_1 = { features?(c_vec_1_2_1_features {}) }: c_vec_1_2_1_ {}; + c_vec_1_2_1_features = f: updateFeatures f (rec { + c_vec_1_2_1.default = (f.c_vec_1_2_1.default or true); + }) []; + cairo_rs_0_2_0 = { features?(cairo_rs_0_2_0_features {}) }: cairo_rs_0_2_0_ { + dependencies = mapFeatures features ([ c_vec_1_2_1 cairo_sys_rs_0_4_0 libc_0_2_34 ] + ++ (if features.cairo_rs_0_2_0.glib or false then [ glib_0_3_1 ] else []) + ++ (if features.cairo_rs_0_2_0.glib-sys or false then [ glib_sys_0_4_0 ] else [])) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([]); + features = mkFeatures (features.cairo_rs_0_2_0 or {}); + }; + cairo_rs_0_2_0_features = f: updateFeatures f (rec { + c_vec_1_2_1.default = true; + cairo_rs_0_2_0.default = (f.cairo_rs_0_2_0.default or true); + cairo_rs_0_2_0.glib = + (f.cairo_rs_0_2_0.glib or false) || + (f.cairo_rs_0_2_0.use_glib or false) || + (cairo_rs_0_2_0.use_glib or false); + cairo_rs_0_2_0.glib-sys = + (f.cairo_rs_0_2_0.glib-sys or false) || + (f.cairo_rs_0_2_0.use_glib or false) || + (cairo_rs_0_2_0.use_glib or false); + cairo_rs_0_2_0.gtk-rs-lgpl-docs = + (f.cairo_rs_0_2_0.gtk-rs-lgpl-docs or false) || + (f.cairo_rs_0_2_0.embed-lgpl-docs or false) || + (cairo_rs_0_2_0.embed-lgpl-docs or false) || + (f.cairo_rs_0_2_0.purge-lgpl-docs or false) || + (cairo_rs_0_2_0.purge-lgpl-docs or false); + cairo_rs_0_2_0.use_glib = + (f.cairo_rs_0_2_0.use_glib or false) || + (f.cairo_rs_0_2_0.default or false) || + (cairo_rs_0_2_0.default or false); + cairo_sys_rs_0_4_0.default = true; + cairo_sys_rs_0_4_0.png = + (f.cairo_sys_rs_0_4_0.png or false) || + (cairo_rs_0_2_0.png or false) || + (f.cairo_rs_0_2_0.png or false); + cairo_sys_rs_0_4_0.v1_12 = + (f.cairo_sys_rs_0_4_0.v1_12 or false) || + (cairo_rs_0_2_0.v1_12 or false) || + (f.cairo_rs_0_2_0.v1_12 or false); + cairo_sys_rs_0_4_0.xcb = + (f.cairo_sys_rs_0_4_0.xcb or false) || + (cairo_rs_0_2_0.xcb or false) || + (f.cairo_rs_0_2_0.xcb or false); + glib_0_3_1.default = true; + glib_sys_0_4_0.default = true; + libc_0_2_34.default = true; + winapi_0_2_8.default = true; + }) [ c_vec_1_2_1_features cairo_sys_rs_0_4_0_features glib_0_3_1_features glib_sys_0_4_0_features libc_0_2_34_features winapi_0_2_8_features ]; + cairo_sys_rs_0_4_0 = { features?(cairo_sys_rs_0_4_0_features {}) }: cairo_sys_rs_0_4_0_ { + dependencies = mapFeatures features ([ libc_0_2_34 ]) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + features = mkFeatures (features.cairo_sys_rs_0_4_0 or {}); + }; + cairo_sys_rs_0_4_0_features = f: updateFeatures f (rec { + cairo_sys_rs_0_4_0.default = (f.cairo_sys_rs_0_4_0.default or true); + cairo_sys_rs_0_4_0.v1_12 = + (f.cairo_sys_rs_0_4_0.v1_12 or false) || + (f.cairo_sys_rs_0_4_0.v1_14 or false) || + (cairo_sys_rs_0_4_0.v1_14 or false); + cairo_sys_rs_0_4_0.x11 = + (f.cairo_sys_rs_0_4_0.x11 or false) || + (f.cairo_sys_rs_0_4_0.xlib or false) || + (cairo_sys_rs_0_4_0.xlib or false); + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + winapi_0_2_8.default = true; + }) [ libc_0_2_34_features pkg_config_0_3_9_features winapi_0_2_8_features ]; + cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; + cfg_if_0_1_2_features = f: updateFeatures f (rec { + cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); + }) []; + dbus_0_4_1 = { features?(dbus_0_4_1_features {}) }: dbus_0_4_1_ { + dependencies = mapFeatures features ([ libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + }; + dbus_0_4_1_features = f: updateFeatures f (rec { + dbus_0_4_1.default = (f.dbus_0_4_1.default or true); + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + }) [ libc_0_2_34_features pkg_config_0_3_9_features ]; + dbus_macros_0_0_6 = { features?(dbus_macros_0_0_6_features {}) }: dbus_macros_0_0_6_ { + dependencies = mapFeatures features ([ dbus_0_4_1 ]); + }; + dbus_macros_0_0_6_features = f: updateFeatures f (rec { + dbus_0_4_1.default = true; + dbus_macros_0_0_6.default = (f.dbus_macros_0_0_6.default or true); + }) [ dbus_0_4_1_features ]; + dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ { + dependencies = mapFeatures features ([ libloading_0_3_4 ]); + features = mkFeatures (features.dlib_0_3_1 or {}); + }; + dlib_0_3_1_features = f: updateFeatures f (rec { + dlib_0_3_1.default = (f.dlib_0_3_1.default or true); + libloading_0_3_4.default = true; + }) [ libloading_0_3_4_features ]; + dlib_0_4_0 = { features?(dlib_0_4_0_features {}) }: dlib_0_4_0_ { + dependencies = mapFeatures features ([ libloading_0_4_3 ]); + features = mkFeatures (features.dlib_0_4_0 or {}); + }; + dlib_0_4_0_features = f: updateFeatures f (rec { + dlib_0_4_0.default = (f.dlib_0_4_0.default or true); + libloading_0_4_3.default = true; + }) [ libloading_0_4_3_features ]; + dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; + dtoa_0_4_2_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); + }) []; + dummy_rustwlc_0_7_1 = { features?(dummy_rustwlc_0_7_1_features {}) }: dummy_rustwlc_0_7_1_ { + dependencies = mapFeatures features ([ bitflags_0_6_0 libc_0_2_34 wayland_sys_0_9_10 ]); + }; + dummy_rustwlc_0_7_1_features = f: updateFeatures f (rec { + bitflags_0_6_0.default = true; + dummy_rustwlc_0_7_1.default = (f.dummy_rustwlc_0_7_1.default or true); + libc_0_2_34.default = true; + wayland_sys_0_9_10.default = true; + wayland_sys_0_9_10.dlopen = true; + wayland_sys_0_9_10.server = true; + }) [ bitflags_0_6_0_features libc_0_2_34_features wayland_sys_0_9_10_features ]; + env_logger_0_3_5 = { features?(env_logger_0_3_5_features {}) }: env_logger_0_3_5_ { + dependencies = mapFeatures features ([ log_0_3_9 ] + ++ (if features.env_logger_0_3_5.regex or false then [ regex_0_1_80 ] else [])); + features = mkFeatures (features.env_logger_0_3_5 or {}); + }; + env_logger_0_3_5_features = f: updateFeatures f (rec { + env_logger_0_3_5.default = (f.env_logger_0_3_5.default or true); + env_logger_0_3_5.regex = + (f.env_logger_0_3_5.regex or false) || + (f.env_logger_0_3_5.default or false) || + (env_logger_0_3_5.default or false); + log_0_3_9.default = true; + regex_0_1_80.default = true; + }) [ log_0_3_9_features regex_0_1_80_features ]; + fixedbitset_0_1_8 = { features?(fixedbitset_0_1_8_features {}) }: fixedbitset_0_1_8_ {}; + fixedbitset_0_1_8_features = f: updateFeatures f (rec { + fixedbitset_0_1_8.default = (f.fixedbitset_0_1_8.default or true); + }) []; + fuchsia_zircon_0_3_2 = { features?(fuchsia_zircon_0_3_2_features {}) }: fuchsia_zircon_0_3_2_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_2 ]); + }; + fuchsia_zircon_0_3_2_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + fuchsia_zircon_0_3_2.default = (f.fuchsia_zircon_0_3_2.default or true); + fuchsia_zircon_sys_0_3_2.default = true; + }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_2_features ]; + fuchsia_zircon_sys_0_3_2 = { features?(fuchsia_zircon_sys_0_3_2_features {}) }: fuchsia_zircon_sys_0_3_2_ {}; + fuchsia_zircon_sys_0_3_2_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_3_2.default = (f.fuchsia_zircon_sys_0_3_2.default or true); + }) []; + gcc_0_3_54 = { features?(gcc_0_3_54_features {}) }: gcc_0_3_54_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.gcc_0_3_54 or {}); + }; + gcc_0_3_54_features = f: updateFeatures f (rec { + gcc_0_3_54.default = (f.gcc_0_3_54.default or true); + gcc_0_3_54.rayon = + (f.gcc_0_3_54.rayon or false) || + (f.gcc_0_3_54.parallel or false) || + (gcc_0_3_54.parallel or false); + }) []; + gdk_pixbuf_0_2_0 = { features?(gdk_pixbuf_0_2_0_features {}) }: gdk_pixbuf_0_2_0_ { + dependencies = mapFeatures features ([ gdk_pixbuf_sys_0_4_0 glib_0_3_1 glib_sys_0_4_0 gobject_sys_0_4_0 libc_0_2_34 ]); + buildDependencies = mapFeatures features ([]); + features = mkFeatures (features.gdk_pixbuf_0_2_0 or {}); + }; + gdk_pixbuf_0_2_0_features = f: updateFeatures f (rec { + gdk_pixbuf_0_2_0.default = (f.gdk_pixbuf_0_2_0.default or true); + gdk_pixbuf_0_2_0.gtk-rs-lgpl-docs = + (f.gdk_pixbuf_0_2_0.gtk-rs-lgpl-docs or false) || + (f.gdk_pixbuf_0_2_0.embed-lgpl-docs or false) || + (gdk_pixbuf_0_2_0.embed-lgpl-docs or false) || + (f.gdk_pixbuf_0_2_0.purge-lgpl-docs or false) || + (gdk_pixbuf_0_2_0.purge-lgpl-docs or false); + gdk_pixbuf_0_2_0.v2_28 = + (f.gdk_pixbuf_0_2_0.v2_28 or false) || + (f.gdk_pixbuf_0_2_0.v2_30 or false) || + (gdk_pixbuf_0_2_0.v2_30 or false); + gdk_pixbuf_0_2_0.v2_30 = + (f.gdk_pixbuf_0_2_0.v2_30 or false) || + (f.gdk_pixbuf_0_2_0.v2_32 or false) || + (gdk_pixbuf_0_2_0.v2_32 or false); + gdk_pixbuf_0_2_0.v2_32 = + (f.gdk_pixbuf_0_2_0.v2_32 or false) || + (f.gdk_pixbuf_0_2_0.v2_36 or false) || + (gdk_pixbuf_0_2_0.v2_36 or false); + gdk_pixbuf_sys_0_4_0.default = true; + gdk_pixbuf_sys_0_4_0.v2_28 = + (f.gdk_pixbuf_sys_0_4_0.v2_28 or false) || + (gdk_pixbuf_0_2_0.v2_28 or false) || + (f.gdk_pixbuf_0_2_0.v2_28 or false); + gdk_pixbuf_sys_0_4_0.v2_30 = + (f.gdk_pixbuf_sys_0_4_0.v2_30 or false) || + (gdk_pixbuf_0_2_0.v2_30 or false) || + (f.gdk_pixbuf_0_2_0.v2_30 or false); + gdk_pixbuf_sys_0_4_0.v2_32 = + (f.gdk_pixbuf_sys_0_4_0.v2_32 or false) || + (gdk_pixbuf_0_2_0.v2_32 or false) || + (f.gdk_pixbuf_0_2_0.v2_32 or false); + gdk_pixbuf_sys_0_4_0.v2_36 = + (f.gdk_pixbuf_sys_0_4_0.v2_36 or false) || + (gdk_pixbuf_0_2_0.v2_36 or false) || + (f.gdk_pixbuf_0_2_0.v2_36 or false); + glib_0_3_1.default = true; + glib_sys_0_4_0.default = true; + gobject_sys_0_4_0.default = true; + libc_0_2_34.default = true; + }) [ gdk_pixbuf_sys_0_4_0_features glib_0_3_1_features glib_sys_0_4_0_features gobject_sys_0_4_0_features libc_0_2_34_features ]; + gdk_pixbuf_sys_0_4_0 = { features?(gdk_pixbuf_sys_0_4_0_features {}) }: gdk_pixbuf_sys_0_4_0_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 gio_sys_0_4_0 glib_sys_0_4_0 gobject_sys_0_4_0 libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + features = mkFeatures (features.gdk_pixbuf_sys_0_4_0 or {}); + }; + gdk_pixbuf_sys_0_4_0_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + gdk_pixbuf_sys_0_4_0.default = (f.gdk_pixbuf_sys_0_4_0.default or true); + gdk_pixbuf_sys_0_4_0.v2_28 = + (f.gdk_pixbuf_sys_0_4_0.v2_28 or false) || + (f.gdk_pixbuf_sys_0_4_0.v2_30 or false) || + (gdk_pixbuf_sys_0_4_0.v2_30 or false); + gdk_pixbuf_sys_0_4_0.v2_30 = + (f.gdk_pixbuf_sys_0_4_0.v2_30 or false) || + (f.gdk_pixbuf_sys_0_4_0.v2_32 or false) || + (gdk_pixbuf_sys_0_4_0.v2_32 or false); + gdk_pixbuf_sys_0_4_0.v2_32 = + (f.gdk_pixbuf_sys_0_4_0.v2_32 or false) || + (f.gdk_pixbuf_sys_0_4_0.v2_36 or false) || + (gdk_pixbuf_sys_0_4_0.v2_36 or false); + gio_sys_0_4_0.default = true; + glib_sys_0_4_0.default = true; + gobject_sys_0_4_0.default = true; + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + }) [ bitflags_0_9_1_features gio_sys_0_4_0_features glib_sys_0_4_0_features gobject_sys_0_4_0_features libc_0_2_34_features pkg_config_0_3_9_features ]; + getopts_0_2_15 = { features?(getopts_0_2_15_features {}) }: getopts_0_2_15_ {}; + getopts_0_2_15_features = f: updateFeatures f (rec { + getopts_0_2_15.default = (f.getopts_0_2_15.default or true); + }) []; + gio_sys_0_4_0 = { features?(gio_sys_0_4_0_features {}) }: gio_sys_0_4_0_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 glib_sys_0_4_0 gobject_sys_0_4_0 libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + features = mkFeatures (features.gio_sys_0_4_0 or {}); + }; + gio_sys_0_4_0_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + gio_sys_0_4_0.default = (f.gio_sys_0_4_0.default or true); + gio_sys_0_4_0.v2_34 = + (f.gio_sys_0_4_0.v2_34 or false) || + (f.gio_sys_0_4_0.v2_36 or false) || + (gio_sys_0_4_0.v2_36 or false); + gio_sys_0_4_0.v2_36 = + (f.gio_sys_0_4_0.v2_36 or false) || + (f.gio_sys_0_4_0.v2_38 or false) || + (gio_sys_0_4_0.v2_38 or false); + gio_sys_0_4_0.v2_38 = + (f.gio_sys_0_4_0.v2_38 or false) || + (f.gio_sys_0_4_0.v2_40 or false) || + (gio_sys_0_4_0.v2_40 or false); + gio_sys_0_4_0.v2_40 = + (f.gio_sys_0_4_0.v2_40 or false) || + (f.gio_sys_0_4_0.v2_42 or false) || + (gio_sys_0_4_0.v2_42 or false); + gio_sys_0_4_0.v2_42 = + (f.gio_sys_0_4_0.v2_42 or false) || + (f.gio_sys_0_4_0.v2_44 or false) || + (gio_sys_0_4_0.v2_44 or false); + gio_sys_0_4_0.v2_44 = + (f.gio_sys_0_4_0.v2_44 or false) || + (f.gio_sys_0_4_0.v2_46 or false) || + (gio_sys_0_4_0.v2_46 or false); + gio_sys_0_4_0.v2_46 = + (f.gio_sys_0_4_0.v2_46 or false) || + (f.gio_sys_0_4_0.v2_48 or false) || + (gio_sys_0_4_0.v2_48 or false); + gio_sys_0_4_0.v2_48 = + (f.gio_sys_0_4_0.v2_48 or false) || + (f.gio_sys_0_4_0.v2_50 or false) || + (gio_sys_0_4_0.v2_50 or false); + glib_sys_0_4_0.default = true; + gobject_sys_0_4_0.default = true; + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + }) [ bitflags_0_9_1_features glib_sys_0_4_0_features gobject_sys_0_4_0_features libc_0_2_34_features pkg_config_0_3_9_features ]; + glib_0_3_1 = { features?(glib_0_3_1_features {}) }: glib_0_3_1_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 glib_sys_0_4_0 gobject_sys_0_4_0 lazy_static_0_2_11 libc_0_2_34 ]); + features = mkFeatures (features.glib_0_3_1 or {}); + }; + glib_0_3_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + glib_0_3_1.default = (f.glib_0_3_1.default or true); + glib_0_3_1.v2_34 = + (f.glib_0_3_1.v2_34 or false) || + (f.glib_0_3_1.v2_38 or false) || + (glib_0_3_1.v2_38 or false); + glib_0_3_1.v2_38 = + (f.glib_0_3_1.v2_38 or false) || + (f.glib_0_3_1.v2_40 or false) || + (glib_0_3_1.v2_40 or false); + glib_0_3_1.v2_40 = + (f.glib_0_3_1.v2_40 or false) || + (f.glib_0_3_1.v2_44 or false) || + (glib_0_3_1.v2_44 or false); + glib_0_3_1.v2_44 = + (f.glib_0_3_1.v2_44 or false) || + (f.glib_0_3_1.v2_46 or false) || + (glib_0_3_1.v2_46 or false); + glib_0_3_1.v2_46 = + (f.glib_0_3_1.v2_46 or false) || + (f.glib_0_3_1.v2_48 or false) || + (glib_0_3_1.v2_48 or false); + glib_0_3_1.v2_48 = + (f.glib_0_3_1.v2_48 or false) || + (f.glib_0_3_1.v2_50 or false) || + (glib_0_3_1.v2_50 or false); + glib_sys_0_4_0.default = true; + glib_sys_0_4_0.v2_34 = + (f.glib_sys_0_4_0.v2_34 or false) || + (glib_0_3_1.v2_34 or false) || + (f.glib_0_3_1.v2_34 or false); + glib_sys_0_4_0.v2_38 = + (f.glib_sys_0_4_0.v2_38 or false) || + (glib_0_3_1.v2_38 or false) || + (f.glib_0_3_1.v2_38 or false); + glib_sys_0_4_0.v2_40 = + (f.glib_sys_0_4_0.v2_40 or false) || + (glib_0_3_1.v2_40 or false) || + (f.glib_0_3_1.v2_40 or false); + glib_sys_0_4_0.v2_44 = + (f.glib_sys_0_4_0.v2_44 or false) || + (glib_0_3_1.v2_44 or false) || + (f.glib_0_3_1.v2_44 or false); + glib_sys_0_4_0.v2_46 = + (f.glib_sys_0_4_0.v2_46 or false) || + (glib_0_3_1.v2_46 or false) || + (f.glib_0_3_1.v2_46 or false); + glib_sys_0_4_0.v2_48 = + (f.glib_sys_0_4_0.v2_48 or false) || + (glib_0_3_1.v2_48 or false) || + (f.glib_0_3_1.v2_48 or false); + glib_sys_0_4_0.v2_50 = + (f.glib_sys_0_4_0.v2_50 or false) || + (glib_0_3_1.v2_50 or false) || + (f.glib_0_3_1.v2_50 or false); + gobject_sys_0_4_0.default = true; + gobject_sys_0_4_0.v2_34 = + (f.gobject_sys_0_4_0.v2_34 or false) || + (glib_0_3_1.v2_34 or false) || + (f.glib_0_3_1.v2_34 or false); + gobject_sys_0_4_0.v2_38 = + (f.gobject_sys_0_4_0.v2_38 or false) || + (glib_0_3_1.v2_38 or false) || + (f.glib_0_3_1.v2_38 or false); + gobject_sys_0_4_0.v2_44 = + (f.gobject_sys_0_4_0.v2_44 or false) || + (glib_0_3_1.v2_44 or false) || + (f.glib_0_3_1.v2_44 or false); + gobject_sys_0_4_0.v2_46 = + (f.gobject_sys_0_4_0.v2_46 or false) || + (glib_0_3_1.v2_46 or false) || + (f.glib_0_3_1.v2_46 or false); + lazy_static_0_2_11.default = true; + libc_0_2_34.default = true; + }) [ bitflags_0_9_1_features glib_sys_0_4_0_features gobject_sys_0_4_0_features lazy_static_0_2_11_features libc_0_2_34_features ]; + glib_sys_0_4_0 = { features?(glib_sys_0_4_0_features {}) }: glib_sys_0_4_0_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + features = mkFeatures (features.glib_sys_0_4_0 or {}); + }; + glib_sys_0_4_0_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + glib_sys_0_4_0.default = (f.glib_sys_0_4_0.default or true); + glib_sys_0_4_0.v2_34 = + (f.glib_sys_0_4_0.v2_34 or false) || + (f.glib_sys_0_4_0.v2_36 or false) || + (glib_sys_0_4_0.v2_36 or false); + glib_sys_0_4_0.v2_36 = + (f.glib_sys_0_4_0.v2_36 or false) || + (f.glib_sys_0_4_0.v2_38 or false) || + (glib_sys_0_4_0.v2_38 or false); + glib_sys_0_4_0.v2_38 = + (f.glib_sys_0_4_0.v2_38 or false) || + (f.glib_sys_0_4_0.v2_40 or false) || + (glib_sys_0_4_0.v2_40 or false); + glib_sys_0_4_0.v2_40 = + (f.glib_sys_0_4_0.v2_40 or false) || + (f.glib_sys_0_4_0.v2_44 or false) || + (glib_sys_0_4_0.v2_44 or false); + glib_sys_0_4_0.v2_44 = + (f.glib_sys_0_4_0.v2_44 or false) || + (f.glib_sys_0_4_0.v2_46 or false) || + (glib_sys_0_4_0.v2_46 or false); + glib_sys_0_4_0.v2_46 = + (f.glib_sys_0_4_0.v2_46 or false) || + (f.glib_sys_0_4_0.v2_48 or false) || + (glib_sys_0_4_0.v2_48 or false); + glib_sys_0_4_0.v2_48 = + (f.glib_sys_0_4_0.v2_48 or false) || + (f.glib_sys_0_4_0.v2_50 or false) || + (glib_sys_0_4_0.v2_50 or false); + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + }) [ bitflags_0_9_1_features libc_0_2_34_features pkg_config_0_3_9_features ]; + gobject_sys_0_4_0 = { features?(gobject_sys_0_4_0_features {}) }: gobject_sys_0_4_0_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 glib_sys_0_4_0 libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + features = mkFeatures (features.gobject_sys_0_4_0 or {}); + }; + gobject_sys_0_4_0_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + glib_sys_0_4_0.default = true; + gobject_sys_0_4_0.default = (f.gobject_sys_0_4_0.default or true); + gobject_sys_0_4_0.v2_34 = + (f.gobject_sys_0_4_0.v2_34 or false) || + (f.gobject_sys_0_4_0.v2_36 or false) || + (gobject_sys_0_4_0.v2_36 or false); + gobject_sys_0_4_0.v2_36 = + (f.gobject_sys_0_4_0.v2_36 or false) || + (f.gobject_sys_0_4_0.v2_38 or false) || + (gobject_sys_0_4_0.v2_38 or false); + gobject_sys_0_4_0.v2_38 = + (f.gobject_sys_0_4_0.v2_38 or false) || + (f.gobject_sys_0_4_0.v2_42 or false) || + (gobject_sys_0_4_0.v2_42 or false); + gobject_sys_0_4_0.v2_42 = + (f.gobject_sys_0_4_0.v2_42 or false) || + (f.gobject_sys_0_4_0.v2_44 or false) || + (gobject_sys_0_4_0.v2_44 or false); + gobject_sys_0_4_0.v2_44 = + (f.gobject_sys_0_4_0.v2_44 or false) || + (f.gobject_sys_0_4_0.v2_46 or false) || + (gobject_sys_0_4_0.v2_46 or false); + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + }) [ bitflags_0_9_1_features glib_sys_0_4_0_features libc_0_2_34_features pkg_config_0_3_9_features ]; + itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ { + features = mkFeatures (features.itoa_0_3_4 or {}); + }; + itoa_0_3_4_features = f: updateFeatures f (rec { + itoa_0_3_4.default = (f.itoa_0_3_4.default or true); + }) []; + json_macro_0_1_1 = { features?(json_macro_0_1_1_features {}) }: json_macro_0_1_1_ { + dependencies = mapFeatures features ([ rustc_serialize_0_3_24 ]); + }; + json_macro_0_1_1_features = f: updateFeatures f (rec { + json_macro_0_1_1.default = (f.json_macro_0_1_1.default or true); + rustc_serialize_0_3_24.default = true; + }) [ rustc_serialize_0_3_24_features ]; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_0_2_11 or {}); + }; + lazy_static_0_2_11_features = f: updateFeatures f (rec { + lazy_static_0_2_11.compiletest_rs = + (f.lazy_static_0_2_11.compiletest_rs or false) || + (f.lazy_static_0_2_11.compiletest or false) || + (lazy_static_0_2_11.compiletest or false); + lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true); + lazy_static_0_2_11.nightly = + (f.lazy_static_0_2_11.nightly or false) || + (f.lazy_static_0_2_11.spin_no_std or false) || + (lazy_static_0_2_11.spin_no_std or false); + lazy_static_0_2_11.spin = + (f.lazy_static_0_2_11.spin or false) || + (f.lazy_static_0_2_11.spin_no_std or false) || + (lazy_static_0_2_11.spin_no_std or false); + }) []; + lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_1_0_0 or {}); + }; + lazy_static_1_0_0_features = f: updateFeatures f (rec { + lazy_static_1_0_0.compiletest_rs = + (f.lazy_static_1_0_0.compiletest_rs or false) || + (f.lazy_static_1_0_0.compiletest or false) || + (lazy_static_1_0_0.compiletest or false); + lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true); + lazy_static_1_0_0.nightly = + (f.lazy_static_1_0_0.nightly or false) || + (f.lazy_static_1_0_0.spin_no_std or false) || + (lazy_static_1_0_0.spin_no_std or false); + lazy_static_1_0_0.spin = + (f.lazy_static_1_0_0.spin or false) || + (f.lazy_static_1_0_0.spin_no_std or false) || + (lazy_static_1_0_0.spin_no_std or false); + }) []; + libc_0_2_34 = { features?(libc_0_2_34_features {}) }: libc_0_2_34_ { + features = mkFeatures (features.libc_0_2_34 or {}); + }; + libc_0_2_34_features = f: updateFeatures f (rec { + libc_0_2_34.default = (f.libc_0_2_34.default or true); + libc_0_2_34.use_std = + (f.libc_0_2_34.use_std or false) || + (f.libc_0_2_34.default or false) || + (libc_0_2_34.default or false); + }) []; + libloading_0_3_4 = { features?(libloading_0_3_4_features {}) }: libloading_0_3_4_ { + dependencies = mapFeatures features ([ lazy_static_0_2_11 ]) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]); + }; + libloading_0_3_4_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + lazy_static_0_2_11.default = true; + libloading_0_3_4.default = (f.libloading_0_3_4.default or true); + target_build_utils_0_3_1.default = true; + winapi_0_2_8.default = true; + }) [ lazy_static_0_2_11_features target_build_utils_0_3_1_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + libloading_0_4_3 = { features?(libloading_0_4_3_features {}) }: libloading_0_4_3_ { + dependencies = mapFeatures features ([ lazy_static_1_0_0 ]) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + libloading_0_4_3_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + lazy_static_1_0_0.default = true; + libloading_0_4_3.default = (f.libloading_0_4_3.default or true); + winapi_0_2_8.default = true; + }) [ lazy_static_1_0_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + log_0_3_9 = { features?(log_0_3_9_features {}) }: log_0_3_9_ { + dependencies = mapFeatures features ([ log_0_4_0 ]); + features = mkFeatures (features.log_0_3_9 or {}); + }; + log_0_3_9_features = f: updateFeatures f (rec { + log_0_3_9.default = (f.log_0_3_9.default or true); + log_0_3_9.use_std = + (f.log_0_3_9.use_std or false) || + (f.log_0_3_9.default or false) || + (log_0_3_9.default or false); + log_0_4_0.default = true; + log_0_4_0.max_level_debug = + (f.log_0_4_0.max_level_debug or false) || + (log_0_3_9.max_level_debug or false) || + (f.log_0_3_9.max_level_debug or false); + log_0_4_0.max_level_error = + (f.log_0_4_0.max_level_error or false) || + (log_0_3_9.max_level_error or false) || + (f.log_0_3_9.max_level_error or false); + log_0_4_0.max_level_info = + (f.log_0_4_0.max_level_info or false) || + (log_0_3_9.max_level_info or false) || + (f.log_0_3_9.max_level_info or false); + log_0_4_0.max_level_off = + (f.log_0_4_0.max_level_off or false) || + (log_0_3_9.max_level_off or false) || + (f.log_0_3_9.max_level_off or false); + log_0_4_0.max_level_trace = + (f.log_0_4_0.max_level_trace or false) || + (log_0_3_9.max_level_trace or false) || + (f.log_0_3_9.max_level_trace or false); + log_0_4_0.max_level_warn = + (f.log_0_4_0.max_level_warn or false) || + (log_0_3_9.max_level_warn or false) || + (f.log_0_3_9.max_level_warn or false); + log_0_4_0.release_max_level_debug = + (f.log_0_4_0.release_max_level_debug or false) || + (log_0_3_9.release_max_level_debug or false) || + (f.log_0_3_9.release_max_level_debug or false); + log_0_4_0.release_max_level_error = + (f.log_0_4_0.release_max_level_error or false) || + (log_0_3_9.release_max_level_error or false) || + (f.log_0_3_9.release_max_level_error or false); + log_0_4_0.release_max_level_info = + (f.log_0_4_0.release_max_level_info or false) || + (log_0_3_9.release_max_level_info or false) || + (f.log_0_3_9.release_max_level_info or false); + log_0_4_0.release_max_level_off = + (f.log_0_4_0.release_max_level_off or false) || + (log_0_3_9.release_max_level_off or false) || + (f.log_0_3_9.release_max_level_off or false); + log_0_4_0.release_max_level_trace = + (f.log_0_4_0.release_max_level_trace or false) || + (log_0_3_9.release_max_level_trace or false) || + (f.log_0_3_9.release_max_level_trace or false); + log_0_4_0.release_max_level_warn = + (f.log_0_4_0.release_max_level_warn or false) || + (log_0_3_9.release_max_level_warn or false) || + (f.log_0_3_9.release_max_level_warn or false); + log_0_4_0.std = + (f.log_0_4_0.std or false) || + (log_0_3_9.use_std or false) || + (f.log_0_3_9.use_std or false); + }) [ log_0_4_0_features ]; + log_0_4_0 = { features?(log_0_4_0_features {}) }: log_0_4_0_ { + dependencies = mapFeatures features ([ cfg_if_0_1_2 ]); + features = mkFeatures (features.log_0_4_0 or {}); + }; + log_0_4_0_features = f: updateFeatures f (rec { + cfg_if_0_1_2.default = true; + log_0_4_0.default = (f.log_0_4_0.default or true); + }) [ cfg_if_0_1_2_features ]; + memchr_0_1_11 = { features?(memchr_0_1_11_features {}) }: memchr_0_1_11_ { + dependencies = mapFeatures features ([ libc_0_2_34 ]); + }; + memchr_0_1_11_features = f: updateFeatures f (rec { + libc_0_2_34.default = true; + memchr_0_1_11.default = (f.memchr_0_1_11.default or true); + }) [ libc_0_2_34_features ]; + nix_0_6_0 = { features?(nix_0_6_0_features {}) }: nix_0_6_0_ { + dependencies = mapFeatures features ([ bitflags_0_4_0 cfg_if_0_1_2 libc_0_2_34 void_1_0_2 ]); + buildDependencies = mapFeatures features ([ rustc_version_0_1_7 semver_0_1_20 ]); + features = mkFeatures (features.nix_0_6_0 or {}); + }; + nix_0_6_0_features = f: updateFeatures f (rec { + bitflags_0_4_0.default = true; + cfg_if_0_1_2.default = true; + libc_0_2_34.default = true; + nix_0_6_0.default = (f.nix_0_6_0.default or true); + rustc_version_0_1_7.default = true; + semver_0_1_20.default = true; + void_1_0_2.default = true; + }) [ bitflags_0_4_0_features cfg_if_0_1_2_features libc_0_2_34_features void_1_0_2_features rustc_version_0_1_7_features semver_0_1_20_features ]; + nix_0_9_0 = { features?(nix_0_9_0_features {}) }: nix_0_9_0_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 cfg_if_0_1_2 libc_0_2_34 void_1_0_2 ]); + }; + nix_0_9_0_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + cfg_if_0_1_2.default = true; + libc_0_2_34.default = true; + nix_0_9_0.default = (f.nix_0_9_0.default or true); + void_1_0_2.default = true; + }) [ bitflags_0_9_1_features cfg_if_0_1_2_features libc_0_2_34_features void_1_0_2_features ]; + num_traits_0_1_41 = { features?(num_traits_0_1_41_features {}) }: num_traits_0_1_41_ {}; + num_traits_0_1_41_features = f: updateFeatures f (rec { + num_traits_0_1_41.default = (f.num_traits_0_1_41.default or true); + }) []; + ordermap_0_3_2 = { features?(ordermap_0_3_2_features {}) }: ordermap_0_3_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.ordermap_0_3_2 or {}); + }; + ordermap_0_3_2_features = f: updateFeatures f (rec { + ordermap_0_3_2.default = (f.ordermap_0_3_2.default or true); + ordermap_0_3_2.serde = + (f.ordermap_0_3_2.serde or false) || + (f.ordermap_0_3_2.serde-1 or false) || + (ordermap_0_3_2.serde-1 or false); + }) []; + petgraph_0_4_10 = { features?(petgraph_0_4_10_features {}) }: petgraph_0_4_10_ { + dependencies = mapFeatures features ([ fixedbitset_0_1_8 ] + ++ (if features.petgraph_0_4_10.ordermap or false then [ ordermap_0_3_2 ] else [])); + features = mkFeatures (features.petgraph_0_4_10 or {}); + }; + petgraph_0_4_10_features = f: updateFeatures f (rec { + fixedbitset_0_1_8.default = true; + ordermap_0_3_2.default = true; + petgraph_0_4_10.default = (f.petgraph_0_4_10.default or true); + petgraph_0_4_10.generate = + (f.petgraph_0_4_10.generate or false) || + (f.petgraph_0_4_10.unstable or false) || + (petgraph_0_4_10.unstable or false); + petgraph_0_4_10.graphmap = + (f.petgraph_0_4_10.graphmap or false) || + (f.petgraph_0_4_10.all or false) || + (petgraph_0_4_10.all or false) || + (f.petgraph_0_4_10.default or false) || + (petgraph_0_4_10.default or false); + petgraph_0_4_10.ordermap = + (f.petgraph_0_4_10.ordermap or false) || + (f.petgraph_0_4_10.graphmap or false) || + (petgraph_0_4_10.graphmap or false); + petgraph_0_4_10.quickcheck = + (f.petgraph_0_4_10.quickcheck or false) || + (f.petgraph_0_4_10.all or false) || + (petgraph_0_4_10.all or false); + petgraph_0_4_10.serde = + (f.petgraph_0_4_10.serde or false) || + (f.petgraph_0_4_10.serde-1 or false) || + (petgraph_0_4_10.serde-1 or false); + petgraph_0_4_10.serde_derive = + (f.petgraph_0_4_10.serde_derive or false) || + (f.petgraph_0_4_10.serde-1 or false) || + (petgraph_0_4_10.serde-1 or false); + petgraph_0_4_10.stable_graph = + (f.petgraph_0_4_10.stable_graph or false) || + (f.petgraph_0_4_10.all or false) || + (petgraph_0_4_10.all or false) || + (f.petgraph_0_4_10.default or false) || + (petgraph_0_4_10.default or false); + petgraph_0_4_10.unstable = + (f.petgraph_0_4_10.unstable or false) || + (f.petgraph_0_4_10.all or false) || + (petgraph_0_4_10.all or false); + }) [ fixedbitset_0_1_8_features ordermap_0_3_2_features ]; + phf_0_7_21 = { features?(phf_0_7_21_features {}) }: phf_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 ]); + features = mkFeatures (features.phf_0_7_21 or {}); + }; + phf_0_7_21_features = f: updateFeatures f (rec { + phf_0_7_21.default = (f.phf_0_7_21.default or true); + phf_shared_0_7_21.core = + (f.phf_shared_0_7_21.core or false) || + (phf_0_7_21.core or false) || + (f.phf_0_7_21.core or false); + phf_shared_0_7_21.default = true; + phf_shared_0_7_21.unicase = + (f.phf_shared_0_7_21.unicase or false) || + (phf_0_7_21.unicase or false) || + (f.phf_0_7_21.unicase or false); + }) [ phf_shared_0_7_21_features ]; + phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ { + dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]); + }; + phf_codegen_0_7_21_features = f: updateFeatures f (rec { + phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true); + phf_generator_0_7_21.default = true; + phf_shared_0_7_21.default = true; + }) [ phf_generator_0_7_21_features phf_shared_0_7_21_features ]; + phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_19 ]); + }; + phf_generator_0_7_21_features = f: updateFeatures f (rec { + phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true); + phf_shared_0_7_21.default = true; + rand_0_3_19.default = true; + }) [ phf_shared_0_7_21_features rand_0_3_19_features ]; + phf_shared_0_7_21 = { features?(phf_shared_0_7_21_features {}) }: phf_shared_0_7_21_ { + dependencies = mapFeatures features ([ siphasher_0_2_2 ]); + features = mkFeatures (features.phf_shared_0_7_21 or {}); + }; + phf_shared_0_7_21_features = f: updateFeatures f (rec { + phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true); + siphasher_0_2_2.default = true; + }) [ siphasher_0_2_2_features ]; + pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; + pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); + }) []; + rand_0_3_19 = { features?(rand_0_3_19_features {}) }: rand_0_3_19_ { + dependencies = mapFeatures features ([ libc_0_2_34 ]) + ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_2 ]) else []); + features = mkFeatures (features.rand_0_3_19 or {}); + }; + rand_0_3_19_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_2.default = true; + libc_0_2_34.default = true; + rand_0_3_19.default = (f.rand_0_3_19.default or true); + rand_0_3_19.i128_support = + (f.rand_0_3_19.i128_support or false) || + (f.rand_0_3_19.nightly or false) || + (rand_0_3_19.nightly or false); + }) [ libc_0_2_34_features fuchsia_zircon_0_3_2_features ]; + regex_0_1_80 = { features?(regex_0_1_80_features {}) }: regex_0_1_80_ { + dependencies = mapFeatures features ([ aho_corasick_0_5_3 memchr_0_1_11 regex_syntax_0_3_9 thread_local_0_2_7 utf8_ranges_0_1_3 ]); + features = mkFeatures (features.regex_0_1_80 or {}); + }; + regex_0_1_80_features = f: updateFeatures f (rec { + aho_corasick_0_5_3.default = true; + memchr_0_1_11.default = true; + regex_0_1_80.default = (f.regex_0_1_80.default or true); + regex_0_1_80.simd = + (f.regex_0_1_80.simd or false) || + (f.regex_0_1_80.simd-accel or false) || + (regex_0_1_80.simd-accel or false); + regex_syntax_0_3_9.default = true; + thread_local_0_2_7.default = true; + utf8_ranges_0_1_3.default = true; + }) [ aho_corasick_0_5_3_features memchr_0_1_11_features regex_syntax_0_3_9_features thread_local_0_2_7_features utf8_ranges_0_1_3_features ]; + regex_syntax_0_3_9 = { features?(regex_syntax_0_3_9_features {}) }: regex_syntax_0_3_9_ {}; + regex_syntax_0_3_9_features = f: updateFeatures f (rec { + regex_syntax_0_3_9.default = (f.regex_syntax_0_3_9.default or true); + }) []; + rlua_0_9_7 = { features?(rlua_0_9_7_features {}) }: rlua_0_9_7_ { + dependencies = mapFeatures features ([ libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ ] + ++ (if features.rlua_0_9_7.gcc or false then [ gcc_0_3_54 ] else [])); + features = mkFeatures (features.rlua_0_9_7 or {}); + }; + rlua_0_9_7_features = f: updateFeatures f (rec { + gcc_0_3_54.default = true; + libc_0_2_34.default = true; + rlua_0_9_7.builtin-lua = + (f.rlua_0_9_7.builtin-lua or false) || + (f.rlua_0_9_7.default or false) || + (rlua_0_9_7.default or false); + rlua_0_9_7.default = (f.rlua_0_9_7.default or true); + rlua_0_9_7.gcc = + (f.rlua_0_9_7.gcc or false) || + (f.rlua_0_9_7.builtin-lua or false) || + (rlua_0_9_7.builtin-lua or false); + }) [ libc_0_2_34_features gcc_0_3_54_features ]; + rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {}; + rustc_serialize_0_3_24_features = f: updateFeatures f (rec { + rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true); + }) []; + rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ { + dependencies = mapFeatures features ([ semver_0_1_20 ]); + }; + rustc_version_0_1_7_features = f: updateFeatures f (rec { + rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true); + semver_0_1_20.default = true; + }) [ semver_0_1_20_features ]; + rustwlc_0_7_0 = { features?(rustwlc_0_7_0_features {}) }: rustwlc_0_7_0_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 libc_0_2_34 ] + ++ (if features.rustwlc_0_7_0.wayland-sys or false then [ wayland_sys_0_6_0 ] else [])); + features = mkFeatures (features.rustwlc_0_7_0 or {}); + }; + rustwlc_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + libc_0_2_34.default = true; + rustwlc_0_7_0.default = (f.rustwlc_0_7_0.default or true); + rustwlc_0_7_0.wayland-sys = + (f.rustwlc_0_7_0.wayland-sys or false) || + (f.rustwlc_0_7_0.wlc-wayland or false) || + (rustwlc_0_7_0.wlc-wayland or false); + wayland_sys_0_6_0.default = true; + wayland_sys_0_6_0.server = true; + }) [ bitflags_0_7_0_features libc_0_2_34_features wayland_sys_0_6_0_features ]; + semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {}; + semver_0_1_20_features = f: updateFeatures f (rec { + semver_0_1_20.default = (f.semver_0_1_20.default or true); + }) []; + serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_0_9_15 or {}); + }; + serde_0_9_15_features = f: updateFeatures f (rec { + serde_0_9_15.alloc = + (f.serde_0_9_15.alloc or false) || + (f.serde_0_9_15.collections or false) || + (serde_0_9_15.collections or false); + serde_0_9_15.default = (f.serde_0_9_15.default or true); + serde_0_9_15.serde_derive = + (f.serde_0_9_15.serde_derive or false) || + (f.serde_0_9_15.derive or false) || + (serde_0_9_15.derive or false) || + (f.serde_0_9_15.playground or false) || + (serde_0_9_15.playground or false); + serde_0_9_15.std = + (f.serde_0_9_15.std or false) || + (f.serde_0_9_15.default or false) || + (serde_0_9_15.default or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + serde_0_9_15.unstable = + (f.serde_0_9_15.unstable or false) || + (f.serde_0_9_15.alloc or false) || + (serde_0_9_15.alloc or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + }) []; + serde_json_0_9_10 = { features?(serde_json_0_9_10_features {}) }: serde_json_0_9_10_ { + dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_41 serde_0_9_15 ]); + features = mkFeatures (features.serde_json_0_9_10 or {}); + }; + serde_json_0_9_10_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = true; + itoa_0_3_4.default = true; + num_traits_0_1_41.default = true; + serde_0_9_15.default = true; + serde_json_0_9_10.default = (f.serde_json_0_9_10.default or true); + serde_json_0_9_10.linked-hash-map = + (f.serde_json_0_9_10.linked-hash-map or false) || + (f.serde_json_0_9_10.preserve_order or false) || + (serde_json_0_9_10.preserve_order or false); + }) [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_41_features serde_0_9_15_features ]; + siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { + dependencies = mapFeatures features ([]); + }; + siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); + }) []; + target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ { + dependencies = mapFeatures features ([ phf_0_7_21 ] + ++ (if features.target_build_utils_0_3_1.serde_json or false then [ serde_json_0_9_10 ] else [])); + buildDependencies = mapFeatures features ([ phf_codegen_0_7_21 ]); + features = mkFeatures (features.target_build_utils_0_3_1 or {}); + }; + target_build_utils_0_3_1_features = f: updateFeatures f (rec { + phf_0_7_21.default = true; + phf_codegen_0_7_21.default = true; + serde_json_0_9_10.default = true; + target_build_utils_0_3_1.default = (f.target_build_utils_0_3_1.default or true); + target_build_utils_0_3_1.serde_json = + (f.target_build_utils_0_3_1.serde_json or false) || + (f.target_build_utils_0_3_1.default or false) || + (target_build_utils_0_3_1.default or false); + }) [ phf_0_7_21_features serde_json_0_9_10_features phf_codegen_0_7_21_features ]; + thread_id_2_0_0 = { features?(thread_id_2_0_0_features {}) }: thread_id_2_0_0_ { + dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_34 ]); + }; + thread_id_2_0_0_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_34.default = true; + thread_id_2_0_0.default = (f.thread_id_2_0_0.default or true); + }) [ kernel32_sys_0_2_2_features libc_0_2_34_features ]; + thread_local_0_2_7 = { features?(thread_local_0_2_7_features {}) }: thread_local_0_2_7_ { + dependencies = mapFeatures features ([ thread_id_2_0_0 ]); + }; + thread_local_0_2_7_features = f: updateFeatures f (rec { + thread_id_2_0_0.default = true; + thread_local_0_2_7.default = (f.thread_local_0_2_7.default or true); + }) [ thread_id_2_0_0_features ]; + token_store_0_1_2 = { features?(token_store_0_1_2_features {}) }: token_store_0_1_2_ {}; + token_store_0_1_2_features = f: updateFeatures f (rec { + token_store_0_1_2.default = (f.token_store_0_1_2.default or true); + }) []; + utf8_ranges_0_1_3 = { features?(utf8_ranges_0_1_3_features {}) }: utf8_ranges_0_1_3_ {}; + utf8_ranges_0_1_3_features = f: updateFeatures f (rec { + utf8_ranges_0_1_3.default = (f.utf8_ranges_0_1_3.default or true); + }) []; + uuid_0_3_1 = { features?(uuid_0_3_1_features {}) }: uuid_0_3_1_ { + dependencies = mapFeatures features ([ ] + ++ (if features.uuid_0_3_1.rand or false then [ rand_0_3_19 ] else []) + ++ (if features.uuid_0_3_1.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else [])); + features = mkFeatures (features.uuid_0_3_1 or {}); + }; + uuid_0_3_1_features = f: updateFeatures f (rec { + rand_0_3_19.default = true; + rustc_serialize_0_3_24.default = true; + uuid_0_3_1.default = (f.uuid_0_3_1.default or true); + uuid_0_3_1.rand = + (f.uuid_0_3_1.rand or false) || + (f.uuid_0_3_1.v4 or false) || + (uuid_0_3_1.v4 or false); + uuid_0_3_1.sha1 = + (f.uuid_0_3_1.sha1 or false) || + (f.uuid_0_3_1.v5 or false) || + (uuid_0_3_1.v5 or false); + }) [ rand_0_3_19_features rustc_serialize_0_3_24_features ]; + void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { + features = mkFeatures (features.void_1_0_2 or {}); + }; + void_1_0_2_features = f: updateFeatures f (rec { + void_1_0_2.default = (f.void_1_0_2.default or true); + void_1_0_2.std = + (f.void_1_0_2.std or false) || + (f.void_1_0_2.default or false) || + (void_1_0_2.default or false); + }) []; + way_cooler_0_8_0 = { features?(way_cooler_0_8_0_features {}) }: way_cooler_0_8_0_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 cairo_rs_0_2_0 cairo_sys_rs_0_4_0 dbus_0_4_1 dbus_macros_0_0_6 env_logger_0_3_5 gdk_pixbuf_0_2_0 getopts_0_2_15 glib_0_3_1 json_macro_0_1_1 lazy_static_0_2_11 log_0_3_9 nix_0_6_0 petgraph_0_4_10 rlua_0_9_7 rustc_serialize_0_3_24 rustwlc_0_7_0 uuid_0_3_1 wayland_server_0_12_4 wayland_sys_0_12_4 xcb_0_8_1 ]); + buildDependencies = mapFeatures features ([ wayland_scanner_0_12_4 ]); + features = mkFeatures (features.way_cooler_0_8_0 or {}); + }; + way_cooler_0_8_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + cairo_rs_0_2_0.default = true; + cairo_sys_rs_0_4_0.default = true; + dbus_0_4_1.default = true; + dbus_macros_0_0_6.default = true; + env_logger_0_3_5.default = true; + gdk_pixbuf_0_2_0.default = true; + getopts_0_2_15.default = true; + glib_0_3_1.default = true; + json_macro_0_1_1.default = true; + lazy_static_0_2_11.default = true; + log_0_3_9.default = true; + nix_0_6_0.default = true; + petgraph_0_4_10.default = true; + rlua_0_9_7.builtin-lua = + (f.rlua_0_9_7.builtin-lua or false) || + (way_cooler_0_8_0.builtin-lua or false) || + (f.way_cooler_0_8_0.builtin-lua or false); + rlua_0_9_7.default = (f.rlua_0_9_7.default or false); + rustc_serialize_0_3_24.default = true; + rustwlc_0_7_0.default = true; + rustwlc_0_7_0.static-wlc = + (f.rustwlc_0_7_0.static-wlc or false) || + (way_cooler_0_8_0.static-wlc or false) || + (f.way_cooler_0_8_0.static-wlc or false); + rustwlc_0_7_0.wlc-wayland = true; + uuid_0_3_1.default = true; + uuid_0_3_1.rustc-serialize = true; + uuid_0_3_1.v4 = true; + way_cooler_0_8_0.default = (f.way_cooler_0_8_0.default or true); + wayland_scanner_0_12_4.default = true; + wayland_server_0_12_4.default = true; + wayland_sys_0_12_4.client = true; + wayland_sys_0_12_4.default = true; + wayland_sys_0_12_4.dlopen = true; + xcb_0_8_1.default = true; + xcb_0_8_1.xkb = true; + }) [ bitflags_0_7_0_features cairo_rs_0_2_0_features cairo_sys_rs_0_4_0_features dbus_0_4_1_features dbus_macros_0_0_6_features env_logger_0_3_5_features gdk_pixbuf_0_2_0_features getopts_0_2_15_features glib_0_3_1_features json_macro_0_1_1_features lazy_static_0_2_11_features log_0_3_9_features nix_0_6_0_features petgraph_0_4_10_features rlua_0_9_7_features rustc_serialize_0_3_24_features rustwlc_0_7_0_features uuid_0_3_1_features wayland_server_0_12_4_features wayland_sys_0_12_4_features xcb_0_8_1_features wayland_scanner_0_12_4_features ]; + wayland_scanner_0_12_4 = { features?(wayland_scanner_0_12_4_features {}) }: wayland_scanner_0_12_4_ { + dependencies = mapFeatures features ([ xml_rs_0_7_0 ]); + }; + wayland_scanner_0_12_4_features = f: updateFeatures f (rec { + wayland_scanner_0_12_4.default = (f.wayland_scanner_0_12_4.default or true); + xml_rs_0_7_0.default = true; + }) [ xml_rs_0_7_0_features ]; + wayland_server_0_12_4 = { features?(wayland_server_0_12_4_features {}) }: wayland_server_0_12_4_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 libc_0_2_34 nix_0_9_0 token_store_0_1_2 wayland_sys_0_12_4 ]); + buildDependencies = mapFeatures features ([ wayland_scanner_0_12_4 ]); + features = mkFeatures (features.wayland_server_0_12_4 or {}); + }; + wayland_server_0_12_4_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + libc_0_2_34.default = true; + nix_0_9_0.default = true; + token_store_0_1_2.default = true; + wayland_scanner_0_12_4.default = true; + wayland_server_0_12_4.default = (f.wayland_server_0_12_4.default or true); + wayland_sys_0_12_4.default = true; + wayland_sys_0_12_4.dlopen = + (f.wayland_sys_0_12_4.dlopen or false) || + (wayland_server_0_12_4.dlopen or false) || + (f.wayland_server_0_12_4.dlopen or false); + wayland_sys_0_12_4.server = true; + }) [ bitflags_1_0_1_features libc_0_2_34_features nix_0_9_0_features token_store_0_1_2_features wayland_sys_0_12_4_features wayland_scanner_0_12_4_features ]; + wayland_sys_0_6_0 = { features?(wayland_sys_0_6_0_features {}) }: wayland_sys_0_6_0_ { + dependencies = mapFeatures features ([ dlib_0_3_1 ] + ++ (if features.wayland_sys_0_6_0.libc or false then [ libc_0_2_34 ] else [])); + features = mkFeatures (features.wayland_sys_0_6_0 or {}); + }; + wayland_sys_0_6_0_features = f: updateFeatures f (rec { + dlib_0_3_1.default = true; + dlib_0_3_1.dlopen = + (f.dlib_0_3_1.dlopen or false) || + (wayland_sys_0_6_0.dlopen or false) || + (f.wayland_sys_0_6_0.dlopen or false); + libc_0_2_34.default = true; + wayland_sys_0_6_0.default = (f.wayland_sys_0_6_0.default or true); + wayland_sys_0_6_0.lazy_static = + (f.wayland_sys_0_6_0.lazy_static or false) || + (f.wayland_sys_0_6_0.dlopen or false) || + (wayland_sys_0_6_0.dlopen or false); + wayland_sys_0_6_0.libc = + (f.wayland_sys_0_6_0.libc or false) || + (f.wayland_sys_0_6_0.server or false) || + (wayland_sys_0_6_0.server or false); + }) [ dlib_0_3_1_features libc_0_2_34_features ]; + wayland_sys_0_9_10 = { features?(wayland_sys_0_9_10_features {}) }: wayland_sys_0_9_10_ { + dependencies = mapFeatures features ([ dlib_0_3_1 ] + ++ (if features.wayland_sys_0_9_10.lazy_static or false then [ lazy_static_0_2_11 ] else []) + ++ (if features.wayland_sys_0_9_10.libc or false then [ libc_0_2_34 ] else [])); + features = mkFeatures (features.wayland_sys_0_9_10 or {}); + }; + wayland_sys_0_9_10_features = f: updateFeatures f (rec { + dlib_0_3_1.default = true; + dlib_0_3_1.dlopen = + (f.dlib_0_3_1.dlopen or false) || + (wayland_sys_0_9_10.dlopen or false) || + (f.wayland_sys_0_9_10.dlopen or false); + lazy_static_0_2_11.default = true; + libc_0_2_34.default = true; + wayland_sys_0_9_10.default = (f.wayland_sys_0_9_10.default or true); + wayland_sys_0_9_10.lazy_static = + (f.wayland_sys_0_9_10.lazy_static or false) || + (f.wayland_sys_0_9_10.dlopen or false) || + (wayland_sys_0_9_10.dlopen or false); + wayland_sys_0_9_10.libc = + (f.wayland_sys_0_9_10.libc or false) || + (f.wayland_sys_0_9_10.server or false) || + (wayland_sys_0_9_10.server or false); + }) [ dlib_0_3_1_features lazy_static_0_2_11_features libc_0_2_34_features ]; + wayland_sys_0_12_4 = { features?(wayland_sys_0_12_4_features {}) }: wayland_sys_0_12_4_ { + dependencies = mapFeatures features ([ dlib_0_4_0 ] + ++ (if features.wayland_sys_0_12_4.lazy_static or false then [ lazy_static_0_2_11 ] else []) + ++ (if features.wayland_sys_0_12_4.libc or false then [ libc_0_2_34 ] else [])); + features = mkFeatures (features.wayland_sys_0_12_4 or {}); + }; + wayland_sys_0_12_4_features = f: updateFeatures f (rec { + dlib_0_4_0.default = true; + dlib_0_4_0.dlopen = + (f.dlib_0_4_0.dlopen or false) || + (wayland_sys_0_12_4.dlopen or false) || + (f.wayland_sys_0_12_4.dlopen or false); + lazy_static_0_2_11.default = true; + libc_0_2_34.default = true; + wayland_sys_0_12_4.default = (f.wayland_sys_0_12_4.default or true); + wayland_sys_0_12_4.lazy_static = + (f.wayland_sys_0_12_4.lazy_static or false) || + (f.wayland_sys_0_12_4.dlopen or false) || + (wayland_sys_0_12_4.dlopen or false); + wayland_sys_0_12_4.libc = + (f.wayland_sys_0_12_4.libc or false) || + (f.wayland_sys_0_12_4.server or false) || + (wayland_sys_0_12_4.server or false); + }) [ dlib_0_4_0_features lazy_static_0_2_11_features libc_0_2_34_features ]; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; + xcb_0_8_1 = { features?(xcb_0_8_1_features {}) }: xcb_0_8_1_ { + dependencies = mapFeatures features ([ libc_0_2_34 log_0_3_9 ]); + buildDependencies = mapFeatures features ([ libc_0_2_34 ]); + features = mkFeatures (features.xcb_0_8_1 or {}); + }; + xcb_0_8_1_features = f: updateFeatures f (rec { + libc_0_2_34.default = true; + log_0_3_9.default = true; + xcb_0_8_1.composite = + (f.xcb_0_8_1.composite or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.damage = + (f.xcb_0_8_1.damage or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.default = (f.xcb_0_8_1.default or true); + xcb_0_8_1.dpms = + (f.xcb_0_8_1.dpms or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.dri2 = + (f.xcb_0_8_1.dri2 or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.dri3 = + (f.xcb_0_8_1.dri3 or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.glx = + (f.xcb_0_8_1.glx or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.randr = + (f.xcb_0_8_1.randr or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.record = + (f.xcb_0_8_1.record or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.render = + (f.xcb_0_8_1.render or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false) || + (f.xcb_0_8_1.present or false) || + (xcb_0_8_1.present or false) || + (f.xcb_0_8_1.randr or false) || + (xcb_0_8_1.randr or false) || + (f.xcb_0_8_1.xfixes or false) || + (xcb_0_8_1.xfixes or false); + xcb_0_8_1.res = + (f.xcb_0_8_1.res or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.screensaver = + (f.xcb_0_8_1.screensaver or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.shape = + (f.xcb_0_8_1.shape or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false) || + (f.xcb_0_8_1.xfixes or false) || + (xcb_0_8_1.xfixes or false); + xcb_0_8_1.shm = + (f.xcb_0_8_1.shm or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false) || + (f.xcb_0_8_1.xv or false) || + (xcb_0_8_1.xv or false); + xcb_0_8_1.sync = + (f.xcb_0_8_1.sync or false) || + (f.xcb_0_8_1.present or false) || + (xcb_0_8_1.present or false); + xcb_0_8_1.thread = + (f.xcb_0_8_1.thread or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xevie = + (f.xcb_0_8_1.xevie or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xf86dri = + (f.xcb_0_8_1.xf86dri or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xfixes = + (f.xcb_0_8_1.xfixes or false) || + (f.xcb_0_8_1.composite or false) || + (xcb_0_8_1.composite or false) || + (f.xcb_0_8_1.damage or false) || + (xcb_0_8_1.damage or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false) || + (f.xcb_0_8_1.present or false) || + (xcb_0_8_1.present or false) || + (f.xcb_0_8_1.xinput or false) || + (xcb_0_8_1.xinput or false); + xcb_0_8_1.xinerama = + (f.xcb_0_8_1.xinerama or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xkb = + (f.xcb_0_8_1.xkb or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xlib_xcb = + (f.xcb_0_8_1.xlib_xcb or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xprint = + (f.xcb_0_8_1.xprint or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xselinux = + (f.xcb_0_8_1.xselinux or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xtest = + (f.xcb_0_8_1.xtest or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xv = + (f.xcb_0_8_1.xv or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false) || + (f.xcb_0_8_1.xvmc or false) || + (xcb_0_8_1.xvmc or false); + xcb_0_8_1.xvmc = + (f.xcb_0_8_1.xvmc or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + }) [ libc_0_2_34_features log_0_3_9_features libc_0_2_34_features ]; + xml_rs_0_7_0 = { features?(xml_rs_0_7_0_features {}) }: xml_rs_0_7_0_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 ]); + }; + xml_rs_0_7_0_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + xml_rs_0_7_0.default = (f.xml_rs_0_7_0.default or true); + }) [ bitflags_1_0_1_features ]; +} diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix new file mode 100644 index 0000000000000000000000000000000000000000..d1c0993982ab02b50c97cc057c1b2873306bf4c0 --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix @@ -0,0 +1,1379 @@ +# Generated by carnix 0.6.5: carnix -o wc-bg.nix Cargo.lock +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); +in +rec { + wc_bg = f: wc_bg_0_3_0 { features = wc_bg_0_3_0_features { wc_bg_0_3_0 = f; }; }; + ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + inherit dependencies buildDependencies features; + }; + atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.3"; + authors = [ "softprops " ]; + sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.9.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; + inherit dependencies buildDependencies features; + }; + byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "0.5.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx"; + inherit dependencies buildDependencies features; + }; + byteorder_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.1.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp"; + inherit dependencies buildDependencies features; + }; + cc_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1s5ha0k6cdy1049a5kpzvhnjc9hjvi18zrcr5dmbqpd03ag751g1"; + inherit dependencies buildDependencies features; + }; + clap_2_26_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.26.2"; + authors = [ "Kevin K. " ]; + sha256 = "0njvc0b7m11yym25jrr8h47nb3k3lpzzafjf22y33c5p4rw7fn2d"; + inherit dependencies buildDependencies features; + }; + coco_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "coco"; + version = "0.1.1"; + authors = [ "Stjepan Glavina " ]; + sha256 = "0hvj4jaj9y6i38c4dkii8nqq98cgx3kyx78cjqkdvk0aqq5sfr94"; + inherit dependencies buildDependencies features; + }; + color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "color_quant"; + version = "1.0.0"; + authors = [ "nwin " ]; + sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj"; + inherit dependencies buildDependencies features; + }; + dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.3.1"; + authors = [ "Victor Berger " ]; + sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; + inherit dependencies buildDependencies features; + }; + either_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "either"; + version = "1.2.0"; + authors = [ "bluss" ]; + sha256 = "0l72xaf1kwzgbl3andf3d2ggz7km9059rbmp90iywww8inlnqppp"; + inherit dependencies buildDependencies features; + }; + enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "enum_primitive"; + version = "0.1.1"; + authors = [ "Anders Kaseorg " ]; + sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y"; + inherit dependencies buildDependencies features; + }; + flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "flate2"; + version = "0.2.20"; + authors = [ "Alex Crichton " ]; + sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.2.1"; + authors = [ "Raph Levien " ]; + sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.2.0"; + authors = [ "Raph Levien " ]; + sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w"; + inherit dependencies buildDependencies features; + }; + futures_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "futures"; + version = "0.1.16"; + authors = [ "Alex Crichton " ]; + sha256 = "0ndk8cl6l600a95q8il2c3y38jz50nhfsczps0nziadqdd45gy2b"; + inherit dependencies buildDependencies features; + }; + gif_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gif"; + version = "0.9.2"; + authors = [ "nwin " ]; + sha256 = "0dl76jrn6127w3bdg2b58p5psf8fpnbzdxdkw1i35ac8dn4vxcqa"; + inherit dependencies buildDependencies features; + }; + glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glob"; + version = "0.2.11"; + authors = [ "The Rust Project Developers" ]; + sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; + inherit dependencies buildDependencies features; + }; + image_0_10_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "image"; + version = "0.10.4"; + authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ]; + sha256 = "1pwrs7k5760b38i1lg872x9q2zc6xvhs7mjhlzvjnr5p85zx2fbw"; + libPath = "./src/lib.rs"; + inherit dependencies buildDependencies features; + }; + inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "inflate"; + version = "0.1.1"; + authors = [ "nwin " ]; + sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.4"; + authors = [ "David Tolnay " ]; + sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + inherit dependencies buildDependencies features; + }; + jpeg_decoder_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "jpeg-decoder"; + version = "0.1.13"; + authors = [ "Ulf Nilsson " ]; + sha256 = "0w16gbywlm9p0p3wx34b85q4d1izrx89afcsxlc6g11cx2js4fa2"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.9"; + authors = [ "Marvin Löbel " ]; + sha256 = "08ldzr5292y3hvi6l6v8l4i6v95lm1aysmnfln65h10sqrfh6iw7"; + inherit dependencies buildDependencies features; + }; + libc_0_2_32_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.32"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1i8njlar6v9qvmkyfvwzhxrvkqw6ijp8fqdnya5csqixxz18a532"; + inherit dependencies buildDependencies features; + }; + libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.3.4"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lzw"; + version = "0.10.0"; + authors = [ "nwin " ]; + sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb"; + inherit dependencies buildDependencies features; + }; + miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miniz-sys"; + version = "0.1.10"; + authors = [ "Alex Crichton " ]; + sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln"; + libPath = "lib.rs"; + libName = "miniz_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + num_bigint_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-bigint"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0pkxd9mb4chdbipprxjc8ll7kjh79n278s2z663zmd80yg5xi788"; + inherit dependencies buildDependencies features; + }; + num_integer_0_1_35_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.35"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc"; + inherit dependencies buildDependencies features; + }; + num_iter_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.34"; + authors = [ "The Rust Project Developers" ]; + sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9"; + inherit dependencies buildDependencies features; + }; + num_rational_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-rational"; + version = "0.1.39"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1qsacdfp97zgpajc2pgbrbga3yag1f0k7yz0gi78vd165gxdwk3m"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.7.0"; + authors = [ "Sean McArthur " ]; + sha256 = "0231xmd65ma3pqfiw8pkv9dvm9x708z4xlrwp3i0sgiwv408dz3f"; + inherit dependencies buildDependencies features; + }; + phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; + inherit dependencies buildDependencies features; + }; + phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; + inherit dependencies buildDependencies features; + }; + phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + png_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "png"; + version = "0.5.2"; + authors = [ "nwin " ]; + sha256 = "1pgann3f1ysgf8y1acw86v4s3ji1xk85ri353biyvh4i1cpn1g3q"; + inherit dependencies buildDependencies features; + }; + rand_0_3_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.17"; + authors = [ "The Rust Project Developers" ]; + sha256 = "06ra3pr36dlyq3kp5lbia8xnw5g0zsys2d69frr7y6df5hhb1r8j"; + inherit dependencies buildDependencies features; + }; + rayon_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon"; + version = "0.8.2"; + authors = [ "Niko Matsakis " "Josh Stone " ]; + sha256 = "0d0mddg1k75hb9138pn8lysy2095jijrinskqbpgfr73s0jx6dq8"; + inherit dependencies buildDependencies features; + }; + rayon_core_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon-core"; + version = "1.2.1"; + authors = [ "Niko Matsakis " "Josh Stone " ]; + sha256 = "12xv2r0dqrgvla24bl5mfvcw0599dlhrj0mx620nq95nyds753kk"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + redox_syscall_0_1_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.31"; + authors = [ "Jeremy Soller " ]; + sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4"; + libName = "syscall"; + inherit dependencies buildDependencies features; + }; + redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-serialize"; + version = "0.3.24"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn"; + inherit dependencies buildDependencies features; + }; + scoped_threadpool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.8"; + authors = [ "Marvin Löbel " ]; + sha256 = "1al42hqbbijpah9bc6hw9c49nhnyrc0sj274ja1q3k9305c3s5a6"; + inherit dependencies buildDependencies features; + }; + scopeguard_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scopeguard"; + version = "0.3.2"; + authors = [ "bluss" ]; + sha256 = "0xlvfawva4fnp6kwr5xjwf0q2d1w6di81nhfby1sa55xj1ia5zs2"; + inherit dependencies buildDependencies features; + }; + serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "0.9.15"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b"; + inherit dependencies buildDependencies features; + }; + serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "0.9.10"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; + inherit dependencies buildDependencies features; + }; + siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + authors = [ "Frank Denis " ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "target_build_utils"; + version = "0.3.1"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + tempfile_2_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempfile"; + version = "2.2.0"; + authors = [ "Steven Allen " ]; + sha256 = "1z3l901ipvi0s0mdppw4lwfa77ydb22rfnf6y9sh0pifj7ah5drf"; + inherit dependencies buildDependencies features; + }; + term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "term_size"; + version = "0.3.0"; + authors = [ "Kevin K. " "Benjamin Sago " ]; + sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs"; + inherit dependencies buildDependencies features; + }; + termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + inherit dependencies buildDependencies features; + }; + textwrap_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "textwrap"; + version = "0.8.0"; + authors = [ "Martin Geisler " ]; + sha256 = "02j8apii1032cvp9fwrxw4pf11xb287j2n1iv1iixp8yh6vzrq41"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; + inherit dependencies buildDependencies features; + }; + way_cooler_client_helpers_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "way-cooler-client-helpers"; + version = "0.1.0"; + authors = [ "Timidger " ]; + sha256 = "0749lh5crd0rhq4dxij9mb3y5902laazjd01l6ci5782bjfk4s39"; + inherit dependencies buildDependencies features; + }; + wayland_client_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-client"; + version = "0.9.10"; + authors = [ "Victor Berger " ]; + sha256 = "1cs7zwvqahiysnfqfask96zpfr2bp47dlwwwd9ap8ccvcjbspj67"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_scanner_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-scanner"; + version = "0.9.10"; + authors = [ "Victor Berger " ]; + sha256 = "0vhnj3vfnrknvdmy72pjh7dck5q5sz1v8kfr0qqzkqf0ylavvyb2"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.9.10"; + authors = [ "Victor Berger " ]; + sha256 = "011q7lfii222whvif39asvryl1sf3rc1fxp8qs8gh84kr4mna0k8"; + inherit dependencies buildDependencies features; + }; + wc_bg_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wc-bg"; + version = "0.3.0"; + authors = [ "Timidger " ]; + sha256 = "1jywymr80k96481vr6nyyqhlf2gj2n2zgvkwkny2m84v9n3pqn62"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + xml_rs_0_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xml-rs"; + version = "0.6.1"; + authors = [ "Vladimir Matveev " ]; + sha256 = "0adjwgmn061p60n81s52a9p26y2jdc20wvinsyw2nzmby5wvnbwk"; + libPath = "src/lib.rs"; + libName = "xml"; + crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; + inherit dependencies buildDependencies features; + }; + ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; + ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); + }) []; + atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ { + dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + atty_0_2_3_features = f: updateFeatures f (rec { + atty_0_2_3.default = (f.atty_0_2_3.default or true); + kernel32_sys_0_2_2.default = true; + libc_0_2_32.default = (f.libc_0_2_32.default or false); + termion_1_5_1.default = true; + winapi_0_2_8.default = true; + }) [ termion_1_5_1_features libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; + bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); + }) []; + bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { + features = mkFeatures (features.bitflags_0_9_1 or {}); + }; + bitflags_0_9_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); + bitflags_0_9_1.example_generated = + (f.bitflags_0_9_1.example_generated or false) || + (f.bitflags_0_9_1.default or false) || + (bitflags_0_9_1.default or false); + }) []; + byteorder_0_5_3 = { features?(byteorder_0_5_3_features {}) }: byteorder_0_5_3_ { + features = mkFeatures (features.byteorder_0_5_3 or {}); + }; + byteorder_0_5_3_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = (f.byteorder_0_5_3.default or true); + byteorder_0_5_3.std = + (f.byteorder_0_5_3.std or false) || + (f.byteorder_0_5_3.default or false) || + (byteorder_0_5_3.default or false); + }) []; + byteorder_1_1_0 = { features?(byteorder_1_1_0_features {}) }: byteorder_1_1_0_ { + features = mkFeatures (features.byteorder_1_1_0 or {}); + }; + byteorder_1_1_0_features = f: updateFeatures f (rec { + byteorder_1_1_0.default = (f.byteorder_1_1_0.default or true); + byteorder_1_1_0.std = + (f.byteorder_1_1_0.std or false) || + (f.byteorder_1_1_0.default or false) || + (byteorder_1_1_0.default or false); + }) []; + cc_1_0_0 = { features?(cc_1_0_0_features {}) }: cc_1_0_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.cc_1_0_0 or {}); + }; + cc_1_0_0_features = f: updateFeatures f (rec { + cc_1_0_0.default = (f.cc_1_0_0.default or true); + cc_1_0_0.rayon = + (f.cc_1_0_0.rayon or false) || + (f.cc_1_0_0.parallel or false) || + (cc_1_0_0.parallel or false); + }) []; + clap_2_26_2 = { features?(clap_2_26_2_features {}) }: clap_2_26_2_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 textwrap_0_8_0 unicode_width_0_1_4 vec_map_0_8_0 ] + ++ (if features.clap_2_26_2.ansi_term or false then [ ansi_term_0_9_0 ] else []) + ++ (if features.clap_2_26_2.atty or false then [ atty_0_2_3 ] else []) + ++ (if features.clap_2_26_2.strsim or false then [ strsim_0_6_0 ] else []) + ++ (if features.clap_2_26_2.term_size or false then [ term_size_0_3_0 ] else [])); + features = mkFeatures (features.clap_2_26_2 or {}); + }; + clap_2_26_2_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = true; + atty_0_2_3.default = true; + bitflags_0_9_1.default = true; + clap_2_26_2.ansi_term = + (f.clap_2_26_2.ansi_term or false) || + (f.clap_2_26_2.color or false) || + (clap_2_26_2.color or false); + clap_2_26_2.atty = + (f.clap_2_26_2.atty or false) || + (f.clap_2_26_2.color or false) || + (clap_2_26_2.color or false); + clap_2_26_2.clippy = + (f.clap_2_26_2.clippy or false) || + (f.clap_2_26_2.lints or false) || + (clap_2_26_2.lints or false); + clap_2_26_2.color = + (f.clap_2_26_2.color or false) || + (f.clap_2_26_2.default or false) || + (clap_2_26_2.default or false); + clap_2_26_2.default = (f.clap_2_26_2.default or true); + clap_2_26_2.strsim = + (f.clap_2_26_2.strsim or false) || + (f.clap_2_26_2.suggestions or false) || + (clap_2_26_2.suggestions or false); + clap_2_26_2.suggestions = + (f.clap_2_26_2.suggestions or false) || + (f.clap_2_26_2.default or false) || + (clap_2_26_2.default or false); + clap_2_26_2.term_size = + (f.clap_2_26_2.term_size or false) || + (f.clap_2_26_2.wrap_help or false) || + (clap_2_26_2.wrap_help or false); + clap_2_26_2.wrap_help = + (f.clap_2_26_2.wrap_help or false) || + (f.clap_2_26_2.default or false) || + (clap_2_26_2.default or false); + clap_2_26_2.yaml = + (f.clap_2_26_2.yaml or false) || + (f.clap_2_26_2.doc or false) || + (clap_2_26_2.doc or false); + clap_2_26_2.yaml-rust = + (f.clap_2_26_2.yaml-rust or false) || + (f.clap_2_26_2.yaml or false) || + (clap_2_26_2.yaml or false); + strsim_0_6_0.default = true; + term_size_0_3_0.default = true; + textwrap_0_8_0.default = true; + unicode_width_0_1_4.default = true; + vec_map_0_8_0.default = true; + }) [ ansi_term_0_9_0_features atty_0_2_3_features bitflags_0_9_1_features strsim_0_6_0_features term_size_0_3_0_features textwrap_0_8_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ]; + coco_0_1_1 = { features?(coco_0_1_1_features {}) }: coco_0_1_1_ { + dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]); + features = mkFeatures (features.coco_0_1_1 or {}); + }; + coco_0_1_1_features = f: updateFeatures f (rec { + coco_0_1_1.default = (f.coco_0_1_1.default or true); + either_1_2_0.default = true; + scopeguard_0_3_2.default = true; + }) [ either_1_2_0_features scopeguard_0_3_2_features ]; + color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; + color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); + }) []; + dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ { + dependencies = mapFeatures features ([ libloading_0_3_4 ]); + features = mkFeatures (features.dlib_0_3_1 or {}); + }; + dlib_0_3_1_features = f: updateFeatures f (rec { + dlib_0_3_1.default = (f.dlib_0_3_1.default or true); + libloading_0_3_4.default = true; + }) [ libloading_0_3_4_features ]; + dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; + dtoa_0_4_2_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); + }) []; + either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ { + features = mkFeatures (features.either_1_2_0 or {}); + }; + either_1_2_0_features = f: updateFeatures f (rec { + either_1_2_0.default = (f.either_1_2_0.default or true); + either_1_2_0.use_std = + (f.either_1_2_0.use_std or false) || + (f.either_1_2_0.default or false) || + (either_1_2_0.default or false); + }) []; + enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { + dependencies = mapFeatures features ([ num_traits_0_1_40 ]); + }; + enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); + num_traits_0_1_40.default = (f.num_traits_0_1_40.default or false); + }) [ num_traits_0_1_40_features ]; + flate2_0_2_20 = { features?(flate2_0_2_20_features {}) }: flate2_0_2_20_ { + dependencies = mapFeatures features ([ libc_0_2_32 ] + ++ (if features.flate2_0_2_20.miniz-sys or false then [ miniz_sys_0_1_10 ] else [])); + features = mkFeatures (features.flate2_0_2_20 or {}); + }; + flate2_0_2_20_features = f: updateFeatures f (rec { + flate2_0_2_20.default = (f.flate2_0_2_20.default or true); + flate2_0_2_20.futures = + (f.flate2_0_2_20.futures or false) || + (f.flate2_0_2_20.tokio or false) || + (flate2_0_2_20.tokio or false); + flate2_0_2_20.libz-sys = + (f.flate2_0_2_20.libz-sys or false) || + (f.flate2_0_2_20.zlib or false) || + (flate2_0_2_20.zlib or false); + flate2_0_2_20.miniz-sys = + (f.flate2_0_2_20.miniz-sys or false) || + (f.flate2_0_2_20.default or false) || + (flate2_0_2_20.default or false); + flate2_0_2_20.tokio-io = + (f.flate2_0_2_20.tokio-io or false) || + (f.flate2_0_2_20.tokio or false) || + (flate2_0_2_20.tokio or false); + libc_0_2_32.default = true; + miniz_sys_0_1_10.default = true; + }) [ libc_0_2_32_features miniz_sys_0_1_10_features ]; + fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ { + dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]); + }; + fuchsia_zircon_0_2_1_features = f: updateFeatures f (rec { + fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true); + fuchsia_zircon_sys_0_2_0.default = true; + }) [ fuchsia_zircon_sys_0_2_0_features ]; + fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 ]); + }; + fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true); + }) [ bitflags_0_7_0_features ]; + futures_0_1_16 = { features?(futures_0_1_16_features {}) }: futures_0_1_16_ { + features = mkFeatures (features.futures_0_1_16 or {}); + }; + futures_0_1_16_features = f: updateFeatures f (rec { + futures_0_1_16.default = (f.futures_0_1_16.default or true); + futures_0_1_16.use_std = + (f.futures_0_1_16.use_std or false) || + (f.futures_0_1_16.default or false) || + (futures_0_1_16.default or false); + futures_0_1_16.with-deprecated = + (f.futures_0_1_16.with-deprecated or false) || + (f.futures_0_1_16.default or false) || + (futures_0_1_16.default or false); + }) []; + gif_0_9_2 = { features?(gif_0_9_2_features {}) }: gif_0_9_2_ { + dependencies = mapFeatures features ([ color_quant_1_0_0 lzw_0_10_0 ]); + features = mkFeatures (features.gif_0_9_2 or {}); + }; + gif_0_9_2_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = true; + gif_0_9_2.default = (f.gif_0_9_2.default or true); + gif_0_9_2.libc = + (f.gif_0_9_2.libc or false) || + (f.gif_0_9_2.c_api or false) || + (gif_0_9_2.c_api or false); + gif_0_9_2.raii_no_panic = + (f.gif_0_9_2.raii_no_panic or false) || + (f.gif_0_9_2.default or false) || + (gif_0_9_2.default or false); + lzw_0_10_0.default = true; + }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; + glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; + glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11.default = (f.glob_0_2_11.default or true); + }) []; + image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ { + dependencies = mapFeatures features ([ byteorder_0_5_3 enum_primitive_0_1_1 glob_0_2_11 num_iter_0_1_34 num_rational_0_1_39 num_traits_0_1_40 ] + ++ (if features.image_0_10_4.gif or false then [ gif_0_9_2 ] else []) + ++ (if features.image_0_10_4.jpeg-decoder or false then [ jpeg_decoder_0_1_13 ] else []) + ++ (if features.image_0_10_4.png or false then [ png_0_5_2 ] else []) + ++ (if features.image_0_10_4.scoped_threadpool or false then [ scoped_threadpool_0_1_8 ] else [])); + features = mkFeatures (features.image_0_10_4 or {}); + }; + image_0_10_4_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = true; + enum_primitive_0_1_1.default = true; + gif_0_9_2.default = true; + glob_0_2_11.default = true; + image_0_10_4.bmp = + (f.image_0_10_4.bmp or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false) || + (f.image_0_10_4.ico or false) || + (image_0_10_4.ico or false); + image_0_10_4.default = (f.image_0_10_4.default or true); + image_0_10_4.gif = + (f.image_0_10_4.gif or false) || + (f.image_0_10_4.gif_codec or false) || + (image_0_10_4.gif_codec or false); + image_0_10_4.gif_codec = + (f.image_0_10_4.gif_codec or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.hdr = + (f.image_0_10_4.hdr or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.ico = + (f.image_0_10_4.ico or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.jpeg = + (f.image_0_10_4.jpeg or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.jpeg-decoder = + (f.image_0_10_4.jpeg-decoder or false) || + (f.image_0_10_4.jpeg or false) || + (image_0_10_4.jpeg or false); + image_0_10_4.png = + (f.image_0_10_4.png or false) || + (f.image_0_10_4.png_codec or false) || + (image_0_10_4.png_codec or false); + image_0_10_4.png_codec = + (f.image_0_10_4.png_codec or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false) || + (f.image_0_10_4.ico or false) || + (image_0_10_4.ico or false); + image_0_10_4.ppm = + (f.image_0_10_4.ppm or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.scoped_threadpool = + (f.image_0_10_4.scoped_threadpool or false) || + (f.image_0_10_4.hdr or false) || + (image_0_10_4.hdr or false); + image_0_10_4.tga = + (f.image_0_10_4.tga or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.tiff = + (f.image_0_10_4.tiff or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.webp = + (f.image_0_10_4.webp or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + jpeg_decoder_0_1_13.default = true; + num_iter_0_1_34.default = true; + num_rational_0_1_39.default = true; + num_traits_0_1_40.default = true; + png_0_5_2.default = true; + scoped_threadpool_0_1_8.default = true; + }) [ byteorder_0_5_3_features enum_primitive_0_1_1_features gif_0_9_2_features glob_0_2_11_features jpeg_decoder_0_1_13_features num_iter_0_1_34_features num_rational_0_1_39_features num_traits_0_1_40_features png_0_5_2_features scoped_threadpool_0_1_8_features ]; + inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { + features = mkFeatures (features.inflate_0_1_1 or {}); + }; + inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1.default = (f.inflate_0_1_1.default or true); + }) []; + itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ { + features = mkFeatures (features.itoa_0_3_4 or {}); + }; + itoa_0_3_4_features = f: updateFeatures f (rec { + itoa_0_3_4.default = (f.itoa_0_3_4.default or true); + }) []; + jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ { + dependencies = mapFeatures features ([ byteorder_1_1_0 ] + ++ (if features.jpeg_decoder_0_1_13.rayon or false then [ rayon_0_8_2 ] else [])); + features = mkFeatures (features.jpeg_decoder_0_1_13 or {}); + }; + jpeg_decoder_0_1_13_features = f: updateFeatures f (rec { + byteorder_1_1_0.default = true; + jpeg_decoder_0_1_13.default = (f.jpeg_decoder_0_1_13.default or true); + jpeg_decoder_0_1_13.rayon = + (f.jpeg_decoder_0_1_13.rayon or false) || + (f.jpeg_decoder_0_1_13.default or false) || + (jpeg_decoder_0_1_13.default or false); + rayon_0_8_2.default = true; + }) [ byteorder_1_1_0_features rayon_0_8_2_features ]; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + lazy_static_0_2_9 = { features?(lazy_static_0_2_9_features {}) }: lazy_static_0_2_9_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_0_2_9 or {}); + }; + lazy_static_0_2_9_features = f: updateFeatures f (rec { + lazy_static_0_2_9.default = (f.lazy_static_0_2_9.default or true); + lazy_static_0_2_9.nightly = + (f.lazy_static_0_2_9.nightly or false) || + (f.lazy_static_0_2_9.spin_no_std or false) || + (lazy_static_0_2_9.spin_no_std or false); + lazy_static_0_2_9.spin = + (f.lazy_static_0_2_9.spin or false) || + (f.lazy_static_0_2_9.spin_no_std or false) || + (lazy_static_0_2_9.spin_no_std or false); + }) []; + libc_0_2_32 = { features?(libc_0_2_32_features {}) }: libc_0_2_32_ { + features = mkFeatures (features.libc_0_2_32 or {}); + }; + libc_0_2_32_features = f: updateFeatures f (rec { + libc_0_2_32.default = (f.libc_0_2_32.default or true); + libc_0_2_32.use_std = + (f.libc_0_2_32.use_std or false) || + (f.libc_0_2_32.default or false) || + (libc_0_2_32.default or false); + }) []; + libloading_0_3_4 = { features?(libloading_0_3_4_features {}) }: libloading_0_3_4_ { + dependencies = mapFeatures features ([ lazy_static_0_2_9 ]) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]); + }; + libloading_0_3_4_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + lazy_static_0_2_9.default = true; + libloading_0_3_4.default = (f.libloading_0_3_4.default or true); + target_build_utils_0_3_1.default = true; + winapi_0_2_8.default = true; + }) [ lazy_static_0_2_9_features target_build_utils_0_3_1_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + lzw_0_10_0 = { features?(lzw_0_10_0_features {}) }: lzw_0_10_0_ { + features = mkFeatures (features.lzw_0_10_0 or {}); + }; + lzw_0_10_0_features = f: updateFeatures f (rec { + lzw_0_10_0.default = (f.lzw_0_10_0.default or true); + lzw_0_10_0.raii_no_panic = + (f.lzw_0_10_0.raii_no_panic or false) || + (f.lzw_0_10_0.default or false) || + (lzw_0_10_0.default or false); + }) []; + miniz_sys_0_1_10 = { features?(miniz_sys_0_1_10_features {}) }: miniz_sys_0_1_10_ { + dependencies = mapFeatures features ([ libc_0_2_32 ]); + buildDependencies = mapFeatures features ([ cc_1_0_0 ]); + }; + miniz_sys_0_1_10_features = f: updateFeatures f (rec { + cc_1_0_0.default = true; + libc_0_2_32.default = true; + miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true); + }) [ libc_0_2_32_features cc_1_0_0_features ]; + num_bigint_0_1_40 = { features?(num_bigint_0_1_40_features {}) }: num_bigint_0_1_40_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ] + ++ (if features.num_bigint_0_1_40.rand or false then [ rand_0_3_17 ] else []) + ++ (if features.num_bigint_0_1_40.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else [])); + features = mkFeatures (features.num_bigint_0_1_40 or {}); + }; + num_bigint_0_1_40_features = f: updateFeatures f (rec { + num_bigint_0_1_40.default = (f.num_bigint_0_1_40.default or true); + num_bigint_0_1_40.rand = + (f.num_bigint_0_1_40.rand or false) || + (f.num_bigint_0_1_40.default or false) || + (num_bigint_0_1_40.default or false); + num_bigint_0_1_40.rustc-serialize = + (f.num_bigint_0_1_40.rustc-serialize or false) || + (f.num_bigint_0_1_40.default or false) || + (num_bigint_0_1_40.default or false); + num_integer_0_1_35.default = true; + num_traits_0_1_40.default = true; + rand_0_3_17.default = true; + rustc_serialize_0_3_24.default = true; + }) [ num_integer_0_1_35_features num_traits_0_1_40_features rand_0_3_17_features rustc_serialize_0_3_24_features ]; + num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { + dependencies = mapFeatures features ([ num_traits_0_1_40 ]); + }; + num_integer_0_1_35_features = f: updateFeatures f (rec { + num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); + num_traits_0_1_40.default = true; + }) [ num_traits_0_1_40_features ]; + num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]); + }; + num_iter_0_1_34_features = f: updateFeatures f (rec { + num_integer_0_1_35.default = true; + num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); + num_traits_0_1_40.default = true; + }) [ num_integer_0_1_35_features num_traits_0_1_40_features ]; + num_rational_0_1_39 = { features?(num_rational_0_1_39_features {}) }: num_rational_0_1_39_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ] + ++ (if features.num_rational_0_1_39.num-bigint or false then [ num_bigint_0_1_40 ] else []) + ++ (if features.num_rational_0_1_39.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else [])); + features = mkFeatures (features.num_rational_0_1_39 or {}); + }; + num_rational_0_1_39_features = f: updateFeatures f (rec { + num_bigint_0_1_40.default = true; + num_integer_0_1_35.default = true; + num_rational_0_1_39.bigint = + (f.num_rational_0_1_39.bigint or false) || + (f.num_rational_0_1_39.default or false) || + (num_rational_0_1_39.default or false); + num_rational_0_1_39.default = (f.num_rational_0_1_39.default or true); + num_rational_0_1_39.num-bigint = + (f.num_rational_0_1_39.num-bigint or false) || + (f.num_rational_0_1_39.bigint or false) || + (num_rational_0_1_39.bigint or false); + num_rational_0_1_39.rustc-serialize = + (f.num_rational_0_1_39.rustc-serialize or false) || + (f.num_rational_0_1_39.default or false) || + (num_rational_0_1_39.default or false); + num_traits_0_1_40.default = true; + rustc_serialize_0_3_24.default = true; + }) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_40_features rustc_serialize_0_3_24_features ]; + num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {}; + num_traits_0_1_40_features = f: updateFeatures f (rec { + num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true); + }) []; + num_cpus_1_7_0 = { features?(num_cpus_1_7_0_features {}) }: num_cpus_1_7_0_ { + dependencies = mapFeatures features ([ libc_0_2_32 ]); + }; + num_cpus_1_7_0_features = f: updateFeatures f (rec { + libc_0_2_32.default = true; + num_cpus_1_7_0.default = (f.num_cpus_1_7_0.default or true); + }) [ libc_0_2_32_features ]; + phf_0_7_21 = { features?(phf_0_7_21_features {}) }: phf_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 ]); + features = mkFeatures (features.phf_0_7_21 or {}); + }; + phf_0_7_21_features = f: updateFeatures f (rec { + phf_0_7_21.default = (f.phf_0_7_21.default or true); + phf_shared_0_7_21.core = + (f.phf_shared_0_7_21.core or false) || + (phf_0_7_21.core or false) || + (f.phf_0_7_21.core or false); + phf_shared_0_7_21.default = true; + phf_shared_0_7_21.unicase = + (f.phf_shared_0_7_21.unicase or false) || + (phf_0_7_21.unicase or false) || + (f.phf_0_7_21.unicase or false); + }) [ phf_shared_0_7_21_features ]; + phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ { + dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]); + }; + phf_codegen_0_7_21_features = f: updateFeatures f (rec { + phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true); + phf_generator_0_7_21.default = true; + phf_shared_0_7_21.default = true; + }) [ phf_generator_0_7_21_features phf_shared_0_7_21_features ]; + phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_17 ]); + }; + phf_generator_0_7_21_features = f: updateFeatures f (rec { + phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true); + phf_shared_0_7_21.default = true; + rand_0_3_17.default = true; + }) [ phf_shared_0_7_21_features rand_0_3_17_features ]; + phf_shared_0_7_21 = { features?(phf_shared_0_7_21_features {}) }: phf_shared_0_7_21_ { + dependencies = mapFeatures features ([ siphasher_0_2_2 ]); + features = mkFeatures (features.phf_shared_0_7_21 or {}); + }; + phf_shared_0_7_21_features = f: updateFeatures f (rec { + phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true); + siphasher_0_2_2.default = true; + }) [ siphasher_0_2_2_features ]; + png_0_5_2 = { features?(png_0_5_2_features {}) }: png_0_5_2_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 inflate_0_1_1 num_iter_0_1_34 ] + ++ (if features.png_0_5_2.flate2 or false then [ flate2_0_2_20 ] else [])); + features = mkFeatures (features.png_0_5_2 or {}); + }; + png_0_5_2_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + flate2_0_2_20.default = true; + inflate_0_1_1.default = true; + num_iter_0_1_34.default = true; + png_0_5_2.default = (f.png_0_5_2.default or true); + png_0_5_2.flate2 = + (f.png_0_5_2.flate2 or false) || + (f.png_0_5_2.png-encoding or false) || + (png_0_5_2.png-encoding or false); + png_0_5_2.png-encoding = + (f.png_0_5_2.png-encoding or false) || + (f.png_0_5_2.default or false) || + (png_0_5_2.default or false); + }) [ bitflags_0_7_0_features flate2_0_2_20_features inflate_0_1_1_features num_iter_0_1_34_features ]; + rand_0_3_17 = { features?(rand_0_3_17_features {}) }: rand_0_3_17_ { + dependencies = mapFeatures features ([ libc_0_2_32 ]) + ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_2_1 ]) else []); + features = mkFeatures (features.rand_0_3_17 or {}); + }; + rand_0_3_17_features = f: updateFeatures f (rec { + fuchsia_zircon_0_2_1.default = true; + libc_0_2_32.default = true; + rand_0_3_17.default = (f.rand_0_3_17.default or true); + rand_0_3_17.i128_support = + (f.rand_0_3_17.i128_support or false) || + (f.rand_0_3_17.nightly or false) || + (rand_0_3_17.nightly or false); + }) [ libc_0_2_32_features fuchsia_zircon_0_2_1_features ]; + rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ { + dependencies = mapFeatures features ([ rayon_core_1_2_1 ]); + }; + rayon_0_8_2_features = f: updateFeatures f (rec { + rayon_0_8_2.default = (f.rayon_0_8_2.default or true); + rayon_core_1_2_1.default = true; + }) [ rayon_core_1_2_1_features ]; + rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ { + dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_9 libc_0_2_32 num_cpus_1_7_0 rand_0_3_17 ]); + }; + rayon_core_1_2_1_features = f: updateFeatures f (rec { + coco_0_1_1.default = true; + futures_0_1_16.default = true; + lazy_static_0_2_9.default = true; + libc_0_2_32.default = true; + num_cpus_1_7_0.default = true; + rand_0_3_17.default = true; + rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true); + }) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_9_features libc_0_2_32_features num_cpus_1_7_0_features rand_0_3_17_features ]; + redox_syscall_0_1_31 = { features?(redox_syscall_0_1_31_features {}) }: redox_syscall_0_1_31_ {}; + redox_syscall_0_1_31_features = f: updateFeatures f (rec { + redox_syscall_0_1_31.default = (f.redox_syscall_0_1_31.default or true); + }) []; + redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { + dependencies = mapFeatures features ([ redox_syscall_0_1_31 ]); + }; + redox_termios_0_1_1_features = f: updateFeatures f (rec { + redox_syscall_0_1_31.default = true; + redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); + }) [ redox_syscall_0_1_31_features ]; + rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {}; + rustc_serialize_0_3_24_features = f: updateFeatures f (rec { + rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true); + }) []; + scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ { + features = mkFeatures (features.scoped_threadpool_0_1_8 or {}); + }; + scoped_threadpool_0_1_8_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true); + }) []; + scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ { + features = mkFeatures (features.scopeguard_0_3_2 or {}); + }; + scopeguard_0_3_2_features = f: updateFeatures f (rec { + scopeguard_0_3_2.default = (f.scopeguard_0_3_2.default or true); + scopeguard_0_3_2.use_std = + (f.scopeguard_0_3_2.use_std or false) || + (f.scopeguard_0_3_2.default or false) || + (scopeguard_0_3_2.default or false); + }) []; + serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_0_9_15 or {}); + }; + serde_0_9_15_features = f: updateFeatures f (rec { + serde_0_9_15.alloc = + (f.serde_0_9_15.alloc or false) || + (f.serde_0_9_15.collections or false) || + (serde_0_9_15.collections or false); + serde_0_9_15.default = (f.serde_0_9_15.default or true); + serde_0_9_15.serde_derive = + (f.serde_0_9_15.serde_derive or false) || + (f.serde_0_9_15.derive or false) || + (serde_0_9_15.derive or false) || + (f.serde_0_9_15.playground or false) || + (serde_0_9_15.playground or false); + serde_0_9_15.std = + (f.serde_0_9_15.std or false) || + (f.serde_0_9_15.default or false) || + (serde_0_9_15.default or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + serde_0_9_15.unstable = + (f.serde_0_9_15.unstable or false) || + (f.serde_0_9_15.alloc or false) || + (serde_0_9_15.alloc or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + }) []; + serde_json_0_9_10 = { features?(serde_json_0_9_10_features {}) }: serde_json_0_9_10_ { + dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_0_9_15 ]); + features = mkFeatures (features.serde_json_0_9_10 or {}); + }; + serde_json_0_9_10_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = true; + itoa_0_3_4.default = true; + num_traits_0_1_40.default = true; + serde_0_9_15.default = true; + serde_json_0_9_10.default = (f.serde_json_0_9_10.default or true); + serde_json_0_9_10.linked-hash-map = + (f.serde_json_0_9_10.linked-hash-map or false) || + (f.serde_json_0_9_10.preserve_order or false) || + (serde_json_0_9_10.preserve_order or false); + }) [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_40_features serde_0_9_15_features ]; + siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { + dependencies = mapFeatures features ([]); + }; + siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); + }) []; + strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; + strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0.default = (f.strsim_0_6_0.default or true); + }) []; + target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ { + dependencies = mapFeatures features ([ phf_0_7_21 ] + ++ (if features.target_build_utils_0_3_1.serde_json or false then [ serde_json_0_9_10 ] else [])); + buildDependencies = mapFeatures features ([ phf_codegen_0_7_21 ]); + features = mkFeatures (features.target_build_utils_0_3_1 or {}); + }; + target_build_utils_0_3_1_features = f: updateFeatures f (rec { + phf_0_7_21.default = true; + phf_codegen_0_7_21.default = true; + serde_json_0_9_10.default = true; + target_build_utils_0_3_1.default = (f.target_build_utils_0_3_1.default or true); + target_build_utils_0_3_1.serde_json = + (f.target_build_utils_0_3_1.serde_json or false) || + (f.target_build_utils_0_3_1.default or false) || + (target_build_utils_0_3_1.default or false); + }) [ phf_0_7_21_features serde_json_0_9_10_features phf_codegen_0_7_21_features ]; + tempfile_2_2_0 = { features?(tempfile_2_2_0_features {}) }: tempfile_2_2_0_ { + dependencies = mapFeatures features ([ rand_0_3_17 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_31 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + tempfile_2_2_0_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_32.default = true; + rand_0_3_17.default = true; + redox_syscall_0_1_31.default = true; + tempfile_2_2_0.default = (f.tempfile_2_2_0.default or true); + winapi_0_2_8.default = true; + }) [ rand_0_3_17_features redox_syscall_0_1_31_features libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + term_size_0_3_0 = { features?(term_size_0_3_0_features {}) }: term_size_0_3_0_ { + dependencies = mapFeatures features ([]) + ++ (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_32 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + features = mkFeatures (features.term_size_0_3_0 or {}); + }; + term_size_0_3_0_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_32.default = true; + term_size_0_3_0.clippy = + (f.term_size_0_3_0.clippy or false) || + (f.term_size_0_3_0.lints or false) || + (term_size_0_3_0.lints or false); + term_size_0_3_0.default = (f.term_size_0_3_0.default or true); + term_size_0_3_0.lints = + (f.term_size_0_3_0.lints or false) || + (f.term_size_0_3_0.travis or false) || + (term_size_0_3_0.travis or false); + term_size_0_3_0.nightly = + (f.term_size_0_3_0.nightly or false) || + (f.term_size_0_3_0.lints or false) || + (term_size_0_3_0.lints or false) || + (f.term_size_0_3_0.travis or false) || + (term_size_0_3_0.travis or false); + winapi_0_2_8.default = true; + }) [ libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { + dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_32 ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_31 redox_termios_0_1_1 ]) else []); + }; + termion_1_5_1_features = f: updateFeatures f (rec { + libc_0_2_32.default = true; + redox_syscall_0_1_31.default = true; + redox_termios_0_1_1.default = true; + termion_1_5_1.default = (f.termion_1_5_1.default or true); + }) [ libc_0_2_32_features redox_syscall_0_1_31_features redox_termios_0_1_1_features ]; + textwrap_0_8_0 = { features?(textwrap_0_8_0_features {}) }: textwrap_0_8_0_ { + dependencies = mapFeatures features ([ term_size_0_3_0 unicode_width_0_1_4 ]); + }; + textwrap_0_8_0_features = f: updateFeatures f (rec { + term_size_0_3_0.default = true; + textwrap_0_8_0.default = (f.textwrap_0_8_0.default or true); + unicode_width_0_1_4.default = true; + }) [ term_size_0_3_0_features unicode_width_0_1_4_features ]; + unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { + features = mkFeatures (features.unicode_width_0_1_4 or {}); + }; + unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); + }) []; + vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.vec_map_0_8_0 or {}); + }; + vec_map_0_8_0_features = f: updateFeatures f (rec { + vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true); + vec_map_0_8_0.serde = + (f.vec_map_0_8_0.serde or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + vec_map_0_8_0.serde_derive = + (f.vec_map_0_8_0.serde_derive or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + }) []; + way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ { + dependencies = mapFeatures features ([ wayland_client_0_9_10 wayland_sys_0_9_10 ]); + }; + way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec { + way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true); + wayland_client_0_9_10.cursor = true; + wayland_client_0_9_10.default = true; + wayland_client_0_9_10.dlopen = true; + wayland_sys_0_9_10.client = true; + wayland_sys_0_9_10.default = true; + wayland_sys_0_9_10.dlopen = true; + }) [ wayland_client_0_9_10_features wayland_sys_0_9_10_features ]; + wayland_client_0_9_10 = { features?(wayland_client_0_9_10_features {}) }: wayland_client_0_9_10_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 libc_0_2_32 wayland_sys_0_9_10 ]); + buildDependencies = mapFeatures features ([ wayland_scanner_0_9_10 ]); + features = mkFeatures (features.wayland_client_0_9_10 or {}); + }; + wayland_client_0_9_10_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + libc_0_2_32.default = true; + wayland_client_0_9_10.cursor = + (f.wayland_client_0_9_10.cursor or false) || + (f.wayland_client_0_9_10.default or false) || + (wayland_client_0_9_10.default or false); + wayland_client_0_9_10.default = (f.wayland_client_0_9_10.default or true); + wayland_client_0_9_10.egl = + (f.wayland_client_0_9_10.egl or false) || + (f.wayland_client_0_9_10.default or false) || + (wayland_client_0_9_10.default or false); + wayland_scanner_0_9_10.default = true; + wayland_sys_0_9_10.client = true; + wayland_sys_0_9_10.cursor = + (f.wayland_sys_0_9_10.cursor or false) || + (wayland_client_0_9_10.cursor or false) || + (f.wayland_client_0_9_10.cursor or false); + wayland_sys_0_9_10.default = true; + wayland_sys_0_9_10.dlopen = + (f.wayland_sys_0_9_10.dlopen or false) || + (wayland_client_0_9_10.dlopen or false) || + (f.wayland_client_0_9_10.dlopen or false); + wayland_sys_0_9_10.egl = + (f.wayland_sys_0_9_10.egl or false) || + (wayland_client_0_9_10.egl or false) || + (f.wayland_client_0_9_10.egl or false); + }) [ bitflags_0_9_1_features libc_0_2_32_features wayland_sys_0_9_10_features wayland_scanner_0_9_10_features ]; + wayland_scanner_0_9_10 = { features?(wayland_scanner_0_9_10_features {}) }: wayland_scanner_0_9_10_ { + dependencies = mapFeatures features ([ xml_rs_0_6_1 ]); + }; + wayland_scanner_0_9_10_features = f: updateFeatures f (rec { + wayland_scanner_0_9_10.default = (f.wayland_scanner_0_9_10.default or true); + xml_rs_0_6_1.default = true; + }) [ xml_rs_0_6_1_features ]; + wayland_sys_0_9_10 = { features?(wayland_sys_0_9_10_features {}) }: wayland_sys_0_9_10_ { + dependencies = mapFeatures features ([ dlib_0_3_1 ] + ++ (if features.wayland_sys_0_9_10.lazy_static or false then [ lazy_static_0_2_9 ] else [])); + features = mkFeatures (features.wayland_sys_0_9_10 or {}); + }; + wayland_sys_0_9_10_features = f: updateFeatures f (rec { + dlib_0_3_1.default = true; + dlib_0_3_1.dlopen = + (f.dlib_0_3_1.dlopen or false) || + (wayland_sys_0_9_10.dlopen or false) || + (f.wayland_sys_0_9_10.dlopen or false); + lazy_static_0_2_9.default = true; + wayland_sys_0_9_10.default = (f.wayland_sys_0_9_10.default or true); + wayland_sys_0_9_10.lazy_static = + (f.wayland_sys_0_9_10.lazy_static or false) || + (f.wayland_sys_0_9_10.dlopen or false) || + (wayland_sys_0_9_10.dlopen or false); + wayland_sys_0_9_10.libc = + (f.wayland_sys_0_9_10.libc or false) || + (f.wayland_sys_0_9_10.server or false) || + (wayland_sys_0_9_10.server or false); + }) [ dlib_0_3_1_features lazy_static_0_2_9_features ]; + wc_bg_0_3_0 = { features?(wc_bg_0_3_0_features {}) }: wc_bg_0_3_0_ { + dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_26_2 image_0_10_4 tempfile_2_2_0 way_cooler_client_helpers_0_1_0 wayland_client_0_9_10 wayland_sys_0_9_10 ]); + buildDependencies = mapFeatures features ([ wayland_scanner_0_9_10 ]); + }; + wc_bg_0_3_0_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = true; + clap_2_26_2.default = true; + image_0_10_4.default = true; + tempfile_2_2_0.default = true; + way_cooler_client_helpers_0_1_0.default = true; + wayland_client_0_9_10.cursor = true; + wayland_client_0_9_10.default = true; + wayland_client_0_9_10.dlopen = true; + wayland_scanner_0_9_10.default = true; + wayland_sys_0_9_10.client = true; + wayland_sys_0_9_10.default = true; + wayland_sys_0_9_10.dlopen = true; + wc_bg_0_3_0.default = (f.wc_bg_0_3_0.default or true); + }) [ byteorder_0_5_3_features clap_2_26_2_features image_0_10_4_features tempfile_2_2_0_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_10_features wayland_sys_0_9_10_features wayland_scanner_0_9_10_features ]; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; + xml_rs_0_6_1 = { features?(xml_rs_0_6_1_features {}) }: xml_rs_0_6_1_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 ]); + }; + xml_rs_0_6_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + xml_rs_0_6_1.default = (f.xml_rs_0_6_1.default or true); + }) [ bitflags_0_9_1_features ]; +} diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix new file mode 100644 index 0000000000000000000000000000000000000000..253281b6a9a20d2f3ba21bf869742712768caa24 --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix @@ -0,0 +1,801 @@ +# Generated by carnix 0.6.5: carnix -o wc-grab.nix Cargo.lock +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); +in +rec { + wc_grab = f: wc_grab_0_3_0 { features = wc_grab_0_3_0_features { wc_grab_0_3_0 = f; }; }; + adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "adler32"; + version = "1.0.0"; + authors = [ "Remi Rampin " ]; + sha256 = "0pj35a7m4apn5xjg9n63gsdj6w8iw76zg4p9znrij43xnfqp084w"; + inherit dependencies buildDependencies features; + }; + ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + inherit dependencies buildDependencies features; + }; + atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.2"; + authors = [ "softprops " ]; + sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.8.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1h489m0wzhng5gvvc40jgdbaf0ac3rgkka31vwinhsjmfvrqcc4v"; + inherit dependencies buildDependencies features; + }; + byteorder_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "14pdnds4517vcpablc51vv76hvc3glnpkpbb7qdil591q7lyb0m1"; + inherit dependencies buildDependencies features; + }; + clap_2_22_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.22.0"; + authors = [ "Kevin K. " ]; + sha256 = "0gdgyfh3ydpd2px4xh0i5qd6bhi2c5f43bqv9z4kla9vkmmfiavd"; + inherit dependencies buildDependencies features; + }; + color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "color_quant"; + version = "1.0.0"; + authors = [ "nwin " ]; + sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj"; + inherit dependencies buildDependencies features; + }; + dbus_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus"; + version = "0.5.2"; + authors = [ "David Henningsson " ]; + sha256 = "1ga3p2myqxbz34n2bbw4gk1ipf76mjr8r2rvrvnalwggymzfkhj7"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + deflate_0_7_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "deflate"; + version = "0.7.5"; + authors = [ "oyvindln " ]; + sha256 = "18bcmdkyshnzpkxx22b29gn55g6bk5ysy98ghjpjhxy3hky96rvy"; + inherit dependencies buildDependencies features; + }; + deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "deque"; + version = "0.3.1"; + authors = [ "Alex Crichton " "Samuel Fredrickson " "Linus Färnstrand " "Amanieu d'Antras " ]; + sha256 = "04x8i5aagxmslk350i8qszyw7kmvrqc3d99g4qi1xnfmr61y7m68"; + inherit dependencies buildDependencies features; + }; + enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "enum_primitive"; + version = "0.1.1"; + authors = [ "Anders Kaseorg " ]; + sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y"; + inherit dependencies buildDependencies features; + }; + error_chain_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.7.2"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "0b1r4ggdgy1djfvz2s4l5kirmfsmxd286y6wx0p9ahv2phb7inyi"; + inherit dependencies buildDependencies features; + }; + gif_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gif"; + version = "0.9.1"; + authors = [ "nwin " ]; + sha256 = "16s7b0rqc6gg1fcbppakm3jy2q462w3qvykcmcmifmg7q7lwsg6r"; + inherit dependencies buildDependencies features; + }; + glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glob"; + version = "0.2.11"; + authors = [ "The Rust Project Developers" ]; + sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; + inherit dependencies buildDependencies features; + }; + image_0_12_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "image"; + version = "0.12.3"; + authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ]; + sha256 = "12xdzi29vr19gz3h93c1ihyvyv9xar9sp0inrjwwvlbjvn8nn0p9"; + libPath = "./src/lib.rs"; + inherit dependencies buildDependencies features; + }; + inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "inflate"; + version = "0.1.1"; + authors = [ "nwin " ]; + sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h"; + inherit dependencies buildDependencies features; + }; + jpeg_decoder_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "jpeg-decoder"; + version = "0.1.11"; + authors = [ "Ulf Nilsson " ]; + sha256 = "1xm39c1cff5gkczs164371hk2gpkjpkbw63k4f8mjnpwwpn9xk4n"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + libc_0_2_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.21"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0glj3lxwc8358cfw9pb5dd4zr9iynzj6w2ly59nshrggsw021j75"; + inherit dependencies buildDependencies features; + }; + lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lzw"; + version = "0.10.0"; + authors = [ "nwin " ]; + sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb"; + inherit dependencies buildDependencies features; + }; + metadeps_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "metadeps"; + version = "1.1.1"; + authors = [ "Josh Triplett " ]; + sha256 = "1px8v94jn4ps63gqmvgsfcqxrwjhpa9z4xr0y1lh95wn2063fsar"; + inherit dependencies buildDependencies features; + }; + num_integer_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1rhy9lf4lhl7r8278n73mi9y55v9a71639as3v92bj2gk1x4k729"; + inherit dependencies buildDependencies features; + }; + num_iter_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1xjzf2p2vaqwknkr4s8ka5hn6cpr5rsshnydbpkn2pvapfzdrqd3"; + inherit dependencies buildDependencies features; + }; + num_rational_0_1_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-rational"; + version = "0.1.36"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0jibhs8xiap2wlv1xjwdvhyj4yrxwfisqbnfm53vjm5ldlijp87p"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.37"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.3.0"; + authors = [ "Sean McArthur " ]; + sha256 = "0i0zm6qh932k9b67qf7f1vsczkdim5kg9qv73m7y5hhw1i781rrb"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + png_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "png"; + version = "0.6.2"; + authors = [ "nwin " ]; + sha256 = "03i78w5jbvk9y6babfrh7h0akvg81pcyyhniilv24z5v0vh5jvjs"; + inherit dependencies buildDependencies features; + }; + rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; + inherit dependencies buildDependencies features; + }; + rayon_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon"; + version = "0.6.0"; + authors = [ "Niko Matsakis " ]; + sha256 = "0y2693bari5j4h46mjzkyc9lkfbnq2d1p0ldyn6sb02jn63lpw97"; + inherit dependencies buildDependencies features; + }; + scoped_threadpool_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0dg58f18i6v071640062n0vymr4h42cnj0xy8a7b80sc0mddykyk"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + term_size_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "term_size"; + version = "0.2.3"; + authors = [ "Kevin K. " "Benjamin Sago " ]; + sha256 = "16b7gq2dmz7mws4vgai7whxy4xkg4yvlhm7spz0q6jyipqfq87ci"; + inherit dependencies buildDependencies features; + }; + toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs"; + inherit dependencies buildDependencies features; + }; + unicode_segmentation_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-segmentation"; + version = "1.1.0"; + authors = [ "kwantam " ]; + sha256 = "10hk7wy0217jwdbp27p36skwkig5lbhk482yfzij9m87h247rry0"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + vec_map_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.7.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1"; + inherit dependencies buildDependencies features; + }; + wc_grab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wc-grab"; + version = "0.3.0"; + authors = [ "Timidger " ]; + sha256 = "02dkjxffzh38h3hiwfypkjv0g8dsfkp9wk20j04x4qydg4dr8a8h"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {}; + adler32_1_0_0_features = f: updateFeatures f (rec { + adler32_1_0_0.default = (f.adler32_1_0_0.default or true); + }) []; + ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; + ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); + }) []; + atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ { + dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + atty_0_2_2_features = f: updateFeatures f (rec { + atty_0_2_2.default = (f.atty_0_2_2.default or true); + kernel32_sys_0_2_2.default = true; + libc_0_2_21.default = true; + winapi_0_2_8.default = true; + }) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; + bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); + }) []; + bitflags_0_8_0 = { features?(bitflags_0_8_0_features {}) }: bitflags_0_8_0_ { + features = mkFeatures (features.bitflags_0_8_0 or {}); + }; + bitflags_0_8_0_features = f: updateFeatures f (rec { + bitflags_0_8_0.default = (f.bitflags_0_8_0.default or true); + bitflags_0_8_0.i128 = + (f.bitflags_0_8_0.i128 or false) || + (f.bitflags_0_8_0.unstable or false) || + (bitflags_0_8_0.unstable or false); + }) []; + byteorder_1_0_0 = { features?(byteorder_1_0_0_features {}) }: byteorder_1_0_0_ { + features = mkFeatures (features.byteorder_1_0_0 or {}); + }; + byteorder_1_0_0_features = f: updateFeatures f (rec { + byteorder_1_0_0.default = (f.byteorder_1_0_0.default or true); + byteorder_1_0_0.std = + (f.byteorder_1_0_0.std or false) || + (f.byteorder_1_0_0.default or false) || + (byteorder_1_0_0.default or false); + }) []; + clap_2_22_0 = { features?(clap_2_22_0_features {}) }: clap_2_22_0_ { + dependencies = mapFeatures features ([ bitflags_0_8_0 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ] + ++ (if features.clap_2_22_0.ansi_term or false then [ ansi_term_0_9_0 ] else []) + ++ (if features.clap_2_22_0.atty or false then [ atty_0_2_2 ] else []) + ++ (if features.clap_2_22_0.strsim or false then [ strsim_0_6_0 ] else []) + ++ (if features.clap_2_22_0.term_size or false then [ term_size_0_2_3 ] else [])); + features = mkFeatures (features.clap_2_22_0 or {}); + }; + clap_2_22_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = true; + atty_0_2_2.default = true; + bitflags_0_8_0.default = true; + clap_2_22_0.ansi_term = + (f.clap_2_22_0.ansi_term or false) || + (f.clap_2_22_0.color or false) || + (clap_2_22_0.color or false); + clap_2_22_0.atty = + (f.clap_2_22_0.atty or false) || + (f.clap_2_22_0.color or false) || + (clap_2_22_0.color or false); + clap_2_22_0.clippy = + (f.clap_2_22_0.clippy or false) || + (f.clap_2_22_0.lints or false) || + (clap_2_22_0.lints or false); + clap_2_22_0.color = + (f.clap_2_22_0.color or false) || + (f.clap_2_22_0.default or false) || + (clap_2_22_0.default or false); + clap_2_22_0.default = (f.clap_2_22_0.default or true); + clap_2_22_0.strsim = + (f.clap_2_22_0.strsim or false) || + (f.clap_2_22_0.suggestions or false) || + (clap_2_22_0.suggestions or false); + clap_2_22_0.suggestions = + (f.clap_2_22_0.suggestions or false) || + (f.clap_2_22_0.default or false) || + (clap_2_22_0.default or false); + clap_2_22_0.term_size = + (f.clap_2_22_0.term_size or false) || + (f.clap_2_22_0.wrap_help or false) || + (clap_2_22_0.wrap_help or false); + clap_2_22_0.wrap_help = + (f.clap_2_22_0.wrap_help or false) || + (f.clap_2_22_0.default or false) || + (clap_2_22_0.default or false); + clap_2_22_0.yaml-rust = + (f.clap_2_22_0.yaml-rust or false) || + (f.clap_2_22_0.yaml or false) || + (clap_2_22_0.yaml or false); + strsim_0_6_0.default = true; + term_size_0_2_3.default = true; + unicode_segmentation_1_1_0.default = true; + unicode_width_0_1_4.default = true; + vec_map_0_7_0.default = true; + }) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_0_features strsim_0_6_0_features term_size_0_2_3_features unicode_segmentation_1_1_0_features unicode_width_0_1_4_features vec_map_0_7_0_features ]; + color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; + color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); + }) []; + dbus_0_5_2 = { features?(dbus_0_5_2_features {}) }: dbus_0_5_2_ { + dependencies = mapFeatures features ([ libc_0_2_21 ]); + buildDependencies = mapFeatures features ([ metadeps_1_1_1 ]); + features = mkFeatures (features.dbus_0_5_2 or {}); + }; + dbus_0_5_2_features = f: updateFeatures f (rec { + dbus_0_5_2.default = (f.dbus_0_5_2.default or true); + libc_0_2_21.default = true; + metadeps_1_1_1.default = true; + }) [ libc_0_2_21_features metadeps_1_1_1_features ]; + deflate_0_7_5 = { features?(deflate_0_7_5_features {}) }: deflate_0_7_5_ { + dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_0_0 ]); + }; + deflate_0_7_5_features = f: updateFeatures f (rec { + adler32_1_0_0.default = true; + byteorder_1_0_0.default = true; + deflate_0_7_5.default = (f.deflate_0_7_5.default or true); + }) [ adler32_1_0_0_features byteorder_1_0_0_features ]; + deque_0_3_1 = { features?(deque_0_3_1_features {}) }: deque_0_3_1_ { + dependencies = mapFeatures features ([ rand_0_3_15 ]); + }; + deque_0_3_1_features = f: updateFeatures f (rec { + deque_0_3_1.default = (f.deque_0_3_1.default or true); + rand_0_3_15.default = true; + }) [ rand_0_3_15_features ]; + enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { + dependencies = mapFeatures features ([ num_traits_0_1_37 ]); + }; + enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); + num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false); + }) [ num_traits_0_1_37_features ]; + error_chain_0_7_2 = { features?(error_chain_0_7_2_features {}) }: error_chain_0_7_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.error_chain_0_7_2 or {}); + }; + error_chain_0_7_2_features = f: updateFeatures f (rec { + error_chain_0_7_2.backtrace = + (f.error_chain_0_7_2.backtrace or false) || + (f.error_chain_0_7_2.default or false) || + (error_chain_0_7_2.default or false); + error_chain_0_7_2.default = (f.error_chain_0_7_2.default or true); + error_chain_0_7_2.example_generated = + (f.error_chain_0_7_2.example_generated or false) || + (f.error_chain_0_7_2.default or false) || + (error_chain_0_7_2.default or false); + }) []; + gif_0_9_1 = { features?(gif_0_9_1_features {}) }: gif_0_9_1_ { + dependencies = mapFeatures features ([ color_quant_1_0_0 lzw_0_10_0 ]); + features = mkFeatures (features.gif_0_9_1 or {}); + }; + gif_0_9_1_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = true; + gif_0_9_1.default = (f.gif_0_9_1.default or true); + gif_0_9_1.libc = + (f.gif_0_9_1.libc or false) || + (f.gif_0_9_1.c_api or false) || + (gif_0_9_1.c_api or false); + gif_0_9_1.raii_no_panic = + (f.gif_0_9_1.raii_no_panic or false) || + (f.gif_0_9_1.default or false) || + (gif_0_9_1.default or false); + lzw_0_10_0.default = true; + }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; + glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; + glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11.default = (f.glob_0_2_11.default or true); + }) []; + image_0_12_3 = { features?(image_0_12_3_features {}) }: image_0_12_3_ { + dependencies = mapFeatures features ([ byteorder_1_0_0 enum_primitive_0_1_1 glob_0_2_11 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 ] + ++ (if features.image_0_12_3.gif or false then [ gif_0_9_1 ] else []) + ++ (if features.image_0_12_3.jpeg-decoder or false then [ jpeg_decoder_0_1_11 ] else []) + ++ (if features.image_0_12_3.png or false then [ png_0_6_2 ] else []) + ++ (if features.image_0_12_3.scoped_threadpool or false then [ scoped_threadpool_0_1_7 ] else [])); + features = mkFeatures (features.image_0_12_3 or {}); + }; + image_0_12_3_features = f: updateFeatures f (rec { + byteorder_1_0_0.default = true; + enum_primitive_0_1_1.default = true; + gif_0_9_1.default = true; + glob_0_2_11.default = true; + image_0_12_3.bmp = + (f.image_0_12_3.bmp or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false) || + (f.image_0_12_3.ico or false) || + (image_0_12_3.ico or false); + image_0_12_3.default = (f.image_0_12_3.default or true); + image_0_12_3.gif = + (f.image_0_12_3.gif or false) || + (f.image_0_12_3.gif_codec or false) || + (image_0_12_3.gif_codec or false); + image_0_12_3.gif_codec = + (f.image_0_12_3.gif_codec or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.hdr = + (f.image_0_12_3.hdr or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.ico = + (f.image_0_12_3.ico or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.jpeg = + (f.image_0_12_3.jpeg or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.jpeg-decoder = + (f.image_0_12_3.jpeg-decoder or false) || + (f.image_0_12_3.jpeg or false) || + (image_0_12_3.jpeg or false); + image_0_12_3.png = + (f.image_0_12_3.png or false) || + (f.image_0_12_3.png_codec or false) || + (image_0_12_3.png_codec or false); + image_0_12_3.png_codec = + (f.image_0_12_3.png_codec or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false) || + (f.image_0_12_3.ico or false) || + (image_0_12_3.ico or false); + image_0_12_3.ppm = + (f.image_0_12_3.ppm or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.scoped_threadpool = + (f.image_0_12_3.scoped_threadpool or false) || + (f.image_0_12_3.hdr or false) || + (image_0_12_3.hdr or false); + image_0_12_3.tga = + (f.image_0_12_3.tga or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.tiff = + (f.image_0_12_3.tiff or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.webp = + (f.image_0_12_3.webp or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + jpeg_decoder_0_1_11.default = true; + num_iter_0_1_33.default = true; + num_rational_0_1_36.default = (f.num_rational_0_1_36.default or false); + num_traits_0_1_37.default = true; + png_0_6_2.default = true; + scoped_threadpool_0_1_7.default = true; + }) [ byteorder_1_0_0_features enum_primitive_0_1_1_features gif_0_9_1_features glob_0_2_11_features jpeg_decoder_0_1_11_features num_iter_0_1_33_features num_rational_0_1_36_features num_traits_0_1_37_features png_0_6_2_features scoped_threadpool_0_1_7_features ]; + inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { + features = mkFeatures (features.inflate_0_1_1 or {}); + }; + inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1.default = (f.inflate_0_1_1.default or true); + }) []; + jpeg_decoder_0_1_11 = { features?(jpeg_decoder_0_1_11_features {}) }: jpeg_decoder_0_1_11_ { + dependencies = mapFeatures features ([ byteorder_1_0_0 ] + ++ (if features.jpeg_decoder_0_1_11.rayon or false then [ rayon_0_6_0 ] else [])); + features = mkFeatures (features.jpeg_decoder_0_1_11 or {}); + }; + jpeg_decoder_0_1_11_features = f: updateFeatures f (rec { + byteorder_1_0_0.default = true; + jpeg_decoder_0_1_11.default = (f.jpeg_decoder_0_1_11.default or true); + jpeg_decoder_0_1_11.rayon = + (f.jpeg_decoder_0_1_11.rayon or false) || + (f.jpeg_decoder_0_1_11.default or false) || + (jpeg_decoder_0_1_11.default or false); + rayon_0_6_0.default = true; + }) [ byteorder_1_0_0_features rayon_0_6_0_features ]; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + libc_0_2_21 = { features?(libc_0_2_21_features {}) }: libc_0_2_21_ { + features = mkFeatures (features.libc_0_2_21 or {}); + }; + libc_0_2_21_features = f: updateFeatures f (rec { + libc_0_2_21.default = (f.libc_0_2_21.default or true); + libc_0_2_21.use_std = + (f.libc_0_2_21.use_std or false) || + (f.libc_0_2_21.default or false) || + (libc_0_2_21.default or false); + }) []; + lzw_0_10_0 = { features?(lzw_0_10_0_features {}) }: lzw_0_10_0_ { + features = mkFeatures (features.lzw_0_10_0 or {}); + }; + lzw_0_10_0_features = f: updateFeatures f (rec { + lzw_0_10_0.default = (f.lzw_0_10_0.default or true); + lzw_0_10_0.raii_no_panic = + (f.lzw_0_10_0.raii_no_panic or false) || + (f.lzw_0_10_0.default or false) || + (lzw_0_10_0.default or false); + }) []; + metadeps_1_1_1 = { features?(metadeps_1_1_1_features {}) }: metadeps_1_1_1_ { + dependencies = mapFeatures features ([ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]); + }; + metadeps_1_1_1_features = f: updateFeatures f (rec { + error_chain_0_7_2.default = (f.error_chain_0_7_2.default or false); + metadeps_1_1_1.default = (f.metadeps_1_1_1.default or true); + pkg_config_0_3_9.default = true; + toml_0_2_1.default = (f.toml_0_2_1.default or false); + }) [ error_chain_0_7_2_features pkg_config_0_3_9_features toml_0_2_1_features ]; + num_integer_0_1_33 = { features?(num_integer_0_1_33_features {}) }: num_integer_0_1_33_ { + dependencies = mapFeatures features ([ num_traits_0_1_37 ]); + }; + num_integer_0_1_33_features = f: updateFeatures f (rec { + num_integer_0_1_33.default = (f.num_integer_0_1_33.default or true); + num_traits_0_1_37.default = true; + }) [ num_traits_0_1_37_features ]; + num_iter_0_1_33 = { features?(num_iter_0_1_33_features {}) }: num_iter_0_1_33_ { + dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]); + }; + num_iter_0_1_33_features = f: updateFeatures f (rec { + num_integer_0_1_33.default = true; + num_iter_0_1_33.default = (f.num_iter_0_1_33.default or true); + num_traits_0_1_37.default = true; + }) [ num_integer_0_1_33_features num_traits_0_1_37_features ]; + num_rational_0_1_36 = { features?(num_rational_0_1_36_features {}) }: num_rational_0_1_36_ { + dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]); + features = mkFeatures (features.num_rational_0_1_36 or {}); + }; + num_rational_0_1_36_features = f: updateFeatures f (rec { + num_integer_0_1_33.default = true; + num_rational_0_1_36.bigint = + (f.num_rational_0_1_36.bigint or false) || + (f.num_rational_0_1_36.default or false) || + (num_rational_0_1_36.default or false); + num_rational_0_1_36.default = (f.num_rational_0_1_36.default or true); + num_rational_0_1_36.num-bigint = + (f.num_rational_0_1_36.num-bigint or false) || + (f.num_rational_0_1_36.bigint or false) || + (num_rational_0_1_36.bigint or false); + num_rational_0_1_36.rustc-serialize = + (f.num_rational_0_1_36.rustc-serialize or false) || + (f.num_rational_0_1_36.default or false) || + (num_rational_0_1_36.default or false); + num_traits_0_1_37.default = true; + }) [ num_integer_0_1_33_features num_traits_0_1_37_features ]; + num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {}; + num_traits_0_1_37_features = f: updateFeatures f (rec { + num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true); + }) []; + num_cpus_1_3_0 = { features?(num_cpus_1_3_0_features {}) }: num_cpus_1_3_0_ { + dependencies = mapFeatures features ([ libc_0_2_21 ]); + }; + num_cpus_1_3_0_features = f: updateFeatures f (rec { + libc_0_2_21.default = true; + num_cpus_1_3_0.default = (f.num_cpus_1_3_0.default or true); + }) [ libc_0_2_21_features ]; + pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; + pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); + }) []; + png_0_6_2 = { features?(png_0_6_2_features {}) }: png_0_6_2_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 inflate_0_1_1 num_iter_0_1_33 ] + ++ (if features.png_0_6_2.deflate or false then [ deflate_0_7_5 ] else [])); + features = mkFeatures (features.png_0_6_2 or {}); + }; + png_0_6_2_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + deflate_0_7_5.default = true; + inflate_0_1_1.default = true; + num_iter_0_1_33.default = true; + png_0_6_2.default = (f.png_0_6_2.default or true); + png_0_6_2.deflate = + (f.png_0_6_2.deflate or false) || + (f.png_0_6_2.png-encoding or false) || + (png_0_6_2.png-encoding or false); + png_0_6_2.png-encoding = + (f.png_0_6_2.png-encoding or false) || + (f.png_0_6_2.default or false) || + (png_0_6_2.default or false); + }) [ bitflags_0_7_0_features deflate_0_7_5_features inflate_0_1_1_features num_iter_0_1_33_features ]; + rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ { + dependencies = mapFeatures features ([ libc_0_2_21 ]); + }; + rand_0_3_15_features = f: updateFeatures f (rec { + libc_0_2_21.default = true; + rand_0_3_15.default = (f.rand_0_3_15.default or true); + }) [ libc_0_2_21_features ]; + rayon_0_6_0 = { features?(rayon_0_6_0_features {}) }: rayon_0_6_0_ { + dependencies = mapFeatures features ([ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]); + features = mkFeatures (features.rayon_0_6_0 or {}); + }; + rayon_0_6_0_features = f: updateFeatures f (rec { + deque_0_3_1.default = true; + libc_0_2_21.default = true; + num_cpus_1_3_0.default = true; + rand_0_3_15.default = true; + rayon_0_6_0.default = (f.rayon_0_6_0.default or true); + }) [ deque_0_3_1_features libc_0_2_21_features num_cpus_1_3_0_features rand_0_3_15_features ]; + scoped_threadpool_0_1_7 = { features?(scoped_threadpool_0_1_7_features {}) }: scoped_threadpool_0_1_7_ { + features = mkFeatures (features.scoped_threadpool_0_1_7 or {}); + }; + scoped_threadpool_0_1_7_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_7.default = (f.scoped_threadpool_0_1_7.default or true); + }) []; + strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; + strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0.default = (f.strsim_0_6_0.default or true); + }) []; + term_size_0_2_3 = { features?(term_size_0_2_3_features {}) }: term_size_0_2_3_ { + dependencies = mapFeatures features ([]) + ++ (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + features = mkFeatures (features.term_size_0_2_3 or {}); + }; + term_size_0_2_3_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_21.default = true; + term_size_0_2_3.clippy = + (f.term_size_0_2_3.clippy or false) || + (f.term_size_0_2_3.lints or false) || + (term_size_0_2_3.lints or false); + term_size_0_2_3.default = (f.term_size_0_2_3.default or true); + term_size_0_2_3.lints = + (f.term_size_0_2_3.lints or false) || + (f.term_size_0_2_3.travis or false) || + (term_size_0_2_3.travis or false); + term_size_0_2_3.nightly = + (f.term_size_0_2_3.nightly or false) || + (f.term_size_0_2_3.lints or false) || + (term_size_0_2_3.lints or false) || + (f.term_size_0_2_3.travis or false) || + (term_size_0_2_3.travis or false); + winapi_0_2_8.default = true; + }) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + toml_0_2_1 = { features?(toml_0_2_1_features {}) }: toml_0_2_1_ { + dependencies = mapFeatures features ([]); + }; + toml_0_2_1_features = f: updateFeatures f (rec { + toml_0_2_1.default = (f.toml_0_2_1.default or true); + toml_0_2_1.rustc-serialize = + (f.toml_0_2_1.rustc-serialize or false) || + (f.toml_0_2_1.default or false) || + (toml_0_2_1.default or false); + }) []; + unicode_segmentation_1_1_0 = { features?(unicode_segmentation_1_1_0_features {}) }: unicode_segmentation_1_1_0_ { + features = mkFeatures (features.unicode_segmentation_1_1_0 or {}); + }; + unicode_segmentation_1_1_0_features = f: updateFeatures f (rec { + unicode_segmentation_1_1_0.default = (f.unicode_segmentation_1_1_0.default or true); + }) []; + unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { + features = mkFeatures (features.unicode_width_0_1_4 or {}); + }; + unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); + }) []; + vec_map_0_7_0 = { features?(vec_map_0_7_0_features {}) }: vec_map_0_7_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.vec_map_0_7_0 or {}); + }; + vec_map_0_7_0_features = f: updateFeatures f (rec { + vec_map_0_7_0.default = (f.vec_map_0_7_0.default or true); + vec_map_0_7_0.serde = + (f.vec_map_0_7_0.serde or false) || + (f.vec_map_0_7_0.eders or false) || + (vec_map_0_7_0.eders or false); + vec_map_0_7_0.serde_derive = + (f.vec_map_0_7_0.serde_derive or false) || + (f.vec_map_0_7_0.eders or false) || + (vec_map_0_7_0.eders or false); + }) []; + wc_grab_0_3_0 = { features?(wc_grab_0_3_0_features {}) }: wc_grab_0_3_0_ { + dependencies = mapFeatures features ([ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]); + }; + wc_grab_0_3_0_features = f: updateFeatures f (rec { + clap_2_22_0.default = true; + dbus_0_5_2.default = true; + image_0_12_3.default = true; + wc_grab_0_3_0.default = (f.wc_grab_0_3_0.default or true); + }) [ clap_2_22_0_features dbus_0_5_2_features image_0_12_3_features ]; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; +} diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix new file mode 100644 index 0000000000000000000000000000000000000000..80775112abc103049e649b598371b76a685909b9 --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix @@ -0,0 +1,1486 @@ +# Generated by carnix 0.6.5: carnix -o wc-lock.nix Cargo.lock +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); +in +rec { + wc_lock = f: wc_lock_0_2_1 { features = wc_lock_0_2_1_features { wc_lock_0_2_1 = f; }; }; + ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + inherit dependencies buildDependencies features; + }; + atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.2"; + authors = [ "softprops " ]; + sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.8.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2"; + inherit dependencies buildDependencies features; + }; + byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "0.5.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx"; + inherit dependencies buildDependencies features; + }; + byteorder_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.1.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp"; + inherit dependencies buildDependencies features; + }; + cc_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1s5ha0k6cdy1049a5kpzvhnjc9hjvi18zrcr5dmbqpd03ag751g1"; + inherit dependencies buildDependencies features; + }; + clap_2_24_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.24.2"; + authors = [ "Kevin K. " ]; + sha256 = "0028bkzafprs6n7ing8lnf7iss2a2zq17qmgadipgdfgvww43rmv"; + inherit dependencies buildDependencies features; + }; + coco_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "coco"; + version = "0.1.1"; + authors = [ "Stjepan Glavina " ]; + sha256 = "0hvj4jaj9y6i38c4dkii8nqq98cgx3kyx78cjqkdvk0aqq5sfr94"; + inherit dependencies buildDependencies features; + }; + color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "color_quant"; + version = "1.0.0"; + authors = [ "nwin " ]; + sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj"; + inherit dependencies buildDependencies features; + }; + dbus_0_5_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus"; + version = "0.5.4"; + authors = [ "David Henningsson " ]; + sha256 = "0qr62splq38b8vfjvpcpk9ph21d63ya7vd2vifs5wc8jzwc309yn"; + inherit dependencies buildDependencies features; + }; + dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.3.1"; + authors = [ "Victor Berger " ]; + sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.1"; + authors = [ "David Tolnay " ]; + sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw"; + inherit dependencies buildDependencies features; + }; + either_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "either"; + version = "1.2.0"; + authors = [ "bluss" ]; + sha256 = "0l72xaf1kwzgbl3andf3d2ggz7km9059rbmp90iywww8inlnqppp"; + inherit dependencies buildDependencies features; + }; + enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "enum_primitive"; + version = "0.1.1"; + authors = [ "Anders Kaseorg " ]; + sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y"; + inherit dependencies buildDependencies features; + }; + error_chain_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.10.0"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "1xxbzd8cjlpzsb9fsih7mdnndhzrvykj0w77yg90qc85az1xwy5z"; + inherit dependencies buildDependencies features; + }; + flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "flate2"; + version = "0.2.20"; + authors = [ "Alex Crichton " ]; + sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl"; + inherit dependencies buildDependencies features; + }; + fs2_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fs2"; + version = "0.2.5"; + authors = [ "Dan Burkert " ]; + sha256 = "0j6l5r95jigbl0lgkm69c82dzq10jipjbm9qnni147hb45gyw790"; + inherit dependencies buildDependencies features; + }; + futures_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "futures"; + version = "0.1.16"; + authors = [ "Alex Crichton " ]; + sha256 = "0ndk8cl6l600a95q8il2c3y38jz50nhfsczps0nziadqdd45gy2b"; + inherit dependencies buildDependencies features; + }; + gcc_0_3_50_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gcc"; + version = "0.3.50"; + authors = [ "Alex Crichton " ]; + sha256 = "032izcbbyiakv9ck5j3s27p3ddx4468n7qpaxgwi5iswmimjaaj0"; + inherit dependencies buildDependencies features; + }; + gif_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gif"; + version = "0.9.2"; + authors = [ "nwin " ]; + sha256 = "0dl76jrn6127w3bdg2b58p5psf8fpnbzdxdkw1i35ac8dn4vxcqa"; + inherit dependencies buildDependencies features; + }; + glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glob"; + version = "0.2.11"; + authors = [ "The Rust Project Developers" ]; + sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; + inherit dependencies buildDependencies features; + }; + image_0_10_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "image"; + version = "0.10.4"; + authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ]; + sha256 = "1pwrs7k5760b38i1lg872x9q2zc6xvhs7mjhlzvjnr5p85zx2fbw"; + libPath = "./src/lib.rs"; + inherit dependencies buildDependencies features; + }; + inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "inflate"; + version = "0.1.1"; + authors = [ "nwin " ]; + sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.1"; + authors = [ "David Tolnay " ]; + sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k"; + inherit dependencies buildDependencies features; + }; + jpeg_decoder_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "jpeg-decoder"; + version = "0.1.13"; + authors = [ "Ulf Nilsson " ]; + sha256 = "0w16gbywlm9p0p3wx34b85q4d1izrx89afcsxlc6g11cx2js4fa2"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.8"; + authors = [ "Marvin Löbel " ]; + sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl"; + inherit dependencies buildDependencies features; + }; + libc_0_2_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.23"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1i29f6k26fmv81c5bjc6hw2j95sd01h9ad66qxdc755b24xfa9jm"; + inherit dependencies buildDependencies features; + }; + libdbus_sys_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libdbus-sys"; + version = "0.1.1"; + authors = [ "David Henningsson " ]; + sha256 = "14kpislv2zazmgv5f8by4zkgkjxd0cwab8z6621kskjdwyir1wpy"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.3.4"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lzw"; + version = "0.10.0"; + authors = [ "nwin " ]; + sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb"; + inherit dependencies buildDependencies features; + }; + memmap_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memmap"; + version = "0.4.0"; + authors = [ "Dan Burkert " ]; + sha256 = "0q2gm5p8n9najc8kccbxxkannmnjh85rin4k8d4y1kg5ymdp6kll"; + inherit dependencies buildDependencies features; + }; + metadeps_1_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "metadeps"; + version = "1.1.2"; + authors = [ "Josh Triplett " ]; + sha256 = "00dpxjls9fq6fs5gr9v3hkqxmb1zwnhh8b56q3dnzghppjf3ivk3"; + inherit dependencies buildDependencies features; + }; + miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miniz-sys"; + version = "0.1.10"; + authors = [ "Alex Crichton " ]; + sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln"; + libPath = "lib.rs"; + libName = "miniz_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + num_bigint_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-bigint"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0pkxd9mb4chdbipprxjc8ll7kjh79n278s2z663zmd80yg5xi788"; + inherit dependencies buildDependencies features; + }; + num_integer_0_1_35_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.35"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc"; + inherit dependencies buildDependencies features; + }; + num_iter_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.34"; + authors = [ "The Rust Project Developers" ]; + sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9"; + inherit dependencies buildDependencies features; + }; + num_rational_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-rational"; + version = "0.1.39"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1qsacdfp97zgpajc2pgbrbga3yag1f0k7yz0gi78vd165gxdwk3m"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.37"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.6.2"; + authors = [ "Sean McArthur " ]; + sha256 = "0wxfzxsk05xbkph5qcvdqyi334zn0pnpahzi7n7iagxbb68145rm"; + inherit dependencies buildDependencies features; + }; + phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; + inherit dependencies buildDependencies features; + }; + phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; + inherit dependencies buildDependencies features; + }; + phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + png_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "png"; + version = "0.5.2"; + authors = [ "nwin " ]; + sha256 = "1pgann3f1ysgf8y1acw86v4s3ji1xk85ri353biyvh4i1cpn1g3q"; + inherit dependencies buildDependencies features; + }; + rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; + inherit dependencies buildDependencies features; + }; + rayon_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon"; + version = "0.8.2"; + authors = [ "Niko Matsakis " "Josh Stone " ]; + sha256 = "0d0mddg1k75hb9138pn8lysy2095jijrinskqbpgfr73s0jx6dq8"; + inherit dependencies buildDependencies features; + }; + rayon_core_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon-core"; + version = "1.2.1"; + authors = [ "Niko Matsakis " "Josh Stone " ]; + sha256 = "12xv2r0dqrgvla24bl5mfvcw0599dlhrj0mx620nq95nyds753kk"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-serialize"; + version = "0.3.24"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn"; + inherit dependencies buildDependencies features; + }; + rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc_version"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; + inherit dependencies buildDependencies features; + }; + scoped_threadpool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.8"; + authors = [ "Marvin Löbel " ]; + sha256 = "1al42hqbbijpah9bc6hw9c49nhnyrc0sj274ja1q3k9305c3s5a6"; + inherit dependencies buildDependencies features; + }; + scopeguard_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scopeguard"; + version = "0.3.2"; + authors = [ "bluss" ]; + sha256 = "0xlvfawva4fnp6kwr5xjwf0q2d1w6di81nhfby1sa55xj1ia5zs2"; + inherit dependencies buildDependencies features; + }; + semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.1.20"; + authors = [ "The Rust Project Developers" ]; + sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; + inherit dependencies buildDependencies features; + }; + serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "0.9.15"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b"; + inherit dependencies buildDependencies features; + }; + serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "0.9.10"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; + inherit dependencies buildDependencies features; + }; + siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + authors = [ "Frank Denis " ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "target_build_utils"; + version = "0.3.1"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + tempfile_2_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempfile"; + version = "2.1.5"; + authors = [ "Steven Allen " ]; + sha256 = "1yz8aaj78z9gsn4b71y0m6fa5bnxhqafcczhxvmwra56k943aqkw"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "term_size"; + version = "0.3.0"; + authors = [ "Kevin K. " "Benjamin Sago " ]; + sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs"; + inherit dependencies buildDependencies features; + }; + toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs"; + inherit dependencies buildDependencies features; + }; + unicode_segmentation_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-segmentation"; + version = "1.2.0"; + authors = [ "kwantam " ]; + sha256 = "0yz43x7wrhr3n7a2zsinx3r60yxsdqicg8a5kycyyhdaq1zmiz1y"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; + inherit dependencies buildDependencies features; + }; + way_cooler_client_helpers_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "way-cooler-client-helpers"; + version = "0.1.0"; + authors = [ "Timidger " ]; + sha256 = "0749lh5crd0rhq4dxij9mb3y5902laazjd01l6ci5782bjfk4s39"; + inherit dependencies buildDependencies features; + }; + wayland_client_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-client"; + version = "0.9.6"; + authors = [ "Victor Berger " ]; + sha256 = "1908h6ilvq2cxph1lxv1vzrb3dcfx4x6pf6pszxwifsfqva8nm34"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_kbd_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-kbd"; + version = "0.9.0"; + authors = [ "Victor Berger " ]; + sha256 = "1x0f7n79hjwf5fclf62fpzjp05xdzc93xw84zgyrn8f1hill3qhj"; + inherit dependencies buildDependencies features; + }; + wayland_scanner_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-scanner"; + version = "0.9.6"; + authors = [ "Victor Berger " ]; + sha256 = "1w5cyc48g4x5w3rakb4sji5328rl5yph1abmjbh5h4slkm4n76g1"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.9.6"; + authors = [ "Victor Berger " ]; + sha256 = "0izw50pmj1r10hmr29gi8ps01avs6zjwisywijlq7wr268h6yxcg"; + inherit dependencies buildDependencies features; + }; + wc_lock_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wc-lock"; + version = "0.2.1"; + authors = [ "Timidger " ]; + sha256 = "0ikmir7azihxiyzgb0wnvk81yinmn2l6k93bnb1qg4k704zcyq84"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xml-rs"; + version = "0.3.6"; + authors = [ "Vladimir Matveev " ]; + sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15"; + libPath = "src/lib.rs"; + libName = "xml"; + crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; + inherit dependencies buildDependencies features; + }; + ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; + ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); + }) []; + atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ { + dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_23 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + atty_0_2_2_features = f: updateFeatures f (rec { + atty_0_2_2.default = (f.atty_0_2_2.default or true); + kernel32_sys_0_2_2.default = true; + libc_0_2_23.default = true; + winapi_0_2_8.default = true; + }) [ libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; + bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); + }) []; + bitflags_0_8_2 = { features?(bitflags_0_8_2_features {}) }: bitflags_0_8_2_ { + features = mkFeatures (features.bitflags_0_8_2 or {}); + }; + bitflags_0_8_2_features = f: updateFeatures f (rec { + bitflags_0_8_2.default = (f.bitflags_0_8_2.default or true); + bitflags_0_8_2.i128 = + (f.bitflags_0_8_2.i128 or false) || + (f.bitflags_0_8_2.unstable or false) || + (bitflags_0_8_2.unstable or false); + }) []; + byteorder_0_5_3 = { features?(byteorder_0_5_3_features {}) }: byteorder_0_5_3_ { + features = mkFeatures (features.byteorder_0_5_3 or {}); + }; + byteorder_0_5_3_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = (f.byteorder_0_5_3.default or true); + byteorder_0_5_3.std = + (f.byteorder_0_5_3.std or false) || + (f.byteorder_0_5_3.default or false) || + (byteorder_0_5_3.default or false); + }) []; + byteorder_1_1_0 = { features?(byteorder_1_1_0_features {}) }: byteorder_1_1_0_ { + features = mkFeatures (features.byteorder_1_1_0 or {}); + }; + byteorder_1_1_0_features = f: updateFeatures f (rec { + byteorder_1_1_0.default = (f.byteorder_1_1_0.default or true); + byteorder_1_1_0.std = + (f.byteorder_1_1_0.std or false) || + (f.byteorder_1_1_0.default or false) || + (byteorder_1_1_0.default or false); + }) []; + cc_1_0_0 = { features?(cc_1_0_0_features {}) }: cc_1_0_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.cc_1_0_0 or {}); + }; + cc_1_0_0_features = f: updateFeatures f (rec { + cc_1_0_0.default = (f.cc_1_0_0.default or true); + cc_1_0_0.rayon = + (f.cc_1_0_0.rayon or false) || + (f.cc_1_0_0.parallel or false) || + (cc_1_0_0.parallel or false); + }) []; + clap_2_24_2 = { features?(clap_2_24_2_features {}) }: clap_2_24_2_ { + dependencies = mapFeatures features ([ bitflags_0_8_2 unicode_segmentation_1_2_0 unicode_width_0_1_4 vec_map_0_8_0 ] + ++ (if features.clap_2_24_2.ansi_term or false then [ ansi_term_0_9_0 ] else []) + ++ (if features.clap_2_24_2.atty or false then [ atty_0_2_2 ] else []) + ++ (if features.clap_2_24_2.strsim or false then [ strsim_0_6_0 ] else []) + ++ (if features.clap_2_24_2.term_size or false then [ term_size_0_3_0 ] else [])); + features = mkFeatures (features.clap_2_24_2 or {}); + }; + clap_2_24_2_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = true; + atty_0_2_2.default = true; + bitflags_0_8_2.default = true; + clap_2_24_2.ansi_term = + (f.clap_2_24_2.ansi_term or false) || + (f.clap_2_24_2.color or false) || + (clap_2_24_2.color or false); + clap_2_24_2.atty = + (f.clap_2_24_2.atty or false) || + (f.clap_2_24_2.color or false) || + (clap_2_24_2.color or false); + clap_2_24_2.clippy = + (f.clap_2_24_2.clippy or false) || + (f.clap_2_24_2.lints or false) || + (clap_2_24_2.lints or false); + clap_2_24_2.color = + (f.clap_2_24_2.color or false) || + (f.clap_2_24_2.default or false) || + (clap_2_24_2.default or false); + clap_2_24_2.default = (f.clap_2_24_2.default or true); + clap_2_24_2.strsim = + (f.clap_2_24_2.strsim or false) || + (f.clap_2_24_2.suggestions or false) || + (clap_2_24_2.suggestions or false); + clap_2_24_2.suggestions = + (f.clap_2_24_2.suggestions or false) || + (f.clap_2_24_2.default or false) || + (clap_2_24_2.default or false); + clap_2_24_2.term_size = + (f.clap_2_24_2.term_size or false) || + (f.clap_2_24_2.wrap_help or false) || + (clap_2_24_2.wrap_help or false); + clap_2_24_2.wrap_help = + (f.clap_2_24_2.wrap_help or false) || + (f.clap_2_24_2.default or false) || + (clap_2_24_2.default or false); + clap_2_24_2.yaml-rust = + (f.clap_2_24_2.yaml-rust or false) || + (f.clap_2_24_2.yaml or false) || + (clap_2_24_2.yaml or false); + strsim_0_6_0.default = true; + term_size_0_3_0.default = true; + unicode_segmentation_1_2_0.default = true; + unicode_width_0_1_4.default = true; + vec_map_0_8_0.default = true; + }) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_2_features strsim_0_6_0_features term_size_0_3_0_features unicode_segmentation_1_2_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ]; + coco_0_1_1 = { features?(coco_0_1_1_features {}) }: coco_0_1_1_ { + dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]); + features = mkFeatures (features.coco_0_1_1 or {}); + }; + coco_0_1_1_features = f: updateFeatures f (rec { + coco_0_1_1.default = (f.coco_0_1_1.default or true); + either_1_2_0.default = true; + scopeguard_0_3_2.default = true; + }) [ either_1_2_0_features scopeguard_0_3_2_features ]; + color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; + color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); + }) []; + dbus_0_5_4 = { features?(dbus_0_5_4_features {}) }: dbus_0_5_4_ { + dependencies = mapFeatures features ([ libc_0_2_23 libdbus_sys_0_1_1 ]); + features = mkFeatures (features.dbus_0_5_4 or {}); + }; + dbus_0_5_4_features = f: updateFeatures f (rec { + dbus_0_5_4.default = (f.dbus_0_5_4.default or true); + libc_0_2_23.default = true; + libdbus_sys_0_1_1.default = true; + }) [ libc_0_2_23_features libdbus_sys_0_1_1_features ]; + dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ { + dependencies = mapFeatures features ([ libloading_0_3_4 ]); + features = mkFeatures (features.dlib_0_3_1 or {}); + }; + dlib_0_3_1_features = f: updateFeatures f (rec { + dlib_0_3_1.default = (f.dlib_0_3_1.default or true); + libloading_0_3_4.default = true; + }) [ libloading_0_3_4_features ]; + dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {}; + dtoa_0_4_1_features = f: updateFeatures f (rec { + dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true); + }) []; + either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ { + features = mkFeatures (features.either_1_2_0 or {}); + }; + either_1_2_0_features = f: updateFeatures f (rec { + either_1_2_0.default = (f.either_1_2_0.default or true); + either_1_2_0.use_std = + (f.either_1_2_0.use_std or false) || + (f.either_1_2_0.default or false) || + (either_1_2_0.default or false); + }) []; + enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { + dependencies = mapFeatures features ([ num_traits_0_1_37 ]); + }; + enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); + num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false); + }) [ num_traits_0_1_37_features ]; + error_chain_0_10_0 = { features?(error_chain_0_10_0_features {}) }: error_chain_0_10_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.error_chain_0_10_0 or {}); + }; + error_chain_0_10_0_features = f: updateFeatures f (rec { + error_chain_0_10_0.backtrace = + (f.error_chain_0_10_0.backtrace or false) || + (f.error_chain_0_10_0.default or false) || + (error_chain_0_10_0.default or false); + error_chain_0_10_0.default = (f.error_chain_0_10_0.default or true); + error_chain_0_10_0.example_generated = + (f.error_chain_0_10_0.example_generated or false) || + (f.error_chain_0_10_0.default or false) || + (error_chain_0_10_0.default or false); + }) []; + flate2_0_2_20 = { features?(flate2_0_2_20_features {}) }: flate2_0_2_20_ { + dependencies = mapFeatures features ([ libc_0_2_23 ] + ++ (if features.flate2_0_2_20.miniz-sys or false then [ miniz_sys_0_1_10 ] else [])); + features = mkFeatures (features.flate2_0_2_20 or {}); + }; + flate2_0_2_20_features = f: updateFeatures f (rec { + flate2_0_2_20.default = (f.flate2_0_2_20.default or true); + flate2_0_2_20.futures = + (f.flate2_0_2_20.futures or false) || + (f.flate2_0_2_20.tokio or false) || + (flate2_0_2_20.tokio or false); + flate2_0_2_20.libz-sys = + (f.flate2_0_2_20.libz-sys or false) || + (f.flate2_0_2_20.zlib or false) || + (flate2_0_2_20.zlib or false); + flate2_0_2_20.miniz-sys = + (f.flate2_0_2_20.miniz-sys or false) || + (f.flate2_0_2_20.default or false) || + (flate2_0_2_20.default or false); + flate2_0_2_20.tokio-io = + (f.flate2_0_2_20.tokio-io or false) || + (f.flate2_0_2_20.tokio or false) || + (flate2_0_2_20.tokio or false); + libc_0_2_23.default = true; + miniz_sys_0_1_10.default = true; + }) [ libc_0_2_23_features miniz_sys_0_1_10_features ]; + fs2_0_2_5 = { features?(fs2_0_2_5_features {}) }: fs2_0_2_5_ { + dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]); + }; + fs2_0_2_5_features = f: updateFeatures f (rec { + fs2_0_2_5.default = (f.fs2_0_2_5.default or true); + kernel32_sys_0_2_2.default = true; + libc_0_2_23.default = true; + winapi_0_2_8.default = true; + }) [ kernel32_sys_0_2_2_features libc_0_2_23_features winapi_0_2_8_features ]; + futures_0_1_16 = { features?(futures_0_1_16_features {}) }: futures_0_1_16_ { + features = mkFeatures (features.futures_0_1_16 or {}); + }; + futures_0_1_16_features = f: updateFeatures f (rec { + futures_0_1_16.default = (f.futures_0_1_16.default or true); + futures_0_1_16.use_std = + (f.futures_0_1_16.use_std or false) || + (f.futures_0_1_16.default or false) || + (futures_0_1_16.default or false); + futures_0_1_16.with-deprecated = + (f.futures_0_1_16.with-deprecated or false) || + (f.futures_0_1_16.default or false) || + (futures_0_1_16.default or false); + }) []; + gcc_0_3_50 = { features?(gcc_0_3_50_features {}) }: gcc_0_3_50_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.gcc_0_3_50 or {}); + }; + gcc_0_3_50_features = f: updateFeatures f (rec { + gcc_0_3_50.default = (f.gcc_0_3_50.default or true); + gcc_0_3_50.rayon = + (f.gcc_0_3_50.rayon or false) || + (f.gcc_0_3_50.parallel or false) || + (gcc_0_3_50.parallel or false); + }) []; + gif_0_9_2 = { features?(gif_0_9_2_features {}) }: gif_0_9_2_ { + dependencies = mapFeatures features ([ color_quant_1_0_0 lzw_0_10_0 ]); + features = mkFeatures (features.gif_0_9_2 or {}); + }; + gif_0_9_2_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = true; + gif_0_9_2.default = (f.gif_0_9_2.default or true); + gif_0_9_2.libc = + (f.gif_0_9_2.libc or false) || + (f.gif_0_9_2.c_api or false) || + (gif_0_9_2.c_api or false); + gif_0_9_2.raii_no_panic = + (f.gif_0_9_2.raii_no_panic or false) || + (f.gif_0_9_2.default or false) || + (gif_0_9_2.default or false); + lzw_0_10_0.default = true; + }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; + glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; + glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11.default = (f.glob_0_2_11.default or true); + }) []; + image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ { + dependencies = mapFeatures features ([ byteorder_0_5_3 enum_primitive_0_1_1 glob_0_2_11 num_iter_0_1_34 num_rational_0_1_39 num_traits_0_1_37 ] + ++ (if features.image_0_10_4.gif or false then [ gif_0_9_2 ] else []) + ++ (if features.image_0_10_4.jpeg-decoder or false then [ jpeg_decoder_0_1_13 ] else []) + ++ (if features.image_0_10_4.png or false then [ png_0_5_2 ] else []) + ++ (if features.image_0_10_4.scoped_threadpool or false then [ scoped_threadpool_0_1_8 ] else [])); + features = mkFeatures (features.image_0_10_4 or {}); + }; + image_0_10_4_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = true; + enum_primitive_0_1_1.default = true; + gif_0_9_2.default = true; + glob_0_2_11.default = true; + image_0_10_4.bmp = + (f.image_0_10_4.bmp or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false) || + (f.image_0_10_4.ico or false) || + (image_0_10_4.ico or false); + image_0_10_4.default = (f.image_0_10_4.default or true); + image_0_10_4.gif = + (f.image_0_10_4.gif or false) || + (f.image_0_10_4.gif_codec or false) || + (image_0_10_4.gif_codec or false); + image_0_10_4.gif_codec = + (f.image_0_10_4.gif_codec or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.hdr = + (f.image_0_10_4.hdr or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.ico = + (f.image_0_10_4.ico or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.jpeg = + (f.image_0_10_4.jpeg or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.jpeg-decoder = + (f.image_0_10_4.jpeg-decoder or false) || + (f.image_0_10_4.jpeg or false) || + (image_0_10_4.jpeg or false); + image_0_10_4.png = + (f.image_0_10_4.png or false) || + (f.image_0_10_4.png_codec or false) || + (image_0_10_4.png_codec or false); + image_0_10_4.png_codec = + (f.image_0_10_4.png_codec or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false) || + (f.image_0_10_4.ico or false) || + (image_0_10_4.ico or false); + image_0_10_4.ppm = + (f.image_0_10_4.ppm or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.scoped_threadpool = + (f.image_0_10_4.scoped_threadpool or false) || + (f.image_0_10_4.hdr or false) || + (image_0_10_4.hdr or false); + image_0_10_4.tga = + (f.image_0_10_4.tga or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.tiff = + (f.image_0_10_4.tiff or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.webp = + (f.image_0_10_4.webp or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + jpeg_decoder_0_1_13.default = true; + num_iter_0_1_34.default = true; + num_rational_0_1_39.default = true; + num_traits_0_1_37.default = true; + png_0_5_2.default = true; + scoped_threadpool_0_1_8.default = true; + }) [ byteorder_0_5_3_features enum_primitive_0_1_1_features gif_0_9_2_features glob_0_2_11_features jpeg_decoder_0_1_13_features num_iter_0_1_34_features num_rational_0_1_39_features num_traits_0_1_37_features png_0_5_2_features scoped_threadpool_0_1_8_features ]; + inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { + features = mkFeatures (features.inflate_0_1_1 or {}); + }; + inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1.default = (f.inflate_0_1_1.default or true); + }) []; + itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {}; + itoa_0_3_1_features = f: updateFeatures f (rec { + itoa_0_3_1.default = (f.itoa_0_3_1.default or true); + }) []; + jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ { + dependencies = mapFeatures features ([ byteorder_1_1_0 ] + ++ (if features.jpeg_decoder_0_1_13.rayon or false then [ rayon_0_8_2 ] else [])); + features = mkFeatures (features.jpeg_decoder_0_1_13 or {}); + }; + jpeg_decoder_0_1_13_features = f: updateFeatures f (rec { + byteorder_1_1_0.default = true; + jpeg_decoder_0_1_13.default = (f.jpeg_decoder_0_1_13.default or true); + jpeg_decoder_0_1_13.rayon = + (f.jpeg_decoder_0_1_13.rayon or false) || + (f.jpeg_decoder_0_1_13.default or false) || + (jpeg_decoder_0_1_13.default or false); + rayon_0_8_2.default = true; + }) [ byteorder_1_1_0_features rayon_0_8_2_features ]; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + lazy_static_0_2_8 = { features?(lazy_static_0_2_8_features {}) }: lazy_static_0_2_8_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_0_2_8 or {}); + }; + lazy_static_0_2_8_features = f: updateFeatures f (rec { + lazy_static_0_2_8.default = (f.lazy_static_0_2_8.default or true); + lazy_static_0_2_8.nightly = + (f.lazy_static_0_2_8.nightly or false) || + (f.lazy_static_0_2_8.spin_no_std or false) || + (lazy_static_0_2_8.spin_no_std or false); + lazy_static_0_2_8.spin = + (f.lazy_static_0_2_8.spin or false) || + (f.lazy_static_0_2_8.spin_no_std or false) || + (lazy_static_0_2_8.spin_no_std or false); + }) []; + libc_0_2_23 = { features?(libc_0_2_23_features {}) }: libc_0_2_23_ { + features = mkFeatures (features.libc_0_2_23 or {}); + }; + libc_0_2_23_features = f: updateFeatures f (rec { + libc_0_2_23.default = (f.libc_0_2_23.default or true); + libc_0_2_23.use_std = + (f.libc_0_2_23.use_std or false) || + (f.libc_0_2_23.default or false) || + (libc_0_2_23.default or false); + }) []; + libdbus_sys_0_1_1 = { features?(libdbus_sys_0_1_1_features {}) }: libdbus_sys_0_1_1_ { + buildDependencies = mapFeatures features ([ metadeps_1_1_2 ]);}; + libdbus_sys_0_1_1_features = f: updateFeatures f (rec { + libdbus_sys_0_1_1.default = (f.libdbus_sys_0_1_1.default or true); + metadeps_1_1_2.default = true; + }) [ metadeps_1_1_2_features ]; + libloading_0_3_4 = { features?(libloading_0_3_4_features {}) }: libloading_0_3_4_ { + dependencies = mapFeatures features ([ lazy_static_0_2_8 ]) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]); + }; + libloading_0_3_4_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + lazy_static_0_2_8.default = true; + libloading_0_3_4.default = (f.libloading_0_3_4.default or true); + target_build_utils_0_3_1.default = true; + winapi_0_2_8.default = true; + }) [ lazy_static_0_2_8_features target_build_utils_0_3_1_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + lzw_0_10_0 = { features?(lzw_0_10_0_features {}) }: lzw_0_10_0_ { + features = mkFeatures (features.lzw_0_10_0 or {}); + }; + lzw_0_10_0_features = f: updateFeatures f (rec { + lzw_0_10_0.default = (f.lzw_0_10_0.default or true); + lzw_0_10_0.raii_no_panic = + (f.lzw_0_10_0.raii_no_panic or false) || + (f.lzw_0_10_0.default or false) || + (lzw_0_10_0.default or false); + }) []; + memmap_0_4_0 = { features?(memmap_0_4_0_features {}) }: memmap_0_4_0_ { + dependencies = mapFeatures features ([ fs2_0_2_5 kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]); + }; + memmap_0_4_0_features = f: updateFeatures f (rec { + fs2_0_2_5.default = true; + kernel32_sys_0_2_2.default = true; + libc_0_2_23.default = true; + memmap_0_4_0.default = (f.memmap_0_4_0.default or true); + winapi_0_2_8.default = true; + }) [ fs2_0_2_5_features kernel32_sys_0_2_2_features libc_0_2_23_features winapi_0_2_8_features ]; + metadeps_1_1_2 = { features?(metadeps_1_1_2_features {}) }: metadeps_1_1_2_ { + dependencies = mapFeatures features ([ error_chain_0_10_0 pkg_config_0_3_9 toml_0_2_1 ]); + }; + metadeps_1_1_2_features = f: updateFeatures f (rec { + error_chain_0_10_0.default = (f.error_chain_0_10_0.default or false); + metadeps_1_1_2.default = (f.metadeps_1_1_2.default or true); + pkg_config_0_3_9.default = true; + toml_0_2_1.default = (f.toml_0_2_1.default or false); + }) [ error_chain_0_10_0_features pkg_config_0_3_9_features toml_0_2_1_features ]; + miniz_sys_0_1_10 = { features?(miniz_sys_0_1_10_features {}) }: miniz_sys_0_1_10_ { + dependencies = mapFeatures features ([ libc_0_2_23 ]); + buildDependencies = mapFeatures features ([ cc_1_0_0 ]); + }; + miniz_sys_0_1_10_features = f: updateFeatures f (rec { + cc_1_0_0.default = true; + libc_0_2_23.default = true; + miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true); + }) [ libc_0_2_23_features cc_1_0_0_features ]; + num_bigint_0_1_40 = { features?(num_bigint_0_1_40_features {}) }: num_bigint_0_1_40_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ] + ++ (if features.num_bigint_0_1_40.rand or false then [ rand_0_3_15 ] else []) + ++ (if features.num_bigint_0_1_40.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else [])); + features = mkFeatures (features.num_bigint_0_1_40 or {}); + }; + num_bigint_0_1_40_features = f: updateFeatures f (rec { + num_bigint_0_1_40.default = (f.num_bigint_0_1_40.default or true); + num_bigint_0_1_40.rand = + (f.num_bigint_0_1_40.rand or false) || + (f.num_bigint_0_1_40.default or false) || + (num_bigint_0_1_40.default or false); + num_bigint_0_1_40.rustc-serialize = + (f.num_bigint_0_1_40.rustc-serialize or false) || + (f.num_bigint_0_1_40.default or false) || + (num_bigint_0_1_40.default or false); + num_integer_0_1_35.default = true; + num_traits_0_1_37.default = true; + rand_0_3_15.default = true; + rustc_serialize_0_3_24.default = true; + }) [ num_integer_0_1_35_features num_traits_0_1_37_features rand_0_3_15_features rustc_serialize_0_3_24_features ]; + num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { + dependencies = mapFeatures features ([ num_traits_0_1_37 ]); + }; + num_integer_0_1_35_features = f: updateFeatures f (rec { + num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); + num_traits_0_1_37.default = true; + }) [ num_traits_0_1_37_features ]; + num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ]); + }; + num_iter_0_1_34_features = f: updateFeatures f (rec { + num_integer_0_1_35.default = true; + num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); + num_traits_0_1_37.default = true; + }) [ num_integer_0_1_35_features num_traits_0_1_37_features ]; + num_rational_0_1_39 = { features?(num_rational_0_1_39_features {}) }: num_rational_0_1_39_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ] + ++ (if features.num_rational_0_1_39.num-bigint or false then [ num_bigint_0_1_40 ] else []) + ++ (if features.num_rational_0_1_39.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else [])); + features = mkFeatures (features.num_rational_0_1_39 or {}); + }; + num_rational_0_1_39_features = f: updateFeatures f (rec { + num_bigint_0_1_40.default = true; + num_integer_0_1_35.default = true; + num_rational_0_1_39.bigint = + (f.num_rational_0_1_39.bigint or false) || + (f.num_rational_0_1_39.default or false) || + (num_rational_0_1_39.default or false); + num_rational_0_1_39.default = (f.num_rational_0_1_39.default or true); + num_rational_0_1_39.num-bigint = + (f.num_rational_0_1_39.num-bigint or false) || + (f.num_rational_0_1_39.bigint or false) || + (num_rational_0_1_39.bigint or false); + num_rational_0_1_39.rustc-serialize = + (f.num_rational_0_1_39.rustc-serialize or false) || + (f.num_rational_0_1_39.default or false) || + (num_rational_0_1_39.default or false); + num_traits_0_1_37.default = true; + rustc_serialize_0_3_24.default = true; + }) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_37_features rustc_serialize_0_3_24_features ]; + num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {}; + num_traits_0_1_37_features = f: updateFeatures f (rec { + num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true); + }) []; + num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ { + dependencies = mapFeatures features ([ libc_0_2_23 ]); + }; + num_cpus_1_6_2_features = f: updateFeatures f (rec { + libc_0_2_23.default = true; + num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true); + }) [ libc_0_2_23_features ]; + phf_0_7_21 = { features?(phf_0_7_21_features {}) }: phf_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 ]); + features = mkFeatures (features.phf_0_7_21 or {}); + }; + phf_0_7_21_features = f: updateFeatures f (rec { + phf_0_7_21.default = (f.phf_0_7_21.default or true); + phf_shared_0_7_21.core = + (f.phf_shared_0_7_21.core or false) || + (phf_0_7_21.core or false) || + (f.phf_0_7_21.core or false); + phf_shared_0_7_21.default = true; + phf_shared_0_7_21.unicase = + (f.phf_shared_0_7_21.unicase or false) || + (phf_0_7_21.unicase or false) || + (f.phf_0_7_21.unicase or false); + }) [ phf_shared_0_7_21_features ]; + phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ { + dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]); + }; + phf_codegen_0_7_21_features = f: updateFeatures f (rec { + phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true); + phf_generator_0_7_21.default = true; + phf_shared_0_7_21.default = true; + }) [ phf_generator_0_7_21_features phf_shared_0_7_21_features ]; + phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_15 ]); + }; + phf_generator_0_7_21_features = f: updateFeatures f (rec { + phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true); + phf_shared_0_7_21.default = true; + rand_0_3_15.default = true; + }) [ phf_shared_0_7_21_features rand_0_3_15_features ]; + phf_shared_0_7_21 = { features?(phf_shared_0_7_21_features {}) }: phf_shared_0_7_21_ { + dependencies = mapFeatures features ([ siphasher_0_2_2 ]); + features = mkFeatures (features.phf_shared_0_7_21 or {}); + }; + phf_shared_0_7_21_features = f: updateFeatures f (rec { + phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true); + siphasher_0_2_2.default = true; + }) [ siphasher_0_2_2_features ]; + pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; + pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); + }) []; + png_0_5_2 = { features?(png_0_5_2_features {}) }: png_0_5_2_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 inflate_0_1_1 num_iter_0_1_34 ] + ++ (if features.png_0_5_2.flate2 or false then [ flate2_0_2_20 ] else [])); + features = mkFeatures (features.png_0_5_2 or {}); + }; + png_0_5_2_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + flate2_0_2_20.default = true; + inflate_0_1_1.default = true; + num_iter_0_1_34.default = true; + png_0_5_2.default = (f.png_0_5_2.default or true); + png_0_5_2.flate2 = + (f.png_0_5_2.flate2 or false) || + (f.png_0_5_2.png-encoding or false) || + (png_0_5_2.png-encoding or false); + png_0_5_2.png-encoding = + (f.png_0_5_2.png-encoding or false) || + (f.png_0_5_2.default or false) || + (png_0_5_2.default or false); + }) [ bitflags_0_7_0_features flate2_0_2_20_features inflate_0_1_1_features num_iter_0_1_34_features ]; + rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ { + dependencies = mapFeatures features ([ libc_0_2_23 ]); + }; + rand_0_3_15_features = f: updateFeatures f (rec { + libc_0_2_23.default = true; + rand_0_3_15.default = (f.rand_0_3_15.default or true); + }) [ libc_0_2_23_features ]; + rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ { + dependencies = mapFeatures features ([ rayon_core_1_2_1 ]); + }; + rayon_0_8_2_features = f: updateFeatures f (rec { + rayon_0_8_2.default = (f.rayon_0_8_2.default or true); + rayon_core_1_2_1.default = true; + }) [ rayon_core_1_2_1_features ]; + rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ { + dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_8 libc_0_2_23 num_cpus_1_6_2 rand_0_3_15 ]); + }; + rayon_core_1_2_1_features = f: updateFeatures f (rec { + coco_0_1_1.default = true; + futures_0_1_16.default = true; + lazy_static_0_2_8.default = true; + libc_0_2_23.default = true; + num_cpus_1_6_2.default = true; + rand_0_3_15.default = true; + rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true); + }) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_8_features libc_0_2_23_features num_cpus_1_6_2_features rand_0_3_15_features ]; + rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {}; + rustc_serialize_0_3_24_features = f: updateFeatures f (rec { + rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true); + }) []; + rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ { + dependencies = mapFeatures features ([ semver_0_1_20 ]); + }; + rustc_version_0_1_7_features = f: updateFeatures f (rec { + rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true); + semver_0_1_20.default = true; + }) [ semver_0_1_20_features ]; + scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ { + features = mkFeatures (features.scoped_threadpool_0_1_8 or {}); + }; + scoped_threadpool_0_1_8_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true); + }) []; + scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ { + features = mkFeatures (features.scopeguard_0_3_2 or {}); + }; + scopeguard_0_3_2_features = f: updateFeatures f (rec { + scopeguard_0_3_2.default = (f.scopeguard_0_3_2.default or true); + scopeguard_0_3_2.use_std = + (f.scopeguard_0_3_2.use_std or false) || + (f.scopeguard_0_3_2.default or false) || + (scopeguard_0_3_2.default or false); + }) []; + semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {}; + semver_0_1_20_features = f: updateFeatures f (rec { + semver_0_1_20.default = (f.semver_0_1_20.default or true); + }) []; + serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_0_9_15 or {}); + }; + serde_0_9_15_features = f: updateFeatures f (rec { + serde_0_9_15.alloc = + (f.serde_0_9_15.alloc or false) || + (f.serde_0_9_15.collections or false) || + (serde_0_9_15.collections or false); + serde_0_9_15.default = (f.serde_0_9_15.default or true); + serde_0_9_15.serde_derive = + (f.serde_0_9_15.serde_derive or false) || + (f.serde_0_9_15.derive or false) || + (serde_0_9_15.derive or false) || + (f.serde_0_9_15.playground or false) || + (serde_0_9_15.playground or false); + serde_0_9_15.std = + (f.serde_0_9_15.std or false) || + (f.serde_0_9_15.default or false) || + (serde_0_9_15.default or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + serde_0_9_15.unstable = + (f.serde_0_9_15.unstable or false) || + (f.serde_0_9_15.alloc or false) || + (serde_0_9_15.alloc or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + }) []; + serde_json_0_9_10 = { features?(serde_json_0_9_10_features {}) }: serde_json_0_9_10_ { + dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_15 ]); + features = mkFeatures (features.serde_json_0_9_10 or {}); + }; + serde_json_0_9_10_features = f: updateFeatures f (rec { + dtoa_0_4_1.default = true; + itoa_0_3_1.default = true; + num_traits_0_1_37.default = true; + serde_0_9_15.default = true; + serde_json_0_9_10.default = (f.serde_json_0_9_10.default or true); + serde_json_0_9_10.linked-hash-map = + (f.serde_json_0_9_10.linked-hash-map or false) || + (f.serde_json_0_9_10.preserve_order or false) || + (serde_json_0_9_10.preserve_order or false); + }) [ dtoa_0_4_1_features itoa_0_3_1_features num_traits_0_1_37_features serde_0_9_15_features ]; + siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { + dependencies = mapFeatures features ([]); + }; + siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); + }) []; + strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; + strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0.default = (f.strsim_0_6_0.default or true); + }) []; + target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ { + dependencies = mapFeatures features ([ phf_0_7_21 ] + ++ (if features.target_build_utils_0_3_1.serde_json or false then [ serde_json_0_9_10 ] else [])); + buildDependencies = mapFeatures features ([ phf_codegen_0_7_21 ]); + features = mkFeatures (features.target_build_utils_0_3_1 or {}); + }; + target_build_utils_0_3_1_features = f: updateFeatures f (rec { + phf_0_7_21.default = true; + phf_codegen_0_7_21.default = true; + serde_json_0_9_10.default = true; + target_build_utils_0_3_1.default = (f.target_build_utils_0_3_1.default or true); + target_build_utils_0_3_1.serde_json = + (f.target_build_utils_0_3_1.serde_json or false) || + (f.target_build_utils_0_3_1.default or false) || + (target_build_utils_0_3_1.default or false); + }) [ phf_0_7_21_features serde_json_0_9_10_features phf_codegen_0_7_21_features ]; + tempfile_2_1_5 = { features?(tempfile_2_1_5_features {}) }: tempfile_2_1_5_ { + dependencies = mapFeatures features ([ rand_0_3_15 ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_23 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]); + }; + tempfile_2_1_5_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_23.default = true; + rand_0_3_15.default = true; + rustc_version_0_1_7.default = true; + tempfile_2_1_5.default = (f.tempfile_2_1_5.default or true); + winapi_0_2_8.default = true; + }) [ rand_0_3_15_features rustc_version_0_1_7_features libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + term_size_0_3_0 = { features?(term_size_0_3_0_features {}) }: term_size_0_3_0_ { + dependencies = mapFeatures features ([]) + ++ (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_23 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + features = mkFeatures (features.term_size_0_3_0 or {}); + }; + term_size_0_3_0_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_23.default = true; + term_size_0_3_0.clippy = + (f.term_size_0_3_0.clippy or false) || + (f.term_size_0_3_0.lints or false) || + (term_size_0_3_0.lints or false); + term_size_0_3_0.default = (f.term_size_0_3_0.default or true); + term_size_0_3_0.lints = + (f.term_size_0_3_0.lints or false) || + (f.term_size_0_3_0.travis or false) || + (term_size_0_3_0.travis or false); + term_size_0_3_0.nightly = + (f.term_size_0_3_0.nightly or false) || + (f.term_size_0_3_0.lints or false) || + (term_size_0_3_0.lints or false) || + (f.term_size_0_3_0.travis or false) || + (term_size_0_3_0.travis or false); + winapi_0_2_8.default = true; + }) [ libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + toml_0_2_1 = { features?(toml_0_2_1_features {}) }: toml_0_2_1_ { + dependencies = mapFeatures features ([]); + }; + toml_0_2_1_features = f: updateFeatures f (rec { + toml_0_2_1.default = (f.toml_0_2_1.default or true); + toml_0_2_1.rustc-serialize = + (f.toml_0_2_1.rustc-serialize or false) || + (f.toml_0_2_1.default or false) || + (toml_0_2_1.default or false); + }) []; + unicode_segmentation_1_2_0 = { features?(unicode_segmentation_1_2_0_features {}) }: unicode_segmentation_1_2_0_ { + features = mkFeatures (features.unicode_segmentation_1_2_0 or {}); + }; + unicode_segmentation_1_2_0_features = f: updateFeatures f (rec { + unicode_segmentation_1_2_0.default = (f.unicode_segmentation_1_2_0.default or true); + }) []; + unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { + features = mkFeatures (features.unicode_width_0_1_4 or {}); + }; + unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); + }) []; + vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.vec_map_0_8_0 or {}); + }; + vec_map_0_8_0_features = f: updateFeatures f (rec { + vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true); + vec_map_0_8_0.serde = + (f.vec_map_0_8_0.serde or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + vec_map_0_8_0.serde_derive = + (f.vec_map_0_8_0.serde_derive or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + }) []; + way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ { + dependencies = mapFeatures features ([ wayland_client_0_9_6 wayland_sys_0_9_6 ]); + }; + way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec { + way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true); + wayland_client_0_9_6.cursor = true; + wayland_client_0_9_6.default = true; + wayland_client_0_9_6.dlopen = true; + wayland_sys_0_9_6.client = true; + wayland_sys_0_9_6.default = true; + wayland_sys_0_9_6.dlopen = true; + }) [ wayland_client_0_9_6_features wayland_sys_0_9_6_features ]; + wayland_client_0_9_6 = { features?(wayland_client_0_9_6_features {}) }: wayland_client_0_9_6_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 libc_0_2_23 wayland_sys_0_9_6 ]); + buildDependencies = mapFeatures features ([ wayland_scanner_0_9_6 ]); + features = mkFeatures (features.wayland_client_0_9_6 or {}); + }; + wayland_client_0_9_6_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + libc_0_2_23.default = true; + wayland_client_0_9_6.cursor = + (f.wayland_client_0_9_6.cursor or false) || + (f.wayland_client_0_9_6.default or false) || + (wayland_client_0_9_6.default or false); + wayland_client_0_9_6.default = (f.wayland_client_0_9_6.default or true); + wayland_client_0_9_6.egl = + (f.wayland_client_0_9_6.egl or false) || + (f.wayland_client_0_9_6.default or false) || + (wayland_client_0_9_6.default or false); + wayland_scanner_0_9_6.default = true; + wayland_sys_0_9_6.client = true; + wayland_sys_0_9_6.cursor = + (f.wayland_sys_0_9_6.cursor or false) || + (wayland_client_0_9_6.cursor or false) || + (f.wayland_client_0_9_6.cursor or false); + wayland_sys_0_9_6.default = true; + wayland_sys_0_9_6.dlopen = + (f.wayland_sys_0_9_6.dlopen or false) || + (wayland_client_0_9_6.dlopen or false) || + (f.wayland_client_0_9_6.dlopen or false); + wayland_sys_0_9_6.egl = + (f.wayland_sys_0_9_6.egl or false) || + (wayland_client_0_9_6.egl or false) || + (f.wayland_client_0_9_6.egl or false); + }) [ bitflags_0_7_0_features libc_0_2_23_features wayland_sys_0_9_6_features wayland_scanner_0_9_6_features ]; + wayland_kbd_0_9_0 = { features?(wayland_kbd_0_9_0_features {}) }: wayland_kbd_0_9_0_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 dlib_0_3_1 lazy_static_0_2_8 memmap_0_4_0 wayland_client_0_9_6 ]); + }; + wayland_kbd_0_9_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + dlib_0_3_1.default = true; + lazy_static_0_2_8.default = true; + memmap_0_4_0.default = true; + wayland_client_0_9_6.default = true; + wayland_kbd_0_9_0.default = (f.wayland_kbd_0_9_0.default or true); + }) [ bitflags_0_7_0_features dlib_0_3_1_features lazy_static_0_2_8_features memmap_0_4_0_features wayland_client_0_9_6_features ]; + wayland_scanner_0_9_6 = { features?(wayland_scanner_0_9_6_features {}) }: wayland_scanner_0_9_6_ { + dependencies = mapFeatures features ([ xml_rs_0_3_6 ]); + }; + wayland_scanner_0_9_6_features = f: updateFeatures f (rec { + wayland_scanner_0_9_6.default = (f.wayland_scanner_0_9_6.default or true); + xml_rs_0_3_6.default = true; + }) [ xml_rs_0_3_6_features ]; + wayland_sys_0_9_6 = { features?(wayland_sys_0_9_6_features {}) }: wayland_sys_0_9_6_ { + dependencies = mapFeatures features ([ dlib_0_3_1 ] + ++ (if features.wayland_sys_0_9_6.lazy_static or false then [ lazy_static_0_2_8 ] else [])); + features = mkFeatures (features.wayland_sys_0_9_6 or {}); + }; + wayland_sys_0_9_6_features = f: updateFeatures f (rec { + dlib_0_3_1.default = true; + dlib_0_3_1.dlopen = + (f.dlib_0_3_1.dlopen or false) || + (wayland_sys_0_9_6.dlopen or false) || + (f.wayland_sys_0_9_6.dlopen or false); + lazy_static_0_2_8.default = true; + wayland_sys_0_9_6.default = (f.wayland_sys_0_9_6.default or true); + wayland_sys_0_9_6.lazy_static = + (f.wayland_sys_0_9_6.lazy_static or false) || + (f.wayland_sys_0_9_6.dlopen or false) || + (wayland_sys_0_9_6.dlopen or false); + wayland_sys_0_9_6.libc = + (f.wayland_sys_0_9_6.libc or false) || + (f.wayland_sys_0_9_6.server or false) || + (wayland_sys_0_9_6.server or false); + }) [ dlib_0_3_1_features lazy_static_0_2_8_features ]; + wc_lock_0_2_1 = { features?(wc_lock_0_2_1_features {}) }: wc_lock_0_2_1_ { + dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_24_2 dbus_0_5_4 image_0_10_4 libc_0_2_23 rand_0_3_15 tempfile_2_1_5 way_cooler_client_helpers_0_1_0 wayland_client_0_9_6 wayland_kbd_0_9_0 wayland_sys_0_9_6 ]); + buildDependencies = mapFeatures features ([ gcc_0_3_50 wayland_scanner_0_9_6 ]); + }; + wc_lock_0_2_1_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = true; + clap_2_24_2.default = true; + dbus_0_5_4.default = true; + gcc_0_3_50.default = true; + image_0_10_4.default = true; + libc_0_2_23.default = true; + rand_0_3_15.default = true; + tempfile_2_1_5.default = true; + way_cooler_client_helpers_0_1_0.default = true; + wayland_client_0_9_6.cursor = true; + wayland_client_0_9_6.default = true; + wayland_client_0_9_6.dlopen = true; + wayland_kbd_0_9_0.default = true; + wayland_scanner_0_9_6.default = true; + wayland_sys_0_9_6.client = true; + wayland_sys_0_9_6.default = true; + wayland_sys_0_9_6.dlopen = true; + wc_lock_0_2_1.default = (f.wc_lock_0_2_1.default or true); + }) [ byteorder_0_5_3_features clap_2_24_2_features dbus_0_5_4_features image_0_10_4_features libc_0_2_23_features rand_0_3_15_features tempfile_2_1_5_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_6_features wayland_kbd_0_9_0_features wayland_sys_0_9_6_features gcc_0_3_50_features wayland_scanner_0_9_6_features ]; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; + xml_rs_0_3_6 = { features?(xml_rs_0_3_6_features {}) }: xml_rs_0_3_6_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 ]); + }; + xml_rs_0_3_6_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + xml_rs_0_3_6.default = (f.xml_rs_0_3_6.default or true); + }) [ bitflags_0_7_0_features ]; +} diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 395541d62503b36681e2f233fe9cf8c61e5a35ea..4a15e3236168e915982117986d5c25332fe8aaa4 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb +{ stdenv, fetchurl, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null, wayland-protocols @@ -7,16 +7,16 @@ stdenv.mkDerivation rec { name = "weston-${version}"; - version = "1.12.0"; + version = "4.0.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033"; + sha256 = "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm + wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva libwebp wayland-protocols ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--enable-weston-launch" "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor" - ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder" + ++ stdenv.lib.optional (vaapi != null) "--enable-vaapi-recorder" ++ stdenv.lib.optionals (xwayland != null) [ "--enable-xwayland" "--with-xserver-path=${xwayland.out}/bin/Xwayland" diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index a4eff26d88cfb6243f516231de0bb5c30a184c21..c68562d82b39ac19cca3daaa056ab8c70eed4a20 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, xlibs, pkgconfig }: +{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, pkgconfig }: rustPlatform.buildRustPackage rec { name = "wtftw-0.0pre20170921"; diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix deleted file mode 100644 index 906ba0efda243a9ce8f38c62c87dbd8527dc3be8..0000000000000000000000000000000000000000 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus_glib -, desktopSupport -, gtk2, gnome2_panel, GConf2 -, libxfce4util, xfce4panel -}: - -assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; - -stdenv.mkDerivation rec { - version = "2.1.0"; - pname = "xmonad-log-applet"; - name = "${pname}-${version}-${desktopSupport}"; - - src = fetchFromGitHub { - owner = "alexkay"; - repo = pname; - rev = "${version}"; - sha256 = "1g1fisyaw83v72b25fxfjln8f4wlw3rm6nyk27mrqlhsc1spnb5p"; - }; - - buildInputs = with stdenv.lib; - [ glib dbus_glib ] - ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] - # TODO: no idea where to find libpanelapplet-4.0 - ++ optionals (desktopSupport == "gnome3") [ ] - ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4panel ] - ; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - configureFlags = [ "--with-panel=${desktopSupport}" ]; - - patches = [ ./fix-paths.patch ]; - - meta = with stdenv.lib; { - homepage = https://github.com/alexkay/xmonad-log-applet; - license = licenses.bsd3; - description = "An applet that will display XMonad log information (${desktopSupport} version)"; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - - broken = desktopSupport == "gnome3"; - }; -} - diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f2acf03958b6e4775bd318d6d9ab75ecc6fc0167 --- /dev/null +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib +, desktopSupport +, gtk2, gnome2_panel, GConf2 +, libxfce4util, xfce4-panel +}: + +assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; + +stdenv.mkDerivation rec { + version = "2.1.0"; + pname = "xmonad-log-applet"; + name = "${pname}-${version}-${desktopSupport}"; + + src = fetchFromGitHub { + owner = "alexkay"; + repo = pname; + rev = "${version}"; + sha256 = "1g1fisyaw83v72b25fxfjln8f4wlw3rm6nyk27mrqlhsc1spnb5p"; + }; + + buildInputs = with stdenv.lib; + [ glib dbus-glib ] + ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] + # TODO: no idea where to find libpanelapplet-4.0 + ++ optionals (desktopSupport == "gnome3") [ ] + ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] + ; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + configureFlags = [ "--with-panel=${desktopSupport}" ]; + + patches = [ ./fix-paths.patch ]; + + meta = with stdenv.lib; { + homepage = https://github.com/alexkay/xmonad-log-applet; + license = licenses.bsd3; + description = "An applet that will display XMonad log information (${desktopSupport} version)"; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + + broken = desktopSupport == "gnome3"; + }; +} + diff --git a/pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch similarity index 100% rename from pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch rename to pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index 5e92c52e521b22407cad49080f66292b77e67235..a5d02093e3f62d5c9bac32ae8306be7b987d2d5d 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -2,7 +2,6 @@ , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version -, playerctl }: stdenv.mkDerivation { @@ -21,7 +20,6 @@ stdenv.mkDerivation { buildInputs = [ cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl alsaLib wirelesstools asciidoc libxslt makeWrapper - playerctl ]; postPatch = '' @@ -30,7 +28,7 @@ stdenv.mkDerivation { --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint" ''; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "PLAYERCTL=1" ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; postInstall = '' mkdir -p $out/share/yabar/examples diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix index b704c480d668271741cb41cee444a7d5d5918c98..77abc0c7ed4bda0b427e38a6669bf5d1399ccbd9 100644 --- a/pkgs/applications/window-managers/yabar/unstable.nix +++ b/pkgs/applications/window-managers/yabar/unstable.nix @@ -1,10 +1,18 @@ -{ callPackage, attrs ? {} }: +{ playerctl, libxkbcommon, callPackage, attrs ? {} }: let - overrides = { - version = "unstable-2017-10-12"; + pkg = callPackage ./build.nix ({ + version = "unstable-2018-01-18"; - rev = "cbecc7766e37f29d50705da0a82dc76ce7c3b86e"; - sha256 = "1wprjas3k14rxfl06mgr0xq2ra735w1c7dq4xrdvii887wnl37xb"; - } // attrs; -in callPackage ./build.nix overrides + rev = "c516e8e78d39dd2b339acadc4c175347171150bb"; + sha256 = "1p9lx78cayyn7qc2q66id2xfs76jyddnqv2x1ypsvixaxwcvqgdb"; + } // attrs); +in pkg.overrideAttrs (o: { + buildInputs = o.buildInputs ++ [ + playerctl libxkbcommon + ]; + + makeFlags = o.makeFlags ++ [ + "PLAYERCTL=1" + ]; +}) diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh new file mode 100644 index 0000000000000000000000000000000000000000..7d118d20fc6820a0310c72353824bf085b74fae3 --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -0,0 +1,40 @@ +# See cc-wrapper for comments. +var_templates_list=( + NIX+IGNORE_LD_THROUGH_GCC + NIX+LDFLAGS + NIX+LDFLAGS_BEFORE + NIX+LDFLAGS_AFTER + NIX+LDFLAGS_HARDEN +) +var_templates_bool=( + NIX+SET_BUILD_ID + NIX+DONT_SET_RPATH +) + +declare -a role_infixes=() +if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then + role_infixes+=(_BUILD_) +fi +if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then + role_infixes+=(_) +fi +if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then + role_infixes+=(_TARGET_) +fi + +for var in "${var_templates_list[@]}"; do + mangleVarList "$var" "${role_infixes[@]}" +done +for var in "${var_templates_bool[@]}"; do + mangleVarBool "$var" "${role_infixes[@]}" +done + +if [ -e @out@/nix-support/libc-ldflags ]; then + NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" +fi + +if [ -e @out@/nix-support/libc-ldflags-before ]; then + NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE" +fi + +export NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET=1 diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh new file mode 100644 index 0000000000000000000000000000000000000000..5282d17fce27fe4db1411e9f8d5f7d8b4673db56 --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -0,0 +1,53 @@ +hardeningFlags=(relro bindnow) +# Intentionally word-split in case 'hardeningEnable' is defined in +# Nix. Also, our bootstrap tools version of bash is old enough that +# undefined arrays trip `set -u`. +if [[ -v hardeningEnable[@] ]]; then + hardeningFlags+=(${hardeningEnable[@]}) +fi +hardeningLDFlags=() + +declare -A hardeningDisableMap + +# Intentionally word-split in case 'hardeningDisable' is defined in Nix. +for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@ +do + hardeningDisableMap[$flag]=1 +done + +if (( "${NIX_DEBUG:-0}" >= 1 )); then + printf 'HARDENING: disabled flags:' >&2 + (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2 + echo >&2 +fi + +if [[ -z "${hardeningDisableMap[all]:-}" ]]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then + echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; + fi + for flag in "${hardeningFlags[@]}" + do + if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then + case $flag in + pie) + if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi + hardeningLDFlags+=('-pie') + fi + ;; + relro) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi + hardeningLDFlags+=('-z' 'relro') + ;; + bindnow) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi + hardeningLDFlags+=('-z' 'now') + ;; + *) + # Ignore unsupported. Checked in Nix that at least *some* + # tool supports each flag. + ;; + esac + fi + done +fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5c0436b73ddf4c1a4b56c72fe352fde7db137fed --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -0,0 +1,315 @@ +# The Nixpkgs CC 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. So we use a wrapper +# script that sets up the right environment variables so that the +# compiler and the linker just "work". + +{ name ? "" +, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +, bintools ? null, libc ? null +, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null +, extraPackages ? [], extraBuildCommands ? "" +, buildPackages ? {} +, useMacosReexportHack ? false +}: + +with stdenvNoCC.lib; + +assert nativeTools -> !propagateDoc && nativePrefix != ""; +assert !nativeTools -> + bintools != null && coreutils != null && gnugrep != null; +assert !(nativeLibc && noLibc); +assert (noLibc || nativeLibc) == (libc == null); + +let + stdenv = stdenvNoCC; + inherit (stdenv) hostPlatform targetPlatform; + + # Prefix for binaries. Customarily ends with a dash separator. + # + # TODO(@Ericson2314) Make unconditional, or optional but always true by + # default. + targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + (targetPlatform.config + "-"); + + bintoolsVersion = (builtins.parseDrvName bintools.name).version; + bintoolsName = (builtins.parseDrvName bintools.name).name; + + 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; + bintools_bin = if nativeTools then "" else getBin bintools; + # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. + coreutils_bin = if nativeTools then "" else getBin coreutils; + + dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config; + + # See description in cc-wrapper. + infixSalt = dashlessTarget; + + # The dynamic linker has different names on different platforms. This is a + # shell glob that ought to match it. + dynamicLinker = + /**/ if libc == null then null + else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" + else if targetPlatform.libc == "bionic" then "/system/bin/linker" + else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" + else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" + # ARM with a wildcard, which can be "" or "-armhf". + else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" + else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" + else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" + else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" + else if targetPlatform.isDarwin then "/usr/lib/dyld" + else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" + else null; + + expand-response-params = + if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" + then import ../expand-response-params { inherit (buildPackages) stdenv; } + else ""; + +in + +stdenv.mkDerivation { + name = targetPrefix + + (if name != "" then name else "${bintoolsName}-wrapper") + + (stdenv.lib.optionalString (bintools != null && bintoolsVersion != "") "-${bintoolsVersion}"); + + preferLocalBuild = true; + + inherit bintools_bin libc_bin libc_dev libc_lib coreutils_bin; + shell = getBin shell + shell.shellPath or ""; + gnugrep_bin = if nativeTools then "" else gnugrep; + + inherit targetPrefix infixSalt; + + outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; + + passthru = { + inherit bintools libc nativeTools nativeLibc nativePrefix; + + emacsBufferSetup = pkgs: '' + ; We should handle propagation here too + (mapc + (lambda (arg) + (when (file-directory-p (concat arg "/lib")) + (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib"))) + (when (file-directory-p (concat arg "/lib64")) + (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib64")))) + '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + ''; + }; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + src=$PWD + ''; + + installPhase = + '' + set -u + + mkdir -p $out/bin $out/nix-support + + wrap() { + local dst="$1" + local wrapper="$2" + export prog="$3" + set +u + substituteAll "$wrapper" "$out/bin/$dst" + set -u + chmod +x "$out/bin/$dst" + } + '' + + + (if nativeTools then '' + echo ${nativePrefix} > $out/nix-support/orig-bintools + + ldPath="${nativePrefix}/bin" + '' else '' + echo $bintools_bin > $out/nix-support/orig-bintools + + ldPath="${bintools_bin}/bin" + '' + + + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' + # Solaris needs an additional ld wrapper. + ldPath="${nativePrefix}/bin" + exec="$ldPath/${targetPrefix}ld" + wrap ld-solaris ${./ld-solaris-wrapper.sh} + '') + + + '' + # Create a symlink to as (the assembler). + if [ -e $ldPath/${targetPrefix}as ]; then + ln -s $ldPath/${targetPrefix}as $out/bin/${targetPrefix}as + fi + + '' + (if !useMacosReexportHack then '' + wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld} + '' else '' + ldInner="${targetPrefix}ld-reexport-delegate" + wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${targetPrefix}ld} + wrap "${targetPrefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" + unset ldInner + '') + '' + + for variant in ld.gold ld.bfd ld.lld; do + local underlying=$ldPath/${targetPrefix}$variant + [[ -e "$underlying" ]] || continue + wrap ${targetPrefix}$variant ${./ld-wrapper.sh} $underlying + done + + set +u + ''; + + emulation = let + fmt = + /**/ if targetPlatform.isDarwin then "mach-o" + else if targetPlatform.isWindows then "pe" + else "elf" + toString targetPlatform.parsed.cpu.bits; + endianPrefix = if targetPlatform.isBigEndian then "big" else "little"; + sep = optionalString (!targetPlatform.isMips) "-"; + arch = + /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" + else if targetPlatform.isArm then endianPrefix + "arm" + else if targetPlatform.isx86_64 then "x86-64" + else if targetPlatform.isi686 then "i386" + else if targetPlatform.isMips then { + "mips" = "btsmipn32"; # n32 variant + "mipsel" = "ltsmipn32"; # n32 variant + "mips64" = "btsmip"; + "mips64el" = "ltsmip"; + }.${targetPlatform.parsed.cpu.name} + else throw "unknown emulation for platform: " + targetPlatform.config; + in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); + + depsTargetTargetPropagated = extraPackages; + + setupHook = ./setup-hook.sh; + + postFixup = + '' + set -u + '' + + + optionalString (libc != null) ('' + ## + ## General libc support + ## + + echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags + + echo "${libc_lib}" > $out/nix-support/orig-libc + echo "${libc_dev}" > $out/nix-support/orig-libc-dev + + ## + ## Dynamic linker support + ## + + if [[ -z ''${dynamicLinker+x} ]]; then + echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 + local dynamicLinker="${libc_lib}/lib/ld*.so.?" + fi + + # Expand globs to fill array of options + dynamicLinker=($dynamicLinker) + + case ''${#dynamicLinker[@]} in + 0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;; + 1) echo "Using dynamic linker: '$dynamicLinker'" >&2;; + *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; + esac + + if [ -n "''${dynamicLinker:-}" ]; then + echo $dynamicLinker > $out/nix-support/dynamic-linker + + '' + (if targetPlatform.isDarwin then '' + printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook + '' else '' + 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 + + local ldflagsBefore=(-dynamic-linker "$dynamicLinker") + '') + '' + fi + + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to ld + # (the *last* value counts, so ours should come first). + printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before + '') + + + optionalString (!nativeTools) '' + ## + ## User env support + ## + + # Propagate the underling unwrapped bintools so that if you + # install the wrapper, you get tools like objdump (same for any + # binaries of libc). + printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages + '' + + + optionalString propagateDoc '' + ## + ## Man page and info support + ## + + mkdir -p $man/nix-support $info/nix-support + printWords ${bintools.man or ""} >> $man/nix-support/propagated-build-inputs + printWords ${bintools.info or ""} >> $info/nix-support/propagated-build-inputs + '' + + + '' + ## + ## Hardening support + ## + + # some linkers on some platforms don't support specific -z flags + export hardening_unsupported_flags="" + if [[ "$($ldPath/${targetPrefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then + hardening_unsupported_flags+=" bindnow" + fi + if [[ "$($ldPath/${targetPrefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then + hardening_unsupported_flags+=" relro" + fi + '' + + + optionalString hostPlatform.isCygwin '' + hardening_unsupported_flags+=" pic" + '' + + + '' + set +u + substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh + substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh + substituteAll ${../cc-wrapper/utils.sh} $out/nix-support/utils.sh + + ## + ## Extra custom steps + ## + '' + + + extraBuildCommands; + + inherit dynamicLinker expand-response-params; + + # for substitution in utils.sh + expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + + meta = + let bintools_ = if bintools != null then bintools else {}; in + (if bintools_ ? meta then removeAttrs bintools.meta ["priority"] else {}) // + { description = + stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + + " (wrapper script)"; + } // optionalAttrs useMacosReexportHack { + platforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh old mode 100755 new mode 100644 similarity index 100% rename from pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh rename to pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh new file mode 100644 index 0000000000000000000000000000000000000000..991ed0fe263c10e3f49f1826a68bd7ec3c612a4c --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -0,0 +1,210 @@ +#! @shell@ +set -eu -o pipefail +o posix +shopt -s nullglob + +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + +path_backup="$PATH" + +# phase separation makes this look useless +# shellcheck disable=SC2157 +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" +fi + +source @out@/nix-support/utils.sh + +if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then + source @out@/nix-support/add-flags.sh +fi + + +# Optionally filter out paths not refering to the store. +expandResponseParams "$@" +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" + && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ) ]]; then + rest=() + nParams=${#params[@]} + declare -i n=0 + while (( "$n" < "$nParams" )); do + p=${params[n]} + p2=${params[n+1]:-} # handle `p` being last one + if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then + skip "${p:2}" + elif [ "$p" = -L ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "$p" = -rpath ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "$p" = -dynamic-linker ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "${p:0:1}" = / ] && badPath "$p"; then + # We cannot skip this; barf. + echo "impure path \`$p' used in link" >&2 + exit 1 + elif [ "${p:0:9}" = --sysroot ]; then + # Our ld is not built with sysroot support (Can we fix that?) + : + else + rest+=("$p") + fi + n+=1 + done + # Old bash empty array hack + params=(${rest+"${rest[@]}"}) +fi + +source @out@/nix-support/add-hardening.sh + +extraAfter=("${hardeningLDFlags[@]}") +extraBefore=() + +if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then + extraAfter+=($NIX_@infixSalt@_LDFLAGS) + extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE) +fi + +extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER) + +# Specify the target emulation if nothing is passed in ("-m" overrides this +# environment variable). Ensures we never blindly fallback on targeting the host +# platform. +: ${LDEMULATION:=@emulation@} + +# Three tasks: +# +# 1. Find all -L... switches for rpath +# +# 2. Find relocatable flag for build id. +# +# 3. Choose 32-bit dynamic linker if needed +declare -a libDirs +declare -A libs +declare -i relocatable=0 link32=0 + +if + [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] \ + || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] \ + || [ -e @out@/nix-support/dynamic-linker-m32 ] +then + prev= + # Old bash thinks empty arrays are undefined, ugh. + for p in \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} + do + case "$prev" in + -L) + libDirs+=("$p") + ;; + -l) + libs["lib${p}.so"]=1 + ;; + -m) + # Presumably only the last `-m` flag has any effect. + case "$p" in + elf_i386) link32=1;; + *) link32=0;; + esac + ;; + -dynamic-linker | -plugin) + # Ignore this argument, or it will match *.so and be added to rpath. + ;; + *) + case "$p" in + -L/*) + libDirs+=("${p:2}") + ;; + -l?*) + libs["lib${p:2}.so"]=1 + ;; + "${NIX_STORE:-}"/*.so | "${NIX_STORE:-}"/*.so.*) + # This is a direct reference to a shared library. + libDirs+=("${p%/*}") + libs["${p##*/}"]=1 + ;; + -r | --relocatable | -i) + relocatable=1 + esac + ;; + esac + prev="$p" + done +fi + +if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then + # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's + # use it. + extraAfter+=( + '-dynamic-linker' + "$(< @out@/nix-support/dynamic-linker-m32)" + ) +fi + +# Add all used dynamic libraries to the rpath. +if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then + # For each directory in the library search path (-L...), + # see if it contains a dynamic library used by a -l... flag. If + # so, add the directory to the rpath. + # It's important to add the rpath in the order of -L..., so + # the link time chosen objects will be those of runtime linking. + declare -A rpaths + for dir in ${libDirs+"${libDirs[@]}"}; do + if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then + dir="$dir2" + fi + if [ -n "${rpaths[$dir]:-}" ] || [[ "$dir" != "${NIX_STORE:-}"/* ]]; then + # 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. + continue + fi + for path in "$dir"/*; do + file="${path##*/}" + if [ "${libs[$file]:-}" ]; then + # This library may have been provided by a previous directory, + # but if that library file is inside an output of the current + # derivation, it can be deleted after this compilation and + # should be found in a later directory, so we add all + # directories that contain any of the libraries to rpath. + rpaths["$dir"]=1 + extraAfter+=(-rpath "$dir") + break + fi + done + done + +fi + +# This is outside the DONT_SET_RPATH branch because it's more targeted and we +# usually want it (on Darwin) even if DONT_SET_RPATH is set. +if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then + extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH) +fi + +# Only add --build-id if this is a final link. FIXME: should build gcc +# with --enable-linker-build-id instead? +if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && ! (( "$relocatable" )); then + extraAfter+=(--build-id) +fi + + +# Optionally print debug info. +if (( "${NIX_DEBUG:-0}" >= 1 )); then + # Old bash workaround, see above. + echo "extra flags before to @prog@:" >&2 + printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" ${params+"${params[@]}"} >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 +fi + +PATH="$path_backup" +# Old bash workaround, see above. +exec @prog@ \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} diff --git a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash new file mode 100644 index 0000000000000000000000000000000000000000..71b9471cbc83f26ceae8f97aa4ed84a9ce852151 --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash @@ -0,0 +1,246 @@ +#! @shell@ + +set -eu -o pipefail + +# For cmd | while read; do ...; done +shopt -s lastpipe + +path_backup="$PATH" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" +fi + +declare -ri recurThreshold=200 +declare -i overflowCount=0 + +declare -ar origArgs=("$@") + +# Throw away what we won't need +declare -a parentArgs=() + +while (( $# )); do + case "$1" in + -l) + echo "cctools LD does not support '-l foo'" >&2 + exit 1 + ;; + -lazy_library | -reexport_library | -upward_library | -weak_library) + overflowCount+=1 + shift 2 + ;; + -l* | *.so.* | *.dylib | -lazy-l* | -reexport-l* | -upward-l* | -weak-l*) + overflowCount+=1 + shift 1 + ;; + *.a | *.o) + shift 1 + ;; + -L | -F) + # Evidentally ld doesn't like using the child's RPATH, so it still + # needs these. + parentArgs+=("$1" "$2") + shift 2 + ;; + -L?* | -F?*) + parentArgs+=("$1") + shift 1 + ;; + -o) + outputName="$2" + parentArgs+=("$1" "$2") + shift 2 + ;; + -install_name | -dylib_install_name | -dynamic-linker | -plugin) + parentArgs+=("$1" "$2") + shift 2 + ;; + -rpath) + # Only an rpath to the child is needed, which we will add + shift 2 + ;; + *) + if [[ -f "$1" ]]; then + # Propabably a non-standard object file like Haskell's + # `.dyn_o`. Skip it like other inputs + : + else + parentArgs+=("$1") + fi + shift 1 + ;; + esac +done + + + +if (( "$overflowCount" <= "$recurThreshold" )); then + if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: Only ${overflowCount} inputs counted while ${recurThreshold} is the ceiling, linking normally. " >&2 + fi + PATH="$path_backup" + exec @prog@ "${origArgs[@]}" +fi + + + +if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: ${overflowCount} inputs counted when ${recurThreshold} is the ceiling, inspecting further. " >&2 +fi + +# Collect the normalized linker input +declare -a norm=() + +# Arguments are null-separated +@prog@ --dump-normalized-lib-args "${origArgs[@]}" | + while IFS= read -r -d '' input; do + norm+=("$input") + done + +declare -i leafCount=0 +declare lastLeaf='' +declare -a childrenInputs=() trailingInputs=() +while (( "${#norm[@]}" )); do + case "${norm[0]}" in + -lazy_library | -upward_library) + # TODO(@Ericson2314): Don't do that, but intersperse children + # between such args. + echo "ld-wrapper: Warning: Potentially changing link order" >&2 + trailingInputs+=("${norm[0]}" "${norm[1]}") + norm=("${norm[@]:2}") + ;; + -reexport_library | -weak_library) + childrenInputs+=("${norm[0]}" "${norm[1]}") + if [[ "${norm[1]}" != "$lastLeaf" ]]; then + leafCount+=1 + lastLeaf="${norm[1]}" + fi + norm=("${norm[@]:2}") + ;; + *.so | *.dylib) + childrenInputs+=(-reexport_library "${norm[0]}") + if [[ "${norm[0]}" != "$lastLeaf" ]]; then + leafCount+=1 + lastLeaf="${norm[0]}" + fi + norm=("${norm[@]:1}") + ;; + *.o | *.a) + # Don't delegate object files or static libs + parentArgs+=("${norm[0]}") + norm=("${norm[@]:1}") + ;; + *) + if [[ -f "${norm[0]}" ]]; then + # Propabably a non-standard object file. We'll let it by. + parentArgs+=("${norm[0]}") + norm=("${norm[@]:1}") + else + echo "ld-wrapper: Internal Error: Invalid normalized argument" >&2 + exit -1 + fi + ;; + esac +done + + + +if (( "$leafCount" <= "$recurThreshold" )); then + if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: Only ${leafCount} *dynamic* inputs counted while ${recurThreshold} is the ceiling, linking normally. " >&2 + fi + PATH="$path_backup" + exec @prog@ "${origArgs[@]}" +fi + + + +if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: ${leafCount} *dynamic* inputs counted when ${recurThreshold} is the ceiling, delegating to children. " >&2 +fi + +declare -r outputNameLibless=$( \ + if [[ -z "${outputName:+isUndefined}" ]]; then + echo unnamed + return 0; + fi + baseName=$(basename ${outputName}) + if [[ "$baseName" = lib* ]]; then + baseName="${baseName:3}" + fi + echo "$baseName") + +declare -ra children=( + "$outputNameLibless-reexport-delegate-0" + "$outputNameLibless-reexport-delegate-1" +) + +mkdir -p "$out/lib" + +symbolBloatObject=$outputNameLibless-symbol-hack.o +if [[ ! -f $symbolBloatObject ]]; then + # `-Q` means use GNU Assembler rather than Clang, avoiding an awkward + # dependency cycle. + printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' | + PATH="$PATH:@out@/bin" @targetPrefix@as -Q -- -o $symbolBloatObject +fi + +# Split inputs between children +declare -a child0Inputs=() child1Inputs=("${childrenInputs[@]}") +let "countFirstChild = $leafCount / 2" || true +lastLeaf='' +while (( "$countFirstChild" )); do + case "${child1Inputs[0]}" in + -reexport_library | -weak_library) + child0Inputs+=("${child1Inputs[0]}" "${child1Inputs[1]}") + if [[ "${child1Inputs[1]}" != "$lastLeaf" ]]; then + let countFirstChild-=1 || true + lastLeaf="${child1Inputs[1]}" + fi + child1Inputs=("${child1Inputs[@]:2}") + ;; + *.so | *.dylib) + child0Inputs+=(-reexport_library "${child1Inputs[0]}") + if [[ "${child1Inputs[0]}" != "$lastLeaf" ]]; then + let countFirstChild-=1 || true + lastLeaf="${child1Inputs[1]}" + fi + child1Inputs=("${child1Inputs[@]:2}") + ;; + *) + echo "ld-wrapper: Internal Error: Invalid delegated input" >&2 + exit -1 + ;; + esac +done + + +# First half of libs +@out@/bin/@targetPrefix@ld \ + -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[0]}.dylib" \ + -install_name "$out/lib/lib${children[0]}.dylib" \ + "$symbolBloatObject" "${child0Inputs[@]}" "${trailingInputs[@]}" + +# Second half of libs +@out@/bin/@targetPrefix@ld \ + -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[1]}.dylib" \ + -install_name "$out/lib/lib${children[1]}.dylib" \ + "$symbolBloatObject" "${child1Inputs[@]}" "${trailingInputs[@]}" + +parentArgs+=("-L$out/lib" -rpath "$out/lib") +if [[ $outputName != *reexport-delegate* ]]; then + parentArgs+=("-l${children[0]}" "-l${children[1]}") +else + parentArgs+=("-reexport-l${children[0]}" "-reexport-l${children[1]}") +fi + +parentArgs+=("${trailingInputs[@]}") + +if [ -n "${NIX_DEBUG:-}" ]; then + echo "flags using delegated children to @prog@:" >&2 + printf " %q\n" "${parentArgs[@]}" >&2 +fi + +PATH="$path_backup" +exec @prog@ "${parentArgs[@]}" diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..48a00b0b9b074bd3fa33fe31ca83d82b243f5805 --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -0,0 +1,88 @@ +# Binutils Wrapper hygiene +# +# See comments in cc-wrapper's setup hook. This works exactly the same way. + +set -u + +# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a +# native compile. +# +# TODO(@Ericson2314): No native exception +[[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0 + +bintoolsWrapper_addLDVars () { + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "bintools-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then + export NIX_${role}LDFLAGS+=" -L$1/lib64" + fi + + if [[ -d "$1/lib" ]]; then + export NIX_${role}LDFLAGS+=" -L$1/lib" + fi +} + +case $targetOffset in + -1) + export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD=1 + role_pre='BUILD_' + role_post='_FOR_BUILD' + ;; + 0) + export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST=1 + role_pre='' + role_post='' + ;; + 1) + export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET=1 + role_pre='TARGET_' + role_post='_FOR_TARGET' + ;; + *) + echo "cc-wrapper: used as improper sort of dependency" >2; + return 1 + ;; +esac + +addEnvHooks "$targetOffset" bintoolsWrapper_addLDVars + +# shellcheck disable=SC2157 +if [ -n "@bintools_bin@" ]; then + addToSearchPath _PATH @bintools_bin@/bin +fi + +# shellcheck disable=SC2157 +if [ -n "@libc_bin@" ]; then + addToSearchPath _PATH @libc_bin@/bin +fi + +# shellcheck disable=SC2157 +if [ -n "@coreutils_bin@" ]; then + addToSearchPath _PATH @coreutils_bin@/bin +fi + +# Export tool environment variables so various build systems use the right ones. + +export NIX_${role_pre}BINTOOLS=@out@ + +for cmd in \ + ar as ld nm objcopy objdump readelf ranlib strip strings size windres +do + if + PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null + then + upper_case="$(echo "$cmd" | tr "[:lower:]" "[:upper:]")" + export "${role_pre}${upper_case}=@targetPrefix@${cmd}"; + export "${upper_case}${role_post}=@targetPrefix@${cmd}"; + fi +done + +# No local scope in sourced file +unset -v role_pre role_post cmd upper_case +set +u diff --git a/pkgs/build-support/binutils-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/binutils-wrapper/macos-sierra-reexport-hack.bash deleted file mode 100644 index c3077e869e7582c96843d9ec9dfaf09aa1b623ba..0000000000000000000000000000000000000000 --- a/pkgs/build-support/binutils-wrapper/macos-sierra-reexport-hack.bash +++ /dev/null @@ -1,108 +0,0 @@ -#! @shell@ - -set -eu -o pipefail - -path_backup="$PATH" -if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" -fi - -declare -r recurThreshold=300 - -declare overflowCount=0 -for ((n=0; n < $#; ++n)); do - case "${!n}" in - -l*) let overflowCount+=1 ;; - -reexport-l*) let overflowCount+=1 ;; - *) ;; - esac -done - -declare -a allArgs=() - -if (( "$overflowCount" <= "$recurThreshold" )); then - allArgs=("$@") -else - declare -a childrenLookup=() childrenLink=() - - while (( $# )); do - case "$1" in - -L/*) - childrenLookup+=("$1") - allArgs+=("$1") - ;; - -L) - echo "cctools LD does not support '-L foo' or '-l foo'" >&2 - exit 1 - ;; - -l) - echo "cctools LD does not support '-L foo' or '-l foo'" >&2 - exit 1 - ;; - -lazy_library | -lazy_framework | -lto_library) - # We aren't linking any "azy_library", "to_library", etc. - allArgs+=("$1") - ;; - -lazy-l | -weak-l) allArgs+=("$1") ;; - # We can't so easily prevent header issues from these. - -lSystem) allArgs+=("$1") ;; - # Special case as indirection seems like a bad idea for something - # so fundamental. Can be removed for simplicity. - -l?* | -reexport-l?*) childrenLink+=("$1") ;; - *) allArgs+=("$1") ;; - esac - - shift - done - - declare n=0 - while (( $n < "${#childrenLink[@]}" )); do - if [[ "${childrenLink[n]}" = -l* ]]; then - childrenLink[n]="-reexport${childrenLink[n]}" - fi - let ++n - done - unset n - - declare -r outputNameLibless=$(basename $( \ - if [[ -z "${outputName:+isUndefined}" ]]; then - echo unnamed - elif [[ "${outputName:0:3}" = lib ]]; then - echo "${outputName:3}" - else - echo "${outputName}" - fi)) - declare -ra children=("$outputNameLibless-reexport-delegate-0" \ - "$outputNameLibless-reexport-delegate-1") - - mkdir -p "$out/lib" - - PATH="$PATH:@out@/bin" - - symbolBloatObject=$outputNameLibless-symbol-hack.o - if [[ ! -e $symbolBloatObject ]]; then - # `-Q` means use GNU Assembler rather than Clang, avoiding an awkward - # dependency cycle. - printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ - | @binPrefix@as -Q -- -o $symbolBloatObject - fi - - # first half of libs - @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[0]}.dylib" \ - -install_name "$out/lib/lib${children[0]}.dylib" \ - "${childrenLookup[@]}" "$symbolBloatObject" \ - "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" - - # second half of libs - @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[1]}.dylib" \ - -install_name "$out/lib/lib${children[1]}.dylib" \ - "${childrenLookup[@]}" "$symbolBloatObject" \ - "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}" - - allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}") -fi - -PATH="$path_backup" -exec @prog@ "${allArgs[@]}" diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..349a7e5aa333b5dae88459a54fce94e97cfaf973 --- /dev/null +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -0,0 +1,78 @@ +{ stdenv, bazel }: + +args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }: + +let + fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" ]; + fBuildAttrs = fArgs // buildAttrs; + fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "sha256" ]; + +in stdenv.mkDerivation (fBuildAttrs // { + inherit name bazelFlags bazelTarget; + + deps = stdenv.mkDerivation (fFetchAttrs // { + name = "${name}-deps"; + inherit bazelFlags bazelTarget; + + nativeBuildInputs = fFetchAttrs.nativeBuildInputs or [] ++ [ bazel ]; + + preHook = fFetchAttrs.preHook or "" + '' + export bazelOut="$NIX_BUILD_TOP/output" + export HOME="$NIX_BUILD_TOP" + ''; + + buildPhase = fFetchAttrs.buildPhase or '' + runHook preBuild + + bazel --output_base="$bazelOut" fetch $bazelFlags $bazelTarget + + runHook postBuild + ''; + + installPhase = fFetchAttrs.installPhase or '' + runHook preInstall + + # Patching markers to make them deterministic + for i in $bazelOut/external/\@*.marker; do + sed -i 's, -\?[0-9][0-9]*$, 1,' "$i" + done + # Patching symlinks to remove build directory reference + find $bazelOut/external -type l | while read symlink; do + ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink" + done + + cp -r $bazelOut/external $out + + runHook postInstall + ''; + + dontFixup = true; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = fetchAttrs.sha256; + }); + + nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (bazel.override { enableNixHacks = true; }) ]; + + preHook = fBuildAttrs.preHook or "" + '' + export bazelOut="$NIX_BUILD_TOP/output" + export HOME="$NIX_BUILD_TOP" + ''; + + preConfigure = '' + mkdir -p $bazelOut/external + cp -r $deps/* $bazelOut/external + chmod -R +w $bazelOut + find $bazelOut -type l | while read symlink; do + ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" + done + '' + fBuildAttrs.preConfigure or ""; + + buildPhase = fBuildAttrs.buildPhase or '' + runHook preBuild + + bazel --output_base="$bazelOut" build -j $NIX_BUILD_CORES $bazelFlags $bazelTarget + + runHook postBuild + ''; +}) diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb deleted file mode 100755 index 833aab16ceb14c4d2d69f491b08daf05af3e8454..0000000000000000000000000000000000000000 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env ruby - -# Bind mounts hierarchy: from => to (relative) -# If 'to' is nil, path will be the same -mounts = { '/' => 'host', - '/proc' => nil, - '/sys' => nil, - '/nix' => nil, - '/tmp' => nil, - '/var' => nil, - '/run' => nil, - '/dev' => nil, - '/home' => nil, - } - -# Propagate environment variables -envvars = [ 'TERM', - 'DISPLAY', - 'XAUTHORITY', - 'HOME', - 'XDG_RUNTIME_DIR', - 'LANG', - 'SSL_CERT_FILE', - 'DBUS_SESSION_BUS_ADDRESS', - ] - -require 'tmpdir' -require 'fileutils' -require 'pathname' -require 'set' -require 'fiddle' - -def write_file(path, str) - File.open(path, 'w') { |file| file.write str } -end - -# Import C standard library and several needed calls -$libc = Fiddle.dlopen nil - -def make_fcall(name, args, output) - c = Fiddle::Function.new $libc[name], args, output - lambda do |*args| - ret = c.call *args - raise SystemCallError.new Fiddle.last_error if ret < 0 - return ret - end -end - -$fork = make_fcall 'fork', [], Fiddle::TYPE_INT - -CLONE_NEWNS = 0x00020000 -CLONE_NEWUSER = 0x10000000 -$unshare = make_fcall 'unshare', [Fiddle::TYPE_INT], Fiddle::TYPE_INT - -MS_BIND = 0x1000 -MS_REC = 0x4000 -MS_SLAVE = 0x80000 -$mount = make_fcall 'mount', [Fiddle::TYPE_VOIDP, - Fiddle::TYPE_VOIDP, - Fiddle::TYPE_VOIDP, - Fiddle::TYPE_LONG, - Fiddle::TYPE_VOIDP], - Fiddle::TYPE_INT - -# Read command line args -abort "Usage: chrootenv program args..." unless ARGV.length >= 1 -execp = ARGV - -# Populate extra mounts -if not ENV["CHROOTENV_EXTRA_BINDS"].nil? - $stderr.puts "CHROOTENV_EXTRA_BINDS is discussed for deprecation." - $stderr.puts "If you have a usecase, please drop a note in issue #16030." - $stderr.puts "Notice that we now bind-mount host FS to '/host' and symlink all directories from it to '/' by default." - - for extra in ENV["CHROOTENV_EXTRA_BINDS"].split(':') - paths = extra.split('=') - if not paths.empty? - if paths.size <= 2 - mounts[paths[0]] = paths[1] - else - $stderr.puts "Ignoring invalid entry in CHROOTENV_EXTRA_BINDS: #{extra}" - end - end - end -end - -# Set destination paths for mounts -mounts = mounts.map { |k, v| [k, v.nil? ? k.sub(/^\/*/, '') : v] }.to_h - -# Create temporary directory for root and chdir -root = Dir.mktmpdir 'chrootenv' - -# Fork process; we need this to do a proper cleanup because -# child process will chroot into temporary directory. -# We use imported 'fork' instead of native to overcome -# CRuby's meddling with threads; this should be safe because -# we don't use threads at all. -$cpid = $fork.call -if $cpid == 0 - # If we are root, no need to create new user namespace. - if Process.uid == 0 - $unshare.call CLONE_NEWNS - # Mark all mounted filesystems as slave so changes - # don't propagate to the parent mount namespace. - $mount.call nil, '/', nil, MS_REC | MS_SLAVE, nil - else - # Save user UID and GID - uid = Process.uid - gid = Process.gid - - # Create new mount and user namespaces - # CLONE_NEWUSER requires a program to be non-threaded, hence - # native fork above. - $unshare.call CLONE_NEWNS | CLONE_NEWUSER - - # Map users and groups to the parent namespace - begin - # setgroups is only available since Linux 3.19 - write_file '/proc/self/setgroups', 'deny' - rescue - end - write_file '/proc/self/uid_map', "#{uid} #{uid} 1" - write_file '/proc/self/gid_map', "#{gid} #{gid} 1" - end - - # Do rbind mounts. - mounts.each do |from, rto| - to = "#{root}/#{rto}" - FileUtils.mkdir_p to - $mount.call from, to, nil, MS_BIND | MS_REC, nil - end - - # Don't make root private so privilege drops inside chroot are possible - File.chmod(0755, root) - # Chroot! - Dir.chroot root - Dir.chdir '/' - - # New environment - new_env = Hash[ envvars.map { |x| [x, ENV[x]] } ] - - # Finally, exec! - exec(new_env, *execp, close_others: true, unsetenv_others: true) -end - -# Wait for a child. If we catch a signal, resend it to child and continue -# waiting. -def wait_child - begin - Process.wait - - # Return child's exit code - if $?.exited? - exit $?.exitstatus - else - exit 1 - end - rescue SignalException => e - Process.kill e.signo, $cpid - wait_child - end -end - -begin - wait_child -ensure - # Cleanup - FileUtils.rm_rf root, secure: true -end diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c new file mode 100644 index 0000000000000000000000000000000000000000..c03a1710f4516fee1bebda8655187a9099a6d347 --- /dev/null +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c @@ -0,0 +1,139 @@ +#define _GNU_SOURCE + +#include +#include + +#include +#include +#include + +#define fail(s, err) g_error("%s: %s: %s", __func__, s, g_strerror(err)) +#define fail_if(expr) \ + if (expr) \ + fail(#expr, errno); + +#include + +#include +#include +#include +#include + +const gchar *bind_blacklist[] = {"bin", "etc", "host", "usr", NULL}; + +void bind_mount(const gchar *source, const gchar *target) { + fail_if(g_mkdir(target, 0755)); + fail_if(mount(source, target, "bind", MS_BIND | MS_REC, NULL)); +} + +void bind_mount_host(const gchar *host, const gchar *guest) { + g_autofree gchar *point = g_build_filename(guest, "host", NULL); + bind_mount(host, point); +} + +void bind_mount_item(const gchar *host, const gchar *guest, const gchar *name) { + g_autofree gchar *source = g_build_filename(host, name, NULL); + g_autofree gchar *target = g_build_filename(guest, name, NULL); + + if (G_LIKELY(g_file_test(source, G_FILE_TEST_IS_DIR))) + bind_mount(source, target); +} + +void bind(const gchar *host, const gchar *guest) { + g_autoptr(GError) err = NULL; + g_autoptr(GDir) dir = g_dir_open(host, 0, &err); + + if (err != NULL) + fail("g_dir_open", errno); + + const gchar *item; + + while (item = g_dir_read_name(dir)) + if (!g_strv_contains(bind_blacklist, item)) + bind_mount_item(host, guest, item); + + bind_mount_host(host, guest); +} + +void spit(const char *path, char *fmt, ...) { + va_list args; + va_start(args, fmt); + + FILE *f = g_fopen(path, "w"); + + if (f == NULL) + fail("g_fopen", errno); + + g_vfprintf(f, fmt, args); + fclose(f); +} + +int nftw_remove(const char *path, const struct stat *sb, int type, + struct FTW *ftw) { + return remove(path); +} + +int main(gint argc, gchar **argv) { + const gchar *self = *argv++; + + if (argc < 2) { + g_message("%s command [arguments...]", self); + return 1; + } + + if (g_getenv("NIX_CHROOTENV")) + g_warning("chrootenv doesn't stack!"); + else + g_setenv("NIX_CHROOTENV", "", TRUE); + + g_autofree gchar *prefix = + g_build_filename(g_get_tmp_dir(), "chrootenvXXXXXX", NULL); + + fail_if(!g_mkdtemp_full(prefix, 0755)); + + pid_t cpid = fork(); + + if (cpid < 0) + fail("fork", errno); + + else if (cpid == 0) { + uid_t uid = getuid(); + gid_t gid = getgid(); + + if (unshare(CLONE_NEWNS | CLONE_NEWUSER) < 0) { + int unshare_errno = errno; + + g_message("Requires Linux version >= 3.19 built with CONFIG_USER_NS"); + if (g_file_test("/proc/sys/kernel/unprivileged_userns_clone", + G_FILE_TEST_EXISTS)) + g_message("Run: sudo sysctl -w kernel.unprivileged_userns_clone=1"); + + fail("unshare", unshare_errno); + } + + spit("/proc/self/setgroups", "deny"); + spit("/proc/self/uid_map", "%d %d 1", uid, uid); + spit("/proc/self/gid_map", "%d %d 1", gid, gid); + + bind("/", prefix); + + fail_if(chroot(prefix)); + fail_if(execvp(*argv, argv)); + } + + else { + int status; + + fail_if(waitpid(cpid, &status, 0) != cpid); + fail_if(nftw(prefix, nftw_remove, getdtablesize(), + FTW_DEPTH | FTW_MOUNT | FTW_PHYS)); + + if (WIFEXITED(status)) + return WEXITSTATUS(status); + + else if (WIFSIGNALED(status)) + kill(getpid(), WTERMSIG(status)); + + return 1; + } +} diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..375c30e1e463bebcebfaade155c9f92ae8164038 --- /dev/null +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -0,0 +1,19 @@ +{ stdenv, pkgconfig, glib }: + +stdenv.mkDerivation { + name = "chrootenv"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; + + buildCommand = '' + cc ${./chrootenv.c} $(pkg-config --cflags --libs glib-2.0) -o $out + ''; + + meta = with stdenv.lib; { + description = "Setup mount/user namespace for FHS emulation"; + license = licenses.free; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index d91cdffcf39232a04dc3a02acf49ade1378c1fbc..219530a67bd8c9b05aeec76a9680ec5a55d77c3a 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,17 +1,13 @@ -{ callPackage, runCommand, lib, writeScript, stdenv, coreutils, ruby }: +{ callPackage, runCommand, lib, writeScript, stdenv, coreutils }: let buildFHSEnv = callPackage ./env.nix { }; in -args@{ name, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: +args@{ name, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: let - env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" "passthru" ]); + env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" ]); - # Sandboxing script - chroot-user = writeScript "chroot-user" '' - #! ${ruby}/bin/ruby - ${builtins.readFile ./chroot-user.rb} - ''; + chrootenv = callPackage ./chrootenv {}; init = run: writeScript "${name}-init" '' #! ${stdenv.shell} @@ -32,8 +28,7 @@ in runCommand name { passthru = passthru // { env = runCommand "${name}-shell-env" { shellHook = '' - ${lib.optionalString (extraBindMounts != []) ''export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"''} - exec ${chroot-user} ${init "bash"} "$(pwd)" + exec ${chrootenv} ${init "bash"} "$(pwd)" ''; } '' echo >&2 "" @@ -46,8 +41,7 @@ in runCommand name { mkdir -p $out/bin cat <$out/bin/${name} #! ${stdenv.shell} - ${lib.optionalString (extraBindMounts != []) ''export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"''} - exec ${chroot-user} ${init runScript} "\$(pwd)" "\$@" + exec ${chrootenv} ${init runScript} "\$(pwd)" "\$@" EOF chmod +x $out/bin/${name} ${extraInstallCommands} diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index da8a86b68f5d4a1b6f4f6e7a0476e2d7bd0f35dc..d951fb9ab06ed0216dd32a2e8678541f5d5033f7 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -52,11 +52,14 @@ 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 TZDIR='/etc/zoneinfo' # Force compilers and other tools to look in default search paths + unset NIX_ENFORCE_PURITY export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1 export NIX_CFLAGS_COMPILE='-idirafter /usr/include' - export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32' + export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' + export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32' export PKG_CONFIG_PATH=/usr/lib/pkgconfig export ACLOCAL_PATH=/usr/share/aclocal diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index ce948739c320e30c55edef6b8453f9adb2e108a6..738dbb56708d19740acc032fb8852de527b2744c 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -22,6 +22,4 @@ stdenv.mkDerivation (args // { makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; autoreconfPhase = "phpize"; - - preConfigure = "touch unix.h"; }) diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bc6482f0a88e6f1399596e6994f335ce9529affe --- /dev/null +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -0,0 +1,25 @@ +# Build a python package from info made available by setupcfg2nix. +# +# * src: The source of the package. +# * info: The package information generated by setupcfg2nix. +# * meta: Standard nixpkgs metadata. +# * application: Whether this package is a python library or an +# application which happens to be written in python. +# * doCheck: Whether to run the test suites. +pythonPackages: +{ src, info, meta ? {}, application ? false, doCheck ? true }: let + build = if application + then pythonPackages.buildPythonApplication + else pythonPackages.buildPythonPackage; +in build { + inherit (info) pname version; + + inherit src meta doCheck; + + nativeBuildInputs = map (p: pythonPackages.${p}) ( + (info.setup_requires or []) ++ + (if doCheck then (info.tests_require or []) else [])); + + propagatedBuildInputs = map (p: pythonPackages.${p}) + (info.install_requires or []); +} diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 39633fce69a819186735eda740b4803e8ee55cdc..604aaf6b6cf0b779dab3cfd6c6dce58bf1f56e6e 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -4,19 +4,13 @@ # that case, it is cheaper/better to not repeat this step and let the forked # wrapped binary just inherit the work of the forker's wrapper script. -var_templates=( +var_templates_list=( NIX+CFLAGS_COMPILE NIX+CFLAGS_LINK NIX+CXXSTDLIB_COMPILE NIX+CXXSTDLIB_LINK - NIX+GNATFLAGS_COMPILE - NIX+IGNORE_LD_THROUGH_GCC - NIX+LDFLAGS - NIX+LDFLAGS_BEFORE - NIX+LDFLAGS_AFTER - - NIX+SET_BUILD_ID - NIX+DONT_SET_RPATH +) +var_templates_bool=( NIX+ENFORCE_NO_NATIVE ) @@ -35,17 +29,11 @@ fi # We need to mangle names for hygiene, but also take parameters/overrides # from the environment. -for var in "${var_templates[@]}"; do - outputVar="${var/+/_@infixSalt@_}" - export ${outputVar}+='' - # For each role we serve, we accumulate the input parameters into our own - # cc-wrapper-derivation-specific environment variables. - for infix in "${role_infixes[@]}"; do - inputVar="${var/+/${infix}}" - if [ -v "$inputVar" ]; then - export ${outputVar}+="${!outputVar:+ }${!inputVar}" - fi - done +for var in "${var_templates_list[@]}"; do + mangleVarList "$var" "${role_infixes[@]}" +done +for var in "${var_templates_bool[@]}"; do + mangleVarBool "$var" "${role_infixes[@]}" done # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. @@ -62,21 +50,9 @@ if [ -e @out@/nix-support/cc-cflags ]; then NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE" fi -if [ -e @out@/nix-support/gnat-cflags ]; then - NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE" -fi - -if [ -e @out@/nix-support/libc-ldflags ]; then - NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" -fi - if [ -e @out@/nix-support/cc-ldflags ]; then NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" fi -if [ -e @out@/nix-support/libc-ldflags-before ]; then - NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE" -fi - # That way forked processes will not extend these environment variables again. export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1 diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index b0e39e455ffc57a5a33bb977a258e3dbafd74725..a35ff3cb42609196425565dbd073b557700e9c48 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -6,7 +6,6 @@ if [[ -v hardeningEnable[@] ]]; then hardeningFlags+=(${hardeningEnable[@]}) fi hardeningCFlags=() -hardeningLDFlags=() declare -A hardeningDisableMap @@ -44,7 +43,6 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi hardeningCFlags+=('-pie') - hardeningLDFlags+=('-pie') fi ;; pic) @@ -59,14 +57,6 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') ;; - relro) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi - hardeningLDFlags+=('-z' 'relro') - ;; - bindnow) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi - hardeningLDFlags+=('-z' 'now') - ;; *) # Ignore unsupported. Checked in Nix that at least *some* # tool supports each flag. diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index d2cdbf6ce0cca016b52caba06defc6d01c9790a5..c2e6c1406358f9592dd31d321424fea7c2799f1a 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -15,12 +15,18 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi +source @out@/nix-support/utils.sh + +# Flirting with a layer violation here. +if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then + source @bintools@/nix-support/add-flags.sh +fi + +# Put this one second so libc ldflags take priority. if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi -source @out@/nix-support/utils.sh - # Parse command line options and set several variables. # For instance, figure out if linker flags should be passed. @@ -59,7 +65,8 @@ while (( "$n" < "$nParams" )); do cppInclude=0 elif [ "$p" = -nostdinc++ ]; then cppInclude=0 - elif [ "${p:0:1}" != - ]; then + elif [[ "$p" != -?* ]]; then + # A dash alone signifies standard input; it is not a flag nonFlagArgs=1 fi n+=1 diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8d8b8a42fe9f1391f867a3d2852c37909c973c2b..43cd87fb45976be1d7d5c3953a27d5b773e6d2d0 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -5,25 +5,22 @@ # script that sets up the right environment variables so that the # compiler and the linker just "work". -{ name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenvNoCC.shell -, zlib ? null, extraPackages ? [], extraBuildCommands ? "" +{ name ? "" +, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +, cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell +, extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} -, useMacosReexportHack ? false }: with stdenvNoCC.lib; -assert nativeTools -> nativePrefix != ""; +assert nativeTools -> !propagateDoc && nativePrefix != ""; assert !nativeTools -> - cc != null && binutils != null && coreutils != null && gnugrep != null; + cc != null && coreutils != null && gnugrep != null; assert !(nativeLibc && noLibc); assert (noLibc || nativeLibc) == (libc == null); -# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper. -assert cc.langVhdl or false -> zlib != null; - let stdenv = stdenvNoCC; inherit (stdenv) hostPlatform targetPlatform; @@ -32,8 +29,8 @@ let # # TODO(@Ericson2314) Make unconditional, or optional but always true by # default. - prefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) - (targetPlatform.config + "-"); + targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + (targetPlatform.config + "-"); ccVersion = (builtins.parseDrvName cc.name).version; ccName = (builtins.parseDrvName cc.name).name; @@ -42,11 +39,10 @@ let 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)) + default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools) "-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; @@ -58,21 +54,6 @@ let # unstable implementation detail, however. infixSalt = dashlessTarget; - # The dynamic linker has different names on different platforms. This is a - # shell glob that ought to match it. - dynamicLinker = - /**/ if libc == null then null - else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" - else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" - # ARM with a wildcard, which can be "" or "-armhf". - else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" - else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" - else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" - else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1" - else if targetPlatform.isDarwin then "/usr/lib/dyld" - else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" - else null; - expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" then import ../expand-response-params { inherit (buildPackages) stdenv; } @@ -80,40 +61,44 @@ let in +# Ensure bintools matches +assert libc_bin == bintools.libc_bin; +assert libc_dev == bintools.libc_dev; +assert libc_lib == bintools.libc_lib; +assert nativeTools == bintools.nativeTools; +assert nativeLibc == bintools.nativeLibc; +assert nativePrefix == bintools.nativePrefix; + stdenv.mkDerivation { - name = prefix + name = targetPrefix + (if name != "" then name else "${ccName}-wrapper") + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}"); preferLocalBuild = true; - inherit cc libc_bin libc_dev libc_lib binutils_bin coreutils_bin; - shell = getBin shell + shell.shellPath or ""; + inherit cc libc_bin libc_dev libc_lib bintools coreutils_bin; + shell = getBin shell + stdenv.lib.optionalString (stdenv ? shellPath) stdenv.shellPath; gnugrep_bin = if nativeTools then "" else gnugrep; - binPrefix = prefix; - inherit infixSalt; + inherit targetPrefix infixSalt; - outputs = [ "out" "man" ]; + outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; passthru = { # "cc" is the generic name for a C compiler, but there is no one for package # providing the linker and related tools. The two we use now are GNU - # Binutils, and Apple's "cctools"; "binutils" as an attempt to find an + # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an # unused middle-ground name that evokes both. - bintools = binutils_bin; - inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile - prefix; + inherit bintools; + inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile; emacsBufferSetup = pkgs: '' ; We should handle propagation here too - (mapc (lambda (arg) - (when (file-directory-p (concat 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_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib"))) - (when (file-directory-p (concat arg "/lib64")) - (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + (mapc + (lambda (arg) + (when (file-directory-p (concat arg "/include")) + (setenv "NIX_${infixSalt}_CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt}_CFLAGS_COMPILE") " -isystem " arg "/include")))) + '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ''; }; @@ -128,7 +113,7 @@ stdenv.mkDerivation { '' set -u - mkdir -p $out/bin $out/nix-support $man/nix-support + mkdir -p $out/bin $out/nix-support wrap() { local dst="$1" @@ -143,114 +128,89 @@ stdenv.mkDerivation { echo ${if targetPlatform.isDarwin then cc else nativePrefix} > $out/nix-support/orig-cc ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin" - ldPath="${nativePrefix}/bin" '' else '' echo $cc > $out/nix-support/orig-cc ccPath="${cc}/bin" - ldPath="${binutils_bin}/bin" - '' - - + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' - # Solaris needs an additional ld wrapper. - ldPath="${nativePrefix}/bin" - exec="$ldPath/${prefix}ld" - wrap ld-solaris ${./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/${prefix}as ]; then - ln -s $ldPath/${prefix}as $out/bin/${prefix}as - fi - - '' + (if !useMacosReexportHack then '' - wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} - '' else '' - ldInner="${prefix}ld-reexport-delegate" - wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld} - wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" - unset ldInner - '') + '' - - if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then - wrap ${prefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold - fi - - if [ -e ${binutils_bin}/bin/ld.bfd ]; then - wrap ${prefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd - fi + # Create symlinks to everything in the bintools wrapper. + for bbin in $bintools/bin/*; do + mkdir -p "$out/bin" + ln -s "$bbin" "$out/bin/$(basename $bbin)" + done # We export environment variables pointing to the wrapped nonstandard # cmds, lest some lousy configure script use those to guess compiler # version. - export named_cc=${prefix}cc - export named_cxx=${prefix}c++ + export named_cc=${targetPrefix}cc + export named_cxx=${targetPrefix}c++ export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" - if [ -e $ccPath/${prefix}gcc ]; then - wrap ${prefix}gcc ${./cc-wrapper.sh} $ccPath/${prefix}gcc - ln -s ${prefix}gcc $out/bin/${prefix}cc - export named_cc=${prefix}gcc - export named_cxx=${prefix}g++ + if [ -e $ccPath/${targetPrefix}gcc ]; then + wrap ${targetPrefix}gcc ${./cc-wrapper.sh} $ccPath/${targetPrefix}gcc + ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc + export named_cc=${targetPrefix}gcc + export named_cxx=${targetPrefix}g++ elif [ -e $ccPath/clang ]; then - wrap ${prefix}clang ${./cc-wrapper.sh} $ccPath/clang - ln -s ${prefix}clang $out/bin/${prefix}cc - export named_cc=${prefix}clang - export named_cxx=${prefix}clang++ + wrap ${targetPrefix}clang ${./cc-wrapper.sh} $ccPath/clang + ln -s ${targetPrefix}clang $out/bin/${targetPrefix}cc + export named_cc=${targetPrefix}clang + export named_cxx=${targetPrefix}clang++ fi - if [ -e $ccPath/${prefix}g++ ]; then - wrap ${prefix}g++ ${./cc-wrapper.sh} $ccPath/${prefix}g++ - ln -s ${prefix}g++ $out/bin/${prefix}c++ + if [ -e $ccPath/${targetPrefix}g++ ]; then + wrap ${targetPrefix}g++ ${./cc-wrapper.sh} $ccPath/${targetPrefix}g++ + ln -s ${targetPrefix}g++ $out/bin/${targetPrefix}c++ elif [ -e $ccPath/clang++ ]; then - wrap ${prefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++ - ln -s ${prefix}clang++ $out/bin/${prefix}c++ + wrap ${targetPrefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++ + ln -s ${targetPrefix}clang++ $out/bin/${targetPrefix}c++ fi if [ -e $ccPath/cpp ]; then - wrap ${prefix}cpp ${./cc-wrapper.sh} $ccPath/cpp + wrap ${targetPrefix}cpp ${./cc-wrapper.sh} $ccPath/cpp fi '' + optionalString cc.langFortran or false '' - wrap ${prefix}gfortran ${./cc-wrapper.sh} $ccPath/${prefix}gfortran - ln -sv ${prefix}gfortran $out/bin/${prefix}g77 - ln -sv ${prefix}gfortran $out/bin/${prefix}f77 + wrap ${targetPrefix}gfortran ${./cc-wrapper.sh} $ccPath/${targetPrefix}gfortran + ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 + ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77 '' + optionalString cc.langJava or false '' - wrap ${prefix}gcj ${./cc-wrapper.sh} $ccPath/${prefix}gcj + wrap ${targetPrefix}gcj ${./cc-wrapper.sh} $ccPath/${targetPrefix}gcj '' + optionalString cc.langGo or false '' - wrap ${prefix}gccgo ${./cc-wrapper.sh} $ccPath/${prefix}gccgo - '' - - + optionalString cc.langAda or false '' - wrap ${prefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${prefix}gnatgcc - wrap ${prefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${prefix}gnatmake - wrap ${prefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${prefix}gnatbind - wrap ${prefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink - '' - - + optionalString cc.langVhdl or false '' - ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl + wrap ${targetPrefix}gccgo ${./cc-wrapper.sh} $ccPath/${targetPrefix}gccgo ''; - propagatedBuildInputs = extraPackages; + propagatedBuildInputs = [ bintools ]; + depsTargetTargetPropagated = extraPackages; setupHook = ./setup-hook.sh; postFixup = '' set -u + + # Backwards compatability for packages expecting this file, e.g. with + # `$NIX_CC/nix-support/dynamic-linker`. + # + # TODO(@Ericson2314): Remove this after stable release and force + # everyone to refer to bintools-wrapper directly. + if [[ -f "$bintools/nix-support/dynamic-linker" ]]; then + ln -s "$bintools/nix-support/dynamic-linker" "$out/nix-support" + fi + if [[ -f "$bintools/nix-support/dynamic-linker-m32" ]]; then + ln -s "$bintools/nix-support/dynamic-linker-m32" "$out/nix-support" + fi '' - + optionalString (libc != null) ('' + + optionalString (libc != null) '' ## ## General libc support ## @@ -266,53 +226,13 @@ stdenv.mkDerivation { # compile, because it uses "#include_next " to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. - echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags - - echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags + echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include ${optionalString isGNU "-idirafter ${cc}/lib/gcc/*/*/include-fixed"}" > $out/nix-support/libc-cflags echo "${libc_lib}" > $out/nix-support/orig-libc echo "${libc_dev}" > $out/nix-support/orig-libc-dev - - ## - ## Dynamic linker support - ## - - if [[ -z ''${dynamicLinker+x} ]]; then - echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 - local dynamicLinker="${libc_lib}/lib/ld*.so.?" - fi - - # Expand globs to fill array of options - dynamicLinker=($dynamicLinker) - - case ''${#dynamicLinker[@]} in - 0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;; - 1) echo "Using dynamic linker: '$dynamicLinker'" >&2;; - *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; - esac - - if [ -n "''${dynamicLinker:-}" ]; then - echo $dynamicLinker > $out/nix-support/dynamic-linker - - '' + (if targetPlatform.isDarwin then '' - printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook - '' else '' - 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 - - local ldflagsBefore=(-dynamic-linker "$dynamicLinker") - '') + '' - 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). - printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before - '') + '' + optionalString (!nativeTools) '' - ## ## Initial CFLAGS ## @@ -328,46 +248,26 @@ stdenv.mkDerivation { ccLDFlags+=" -L${cc_solib}/lib" ccCFlags+=" -B${cc_solib}/lib" - ${optionalString cc.langVhdl or false '' - ccLDFlags+=" -L${zlib.out}/lib" - ''} - - # Find the gcc libraries path (may work only without multilib). - ${optionalString cc.langAda or false '' - basePath=`echo ${cc_solib}/lib/*/*/*` - ccCFlags+=" -B$basePath -I$basePath/adainclude" - gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" - echo "$gnatCFlags" > $out/nix-support/gnat-cflags - ''} - echo "$ccLDFlags" > $out/nix-support/cc-ldflags echo "$ccCFlags" > $out/nix-support/cc-cflags + '' + + optionalString propagateDoc '' ## - ## User env support + ## Man page and info support ## - # 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). - printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages + mkdir -p $man/nix-support $info/nix-support printWords ${cc.man or ""} > $man/nix-support/propagated-user-env-packages + printWords ${cc.info or ""} > $info/nix-support/propagated-user-env-packages '' + '' - ## ## Hardening support ## - # some linkers on some platforms don't support specific -z flags - export hardening_unsupported_flags="" - if [[ "$($ldPath/${prefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then - hardening_unsupported_flags+=" bindnow" - fi - if [[ "$($ldPath/${prefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then - hardening_unsupported_flags+=" relro" - fi + export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}" '' + optionalString hostPlatform.isCygwin '' @@ -382,11 +282,11 @@ stdenv.mkDerivation { ## ## Extra custom steps ## - '' + + extraBuildCommands; - inherit dynamicLinker expand-response-params; + inherit expand-response-params; # for substitution in utils.sh expandResponseParams = "${expand-response-params}/bin/expand-response-params"; @@ -397,7 +297,5 @@ stdenv.mkDerivation { { description = stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)"; - } // optionalAttrs useMacosReexportHack { - platforms = stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh deleted file mode 100644 index 7a0eb28be6368c6295a4b0971850c026c17e6f2f..0000000000000000000000000000000000000000 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ /dev/null @@ -1,126 +0,0 @@ -#! @shell@ -set -eu -o pipefail +o posix -shopt -s nullglob - -if (( "${NIX_DEBUG:-0}" >= 7 )); then - set -x -fi - -# N.B. Gnat is not used during bootstrapping, so we don't need to -# worry about the old bash empty array `set -u` workarounds. - -path_backup="$PATH" - -# phase separation makes this look useless -# shellcheck disable=SC2157 -if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" -fi - -if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then - source @out@/nix-support/add-flags.sh -fi - -source @out@/nix-support/utils.sh - - -# Figure out if linker flags should be passed. GCC prints annoying -# warnings when they are not needed. -dontLink=0 -nonFlagArgs=0 - -for i in "$@"; do - if [ "$i" = -c ]; then - dontLink=1 - elif [ "$i" = -M ]; then - dontLink=1 - elif [ "${i:0:1}" != - ]; then - nonFlagArgs=1 - elif [ "$i" = -m32 ]; then - if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)" - fi - fi -done - -# If we pass a flag like -Wl, then gcc will call the linker unless it -# can figure out that it has to do something else (e.g., because of a -# "-c" flag). So if no non-flag arguments are given, don't pass any -# linker flags. This catches cases like "gcc" (should just print -# "gcc: no input files") and "gcc -v" (should print the version). -if [ "$nonFlagArgs" = 0 ]; then - dontLink=1 -fi - - -# Optionally filter out paths not refering to the store. -params=("$@") -if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then - rest=() - for p in "${params[@]}"; do - if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then - skip "${p:2}" - elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then - skip "${p:2}" - elif [ "${p:0:4}" = -aI/ ] && badPath "${p:3}"; then - skip "${p:2}" - elif [ "${p:0:4}" = -aO/ ] && badPath "${p:3}"; then - skip "${p:2}" - else - rest+=("$p") - fi - done - params=("${rest[@]}") -fi - - -# Clear march/mtune=native -- they bring impurity. -if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then - rest=() - for p in "${params[@]}"; do - if [[ "$p" = -m*=native ]]; then - skip "$p" - else - rest+=("$p") - fi - done - params=("${rest[@]}") -fi - - -# Add the flags for the GNAT compiler proper. -extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE) -extraBefore=() - -if [ "$(basename "$0")x" = "gnatmakex" ]; then - extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink ") -fi - -#if [ "$dontLink" != 1 ]; then -# # Add the flags that should be passed to the linker (and prevent -# # `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again). -# for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do -# extraBefore+=("-largs" "$i") -# done -# for i in $NIX_@infixSalt@_LDFLAGS; do -# if [ "${i:0:3}" = -L/ ]; then -# extraAfter+=("$i") -# else -# extraAfter+=("-largs" "$i") -# fi -# done -# export NIX_@infixSalt@_LDFLAGS_SET=1 -#fi - -# Optionally print debug info. -if (( "${NIX_DEBUG:-0}" >= 1 )); then - echo "extra flags before to @prog@:" >&2 - printf " %q\n" "${extraBefore[@]}" >&2 - echo "original flags to @prog@:" >&2 - printf " %q\n" "${params[@]}" >&2 - echo "extra flags after to @prog@:" >&2 - printf " %q\n" "${extraAfter[@]}" >&2 -fi - -PATH="$path_backup" -exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh deleted file mode 100644 index 0944d74e431b103cc7679833c522745c1350e903..0000000000000000000000000000000000000000 --- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh +++ /dev/null @@ -1,40 +0,0 @@ -#! @shell@ -set -eu -o pipefail +o posix -shopt -s nullglob - -if (( "${NIX_DEBUG:-0}" >= 7 )); then - set -x -fi - -# N.B. Gnat is not used during bootstrapping, so we don't need to -# worry about the old bash empty array `set -u` workarounds. - -# Add the flags for the GNAT compiler proper. -extraAfter=("--GCC=@out@/bin/gcc") -extraBefore=() - -## Add the flags that should be passed to the linker (and prevent -## `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again). -#for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do -# extraBefore+=("-largs" "$i") -#done -#for i in $NIX_@infixSalt@_LDFLAGS; do -# if [ "${i:0:3}" = -L/ ]; then -# extraAfter+=("$i") -# else -# extraAfter+=("-largs" "$i") -# fi -#done -#export NIX_@infixSalt@_LDFLAGS_SET=1 - -# Optionally print debug info. -if (( "${NIX_DEBUG:-0}" >= 1 )); then - echo "extra flags before to @prog@:" >&2 - printf " %q\n" "${extraBefore[@]}" >&2 - echo "original flags to @prog@:" >&2 - printf " %q\n" "$@" >&2 - echo "extra flags after to @prog@:" >&2 - printf " %q\n" "${extraAfter[@]}" >&2 -fi - -exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh deleted file mode 100644 index ef618f9a86d40695e23e81323d3bd7c3216a458e..0000000000000000000000000000000000000000 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ /dev/null @@ -1,205 +0,0 @@ -#! @shell@ -set -eu -o pipefail +o posix -shopt -s nullglob - -if (( "${NIX_DEBUG:-0}" >= 7 )); then - set -x -fi - -path_backup="$PATH" - -# phase separation makes this look useless -# shellcheck disable=SC2157 -if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" -fi - -if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then - source @out@/nix-support/add-flags.sh -fi - -source @out@/nix-support/utils.sh - - -# Optionally filter out paths not refering to the store. -expandResponseParams "$@" -if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" - && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ) ]]; then - rest=() - nParams=${#params[@]} - declare -i n=0 - while (( "$n" < "$nParams" )); do - p=${params[n]} - p2=${params[n+1]:-} # handle `p` being last one - if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then - skip "${p:2}" - elif [ "$p" = -L ] && badPath "$p2"; then - n+=1; skip "$p2" - elif [ "$p" = -rpath ] && badPath "$p2"; then - n+=1; skip "$p2" - elif [ "$p" = -dynamic-linker ] && badPath "$p2"; then - n+=1; skip "$p2" - elif [ "${p:0:1}" = / ] && badPath "$p"; then - # We cannot skip this; barf. - echo "impure path \`$p' used in link" >&2 - exit 1 - elif [ "${p:0:9}" = --sysroot ]; then - # Our ld is not built with sysroot support (Can we fix that?) - : - else - rest+=("$p") - fi - n+=1 - done - # Old bash empty array hack - params=(${rest+"${rest[@]}"}) -fi - -source @out@/nix-support/add-hardening.sh - -extraAfter=("${hardeningLDFlags[@]}") -extraBefore=() - -if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then - extraAfter+=($NIX_@infixSalt@_LDFLAGS) - extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE) -fi - -extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER) - -# Three tasks: -# -# 1. Find all -L... switches for rpath -# -# 2. Find relocatable flag for build id. -# -# 3. Choose 32-bit dynamic linker if needed -declare -a libDirs -declare -A libs -declare -i relocatable=0 link32=0 - -if - [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] \ - || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] \ - || [ -e @out@/nix-support/dynamic-linker-m32 ] -then - prev= - # Old bash thinks empty arrays are undefined, ugh. - for p in \ - ${extraBefore+"${extraBefore[@]}"} \ - ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} - do - case "$prev" in - -L) - libDirs+=("$p") - ;; - -l) - libs["lib${p}.so"]=1 - ;; - -m) - # Presumably only the last `-m` flag has any effect. - case "$p" in - elf_i386) link32=1;; - *) link32=0;; - esac - ;; - -dynamic-linker | -plugin) - # Ignore this argument, or it will match *.so and be added to rpath. - ;; - *) - case "$p" in - -L/*) - libDirs+=("${p:2}") - ;; - -l?*) - libs["lib${p:2}.so"]=1 - ;; - "${NIX_STORE:-}"/*.so | "${NIX_STORE:-}"/*.so.*) - # This is a direct reference to a shared library. - libDirs+=("${p%/*}") - libs["${p##*/}"]=1 - ;; - -r | --relocatable | -i) - relocatable=1 - esac - ;; - esac - prev="$p" - done -fi - -if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then - # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's - # use it. - extraAfter+=( - '-dynamic-linker' - "$(< @out@/nix-support/dynamic-linker-m32)" - ) -fi - -# Add all used dynamic libraries to the rpath. -if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then - # For each directory in the library search path (-L...), - # see if it contains a dynamic library used by a -l... flag. If - # so, add the directory to the rpath. - # It's important to add the rpath in the order of -L..., so - # the link time chosen objects will be those of runtime linking. - declare -A rpaths - for dir in ${libDirs+"${libDirs[@]}"}; do - if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then - dir="$dir2" - fi - if [ -n "${rpaths[$dir]:-}" ] || [[ "$dir" != "${NIX_STORE:-}"/* ]]; then - # 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. - continue - fi - for path in "$dir"/*; do - file="${path##*/}" - if [ "${libs[$file]:-}" ]; then - # This library may have been provided by a previous directory, - # but if that library file is inside an output of the current - # derivation, it can be deleted after this compilation and - # should be found in a later directory, so we add all - # directories that contain any of the libraries to rpath. - rpaths["$dir"]=1 - extraAfter+=(-rpath "$dir") - break - fi - done - done - -fi - -# This is outside the DONT_SET_RPATH branch because it's more targeted and we -# usually want it (on Darwin) even if DONT_SET_RPATH is set. -if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then - extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH) -fi - -# Only add --build-id if this is a final link. FIXME: should build gcc -# with --enable-linker-build-id instead? -if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && ! (( "$relocatable" )); then - extraAfter+=(--build-id) -fi - - -# Optionally print debug info. -if (( "${NIX_DEBUG:-0}" >= 1 )); then - # Old bash workaround, see above. - echo "extra flags before to @prog@:" >&2 - printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 - echo "original flags to @prog@:" >&2 - printf " %q\n" ${params+"${params[@]}"} >&2 - echo "extra flags after to @prog@:" >&2 - printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 -fi - -PATH="$path_backup" -# Old bash workaround, see above. -exec @prog@ \ - ${extraBefore+"${extraBefore[@]}"} \ - ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash deleted file mode 100644 index b7aa7ea5c092dcf52ba05b07a7318e997e1d78bd..0000000000000000000000000000000000000000 --- a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash +++ /dev/null @@ -1,106 +0,0 @@ -#! @shell@ - -set -eu -o pipefail - -path_backup="$PATH" -if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" -fi - -declare -r recurThreshold=300 - -declare overflowCount=0 -for ((n=0; n < $#; ++n)); do - case "${!n}" in - -l*) let overflowCount+=1 ;; - -reexport-l*) let overflowCount+=1 ;; - *) ;; - esac -done - -declare -a allArgs=() - -if (( "$overflowCount" <= "$recurThreshold" )); then - allArgs=("$@") -else - declare -a childrenLookup=() childrenLink=() - - while (( $# )); do - case "$1" in - -L/*) - childrenLookup+=("$1") - allArgs+=("$1") - ;; - -L) - echo "cctools LD does not support '-L foo' or '-l foo'" >&2 - exit 1 - ;; - -l) - echo "cctools LD does not support '-L foo' or '-l foo'" >&2 - exit 1 - ;; - -lazy_library | -lazy_framework | -lto_library) - # We aren't linking any "azy_library", "to_library", etc. - allArgs+=("$1") - ;; - -lazy-l | -weak-l) allArgs+=("$1") ;; - # We can't so easily prevent header issues from these. - -lSystem) allArgs+=("$1") ;; - # Special case as indirection seems like a bad idea for something - # so fundamental. Can be removed for simplicity. - -l?* | -reexport-l?*) childrenLink+=("$1") ;; - *) allArgs+=("$1") ;; - esac - - shift - done - - declare n=0 - while (( $n < "${#childrenLink[@]}" )); do - if [[ "${childrenLink[n]}" = -l* ]]; then - childrenLink[n]="-reexport${childrenLink[n]}" - fi - let ++n - done - unset n - - declare -r outputNameLibless=$(basename $( \ - if [[ -z "${outputName:+isUndefined}" ]]; then - echo unnamed - elif [[ "${outputName:0:3}" = lib ]]; then - echo "${outputName:3}" - else - echo "${outputName}" - fi)) - declare -ra children=("$outputNameLibless-reexport-delegate-0" \ - "$outputNameLibless-reexport-delegate-1") - - mkdir -p "$out/lib" - - PATH="$PATH:@out@/bin" - - symbolBloatObject=$outputNameLibless-symbol-hack.o - if [[ ! -e $symbolBloatObject ]]; then - printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ - | @binPrefix@as -- -o $symbolBloatObject - fi - - # first half of libs - @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[0]}.dylib" \ - -install_name "$out/lib/lib${children[0]}.dylib" \ - "${childrenLookup[@]}" "$symbolBloatObject" \ - "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" - - # second half of libs - @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[1]}.dylib" \ - -install_name "$out/lib/lib${children[1]}.dylib" \ - "${childrenLookup[@]}" "$symbolBloatObject" \ - "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}" - - allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}") -fi - -PATH="$path_backup" -exec @prog@ "${allArgs[@]}" diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index e43c1609edb18833b88ecc14d8a8693a01a85a7f..29a7306b9b7e9cff57e7c1d5cf83318e53de457d 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -54,19 +54,26 @@ # For more details, read the individual files where the mechanisms used to # accomplish this will be individually documented. +set -u + +# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a +# native compile. +# +# TODO(@Ericson2314): No native exception +[[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0 # It's fine that any other cc-wrapper will redefine this. Bash functions close # over no state, and there's no @-substitutions within, so any redefined # function is guaranteed to be exactly the same. ccWrapper_addCVars () { - # The `depOffset` describes how the platforms of the dependencies are slid - # relative to the depending package. It is brought into scope of the - # environment hook defined as the role of the dependency being applied. - case $depOffset in + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in -1) local role='BUILD_' ;; 0) local role='' ;; 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; return 1 ;; esac @@ -74,14 +81,6 @@ ccWrapper_addCVars () { export NIX_${role}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" fi - if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then - export NIX_${role}LDFLAGS+=" -L$1/lib64" - fi - - if [[ -d "$1/lib" ]]; then - export NIX_${role}LDFLAGS+=" -L$1/lib" - fi - if [[ -d "$1/Library/Frameworks" ]]; then export NIX_${role}CFLAGS_COMPILE+=" -F$1/Library/Frameworks" fi @@ -95,18 +94,31 @@ ccWrapper_addCVars () { # # We also need to worry about what role is being added on *this* invocation of # setup-hook, which `role` tracks. -if [ -n "${crossConfig:-}" ]; then - export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1 - role="BUILD_" -else - export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1 - role="" -fi - -# Eventually the exact sort of env-hook we create will depend on the role. This -# is because based on what relative platform we are targeting, we use different -# dependencies. -envHooks+=(ccWrapper_addCVars) +case $targetOffset in + -1) + export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1 + role_pre='BUILD_' + role_post='_FOR_BUILD' + ;; + 0) + export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1 + role_pre='' + role_post='' + ;; + 1) + export NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET=1 + role_pre='TARGET_' + role_post='_FOR_TARGET' + ;; + *) + echo "cc-wrapper: used as improper sort of dependency" >2; + return 1 + ;; +esac + +# We use the `targetOffset` to choose the right env hook to accumulate the right +# sort of deps (those with that offset). +addEnvHooks "$targetOffset" ccWrapper_addCVars # Note 1: these come *after* $out in the PATH (see setup.sh). # Note 2: phase separation makes this look useless to shellcheck. @@ -116,11 +128,6 @@ if [ -n "@cc@" ]; then addToSearchPath _PATH @cc@/bin fi -# shellcheck disable=SC2157 -if [ -n "@binutils_bin@" ]; then - addToSearchPath _PATH @binutils_bin@/bin -fi - # shellcheck disable=SC2157 if [ -n "@libc_bin@" ]; then addToSearchPath _PATH @libc_bin@/bin @@ -133,20 +140,13 @@ fi # Export tool environment variables so various build systems use the right ones. -export NIX_${role}CC=@out@ - -export ${role}CC=@named_cc@ -export ${role}CXX=@named_cxx@ +export NIX_${role_pre}CC=@out@ -for CMD in \ - ar as nm objcopy ranlib strip strings size ld windres -do - if - PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null - then - export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}"; - fi -done +export ${role_pre}CC=@named_cc@ +export ${role_pre}CXX=@named_cxx@ +export CC${role_post}=@named_cc@ +export CXX${role_post}=@named_cxx@ # No local scope in sourced file -unset role +unset -v role_pre role_post +set +u diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index c43c2e12d74a425b42b7e01e3f1834602802a6f0..9215fe2dc397c3734899de7635cf5ec1555bdcab 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -1,3 +1,39 @@ +mangleVarList() { + local var="$1" + shift + local -a role_infixes=("$@") + + local outputVar="${var/+/_@infixSalt@_}" + declare -gx ${outputVar}+='' + # For each role we serve, we accumulate the input parameters into our own + # cc-wrapper-derivation-specific environment variables. + for infix in "${role_infixes[@]}"; do + local inputVar="${var/+/${infix}}" + if [ -v "$inputVar" ]; then + export ${outputVar}+="${!outputVar:+ }${!inputVar}" + fi + done +} + +mangleVarBool() { + local var="$1" + shift + local -a role_infixes=("$@") + + local outputVar="${var/+/_@infixSalt@_}" + declare -gxi ${outputVar}+=0 + for infix in "${role_infixes[@]}"; do + local inputVar="${var/+/${infix}}" + if [ -v "$inputVar" ]; then + # "1" in the end makes `let` return success error code when + # expression itself evaluates to zero. + # We don't use `|| true` because that would silence actual + # syntax errors from bad variable values. + let "${outputVar} |= ${!inputVar:-0}" "1" + fi + done +} + skip () { if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "skipping impure path $1" >&2 diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 4d178ac96c5d9bff4bc7a52240829ad185ff8cff..58d70b4b0631e1135f0a57fdd7fffe9d5fcb225e 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -4,55 +4,31 @@ # "nix-store --load-db" and "nix-store --register-validity # --hash-given". -{ stdenv, coreutils, jq, perl, pathsFromGraph }: +{ stdenv, coreutils, jq }: { rootPaths }: -#if builtins.langVersion >= 5 then -# FIXME: it doesn't work on Hydra, failing to find mkdir; -# perhaps .attrs.sh clobbers PATH with new nix? -if false then +assert builtins.langVersion >= 5; - # Nix >= 1.12: Include NAR hash / size info. +stdenv.mkDerivation { + name = "closure-info"; - stdenv.mkDerivation { - name = "closure-info"; + __structuredAttrs = true; - __structuredAttrs = true; + exportReferencesGraph.closure = rootPaths; - exportReferencesGraph.closure = rootPaths; + PATH = "${coreutils}/bin:${jq}/bin"; - PATH = "${coreutils}/bin:${jq}/bin"; + builder = builtins.toFile "builder" + '' + . .attrs.sh - builder = builtins.toFile "builder" - '' - if [ -e .attrs.sh ]; then . .attrs.sh; fi + out=''${outputs[out]} - out=''${outputs[out]} + mkdir $out - mkdir $out - - jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration - jq -r .closure[].path < .attrs.json > $out/store-paths - ''; - } - -else - - # Nix < 1.12 - - stdenv.mkDerivation { - name = "closure-info"; - - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) rootPaths; - - buildInputs = [ perl ]; - - buildCommand = - '' - mkdir $out - printRegistration=1 perl ${pathsFromGraph} closure-* > $out/registration - perl ${pathsFromGraph} closure-* > $out/store-paths - ''; - } + jq -r ".closure | map(.narSize) | add" < .attrs.json > $out/total-nar-size + jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration + jq -r .closure[].path < .attrs.json > $out/store-paths + ''; +} diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 68b803f6e3ccf906ccd065d1539fa27e01443098..75e279afdc372042b96ebf2b677bcfebb415eb39 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -44,8 +44,8 @@ rec { cp ${./tarsum.go} tarsum.go export GOPATH=$(pwd) - mkdir src - ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum + mkdir -p src/github.com/docker/docker/pkg + ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build cp tarsum $out @@ -212,7 +212,7 @@ rec { postMount = '' echo "Packing raw image..." - tar -C mnt --mtime="@$SOURCE_DATE_EPOCH" -cf $out . + tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out . ''; }; @@ -249,6 +249,10 @@ rec { baseJson, # Files to add to the layer. contents ? null, + # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false, # Additional commands to run on the layer before it is tar'd up. extraCommands ? "", uid ? 0, gid ? 0 }: @@ -262,7 +266,7 @@ rec { echo "Adding contents..." for item in $contents; do echo "Adding $item" - rsync -ak --chown=0:0 $item/ layer/ + rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/ done else echo "No contents to add to layer." @@ -277,7 +281,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . + tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . # Compute a checksum of the tarball. echo "Computing layer checksum..." @@ -303,6 +307,10 @@ rec { runAsRoot, # Files to add to the layer. If null, an empty layer will be created. contents ? null, + # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false, # JSON containing configuration and metadata for this layer. baseJson, # Existing image onto which to append the new layer. @@ -327,7 +335,7 @@ rec { echo "Adding contents..." for item in ${toString contents}; do echo "Adding $item..." - rsync -ak --chown=0:0 $item/ layer/ + rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/ done chmod ug+w layer @@ -359,7 +367,7 @@ rec { echo "Packing layer..." mkdir $out - tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . + tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . # Compute the tar checksum and add it to the output json. echo "Computing checksum..." @@ -391,6 +399,10 @@ rec { fromImageTag ? null, # Files to put on the image (a nix store path or list of paths). contents ? null, + # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false, # 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. @@ -417,11 +429,12 @@ rec { if runAsRoot == null then mkPureLayer { name = baseName; - inherit baseJson contents extraCommands uid gid; + inherit baseJson contents keepContentsDirlinks extraCommands uid gid; } else mkRootLayer { name = baseName; inherit baseJson fromImage fromImageName fromImageTag - contents runAsRoot diskSize extraCommands; + contents keepContentsDirlinks runAsRoot diskSize + extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { buildInputs = [ jshon pigz coreutils findutils jq ]; @@ -476,8 +489,6 @@ rec { cp ${layer}/* temp/ chmod ug+w temp/* - echo "$(dirname ${storeDir})" >> layerFiles - echo '${storeDir}' >> layerFiles for dep in $(cat $layerClosure); do find $dep >> layerFiles done @@ -486,12 +497,22 @@ rec { # Record the contents of the tarball with ls_tar. ls_tar temp/layer.tar >> baseFiles + # Append nix/store directory to the layer so that when the layer is loaded in the + # image /nix/store has read permissions for non-root users. + # nix/store is added only if the layer has /nix/store paths in it. + if [ $(wc -l < $layerClosure) -gt 1 ] && [ $(grep -c -e "^/nix/store$" baseFiles) -eq 0 ]; then + mkdir -p nix/store + chmod -R 555 nix + echo "./nix" >> layerFiles + echo "./nix/store" >> layerFiles + fi + # Get the files in the new layer which were *not* present in # the old layer, and record them as newFiles. 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="@$SOURCE_DATE_EPOCH" \ + tar -rpf temp/layer.tar --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 --no-recursion --files-from newFiles echo "Adding meta..." @@ -539,7 +560,7 @@ rec { chmod -R a-w image echo "Cooking the image..." - tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out + tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out echo "Finished." ''; diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index b9a3349717443c76b8f782525b7beabe8eac2670..315440349b6b6ad841dfbbe17a0ce880408e5704 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -102,7 +102,7 @@ rec { ]; }; - # 5. nix example to play with the container nix store + # 6. nix example to play with the container nix store # docker run -it --rm nix nix-store -qR $(nix-build '' -A nix) nix = buildImageWithNixDb { name = "nix"; @@ -116,4 +116,12 @@ rec { Env = [ "NIX_PAGER=cat" ]; }; }; + + # 7. example of adding something on top of an image pull by our + # dockerTools chain. + onTopOfPulledImage = buildImage { + name = "onTopOfPulledImage"; + fromImage = nixFromDockerHub; + contents = [ pkgs.hello ]; + }; } diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix index 5ccd0a41c5e4972777aacb490b598ef235527d20..5611c7785862421fe7d582a32f1823cb5e5d6324 100644 --- a/pkgs/build-support/docker/pull.nix +++ b/pkgs/build-support/docker/pull.nix @@ -14,7 +14,7 @@ let builder = ./pull.sh; - buildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ]; + nativeBuildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ]; outputHashAlgo = "sha256"; outputHash = sha256; diff --git a/pkgs/build-support/docker/tarsum.go b/pkgs/build-support/docker/tarsum.go index ad33bbac75b427e5ee24de175acdd2d4ee9f103d..f91a90bdbdab7952562621c4d2ff1760bbc36b04 100644 --- a/pkgs/build-support/docker/tarsum.go +++ b/pkgs/build-support/docker/tarsum.go @@ -5,7 +5,7 @@ import ( "io" "io/ioutil" "os" - "tarsum" + "github.com/docker/docker/pkg/tarsum" ) func main() { diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 75e660d02143636baac31b5df1c99da7b5cd2310..8f824f4e1a57903b7b2374b5987ec7d632c4ce00 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -4,7 +4,8 @@ { lib, writeText, inherit-local }: rec { - withPackages = pkgs: let + withPackages = pkgs': let + pkgs = builtins.filter (x: x != null) pkgs'; extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs); in writeText "dir-locals.el" '' (require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc") @@ -44,6 +45,8 @@ rec { (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) + (inherit-local-permanent eshell-path-env (concat "${lib.makeSearchPath "bin" pkgs}:" eshell-path-env)) + (setq nixpkgs--is-nixpkgs-buffer t) (inherit-local 'nixpkgs--is-nixpkgs-buffer) diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index defef45b55f5ec2071fb2fb9e599d6b503aa3e64..e1db3e828fd7b5b14225882454efc78abcf3fa58 100644 --- a/pkgs/build-support/emacs/setup-hook.sh +++ b/pkgs/build-support/emacs/setup-hook.sh @@ -4,4 +4,8 @@ addEmacsVars () { fi } -envHooks+=(addEmacsVars) +# If this is for a wrapper derivation, emacs and the dependencies are all +# run-time dependencies. If this is for precompiling packages into bytecode, +# emacs is a compile-time dependency of the package. +addEnvHooks "$targetOffset" addEmacsVars +addEnvHooks "$targetOffset" addEmacsVars diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index bd733f1b9bafc8355a5b5ad9699404cbf1b117e8..4e780b104b087eab64829d579f325eac0a80a858 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -40,7 +40,7 @@ packagesFun: # packages explicitly requested by the user let explicitRequires = - if builtins.isFunction packagesFun + if lib.isFunction packagesFun then packagesFun self else packagesFun; in @@ -55,12 +55,46 @@ stdenv.mkDerivation { deps = runCommand "emacs-packages-deps" { inherit explicitRequires lndir emacs; } '' + findInputsOld() { + local pkg="$1"; shift + local var="$1"; shift + local propagatedBuildInputsFiles=("$@") + + # TODO(@Ericson2314): Restore using associative array once Darwin + # nix-shell doesn't use impure bash. This should replace the O(n) + # case with an O(1) hash map lookup, assuming bash is implemented + # well :D. + local varSlice="$var[*]" + # ''${..-} to hack around old bash empty array problem + case "''${!varSlice-}" in + *" $pkg "*) return 0 ;; + esac + unset -v varSlice + + eval "$var"'+=("$pkg")' + + if ! [ -e "$pkg" ]; then + echo "build input $pkg does not exist" >&2 + exit 1 + fi + + local file + for file in "''${propagatedBuildInputsFiles[@]}"; do + file="$pkg/nix-support/$file" + [[ -f "$file" ]] || continue + + local pkgNext + for pkgNext in $(< "$file"); do + findInputsOld "$pkgNext" "$var" "''${propagatedBuildInputsFiles[@]}" + done + done + } mkdir -p $out/bin mkdir -p $out/share/emacs/site-lisp local requires for pkg in $explicitRequires; do - findInputs $pkg requires propagated-user-env-packages + findInputsOld $pkg requires propagated-user-env-packages done # requires now holds all requested packages and their transitive dependencies diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index 3e1f0eff84afe88d7fe2ef61890cd6dc3bc3d272..fd971d431df88e9eba58f24a12564ca048408960 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bower2nix, cacert }: +{ stdenvNoCC, lib, bower2nix, cacert }: let bowerVersion = version: let @@ -9,9 +9,8 @@ let cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name; - fetchbower = name: version: target: outputHash: stdenv.mkDerivation { + fetchbower = name: version: target: outputHash: stdenvNoCC.mkDerivation { name = "${cleanName name}-${bowerVersion version}"; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildCommand = '' fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" # In some cases, the result of fetchBower is different depending @@ -23,7 +22,7 @@ let outputHashMode = "recursive"; outputHashAlgo = "sha256"; inherit outputHash; - buildInputs = [ bower2nix ]; + nativeBuildInputs = [ bower2nix cacert ]; }; in fetchbower diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix index dd2c0363187ac8ba646c0264277f83f0c7ac050d..f9250de4ee07e16cadd0127bd338deeffef5d6e3 100644 --- a/pkgs/build-support/fetchbzr/default.nix +++ b/pkgs/build-support/fetchbzr/default.nix @@ -1,11 +1,11 @@ -{ stdenv, bazaar }: +{ stdenvNoCC, bazaar }: { url, rev, sha256 }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "bzr-export"; builder = ./builder.sh; - buildInputs = [ bazaar ]; + nativeBuildInputs = [ bazaar ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/build-support/fetchcvs/default.nix b/pkgs/build-support/fetchcvs/default.nix index d4c88ca6d15efe1c7a65ceed7b7aef1ee1dd8c40..9d9deb3f629ecb65d232ad5fbdd68a1e15bf5f5a 100644 --- a/pkgs/build-support/fetchcvs/default.nix +++ b/pkgs/build-support/fetchcvs/default.nix @@ -3,14 +3,14 @@ # tag="" (get version by tag name) # If you don't specify neither one date="NOW" will be used (get latest) -{stdenv, cvs}: +{stdenvNoCC, cvs}: {cvsRoot, module, tag ? null, date ? null, sha256}: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "cvs-export"; builder = ./builder.sh; - buildInputs = [cvs]; + nativeBuildInputs = [cvs]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 2df1b136c5593c33dafb27fb828ac8cfdcfafe5f..3b965b06662c3fdc117cd753176fb5280c67764d 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,15 +1,14 @@ -{stdenv, darcs, nix, cacert}: +{stdenvNoCC, 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 { +stdenvNoCC.mkDerivation { name = "fetchdarcs"; - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; builder = ./builder.sh; - buildInputs = [darcs]; + nativeBuildInputs = [cacert darcs]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix new file mode 100644 index 0000000000000000000000000000000000000000..c01288dbf53a0a394db6c9d404a350a300709c29 --- /dev/null +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -0,0 +1,38 @@ +# We provide three paths to get the credentials into the builder's +# environment: +# +# 1. Via impureEnvVars. This method is difficult for multi-user Nix +# installations (but works very well for single-user Nix +# installations!) because it requires setting the environment +# variables on the nix-daemon which is either complicated or unsafe +# (i.e: configuring via Nix means the secrets will be persisted +# into the store) +# +# 2. If the DOCKER_CREDENTIALS key with a path to a credentials file +# is added to the NIX_PATH (usually via the '-I ' argument to most +# Nix tools) then an attempt will be made to read credentials from +# it. The semantics are simple, the file should contain two lines +# for the username and password based authentication: +# +# $ cat ./credentials-file.txt +# DOCKER_USER=myusername +# DOCKER_PASS=mypassword +# +# ... and a single line for the token based authentication: +# +# $ cat ./credentials-file.txt +# DOCKER_TOKEN=mytoken +# +# 3. A credential file at /etc/nix-docker-credentials.txt with the +# same format as the file described in #2 can also be used to +# communicate credentials to the builder. This is necessary for +# situations (like Hydra) where you cannot customize the NIX_PATH +# given to the nix-build invocation to provide it with the +# DOCKER_CREDENTIALS path +let + pathParts = + (builtins.filter + ({path, prefix}: "DOCKER_CREDENTIALS" == prefix) + builtins.nixPath); +in + if (pathParts != []) then (builtins.head pathParts).path else "" diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ae3ae4185e0537e9740a0503a0602367cc357a12 --- /dev/null +++ b/pkgs/build-support/fetchdocker/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, coreutils, bash, gnutar, jq, writeText }: +let + stripScheme = + builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; + stripNixStore = + s: lib.removePrefix "/nix/store/" s; +in +{ name +, registry ? "https://registry-1.docker.io/v2/" +, repository ? "library" +, imageName +, tag +, imageLayers +, imageConfig +, image ? "${stripScheme registry}/${repository}/${imageName}:${tag}" +}: + +# Make sure there are *no* slashes in the repository or container +# names since we use these to make the output derivation name for the +# nix-store path. +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository); +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName); + +let + # Abuse `builtins.toPath` to collapse possible double slashes + repoTag0 = builtins.toString (builtins.toPath "/${stripScheme registry}/${repository}/${imageName}"); + repoTag1 = lib.removePrefix "/" repoTag0; + + layers = builtins.map stripNixStore imageLayers; + + manifest = + writeText "manifest.json" (builtins.toJSON [ + { Config = stripNixStore imageConfig; + Layers = layers; + RepoTags = [ "${repoTag1}:${tag}" ]; + }]); + + repositories = + writeText "repositories" (builtins.toJSON { + "${repoTag1}" = { + "${tag}" = lib.last layers; + }; + }); + + imageFileStorePaths = + writeText "imageFileStorePaths.txt" + (lib.concatStringsSep "\n" ((lib.unique imageLayers) ++ [imageConfig])); +in +stdenv.mkDerivation { + builder = ./fetchdocker-builder.sh; + buildInputs = [ coreutils ]; + preferLocalBuild = true; + + inherit name imageName repository tag; + inherit bash gnutar manifest repositories; + inherit imageFileStorePaths; + + passthru = { + inherit image; + }; +} diff --git a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix new file mode 100644 index 0000000000000000000000000000000000000000..9fd813bfa575ac0817fef38ea6da848732dabcdf --- /dev/null +++ b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix @@ -0,0 +1,13 @@ +pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +let + generic-fetcher = + import ./generic-fetcher.nix pkgargs; +in + +args@{ repository ? "library", imageName, tag, ... }: + +generic-fetcher ({ + fetcher = "hocker-config"; + name = "${repository}_${imageName}_${tag}-config.json"; + tag = "unused"; +} // args) diff --git a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix new file mode 100644 index 0000000000000000000000000000000000000000..869ba637429cdbeba2e498b08ddd34120a9dbfa3 --- /dev/null +++ b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix @@ -0,0 +1,13 @@ +pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +let + generic-fetcher = + import ./generic-fetcher.nix pkgargs; +in + +args@{ layerDigest, ... }: + +generic-fetcher ({ + fetcher = "hocker-layer"; + name = "docker-layer-${layerDigest}.tar.gz"; + tag = "unused"; +} // args) diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh new file mode 100644 index 0000000000000000000000000000000000000000..7443591e6569b790e164f1b92a3a7a92bd3a34d7 --- /dev/null +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -0,0 +1,28 @@ +source "${stdenv}/setup" +header "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" +mkdir -p "${out}" + +cat < "${out}/compositeImage.sh" +#! ${bash}/bin/bash +# +# Create a tar archive of a docker image's layers, docker image config +# json, manifest.json, and repositories json; this streams directly to +# stdout and is intended to be used in concert with docker load, i.e: +# +# ${out}/compositeImage.sh | docker load + +# The first character follow the 's' command for sed becomes the +# delimiter sed will use; this makes the transformation regex easy to +# read. We feed tar a file listing the files we want in the archive, +# because the paths are absolute and docker load wants them flattened in +# the archive, we need to transform all of the paths going in by +# stripping everything *including* the last solidus so that we end up +# with the basename of the path. +${gnutar}/bin/tar \ + --transform='s=.*/==' \ + --transform="s=.*-manifest.json=manifest.json=" \ + --transform="s=.*-repositories=repositories=" \ + -c "${manifest}" "${repositories}" -T "${imageFileStorePaths}" +EOF +chmod +x "${out}/compositeImage.sh" +stopNest diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix new file mode 100644 index 0000000000000000000000000000000000000000..e051cee08432e1e1b2631a500deddb792ea13e1b --- /dev/null +++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -0,0 +1,97 @@ +{ stdenv, lib, haskellPackages, writeText, gawk }: +let + awk = "${gawk}/bin/awk"; + dockerCredentialsFile = import ./credentials.nix; + stripScheme = + builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; +in +{ fetcher +, name + , registry ? "https://registry-1.docker.io/v2/" + , repository ? "library" + , imageName + , sha256 + , tag ? "" + , layerDigest ? "" +}: + +# There must be no slashes in the repository or container names since +# we use these to make the output derivation name for the nix store +# path +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository); +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName); + +# Only allow hocker-config and hocker-layer as fetchers for now +assert (builtins.elem fetcher ["hocker-config" "hocker-layer"]); + +# If layerDigest is non-empty then it must not have a 'sha256:' prefix! +assert + (if layerDigest != "" + then !lib.hasPrefix "sha256:" layerDigest + else true); + +let + layerDigestFlag = + lib.optionalString (layerDigest != "") "--layer ${layerDigest}"; +in +stdenv.mkDerivation { + inherit name; + builder = writeText "${fetcher}-builder.sh" '' + source "$stdenv/setup" + header "${fetcher} exporting to $out" + + declare -A creds + + # This is a hack for Hydra since we have no way of adding values + # to the NIX_PATH for Hydra jobsets!! + staticCredentialsFile="/etc/nix-docker-credentials.txt" + if [ ! -f "$dockerCredentialsFile" -a -f "$staticCredentialsFile" ]; then + echo "credentials file not set, falling back on static credentials file at: $staticCredentialsFile" + dockerCredentialsFile=$staticCredentialsFile + fi + + if [ -f "$dockerCredentialsFile" ]; then + header "using credentials from $dockerCredentialsFile" + + CREDSFILE=$(cat "$dockerCredentialsFile") + creds[token]=$(${awk} -F'=' '/DOCKER_TOKEN/ {print $2}' <<< "$CREDSFILE" | head -n1) + + # Prefer DOCKER_TOKEN over the username and password + # authentication method + if [ -z "''${creds[token]}" ]; then + creds[user]=$(${awk} -F'=' '/DOCKER_USER/ {print $2}' <<< "$CREDSFILE" | head -n1) + creds[pass]=$(${awk} -F'=' '/DOCKER_PASS/ {print $2}' <<< "$CREDSFILE" | head -n1) + fi + fi + + # These variables will be filled in first by the impureEnvVars, if + # those variables are empty then they will default to the + # credentials that may have been read in from the 'DOCKER_CREDENTIALS' + DOCKER_USER="''${DOCKER_USER:-''${creds[user]}}" + DOCKER_PASS="''${DOCKER_PASS:-''${creds[pass]}}" + DOCKER_TOKEN="''${DOCKER_TOKEN:-''${creds[token]}}" + + ${fetcher} --out="$out" \ + ''${registry:+--registry "$registry"} \ + ''${DOCKER_USER:+--username "$DOCKER_USER"} \ + ''${DOCKER_PASS:+--password "$DOCKER_PASS"} \ + ''${DOCKER_TOKEN:+--token "$DOCKER_TOKEN"} \ + ${layerDigestFlag} \ + "${repository}/${imageName}" \ + "${tag}" + + stopNest + ''; + + buildInputs = [ haskellPackages.hocker ]; + + outputHashAlgo = "sha256"; + outputHashMode = "flat"; + outputHash = sha256; + + preferLocalBuild = true; + + impureEnvVars = [ "DOCKER_USER" "DOCKER_PASS" "DOCKER_TOKEN" ]; + + inherit registry dockerCredentialsFile; +} diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix index 41d2c936e01e4e605ae89cd699fad61c97322392..746af9e27375dff3afeb19cbda6cd0df61fa10f4 100644 --- a/pkgs/build-support/fetchegg/default.nix +++ b/pkgs/build-support/fetchegg/default.nix @@ -1,16 +1,16 @@ # Fetches a chicken egg from henrietta using `chicken-install -r' # See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html -{ stdenv, chicken }: +{ stdenvNoCC, chicken }: { name, version, md5 ? "", sha256 ? "" }: if md5 != "" then throw "fetchegg does not support md5 anymore, please use sha256" else -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "chicken-${name}-export"; builder = ./builder.sh; - buildInputs = [ chicken ]; + nativeBuildInputs = [ chicken ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; @@ -20,6 +20,6 @@ stdenv.mkDerivation { eggName = name; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/build-support/fetchfossil/default.nix b/pkgs/build-support/fetchfossil/default.nix index 439c96019a414a901cf5899e1389c8d3f2c9b877..27933b47178a6077b130c5fbd10eb5d1be5c5cad 100644 --- a/pkgs/build-support/fetchfossil/default.nix +++ b/pkgs/build-support/fetchfossil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "fossil-archive" + (if name != null then "-${name}" else ""); builder = ./builder.sh; - buildInputs = [fossil]; + nativeBuildInputs = [fossil]; # Envvar docs are hard to find. A link for the future: # https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 8e060b87ebd30feb81aeaf316cace29483c0e1af..9fccc27ef63220ba532c4d58adff70c03d179ff4 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,6 +1,6 @@ -{stdenv, git, cacert}: let +{stdenvNoCC, git, cacert}: let urlToName = url: rev: let - inherit (stdenv.lib) removeSuffix splitString last; + inherit (stdenvNoCC.lib) removeSuffix splitString last; base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); matched = builtins.match "(.*).git" base; @@ -48,11 +48,11 @@ assert deepClone -> leaveDotGit; if md5 != "" then throw "fetchgit does not support md5 anymore, please use sha256" else -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { inherit name; builder = ./builder.sh; fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. - buildInputs = [git]; + nativeBuildInputs = [git]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; @@ -62,7 +62,7 @@ stdenv.mkDerivation { GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ]; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 17962d08acc3001c5610b90790aec0fd958eb759..2441da156d1a764b2201a43f84acc19b8c5360ed 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -184,7 +184,7 @@ init_submodules(){ local url # checkout each submodule - hash=$(echo "$l" | awk '{print substr($1,2)}') + hash=$(echo "$l" | awk '{print $1}' | tr -d '-') dir=$(echo "$l" | awk '{print $2}') name=$( git config -f .gitmodules --get-regexp submodule\..*\.path | diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix index a1dd9210e731c7af5f06c3cf6a982686f66bf900..4dcf6d06718afd03f86c85e577233b9b480c6300 100644 --- a/pkgs/build-support/fetchgit/private.nix +++ b/pkgs/build-support/fetchgit/private.nix @@ -17,7 +17,7 @@ in builtins.toString sshConfigFile}''; ssh-wrapped = runCommand "fetchgit-ssh" { - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@" diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix index ea91a0854d1672dedc24a806a1216db1ef5a2975..3ccf5d273fc5a9c7362cfcf7134eeac9399de8d5 100644 --- a/pkgs/build-support/fetchgx/default.nix +++ b/pkgs/build-support/fetchgx/default.nix @@ -1,12 +1,12 @@ -{ stdenv, gx, gx-go, go, cacert }: +{ stdenvNoCC, gx, gx-go, go, cacert }: { name, src, sha256 }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "${name}-gxdeps"; inherit src; - buildInputs = [ go gx gx-go ]; + nativeBuildInputs = [ cacert go gx gx-go ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; @@ -14,8 +14,6 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - buildPhase = '' export GOPATH=$(pwd)/vendor mkdir -p vendor diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index aba12317963ac6de943a5cccab16384fd1b7daf9..36a48ce9f17001529e1b9a08fe6214cce2eadf45 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -1,15 +1,15 @@ -{stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: +{stdenvNoCC, 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 { +stdenvNoCC.mkDerivation { name = "hg-archive" + (if name != null then "-${name}" else ""); builder = ./builder.sh; - buildInputs = [mercurial]; + nativeBuildInputs = [mercurial]; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; subrepoClause = if fetchSubrepos then "S" else ""; diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix index 196b3bebc916804a13519cc7eb8ae5256eb47d56..dc8949794221fbd2d780a79ad2f266abb4386e8b 100644 --- a/pkgs/build-support/fetchipfs/default.nix +++ b/pkgs/build-support/fetchipfs/default.nix @@ -28,7 +28,7 @@ in if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation { name = ipfs; builder = ./builder.sh; - buildInputs = [ curl ]; + nativeBuildInputs = [ curl ]; # New-style output content requirements. outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix index 1dc14e8cab13caaafbf74350dd0c196a7f960c6c..7ce67453d698b0f62407a3854e3c061818662678 100644 --- a/pkgs/build-support/fetchmtn/default.nix +++ b/pkgs/build-support/fetchmtn/default.nix @@ -1,5 +1,5 @@ # You can specify some extra mirrors and a cache DB via options -{stdenv, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: +{stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: # dbs is a list of strings # each is an url for sync @@ -8,7 +8,7 @@ {name ? "mtn-checkout", dbs ? [], sha256 , selector ? "h:" + branch, branch}: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { builder = ./builder.sh; nativeBuildInputs = [monotone]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { dbs = defaultDBMirrors ++ dbs; inherit branch cacheDB name selector; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix index 62b700dd81b5dce0f84285e2054f63dac43d6c34..40ba79ec4353f240f3c9233dc65d235f78deef00 100644 --- a/pkgs/build-support/fetchnuget/default.nix +++ b/pkgs/build-support/fetchnuget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDotnetPackage, unzip }: +{ stdenvNoCC, fetchurl, buildDotnetPackage, unzip }: attrs @ { baseName diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index e3159d2053012f8c71d09836ee30a719022baed5..c185497e6913e902e369d405eb837479fc88a5be 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -5,7 +5,7 @@ # stripLen acts as the -p parameter when applying a patch. { lib, fetchurl, patchutils }: -{ stripLen ? 0, addPrefixes ? false, excludes ? [], ... }@args: +{ stripLen ? 0, extraPrefix ? null, excludes ? [], ... }@args: fetchurl ({ postFetch = '' @@ -16,9 +16,9 @@ fetchurl ({ "${patchutils}/bin/filterdiff" \ --include={} \ --strip=${toString stripLen} \ - ${lib.optionalString addPrefixes '' - --addoldprefix=a/ \ - --addnewprefix=b/ \ + ${lib.optionalString (extraPrefix != null) '' + --addoldprefix=a/${extraPrefix} \ + --addnewprefix=b/${extraPrefix} \ ''} \ --clean "$out" > "$tmpfile" ${patchutils}/bin/filterdiff \ @@ -27,4 +27,4 @@ fetchurl ({ "$tmpfile" > "$out" ${args.postFetch or ""} ''; -} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes" "postFetch"]) +} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "postFetch"]) diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix index 199c029d3b649d4b0848e474bf57be7c0417acca..f8793dbac95024c5bcb176d02ea19bb088900ebc 100644 --- a/pkgs/build-support/fetchrepoproject/default.nix +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gitRepo, cacert, copyPathsToStore }: +{ stdenvNoCC, gitRepo, cacert, copyPathsToStore }: { name, manifest, rev ? "HEAD", sha256 # Optional parameters: @@ -9,7 +9,7 @@ assert repoRepoRev != "" -> repoRepoURL != ""; assert createMirror -> !useArchive; -with stdenv.lib; +with stdenvNoCC.lib; let extraRepoInitFlags = [ @@ -28,7 +28,7 @@ let local_manifests = copyPathsToStore localManifests; -in stdenv.mkDerivation { +in stdenvNoCC.mkDerivation { inherit name; inherit cacert manifest rev repoRepoURL repoRepoRev referenceDir; # TODO @@ -44,7 +44,7 @@ in stdenv.mkDerivation { "GIT_PROXY_COMMAND" "SOCKS_SERVER" ]; - buildInputs = [ gitRepo cacert ]; + nativeBuildInputs = [ gitRepo cacert ]; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index a5cdbd150b8bcbe3c92b591eff4ba2279080ecca..e6b7a3418c0cf4c6825c136668df88f922d60c50 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, awscli }: +{ stdenvNoCC, runCommand, awscli }: { s3url , sha256 @@ -10,13 +10,13 @@ }: let - credentialAttrs = stdenv.lib.optionalAttrs (credentials != null) { + credentialAttrs = stdenvNoCC.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 ]; + nativeBuildInputs = [ awscli ]; outputHashAlgo = "sha256"; outputHash = sha256; outputHashMode = if recursiveHash then "recursive" else "flat"; diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index 8ed30b37fc7fb98cbc7090f706a823fb0b061cf3..c386a3f3489f6d004add7f3745de57f6e1b3e753 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -22,11 +22,7 @@ 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 \ +svn export --trust-server-cert --non-interactive \ ${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \ -r "$rev" "$url" "$out" diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 8a1085affd3cb874963629a68b91ef71fce6f892..da57d581daddc682140907153e0145c6c3558d24 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,9 +1,9 @@ -{stdenv, subversion, glibcLocales, sshSupport ? false, openssh ? null}: +{stdenvNoCC, subversion, glibcLocales, sshSupport ? false, openssh ? null}: {url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false, ignoreKeywords ? false, name ? null}: let - repoName = with stdenv.lib; + repoName = with stdenvNoCC.lib; let fst = head; snd = l: head (tail l); @@ -28,10 +28,10 @@ in if md5 != "" then throw "fetchsvn does not support md5 anymore, please use sha256" else -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = name_; builder = ./builder.sh; - buildInputs = [ subversion glibcLocales ]; + nativeBuildInputs = [ subversion glibcLocales ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; @@ -39,6 +39,6 @@ stdenv.mkDerivation { inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; preferLocalBuild = true; } diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index a6f3d3469f09fadf5ab45325d860cb6e52e98ec6..f76bd10247ba8ef222de71229a1906aeae956027 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -1,14 +1,14 @@ -{stdenv, subversion, sshSupport ? false, openssh ? null, expect}: +{stdenvNoCC, 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 { +stdenvNoCC.mkDerivation { name = "svn-export-ssh"; builder = ./builder.sh; - buildInputs = [subversion expect]; + nativeBuildInputs = [subversion expect]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 8dac273eb1ca90dd93ba806235627768b232835e..0bf529caa75ecb344fc2cfccc1ea4e320ad1b993 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, curl }: # Note that `curl' may be `null', in case of the native stdenv. +{ lib, stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC. let @@ -10,7 +10,7 @@ let # resulting store derivations (.drv files) much smaller, which in # turn makes nix-env/nix-instantiate faster. mirrorsFile = - stdenv.mkDerivation ({ + stdenvNoCC.mkDerivation ({ name = "mirrors-list"; builder = ./write-mirror-list.sh; preferLocalBuild = true; @@ -20,7 +20,7 @@ let # "gnu", etc.). sites = builtins.attrNames mirrors; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ # This variable allows the user to pass additional options to curl "NIX_CURL_FLAGS" @@ -89,22 +89,28 @@ in , passthru ? {} }: -assert builtins.isList urls; -assert (urls == []) != (url == ""); assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; - let - hasHash = showURLs || (outputHash != "" && outputHashAlgo != "") - || sha1 != "" || sha256 != "" || sha512 != ""; - urls_ = if urls != [] then urls else [url]; + urls_ = + if urls != [] && url == "" then + (if lib.isList urls then urls + else throw "`urls` is not a list") + else if urls == [] && url != "" then [url] + else throw "fetchurl requires either `url` or `urls` to be set"; + + hash_ = + if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512" + else if (outputHash != "" && outputHashAlgo != "") then { inherit outputHashAlgo outputHash; } + else if sha512 != "" then { outputHashAlgo = "sha512"; outputHash = sha512; } + else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; } + else if sha1 != "" then { outputHashAlgo = "sha1"; outputHash = sha1; } + else throw "fetchurl requires a hash for fixed-output derivation: ${lib.concatStringsSep ", " urls_}"; in -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 { +stdenvNoCC.mkDerivation { name = if showURLs then "urls" else if name != "" then name @@ -112,7 +118,7 @@ else stdenv.mkDerivation { builder = ./builder.sh; - buildInputs = [ curl ]; + nativeBuildInputs = [ curl ]; urls = urls_; @@ -121,10 +127,7 @@ else stdenv.mkDerivation { preferHashedMirrors = true; # New-style output content requirements. - outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else - 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 sha1; + inherit (hash_) outputHashAlgo outputHash; outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index d612db64c122a5c8f8bfd5583323be857c5088bb..b0d3f373a4622318105d0d01fee91a879209864c 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -129,7 +129,7 @@ rec { samba = [ https://www.samba.org/ftp/ - http://ftp.riken.jp/net/samba + http://www.samba.org/ftp/ ]; # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . diff --git a/pkgs/build-support/gcc-wrapper-old/add-flags b/pkgs/build-support/gcc-wrapper-old/add-flags deleted file mode 100644 index 93da917a541585a2e746d1350ca1a89a61c38ad5..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/add-flags +++ /dev/null @@ -1,28 +0,0 @@ -# `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. -export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" - -if test -e @out@/nix-support/libc-cflags; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" -fi - -if test -e @out@/nix-support/cc-cflags; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE" -fi - -if test -e @out@/nix-support/gnat-cflags; then - export NIX_GNATFLAGS_COMPILE="$(cat @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE" -fi - -if test -e @out@/nix-support/libc-ldflags; then - export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)" -fi - -if test -e @out@/nix-support/cc-ldflags; then - export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/cc-ldflags)" -fi - -if test -e @out@/nix-support/libc-ldflags-before; then - export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" -fi - -export NIX_CC_WRAPPER_FLAGS_SET=1 diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh deleted file mode 100644 index 22e32814927e0138ea2f888c2b315be534c3eb18..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/builder.sh +++ /dev/null @@ -1,215 +0,0 @@ -source $stdenv/setup - - -mkdir -p $out/bin -mkdir -p $out/nix-support - - -if test -z "$nativeLibc"; then - dynamicLinker="$libc/lib/$dynamicLinker" - echo $dynamicLinker > $out/nix-support/dynamic-linker - - if test -e $libc/lib/32/ld-linux.so.2; then - echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 - fi - - # The "-B$libc/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' - # compiler/linker, i.e., one that searches /usr/lib and so on.) - # - # Unfortunately, setting -B appears to override the default search - # path. Thus, the gcc-specific "../includes-fixed" directory is - # now longer searched and glibc's header fails to - # compile, because it uses "#include_next " to find the - # limits.h file in ../includes-fixed. To remedy the problem, - # another -idirafter is necessary to add that directory again. - echo "-B$libc/lib/ -idirafter $libc_dev/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags - - echo "-L$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 "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before -fi - -if test -n "$nativeTools"; then - gccPath="$nativePrefix/bin" - ldPath="$nativePrefix/bin" -else - if test -e "$gcc/lib64"; then - gccLDFlags="$gccLDFlags -L$gcc_lib/lib64" - fi - gccLDFlags="$gccLDFlags -L$gcc_lib/lib" - if [ -n "$langVhdl" ]; then - gccLDFlags="$gccLDFlags -L$zlib/lib" - fi - echo "$gccLDFlags" > $out/nix-support/cc-ldflags - - # GCC shows $gcc/lib in `gcc -print-search-dirs', but not - # $gcc/lib64 (even though it does actually search there...).. - # This confuses libtool. So add it to the compiler tool search - # path explicitly. - if test -e "$gcc/lib64"; then - gccCFlags="$gccCFlags -B$gcc/lib64" - fi - - # Find the gcc libraries path (may work only without multilib) - if [ -n "$langAda" ]; then - basePath=`echo $gcc/lib/*/*/*` - gccCFlags="$gccCFlags -B$basePath -I$basePath/adainclude" - - gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" - echo "$gnatCFlags" > $out/nix-support/gnat-cflags - fi - echo "$gccCFlags" > $out/nix-support/cc-cflags - - gccPath="$gcc/bin" - # On Illumos/Solaris we might prefer native ld - if test -n "$nativePrefix"; then - ldPath="$nativePrefix/bin" - else - ldPath="$binutils/bin" - fi; -fi - - -doSubstitute() { - local src=$1 - local dst=$2 - local ld="$ldPath/ld" - if $ld -V 2>&1 |grep Solaris; then - # Use Solaris specific linker wrapper - ld="$out/bin/ld-solaris" - fi - # Can't use substitute() here, because replace may not have been - # built yet (in the bootstrap). - sed \ - -e "s^@out@^$out^g" \ - -e "s^@shell@^$shell^g" \ - -e "s^@gcc@^$gcc^g" \ - -e "s^@gccProg@^$gccProg^g" \ - -e "s^@gnatProg@^$gnatProg^g" \ - -e "s^@gnatlinkProg@^$gnatlinkProg^g" \ - -e "s^@binutils@^$binutils^g" \ - -e "s^@coreutils@^$coreutils^g" \ - -e "s^@libc@^$libc^g" \ - -e "s^@libc_bin@^$libc_bin^g" \ - -e "s^@ld@^$ld^g" \ - < "$src" > "$dst" -} - - -# Make wrapper scripts around gcc, g++, and gfortran. 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 1 - fi - - gccProg="$src" - doSubstitute "$gccWrapper" "$dst" - chmod +x "$dst" -} - -mkGnatWrapper() { - local dst=$1 - local src=$2 - - if ! test -f "$src"; then - echo "$src does not exist (skipping)" - return 1 - fi - - gnatProg="$src" - doSubstitute "$gnatWrapper" "$dst" - chmod +x "$dst" -} - -mkGnatLinkWrapper() { - local dst=$1 - local src=$2 - - if ! test -f "$src"; then - echo "$src does not exist (skipping)" - return 1 - fi - - gnatlinkProg="$src" - doSubstitute "$gnatlinkWrapper" "$dst" - chmod +x "$dst" -} - -if mkGccWrapper $out/bin/gcc $gccPath/gcc -then - ln -sv gcc $out/bin/cc -fi - -if mkGccWrapper $out/bin/g++ $gccPath/g++ -then - ln -sv g++ $out/bin/c++ -fi - -mkGccWrapper $out/bin/cpp $gccPath/cpp || true - -if mkGccWrapper $out/bin/gfortran $gccPath/gfortran -then - ln -sv gfortran $out/bin/g77 - ln -sv gfortran $out/bin/f77 -fi - -mkGccWrapper $out/bin/gcj $gccPath/gcj || true - -mkGccWrapper $out/bin/gccgo $gccPath/gccgo || true - -mkGccWrapper $out/bin/gnatgcc $gccPath/gnatgcc || true -mkGnatWrapper $out/bin/gnatmake $gccPath/gnatmake || true -mkGnatWrapper $out/bin/gnatbind $gccPath/gnatbind || true -mkGnatLinkWrapper $out/bin/gnatlink $gccPath/gnatlink || true - -if [ -f $gccPath/ghdl ]; then - ln -sf $gccPath/ghdl $out/bin/ghdl -fi - - -# Create a symlink to as (the assembler). This is useful when a -# gcc-wrapper is installed in a user environment, as it ensures that -# the right assembler is called. -ln -s $ldPath/as $out/bin/as - - -# Make a wrapper around the linker. -doSubstitute "$ldWrapper" "$out/bin/ld" -chmod +x "$out/bin/ld" - -# Copy solaris ld wrapper if needed -if $ldPath/ld -V 2>&1 |grep Solaris; then - # Use Solaris specific linker wrapper - sed -e "s^@ld@^$ldPath/ld^g" < "$ldSolarisWrapper" > "$out/bin/ld-solaris" - chmod +x "$out/bin/ld-solaris" -fi - - -# 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 - -doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" - -doSubstitute "$setupHook" "$out/nix-support/setup-hook" - -cp -p $utils $out/nix-support/utils.sh - - -# Propagate the wrapped gcc so that if you install the wrapper, you get -# tools like gcov, the manpages, etc. as well (including for binutils -# and Glibc). -if test -z "$nativeTools"; then - printWords $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages -fi diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix deleted file mode 100644 index ae17989d932b0168144ad5119e636ad29e963af0..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/default.nix +++ /dev/null @@ -1,99 +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, lib, nativeTools, nativeLibc, nativePrefix ? "" -, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell -, zlib ? null -, hostPlatform, targetPlatform -}: - -assert nativeTools -> nativePrefix != ""; -assert !nativeTools -> gcc != null && binutils != null && coreutils != null; -assert !nativeLibc -> libc != null; - -# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper -assert (gcc != null && gcc ? langVhdl && gcc.langVhdl) -> zlib != null; - -let - - gccVersion = (builtins.parseDrvName gcc.name).version; - gccName = (builtins.parseDrvName gcc.name).name; - - langGo = if nativeTools then false else gcc ? langGo && gcc.langGo; -in - -stdenv.mkDerivation { - name = - (if name != "" then name else gccName + "-wrapper") + - (if gcc != null && gccVersion != "" then "-" + gccVersion else ""); - - builder = ./builder.sh; - setupHook = ./setup-hook.sh; - gccWrapper = ./gcc-wrapper.sh; - gnatWrapper = ./gnat-wrapper.sh; - gnatlinkWrapper = ./gnatlink-wrapper.sh; - ldWrapper = ./ld-wrapper.sh; - ldSolarisWrapper = ./ld-solaris-wrapper.sh; - utils = ./utils.sh; - addFlags = ./add-flags; - - inherit nativeTools nativeLibc nativePrefix gcc; - gcc_lib = lib.getLib gcc; - libc = if nativeLibc then null else libc; - libc_dev = if nativeLibc then null else lib.getDev libc; - libc_bin = if nativeLibc then null else lib.getBin libc; - binutils = if nativeTools then null else lib.getBin binutils; - # The wrapper scripts use 'cat', so we may need coreutils - coreutils = if nativeTools then null else lib.getBin coreutils; - - langC = if nativeTools then true else gcc.langC; - langCC = if nativeTools then true else gcc.langCC; - langFortran = if nativeTools then false else gcc ? langFortran; - langAda = if nativeTools then false else gcc ? langAda && gcc.langAda; - langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl; - zlib = if gcc != null && gcc ? langVhdl then zlib else null; - shell = shell + shell.shellPath or ""; - - crossAttrs = { - # - # 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 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"); - }; - - preferLocalBuild = true; - - meta = - let gcc_ = if gcc != null then gcc else {}; in - (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) // - { description = - stdenv.lib.attrByPath ["meta" "description"] "System C compiler" gcc_ - + " (wrapper script)"; - }; - - # 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.isArm 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/gcc-wrapper-old/gcc-wrapper-old.sh b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh deleted file mode 100644 index a9d18036952eb0a2109a3094f9b8acbf83d7281d..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh +++ /dev/null @@ -1,146 +0,0 @@ -#! @shell@ -e - -if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then - source "$NIX_CC_WRAPPER_START_HOOK" -fi - -if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then - source @out@/nix-support/add-flags.sh -fi - -source @out@/nix-support/utils.sh - - -# Figure out if linker flags should be passed. GCC prints annoying -# warnings when they are not needed. -dontLink=0 -getVersion=0 -nonFlagArgs=0 - -for i in "$@"; do - if [ "$i" = -c ]; then - dontLink=1 - elif [ "$i" = -S ]; then - dontLink=1 - elif [ "$i" = -E ]; then - dontLink=1 - elif [ "$i" = -E ]; then - dontLink=1 - elif [ "$i" = -M ]; then - dontLink=1 - elif [ "$i" = -MM ]; then - dontLink=1 - elif [ "$i" = -x ]; then - # At least for the cases c-header or c++-header we should set dontLink. - # I expect no one use -x other than making precompiled headers. - dontLink=1 - elif [ "${i:0:1}" != - ]; then - nonFlagArgs=1 - elif [ "$i" = -m32 ]; then - if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" - fi - fi -done - -# If we pass a flag like -Wl, then gcc will call the linker unless it -# can figure out that it has to do something else (e.g., because of a -# "-c" flag). So if no non-flag arguments are given, don't pass any -# linker flags. This catches cases like "gcc" (should just print -# "gcc: no input files") and "gcc -v" (should print the version). -if [ "$nonFlagArgs" = 0 ]; then - dontLink=1 -fi - - -# Optionally filter out paths not refering to the store. -params=("$@") -if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then - rest=() - n=0 - while [ $n -lt ${#params[*]} ]; do - p=${params[n]} - p2=${params[$((n+1))]} - if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then - skip $p - elif [ "$p" = -L ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then - skip $p - elif [ "$p" = -I ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif [ "$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_CFLAGS_COMPILE) -extraBefore=() - -# When enforcing purity, pretend gcc can't find the current date and -# time -if [ "$NIX_ENFORCE_PURITY" = 1 ]; then - extraAfter+=('-D__DATE__="Jan 01 1970"' - '-D__TIME__="00:00:01"' - ) -fi - - -if [ "$dontLink" != 1 ]; then - - # Add the flags that should only be passed to the compiler when - # linking. - extraAfter+=($NIX_CFLAGS_LINK) - - # Add the flags that should be passed to the linker (and prevent - # `ld-wrapper' from adding NIX_LDFLAGS again). - for i in $NIX_LDFLAGS_BEFORE; do - extraBefore=(${extraBefore[@]} "-Wl,$i") - done - for i in $NIX_LDFLAGS; do - if [ "${i:0:3}" = -L/ ]; then - extraAfter+=("$i") - else - extraAfter+=("-Wl,$i") - fi - done - export NIX_LDFLAGS_SET=1 -fi - -# As a very special hack, if the arguments are just `-v', then don't -# add anything. This is to prevent `gcc -v' (which normally prints -# out the version number and returns exit code 0) from printing out -# `No input files specified' and returning exit code 1. -if [ "$*" = -v ]; then - extraAfter=() - extraBefore=() -fi - -# Optionally print debug info. -if [ -n "$NIX_DEBUG" ]; then - echo "original flags to @prog@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extraBefore flags to @prog@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @prog@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done -fi - -if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_CC_WRAPPER_EXEC_HOOK" -fi - -exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh deleted file mode 100644 index 8f12f08ddc7c5141eff16df3e7220700d63c1bb2..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh +++ /dev/null @@ -1,147 +0,0 @@ -#! @shell@ -e - -if test -n "$NIX_CC_WRAPPER_START_HOOK"; then - source "$NIX_CC_WRAPPER_START_HOOK" -fi - -if test -z "$NIX_CC_WRAPPER_FLAGS_SET"; then - source @out@/nix-support/add-flags.sh -fi - -source @out@/nix-support/utils.sh - - -# Figure out if linker flags should be passed. GCC prints annoying -# warnings when they are not needed. -dontLink=0 -getVersion=0 -nonFlagArgs=0 - -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 - elif test "$i" = "-x"; then - # At least for the cases c-header or c++-header we should set dontLink. - # I expect no one use -x other than making precompiled headers. - dontLink=1 - elif test "${i:0:1}" != "-"; then - nonFlagArgs=1 - elif test "$i" = "-m32"; then - if test -e @out@/nix-support/dynamic-linker-m32; then - NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" - fi - fi -done - -# If we pass a flag like -Wl, then gcc will call the linker unless it -# can figure out that it has to do something else (e.g., because of a -# "-c" flag). So if no non-flag arguments are given, don't pass any -# linker flags. This catches cases like "gcc" (should just print -# "gcc: no input files") and "gcc -v" (should print the version). -if test "$nonFlagArgs" = "0"; then - dontLink=1 -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_CFLAGS_COMPILE) -extraBefore=() - -if test "$dontLink" != "1"; then - - # Add the flags that should only be passed to the compiler when - # linking. - extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK) - - # Add the flags that should be passed to the linker (and prevent - # `ld-wrapper' from adding NIX_LDFLAGS again). - for i in $NIX_LDFLAGS_BEFORE; do - extraBefore=(${extraBefore[@]} "-Wl,$i") - done - for i in $NIX_LDFLAGS; do - if test "${i:0:3}" = "-L/"; then - extraAfter=(${extraAfter[@]} "$i") - else - extraAfter=(${extraAfter[@]} "-Wl,$i") - fi - done - export NIX_LDFLAGS_SET=1 -fi - -# As a very special hack, if the arguments are just `-v', then don't -# add anything. This is to prevent `gcc -v' (which normally prints -# out the version number and returns exit code 0) from printing out -# `No input files specified' and returning exit code 1. -if test "$*" = "-v"; then - extraAfter=() - extraBefore=() -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 - - -# Call the real `gcc'. Filter out warnings from stderr about unused -# `-B' flags, since they confuse some programs. Deep bash magic to -# apply grep to stderr (by swapping stdin/stderr twice). -if test -z "$NIX_CC_NEEDS_GREP"; then - @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} -else - (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- - exit $? -fi diff --git a/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh deleted file mode 100644 index f6fa4b18400a15132734b56e7b78f864723f3e14..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh +++ /dev/null @@ -1,113 +0,0 @@ -#! @shell@ -e - -if test -n "$NIX_GNAT_WRAPPER_START_HOOK"; then - source "$NIX_GNAT_WRAPPER_START_HOOK" -fi - -if test -z "$NIX_GNAT_WRAPPER_FLAGS_SET"; then - source @out@/nix-support/add-flags.sh -fi - -source @out@/nix-support/utils.sh - - -# Figure out if linker flags should be passed. GCC prints annoying -# warnings when they are not needed. -dontLink=0 -getVersion=0 -nonFlagArgs=0 - -for i in "$@"; do - if test "$i" = "-c"; then - dontLink=1 - elif test "$i" = "-M"; then - dontLink=1 - elif test "${i:0:1}" != "-"; then - nonFlagArgs=1 - elif test "$i" = "-m32"; then - if test -e @out@/nix-support/dynamic-linker-m32; then - NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" - fi - fi -done - -# If we pass a flag like -Wl, then gcc will call the linker unless it -# can figure out that it has to do something else (e.g., because of a -# "-c" flag). So if no non-flag arguments are given, don't pass any -# linker flags. This catches cases like "gcc" (should just print -# "gcc: no input files") and "gcc -v" (should print the version). -if test "$nonFlagArgs" = "0"; then - dontLink=1 -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:0:3}" = "-I/" && badPath "${p:2}"; then - skip $p - elif test "${p:0:4}" = "-aI/" && badPath "${p:3}"; then - skip $p - elif test "${p:0:4}" = "-aO/" && badPath "${p:3}"; then - skip $p - else - rest=("${rest[@]}" "$p") - fi - n=$((n + 1)) - done - params=("${rest[@]}") -fi - - -# Add the flags for the GNAT compiler proper. -extraAfter=($NIX_GNATFLAGS_COMPILE) -extraBefore=() - -if [ "`basename $0`x" = "gnatmakex" ]; then - extraBefore=("--GNATBIND=@out@/bin/gnatbind --GNATLINK=@out@/bin/gnatlink ") -fi - -# Add the flags that should be passed to the linker (and prevent -# `ld-wrapper' from adding NIX_LDFLAGS again). -#for i in $NIX_LDFLAGS_BEFORE; do -# extraBefore=(${extraBefore[@]} "-largs $i") -#done - -# Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @gnatProg@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extraBefore flags to @gnatProg@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @gnatProg@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done -fi - -if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then - source "$NIX_GNAT_WRAPPER_EXEC_HOOK" -fi - - -# Call the real `gcc'. Filter out warnings from stderr about unused -# `-B' flags, since they confuse some programs. Deep bash magic to -# apply grep to stderr (by swapping stdin/stderr twice). -if test -z "$NIX_GNAT_NEEDS_GREP"; then - @gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} -else - (@gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- - exit $? -fi diff --git a/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh deleted file mode 100644 index 25907108b4db16ebf9ac8e3bd51da634d5dfdb43..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh +++ /dev/null @@ -1,43 +0,0 @@ -#! @shell@ -e - -# Add the flags for the GNAT compiler proper. -extraAfter="--GCC=@out@/bin/gcc" -extraBefore=() - -# Add the flags that should be passed to the linker (and prevent -# `ld-wrapper' from adding NIX_LDFLAGS again). -#for i in $NIX_LDFLAGS_BEFORE; do -# extraBefore=(${extraBefore[@]} "-largs $i") -#done - -# Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @gnatlinkProg@:" >&2 - for i in "$@"; do - echo " $i" >&2 - done - echo "extraBefore flags to @gnatlinkProg@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @gnatlinkProg@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done -fi - -if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then - source "$NIX_GNAT_WRAPPER_EXEC_HOOK" -fi - - -# Call the real `gcc'. Filter out warnings from stderr about unused -# `-B' flags, since they confuse some programs. Deep bash magic to -# apply grep to stderr (by swapping stdin/stderr twice). -if test -z "$NIX_GNAT_NEEDS_GREP"; then - @gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]} -else - (@gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- - exit $? -fi diff --git a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh deleted file mode 100755 index 263ea5408e9a316c43c5287ea229c58d130f9b27..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!@shell@ - -set -e -set -u - -# I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( -# Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 -# but still no success. -cmd="@ld@ -z ignore" - -args=("$@"); - -# This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library. -# GNU binutils does not have this problem: -# http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter -i=0; -while [[ $i -lt $# ]]; do - case "${args[$i]}" in - -L) cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;; - -L*) cmd="$cmd ${args[$i]}" ;; - *) ;; - esac - i=($i+1); -done - -i=0; -while [[ $i -lt $# ]]; do - case "${args[$i]}" in - -L) i=($i+1); ;; - -L*) ;; - *) cmd="$cmd ${args[$i]}" ;; - esac - i=($i+1); -done - -# Trace: -set -x -exec $cmd - -exit 0 diff --git a/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh deleted file mode 100644 index db50d25cb3b99ad70fcd33fd793a71960d47725f..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh +++ /dev/null @@ -1,166 +0,0 @@ -#! @shell@ -e - -if test -n "$NIX_LD_WRAPPER_START_HOOK"; then - source "$NIX_LD_WRAPPER_START_HOOK" -fi - -if test -z "$NIX_CC_WRAPPER_FLAGS_SET"; then - source @out@/nix-support/add-flags.sh -fi - -source @out@/nix-support/utils.sh - - -# 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_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 - elif test "${p:0:9}" = "--sysroot"; then - # Our ld is not built with sysroot support (Can we fix that?) - : - else - rest=("${rest[@]}" "$p") - fi - n=$((n + 1)) - done - params=("${rest[@]}") -fi - - -extra=() -extraBefore=() - -if test -z "$NIX_LDFLAGS_SET"; then - extra+=($NIX_LDFLAGS) - extraBefore+=($NIX_LDFLAGS_BEFORE) -fi - -extra+=($NIX_LDFLAGS_AFTER) - - -# Add all used dynamic libraries to the rpath. -if test "$NIX_DONT_SET_RPATH" != "1"; then - - 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 " - } - - 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 " - } - - libs="" - addToLibs() { - libs="$libs $1" - } - - rpath="" - - # First, find all -L... switches. - allParams=("${params[@]}" ${extra[@]}) - 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)) - elif test "$p" = "-l"; then - addToLibs ${p2} - n=$((n + 1)) - elif test "${p:0:2}" = "-l"; then - addToLibs ${p:2} - elif test "$p" = "-dynamic-linker"; then - # Ignore the dynamic linker argument, or it - # will get into the next 'elif'. We don't want - # the dynamic linker path rpath to go always first. - n=$((n + 1)) - elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then - # This is a direct reference to a shared library, so add - # its directory to the rpath. - path="$(dirname "$p")"; - addToRPath "${path}" - fi - n=$((n + 1)) - done - - # Second, for each directory in the library search path (-L...), - # see if it contains a dynamic library used by a -l... flag. If - # so, add the directory to the rpath. - # It's important to add the rpath in the order of -L..., so - # the link time chosen objects will be those of runtime linking. - - for i in $libPath; do - for j in $libs; do - if test -f "$i/lib$j.so"; then - addToRPath $i - break - fi - done - done - - - # Finally, add `-rpath' switches. - for i in $rpath; do - extra=(${extra[@]} -rpath $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-wrapper-old/setup-hook.sh b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh deleted file mode 100644 index d8bdf858ae58c0b9af759af1229b9f3e0c63cf46..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh +++ /dev/null @@ -1,33 +0,0 @@ -addCVars () { - if test -d $1/include; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include" - fi - - if test -d $1/lib64; then - export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64" - fi - - if test -d $1/lib; then - export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib" - fi -} - -envHooks=(${envHooks[@]} addCVars) - -# Note: these come *after* $out in the PATH (see setup.sh). - -if test -n "@gcc@"; then - addToSearchPath PATH @gcc@/bin -fi - -if test -n "@binutils@"; then - addToSearchPath PATH @binutils@/bin -fi - -if test -n "@libc@"; then - addToSearchPath PATH @libc_bin@/bin -fi - -if test -n "@coreutils@"; then - addToSearchPath PATH @coreutils@/bin -fi diff --git a/pkgs/build-support/gcc-wrapper-old/utils.sh b/pkgs/build-support/gcc-wrapper-old/utils.sh deleted file mode 100644 index fa19f91bf5d2821f2c701513fa0785c738abf867..0000000000000000000000000000000000000000 --- a/pkgs/build-support/gcc-wrapper-old/utils.sh +++ /dev/null @@ -1,26 +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 - - @extraPathTests@ - - # 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/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 5353ae8284107ea67b3ad8c2014e6128bd6fba5e..262bee608eddfa11131e8686d3f28d628e1e1b05 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { suffices = map (x: if x ? suffix then x.suffix else "none") contents; # For obtaining the closure of `contents'. + # Note: we don't use closureInfo yet, as that won't build with nix-1.x. + # See #36268. exportReferencesGraph = map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents; pathsFromGraph = ./paths-from-graph.pl; diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix index 9940e611124c9e5a8d4ac06e8850673efe39853c..d82e279799ba35b045d9209d3bc8541485013aa3 100644 --- a/pkgs/build-support/kernel/modules-closure.nix +++ b/pkgs/build-support/kernel/modules-closure.nix @@ -3,13 +3,13 @@ # the modules identified by `rootModules', plus their dependencies. # Also generate an appropriate modules.dep. -{ stdenvNoCC, kernel, nukeReferences, rootModules +{ stdenvNoCC, kernel, firmware, nukeReferences, rootModules , kmod, allowMissing ? false }: stdenvNoCC.mkDerivation { name = kernel.name + "-shrunk"; builder = ./modules-closure.sh; - buildInputs = [ nukeReferences kmod ]; - inherit kernel rootModules allowMissing; + nativeBuildInputs = [ nukeReferences kmod ]; + inherit kernel firmware rootModules allowMissing; allowedReferences = ["out"]; } diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 8a31c760da07a3ab34dbf578597d844e6f361888..5658094872c84274a4b3a5426ec060d90f120449 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -1,5 +1,19 @@ source $stdenv/setup +# When no modules are built, the $out/lib/modules directory will not +# exist. Because the rest of the script assumes it does exist, we +# handle this special case first. +if ! test -d "$kernel/lib/modules"; then + if test -z "$rootModules" || test -n "$allowMissing"; then + mkdir -p "$out" + exit 0 + else + echo "Required modules: $rootModules" + echo "Can not derive a closure of kernel modules because no modules were provided." + exit 1 + fi +fi + version=$(cd $kernel/lib/modules && ls -d *) echo "kernel version is $version" @@ -33,4 +47,13 @@ for module in $closure; do echo $target >> $out/insmod-list done +mkdir -p $out/lib/firmware +for module in $closure; do + for i in $(modinfo -F firmware $module); do + mkdir -p "$out/lib/firmware/$(dirname "$i")" + echo "firmware for $module: $i" + cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi + done +done + depmod -b $out -a $version diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/pkgs/build-support/kernel/paths-from-graph.pl index 747e1edec81105d787ab65625799830b2bffb250..1465b73fddb6682a7a39256bb0d2a2e63affa9f4 100644 --- a/pkgs/build-support/kernel/paths-from-graph.pl +++ b/pkgs/build-support/kernel/paths-from-graph.pl @@ -1,3 +1,5 @@ +# NOTE: this script is deprecated. Use closureInfo instead. + # Parses a /nix/store/*-closure file and prints # various information. # By default, the nodes in the graph are printed to stdout. diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index bc777c7e6c74fcd8f6c4d614addd4ccfe48010d3..d13cdd681a219426c6f00d8d8c061c0d24446dad 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -14,5 +14,11 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + description = "An LD_PRELOAD library to intercept and rewrite the paths in glibc calls"; + longDescription = '' + libredirect is an LD_PRELOAD library to intercept and rewrite the paths in + glibc calls based on the value of $NIX_REDIRECTS, a colon-separated list + of path prefixes to be rewritten, e.g. "/src=/dst:/usr/=/nix/store/". + ''; }; } diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a98b4affacba2425a67e5032f4152666e8b4e389 --- /dev/null +++ b/pkgs/build-support/mkshell/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv }: + +# A special kind of derivation that is only meant to be consumed by the +# nix-shell. +{ + inputsFrom ? [], # a list of derivations whose inputs will be made available to the environment + buildInputs ? [], + nativeBuildInputs ? [], + propagatedBuildInputs ? [], + propagatedNativeBuildInputs ? [], + ... +}@attrs: +let + mergeInputs = name: + let + op = item: sum: sum ++ item."${name}" or []; + nul = []; + list = [attrs] ++ inputsFrom; + in + lib.foldr op nul list; + + rest = builtins.removeAttrs attrs [ + "inputsFrom" + "buildInputs" + "nativeBuildInputs" + "propagatedBuildInputs" + "propagatedNativeBuildInputs" + ]; +in + +stdenv.mkDerivation ({ + name = "nix-shell"; + phases = ["nobuildPhase"]; + + buildInputs = mergeInputs "buildInputs"; + nativeBuildInputs = mergeInputs "nativeBuildInputs"; + propagatedBuildInputs = mergeInputs "propagatedBuildInputs"; + propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs"; + + nobuildPhase = '' + echo + echo "This derivation is not meant to be built, aborting"; + echo + exit 1 + ''; +} // rest) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index f4bc3e73056dca0e46cfe544221d6431eb797c3a..354d929c9b652b6487724a294dd05d138e816588 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -78,10 +78,10 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( header "Generated DEB package: $i" dpkg-deb --info "$i" pkgName=$(dpkg-deb -W "$i" | awk '{print $1}') - dpkg -i "$i" echo "file deb $i" >> $out/nix-support/hydra-build-products stopNest done + dpkg -i $out/debs/*.deb for i in $extraDebs; do echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 376cd0e1d1546f908b07c84dc9fd97cf9e02cd05..c7129ae83f9289b4578190885bf2b47df6f3c041 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation ( touch now touch -d "1970-01-01 00:00:00 UTC" then find $sourceRoot ! -newer then -print0 | xargs -0r touch --reference now + rm now then eval "$nextPostUnpack" ''; @@ -122,7 +123,7 @@ stdenv.mkDerivation ( # Tarball builds are generally important, so give them a high # default priority. - schedulingPriority = "200"; + schedulingPriority = 200; }; } diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix new file mode 100644 index 0000000000000000000000000000000000000000..e0aec6e0e18bc0a42a129a81e2fda52a18158efe --- /dev/null +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -0,0 +1,460 @@ +# Code for buildRustCrate, a Nix function that builds Rust code, just +# like Cargo, but using Nix instead. +# +# This can be useful for deploying packages with NixOps, and to share +# binary dependencies between projects. + +{ lib, buildPlatform, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc }: + +let makeDeps = dependencies: + (lib.concatMapStringsSep " " (dep: + let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in + (if dep.crateType == "lib" then + " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib" + else + " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${buildPlatform.extensions.sharedLibrary}") + ) dependencies); + + echo_build_heading = colors: '' + echo_build_heading() { + start="" + end="" + if [[ "${colors}" == "always" ]]; then + start="$(printf '\033[0;1;32m')" #set bold, and set green. + end="$(printf '\033[0m')" #returns to "normal" + fi + if (( $# == 1 )); then + echo "$start""Building $1""$end" + else + echo "$start""Building $1 ($2)""$end" + fi + } + ''; + noisily = colors: verbose: '' + noisily() { + start="" + end="" + if [[ "${colors}" == "always" ]]; then + start="$(printf '\033[0;1;32m')" #set bold, and set green. + end="$(printf '\033[0m')" #returns to "normal" + fi + ${lib.optionalString verbose '' + echo -n "$start"Running "$end" + echo $@ + ''} + $@ + } + ''; + + configureCrate = + { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }: + let version_ = lib.splitString "-" crateVersion; + versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; + version = lib.splitString "." (lib.head version_); + rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2"); + buildDeps = makeDeps buildDependencies; + authors = lib.concatStringsSep ":" crateAuthors; + optLevel = if release then 3 else 0; + completeDepsDir = lib.concatStringsSep " " completeDeps; + completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; + in '' + cd ${workspace_member} + runHook preConfigure + ${echo_build_heading colors} + ${noisily colors verbose} + symlink_dependency() { + # $1 is the nix-store path of a dependency + # $2 is the target path + i=$1 + ln -s -f $i/lib/*.rlib $2 #*/ + ln -s -f $i/lib/*.so $i/lib/*.dylib $2 #*/ + if [ -e "$i/lib/link" ]; then + cat $i/lib/link >> target/link + cat $i/lib/link >> target/link.final + fi + if [ -e $i/env ]; then + source $i/env + fi + } + + mkdir -p target/{deps,lib,build,buildDeps} + chmod uga+w target -R + for i in ${completeDepsDir}; do + symlink_dependency $i target/deps + done + for i in ${completeBuildDepsDir}; do + symlink_dependency $i target/buildDeps + done + if [[ -e target/link ]]; then + sort -u target/link > target/link.sorted + mv target/link.sorted target/link + sort -u target/link.final > target/link.final.sorted + mv target/link.final.sorted target/link.final + tr '\n' ' ' < target/link > target/link_ + fi + EXTRA_BUILD="" + BUILD_OUT_DIR="" + export CARGO_PKG_NAME=${crateName} + export CARGO_PKG_VERSION=${crateVersion} + export CARGO_PKG_AUTHORS="${authors}" + + export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name} + export CARGO_CFG_TARGET_OS=${buildPlatform.parsed.kernel.name} + export CARGO_CFG_TARGET_FAMILY="unix" + export CARGO_CFG_UNIX=1 + export CARGO_CFG_TARGET_ENV="gnu" + export CARGO_CFG_TARGET_ENDIAN=${if buildPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"} + export CARGO_CFG_TARGET_POINTER_WIDTH=${toString buildPlatform.parsed.cpu.bits} + export CARGO_CFG_TARGET_VENDOR=${buildPlatform.parsed.vendor.name} + + export CARGO_MANIFEST_DIR="." + export DEBUG="${toString (!release)}" + export OPT_LEVEL="${toString optLevel}" + export TARGET="${buildPlatform.config}" + export HOST="${buildPlatform.config}" + export PROFILE=${if release then "release" else "debug"} + export OUT_DIR=$(pwd)/target/build/${crateName}.out + export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0} + export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1} + export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2} + if [[ -n "${versionPre}" ]]; then + export CARGO_PKG_VERSION_PRE="${versionPre}" + fi + + BUILD="" + if [[ ! -z "${build}" ]] ; then + BUILD=${build} + elif [[ -e "build.rs" ]]; then + BUILD="build.rs" + fi + if [[ ! -z "$BUILD" ]] ; then + echo_build_heading "$BUILD" ${libName} + mkdir -p target/build/${crateName} + EXTRA_BUILD_FLAGS="" + if [ -e target/link_ ]; then + EXTRA_BUILD_FLAGS=$(cat target/link_) + fi + if [ -e target/link.build ]; then + EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(cat target/link.build)" + fi + noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \ + ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \ + -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors} + + mkdir -p target/build/${crateName}.out + export RUST_BACKTRACE=1 + BUILD_OUT_DIR="-L $OUT_DIR" + mkdir -p $OUT_DIR + target/build/${crateName}/build_script_build > target/build/${crateName}.opt + set +e + EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) + EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) + EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) + + for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do + export $env + done + + CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/") + grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ + | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env + + set -e + if [[ -n "$(ls target/build/${crateName}.out)" ]]; then + + if [[ -e "${libPath}" ]]; then + cp -r target/build/${crateName}.out/* $(dirname ${libPath}) #*/ + else + cp -r target/build/${crateName}.out/* src #*/ + fi + fi + fi + runHook postConfigure + ''; + + buildCrate = { crateName, crateVersion, crateAuthors, + dependencies, completeDeps, completeBuildDeps, + crateFeatures, libName, build, release, libPath, + crateType, metadata, crateBin, finalBins, + extraRustcOpts, verbose, colors }: + + let depsDir = lib.concatStringsSep " " dependencies; + completeDepsDir = lib.concatStringsSep " " completeDeps; + completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; + deps = makeDeps dependencies; + optLevel = if release then 3 else 0; + rustcOpts = + lib.lists.foldl' (opts: opt: opts + " " + opt) + (if release then "-C opt-level=3" else "-C debuginfo=2") + (["-C codegen-units=1"] ++ extraRustcOpts); + rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; + version_ = lib.splitString "-" crateVersion; + versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; + version = lib.splitString "." (lib.head version_); + authors = lib.concatStringsSep ":" crateAuthors; + in '' + runHook preBuild + norm="" + bold="" + green="" + boldgreen="" + if [[ "${colors}" == "always" ]]; then + norm="$(printf '\033[0m')" #returns to "normal" + bold="$(printf '\033[0;1m')" #set bold + green="$(printf '\033[0;32m')" #set green + boldgreen="$(printf '\033[0;1;32m')" #set bold, and set green. + fi + ${echo_build_heading colors} + ${noisily colors verbose} + + build_lib() { + lib_src=$1 + echo_build_heading $lib_src ${libName} + + noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \ + ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \ + --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \ + $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} + + EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}.rlib" + if [ -e target/deps/lib$CRATE_NAME-${metadata}${buildPlatform.extensions.sharedLibrary} ]; then + EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}${buildPlatform.extensions.sharedLibrary}" + fi + } + + build_bin() { + crate_name=$1 + crate_name_=$(echo $crate_name | sed -e "s/-/_/g") + main_file="" + if [[ ! -z $2 ]]; then + main_file=$2 + fi + echo_build_heading $@ + noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ + ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ + $LINK ${deps}$EXTRA_LIB --cap-lints allow \ + $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} + if [ "$crate_name_" != "$crate_name" ]; then + mv target/bin/$crate_name_ target/bin/$crate_name + fi + } + + + EXTRA_LIB="" + CRATE_NAME=$(echo ${libName} | sed -e "s/-/_/g") + + if [[ -e target/link_ ]]; then + EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD" + fi + + if [[ -e "${libPath}" ]]; then + build_lib ${libPath} + elif [[ -e src/lib.rs ]]; then + build_lib src/lib.rs + elif [[ -e src/${libName}.rs ]]; then + build_lib src/${libName}.rs + fi + + echo "$EXTRA_LINK_SEARCH" | while read i; do + if [[ ! -z "$i" ]]; then + for lib in $i; do + echo "-L $lib" >> target/link + L=$(echo $lib | sed -e "s#$(pwd)/target/build#$out/lib#") + echo "-L $L" >> target/link.final + done + fi + done + echo "$EXTRA_LINK" | while read i; do + if [[ ! -z "$i" ]]; then + for lib in $i; do + echo "-l $lib" >> target/link + echo "-l $lib" >> target/link.final + done + fi + done + + if [[ -e target/link ]]; then + sort -u target/link.final > target/link.final.sorted + mv target/link.final.sorted target/link.final + sort -u target/link > target/link.sorted + mv target/link.sorted target/link + + tr '\n' ' ' < target/link > target/link_ + LINK=$(cat target/link_) + fi + + mkdir -p target/bin + echo "${crateBin}" | sed -n 1'p' | tr ',' '\n' | while read BIN; do + if [[ ! -z "$BIN" ]]; then + build_bin $BIN + fi + done + ${lib.optionalString (crateBin == "") '' + if [[ -e src/main.rs ]]; then + build_bin ${crateName} src/main.rs + fi + for i in src/bin/*.rs; do #*/ + build_bin "$(basename $i .rs)" "$i" + done + ''} + # Remove object files to avoid "wrong ELF type" + find target -type f -name "*.o" -print0 | xargs -0 rm -f + '' + finalBins + '' + runHook postBuild + ''; + + installCrate = crateName: metadata: '' + runHook preInstall + mkdir -p $out + if [[ -s target/env ]]; then + cp target/env $out/env + fi + if [[ -s target/link.final ]]; then + mkdir -p $out/lib + cp target/link.final $out/lib/link + fi + if [[ "$(ls -A target/lib)" ]]; then + mkdir -p $out/lib + cp target/lib/* $out/lib #*/ + for lib in $out/lib/*.so $out/lib/*.dylib; do #*/ + ln -s $lib $(echo $lib | sed -e "s/-${metadata}//") + done + fi + if [[ "$(ls -A target/build)" ]]; then # */ + mkdir -p $out/lib + cp -r target/build/* $out/lib # */ + fi + if [[ "$(ls -A target/bin)" ]]; then + mkdir -p $out/bin + cp -P target/bin/* $out/bin # */ + fi + runHook postInstall + ''; +in + +crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides, + dependencies, buildDependencies, + extraRustcOpts, + preUnpack, postUnpack, prePatch, patches, postPatch, + preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }: + +let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_); + release_ = release; + dependencies_ = dependencies; + buildDependencies_ = buildDependencies; + processedAttrs = [ + "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath" + "buildDependencies" "dependencies" "features" + "crateName" "version" "build" "authors" "colors" + ]; + extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate; + buildInputs_ = buildInputs; +in +stdenv.mkDerivation (rec { + + inherit (crate) crateName; + inherit preUnpack postUnpack prePatch patches postPatch preConfigure postConfigure preBuild postBuild preInstall postInstall; + + src = if lib.hasAttr "src" crate then + crate.src + else + fetchCrate { inherit (crate) crateName version sha256; }; + name = "rust_${crate.crateName}-${crate.version}"; + buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_; + dependencies = + builtins.map + (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) + dependencies_; + + buildDependencies = + builtins.map + (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) + buildDependencies_; + + completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies); + completeBuildDeps = lib.lists.unique ( + buildDependencies + ++ lib.lists.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies + ); + + crateFeatures = if crate ? features then + lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #" + else ""; + + libName = if crate ? libName then crate.libName else crate.crateName; + libPath = if crate ? libPath then crate.libPath else ""; + + depsMetadata = builtins.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies); + metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString crateFeatures + "___" + depsMetadata )); + + crateBin = if crate ? crateBin then + builtins.foldl' (bins: bin: + let name = + lib.strings.replaceStrings ["-"] ["_"] + (if bin ? name then bin.name else crateName); + path = if bin ? path then bin.path else "src/main.rs"; + in + bins + (if bin == "" then "" else ",") + "${name} ${path}" + + ) "" crate.crateBin + else ""; + + finalBins = if crate ? crateBin then + builtins.foldl' (bins: bin: + let name = lib.strings.replaceStrings ["-"] ["_"] + (if bin ? name then bin.name else crateName); + new_name = if bin ? name then bin.name else crateName; + in + if name == new_name then bins else + (bins + "mv target/bin/${name} target/bin/${new_name};") + + ) "" crate.crateBin + else ""; + + build = crate.build or ""; + workspace_member = crate.workspace_member or "."; + crateVersion = crate.version; + crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; + crateType = + if lib.attrByPath ["procMacro"] false crate then "proc-macro" else + if lib.attrByPath ["plugin"] false crate then "dylib" else + (crate.type or "lib"); + colors = lib.attrByPath [ "colors" ] "always" crate; + configurePhase = configureCrate { + inherit crateName dependencies buildDependencies completeDeps completeBuildDeps + crateFeatures libName build workspace_member release libPath crateVersion + crateAuthors verbose colors; + }; + extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; + buildPhase = buildCrate { + inherit crateName dependencies completeDeps completeBuildDeps + crateFeatures libName build release libPath crateType + crateVersion crateAuthors metadata crateBin finalBins verbose colors + extraRustcOpts; + }; + installPhase = installCrate crateName metadata; + +} // extraDerivationAttrs +)) { + rust = rustc; + release = crate_.release or true; + verbose = crate_.verbose or true; + extraRustcOpts = []; + features = []; + buildInputs = []; + crateOverrides = defaultCrateOverrides; + preUnpack = crate_.preUnpack or ""; + postUnpack = crate_.postUnpack or ""; + prePatch = crate_.prePatch or ""; + patches = crate_.patches or []; + postPatch = crate_.postPatch or ""; + preConfigure = crate_.preConfigure or ""; + postConfigure = crate_.postConfigure or ""; + preBuild = crate_.preBuild or ""; + postBuild = crate_.postBuild or ""; + preInstall = crate_.preInstall or ""; + postInstall = crate_.postInstall or ""; + dependencies = crate_.dependencies or []; + buildDependencies = crate_.buildDependencies or []; +} diff --git a/pkgs/build-support/rust/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor.nix deleted file mode 100644 index 6b50f8b83e73381c54372d9f057ee8e6caec1ac3..0000000000000000000000000000000000000000 --- a/pkgs/build-support/rust/cargo-vendor.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ fetchurl, stdenv }: -let - inherit (stdenv) system; - - version = "0.1.12"; - - hashes = { - x86_64-linux = "1hxlavcxy374yypfamlkygjg662lhll8j434qcvdawkvlidg5ii5"; - x86_64-darwin = "1jkvhh710gwjnnjx59kaplx2ncfvkx9agfa76rr94sbjqq4igddm"; - }; - hash = hashes. ${system} or (throw "missing bootstrap hash for platform ${system}"); - - platforms = { - x86_64-linux = "x86_64-unknown-linux-musl"; - x86_64-darwin = "x86_64-apple-darwin"; - }; - platform = platforms . ${system}; - -in stdenv.mkDerivation { - name = "cargo-vendor-${version}"; - - src = fetchurl { - url = "https://github.com/alexcrichton/cargo-vendor/releases/download/${version}/cargo-vendor-${version}-${platform}.tar.gz"; - sha256 = hash; - }; - - phases = "unpackPhase installPhase"; - - installPhase = '' - install -Dm755 cargo-vendor $out/bin/cargo-vendor - ''; -} diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix new file mode 100644 index 0000000000000000000000000000000000000000..ac6bb6ab1bd449cdbbdc7cfdb192539fc5bfa24b --- /dev/null +++ b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix @@ -0,0 +1,1487 @@ +# Generated by carnix 0.5.2: carnix Cargo.lock -o cargo-vendor.nix +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + hasFeature = feature: + lib.lists.any + (originName: feature.${originName}) + (builtins.attrNames feature); + + hasDefault = feature: + let defaultFeatures = builtins.attrNames (feature."default" or {}); in + (defaultFeatures == []) + || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); + + mkFeatures = feat: lib.lists.foldl (features: featureName: + if featureName != "" && hasFeature feat.${featureName} then + [ featureName ] ++ features + else + features + ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); + advapi32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "advapi32-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "1l6789hkz2whd9gklwz1m379kcvyizaj8nnzj3rn4a5h79yg59v7"; + libName = "advapi32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; } ]; + inherit dependencies buildDependencies features; + }; + atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.3"; + authors = [ "softprops " ]; + sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f"; + inherit dependencies buildDependencies features; + }; + backtrace_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.3"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "0invfdxkj85v8zyrjs3amfxjdk2a36x8irq7wq7kny6q49hh8y0z"; + inherit dependencies buildDependencies features; + }; + backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.16"; + authors = [ "Alex Crichton " ]; + sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.9.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; + inherit dependencies buildDependencies features; + }; + cargo_0_22_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cargo"; + version = "0.22.0"; + authors = [ "Yehuda Katz " "Carl Lerche " "Alex Crichton " ]; + sha256 = "1a47jzkxydsrcyybdqv7wd6a2f258c8bb8rb2jv5n4apxz5qhycl"; + libPath = "src/cargo/lib.rs"; + crateBin = [ { name = "cargo"; } ]; + inherit dependencies buildDependencies features; + }; + cargo_vendor_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cargo-vendor"; + version = "0.1.13"; + authors = [ "Alex Crichton " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; + cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.3"; + authors = [ "Alex Crichton " ]; + sha256 = "193pwqgh79w6k0k29svyds5nnlrwx44myqyrw605d5jj4yk2zmpr"; + inherit dependencies buildDependencies features; + }; + cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; + inherit dependencies buildDependencies features; + }; + cmake_0_1_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cmake"; + version = "0.1.26"; + authors = [ "Alex Crichton " ]; + sha256 = "0qi1vb1fzlngxr4mzklg58jjmvwj08059pjvh0yh1azzj2mcmgx6"; + inherit dependencies buildDependencies features; + }; + core_foundation_0_4_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "core-foundation"; + version = "0.4.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "1vn9cdbihjnqrlznrbvw0yggz5grb4wqll5xq080w28xxhnayyhx"; + inherit dependencies buildDependencies features; + }; + core_foundation_sys_0_4_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "core-foundation-sys"; + version = "0.4.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "022i015jzjmv85vr25l9caxz211649d8rnbcsmr0gh9k4ygm7pqk"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + crates_io_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crates-io"; + version = "0.11.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1xxhbka89bk1kkhl8nsnlp9ih64fzv904dyb7jyws7lizcvq77wm"; + libPath = "lib.rs"; + libName = "crates_io"; + inherit dependencies buildDependencies features; + }; + crossbeam_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crossbeam"; + version = "0.2.10"; + authors = [ "Aaron Turon " ]; + sha256 = "1k1a4q5gy7zakiw39hdzrblnw3kk4nsqmkdp1dpzh8h558140rhq"; + inherit dependencies buildDependencies features; + }; + curl_0_4_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "curl"; + version = "0.4.8"; + authors = [ "Carl Lerche " "Alex Crichton " ]; + sha256 = "0pxg1bpplm1bp8b8gzlvs4pmd36m02gjhskvwrd161hh9pslczv5"; + inherit dependencies buildDependencies features; + }; + curl_sys_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "curl-sys"; + version = "0.3.15"; + authors = [ "Carl Lerche " "Alex Crichton " ]; + sha256 = "0x2ysxhpwg1a7srf74v4qcy516jzf0kjg87hsl6cfnasxplz5x1g"; + libPath = "lib.rs"; + libName = "curl_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbghelp-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq"; + libName = "dbghelp"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + docopt_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "docopt"; + version = "0.8.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "0kmqy534qgcc2hh81nd248jmnvdjb5y4wclddd7y2jjm27rzibss"; + crateBin = [ { name = "docopt-wordlist"; path = "src/wordlist.rs"; } ]; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; + inherit dependencies buildDependencies features; + }; + env_logger_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "env_logger"; + version = "0.4.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0nrx04p4xa86d5kc7aq4fwvipbqji9cmgy449h47nc9f1chafhgg"; + inherit dependencies buildDependencies features; + }; + error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.11.0"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; + inherit dependencies buildDependencies features; + }; + filetime_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "filetime"; + version = "0.1.14"; + authors = [ "Alex Crichton " ]; + sha256 = "0i6dvc3ba7vl1iccc91k7c9bv9j5md98mbvlmfy0kicikx0ffn08"; + inherit dependencies buildDependencies features; + }; + flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "flate2"; + version = "0.2.20"; + authors = [ "Alex Crichton " ]; + sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl"; + inherit dependencies buildDependencies features; + }; + fnv_1_0_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fnv"; + version = "1.0.5"; + authors = [ "Alex Crichton " ]; + sha256 = "164832m16b3hdm3jfrda03ps3ayi5qb855irpm9sqpnw1awpy2a2"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + foreign_types_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "foreign-types"; + version = "0.2.0"; + authors = [ "Steven Fackler " ]; + sha256 = "1sznwg2py4xi7hyrx0gg1sirlwgh87wsanvjx3zb475g6c4139jh"; + inherit dependencies buildDependencies features; + }; + fs2_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fs2"; + version = "0.4.2"; + authors = [ "Dan Burkert " ]; + sha256 = "034s52pmqvrkafmmlnklysqx6gl08rl63ycngbav9hs0mrq22qvf"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.2.1"; + authors = [ "Raph Levien " ]; + sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.2.0"; + authors = [ "Raph Levien " ]; + sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w"; + inherit dependencies buildDependencies features; + }; + git2_0_6_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "git2"; + version = "0.6.8"; + authors = [ "Alex Crichton " ]; + sha256 = "1si82zg35a1az91wa2zjwlkmbd4pdia8wf87j6hz4bs8l55y8fd9"; + inherit dependencies buildDependencies features; + }; + git2_curl_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "git2-curl"; + version = "0.7.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1k36py61r3g7xz79ms02c1zb9x5c60g4wnjg2ffwz2j7kqzw9cc8"; + inherit dependencies buildDependencies features; + }; + glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glob"; + version = "0.2.11"; + authors = [ "The Rust Project Developers" ]; + sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; + inherit dependencies buildDependencies features; + }; + globset_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "globset"; + version = "0.2.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "02dycdz001g33rs2jygiq7yqqswmy1in5rczfl44clq1p118fis0"; + inherit dependencies buildDependencies features; + }; + hex_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hex"; + version = "0.2.0"; + authors = [ "KokaKiwi " ]; + sha256 = "0yd68d709w1z8133n9hny9dfj2fvil0r6802c3bb63czyis8rfbp"; + inherit dependencies buildDependencies features; + }; + home_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "home"; + version = "0.3.0"; + authors = [ "Brian Anderson " ]; + sha256 = "1dzc0wd2i82zqq1s8j4mpy2almaq5fcas22s4asn38pm86k40zf2"; + inherit dependencies buildDependencies features; + }; + idna_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "idna"; + version = "0.1.4"; + authors = [ "The rust-url developers" ]; + sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336"; + inherit dependencies buildDependencies features; + }; + ignore_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ignore"; + version = "0.2.2"; + authors = [ "Andrew Gallant " ]; + sha256 = "1b9wc8q25jwbipxmrysaps7sykbhyh6hdl8ihqzlwfvg39dy7mjc"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.4"; + authors = [ "David Tolnay " ]; + sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + inherit dependencies buildDependencies features; + }; + jobserver_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "jobserver"; + version = "0.1.8"; + authors = [ "Alex Crichton " ]; + sha256 = "0rscjndafcrldrlb5nax2jgnc6fk298awqc6yzi9lbnbybm6r004"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.9"; + authors = [ "Marvin Löbel " ]; + sha256 = "08ldzr5292y3hvi6l6v8l4i6v95lm1aysmnfln65h10sqrfh6iw7"; + inherit dependencies buildDependencies features; + }; + libc_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1l7synziccnvarsq2kk22vps720ih6chmn016bhr2bq54hblbnl1"; + inherit dependencies buildDependencies features; + }; + libgit2_sys_0_6_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libgit2-sys"; + version = "0.6.16"; + authors = [ "Alex Crichton " ]; + sha256 = "05axjdwkm7z8z6c7s96cakdigjiq9sfah8z48868bhby6v1q30n9"; + libPath = "lib.rs"; + libName = "libgit2_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + libssh2_sys_0_2_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libssh2-sys"; + version = "0.2.6"; + authors = [ "Alex Crichton " ]; + sha256 = "0pvdgr3lg9x8xyjmfwifr9dxirvrzjvq7i3clix50rwp7ck21jh7"; + libPath = "lib.rs"; + libName = "libssh2_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + libz_sys_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libz-sys"; + version = "1.0.18"; + authors = [ "Alex Crichton " ]; + sha256 = "0lr0rvmmfbfa4g7mhi0l93i8jq86pfcssdv4d40kzfy45ajdcgim"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.8"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; + inherit dependencies buildDependencies features; + }; + matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "matches"; + version = "0.1.6"; + authors = [ "Simon Sapin " ]; + sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "1.0.2"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; + inherit dependencies buildDependencies features; + }; + memchr_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "2.0.0"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "182svm4sr8b7l38ss6ph5wkj3p7ypp08jq65fm83mxpylxziih9p"; + inherit dependencies buildDependencies features; + }; + miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miniz-sys"; + version = "0.1.10"; + authors = [ "Alex Crichton " ]; + sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln"; + libPath = "lib.rs"; + libName = "miniz_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miow"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0"; + inherit dependencies buildDependencies features; + }; + net2_0_2_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "net2"; + version = "0.2.31"; + authors = [ "Alex Crichton " ]; + sha256 = "13mphllfcbybsdqyi1jb3kyqx65m8ch07drr59a4wb3yl89awm7y"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.7.0"; + authors = [ "Sean McArthur " ]; + sha256 = "0231xmd65ma3pqfiw8pkv9dvm9x708z4xlrwp3i0sgiwv408dz3f"; + inherit dependencies buildDependencies features; + }; + openssl_0_9_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl"; + version = "0.9.20"; + authors = [ "Steven Fackler " ]; + sha256 = "0dbj6k6z828c3sqbxidw5zfval29k8dlsr8qn8fizhc1alli18gx"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + openssl_probe_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl-probe"; + version = "0.1.1"; + authors = [ "Alex Crichton " ]; + sha256 = "19ykmqfnbmq56nadir0kvap4q1rpcjpmrfpnbc1qkj195dnh66na"; + inherit dependencies buildDependencies features; + }; + openssl_sys_0_9_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl-sys"; + version = "0.9.20"; + authors = [ "Alex Crichton " "Steven Fackler " ]; + sha256 = "05q6qagvy7lim9vkq2v00vpm34j1dq4xy9pchs7fb6yy803vx24m"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + percent_encoding_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "percent-encoding"; + version = "1.0.0"; + authors = [ "The rust-url developers" ]; + sha256 = "0c91wp8inj7z270i2kilxjl00kcagqalxxnnjg7fsdlimdwb7q1z"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + psapi_sys_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "psapi-sys"; + version = "0.1.0"; + authors = [ "Peter Atashian " ]; + sha256 = "091sbrcwbnhq1mwx6rc5w5kkwzg2ph78rhwjkdy9aqnzj7yj5ppm"; + libName = "psapi"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quote"; + version = "0.3.15"; + authors = [ "David Tolnay " ]; + sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + inherit dependencies buildDependencies features; + }; + rand_0_3_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.18"; + authors = [ "The Rust Project Developers" ]; + sha256 = "15d7c3myn968dzjs0a2pgv58hzdavxnq6swgj032lw2v966ir4xv"; + inherit dependencies buildDependencies features; + }; + redox_syscall_0_1_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.31"; + authors = [ "Jeremy Soller " ]; + sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4"; + libName = "syscall"; + inherit dependencies buildDependencies features; + }; + redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "0.2.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.4.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls"; + inherit dependencies buildDependencies features; + }; + rustc_demangle_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.5"; + authors = [ "Alex Crichton " ]; + sha256 = "096kkcx9j747700fhxj1s4rlwkj21pqjmvj64psdj6bakb2q13nc"; + inherit dependencies buildDependencies features; + }; + same_file_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "same-file"; + version = "0.1.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "01hdnxblb1hlysr47nwdv7r8vs7p63ia08v5h4lcffmzqvl5zzn9"; + inherit dependencies buildDependencies features; + }; + scoped_tls_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped-tls"; + version = "0.1.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1j8azxa15srljafrg7wc221npvxb3700sbfk6jjav0rw2zclsnf5"; + inherit dependencies buildDependencies features; + }; + scopeguard_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scopeguard"; + version = "0.1.2"; + authors = [ "bluss" ]; + sha256 = "00b3jrxlrzqv7qqzdd18m6p5skj1xwb4nw6bhch2ikg0hnfv5zdb"; + inherit dependencies buildDependencies features; + }; + semver_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.7.0"; + authors = [ "Steve Klabnik " "The Rust Project Developers" ]; + sha256 = "079944bh20ldr41i96nk9b31igj555dl2d8mg51m4h0ccwric4l8"; + inherit dependencies buildDependencies features; + }; + semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver-parser"; + version = "0.7.0"; + authors = [ "Steve Klabnik " ]; + sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; + inherit dependencies buildDependencies features; + }; + serde_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "1.0.18"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "14cczcvmfwgbm8447k93aggi7fbx0ix5f7dz16fxzs9l3riac5vq"; + inherit dependencies buildDependencies features; + }; + serde_derive_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.18"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1kx8zjcc9mxib6ipb9ygjjgxdniff93pwazvj4vqb859paqazdsj"; + procMacro = true; + inherit dependencies buildDependencies features; + }; + serde_derive_internals_0_16_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive_internals"; + version = "0.16.0"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1k96ypwlhnvmaksimkx1pd5rwvjaanfcdzpgndhy994hx03xplhs"; + inherit dependencies buildDependencies features; + }; + serde_ignored_0_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_ignored"; + version = "0.0.3"; + authors = [ "David Tolnay " ]; + sha256 = "0yz81jz6rqbzbhznmkygl9rdq1xq43jsgv10mmd5m24vh4j00icc"; + inherit dependencies buildDependencies features; + }; + serde_json_1_0_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.5"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1yka3aa2gfi30415jpf0935k54r08jhyw6r7rjz2nv1kqgbw2brs"; + inherit dependencies buildDependencies features; + }; + shell_escape_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "shell-escape"; + version = "0.1.3"; + authors = [ "Steven Fackler " ]; + sha256 = "0r3pj7kl40iqjbivwh4kd6agjdhbf5avzp7i8v42xvpc1zrzrq77"; + inherit dependencies buildDependencies features; + }; + socket2_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "socket2"; + version = "0.2.4"; + authors = [ "Alex Crichton " ]; + sha256 = "1pdwqlx4wnabgv549i3pb3whbk8ggcq4kg0lfx9cpcazcjk5p6iz"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "syn"; + version = "0.11.11"; + authors = [ "David Tolnay " ]; + sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + inherit dependencies buildDependencies features; + }; + synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "synom"; + version = "0.11.3"; + authors = [ "David Tolnay " ]; + sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + inherit dependencies buildDependencies features; + }; + tar_0_4_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tar"; + version = "0.4.13"; + authors = [ "Alex Crichton " ]; + sha256 = "1m425d07h0i6h2vbpxnh067zmc16l9yr9bii17zxw4z2inkfyfc4"; + inherit dependencies buildDependencies features; + }; + tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz"; + inherit dependencies buildDependencies features; + }; + termcolor_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termcolor"; + version = "0.3.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1rb853jzvkbwm62373dhls4x4r3r5cvfcsxvqh0i75rhx5j8kwsz"; + inherit dependencies buildDependencies features; + }; + termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + inherit dependencies buildDependencies features; + }; + thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.4"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; + inherit dependencies buildDependencies features; + }; + toml_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.4.5"; + authors = [ "Alex Crichton " ]; + sha256 = "06zxqhn3y58yzjfaykhcrvlf7p2dnn54kn3g4apmja3cn5b18lkk"; + inherit dependencies buildDependencies features; + }; + unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-bidi"; + version = "0.3.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; + libName = "unicode_bidi"; + inherit dependencies buildDependencies features; + }; + unicode_normalization_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.5"; + authors = [ "kwantam " ]; + sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5"; + inherit dependencies buildDependencies features; + }; + unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.0.4"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + inherit dependencies buildDependencies features; + }; + unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + authors = [ "Jonathan Reem " ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + inherit dependencies buildDependencies features; + }; + url_1_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "url"; + version = "1.6.0"; + authors = [ "The rust-url developers" ]; + sha256 = "1bvzl4dvjj84h46ai3x23wyafa2wwhchj08vr2brf25dxwc7mg18"; + inherit dependencies buildDependencies features; + }; + userenv_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "userenv-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "19l85k56y30likj69ri83jspsf4n9q4d03pi4mbs7cimlzn8lvzj"; + libName = "userenv"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; + inherit dependencies buildDependencies features; + }; + vcpkg_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.2"; + authors = [ "Jim McGrath " ]; + sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + walkdir_1_0_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "walkdir"; + version = "1.0.7"; + authors = [ "Andrew Gallant " ]; + sha256 = "1ygsc59m8mbnlz0psjxdzm1xjndxpywjwalqcd3pwdarzk1gy1vr"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + wincolor_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wincolor"; + version = "0.1.4"; + authors = [ "Andrew Gallant " ]; + sha256 = "0cxv6hadnj5vffb8a73y7055p59n20bpqd524df85cm29dcjl38a"; + inherit dependencies buildDependencies features; + }; + ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ws2_32-sys"; + version = "0.2.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc"; + libName = "ws2_32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + +in +rec { + advapi32_sys_0_2_0 = advapi32_sys_0_2_0_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_advapi32_sys_0_2_0__default_ = true; + winapi_build_0_1_1_features."default".from_advapi32_sys_0_2_0__default_ = true; + aho_corasick_0_6_3 = aho_corasick_0_6_3_ rec { + dependencies = [ memchr_1_0_2 ]; + }; + memchr_1_0_2_features."default".from_aho_corasick_0_6_3__default_ = true; + atty_0_2_3 = atty_0_2_3_ rec { + dependencies = (if kernel == "redox" then [ termion_1_5_1 ] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + kernel32_sys_0_2_2_features."default".from_atty_0_2_3__default_ = true; + libc_0_2_33_features."default".from_atty_0_2_3__default_ = false; + termion_1_5_1_features."default".from_atty_0_2_3__default_ = true; + winapi_0_2_8_features."default".from_atty_0_2_3__default_ = true; + backtrace_0_3_3 = backtrace_0_3_3_ rec { + dependencies = [ cfg_if_0_1_2 rustc_demangle_0_1_5 ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then [ backtrace_sys_0_1_16 ] + ++ (if lib.lists.any (x: x == "backtrace-sys") features then [backtrace_sys_0_1_16] else []) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ dbghelp_sys_0_2_0 kernel32_sys_0_2_2 winapi_0_2_8 ] + ++ (if lib.lists.any (x: x == "dbghelp-sys") features then [dbghelp_sys_0_2_0] else []) + ++ (if lib.lists.any (x: x == "kernel32-sys") features then [kernel32_sys_0_2_2] else []) + ++ (if lib.lists.any (x: x == "winapi") features then [winapi_0_2_8] else []) else []); + features = mkFeatures backtrace_0_3_3_features; + }; + backtrace_0_3_3_features."".self = true; + backtrace_0_3_3_features."kernel32-sys".self_dbghelp = hasFeature (backtrace_0_3_3_features."dbghelp" or {}); + backtrace_0_3_3_features."winapi".self_dbghelp = hasFeature (backtrace_0_3_3_features."dbghelp" or {}); + backtrace_0_3_3_features."dbghelp-sys".self_dbghelp = hasFeature (backtrace_0_3_3_features."dbghelp" or {}); + backtrace_0_3_3_features."libunwind".self_default = hasDefault backtrace_0_3_3_features; + backtrace_0_3_3_features."libbacktrace".self_default = hasDefault backtrace_0_3_3_features; + backtrace_0_3_3_features."coresymbolication".self_default = hasDefault backtrace_0_3_3_features; + backtrace_0_3_3_features."dladdr".self_default = hasDefault backtrace_0_3_3_features; + backtrace_0_3_3_features."dbghelp".self_default = hasDefault backtrace_0_3_3_features; + backtrace_0_3_3_features."addr2line".self_gimli-symbolize = hasFeature (backtrace_0_3_3_features."gimli-symbolize" or {}); + backtrace_0_3_3_features."findshlibs".self_gimli-symbolize = hasFeature (backtrace_0_3_3_features."gimli-symbolize" or {}); + backtrace_0_3_3_features."backtrace-sys".self_libbacktrace = hasFeature (backtrace_0_3_3_features."libbacktrace" or {}); + backtrace_0_3_3_features."rustc-serialize".self_serialize-rustc = hasFeature (backtrace_0_3_3_features."serialize-rustc" or {}); + backtrace_0_3_3_features."serde".self_serialize-serde = hasFeature (backtrace_0_3_3_features."serialize-serde" or {}); + backtrace_0_3_3_features."serde_derive".self_serialize-serde = hasFeature (backtrace_0_3_3_features."serialize-serde" or {}); + addr2line_0_0_0_features."default".from_backtrace_0_3_3__default_ = true; + backtrace_sys_0_1_16_features."default".from_backtrace_0_3_3__default_ = true; + cfg_if_0_1_2_features."default".from_backtrace_0_3_3__default_ = true; + cpp_demangle_0_0_0_features."default".from_backtrace_0_3_3__default_ = false; + dbghelp_sys_0_2_0_features."default".from_backtrace_0_3_3__default_ = true; + findshlibs_0_0_0_features."default".from_backtrace_0_3_3__default_ = true; + kernel32_sys_0_2_2_features."default".from_backtrace_0_3_3__default_ = true; + libc_0_2_33_features."default".from_backtrace_0_3_3__default_ = true; + rustc_demangle_0_1_5_features."default".from_backtrace_0_3_3__default_ = true; + rustc_serialize_0_0_0_features."default".from_backtrace_0_3_3__default_ = true; + serde_0_0_0_features."default".from_backtrace_0_3_3__default_ = true; + serde_derive_0_0_0_features."default".from_backtrace_0_3_3__default_ = true; + winapi_0_2_8_features."default".from_backtrace_0_3_3__default_ = true; + backtrace_sys_0_1_16 = backtrace_sys_0_1_16_ rec { + dependencies = [ libc_0_2_33 ]; + buildDependencies = [ cc_1_0_3 ]; + }; + cc_1_0_3_features."default".from_backtrace_sys_0_1_16__default_ = true; + libc_0_2_33_features."default".from_backtrace_sys_0_1_16__default_ = true; + bitflags_0_7_0 = bitflags_0_7_0_ rec {}; + bitflags_0_9_1 = bitflags_0_9_1_ rec { + features = mkFeatures bitflags_0_9_1_features; + }; + bitflags_0_9_1_features."example_generated".self_default = hasDefault bitflags_0_9_1_features; + cargo_0_22_0 = cargo_0_22_0_ rec { + dependencies = [ atty_0_2_3 crates_io_0_11_0 crossbeam_0_2_10 curl_0_4_8 docopt_0_8_1 env_logger_0_4_3 error_chain_0_11_0 filetime_0_1_14 flate2_0_2_20 fs2_0_4_2 git2_0_6_8 git2_curl_0_7_0 glob_0_2_11 hex_0_2_0 home_0_3_0 ignore_0_2_2 jobserver_0_1_8 libc_0_2_33 libgit2_sys_0_6_16 log_0_3_8 num_cpus_1_7_0 same_file_0_1_3 scoped_tls_0_1_0 semver_0_7_0 serde_1_0_18 serde_derive_1_0_18 serde_ignored_0_0_3 serde_json_1_0_5 shell_escape_0_1_3 tar_0_4_13 tempdir_0_3_5 termcolor_0_3_3 toml_0_4_5 url_1_6_0 ] + ++ (if kernel == "darwin" then [ core_foundation_0_4_4 ] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ openssl_0_9_20 ] else []) + ++ (if kernel == "windows" then [ advapi32_sys_0_2_0 kernel32_sys_0_2_2 miow_0_2_1 psapi_sys_0_1_0 winapi_0_2_8 ] else []); + }; + semver_0_7_0_features."serde".from_cargo_0_22_0 = true; + core_foundation_0_4_4_features."mac_os_10_7_support".from_cargo_0_22_0 = true; + advapi32_sys_0_2_0_features."default".from_cargo_0_22_0__default_ = true; + atty_0_2_3_features."default".from_cargo_0_22_0__default_ = true; + core_foundation_0_4_4_features."default".from_cargo_0_22_0__default_ = true; + crates_io_0_11_0_features."default".from_cargo_0_22_0__default_ = true; + crossbeam_0_2_10_features."default".from_cargo_0_22_0__default_ = true; + curl_0_4_8_features."default".from_cargo_0_22_0__default_ = true; + docopt_0_8_1_features."default".from_cargo_0_22_0__default_ = true; + env_logger_0_4_3_features."default".from_cargo_0_22_0__default_ = true; + error_chain_0_11_0_features."default".from_cargo_0_22_0__default_ = true; + filetime_0_1_14_features."default".from_cargo_0_22_0__default_ = true; + flate2_0_2_20_features."default".from_cargo_0_22_0__default_ = true; + fs2_0_4_2_features."default".from_cargo_0_22_0__default_ = true; + git2_0_6_8_features."default".from_cargo_0_22_0__default_ = true; + git2_curl_0_7_0_features."default".from_cargo_0_22_0__default_ = true; + glob_0_2_11_features."default".from_cargo_0_22_0__default_ = true; + hex_0_2_0_features."default".from_cargo_0_22_0__default_ = true; + home_0_3_0_features."default".from_cargo_0_22_0__default_ = true; + ignore_0_2_2_features."default".from_cargo_0_22_0__default_ = true; + jobserver_0_1_8_features."default".from_cargo_0_22_0__default_ = true; + kernel32_sys_0_2_2_features."default".from_cargo_0_22_0__default_ = true; + libc_0_2_33_features."default".from_cargo_0_22_0__default_ = true; + libgit2_sys_0_6_16_features."default".from_cargo_0_22_0__default_ = true; + log_0_3_8_features."default".from_cargo_0_22_0__default_ = true; + miow_0_2_1_features."default".from_cargo_0_22_0__default_ = true; + num_cpus_1_7_0_features."default".from_cargo_0_22_0__default_ = true; + openssl_0_9_20_features."default".from_cargo_0_22_0__default_ = true; + psapi_sys_0_1_0_features."default".from_cargo_0_22_0__default_ = true; + same_file_0_1_3_features."default".from_cargo_0_22_0__default_ = true; + scoped_tls_0_1_0_features."default".from_cargo_0_22_0__default_ = true; + semver_0_7_0_features."default".from_cargo_0_22_0__default_ = true; + serde_1_0_18_features."default".from_cargo_0_22_0__default_ = true; + serde_derive_1_0_18_features."default".from_cargo_0_22_0__default_ = true; + serde_ignored_0_0_3_features."default".from_cargo_0_22_0__default_ = true; + serde_json_1_0_5_features."default".from_cargo_0_22_0__default_ = true; + shell_escape_0_1_3_features."default".from_cargo_0_22_0__default_ = true; + tar_0_4_13_features."default".from_cargo_0_22_0__default_ = false; + tempdir_0_3_5_features."default".from_cargo_0_22_0__default_ = true; + termcolor_0_3_3_features."default".from_cargo_0_22_0__default_ = true; + toml_0_4_5_features."default".from_cargo_0_22_0__default_ = true; + url_1_6_0_features."default".from_cargo_0_22_0__default_ = true; + winapi_0_2_8_features."default".from_cargo_0_22_0__default_ = true; + cargo_vendor_0_1_13 = cargo_vendor_0_1_13_ rec { + dependencies = [ cargo_0_22_0 env_logger_0_4_3 serde_1_0_18 serde_derive_1_0_18 serde_json_1_0_5 toml_0_4_5 ]; + }; + cargo_0_22_0_features."default".from_cargo_vendor_0_1_13__default_ = true; + env_logger_0_4_3_features."default".from_cargo_vendor_0_1_13__default_ = true; + serde_1_0_18_features."default".from_cargo_vendor_0_1_13__default_ = true; + serde_derive_1_0_18_features."default".from_cargo_vendor_0_1_13__default_ = true; + serde_json_1_0_5_features."default".from_cargo_vendor_0_1_13__default_ = true; + toml_0_4_5_features."default".from_cargo_vendor_0_1_13__default_ = true; + cc_1_0_3 = cc_1_0_3_ rec { + dependencies = []; + features = mkFeatures cc_1_0_3_features; + }; + cc_1_0_3_features."rayon".self_parallel = hasFeature (cc_1_0_3_features."parallel" or {}); + rayon_0_0_0_features."default".from_cc_1_0_3__default_ = true; + cfg_if_0_1_2 = cfg_if_0_1_2_ rec {}; + cmake_0_1_26 = cmake_0_1_26_ rec { + dependencies = [ cc_1_0_3 ]; + }; + cc_1_0_3_features."default".from_cmake_0_1_26__default_ = true; + core_foundation_0_4_4 = core_foundation_0_4_4_ rec { + dependencies = [ core_foundation_sys_0_4_4 libc_0_2_33 ]; + features = mkFeatures core_foundation_0_4_4_features; + }; + core_foundation_0_4_4_features."".self = true; + core_foundation_sys_0_4_4_features."mac_os_10_7_support".from_core_foundation_0_4_4__mac_os_10_7_support = hasFeature (core_foundation_0_4_4_features."mac_os_10_7_support" or {}); + core_foundation_sys_0_4_4_features."mac_os_10_8_features".from_core_foundation_0_4_4__mac_os_10_8_features = hasFeature (core_foundation_0_4_4_features."mac_os_10_8_features" or {}); + core_foundation_sys_0_4_4_features."default".from_core_foundation_0_4_4__default_ = true; + libc_0_2_33_features."default".from_core_foundation_0_4_4__default_ = true; + core_foundation_sys_0_4_4 = core_foundation_sys_0_4_4_ rec { + dependencies = [ libc_0_2_33 ]; + features = mkFeatures core_foundation_sys_0_4_4_features; + }; + core_foundation_sys_0_4_4_features."".self = true; + libc_0_2_33_features."default".from_core_foundation_sys_0_4_4__default_ = true; + crates_io_0_11_0 = crates_io_0_11_0_ rec { + dependencies = [ curl_0_4_8 error_chain_0_11_0 serde_1_0_18 serde_derive_1_0_18 serde_json_1_0_5 url_1_6_0 ]; + }; + curl_0_4_8_features."default".from_crates_io_0_11_0__default_ = true; + error_chain_0_11_0_features."default".from_crates_io_0_11_0__default_ = true; + serde_1_0_18_features."default".from_crates_io_0_11_0__default_ = true; + serde_derive_1_0_18_features."default".from_crates_io_0_11_0__default_ = true; + serde_json_1_0_5_features."default".from_crates_io_0_11_0__default_ = true; + url_1_6_0_features."default".from_crates_io_0_11_0__default_ = true; + crossbeam_0_2_10 = crossbeam_0_2_10_ rec { + features = mkFeatures crossbeam_0_2_10_features; + }; + crossbeam_0_2_10_features."".self = true; + curl_0_4_8 = curl_0_4_8_ rec { + dependencies = [ curl_sys_0_3_15 libc_0_2_33 socket2_0_2_4 ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then [ openssl_probe_0_1_1 openssl_sys_0_9_20 ] else []) + ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []); + }; + curl_sys_0_3_15_features."default".from_curl_0_4_8__default_ = true; + libc_0_2_33_features."default".from_curl_0_4_8__default_ = true; + openssl_probe_0_1_1_features."default".from_curl_0_4_8__default_ = true; + openssl_sys_0_9_20_features."default".from_curl_0_4_8__default_ = true; + socket2_0_2_4_features."default".from_curl_0_4_8__default_ = true; + winapi_0_2_8_features."default".from_curl_0_4_8__default_ = true; + curl_sys_0_3_15 = curl_sys_0_3_15_ rec { + dependencies = [ libc_0_2_33 libz_sys_1_0_18 ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then [ openssl_sys_0_9_20 ] else []) + ++ (if abi == "msvc" then [] else []) + ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []); + buildDependencies = [ cc_1_0_3 pkg_config_0_3_9 ]; + }; + cc_1_0_3_features."default".from_curl_sys_0_3_15__default_ = true; + libc_0_2_33_features."default".from_curl_sys_0_3_15__default_ = true; + libz_sys_1_0_18_features."default".from_curl_sys_0_3_15__default_ = true; + openssl_sys_0_9_20_features."default".from_curl_sys_0_3_15__default_ = true; + pkg_config_0_3_9_features."default".from_curl_sys_0_3_15__default_ = true; + winapi_0_2_8_features."default".from_curl_sys_0_3_15__default_ = true; + dbghelp_sys_0_2_0 = dbghelp_sys_0_2_0_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_dbghelp_sys_0_2_0__default_ = true; + winapi_build_0_1_1_features."default".from_dbghelp_sys_0_2_0__default_ = true; + docopt_0_8_1 = docopt_0_8_1_ rec { + dependencies = [ lazy_static_0_2_9 regex_0_2_2 serde_1_0_18 serde_derive_1_0_18 strsim_0_6_0 ]; + }; + lazy_static_0_2_9_features."default".from_docopt_0_8_1__default_ = true; + regex_0_2_2_features."default".from_docopt_0_8_1__default_ = true; + serde_1_0_18_features."default".from_docopt_0_8_1__default_ = true; + serde_derive_1_0_18_features."default".from_docopt_0_8_1__default_ = true; + strsim_0_6_0_features."default".from_docopt_0_8_1__default_ = true; + dtoa_0_4_2 = dtoa_0_4_2_ rec {}; + env_logger_0_4_3 = env_logger_0_4_3_ rec { + dependencies = [ log_0_3_8 regex_0_2_2 ] + ++ (if lib.lists.any (x: x == "regex") features then [regex_0_2_2] else []); + features = mkFeatures env_logger_0_4_3_features; + }; + env_logger_0_4_3_features."".self = true; + env_logger_0_4_3_features."regex".self_default = hasDefault env_logger_0_4_3_features; + log_0_3_8_features."default".from_env_logger_0_4_3__default_ = true; + regex_0_2_2_features."default".from_env_logger_0_4_3__default_ = true; + error_chain_0_11_0 = error_chain_0_11_0_ rec { + dependencies = [ backtrace_0_3_3 ] + ++ (if lib.lists.any (x: x == "backtrace") features then [backtrace_0_3_3] else []); + features = mkFeatures error_chain_0_11_0_features; + }; + error_chain_0_11_0_features."".self = true; + error_chain_0_11_0_features."backtrace".self_default = hasDefault error_chain_0_11_0_features; + error_chain_0_11_0_features."example_generated".self_default = hasDefault error_chain_0_11_0_features; + backtrace_0_3_3_features."default".from_error_chain_0_11_0__default_ = true; + filetime_0_1_14 = filetime_0_1_14_ rec { + dependencies = [ cfg_if_0_1_2 ] + ++ (if kernel == "redox" then [ redox_syscall_0_1_31 ] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []); + }; + cfg_if_0_1_2_features."default".from_filetime_0_1_14__default_ = true; + libc_0_2_33_features."default".from_filetime_0_1_14__default_ = true; + redox_syscall_0_1_31_features."default".from_filetime_0_1_14__default_ = true; + flate2_0_2_20 = flate2_0_2_20_ rec { + dependencies = [ libc_0_2_33 miniz_sys_0_1_10 ] + ++ (if lib.lists.any (x: x == "miniz-sys") features then [miniz_sys_0_1_10] else []); + features = mkFeatures flate2_0_2_20_features; + }; + flate2_0_2_20_features."".self = true; + flate2_0_2_20_features."miniz-sys".self_default = hasDefault flate2_0_2_20_features; + flate2_0_2_20_features."tokio-io".self_tokio = hasFeature (flate2_0_2_20_features."tokio" or {}); + flate2_0_2_20_features."futures".self_tokio = hasFeature (flate2_0_2_20_features."tokio" or {}); + flate2_0_2_20_features."libz-sys".self_zlib = hasFeature (flate2_0_2_20_features."zlib" or {}); + futures_0_0_0_features."default".from_flate2_0_2_20__default_ = true; + libc_0_2_33_features."default".from_flate2_0_2_20__default_ = true; + libz_sys_0_0_0_features."default".from_flate2_0_2_20__default_ = true; + miniz_sys_0_1_10_features."default".from_flate2_0_2_20__default_ = true; + tokio_io_0_0_0_features."default".from_flate2_0_2_20__default_ = true; + fnv_1_0_5 = fnv_1_0_5_ rec {}; + foreign_types_0_2_0 = foreign_types_0_2_0_ rec {}; + fs2_0_4_2 = fs2_0_4_2_ rec { + dependencies = (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + kernel32_sys_0_2_2_features."default".from_fs2_0_4_2__default_ = true; + libc_0_2_33_features."default".from_fs2_0_4_2__default_ = true; + winapi_0_2_8_features."default".from_fs2_0_4_2__default_ = true; + fuchsia_zircon_0_2_1 = fuchsia_zircon_0_2_1_ rec { + dependencies = [ fuchsia_zircon_sys_0_2_0 ]; + }; + fuchsia_zircon_sys_0_2_0_features."default".from_fuchsia_zircon_0_2_1__default_ = true; + fuchsia_zircon_sys_0_2_0 = fuchsia_zircon_sys_0_2_0_ rec { + dependencies = [ bitflags_0_7_0 ]; + }; + bitflags_0_7_0_features."default".from_fuchsia_zircon_sys_0_2_0__default_ = true; + git2_0_6_8 = git2_0_6_8_ rec { + dependencies = [ bitflags_0_9_1 libc_0_2_33 libgit2_sys_0_6_16 url_1_6_0 ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then [ openssl_probe_0_1_1 openssl_sys_0_9_20 ] + ++ (if lib.lists.any (x: x == "openssl-probe") features then [openssl_probe_0_1_1] else []) + ++ (if lib.lists.any (x: x == "openssl-sys") features then [openssl_sys_0_9_20] else []) else []); + features = mkFeatures git2_0_6_8_features; + }; + git2_0_6_8_features."".self = true; + git2_0_6_8_features."ssh".self_default = hasDefault git2_0_6_8_features; + git2_0_6_8_features."https".self_default = hasDefault git2_0_6_8_features; + git2_0_6_8_features."curl".self_default = hasDefault git2_0_6_8_features; + git2_0_6_8_features."openssl-sys".self_https = hasFeature (git2_0_6_8_features."https" or {}); + git2_0_6_8_features."openssl-probe".self_https = hasFeature (git2_0_6_8_features."https" or {}); + libgit2_sys_0_6_16_features."curl".from_git2_0_6_8__curl = hasFeature (git2_0_6_8_features."curl" or {}); + libgit2_sys_0_6_16_features."https".from_git2_0_6_8__https = hasFeature (git2_0_6_8_features."https" or {}); + libgit2_sys_0_6_16_features."ssh".from_git2_0_6_8__ssh = hasFeature (git2_0_6_8_features."ssh" or {}); + bitflags_0_9_1_features."default".from_git2_0_6_8__default_ = true; + libc_0_2_33_features."default".from_git2_0_6_8__default_ = true; + libgit2_sys_0_6_16_features."default".from_git2_0_6_8__default_ = true; + openssl_probe_0_1_1_features."default".from_git2_0_6_8__default_ = true; + openssl_sys_0_9_20_features."default".from_git2_0_6_8__default_ = true; + url_1_6_0_features."default".from_git2_0_6_8__default_ = true; + git2_curl_0_7_0 = git2_curl_0_7_0_ rec { + dependencies = [ curl_0_4_8 git2_0_6_8 log_0_3_8 url_1_6_0 ]; + }; + curl_0_4_8_features."default".from_git2_curl_0_7_0__default_ = true; + git2_0_6_8_features."default".from_git2_curl_0_7_0__default_ = false; + log_0_3_8_features."default".from_git2_curl_0_7_0__default_ = true; + url_1_6_0_features."default".from_git2_curl_0_7_0__default_ = true; + glob_0_2_11 = glob_0_2_11_ rec {}; + globset_0_2_1 = globset_0_2_1_ rec { + dependencies = [ aho_corasick_0_6_3 fnv_1_0_5 log_0_3_8 memchr_2_0_0 regex_0_2_2 ]; + features = mkFeatures globset_0_2_1_features; + }; + globset_0_2_1_features."".self = true; + regex_0_2_2_features."simd-accel".from_globset_0_2_1__simd-accel = hasFeature (globset_0_2_1_features."simd-accel" or {}); + aho_corasick_0_6_3_features."default".from_globset_0_2_1__default_ = true; + fnv_1_0_5_features."default".from_globset_0_2_1__default_ = true; + log_0_3_8_features."default".from_globset_0_2_1__default_ = true; + memchr_2_0_0_features."default".from_globset_0_2_1__default_ = true; + regex_0_2_2_features."default".from_globset_0_2_1__default_ = true; + hex_0_2_0 = hex_0_2_0_ rec {}; + home_0_3_0 = home_0_3_0_ rec { + dependencies = (if kernel == "windows" then [ advapi32_sys_0_2_0 kernel32_sys_0_2_2 scopeguard_0_1_2 userenv_sys_0_2_0 winapi_0_2_8 ] else []); + }; + advapi32_sys_0_2_0_features."default".from_home_0_3_0__default_ = true; + kernel32_sys_0_2_2_features."default".from_home_0_3_0__default_ = true; + scopeguard_0_1_2_features."default".from_home_0_3_0__default_ = true; + userenv_sys_0_2_0_features."default".from_home_0_3_0__default_ = true; + winapi_0_2_8_features."default".from_home_0_3_0__default_ = true; + idna_0_1_4 = idna_0_1_4_ rec { + dependencies = [ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_5 ]; + }; + matches_0_1_6_features."default".from_idna_0_1_4__default_ = true; + unicode_bidi_0_3_4_features."default".from_idna_0_1_4__default_ = true; + unicode_normalization_0_1_5_features."default".from_idna_0_1_4__default_ = true; + ignore_0_2_2 = ignore_0_2_2_ rec { + dependencies = [ crossbeam_0_2_10 globset_0_2_1 lazy_static_0_2_9 log_0_3_8 memchr_1_0_2 regex_0_2_2 thread_local_0_3_4 walkdir_1_0_7 ]; + features = mkFeatures ignore_0_2_2_features; + }; + ignore_0_2_2_features."".self = true; + globset_0_2_1_features."simd-accel".from_ignore_0_2_2__simd-accel = hasFeature (ignore_0_2_2_features."simd-accel" or {}); + crossbeam_0_2_10_features."default".from_ignore_0_2_2__default_ = true; + globset_0_2_1_features."default".from_ignore_0_2_2__default_ = true; + lazy_static_0_2_9_features."default".from_ignore_0_2_2__default_ = true; + log_0_3_8_features."default".from_ignore_0_2_2__default_ = true; + memchr_1_0_2_features."default".from_ignore_0_2_2__default_ = true; + regex_0_2_2_features."default".from_ignore_0_2_2__default_ = true; + thread_local_0_3_4_features."default".from_ignore_0_2_2__default_ = true; + walkdir_1_0_7_features."default".from_ignore_0_2_2__default_ = true; + itoa_0_3_4 = itoa_0_3_4_ rec { + features = mkFeatures itoa_0_3_4_features; + }; + itoa_0_3_4_features."".self = true; + jobserver_0_1_8 = jobserver_0_1_8_ rec { + dependencies = (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ rand_0_3_18 ] else []); + }; + libc_0_2_33_features."default".from_jobserver_0_1_8__default_ = true; + rand_0_3_18_features."default".from_jobserver_0_1_8__default_ = true; + kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default_ = true; + winapi_build_0_1_1_features."default".from_kernel32_sys_0_2_2__default_ = true; + lazy_static_0_2_9 = lazy_static_0_2_9_ rec { + dependencies = []; + features = mkFeatures lazy_static_0_2_9_features; + }; + lazy_static_0_2_9_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_9_features."spin_no_std" or {}); + lazy_static_0_2_9_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_9_features."spin_no_std" or {}); + spin_0_0_0_features."default".from_lazy_static_0_2_9__default_ = true; + libc_0_2_33 = libc_0_2_33_ rec { + features = mkFeatures libc_0_2_33_features; + }; + libc_0_2_33_features."use_std".self_default = hasDefault libc_0_2_33_features; + libgit2_sys_0_6_16 = libgit2_sys_0_6_16_ rec { + dependencies = [ curl_sys_0_3_15 libc_0_2_33 libssh2_sys_0_2_6 libz_sys_1_0_18 ] + ++ (if lib.lists.any (x: x == "curl-sys") features then [curl_sys_0_3_15] else []) + ++ (if lib.lists.any (x: x == "libssh2-sys") features then [libssh2_sys_0_2_6] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ openssl_sys_0_9_20 ] + ++ (if lib.lists.any (x: x == "openssl-sys") features then [openssl_sys_0_9_20] else []) else []); + buildDependencies = [ cc_1_0_3 cmake_0_1_26 pkg_config_0_3_9 ]; + features = mkFeatures libgit2_sys_0_6_16_features; + }; + libgit2_sys_0_6_16_features."".self = true; + libgit2_sys_0_6_16_features."curl-sys".self_curl = hasFeature (libgit2_sys_0_6_16_features."curl" or {}); + libgit2_sys_0_6_16_features."openssl-sys".self_https = hasFeature (libgit2_sys_0_6_16_features."https" or {}); + libgit2_sys_0_6_16_features."libssh2-sys".self_ssh = hasFeature (libgit2_sys_0_6_16_features."ssh" or {}); + cc_1_0_3_features."default".from_libgit2_sys_0_6_16__default_ = true; + cmake_0_1_26_features."default".from_libgit2_sys_0_6_16__default_ = true; + curl_sys_0_3_15_features."default".from_libgit2_sys_0_6_16__default_ = true; + libc_0_2_33_features."default".from_libgit2_sys_0_6_16__default_ = true; + libssh2_sys_0_2_6_features."default".from_libgit2_sys_0_6_16__default_ = true; + libz_sys_1_0_18_features."default".from_libgit2_sys_0_6_16__default_ = true; + openssl_sys_0_9_20_features."default".from_libgit2_sys_0_6_16__default_ = true; + pkg_config_0_3_9_features."default".from_libgit2_sys_0_6_16__default_ = true; + libssh2_sys_0_2_6 = libssh2_sys_0_2_6_ rec { + dependencies = [ libc_0_2_33 libz_sys_1_0_18 ] + ++ (if (kernel == "linux" || kernel == "darwin") then [ openssl_sys_0_9_20 ] else []); + buildDependencies = [ cmake_0_1_26 pkg_config_0_3_9 ]; + }; + cmake_0_1_26_features."default".from_libssh2_sys_0_2_6__default_ = true; + libc_0_2_33_features."default".from_libssh2_sys_0_2_6__default_ = true; + libz_sys_1_0_18_features."default".from_libssh2_sys_0_2_6__default_ = true; + openssl_sys_0_9_20_features."default".from_libssh2_sys_0_2_6__default_ = true; + pkg_config_0_3_9_features."default".from_libssh2_sys_0_2_6__default_ = true; + libz_sys_1_0_18 = libz_sys_1_0_18_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if abi == "msvc" then [] else []); + buildDependencies = [ cc_1_0_3 pkg_config_0_3_9 ]; + }; + cc_1_0_3_features."default".from_libz_sys_1_0_18__default_ = true; + libc_0_2_33_features."default".from_libz_sys_1_0_18__default_ = true; + pkg_config_0_3_9_features."default".from_libz_sys_1_0_18__default_ = true; + log_0_3_8 = log_0_3_8_ rec { + features = mkFeatures log_0_3_8_features; + }; + log_0_3_8_features."use_std".self_default = hasDefault log_0_3_8_features; + matches_0_1_6 = matches_0_1_6_ rec {}; + memchr_1_0_2 = memchr_1_0_2_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_33] else []); + features = mkFeatures memchr_1_0_2_features; + }; + memchr_1_0_2_features."".self = true; + memchr_1_0_2_features."use_std".self_default = hasDefault memchr_1_0_2_features; + memchr_1_0_2_features."libc".self_default = hasDefault memchr_1_0_2_features; + memchr_1_0_2_features."libc".self_use_std = hasFeature (memchr_1_0_2_features."use_std" or {}); + libc_0_2_33_features."use_std".from_memchr_1_0_2__use_std = hasFeature (memchr_1_0_2_features."use_std" or {}); + libc_0_2_33_features."default".from_memchr_1_0_2__default_ = false; + memchr_2_0_0 = memchr_2_0_0_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_33] else []); + features = mkFeatures memchr_2_0_0_features; + }; + memchr_2_0_0_features."".self = true; + memchr_2_0_0_features."use_std".self_default = hasDefault memchr_2_0_0_features; + memchr_2_0_0_features."libc".self_default = hasDefault memchr_2_0_0_features; + memchr_2_0_0_features."libc".self_use_std = hasFeature (memchr_2_0_0_features."use_std" or {}); + libc_0_2_33_features."use_std".from_memchr_2_0_0__use_std = hasFeature (memchr_2_0_0_features."use_std" or {}); + libc_0_2_33_features."default".from_memchr_2_0_0__default_ = false; + miniz_sys_0_1_10 = miniz_sys_0_1_10_ rec { + dependencies = [ libc_0_2_33 ]; + buildDependencies = [ cc_1_0_3 ]; + }; + cc_1_0_3_features."default".from_miniz_sys_0_1_10__default_ = true; + libc_0_2_33_features."default".from_miniz_sys_0_1_10__default_ = true; + miow_0_2_1 = miow_0_2_1_ rec { + dependencies = [ kernel32_sys_0_2_2 net2_0_2_31 winapi_0_2_8 ws2_32_sys_0_2_1 ]; + }; + kernel32_sys_0_2_2_features."default".from_miow_0_2_1__default_ = true; + net2_0_2_31_features."default".from_miow_0_2_1__default_ = false; + winapi_0_2_8_features."default".from_miow_0_2_1__default_ = true; + ws2_32_sys_0_2_1_features."default".from_miow_0_2_1__default_ = true; + net2_0_2_31 = net2_0_2_31_ rec { + dependencies = [ cfg_if_0_1_2 ] + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ws2_32_sys_0_2_1 ] else []) + ++ (if kernel == "i686-apple-darwin" then [ libc_0_2_33 ] else []) + ++ (if kernel == "i686-unknown-linux-gnu" then [ libc_0_2_33 ] else []) + ++ (if kernel == "x86_64-apple-darwin" then [ libc_0_2_33 ] else []) + ++ (if kernel == "x86_64-unknown-linux-gnu" then [ libc_0_2_33 ] else []); + features = mkFeatures net2_0_2_31_features; + }; + net2_0_2_31_features."duration".self_default = hasDefault net2_0_2_31_features; + cfg_if_0_1_2_features."default".from_net2_0_2_31__default_ = true; + kernel32_sys_0_2_2_features."default".from_net2_0_2_31__default_ = true; + libc_0_2_33_features."default".from_net2_0_2_31__default_ = true; + winapi_0_2_8_features."default".from_net2_0_2_31__default_ = true; + ws2_32_sys_0_2_1_features."default".from_net2_0_2_31__default_ = true; + num_traits_0_1_40 = num_traits_0_1_40_ rec {}; + num_cpus_1_7_0 = num_cpus_1_7_0_ rec { + dependencies = [ libc_0_2_33 ]; + }; + libc_0_2_33_features."default".from_num_cpus_1_7_0__default_ = true; + openssl_0_9_20 = openssl_0_9_20_ rec { + dependencies = [ bitflags_0_9_1 foreign_types_0_2_0 lazy_static_0_2_9 libc_0_2_33 openssl_sys_0_9_20 ]; + features = mkFeatures openssl_0_9_20_features; + }; + openssl_0_9_20_features."".self = true; + bitflags_0_9_1_features."default".from_openssl_0_9_20__default_ = true; + foreign_types_0_2_0_features."default".from_openssl_0_9_20__default_ = true; + lazy_static_0_2_9_features."default".from_openssl_0_9_20__default_ = true; + libc_0_2_33_features."default".from_openssl_0_9_20__default_ = true; + openssl_sys_0_9_20_features."default".from_openssl_0_9_20__default_ = true; + openssl_probe_0_1_1 = openssl_probe_0_1_1_ rec {}; + openssl_sys_0_9_20 = openssl_sys_0_9_20_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if abi == "msvc" then [] else []); + buildDependencies = [ cc_1_0_3 pkg_config_0_3_9 ]; + }; + cc_1_0_3_features."default".from_openssl_sys_0_9_20__default_ = true; + libc_0_2_33_features."default".from_openssl_sys_0_9_20__default_ = true; + pkg_config_0_3_9_features."default".from_openssl_sys_0_9_20__default_ = true; + percent_encoding_1_0_0 = percent_encoding_1_0_0_ rec {}; + pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; + psapi_sys_0_1_0 = psapi_sys_0_1_0_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_psapi_sys_0_1_0__default_ = true; + winapi_build_0_1_1_features."default".from_psapi_sys_0_1_0__default_ = true; + quote_0_3_15 = quote_0_3_15_ rec {}; + rand_0_3_18 = rand_0_3_18_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if kernel == "fuchsia" then [ fuchsia_zircon_0_2_1 ] else []); + features = mkFeatures rand_0_3_18_features; + }; + rand_0_3_18_features."i128_support".self_nightly = hasFeature (rand_0_3_18_features."nightly" or {}); + fuchsia_zircon_0_2_1_features."default".from_rand_0_3_18__default_ = true; + libc_0_2_33_features."default".from_rand_0_3_18__default_ = true; + redox_syscall_0_1_31 = redox_syscall_0_1_31_ rec {}; + redox_termios_0_1_1 = redox_termios_0_1_1_ rec { + dependencies = [ redox_syscall_0_1_31 ]; + }; + redox_syscall_0_1_31_features."default".from_redox_termios_0_1_1__default_ = true; + regex_0_2_2 = regex_0_2_2_ rec { + dependencies = [ aho_corasick_0_6_3 memchr_1_0_2 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]; + features = mkFeatures regex_0_2_2_features; + }; + regex_0_2_2_features."simd".self_simd-accel = hasFeature (regex_0_2_2_features."simd-accel" or {}); + aho_corasick_0_6_3_features."default".from_regex_0_2_2__default_ = true; + memchr_1_0_2_features."default".from_regex_0_2_2__default_ = true; + regex_syntax_0_4_1_features."default".from_regex_0_2_2__default_ = true; + simd_0_0_0_features."default".from_regex_0_2_2__default_ = true; + thread_local_0_3_4_features."default".from_regex_0_2_2__default_ = true; + utf8_ranges_1_0_0_features."default".from_regex_0_2_2__default_ = true; + regex_syntax_0_4_1 = regex_syntax_0_4_1_ rec {}; + rustc_demangle_0_1_5 = rustc_demangle_0_1_5_ rec {}; + same_file_0_1_3 = same_file_0_1_3_ rec { + dependencies = (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + kernel32_sys_0_2_2_features."default".from_same_file_0_1_3__default_ = true; + winapi_0_2_8_features."default".from_same_file_0_1_3__default_ = true; + scoped_tls_0_1_0 = scoped_tls_0_1_0_ rec {}; + scopeguard_0_1_2 = scopeguard_0_1_2_ rec {}; + semver_0_7_0 = semver_0_7_0_ rec { + dependencies = [ semver_parser_0_7_0 serde_1_0_18 ] + ++ (if lib.lists.any (x: x == "serde") features then [serde_1_0_18] else []); + features = mkFeatures semver_0_7_0_features; + }; + semver_0_7_0_features."".self = true; + semver_0_7_0_features."serde".self_ci = hasFeature (semver_0_7_0_features."ci" or {}); + semver_parser_0_7_0_features."default".from_semver_0_7_0__default_ = true; + serde_1_0_18_features."default".from_semver_0_7_0__default_ = true; + semver_parser_0_7_0 = semver_parser_0_7_0_ rec {}; + serde_1_0_18 = serde_1_0_18_ rec { + dependencies = []; + features = mkFeatures serde_1_0_18_features; + }; + serde_1_0_18_features."unstable".self_alloc = hasFeature (serde_1_0_18_features."alloc" or {}); + serde_1_0_18_features."std".self_default = hasDefault serde_1_0_18_features; + serde_1_0_18_features."serde_derive".self_derive = hasFeature (serde_1_0_18_features."derive" or {}); + serde_1_0_18_features."serde_derive".self_playground = hasFeature (serde_1_0_18_features."playground" or {}); + serde_derive_0_0_0_features."default".from_serde_1_0_18__default_ = true; + serde_derive_1_0_18 = serde_derive_1_0_18_ rec { + dependencies = [ quote_0_3_15 serde_derive_internals_0_16_0 syn_0_11_11 ]; + }; + syn_0_11_11_features."visit".from_serde_derive_1_0_18 = true; + quote_0_3_15_features."default".from_serde_derive_1_0_18__default_ = true; + serde_derive_internals_0_16_0_features."default".from_serde_derive_1_0_18__default_ = false; + syn_0_11_11_features."default".from_serde_derive_1_0_18__default_ = true; + serde_derive_internals_0_16_0 = serde_derive_internals_0_16_0_ rec { + dependencies = [ syn_0_11_11 synom_0_11_3 ]; + }; + syn_0_11_11_features."parsing".from_serde_derive_internals_0_16_0 = true; + syn_0_11_11_features."default".from_serde_derive_internals_0_16_0__default_ = false; + synom_0_11_3_features."default".from_serde_derive_internals_0_16_0__default_ = true; + serde_ignored_0_0_3 = serde_ignored_0_0_3_ rec { + dependencies = [ serde_1_0_18 ]; + }; + serde_1_0_18_features."default".from_serde_ignored_0_0_3__default_ = true; + serde_json_1_0_5 = serde_json_1_0_5_ rec { + dependencies = [ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_1_0_18 ]; + features = mkFeatures serde_json_1_0_5_features; + }; + serde_json_1_0_5_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_1_0_5_features."preserve_order" or {}); + dtoa_0_4_2_features."default".from_serde_json_1_0_5__default_ = true; + itoa_0_3_4_features."default".from_serde_json_1_0_5__default_ = true; + linked_hash_map_0_0_0_features."default".from_serde_json_1_0_5__default_ = true; + num_traits_0_1_40_features."default".from_serde_json_1_0_5__default_ = true; + serde_1_0_18_features."default".from_serde_json_1_0_5__default_ = true; + shell_escape_0_1_3 = shell_escape_0_1_3_ rec {}; + socket2_0_2_4 = socket2_0_2_4_ rec { + dependencies = (if (kernel == "linux" || kernel == "darwin") then [ cfg_if_0_1_2 libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ws2_32_sys_0_2_1 ] else []); + features = mkFeatures socket2_0_2_4_features; + }; + socket2_0_2_4_features."".self = true; + cfg_if_0_1_2_features."default".from_socket2_0_2_4__default_ = true; + kernel32_sys_0_2_2_features."default".from_socket2_0_2_4__default_ = true; + libc_0_2_33_features."default".from_socket2_0_2_4__default_ = true; + winapi_0_2_8_features."default".from_socket2_0_2_4__default_ = true; + ws2_32_sys_0_2_1_features."default".from_socket2_0_2_4__default_ = true; + strsim_0_6_0 = strsim_0_6_0_ rec {}; + syn_0_11_11 = syn_0_11_11_ rec { + dependencies = [ quote_0_3_15 synom_0_11_3 unicode_xid_0_0_4 ] + ++ (if lib.lists.any (x: x == "quote") features then [quote_0_3_15] else []) + ++ (if lib.lists.any (x: x == "synom") features then [synom_0_11_3] else []) + ++ (if lib.lists.any (x: x == "unicode-xid") features then [unicode_xid_0_0_4] else []); + features = mkFeatures syn_0_11_11_features; + }; + syn_0_11_11_features."".self = true; + syn_0_11_11_features."parsing".self_default = hasDefault syn_0_11_11_features; + syn_0_11_11_features."printing".self_default = hasDefault syn_0_11_11_features; + syn_0_11_11_features."unicode-xid".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {}); + syn_0_11_11_features."synom".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {}); + syn_0_11_11_features."quote".self_printing = hasFeature (syn_0_11_11_features."printing" or {}); + quote_0_3_15_features."default".from_syn_0_11_11__default_ = true; + synom_0_11_3_features."default".from_syn_0_11_11__default_ = true; + unicode_xid_0_0_4_features."default".from_syn_0_11_11__default_ = true; + synom_0_11_3 = synom_0_11_3_ rec { + dependencies = [ unicode_xid_0_0_4 ]; + }; + unicode_xid_0_0_4_features."default".from_synom_0_11_3__default_ = true; + tar_0_4_13 = tar_0_4_13_ rec { + dependencies = [ filetime_0_1_14 libc_0_2_33 ] + ++ (if (kernel == "linux" || kernel == "darwin") then [] else []); + }; + tar_0_4_13_features."xattr".self_default = hasDefault tar_0_4_13_features; + filetime_0_1_14_features."default".from_tar_0_4_13__default_ = true; + libc_0_2_33_features."default".from_tar_0_4_13__default_ = true; + xattr_0_0_0_features."default".from_tar_0_4_13__default_ = true; + tempdir_0_3_5 = tempdir_0_3_5_ rec { + dependencies = [ rand_0_3_18 ]; + }; + rand_0_3_18_features."default".from_tempdir_0_3_5__default_ = true; + termcolor_0_3_3 = termcolor_0_3_3_ rec { + dependencies = (if kernel == "windows" then [ wincolor_0_1_4 ] else []); + }; + wincolor_0_1_4_features."default".from_termcolor_0_3_3__default_ = true; + termion_1_5_1 = termion_1_5_1_ rec { + dependencies = (if !(kernel == "redox") then [ libc_0_2_33 ] else []) + ++ (if kernel == "redox" then [ redox_syscall_0_1_31 redox_termios_0_1_1 ] else []); + }; + libc_0_2_33_features."default".from_termion_1_5_1__default_ = true; + redox_syscall_0_1_31_features."default".from_termion_1_5_1__default_ = true; + redox_termios_0_1_1_features."default".from_termion_1_5_1__default_ = true; + thread_local_0_3_4 = thread_local_0_3_4_ rec { + dependencies = [ lazy_static_0_2_9 unreachable_1_0_0 ]; + }; + lazy_static_0_2_9_features."default".from_thread_local_0_3_4__default_ = true; + unreachable_1_0_0_features."default".from_thread_local_0_3_4__default_ = true; + toml_0_4_5 = toml_0_4_5_ rec { + dependencies = [ serde_1_0_18 ]; + }; + serde_1_0_18_features."default".from_toml_0_4_5__default_ = true; + unicode_bidi_0_3_4 = unicode_bidi_0_3_4_ rec { + dependencies = [ matches_0_1_6 ]; + features = mkFeatures unicode_bidi_0_3_4_features; + }; + unicode_bidi_0_3_4_features."flame".self_flame_it = hasFeature (unicode_bidi_0_3_4_features."flame_it" or {}); + unicode_bidi_0_3_4_features."flamer".self_flame_it = hasFeature (unicode_bidi_0_3_4_features."flame_it" or {}); + unicode_bidi_0_3_4_features."serde".self_with_serde = hasFeature (unicode_bidi_0_3_4_features."with_serde" or {}); + serde_0_0_0_features."derive".from_unicode_bidi_0_3_4 = true; + flame_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true; + flamer_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true; + matches_0_1_6_features."default".from_unicode_bidi_0_3_4__default_ = true; + serde_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true; + unicode_normalization_0_1_5 = unicode_normalization_0_1_5_ rec {}; + unicode_xid_0_0_4 = unicode_xid_0_0_4_ rec { + features = mkFeatures unicode_xid_0_0_4_features; + }; + unicode_xid_0_0_4_features."".self = true; + unreachable_1_0_0 = unreachable_1_0_0_ rec { + dependencies = [ void_1_0_2 ]; + }; + void_1_0_2_features."default".from_unreachable_1_0_0__default_ = false; + url_1_6_0 = url_1_6_0_ rec { + dependencies = [ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_0 ]; + features = mkFeatures url_1_6_0_features; + }; + url_1_6_0_features."heapsize".self_heap_size = hasFeature (url_1_6_0_features."heap_size" or {}); + url_1_6_0_features."encoding".self_query_encoding = hasFeature (url_1_6_0_features."query_encoding" or {}); + encoding_0_0_0_features."default".from_url_1_6_0__default_ = true; + heapsize_0_0_0_features."default".from_url_1_6_0__default_ = true; + idna_0_1_4_features."default".from_url_1_6_0__default_ = true; + matches_0_1_6_features."default".from_url_1_6_0__default_ = true; + percent_encoding_1_0_0_features."default".from_url_1_6_0__default_ = true; + rustc_serialize_0_0_0_features."default".from_url_1_6_0__default_ = true; + serde_0_0_0_features."default".from_url_1_6_0__default_ = true; + userenv_sys_0_2_0 = userenv_sys_0_2_0_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_userenv_sys_0_2_0__default_ = true; + winapi_build_0_1_1_features."default".from_userenv_sys_0_2_0__default_ = true; + utf8_ranges_1_0_0 = utf8_ranges_1_0_0_ rec {}; + vcpkg_0_2_2 = vcpkg_0_2_2_ rec {}; + void_1_0_2 = void_1_0_2_ rec { + features = mkFeatures void_1_0_2_features; + }; + void_1_0_2_features."std".self_default = hasDefault void_1_0_2_features; + walkdir_1_0_7 = walkdir_1_0_7_ rec { + dependencies = [ same_file_0_1_3 ] + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + kernel32_sys_0_2_2_features."default".from_walkdir_1_0_7__default_ = true; + same_file_0_1_3_features."default".from_walkdir_1_0_7__default_ = true; + winapi_0_2_8_features."default".from_walkdir_1_0_7__default_ = true; + winapi_0_2_8 = winapi_0_2_8_ rec {}; + winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; + wincolor_0_1_4 = wincolor_0_1_4_ rec { + dependencies = [ kernel32_sys_0_2_2 winapi_0_2_8 ]; + }; + kernel32_sys_0_2_2_features."default".from_wincolor_0_1_4__default_ = true; + winapi_0_2_8_features."default".from_wincolor_0_1_4__default_ = true; + ws2_32_sys_0_2_1 = ws2_32_sys_0_2_1_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_ws2_32_sys_0_2_1__default_ = true; + winapi_build_0_1_1_features."default".from_ws2_32_sys_0_2_1__default_ = true; +} diff --git a/pkgs/build-support/rust/cargo-vendor/default.nix b/pkgs/build-support/rust/cargo-vendor/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..faeb6e03743c4a250c542d5d349d4773f36e7c01 --- /dev/null +++ b/pkgs/build-support/rust/cargo-vendor/default.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchFromGitHub }: + +(callPackage ./cargo-vendor.nix {}).cargo_vendor_0_1_13.overrideAttrs (attrs: { + src = fetchFromGitHub { + owner = "alexcrichton"; + repo = "cargo-vendor"; + rev = "0.1.13"; + sha256 = "0ljh2d65zpxp26a95b3czy5ai2z2dm87x7ndfdc1s0v1fsy69kn4"; + }; +}) diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix new file mode 100644 index 0000000000000000000000000000000000000000..5b79d607f9d5d38e65cdf5d9c8c2a79a6447b0b1 --- /dev/null +++ b/pkgs/build-support/rust/carnix.nix @@ -0,0 +1,1450 @@ +# Generated by carnix 0.7.2: carnix nix +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); +in +rec { + carnix = f: carnix_0_7_2 { features = carnix_0_7_2_features { carnix_0_7_2 = f; }; }; + __all = [ (carnix {}) ]; + aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.4"; + authors = [ "Andrew Gallant " ]; + sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; } ]; + inherit dependencies buildDependencies features; + }; + ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.11.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; + sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; + inherit dependencies buildDependencies features; + }; + atty_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.8"; + authors = [ "softprops " ]; + sha256 = "03w1q3h4w7vhcdxdwa9cirjkzdjz3ja636fj3g64659z6yax6p6d"; + inherit dependencies buildDependencies features; + }; + backtrace_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.6"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "00p77iqrv2p47m4y5lq1clb8fi1xfmnz2520frqx88497ff4zhrx"; + inherit dependencies buildDependencies features; + }; + backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.16"; + authors = [ "Alex Crichton " ]; + sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; + inherit dependencies buildDependencies features; + }; + carnix_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "carnix"; + version = "0.7.2"; + authors = [ "pe@pijul.org " ]; + sha256 = "0zsmc4wiz7vill676mcdh6ibyzmr9rn030j555ncqgavs7k5yhq5"; + crateBin = [ { name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; } { name = "carnix"; path = "src/main.rs"; } ]; + inherit dependencies buildDependencies features; + }; + cc_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.10"; + authors = [ "Alex Crichton " ]; + sha256 = "0fqchrxcrd2j2b9x7cqs49ck7b3ilsap8s9xhs75gzgl6c1ylpdn"; + inherit dependencies buildDependencies features; + }; + cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; + inherit dependencies buildDependencies features; + }; + clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.31.2"; + authors = [ "Kevin K. " ]; + sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72"; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; + inherit dependencies buildDependencies features; + }; + either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "either"; + version = "1.5.0"; + authors = [ "bluss" ]; + sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; + inherit dependencies buildDependencies features; + }; + env_logger_0_5_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "env_logger"; + version = "0.5.7"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0wgd9fashmwbx5ssrxx69naam6hlb5c7qmh1nln645q4gms35i2l"; + inherit dependencies buildDependencies features; + }; + error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.11.0"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.3"; + authors = [ "Raph Levien " ]; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.3"; + authors = [ "Raph Levien " ]; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; + inherit dependencies buildDependencies features; + }; + humantime_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "humantime"; + version = "1.1.1"; + authors = [ "Paul Colomiets " ]; + sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + itertools_0_7_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itertools"; + version = "0.7.8"; + authors = [ "bluss" ]; + sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357"; + inherit dependencies buildDependencies features; + }; + itoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.4.1"; + authors = [ "David Tolnay " ]; + sha256 = "1jyrsmrm5q4r2ipmq5hvvkqg0mgnlbk44lm7gr0v9ymvbrh2gbij"; + inherit dependencies buildDependencies features; + }; + lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "1.0.0"; + authors = [ "Marvin Löbel " ]; + sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; + inherit dependencies buildDependencies features; + }; + libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83"; + inherit dependencies buildDependencies features; + }; + libsqlite3_sys_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libsqlite3-sys"; + version = "0.9.1"; + authors = [ "John Gallagher " ]; + sha256 = "1j599xygsh564xmx29942w0sq7w05c1jipk6dsyrxj6b33kw3fw7"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + linked_hash_map_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "linked-hash-map"; + version = "0.4.2"; + authors = [ "Stepan Koltsov " "Andrew Paseltiner " ]; + sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl"; + inherit dependencies buildDependencies features; + }; + log_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.4.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "01vm8yy3wngvyj6qp1x3xpcb4xq7v67yn9l7fsma8kz28mliz90d"; + inherit dependencies buildDependencies features; + }; + lru_cache_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lru-cache"; + version = "0.1.1"; + authors = [ "Stepan Koltsov " ]; + sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw"; + inherit dependencies buildDependencies features; + }; + memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "1.0.2"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; + inherit dependencies buildDependencies features; + }; + memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "2.0.1"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; + inherit dependencies buildDependencies features; + }; + nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nom"; + version = "3.2.1"; + authors = [ "contact@geoffroycouprie.com" ]; + sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; + inherit dependencies buildDependencies features; + }; + num_traits_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.2.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1gcqhcd27gi72al5salxlp3m374qr3xnc3zh249f7dsrxc9rmgh0"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + proc_macro2_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "proc-macro2"; + version = "0.3.6"; + authors = [ "Alex Crichton " ]; + sha256 = "1viqlvsknzvgc2j0bcz53n94zxv7c816py7hv2r27y0bv1dq4iqp"; + inherit dependencies buildDependencies features; + }; + quick_error_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quick-error"; + version = "1.2.1"; + authors = [ "Paul Colomiets " "Colin Kiegel " ]; + sha256 = "0vq41csw68ynaq2fy5dvldh4lx7pnbw6pr332kv5rvrz4pz0jnq6"; + inherit dependencies buildDependencies features; + }; + quote_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quote"; + version = "0.5.1"; + authors = [ "David Tolnay " ]; + sha256 = "0jppgddqp6vp67ns4hpyf644n5678fligp711isp0xkvfv19la3r"; + inherit dependencies buildDependencies features; + }; + rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.4.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; + inherit dependencies buildDependencies features; + }; + redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.37"; + authors = [ "Jeremy Soller " ]; + sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v"; + libName = "syscall"; + inherit dependencies buildDependencies features; + }; + redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + regex_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "0.2.10"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0cwdmcllssm984b5nnpr55rgla1yzw31kmp2imxdpgk6hvlhf1ca"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_5_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.5.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1m5v66r6xxglgkdl1ci23qq0bl0k2wqplm6li4pmg1k7szvgxcbp"; + inherit dependencies buildDependencies features; + }; + remove_dir_all_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "remove_dir_all"; + version = "0.5.0"; + authors = [ "Aaronepower " ]; + sha256 = "0cgmlm9xvf19z84zcb7d62c2lfv60g6gd58c9717giq7c9ib284y"; + inherit dependencies buildDependencies features; + }; + rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rusqlite"; + version = "0.13.0"; + authors = [ "John Gallagher " ]; + sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc"; + inherit dependencies buildDependencies features; + }; + rustc_demangle_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.7"; + authors = [ "Alex Crichton " ]; + sha256 = "0wrln6jvwmqrhyvqlw5vq9a2s4r04ja8mrybxjj9aaaar1fyvns6"; + inherit dependencies buildDependencies features; + }; + serde_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "1.0.38"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "0dri7vmzjsfmak1qq5wdinykqqvd5shpms504p8acpgyx7817jgk"; + inherit dependencies buildDependencies features; + }; + serde_derive_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.38"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "027c13sbnqkfzc8vxx0m6wnkr68im8kdbkbnix07dgw1l616yw0m"; + procMacro = true; + inherit dependencies buildDependencies features; + }; + serde_derive_internals_0_23_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive_internals"; + version = "0.23.1"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "0bjgcn2irh6sd34q3j3xkbn5ghfgiv3cfdlffb31lh0bikwpk1b4"; + inherit dependencies buildDependencies features; + }; + serde_json_1_0_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.14"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "053n2vbcx32f28pr8fxi0fxq7m3g0gm94kz9i1fmi1kiwq9j5lsj"; + inherit dependencies buildDependencies features; + }; + strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.7.0"; + authors = [ "Danny Guo " ]; + sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; + inherit dependencies buildDependencies features; + }; + syn_0_13_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "syn"; + version = "0.13.1"; + authors = [ "David Tolnay " ]; + sha256 = "1pimp7fpvillhz06xz0k6450h9nis3ab6h1j2hzrzykrpxs2qnyg"; + inherit dependencies buildDependencies features; + }; + tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.7"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; + inherit dependencies buildDependencies features; + }; + termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termcolor"; + version = "0.3.6"; + authors = [ "Andrew Gallant " ]; + sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z"; + inherit dependencies buildDependencies features; + }; + termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + inherit dependencies buildDependencies features; + }; + textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "textwrap"; + version = "0.9.0"; + authors = [ "Martin Geisler " ]; + sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; + inherit dependencies buildDependencies features; + }; + thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.5"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; + inherit dependencies buildDependencies features; + }; + time_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "time"; + version = "0.1.39"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1ryy3bwhvyzj6fym123il38mk9ranm4vradj2a47l5ij8jd7w5if"; + inherit dependencies buildDependencies features; + }; + toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.4.6"; + authors = [ "Alex Crichton " ]; + sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v"; + inherit dependencies buildDependencies features; + }; + ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.1.0"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; + inherit dependencies buildDependencies features; + }; + unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + authors = [ "Jonathan Reem " ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; + inherit dependencies buildDependencies features; + }; + vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.3"; + authors = [ "Jim McGrath " ]; + sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c"; + inherit dependencies buildDependencies features; + }; + vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.3.4"; + authors = [ "Peter Atashian " ]; + sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian " ]; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wincolor"; + version = "0.1.6"; + authors = [ "Andrew Gallant " ]; + sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47"; + inherit dependencies buildDependencies features; + }; + aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ { + dependencies = mapFeatures features ([ memchr_2_0_1 ]); + }; + aho_corasick_0_6_4_features = f: updateFeatures f (rec { + aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true); + memchr_2_0_1.default = true; + }) [ memchr_2_0_1_features ]; + ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + }; + ansi_term_0_11_0_features = f: updateFeatures f (rec { + ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); + winapi_0_3_4.consoleapi = true; + winapi_0_3_4.default = true; + winapi_0_3_4.errhandlingapi = true; + winapi_0_3_4.processenv = true; + }) [ winapi_0_3_4_features ]; + atty_0_2_8 = { features?(atty_0_2_8_features {}) }: atty_0_2_8_ { + dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + }; + atty_0_2_8_features = f: updateFeatures f (rec { + atty_0_2_8.default = (f.atty_0_2_8.default or true); + libc_0_2_40.default = (f.libc_0_2_40.default or false); + termion_1_5_1.default = true; + winapi_0_3_4.consoleapi = true; + winapi_0_3_4.default = true; + winapi_0_3_4.minwinbase = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.processenv = true; + winapi_0_3_4.winbase = true; + }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ]; + backtrace_0_3_6 = { features?(backtrace_0_3_6_features {}) }: backtrace_0_3_6_ { + dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_7 ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] + ++ (if features.backtrace_0_3_6.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ ] + ++ (if features.backtrace_0_3_6.winapi or false then [ winapi_0_3_4 ] else [])) else []); + features = mkFeatures (features.backtrace_0_3_6 or {}); + }; + backtrace_0_3_6_features = f: updateFeatures f (rec { + backtrace_0_3_6.addr2line = + (f.backtrace_0_3_6.addr2line or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.backtrace-sys = + (f.backtrace_0_3_6.backtrace-sys or false) || + (f.backtrace_0_3_6.libbacktrace or false) || + (backtrace_0_3_6.libbacktrace or false); + backtrace_0_3_6.coresymbolication = + (f.backtrace_0_3_6.coresymbolication or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.dbghelp = + (f.backtrace_0_3_6.dbghelp or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.default = (f.backtrace_0_3_6.default or true); + backtrace_0_3_6.dladdr = + (f.backtrace_0_3_6.dladdr or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.findshlibs = + (f.backtrace_0_3_6.findshlibs or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.gimli = + (f.backtrace_0_3_6.gimli or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.libbacktrace = + (f.backtrace_0_3_6.libbacktrace or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.libunwind = + (f.backtrace_0_3_6.libunwind or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.memmap = + (f.backtrace_0_3_6.memmap or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.object = + (f.backtrace_0_3_6.object or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.rustc-serialize = + (f.backtrace_0_3_6.rustc-serialize or false) || + (f.backtrace_0_3_6.serialize-rustc or false) || + (backtrace_0_3_6.serialize-rustc or false); + backtrace_0_3_6.serde = + (f.backtrace_0_3_6.serde or false) || + (f.backtrace_0_3_6.serialize-serde or false) || + (backtrace_0_3_6.serialize-serde or false); + backtrace_0_3_6.serde_derive = + (f.backtrace_0_3_6.serde_derive or false) || + (f.backtrace_0_3_6.serialize-serde or false) || + (backtrace_0_3_6.serialize-serde or false); + backtrace_0_3_6.winapi = + (f.backtrace_0_3_6.winapi or false) || + (f.backtrace_0_3_6.dbghelp or false) || + (backtrace_0_3_6.dbghelp or false); + backtrace_sys_0_1_16.default = true; + cfg_if_0_1_2.default = true; + libc_0_2_40.default = true; + rustc_demangle_0_1_7.default = true; + winapi_0_3_4.dbghelp = true; + winapi_0_3_4.default = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.processthreadsapi = true; + winapi_0_3_4.std = true; + winapi_0_3_4.winnt = true; + }) [ cfg_if_0_1_2_features rustc_demangle_0_1_7_features backtrace_sys_0_1_16_features libc_0_2_40_features winapi_0_3_4_features ]; + backtrace_sys_0_1_16 = { features?(backtrace_sys_0_1_16_features {}) }: backtrace_sys_0_1_16_ { + dependencies = mapFeatures features ([ libc_0_2_40 ]); + buildDependencies = mapFeatures features ([ cc_1_0_10 ]); + }; + backtrace_sys_0_1_16_features = f: updateFeatures f (rec { + backtrace_sys_0_1_16.default = (f.backtrace_sys_0_1_16.default or true); + cc_1_0_10.default = true; + libc_0_2_40.default = true; + }) [ libc_0_2_40_features cc_1_0_10_features ]; + bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ { + features = mkFeatures (features.bitflags_1_0_1 or {}); + }; + bitflags_1_0_1_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = (f.bitflags_1_0_1.default or true); + bitflags_1_0_1.example_generated = + (f.bitflags_1_0_1.example_generated or false) || + (f.bitflags_1_0_1.default or false) || + (bitflags_1_0_1.default or false); + }) []; + carnix_0_7_2 = { features?(carnix_0_7_2_features {}) }: carnix_0_7_2_ { + dependencies = mapFeatures features ([ clap_2_31_2 env_logger_0_5_7 error_chain_0_11_0 itertools_0_7_8 log_0_4_1 nom_3_2_1 regex_0_2_10 rusqlite_0_13_0 serde_1_0_38 serde_derive_1_0_38 serde_json_1_0_14 tempdir_0_3_7 toml_0_4_6 ]); + }; + carnix_0_7_2_features = f: updateFeatures f (rec { + carnix_0_7_2.default = (f.carnix_0_7_2.default or true); + clap_2_31_2.default = true; + env_logger_0_5_7.default = true; + error_chain_0_11_0.default = true; + itertools_0_7_8.default = true; + log_0_4_1.default = true; + nom_3_2_1.default = true; + regex_0_2_10.default = true; + rusqlite_0_13_0.default = true; + serde_1_0_38.default = true; + serde_derive_1_0_38.default = true; + serde_json_1_0_14.default = true; + tempdir_0_3_7.default = true; + toml_0_4_6.default = true; + }) [ clap_2_31_2_features env_logger_0_5_7_features error_chain_0_11_0_features itertools_0_7_8_features log_0_4_1_features nom_3_2_1_features regex_0_2_10_features rusqlite_0_13_0_features serde_1_0_38_features serde_derive_1_0_38_features serde_json_1_0_14_features tempdir_0_3_7_features toml_0_4_6_features ]; + cc_1_0_10 = { features?(cc_1_0_10_features {}) }: cc_1_0_10_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.cc_1_0_10 or {}); + }; + cc_1_0_10_features = f: updateFeatures f (rec { + cc_1_0_10.default = (f.cc_1_0_10.default or true); + cc_1_0_10.rayon = + (f.cc_1_0_10.rayon or false) || + (f.cc_1_0_10.parallel or false) || + (cc_1_0_10.parallel or false); + }) []; + cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; + cfg_if_0_1_2_features = f: updateFeatures f (rec { + cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); + }) []; + clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 textwrap_0_9_0 unicode_width_0_1_4 ] + ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_8 ] else []) + ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else []) + ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_0 ] else [])) + ++ (if !(kernel == "windows") then mapFeatures features ([ ] + ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []); + features = mkFeatures (features.clap_2_31_2 or {}); + }; + clap_2_31_2_features = f: updateFeatures f (rec { + ansi_term_0_11_0.default = true; + atty_0_2_8.default = true; + bitflags_1_0_1.default = true; + clap_2_31_2.ansi_term = + (f.clap_2_31_2.ansi_term or false) || + (f.clap_2_31_2.color or false) || + (clap_2_31_2.color or false); + clap_2_31_2.atty = + (f.clap_2_31_2.atty or false) || + (f.clap_2_31_2.color or false) || + (clap_2_31_2.color or false); + clap_2_31_2.clippy = + (f.clap_2_31_2.clippy or false) || + (f.clap_2_31_2.lints or false) || + (clap_2_31_2.lints or false); + clap_2_31_2.color = + (f.clap_2_31_2.color or false) || + (f.clap_2_31_2.default or false) || + (clap_2_31_2.default or false); + clap_2_31_2.default = (f.clap_2_31_2.default or true); + clap_2_31_2.strsim = + (f.clap_2_31_2.strsim or false) || + (f.clap_2_31_2.suggestions or false) || + (clap_2_31_2.suggestions or false); + clap_2_31_2.suggestions = + (f.clap_2_31_2.suggestions or false) || + (f.clap_2_31_2.default or false) || + (clap_2_31_2.default or false); + clap_2_31_2.term_size = + (f.clap_2_31_2.term_size or false) || + (f.clap_2_31_2.wrap_help or false) || + (clap_2_31_2.wrap_help or false); + clap_2_31_2.vec_map = + (f.clap_2_31_2.vec_map or false) || + (f.clap_2_31_2.default or false) || + (clap_2_31_2.default or false); + clap_2_31_2.yaml = + (f.clap_2_31_2.yaml or false) || + (f.clap_2_31_2.doc or false) || + (clap_2_31_2.doc or false); + clap_2_31_2.yaml-rust = + (f.clap_2_31_2.yaml-rust or false) || + (f.clap_2_31_2.yaml or false) || + (clap_2_31_2.yaml or false); + strsim_0_7_0.default = true; + textwrap_0_9_0.default = true; + textwrap_0_9_0.term_size = + (f.textwrap_0_9_0.term_size or false) || + (clap_2_31_2.wrap_help or false) || + (f.clap_2_31_2.wrap_help or false); + unicode_width_0_1_4.default = true; + vec_map_0_8_0.default = true; + }) [ atty_0_2_8_features bitflags_1_0_1_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ansi_term_0_11_0_features ]; + dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; + dtoa_0_4_2_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); + }) []; + either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.either_1_5_0 or {}); + }; + either_1_5_0_features = f: updateFeatures f (rec { + either_1_5_0.default = (f.either_1_5_0.default or true); + either_1_5_0.use_std = + (f.either_1_5_0.use_std or false) || + (f.either_1_5_0.default or false) || + (either_1_5_0.default or false); + }) []; + env_logger_0_5_7 = { features?(env_logger_0_5_7_features {}) }: env_logger_0_5_7_ { + dependencies = mapFeatures features ([ atty_0_2_8 humantime_1_1_1 log_0_4_1 termcolor_0_3_6 ] + ++ (if features.env_logger_0_5_7.regex or false then [ regex_0_2_10 ] else [])); + features = mkFeatures (features.env_logger_0_5_7 or {}); + }; + env_logger_0_5_7_features = f: updateFeatures f (rec { + atty_0_2_8.default = true; + env_logger_0_5_7.default = (f.env_logger_0_5_7.default or true); + env_logger_0_5_7.regex = + (f.env_logger_0_5_7.regex or false) || + (f.env_logger_0_5_7.default or false) || + (env_logger_0_5_7.default or false); + humantime_1_1_1.default = true; + log_0_4_1.default = true; + log_0_4_1.std = true; + regex_0_2_10.default = true; + termcolor_0_3_6.default = true; + }) [ atty_0_2_8_features humantime_1_1_1_features log_0_4_1_features regex_0_2_10_features termcolor_0_3_6_features ]; + error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ { + dependencies = mapFeatures features ([ ] + ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_6 ] else [])); + features = mkFeatures (features.error_chain_0_11_0 or {}); + }; + error_chain_0_11_0_features = f: updateFeatures f (rec { + backtrace_0_3_6.default = true; + error_chain_0_11_0.backtrace = + (f.error_chain_0_11_0.backtrace or false) || + (f.error_chain_0_11_0.default or false) || + (error_chain_0_11_0.default or false); + error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true); + error_chain_0_11_0.example_generated = + (f.error_chain_0_11_0.example_generated or false) || + (f.error_chain_0_11_0.default or false) || + (error_chain_0_11_0.default or false); + }) [ backtrace_0_3_6_features ]; + fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_3 ]); + }; + fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); + fuchsia_zircon_sys_0_3_3.default = true; + }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_3_features ]; + fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; + fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); + }) []; + humantime_1_1_1 = { features?(humantime_1_1_1_features {}) }: humantime_1_1_1_ { + dependencies = mapFeatures features ([ quick_error_1_2_1 ]); + }; + humantime_1_1_1_features = f: updateFeatures f (rec { + humantime_1_1_1.default = (f.humantime_1_1_1.default or true); + quick_error_1_2_1.default = true; + }) [ quick_error_1_2_1_features ]; + itertools_0_7_8 = { features?(itertools_0_7_8_features {}) }: itertools_0_7_8_ { + dependencies = mapFeatures features ([ either_1_5_0 ]); + features = mkFeatures (features.itertools_0_7_8 or {}); + }; + itertools_0_7_8_features = f: updateFeatures f (rec { + either_1_5_0.default = (f.either_1_5_0.default or false); + itertools_0_7_8.default = (f.itertools_0_7_8.default or true); + itertools_0_7_8.use_std = + (f.itertools_0_7_8.use_std or false) || + (f.itertools_0_7_8.default or false) || + (itertools_0_7_8.default or false); + }) [ either_1_5_0_features ]; + itoa_0_4_1 = { features?(itoa_0_4_1_features {}) }: itoa_0_4_1_ { + features = mkFeatures (features.itoa_0_4_1 or {}); + }; + itoa_0_4_1_features = f: updateFeatures f (rec { + itoa_0_4_1.default = (f.itoa_0_4_1.default or true); + itoa_0_4_1.std = + (f.itoa_0_4_1.std or false) || + (f.itoa_0_4_1.default or false) || + (itoa_0_4_1.default or false); + }) []; + lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_1_0_0 or {}); + }; + lazy_static_1_0_0_features = f: updateFeatures f (rec { + lazy_static_1_0_0.compiletest_rs = + (f.lazy_static_1_0_0.compiletest_rs or false) || + (f.lazy_static_1_0_0.compiletest or false) || + (lazy_static_1_0_0.compiletest or false); + lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true); + lazy_static_1_0_0.nightly = + (f.lazy_static_1_0_0.nightly or false) || + (f.lazy_static_1_0_0.spin_no_std or false) || + (lazy_static_1_0_0.spin_no_std or false); + lazy_static_1_0_0.spin = + (f.lazy_static_1_0_0.spin or false) || + (f.lazy_static_1_0_0.spin_no_std or false) || + (lazy_static_1_0_0.spin_no_std or false); + }) []; + libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ { + features = mkFeatures (features.libc_0_2_40 or {}); + }; + libc_0_2_40_features = f: updateFeatures f (rec { + libc_0_2_40.default = (f.libc_0_2_40.default or true); + libc_0_2_40.use_std = + (f.libc_0_2_40.use_std or false) || + (f.libc_0_2_40.default or false) || + (libc_0_2_40.default or false); + }) []; + libsqlite3_sys_0_9_1 = { features?(libsqlite3_sys_0_9_1_features {}) }: libsqlite3_sys_0_9_1_ { + dependencies = (if abi == "msvc" then mapFeatures features ([]) else []); + buildDependencies = mapFeatures features ([ ] + ++ (if features.libsqlite3_sys_0_9_1.pkg-config or false then [ pkg_config_0_3_9 ] else [])); + features = mkFeatures (features.libsqlite3_sys_0_9_1 or {}); + }; + libsqlite3_sys_0_9_1_features = f: updateFeatures f (rec { + libsqlite3_sys_0_9_1.bindgen = + (f.libsqlite3_sys_0_9_1.bindgen or false) || + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_1.buildtime_bindgen or false); + libsqlite3_sys_0_9_1.cc = + (f.libsqlite3_sys_0_9_1.cc or false) || + (f.libsqlite3_sys_0_9_1.bundled or false) || + (libsqlite3_sys_0_9_1.bundled or false); + libsqlite3_sys_0_9_1.default = (f.libsqlite3_sys_0_9_1.default or true); + libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_1.default or false) || + (libsqlite3_sys_0_9_1.default or false); + libsqlite3_sys_0_9_1.pkg-config = + (f.libsqlite3_sys_0_9_1.pkg-config or false) || + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); + libsqlite3_sys_0_9_1.vcpkg = + (f.libsqlite3_sys_0_9_1.vcpkg or false) || + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); + pkg_config_0_3_9.default = true; + }) [ pkg_config_0_3_9_features ]; + linked_hash_map_0_4_2 = { features?(linked_hash_map_0_4_2_features {}) }: linked_hash_map_0_4_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.linked_hash_map_0_4_2 or {}); + }; + linked_hash_map_0_4_2_features = f: updateFeatures f (rec { + linked_hash_map_0_4_2.default = (f.linked_hash_map_0_4_2.default or true); + linked_hash_map_0_4_2.heapsize = + (f.linked_hash_map_0_4_2.heapsize or false) || + (f.linked_hash_map_0_4_2.heapsize_impl or false) || + (linked_hash_map_0_4_2.heapsize_impl or false); + linked_hash_map_0_4_2.serde = + (f.linked_hash_map_0_4_2.serde or false) || + (f.linked_hash_map_0_4_2.serde_impl or false) || + (linked_hash_map_0_4_2.serde_impl or false); + linked_hash_map_0_4_2.serde_test = + (f.linked_hash_map_0_4_2.serde_test or false) || + (f.linked_hash_map_0_4_2.serde_impl or false) || + (linked_hash_map_0_4_2.serde_impl or false); + }) []; + log_0_4_1 = { features?(log_0_4_1_features {}) }: log_0_4_1_ { + dependencies = mapFeatures features ([ cfg_if_0_1_2 ]); + features = mkFeatures (features.log_0_4_1 or {}); + }; + log_0_4_1_features = f: updateFeatures f (rec { + cfg_if_0_1_2.default = true; + log_0_4_1.default = (f.log_0_4_1.default or true); + }) [ cfg_if_0_1_2_features ]; + lru_cache_0_1_1 = { features?(lru_cache_0_1_1_features {}) }: lru_cache_0_1_1_ { + dependencies = mapFeatures features ([ linked_hash_map_0_4_2 ]); + features = mkFeatures (features.lru_cache_0_1_1 or {}); + }; + lru_cache_0_1_1_features = f: updateFeatures f (rec { + linked_hash_map_0_4_2.default = true; + linked_hash_map_0_4_2.heapsize_impl = + (f.linked_hash_map_0_4_2.heapsize_impl or false) || + (lru_cache_0_1_1.heapsize_impl or false) || + (f.lru_cache_0_1_1.heapsize_impl or false); + lru_cache_0_1_1.default = (f.lru_cache_0_1_1.default or true); + lru_cache_0_1_1.heapsize = + (f.lru_cache_0_1_1.heapsize or false) || + (f.lru_cache_0_1_1.heapsize_impl or false) || + (lru_cache_0_1_1.heapsize_impl or false); + }) [ linked_hash_map_0_4_2_features ]; + memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ { + dependencies = mapFeatures features ([ ] + ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_40 ] else [])); + features = mkFeatures (features.memchr_1_0_2 or {}); + }; + memchr_1_0_2_features = f: updateFeatures f (rec { + libc_0_2_40.default = (f.libc_0_2_40.default or false); + libc_0_2_40.use_std = + (f.libc_0_2_40.use_std or false) || + (memchr_1_0_2.use_std or false) || + (f.memchr_1_0_2.use_std or false); + memchr_1_0_2.default = (f.memchr_1_0_2.default or true); + memchr_1_0_2.libc = + (f.memchr_1_0_2.libc or false) || + (f.memchr_1_0_2.default or false) || + (memchr_1_0_2.default or false) || + (f.memchr_1_0_2.use_std or false) || + (memchr_1_0_2.use_std or false); + memchr_1_0_2.use_std = + (f.memchr_1_0_2.use_std or false) || + (f.memchr_1_0_2.default or false) || + (memchr_1_0_2.default or false); + }) [ libc_0_2_40_features ]; + memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { + dependencies = mapFeatures features ([ ] + ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else [])); + features = mkFeatures (features.memchr_2_0_1 or {}); + }; + memchr_2_0_1_features = f: updateFeatures f (rec { + libc_0_2_40.default = (f.libc_0_2_40.default or false); + libc_0_2_40.use_std = + (f.libc_0_2_40.use_std or false) || + (memchr_2_0_1.use_std or false) || + (f.memchr_2_0_1.use_std or false); + memchr_2_0_1.default = (f.memchr_2_0_1.default or true); + memchr_2_0_1.libc = + (f.memchr_2_0_1.libc or false) || + (f.memchr_2_0_1.default or false) || + (memchr_2_0_1.default or false) || + (f.memchr_2_0_1.use_std or false) || + (memchr_2_0_1.use_std or false); + memchr_2_0_1.use_std = + (f.memchr_2_0_1.use_std or false) || + (f.memchr_2_0_1.default or false) || + (memchr_2_0_1.default or false); + }) [ libc_0_2_40_features ]; + nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ { + dependencies = mapFeatures features ([ memchr_1_0_2 ]); + features = mkFeatures (features.nom_3_2_1 or {}); + }; + nom_3_2_1_features = f: updateFeatures f (rec { + memchr_1_0_2.default = (f.memchr_1_0_2.default or false); + memchr_1_0_2.use_std = + (f.memchr_1_0_2.use_std or false) || + (nom_3_2_1.std or false) || + (f.nom_3_2_1.std or false); + nom_3_2_1.compiler_error = + (f.nom_3_2_1.compiler_error or false) || + (f.nom_3_2_1.nightly or false) || + (nom_3_2_1.nightly or false); + nom_3_2_1.default = (f.nom_3_2_1.default or true); + nom_3_2_1.lazy_static = + (f.nom_3_2_1.lazy_static or false) || + (f.nom_3_2_1.regexp_macros or false) || + (nom_3_2_1.regexp_macros or false); + nom_3_2_1.regex = + (f.nom_3_2_1.regex or false) || + (f.nom_3_2_1.regexp or false) || + (nom_3_2_1.regexp or false); + nom_3_2_1.regexp = + (f.nom_3_2_1.regexp or false) || + (f.nom_3_2_1.regexp_macros or false) || + (nom_3_2_1.regexp_macros or false); + nom_3_2_1.std = + (f.nom_3_2_1.std or false) || + (f.nom_3_2_1.default or false) || + (nom_3_2_1.default or false); + nom_3_2_1.stream = + (f.nom_3_2_1.stream or false) || + (f.nom_3_2_1.default or false) || + (nom_3_2_1.default or false); + }) [ memchr_1_0_2_features ]; + num_traits_0_2_2 = { features?(num_traits_0_2_2_features {}) }: num_traits_0_2_2_ { + features = mkFeatures (features.num_traits_0_2_2 or {}); + }; + num_traits_0_2_2_features = f: updateFeatures f (rec { + num_traits_0_2_2.default = (f.num_traits_0_2_2.default or true); + num_traits_0_2_2.std = + (f.num_traits_0_2_2.std or false) || + (f.num_traits_0_2_2.default or false) || + (num_traits_0_2_2.default or false); + }) []; + pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; + pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); + }) []; + proc_macro2_0_3_6 = { features?(proc_macro2_0_3_6_features {}) }: proc_macro2_0_3_6_ { + dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]); + features = mkFeatures (features.proc_macro2_0_3_6 or {}); + }; + proc_macro2_0_3_6_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or true); + proc_macro2_0_3_6.proc-macro = + (f.proc_macro2_0_3_6.proc-macro or false) || + (f.proc_macro2_0_3_6.default or false) || + (proc_macro2_0_3_6.default or false) || + (f.proc_macro2_0_3_6.nightly or false) || + (proc_macro2_0_3_6.nightly or false); + unicode_xid_0_1_0.default = true; + }) [ unicode_xid_0_1_0_features ]; + quick_error_1_2_1 = { features?(quick_error_1_2_1_features {}) }: quick_error_1_2_1_ {}; + quick_error_1_2_1_features = f: updateFeatures f (rec { + quick_error_1_2_1.default = (f.quick_error_1_2_1.default or true); + }) []; + quote_0_5_1 = { features?(quote_0_5_1_features {}) }: quote_0_5_1_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 ]); + features = mkFeatures (features.quote_0_5_1 or {}); + }; + quote_0_5_1_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); + proc_macro2_0_3_6.proc-macro = + (f.proc_macro2_0_3_6.proc-macro or false) || + (quote_0_5_1.proc-macro or false) || + (f.quote_0_5_1.proc-macro or false); + quote_0_5_1.default = (f.quote_0_5_1.default or true); + quote_0_5_1.proc-macro = + (f.quote_0_5_1.proc-macro or false) || + (f.quote_0_5_1.default or false) || + (quote_0_5_1.default or false); + }) [ proc_macro2_0_3_6_features ]; + rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { + dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] + ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + features = mkFeatures (features.rand_0_4_2 or {}); + }; + rand_0_4_2_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_3.default = true; + libc_0_2_40.default = true; + rand_0_4_2.default = (f.rand_0_4_2.default or true); + rand_0_4_2.i128_support = + (f.rand_0_4_2.i128_support or false) || + (f.rand_0_4_2.nightly or false) || + (rand_0_4_2.nightly or false); + rand_0_4_2.libc = + (f.rand_0_4_2.libc or false) || + (f.rand_0_4_2.std or false) || + (rand_0_4_2.std or false); + rand_0_4_2.std = + (f.rand_0_4_2.std or false) || + (f.rand_0_4_2.default or false) || + (rand_0_4_2.default or false); + winapi_0_3_4.default = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.ntsecapi = true; + winapi_0_3_4.profileapi = true; + winapi_0_3_4.winnt = true; + }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ]; + redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {}; + redox_syscall_0_1_37_features = f: updateFeatures f (rec { + redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true); + }) []; + redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { + dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]); + }; + redox_termios_0_1_1_features = f: updateFeatures f (rec { + redox_syscall_0_1_37.default = true; + redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); + }) [ redox_syscall_0_1_37_features ]; + regex_0_2_10 = { features?(regex_0_2_10_features {}) }: regex_0_2_10_ { + dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_5 thread_local_0_3_5 utf8_ranges_1_0_0 ]); + features = mkFeatures (features.regex_0_2_10 or {}); + }; + regex_0_2_10_features = f: updateFeatures f (rec { + aho_corasick_0_6_4.default = true; + memchr_2_0_1.default = true; + regex_0_2_10.default = (f.regex_0_2_10.default or true); + regex_0_2_10.pattern = + (f.regex_0_2_10.pattern or false) || + (f.regex_0_2_10.unstable or false) || + (regex_0_2_10.unstable or false); + regex_syntax_0_5_5.default = true; + thread_local_0_3_5.default = true; + utf8_ranges_1_0_0.default = true; + }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_5_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ]; + regex_syntax_0_5_5 = { features?(regex_syntax_0_5_5_features {}) }: regex_syntax_0_5_5_ { + dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); + }; + regex_syntax_0_5_5_features = f: updateFeatures f (rec { + regex_syntax_0_5_5.default = (f.regex_syntax_0_5_5.default or true); + ucd_util_0_1_1.default = true; + }) [ ucd_util_0_1_1_features ]; + remove_dir_all_0_5_0 = { features?(remove_dir_all_0_5_0_features {}) }: remove_dir_all_0_5_0_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + }; + remove_dir_all_0_5_0_features = f: updateFeatures f (rec { + remove_dir_all_0_5_0.default = (f.remove_dir_all_0_5_0.default or true); + winapi_0_3_4.default = true; + winapi_0_3_4.errhandlingapi = true; + winapi_0_3_4.fileapi = true; + winapi_0_3_4.std = true; + winapi_0_3_4.winbase = true; + winapi_0_3_4.winerror = true; + }) [ winapi_0_3_4_features ]; + rusqlite_0_13_0 = { features?(rusqlite_0_13_0_features {}) }: rusqlite_0_13_0_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_1 lru_cache_0_1_1 time_0_1_39 ]); + features = mkFeatures (features.rusqlite_0_13_0 or {}); + }; + rusqlite_0_13_0_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + libsqlite3_sys_0_9_1.buildtime_bindgen = + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (rusqlite_0_13_0.buildtime_bindgen or false) || + (f.rusqlite_0_13_0.buildtime_bindgen or false); + libsqlite3_sys_0_9_1.bundled = + (f.libsqlite3_sys_0_9_1.bundled or false) || + (rusqlite_0_13_0.bundled or false) || + (f.rusqlite_0_13_0.bundled or false); + libsqlite3_sys_0_9_1.default = true; + libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (rusqlite_0_13_0.backup or false) || + (f.rusqlite_0_13_0.backup or false); + libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (rusqlite_0_13_0.trace or false) || + (f.rusqlite_0_13_0.trace or false); + libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (rusqlite_0_13_0.functions or false) || + (f.rusqlite_0_13_0.functions or false); + libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || + (rusqlite_0_13_0.blob or false) || + (f.rusqlite_0_13_0.blob or false); + libsqlite3_sys_0_9_1.sqlcipher = + (f.libsqlite3_sys_0_9_1.sqlcipher or false) || + (rusqlite_0_13_0.sqlcipher or false) || + (f.rusqlite_0_13_0.sqlcipher or false); + lru_cache_0_1_1.default = true; + rusqlite_0_13_0.default = (f.rusqlite_0_13_0.default or true); + time_0_1_39.default = true; + }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_1_features lru_cache_0_1_1_features time_0_1_39_features ]; + rustc_demangle_0_1_7 = { features?(rustc_demangle_0_1_7_features {}) }: rustc_demangle_0_1_7_ {}; + rustc_demangle_0_1_7_features = f: updateFeatures f (rec { + rustc_demangle_0_1_7.default = (f.rustc_demangle_0_1_7.default or true); + }) []; + serde_1_0_38 = { features?(serde_1_0_38_features {}) }: serde_1_0_38_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_1_0_38 or {}); + }; + serde_1_0_38_features = f: updateFeatures f (rec { + serde_1_0_38.default = (f.serde_1_0_38.default or true); + serde_1_0_38.serde_derive = + (f.serde_1_0_38.serde_derive or false) || + (f.serde_1_0_38.derive or false) || + (serde_1_0_38.derive or false) || + (f.serde_1_0_38.playground or false) || + (serde_1_0_38.playground or false); + serde_1_0_38.std = + (f.serde_1_0_38.std or false) || + (f.serde_1_0_38.default or false) || + (serde_1_0_38.default or false); + serde_1_0_38.unstable = + (f.serde_1_0_38.unstable or false) || + (f.serde_1_0_38.alloc or false) || + (serde_1_0_38.alloc or false); + }) []; + serde_derive_1_0_38 = { features?(serde_derive_1_0_38_features {}) }: serde_derive_1_0_38_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 quote_0_5_1 serde_derive_internals_0_23_1 syn_0_13_1 ]); + features = mkFeatures (features.serde_derive_1_0_38 or {}); + }; + serde_derive_1_0_38_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = true; + quote_0_5_1.default = true; + serde_derive_1_0_38.default = (f.serde_derive_1_0_38.default or true); + serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or false); + syn_0_13_1.default = true; + syn_0_13_1.visit = true; + }) [ proc_macro2_0_3_6_features quote_0_5_1_features serde_derive_internals_0_23_1_features syn_0_13_1_features ]; + serde_derive_internals_0_23_1 = { features?(serde_derive_internals_0_23_1_features {}) }: serde_derive_internals_0_23_1_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 syn_0_13_1 ]); + }; + serde_derive_internals_0_23_1_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = true; + serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or true); + syn_0_13_1.clone-impls = true; + syn_0_13_1.default = (f.syn_0_13_1.default or false); + syn_0_13_1.derive = true; + syn_0_13_1.parsing = true; + }) [ proc_macro2_0_3_6_features syn_0_13_1_features ]; + serde_json_1_0_14 = { features?(serde_json_1_0_14_features {}) }: serde_json_1_0_14_ { + dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 num_traits_0_2_2 serde_1_0_38 ]); + features = mkFeatures (features.serde_json_1_0_14 or {}); + }; + serde_json_1_0_14_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = true; + itoa_0_4_1.default = true; + num_traits_0_2_2.default = (f.num_traits_0_2_2.default or false); + serde_1_0_38.default = true; + serde_json_1_0_14.default = (f.serde_json_1_0_14.default or true); + serde_json_1_0_14.linked-hash-map = + (f.serde_json_1_0_14.linked-hash-map or false) || + (f.serde_json_1_0_14.preserve_order or false) || + (serde_json_1_0_14.preserve_order or false); + }) [ dtoa_0_4_2_features itoa_0_4_1_features num_traits_0_2_2_features serde_1_0_38_features ]; + strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; + strsim_0_7_0_features = f: updateFeatures f (rec { + strsim_0_7_0.default = (f.strsim_0_7_0.default or true); + }) []; + syn_0_13_1 = { features?(syn_0_13_1_features {}) }: syn_0_13_1_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 unicode_xid_0_1_0 ] + ++ (if features.syn_0_13_1.quote or false then [ quote_0_5_1 ] else [])); + features = mkFeatures (features.syn_0_13_1 or {}); + }; + syn_0_13_1_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); + proc_macro2_0_3_6.proc-macro = + (f.proc_macro2_0_3_6.proc-macro or false) || + (syn_0_13_1.proc-macro or false) || + (f.syn_0_13_1.proc-macro or false); + quote_0_5_1.default = (f.quote_0_5_1.default or false); + quote_0_5_1.proc-macro = + (f.quote_0_5_1.proc-macro or false) || + (syn_0_13_1.proc-macro or false) || + (f.syn_0_13_1.proc-macro or false); + syn_0_13_1.clone-impls = + (f.syn_0_13_1.clone-impls or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.default = (f.syn_0_13_1.default or true); + syn_0_13_1.derive = + (f.syn_0_13_1.derive or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.parsing = + (f.syn_0_13_1.parsing or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.printing = + (f.syn_0_13_1.printing or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.proc-macro = + (f.syn_0_13_1.proc-macro or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.quote = + (f.syn_0_13_1.quote or false) || + (f.syn_0_13_1.printing or false) || + (syn_0_13_1.printing or false); + unicode_xid_0_1_0.default = true; + }) [ proc_macro2_0_3_6_features quote_0_5_1_features unicode_xid_0_1_0_features ]; + tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ { + dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_0 ]); + }; + tempdir_0_3_7_features = f: updateFeatures f (rec { + rand_0_4_2.default = true; + remove_dir_all_0_5_0.default = true; + tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); + }) [ rand_0_4_2_features remove_dir_all_0_5_0_features ]; + termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []); + }; + termcolor_0_3_6_features = f: updateFeatures f (rec { + termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true); + wincolor_0_1_6.default = true; + }) [ wincolor_0_1_6_features ]; + termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { + dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []); + }; + termion_1_5_1_features = f: updateFeatures f (rec { + libc_0_2_40.default = true; + redox_syscall_0_1_37.default = true; + redox_termios_0_1_1.default = true; + termion_1_5_1.default = (f.termion_1_5_1.default or true); + }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ]; + textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { + dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); + }; + textwrap_0_9_0_features = f: updateFeatures f (rec { + textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); + unicode_width_0_1_4.default = true; + }) [ unicode_width_0_1_4_features ]; + thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { + dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]); + }; + thread_local_0_3_5_features = f: updateFeatures f (rec { + lazy_static_1_0_0.default = true; + thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); + unreachable_1_0_0.default = true; + }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ]; + time_0_1_39 = { features?(time_0_1_39_features {}) }: time_0_1_39_ { + dependencies = mapFeatures features ([ libc_0_2_40 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + }; + time_0_1_39_features = f: updateFeatures f (rec { + libc_0_2_40.default = true; + redox_syscall_0_1_37.default = true; + time_0_1_39.default = (f.time_0_1_39.default or true); + winapi_0_3_4.default = true; + winapi_0_3_4.minwinbase = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.ntdef = true; + winapi_0_3_4.profileapi = true; + winapi_0_3_4.std = true; + winapi_0_3_4.sysinfoapi = true; + winapi_0_3_4.timezoneapi = true; + }) [ libc_0_2_40_features redox_syscall_0_1_37_features winapi_0_3_4_features ]; + toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ { + dependencies = mapFeatures features ([ serde_1_0_38 ]); + }; + toml_0_4_6_features = f: updateFeatures f (rec { + serde_1_0_38.default = true; + toml_0_4_6.default = (f.toml_0_4_6.default or true); + }) [ serde_1_0_38_features ]; + ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; + ucd_util_0_1_1_features = f: updateFeatures f (rec { + ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); + }) []; + unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { + features = mkFeatures (features.unicode_width_0_1_4 or {}); + }; + unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); + }) []; + unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { + features = mkFeatures (features.unicode_xid_0_1_0 or {}); + }; + unicode_xid_0_1_0_features = f: updateFeatures f (rec { + unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); + }) []; + unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { + dependencies = mapFeatures features ([ void_1_0_2 ]); + }; + unreachable_1_0_0_features = f: updateFeatures f (rec { + unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); + void_1_0_2.default = (f.void_1_0_2.default or false); + }) [ void_1_0_2_features ]; + utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; + utf8_ranges_1_0_0_features = f: updateFeatures f (rec { + utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); + }) []; + vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {}; + vcpkg_0_2_3_features = f: updateFeatures f (rec { + vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true); + }) []; + vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.vec_map_0_8_0 or {}); + }; + vec_map_0_8_0_features = f: updateFeatures f (rec { + vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true); + vec_map_0_8_0.serde = + (f.vec_map_0_8_0.serde or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + vec_map_0_8_0.serde_derive = + (f.vec_map_0_8_0.serde_derive or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + }) []; + void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { + features = mkFeatures (features.void_1_0_2 or {}); + }; + void_1_0_2_features = f: updateFeatures f (rec { + void_1_0_2.default = (f.void_1_0_2.default or true); + void_1_0_2.std = + (f.void_1_0_2.std or false) || + (f.void_1_0_2.default or false) || + (void_1_0_2.default or false); + }) []; + winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ { + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); + features = mkFeatures (features.winapi_0_3_4 or {}); + }; + winapi_0_3_4_features = f: updateFeatures f (rec { + winapi_0_3_4.default = (f.winapi_0_3_4.default or true); + winapi_i686_pc_windows_gnu_0_4_0.default = true; + winapi_x86_64_pc_windows_gnu_0_4_0.default = true; + }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; + winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; + winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); + }) []; + winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; + winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); + }) []; + wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ { + dependencies = mapFeatures features ([ winapi_0_3_4 ]); + }; + wincolor_0_1_6_features = f: updateFeatures f (rec { + winapi_0_3_4.consoleapi = true; + winapi_0_3_4.default = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.processenv = true; + winapi_0_3_4.winbase = true; + winapi_0_3_4.wincon = true; + wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true); + }) [ winapi_0_3_4_features ]; +} diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix new file mode 100644 index 0000000000000000000000000000000000000000..488fcb943721ab17e4db28c789b8c4dd1706bf1b --- /dev/null +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -0,0 +1,72 @@ +{ stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, + openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3, + libsodium, postgresql, ... }: + +let + inherit (darwin.apple_sdk.frameworks) CoreFoundation; +in +{ + cargo = attrs: { + buildInputs = [ openssl zlib curl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; + # TODO: buildRustCrate seems to use incorrect default inference + crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ]; + }; + cargo-vendor = attrs: { + buildInputs = [ openssl zlib curl ]; + # TODO: this defaults to cargo_vendor; needs to be cargo-vendor to + # be considered a cargo subcommand. + crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ]; + }; + curl-sys = attrs: { + buildInputs = [ pkgconfig curl ]; + }; + libgit2-sys = attrs: { + LIBGIT2_SYS_USE_PKG_CONFIG = true; + buildInputs = [ pkgconfig openssl zlib libgit2 ]; + }; + libsqlite3-sys = attrs: { + buildInputs = [ pkgconfig sqlite ]; + }; + libssh2-sys = attrs: { + buildInputs = [ pkgconfig openssl zlib libssh2 ]; + }; + openssl = attrs: { + buildInputs = [ openssl ]; + }; + openssl-sys = attrs: { + buildInputs = [ pkgconfig openssl ]; + }; + + dbus = attrs: { + buildInputs = [ pkgconfig dbus_libs ]; + }; + libdbus-sys = attrs: { + buildInputs = [ pkgconfig dbus_libs ]; + }; + gobject-sys = attrs: { + buildInputs = [ dbus-glib ]; + }; + gio-sys = attrs: { + buildInputs = [ dbus-glib ]; + }; + gdk-pixbuf-sys = attrs: { + buildInputs = [ dbus-glib ]; + }; + gdk-pixbuf = attrs: { + buildInputs = [ gdk_pixbuf ]; + }; + cairo-rs = attrs: { + buildInputs = [ cairo ]; + }; + xcb = attrs: { + buildInputs = [ python3 ]; + }; + + thrussh-libsodium = attrs: { + buildInputs = [ pkgconfig libsodium ]; + }; + pq-sys = attr: { + buildInputs = [ pkgconfig postgresql ]; + }; +} diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 37ea264a53fbf7f7af809bdf22f9edeeb1594395..f407ba25bf850d006fc4c1d1ed0697327ce57248 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,14 +1,10 @@ -{ fetchurl, stdenv, path, cacert, git, rust }: +{ callPackage, fetchurl, stdenv, path, cacert, git, rust, cargo-vendor }: let - cargoVendor = import ./cargo-vendor.nix { - inherit fetchurl stdenv; - }; - fetchcargo = import ./fetchcargo.nix { - inherit stdenv cacert git rust cargoVendor; + inherit stdenv cacert git rust cargo-vendor; }; in -{ name, cargoSha256 +{ name, cargoSha256 ? "unset" , src ? null , srcs ? null , sourceRoot ? null @@ -17,22 +13,38 @@ in , cargoUpdateHook ? "" , cargoDepsHook ? "" , cargoBuildFlags ? [] + +, cargoVendorDir ? null , ... } @ args: +assert cargoVendorDir == null -> cargoSha256 != "unset"; + let lib = stdenv.lib; - cargoDeps = fetchcargo { - inherit name src srcs sourceRoot cargoUpdateHook; - sha256 = cargoSha256; - }; + cargoDeps = if cargoVendorDir == null + then fetchcargo { + inherit name src srcs sourceRoot cargoUpdateHook; + sha256 = cargoSha256; + } + else null; + + setupVendorDir = if cargoVendorDir == null + then '' + unpackFile "$cargoDeps" + cargoDepsCopy=$(stripHash $(basename $cargoDeps)) + chmod -R +w "$cargoDepsCopy" + '' + else '' + cargoDepsCopy="$sourceRoot/${cargoVendorDir}" + ''; in stdenv.mkDerivation (args // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; - buildInputs = [ git rust.cargo rust.rustc ] ++ buildInputs; + buildInputs = [ cacert git rust.cargo rust.rustc ] ++ buildInputs; configurePhase = args.configurePhase or '' runHook preConfigure @@ -43,6 +55,8 @@ in stdenv.mkDerivation (args // { postUnpack = '' eval "$cargoDepsHook" + ${setupVendorDir} + mkdir .cargo cat >.cargo/config <<-EOF [source.crates-io] @@ -50,11 +64,12 @@ in stdenv.mkDerivation (args // { replace-with = 'vendored-sources' [source.vendored-sources] - directory = '$cargoDeps' + directory = '$(pwd)/$cargoDepsCopy' EOF + unset cargoDepsCopy + export RUST_LOG=${logLevel} - export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt '' + (args.postUnpack or ""); buildPhase = with builtins; args.buildPhase or '' diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 9b3ba53033987ed1d81c2e6051fe7aefdb06feb7..42a3ac27cb5b3e3ac224cf40d04c05aa765fd802 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,8 +1,8 @@ -{ stdenv, cacert, git, rust, cargoVendor }: +{ stdenv, cacert, git, rust, cargo-vendor }: { name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }: stdenv.mkDerivation { name = "${name}-vendor"; - buildInputs = [ cacert cargoVendor git rust.cargo ]; + nativeBuildInputs = [ cacert cargo-vendor git rust.cargo ]; inherit src srcs sourceRoot; phases = "unpackPhase installPhase"; @@ -19,9 +19,10 @@ stdenv.mkDerivation { exit 1 fi - export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt export CARGO_HOME=$(mktemp -d cargo-home.XXX) + ${cargoUpdateHook} + cargo vendor cp -ar vendor $out diff --git a/pkgs/build-support/rust/fetchcrate.nix b/pkgs/build-support/rust/fetchcrate.nix new file mode 100644 index 0000000000000000000000000000000000000000..95dfd38b12ae99e145ce845c596f455eed4d8632 --- /dev/null +++ b/pkgs/build-support/rust/fetchcrate.nix @@ -0,0 +1,35 @@ +{ lib, fetchurl, unzip }: + +{ crateName +, version +, sha256 +, ... } @ args: + +lib.overrideDerivation (fetchurl ({ + + name = "${crateName}-${version}.tar.gz"; + url = "https://crates.io/api/v1/crates/${crateName}/${version}/download"; + recursiveHash = true; + + downloadToTemp = true; + + postFetch = + '' + export PATH=${unzip}/bin:$PATH + + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + + renamed="$TMPDIR/${crateName}-${version}.tar.gz" + mv "$downloadedFile" "$renamed" + unpackFile "$renamed" + fn=$(cd "$unpackDir" && echo *) + if [ -f "$unpackDir/$fn" ]; then + mkdir $out + fi + mv "$unpackDir/$fn" "$out" + ''; +} // removeAttrs args [ "crateName" "version" ])) +# Hackety-hack: we actually need unzip hooks, too +(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh new file mode 100644 index 0000000000000000000000000000000000000000..0f9d7603d48fb3afdd1ba6772226e33aeb858fbb --- /dev/null +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -0,0 +1,174 @@ +declare -a autoPatchelfLibs + +gatherLibraries() { + autoPatchelfLibs+=("$1/lib") +} + +addEnvHooks "$targetOffset" gatherLibraries + +isExecutable() { + [ "$(file -b -N --mime-type "$1")" = application/x-executable ] +} + +findElfs() { + find "$1" -type f -exec "$SHELL" -c ' + while [ -n "$1" ]; do + mimeType="$(file -b -N --mime-type "$1")" + if [ "$mimeType" = application/x-executable \ + -o "$mimeType" = application/x-sharedlib ]; then + echo "$1" + fi + shift + done + ' -- {} + +} + +# We cache dependencies so that we don't need to search through all of them on +# every consecutive call to findDependency. +declare -a cachedDependencies + +addToDepCache() { + local existing + for existing in "${cachedDependencies[@]}"; do + if [ "$existing" = "$1" ]; then return; fi + done + cachedDependencies+=("$1") +} + +declare -gi depCacheInitialised=0 +declare -gi doneRecursiveSearch=0 +declare -g foundDependency + +getDepsFromSo() { + ldd "$1" 2> /dev/null | sed -n -e 's/[^=]*=> *\(.\+\) \+([^)]*)$/\1/p' +} + +populateCacheWithRecursiveDeps() { + local so found foundso + for so in "${cachedDependencies[@]}"; do + for found in $(getDepsFromSo "$so"); do + local libdir="${found%/*}" + local base="${found##*/}" + local soname="${base%.so*}" + for foundso in "${found%/*}/$soname".so*; do + addToDepCache "$foundso" + done + done + done +} + +getSoArch() { + objdump -f "$1" | sed -ne 's/^architecture: *\([^,]\+\).*/\1/p' +} + +# NOTE: If you want to use this function outside of the autoPatchelf function, +# keep in mind that the dependency cache is only valid inside the subshell +# spawned by the autoPatchelf function, so invoking this directly will possibly +# rebuild the dependency cache. See the autoPatchelf function below for more +# information. +findDependency() { + local filename="$1" + local arch="$2" + local lib dep + + if [ $depCacheInitialised -eq 0 ]; then + for lib in "${autoPatchelfLibs[@]}"; do + for so in "$lib/"*.so*; do addToDepCache "$so"; done + done + depCacheInitialised=1 + fi + + for dep in "${cachedDependencies[@]}"; do + if [ "$filename" = "${dep##*/}" ]; then + if [ "$(getSoArch "$dep")" = "$arch" ]; then + foundDependency="$dep" + return 0 + fi + fi + done + + # Populate the dependency cache with recursive dependencies *only* if we + # didn't find the right dependency so far and afterwards run findDependency + # again, but this time with $doneRecursiveSearch set to 1 so that it won't + # recurse again (and thus infinitely). + if [ $doneRecursiveSearch -eq 0 ]; then + populateCacheWithRecursiveDeps + doneRecursiveSearch=1 + findDependency "$filename" "$arch" || return 1 + return 0 + fi + return 1 +} + +autoPatchelfFile() { + local dep rpath="" toPatch="$1" + + local interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")" + if isExecutable "$toPatch"; then + patchelf --set-interpreter "$interpreter" "$toPatch" + if [ -n "$runtimeDependencies" ]; then + for dep in $runtimeDependencies; do + rpath="$rpath${rpath:+:}$dep/lib" + done + fi + fi + + echo "searching for dependencies of $toPatch" >&2 + + # We're going to find all dependencies based on ldd output, so we need to + # clear the RPATH first. + patchelf --remove-rpath "$toPatch" + + local missing="$( + ldd "$toPatch" 2> /dev/null | \ + sed -n -e 's/^[\t ]*\([^ ]\+\) => not found.*/\1/p' + )" + + # This ensures that we get the output of all missing dependencies instead + # of failing at the first one, because it's more useful when working on a + # new package where you don't yet know its dependencies. + local -i depNotFound=0 + + for dep in $missing; do + echo -n " $dep -> " >&2 + if findDependency "$dep" "$(getSoArch "$toPatch")"; then + rpath="$rpath${rpath:+:}${foundDependency%/*}" + echo "found: $foundDependency" >&2 + else + echo "not found!" >&2 + depNotFound=1 + fi + done + + # This makes sure the builder fails if we didn't find a dependency, because + # the stdenv setup script is run with set -e. The actual error is emitted + # earlier in the previous loop. + [ $depNotFound -eq 0 ] + + if [ -n "$rpath" ]; then + echo "setting RPATH to: $rpath" >&2 + patchelf --set-rpath "$rpath" "$toPatch" + fi +} + +autoPatchelf() { + echo "automatically fixing dependencies for ELF files" >&2 + + # Add all shared objects of the current output path to the start of + # cachedDependencies so that it's choosen first in findDependency. + cachedDependencies+=( + $(find "$prefix" \! -type d \( -name '*.so' -o -name '*.so.*' \)) + ) + local elffile + + # Here we actually have a subshell, which also means that + # $cachedDependencies is final at this point, so whenever we want to run + # findDependency outside of this, the dependency cache needs to be rebuilt + # from scratch, so keep this in mind if you want to run findDependency + # outside of this function. + findElfs "$prefix" | while read -r elffile; do + autoPatchelfFile "$elffile" + done +} + +fixupOutputHooks+=(autoPatchelf) diff --git a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh index b742d5a8ffd9c6f9cda693277e7a05cda92bbad3..85364a61f612c0cb81019ecea1e8ef4753f73088 100644 --- a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh +++ b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh @@ -18,5 +18,5 @@ if [ -z "$libxmlHookDone" ]; then # xmllint and xsltproc from looking in /etc/xml/catalog. export XML_CATALOG_FILES if [ -z "$XML_CATALOG_FILES" ]; then XML_CATALOG_FILES=" "; fi - envHooks+=(addXMLCatalogs) + addEnvHooks "$hostOffset" addXMLCatalogs fi diff --git a/pkgs/build-support/setup-hooks/gog-unpack.sh b/pkgs/build-support/setup-hooks/gog-unpack.sh new file mode 100644 index 0000000000000000000000000000000000000000..559b543fadfceb396cb7557c0b2e46727a5b8ed9 --- /dev/null +++ b/pkgs/build-support/setup-hooks/gog-unpack.sh @@ -0,0 +1,11 @@ +unpackPhase="unpackGog" + +unpackGog() { + runHook preUnpackGog + + innoextract --silent --extract --exclude-temp "${src}" + + find . -depth -print -execdir rename -f 'y/A-Z/a-z/' '{}' \; + + runHook postUnpackGog +} diff --git a/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh b/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..b53e184b095619445433cfd118360a368c4eead1 --- /dev/null +++ b/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh @@ -0,0 +1,5 @@ +ld-is-cc-hook() { + LD=$CC +} + +preConfigureHooks+=(ld-is-cc-hook) diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index f9d435df655ba608924d902e3975f95fde0f5312..f75b285bacf21920676b42f28f88e42c4e87ea3c 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -47,7 +47,12 @@ makeWrapper() { varName="${params[$((n + 1))]}" value="${params[$((n + 2))]}" n=$((n + 2)) - echo "export $varName=\"$value\"" >> "$wrapper" + echo "export $varName=${value@Q}" >> "$wrapper" + elif [[ "$p" == "--set-default" ]]; then + varName="${params[$((n + 1))]}" + value="${params[$((n + 2))]}" + n=$((n + 2)) + echo "export $varName=\${$varName-${value@Q}}" >> "$wrapper" elif [[ "$p" == "--unset" ]]; then varName="${params[$((n + 1))]}" n=$((n + 1)) @@ -63,9 +68,9 @@ makeWrapper() { 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@Q}}${value@Q}" >> "$wrapper" else - echo "export $varName=$value\${$varName:+$separator}\$$varName" >> "$wrapper" + echo "export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName" >> "$wrapper" fi fi elif [[ "$p" == "--suffix-each" ]]; then @@ -74,7 +79,7 @@ makeWrapper() { 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@Q}" >> "$wrapper" done elif [[ ("$p" == "--suffix-contents") || ("$p" == "--prefix-contents") ]]; then varName="${params[$((n + 1))]}" @@ -82,10 +87,11 @@ makeWrapper() { fileNames="${params[$((n + 3))]}" n=$((n + 3)) for fileName in $fileNames; do + contents="$(cat "$fileName")" if test "$p" = "--suffix-contents"; then - echo "export $varName=\$$varName\${$varName:+$separator}$(cat "$fileName")" >> "$wrapper" + echo "export $varName=\$$varName\${$varName:+$separator}${contents@Q}" >> "$wrapper" else - echo "export $varName=$(cat "$fileName")\${$varName:+$separator}\$$varName" >> "$wrapper" + echo "export $varName=${contents@Q}\${$varName:+$separator}\$$varName" >> "$wrapper" fi done elif [[ "$p" == "--add-flags" ]]; then diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 60d4ccf99ed1fbded78d6e0278bf4eb7b471e699..d43b1877674231018c0be20fc34b50c9711ddb20 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -140,6 +140,7 @@ _multioutDocs() { moveToOutput share/info "${!outputInfo}" moveToOutput share/doc "${!outputDoc}" moveToOutput share/gtk-doc "${!outputDevdoc}" + moveToOutput share/devhelp/books "${!outputDevdoc}" # the default outputMan is in $bin moveToOutput share/man "${!outputMan}" @@ -164,8 +165,6 @@ _multioutDevs() { } # Make the "dev" propagate other outputs needed for development. -# Note: with current cross-building setup, all packages are "native" if not cross-building; -# however, if cross-building, the outputs are non-native. We have to choose the right file. _multioutPropagateDev() { if [ "$outputs" = "out" ]; then return; fi; @@ -193,16 +192,8 @@ _multioutPropagateDev() { return fi - local propagatedBuildInputsFile - if [ -z "$crossConfig" ]; then - propagatedBuildInputsFile=propagated-native-build-inputs - else - propagatedBuildInputsFile=propagated-build-inputs - fi - mkdir -p "${!propagaterOutput}"/nix-support for output in $propagatedBuildOutputs; do - echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile + echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/propagated-build-inputs done } - diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 4317a5f4dadef2a8b5781b745fc6599dd0f0baa4..1433d1e1f14408eaee7f1606880aeecd93fb26e3 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -54,7 +54,11 @@ patchShebangs() { echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" # escape the escape chars so that sed doesn't interpret them escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g') + # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281 + touch -r "$f" "$f.timestamp" sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" + touch -r "$f.timestamp" "$f" + rm "$f.timestamp" fi fi done diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index c90d2cd5201365c9ee21ec594fab8227b55e1df9..19dbb10d18e72f8c6cc7a201e1e1c3ad497fd64e 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -19,7 +19,7 @@ _separateDebugInfo() { if ! isELF "$i"; then continue; fi # Extract the Build ID. FIXME: there's probably a cleaner way. - local id="$(readelf -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" + local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" if [ "${#id}" != 40 ]; then echo "could not find build ID of $i, skipping" >&2 continue @@ -28,8 +28,8 @@ _separateDebugInfo() { # Extract the debug info. header "separating debug info from $i (build ID $id)" mkdir -p "$dst/${id:0:2}" - objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" - strip --strip-debug "$i" + $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" + $STRIP --strip-debug "$i" # Also a create a symlink .debug. ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" diff --git a/pkgs/build-support/setup-hooks/set-java-classpath.sh b/pkgs/build-support/setup-hooks/set-java-classpath.sh index 047da91bc97c6ed66904c2933aca389b25c8a939..5d3548dc2e88623b0ada7dee66deda2b2659234c 100644 --- a/pkgs/build-support/setup-hooks/set-java-classpath.sh +++ b/pkgs/build-support/setup-hooks/set-java-classpath.sh @@ -10,4 +10,4 @@ addPkgToClassPath () { done } -envHooks+=(addPkgToClassPath) +addEnvHooks "$targetOffset" addPkgToClassPath diff --git a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh index 2fd2a2d6da6fb9bef4b904ef498fafa637e23664..96bf48cf123abb0789fe1d73c2df6b0544fd2e63 100644 --- a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh +++ b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh @@ -2,4 +2,4 @@ setupDebugInfoDirs () { addToSearchPath NIX_DEBUG_INFO_DIRS $1/lib/debug } -envHooks+=(setupDebugInfoDirs) +addEnvHooks "$targetOffset" setupDebugInfoDirs diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index 0bf37e10d87039ad73841d1903b33471a913f92e..fc4c7bfbaf95787ebd892a282b54e6199b27439e 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -3,24 +3,45 @@ fixupOutputHooks+=(_doStrip) _doStrip() { - if [ -z "$dontStrip" ]; then + # We don't bother to strip build platform code because it shouldn't make it + # to $out anyways---if it does, that's a bigger problem that a lack of + # stripping will help catch. + local -ra flags=(dontStripHost dontStripTarget) + local -ra stripCmds=(STRIP TARGET_STRIP) + + # Optimization + if [[ "$STRIP" == "$TARGET_STRIP" ]]; then + dontStripTarget+=1 + fi + + local i + for i in ${!stripCmds[@]}; do + local -n flag="${flags[$i]}" + local -n stripCmd="${stripCmds[$i]}" + + # `dontStrip` disables them all + if [[ "$dontStrip" || "$flag" ]] || ! type -f "$stripCmd" 2>/dev/null + then continue; fi + stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} if [ -n "$stripDebugList" ]; then - stripDirs "$stripDebugList" "${stripDebugFlags:--S}" + stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:--S}" fi stripAllList=${stripAllList:-} if [ -n "$stripAllList" ]; then - stripDirs "$stripAllList" "${stripAllFlags:--s}" + stripDirs "$stripCmd" "$stripAllList" "${stripAllFlags:--s}" fi - fi + done } stripDirs() { - local dirs="$1" - local stripFlags="$2" + local cmd="$1" + local dirs="$2" + local stripFlags="$3" local dirsNew= + local d for d in ${dirs}; do if [ -d "$prefix/$d" ]; then dirsNew="${dirsNew} $prefix/$d " @@ -29,8 +50,8 @@ stripDirs() { dirs=${dirsNew} if [ -n "${dirs}" ]; then - header "stripping (with flags $stripFlags) in$dirs" - find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags 2>/dev/null || true + header "stripping (with command $cmd and flags $stripFlags) in$dirs" + find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $cmd $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 9658b9f82595cbe776c2ac3d084395e8684b64c1..6130f32bef86c2e9002787c8ac3698d332359588 100644 --- a/pkgs/build-support/setup-hooks/win-dll-link.sh +++ b/pkgs/build-support/setup-hooks/win-dll-link.sh @@ -25,7 +25,7 @@ _linkDLLs() { linkCount=0 # Iterate over any DLL that we depend on. local dll - for dll in $(objdump -p *.{exe,dll} | sed -n 's/.*DLL Name: \(.*\)/\1/p' | sort -u); do + for dll in $($OBJDUMP -p *.{exe,dll} | sed -n 's/.*DLL Name: \(.*\)/\1/p' | sort -u); do if [ -e "./$dll" ]; then continue; fi # Locate the DLL - it should be an *executable* file on $DLLPATH. local dllPath="$(PATH="$DLLPATH" type -P "$dll")" diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 79b8d5b73fa12572cff3d75e81190ae905ddfa72..25ac12996cc10e0517a73fa29312075a256e4f87 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -6,7 +6,7 @@ find_gio_modules() { fi } -envHooks+=(find_gio_modules) +addEnvHooks "$targetOffset" find_gio_modules # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set. wrapGAppsHook() { diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 3c27b9fc1ad9cffe276f6efc2f35a3cb2ce3c8d6..60271e592a23f84c6552f6aeffc47ce4b7f1e559 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -61,6 +61,7 @@ rec { mkfs -t ext3 -b 4096 /dev/${vmTools.hd} mount /dev/${vmTools.hd} disk cd disk + mkdir proc sys dev # Run root script ${stdenv.lib.optionalString (runAsRoot != null) '' @@ -92,8 +93,11 @@ rec { cd disk export PATH=$PATH:${e2fsprogs}/bin/ - singularity create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out - tar -c . | singularity import $out + echo creating + singularity image.create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out + echo importing + mkdir -p /var/singularity/mnt/container + tar -c . | singularity image.import $out ''); in result; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 32214db658424d389f54829e4f186260549e1369..d092efb556e50842e7430c99d62192a1683aa85e 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -95,13 +95,13 @@ rec { # Make a package that just contains a setup hook with the given contents. - makeSetupHook = { deps ? [], substitutions ? {} }: script: - runCommand "hook" substitutions + makeSetupHook = { name ? "hook", deps ? [], substitutions ? {} }: script: + runCommand name substitutions ('' mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook '' + lib.optionalString (deps != []) '' - printWords ${toString deps} > $out/nix-support/propagated-native-build-inputs + printWords ${toString deps} > $out/nix-support/propagated-build-inputs '' + lib.optionalString (substitutions != {}) '' substituteAll ${script} $out/nix-support/setup-hook ''); @@ -170,6 +170,7 @@ rec { *** _EOF_ + exit 1 ''; }; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index d886e9a56fa4a9c768d9e7cc2fcb65c5f2acc1c3..8e8b88a9bd2df0208fd4034741618673df93a1c2 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,12 +1,14 @@ { pkgs , kernel ? pkgs.linux -, img ? "bzImage" +, img ? pkgs.stdenv.platform.kernelTarget , storeDir ? builtins.storeDir , rootModules ? - [ "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ] + [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] + ++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos" }: with pkgs; +with import ../../../nixos/lib/qemu-flags.nix { inherit pkgs; }; rec { @@ -21,11 +23,10 @@ rec { patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ]; }); - qemuProg = "${qemu}/bin/qemu-kvm"; - modulesClosure = makeModulesClosure { inherit kernel rootModules; + firmware = kernel; }; @@ -60,20 +61,6 @@ rec { ''; # */ - createDeviceNodes = dev: - '' - mknod -m 666 ${dev}/null c 1 3 - mknod -m 666 ${dev}/zero c 1 5 - mknod -m 666 ${dev}/random c 1 8 - mknod -m 666 ${dev}/urandom c 1 9 - mknod -m 666 ${dev}/tty c 5 0 - mknod -m 666 ${dev}/ttyS0 c 4 64 - mknod ${dev}/rtc c 254 0 - . /sys/class/block/${hd}/uevent - mknod ${dev}/${hd} b $MAJOR $MINOR - ''; - - stage1Init = writeScript "vm-run-stage1" '' #! ${initrdUtils}/bin/ash -e @@ -108,8 +95,7 @@ rec { insmod $i done - mount -t tmpfs none /dev - ${createDeviceNodes "/dev"} + mount -t devtmpfs devtmpfs /dev ifconfig lo up @@ -211,22 +197,21 @@ rec { export PATH=/bin:/usr/bin:${coreutils}/bin echo "Starting interactive shell..." echo "(To run the original builder: \$origBuilder \$origArgs)" - exec ${busybox}/bin/setsid ${bashInteractive}/bin/bash < /dev/ttyS0 &> /dev/ttyS0 + exec ${busybox}/bin/setsid ${bashInteractive}/bin/bash < /dev/${qemuSerialDevice} &> /dev/${qemuSerialDevice} fi ''; qemuCommandLinux = '' - ${qemuProg} \ - ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ + ${qemuBinary qemu} \ -nographic -no-reboot \ -device virtio-rng-pci \ -virtfs local,path=${storeDir},security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ - -drive file=$diskImage,if=virtio,cache=unsafe,werror=report \ + ''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ - -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ + -append "console=${qemuSerialDevice} panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ $QEMU_OPTS ''; @@ -238,8 +223,6 @@ rec { mkdir xchg mv saved-env xchg/ - diskImage=''${diskImage:-/dev/null} - eval "$preVM" if [ "$enableParallelBuilding" = 1 ]; then @@ -255,7 +238,7 @@ rec { # the -K option to preserve the temporary build directory). cat > ./run-vm <= 26 + fedora26x86_64 = + let version = "26"; + in rec { + name = "fedora-${version}-x86_64"; + fullName = "Fedora ${version} (x86_64)"; + packagesList = fetchurl rec { + url = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; + sha256 = "880055a50c05b20641530d09b23f64501a000b2f92fe252417c530178730a95e"; + }; + urlPrefix = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os"; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + + fedora27x86_64 = + let version = "27"; + in rec { + name = "fedora-${version}-x86_64"; + fullName = "Fedora ${version} (x86_64)"; + packagesList = fetchurl rec { + url = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; + sha256 = "48986ce4583cd09825c6d437150314446f0f49fa1a1bd62dcfa1085295030fe9"; + }; + urlPrefix = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os"; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + + centos6i386 = + let version = "6.9"; + in rec { + name = "centos-${version}-i386"; + fullName = "CentOS ${version} (i386)"; + # N.B. Switch to vault.centos.org when the next release comes out + # urlPrefix = "http://vault.centos.org/${version}/os/i386"; + urlPrefix = "http://mirror.centos.org/centos-6/${version}/os/i386"; + packagesList = fetchurl rec { + url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; + sha256 = "b826a45082ef68340325c0855f3d2e5d5a4d0f77d28ba3b871791d6f14a97aeb"; + }; + archs = ["noarch" "i386"]; + packages = commonCentOSPackages ++ [ "procps" ]; + }; + + centos6x86_64 = + let version = "6.9"; + in rec { + name = "centos-${version}-x86_64"; + fullName = "CentOS ${version} (x86_64)"; + # N.B. Switch to vault.centos.org when the next release comes out + # urlPrefix = "http://vault.centos.org/${version}/os/x86_64"; + urlPrefix = "http://mirror.centos.org/centos-6/${version}/os/x86_64"; + packagesList = fetchurl rec { + url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; + sha256 = "ed2b2d4ac98d774d4cd3e91467e1532f7e8b0275cfc91a0d214b532dcaf1e979"; + }; + archs = ["noarch" "x86_64"]; + packages = commonCentOSPackages ++ [ "procps" ]; }; - urlPrefix = mirror://fedora/linux/releases/17/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora17x86_64 = { - name = "fedora-17-x86_64"; - fullName = "Fedora 17 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/17/Everything/x86_64/os/repodata/7009de56f1a1c399930fa72094a310a40d38153c96d0b5af443914d3d6a7d811-primary.xml.gz; - sha256 = "04fqlzbd651r8jpvbl4n7hakh3d422ir88571y9rkhx1y5bdw2bh"; - }; - urlPrefix = mirror://fedora/linux/releases/17/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora18i386 = { - name = "fedora-18-i386"; - fullName = "Fedora 18 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/18/Everything/i386/os/repodata/935f57e61365047b6aee346792bc68bfd24de30874ce5d26bf730a992d36678d-primary.xml.gz; - sha256 = "935f57e61365047b6aee346792bc68bfd24de30874ce5d26bf730a992d36678d"; - }; - urlPrefix = mirror://fedora/linux/releases/18/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora18x86_64 = { - name = "fedora-18-x86_64"; - fullName = "Fedora 18 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/18/Everything/x86_64/os/repodata/463ac49f2218e404607b2eeb3c04be1a648d90293f4239bbb6a63c2fed672bea-primary.xml.gz; - sha256 = "463ac49f2218e404607b2eeb3c04be1a648d90293f4239bbb6a63c2fed672bea"; - }; - urlPrefix = mirror://fedora/linux/releases/18/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora19i386 = { - name = "fedora-19-i386"; - fullName = "Fedora 19 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/19/Everything/i386/os/repodata/b72220bcdefff8b38de1c9029a630db4813e073f88c4b080ca274d133e0460d1-primary.xml.gz; - sha256 = "b72220bcdefff8b38de1c9029a630db4813e073f88c4b080ca274d133e0460d1"; - }; - urlPrefix = mirror://fedora/linux/releases/19/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora19x86_64 = { - name = "fedora-19-x86_64"; - fullName = "Fedora 19 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/19/Everything/x86_64/os/repodata/d3f67da6461748f57a06459e6877fd07858828e256f58f032704186a65430fd3-primary.xml.gz; - sha256 = "d3f67da6461748f57a06459e6877fd07858828e256f58f032704186a65430fd3"; - }; - urlPrefix = mirror://fedora/linux/releases/19/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora20i386 = { - name = "fedora-20-i386"; - fullName = "Fedora 20 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/20/Everything/i386/os/repodata/ae9c6ae73a12a64227e6b8e7b2d7e1c2a9515bd9c82f2af006c838e7a445dcb9-primary.xml.gz; - sha256 = "1ffw8njfff680vq2lby8v5dm3af2w7bv5rxqwqkl59hj7bknm75f"; - }; - urlPrefix = mirror://fedora/linux/releases/20/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora20x86_64 = { - name = "fedora-20-x86_64"; - fullName = "Fedora 20 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/20/Everything/x86_64/os/repodata/d7777ea6ec66e1c86c3fe1900adf5bf8d877fb77dd06e439bd76bbbec4e82094-primary.xml.gz; - sha256 = "1510x32bxfvnplwy81nxfzxpgn7qbgghm4717xnciqb6xjk7wxyp"; - }; - urlPrefix = mirror://fedora/linux/releases/20/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora21i386 = { - name = "fedora-21-i386"; - fullName = "Fedora 21 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/21/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "a6ad1140adeef65bbc1fdcc7f8f2b356f0d20c71bbe3f1625038e7f43fc44780"; - }; - urlPrefix = mirror://fedora/linux/releases/21/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora21x86_64 = { - name = "fedora-21-x86_64"; - fullName = "Fedora 21 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/21/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "e2a28baab2ea4632fad93f9f28144cda3458190888fdf7f2acc9bc289f397e96"; - }; - urlPrefix = mirror://fedora/linux/releases/21/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora23i386 = { - name = "fedora-23-i386"; - fullName = "Fedora 23 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/23/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "0d1012e6c1f1d694ab5354d95005791ce8de908016d07e5ed0b9dac9b9223492"; - }; - urlPrefix = mirror://fedora/linux/releases/23/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora23x86_64 = { - name = "fedora-23-x86_64"; - fullName = "Fedora 23 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/23/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "0fa09bb5f82e4a04890b91255f4b34360e38ede964fe8328f7377e36f06bad27"; - }; - urlPrefix = mirror://fedora/linux/releases/23/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora24i386 = { - name = "fedora-24-i386"; - fullName = "Fedora 24 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/24/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "6928e251628da7a74b79180739a43784e534eaa744ba4bcb18c847dff541f344"; - }; - urlPrefix = mirror://fedora/linux/releases/24/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora24x86_64 = { - name = "fedora-24-x86_64"; - fullName = "Fedora 24 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/24/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "8dcc989396ed27fadd252ba9b655019934bc3d9915f186f1f2f27e71eba7b42f"; - }; - urlPrefix = mirror://fedora/linux/releases/24/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora25i386 = { - name = "fedora-25-i386"; - fullName = "Fedora 25 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/25/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "4d399e5eebb8d543d50e2da274348280fae07a6efcc469491784582b39d73bba"; - }; - urlPrefix = mirror://fedora/linux/releases/25/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora25x86_64 = { - name = "fedora-25-x86_64"; - fullName = "Fedora 25 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/25/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "eaea04bff7327c49d90240992dff2be6d451a1758ef83e94825f23d4ff27e868"; - }; - urlPrefix = mirror://fedora/linux/releases/25/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - opensuse103i386 = { - name = "opensuse-10.3-i586"; - fullName = "openSUSE 10.3 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/10.3/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "0zb5kxsb755nqq9i8jdclmanacyf551ncx6a011v9jqphsvyfvd7"; - }; - urlPrefix = mirror://opensuse/10.3/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages ++ [ "devs" ]; - }; - - opensuse110i386 = { - name = "opensuse-11.0-i586"; - fullName = "openSUSE 11.0 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/11.0/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "13rv855aj8p3h1zpsji5xa1wpkhgq94gcxzvg05l2b68b15q3mwn"; - }; - urlPrefix = mirror://opensuse/11.0/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages; - }; - - opensuse110x86_64 = { - name = "opensuse-11.0-x86_64"; - fullName = "openSUSE 11.0 (x86_64)"; - packagesList = fetchurl { - url = mirror://opensuse/11.0/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "13rv855aj8p3h1zpsji5xa1wpkhgq94gcxzvg05l2b68b15q3mwn"; - }; - urlPrefix = mirror://opensuse/11.0/repo/oss/suse/; - archs = ["noarch" "x86_64"]; - packages = commonOpenSUSEPackages; - }; - - opensuse111i386 = { - name = "opensuse-11.1-i586"; - fullName = "openSUSE 11.1 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/11.1/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "1mfmp9afikj0hci1s8cpwjdr0ycbpfym9gdhci590r9fa75w221j"; - }; - urlPrefix = mirror://opensuse/11.1/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages; - }; - - opensuse111x86_64 = { - name = "opensuse-11.1-x86_64"; - fullName = "openSUSE 11.1 (x86_64)"; - packagesList = fetchurl { - url = mirror://opensuse/11.1/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "1mfmp9afikj0hci1s8cpwjdr0ycbpfym9gdhci590r9fa75w221j"; - }; - urlPrefix = mirror://opensuse/11.1/repo/oss/suse/; - archs = ["noarch" "x86_64"]; - packages = commonOpenSUSEPackages; - }; - - opensuse132i386 = { - name = "opensuse-13.2-i586"; - fullName = "openSUSE 13.2 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/13.2/repo/oss/suse/repodata/485e4f44e3c3ef3133accb589480933c2fe48dedfc44a7e5f9d5437cd9122a99-primary.xml.gz; - sha256 = "0klzmk680as4sb6h1wl0ynj0dds3m70qim66wwbiqlnnp6xkf83y"; - }; - urlPrefix = mirror://opensuse/13.2/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages; - }; - - opensuse132x86_64 = { - name = "opensuse-13.2-x86_64"; - fullName = "openSUSE 13.2 (x86_64)"; - packagesList = fetchurl { - url = mirror://opensuse/13.2/repo/oss/suse/repodata/485e4f44e3c3ef3133accb589480933c2fe48dedfc44a7e5f9d5437cd9122a99-primary.xml.gz; - sha256 = "0klzmk680as4sb6h1wl0ynj0dds3m70qim66wwbiqlnnp6xkf83y"; - }; - urlPrefix = mirror://opensuse/13.2/repo/oss/suse/; - archs = ["noarch" "x86_64"]; - packages = commonOpenSUSEPackages; - }; - - centos65i386 = { - name = "centos-6.5-i386"; - fullName = "CentOS 6.5 (i386)"; - packagesList = fetchurl { - url = http://vault.centos.org/6.5/os/i386/repodata/a89f27cc7d3cea431f3bd605a1e9309c32d5d409abc1b51a7b5c71c05f18a0c2-primary.xml.gz; - sha256 = "1hm031gw0wawgcdbbhdb17adaclw63ls21fn7cgl7siwgp62g7x8"; - }; - urlPrefix = http://vault.centos.org/6.5/os/i386; - archs = ["noarch" "i386"]; - packages = commonCentOSPackages ++ [ "procps" ]; - }; - - centos65x86_64 = { - name = "centos-6.5-x86_64"; - fullName = "CentOS 6.5 (x86_64)"; - packagesList = fetchurl { - url = http://vault.centos.org/6.5/os/x86_64/repodata/3353e378f5cb4bb6c3b3dd2ca266c6d68a1e29c36cf99f76aea3d8e158626024-primary.xml.gz; - sha256 = "0930c9cf3n53mrv9zybcqclix2nnqrka4b6xng1vcjybymwf6lrk"; - }; - urlPrefix = http://vault.centos.org/6.5/os/x86_64/; - archs = ["noarch" "x86_64"]; - packages = commonCentOSPackages ++ [ "procps" ]; - }; # Note: no i386 release for 7.x - centos71x86_64 = { - name = "centos-7.1-x86_64"; - fullName = "CentOS 7.1 (x86_64)"; - packagesList = fetchurl { - url = http://vault.centos.org/7.1.1503/os/x86_64/repodata/1386c5af55bda40669bb5ed91e0a22796c3ed7325367506109b09ea2657f22bd-primary.xml.gz; - sha256 = "1g92gxjs57mh15hm0rsk6bbkwv3r4851xnaypdlhd95xanpwb1hk"; + centos7x86_64 = + let version = "7.4.1708"; + in rec { + name = "centos-${version}-x86_64"; + fullName = "CentOS ${version} (x86_64)"; + # N.B. Switch to vault.centos.org when the next release comes out + # urlPrefix = "http://vault.centos.org/${version}/os/x86_64"; + urlPrefix = "http://mirror.centos.org/centos-7/${version}/os/x86_64"; + packagesList = fetchurl rec { + url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; + sha256 = "b686d3a0f337323e656d9387b9a76ce6808b26255fc3a138b1a87d3b1cb95ed5"; + }; + archs = ["noarch" "x86_64"]; + packages = commonCentOSPackages ++ [ "procps-ng" ]; }; - urlPrefix = http://vault.centos.org/7.1.1503/os/x86_64; - archs = ["noarch" "x86_64"]; - packages = commonCentOSPackages ++ [ "procps-ng" ]; - }; - }; @@ -1321,207 +838,6 @@ rec { # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are # wrong, but the SHA-1 and MD5 hashes are correct. Intrepid is fine. - ubuntu710i386 = { - name = "ubuntu-7.10-gutsy-i386"; - fullName = "Ubuntu 7.10 Gutsy (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/gutsy/main/binary-i386/Packages.bz2; - sha256 = "0fmac8svxq86a4w878g6syczvy5ff4jrdc1gajd3xd8z0dypnw27"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu804i386 = { - name = "ubuntu-8.04-hardy-i386"; - fullName = "Ubuntu 8.04 Hardy (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/hardy/main/binary-i386/Packages.bz2; - sha256 = "19132nc9fhdfmgmvn834lk0d8c0n3jv0ndz9inyynh9k6pc8b5hd"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu804x86_64 = { - name = "ubuntu-8.04-hardy-amd64"; - fullName = "Ubuntu 8.04 Hardy (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/hardy/main/binary-amd64/Packages.bz2; - sha256 = "1xjcgh0ydixmim7kgxss0mhfw0sibpgygvgsyac4bdz9m503sj3h"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu810i386 = { - name = "ubuntu-8.10-intrepid-i386"; - fullName = "Ubuntu 8.10 Intrepid (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/intrepid/main/binary-i386/Packages.bz2; - sha256 = "70483d40a9e9b74598f2faede7df5d5103ee60055af7374f8db5c7e6017c4cf6"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu810x86_64 = { - name = "ubuntu-8.10-intrepid-amd64"; - fullName = "Ubuntu 8.10 Intrepid (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/intrepid/main/binary-amd64/Packages.bz2; - sha256 = "01b2f3842cbdd5834446ddf91691bcf60f59a726dcefa23fb5b93fdc8ea7e27f"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu904i386 = { - name = "ubuntu-9.04-jaunty-i386"; - fullName = "Ubuntu 9.04 Jaunty (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/jaunty/main/binary-i386/Packages.bz2; - sha256 = "72c95e4901ad56ce8791723e2ae40bce2399f306f9956cac80e964011e1948d0"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu904x86_64 = { - name = "ubuntu-9.04-jaunty-amd64"; - fullName = "Ubuntu 9.04 Jaunty (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/jaunty/main/binary-amd64/Packages.bz2; - sha256 = "af760ce04e43f066b8938b1abdeff979a642f940515659ede44f7877ca358ca8"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu910i386 = { - name = "ubuntu-9.10-karmic-i386"; - fullName = "Ubuntu 9.10 Karmic (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/karmic/main/binary-i386/Packages.bz2; - sha256 = "6e3e813857496f2af6cd7e6ada06b3398fa067a7992c5fd7e8bd8fa92e3548b7"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diff" "mktemp" ]; - }; - - ubuntu910x86_64 = { - name = "ubuntu-9.10-karmic-amd64"; - fullName = "Ubuntu 9.10 Karmic (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/karmic/main/binary-amd64/Packages.bz2; - sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diff" "mktemp" ]; - }; - - ubuntu1004i386 = { - name = "ubuntu-10.04-lucid-i386"; - fullName = "Ubuntu 10.04 Lucid (i386)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/lucid/main/binary-i386/Packages.bz2; - sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa"; - }) - (fetchurl { - url = mirror://ubuntu/dists/lucid/universe/binary-i386/Packages.bz2; - sha256 = "13nvsb7na9igps2fdbbfpq4y8ihccmcs6x35pfyfp6rkhjgpzigy"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; - }; - - ubuntu1004x86_64 = { - name = "ubuntu-10.04-lucid-amd64"; - fullName = "Ubuntu 10.04 Lucid (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/lucid/main/binary-amd64/Packages.bz2; - sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0"; - }) - (fetchurl { - url = mirror://ubuntu/dists/lucid/universe/binary-amd64/Packages.bz2; - sha256 = "112lbnf8rcsbbh89aci4m6gwac0jy16838aij0av8n076zwkvlj9"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; - }; - - ubuntu1010i386 = { - name = "ubuntu-10.10-maverick-i386"; - fullName = "Ubuntu 10.10 Maverick (i386)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2; - sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0"; - }) - (fetchurl { - url = mirror://ubuntu/dists/maverick/universe/binary-i386/Packages.bz2; - sha256 = "1g5pnhx730wj32221ic8p2q6zcka23knpyg190mvq9x7kflcbfzy"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1010x86_64 = { - name = "ubuntu-10.10-maverick-amd64"; - fullName = "Ubuntu 10.10 Maverick (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2; - sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc"; - }) - (fetchurl { - url = mirror://ubuntu/dists/maverick/universe/binary-amd64/Packages.bz2; - sha256 = "0m26viwah29gh47p8m3jpnx6l84dhpwnms29m9bvqn1vwcrgjh0s"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1110i386 = { - name = "ubuntu-11.10-oneiric-i386"; - fullName = "Ubuntu 11.10 Oneiric (i386)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/oneiric/main/binary-i386/Packages.bz2; - sha256 = "11r1s76ppi7rwz08i20d7n4ndaj9lb9wsl9k8ww4s1c6agzpwv8a"; - }) - (fetchurl { - url = mirror://ubuntu/dists/oneiric/universe/binary-i386/Packages.bz2; - sha256 = "1dr59j8pjdhk07fpc0x73afcd9630kkdsbabx3bj92q71104yigz"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1110x86_64 = { - name = "ubuntu-11.10-oneiric-amd64"; - fullName = "Ubuntu 11.10 Oneiric (amd64)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/oneiric/main/binary-amd64/Packages.bz2; - sha256 = "07k784gxwaqmyggmzczy9hjkgfp6p6dcs8rhkxw5hfzn0jaf8l2s"; - }) - (fetchurl { - url = mirror://ubuntu/dists/oneiric/universe/binary-amd64/Packages.bz2; - sha256 = "1v3ldxn5jnnfgs863ryd6wl3fsb3glainr1ma2zn2l5vpzhpi2h1"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - ubuntu1204i386 = { name = "ubuntu-12.04-precise-i386"; fullName = "Ubuntu 12.04 Precise (i386)"; @@ -1542,7 +858,7 @@ rec { ubuntu1204x86_64 = { name = "ubuntu-12.04-precise-amd64"; fullName = "Ubuntu 12.04 Precise (amd64)"; - packagesList = + packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; @@ -1556,119 +872,17 @@ rec { packages = commonDebPackages ++ [ "diffutils" ]; }; - ubuntu1210i386 = { - name = "ubuntu-12.10-quantal-i386"; - fullName = "Ubuntu 12.10 Quantal (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/quantal/main/binary-i386/Packages.bz2; - sha256 = "bee3200ac8f037700ccd2311fb8b0de665bd02d46bdb2ae946cf50c5885001c3"; - }) - (fetchurl { - url = mirror://ubuntu/dists/quantal/universe/binary-i386/Packages.bz2; - sha256 = "9933ce12e7830b9c68a4aead08b86fcbb8d6ef0ea1fd133f0cf9d7126ad8c9bd"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1210x86_64 = { - name = "ubuntu-12.10-quantal-amd64"; - fullName = "Ubuntu 12.10 Quantal (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/quantal/main/binary-amd64/Packages.bz2; - sha256 = "ef14073f335ef118ebe1c7d45f5a0c17ef28f72abb57c10b9082ab5e04b5d003"; - }) - (fetchurl { - url = mirror://ubuntu/dists/quantal/universe/binary-amd64/Packages.bz2; - sha256 = "329a98312248c98092f8b91f232fc68fd3e6e2337ea4f348b3785465ae8dae17"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1304i386 = { - name = "ubuntu-13.04-raring-i386"; - fullName = "Ubuntu 13.04 Raring (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/raring/main/binary-i386/Packages.bz2; - sha256 = "b7da6802c5302439d9abf05ebe1ab4c3b82d7be9356f51a12c5bf4994f009181"; - }) - (fetchurl { - url = mirror://ubuntu/dists/raring/universe/binary-i386/Packages.bz2; - sha256 = "c1a59dd9132654194f4470932fd0f1582496465d8f96909b22accaf9f404024a"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1304x86_64 = { - name = "ubuntu-13.04-raring-amd64"; - fullName = "Ubuntu 13.04 Raring (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/raring/main/binary-amd64/Packages.bz2; - sha256 = "9ee6a67bedbda80b668a868bb81b5b3f30bbabac01f69d2a08961c37c8536356"; - }) - (fetchurl { - url = mirror://ubuntu/dists/raring/universe/binary-amd64/Packages.bz2; - sha256 = "8aba137ae18540a12de03a564c11496431a150ab2d4d1e93e2b4b691fa2a4850"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1310i386 = { - name = "ubuntu-13.10-saucy-i386"; - fullName = "Ubuntu 13.10 Saucy (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/saucy/main/binary-i386/Packages.bz2; - sha256 = "9b35d44a737e6aa7e1cb5e2b52ba0ed8717c8820b3950c2e7ade07024db9c138"; - }) - (fetchurl { - url = mirror://ubuntu/dists/saucy/universe/binary-i386/Packages.bz2; - sha256 = "897f64c19a742ac8524c17c1b5ec31b33ec8ab20c85463010d8bf04f5d14aa0f"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1310x86_64 = { - name = "ubuntu-13.10-saucy-amd64"; - fullName = "Ubuntu 13.10 Saucy (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/saucy/main/binary-amd64/Packages.bz2; - sha256 = "d000968f9653d7c25928002b0850fe2da97607682f63a351eb2c89896a219a12"; - }) - (fetchurl { - url = mirror://ubuntu/dists/saucy/universe/binary-amd64/Packages.bz2; - sha256 = "a899ce5513ce8540ce9b8da4c1cd85b16b231900881b3aa559f7ac3182cdbfc8"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - ubuntu1404i386 = { name = "ubuntu-14.04-trusty-i386"; fullName = "Ubuntu 14.04 Trusty (i386)"; packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2; - sha256 = "fdfc38663915c5cef3029872deb8c3bf52b98092073058086e2f1db0c71ebeb4"; + sha256 = "1d5y3v3v079gdq45hc07ja0bjlmzqfwdwwlq0brwxi8m75k3iz7x"; }) (fetchurl { url = mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2; - sha256 = "2afcf259332d88c5e02f5446c4926edd567ef1a00ce24ca7cb400cbf44e2a90f"; + sha256 = "03x9w92by320rfklrqhcl3qpwmnxds9c8ijl5zhcb21d6dcz5z1a"; }) ]; urlPrefix = mirror://ubuntu; @@ -1678,116 +892,14 @@ rec { ubuntu1404x86_64 = { name = "ubuntu-14.04-trusty-amd64"; fullName = "Ubuntu 14.04 Trusty (amd64)"; - packagesList = + packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2; - sha256 = "7095917eb8e4ac9161bc3b2ceeaf86e9265aae7b855a0e15d72096ecb05f1fc2"; + sha256 = "1hhzbyqfr5i0swahwnl5gfp5l9p9hspywb1vpihr3b74p1z935bh"; }) (fetchurl { url = mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2; - sha256 = "558637eeb8e340b871653e2060effe36e064677eca4eae62d9e4138dd402a610"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1410i386 = { - name = "ubuntu-14.10-utopic-i386"; - fullName = "Ubuntu 14.10 Utopic (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/utopic/main/binary-i386/Packages.bz2; - sha256 = "dc33a906ccb5625740251da759393d7daace65013d421c79fdd6c99a6490d989"; - }) - (fetchurl { - url = mirror://ubuntu/dists/utopic/universe/binary-i386/Packages.bz2; - sha256 = "e50553c033d9e478507405e63ce7d43c8060368ea851eca0c93b75b72fd85167"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1410x86_64 = { - name = "ubuntu-14.10-utopic-amd64"; - fullName = "Ubuntu 14.10 Utopic (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/utopic/main/binary-amd64/Packages.bz2; - sha256 = "9650775abec90a24c26dbb03f91a488180309144338f64f7044f7119d60d7182"; - }) - (fetchurl { - url = mirror://ubuntu/dists/utopic/universe/binary-amd64/Packages.bz2; - sha256 = "2acf0e39e64b4fd6d2b68b55c598fc167d7c3cabae233fc31a1e6b69eb6ecc63"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1504i386 = { - name = "ubuntu-15.04-vivid-i386"; - fullName = "Ubuntu 15.04 Vivid (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/vivid/main/binary-i386/Packages.bz2; - sha256 = "0bf587152fa3fc3524bf3a3caaf46ea43cc640a27b2b448577232f014a3ec1e4"; - }) - (fetchurl { - url = mirror://ubuntu/dists/vivid/universe/binary-i386/Packages.bz2; - sha256 = "3452cff96eb715ca36b73d4d0cdffbf06064cbc30b1097e334a2e493b94c7fac"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1504x86_64 = { - name = "ubuntu-15.04-vivid-amd64"; - fullName = "Ubuntu 15.04 Vivid (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/vivid/main/binary-amd64/Packages.bz2; - sha256 = "8f22c9bd389822702e65713e816250aa0d5829d6b3d75fd34f068de5f93de1d9"; - }) - (fetchurl { - url = mirror://ubuntu/dists/vivid/universe/binary-amd64/Packages.bz2; - sha256 = "feb88768e245a63ee04b0f3bcfc8899a1f03b2f831646dc2a59e4e58884b5cb9"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1510i386 = { - name = "ubuntu-15.10-wily-i386"; - fullName = "Ubuntu 15.10 Wily (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/wily/main/binary-i386/Packages.bz2; - sha256 = "ac9821095c63436fd4286539592295dd5de99bc82300f628e7a74111bb5dc370"; - }) - (fetchurl { - url = mirror://ubuntu/dists/wily/universe/binary-i386/Packages.bz2; - sha256 = "8951294f36c0755e945e8c37fdd046319f50553a8987ead1b68b21ffa53c5f7f"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1510x86_64 = { - name = "ubuntu-15.10-wily-amd64"; - fullName = "Ubuntu 15.10 Wily (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/wily/main/binary-amd64/Packages.bz2; - sha256 = "2877de7674c8c6a410c3ac479e46fec24164a4de250f22b3ff062073e3985013"; - }) - (fetchurl { - url = mirror://ubuntu/dists/wily/universe/binary-amd64/Packages.bz2; - sha256 = "714be7a2fd33b8bb577901c9223039dcc12c130c9244122648ee21a625e2a66d"; + sha256 = "04560ba8s4z4v5iawknagrkn9q1nzvpn081ycmqvhh73p3p3g1jm"; }) ]; urlPrefix = mirror://ubuntu; @@ -1814,7 +926,7 @@ rec { ubuntu1604x86_64 = { name = "ubuntu-16.04-xenial-amd64"; fullName = "Ubuntu 16.04 Xenial (amd64)"; - packagesList = + packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/xenial/main/binary-amd64/Packages.xz; sha256 = "110qnkhjkkwm316fbig3aivm2595ydz6zskc4ld5cr8ngcrqm1bn"; @@ -1828,153 +940,85 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1610i386 = { - name = "ubuntu-16.10-yakkety-i386"; - fullName = "Ubuntu 16.10 Yakkety (i386)"; + ubuntu1710i386 = { + name = "ubuntu-17.10-artful-i386"; + fullName = "Ubuntu 17.10 Artful (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/yakkety/main/binary-i386/Packages.xz; - sha256 = "da811f582779a969f738f2366c17e075cf0da3c4f2a4ed1926093a2355fd72ba"; + url = mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz; + sha256 = "18yrj4kqdzm39q0527m97h5ing58hkm9yq9iyj636zh2rclym3c8"; }) (fetchurl { - url = mirror://ubuntu/dists/yakkety/universe/binary-i386/Packages.xz; - sha256 = "5162b0a87173cd5dea7ce2273788befe36f38089d44a2379ed9dd92f76c6b2aa"; + url = mirror://ubuntu/dists/artful/universe/binary-i386/Packages.xz; + sha256 = "1v0njw2w80xfmxi7by76cs8hyxlla5h3gqajlpdw5srjgx2qrm2g"; }) ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1610x86_64 = { - name = "ubuntu-16.10-yakkety-amd64"; - fullName = "Ubuntu 16.10 Yakkety (amd64)"; - packagesList = + ubuntu1710x86_64 = { + name = "ubuntu-17.10-artful-amd64"; + fullName = "Ubuntu 17.10 Artful (amd64)"; + packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/yakkety/main/binary-amd64/Packages.xz; - sha256 = "356c4cfab0d7f77b75c473cd78b22ee7288f63b24c9739049924dc081dd2e3d1"; + url = mirror://ubuntu/dists/artful/main/binary-amd64/Packages.xz; + sha256 = "104g57j1l3vi8wb5f7rgjvjhf82ccs0vwhc59jfc4ynd51z7fqjk"; }) (fetchurl { - url = mirror://ubuntu/dists/yakkety/universe/binary-amd64/Packages.xz; - sha256 = "a72660f8feffd6978e3b9328c6259b5387ac0b4f33d1029e4a17091ceb5057e6"; + url = mirror://ubuntu/dists/artful/universe/binary-amd64/Packages.xz; + sha256 = "1qzs95wfy9inaskfx9cf1l5yd3aaqwzy72zzi9xyvkxi75k5gcn4"; }) ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - debian40i386 = { - name = "debian-4.0r9-etch-i386"; - fullName = "Debian 4.0r9 Etch (i386)"; - packagesList = fetchurl { - url = mirror://debian/dists/etch/main/binary-i386/Packages.bz2; - sha256 = "40eeeecc35e6895b6eb0bc601e38fe53fc985d1b1f3fea3766f34763d21f206f"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian40x86_64 = { - name = "debian-4.0r9-etch-amd64"; - fullName = "Debian 4.0r9 Etch (amd64)"; - packagesList = fetchurl { - url = mirror://debian/dists/etch/main/binary-amd64/Packages.bz2; - sha256 = "cf1c4c7d72e0da45797b046011254d2bd83f5ecb7389c7f30d2561be3f5b2e49"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian50i386 = { - name = "debian-5.0.10-lenny-i386"; - fullName = "Debian 5.0.10 Lenny (i386)"; - packagesList = fetchurl { - url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2; - sha256 = "fb390cf043a5b6bac50879ce1c0827882abdb560050313a6a326a03a4fc761d6"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian50x86_64 = { - name = "debian-5.0.10-lenny-amd64"; - fullName = "Debian 5.0.10 Lenny (amd64)"; + debian8i386 = { + name = "debian-8.10-jessie-i386"; + fullName = "Debian 8.10 Jessie (i386)"; packagesList = fetchurl { - url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2; - sha256 = "1y4bb3n770fgwsrw8qiwsgf17k0ws2d6jmcfvqv07lj77dyj53wc"; + url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; + sha256 = "1w1gm195dcrndy5486kcv0h9l3br9dqnqyyhmavp4vr5w2zk7amk"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; - debian60i386 = { - name = "debian-6.0.10-squeeze-i386"; - fullName = "Debian 6.0.10 Squeeze (i386)"; + debian8x86_64 = { + name = "debian-8.10-jessie-amd64"; + fullName = "Debian 8.10 Jessie (amd64)"; packagesList = fetchurl { - url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2; - sha256 = "c08899011a7a2b0df4da08f91eef3a80d112a247df988b1c966c9fb64c812392"; + url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; + sha256 = "045700qsrmd3lng2rw8nfs5ci7pf660lwl6alpzkyjikyp6pg7k8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; - debian60x86_64 = { - name = "debian-6.0.10-squeeze-amd64"; - fullName = "Debian 6.0.10 Squeeze (amd64)"; + debian9i386 = { + name = "debian-9.3-stretch-i386"; + fullName = "Debian 9.3 Stretch (i386)"; packagesList = fetchurl { - url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2; - sha256 = "3f2ebd5221b9a4bdf7224acf728a51a987c63d32df1bbc20a97f177d2f184045"; + url = mirror://debian/dists/stretch/main/binary-i386/Packages.xz; + sha256 = "1rpv0r92pkr9dmjvpffvgmq3an1s83npfmq870h67jqag3qpwj9l"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; - # Backward compatibility. - debian70i386 = debian7i386; - debian70x86_64 = debian7x86_64; - - debian7i386 = { - name = "debian-7.11-wheezy-i386"; - fullName = "Debian 7.11 Wheezy (i386)"; + debian9x86_64 = { + name = "debian-9.3-stretch-amd64"; + fullName = "Debian 9.3 Stretch (amd64)"; packagesList = fetchurl { - url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2; - sha256 = "57ea423dc1c0cc082cae580360f8e7192c9fd60e2ef775a4ce7f48784277462d"; + url = mirror://debian/dists/stretch/main/binary-amd64/Packages.xz; + sha256 = "1gnkvh7wc5yp0rw8kq8p8rlskvl0lc4cv3gdylw8qpqzy75xqlig"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; - debian7x86_64 = { - name = "debian-7.11-wheezy-amd64"; - fullName = "Debian 7.11 Wheezy (amd64)"; - packagesList = fetchurl { - url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2; - sha256 = "b400e459ce2f8af8621182c3a9ea843f0df3dc2d5662e6c6204f9406f5ff2d41"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - debian8i386 = { - name = "debian-8.9-jessie-i386"; - fullName = "Debian 8.9 Jessie (i386)"; - packagesList = fetchurl { - url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "3c78bdf3b693f2f37737c52d6a7718b3a545956f2a853da79f04a2d15541e811"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian8x86_64 = { - name = "debian-8.9-jessie-amd64"; - fullName = "Debian 8.9 Jessie (amd64)"; - packagesList = fetchurl { - url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "0605589ae7a63c690f37bd2567dc12e02a2eb279d9dc200a7310072ad3593e53"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; }; @@ -1994,7 +1038,7 @@ rec { "make" "patch" "perl" - "pkgconfig" + "pkgconf-pkg-config" "rpm" "rpm-build" "tar" @@ -2098,6 +1142,7 @@ rec { # Needed because it provides /etc/login.defs, whose absence causes # the "passwd" post-installs script to fail. "login" + "passwd" ]; commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ]; diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index 01884f488780051b5944ce233b7cba2f3ce6eed2..2c46d5fae9072900e69cd6ba5b77cefecf700283 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -21,7 +21,6 @@ let crossSystem = { libc = "msvcrt"; platform = {}; - openssl.system = "mingw64"; inherit arch; config = "${arch}-w64-mingw32"; }; diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 13f8adf56771cd79883efcd4e05fed1429a16375..3e507660a65efc58b00ecb58fa035eb100774c1d 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -6,10 +6,11 @@ die() { exit 1 } -# Usage: update-source-hash [] +# Usage: update-source-hash [] [] attr=$1 newVersion=$2 newHash=$3 +newUrl=$4 nixFile=$(nix-instantiate --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') if [ ! -f "$nixFile" ]; then @@ -27,6 +28,12 @@ if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" fi +oldUrl=$(nix-instantiate --eval -E "with import ./. {}; builtins.elemAt $attr.src.drvAttrs.urls 0" | tr -d '"') + +if [ -z "$oldUrl" ]; then + die "Couldn't evaluate source url from '$attr.name'!" +fi + drvName=$(nix-instantiate --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"') oldVersion=$(nix-instantiate --eval -E "with import ./. {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"') @@ -39,13 +46,14 @@ if [ "$oldVersion" = "$newVersion" ]; then exit 0 fi -# Escape dots, there should not be any other regex characters allowed in store path names -oldVersion=$(echo "$oldVersion" | sed -re 's|\.|\\.|g') +# Escape regex metacharacter that are allowed in store path names +oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') +oldUrl=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') -if [ $(grep -c -E "^\s*(let\b)?\s*version\s+=\s+\"$oldVersion\"" "$nixFile") = 1 ]; then +if [ $(grep -c -E "^\s*(let\b)?\s*version\s*=\s*\"$oldVersion\"" "$nixFile") = 1 ]; then pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|" -elif [ $(grep -c -E "^\s*(let\b)?\s*name\s+=\s+\"$drvName-$oldVersion\"" "$nixFile") = 1 ]; then - pattern="/\bname\b\s*=/ s|\"$drvName-$oldVersion\"|\"$drvName-$newVersion\"|" +elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersion\"" "$nixFile") = 1 ]; then + pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|" else die "Couldn't figure out where out where to patch in new version in '$attr'!" fi @@ -56,6 +64,15 @@ if cmp -s "$nixFile" "$nixFile.bak"; then die "Failed to replace version '$oldVersion' to '$newVersion' in '$attr'!" fi +# Replace new URL +if [ -n "$newUrl" ]; then + sed -i "$nixFile" -re "s|\"$oldUrl\"|\"$newUrl\"|" + + if cmp -s "$nixFile" "$nixFile.bak"; then + die "Failed to replace source URL '$oldUrl' to '$newUrl' in '$attr'!" + fi +fi + case "$oldHashAlgo" in sha256) hashLength=64 ;; sha512) hashLength=128 ;; @@ -74,7 +91,7 @@ fi if [ -z "$newHash" ]; then nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed - newHash=$(tail -n2 "$attr.fetchlog" | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | awk '{ print $(NF-4) }') + newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'~\1\2~" | head -n1) fi if [ -z "$newHash" ]; then @@ -82,6 +99,11 @@ if [ -z "$newHash" ]; then die "Couldn't figure out new hash of '$attr.src'!" fi +if [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then + mv "$nixFile.bak" "$nixFile" + die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" +fi + sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|" if cmp -s "$nixFile" "$nixFile.bak"; then die "Failed to replace temporary source hash of '$attr' to the final source hash!" diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix index e205129db194c9b05f48a21dcc150dc10bf7d490..51ebe704beac8cf815fb89f30e52a99baa5c5191 100644 --- a/pkgs/data/documentation/bgnet/default.nix +++ b/pkgs/data/documentation/bgnet/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = https://beej.us/guide/bgnet/; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index b77b79338c756778739097b7c10af417455da222..ec58dfd7749249de3204fdd1890d02325c87d0c0 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.12"; + version = "4.15"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093"; + sha256 = "01n1rq1kvambax85xamriawbga94mh63s5mgjmjljjgf50m7yw6f"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { description = "Linux development manual pages"; homepage = https://www.kernel.org/doc/man-pages/; repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix index 5659cac6703d8786f5d8898a3fff961f80cd6973..08690b7cecfcb5d5c8dfa8caf52adaf78b0bfd0b 100644 --- a/pkgs/data/documentation/mustache-spec/default.nix +++ b/pkgs/data/documentation/mustache-spec/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://mustache.github.io/; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 59a7612c6aa0c9452fa7719ec3dbe56a28566fd8..25df45258a6f21833ea29e87a46200aac1bdf517 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "stdman-${version}"; - version = "2017.04.02"; + version = "2018.03.11"; src = fetchFromGitHub { owner = "jeaye"; repo = "stdman"; rev = "${version}"; - sha256 = "1wfxd9ca8b9l976rnlhjd0sp364skfm99wxi633swwwjvhy26sgm"; + sha256 = "1017vwhcwlwi5sa8h6pkhj048in826wxnhl6qarykmzksvidff3r"; }; outputDevdoc = "out"; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index a1e90244f808b8ee8430480b739b1e4e62c547bc..e9225900cb7bbc722ea5de54fbdb73365b49b24c 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "zeal-${version}"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; rev = "v${version}"; - sha256 = "1mfcw843g4slr79bvidb5s88m7a3swr9by6srdn233b88j8mqwzl"; + sha256 = "0zsrb89jz04b8in1d69p7mg001yayyljc47vdlvm48cjbhvxwj0k"; }; # while ads can be disabled from the user settings, by default they are not so @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; - homepage = http://zealdocs.org/; + homepage = https://zealdocs.org/; license = licenses.gpl3; - maintainers = with maintainers; [ skeidel ]; + maintainers = with maintainers; [ skeidel peterhoeg ]; platforms = platforms.linux; }; } diff --git a/pkgs/data/documentation/zeal/remove_ads.patch b/pkgs/data/documentation/zeal/remove_ads.patch index 7f163376865ca79d8d3c2409d21e91f70ed398ca..be0cab305eb55af95bf8e9ce9fb2f8b135627090 100644 --- a/pkgs/data/documentation/zeal/remove_ads.patch +++ b/pkgs/data/documentation/zeal/remove_ads.patch @@ -1,14 +1,23 @@ +commit 1b61397175b6e60f23224db463301c9057830859 +Author: Peter Hoeg +Date: Mon Feb 19 07:38:03 2018 +0800 + + strip container with ads + diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html -index afe9e2a..490a0fb 100644 +index bb3f511..67382b2 100644 --- a/src/app/resources/browser/welcome.html +++ b/src/app/resources/browser/welcome.html -@@ -34,9 +34,6 @@ -
-
-
--
-- --
-

- - +@@ -20,12 +20,6 @@ + +

+

Docs for everyone

+-
+-
+- +-
+-
+
+
+

Customize

diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 97333f7d953a2d0729e88a6ee52f3b679389ee83..fbf62e3ba38674a71921bab194b26baaf39e2445 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,19 +1,19 @@ {stdenv, fetchzip}: let - version = "10.0.0"; + version = "11.0.2"; in fetchzip { name = "babelstone-han-${version}"; - url = http://www.babelstone.co.uk/Fonts/0816/BabelStoneHan.zip; + url = http://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; postFetch = '' mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype ''; - sha256 = "0648hv5c1hq3bq7mlk7bnmflzzqj4wh137bjqyrwj5hy3nqzvl5r"; + sha256 = "003cz520riskjp729y3piqhmnzfw3jyrmb94im7jyvlc7hp14cdh"; meta = with stdenv.lib; { - description = "Unicode CJK font with over 32600 Han characters"; + description = "Unicode CJK font with over 36000 Han characters"; homepage = http://www.babelstone.co.uk/Fonts/Han.html; license = licenses.free; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index de2edad451b9760e04fd414656188b8257abda8f..9d002ef02ade2fb8b72a4cb7797e746f25a3b3cd 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,18 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: -stdenv.mkDerivation rec { - major = "0.0"; - minor = "25"; - name = "cantarell-fonts-${major}.${minor}"; +let + pname = "cantarell-fonts"; + version = "0.100"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/cantarell-fonts/${major}/${name}.tar.xz"; - sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1286rx1z7mrmi6snx957fprpcmd5p00l6drdfpbgf6mqapl6kb81"; }; + nativeBuildInputs = [ meson ninja gettext appstream-glib ]; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2"; + outputHash = "12ia41pr0rzjfay6y84asw3nxhyp1scq9zl0w4f6wkqj7vf1qfn1"; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 1e4df0c9221e2853164e9c8d09b452a5bd44aded..cbca697cb262fb89291c64e7412dfa201f1a724d 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21"; }; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ mkfontdir mkfontscale ]; installPhase = '' diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index 91c8ed1163d48cc20fa4268ce0c3f04f69241cd9..8c45c8139534323c6cc172446fcc9ad0a5876190 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { inherit sha256; }) fonts; - buildInputs = [cabextract]; + nativeBuildInputs = [cabextract]; buildCommand = '' for i in $exes; do diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 1e888fe0784bd720366c033953ed8e5151539fdc..23158a38f2189a027c45cee922b22880c5a70665 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -25,7 +25,7 @@ let full-ttf = stdenv.mkDerivation { name = "dejavu-fonts-full-${version}"; - buildInputs = [fontforge perl FontTTF]; + nativeBuildInputs = [fontforge perl FontTTF]; src = fetchFromGitHub { owner = "dejavu-fonts"; @@ -64,11 +64,11 @@ in stdenv.mkDerivation { buildCommand = '' mkdir -p $out/share/fonts/truetype cp ${full-ttf}/share/fonts/truetype/*.ttf $out/share/fonts/truetype/ - ln -s --force ${minimal}/share/fonts/truetype/DejaVuSans.ttf $out/share/fonts/truetype/DejaVuSans.ttf + ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1nf0h15p8yvjx36syq1034i3hix99lm8p54iyjw8dpa19i9jfkmd"; + outputHash = "15l93xm9mg2ziaxv4nqy2a4jaz54d05xf0hfz1h84bclzb882llh"; inherit meta; passthru.minimal = minimal; diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix index b94004b24bb4e1c28af322b72c75253570af0c4e..975bbc1749a723a891e54f6a142a5d7c4d19bae8 100644 --- a/pkgs/data/fonts/dina-pcf/default.nix +++ b/pkgs/data/fonts/dina-pcf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; }; - buildInputs = [ unzip bdftopcf mkfontdir mkfontscale ]; + nativeBuildInputs = [ unzip bdftopcf mkfontdir mkfontscale ]; dontBuild = true; patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf"; diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 560aed970bbfd872c1d2a26b2361781efab20230..9d4c1e22e145f0a5a698e9f060b8448a75c62727 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source emoji set"; homepage = http://emojione.com/; license = licenses.cc-by-40; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 40880d022db0b761801bc480964f192e5e1d1b6f..0e31231d05fccdd3585b618a733ea0e74ba33b50 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; }; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ mkfontdir mkfontscale ]; unpackPhase = '' tar -xzf $src --strip-components=1 diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix index de52ae411efbc8a50dac65b7cc72d824a020c4ab..7d05482ef5ffb124422d5045564db8c636e10c7c 100644 --- a/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -1,11 +1,15 @@ -{stdenv, fetchzip}: +{ stdenv, fetchzip }: let - version = "1.7.1"; -in fetchzip rec { + + version = "1.7.2"; + +in + +fetchzip rec { name = "fantasque-sans-mono-${version}"; - url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip"; + url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono-Normal.zip"; postFetch = '' mkdir -p $out/share/{doc,fonts} @@ -13,13 +17,13 @@ in fetchzip rec { unzip -j $downloadedFile README.md -d $out/share/doc/${name} ''; - sha256 = "1sjdpnxyjdbqxzrylzkynxh1bmicc71h3pmwmr3a3cq0h53g28z0"; + sha256 = "1fwvbqfrgb539xybwdawvwa8cg4f215kw905rgl9a6p0iwa1nxqk"; meta = with stdenv.lib; { homepage = https://github.com/belluzj/fantasque-sans; description = "A font family with a great monospaced variant for programmers"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 5cfd2ec1f4721797259b6d1b5b974cf08cfbfa5a..191e52c427a7dd0d4e342e7449294e3eab81d34b 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "1.204"; + version = "1.205"; in fetchzip { name = "fira-code-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0gngbnrq42ysz13w3s227ghv1yigw399r3w2415ipb5pba8vipad"; + sha256 = "0h8b89d1n3y56k7x9zrwm9fic09ccg1mc7g1258g152m5g6z6zms"; meta = with stdenv.lib; { homepage = https://github.com/tonsky/FiraCode; diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index c19fbccb1420108d51b34566365c901dc979c3fb..624616bdd5802e6160ebdde1815911b24618c1d6 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -20,7 +20,7 @@ fetchzip { See https://github.com/tonsky/FiraCode/issues/211. ''; license = licenses.ofl; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; } diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b0c481dfcb5ccfb7f5530adc889db62874ebf3fb --- /dev/null +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl } : + +let + major = "3"; + minor = "00"; + version = "${major}.${minor}"; + +in + +stdenv.mkDerivation rec { + name = "fixedsys-excelsior-${version}"; + + src = fetchurl { + url = http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf; + sha256 = "6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype/ + cp $src $out/share/fonts/truetype/${name}.ttf + ''; + + outputHashMode = "recursive"; + + outputHashAlgo = "sha256"; + + outputHash = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37"; + + meta = { + description = "Pan-unicode version of Fixedsys, a classic DOS font."; + homepage = http://www.fixedsysexcelsior.com/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.publicDomain; + maintainers = [ stdenv.lib.maintainers.ninjatrappeur ]; + }; +} diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-4/default.nix similarity index 100% rename from pkgs/data/fonts/font-awesome-ttf/default.nix rename to pkgs/data/fonts/font-awesome-4/default.nix diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6bb175f1ecac42a2a7b315b7063cfac2d1fbac1d --- /dev/null +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip }: + +let + version = "5.0.6"; +in fetchzip rec { + name = "font-awesome-${version}"; + + url = "https://github.com/FortAwesome/Font-Awesome/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Brands-Regular-400.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Regular-400.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype + ''; + + sha256 = "1p7xb8s371r62rx0akcnlkk4mspjid6y0s9h04gakx83ymgjlfg4"; + + meta = with stdenv.lib; { + description = "Font Awesome - OTF font"; + longDescription = '' + Font Awesome gives you scalable vector icons that can instantly be customized. + This package includes only the OTF font. For full CSS etc. see the project website. + ''; + homepage = http://fortawesome.github.io/Font-Awesome/; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ abaldeau ]; + }; +} diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index 4c1e484253cfabb32e0e8dbf86faf58785863e69..9b626291c2cb82d9a55340d2657ed1d3338dc072 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -19,7 +19,7 @@ in fetchzip rec { sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; meta = with stdenv.lib; { - homepage = http://software.sil.org/gentium/; + homepage = https://software.sil.org/gentium/; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; maintainers = with maintainers; [ ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 2e2ffdeb5bb4b121b763c4a36028bf1e9a04ddd2..829eca8c06fc19eda60d7a8f4ff4be63496c3059 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -18,7 +18,7 @@ in fetchzip rec { sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; meta = with stdenv.lib; { - homepage = http://software.sil.org/gentium/; + homepage = https://software.sil.org/gentium/; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; longDescription = '' Gentium is a typeface family designed to enable the diverse ethnic groups @@ -35,7 +35,7 @@ in fetchzip rec { This package contains the regular and italic styles for the Gentium Plus font family, along with documentation. ''; - downloadPage = "http://software.sil.org/gentium/download/"; + downloadPage = "https://software.sil.org/gentium/download/"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index f4043697e7b53a4587a445c4f3eb47eb7c1711ed..7936a216ada7ef03d54af05aa633ba46656b1a5a 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr"; }; - buildInputs = [ mkfontdir mkfontscale bdf2psf ]; + nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf ]; unpackPhase = '' mkdir pcf bdf diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index f997f10db1ddc11ea1a74e1016c4fa39b85f0110..eb79432653971d1d73dc43380bbc197ff5b35088 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,20 +1,18 @@ { stdenv, fetchzip }: let - version = "2.020"; + version = "3.002"; in fetchzip rec { name = "hack-font-${version}"; - url = let - version_ = with stdenv.lib; concatStringsSep "_" (splitString "." version); - in "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip"; + url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack ''; - sha256 = "0cpsglb9vnhmpsn496aqisfvmq3yxvjnj7c361dspy0fn6z8x60c"; + sha256 = "11f3hl4nvxq6pvsmwr1c1r5wrxhrp7ixr5bshrz2dmqn7l8bxa63"; meta = with stdenv.lib; { description = "A typeface designed for source code"; @@ -25,7 +23,7 @@ in fetchzip rec { The face has been re-designed with a larger glyph set, modifications of the original glyph shapes, and meticulous attention to metrics. ''; - homepage = http://sourcefoundry.org/hack/; + homepage = https://sourcefoundry.org/hack/; /* "The font binaries are released under a license that permits unlimited @@ -36,7 +34,7 @@ in fetchzip rec { the license is available in LICENSE.md" (From the GitHub page) */ license = licenses.free; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index 96af2e573a2f1a281d95c0c7b7462bddda3ad597..de7dd5834e4ba31130392ad5642a646d66b2f75e 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -20,6 +20,6 @@ in fetchzip { description = "A font with ligatures for Haskell code based off Source Code Pro"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ davidrusu profpatsch ]; + maintainers = with maintainers; [ davidrusu Profpatsch ]; }; } diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..573cb432085eb284d0170addedd34e76fe1dbf9c --- /dev/null +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub }: + +let version = "0.5.3"; +in fetchFromGitHub rec { + name = "ibm-plex-${version}"; + + owner = "IBM"; + repo = "type"; + rev = "v${version}"; + sha256 = "1im7sid3qsk4wnm0yhq9h7i50bz46jksqxv60svdfnsrwq0krd1h"; + + postFetch = '' + tar --strip-components=1 -xzvf $downloadedFile + mkdir -p $out/share/fonts/opentype + cp fonts/*/desktop/mac/*.otf $out/share/fonts/opentype/ + ''; + + meta = with lib; { + description = "IBM Plex Typeface"; + homepage = https://ibm.github.io/type/; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 13aeae80312425bc7e95a6bc900bb68290a96910..e1544787b72693651a3b396e402d11bedd812e13 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchzip }: +{ stdenv, google-fonts }: -let - version = "1.010"; -in fetchzip { +stdenv.mkDerivation rec { name = "inconsolata-${version}"; - url = "http://www.levien.com/type/myfonts/Inconsolata.otf"; + inherit (google-fonts) src version; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/opentype/inconsolata.otf"; - - sha256 = "1yyf7agabfv0ia57c7in0r33x7c8ay445zf7c3dfc83j6w85g3i7"; + installPhase = '' + install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf + ''; meta = with stdenv.lib; { homepage = http://www.levien.com/type/myfonts/inconsolata.html; description = "A monospace font for both screen and print"; - maintainers = with maintainers; [ raskin rycee ]; + maintainers = with maintainers; [ mikoim raskin rycee ]; license = licenses.ofl; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index aa7d3d7def4f669dee83e701f06c6d3f94e5e96d..8563e0e112ac63cda78373999d8c2ecb82682e18 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0dqjj3mlc28s8ljnph6l086b4j9r5dly4fldq59crycwys72zzai"; }; - buildInputs = [ fontforge ]; + nativeBuildInputs = [ fontforge ]; installPhase = '' mkdir -p $out/share/fonts/truetype diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 5217b175ed20030b7e656a1fbf0c061347771e0d..94c580c30df063cde2ae138df66b13bd1b3d1a20 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fonts for Code, from Font Bureau"; - longDescrition = '' + longDescription = '' Input is a font family designed for computer programming, data, and text composition. It was designed by David Jonathan Ross between 2012 and 2014 and published by The Font Bureau. It diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix new file mode 100644 index 0000000000000000000000000000000000000000..1571f8e573deb7f0b8efa7b135f4d0850c97445b --- /dev/null +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchzip }: + +let + version = "1.14.0"; +in fetchzip rec { + name = "iosevka-bin-${version}"; + + url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka + ''; + + sha256 = "03zgh5dfx58sxrprhqi8cyc18sh05k84yc262bn81vavl6lm14ns"; + + meta = with stdenv.lib; { + homepage = https://be5invis.github.io/Iosevka/; + downloadPage = "https://github.com/be5invis/Iosevka/releases"; + description = '' + Slender monospace sans-serif and slab-serif typeface inspired by Pragmata + Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.cstrahan ]; + }; +} diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 04f8ebc613c5e7a07db9acce8367b6f0cca95e17..ad2485dc4b8c4510d718a47f04f97eb9d72b5144 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,18 +1,94 @@ -{ stdenv, fetchzip }: +{ + stdenv, lib, + fetchFromGitHub, fetchurl, + runCommand, writeText, + nodejs, ttfautohint-nox, otfcc, + + # Custom font set options. + # See https://github.com/be5invis/Iosevka#build-your-own-style + design ? [], upright ? [], italic ? [], oblique ? [], + family ? null, weights ? [], + # Custom font set name. Required if any custom settings above. + set ? null +}: + +assert (design != []) -> set != null; +assert (upright != []) -> set != null; +assert (italic != []) -> set != null; +assert (oblique != []) -> set != null; +assert (family != null) -> set != null; +assert (weights != []) -> set != null; + +let + installPackageLock = import ./package-lock.nix { inherit fetchurl lib; }; +in + +let pname = if set != null then "iosevka-${set}" else "iosevka"; in let - version = "1.13.3"; -in fetchzip rec { - name = "iosevka-${version}"; + version = "1.14.1"; + name = "${pname}-${version}"; + src = fetchFromGitHub { + owner = "be5invis"; + repo ="Iosevka"; + rev = "v${version}"; + sha256 = "0m6kj1zfv9w6lyykhsfqdx2a951k8qa76licqikz5spm13n22z43"; + }; +in + +with lib; +let unwords = concatStringsSep " "; in + +let + param = name: options: + if options != [] then "${name}='${unwords options}'" else null; + config = unwords (lib.filter (x: x != null) [ + (param "design" design) + (param "upright" upright) + (param "italic" italic) + (param "oblique" oblique) + (if family != null then "family='${family}'" else null) + (param "weights" weights) + ]); + custom = design != [] || upright != [] || italic != [] || oblique != [] + || family != null || weights != []; +in + +stdenv.mkDerivation { + inherit name pname version src; + + nativeBuildInputs = [ nodejs ttfautohint-nox otfcc ]; + + passAsFile = [ "installPackageLock" ]; + installPackageLock = installPackageLock ./package-lock.json; + + preConfigure = '' + HOME=$TMPDIR + source "$installPackageLockPath"; + npm --offline rebuild + ''; + + configurePhase = '' + runHook preConfigure + + ${optionalString custom ''make custom-config set=${set} ${config}''} + + runHook postConfigure + ''; + + makeFlags = lib.optionals custom [ "custom" "set=${set}" ]; + + installPhase = '' + runHook preInstall - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; + fontdir="$out/share/fonts/$pname" + install -d "$fontdir" + install "dist/$pname/ttf"/* "$fontdir" - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka + runHook postInstall ''; - sha256 = "0103rjxcp2sis42xp7fh7g8i03h5snvs8n78lgsf79g8ssw0p9d4"; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://be5invis.github.io/Iosevka/; @@ -23,6 +99,6 @@ in fetchzip rec { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.cstrahan ]; + maintainers = with maintainers; [ cstrahan jfrankenau ttuegel ]; }; } diff --git a/pkgs/data/fonts/iosevka/package-lock.json b/pkgs/data/fonts/iosevka/package-lock.json new file mode 100644 index 0000000000000000000000000000000000000000..54de11a1f42256f332769daf7aa5a7db30144f94 --- /dev/null +++ b/pkgs/data/fonts/iosevka/package-lock.json @@ -0,0 +1,1025 @@ +{ + "name": "iosevka", + "version": "1.14.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "JSONStream": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz", + "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=", + "requires": { + "jsonparse": "1.3.1", + "through": "2.3.8" + } + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "bezier-js": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz", + "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg==" + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" + }, + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + }, + "caryll-shapeops": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz", + "integrity": "sha512-3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==", + "requires": { + "bezier-js": "2.2.5", + "clipper-lib": "1.0.0" + } + }, + "child-process-promise": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", + "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=", + "requires": { + "cross-spawn": "4.0.2", + "node-version": "1.1.0", + "promise-polyfill": "6.1.0" + } + }, + "clipper-lib": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz", + "integrity": "sha1-6QLOsm4o7lz6YBSr33kKUe//Tss=" + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "clone": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=" + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "coffee-script": { + "version": "1.12.7", + "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz", + "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==" + }, + "cross-spawn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + } + }, + "cubic2quad": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz", + "integrity": "sha1-abGcYaP1tB7PLx1fro+wNBWqixU=" + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "requires": { + "clone": "1.0.3" + } + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "requires": { + "is-arrayish": "0.2.1" + } + }, + "escodegen": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", + "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", + "requires": { + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.5.7" + } + }, + "escope": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz", + "integrity": "sha1-dZ3OhJbEJI/sLQyq9BCLzz8af10=", + "requires": { + "estraverse": "2.0.0" + }, + "dependencies": { + "estraverse": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz", + "integrity": "sha1-WuRpYyQ2ACBmdMyySgnhZnT83KE=" + } + } + }, + "esmangle": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz", + "integrity": "sha1-2bs3uPjq+/Tm1O1reqKVarvTxMI=", + "requires": { + "escodegen": "1.3.3", + "escope": "1.0.3", + "esprima": "1.1.1", + "esshorten": "1.1.1", + "estraverse": "1.5.1", + "esutils": "1.0.0", + "optionator": "0.3.0", + "source-map": "0.1.43" + }, + "dependencies": { + "escodegen": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz", + "integrity": "sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=", + "requires": { + "esprima": "1.1.1", + "estraverse": "1.5.1", + "esutils": "1.0.0", + "source-map": "0.1.43" + } + }, + "esprima": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz", + "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=" + }, + "estraverse": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", + "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=" + }, + "esutils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz", + "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=" + }, + "fast-levenshtein": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz", + "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=" + }, + "levn": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz", + "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=", + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "optionator": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz", + "integrity": "sha1-lxWotfXnWGz/BsgkngOc1zZNP1Q=", + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "1.0.7", + "levn": "0.2.5", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "0.0.3" + } + }, + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "requires": { + "amdefine": "1.0.1" + } + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + } + } + }, + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + }, + "esshorten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz", + "integrity": "sha1-F0+Wt8wmfkaHLYFOfbfCkL3/Yak=", + "requires": { + "escope": "1.0.3", + "estraverse": "4.1.1", + "esutils": "2.0.2" + }, + "dependencies": { + "estraverse": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz", + "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI=" + } + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + } + } + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "fs-extra": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", + "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "3.0.1", + "universalify": "0.1.1" + } + }, + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + }, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "jsonfile": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", + "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", + "requires": { + "graceful-fs": "4.1.11" + } + }, + "jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=" + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "1.0.0" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "libspiro-js": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz", + "integrity": "sha1-hmUrAAmm2E6nmlMgvcpfAGEu5Dk=" + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + } + } + }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "megaminx": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz", + "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==", + "requires": { + "JSONStream": "1.3.2", + "child-process-promise": "2.2.1", + "cubic2quad": "1.1.1", + "fs-extra": "3.0.1", + "which": "1.3.0" + } + }, + "mem": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "requires": { + "mimic-fn": "1.2.0" + } + }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" + }, + "node-version": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz", + "integrity": "sha512-t1V2RFiaTavaW3jtQO0A2nok6k7/Gghuvx2rjvICuT0B0dYaObBQ4U0xHL+ZTPFZodt1LMYG2Vi2nypfz4/AJg==" + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.1" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "2.0.1" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + } + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "requires": { + "lcid": "1.0.0" + } + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + }, + "p-limit": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", + "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", + "requires": { + "p-try": "1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "requires": { + "p-limit": "1.2.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + }, + "pad": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz", + "integrity": "sha512-cx/l/K+9UjGXJmoYolvP0l3cEUyB9BUdUL3wj3uwskIiApboLsinvsXxU9nSNg9Luz2ZyH0zzJNbqgLSNtfIDw==", + "requires": { + "coffee-script": "1.12.7", + "wcwidth": "1.0.1" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "1.3.1" + } + }, + "patel": { + "version": "0.32.1", + "resolved": "https://registry.npmjs.org/patel/-/patel-0.32.1.tgz", + "integrity": "sha1-nnC2sj/XqcgsV57VkbivpSF+YhI=", + "requires": { + "escodegen": "1.9.0", + "esmangle": "1.0.1", + "patrisika": "0.21.0", + "resumer": "0.0.0", + "yargs": "6.6.0" + }, + "dependencies": { + "yargs": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" + } + } + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "patrisika": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz", + "integrity": "sha1-uCwn99QEFSLcXDG0O3xu+xnkdII=", + "requires": { + "patrisika-scopes": "0.11.0" + } + }, + "patrisika-scopes": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.0.tgz", + "integrity": "sha1-BSqddkoWXgs0zDW2ViqIJCA2tAM=" + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "requires": { + "pinkie": "2.0.4" + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" + }, + "promise-polyfill": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", + "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=" + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "resumer": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz", + "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=", + "requires": { + "through": "2.3.8" + } + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "optional": true + }, + "spdx-correct": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=" + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + }, + "toml": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz", + "integrity": "sha512-O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA==" + }, + "topsort": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz", + "integrity": "sha1-Ll4O6KFDlBfxAdW5stA15iAmMyE=" + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "requires": { + "prelude-ls": "1.1.2" + } + }, + "universalify": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=" + }, + "unorm": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz", + "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA=" + }, + "validate-npm-package-license": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", + "requires": { + "defaults": "1.0.3" + } + }, + "which": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "requires": { + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + } + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + }, + "yargs": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", + "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "requires": { + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "requires": { + "locate-path": "2.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "requires": { + "pify": "2.3.0" + } + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "requires": { + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "requires": { + "find-up": "2.1.0", + "read-pkg": "2.0.0" + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "3.0.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, + "yargs-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", + "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", + "requires": { + "camelcase": "4.1.0" + } + } + } + }, + "yargs-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", + "requires": { + "camelcase": "3.0.0" + } + } + } +} diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix new file mode 100644 index 0000000000000000000000000000000000000000..4a7be92e7375adc315b941198eaebeff83e69353 --- /dev/null +++ b/pkgs/data/fonts/iosevka/package-lock.nix @@ -0,0 +1,142 @@ +{ lib, fetchurl }: + +with lib; with builtins; + +let + # Convert a base64-encoded string into a list of quads and padding. + fromBase64 = str: + let + len = stringLength str; + quads = 3 * len - 4 * padding; + padding = + if hasSuffix "==" str then 2 else + if hasSuffix "=" str then 1 else + 0; + chars = stringToCharacters (substring 0 (len - padding) str); + table = { + "A" = [0 0 0]; + "B" = [0 0 1]; + "C" = [0 0 2]; + "D" = [0 0 3]; + "E" = [0 1 0]; + "F" = [0 1 1]; + "G" = [0 1 2]; + "H" = [0 1 3]; + "I" = [0 2 0]; + "J" = [0 2 1]; + "K" = [0 2 2]; + "L" = [0 2 3]; + "M" = [0 3 0]; + "N" = [0 3 1]; + "O" = [0 3 2]; + "P" = [0 3 3]; + "Q" = [1 0 0]; + "R" = [1 0 1]; + "S" = [1 0 2]; + "T" = [1 0 3]; + "U" = [1 1 0]; + "V" = [1 1 1]; + "W" = [1 1 2]; + "X" = [1 1 3]; + "Y" = [1 2 0]; + "Z" = [1 2 1]; + "a" = [1 2 2]; + "b" = [1 2 3]; + "c" = [1 3 0]; + "d" = [1 3 1]; + "e" = [1 3 2]; + "f" = [1 3 3]; + "g" = [2 0 0]; + "h" = [2 0 1]; + "i" = [2 0 2]; + "j" = [2 0 3]; + "k" = [2 1 0]; + "l" = [2 1 1]; + "m" = [2 1 2]; + "n" = [2 1 3]; + "o" = [2 2 0]; + "p" = [2 2 1]; + "q" = [2 2 2]; + "r" = [2 2 3]; + "s" = [2 3 0]; + "t" = [2 3 1]; + "u" = [2 3 2]; + "v" = [2 3 3]; + "w" = [3 0 0]; + "x" = [3 0 1]; + "y" = [3 0 2]; + "z" = [3 0 3]; + "0" = [3 1 0]; + "1" = [3 1 1]; + "2" = [3 1 2]; + "3" = [3 1 3]; + "4" = [3 2 0]; + "5" = [3 2 1]; + "6" = [3 2 2]; + "7" = [3 2 3]; + "8" = [3 3 0]; + "9" = [3 3 1]; + "+" = [3 3 2]; + "/" = [3 3 3]; + }; + in + take quads (concatMap (c: table.${c}) chars); + + # Convert a list of quads with padding into a base16-encoded string. + toBase16 = quads: + if length quads == 0 then "" else + if length quads == 1 then throw "toBase16: odd quads" else + let + hexad = 4 * elemAt quads 0 + elemAt quads 1; + hexits = "0123456789abcdef"; + in + substring hexad 1 hexits + toBase16 (drop 2 quads); +in + +let + fetchResolved = { resolved, integrity, ... }: + let args = { url = resolved; } // integrityHash integrity; in + fetchurl args; + integrityHash = integrity: + if hasPrefix "sha1-" integrity then integritySHA1 integrity else + if hasPrefix "sha512-" integrity then integritySHA512 integrity else + throw "don't understand integrity: ${integrity}"; + integritySHA1 = integrity: + { sha1 = toBase16 (fromBase64 (removePrefix "sha1-" integrity)); }; + integritySHA512 = integrity: + { sha512 = toBase16 (fromBase64 (removePrefix "sha512-" integrity)); }; +in + +let + depend = name: attrs@{ version, dependencies ? {}, ... }: + { + inherit name version; + src = fetchResolved attrs; + depends = mapAttrsToList depend dependencies; + }; + prepareDepend = { name, src, depends, ... }: + '' + unpackFile '${src}' + mv package '${name}' + mkdir -p '${name}/node_modules' + ( + cd '${name}/node_modules' + ${concatMapStrings prepareDepend depends} + ) + ''; +in + +packageLockFile: + +let + packageLock = fromJSON (readFile packageLockFile); + depends = mapAttrsToList depend packageLock.dependencies; +in + '' + mkdir -p node_modules + ( + cd node_modules + ${concatMapStrings prepareDepend depends} + ) + '' + diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index f49d20e3ba7cb939d45de2d09089ee5153ecc8e7..5815b84f21a4af65edf1fc111a1e9b68b2c9b9cb 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c"; }; - buildInputs = [ dpkg ]; + nativeBuildInputs = [ dpkg ]; unpackCmd = '' dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index 3fac3024dd4ffa80b0752b7a82a79a30aa9a8c93..5657b8380a969dbea45e27dfef2f95605361999d 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { srcs = fonts; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; sourceRoot = "."; installPhase = '' @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.ofl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ bergey profpatsch ]; + maintainers = with stdenv.lib.maintainers; [ bergey Profpatsch ]; }; } diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index 8a11a98ebd2373e5f5e2166c2ac916fd08a80a58..d95aea26c8d4a7a3d74129782d6794eff2beb391 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; sourceRoot = "."; diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..14b08e140ea876e2ab575feffde21b4ff9a48e35 --- /dev/null +++ b/pkgs/data/fonts/migmix/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "migmix-${version}"; + version = "20150712"; + + srcs = [ + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1p-${version}.zip"; + sha256 = "0wp44axcalaak04nj3dgpx0vk13nqa3ihx2vjv4acsgv83x8ciph"; + }) + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2p-${version}.zip"; + sha256 = "0y7s3rbxrp5bv56qgihk8b847lqgibfhn2wlkzx7z655fbzdgxw9"; + }) + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1m-${version}.zip"; + sha256 = "1sfym0chy8ilyd9sr3mjc0bf63vc33p05ynpdc11miivxn4qsshx"; + }) + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2m-${version}.zip"; + sha256 = "0hg04rvm39fh4my4akmv4rhfc14s3ipz2aw718h505k9hppkhkch"; + }) + ]; + + unpackPhase = ":"; + + installPhase = '' + mkdir -p $out/share/fonts/truetype/migmix + find $srcs -name '*.ttf' | xargs install -m644 --target $out/share/fonts/truetype/migmix + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1fhh8wg6lxwrnsg9rl4ihffl0bsp1wqa5gps9fx60kr6j9wpvmbg"; + + meta = with stdenv.lib; { + description = "A high-quality Japanese font based on M+ fonts and IPA fonts"; + homepage = http://mix-mplus-ipa.osdn.jp/migmix; + license = licenses.ipa; + platforms = platforms.unix; + maintainers = [ maintainers.mikoim ]; + }; +} diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..aefaefb337fa9abf5de7fbdfe35a0ff2773dde26 --- /dev/null +++ b/pkgs/data/fonts/migu/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "migu-${version}"; + version = "20150712"; + + srcs = [ + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1p-${version}.zip"; + sha256 = "04wpbk5xbbcv2rzac8yzj4ww7sk2hy2rg8zs96yxc5vzj9q7svf6"; + }) + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1c-${version}.zip"; + sha256 = "1k7ymix14ac5fb44bjvbaaf24784zzpyc1jj2280c0zdnpxksyk6"; + }) + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1m-${version}.zip"; + sha256 = "07r8id83v92hym21vrqmfsfxb646v8258001pkjhgfnfg1yvw8lm"; + }) + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-2m-${version}.zip"; + sha256 = "1pvzbrawh43589j8rfxk86y1acjbgzzdy5wllvdkpm1qnx28zwc2"; + }) + ]; + + unpackPhase = ":"; + + installPhase = '' + find $srcs -name '*.ttf' | xargs install -m644 --target $out/share/fonts/truetype/migu -D + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0nbpn21cxdd6gsgr3fadzjsnz84f2swpf81wmscmjgvd56ngndzh"; + + meta = with stdenv.lib; { + description = "A high-quality Japanese font based on modified M+ fonts and IPA fonts"; + homepage = http://mix-mplus-ipa.osdn.jp/migu/; + license = licenses.ipa; + platforms = platforms.unix; + maintainers = [ maintainers.mikoim ]; + }; +} diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index b70166b7ec1747d988b137570b6b7acb738b5939..0fd724149d8f1fefbe7e72729cf7b37df487611c 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "062"; + version = "063"; in fetchzip rec { name = "mplus-${version}"; @@ -13,7 +13,7 @@ in fetchzip rec { cp *.ttf $out/share/fonts/truetype ''; - sha256 = "0zm1snq5r584rz90yv5lndsqgchdaxq2185vrk7849ch4k5vd23z"; + sha256 = "0d485l2ihxfk039rrrnfviamlbj13cwky0c752m4ikwvgiqiq94y"; meta = with stdenv.lib; { description = "M+ Outline Fonts"; diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f3be8857284c0389ce4b7119ed52b0945acc78f9 --- /dev/null +++ b/pkgs/data/fonts/myrica/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub }: + +fetchFromGitHub rec { + name = "myrica-2.011.20160403"; + + owner = "tomokuni"; + repo = "Myrica"; + rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; + sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12"; + + postFetch = '' + tar --strip-components=1 -xzvf $downloadedFile + mkdir -p $out/share/fonts/truetype + cp product/*.TTC $out/share/fonts/truetype + ''; + + meta = with lib; { + homepage = https://myrica.estable.jp/; + license = licenses.ofl; + maintainers = with maintainers; [ mikoim ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index 054c2ca91f6e313b2b4baf28f1c718bb901b8a58..b39a59d1ba7ac8b097a755f0cb1397e3bd90a2d0 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [unzip]; + nativeBuildInputs = [unzip]; sourceRoot = "."; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 8815bf688389107e76faa03fd29692d7332f2de2..528055a5e80e472c286139f5136cbe465eb9ca06 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, bash, which, withFont ? "" }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "2.0.0"; name = "nerdfonts-${version}"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "nerd-fonts"; rev = version; - sha256 = "0h12d33wnhs5w8r3h1gqil98442vf7a13ms3nwldsam4naapsqxz"; + sha256 = "09i467hyskvzj2wn5sj6shvc9pb0a0rx5iknjkkkbg1ng3bla7nm"; }; dontPatchShebangs = true; buildInputs = [ which ]; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 73059cbcc33ac33a2ad73800fde7061639509135..e2336c51255f30676525920346bc4658958e8166 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -2,10 +2,10 @@ rec { # 18MB - noto-fonts = let version = "git-2016-03-29"; in fetchzip { + noto-fonts = let version = "2017-10-24-phase3-second-cleanup"; in fetchzip { name = "noto-fonts-${version}"; - url = https://github.com/googlei18n/noto-fonts/archive/e8b0af48b15d64bd490edab4418b5e396cf29644.zip; + url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip"; postFetch = '' unzip $downloadedFile @@ -17,7 +17,7 @@ rec { cp -n noto-fonts-*/unhinted/*.ttf $out/share/fonts/noto cp -n noto-fonts-*/alpha/*.ttf $out/share/fonts/noto ''; - sha256 = "0wphc8671dpbx3rxzmjisnjipg2c2vkhw2i6mmyamd6vvcwajd64"; + sha256 = "013l816cq9svdji266sccscm9sf9pfn472gq9lnqkzlwaxx9qrrl"; meta = with stdenv.lib; { inherit version; @@ -75,14 +75,14 @@ rec { }; }; # 12MB - noto-fonts-emoji = let version = "git-2016-03-17"; in stdenv.mkDerivation { + noto-fonts-emoji = let version = "2017-09-13-design-refresh"; in stdenv.mkDerivation { name = "noto-fonts-emoji-${version}"; src = fetchFromGitHub { owner = "googlei18n"; repo = "noto-emoji"; - rev = "c6379827aaa9cb0baca1a08a9d44ae74ca505236"; - sha256 = "1zh1b617cjr5laha6lx0ys4k1c3az2zkgzjwc2nlb7dsdmfw1n0q"; + rev = "v${version}"; + sha256 = "1ixz03207kzh6jhmw8bpi77pxkfzq46dk26sr41m5kkvc14d14vl"; }; buildInputs = [ cairo ]; diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix new file mode 100644 index 0000000000000000000000000000000000000000..b5fc13daefa0a0523f7825c85d2abc23f3f4e7cd --- /dev/null +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -0,0 +1,32 @@ +{ fetchFromGitHub, pythonPackages, lib }: + +pythonPackages.buildPythonPackage rec { + version = "2017-09-25"; + name = "nototools-${version}"; + + src = fetchFromGitHub { + owner = "googlei18n"; + repo = "nototools"; + rev = "v2017-09-25-tooling-for-phase3-update"; + sha256 = "03nzvcvwmrhfrcjhg218q2f3hfrm3vlivp4rk19sc397kh3hisiz"; + }; + + propagatedBuildInputs = with pythonPackages; [ fonttools numpy ]; + + postPatch = '' + sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py + ''; + + postInstall = '' + cp -r third_party $out + ''; + + disabled = pythonPackages.isPy3k; + + meta = { + description = "Noto fonts support tools and scripts plus web site generation"; + license = lib.licenses.asl20; + homepage = https://github.com/googlei18n/nototools; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 9b13246397204e883feaf4baad0cd1d8349204c5..40a9be3282e07dc3266e8370cc8f41d71b1f45c9 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -16,7 +16,7 @@ in fetchzip { sha256 = "045xc7kj56q4ygnjppm8f8fwqqvf21x1piabm4nh8hwgly42a3w2"; meta = with stdenv.lib; { - homepage = http://opendyslexic.org/; + homepage = https://opendyslexic.org/; description = "Font created to increase readability for readers with dyslexia"; license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; platforms = platforms.all; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index b27290707b6b5f107a12fc7668bc8dd527d4d9c3..81fc7b799259fbd680b9d86bbbb33cd578e70e86 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1chzcy3kyi7wpr4iq4aj1v24fq1wwph1v5z96dimlqcrnvm66h2l"; }; - buildInputs = [unzip]; + nativeBuildInputs = [unzip]; sourceRoot = "."; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 895ef3dae0f2b89493d2f822f7f44bd7939a00a4..5ebb365ecdfb24dfdb2d2783476f8a0cd9706b2f 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n"; }; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ mkfontdir mkfontscale ]; installPhase = '' diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index 2ba9069d48bee59521cbae00122944f1e0890186..009295c5869139712124f80ea3da016ac8b53b5f 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -35,6 +35,6 @@ in fetchzip { homepage = https://github.com/impallari/Raleway; license = stdenv.lib.licenses.ofl; - maintainers = with stdenv.lib.maintainers; [ profpatsch ]; + maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 3fbcefc3187cfcf407b095b6346da0752024a396..88d438096c101cef35fc55c7e818981b1d0e01c4 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -4,14 +4,14 @@ let inherit (python2.pkgs) fonttools; common = - {version, url, sha256, buildInputs, postPatch ? null, outputHash}: + {version, url, sha256, nativeBuildInputs, postPatch ? null, outputHash}: stdenv.mkDerivation rec { name = "liberation-fonts-${version}"; src = fetchurl { inherit url sha256; }; - inherit buildInputs postPatch; + inherit nativeBuildInputs postPatch; installPhase = '' mkdir -p $out/share/fonts/truetype @@ -53,21 +53,21 @@ in { version = "1.07.4"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; - buildInputs = [ fontforge ]; + nativeBuildInputs = [ fontforge ]; outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p"; }; liberation_ttf_v1_binary = common rec { version = "1.07.4"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1"; - buildInputs = [ ]; + nativeBuildInputs = [ ]; outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab"; }; liberation_ttf_v2_from_source = common rec { version = "2.00.1"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; - buildInputs = [ fontforge fonttools ]; + nativeBuildInputs = [ fontforge fonttools ]; postPatch = '' substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ 'font = ttLib.TTFont(fontfile)' \ @@ -79,7 +79,7 @@ in { version = "2.00.1"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; - buildInputs = [ ]; + nativeBuildInputs = [ ]; outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk"; }; } diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..add2c44cd48019c3989380b72440e31b584da9a3 --- /dev/null +++ b/pkgs/data/fonts/ricty/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, google-fonts, migu, fontforge, which }: + +stdenv.mkDerivation rec { + name = "ricty-${version}"; + version = "4.1.0"; + + src = fetchurl { + url = "http://www.rs.tus.ac.jp/yyusa/ricty/ricty_generator-${version}.sh"; + sha256 = "1cv0xh81fi6zdjb62zqjw46kbc89jvwbyllw1x1xbnpz2il6aavf"; + }; + + unpackPhase = '' + install -m 0770 $src ricty_generator.sh + ''; + + patchPhase = '' + sed -i 's/fonts_directories=".*"/fonts_directories="$inconsolata $migu"/' ricty_generator.sh + ''; + + buildInputs = [ google-fonts migu fontforge which ]; + + buildPhase = '' + inconsolata=${google-fonts} migu=${migu} ./ricty_generator.sh auto + ''; + + installPhase = '' + install -m644 --target $out/share/fonts/truetype/ricty -D Ricty-*.ttf + ''; + + meta = with stdenv.lib; { + description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; + homepage = http://www.rs.tus.ac.jp/yyusa/ricty.html; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = [ maintainers.mikoim ]; + }; +} + diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index 00c4bb7fb886d03a474362664100988787837efd..26697c523273cc8e97252875ccdb743abc0adc09 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "2.136"; + version = "2.138"; in fetchzip rec { name = "roboto-${version}"; @@ -9,10 +9,10 @@ in fetchzip rec { postFetch = '' mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.ttf -x __MACOSX/\* -d $out/share/fonts/truetype ''; - sha256 = "02fanxx2hg0kvxl693rc0fkbrbr2i8b14qmpparkrwmv0j35wnd7"; + sha256 = "1s3c48wwvvwd3p4w3hfkri5v2c54j2bdxmd3bjv54klc5mrlh6z3"; meta = { homepage = https://github.com/google/roboto; diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b35f537c06b9c390817bc7e03372384563d0b598 --- /dev/null +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchzip }: + +let + version = "2.100"; +in fetchzip rec { + name = "scheherazade-${version}"; + + url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/README.txt -d $out/share/doc/${name} + unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation + ''; + + sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; + + meta = with stdenv.lib; { + homepage = https://software.sil.org/scheherazade/; + description = "A font designed in a similar style to traditional Naskh typefaces"; + longDescription = '' + Scheherazade, named after the heroine of the classic Arabian Nights tale, + is designed in a similar style to traditional typefaces such as Monotype + Naskh, extended to cover the Unicode Arabic repertoire through Unicode + 8.0. + + Scheherazade provides a “simplified” rendering of Arabic script, using + basic connecting glyphs but not including a wide variety of additional + ligatures or contextual alternates (only the required lam-alef + ligatures). This simplified style is often preferred for clarity, + especially in non-Arabic languages, but may not be considered appropriate + in situations where a more elaborate style of calligraphy is preferred. + + This package contains the regular and bold styles for the Scheherazade + font family, along with documentation. + ''; + downloadPage = "https://software.sil.org/scheherazade/download/"; + license = licenses.ofl; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index b695143fa592d58981d6c98c5962e2fe4aa2e4ad..99f0d913b8574a690b3dbaaf8ec2d6a7f8eea764 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -17,7 +17,7 @@ in fetchzip { meta = { homepage = https://github.com/stark/siji; description = "An iconic bitmap font based on Stlarch with additional glyphs"; - liscense = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.asymmetric ]; }; diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index d0e7b89888c37d6230e9127385a7fa426f47fe6d..1cab3da200e64ed7e6da933ee37d0b28659c2630 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -18,12 +18,12 @@ let sha256 = "0iwa8wyydcpjss6d1jy4jibqxpvzph4vmaxwwmndpsqy1fz64y9i"; }) ]; - buildInputs = [ + nativeBuildInputs = [ ]; in stdenv.mkDerivation { name = "tempora-lgc"; - inherit buildInputs; + inherit nativeBuildInputs; inherit srcs; phases = "installPhase"; installPhase = '' diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index e499eb412bacc639e6071f7d5b351ada11a071f3..32d859bf53bd4e145c4f2b25c791aa4444ddf85c 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0c7k847cp68w20frzsdknpss2cwv3lp970asyybv65jxyl2jz3iq"; }; - buildInputs = [ bdftopcf mkfontdir mkfontscale ]; + nativeBuildInputs = [ bdftopcf mkfontdir mkfontscale ]; buildPhase = '' for i in *.bdf; do bdftopcf -o ''${i/bdf/pcf} $i diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index e99e0bfb342fafd084f12fe07b668d7c1fff8835..3f9726ee094fa2456d1c95dc3363f86196696c02 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -1,4 +1,4 @@ -{ variant, stdenv, fetchzip }: +{ stdenv, fetchzip }: let variants = { @@ -27,40 +27,43 @@ let outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm"; }; }; - current = variants."${variant}"; - dotless_version = builtins.replaceStrings ["."] [""] current.version; -in stdenv.mkDerivation rec { - name = "tex-gyre-${variant}-math-${current.version}"; - version = "${current.version}"; - src = fetchzip { - url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip"; - sha256 = current.sha256; - }; + mkVariant = variant: current: + let dotless_version = builtins.replaceStrings ["."] [""] current.version; in + stdenv.mkDerivation rec { + name = "tex-gyre-${variant}-math-${current.version}"; + version = "${current.version}"; - installPhase = '' - mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/${name}/ - cp -v opentype/*.otf $out/share/fonts/opentype/ - cp -v doc/*.txt $out/share/doc/${name}/ - ''; + src = fetchzip { + url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip"; + sha256 = current.sha256; + }; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = current.outputHash; + installPhase = '' + mkdir -p $out/share/fonts/opentype/ + mkdir -p $out/share/doc/${name}/ + cp -v opentype/*.otf $out/share/fonts/opentype/ + cp -v doc/*.txt $out/share/doc/${name}/ + ''; - meta = with stdenv.lib; { - longDescription = '' - TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre - ${current.displayName} family of fonts (see - http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format. - ''; - homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; - # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), - # which is a free license, legally equivalent to the LaTeX Project Public - # License (LPPL), version 1.3c or later." - GUST website - license = licenses.lppl13c; - maintainers = with maintainers; [ siddharthist ]; - platforms = platforms.all; - }; -} + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = current.outputHash; + + meta = with stdenv.lib; { + longDescription = '' + TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre + ${current.displayName} family of fonts (see + http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format. + ''; + homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; + # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), + # which is a free license, legally equivalent to the LaTeX Project Public + # License (LPPL), version 1.3c or later." - GUST website + license = licenses.lppl13c; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.all; + }; + }; +in + stdenv.lib.mapAttrs mkVariant variants diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4bd77d894e4bb0f84cb182a781051dcf26f27e31 --- /dev/null +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -0,0 +1,90 @@ +{ stdenv, fetchzip }: + +let + mkVariant = variant: { displayName, version, abbreviation, sha256, outputHash }: stdenv.mkDerivation { + name = "tex-gyre-${variant}-${version}"; + inherit version; + + src = fetchzip { + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/${variant}/${abbreviation}${version}otf.zip"; + stripRoot = false; + inherit sha256; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype/ + cp -v *.otf $out/share/fonts/opentype/ + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = outputHash; + + meta = with stdenv.lib; { + homepage = http://www.gust.org.pl/projects/e-foundry/tex-gyre; + # "The TeX Gyre fonts are licensed under the GUST Font License (GFL), + # which is a free license, legally equivalent to the LaTeX Project Public + # License (LPPL), version 1.3c or later." - GUST website + license = licenses.lppl13c; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.all; + }; + }; +in stdenv.lib.mapAttrs mkVariant { + adventor = { + displayName = "Adventor"; + version = "2.003"; + sha256 = "13wnb04z9f766ij30x8bpkn4xzv7n466g07dlbimx7qvglxl605g"; + outputHash = "1cz0lkk2a5fg8r8175h454va499hzln3s99dadxhh147nx1914pm"; + abbreviation = "qag"; + }; + bonum = { + displayName = "Bonum"; + version = "2.004"; + sha256 = "0qbrs98knx4h0b297c5n3vav4mkal1a95ai2dzmdc10pghfzl8vv"; + outputHash = "0bid8gzwz50ylmm8jyqf9s4nfvy6cp1x34wbyrh4gyk1ki6hf3z1"; + abbreviation = "qbk"; + }; + chorus = { + displayName = "Chorus"; + version = "2.003"; + sha256 = "1b0zak27fzmapwbf2jasvsd95vhnqyc92n985d1lc1ivwja1zgfa"; + outputHash = "0fqifd45c1ys6y98b66lmldfbv7wjb2414fs9swicv4n7xvl3cp1"; + abbreviation = "qzc"; + }; + cursor = { + displayName = "Cursor"; + version = "2.004"; + sha256 = "0ck3jm33bk2xsxp5d2irzd3j24zb49f0gnjvd1nikg1ivk8w85ng"; + outputHash = "0i76835xqlkrnlx303mx63m0f4899j056c2ag2fl6p9qk8s4rskp"; + abbreviation = "qcr"; + }; + heros = { + displayName = "Heros"; + version = "2.004"; + sha256 = "1fj2srxxf6ap913y5yd3dn4jzg828j7381gifs39nm5lnzmgw78y"; + outputHash = "16y76ab46fxm9k8wfmwx4w0cl96yrmjywz587lyr08s0agp1v3kf"; + abbreviation = "qhv"; + }; + pagella = { + displayName = "Pagella"; + version ="2.004"; + sha256 = "0b2pjhw1ihnl951slln6d6vafjd3i6p4i947lwybvg8081qfvd9z"; + outputHash = "0c6s0r14qax3b4amvm9nffwzby8mm4p7r2hfb8yv9jzhjwa5z8rd"; + abbreviation = "qpl"; + }; + schola = { + displayName = "Schola"; + version = "2.005"; + sha256 = "05z3gk4mm0sa7wwjcv31j2xlzqhwhcncpamn0kn9y0221cdknyp8"; + outputHash = "1yqq1ngcylhldrh1v35l439k72szq9m4gx6g0wh235fk65chb2bm"; + abbreviation = "qcs"; + }; + termes = { + displayName = "Termes"; + version = "2.004"; + sha256 = "1aq3yqbgkc3z20dkcqyhicsyq0afbgg4l397z96sd8a16jyz2x8k"; + outputHash = "1igw821m601h8937pix6yish4d8fxmz3h4j9hripf41bxsiafzzg"; + abbreviation = "qtm"; + }; +} diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..90f1b1da908aa1537e89d698b7588b6ca87dcb9c --- /dev/null +++ b/pkgs/data/fonts/tlwg/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, fontforge }: + +stdenv.mkDerivation rec { + name = "tlwg-${version}"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "tlwg"; + repo = "fonts-tlwg"; + rev = "v${version}"; + sha256 = "13bx98ygyyizb15ybdv3856lkxhx1fss8f7aiqmp0lk9zgw4mqyk"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ fontforge ]; + + preAutoreconf = "echo ${version} > VERSION"; + + meta = with stdenv.lib; { + description = "A collection of Thai scalable fonts available under free licenses"; + homepage = https://linux.thai.net/projects/fonts-tlwg; + license = with licenses; [ gpl2 publicDomain lppl13c free ]; + platforms = platforms.unix; + maintainers = [ maintainers.yrashk ]; + }; +} diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9a8c6bf592aefc95307cc8aedafbf7e525d8dea6 --- /dev/null +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: + +stdenv.mkDerivation rec { + name = "twemoji-color-font-${meta.version}"; + src = fetchFromGitHub { + owner = "eosrei"; + repo = "twemoji-color-font"; + rev = "v${meta.version}"; + sha256 = "0i7krmg99nrrj7mbjjd2cw6dx24aja63571mcyp6d7q1z09asz9k"; + }; + + nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; + # silence inkscape errors about non-writable home + preBuild = "export HOME=\"$NIX_BUILD_ROOT\""; + makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ]; + enableParallelBuilding = true; + + installPhase = '' + install -Dm755 build/TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf + install -Dm644 linux/fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf + ''; + + meta = with stdenv.lib; { + version = "1.3"; + description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags"; + longDescription = '' + A color and B&W emoji SVGinOT font built from the Twitter Emoji for + Everyone artwork with support for ZWJ, skin tone diversity and country + flags. + + The font works in all operating systems, but will currently only show + color emoji in Firefox, Thunderbird, Photoshop CC 2017, and Windows Edge + V38.14393+. This is not a limitation of the font, but of the operating + systems and applications. Regular B&W outline emoji are included for + backwards/fallback compatibility. + ''; + homepage = "https://github.com/eosrei/twemoji-color-font"; + downloadPage = "https://github.com/eosrei/twemoji-color-font/releases"; + license = with licenses; [ cc-by-40 mit ]; + maintainers = [ maintainers.fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 75ab2f40b6f1933ccef32e9900f8d08d37b8d5e5..996d11923972b0145238d1accff20916d07a6d9a 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ mkfontdir mkfontscale ]; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index ce18893ced7dc00f0866bb2de868ccf0c77c7c8b..2a13824b36f7de03c3eb56c83098a19fabcdeb29 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6"; }; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ mkfontdir mkfontscale ]; installPhase = '' mkdir -p $out/share/fonts diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 29d5060d4012137ca60352b4ca055750b980e44b..e56807a434e855fe2d8680de6140407cd5ea5130 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0ypkmwyfrsnag69h1c0mx89ranz4f6jc9y1sqkpq2rbzg64maik0"; }; - buildInputs = [ mkfontscale mkfontdir ]; + nativeBuildInputs = [ mkfontscale mkfontdir ]; phases = "installPhase"; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 092537c216aa4d266e130986634908568fae9e49..c4969d046d48faaa1bec6c4327028efe71458cd9 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { url = "http://pelulamu.net/${pname}/${name}-src.tar.gz"; sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1"; }; - buildInputs = []; nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge SDL SDL_image]; preConfigure = '' diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d3373a64c490c4b4eb372117233de71ba13d5960 --- /dev/null +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +fetchzip rec { + name = "vdrsymbols-20100612"; + + url = http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz; + + sha256 = "0wpxns8zqic98c84j18dr4zmj092v07yq07vwwgzblr0rw9n6gzr"; + + postFetch = '' + tar xvzf "$downloadedFile" + install -Dm444 -t "$out/share/fonts/truetype" */*.ttf + ''; + + meta = with stdenv.lib; { + description = "DejaVu fonts with additional symbols used by VDR"; + homepage = http://andreas.vdr-developer.org/fonts/; + platforms = platforms.all; + maintainers = with maintainers; [ ck3d ]; + + # Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. + # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + # DejaVu changes are in public domain + # See https://dejavu-fonts.github.io/License.html for details + license = licenses.free; + }; +} diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index f84d067eed83c3f55b2030777557579a1bc0d8d8..65fa3fb81ab5540483b109e09b476788db0e7452 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -26,7 +26,7 @@ fetchzip { meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = http://www.microsoft.com/typography/ClearTypeFonts.mspx; - binaryDistribution = false; # haven't read the EULA, but we probably can't redistribute these files, so... + license = stdenv.lib.licenses.unfree; # haven't read the EULA, but we probably can't redistribute these files, so... # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/data/fonts/zilla-slab/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d77d6d8b30110d00ba46ff8bd8ba7e9474385ccb --- /dev/null +++ b/pkgs/data/fonts/zilla-slab/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchzip }: + +let + version = "1.002"; + hash = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f"; +in fetchzip { + name = "zilla-slab-${version}"; + + url = "https://github.com/mozilla/zilla-slab/releases/download/v${version}/Zilla-Slab-Fonts-v${version}.zip"; + postFetch = '' + unzip $downloadedFile + mkdir -p $out/share/fonts/truetype + cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/ + ''; + sha256 = hash; + + meta = with stdenv.lib; { + homepage = https://github.com/mozilla/zilla-slab; + description = "Zilla Slab fonts"; + longDescription = '' + Zilla Slab is Mozilla's core typeface, used + for the Mozilla wordmark, headlines and + throughout their designs. A contemporary + slab serif, based on Typotheque's Tesla, it + is constructed with smooth curves and true + italics, which gives text an unexpectedly + sophisticated industrial look and a friendly + approachability in all weights. + ''; + license = licenses.ofl; + maintainers = with maintainers; [ caugner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 91e379de223a8aeaeae2fe4dd577a8b3245382d7..84bf45a52bbeb1f4e5e5be5948f64ebaf03bafed 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, moka-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; - buildInputs = [ moka-icon-theme ]; + postFixup = "gtk-update-icon-cache $out/share/icons/Arc"; meta = with stdenv.lib; { description = "Arc icon theme"; homepage = https://github.com/horst3180/arc-icon-theme; - license = with licenses; [ gpl3 ]; + license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 77d29d52507ea5d6fc9a58007370e1b4b018d706..db4b5ea6387b7368da1c2e0c82bb8a68d4bba9b5 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,26 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, cmake, gtk3 }: stdenv.mkDerivation rec { + name = "elementary-icon-theme-${version}"; version = "4.3.1"; - package-name = "elementary-icon-theme"; - - name = "${package-name}-${version}"; - src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; sha256 = "1rp22igvnx71l94j5a6px142329djhk2psm1wfgbhdxbj23hw9kb"; }; - dontBuild = true; + nativeBuildInputs = [ cmake gtk3 ]; + + postPatch = "cat > volumeicon/CMakeLists.txt"; + postFixup = "gtk-update-icon-cache $out/share/icons/elementary"; - installPhase = '' - install -dm 755 $out/share/{icons,doc/$name} - cp -dr --no-preserve='ownership' . $out/share/icons/Elementary/ - mv $out/share/icons/Elementary/{AUTHORS,CONTRIBUTORS,README.md} \ - $out/share/doc/$name/ - rm $out/share/icons/Elementary/{COPYING,pre-commit} - ''; meta = with stdenv.lib; { description = "Elementary icon theme"; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..724f3a066cc857b9094c2ecec4c9b8174c3e3d15 --- /dev/null +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + name = "elementary-xfce-icon-theme-${version}"; + version = "2017-11-28"; + + src = fetchFromGitHub { + owner = "shimmerproject"; + repo = "elementary-xfce"; + rev = "b5cc6f044ed24e388ed2fffed1d02f43ce76f5e6"; + sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y"; + }; + + nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; + + installPhase = '' + mkdir -p $out/share/icons + mv elementary-xfce* $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Elementary icons for Xfce and other GTK+ desktops like GNOME"; + homepage = https://github.com/shimmerproject/elementary-xfce; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index 37f46060ae31932b41990df208cf7afb522c0847..fdad4f0f46da158a0378a38f939f2425a8d887a9 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme, gtk3 }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "0hif030pd4w3s851k0s65w0mf2pik10ha25ycpsv91gpbgarqcns"; }; - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ elementary-icon-theme ]; + nativeBuildInputs = [ autoreconfHook elementary-icon-theme gtk3 ]; postPatch = '' substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out ''; + postFixup = "gtk-update-icon-cache $out/share/icons/Faba"; + meta = with stdenv.lib; { description = "A sexy and modern icon theme with Tango influences"; homepage = https://snwh.org/moka; diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index 3a871e86d9d1dce04423f1c69271b88de6afbe69..bdb6f651e6a5b49428b2a07bd024be8458a11553 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, moka-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "faba-mono-icons"; + name = "${pname}-${version}"; + pname = "faba-mono-icons"; version = "2016-04-30"; src = fetchFromGitHub { owner = "snwh"; - repo = package-name; + repo = pname; rev = "2006c5281eb988c799068734f289a85443800cda"; sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; - buildInputs = [ moka-icon-theme ]; + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; meta = with stdenv.lib; { description = "The full set of Faba monochrome panel icons"; homepage = https://snwh.org/moka; - license = with licenses; [ gpl3 ]; + license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index e5a3faf7742b5117e7099ecc9eeaa4c3b79c2775..03c5be143ded61555c656287e5cc8dc25238a0fb 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hicolor-icon-theme-0.15"; + name = "hicolor-icon-theme-0.17"; src = fetchurl { url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1k1kf2c5zbqh31nglc3nxs9j6wr083k9kjyql8p22ccc671mmi4w"; + sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i"; }; setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = https://icon-theme.freedesktop.org/releases/; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index 05ab9b3d65df1b665c3059a72c9a787e1d9096ab..29306cb316af1d7208edb6e4bad89054947e9617 100644 --- a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -8,7 +8,8 @@ hicolorIconThemeHook() { } -envHooks+=(hicolorIconThemeHook) +# I think this is meant to be a runtime dep +addEnvHooks "$hostOffset" hicolorIconThemeHook # Remove icon cache hicolorPreFixupPhase() { diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index f4f81f8de8befcce1d1faf3eda661107fa576496..82aafca11f4ff0eae2a438e64bd9140b6b41bd76 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, gtk3, kdeFrameworks }: stdenv.mkDerivation rec { name = "maia-icon-theme-${version}"; @@ -11,21 +11,19 @@ stdenv.mkDerivation rec { sha256 = "0f9l3k9abgg8islzddrxgbxaw6vbai5bvz5qi1v2fzir7ykx7bgj"; }; - dontBuild = true; - - installPhase = '' - install -dm 755 $out/share/icons - for f in "" "-dark"; do - rm icons$f/CMakeLists.txt - cp -dr --no-preserve='ownership' icons$f $out/share/icons/maia$f - done - ''; + nativeBuildInputs = [ + cmake + extra-cmake-modules + gtk3 + kdeFrameworks.plasma-framework + kdeFrameworks.kwindowsystem + ]; meta = with stdenv.lib; { description = "Icons based on Breeze and Super Flat Remix"; homepage = https://github.com/manjaro/artwork-maia; - license = licenses.free; - maintainers = [ maintainers.mounium ]; + license = licenses.free; # https://github.com/manjaro/artwork-maia/issues/27 + maintainers = with maintainers; [ mounium ]; platforms = platforms.all; }; } diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 5ac2a13be4d1963b3d2b983807659a0258cc4782..f3180db54dcfc5dd5e22dca1f8e6c188c1e7fc35 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme, gtk3 }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "moka-icon-theme"; + name = "${pname}-${version}"; + pname = "moka-icon-theme"; version = "5.3.6"; src = fetchFromGitHub { owner = "snwh"; - repo = package-name; + repo = pname; rev = "v${version}"; sha256 = "17f8k8z8xvib4hkxq0cw9j7bhdpqpv5frrkyc4sbyildcbavzzbr"; }; - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ faba-icon-theme ]; + nativeBuildInputs = [ autoreconfHook faba-icon-theme gtk3 ]; postPatch = '' substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out ''; + postFixup = "gtk-update-icon-cache $out/share/icons/Moka"; + meta = with stdenv.lib; { description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; homepage = https://snwh.org/moka; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 1dd268cf816ebb36049a15ad5f77139526a2086e..5982074991fa40970bc34a9da5cf5a623c187cdf 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, numix-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { - version = "17-09-13"; + version = "18-02-16"; package-name = "numix-icon-theme-circle"; @@ -11,18 +11,22 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "14ck07j9v0yh8ky191sa3xxi4qh7bbg84i8jijy3kbjcx9s0zl8a"; + sha256 = "0q08q1czsk6h0dxqscbgryr12xaakp4zbch37z0jxpwh087gnq4f"; }; - buildInputs = [ numix-icon-theme ]; - - dontBuild = true; + nativeBuildInputs = [ gtk3 numix-icon-theme ]; installPhase = '' install -dm 755 $out/share/icons cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ ''; + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + meta = with stdenv.lib; { description = "Numix icon theme (circle version)"; homepage = https://numixproject.org; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 90040c8fc2868caa0c26007bd1bc35dcc4611287..99871abe5d464f130dc94b4d28d336aff3e7f775 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -1,31 +1,35 @@ -{ stdenv, fetchFromGitHub, numix-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "numix-icon-theme-square"; - version = "17-09-13"; + version = "18-02-16"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "1grpm902hiid561fbp9y1rb9z21y8d1krjgxgs7j8qnpx380sd5x"; + sha256 = "1gjwc0s6a7q1jby5bcwxkcmbs470m81y8s0clsm0qhcmcn1c36xj"; }; - buildInputs = [ numix-icon-theme ]; - - dontBuild = true; + nativeBuildInputs = [ gtk3 numix-icon-theme ]; installPhase = '' mkdir -p $out/share/icons cp -a Numix-Square{,-Light} $out/share/icons/ ''; + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + meta = with stdenv.lib; { description = "Numix icon theme (square version)"; homepage = https://numixproject.org; license = licenses.gpl3; - platforms = with platforms; allBut darwin; + platforms = platforms.linux; # Maybe other non-darwin Unix maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index a7c6c4908972700aefd9b1066e9775f9115ada55..6b6b77ae5e8b563a94a70d22c6b635f0f6e5ffa5 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { - version = "2017-11-18"; - - package-name = "numix-icon-theme"; - - name = "${package-name}-${version}"; + name = "${pname}-${version}"; + pname = "numix-icon-theme"; + version = "17-12-25"; src = fetchFromGitHub { owner = "numixproject"; - repo = package-name; - rev = "ea7f2069ca1f6190494e96aa2febcadf6248c5b4"; - sha256 = "1nk0mc2qycwmjqdlrsfgar5m83pyj3hf6f66pywf9706nn2yz8fv"; + repo = pname; + rev = version; + sha256 = "0q3hpq2jc9iwnzzqpb12g1qzjsw4ckhdqkfqf6nirl87r5drkv6j"; }; - dontBuild = true; + nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; installPhase = '' - install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/ + mkdir -p $out/share/icons + mv Numix{,-Light} $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done ''; meta = with stdenv.lib; { diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 9e793caf9de811670951105ad62f87eed3e04d8e..f49009e76f3e04aa8cae9c18de3f2a7168af2204 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3 }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "paper-icon-theme"; - version = "2017-02-13"; + name = "${pname}-${version}"; + pname = "paper-icon-theme"; + version = "2017-11-20"; src = fetchFromGitHub { owner = "snwh"; - repo = package-name; - rev = "fcaf8bb2aacdd1bb7dcde3d45ef92d0751567e8e"; - sha256 = "1l1w99411jrv4l7jr5dvwszghrncsir23c7lpc26gh2f0ydf3d0d"; + repo = pname; + rev = "af0296ecc872ad723fad7dca6e7e89eb85cbb3a8"; + sha256 = "18a9zl9lbw9gc3zas49w329xrps4slvkp4nv815nlnmimz8dj85m"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gtk3 ]; - postPatch = '' - substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done ''; meta = with stdenv.lib; { diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index ef817a2e3f47d94e1e8af1f5eef9a4891580b5f9..c0f4727f48fbabb16ed151e957d675f1c372a3d5 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,26 +1,31 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, gtk3 }: stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20171102"; + version = "20180401"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; - rev = "${version}"; - sha256 = "10q7ppizzqi8c564jydqivia43gp4j1z984igfyym2mdwdw71mzq"; + rev = version; + sha256 = "1cbzv3igc6j05h0mq2850fwfd8sxxwixzgmhh85mc1k326rvncil"; }; - dontBuild = true; + nativeBuildInputs = [ gtk3 ]; installPhase = '' - install -dm 755 $out/share/icons - cp -dr Papirus{,-Dark,-Light} $out/share/icons/ - cp -dr ePapirus $out/share/icons/ + mkdir -p $out/share/icons + mv {,e}Papirus* $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done ''; meta = with stdenv.lib; { - description = "Papirus icon theme for Linux"; + description = "Papirus icon theme"; homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme; license = licenses.lgpl3; platforms = platforms.all; diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix index 72ee323030a9a43df35f70af03d8833b8dd283e3..41f704e750c5e34aaf25a9767d44bcc3f1090a4f 100644 --- a/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "adapta-backgrounds-${version}"; - version = "0.4.0.6"; + version = "0.5.2.3"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-backgrounds"; rev = version; - sha256 = "1yqxrwhjl6g92wm52kalbns41i2l5g45qbd4185b22crhbrn5x79"; + sha256 = "0n0ggcxinja81lasmpviqq3l4jiwb05bs8r5aah1im2zvls1g007"; }; nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - description = "A wallpaper collection for adapta-project"; + description = "Wallpaper collection for adapta-project"; homepage = https://github.com/adapta-project/adapta-backgrounds; - license = with licenses; [ gpl2 cc-by-sa-30 ]; + license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index 8b27f4fbf7290d7d283b88082b2e3a8f7d2a8c06..6c59a0faf0491c5a0d8b04232f70c0e8956f2cbb 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # Note that individual packages in this collection # may be released under different licenses license = licenses.gpl3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.sifmelcara ]; }; } diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 275ae6dc2d86837feba6c47b5d91831eb1aa633a..638a342e8eba4cc1c1c73bc00465fafca7910d53 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -9,8 +9,8 @@ let certdata2pem = fetchurl { name = "certdata2pem.py"; - url = "https://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?h=debian/20160104"; - sha256 = "0bw11mgfrf19qziyvdnq22kirp0nn54lfsanrg5h6djs6ig1c2im"; + url = "https://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?h=debian/20170717"; + sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; }; in @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { src = nss.src; + outputs = [ "out" "unbundled" ]; + nativeBuildInputs = [ python ]; configurePhase = '' @@ -50,8 +52,14 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -pv $out/etc/ssl/certs cp -v ca-bundle.crt $out/etc/ssl/certs + # install individual certs in unbundled output + mkdir -pv $unbundled/etc/ssl/certs + cp -v *.crt $unbundled/etc/ssl/certs + rm -f $unbundled/etc/ssl/certs/ca-bundle.crt # not wanted in unbundled ''; + setupHook = ./setup-hook.sh; + meta = { homepage = https://curl.haxx.se/docs/caextract.html; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..b704a6a919e0946ec68742e8f664434178263774 --- /dev/null +++ b/pkgs/data/misc/cacert/setup-hook.sh @@ -0,0 +1,5 @@ +cacertHook() { + export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt +} + +addEnvHooks "$targetOffset" cacertHook diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix index 88b608c781523ea01a37406249f0da4b4b88dc07..e94b8eb898c1de834e0f3f9034aefbc878db9e3c 100644 --- a/pkgs/data/misc/dns-root-data/default.nix +++ b/pkgs/data/misc/dns-root-data/default.nix @@ -3,7 +3,13 @@ let rootHints = fetchurl { - url = "https://www.internic.net/domain/named.root"; + # Original source https://www.internic.net/domain/named.root + # occasionally suffers from pointless hash changes, + # and having stable sources for older versions has advantages, too. + urls = map (prefix: prefix + "cc5e14a264912/etc/root.hints") [ + "https://gitlab.labs.nic.cz/knot/knot-resolver/raw/" + "https://raw.githubusercontent.com/CZ-NIC/knot-resolver/" + ]; sha256 = "0vdrff4l8s8grif52dnh091s8qydhh88k25zqd9rj66sf1qwcwxl"; }; @@ -24,6 +30,6 @@ stdenv.mkDerivation { meta = with lib; { description = "DNS root data including root zone and DNSSEC key"; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz vcunat ]; }; } diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index eaebc3aff268ad1d4930f1acde415a99631c0dc8..309ae47a85161c0f9e98a11a35da8b952ffe715d 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,33 +8,33 @@ let in stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; - version = "2017-09-17"; + version = "2017-12-02"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" - "1xqxlnxxk8grqr0nr9vaf5r6z5bcdbadh83qhzr6jvhs20s37lsl"; + "1nggml11wzlanmzk6wbw2kla91fj8ggd9kh9yz42lnyckdlf5ac4"; srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz" - "0g3am25jmhm3r51hvz9lknkrnzj98hxdxav2cvrhz6b7wndgyspk"; + "0w809xgmr5zi4fgm9q3lhrnh1vl62s49n737bhq4jplm5918ki50"; srcGeoLiteCity = fetchDB "GeoLiteCity.dat.gz" - "1syw19gx2mpqz9ypkaq2gh712bv60a7rf56afzd3qzkmgf6rw1qr"; + "0cibajsv5xdjpw1qfx22izm5azqcj0d7nvk39irgwflkim9jfjbs"; srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" - "0ihbqm1f5b9qb68i73ghmk30b6i2n53fmmhv2wadja5zcdpkhdvk"; + "1ldwbzgs64irfgb3kq3jp8fmhwmwqk713dr4kkdqlglrblr9hfkc"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" - "0adddsk0g9a3xaa0f8qx12s07n31wvirymjzrhnsg66i2qlm0h34"; + "06qqs8qr8vxqwd80npz7n66k3bpc1vs7w43i2bb4k0di5yxnjwr9"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" - "1qar0vdlpk3razq83l5fzb54zihs2sma8xgngpql8njfgby0w825"; + "1qyq4h8cja62giv6q1qqc502vsq53wzz1kx80mgvwngmycrxa21k"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; homepage = https://geolite.maxmind.com/download/geoip; license = licenses.cc-by-sa-30; platforms = platforms.all; - maintainers = with maintainers; [ nckx fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; builder = ./builder.sh; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 91d38f3537e043ae8421818d372e54134d5f5126..e7dbf947815bcb9ca0632a68033d7997557c7ec4 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/5e87c40f2cd96bd5dd953758e82f302107c7895e.tar.gz"; - sha256 = "0hjkddda9mdm21nb9bkhr9n5r9jllisif1qmzha91a9cps5w1mx5"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/61de1110af16fa0645a8cc8bbaf4a9c6fca9d8e8.tar.gz"; + sha256 = "0vwfm1imwcffyliaama572ksjgqmwxk48py0wgvgpi2vg08w7a12"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 249f0e5dcb914c6cd1f1b8bbbc8b765dfbb7f7fc..d5ab50f0b8c2cb248396c56c2725f8f7e30dcdf0 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iana-etc-${version}"; - version = "20171106"; + version = "20180405"; src = fetchurl { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "0pbmq95gdkp66cljwklv4gzh8lvl30l4k77hfwvrxz5mfqia6qdd"; + sha256 = "0x6i95arrc4lcq2il3r05hbnd9vsi87z4yc8s3agkvbj74d6hfhj"; }; installPhase = '' diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..343071fcf59cc64ee7c061b1b406344fdad4dff6 --- /dev/null +++ b/pkgs/data/misc/libkkc-data/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, marisa, libkkc }: + +stdenv.mkDerivation rec { + pname = "libkkc-data"; + version = "0.2.7"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "${meta.homepage}/releases/download/v${libkkc.version}/${name}.tar.xz"; + sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy"; + }; + + nativeBuildInputs = [ marisa ]; + + meta = with stdenv.lib; { + description = "Language model data package for libkkc"; + homepage = https://github.com/ueno/libkkc; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ vanzef ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 4d824e6e8d7700e84903276a5b8a8b5ec4e4c9f4..dbf92ad066f5598937d6bb1b3a55ac675f6cb6b3 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, python3, udev, systemd }: let - name = "media-player-info-22"; + name = "media-player-info-23"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; - sha256 = "0di3gfx5z8c34yspzyllydr5snzg71r985kbqhrhb1il51qxgrvy"; + url = "https://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; + sha256 = "1jy8xh4xjgjc4wj4qrw6sx2j3606zsj4bgiczhzf3xlpnkh6vax9"; }; buildInputs = [ udev systemd ]; @@ -25,7 +25,7 @@ in meta = with stdenv.lib; { description = "A repository of data files describing media player capabilities"; - homepage = http://www.freedesktop.org/wiki/Software/media-player-info/; + homepage = https://www.freedesktop.org/wiki/Software/media-player-info/; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; linux; diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix index bce1c5d81d890641a486f478ce8253a33916adc1..65ad964736d15dbfd428646793c30647ae273602 100644 --- a/pkgs/data/misc/mime-types/default.nix +++ b/pkgs/data/misc/mime-types/default.nix @@ -1,21 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "mime-types-${version}"; +let version = "9"; - - src = fetchurl { - url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2"; - sha256 = "0pib8v0f5xwwm3xj2ygdi2dlxxvbq6p95l3fah5f66qj9xrqlqxl"; - }; - - dontBuild = true; - - installPhase = '' - runHook preInstall - install -Dm644 -t $out/etc mime.types - runHook postInstall +in fetchzip rec { + name = "mime-types-${version}"; + url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2"; + postFetch = '' + mkdir -p $out/etc + tar xjvf $downloadedFile --directory=$out/etc --strip-components=1 ''; + sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0"; meta = with stdenv.lib; { description = "A database of common mappings of file extensions to MIME types"; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..09c677c35bdae287191b70d7953d9b6b39a7dffb --- /dev/null +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: + +stdenv.mkDerivation rec { + name = "osinfo-db-20180416"; + + src = fetchurl { + url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; + sha256 = "0qam3qbrwzrz40pikhb8y11lidpb6snsa80ym8s6hp5kh4icr1h6"; + }; + + nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; + + phases = [ "installPhase" ]; + + installPhase = '' + osinfo-db-import --dir "$out/share/osinfo" "${src}" + ''; + + meta = with stdenv.lib; { + description = "Osinfo database of information about operating systems for virtualization provisioning tools"; + homepage = https://libosinfo.org/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index f0f6505cb247f467fa096472af0b49bb4e08b017..5c8e0970518b62f872a4560ece9820abf9700516 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,18 +1,14 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, cmake, ninja }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.7"; + name = "poppler-data-0.4.8"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "1pm7wg6xqj4sppb5az4pa7psfdk4yxxkw52j85bm9fksibcb0lp7"; + sha256 = "0wi8yyynladny51r4q53z7ygh7y491ayp8nqqv6wqqzjc60s35hh"; }; - postPatch = '' - sed -i 's,$(datadir)/pkgconfig,$(prefix)/lib/pkgconfig,g' Makefile - ''; - - installFlags = [ "prefix=$(out)" ]; + nativeBuildInputs = [ cmake ninja ]; meta = with stdenv.lib; { homepage = https://poppler.freedesktop.org/; diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e54dc3fa9feb1b441667d07753a224e486d12809 --- /dev/null +++ b/pkgs/data/misc/scowl/default.nix @@ -0,0 +1,113 @@ +{ stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix +, singleWordlist ? null +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "scowl"; + version = "2017.08.24"; + + src = fetchFromGitHub { + owner = "en-wl"; + repo = "wordlist"; + rev = "rel-${version}"; + sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz"; + }; + + postPatch = '' + substituteInPlace scowl/src/Makefile \ + --replace g++ c++ + ''; + + nativeBuildInputs = [ unzip zip perl aspell dos2unix ]; + buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + + preConfigure = '' + patchShebangs . + export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$PWD/varcon" + ''; + + postBuild = stdenv.lib.optionalString (singleWordlist == null) '' + ( + cd scowl/speller + make aspell + make hunspell + ) + ''; + + enableParallelBuilding = false; + + installPhase = if singleWordlist == null then '' + eval "$preInstall" + + mkdir -p "$out/share/scowl" + mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell" + mkdir -p "$out/share/dict" + + cp -r scowl/speller/aspell "$out/lib/aspell" + cp scowl/speller/*.{aff,dic} "$out/share/hunspell" + ln -s "$out/share/hunspell" "$out/share/myspell/dicts" + + cp scowl/final/* "$out/share/scowl" + + ( + cd scowl + for region in american british british_s british_z canadian australian; do + case $region in + american) + regcode=en-us; + ;; + british) + regcode=en-gb-ise; + ;; + british_s) + regcode=en-gb-ise; + ;; + british_z) + regcode=en-gb-ize; + ;; + canadian) + regcode=en-ca; + ;; + australian) + regcode=en-au; + ;; + esac + regcode_var="$regcode" + if test "$region" = british; then + regcode_var="en-gb" + fi + + echo $region $regcode $regcode_sz + for s in 10 20 30 35 40 50 55 60 70 80 90 95; do + ./mk-list $regcode $s > "$out/share/dict/w$region.$s" + ./mk-list --variants=1 $regcode_var $s > "$out/share/dict/w$region.variants.$s" + ./mk-list --variants=2 $regcode_var $s > "$out/share/dict/w$region.acceptable.$s" + done + ./mk-list $regcode 60 > "$out/share/dict/w$region.txt" + ./mk-list --variants=1 $regcode_var 60 > "$out/share/dict/w$region.variants.txt" + ./mk-list --variants=2 $regcode_var 80 > "$out/share/dict/w$region.scrabble.txt" + done + ./mk-list --variants=1 en-gb 60 > "$out/share/dict/words.variants.txt" + ./mk-list --variants=1 en-gb 80 > "$out/share/dict/words.scrabble.txt" + ./mk-list en-gb-ise 60 > "$out/share/dict/words.txt" + ) + + eval "$postInstall" + '' else '' + mkdir -p "$out/share/dict" + cd scowl + ./mk-list ${singleWordlist} > "$out/share/dict/words.txt" + ''; + + meta = { + inherit version; + description = "Spell checker oriented word lists"; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.unix; + homepage = "http://wordlist.aspell.net/"; + }; +} diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix index 7c3f045b1b7edf6798d6e085cf04446d1b29a31d..043d3d65b84e468f45fa0d8e021cfd169e4fad4e 100644 --- a/pkgs/data/misc/sound-theme-freedesktop/default.nix +++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec; # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS: license = with licenses; [ cc-by-30 cc-by-sa-25 gpl2 gpl2Plus ]; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index ef2bae8dbaf9ba407d83ded9f272cb4a4b7e5b15..6c8fd6229a3feb1a0f8b8b20be0f9e6a2565ff06 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, buildPackages }: stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -28,18 +28,36 @@ stdenv.mkDerivation rec { "MANDIR=$(man)/share/man" "AWK=awk" "CFLAGS=-DHAVE_LINK=0" + "cc=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + installFlags = [ "ZIC=./zic-native" ]; + + preInstall = '' + mv zic.o zic.o.orig + mv zic zic.orig + make $makeFlags cc=cc AR=ar zic + mv zic zic-native + mv zic.o.orig zic.o + mv zic.orig zic + ''; + postInstall = '' rm $out/share/zoneinfo-posix - ln -s . $out/share/zoneinfo/posix + mkdir $out/share/zoneinfo/posix + ( cd $out/share/zoneinfo/posix; ln -s ../* .; rm posix ) mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right mkdir -p "$dev/include" cp tzfile.h "$dev/include/tzfile.h" ''; + setupHook = ./tzdata-setup-hook.sh; + meta = { homepage = http://www.iana.org/time-zones; description = "Database of current and historical time zones"; diff --git a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh b/pkgs/data/misc/tzdata/tzdata-setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..9975d0aec31a45c5039068989b38b85468599c64 --- /dev/null +++ b/pkgs/data/misc/tzdata/tzdata-setup-hook.sh @@ -0,0 +1,5 @@ +tzdataHook() { + export TZDIR=@out@/share/zoneinfo +} + +addEnvHooks "$targetOffset" tzdataHook diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index b69762d933fa43257126e0be01f8bad0474f4b65..70f217f1b7e91156bffcfe32ff88a94bc5f8c9f7 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "wireless-regdb-${version}"; - version = "2017.03.07"; + version = "2017.12.23"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz"; - sha256 = "1f9mcp78sdd4sci6v32vxfcl1rfjpv205jisz1p93kkfnaisy7ip"; + sha256 = "1faa394frq0126h2z28kp4dwknx6zqm5nar4552g7rwqvl2yclqf"; }; dontBuild = true; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = http://wireless.kernel.org/en/developers/Regulatory/; license = licenses.isc; platforms = platforms.all; - maintainers = with maintainers; [ nckx fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix index a9d09945d7ff01a592a1fc6fdf74d183c0715091..4986101584e149e6f27a031a6c239105029023f7 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "13i04dkd709f0p5f2413sf2y9321pfi4y85ynf8wih6ryphnbk9x"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation"; - homepage = http://docbook.org/xml/5.0/; + homepage = https://docbook.org/xml/5.0/; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; }; diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index b7ab83aa5773660a4ff85db2903eb6b36a5bcb2a..cc71e00263246db82d9d9718c4e2fc57f6ee2279 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -let +let src = fetchurl { url = http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip; @@ -19,7 +19,7 @@ stdenv.mkDerivation { unpackPhase = "true"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index 424a44c1bc78f4bf3acce5b9ad9540470567d21b..dc7ebf5959da2c23e403f0796994726f37183647 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -let +let src = fetchurl { url = http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip; @@ -19,7 +19,7 @@ stdenv.mkDerivation { unpackPhase = "true"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh deleted file mode 100644 index 939305d486a777db3aca345b74bf1f8edc08ac88..0000000000000000000000000000000000000000 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/xml/dtd/docbook-ebnf -cd $out/xml/dtd/docbook-ebnf -cp -p $dtd dbebnf.dtd -cp -p $catalog $(stripHash $catalog) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index e9ff03f784353a8142b8c2c206acf7edfba67a54..bc51ceeca43190b424a6a3cc3d07aa227da98384 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -1,16 +1,24 @@ {stdenv, fetchurl, unzip}: -assert unzip != null; - stdenv.mkDerivation { name = "docbook-xml-ebnf-1.2b1"; - builder = ./builder.sh; + dtd = fetchurl { url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd; sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95"; }; catalog = ./docbook-ebnf.cat; + unpackPhase = '' + mkdir -p $out/xml/dtd/docbook-ebnf + cd $out/xml/dtd/docbook-ebnf + ''; + + installPhase = '' + cp -p $dtd dbebnf.dtd + cp -p $catalog $(stripHash $catalog) + ''; + meta = { platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh deleted file mode 100644 index 8b52ebd70b446085a3f593a0d47b40e7e122e11c..0000000000000000000000000000000000000000 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/xml/dtd/docbook -cd $out/xml/dtd/docbook -unpackFile $src -find . -type f -exec chmod -x {} \; -eval "$postInstall" diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 373778d43de6b54e653362b2f8e4919769b9757f..10b76f7b2b55ae88da0c781dbb97b2b1cfde91c4 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,12 +1,21 @@ { stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: -assert unzip != null; - stdenv.mkDerivation { inherit src name postInstall; - builder = ./builder.sh; - buildInputs = [unzip]; - propagatedBuildInputs = [ findXMLCatalogs ]; + + nativeBuildInputs = [unzip]; + propagatedNativeBuildInputs = [ findXMLCatalogs ]; + + unpackPhase = '' + mkdir -p $out/xml/dtd/docbook + cd $out/xml/dtd/docbook + unpackFile $src + ''; + + installPhase = '' + find . -type f -exec chmod -x {} \; + runHook postInstall + ''; meta = meta // { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index f1cad801cdfa987d62403224c72ab1312b421972..54ef5225d2f1393db0c323e8b2af958e4f3b4c60 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0rr0d89i0z75qvjbm8il93bippx09hbmjwy0y2sj44n9np69x3hl"; }; - buildInputs = [ libxml2 ]; + nativeBuildInputs = [ libxml2 ]; installPhase = '' 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 7bae913ed5e68cecbe7a7f242d8de81285d47cc9..ef7b1f93d74e4265f70a4fe97a2cf19453090993 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, findXMLCatalogs }: +{ lib, stdenv, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }: let - common = { pname, sha256 }: stdenv.mkDerivation rec { + common = { pname, sha256, patches ? [] }: let self = stdenv.mkDerivation rec { name = "${pname}-1.79.1"; src = fetchurl { @@ -10,6 +10,8 @@ let inherit sha256; }; + inherit patches; + propagatedBuildInputs = [ findXMLCatalogs ]; dontBuild = true; @@ -25,24 +27,40 @@ let ln -s $dst $out/xml/xsl/docbook ''; + passthru.dbtoepub = writeScriptBin "dbtoepub" + '' + #!${bash}/bin/bash + exec -a dbtoepub ${ruby}/bin/ruby ${self}/share/xml/${pname}/epub/bin/dbtoepub "$@" + ''; + meta = { homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets; description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; }; - }; + }; in self; in { docbook_xsl = common { pname = "docbook-xsl"; sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj"; + + patches = [(fetchpatch { + name = "potential-infinite-template-recursion.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/docbook-style-xsl.git/" + + "plain/docbook-style-xsl-non-recursive-string-subst.patch?id=bf9e5d16fd"; + sha256 = "1pfb468bsj3j879ip0950waih0r1s6rzfbm2p70glbz0g3903p7h"; + stripLen = "1"; + })]; + }; docbook_xsl_ns = common { pname = "docbook-xsl-ns"; sha256 = "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin"; - }; + patches = [ ./docbook-xsl-ns-infinite.patch ]; + }; } diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch new file mode 100644 index 0000000000000000000000000000000000000000..5729f9b43c80bb2c0a2a8f4e978d116285020da3 --- /dev/null +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch @@ -0,0 +1,30 @@ +Description: Remove infinite recursion +Attribute: docbook5_xsl +Version: 1.79.1 +URL: https://github.com/NixOS/nixpkgs/issues/39090 +diff -ru a/lib/lib.xsl b/lib/lib.xsl +--- a/lib/lib.xsl 2015-12-26 15:15:37.000000000 -0800 ++++ b/lib/lib.xsl 2018-03-22 11:52:45.311949264 -0700 +@@ -11,8 +11,10 @@ + + ******************************************************************** --> + ++ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ++ xmlns:d="http://docbook.org/ns/docbook" ++ xmlns:str="http://exslt.org/strings" ++ version="1.0"> + + + +@@ -58,6 +61,9 @@ + + + ++ ++ ++ + + + diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..26520889c7de1bd937e6a17b569871bec5a56f76 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "deepin-gtk-theme-${version}"; + version = "17.10.6"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-gtk-theme"; + rev = version; + sha256 = "01mfn3i234ynjvxl0yddsqqadwh6zmiibzrjm9xd1f78rj4xxkll"; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "Deepin GTK Theme"; + homepage = https://github.com/linuxdeepin/deepin-gtk-theme; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7a422beb9924df756a903391786cd74a42712ff5 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-icon-theme"; + version = "15.12.52"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "141in9jlflmckd8rg4605dfks84p1p6b1zdbhbiwrg11xbl66f3l"; + + # Get rid of case collision in file names, which is an issue in + # darwin where file names are case insensitive. + extraPostFetch = '' + rm "$out"/Sea/apps/scalable/TeXmacs.svg + rm "$out"/deepin/apps/48/TeXmacs.svg + ''; + }; + + nativeBuildInputs = [ gtk3 papirus-icon-theme ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Deepin icon theme"; + homepage = https://github.com/linuxdeepin/deepin-icon-theme; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8e64fa6980582d86cf7f331664202028ee0f2cfa --- /dev/null +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "deepin-terminal-${version}"; + version = "2.9.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-terminal"; + rev = version; + sha256 = "1pmg1acs44c30hz9rpr6x1l6lyvlylc2pz5lv4ai0rhv37n51yn2"; + }; + + patches = [ + # Do not build vendored zssh and vte + (fetchurl { + name = "remove-vendor.patch"; + url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=5baa756e8e6ac8ce43fb122fce270756cc55086c; + sha256 = "0zrq004malphpy7xv5z502bpq30ybyj1rr4hlq4k5m4fpk29dlw6"; + }) + ]; + + postPatch = '' + substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" + substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" + ''; + + nativeBuildInputs = [ + pkgconfig vala cmake gettext + # For setup hook + gobjectIntrospection + ]; + buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ]; + + meta = with stdenv.lib; { + 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 = licenses.gpl3; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2070e7bc77f5940ce7b6dac7318da00182c7b913 --- /dev/null +++ b/pkgs/desktops/deepin/default.nix @@ -0,0 +1,16 @@ +{ pkgs, makeScope, libsForQt5 }: + +let + packages = self: with self; { + + deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; + deepin-icon-theme = callPackage ./deepin-icon-theme { }; + deepin-terminal = callPackage ./deepin-terminal { + inherit (pkgs.gnome3) libgee vte; + wnck = pkgs.libwnck3; + }; + + }; + +in + makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 7739e2bd09ec35ea99bce8f8f9f8cc0964f8a34f..60e63dc68ed99d40cdc18efefe4a80ed71b51702 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, curl, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { name = "econnman-${version}"; @@ -11,13 +11,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ]; - buildInputs = [ efl python2Packages.python dbus curl ]; + buildInputs = [ efl python2Packages.python dbus ]; 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 be648bf669985c246b07443c21bb48559192b114..9660bc3e4c78510d8ef7ccba596e4d8afab043c8 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig -, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio +, fribidi, SDL2, SDL, libGL, 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 +, curl, libinput, systemd, mesa_noglu, writeText }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.20.5"; + version = "1.20.7"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "07624c71l9d1jx1zvdhwkr1bgb1n7i0i5hyg6579zdwl3jw6jpns"; + sha256 = "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl zlib lz4 freetype fontconfig SDL mesa + buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa_noglu giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto xorg.libX11 udev systemd ]; @@ -70,6 +70,12 @@ stdenv.mkDerivation rec { 'Cflags: -I''${includedir}/eina-1/eina'"$modules" ''; + # EFL applications depend on libcurl, although it is linked at + # runtime by hand in code (it is dlopened). + postFixup = '' + patchelf --add-needed ${curl.out}/lib/libcurl.so $out/lib/libecore_con.so + ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index b1bd4e6b2f32a33c39a84ba13d2a9e8c34e9e36d..9b782b94f7ffff6400d71b23353f8974a21e4646 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_glu, + luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, xkeyboard_config, pcre }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.22.0"; + version = "0.22.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0xmrvryr35idd7fyqgshfhvy2053bs3vwrxbx681pi6rgpdvjghv"; + sha256 = "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index eef9eafae38b6d75dc59a2ed3e01b65d486abcc3..6a49852909e66e66fb88c396b777131a42a32a65 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, curl, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }: stdenv.mkDerivation rec { name = "ephoto-${version}"; @@ -11,11 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ]; - buildInputs = [ efl pcre curl ]; - - postInstall = '' - wrapProgram $out/bin/ephoto --prefix LD_LIBRARY_PATH : ${curl.out}/lib - ''; + buildInputs = [ efl pcre ]; meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 5f6a451d06551a02987cb25777a1a372c142448a..5de22522073395e40f99665c7c7f8bafe2d3a70d 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, pcre, curl, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, wrapGAppsHook }: stdenv.mkDerivation rec { name = "rage-${version}"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; - sha256 = "0xlxb1hmbnqcy088cqpj2i87hsd5h3da7d2f9afiavz0ssw4ll94"; + url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz"; + sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy"; }; nativeBuildInputs = [ + meson + ninja (pkgconfig.override { vanilla = true; }) wrapGAppsHook ]; @@ -22,12 +24,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad gst_all_1.gst-libav pcre - curl - ]; - - postInstall = '' - wrapProgram $out/bin/rage --prefix LD_LIBRARY_PATH : ${curl.out}/lib - ''; + ]; meta = { description = "Video + Audio player along the lines of mplayer"; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 935546efa869187c17b721d25916de5c6a2aacf2..3a52707fcf4ce0990c8e4c9dc338545f16572335 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, curl, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }: stdenv.mkDerivation rec { name = "terminology-${version}"; @@ -17,15 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ efl pcre - curl ]; - 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/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix index 8cf18b7018da175bbcf31485ac161a31a66abdd4..d4813eb2a938c4f5d0fc8bdfa7e8239b06596695 100644 --- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2"; sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; }; - + + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool ]; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 4fec962f16d8d007891c06010fab28462f82f28f..cc453678525135b705df5e81a7f6607749117b18 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -3,12 +3,17 @@ let overridden = set // overrides; set = with overridden; { # Backward compatibility. - gtkdoc = self.gtk_doc; + gtkdoc = self.gtk-doc; startup_notification = libstartup_notification; startupnotification = libstartup_notification; - gnomedocutils = self.gnome_doc_utils; + gnomedocutils = self.gnome-doc-utils; gnomeicontheme = self.gnome_icon_theme; gnomepanel = self.gnome_panel; + gnome_common = gnome-common; + gnome_keyring = gnome-keyring; + gnome_desktop = gnome-desktop; + gnome_settings_daemon = gnome-settings-daemon; + gnome_control_center = gnome-control-center; #### PLATFORM @@ -41,7 +46,7 @@ let overridden = set // overrides; set = with overridden; { libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { }; # for git-head builds - gnome_common = callPackage platform/gnome-common { }; + gnome-common = callPackage platform/gnome-common { }; gnome_mime_data = callPackage ./platform/gnome-mime-data { }; @@ -77,7 +82,7 @@ let overridden = set // overrides; set = with overridden; { #### DESKTOP - gnome_keyring = callPackage ./desktop/gnome-keyring { }; + gnome-keyring = callPackage ./desktop/gnome-keyring { }; libgweather = callPackage ./desktop/libgweather { }; @@ -97,15 +102,13 @@ let overridden = set // overrides; set = with overridden; { gnome_menus = callPackage ./desktop/gnome-menus { }; - gnome_desktop = callPackage ./desktop/gnome-desktop { }; + gnome-desktop = callPackage ./desktop/gnome-desktop { }; gnome_panel = callPackage ./desktop/gnome-panel { }; - gnome_session = callPackage ./desktop/gnome-session { }; + gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { }; - gnome_settings_daemon = callPackage ./desktop/gnome-settings-daemon { }; - - gnome_control_center = callPackage ./desktop/gnome-control-center { }; + gnome-control-center = callPackage ./desktop/gnome-control-center { }; gtksourceview = callPackage ./desktop/gtksourceview { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index c07dc9730e6df02c717e5cc5c7c4859069abeebe..276bc7e79c1a68f9883c16b31635d72503a7cb50 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python -, shared_mime_info, desktop_file_utils, libunique, libtool, bzip2 -, glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd -, librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon +{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python +, shared-mime-info, desktop-file-utils, libunique, libtool, bzip2 +, glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd +, librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon , libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 -, libSM }: +, libSM, docbook_xml_dtd_412 }: stdenv.mkDerivation { name = "gnome-control-center-2.32.1"; @@ -14,10 +14,10 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils - gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon - libSM + buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils + gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 + libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon + libSM docbook_xml_dtd_412 ]; configureFlags = "--disable-scrollkeeper"; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix index 63df026836fae2008b0969d8ec609edf9ce0b65f..b99f23555d38f162ff982c397fb3b0db03c8dbef 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk -, intltool, GConf, gnome_doc_utils}: +, intltool, GConf, gnome-doc-utils}: stdenv.mkDerivation { name = "gnome-desktop-2.32.1"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { configureFlags = "--disable-scrollkeeper"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python libxml2Python libxslt which libX11 gtk - intltool GConf gnome_doc_utils ]; + intltool GConf gnome-doc-utils ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix index 50f2cd081332399b1a1fa923383abc0738e56ab2..26f3f624a042b8cac1aa6e860b0254fbe689fbff 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, -gtk, intltool, GConf, libgnome_keyring }: +gtk, intltool, GConf, libgnome-keyring }: stdenv.mkDerivation { name = "gnome-keyring-2.30.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj"; }; - buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome_keyring ]; + buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome-keyring ]; propagatedBuildInputs = [ glib libtasn1 ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index 1732b81f0704ba6e5c49e0c59f7ea1eae98a6357..d85b5494da47a49b03d0a8b78c0b7629e6e136e5 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python -, glib, gtk, pango, atk, libXau, libcanberra -, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop -, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: +{ stdenv, fetchurl, pkgconfig, dbus-glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python +, glib, gtk, pango, atk, libXau, libcanberra-gtk2 +, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop +, libwnck, librsvg, libgweather, gnome-doc-utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: stdenv.mkDerivation { name = "gnome-panel-2.32.1"; @@ -12,10 +12,10 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk dbus_glib popt libxml2Python libxslt bzip2 python libXau intltool + [ gtk dbus-glib popt libxml2Python libxslt bzip2 python libXau intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf - gnome_menus gnome_desktop libwnck librsvg libgweather gnome_doc_utils - libtasn1 libtool libcanberra xorg.libICE xorg.libSM + gnome_menus gnome-desktop libwnck librsvg libgweather gnome-doc-utils + libtasn1 libtool libcanberra-gtk2 xorg.libICE xorg.libSM ]; nativeBuildInputs = [ pkgconfig intltool which ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix deleted file mode 100644 index 7678cb3a4b426a7806e516f313c622bb57d8d044..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto -, intltool, libglade, startup_notification, GConf, upower, libSM }: - -stdenv.mkDerivation { - name = "gnome-session-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-session/2.32/gnome-session-2.32.1.tar.bz2; - sha256 = "0sk8qclarpar27va1ahzwjh2wsafys0xsdjzdg7cgygw6gj3rn92"; - }; - - buildInputs = - [ dbus_glib gtk libXau libXtst inputproto libglade startup_notification - GConf upower libSM - ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # gconf-sanity-check-2 not found - meta.broken = true; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index 37f9953968612d945a49f5e15508f401c367f885..9712ce64841f01e633cb261f83bd8219c691c44d 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio +{ stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, gtk +, intltool, GConf, gnome-desktop, libglade, libgnomekbd, polkit, libpulseaudio , libSM }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = - [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit + [ dbus-glib libxklavier gtk GConf gnome-desktop libglade libgnomekbd polkit libpulseaudio libSM ]; diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index bd8b71d0daca73d767c36a49b1e939b4f6d30a85..9efca75e8f873a7e63adba56e422f430e603d377 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib -, gnome_common, gtk, pango +, gnome-common, gtk, pango , libxml2Python, perl, intltool, gettext, gtk-mac-integration }: with stdenv.lib; @@ -32,10 +32,12 @@ stdenv.mkDerivation rec { pango libxml2Python perl intltool gettext ] ++ optionals stdenv.isDarwin [ - autoreconfHook gnome_common gtk-mac-integration + autoreconfHook gnome-common gtk-mac-integration ]; preConfigure = optionalString stdenv.isDarwin '' intltoolize --force ''; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix index f0882e39a8570d4a8c15d8d425128a45b83d2b24..b846ef888c43fffd6cfd45f93910accc37d42e30 100644 --- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, glib, gtk, intltool, GConf, libglade}: +{stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, glib, gtk, intltool, GConf, libglade}: stdenv.mkDerivation { name = "libgnomekbd-2.32.0"; @@ -9,5 +9,5 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib libxklavier glib gtk intltool GConf libglade ]; + buildInputs = [ dbus-glib libxklavier glib gtk intltool GConf libglade ]; } diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 22604f214d488f7b62d7754b6100936842f08db0..d4935c498f136dde81d2c2f67239f8762fd9366f 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus_glib, gmime, libnotify, libgnome_keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor_icon_theme, tango-icon-theme }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.gnome-keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/desktops/gnome-2/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix index a3584d67beaf0217a9396ad44b5f7afa18f36783..95dd97568f464e7d6f58c82cfc6b0085e8242f80 100644 --- a/pkgs/desktops/gnome-2/desktop/metacity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/metacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage -, libcanberra, intltool, GConf, startup_notification, zenity, gnome_doc_utils -, gsettings_desktop_schemas }: +, libcanberra-gtk2, intltool, GConf, startup_notification, zenity, gnome-doc-utils +, gsettings-desktop-schemas }: stdenv.mkDerivation { name = "metacity-2.30.3"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; buildInputs = - [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra - intltool GConf startup_notification zenity gnome_doc_utils - gsettings_desktop_schemas + [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra-gtk2 + intltool GConf startup_notification zenity gnome-doc-utils + gsettings-desktop-schemas ]; } diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index e5d2489436eec7472565357cd3c5b3b7485c07b1..80c77d9b291cc0e49209a81e183d21ae4b2b2b00 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses +{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk, ncurses , pythonSupport ? false, python27Packages}: let @@ -15,7 +15,17 @@ in stdenv.mkDerivation rec { ./alt.patch ./change-scroll-region.patch # CVE-2012-2738 - ./vte-0.28.2-limit-arguments.patch + # fixed in upstream version 0.32.2 + (fetchpatch{ + name = "CVE-2012-2738-1.patch"; + url = https://git.gnome.org/browse/vte/patch/?id=feeee4b5832b17641e505b7083e0d299fdae318e; + sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n"; + }) + (fetchpatch{ + name = "CVE-2012-2738-2.patch"; + url = https://git.gnome.org/browse/vte/patch/?id=98ce2f265f986fb88c38d508286bb5e3716b9e74; + sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn"; + }) ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch b/pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch deleted file mode 100644 index fd454079390f3e6c5f7d28b0d8d6084cf3b726ec..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch +++ /dev/null @@ -1,40 +0,0 @@ -From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Sat, 19 May 2012 17:36:09 +0000 -Subject: emulation: Limit integer arguments to 65535 - -To guard against malicious sequences containing excessively big numbers, -limit all parsed numbers to 16 bit range. Doing this here in the parsing -routine is a catch-all guard; this doesn't preclude enforcing -more stringent limits in the handlers themselves. - -https://bugzilla.gnome.org/show_bug.cgi?id=676090 ---- -diff --git a/src/table.c b/src/table.c -index 140e8c8..85cf631 100644 ---- a/src/table.c -+++ b/src/table.c -@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array, - if (G_UNLIKELY (*array == NULL)) { - *array = g_value_array_new(1); - } -- g_value_set_long(&value, total); -+ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT)); - g_value_array_append(*array, &value); - } while (i++ < arginfo->length); - g_value_unset(&value); -diff --git a/src/vteseq.c b/src/vteseq.c -index 457c06a..46def5b 100644 ---- a/src/vteseq.c -+++ b/src/vteseq.c -@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal, - GValueArray *params, - VteTerminalSequenceHandler handler) - { -- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG); -+ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT); - } - - static void --- -cgit v0.9.0.2 diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index 3ab8838c97b61f386a1ea3ba217a631299af363b..014255785ddf9436028b32ef36266894430e4033 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk -, gnome_doc_utils, intltool, libglade, libX11, which }: +, gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }: stdenv.mkDerivation { name = "zenity-2.32.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ gtk libglade libxml2 libxslt libX11 ]; + buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; } diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index afa27a93bad5940ca5b7d87e648a82aeea48aa54..778a1cc920f1cc6a40c438fda5b8e005bf6010ec 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2 +{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 , polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: assert withGtk -> (gtk2 != null); @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ] + buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index b8a41a529b05101084db8c87a5a29f4d4fdb3a98..ef18f0783ce3abf3f3401d9ee82ce7f5c9538e4c 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintl }: stdenv.mkDerivation rec { name = "ORBit2-${minVer}.19"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig libintl ]; + propagatedBuildInputs = [ glib libIDL ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix index b0b669148ff314e04bde068527271f6745e702c1..9bcc9ab6cabe5b36b41af4d37340c151b7d1c8d4 100644 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi -, intltool, libbonobo, ORBit2, GConf, dbus_glib }: +, intltool, libbonobo, ORBit2, GConf, dbus-glib }: stdenv.mkDerivation { name = "at-spi-1.32.0"; @@ -13,5 +13,5 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi - intltool libbonobo ORBit2 GConf dbus_glib ]; + intltool libbonobo ORBit2 GConf dbus-glib ]; } diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix index c00f0a9c37b221d041a69896d3641a2fff0faa69..54a2bd526a945e29336dbfa208475d156b72f5a1 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; }; - propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which + propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome-common tends to require which patches = [(fetchurl { name = "gnome-common-patch"; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 06af8a63200a511f7db79b0f39782e133637058c..4ca0e791a2a9c1d48a8e14c4c843979ee5603e36 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus_glib +{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = - [ libxml2 bzip2 openssl dbus_glib fam cdparanoia + [ libxml2 bzip2 openssl dbus-glib fam cdparanoia gnome_mime_data avahi acl ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index d5be7137c8fa08e21e85c2280ce97cd1228da28a..834ec2201581aee9133efa7ef8e5f3659cd7e385 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xorg }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -9,12 +9,23 @@ stdenv.mkDerivation rec { }; buildInputs = with xorg; - [ pkgconfig glib gtk mesa pango libX11 libXmu ]; + [ pkgconfig glib gtk libGLU_combined pango libX11 libXmu ]; propagatedBuildInputs = [ pangox_compat ]; - # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and - # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. - CPPFLAGS = "-UGTK_DISABLE_DEPRECATED"; + patches = [ + # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and + # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. + (fetchpatch { + name = "02_fix_gtk-2.20_deprecated_symbols.diff"; + url = https://git.gnome.org/browse/gtkglext/patch/?id=d8f285d1397f6c41099c67e668288eecc1cdae67; + sha256 = "1zxak73plhy3m6psil1q9ssvjh9aqrif7kcbcz69y480qfb4ja08"; + }) + # Fix build with glibc ≥ 2.27 + (fetchurl { + url = https://salsa.debian.org/gewo/gtkglext/raw/3b002677c907890c7de002c9f5b4b3ec71d11b31/debian/patches/04_glibc2.27-ftbfs.diff; + sha256 = "1l1swkjkai6pnah23xfsfpbq2fgbhp5pzj3l0ybsx6b858cxqzj5"; + }) + ]; meta = with stdenv.lib; { homepage = https://projects.gnome.org/gtkglext/; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index 152c1d98b8c8d6b1aa7e56d03dfa8b65795bb129..63e33aa578ef644a292d634f6c8d9cd34ed0aecb 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf +{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, libGLU_combined, gdk_pixbuf , pangox_compat, libXmu }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [pkgconfig]; - propagatedBuildInputs = [ gtkglext gtkmm gtk mesa gdk_pixbuf ]; + propagatedBuildInputs = [ gtkglext gtkmm gtk libGLU_combined gdk_pixbuf ]; meta = { description = "C++ wrappers for GtkGLExt"; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 49b8cc88f9de2880316058d40b7188275884a536..493f88290f3a1f5334dddd17841cebaa8c188c1b 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool, -GConf, enchant, isocodes, gnome_icon_theme, gsettings_desktop_schemas }: +GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "4.10.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; }; - propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ]; + propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome_icon_theme GConf ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index d93ef73ca986dbab73de64145ad12b9ec4f42fb8..ee0bf5f82a098bb9a8ece3508fab84088a3293d6 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt +{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 5003215529e4860722ac1e745d96920e27ba402e..956fec1ddf1535286a208a167dfb4d03a8157c49 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -14,6 +14,4 @@ stdenv.mkDerivation { buildInputs = [ gtk python gettext ]; propagatedBuildInputs = [ libxml2 ]; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index a9957c41ff5d7f78a988289c86ac918ae13a4673..2dcb85235ee4c075c46c68f94e31c3880c4846d7 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra +{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2 , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg }: @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; + buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ]; propagatedBuildInputs = [ glib libbonobo libogg ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 24cd851eef6a895fa06ae22ce79eafce5d1710d0..838e513374531c4d8c4a64422b684feba6f5c919 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool -, gnome_vfs, libgnome_keyring, libglade }: +, gnome_vfs, libgnome-keyring, libglade }: stdenv.mkDerivation rec { name = "libgnomeui-${minVer}.5"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = - [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; + [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 545e89a85125bddc7b7435279777cdab13f83425..513948d3b51fe2b124f31633979e9ad510ae62e7 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,19 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, itstool, libxml2, python3Packages, at_spi2_core +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobjectIntrospection +, itstool, libxml2, python3Packages, at-spi2-core , dbus, intltool, libwnck3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) src name; + name = "accerciser-${version}"; + version = "3.22.0"; - nativeBuildInputs = [ pkgconfig ]; + src = fetchurl { + url = "mirror://gnome/sources/accerciser/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5"; + }; + + nativeBuildInputs = [ + pkgconfig wrapGAppsHook itstool intltool + gobjectIntrospection # For setup hook + ]; buildInputs = [ - gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi + gtk3 libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython - at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme + at-spi2-core dbus libwnck3 gnome3.defaultIconTheme ]; wrapPrefixVariables = [ "PYTHONPATH" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "accerciser"; + attrPath = "gnome3.accerciser"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Accerciser; description = "Interactive Python accessibility explorer"; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/src.nix b/pkgs/desktops/gnome-3/apps/accerciser/src.nix deleted file mode 100644 index 20bd008396493302f4b63e8495551e311fa790da..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/accerciser/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "accerciser-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/accerciser/3.22/accerciser-3.22.0.tar.xz; - sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index 9aae9215650f321c452db74b618b01c8a8ae58fd..93a2c41caf357d79f0d036e22847f1e43a210e69 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -1,37 +1,55 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, evolution_data_server, evolution, sqlite -, makeWrapper, itstool, desktop_file_utils -, clutter_gtk, libuuid, webkitgtk, zeitgeist -, gnome3, librsvg, gdk_pixbuf, libxml2 }: +{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig +, wrapGAppsHook, itstool, desktop-file-utils +, glib, gtk3, evolution-data-server +, libuuid, webkitgtk, zeitgeist +, gnome3, libxml2 }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "bijiben-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ivx3hbpg7qaqzpbbn06lz9w3q285vhwgfr353b14bg0nsidwy17"; + }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib intltool itstool libxml2 - clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg - evolution_data_server evolution sqlite ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook + ]; - enableParallelBuilding = true; + buildInputs = [ + glib gtk3 libuuid webkitgtk gnome3.tracker + gnome3.gnome-online-accounts zeitgeist + gnome3.gsettings-desktop-schemas + evolution-data-server + gnome3.defaultIconTheme + ]; - preFixup = '' - wrapProgram "$out/bin/bijiben" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + mesonFlags = [ + "-Dzeitgeist=true" + "-Dupdate_mimedb=false" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "bijiben"; + attrPath = "gnome3.bijiben"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Bijiben; description = "Note editor designed to remain simple to use"; - maintainers = gnome3.maintainers; + homepage = https://wiki.gnome.org/Apps/Bijiben; license = licenses.gpl3; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/apps/bijiben/src.nix deleted file mode 100644 index ea2c063647f7829ba3efb790941137eac05f8f15..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/bijiben/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "bijiben-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/bijiben/3.24/bijiben-3.24.1.tar.xz; - sha256 = "2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index a10864c347efbf1914b27880a5a329b02ad19391..9da265e75d6739c821521472df94b9f186768cf2 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,21 +1,52 @@ -{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 -, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool -, libgudev -, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: +{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3 +, pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool +, libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib +, libxslt, yelp-tools, gnome-common, gtk-doc +, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome-desktop, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "cheese-${version}"; + version = "3.28.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool - gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop - gst_all_1.gst-plugins-bad clutter_gtk clutter-gst - libcanberra_gtk3 libgudev ]; + src = fetchurl { + url = "mirror://gnome/sources/cheese/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw"; + }; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; }; + }; + + nativeBuildInputs = [ + pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib + libxslt docbook_xml_dtd_43 docbook_xsl + autoreconfHook gtk-doc yelp-tools gnome-common + ]; + buildInputs = [ gtk3 glib gnome-video-effects + gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop + gst_all_1.gst-plugins-bad clutter-gtk clutter-gst + libcanberra-gtk3 libgudev ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + outputs = [ "out" "man" "devdoc" ]; + + patches = [ + gtk-doc.respect_xml_catalog_files_var_patch + ]; + + preFixup = '' + gappsWrapperArgs+=( + # Effects + --prefix XDG_DATA_DIRS : "${gnome-video-effects}/share" + # vp8enc preset + --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" + # Thumbnailers + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${totem}/share" + ) + ''; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Cheese; diff --git a/pkgs/desktops/gnome-3/apps/cheese/src.nix b/pkgs/desktops/gnome-3/apps/cheese/src.nix deleted file mode 100644 index e10f79e8312d7eeb3ab5a52d817db3214a2dab75..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/cheese/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "cheese-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/cheese/3.24/cheese-3.24.0.tar.xz; - sha256 = "26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 3d152221a39773ff86c6883da3e95ff7adf1da47..d7def6e270916eefbc1aa1963a1897a4500cf3eb 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,47 +1,51 @@ -{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight +{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight , 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, openldap -, cmake}: +, wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite +, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu +, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - majVer = gnome3.version; + version = "3.28.1"; in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evolution-${version}"; - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome3.evolution_data_server ]; - - propagatedBuildInputs = [ gnome3.gtkhtml ]; + src = fetchurl { + url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l"; + }; - buildInputs = [ gtk3 glib intltool itstool libxml2 libtool - gdk_pixbuf gnome3.defaultIconTheme librsvg db icu - gnome3.evolution_data_server libsecret libical gcr - webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 - libcanberra_gtk3 bogofilter gnome3.libgdata sqlite - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas - gnome3.libgnome_keyring gnome3.glib_networking openldap - cmake - ]; + propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu + gnome3.evolution-data-server libsecret libical gcr + webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3 + libcanberra-gtk3 bogofilter gnome3.libgdata sqlite + gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit + nss nspr libnotify procps highlight gnome3.libgweather + gnome3.gsettings-desktop-schemas + gnome3.glib-networking openldap + ]; + nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ]; - configureFlags = [ "--disable-pst-import" "--disable-autoar" - "--disable-libcryptui" "--with-openldap"]; + cmakeFlags = [ + "-DENABLE_AUTOAR=OFF" + "-DENABLE_LIBCRYPTUI=OFF" + "-DENABLE_YTNEF=OFF" + "-DENABLE_PST_IMPORT=OFF" + ]; - cmakeFlags = [ "-DENABLE_AUTOAR=OFF" "-DENABLE_LIBCRYPTUI=OFF" - "-DENABLE_YTNEF=OFF" "-DENABLE_PST_IMPORT=OFF" - ]; + doCheck = true; - NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; + checkPhase = "ctest"; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "evolution"; + attrPath = "gnome3.evolution"; + }; + }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/desktops/gnome-3/apps/evolution/src.nix b/pkgs/desktops/gnome-3/apps/evolution/src.nix deleted file mode 100644 index 2aab7967d8a87ae8680a9f3211198fb258509b31..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/evolution/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-3.24.5"; - - src = fetchurl { - url = mirror://gnome/sources/evolution/3.24/evolution-3.24.5.tar.xz; - sha256 = "5544c5ea1a1c352e0300bff447ddf67146486fc3a6bbecd1b785d378d34b2189"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 181888293777d025d3c60745ed9fa99322a916ae..80f2a825c12270252270e494a815a5144f5c5316 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -1,20 +1,39 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }: +{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive +, file, json-glib, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "file-roller-${version}"; + version = "3.28.0"; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + src = fetchurl { + url = "mirror://gnome/sources/file-roller/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "15pn2m80x45bzibig4zrqybnbr0n1f9wpqx7f2p6difldns3jwf1"; + }; + + LANG = "en_US.UTF-8"; # postinstall.py + + nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook glibcLocales desktop-file-utils ]; - buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive - gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg - gnome3.dconf libnotify nautilus ]; + buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ]; - installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ]; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0"; + + postPatch = '' + chmod +x postinstall.py # patchShebangs requires executable file + patchShebangs postinstall.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "file-roller"; + attrPath = "gnome3.file-roller"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/FileRoller; description = "Archive manager for the GNOME desktop environment"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/apps/file-roller/src.nix deleted file mode 100644 index 10a82877bcd856d7f8a24a03b036d7de61f0988d..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/file-roller/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "file-roller-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz; - sha256 = "011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 69056e28c2607725dd6fb4edd316ec3589d1e393..919ebdd77d1715646e5d677f8fc8716d836727d9 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,25 +1,34 @@ -{ stdenv, intltool, fetchurl, enchant, isocodes +{ stdenv, intltool, fetchurl , pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool, libsoup, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, gspell }: +, wrapGAppsHook, itstool, libsoup, libxml2 +, gnome3, gspell }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gedit-${version}"; + version = "3.28.1"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i"; + }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; - buildInputs = [ gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup - gnome3.libpeas gnome3.gtksourceview libxml2 - gnome3.gsettings_desktop_schemas gnome3.dconf file gspell ]; + buildInputs = [ + gtk3 glib + gnome3.defaultIconTheme libsoup + gnome3.libpeas gnome3.gtksourceview + gnome3.gsettings-desktop-schemas gspell + ]; enableParallelBuilding = true; - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}") - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gedit"; + attrPath = "gnome3.gedit"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Gedit; diff --git a/pkgs/desktops/gnome-3/apps/gedit/src.nix b/pkgs/desktops/gnome-3/apps/gedit/src.nix deleted file mode 100644 index 3fdc6cfaa68582d37cb3ca6f5b4cbeeadaee4684..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gedit/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gedit-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gedit/3.22/gedit-3.22.0.tar.xz; - sha256 = "063b5a0b5dcc8f540f6e8c3ea1c22cf8a3a19edffc25315a1b6bc51d462b3f45"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 1179b2fdc5cf8a3021d9ee3a374e15fabbd6efdb..1f8077ff4af8686f78c30c5d307559cdd7fd07f2 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -2,7 +2,17 @@ wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "ghex-${version}"; + version = "3.18.3"; + + src = fetchurl { + url = "mirror://gnome/sources/ghex/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/ghex/src.nix b/pkgs/desktops/gnome-3/apps/ghex/src.nix deleted file mode 100644 index edaa51d9478425578a7e34e15535b2f46843547f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/ghex/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# 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/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index ce29ebf0a7ea2db1164d68f77cc50f0b9c199779..a1777137c019cdcef404867083f41d989a8eb6b7 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -1,37 +1,31 @@ -{ stdenv, intltool, fetchurl, python, autoreconfHook -, pkgconfig, gtk3, glib -, makeWrapper, itstool, libxml2, docbook_xsl -, gnome3, librsvg, gdk_pixbuf, libxslt }: +{ stdenv, intltool, fetchurl, python3 +, pkgconfig, gtk3, glib, gobjectIntrospection +, wrapGAppsHook, itstool, libxml2, docbook_xsl +, gnome3, gdk_pixbuf, libxslt }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "glade-${version}"; + version = "3.22.1"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; }; + }; nativeBuildInputs = [ - pkgconfig intltool itstool makeWrapper docbook_xsl libxslt - # reconfiguration - autoreconfHook gnome3.gnome_common gnome3.yelp_tools + pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection ]; - buildInputs = [ gtk3 glib libxml2 python - gnome3.gsettings_desktop_schemas - gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - enableParallelBuilding = true; - - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=782161 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=351054; - sha256 = "093wjjj40027pkqqnm14jb2dp2i2m8p1bayqx1lw18pq66c8fahn"; - }) + buildInputs = [ + gtk3 glib libxml2 python3 python3.pkgs.pygobject3 + gnome3.gsettings-desktop-schemas + gdk_pixbuf gnome3.defaultIconTheme ]; - preFixup = '' - wrapProgram "$out/bin/glade" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Glade; diff --git a/pkgs/desktops/gnome-3/apps/glade/src.nix b/pkgs/desktops/gnome-3/apps/glade/src.nix deleted file mode 100644 index d32dbd94d059cf132c60201aaeeded206d5629b2..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/glade/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "glade-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/glade/3.20/glade-3.20.0.tar.xz; - sha256 = "82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index cb8bf49254baba249da16813060b49828af53817..8921d70787ca90b0329fde83599925017ab93b41 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -1,41 +1,57 @@ -{ 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, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils +{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib +, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk +, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala +, 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 +, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk }: # TODO: ovirt (optional) -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + version = "3.28.2"; +in stdenv.mkDerivation rec { + name = "gnome-boxes-${version}"; - enableParallelBuilding = true; + src = fetchurl { + url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0xss6wrs4hkmr0aa9qxr9b6wxbygrkjz4p0c4xnymicq97jnwra1"; + }; doCheck = true; nativeBuildInputs = [ - makeWrapper pkgconfig intltool + meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils ]; buildInputs = [ - 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 + libvirt-glib glib gtk3 gtkvnc libxml2 + libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd + tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive + gnome3.defaultIconTheme librsvg acl libgudev libsecret libcap_ng numactl xen libapparmor ]; preFixup = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}" - done + gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}") ''; + mesonFlags = [ + "-Dovirt=false" + ]; + + postPatch = '' + chmod +x build-aux/post_install.py # patchShebangs requires executable file + patchShebangs build-aux/post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-boxes"; + attrPath = "gnome3.gnome-boxes"; + }; + }; + meta = with stdenv.lib; { description = "Simple GNOME 3 application to access remote or virtual systems"; homepage = https://wiki.gnome.org/action/show/Apps/Boxes; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix deleted file mode 100644 index dbed46178504c55cbc4738b5c7263439be1c60a1..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-boxes-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.0.tar.xz; - sha256 = "7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 618d6152d81f62b77f4c12422c6be333a4ff360c..b88bad2f6497b702c8185cc614958cdbf576845b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,19 +1,36 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, evolution_data_server, sqlite, libxml2, libsoup -, glib, gnome_online_accounts, gsettings_desktop_schemas }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib +, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup +, glib, gnome-online-accounts, gsettings-desktop-schemas }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "gnome-calendar"; + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1jacznnjql5jgzvzcp5kh2k0cd0y41cri6qz2bsakpllf7adbrq6"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ]; buildInputs = [ - gtk3 wrapGAppsHook intltool evolution_data_server - sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts - gsettings_desktop_schemas + gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib + gsettings-desktop-schemas gnome3.defaultIconTheme ]; + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Calendar; description = "Simple and beautiful calendar application for GNOME"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix deleted file mode 100644 index 5d0eeadcc0ae410879feecf66891f5214cf492a3..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calendar-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz; - sha256 = "3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 15f1f58b558cf75217aa268593265fe98812475e..1587fec2c69551e72ed75e2a3911bb773cac583f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,13 +1,32 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, gjs, gdk_pixbuf, librsvg }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook +, gobjectIntrospection, gjs, gdk_pixbuf, librsvg, libunistring }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-characters-${version}"; + version = "3.28.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool gjs gdk_pixbuf - librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme + src = fetchurl { + url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "14q92ysg7krawxlwv6ymgsxz2plk81wgfz6knlma7lm13jsczmf0"; + }; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-characters"; + attrPath = "gnome3.gnome-characters"; + }; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ]; + + mesonFlags = [ + "-Ddbus_service_dir=share/dbus-1/services" ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix deleted file mode 100644 index db14a10d65a7f2ae444ff65616f2361c68b1337b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-characters-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz; - sha256 = "9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 68cd2a42fa644da098b40f9a67308c8bf8968a4f..09c006771997b18aa10a3c5634d1bedd068217f4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,22 +1,34 @@ -{ stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, gsound -, makeWrapper, itstool, libcanberra_gtk3, libtool -, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: +{ stdenv, fetchurl +, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils +, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound +, gnome3, gdk_pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-clocks-${version}"; + version = "3.28.0"; - doCheck = true; + src = fetchurl { + url = "mirror://gnome/sources/gnome-clocks/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1dd739vchb592mck1dia2hkywn4213cpramyqzgmlmwv8z80p3nl"; + }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 - libgweather libnotify libtool gsound - wrapGAppsHook ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-clocks"; + attrPath = "gnome3.gnome-clocks"; + }; + }; + + doCheck = true; - enableParallelBuilding = true; + nativeBuildInputs = [ + vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils libxml2 + gobjectIntrospection # for finding vapi files + ]; + buildInputs = [ + gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme + gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound + ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Clocks; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix deleted file mode 100644 index 2497fe83c1edd19b1290e3db3120fc0f89a19390..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-clocks-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz; - sha256 = "9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index d34334c4f64cf9757d31b7af915441c679feb520..3bd3222dc0c2ff317a6c5bf931f3296a7ebfba4a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -1,36 +1,52 @@ -{ stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib -, makeWrapper, itstool, libxslt, webkitgtk +{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs +, pkgconfig, gtk3, glib, tracker, tracker-miners +, itstool, libxslt, webkitgtk, libgdata, gnome-online-accounts +, gnome-desktop, libzapojit, libgepub , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib, inkscape, poppler_utils -, gmp, desktop_file_utils, wrapGAppsHook }: +, gobjectIntrospection, json-glib, inkscape, poppler_utils +, gmp, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-documents-${version}"; + version = "3.28.0"; - doCheck = true; - - configureFlags = [ "--enable-getting-started" ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "174q59gk9j0083bvv8sd2k66xrd4lydy2rcqbwsbzsy22fbhwcha"; + }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxslt - docbook_xsl desktop_file_utils inkscape poppler_utils - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.defaultIconTheme librsvg evince - libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib - wrapGAppsHook ] - ++ (with gnome3; [ libgepub ]); + doCheck = true; - enableParallelBuilding = true; + mesonFlags = [ "-Dgetting-started=true" ]; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook + inkscape poppler_utils # building getting started + ]; + buildInputs = [ + gtk3 glib gnome3.gsettings-desktop-schemas + gdk_pixbuf gnome3.defaultIconTheme evince + libsoup webkitgtk gjs gobjectIntrospection + tracker tracker-miners libgdata + gnome-desktop libzapojit libgepub + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; preFixup = '' substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication" - - gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi') ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-documents"; + attrPath = "gnome3.gnome-documents"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Documents; description = "Document manager application designed to work with GNOME 3"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix deleted file mode 100644 index c1ca08a064bf875fd8cc7ddd231d7247b1d51437..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-documents-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz; - sha256 = "c2f920fe1696499ba2594c9ab3328e7f18fa8f60df0273aaad503bbe27eeb9a0"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 0c75ebd7c783274ef9ab4fd51068946995f9688a..b3ede7028902191f7e76944122caf39aee086612 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-getting-started-docs-${version}"; + version = "3.28.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0x60aava6ba4xliy4p4i6jm5d2nq8hx9aqgnaw4d34fvmcpcy5w0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-getting-started-docs"; attrPath = "gnome3.gnome-getting-started-docs"; }; + }; buildInputs = [ intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix deleted file mode 100644 index 027cbb59d88051519aeb6a2159dc75b2e76dfcc7..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-getting-started-docs-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz; - sha256 = "9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 91d5f7d00e49707862a9e45aa8b0016a4c6706e1..c184bcbb42d8e152ada5db835a91c79d7d0738fe 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,16 +1,26 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libxml2, systemd }: +, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-logs-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0j3wkbz7c2snmx4kjmh767175nf2lqxx2p8b8xa2qslknxc3gq6b"; + }; configureFlags = [ "--disable-tests" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 - systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme - ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; + buildInputs = [ gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-logs"; + attrPath = "gnome3.gnome-logs"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Logs; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix deleted file mode 100644 index 53e303f3856662591f84aef1b037fc242e763aea..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-logs-3.24.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz; - sha256 = "9aaf0d6ba6af195dc9805b5f6d290b454a0b710daf0c595fe6286f59a43083c4"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index bb8375d595ef16709ca9dcad0b0d8f964f2aef24..b5c8188bd0647dda6ffdd385562dd58de2832617 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -1,21 +1,31 @@ { stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3 , gobjectIntrospection, gdk_pixbuf, librsvg, libgweather, autoreconfHook , geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup -, webkitgtk }: +, webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "gnome-maps"; + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "19xx1v25ycr8ih4jwb1vc662jcx6kynaf7baj4i569ccrcwaj2d5"; + }; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gobjectIntrospection wrapGAppsHook - gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph - gnome3.geocode_glib libchamplain file libsoup - gdk_pixbuf librsvg libgweather autoreconfHook - gnome3.gsettings_desktop_schemas gnome3.evolution_data_server - gnome3.gnome_online_accounts gnome3.defaultIconTheme - webkitgtk ]; + nativeBuildInputs = [ intltool wrapGAppsHook file autoreconfHook pkgconfig ]; + buildInputs = [ + gobjectIntrospection + gtk3 geoclue2 gjs libgee folks gfbgraph + geocode-glib libchamplain libsoup + gdk_pixbuf librsvg libgweather + gnome3.gsettings-desktop-schemas evolution-data-server + gnome-online-accounts gnome3.defaultIconTheme + webkitgtk + ]; # The .service file isn't wrapped with the correct environment # so misses GIR files when started. By re-pointing from the gjs @@ -27,6 +37,13 @@ stdenv.mkDerivation rec { "Exec=$out/bin/gnome-maps" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Maps; description = "A map application for GNOME 3"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix deleted file mode 100644 index e45d7be3fb7717aaa7482978b4fea0ef29d3fea8..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-maps-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.3.tar.xz; - sha256 = "5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 54e79872c6795f9b6970383571624b5917e9e238..c2d5045e79ea1935eb78ecf4a164223ebdfaca6a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -1,25 +1,46 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker -, libxml2, python3Packages, libnotify, wrapGAppsHook -, pkgconfig, gtk3, glib, cairo -, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: +{ stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker +, libxml2, python3, libnotify, wrapGAppsHook, libmediaart +, gobjectIntrospection, gnome-online-accounts, grilo, grilo-plugins +, pkgconfig, gtk3, glib, cairo, desktop-file-utils, appstream-glib +, itstool, gnome3, gst_all_1 }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +python3.pkgs.buildPythonApplication rec { + pname = "gnome-music"; + version = "3.28.1"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + format = "other"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz"; + sha256 = "0xbwndfl72292dx4x99vm0iyrcy8xw2i5fhsch7b073rk4ydbyfx"; + }; + + nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ]; + buildInputs = with gst_all_1; [ + gtk3 glib libmediaart gnome-online-accounts + gdk_pixbuf gnome3.defaultIconTheme python3 + grilo grilo-plugins libnotify + gnome3.gsettings-desktop-schemas tracker + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly + ]; + propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python requests pygobject3 ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ 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.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 ]; - wrapPrefixVariables = [ "PYTHONPATH" ]; + postPatch = '' + for f in meson_post_conf.py meson_post_install.py; do + chmod +x $f + patchShebangs $f + done + ''; - enableParallelBuilding = true; + doCheck = false; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Music; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/apps/gnome-music/src.nix deleted file mode 100644 index 615c54583f2908e08cc9a09e02ce7ad8fd7a5a14..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-music/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-music-3.24.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz; - sha256 = "1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 3c793d703680e32d6d87f62dd71701e938795a7f..2163e6e875e7ebeb9afe8568e2ca75837ad51415 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -1,33 +1,48 @@ -{ stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib -, makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp, libmediaart, wrapGAppsHook -, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib +{ stdenv, gettext, fetchurl, libxml2, libgdata +, pkgconfig, gtk3, glib, tracker, tracker-miners +, itstool, gegl, babl, libdazzle, gfbgraph, grilo-plugins +, grilo, gnome-online-accounts +, desktop-file-utils, wrapGAppsHook +, gnome3, gdk_pixbuf, gexiv2, geocode-glib , dleyna-renderer }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "gnome-photos"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1n280j7crgwlzyf09j66f1zkrnnhfrr8pshn824njs1xyk3g0q11"; + }; # doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gegl babl libgdata libdazzle + gnome3.gsettings-desktop-schemas + gdk_pixbuf gnome3.defaultIconTheme + gfbgraph grilo-plugins grilo + gnome-online-accounts tracker + gexiv2 geocode-glib dleyna-renderer + tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata - gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart - gdk_pixbuf gnome3.defaultIconTheme librsvg exempi - gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif gnome3.tracker libxml2 desktop_file_utils - wrapGAppsHook gexiv2 geocode_glib dleyna-renderer ]; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Photos; - description = "Photos is an application to access, organize and share your photos with GNOME 3"; + description = "Access, organize and share your photos"; maintainers = gnome3.maintainers; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix deleted file mode 100644 index 204897f6d363b3f7ce127dd13c2553dda06ada52..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-photos-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.3.tar.xz; - sha256 = "cd365629ce584d223c023676a88b6194012bbc561c4a4b1c8eca462425e76288"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..70ed4403f100c5939864746cd8c746c06f594557 --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, gettext +, fetchurl +, pkgconfig +, gtk3 +, glib +, meson +, ninja +, upower +, desktop-file-utils +, wrapGAppsHook +, gnome3 }: + +let + pname = "gnome-power-manager"; + version = "3.26.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + wrapGAppsHook + gettext + + # needed by meson_post_install.sh + glib.dev + desktop-file-utils + ]; + + buildInputs = [ + gtk3 + glib + upower + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://projects-old.gnome.org/gnome-power-manager/; + description = "View battery and power statistics provided by UPower"; + maintainers = gnome3.maintainers; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index d6804e09a482b5bde68d82c01a61d76de417117d..ad759bf5506a4cd97f148d18286a40ad3c36d48f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -1,13 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs -, libgweather, intltool, itstool, geoclue2 }: +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobjectIntrospection +, libgweather, intltool, itstool, geoclue2, gnome-desktop }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-weather-${version}"; + version = "3.26.0"; - nativeBuildInputs = [ pkgconfig ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-weather/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; + }; + + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gtk3 wrapGAppsHook gjs intltool itstool - libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas + gtk3 gjs gobjectIntrospection gnome-desktop + libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas ]; # The .service file isn't wrapped with the correct environment @@ -20,6 +26,13 @@ stdenv.mkDerivation rec { "Exec=$out/bin/gnome-weather" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-weather"; + attrPath = "gnome3.gnome-weather"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Weather; description = "Access current weather conditions and forecasts"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix deleted file mode 100644 index eef77b23504c65fcc3e729f80910aaf62bbccf19..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-weather-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz; - sha256 = "e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix index 2812e7673b408d0ab43846047ee8656369939154..7ac8b4dfe1165188cb80a5299b4ab7efca709c6b 100644 --- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix +++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix @@ -1,18 +1,27 @@ { stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }: -stdenv.mkDerivation rec { - name = "nautilus-sendto-${version}"; - +let + pname = "nautilus-sendto"; version = "3.8.6"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + src = fetchurl { - url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/3.8/${name}.tar.xz"; sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d"; }; nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ]; buildInputs = [ glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { description = "Integrates Evolution and Pidgin into the Nautilus file manager"; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 7c3da70edeb2cd4bc5e93ba5bb7722fafc08145d..4ae67f9b41d688de2988858a06debb2430608f54 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,18 +1,37 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme -, telepathy_glib, gjs, itstool, telepathy_idle, libxml2 -, pkgconfig, gtk3, glib, librsvg, libsecret, libsoup -, gnome3, wrapGAppsHook, telepathy_logger, gspell }: +{ stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme +, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils +, pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib +, gnome3, wrapGAppsHook, telepathy-logger, gspell }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "polari"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "08zgdqrnxl752nv0gac1k7wvjd4j7h5n4c0flrq7q337p40k3dd5"; + }; + + propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas - telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ]; + nativeBuildInputs = [ + meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2 + desktop-file-utils gobjectIntrospection appstream-glib + ]; - enableParallelBuilding = true; + buildInputs = [ + gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas + telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Polari; diff --git a/pkgs/desktops/gnome-3/apps/polari/src.nix b/pkgs/desktops/gnome-3/apps/polari/src.nix deleted file mode 100644 index da7a37031f576164b15c35b98718484b00d03ecd..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/polari/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "polari-3.24.2"; - - src = fetchurl { - url = mirror://gnome/sources/polari/3.24/polari-3.24.2.tar.xz; - sha256 = "3e1884000fda5cf6293e21ca1c028ec0b13d5baab5a79b8c11e4728c3238bb42"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 03dbdb1842a4d90248f3849b02c125d1838036a8..60e8822135ced34c3bad0d705cf85dfc9fbdef10 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,30 +1,39 @@ -{ stdenv, intltool, fetchurl, vala_0_32 +{ stdenv, intltool, fetchurl, vala , pkgconfig, gtk3, glib , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit, openssh }: +, libsecret, avahi, p11-kit, openssh }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "seahorse"; + version = "3.20.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - doCheck = true; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; + }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + doCheck = true; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg - gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala_0_32 - openssh ]; + nativeBuildInputs = [ pkgconfig vala intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gnome3.gcr + gnome3.gsettings-desktop-schemas gnupg + gnome3.defaultIconTheme gpgme + libsecret avahi libsoup p11-kit + openssh + ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" - ) - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Seahorse; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/apps/seahorse/src.nix deleted file mode 100644 index 0ae195a0a7ba3a77150a8673e4d76b65002785ed..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/seahorse/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "seahorse-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/seahorse/3.20/seahorse-3.20.0.tar.xz; - sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index e719fbf9f2197cf484e3c6c28548a5dd99b9f8c3..4f358cf0b4f67928b6d9fc36d8bb864de8d8a9fd 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -2,7 +2,17 @@ , libsecret, itstool, makeWrapper, librsvg }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vinagre-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/vinagre/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "vinagre"; attrPath = "gnome3.vinagre"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret diff --git a/pkgs/desktops/gnome-3/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/apps/vinagre/src.nix deleted file mode 100644 index 3d1357c498982ae6ff94342d34e4658585d76b1c..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/apps/vinagre/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vinagre-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz; - sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 62cc4da6ba14aefee1ae34390690ae75a8965cee..049b586f16db49416b3714dea298268c168ab4ca 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,11 +1,21 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }: +, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "adwaita-icon-theme-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "adwaita-icon-theme"; attrPath = "gnome3.adwaita-icon-theme"; }; + }; # For convenience, we can specify adwaita-icon-theme only in packages - propagatedBuildInputs = [ hicolor_icon_theme ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; buildInputs = [ gdk_pixbuf librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix deleted file mode 100644 index 5700cb56913f3d6a9197fb9d38dd6b67f0d72534..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "adwaita-icon-theme-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz; - sha256 = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index f94cb3c57c46d65d0c6d25a170f842444341a8d6..693e284e27005ef99ef33d053ef5a4c39dc50d49 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -1,24 +1,34 @@ -{ stdenv, intltool, fetchurl, vala, libgtop -, pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: +{ stdenv, gettext, fetchurl, vala, desktop-file-utils +, meson, ninja, pkgconfig, gtk3, glib, libxml2 +, wrapGAppsHook, itstool, gnome3 }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "baobab"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - doCheck = true; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk"; + }; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; + buildInputs = [ gtk3 glib gnome3.defaultIconTheme ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala gtk3 glib libgtop intltool itstool libxml2 - wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Baobab; - description = "Graphical application to analyse disk usage in any Gnome environment"; - maintainers = gnome3.maintainers; + description = "Graphical application to analyse disk usage in any GNOME environment"; + homepage = https://wiki.gnome.org/Apps/DiskUsageAnalyzer; license = licenses.gpl2; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/baobab/src.nix b/pkgs/desktops/gnome-3/core/baobab/src.nix deleted file mode 100644 index 8a2e35d454e37467166aa2f5ef6a2784788d356d..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/baobab/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "baobab-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/baobab/3.24/baobab-3.24.0.tar.xz; - sha256 = "5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index e405d8edfbaf33f97a48b0254c1616f78c6a1a42..48be01faf33f829ad9959d2ed727bb0527d64b9b 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,22 +1,24 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook }: +{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2 +, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook +, wrapGAppsHook }: let - majorVersion = "0.4"; -in -stdenv.mkDerivation rec { - name = "caribou-${majorVersion}.21"; + pname = "caribou"; + version = "0.4.21"; + pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; buildInputs = with gnome3; - [ glib gtk clutter at_spi2_core dbus pythonPackages.python - pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ]; + [ glib gtk clutter at-spi2-core dbus pythonEnv python3Packages.pygobject3 + libXtst gtk2 ]; propagatedBuildInputs = [ gnome3.libgee libxklavier ]; @@ -25,8 +27,18 @@ stdenv.mkDerivation rec { substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { + description = "An input assistive technology intended for switch and pointer users"; + homepage = https://wiki.gnome.org/Projects/Caribou; platforms = platforms.linux; + license = licenses.lgpl21; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index cd401962c99c4c3f153ae35a364d89e5174f8d2f..57c102d89cc517b64f6830a5d535abb8125694ef 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,14 +1,32 @@ -{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, dbus-glib, gtk3, gnome3 +, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobjectIntrospection }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "dconf-editor"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5"; + }; + + nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection ]; + + buildInputs = [ glib dbus-glib gtk3 gnome3.defaultIconTheme gnome3.dconf ]; - buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas - intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "${pname}"; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/core/dconf-editor/src.nix deleted file mode 100644 index 64e19864536fa6b0bcafe993d77462ec52c927a1..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/dconf-editor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "dconf-editor-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/dconf-editor/3.22/dconf-editor-3.22.0.tar.xz; - sha256 = "4ca3c2c3836f4c944f161540d1521507dab8e7bee0cac7d543560808efb9246f"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 130e8255edcaf6091f29915978a920dc2ef3b591..9b1adeb953d63ba4de1584bde47cfb0918853ba9 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,29 +1,38 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: +{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 +, libxml2, docbook_xsl, makeWrapper }: let - majorVersion = "0.26"; + pname = "dconf"; in stdenv.mkDerivation rec { - name = "dconf-${version}"; - version = "${majorVersion}.0"; + name = "${pname}-${version}"; + version = "0.28.0"; src = fetchurl { - url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz"; - sha256 = "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1"; }; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ]; - buildInputs = [ glib dbus_glib ]; + nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 docbook_xsl ]; + buildInputs = [ glib dbus-glib ]; - postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace client/Makefile \ - --replace "-soname=libdconf.so.1" "-install_name,libdconf.so.1" - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/dconf; + license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index ea257ed69f0f7ffce698df8c91a64d4dcc20be76..4da4c480266596b5af2397231f0bd09a7cacb3fa 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,58 +1,59 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, gnome3, gdk_pixbuf -, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream -, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control -, telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server -, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info -, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: +, dbus-glib, dbus_libs, telepathy-glib, telepathy-farstream +, clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts +, gcr, libsecret, folks, libpulseaudio, telepathy-mission-control +, telepathy-logger, libnotify, clutter, libsoup, gnutls +, evolution-data-server, yelp-xsl +, libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info +, bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee +, isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: -# TODO: enable more features - -let - majorVersion = "3.12"; -in stdenv.mkDerivation rec { - name = "empathy-${majorVersion}.11"; + name = "empathy-${version}"; + version = "3.25.90"; src = fetchurl { - url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz"; - sha256 = "11yl8msyf017197fm6h15yw159yjp9i08566l967yashbx7gzr6i"; + url = "mirror://gnome/sources/empathy/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome_online_accounts shared_mime_info ]; - propagatedBuildInputs = [ folks telepathy_logger evolution_data_server - telepathy_mission_control ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper - telepathy_glib clutter_gtk clutter-gst cogl - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas - file libtool librsvg ]; - - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" - "-I${dbus_libs.dev}/include/dbus-1.0" - "-I${dbus_libs.dev}/lib/dbus-1.0/include" ]; + passthru = { + updateScript = gnome3.updateScript { packageName = "empathy"; }; + }; - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; + propagatedUserEnvPkgs = [ + gnome-online-accounts shared-mime-info + ]; + propagatedBuildInputs = [ + folks telepathy-logger evolution-data-server telepathy-mission-control + ]; + nativeBuildInputs = [ + pkgconfig libtool intltool itstool file wrapGAppsHook + libxml2 libxslt yelp-xsl + ]; + buildInputs = [ + gtk3 glib webkitgtk icu gnome-online-accounts + telepathy-glib clutter-gtk clutter-gst cogl + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gcr libsecret libpulseaudio gdk_pixbuf + libnotify clutter libsoup gnutls libgee p11-kit + libcanberra-gtk3 telepathy-farstream farstream + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + librsvg + # Spell-checking + enchant isocodes + # Display maps, location awareness, geocode support + libchamplain geoclue2 geocode-glib + # Cheese webcam support, camera monitoring + cheese libgudev + ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Empathy; description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; maintainers = gnome3.maintainers; - # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; + license = [ licenses.gpl2 ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 23759e3bf90e0b8d63b17fa425b24d651e8785aa..85587d11178d8ca6b8f222f3478c3952200de4ce 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,20 +1,42 @@ -{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, wrapGAppsHook, librsvg, libexif }: +{ fetchurl, stdenv, meson, ninja, gettext, itstool, pkgconfig, libxml2, libjpeg, libpeas, gnome3 +, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk_pixbuf, exempi +, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "eog"; + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1v3s4x4xdmfa488drwvxfps33jiyh3qz9z8v8s3779n1jn92rmbq"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ]; - buildInputs = with gnome3; - [ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg - gsettings_desktop_schemas shared_mime_info adwaita-icon-theme - gnome_desktop libexif dconf ]; + buildInputs = [ + libjpeg gtk3 gdk_pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi + gsettings-desktop-schemas shared-mime-info adwaita-icon-theme + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/EyeOfGnome; - platforms = platforms.linux; description = "GNOME image viewer"; + homepage = https://wiki.gnome.org/Apps/EyeOfGnome; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/core/eog/src.nix b/pkgs/desktops/gnome-3/core/eog/src.nix deleted file mode 100644 index 72b02d0bba5ac6938c342156e1d4e28d250504b4..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/eog/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "eog-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/eog/3.24/eog-3.24.1.tar.xz; - sha256 = "f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 35aae8cc9eb9592da505a5abe099c0583db05cde..3ece64dc163f8628bc05412d3095f9534efcdd2a 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,31 +1,44 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu -, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common, gst_all_1, json_glib }: +{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu +, wrapGAppsHook, gnome3, libxml2, libxslt, itstool +, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit +, sqlite, gcr, isocodes, desktop-file-utils +, gdk_pixbuf, gst_all_1, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "epiphany-${version}"; + version = "3.28.1"; - # Tests need an X display - configureFlags = [ "--disable-static --disable-tests" ]; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; - - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file - webkitgtk libsoup libsecret gnome_desktop libnotify libtool - sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools - gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common - gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf - gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav json_glib ]; - - NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; + src = fetchurl { + url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0zvxrwlswxadq4zbr4f73ms141d08j0lhi6rzmj83j1s3gan88md"; + }; - enableParallelBuilding = true; + # Tests need an X display + mesonFlags = [ "-Dunit_tests=false" ]; + + nativeBuildInputs = [ + meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils + ]; + + buildInputs = [ + gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify + sqlite isocodes p11-kit icu + gdk_pixbuf gnome3.defaultIconTheme gcr + glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav json-glib + ]; + + postPatch = '' + chmod +x post_install.py # patchShebangs requires executable file + patchShebangs post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "epiphany"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Epiphany; diff --git a/pkgs/desktops/gnome-3/core/epiphany/src.nix b/pkgs/desktops/gnome-3/core/epiphany/src.nix deleted file mode 100644 index 85596c07fadbf19ff616162afdaaa7794ab0d867..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/epiphany/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "epiphany-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/epiphany/3.24/epiphany-3.24.3.tar.xz; - sha256 = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index aca10516a38818e6aee3770fefb51f4972a22f1f..74f10cc384d7cc45ad466bb2c39e2cd55de2512c 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,58 +1,57 @@ -{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libsecret , wrapGAppsHook -, librsvg, gobjectIntrospection +{ fetchurl, stdenv, pkgconfig, intltool, libxml2 +, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 +, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook +, librsvg, gobjectIntrospection, yelp-tools , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps -, fetchpatch, autoreconfHook +, autoreconfHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evince-${version}"; + version = "3.28.2"; - # missing help for now; fixing the autogen phase seemed too difficult - postPatch = "sed '/@YELP_HELP_RULES@/d' -i help/Makefile.am"; + src = fetchurl { + url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "evince"; }; + }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook/*for patches*/ ]; + nativeBuildInputs = [ + pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp-tools autoreconfHook + ]; buildInputs = [ - intltool perl perlXMLParser libxml2 - glib gtk3 pango atk gdk_pixbuf gobjectIntrospection - itstool gnome3.adwaita-icon-theme - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas - poppler ghostscriptX djvulibre libspectre - libsecret librsvg gnome3.adwaita-icon-theme gnome3.dconf + glib gtk3 pango atk gdk_pixbuf libxml2 + gnome3.gsettings-desktop-schemas + poppler ghostscriptX djvulibre libspectre libarchive + libsecret librsvg gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; configureFlags = [ - "--disable-nautilus" # Do not use nautilus + "--disable-nautilus" # Do not build nautilus plugin "--enable-introspection" (if supportXPS then "--enable-xps" else "--disable-xps") ]; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - preConfigure = with stdenv.lib; - optionalString doCheck '' - for file in test/*.py; do - echo "patching $file" - sed '1s,/usr,${python},' -i "$file" - done - '' + optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; + preConfigure = stdenv.lib.optionalString (recentListSize != null) '' + sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c + sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c + ''; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; enableParallelBuilding = true; - doCheck = false; # would need pythonPackages.dogTail, which is missing - meta = with stdenv.lib; { - homepage = https://www.gnome.org/projects/evince/; + homepage = https://wiki.gnome.org/Apps/Evince; description = "GNOME's document viewer"; longDescription = '' @@ -64,6 +63,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; + maintainers = gnome3.maintainers ++ [ maintainers.vcunat ]; }; } diff --git a/pkgs/desktops/gnome-3/core/evince/src.nix b/pkgs/desktops/gnome-3/core/evince/src.nix deleted file mode 100644 index aa45a79536ac8ff6b7375077d6f65477440bc4ba..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/evince/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evince-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/evince/3.24/evince-3.24.1.tar.xz; - sha256 = "9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index e2472a4036991fb8e362d3c7fe0432b4e3a60c8b..01891ad82473df00b237f25419654df18e0142d1 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,27 +1,40 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf +{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf, gobjectIntrospection , intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, -vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }: +, p11-kit, db, nspr, nss, libical, gperf, makeWrapper +, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evolution-data-server-${version}"; + version = "3.28.1"; - buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts - (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper - icu sqlite gsettings_desktop_schemas cmake kerberos openldap webkitgtk - libaccounts-glib ] - ++ stdenv.lib.optional valaSupport vala_0_32; + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b"; + }; + + nativeBuildInputs = [ + cmake ninja pkgconfig intltool python3 gperf makeWrapper gobjectIntrospection vala + ]; + buildInputs = with gnome3; [ + glib libsoup libxml2 gtk gnome-online-accounts + gcr p11-kit libgweather libgdata libaccounts-glib json-glib + icu sqlite kerberos openldap webkitgtk + ]; propagatedBuildInputs = [ libsecret nss nspr libical db ]; - # uoa irrelevant for now - cmakeFlags = [ "-DENABLE_UOA=OFF" ] - ++ stdenv.lib.optionals valaSupport [ - "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + cmakeFlags = [ + "-DENABLE_UOA=OFF" + "-DENABLE_VALA_BINDINGS=ON" + "-DENABLE_INTROSPECTION=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + ]; - enableParallelBuilding = true; + postPatch = '' + cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags" + ''; preFixup = '' for f in $(find $out/libexec/ -type f -executable); do @@ -31,9 +44,17 @@ stdenv.mkDerivation rec { done ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "evolution-data-server"; + }; + }; + meta = with stdenv.lib; { - platforms = platforms.linux; + description = "Unified backend for programs that work with contacts, tasks, and calendar information"; + homepage = https://wiki.gnome.org/Apps/Evolution; + license = licenses.lgpl2; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix deleted file mode 100644 index 655fffe0eb9d2f1ded8f77df2524e48157da11b6..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-data-server-3.24.5"; - - src = fetchurl { - url = mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.5.tar.xz; - sha256 = "6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 6fcaa67b7712830becd84a76af176ccefd5a3f9f..776f76642222049aec9067492567ae34a6b463fb 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -1,35 +1,42 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs -, telepathy_glib, evolution_data_server, libsecret, db }: +, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus_libs +, telepathy-glib, evolution-data-server, libsecret, db }: # TODO: enable more folks backends let - majorVersion = "0.11"; -in -stdenv.mkDerivation rec { - name = "folks-${majorVersion}.4"; + version = "0.11.4"; +in stdenv.mkDerivation rec { + name = "folks-${version}"; src = fetchurl { - url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/folks/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57"; }; propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; # dbus_daemon needed for tests - buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs - vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ]; + buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus_libs + vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-fatal-warnings"; NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" - "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; + "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; enableParallelBuilding = true; postBuild = "rm -rf $out/share/gtk-doc"; + passthru = { + updateScript = gnome3.updateScript { + packageName = "folks"; + attrPath = "gnome3.folks"; + versionPolicy = "none"; + }; + }; + meta = { description = "Folks"; diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index 1729ec0662331aab1d4100cfeccf8726036452d2..3e7ba45b03ae080862c9f2bd4001f413f6f461dd 100644 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 -, intltool, polkit, orbit, withGtk ? false }: +{ stdenv, fetchurl, pkgconfig, dbus-glib, gnome3 ? null, glib, libxml2 +, intltool, polkit, orbit, python, withGtk ? false }: assert withGtk -> (gnome3 != null); @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; }; - buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus_glib ]; + buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk; + propagatedBuildInputs = [ glib dbus-glib ]; nativeBuildInputs = [ pkgconfig intltool ]; # ToDo: ldap reported as not found but afterwards reported as supported diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index e970dba5615e070384c2dbcaa7456b30ac3822d4..61c17a210b436d2b8685d85c3d93efcb6915e762 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -1,22 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk -, gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }: +{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib +, libgcrypt, libtasn1, dbus-glib, gtk, pango, gdk_pixbuf, atk +, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gcr-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gcr/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gcr"; attrPath = "gnome3.gcr"; }; + }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection libxslt makeWrapper vala ]; buildInputs = let gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome in [ - intltool gpg gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32 + gpg libgcrypt libtasn1 dbus-glib pango gdk_pixbuf atk ]; - propagatedBuildInputs = [ glib gtk p11_kit ]; + propagatedBuildInputs = [ glib gtk p11-kit ]; #doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gcr/src.nix b/pkgs/desktops/gnome-3/core/gcr/src.nix deleted file mode 100644 index d166f033266c5f9d1bf5758a0e3536d9802b53c9..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gcr/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gcr-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz; - sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 09e27e7c0c5f3d050e0fe60aaba2532eb68247c4..6b6b23f21b548745ca6af9aecaf1d18bfd9bf27f 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,26 +1,41 @@ { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth -, librsvg }: +, gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth +, librsvg, coreutils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gdm-${version}"; + version = "3.28.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1yxjjyrp0ywrc25cp81bsdhp79zn0c0jag48hlp00b5wfnkqy1kp"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gdm"; attrPath = "gnome3.gdm"; }; + }; # Only needed to make it build preConfigure = '' substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" ''; + postPatch = '' + substituteInPlace daemon/gdm-manager.c --replace "/bin/plymouth" "${plymouth}/bin/plymouth" + substituteInPlace data/gdm.service.in --replace "/bin/kill" "${coreutils}/bin/kill" + ''; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-plymouth=yes" + "--with-initial-vt=7" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ glib itstool libxml2 intltool - accountsservice gnome3.dconf systemd + nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ]; + buildInputs = [ glib accountsservice systemd gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam libtool plymouth librsvg ]; + libcanberra-gtk3 pam plymouth librsvg ]; enableParallelBuilding = true; @@ -30,6 +45,11 @@ stdenv.mkDerivation rec { ./gdm-session-worker_xserver-path.patch ]; + postInstall = '' + # Prevent “Could not parse desktop file orca-autostart.desktop or it references a not found TryExec binary” + rm $out/share/gdm/greeter/autostart/orca-autostart.desktop + ''; + installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch deleted file mode 100644 index 84081f4786c1f81017e2c0dfc433b6b120d65dd9..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c -index d835b34..86f0d47 100644 ---- a/daemon/gdm-x-session.c.orig -+++ b/daemon/gdm-x-session.c -@@ -240,7 +240,13 @@ spawn_x_server (State *state, - - display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO); - -- g_ptr_array_add (arguments, X_SERVER); -+ if (g_getenv ("GDM_X_SERVER") != NULL) { -+ g_debug ("using GDM_X_SERVER: %s", g_getenv("GDM_X_SERVER")); -+ g_ptr_array_add (arguments, g_getenv("GDM_X_SERVER")); -+ } else { -+ g_debug ("GDM_X_SERVER not set, using default: %s", X_SERVER); -+ g_ptr_array_add (arguments, X_SERVER); -+ } - - if (vt_string != NULL) { - g_ptr_array_add (arguments, vt_string); diff --git a/pkgs/desktops/gnome-3/core/gdm/src.nix b/pkgs/desktops/gnome-3/core/gdm/src.nix deleted file mode 100644 index 0dd7680467f99495234f55f1d8ec51e23b9e36a3..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdm-3.24.2"; - - src = fetchurl { - url = mirror://gnome/sources/gdm/3.24/gdm-3.24.2.tar.xz; - sha256 = "4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix index 4d75bdc499634a1b78d367dafe73a0ff1c5a5ea3..910ef01fcb9db883c90c772de203187df34f52b1 100644 --- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix +++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix @@ -1,14 +1,38 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: +{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobjectIntrospection, gnome3, libsoup, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "geocode-glib-${version}"; + version = "3.25.4.1"; - buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; + outputs = [ "out" "dev" "installedTests" ]; + + src = fetchurl { + url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0y6p5l2jrr78p7l4hijjhclzbap005y6h06g3aiglg9i5hk6j0gi"; + }; + + nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobjectIntrospection ]; + buildInputs = with gnome3; [ glib libsoup json-glib ]; + + patches = [ + ./installed-tests-path.patch + ]; + + postPatch = '' + substituteInPlace geocode-glib/tests/meson.build --subst-var-by "installedTests" "$installedTests" + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "geocode-glib"; + attrPath = "gnome3.geocode-glib"; + }; + }; meta = with stdenv.lib; { - platforms = platforms.linux; + description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; + license = licenses.lgpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch b/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..499c680080883e6b24ba1b648b5c0625403a66c3 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch @@ -0,0 +1,8 @@ +--- a/geocode-glib/tests/meson.build ++++ b/geocode-glib/tests/meson.build +@@ -1,4 +1,4 @@ +-install_dir = get_option('libexecdir') + '/installed-tests/geocode-glib' ++install_dir = '@installedTests@/libexec/installed-tests/geocode-glib' + + e = executable('geo-uri', + 'geo-uri.c', diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/core/geocode-glib/src.nix deleted file mode 100644 index 394e3a68c35c4624ae2a897ada4bb21d8be61316..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/geocode-glib/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "geocode-glib-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz; - sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 482d6ae64a4017f6c99edae6c2b91b298157a71c..68b85d9dfe0f6cb39c00fe1676da68e2e2e2a298 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -1,26 +1,51 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection -, spidermonkey_38, pango, readline, glib, libxml2, dbus }: +{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, atk, gobjectIntrospection +, spidermonkey_52, pango, readline, glib, libxml2, dbus, gdk_pixbuf +, makeWrapper }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gjs-${version}"; + version = "1.52.1"; - nativeBuildInputs = [ pkgconfig ]; + src = fetchurl { + url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1s1m8xv3ixgl0hah3r364ws249d6w8yn56q2ahfn3dg2j54rmz58"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gjs"; attrPath = "gnome3.gjs"; }; + }; + + outputs = [ "out" "installedTests" ]; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ]; - propagatedBuildInputs = [ spidermonkey_38 ]; + propagatedBuildInputs = [ spidermonkey_52 ]; - # GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc - preConfigure = '' - sed -i s/mozjs-38/js/ configure + configureFlags = [ + "--enable-installed-tests" + ]; + + postPatch = '' + for f in installed-tests/*.test.in; do + substituteInPlace "$f" --subst-var-by pkglibexecdir "$installedTests/libexec/gjs" + done ''; postInstall = '' sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la + + moveToOutput "share/installed-tests" "$installedTests" + moveToOutput "libexec/gjs/installed-tests" "$installedTests" + + wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \ + --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk_pixbuf ]}:$installedTests/libexec/gjs/installed-tests" ''; meta = with stdenv.lib; { + description = "JavaScript bindings for GNOME"; maintainers = gnome3.maintainers; platforms = platforms.linux; + license = licenses.lgpl2Plus; }; - } diff --git a/pkgs/desktops/gnome-3/core/gjs/src.nix b/pkgs/desktops/gnome-3/core/gjs/src.nix deleted file mode 100644 index 27162fcbfd45341a406fd8702f15621ec5a36b49..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gjs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gjs-1.48.6"; - - src = fetchurl { - url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz; - sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index eb801caf5657df1a65076ef73a205f1c72f23dc4..c52fe5c60492b8242577a1184167de237fd6b220 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,9 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-backgrounds-${version}"; + version = "3.28.0"; - nativeBuildInputs = [ pkgconfig intltool ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; meta = with stdenv.lib; { platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix deleted file mode 100644 index dce56f2341e80ecfd7b938da7eb5828b14b60770..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-backgrounds-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz; - sha256 = "cbda4c2159292940fa4b972df77379be716590c7b62bb4b2b9fa8e99749c71ca"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index f237d745c1cc270a66b941ae90feca1d1a60672b..d570a5414094f94768fa3f844afa659fa8169cbc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,17 +1,26 @@ -{ stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }: +{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-bluetooth-${version}"; + version = "3.28.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme - makeWrapper gnome3.gsettings_desktop_schemas itstool - libnotify libcanberra_gtk3 ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0q7yzklrlayj99risj096mr5x35anx94wvr6nbf6pwbvvzv7453p"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-bluetooth"; attrPath = "gnome3.gnome-bluetooth"; }; + }; + + nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ]; - preFixup = '' - wrapProgram "$out/bin/bluetooth-sendto" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix deleted file mode 100644 index 5129b87e542e0712dd2adf110d76ac3776ddf2c5..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-bluetooth-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz; - sha256 = "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 12b8af206ea07a308cf15bf07700995c0d69a7a7..03fdf4b14fe0b6c439565c79d3ba7586be581cab 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,23 +1,43 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, wrapGAppsHook -, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }: +{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 +, gtk3, glib, gtksourceview3, wrapGAppsHook, gobjectIntrospection +, gnome3, mpfr, gmp, libsoup, libmpc }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-calculator-${version}"; + version = "3.28.1"; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "05zpdp9mkfjz22hs7hfjikkxhzmvy02mxrldrjxsv8ff17w9xvic"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig vala gettext itstool wrapGAppsHook + gobjectIntrospection # for finding vapi files + ]; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + buildInputs = [ + gtk3 glib libxml2 gtksourceview3 mpfr gmp + gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas libsoup libmpc + ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + doCheck = true; - buildInputs = [ bash gtk3 glib intltool itstool - libxml2 gnome3.gtksourceview mpfr gmp - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas gnome3.dconf libsoup libmpc ]; + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-calculator"; + attrPath = "gnome3.gnome-calculator"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Calculator; + homepage = https://wiki.gnome.org/Apps/Calculator; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = gnome3.maintainers; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix deleted file mode 100644 index 9279cdb13af7980a4185dc47178d462cc15fa25e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calculator-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz; - sha256 = "44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9fcbbe814dcec21fdf7bdd92216a73cc9fa00ec8 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2 }: + +let + pname = "gnome-color-manager"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1mixga6mq67wgxdsg6rnl7lvyh3z3yabxjmnyjq2k2v8ljgklczc"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ]; + buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "A set of graphical utilities for color management to be used in the GNOME desktop"; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index f9261e183ef17466fb9a0cc16c9758caad0777dc..23fd157a528a4fdafc5b8f2bb259dbac83d30699 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, which, gnome3, autoconf, automake }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-common-${version}"; + version = "3.18.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-common/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-common"; attrPath = "gnome3.gnome-common"; }; + }; patches = [(fetchurl { name = "gnome-common-patch"; @@ -9,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; })]; - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which + propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which meta = with stdenv.lib; { maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/core/gnome-common/src.nix deleted file mode 100644 index 8ffe7e20e1a9904c7beb59729ec5adc140a1e537..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-common/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-common-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz; - sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index e69092a571230b9f4608d10f29a738925bdef75a..c8636cb1dc1fc858197becc4f76cdef15bcf6328 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -1,44 +1,55 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db -, pkgconfig, gtk3, glib, libsecret -, libchamplain, clutter_gtk, geocode_glib -, bash, wrapGAppsHook, itstool, folks, libnotify, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala_0_32, dbus_glib, automake, autoconf }: +{ stdenv, gettext, fetchurl, evolution-data-server +, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, gtk3, glib, cheese +, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts +, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib +, vala, meson, ninja }: + +let + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "gnome-contacts-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "17iinxqf221kk9yppv3yhg0m7jxk5zvwxmdf3hjygf9xgfw7z3zi"; + }; -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + propagatedUserEnvPkgs = [ evolution-data-server ]; - doCheck = true; + nativeBuildInputs = [ + meson ninja pkgconfig vala gettext libxslt docbook_xsl docbook_xml_dtd_42 wrapGAppsHook + ]; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; + buildInputs = [ + gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas + folks gnome-desktop telepathy-glib + libxml2 gnome-online-accounts cheese + gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib + ]; - # force build from vala - preBuild = '' - touch src/*.vala + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify - folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib - libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.defaultIconTheme librsvg - libchamplain clutter_gtk geocode_glib - vala_0_32 automake autoconf db ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" - ) - ''; + # In file included from src/gnome-contacts@exe/contacts-avatar-selector.c:30:0: + # /nix/store/*-cheese-3.28.0/include/cheese/cheese-widget.h:26:10: fatal error: clutter-gtk/clutter-gtk.h: No such file or directory + # #include + # ^~~~~~~~~~~~~~~~~~~~~~~~~~~ + NIX_CFLAGS_COMPILE = "-I${clutter-gtk}/include/clutter-gtk-1.0"; - patches = [ ./gio_unix.patch ]; + doCheck = true; - patchFlags = "-p0"; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-contacts"; + attrPath = "gnome3.gnome-contacts"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Contacts; - description = "Contacts is GNOME's integrated address book"; + description = "GNOME’s integrated address book"; maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/core/gnome-contacts/gio_unix.patch deleted file mode 100644 index f1b3d3c94ac26c3b2f64a945edd1ae24b0cb6d56..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/gio_unix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-04-09 18:45:50.581232289 +0200 -+++ configure.ac 2015-04-09 18:45:59.744280137 +0200 -@@ -54,6 +54,7 @@ - champlain-0.12 - clutter-gtk-1.0 - geocode-glib-1.0 >= 3.15.3 -+ gio-unix-2.0 - " - PKG_CHECK_MODULES(CONTACTS, [$pkg_modules]) - diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix deleted file mode 100644 index 4409747169baf8c763d14925a6b98c80492181db..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-contacts-3.22.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-contacts/3.22/gnome-contacts-3.22.1.tar.xz; - sha256 = "e45297fb6f379a978605f7e183201be70dff2912f55072a363bdb1f67d9fe87b"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index a6cc7ec962a004c285d7621f46677760f75e5282..55ac087cfa2c578ec843f5f33620d0659714ebe0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,60 +1,74 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook -, libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio -, gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev +{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook +, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio +, gdk_pixbuf, librsvg, libnotify, libgudev, gnome-color-manager , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, libkrb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk +, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc +, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd +, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese , fontconfig, sound-theme-freedesktop, grilo }: -# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules -# TODO: bluetooth, wacom, printers +let + pname = "gnome-control-center"; + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = - [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0f2p91bzbl39q3cb1qj5vi55km7wxb2fibx07vciz39g5va5cpn6"; + }; - # https://bugzilla.gnome.org/show_bug.cgi?id=752596 - enableParallelBuilding = false; + nativeBuildInputs = [ + meson ninja pkgconfig gettext wrapGAppsHook libtool libxslt docbook_xsl + shared-mime-info + ]; - buildInputs = with gnome3; - [ 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 wrapGAppsHook - networkmanager modemmanager gnome3.gnome-bluetooth grilo tracker - cracklib ]; + buildInputs = with gnome3; [ + ibus gtk glib glib-networking upower gsettings-desktop-schemas + libxml2 gnome-desktop gnome-settings-daemon polkit libgtop + gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk + accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify + grilo libpwquality cracklib vino libcanberra-gtk3 libgudev + gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese + networkmanager modemmanager gnome-bluetooth tracker + ]; - preBuild = '' - substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" + patches = [ + (substituteAll { + src = ./paths.patch; + gcm = gnome-color-manager; + inherit glibc libgnomekbd tzdata; + }) + ]; - # hack to make test-endianess happy - mkdir -p $out/share/locale - substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/" + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py ''; - preFixup = with gnome3; '' + preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share" + --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" ) for i in $out/share/applications/*; do - substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" + substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center" done ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { description = "Utilities to configure the GNOME desktop"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..ad9187b650e483706896bd31d0fc9cdfcba94632 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch @@ -0,0 +1,82 @@ +--- a/panels/color/cc-color-panel.c ++++ b/panels/color/cc-color-panel.c +@@ -634,7 +634,7 @@ + + /* run with modal set */ + argv = g_ptr_array_new_with_free_func (g_free); +- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL)); ++ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); + g_ptr_array_add (argv, g_strdup ("--device")); + g_ptr_array_add (argv, g_strdup (cd_device_get_id (priv->current_device))); + g_ptr_array_add (argv, g_strdup ("--parent-window")); +@@ -1136,7 +1136,7 @@ + + /* open up gcm-viewer as a info pane */ + argv = g_ptr_array_new_with_free_func (g_free); +- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-viewer", NULL)); ++ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL)); + g_ptr_array_add (argv, g_strdup ("--profile")); + g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); + g_ptr_array_add (argv, g_strdup ("--parent-window")); +@@ -1406,7 +1406,6 @@ + gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) + { + GtkWidget *widget; +- gchar *s; + CcColorPanelPrivate *priv = prefs->priv; + + /* get profile */ +@@ -1416,11 +1415,9 @@ + /* allow getting profile info */ + widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, + "toolbutton_profile_view")); +- if (cd_profile_get_filename (profile) != NULL && +- (s = g_find_program_in_path ("gcm-viewer")) != NULL) ++ if (cd_profile_get_filename (profile) != NULL) + { + gtk_widget_set_sensitive (widget, TRUE); +- g_free (s); + } + else + gtk_widget_set_sensitive (widget, FALSE); +--- a/panels/datetime/test-endianess.c ++++ b/panels/datetime/test-endianess.c +@@ -26,7 +26,7 @@ + GDir *dir; + const char *name; + +- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); ++ dir = g_dir_open ("@glibc@/share/i18n/locales/", 0, NULL); + if (dir == NULL) { + /* Try with /usr/share/locale/ + * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ +--- a/panels/datetime/tz.h ++++ b/panels/datetime/tz.h +@@ -27,11 +27,7 @@ + + #include + +-#ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" +-#else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" +-#endif ++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + + typedef struct _TzDB TzDB; + typedef struct _TzLocation TzLocation; +--- a/panels/region/cc-region-panel.c ++++ b/panels/region/cc-region-panel.c +@@ -1388,10 +1388,10 @@ + } + + if (variant && variant[0]) +- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", + layout, variant); + else +- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", + layout); + + g_spawn_command_line_async (commandline, NULL); diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix deleted file mode 100644 index 85dfcd2ef31c6345eeb8c53dd864247402c0ffd4..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-control-center-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.3.tar.xz; - sha256 = "43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..ee9b012b6e45fe87104b6d1f8b1d10cf8ed61e6c --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -0,0 +1,19 @@ +--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c +@@ -504,14 +504,10 @@ + g_return_val_if_fail (script->s_infile != NULL, FALSE); + + add_args (array, +- "bwrap", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind", "/lib", "/lib", +- "--ro-bind", "/lib64", "/lib64", ++ "@BUBBLEWRAP_BIN@", ++ "--ro-bind", "/nix/store", "/nix/store", + "--proc", "/proc", + "--dev", "/dev", +- "--symlink", "usr/bin", "/bin", +- "--symlink", "usr/sbin", "/sbin", + "--chdir", "/", + "--setenv", "GIO_USE_VFS", "local", + "--unshare-all", diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index d56018bf1e8bd2e8f8b5cb1ac9bf6b08e0e79d3a..ed1e59da62c2dfe84e8d11dea0a49457e9080473 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,24 +1,47 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland -, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib +, intltool, gnome-doc-utils, xkeyboard_config, isocodes, itstool, wayland +, libseccomp, bubblewrap, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-desktop-${version}"; + version = "3.28.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16nbgrp0hihvrsa6kmqk0z8y7ajravyagmkmq1nnwn27psi9g8vq"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-desktop"; attrPath = "gnome3.gnome-desktop"; }; + }; # this should probably be setuphook for glib NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python libxml2Python libxslt which libX11 - xkeyboard_config isocodes itstool wayland - gtk3 glib intltool gnome_doc_utils libxkbfile - gobjectIntrospection ]; + nativeBuildInputs = [ + pkgconfig which itstool intltool libxslt gnome-doc-utils gobjectIntrospection + ]; + buildInputs = [ + libX11 bubblewrap xkeyboard_config isocodes wayland + gtk3 glib libseccomp + ]; + + propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ]; + + patches = [ + ./bubblewrap-paths.patch + ]; - propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; + postPatch = '' + substituteInPlace libgnome-desktop/gnome-desktop-thumbnail-script.c --subst-var-by \ + BUBBLEWRAP_BIN "${bubblewrap}/bin/bwrap" + ''; meta = with stdenv.lib; { + description = "Library with common API for various GNOME modules"; + license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix deleted file mode 100644 index 83c2979656c3227d3502a3e0db36e5ccce931c24..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-desktop-3.24.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz; - sha256 = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 77c4805a197eda1b8bd7b5c2c8531c1432e993d7..ee1feb6ddaeb59362ab0db4c3587f65b5b22c3f7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,27 +1,30 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt +, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 +, gnome3, gtk, glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-dictionary-${version}"; + version = "3.26.1"; - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-dictionary/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; + }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 file - gnome3.gsettings_desktop_schemas makeWrapper ]; + nativeBuildInputs = [ + meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool + desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; - preFixup = '' - wrapProgram "$out/bin/gnome-dictionary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-dictionary"; + attrPath = "gnome3.gnome-dictionary"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Dictionary; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix deleted file mode 100644 index 3c0a188c7b26e797a53f8ff5504ef8173b2575e1..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-dictionary-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.0.tar.xz; - sha256 = "41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index f9380272f06586fee07eb20d49d797292bc7ff7b..4f9e2dda54022132df0ddf5f939e044fc5c1ce2b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,24 +1,35 @@ -{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify -, itstool, gnome3, gdk_pixbuf, libxml2, python -, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: +{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread +, meson, ninja, gtk, glib, wrapGAppsHook, libnotify +, itstool, gnome3, libxml2 +, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-disk-utility-${version}"; + version = "3.28.1"; - doCheck = true; + src = fetchurl { + url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "09dmknfas8iifv6k5jb4a9ag57s8awrn0f26fd1qlg0mbfjlnfd6"; + }; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; + }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxslt docbook_xsl + wrapGAppsHook libxml2 + ]; + buildInputs = [ + gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 + udisks2 gnome3.defaultIconTheme + gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bash gtk3 glib intltool itstool - libxslt libtool libsecret libpwquality cracklib - libnotify libdvdread libcanberra_gtk3 docbook_xsl - gdk_pixbuf gnome3.defaultIconTheme - udisks2 gnome3.gnome_settings_daemon - gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Disks; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix deleted file mode 100644 index 602b9eb340e4bdf309c982ea640ab8915d726813..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-disk-utility-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz; - sha256 = "878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 14aeb69e14cb777a4845a138aaec1b56f5409d5b..7e76b8991fd49c3e6ad775bc69392644eae72840 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,27 +1,27 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool -, gnome3, librsvg, gdk_pixbuf }: +{ stdenv, meson, ninja, gettext, fetchurl +, pkgconfig, gtk3, glib, libxml2 +, wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-font-viewer-${version}"; + version = "3.28.0"; - doCheck = true; + src = fetchurl { + url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16mp22f255b8zqnnlqh25n6v79b9bd0gmli9ywqyapa0cfai09x3"; + }; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; }; + }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool gnome3.gnome_desktop - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; + buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" - ) - ''; + # Do not run meson-postinstall.sh + preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; meta = with stdenv.lib; { description = "Program that can preview fonts and create thumbnails for fonts"; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix deleted file mode 100644 index f4e37d476ddf76d7d9469d166b1b820342e8840b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-font-viewer-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-3.24.0.tar.xz; - sha256 = "f3658216a744603fd2100d60de7b31062e014f02333e8433dcaf6a3bb4b7dc76"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 4baafecadd0ab67ba660399b75e1cdc99ee38848..740748631ee2488772f36e7537106db875257ead 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,28 +1,58 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook -, docbook_xsl_ns, docbook_xsl, gnome3 }: +{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt +, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, openssh, wrapGAppsHook +, docbook_xsl, docbook_xml_dtd_42, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-keyring-${version}"; + version = "3.28.0.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0a52xz535vgfymjw3cxmryi3xn2ik24vwk6sixyb7q6jgmqi4bw8"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-keyring"; attrPath = "gnome3.gnome-keyring"; }; + }; outputs = [ "out" "dev" ]; buildInputs = with gnome3; [ - dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit + dbus libgcrypt pam gtk3 libgnome-keyring openssh + pango gcr gdk_pixbuf atk p11-kit ]; + # In 3.20.1, tests do not support Python 3 + checkInputs = [ dbus python2 ]; + propagatedBuildInputs = [ glib libtasn1 libxslt ]; - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig intltool docbook_xsl docbook_xml_dtd_42 wrapGAppsHook + ] ++ stdenv.lib.optionals doCheck checkInputs; configureFlags = [ "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-modules=$$out/lib/pkcs11/" ]; + postPatch = '' + patchShebangs build + ''; + + doCheck = true; + checkPhase = '' + export HOME=$(mktemp -d) + dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; + meta = with stdenv.lib; { - platforms = platforms.linux; + description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; + homepage = https://wiki.gnome.org/Projects/GnomeKeyring; + license = licenses.gpl2; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix deleted file mode 100644 index 88179fff3c7e181b756bc3b1ef4be60dd0b9c447..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-keyring-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz; - sha256 = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 1f64e10aa25da1a6076df4eef175068ffd4f0af2..d3d14f555cfaeb946fb27bde1e8cb1793ff21197 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,20 +1,47 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common -, telepathy_glib, intltool, dbus_libs, icu, glib_networking -, libsoup, docbook_xsl_ns, docbook_xsl, gnome3 +, webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc +, telepathy-glib, gettext, dbus_libs, icu, glib-networking +, libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "gnome-online-accounts"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47"; + }; + + outputs = [ "out" "man" "dev" "devdoc" ]; + + configureFlags = [ + "--enable-media-server" + "--enable-kerberos" + "--enable-lastfm" + "--enable-todoist" + "--enable-gtk-doc" + ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook - libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup vala - docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; + nativeBuildInputs = [ + pkgconfig vala gettext wrapGAppsHook + libxslt docbook_xsl docbook_xsl_ns gtk-doc + ]; + buildInputs = [ + glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib glib-networking icu libsoup + gcr kerberos + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix deleted file mode 100644 index 2c51429cd0cdf88c22e37bb00f17f50663362dca..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-accounts-3.24.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.2.tar.xz; - sha256 = "b70ad52d1541e1e5192dd060bb11552a3af5007ab477aa81d265d1cd1cf7afba"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index fbcd51b6cc2996ed5310b06b8209baa9ea4f8e6a..1df5465382a9cc02dfd4772806b22f127b345fc0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -1,25 +1,28 @@ { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, dleyna-server, makeWrapper }: +, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-online-miners-${version}"; + version = "3.26.0"; - nativeBuildInputs = [ pkgconfig ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-miners/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; }; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest + gnome3.gnome-online-accounts gnome3.libmediaart + gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest dleyna-server ]; enableParallelBuilding = true; - preFixup = '' - for f in $out/libexec/*; do - wrapProgram "$f" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-${gnome3.grilo-plugins.major}" - done - ''; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; description = "A set of crawlers that go through your online content and index them locally in Tracker"; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix deleted file mode 100644 index 00558f252952ab76b5e5e71dc8eb081020236bb1..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-miners-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz; - sha256 = "8c0508f459b0364bed5f2f6a997aa81c1cbe75a94b23cc8fcfd83b0d3485d3ab"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 1f933e1b3c57c89f7bd8003ef97040dd0c978ebc..f5b33c88f574e490e69421d734ad41c5766b55e3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,26 +1,37 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, wrapGAppsHook -, itstool, gnome3, librsvg, gdk_pixbuf }: +{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 +, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib, desktop-file-utils +, gnome3 }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "gnome-screenshot"; + version = "3.26.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - doCheck = true; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; + }; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + postPatch = '' + chmod +x build-aux/postinstall.py # patchShebangs requires executable file + patchShebangs build-aux/postinstall.py + ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bash gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils wrapGAppsHook ]; + buildInputs = [ + gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas + ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" - ) - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "${pname}"; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix deleted file mode 100644 index 3668417d280b5a370b4130262d6158933f12870d..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-screenshot-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-screenshot/3.22/gnome-screenshot-3.22.0.tar.xz; - sha256 = "8a05f14b3c7c6cb42f9848ad0332034c7fe5c34a69742910203588fd60b00230"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 2cd92ce39ca136bc531edd9ca545507dfa92caff..7b407aad5068ea3c839cab6e2e3388cd8082651f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,17 +1,33 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }: +{ fetchurl, stdenv, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas +, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412 +, libxslt, gettext, makeWrapper, systemd, xorg, epoxy }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-session-${version}"; + version = "3.28.1"; - configureFlags = "--enable-systemd"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq"; + }; + + mesonFlags = [ "-Dsystemd=true" ]; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext makeWrapper + xmlto libxslt docbook_xsl docbook_xml_dtd_412 + dbus # for DTD + ]; - buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd - epoxy - ]; + buildInputs = [ + glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme + gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; # FIXME: glib binaries shouldn't be in .dev! preFixup = '' @@ -24,13 +40,22 @@ stdenv.mkDerivation rec { --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" \ - --suffix XDG_CONFIG_DIRS : "${gnome3.gnome_settings_daemon}/etc/xdg" + --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\ + --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-session"; + attrPath = "gnome3.gnome-session"; + }; + }; + meta = with stdenv.lib; { - platforms = platforms.linux; + description = "GNOME session manager"; + homepage = https://wiki.gnome.org/Projects/SessionManagement; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/core/gnome-session/src.nix deleted file mode 100644 index d323fea7631c2fd4b814ca06928b8b228969f3ae..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-session/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-session-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz; - sha256 = "3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index ff5670935bd9e1a9fa2304104196c0c0ab597ad9..cfb41c01e6ade95344487181b9b2f25715ec0b9c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,24 +1,57 @@ -{ 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, wrapGAppsHook, ibus, xkeyboard_config }: +{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst +, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit +, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager +, docbook_xsl, wrapGAppsHook, ibus, xkeyboard_config, tzdata, nss }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-settings-daemon-${version}"; + version = "3.28.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0z9dip9p0iav646cmxisii5sbkdr9hmaklc5fzvschpbjkhphksr"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + ]; # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager - 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 wrapGAppsHook gnome_themes_standard ]; + nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook ]; + + buildInputs = with gnome3; [ + ibus gtk glib gsettings-desktop-schemas networkmanager + libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib + libcanberra-gtk3 upower colord libgweather xkeyboard_config nss + polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom + ]; + + mesonFlags = [ + "-Dudev_dir=lib/udev" + ]; + + postPatch = '' + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do + chmod +x $f + patchShebangs $f + done + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-settings-daemon"; + attrPath = "gnome3.gnome-settings-daemon"; + }; + }; meta = with stdenv.lib; { - platforms = platforms.linux; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..2229302cab7c0cbcf5e86aa30bf5d357fa84b06b --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch @@ -0,0 +1,15 @@ +--- a/plugins/datetime/tz.h ++++ b/plugins/datetime/tz.h +@@ -27,11 +27,7 @@ + + #include + +-#ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" +-#else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" +-#endif ++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + + typedef struct _TzDB TzDB; + typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix deleted file mode 100644 index 03c213f216227543d4482c96d01155e8e03be503..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-settings-daemon-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.3.tar.xz; - sha256 = "68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index fd90b8867d7b05b48a48b9a95f93ef0f0e49b2d8..7ba3545848f7741e0cdb221cb4866809d59fd3ff 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,16 +1,57 @@ -{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, gnome3, file }: +{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib +, gnome3, substituteAll }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-shell-extensions-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "00xm5r4q40c0ji80vrsqg2fkrvzb1nm75p3ikv6bsmd3gfvwwp91"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-shell-extensions"; + attrPath = "gnome3.gnome-shell-extensions"; + }; + }; + + patches = [ + (substituteAll { + src = ./fix_gmenu.patch; + gmenu_path = "${gnome3.gnome-menus}/lib/girepository-1.0"; + }) + ]; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib libgtop intltool itstool - makeWrapper file ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; + buildInputs = [ spidermonkey_52 ]; + + mesonFlags = [ "-Dextension_set=all" ]; + + preFixup = '' + # The meson build doesn't compile the schemas. + # Fixup adapted from export-zips.sh in the source. + + extensiondir=$out/share/gnome-shell/extensions + schemadir=$out/share/gsettings-schemas/gnome-shell-extensions-3.28.0/glib-2.0/schemas/ + + glib-compile-schemas $schemadir + + for f in $extensiondir/*; do + name=`basename ''${f%%@*}` + uuid=$name@gnome-shell-extensions.gcampax.github.com + schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml - configureFlags = [ "--enable-extensions=all" ]; + if [ -f $schema ]; then + mkdir $f/schemas + ln -s $schema $f/schemas; + glib-compile-schemas $f/schemas + fi + done + ''; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch new file mode 100644 index 0000000000000000000000000000000000000000..c384826de6174b04033434cf53b3a119cbf46561 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch @@ -0,0 +1,24 @@ +From f72924a59d4a30daefccf84526bd854ebbe65ac8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= +Date: Tue, 3 Apr 2018 14:13:12 +0200 +Subject: [PATCH] Fix gmenu typelib path + +--- + extensions/apps-menu/extension.js | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js +index 5b38213..d706f64 100644 +--- a/extensions/apps-menu/extension.js ++++ b/extensions/apps-menu/extension.js +@@ -1,5 +1,7 @@ + /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ + ++imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); ++ + const Atk = imports.gi.Atk; + const DND = imports.ui.dnd; + const GMenu = imports.gi.GMenu; +-- +2.16.2 + diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix deleted file mode 100644 index cb9bf57ce4a43a53eef0ee4104482cfa70d45606..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-extensions-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz; - sha256 = "3c7defc6512d7ed9f09eb82342d7b6c8f5fe8dcac3f0126ca7e0569feeb50a79"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index a694da0844dea4dbccbda30d92389a0a4fa3db61..70177d0a516e985766d8478ed6f21b7343ed876a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,9 +1,10 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret -, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2 -, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }: +{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret +, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core +, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info +, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 +, libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet +, sassc, systemd, gst_all_1 }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -11,64 +12,90 @@ let pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-shell-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0kmsh305cfr3fg40rhwykqbl466lwcq9djda25kf29ib7h6w1pn7"; + }; # Needed to find /etc/NetworkManager/VPN - configureFlags = [ "--sysconfdir=/etc" ]; - - buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf - (librsvg.override { enableIntrospection = true; }) - clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns - libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server - libical libtool nss gtk gstreamer makeWrapper gdm - libcanberra_gtk3 gnome_control_center geoclue2 - defaultIconTheme sqlite gnome3.gnome-bluetooth - libgweather # not declared at build time, but typelib is needed at runtime - gnome3.gnome-clocks # schemas needed - at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon - gobjectIntrospection (stdenv.lib.getLib dconf) ]; - - installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; - - preBuild = '' + mesonFlags = [ "--sysconfdir=/etc" ]; + + LANG = "en_US.UTF-8"; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales + sassc + ]; + buildInputs = with gnome3; [ + systemd caribou + gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice + libcroco libsecret libsoup polkit gdk_pixbuf librsvg + clutter networkmanager libstartup_notification telepathy-glib + libXtst gjs mutter libpulseaudio evolution-data-server + libical gtk gstreamer gdm libcanberra-gtk3 geoclue2 + defaultIconTheme gnome3.gnome-bluetooth + gnome3.gnome-clocks # schemas needed + at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon + gst_all_1.gst-plugins-good # recording + gobjectIntrospection + + # not declared at build time, but typelib is needed at runtime + libgweather networkmanagerapplet + ]; + propagatedUserEnvPkgs = [ + # Needed to support on-screen keyboard used with touch screen devices + # see https://github.com/NixOS/nixpkgs/issues/25968 + gnome3.caribou + ]; + + patches = [ + (fetchpatch { + name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; + url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016; + sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm"; + }) + (substituteAll { + src = ./fix-paths.patch; + inherit unzip; + }) + ]; + + postPatch = '' patchShebangs src/data-to-c.pl - substituteInPlace data/Makefile --replace " install-keysDATA" "" substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" ''; - - preFixup = with gnome3; '' - wrapProgram "$out/bin/gnome-shell" \ - --prefix PATH : "${unzip}/bin" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ - --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - wrapProgram "$out/bin/gnome-shell-extension-prefs" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - wrapProgram "$out/libexec/gnome-shell-calendar-server" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas ''; - enableParallelBuilding = true; + preFixup = '' + gappsWrapperArgs+=( + # Until glib’s xdgmime is patched + # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format” + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; passthru = { mozillaPlugin = "/lib/mozilla/plugins"; + updateScript = gnome3.updateScript { + packageName = "gnome-shell"; + attrPath = "gnome3.gnome-shell"; + }; }; meta = with stdenv.lib; { - platforms = platforms.linux; + description = "Core user interface for the GNOME 3 desktop"; + homepage = https://wiki.gnome.org/Projects/GnomeShell; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..7b7ff85a7c8128e6c4634d5874922b0373fe04a9 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/js/ui/extensionDownloader.js ++++ b/js/ui/extensionDownloader.js +@@ -86,7 +86,7 @@ + stream.output_stream.write_bytes(contents, null); + stream.close(null); + let [success, pid] = GLib.spawn_async(null, +- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], ++ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], + null, + GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, + null); diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell/src.nix deleted file mode 100644 index 7cb2bd89221b3f4dbc8d2cdfbefb4c508473ad14..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz; - sha256 = "58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 2f4a1427ec0ac4c3fa531385472ca4598c35c66e..21a1e1a1c4c7ea4d07b439c9d99315cf98fcd530 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,27 +1,56 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit -, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3 -, json_glib, libsecret, valgrind-light }: +{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree +, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection +, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-software-${version}"; + version = "3.28.1"; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; - buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gtkspell3 json_glib libsecret - polkit attr acl libyaml valgrind-light ]; - propagatedBuildInputs = [ isocodes ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0j27zygb3g08q9i8ygwpxqf6g0lrivq2vhj7p7g9x0zh9r0vzlbs"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit isocodes; + }) + ]; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 + valgrind-light docbook_xsl gtk-doc desktop-file-utils gobjectIntrospection + ]; + + buildInputs = [ + gnome3.gtk glib packagekit appstream-glib libsoup + gnome3.gsettings-desktop-schemas gnome3.gnome-desktop + gspell json-glib libsecret ostree + polkit + ]; + + mesonFlags = [ + "-Denable-flatpak=false" + "-Denable-rpm=false" + "-Denable-fwupd=false" + "-Denable-oauth=false" + "-Denable-ubuntu-reviews=false" + "-Denable-gudev=false" + ]; - postInstall = '' - mkdir -p $out/share/xml/ - ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-software"; + attrPath = "gnome3.gnome-software"; + }; + }; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/software/PackageKit/; - platforms = platforms.linux; - maintainers = gnome3.maintainers; + description = "Software store that lets you install and update applications and system extensions"; + homepage = https://wiki.gnome.org/Apps/Software; license = licenses.gpl2; - description = "GNOME Software lets you install and update applications and system extensions."; + maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..6f443a8a43edb4e1a2498e499e2d61f76e10a435 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/gs-language.c ++++ b/src/gs-language.c +@@ -95,7 +95,7 @@ + g_autoptr(GMarkupParseContext) context = NULL; + + /* find filename */ +- filename = g_build_filename (DATADIR, "xml", "iso-codes", "iso_639.xml", NULL); ++ filename = g_build_filename ("@isocodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL); + if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { + g_free (filename); + filename = g_build_filename ("/usr", "share", "xml", "iso-codes", "iso_639.xml", NULL); diff --git a/pkgs/desktops/gnome-3/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/core/gnome-software/src.nix deleted file mode 100644 index 9d847b3af7d83b65efacd68cabd695e0bf07ef97..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-software/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-software-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-software/3.24/gnome-software-3.24.3.tar.xz; - sha256 = "0dbc8cbf0e46c5ef8c6a34391622d1532cf05c49976b39a8b8ee1fff8d8f75e3"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix index d66efca66d9cb6f25119128579d98758cabef56a..23a41b6d6ae6db5edaad9e00a698c36fd78dc10c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix @@ -1,34 +1,31 @@ { stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, wrapGAppsHook -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: +, gtk3, glib, wrapGAppsHook +, itstool, gnome3, libxml2 }: -stdenv.mkDerivation rec { - name = "gnome-system-log-3.9.90"; +let + pname = "gnome-system-log"; + version = "3.9.90"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; }; doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bash gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" - ) - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-log/3.9/; description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index c32d9d95d88f74e7ad90569bda7c60bf435641e2..46a91dda70e05f9351cc786093d6f19a851e483b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -1,33 +1,41 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 +{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit , bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-system-monitor-${version}"; + version = "3.28.1"; - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0wdpd5mfrm0gwmwjvcj556c3mpxf3pcfnvh7x698i8if53ci0gw7"; + }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bash gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop wrapGAppsHook - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas systemd ]; + doCheck = true; - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" - ) - ''; + nativeBuildInputs = [ + pkgconfig gettext itstool wrapGAppsHook + polkit # for ITS file + ]; + buildInputs = [ + bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg + gnome3.gsettings-desktop-schemas systemd + ]; # fails to build without --enable-static configureFlags = ["--enable-systemd" "--enable-static"]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-system-monitor"; + attrPath = "gnome3.gnome-system-monitor"; + }; + }; + meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/; + homepage = https://wiki.gnome.org/Apps/SystemMonitor; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix deleted file mode 100644 index aab373b9715b486dee21510ba6d6b18f0c97b65d..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-system-monitor-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz; - sha256 = "c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 073a791ac3c8050e240e905ac92a78c2af8e3c1a..6f80fe0c90bf77e12490baa966c917beda481d61 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,21 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32 -, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: +{ stdenv, fetchurl, pkgconfig, libxml2, gnome3 +, gnome-doc-utils, intltool, which, libuuid, vala +, desktop-file-utils, itstool, wrapGAppsHook, appdata-tools }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-terminal-${version}"; + version = "3.28.1"; - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool gnome3.nautilus vala_0_32 ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1hqwh12hiy73mazqgvyrq8jk4c669x2fb4nh8mwby3qbk8ca19pp"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-terminal"; attrPath = "gnome3.gnome-terminal"; }; + }; + + buildInputs = [ gnome3.gtk gnome3.gsettings-desktop-schemas gnome3.vte appdata-tools + gnome3.dconf itstool gnome3.nautilus ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 - desktop_file_utils wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which libuuid libxml2 + vala desktop-file-utils wrapGAppsHook ]; # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; # FIXME: enable for gnome3 diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix deleted file mode 100644 index 2aa084cc493527f289ec21288272282274a07ae4..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-terminal-3.24.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz; - sha256 = "281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0503d3baa6c16556ea99dc9f910cf42e7ada7fe7 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 +, gdk_pixbuf }: + +let + pname = "gnome-themes-extra"; + version = "3.28"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix deleted file mode 100644 index 3db252d063f22d4d7b8dc9e4a820ec2ed081f66f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk_pixbuf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf - gnome3.defaultIconTheme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix deleted file mode 100644 index dcda746c8dd1102033d7d9727b16738a2faf762b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-themes-standard-3.22.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.3.tar.xz; - sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 6ab72ab7826de0f6d412ccad13cdf9ada48e0583..a8efa23844704063f350e6dad67ba1380a35846e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-user-docs-${version}"; + version = "3.28.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "189j78d23c6jr5x5j9nxkbdqxg31xvmwvyblz7f9xi9ncy0qdvfh"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-user-docs"; attrPath = "gnome3.gnome-user-docs"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gnome3.yelp itstool libxml2 intltool ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix deleted file mode 100644 index f617d41ff309552b96241acff3765b86fe6d3f90..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-user-docs-3.24.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz; - sha256 = "c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 0b83f6eb2267b5394e36c58242b61411509cc168..509c10d75648ae322add4525b35d67385c48d777 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,10 +1,20 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus , pkgconfig, gtk3, glib, libxml2, gnused, systemd , bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: +, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-user-share-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "04wjnrcdlmyszj582nsda32sgi44nwgrw2ksy11xp17nb09d7m09"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-user-share"; attrPath = "gnome3.gnome-user-share"; }; + }; doCheck = true; @@ -24,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool libxml2 libtool wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra_gtk3 systemd ]; + nautilus libnotify libcanberra-gtk3 systemd ]; postInstall = '' mkdir -p $out/share/gsettings-schemas/$name diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix deleted file mode 100644 index 2d06f9e7a7cf7ff2e7203e0894d2446320b9b50e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "3.18"; - minor = "3"; - name = "gnome-user-share-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/${major}/${name}.tar.xz"; - sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index eb600770e0ac7ea77ea2ccc84003a81a990233fd..c6000352ab06c4b64d2431b59260ac0cc1440666 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,27 +1,39 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, dleyna-server, itstool }: +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av +, gmime, json-glib, avahi, tracker, dleyna-server, itstool }: -stdenv.mkDerivation rec { - major = "0.3"; - minor = "5"; - name = "grilo-plugins-${major}.${minor}"; +let + pname = "grilo-plugins"; + version = "0.3.5"; + major = gnome3.versionBranch version; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; sha256 = "1yv8a0mfd5qmdbdrnd0is5c51s1mvibhw61na99iagnbirxq4xr9"; }; installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata - lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts - gnome3.totem-pl-parser gnome3.rest gmime json_glib - avahi gnome3.libmediaart tracker dleyna-server intltool itstool ]; + nativeBuildInputs = [ pkgconfig intltool itstool ]; + buildInputs = [ + gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata + lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts + gnome3.totem-pl-parser gnome3.rest gmime json-glib + avahi gnome3.libmediaart tracker dleyna-server + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; + homepage = https://wiki.gnome.org/Projects/Grilo; description = "A collection of plugins for the Grilo framework"; maintainers = gnome3.maintainers; license = licenses.lgpl2; diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix index ffa489927e2f10c7cbd29e70a60aaa7bedd130ce..08a6b784e9bd18d208708b0d49184e268bc1d233 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib , libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }: -stdenv.mkDerivation rec { - major = "0.3"; # if you change this, also change ./setup-hook.sh - minor = "4"; - name = "grilo-${major}.${minor}"; +let + pname = "grilo"; + version = "0.3.4"; # if you change minor, also change ./setup-hook.sh +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw"; }; @@ -28,8 +29,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; + homepage = https://wiki.gnome.org/Projects/Grilo; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = gnome3.maintainers; license = licenses.lgpl2; diff --git a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh index 3291e38addb818d0a5929c6afddc0e9eeba3883d..9337c520a2075c93855514220a98e585699fb995 100644 --- a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh +++ b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh @@ -4,4 +4,4 @@ make_grilo_find_plugins() { fi } -envHooks+=(make_grilo_find_plugins) +addEnvHooks "$hostOffset" make_grilo_find_plugins diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index 5123cadbdafd4f0f93347601b3cf2dfd36e4c37b..e5ca314c69afc767895a62f7245fd2b5e5c232a0 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -1,15 +1,29 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection # just for passthru -, gnome3, gtk3, gsettings_desktop_schemas }: +, gnome3, gtk3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gsettings-desktop-schemas-${version}"; + version = "3.28.0"; - postPatch = '' - for file in "background" "screensaver"; do - substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \ - --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/" - done + src = fetchurl { + url = "mirror://gnome/sources/gsettings-desktop-schemas/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0rwidacwrxlc54x90h9g3wx2zlisc4vm49vmxi15azmpj1vwvd2c"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; + }; + + preInstall = '' + mkdir -p $out/share/gsettings-schemas/${name}/glib-2.0/schemas + cat - > $out/share/gsettings-schemas/${name}/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF + [org.gnome.desktop.background] + picture-uri=''' + + [org.gnome.desktop.screensaver] + picture-uri=''' + EOF ''; buildInputs = [ glib gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix deleted file mode 100644 index 22760d2be1132c73b63aa10be7d30eb0eced55ca..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gsettings-desktop-schemas-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz; - sha256 = "f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix index 8e72b7fb233e784c7f944497b35945ff8899729c..4978223c9b2ba27088c4440beaf6428eb14e7004 100644 --- a/pkgs/desktops/gnome-3/core/gsound/default.nix +++ b/pkgs/desktops/gnome-3/core/gsound/default.nix @@ -1,17 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, glib, libcanberra_gtk2, gobjectIntrospection, libtool, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }: let - majVer = "1.0"; + pname = "gsound"; + version = "1.0.2"; in stdenv.mkDerivation rec { - name = "gsound-${majVer}.1"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz"; - sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libcanberra_gtk2 gobjectIntrospection libtool ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection libtool gnome3.vala ]; + buildInputs = [ glib libcanberra ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix deleted file mode 100644 index a39464449485fe51313b9203a1a449a2370b88fb..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2Python, perl, intltool, gettext, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedBuildInputs = [ gtk3 ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ atk cairo glib pango - libxml2Python perl intltool gettext ]; - - preBuild = '' - substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" - ''; - - patches = [ ./nix_share_path.patch ]; - - meta = with stdenv.lib; { - platforms = with platforms; linux ++ darwin; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix deleted file mode 100644 index 8648c595bb96accc049943a5bdd218c89876a5f7..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceview-3.24.3"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.3.tar.xz; - sha256 = "3eed05486a6420c3e2fdda0bbb19a0d905ed09ebf442302a026ab7e574204cbd"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix index 7763867bcbffaf45c20c1c6a67151d9a9fbeb4e7..0a37144d8f7458b6e278fa3c0ad311bcec802088 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix @@ -1,7 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }: +{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gtksourceviewmm-${version}"; + version = "3.21.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceviewmm/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gtksourceviewmm"; attrPath = "gnome3.gtksourceviewmm"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glibmm gtkmm gtksourceview ]; diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix deleted file mode 100644 index 21618c45e051f9bf0386fd617f7aab46bff450ef..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceviewmm-3.21.2"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceviewmm/3.21/gtksourceviewmm-3.21.2.tar.xz; - sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 58d9901ad0129422f61b19cfb9d16e6ef731ae36..45a4a97205b85ea3b4cfbf302a3f62c10cf69612 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,25 +1,31 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash, appdata-tools +{ stdenv, intltool, fetchurl, pkgconfig, gtk3, defaultIconTheme +, glib, desktop-file-utils, bash, appdata-tools , wrapGAppsHook, gnome3, itstool, libxml2 -, callPackage, unzip }: - -# TODO: icons and theme still does not work -# use packaged gnome3.adwaita-icon-theme +, callPackage, unzip, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gucharmap-${version}"; + version = "10.0.4"; - doCheck = true; + src = fetchurl { + url = "mirror://gnome/sources/gucharmap/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "00gh3lll6wykd2qg1lrj05a4wvscsypmrx7rpb6jsbvb4scnh9mv"; + }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + passthru = { + updateScript = gnome3.updateScript { packageName = "gucharmap"; }; + }; + + doCheck = true; preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; - nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools + gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection + ]; - buildInputs = [ gtk3 intltool itstool glib appdata-tools - gnome3.yelp_tools libxml2 desktop_file_utils - gnome3.gsettings_desktop_schemas ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas defaultIconTheme ]; unicode-data = callPackage ./unicode-data.nix {}; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix deleted file mode 100644 index 67d00c269f5320b579a9ff73987542ef0ace4e65..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gucharmap/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gucharmap-10.0.1"; - - src = fetchurl { - url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.1.tar.xz; - sha256 = "51a2bf91c4590ea2159f828156864f088a0bd4c12e7a1c396002a23d48b2d5e2"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix index 84770a17162cefa10f742e4213cd72e7ecfde3cf..72299b8a3690b6494f45490730df55a5b56e5487 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv}: +{ fetchurl, stdenv, gnome3 }: stdenv.mkDerivation { name = "unicode-data-10.0.0"; srcs = [ diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 4141afeb821d3f0e9930ef03086c61675a9c23bd..7df5165d238c79bcf2ab2eead7a0d556b0af628a 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -1,13 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: - -stdenv.mkDerivation rec { - name = "libcroco-0.6.12"; +{ stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch, gnome3 }: +let + pname = "libcroco"; + version = "0.6.12"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-7960.patch"; + url = "https://git.gnome.org/browse/libcroco/patch/?id=898e3a8c8c0314d2e6b106809a8e3e93cf9d4394"; + sha256 = "1xjwdqijxf4b7mhdp3kkgnb6c14y0bn3b3gg79kyrm82x696d94l"; + }) + (fetchpatch { + name = "CVE-2017-7961.patch"; + url = "https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7"; + sha256 = "0zakd72ynzjgzskwyvqglqiznsb93j1bkvc1lgyrzgv9rwrbwv9s"; + }) + ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; @@ -16,6 +31,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "GNOME CSS2 parsing and manipulation toolkit"; homepage = https://git.gnome.org/browse/libcroco; diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix index ddf245f49e06aa60a31984f047fe90cb1b077199..f430986cc474a583c64747b3061f71dc7114f66a 100644 --- a/pkgs/desktops/gnome-3/core/libgdata/default.nix +++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl, uhttpmock }: +{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib +, gobjectIntrospection, liboauth, gnome3, p11-kit, openssl, uhttpmock }: let - majorVersion = "0.17"; + pname = "libgdata"; + version = "0.17.9"; in stdenv.mkDerivation rec { - name = "libgdata-${majorVersion}.9"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45"; }; @@ -16,12 +17,21 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection - liboauth gcr gnome_online_accounts p11_kit openssl uhttpmock ]; + liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; - propagatedBuildInputs = [ json_glib ]; + propagatedBuildInputs = [ json-glib ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; # Stable version has not been updated for a long time. + }; + }; meta = with stdenv.lib; { description = "GData API library"; + homepage = https://wiki.gnome.org/Projects/libgdata; maintainers = with maintainers; [ raskin lethalman ]; platforms = platforms.linux; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index 04d9098764f6c0cdebef9ccbdf1370fe4f759cc4..a5ce9ee5e10528971626a05ca03900a23b87df62 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -1,25 +1,33 @@ { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: let - ver_maj = "0.20"; - ver_min = "0"; + pname = "libgee"; + version = "0.20.1"; in stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1fy24dr8imrjlmsqj1syn0gi139gba6hwk3j5vd6sr3pxniqnc11"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; }; doCheck = true; patches = [ ./fix_introspection_paths.patch ]; - nativeBuildInputs = [ pkgconfig autoconf vala pkgconfig gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ]; buildInputs = [ glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + homepage = https://wiki.gnome.org/Projects/Libgee; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix index 56159500228a084a7467cfd8b410fb908ba2f372..f43b1de46e500940d92f53e13940e52574ca6296 100644 --- a/pkgs/desktops/gnome-3/core/libgepub/default.nix +++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix @@ -1,19 +1,29 @@ -{ stdenv, fetchurl, autoconf, pkgconfig, glib, gobjectIntrospection, gnome3 +{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, gnome3 , webkitgtk, libsoup, libxml2, libarchive }: -stdenv.mkDerivation rec { - name = "libgepub-${version}"; - version = "0.4"; + +let + pname = "libgepub"; + version = "0.6.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgepub/${version}/${name}.tar.xz"; - sha256 = "5666a1c4d186d205bd2d91b71d4c1cd5426025569114a765dd913a564f149ff4"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7"; }; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf glib gobjectIntrospection webkitgtk libsoup - libxml2 libarchive ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; + buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; meta = with stdenv.lib; { description = "GObject based library for handling and rendering epub documents"; diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index 689ece9ad788d602a9f255fd7e61445082afd6f9..d46cf489620a803cfaf767327840f5bf89748317 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }: +let + pname = "libgnome-keyring"; + version = "3.12.0"; +in stdenv.mkDerivation rec { - name = "libgnome-keyring-3.12.0"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; @@ -13,9 +17,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = { description = "Framework for managing passwords and other secrets"; - homepage = http://live.gnome.org/GnomeKeyring; + homepage = https://wiki.gnome.org/Projects/GnomeKeyring; license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; inherit (glib.meta) platforms maintainers; diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix index 74636708988b91b2bdf48f5c113bc20014fa8f76..6301f6f4ab659ad293802792aee039c2d460235a 100644 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix @@ -1,10 +1,20 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgnomekbd-${version}"; + version = "3.26.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file intltool glib gtk3 libxklavier makeWrapper ]; + src = fetchurl { + url = "mirror://gnome/sources/libgnomekbd/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgnomekbd"; attrPath = "gnome3.libgnomekbd"; }; + }; + + nativeBuildInputs = [ pkgconfig file intltool makeWrapper ]; + buildInputs = [ glib gtk3 libxklavier ]; preFixup = '' wrapProgram $out/bin/gkbd-keyboard-display \ diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix deleted file mode 100644 index 02fa271698714ee6d9ff2f95bdeb3fe48a3d61bf..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgnomekbd-3.22.0.1"; - - src = fetchurl { - url = mirror://gnome/sources/libgnomekbd/3.22/libgnomekbd-3.22.0.1.tar.xz; - sha256 = "4efdb6b8ec92f04caced710b5edb285fb27715059ed6ca5e100b6933999a93de"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix index 9dbed05523c32538709e4d2b620b8ad3d46a8fb6..fbae8fbcfbd41db56269b565b1153c545e36b8db 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -1,15 +1,45 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf -, pango, gdk_pixbuf, atk, tzdata, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk, gettext, libsoup +, gtk-doc, docbook_xsl, gobjectIntrospection, tzdata, geocode-glib, vala, gnome3 }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "libgweather"; + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1qqbfgmlfs0g0v92rdl96v2b44yr3sqj9x7zpqv1nx9aaf486yhm"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ]; + buildInputs = [ glib gtk libsoup libxml2 geocode-glib ]; + + postPatch = '' + chmod +x meson/meson_post_install.py + patchShebangs meson/meson_post_install.py + ''; + + mesonFlags = [ + "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" + "-Denable_vala=true" + "-Dgtk_doc=true" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { - platforms = platforms.linux; + description = "A library to access weather information from online services for numerous locations"; + homepage = https://wiki.gnome.org/Projects/LibGWeather; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/libgweather/src.nix b/pkgs/desktops/gnome-3/core/libgweather/src.nix deleted file mode 100644 index 6324a27b61274cca23fef30d4af4c0dbb2afaa8a..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/libgweather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgweather-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz; - sha256 = "1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix index 9e1e4588918f098d4860716b7278ec017354c4e0..65f8090e4ead9f65024bcfae517c516c5465e098 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo -, libarchive, freetype, libjpeg, libtiff +, libarchive, freetype, libjpeg, libtiff, gnome3 }: -stdenv.mkDerivation rec { - name = "libgxps-0.3.0"; +let + pname = "libgxps"; + version = "0.3.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgxps/0.3/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; }; @@ -19,7 +22,19 @@ stdenv.mkDerivation rec { "-Dwith-liblcms2=false" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { - platforms = platforms.linux; + description = "A GObject based library for handling and rendering XPS documents"; + homepage = https://wiki.gnome.org/Projects/libgxps; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index 8fddd8f7d5a681d71f75c12a33c3c4efbe217d00..8eaa927ac7b9f716dc559d14e167aa1b62a448cd 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -3,12 +3,26 @@ }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libpeas-${version}"; + version = "1.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libpeas/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libpeas"; attrPath = "gnome3.libpeas"; }; + }; configureFlags = [ "--enable-python3" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ]; + buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 ]; + propagatedBuildInputs = [ + # Required by libpeas-1.0.pc + gobjectIntrospection + ]; meta = with stdenv.lib; { description = "A GObject-based plugins engine"; diff --git a/pkgs/desktops/gnome-3/core/libpeas/src.nix b/pkgs/desktops/gnome-3/core/libpeas/src.nix deleted file mode 100644 index 6f2cd82fb215f519767331822596224c21bb6aef..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/libpeas/src.nix +++ /dev/null @@ -1,13 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "1.22"; - minor = "0"; - version = "${major}.${minor}"; - name = "libpeas-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz"; - sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix index dab1a0fea8a09650ce81f6ad09461d9eacc55950..10c6185fa821b9f216b8035866e516b2b2c6c9c1 100644 --- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix @@ -1,18 +1,32 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: - +{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gnome-online-accounts, gnome3, gobjectIntrospection }: +let + pname = "libzapojit"; + version = "0.0.3"; +in stdenv.mkDerivation rec { - name = "libzapojit-0.0.3"; + name = "${pname}-${version}"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; + propagatedBuildInputs = [ glib json-glib rest libsoup gnome-online-accounts ]; # zapojit-0.0.pc + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 208b8b756488105076539b42b1f83bbe77e8f837..623d2b1251e12cdea12a636fb849e79ba6362f92 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,17 +1,25 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 -, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput -, libgudev, libwacom, xwayland, autoreconfHook }: +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo +, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 +, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput +, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "mutter-${version}"; + version = "3.28.0"; - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare"; + src = fetchurl { + url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1c46sf10mgvwgym4c6hbjm7wa82dvfv8j8dx4zdbc7zj4n0grzsq"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; }; + }; configureFlags = [ "--with-x" "--disable-static" + "--enable-remote-desktop" "--enable-shape" "--enable-sm" "--enable-startup-notification" @@ -28,20 +36,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; - buildInputs = with gnome3; - [ glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 - gnome3.geocode_glib libudev libinput libgudev libwacom - libcanberra_gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon ]; - - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=760670 - (fetchpatch { - name = "libgudev-232.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=358904; - sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix"; - }) + buildInputs = with gnome3; [ + glib gobjectIntrospection gtk gsettings-desktop-schemas upower + gnome-desktop cairo pango cogl clutter zenity libstartup_notification + gnome3.geocode-glib libinput libgudev libwacom + libcanberra-gtk3 zenity xkeyboard_config libxkbfile + libxkbcommon pipewire ]; preFixup = '' @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; + license = licenses.gpl2; }; - } diff --git a/pkgs/desktops/gnome-3/core/mutter/src.nix b/pkgs/desktops/gnome-3/core/mutter/src.nix deleted file mode 100644 index 579ee0689e8796b4f749a19f73ab2aa824afb7e7..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "mutter-3.24.4"; - - src = fetchurl { - url = mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz; - sha256 = "7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index f987df4603495c084127879dfc661a064c129a55..2daaf2d43261c09f26a0ad273f6c63438cd3343c 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,35 +1,54 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif -, gtk, gnome3, libunique, intltool, gobjectIntrospection, gnome-autoar, glib -, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux, gdk_pixbuf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook +, gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif +, exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }: + +let + pname = "nautilus"; + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w"; + }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ]; - buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker libselinux ]; + buildInputs = [ + dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux + tracker tracker-miners gnome-desktop gexiv2 + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas + ]; propagatedBuildInputs = [ gnome-autoar ]; - # fatal error: gio/gunixinputstream.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - preFixup = '' gappsWrapperArgs+=( # Thumbnailers --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" ) ''; -# hardeningDisable = [ "format" ]; - enableParallelBuilding = true; + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; patches = [ ./extension_dir.patch ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { + description = "The file manager for GNOME"; + homepage = https://wiki.gnome.org/Apps/Files; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/core/nautilus/src.nix b/pkgs/desktops/gnome-3/core/nautilus/src.nix deleted file mode 100644 index 37c81a54a316e2d3429ede4ef2b3c6d6f8d456e5..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/nautilus/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "nautilus-3.24.2.1"; - - src = fetchurl { - url = mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz; - sha256 = "357d9d051fcc2c385ce9b3beb2db2ea1874b7cdf507ca10274a063023e1a61b3"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix index 154e7221cc20e3f9844494a7d5cbdc6efeb1f02b..9cd36cd775033f166acbd59d32798635f8e52ded 100644 --- a/pkgs/desktops/gnome-3/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/core/rest/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }: -stdenv.mkDerivation rec { - name = "rest-${version}"; - major = "0.8"; - version = "${major}.0"; +let + pname = "rest"; + version = "0.8.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/rest/${major}/${name}.tar.xz"; - sha256 = "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; nativeBuildInputs = [ pkgconfig ]; @@ -15,7 +16,16 @@ stdenv.mkDerivation rec { configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Librest; + license = licenses.lgpl21; platforms = platforms.linux; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 0b453d5c53329bb646376c6815c03377f6535d24..e4458b7d0a3f91699aa4f6cf01b41d4c19a6118c 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool -, libusb1, libxml2, pkgconfig, sane-backends, vala_0_32, wrapGAppsHook -, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook +, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp +, libxml2, sane-backends, vala, gnome3, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "simple-scan-${version}"; + version = "3.28.1"; - buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ]; - nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; + src = fetchurl { + url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "140vz94vml0vf6kiw3sg436qfvajk21x6q86smvycgf24qfyvk6a"; + }; - configureFlags = [ "--disable-packagekit" ]; + passthru = { + updateScript = gnome3.updateScript { packageName = "simple-scan"; }; + }; - patchPhase = '' - sed -i -e 's#Icon=scanner#Icon=simple-scan#g' ./data/simple-scan.desktop.in - ''; + buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb + gtk libwebp packagekit sane-backends vala ]; + nativeBuildInputs = [ + meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 + # For setup hook + gobjectIntrospection + ]; + + postPatch = '' + patchShebangs data/meson_compile_gschema.py - preBuild = '' - # Clean up stale .c files referencing packagekit headers as of 3.20.0: - make clean + sed -i -e 's#Icon=scanner#Icon=simple-scan#g' ./data/simple-scan.desktop.in ''; postInstall = '' @@ -51,7 +61,7 @@ stdenv.mkDerivation rec { ''; homepage = https://launchpad.net/simple-scan; license = licenses.gpl3Plus; + maintainers = gnome3.maintainers; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/desktops/gnome-3/core/simple-scan/src.nix b/pkgs/desktops/gnome-3/core/simple-scan/src.nix deleted file mode 100644 index cea148891a725aca8a4006b25839bc6766f04a7f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/simple-scan/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "simple-scan-3.22.0.1"; - - src = fetchurl { - url = mirror://gnome/sources/simple-scan/3.22/simple-scan-3.22.0.1.tar.xz; - sha256 = "c505b6e63379c9256fbeaa4def3e595fd063d46a8a852ed90218d336291d2b50"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 638c0cbe7dcdaa081a66126c9475305d044f38e9..00cec2f93b9f5f90a5c4f2bd112b13ec3cc3e3ed 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,16 +1,26 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz +, clutter-gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 , gdk_pixbuf, librsvg, gtk3, harfbuzz }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "sushi-${version}"; + version = "3.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/sushi/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "sushi"; attrPath = "gnome3.sushi"; }; + }; propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ file intltool gobjectIntrospection glib gtk3 - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf + clutter-gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper harfbuzz ]; @@ -32,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; + homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; description = "A quick previewer for Nautilus"; maintainers = gnome3.maintainers; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/core/sushi/src.nix b/pkgs/desktops/gnome-3/core/sushi/src.nix deleted file mode 100644 index a713aef6f7f0b730e45c6e9aaba78cca6dcac393..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/sushi/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "sushi-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/sushi/3.24/sushi-3.24.0.tar.xz; - sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix index 56fef312927269c728b4a19d2c223e22b34cfa8c..457cee3b3f250de25ee6aa74a2c4298c9f9ff157 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -1,9 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gobjectIntrospection, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "totem-pl-parser-${version}"; + version = "3.26.0"; - nativeBuildInputs = [ pkgconfig file intltool ]; + src = fetchurl { + url = "mirror://gnome/sources/totem-pl-parser/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "totem-pl-parser"; attrPath = "gnome3.totem-pl-parser"; }; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; buildInputs = [ gmime libxml2 libsoup ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix deleted file mode 100644 index 8e352ccfb4c496da868ea656aa14682b9549f5d2..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "totem-pl-parser-3.10.2"; - - src = fetchurl { - url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz; - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 34ec9b58116f3dcbf121dc8fd09c7f41ec406d2d..b4c15b5dce2e94c746e9e7ad0b2f0b1b7d6d06e0 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,36 +1,62 @@ -{ stdenv, intltool, fetchurl, gst_all_1 -, clutter_gtk, clutter-gst, python3Packages, shared_mime_info +{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter +, clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, dbus_glib -, gnome3, librsvg, gdk_pixbuf, file, tracker, nautilus }: +, bash, wrapGAppsHook, itstool, libxml2, vala, gnome3, librsvg +, gdk_pixbuf, tracker, nautilus }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "totem-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/totem/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; + }; doCheck = true; - enableParallelBuilding = true; + # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 + # https://bugzilla.gnome.org/show_bug.cgi?id=784236 + # https://github.com/mesonbuild/meson/issues/1994 + enableParallelBuilding = false; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 gnome3.grilo - clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav - gnome3.libpeas shared_mime_info dbus_glib - gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop - gnome3.gsettings_desktop_schemas wrapGAppsHook file tracker nautilus ]; + nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info + gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas tracker nautilus + ]; propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; - configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + patches = [ + (fetchurl { + name = "remove-pycompile.patch"; + url = "https://bug787965.bugzilla-attachments.gnome.org/attachment.cgi?id=360204"; + sha256 = "1iphlazllv42k553jqh3nqrrh5jb63gy3nhj4ipwc9xh4sg2irhi"; + }) + ]; + + postPatch = '' + chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file + patchShebangs . + ''; + + mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ]; - GI_TYPELIB_PATH = "$out/lib/girepository-1.0"; wrapPrefixVariables = [ "PYTHONPATH" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "totem"; + attrPath = "gnome3.totem"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; description = "Movie player for the GNOME desktop based on GStreamer"; diff --git a/pkgs/desktops/gnome-3/core/totem/src.nix b/pkgs/desktops/gnome-3/core/totem/src.nix deleted file mode 100644 index 2067945f99e45bbdda28db7e4b7101ff0a699257..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/totem/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "totem-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/totem/3.24/totem-3.24.0.tar.xz; - sha256 = "9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b612db9ce38b6d58cb97b9f6398484002db8f7f3 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -0,0 +1,61 @@ +{ stdenv, intltool, fetchurl, libxml2, upower +, substituteAll, pkgconfig, gtk3, glib, gexiv2 +, bash, wrapGAppsHook, itstool, vala, sqlite, libxslt +, gnome3, librsvg, gdk_pixbuf, libnotify +, evolution-data-server, gst_all_1, poppler +, icu, taglib, libjpeg, libtiff, giflib, libcue +, libvorbis, flac, exempi, networkmanager +, libpng, libexif, libgsf, libuuid, bzip2 +, libsoup, json-glib, libseccomp +, libiptcdata }: + +let + pname = "tracker-miners"; + version = "2.0.4"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6"; + }; + + NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; + + enableParallelBuilding = true; + + nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ]; + # TODO: add libgrss, libenca, libosinfo + buildInputs = [ + bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser + gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu + json-glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup + libtiff libuuid libvorbis libxml2 poppler taglib upower gexiv2 + ]; + + LANG = "en_US.UTF-8"; # for running tests + + doCheck = true; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit (gnome3) tracker; + }) + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Tracker; + description = "Desktop-neutral user information store, search tool and indexer"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..847e3bf204dde13b9065cf982d485d0e00eccf2d --- /dev/null +++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/src/libtracker-miners-common/tracker-domain-ontology.c ++++ b/src/libtracker-miners-common/tracker-domain-ontology.c +@@ -313,7 +313,7 @@ + goto end; + } + } else { +- path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies", ++ path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies", + DEFAULT_RULE, NULL); + + if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { +@@ -372,7 +372,7 @@ + if (!priv->ontology_location) { + gchar *ontology_path; + +- ontology_path = g_build_filename (SHAREDIR, "tracker", "ontologies", ++ ontology_path = g_build_filename ("@tracker@", "share", "tracker", "ontologies", + priv->ontology_name, NULL); + + if (!g_file_test (ontology_path, G_FILE_TEST_IS_DIR)) { diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 0d3e8bd358d479b1394b37467083216ad3ca2ede..cbf16c6807ff73afd5f1e4f8db14122544762da7 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,45 +1,42 @@ -{ stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool, vala_0_32, sqlite, libxslt -, gnome3, librsvg, gdk_pixbuf, file, libnotify -, evolution_data_server, gst_all_1, poppler -, icu, taglib, libjpeg, libtiff, giflib, libcue -, libvorbis, flac, exempi, networkmanager -, libpng, libexif, libgsf, libuuid, bzip2 -, libsoup, json_glib, libseccomp }: +{ stdenv, fetchurl, intltool, pkgconfig, gobjectIntrospection +, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt +, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: -stdenv.mkDerivation rec { +let + pname = "tracker"; + version = "2.0.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - inherit (import ./src.nix fetchurl) name src; + outputs = [ "out" "dev" ]; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1005w90vhk1cl8g6kxpy2vdzbskw2jskfjcl42lngv18q5sb4bss"; + }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_32 gtk3 glib intltool itstool libxml2 - bzip2 gnome3.totem-pl-parser libxslt - gnome3.gsettings_desktop_schemas wrapGAppsHook - file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite - upower libnotify evolution_data_server gnome3.libgee - gst_all_1.gstreamer gst_all_1.gst-plugins-base flac - poppler icu taglib libjpeg libtiff giflib libvorbis - exempi networkmanager libpng libexif libgsf libuuid - libsoup json_glib libseccomp - ]; - - preConfigure = '' - substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" - ''; + nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook gobjectIntrospection ]; + # TODO: add libstemmer + buildInputs = [ + glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib + ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" - ) + # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas + configureFlags = [ "--disable-unit-tests" ]; + + postPatch = '' + patchShebangs utils/g-ir-merge/g-ir-merge ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; description = "Desktop-neutral user information store, search tool and indexer"; diff --git a/pkgs/desktops/gnome-3/core/tracker/src.nix b/pkgs/desktops/gnome-3/core/tracker/src.nix deleted file mode 100644 index 7a9b9ce3e38a07dfa10d6c9e308141cf454e303b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/tracker/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tracker-1.12.3"; - - src = fetchurl { - url = mirror://gnome/sources/tracker/1.12/tracker-1.12.3.tar.xz; - sha256 = "1mpq418lzba7fad0w0m3bnxvz3khf461b5zya8zmq5n1g0w99ki3"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index bd446623fc255db25898bf83968aaa7bededa565..65c6ace8eec0882cfa2bcf76ae39359b6d4586ba 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -1,35 +1,39 @@ { 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 -, zlib ? null, libjpeg ? null -, libXdamage ? null, libXfixes ? null, libXext ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null -, networkmanager ? null }: +, telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null +, libsecret, gnutls, libgcrypt, avahi, zlib, libjpeg, libXdamage, libXfixes, libXext +, networkmanager }: with lib; stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vino-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/vino/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; + }; doCheck = true; + nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ]; + buildInputs = [ - wrapGAppsHook - pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup - ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] - ++ optional gnomeKeyringSupport libgnome_keyring3 - ++ filter (p: p != null) [ - libsecret gnutls libgcrypt avahi zlib libjpeg - libXdamage libXfixes libXext networkmanager - ]; - - preFixup = '' - export GSETTINGS_SCHEMAS_PATH="$out/share/gsettings-schemas/${name}:$GSETTINGS_SCHEMAS_PATH" - ''; + gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup + libsecret gnutls libgcrypt avahi zlib libjpeg + libXdamage libXfixes libXext networkmanager + ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "vino"; + attrPath = "gnome3.vino"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Vino; + homepage = https://wiki.gnome.org/Projects/Vino; description = "GNOME desktop sharing server"; maintainers = with maintainers; [ lethalman domenkozar ]; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/vino/src.nix b/pkgs/desktops/gnome-3/core/vino/src.nix deleted file mode 100644 index 8cf55272da97ccb64a6ca5b88874d42fecfc0721..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/vino/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vino-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/vino/3.22/vino-3.22.0.tar.xz; - sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index b3962015d3ccd1692cef23a08fac4967e7665850..6577ba3ae587959964e85e27b9bfe9e1ce986932 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -1,14 +1,23 @@ { stdenv, fetchurl, intltool, pkgconfig -, gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls -, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2 +, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls +, fetchFromGitHub, autoconf, automake, libtool, gtk-doc, gperf, pcre2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vte-${version}"; + version = "0.52.1"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobjectIntrospection intltool gnome3.glib - gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ]; + src = fetchurl { + url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1lva70inb5y8p42rg95fb88z2ybwcz0lybla3ixbgp2sj0s4rzdh"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "vte"; attrPath = "gnome3.vte"; }; + }; + + nativeBuildInputs = [ gobjectIntrospection intltool pkgconfig vala gperf libxml2 ]; + buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; propagatedBuildInputs = [ gnutls pcre2 ]; diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix index 73bbba3e72bc9145c4f25e0b79bd4c1f27e87a28..e6dc005fe58eee2ef32636e2767bdbce7bbb383a 100644 --- a/pkgs/desktops/gnome-3/core/vte/ng.nix +++ b/pkgs/desktops/gnome-3/core/vte/ng.nix @@ -1,4 +1,4 @@ -{ gnome3, fetchFromGitHub, autoconf, automake, gtk_doc, gettext, libtool, gperf }: +{ gnome3, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: gnome3.vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; @@ -11,8 +11,8 @@ gnome3.vte.overrideAttrs (oldAttrs: rec { sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf"; }; - preConfigure = oldAttrs.preConfigure + "; ./autogen.sh"; + preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; nativeBuildInputs = oldAttrs.nativeBuildInputs or [] - ++ [ gtk_doc autoconf automake gettext libtool gperf ]; + ++ [ gtk-doc autoconf automake gettext libtool gperf ]; }) diff --git a/pkgs/desktops/gnome-3/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix deleted file mode 100644 index 45029e8bb8ddb0b850fe5c7637d8028df89c2e8c..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/vte/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vte-0.50.1"; - - src = fetchurl { - url = mirror://gnome/sources/vte/0.50/vte-0.50.1.tar.xz; - sha256 = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index eaceadcc85c4fc2bfbb17de5297c441d5985252d..5a0a5bd43b5b6d2b8f40253f91d06cfaf9a480e4 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -1,10 +1,20 @@ { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-tools-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp-tools/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1b61dmlb1sd50fgq6zgnkcpx2s1py33q0x9cx67fzpsr4gmgxnw2"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp-tools"; attrPath = "gnome3.yelp-tools"; }; + }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl ]; + buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/core/yelp-tools/src.nix deleted file mode 100644 index f03c6d1bc311300e642dbc10bf707e8fcb7c97ef..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/yelp-tools/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-tools-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz; - sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 353b9ccb55e3f4f3e214b26fb046d33c491fb8ee..f904a90454f3f77dc6f801fef56563131ea73cef 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -2,7 +2,17 @@ , itstool, libxml2, libxslt, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-xsl-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp-xsl/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "14rznm1qpsnmkwksnkd5j7zplakl01kvrcw0fdmd5gdc65xz9kcc"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp-xsl"; attrPath = "gnome3.yelp-xsl"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix deleted file mode 100644 index de5d68d1fab1fc4a2e359c7b2cc46a4cd2f49f29..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-xsl-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz; - sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 6b458598c2999a1cf9a161ee27264274af048f33..9a47ecd2842a107594e11c8e24f1edc786a892cd 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,21 +1,30 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff -, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 +, gnome3, sqlite +, itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-${version}"; + version = "3.28.1"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + src = fetchurl { + url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "033w5qnhm495pnvscnb3k2dagzgq4fsnzcrh0k2rgr10mw2mv2p8"; + }; - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib webkitgtk sqlite + libxml2 libxslt gnome3.yelp-xsl + gnome3.defaultIconTheme + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.defaultIconTheme groff - gnome3.gsettings_desktop_schemas wrapGAppsHook - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "yelp"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; diff --git a/pkgs/desktops/gnome-3/core/yelp/src.nix b/pkgs/desktops/gnome-3/core/yelp/src.nix deleted file mode 100644 index 7f38bab736fd844baf294c4afbb455c84471a16e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/yelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/yelp/3.22/yelp-3.22.0.tar.xz; - sha256 = "8616b77c239aaa731312609f192c9b2c71d54b2cae42ff23efa23b5b3188778e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 80f2dde534ecabda45d83ec4013dcba8d5a7ba2c..b9788106342738f53357c5326c20aeccd2dbc85a 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,8 +1,18 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool, wrapGAppsHook }: +, gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "zenity-${version}"; + version = "3.28.1"; + + src = fetchurl { + url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0swavrkc5ps3fwzy6h6l5mmim0wwy10xrq0qqkay5d0zf9a965yv"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "zenity"; attrPath = "gnome3.zenity"; }; + }; preBuild = '' mkdir -p $out/include @@ -10,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/zenity/src.nix b/pkgs/desktops/gnome-3/core/zenity/src.nix deleted file mode 100644 index cb12262725a6269356ea8e240951fe364f3bde65..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/zenity/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "zenity-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz; - sha256 = "6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7"; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 585f79ddea676923355ef6f82e214c07baf130ff..f356888889971117ea200aaa22b6799905feeb00 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, lib }: let @@ -13,29 +13,36 @@ let callPackage = pkgs.newScope self; - version = "3.24"; - maintainers = with pkgs.lib.maintainers; [ lethalman ]; + # Convert a version to branch (3.26.18 → 3.26) + # Used for finding packages on GNOME mirrors + versionBranch = version: builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version)); + + updateScript = callPackage ./update.nix { }; + + version = "3.26"; + maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ]; corePackages = with gnome3; [ - pkgs.desktop_file_utils pkgs.ibus - pkgs.shared_mime_info # for update-mime-database + pkgs.desktop-file-utils + pkgs.shared-mime-info # for update-mime-database glib # for gsettings gtk3.out # for gtk-update-icon-cache - glib_networking gvfs dconf gnome-backgrounds gnome_control_center - gnome-menus gnome_settings_daemon gnome_shell - gnome_themes_standard defaultIconTheme gnome-shell-extensions - pkgs.hicolor_icon_theme + glib-networking gvfs dconf gnome-backgrounds gnome-control-center + gnome-menus gnome-settings-daemon gnome-shell + gnome-themes-extra defaultIconTheme gnome-shell-extensions + pkgs.hicolor-icon-theme ]; optionalPackages = with gnome3; [ baobab eog epiphany evince gucharmap nautilus totem vino yelp gnome-bluetooth gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-log gnome-system-monitor simple-scan - gnome_terminal gnome-user-docs evolution file-roller gedit - gnome-clocks gnome-music gnome-tweak-tool gnome-photos + gnome-terminal gnome-user-docs evolution file-roller gedit + gnome-clocks gnome-music gnome-tweaks gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-getting-started-docs gnome-packagekit gnome-software + gnome-power-manager gnome-usage ]; gamesPackages = with gnome3; [ swell-foop lightsoff iagno @@ -45,8 +52,11 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 - clutter clutter-gst clutter_gtk cogl gtkvnc; + inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2 + libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 + easytag meld orca rhythmbox shotwell gnome-usage + clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; + inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -54,7 +64,7 @@ let gnome3 = self // { recurseForDerivations = false; }; gtk = gtk3; gtkmm = gtkmm3; - vala = pkgs.vala_0_32; + vala = pkgs.vala_0_40; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; # Simplify the nixos module and gnome packages @@ -74,20 +84,17 @@ let dconf = callPackage ./core/dconf { }; dconf-editor = callPackage ./core/dconf-editor { }; - # empathy = callPackage ./core/empathy { - # webkitgtk = webkitgtk24x-gtk3; - # clutter-gst = pkgs.clutter-gst; - # }; + empathy = callPackage ./core/empathy { }; epiphany = callPackage ./core/epiphany { }; evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - evolution_data_server = callPackage ./core/evolution-data-server { }; + evolution-data-server = callPackage ./core/evolution-data-server { }; gconf = callPackage ./core/gconf { }; - geocode_glib = callPackage ./core/geocode-glib { }; + geocode-glib = callPackage ./core/geocode-glib { }; gcr = callPackage ./core/gcr { }; # ToDo: tests fail @@ -95,23 +102,25 @@ let gjs = callPackage ./core/gjs { }; - glib_networking = pkgs.glib_networking.override { - inherit gsettings_desktop_schemas; + glib-networking = pkgs.glib-networking.override { + inherit gsettings-desktop-schemas; }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; + gnome-color-manager = callPackage ./core/gnome-color-manager { }; + gnome-contacts = callPackage ./core/gnome-contacts { }; - gnome_control_center = callPackage ./core/gnome-control-center { }; + gnome-control-center = callPackage ./core/gnome-control-center { }; gnome-calculator = callPackage ./core/gnome-calculator { }; - gnome_common = callPackage ./core/gnome-common { }; + gnome-common = callPackage ./core/gnome-common { }; - gnome_desktop = callPackage ./core/gnome-desktop { }; + gnome-desktop = callPackage ./core/gnome-desktop { }; gnome-dictionary = callPackage ./core/gnome-dictionary { }; @@ -121,27 +130,27 @@ let gnome-menus = callPackage ./core/gnome-menus { }; - gnome_keyring = callPackage ./core/gnome-keyring { }; + gnome-keyring = callPackage ./core/gnome-keyring { }; - libgnome_keyring = callPackage ./core/libgnome-keyring { }; + libgnome-keyring = callPackage ./core/libgnome-keyring { }; libgnomekbd = callPackage ./core/libgnomekbd { }; folks = callPackage ./core/folks { }; - gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; + gnome-online-accounts = callPackage ./core/gnome-online-accounts { }; gnome-online-miners = callPackage ./core/gnome-online-miners { }; - gnome_session = callPackage ./core/gnome-session { }; + gnome-session = callPackage ./core/gnome-session { }; - gnome_shell = callPackage ./core/gnome-shell { }; + gnome-shell = callPackage ./core/gnome-shell { }; gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; gnome-screenshot = callPackage ./core/gnome-screenshot { }; - gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; + gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; gnome-software = callPackage ./core/gnome-software { }; @@ -149,9 +158,9 @@ let gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - gnome_terminal = callPackage ./core/gnome-terminal { }; + gnome-terminal = callPackage ./core/gnome-terminal { }; - gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; + gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; gnome-user-docs = callPackage ./core/gnome-user-docs { }; @@ -161,12 +170,10 @@ let grilo-plugins = callPackage ./core/grilo-plugins { }; - gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; + gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { }; gsound = callPackage ./core/gsound { }; - gtksourceview = callPackage ./core/gtksourceview { }; - gtksourceviewmm = callPackage ./core/gtksourceviewmm { }; gucharmap = callPackage ./core/gucharmap { }; @@ -195,36 +202,32 @@ let nautilus = callPackage ./core/nautilus { }; - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { + networkmanager-openvpn = pkgs.networkmanager-openvpn.override { inherit gnome3; }; - networkmanager_pptp = pkgs.networkmanager_pptp.override { + networkmanager-vpnc = pkgs.networkmanager-vpnc.override { inherit gnome3; }; - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { + networkmanager-openconnect = pkgs.networkmanager-openconnect.override { inherit gnome3; }; - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { + networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { inherit gnome3; }; - networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { + networkmanager-l2tp = pkgs.networkmanager-l2tp.override { inherit gnome3; }; - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { - inherit gnome3; - }; - - networkmanager_iodine = pkgs.networkmanager_iodine.override { + networkmanager-iodine = pkgs.networkmanager-iodine.override { inherit gnome3; }; networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings_desktop_schemas glib_networking; + inherit gnome3 gsettings-desktop-schemas glib-networking; }; rest = callPackage ./core/rest { }; @@ -237,7 +240,9 @@ let totem-pl-parser = callPackage ./core/totem-pl-parser { }; - tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; + tracker = callPackage ./core/tracker { }; + + tracker-miners = callPackage ./core/tracker-miners { }; vte = callPackage ./core/vte { }; @@ -249,9 +254,9 @@ let yelp = callPackage ./core/yelp { }; - yelp_xsl = callPackage ./core/yelp-xsl { }; + yelp-xsl = callPackage ./core/yelp-xsl { }; - yelp_tools = callPackage ./core/yelp-tools { }; + yelp-tools = callPackage ./core/yelp-tools { }; zenity = callPackage ./core/zenity { }; @@ -298,6 +303,8 @@ let gegl = gegl_0_3; }; + gnome-power-manager = callPackage ./apps/gnome-power-manager { }; + gnome-weather = callPackage ./apps/gnome-weather { }; nautilus-sendto = callPackage ./apps/nautilus-sendto { }; @@ -373,7 +380,7 @@ let gspell = callPackage ./misc/gspell { }; - libgames-support = callPackage ./misc/libgames-support { }; + libgnome-games-support = callPackage ./misc/libgnome-games-support { }; libgda = callPackage ./misc/libgda { }; @@ -383,7 +390,7 @@ let gexiv2 = callPackage ./misc/gexiv2 { }; - gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; + gnome-tweaks = callPackage ./misc/gnome-tweaks { }; gpaste = callPackage ./misc/gpaste { }; @@ -399,6 +406,36 @@ let gnome-packagekit = callPackage ./misc/gnome-packagekit { }; +#### Legacy aliases + + evolution_data_server = evolution-data-server; # added 2018-02-25 + geocode_glib = geocode-glib; # added 2018-02-25 + glib_networking = glib-networking; # added 2018-02-25 + gnome_common = gnome-common; # added 2018-02-25 + gnome_control_center = gnome-control-center; # added 2018-02-25 + gnome_desktop = gnome-desktop; # added 2018-02-25 + gnome_keyring = gnome-keyring; # added 2018-02-25 + gnome_online_accounts = gnome-online-accounts; # added 2018-02-25 + gnome_session = gnome-session; # added 2018-02-25 + gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25 + gnome_shell = gnome-shell; # added 2018-02-25 + gnome_terminal = gnome-terminal; # added 2018-02-25 + gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 + gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnome-tweak-tool = gnome-tweaks; # added 2018-03-21 + gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 + libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 + libgames-support = libgnome-games-support; # added 2018-03-14 + libgnome_keyring = libgnome-keyring; # added 2018-02-25 + networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 + networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 + networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 + networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 + networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 + networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 + yelp_xsl = yelp-xsl; # added 2018-02-25 + yelp_tools = yelp-tools; # added 2018-02-25 + }; in self; # pkgsFun diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/desktop/rarian/default.nix index c6927111ed4826d0d8c76c4f015fe8c05bd88911..484e58568721042cfb33981bb228234e7c71c0f4 100644 --- a/pkgs/desktops/gnome-3/desktop/rarian/default.nix +++ b/pkgs/desktops/gnome-3/desktop/rarian/default.nix @@ -1,9 +1,12 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: +let + pname = "rarian"; + version = "0.8.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.gz"; sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; }; @@ -11,7 +14,18 @@ stdenv.mkDerivation rec { buildInputs = [ perl perlXMLParser libxml2 libxslt]; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { + description = "Documentation metadata library based on the proposed Freedesktop.org spec"; + homepage = https://rarian.freedesktop.org/; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 9ff98c2825e63d4aefae54d690277d75bb87577b..0e50953b3deac7d0767268e569fae067a3574f83 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -1,15 +1,30 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python2, makeWrapper }: + itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "anjuta-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/anjuta/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "anjuta"; attrPath = "gnome3.anjuta"; }; + }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper - gnome3.gsettings_desktop_schemas + nativeBuildInputs = [ + pkgconfig intltool itstool python3 makeWrapper + # Required by python3 + ncurses + ]; + buildInputs = [ + flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl + gnome3.libgda gnome3.gtksourceview + gnome3.gsettings-desktop-schemas ]; preFixup = '' @@ -22,6 +37,7 @@ stdenv.mkDerivation rec { description = "Software development studio"; homepage = http://anjuta.org/; license = licenses.gpl2; + maintainers = with maintainers; []; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/devtools/anjuta/src.nix deleted file mode 100644 index bbb7696d91c908e20c2a264a838f05239304e751..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/devtools/anjuta/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "anjuta-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/anjuta/3.22/anjuta-3.22.0.tar.xz; - sha256 = "4face1c063a5a6687a6cfc6f1f700ba15f13664633c05caa2fbf50317608dd03"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 08dbade67fbf432c352d32fb7b467b601231c939..97a425bccb1f85f902bf3a9c3ab32ba92cff15a8 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -1,20 +1,34 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool, gsettings_desktop_schemas }: +, glib, appstream-glib, gobjectIntrospection +, webkitgtk, gettext, itstool, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "devhelp-${version}"; + version = "3.28.1"; - nativeBuildInputs = [ pkgconfig ]; + src = fetchurl { + url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "08a8xizjqz68k30zd37r7g516azhan9bbrjsvv10hjd5dg3f476s"; + }; + + nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ]; buildInputs = [ - gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme - gsettings_desktop_schemas + glib gtk3 webkitgtk + gnome3.defaultIconTheme gsettings-desktop-schemas ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "devhelp"; + attrPath = "gnome3.devhelp"; + }; + }; + meta = with stdenv.lib; { - homepage = https://live.gnome.org/devhelp; description = "API documentation browser for GNOME"; - maintainers = gnome3.maintainers; + homepage = https://wiki.gnome.org/Apps/Devhelp; license = licenses.gpl2; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix deleted file mode 100644 index b13de444c7e73695ac554971382e3bc59708b2d3..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "devhelp-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz; - sha256 = "4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix index f12bbb0ca41d2b1cf28e92951e68f445214103b7..75f9bc48db65821fe24c7bd37614731503cecd44 100644 --- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gdl-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gdl/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gdl"; attrPath = "gnome3.gdl"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gtk3 intltool ]; diff --git a/pkgs/desktops/gnome-3/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/devtools/gdl/src.nix deleted file mode 100644 index c8b65884e0829691154c32323154fc92113287ca..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/devtools/gdl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdl-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gdl/3.22/gdl-3.22.0.tar.xz; - sha256 = "cc5b360e1392292186924f0f9a8efc0f4db7e6e56dc7042037466b5cc839660c"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 50960f41a3126fe901975b508890cc77129f69a7..57070f7ce38afa086444f1e92ce58e17e53aa880 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-devel-docs-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1py0zyfzpaws41p9iw4645ykfnmm408axfghsmq6gnwgp66vl074"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome3.gnome-devel-docs"; }; + }; buildInputs = [ intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix deleted file mode 100644 index 7f39aabda0223d00e1dd4fa64aaa187a9b47b59f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-devel-docs-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-devel-docs/3.22/gnome-devel-docs-3.22.0.tar.xz; - sha256 = "e0778c62670b1c19d45191ac5503568cbd09500e9e30015b48c19e95959e6d85"; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index cf200cb3292553d49bda27772998c4e409b8e501..19853b19fcae2527f5c3dcab1bfe63faf7f125f4 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -3,7 +3,17 @@ gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "nemiver-${version}"; + version = "0.9.6"; + + src = fetchurl { + url = "mirror://gnome/sources/nemiver/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "nemiver"; attrPath = "gnome3.nemiver"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/devtools/nemiver/src.nix deleted file mode 100644 index 2fcf639fe1b4ea72ef90b38fc699d2925318c0bd..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/devtools/nemiver/src.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "nemiver-0.9.6"; - - src = fetchurl { - url = mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz; - sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; - }; -} - diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c576112d57b92ece40b2d876763a18f603b7b555 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-appindicator-${version}"; + version = "22"; + + src = fetchFromGitHub { + owner = "Ubuntu"; + repo = "gnome-shell-extension-appindicator"; + rev = "v${version}"; + sha256 = "1gqw54d55hxjj2hh04p0dx2j40bhi4ck9hgwlz8f7j4v7r37z0qw"; + }; + + # This package has a Makefile, but it's used for building a zip for + # publication to extensions.gnome.org. Disable the build phase so + # installing doesn't build an unnecessary release. + dontBuild = true; + + uuid = "appindicatorsupport@rgcjonas.gmail.com"; + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp *.js $out/share/gnome-shell/extensions/${uuid} + cp -r interfaces-xml $out/share/gnome-shell/extensions/${uuid} + cp metadata.json $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jonafato ]; + homepage = https://github.com/Ubuntu/gnome-shell-extension-appindicator; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e1fe15c19d807179bffdf254c0195c2b3f5b1968 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-battery-status-${version}"; + version = "6"; + + src = fetchFromGitHub { + owner = "milliburn"; + repo = "gnome-shell-extension-battery_status"; + rev = "v${version}"; + sha256 = "1w83h863mzffjnmk322xq90qf3y9dzay1w9yw5r0qnbsq1ljl8p4"; + }; + + uuid = "battery_status@milliburn.github.com"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions/ + ''; + + meta = with stdenv.lib; { + description = "Configurable lightweight battery charge indicator and autohider"; + license = licenses.gpl2; + maintainers = with maintainers; [ jonafato ]; + homepage = https://github.com/milliburn/gnome-shell-extension-battery_status; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index bda356cf4c371a7da1a8c823d4ba0cad3ead9a78..3064b62f2a4a90b07a38dd5cb55a33889b3a0a25 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -1,31 +1,43 @@ -{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"; - }; +{stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}: + +let + version = "10"; - buildInputs = [ gnome3.gnome_shell makeWrapper jq dbus gobjectIntrospection - python python27Packages.requests python27Packages.pygobject3 wrapGAppsHook]; + inherit (python3.pkgs) python pygobject3 requests; +in stdenv.mkDerivation rec { + name = "chrome-gnome-shell-${version}"; - 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" - ''; + src = fetchurl { + url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; + sha256 = "1wp6qvcp758yfj8xlj15sk1d3jsb1p8136y8xxwpi9wfdjpzjs8j"; + }; - 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"' \ - --prefix PATH : '"${gnome3.gnome_shell}/bin"' \ - --prefix PYTHONPATH : "$PYTHONPATH" + nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ]; + buildInputs = [ gnome3.gnome-shell python pygobject3 requests ]; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" ''; + # cmake setup hook changes /etc/opt into /var/empty + dontFixCmake = true; + + cmakeFlags = [ "-DBUILD_EXTENSION=OFF" ]; + wrapPrefixVariables = [ "PYTHONPATH" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "chrome-gnome-shell"; + }; + }; + + meta = with stdenv.lib; { + description = "GNOME Shell integration for Chrome"; + homepage = https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome; + longDescription = '' + To use the integration, install the browser extension, and then set to true. For Firefox based browsers, you will also need to build the wrappers with set to true. + ''; + license = licenses.gpl3; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; } diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e41227e85139caccad218ae84c189914775cfa35 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-clipboard-indicator-${version}"; + version = "30"; + + src = fetchFromGitHub { + owner = "Tudmotu"; + repo = "gnome-shell-extension-clipboard-indicator"; + rev = "v${version}"; + sha256 = "1fmgmxv2y678bj0kmymkgnnglcpqk8ww053izlq46xg7s27jjdf6"; + }; + + uuid = "clipboard-indicator@tudmotu.com"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r * $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = "Adds a clipboard indicator to the top panel and saves clipboard history"; + license = licenses.mit; + maintainers = with maintainers; [ jonafato ]; + platforms = platforms.linux; + homepage = https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 4d788e909e2dea80040856c760ab886e99d283be..152b9522beff218d82bd1f9b4dfcfa9fa47979ce 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-dash-to-dock-${version}"; - version = "v60"; + version = "v63"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-" + version; - sha256 = "0w9km1zcxcskrsfr392zx945k227qajnw09pxc20d1vwv78wlgy3"; + sha256 = "140ih4l3nn2lbgw684xjvkhqxflr1xg2vm1m46z632bb0y3py4yg"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3baedbf0c594fe8e1f21d20d37c6d71ade38153b --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, glib, gettext }: + +stdenv.mkDerivation rec { + name = "gnome-shell-dash-to-panel-${version}"; + version = "11"; + + src = fetchFromGitHub { + owner = "jderose9"; + repo = "dash-to-panel"; + rev = "v${version}"; + sha256 = "1bfcnrhw6w8yrz8sw520kwwshmplkg4awpvz07kg4d73m6zn4mw2"; + }; + + buildInputs = [ + glib gettext + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + meta = with stdenv.lib; { + description = "An icon taskbar for Gnome Shell"; + license = licenses.gpl2; + maintainers = with maintainers; [ mounium ]; + homepage = https://github.com/jderose9/dash-to-panel; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7ad26a7c6d42071c30c5b28644137e4d599eeb69 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-icon-hider-${version}"; + version = "19"; + + src = fetchFromGitHub { + owner = "ikalnytskyi"; + repo = "gnome-shell-extension-icon-hider"; + rev = "v${version}"; + sha256 = "0cifm6cmxwxrrrva41wvjvrzsdqaczfbillf2vv3wsb60dqr6h39"; + }; + + uuid = "icon-hider@kalnitsky.org"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + ''; + + meta = with stdenv.lib; { + description = "Icon Hider is a GNOME Shell extension for managing status area items"; + license = licenses.bsd3; + maintainers = with maintainers; [ jonafato ]; + platforms = platforms.linux; + homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix index d82ff652bd0fafd3c0612e70d647ab76c177d667..24b4c1cf703fe23a10c88d5bb35279521b65ad54 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-impatience-${version}"; - version = "6564c21e4caf4a6bc5fe2bf21116d7c15408d494"; + version = "0.4.5"; src = fetchFromGitHub { owner = "timbertson"; repo = "gnome-shell-impatience"; - rev = version; - sha256 = "10zyj42i07dcvaciv47qgkcs5g5n2bpc8a0m6fsimfi0442iwlcn"; + rev = "version-${version}"; + sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx"; }; buildInputs = [ @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - cp -r impatience $out + mkdir -p $out/share/gnome-shell/extensions + cp -r impatience $out/share/gnome-shell/extensions/${uuid} ''; uuid = "impatience@gfxmonk.net"; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Speed up builtin gnome-shell animations"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ aneeshusa timbertson ]; + maintainers = with maintainers; [ aneeshusa timbertson tiramiseb ]; homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml; }; } diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f64a0ef3f27e22f0170692f3ba7166ec24518cf0 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extensions-mediaplayer-${version}"; + version = "3.5"; + + src = fetchFromGitHub { + owner = "JasonLG1979"; + repo = "gnome-shell-extensions-mediaplayer"; + rev = version; + sha256 = "0b8smid9vdybgs0601q9chlbgfm1rzrj3vmd3i6p2a5d1n4fyvsc"; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + buildInputs = [ + glib + gettext + ]; + + postPatch = '' + rm build + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + meta = with stdenv.lib; { + description = "Control MPRIS Version 2 Capable Media Players"; + license = licenses.gpl2Plus; + homepage = https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/; + maintainers = with maintainers; [ tiramiseb ]; + }; +} + diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..43e94ce6bfbbca9d0e5252430d01cbb2b46b0f2d --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-no-title-bar-${version}"; + version = "8"; + + src = fetchFromGitHub { + owner = "franglais125"; + repo = "no-title-bar"; + rev = "v${version}"; + sha256 = "0n3ayf7k2icy913sjl1d6iwm21i8fivv0f7wj7gck8q7q2j7i3bz"; + }; + + nativeBuildInputs = [ + glib gettext + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + xprop = "${xorg.xprop}/bin/xprop"; + xwininfo = "${xorg.xwininfo}/bin/xwininfo"; + }) + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + meta = with stdenv.lib; { + description = "Integrates maximized windows with the top panel"; + homepage = https://github.com/franglais125/no-title-bar; + license = licenses.gpl2; + maintainers = with maintainers; [ jonafato svsdep ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..9a53d63860da9ff53bc5535222eb46396668b234 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch @@ -0,0 +1,56 @@ +--- a/decoration.js ++++ b/decoration.js +@@ -181,7 +181,7 @@ + let act = win.get_compositor_private(); + let xwindow = act && act['x-window']; + if (xwindow) { +- let xwininfo = GLib.spawn_command_line_sync('xwininfo -children -id 0x%x'.format(xwindow)); ++ let xwininfo = GLib.spawn_command_line_sync('@xwininfo@ -children -id 0x%x'.format(xwindow)); + if (xwininfo[0]) { + let str = xwininfo[1].toString(); + +@@ -207,7 +207,7 @@ + // Try enumerating all available windows and match the title. Note that this + // may be necessary if the title contains special characters and `x-window` + // is not available. +- let result = GLib.spawn_command_line_sync('xprop -root _NET_CLIENT_LIST'); ++ let result = GLib.spawn_command_line_sync('@xprop@ -root _NET_CLIENT_LIST'); + if (result[0]) { + let str = result[1].toString(); + +@@ -218,7 +218,7 @@ + + // For each window ID, check if the title matches the desired title. + for (var i = 0; i < windowList.length; ++i) { +- let cmd = 'xprop -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE'; ++ let cmd = '@xprop@ -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE'; + let result = GLib.spawn_command_line_sync(cmd); + + if (result[0]) { +@@ -258,7 +258,7 @@ + } + + let id = this._guessWindowXID(win); +- let cmd = 'xprop -id ' + id; ++ let cmd = '@xprop@ -id ' + id; + + let xprops = GLib.spawn_command_line_sync(cmd); + if (!xprops[0]) { +@@ -277,7 +277,7 @@ + m = str.match(/^_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED(\(CARDINAL\))? = ([0-9]+)$/m); + if (m) { + let state = !!parseInt(m[2]); +- cmd = ['xprop', '-id', id, ++ cmd = ['@xprop@', '-id', id, + '-f', '_NO_TITLE_BAR_ORIGINAL_STATE', '32c', + '-set', '_NO_TITLE_BAR_ORIGINAL_STATE', + (state ? '0x1' : '0x0')]; +@@ -358,7 +358,7 @@ + let winXID = this._guessWindowXID(win); + if (winXID == null) + return; +- let cmd = ['xprop', '-id', winXID, ++ let cmd = ['@xprop@', '-id', winXID, + '-f', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED', '32c', + '-set', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED', + (hide ? '0x1' : '0x0')]; diff --git a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4061c3bb5cc4061fa433db5fa8a9801fe84ffd9f --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-nohotcorner-${version}"; + version = "16.0"; + + src = fetchFromGitHub { + owner = "HROMANO"; + repo = "nohotcorner"; + rev = "v${version}"; + sha256 = "042lv4pvzsxv6spa8k1hji1bfqj893arx55p56mmm20wa5dr5qm3"; + }; + + # Taken from the extension download link at + # https://extensions.gnome.org/extension/118/no-topleft-hot-corner/ + uuid = "nohotcorner@azuri.free.fr"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp extension.js $out/share/gnome-shell/extensions/${uuid} + cp metadata.json $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = "Disables the top left hot corner"; + license = licenses.gpl2; + maintainers = with maintainers; [ jonafato ]; + homepage = https://github.com/HROMANO/nohotcorner; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..42cd6d217de77a8cd2fbb3deb79995aa9697b8aa --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-remove-dropdown-arrows-${version}"; + version = "9"; + + src = fetchFromGitHub { + owner = "mpdeimos"; + repo = "gnome-shell-remove-dropdown-arrows"; + rev = "version/${version}"; + sha256 = "1z9icxr75rd3cas28xjlmsbbd3j3sm1qvj6mp95jhfaqj821q665"; + }; + + # This package has a Makefile, but it's used for publishing and linting, not + # for building. Disable the build phase so installing doesn't attempt to + # publish the extension. + dontBuild = true; + + uuid = "remove-dropdown-arrows@mpdeimos.com"; + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp extension.js $out/share/gnome-shell/extensions/${uuid} + cp metadata.json $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = "Remove dropdown arrows from GNOME Shell Menus"; + license = licenses.gpl3; + maintainers = with maintainers; [ jonafato ]; + homepage = https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor.nix b/pkgs/desktops/gnome-3/extensions/system-monitor.nix deleted file mode 100644 index 0c3e65633c818ff0339183b9b18f3eb4e31ccb51..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/extensions/system-monitor.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchFromGitHub, glib }: - -stdenv.mkDerivation rec { - name = "gnome-shell-system-monitor-${version}"; - version = "8b31f070e9e59109d729661ced313d6a63e31787"; - - src = fetchFromGitHub { - owner = "paradoxxxzero"; - repo = "gnome-shell-system-monitor-applet"; - rev = version; - sha256 = "0fm5zb6qp53jjy2mnkb8ybxygzjwpb314giiq0ywq87hhrpch8m3"; - }; - - buildInputs = [ - glib - ]; - - buildPhase = '' - ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas - ''; - - installPhase = '' - cp -r ${uuid} $out - ''; - - uuid = "system-monitor@paradoxxx.zero.gmail.com"; - - meta = with stdenv.lib; { - description = "Display system informations in gnome shell status bar"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ aneeshusa ]; - homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..eed34ae523d4a860bd2e5fd8cc3df2efdf7d4245 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -0,0 +1,45 @@ +{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }: + +stdenv.mkDerivation rec { + name = "gnome-shell-system-monitor-${version}"; + version = "33"; + + src = fetchFromGitHub { + owner = "paradoxxxzero"; + repo = "gnome-shell-system-monitor-applet"; + rev = "v${version}"; + sha256 = "0abqaanl5r26x8f0mm0jgrjsr86hcx7mk75dx5c3zz7csw4nclkk"; + }; + + buildInputs = [ + glib + glib_networking + libgtop + ]; + + patches = [ + (substituteAll { + src = ./paths_and_nonexisting_dirs.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + glib_net_path = "${glib_networking}/lib/girepository-1.0"; + }) + ]; + + buildPhase = '' + ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas + ''; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + ''; + + uuid = "system-monitor@paradoxxx.zero.gmail.com"; + + meta = with stdenv.lib; { + description = "Display system informations in gnome shell status bar"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ aneeshusa tiramiseb ]; + homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch new file mode 100644 index 0000000000000000000000000000000000000000..82e3d7c541ba9153b0ed94c7ea40641c393c5bda --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch @@ -0,0 +1,23 @@ +diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js +index b4b7f15..d139135 100644 +--- a/system-monitor@paradoxxx.zero.gmail.com/extension.js ++++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js +@@ -18,6 +18,9 @@ + + // Author: Florian Mounier aka paradoxxxzero + ++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); ++imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@'); ++ + /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily + * by loading the new libnm.so. Should go away eventually */ + const libnm_glib = imports.gi.GIRepository.Repository.get_default().is_registered("NMClient", "1.0"); +@@ -386,7 +389,7 @@ const smMountsMonitor = new Lang.Class({ + connected: false, + _init: function () { + this._volumeMonitor = Gio.VolumeMonitor.get(); +- let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local']; ++ let sys_mounts = ['/home', '/tmp', '/boot']; + this.base_mounts = ['/']; + sys_mounts.forEach(Lang.bind(this, function (sMount) { + if (this.is_sys_mount(sMount + '/')) { diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fcaa868c06f22ddb1d572701322ca25253fa86d8 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -0,0 +1,43 @@ +{ stdenv, substituteAll, fetchFromGitHub, taskwarrior }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-taskwhisperer-${version}"; + version = "11"; + + src = fetchFromGitHub { + owner = "cinatic"; + repo = "taskwhisperer"; + rev = "v${version}"; + sha256 = "1g1301rwnfg5jci78bjpmgxrn78ra80m1zp2inhfsm8jssr1i426"; + }; + + buildInputs = [ taskwarrior ]; + + uuid = "taskwhisperer-extension@infinicode.de"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp *.js $out/share/gnome-shell/extensions/${uuid} + cp -r extra $out/share/gnome-shell/extensions/${uuid} + cp -r icons $out/share/gnome-shell/extensions/${uuid} + cp -r locale $out/share/gnome-shell/extensions/${uuid} + cp -r schemas $out/share/gnome-shell/extensions/${uuid} + cp metadata.json $out/share/gnome-shell/extensions/${uuid} + cp settings.ui $out/share/gnome-shell/extensions/${uuid} + cp stylesheet.css $out/share/gnome-shell/extensions/${uuid} + ''; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + task = "${taskwarrior}/bin/task"; + }) + ]; + + meta = with stdenv.lib; { + description = "GNOME Shell TaskWarrior GUI"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jonafato ]; + homepage = https://github.com/cinatic/taskwhisperer; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..310d6ea1b3052224619fea16dd11f3574257b79c --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch @@ -0,0 +1,81 @@ +diff --git a/extra/create.sh b/extra/create.sh +index a69e369..35d5ea1 100755 +--- a/extra/create.sh ++++ b/extra/create.sh +@@ -1 +1 @@ +-bash -c "task add $1" ++bash -c "@task@ add $1" +diff --git a/extra/modify.sh b/extra/modify.sh +index 7964a26..8edd21b 100755 +--- a/extra/modify.sh ++++ b/extra/modify.sh +@@ -1 +1 @@ +-bash -c "task $1 modify $2" ++bash -c "@task@ $1 modify $2" +diff --git a/taskService.js b/taskService.js +index dea40d8..ff35a80 100644 +--- a/taskService.js ++++ b/taskService.js +@@ -186,7 +186,7 @@ const TaskService = new Lang.Class({ + + let project = projectName ? "project:" + projectName : ""; + +- let command = ['task', 'rc.json.array=on', status, project, 'export']; ++ let command = ['@task@', 'rc.json.array=on', status, project, 'export']; + let reader = new SpawnReader.SpawnReader(); + + let buffer = ""; +@@ -227,7 +227,7 @@ const TaskService = new Lang.Class({ + break; + } + +- let shellProc = Gio.Subprocess.new(['task', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); ++ let shellProc = Gio.Subprocess.new(['@task@', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); + + shellProc.wait_async(null, function(obj, result){ + let shellProcExited = true; +@@ -274,7 +274,7 @@ const TaskService = new Lang.Class({ + return; + } + +- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); ++ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); + + shellProc.wait_async(null, function(obj, result){ + let shellProcExited = true; +@@ -307,7 +307,7 @@ const TaskService = new Lang.Class({ + return; + } + +- let shellProc = Gio.Subprocess.new(['task', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); ++ let shellProc = Gio.Subprocess.new(['@task@', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); + + shellProc.wait_async(null, function(obj, result){ + let shellProcExited = true; +@@ -339,7 +339,7 @@ const TaskService = new Lang.Class({ + { + return; + } +- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); ++ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); + shellProc.wait_async(null, function(obj, result){ + let shellProcExited = true; + shellProc.wait_finish(result); +@@ -369,7 +369,7 @@ const TaskService = new Lang.Class({ + { + return; + } +- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); ++ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); + shellProc.wait_async(null, function(obj, result){ + let shellProcExited = true; + shellProc.wait_finish(result); +@@ -468,7 +468,7 @@ const TaskService = new Lang.Class({ + + try + { +- shellProc = Gio.Subprocess.new(['task', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); ++ shellProc = Gio.Subprocess.new(['@task@', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); + } + catch(err) + { diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..dcc018d18837ebd1b992e3dfb711c4edee6de27b --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-timepp-${version}"; + version = "2018.03.17"; + + src = fetchFromGitHub { + owner = "zagortenay333"; + repo = "timepp__gnome"; + rev = "440cf85dc68d9e6ba876793f13910ee6239622cf"; + sha256 = "0idsqsii5rvynvj78w2j7xiiz9rrl3384m5mj6bf6rg8vprpfi8v"; + }; + + uuid = "timepp@zagortenay333"; + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r . $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = " A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; + homepage = https://github.com/zagortenay333/timepp__gnome; + license = licenses.gpl3; + maintainers = with maintainers; [ svsdep ]; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 4aedc10e056a743b7101ab19bce4567b01d60c75..84a9d26c2d761c881978508b81c4321569ed06ac 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-topicons-plus-${version}"; - version = "20"; + version = "21"; src = fetchFromGitHub { owner = "phocean"; repo = "TopIcons-plus"; - rev = "01535328bd43ecb3f2c71376de6fc8d1d8a88577"; - sha256 = "0pwpg72ihgj2jl9pg63y0hibdsl27srr3mab881w0gh17vwyixzi"; + rev = "v${version}"; + sha256 = "15p61krd7lcmgr1d4s2ydfjy3pyq79pq5100xzy6dln1538901m3"; }; buildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome-3/find-latest-version.py new file mode 100644 index 0000000000000000000000000000000000000000..d9155fe23930caed9f6f8543537e4e5a7a74c3a6 --- /dev/null +++ b/pkgs/desktops/gnome-3/find-latest-version.py @@ -0,0 +1,60 @@ +import argparse +import json +import requests +import sys + +def version_to_list(version): + return list(map(int, version.split('.'))) + +def odd_unstable(version_str, selected): + version = version_to_list(version_str) + if len(version) < 2: + return True + + even = version[1] % 2 == 0 + prerelease = version[1] >= 90 + stable = even and not prerelease + if selected == 'stable': + return stable + else: + return True + +def no_policy(version, selected): + return True + +version_policies = { + 'odd-unstable': odd_unstable, + 'none': no_policy, +} + +def make_version_policy(version_predicate, selected): + return lambda version: version_predicate(version, selected) + +parser = argparse.ArgumentParser(description='Find latest version for a GNOME package by crawling their release server.') +parser.add_argument('package-name', help='Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.') +parser.add_argument('version-policy', help='Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.', choices=version_policies.keys(), nargs='?', default='odd-unstable') +parser.add_argument('requested-release', help='Most of the time, we will want to update to stable version but sometimes it is useful to test.', choices=['stable', 'unstable'], nargs='?', default='stable') + + +if __name__ == '__main__': + args = parser.parse_args() + + package_name = getattr(args, 'package-name') + requested_release = getattr(args, 'requested-release') + version_predicate = version_policies[getattr(args, 'version-policy')] + version_policy = make_version_policy(version_predicate, requested_release) + + # The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762 + cache = json.loads(requests.get('https://ftp.gnome.org/pub/GNOME/sources/{}/cache.json'.format(package_name)).text) + if type(cache) != list or cache[0] != 4: + print('Unknown format of cache.json file.', file=sys.stderr) + sys.exit(1) + + versions = cache[2][package_name] + versions = sorted(filter(version_policy, versions), key=version_to_list) + + if len(versions) == 0: + print('No versions matched.', file=sys.stderr) + sys.exit(1) + + print(versions[-1]) diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 40e1473b59e25972b75e077de79b6b1a9bf1ca86..77220124fcc1e315cac5dc9e647a583e2807a7ea 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils -, guile_2_0, libcanberra_gtk3 }: +, wrapGAppsHook, gconf, librsvg, libxml2, desktop-file-utils +, guile_2_0, libcanberra-gtk3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "aisleriot-${version}"; + version = "3.22.5"; + + src = fetchurl { + url = "mirror://gnome/sources/aisleriot/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "aisleriot"; attrPath = "gnome3.aisleriot"; }; + }; configureFlags = [ "--with-card-theme-formats=svg" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf - librsvg libxml2 desktop_file_utils guile_2_0 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/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/games/aisleriot/src.nix deleted file mode 100644 index fbe6505b9a06f9cd82b21c2466dbed6cf032a613..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/aisleriot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "aisleriot-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/aisleriot/3.22/aisleriot-3.22.0.tar.xz; - sha256 = "e7b603df0a482bdd0ab8083efc096a24a46aea1b36cc8608846e568b7a353eb7"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 48b2b3823729844d2e88ccf8717fc4b7096572e0..4115fda9f8df6a547b52015f1565f1a352cb8822 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "five-or-more-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/five-or-more/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1fy4a7qdjqvabm0cl45d6xlx6hy4paxvm0b2paifff73bl250d5c"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "five-or-more"; attrPath = "gnome3.five-or-more"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/games/five-or-more/src.nix deleted file mode 100644 index 597db69a5dcfb85c986a4e779f6b3b8c2a0b72a2..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/five-or-more/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "five-or-more-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/five-or-more/3.22/five-or-more-3.22.0.tar.xz; - sha256 = "33c0ba7723144aea496112fa85a1d7e5a2a8ecaa32f4373471470d7c3078da94"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 486fe5c486e060b5398617ad71058ff6b315fb3d..bf21f734680945b935c278c9c14c255d1769c49b 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: +, gettext, itstool, libcanberra-gtk3, librsvg, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "four-in-a-row-${version}"; + version = "3.28.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg - libxml2 gnome3.defaultIconTheme - ]; + src = fetchurl { + url = "mirror://gnome/sources/four-in-a-row/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ]; + buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.defaultIconTheme ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "four-in-a-row"; + attrPath = "gnome3.four-in-a-row"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Four-in-a-row; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix deleted file mode 100644 index e0e11bc2124c1c6ff849972fe42399d9ad23ce1d..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "four-in-a-row-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.0.tar.xz; - sha256 = "c2e26630f7b4e81cff087314edc0f39cd645dfbf4b31f826232bd8e9d57a7ff7"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index bfa345c4a40b458d565b23921260b2dc75ef369f..aebd72d65df2d8a99c907670e68f7d12c4304d64 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -1,14 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, librsvg, libxml2 }: +{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobjectIntrospection +, gettext, itstool, libxml2, gnome3, glib, gtk3, librsvg }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-chess-${version}"; + version = "3.28.1"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - gnome3.defaultIconTheme - ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-chess/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1q8gc0mq8k2b7pjy363g0yjd80czqknw6ssqzbvgqx5b8nkfvmv1"; + }; + + nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-chess"; + attrPath = "gnome3.gnome-chess"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Chess; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/games/gnome-chess/src.nix deleted file mode 100644 index 3fb218ab60245525bbef840aa820a0477e11133f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-chess/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-chess-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz; - sha256 = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 13afae2eb2cb32a6e5652b1867a179a7af1c5cb9..fc75cd081f9a2e931f5ca3026fb277cc4759c103 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -1,14 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libxml2, intltool, itstool, libgee, libgames-support }: +{ stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils +, glib, librsvg, libxml2, intltool, itstool, libgee, libgnome-games-support }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "gnome-klotski"; + version = "3.22.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support - gnome3.defaultIconTheme - ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f"; + }; + + nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ]; + buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.defaultIconTheme ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "${pname}"; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Klotski; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix deleted file mode 100644 index 447bc1eff130f14a2a1f9a73c6b859e3c448de9b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-klotski-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.0.tar.xz; - sha256 = "25e35369d1b5d2f9e6b92d44568d21df631b5b23dd7b12ca226a04f58cb54700"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 3d0d5d6df4672d11c403f7523b7b7580df445834..b9a4638a947c9f9e47b8253c857b54ce3c0f3c49 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-mahjongg-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-mahjongg"; attrPath = "gnome3.gnome-mahjongg"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix deleted file mode 100644 index c021136ee304a7b529a63a18cd36a99abe0b3f74..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-mahjongg-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-mahjongg/3.22/gnome-mahjongg-3.22.0.tar.xz; - sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index d76e585bb4ebff5a42999a2f4b8e0f4736a7fc8e..55dad369c1086e7381e7ee28f84b0d8afe6263bb 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -1,14 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2, libgames-support, libgee }: +{ stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, gettext, itstool, libxml2, libgames-support, libgee }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-mines-${version}"; + version = "3.28.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme libgames-support libgee - ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-mines/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf"; + }; + + # gobjectIntrospection for finding vapi files + nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ]; + buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgames-support libgee ]; + + postPatch = '' + chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file + patchShebangs data/meson_compile_gschema.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-mines"; + attrPath = "gnome3.gnome-mines"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Mines; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/games/gnome-mines/src.nix deleted file mode 100644 index 4b0e85fdef1047706dcc0174364b4621c9225f24..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-mines/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-mines-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-mines/3.24/gnome-mines-3.24.0.tar.xz; - sha256 = "e663af29235a5c3f03d90f135487f57e5fd9137480dafb0ae9efc0da855602f6"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 90fdccc11860fd168ac45bc6892c228ba0ef1773..302d8fb2101001540bceb46cb247ed088a002ade 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool +, librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool , libxml2, libgee, libgames-support }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-nibbles-${version}"; + version = "3.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-nibbles/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-nibbles"; attrPath = "gnome3.gnome-nibbles"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme + librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme libgee libgames-support ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix deleted file mode 100644 index 133e9651fa74d0faabe5c654a5023728a9f85883..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-nibbles-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-3.24.0.tar.xz; - sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index cd13e6ab9585dba9cda6fc3aeed57c6dccdb55ac..e07e3c14152200479ad6cf5f5b28ba19ae5e2215 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,13 +1,23 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2, libgames-support +, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgames-support , libgee}: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-robots-${version}"; + version = "3.22.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-robots/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0dzcjd7rdmlzgr6rmljhrbccwif8wj0cr1xcrrj7malj33098wwk"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 libxml2 gnome3.defaultIconTheme libgames-support libgee ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/games/gnome-robots/src.nix deleted file mode 100644 index 17fabe2de26bef7801d6d5b1f6caaf30c28f3688..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-robots/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-robots-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.0.tar.xz; - sha256 = "ddb02f9d04c970354d1836813f8c0d9ffc3ff509091d2580384e2275663e6f73"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index a0f83d48c3daf89659a3559ba534a85cfc99cf68..1d467e542da9f2e9f7eed2deeff04e3bbd5b23b4 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook -, json_glib, qqwing, itstool, libxml2 }: +, json-glib, qqwing, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-sudoku-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-sudoku/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-sudoku"; attrPath = "gnome3.gnome-sudoku"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook gtk3 gnome3.libgee - json_glib qqwing itstool libxml2 ]; + json-glib qqwing itstool libxml2 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Sudoku; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix deleted file mode 100644 index 597196a5ec8cfb87e17cd2f4fd4630b55c43edfe..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-sudoku-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz; - sha256 = "04a29447889448ee5d5840cb5b2fd05ce6031c38a24809ce4919647ee6f485d7"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index d456abe6dc1fed2dcce174d812e5ce7500b6392e..855e496dfaf420396b161884ea6190919e32dd9a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: +, librsvg, libcanberra-gtk3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-taquin-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-taquin/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "096a32nhcz243na56iq2wxixd4f3lbj33a5h718r3j6yppqazjx9"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-taquin"; attrPath = "gnome3.gnome-taquin"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook librsvg libcanberra-gtk3 intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix deleted file mode 100644 index 6828e56a911f9191712851b2b14c818dbefda3fe..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-taquin-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-taquin/3.22/gnome-taquin-3.22.0.tar.xz; - sha256 = "780af247856b91095a9a2e1a6b425e4e3a78520659e2157eddb421377e8ce982"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 37218776f1235afd94a0704a40654fbe06868a36..f456b7ee68311ea2cd528a1977e5e1724dfa2c90 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -2,7 +2,17 @@ , libxml2, intltool, itstool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-tetravex-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-tetravex/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix deleted file mode 100644 index e79b18263b995b5454e5e5ee76015e941457a350..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-tetravex-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-tetravex/3.22/gnome-tetravex-3.22.0.tar.xz; - sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 21d4ed6f520eae53a44b112ca629dcdc070f942e..db01eb86f1732684556efe9364ff729d91355b0d 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -2,11 +2,16 @@ , libxml2, intltool, itstool }: stdenv.mkDerivation rec { - name = "hitori-${gnome3.version}.1"; + name = "hitori-${version}"; + version = "3.22.4"; src = fetchurl { - url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz"; - sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1"; + url = "mirror://gnome/sources/hitori/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "hitori"; attrPath = "gnome3.hitori"; }; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/gnome-3/games/hitori/src.nix b/pkgs/desktops/gnome-3/games/hitori/src.nix deleted file mode 100644 index 47989cf2eae5018981250df4091d3542d649a316..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/hitori/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "hitori-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/hitori/3.22/hitori-3.22.0.tar.xz; - sha256 = "f70521c9a7a7c3e16b3951b64780eb0c5bce1bb1bb29de4482be06fb5e41adaa"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 3836548b3ab25b08a7240b980b1a465698b23776..55dac4659d0f6d2f1f7c42915e7f7471337a5617 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, libxml2, dconf }: +, intltool, itstool, libcanberra-gtk3, libxml2, dconf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "iagno-${version}"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/iagno/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "12haq1vgrr6wf970rja55rcg0352sm0i3l5z7gj0ipr2isv8506x"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "iagno"; attrPath = "gnome3.iagno"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; + dconf libxml2 libcanberra-gtk3 wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/iagno/src.nix b/pkgs/desktops/gnome-3/games/iagno/src.nix deleted file mode 100644 index 6c20a8f7844a51a4862e2f8f806038441ca9ff23..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/iagno/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "iagno-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/iagno/3.22/iagno-3.22.0.tar.xz; - sha256 = "e7070c55f1f74cd9345388ee120f0e6cc47392868c2601664c26a0fa2672fe13"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 7bd3ca95de941df8a95a596b2bbfeba2d73574ae..73b7c092a66d2a74b6000f0422cbc2a9541fd351 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -1,15 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }: +{ stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook +, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "lightsoff-${version}"; + version = "3.28.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf - libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; + src = fetchurl { + url = "mirror://gnome/sources/lightsoff/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0rwh9kz6aphglp79cyrfjab6vy02vclq68f646zjgb9xgg6ar73g"; + }; + + nativeBuildInputs = [ vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "lightsoff"; + attrPath = "gnome3.lightsoff"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Lightsoff; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/games/lightsoff/src.nix deleted file mode 100644 index 2a26df6615bd10756cc3c7c01efd6e6dc7ccd295..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/lightsoff/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "lightsoff-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz; - sha256 = "5d1bb7de4b3f5c7814e5599a5171cfdeef74e774a8a6dbd992c893a5af6bd8ce"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 514b2a035575ba52bccd918f9a67e879a6a1d41a..b0572f981dedee1d842899eafb7a896668d0f744 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -1,14 +1,24 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, libcanberra_gtk3 -, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }: +, librsvg, libcanberra-gtk3 +, intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "quadrapassel-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/quadrapassel/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "quadrapassel"; attrPath = "gnome3.quadrapassel"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libcanberra_gtk3 itstool intltool clutter - libxml2 clutter_gtk wrapGAppsHook ]; + libcanberra-gtk3 itstool intltool clutter + libxml2 clutter-gtk wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/games/quadrapassel/src.nix deleted file mode 100644 index 57bdb4771ddf895bf02ce3e002e99a5920584137..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/quadrapassel/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "quadrapassel-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/quadrapassel/3.22/quadrapassel-3.22.0.tar.xz; - sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index c6416960b7aadf1c84a31c1008cc404c9bc5722c..13b6f57d0fd204aa14cb45b6bd01bb62d9e7894d 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,14 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf -, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils +, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "swell-foop"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1yjmg6sgi7mvp10fsqlkqshajmh8kgdmg6vyj5r8y48pv2ihfk64"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook itstool gettext libxml2 desktop-file-utils ]; + buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ]; - enableParallelBuilding = true; + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Swell%20Foop; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/games/swell-foop/src.nix deleted file mode 100644 index 7fa5f724de269dc0b94d188f0ca1f5cfd82dbd2a..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/swell-foop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "swell-foop-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz; - sha256 = "1b2d444e4d399e300afe07a243423c8b3ab1ca32828c749e0be9af48a5904a11"; - }; -} diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index 6f6beee89615f927b5389b00bfff32d1d160bf31..f8d799b69141904097de37c76132f14bf4d808d0 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -2,7 +2,17 @@ , librsvg, intltool, itstool, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "tali-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/tali/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg diff --git a/pkgs/desktops/gnome-3/games/tali/src.nix b/pkgs/desktops/gnome-3/games/tali/src.nix deleted file mode 100644 index 108144cc3eef2e21f989a4f6aa961361f2bf838e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/games/tali/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tali-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/tali/3.22/tali-3.22.0.tar.xz; - sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch deleted file mode 100644 index c229cc96094fec679683a0a9ed5f14272cb78ae7..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 8a94642..1ca6426 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS) - GLIB_REQUIRED=2.38.0 - GTK_REQUIRED=3.12.2 - GEE_REQUIRED=0.10.5 --ECAL_REQUIRED=3.8.5 -+ECAL_REQUIRED=3.13.90 - LIBSOUP_REQUIRED=2.44 - GDATA_REQUIRED=0.14.0 - GOA_REQUIRED=3.8.3 -diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala -index ee6a572..5009b5d 100644 ---- a/src/backing/eds/backing-eds-calendar-source.vala -+++ b/src/backing/eds/backing-eds-calendar-source.vala -@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource { - - // Invoked by EdsStore prior to making it available outside of unit - internal async void open_async(Cancellable? cancellable) throws Error { -- client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, -+ client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1, - cancellable); - - client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE); -diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi -index 6ead3ec..46fd711 100644 ---- a/vapi/libecal-1.2.vapi -+++ b/vapi/libecal-1.2.vapi -@@ -23,7 +23,7 @@ namespace E { - public bool check_save_schedules (); - public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_connect_finish")] -- public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; -+ public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error; - public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_create_object_finish")] - public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error; diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index b33488e34fce974ee04dbd3e239cf58eeebe8e3b..c81238d24986467eedfab5801ae6a842fca125ab 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -1,34 +1,36 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, makeWrapper -, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, libgee, wrapGAppsHook, itstool, gobjectIntrospection +, gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }: let - majorVersion = "0.4"; -in -stdenv.mkDerivation rec { - name = "california-${majorVersion}.0"; + pname = "california"; + version = "0.4.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee - libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server - sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/california" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share" - ''; + nativeBuildInputs = [ intltool itstool vala_0_32 pkgconfig wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ]; enableParallelBuilding = true; - # Apply fedoras patch to build with evolution-data-server >3.13 - patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ]; + patches = [ + # Apply Fedora patch to build with evolution-data-server > 3.13 + (fetchurl { + url = https://src.fedoraproject.org/rpms/california/raw/c00bf9924d8fa8cb0a9ec06564d1a1b00c9055af/f/0002-Build-with-evolution-data-server-3.13.90.patch; + sha256 = "0g9923n329p32gzr1q52ad30f8vyz8vrri4rih0w8klmf02ga4pm"; + }) + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/California; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 6243d1b1d5f10ca5320bffd3f5f1fc5d7cf89286..1994b587fbd3ffbfa14cefca30754e1c0bc2b2a3 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,37 +1,46 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant -, wrapGAppsHook, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra_gtk3, libsecret, gmime -, libpthreadstubs, sqlite -, gnome3, librsvg, gnome_doc_utils, webkitgtk }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant +, wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils +, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes +, gobjectIntrospection, libpthreadstubs, sqlite +, gnome3, librsvg, gnome-doc-utils, webkitgtk }: let - majorVersion = "0.12"; + pname = "geary"; + version = "0.12.1"; in stdenv.mkDerivation rec { - name = "geary-${majorVersion}.0"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; - sha256 = "0ii4qaqfqx90kvqwg0g9jahygkir4mb03ja55fa55yyx6cq0kwff"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; + buildInputs = [ + gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite + libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr isocodes + gdk_pixbuf librsvg gnome3.defaultIconTheme + ]; - nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop_file_utils gnome_doc_utils ]; - buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr - gdk_pixbuf librsvg gnome3.defaultIconTheme ]; + cmakeFlags = [ + "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes" + ]; - preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' - ''; + # TODO: This is bad, upstream should fix their code. + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0"; preFixup = '' # Add geary to path for geary-attach gappsWrapperArgs+=(--prefix PATH : "$out/bin") ''; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Geary; diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix index d0801714a0f9e575a02cc58c4d8a7592a5411139..045dc2ffc33116d3098bccba099fca899f56dab0 100644 --- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix @@ -1,29 +1,37 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobjectIntrospection, vala }: let - majorVersion = "0.10"; + pname = "gexiv2"; + version = "0.10.8"; in stdenv.mkDerivation rec { - name = "gexiv2-${version}"; - version = "${majorVersion}.6"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "09aqsnpah71p9gx0ap2px2dyanrs7jmkkar6q114n9b7js8qh9qk"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0088m7p044n741ly1m6i7w25z513h9wpgyw0rmx5f0sy3vyjiic1"; }; preConfigure = '' patchShebangs . ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libtool m4 ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ]; + buildInputs = [ glib ]; propagatedBuildInputs = [ exiv2 ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/gexiv2; description = "GObject wrapper around the Exiv2 photo metadata library"; - platforms = platforms.linux; + license = licenses.gpl2; + platforms = platforms.unix; maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix index 364a52ee5cdfdb60e181652213ec3947d9e5ebf5..8194e3f1699d7c54a1fe83a0736770ee9cefbd5a 100644 --- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix @@ -1,20 +1,34 @@ { stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json_glib }: +, gnome3, libsoup, json-glib, gobjectIntrospection }: -stdenv.mkDerivation rec { - name = "gfbgraph-0.2.3"; +let + pname = "gfbgraph"; + version = "0.2.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gnome3.gnome_online_accounts ]; - propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; + buildInputs = [ glib gnome3.gnome-online-accounts ]; + propagatedBuildInputs = [ libsoup json-glib gnome3.rest ]; + + configureFlags = [ "--enable-introspection" ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { description = "GLib/GObject wrapper for the Facebook Graph API"; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index b3646abd6dda21038fe859ee1c5c2c3cd9b42355..32da3a9a4b81583253a313b77ccb542a7ffbad3e 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,36 +1,51 @@ -{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib -, json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret -, dconf}: - - -# TODO: icons and theme still does not work -# use packaged gnome3.adwaita-icon-theme - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +{ stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib +, json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection +, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret +, libsoup }: + +let + pname = "gitg"; + version = "3.26.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; + }; preCheck = '' substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" ''; doCheck = true; + enableParallelBuilding = true; + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - propagatedUserEnvPkgs = [ shared_mime_info - gnome3.gnome_themes_standard ]; + buildInputs = [ + gtk3 glib json-glib libgee libpeas gnome3.libsoup + libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas + libsecret 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 = [ vala wrapGAppsHook intltool pkgconfig ]; - nativeBuildInputs = [ wrapGAppsHook intltool pkgconfig ]; + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; - # https://bugzilla.gnome.org/show_bug.cgi?id=758240 - preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Gitg; + homepage = https://wiki.gnome.org/Apps/Gitg; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/misc/gitg/src.nix b/pkgs/desktops/gnome-3/misc/gitg/src.nix deleted file mode 100644 index c72e2830ad1ee6b11a36be5001442e8f3170d74c..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gitg/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gitg-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz; - sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 3a35a87ceafc4f55878bae4733d3472a09dead04..b1251f5111a4b02b844e129c931d60b1b395b2a4 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -3,7 +3,17 @@ }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-autoar-${version}"; + version = "0.2.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-autoar/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix deleted file mode 100644 index ee2ade83ee6c345f86c1d6a38eaed7b44fd91e5f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-autoar-0.2.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.2.tar.xz; - sha256 = "e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index ee3dd60e59ad92b92fd7669a2f68b11e2d019d6a..e3ff784b16fa55ddefeca868d8a8d8f8aadb8a78 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,14 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit -, fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit +, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus_libs, desktop-file-utils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-packagekit-${version}"; + version = "3.28.0"; - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-packagekit/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "051q3hc78qa85mfh4jxxprfcrfj1hva6smfqsgzm0kx4zkkj1c1r"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-packagekit"; attrPath = "gnome3.gnome-packagekit"; }; + }; + + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + + nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; + buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit + libcanberra-gtk3 libnotify dbus-glib dbus_libs ]; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; - buildInputs = [ libxslt gnome3.gtk packagekit fontconfig - libcanberra_gtk3 libnotify dbus_glib dbus_libs ]; + prePatch = "patchShebangs meson_post_install.sh"; meta = with stdenv.lib; { homepage = https://www.freedesktop.org/software/PackageKit/; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix deleted file mode 100644 index 992badf1f4f4474ea3c3e7af995ce9ac5b86401b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-packagekit-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz; - sha256 = "8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch deleted file mode 100644 index d236730282a9ff0de825c11b1669dc8e15300e94..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch +++ /dev/null @@ -1,123 +0,0 @@ -From ac9e8e835888da1faa57f07c54fa4e73783621e2 Mon Sep 17 00:00:00 2001 -From: Jascha Geerds -Date: Sun, 25 Jun 2017 11:32:30 +0100 -Subject: [PATCH 1/3] Search for themes and icons in system data dirs - ---- - gtweak/tweaks/tweak_group_interface.py | 17 ++++------------- - gtweak/tweaks/tweak_group_keymouse.py | 7 ++----- - gtweak/utils.py | 17 +++++++++++++++++ - 3 files changed, 23 insertions(+), 18 deletions(-) - -diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py -index 97751ed..db89b85 100644 ---- a/gtweak/tweaks/tweak_group_interface.py -+++ b/gtweak/tweaks/tweak_group_interface.py -@@ -26,7 +26,7 @@ from gi.repository import Gtk - from gi.repository import GLib - - import gtweak --from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file -+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE - from gtweak.gshellwrapper import GnomeShellFactory - from gtweak.gsettings import GSettingsSetting -@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): - if gtk_ver % 2: # Want even number - gtk_ver += 1 - -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.exists(os.path.join(d, "gtk-2.0")) and \ - (os.path.exists(os.path.join(d, "gtk-3.0")) or \ - os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))) -@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_icon_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), -- os.path.join(GLib.get_user_data_dir(), "icons"), -- os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "index.theme"))) - return valid -@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_cursor_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), -- os.path.join(GLib.get_user_data_dir(), "icons"), -- os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "cursors"))) - return valid -diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py -index 69c4b7e..b06900c 100644 ---- a/gtweak/tweaks/tweak_group_keymouse.py -+++ b/gtweak/tweaks/tweak_group_keymouse.py -@@ -21,7 +21,7 @@ from gi.repository import GLib - - import gtweak - from gtweak.gshellwrapper import GnomeShellFactory --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak - - _shell = GnomeShellFactory().get_shell() -@@ -41,10 +41,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_key_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) - return valid -diff --git a/gtweak/utils.py b/gtweak/utils.py -index 39f8833..b0993b6 100644 ---- a/gtweak/utils.py -+++ b/gtweak/utils.py -@@ -21,6 +21,7 @@ import tempfile - import shutil - import subprocess - import glob -+import itertools - - import gtweak - from gtweak.gsettings import GSettingsSetting -@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True): - stdout, stderr = p.communicate() - return stdout, stderr, p.returncode - -+def get_resource_dirs(resource): -+ """Returns a list of all known resource dirs for a given resource. -+ -+ :param str resource: -+ Name of the resource (e.g. "themes") -+ :return: -+ A list of resource dirs -+ """ -+ dirs = [os.path.join(dir, resource) -+ for dir in itertools.chain(GLib.get_system_data_dirs(), -+ (gtweak.DATA_DIR, -+ GLib.get_user_data_dir()))] -+ dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))] -+ -+ return [dir for dir in dirs if os.path.isdir(dir)] -+ - @singleton - class AutostartManager: - --- -2.12.2 - diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch deleted file mode 100644 index 40c0969d588055b5fd117f64e97701ad367f7079..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 25c047ac6a2ac892e2be3d7e002fbf7a16725a4c Mon Sep 17 00:00:00 2001 -From: Jascha Geerds -Date: Sun, 25 Jun 2017 11:35:10 +0100 -Subject: [PATCH 2/3] Don't show multiple entries for a single theme - ---- - gtweak/tweaks/tweak_group_interface.py | 8 ++++---- - gtweak/tweaks/tweak_group_keymouse.py | 4 ++-- - gtweak/utils.py | 16 ++++++++++++++++ - 3 files changed, 22 insertions(+), 6 deletions(-) - -diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py -index db89b85..4697fe3 100644 ---- a/gtweak/tweaks/tweak_group_interface.py -+++ b/gtweak/tweaks/tweak_group_interface.py -@@ -26,7 +26,7 @@ from gi.repository import Gtk - from gi.repository import GLib - - import gtweak --from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs -+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE - from gtweak.gshellwrapper import GnomeShellFactory - from gtweak.gsettings import GSettingsSetting -@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): - os.path.exists(os.path.join(d, "gtk-2.0")) and \ - (os.path.exists(os.path.join(d, "gtk-3.0")) or \ - os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))) -- return valid -+ return get_unique_resources(valid) - - class IconThemeSwitcher(GSettingsComboTweak): - def __init__(self, **options): -@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "index.theme"))) -- return valid -+ return get_unique_resources(valid) - - class CursorThemeSwitcher(GSettingsComboTweak): - def __init__(self, **options): -@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "cursors"))) -- return valid -+ return get_unique_resources(valid) - - class ShellThemeTweak(Gtk.Box, Tweak): - -diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py -index b06900c..d34793e 100644 ---- a/gtweak/tweaks/tweak_group_keymouse.py -+++ b/gtweak/tweaks/tweak_group_keymouse.py -@@ -21,7 +21,7 @@ from gi.repository import GLib - - import gtweak - from gtweak.gshellwrapper import GnomeShellFactory --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak - - _shell = GnomeShellFactory().get_shell() -@@ -44,7 +44,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) -- return valid -+ return get_unique_resources(valid) - - TWEAK_GROUPS = [ - ListBoxTweakGroup(_("Keyboard and Mouse"), -diff --git a/gtweak/utils.py b/gtweak/utils.py -index b0993b6..0d995bc 100644 ---- a/gtweak/utils.py -+++ b/gtweak/utils.py -@@ -133,6 +133,22 @@ def get_resource_dirs(resource): - - return [dir for dir in dirs if os.path.isdir(dir)] - -+def get_unique_resources(dirs): -+ """Filter out duplicated resources. -+ -+ :param list dirs: -+ List of resource dirs (e.g. /usr/share/themes/Adwaita) -+ :return: -+ List of dirs without duplicated resources -+ """ -+ unique_dirs = {} -+ for dir in dirs: -+ basename = os.path.basename(dir) -+ if basename not in unique_dirs: -+ unique_dirs[basename] = dir -+ -+ return unique_dirs -+ - @singleton - class AutostartManager: - --- -2.12.2 - diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch deleted file mode 100644 index 5082a55387a86c38f289b80b2ba4e891efc3cec6..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ba2eb4be6c69ee8206e0139268c896e6a2b278d8 Mon Sep 17 00:00:00 2001 -From: Jascha Geerds -Date: Sun, 25 Jun 2017 11:50:33 +0100 -Subject: [PATCH 3/3] Create config dir if it doesn't exist - ---- - gtweak/gtksettings.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py -index a0c163b..f5883ec 100644 ---- a/gtweak/gtksettings.py -+++ b/gtweak/gtksettings.py -@@ -36,6 +36,10 @@ class GtkSettingsManager: - def _get_keyfile(self): - keyfile = None - try: -+ config_dir = os.path.dirname(self._path) -+ if not os.path.isdir(config_dir): -+ os.makedirs(config_dir) -+ - keyfile = GLib.KeyFile() - keyfile.load_from_file(self._path, 0) - except MemoryError: --- -2.12.2 - diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix deleted file mode 100644 index ad415368368dcf74793e71b4339014f256c5bcc6..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, intltool, fetchurl, atk -, pkgconfig, gtk3, glib, libsoup -, bash, itstool, libxml2, python2Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - makeFlags = [ "DESTDIR=/" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 - gnome3.gsettings_desktop_schemas file - gdk_pixbuf gnome3.defaultIconTheme librsvg - libnotify gnome3.gnome_shell python2Packages.pygobject3 - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.gnome_desktop wrapGAppsHook gobjectIntrospection - ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/${python2Packages.python.sitePackages}:$PYTHONPATH") - ''; - - patches = [ - ./find_gsettings.patch - ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch - ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch - ./0003-Create-config-dir-if-it-doesn-t-exist.patch - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; - description = "A tool to customize advanced GNOME 3 options"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch deleted file mode 100644 index 3e68c04cb3ab868edd59bc325d5761e35f54adae..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py -index a00fe19..dce74b2 100644 ---- a/gtweak/gsettings.py -+++ b/gtweak/gsettings.py -@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception): - - class _GSettingsSchema: - def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): -- if not schema_dir: -- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR - if not schema_filename: - schema_filename = schema_name + ".gschema.xml" -+ if not schema_dir: -+ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR -+ for xdg_dir in GLib.get_system_data_dirs(): -+ dir = os.path.join(xdg_dir, "glib-2.0", "schemas") -+ if os.path.exists(os.path.join(dir, schema_filename)): -+ schema_dir = dir -+ break - - schema_path = os.path.join(schema_dir, schema_filename) - if not os.path.exists(schema_path): diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix deleted file mode 100644 index 0af83053fa897762c2976e4cd583ca1d6468a2a1..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-tweak-tool-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz; - sha256 = "19226b374148d660330af9a8341087c2f869bb24355f4dcc87857169eca9f565"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a7c69de44eb64a471d3533dc871959c28e35c6c4 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -0,0 +1,54 @@ +{ stdenv, meson, ninja, gettext, fetchurl, atk +, pkgconfig, gtk3, glib, libsoup +, bash, itstool, libxml2, python3Packages +, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: + +let + pname = "gnome-tweaks"; + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1p5xydr0haz4389h6dvvbna6i1mipdzvmlfksnv0jqfvfs9sy6fp"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook + ]; + buildInputs = [ + gtk3 glib gnome3.gsettings-desktop-schemas + gdk_pixbuf gnome3.defaultIconTheme + libnotify gnome3.gnome-shell python3Packages.pygobject3 + libsoup gnome3.gnome-settings-daemon gnome3.nautilus + gnome3.mutter gnome3.gnome-desktop gobjectIntrospection + gnome3.nautilus + # Makes it possible to select user themes through the `user-theme` extension + gnome3.gnome-shell-extensions + ]; + + postPatch = '' + patchShebangs meson-postinstall.py + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH") + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; + description = "A tool to customize advanced GNOME 3 options"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix index dfeefe0def86b7411be0e647ddb6fb4a30ef3f71..38b33ff66671b49123b4435bbf7f867abe4ecdd5 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix @@ -1,18 +1,26 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 }: - -stdenv.mkDerivation rec { - name = "gnome-video-effects-${version}"; - version = "0.4.1"; +let + pname = "gnome-video-effects"; + version = "0.4.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz"; - sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { + description = "A collection of GStreamer effects to be used in different GNOME Modules"; homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index a43f9206cdd6a650749e8dab4c78a9bbac7df739..a0182057873332a488fa4aa4e3bb27ca6057fe9c 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -2,20 +2,20 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }: stdenv.mkDerivation rec { - version = "3.24.2"; + version = "3.28.2"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "16142jfpkz8qfs7zp9k3c5l9pnvxbr5yygj8jdpx6by1142s6340"; + sha256 = "1zfx73qpw976hyzp5k569lywsq2b6dbnnzf2cvhjvn3mvkw8pin2"; }; nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ]; buildInputs = [ glib gjs mutter gnome3.adwaita-icon-theme - gtk3 gnome3.gnome_control_center dbus + gtk3 gnome3.gnome-control-center dbus clutter pango appstream-glib systemd gobjectIntrospection ]; - configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings" + configureFlags = [ "--with-controlcenterdir=$(out)/share/gnome-control-center/keybindings" "--with-dbusservicesdir=$(out)/share/dbus-1/services" "--with-systemduserunitdir=$(out)/etc/systemd/user" ]; diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix index 71e3ff19dc3f9bb36dab8d5b7334b38ba89debd5..ca1fc3724fca8be02fe6d868f0b833329bc10dff 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix @@ -1,14 +1,36 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }: +{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobjectIntrospection, gnome3 }: -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +let + pname = "gspell"; + version = "1.8.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - propagatedBuildInputs = [ enchant ]; # required for pkgconfig + outputs = [ "out" "dev" ]; + outputBin = "dev"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk3 isocodes vala ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ickabxngl567lv1jax4fasr5brq29hg04ymaay47pjfp32w4zqv"; + }; + + propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig + + nativeBuildInputs = [ pkgconfig vala gobjectIntrospection libxml2 ]; + buildInputs = [ glib gtk3 isocodes ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { + description = "A spell-checking library for GTK+ applications"; + homepage = https://wiki.gnome.org/Projects/gspell; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gspell/src.nix b/pkgs/desktops/gnome-3/misc/gspell/src.nix deleted file mode 100644 index fd55e654d5519a5c6b86d83e9ea6e3e70a7a448e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gspell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -fetchurl: rec { - major = "1.4"; - minor = "1"; - name = "gspell-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz"; - sha256 = "1ghh1xdzf04mfgb13zqpj88krpa44xv2vbyhm6k017kzrpz8hbs4"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 3f65ab36b0bb7e881719602258eac8f1740e0992..1b912109cfd5261c2dfec4318e6276a92ad2e286 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -2,11 +2,21 @@ , gnome3, enchant, isocodes }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gtkhtml-${version}"; + version = "4.10.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gtkhtml/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gtkhtml"; attrPath = "gnome3.gtkhtml"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas ]; + gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix deleted file mode 100644 index 21876ec9c399f6744c4cacaa5d1c83d722ecfb6f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtkhtml-4.10.0"; - - src = fetchurl { - url = mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz; - sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix deleted file mode 100644 index 90ee658fd09614f683c1445e1b6db03126e98397..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool }: - -stdenv.mkDerivation rec { - version = "1.2.1"; - name = "libgnome-games-support-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnome-games-support/1.2/${name}.tar.xz"; - sha256 = "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk3 libgee intltool ]; - - meta = with stdenv.lib; { - description = "Small library intended for internal use by GNOME Games, but it may be used by others"; - homepage = https://github.com/GNOME/libgames-support; - license = licenses.gpl3; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index f477c13c7bae42988de3471b766cfe24819a7ebd..ce7bb6f75b5cd71926671a8bd2a7b30836b2f7ef 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -1,7 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 +, mysqlSupport ? false, mysql ? null +, postgresSupport ? false, postgresql ? null +}: + +assert mysqlSupport -> mysql != null; +assert postgresSupport -> postgresql != null; stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgda-${version}"; + version = "5.2.4"; + + src = fetchurl { + url = "mirror://gnome/sources/libgda/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgda"; attrPath = "gnome3.libgda"; }; + }; patches = [ (fetchurl { @@ -11,21 +27,24 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ - "--enable-gi-system-install=no" - ]; + configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ] + ++ (optional (mysqlSupport) "--with-mysql=yes") + ++ (optional (postgresSupport) "--with-postgres=yes"); enableParallelBuilding = true; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool itstool libxml2 gtk3 openssl ]; + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 ]; + buildInputs = with stdenv.lib; [ gtk3 openssl ] + ++ optional (mysqlSupport) mysql.connector-c + ++ optional (postgresSupport) postgresql; meta = with stdenv.lib; { description = "Database access library"; homepage = http://www.gnome-db.org/; license = [ licenses.lgpl2 licenses.gpl2 ]; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgda/src.nix b/pkgs/desktops/gnome-3/misc/libgda/src.nix deleted file mode 100644 index 8812ccc8ccd9018f5dc1d8173b6dde9eeef0feda..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/libgda/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgda-5.2.4"; - - src = fetchurl { - url = mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz; - sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix index 36feb09d7eeff70504a25e236b0ecea168919d64..13d34c1c25801cd136340f8ab886058ddac1018c 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix @@ -1,16 +1,45 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2 -, gtk_doc, gobjectIntrospection, libgit2, glib }: +{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, vala, libssh2 +, gtk-doc, gobjectIntrospection, libgit2, glib, python3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgit2-glib-${version}"; + version = "0.26.4"; + + src = fetchurl { + url = "mirror://gnome/sources/libgit2-glib/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0nhyqas110q7ingw97bvyjdb7v4dzch517dq8sn8c33s8910wqcp"; + }; + + postPatch = '' + for f in meson_vapi_link.py meson_python_compile.py; do + chmod +x $f + patchShebangs $f + done + ''; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgit2-glib"; attrPath = "gnome3.libgit2-glib"; }; + }; nativeBuildInputs = [ - gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection + meson ninja pkgconfig vala gtk-doc gobjectIntrospection + ]; + + propagatedBuildInputs = [ + # Required by libgit2-glib-1.0.pc + libgit2 glib ]; - buildInputs = [ libssh2 libgit2 glib ]; + buildInputs = [ + libssh2 + python3.pkgs.pygobject3 # this should really be a propagated input of python output + ]; meta = with stdenv.lib; { + description = "A glib wrapper library around the libgit2 git access library"; + homepage = https://wiki.gnome.org/Projects/Libgit2-glib; + license = licenses.lgpl21; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix deleted file mode 100644 index 00e747500c61aa5d84515f8ea6bd4d9a3093956b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgit2-glib-0.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.0.tar.xz; - sha256 = "06b16cfcc3a53d9804858618d690e5509e9af2e2245b75f0479cadbbe39745c3"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d777ec0baae50633a1d798187d64ffd683dc05cc --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3, libintlOrEmpty }: + +let + pname = "libgnome-games-support"; + version = "1.4.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1"; + }; + + nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty; + buildInputs = [ glib gtk3 libgee ]; + + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Small library intended for internal use by GNOME Games, but it may be used by others"; + homepage = https://wiki.gnome.org/Apps/Games; + license = licenses.lgpl3; + maintainers = gnome3.maintainers; + platforms = platforms.unix; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix index abdcdef99379442ebe7d72459a777deba4783efe..74a4cdca722e3ac8d43fa462d03877452d63e812 100644 --- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix +++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix @@ -1,18 +1,27 @@ { stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }: let - majorVersion = "1.9"; + pname = "libmediaart"; + version = "1.9.4"; in stdenv.mkDerivation rec { - name = "libmediaart-${majorVersion}.1"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz"; - sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gdk_pixbuf gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; + buildInputs = [ glib gdk_pixbuf ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; meta = with stdenv.lib; { description = "Library tasked with managing, extracting and handling media art caches"; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 63f59357db5e3df26cf73e074e1cf712e50620e6..82e56d3f96c418bef402cda25207c1913c58195c 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,37 +1,34 @@ { stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, - dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3, + dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook, glib, gobjectIntrospection, libpeas }: stdenv.mkDerivation rec { - version = "0.13.3"; + version = "0.13.4"; name = "gnome-shell-pomodoro-${version}"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; rev = "${version}"; - sha256 = "1hi4mdzyz2f8k19bkfzrrnavsbkr621w0bfpza8ij2yccpxz81h2"; + sha256 = "0fiql99nhj168wbfhvzrhfcm4c4569gikd2zaf10vzszdqjahrl1"; }; - configureScript = "./autogen.sh"; - nativeBuildInputs = [ - autoconf-archive libtool intltool appstream-glib - wrapGAppsHook pkgconfig + autoreconfHook vala autoconf-archive libtool intltool appstream-glib + wrapGAppsHook pkgconfig libxml2 ]; buildInputs = [ glib gobjectIntrospection libpeas - dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer + dbus-glib libcanberra gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3.gsettings_desktop_schemas - gnome3.gnome_common gnome3.gnome_shell gtk3 - gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas + gnome3.gnome-shell gtk3 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { - homepage = https://github.com/codito/gnome-shell-pomodoro; + homepage = http://gnomepomodoro.org/; description = "A time management utility for GNOME based on the pomodoro technique"; longDescription = '' This GNOME utility helps to manage time according to Pomodoro Technique. diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix new file mode 100644 index 0000000000000000000000000000000000000000..b7a6ce16d11f210d088be3926a267b44f62206ae --- /dev/null +++ b/pkgs/desktops/gnome-3/update.nix @@ -0,0 +1,11 @@ +{ lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }: +{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }: + +let + python = python3.withPackages (p: [ p.requests ]); +in writeScript "update-${packageName}" '' + set -o errexit + PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]} + latest_tag=$(python "${./find-latest-version.py}" "${packageName}" "${versionPolicy}" "stable") + update-source-version "${attrPath}" "$latest_tag" +'' diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 02f58f81200ec117264984c9eac12f78f56d1585..7920c8e1f4588b7d6a7b076121e25681da43a0fb 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -8,13 +8,13 @@ , libXmu }: let - version = "0.25.0"; + version = "0.26.2"; in gsmakeDerivation { name = "gnustep-back-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; - sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; + sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cairo base gui freetype x11 libXmu ]; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 4d9f763acc4e01288c14ccba237bc5ffced2b6e1..40c79274aae439c851cca228a21cd7c0821a9317 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -11,13 +11,13 @@ , pkgconfig, portaudio }: let - version = "1.24.9"; + version = "1.25.1"; in gsmakeDerivation { name = "gnustep-base-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; - sha256 = "1vvjlbqmlwr82b4pf8c62rxjgz475bmg0x2yd0bbkia6yvwhk585"; + sha256 = "17mnilg28by74wc08nkwp6gi06x3j2nrcf05wg64nrw5ljffp2zj"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/desktops/gnustep/gorm/default.nix index 5075ec5500c1438c9e5dafc049468253553d7267..9f1b0ef47fe5f752d130030bca3b09fa73cc1211 100644 --- a/pkgs/desktops/gnustep/gorm/default.nix +++ b/pkgs/desktops/gnustep/gorm/default.nix @@ -1,13 +1,13 @@ { fetchurl, base, back, gsmakeDerivation, gui }: let - version = "1.2.22"; + version = "1.2.23"; in gsmakeDerivation { name = "gorm-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; - sha256 = "1mq5n65xd9bc4kppx19iijsgpz4crvhg7bfwbi9k78j159vclnmi"; + sha256 = "18pf9vvzvdk8bg4lhjb96y1kdkmb9ahmvrqv2581vn45pjxmmlnb"; }; buildInputs = [ base back gui ]; diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix index a28fef8f3d999dd62e5a07fb882d0c7c400901c6..399bad2581f6890dc2edbd0e7d348e60ffe87cd2 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/desktops/gnustep/gui/default.nix @@ -1,12 +1,12 @@ { gsmakeDerivation, fetchurl, base }: let - version = "0.25.0"; + version = "0.26.2"; in gsmakeDerivation { name = "gnustep-gui-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz"; - sha256 = "10jf3xir59qzbhhl0bvs9wdw40fsmvv6mdv5akdkia1rnck60xf5"; + sha256 = "1dsbkifnjha3ghq8xx55bpsbbng0cjsni3yz71r7342ax2ixcvxc"; }; buildInputs = [ base ]; patches = [ ./fixup-all.patch ]; diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 62250586497111755043d17ef31b9737deaa7f60..6ef87cece4e45738dcf5dcce1518aa2a462bfb80 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, clang, which, libobjc }: let - version = "2.6.8"; + version = "2.7.0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; - sha256 = "0r00439f7vrggdwv60n8p626gnyymhq968i5x9ad2i4v6g8x4gk0"; + sha256 = "1khiygfkz0zhh9b5nybn40g0xnnjxchk24n49hff1bwanszir84h"; }; configureFlags = [ diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh index 71618ef960f9705ea88ca7280c8e750ef6a8111c..5313890111645a719d525750658400cba2d16d95 100644 --- a/pkgs/desktops/gnustep/make/setup-hook.sh +++ b/pkgs/desktops/gnustep/make/setup-hook.sh @@ -74,4 +74,4 @@ addEnvVars() { addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp" fi } -envHooks=(${envHooks[@]} addEnvVars) +addEnvHooks "$targetOffset" addEnvVars diff --git a/pkgs/desktops/kde-4.14/CVE-2014-8600.diff b/pkgs/desktops/kde-4.14/CVE-2014-8600.diff deleted file mode 100644 index 1fe26484605e69077da8464e5d4a6bc5d67902a9..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/CVE-2014-8600.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- a/kioslave/bookmarks/kio_bookmarks.cpp -+++ b/kioslave/bookmarks/kio_bookmarks.cpp -@@ -22,6 +22,7 @@ - #include - - #include -+#include - - #include - #include -@@ -197,7 +198,7 @@ - echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size")); - } else { - echoHead(); -- echo("

" + i18n("Wrong request: %1",path) + "

"); -+ echo("

" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "

"); - } - finished(); - } diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix deleted file mode 100644 index 02cd509537d1e301136946c706fbb130bc65cfd6..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3", kdelibs }: - -let - branch = "4.14"; - - # Need callPackageOrig to avoid infinite cycle - kde = callPackageOrig ./kde-package { - inherit release branch ignoreList extraSubpkgs callPackage; - }; - - # The list of igored individual modules - ignoreList = { - # Doesn't work yet - kdeutils = [ "ksecrets" ]; - # kdeadmin/strigi-analyzer has no real code - kdeadmin = [ "strigi-analyzer" ]; - # Most of kdebindings do not compile due to a bug in the buildsystem - kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ]; - }; - - # Extra subpackages in the manifest format - extraSubpkgs = {}; - -in - -kde.modules // kde.individual // -{ - akonadi = callPackage ./support/akonadi { }; - - inherit release; - - l10n = callPackage ./l10n { - inherit release branch; - inherit (kde.manifest) stable; - }; -} diff --git a/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch b/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch deleted file mode 100644 index cd19b7e2d72abdca9c29cc4423b1d7d496c86cef..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 7 Sep 2015 18:55:44 -0500 -Subject: [PATCH] ksysguard disable signalplottertest - ---- - libs/ksysguard/tests/CMakeLists.txt | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt -index d472fd7..f178b71 100644 ---- a/libs/ksysguard/tests/CMakeLists.txt -+++ b/libs/ksysguard/tests/CMakeLists.txt -@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB - set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp) - kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} ) - target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) -- -- --# KGraphicsSignalPlotter benchmark --set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp) --kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} ) --target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) -- -- --# KSignalPlotter unit test --set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp) --kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} ) --target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ) -- -- -- -- --- -2.5.0 - diff --git a/pkgs/desktops/kde-4.14/kactivities.nix b/pkgs/desktops/kde-4.14/kactivities.nix deleted file mode 100644 index dd14e0429ddb6a6893c52208fcd651162b6d90d9..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kactivities.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchurl, kde, kdelibs }: - -kde { - - src = fetchurl { - url = "mirror://kde/stable/4.13.3/src/kactivities-4.13.3.tar.xz"; - sha256 = "12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7"; - }; - - outputs = [ "out" "dev" ]; - - outputInclude = "out"; - - setOutputFlags = false; - - propagatedBuildInputs = [ kdelibs ]; - - meta = { - description = "KDE activities library and daemon"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix deleted file mode 100644 index df211f491993654f2d998a287824e972b4551794..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, kde, kdelibs, html-tidy, kactivities, libXt }: - -kde { - postPatch = '' - substituteInPlace konq-plugins/validators/tidy_validator.cpp \ - --replace buffio.h tidybuffio.h - ''; - - buildInputs = [ kdelibs html-tidy kactivities libXt ]; - - meta = { - description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; - license = stdenv.lib.licenses.gpl2; - }; -} 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 deleted file mode 100644 index 5d9e2401ca8242015dd5b26914495187305cc511..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix +++ /dev/null @@ -1,71 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";} - {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";} - {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";} - {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";} - {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";} - {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";} - {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";} - {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";} - {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";} - {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";} -]; -versions=builtins.listToAttrs[ - {name="baloo";value="4.14.3";} - {name="kactivities";value="4.13.3";} - {name="kde-baseapps";value="4.14.3";} - {name="kdepimlibs";value="4.14.3";} - {name="kde-runtime";value="4.14.3";} - {name="kfilemetadata";value="4.14.3";} - {name="libkcddb";value="4.14.3";} - {name="libkdcraw";value="4.14.3";} - {name="libkexiv2";value="4.14.3";} - {name="marble";value="4.14.3";} - {name="okular";value="4.14.3";} - {name="svgpart";value="4.14.3";} -]; -modules=[ -{ - module="kdemultimedia"; - split=true; - pkgs=[ - { name="libkcddb"; } - ]; -} -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdelibs"; - split=true; - pkgs=[ - { name = "baloo"; } - { name = "kfilemetadata"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="marble"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kde-baseapps"; sane="kde_baseapps"; } - ]; -} -{ module="kactivities"; split=false;} -{ module="kdepimlibs"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix deleted file mode 100644 index 94f878097dedd0f77f983757984e4fba92a18aea..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake_2_8, automoc4, perl, pkgconfig -, release, branch, ignoreList, extraSubpkgs -}: - -let - inherit (stdenv.lib) filter fold; - inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head; - cmake = cmake_2_8; -in -rec { - manifest = import (./. + "/${release}.nix"); - - # src attribute for $name tarball - kdesrc = name: version: fetchurl { - url = "mirror://kde/" + (if manifest.stable then "" else "un") - + "stable/${release}/src/${name}-${version}.tar.xz"; - sha256 = getAttr name manifest.hashes; - }; - - # Default meta attribute - defMeta = { - homepage = http://www.kde.org; - inherit branch; - platforms = stdenv.lib.platforms.linux; - inherit (qt4.meta) maintainers; - }; - - # KDE package built from the whole tarball - # This function is used both for monolithic modules and modules which are - # released as individual tarballs - kdeMonoPkg = name: - let n_ = name; v_ = getAttr name manifest.versions; in - a@{meta, name ? n_, version ? v_, nativeBuildInputs ? [], ...}: - stdenv.mkDerivation ({ - name = "${name}-${version}"; - src = kdesrc name version; - nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ]; - meta = defMeta // meta; - enableParallelBuilding = true; - } // (removeAttrs a [ "meta" "name" "nativeBuildInputs" ])); - - # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs - # API. - kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; - - # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz - kdeSubdirPkg = module: - {name, subdir ? name, sane ? name}: - let name_ = name; version_ = getAttr module manifest.versions; in - a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, nativeBuildInputs ? [], ...}: - stdenv.mkDerivation ({ - name = "${name}-${release}"; - src = kdesrc module version; - nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ]; - cmakeFlags = - [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" - "-DBUILD_doc=TRUE" - "-DBUILD_${subdir}=TRUE" - ] ++ cmakeFlags; - meta = defMeta // meta; - enableParallelBuilding = module.enableParallelBuilding or true; - } // (removeAttrs a [ "meta" "name" "cmakeFlags" "nativeBuildInputs" ])); - - # A KDE monolithic module - kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; - - # Combine packages in one module. - # Arguments: - # * pkgFun --- a function of the following signature: - # module: manifest_attrs: manual_attrs: derivation; - # * module --- name of the module - # * pkgs --- list of packages in manifest format - combinePkgs = pkgFun: module: pkgs: - let - f = p@{name, ...}: - callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; }; - list = map f pkgs; - attrs = listToAttrs (map - ({name, sane ? name, ...}@p: { name = sane; value = f p; }) - pkgs); - in - runCommand "${module}-${release}" - ({passthru = attrs // { - propagatedUserEnvPackages = list; - projects = attrs; - };}) - '' - mkdir -pv $out/nix-support - printWords ${toString list} | tee $out/nix-support/propagated-user-env-packages - ''; - - # Given manifest module data, return the module - kdeModule = { module, sane ? module, split, pkgs ? [] }: - let - pkgs_ = filterPkgs module pkgs; - in - # Module is splitted by upstream - if split then combinePkgs kdeSplittedPkg module pkgs_ - # Monolithic module - else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix") - # Module is splitted by us - else combinePkgs kdeSubdirPkg module pkgs_; - - # The same, as nameValuePair with sane name - kdeModuleNV = a@{ module, sane ? module, ... }: - { name = sane; value = kdeModule a; }; - - filterPkgs = module: (p: - removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p - ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs)); - - # Remove attrsets with x.name in subst. Optimized for empty subst. - removeNames = subst: big: - fold (s: out: filter (x: x.name != s) out) big subst; - - allModules = listToAttrs (map kdeModuleNV manifest.modules); - - modules = - let unsplit = filter (a: ! (a ? pkgs)) manifest.modules; - in listToAttrs (map kdeModuleNV unsplit); - - splittedModuleList = - let - splitted = filter (a: a ? pkgs) manifest.modules; - names = map ({module, sane ? module, ...}: sane) splitted; - in - map (m: m.projects) (stdenv.lib.attrVals names allModules); - - individual = - stdenv.lib.zipAttrsWith - ( - name: list: - if tail list == [] - then head list - else abort "Multiple modules define ${name}" - ) - splittedModuleList; -} diff --git a/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh deleted file mode 100755 index 1da7bc810c3249a7a6b0547a5b1565c51e5469bf..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh +++ /dev/null @@ -1,173 +0,0 @@ -#! /bin/sh - -# Usage: download kde release to $dir, then run -# $0 $dir - -dir="$1" - - -if [[ -z $(type -p xsltproc) ]]; then - echo "Please provide libxslt" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kdelibs-*.tar.xz | \ - sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//') - -# Detect release number & whether it is a stable release -if [[ $? -ne 0 || -z $release ]]; then - echo "'${dir}' is not a directory (or kdelibs...tar.xz doesn't exist)!" >&2 - exit 1 -fi - -if [[ ${release##*.} -gt 50 ]]; then - stable="false" -else - stable="true" -fi - -echo "Detected release ${release}" >&2 - -declare -A hash -declare -A version -declare -A modules -declare -a packages -declare -a top_level - -if [[ ! -f ${dir}/kde_projects.xml ]]; then - if ! curl -o "${dir}/kde_projects.xml" -J http://projects.kde.org/kde_projects.xml; then - echo "Could not download http://projects.kde.org/kde_projects.xml to ${dir}/kde_projects.xml" >&2 - exit 1 - fi -fi -# xsltproc output declares -A module -eval `xsltproc kde-submodules.xslt ${dir}/kde_projects.xml` - -module[kde-baseapps]=kde-baseapps -unset module[kactivities] - -print_sane() { - echo "Called print_sane $1" >&2 - sane="${1//[^a-z0-9_]/_}" - if [[ "$sane" != "$1" ]]; then - echo "Sane version is $sane" >&2 - echo -n "sane=\"$sane\";" - fi -} - -for i in `cd "${dir}"; ls *.tar.xz`; do - package=${i%.tar.xz} - v=${package##*-} - package=${i%-*} - packages+=( "$package" ) - echo -n "${package}.. " >&2 - hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo -n ${hash[$package]} >&2 - - version[$package]=$v - - if [ -n "${module[$package]}" ]; then - m="${module[$package]}" - echo " (${m})" >&2 - modules[$m]=1 - else - top_level+=( "$package" ) - echo " (top-level)" >&2 - fi - nix-store --add-fixed sha256 "${dir}/${i}" >&2 -done - - -print_pkg_hash() { - echo " {name=\"${1}\";value=\"${hash[$1]}\";}" -} - -print_pkg_version() { - echo " {name=\"${1}\";value=\"${version[$1]}\";}" -} - -print_hashes(){ - echo "hashes=builtins.listToAttrs[" - for p in "${packages[@]}"; do print_pkg_hash "$p"; done - echo "];" -} - -print_versions(){ - echo "versions=builtins.listToAttrs[" - for p in "${packages[@]}"; do print_pkg_version "$p"; done - echo "];" -} - -print_split_module(){ - echo -n "$1:" >&2 - echo -e "{\n module=\"$1\";" - print_sane "$1" - echo " split=true;" - echo " pkgs=[" - for p in "${packages[@]}"; do - if [[ "${module[$p]}" == "$1" ]]; then - echo -n " { name=\"$p\"; " - print_sane "$p" - echo " }" - echo -n " $p" >&2 - fi - done - echo " ];" - echo "}" - echo >&2 -} - -print_mono_module(){ - echo -en "{ module=\"$1\"; " - print_sane "$1" - echo -n "$1 ... " >&2 - pkg=$(cd "$dir"; echo "$1"-*.tar.xz) - pkg="${pkg%.tar.xz}" - echo -n " split=false;" - cml="$pkg/CMakeLists.txt" - tar -xf "${dir}/$pkg.tar.xz" "$cml" - if grep '^[^#]*add_subdirectory' $cml >/dev/null; then - if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then - echo " is monolithic (has unconditionally added subdirs)" >&2 - else - subdirs=( `grep '^[^#]*add_subdirectory' $cml | - sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' | - grep -v '\(doc\|cmake\)'` ) - echo " seems splittable, subdirs: ${subdirs[*]}" >&2 - echo -e "\n pkgs=[" - for s in "${subdirs[@]}"; do - echo -en " {" - echo -n " name=\"${s//\//-}\"; " - print_sane "$s" - if [[ $s != "${s//\//-}" ]]; then - echo -n "subdir=\"$s\"; " - fi - echo "}" - done - echo -e " ];\n" - fi - else - echo " is monolithic (has no subdirs)" >&2 - fi - rm $cml - rmdir "$pkg" - echo "}" -} - -print_modules(){ - echo "modules=[" - echo "Printing modules splitted by upstream" >&2 - for m in "${!modules[@]}"; do print_split_module "$m"; done - echo >&2 - echo "Printing modules not splitted by upstream (${top_level[*]})" >&2 - for m in "${top_level[@]}"; do print_mono_module "$m"; done - echo "];" -} - -echo "Writing ${release}.nix" >&2 -exec > "${release}.nix" -echo "{stable=${stable};" -print_hashes -print_versions -print_modules -echo "}" diff --git a/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt deleted file mode 100644 index 952a05a9d2744f483b338654578ef6e3d3bfc817..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - declare -A module - - - - module[" - - "]=" - - " - - - - - diff --git a/pkgs/desktops/kde-4.14/kdeedu/marble.nix b/pkgs/desktops/kde-4.14/kdeedu/marble.nix deleted file mode 100644 index 2dc07d14a0d966e3dd50f62ad2a7d1ca8465ec65..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/marble.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, gpsd }: - -kde { - -# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip - - buildInputs = [ kdelibs gpsd ]; - - meta = { - description = "Marble Virtual Globe"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix deleted file mode 100644 index 18697e13b66c063ecbcfd88bd07b6f2890278546..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }: - -kde { - - buildInputs = [ kdelibs libraw lcms2 ]; - - meta = { - description = "Library for decoding RAW images"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix deleted file mode 100644 index 46ec45fad01a7b00283e9bb21d967b4403473721..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, exiv2 }: - -kde { - buildInputs = [ kdelibs exiv2 ]; - - meta = { - description = "Exiv2 support library"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix deleted file mode 100644 index de7b77999936f29157edaa50cd729897449257ee..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, poppler_qt4, qca2 -, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }: - -kde { - -# TODO: package activeapp, qmobipocket - - buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre poppler_qt4 - qca2 qimageblitz libtiff kactivities libkexiv2 ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Okular, the KDE document viewer"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix deleted file mode 100644 index 2fc0e373dbdfb674b972d3f022789f2579fb80f6..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "SVG KPart"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix deleted file mode 100644 index 8883c03274df5ac86a1b274d54e8b65f446108a7..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata, boost -}: - -kde { - -# TODO: qmobipocket - - buildInputs = [ - kdelibs kdepimlibs xapian qjson akonadi kfilemetadata boost - ]; - - nativeBuildInputs = [ pkgconfig doxygen ]; - - meta = { - description = "Baloo"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix deleted file mode 100644 index 6068516ba2b291727890c4021f873c7a4d6e5e61..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, kde, kdelibs, pkgconfig, doxygen, poppler_qt4, taglib, exiv2, ffmpeg }: - -kde { - buildInputs = [ - kdelibs poppler_qt4 taglib exiv2 ffmpeg - ]; - - nativeBuildInputs = [ pkgconfig doxygen ]; - - meta = { - description = "KFileMetaData"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix deleted file mode 100644 index 66b0cfe869f60a453572054dfdf41c2ac99be7a0..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { -#todo: libmusicbrainz5 - buildInputs = [ kdelibs ]; - meta = { - description = "A library used to retrieve audio CD meta data from the internet"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix deleted file mode 100644 index 1f412d3c766ea4f29884740f30796105b88675e3..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison -, kdelibs, akonadi, libxslt -, shared_mime_info, shared_desktop_ontologies, qjson -, automoc4, cmake_2_8, perl -}: - -kde { - outputs = [ "out" "dev" ]; - - outputInclude = "out"; - - setOutputFlags = false; - - nativeBuildInputs = [ automoc4 cmake_2_8 perl pkgconfig ]; - - cmakeFlags = [ - "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3" - ]; - - buildInputs = - [ boost gpgme libical libxslt qjson prison - openldap cyrus_sasl akonadi shared_desktop_ontologies - shared_mime_info - ]; - - propagatedBuildInputs = [ kdelibs ]; - - # Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev. - postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake"; - - meta = { - description = "KDE PIM libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.14/l10n/default.nix b/pkgs/desktops/kde-4.14/l10n/default.nix deleted file mode 100644 index b4c272cb328ec73869484a12689d65ab64d54d7f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/l10n/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, kdelibs, gettext, release, branch, stable -}: - -let - - inherit (stdenv.lib) attrByPath singleton; - - kdeL10nDerivation = - { lang, saneName, sha256 }: - - stdenv.mkDerivation rec { - name = "kde-l10n-${saneName}-${release}"; - - src = fetchurl { - url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz"; - name = "${name}.tar.xz"; - inherit sha256; - }; - - buildInputs = [ gettext kdelibs ]; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - - cmakeFlags = [ - "-Wno-dev" - ]; - - meta = { - description = "KDE translation for ${lang}"; - inherit branch; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; - inherit (kdelibs.meta) maintainers homepage; - }; - }; - - kdeL10nRelease = - builtins.listToAttrs ( - map ({lang, saneName, sha256}: - { - name = saneName; - value = kdeL10nDerivation { inherit lang saneName sha256; }; - } - ) (import (./manifest + "-${release}.nix")) - ); - -in -{ - inherit kdeL10nDerivation; - recurseForDerivations = true; -} // kdeL10nRelease diff --git a/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh deleted file mode 100755 index ec159a1e2047b91845c9afb1ded0d3671eb0e1b3..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# Usage: download kde-l10n to $dir, then run -# $0 $dir - -dir=$1 - -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \ - sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//') - -echo "Detected release ${release}" >&2 - -exec > "manifest-${release}.nix" -echo "[" -for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do - lang=${i%-${release}.tar.xz} - lang=${lang#kde-l10n-} - echo -n "${lang}.. " >&2 - hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo "{" - echo " lang = \"${lang}\";" - echo " saneName = \"$(echo $lang | sed s^@^_^g)\";" - echo " sha256 = \"${hash}\";" - echo "}" - echo $hash >&2 -done -echo "]" diff --git a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix deleted file mode 100644 index a6d48ae51bf268c1bbf423440029a214c7f46e19..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix +++ /dev/null @@ -1,267 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "1amzzwa4zhwm0r1b1fdi0fjp883wpbjh12wn9q42g04xzza6nq04"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "1x1yx6lw86bwv2d7lcfb061k1pqgqw6abqwrga7pnzfmk2fcaawb"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "148195dk6wmymk6jib467a10w9jajh3bmx1igxl29l7vp33xpgng"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "04bgjfwr5pwn79lh3wixajswmccfcqll5dnjhf84zw7p09138m0v"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "0p257jjilkmjrq9ddvwfdh41911b2yrcrid1j31g7gg9gp7iriq4"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "0kjn9pq9p8bfja6ca4pcpqgli9k1mfyh77j6i8p28i37wfmgv0cn"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "1w0ylqnxkbqz6camk8045nrxpz1n4dbz8cgl559l31m7zacq1rmb"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "0i97h1jcm8lpv3pap7wiz8nvjwf00jav5z5ymsbklagvmbmwyfyk"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "1br19741hmn08g3vzmx8dilx2kdfbg5zv1rjxnigdfwi0zphqyw9"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "1flp57prc12ri2rhh6vwf6hb5mqj8w1sj94pnji02ylmkghcc466"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "0waccr5mih5nv4q31k6xn07iws2by8n67riij6k9nsfsrlrxv21g"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "1bqd4jaws8890r2zjzpf6pw1k9v7h2lr7xk1dzfs8ak7gny32fm9"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "0q4cac4vp1s7fda328xxyzhqll0iqinn5v9syb93xfj29kij4ja2"; -} -{ - lang = "fa"; - saneName = "fa"; - sha256 = "0avabmdm9bxyb5b5d0mrv8mmwp6j1r4ch7y0ab7b4zl380blw7d3"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0lk0r03r2wmqpf8n9zvwpsbl7s11dipa8kc3lmkh1yrjk8c4z2sw"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "1gzwc6yj7x7x3jx0270ap5nf70ckl25lqccrxiyzwx3mqfxgfbx2"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "0bkf62cqj4rfgz81yj9jspv5jfa932hsyhk4kq0r2hqsm8gndddd"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "00m4m480fqls5i1cvdidkq3nb8xzqhgyqqp0zk3j3qybxfq98yg5"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "1488lk7jniv0hj77wcfxplxw10srp3df6lv6llss8b5m3yqb061a"; -} -{ - lang = "hi"; - saneName = "hi"; - sha256 = "16ni7257b1ch0wabncvq17569c57ncz7pzqgqm830bj8ldpk9zzv"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "1si90cnwjsvw553pmppb0aakfk7fan2jk44ag0j191kdiir2b3xk"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "1x2s2cd521ffp5azzrzq2w2cr4sjz6gpg1a1h9jg4749xwqfhc1a"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "1ybaihygv0lviw6bq3a6ki40glgs49gsk29abq4y95bi9ymlrryc"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "1s8zliwc737avc04n2l27rhhh9isz9ag81nsajai27yxif0ncn7x"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "1x2mag8jwlmbh8v8y3rmvp9n69sv2xfwwsxw7c9vb8qg4cybax1c"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "1ng2hzrbvcak3nhbmlb3h64a15h34zfrgabzwrjvi2b0fv8liycw"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "01klhf9bmha9x6s39r4wnd0hxn35jg5bh7h9rwqij3nf06rddfrj"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "149fi65z1x64svs00rn82njmw6l0pncgs4b5d66fb18ah3bjlfg2"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "17hjv0gi2fqa5gkjgmqkxb4k7z3zizrxax6inq8s03g4f2vfibaz"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "19yhacc0v5grxc35bmks9r4qy091qij26yfi2qvs3rca7cc374jp"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "0y0nkvqidc12paf8ghk4p6z213gxcyv27nvglk120l2602980idj"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "0msw54v8d9p08c7prw6m20w29qf8f0yb32s378knhsql6abv5gln"; -} -{ - lang = "mr"; - saneName = "mr"; - sha256 = "05kcm7x7jj4lppn6fd1jlzl37r3gs9wrz0cckwpscc2m6y2g7p55"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "0wsdr8yyjjik2h30xy7y38i5hagy4jya98cqjbcrrab35i677l9a"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "0lr5z1r8v3fkqpkcjvnml2s9jh50wmqsqiyls9ivr46ygwm8wcbq"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "09w8cniq3z11900axjcdlm24jbzjjsqcpdwpvhvc9z78hfsjqp36"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "1b304wg1143pk7ib8k451g2riq87c1h0611khslghy428q4rviwd"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "02y56ld5hiywph88khh55hqg0gpcvmqcqrbpsidzx3qdgh5j40nl"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "137mfrr7wza2pg4yzqqi93bsmsrjvj0ar27gi3lk1qh6zniwyjai"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "1zb454rg4pigkldg9jp97r2r7k8azwxbal77zscky2q6rbw0sjcn"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "1zrn09k99pfscnc5zyxh1jzyrbirhy8ilwacbgg913maaanjprny"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "1lkr14if7jmfcxmb10pf11a6xjxxqxrq45lwdx19kj3djgr5l4pc"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "1ldf4y9wck339n0jq8x43x9h57jvfg3qk0spfv9d5fw9qyxygwwi"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "1n4qjwvpkddwizl8k3gr1xwv8icwd6lqsg09cypax049g3q2sy4p"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "1k111r9ssprgali6sg3wpbvp635hb56ckmcgpdhyvk6bbkcbnbmr"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "0pini77jlnrv2fhl0j99wjxylwlj77bihcbfvnkf5bganffgwc11"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "0ykxy95a4q0pp5ibmw20ckg33b3h89g2m86p6fcfnqf6350nxs2v"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "15vcfpyc30ia6bsjgwv3zhydv2nlnmggr8i2yjpnb5dlynn3sywh"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "0qhzfbd3j0d7grg4ghzn7y5vrl031iz9krifv7dv6jgp68fzz1h0"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "03n2myhwx9lvm1vzqvrg2sgl3y1m0rrrskqa22m06fjmh4vxawhx"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "11b7gyy31n2zfhkaj304pd4lkr14sp1sgi4pzv86c824sr6lp01v"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "1r5gxadd94ckdpkwcchwa8k735g2y9x7bi6px6hm7qlxdbi9sjmq"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "04bvvb3na4arns483fz27npjs045hf3s53p2rkd2nvq9gwvn0kmi"; -} -] diff --git a/pkgs/desktops/kde-4.14/support/akonadi/default.nix b/pkgs/desktops/kde-4.14/support/akonadi/default.nix deleted file mode 100644 index ecfb4913a4290a35726ecad52d32eaef248cfbc0..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.14/support/akonadi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite, pkgconfig }: - -stdenv.mkDerivation rec { - name = "akonadi-1.13.0"; - - src = fetchurl { - url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2"; - }; - - buildInputs = [ qt4 soprano libxslt boost sqlite ]; - - nativeBuildInputs = [ cmake automoc4 shared_mime_info pkgconfig ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "KDE PIM Storage Service"; - license = "LGPL"; - homepage = http://pim.kde.org/akonadi; - maintainers = [ maintainers.sander maintainers.phreedom ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 77b47533d537d0740de1ee16756f3ae9b8803281..7563e3447504a1343d7acbb05c878c6923fd44e5 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,34 +1,38 @@ -{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx, - xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools +{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, + numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, + qttools, poppler_qt5, wrapGAppsHook }: stdenv.mkDerivation rec { name = "lumina-${version}"; - version = "1.3.0"; + version = "1.4.0-p1"; src = fetchFromGitHub { owner = "trueos"; repo = "lumina"; rev = "v${version}"; - sha256 = "13kwlhv2qscrn52xvx0n1sqbl96fkcb5r1ixa0wazflx8dfl9ndn"; + sha256 = "0jin0a2s6pjbpw7w1bz67dgqp0xlpw1a7nh8zv0qwdf954zczanp"; }; nativeBuildInputs = [ qmake qttools + wrapGAppsHook ]; buildInputs = [ xorg.libxcb + xorg.libXdamage xorg.xcbutilwm xorg.xcbutilimage qtbase qtsvg qtmultimedia qtx11extras + poppler_qt5 fluxbox xscreensaver - desktop_file_utils + desktop-file-utils numlockx ]; @@ -44,12 +48,24 @@ stdenv.mkDerivation rec { ''; postPatch = '' + # Fix location of poppler-qt5.h + substituteInPlace src-qt5/desktop-utils/lumina-pdf/mainUI.h \ + --replace '#include ' '#include ' + + # Fix plugin dir + substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + # Fix location of fluxbox styles substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \ --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" ''; - qmakeFlags = [ "LINUX_DISTRO=NixOS" "CONFIG+=WITH_I18N" ]; + qmakeFlags = [ + "LINUX_DISTRO=NixOS" + "CONFIG+=WITH_I18N" + "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index aece5fefaecf3cc322b13e53eb5f029356803dec..c06a99eb36c2764d82a3e6cf4d724fab408c9472 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight program for configuring the theme and fonts of gtk applications"; - homepage = http://lxde.org/; + homepage = https://lxde.org/; maintainers = [ stdenv.lib.maintainers.hinton ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index b17ab4fda659e7206eca459be5ec665c73298a0c..6e8644b19b0cd1340221f777b5950befb7a5bbbd 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool ]; meta = { - homepage = http://lxde.org/; + homepage = https://lxde.org/; license = stdenv.lib.licenses.gpl2; description = "Freedesktop.org desktop menus for LXDE"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 1225f425b263cc5c04542d1b7c69ee8ad72bfd46..af9570a2c733ad63a7c71ca0c76ff301231b8566 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight X11 desktop panel for LXDE"; - homepage = http://lxde.org/; + homepage = https://lxde.org/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ryneeverett ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index ef95f6035b27a2b4435c2ad16b2631190aba7f4f..dbed065190e66fcd390579ea09ec0e264334006e 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - + buildInputs = [ gtk3 ]; configureFlags = [ "--enable-gtk3" ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + meta = { description = "Lightweight and desktop independent task manager"; longDescription = '' @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { Desktop Environment, it's totally desktop independent and only requires pure gtk+. ''; - homepage = https://wiki.lxde.org/en/LXTask; + homepage = https://wiki.lxde.org/en/LXTask; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix index 966566db7c8d9b362f279f9f32ec61cdd0e2d2a7..7938e4fd9a17ddefc06b537fe90b76af2c29d86a 100644 --- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ qt5.qtbase qt5.qtsvg ]; preConfigure = '' - cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + cmakeFlagsArray+=( + "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index 77a49410bb608019c2ac47994ab69ec260efa337..9a8e6e7a5ca9309638429ccf296a4cdd479e562d 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -4,7 +4,7 @@ qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data, pcre + lxmenu-data, pcre, libXdamage }: stdenv.mkDerivation rec { @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { menu-cache lxmenu-data pcre + libXdamage ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix index e3cb02e8b8afed921d032e7b13fa483c9a360441..c40b9c4e9f94f6bf90ef965e0818c61f654e5a7e 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { xorg.libXdmcp xorg.libSM openbox - hicolor_icon_theme + hicolor-icon-theme ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix index 04b0cd3e6ac6b9a7b89615eb30745b2bdd9aca9f..e09c8bc09d50ee99aff307a5df981b6d7d312407 100644 --- a/pkgs/desktops/lxqt/optional/qlipper/default.nix +++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qlipper"; - version = "5.0.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "pvanek"; repo = pname; rev = version; - sha256 = "1y34vadxxjg2l7021y1rpvb8x6pzhk2sk9p35wfm9inilwi8bg8j"; + sha256 = "0vlm4ab9isi7i2bimnyrk6083j2dfdrs14qj59vjcjri7mcwmf76"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 5b02c6ad117f6b210f63aa1e481e3ed9eda1603a..05b9d966fc4367017678f08579a2ce60297da047 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "atril-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.19"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0v829yvr738y5s2knyvimcgqv351qzb0rpw5il19qc27rbzyri1r"; + url = "https://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1639jxcdhcn5wvb4gj9xncdj5d5c3rnyydwwsgqj66cmfmb53l1n"; }; nativeBuildInputs = [ @@ -23,12 +21,13 @@ stdenv.mkDerivation rec { libsecret libxml2 poppler - hicolor_icon_theme + mate.caja mate.mate-desktop + hicolor-icon-theme ]; - - configureFlags = [ "--disable-caja" ]; + makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; + meta = { description = "A simple multi-page document viewer for the MATE desktop"; homepage = http://mate-desktop.org; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f84fe2fef2eb1937fabc0f26bfed97a24e040eda --- /dev/null +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, mate, pythonPackages }: + +stdenv.mkDerivation rec { + name = "caja-dropbox-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0xjqcfi5n6hsfyw77blplkn30as0slkfzngxid1n6z7jz5yjq7vj"; + }; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + gtk3 + mate.caja + pythonPackages.python + pythonPackages.pygtk + pythonPackages.docutils + ]; + + configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ]; + + meta = with stdenv.lib; { + description = "Dropbox extension for Caja file manager"; + homepage = https://github.com/mate-desktop/caja-dropbox; + license = with licenses; [ gpl3 cc-by-nd-30 ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index ab2831159f90fef3fc6fff59ddd62b940160157c..3383847f16c61c56392912b2820008a31eb55331 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-extensions-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0hgala7zkfsa60jflq3s4n9yd11dhfdcla40l83cmgc3r1az7cmw"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1abi7s31mx7v8x0f747bmb3s8hrv8fv007pflv2n545yvn0m1dpj"; }; nativeBuildInputs = [ pkgconfig intltool + wrapGAppsHook ]; buildInputs = [ gtk3 - dbus_glib + dbus-glib gupnp mate.caja mate.mate-desktop diff --git a/pkgs/desktops/mate/caja/cajaWithExtensions.nix b/pkgs/desktops/mate/caja/cajaWithExtensions.nix deleted file mode 100644 index cb315d7f09a23533d8285759610cf90808dabfe2..0000000000000000000000000000000000000000 --- a/pkgs/desktops/mate/caja/cajaWithExtensions.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ buildEnv, makeWrapper, caja, extensions ? [] }: - -buildEnv { - name = "cajaWithExtensions-${caja.version}"; - meta = caja.meta // { description = "File manager (including extensions) for the MATE desktop"; }; - paths = [ caja ] ++ extensions; - buildInputs = [ makeWrapper ]; - postBuild = '' - wrapProgram "$out/bin/caja" --set CAJA_EXTENSION_DIRS "$out/lib/caja/extensions-2.0" - ''; -} diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 8f38a5ef7e69ae3b91ee8ac8c00f35693729d96d..9643c9a341647d99a4cf28279fcb650d86959349 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "3"; + version = "1.21.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0v8zx5rzqh1zkwizkpdckmwm6004cv9sbjghzgz3049xzcqm371g"; }; nativeBuildInputs = [ @@ -24,6 +22,7 @@ stdenv.mkDerivation rec { libexif exempi mate.mate-desktop + hicolor-icon-theme ]; patches = [ diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index dd7d8c5dbb260c11fedb2207f39714ba296b4525..7441a8f73ae7f24f540ca0d5547d2b3b8a1c3181 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -5,32 +5,48 @@ let self = rec { + getRelease = version: + pkgs.stdenv.lib.concatStringsSep "." (pkgs.stdenv.lib.take 2 (pkgs.stdenv.lib.splitString "." version)); + atril = callPackage ./atril { }; caja = callPackage ./caja { }; + caja-dropbox = callPackage ./caja-dropbox { }; caja-extensions = callPackage ./caja-extensions { }; - cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix { - extensions = [ caja-extensions ]; - }; engrampa = callPackage ./engrampa { }; eom = callPackage ./eom { }; libmatekbd = callPackage ./libmatekbd { }; libmatemixer = callPackage ./libmatemixer { }; libmateweather = callPackage ./libmateweather { }; marco = callPackage ./marco { }; + mate-applets = callPackage ./mate-applets { }; + mate-backgrounds = callPackage ./mate-backgrounds { }; + mate-calc = callPackage ./mate-calc { }; mate-common = callPackage ./mate-common { }; mate-control-center = callPackage ./mate-control-center { }; mate-desktop = callPackage ./mate-desktop { }; mate-icon-theme = callPackage ./mate-icon-theme { }; mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { }; + mate-indicator-applet = callPackage ./mate-indicator-applet { }; + mate-media = callPackage ./mate-media { }; mate-menus = callPackage ./mate-menus { }; + mate-netbook = callPackage ./mate-netbook { }; mate-notification-daemon = callPackage ./mate-notification-daemon { }; mate-panel = callPackage ./mate-panel { }; + mate-polkit = callPackage ./mate-polkit { }; mate-power-manager = callPackage ./mate-power-manager { }; + mate-sensors-applet = callPackage ./mate-sensors-applet { }; mate-session-manager = callPackage ./mate-session-manager { }; mate-settings-daemon = callPackage ./mate-settings-daemon { }; + mate-screensaver = callPackage ./mate-screensaver { }; + mate-system-monitor = callPackage ./mate-system-monitor { }; mate-terminal = callPackage ./mate-terminal { }; mate-themes = callPackage ./mate-themes { }; + mate-user-guide = callPackage ./mate-user-guide { }; + mate-user-share = callPackage ./mate-user-share { }; + mate-utils = callPackage ./mate-utils { }; + mozo = callPackage ./mozo { }; pluma = callPackage ./pluma { }; + python-caja = callPackage ./python-caja { }; basePackages = [ caja @@ -45,6 +61,7 @@ let mate-menus mate-notification-daemon mate-panel + mate-polkit mate-session-manager mate-settings-daemon mate-themes @@ -52,12 +69,25 @@ let extraPackages = [ atril - cajaWithExtensions + caja-extensions engrampa eom + mate-applets + mate-backgrounds + mate-calc mate-icon-theme-faenza + mate-indicator-applet + mate-media + mate-netbook mate-power-manager + mate-screensaver + mate-sensors-applet + mate-system-monitor mate-terminal + mate-user-guide + # mate-user-share + mate-utils + mozo pluma ]; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 02689082989040e6c2a170558b65664be21193d7..74d32ce1f216b1ee3fbf146eff7148658e77d750 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "engrampa-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0d98zhqqc7qdnxcf0195kd04xmhijc0w2qrn6q61zd0daiswnv98"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1pk053i14a0r5s9qkipwnp4qjg76b763203z64ymnpkslrrarnnm"; }; nativeBuildInputs = [ @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { libxml2 gnome3.gtk mate.caja - hicolor_icon_theme + hicolor-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index c7651e1b5be8665a6bd506443597452732a6f8c8..23e167412919dcb321019e51f97ae6474f45fb94 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,36 +1,34 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "eom-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "00ns7g7qykakc89lijrw2vwy9x9ijqiyvmnd4sw0j6py90zs8m87"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0320ph6cyh0m4cfyvky10j9prk2hry6rpm4jzgcn7ig03dnj4y0s"; }; nativeBuildInputs = [ pkgconfig intltool itstool - hicolor_icon_theme wrapGAppsHook ]; buildInputs = [ - dbus_glib + dbus-glib exempi lcms2 libexif libjpeg librsvg libxml2 - shared_mime_info + shared-mime-info gnome3.gtk gnome3.libpeas mate.mate-desktop + hicolor-icon-theme ]; meta = { diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index a02f605b470c4ed2f12024cee7565cd260a1d781..fb7a8308ee5faea7a7f49f5b740aedf84ff28084 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, libxklavier }: stdenv.mkDerivation rec { name = "libmatekbd-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "030bl18qbjm7l92bp1bhs7v82bp8j3mv7c1j1a4gd89iz4611pq3"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1d80xnbb8w51cv9cziybdxca037lksqkc5bd8wqlyb2p79z77426"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 20cf71c7554d42e5a27a9ca926f5c41a78ea08c1..10a690546f7661aeb5d8864a7eab3840f846091b 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib +{ stdenv, fetchurl, pkgconfig, intltool, glib, mate , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio , ossSupport ? false @@ -6,13 +6,11 @@ stdenv.mkDerivation rec { name = "libmatemixer-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "09vyxnlnalws318gsafdfi5c6jwpp92pbafn1ddlqqds23ihk4mr"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0jpfaqbspn2mjv6ysgzdmzhb07gx61yiiiwmrw94qymld2igrzb5"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 4d7c9dd61d6df61a224fa9a85f7a1e9ccd290edb..7efad3a5e3ae8bd62b3b9d1e3b153f8cb7301c5e 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata, mate }: stdenv.mkDerivation rec { name = "libmateweather-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0z6vfh42fv9rqjrraqfpf6h9nd9h662bxy3l3r48j19xvxrwmx3a"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1c8mvydb0h7z3zn0qahwlp15z5wl6nrv24q4z7ldhm340jnxsvh7"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 1846bccacefb46e9b73f6a2700f0d8b40228fde2..42c74aa1173d3e1a01bc50d35ff581b9c13d6e64 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "marco-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0lwbp9wyd66hl5d7g272l8g3k1pb9s4s2p9fb04750a58w87d8k5"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1qnx47aibvl00qaf1jik457cwncxb71pf5pd1m3gdg7ky61ljkm4"; }; nativeBuildInputs = [ @@ -20,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - libcanberra_gtk3 + libcanberra-gtk3 libgtop gnome2.startup_notification gnome3.gtk diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b9f9e0ece35db085efdd863877dae09bd03bca0b --- /dev/null +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus-glib, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-applets-${version}"; + version = "1.20.1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1a119g49sr7jrd8i32bw7sn2qlsg3sdiwqdb2v36bm2999j261wc"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.gtk + gnome3.gtksourceview + gnome3.gucharmap + libwnck3 + libgtop + libxml2 + libnotify + polkit + upower + wirelesstools + mate.libmateweather + mate.mate-panel + hicolor-icon-theme + ]; + + configureFlags = [ "--enable-suid=no" ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + meta = with stdenv.lib; { + description = "Applets for use with the MATE panel"; + homepage = http://mate-desktop.org; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..79a322ccb0a5ba62fff6a3dc9dd9b8fb08812288 --- /dev/null +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, intltool, mate }: + +stdenv.mkDerivation rec { + name = "mate-backgrounds-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0pcnjcw00y8hf2bwfrb5sbk2511cbg4fr8vgvgqswcwjp9y15cjp"; + }; + + nativeBuildInputs = [ intltool ]; + + meta = with stdenv.lib; { + description = "Background images and data for MATE"; + homepage = http://mate-desktop.org; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7e501fcf379b1d0489250896e96454e50c166376 --- /dev/null +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-calc-${version}"; + version = "1.20.1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "00k063ia4dclvcpg1q733lbi56533s6mj8bgb1nrgna6y7zw4q87"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libxml2 + ]; + + meta = with stdenv.lib; { + description = "Calculator for the MATE desktop"; + homepage = http://mate-desktop.org; + license = [ licenses.gpl2Plus ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index a433104b1fa7d5a40af2aeed37b177835f1b7c10..63adb1849dac840f19035e5e4b3bd40abbe60727 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, mate }: stdenv.mkDerivation rec { name = "mate-common-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1005laf3z1h8qczm7pmwr40r842665cv6ykhjg7r93vldra48z6p"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0h8s2qhc6f5flslx05cd3xxg243c67vv03spjiag14p8kqqrqvb1"; }; meta = { diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 3b04d4b48aa1b2e09dd5e85971ebdaff07880384..6bde7d7a01722576f541982f20b49167c81c14f0 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,37 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, - libxklavier, libcanberra_gtk3, librsvg, libappindicator-gtk3, - desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, + libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, + desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-control-center-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0flnn0h8f5aqyccwrlv7qxchvr3kqmlfdga6wq28d55zkpv5m7dl"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1x40gxrz1hrzbdfl8vbag231g08h45vaky5z827k44qwl6pjd6nl"; }; nativeBuildInputs = [ pkgconfig intltool itstool - desktop_file_utils + desktop-file-utils wrapGAppsHook ]; buildInputs = [ libxml2 - dbus_glib + dbus-glib libxklavier - libcanberra_gtk3 + libcanberra-gtk3 librsvg libappindicator-gtk3 gnome3.gtk gnome3.dconf - hicolor_icon_theme + hicolor-icon-theme mate.mate-desktop mate.libmatekbd mate.mate-menus diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 039c3732d11df27893f7527e2e1da208aa5fb92d..f84b6b25420782735b820a4691839a2e3200bb6e 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-desktop-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0jxhhf9w6mz8ha6ymgj2alzmiydylg4ngqslkjxx37vvpvms2dyx"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 05edfc1dd6d4146da9e35d00aea003ea5060c21d..2d868d2e0821f86d98991fcf8b8eada58e620141 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl, autoreconfHook, mate, hicolor_icon_theme }: +{ stdenv, fetchurl, autoreconfHook, mate, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0vc3wg9l5yrxm0xmligz4lw2g3nqj1dz8fwv90xvym8pbjds2849"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mate.mate-icon-theme hicolor_icon_theme ]; + buildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; meta = { description = "Faenza icon theme from MATE"; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index b1c5e82da99547d4546a488a43e18726636cc112..7291b475fe16effa5707a426a426238691a66d6f 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3 }: +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3, mate }: stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0si3li3kza7s45zhasjvqn5f85zpkn0x8i4kq1dlnqvjjqzkg4ch"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0lmsmsamgg1s6qrk19qwa76ld7x1k3pwhy4vs1ixn1as4iaaddk5"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; - buildInputs = [ librsvg hicolor_icon_theme ]; - + buildInputs = [ librsvg hicolor-icon-theme ]; + postInstall = '' for theme in "$out"/share/icons/*; do "${gtk3.out}/bin/gtk-update-icon-cache" "$theme" done ''; - + meta = { description = "Icon themes from MATE"; homepage = http://mate-desktop.org; license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..512327c0620844aaf446cfce5c061366a6922f73 --- /dev/null +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-indicator-applet-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1fc6j5dnxghpgz8xbf5p8j2jprk97q4q3ajkh6sg5l71gqlnampg"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libindicator-gtk3 + mate.mate-panel + hicolor-icon-theme + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mate-desktop/mate-indicator-applet; + description = "MATE panel indicator applet"; + longDescription = '' + A small applet to display information from various applications + consistently in the panel. + + The indicator applet exposes Ayatana Indicators in the MATE Panel. + Ayatana Indicators are an initiative by Canonical to provide crisp and + clean system and application status indication. They take the form of + an icon and associated menu, displayed (usually) in the desktop panel. + Existing indicators include the Message Menu, Battery Menu and Sound + menu. + ''; + license = with licenses; [ gpl3Plus lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..514da3a1172407317ea86c6a32381f25a3656efe --- /dev/null +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-media-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "09vbw7nc91ljnxm5sbrch0w7zzn2i6qjb1b50q402niwr5b0zicr"; + }; + + buildInputs = [ + libxml2 + libcanberra-gtk3 + gnome3.gtk + mate.libmatemixer + mate.mate-desktop + ]; + + nativeBuildInputs = [ + pkgconfig + intltool + libtool + wrapGAppsHook + ]; + + meta = with stdenv.lib; { + description = "Media tools for MATE"; + homepage = http://mate-desktop.org; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo maintainers.chpatrick ]; + }; +} diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index a3da557f2a21585636b77c0a556af357515dbf53..51263f0d74e7117bf59495392167bea53ecdc5c1 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection, python }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection, python, mate }: stdenv.mkDerivation rec { name = "mate-menus-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "05kyr37xqv6hm1rlvnqd5ng0x1n883brqynkirkk5drl56axnz7h"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1w1k6kdabmabhpqvkizk1si6ri4rmspsbj0252ki834ml0dxpnhg"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..508e1d359c9a3955c5dba7d479d4646989d4e6af --- /dev/null +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-netbook-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1w92kny1fnlwbq4b8y50n5s1vsvvl4xrvspsp9lqfxyz3jxiwbrz"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libwnck3 + libfakekey + libXtst + mate.mate-panel + ]; + + meta = with stdenv.lib; { + description = "MATE utilities for netbooks"; + longDescription = '' + MATE utilities for netbooks are an applet and a daemon to maximize + windows and move their titles on the panel. + + Installing these utilities is recommended for netbooks and similar + devices with low resolution displays. + ''; + homepage = http://mate-desktop.org; + license = with licenses; [ gpl3 lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 5a64727419c6538092212eb49270744e6be1d8b4..59df2b7d59bde142d2bfc1be422025db9b3e0ab4 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,15 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, libcanberra_gtk3, - libnotify, libwnck3, gnome3, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3, + libnotify, libwnck3, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-notification-daemon-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0rhhv99ipxy7l4fdgwvqp3g0c3d4njq0fhkag2vs1nwc6kx0h7sc"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0dq457npzid20yfwigdh8gfqgf5wv8p6jhbxfnzybam9xidlqc5f"; }; nativeBuildInputs = [ @@ -19,8 +17,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib - libcanberra_gtk3 + dbus-glib + libcanberra-gtk3 libnotify libwnck3 gnome3.gtk diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index d3e6f11fd9475fce1dbc1484d1748f255a5301ef..df1c15bddd3758a71cec1f67c967eac86d36a61a 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-panel-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "4"; + version = "1.20.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1n565ff1n7jrfx223i3cl3m69wjda506nvbn8gra7m1jwdfzpbw1"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1vmvn93apvq6r9m823zyrncbxgsjr4nmigw9k4s4n05z8zd8wy8k"; }; nativeBuildInputs = [ @@ -20,16 +18,16 @@ stdenv.mkDerivation rec { buildInputs = [ glib - dbus_glib + dbus-glib libwnck3 librsvg libxml2 - hicolor_icon_theme gnome3.gtk gnome3.dconf mate.libmateweather mate.mate-desktop mate.mate-menus + hicolor-icon-theme ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3db773af9fc5fb94d161c9d141198388523a3aba --- /dev/null +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobjectIntrospection, libappindicator-gtk3, libindicator-gtk3, polkit, mate }: + +stdenv.mkDerivation rec { + name = "mate-polkit-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "00c1rmi31gv1a3lk7smjp489kd3wrj0d6npagnb8p1rz0g88ha94"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + gtk3 + gobjectIntrospection + libappindicator-gtk3 + libindicator-gtk3 + polkit + ]; + + meta = with stdenv.lib; { + description = "Integrates polkit authentication for MATE desktop"; + homepage = http://mate-desktop.org; + license = [ licenses.gpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 62b991632840c74ad7d272e3b179aba179d860e0..c056b1f62fbdbba85995f703800ed2d3fe5298e2 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,27 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra_gtk3, dbus_glib, upower, gnome3, libtool, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1gmka9ybxvkrdjaga1md6pbw6q1cx5yxb58ai5315a0f5p45y36x"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1s46jvjcrai6xb2k0dy7i121b9ihfl5h3y5809fg9fzrbvw6bafn"; }; buildInputs = [ glib itstool libxml2 - libcanberra_gtk3 + libcanberra-gtk3 gnome3.gtk - gnome3.libgnome_keyring + gnome3.libgnome-keyring libnotify - dbus_glib + dbus-glib upower - mate.mate-panel ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3b5d303816ba6c012d9a07ae16ecc4ddd93f344d --- /dev/null +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-screensaver-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1698608m6kf4dn91xdwy7l809yagz02h1k594smj75wvnhr7x4k9"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + dbus-glib + libXScrnSaver + libnotify + pam + systemd + mate.mate-desktop + mate.mate-menus + ]; + + configureFlags = "--without-console-kit"; + + makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc"; + + meta = with stdenv.lib; { + description = "Screen saver and locker for the MATE desktop"; + homepage = http://mate-desktop.org; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d82cd4b073a2c35747dc886a88eed144f6f618f5 --- /dev/null +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus-glib, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-sensors-applet-${version}"; + version = "1.20.1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0lnr3jjq30zw1i2rv5n69dhsa3x39lc91xcgbj4vyj1rxj9ff05x"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + # maybe add nvidia-settings later on + buildInputs = [ + gtk3 + libxml2 + libxslt + libatasmart + libnotify + dbus-glib + lm_sensors + mate.mate-panel + hicolor-icon-theme + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mate-desktop/mate-sensors-applet; + description = "MATE panel applet for hardware sensors"; + license = with licenses; [ gpl2Plus ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 48d2890388a7067653320b6828ea1c4b3afc83aa..97c80cdc2e4ed4bb262345d2536b77498f78406c 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,31 +1,32 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd, + libSM, libXtst, gtk3, hicolor-icon-theme, mate, + wrapGAppsHook +}: stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0i0xq6041x2qmb26x9bawx0qpfkgjn6x9w3phnm9s7rc4s0z20ll"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0vzr6y9shw4zb3ddfrj0nn7yqggpq9sv6h33p0xxdx71ydl40p2g"; }; nativeBuildInputs = [ pkgconfig intltool + xtrans wrapGAppsHook ]; buildInputs = [ - dbus_glib + dbus-glib systemd - xtrans - hicolor_icon_theme - xorg.libSM - gnome3.gtk3 - gnome3.gsettings_desktop_schemas + libSM + libXtst + gtk3 mate.mate-desktop + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index ffa01d1dba88c4e84a46a13407c9683669734164..490500fca6970fdff15ea166c8c00c6ec4327d9c 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus_glib, libxklavier, libcanberra_gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio }: stdenv.mkDerivation rec { name = "mate-settings-daemon-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "07b2jkxqv07njdrgkdck93d872p6lch1lrvi7ydnpicspg3rfid6"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1hmc5qfr9yrvrlc1d2mmsqbhv0lhikbadaac18bxjynw9ff857iq"; }; nativeBuildInputs = [ @@ -20,9 +18,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib libxklavier - libcanberra_gtk3 + libcanberra-gtk3 libnotify nss polkit diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8c67044a42206a881080dd67140c0eccc07ea69c --- /dev/null +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-system-monitor-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "059aryj0gz4sic719nsmckhkjl4yhqxmyplvh78clf5khh4apwn5"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtkmm3 + libxml2 + libgtop + libwnck3 + librsvg + systemd + ]; + + configureFlags = "--enable-systemd"; + + meta = with stdenv.lib; { + description = "System monitor for the MATE desktop"; + homepage = http://mate-desktop.org; + license = [ licenses.gpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 9d620b2830185afc803618f3304d00a5f6c6d4f5..b90211ae06111068723bddda0968c4bf1cfc041d 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "mate-terminal-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "03366hs7mxazn6m6y53ppkb1din4jywljg0lx8zw101qg6car0az"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 3967a8c9ca2bff3a671c5c4883977c329d33919c..9d82d439c8250a18dfe53e22c757daa01ff3939c 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -3,26 +3,18 @@ stdenv.mkDerivation rec { name = "mate-themes-${version}"; - version = "${major-ver}.${minor-ver}"; - # There is no 3.24 release. - major-ver = if stdenv.lib.versionOlder gnome3.version "3.23" then gnome3.version else "3.22"; - minor-ver = { - "3.20" = "22"; - "3.22" = "13"; - }."${major-ver}"; + version = "3.22.16"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; - sha256 = { - "3.20" = "1yjj5w7zvyjyg0k21nwk438jjsnj0qklsf0z5pmmp1jff1vxyck4"; - "3.22" = "1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i"; - }."${major-ver}"; + url = "http://pub.mate-desktop.org/releases/themes/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1k8qp2arjv4vj8kyjhjgyj5h46jy0darlfh48l5h25623z1firdj"; }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gtk-engine-murrine - gdk_pixbuf librsvg ]; + buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk_pixbuf librsvg ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; meta = { description = "A set of themes from MATE"; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..55cd82eecdc74a0f3a0a9796ab23b146642e3c0e --- /dev/null +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, intltool, itstool, libxml2, yelp, mate }: + +stdenv.mkDerivation rec { + name = "mate-user-guide-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1n1rlvymz8k7vvjmd9qkv26wz3770w1ywsa41kbisbfp9x7mr0w2"; + }; + + nativeBuildInputs = [ itstool intltool libxml2 ]; + + buildInputs = [ yelp ]; + + meta = with stdenv.lib; { + description = "MATE User Guide"; + homepage = http://mate-desktop.org; + license = with licenses; [ gpl2Plus fdl12 ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..23123fd2db1a73d7c72d56aaffccce695bb8aabd --- /dev/null +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-user-share-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0lv5ndjk2br4w7cw8gsgj7aa2iadxv7m4wii4c49pajmd950iff2"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + dbus-glib + libnotify + libcanberra-gtk3 + libxml2 + mate.caja + hicolor-icon-theme + # Should mod_dnssd and apacheHttpd be runtime dependencies? + # In gnome-user-share they are not. + #mod_dnssd + #apacheHttpd + ]; + + preConfigure = '' + sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ + -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ + -i data/dav_user_2.4.conf + ''; + + configureFlags = [ + "--with-httpd=${apacheHttpd.out}/bin/httpd" + "--with-modules-path=${apacheHttpd.dev}/modules" + "--with-cajadir=$(out)/lib/caja/extensions-2.0" + ]; + + meta = with stdenv.lib; { + description = "User level public file sharing for the MATE desktop"; + homepage = https://github.com/mate-desktop/mate-user-share; + license = with licenses; [ gpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f96eecb0a4e63f875227fbd18008d33c5a5a9b7d --- /dev/null +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-utils-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "10a6k8gi7cajlkbj1jbvk3s633hw58lan3rc85v8jlrkwm7wmhpl"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libgtop + libcanberra-gtk3 + libxml2 + mate.mate-panel + hicolor-icon-theme + ]; + + meta = with stdenv.lib; { + description = "Utilities for the MATE desktop"; + homepage = http://mate-desktop.org; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e98d16d774e2788da97c47fca60d65b1d4157350 --- /dev/null +++ b/pkgs/desktops/mate/mozo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, intltool, mate, pythonPackages }: + +stdenv.mkDerivation rec { + name = "mozo-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1108avdappfjadd46ld7clhh5m9f4b5khl5y33l377m8ky9dy87g"; + }; + + pythonPath = [ mate.mate-menus pythonPackages.pygobject3 ]; + + nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ]; + + buildInputs = [ pythonPackages.python ] ++ pythonPath; + + preFixup = "wrapPythonPrograms"; + + meta = with stdenv.lib; { + description = "MATE Desktop menu editor"; + homepage = https://github.com/mate-desktop/mozo; + license = with licenses; [ lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index a290c404469c6b6f57f0ca26b754459df3acca9e..c1b57504317d140c340982c02ac7f206bacf2bb5 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "pluma-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.21.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1z0938yiygxipj2a77n9dv8v4253snrc5gbbnarcnim9xba2j3zz"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1y3zl0rzp069pix1vgrhzkkfc3lvhq9ahfgbmc88cwqw9aw3mgk0"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..566245c4441de7b649439d29ce734aa68ee301d1 --- /dev/null +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, pythonPackages }: + +stdenv.mkDerivation rec { + name = "python-caja-${version}"; + version = "1.20.0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0bcgg3p01zik53l5ns48575yw0k88fyc044yvp9fvwy5jqqg1ykk"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + pythonPackages.wrapPython + ]; + + buildInputs = [ + gtk3 + mate.caja + pythonPackages.python + pythonPackages.pygobject3 + ]; + + configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + + meta = with stdenv.lib; { + description = "Python binding for Caja components"; + homepage = https://github.com/mate-desktop/python-caja; + license = [ licenses.gpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/update.sh b/pkgs/desktops/mate/update.sh new file mode 100755 index 0000000000000000000000000000000000000000..736bcbd34fc63bc282c2408d7d67709ee1357c6c --- /dev/null +++ b/pkgs/desktops/mate/update.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p libarchive curl common-updater-scripts + +set -eu -o pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" +root=../../.. +export NIXPKGS_ALLOW_UNFREE=1 + +mate_version=1.20 +theme_version=3.22 +materepo=https://pub.mate-desktop.org/releases/${mate_version} +themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version} + +version() { + (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"') +} + +update_package() { + local p=$1 + echo $p + + local repo + if [ "$p" = "mate-themes" ]; then + repo=$themerepo + else + repo=$materepo + fi + + local p_version_old=$(version mate.$p) + local p_versions=$(curl -sS ${repo}/ | sed -rne "s/.*\"$p-([0-9]+\\.[0-9]+\\.[0-9]+)\\.tar\\.xz.*/\\1/p") + local p_version=$(echo $p_versions | sed -e 's/ /\n/g' | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n1) + + if [[ "$p_version" = "$p_version_old" ]]; then + echo "nothing to do, $p $p_version is current" + echo + return + fi + + # Download package and save hash and file path. + local url="$repo/$p-${p_version}.tar.xz" + mapfile -t prefetch < <(nix-prefetch-url --print-path "$url") + local hash=${prefetch[0]} + local path=${prefetch[1]} + echo "$p: $p_version_old -> $p_version" + (cd "$root" && update-source-version mate.$p "$p_version" "$hash") + echo +} + +for d in $(ls -A --indicator-style=none); do + if [ -d $d ]; then + update_package $d + fi +done diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix index 4a404b89ff6d7341ca17d5fe9eed463c5d93b67c..69d16c9b20a1de97769c7b528c3cdde309c32e9e 100644 --- a/pkgs/desktops/maxx/default.nix +++ b/pkgs/desktops/maxx/default.nix @@ -2,7 +2,7 @@ , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 -, gdk_pixbuf, mesa_noglu, ncurses +, gdk_pixbuf, libGL, ncurses , xclock, xsettingsd }: @@ -12,7 +12,7 @@ let deps = [ stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2 - gdk_pixbuf mesa_noglu ncurses + gdk_pixbuf libGL ncurses ]; runtime_deps = [ xclock xsettingsd diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index d91f06e0c3a11d058071ccd225fb44f4ee4a1faf..7f259d66954774837007eb828d04101339493096 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -1,28 +1,22 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: +{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobjectIntrospection }: stdenv.mkDerivation rec { - majorVersion = "0.3"; - minorVersion = "1.3"; + majorVersion = "0.4"; + minorVersion = "3"; name = "pantheon-terminal-${majorVersion}.${minorVersion}"; src = fetchurl { url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz"; sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss"; }; - preConfigure = '' - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${granite}/lib64/pkgconfig" - ''; - - preFixup = '' - for f in $out/bin/*; do - wrapProgram $f \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share" - done - ''; - + nativeBuildInputs = [ + perl cmake vala_0_38 pkgconfig wrapGAppsHook + # For setup hook + gobjectIntrospection + ]; buildInputs = with gnome3; [ - perl cmake vala_0_23 pkgconfig glib gtk3 granite libnotify gettext makeWrapper - vte_290 libgee gsettings_desktop_schemas defaultIconTheme + glib gtk3 granite libnotify gettext vte_290 libgee + gsettings-desktop-schemas defaultIconTheme ]; meta = { description = "Elementary OS's terminal"; diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 44e8a26eee15c0dd6753cffcc8989ee60da5431d..4be84589080ce166e799a78f7ddb2f3390a9dbfd 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,12 +1,12 @@ { - mkDerivation, 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 }: mkDerivation { name = "bluedevil"; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix deleted file mode 100644 index 6c31398037b0d7561cb6f2b3b78a9b5a85f52702..0000000000000000000000000000000000000000 --- a/pkgs/desktops/plasma-5/breeze-qt4.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - mkDerivation, lib, - automoc4, cmake, perl, pkgconfig, - kdelibs4, qt4, xproto -}: - -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/default.nix b/pkgs/desktops/plasma-5/default.nix index a828ba0fe7bc412b5c88d60ac130fc916e257bd2..6da0ad22d11548973db245331355bee94764dba2 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { libsForQt5, lib, fetchurl, - gconf, + gconf, gsettings-desktop-schemas, debug ? false, }: @@ -58,11 +58,7 @@ let # 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 + propagatedBuildInputs="$propagatedBuildInputs @dev@" fi fi ''; @@ -104,13 +100,12 @@ let in { bluedevil = callPackage ./bluedevil.nix {}; breeze-gtk = callPackage ./breeze-gtk.nix {}; - breeze-qt4 = callPackage ./breeze-qt4.nix {}; breeze-qt5 = callPackage ./breeze-qt5.nix {}; breeze-grub = callPackage ./breeze-grub.nix {}; breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; - kde-gtk-config = callPackage ./kde-gtk-config {}; + kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; }; kdecoration = callPackage ./kdecoration.nix {}; kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; kgamma5 = callPackage ./kgamma5.nix {}; @@ -130,7 +125,7 @@ let milou = callPackage ./milou.nix {}; oxygen = callPackage ./oxygen.nix {}; plasma-desktop = callPackage ./plasma-desktop {}; - plasma-integration = callPackage ./plasma-integration.nix {}; + plasma-integration = callPackage ./plasma-integration {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; plasma-vault = callPackage ./plasma-vault {}; @@ -140,6 +135,8 @@ let powerdevil = callPackage ./powerdevil.nix {}; sddm-kcm = callPackage ./sddm-kcm.nix {}; systemsettings = callPackage ./systemsettings.nix {}; + user-manager = callPackage ./user-manager.nix {}; + xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 494b84923534b8d8045bda656a2bba25aa26797f..117401b0eab1db43967f742991ac50326cb92229 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 38bab58c829e55042faff8f4a5653d38a60e6853..35d90a246bc6c7b62829f74ddf08f09324be985f 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff + knewstuff, gsettings-desktop-schemas }: mkDerivation { @@ -10,11 +10,12 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff + knewstuff gsettings-desktop-schemas ]; 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" + "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; } diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index ea58cad12ae03570de065ca6940f63542cfcf901..ccbf3820b908c932695a7c7c0b9ac494ea34c4b6 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,11 +1,11 @@ { mkDerivation, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, ki18n, qtx11extras, + kconfig, kconfigwidgets, ki18n, qtx11extras, libXxf86vm }: mkDerivation { name = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras ]; + buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ]; } diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index d366aa4b36e49cae9f13096ee43ff94814ecdfdb..b35493929ff344a629d8f90c955904cade168d95 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -3,7 +3,7 @@ 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 + kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, solid }: mkDerivation { @@ -12,6 +12,6 @@ mkDerivation { buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice - kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid + kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid ]; } diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index f31294e00d6fe98d83e4a111fffe6a71297ecab3..87a25885b40ff44d2293f9735dc8203a2fdef092 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, fetchpatch, extra-cmake-modules, kdoctools, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, @@ -11,7 +11,7 @@ kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, + plasma-framework, qtsensors, libcap }: mkDerivation { @@ -21,17 +21,24 @@ mkDerivation { epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor xwayland - qtdeclarative qtmultimedia qtscript qtx11extras + qtdeclarative qtmultimedia qtscript qtx11extras qtsensors 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 plasma-framework + libcap ]; outputs = [ "bin" "dev" "out" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - NIX_CFLAGS_COMPILE = [ - ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"'' + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [ + # This patch should be removed in 5.12.2 + (fetchpatch { + url = "https://github.com/KDE/kwin/commit/6e5f5d92daab4c60f7bf241d90a91b3bea27acfd.patch"; + sha256 = "1yq9wjvch46z7qx051s0ws0gyqbqhkvx7xl4pymd97vz8v6gnx4x"; + }) + ]; + CXXFLAGS = [ + ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ]; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; postInstall = '' diff --git a/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch b/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch new file mode 100644 index 0000000000000000000000000000000000000000..80aacacc6ca008f287f6aadefbc495ca496485b5 --- /dev/null +++ b/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch @@ -0,0 +1,24 @@ +Dont set capabilities on kwin_wayland executable at build time + +This is handled by security.wrappers on NixOS + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48cbcdbfe..93b410ed8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -674,15 +674,6 @@ if (HAVE_LIBCAP) + endif() + + install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS} ) +-if (HAVE_LIBCAP) +- install( +- CODE "execute_process( +- COMMAND +- ${SETCAP_EXECUTABLE} +- CAP_SYS_NICE=+ep +- \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/kwin_wayland)" +- ) +-endif() + + add_subdirectory(platformsupport) + add_subdirectory(plugins) diff --git a/pkgs/desktops/plasma-5/kwin/series b/pkgs/desktops/plasma-5/kwin/series index 9dbc88f499752f00f63980a1c293c66d38445d91..8efb74eabd67d33cae7222f737386f254108bbb0 100644 --- a/pkgs/desktops/plasma-5/kwin/series +++ b/pkgs/desktops/plasma-5/kwin/series @@ -1,2 +1,3 @@ follow-symlinks.patch xwayland.patch +no-setcap-install.patch diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 18675159df6d9c93cf3a3441c85b041c8c654e1a..32bd5f3a9f288960f11ae15f95ef0e363b78d1d8 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -12,7 +12,7 @@ kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner, kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework, - plasma-workspace, + plasma-workspace, xf86inputlibinput }: mkDerivation rec { @@ -34,13 +34,14 @@ mkDerivation rec { postPatch = '' sed '1i#include ' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp ''; - NIX_CFLAGS_COMPILE = [ + CXXFLAGS = [ "-I${lib.getDev xorgserver}/include/xorg" - ''-DNIXPKGS_HWCLOCK="${lib.getBin utillinux}/sbin/hwclock"'' + ''-DNIXPKGS_HWCLOCK=\"${lib.getBin utillinux}/sbin/hwclock\"'' ]; cmakeFlags = [ "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${lib.getDev xf86inputsynaptics}/include/xorg" + "-DXORGLIBINPUT_INCLUDE_DIRS=${lib.getDev xf86inputlibinput}/include/xorg" ]; postInstall = '' # Display ~/Desktop contents on the desktop by default. diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix deleted file mode 100644 index f69644287624cb629484ab78b212e18cc8ba47bb..0000000000000000000000000000000000000000 --- a/pkgs/desktops/plasma-5/plasma-integration.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, - kwayland, libXcursor, qtquickcontrols2 -}: - -# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration - -mkDerivation { - name = "plasma-integration"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland - libXcursor qtquickcontrols2 - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-integration/D9070.patch b/pkgs/desktops/plasma-5/plasma-integration/D9070.patch new file mode 100644 index 0000000000000000000000000000000000000000..66fef4712a7b2148269285a4794bedc3b47ae8b8 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-integration/D9070.patch @@ -0,0 +1,24 @@ +Index: src/platformtheme/kfontsettingsdata.cpp +=================================================================== +--- src/platformtheme/kfontsettingsdata.cpp ++++ src/platformtheme/kfontsettingsdata.cpp +@@ -70,15 +70,18 @@ + const KFontData &fontData = DefaultFontData[fontType]; + cachedFont = new QFont(QLatin1String(fontData.FontName), fontData.Size, fontData.Weight); + cachedFont->setStyleHint(fontData.StyleHint); +- cachedFont->setStyleName(QLatin1String(fontData.StyleName)); + + const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey); + QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString()); + + //If we have serialized information for this font, restore it + //NOTE: We are not using KConfig directly because we can't call QFont::QFont from here + if (!fontInfo.isEmpty()) { + cachedFont->fromString(fontInfo); ++ } else { ++ // set the canonical stylename here, where it cannot override ++ // user-specific font attributes if those do not include a stylename. ++ cachedFont->setStyleName(QLatin1String(fontData.StyleName)); + } + + mFonts[fontType] = cachedFont; diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d33ecf05024295de72d38c33716714cccd2b4e6a --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix @@ -0,0 +1,24 @@ +{ + mkDerivation, + extra-cmake-modules, + breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, + kwayland, libXcursor, qtquickcontrols2 +}: + +# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration + +mkDerivation { + name = "plasma-integration"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland + libXcursor qtquickcontrols2 + ]; + patches = [ + # See also: https://phabricator.kde.org/D9070 + # ttuegel: The patch is checked into Nixpkgs because I could not get + # Phabricator to give me a stable link to it. + ./D9070.patch + ]; + patchFlags = "-p0"; +} diff --git a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch index 79b5cfb437e265c78fd7fea28f59e45c97801fe6..75144d352223ed9e2923331cfbb9cae3a74eb0bc 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch +++ b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch @@ -16,7 +16,7 @@ index 568cb34..98a5992 100644 #include -const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml"; -+const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml"; ++const QString MobileProviders::ProvidersFile = "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"; bool localeAwareCompare(const QString & one, const QString & two) { return one.localeAwareCompare(two) < 0; diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index cc1dcb7ee9f744a1f27625ecf19969462d96e4da..214dbd9cc042f8f35cbe61432f9969d0b73f356f 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -4,7 +4,7 @@ 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, + mobile-broadband-provider-info, modemmanager-qt, networkmanager-qt, openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid }: @@ -15,13 +15,13 @@ mkDerivation { 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 + 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; + inherit mobile-broadband-provider-info; }) (substituteAll { src = ./0002-openvpn-binary-path.patch; diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 0bfad2b5c8e4350f0716a7ac5f6ec0c60c0635f9..b60b5298d6dbba974235859abaab25bcb2e1b28e 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kdoctools, gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, - libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem + libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem }: mkDerivation { @@ -10,6 +10,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n - libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem + libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem ]; } diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix index 203ff50d7357e708e4f1d88705fd15af05d77d4e..300627163e57412425c253610fa837bdcf03aac6 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/default.nix +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -26,13 +26,13 @@ mkDerivation { kactivities plasma-framework kwindowsystem libksysguard ]; - NIX_CFLAGS_COMPILE = [ - ''-DNIXPKGS_ENCFS="${lib.getBin encfs}/bin/encfs"'' - ''-DNIXPKGS_ENCFSCTL="${lib.getBin encfs}/bin/encfsctl"'' + CXXFLAGS = [ + ''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"'' + ''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"'' - ''-DNIXPKGS_CRYFS="${lib.getBin cryfs}/bin/cryfs"'' + ''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"'' - ''-DNIXPKGS_FUSERMOUNT="${lib.getBin fuse}/bin/fusermount"'' + ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"'' ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 598f043dcd537ee3afff6781729f581d93affac9..e012537e4028a16d6a6f56000a2217be0f275e0f 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -1,5 +1,5 @@ diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml -index 7e2d9758..40a5797b 100644 +index 7e2d975..40a5797 100644 --- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml +++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml @@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents @@ -8,11 +8,11 @@ index 7e2d9758..40a5797b 100644 import org.kde.kcoreaddons 1.0 as KCoreAddons -import "logic.js" as Logic +import "../code/logic.js" as Logic - + Item { id: batteryItem diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml -index ae6d5919..c2f99c86 100644 +index 50deee5..45b6b37 100644 --- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml +++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml @@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 @@ -21,11 +21,11 @@ index ae6d5919..c2f99c86 100644 import org.kde.kquickcontrolsaddons 2.0 -import "logic.js" as Logic +import "../code/logic.js" as Logic - + Item { id: batterymonitor diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml -index 80e7e53b..0083cf01 100644 +index 80e7e53..0083cf0 100644 --- a/applets/lock_logout/contents/ui/lockout.qml +++ b/applets/lock_logout/contents/ui/lockout.qml @@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 @@ -34,24 +34,24 @@ index 80e7e53b..0083cf01 100644 import org.kde.kquickcontrolsaddons 2.0 -import "data.js" as Data +import "../code/data.js" as Data - + Flow { id: lockout diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml -index acdda88f..989de8ab 100644 +index cb15cfa..a6976ba 100644 --- a/applets/notifications/package/contents/ui/main.qml +++ b/applets/notifications/package/contents/ui/main.qml @@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras - + import org.kde.plasma.private.notifications 1.0 - + -import "uiproperties.js" as UiProperties +import "../code/uiproperties.js" as UiProperties - + MouseEventListener { id: notificationsApplet diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in -index 85715214..294eab08 100644 +index 8571521..294eab0 100644 --- a/krunner/dbus/org.kde.krunner.service.in +++ b/krunner/dbus/org.kde.krunner.service.in @@ -1,4 +1,4 @@ @@ -59,9 +59,9 @@ index 85715214..294eab08 100644 Name=org.kde.krunner -Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner +Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner - + diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in -index 7a86d07f..5b3030cc 100644 +index 7a86d07..5b3030c 100644 --- a/kuiserver/org.kde.kuiserver.service.in +++ b/kuiserver/org.kde.kuiserver.service.in @@ -1,3 +1,3 @@ @@ -70,13 +70,13 @@ index 7a86d07f..5b3030cc 100644 -Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5 +Exec=@CMAKE_INSTALL_FULL_BINDIR@/kuiserver5 diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt -index fe29f57a..247db953 100644 +index fe29f57..247db95 100644 --- a/startkde/CMakeLists.txt +++ b/startkde/CMakeLists.txt @@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig) add_subdirectory(ksyncdbusenv) add_subdirectory(waitforname) - + -#FIXME: reconsider, looks fishy -if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") - set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH") @@ -86,7 +86,7 @@ index fe29f57a..247db953 100644 configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY) configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY) diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp -index c9927855..bd506ce2 100644 +index c992785..bd506ce 100644 --- a/startkde/kstartupconfig/kstartupconfig.cpp +++ b/startkde/kstartupconfig/kstartupconfig.cpp @@ -147,5 +147,5 @@ int main() @@ -97,7 +97,7 @@ index c9927855..bd506ce2 100644 + return system( NIXPKGS_KDOSTARTUPCONFIG5 ); } diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index e9fa0bee..79e50a96 100644 +index b3117b4..e70110e 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,22 +1,31 @@ @@ -106,7 +106,7 @@ index e9fa0bee..79e50a96 100644 -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) +# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) # - + +if test "x$1" = x--failsafe; then + KDE_FAILSAFE=1 # General failsafe flag + KWIN_COMPOSE=N # Disable KWin's compositing @@ -117,7 +117,7 @@ index e9fa0bee..79e50a96 100644 # When the X server dies we get a HUP signal from xinit. We must ignore it # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP - + -# Check if a Plasma session already is running and whether it's possible to connect to X -kcheckrunning +# we have to unset this for Darwin since it will screw up KDE's dynamic-loading @@ -140,13 +140,12 @@ index e9fa0bee..79e50a96 100644 + echo "\$DISPLAY is not set or cannot connect to the X server." + exit 1 fi - + # Boot sequence: -@@ -33,59 +42,132 @@ fi +@@ -33,61 +42,133 @@ fi # # * Then ksmserver is started which takes control of the rest of the startup sequence - --# We need to create config folder so we can write startupconfigkeys + -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; -else @@ -174,7 +173,9 @@ index e9fa0bee..79e50a96 100644 +if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then + @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf fi - + sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg} + +-# We need to create config folder so we can write startupconfigkeys -mkdir -p $configDir +@NIXPKGS_KBUILDSYCOCA5@ + @@ -227,7 +228,7 @@ index e9fa0bee..79e50a96 100644 +cursorSize=0 +EOF +fi - + #This is basically setting defaults so we can use them with kstartupconfig5 -cat >$configDir/startupconfigkeys <"$XDG_CONFIG_HOME/startupconfigkeys" </plasma-workspace/env/*.sh -# (where correspond to the system and user's configuration --# directories, as identified by Qt's qtpaths, e.g. $HOME/.config --# and /etc/xdg/ on Linux) +-# directory. -# -# This is where you can define environment variables that will be available to -# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` @@ -382,11 +383,10 @@ index e9fa0bee..79e50a96 100644 -# For anything else (that doesn't set env vars, or that needs a window manager), -# better use the Autostart folder. - --scriptpath=`qtpaths --locate-dirs GenericConfigLocation plasma-workspace | tr ':' '\n'` +-scriptpath=`echo "$configDir:$sysConfigDirs" | tr ':' '\n'` - --# Add /env/ to the directory to locate the scripts to be sourced -for prefix in `echo $scriptpath`; do -- for file in "$prefix"/env/*.sh; do +- for file in "$prefix"/plasma-workspace/env/*.sh; do - test -r "$file" && . "$file" || true - done -done @@ -436,7 +436,7 @@ index e9fa0bee..79e50a96 100644 # Set a left cursor instead of the standard X11 "X" cursor, since I've heard # from some users that they're confused and don't know what to do. This is # especially necessary on slow machines, where starting KDE takes one or two -@@ -208,28 +232,10 @@ xset fp rehash +@@ -211,28 +236,10 @@ xset fp rehash # If the user has overwritten fonts, the cursor font may be different now # so don't move this up. # @@ -451,9 +451,9 @@ index e9fa0bee..79e50a96 100644 - export GS_LIB -fi +@NIXPKGS_XSETROOT@ -cursor_name left_ptr - + echo 'startkde: Starting up...' 1>&2 - + -# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. -# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend -# to set it to a list of paths *not* including the KDE prefix if it's not /usr or @@ -466,25 +466,25 @@ index e9fa0bee..79e50a96 100644 # Mark that full KDE session is running (e.g. Konqueror preloading works only # with full KDE running). The KDE_FULL_SESSION property can be detected by # any X client connected to the same X session, even if not launched -@@ -254,44 +260,65 @@ export XDG_DATA_DIRS +@@ -257,44 +264,65 @@ export XDG_DATA_DIRS # KDE_FULL_SESSION=true export KDE_FULL_SESSION -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +@NIXPKGS_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 +@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - + -KDE_SESSION_UID=`id -ru` +KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) export KDE_SESSION_UID - + XDG_CURRENT_DESKTOP=KDE export XDG_CURRENT_DESKTOP - + +# Enforce xcb QPA. Helps switching between Wayland and X sessions. +export QT_QPA_PLATFORM=xcb + @@ -527,7 +527,7 @@ index e9fa0bee..79e50a96 100644 - 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 @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup @@ -539,13 +539,13 @@ index e9fa0bee..79e50a96 100644 - xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." exit 1 fi - + -qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@NIXPKGS_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 -@@ -303,34 +330,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@@ -306,34 +334,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. @@ -568,12 +568,12 @@ index e9fa0bee..79e50a96 100644 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." fi - + #Anything after here is logout/shutdown - + -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` +wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - + -if test x"$wait_drkonqi"x = x"true"x ; then +if [ x"$wait_drkonqi"x = x"true"x ]; then # wait for remaining drkonqi instances with timeout (in seconds) @@ -594,19 +594,19 @@ index e9fa0bee..79e50a96 100644 done break fi -@@ -339,15 +369,17 @@ fi - +@@ -342,15 +373,17 @@ fi + echo 'startkde: Shutting down...' 1>&2 # just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +if [ -n "$ksplash_pid" ]; then + kill "$ksplash_pid" 2>/dev/null +fi - + # Clean up -kdeinit5_shutdown +@NIXPKGS_KDEINIT5_SHUTDOWN@ - + unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION +@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION @@ -614,24 +614,24 @@ index e9fa0bee..79e50a96 100644 -xprop -root -remove KDE_SESSION_VERSION +@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID - + echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index fd232bdf..e1c8fff6 100644 +index a5d09fa..d42c284 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake -@@ -1,4 +1,4 @@ +@@ -1,6 +1,6 @@ #!/bin/sh # -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) +# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) # - + # Boot sequence: -@@ -17,17 +17,13 @@ +@@ -17,28 +17,26 @@ # # * Then ksmserver is started which takes control of the rest of the startup sequence - + -# We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; @@ -641,19 +641,19 @@ index fd232bdf..e1c8fff6 100644 +if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then + . "$XDG_CONFIG_HOME/startupconfig" fi - + -[ -r $configDir/startupconfig ] && . $configDir/startupconfig - --if test "$kcmfonts_general_forcefontdpi" -ne 0; then -- xrdb -quiet -merge -nocpp <&2 - + # export our session variables to the Xwayland server -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 +@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - + + # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment + if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then +@@ -131,16 +78,15 @@ fi + # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup @@ -749,28 +753,19 @@ index fd232bdf..e1c8fff6 100644 - xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." exit 1 fi - + -qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit +@NIXPKGS_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 -@@ -145,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit - # If the session should be locked from the start (locked autologin), - # lock now and do the rest of the KDE startup underneath the locker. - KSMSERVEROPTIONS=" --no-lockscreen" --kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS -+@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS - if test $? -eq 255; then - # Startup error - echo 'startplasma: 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." +@@ -163,19 +109,19 @@ if test $? -eq 255; then + xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." fi - + -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` +wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - + -if test x"$wait_drkonqi"x = x"true"x ; then +if [ x"$wait_drkonqi"x = x"true"x ]; then # wait for remaining drkonqi instances with timeout (in seconds) @@ -791,19 +786,19 @@ index fd232bdf..e1c8fff6 100644 done break fi -@@ -174,15 +117,17 @@ fi - +@@ -184,15 +130,17 @@ fi + echo 'startplasma: Shutting down...' 1>&2 # just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +if [ -n "$ksplash_pid" ]; then -+ kill "$ksplash_pid" 2>/dev/null ++ "$ksplash_pid" 2>/dev/null +fi - + # Clean up -kdeinit5_shutdown +@NIXPKGS_KDEINIT5_SHUTDOWN@ - + unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION +@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION @@ -811,30 +806,24 @@ index fd232bdf..e1c8fff6 100644 -xprop -root -remove KDE_SESSION_VERSION +@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID - + echo 'startplasma: Done.' 1>&2 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index 417a87d4..3f62745a 100644 +index 8ac47aa..49970ef 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake -@@ -1,173 +1,171 @@ +@@ -1,118 +1,165 @@ #!/bin/sh # -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) +# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) # - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`qtpaths --binaries-dir` -- qdbus=$qbindir/qdbus -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac + +-# We need to create config folder so we can write startupconfigkeys +-if [ ${XDG_CONFIG_HOME} ]; then +- configDir=$XDG_CONFIG_HOME; -else -- qdbus=qdbus +- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html +# we have to unset this for Darwin since it will screw up KDE's dynamic-loading +unset DYLD_FORCE_FLAT_NAMESPACE + @@ -860,13 +849,8 @@ index 417a87d4..3f62745a 100644 +# Qt from doing this wackiness in the first place. +if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then + @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf - fi - --# We need to create config folder so we can write startupconfigkeys --if [ ${XDG_CONFIG_HOME} ]; then -- configDir=$XDG_CONFIG_HOME; --else -- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html ++fi ++ +@NIXPKGS_KBUILDSYCOCA5@ + +# Set the default GTK 2 theme @@ -891,7 +875,9 @@ index 417a87d4..3f62745a 100644 +gtk-button-images=1 +EOF fi - + sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg} + +-# We need to create config folder so we can write startupconfigkeys -mkdir -p $configDir +# Set the default GTK 3 theme +gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini" @@ -919,7 +905,7 @@ index 417a87d4..3f62745a 100644 +cursorSize=0 +EOF +fi - + #This is basically setting defaults so we can use them with kstartupconfig5 -cat >$configDir/startupconfigkeys <"$XDG_CONFIG_HOME/startupconfigkeys" </dev/null 2>/dev/null; then ++if @NIXPKGS_QDBUS@ --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then + # Do not overwrite existing values. There is no point in setting only some + # of them as then they would not match anymore. + if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \ +@@ -141,41 +188,10 @@ if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then + fi fi - + -# Source scripts found in /plasma-workspace/env/*.sh -# (where correspond to the system and user's configuration -# directories, as identified by Qt's qtpaths, e.g. $HOME/.config @@ -1082,18 +1085,16 @@ index 417a87d4..3f62745a 100644 -# For anything else (that doesn't set env vars, or that needs a window manager), -# better use the Autostart folder. - --# TODO: Use GenericConfigLocation once we depend on Qt 5.4 --scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` +-scriptpath=`echo "$configDir:$sysConfigDirs" | tr ':' '\n'` - --# Add /env/ to the directory to locate the scripts to be sourced -for prefix in `echo $scriptpath`; do -- for file in "$prefix"/env/*.sh; do -- test -r "$file" && . "$file" +- for file in "$prefix"/plasma-workspace/env/*.sh; do +- test -r "$file" && . "$file" || true - done -done - echo 'startplasmacompositor: Starting up...' 1>&2 - + -# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. -# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend -# to set it to a list of paths *not* including the KDE prefix if it's not /usr or @@ -1104,26 +1105,24 @@ index 417a87d4..3f62745a 100644 -export XDG_DATA_DIRS - # Make sure that D-Bus is running --if $qdbus >/dev/null 2>/dev/null; then -- : # ok --else -+if ! @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then +-if qdbus >/dev/null 2>/dev/null; then ++if @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then + : # ok + else echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - exit 1 -@@ -202,7 +200,7 @@ export KDE_FULL_SESSION +@@ -212,7 +228,7 @@ export KDE_FULL_SESSION KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION - + -KDE_SESSION_UID=`id -ru` +KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) export KDE_SESSION_UID - + XDG_CURRENT_DESKTOP=KDE -@@ -212,26 +210,47 @@ export XDG_CURRENT_DESKTOP +@@ -222,20 +238,41 @@ export XDG_CURRENT_DESKTOP QT_QPA_PLATFORM=wayland export QT_QPA_PLATFORM - + +# Source scripts found in /plasma-workspace/env/*.sh +# (where correspond to the system and user's configuration +# directories, as identified by Qt's qtpaths, e.g. $HOME/.config @@ -1148,7 +1147,8 @@ index 417a87d4..3f62745a 100644 + done +done + - # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment + # kwin_wayland can possibly also start dbus-activated services which need env variables. + # In that case, the update in startplasma might be too late. -if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then - dbus-update-activation-environment --systemd --all -else @@ -1165,23 +1165,14 @@ index 417a87d4..3f62745a 100644 + echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2 + exit 1 fi - + -@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma +@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@NIXPKGS_STARTPLASMA@ - + echo 'startplasmacompositor: Shutting down...' 1>&2 - - unset KDE_FULL_SESSION --xprop -root -remove KDE_FULL_SESSION -+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --xprop -root -remove KDE_SESSION_VERSION -+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION - unset KDE_SESSION_UID - - echo 'startplasmacompositor: Done.' 1>&2 + diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in -index 0a51b84b..f48b5d8a 100644 +index 0a51b84..f48b5d8 100644 --- a/startkde/waitforname/org.kde.plasma.Notifications.service.in +++ b/startkde/waitforname/org.kde.plasma.Notifications.service.in @@ -1,3 +1,3 @@ diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 65912083a4cf6a251ce641ff5c138c8bb953b2ae..6becf3bf420b79e3d0cf8b0b85324fc5d52779c1 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -1,5 +1,5 @@ { - mkDerivation, extra-cmake-modules, shared_mime_info, + mkDerivation, extra-cmake-modules, shared-mime-info, libpthreadstubs, libXcursor, libXdmcp, qtquickcontrols2, qtx11extras, karchive, ki18n, kio, knewstuff @@ -7,7 +7,7 @@ mkDerivation { name = "sddm-kcm"; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs libXcursor libXdmcp qtquickcontrols2 qtx11extras diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index c4f526a3e8cd6dd8bf7d5b7d240667ce1b090a09..df031ba062753a16f73cd2f5692fdcfcedc83a0d 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,355 +3,355 @@ { bluedevil = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/bluedevil-5.11.3.tar.xz"; - sha256 = "1sgnj3z4s1k7h2ddvcq9r67qc8gbd4yv7zb9a24gi3x3iwd5hsf3"; - name = "bluedevil-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/bluedevil-5.12.4.tar.xz"; + sha256 = "1gr7zrs2h3xk6rc16wqh2fx40q6q2vm5nwk2fy9r6z639wyxhk2x"; + name = "bluedevil-5.12.4.tar.xz"; }; }; breeze = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/breeze-5.11.3.tar.xz"; - sha256 = "1xlh8m9fw3009gdi0v1nn945rm1zg908apv8v9lgkgks6s2sspxk"; - name = "breeze-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/breeze-5.12.4.tar.xz"; + sha256 = "12baji960mfkb9ynkhz6c2a76m8fwx4kvzwifwn40sxqv5m857w7"; + name = "breeze-5.12.4.tar.xz"; }; }; breeze-grub = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/breeze-grub-5.11.3.tar.xz"; - sha256 = "1v1ha0j9kh4vcxknnwk78lzigvpqdrcj4gv6h86pxmwsipr5l2bl"; - name = "breeze-grub-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/breeze-grub-5.12.4.tar.xz"; + sha256 = "0jnpwznhfml9mshx9zl9wsi8s6ygfplfw4bycq1r9gyxzlcm9zvs"; + name = "breeze-grub-5.12.4.tar.xz"; }; }; breeze-gtk = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/breeze-gtk-5.11.3.tar.xz"; - sha256 = "1f9xlmc6mhr25mji8ir46qslnfa0i7q7pqkzp1hm5ss3kzdd45gb"; - name = "breeze-gtk-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/breeze-gtk-5.12.4.tar.xz"; + sha256 = "183pj18ldhql845xd2lvd4klp6m2xiiaszprw83n7048s9b0bk4c"; + name = "breeze-gtk-5.12.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/breeze-plymouth-5.11.3.tar.xz"; - sha256 = "11m65cg74cfhglsppahnppisqp4rnj528b93k78pgvb4xazm7s76"; - name = "breeze-plymouth-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/breeze-plymouth-5.12.4.tar.xz"; + sha256 = "1apv2jqcjmsfvj4xi736vqsly57wwzxv088hsqcryv3l4v4qkyfr"; + name = "breeze-plymouth-5.12.4.tar.xz"; }; }; discover = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/discover-5.11.3.tar.xz"; - sha256 = "1bavw2hynmznd72wmh4cmy6zs4a13gxcsh6gznd99g6shry8svix"; - name = "discover-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/discover-5.12.4.tar.xz"; + sha256 = "1gyddpafis1yfhh1dz0zvjca8pxnq5z0xvwfbmyh062xmhfy66wq"; + name = "discover-5.12.4.tar.xz"; }; }; drkonqi = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/drkonqi-5.11.3.tar.xz"; - sha256 = "1683h4nzk9kgwzwjzkr0bmk8vmq07991x4239z3p39z4gnvsmb0h"; - name = "drkonqi-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/drkonqi-5.12.4.tar.xz"; + sha256 = "0ijrhd689w6pg4biikfv7w6h5hwfjmsp7wcbpd2dq0xwjp3vnyb6"; + name = "drkonqi-5.12.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kactivitymanagerd-5.11.3.tar.xz"; - sha256 = "1syprfgbcg1821v0mqnalnn3gr40sfvi3m9wcy1hbffqm2k561qq"; - name = "kactivitymanagerd-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kactivitymanagerd-5.12.4.tar.xz"; + sha256 = "1llni6dz8014r8gaihnaxg0nn6ihjvqy7bfyigfda6iz5gwfbpcg"; + name = "kactivitymanagerd-5.12.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kde-cli-tools-5.11.3.tar.xz"; - sha256 = "0yhghfsyvx0xlmyigjm8hvp8d4s6pp8h6wbqrbfngslayq624cvi"; - name = "kde-cli-tools-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kde-cli-tools-5.12.4.tar.xz"; + sha256 = "0w6iz9rqi9b6vy18jxksah5lr44211dhfgaxccm0gmggqpiqm5wb"; + name = "kde-cli-tools-5.12.4.tar.xz"; }; }; kdecoration = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kdecoration-5.11.3.tar.xz"; - sha256 = "0ik62pavf9bw1mahiyqlc9qh2za31l4qa3fyz42y81phmr8hbj4a"; - name = "kdecoration-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kdecoration-5.12.4.tar.xz"; + sha256 = "0njs3b05hvm5s04cfn56dc98yc8sw52hwlclx0qf1hqcsjmm8bnj"; + name = "kdecoration-5.12.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kde-gtk-config-5.11.3.tar.xz"; - sha256 = "09k02ghsrc5bwk05a7jlyzgwr6a1mzwypy6q1yhkl8jcqaim18ff"; - name = "kde-gtk-config-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kde-gtk-config-5.12.4.tar.xz"; + sha256 = "00j2279z4b9qknip4rpaliwpwv25g3d6j9s0ajs151x94cl18wd6"; + name = "kde-gtk-config-5.12.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kdeplasma-addons-5.11.3.tar.xz"; - sha256 = "13vmr5m3gx2b757bnb74qjjr6faj2bn1qb9cngj0gnk9gbdgrwh1"; - name = "kdeplasma-addons-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kdeplasma-addons-5.12.4.tar.xz"; + sha256 = "0ggvxmsj4r25sjaap377i6ap2qkdhjqwslcjym9bcyys1lldbcg5"; + name = "kdeplasma-addons-5.12.4.tar.xz"; }; }; kgamma5 = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kgamma5-5.11.3.tar.xz"; - sha256 = "18g8rj4l1y1lwl2wrk4cdlpdn6gibbwbipdkmlk0hb4ad1bxkc96"; - name = "kgamma5-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kgamma5-5.12.4.tar.xz"; + sha256 = "1v19ay77vv8y37pxqainkrlh0lpajwxgx4xxra84gzd8g7l4zs0h"; + name = "kgamma5-5.12.4.tar.xz"; }; }; khotkeys = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/khotkeys-5.11.3.tar.xz"; - sha256 = "1bykjywj6yass35xv858azv9pw74wlqsss6hs9ra4sx0yh0n9ffp"; - name = "khotkeys-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/khotkeys-5.12.4.tar.xz"; + sha256 = "1lj8axpimh34vbpgwnfhkh3f7njmqy7jihqk51vkq7ngcy1bmd6f"; + name = "khotkeys-5.12.4.tar.xz"; }; }; kinfocenter = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kinfocenter-5.11.3.tar.xz"; - sha256 = "1ip6zkrl81v987z7bj0mvkjmydyarxgih4gzkbgnpppl7746bs5n"; - name = "kinfocenter-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kinfocenter-5.12.4.tar.xz"; + sha256 = "0dgybc8xa5lxgmw3nxfh5y085921qm5x6aw0233mwx3zj4v6nsj3"; + name = "kinfocenter-5.12.4.tar.xz"; }; }; kmenuedit = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kmenuedit-5.11.3.tar.xz"; - sha256 = "1nks0lk1xnywx5r3bzr5npzapg5d25l73ygxq8988q1f4q39jlj6"; - name = "kmenuedit-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz"; + sha256 = "063509xbvpk2n86anpl2kcsb1v4zvx6ycwl1ppyjhgg4jim9p099"; + name = "kmenuedit-5.12.4.tar.xz"; }; }; kscreen = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kscreen-5.11.3.tar.xz"; - sha256 = "03wcrqvqcsw47x504ydk3dkqw6x9dc2n3skh7asznmpda8ryb6dp"; - name = "kscreen-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kscreen-5.12.4.tar.xz"; + sha256 = "1pix8gfvgig5phvcqjc7yqvn1pgmdn6l8g56n06pijicrpksq315"; + name = "kscreen-5.12.4.tar.xz"; }; }; kscreenlocker = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kscreenlocker-5.11.3.tar.xz"; - sha256 = "0i0xcakzznxsk0zqa664xavp64wbqgqim57bkp01wl82s3aik82v"; - name = "kscreenlocker-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kscreenlocker-5.12.4.tar.xz"; + sha256 = "187c6azmbcfs5w18f450f75hikpvh3lhz7qn8zb93kfm65yvjz1m"; + name = "kscreenlocker-5.12.4.tar.xz"; }; }; ksshaskpass = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/ksshaskpass-5.11.3.tar.xz"; - sha256 = "1ij2xspd6clf8plqqgzx6zjq7c1sxrlf7ch9brnxprw29h5qfz34"; - name = "ksshaskpass-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/ksshaskpass-5.12.4.tar.xz"; + sha256 = "0k405qp8ji84gd7h3lsyfhsya7z55kw2klj9a0ld9z5r7jpr95z5"; + name = "ksshaskpass-5.12.4.tar.xz"; }; }; ksysguard = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/ksysguard-5.11.3.tar.xz"; - sha256 = "17b5lddmas5n1726xa5r8v0v6gmw6bzpvhcljk2r4yrly6gy3pv9"; - name = "ksysguard-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/ksysguard-5.12.4.tar.xz"; + sha256 = "0svk5ggdbjqq9lg4ggwijy7nbwmn3mdkmvm1jqbd174myyd6hmwk"; + name = "ksysguard-5.12.4.tar.xz"; }; }; kwallet-pam = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kwallet-pam-5.11.3.tar.xz"; - sha256 = "04ps2p3hjvkca8miqmg0xwh3i5van0jld2hb1xp737hy1dfpi9h4"; - name = "kwallet-pam-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kwallet-pam-5.12.4.tar.xz"; + sha256 = "058xxqkyyiwn34iwbmapk6bk6fi3l1g4vwbf125vc9pcbx6nqn2q"; + name = "kwallet-pam-5.12.4.tar.xz"; }; }; kwayland-integration = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kwayland-integration-5.11.3.tar.xz"; - sha256 = "0j5czhq5r8pxy7pw00by0v75kk4lbijn7mrdnydlca3jjrdcgz6f"; - name = "kwayland-integration-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kwayland-integration-5.12.4.tar.xz"; + sha256 = "1lcz12iqisls2icv4jmgjndlamz2zlfyd9lbn6j2hizz7riybsla"; + name = "kwayland-integration-5.12.4.tar.xz"; }; }; kwin = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kwin-5.11.3.tar.xz"; - sha256 = "1xgx7xn27lzqdwla45scfcnyxva97j2y2m7hgj60cd1mz686pill"; - name = "kwin-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kwin-5.12.4.tar.xz"; + sha256 = "0br27craalz6vqcv2g7jkskk0ia91hrir1wf1phm2lrnn4yadgf8"; + name = "kwin-5.12.4.tar.xz"; }; }; kwrited = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/kwrited-5.11.3.tar.xz"; - sha256 = "0qm3x6ahnis1b98q9h53wdldsj7nqw35s1hcgfqzjqk7nnxzim5i"; - name = "kwrited-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/kwrited-5.12.4.tar.xz"; + sha256 = "0m2snmvyxfnmlhfpvghp3w6apmba7rna9xsp5szdzrxgrd92ibgy"; + name = "kwrited-5.12.4.tar.xz"; }; }; libkscreen = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/libkscreen-5.11.3.tar.xz"; - sha256 = "01wbl1kinsvxfw5lq0wrhsk0fmv8gvkhr7m0w4lq1827wx68lfzw"; - name = "libkscreen-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/libkscreen-5.12.4.tar.xz"; + sha256 = "1dq5mbz7vqz4dzgnpsxgmygnz00d7ziqs98qcdgfcbvkh0j4sqsr"; + name = "libkscreen-5.12.4.tar.xz"; }; }; libksysguard = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/libksysguard-5.11.3.tar.xz"; - sha256 = "1jbcd2n1zd6ijybaffm5vs5b80130vii562s98xhinmifzsahzmy"; - name = "libksysguard-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/libksysguard-5.12.4.tar.xz"; + sha256 = "09mqfr4dxiq4xs4ihrxvsa9wf8azmilpnl5jbi06pfw5bd1q6fpd"; + name = "libksysguard-5.12.4.tar.xz"; }; }; milou = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/milou-5.11.3.tar.xz"; - sha256 = "02j6f4ip7hgb5qpq9812g1pnm8fjd83dc923gyfpzb4i0nf6j93g"; - name = "milou-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/milou-5.12.4.tar.xz"; + sha256 = "0v0m4a0idah99dvsmgng6kmlcqwpwh1rbd2j9ih7ka1xmlshdml7"; + name = "milou-5.12.4.tar.xz"; }; }; oxygen = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/oxygen-5.11.3.tar.xz"; - sha256 = "0zg3qdnip1ad6980ga0lmxndbph3y4dw0qk73dd8022qw5f3ysyp"; - name = "oxygen-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/oxygen-5.12.4.tar.xz"; + sha256 = "1k9kls7xzwb49gwjlhyxhg2jn9zh034csbdlz0pnq9h1yzwph4wa"; + name = "oxygen-5.12.4.tar.xz"; }; }; plasma-desktop = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-desktop-5.11.3.tar.xz"; - sha256 = "1igmq8zj71wf34ap2g0iakpjfq08mlg6yf1ly06111ygsinbg55a"; - name = "plasma-desktop-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-desktop-5.12.4.tar.xz"; + sha256 = "16g2vnbfd7nl61hfx7i6b3m0hms2aw4v85nbj8mf2i6csc1vzhmy"; + name = "plasma-desktop-5.12.4.tar.xz"; }; }; plasma-integration = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-integration-5.11.3.tar.xz"; - sha256 = "0bqw5xp71yxciqzd3bmlgsd4mkjl4vcysd9s6bka5mxrlhkqxgx1"; - name = "plasma-integration-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-integration-5.12.4.tar.xz"; + sha256 = "0qdyckmm52d0bf0062v103hy5szqqgfbh4z6h9bbjcz5l372aklb"; + name = "plasma-integration-5.12.4.tar.xz"; }; }; plasma-nm = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-nm-5.11.3.tar.xz"; - sha256 = "1zqlg5jm3pgiirr98j3fl1h6wbhf4f06qainpy42b5w42vhizspk"; - name = "plasma-nm-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-nm-5.12.4.tar.xz"; + sha256 = "1mvj41hxd42wk8ja186vxv080igrdza6sqbgcajk48r2klybpfzj"; + name = "plasma-nm-5.12.4.tar.xz"; }; }; plasma-pa = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-pa-5.11.3.tar.xz"; - sha256 = "07rwlqpmvbvdidhfhw8xk6lvarimd1mhm085vjk7g2wmzw5n69wl"; - name = "plasma-pa-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-pa-5.12.4.tar.xz"; + sha256 = "1mngqa9957m45ij73xp3lzp19hmwwq9h40ig39mwh20gm5jrdw56"; + name = "plasma-pa-5.12.4.tar.xz"; }; }; plasma-sdk = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-sdk-5.11.3.tar.xz"; - sha256 = "17h42223agz4vvbff13xd1p7xa5swnhcrmh1779mswl1rfznrkys"; - name = "plasma-sdk-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-sdk-5.12.4.tar.xz"; + sha256 = "1mw477p1z396gsbdx3m9cp0b2ljhqjw39grklg7l4cgrhiwrnjk2"; + name = "plasma-sdk-5.12.4.tar.xz"; }; }; plasma-tests = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-tests-5.11.3.tar.xz"; - sha256 = "0ac2i66f3mywvkf7041sg3hsa97f69y5aibpk0fz41q9zi5jwzv3"; - name = "plasma-tests-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-tests-5.12.4.tar.xz"; + sha256 = "13gq7mfimh4xd4f2vqaqri3f1v8nh7yixqppjip8s9mq3amf6xd9"; + name = "plasma-tests-5.12.4.tar.xz"; }; }; plasma-vault = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-vault-5.11.3.tar.xz"; - sha256 = "12y2331lpp7i3fl6nbm78n6qh7hd7vmrvc94jkzwx5pbql6nx2ia"; - name = "plasma-vault-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-vault-5.12.4.tar.xz"; + sha256 = "022vqjra25v9bw9j14j0a5jl9r08iqvzd5zn0dhz6l4bj0amcd8n"; + name = "plasma-vault-5.12.4.tar.xz"; }; }; plasma-workspace = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-workspace-5.11.3.tar.xz"; - sha256 = "0skn3mg90ghx3bmlj7snbhap9z2fq0hab0gfi4pv80ggyl5jf9sp"; - name = "plasma-workspace-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-5.12.4.tar.xz"; + sha256 = "00n2i6hj0fqss69gmmdhf32sfybak3l1iw379ljc3l4k6b3kzmh7"; + name = "plasma-workspace-5.12.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plasma-workspace-wallpapers-5.11.3.tar.xz"; - sha256 = "1xbfghhb6bjlqs2fk3z8k3q0lfirqmyqyxym2w8k69im2fscg0rl"; - name = "plasma-workspace-wallpapers-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-wallpapers-5.12.4.tar.xz"; + sha256 = "1y2mqkql2nadq3npxjp5hr2vzq3i45b4xp7gzcjl9bb2wppmhv4j"; + name = "plasma-workspace-wallpapers-5.12.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/plymouth-kcm-5.11.3.tar.xz"; - sha256 = "1sbxwvi402lcnzxalgr85srh8vd4wy26gav7q23qbhd5axh26f06"; - name = "plymouth-kcm-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/plymouth-kcm-5.12.4.tar.xz"; + sha256 = "1aakf2qrbnnv2n2rp57jql6nvl9i5mxpy0f4f5bjlqjxhzjlwwkn"; + name = "plymouth-kcm-5.12.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.11.3"; + version = "1-5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/polkit-kde-agent-1-5.11.3.tar.xz"; - sha256 = "088ch67syimxqlda0nczrrj1hb7ynsrwdcb0bq1pcndp57p71vzl"; - name = "polkit-kde-agent-1-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/polkit-kde-agent-1-5.12.4.tar.xz"; + sha256 = "0wwk1cr4mh2csjv0xrahzwyxyg8znd839zz518hfxdcv9a1rba2q"; + name = "polkit-kde-agent-1-5.12.4.tar.xz"; }; }; powerdevil = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/powerdevil-5.11.3.tar.xz"; - sha256 = "1807x3vzq24vip7dnl87cd1hn368vqk7cbyhai492irf20j7hn82"; - name = "powerdevil-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/powerdevil-5.12.4.tar.xz"; + sha256 = "043k0zhab6nqa1kc09d9d8jg7j1sd7jy0zhrwb66lf29yc6iyahx"; + name = "powerdevil-5.12.4.tar.xz"; }; }; sddm-kcm = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/sddm-kcm-5.11.3.tar.xz"; - sha256 = "1c9dm8819yaynq6cbzcg0j77cz0cf2cwrz9cfmr4w65ypl937va5"; - name = "sddm-kcm-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/sddm-kcm-5.12.4.tar.xz"; + sha256 = "0bm8h5r4nin0hx1nfqya1lxcp93745shk6ifqrizgzw1ldqqyah7"; + name = "sddm-kcm-5.12.4.tar.xz"; }; }; systemsettings = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/systemsettings-5.11.3.tar.xz"; - sha256 = "1abza0qmdhfdlr2k53lc4ymr42ri1pfv0yyf9plxhra7f7f2ylf7"; - name = "systemsettings-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/systemsettings-5.12.4.tar.xz"; + sha256 = "0af2vqnlwxa7ldra78y0gwq1cra227q49ww7w1cnvgq0il7cav4a"; + name = "systemsettings-5.12.4.tar.xz"; }; }; user-manager = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/user-manager-5.11.3.tar.xz"; - sha256 = "0d2i3ndq9vwr2m39i6qdn18bg4c19rqhfy2a38lhm30g288wxfbr"; - name = "user-manager-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/user-manager-5.12.4.tar.xz"; + sha256 = "1y144lw1a4q4pp9hw31lr806fpm1p397ibpbagcdr3xaka2z36lm"; + name = "user-manager-5.12.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.11.3"; + version = "5.12.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.3/xdg-desktop-portal-kde-5.11.3.tar.xz"; - sha256 = "01jcya7xyrn3d99raqvbzfwllihzdpyizx757f87pgg43dmbggwm"; - name = "xdg-desktop-portal-kde-5.11.3.tar.xz"; + url = "${mirror}/stable/plasma/5.12.4/xdg-desktop-portal-kde-5.12.4.tar.xz"; + sha256 = "18b97mbyfqvf2ygwrggi5zvkv8a9givqjlyaqi184h8mgndn044c"; + name = "xdg-desktop-portal-kde-5.12.4.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 4c449aa2703cde584dafda2e9d06d46645cead9e..a6199d9fbef2a718b39a6e9d23ee8b4fffb391c6 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, - kactivities, kactivities-stats, kirigami2 + kactivities, kactivities-stats, kirigami2, kcrash }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 - kactivities kactivities-stats kirigami2 + kactivities kactivities-stats kirigami2 kcrash ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/user-manager.nix b/pkgs/desktops/plasma-5/user-manager.nix new file mode 100644 index 0000000000000000000000000000000000000000..f46792fc48f7642a270d2b1b65f98ff79c252f7a --- /dev/null +++ b/pkgs/desktops/plasma-5/user-manager.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, khtml, + ki18n, kiconthemes, kio, kwindowsystem, libpwquality +}: + +mkDerivation { + name = "user-manager"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcmutils kconfig khtml ki18n kiconthemes kio kwindowsystem + libpwquality + ]; +} diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix new file mode 100644 index 0000000000000000000000000000000000000000..115c5f2ac718096ddf3bff416da05a65224bd531 --- /dev/null +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, + extra-cmake-modules, gettext, kdoctools, python, + kcoreaddons, knotifications +}: + +mkDerivation { + name = "xdg-desktop-portal-kde"; + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; + buildInputs = [ + kcoreaddons knotifications + ]; +} diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 54b112927690c12c1bd64928a1b0fe9d971df9df..65e4463600a992b279169f04959ec7bfe3bc7e09 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared_mime_info, hicolor_icon_theme }: +{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared-mime-info, hicolor-icon-theme }: let version = "2.11"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gtk shared_mime_info hicolor_icon_theme libSM ]; + buildInputs = [ libxml2 gtk shared-mime-info hicolor-icon-theme libSM ]; patches = [ ./rox-filer-2.11-in-source-build.patch diff --git a/pkgs/desktops/xfce/applications/mousepad-12134.patch b/pkgs/desktops/xfce/applications/mousepad-12134.patch new file mode 100644 index 0000000000000000000000000000000000000000..74a28ecf61afcb1eaff2c81afebf55908f6f8c16 --- /dev/null +++ b/pkgs/desktops/xfce/applications/mousepad-12134.patch @@ -0,0 +1,90 @@ +diff -urNZ a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c +--- a/mousepad/mousepad-action-group.c 2014-09-01 20:50:07.000000000 +0000 ++++ b/mousepad/mousepad-action-group.c 2017-12-18 16:57:46.836538403 +0000 +@@ -302,11 +302,6 @@ + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); + self->locked = FALSE; + +- /* update the setting when the active action is changed */ +- self->locked = TRUE; +- MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, gtk_source_style_scheme_get_id (scheme)); +- self->locked = FALSE; +- + g_object_notify (G_OBJECT (self), "active-style-scheme"); + } + +@@ -473,6 +468,8 @@ + mousepad_action_group_style_scheme_action_activate (MousepadActionGroup *self, + MousepadStyleSchemeAction *action) + { ++ const gchar *scheme_name = NULL; ++ + /* only update the active action if we're not already in the process of + * setting it and the sender action is actually active */ + if (! self->locked && +@@ -481,7 +478,14 @@ + GtkSourceStyleScheme *scheme; + + scheme = mousepad_style_scheme_action_get_style_scheme (action); +- mousepad_action_group_set_active_style_scheme (self, scheme); ++ ++ /* update the setting when the active action is changed */ ++ if (scheme != NULL) ++ scheme_name = gtk_source_style_scheme_get_id(scheme); ++ ++ self->locked = TRUE; ++ MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name); ++ self->locked = FALSE; + } + } + +diff -urNZ a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c +--- a/mousepad/mousepad-window.c 2014-09-01 20:58:02.000000000 +0000 ++++ b/mousepad/mousepad-window.c 2017-12-18 17:07:51.099321408 +0000 +@@ -712,32 +712,6 @@ + + + static void +-mousepad_window_action_group_style_scheme_changed (MousepadWindow *window, +- GParamSpec *pspec, +- MousepadActionGroup *group) +-{ +- GtkSourceStyleScheme *scheme; +- const gchar *scheme_id; +- gint npages, i; +- +- /* get the new active language */ +- scheme = mousepad_action_group_get_active_style_scheme (group); +- scheme_id = gtk_source_style_scheme_get_id (scheme); +- +- /* update the color scheme on all the documents */ +- npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook)); +- for (i = 0; i < npages; i++) +- { +- MousepadDocument *document; +- +- document = MOUSEPAD_DOCUMENT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (window->notebook), i)); +- mousepad_view_set_color_scheme (document->textview, scheme_id); +- } +-} +- +- +- +-static void + mousepad_window_create_style_schemes_menu (MousepadWindow *window) + { + GtkWidget *menu, *item; +@@ -751,13 +725,6 @@ + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); + gtk_widget_show_all (menu); + gtk_widget_show (item); +- +- /* watch for activations of the style schemes actions */ +- g_signal_connect_object (window->action_group, +- "notify::active-style-scheme", +- G_CALLBACK (mousepad_window_action_group_style_scheme_changed), +- window, +- G_CONNECT_SWAPPED); + } + + diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index c15ab310f47b8d21061e0aa5932833b62081939c..d66fa2049e6522cb5e17298b6d981f2e7b330531 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util -, gtk, gtksourceview, dbus, dbus_glib, makeWrapper +, gtk, gtksourceview, dbus, dbus-glib, makeWrapper , dconf }: stdenv.mkDerivation rec { @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; + patches = [ ./mousepad-12134.patch ]; + buildInputs = [ pkgconfig intltool libxfce4util - gtk gtksourceview dbus dbus_glib makeWrapper + gtk gtksourceview dbus dbus-glib makeWrapper dconf ]; diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index c26327f4d9206d510652aef529c23aceb5155246..812630e17d06e0ce1857f5d4b2ecdae1222aafe7 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus_glib +{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib , libnotify, popt, xfce }: @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool bison flex ]; - buildInputs = [ gtk libical dbus_glib libnotify popt xfce.libxfce4util - xfce.xfce4panel ]; + buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util + xfce.xfce4-panel ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix index 598c503809285b4ed38e9af6c300f586c7cc680e..3951c9deedc6f4da2300326d628391a2e5ea8791 100644 --- a/pkgs/desktops/xfce/applications/parole.nix +++ b/pkgs/desktops/xfce/applications/parole.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1 -, gtk, dbus_glib, libxfce4ui, libxfce4util, xfconf -, taglib, libnotify +, gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf +, taglib, libnotify, hicolor-icon-theme , withGstPlugins ? true }: @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - makeWrapper - gtk dbus_glib libxfce4ui libxfce4util xfconf + makeWrapper hicolor-icon-theme + gtk dbus-glib libxfce4ui libxfce4util xfconf taglib libnotify ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]); diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index b38b97b90438d4a6896b2078a5512776d7bcb309..f849fbd20a733df0f453237d83636fa2a6ef6766 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, libexif, gtk -, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf -, hicolor_icon_theme, makeWrapper +, exo, dbus-glib, libxfce4util, libxfce4ui, xfconf +, hicolor-icon-theme, makeWrapper }: stdenv.mkDerivation rec { @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool libexif gtk dbus_glib exo libxfce4util - libxfce4ui xfconf hicolor_icon_theme makeWrapper + [ pkgconfig intltool libexif gtk dbus-glib exo libxfce4util + libxfce4ui xfconf hicolor-icon-theme makeWrapper ]; postInstall = '' wrapProgram "$out/bin/ristretto" \ - --prefix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" + --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" ''; meta = { diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index ad1727da3b93f1f5dd4ebc07bc348e147d8e35df..773a8274f341e8d4ea57577afb6f768dbb86ff72 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus_glib +{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus-glib , exo, libxfce4util, libxfce4ui }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ]; + buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ]; meta = { homepage = http://www.xfce.org/projects/terminal; diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index 05a5fa4a6fccc016c9925831725c2a5ccd0d6183..93a7fad4918aa3dd9374513726d2a659390cdbf8 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, makeWrapper , glib, gstreamer, gst-plugins-base, gtk -, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null +, libxfce4util, libxfce4ui, xfce4-panel, xfconf, libunique ? null , pulseaudioSupport ? false, gst-plugins-good }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool glib gstreamer gtk - libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper + libxfce4util libxfce4ui xfce4-panel xfconf libunique makeWrapper ] ++ gst_plugins; postInstall = diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index ffcdf483577972351966dbaee74e0fd8ecc431d6..28c586382b46ce5ef26caad29f10efe2ce86e9ec 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 -, makeWrapper, glib_networking, exo, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup +, makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme glib_networking + xfce4-panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking ]; meta = { diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index a213b27a76191fd16c46555244950d3690535991..6b5ee4b313288d09bb94d5f26f3ee3e294da9493 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util -, hicolor_icon_theme }: +, hicolor-icon-theme }: stdenv.mkDerivation rec { p_name = "exo"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/ nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor_icon_theme ]; + buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ]; meta = with stdenv.lib; { homepage = "http://www.xfce.org/projects/${p_name}"; diff --git a/pkgs/desktops/xfce/core/garcon-10967.patch b/pkgs/desktops/xfce/core/garcon-10967.patch new file mode 100644 index 0000000000000000000000000000000000000000..aea12325547825765901d9b6df4abe81fe6cb3dc --- /dev/null +++ b/pkgs/desktops/xfce/core/garcon-10967.patch @@ -0,0 +1,14 @@ +diff -urNZ a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c +--- a/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:22:33.551926068 +0000 ++++ b/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:23:33.055497211 +0000 +@@ -676,6 +676,9 @@ + G_CALLBACK (garcon_gtk_menu_deactivate), menu); + gtk_widget_show (mi); + ++ /* submenu are child items, too. */ ++ has_children = TRUE; ++ + if (menu->priv->show_menu_icons) + { + icon_name = garcon_menu_element_get_icon_name (li->data); +Binary files a/.git/index and b/.git/index differ diff --git a/pkgs/desktops/xfce/core/garcon-12700.patch b/pkgs/desktops/xfce/core/garcon-12700.patch new file mode 100644 index 0000000000000000000000000000000000000000..b95a65cc21941cb548a13d2da97b5fc2fbdbb536 --- /dev/null +++ b/pkgs/desktops/xfce/core/garcon-12700.patch @@ -0,0 +1,44 @@ +From 222080e6d5fce85eb2a8a5c33df671bd9f21add8 Mon Sep 17 00:00:00 2001 +From: Yegor Timoshenko +Date: Thu, 14 Dec 2017 22:04:04 +0000 +Subject: [PATCH] Decrement allocation counter on item unref (#12700) + +--- + garcon/garcon-menu-item-pool.c | 7 ++++++- + garcon/garcon-menu-item.c | 2 ++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c +index 2017180..355e520 100644 +--- a/garcon/garcon-menu-item-pool.c ++++ b/garcon/garcon-menu-item-pool.c +@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id, + g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE); + g_return_val_if_fail (node != NULL, FALSE); + +- return garcon_menu_node_tree_rule_matches (node, item); ++ gboolean matches = garcon_menu_node_tree_rule_matches (node, item); ++ ++ if (matches) ++ garcon_menu_item_increment_allocated (item); ++ ++ return matches; + } + + +diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c +index 66a86bf..d61c88f 100644 +--- a/garcon/garcon-menu-item.c ++++ b/garcon/garcon-menu-item.c +@@ -1516,6 +1516,8 @@ garcon_menu_item_unref (GarconMenuItem *item) + { + g_return_if_fail (GARCON_IS_MENU_ITEM (item)); + ++ garcon_menu_item_decrement_allocated (item); ++ + /* Decrement the reference counter */ + g_object_unref (G_OBJECT (item)); + } +-- +2.15.1 + diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 46b9a372009022de5bab00b6132af6635d49386f..d9c918c0fdc1cbe8cd853b0d209b47ac575228e9 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" ]; + patches = [ ./garcon-10967.patch ./garcon-12700.patch ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ]; @@ -24,4 +25,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 58fc6c3fe4be0d13b773f6c8914fb6d9de94a47a..e8d5b4acd76908dfeef214f93de3667ac49dfe5e 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf -, libglade, libstartup_notification, hicolor_icon_theme +, libglade, libstartup_notification, hicolor-icon-theme , withGtk3 ? false, gtk3 }: let @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libxfce4util xfconf libglade - libstartup_notification hicolor_icon_theme + libstartup_notification hicolor-icon-theme ] ++ optional withGtk3 gtk3; propagatedBuildInputs = [ xorg.libICE xorg.libSM ]; diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index 106cda6b97577328c16e37b879fff7400603206d..7fe76057c93002fde0fe416b5e2d710274837059 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk -, libxfce4util, xfconf, libglade, libstartup_notification, hicolor_icon_theme }: +, libxfce4util, xfconf, libglade, libstartup_notification, hicolor-icon-theme }: let p_name = "libxfcegui4"; ver_maj = "4.10"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade - libstartup_notification hicolor_icon_theme + libstartup_notification hicolor-icon-theme ]; meta = { diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix index bfc55f87b5cd3dbcdfd657f486e8c234871b64fa..5f8cc71de851bc1163e23f45997d2970590dcc76 100644 --- a/pkgs/desktops/xfce/core/thunar-build.nix +++ b/pkgs/desktops/xfce/core/thunar-build.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool -, gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev -, exo, libxfce4util, xfconf, xfce4panel, wrapGAppsHook +, gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev +, exo, libxfce4util, xfconf, xfce4-panel, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ intltool - gtk dbus_glib libstartup_notification libnotify libexif pcre udev - exo libxfce4util xfconf xfce4panel + gtk dbus-glib libstartup_notification libnotify libexif pcre udev + exo libxfce4util xfconf xfce4-panel ]; # TODO: optionality? diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index 037a3f947fbed8c272b1633ddeef0435c1167028..83e3a2879d79bd3b7168f96ba9b354e159ea9a5d 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-build +{ stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-bare , thunarPlugins ? [] }: @@ -6,7 +6,7 @@ with stdenv.lib; let - build = thunar-build; + build = thunar-bare; replaceLnExeListWithWrapped = exeDir: exeNameList: mkWrapArgs: '' exeDir="${exeDir}" @@ -50,7 +50,7 @@ runCommand name { } (let buildWithPlugins = buildEnv { - name = "thunar-build-with-plugins"; + name = "thunar-bare-with-plugins"; paths = [ build ] ++ thunarPlugins; }; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 6e785c9438bb65b800f2a49f9da0a4a4f7b27a11..3e1d2be2b5313f8054e5543d8e419abb80b00add 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk_pixbuf, curl, freetype , libgsf, poppler, bzip2 }: let p_name = "tumbler"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - intltool dbus_glib gdk_pixbuf curl freetype + intltool dbus-glib gdk_pixbuf curl freetype poppler libgsf bzip2 ]; diff --git a/pkgs/desktops/xfce/core/xfce4-light-locker.patch b/pkgs/desktops/xfce/core/xfce4-light-locker.patch index 4e1dcc1efa717ee9d50a065005caf735bf486b90..0fabdffd7ed6bbbc220e45b88acde9e5a46975d7 100644 --- a/pkgs/desktops/xfce/core/xfce4-light-locker.patch +++ b/pkgs/desktops/xfce/core/xfce4-light-locker.patch @@ -1,16 +1,25 @@ --- ./scripts/xflock4.orig 2017-08-06 23:05:53.807688995 +0100 +++ ./scripts/xflock4 2017-08-06 23:09:06.171789989 +0100 -@@ -24,10 +24,11 @@ +@@ -24,12 +24,19 @ PATH=/bin:/usr/bin export PATH - + -# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running -+# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective daemon is running ++# First test for the command set in the session's xfconf channel ++LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand) ++ ++# Lock by xscreensaver, gnome-screensaver, or light-locker, if a respective daemon is running for lock_cmd in \ ++ "$LOCK_CMD" \ "xscreensaver-command -lock" \ - "gnome-screensaver-command --lock" + "gnome-screensaver-command --lock" \ + "light-locker-command -l" do - $lock_cmd >/dev/null 2>&1 && exit +- $lock_cmd >/dev/null 2>&1 && exit ++ if [ ! -z "$lock_cmd" ]; then ++ $lock_cmd >/dev/null 2>&1 && exit ++ fi done + + # else run another access locking utility, if installed diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index e91a3ab25ee90ba845047941d08750c1ff510eca..17fd08faf69c829da4672531b550acda1e59fecc 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification -, makeWrapper, xfce4mixer, hicolor_icon_theme -, withGtk3 ? false, gtk3, gettext +, makeWrapper, xfce4-mixer, hicolor-icon-theme +, withGtk3 ? false, gtk3, gettext, glib-networking }: let inherit (stdenv.lib) optional; p_name = "xfce4-panel"; ver_maj = "4.12"; - ver_min = "1"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1s52k80911pkp65zkxw9mrnczxsd81svr0djmmcfpjd9rj08pmck"; + sha256 = "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2"; }; patches = [ ./xfce4-panel-datadir.patch ]; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck - garcon xfconf libstartup_notification makeWrapper hicolor_icon_theme - ] ++ xfce4mixer.gst_plugins + garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme + ] ++ xfce4-mixer.gst_plugins ++ optional withGtk3 gtk3; propagatedBuildInputs = [ (if withGtk3 then libxfce4ui_gtk3 else libxfce4ui) ]; @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xfce4-panel" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index c72061e577e8a64d0d8212c127ef73eccd7f2729..ffcc67bf0e9b540b26dfec9140e294e1dfe0a00c 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus_glib, upower, xfconf -, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor_icon_theme +{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf +, libxfce4ui, libxfce4util, libnotify, xfce4-panel, hicolor-icon-theme , withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }: let p_name = "xfce4-power-manager"; @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig intltool glib dbus_glib upower xfconf libxfce4util - libnotify hicolor_icon_theme + [ pkgconfig intltool glib dbus-glib upower xfconf libxfce4util + libnotify hicolor-icon-theme ] ++ (if withGtk3 then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ] - else [ gtk libxfce4ui xfce4panel ]); + else [ gtk libxfce4ui xfce4-panel ]); postPatch = lib.optionalString withGtk3 '' substituteInPlace configure --replace gio-2.0 gio-unix-2.0 diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index edc810d389722cfe4cdea35bd335af5f309be619..2d5a169a215d223ca7912a8dc2b7b43fd74267fd 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit -, libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus_glib, xfconf, libglade, xorg -, hicolor_icon_theme +, libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg +, hicolor-icon-theme }: let @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib - xfconf xfce4panel libglade xorg.iceauth xorg.libSM - polkit hicolor_icon_theme + [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib + xfconf xfce4-panel libglade xorg.iceauth xorg.libSM + polkit hicolor-icon-theme ]; #TODO: upower-glib, gconf (assistive?), gnome keyring preBuild = '' diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index fbf03cc4a81d4c5724443a531bf4929ca910c820..9aa66a1343f65c019a80b12a0fc254f7390437cd 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus-glib }: let p_name = "xfconf"; ver_maj = "4.12"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib libxfce4util ]; - propagatedBuildInputs = [ dbus_glib ]; + propagatedBuildInputs = [ dbus-glib ]; meta = with stdenv.lib; { homepage = http://docs.xfce.org/xfce/xfconf/start; diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 8802862edddeae973d71cb89b85efa5d44a2f293..48585b4004bb60fb902dd5a4ea6a96e454783bc1 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui -, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify -, hicolor_icon_theme }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui +, libwnck, xfconf, libglade, xfce4-panel, thunar, exo, garcon, libnotify +, hicolor-icon-theme }: let p_name = "xfdesktop"; ver_maj = "4.12"; @@ -14,10 +14,15 @@ stdenv.mkDerivation rec { sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac"; }; - buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf - libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme - ]; + buildInputs = [ + pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf + libglade xfce4-panel thunar exo garcon libnotify hicolor-icon-theme + ]; + + patches = [(fetchpatch { + url = https://git.xfce.org/xfce/xfdesktop/patch?id=157f5b55cfc3629d595ef38984278de5915aac27; + sha256 = "0ki7hnyfpz7bdmsxqnm9qvyk040iyv1fawnhzfbyyzrh4nc5jd3x"; + })]; enableParallelBuilding = true; @@ -29,4 +34,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.eelco ]; }; } - diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index d861e5f2d5570158d11244d64e9f37c9dc860987..313a2662f0392c533cabddd49c2e62e717a39d45 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -3,14 +3,14 @@ let p_name = "xfwm4"; ver_maj = "4.12"; - ver_min = "3"; + ver_min = "4"; in stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac"; + sha256 = "0dpvdrd5lclkcrzmdpva38gfsgvdf3xkqfknvy96x6k4fn508x7s"; }; buildInputs = diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 6fa9c991dbd9cb573db9ba3f8312e19d1c20999b..d83e51a676cd3ee8a4f521986399876a67779be5 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,109 +1,208 @@ -{ config, pkgs, newScope }: +{ lib, pkgs }: -let - -callPackage = newScope (deps // xfce_self); +lib.makeScope pkgs.newScope (self: with self; { + #### NixOS support -deps = { # xfce-global dependency overrides should be here inherit (pkgs.gnome2) libglade libwnck vte gtksourceview; inherit (pkgs.gnome3) dconf; inherit (pkgs.perlPackages) URI; + gtk = pkgs.gtk2; -}; -xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach + # Samba is a rather heavy dependency + gvfs = pkgs.gvfs.override { samba = null; }; - #### NixOS support + xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc"; - gvfs = pkgs.gvfs.override { samba = null; }; # samba is a rather heavy dependency - xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc"; + #### CORE - #### CORE from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2" + exo = callPackage ./core/exo.nix { }; + + garcon = callPackage ./core/garcon.nix { }; + + # When built with GTK+3, it was breaking GTK+3 app layout + gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; }; + + libxfce4ui = callPackage ./core/libxfce4ui.nix { }; + + libxfce4util = callPackage ./core/libxfce4util.nix { }; + + libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; + + thunar-bare = callPackage ./core/thunar-build.nix { }; + + thunar = callPackage ./core/thunar.nix { }; + + # NB: thunar already has it + thunar-volman = callPackage ./core/thunar-volman.nix { }; + + thunar-archive-plugin = callPackage ./thunar-plugins/archive { }; + + thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; + + tumbler = callPackage ./core/tumbler.nix { }; + + # TODO: impure plugins from /run/current-system/sw/lib/xfce4 + xfce4-panel = callPackage ./core/xfce4-panel.nix { }; + + xfce4-session = callPackage ./core/xfce4-session.nix { }; + + xfce4-settings = callPackage ./core/xfce4-settings.nix { }; + + xfce4-power-manager = callPackage ./core/xfce4-power-manager.nix { }; + + xfconf = callPackage ./core/xfconf.nix { }; + + xfdesktop = callPackage ./core/xfdesktop.nix { }; + + xfwm4 = callPackage ./core/xfwm4.nix { }; + + xfce4-appfinder = callPackage ./core/xfce4-appfinder.nix { }; + + xfce4-dev-tools = callPackage ./core/xfce4-dev-tools.nix { }; + + #### APPLICATIONS + + gigolo = callPackage ./applications/gigolo.nix { }; + + mousepad = callPackage ./applications/mousepad.nix { }; + + orage = callPackage ./applications/orage.nix { }; + + parole = callPackage ./applications/parole.nix { }; + + ristretto = callPackage ./applications/ristretto.nix { }; + + xfce4-mixer = callPackage ./applications/xfce4-mixer.nix { }; + + xfce4-mixer-pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; }; + + xfce4-notifyd = callPackage ./applications/xfce4-notifyd.nix { }; + + xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager.nix { }; + + xfce4-terminal = callPackage ./applications/terminal.nix { }; - exo = callPackage ./core/exo.nix { }; - garcon = callPackage ./core/garcon.nix { }; - gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix - { withGtk3 = false; }; # = true; was completely breaking GTK3 app layout - libxfce4ui = callPackage ./core/libxfce4ui.nix { }; - libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; }; - libxfce4util = callPackage ./core/libxfce4util.nix { }; - libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; - thunar-build = callPackage ./core/thunar-build.nix { }; - thunar = callPackage ./core/thunar.nix { }; - thunarx-2-dev = thunar-build; # Plugins need only the `thunarx-2` part of the package. Awaiting multiple outputs. - thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now - thunar-archive-plugin - = callPackage ./thunar-plugins/archive { }; - thunar-dropbox-plugin - = callPackage ./thunar-plugins/dropbox { }; - tumbler = callPackage ./core/tumbler.nix { }; - xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4 - xfce4panel_gtk3 = xfce4panel.override { withGtk3 = true; }; - xfce4session = callPackage ./core/xfce4-session.nix { }; - xfce4settings = callPackage ./core/xfce4-settings.nix { }; - xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { }; - xfce4_power_manager_gtk3 = callPackage ./core/xfce4-power-manager.nix { withGtk3 = true; }; - xfconf = callPackage ./core/xfconf.nix { }; - xfdesktop = callPackage ./core/xfdesktop.nix { }; - xfwm4 = callPackage ./core/xfwm4.nix { }; - - xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { }; - xfce4_dev_tools = callPackage ./core/xfce4-dev-tools.nix { }; # only if autotools are needed - - #### APPLICATIONS from "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2" - - gigolo = callPackage ./applications/gigolo.nix { }; - mousepad = callPackage ./applications/mousepad.nix { }; - orage = callPackage ./applications/orage.nix { }; - parole = callPackage ./applications/parole.nix { }; - ristretto = callPackage ./applications/ristretto.nix { }; - terminal = xfce4terminal; # it has changed its name - xfce4mixer = callPackage ./applications/xfce4-mixer.nix { - pulseaudioSupport = config.pulseaudio or false; - }; - xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { }; - xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; - xfce4terminal = callPackage ./applications/terminal.nix { }; xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { }; - xfce4volumed = let - gst = callPackage ./applications/xfce4-volumed.nix { }; - pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; - in if config.pulseaudio or false then pulse else gst; - - #### 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}" - - xfce4_battery_plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { }; - xfce4_clipman_plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { }; - xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; - 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-volumed = callPackage ./applications/xfce4-volumed.nix { }; + + xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; + + #### ART + + xfce4-icon-theme = callPackage ./art/xfce4-icon-theme.nix { }; + + xfwm4-themes = callPackage ./art/xfwm4-themes.nix { }; + + #### PANEL PLUGINS + + xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { }; + + xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { }; + + xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + + 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 { }; - xfce4_mpc_plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { }; - xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; - xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; - xfce4_timer_plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { }; - xfce4_verve_plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { }; - xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; - xfce4_weather_plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; - xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { }; - xfce4_windowck_plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { }; - xfce4_pulseaudio_plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; - -}; # xfce_self - -in xfce_self + + 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 { }; + + xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { }; + + xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; + + xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; + + xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { }; + + xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { }; + + xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; + + xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; + + xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { }; + + xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { }; + + xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; + + #### GTK+3 (deprecated, see NixOS/nixpkgs#32763) + + libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; }; + + xfce4panel_gtk3 = xfce4-panel.override { withGtk3 = true; }; + + xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; }; + + #### ALIASES - added 2018-01 + + terminal = xfce4-terminal; + thunar-build = thunar-bare; + thunarx-2-dev = thunar-build; + thunar_volman = thunar-volman; + xfce4panel = xfce4-panel; + xfce4session = xfce4-session; + xfce4settings = xfce4-settings; + xfce4_power_manager = xfce4-power-manager; + xfce4_appfinder = xfce4-appfinder; + xfce4_dev_tools = xfce4-dev-tools; + xfce4mixer = xfce4-mixer; + xfce4mixer_pulse = xfce4-mixer-pulse; + xfce4notifyd = xfce4-notifyd; + xfce4taskmanager = xfce4-taskmanager; + xfce4terminal = xfce4-terminal; + xfce4volumed = xfce4-volumed; + xfce4volumed_pulse = xfce4-volumed-pulse; + xfce4icontheme = xfce4-icon-theme; + xfwm4themes = xfwm4-themes; + + xfce4_battery_plugin = xfce4-battery-plugin; + xfce4_clipman_plugin = xfce4-clipman-plugin; + xfce4_cpufreq_plugin = xfce4-cpufreq-plugin; + xfce4_cpugraph_plugin = xfce4-cpugraph-plugin; + xfce4_datetime_plugin = xfce4-datetime-plugin; + xfce4_dict_plugin = xfce4-dict-plugin; + xfce4_dockbarx_plugin = xfce4-dockbarx-plugin; + xfce4_embed_plugin = xfce4-embed-plugin; + xfce4_eyes_plugin = xfce4-eyes-plugin; + xfce4_fsguard_plugin = xfce4-fsguard-plugin; + xfce4_genmon_plugin = xfce4-genmon-plugin; + xfce4_hardware_monitor_plugin = xfce4-hardware-monitor-plugin; + xfce4_namebar_plugin = xfce4-namebar-plugin; + xfce4_netload_plugin = xfce4-netload-plugin; + xfce4_notes_plugin = xfce4-notes-plugin; + xfce4_mailwatch_plugin = xfce4-mailwatch-plugin; + xfce4_mpc_plugin = xfce4-mpc-plugin; + xfce4_sensors_plugin = xfce4-sensors-plugin; + xfce4_systemload_plugin = xfce4-systemload-plugin; + xfce4_timer_plugin = xfce4-timer-plugin; + xfce4_verve_plugin = xfce4-verve-plugin; + xfce4_xkb_plugin = xfce4-xkb-plugin; + xfce4_weather_plugin = xfce4-weather-plugin; + xfce4_whiskermenu_plugin = xfce4-whiskermenu-plugin; + xfce4_windowck_plugin = xfce4-windowck-plugin; + xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin; +}) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix index 0dcdcda699469253c237588b21047e58c882bf21..c64e8770d256476a4fc53087f3539b7405816af0 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix index 6614d746b686689921ebc4d5cf7942f1c0a4084a..236c71c66d569c5433b666937069eab1567b59d9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix index c0c8519d63aa3744413b203b56ac8731828fd7b6..0a309c433e9587ecffb9c1cfac7bc6ce090c2c6a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index fb8b1bae83d5a8b242ad97c7942ab7ce80b4eb7c..c5487198f97e5c902bec7bb547f79f54301d25f3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix index 0905a9bb16a736bdc8d265025dd307c18a0bc094..c63170100312f3ae985a89566e34202b22589928 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4panel +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4-panel , gtk }: with stdenv.lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfcegui4 xfce4panel gtk ]; + buildInputs = [ intltool libxfce4util libxfcegui4 xfce4-panel gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix index b6d0fc12db3b79e444bb1cddf1823d0cf0193306..8210fc62ccb4cc1a51177b50a99e70036114e9b4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix index 438be7e84944da52aceaa062563db017dec717a1..621b4266d10cfabf52ef960f7e87d7bdd71b08e8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ] - ++ (with xfce; [ libxfce4util xfce4panel xfconf xfce4_dev_tools ]) + ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) ++ pythonPath; postPatch = '' diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index a5cfc3659f677ae856ee13138b977eb0938e1384..0d99c2053df71c438f5ef48ba6040c199fddeee8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 81bff06500bbb43b7257bf9ace86ca89deed204c..3a79f67068c88a8d4f340ac1a37ef68c550cb7bf 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index 4f4f882d67b1df2008000932127a865463045cb6..6d0f8ee73a4c9add2e6c8274dba11a9e12eaf31e 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index c6252a48bff68fc9a0d95931fd1c154152c8a3e1..039ac144094755ed840ab6b41efa579d74babe02 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index ea17c960b2e4dfbd9197f64a26eafdc7a25eb277..cac09d0ad35c4c3167e6c172b217b3c44b41035c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, - libgtop, libxfce4ui, libxfce4util, xfce4panel, lm_sensors + libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libgtop libxfce4ui libxfce4util - xfce4panel + xfce4-panel lm_sensors ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 2b43eaca4c03be68ef2ec5ab5621f68be40d48f5..541b30ec1b3dc9b14712c2db2ff3165b86d3fc56 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, exo, gnutls, libgcrypt }: with stdenv.lib; @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk exo gnutls libgcrypt ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Mailwatch plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 6f16561d41d50af8a65d2026bf58e9e5c3804fc8..5331c29a4546d6fc52ef2ee394c5bafc4f831997 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, exo }: with stdenv.lib; @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk exo ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index e81289f26f66ffda7d9681170ca31cce24c753d4..66179996df699930dd6e664fe3c21d966a1bf462 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4panel }: +{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4-panel }: stdenv.mkDerivation rec { ver = "0.3.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4panel ]; + buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4-panel ]; postPatch = '' substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix index 9650cafedec7715c40d500afd36d7f5fcdc9a58a..a843f0223c4e4caebe9930ac4fd5e857b7b26bc4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index c8c9c7735a9fce3c1ea93c005a9c74e656b3579e..d61dae6bdd5639907eeb0bbb9ed3e8c822837867 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk libunique ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk libunique ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 3314d313ad2c10114c2841807802f68273ec10e6..5a4dfee76fc4b3ff189a18a90d85501cea1ddf53 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui, - libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat-gnu + libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { gnome2.gtk libxfce4ui libxfce4util - xfce4panel + xfce4-panel libnotify lm_sensors hddtemp diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 34677db81d12ad68cfecc83404b293286667c485..698d4aae532840811e34c53c824d259e53e3654d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 17dcb10c9d1edfccd00242878028a23037324845..c420c9fb64362009a1b5a7e1940733e7ff8256bc 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel +, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -12,8 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf - gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf + gtk hicolor-icon-theme ]; nativeBuildInputs = [ pkgconfig ]; @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { description = "Battery plugin for Xfce panel"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix index 3c0d1a488f88512e8693b0a20101fd2f9de90b1e..96ef08cbeb70d35df6723173e59a6b6b868f3436 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre -, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk }: +, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; + buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4-panel xfconf gtk ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 419efbcbf95aae1803a77c448357d452c9daa9b7..03f062532ead74bba8e05d21d53f639bf0f361b5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower, -libxfce4ui, libxfce4util, xfce4panel }: +libxfce4ui, libxfce4util, xfce4-panel }: stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; p_name = "xfce4-weather-plugin"; ver_maj = "0.8"; - ver_min = "7"; + ver_min = "10"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1c35iqqiphazkfdabbjdynk0qkc3r8vxhmk2jc6dkiv8d08727h7"; + sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf"; }; nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util - xfce4panel ]; + xfce4-panel ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index 92564c4eb684c52477ec435c421ecd8d7189ca47..c29758452ae6d50d65df84606c09370d829a0de2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, intltool, libxfce4util, libxfcegui4 -, xfce4panel, gtk, exo, garcon }: +, xfce4-panel, gtk, exo, garcon }: with stdenv.lib; stdenv.mkDerivation rec { @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig intltool ]; - buildInputs = [ libxfce4util libxfcegui4 xfce4panel gtk exo garcon ]; + buildInputs = [ libxfce4util libxfcegui4 xfce4-panel gtk exo garcon ]; enableParallelBuilding = true; preFixup = '' substituteInPlace $out/bin/xfce4-popup-whiskermenu \ - --replace $out/bin/xfce4-panel ${xfce4panel.out}/bin/xfce4-panel + --replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel ''; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index 32b2e65146203566988d6963ab8cc1cc78d2b4b1..8798851579d8b8a3fa9f27e639f8118773462aad 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2 -, exo, libxfce4ui, libxfce4util, xfce4panel, xfconf, xfce4_dev_tools }: +, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools }: stdenv.mkDerivation rec { p_name = "xfce4-windowck-plugin"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool python3 imagemagick libwnck gtk2 - exo libxfce4ui libxfce4util xfce4panel xfconf xfce4_dev_tools ]; + exo libxfce4ui libxfce4util xfce4-panel xfconf xfce4-dev-tools ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix index 453c09cfc70cac8d2583dce694fe3466f1b727cb..307d2e81bf24384ea29b5783e4f913b6c9559dfa 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4panel +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4-panel , garcon, gtk, libxklavier, librsvg, libwnck }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel garcon + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel garcon gtk libxklavier librsvg libwnck ]; meta = { diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 8ff4a74e6bf4e58374a8750975a1115a7d03e79d..9783e6c9228f45be7fdcc6bee7bd04651009a2ff 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, xfce4_dev_tools +{ stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools , gtk , thunarx-2-dev , exo, libxfce4util, libxfce4ui @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - xfce4_dev_tools + xfce4-dev-tools thunarx-2-dev exo gtk libxfce4util libxfce4ui xfconf udev libnotify diff --git a/pkgs/desktops/xfce4-13/automakeAddFlags.sh b/pkgs/desktops/xfce4-13/automakeAddFlags.sh new file mode 100644 index 0000000000000000000000000000000000000000..92d5659d05ca762b1bbf278f2131a0debde0d21d --- /dev/null +++ b/pkgs/desktops/xfce4-13/automakeAddFlags.sh @@ -0,0 +1,7 @@ +automakeAddFlags() { + local file="$1" + local target="$2" + local source="$3" + + sed "/$target/a\$($source) \\\\" -i $file +} diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..451322bcaf97e4cbc893df73e48c99d9f284c0ce --- /dev/null +++ b/pkgs/desktops/xfce4-13/default.nix @@ -0,0 +1,80 @@ +{ lib, makeSetupHook, newScope, gnome3, gst_all_1 }: + +let + inherit (lib) makeScope; +in + +makeScope newScope (self: with self; { + mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; + + automakeAddFlags = makeSetupHook { } ./automakeAddFlags.sh; + + exo = callPackage ./exo { }; + + garcon = callPackage ./garcon { }; + + gigolo = callPackage ./gigolo { }; + + libxfce4util = callPackage ./libxfce4util { }; + + libxfce4ui = callPackage ./libxfce4ui { }; + + mousepad = callPackage ./mousepad { + inherit (gnome3) gtksourceview; + }; + + orage = callPackage ./orage { }; + + parole = callPackage ./parole { + inherit (gst_all_1) gst-plugins-bad gst-plugins-base gst-plugins-good; + gst-plugins-ugly = null; + }; + + ristretto = callPackage ./ristretto { }; + + thunar = callPackage ./thunar { }; + + thunar-volman = callPackage ./thunar-volman { }; + + tumbler = callPackage ./tumbler { }; + + xfburn = callPackage ./xfburn { }; + + xfconf = callPackage ./xfconf { }; + + xfdesktop = callPackage ./xfdesktop { }; + + xfce4-appfinder = callPackage ./xfce4-appfinder { }; + + xfce4-dev-tools = callPackage ./xfce4-dev-tools { + mkXfceDerivation = mkXfceDerivation.override { + xfce4-dev-tools = null; + }; + }; + + xfce4-dict = callPackage ./xfce4-dict { }; + + xfce4-mixer = callPackage ./xfce4-mixer { }; + + xfce4-notifyd = callPackage ./xfce4-notifyd { }; + + xfce4-panel = callPackage ./xfce4-panel { }; + + xfce4-power-manager = callPackage ./xfce4-power-manager { }; + + xfce4-screenshooter = callPackage ./xfce4-screenshooter { + inherit (gnome3) libsoup; + }; + + xfce4-taskmanager = callPackage ./xfce4-taskmanager { }; + + xfce4-settings = callPackage ./xfce4-settings { }; + + xfce4-terminal = callPackage ./xfce4-terminal { + inherit (gnome3) vte; + }; + + xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { }; + + xfwm4 = callPackage ./xfwm4 { }; +}) diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e11309135dd7cb9284c2a6799a1a81b6c63a9595 --- /dev/null +++ b/pkgs/desktops/xfce4-13/exo/default.nix @@ -0,0 +1,23 @@ +{ mkXfceDerivation, docbook_xml_xslt, libxslt, perlPackages, gtk2, gtk3 +, libxfce4ui, libxfce4util }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "exo"; + version = "0.11.5"; + + sha256 = "0zxv7cx1xbjls7q2blv8ir9zwzyq7r189n6q35jwasns7rxj256v"; + + nativeBuildInputs = [ libxslt perlPackages.URI ]; + buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ]; + + postPatch = '' + substituteInPlace docs/reference/Makefile.am \ + --replace http://docbook.sourceforge.net/release/xsl/current \ + ${docbook_xml_xslt}/share/xml/docbook-xsl + ''; + + meta = { + description = "Application library for Xfce"; + }; +} diff --git a/pkgs/desktops/xfce4-13/exo/gtk3-only.patch b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch new file mode 100644 index 0000000000000000000000000000000000000000..74e6f812e3c73b890b27d8cd88bc86b9ac8ad787 --- /dev/null +++ b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch @@ -0,0 +1,28 @@ +diff -urNZ a/configure.ac.in b/configure.ac.in +--- a/configure.ac.in 2017-11-20 02:57:40.476664918 +0000 ++++ b/configure.ac.in 2017-11-20 03:07:18.999128370 +0000 +@@ -165,11 +165,9 @@ + dnl *********************************** + XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) + XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) +-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) + XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0]) + XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) + XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) + +diff -urNZ a/exo/Makefile.am b/exo/Makefile.am +--- a/exo/Makefile.am 2017-11-20 02:57:34.444785202 +0000 ++++ b/exo/Makefile.am 2017-11-20 03:00:49.402897465 +0000 +@@ -117,7 +117,7 @@ + + libexo_2_includedir = $(includedir)/exo-2/exo + +-lib_LTLIBRARIES += libexo-2.la ++lib_LTLIBRARIES = libexo-2.la + + libexo_2_include_HEADERS = \ + exo.h \ +Binary files a/.git/index and b/.git/index differ diff --git a/pkgs/desktops/xfce4-13/garcon/12700.patch b/pkgs/desktops/xfce4-13/garcon/12700.patch new file mode 100644 index 0000000000000000000000000000000000000000..fda36d696510a45bf769fd18fc4fac486b7ae6e4 --- /dev/null +++ b/pkgs/desktops/xfce4-13/garcon/12700.patch @@ -0,0 +1,37 @@ +From: Yegor Timoshenko +Date: Thu, 14 Dec 2017 21:13:02 +0000 +Subject: [PATCH] Decrement allocation counter on item unref (#12700) + +diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c +index 2017180..355e520 100644 +--- a/garcon/garcon-menu-item-pool.c ++++ b/garcon/garcon-menu-item-pool.c +@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id, + g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE); + g_return_val_if_fail (node != NULL, FALSE); + +- return garcon_menu_node_tree_rule_matches (node, item); ++ gboolean matches = garcon_menu_node_tree_rule_matches (node, item); ++ ++ if (matches) ++ garcon_menu_item_increment_allocated (item); ++ ++ return matches; + } + + +diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c +index ca8cb63..b44acfe 100644 +--- a/garcon/garcon-menu-item.c ++++ b/garcon/garcon-menu-item.c +@@ -1908,6 +1908,8 @@ garcon_menu_item_unref (GarconMenuItem *item) + { + g_return_if_fail (GARCON_IS_MENU_ITEM (item)); + ++ garcon_menu_item_decrement_allocated (item); ++ + /* Decrement the reference counter */ + g_object_unref (G_OBJECT (item)); + } +-- +2.15.1 diff --git a/pkgs/desktops/xfce4-13/garcon/13785.patch b/pkgs/desktops/xfce4-13/garcon/13785.patch new file mode 100644 index 0000000000000000000000000000000000000000..1b723d21d60a6ae63fd03df2810324513aea9f95 --- /dev/null +++ b/pkgs/desktops/xfce4-13/garcon/13785.patch @@ -0,0 +1,75 @@ +From 4387496fe332a50945e7db76bc2196b419656fe3 Mon Sep 17 00:00:00 2001 +From: Stefan Berzl +Date: Mon, 21 Aug 2017 18:39:07 +0300 +Subject: [PATCH] fix: some menu icons are too big (Bug #13785) + +Some packages only provide icons in sizes much bigger than the standard +GTK menu size of 16px. + +The clipboard manager qlipper for example provides the following icon: +/usr/share/icons/hicolor/128x128/apps/qlipper.png + +In GTK 3.22.18 the function gtk_image_new_from_icon_name when given +GTK_ICON_SIZE_MENU as second argument still returns an image with 128x128. + +The patch I have supplied uses existing code to scale such an image. + +Signed-off-by: Eric Koegel +--- + garcon-gtk/garcon-gtk-menu.c | 33 +++++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 14 deletions(-) + +diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c +index 41990f2..f31a1ed 100644 +--- a/garcon-gtk/garcon-gtk-menu.c ++++ b/garcon-gtk/garcon-gtk-menu.c +@@ -650,7 +650,11 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h); + size = MIN (w, h); + +- if (! gtk_icon_theme_has_icon (icon_theme, icon_name)) ++ if (gtk_icon_theme_has_icon (icon_theme, icon_name)) ++ { ++ pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);; ++ } ++ else + { + if (g_path_is_absolute (icon_name)) + { +@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) + g_free (name); + } + } ++ } + +- /* Turn the pixbuf into a gtk_image */ +- if (G_LIKELY (pixbuf)) +- { +- /* scale the pixbuf down if it needs it */ +- GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); +- g_object_unref (pixbuf); +- pixbuf = tmp; ++ /* Turn the pixbuf into a gtk_image */ ++ if (G_LIKELY (pixbuf)) ++ { ++ /* scale the pixbuf down if it needs it */ ++ GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); ++ g_object_unref (G_OBJECT (pixbuf)); + +- image = gtk_image_new_from_pixbuf (pixbuf); +- g_object_unref (G_OBJECT (pixbuf)); +- } ++ image = gtk_image_new_from_pixbuf (pixbuf_scaled); ++ g_object_unref (G_OBJECT (pixbuf_scaled)); ++ } ++ else ++ { ++ /* display the placeholder at least */ ++ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + } +- +- if (image == NULL) +- image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + + return image; + } diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/pkgs/desktops/xfce4-13/garcon/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a88d64702a1a62f10c94ce51b455e91a9915be93 --- /dev/null +++ b/pkgs/desktops/xfce4-13/garcon/default.nix @@ -0,0 +1,12 @@ +{ mkXfceDerivation, gtk2 ? null, gtk3, libxfce4ui, libxfce4util }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "garcon"; + version = "0.6.1"; + + sha256 = "19k8bwn29x7hkg882pxv5xxmrbfagdqgkxg166pwz2k0prab6hl8"; + + patches = [ ./12700.patch ./13785.patch ]; + buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ]; +} diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/pkgs/desktops/xfce4-13/gigolo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0d7b2210b12ce9c019dd59f72e2cff20eed86655 --- /dev/null +++ b/pkgs/desktops/xfce4-13/gigolo/default.nix @@ -0,0 +1,11 @@ +{ mkXfceDerivation, gtk2, libX11 }: + +mkXfceDerivation rec { + category = "apps"; + pname = "gigolo"; + version = "0.4.2"; + + sha256 = "0qd2jkf3zsvfyd9jn8bfnljja1xfj3ph4wjh3fx10dcwcd791al1"; + + buildInputs = [ gtk2 libX11 ]; +} diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..63df0b7cc9adc7a424e116de2bff5f9eebaedfab --- /dev/null +++ b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix @@ -0,0 +1,18 @@ +{ lib, mkXfceDerivation, gobjectIntrospection, gtk2, gtk3 +, libstartup_notification ? null, libxfce4util, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "libxfce4ui"; + version = "4.13.4"; + + sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy"; + + buildInputs = [ gobjectIntrospection gtk2 gtk3 libstartup_notification xfconf ]; + propagatedBuildInputs = [ libxfce4util ]; + + meta = with lib; { + description = "Widgets library for Xfce"; + license = licenses.lgpl2Plus; + }; +} diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-13/libxfce4util/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..091d73bf72a41d4fdf3afab7f29a95dbf0b2e17d --- /dev/null +++ b/pkgs/desktops/xfce4-13/libxfce4util/default.nix @@ -0,0 +1,16 @@ +{ lib, mkXfceDerivation, gobjectIntrospection }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "libxfce4util"; + version = "4.13.1"; + + sha256 = "001ls90an2pi9l04g3r6syfa4lhyvjymp0r9djxrkc2q493mcv3d"; + + buildInputs = [ gobjectIntrospection ]; + + meta = with lib; { + description = "Extension library for Xfce"; + license = licenses.lgpl2Plus; + }; +} diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix new file mode 100644 index 0000000000000000000000000000000000000000..f08272e9db072de2cf38c04ec60bd27559a48fb6 --- /dev/null +++ b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools ? null }: + +{ category, pname, sha256 ? null, version, ... } @ args: + +let + inherit (builtins) filter getAttr head isList; + inherit (stdenv.lib) attrNames concatLists recursiveUpdate zipAttrsWithNames; + + filterAttrNames = f: attrs: + filter (n: f (getAttr n attrs)) (attrNames attrs); + + concatAttrLists = attrsets: + zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; + + template = rec { + name = "${pname}-${version}"; + + nativeBuildInputs = [ pkgconfig xfce4-dev-tools ]; + configureFlags = [ "--enable-maintainer-mode" ]; + + src = fetchgit { + url = "git://git.xfce.org/${category}/${pname}"; + rev = name; + inherit sha256; + }; + + enableParallelBuilding = true; + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + homepage = "https://git.xfce.org/${category}/${pname}/about"; + license = licenses.gpl2; # some libraries are under LGPLv2+ + platforms = platforms.linux; + }; + }; + + publicArgs = removeAttrs args [ "category" "pname" "sha256" ]; +in + +stdenv.mkDerivation (recursiveUpdate template publicArgs // concatAttrLists [ template args ]) diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/pkgs/desktops/xfce4-13/mousepad/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..84206f763f3e2ee666d03a37679d6b7e292ec5e1 --- /dev/null +++ b/pkgs/desktops/xfce4-13/mousepad/default.nix @@ -0,0 +1,12 @@ +{ mkXfceDerivation, exo, wrapGAppsHook, dbus_glib ? null, gtk3, gtksourceview }: + +mkXfceDerivation rec { + category = "apps"; + pname = "mousepad"; + version = "0.4.0"; + + sha256 = "0mm90iq2yd3d0qbgsjyk3yj25k0gm3p34jazl640vixk84v20lyw"; + + nativeBuildInputs = [ exo wrapGAppsHook ]; + buildInputs = [ dbus_glib gtk3 gtksourceview ]; +} diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6a2f37cbef67244b2262d502de8a3d1bd5ee35c4 --- /dev/null +++ b/pkgs/desktops/xfce4-13/orage/default.nix @@ -0,0 +1,18 @@ +{ lib, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null +, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: + +assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; + +let + inherit (lib) optionals; +in + +mkXfceDerivation rec { + category = "apps"; + pname = "orage"; + version = "4.12.1"; + + sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; + buildInputs = [ dbus_glib gtk2 libical libnotify popt ] + ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; +} diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-13/parole/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c1976727c048d946d38004aca5abe373fa7b6f9e --- /dev/null +++ b/pkgs/desktops/xfce4-13/parole/default.nix @@ -0,0 +1,36 @@ +{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus_glib +, gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good +, gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util +, taglib ? null, xfconf }: + +# Doesn't seem to find H.264 codec even though built with gst-plugins-bad. + +mkXfceDerivation rec { + category = "apps"; + pname = "parole"; + version = "0.9.2"; + + sha256 = "07i9d7xn2ys3z71sxvr53idq4ivy94pqgxvr0k78crva39ls08s5"; + + postPatch = '' + substituteInPlace src/plugins/mpris2/Makefile.am \ + --replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS + ''; + + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + + buildInputs = [ + dbus + dbus_glib + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gtk3 + libnotify + libxfce4ui + libxfce4util + taglib + xfconf + ]; +} diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-13/ristretto/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5296723eb401c6884c0f32970b24e7684c381a7d --- /dev/null +++ b/pkgs/desktops/xfce4-13/ristretto/default.nix @@ -0,0 +1,18 @@ +{ mkXfceDerivation, automakeAddFlags, exo, dbus_glib, gtk2, libexif +, libxfce4ui, libxfce4util, xfconf }: + +mkXfceDerivation rec { + category = "apps"; + pname = "ristretto"; + version = "0.8.2"; + + postPatch = '' + automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS + automakeAddFlags src/Makefile.am ristretto_LDADD DBUS_GLIB_LIBS + ''; + + nativeBuildInputs = [ automakeAddFlags exo ]; + buildInputs = [ dbus_glib gtk2 libexif libxfce4ui libxfce4util xfconf ]; + + sha256 = "0ra50452ldk91pvhcpl3f3rhdssw3djfr6cm0hc29v8r58am0wni"; +} diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/pkgs/desktops/xfce4-13/thunar-volman/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0055d0d82179669d82e80f1afed2ad1697918b47 --- /dev/null +++ b/pkgs/desktops/xfce4-13/thunar-volman/default.nix @@ -0,0 +1,11 @@ +{ mkXfceDerivation, exo, gtk3, libgudev, libxfce4ui, libxfce4util, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "thunar-volman"; + version = "0.9.0"; + + buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; + + sha256 = "08aqbp3i0z6frj7z3laz9nj641iakrcr7vh2dxb057ky24gj61i7"; +} diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7503e67e4a56ca1fc592cd92f5a19dfba51e639d --- /dev/null +++ b/pkgs/desktops/xfce4-13/thunar/default.nix @@ -0,0 +1,30 @@ +{ mkXfceDerivation, docbook_xml_xslt, exo, gdk_pixbuf, gtk3, libgudev ? null +, libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "thunar"; + version = "1.7.0"; + + sha256 = "1s262hii524a5hb15pb8xbrrrhyi5fj3837zgbscg3rdnsm52igw"; + + postPatch = '' + substituteInPlace docs/Makefile.am \ + --replace http://docbook.sourceforge.net/release/xsl/current \ + ${docbook_xml_xslt}/share/xml/docbook-xsl + ''; + + nativeBuildInputs = [ libxslt ]; + + buildInputs = [ + exo + gdk_pixbuf + gtk3 + libgudev + libnotify + libX11 + libxfce4ui + libxfce4util + xfconf + ]; +} diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-13/tumbler/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6bcdbfbc41e34f44211a4ddd3b6d1ac281f8a9cf --- /dev/null +++ b/pkgs/desktops/xfce4-13/tumbler/default.nix @@ -0,0 +1,14 @@ +{ mkXfceDerivation, gdk_pixbuf ? null, ffmpegthumbnailer ? null, libgsf ? null +, poppler ? null }: + +# TODO: add libopenraw + +mkXfceDerivation rec { + category = "xfce"; + pname = "tumbler"; + version = "0.2.0"; + + sha256 = "0jr6rhgc57yqb3iwp7y49yf5ig541liaz6xpvjl45ki34j091iaj"; + + buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ]; +} diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-13/xfburn/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..266722c9b053a8546212bc1b6ff5ce2de3813134 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfburn/default.nix @@ -0,0 +1,18 @@ +{ mkXfceDerivation, docbook_xml_xslt, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfburn"; + version = "0.5.5"; + + postPatch = '' + substituteInPlace docs/Makefile.am \ + --replace http://docbook.sourceforge.net/release/xsl/current \ + ${docbook_xml_xslt}/share/xml/docbook-xsl + ''; + + sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp"; + + nativeBuildInputs = [ libxslt ]; + buildInputs = [ exo gtk2 libburn libICE libisofs libSM libxfce4ui ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..65941fee4c4a2fae50579e2e667250f37392968f --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix @@ -0,0 +1,12 @@ +{ mkXfceDerivation, exo, garcon, gtk3, libxfce4util, libxfce4ui, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfce4-appfinder"; + version = "4.13.0"; + + sha256 = "13xsshzw04gx5rhalx4r0khjb0dbq26fv6n20biyiai1ykznyryy"; + + nativeBuildInputs = [ exo ]; + buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ab64acee0504e0bda059d7cb5ca7f578cf7d38c9 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix @@ -0,0 +1,31 @@ +{ mkXfceDerivation, autoreconfHook, autoconf, automake, glib, gtk_doc, intltool, libtool }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfce4-dev-tools"; + version = "4.12.0"; + + sha256 = "0bbmlmw2dpm10q2wv3vy592i0vx7b5h1qnd35j0fdzxqb8x2hbw2"; + + nativeBuildInputs = [ autoreconfHook ]; + + propagatedBuildInputs = [ + autoconf + automake + glib + gtk_doc + intltool + libtool + ]; + + preAutoreconf = '' + substitute configure.ac.in configure.ac \ + --subst-var-by REVISION UNKNOWN + ''; + + setupHook = ./setup-hook.sh; + + meta = { + description = "Autoconf macros and scripts to augment app build systems"; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..600bf47fd872af3f95cfdfd7ed13df37cfcc9364 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh @@ -0,0 +1,12 @@ +xdtEnvHook() { + addToSearchPath ACLOCAL_PATH $1/share/xfce4/dev-tools/m4macros +} + +envHooks+=(xdtEnvHook) + +xdtAutogenPhase() { + mkdir -p m4 + NOCONFIGURE=1 xdt-autogen +} + +preConfigurePhases+=(xdtAutogenPhase) diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch b/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch new file mode 100644 index 0000000000000000000000000000000000000000..787b63511a23bf3cb2490050af5df38c412a57e8 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch @@ -0,0 +1,11 @@ +diff -urNZ a/configure.ac.in b/configure.ac.in +--- a/configure.ac.in 2017-12-16 19:46:13.784914017 +0000 ++++ b/configure.ac.in 2017-12-16 19:46:38.612477052 +0000 +@@ -53,6 +53,7 @@ + dnl *********************************** + dnl *** Check for required packages *** + dnl *********************************** ++XDT_CHECK_PACKAGE([GIO], [gio-unix-2.0], [2.32.0]) + XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0]) + XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0]) diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a5357ebd5901f245f3a7da6c405884f4089e2038 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix @@ -0,0 +1,19 @@ +{ mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-dict"; + version = "0.8.0"; + + sha256 = "1r1k9cgl7zkn3q4mjf7qjql6vlxkb2m0spgj9p646mw7bnhbf9wr"; + + patches = [ ./configure-gio.patch ]; + + nativeBuildInputs = [ automakeAddFlags ]; + + postPatch = '' + automakeAddFlags lib/Makefile.am libdict_la_CFLAGS GIO_CFLAGS + ''; + + buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..96deb96e7f7dc347046f8c421bdf2f2eeae249ac --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix @@ -0,0 +1,30 @@ +{ mkXfceDerivation, automakeAddFlags, dbus_glib, gst-plugins-base, gtk2 +, libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-mixer"; + version = "4.11.0"; + + sha256 = "1kiz5ysn4rqkjfzz4dvbsfj64kqqayg7bqakcys3rw28g2q5qyys"; + + nativeBuildInputs = [ automakeAddFlags ]; + + postPatch = '' + automakeAddFlags panel-plugin/Makefile.am libmixer_la_CFLAGS DBUS_GLIB_CFLAGS + automakeAddFlags xfce4-mixer/Makefile.am xfce4_mixer_CFLAGS DBUS_GLIB_CFLAGS + ''; + + buildInputs = [ + dbus_glib + gst-plugins-base + gtk2 + libICE + libSM + libunique + libxfce4ui + libxfce4util + xfce4-panel + xfconf + ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b4be0a35a130a41cb42b0726e7bcb8440f8657cb --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix @@ -0,0 +1,13 @@ +{ mkXfceDerivation, dbus_glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util +, xfce4-panel, xfconf }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-notifyd"; + version = "0.4.1"; + + sha256 = "12mqi0q1hcjm16f4pndq7l58h2n0nq160r5fqx8ns320i83nh94k"; + + nativeBuildInputs = [ dbus_glib exo ]; + buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..88ba2de49be0e435d2bb67f289a45bb64622f9fc --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix @@ -0,0 +1,15 @@ +{ mkXfceDerivation, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfce4-panel"; + version = "4.13.2"; + + sha256 = "194pihmg7af4x81nia2fy3h7rls306a7c0bqny9ycqikvi6nmdmn"; + + buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ]; + + meta = { + description = "Xfce's panel"; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bf998d2e819059b1ec87e2d3afc76eb86e3dd756 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix @@ -0,0 +1,19 @@ +{ mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify +, libxfce4ui, libxfce4util, upower, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfce4-power-manager"; + version = "1.6.0"; + + sha256 = "1sh6ydn44j1yki8f020ljayp1fjcigkywcvjp38fsk7j25ni2wrp"; + + nativeBuildInputs = [ automakeAddFlags exo ]; + buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; + + postPatch = '' + substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0 + automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS + automakeAddFlags src/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS + ''; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5e2c296f056baed73d80f232c738cb5b344f0f58 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix @@ -0,0 +1,11 @@ +{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-screenshooter"; + version = "1.9.1"; + + sha256 = "1q13hvaz3ykrbgbbqb1186mhri8r9hkmpaayjwhnkvjm7jfyhbin"; + + buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..235c5cd15e4245becfe14d036a896365684da883 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix @@ -0,0 +1,39 @@ +{ mkXfceDerivation, automakeAddFlags, dbus_glib, exo, garcon, gtk3 +, libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null +, upower ? null, xfconf, xf86inputlibinput ? null }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfce4-settings"; + version = "4.13.1"; + + sha256 = "010vcgy3qiqykk174jhf50a8q3x4a5qq2lf6b0wcbyzv7aikydrw"; + + postPatch = '' + automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS + for f in $(find . -name \*.c); do + substituteInPlace $f --replace \"libinput-properties.h\" '' + done + ''; + + nativeBuildInputs = [ automakeAddFlags ]; + + buildInputs = [ + dbus_glib + exo + garcon + gtk3 + libnotify + libxfce4ui + libxfce4util + libxklavier + upower + xfconf + xf86inputlibinput + ]; + + configureFlags = [ + "--enable-pluggable-dialogs" + "--enable-sound-settings" + ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c2d80e31f150523b3df5a355e8bc9584138648c0 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix @@ -0,0 +1,18 @@ +{ lib, mkXfceDerivation, exo, gtk2, gtk3 ? null, libwnck3 ? null, libXmu }: + +let + inherit (lib) enableFeature; +in + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-taskmanager"; + version = "1.2.0"; + + sha256 = "1lx66lhzfzhysymcbzfq9nrafyfmwdb79lli9kvhz6m12dhz6j18"; + + nativeBuildInputs = [ exo ]; + buildInputs = [ gtk2 gtk3 libwnck3 libXmu ]; + + configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..de37e4071fec1f9aef0b034d566c7f662fb16c53 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix @@ -0,0 +1,15 @@ +{ mkXfceDerivation, gtk3, libxfce4ui, vte }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-terminal"; + version = "0.8.6"; + + sha256 = "1a0b2ih552zhbbx1fc5ad80nafvkc5my3gw89as4mvycnhyd5inj"; + + buildInputs = [ gtk3 libxfce4ui vte ]; + + meta = { + description = "A modern terminal emulator"; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e7f13e104c83333a727c6c419e01a656fd0b232b --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix @@ -0,0 +1,15 @@ +{ lib, mkXfceDerivation, gtk2, libnotify ? null, libpulseaudio, keybinder, xfconf }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-volumed-pulse"; + version = "0.2.2"; + + sha256 = "0ccb98b433lx5fgdqd3nqqppg4sldr5p1is6pnx85h9wyxx5svhp"; + + buildInputs = [ gtk2 libnotify libpulseaudio keybinder xfconf ]; + + meta = with lib; { + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-13/xfconf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8280922d1c74ed966cea5945323977cb70d41e17 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfconf/default.nix @@ -0,0 +1,11 @@ +{ mkXfceDerivation, libxfce4util }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfconf"; + version = "4.13.4"; + + sha256 = "1bm4q06rwlmkmcy6qnwm6l70w6749iqfrmsrgj3y1jb2sacc3pd4"; + + buildInputs = [ libxfce4util ]; +} diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7ce32424b9bdb636d137edcb774b12d13445531f --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfdesktop/default.nix @@ -0,0 +1,22 @@ +{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfdesktop"; + version = "4.13.1"; + + sha256 = "0idc8j44apflvdasnvj7ld0fa8mxlwpndfqzbh97w54s8972gf6g"; + + buildInputs = [ + exo + gtk3 + libxfce4ui + libxfce4util + libwnck3 + xfconf + ]; + + meta = { + description = "Xfce's desktop manager"; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-13/xfwm4/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d5de68173009fc21fe2c7f0934fafb5ea5c7070c --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfwm4/default.nix @@ -0,0 +1,27 @@ +{ mkXfceDerivation, exo, dbus_glib, epoxy ? null, gtk2, libICE, libSM +, libstartup_notification ? null, libxfce4ui, libxfce4util, libwnck +, libXpresent ? null, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfwm4"; + version = "4.13.0"; + + sha256 = "19ikyls4xawsbz07qdz60g5yl2jbvpb90sfy5zql7ghypd69cgn9"; + + nativeBuildInputs = [ exo ]; + + buildInputs = [ + dbus_glib + epoxy + gtk2 + libICE + libSM + libstartup_notification + libxfce4ui + libxfce4util + libwnck + libXpresent + xfconf + ]; +} diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index fdb9d1be6ad2b98d3b9e60265fca47fe46a8ce49..a427023df56eb288296856336001b0991c5cb97c 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -20,8 +20,8 @@ let externalDownloads = import ./downloads.nix {inherit fetchurl; inherit (lib) optionalAttrs; inherit (stdenv) system;}; # Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand patchelfInJars = - lib.optional (stdenv.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";} - ++ lib.optional (stdenv.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0.jar"; file = "libs/linux/libjSSC-2.8_x86.so";} + lib.optional (stdenv.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino1.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";} + ++ lib.optional (stdenv.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino1.jar"; file = "libs/linux/libjSSC-2.8_x86.so";} ; # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable ncurses5 = ncurses.override { abiVersion = "5"; }; @@ -54,25 +54,25 @@ let + stdenv.lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { - version = "1.8.2"; + version = "1.8.5"; name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = "${version}"; - sha256 = "1ssznjmzmahayslj2xnci9b5wpsl53nyg85say54akng93qipmfb"; + sha256 = "0ww72qfk7fyvprz15lc80i1axfdacb5fij4h5j5pakrg76mng2c3"; }; teensyduino_src = fetchurl { - url = "https://www.pjrc.com/teensy/td_136/TeensyduinoInstall.${teensy_architecture}"; + url = "https://www.pjrc.com/teensy/td_140/TeensyduinoInstall.${teensy_architecture}"; sha256 = lib.optionalString ("${teensy_architecture}" == "linux64") - "0qvb5z9y6nsqy0kzib9fvvbn8dakl50vib6r3nm6bnpvyxzwjl2r" + "0127a1ak31252dbmr5niqa5mkvbm8dnz1cfcnmydzx9qn9rk00ir" + lib.optionalString ("${teensy_architecture}" == "linux32") - "14ca62vq7cpx269vfd92shi80qj8spf0dzli8gfcb39ss2zc4jf1" + "01mxj5xsr7gka652c9rp4szy5mkcka8mljk044v4agk3sxvx3v3i" + lib.optionalString ("${teensy_architecture}" == "linuxarm") - "122z1gxcgkmwjb8wdklb2w8c3qkj5rc1ap5n4a8fi3kjz29va9rx"; + "1dff3alhvk9x8qzy3n85qrg6rfmy6l9pj6fmrlzpli63lzykvv4i"; }; buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index f74da9773724a54b5e39c8f6888a39318dd5420c..e71c898dd5558624ef834424368437cc917e2fe9 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -1,5 +1,8 @@ {fetchurl, optionalAttrs, system}: - +# This file preloads all the archives which Arduino's build/build.xml +# would otherwise try to download itself. When updating this for a new +# version of Arduino, check build.xml for version numbers and new +# urls. { "build/shared/reference-1.6.6-3.zip" = fetchurl { url = "https://downloads.arduino.cc/reference-1.6.6-3.zip"; @@ -21,17 +24,17 @@ url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip"; sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj"; }; - "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_Control-1.0.4.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip"; + sha256 = "1pkabrghx3h8l60x571vwkbhfm02nhyn5x2vqz4vhx9cczr70zq7"; }; - "build/Robot_Motor-1.0.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2.zip"; - sha256 = "0da21kfzy07kk2qnkprs3lj214fgkcjxlkk3hdp306jfv8ilmvy2"; + "build/Robot_Motor-1.0.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3.zip"; + sha256 = "1pkvrimg77jrhdsz4l81y59hv50h6cl7hvhk9w8ac7ckg70lvxkw"; }; - "build/RobotIRremote-1.0.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2.zip"; - sha256 = "0wkya7dy4x0xyi7wn5aghmr1gj0d0wszd61pq18zgfdspz1gi6xn"; + "build/RobotIRremote-2.0.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip"; + sha256 = "0j5smap74j8p3wc6k0h73b1skj4gkr7r25jbjh1j1cg052dxri86"; }; "build/SpacebrewYun-1.0.1.zip" = fetchurl { url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip"; @@ -61,9 +64,13 @@ 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/LiquidCrystal-1.0.7.zip" = fetchurl { + url = "https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip"; + sha256 = "1wrxrqz3n4yrj9j1a2b7pdd7a1rlyi974ra7crv5amjng8817x9n"; + }; + "build/Adafruit_CircuitPlayground-1.6.8.zip" = fetchurl { + url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip"; + sha256 = "0zm667xiaygx8v1ygcls43s6qd5n7pf21n0998n1z7nf18s35j41"; }; "build/libastylej-2.05.1-3.zip" = fetchurl { url = "https://downloads.arduino.cc/libastylej-2.05.1-3.zip"; @@ -73,9 +80,9 @@ url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip"; sha256 = "129mfbyx7snq3znzhkfbdjiifdr85cwk6wjn8l9ia0wynszs5zyv"; }; - "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"; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip"; + sha256 = "15przp8z1dp6lamcvqdx4daq6fqi3c1algc3sbinyh25pm69pq74"; }; } // optionalAttrs (system == "x86_64-linux") { diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 187899b89647f6328a764bed789a37b081bca43a..f46e705fb901db753307acfb8c5076ba22e3eab0 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -1,28 +1,40 @@ -{ lib, buildFHSUserEnv, platformio, stdenv }: +{ lib, buildFHSUserEnv }: -buildFHSUserEnv { - name = "platformio"; +let + pio-pkgs = pkgs: + let + python = pkgs.python.override { + packageOverrides = self: super: { - targetPkgs = pkgs: (with pkgs; - [ - python27Packages.python - python27Packages.setuptools - python27Packages.pip - python27Packages.bottle - python27Packages.platformio - zlib - ]); - multiPkgs = pkgs: (with pkgs; - [ - python27Packages.python - python27Packages.setuptools - python27Packages.pip - python27Packages.bottle + # https://github.com/platformio/platformio-core/issues/349 + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "5.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a"; + }; + }); + + platformio = self.callPackage ./core.nix { }; + }; + }; + in (with pkgs; [ zlib - python27Packages.platformio + ]) ++ (with python.pkgs; [ + python + setuptools + pip + bottle + platformio ]); - meta = with stdenv.lib; { +in buildFHSUserEnv { + name = "platformio"; + + targetPkgs = pio-pkgs; + multiPkgs = pio-pkgs; + + meta = with lib; { description = "An open source ecosystem for IoT development"; homepage = http://platformio.org; maintainers = with maintainers; [ mog ]; @@ -30,5 +42,9 @@ buildFHSUserEnv { platforms = with platforms; linux; }; + extraInstallCommands = '' + ln -s $out/bin/platformio $out/bin/pio + ''; + runScript = "platformio"; } diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix new file mode 100644 index 0000000000000000000000000000000000000000..9d30c2268554564f9b0a9dfdccf18df229c92ecf --- /dev/null +++ b/pkgs/development/arduino/platformio/core.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, bottle, click, colorama +, lockfile, pyserial, requests +, semantic-version +, git +}: + +buildPythonPackage rec { + pname = "platformio"; + version = "3.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "bb311ce5b8f12c95bc45c2071626a4887a3632fb2472b4d69a873b2acfc2e4ec"; + }; + + propagatedBuildInputs = [ + bottle click colorama git lockfile + pyserial requests semantic-version + ]; + + patches = [ ./fix-searchpath.patch ]; + + meta = with stdenv.lib; { + description = "An open source ecosystem for IoT development"; + homepage = http://platformio.org; + maintainers = with maintainers; [ mog makefu ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/platformio/fix-searchpath.patch b/pkgs/development/arduino/platformio/fix-searchpath.patch similarity index 100% rename from pkgs/development/python-modules/platformio/fix-searchpath.patch rename to pkgs/development/arduino/platformio/fix-searchpath.patch diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 1d4cef685148b298fdf8b38d550d88bc4837bdd5..83de6f9e56975a544b86fd7797498c8887aa57e1 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -42,7 +42,12 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = elixir_1_5; + elixir = elixir_1_6; + + elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { + inherit rebar erlang; + debugInfo = true; + }; elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix { inherit rebar erlang; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 26d868a8e7c4f5d053fc928a0735419e26112fe5..d6b83cb1af04ead6e059ad2f3329612ce91ff80d 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -6,8 +6,8 @@ rec { */ callPackageWith = autoArgs: fn: args: let - f = if builtins.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + f = if pkgs.lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (stdenv.lib.functionArgs f) autoArgs; in f (auto // args); callPackage = callPackageWith pkgs; diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index ccb366ffe1cb5474b19fdef7a1a8927f28293290..63dd315e8e4e982369585935fd8e1dc02eaff742 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Flex SDK for Adobe Flash / ActionScript"; - homepage = "http://www.adobe.com/products/flex.html"; + homepage = "https://www.adobe.com/products/flex.html"; license = stdenv.lib.licenses.mpl11; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 7db75d1297812062b07ca74389ba16c4e707ea39..70acb79dc7e46a6cd54fb41323f1147f155610f3 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -1,21 +1,29 @@ { stdenv, fetchFromGitHub, icestorm }: +with builtins; + stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2017.11.05"; + version = "2018.03.07"; src = fetchFromGitHub { owner = "cseed"; repo = "arachne-pnr"; - rev = "1e81432830c75c505c76e419619f605a6c4c7583"; - sha256 = "0lzblmi1klbsmd32h8nh027npm1z1a199lng13lcrqwr17lhb7my"; + rev = "6701132cbd5c7b31edd0ff18ca6727eb3691186b"; + sha256 = "1c55k9gpq042mkyxrblwskbmr3v0baj4gkwm45v1gvmhdza6gfw8"; }; enableParallelBuilding = true; makeFlags = - [ "PREFIX=$(out)" "ICEBOX=${icestorm}/share/icebox" + [ "PREFIX=$(out)" + "ICEBOX=${icestorm}/share/icebox" ]; + patchPhase = '' + substituteInPlace ./Makefile \ + --replace 'echo UNKNOWN' 'echo ${substring 0 10 src.rev}' + ''; + meta = { description = "Place and route tool for FPGAs"; longDescription = '' diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix deleted file mode 100755 index 6fa25df5e0333c8d6bd757eb8fe4ce2b67642f6b..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{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 deleted file mode 100755 index d97d12bc629a715c507111cc9420f9e917d768f3..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100755 index 050a63e92fd64be89ec42cf4e05e9d9f64d06d2e..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 3abd5c8c82a94bb5d65ee7432cdab3f3cb19cbff..579af7a8d23270cd96eb9ae144824e1bb4cd2054 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.3.0" ; + versionPkg = "0.3.9" ; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ; - sha256 = "1s4yscisn9gsr692jmh4y5mz03012pv84cm7l5n51v83wc08fks0" ; + sha256 = "627bb99ecf2e3d5976f95f2faa13c7c330726601e8bb05a2113c9b69c98749b5"; }; postInstallContrib = stdenv.lib.optionalString withContrib @@ -31,11 +31,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1knf03r8a5sis7n8rw54flf1lxfbr3prywxb1czcdp6hsbcd1v1d"; + sha256 = "c69a7c58964df26227e77656659129ca4c05205d2ebcacc7084edba818fb6e81"; }; - patches = [ ./install-postiats-contrib.patch ]; - buildInputs = [ gmp ]; setupHook = with stdenv.lib; diff --git a/pkgs/development/compilers/ats2/install-postiats-contrib.patch b/pkgs/development/compilers/ats2/install-postiats-contrib.patch deleted file mode 100644 index cb280d028b5211c95f3760754ed90c038d1ffa0d..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ats2/install-postiats-contrib.patch +++ /dev/null @@ -1,19 +0,0 @@ -Install the parts of the contrib that have been moved to Postiats. -diff -Naur ATS2-Postiats-0.3.0-upstream/Makefile_dist ATS2-Postiats-0.3.0/Makefile_dist ---- ATS2-Postiats-0.3.0-upstream/Makefile_dist 2017-01-20 10:23:54.000000000 -0400 -+++ ATS2-Postiats-0.3.0/Makefile_dist 2017-01-21 13:14:27.614723335 -0400 -@@ -124,12 +124,12 @@ - cd "$(abs_top_srcdir)" && \ - $(MKDIR_P) $(PATSLIBHOME2)/bin && \ - if [ ! -d $(bindir2) ] ; then $(MKDIR_P) $(bindir2) ; fi && \ -- for x in share ccomp prelude libc libats ; do \ -+ for x in share ccomp prelude libc libats contrib atscntrb ; do \ - find "$$x" -type d -exec $(MKDIR_P) $(PATSLIBHOME2)/\{} \; -print; \ - done - - install_files_0: install_dirs ; \ -- for x in share ccomp/runtime prelude libc libats ; do \ -+ for x in share ccomp/runtime prelude libc libats contrib atscntrb ; do \ - cd "$(abs_top_srcdir)" && \ - $(INSTALL) -d $(PATSLIBHOME2)/"$$x" && \ - find "$$x" -type l -exec cp -d \{} $(PATSLIBHOME2)/\{} \; -print && \ diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix index 3d58e75200c81a63410a0b4cca8a3f535030ca8b..4dc384f70a342d25853cb978404b35901d295bb4 100644 --- a/pkgs/development/compilers/avian/default.nix +++ b/pkgs/development/compilers/avian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, jdk }: +{ stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }: stdenv.mkDerivation rec { name = "avian-${version}"; @@ -11,10 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48"; }; - buildInputs = [ - zlib - jdk - ]; + buildInputs = [ zlib jdk ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Foundation ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error"; + + postPatch = '' + substituteInPlace makefile \ + --replace 'g++' 'c++' \ + --replace 'gcc' 'cc' + ''; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 72eaae99877909ff21335d0b59fd9a852289b73c..fc75fe92c730ffd175a0b7d49dabcf92759e8462 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,14 +1,31 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv, cmake, fetchFromGitHub, emscriptenRev ? null }: + +let + defaultVersion = "45"; + + # Map from git revs to SHA256 hashes + sha256s = { + "version_45" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc"; + "1.37.36" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc"; + }; +in stdenv.mkDerivation rec { - version = "33"; - rev = "version_${version}"; + version = if emscriptenRev == null + then defaultVersion + else "emscripten-${emscriptenRev}"; + rev = if emscriptenRev == null + then "version_${version}" + else emscriptenRev; name = "binaryen-${version}"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; - sha256 = "0zijs2mcgfv0iynwdb0l4zykm0891b1zccf6r8w35ipxvcdwbsbp"; + sha256 = + if builtins.hasAttr rev sha256s + then builtins.getAttr rev sha256s + else null; inherit rev; }; diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index d27f498842e3fb0d3b85f7e76cf4e6704781297f..968c845a011969729f02964c10734d9837ae6c96 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant -, shared_mime_info, gtksourceview, gtk2 +, shared-mime-info, gtksourceview, gtk2 , targetVersion ? "4.5" }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - mono makeWrapper nant shared_mime_info gtksourceview + mono makeWrapper nant shared-mime-info gtksourceview gtk2 ]; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index ed7e0357d74cc200217b60e8c66c1aed183316d2..f3a4ff74aa0567c933ef74fb81bdd37d37a07355 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchsvn, fetchpatch, gcc, glibc, m4, coreutils }: +{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4 }: let options = rec { - /* TODO: there are also MacOS, FreeBSD and Windows versions */ + /* TODO: there are also FreeBSD and Windows versions */ x86_64-linux = { arch = "linuxx86"; - sha256 = "0g6mkl207ri3ib9w85i9w0sv7srz784pbxidz0d95p6qkvg6shba"; + sha256 = "0hs1f3z7crgzvinpj990kv9gvbsipxvcvwbmk54n51nasvc5025q"; runtime = "lx86cl64"; kernel = "linuxx8664"; }; @@ -17,42 +17,46 @@ let }; armv7l-linux = { arch = "linuxarm"; - sha256 = "0k6wxwyg3pmbb5xdkwma0i3rvbjmy3p604g4minjjc1drzsn1i0q"; + sha256 = "0p0l1dzsygb6i1xxgbipjpxkn46xhq3jm41a34ga1qqp4x8lkr62"; runtime = "armcl"; kernel = "linuxarm"; }; + x86_64-darwin = { + arch = "darwinx86"; + sha256 = "5adbea3d8b4a2e29af30d141f781c6613844f468c0ccfa11bae908c3e9641939"; + runtime = "dx86cl64"; + kernel = "darwinx8664"; + }; armv6l-linux = armv7l-linux; }; - cfg = options.${stdenv.system}; + cfg = options."${stdenv.system}" or (throw "missing source url for platform ${stdenv.system}"); in -assert builtins.hasAttr stdenv.system options; - stdenv.mkDerivation rec { name = "ccl-${version}"; - version = "1.11"; - revision = "16313"; + version = "1.11.5"; - src = fetchsvn { - url = "http://svn.clozure.com/publicsvn/openmcl/release/${version}/${cfg.arch}/ccl"; - rev = revision; + src = fetchurl { + url = "https://github.com/Clozure/ccl/releases/download/v${version}/ccl-${version}-${cfg.arch}.tar.gz"; sha256 = cfg.sha256; }; - patches = fetchpatch { - name = "ccl-1.11-glibc-2.26.patch"; - url = https://patch-diff.githubusercontent.com/raw/Clozure/ccl/pull/80.patch; - sha256 = "02v6287w0nppfpvkn9dyd5rvq2zkgd47ia9gs17hrww2hgzr6agd"; - }; - - buildInputs = [ gcc glibc m4 ]; + buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; CCL_RUNTIME = cfg.runtime; CCL_KERNEL = cfg.kernel; - postPatch = '' + postPatch = if stdenv.isDarwin then '' + substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ + --replace "M4 = gm4" "M4 = m4" \ + --replace "dtrace" "/usr/sbin/dtrace" \ + --replace "/bin/rm" "${coreutils}/bin/rm" \ + --replace "/bin/echo" "${coreutils}/bin/echo" + + substituteInPlace lisp-kernel/m4macros.m4 \ + --replace "/bin/pwd" "${coreutils}/bin/pwd" + '' else '' substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ - --replace "svnversion" "echo ${revision}" \ --replace "/bin/rm" "${coreutils}/bin/rm" \ --replace "/bin/echo" "${coreutils}/bin/echo" @@ -72,7 +76,7 @@ stdenv.mkDerivation rec { cp -r . "$out/share/ccl-installation" mkdir -p "$out/bin" - echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" + echo -e '#!${stdenv.shell}\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 ''; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index cd9a8e514e93166cb4e3b7310d4b1c461f02eda1..3ffd024305deaa7bc90064cc87ca8306e5dfcea9 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchgit, coreutils, ncurses, libX11 }: +{ stdenv, fetchgit, coreutils, cctools, ncurses, libiconv, libX11 }: stdenv.mkDerivation rec { name = "chez-scheme-${version}"; - version = "9.5-${dver}"; - dver = "20171109"; + version = "9.5.1"; src = fetchgit { url = "https://github.com/cisco/chezscheme.git"; @@ -12,10 +11,13 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools; + buildInputs = [ ncurses libiconv libX11 ]; + enableParallelBuilding = true; - buildInputs = [ ncurses libX11 ]; - /* We patch out a very annoying 'feature' in ./configure, which + /* + ** We patch out a very annoying 'feature' in ./configure, which ** tries to use 'git' to update submodules. ** ** We have to also fix a few occurrences to tools with absolute @@ -27,26 +29,59 @@ stdenv.mkDerivation rec { --replace "git submodule init && git submodule update || exit 1" "true" substituteInPlace ./workarea \ - --replace "/bin/ln" "${coreutils}/bin/ln" \ - --replace "/bin/cp" "${coreutils}/bin/cp" + --replace "/bin/ln" ln \ + --replace "/bin/cp" cp substituteInPlace ./makefiles/installsh \ --replace "/usr/bin/true" "${coreutils}/bin/true" + + substituteInPlace zlib/configure \ + --replace "/usr/bin/libtool" libtool ''; - /* Don't use configureFlags, since that just implicitly appends + /* + ** Don't use configureFlags, since that just implicitly appends ** everything onto a --prefix flag, which ./configure gets very angry ** about. + ** + ** Also, carefully set a manual workarea argument, so that we + ** can later easily find the machine type that we built Chez + ** for. */ configurePhase = '' - ./configure --threads --installprefix=$out --installman=$out/share/man + ./configure --threads \ + --installprefix=$out --installman=$out/share/man \ + --workarea=work + ''; + + /* + ** Install the kernel.o file, so we can compile C applications that + ** link directly to the Chez runtime (for booting their own files, or + ** embedding.) + ** + ** Ideally in the future this would be less of a hack and could be + ** done by Chez itself. Alternatively, there could just be a big + ** case statement matching to the different stdenv.platform values... + */ + postInstall = '' + m="$(ls ./work/boot)" + if [ "x''${m[1]}" != "x" ]; then + >&2 echo "ERROR: more than one bootfile build found; this is a nixpkgs error" + exit 1 + fi + + kernel=./work/boot/$m/kernel.o + kerneldest=$out/lib/csv${version}/$m/ + + echo installing $kernel to $kerneldest + cp $kernel $kerneldest/kernel.o ''; meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; - homepage = "http://www.scheme.com"; + homepage = https://cisco.github.io/ChezScheme/; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 792ecc739a504ebec59dda7416d29d990e9de48f..ad9e57f794f0d1f4d6ce9ddff25f00fd36f01178 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: let - version = "4.11.0"; + version = "4.13.0"; platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; - sha256 = "12ddyiikqknpr8h6llsxbg2fz75xnayvcnsvr1cwv8xnjn7jpp73"; + sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; @@ -63,7 +63,7 @@ stdenv.mkDerivation { homepage = http://www.call-cc.org/; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = with stdenv.lib.platforms; allBut darwin; + platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' CHICKEN is a compiler for the Scheme programming language. diff --git a/pkgs/development/compilers/chicken/eggDerivation.nix b/pkgs/development/compilers/chicken/eggDerivation.nix index 97ce9d9be79bae9147df66aa89d47931c3234897..58247e5aeb533ce1bcec01d5300e0d9ef47eaba7 100644 --- a/pkgs/development/compilers/chicken/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/eggDerivation.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation ({ wrapProgram $f \ --set CHICKEN_REPOSITORY $CHICKEN_REPOSITORY \ --prefix CHICKEN_REPOSITORY_EXTRA : "$out/lib/chicken/${toString chicken.binaryVersion}/:$CHICKEN_REPOSITORY_EXTRA" \ - --prefix CHICKEN_INCLUDE_PATH \; \"$CHICKEN_INCLUDE_PATH\;$out/share/\" \ + --prefix CHICKEN_INCLUDE_PATH \; "$CHICKEN_INCLUDE_PATH;$out/share/" \ --prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_EXTRA:$CHICKEN_REPOSITORY" done diff --git a/pkgs/development/compilers/chicken/setup-hook.sh b/pkgs/development/compilers/chicken/setup-hook.sh index d7f28539dc6476f228c269aeed2bb82821f20a49..b0d9b53b53784984f9f1d09b27ed24b0eaace856 100644 --- a/pkgs/development/compilers/chicken/setup-hook.sh +++ b/pkgs/development/compilers/chicken/setup-hook.sh @@ -4,4 +4,4 @@ addChickenRepositoryPath() { export CHICKEN_INCLUDE_PATH="$1/share;$CHICKEN_INCLUDE_PATH" } -envHooks=(${envHooks[@]} addChickenRepositoryPath) +addEnvHooks "$targetOffset" addChickenRepositoryPath diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 8d1b06f52b70d2908ef972beaf921fc1524e9d44..e73871fcb095528a2fbcf6a5e9cbc924d2825647 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 = "20170910"; + version = "20180402"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0znzsks8ql9qajhcjzfkhmnpz8zs6b8cji04fhivyq973jpxxrak"; + sha256 = "1xbr2wvppzhq189z9m70zqry2a3hh6cdydwbc1jm2z7imsg1i6c1"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 6ac5165b7e9e5e3158826d05daefdf6ed7c5c53e..3f25041f1753d1218f4ba622e41aa2c11f6a635f 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "cmdstan-2.9.0"; + name = "cmdstan-2.17.1"; src = fetchurl { - url = "https://github.com/stan-dev/cmdstan/releases/download/v2.9.0/cmdstan-2.9.0.tar.gz"; - sha256 = "08bim6nxgam989152hm0ga1rfb33mr71pwsym1nmfmavma68bwm9"; + url = "https://github.com/stan-dev/cmdstan/releases/download/v2.17.1/cmdstan-2.17.1.tar.gz"; + sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j"; }; buildFlags = "build"; @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { ''; homepage = http://mc-stan.org/interfaces/cmdstan.html; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index ee9224b380c882601e9ecb292c57946a63194904..06c4b62e2946719d74ab4a16e88f9893bf3b6339 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -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" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index a12f1c42ba619e55279758e7ea892eaa4fd45724..51392e23d8cf20ae0ccf16c4b42424b4e5505550 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -7,11 +7,11 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02"; stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "3.1"; + version = "3.2"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "0irfwlw2chalp0g2gw0makc699hn3z37sha1a239p9d90mzx03cx"; + sha256 = "11q4121s0rxva63njjwya7syfx9w0p4hzr6avh8s57vfbrcakc93"; }; buildInputs = [ coq ] @@ -19,8 +19,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = '' + sed -i -e 's/8\.6\.1|8\.7\.0|8\.7\.1)/8.6.1|8.7.0|8.7.1|8.7.2)/' configure + ''; + configurePhase = '' - substituteInPlace VERSION --replace '3.0.1' '3.1' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + (if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"); diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 17d91f36875c3275a5c397019916149f350d1d97..3861501d3996d9606df1a6460867d571b6e88491 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { name = "coreclr-${version}"; - version = "2.0.0"; + version = "2.0.7"; src = fetchFromGitHub { owner = "dotnet"; repo = "coreclr"; rev = "v${version}"; - sha256 = "16z58ix8kmk8csfy5qsqz8z30czhrap2vb8s8vdflmbcfnq31jcw"; + sha256 = "0pzkrfgqywhpijbx7j1v4lxa6270h6whymb64jdkp7yj56ipqh2n"; }; patches = [ @@ -34,12 +34,20 @@ stdenv.mkDerivation rec { url = https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch; sha256 = "047ph5gip4z2h7liwdxsmpnlaq0sd3hliaw4nyqjp647m80g3ffq"; }) + (fetchpatch { + # clang 5 + url = https://github.com/dotnet/coreclr/commit/9b22e1a767dee38f351001c5601f56d78766a43e.patch; + sha256 = "1w1lxw5ryvhq8m5m0kv880c4bh6y9xdgypkr76sqbh3v568yghzg"; + }) ]; - buildInputs = [ + nativeBuildInputs = [ which cmake clang + ]; + + buildInputs = [ llvmPackages.llvm llvmPackages.lldb libunwind @@ -68,7 +76,8 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ./build.sh $BuildArch $BuildType + # disable -Werror which can potentially breaks with every compiler upgrade + ./build.sh $BuildArch $BuildType cmakeargs "-DCLR_CMAKE_WARNINGS_ARE_ERRORS=OFF" runHook postBuild ''; @@ -83,7 +92,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dotnet.github.io/core/; + homepage = https://dotnet.github.io/core/; description = ".NET is a general purpose development platform"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kuznero ]; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 6b817d06553e666fb830a9da765e8786906703fb..3c3124cea1743b16bcf89d9117e18cf0eb48f18d 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -2,29 +2,33 @@ stdenv.mkDerivation rec { name = "crystal-${version}"; - version = "0.23.1"; + version = "0.24.1"; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "8cf1b9a4eab29fca2f779ea186ae18f7ce444ce189c621925fa1a0c61dd5ff55"; + sha256 = "1n375cwzb9rfqbjiimfbj4h5q4rsgh2rf6rmm2zbzizzm79a96a9"; }; - prebuiltName = "crystal-0.23.0-1"; + prebuiltName = "crystal-0.24.1-2"; prebuiltSrc = let arch = { "x86_64-linux" = "linux-x86_64"; "i686-linux" = "linux-i686"; "x86_64-darwin" = "darwin-x86_64"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); in fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/0.23.0/${prebuiltName}-${arch}.tar.gz"; + url = "https://github.com/crystal-lang/crystal/releases/download/v0.24.1/${prebuiltName}-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0nhs7swbll8hrk15kmmywngkhij80x62axiskb1gjmiwvzhlh0qx"; - "i686-linux" = "03xp8d3lqflzzm26lpdn4yavj87qzgd6xyrqxp2pn9ybwrq8fx8a"; - "x86_64-darwin" = "1prz6c1gs8z7dgpdy2id2mjn1c8f5p2bf9b39985bav448njbyjz"; + "x86_64-linux" = "19xchfzsyxh0gqi89y6d73iqc06bl097idz6905jf0i35x9ghpdp"; + "i686-linux" = "15zaxgc1yc9ixbsgy2d8g8d7x2w4vbnndi1ms3wf0ss8azmghiag"; + "x86_64-darwin" = "1818ahalahcbh974ai09hyfsns6njkpph4sbn4xwv2235x35dqib"; }."${stdenv.system}"; }; - srcs = [ src prebuiltSrc ]; + unpackPhase = '' + mkdir ${prebuiltName} + tar --strip-components=1 -C ${prebuiltName} -xf ${prebuiltSrc} + tar xf ${src} + ''; # crystal on Darwin needs libiconv to build libs = [ @@ -41,36 +45,28 @@ stdenv.mkDerivation rec { sourceRoot = "${name}"; - fixPrebuiltBinary = if stdenv.isDarwin then '' - wrapProgram ../${prebuiltName}/embedded/bin/crystal \ - --suffix DYLD_LIBRARY_PATH : $libPath - '' - else '' - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - ../${prebuiltName}/embedded/bin/crystal - patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \ - ../${prebuiltName}/embedded/bin/crystal - ''; - preBuild = '' patchShebangs bin/crystal patchShebangs ../${prebuiltName}/bin/crystal - ${fixPrebuiltBinary} export PATH="$(pwd)/../${prebuiltName}/bin:$PATH" ''; - makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" "release=1" "all" "doc" ]; + makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" + "FLAGS=--no-debug" + "release=1" + "all" "docs" + ]; installPhase = '' install -Dm755 .build/crystal $out/bin/crystal wrapProgram $out/bin/crystal \ - --suffix CRYSTAL_PATH : $out/lib/crystal \ + --suffix CRYSTAL_PATH : lib:$out/lib/crystal \ --suffix LIBRARY_PATH : $libPath install -dm755 $out/lib/crystal cp -r src/* $out/lib/crystal/ install -dm755 $out/share/doc/crystal/api - cp -r doc/* $out/share/doc/crystal/api/ + cp -r docs/* $out/share/doc/crystal/api/ cp -r samples $out/share/doc/crystal/ install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 62b2e7c18508d5ff186646104182a1ef95959d90..d569e2401b6dd9b25496375127cbfd0f8f8b01df 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -11,11 +11,12 @@ let , name ? "" , developerProgram ? false , python ? python27 + , runPatches ? [] }: stdenv.mkDerivation rec { name = "cudatoolkit-${version}"; - inherit (args) version; + inherit version runPatches; dontPatchELF = true; dontStrip = true; @@ -27,7 +28,7 @@ let This nix expression requires that ${args.name} is already part of the store. Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory: - nix-prefetch-url file://${args.name} + nix-prefetch-url file://\$PWD/${args.name} ''; inherit (args) name sha256; } @@ -48,35 +49,34 @@ let rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64"; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + unpackPhase = '' sh $src --keep --noexec + cd pkg/run_files sh cuda-linux*.run --keep --noexec sh cuda-samples*.run --keep --noexec - cd pkg - ''; - - buildPhase = '' - chmod -R u+w . - while IFS= read -r -d ''$'\0' i; do - if ! isELF "$i"; then continue; fi - echo "patching $i..." - if [[ ! $i =~ \.so ]]; then - patchelf \ - --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i - fi - if [[ $i =~ libcudart ]]; then - rpath2= - else - rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 - fi - patchelf --set-rpath $rpath2 --force-rpath $i - done < <(find . -type f -print0) + mv pkg ../../$(basename $src) + cd ../.. + rm -rf pkg + + for patch in $runPatches; do + sh $patch --keep --noexec + mv pkg $(basename $patch) + done ''; installPhase = '' mkdir $out + cd $(basename $src) perl ./install-linux.pl --prefix="$out" + cd .. + for patch in $runPatches; do + cd $(basename $patch) + perl ./install_patch.pl --silent --accept-eula --installdir="$out" + cd .. + done rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? @@ -94,6 +94,9 @@ let # Change the #error on GCC > 4.9 to a #warning. sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/' + # Fix builds with newer glibc version + sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h" + # Ensure that cmake can find CUDA. mkdir -p $out/nix-support echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook @@ -114,6 +117,23 @@ let echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook ''; + preFixup = '' + while IFS= read -r -d ''$'\0' i; do + if ! isELF "$i"; then continue; fi + echo "patching $i..." + if [[ ! $i =~ \.so ]]; then + patchelf \ + --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i + fi + if [[ $i =~ libcudart ]]; then + rpath2= + else + rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 + fi + patchelf --set-rpath $rpath2 --force-rpath $i + done < <(find $out $lib $doc -type f -print0) + ''; + passthru = { cc = gcc; majorVersion = @@ -160,16 +180,28 @@ in { }; cudatoolkit8 = common { - version = "8.0.61"; + version = "8.0.61.2"; url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"; sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; + runPatches = [ + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run"; + sha256 = "1iaz5rrsnsb1p99qiqvxn6j3ksc7ry8xlr397kqcjzxqbljbqn9d"; + }) + ]; gcc = gcc5; }; cudatoolkit9 = common { - version = "9.0.176"; - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; - sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; + version = "9.1.85.1"; + url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux"; + sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4"; + runPatches = [ + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux"; + sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g"; + }) + ]; gcc = gcc6; }; diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix deleted file mode 100644 index 6a3cddbd2e508efcc3df87efacd8a49b7f466b72..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ /dev/null @@ -1,167 +0,0 @@ -{ stdenv, fetchFromGitHub -, makeWrapper, unzip, which -, curl, tzdata -}: - -stdenv.mkDerivation rec { - name = "dmd-${version}"; - # This is the last version of dmd which is buildable without a D compiler. - # So we use this as a bootstrap version. - # The DMD frontend has been ported to D in 2.069.0 but idgen was already - # ported in 2.068.0. - version = "2.067.1"; - - srcs = [ - (fetchFromGitHub { - owner = "dlang"; - repo = "dmd"; - rev = "v${version}"; - sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; - name = "dmd-v${version}-src"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "druntime"; - rev = "v${version}"; - sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; - name = "druntime-v${version}-src"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "phobos"; - rev = "v${version}"; - sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; - name = "phobos-v${version}-src"; - }) - ]; - - sourceRoot = "."; - - postUnpack = '' - mv dmd-v${version}-src dmd - mv druntime-v${version}-src druntime - mv phobos-v${version}-src phobos - ''; - - # Compile with PIC to prevent colliding modules with binutils 2.28. - # https://issues.dlang.org/show_bug.cgi?id=17375 - usePIC = "-fPIC"; - ROOT_HOME_DIR = "$(echo ~root)"; - - postPatch = '' - # Ugly hack so the dlopen call has a chance to succeed. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace phobos/std/net/curl.d \ - --replace libcurl.so ${curl.out}/lib/libcurl.so - - # Ugly hack to fix the hardcoded path to zoneinfo in the source file. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace phobos/std/datetime.d \ - --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ - - substituteInPlace druntime/test/shared/Makefile \ - --replace "DFLAGS:=" "DFLAGS:=${usePIC} " - - # phobos uses curl, so we need to patch the path to the lib. - substituteInPlace phobos/posix.mak \ - --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4" - - # Use proper C++ compiler - substituteInPlace dmd/src/posix.mak \ - --replace g++ $CXX - '' - - + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace dmd/src/root/port.c \ - --replace "#include " "#include " - - # See https://github.com/NixOS/nixpkgs/issues/29443 - substituteInPlace phobos/std/path.d \ - --replace "\"/root" "\"${ROOT_HOME_DIR}" - '' - - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace dmd/src/posix.mak \ - --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ - - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace dmd/src/root/port.c --replace __inline_isnanl __inline_isnan - ''; - - nativeBuildInputs = [ makeWrapper unzip which ]; - buildInputs = [ curl tzdata ]; - - # Buid and install are based on http://wiki.dlang.org/Building_DMD - buildPhase = '' - cd dmd - make -f posix.mak INSTALL_DIR=$out - export DMD=$PWD/src/dmd - cd ../druntime - make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD - cd ../phobos - make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD - cd .. - ''; - - # disable check phase because some tests are not working with sandboxing - doCheck = false; - - checkPhase = '' - cd dmd - export DMD=$PWD/src/dmd - cd ../druntime - make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release - cd ../phobos - make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release - cd .. - ''; - - installPhase = '' - cd dmd - mkdir $out - mkdir $out/bin - cp $PWD/src/dmd $out/bin - mkdir -p $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp -r docs/man/man1/* $out/share/man/man1/ - cp -r docs/man/man5/* $out/share/man/man5/ - - cd ../druntime - mkdir $out/include - mkdir $out/include/d2 - cp -r import/* $out/include/d2 - - cd ../phobos - mkdir $out/lib - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; - extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; in - "cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib" - } - - cp -r std $out/include/d2 - cp -r etc $out/include/d2 - - wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${stdenv.cc}/bin" \ - --set CC "$""{CC:-$CC""}" - - cd $out/bin - tee dmd.conf << EOF - [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC - EOF - ''; - - meta = with stdenv.lib; { - description = "Official reference compiler for the D language"; - homepage = http://dlang.org/; - # Everything is now Boost licensed, even the backend. - # https://github.com/dlang/dmd/pull/6680 - license = licenses.boost; - platforms = platforms.unix; - }; -} - diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 938dd04904bf33650234c35c69f57ebeb3faacfe..6522b12b13102f8d374fca96808831be6b288099 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,173 +1,291 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, overrideCC, gcc5 , makeWrapper, unzip, which , curl, tzdata, gdb, darwin -# Versions 2.070.2 and up require a working dmd compiler to build: -, bootstrapDmd }: +, callPackage +, bootstrapVersion ? false +, version ? "2.079.0" +, dmdSha256 ? "1k6cky71pqnss6h6391p1ich2mjs598f5fda018aygnxg87qgh4y" +, druntimeSha256 ? "183pqygj5w4105czs5kswyjn9mrcybx3wmkynz3in0m3ylzzjmvl" +, phobosSha256 ? "0y9i86ggmf41ww2xk2bsrlsv9b1blj5dbyan6q6r6xp8dmgrd79w" +}: -stdenv.mkDerivation rec { - name = "dmd-${version}"; - version = "2.075.1"; - - srcs = [ - (fetchFromGitHub { - owner = "dlang"; - repo = "dmd"; - rev = "v${version}"; - sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5"; - name = "dmd-v${version}-src"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "druntime"; - rev = "v${version}"; - sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j"; - name = "druntime-v${version}-src"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "phobos"; - rev = "v${version}"; - sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04"; - name = "phobos-v${version}-src"; - }) - ]; - - sourceRoot = "."; - - postUnpack = '' - mv dmd-v${version}-src dmd - mv druntime-v${version}-src druntime - mv phobos-v${version}-src phobos - - # Remove cppa test for now because it doesn't work. - rm dmd/test/runnable/cppa.d - rm dmd/test/runnable/extra-files/cppb.cpp - ''; +let + + bootstrapDmd = if !bootstrapVersion then + # Versions 2.070.2 and up require a working dmd compiler to build so we just + # use the last dmd without any D code to bootstrap the actual build. + callPackage ./default.nix { + stdenv = if stdenv.hostPlatform.isDarwin then + stdenv + else + # Doesn't build with gcc6 on linux + overrideCC stdenv gcc5; + bootstrapVersion = true; + version = "2.067.1"; + dmdSha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; + druntimeSha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; + phobosSha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; + } + else + ""; + + dmdBuild = stdenv.mkDerivation rec { + name = "dmdBuild-${version}"; + inherit version; + + enableParallelBuilding = true; + + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = dmdSha256; + name = "dmd"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "druntime"; + rev = "v${version}"; + sha256 = druntimeSha256; + name = "druntime"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "phobos"; + rev = "v${version}"; + sha256 = phobosSha256; + name = "phobos"; + }) + ]; + + sourceRoot = "."; - # Compile with PIC to prevent colliding modules with binutils 2.28. - # https://issues.dlang.org/show_bug.cgi?id=17375 - usePIC = "-fPIC"; + postUnpack = '' + patchShebangs . - postPatch = '' - # Ugly hack so the dlopen call has a chance to succeed. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace phobos/std/net/curl.d \ - --replace libcurl.so ${curl.out}/lib/libcurl.so + # Remove cppa test for now because it doesn't work. + rm dmd/test/runnable/cppa.d + rm dmd/test/runnable/extra-files/cppb.cpp + ''; + + # Compile with PIC to prevent colliding modules with binutils 2.28. + # https://issues.dlang.org/show_bug.cgi?id=17375 + usePIC = "-fPIC"; + ROOT_HOME_DIR = "$(echo ~root)"; + + datetimePath = if bootstrapVersion then + "phobos/std/datetime.d" + else + "phobos/std/datetime/timezone.d"; + + phobosPatches = '' + # Ugly hack so the dlopen call has a chance to succeed. + # https://issues.dlang.org/show_bug.cgi?id=15391 + substituteInPlace phobos/std/net/curl.d \ + --replace libcurl.so ${curl.out}/lib/libcurl.so - # Ugly hack to fix the hardcoded path to zoneinfo in the source file. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace phobos/std/datetime/timezone.d \ - --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ + # phobos uses curl, so we need to patch the path to the lib. + substituteInPlace phobos/posix.mak \ + --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4" - substituteInPlace druntime/test/common.mak \ - --replace "DFLAGS:=" "DFLAGS:=${usePIC} " + '' - # phobos uses curl, so we need to patch the path to the lib. - substituteInPlace phobos/posix.mak \ - --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4" + + stdenv.lib.optionalString (!bootstrapVersion) '' + # Can be removed when https://github.com/dlang/phobos/pull/6224 is included. + substituteInPlace ${datetimePath} \ + --replace "foreach (DirEntry de; dirEntries(tzDatabaseDir, SpanMode.depth))" "import std.path : baseName; foreach (DirEntry de; dirEntries(tzDatabaseDir, SpanMode.depth))" - # Use proper C++ compiler - substituteInPlace dmd/posix.mak \ - --replace g++ $CXX - '' + substituteInPlace ${datetimePath} \ + --replace "tzName == \"leapseconds\"" "baseName(tzName) == \"leapseconds\"" + '' + + + stdenv.lib.optionalString (bootstrapVersion) '' + substituteInPlace ${datetimePath} \ + --replace "import std.traits;" "import std.traits;import std.path;" + + substituteInPlace ${datetimePath} \ + --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\"" + + # Ugly hack to fix the hardcoded path to zoneinfo in the source file. + # https://issues.dlang.org/show_bug.cgi?id=15391 + substituteInPlace ${datetimePath} \ + --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ + '' + + + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isLinux) '' + # See https://github.com/dlang/phobos/pull/5960 + substituteInPlace phobos/std/path.d \ + --replace "\"/root" "\"${ROOT_HOME_DIR}" + ''; + + dmdPath = if bootstrapVersion then + "dmd/src" + else + "dmd"; + + postPatch = '' + '' + + + stdenv.lib.optionalString (!bootstrapVersion) '' + substituteInPlace druntime/test/common.mak \ + --replace "DFLAGS:=" "DFLAGS:=${usePIC} " + '' + + + stdenv.lib.optionalString (bootstrapVersion) '' + # Use proper C++ compiler + substituteInPlace ${dmdPath}/posix.mak \ + --replace g++ $CXX + '' + + + phobosPatches + + + stdenv.lib.optionalString (stdenv.hostPlatform.isLinux && bootstrapVersion) '' + substituteInPlace ${dmdPath}/root/port.c \ + --replace "#include " "#include " + '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace dmd/posix.mak \ + substituteInPlace ${dmdPath}/posix.mak \ --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + '' + + + stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin && bootstrapVersion) '' + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + substituteInPlace ${dmdPath}/root/port.c --replace __inline_isnanl __inline_isnan ''; - nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); - - buildInputs = [ curl tzdata ]; - - # Buid and install are based on http://wiki.dlang.org/Building_DMD - buildPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in - "export DMD=$PWD/generated/${osname}/release/${bits}/dmd" - } - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD - cd ../phobos - make -j$NIX_BUILD_CORES -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD - cd .. - ''; + nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ] - # disable check phase because some tests are not working with sandboxing - doCheck = false; - - checkPhase = '' - cd dmd - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in - "export DMD=$PWD/generated/${osname}/release/${bits}/dmd" - } - make -j$NIX_BUILD_CORES -C test -f Makefile PIC=${usePIC} DMD=$DMD BUILD=release SHARED=0 - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release - cd ../phobos - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release - cd .. - ''; + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); - installPhase = '' - cd dmd - mkdir $out - mkdir $out/bin - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in - "cp $PWD/generated/${osname}/release/${bits}/dmd $out/bin" - } - - mkdir -p $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp -r docs/man/man1/* $out/share/man/man1/ - cp -r docs/man/man5/* $out/share/man/man5/ - - cd ../druntime - mkdir $out/include - mkdir $out/include/d2 - cp -r import/* $out/include/d2 - - cd ../phobos - mkdir $out/lib - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; - extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; in - "cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib" - } - - cp -r std $out/include/d2 - cp -r etc $out/include/d2 - - wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${stdenv.cc}/bin" \ - --set CC "$""{CC:-$CC""}" - - cd $out/bin - tee dmd.conf << EOF - [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC - EOF - ''; + buildInputs = [ curl tzdata ]; + + bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; + osname = if stdenv.hostPlatform.isDarwin then + "osx" + else + stdenv.hostPlatform.parsed.kernel.name; + top = "$(echo $NIX_BUILD_TOP)"; + pathToDmd = if bootstrapVersion then + "${top}/dmd/src/dmd" + else + "${top}/dmd/generated/${osname}/release/${bits}/dmd"; + + # Buid and install are based on http://wiki.dlang.org/Building_DMD + buildPhase = '' + cd dmd + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} + cd ../phobos + make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/ + cd .. + ''; - meta = with stdenv.lib; { - description = "Official reference compiler for the D language"; - homepage = http://dlang.org/; - # Everything is now Boost licensed, even the backend. - # https://github.com/dlang/dmd/pull/6680 - license = licenses.boost; - maintainers = with maintainers; [ ThomasMader ]; - platforms = platforms.unix; + doCheck = !bootstrapVersion; + + checkPhase = '' + cd dmd + make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 DMD=${pathToDmd} BUILD=release SHARED=0 SHELL=$SHELL + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release + cd .. + ''; + + extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; + + installPhase = '' + cd dmd + mkdir $out + mkdir $out/bin + cp ${pathToDmd} $out/bin + + mkdir -p $out/share/man/man1 + mkdir -p $out/share/man/man5 + cp -r docs/man/man1/* $out/share/man/man1/ + cp -r docs/man/man5/* $out/share/man/man5/ + + cd ../druntime + mkdir $out/include + mkdir $out/include/d2 + cp -r import/* $out/include/d2 + + cd ../phobos + mkdir $out/lib + cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib + + cp -r std $out/include/d2 + cp -r etc $out/include/d2 + + wrapProgram $out/bin/dmd \ + --prefix PATH ":" "${stdenv.cc}/bin" \ + --set-default CC "$CC" + + cd $out/bin + tee dmd.conf << EOF + [Environment] + DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC + EOF + ''; + + meta = with stdenv.lib; { + description = "Official reference compiler for the D language"; + homepage = http://dlang.org/; + # Everything is now Boost licensed, even the backend. + # https://github.com/dlang/dmd/pull/6680 + license = licenses.boost; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; + }; + + # Need to test Phobos in a fixed-output derivation, otherwise the + # network stuff in Phobos would fail if sandbox mode is enabled. + phobosUnittests = stdenv.mkDerivation rec { + name = "phobosUnittests-${version}"; + version = dmdBuild.version; + + enableParallelBuilding = dmdBuild.enableParallelBuilding; + preferLocalBuild = true; + inputString = dmdBuild.outPath; + outputHashAlgo = "sha256"; + outputHash = builtins.hashString "sha256" inputString; + + srcs = dmdBuild.srcs; + + sourceRoot = "."; + + postPatch = dmdBuild.phobosPatches; + + nativeBuildInputs = dmdBuild.nativeBuildInputs; + buildInputs = dmdBuild.buildInputs; + + buildPhase = '' + cd phobos + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${dmdBuild}/bin/dmd BUILD=release TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/ + ''; + + installPhase = '' + echo -n $inputString > $out + ''; }; + +in + +stdenv.mkDerivation rec { + inherit phobosUnittests; + name = "dmd-${version}"; + phases = "installPhase"; + buildInputs = dmdBuild.buildInputs; + + installPhase = '' + mkdir $out + cp -r --symbolic-link ${dmdBuild}/* $out/ + ''; + meta = dmdBuild.meta; } + diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index fd02f779b3cf586d58516c67434113aff50cb933..b342bd945858ae359df342501a106cc4172bf5a2 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.4.5"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git"; + url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; rev = "refs/tags/v${version}"; sha256 = "10y5pbkcj5gkijcgnlvrh6q2prpnvsgihb9asz3zfp66mcjwzsy3"; }; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index b3e2ff909b7fce2afa45c93fbe88f768af44cff3..1dc4430dc6a7c15a2c081b5b23027aa758362b77 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libuuid, python2, iasl }: +{ stdenv, fetchFromGitHub, fetchpatch, libuuid, python2, iasl }: let pythonEnv = python2.withPackages(ps: [ps.tkinter]); @@ -7,20 +7,30 @@ targetArch = if stdenv.isi686 then "IA32" else if stdenv.isx86_64 then "X64" +else if stdenv.isAarch64 then + "AARCH64" else throw "Unsupported architecture"; edk2 = stdenv.mkDerivation { - name = "edk2-2014-12-10"; + name = "edk2-2017-12-05"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; - rev = "vUDK2017"; - sha256 = "0sswa028644yr8fbl8j6rhrdm717fj29h4dys3ygklmjhss90a2g"; + rev = "f71a70e7a4c93a6143d7bad8ab0220a947679697"; + sha256 = "0k48xfwxcgcim1bhkggc19hilvsxsf5axvvcpmld0ng1fcfg0cr6"; }; - buildInputs = [ libuuid pythonEnv]; + patches = [ + (fetchpatch { + name = "short-circuit-the-transfer-of-an-empty-S3_CONTEXT.patch"; + url = "https://github.com/tianocore/edk2/commit/9e2a8e928995c3b1bb664b73fd59785055c6b5f6"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }) + ]; + + buildInputs = [ libuuid pythonEnv ]; makeFlags = "-C BaseTools"; @@ -33,11 +43,14 @@ edk2 = stdenv.mkDerivation { mv -v edksetup.sh $out ''; + enableParallelBuilding = true; + meta = { description = "Intel EFI development kit"; homepage = https://sourceforge.net/projects/edk2/; license = stdenv.lib.licenses.bsd2; - platforms = ["x86_64-linux" "i686-linux"]; + branch = "UDK2017"; + platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; }; passthru = { @@ -47,13 +60,20 @@ edk2 = stdenv.mkDerivation { configurePhase = '' mkdir -v Conf - sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \ - 's|MYTOOLS|GCC49|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\ - < ${edk2}/BaseTools/Conf/target.template > Conf/target.txt - sed -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \ + + cp ${edk2}/BaseTools/Conf/target.template Conf/target.txt + sed -i Conf/target.txt \ + -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' \ + -e 's|MYTOOLS|GCC49|' \ + -e 's|IA32|${targetArch}|' \ + -e 's|DEBUG|RELEASE|'\ + + cp ${edk2}/BaseTools/Conf/tools_def.template Conf/tools_def.txt + sed -i Conf/tools_def.txt \ + -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \ -e 's|DEFINE GCC48_X64_PREFIX = /usr/bin/|DEFINE GCC48_X64_PREFIX = ""|' \ - -e 's|DEFINE UNIX_IASL_BIN = /usr/bin/iasl|DEFINE UNIX_IASL_BIN = ${iasl}/bin/iasl|' \ - < ${edk2}/BaseTools/Conf/tools_def.template > Conf/tools_def.txt + -e 's|DEFINE UNIX_IASL_BIN = /usr/bin/iasl|DEFINE UNIX_IASL_BIN = ${iasl}/bin/iasl|' + export WORKSPACE="$PWD" export EFI_SOURCE="$PWD/EdkCompatibilityPkg" ln -sv ${edk2}/BaseTools BaseTools diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..93e53aa30d13f88a5d773bbed95c9350c700ecf3 --- /dev/null +++ b/pkgs/development/compilers/eli/default.nix @@ -0,0 +1,91 @@ +{ stdenv +, fetchurl +, symlinkJoin +, makeWrapper +, tcl +, fontconfig +, tk +, ncurses +, xorg +, file +}: + +let + # eli derives the location of the include folder from the location of the lib folder + tk_combined = symlinkJoin { + name = "tk_combined"; + paths = [ + tk + tk.dev + ]; + }; + curses_combined = symlinkJoin { + name = "curses_combined"; + paths = [ + ncurses + ncurses.dev + ]; + }; +in +stdenv.mkDerivation rec { + name = "eli"; + version = "4.8.1"; + + src = fetchurl { + url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/eli-${version}.tar.bz2"; + sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; + }; + + buildInputs = [ + ncurses + fontconfig + ] ++ (with xorg; [ + libX11.dev + libXt.dev + libXaw.dev + libXext.dev + ]); + + nativeBuildInputs = [ + file + makeWrapper + ]; + + # skip interactive browser check + buildFlags = "nobrowsers"; + + + preConfigure='' + configureFlagsArray=( + --with-tcltk="${tcl} ${tk_combined}" + --with-curses="${curses_combined}" + ) + export ODIN_LOCALIPC=1 + ''; + + postInstall = '' + wrapProgram "$out/bin/eli" \ + --set ODIN_LOCALIPC 1 + ''; + + # Test if eli starts + doInstallCheck = true; + installCheckPhase = '' + export HOME="$TMP/home" + mkdir -p "$HOME" + $out/bin/eli "!ls" + ''; + + meta = { + description = "Translator Construction Made Easy"; + longDescription = '' + Eli is a programming environment that supports all phases of translator + construction with extensive libraries implementing common tasks, yet handling + arbitrary special cases. Output is the C subset of C++. + ''; + homepage = http://eli-project.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ timokau ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 7cba0cab351f8a42ebc336eaa3b9b427b6e73da8..8ed34cf9d1e04c4f2e374230560f717effcbaf22 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -72,23 +72,28 @@ let where foo is a tag for a new version, for example "0.3.1-alpha". */ elm-format = self.callPackage ./packages/elm-format.nix { }; - + elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix { + aeson-pretty = self.aeson-pretty_0_7_2; + either = hlib.overrideCabal self.either (drv :{ + jailbreak = true; + version = "4.4.1.1"; + sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh"; + libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ + self.exceptions self.free self.mmorph self.monad-control + self.MonadRandom self.profunctors self.transformers + self.transformers-base + ]; + }); + }; }; in elmPkgs // { inherit elmPkgs; elmVersion = elmRelease.version; - # needed for elm-package - http-client = hlib.overrideCabal super.http-client (drv: { - version = "0.4.31.2"; - sha256 = "12yq2l6bvmxg5w6cw5ravdh39g8smwn1j44mv36pfmkhm5402h8n"; - }); - http-client-tls = hlib.overrideCabal super.http-client-tls (drv: { - version = "0.2.4.1"; - sha256 = "18wbca7jg15p0ds3339f435nqv2ng0fqc4bylicjzlsww625ij4d"; - }); # https://github.com/elm-lang/elm-compiler/issues/1566 indents = hlib.overrideCabal super.indents (drv: { version = "0.3.3"; + #test dep tasty has a version mismatch + doCheck = false; sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn"; libraryHaskellDepends = drv.libraryHaskellDepends ++ [super.concatenative]; }); diff --git a/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix b/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix new file mode 100644 index 0000000000000000000000000000000000000000..3f797b7a236296b17398930c633f824c334ebf17 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix @@ -0,0 +1,24 @@ +{ mkDerivation, aeson, aeson-pretty, base, binary, bytestring +, concatenative, containers, directory, either, elm-compiler +, filemanip, filepath, indents, optparse-applicative, parsec +, stdenv, text, transformers, fetchgit +}: +mkDerivation { + pname = "elm-interface-to-json"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/stoeffel/elm-interface-to-json"; + sha256 = "1izc78w91m7nrc9i2b3lgy3kyjsy4d5mkkblx96ws0bp3dpm5f9k"; + rev = "9884c1c997a55f11cf7c3d99a8afa72cf2e97323"; + }; + isLibrary = false; + isExecutable = true; + jailbreak = true; + executableHaskellDepends = [ + aeson aeson-pretty base binary bytestring concatenative containers + directory either elm-compiler filemanip filepath indents + optparse-applicative parsec text transformers + ]; + homepage = "https://github.com/githubuser/elm-interface-to-json#readme"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix index 4a60b3dfb38771ac9a5255dfc7b6ae9670fa5e3d..49eddb58a14280e562d3be07fb85115b003b2cba 100644 --- a/pkgs/development/compilers/elm/packages/elm-package.nix +++ b/pkgs/development/compilers/elm/packages/elm-package.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, aeson-pretty_0_7_2, ansi-wl-pprint, base, binary , bytestring, containers, directory, edit-distance, elm-compiler -, fetchgit, filepath, HTTP, http-client, http-client-tls +, fetchgit, fetchurl, filepath, HTTP, http-client, http-client-tls , http-types, mtl, network, optparse-applicative, parallel-io , pretty, stdenv, text, time, unordered-containers, vector , zip-archive @@ -13,6 +13,10 @@ mkDerivation { sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7"; rev = "8bd150314bacab5b6fc451927aa01deec2276fbf"; }; + patches = fetchurl { + url = https://github.com/jerith666/elm-package/commit/40bab60c2fbff70812cc24cdd97f5e09db3844ad.patch; + sha256 = "0j6pi6cv3h9s6vz68bh0c73fysvk83yhhk56kgshvnrmnpcb3jib"; + }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix deleted file mode 100644 index 5d952073740ed654543abe59baa1581091d69cfb..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ newScope, stdenv, wrapCC, wrapCCWith, symlinkJoin }: -let - callPackage = newScope (self // {inherit stdenv;}); - - self = { - emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {}; - emscriptenfastcomp-wrapped = wrapCCWith { - cc = self.emscriptenfastcomp-unwrapped; - libc = stdenv.cc.libc; - extraBuildCommands = '' - # hardening flags break WASM support - cat > $out/nix-support/add-hardening.sh - ''; - }; - emscriptenfastcomp = symlinkJoin { - name = "emscriptenfastcomp"; - paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; - preferLocalBuild = false; - allowSubstitutes = true; - postBuild = '' - # replace unwrapped clang-3.9 binary by wrapper - ln -sf $out/bin/clang $out/bin/clang-[0-9]* - ''; - }; - }; -in self diff --git a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix deleted file mode 100644 index f35ca26584f1bf7be441cc27dbcb0ad02345e16b..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, python, ... }: - -let - rev = "1.37.16"; - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; -in -stdenv.mkDerivation rec { - name = "emscripten-fastcomp-${rev}"; - - src = fetchFromGitHub { - owner = "kripken"; - repo = "emscripten-fastcomp"; - sha256 = "0wj9sc0gciaiidcjv6wb0qn6ks06xds7q34351masc7qpvd217by"; - inherit rev; - }; - - srcFL = fetchFromGitHub { - owner = "kripken"; - repo = "emscripten-fastcomp-clang"; - sha256 = "1akdgxzxhzjbhp4d14ajcrp9jrf39x004a726ly2gynqc185l4j7"; - inherit rev; - }; - - nativeBuildInputs = [ cmake python ]; - preConfigure = '' - cp -Lr ${srcFL} tools/clang - chmod +w -R tools/clang - ''; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'" - "-DLLVM_INCLUDE_EXAMPLES=OFF" - "-DLLVM_INCLUDE_TESTS=OFF" - # "-DCLANG_INCLUDE_EXAMPLES=OFF" - "-DCLANG_INCLUDE_TESTS=OFF" - ] ++ (stdenv.lib.optional stdenv.isLinux - # necessary for clang to find crtend.o - "-DGCC_INSTALL_PREFIX=${gcc}" - ); - enableParallelBuilding = true; - - passthru = { - isClang = true; - inherit gcc; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/kripken/emscripten-fastcomp; - description = "Emscripten LLVM"; - platforms = platforms.all; - maintainers = with maintainers; [ qknight matthewbauer ]; - license = stdenv.lib.licenses.ncsa; - }; -} diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index ae80ad6fc808efec0e1001ca6152844c649c4872..8e268aa7eb7446de99d1b99e74fa672ad68cf6ee 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler -, jre, binaryen, enableWasm ? true +{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, pkgs +, jre, binaryen, enableWasm ? true , python2Packages, cmake }: let - rev = "1.37.16"; + rev = emscriptenVersion; appdir = "share/emscripten"; + binaryenVersioned = binaryen.override { emscriptenRev = rev; }; in stdenv.mkDerivation { @@ -13,10 +14,12 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten"; - sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy"; + sha256 = "02p0cp86vd1mydlpq544xbydggpnrq9dhbxx7h08j235frjm5cdc"; inherit rev; }; + buildInputs = [ nodejs cmake python ]; + buildCommand = '' mkdir -p $out/${appdir} cp -r $src/* $out/${appdir} @@ -38,9 +41,23 @@ stdenv.mkDerivation { echo "COMPILER_ENGINE = NODE_JS" >> $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 + # to make the test(s) below work + echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config '' + stdenv.lib.optionalString enableWasm '' - echo "BINARYEN_ROOT = '${binaryen}'" >> $out/share/emscripten/config + echo "BINARYEN_ROOT = '${binaryenVersioned}'" >> $out/share/emscripten/config + '' + + + '' + echo "--------------- running test -----------------" + # quick hack to get the test working + HOME=$TMPDIR + cp $out/${appdir}/config $HOME/.emscripten + export PATH=$PATH:$out/bin + + #export EMCC_DEBUG=2 + ${python}/bin/python $src/tests/runner.py test_hello_world + echo "--------------- /running test -----------------" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/emscripten/fastcomp/default.nix b/pkgs/development/compilers/emscripten/fastcomp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..10c1107da0261cadbd9b618d4b677c69e9c8f61b --- /dev/null +++ b/pkgs/development/compilers/emscripten/fastcomp/default.nix @@ -0,0 +1,28 @@ +{ newScope, stdenv, binutils, wrapCCWith, symlinkJoin }: +let + callPackage = newScope (self // {inherit stdenv;}); + + self = { + emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {}; + emscriptenfastcomp-wrapped = wrapCCWith { + cc = self.emscriptenfastcomp-unwrapped; + # Never want Apple's cctools for WASM target + bintools = binutils; + libc = stdenv.cc.libc; + extraBuildCommands = '' + # hardening flags break WASM support + cat > $out/nix-support/add-hardening.sh + ''; + }; + emscriptenfastcomp = symlinkJoin { + name = "emscriptenfastcomp"; + paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; + preferLocalBuild = false; + allowSubstitutes = true; + postBuild = '' + # replace unwrapped clang-3.9 binary by wrapper + ln -sf $out/bin/clang $out/bin/clang-[0-9]* + ''; + }; + }; +in self diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix new file mode 100644 index 0000000000000000000000000000000000000000..5317cf25d41baed100dd62d5e687845b19daf884 --- /dev/null +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -0,0 +1,55 @@ +{ emscriptenVersion, stdenv, llvm, fetchFromGitHub, cmake, python, gtest, ... }: + +let + rev = emscriptenVersion; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; +in +stdenv.mkDerivation rec { + name = "emscripten-fastcomp-${rev}"; + + src = fetchFromGitHub { + owner = "kripken"; + repo = "emscripten-fastcomp"; + sha256 = "04j698gmp686b5lricjakm5hyh2z2kh28m1ffkghmkyz4zkzmx98"; + inherit rev; + }; + + srcFL = fetchFromGitHub { + owner = "kripken"; + repo = "emscripten-fastcomp-clang"; + sha256 = "1ici51mmpgg80xk3y8f376nbbfak6rz27qdy98l8lxkrymklp5g5"; + inherit rev; + }; + + nativeBuildInputs = [ cmake python gtest ]; + preConfigure = '' + cp -Lr ${srcFL} tools/clang + chmod +w -R tools/clang + ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'" + "-DLLVM_INCLUDE_EXAMPLES=OFF" + "-DLLVM_INCLUDE_TESTS=ON" + #"-DLLVM_CONFIG=${llvm}/bin/llvm-config" + "-DLLVM_BUILD_TESTS=ON" + "-DCLANG_INCLUDE_TESTS=ON" + ] ++ (stdenv.lib.optional stdenv.isLinux + # necessary for clang to find crtend.o + "-DGCC_INSTALL_PREFIX=${gcc}" + ); + enableParallelBuilding = true; + + passthru = { + isClang = true; + inherit gcc; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kripken/emscripten-fastcomp; + description = "Emscripten LLVM"; + platforms = platforms.all; + maintainers = with maintainers; [ qknight matthewbauer ]; + license = stdenv.lib.licenses.ncsa; + }; +} diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index ae2d39d604a6cdd69f43bd588c091efbf981b1d1..ce1987866007ecd49d1b69a34b717b9224ded1ee 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, glib, glibc, git, rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext, - mesa_glu, libXmu, libXt, libICE, libSM }: + libGLU, libXmu, libXt, libICE, libSM }: stdenv.mkDerivation rec { name = "factor-lang-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ git rlwrap curl perl makeWrapper libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa_glu libXmu libXt libICE libSM ]; + libGLU libXmu libXt libICE libSM ]; buildPhase = '' make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev} @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # to be a generic solution here. find $(echo ${stdenv.lib.makeLibraryPath [ glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa_glu libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst + libGLU libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'"; for l in $(<$TMPDIR/so.lst); @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \ "${stdenv.lib.makeLibraryPath [ glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa_glu libXmu libXt libICE libSM ]}" + libGLU libXmu libXt libICE libSM ]}" sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor mv $out/bin/.factor-wrapped $out/lib/factor/factor diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 704d9d5be645ff2c2669f992c79cbb2908b7ef1c..0793a9d7ed0b96351875f57762f2619e1bb0845d 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -8,10 +8,10 @@ stdenv, fetchurl let s = rec { - version = "1.6"; - versionSuffix = ".0-0"; + version = "1.8.2"; + versionSuffix = ""; url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz"; - sha256 = "1a1w9yibi0rsr51bl7csnq6mr59x0934850kiabs80nr3sz05knb"; + sha256 = "06ajdnyba3v3d37mjq1yim96hsmbx1w5n695m5zlhjbydgw62a15"; name = "lazarus-${version}"; }; buildInputs = [ diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index af33039d341a4b5e9e215f16f6594494d1c505d6..5c1f931da9a2add905cc9ba094ef7d5216ef37f0 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -1,4 +1,4 @@ -# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it +# Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it { stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }: diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index e645ecb41bd282c4099eceeaba3025fde32f962d..05e804a1f740ecf6975f6735a348b8514315bdfd 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gambit-bootstrap-${version}"; - version = "4.8.8"; - tarball_version = "v4_8_8"; + version = "4.8.9"; + tarball_version = "v4_8_9"; src = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-${tarball_version}-devel.tgz"; - sha256 = "075k2z04d6svxqf9paj3xvp0mm0xzy0vbma1y61s0lkywdim8xjz"; + sha256 = "b7f86c794711792ca556ce41f8bc7043dffc395c01bb6d8d119bc2f454f89fbf"; }; buildInputs = [ autoconf ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Optimizing Scheme to C compiler, bootstrap step"; homepage = "http://gambitscheme.org"; license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix new file mode 100644 index 0000000000000000000000000000000000000000..202e552542223863ab0037ec5a6b34514b514f5d --- /dev/null +++ b/pkgs/development/compilers/gambit/build.nix @@ -0,0 +1,70 @@ +{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, git-version, SRC }: + +stdenv.mkDerivation rec { + name = "gambit-${version}"; + src = SRC; + + bootstrap = import ./bootstrap.nix ( pkgs ); + + # Use makeStaticLibraries to enable creation of statically linked binaries + buildInputs = [ git autoconf bootstrap openssl (makeStaticLibraries openssl)]; + + configurePhase = '' + options=( + --prefix=$out + --enable-single-host + --enable-c-opt=-O2 + --enable-gcc-opts + --enable-shared + --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it. + --enable-poll + --enable-openssl + --enable-default-runtime-options="f8,-8,t8" # Default to UTF-8 for source and all I/O + #--enable-debug # Nope: enables plenty of good stuff, but also the costly console.log + + #--enable-multiple-versions # Nope, NixOS already does version multiplexing + #--enable-guide + #--enable-track-scheme + #--enable-high-res-timing + #--enable-max-processors=4 + #--enable-multiple-vms + #--enable-dynamic-tls + #--enable-multiple-vms + #--enable-multiple-threaded-vms ## when SMP branch is merged in + #--enable-thread-system=posix ## default when --enable-multiple-vms is on. + #--enable-profile + #--enable-coverage + #--enable-inline-jumps + #--enable-char-size=1" ; default is 4 + ) + ./configure ''${options[@]} + ''; + + buildPhase = '' + # Make bootstrap compiler, from release bootstrap + mkdir -p boot && + cp -rp ${bootstrap}/. boot/. && + chmod -R u+w boot && + cd boot && + cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ + ./configure && + for i in lib gsi gsc ; do (cd $i ; make ) ; done && + cd .. && + cp boot/gsc/gsc gsc-boot && + + # Now use the bootstrap compiler to build the real thing! + make -j2 from-scratch + ''; + + doCheck = true; + + meta = { + description = "Optimizing Scheme to C compiler"; + homepage = "http://gambitscheme.org"; + license = stdenv.lib.licenses.lgpl2; + # NB regarding platforms: only actually tested on Linux, *should* work everywhere, + # but *might* need adaptation e.g. on macOS. + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 79f57c42c50d6313c3c58010b0fb52c26609d667..0996d0c3078ae5ab86ee72c97cabf527f709830d 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,74 +1,13 @@ -{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs }: +{ callPackage, fetchgit }: -# TODO: distinct packages for gambit-release and gambit-devel +callPackage ./build.nix { + version = "4.8.9"; + # TODO: for next version, prefer the unpatched tarball for the stable/default gambit. + git-version = "4.8.9-8-g793679bd"; -stdenv.mkDerivation rec { - name = "gambit-${version}"; - version = "4.8.8-300db59"; - bootstrap = import ./bootstrap.nix ( pkgs ); - - src = fetchgit { + SRC = fetchgit { url = "https://github.com/feeley/gambit.git"; - rev = "300db59e1d3b66bcd597f617849df0274d2a4472"; - sha256 = "1mhy49lasakgvdaswkxasdssik11lx3hfx4h1gs2b6881488ssdp"; - }; - - buildInputs = [ openssl git autoconf bootstrap ]; - - configurePhase = '' - options=( - --prefix=$out - --enable-single-host - --enable-c-opt=-O2 - --enable-gcc-opts - --enable-shared - --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it. - --enable-poll - --enable-openssl - --enable-default-runtime-options="f8,-8,t8" # Default to UTF-8 for source and all I/O - #--enable-debug # Nope: enables plenty of good stuff, but also the costly console.log - - #--enable-multiple-versions # Nope, NixOS already does version multiplexing - #--enable-guide - #--enable-track-scheme - #--enable-high-res-timing - #--enable-max-processors=4 - #--enable-multiple-vms - #--enable-dynamic-tls - #--enable-multiple-vms - #--enable-multiple-threaded-vms ## when SMP branch is merged in - #--enable-thread-system=posix ## default when --enable-multiple-vms is on. - #--enable-profile - #--enable-coverage - #--enable-inline-jumps - #--enable-char-size=1" ; default is 4 - ) - ./configure ''${options[@]} - ''; - - buildPhase = '' - # Make bootstrap compiler, from release bootstrap - mkdir -p boot && - cp -rp ${bootstrap}/. boot/. && - chmod -R u+w boot && - cd boot && - cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ - ./configure && - for i in lib gsi gsc ; do (cd $i ; make ) ; done && - cd .. && - cp boot/gsc/gsc gsc-boot && - - # Now use the bootstrap compiler to build the real thing! - make -j2 from-scratch - ''; - - doCheck = true; - - meta = { - description = "Optimizing Scheme to C compiler"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; + rev = "dd54a71dfc0bd09813592f1645d755867a02195d"; + sha256 = "120kg73k39gshrwas8a3xcrxgnq1c7ww92wgy4d3mmrwy3j9nzzc"; }; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix new file mode 100644 index 0000000000000000000000000000000000000000..f98fd5ca935aa3bb91d30758a5e423837093a00c --- /dev/null +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -0,0 +1,11 @@ +{ callPackage, fetchgit }: + +callPackage ./build.nix { + version = "unstable-2018-03-26"; + git-version = "4.8.9-8-g793679bd"; + SRC = fetchgit { + url = "https://github.com/feeley/gambit.git"; + rev = "793679bd57eb6275cb06e6570b05f4a78df61bf9"; + sha256 = "0bippvmrc8vcaa6ka3mhzfgkagb6a1616g7nxk0i0wapxai5cngj"; + }; +} diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix deleted file mode 100644 index e7b188ad71b84a74c30d597aedbdc9d45df60b4c..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ /dev/null @@ -1,471 +0,0 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs -, langC ? true, langCC ? true, langFortran ? false -, langJava ? false -, langAda ? false -, langVhdl ? 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) -, ppl ? null, cloogppl ? 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 -, gnatboot ? null -, enableMultilib ? false -, name ? "gcc" -, libcCross ? null -, crossStageStatic ? false -, gnat ? null -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd -, stripped ? true -, 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; - -with stdenv.lib; -with builtins; - -let version = "4.5.4"; - 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-3.1.3.jar; - sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09"; - }; - - xlibs = [ - libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xproto renderproto xextproto inputproto randrproto - ]; - - javaAwtGtk = langJava && gtk2 != null; - - /* Cross-gcc settings */ - gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null targetPlatform; - gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatform; - 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 = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"); - - crossConfigureFlags = - withArch + - withCpu + - withAbi + - # Ensure that -print-prog-name is able to find the correct programs. - " --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + - " --with-ld=${targetPackages.stdenv.cc.bintools}/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-libmudflap " + - " --disable-libgomp " + - " --disable-shared" + - " --disable-decimal-float" # libdecnumber requires libc - else - " --with-headers=${libcCross}/include" + - " --enable-__cxa_atexit" + - " --enable-long-long" + - (if crossMingw then - " --enable-threads=win32" + - " --enable-sjlj-exceptions" + - " --enable-hash-synchronization" + - " --enable-version-specific-runtime-libs" + - " --disable-libssp" + - " --disable-nls" + - " --with-dwarf2" - 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 ""; - -in - -# We need all these X libraries when building AWT with GTK+. -assert gtk2 != null -> (filter (x: x == null) xlibs) == []; - -stdenv.mkDerivation ({ - name = "${name}-${version}" + crossNameAddon; - - builder = ../builder.sh; - - src = (import ./sources.nix) { - inherit fetchurl optional version; - inherit langC langCC langFortran langJava langAda; - }; - - hardeningDisable = [ "format" ] ++ optional (name != "gnat") "all"; - - outputs = [ "out" "man" "info" ] - ++ optional (!(hostPlatform.is64bit && langAda)) "lib"; - - setOutputFlags = false; - NIX_NO_SELF_RPATH = true; - - libc_dev = stdenv.cc.libc_dev; - - 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 langVhdl ./ghdl-ortho-cflags.patch - ++ [ ../struct-ucontext-4.5.patch ] # glibc-2.26 - ; - - postPatch = - if (stdenv.system == "i586-pc-gnu" - || (libcCross != null # e.g., building `gcc.crossDrv' - && libcCross ? crossConfig - && libcCross.crossConfig == "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 - # 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"; - i386_gnu_h = "gcc/config/i386/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 \`${i386_gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${i386_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' - sed -i gcc/config/t-gnu \ - -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_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; - - # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, - crossStageStatic = targetPlatform == hostPlatform || crossStageStatic; - inherit noSysDirs profiledCompiler staticCompiler langJava - libcCross crossMingw; - - nativeBuildInputs = [ texinfo which gettext ] - ++ optional (perl != null) perl; - - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (ppl != null) ppl) - ++ (optional (cloogppl != null) cloogppl) - ++ (optional (zlib != null) zlib) - ++ (optional langJava boehmgc) - ++ (optionals langJava [zip unzip]) - ++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs)) - ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) - ++ (optionals langAda [gnatboot]) - ++ (optionals langVhdl [gnat]) - ; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - - configureFlags = " - ${if enableMultilib then "" else "--disable-multilib"} - ${if enableShared then "" else "--disable-shared"} - ${if ppl != null then "--with-ppl=${ppl}" else ""} - ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""} - ${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=${gmp.dev} - --with-mpfr=${mpfr.dev} - --with-mpc=${libmpc} - ${if libelf != null then "--with-libelf=${libelf}" else ""} - --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" - ) - ) - } - ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f - if targetPlatform == hostPlatform && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} - ${if langAda then " --enable-libada" else ""} - ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} - ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} - "; - - targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - - crossAttrs = { - 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 ppl != null then "--with-ppl=${ppl.crossDrv}" else ""} - ${if cloogppl != null then "--with-cloog=${cloogppl.crossDrv}" else ""} - ${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" - ) - ) - } - ${if langAda then " --enable-libada" else ""} - ${if targetplatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} - ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} - ''; - }; - - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; - CC = "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 ${libcCross.dev}/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 langAda langFortran langVhdl - enableMultilib version; isGNU = true; }; - - enableParallelBuilding = !langAda; - - 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 = [ - stdenv.lib.maintainers.viric - ]; - - # Volunteers needed for the {Cyg,Dar}win ports of *PPL. - # gnatboot is not available out of linux platforms, so we disable the darwin build - # for the gnat (ada compiler). - platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ]; - }; -} - -// 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 (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - -# GCC 4.5.2 doesn't support the `install-strip' target, so let `stdenv' do -# the stripping by default. -// optionalAttrs (!stripped) { dontStrip = true; } - -// optionalAttrs langVhdl rec { - name = "ghdl-0.29"; - - ghdlSrc = fetchurl { - url = "http://ghdl.free.fr/ghdl-0.29.tar.bz2"; - sha256 = "15mlinr1lwljwll9ampzcfcrk9bk0qpdks1kxlvb70xf9zhh2jva"; - }; - - # Ghdl has some timestamps checks, storing file timestamps in '.cf' files. - # As we will change the timestamps to 1970-01-01 00:00:01, we also set the - # content of that .cf to that value. This way ghdl does not complain on - # the installed object files from the basic libraries (ieee, ...) - postInstallGhdl = '' - pushd $out - find . -name "*.cf" -exec \ - sed 's/[0-9]*\.000" /19700101000001.000" /g' -i {} \; - popd - ''; - - postUnpack = '' - tar xvf ${ghdlSrc} - mv ghdl-*/vhdl gcc*/gcc - rm -Rf ghdl-* - ''; - - meta = { - homepage = http://ghdl.free.fr/; - license = stdenv.lib.licenses.gpl2Plus; - description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; - -}) diff --git a/pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch deleted file mode 100644 index 901534591c8f16a9a495953ffaaf9d770601e5eb..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in -index 8f481df..681ac59 100644 ---- a/gcc/vhdl/Make-lang.in -+++ b/gcc/vhdl/Make-lang.in -@@ -96,7 +96,7 @@ AGCC_GCCOBJ_DIR=../ - AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \ - -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \ - -I$(AGCC_GCCSRC_DIR)/libcpp/include --AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) -+AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) $(CFLAGS) $(INCLUDES) - - AGCC_LOCAL_OBJS=ortho-lang.o - -@@ -140,7 +140,7 @@ ghdl$(exeext): force - - # Ghdl libraries. - ghdllib: ghdl$(exeext) $(GCC_PASSES) force -- $(MAKE_IN_VHDL) GRT_FLAGS="-O -g" ghdllib -+ $(MAKE_IN_VHDL) GRT_FLAGS="-O -g $(CFLAGS)" ghdllib - - # Build hooks: - -diff --git a/gcc/vhdl/Makefile.in b/gcc/vhdl/Makefile.in -index d754c6c..07abc4a 100644 ---- a/gcc/vhdl/Makefile.in -+++ b/gcc/vhdl/Makefile.in -@@ -80,7 +80,8 @@ T_CPPFLAGS = - X_ADAFLAGS = - T_ADAFLAGS = - --ADAC = $(CC) -+# Never use the bootstrapped compiler, as it may not be built for ada -+ADAC = gcc - - ECHO = echo - CHMOD = chmod -diff --git a/gcc/vhdl/ortho-lang.c b/gcc/vhdl/ortho-lang.c -index 84aeb92..8eddd42 100644 ---- a/gcc/vhdl/ortho-lang.c -+++ b/gcc/vhdl/ortho-lang.c -@@ -16,6 +16,7 @@ - #include "options.h" - #include "real.h" --#include "tree-gimple.h" -+#include "gimple.h" -+#include "tree.h" - #include "function.h" - #include "cgraph.h" - #include "target.h" -@@ -680,38 +681,10 @@ type_for_mode (enum machine_mode mode, int unsignedp) - - const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; - --/* Tree code classes. */ -- --#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, -- --const enum tree_code_class tree_code_type[] = { --#include "tree.def" -- 'x' --}; --#undef DEFTREECODE -- --/* Table indexed by tree code giving number of expression -- operands beyond the fixed part of the node structure. -- Not used for types or decls. */ -- --#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, -- --const unsigned char tree_code_length[] = { --#include "tree.def" -- 0 --}; --#undef DEFTREECODE -- --#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) NAME, --const char * const tree_code_name[] = { --#include "tree.def" -- "@@dummy" --}; --#undef DEFTREECODE - - union lang_tree_node - GTY((desc ("0"), -- chain_next ("(union lang_tree_node *) GENERIC_NEXT (&%h.generic)"))) -+ chain_next ("(union lang_tree_node *) TREE_CHAIN (&%h.generic)"))) - { - union tree_node GTY ((tag ("0"))) generic; - }; -@@ -1162,7 +1135,7 @@ new_access_type (tree dtype) - res = make_node (POINTER_TYPE); - TREE_TYPE (res) = NULL_TREE; - /* Seems necessary. */ -- TYPE_MODE (res) = Pmode; -+ SET_TYPE_MODE (res, Pmode); - layout_type (res); - return res; - } -diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in -index e201f64..f36fb97 100644 ---- a/gcc/vhdl/Make-lang.in -+++ b/gcc/vhdl/Make-lang.in -@@ -132,7 +132,7 @@ ghdl1$(exeext): $(AGCC_OBJS) $(AGCC_DEPS) force - -cargs $(CFLAGS) $(GHDL_ADAFLAGS) - $(GNATMAKE) -o $@ -aI$(srcdir)/vhdl -aOvhdl ortho_gcc-main \ - -bargs -E -cargs $(CFLAGS) $(GHDL_ADAFLAGS) \ -- -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) -+ -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) $(CLOOGLIBS) $(PPLLIBS) - - # The driver for ghdl. - ghdl$(exeext): force diff --git a/pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch deleted file mode 100644 index 8128fa87da5fd627bdcfc8da49df79762a5053e9..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c ---- gcc-4.3.1-orig/gcc/cppdefault.c 2007-07-26 10:37:01.000000000 +0200 -+++ gcc-4.3.1/gcc/cppdefault.c 2008-06-25 17:48:23.000000000 +0200 -@@ -41,6 +41,10 @@ - # undef CROSS_INCLUDE_DIR - #endif - -+#undef LOCAL_INCLUDE_DIR -+#undef SYSTEM_INCLUDE_DIR -+#undef STANDARD_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c ---- gcc-4.3.1-orig/gcc/gcc.c 2008-03-02 23:55:19.000000000 +0100 -+++ gcc-4.3.1/gcc/gcc.c 2008-06-25 17:52:53.000000000 +0200 -@@ -1478,10 +1478,10 @@ - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 --#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#define STANDARD_STARTFILE_PREFIX_1 "" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" -+#define STANDARD_STARTFILE_PREFIX_2 "" - #endif - - #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ ---- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200 -+++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200 -@@ -378,7 +378,11 @@ - MD5_H = $(srcdir)/../include/md5.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. --NATIVE_SYSTEM_HEADER_DIR = /usr/include -+# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent -+# `fixinc' from fixing header files in /usr/include. However, -+# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set -+# it to some dummy directory. -+NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - -@@ -3277,7 +3281,7 @@ - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ -+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - -DPREFIX=\"$(prefix)/\" \ diff --git a/pkgs/development/compilers/gcc/4.5/sources.nix b/pkgs/development/compilers/gcc/4.5/sources.nix deleted file mode 100644 index 71e1e483cacd8bdbc7eb610d58ba28dfdb6d25f9..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/4.5/sources.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.5.4. */ -{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }: - -assert version == "4.5.4"; -optional /* langC */ true (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "894d90f72cbfc8707e330fa2b1847c443fa97cf9b7f26e86be554709510e624a"; -}) ++ -optional langCC (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "f7e3bab5e22713fbce46c2acb35fb727748473a34a942ce00393d75e1b09b6b9"; -}) ++ -optional langFortran (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "cf0803b4f5334a526dd8da1b2171d6724f50c17346b2d5c509b6abc973d2ef34"; -}) ++ -optional langJava (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "c98398da6f8c4c7d1758e291089d99853fdd27112cd3f146b7a8c26e6d762a23"; -}) ++ -optional langAda (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "8abddae15be65572b4d639bd9818057019bb4a45da4decfc6451511c8d580c5e"; -}) ++ -[] diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ab91528049c4013c945be2c178f0c2ec0c8d4ef0..0a6ea59e5ac430bd0c82900c0846be4718b0ceea 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -3,8 +3,6 @@ , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin , langJava ? false -, langAda ? false -, langVhdl ? false , langGo ? false , profiledCompiler ? false , staticCompiler ? false @@ -21,25 +19,22 @@ , 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 +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, gnat ? null , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null , darwin ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null && zlib != null && boehmgc != null && perl != null; # for `--enable-java-home' -assert langAda -> gnatboot != null; -assert langVhdl -> gnat != null; # We enable the isl cloog backend. assert cloog != null -> isl != null; @@ -67,9 +62,6 @@ let version = "4.8.5"; ++ optional enableParallelBuilding ../parallel-bconfig.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 hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch ++ [(fetchpatch { @@ -109,105 +101,78 @@ let version = "4.8.5"; /* 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 ""; + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; in - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode; - - /* Cross-gcc settings */ + optional (gccArch != null) "--with-arch=${gccArch}" ++ + optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ + optional (gccAbi != null) "--with-abi=${gccAbi}" ++ + optional (gccFpu != null) "--with-fpu=${gccFpu}" ++ + optional (gccFloat != null) "--with-float=${gccFloat}" ++ + optional (gccMode != null) "--with-mode=${gccMode}"; + + /* Cross-gcc settings (build == host != target) */ 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 - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode + - # Ensure that -print-prog-name is able to find the correct programs. - " --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + - " --with-ld=${targetPackages.stdenv.cc.bintools}/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-libmudflap " + - " --disable-libgomp " + - " --disable-libquadmath" + - " --disable-shared" + - " --disable-libatomic " + # libatomic requires libc - " --disable-decimal-float" # libdecnumber requires libc - 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. - " --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 - # 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) - ); + crossConfigureFlags = + # Ensure that -print-prog-name is able to find the correct programs. + [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-ld=${targetPackages.stdenv.cc.bintools}/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") + "--enable-__cxa_atexit" + "--enable-long-long" + ] ++ + (if crossMingw then [ + "--enable-threads=win32" + "--enable-sjlj-exceptions" + "--enable-hash-synchronization" + "--enable-libssp" + "--disable-nls" + "--with-dwarf2" + # To keep ABI compatibility with upstream mingw-w64 + "--enable-fully-dynamic-string" + ] else + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + "--disable-libgomp" + ] ++ [ + "--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 && !hostPlatform.isArm && !hostPlatform.isMips; + bootstrap = targetPlatform == hostPlatform; in @@ -293,6 +258,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); @@ -304,8 +270,6 @@ stdenv.mkDerivation ({ ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) - ++ (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. @@ -325,67 +289,85 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - 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 "--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}"} - ${optionalString (cloog != null) "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"} - ${if langJava then - "--with-ecj-jar=${javaEcj} " + + configureFlags = + # Basic dependencies + [ + "--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}" + ] ++ + optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + + # Basic configuration + [ + "--enable-lto" + "--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 langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + }" + ] ++ + + (if enableMultilib + then ["--enable-multilib" "--disable-libquadmath"] + else ["--disable-multilib"]) ++ + optional (!enableShared) "--disable-shared" ++ + (if enablePlugin + then ["--enable-plugin"] + else ["--disable-plugin"]) ++ + + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + optionals (cloog != null) [ + "--with-cloog=${cloog}" + "--disable-cloog-version-check" + "--enable-cloog-backend=isl" + ] ++ + + # Java options + optionals langJava [ + "--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 ""} - "; + "--enable-java-home" + "--with-java-home=\${prefix}/lib/jvm/jre" + ] ++ + optional javaAwtGtk "--enable-java-awt=gtk" ++ + optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ + + platformFlags ++ + optional (targetPlatform != hostPlatform) crossConfigureFlags ++ + optional (!bootstrap) "--disable-bootstrap" ++ + + # Platform-specific flags + optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optionals hostPlatform.isSunOS [ + "--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" + ] + ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -398,84 +380,30 @@ stdenv.mkDerivation ({ 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; + /* For cross-built gcc (build != host == target) */ + crossAttrs = { dontStrip = true; - configureFlags = '' - ${if enableMultilib then "" else "--disable-multilib"} - ${if enableShared then "" else "--disable-shared"} - ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""} - ${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 ""} - ${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"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # 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. + # 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. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -486,42 +414,44 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (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 ${libcCross.dev}/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 [ + ++ optional (libpthread != null) libpthread) + ); + + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${libcCross.dev}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); + + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-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; }; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); + + passthru = { + inherit langC langCC langObjC langObjCpp langFortran langGo version; + isGNU = true; + hardeningUnsupportedFlags = [ "stackprotector" ]; + }; inherit enableParallelBuilding enableMultilib; @@ -544,13 +474,11 @@ stdenv.mkDerivation ({ maintainers = with stdenv.lib.maintainers; [ viric peti ]; - # 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 ++ stdenv.lib.platforms.illumos ++ - optionals (langAda == false) stdenv.lib.platforms.darwin; + stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 794d809fa72762e6fa10c55868b950b371be8a54..5dfdbd02cbfdf5fdcf4ac3e6cb09ba18151d8f84 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -3,8 +3,6 @@ , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin , langJava ? false -, langAda ? false -, langVhdl ? false , langGo ? false , profiledCompiler ? false , staticCompiler ? false @@ -21,25 +19,22 @@ , 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 +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, gnat ? null , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null , darwin ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null && zlib != null && boehmgc != null && perl != null; # for `--enable-java-home' -assert langAda -> gnatboot != null; -assert langVhdl -> gnat != null; # We enable the isl cloog backend. assert cloog != null -> isl != null; @@ -68,9 +63,6 @@ let version = "4.9.4"; ++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.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 ++ [ ../struct-ucontext.patch ../struct-sigaltstack-4.9.patch ] # glibc-2.26 ; @@ -100,106 +92,81 @@ let version = "4.9.4"; /* 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 ""; + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; in - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode; - - /* Cross-gcc settings */ + optional (gccArch != null) "--with-arch=${gccArch}" ++ + optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ + optional (gccAbi != null) "--with-abi=${gccAbi}" ++ + optional (gccFpu != null) "--with-fpu=${gccFpu}" ++ + optional (gccFloat != null) "--with-float=${gccFloat}" ++ + optional (gccMode != null) "--with-mode=${gccMode}"; + + /* Cross-gcc settings (build == host != target) */ 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 - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode + - # Ensure that -print-prog-name is able to find the correct programs. - " --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + - " --with-ld=${targetPackages.stdenv.cc.bintools}/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=${libcCross.out}/share/sysroot" - else " --with-headers=${libcCross.dev}/include") + - " --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) - ); + crossConfigureFlags = + # Ensure that -print-prog-name is able to find the correct programs. + [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-ld=${targetPackages.stdenv.cc.bintools}/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") + "--enable-__cxa_atexit" + "--enable-long-long" + ] ++ + (if crossMingw then [ + "--enable-threads=win32" + "--enable-sjlj-exceptions" + "--enable-hash-synchronization" + "--enable-libssp" + "--disable-nls" + "--with-dwarf2" + # To keep ABI compatibility with upstream mingw-w64 + "--enable-fully-dynamic-string" + ] else + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ + # 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" + ] ++ [ + "--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; + bootstrap = targetPlatform == hostPlatform; in @@ -286,19 +253,28 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (cloog != null) cloog) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (cloog != null) cloog) ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) - ++ (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. @@ -322,65 +298,84 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - 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}"} - ${optionalString (cloog != null) "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"} - ${if langJava then - "--with-ecj-jar=${javaEcj} " + + configureFlags = + # Basic dependencies + [ + "--with-gmp-include=${gmp.dev}/include" + "--with-gmp-lib=${gmp.out}/lib" + "--with-mpfr=${mpfr.dev}" + "--with-mpc=${libmpc}" + ] ++ + optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + + # Basic configuration + [ + "--enable-lto" + "--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 langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + }" + ] ++ + + (if enableMultilib + then ["--enable-multilib" "--disable-libquadmath"] + else ["--disable-multilib"]) ++ + optional (!enableShared) "--disable-shared" ++ + (if enablePlugin + then ["--enable-plugin"] + else ["--disable-plugin"]) ++ + + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + optionals (cloog != null) [ + "--with-cloog=${cloog}" + "--disable-cloog-version-check" + "--enable-cloog-backend=isl" + ] ++ + + # Java options + optionals langJava [ + "--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=${gmp.dev} - --with-mpfr=${mpfr.dev} - --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 ""} - "; + "--enable-java-home" + "--with-java-home=\${prefix}/lib/jvm/jre" + ] ++ + optional javaAwtGtk "--enable-java-awt=gtk" ++ + optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ + + platformFlags ++ + optional (targetPlatform != hostPlatform) crossConfigureFlags ++ + optional (!bootstrap) "--disable-bootstrap" ++ + + # Platform-specific flags + optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optionals hostPlatform.isSunOS [ + "--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" + ] + ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -393,84 +388,30 @@ stdenv.mkDerivation ({ 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; + /* For cross-built gcc (build != host == target) */ + crossAttrs = { dontStrip = true; - configureFlags = '' - ${if enableMultilib then "" else "--disable-multilib"} - ${if enableShared then "" else "--disable-shared"} - ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""} - ${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 ""} - ${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"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # 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. + # 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. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -481,42 +422,41 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (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 ${libcCross.dev}/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 [ + ++ optional (libpthread != null) libpthread) + ); + + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); + + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-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; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); passthru = - { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; inherit enableParallelBuilding enableMultilib; @@ -539,13 +479,11 @@ stdenv.mkDerivation ({ maintainers = with stdenv.lib.maintainers; [ viric peti ]; - # 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 ++ stdenv.lib.platforms.illumos ++ - optionals (langAda == false) stdenv.lib.platforms.darwin; + stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 345e2baf6718f598b55e763d6c88552317c24982..e42bb736676d4c4ff5cd35a7cab3565432d68e75 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -1,10 +1,8 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs +{ stdenv, targetPackages, fetchurl, fetchpatch, 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 @@ -21,13 +19,11 @@ , 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 +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, gnat ? null , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null @@ -40,8 +36,6 @@ 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; @@ -49,9 +43,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -70,14 +61,15 @@ let version = "5.5.0"; [ ../use-source-date-epoch.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 # This could be applied unconditionally but I don't want to cause a full # Linux rebuild. - ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch; + ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch + ++ optional stdenv.hostPlatform.isMusl (fetchpatch { + url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff; + sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm"; + }); javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -104,106 +96,81 @@ let version = "5.5.0"; /* 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 ""; + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; in - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode; - - /* Cross-gcc settings */ + optional (gccArch != null) "--with-arch=${gccArch}" ++ + optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ + optional (gccAbi != null) "--with-abi=${gccAbi}" ++ + optional (gccFpu != null) "--with-fpu=${gccFpu}" ++ + optional (gccFloat != null) "--with-float=${gccFloat}" ++ + optional (gccMode != null) "--with-mode=${gccMode}"; + + /* Cross-gcc settings (build == host != target) */ 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 - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode + - # Ensure that -print-prog-name is able to find the correct programs. - " --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + - " --with-ld=${targetPackages.stdenv.cc.bintools}/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") + - " --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) - ); + crossConfigureFlags = + # Ensure that -print-prog-name is able to find the correct programs. + [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-ld=${targetPackages.stdenv.cc.bintools}/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") + "--enable-__cxa_atexit" + "--enable-long-long" + ] ++ + (if crossMingw then [ + "--enable-threads=win32" + "--enable-sjlj-exceptions" + "--enable-hash-synchronization" + "--enable-libssp" + "--disable-nls" + "--with-dwarf2" + # To keep ABI compatibility with upstream mingw-w64 + "--enable-fully-dynamic-string" + ] else + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ + # 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" + ] ++ [ + "--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; + bootstrap = targetPlatform == hostPlatform; in @@ -220,8 +187,6 @@ stdenv.mkDerivation ({ inherit sha256; }; - hardeningDisable = [ "format" ]; - inherit patches; outputs = [ "out" "lib" "man" "info" ]; @@ -230,6 +195,8 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; + hardeningDisable = [ "format" ]; + # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' @@ -286,15 +253,22 @@ stdenv.mkDerivation ({ let libc = if libcCross != null then libcCross else stdenv.cc.libc; in - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do - grep -q LIBC_DYNAMIC_LINKER "$header" || continue + grep -q _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' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) else null; # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, @@ -302,19 +276,27 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) - ++ (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. @@ -336,66 +318,81 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - 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} " + + configureFlags = + # Basic dependencies + [ + "--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}" + ] ++ + optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + + # Basic configuration + [ + "--enable-lto" + "--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 langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + }" + ] ++ + + (if enableMultilib + then ["--enable-multilib" "--disable-libquadmath"] + else ["--disable-multilib"]) ++ + optional (!enableShared) "--disable-shared" ++ + (if enablePlugin + then ["--enable-plugin"] + else ["--disable-plugin"]) ++ + + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + + # Java options + optionals langJava [ + "--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 ""} - "; + "--enable-java-home" + "--with-java-home=\${prefix}/lib/jvm/jre" + ] ++ + optional javaAwtGtk "--enable-java-awt=gtk" ++ + optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ + + platformFlags ++ + optional (targetPlatform != hostPlatform) crossConfigureFlags ++ + optional (!bootstrap) "--disable-bootstrap" ++ + + # Platform-specific flags + optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optionals hostPlatform.isSunOS [ + "--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" + ] + ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer" + ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -408,85 +405,32 @@ stdenv.mkDerivation ({ 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; + /* For cross-built gcc (build != host == target) */ + crossAttrs = { 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 ""} - ${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. + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # 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. + # 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. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optionals langJava [ boehmgc ] + ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] ++ optional (libpthread != null) libpthread @@ -495,42 +439,41 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (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 [ + ++ optional (libpthread != null) libpthread) + ); + + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); + + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-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; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); passthru = - { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; inherit enableParallelBuilding enableMultilib; @@ -553,12 +496,10 @@ stdenv.mkDerivation ({ maintainers = with stdenv.lib.maintainers; [ viric peti ]; - # 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; + stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 03c6b3834ea420156036fc66135679d02b7642b2..cf71f51627c92a8c852dc2aadaf40fd46b6027bc 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -3,8 +3,6 @@ , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin , langJava ? false -, langAda ? false -, langVhdl ? false , langGo ? false , profiledCompiler ? false , staticCompiler ? false @@ -21,26 +19,23 @@ , 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 +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, gnat ? null , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? 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 && 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; @@ -48,9 +43,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -68,9 +60,6 @@ let version = "6.4.0"; [ ../use-source-date-epoch.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 ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26 ++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26 @@ -101,106 +90,86 @@ let version = "6.4.0"; /* 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 ""; + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; in - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode; - - /* Cross-gcc settings */ + optional (gccArch != null) "--with-arch=${gccArch}" ++ + optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ + optional (gccAbi != null) "--with-abi=${gccAbi}" ++ + optional (gccFpu != null) "--with-fpu=${gccFpu}" ++ + optional (gccFloat != null) "--with-float=${gccFloat}" ++ + optional (gccMode != null) "--with-mode=${gccMode}"; + + /* Cross-gcc settings (build == host != target) */ 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 - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode + - # Ensure that -print-prog-name is able to find the correct programs. - " --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + - " --with-ld=${targetPackages.stdenv.cc.bintools}/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") + - " --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) - ); + crossConfigureFlags = + # Ensure that -print-prog-name is able to find the correct programs. + [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-ld=${targetPackages.stdenv.cc.bintools}/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 + # maybe only needed on musl, PATH_MAX + # https://github.com/richfelker/musl-cross-make/blob/0867cdf300618d1e3e87a0a939fa4427207ad9d7/litecross/Makefile#L62 + "--disable-libmpx" + ] else [ + (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" + else "--with-headers=${getDev libcCross}/include") + "--enable-__cxa_atexit" + "--enable-long-long" + ] ++ + (if crossMingw then [ + "--enable-threads=win32" + "--enable-sjlj-exceptions" + "--enable-hash-synchronization" + "--enable-libssp" + "--disable-nls" + "--with-dwarf2" + # To keep ABI compatibility with upstream mingw-w64 + "--enable-fully-dynamic-string" + ] else + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ + # 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" + # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 + "--disable-libmpx" + ] ++ [ + "--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; + bootstrap = targetPlatform == hostPlatform; in @@ -284,15 +253,22 @@ stdenv.mkDerivation ({ let libc = if libcCross != null then libcCross else stdenv.cc.libc; in - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do - grep -q LIBC_DYNAMIC_LINKER "$header" || continue + grep -q _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' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) else null; # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, @@ -300,18 +276,27 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) - ++ (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. @@ -337,155 +322,116 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - 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} " + + configureFlags = + # Basic dependencies + [ + "--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}" + ] ++ + optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + + # Basic configuration + [ + "--enable-lto" + "--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 langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + }" + ] ++ + + (if enableMultilib + then ["--enable-multilib" "--disable-libquadmath"] + else ["--disable-multilib"]) ++ + optional (!enableShared) "--disable-shared" ++ + (if enablePlugin + then ["--enable-plugin"] + else ["--disable-plugin"]) ++ + + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + + # Java options + optionals langJava [ + "--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 ""} - "; + "--enable-java-home" + "--with-java-home=\${prefix}/lib/jvm/jre" + ] ++ + optional javaAwtGtk "--enable-java-awt=gtk" ++ + optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ + + platformFlags ++ + optional (targetPlatform != hostPlatform) crossConfigureFlags ++ + optional (!bootstrap) "--disable-bootstrap" ++ + + # Platform-specific flags + optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optionals hostPlatform.isSunOS [ + "--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" + ] + ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer" + ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - buildFlags = if bootstrap then - (if profiledCompiler then "profiledbootstrap" else "bootstrap") - else ""; + buildFlags = + optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 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; + /* For cross-built gcc (build != host == target) */ + crossAttrs = { 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 ""} - ${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. + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # 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. + # 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. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -496,42 +442,41 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (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 [ + ++ optional (libpthread != null) libpthread) + ); + + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); + + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-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; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); passthru = - { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; inherit enableParallelBuilding enableMultilib; @@ -554,12 +499,10 @@ stdenv.mkDerivation ({ maintainers = with stdenv.lib.maintainers; [ viric peti ]; - # 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; + stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/6/fix-objdump-check.patch b/pkgs/development/compilers/gcc/6/fix-objdump-check.patch new file mode 100644 index 0000000000000000000000000000000000000000..f9adbe9eb1ca56291923bde89a3a3fb4ee8ecdea --- /dev/null +++ b/pkgs/development/compilers/gcc/6/fix-objdump-check.patch @@ -0,0 +1,43 @@ +commit 4c38abe0967bad78dd6baa61c86923e4d4b346d3 +Author: Ben Gamari +Date: Sun Nov 5 13:14:19 2017 -0500 + + Fix it + +diff --git a/config/gcc-plugin.m4 b/config/gcc-plugin.m4 +index dd06a58..f4435b8 100644 +--- a/config/gcc-plugin.m4 ++++ b/config/gcc-plugin.m4 +@@ -13,6 +13,32 @@ dnl the same distribution terms as the rest of that program. + # Sets the shell variables enable_plugin and pluginlibs. + AC_DEFUN([GCC_ENABLE_PLUGINS], + [# Check for plugin support ++ ++ # Figure out what objdump we will be using. ++ AS_VAR_SET_IF(gcc_cv_objdump,, [ ++ if test -f $gcc_cv_binutils_srcdir/configure.ac \ ++ && test -f ../binutils/Makefile \ ++ && test x$build = x$host; then ++ # Single tree build which includes binutils. ++ gcc_cv_objdump=../binutils/objdump$build_exeext ++ elif test -x objdump$build_exeext; then ++ gcc_cv_objdump=./objdump$build_exeext ++ elif ( set dummy $OBJDUMP_FOR_TARGET; test -x $[2] ); then ++ gcc_cv_objdump="$OBJDUMP_FOR_TARGET" ++ else ++ AC_PATH_PROG(gcc_cv_objdump, $OBJDUMP_FOR_TARGET) ++ fi]) ++ ++ AC_MSG_CHECKING(what objdump to use) ++ if test "$gcc_cv_objdump" = ../binutils/objdump$build_exeext; then ++ # Single tree build which includes binutils. ++ AC_MSG_RESULT(newly built objdump) ++ elif test x$gcc_cv_objdump = x; then ++ AC_MSG_RESULT(not found) ++ else ++ AC_MSG_RESULT($gcc_cv_objdump) ++ fi ++ + AC_ARG_ENABLE(plugin, + [AS_HELP_STRING([--enable-plugin], [enable plugin support])], + enable_plugin=$enableval, diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 3a7c0eb64437e69f397681c34af2f6213dbb6c8b..0b19aa95effe444966cb98f9a8f32cf5e38d33cc 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -1,10 +1,8 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs +{ stdenv, targetPackages, fetchurl, fetchpatch, 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 @@ -21,27 +19,23 @@ , 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 +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, gnat ? null , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null -, flex ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: 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; @@ -49,16 +43,13 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "7.2.0"; +let version = "7.3.0"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; @@ -66,12 +57,17 @@ let version = "7.2.0"; enableParallelBuilding = true; patches = - [ ] + [ # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html + ./riscv-pthread-reentrant.patch + # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html + ./riscv-no-relax.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 (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied + url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; + sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs"; + }) ++ optional langFortran ../gfortran-driving.patch; javaEcj = fetchurl { @@ -99,107 +95,86 @@ let version = "7.2.0"; /* 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 ""; + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; in - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode; - - /* Cross-gcc settings */ + optional (gccArch != null) "--with-arch=${gccArch}" ++ + optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ + optional (gccAbi != null) "--with-abi=${gccAbi}" ++ + optional (gccFpu != null) "--with-fpu=${gccFpu}" ++ + optional (gccFloat != null) "--with-float=${gccFloat}" ++ + optional (gccMode != null) "--with-mode=${gccMode}"; + + /* Cross-gcc settings (build == host != target) */ 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 - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode + - # Ensure that -print-prog-name is able to find the correct programs. - " --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + - " --with-ld=${targetPackages.stdenv.cc.bintools}/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) - ); + crossConfigureFlags = + # Ensure that -print-prog-name is able to find the correct programs. + [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-ld=${targetPackages.stdenv.cc.bintools}/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 + # maybe only needed on musl, PATH_MAX + # https://github.com/richfelker/musl-cross-make/blob/0867cdf300618d1e3e87a0a939fa4427207ad9d7/litecross/Makefile#L62 + "--disable-libmpx" + ] else [ + (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" + else "--with-headers=${getDev libcCross}/include") + "--enable-__cxa_atexit" + "--enable-long-long" + ] ++ + (if crossMingw then [ + "--enable-threads=win32" + "--enable-sjlj-exceptions" + "--enable-hash-synchronization" + "--enable-libssp" + "--disable-nls" + "--with-dwarf2" + # To keep ABI compatibility with upstream mingw-w64 + "--enable-fully-dynamic-string" + ] else + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ + # 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" + # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 + "--disable-libmpx" + ] ++ [ + "--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; + bootstrap = targetPlatform == hostPlatform; in @@ -213,7 +188,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "16j7i0888j2f1yp9l0nhji6cq65dy6y4nwy8868a8njbzzwavxqw"; + sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; }; inherit patches; @@ -239,7 +214,12 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" ''; - postPatch = + postPatch = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + ( if (hostPlatform.isHurd || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig @@ -282,34 +262,50 @@ stdenv.mkDerivation ({ let libc = if libcCross != null then libcCross else stdenv.cc.libc; in - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do - grep -q LIBC_DYNAMIC_LINKER "$header" || continue + grep -q _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' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' - else null; + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) + else ""); # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, crossStageStatic = targetPlatform == hostPlatform || crossStageStatic; inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf flex ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) - ++ (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. @@ -331,155 +327,117 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - 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} " + + configureFlags = + # Basic dependencies + [ + "--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}" + ] ++ + optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + + # Basic configuration + [ + "--enable-lto" + "--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 langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + }" + ] ++ + + (if enableMultilib + then ["--enable-multilib" "--disable-libquadmath"] + else ["--disable-multilib"]) ++ + optional (!enableShared) "--disable-shared" ++ + (if enablePlugin + then ["--enable-plugin"] + else ["--disable-plugin"]) ++ + + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + + # Java options + optionals langJava [ + "--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 ""} - "; + "--enable-java-home" + "--with-java-home=\${prefix}/lib/jvm/jre" + ] ++ + optional javaAwtGtk "--enable-java-awt=gtk" ++ + optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ + + + platformFlags ++ + optional (targetPlatform != hostPlatform) crossConfigureFlags ++ + optional (!bootstrap) "--disable-bootstrap" ++ + + # Platform-specific flags + optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optionals hostPlatform.isSunOS [ + "--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" + ] + ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer" + ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - buildFlags = if bootstrap then - (if profiledCompiler then "profiledbootstrap" else "bootstrap") - else ""; + buildFlags = + optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 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 ""; + /* For cross-built gcc (build != host == target) */ + crossAttrs = { 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 ""} - ${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. + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # 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. + # 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. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -490,42 +448,41 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (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 [ + ++ optional (libpthread != null) libpthread) + ); + + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); + + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-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; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); passthru = - { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; inherit enableParallelBuilding enableMultilib; @@ -548,12 +505,10 @@ stdenv.mkDerivation ({ 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; + stdenv.lib.platforms.darwin; }; } @@ -563,7 +518,7 @@ stdenv.mkDerivation ({ } # Strip kills static libs of other archs (hence targetPlatform != hostPlatform) -// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/7/riscv-no-relax.patch b/pkgs/development/compilers/gcc/7/riscv-no-relax.patch new file mode 100644 index 0000000000000000000000000000000000000000..93d9cd1d60f58ea6cf39c3d76c2d0b8d13c36e2d --- /dev/null +++ b/pkgs/development/compilers/gcc/7/riscv-no-relax.patch @@ -0,0 +1,109 @@ +commit e7c570f37384d824cb9725f237920e9691e57269 +gpg: Signature made Tue 06 Mar 2018 04:52:46 PM PST +gpg: using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41 +gpg: issuer "palmer@dabbelt.com" +gpg: Good signature from "Palmer Dabbelt " [ultimate] +gpg: aka "Palmer Dabbelt " [ultimate] +Author: Palmer Dabbelt +Date: Thu Mar 1 12:01:06 2018 -0800 + + RISC-V: Add and document the "-mno-relax" option + + RISC-V relies on aggressive linker relaxation to get good code size. As + a result no text symbol addresses can be known until link time, which + means that alignment must be handled during the link. This alignment + pass is essentially just another linker relaxation, so this has the + unfortunate side effect that linker relaxation is required for + correctness on many RISC-V targets. + + The RISC-V assembler has supported an ".option norelax" for a long time + because there are situations in which linker relaxation is a bad idea -- + the canonical example is when trying to materialize the initial value of + the global pointer into a register, which would otherwise be relaxed to + a NOP. We've been relying on users who want to disable relaxation for + an entire link to pass "-Wl,--no-relax", but that still relies on the + linker relaxing R_RISCV_ALIGN to handle alignment despite it not being + strictly necessary. + + This patch adds a GCC option, "-mno-relax", that disable linker + relaxation by adding ".option norelax" to the top of every generated + assembly file. The assembler is smart enough to handle alignment at + assemble time for files that have never emitted a relaxable relocation, + so this is sufficient to really disable all relaxations in the linker, + which results in significantly faster link times for large objects. + + This also has the side effect of allowing toolchains that don't support + linker relaxation (LLVM and the Linux module loader) to function + correctly. Toolchains that don't support linker relaxation should + default to "-mno-relax" and error when presented with any R_RISCV_ALIGN + relocation as those need to be handled for correctness. + + gcc/ChangeLog + + 2018-03-01 Palmer Dabbelt + + * config/riscv/riscv.opt (mrelax): New option. + * config/riscv/riscv.c (riscv_file_start): Emit ".option + "norelax" when riscv_mrelax is disabled. + * doc/invoke.texi (RISC-V): Document "-mrelax" and "-mno-relax". + +diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c +index c38f6c394d54..3e81874de232 100644 +--- a/gcc/config/riscv/riscv.c ++++ b/gcc/config/riscv/riscv.c +@@ -3979,6 +3979,11 @@ riscv_file_start (void) + + /* Instruct GAS to generate position-[in]dependent code. */ + fprintf (asm_out_file, "\t.option %spic\n", (flag_pic ? "" : "no")); ++ ++ /* If the user specifies "-mno-relax" on the command line then disable linker ++ relaxation in the assembler. */ ++ if (! riscv_mrelax) ++ fprintf (asm_out_file, "\t.option norelax\n"); + } + + /* Implement TARGET_ASM_OUTPUT_MI_THUNK. Generate rtl rather than asm text +diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt +index 581a26bb5c1e..b37ac75d9bb4 100644 +--- a/gcc/config/riscv/riscv.opt ++++ b/gcc/config/riscv/riscv.opt +@@ -106,6 +106,11 @@ mexplicit-relocs + Target Report Mask(EXPLICIT_RELOCS) + Use %reloc() operators, rather than assembly macros, to load addresses. + ++mrelax ++Target Bool Var(riscv_mrelax) Init(1) ++Take advantage of linker relaxations to reduce the number of instructions ++required to materialize symbol addresses. ++ + Mask(64BIT) + + Mask(MUL) +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 8d366c626bae..deb48af2ecad 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -1042,7 +1042,8 @@ See RS/6000 and PowerPC Options. + -msave-restore -mno-save-restore @gol + -mstrict-align -mno-strict-align @gol + -mcmodel=medlow -mcmodel=medany @gol +--mexplicit-relocs -mno-explicit-relocs @gol} ++-mexplicit-relocs -mno-explicit-relocs @gol ++-mrelax -mno-relax @gol} + + @emph{RL78 Options} + @gccoptlist{-msim -mmul=none -mmul=g13 -mmul=g14 -mallregs @gol +@@ -23102,6 +23103,12 @@ Use or do not use assembler relocation operators when dealing with symbolic + addresses. The alternative is to use assembler macros instead, which may + limit optimization. + ++@item -mrelax ++@itemx -mno-relax ++Take advantage of linker relaxations to reduce the number of instructions ++required to materialize symbol addresses. The default is to take advantage of ++linker relaxations. ++ + @end table + + @node RL78 Options + diff --git a/pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch b/pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch new file mode 100644 index 0000000000000000000000000000000000000000..c7527ffb2b16ce98046788b1d335dbab61395323 --- /dev/null +++ b/pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch @@ -0,0 +1,13 @@ +Index: gcc/config/riscv/linux.h +=================================================================== +--- a/gcc/config/riscv/linux.h (revision 257620) ++++ b/gcc/config/riscv/linux.h (revision 257621) +@@ -47,6 +47,8 @@ + + #define ICACHE_FLUSH_FUNC "__riscv_flush_icache" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #define LINK_SPEC "\ + -melf" XLEN_SPEC "lriscv \ + %{shared} \ diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index ee56425f00b422f1e3e8c2b0fd502c65c897e0f4..a3250f4021a5396cccecfb43a8ed61058e0a2032 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -1,153 +1,156 @@ source $stdenv/setup -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY +oldOpts="$(shopt -po nounset)" || true +set -euo pipefail + + +export NIX_FIXINC_DUMMY="$NIX_BUILD_TOP/dummy" +mkdir "$NIX_FIXINC_DUMMY" if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" else - EXTRA_LDFLAGS="-Wl,-rpath,$lib/lib" + EXTRA_LDFLAGS="-Wl,-rpath,${!outputLib}/lib" fi # GCC interprets empty paths as ".", which we don't want. -if test -z "$CPATH"; then unset CPATH; fi -if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi -echo "\$CPATH is \`$CPATH'" -echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" +if test -z "${CPATH-}"; then unset CPATH; fi +if test -z "${LIBRARY_PATH-}"; then unset LIBRARY_PATH; fi +echo "\$CPATH is \`${CPATH-}'" +echo "\$LIBRARY_PATH is \`${LIBRARY_PATH-}'" if test "$noSysDirs" = "1"; then - if test -e $NIX_CC/nix-support/orig-libc; then + declare \ + EXTRA_BUILD_FLAGS EXTRA_FLAGS EXTRA_TARGET_FLAGS \ + EXTRA_BUILD_LDFLAGS EXTRA_TARGET_LDFLAGS - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before || true)" + # Extract flags from Bintools Wrappers + for pre in 'BUILD_' ''; do + curBintools="NIX_${pre}BINTOOLS" - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$libc_dev/include + declare -a extraLDFlags=() + if [[ -e "${!curBintools}/nix-support/orig-libc" ]]; then + # Figure out what extra flags when linking to pass to the gcc + # compilers being generated to make sure that they use our libc. + extraLDFlags=($(< "${!curBintools}/nix-support/libc-ldflags") $(< "${!curBintools}/nix-support/libc-ldflags-before" || true)) - # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" + # The path to the Libc binaries such as `crti.o'. + libc_libdir="$(< "${!curBintools}/nix-support/orig-libc")/lib" + else + # Hack: support impure environments. + extraLDFlags=("-L/usr/lib64" "-L/usr/lib") + libc_libdir="/usr/lib" + fi + extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir" + "${extraLDFlags[@]}") + for i in "${extraLDFlags[@]}"; do + declare EXTRA_${pre}LDFLAGS+=" -Wl,$i" + done + done - else - # Hack: support impure environments. - extraFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - glibc_libdir="/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi + # Extract flags from CC Wrappers + for pre in 'BUILD_' ''; do + curCC="NIX_${pre}CC" + curFIXINC="NIX_${pre}FIXINC_DUMMY" - extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" + declare -a extraFlags=() + if [[ -e "${!curCC}/nix-support/orig-libc" ]]; then + # Figure out what extra compiling flags to pass to the gcc compilers + # being generated to make sure that they use our libc. + extraFlags=($(< "${!curCC}/nix-support/libc-cflags")) - # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, - # make sure to explictly add them so that files compiled with the - # bootstrap compiler are optimized and (optionally) contain - # debugging information (info "(gccinstall) Building"). - if test -n "$dontStrip"; then - extraFlags="-O2 -g $extraFlags" - else - # Don't pass `-g' at all; this saves space while building. - extraFlags="-O2 $extraFlags" - fi + # The path to the Libc headers + libc_devdir="$(< "${!curCC}/nix-support/orig-libc-dev")" - EXTRA_FLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i" - done + # Use *real* header files, otherwise a limits.h is generated that + # does not include Libc's limits.h (notably missing SSIZE_MAX, + # which breaks the build). + declare NIX_${pre}FIXINC_DUMMY="$libc_devdir/include" + else + # Hack: support impure environments. + extraFlags=("-isystem" "/usr/include") + declare NIX_${pre}FIXINC_DUMMY=/usr/include + fi - if test -n "$targetConfig"; then - # Cross-compiling, we need gcc not to read ./specs in order to build - # the g++ compiler (after the specs for the cross-gcc are created). - # Having LIBRARY_PATH= makes gcc read the specs from ., and the build - # breaks. Having this variable comes from the default.nix code to bring - # gcj in. - unset LIBRARY_PATH - unset CPATH - else - if test -z "$NIX_CC_CROSS"; then - EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" + extraFlags=("-I${!curFIXINC}" "${extraFlags[@]}") + + # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, make + # sure to explictly add them so that files compiled with the bootstrap + # compiler are optimized and (optionally) contain debugging information + # (info "(gccinstall) Building"). + if test -n "${dontStrip-}"; then + extraFlags=("-O2" "-g" "${extraFlags[@]}") else - # This the case of cross-building the gcc. - # We need special flags for the target, different than those of the build - # Assertion: - test -e $NIX_CC_CROSS/nix-support/orig-libc - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" - - # The path to the Glibc binaries such as `crti.o'. - glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)" - glibc_libdir="$glibc_dir/lib" - glibc_devdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc-dev)" - configureFlags="$configureFlags --with-native-system-header-dir=$glibc_devdir/include" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS="$glibc_devdir/include" - - extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - EXTRA_TARGET_CFLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i" - done + # Don't pass `-g' at all; this saves space while building. + extraFlags=("-O2" "${extraFlags[@]}") fi + + declare EXTRA_${pre}FLAGS="${extraFlags[*]}" + done + + if test -z "${targetConfig-}"; then + # host = target, so the flags are the same + EXTRA_TARGET_FLAGS="$EXTRA_FLAGS" + EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" fi # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find # the startfiles. # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx # for the startfiles. - makeFlagsArray+=( \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \ + makeFlagsArray+=( + "BUILD_SYSTEM_HEADER_DIR=$NIX_BUILD_FIXINC_DUMMY" + "SYSTEM_HEADER_DIR=$NIX_BUILD_FIXINC_DUMMY" + "NATIVE_SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY" + + "LDFLAGS_FOR_BUILD=$EXTRA_BUILD_LDFLAGS" + #"LDFLAGS=$EXTRA_LDFLAGS" + "LDFLAGS_FOR_TARGET=$EXTRA_TARGET_LDFLAGS" + + "CFLAGS_FOR_BUILD=$EXTRA_BUILD_FLAGS $EXTRA_BUILD_LDFLAGS" + "CXXFLAGS_FOR_BUILD=$EXTRA_BUILD_FLAGS $EXTRA_BUILD_LDFLAGS" + "FLAGS_FOR_BUILD=$EXTRA_BUILD_FLAGS $EXTRA_BUILD_LDFLAGS" + + # It seems there is a bug in GCC 5 + #"CFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" + #"CXXFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" + + "CFLAGS_FOR_TARGET=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" + "CXXFLAGS_FOR_TARGET=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" + "FLAGS_FOR_TARGET=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" + ) + + if test -z "${targetConfig-}"; then + makeFlagsArray+=( + "BOOT_CFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" + "BOOT_LDFLAGS=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" ) - - if test -z "$targetConfig"; then - makeFlagsArray+=( \ - BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) fi - if test -n "$targetConfig" -a "$crossStageStatic" == 1; then + if test -n "${targetConfig-}" -a "$crossStageStatic" == 1; then # We don't want the gcc build to assume there will be a libc providing # limits.h in this stagae - makeFlagsArray+=( \ - LIMITS_H_TEST=false \ - ) + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) else - makeFlagsArray+=( \ - LIMITS_H_TEST=true \ - ) + makeFlagsArray+=( + 'LIMITS_H_TEST=true' + ) fi fi -if test -n "$targetConfig"; then +if test -n "${targetConfig-}"; then # The host strip will destroy some important details of the objects dontStrip=1 fi +eval "$oldOpts" + providedPreConfigure="$preConfigure"; preConfigure() { if test -n "$newlibSrc"; then @@ -284,8 +287,6 @@ postInstall() { # See https://bugs.gentoo.org/show_bug.cgi?id=301299#c31 paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus} - eval "$postInstallGhdl" - # Two identical man pages are shipped (moving and compressing is done later) ln -sf gcc.1 "$out"/share/man/man1/g++.1 } diff --git a/pkgs/development/compilers/gcc/gnat-cflags.patch b/pkgs/development/compilers/gcc/gnat-cflags.patch deleted file mode 100644 index bf2acf065e9b91f408e5dc5d7c5fc375044df3e9..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/gnat-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/libada/Makefile.in b/libada/Makefile.in -index f5057a0..337e0c6 100644 ---- a/libada/Makefile.in -+++ b/libada/Makefile.in -@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN) - WARN_CFLAGS = @warn_cflags@ - - TARGET_LIBGCC2_CFLAGS= --GNATLIBCFLAGS= -g -O2 -+GNATLIBCFLAGS= -g -O2 $(CFLAGS) - GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ - -DIN_RTS @have_getipinfo@ - ---- a/gcc/ada/gcc-interface/Makefile.in -+++ b/gcc/ada/gcc-interface/Makefile.in -@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata - SOME_ADAFLAGS =-gnata - FORCE_DEBUG_ADAFLAGS = -g - GNATLIBFLAGS = -gnatpg -nostdinc --GNATLIBCFLAGS = -g -O2 -+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) - # Pretend that _Unwind_GetIPInfo is available for the target by default. This - # should be autodetected during the configuration of libada and passed down to - # here, but we need something for --disable-libada and hope for the best. -@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) - # Link flags used to build gnat tools. By default we prefer to statically - # link with libgcc to avoid a dependency on shared libgcc (which is tricky - # to deal with as it may conflict with the libgcc provided by the system). --GCC_LINK_FLAGS=-static-libgcc -+GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET) - - # End of variables for you to override. - diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh index 2d30c845b5a33347342a77074ec58c240eaf96b2..893bbbc0c2dc24fc725b9f0391dec240d0f37c31 100644 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh @@ -1,2 +1,2 @@ -export NIX_CXXSTDLIB_COMPILE+="-isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" +export NIX_CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" export NIX_CXXSTDLIB_LINK=" -stdlib=libstdc++" diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 4ec92b7bdb621097d0549c8458a221ebf70f076e..e41e8789c9edba2ed0eda51a2ce8bfb3f84f8d4a 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -3,8 +3,6 @@ , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin , langJava ? false -, langAda ? false -, langVhdl ? false , langGo ? false , profiledCompiler ? false , staticCompiler ? false @@ -21,13 +19,11 @@ , 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 +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, gnat ? null , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null @@ -35,13 +31,12 @@ , darwin ? null , flex ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: 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; @@ -49,9 +44,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -69,9 +61,6 @@ let version = "7-20170409"; [ ] ++ 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 { @@ -99,107 +88,81 @@ let version = "7-20170409"; /* 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 ""; + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; in - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode; - - /* Cross-gcc settings */ + optional (gccArch != null) "--with-arch=${gccArch}" ++ + optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ + optional (gccAbi != null) "--with-abi=${gccAbi}" ++ + optional (gccFpu != null) "--with-fpu=${gccFpu}" ++ + optional (gccFloat != null) "--with-float=${gccFloat}" ++ + optional (gccMode != null) "--with-mode=${gccMode}"; + + /* Cross-gcc settings (build == host != target) */ 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 - withArch + - withCpu + - withAbi + - withFpu + - withFloat + - withMode + - # Ensure that -print-prog-name is able to find the correct programs. - " --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + - " --with-ld=${targetPackages.stdenv.cc.bintools}/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) - ); + crossConfigureFlags = + # Ensure that -print-prog-name is able to find the correct programs. + [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-ld=${targetPackages.stdenv.cc.bintools}/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") + "--enable-__cxa_atexit" + "--enable-long-long" + ] ++ + (if crossMingw then [ + "--enable-threads=win32" + "--enable-sjlj-exceptions" + "--enable-hash-synchronization" + "--enable-libssp" + "--disable-nls" + "--with-dwarf2" + # To keep ABI compatibility with upstream mingw-w64 + "--enable-fully-dynamic-string" + ] else + optionals (targetPlatform.libc == "uclibc") [ + # 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" + ] ++ [ + "--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; + bootstrap = targetPlatform == hostPlatform; in @@ -285,18 +248,27 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf flex ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf flex + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) - ++ (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. @@ -318,66 +290,80 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - 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} " + + configureFlags = + # Basic dependencies + [ + "--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}" + ] ++ + optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + + # Basic configuration + [ + "--enable-lto" + "--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 langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + }" + ] ++ + + (if enableMultilib + then ["--enable-multilib" "--disable-libquadmath"] + else ["--disable-multilib"]) ++ + optional (!enableShared) "--disable-shared" ++ + (if enablePlugin + then ["--enable-plugin"] + else ["--disable-plugin"]) ++ + + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + + # Java options + optionals langJava [ + "--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 ""} - "; + "--enable-java-home" + "--with-java-home=\${prefix}/lib/jvm/jre" + ] ++ + optional javaAwtGtk "--enable-java-awt=gtk" ++ + optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ + + platformFlags ++ + optional (targetPlatform != hostPlatform) crossConfigureFlags ++ + optional (!bootstrap) "--disable-bootstrap" ++ + + # Platform-specific flags + optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optionals hostPlatform.isSunOS [ + "--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" + ] + ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -390,83 +376,30 @@ stdenv.mkDerivation ({ 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; + /* For cross-built gcc (build != host == target) */ + crossAttrs = { 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 ""} - ${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. + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - # 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. + # 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. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = makeSearchPathOutput "dev" "include" ([] + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs @@ -477,42 +410,41 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs); + libcCross.propagatedBuildInputs + )); - LIBRARY_PATH = makeLibraryPath ([] + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (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 [ + ++ optional (libpthread != null) libpthread) + ); + + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); + + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-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; + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); passthru = - { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; inherit enableParallelBuilding enableMultilib; @@ -535,12 +467,10 @@ stdenv.mkDerivation ({ 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; + stdenv.lib.platforms.darwin; broken = true; }; diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix new file mode 100644 index 0000000000000000000000000000000000000000..5609de15d4cb0738d67ef5b3e2843dacbeb5772c --- /dev/null +++ b/pkgs/development/compilers/gerbil/build.nix @@ -0,0 +1,88 @@ +{ stdenv, lib, makeStaticLibraries, + coreutils, rsync, bash, + openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql, + version, git-version, GAMBIT, SRC }: + +# TODO: distinct packages for gerbil-release and gerbil-devel +# TODO: make static compilation work + +stdenv.mkDerivation rec { + name = "gerbil-${version}"; + src = SRC; + + # Use makeStaticLibraries to enable creation of statically linked binaries + buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ]; + buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; + + buildInputs = [ GAMBIT coreutils rsync bash ] + ++ buildInputs_libraries ++ buildInputs_staticLibraries; + + NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; + + postPatch = '' + echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm + + patchShebangs . + + find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do + substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' + done + + cat > etc/gerbil_static_libraries.sh < $out/bin/gxi < src/gerbil/runtime/gx-version.scm - - 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 < "$TMP/bin/$i" - chmod +x "$TMP/bin/$i" - done - PATH="$TMP/bin:$PATH" - '' + - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. - stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' - find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \; - for prog in ld ar gcc strip ranlib; do - find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; - done - ''; - - configurePhase = '' - ./configure --prefix=$out --with-gmp-libraries=${stdenv.lib.getLib gmp}/lib --with-gmp-includes=${stdenv.lib.getDev gmp}/include - ''; - - # Stripping combined with patchelf breaks the executables (they die - # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) - dontStrip = true; - - # No building is necessary, but calling make without flags ironically - # calls install-strip ... - dontBuild = true; - - postInstall = '' - # bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way - sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp.out}/lib\",\2@" $out/lib/ghc-${version}/package.conf - - # Sanity check, can ghc create executables? - cd $TMP - mkdir test-ghc; cd test-ghc - cat > main.hs << EOF - module Main where - main = putStrLn "yes" - EOF - $out/bin/ghc --make main.hs - echo compilation ok - [ $(./main) == "yes" ] - ''; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - license = stdenv.lib.licenses.bsd3; - platforms = ["x86_64-linux" "i686-linux"]; - }; - -} diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix deleted file mode 100644 index c56762edd24e424d8098580d34bd6a1028b0e48c..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}: - -stdenv.mkDerivation rec { - version = "6.10.4"; - - name = "ghc-${version}"; - - src = fetchurl { - url = "${meta.homepage}/dist/${version}/${name}-src.tar.bz2"; - sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d"; - }; - - buildInputs = [ghc libedit perl gmp]; - - hardeningDisable = [ "format" ]; - - configureFlags = [ - "--with-gmp-libraries=${gmp.out}/lib" - "--with-gmp-includes=${gmp.dev}/include" - "--with-gcc=${stdenv.cc}/bin/gcc" - ]; - - NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. - inherit (ghc.meta) license; - broken = true; # https://nix-cache.s3.amazonaws.com/log/6ys7lzckf2c0532kzhmss73mmz504can-ghc-6.10.4.drv - }; -} diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix deleted file mode 100644 index a46ef66a8cb7c3a8c584a3e97603c286f7f8948a..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ /dev/null @@ -1,44 +0,0 @@ -{stdenv, fetchurl, ghc, perl, gmp, ncurses}: - -stdenv.mkDerivation rec { - version = "6.12.3"; - - name = "ghc-${version}"; - - src = fetchurl { - url = "http://darcs.haskell.org/download/dist/${version}/${name}-src.tar.bz2"; - sha256 = "0s2y1sv2nq1cgliv735q2w3gg4ykv1c0g1adbv8wgwhia10vxgbc"; - }; - - buildInputs = [ghc perl gmp ncurses]; - - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - ''; - - preConfigure = '' - echo "${buildMK}" > mk/build.mk - ''; - - configureFlags = [ - "--with-gcc=${stdenv.cc}/bin/gcc" - ]; - - NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags=["-S" "--keep-file-symbols"]; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. - inherit (ghc.meta) license; - broken = true; # broken by gcc 5.x: http://hydra.nixos.org/build/33627548 - }; -} diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix deleted file mode 100644 index 394e4239e9a0dc0b5aed42c1bbeee1c1a29318be..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ stdenv -, fetchurl, perl -, ncurses5, gmp, libiconv -}: - -stdenv.mkDerivation rec { - version = "7.0.4"; - - name = "ghc-${version}-binary"; - - src = fetchurl ({ - "i686-linux" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2"; - sha256 = "0mfnihiyjl06f5w1yrjp36sw9g67g2ymg5sdl0g23h1pab99jx63"; - }; - "x86_64-linux" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; - sha256 = "0mc4rhqcxz427wq4zgffmnn0d2yjqvy6af4x9mha283p1gdj5q99"; - }; - "i686-darwin" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2"; - sha256 = "0qj45hslrrr8zfks8m1jcb3awwx9rh35ndnpfmb0gwb6j7azq5n3"; - }; - "x86_64-darwin" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; - sha256 = "1m2ml88p1swf4dnv2vq8hz4drcp46n3ahpfi05wh01ajkf8hnn3l"; - }; - }.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform")); - - buildInputs = [perl]; - - postUnpack = - # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib - # during linking - stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + - - # Strip is harmful, see also below. It's important that this happens - # first. The GHC Cabal build system makes use of strip by default and - # has hardcoded paths to /usr/bin/strip in many places. We replace - # those below, making them point to our dummy script. - '' - mkdir "$TMP/bin" - for i in strip; do - echo '#! ${stdenv.shell}' > "$TMP/bin/$i" - chmod +x "$TMP/bin/$i" - done - PATH="$TMP/bin:$PATH" - '' + - # We have to patch the GMP paths for the integer-gmp package. - '' - find . -name integer-gmp.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + stdenv.lib.optionalString stdenv.isDarwin '' - find . -name base.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; - '' + - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. - stdenv.lib.optionalString stdenv.isLinux '' - find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \; - sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - for prog in ld ar gcc strip ranlib; do - find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; - done - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - fix () { - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1 - } - - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/ghc-pwd/dist/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/hpc/dist/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/ghc/stage2/build/tmp - - for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do - fix $(find . -type f -name $file) - done - - for file in $(find . -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done - ''; - - configurePhase = '' - ./configure --prefix=$out \ - --with-gmp-libraries=${gmp.out or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/include \ - ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} - ''; - - # Stripping combined with patchelf breaks the executables (they die - # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) - dontStrip = true; - - # No building is necessary, but calling make without flags ironically - # calls install-strip ... - dontBuild = true; - - postInstall = '' - # Sanity check, can ghc create executables? - cd $TMP - mkdir test-ghc; cd test-ghc - cat > main.hs << EOF - module Main where - main = putStrLn "yes" - EOF - $out/bin/ghc --make main.hs - echo compilation ok - [ $(./main) == "yes" ] - ''; - - meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; -} diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix deleted file mode 100644 index 9d052ddb246fac0c74c6aca99672019a2ae755de..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: - -stdenv.mkDerivation rec { - version = "7.0.4"; - name = "ghc-${version}"; - - src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; - sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed"; - }; - - patches = [ ./fix-7.0.4-clang.patch ./relocation.patch ]; - - buildInputs = [ ghc perl gmp ncurses ]; - - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - ''; - - preConfigure = '' - echo "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString stdenv.isDarwin '' - find . -name '*.hs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|' - find . -name '*.lhs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}" - else "--with-gcc=${stdenv.cc}/bin/gcc"; - - NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags=["-S" "--keep-file-symbols"]; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - stdenv.lib.maintainers.peti - ]; - platforms = ["x86_64-linux" "i686-linux"]; # Darwin is not supported. - inherit (ghc.meta) license; - }; - -} diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix deleted file mode 100644 index 51274dd605986bcdc3cfd16bd3292949bfdc2866..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -let - inherit (bootPkgs) ghc; - - buildMK = '' - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - '' + (if enableIntegerSimple then '' - INTEGER_LIBRARY=integer-simple - '' else '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - ''); - -in - -stdenv.mkDerivation rec { - version = "7.10.2"; - name = "ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.2/${name}-src.tar.xz"; - sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"; - }; - - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; - - patches = [ ./relocation.patch ]; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - preConfigure = '' - echo >mk/build.mk "${buildMK}" - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - configureFlags = [ - "--with-gcc=${stdenv.cc}/bin/cc" - "--datadir=$doc/share/doc/ghc" - ] ++ stdenv.lib.optional (! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/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"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix new file mode 100644 index 0000000000000000000000000000000000000000..c56798e31ae4b13fcebbfd4c97fa252f04d70940 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -0,0 +1,159 @@ +{ stdenv +, fetchurl, perl +, ncurses5, gmp, libiconv +, gcc, llvm_35 +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + libPath = stdenv.lib.makeLibraryPath ([ + ncurses5 gmp + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + + libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + +in + +stdenv.mkDerivation rec { + version = "7.10.3"; + + name = "ghc-${version}-binary"; + + src = fetchurl ({ + "i686-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-i386-deb7-linux.tar.bz2"; + sha256 = "20b32912fb7e57910a3c908f99a9519b57a4872e1ea0f4f2265b2f7b30e8a3cd"; + }; + "x86_64-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-deb8-linux.tar.bz2"; + sha256 = "5e163c557e9236cce68be41c984eab0fcdbdc1602e39040ca9ae325e6bdec1c3"; + }; + "armv7l-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.bz2"; + sha256 = "2913763eef88e4d1843a1e4c34225afb1866310d1a1956c08a4131f4593518f6"; + }; + "x86_64-darwin" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-apple-darwin.tar.bz2"; + sha256 = "4b537228d49b5ea0f8e8dbcc440a5b3c3cb19a92579d607291cc0041422fa5c3"; + }; + }.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform")); + + nativeBuildInputs = [ perl ]; + buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + ${libEnvVar} = libPath; + + postUnpack = + # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib + # during linking + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + # not enough room in the object files for the full path to libiconv :( + for exe in $(find . -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/5/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + '' + + + # Some scripts used during the build need to have their shebangs patched + '' + patchShebangs ghc-${version}/utils/ + '' + + + # Strip is harmful, see also below. It's important that this happens + # first. The GHC Cabal build system makes use of strip by default and + # has hardcoded paths to /usr/bin/strip in many places. We replace + # those below, making them point to our dummy script. + '' + mkdir "$TMP/bin" + for i in strip; do + echo '#! ${stdenv.shell}' > "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + done + PATH="$TMP/bin:$PATH" + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + find . -name base.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; + '' + + # Rename needed libraries and binaries, fix interpreter + stdenv.lib.optionalString stdenv.isLinux '' + find . -type f -perm -0100 -exec patchelf \ + --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libtinfo.so libtinfo.so.5 \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; + + paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + ''; + + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"; + + # Stripping combined with patchelf breaks the executables (they die + # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) + dontStrip = true; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + dontBuild = true; + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/5/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + ''; + + doInstallCheck = true; + installCheckPhase = '' + unset ${libEnvVar} + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { targetPrefix = ""; }; + + meta.license = stdenv.lib.licenses.bsd3; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux"]; +} diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index d573a22e0ae809e85b47191a40a1f71db8780ca3..e4bf23c6e9e2db14f74ed059d9949750582ad255 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -1,68 +1,161 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, hscolour +, coreutils, fetchurl, fetchpatch, perl +, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt + +, libffi, libiconv ? null, ncurses + +, useLLVM ? !targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? targetPlatform != hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? true }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + docFixes = fetchurl { url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch"; sha256 = "1j45z4kcd3w1rzm4hapap2xc16bbh942qnzzdbdjcwqznsccznf0"; }; + buildMK = '' + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + '' + stdenv.lib.optionalString enableIntegerSimple '' + INTEGER_LIBRARY = integer-simple + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross + Stage1Only = YES + HADDOCK_DOCS = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + ''; + + # Splicer will pull out correct variations + libDeps = platform: [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + in stdenv.mkDerivation rec { version = "7.10.3"; - name = "ghc-${version}"; + name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g"; }; + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + patches = [ docFixes ./relocation.patch ]; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - + # GHC is a bit confused on its cross terminology. preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString enableIntegerSimple '' - echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk ''; + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker configureFlags = [ - "--with-gcc=${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-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + "--disable-large-address-space" + ]; + + # Hack to make sure we never to the relaxation `$PATH` and hooks support for + # compatability. This will be replaced with something clearer in a future + # masss-rebuild. + crossConfig = true; + + nativeBuildInputs = [ + ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = libDeps hostPlatform; + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + # 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"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; postInstall = '' # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -73,7 +166,12 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit bootPkgs; + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + + # Our Cabal compiler name + haskellCompilerName = "ghc-7.10.3"; }; meta = { @@ -82,4 +180,5 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; }; + } diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix deleted file mode 100644 index dd3b5cb2ebcb1b9ff6ff02d76c2854f4ae5d1da6..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv, fetchurl, ghc, perl, ncurses, libiconv - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -stdenv.mkDerivation rec { - version = "7.2.2"; - name = "ghc-${version}"; - - src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; - sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz"; - }; - - patches = [ ./fix-7.2.2-clang.patch ./relocation.patch ]; - - buildInputs = [ ghc perl ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp; - - buildMK = '' - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - '' + (if enableIntegerSimple then '' - INTEGER_LIBRARY=integer-simple - '' else '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - ''); - - preConfigure = '' - echo "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString stdenv.isDarwin '' - find . -name '*.hs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|' - find . -name '*.lhs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}" - else "--with-gcc=${stdenv.cc}/bin/gcc"; - - NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags=["-S" "--keep-file-symbols"]; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - stdenv.lib.maintainers.peti - ]; - platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. - inherit (ghc.meta) license; - broken = true; # broken by 51cf42ad0d3ccb55af182f1f0ee5eb5094ea5995: https://hydra.nixos.org/build/60616815 - }; - -} diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix deleted file mode 100644 index 9d85253f630945af228de40d3585a00919f7f35f..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ stdenv -, fetchurl, perl, makeWrapper -, ncurses5, gmp, libiconv -}: - -stdenv.mkDerivation rec { - version = "7.4.2"; - - name = "ghc-${version}-binary"; - - src = fetchurl ({ - "i686-linux" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2"; - sha256 = "0gny7knhss0w0d9r6jm1gghrcb8kqjvj94bb7hxf9syrk4fxlcxi"; - }; - "x86_64-linux" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; - sha256 = "043jabd0lh6n1zlqhysngbpvlsdznsa2mmsj08jyqgahw9sjb5ns"; - }; - "i686-darwin" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2"; - sha256 = "1vrbs3pzki37hzym1f1nh07lrqh066z3ypvm81fwlikfsvk4djc0"; - }; - "x86_64-darwin" = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; - sha256 = "1imzqc0slpg0r6p40n5a9m18cbcm0m86z8dgyhfxcckksw54mzwf"; - }; - }.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform")); - - buildInputs = [perl]; - - postUnpack = - # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib - # during linking - stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + - - # Strip is harmful, see also below. It's important that this happens - # first. The GHC Cabal build system makes use of strip by default and - # has hardcoded paths to /usr/bin/strip in many places. We replace - # those below, making them point to our dummy script. - '' - mkdir "$TMP/bin" - for i in strip; do - echo '#! ${stdenv.shell}' > "$TMP/bin/$i" - chmod +x "$TMP/bin/$i" - done - PATH="$TMP/bin:$PATH" - '' + - # We have to patch the GMP paths for the integer-gmp package. - '' - find . -name integer-gmp.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + stdenv.lib.optionalString stdenv.isDarwin '' - find . -name base.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; - '' + - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. - stdenv.lib.optionalString stdenv.isLinux '' - mkdir -p "$out/lib" - ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" - find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \; - - paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - - sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - for prog in ld ar gcc strip ranlib; do - find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; - done - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - fix () { - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1 - } - - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/ghc-pwd/dist-install/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/hpc/dist-install/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/ghc/stage2/build/tmp - - for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do - fix $(find . -type f -name $file) - done - - for file in $(find . -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done - ''; - - configurePhase = '' - ./configure --prefix=$out \ - --with-gmp-libraries=${gmp.out or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/include \ - ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} - ''; - - # Stripping combined with patchelf breaks the executables (they die - # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) - dontStrip = true; - - # No building is necessary, but calling make without flags ironically - # calls install-strip ... - dontBuild = true; - - preInstall = stdenv.lib.optionalString stdenv.isDarwin '' - mkdir -p $out/lib/ghc-${version} - mkdir -p $out/bin - ln -s ${libiconv}/lib/libiconv.dylib $out/bin - ln -s ${libiconv}/lib/libiconv.dylib $out/lib/ghc-${version}/libiconv.dylib - ln -s ${libiconv}/lib/libiconv.dylib utils/ghc-cabal/dist-install/build/tmp - ''; - - postInstall = '' - # Sanity check, can ghc create executables? - cd $TMP - mkdir test-ghc; cd test-ghc - cat > main.hs << EOF - {-# LANGUAGE TemplateHaskell #-} - module Main where - main = putStrLn \$([|"yes"|]) - EOF - $out/bin/ghc --make main.hs || exit 1 - echo compilation ok - [ $(./main) == "yes" ] - ''; - - meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; -} diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix deleted file mode 100644 index e5bc4724c9eb0a0deffeb0cedd2f1ea8269cfac8..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, fetchurl, ghc, perl, ncurses, libiconv - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -stdenv.mkDerivation rec { - version = "7.4.2"; - - name = "ghc-${version}"; - - src = fetchurl { - url = "http://haskell.org/ghc/dist/7.4.2/${name}-src.tar.bz2"; - sha256 = "0vc3zmxqi4gflssmj35n5c8idbvyrhd88abi50whbirwlf4i5vpj"; - }; - - patches = [ ./fix-7.4.2-clang.patch ./relocation.patch ]; - - buildInputs = [ ghc perl ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp; - - buildMK = '' - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - '' + (if enableIntegerSimple then '' - INTEGER_LIBRARY=integer-simple - '' else '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - ''); - - preConfigure = '' - echo "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - find . -name '*.hs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|' - find . -name '*.lhs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}" - else "--with-gcc=${stdenv.cc}/bin/gcc"; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - stdenv.lib.maintainers.peti - ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix deleted file mode 100644 index fde4ca2aa37d1f6bc09ce13b3ca5ac9d79aa10ac..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, fetchurl, ghc, perl, ncurses, libiconv - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -let - # The "-Wa,--noexecstack" options might be needed only with GNU ld (as opposed - # to the gold linker). It prevents binaries' stacks from being marked as - # executable, which fails to run on a grsecurity/PaX kernel. - ghcFlags = "-optc-Wa,--noexecstack -opta-Wa,--noexecstack"; - cFlags = "-Wa,--noexecstack"; - -in stdenv.mkDerivation rec { - version = "7.6.3"; - - name = "ghc-${version}"; - - src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; - sha256 = "1669m8k9q72rpd2mzs0bh2q6lcwqiwd1ax3vrard1dgn64yq4hxx"; - }; - - patches = [ ./fix-7.6.3-clang.patch ./relocation.patch ]; - - buildInputs = [ ghc perl ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp; - - buildMK = '' - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - '' + stdenv.lib.optionalString stdenv.isLinux '' - # Set ghcFlags for building ghc itself - SRC_HC_OPTS += ${ghcFlags} - SRC_CC_OPTS += ${cFlags} - '' + (if enableIntegerSimple then '' - INTEGER_LIBRARY=integer-simple - '' else '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - ''); - - preConfigure = '' - echo "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - - '' + stdenv.lib.optionalString stdenv.isLinux '' - # Set ghcFlags for binaries that ghc builds - sed -i -e 's|"\$topdir"|"\$topdir" ${ghcFlags}|' ghc/ghc.wrapper - - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - find . -name '*.hs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|' - find . -name '*.lhs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}" - else "--with-gcc=${stdenv.cc}/bin/gcc"; - - postInstall = '' - # ghci uses mmap with rwx protection at it implements dynamic - # linking on its own. See: - # - https://bugs.gentoo.org/show_bug.cgi?id=299709 - # - https://ghc.haskell.org/trac/ghc/ticket/4244 - # Therefore, we have to pax-mark the resulting binary. - # Haddock also seems to run with ghci, so mark it as well. - paxmark m $out/lib/${name}/{ghc,haddock} - ''; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - stdenv.lib.maintainers.peti - ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix deleted file mode 100644 index 50b0108861f01f6dd59bdc9adeb08873054b34ef..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchurl, ghc, perl, ncurses, libiconv - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -stdenv.mkDerivation rec { - version = "7.8.3"; - name = "ghc-${version}"; - - src = fetchurl { - url = "http://www.haskell.org/ghc/dist/${version}/${name}-src.tar.xz"; - sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh"; - }; - - patches = [ ./relocation.patch ]; - - buildInputs = [ ghc perl ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp; - - enableParallelBuilding = true; - - buildMK = '' - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - DYNAMIC_BY_DEFAULT = NO - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - '' + (if enableIntegerSimple then '' - INTEGER_LIBRARY=integer-simple - '' else '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - ''); - - preConfigure = '' - echo "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix deleted file mode 100644 index 5a380c75c69f579dd2b1d1b3f3946568fd364757..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, fetchurl, ghc, perl, ncurses, libiconv - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -stdenv.mkDerivation (rec { - version = "7.8.4"; - name = "ghc-${version}"; - - src = fetchurl { - url = "http://www.haskell.org/ghc/dist/7.8.4/${name}-src.tar.xz"; - sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3"; - }; - - patches = [ ./relocation.patch ]; - - buildInputs = [ ghc perl ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp; - - enableParallelBuilding = true; - - buildMK = '' - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - DYNAMIC_BY_DEFAULT = NO - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - '' + (if enableIntegerSimple then '' - INTEGER_LIBRARY=integer-simple - '' else '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - ''); - - preConfigure = '' - echo "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} // stdenv.lib.optionalAttrs stdenv.isDarwin { - # https://ghc.haskell.org/trac/ghc/ticket/9762 - patches = [ ./hpc-7.8.4.patch ]; -}) diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index d475e3438b4b47de9dfb2a5814cb8447c0fb2ce0..7d11ffb66c60760d8827530832698e4dc931f514 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -1,65 +1,162 @@ -{ stdenv, lib, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, hscolour, patchutils, sphinx +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, hscolour +, coreutils, fetchpatch, fetchurl, perl, sphinx + +, libffi, libiconv ? null, ncurses + +, useLLVM ? !targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -, cross ? null + enableIntegerSimple ? false, gmp ? null + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? targetPlatform != hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? true }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + '' + stdenv.lib.optionalString enableIntegerSimple '' + INTEGER_LIBRARY = integer-simple + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross + Stage1Only = YES + HADDOCK_DOCS = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + ''; + + # Splicer will pull out correct variations + libDeps = platform: [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + in stdenv.mkDerivation rec { version = "8.0.2"; - name = "ghc-${version}"; + name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.2/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi"; }; - patches = [ ./ghc-gold-linker.patch ] - ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch - ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch; - - buildInputs = [ ghc perl hscolour sphinx ]; - enableParallelBuilding = true; outputs = [ "out" "man" "doc" ]; + patches = [ + ./ghc-gold-linker.patch + (fetchpatch { # Unreleased 1.24.x commit + url = "https://github.com/haskell/cabal/commit/6394cb0b6eba91a8692a3d04b2b56935aed7cccd.patch"; + sha256 = "14xxjg0nb1j1pw0riac3v385ka92qhxxblfmwyvbghz7kry6axy0"; + stripLen = 1; + extraPrefix = "libraries/Cabal/"; + }) + ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch + ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch; + + # GHC is a bit confused on its cross terminology. preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString enableIntegerSimple '' - echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk ''; + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker configureFlags = [ - "--with-gcc=${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-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ # 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"; + "--disable-large-address-space" + ]; + + # Hack to make sure we never to the relaxation `$PATH` and hooks support for + # compatability. This will be replaced with something clearer in a future + # masss-rebuild. + crossConfig = true; + + nativeBuildInputs = [ ghc perl hscolour sphinx ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = libDeps hostPlatform; + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); # 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"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't + # treat that as a unary `{x,y,z,..}` repetition. postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -70,7 +167,12 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit bootPkgs; + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.0.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix new file mode 100644 index 0000000000000000000000000000000000000000..5cb3f2ea5cedccdf1f99b4d1fff9ce75ddd98cad --- /dev/null +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -0,0 +1,163 @@ +{ stdenv +, fetchurl, perl, gcc, llvm_39 +, ncurses5, gmp, libiconv +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + libPath = stdenv.lib.makeLibraryPath ([ + ncurses5 gmp + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + + libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + +in + +stdenv.mkDerivation rec { + version = "8.2.1"; + + name = "ghc-${version}-binary"; + + src = fetchurl ({ + "i686-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; + sha256 = "d86f9c157dd4161a8acb14062c131c8985a4f65fc856603c373502be1d50c95e"; + }; + "x86_64-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; + sha256 = "543b81bf610240bd0398111d6c6607a9094dc2d159b564057d46c8a3d1aaa130"; + }; + "armv7l-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz"; + sha256 = "0f0e5e1d4fad3fa1a87ca1fe0d19242f4a94d158b7b8a08f99efefd98b51b019"; + }; + "aarch64-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz"; + sha256 = "61dab9c95ef9f9af8bce7338863fda3e42945eb46194b12d922b6d0dc245d0c2"; + }; + "x86_64-darwin" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + sha256 = "900c802025fb630060dbd30f9738e5d107a4ca5a50d5c1262cd3e69fe4467188"; + }; + }.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform")); + + nativeBuildInputs = [ perl ]; + buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + ${libEnvVar} = libPath; + + postUnpack = + # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib + # during linking + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + # not enough room in the object files for the full path to libiconv :( + for exe in $(find . -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + '' + + + # Some scripts used during the build need to have their shebangs patched + '' + patchShebangs ghc-${version}/utils/ + '' + + + # Strip is harmful, see also below. It's important that this happens + # first. The GHC Cabal build system makes use of strip by default and + # has hardcoded paths to /usr/bin/strip in many places. We replace + # those below, making them point to our dummy script. + '' + mkdir "$TMP/bin" + for i in strip; do + echo '#! ${stdenv.shell}' > "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + done + PATH="$TMP/bin:$PATH" + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + find . -name base.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; + '' + + # Rename needed libraries and binaries, fix interpreter + stdenv.lib.optionalString stdenv.isLinux '' + find . -type f -perm -0100 -exec patchelf \ + --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libtinfo.so libtinfo.so.5 \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; + + paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + ''; + + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"; + + # Stripping combined with patchelf breaks the executables (they die + # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) + dontStrip = true; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + dontBuild = true; + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + ''; + + doInstallCheck = true; + installCheckPhase = '' + unset ${libEnvVar} + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { targetPrefix = ""; }; + + meta.license = stdenv.lib.licenses.bsd3; + # AArch64 should work in theory but eventually some builds start segfaulting + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" /* "aarch64-linux" */]; +} diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix deleted file mode 100644 index bcc801c98ea5d9e27691a90d7c2bbf8138229897..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, autoconf, automake, happy, alex, python3, sphinx, hscolour -, buildPlatform, targetPlatform , selfPkgs, cross ? null - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -let - inherit (bootPkgs) ghc; - version = "8.2.1"; - - commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; - commonPreConfigure = '' - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString enableIntegerSimple '' - echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk - ''; -in stdenv.mkDerivation (rec { - inherit version; - name = "ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; - sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng"; - }; - - postPatch = "patchShebangs ."; - - patches = [ ./ghc-gold-linker.patch ]; - - 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/${name}/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 [ targetPackages.stdenv.cc.bintools 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=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ld" - "AR=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ar" - "NM=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-nm" - "RANLIB=${targetPackages.stdenv.cc.bintools}/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.targetPackages.stdenv.cc.bintools ]; - - dontSetConfigureCross = true; - - passthru = { - inherit bootPkgs cross; - cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; - ld = "${stdenv.targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ld"; - }; -}) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index cd15a6680c262ced6dae2f318a11d84c8dfe6e63..6520daa4d42c3e8984a4c7649cf871e8ebf4aae6 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -1,84 +1,199 @@ -{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, binutils, coreutils -, autoconf, automake, happy, alex, python3, sphinx, hscolour -, buildPlatform, targetPlatform , selfPkgs, cross ? null +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, alex, happy, hscolour +, autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx +, runCommand + +, libffi, libiconv ? null, ncurses + +, useLLVM ? !targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? targetPlatform != hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? + !(targetPlatform.isDarwin + # On iOS, dynamic linking is not supported + && (targetPlatform.isAarch64 || targetPlatform.isArm)) +, # Whether to backport https://phabricator.haskell.org/D4388 for + # deterministic profiling symbol names, at the cost of a slightly + # non-standard GHC API + deterministicProfiling ? false }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; - version = "8.2.1.20171108"; - commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; - commonPreConfigure = '' - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} '' + stdenv.lib.optionalString enableIntegerSimple '' - echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk + INTEGER_LIBRARY = integer-simple + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross + Stage1Only = YES + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC ''; -in stdenv.mkDerivation (rec { - inherit version; - name = "ghc-${version}"; + + # Splicer will pull out correct variations + libDeps = platform: [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation rec { + version = "8.2.2"; + name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.2.2-rc3/${name}-src.tar.xz"; - sha256 = "13h55vcrs243bv4hv8i4jq80rsx5hvhi09r3rcs562d8zk7k665w"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; }; - postPatch = "patchShebangs ."; + enableParallelBuilding = true; - patches = [ ./ghc-gold-linker.patch ]; + outputs = [ "out" "doc" ]; - preConfigure = commonPreConfigure; + patches = [ + (fetchpatch { # Fix STRIP to be substituted from configure + url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; + sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; + }) + (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) + ] ++ stdenv.lib.optional deterministicProfiling + (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism + url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; + sha256 = "1lyysz6hfd1njcigpm8xppbnkadqfs0kvrp7s8vqgb38pjswj5hg"; + }); - buildInputs = commonBuildInputs; + postPatch = "patchShebangs ."; - enableParallelBuilding = true; + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker 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-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + "--disable-large-address-space" ]; + # Hack to make sure we never to the relaxation `$PATH` and hooks support for + # compatability. This will be replaced with something clearer in a future + # masss-rebuild. + crossConfig = true; + + nativeBuildInputs = [ alex autoconf autoreconfHook automake ghc happy hscolour perl python3 sphinx ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = libDeps hostPlatform; + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + # 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"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; + # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't + # treat that as a unary `{x,y,z,..}` repetition. postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}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 + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; - outputs = [ "out" "doc" ]; - passthru = { - inherit bootPkgs; - } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { - crossCompiler = selfPkgs.ghc.override { - cross = targetPlatform; - bootPkgs = selfPkgs; - }; + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.2.2"; }; meta = { @@ -88,32 +203,4 @@ in stdenv.mkDerivation (rec { 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/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix new file mode 100644 index 0000000000000000000000000000000000000000..df23f660147aecfacc4a58d7022b4c953655a65c --- /dev/null +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -0,0 +1,206 @@ +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform + +# build-tools +, bootPkgs, alex, happy +, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 +, runCommand + +, libffi, libiconv ? null, ncurses + +, useLLVM ? !targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? false, gmp ? null, m4 + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? targetPlatform != hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? true + +, version ? "8.4.1" +, # Whether to backport https://phabricator.haskell.org/D4388 for + # deterministic profiling symbol names, at the cost of a slightly + # non-standard GHC API + deterministicProfiling ? false +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + '' + stdenv.lib.optionalString enableIntegerSimple '' + INTEGER_LIBRARY = integer-simple + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross + Stage1Only = YES + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + ''; + + # Splicer will pull out correct variations + libDeps = platform: [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation rec { + inherit version; + inherit (src) rev; + name = "${targetPrefix}ghc-${version}"; + + src = fetchgit { + url = "git://git.haskell.org/ghc.git"; + rev = "0a3e2f324dbd525d626ebd3d97e8ffa1cf2f0ffb"; + sha256 = "1m51khnmf8gw203d8kh6y4ivh0acb2wiqqnb950yfbg2a2k7bcfi"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) + ] ++ stdenv.lib.optional deterministicProfiling + (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism + url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch"; + sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m"; + }); + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + echo ${version} >VERSION + echo ${src.rev} >GIT_COMMIT_ID + ./boot + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + "--disable-large-address-space" + ]; + + # Hack to make sure we never to the relaxation `$PATH` and hooks support for + # compatability. This will be replaced with something clearer in a future + # masss-rebuild. + crossConfig = true; + + nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = libDeps hostPlatform; + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't + # treat that as a unary `{x,y,z,..}` repetition. + postInstall = '' + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}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 [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.4.1"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix new file mode 100644 index 0000000000000000000000000000000000000000..296c10b9346c175c5678d7064b7f3986560c5548 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -0,0 +1,188 @@ +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform + +# build-tools +, bootPkgs, alex, happy +, autoconf, automake, coreutils, fetchurl, perl, python3 + +, libffi, libiconv ? null, ncurses + +, useLLVM ? !targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? false, gmp ? null, m4 + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? targetPlatform != hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? true + +, version ? "8.4.2" +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + '' + stdenv.lib.optionalString enableIntegerSimple '' + INTEGER_LIBRARY = integer-simple + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross + Stage1Only = YES + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + ''; + + # Splicer will pull out correct variations + libDeps = platform: [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation rec { + inherit version; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0yq4y0smn92sksnjjva28b8847krxizns6rm50j3pgq69br35k01"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + "--disable-large-address-space" + ]; + + # Hack to make sure we never to the relaxation `$PATH` and hooks support for + # compatability. This will be replaced with something clearer in a future + # masss-rebuild. + crossConfig = true; + + nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = libDeps hostPlatform; + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't + # treat that as a unary `{x,y,z,..}` repetition. + postInstall = '' + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}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 [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.4.2"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} diff --git a/pkgs/development/compilers/ghc/abi-depends-determinism.nix b/pkgs/development/compilers/ghc/abi-depends-determinism.nix new file mode 100644 index 0000000000000000000000000000000000000000..bc803b74617f906b143f9f269ffb5f7780b3080a --- /dev/null +++ b/pkgs/development/compilers/ghc/abi-depends-determinism.nix @@ -0,0 +1,12 @@ +# https://phabricator.haskell.org/D4159 to fix non-determinism in +# cached abi-depends fields in package databases, modified to only +# contain hunks that exist in distribution tarballs. +{ fetchpatch, runCommand }: let + base = fetchpatch rec { # Non-determinism in cached abi-depends fields + # Originally https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D4159.diff"; + sha256 = "0b8a08sisf1swmarm6nh9rgw7cpzi2rwdzvrd6ny49c7wk0f7x4b"; + }; +in runCommand base.name {} + "sed -n '/utils\\/ghc-pkg/,$p' ${base} >$out" diff --git a/pkgs/development/compilers/ghc/fix-7.0.4-clang.patch b/pkgs/development/compilers/ghc/fix-7.0.4-clang.patch deleted file mode 100644 index 51323c69c2014837a90dfbf23ce5adf624440c0d..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/fix-7.0.4-clang.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs -index f704a69..37753fd 100644 ---- a/compiler/codeGen/CgInfoTbls.hs -+++ b/compiler/codeGen/CgInfoTbls.hs -@@ -211,9 +211,7 @@ mkStackLayout = do - [(offset - frame_sp - retAddrSizeW, b) - | (offset, b) <- binds] - -- WARN( not (all (\bind -> fst bind >= 0) rel_binds), -- ppr binds $$ ppr rel_binds $$ -- ppr frame_size $$ ppr real_sp $$ ppr frame_sp ) -+ WARN( not (all (\bind -> fst bind >= 0) rel_binds), ppr binds $$ ppr rel_binds $$ ppr frame_size $$ ppr real_sp $$ ppr frame_sp ) - return $ stack_layout rel_binds frame_size - - stack_layout :: [(VirtualSpOffset, CgIdInfo)] -diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs -index 638e1db..0aee4b7 100644 ---- a/compiler/main/GHC.hs -+++ b/compiler/main/GHC.hs -@@ -788,8 +788,7 @@ load2 how_much mod_graph = do - -- is stable). - partial_mg - | LoadDependenciesOf _mod <- how_much -- = ASSERT( case last partial_mg0 of -- AcyclicSCC ms -> ms_mod_name ms == _mod; _ -> False ) -+ = ASSERT( case last partial_mg0 of AcyclicSCC ms -> ms_mod_name ms == _mod; _ -> False ) - List.init partial_mg0 - | otherwise - = partial_mg0 -@@ -879,8 +878,7 @@ load2 how_much mod_graph = do - liftIO $ cleanTempFilesExcept dflags (ppFilesFromSummaries mods_to_keep) - - -- there should be no Nothings where linkables should be, now -- ASSERT(all (isJust.hm_linkable) -- (eltsUFM (hsc_HPT hsc_env))) do -+ ASSERT(all (isJust.hm_linkable) (eltsUFM (hsc_HPT hsc_env))) do - - -- Link everything together - linkresult <- liftIO $ link (ghcLink dflags) dflags False hpt4 -diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs -index 99a63e4..3268726 100644 ---- a/compiler/simplCore/SimplUtils.lhs -+++ b/compiler/simplCore/SimplUtils.lhs -@@ -388,8 +388,7 @@ mkArgInfo fun rules n_val_args call_cont - else - map isStrictDmd demands ++ vanilla_stricts - | otherwise -- -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) -- <+> ppr n_val_args <+> ppr demands ) -+ -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) <+> ppr n_val_args <+> ppr demands ) - vanilla_stricts -- Not enough args, or no strictness - - add_type_str :: Type -> [Bool] -> [Bool] -@@ -1812,4 +1811,4 @@ without getting changed to c1=I# c2. - I don't think this is worth fixing, even if I knew how. It'll - all come out in the next pass anyway. - -- -\ No newline at end of file -+ -diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs -index d0fbd8d..ef87996 100644 ---- a/compiler/simplCore/Simplify.lhs -+++ b/compiler/simplCore/Simplify.lhs -@@ -2071,8 +2071,7 @@ mkDupableAlt env case_bndr (con, bndrs', rhs') - rhs = mkConApp dc (map Type (tyConAppArgs scrut_ty) - ++ varsToCoreExprs bndrs') - -- LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") -- <+> ppr case_bndr <+> ppr con ) -+ LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") <+> ppr case_bndr <+> ppr con ) - case_bndr - -- The case binder is alive but trivial, so why has - -- it not been substituted away? diff --git a/pkgs/development/compilers/ghc/fix-7.2.2-clang.patch b/pkgs/development/compilers/ghc/fix-7.2.2-clang.patch deleted file mode 100644 index 9592d54188eda7ce592d3583fc191451c22c88e6..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/fix-7.2.2-clang.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs -index dbd22f3..42208f9 100644 ---- a/compiler/codeGen/CgInfoTbls.hs -+++ b/compiler/codeGen/CgInfoTbls.hs -@@ -210,9 +210,7 @@ mkStackLayout = do - [(offset - frame_sp - retAddrSizeW, b) - | (offset, b) <- binds] - -- WARN( not (all (\bind -> fst bind >= 0) rel_binds), -- ppr binds $$ ppr rel_binds $$ -- ppr frame_size $$ ppr real_sp $$ ppr frame_sp ) -+ WARN( not (all (\bind -> fst bind >= 0) rel_binds), ppr binds $$ ppr rel_binds $$ ppr frame_size $$ ppr real_sp $$ ppr frame_sp ) - return $ stack_layout rel_binds frame_size - - stack_layout :: [(VirtualSpOffset, CgIdInfo)] -diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs -index dece548..9643f30 100644 ---- a/compiler/main/GhcMake.hs -+++ b/compiler/main/GhcMake.hs -@@ -236,8 +236,7 @@ load2 how_much mod_graph = do - -- is stable). - partial_mg - | LoadDependenciesOf _mod <- how_much -- = ASSERT( case last partial_mg0 of -- AcyclicSCC ms -> ms_mod_name ms == _mod; _ -> False ) -+ = ASSERT( case last partial_mg0 of AcyclicSCC ms -> ms_mod_name ms == _mod; _ -> False ) - List.init partial_mg0 - | otherwise - = partial_mg0 -@@ -331,8 +330,7 @@ load2 how_much mod_graph = do - liftIO $ intermediateCleanTempFiles dflags mods_to_keep hsc_env1 - - -- there should be no Nothings where linkables should be, now -- ASSERT(all (isJust.hm_linkable) -- (eltsUFM (hsc_HPT hsc_env))) do -+ ASSERT(all (isJust.hm_linkable) (eltsUFM (hsc_HPT hsc_env))) do - - -- Link everything together - linkresult <- liftIO $ link (ghcLink dflags) dflags False hpt4 -diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs -index dd0ce4b..9501e73 100644 ---- a/compiler/simplCore/SimplUtils.lhs -+++ b/compiler/simplCore/SimplUtils.lhs -@@ -393,8 +393,7 @@ mkArgInfo fun rules n_val_args call_cont - else - map isStrictDmd demands ++ vanilla_stricts - | otherwise -- -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) -- <+> ppr n_val_args <+> ppr demands ) -+ -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) <+> ppr n_val_args <+> ppr demands ) - vanilla_stricts -- Not enough args, or no strictness - - add_type_str :: Type -> [Bool] -> [Bool] -@@ -1845,4 +1844,4 @@ without getting changed to c1=I# c2. - I don't think this is worth fixing, even if I knew how. It'll - all come out in the next pass anyway. - -- -\ No newline at end of file -+ -diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs -index adcaf13..06d939d 100644 ---- a/compiler/simplCore/Simplify.lhs -+++ b/compiler/simplCore/Simplify.lhs -@@ -2185,8 +2185,7 @@ mkDupableAlt env case_bndr (con, bndrs', rhs') - rhs = mkConApp dc (map Type (tyConAppArgs scrut_ty) - ++ varsToCoreExprs bndrs') - -- LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") -- <+> ppr case_bndr <+> ppr con ) -+ LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") <+> ppr case_bndr <+> ppr con ) - case_bndr - -- The case binder is alive but trivial, so why has - -- it not been substituted away? diff --git a/pkgs/development/compilers/ghc/fix-7.4.2-clang.patch b/pkgs/development/compilers/ghc/fix-7.4.2-clang.patch deleted file mode 100644 index ce1593b3e31dbe6b41426efc0c1d73c62a5473dc..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/fix-7.4.2-clang.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs -index 25ba154..fbb7874 100644 ---- a/compiler/codeGen/CgInfoTbls.hs -+++ b/compiler/codeGen/CgInfoTbls.hs -@@ -178,9 +178,7 @@ mkStackLayout = do - [(offset - frame_sp - retAddrSizeW, b) - | (offset, b) <- binds] - -- WARN( not (all (\bind -> fst bind >= 0) rel_binds), -- pprPlatform platform binds $$ pprPlatform platform rel_binds $$ -- ppr frame_size $$ ppr real_sp $$ ppr frame_sp ) -+ WARN( not (all (\bind -> fst bind >= 0) rel_binds), pprPlatform platform binds $$ pprPlatform platform rel_binds $$ ppr frame_size $$ ppr real_sp $$ ppr frame_sp ) - return $ stack_layout rel_binds frame_size - - stack_layout :: [(VirtualSpOffset, CgIdInfo)] -diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs -index 091e1be..23447e4 100644 ---- a/compiler/main/GhcMake.hs -+++ b/compiler/main/GhcMake.hs -@@ -338,8 +338,7 @@ load2 how_much mod_graph = do - liftIO $ intermediateCleanTempFiles dflags mods_to_keep hsc_env1 - - -- there should be no Nothings where linkables should be, now -- ASSERT(all (isJust.hm_linkable) -- (eltsUFM (hsc_HPT hsc_env))) do -+ ASSERT(all (isJust.hm_linkable) (eltsUFM (hsc_HPT hsc_env))) do - - -- Link everything together - linkresult <- liftIO $ link (ghcLink dflags) dflags False hpt4 -diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs -index 86dc88d..ecde4fd 100644 ---- a/compiler/simplCore/SimplUtils.lhs -+++ b/compiler/simplCore/SimplUtils.lhs -@@ -407,8 +407,7 @@ mkArgInfo fun rules n_val_args call_cont - else - map isStrictDmd demands ++ vanilla_stricts - | otherwise -- -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) -- <+> ppr n_val_args <+> ppr demands ) -+ -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) <+> ppr n_val_args <+> ppr demands ) - vanilla_stricts -- Not enough args, or no strictness - - add_type_str :: Type -> [Bool] -> [Bool] -diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs -index 3bd95a7..4c9ee7c 100644 ---- a/compiler/simplCore/Simplify.lhs -+++ b/compiler/simplCore/Simplify.lhs -@@ -2336,8 +2336,7 @@ mkDupableAlt env case_bndr (con, bndrs', rhs') - rhs = mkConApp dc (map Type (tyConAppArgs scrut_ty) - ++ varsToCoreExprs bndrs') - -- LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") -- <+> ppr case_bndr <+> ppr con ) -+ LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") <+> ppr case_bndr <+> ppr con ) - case_bndr - -- The case binder is alive but trivial, so why has - -- it not been substituted away? diff --git a/pkgs/development/compilers/ghc/fix-7.6.3-clang.patch b/pkgs/development/compilers/ghc/fix-7.6.3-clang.patch deleted file mode 100644 index e83fd252d72cf86781dc40fdd950f3591b99b1a3..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/fix-7.6.3-clang.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs -index 7cdb1b6..e953507 100644 ---- a/compiler/codeGen/CgInfoTbls.hs -+++ b/compiler/codeGen/CgInfoTbls.hs -@@ -157,9 +157,7 @@ mkStackLayout = do - [(offset - frame_sp - retAddrSizeW, b) - | (offset, b) <- binds] - -- WARN( not (all (\bind -> fst bind >= 0) rel_binds), -- ppr binds $$ ppr rel_binds $$ -- ppr frame_size $$ ppr real_sp $$ ppr frame_sp ) -+ WARN( not (all (\bind -> fst bind >= 0) rel_binds), ppr binds $$ ppr rel_binds $$ ppr frame_size $$ ppr real_sp $$ ppr frame_sp ) - return $ stack_layout rel_binds frame_size - - stack_layout :: [(VirtualSpOffset, CgIdInfo)] -diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs -index f563cd9..4ac7812 100644 ---- a/compiler/main/GhcMake.hs -+++ b/compiler/main/GhcMake.hs -@@ -331,8 +331,7 @@ load how_much = do - liftIO $ intermediateCleanTempFiles dflags mods_to_keep hsc_env1 - - -- there should be no Nothings where linkables should be, now -- ASSERT(all (isJust.hm_linkable) -- (eltsUFM (hsc_HPT hsc_env))) do -+ ASSERT(all (isJust.hm_linkable) (eltsUFM (hsc_HPT hsc_env))) do - - -- Link everything together - linkresult <- liftIO $ link (ghcLink dflags) dflags False hpt4 -diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs -index 87aefba..479d2ef 100644 ---- a/compiler/simplCore/SimplUtils.lhs -+++ b/compiler/simplCore/SimplUtils.lhs -@@ -415,8 +415,7 @@ mkArgInfo fun rules n_val_args call_cont - else - map isStrictDmd demands ++ vanilla_stricts - | otherwise -- -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) -- <+> ppr n_val_args <+> ppr demands ) -+ -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) <+> ppr n_val_args <+> ppr demands ) - vanilla_stricts -- Not enough args, or no strictness - - add_type_str :: Type -> [Bool] -> [Bool] -diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs -index f2ed224..464fad6 100644 ---- a/compiler/simplCore/Simplify.lhs -+++ b/compiler/simplCore/Simplify.lhs -@@ -2359,8 +2359,7 @@ mkDupableAlt env case_bndr (con, bndrs', rhs') - rhs = mkConApp dc (map Type (tyConAppArgs scrut_ty) - ++ varsToCoreExprs bndrs') - -- LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") -- <+> ppr case_bndr <+> ppr con ) -+ LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") <+> ppr case_bndr <+> ppr con ) - case_bndr - -- The case binder is alive but trivial, so why has - -- it not been substituted away? -diff --git a/compiler/types/Coercion.lhs b/compiler/types/Coercion.lhs -index 42e54ba..9b420ae 100644 ---- a/compiler/types/Coercion.lhs -+++ b/compiler/types/Coercion.lhs -@@ -498,8 +498,7 @@ splitForAllCo_maybe _ = Nothing - coVarKind :: CoVar -> (Type,Type) - coVarKind cv - | Just (tc, [_kind,ty1,ty2]) <- splitTyConApp_maybe (varType cv) -- = ASSERT (tc `hasKey` eqPrimTyConKey) -- (ty1,ty2) -+ = ASSERT (tc `hasKey` eqPrimTyConKey) (ty1,ty2) - | otherwise = panic "coVarKind, non coercion variable" - - -- | Makes a coercion type from two types: the types whose equality diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 92ba3f6a46edd5ecd171ba2570e9a83e4094b34a..bc3ccbdcdf51ccc6fa055c6345c33a47019a139f 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,71 +1,170 @@ -{ stdenv, lib, fetchgit, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform -, selfPkgs, cross ? null +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, alex, happy +, autoconf, automake, coreutils, fetchgit, perl, python3 + +, libffi, libiconv ? null, ncurses + +, useLLVM ? !targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -, version ? "8.3.20170808" + enableIntegerSimple ? false, gmp ? null + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? targetPlatform != hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? true + +, version ? "8.5.20180118" }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; - commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - - rev = "14457cf6a50f708eecece8f286f08687791d51f7"; + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; - commonPreConfigure = '' - echo ${version} >VERSION - echo ${rev} >GIT_COMMIT_ID - ./boot - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" + buildMK = '' + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} '' + stdenv.lib.optionalString enableIntegerSimple '' - echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk + INTEGER_LIBRARY = integer-simple + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross + Stage1Only = YES + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC ''; -in stdenv.mkDerivation (rec { - inherit version rev; - name = "ghc-${version}"; + + # Splicer will pull out correct variations + libDeps = platform: [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation rec { + inherit version; + inherit (src) rev; + name = "${targetPrefix}ghc-${version}"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; - inherit rev; - sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y"; + rev = "e1d4140be4d2a1508015093b69e1ef53516e1eb6"; + sha256 = "1gdcr10dd968d40qgljdwx9vfkva3yrvjm9a4nis7whaaac3ag58"; }; - postPatch = "patchShebangs ."; + enableParallelBuilding = true; - preConfigure = commonPreConfigure; + outputs = [ "out" "doc" ]; - buildInputs = commonBuildInputs; + postPatch = "patchShebangs ."; - enableParallelBuilding = true; + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + echo ${version} >VERSION + echo ${src.rev} >GIT_COMMIT_ID + ./boot + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker 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-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + "--disable-large-address-space" ]; + # Hack to make sure we never to the relaxation `$PATH` and hooks support for + # compatability. This will be replaced with something clearer in a future + # masss-rebuild. + crossConfig = true; + + nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = libDeps hostPlatform; + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + # 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"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; + # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't + # treat that as a unary `{x,y,z,..}` repetition. postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -75,15 +174,13 @@ in stdenv.mkDerivation (rec { done ''; - outputs = [ "out" "doc" ]; - passthru = { - inherit bootPkgs; - } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { - crossCompiler = selfPkgs.ghc.override { - cross = targetPlatform; - bootPkgs = selfPkgs; - }; + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.5"; }; meta = { @@ -93,34 +190,4 @@ in stdenv.mkDerivation (rec { 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.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; - - configurePlatforms = []; - - passthru = { - inherit bootPkgs cross; - - cc = "${stdenv.cc}/bin/${cross.config}-cc"; - - ld = "${stdenv.cc}/bin/${cross.config}-ld"; - }; -}) +} diff --git a/pkgs/development/compilers/ghc/hpc-7.8.4.patch b/pkgs/development/compilers/ghc/hpc-7.8.4.patch deleted file mode 100644 index 212989200bc587bce731d1d248eb1bf5451bc3c5..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghc/hpc-7.8.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs -index 991fc57..0aad221 100644 ---- a/compiler/cmm/CLabel.hs -+++ b/compiler/cmm/CLabel.hs -@@ -877,7 +877,7 @@ labelDynamic dflags this_pkg this_mod lbl = - - PlainModuleInitLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m) - -- HpcTicksLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m) -+ HpcTicksLabel m -> not (gopt Opt_Static dflags) && this_mod /= m - - -- Note that DynamicLinkerLabels do NOT require dynamic linking themselves. - _ -> False diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index d4418b058d92c1e550493987167b3e3e2a2431bf..07662d32d25803a3d81122a4bc56cabef61df026 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -174,6 +174,10 @@ in mkDerivation (rec { isGhcjs = true; inherit nodejs ghcjsBoot; socket-io = pkgs.nodePackages."socket.io"; + haskellCompilerName = "ghcjs"; + + # let us assume ghcjs is never actually cross compiled + targetPrefix = ""; inherit stage1Packages; mkStage2 = stage2 { @@ -185,6 +189,7 @@ 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 dmjio ]; + maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio elvishjerricco ]; + hydraPlatforms = if broken then [] else ghc.meta.platforms; inherit broken; }) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index ff989ea22c4021209ab25e918086489719b26472..7f3cc94400158af761f3d8d194dc4f165d6f5c35 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -1,5 +1,5 @@ -{ bootPkgs }: +{ bootPkgs, cabal-install }: bootPkgs.callPackage ./base.nix { - inherit bootPkgs; + inherit bootPkgs cabal-install; } diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 2cf6c8b39c240ca314a7378639902e7e663f6162..84eb2d8bd0dacfc104a89553a6af157ff8f0ac14 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -1,9 +1,9 @@ -{ fetchgit, fetchFromGitHub, bootPkgs }: +{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }: bootPkgs.callPackage ./base.nix { version = "0.2.020170323"; - inherit bootPkgs; + inherit bootPkgs cabal-install; ghcjsSrc = fetchFromGitHub { owner = "ghcjs"; diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix deleted file mode 100644 index eaf9949b52da1411b16c07747e82dfde461d8ae6..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ghdl/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchFromGitHub, gnat, zlib, llvm_35, ncurses, clang, flavour ? "mcode" }: - -# mcode only works on x86, while the llvm flavour works on both x86 and x86_64. - - -assert flavour == "llvm" || flavour == "mcode"; - -let - inherit (stdenv.lib) optional; - inherit (stdenv.lib) optionals; - version = "0.33"; -in -stdenv.mkDerivation rec { - name = "ghdl-${flavour}-${version}"; - - src = fetchFromGitHub { - owner = "tgingold"; - repo = "ghdl"; - rev = "v${version}"; - sha256 = "0g72rk2yzr0lrpncq2c1qcv71w3mi2hjq84r1yzgjr6d0qm87r2a"; - }; - - buildInputs = [ gnat zlib ] ++ optionals (flavour == "llvm") [ clang ncurses ]; - - configureFlags = optional (flavour == "llvm") "--with-llvm=${llvm_35}"; - - patchPhase = '' - # Disable warnings-as-errors, because there are warnings (unused things) - sed -i s/-gnatwae/-gnatwa/ Makefile.in ghdl.gpr.in - ''; - - hardeningDisable = [ "all" ]; - - enableParallelBuilding = true; - - meta = { - homepage = https://sourceforge.net/p/ghdl-updates/wiki/Home/; - description = "Free VHDL simulator"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; (if flavour == "llvm" then [ "i686-linux" "x86_64-linux" ] - else [ "i686-linux" ]); - license = stdenv.lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 20e156a72e43841972518f735c198f59d3b2487e..ca1e2f54df930166639f509a7a9eb112fe631db2 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -1,21 +1,35 @@ -{ stdenv, fetchFromGitHub, cmake, bison }: +{ stdenv, fetchFromGitHub, cmake, bison, spirv-tools, jq }: stdenv.mkDerivation rec { name = "glslang-git-${version}"; - version = "2017-03-29"; + version = "2018-02-05"; # `vulkan-loader` requires a specific version of `glslang` as specified in # `/external_revisions/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "714e58b2fc5a45714596e6aa2f6ac8f64260365c"; - sha256 = "0ihnd0c4mr6ppbv9g7z1abrn8vx66simfzx5q48nqcpnywn35jxv"; + rev = "2651ccaec8"; + sha256 = "0x5x5i07n9g809rzf5jgw70mmwck31ishdmxnmi0wxx737jjqwaq"; }; - buildInputs = [ cmake bison ]; + buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs; enableParallelBuilding = true; + patchPhase = '' + cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools + ln -s "${spirv-tools.headers}" External/spirv-tools/external/spirv-headers + ''; + + preConfigure = '' + HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit') + TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit') + if [ "$HEADERS_COMMIT" != "${spirv-tools.headers.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then + echo "ERROR: spirv-tools commits do not match expected versions"; + exit 1; + fi + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Khronos reference front-end for GLSL and ESSL"; diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix deleted file mode 100644 index a209e392bc6f58e209ccc9c9835a8067a6d88ca6..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gnatboot/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gentoo-gnatboot-4.1"; - - src = if stdenv.system == "i686-linux" then - fetchurl { - url = "mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2"; - sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2"; - sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4"; - } else throw "Platform not supported"; - - dontStrip=1; - - installPhase = '' - mkdir -p $out - cp -R * $out - set +e - for a in $out/bin/* ; do - patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a - done - set -e - mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc - ln -s $out/bin/gnatgcc $out/bin/gcc - ''; - - passthru = { - langC = true; /* TRICK for gcc-wrapper to wrap it */ - langCC = false; - langFortran = false; - langAda = true; - }; - - meta = { - homepage = http://gentoo.org; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - maintainers = [ - stdenv.lib.maintainers.viric - ]; - - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index f82fc17634daef6ef715645ff407ee0fa4f999a5..3ac14565946ceed71ba61424dfd025972c8e64cf 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -1,35 +1,40 @@ { stdenv, fetchurl, gcc, makeWrapper , db, gmp, ncurses }: -let version = { - maj = "2.0"; - min = "rc-2"; -}; -in +let + version = "2.2"; + lib = stdenv.lib; +in stdenv.mkDerivation rec { - name = "gnu-cobol-${version.maj}${version.min}"; + name = "gnu-cobol-${version}"; + inherit version; src = fetchurl { - url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version.maj}/gnu-cobol-${version.maj}_${version.min}.tar.gz"; - sha256 = "1pj7mjnp3l76zvzrh1xa6d4kw3jkvzqh39sbf02kiinq4y65s7zj"; + url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version}/gnucobol-${version}.tar.gz"; + sha256 = "1jrjmdx0swssjh388pp08awhiisbrs2i7gx4lcm4p1k5rpg3hn4j"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ db gmp ncurses ]; + cflags = stdenv.lib.concatMapStringsSep " " (p: "-L" + (lib.getLib p) + "/lib ") buildInputs; + ldflags = stdenv.lib.concatMapStringsSep " " (p: "-I" + (lib.getDev p) + "/include ") buildInputs; + + cobolCCFlags = "-I$out/include ${ldflags} -L$out/lib ${cflags}"; + postInstall = with stdenv.lib; '' wrapProgram "$out/bin/cobc" \ - --prefix PATH ':' "${gcc}/bin" \ - --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \ - --prefix NIX_CFLAGS_COMPILE ' ' "'$NIX_CFLAGS_COMPILE'" + --set COB_CC "${gcc}/bin/gcc" \ + --prefix COB_LDFLAGS " " "${cobolCCFlags}" \ + --prefix COB_CFLAGS " " "${cobolCCFlags}" ''; meta = with stdenv.lib; { description = "An open-source COBOL compiler"; homepage = https://sourceforge.net/projects/open-cobol/; license = licenses.gpl3; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ericsagnes the-kenny ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix new file mode 100644 index 0000000000000000000000000000000000000000..7ba547552907c45f186a12347d10357a7952456f --- /dev/null +++ b/pkgs/development/compilers/go/1.10.nix @@ -0,0 +1,184 @@ +{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin +, perl, which, pkgconfig, patch, procps +, pcre, cacert, llvm +, Security, Foundation, bash +, makeWrapper, git, subversion, mercurial, bazaar }: + +let + + inherit (stdenv.lib) optional optionals optionalString; + + clangHack = writeScriptBin "clang" '' + #!${stdenv.shell} + exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) + ''; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + +in + +stdenv.mkDerivation rec { + name = "go-${version}"; + version = "1.10.1"; + + src = fetchFromGitHub { + owner = "golang"; + repo = "go"; + rev = "go${version}"; + sha256 = "1wqwy52ibb343a4v7b9q26xa6r5jk4khfxd90wbpcayws8cxly8m"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/areturn' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_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 + + # 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 '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + 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 + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go + sed -i '/TestCurrent/areturn' src/os/user/user_test.go + sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + sed -i '/TestRead0/areturn' src/os/os_test.go + sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.9.patch + ./ssl-cert-file-1.9.patch + ./remove-test-pie.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ]; + + 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 + ''; + + GOOS = if stdenv.isDarwin then "darwin" else "linux"; + GOARCH = if stdenv.isDarwin then "amd64" + else if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" + else throw "Unsupported system"; + GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # The go build actually checks for CC=*/clang and does something different, so we don't + # just want the generic `cc` here. + CC = if stdenv.isDarwin then "clang" else "cc"; + + configurePhase = '' + mkdir -p $out/share/go/bin + export GOROOT=$out/share/go + export GOBIN=$GOROOT/bin + export PATH=$GOBIN:$PATH + ulimit -a + ''; + + postConfigure = optionalString stdenv.isDarwin '' + export PATH=${clangHack}/bin:$PATH + ''; + + 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 = '' + rm -r $out/share/go/pkg/bootstrap + ln -s $out/share/go/bin $out/bin + ''; + + setupHook = ./setup-hook.sh; + + disallowedReferences = [ go_bootstrap ]; + + meta = with stdenv.lib; { + branch = "1.9"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 2a1944debd91819fd53da91f25e48b00a1d840fb..b8c283fef07e776dc24adc2800ea6e3663dbfaa1 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -23,6 +23,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; + # The tests try to do stuff with 127.0.0.1 and localhost + __darwinAllowLocalNetworking = true; + # I'm not sure what go wants from its 'src', but the go installation manual # describes an installation keeping the src. preUnpack = '' diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix deleted file mode 100644 index 0eebc92ee5941e19c3bdfb028cf9e55749dccc89..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/1.6.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ stdenv, lib, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand -, perl, which, pkgconfig, patch, fetchpatch -, pcre -, Security, Foundation, bash }: - -let - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; -in - -stdenv.mkDerivation rec { - name = "go-${version}"; - version = "1.6.4"; - - src = fetchurl { - url = "https://github.com/golang/go/archive/go${version}.tar.gz"; - sha256 = "1212pijypippg3sq9c9645kskq4ib73y1f8cv0ka6n279smk0mq9"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch ]; - buildInputs = [ pcre ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ - Security Foundation - ]; - - hardeningDisable = [ "all" ]; - - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - topdir=$PWD - mkdir -p $out/share - cd $out/share - ''; - - prePatch = '' - # Ensure that the source directory is named go - cd .. - if [ ! -d go ]; then - mv * go - fi - - cd go - patchShebangs ./ # replace /bin/bash - - # This script produces another script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/test.bash \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # 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 - '' + lib.optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + lib.optionalString stdenv.isDarwin '' - 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 - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - rm src/crypto/x509/root_darwin_test.go src/crypto/x509/verify_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - - sed -i '1 a\exit 0' misc/cgo/errors/test.bash - - mkdir $topdir/dirtyhacks - cat < $topdir/dirtyhacks/clang - #!${bash}/bin/bash - $(type -P clang) "\$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - exit $? - EOF - chmod +x $topdir/dirtyhacks/clang - PATH=$topdir/dirtyhacks:$PATH - ''; - - 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"; - GOARCH = if stdenv.isDarwin then "amd64" - else if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" - else if stdenv.isAarch64 then "arm64" - else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - echo Building - ./all.bash - ''; - - preFixup = '' - rm -r $out/share/go/pkg/bootstrap - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ go_bootstrap ]; - - meta = with stdenv.lib; { - branch = "1.6"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix deleted file mode 100644 index b1230da5a14289fc00a522516a5867aa5e43f373..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/1.7.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, fetchpatch -, pcre, cacert -, Security, Foundation, bash }: - -let - - inherit (stdenv.lib) optional optionals optionalString; - - clangHack = writeScriptBin "clang" '' - #!${stdenv.shell} - exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - ''; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - -in - -stdenv.mkDerivation rec { - name = "go-${version}"; - version = "1.7.6"; - - src = fetchFromGitHub { - owner = "golang"; - repo = "go"; - rev = "go${version}"; - sha256 = "1gacjwbs1qbx8x84746qdxx2xwylirvd31ybgagfglfsl77vi4m2"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch ]; - buildInputs = [ pcre ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # 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 - - # 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.isDarwin '' - 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 - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - sed -i '/TestCurrent/areturn' src/os/user/user_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - sed -i 's/unrecognized/unknown/' src/cmd/go/build.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - - sed -i '1 a\exit 0' misc/cgo/errors/test.bash - ''; - - patches = - [ ./remove-tools-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"; - }) - ]; - - 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" - else if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" - else if stdenv.isAarch64 then "arm64" - else throw "Unsupported system"; - GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - configurePhase = '' - mkdir -p $out/share/go/bin - export GOROOT=$out/share/go - export GOBIN=$GOROOT/bin - export PATH=$GOBIN:$PATH - ''; - - postConfigure = optionalString stdenv.isDarwin '' - export PATH=${clangHack}/bin:$PATH - ''; - - installPhase = '' - cp -r . $GOROOT - ( cd $GOROOT/src && ./all.bash ) - ''; - - preFixup = '' - rm -r $out/share/go/pkg/bootstrap - ln -s $out/share/go/bin $out/bin - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ go_bootstrap ]; - - meta = with stdenv.lib; { - branch = "1.7"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix deleted file mode 100644 index 538c20bac72a3d60ff6dd8055bcda20031bed644..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/1.8.nix +++ /dev/null @@ -1,178 +0,0 @@ -{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, fetchpatch -, pcre, cacert, llvm -, Security, Foundation, bash -, makeWrapper, git, subversion, mercurial, bazaar }: - -let - - inherit (stdenv.lib) optional optionals optionalString; - - clangHack = writeScriptBin "clang" '' - #!${stdenv.shell} - exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - ''; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - -in - -stdenv.mkDerivation rec { - name = "go-${version}"; - version = "1.8.5"; - - src = fetchFromGitHub { - owner = "golang"; - repo = "go"; - rev = "go${version}"; - sha256 = "1ab021l3v29ciaxp738cjpbkh1chlsl6928672q3i82anmdzn5m5"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]; - buildInputs = [ pcre ] - ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # 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 - - # 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 '' - 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 - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - sed -i '/TestCurrent/areturn' src/os/user/user_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - sed -i 's/unrecognized/unknown/' src/cmd/go/build.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - - sed -i '1 a\exit 0' misc/cgo/errors/test.bash - ''; - - patches = - [ ./remove-tools-1.8.patch - ./ssl-cert-file.patch - ./creds-test.patch - ./remove-test-pie-1.8.patch - ]; - - 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" - else if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" - else if stdenv.isAarch64 then "arm64" - else throw "Unsupported system"; - GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - configurePhase = '' - mkdir -p $out/share/go/bin - export GOROOT=$out/share/go - export GOBIN=$GOROOT/bin - export PATH=$GOBIN:$PATH - ''; - - postConfigure = optionalString stdenv.isDarwin '' - export PATH=${clangHack}/bin:$PATH - ''; - - 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 = '' - rm -r $out/share/go/pkg/bootstrap - ln -s $out/share/go/bin $out/bin - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ go_bootstrap ]; - - meta = with stdenv.lib; { - branch = "1.8"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 007b81d995b791568ae2ef52f8c1b5ee8ba0e534..829309f9426817d3b49754e2c15677d6e380bf29 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, fetchpatch +, perl, which, pkgconfig, patch, procps , pcre, cacert, llvm , Security, Foundation, bash , makeWrapper, git, subversion, mercurial, bazaar }: @@ -25,19 +25,20 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.2"; + version = "1.9.5"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "07p4ld07r2nml2bsbfb8h51hqilbqyhhdlia99y1gk7ibvhybv8i"; + sha256 = "15dx1b71xv7b265gqk9nv02pirggpw7d83apikhrza2qkj64ydd0"; }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]; - buildInputs = [ pcre ] - ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; @@ -86,7 +87,7 @@ stdenv.mkDerivation rec { 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 + echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true @@ -116,7 +117,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.9.patch ./ssl-cert-file-1.9.patch - ./creds-test.patch + ./creds-test-1.9.patch ./remove-test-pie-1.9.patch ./go-1.9-skip-flaky-19608.patch ./go-1.9-skip-flaky-20072.patch @@ -127,8 +128,6 @@ stdenv.mkDerivation rec { 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" else if stdenv.system == "i686-linux" then "386" @@ -140,6 +139,8 @@ stdenv.mkDerivation rec { GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; # The go build actually checks for CC=*/clang and does something different, so we don't # just want the generic `cc` here. @@ -150,6 +151,7 @@ stdenv.mkDerivation rec { export GOROOT=$out/share/go export GOBIN=$GOROOT/bin export PATH=$GOBIN:$PATH + ulimit -a ''; postConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/go/creds-test-1.9.patch b/pkgs/development/compilers/go/creds-test-1.9.patch new file mode 100644 index 0000000000000000000000000000000000000000..09f78959ff9cdab43b2b2cbc4eb0d88ac1604fdb --- /dev/null +++ b/pkgs/development/compilers/go/creds-test-1.9.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go +--- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 ++++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100 +@@ -62,8 +62,8 @@ + if sys, ok := err.(*os.SyscallError); ok { + err = sys.Err + } +- if err != syscall.EPERM { +- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) ++ if err != syscall.EPERM && err != syscall.EINVAL { ++ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) + } + } + diff --git a/pkgs/development/compilers/go/creds-test.patch b/pkgs/development/compilers/go/creds-test.patch index 09f78959ff9cdab43b2b2cbc4eb0d88ac1604fdb..6a18e6cc42e83e057096507b04646d0abcca67c9 100644 --- a/pkgs/development/compilers/go/creds-test.patch +++ b/pkgs/development/compilers/go/creds-test.patch @@ -1,14 +1,13 @@ -diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go ---- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 -+++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100 -@@ -62,8 +62,8 @@ - if sys, ok := err.(*os.SyscallError); ok { - err = sys.Err +--- source.org/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/syscall/creds_test.go 2018-02-22 10:43:47.223615358 +0000 +@@ -76,8 +76,8 @@ + if sys, ok := err.(*os.SyscallError); ok { + err = sys.Err + } +- if err != syscall.EPERM { +- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) ++ if err != syscall.EPERM && err != syscall.EINVAL { ++ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) + } } -- if err != syscall.EPERM { -- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) -+ if err != syscall.EPERM && err != syscall.EINVAL { -+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) - } - } diff --git a/pkgs/development/compilers/go/fix-systime-1.6.patch b/pkgs/development/compilers/go/fix-systime-1.6.patch deleted file mode 100644 index e4a3932001e50528278406bd8cf791b32f747adf..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/fix-systime-1.6.patch +++ /dev/null @@ -1,45 +0,0 @@ -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/new-binutils.patch b/pkgs/development/compilers/go/new-binutils.patch deleted file mode 100644 index a547e3ab9b9a333807971da3a1dccb78f2b34087..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/new-binutils.patch +++ /dev/null @@ -1,194 +0,0 @@ -https://github.com/golang/go/issues/13114 -https://gnats.netbsd.org/50777 - ---- a/src/cmd/6l/asm.c 2015-09-23 06:20:05.000000000 +0200 -+++ b/src/cmd/6l/asm.c 2016-03-10 21:00:29.032083210 +0100 -@@ -118,6 +118,8 @@ - return; - - case 256 + R_X86_64_GOTPCREL: -+ case 256 + R_X86_64_GOTPCRELX: -+ case 256 + R_X86_64_REX_GOTPCRELX: - if(targ->type != SDYNIMPORT) { - // have symbol - if(r->off >= 2 && s->p[r->off-2] == 0x8b) { ---- a/src/cmd/8l/asm.c 2015-09-23 06:20:05.000000000 +0200 -+++ b/src/cmd/8l/asm.c 2016-03-10 21:02:16.702064080 +0100 -@@ -115,6 +115,7 @@ - return; - - case 256 + R_386_GOT32: -+ case 256 + R_386_GOT32X: - if(targ->type != SDYNIMPORT) { - // have symbol - if(r->off >= 2 && s->p[r->off-2] == 0x8b) { ---- a/src/cmd/ld/elf.h 2015-09-23 06:20:05.000000000 +0200 -+++ b/src/cmd/ld/elf.h 2016-03-10 21:00:29.033083211 +0100 -@@ -478,32 +478,47 @@ - * Relocation types. - */ - --#define R_X86_64_NONE 0 /* No relocation. */ --#define R_X86_64_64 1 /* Add 64 bit symbol value. */ --#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ --#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ --#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ --#define R_X86_64_COPY 5 /* Copy data from shared object. */ --#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ --#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ --#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ --#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */ --#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ --#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ --#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ --#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ --#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ --#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ --#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ --#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ --#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ --#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ --#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ --#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ --#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ --#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ -- --#define R_X86_64_COUNT 24 /* Count of defined relocation types. */ -+#define R_X86_64_NONE 0 -+#define R_X86_64_64 1 -+#define R_X86_64_PC32 2 -+#define R_X86_64_GOT32 3 -+#define R_X86_64_PLT32 4 -+#define R_X86_64_COPY 5 -+#define R_X86_64_GLOB_DAT 6 -+#define R_X86_64_JMP_SLOT 7 -+#define R_X86_64_RELATIVE 8 -+#define R_X86_64_GOTPCREL 9 -+#define R_X86_64_32 10 -+#define R_X86_64_32S 11 -+#define R_X86_64_16 12 -+#define R_X86_64_PC16 13 -+#define R_X86_64_8 14 -+#define R_X86_64_PC8 15 -+#define R_X86_64_DTPMOD64 16 -+#define R_X86_64_DTPOFF64 17 -+#define R_X86_64_TPOFF64 18 -+#define R_X86_64_TLSGD 19 -+#define R_X86_64_TLSLD 20 -+#define R_X86_64_DTPOFF32 21 -+#define R_X86_64_GOTTPOFF 22 -+#define R_X86_64_TPOFF32 23 -+#define R_X86_64_PC64 24 -+#define R_X86_64_GOTOFF64 25 -+#define R_X86_64_GOTPC32 26 -+#define R_X86_64_GOT64 27 -+#define R_X86_64_GOTPCREL64 28 -+#define R_X86_64_GOTPC64 29 -+#define R_X86_64_GOTPLT64 30 -+#define R_X86_64_PLTOFF64 31 -+#define R_X86_64_SIZE32 32 -+#define R_X86_64_SIZE64 33 -+#define R_X86_64_GOTPC32_TLSDEC 34 -+#define R_X86_64_TLSDESC_CALL 35 -+#define R_X86_64_TLSDESC 36 -+#define R_X86_64_IRELATIVE 37 -+#define R_X86_64_PC32_BND 40 -+#define R_X86_64_GOTPCRELX 41 -+#define R_X86_64_REX_GOTPCRELX 42 - - - #define R_ALPHA_NONE 0 /* No reloc */ -@@ -581,39 +596,42 @@ - #define R_ARM_COUNT 38 /* Count of defined relocation types. */ - - --#define R_386_NONE 0 /* No relocation. */ --#define R_386_32 1 /* Add symbol value. */ --#define R_386_PC32 2 /* Add PC-relative symbol value. */ --#define R_386_GOT32 3 /* Add PC-relative GOT offset. */ --#define R_386_PLT32 4 /* Add PC-relative PLT offset. */ --#define R_386_COPY 5 /* Copy data from shared object. */ --#define R_386_GLOB_DAT 6 /* Set GOT entry to data address. */ --#define R_386_JMP_SLOT 7 /* Set GOT entry to code address. */ --#define R_386_RELATIVE 8 /* Add load address of shared object. */ --#define R_386_GOTOFF 9 /* Add GOT-relative symbol address. */ --#define R_386_GOTPC 10 /* Add PC-relative GOT table address. */ --#define R_386_TLS_TPOFF 14 /* Negative offset in static TLS block */ --#define R_386_TLS_IE 15 /* Absolute address of GOT for -ve static TLS */ --#define R_386_TLS_GOTIE 16 /* GOT entry for negative static TLS block */ --#define R_386_TLS_LE 17 /* Negative offset relative to static TLS */ --#define R_386_TLS_GD 18 /* 32 bit offset to GOT (index,off) pair */ --#define R_386_TLS_LDM 19 /* 32 bit offset to GOT (index,zero) pair */ --#define R_386_TLS_GD_32 24 /* 32 bit offset to GOT (index,off) pair */ --#define R_386_TLS_GD_PUSH 25 /* pushl instruction for Sun ABI GD sequence */ --#define R_386_TLS_GD_CALL 26 /* call instruction for Sun ABI GD sequence */ --#define R_386_TLS_GD_POP 27 /* popl instruction for Sun ABI GD sequence */ --#define R_386_TLS_LDM_32 28 /* 32 bit offset to GOT (index,zero) pair */ --#define R_386_TLS_LDM_PUSH 29 /* pushl instruction for Sun ABI LD sequence */ --#define R_386_TLS_LDM_CALL 30 /* call instruction for Sun ABI LD sequence */ --#define R_386_TLS_LDM_POP 31 /* popl instruction for Sun ABI LD sequence */ --#define R_386_TLS_LDO_32 32 /* 32 bit offset from start of TLS block */ --#define R_386_TLS_IE_32 33 /* 32 bit offset to GOT static TLS offset entry */ --#define R_386_TLS_LE_32 34 /* 32 bit offset within static TLS block */ --#define R_386_TLS_DTPMOD32 35 /* GOT entry containing TLS index */ --#define R_386_TLS_DTPOFF32 36 /* GOT entry containing TLS offset */ --#define R_386_TLS_TPOFF32 37 /* GOT entry of -ve static TLS offset */ -- --#define R_386_COUNT 38 /* Count of defined relocation types. */ -+#define R_386_NONE 0 -+#define R_386_32 1 -+#define R_386_PC32 2 -+#define R_386_GOT32 3 -+#define R_386_PLT32 4 -+#define R_386_COPY 5 -+#define R_386_GLOB_DAT 6 -+#define R_386_JMP_SLOT 7 -+#define R_386_RELATIVE 8 -+#define R_386_GOTOFF 9 -+#define R_386_GOTPC 10 -+#define R_386_TLS_TPOFF 14 -+#define R_386_TLS_IE 15 -+#define R_386_TLS_GOTIE 16 -+#define R_386_TLS_LE 17 -+#define R_386_TLS_GD 18 -+#define R_386_TLS_LDM 19 -+#define R_386_TLS_GD_32 24 -+#define R_386_TLS_GD_PUSH 25 -+#define R_386_TLS_GD_CALL 26 -+#define R_386_TLS_GD_POP 27 -+#define R_386_TLS_LDM_32 28 -+#define R_386_TLS_LDM_PUSH 29 -+#define R_386_TLS_LDM_CALL 30 -+#define R_386_TLS_LDM_POP 31 -+#define R_386_TLS_LDO_32 32 -+#define R_386_TLS_IE_32 33 -+#define R_386_TLS_LE_32 34 -+#define R_386_TLS_DTPMOD32 35 -+#define R_386_TLS_DTPOFF32 36 -+#define R_386_TLS_TPOFF32 37 -+#define R_386_TLS_GOTDESC 39 -+#define R_386_TLS_DESC_CALL 40 -+#define R_386_TLS_DESC 41 -+#define R_386_IRELATIVE 42 -+#define R_386_GOT32X 43 - - #define R_PPC_NONE 0 /* No relocation. */ - #define R_PPC_ADDR32 1 ---- a/src/cmd/ld/ldelf.c 2015-09-23 06:20:05.000000000 +0200 -+++ b/src/cmd/ld/ldelf.c 2016-03-10 21:00:29.033083211 +0100 -@@ -888,12 +888,15 @@ - case R('6', R_X86_64_PC32): - case R('6', R_X86_64_PLT32): - case R('6', R_X86_64_GOTPCREL): -+ case R('6', R_X86_64_GOTPCRELX): -+ case R('6', R_X86_64_REX_GOTPCRELX): - case R('8', R_386_32): - case R('8', R_386_PC32): - case R('8', R_386_GOT32): - case R('8', R_386_PLT32): - case R('8', R_386_GOTOFF): - case R('8', R_386_GOTPC): -+ case R('8', R_386_GOT32X): - *siz = 4; - break; - case R('6', R_X86_64_64): diff --git a/pkgs/development/compilers/go/remove-test-pie-1.8.patch b/pkgs/development/compilers/go/remove-test-pie-1.8.patch deleted file mode 100644 index d09e143c74c196d56891eb9ff1360e989af6bfd5..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/remove-test-pie-1.8.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index c51dcea..8fbec5e 100644 ---- a/src/cmd/dist/test.go -+++ b/src/cmd/dist/test.go -@@ -461,17 +461,5 @@ func (t *tester) registerTests() { - }) - } - -- // Test internal linking of PIE binaries where it is supported. -- if t.goos == "linux" && t.goarch == "amd64" { -- t.tests = append(t.tests, distTest{ -- name: "pie_internal", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", "go", "test", "reflect", "-short", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60), t.tags(), t.runFlag("")) -- return nil -- }, -- }) -- } -- - // sync tests - t.tests = append(t.tests, distTest{ - name: "sync_cpu", \ No newline at end of file diff --git a/pkgs/development/compilers/go/remove-test-pie.patch b/pkgs/development/compilers/go/remove-test-pie.patch new file mode 100644 index 0000000000000000000000000000000000000000..fb8e116af76f48b98b54d6ef42ea59b48df41ad1 --- /dev/null +++ b/pkgs/development/compilers/go/remove-test-pie.patch @@ -0,0 +1,24 @@ +--- source.org/src/cmd/dist/test.go 2018-02-22 10:40:40.089632339 +0000 ++++ source/src/cmd/dist/test.go 2018-02-22 10:56:53.075193788 +0000 +@@ -526,21 +526,6 @@ + }) + } + +- // Test internal linking of PIE binaries where it is supported. +- if goos == "linux" && goarch == "amd64" && !isAlpineLinux() { +- // Issue 18243: We don't have a way to set the default +- // dynamic linker used in internal linking mode. So +- // this test is skipped on Alpine. +- t.tests = append(t.tests, distTest{ +- name: "pie_internal", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- } +- + // sync tests + t.tests = append(t.tests, distTest{ + name: "sync_cpu", diff --git a/pkgs/development/compilers/go/remove-tools-1.5.patch b/pkgs/development/compilers/go/remove-tools-1.5.patch deleted file mode 100644 index 5aad4b4abc3fb6ef1603c527bfbb2a1afabcf9d0..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/remove-tools-1.5.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go -index 61e3d8d..b8422ad 100644 ---- a/src/cmd/go/pkg.go -+++ b/src/cmd/go/pkg.go -@@ -678,7 +678,7 @@ var goTools = map[string]targetDir{ - "cmd/trace": toTool, - "cmd/vet": toTool, - "cmd/yacc": toTool, -- "golang.org/x/tools/cmd/godoc": toBin, -+ "nixos.org/x/tools/cmd/godoc": toBin, - "code.google.com/p/go.tools/cmd/cover": stalePath, - "code.google.com/p/go.tools/cmd/godoc": stalePath, - "code.google.com/p/go.tools/cmd/vet": stalePath, -diff --git a/src/go/build/build.go b/src/go/build/build.go -index 496fe11..8c81dbd 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1388,7 +1388,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index d346362..fb22b6e 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -194,6 +194,17 @@ func GOROOT() string { - return defaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/go/remove-tools-1.7.patch b/pkgs/development/compilers/go/remove-tools-1.7.patch deleted file mode 100644 index b53e48e1a515d41b0fe55ac4239e20e007ab1f3f..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/remove-tools-1.7.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/go/build/build.go b/src/go/build/build.go -index 9706b8b..f250751 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1513,7 +1513,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index 441dcd9..a50277e 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -230,6 +230,17 @@ func GOROOT() string { - return sys.DefaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/go/remove-tools-1.8.patch b/pkgs/development/compilers/go/remove-tools-1.8.patch deleted file mode 100644 index b53e48e1a515d41b0fe55ac4239e20e007ab1f3f..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/remove-tools-1.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/go/build/build.go b/src/go/build/build.go -index 9706b8b..f250751 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1513,7 +1513,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index 441dcd9..a50277e 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -230,6 +230,17 @@ func GOROOT() string { - return sys.DefaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/go/setup-hook.sh b/pkgs/development/compilers/go/setup-hook.sh index 1b91c8312b88647f7807325180ee991b910e9727..7dce15eeb1025c4f63303a866d2fbdba0e2b08de 100644 --- a/pkgs/development/compilers/go/setup-hook.sh +++ b/pkgs/development/compilers/go/setup-hook.sh @@ -2,4 +2,4 @@ addToGoPath() { addToSearchPath GOPATH $1/share/go } -envHooks=(${envHooks[@]} addToGoPath) +addEnvHooks "$targetOffset" addToGoPath diff --git a/pkgs/development/compilers/go/ssl-cert-file.patch b/pkgs/development/compilers/go/ssl-cert-file.patch deleted file mode 100644 index 052655eed52c93d7c5bac1a3091b2f889fa17a27..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/ssl-cert-file.patch +++ /dev/null @@ -1,80 +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("NIX_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 66cdb5e..bb28036 100644 ---- a/src/crypto/x509/root_darwin.go -+++ b/src/crypto/x509/root_darwin.go -@@ -61,17 +61,25 @@ func execSecurityRoots() (*CertPool, error) { - println(fmt.Sprintf("crypto/x509: %d certs have a trust policy", len(hasPolicy))) - } - -- 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() - numVerified int // number of execs of 'security verify-cert', for debug stats - ) - -+ if file := os.Getenv("NIX_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 -+ } -+ - blockCh := make(chan *pem.Block) - var wg sync.WaitGroup -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("NIX_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/strip.patch b/pkgs/development/compilers/go/strip.patch deleted file mode 100644 index 7b036802d51cb0fd4175ca7b2824d1bffbfd1265..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/go/strip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go -index 0b14725..a7608ce 100644 ---- a/src/cmd/go/build.go -+++ b/src/cmd/go/build.go -@@ -2310,6 +2310,7 @@ func (gcToolchain) ld(b *builder, root *action, out string, allactions []*action - } - } - var ldflags []string -+ ldflags = append(ldflags, "-s") - if buildContext.InstallSuffix != "" { - ldflags = append(ldflags, "-installsuffix", buildContext.InstallSuffix) - } diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2eb9c4a7e8356de22aeb97ff0063caa511ecc897 --- /dev/null +++ b/pkgs/development/compilers/graalvm/default.nix @@ -0,0 +1,208 @@ +{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: + +let + # pre-download some cache entries ('mx' will not be able to download under nixbld1) + makeMxCache = list: + stdenv.mkDerivation { + name = "mx-cache"; + buildCommand = '' + mkdir $out + ${lib.concatMapStrings ({url, name, sha1}: '' + ln -s ${fetchurl { inherit url sha1; }} $out/${name} + echo -n ${sha1} > $out/${name}.sha1 + '') list} + ''; + }; + + jvmci8-mxcache = [ + rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; } + rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; } + rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; } + rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; } + rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; } + rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6.sources_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } + rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; } + rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; } + rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; } + rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } + rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2.sources_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } + rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; } + rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; } + rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12.jar; } + rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12-sources.jar; } + rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3.jar; } + rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3-sources.jar; } + rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}.so"; url = https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-0d031013db9a80d6c88330c42c983fbfa7053193.so; } + ]; + + graal-mxcache = jvmci8-mxcache ++ [ + rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; } + rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; } + rec { sha1 = "aca5eb39e2a12fddd6c472b240afe9ebea3a6733"; name = "org.json_${sha1}.jar"; url = mirror://maven/org/json/json/20160810/json-20160810.jar; } + rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}.jar"; url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; } + rec { sha1 = "476d9a44cd19d6b55f81571077dfa972a4f8a083"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/java-allocation-instrumenter/java-allocation-instrumenter-8f0db117e64e.jar; } + rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-5.0.4.jar; } + rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-tree-5.0.4.jar; } + rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } + rec { sha1 = "616a4fca49c5d610a3354e78cd97e7627024bb66"; name = "GSON_SHADOWED_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4.jar; } + rec { sha1 = "b13337a4ffd095c2e27ea401dc6edfca0d23a6e4"; name = "GSON_SHADOWED.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4-sources.jar; } + ]; + +in rec { + + mx = stdenv.mkDerivation { + name = "mx"; + src = fetchFromGitHub { + owner = "graalvm"; + repo = "mx"; + rev = "22557cf7ec417c49aca20c13a9123045005d72d0"; # HEAD at 2018-02-16 + sha256 = "070647ih2qzcssj7yripbg1w9bjwi1rcp1blx5z3jbp1shrr6563"; + }; + nativeBuildInputs = [ makeWrapper ]; + buildPhase = '' + substituteInPlace mx --replace /bin/pwd pwd + ''; + installPhase = '' + mkdir -p $out/bin + cp -dpR * $out/bin + wrapProgram $out/bin/mx --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} + ''; + meta = with stdenv.lib; { + homepage = https://github.com/graalvm/mx; + description = "Command-line tool used for the development of Graal projects"; + license = licenses.unfree; + platforms = python27.meta.platforms; + }; + }; + + # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too) + jvmci8 = stdenv.mkDerivation rec { + version = "0.41"; + name = let + n = "jvmci8u161-${version}"; + in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then + n + else + throw "length of string `${n}' must be equal to the length of `${oraclejdk8.name}'"; + src = fetchFromGitHub { + owner = "graalvm"; + repo = "graal-jvmci-8"; + rev = "jvmci-${version}"; + sha256 = "0pajf114l8lzczfdzz968c3s1ardiy4q5ya8p2kmwxl06giy95qr"; + }; + buildInputs = [ mx mercurial ]; + postUnpack = '' + # a fake mercurial dir to prevent mx crash and supply the version to mx + ( cd $sourceRoot + hg init + hg add + hg commit -m 'dummy commit' + hg tag ${lib.escapeShellArg src.rev} + hg checkout ${lib.escapeShellArg src.rev} + ) + ''; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format-overflow" # newly detected by gcc7 + ]; + buildPhase = '' + cp -dpR ${oraclejdk8} writable-copy-of-jdk + chmod +w -R writable-copy-of-jdk + + export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild + export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache} + mx --java-home $(pwd)/writable-copy-of-jdk build + ''; + installPhase = '' + mv jdk1.8.0_*/linux-amd64/product $out + find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \; + ''; + dontFixup = true; # do not nuke path of ffmpeg etc + dontStrip = true; # why? see in oraclejdk derivation + inherit (oraclejdk8) meta; + }; + + graalvm8 = stdenv.mkDerivation rec { + version = "0.31"; + name = let + n = "graal-vm-8-${version}"; + in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then + n + else + throw "length of string `${n}' must be equal to the length of `${jvmci8.name}'"; + src = fetchFromGitHub { + owner = "oracle"; + repo = "graal"; + rev = "vm-enterprise-${version}"; + sha256 = "0rhd6dk2jpbxgdprqvdk991b2k177jrjgyjabdnmv5lzlhczy676"; + }; + buildInputs = [ mx zlib mercurial jvmci8 ]; + postUnpack = '' + # a fake mercurial dir to prevent mx crash and supply the version to mx + ( cd $sourceRoot + hg init + hg add + hg commit -m 'dummy commit' + hg tag ${lib.escapeShellArg src.rev} + hg checkout ${lib.escapeShellArg src.rev} + ) + ''; + buildPhase = '' + # make a copy of jvmci8 + cp -dpR ${jvmci8} $out + chmod +w -R $out + find $out -type f -exec sed -i "s#${jvmci8}#$out#g" {} \; + + export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild + export MX_CACHE_DIR=${makeMxCache graal-mxcache} + ( cd substratevm; mx --java-home $out build --no-daemon ) + ''; + installPhase = '' + # add graal files + mkdir -p $out/jre/tools/{profiler,chromeinspector} + cp -pR substratevm/svmbuild/native-image-root/linux-amd64/bin/* $out/jre/bin/ + cp -pLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks + cp -pLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/ + cp -pR $MX_ALT_OUTPUT_ROOT/truffle/dists/* $out/jre/lib/truffle/ + cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/ + cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/ + echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties + ln -s --relative $out/jre/bin/native-image $out/bin/native-image + cp $out/jre/tools/nfi/bin/libtrufflenfi.so $out/jre/lib/amd64/ + cp -dpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/ + + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/jre/lib/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + ''; + dontFixup = true; # do not nuke path of ffmpeg etc + dontStrip = true; # why? see in oraclejdk derivation + doInstallCheck = true; + installCheckPhase = '' + echo ${lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); + } + } + ''} > HelloWorld.java + $out/bin/javac HelloWorld.java + + # run on JVM with Graal Compiler + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + + # Ahead-Of-Time compilation + $out/bin/native-image -no-server HelloWorld + ./helloworld + ./helloworld | fgrep 'Hello World' + ''; + meta = with stdenv.lib; { + homepage = https://github.com/oracle/graal; + description = "High-Performance Polyglot VM"; + license = licenses.unfree; + maintainers = with maintainers; [ volth ]; + platforms = [ "x86_64-linux" ]; + }; + }; +} diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix deleted file mode 100644 index 0c4cef653d86d2509e0494af148dc56eace46dfa..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/halvm/2.4.0.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, targetPackages, 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 |${targetPackages.stdenv.cc.bintools}/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 targetPackages.stdenv.cc.bintools - 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 = "${targetPackages.stdenv.cc.bintools}/bin/ld"; - }; - - meta = { - homepage = https://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; - broken = true; # https://nix-cache.s3.amazonaws.com/log/6i98mhbq9nzzhwr4svlivm4gz91l2w0f-HaLVM-2.4.0.drv - }; -} diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index c6b4913c623642df24658423b1253536bbaf6ecc..afeef2b3637cbd63d211d009deb4e159e12b1692 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -53,6 +53,24 @@ let dontStrip = true; + # While it might be a good idea to run the upstream test suite, let's at + # least make sure we can actually run the compiler. + doInstallCheck = true; + installCheckPhase = '' + # Get out of the source directory to make sure the stdlib from the + # sources doesn't interfere with the installed one. + mkdir installcheck + pushd installcheck > /dev/null + cat >> InstallCheck.hx < /dev/null + ''; + meta = with stdenv.lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; homepage = https://haxe.org; @@ -72,10 +90,10 @@ in { ''; }; haxe_3_4 = generic { - version = "3.4.4"; - sha256 = "057psarsmz8q2y9pqv5221vpdya241gcy8xnl2wg9wyscn6z1lx6"; + version = "3.4.6"; + sha256 = "1myc4b8fwp0f9vky17wv45n34a583f5sjvajsc93f5gm1wanp4if"; prePatch = '' - sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml + sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' 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/setup-hook.sh b/pkgs/development/compilers/haxe/setup-hook.sh index 21cc0206859f64de4ef94d61840bb22ce7500a10..e6496107a5ee17646abfed4db1fc2423d03cf2e2 100644 --- a/pkgs/development/compilers/haxe/setup-hook.sh +++ b/pkgs/development/compilers/haxe/setup-hook.sh @@ -4,4 +4,4 @@ addHaxeLibPath() { fi } -envHooks+=(addHaxeLibPath) +addEnvHooks "$targetOffset" addHaxeLibPath diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 4159b7bd52b7e67958c5380da1648085d943cb23..1cb28118ccbef299d78731539c821fa6e70a2f6a 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchgit, fetchurl, cmake, pkgconfig, boost, libunwind, libmemcached +{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit +, libxslt, freetype, gdb, git, perl, mysql, gmp, libyaml, libedit , libvpx, imagemagick, fribidi, gperf, which, ocamlPackages }: stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.21"; + version = "3.23.2"; # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "56483773e2edd9e61782f1901ce40e47959e71b8"; - sha256 = "0dmdk98nv04m0fv6909gfbsxqlkckn369yi7kadhir0r7vxsj7wa"; + rev = "HHVM-${version}"; + sha256 = "1nic49j8nghx82lgvz0b95r78sqz46qaaqv4nx48p8yrj9ysnd7i"; fetchSubmodules = true; }; buildInputs = - [ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl + [ cmake pkgconfig boost libunwind mysql.connector-c libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5 @@ -29,10 +29,6 @@ stdenv.mkDerivation rec { patches = [ ./flexible-array-members-gcc6.patch - (fetchurl { - url = https://github.com/facebook/hhvm/commit/b506902af2b7c53de6d6c92491c2086472292004.patch; - sha256 = "1br7diczqks6b1xjrdsac599fc62m9l17gcx7dvkc0qj54lq7ys4"; - }) ]; enableParallelBuilding = true; @@ -57,6 +53,7 @@ stdenv.mkDerivation rec { hphp/runtime/ext/std/*.cpp \ hphp/runtime/ext_zend_compat/php-src/main/*.cpp \ hphp/runtime/ext_zend_compat/php-src/main/*.h + sed '1i#include ' -i third-party/mcrouter/src/mcrouter/lib/cycles/Cycles.h patchShebangs . ''; diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 5e0970ea12f44dfb5d5246adf3c74b2e32b9e903..22f80ae559f75a0ae37892b13aa987bd911356ea 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iasl-${version}"; - version = "20170303"; + version = "20180313"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1dc933rr11gv1nlaf5j8ih1chdakbjbjkn34jgbm330zppmck4y0"; + sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index fb03d98dbdc06d9dffedbf2b74c119187a2295fe..9390cbde63779196eba1ab91acf2f5fafd2b87ee 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.6.2"; + version = "1.7.1"; src = fetchurl { url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "004kwrngyxxlrlzby4vzxjr0xcyngcdc9dfgnvi61ffnjr006ryf"; + sha256 = "1b9z0i9b1dsc2qpfdzbn2fi4vi3idrhm7ig45g1ny40ymvxcwwn9"; }; nativeBuildInputs = [ pkgconfig bc perl ]; diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 0e4bc420241d2288758df90bf9928db2bb0094ff..62fa578cef6838033188ef2e897490851e8ee5e3 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -3,8 +3,8 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is n }: stdenv.mkDerivation rec { - version = "20170807"; - rev = "6e0fc2f148e95afad998a7c7f4d7908d29fd8e44"; + version = "1.9.2"; + rev = "v${version}"; inherit testedTargets; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ispc"; repo = "ispc"; inherit rev; - sha256 = "17fwnfm8a329lgfhjwcvji4h1fm4iqmc28wz23hvgqbpj8lk6qgh"; + sha256 = "0zaw7mwvly1csbdcbz9j8ry89n0r1fag1m1f579l4mgg1x6ksqry"; }; # there are missing dependencies in the Makefile, causing sporadic build failures diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index aa3f49ca4d9fa7d847b1467eb97c0397c4a6d000..5ffb7b92b26a465bb9c7bf840adf3b92f2921734 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt -, mesa_noglu , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo +, libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo , gdk_pixbuf, atk }: # TODO: Investigate building from source instead of patching binaries. @@ -7,16 +7,16 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "152b1036.1"; + version = "152b1136.20"; name = pname + "-" + version; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz"; - sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; + sha256 = "0sqr8f3z062kwcxh3dxnan45ldas438blbc69z0pypbhc8c2sk2b"; } else - abort "unsupported system: ${stdenv.system}"; + throw "unsupported system: ${stdenv.system}"; nativeBuildInputs = [ file ]; @@ -51,7 +51,7 @@ let drv = stdenv.mkDerivation rec { ''; rpath = lib.makeLibraryPath ([ - stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu + stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk ] ++ (with xorg; [ libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm @@ -73,7 +73,7 @@ let drv = stdenv.mkDerivation rec { your own risk. ''; homepage = "https://bintray.com/jetbrains/intellij-jdk/"; - licenses = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; platforms = with platforms; [ "x86_64-linux" ]; }; diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix deleted file mode 100644 index 6b8c6599062e5f4a14929488af92485cd1074e16..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/jhc/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, perl, ghcWithPackages }: - -let ghc = ghcWithPackages (hpkgs: with hpkgs; [ - binary zlib utf8-string readline fgl regex-compat HsSyck random - ]); -in - -stdenv.mkDerivation rec { - name = "jhc-${version}"; - version = "0.8.2"; - - src = fetchurl { - url = "http://repetae.net/dist/${name}.tar.gz"; - sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz"; - }; - - buildInputs = [ perl ghc ]; - - preConfigure = '' - configureFlagsArray+=("CC=cc") - configureFlagsArray+=("--with-hsc2hs=${ghc}/bin/hsc2hs --cc=cc") - ''; - - meta = { - description = "Whole-program, globally optimizing Haskell compiler"; - homepage = http://repetae.net/computer/jhc/; - license = stdenv.lib.licenses.bsd3; - platforms = ["x86_64-linux"]; # 32 bit builds are broken - maintainers = with stdenv.lib.maintainers; [ aforemny thoughtpolice ]; - broken = true; # https://hydra.nixos.org/build/61700723 - }; -} diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index cc19f7afe34722e1200b63face5f2d9015fe2946..839e3e71e811ee02addef450953953a2986125e8 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,15 +1,16 @@ { stdenv, lib, fetchFromGitHub, emscripten }: -let version = "0.9.4"; in +let version = "0.10.0"; in stdenv.mkDerivation { name = "jsonnet-${version}"; + version = version; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "1bh9x8d3mxnic31b6gh4drn5l6qpyqfgsn2l48sv0jknhinm1a7l"; + sha256 = "0xj540140r89qrdh3h4kzlz4x8c576ynq9i1x82zzl3d7fxbk5f0"; }; buildInputs = [ emscripten ]; diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index 1ce60d40716d0e6a4865a5e02540aeaf10753714..cff6c1c446f1403602a2217e9a310a924dd1506b 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -42,7 +42,7 @@ let rmathVersion = "0.1"; rmath-julia = fetchurl { url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; }; virtualenvVersion = "15.0.0"; @@ -160,7 +160,6 @@ stdenv.mkDerivation rec { # Julia's tests require read/write access to $HOME preCheck = '' export HOME="$NIX_BUILD_TOP" - set ''; preBuild = '' diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix index 99e6f8efff1028050cab23e71ebaf422877ee8ae..6fad8e5259c595028ffb1fc8d2adfe0ee718cfd6 100644 --- a/pkgs/development/compilers/julia/0.6.nix +++ b/pkgs/development/compilers/julia/0.6.nix @@ -33,16 +33,16 @@ let sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; }; - libuvVersion = "52d72a52cc7ccd570929990f010ed16e2ec604c8"; + libuvVersion = "d8ab1c6a33e77bf155facb54215dd8798e13825d"; libuv = fetchurl { url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = "1vldy94sfmlfqmi14126g590wi61fv78rzh7afk82zkipaixvak8"; + sha256 = "0q5ahc9dzca2yc6cjbhpfi9nwc4yhhjbgxgsychksn13d24gv7ba"; }; rmathVersion = "0.1"; rmath-julia = fetchurl { url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; }; virtualenvVersion = "15.0.0"; @@ -54,12 +54,12 @@ in stdenv.mkDerivation rec { pname = "julia"; - version = "0.6.0"; + version = "0.6.2"; name = "${pname}-${version}"; src = fetchzip { url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "19xk2cs43lnsy9y0d8wmxj7ich908ipb40vkf7xg9031x272brxw"; + sha256 = "0ym4n9vn6w8vj175mmsc2nzvdk2ij0cdrs44lkr3p0signji73b5"; }; prePatch = '' mkdir deps/srccache @@ -163,7 +163,6 @@ stdenv.mkDerivation rec { # Julia's tests require read/write access to $HOME preCheck = '' export HOME="$NIX_BUILD_TOP" - set ''; preBuild = '' @@ -173,10 +172,14 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for prog in "$out/bin/julia" "$out/bin/julia-debug"; do - wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, + # as using a wrapper with LD_LIBRARY_PATH causes segmentation + # faults when program returns an error: + # $ julia -e 'throw(Error())' + find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do + if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then + ln -sv $lib $out/lib/julia/$(basename $lib) + fi done ''; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 63252084b5ded83b10bc74e62a6bdf3edd7c4ff7..b5a3a8c6be2d2464d08435ad505d7df723be5160 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -42,7 +42,7 @@ let rmathVersion = "0.1"; rmath-julia = fetchurl { url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; }; in @@ -164,6 +164,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isi686; + #broken = stdenv.isi686; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index cfddb862f59ae40081f47ed6b4037237cf671a59..4b9a369e8d25158aa6f4139150f475919ffa7730 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -40,7 +40,7 @@ let rmathVersion = "0.1"; rmath-julia = fetchurl { url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; }; virtualenvVersion = "15.0.0"; @@ -175,6 +175,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isi686; + broken = true; # since 2017-04-08. }; } diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9800b33e7a9eaade54b91c1f64f9c154d38a911f --- /dev/null +++ b/pkgs/development/compilers/jwasm/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub +, cmake }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "jwasm-${version}"; + version = "git-2017-11-22"; + + src = fetchFromGitHub { + owner = "JWasm"; + repo = "JWasm"; + rev = "26f97c8b5c9d9341ec45538701116fa3649b7766"; + sha256 = "0m972pc8vk8s9yv1pi85fsjgm6hj24gab7nalw2q04l0359nqi7w"; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = "mkdir -p $out/bin ; cp jwasm $out/bin/"; + + meta = { + description = "A MASM-compatible x86 assembler"; + homepage = http://jwasm.github.io/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.darwin ++ platforms.linux; + }; +} diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 8f2bbefc2bc704c1fa511bebece73778d64f3cb8..d5ce240b4a5fe3eccc74c6d44f16f5088ef868f5 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.1.60"; - release = "55"; + version = "1.2.40"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { - url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}-release-${release}.zip"; - sha256 = "04vlhpc92pg0bcgapd5w2b3039sgv52km8i0m4mc5yf0ik6hx1s9"; + url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; + sha256 = "0n4na0ddnjgc573szk5bpd34v5gib71pah62xq7vwdf34q8mg61l"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 5c283dd4380c572f5c96345677a251a24eb12915..1fd839180c565cf97c307e0868ebc3fd3f0aa748 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,103 +1,256 @@ -{ stdenv, fetchFromGitHub, cmake, llvm, dmd, curl, tzdata, python, - lit, gdb, unzip, darwin }: +{ stdenv, fetchgit, fetchurl, cmake, llvm, curl, tzdata +, python, libconfig, lit, gdb, unzip, darwin, bash +, callPackage +, bootstrapVersion ? false +, version ? "1.8.0" +, ldcSha256 ? "0zswjlibj8zcdj06nn09jjhbd99chsa5f4kps8xifzgrpgsa28g4" +}: -stdenv.mkDerivation rec { - name = "ldc-${version}"; - version = "1.3.0"; - - srcs = [ - (fetchFromGitHub { - owner = "ldc-developers"; - repo = "ldc"; - rev = "v${version}"; - sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl"; - name = "ldc-v${version}-src"; - }) - (fetchFromGitHub { - owner = "ldc-developers"; - repo = "druntime"; - rev = "ldc-v${version}"; - sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30"; - name = "druntime-ldc-v${version}-src"; - }) - (fetchFromGitHub { - owner = "ldc-developers"; - repo = "phobos"; - rev = "ldc-v${version}"; - sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g"; - name = "phobos-ldc-v${version}-src"; - }) - (fetchFromGitHub { - owner = "ldc-developers"; - repo = "dmd-testsuite"; - rev = "ldc-v${version}"; - sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj"; - name = "dmd-testsuite-ldc-v${version}-src"; - }) - ]; - - sourceRoot = "."; - - postUnpack = '' - mv ldc-v${version}-src/* . - - mv druntime-ldc-v${version}-src/* runtime/druntime - - mv phobos-ldc-v${version}-src/* runtime/phobos - - mv dmd-testsuite-ldc-v${version}-src/* tests/d2/dmd-testsuite - - # Remove cppa test for now because it doesn't work. - rm tests/d2/dmd-testsuite/runnable/cppa.d - rm tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp - ''; +let - postPatch = '' - substituteInPlace runtime/phobos/std/net/curl.d \ - --replace libcurl.so ${curl.out}/lib/libcurl.so + bootstrapLdc = if !bootstrapVersion then + # LDC 0.17.x is the last version which doesn't need a working D compiler to + # build so we use that version to bootstrap the actual build. + callPackage ./default.nix { + bootstrapVersion = true; + version = "0.17.5"; + ldcSha256 = "0200r5y8hs5yv2cx24csgyh00dlg18877b9cfblixypr6nhl19bs"; + } + else + ""; - # Ugly hack to fix the hardcoded path to zoneinfo in the source file. - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace runtime/phobos/std/datetime.d \ - --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ - '' + ldcBuild = stdenv.mkDerivation rec { + name = "ldcBuild-${version}"; - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace driver/tool.cpp \ - --replace "gcc" "clang" - ''; + enableParallelBuilding = true; - nativeBuildInputs = [ cmake llvm dmd python lit gdb unzip ] + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); + postUnpack = '' + patchShebangs . - buildInputs = [ curl tzdata stdenv.cc ]; + # Remove cppa test for now because it doesn't work. + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp + '' - preConfigure = '' - cmakeFlagsArray=("-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc") - ''; + + stdenv.lib.optionalString (bootstrapVersion) '' + # ... runnable/variadic.d () + #Test failed. The logged output: + #/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/bin/ldmd2 -conf= -m64 -Irunnable -od/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/dmd-testsuite/runnable -of/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/dmd-testsuite/runnable/variadic_0 runnable/variadic.d + #Error: integer constant expression expected instead of + #Error: integer constant expression expected instead of + #Error: integer constant expression expected instead of + #Error: integer constant expression expected instead of + #Error: integer constant expression expected instead of + #runnable/variadic.d(84): Error: template instance variadic.Foo3!(int, int, int) error instantiating + # + # + #============================== + #Test failed: expected rc == 0, exited with rc == 1 + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/variadic.d + '' - postConfigure = '' - export DMD=$PWD/bin/ldc2 - ''; + + stdenv.lib.optionalString (!bootstrapVersion) '' + # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org + rm -r ldc-${version}-src/tests/dynamiccompile - makeFlags = [ "DMD=$DMD" ]; + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + ''; - # disable check phase because some tests are not working with sandboxing - doCheck = false; + ROOT_HOME_DIR = "$(echo ~root)"; - checkPhase = '' - ctest -j $NIX_BUILD_CORES -V DMD=$DMD - ''; + datetimePath = if bootstrapVersion then + "phobos/std/datetime.d" + else + "phobos/std/datetime/timezone.d"; + + postPatch = '' + substituteInPlace runtime/${datetimePath} \ + --replace "import core.time;" "import core.time;import std.path;" + + substituteInPlace runtime/${datetimePath} \ + --replace "tzName == \"leapseconds\"" "baseName(tzName) == \"leapseconds\"" + + substituteInPlace runtime/phobos/std/net/curl.d \ + --replace libcurl.so ${curl.out}/lib/libcurl.so + + # Ugly hack to fix the hardcoded path to zoneinfo in the source file. + # https://issues.dlang.org/show_bug.cgi?id=15391 + substituteInPlace runtime/${datetimePath} \ + --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/ + + substituteInPlace tests/d2/dmd-testsuite/Makefile \ + --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' + + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + # See https://github.com/NixOS/nixpkgs/issues/29443 + substituteInPlace runtime/phobos/std/path.d \ + --replace "\"/root" "\"${ROOT_HOME_DIR}" + + # Can be remove with front end version >= 2.078.0 + substituteInPlace runtime/druntime/src/core/memory.d \ + --replace "assert(z is null);" "//assert(z is null);" + '' + + + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # https://github.com/ldc-developers/ldc/pull/2306 + # Can be removed on bootstrap version > 0.17.5 + substituteInPlace gen/programs.cpp \ + --replace "gcc" "clang" + + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan + '' + + + stdenv.lib.optionalString (!bootstrapVersion) '' + # TODO Can be removed with the next ldc version > 1.7.0 + # https://github.com/ldc-developers/ldc/issues/2493 + substituteInPlace tests/d2/dmd-testsuite/Makefile \ + --replace "# disable tests based on arch" "DISABLED_TESTS += test_cdvecfill" + '' + + + stdenv.lib.optionalString (bootstrapVersion) '' + substituteInPlace runtime/${datetimePath} \ + --replace "import std.traits;" "import std.traits;import std.path;" + + substituteInPlace runtime/${datetimePath} \ + --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\"" + ''; + + nativeBuildInputs = [ cmake llvm bootstrapLdc python lit gdb unzip ] + + ++ stdenv.lib.optional (bootstrapVersion) [ + libconfig + ] + + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + + + buildInputs = [ curl tzdata stdenv.cc ]; + + preConfigure = '' + cmakeFlagsArray=("-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_SKIP_RPATH=ON" + "-DBUILD_SHARED_LIBS=OFF" + "-DLDC_WITH_LLD=OFF" + # Xcode 9.0.1 fixes that bug according to ldc release notes + "-DRT_ARCHIVE_WITH_LDC=OFF" + ) + ''; + + + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; - meta = with stdenv.lib; { - description = "The LLVM-based D compiler"; - homepage = https://github.com/ldc-developers/ldc; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader ]; - platforms = platforms.unix; + makeFlags = [ "DMD=$DMD" ]; + + doCheck = true; + + checkPhase = '' + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + # Run LIT testsuite. + ctest -V -R "lit-tests" + # Run DMD testsuite. + DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite" + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = https://github.com/ldc-developers/ldc; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; }; + + # Need to test Phobos in a fixed-output derivation, otherwise the + # network stuff in Phobos would fail if sandbox mode is enabled. + ldcUnittests = stdenv.mkDerivation rec { + name = "ldcUnittests-${version}"; + + enableParallelBuilding = ldcBuild.enableParallelBuilding; + preferLocalBuild = true; + inputString = ldcBuild.outPath; + outputHashAlgo = "sha256"; + outputHash = builtins.hashString "sha256" inputString; + + src = ldcBuild.src; + + postUnpack = ldcBuild.postUnpack; + + postPatch = ldcBuild.postPatch; + + nativeBuildInputs = ldcBuild.nativeBuildInputs + + ++ [ + ldcBuild + ]; + + buildInputs = ldcBuild.buildInputs; + + preConfigure = '' + cmakeFlagsArray=( "-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_SKIP_RPATH=ON" + "-DBUILD_SHARED_LIBS=OFF" + "-DLDC_WITH_LLD=OFF" + # Xcode 9.0.1 fixes that bug according to ldc release notes + "-DRT_ARCHIVE_WITH_LDC=OFF" + "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2" + ) + ''; + + postConfigure = ldcBuild.postConfigure; + + makeFlags = ldcBuild.makeFlags; + + buildCmd = if bootstrapVersion then + "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" + else + "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug"; + + testCmd = if bootstrapVersion then + "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" + else + "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\""; + + buildPhase = '' + ${buildCmd} + ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2 + ${testCmd} + ''; + + installPhase = '' + echo -n $inputString > $out + ''; + }; + +in + +stdenv.mkDerivation rec { + inherit ldcUnittests; + name = "ldc-${version}"; + phases = "installPhase"; + buildInputs = ldcBuild.buildInputs; + + installPhase = '' + mkdir $out + cp -r --symbolic-link ${ldcBuild}/* $out/ + ''; + + meta = ldcBuild.meta; } + diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 741ecc3856f8e00c34114b166e7e0d6532e86bc3..10510c75035469761c269caa5cf278c5093ba4f8 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation { # GCC_INSTALL_PREFIX points here, so just use it even though it may not # actually be a gcc gcc = stdenv.cc.cc; + hardeningUnsupportedFlags = [ "stackprotector" ]; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 6e7ef22392b1ad5912be59f0ad8fe4e439461fa7..0b29b04825a10ff80324a380ce57879950a3c487 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -6,7 +6,7 @@ , cmake , python2 , libffi -, binutils +, libbfd , libxml2 , valgrind , ncurses @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_REQUIRES_RTTI=1" - "-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON"; @@ -90,6 +90,6 @@ in stdenv.mkDerivation rec { homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; - platforms = stdenv.lib.platforms.all; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; }; } diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 26144e38619f836de2b673ebcd6e00a759dceb76..7dc134b4fcfd2943838e0223813df6867207fba3 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -6,7 +6,7 @@ , cmake , python , libffi -, binutils +, libbfd , libxml2 , valgrind , ncurses @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; - platforms = stdenv.lib.platforms.all; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; }; } diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 432443e1a89a18908773fb4b72bdde57464876de..5cac04c044de6430ec8f4a4a3b3050dc7358e4c2 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -30,29 +30,25 @@ let libstdcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index 54ab8c10877384b97ad10a4791998ab9c98c012b..1654914ff8c4ca52a29bc20dafac1bd9a3e280bd 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -6,7 +6,7 @@ , cmake , python2 , libffi -, binutils +, libbfd , libxml2 , valgrind , ncurses @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 90b8ea2581e8442ee045bd3a08c53696b4beec5f..0147485dd58da0d4884b2bc764b932d802eb0847 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -29,7 +29,7 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp ''; - outputs = [ "out" "python" ]; + outputs = [ "out" "lib" "python" ]; # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix @@ -38,6 +38,11 @@ let ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/share/clang/cmake/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." + 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 @@ -51,7 +56,6 @@ let enableParallelBuilding = true; passthru = { - lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 453d2c1f04b479789f42f5a31fe0b109594fbf5a..9e37f93dbddc4c0be40adc49777f4a3a5bfa9ad3 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -22,34 +22,32 @@ let inherit clang-tools-extra_src stdenv; }; + libclang = self.clang-unwrapped.lib; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; libstdcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index a0fbdf2b706a4ba4cedb26c21000553705ffa7d6..0f259977f702d74d15b0677cdc64640176d5777d 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -6,7 +6,7 @@ , cmake , python , libffi -, binutils +, libbfd , libxml2 , valgrind , ncurses @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index ec2ec27df363d3d02c16bc02691f6aa7df1f6c82..aafe30e4c9b3c36d5dc73bc52bb74e86f11b3b25 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -31,7 +31,7 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp ''; - outputs = [ "out" "python" ]; + outputs = [ "out" "lib" "python" ]; # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix @@ -40,6 +40,11 @@ let ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." + 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 @@ -53,7 +58,6 @@ let enableParallelBuilding = true; passthru = { - lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index 755b417c78d4da97cafc8f9ebd79f3a9bb971c23..a675bcceb1c989bc0e90d3b55bab08312874a923 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -22,34 +22,32 @@ let inherit clang-tools-extra_src stdenv; }; + libclang = self.clang-unwrapped.lib; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; libstdcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 495f95a5bbdbcec6a5ad374bc1eb5167edbc17f6..f80201167505f6835cbc8d4b35360f7c27a3d5b4 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -6,7 +6,7 @@ , cmake , python , libffi -, binutils +, libbfd , libxml2 , valgrind , ncurses @@ -123,7 +123,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 8d40ee3c8aa25c98cbdb9dda9781c5eb18311a63..5531fd2ab77e40cb5b41a7d62de0238eb906ca30 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -5,7 +5,7 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { + self = stdenv.mkDerivation ({ name = "clang-${version}"; unpackPhase = '' @@ -37,20 +37,17 @@ let 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 + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp ''; - outputs = [ "out" "python" ] - ++ stdenv.lib.optional enableManpages "man"; + outputs = [ "out" "lib" "python" ]; # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix @@ -59,27 +56,23 @@ let ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ ln -sv $out/bin/clang $out/bin/cpp + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." + 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; passthru = { - lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { @@ -92,5 +85,23 @@ let license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; - }; + } // stdenv.lib.optionalAttrs enableManpages { + name = "clang-manpages-${version}"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man page for Clang ${version}"; + }); in self diff --git a/pkgs/development/compilers/llvm/4/cmdline-help.patch b/pkgs/development/compilers/llvm/4/cmdline-help.patch new file mode 100644 index 0000000000000000000000000000000000000000..a693719c2cfa1bac108d1355f392fd8098ca9822 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/cmdline-help.patch @@ -0,0 +1,39 @@ +From c7a9aa3a697c81432786a5583bf973771c7be15e Mon Sep 17 00:00:00 2001 +From: Don Hinton +Date: Wed, 12 Jul 2017 01:15:46 +0000 +Subject: [PATCH] Fix minor typo introduced in r276404 + +Summary: +A space was added between '-' and 'help' when emitting help output. + +See https://reviews.llvm.org/D22621 for details. + +Reviewers: MaggieYi, vsk + +Reviewed By: vsk + +Subscribers: llvm-commits + +Differential Revision: https://reviews.llvm.org/D35283 + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307745 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/Support/CommandLine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp +index 3889902eea5..79defa5c36c 100644 +--- a/lib/Support/CommandLine.cpp ++++ b/lib/Support/CommandLine.cpp +@@ -1236,7 +1236,7 @@ bool CommandLineParser::ParseCommandLineOptions(int argc, + << ": Not enough positional command line arguments specified!\n" + << "Must specify at least " << NumPositionalRequired + << " positional argument" << (NumPositionalRequired > 1 ? "s" : "") +- << ": See: " << argv[0] << " - help\n"; ++ << ": See: " << argv[0] << " -help\n"; + } + + ErrorParsing = true; +-- +2.14.0 + diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 25bb008567f7a06195b6cbcd567221f518ef6b4a..562f9e3457dd48cc12bb2fa856e6db467b0bbb17 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -20,7 +20,7 @@ let # 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"];*/ }; + drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; llvm = callPackage ./llvm.nix { inherit compiler-rt_src stdenv; @@ -34,6 +34,7 @@ let llvm = overrideManOutput llvm; clang-unwrapped = overrideManOutput clang-unwrapped; + libclang = self.clang-unwrapped.lib; llvm-manpages = lowPrio self.llvm.man; clang-manpages = lowPrio self.clang-unwrapped.man; @@ -42,29 +43,25 @@ let libstdcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch b/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch new file mode 100644 index 0000000000000000000000000000000000000000..d5d7f07b5e113a76ce217013566ace25809a64f9 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch @@ -0,0 +1,33 @@ +From d12ecb83d01dcb580dd94f4d57828f33d3eb4c35 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Thu, 18 Feb 2016 15:33:21 +0100 +Subject: [PATCH 3/3] Fix DynamicLibrary to build with musl libc + +stdin/out/err is part of the libc and not the kernel so we check for the +specific libc that does the unexpected instead of linux. + +This is needed for making it build with musl libc. +--- + lib/Support/DynamicLibrary.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp +index 9a7aeb5..0c1c8f8 100644 +--- a/lib/Support/DynamicLibrary.cpp ++++ b/lib/Support/DynamicLibrary.cpp +@@ -140,10 +140,10 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { + #define EXPLICIT_SYMBOL(SYM) \ + if (!strcmp(symbolName, #SYM)) return &SYM + +-// On linux we have a weird situation. The stderr/out/in symbols are both ++// On GNU libc we have a weird situation. The stderr/out/in symbols are both + // macros and global variables because of standards requirements. So, we + // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first. +-#if defined(__linux__) and !defined(__ANDROID__) ++#if defined(__GLIBC__) + { + EXPLICIT_SYMBOL(stderr); + EXPLICIT_SYMBOL(stdout); +-- +2.7.3 + diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index db751bcffd424d8dc43cefb0a1681bfd61fd44cb..f28957c351856c8617dbb03a12847331e7cf9e2d 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { ./pthread_mach_thread_np.patch # glibc 2.26 fix ./xlocale-glibc-2.26.patch + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ./max_align_t.patch ]; prePatch = '' @@ -24,9 +27,10 @@ stdenv.mkDerivation rec { 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") + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py ''; - - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -34,7 +38,7 @@ stdenv.mkDerivation rec { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch b/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch new file mode 100644 index 0000000000000000000000000000000000000000..060be5b23de82bd4b4dce16243a9786a7a13ed97 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch @@ -0,0 +1,54 @@ +From 917331c88bd2afce0cf0fdbcab55a64541b5bcf0 Mon Sep 17 00:00:00 2001 +From: "David L. Jones" +Date: Fri, 10 Feb 2017 01:27:42 +0000 +Subject: [PATCH] Check for musl-libc's max_align_t in addition to other + variants. + +Summary: +Libcxx will define its own max_align_t when it is not available. However, the +availability checks today only check for Clang's definition and GCC's +definition. In particular, it does not check for musl's definition, which is the +same as GCC's but guarded with a different macro. + +Reviewers: mclow.lists, EricWF + +Reviewed By: EricWF + +Subscribers: chandlerc, cfe-commits + +Differential Revision: https://reviews.llvm.org/D28478 + +git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@294683 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + include/cstddef | 3 ++- + include/stddef.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/cstddef b/include/cstddef +index edd106c00..103898b7d 100644 +--- a/include/cstddef ++++ b/include/cstddef +@@ -48,7 +48,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD + using ::ptrdiff_t; + using ::size_t; + +-#if defined(__CLANG_MAX_ALIGN_T_DEFINED) || defined(_GCC_MAX_ALIGN_T) ++#if defined(__CLANG_MAX_ALIGN_T_DEFINED) || defined(_GCC_MAX_ALIGN_T) || \ ++ defined(__DEFINED_max_align_t) + // Re-use the compiler's max_align_t where possible. + using ::max_align_t; + #else +diff --git a/include/stddef.h b/include/stddef.h +index 8841bbea2..faf8552d8 100644 +--- a/include/stddef.h ++++ b/include/stddef.h +@@ -53,7 +53,8 @@ using std::nullptr_t; + } + + // Re-use the compiler's max_align_t where possible. +-#if !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T) ++#if !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T) && \ ++ !defined(__DEFINED_max_align_t) + typedef long double max_align_t; + #endif + diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 6a3d91101360b18b7d10e0b121034540af6ba6f7..41eb40e124eb022250f68e09c20dfb1698e734ee 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation { export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${./libc++/max_align_t.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 7d33179913be9edfe70aca5a51d28f0145fb659d..325149fc19be6785d806def21dcb817bb77ac6a4 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -41,8 +41,18 @@ stdenv.mkDerivation { "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ]; + # Add missing include to fix error when using std::bind + prePatch = '' + sed -i -e '30i#include ' include/lldb/Utility/TaskPool.h + ''; + enableParallelBuilding = true; + postInstall = '' + mkdir -p $out/share/man/man1 + cp ../docs/lldb.1 $out/share/man/man1/ + ''; + meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 332fee8529ba8177ab3666eacbbfdb1fb36ccc91..bc8453f743adef2cdc5ab7e7cd7529f44b5978f2 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -1,12 +1,10 @@ { stdenv , fetch , fetchpatch -, perl -, groff , cmake , python , libffi -, binutils +, libbfd , libxml2 , valgrind , ncurses @@ -27,7 +25,7 @@ let # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; concatStringsSep "." (take 2 (splitString "." release_version)); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (rec { name = "llvm-${version}"; unpackPhase = '' @@ -39,10 +37,9 @@ in stdenv.mkDerivation rec { ''; outputs = [ "out" ] - ++ stdenv.lib.optional enableSharedLibraries "lib" - ++ stdenv.lib.optional enableManpages "man"; + ++ stdenv.lib.optional enableSharedLibraries "lib"; - nativeBuildInputs = [ perl groff cmake python ] + nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libxml2 libffi ] @@ -68,7 +65,7 @@ in stdenv.mkDerivation rec { substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib patch -p1 < ./llvm-outputs.patch '' - + stdenv.lib.optionalString (stdenv ? glibc) '' + + '' ( cd projects/compiler-rt patch -p1 < ${ @@ -81,6 +78,15 @@ in stdenv.mkDerivation rec { substituteInPlace lib/esan/esan_sideline_linux.cpp \ --replace 'struct sigaltstack' 'stack_t' ) + '' + # Fix extra space printed in commandline help sometimes, "- help" + '' + patch -p1 -i ${./cmdline-help.patch} + '' + stdenv.lib.optionalString stdenv.isAarch64 '' + patch -p0 < ${../aarch64.patch} + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../TLI-musl.patch} + patch -p1 -i ${./dynamiclibrary-musl.patch} + patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; # hacky fix: created binaries need to be run before installation @@ -107,10 +113,15 @@ in stdenv.mkDerivation rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ]; postBuild = '' @@ -127,10 +138,7 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ''; - postInstall = stdenv.lib.optionalString enableManpages '' - moveToOutput "share/man" "$man" - '' - + stdenv.lib.optionalString enableSharedLibraries '' + postInstall = stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ @@ -158,4 +166,22 @@ in stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; platforms = stdenv.lib.platforms.all; }; -} +} // stdenv.lib.optionalAttrs enableManpages { + name = "llvm-manpages-${version}"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = [ ]; + + installPhase = '' + make -C docs install + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man pages for LLVM ${version}"; +}) diff --git a/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch new file mode 100644 index 0000000000000000000000000000000000000000..5bd858f8ae79c2856db251cd6086f72ddc110099 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch @@ -0,0 +1,368 @@ +From dac4d3912378069b44340204e5fc6237aa1baf94 Mon Sep 17 00:00:00 2001 +From: Matthias Maier +Date: Fri, 5 May 2017 17:47:39 +0000 +Subject: [PATCH] Musl patches + +Ported to compiler-rt-sanitizers-4.0.0. Taken from + + https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch +--- + lib/asan/asan_linux.cc | 4 +-- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 2 +- + lib/msan/msan_linux.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +-- + lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux_libcdep.cc | 12 +++---- + lib/sanitizer_common/sanitizer_platform.h | 7 ++++ + .../sanitizer_platform_interceptors.h | 2 +- + .../sanitizer_platform_limits_posix.cc | 39 +++++++++++++--------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 11 files changed, 46 insertions(+), 32 deletions(-) + +diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc +index c051573dd..e295f6004 100644 +--- a/lib/asan/asan_linux.cc ++++ b/lib/asan/asan_linux.cc +@@ -39,7 +39,7 @@ + #include + #endif + +-#if SANITIZER_ANDROID || SANITIZER_FREEBSD ++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU + #include + extern "C" void* _DYNAMIC; + #else +@@ -80,7 +80,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { + UNIMPLEMENTED(); + } + +-#if SANITIZER_ANDROID ++#if SANITIZER_ANDROID || SANITIZER_NONGNU + // FIXME: should we do anything for Android? + void AsanCheckDynamicRTPrereqs() {} + void AsanCheckIncompatibleRT() {} +diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc +index 6e908ac01..8f23d9adc 100644 +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + return real == wrapper; + } + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } +diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h +index 27a66c882..3b559a303 100644 +--- a/lib/interception/interception_linux.h ++++ b/lib/interception/interception_linux.h +@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); + (::__interception::uptr) & (func), \ + (::__interception::uptr) & WRAP(func)) + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym + #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) +diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc +index 0a687f620..0852d97d7 100644 +--- a/lib/msan/msan_linux.cc ++++ b/lib/msan/msan_linux.cc +@@ -13,7 +13,7 @@ + //===----------------------------------------------------------------------===// + + #include "sanitizer_common/sanitizer_platform.h" +-#if SANITIZER_FREEBSD || SANITIZER_LINUX ++#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU + + #include "msan.h" + #include "msan_thread.h" +diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 4ed9afedf..64f584e93 100644 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -100,7 +100,7 @@ static void ioctl_table_fill() { + _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + // Conflicting request ids. + // _(CDROMAUDIOBUFSIZ, NONE, 0); + // _(SNDCTL_TMR_CONTINUE, NONE, 0); +@@ -361,7 +361,7 @@ static void ioctl_table_fill() { + _(VT_WAITACTIVE, NONE, 0); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE + _(CYGETDEFTHRESH, WRITE, sizeof(int)); + _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc +index 469c8eb7e..24f87867d 100644 +--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc ++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc +@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { + } + } + +-#if !SANITIZER_ANDROID ++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU + PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, + void *old_rlim) { + if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +index f99f0b594..3a773a94e 100644 +--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -152,7 +152,7 @@ bool SanitizerGetThreadName(char *name, int max_len) { + #endif + } + +-#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO ++#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU + static uptr g_tls_size; + + #ifdef __i386__ +@@ -180,11 +180,11 @@ void InitTlsSize() { + } + #else + void InitTlsSize() { } +-#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO ++#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU + + #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \ + || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__)) \ +- && SANITIZER_LINUX && !SANITIZER_ANDROID ++ && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // sizeof(struct pthread) from glibc. + static atomic_uintptr_t kThreadDescriptorSize; + +@@ -338,7 +338,7 @@ uptr ThreadSelf() { + + #if !SANITIZER_GO + static void GetTls(uptr *addr, uptr *size) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) + *addr = ThreadSelf(); + *size = GetTlsSize(); +@@ -364,7 +364,7 @@ static void GetTls(uptr *addr, uptr *size) { + *addr = (uptr) dtv[2]; + *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]); + } +-#elif SANITIZER_ANDROID ++#elif SANITIZER_ANDROID || SANITIZER_NONGNU + *addr = 0; + *size = 0; + #else +@@ -375,7 +375,7 @@ static void GetTls(uptr *addr, uptr *size) { + + #if !SANITIZER_GO + uptr GetTlsSize() { +-#if SANITIZER_FREEBSD || SANITIZER_ANDROID ++#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU + uptr addr, size; + GetTls(&addr, &size); + return size; +diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h +index d9a8e8df1..fe01c5744 100644 +--- a/lib/sanitizer_common/sanitizer_platform.h ++++ b/lib/sanitizer_common/sanitizer_platform.h +@@ -162,6 +162,13 @@ + # define SANITIZER_PPC64V2 0 + #endif + ++ ++#if defined(__linux__) && !defined(__GLIBC__) ++# define SANITIZER_NONGNU 1 ++#else ++# define SANITIZER_NONGNU 0 ++#endif ++ + // By default we allow to use SizeClassAllocator64 on 64-bit platform. + // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64 + // does not work well and we need to fallback to SizeClassAllocator32. +diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h +index 62875d11a..212e6e882 100644 +--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -23,7 +23,7 @@ + # define SI_NOT_WINDOWS 0 + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # define SI_LINUX_NOT_ANDROID 1 + #else + # define SI_LINUX_NOT_ANDROID 0 +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 683f019d7..fd4880962 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -14,6 +14,8 @@ + + #include "sanitizer_platform.h" + ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -139,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include +-#include ++# if !SANITIZER_NONGNU ++# include ++# endif + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #if HAVE_RPC_XDR_H + # include + #elif HAVE_TIRPC_RPC_XDR_H +@@ -160,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include ++// #include ++#include + #include + #include + #include +@@ -252,7 +257,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ustat_sz = sizeof(struct ustat); + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); +@@ -310,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -404,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -454,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -822,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -985,7 +990,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1019,6 +1024,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1032,6 +1038,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); + CHECK_SIZE_AND_OFFSET(dirent, d_ino); +@@ -1134,7 +1141,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1195,7 +1202,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1245,7 +1252,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1264,7 +1271,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index 3313288a7..103c7b6b9 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -287,7 +287,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + __res_state *statp = (__res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.16.2 + diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index fa8502ebd67aa6a9d4a5d74028572e9f6a29eb34..b5aea54b5771575f04ad147f3e555e618fd83d6b 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -5,11 +5,11 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { + self = stdenv.mkDerivation ({ name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "0w09s8fn3lkn6i04nj0cisgp821r815fk5b5fjn97xrd371277q1"} + unpackFile ${fetch "cfe" "1zyh4dggxd55lnfg73c8fybnkssqcaa6bq2h4bzimnnj1jdnqpqk"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} @@ -37,10 +37,6 @@ let patches = [ ./purity.patch ]; - postBuild = stdenv.lib.optionalString enableManpages '' - cmake --build . --target docs-clang-man - ''; - postPatch = '' sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ @@ -48,10 +44,11 @@ let # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; - outputs = [ "out" "python" ] - ++ stdenv.lib.optional enableManpages "man"; + outputs = [ "out" "lib" "python" ]; # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix @@ -60,27 +57,23 @@ let ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ ln -sv $out/bin/clang $out/bin/cpp + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." + 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; passthru = { - lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { @@ -93,5 +86,23 @@ let license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; - }; + } // stdenv.lib.optionalAttrs enableManpages { + name = "clang-manpages-${version}"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man page for Clang ${version}"; + }); in self diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 1d5cc0e504b71951989742764a400f021541037d..13e1d2308f8c65ef866caaea3e687ca63a91c2aa 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -6,7 +6,7 @@ let callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); - release_version = "5.0.0"; + release_version = "5.0.1"; version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -14,13 +14,13 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "1cy0y389zxn7mk8vffqvfirk9bbcbc8ziwc1nf1a8d118rk55bfm"; - clang-tools-extra_src = fetch "clang-tools-extra" "1ikkv6k8cfgpjqlm24iqz52i5nyafzsc4dyikzzyb9n4b6wpil47"; + compiler-rt_src = fetch "compiler-rt" "1nlmm0b3wpdwxkldqp1klzv3rpqf94q2a248xgqb7aapyhbi9paf"; + clang-tools-extra_src = fetch "clang-tools-extra" "09fjii7w43kvxvsxxs6gig9vz95vnvx1779rqd36h8kksvws3bcs"; # 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"];*/ }; + drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; llvm = callPackage ./llvm.nix { inherit compiler-rt_src stdenv; @@ -34,6 +34,7 @@ let llvm = overrideManOutput llvm; clang-unwrapped = overrideManOutput clang-unwrapped; + libclang = self.clang-unwrapped.lib; llvm-manpages = lowPrio self.llvm.man; clang-manpages = lowPrio self.clang-unwrapped.man; @@ -42,29 +43,25 @@ let libstdcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; /* FIXME is this right? */ - inherit (stdenv.cc) libc nativeTools nativeLibc; + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 036161f7b88992e7e75fc04142f8ea97072c236a..9ddeea7ef79a6c7400b4d5fc3733f38669504202 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,15 +1,21 @@ -{ lib, stdenv, fetch, cmake, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1cf953msb0vwgjjrapw06950dnsdb2ps305czkn0vvr1k8g9irga"; + src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs"; postUnpack = '' unpackFile ${libcxxabi.src} export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; + # on next rebuild, this can be replaced with optionals; for now set to null to avoid + # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = if stdenv.hostPlatform.isMusl then [ + ../../libcxx-0001-musl-hacks.patch + ] else null; + prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" ''; @@ -17,9 +23,10 @@ stdenv.mkDerivation rec { 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") + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py ''; - - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -27,7 +34,7 @@ stdenv.mkDerivation rec { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 5a2a269345d64b46000dd51975cba788855ae9a1..6d27dcd47b0b921728ab5b81c29feb21fe1243dd 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "04c9dfmrr8diih73x0wq99dk9xb99mg0bvsnbhx5q912xg3ihs8p"; + src = fetch "libcxxabi" "0m78yr4arlz2b9m96xcygk15m2pbz8i10snk78i3q7pjnwn1a9as"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; @@ -14,6 +14,8 @@ stdenv.mkDerivation { export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index f19a9afc8044b8c4054053163c5b99efbb2665f6..1d00b16cce1f8fd8f88ce0730a121a781c5d1c96 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "15rqsmfw0jlsri7hszbs8l0j7v1030cy9xvvdb245397llh7k6ir"; + src = fetch "lld" "15fq2zvkliyiw5qi7ig2r8bshgbz4kzvs5in16mhfkw20l06rcym"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index fac23b290bcb9c44ca3d4e644f3a81e58705ee9d..559c52831cd24baafb204d332e49765851594c9b 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0zcbav39srf6awv9znvzr7nqdrj704i8da3wdgc8362y20rcm860"; + src = fetch "lldb" "0sipv8k37ai44m7jcf6wsbm2q41dgk3sk9m3i6823jkmg7kckhdp"; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place @@ -42,6 +42,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; + postInstall = '' + mkdir -p $out/share/man/man1 + cp ../docs/lldb.1 $out/share/man/man1/ + ''; + meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 011eab5678c1319e7fd9bb3b510cb2fd5d02cd44..ac575a0bf7aa536e6bf83fcb2dd574f680ff74ac 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -1,12 +1,10 @@ { stdenv , fetch , fetchpatch -, perl -, groff , cmake , python , libffi -, binutils +, libbfd , libxml2 , valgrind , ncurses @@ -22,12 +20,12 @@ }: let - src = fetch "llvm" "1nin64vz21hyng6jr19knxipvggaqlkl2l9jpd5czbc4c2pcnpg3"; + src = fetch "llvm" "1c07i0b61j69m578lgjkyayg419sh7sn40xb3j112nr2q2gli9sz"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; concatStringsSep "." (take 2 (splitString "." release_version)); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (rec { name = "llvm-${version}"; unpackPhase = '' @@ -38,11 +36,10 @@ in stdenv.mkDerivation rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; - outputs = [ "out" ] - ++ stdenv.lib.optional enableSharedLibraries "lib" - ++ stdenv.lib.optional enableManpages "man"; + outputs = [ "out" "python" ] + ++ stdenv.lib.optional enableSharedLibraries "lib"; - nativeBuildInputs = [ perl groff cmake python ] + nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libxml2 libffi ] @@ -75,6 +72,14 @@ in stdenv.mkDerivation rec { # Revert compiler-rt commit that makes codesign mandatory patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt + '' + stdenv.lib.optionalString stdenv.isAarch64 '' + patch -p0 < ${../aarch64.patch} + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; # hacky fix: created binaries need to be run before installation @@ -101,10 +106,15 @@ in stdenv.mkDerivation rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ]; postBuild = '' @@ -121,8 +131,9 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ''; - postInstall = stdenv.lib.optionalString enableManpages '' - moveToOutput "share/man" "$man" + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer '' + stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" @@ -152,4 +163,22 @@ in stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; platforms = stdenv.lib.platforms.all; }; -} +} // stdenv.lib.optionalAttrs enableManpages { + name = "llvm-manpages-${version}"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = []; + + installPhase = '' + make -C docs install + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man pages for LLVM ${version}"; +}) diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 9ba42eed2e2e517ececbea67949fbeb69470d68c..5a01c191b5aea5d424f3db14dc5f2378dc5d6897 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "openmp-${version}"; - src = fetch "openmp" "1igplg89bl6k6r9q88hnpcznq3g9lb79w7bix025lwp00ldhivy0"; + src = fetch "openmp" "0lr6r87xzg87w1q9rrh04nqpyr8c929dh4qy3csjiy7rsb6kbdmd"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch new file mode 100644 index 0000000000000000000000000000000000000000..c9ddfe45c898e1a4db93f859d6c9345eabdd0691 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch @@ -0,0 +1,370 @@ +From 3e1fcb7d4909db8f0f7dd0109b2eee20115c8be3 Mon Sep 17 00:00:00 2001 +From: "Jory A. Pratt" +Date: Sat, 9 Sep 2017 08:31:15 -0500 +Subject: [PATCH] Ported to compiler-rt-sanitizers-5.0.0. Taken from + +https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch +Signed-off-by: Jory A. Pratt + +Taken from gentoo-musl project, with a few additional minor fixes. +--- + lib/asan/asan_linux.cc | 4 +-- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 2 +- + lib/msan/msan_linux.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +-- + lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux_libcdep.cc | 12 +++---- + lib/sanitizer_common/sanitizer_platform.h | 7 ++++ + .../sanitizer_platform_interceptors.h | 2 +- + .../sanitizer_platform_limits_posix.cc | 40 +++++++++++++--------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 11 files changed, 47 insertions(+), 32 deletions(-) + +diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc +index 6d47ba432..c58dd4864 100644 +--- a/lib/asan/asan_linux.cc ++++ b/lib/asan/asan_linux.cc +@@ -39,7 +39,7 @@ + #include + #endif + +-#if SANITIZER_ANDROID || SANITIZER_FREEBSD ++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU + #include + extern "C" void* _DYNAMIC; + #else +@@ -86,7 +86,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { + UNIMPLEMENTED(); + } + +-#if SANITIZER_ANDROID ++#if SANITIZER_ANDROID || SANITIZER_NONGNU + // FIXME: should we do anything for Android? + void AsanCheckDynamicRTPrereqs() {} + void AsanCheckIncompatibleRT() {} +diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc +index 6e908ac01..76c1688ce 100644 +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + return real == wrapper; + } + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if !defined(__ANDROID__) && defined(__GLIBC__) // android does not have dlvsym + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } +diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h +index 27a66c882..f60c38991 100644 +--- a/lib/interception/interception_linux.h ++++ b/lib/interception/interception_linux.h +@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); + (::__interception::uptr) & (func), \ + (::__interception::uptr) & WRAP(func)) + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym + #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) +diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc +index 0a687f620..0852d97d7 100644 +--- a/lib/msan/msan_linux.cc ++++ b/lib/msan/msan_linux.cc +@@ -13,7 +13,7 @@ + //===----------------------------------------------------------------------===// + + #include "sanitizer_common/sanitizer_platform.h" +-#if SANITIZER_FREEBSD || SANITIZER_LINUX ++#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU + + #include "msan.h" + #include "msan_thread.h" +diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 4ed9afedf..64f584e93 100644 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -100,7 +100,7 @@ static void ioctl_table_fill() { + _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + // Conflicting request ids. + // _(CDROMAUDIOBUFSIZ, NONE, 0); + // _(SNDCTL_TMR_CONTINUE, NONE, 0); +@@ -361,7 +361,7 @@ static void ioctl_table_fill() { + _(VT_WAITACTIVE, NONE, 0); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE + _(CYGETDEFTHRESH, WRITE, sizeof(int)); + _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc +index 469c8eb7e..24f87867d 100644 +--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc ++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc +@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { + } + } + +-#if !SANITIZER_ANDROID ++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU + PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, + void *old_rlim) { + if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +index 52196db12..045d9331f 100644 +--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -148,7 +148,7 @@ bool SanitizerGetThreadName(char *name, int max_len) { + #endif + } + +-#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO ++#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU + static uptr g_tls_size; + + #ifdef __i386__ +@@ -176,11 +176,11 @@ void InitTlsSize() { + } + #else + void InitTlsSize() { } +-#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO ++#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU + + #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \ + || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \ +- || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID ++ || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // sizeof(struct pthread) from glibc. + static atomic_uintptr_t kThreadDescriptorSize; + +@@ -335,7 +335,7 @@ uptr ThreadSelf() { + + #if !SANITIZER_GO + static void GetTls(uptr *addr, uptr *size) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) + *addr = ThreadSelf(); + *size = GetTlsSize(); +@@ -362,7 +362,7 @@ static void GetTls(uptr *addr, uptr *size) { + *addr = (uptr) dtv[2]; + *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]); + } +-#elif SANITIZER_ANDROID ++#elif SANITIZER_ANDROID || SANITIZER_NONGNU + *addr = 0; + *size = 0; + #else +@@ -373,7 +373,7 @@ static void GetTls(uptr *addr, uptr *size) { + + #if !SANITIZER_GO + uptr GetTlsSize() { +-#if SANITIZER_FREEBSD || SANITIZER_ANDROID ++#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU + uptr addr, size; + GetTls(&addr, &size); + return size; +diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h +index 396f7c934..5af6f1ed5 100644 +--- a/lib/sanitizer_common/sanitizer_platform.h ++++ b/lib/sanitizer_common/sanitizer_platform.h +@@ -175,6 +175,13 @@ + # define SANITIZER_ARM 0 + #endif + ++ ++#if defined(__linux__) && !defined(__GLIBC__) ++# define SANITIZER_NONGNU 1 ++#else ++# define SANITIZER_NONGNU 0 ++#endif ++ + // By default we allow to use SizeClassAllocator64 on 64-bit platform. + // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64 + // does not work well and we need to fallback to SizeClassAllocator32. +diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h +index 0380cee92..0a39abbd0 100644 +--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -31,7 +31,7 @@ + # define SI_POSIX 0 + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # define SI_LINUX_NOT_ANDROID 1 + #else + # define SI_LINUX_NOT_ANDROID 0 +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 83f4fd22f..fa8c1b8bd 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -14,6 +14,9 @@ + + #include "sanitizer_platform.h" + ++// Workaround musl <--> linux conflicting definition of 'struct sysinfo' ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include +-#include ++# if !SANITIZER_NONGNU ++# include ++# endif + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #if HAVE_RPC_XDR_H + # include + #elif HAVE_TIRPC_RPC_XDR_H +@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include ++// #include ++#include + #include + #include + #include +@@ -251,7 +257,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ustat_sz = sizeof(struct ustat); + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); +@@ -309,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -403,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -453,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -821,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -976,7 +982,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1010,6 +1016,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1023,6 +1030,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); + CHECK_SIZE_AND_OFFSET(dirent, d_ino); +@@ -1125,7 +1133,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1186,7 +1194,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1236,7 +1244,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1255,7 +1263,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index ead1e5704..2c020e3fe 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -284,7 +284,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.16.2 + diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..919efdc8ef971d51a8d4a1495440bf107ce7431b --- /dev/null +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -0,0 +1,108 @@ +{ 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; + self = stdenv.mkDerivation ({ + name = "clang-${version}"; + + unpackPhase = '' + unpackFile ${fetch "cfe" "0cnznvfyl3hgbg8gj58pmwf0pvd2sv5k3ccbivy6q6ggv7c6szg0"} + mv cfe-${version}* clang + sourceRoot=$PWD/clang + unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + ''; + + 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"; + + patches = [ ./purity.patch ]; + + postPatch = '' + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.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 + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + ''; + + outputs = [ "out" "lib" "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/${release_version}/lib $out/lib/clang/${release_version}/ + ln -sv $out/bin/clang $out/bin/cpp + + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." + + 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; + + passthru = { + isClang = true; + inherit llvm; + } // stdenv.lib.optionalAttrs stdenv.isLinux { + inherit gcc; + }; + + meta = { + description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.ncsa; + platforms = stdenv.lib.platforms.all; + }; + } // stdenv.lib.optionalAttrs enableManpages { + name = "clang-manpages-${version}"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man page for Clang ${version}"; + }); +in self diff --git a/pkgs/development/compilers/llvm/6/clang/purity.patch b/pkgs/development/compilers/llvm/6/clang/purity.patch new file mode 100644 index 0000000000000000000000000000000000000000..b30d0d0b5d5b51aeef7062a1152fc378948e009b --- /dev/null +++ b/pkgs/development/compilers/llvm/6/clang/purity.patch @@ -0,0 +1,30 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + 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"); +-- +2.11.0 + diff --git a/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch new file mode 100644 index 0000000000000000000000000000000000000000..8f4c76bca1eba589fcc1b46725a74d24f12dd609 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch @@ -0,0 +1,155 @@ +From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 19 Sep 2017 13:13:06 -0500 +Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that + needs it + +--- + cmake/Modules/AddCompilerRT.cmake | 8 ------ + test/asan/CMakeLists.txt | 52 --------------------------------------- + test/tsan/CMakeLists.txt | 47 ----------------------------------- + 3 files changed, 107 deletions(-) + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index bc5fb9ff7..b64eb4246 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $ +- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- ) +- endif() + endif() + install(TARGETS ${libname} + ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} +diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt +index 8bfc15b5c..f23d0f71a 100644 +--- a/test/asan/CMakeLists.txt ++++ b/test/asan/CMakeLists.txt +@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH}) + endif() + endforeach() + +-# iOS and iOS simulator test suites +-# These are not added into "check-all", in order to run these tests, use +-# "check-asan-iossim-x86_64" and similar. They also require that an extra env +-# variable to select which iOS device or simulator to use, e.g.: +-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" +-if(APPLE) +- set(EXCLUDE_FROM_ALL ON) +- +- set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) +- set(ASAN_TEST_IOS "1") +- pythonize_bool(ASAN_TEST_IOS) +- set(ASAN_TEST_DYNAMIC True) +- +- foreach(arch ${DARWIN_iossim_ARCHS}) +- set(ASAN_TEST_IOSSIM "1") +- pythonize_bool(ASAN_TEST_IOSSIM) +- set(ASAN_TEST_TARGET_ARCH ${arch}) +- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") +- get_bits_for_arch(${arch} ASAN_TEST_BITS) +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${ASAN_TEST_DEPS}) +- endforeach() +- +- foreach (arch ${DARWIN_ios_ARCHS}) +- set(ASAN_TEST_IOSSIM "0") +- pythonize_bool(ASAN_TEST_IOSSIM) +- set(ASAN_TEST_TARGET_ARCH ${arch}) +- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios") +- get_bits_for_arch(${arch} ASAN_TEST_BITS) +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${ASAN_TEST_DEPS}) +- endforeach() +- +- set(EXCLUDE_FROM_ALL OFF) +-endif() +- + # Add unit tests. + if(COMPILER_RT_INCLUDE_TESTS) + set(ASAN_TEST_DYNAMIC False) +diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt +index a68908612..cde0accb5 100644 +--- a/test/tsan/CMakeLists.txt ++++ b/test/tsan/CMakeLists.txt +@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH}) + list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) + endforeach() + +-# iOS and iOS simulator test suites +-# These are not added into "check-all", in order to run these tests, use +-# "check-tsan-iossim-x86_64" and similar. They also require an extra environment +-# variable to select which iOS device or simulator to use, e.g.: +-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" +-if(APPLE) +- set(EXCLUDE_FROM_ALL ON) +- +- set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) +- set(TSAN_TEST_IOS "1") +- pythonize_bool(TSAN_TEST_IOS) +- +- set(arch "x86_64") +- set(TSAN_TEST_IOSSIM "1") +- pythonize_bool(TSAN_TEST_IOSSIM) +- set(TSAN_TEST_TARGET_ARCH ${arch}) +- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${TSAN_TEST_DEPS}) +- +- set(arch "arm64") +- set(TSAN_TEST_IOSSIM "0") +- pythonize_bool(TSAN_TEST_IOSSIM) +- set(TSAN_TEST_TARGET_ARCH ${arch}) +- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios") +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${TSAN_TEST_DEPS}) +- +- set(EXCLUDE_FROM_ALL OFF) +-endif() +- + if(COMPILER_RT_INCLUDE_TESTS) + configure_lit_site_cfg( + ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in +-- +2.14.1 + diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cfa9e9e15fcf1e42fcd20c933de4ef8478172ddc --- /dev/null +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -0,0 +1,78 @@ +{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, darwin +}: + +let + callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + + release_version = "6.0.0"; + version = release_version; # differentiating these is important for rc's + + fetch = name: sha256: fetchurl { + url = "http://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; + inherit sha256; + }; + + compiler-rt_src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h"; + clang-tools-extra_src = fetch "clang-tools-extra" "1ll9v6r29xfdiywbn9iss49ad39ah3fk91wiv0sr6k6k9i544fq5"; + + # Add man output without introducing extra dependencies. + overrideManOutput = drv: + let drv-manpages = drv.override { enableManpages = true; }; in + drv // { man = drv-manpages.out; /*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 = overrideManOutput llvm; + clang-unwrapped = overrideManOutput clang-unwrapped; + + libclang = self.clang-unwrapped.lib; + llvm-manpages = lowPrio self.llvm.man; + clang-manpages = lowPrio self.clang-unwrapped.man; + + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; + + libcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; + extraPackages = [ self.libcxx self.libcxxabi ]; + }; + + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + }); + + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + }); + + lld = callPackage ./lld.nix {}; + + lldb = callPackage ./lldb.nix {}; + + libcxx = callPackage ./libc++ {}; + + libcxxabi = callPackage ./libc++abi.nix {}; + + openmp = callPackage ./openmp.nix {}; + }; + +in self diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3c6c009a58fac4588ea301810e317fac14f4c2d3 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: + +stdenv.mkDerivation rec { + name = "libc++-${version}"; + + src = fetch "libcxx" "1n8d0iadkk9fdpplvxkdgrgh2szc6msrx1mpdjpmilz9pn3im4vh"; + + postUnpack = '' + unpackFile ${libcxxabi.src} + export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" + ''; + + # on next rebuild, this can be replaced with optionals; for now set to null to avoid + # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = if stdenv.hostPlatform.isMusl then [ + ../../libcxx-0001-musl-hacks.patch + ] else null; + + 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") + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; + + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; + + enableParallelBuilding = true; + + linkCxxAbi = stdenv.isLinux; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = http://libcxx.llvm.org/; + description = "A new implementation of the C++ standard library, targeting C++11"; + license = with stdenv.lib.licenses; [ ncsa mit ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..9022fced6ecfbe47576ba0dc5067e7e7ee8a721a --- /dev/null +++ b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh @@ -0,0 +1,3 @@ +linkCxxAbi="@linkCxxAbi@" +export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix new file mode 100644 index 0000000000000000000000000000000000000000..05fab16c25cd55ece7729e68a0d8ed8dab7a7433 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -0,0 +1,49 @@ +{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: + +stdenv.mkDerivation { + name = "libc++abi-${version}"; + + src = fetch "libcxxabi" "06v4dnqh6q0r3p5h2jznlgb69lg79126lzb2s0lcw1k38b2xkili"; + + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + + postUnpack = '' + unpackFile ${libcxx.src} + unpackFile ${llvm.src} + export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + ''; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # http://www.cmake.org/Wiki/CMake_RPATH_handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/*.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.so.1.0 $out/lib + install -m 644 ../include/cxxabi.h $out/include + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = { + homepage = http://libcxxabi.llvm.org/; + description = "A new implementation of low level support for a standard C++ library"; + license = with stdenv.lib.licenses; [ ncsa mit ]; + maintainers = with stdenv.lib.maintainers; [ vlstill ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix new file mode 100644 index 0000000000000000000000000000000000000000..4997f0a7c94e62bb425516447f8359a2f56a86c0 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetch +, cmake +, libxml2 +, llvm +, python +, version +}: + +stdenv.mkDerivation { + name = "lld-${version}"; + + src = fetch "lld" "02qfkjkjq0snmf8dw9c255xkh8dg06ndny1x470300pk7j1lm33b"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvm libxml2 ]; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + + postInstall = '' + moveToOutput include "$dev" + moveToOutput lib "$dev" + ''; + + meta = { + description = "The LLVM Linker"; + homepage = http://lld.llvm.org/; + license = stdenv.lib.licenses.ncsa; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix new file mode 100644 index 0000000000000000000000000000000000000000..eb565a93ef60317870805a8b50b644fd5c941b30 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -0,0 +1,56 @@ +{ stdenv +, fetch +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, llvm +, clang-unwrapped +, python +, version +, darwin +}: + +stdenv.mkDerivation { + name = "lldb-${version}"; + + src = fetch "lldb" "0m6l2ks4banfmdh7xy7l77ri85kmzavgfy81gkc4gl6wg8flrxa6"; + + 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 + sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \ + cmake/modules/LLDBStandalone.cmake + sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ + cmake/modules/LLDBStandalone.cmake + ''; + + 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_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ]; + + enableParallelBuilding = true; + + postInstall = '' + mkdir -p $out/share/man/man1 + cp ../docs/lldb.1 $out/share/man/man1/ + ''; + + meta = with stdenv.lib; { + description = "A next-generation high-performance debugger"; + homepage = http://llvm.org/; + license = licenses.ncsa; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/6/llvm-outputs.patch b/pkgs/development/compilers/llvm/6/llvm-outputs.patch new file mode 100644 index 0000000000000000000000000000000000000000..40096fa3497fd3b4300953ae9899e4709152228b --- /dev/null +++ b/pkgs/development/compilers/llvm/6/llvm-outputs.patch @@ -0,0 +1,26 @@ +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..37f7794 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,6 +333,21 @@ int main(int argc, char **argv) { + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + ++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared ++ if (!IsInDevelopmentTree) { ++ bool WantShared = true; ++ for (int i = 1; i < argc; ++i) { ++ StringRef Arg = argv[i]; ++ if (Arg == "--link-shared") ++ WantShared = true; ++ else if (Arg == "--link-static") ++ WantShared = false; // the last one wins ++ } ++ ++ if (WantShared) ++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; ++ } ++ + /// We only use `shared library` mode in cases where the static library form + /// of the components provided are not available; note however that this is + /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix new file mode 100644 index 0000000000000000000000000000000000000000..7cb3e88c2f85d91f322e28bec0d2db27179641fb --- /dev/null +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -0,0 +1,185 @@ +{ stdenv +, fetch +, fetchpatch +, cmake +, python +, libffi +, libbfd +, libxml2 +, valgrind +, ncurses +, version +, release_version +, zlib +, compiler-rt_src +, libcxxabi +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? true +, enableWasm ? true +, darwin +}: + +let + src = fetch "llvm" "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z"; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with stdenv.lib; + concatStringsSep "." (take 2 (splitString "." release_version)); +in stdenv.mkDerivation (rec { + name = "llvm-${version}"; + + unpackPhase = '' + unpackFile ${src} + mv llvm-${version}* llvm + sourceRoot=$PWD/llvm + unpackFile ${compiler-rt_src} + mv compiler-rt-* $sourceRoot/projects/compiler-rt + ''; + + outputs = [ "out" "python" ] + ++ stdenv.lib.optional enableSharedLibraries "lib"; + + nativeBuildInputs = [ cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + + buildInputs = [ libxml2 libffi ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + + propagatedBuildInputs = [ ncurses zlib ]; + + # 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 '' + substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \ + --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" + '' + # 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 + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + + # Revert compiler-rt commit that makes codesign mandatory + patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + cmakeFlags = with stdenv; [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=ON" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_ENABLE_RTTI=ON" + "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code + ] + ++ stdenv.lib.optional enableSharedLibraries + "-DLLVM_LINK_LLVM_DYLIB=ON" + ++ 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=${libbfd.dev}/include" + ++ stdenv.lib.optionals (isDarwin) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + ] ++ stdenv.lib.optional enableWasm + "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" + ; + + postBuild = '' + rm -fR $out + + paxmark m bin/{lli,llvm-rtdyld} + paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests + paxmark m unittests/ExecutionEngine/Orc/OrcJITTests + paxmark m unittests/Support/SupportTests + paxmark m bin/lli-child-target + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + ''; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + '' + + stdenv.lib.optionalString enableSharedLibraries '' + moveToOutput "lib/libLLVM-*" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" + 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-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + ''; + + doCheck = stdenv.isLinux && (!stdenv.isi686); + + checkTarget = "check-all"; + + enableParallelBuilding = true; + + passthru.src = src; + + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.ncsa; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; + platforms = stdenv.lib.platforms.all; + }; +} // stdenv.lib.optionalAttrs enableManpages { + name = "llvm-manpages-${version}"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = []; + + installPhase = '' + make -C docs install + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man pages for LLVM ${version}"; +}) diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix new file mode 100644 index 0000000000000000000000000000000000000000..091e378af2a1892e0469a1213c043e4be2faae85 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetch +, cmake +, zlib +, llvm +, perl +, version +}: + +stdenv.mkDerivation { + name = "openmp-${version}"; + + src = fetch "openmp" "1z1qghx6drdvnlp406q1cp3mgikxxmwymcwzaxbv18vxbw6ha3kw"; + + 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/6/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch new file mode 100644 index 0000000000000000000000000000000000000000..39a9bbbd207ab0fa654d6dd95c684d3470ea26c6 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch @@ -0,0 +1,377 @@ +From 8c74f8274369f527f2ada3772f4a0b406cb481ec Mon Sep 17 00:00:00 2001 +From: "Jory A. Pratt" +Date: Sat, 9 Sep 2017 08:31:15 -0500 +Subject: [PATCH] Ported to 6.0, taken from gentoo-musl project. + +------ +Ported to compiler-rt-sanitizers-5.0.0. Taken from + +https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch +Signed-off-by: Jory A. Pratt + +Taken from gentoo-musl project, with a few additional minor fixes. +--- + lib/asan/asan_linux.cc | 4 +-- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 3 +- + lib/msan/msan_linux.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +-- + lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux_libcdep.cc | 10 +++--- + lib/sanitizer_common/sanitizer_platform.h | 6 ++++ + .../sanitizer_platform_interceptors.h | 4 +-- + .../sanitizer_platform_limits_posix.cc | 40 +++++++++++++--------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 11 files changed, 46 insertions(+), 33 deletions(-) + +diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc +index 625f32d40..73cf77aca 100644 +--- a/lib/asan/asan_linux.cc ++++ b/lib/asan/asan_linux.cc +@@ -46,7 +46,7 @@ + #include + #endif + +-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS ++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU + #include + extern "C" void* _DYNAMIC; + #elif SANITIZER_NETBSD +@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { + UNIMPLEMENTED(); + } + +-#if SANITIZER_ANDROID ++#if SANITIZER_ANDROID || SANITIZER_NONGNU + // FIXME: should we do anything for Android? + void AsanCheckDynamicRTPrereqs() {} + void AsanCheckIncompatibleRT() {} +diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc +index c991550a4..2b706418b 100644 +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + } + + // Android and Solaris do not have dlvsym +-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS ++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } +diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h +index 98fe51b85..c13302b98 100644 +--- a/lib/interception/interception_linux.h ++++ b/lib/interception/interception_linux.h +@@ -35,8 +35,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); + (::__interception::uptr) & (func), \ + (::__interception::uptr) & WRAP(func)) + +-// Android and Solaris do not have dlvsym +-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS ++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU + #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) +diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc +index 4e6321fcb..4d50feb82 100644 +--- a/lib/msan/msan_linux.cc ++++ b/lib/msan/msan_linux.cc +@@ -13,7 +13,7 @@ + //===----------------------------------------------------------------------===// + + #include "sanitizer_common/sanitizer_platform.h" +-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD ++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD + + #include "msan.h" + #include "msan_thread.h" +diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 24e7548a5..20259b1d6 100644 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -102,7 +102,7 @@ static void ioctl_table_fill() { + _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + // Conflicting request ids. + // _(CDROMAUDIOBUFSIZ, NONE, 0); + // _(SNDCTL_TMR_CONTINUE, NONE, 0); +@@ -363,7 +363,7 @@ static void ioctl_table_fill() { + _(VT_WAITACTIVE, NONE, 0); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE + _(CYGETDEFTHRESH, WRITE, sizeof(int)); + _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc +index 469c8eb7e..24f87867d 100644 +--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc ++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc +@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { + } + } + +-#if !SANITIZER_ANDROID ++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU + PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, + void *old_rlim) { + if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +index 56fdfc870..a932d5db1 100644 +--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -174,7 +174,7 @@ bool SanitizerGetThreadName(char *name, int max_len) { + } + + #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \ +- !SANITIZER_NETBSD && !SANITIZER_SOLARIS ++ !SANITIZER_NETBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU + static uptr g_tls_size; + + #ifdef __i386__ +@@ -207,7 +207,7 @@ void InitTlsSize() { } + + #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \ + || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \ +- || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID ++ || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // sizeof(struct pthread) from glibc. + static atomic_uintptr_t kThreadDescriptorSize; + +@@ -391,7 +391,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) { + + #if !SANITIZER_GO + static void GetTls(uptr *addr, uptr *size) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) + *addr = ThreadSelf(); + *size = GetTlsSize(); +@@ -432,7 +432,7 @@ static void GetTls(uptr *addr, uptr *size) { + *addr = (uptr)tcb->tcb_dtv[1]; + } + } +-#elif SANITIZER_ANDROID ++#elif SANITIZER_ANDROID || SANITIZER_NONGNU + *addr = 0; + *size = 0; + #elif SANITIZER_SOLARIS +@@ -448,7 +448,7 @@ static void GetTls(uptr *addr, uptr *size) { + #if !SANITIZER_GO + uptr GetTlsSize() { + #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \ +- SANITIZER_SOLARIS ++ SANITIZER_SOLARIS || SANITIZER_NONGNU + uptr addr, size; + GetTls(&addr, &size); + return size; +diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h +index 334903c26..fc2afac2c 100644 +--- a/lib/sanitizer_common/sanitizer_platform.h ++++ b/lib/sanitizer_common/sanitizer_platform.h +@@ -195,6 +195,12 @@ + # define SANITIZER_SOLARIS32 0 + #endif + ++#if defined(__linux__) && !defined(__GLIBC__) ++# define SANITIZER_NONGNU 1 ++#else ++# define SANITIZER_NONGNU 0 ++#endif ++ + // By default we allow to use SizeClassAllocator64 on 64-bit platform. + // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64 + // does not work well and we need to fallback to SizeClassAllocator32. +diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h +index b99ac4480..628d226a1 100644 +--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -38,7 +38,7 @@ + # include "sanitizer_platform_limits_solaris.h" + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # define SI_LINUX_NOT_ANDROID 1 + #else + # define SI_LINUX_NOT_ANDROID 0 +@@ -291,7 +291,7 @@ + (SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID) + #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID) + #define SANITIZER_INTERCEPT_SHMCTL \ +- (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \ ++ (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \ + SANITIZER_WORDSIZE == 64)) // NOLINT + #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID + #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index f12e8206a..8880197b0 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -14,6 +14,9 @@ + + #include "sanitizer_platform.h" + ++// Workaround musl <--> linux conflicting definition of 'struct sysinfo' ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include +-#include ++# if !SANITIZER_NONGNU ++# include ++# endif + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #if HAVE_RPC_XDR_H + # include + #elif HAVE_TIRPC_RPC_XDR_H +@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include ++// #include ++#include + #include + #include + #include +@@ -252,7 +258,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ustat_sz = sizeof(struct ustat); + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); +@@ -311,7 +317,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -405,7 +411,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -455,7 +461,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -823,7 +829,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -978,7 +984,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1012,6 +1018,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1025,6 +1032,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); + CHECK_SIZE_AND_OFFSET(dirent, d_ino); +@@ -1127,7 +1135,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1188,7 +1196,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1238,7 +1246,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1257,7 +1265,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index e14d5f575..389a3bc88 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -285,7 +285,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.16.2 + diff --git a/pkgs/development/compilers/llvm/TLI-musl.patch b/pkgs/development/compilers/llvm/TLI-musl.patch new file mode 100644 index 0000000000000000000000000000000000000000..1a690808663727381773c34c2cdf152e1c518d51 --- /dev/null +++ b/pkgs/development/compilers/llvm/TLI-musl.patch @@ -0,0 +1,35 @@ +From 5c571082fdaf61f6df19d9b7137dc26d71334058 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Thu, 18 Feb 2016 10:33:04 +0100 +Subject: [PATCH 2/3] Fix build with musl libc + +On musl libc the fopen64 and fopen are the same thing, but for +compatibility they have a `#define fopen64 fopen`. Same applies for +fseek64, fstat64, fstatvfs64, ftello64, lstat64, stat64 and tmpfile64. +--- + include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h +index 7becdf0..7f14427 100644 +--- a/include/llvm/Analysis/TargetLibraryInfo.h ++++ b/include/llvm/Analysis/TargetLibraryInfo.h +@@ -18,6 +18,15 @@ + #include "llvm/IR/Module.h" + #include "llvm/Pass.h" + ++#undef fopen64 ++#undef fseeko64 ++#undef fstat64 ++#undef fstatvfs64 ++#undef ftello64 ++#undef lstat64 ++#undef stat64 ++#undef tmpfile64 ++ + namespace llvm { + /// VecDesc - Describes a possible vectorization of a function. + /// Function 'VectorFnName' is equivalent to 'ScalarFnName' vectorized +-- +2.7.3 + diff --git a/pkgs/development/compilers/llvm/aarch64.patch b/pkgs/development/compilers/llvm/aarch64.patch new file mode 100644 index 0000000000000000000000000000000000000000..205074e48e4e040064d7ea65ac5b197e6245afed --- /dev/null +++ b/pkgs/development/compilers/llvm/aarch64.patch @@ -0,0 +1,51 @@ +--- lib/Support/Unix/Memory.inc ++++ lib/Support/Unix/Memory.inc +@@ -126,8 +126,12 @@ + Result.Address = Addr; + Result.Size = NumPages*PageSize; + +- if (PFlags & MF_EXEC) +- Memory::InvalidateInstructionCache(Result.Address, Result.Size); ++ // Rely on protectMappedMemory to invalidate instruction cache. ++ if (PFlags & MF_EXEC) { ++ EC = Memory::protectMappedMemory (Result, PFlags); ++ if (EC != std::error_code()) ++ return MemoryBlock(); ++ } + + return Result; + } +@@ -156,15 +160,31 @@ + return std::error_code(EINVAL, std::generic_category()); + + int Protect = getPosixProtectionFlags(Flags); +- + uintptr_t Start = alignAddr((uint8_t *)M.Address - PageSize + 1, PageSize); + uintptr_t End = alignAddr((uint8_t *)M.Address + M.Size, PageSize); ++ ++ bool InvalidateCache = (Flags & MF_EXEC); ++ ++#if defined(__arm__) || defined(__aarch64__) ++ // Certain ARM implementations treat icache clear instruction as a memory read, ++ // and CPU segfaults on trying to clear cache on !PROT_READ page. Therefore we need ++ // to temporarily add PROT_READ for the sake of flushing the instruction caches. ++ if (InvalidateCache && !(Protect & PROT_READ)) { ++ int Result = ::mprotect((void *)Start, End - Start, Protect | PROT_READ); ++ if (Result != 0) ++ return std::error_code(errno, std::generic_category()); ++ ++ Memory::InvalidateInstructionCache(M.Address, M.Size); ++ InvalidateCache = false; ++ } ++#endif ++ + int Result = ::mprotect((void *)Start, End - Start, Protect); + + if (Result != 0) + return std::error_code(errno, std::generic_category()); + +- if (Flags & MF_EXEC) ++ if (InvalidateCache) + Memory::InvalidateInstructionCache(M.Address, M.Size); + + return std::error_code(); diff --git a/pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch b/pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch new file mode 100644 index 0000000000000000000000000000000000000000..bcb5ad8cfb87d7bcfbe93a446609be91c4a50fed --- /dev/null +++ b/pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch @@ -0,0 +1,39 @@ +From 1c936d7fda3275265e37f93697232a1ed652390f Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Sat, 9 Jul 2016 19:22:54 -0500 +Subject: [PATCH] musl fixes/hacks + +Conflicts: + + include/__config + include/locale + src/locale.cpp +--- + include/locale | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/locale b/include/locale +index 3d804e8..9b01f5b 100644 +--- a/include/locale ++++ b/include/locale +@@ -695,7 +695,7 @@ __num_get_signed_integral(const char* __a, const char* __a_end, + typename remove_reference::type __save_errno = errno; + errno = 0; + char *__p2; +- long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); ++ long long __ll = strtoll(__a, &__p2, __base); + typename remove_reference::type __current_errno = errno; + if (__current_errno == 0) + errno = __save_errno; +@@ -735,7 +735,7 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end, + typename remove_reference::type __save_errno = errno; + errno = 0; + char *__p2; +- unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); ++ unsigned long long __ll = strtoull(__a, &__p2, __base); + typename remove_reference::type __current_errno = errno; + if (__current_errno == 0) + errno = __save_errno; +-- +1.7.1 + diff --git a/pkgs/development/compilers/llvm/multi.nix b/pkgs/development/compilers/llvm/multi.nix new file mode 100644 index 0000000000000000000000000000000000000000..b4f2f8f9d6f6fc923e9b54a1e2de3d34c65ce052 --- /dev/null +++ b/pkgs/development/compilers/llvm/multi.nix @@ -0,0 +1,48 @@ +{ runCommand, +clang, +gcc64, +gcc32, +glibc_multi +}: + +let + combine = basegcc: runCommand "combine-gcc-libc" {} '' + mkdir -p $out + cp -r ${basegcc.cc}/lib $out/lib + + chmod u+rw -R $out/lib + cp -r ${basegcc.libc}/lib/* $(ls -d $out/lib/gcc/*/*) + ''; + gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {} '' + mkdir -p $out/lib/gcc + + ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/ + ln -s ${combine gcc32}/lib/gcc/* $out/lib/gcc/ + # XXX: This shouldn't be needed, clang just doesn't look for "i686-unknown" + ln -s $out/lib/gcc/i686-unknown-linux-gnu $out/lib/gcc/i686-pc-linux-gnu + + + # includes + ln -s ${glibc_multi.dev}/include $out/ + + # dynamic linkers + mkdir -p $out/lib/32 + ln -s ${glibc_multi.out}/lib/ld-linux* $out/lib + ln -s ${glibc_multi.out}/lib/32/ld-linux* $out/lib/32/ + ''; + + clangMulti = clang.override { + # Only used for providing expected structure re:dynamic linkers, AFAIK + # Most of the magic is done by setting the --gcc-toolchain option below + libc = gcc_multi_sysroot; + + bintools = clang.bintools.override { + libc = gcc_multi_sysroot; + }; + + extraBuildCommands = '' + sed -e '$a --gcc-toolchain=${gcc_multi_sysroot}' -i $out/nix-support/libc-cflags + ''; + }; + +in clangMulti diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 795830e0e707dd3d43d6852cc8b19e04fb53a67e..2c8fe1866120c8b9b37385d32b9a1452558e81b0 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }: let - rev = "592a5714595b4448b646a7d49df04c285668c2f8"; + rev= "f8e08c89dd98b7b8dba318d245dcd4abd3328ae2"; in stdenv.mkDerivation rec { name = "manticore-${version}"; - version = "2014.08.18"; + version = "2017.08.22"; src = fetchFromGitHub { - owner = "rrnewton"; - repo = "manticore_temp_mirror"; - sha256 = "1snwlm9a31wfgvzb80y7r7yvc6n0k0bi675lqwzll95as7cdswwi"; + owner = "ManticoreProject"; + repo = "manticore"; + sha256 = "06icq0qdzwyzbsyms53blxpb9i26n2vn7ci8p9xvvnq687hxhr73"; inherit rev; }; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { mkdir -p $out cd $out unpackFile $src - mv manticore_temp_mirror-${rev}-src repo_checkout + mv source repo_checkout cd repo_checkout chmod u+w . -R ''; diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index 74905c6ffae419105f376a28bfc6fdbd2876d900..7cd3c17936615b9c552b21a0d9fd04309d770b3f 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -46,7 +46,7 @@ let meta = with stdenv.lib; { inherit description; - homepage = http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/; + homepage = https://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 076f3c9567507044dbbb32d7a579bd94cb550a9f..4670f39eac18c3b934d1633c6ba197366427dd82 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }: +{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake, + enableX11 ? false, xlibsWrapper ? null }: let version = "9.2"; @@ -9,7 +10,7 @@ let else ""; in stdenv.mkDerivation { - name = "mit-scheme-${version}"; + name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}"; # MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from # the platform-specific tarballs, which contain pre-built binaries. It @@ -29,6 +30,8 @@ stdenv.mkDerivation { sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg"; }; + buildInputs = if enableX11 then [xlibsWrapper] else []; + configurePhase = '' (cd src && ./configure) (cd doc && ./configure) diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix index 1ec679e6e41bdb78855f041512ea0b90475216ea..f80cffe220ea91b255ff1c25f0c9c85902e0eabb 100644 --- a/pkgs/development/compilers/mono/4.4.nix +++ b/pkgs/development/compilers/mono/4.4.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (rec { inherit Foundation libobjc; version = "4.4.2.11"; sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737 }) diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix index 283c34efb321c8c60d18b2feb8edfd7007e0aeac..7c9918cdd397496b9012223f79e49d800344682e 100644 --- a/pkgs/development/compilers/mono/4.6.nix +++ b/pkgs/development/compilers/mono/4.6.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (rec { inherit Foundation libobjc; version = "4.6.2.16"; sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511 }) diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.8.nix index 6d870ae30680655a4bea0eddd9ab790e9cce66ae..c3ba316cd13bb0b7a62ce90c5717bf9181ae5b5f 100644 --- a/pkgs/development/compilers/mono/4.8.nix +++ b/pkgs/development/compilers/mono/4.8.nix @@ -4,4 +4,5 @@ callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645 }) diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix index 911ba0ae02a7225eb0e076ce5b402c07cef17687..d10d6e3e60532fa89a5b12a3bf8fac7b1ec149fb 100644 --- a/pkgs/development/compilers/mono/5.0.nix +++ b/pkgs/development/compilers/mono/5.0.nix @@ -4,4 +4,5 @@ callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; version = "5.0.1.1"; sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147 }) diff --git a/pkgs/development/compilers/mono/5.4.nix b/pkgs/development/compilers/mono/5.4.nix new file mode 100644 index 0000000000000000000000000000000000000000..31e86f94c0a262916d9a9cd69705dd34c5fbd448 --- /dev/null +++ b/pkgs/development/compilers/mono/5.4.nix @@ -0,0 +1,8 @@ +{ stdenv, callPackage, Foundation, libobjc }: + +callPackage ./generic-cmake.nix (rec { + inherit Foundation libobjc; + version = "5.4.1.6"; + sha256 = "1pv5lmyxjr8z9s17jx19850k43ylzqlbzsgr5jxj1knmkbza1zdx"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147 +}) diff --git a/pkgs/development/compilers/mono/5.8.nix b/pkgs/development/compilers/mono/5.8.nix new file mode 100644 index 0000000000000000000000000000000000000000..6db9e19807bbcfa27512821079f3228cd7bfb7c7 --- /dev/null +++ b/pkgs/development/compilers/mono/5.8.nix @@ -0,0 +1,8 @@ +{ stdenv, callPackage, Foundation, libobjc }: + +callPackage ./generic-cmake.nix (rec { + inherit Foundation libobjc; + version = "5.8.0.108"; + sha256 = "177khb06dfll0pcncr84vvibni7f8m5fgb30ndgsdjk25xfcbmzc"; + enableParallelBuilding = false; +}) diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index f6e3f5a0100b8d02bfb575704e8aae007780f4f6..929d00491382f949ff876409512c71c8c08ee1cf 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -1,4 +1,4 @@ -{ 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 }: +{ 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, enableParallelBuilding ? true }: let llvm = callPackage ./llvm.nix { }; @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { # 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" @@ -38,16 +36,13 @@ stdenv.mkDerivation rec { configurePhase = '' patchShebangs ./ - ./autogen.sh --prefix $out + ./autogen.sh --prefix $out $configureFlags ''; # 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 ]; @@ -61,13 +56,13 @@ stdenv.mkDerivation rec { 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 + # Fix mono DLLMap so it can find libX11 to run winforms apps + # libgdiplus is correctly handled by the --with-libgdiplus configure flag # 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" \ + sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" ''; # Without this, any Mono application attempting to open an SSL connection will throw with @@ -83,6 +78,8 @@ stdenv.mkDerivation rec { ln -s $out/bin/mcs $out/bin/gmcs ''; + inherit enableParallelBuilding; + meta = { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 3bc962859e28dab503b675d62a94018b5aa1cd4e..3b476bce0273cf4b58e84544088f701b068dd154 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256 }: +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11 +, callPackage, ncurses, zlib +, cacert, Foundation, libobjc, python + +, version, sha256 +, withLLVM ? false +, enableParallelBuilding ? true +}: let llvm = callPackage ./llvm.nix { }; @@ -40,9 +47,6 @@ stdenv.mkDerivation rec { # 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 ]; @@ -79,10 +83,12 @@ stdenv.mkDerivation rec { ln -s $out/bin/mcs $out/bin/gmcs ''; + inherit enableParallelBuilding; + meta = { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; - platforms = with stdenv.lib.platforms; darwin ++ linux; + platforms = stdenv.lib.platforms.x86; 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/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 6a4fd784d236d74dfa83f359c5e90bbf7b0a3ac4..8e9dcc1dbcb54a2807e53e4cfe44289e5ac6b8b0 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -5,7 +5,7 @@ , cmake , python , libffi -, binutils +, libbfd , libxml2 , valgrind , ncurses @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cmakeFlags = with stdenv; [ "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index a84c5bbf7605a73c34b3206252b32b00fbdaf02d..89dd7dc3fdc50f816f0bf113ca60a3771c008317 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.13.01"; + version = "2.13.03"; src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "1ylqs4sqh0paia970v6hpdgq5icxns9zlg21qql232bz1apppy88"; + sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 5b90dc7debc10f38f87a4a6a0ee9721c90966f49..42a585ff51f072ad8a462e8fa898da461c940567 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,55 +1,31 @@ -{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig -, git, apacheHttpd, apr, aprutil, mariadb, mbedtls, openssl, pkgs, gtk2 +{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig +, git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs }: stdenv.mkDerivation rec { name = "neko-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "http://nekovm.org/media/neko-${version}-src.tar.gz"; - sha256 = "15ng9ad0jspnhj38csli1pvsv3nxm75f0nlps7i10194jvzdb4qc"; + url = "https://nekovm.org/media/neko-${version}-src.tar.gz"; + sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g"; }; - # Patches backported with reference to https://github.com/HaxeFoundation/neko/issues/131 - # They can probably be removed when bumping to next version - patches = [ - (fetchpatch { - url = "https://github.com/HaxeFoundation/neko/commit/" - + "a8c71ad97faaccff6c6e9e09eba2d5efd022f8dc.patch"; - sha256 = "0mnx15cdjs8mnl01mhc9z2gpzh4d1q0ygqnjackrqxz6x235ydyp"; - }) - (fetchpatch { - url = "https://github.com/HaxeFoundation/neko/commit/" - + "fe87462d9c7a6ee27e28f5be5e4fc0ac87b34574.patch"; - sha256 = "1jbmq6j32vg3qv20dbh82cp54886lgrh7gkcqins8a2y4l4dl3sc"; - }) - # https://github.com/HaxeFoundation/neko/pull/165 - (fetchpatch { - url = "https://github.com/HaxeFoundation/neko/commit/" - + "c6d9c6d796200990b3b6a53a4dc716c9192398e6.patch"; - sha256 = "1pq0qhhb9gbhc3zbgylwp0amhwsz0q0ggpj6v2xgv0hfy7d63rcd"; - }) - # Glibc 2.26 no longer has xlocale.h, patch backported from upstream commit - # e286c8f3301fa443255a3101d14b7392467051b8. - ./xlocale-fix.patch - ]; - + nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = - [ boehmgc zlib sqlite pcre cmake pkgconfig git apacheHttpd apr aprutil - mariadb.client mbedtls openssl ] + [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil + mysql.connector-c mbedtls openssl libpthreadstubs ] ++ stdenv.lib.optional stdenv.isLinux gtk2 ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; - prePatch = '' - sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' vm/load.c - ''; - checkPhase = '' + installCheckPhase = '' bin/neko bin/test.n ''; + doInstallCheck = true; + dontPatchELF = true; dontStrip = true; meta = with stdenv.lib; { @@ -60,4 +36,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; }; } - diff --git a/pkgs/development/compilers/neko/xlocale-fix.patch b/pkgs/development/compilers/neko/xlocale-fix.patch deleted file mode 100644 index f4c53f3a43d6273b0749882cc56d64da081e7571..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/neko/xlocale-fix.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit 31d3ac3d691b2a1b07991e67302fd52b0f409cac -Author: Andy Li -Date: Thu Jul 13 13:23:33 2017 +0800 - - include xlocale.h only if it is available since it is removed in recent glibc - - see: https://bugzilla.redhat.com/show_bug.cgi?id=1464244 - - (Backported from e286c8f3301fa443255a3101d14b7392467051b8) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8de1702..d64cab9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,6 @@ - cmake_minimum_required(VERSION 2.8.7) - -+include(CheckIncludeFile) - project(neko C) - - set(CMAKE_OSX_ARCHITECTURES x86_64) -@@ -48,6 +49,8 @@ set(NEKO_VERSION_MAJOR 2) - set(NEKO_VERSION_MINOR 1) - set(NEKO_VERSION_PATCH 0) - -+check_include_file(xlocale.h HAVE_XLOCALE_H) -+ - configure_file ( - "${CMAKE_SOURCE_DIR}/vm/neko.h.in" - "${CMAKE_BINARY_DIR}/neko.h" -diff --git a/libs/std/sys.c b/libs/std/sys.c -index 8003d41..ae0cfee 100644 ---- a/libs/std/sys.c -+++ b/libs/std/sys.c -@@ -41,7 +41,11 @@ - # include - # include - # include -+#ifdef HAVE_XLOCALE_H - # include -+#else -+# include -+#endif - #endif - - #ifdef NEKO_MAC -diff --git a/vm/neko.h.in b/vm/neko.h.in -index bb9ec1b..147ecce 100644 ---- a/vm/neko.h.in -+++ b/vm/neko.h.in -@@ -88,6 +88,8 @@ - # include - #endif - -+#cmakedefine HAVE_XLOCALE_H -+ - #define NEKO_VERSION_MAJOR @NEKO_VERSION_MAJOR@ - #define NEKO_VERSION_MINOR @NEKO_VERSION_MINOR@ - #define NEKO_VERSION_PATCH @NEKO_VERSION_PATCH@ diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index fde4861e982f159df4a95297640733ea8cc9cc66..a49b1b8243943d1c0bced4d74b74e8f167a8672e 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.17.2"; src = fetchurl { - url = "http://nim-lang.org/download/${name}.tar.xz"; + url = "https://nim-lang.org/download/${name}.tar.xz"; sha256 = "1gc2xk3ygmz9y4pm75pligssgw995a7gvnfpy445fjpw4d81pzxa"; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Statically typed, imperative programming language"; - homepage = http://nim-lang.org/; + homepage = https://nim-lang.org/; license = licenses.mit; maintainers = with maintainers; [ ehmry peterhoeg ]; platforms = with platforms; linux ++ darwin; # arbitrary diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index f5bc00118a6171c8174b6c3b03e59a9c689afb0d..774cefb794041fbc07730f1a4fc03dab951088a5 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0jz2ayadx62zv2b5ji947bkvw63axl4a2q70lwli86zgmcl390gf"; }; + patches = [ ./ignore-complex-float128.patch ]; + preBuild = '' patchShebangs . ''; diff --git a/pkgs/development/compilers/obliv-c/ignore-complex-float128.patch b/pkgs/development/compilers/obliv-c/ignore-complex-float128.patch new file mode 100644 index 0000000000000000000000000000000000000000..e3a5b74a9cb20569194cbd6832dee0fbeae08a29 --- /dev/null +++ b/pkgs/development/compilers/obliv-c/ignore-complex-float128.patch @@ -0,0 +1,37 @@ +--- a/src/frontc/clexer.mll ++++ b/src/frontc/clexer.mll +@@ -134,9 +134,11 @@ let init_lexicon _ = + (* WW: see /usr/include/sys/cdefs.h for why __signed and __volatile + * are accepted GCC-isms *) + ("_Bool", fun loc -> BOOL loc); ++ ("_Complex", fun loc -> COMPLEX loc); + ("char", fun loc -> CHAR loc); + ("int", fun loc -> INT loc); + ("float", fun loc -> FLOAT loc); ++ ("__float128", fun loc -> FLOAT128 loc); + ("double", fun loc -> DOUBLE loc); + ("void", fun loc -> VOID loc); + ("enum", fun loc -> ENUM loc); +--- a/src/frontc/cparser.mly ++++ b/src/frontc/cparser.mly +@@ -269,6 +269,8 @@ let oblivState (s:statement): statement = + %token VOLATILE EXTERN STATIC CONST RESTRICT AUTO REGISTER FROZEN + %token THREAD + ++%token COMPLEX FLOAT128 ++ + %token SIZEOF ALIGNOF + + %token EQ PLUS_EQ MINUS_EQ STAR_EQ SLASH_EQ PERCENT_EQ +@@ -1002,7 +1004,11 @@ type_spec: /* ISO 6.7.2 */ + | LONG { Tlong, $1 } + | INT64 { Tint64, $1 } + | FLOAT { Tfloat, $1 } ++| FLOAT128 { Tfloat, $1 } + | DOUBLE { Tdouble, $1 } ++| COMPLEX FLOAT { Tfloat, $2 } ++| COMPLEX FLOAT128{ Tfloat, $2 } ++| COMPLEX DOUBLE { Tdouble, $2 } + | SIGNED { Tsigned, $1 } + | UNSIGNED { Tunsigned, $1 } + | STRUCT id_or_typename diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/pkgs/development/compilers/ocaml/4.06.nix index b913d169e97abad56c417a87cd79d83a2ff506ac..b54b8a6288feac5df87cc0ae157d1e50f23317cf 100644 --- a/pkgs/development/compilers/ocaml/4.06.nix +++ b/pkgs/development/compilers/ocaml/4.06.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "06"; - patch_version = "0"; - sha256 = "1dy542yfnnw10zvh5s9qzswliq11mg7l0bcyss3501qw3vwvadhj"; + patch_version = "1"; + sha256 = "1n3pygfssd6nkrq876wszm5nm3v4605q4k16a66h1nmq9wvf01vg"; # If the executable is stipped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix deleted file mode 100644 index c95d29326a4ee118c532522ca8a29d1d8397e775..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, fetchurl, ncurses, xlibsWrapper }: - -let - useX11 = stdenv.isi686 || stdenv.isx86_64; - useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; -in - -stdenv.mkDerivation rec { - - name = "ber-metaocaml-${version}"; - version = "003"; - - src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.2.tar.bz2"; - sha256 = "0hw1yp1mmfyn1pmda232d0ry69m7ln1z0fn5lgi8nz3y1mx3iww6"; - }; - - metaocaml = fetchurl { - url = "http://okmij.org/ftp/ML/ber-metaocaml.tar.gz"; - sha256 = "1kq1if25c1wvcdiy4g46xk05dkc1am2gc4qvmg4x19wvvaz09gzf"; - }; - - # Needed to avoid a SIGBUS on the final executable on mips - NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; - - patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; - - prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; - buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; - installFlags = "-i"; - installTargets = "install"; # + optionalString useNativeCompilers " installopt"; - prePatch = '' - CAT=$(type -tp cat) - sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - patch -p0 < ${./mips64.patch} - ''; - postConfigure = '' - tar -xvzf $metaocaml - cd ${name} - make patch - cd .. - ''; - postBuild = '' - mkdir -p $out/include - ln -sv $out/lib/ocaml/caml $out/include/caml - ''; - postInstall = '' - cd ${name} - make all - make install - make test - make test-compile - cd .. - ''; - - meta = with stdenv.lib; { - homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; - license = with licenses; [ - qpl /* compiler */ - lgpl2 /* library */ - ]; - description = "Conservative extension of OCaml"; - longDescription = '' - A conservative extension of OCaml with the primitive type of code values, - and three basic multi-stage expression forms: Brackets, Escape, and Run - ''; - broken = true; - }; -} diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix new file mode 100644 index 0000000000000000000000000000000000000000..81c8cd534025a16f53c6765a29d4f72924f1f838 --- /dev/null +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix @@ -0,0 +1,84 @@ +{ stdenv, fetchurl, ncurses, libX11, xproto, buildEnv }: + +let + useX11 = stdenv.isi686 || stdenv.isx86_64; + useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips; + inherit (stdenv.lib) optionals optionalString; +in + +stdenv.mkDerivation rec { + + name = "ber-metaocaml-${version}"; + version = "104"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz"; + sha256 = "1pi2hdm9lxhn45qvfqfss1hpa4jijm14qgmrgajsadxqdiplhqyb"; + }; + + metaocaml = fetchurl { + url = "http://okmij.org/ftp/ML/ber-metaocaml-104.tar.gz"; + sha256 = "1gmwlxairxqcmqa2r6kbf8b4dxc7pfhfbh48g1s14d3z20rj8nib"; + }; + + # Needed to avoid a SIGBUS on the final executable on mips + NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; + + x11env = buildEnv { name = "x11env"; paths = [libX11 xproto];}; + x11lib = x11env + "/lib"; + x11inc = x11env + "/include"; + + prefixKey = "-prefix "; + configureFlags = optionals useX11 [ "-x11lib" x11lib + "-x11include" x11inc ]; + + dontStrip = true; + buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; + installFlags = "-i"; + installTargets = "install"; # + optionalString useNativeCompilers " installopt"; + + postConfigure = '' + tar -xvzf $metaocaml + cd ${name} + make patch + cd .. + ''; + buildPhase = '' + make world + make -i install + + make bootstrap + make opt.opt + make installopt + mkdir -p $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + cd ${name} + make all + make install + make install.opt + cd .. + ''; + installPhase = ""; + postBuild = '' + ''; + checkPhase = '' + cd ${name} + make test + make test-compile + make test-native + cd .. + ''; + + meta = with stdenv.lib; { + homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; + description = "Conservative extension of OCaml"; + longDescription = '' + A conservative extension of OCaml with the primitive type of code values, + and three basic multi-stage expression forms: Brackets, Escape, and Run + ''; + }; +} diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 17b3033c31df62bb80f3f054094cea9a17106d5f..03ae6e518d0b6f9723a87acb37f8658bd9b86a07 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -10,14 +10,18 @@ let safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); in -{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }: +{ stdenv, fetchurl, ncurses, buildEnv +, libX11, xproto, useX11 ? safeX11 stdenv +, flambdaSupport ? false +}: assert useX11 -> !stdenv.isArm && !stdenv.isMips; +assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; let useNativeCompilers = !stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; - name = "ocaml-${version}"; + inherit (stdenv.lib) optional optionals optionalString; + name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}"; in stdenv.mkDerivation (args // rec { @@ -36,7 +40,9 @@ stdenv.mkDerivation (args // rec { prefixKey = "-prefix "; configureFlags = optionals useX11 [ "-x11lib" x11lib - "-x11include" x11inc ]; + "-x11include" x11inc ] + ++ optional flambdaSupport "-flambda" + ; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 8382be7a2091ab0624dc6f5aced38a4c74be2981..d3f654749b040e3589e30b9ed35da19ebd4196b2 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation { name = "opendylan-2013.2"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2; + url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2; sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h"; } else if stdenv.system == "i686-linux" then fetchurl { - url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2; + url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2; sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5"; } else throw "platform ${stdenv.system} not supported."; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 773ab9f473f1ee2225e816bde8f618023d8f076c..95f4dc5b215f18dfd9d1ac3c15f40439ac9c6068 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -2,18 +2,18 @@ {stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: stdenv.mkDerivation { - name = "opendylan-2013.2"; + name = "opendylan-2016.1pre"; src = fetchgit { url = https://github.com/dylan-lang/opendylan; - rev = "ce9b14dab6cb9ffedc69fae8c6df524c0c79abd3"; - sha256 = "17jvhv0y63fj25ma05k70b7phcwgjyna5qkrirk48z3xapb8bknd"; + rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; + sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b"; fetchSubmodules = true; }; buildInputs = (if stdenv.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ opendylan-bootstrap boehmgc gnused autoconf automake perl makeWrapper - ] ; + ]; preConfigure = if stdenv.system == "i686-linux" then '' mkdir -p $TMPDIR/mps diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix deleted file mode 100644 index 1e8f88beea6641001160682a414f2e8416ec8e19..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: -let - jdk = stdenv.mkDerivation { - name = "openjdk-7u60b30"; - - # From https://github.com/alexkasko/openjdk-unofficial-builds - src = fetchurl { - url = https://bitbucket.org/alexkasko/openjdk-unofficial-builds/downloads/openjdk-1.7.0-u60-unofficial-macosx-x86_64-bundle.zip; - sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401"; - }; - - buildInputs = [ unzip freetype ]; - - installPhase = '' - mv */Contents/Home $out - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/darwin/*_md.h $out/include/ - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs - - install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib - - # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - passthru = { - jre = jdk; - home = jdk; - }; - - meta.platforms = stdenv.lib.platforms.darwin; - - }; -in jdk diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix new file mode 100644 index 0000000000000000000000000000000000000000..9cc774727b713f7a11a52f8b868310518bde6537 --- /dev/null +++ b/pkgs/development/compilers/openjdk/10.nix @@ -0,0 +1,202 @@ +{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype +, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libjpeg, giflib +, setJavaClassPath +, minimal ? false +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + + /** + * The JRE libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.system == "i686-linux" then + "i386" + else "amd64"; + + update = "10"; + build = "46"; + repover = "jdk-${update}+${build}"; + paxflags = if stdenv.isi686 then "msp" else "m"; + + openjdk10 = stdenv.mkDerivation { + name = "openjdk-${update}-b${build}"; + + src = fetchurl { + url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz"; + sha256 = "1a2cjad816qilsigkq035rqzfhzmq5vaz1klilrrws456flbsjlg"; + }; + + outputs = [ "out" "jre" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib + libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst + libXi libXinerama libXcursor lndir fontconfig + ] ++ lib.optionals (!minimal && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ] ++ lib.optionals (!minimal && enableGnome2) [ + ./swing-use-gtk-jdk10.patch + ]; + + preConfigure = '' + chmod +x configure + substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" + + configureFlagsArray=( + "--with-boot-jdk=${bootjdk.home}" + "--with-update-version=${update}" + "--with-build-number=${build}" + "--with-milestone=fcs" + "--enable-unlimited-crypto" + "--disable-debug-symbols" + "--disable-freetype-bundling" + "--with-zlib=system" + "--with-giflib=system" + "--with-stdc++lib=dynamic" + + # glibc 2.24 deprecated readdir_r so we need this + # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html + "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" + '' + + lib.optionalString minimal "\"--enable-headless-only\"" + + ");" + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + + stdenv.lib.optionalString stdenv.cc.isGNU '' + NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" + ''; + + NIX_LDFLAGS= lib.optionals (!minimal) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!minimal && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]; + + buildFlags = [ "all" ]; + + installPhase = '' + mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk + + cp -av build/*/images/jdk/* $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir $out/include $out/share/man + ln -s $out/lib/openjdk/include/* $out/include/ + ln -s $out/lib/openjdk/man/* $out/share/man/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Copy the JRE to a separate output and setup fallback fonts + cp -av build/*/images/jre $jre/lib/openjdk/ + mkdir $out/lib/openjdk/jre + ${lib.optionalString (!minimal) '' + mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback + lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ''} + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString minimal '' + for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do + rm ''${d}/{libjsound,libjsoundalsa,libfontmanager}.so + done + ''} + + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + + # Set PaX markings + exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + echo "to mark: *$exes*" + for file in $exes; do + echo "marking *$file*" + paxmark ${paxflags} "$file" + done + + # Remove duplicate binaries. + for i in $(cd $out/lib/openjdk/bin && echo *); do + if [ "$i" = java ]; then continue; fi + if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then + ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i + fi + done + + ln -s $out/lib/openjdk/bin $out/bin + ln -s $jre/lib/openjdk/jre/bin $jre/bin + ln -s $jre/lib/openjdk/jre $out/jre + ''; + + # FIXME: this is unnecessary once the multiple-outputs branch is merged. + preFixup = '' + prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" + patchELF $jre + propagatedBuildInputs+=" $jre" + + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $jre/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat < $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + + # Test to make sure that we don't depend on the bootstrap + for output in $outputs; do + if grep -q -r '${bootjdk}' $(eval echo \$$output); then + echo "Extraneous references to ${bootjdk} detected" + exit 1 + fi + done + ''; + + meta = with stdenv.lib; { + homepage = http://openjdk.java.net/; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = ["i686-linux" "x86_64-linux"]; + }; + + passthru = { + inherit architecture; + home = "${openjdk10}/lib/openjdk"; + }; + }; +in openjdk10 diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix deleted file mode 100644 index 72f0ba293ba999c391de49d321b8f83a9d3537ae..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/7.nix +++ /dev/null @@ -1,241 +0,0 @@ -{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype -, which, bootjdk, nettools, xorg, file, cups -, fontconfig, cpio, cacert, perl, setJavaClassPath -, minimal ? false -}: - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.system == "i686-linux" then - "i386" - else if stdenv.system == "x86_64-linux" then - "amd64" - else - throw "openjdk requires i686-linux or x86_64 linux"; - - update = "111"; - - build = "01"; - - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - paxflags = if stdenv.isi686 then "msp" else "m"; - - baseurl = "http://hg.openjdk.java.net/jdk7u/jdk7u"; - repover = "jdk7u${update}-b${build}"; - jdk7 = fetchurl { - url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "0wgb7hr2gipx1jg28fnsjh7xa744sh1mgr6z3xivmnsfy3dm91gi"; - }; - langtools = fetchurl { - url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0x1xs923h6sma02cbp1whg735x8vcndh5k01b7rkf714g6rxwa0y"; - }; - hotspot = fetchurl { - url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "187apnsvnd4cfa7ss5g59dbh7x5ah8f1lwa2wvjfv055h2cmphpn"; - }; - corba = fetchurl { - url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0vmxf5sgjcmkm7i1scanaa2x75a1byj8b36vcajlr6j7qmdx6r8c"; - }; - jdk = fetchurl { - url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1f8f2dgrjhx8aw1gzawrf8qggf5j0dygsla08bbsxhx5mc5a6cka"; - }; - jaxws = fetchurl { - url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "03982ajxm0hzany1jg009ym84vryx7a8qfi6wcgjxyxvk8vnz37c"; - }; - jaxp = fetchurl { - url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "0578h04y1ha60yjplsa8lqdjds9s2lxzgs9ybm9rs1rqzxmm0xmy"; - }; - openjdk = stdenv.mkDerivation rec { - name = "openjdk-7u${update}b${build}"; - - srcs = [ jdk7 langtools hotspot corba jdk jaxws jaxp ]; - sourceRoot = "."; - - outputs = [ "out" "jre" ]; - - buildInputs = - [ unzip procps ant which zip cpio nettools alsaLib - xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst - xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir - fontconfig perl file bootjdk - ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - NIX_LDFLAGS = if minimal then null else "-lfontconfig -lXcursor -lXinerama"; - - postUnpack = '' - ls | grep jdk | grep -v '^jdk7u' | awk -F- '{print $1}' | while read p; do - mv $p-* $(ls | grep '^jdk7u')/$p - done - cd jdk7u-* - - sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ - -e "s@/bin/ls@${coreutils}/bin/ls@" \ - hotspot/make/linux/makefiles/sa.make - - sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ - {jdk,corba}/make/common/shared/Defs-utils.gmk - - tar xf ${cups.src} - cupsDir=$(echo $(pwd)/cups-*) - makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) - ''; - - patches = [ - ./cppflags-include-fix.patch - ./fix-java-home.patch - ./paxctl.patch - ./read-truststore-from-env.patch - ./currency-date-range.patch - ]; - - NIX_NO_SELF_RPATH = true; - - makeFlags = [ - "SORT=${coreutils}/bin/sort" - "ALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h" - "FREETYPE_HEADERS_PATH=${freetype.dev}/include" - "FREETYPE_LIB_PATH=${freetype.out}/lib" - "MILESTONE=${update}" - "BUILD_NUMBER=b${build}" - "USRBIN_PATH=" - "COMPILER_PATH=" - "DEVTOOLS_PATH=" - "UNIXCOMMAND_PATH=" - "BOOTDIR=${bootjdk.home}" - "STATIC_CXX=false" - "UNLIMITED_CRYPTO=1" - "FULL_DEBUG_SYMBOLS=0" - ] ++ stdenv.lib.optional minimal "BUILD_HEADLESS=1"; - - configurePhase = "true"; - - preBuild = '' - # We also need to PaX-mark in the middle of the build - substituteInPlace hotspot/make/linux/makefiles/launcher.make \ - --replace XXX_PAXFLAGS_XXX ${paxflags} - substituteInPlace jdk/make/common/Program.gmk \ - --replace XXX_PAXFLAGS_XXX ${paxflags} - ''; - - installPhase = '' - mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk - - cp -av build/*/j2sdk-image/* $out/lib/openjdk - - # Move some stuff to top-level. - mv $out/lib/openjdk/include $out/include - mv $out/lib/openjdk/man $out/share/man - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove some broken manpages. - rm -rf $out/share/man/ja* - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample - - # Move the JRE to a separate output. - mv $out/lib/openjdk/jre $jre/lib/openjdk/ - mkdir $out/lib/openjdk/jre - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre - - rm -rf $out/lib/openjdk/jre/bin - ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin - - # Set PaX markings - exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - echo "to mark: *$exes*" - for file in $exes; do - echo "marking *$file*" - paxmark ${paxflags} "$file" - done - - # Remove duplicate binaries. - for i in $(cd $out/lib/openjdk/bin && echo *); do - if [ "$i" = java ]; then continue; fi - if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then - ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i - fi - done - - # Generate certificates. - pushd $jre/lib/openjdk/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - popd - - ln -s $out/lib/openjdk/bin $out/bin - ln -s $jre/lib/openjdk/jre/bin $jre/bin - ''; # */ - - # FIXME: this is unnecessary once the multiple-outputs branch is merged. - preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" - patchELF $jre - propagatedNativeBuildInputs+=" $jre" - - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $jre/nix-support - printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat < $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $outputs; do - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - - # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do - OUTPUTDIR="$(eval echo \$$output)" - BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)" - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done - ''; - - meta = { - homepage = http://openjdk.java.net/; - license = stdenv.lib.licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; - - passthru = { - inherit architecture; - home = "${openjdk}/lib/openjdk"; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 4499a9126a0cfcc65ec1b71d134964fb4d369800..705898a74f37cddee8ede5aabe6c2d26f2aaf0ee 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -14,49 +14,49 @@ let * The JRE libraries are in directories that depend on the CPU. */ architecture = - if stdenv.system == "i686-linux" then + if stdenv.hostPlatform.system == "i686-linux" then "i386" - else if stdenv.system == "x86_64-linux" then + else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else throw "openjdk requires i686-linux or x86_64 linux"; - update = "152"; - build = "16"; + update = "172"; + build = "02"; 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 = "12r5v6srwbm5hcfwz5kib7419a72cppls1d1xkrh5pjlina74zpf"; + sha256 = "0y28by4ifsaxhfrzq35654i8h9jjgvrw51hbxyg8pgfink0n30r2"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "002f0nfw2g3q41iy8cvaqyiglcy1fx9dglgik8gv067c2zslwwqm"; + sha256 = "0rxp4920xpd9khdg2ia1v1djcw1nndsjfis68whawi7s95zwpxy5"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0mnck2c3ky4hbcjfy6p3z831dxm1y2fkxq5k94zbswm4wcvlkzia"; + sha256 = "0sdf6rww290wgfqhaix1vjac244drdgg7hapb67wgj733kkdl711"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1xl3mc3hd5lwh1bxzck4hw60d678h3mjh144kq90iz8kfi197hpj"; + sha256 = "0vl3aryw3nclqprc35b2iriwfyr9fch3x8snjry1z5ajbdyd5c8b"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1hsfgjhp5nrsy4v6c282wq6cv37hgpm8l51cls0rnpbfqvd2cw16"; + sha256 = "1y5fnzxdll3q0jgqxsap3xb21bm1napdlqzs7h6c2l5qldyvw692"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "07ispgrzcf39nxs7a9yn6gkbq0ygdzlzyq32sfk57w6vy1mrgwjh"; + sha256 = "1yg1ik1klg8pl4b7izi2waqhs7vr6ln3fzc4k1siir4va5qhrhlm"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "1kj5w6gk579wh1iszq2bn6k1ib7kjpjf1lp46p5rqkx0qin79sn9"; + sha256 = "03srcj6hhvbdg1iqw85mfm1pwd6yvpykyz5nn4ydf930g4dyxfkf"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "1j9r5r8rihp02n0ciwqr01c07d91z1hs0069rd8hk6i03dkkhk84"; + sha256 = "12nn02jiq3vqgwhqh5yvxq1k92fy3n0jpvfpj1npq9fvimywry2k"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; @@ -93,7 +93,7 @@ let ./004_add-fontconfig.patch ./005_enable-infinality.patch ] ++ lib.optionals (!minimal && enableGnome2) [ - ./swing-use-gtk.patch + ./swing-use-gtk-jdk8.patch ]; preConfigure = '' @@ -206,13 +206,13 @@ let preFixup = '' prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" patchELF $jre - propagatedNativeBuildInputs+=" $jre" + propagatedBuildInputs+=" $jre" # Propagate the setJavaClassPath setup hook from the JRE so that # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support diff --git a/pkgs/development/compilers/openjdk/9.nix b/pkgs/development/compilers/openjdk/9.nix deleted file mode 100644 index ce556a32c11dc5225ea973a20e59df11c87762c6..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/9.nix +++ /dev/null @@ -1,262 +0,0 @@ -{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor -, libjpeg, giflib -, setJavaClassPath -, minimal ? false -#, enableInfinality ? true # font rendering patch -, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf -}: - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.system == "i686-linux" then - "i386" - else if stdenv.system == "x86_64-linux" then - "amd64" - else - throw "openjdk requires i686-linux or x86_64 linux"; - - update = ""; - build = "181"; - baseurl = "http://hg.openjdk.java.net/jdk9/jdk9"; - repover = "jdk-9${update}+${build}"; - paxflags = if stdenv.isi686 then "msp" else "m"; - jdk9 = fetchurl { - url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "0c7jwz4qvl93brs6c2v4dfc2v3lsv6ic0y72lkh04bnxg9343z82"; - }; - langtools = fetchurl { - url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "1wa5rjan6lcs8nnxndbwpw6gkx3qbw013s6zisjjczkcaiq044pp"; - }; - hotspot = fetchurl { - url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "00jnj19rim1gxpsxrpr8ifx1glwrbma3qjiy1ya7n5f08fb263hs"; - }; - corba = fetchurl { - url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1gvx6dblzj7rb8648iqwdiv36x97ibykgs323dd9044n3vbqihvj"; - }; - jdk = fetchurl { - url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "15pwdw6s03rfyw2gx06xg4f70bjl8j19ycssxiigj39h524xc9aw"; - }; - jaxws = fetchurl { - url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0jz32pjbgr77ybb2v1vwr1n9ljdrc3y0d5lrj072g3is1hmn2wbh"; - }; - jaxp = fetchurl { - url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "1jdxr9hcqx6va56ll5s2x9bx9dnlrs7zyvhjk1zgr5hxg5yfcqzr"; - }; - nashorn = fetchurl { - url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "12lihmw9ga6yhz0h26fvfablcjkkma0k3idjggmap97xha8zgd6n"; - }; - openjdk9 = stdenv.mkDerivation { - name = "openjdk-9${update}-b${build}"; - - srcs = [ jdk9 langtools hotspot corba jdk jaxws jaxp nashorn ]; - sourceRoot = "."; - - outputs = [ "out" "jre" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib - libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor lndir fontconfig - ] ++ lib.optionals (!minimal && enableGnome2) [ - gtk2 gnome_vfs GConf glib - ]; - - #move the seven other source dirs under the main jdk8u directory, - #with version suffixes removed, as the remainder of the build will expect - prePatch = '' - mainDir=$(find . -maxdepth 1 -name jdk9\*); - find . -maxdepth 1 -name \*jdk\* -not -name jdk9\* | awk -F- '{print $1}' | while read p; do - mv $p-* $mainDir/$p - done - cd $mainDir - ''; - - patches = [ - ./fix-java-home-jdk9.patch - ./read-truststore-from-env-jdk9.patch - ./currency-date-range-jdk8.patch - #] ++ lib.optionals (!minimal && enableInfinality) [ - # ./004_add-fontconfig.patch - # ./005_enable-infinality.patch - ] ++ lib.optionals (!minimal && enableGnome2) [ - ./swing-use-gtk-jdk9.patch - ]; - - preConfigure = '' - chmod +x configure - substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - - configureFlagsArray=( - "--with-boot-jdk=${bootjdk.home}" - "--with-update-version=${update}" - "--with-build-number=${build}" - "--with-milestone=fcs" - "--enable-unlimited-crypto" - "--disable-debug-symbols" - "--disable-freetype-bundling" - "--with-zlib=system" - "--with-giflib=system" - "--with-stdc++lib=dynamic" - - # glibc 2.24 deprecated readdir_r so we need this - # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" - '' - + lib.optionalString minimal "\"--enable-headless-only\"" - + ");" - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - + stdenv.lib.optionalString stdenv.cc.isGNU '' - NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" - ''; - - NIX_LDFLAGS= lib.optionals (!minimal) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!minimal && enableGnome2) [ - "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]; - - buildFlags = [ "all" ]; - - installPhase = '' - mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk - - cp -av build/*/images/jdk/* $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir $out/include $out/share/man - ln -s $out/lib/openjdk/include/* $out/include/ - ln -s $out/lib/openjdk/man/* $out/share/man/ - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Copy the JRE to a separate output and setup fallback fonts - cp -av build/*/images/jre $jre/lib/openjdk/ - mkdir $out/lib/openjdk/jre - ${lib.optionalString (!minimal) '' - mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback - lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback - ''} - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString minimal '' - for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do - rm ''${d}/{libjsound,libjsoundalsa,libawt*,libfontmanager}.so - done - ''} - - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre - - # Make sure cmm/*.pf are not symlinks: - # https://youtrack.jetbrains.com/issue/IDEA-147272 - # in 9, it seems no *.pf files end up in $out ... ? - # rm -rf $out/lib/openjdk/jre/lib/cmm - # ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm - - # Set PaX markings - exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - echo "to mark: *$exes*" - for file in $exes; do - echo "marking *$file*" - paxmark ${paxflags} "$file" - done - - # Remove duplicate binaries. - for i in $(cd $out/lib/openjdk/bin && echo *); do - if [ "$i" = java ]; then continue; fi - if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then - ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i - fi - done - - # Generate certificates. - ( - cd $jre/lib/openjdk/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - ) - - ln -s $out/lib/openjdk/bin $out/bin - ln -s $jre/lib/openjdk/jre/bin $jre/bin - ln -s $jre/lib/openjdk/jre $out/jre - ''; - - # FIXME: this is unnecessary once the multiple-outputs branch is merged. - preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" - patchELF $jre - propagatedNativeBuildInputs+=" $jre" - - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $jre/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat < $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $outputs; do - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - - # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done - ''; - - meta = with stdenv.lib; { - homepage = http://openjdk.java.net/; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; - }; - - passthru = { - inherit architecture; - home = "${openjdk9}/lib/openjdk"; - }; - }; -in openjdk9 diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 48a22638813f7f7f86922cd8d84d15392c2a67d9..3c29df7ec78e8c9471522da098b33568fe71f3bc 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -1,33 +1,25 @@ -{ stdenv, runCommand, glibc, fetchurl, file +{ stdenv +, runCommand, fetchurl, file, zlib , version }: +assert stdenv.hostPlatform.libc == "glibc"; + let - # !!! These should be on nixos.org - src = if glibc.system == "x86_64-linux" then - (if version == "8" then - fetchurl { - url = "https://www.dropbox.com/s/a0lsq2ig4uguky5/openjdk8-bootstrap-x86_64-linux.tar.xz?dl=1"; - sha256 = "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"; - } - else if version == "7" then - fetchurl { - url = "https://www.dropbox.com/s/rssfbeommrfbsjf/openjdk7-bootstrap-x86_64-linux.tar.xz?dl=1"; - sha256 = "024gg2sgg4labxbc1nhn8lxls2p7d9h3b82hnsahwaja2pm1hbra"; - } + fetchboot = version: arch: sha256: fetchurl { + name = "openjdk${version}-bootstrap-${arch}-linux.tar.xz"; + url = "http://tarballs.nixos.org/openjdk/2018-03-31/${version}/${arch}-linux.tar.xz"; + inherit sha256; + }; + + src = if stdenv.hostPlatform.system == "x86_64-linux" then + (if version == "10" then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2" + else if version == "8" then fetchboot "8" "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks" else throw "No bootstrap for version") - else if glibc.system == "i686-linux" then - (if version == "8" then - fetchurl { - url = "https://www.dropbox.com/s/rneqjhlerijsw74/openjdk8-bootstrap-i686-linux.tar.xz?dl=1"; - sha256 = "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"; - } - else if version == "7" then - fetchurl { - url = "https://www.dropbox.com/s/6xe64td7eg2wurs/openjdk7-bootstrap-i686-linux.tar.xz?dl=1"; - sha256 = "0xwqjk1zx8akziw8q9sbjc1rs8s7c0w6mw67jdmmi26cwwp8ijnx"; - } + else if stdenv.hostPlatform.system == "i686-linux" then + (if version == "10" then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7" + else if version == "8" then fetchboot "8" "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9" else throw "No bootstrap for version") else throw "No bootstrap for system"; @@ -39,22 +31,18 @@ let LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')" - for i in $out/bin/*; do - patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $i || true - patchelf --set-rpath "${glibc.out}/lib:$LIBDIRS" $i || true - done - - find $out -name \*.so\* | while read lib; do - patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $lib || true - patchelf --set-rpath "${glibc.out}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" $lib || true + find "$out" -type f -print0 | while IFS= read -r -d "" elf; do + isELF "$elf" || continue + patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true + patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true done # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: - exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - for file in $exes; do - paxmark m "$file" + find "$out/bin" -type f -print0 | while IFS= read -r -d "" elf; do + isELF "$elf" || continue + paxmark m "$elf" # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} + ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$elf"''} done ''; in bootstrap diff --git a/pkgs/development/compilers/openjdk/cppflags-include-fix.patch b/pkgs/development/compilers/openjdk/cppflags-include-fix.patch deleted file mode 100644 index 8931c122538f2a22ff150092584de4a829b68649..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/cppflags-include-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk ---- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2012-08-28 19:13:16.000000000 -0400 -+++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-01-22 11:56:22.315418708 -0500 -@@ -234,12 +234,6 @@ - endif # !HEADLESS - endif # PLATFORM - --ifeq ($(PLATFORM), linux) -- # Checking for the X11/extensions headers at the additional location -- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \ -- $(wildcard /usr/include/X11/extensions)) --endif -- - ifeq ($(PLATFORM), macosx)) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ - -I$(OPENWIN_HOME)/include diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch b/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch new file mode 100644 index 0000000000000000000000000000000000000000..e058eff0746609242ecfa1a2e51357b8aece95d8 --- /dev/null +++ b/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch @@ -0,0 +1,13 @@ +--- ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java ++++ ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java +@@ -281,8 +281,8 @@ + checkCurrencyCode(newCurrency); + String timeString = currencyInfo.substring(4, length - 4); + long time = format.parse(timeString).getTime(); +- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { +- throw new RuntimeException("time is more than 10 years from present: " + time); ++ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) { ++ throw new RuntimeException("time is more than 20 years from present: " + time); + } + specialCaseCutOverTimes[specialCaseCount] = time; + specialCaseOldCurrencies[specialCaseCount] = oldCurrency; diff --git a/pkgs/development/compilers/openjdk/currency-date-range.patch b/pkgs/development/compilers/openjdk/currency-date-range.patch deleted file mode 100644 index b1c461591d1e7df9a477b30d9bfbb0a51c885e1b..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/currency-date-range.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur openjdk-7u65-b32-upstream/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk-7u65-b32/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java ---- openjdk-7u65-b32-upstream/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-07-17 05:42:14.000000000 -0430 -+++ openjdk-7u65-b32/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-12-30 10:15:50.327905933 -0430 -@@ -281,8 +281,8 @@ - checkCurrencyCode(newCurrency); - String timeString = currencyInfo.substring(4, length - 4); - long time = format.parse(timeString).getTime(); -- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { -- throw new RuntimeException("time is more than 10 years from present: " + time); -+ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) { -+ throw new RuntimeException("time is more than 20 years from present: " + time); - } - specialCaseCutOverTimes[specialCaseCount] = time; - specialCaseOldCurrencies[specialCaseCount] = oldCurrency; diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix similarity index 98% rename from pkgs/development/compilers/openjdk-darwin/8.nix rename to pkgs/development/compilers/openjdk/darwin/8.nix index 6234b63208cd9286cd9d957afd9a2262f478bc97..cc7c5fd371d2e5389da36d2d2b2adee54626ae17 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -33,7 +33,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6ecc785be3b93a86d192ee3af3fccd911c7494ec --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: +let + jdk = stdenv.mkDerivation { + name = "openjdk-7u60b30"; + + # From https://github.com/alexkasko/openjdk-unofficial-builds + src = fetchurl { + url = https://bitbucket.org/alexkasko/openjdk-unofficial-builds/downloads/openjdk-1.7.0-u60-unofficial-macosx-x86_64-bundle.zip; + sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401"; + }; + + buildInputs = [ unzip freetype ]; + + installPhase = '' + mv */Contents/Home $out + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + passthru = { + jre = jdk; + home = jdk; + }; + + meta.platforms = stdenv.lib.platforms.darwin; + + }; +in jdk diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch new file mode 100644 index 0000000000000000000000000000000000000000..c037fde29722f3317f66508fd9e24a2ff2a096a0 --- /dev/null +++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch @@ -0,0 +1,14 @@ +--- a/src/hotspot/os/linux/os_linux.cpp 2017-07-04 23:09:02.533972226 -0400 ++++ b/src/hotspot/os/linux/os_linux.cpp 2017-07-04 23:07:52.118338845 -0400 +@@ -2270,8 +2270,5 @@ + assert(ret, "cannot locate libjvm"); + char *rp = NULL; + if (ret && dli_fname[0] != '\0') { +- rp = os::Posix::realpath(dli_fname, buf, buflen); +- } +- if (rp == NULL) { +- return; ++ snprintf(buf, buflen, "%s", dli_fname); + } + + if (Arguments::sun_java_launcher_is_altjvm()) { diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch deleted file mode 100644 index f9755d58e48f1a913e6e56e0bc4940c183f26edd..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/fix-java-home-jdk9.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-04 23:09:02.533972226 -0400 -+++ b/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-04 23:07:52.118338845 -0400 -@@ -2318,10 +2318,7 @@ - assert(ret, "cannot locate libjvm"); - char *rp = NULL; - if (ret && dli_fname[0] != '\0') { -- rp = realpath(dli_fname, buf); -- } -- if (rp == NULL) { -- return; -+ snprintf(buf, buflen, "%s", dli_fname); - } - - if (Arguments::sun_java_launcher_is_altjvm()) { diff --git a/pkgs/development/compilers/openjdk/fix-java-home.patch b/pkgs/development/compilers/openjdk/fix-java-home.patch deleted file mode 100644 index 5def344f1717dbf32ac05c93702588a6c73304a5..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/fix-java-home.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-09-06 20:22:03.000000000 +0200 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-01-24 22:44:08.223857012 +0100 -@@ -2358,12 +2358,10 @@ - CAST_FROM_FN_PTR(address, os::jvm_path), - dli_fname, sizeof(dli_fname), NULL); - assert(ret, "cannot locate libjvm"); - char *rp = NULL; - if (ret && dli_fname[0] != '\0') { -- rp = realpath(dli_fname, buf); -+ snprintf(buf, buflen, "%s", dli_fname); - } -- if (rp == NULL) -- return; - - if (Arguments::created_by_gamma_launcher()) { - // Support for the gamma launcher. Typical value for buf is diff --git a/pkgs/development/compilers/openjdk/paxctl.patch b/pkgs/development/compilers/openjdk/paxctl.patch deleted file mode 100644 index 12528a601cc8fd25274a354ee1747b40b10bcdb4..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/paxctl.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/hotspot/make/linux/makefiles/launcher.make b/hotspot/make/linux/makefiles/launcher.make -index 34bbcd6..41b9332 100644 ---- a/hotspot/make/linux/makefiles/launcher.make -+++ b/hotspot/make/linux/makefiles/launcher.make -@@ -83,6 +83,8 @@ $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) - $(QUIETLY) echo Linking launcher... - $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) - $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER) -+ paxctl -c $(LAUNCHER) -+ paxctl -zex -XXX_PAXFLAGS_XXX $(LAUNCHER) - $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK) - - $(LAUNCHER): $(LAUNCHER_SCRIPT) -diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk -index 091800d..1de8cb4 100644 ---- a/jdk/make/common/Program.gmk -+++ b/jdk/make/common/Program.gmk -@@ -60,6 +60,10 @@ ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME) - program_default_rule: all - - program: $(ACTUAL_PROGRAM) -+ if [[ "$(PROGRAM)" = "java" ]]; then \ -+ paxctl -c $(ACTUAL_PROGRAM); \ -+ paxctl -zex -XXX_PAXFLAGS_XXX $(ACTUAL_PROGRAM); \ -+ fi - - # Work-around for missing processor specific mapfiles - ifndef CROSS_COMPILE_ARCH diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch new file mode 100644 index 0000000000000000000000000000000000000000..b5abc1d794db433e8f6ad3f6cebae7cb4f6fa207 --- /dev/null +++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch @@ -0,0 +1,20 @@ +--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 ++++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400 +@@ -71,6 +71,7 @@ + * + * The preference of the default trusted KeyStore is: + * javax.net.ssl.trustStore ++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE + * jssecacerts + * cacerts + */ +@@ -144,6 +145,9 @@ + String temporaryName = ""; + File temporaryFile = null; + long temporaryTime = 0L; ++ if (storePropName == null){ ++ storePropName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); ++ } + if (!"NONE".equals(storePropName)) { + String[] fileNames = + new String[] {storePropName, defaultStore}; diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch deleted file mode 100644 index cb8d59ff8063ddd5b51450e37f7327119f714f80..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk9.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 -+++ b/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java.new 2017-07-05 20:45:57.491295030 -0400 -@@ -71,6 +71,7 @@ - * - * The preference of the default trusted KeyStore is: - * javax.net.ssl.trustStore -+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE - * jssecacerts - * cacerts - */ -@@ -144,6 +145,9 @@ - String temporaryName = ""; - File temporaryFile = null; - long temporaryTime = 0L; -+ if (storePropName == null){ -+ storePropName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); -+ } - if (!"NONE".equals(storePropName)) { - String[] fileNames = - new String[] {storePropName, defaultStore}; diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch deleted file mode 100644 index 8fb0f409d0ab6ce8f113705afcc1698ad63a0bac..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/read-truststore-from-env.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200 -+++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100 -@@ -158,6 +158,7 @@ - /* - * Try: - * javax.net.ssl.trustStore (if this variable exists, stop) -+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE - * jssecacerts - * cacerts - * -@@ -165,6 +166,9 @@ - */ - - storeFileName = props.get("trustStore"); -+ if (storeFileName == null) { -+ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); -+ } - if (!"NONE".equals(storeFileName)) { - if (storeFileName != null) { - storeFile = new File(storeFileName); diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch new file mode 100644 index 0000000000000000000000000000000000000000..b9258c500db4dc82aef5d5947f1b9f50e461356b --- /dev/null +++ b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch @@ -0,0 +1,24 @@ +--- a/src/java.desktop/share/classes/javax/swing/UIManager.java ++++ b/src/java.desktop/share/classes/javax/swing/UIManager.java +@@ -607,11 +607,9 @@ + if (osType == OSInfo.OSType.WINDOWS) { + return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; + } else { +- String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop")); + Toolkit toolkit = Toolkit.getDefaultToolkit(); +- if ("gnome".equals(desktop) && +- toolkit instanceof SunToolkit && +- ((SunToolkit) toolkit).isNativeGTKAvailable()) { ++ if (toolkit instanceof SunToolkit && ++ ((SunToolkit) toolkit).isNativeGTKAvailable()) { + // May be set on Linux and Solaris boxs. + return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"; + } +@@ -1341,7 +1339,7 @@ + lafName = (String) lafData.remove("defaultlaf"); + } + if (lafName == null) { +- lafName = getCrossPlatformLookAndFeelClassName(); ++ lafName = getSystemLookAndFeelClassName(); + } + lafName = swingProps.getProperty(defaultLAFKey, lafName); diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch similarity index 100% rename from pkgs/development/compilers/openjdk/swing-use-gtk.patch rename to pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch deleted file mode 100644 index 07d95ba71b8a59d20a370660e2aaa37e1a240804..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk9.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ru3 a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/share/classes/javax/swing/UIManager.java ---- a/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java 2016-07-26 00:41:37.000000000 +0300 -+++ b/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java 2016-10-02 22:46:01.890071761 +0300 -@@ -607,11 +607,9 @@ - if (osType == OSInfo.OSType.WINDOWS) { - return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; - } else { -- String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop")); - Toolkit toolkit = Toolkit.getDefaultToolkit(); -- if ("gnome".equals(desktop) && -- toolkit instanceof SunToolkit && -- ((SunToolkit) toolkit).isNativeGTKAvailable()) { -+ if (toolkit instanceof SunToolkit && -+ ((SunToolkit) toolkit).isNativeGTKAvailable()) { - // May be set on Linux and Solaris boxs. - return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"; - } -@@ -1341,7 +1339,7 @@ - lafName = (String) lafData.remove("defaultlaf"); - } - if (lafName == null) { -- lafName = getCrossPlatformLookAndFeelClassName(); -+ lafName = getSystemLookAndFeelClassName(); - } - lafName = swingProps.getProperty(defaultLAFKey, lafName); - diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 2a00cf5f2d29c9f6aff4ec8d3f5a1e179ab9926d..baa136b798d98681bd7a4b1efdd647d8c5704162 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -1,9 +1,7 @@ { productVersion , patchVersion , downloadUrl -, sha256_i686 -, sha256_x86_64 -, sha256_armv7l +, sha256 , jceName , jceDownloadUrl , sha256JCE @@ -24,7 +22,7 @@ , libav_0_8 , ffmpeg , libxslt -, mesa_noglu +, libGL , freetype , fontconfig , gtk2 @@ -36,26 +34,19 @@ , setJavaClassPath }: -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. */ - architecture = - if stdenv.system == "i686-linux" then - "i386" - else if stdenv.system == "x86_64-linux" then - "amd64" - else if stdenv.system == "armv7l-linux" then - "arm" - else - abortArch; + architecture = { + i686-linux = "i386"; + x86_64-linux = "amd64"; + armv7l-linux = "arm"; + aarch64-linux = "aarch64"; + }.${stdenv.system}; jce = if installjce then @@ -80,27 +71,16 @@ let result = stdenv.mkDerivation rec { name = if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}"; - src = - if stdenv.system == "i686-linux" then - requireFile { - name = "jdk-${productVersion}u${patchVersion}-linux-i586.tar.gz"; - url = downloadUrl; - sha256 = sha256_i686; - } - else if stdenv.system == "x86_64-linux" then - requireFile { - name = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz"; - 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 - abortArch; + src = requireFile { + name = { + i686-linux = "jdk-${productVersion}u${patchVersion}-linux-i586.tar.gz"; + x86_64-linux = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz"; + armv7l-linux = "jdk-${productVersion}u${patchVersion}-linux-arm32-vfp-hflt.tar.gz"; + aarch64-linux = "jdk-${productVersion}u${patchVersion}-linux-arm64-vfp-hflt.tar.gz"; + }.${stdenv.system}; + url = downloadUrl; + sha256 = sha256.${stdenv.system}; + }; nativeBuildInputs = [ file ] ++ stdenv.lib.optional installjce unzip; @@ -116,7 +96,7 @@ let result = stdenv.mkDerivation rec { # Set PaX markings exes=$(file $sourceRoot/bin/* $sourceRoot/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') for file in $exes; do - paxmark m "$file" + paxmark m "$file" || true # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} done @@ -166,7 +146,7 @@ let result = stdenv.mkDerivation rec { ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs # Set JAVA_HOME automatically. cat <> $out/nix-support/setup-hook @@ -197,7 +177,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 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; @@ -212,7 +192,7 @@ let result = stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" ]; # some inherit jre.meta.platforms + platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms }; }; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix new file mode 100644 index 0000000000000000000000000000000000000000..642c17dc6d3f2ef98b74ecb605c9abfbb0b93a3b --- /dev/null +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -0,0 +1,158 @@ +{ swingSupport ? true +, stdenv +, requireFile +, makeWrapper +, unzip +, file +, xorg ? null +, packageType ? "JDK" # JDK, JRE, or ServerJRE +, pluginSupport ? true +, glib +, libxml2 +, ffmpeg_2 +, libxslt +, libGL +, freetype +, fontconfig +, gtk2 +, pango +, cairo +, alsaLib +, atk +, gdk_pixbuf +, zlib +, elfutils +, setJavaClassPath +}: + +assert stdenv.system == "x86_64-linux"; +assert swingSupport -> xorg != null; + +let + version = "10.0.1"; + + downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; + + rSubPaths = [ + "lib/jli" + "lib/server" + "lib" + ]; + +in + +let result = stdenv.mkDerivation rec { + name = if packageType == "JDK" then "oraclejdk-${version}" + else if packageType == "JRE" then "oraclejre-${version}" + else if packageType == "ServerJRE" then "oracleserverjre-${version}" + else abort "unknown package Type ${packageType}"; + + src = + if packageType == "JDK" then + requireFile { + name = "jdk-${version}_linux-x64_bin.tar.gz"; + url = "${downloadUrlBase}/jdk10-downloads-4416644.html"; + sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf"; + } + else if packageType == "JRE" then + requireFile { + name = "jre-${version}_linux-x64_bin.tar.gz"; + url = "${downloadUrlBase}/jre10-downloads-4417026.html"; + sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq"; + } + else if packageType == "ServerJRE" then + requireFile { + name = "serverjre-${version}_linux-x64_bin.tar.gz"; + url = "${downloadUrlBase}/sjre10-downloads-4417025.html"; + sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw"; + } + else abort "unknown package Type ${packageType}"; + + nativeBuildInputs = [ file ]; + + buildInputs = [ makeWrapper ]; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + # Set PaX markings + exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + for file in $exes; do + paxmark m "$file" + # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. + ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} + done + + mv $sourceRoot $out + + shopt -s extglob + for file in $out/* + do + if test -f $file ; then + rm $file + fi + done + + if test -z "$pluginSupport"; then + rm -f $out/bin/javaws + fi + + mkdir $out/lib/plugins + ln -s $out/lib/libnpjp2.so $out/lib/plugins + + # for backward compatibility + ln -s $out $out/jre + + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + postFixup = '' + rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${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 -x $out/bin/jmc; then + wrapProgram "$out/bin/jmc" \ + --suffix-each LD_LIBRARY_PATH ':' "$rpath" + fi + ''; + + /** + * libXt is only needed on amd64 + */ + libraries = + [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++ + (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.mozillaPlugin = "/lib/plugins"; + + passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package + + passthru.home = result; + + # for backward compatibility + passthru.architecture = ""; + + meta = with stdenv.lib; { + license = licenses.unfree; + platforms = [ "x86_64-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 f8f37160a26f4b4d91730f0be736ccb1e2cbd684..bdd367ef35238516e9b5fd4973c060e7388b880f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,10 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "151"; + patchVersion = "171"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0w1snn9hxwvdnk77frhdzbsm6v30v99dy5zmpy8ij7yxd57z6ql0"; - sha256_x86_64 = "0zq2dxbxmshz080yskhc8y2wbqi0y0kl9girxjbb4rwk837010n7"; - sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb"; + sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p"; + sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn"; + sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0"; + sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7"; 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 863621bf6b07ec6075f5d79f44b1c62c9764ef8e..901eea0f8f1575ddadcb7056b618bb7bcc8381be 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,10 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "152"; + patchVersion = "172"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0gjc7kcfx40f43z1w1qsn1fqxdz8d46wml2g11qgm55ishhv2q7w"; - sha256_x86_64 = "1gv1348hrgna9l3sssv3g9jzs37y1lkx05xq83chav9z1hs3p2r1"; - sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb"; + sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa"; + sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818"; + sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln"; + sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s"; 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/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix deleted file mode 100644 index fbda96e1425849d53543a32ddc07cd9e11fd847e..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix +++ /dev/null @@ -1,175 +0,0 @@ -{ swingSupport ? true -, stdenv -, requireFile -, makeWrapper -, unzip -, file -, xorg ? null -, packageType ? "JDK" # JDK, JRE, or ServerJRE -, pluginSupport ? true -, installjce ? false -, glib -, libxml2 -, ffmpeg_2 -, libxslt -, mesa_noglu -, freetype -, fontconfig -, gtk2 -, pango -, cairo -, alsaLib -, atk -, gdk_pixbuf -, zlib -, elfutils -, setJavaClassPath -}: - -assert stdenv.system == "x86_64-linux"; -assert swingSupport -> xorg != null; - -let - version = "9.0.1"; - - downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; - - jce = - if installjce then - requireFile { - name = "jce_policy-8.zip"; - url = "${downloadUrlBase}/jce8-download-2133166.html"; - sha256 = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; - } - else - ""; - - rSubPaths = [ - "lib/jli" - "lib/server" - "lib" - ]; - -in - -let result = stdenv.mkDerivation rec { - name = if packageType == "JDK" then "oraclejdk-${version}" - else if packageType == "JRE" then "oraclejre-${version}" - else if packageType == "ServerJRE" then "oracleserverjre-${version}" - else abort "unknown package Type ${packageType}"; - - src = - if packageType == "JDK" then - requireFile { - name = "jdk-${version}_linux-x64_bin.tar.gz"; - url = "${downloadUrlBase}/jdk9-downloads-3848520.html"; - sha256 = "0560dc3icrwb0ifykshvzkr04b1jr153m26x1r8rp0nhjbzz1nic"; - } - else if packageType == "JRE" then - requireFile { - name = "jre-${version}_linux-x64_bin.tar.gz"; - url = "${downloadUrlBase}/jre9-downloads-3848532.html"; - sha256 = "11pfcck8am48yv7riaj10g6h79xdiy8lm5a9wjqbm3g9cls9ar1w"; - } - else if packageType == "ServerJRE" then - requireFile { - name = "serverjre-${version}_linux-x64_bin.tar.gz"; - url = "${downloadUrlBase}/server-jre9-downloads-3848530.html"; - sha256 = "1biyks6jy0a2kksaj9qbsjifv34ym5mdw8akibmkwr1xh0wavygc"; - } - else abort "unknown package Type ${packageType}"; - - nativeBuildInputs = [ file ] - ++ stdenv.lib.optional installjce unzip; - - buildInputs = [ makeWrapper ]; - - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; - - installPhase = '' - cd .. - - # Set PaX markings - exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - for file in $exes; do - paxmark m "$file" - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} - done - - mv $sourceRoot $out - - shopt -s extglob - for file in $out/* - do - if test -f $file ; then - rm $file - fi - done - - if test -n "${jce}"; then - unzip ${jce} - cp -v UnlimitedJCEPolicy*/*.jar $out/lib/security - fi - - if test -z "$pluginSupport"; then - rm -f $out/bin/javaws - fi - - mkdir $out/lib/plugins - ln -s $out/lib/libnpjp2.so $out/lib/plugins - - # for backward compatibility - ln -s $out $out/jre - - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs - - # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${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 -x $out/bin/jmc; then - wrapProgram "$out/bin/jmc" \ - --suffix-each LD_LIBRARY_PATH ':' "$rpath" - fi - ''; - - /** - * libXt is only needed on amd64 - */ - libraries = - [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++ - (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.mozillaPlugin = "/lib/plugins"; - - passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - - passthru.home = result; - - # for backward compatibility - passthru.architecture = ""; - - meta = with stdenv.lib; { - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms - }; - -}; in result diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 543fc6dfa48fab7a14ce9c1efc60253d73cb9149..9fc9007abb9e3cb92c466a19f7321a0ec00f9f05 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "orc-0.4.27"; + name = "orc-0.4.28"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; - sha256 = "14vbwdydwarcvswzf744jdjb3ibhv6k4j6hzdacfan41zic3xrai"; + sha256 = "bfcd7c6563b05672386c4eedfc4c0d4a0a12b4b4775b74ec6deb88fc2bcd83ce"; }; outputs = [ "out" "dev" ]; @@ -15,10 +15,8 @@ stdenv.mkDerivation rec { sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc ''; - # building memcpy_speed.log - # ../test-driver: line 107: 4495 Segmentation fault "$@" > $log_file 2>&1 - # FAIL: memcpy_speed - doCheck = false; # see https://bugzilla.gnome.org/show_bug.cgi?id=728129#c7 + # https://bugzilla.gnome.org/show_bug.cgi?id=728129#c15 + doCheck = stdenv.system != "i686-linux"; # not sure about cross-compiling meta = with stdenv.lib; { description = "The Oil Runtime Compiler"; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index b01914afc295075e19c9bfa4679fc5420a7af50a..4e2f8b2af5b4e4d917e1fe71a7ac5748877af0f9 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - descripton = "A functional lisp"; + description = "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 390d37dd245f218d5775827df9f5551b9c29f485..de5b85055273062b470c52b50c6c0d44c2a006ed 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "polyml-${version}"; - version = "5.7"; + version = "5.7.1"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "polyml"; repo = "polyml"; rev = "v${version}"; - sha256 = "10nsljmcl0zjbcc7ifc991ypwfwq5gh4rcp5rg4nnb706c6bs16y"; + sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 8c744e7038e83787db79eebb841547c52ac70207..28f12b8ba370246db2739b8342cff5e49de51e67 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.20.0"; + version = "0.21.3"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0shln9v0bp0q9qfipm3834vl284q5vwz9333yzgx46d0l2ivggyi"; + sha256 = "0cdp6wbpirl3jnlqkm0hbxyz67v00nwhi4hvk4sq2g74f36j2bnm"; }; buildInputs = [ llvm makeWrapper which ]; @@ -69,8 +69,10 @@ stdenv.mkDerivation ( rec { + stdenv.lib.optionalString stdenv.isDarwin '' bits=64 '' + stdenv.lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no '' + '' install - mv $out/bin/ponyc $out/bin/ponyc.wrapped - makeWrapper $out/bin/ponyc.wrapped $out/bin/ponyc \ + + wrapProgram $out/bin/ponyc \ + --prefix PATH ":" "${stdenv.cc}/bin" \ + --set-default CC "$CC" \ --prefix PONYPATH : "$out/lib" \ --prefix PONYPATH : "${stdenv.lib.getLib pcre2}/lib" \ --prefix PONYPATH : "${stdenv.lib.getLib libressl}/lib" @@ -84,6 +86,6 @@ stdenv.mkDerivation ( rec { homepage = http://www.ponylang.org; license = licenses.bsd2; maintainers = with maintainers; [ doublec kamilchm patternspandemic ]; - platforms = subtractLists platforms.i686 platforms.unix; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }) diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/pkgs/development/compilers/ponyc/disable-tests.patch index 38740cf963ebc2e726e86633b96f8e4ef45a3d7f..d15561721e22c588710ee7596e70fc0ef5c748c5 100644 --- a/pkgs/development/compilers/ponyc/disable-tests.patch +++ b/pkgs/development/compilers/ponyc/disable-tests.patch @@ -1,19 +1,27 @@ -diff -Naur a/packages/net/_test.pony b/packages/net/_test.pony ---- a/packages/net/_test.pony 1970-01-01 01:00:01.000000000 +0100 -+++ b/packages/net/_test.pony 2016-12-01 22:25:59.102433053 +0100 -@@ -5,14 +5,7 @@ +diff --git a/packages/net/_test.pony b/packages/net/_test.pony +index baf29e7..b63f368 100644 +--- a/packages/net/_test.pony ++++ b/packages/net/_test.pony +@@ -5,9 +5,6 @@ actor Main is TestList new make() => None fun tag tests(test: PonyTest) => -- test(_TestBroadcast) -- test(_TestTCPWritev) -- test(_TestTCPExpect) -- test(_TestTCPMute) -- test(_TestTCPUnmute) -- ifdef not windows then -- test(_TestTCPThrottle) +- ifdef not osx then +- test(_TestBroadcast) - end -+ None + test(_TestTCPWritev) + test(_TestTCPExpect) + test(_TestTCPMute) +diff --git a/packages/net/http/_test.pony b/packages/net/http/_test.pony +index e55d5a7..40a4cb6 100644 +--- a/packages/net/http/_test.pony ++++ b/packages/net/http/_test.pony +@@ -29,8 +29,6 @@ actor Main is TestList + test(_Valid) + test(_ToStringFun) + +- test(_HTTPConnTest) +- + class iso _Encode is UnitTest + fun name(): String => "net/http/URLEncode.encode" - class _TestPing is UDPNotify - let _h: TestHelper diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 8b2a0a0eb391988f1de3c4e5d19ee73b08005a6c..d94179e16fe94c75f5b54fa7011db43eae1576d2 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -4,13 +4,13 @@ with lib; mkDerivation rec { pname = "psc-package"; - version = "0.2.4"; + version = "0.3.2"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "0m1vcxa5zs4sqnnwgmxkhw1isdlmirp12yimn5345vwfvlxkc8kp"; + sha256 = "1zpzcyh82xl0grvgcj8b7yzh053i9z94kbym5qrv413pcx7w50cm"; }; isLibrary = false; @@ -22,5 +22,5 @@ mkDerivation rec { description = "An experimental package manager for PureScript"; license = licenses.bsd3; - maintainers = with lib.maintainers; [ profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch ]; } diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index a4f0442d9d1b2c3824f0686312f92060778899eb..649f4bc4582b9a661cdae1e38e535474cd016cb0 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,31 +1,32 @@ { stdenv, makeWrapper, buildOcaml, fetchFromGitHub, - ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }: + ocaml, opam, jbuilder, menhir, merlin_extend, ppx_tools_versioned, utop }: buildOcaml rec { name = "reason"; - version = "3.0.0"; + version = "3.0.4"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; rev = version; - sha256 = "0vj3y9vlm9gqvj9grmb9n487avbrj4q5611m7wv1bsdpndvv96jr"; + sha256 = "15qhx85him5rr4j0ygj3jh3qv9ijrn82ibr9scbn0qrnn43kj047"; }; propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; - buildInputs = [ makeWrapper opam topkg utop menhir opam topkg ]; + buildInputs = [ makeWrapper opam jbuilder utop menhir ]; 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" + substituteInPlace src/reasonbuild/myocamlbuild.ml \ + --replace "refmt --print binary" "$out/bin/refmt --print binary" ''; installPhase = '' - ${topkg.installPhase} + ${jbuilder.installPhase} wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ @@ -33,7 +34,7 @@ buildOcaml rec { ''; meta = with stdenv.lib; { - homepage = https://facebook.github.io/reason/; + homepage = https://reasonml.github.io/; description = "Facebook's friendly syntax to OCaml"; license = licenses.bsd3; maintainers = [ maintainers.volth ]; diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index e67b305106e168f775188b1cfc320fc9b05ef424..1904c12dfdc14440b08a3d79837d82f8929f60e8 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl, darwin +{ stdenv, fetchurl, makeWrapper, bash, cacert, zlib, buildRustPackage, curl, darwin , version , src , platform @@ -12,26 +12,6 @@ let bootstrapping = versionType == "bootstrap"; - patchBootstrapCargo = '' - ${optionalString (stdenv.isLinux && bootstrapping) '' - patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/cargo" - ''} - ${optionalString (stdenv.isDarwin && bootstrapping) '' - install_name_tool \ - -change /usr/lib/libiconv.2.dylib '${getLib libiconv}/lib/libiconv.2.dylib' \ - "$out/bin/cargo" - install_name_tool \ - -change /usr/lib/libcurl.4.dylib '${getLib curl}/lib/libcurl.4.dylib' \ - "$out/bin/cargo" - install_name_tool \ - -change /usr/lib/libz.1.dylib '${getLib zlib}/lib/libz.1.dylib' \ - "$out/bin/cargo" - ''} - ''; - installComponents = "rustc,rust-std-${platform}" + (optionalString bootstrapping ",rust-docs,cargo") @@ -54,9 +34,11 @@ rec { license = [ licenses.mit licenses.asl20 ]; }; - phases = ["unpackPhase" "installPhase" "fixupPhase"]; + buildInputs = [ bash ] ++ stdenv.lib.optional stdenv.isDarwin Security; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security; + postPatch = '' + patchShebangs . + ''; installPhase = '' ./install.sh --prefix=$out \ @@ -69,9 +51,21 @@ rec { patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustdoc" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" ''} - ${patchBootstrapCargo} + ${optionalString (stdenv.isDarwin && bootstrapping) '' + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustc" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc" + install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo" + for f in $out/lib/lib*.dylib; do + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f" + done + ''} # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc # (or similar) here. It causes strange effects where rustc loads @@ -94,16 +88,28 @@ rec { license = [ licenses.mit licenses.asl20 ]; }; - phases = ["unpackPhase" "installPhase" "fixupPhase"]; + buildInputs = [ makeWrapper bash ] ++ stdenv.lib.optional stdenv.isDarwin Security; - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security; + postPatch = '' + patchShebangs . + ''; installPhase = '' + patchShebangs ./install.sh ./install.sh --prefix=$out \ --components=cargo - ${patchBootstrapCargo} + ${optionalString (stdenv.isLinux && bootstrapping) '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" + ''} + + ${optionalString (stdenv.isDarwin && bootstrapping) '' + install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$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 da9680943b57fe3e89ef41d1dbea996a19e8431f..44d96bc4ad1dd9c590a01e6a3ff42253bd8b04e5 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,14 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.20.0"; + version = "1.24.1"; - # fetch hashes by running `print-hashes.sh 1.20.0` + # fetch hashes by running `print-hashes.sh 1.24.1` hashes = { - i686-unknown-linux-gnu = "abe592e06616cdc2fcca56ddbe482050dd49a1fada35e2af031c64fe6eb14668"; - x86_64-unknown-linux-gnu = "ca1cf3aed73ff03d065a7d3e57ecca92228d35dc36d9274a6597441319f18eb8"; - i686-apple-darwin = "b3c2470f8f132d285e6c989681e251592b67071bc9d93cac8a2e6b66f7bdfcb5"; - x86_64-apple-darwin = "fa1fb8896d5e327cbe6deeb50e6e9a3346de629f2e6bcbd8c10f19f3e2ed67d5"; + i686-unknown-linux-gnu = "a483576bb2ab237aa1ef62b66c0814f934afd8129d7c9748cb9a75da4a678c98"; + x86_64-unknown-linux-gnu = "4567e7f6e5e0be96e9a5a7f5149b5452828ab6a386099caca7931544f45d5327"; + armv7-unknown-linux-gnueabihf = "1169ab005b771c4befcdab536347a90242cae544b6b76eccd0f76796b61a534c"; + aarch64-unknown-linux-gnu = "64bb25a9689b18ddadf025b90d9bdb150b809ebfb74432dc69cc2e46120adbb2"; + i686-apple-darwin = "c96f7579e2406220895da80a989daaa194751c141e112ebe95761f2ed4ecb662"; + x86_64-apple-darwin = "9d4aacdb5849977ea619d399903c9378163bd9c76ea11dac5ef6eca27849f501"; }; platform = @@ -18,6 +20,10 @@ let then "i686-unknown-linux-gnu" else if stdenv.system == "x86_64-linux" then "x86_64-unknown-linux-gnu" + else if stdenv.system == "armv7l-linux" + then "armv7-unknown-linux-gnueabihf" + else if stdenv.system == "aarch64-linux" + then "aarch64-unknown-linux-gnu" else if stdenv.system == "i686-darwin" then "i686-apple-darwin" else if stdenv.system == "x86_64-darwin" diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index fb3001bbf17b134e24d7338739dd7b68781ce31b..46caabf33917c515f3b1191ac94b8ad2a5118da2 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin -, version, srcSha, cargoSha256 -, patches ? [] }: +, version +, patches ? [] +, src }: let inherit (darwin.apple_sdk.frameworks) CoreFoundation; @@ -9,22 +10,20 @@ in rustPlatform.buildRustPackage rec { name = "cargo-${version}"; - inherit version; + inherit version src patches; - src = fetchFromGitHub { - owner = "rust-lang"; - repo = "cargo"; - rev = version; - sha256 = srcSha; - }; - - inherit cargoSha256; - inherit patches; + # the rust source tarball already has all the dependencies vendored, no need to fetch them again + cargoVendorDir = "src/vendor"; + preBuild = "cd src; pushd tools/cargo"; + postBuild = "popd"; passthru.rustc = rustc; + # changes hash of vendor directory otherwise on aarch64 + dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then "1" else null; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ] + buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1; @@ -48,8 +47,6 @@ rustPlatform.buildRustPackage rec { ''; checkPhase = '' - # Export SSL_CERT_FILE as without it one test fails with SSL verification error - export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt # Disable cross compilation tests export CFG_DISABLE_CROSS_TESTS=1 cargo test @@ -63,6 +60,6 @@ rustPlatform.buildRustPackage rec { description = "Downloads your Rust project's dependencies and builds your project"; maintainers = with maintainers; [ wizeman retrry ]; license = [ licenses.mit licenses.asl20 ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 3973eaff1878e297e4f8ed7fcab638e552150232..f191515b745c7e3b6f64aea007ba0469f3ba10df 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,20 +6,25 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.21.0"; -in -rec { + version = "1.25.0"; + cargoVersion = "0.26.0"; + src = fetchurl { + url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; + sha256 = "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf"; + }; +in rec { rustc = callPackage ./rustc.nix { - inherit llvm targets targetPatches targetToolchains rustPlatform version; + inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src; forceBundledLLVM = true; configureFlags = [ "--release-channel=stable" ]; - src = fetchurl { - url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp"; - }; + # 1. Upstream is not running tests on aarch64: + # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 + # So we do the same. + # 2. Tests run out of memory for i686 + doCheck = !stdenv.isAarch64 && !stdenv.isi686; patches = [ ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch @@ -28,10 +33,9 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.22.0"; - srcSha = "0x9pm73hkkd1hq4qrmz8iv91djgpdsxzwll7jari0h77vpwajmw4"; - cargoSha256 = "0xd0rb8gcqy6xngsx9l30jg3fqrcwccgv904ksqs9c4d44hga0gd"; - + version = cargoVersion; + inherit src; + inherit stdenv; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index f3d094d65a8a6aebe04143ce08ac80ca53a90bd7..7eb00a30ad73f8487a5ec76e171260b300d122db 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -10,6 +10,8 @@ set -euo pipefail PLATFORMS=( i686-unknown-linux-gnu x86_64-unknown-linux-gnu + armv7-unknown-linux-gnueabihf + aarch64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin ) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 9f96d05c11631b899f4c5356756070291c580a20..19c4a590e454e08f3a7caaaabafe86c055812328 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,5 +1,5 @@ { stdenv, targetPackages -, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps +, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps , llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl , which, libffi, gdb , version @@ -17,13 +17,11 @@ let inherit (stdenv.lib) optional optionalString; - - procps = if stdenv.isDarwin then darwin.ps else args.procps; + inherit (darwin.apple_sdk.frameworks) Security; llvmShared = llvm.override { enableSharedLibraries = true; }; target = builtins.replaceStrings [" "] [","] (builtins.toString targets); - in stdenv.mkDerivation { @@ -32,7 +30,16 @@ stdenv.mkDerivation { inherit src; - __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ]; + __darwinAllowLocalNetworking = true; + + # The build will fail at the very end on AArch64 without this. + dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + + # Running the default `strip -S` command on Darwin corrupts the + # .rlib files in "lib/". + # + # See https://github.com/NixOS/nixpkgs/pull/34227 + stripDebugList = if stdenv.isDarwin then [ "bin" ] else null; NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; @@ -46,16 +53,23 @@ stdenv.mkDerivation { RUSTFLAGS = "-Ccodegen-units=10"; # We need rust to build rust. If we don't provide it, configure will try to download it. + # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] - ++ [ "--enable-vendor" "--disable-locked-deps" ] + ++ [ "--enable-vendor" ] # ++ [ "--jemalloc-root=${jemalloc}/lib" - ++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" "--default-ar=${targetPackages.stdenv.cc.bintools}/bin/ar" ] + ++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] ++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ] - ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; + # The boostrap.py will generated a Makefile that then executes the build. + # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass + # to the bootstrap builder. + postConfigure = '' + substituteInPlace Makefile --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)' + ''; + patches = patches ++ targetPatches; # the rust build system complains that nix alters the checksums @@ -64,6 +78,8 @@ stdenv.mkDerivation { passthru.target = target; postPatch = '' + patchShebangs src/etc + # Fix dynamic linking against llvm #${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''} @@ -76,8 +92,9 @@ stdenv.mkDerivation { #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ - # Disable fragile linker-output-non-utf8 test + # Disable fragile tests. rm -vr src/test/run-make/linker-output-non-utf8 || true + rm -vr src/test/run-make/issue-26092 || true # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 rm -vr src/test/run-pass/issue-36023.rs || true @@ -89,32 +106,24 @@ stdenv.mkDerivation { # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs - # 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 - '' - + optionalString stdenv.isDarwin '' + '' + 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 = '' - # Needed flags as the upstream configure script has a broken prefix substitution - configureFlagsArray+=("--datadir=$out/share") - configureFlagsArray+=("--infodir=$out/share/info") + rm -v src/test/run-pass/backtrace-debuginfo.rs + + # error: No such file or directory + rm -v src/test/run-pass/issue-45731.rs + + # Disable tests that fail when sandboxing is enabled. + substituteInPlace src/libstd/sys/unix/ext/net.rs \ + --replace '#[test]' '#[test] #[ignore]' + substituteInPlace src/test/run-pass/env-home-dir.rs \ + --replace 'home_dir().is_some()' true + rm -v src/test/run-pass/fds-are-cloexec.rs # FIXME: pipes? + rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ??? ''; # rustc unfortunately need cmake for compiling llvm-rt but doesn't @@ -123,13 +132,14 @@ stdenv.mkDerivation { # ps is needed for one of the test cases nativeBuildInputs = - [ file python2 procps rustPlatform.rust.rustc git cmake + [ file python2 ps rustPlatform.rust.rustc git cmake which libffi ] # Only needed for the debuginfo tests ++ optional (!stdenv.isDarwin) gdb; buildInputs = [ ncurses ] ++ targetToolchains + ++ optional stdenv.isDarwin Security ++ optional (!forceBundledLLVM) llvmShared; outputs = [ "out" "man" "doc" ]; @@ -157,7 +167,7 @@ stdenv.mkDerivation { # enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; + homepage = https://www.rust-lang.org/; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; license = [ licenses.mit licenses.asl20 ]; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 9b7ce4120c48b8506f69b096886217b5290204f9..0da3e9f0fd1d7e233481eac4cce9c83b973e2a0a 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, writeText, sbclBootstrap +{ stdenv, fetchurl, writeText, sbclBootstrap , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , 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. @@ -9,16 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.1.0.20171104"; + version = "1.4.6"; - #src = fetchurl { - # url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - # sha256 = "1qdaf847g5p2zgq00ax5hdy4r82bl3ss382psd0kkca1h83cdiz8"; - #}; - src = fetchgit { - url = "https://git.code.sf.net/p/sbcl/sbcl"; - sha256 = "1fq34h8h8pax5q17w84kwv5amiaag3ikkq3cdmb31r64736mxi6r"; - rev = "11aa57d23bc464d6a6867a80e946907404ceadd1"; + src = fetchurl { + url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; + sha256 = "0y46zgg3lamaqqhxbqmbwzvdakzvc9j07d0ci8f57pfl549v04a4"; }; patchPhase = '' @@ -96,7 +91,7 @@ stdenv.mkDerivation rec { # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`. setupHook = writeText "setupHook.sh" '' - envHooks+=(_setSbclHome) + addEnvHooks "$targetOffset" _setSbclHome _setSbclHome() { export SBCL_HOME='@out@/lib/sbcl/' } diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index 946a9bedbf513105649c355993794e9fc2b24b04..bac36d61068d590c05a9f3ac2f8850318671896e 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.10.6"; + name = "scala-2.10.7"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0rrdrndnxy8m76gppqh7yr68qfx0kxns5bwc69k4swz6va1zbbal"; + sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index 469c8c8e3bc5fd30ad8d655c743f99a3620ba905..1145ebab52451b84a08e1b16fcd85b22f1d171d0 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.11"; + name = "scala-2.11.12"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "02whsszxabyhyrbcmgg3figaxknmfzy4f3wmgrqqwik89jk7q0qj"; + sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix deleted file mode 100644 index c98e2e75c1714997aaa702cb4bfd1ea1691e0854..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/scala/2.9.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl }: - -# at runtime, need jre or jdk - -stdenv.mkDerivation rec { - name = "scala-2.9.3"; - - src = fetchurl { - url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "faaab229f78c945063e8fd31c045bc797c731194296d7a4f49863fd87fc4e7b9"; - }; - - installPhase = '' - mkdir -p $out - rm bin/*.bat - rm lib/scalacheck.jar - mv * $out - ''; - - meta = { - description = "A general purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = http://www.scala-lang.org/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - branch = "2.9"; - }; -} diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 7622fbb9d18de176a1bbf7027eca38bc51c585bf..bfbd9d05d05b38c0c9961ab4bbdb74ca1976a0c1 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.4"; + name = "scala-2.12.5"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "089a54qj8psh4jxqbrrwk5zahw13fyqq24l87s3031xa675a0m4m"; + sha256 = "18bah2n3jfvc3cb10n4b3d6pwm3rwlqp7lrfvafjxccmlklzyqdj"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix new file mode 100644 index 0000000000000000000000000000000000000000..bff73337e9e858d10e782b24ea1b34e3c2dd1b1a --- /dev/null +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + version = "0.6.0-RC1"; + name = "dotty-bare-${version}"; + + src = fetchurl { + url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; + sha256 = "de1f5e72fb0e0b4c377d6cec93f565eff49769698cd8be01b420705fe8475ca4"; + }; + + propagatedBuildInputs = [ jre ] ; + buildInputs = [ makeWrapper ] ; + + installPhase = '' + mkdir -p $out + mv * $out + ''; + + fixupPhase = '' + bin_files=$(find $out/bin -type f ! -name common) + for f in $bin_files ; do + wrapProgram $f --set JAVA_HOME ${jre} + done + ''; + + meta = with stdenv.lib; { + description = "Research platform for new language concepts and compiler technologies for Scala."; + longDescription = '' + Dotty is a platform to try out new language concepts and compiler technologies for Scala. + The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), + and try to boil down Scala’s types into a smaller set of more fundamental constructs. + The theory behind these constructs is researched in DOT, a calculus for dependent object types. + ''; + homepage = http://dotty.epfl.ch/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [maintainers.karolchmist]; + }; +} diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix index cb0c43550022e8b69edc54b6c085038945eef95b..a999bd422e637a7c2107674c84ebf039308cb4eb 100644 --- a/pkgs/development/compilers/scala/dotty.nix +++ b/pkgs/development/compilers/scala/dotty.nix @@ -1,46 +1,22 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, callPackage }: -stdenv.mkDerivation rec { - version = "0.4.0-RC1"; - name = "dotty-${version}"; - - src = fetchurl { - url = "https://github.com/lampepfl/dotty/releases/download/${version}/${name}.tar.gz"; - sha256 = "1d1ab08b85bd6898ce6273fa50818de0d314fc6e5377fb6ee05494827043321b"; +let + dotty-bare = callPackage ./dotty-bare.nix { + inherit stdenv fetchurl makeWrapper jre; }; +in - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; - - installPhase = '' - mkdir -p $out - mv * $out +stdenv.mkDerivation { + name = "dotty-${dotty-bare.version}"; - mkdir -p $out/shared - mv $out/bin/common $out/shared - ''; + unpackPhase = ":"; - fixupPhase = '' - for file in $out/bin/* ; do - substituteInPlace $file \ - --replace '$PROG_HOME/bin/common' $out/shared/common - - wrapProgram $file \ - --set JAVA_HOME ${jre} - done + installPhase = '' + mkdir -p $out/bin + ln -s ${dotty-bare}/bin/dotc $out/bin/dotc + ln -s ${dotty-bare}/bin/dotd $out/bin/dotd + ln -s ${dotty-bare}/bin/dotr $out/bin/dotr ''; - meta = with stdenv.lib; { - description = "Research platform for new language concepts and compiler technologies for Scala."; - longDescription = '' - Dotty is a platform to try out new language concepts and compiler technologies for Scala. - The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), - and try to boil down Scala’s types into a smaller set of more fundamental constructs. - The theory behind these constructs is researched in DOT, a calculus for dependent object types. - ''; - homepage = http://dotty.epfl.ch/; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = [maintainers.karolchmist]; - }; + inherit (dotty-bare) meta; } diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 7383f39f6cbb789c3b167f10c4b28bc50a3875ed..ec93ba79d44abc86d355bafe9bf862d82683f763 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.7.0"; name = "sdcc-${version}"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "0x53gh5yrrfjvlnkk29mjn8hq4v52alrsf7c8nsyzzq13sqwwpg8"; + sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5"; }; # TODO: remove this comment when gputils != null is tested diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 078cf3e36c27cc1c82ff76ac31ccbcbc24ddb66c..4c79fb15c5cb943a985115497aa773f71cbc0c36 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,7 @@ -{ stdenv, fetchzip, fetchgit, boost, cmake, z3 }: +{ stdenv, fetchzip, fetchurl, boost, cmake, z3 }: let - version = "0.4.17"; - rev = "bdeb9e52a2211510644fb53df93fb98258b40a65"; - sha256 = "1x6q2rlq6gxggidgsy6li7m4phwr1hcfi65pq9yimz64ddqfiira"; + version = "0.4.20"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; @@ -15,14 +13,12 @@ stdenv.mkDerivation { name = "solc-${version}"; # Cannot use `fetchFromGitHub' because of submodules - src = fetchgit { - url = "https://github.com/ethereum/solidity"; - inherit rev sha256; + src = fetchurl { + url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; + sha256 = "0jyqnykj537ksfsf2m6ww9vganmpa6yd5fmlfpa5qm1076kq7zd6"; }; patchPhase = '' - echo >commit_hash.txt '${rev}' - echo >prerelease.txt substituteInPlace cmake/jsoncpp.cmake \ --replace '${jsoncppURL}' ${jsoncpp} substituteInPlace cmake/EthCompilerSettings.cmake \ diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index af56026b43a2239d9ad3dae94761b195dab8b5fe..25ea47978fcd6fcaaf8f4d57a6a8b5e51ab8262f 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { downloadPage = http://squeakvm.org/unix/index.html; license = with licenses; [ asl20 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 0f84b8ba4cd8eaf625d5d5c94923218640886136..670a00e250f2994551a39bb9c5d7653700aad3ef 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib +{ stdenv, fetchurl, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib , libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig , fontconfig, makeWrapper ? stdenv.isDarwin }: let - version = "7.4.2"; + version = "7.6.4"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"; - sha256 = "12yzy3w2l1p9fv77lv20xbqq47d0zjw5rkz96mx1xg1lldyja5vz"; + sha256 = "14bq4sqs61maqpnmgy6687jjj0shwc27cpfsqbf056nrssmplg9d"; }; - buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama + buildInputs = [ jdk gmp readline openssl libjpeg unixODBC libXinerama libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig ] ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 937977b0a97dea67e1d27dc4e5326fba1e215d51..abbfdd2abb72e4e26944f716a3f0ba99724b3929 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -12,7 +12,6 @@ , swig , bash , libxml2 -, llvm , clang , python , ncurses @@ -28,13 +27,17 @@ , git , libgit2 , fetchFromGitHub +, fetchpatch , paxctl , findutils +, makeWrapper +, gnumake +, file #, systemtap }: let - v_major = "3.1.1"; + v_major = "4.1"; version = "${v_major}-RELEASE"; version_friendly = "${v_major}"; @@ -47,53 +50,53 @@ let name = "${repo}-${version}-src"; }; -sources = { + 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"; + sha256 = "0j8bi6jv4m4hqiib02q5cvnxd9j6bwiri853x6px86vai3mdff0h"; }; llvm = fetch { repo = "swift-llvm"; - sha256 = "0nwd7cp6mbj7f6a2rx8123n7ygs8406hsx7hp7ybagww6v75bwzi"; + sha256 = "03558f5zbchqvdabi3x9ahyz4xkmj7w69gazivz372832lgr9zfh"; }; compilerrt = fetch { repo = "swift-compiler-rt"; - sha256 = "1gjcr6g3ffs3nhf4a84iwg4flbd7rqcf9rvvclwyq96msa3mj950"; + sha256 = "1wkymmxi2v759xkwlzfrq9rivndjfvp6ikrzz10mvvrvyvrgwqnl"; }; cmark = fetch { repo = "swift-cmark"; - sha256 = "0qf2f3zd8lndkfbxbz6vkznzz8rvq5gigijh7pgmfx9fi4zcssqx"; + sha256 = "1nmxp0fj749sgar682c5nsj7zxxigqwg973baxj2r656a7ybh325"; }; lldb = fetch { repo = "swift-lldb"; - sha256 = "17n4whpf3wxw9zaayiq21gk9q3547qxi4rvxld2hybh0k7a1bj5c"; + sha256 = "09x3d3bc6rn9g6jpi3fb120c4r2carsmqla4bq4scjrs0867jz9m"; }; llbuild = fetch { repo = "swift-llbuild"; - sha256 = "1l3hnb2s01jby91k1ipbc3bhszq14vyx5pzdhf2chld1yhpg420d"; + sha256 = "04y0ihfyam2n671vmpk9gy0gb9lb3ivh6mr19862p5kg5bmrcic1"; }; pm = fetch { repo = "swift-package-manager"; - sha256 = "1ayy5vk3mjk354pg9bf68wvnaj3jymx23w0qnlw1jxz256ff8fwi"; + sha256 = "08d87fc29qq7m92jaxkiczsa7b567pwbibiwwkzdrj6a0gr11qn3"; }; xctest = fetch { repo = "swift-corelibs-xctest"; - sha256 = "0cj5y7wanllfldag08ci567x12aw793c79afckpbsiaxmwy4xhnm"; + sha256 = "1alkgxx8jsr2jjv2kchnjaaddb1byjwim015m1z3qxh6lknqm0k5"; }; foundation = fetch { repo = "swift-corelibs-foundation"; - sha256 = "1d1ldk7ckqn4mhmdhsx2zrmsd6jfxzgdywn2pki7limk979hcwjc"; + sha256 = "06pbhb7wg4q5qgprhiyzbqy6hssga7xxjclhlh81gd6rvfd6bxvw"; }; libdispatch = fetch { repo = "swift-corelibs-libdispatch"; - sha256 = "0ckjg41fjak06i532azhryckjq64fkxzsal4svf5v4s8n9mkq2sg"; + sha256 = "198vskbajch8s168a649qz5an92i2mxmmmzcjlgxlzh38fgxri0n"; fetchSubmodules = true; }; swift = fetch { repo = "swift"; - sha256 = "0879jlv37lmxc1apzi53xn033y72548i86r7fzwr0g52124q5gry"; + sha256 = "1flvr12bg8m4k44yq0xy9qrllv5rpxgxisjgbpakk5p3myfsx7ky"; }; }; @@ -119,6 +122,9 @@ sources = { ]; builder = '' + # gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found + NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE" + $SWIFT_SOURCE_ROOT/swift/utils/build-script \ --preset=buildbot_linux \ installable_package=$INSTALLABLE_PACKAGE \ @@ -145,6 +151,8 @@ stdenv.mkDerivation rec { rsync which findutils + makeWrapper + gnumake ] ++ stdenv.lib.optional stdenv.needsPax paxctl; # TODO: Revisit what's propagated and how @@ -158,7 +166,7 @@ stdenv.mkDerivation rec { configurePhase = '' cd .. - + export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz mkdir build install @@ -198,6 +206,14 @@ stdenv.mkDerivation rec { # Just patch all the things for now, we can focus this later patchShebangs $SWIFT_SOURCE_ROOT + # TODO eliminate use of env. + find -type f -print0 | xargs -0 sed -i \ + -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ + -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ + -e 's|/bin/mkdir|${coreutils}/bin/mkdir|g' \ + -e 's|/bin/cp|${coreutils}/bin/cp|g' \ + -e 's|/usr/bin/file|${file}/bin/file|g' + substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \ --replace '/usr/include' "${stdenv.cc.libc.dev}/include" substituteInPlace swift/utils/build-script-impl \ @@ -207,31 +223,35 @@ stdenv.mkDerivation rec { '' + '' 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 \ + sed -i swift/utils/build-presets.ini \ + -e 's/^test-installable-package$/# \0/' \ + -e 's/^test$/# \0/' \ + -e 's/^validation-test$/# \0/' \ + -e 's/^long-test$/# \0/' + + # https://bugs.swift.org/browse/SR-5779 + sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake + + substituteInPlace clang/lib/Driver/ToolChains/Linux.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. + # 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" + --replace \"usr\" \"$PREFIX\" \ + --replace usr/lib "$PREFIX/lib" ''; doCheck = false; @@ -250,7 +270,11 @@ stdenv.mkDerivation rec { # TODO: Use wrappers to get these on the PATH for swift tools, instead ln -s ${clang}/bin/* $out/bin/ - ln -s ${targetPackages.stdenv.cc.bintools}/bin/ar $out/bin/ar + ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar + + wrapProgram $out/bin/swift \ + --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ + --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include ''; # Hack to avoid TMPDIR in RPATHs. @@ -262,8 +286,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ]; license = licenses.asl20; # Swift doesn't support 32bit Linux, unknown on other platforms. - platforms = [ "x86_64-linux" ]; - broken = true; + platforms = platforms.linux; + badPlatforms = platforms.i686; }; } 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 index 0e18e8812a84b4280deb78ed49dcc0ecd7bd5f13..66723f1cdf3910798c5d9fec4c7e19e25bb18322 100644 --- 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 @@ -11,13 +11,13 @@ 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 +@@ -708,7 +708,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 + swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc build-swift-static-stdlib build-swift-static-sdk-overlay -- 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 deleted file mode 100644 index f647d9189dd2b9c597d747e10c2040694f730cf5..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/purity.patch b/pkgs/development/compilers/swift/purity.patch index f5fb4c73af47881bf9e0f2a084f4628bb39a88cf..b30d0d0b5d5b51aeef7062a1152fc378948e009b 100644 --- a/pkgs/development/compilers/swift/purity.patch +++ b/pkgs/development/compilers/swift/purity.patch @@ -1,6 +1,17 @@ ---- 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 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, if (!Args.hasArg(options::OPT_static)) { if (Args.hasArg(options::OPT_rdynamic)) CmdArgs.push_back("-export-dynamic"); @@ -14,3 +25,6 @@ } CmdArgs.push_back("-o"); +-- +2.11.0 + diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 222a22bf1cd9d5ad3c1227a3fbe8389a9ca57aad..04efe1a913423476450b88adabc74e1b658e38a6 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -1,11 +1,15 @@ { stdenv, fetchurl, omake, ocaml, flex, bison }: +let + version = "2.1"; +in + stdenv.mkDerivation { - name = "teyjus-2.0b2"; + name = "teyjus-${version}"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/teyjus/teyjus-source-2.0-b2.tar.gz"; - sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052"; + url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz"; + sha256 = "0393wpg8v1vvarqy2xh4fdmrwlrl6jaj960kql7cq79mb9p3m269"; }; patches = [ ./fix-lex-to-flex.patch ]; diff --git a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch index d2da1d3faccac4db063facecc8bbadb59410be62..fa82d80633ad752a62d9433bf940c2e1772821be 100644 --- a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch +++ b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch @@ -1,9 +1,9 @@ diff --git a/source/OMakefile b/source/OMakefile -index 6b19d84..095b8b6 100644 +index e6bd37e..1bbc0a8 100644 --- a/source/OMakefile +++ b/source/OMakefile -@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront - DEP_MAIN = $(FNT)/dependfront +@@ -184,6 +184,12 @@ DEP_MAIN = $(FNT)/dependfront + PAR_MAIN = $(FNT)/parsefront ############################################################ +# Nixpkgs specific changes @@ -15,9 +15,11 @@ index 6b19d84..095b8b6 100644 # Platform specific changes # +@@ -194,7 +200,6 @@ if $(mem $(SYSNAME), Linux) + if $(mem $(OSTYPE), Cygwin Win32) YACC = bison -by - LEX = flex - CFLAGS += -mno-cygwin + CC = i686-pc-mingw32-gcc INC_C[] += $(INC)/byteswap $(INC)/search export diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index e88246ecb939940a9dcdfd0d5af6ec64a631634a..da706d502e6ffd1becbe3180e20158af4f774fc9 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,20 +1,14 @@ { stdenv, fetchFromRepoOrCz, perl, texinfo }: with stdenv.lib; -let - date = "20171016"; - rev = "da8c62f75d893449e232944fc62566c020b4d010"; - sha256 = "0pdvyhrx7g9imxpc7gr75116imi6ifn0ihsl4fbffsji2dpi61y2"; - version = "0.9.27pre-${date}"; -in - stdenv.mkDerivation rec { name = "tcc-${version}"; + version = "0.9.27"; src = fetchFromRepoOrCz { repo = "tinycc"; - inherit rev; - inherit sha256; + rev = "release_0_9_27"; + sha256 = "12mm1lqywz0akr2yb2axjfbw8lwv57nh395vzsk534riz03ml977"; }; nativeBuildInputs = [ perl texinfo ]; diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix deleted file mode 100644 index 79b22214eccd0bfcd7ae92bc6fa7e93facf567e9..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/uhc/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -# Note: The Haskell package set used for building UHC is -# determined in the file top-level/haskell-packages.nix. -{ stdenv, coreutils, m4, libtool, clang, ghcWithPackages, fetchFromGitHub }: - -let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [fgl vector syb uulib network binary hashable uhc-util mtl transformers directory containers array process filepath shuffle uuagc] ); -in stdenv.mkDerivation rec { - version = "1.1.9.4"; - name = "uhc-${version}"; - - src = fetchFromGitHub { - owner = "UU-ComputerScience"; - repo = "uhc"; - rev = "v${version}"; - sha256 = "1s84csk6zgzj09igxgdza7gb52jdn3jsr8lygl5xplshv8yzl34n"; - }; - - postUnpack = "sourceRoot=\${sourceRoot}/EHC"; - - buildInputs = [ m4 wrappedGhc clang libtool ]; - - configureFlags = [ "--with-gcc=${clang}/bin/clang" ]; - - # UHC builds packages during compilation; these are by default - # installed in the user-specific package config file. We do not - # want that, and hack the build process to use a temporary package - # configuration file instead. - preConfigure = '' - p=`pwd`/uhc-local-packages/ - ghc-pkg init $p - sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in - sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in - sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk - sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/config.mk.in - sed -i "s|--make|--make -package-db=$p|g" src/ehc/files2.mk - sed -i "s|--make|--make -package-db=$p|g" src/gen/files.mk - ''; - - inherit clang; - - meta = with stdenv.lib; { - homepage = http://www.cs.uu.nl/wiki/UHC; - description = "Utrecht Haskell Compiler"; - maintainers = [ maintainers.phile314 ]; - - # UHC i686 support is broken, see - # https://github.com/UU-ComputerScience/uhc/issues/52 - # - # Darwin build is broken as well at the moment. - # On Darwin, the GNU libtool is used, which does not - # support the -static flag and thus breaks the build. - platforms = ["x86_64-linux"]; - }; -} diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 74ca5dc4c4b0ff7bb58a6392970aad2461faec65..f2b6016ceb70e09e480c69d38e3ace6290e447db 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "17qh9mcmlhbv6r52yij8l9ik7j7x6x7c09lf6pznnbdh4sf8p5wb"; }; - buildInputs = [ openssl mlton mysql.client postgresql sqlite ]; + buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite ]; prePatch = '' sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; - export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h"; + export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h"; export SQHEADER="${sqlite.dev}/include/sqlite3.h"; export CC="${gcc}/bin/gcc"; export CCARGS="-I$out/include \ -L${openssl.out}/lib \ - -L${lib.getLib mysql.client}/lib \ + -L${mysql.connector-c}/lib \ -L${postgresql.lib}/lib \ -L${sqlite.out}/lib"; ''; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index baf48d7a532cc8c731e7418268f1ec072e179198..f36bea42e2a8bc19045deb3787d4e8bb9bd02df1 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz -, glib, libiconv, libintlOrEmpty, libtool, expat +, glib, libiconv, libintl, libtool, expat }: let @@ -12,16 +12,18 @@ let inherit sha256; }; + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs; - buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs; + buildInputs = [ glib libiconv libintl ] ++ extraBuildInputs; meta = with stdenv.lib; { description = "Compiler for GObject type system"; - homepage = http://live.gnome.org/Vala; + homepage = https://wiki.gnome.org/Projects/Vala; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono lethalman peterhoeg ]; + maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ]; }; }; @@ -29,8 +31,8 @@ in rec { vala_0_23 = generic { major = "0.23"; - minor = "2"; - sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl"; + minor = "3"; + sha256 = "101xjbc818g4849n9a80c2aai13zakj7mpnd7470xnkvz5jwqq96"; }; vala_0_26 = generic { @@ -41,8 +43,8 @@ in rec { vala_0_28 = generic { major = "0.28"; - minor = "0"; - sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd"; + minor = "1"; + sha256 = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw"; }; vala_0_32 = generic { @@ -53,17 +55,31 @@ in rec { vala_0_34 = generic { major = "0.34"; - minor = "1"; - sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m"; + minor = "17"; + sha256 = "0wd2zxww4z1ys4iqz218lvzjqjjqwsaad4x2by8pcyy43sbr7qp2"; + }; + + vala_0_36 = generic { + major = "0.36"; + minor = "12"; + sha256 = "1nvw721piwdh15bipg0sdll9kvgpz0y9i5fpszlc7y9w64yis25l"; }; vala_0_38 = generic { major = "0.38"; - minor = "1"; - sha256 = "112hl3lkcyakrk8c3qgw12gzn3nxjkvx7bn0jhl5f2m57d7k8d8h"; + minor = "4"; + sha256 = "1sg5gaq3jhgr9vzh2ypiw475167k150wmyglymr7wwqppmikmcrc"; extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ]; extraBuildInputs = [ graphviz ]; }; - vala = vala_0_34; + vala_0_40 = generic { + major = "0.40"; + minor = "0"; + sha256 = "0wcfljl55a9qvslfcc4sf76wdpwgn83n96b7fgb7r49ib35qz20m"; + extraNativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ expat ]; + extraBuildInputs = [ graphviz ]; + }; + + vala = vala_0_38; } diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 8e37dc76441bee4344038fb414e71155e76d4034..d93da8cb99657c24daaf08414a5cc7c4f7639537 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { configureFlags = "--enable-tabling=yes"; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + meta = { homepage = http://www.dcc.fc.up.pt/~vsc/Yap/; description = "A ISO-compatible high-performance Prolog compiler"; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index b1c36f841a4b565897e6f043186cab07252c980f..c20bffe26ed1cea449a6ce70990216c6205484cb 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -2,24 +2,30 @@ , pkgconfig, tcl, readline, libffi, python3, bison, flex }: +with builtins; + stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2017.11.05"; + version = "2018.03.21"; srcs = [ (fetchFromGitHub { - owner = "cliffordwolf"; - repo = "yosys"; - rev = "4f31cb6daddedcee467d85797d81b79360ce1826"; - sha256 = "1a5n0g5kpjsy8f99f64w81gkrr450wvffp407r1pddl8pmb0c3r7"; - name = "yosys"; + owner = "yosyshq"; + repo = "yosys"; + rev = "3f0070247590458c5ed28c5a7abfc3b9d1ec138b"; + sha256 = "0rsnjk25asg7dkxcmim464rmxgvm7x7njmcp5nyl8y4iwn8i9p8v"; + name = "yosys"; }) + + # NOTE: the version of abc used here is synchronized with + # the one in the yosys Makefile of the version above; + # keep them the same for quality purposes. (fetchFromBitbucket { - owner = "alanmi"; - repo = "abc"; - rev = "f6838749f234"; - sha256 = "0n7ywvih958h1c4n7a398a9w3qikhkv885fx5j3y2a0xwqc86m4y"; - name = "yosys-abc"; + owner = "alanmi"; + repo = "abc"; + rev = "6e3c24b3308a"; + sha256 = "1i4wv0si4fb6dpv2yrpkp588mdlfrnx2s02q2fgra5apdm54c53w"; + name = "yosys-abc"; }) ]; sourceRoot = "yosys"; @@ -27,10 +33,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ tcl readline libffi python3 bison flex ]; + + patchPhase = '' + substituteInPlace ../yosys-abc/Makefile \ + --replace 'CC := gcc' "" + substituteInPlace ./Makefile \ + --replace 'CXX = clang' "" \ + --replace 'ABCMKARGS = CC="$(CXX)"' 'ABCMKARGS =' \ + --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}' + ''; + preBuild = '' chmod -R u+w ../yosys-abc ln -s ../yosys-abc abc - make config-gcc + make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} echo 'ABCREV := default' >> Makefile.conf makeFlags="PREFIX=$out $makeFlags" ''; @@ -49,6 +65,6 @@ stdenv.mkDerivation rec { homepage = http://www.clifford.at/yosys/; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1590075dc2a01448892b8f63ed8e03759069268e --- /dev/null +++ b/pkgs/development/compilers/z88dk/default.nix @@ -0,0 +1,50 @@ +{ fetchFromGitHub, fetchpatch, stdenv, makeWrapper, unzip, libxml2, m4, uthash }: + +stdenv.mkDerivation rec { + name = "z88dk-${version}"; + version = "20180217"; + rev = "49a7c6032b2675af742f5b0b3aa5bd5260bdd814"; + short_rev = "${builtins.substring 0 7 rev}"; + + src = fetchFromGitHub { + owner = "z88dk"; + repo = "z88dk"; + inherit rev; + sha256 = "00vbklh6lkq1gyd08ig2vcg6c1mghvlwfx3vq3wldf34hcs3k4pp"; + }; + + # https://github.com/z88dk/z88dk/pull/612 + patches = [(fetchpatch { + url = "https://github.com/Mic92/z88dk/commit/5b4ca132fa1f31c9ac48cf2220358715739ca0b2.patch"; + sha256 = "1p2l31j68p7jzykhkhd9iagn2lr08hdclk3cl9l32p1q6ghdipfv"; + })]; + + postPatch = '' + # we dont rely on build.sh : + export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite + export ZCCCFG=$PWD/lib/config/ + ''; + + makeFlags = [ + "prefix=$(out)" + "git_rev=${short_rev}" + "version=${version}" + "git_count=0" + ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ libxml2 m4 uthash ]; + + preInstall = '' + mkdir -p $out/{bin,share} + ''; + + installTargets = "libs install"; + + meta = with stdenv.lib; { + homepage = https://www.z88dk.org; + description = "z80 Development Kit"; + license = licenses.clArtistic; + maintainers = [ maintainers.genesis ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 6f0c6d19e45083ebe9685e9935e83f0aaefbbf02..44d1f7bfe4a2e5e07c277cd7126d80b8e15971bb 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages_5, llvm_5 }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }: stdenv.mkDerivation rec { - version = "0.1.1"; + version = "0.2.0"; name = "zig-${version}"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig"; rev = "${version}"; - sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; + sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07"; }; - buildInputs = [ cmake llvmPackages_5.clang-unwrapped llvm_5 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ]; cmakeFlags = [ "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming languaged designed for robustness, optimality, and clarity"; - homepage = http://ziglang.org/; + homepage = https://ziglang.org/; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index f7638757ff7a1699087389b6a6a625014c13aac9..fb1798ab819ce56c6181b65657e3fef3e35f98f3 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -1,21 +1,21 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib +, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib , fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg , swingSupport ? true }: let - version = "8.21.0.1"; - openjdk = "8.0.131"; + version = "8.28.0.1"; + openjdk = "8.0.163"; - sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p"; - sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7"; + sha256_linux = "1z8s3a948nvv92wybnhkyr27ipibcy45k0zv5h5gp37ynd91df45"; + sha256_darwin = "0i0prjijsgg0yyycplpp9rlfl428126rqz7bb31pchrhi6jhk699"; 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 + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk ] ++ (lib.optionals swingSupport (with xorg; [ @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs # Set JAVA_HOME automatically. cat <> $out/nix-support/setup-hook diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 92f1f0a111eddd8f4db5bd559d8c1504ef4e87a1..908aa29e178fea6d6f3f0c89599c554fa79fcacb 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,21 +1,21 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib +, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib , fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg, zlib , swingSupport ? true }: let - version = "9.0.0.15"; - openjdk = "9.0.0"; + version = "10.1+11"; + openjdk = "10"; - sha256_linux = "0s9vr135yhdnxqds4hfafyrlh33j6g78v6l1v0ap2y6yqgabh9qi"; - sha256_darwin = "104w1msrwijf8dv3n65hjinp7i47z6ygzjipdzqriqam2zljxn4b"; + sha256_linux = "0g51n2zc7inal29n5ly3mrrfj15c7vl87zb6b2r1q67n4mnbrgm8"; + sha256_darwin = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y"; 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 + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs # Set JAVA_HOME automatically. cat <> $out/nix-support/setup-hook diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index ec190d5a1d6a323525010a41493669c8af4cf8cc..82c6e58a7b0313ce5c890a546bab8a944cb4126d 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchurl, coq, coqPackages }: - -if !stdenv.lib.versionAtLeast coq.coq-version "8.6" -then throw "CoLoR is not available for Coq ${coq.coq-version}" -else +{ stdenv, fetchurl, coq, bignums }: stdenv.mkDerivation { name = "coq${coq.coq-version}-CoLoR-1.4.0"; @@ -12,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1jsp9adsh7w59y41ihbwchryjhjpajgs9bhf8rnb4b3hzccqxgag"; }; - buildInputs = [ coq coqPackages.bignums ]; + buildInputs = [ coq bignums ]; enableParallelBuilding = false; installPhase = '' @@ -25,4 +21,8 @@ stdenv.mkDerivation { maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ]; + }; } diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index cb77ac3deac916cc88a1c6d17254ecae6e2e0c41..fb01da8d59cc03dd3cd31caeea63e7a6a3db5eee 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, coq }: -if !stdenv.lib.versionAtLeast coq.coq-version "8.6" -then throw "This version of HoTT requires Coq 8.6" -else stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "coq${coq.coq-version}-HoTT-${version}"; version = "20170921"; @@ -56,4 +54,8 @@ else stdenv.mkDerivation rec { maintainers = with maintainers; [ siddharthist ]; platforms = coq.meta.platforms; }; + + passthru = { + compatibleCoqVersions = v: v == "8.6"; + }; } diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index af7ef8001d39a64f8e163646b4b80bf52aa1b105..35cf63af862728ce85ac1ce36b0b562f18011e44 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,13 +1,7 @@ -{ stdenv, fetchgit, coq, ssreflect }: +{ stdenv, fetchFromGitHub, coq, ssreflect }: -let param = +let params = { - "8.4" = { - version = "20160529"; - rev = "a9e89f1d4246a787bf1d8873072077a319635c3e"; - sha256 = "14ng71p890q12xvsj00si2a3fjcbsap2gy0r8sxpw4zndnlq74wa"; - }; - "8.5" = { version = "20170512"; rev = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03"; @@ -21,20 +15,21 @@ let param = }; "8.7" = { - version = "20171102"; - rev = "ddf746809c211fa7edfdbfe459d5a7e1cca47a44"; - sha256 = "0jg3x0w8p088b8369qx492hjpq09f9h2i0li6ph3pny6hdkpdzsi"; + version = "20171212"; + rev = "195e550a1cf0810497734356437a1720ebb6d744"; + sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1"; }; - - }."${coq.coq-version}" -; in + }; + param = params."${coq.coq-version}"; +in stdenv.mkDerivation rec { name = "coq${coq.coq-version}-QuickChick-${param.version}"; - src = fetchgit { - url = git://github.com/QuickChick/QuickChick.git; + src = fetchFromGitHub { + owner = "QuickChick"; + repo = "QuickChick"; inherit (param) rev sha256; }; @@ -54,4 +49,8 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.hasAttr v params; + }; + } diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index a27a247c9d0bbd0ccd86a43c18b9e5eb2ef3d1a7..75e78d8ac44f6432a948dfee564264fb0e2e8c09 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -24,4 +24,6 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { inherit (mathcomp) compatibleCoqVersions; }; + } diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix deleted file mode 100644 index fc3c16d0049232bca08fa0375c5ae610b7d3c411..0000000000000000000000000000000000000000 --- a/pkgs/development/coq-modules/bedrock/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, fetchurl, coq}: - -stdenv.mkDerivation rec { - - name = "coq-bedrock-${coq.coq-version}-${version}"; - version = "20140722"; - - src = fetchurl { - url = "http://plv.csail.mit.edu/bedrock/bedrock-${version}.tgz"; - sha256 = "0aaa98q42rsy9hpsxji21bqznizfvf6fplsw6jq42h06j0049k80"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - enableParallelBuilding = true; - - buildPhase = '' - make -j$NIX_BUILD_CORES -C src/reification - make -j$NIX_BUILD_CORES -C src - make -j$NIX_BUILD_CORES -C src native - # make -j$NIX_BUILD_CORES -C platform - # make -j$NIX_BUILD_CORES -C platform -f Makefile.cito - ''; - - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Bedrock - cp -pR src/* $COQLIB/user-contrib/Bedrock - ''; - - meta = with stdenv.lib; { - homepage = http://plv.csail.mit.edu/bedrock/; - description = "A library that turns Coq into a tool much like classical verification systems"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 5762da66fedda42d4e3b27340ee719b2107ceb1c..474ce05c1d4786eab3a1d9331d6d0e8d50791247 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchFromGitHub, coq }: -let rev_and_sha = { - "8.6" = { - rev = "v8.6.0"; - sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; +let params = + { + "8.6" = { + rev = "v8.6.0"; + sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; + }; + "8.7" = { + rev = "V8.7.0"; + sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; + }; + "8.8" = { + rev = "V8.8+beta1"; + sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; + }; }; - "8.7" = { - rev = "V8.7.0"; - sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; - }; -}; -in - -if ! (rev_and_sha ? "${coq.coq-version}") then - throw "bignums is not available for Coq ${coq.coq-version}" -else with rev_and_sha."${coq.coq-version}"; + param = params."${coq.coq-version}" +; in stdenv.mkDerivation rec { @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "coq"; repo = "bignums"; - inherit rev sha256; + inherit (param) rev sha256; }; buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ]; @@ -35,4 +37,7 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.hasAttr v params; + }; } diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..766a10c9579d99d10f4b9f691c5c97db88376a50 --- /dev/null +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchgit, coq, ssreflect }: + +let param = + { + "8.6" = { + version = "20171214"; + rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00"; + sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd"; + }; + + "8.7" = { + version = "20171214"; + rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00"; + sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd"; + }; + + }."${coq.coq-version}" +; in + +stdenv.mkDerivation rec { + + name = "coq${coq.coq-version}-category-theory-${param.version}"; + + src = fetchgit { + url = git://github.com/jwiegley/category-theory.git; + inherit (param) rev sha256; + }; + + buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ]; + propagatedBuildInputs = [ coq ssreflect ]; + + enableParallelBuilding = false; + + installPhase = '' + make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install + ''; + + meta = with stdenv.lib; { + homepage = git://github.com/jwiegley/category-theory.git; + description = "A formalization of category theory in Coq for personal study and practical work"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ]; + }; + +} diff --git a/pkgs/development/coq-modules/contribs/all.nix b/pkgs/development/coq-modules/contribs/all.nix deleted file mode 100644 index d2ef82c5587507df9ef321743aa113f47aebab22..0000000000000000000000000000000000000000 --- a/pkgs/development/coq-modules/contribs/all.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ -AACTactics = "0v18kf7xjys4g3z8m2sfiyipyn6mz75wxl2zgqk7nv1jr8i03min"; -ABP = "06cn70lbdivn1hxnlsqpiibq9nlwl6dggcn967q6n3nph37m4pdp"; -AILS = "1g0hc27kizrwm6x35j3w721cllfl4rvhiqifn3ljy868mwxwsiva"; -AMM11262 = "15rxr5bzyswxfznml4vij3pflqm3v2bl1xzg9m1p5gmd0385zh6l"; -ATBR = "1xfhc70m9qm51gwi7cls8znx37y5cp1m0wak1h0r51g1d2lxr7a6"; -Additions = "0bhl1wqbqigq0m6zj1yhdm5j0rsn75xy510kz9qy4dv5277wc7ab"; -Algebra = "061szlbg5zh5h0ksgmw34hqrvqy6794p3r1ijg0xi8mqa2wpbjd8"; -Angles = "1grqx88mibz4lg7k9ba89vpg4kwrm3s87wy0ls39i3d3wgx18n97"; -AreaMethod = "07d86p5xbnhbrily18hda0hymf3zx8yhw905plmrqyfbcc6x5531"; -Automata = "0g75gjdj79ysiq1pwqk658jxs2z1l8pk702iz69008vkjzbzkhvm"; -AxiomaticABP = "19x16dgsqyw2pflza8cgv29585a6yy3r8pz4z8ns3r7qhpp1449b"; -BDDs = "0s5a67w9v1lklph8dm4d9bkd6f9qzfb377gvisr3hslacn9ya8zy"; -Bertrand = "05i6xw9gi5ad78rsw5pfhiqllw9x4q4phfi4ddzlxpsgshiw7d0k"; -Buchberger = "1v7zi62ar4inncbcphalsyaggx8im02j81b0fnpvx2x3kyv2pr94"; -CCS = "1na7902k05z19a727wa7rz0dbf1fhcl53r4zxvcgvg5dasvwfc97"; -CFGV = "13gk597r9n2wcgcbhribsqrp9wb8mmr3qd4zbv2ig8469kng0j4m"; -CTLTCTL = "0il1hhizvd2zvh2bhjaa2f43q1qz5sjfdin00yx5l1a8867wjs05"; -CanonBDDs = "1l9yqj0dfqkq49acsy17cvz4rjj86wjbhsdbr4qw2qvn4shllc23"; -Cantor = "1ys81ivigsbsg5cfx9jvm0qprdwc3jm69xm3whq5v9b6skn958yp"; -CatsInZFC = "06rkhns5gz397mafxina52h9z35r0n5bpryk5yfja0kfiyjvp4cr"; -Checker = "0hvfmpy3w4jj4zi3bm9q2yy4361q0lg0znqa22n5l7hzvi28q796"; -Chinese = "191c1bcslxrjxcxvpcz0mzklrl1cwh0lzkd2nq5m0ch3vxar6rq4"; -Circuits = "1a091g5vvmg579mmbfbvhj0scv7zw4n5brmj8dmiwfayfscdh5vg"; -ClassicalRealizability = "1zgivy679rl3ay9mf5ahs0lzrwfg19pcmz5nqm9hq0dpfn9avd6a"; -CoLoR = "05x1drvvhrspj2wzh8v1abblmb9fxy0yx6gg9y4nldkc24widjr7"; -CoRN = "1wv8y67bm2072bd6i3gbvy4sc665sci5kzd1zwv9n2ffxzhy0l5j"; -Coalgebras = "1wzwadfii9mm11bifjbg6f23qbab1ix3valysgq2b4myxlnpwdfz"; -CoinductiveExamples = "1iw6jsxvshsmn52xac3dspkw8f95214f0dcx0y6gi13ln02h8njy"; -CoinductiveReals = "149nsygwlb80s2805qgn85a6mcp7rxifbicbr84l3nyzilfyr6lk"; -ConCaT = "0537r0lamfz657llarxjl030qw29dnya7rb73kx0bdbyphxszr71"; -ConstructiveGeometry = "0cfz64yciyma6jrskc37md4mnv2vbx9hw7y69vyxzy7xdax55j64"; -Containers = "07pjbnzhh418ypppvfkls2x0ycslgl274a913xwi3rb1wrg6q84g"; -Continuations = "0l35xl9kvmq8l9gx3rmcx11p22inw76m1s18y0dnhc6qnhhkq1qg"; -CoqInCoq = "0d5m71xq66rfaa6xr51bsv9hykzfv4dwpclxpnqc7a7ss1q9ccqz"; -Coqoban = "1xp6wblg31asbqbkvbha94lbzn6xnhl0v5y0f3qh4nbmv6hslc54"; -Counting = "150la62c1j4yg8myr7nrp1qwp4z15rfg788j9vraz5q6f2n8c8ph"; -CoursDeCoq = "1qgc03ngzyd138s2cmcwrwrmyq0lf3z3vwhiaq5p371al34fk0d9"; -#Dblib = "00704xi5348fbw9bc0cy5bqx5w4a7aqwpcwdd3740i15ihk60mrl"; -Demos = "0j5ndysvhsj57971yz7xz5mmnzwymgigr3b9mr6nh9iids98g9vy"; -DescenteInfinie = "0is6kclxhfd9n4sdpfkzm4kcc740ifkylg11b8z90frwq79a8yzb"; -Dictionaries = "13zhjvgl20f0hj2pp0zkczm9pwdgh174248jgbqj87rn5alyr2iy"; -DistributedReferenceCounting = "1kw6fb7rvkkrh5rz1839jwf9hrpnrsdnhjlpx3634d5a5kbbdj6a"; -DomainTheory = "1g39bgyxfj9r51vrmrxhrq1xqr36j5q8x0zgz2a12b0k3fj8bswn"; -Ergo = "0xkza35n3f05gkfywaisnis70zsrkh1kwq5idsb2k0rw8m4hq9ki"; -EuclideanGeometry = "11n8877zksgksdfcj7arjx0zcfhsrvg83lcp6yb2bynvfp80gyzb"; -EulerFormula = "1nhh49rf6wza2m5qmz5l5m24m299qn3v80wqzvf51lybadzll2h6"; -ExactRealArithmetic = "1p32g13sx2z5rj3q6390ym8902gvl5x16wdhgz5i75y44s6kmkb1"; -Exceptions = "0w2b16nr80f70dxllmhbqwfr1aw26rcfbak5bdyc0fna8hqp4q3p"; -FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6"; -FSSecModel = "0fi78vqfrw4vrmdw215ic08rw8y6aia901wqs4f1s9z2idd6m8qy"; -FSets = "1n54s2vr6snh31jnvr79q951vyk0w0w6jrnwnlz9d3vyw47la9js"; -Fairisle = "0gg9x69qr0zflaryniqnl8d34kjdij0i55fcb1f1i5hmrwn2sqn6"; -Fermat4 = "0d5lkkrw3vqw6dip1mrgn8imq861xaipirzwpd35jgdkamds802v"; -FingerTree = "1kzfv97mc9sbprgg76lb5lk71gr4a5q10q8yaj57qw3m5hvmdhmw"; -FiringSquad = "0y2dy75j97x0592dxcbcd00ffwnf61f92yiap68xszv3dixl9i9x"; -Float = "1xmskkfd9w3j0bynlmadsrv997988k17bcs0r3zxaazm7vvw2sci"; -FreeGroups = "00pskmp0kfnnafldzcw8vak5v2n0nsjl9pfbw8qkj1xzzbvym2wk"; -FunctionsInZFC = "1vfs27m5f2cx0q2qjlxj3nim1bv53mk241pqz9mpj4plcj0g838l"; -FundamentalArithmetics = "1vvgl5c7rcg3bxizcjdix0fn20vdqy73ixcvm714llb8p986lan5"; -GC = "11kwn43nm58bv7v3p8xg2ih4x0gvgigz26gzh8l8w3lgmriqmzx0"; -GenericEnvironments = "1w05ysx0rl17fgxq3fc0p7p3h70c94qxa6yq88ppyhwm1cqqgihw"; -Goedel = "0b1dfmxp9q5z2l59yz5bn37m0zz4307kq94a7fs8s0lbbwrgyhrf"; -GraphBasics = "1f2bsfkhlyzjvy6ln62sf6hpy9dh8azrnlfpjq6jn667nfb7cbf6"; -Graphs = "0smhsas27llkmfkn4vs8ygb9w19ci2q4ps0f2q969xv8n8n0bj4z"; -GroupTheory = "141w3zbf7jczbk1lrpz6dnpk8yh1vr4f7kw55siawwaai11bh7c1"; -Groups = "00zmn1q9lz7dz8p5wk34svwki9xwn62xkgnhw4bcx8awlbx1pw3a"; -Hardware = "1bp9bnvlv54ksngmgzyxaqw1idxw5snmwrcifqcd6088w6hd9w1n"; -Hedges = "1abbf8v0i8akmhbi2hmb1l9wxvql275c9mxf0r5lzxigwmf0qrbv"; -HighSchoolGeometry = "09n70n0sb1dxnss9xz7xj2z1070gzxs4ap1h0kjcrfkiqss11fpy"; -HigmanCF = "05qg4ci8bvd6s9nmj80imj3b9kfwy4xzfy8ckr5870505mkzxyxv"; -HigmanNW = "0i3mmyh20iib7pglalf4l2p62qyqa6w0mz557n53aa2zx6l0dw18"; -HigmanS = "1c9db1jrpwzqw0arsiljskx3pcxpc1flkdql87fn55lgypbfz5gk"; -HistoricalExamples = "16alm4cv9hj59jyn1rnmb1dnbwp488wpzbnkq6hrnl5drr78gx08"; -HoareTut = "1mazqhb0hclknnzbr4ka1aafkk36hl6n4vixkf5kfvyymr094d0a"; -Huffman = "1h14qdbmawjn9hw813hsywxz0az80nx620rr35mb9wg8hy4xw7jj"; -IEEE754 = "06xrpzg2q9x2bzm7h16k0czm56sgsdn1rxpdgcl44743q3mvpi5p"; -IPC = "1xcgrln8nn2h98qyqz36d0zszjs33kcclv9vamz8mc163agk6jxy"; -IZF = "12inbpihh35hbrh4prs93r4avxlgsj5019n7bndi4fgn09m839bm"; -Icharate = "0giak87mv7g0312i05r7v06wb8wmfkrd2ai54r4c80497f72d17l"; -IdxAssoc = "0gdaxnwyw8phi97izx0wfbpccql73yjdzqqygc4i6nfw4lwanx38"; -IntMap = "1zmlcqv2mz488vpxa6iwbi6sqcljkmb55mywb5pabjjwjj745jhx"; -JProver = "0vz07sclzx0izwm5klwmd0amxhzqly6aknh876vvh3033jp62ik0"; -JordanCurveTheorem = "0varv6ib4f0l3jjq71rafb071ivzcnyxjb5ri8bf6vbjl4fqr335"; -Karatsuba = "02190l3dl0k6qxi3djr2imy4h31kcr5kj94l2ys3xqg1kjjajcmj"; -Kildall = "0lbby3gd3pwivkhr6v8c73915cswmvh50nj3ch10f0zix8lsxrpa"; -LTL = "0bk4232pa6mkbmxjazknfbnmzh2pcjccr68dkf8a2ndd06yfaii1"; -Lambda = "1wy9r95acwf7srs54y5kgmgl9d48j8b871n4z26xpbhdi2pvv9a4"; -Lambek = "0f6nd3fsxsaij9wypwd3cxmgn3larkxg4xww9c0yvjqxpgc5s552"; -LesniewskiMereology = "11wgw93fxwnbvwmpnscvgg9caakhr3wbvqwzqkk1p8wfslpvf7pj"; -LinAlg = "0gl081rx0iikhaghjny3g04aaqgiv0wq6r6c34qpcr5jc6i40mdr"; -MapleMode = "0a50dx473mmg7ksmghbjqs2rg4334dqdd2rkydicw8fl406z19ab"; -Markov = "06aacr8ghycjm68r36hip4rjhwfnbz7az2k8pa92pakjm0am78lq"; -MathClasses = "1gj6dznlc2ma5b5qn9mlinavlrl4xq18dilzd0l9j8jrxfdk1q7n"; -Maths = "15qbv7dxj4ygmw38gnmyf2kwdmy75a21yf991c8lw6fzx334b4dv"; -Matrices = "1q3683xvsgjqlav6kfxx7y05lvr5gp60hpbx4ypwa0hsl6w14mn0"; -#Micromega = "0h2ybdlbdvy30l5kzkfvp5kwsf236fxd3xi87pl4pl3dzylzsbh4"; -MiniC = "1gg9jinay9i3jbsi8bbwxzr9584wycdadf02c5al5yv281ywjar0"; -MiniCompiler = "0yq0k8c0rp120pfssdwfpmz017vq2w8s0rzk9gls476gywjmdvgf"; -MiniML = "1fd4k6rzn5cr24d11dnyy9jp2wf3n8d8l7q7bxk94lbrj6lhrzw2"; -ModRed = "1khg29cm83npasxqlm13bv2w2kfkn9hrvf5q2wch9l1l4ghys4rk"; -Multiplier = "07bj7j4agq2cvhfbkwgrvg39jlzlj1mzlm0ykqjwljd7hi4f6yv9"; -MutualExclusion = "1j3fmf0zvnxg0yzj956jfpjqccnk9l2393q6as80a5gfqhlb3rcr"; -Nfix = "1mpn1fbx15naa2d5lbcxl88xsgp1p88xx4g94f8cjzhg6kdnz7cc"; -OrbStab = "06gg3d2f9qybs2c49mm7srzqx5r9dxail92bcxdi6lr0k74y75ml"; -OtwayRees = "1d39yxppnpzpn5yxdk6rinrgxwgsnr348cggyhwjmgyjm8mr9gcp"; -PAutomata = "0hlzvdi9kb291g36lgyy3vlpn7i8rphpwjisy3wh19j4yqqc7ddf"; -PTS = "12y9niiks4rzpvzzvgfwc1z37480c4l9nvsmh4wx6gsvpnjqvyl3"; -PTSATR = "10jsfbsdaiqrdgp9vnc84wwkxjyfin35kr1qckbax6599xgyk7vj"; -PTSF = "0yz7sh2d4ldcqblnvb96yyimsb4351qqjl8di1cy785mnxa1zfla"; -Paradoxes = "03b22vhkra038z3nfbv9wpbr63x984qyrfvrg58lwqq87s5kgv1d"; -ParamPi = "1p64yj2pqqvyx5b5xm0pv0pm9lqp7hc5hb3wjnwvzi3qchqf7hwi"; -PersistentUnionFind = "1ljdnsm6h3zfn43vla13ibx42kfvgmy6n9qyfn7cgkcw5yv4fh6m"; -PiCalc = "1af8ws86mqs55dldcpm7x4qhk11k0f8l88z2bv6hylfvy6fpbpiy"; -Pocklington = "18zx1ca3pn3vn763smmrnfi395007ddzicrr0cydrph6g4agdw3g"; -Presburger = "1n3nqrplgx1r2vvpcbp91l02c7zc297fkpsqgx1x1msqrldnac9y"; -Prfx = "1nyh134hlh6cdxpys9kv0ngiiibgigh2mifwf8rdz6aj6xj7dgyv"; -ProjectiveGeometry = "01x409rbh3rqxyz53v0kdixnqqv7b890va04a21862g8bml7ls6k"; -QArith = "0xvkw3d3kgiyw6b255f6zbkali1023a9wmn12ga3bgak24jsa8lg"; -QArithSternBrocot = "1kvzww76nxgq7b3b3v2wrjxaxskfrzk55zpg6mj1jjcpgydfqwjr"; -QuicksortComplexity = "0c5gj65rxnxydspc4jqq20c8v9mjbnjrkjkk220yxymbv5n3nqd1"; -RSA = "0b56ipivbbdwc0w7bp4v4lwl0fhhb73k2b62ybmb3x7alc599mc0"; -RailroadCrossing = "0z5cnw1d8jbg30lc9p1hsgrnjwjc4yhpxl74m2pcjscrrnr01zsf"; -Ramsey = "0sd3cihzfx7mn7wcsng15y4jqvp1ql49fy1ch997wfbchp6515ld"; -Random = "0b7gwz38fbk9j5sfa76c2n4781kcb18r65v9vzz8qigx37gm89w4"; -Rational = "0v1zjcf22ij9daxharmaavwp2msgl77y5ad46lskshpypd1ysrsc"; -RecursiveDefinition = "1y4gy2ksxkvmz16zrnblwd1axi7gdjw171n8xfw4f8400my1qhm0"; -ReflexiveFirstOrder = "156a6kmds25kc645w6kkhn3a4bvryp307b76ghz5m5wv2wsajgrn"; -RegExp = "0gya2kckr6325hykd12vwpbwwf7cf04yyjrr2dvmcc81dkygrwxb"; -RelationAlgebra = "1nrhkvypkk7k48gb18c2q9cwbgy02ldfg6s3j74f5rgff1i6c9in"; -RelationExtraction = "1g6hvmsfal17pppqf9v8zh2i1dph0lj5a1r3xiszqr4biiig09ch"; -ReleasedSsreflect = "17wirznfsizmw6gjb54vk9bp97a3bc1l2sb4gdxfbzvxmabx1a9l"; -Rem = "03559q60ibf4dr1np82341xfrw134d27dx8dim84q9fszr4gy8sx"; -RulerCompassGeometry = "02vm80xvvw22pdxrag3pv5zrhqf8726i9jqsiv4bnjqavj5z2hdr"; -SMC = "0ca3ar1y9nyj5147r18babqsbg2q2ywws8fdi91xb5z9m3i97nv1"; -Schroeder = "0mfbjmw4a48758k88yv01494wnywcp5yamkl394axvvbbna9h8b6"; -SearchTrees = "1jyps6ddm8klmxjm50p2j9i014ij7imy3229pwz3dkzg54gxzzxb"; -Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580"; -Shuffle = "14v1m4s9k49w30xrnyncjzgqjcckiga8wd2vnnzy8axrwr9zq7iq"; -SquareMatrices = "07dlykg3w59crc54qqdqxq6hf8rmzvwwfr1g8z8v2l8h4yvfnhfl"; -Ssreflect = "07hv0ixv68d8vrpf9s6gxazxaz5fwpmhqrd6cqw7xp8m8gspxifz"; -Stalmarck = "0vcbkzappq1si4hxbnb9bjkfk82j3jklb8g8ia83h1mdhzr7xdpz"; -Streams = "1spcqnvwayahk12fd13vzh922ypzrjkcmws9gcy12qdqp04h8bnc"; -String = "1wy7g66yq9y8m8y3gq29q7whfdm98g3cj9jxm5yibdzfahfdzzni"; -Subst = "1wxscjhz2y2jv5rdga80ldx2kc954sklip4jsbsd2fim5gwxzl23"; -Sudoku = "0f9h8gwzrdzk5j76nhvlnvpll81zar3pk84r2bf1xfav4yvj8sj7"; -SumOfTwoSquare = "1lxf9wdmvpi0vz4d21p6v9h2vvkk9v8113mvr2cdxd0j43l4ra18"; -Tait = "0bwxl894isndwadbbc3664j51haj3c0i57zmmycnxmhnmsx5pnjj"; -TarskiGeometry = "1vkznrjla943wcyddzyq0pqraiklgn62n1720msxp7cs13ckzpy0"; -ThreeGap = "01nj27xs348126ynsnva1jnvk0nin61xzyi6hwcybj5n46r7nlcv"; -Topology = "1kchddfiksjnkvwdr2ffpqcvmqkd6gf359r09yngf340sa15p5wk"; -TortoiseHareAlgorithm = "1ldm1z48j59lxz60szpy64d0928j4fmygp5npfksvwkvghijchq8"; -TreeAutomata = "0jzfa6rxv7lw1nzrqaxv08h9mpyvc2g4cbdc09ncyhazincrix0z"; -TreeDiameter = "0xdansrbmxrwicvqjjr9ivgs0255nd4ic6jkfv37m1c10vxcjq2n"; -WeakUpTo = "1baaapciaqhyjx8bqa4l04l1vwycyy1bvjr2arrc9myqacifmnpp"; -ZChinese = "0v7gffmcj9yazbbssb2i2iha1dr82b4bl8df9g021s40da49k09k"; -ZF = "0am15lgpn127pzx6ghm76axy75w7m9a8wqa26msgkczjk4x497ni"; -ZFC = "0s11g9rzacng2xg9ygx9lxyqv2apxyirnf7cg3iz95531n46ppn2"; -ZSearchTrees = "1lh6jlzm53jnsg91aa60f6gir6bsx77hg8xwl24771jg8a9b9mcl"; -ZornsLemma = "0dxizjfjx4qsdwc60k6k9fnq8hj4m13vi0llsv9xk3lj3izhpil1"; -lazyPCF = "0wzpv41nv3gdd07g9pr7wydfjv1wxz8kylzmyn07ab38kahhhzh9"; -lc = "05zr0y2ivznmf1ijszq249v4rw6kvdx6jz4s2hhnaiqvx35g4cqg"; -} diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index 289a4d759214b043b0254cee9a1496f73932425c..82d1f7a4746b06621aec1baa248433272a6a9c23 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -1,261 +1,1026 @@ -contribs: - -let - mkContrib = import ./mk-contrib.nix; - all = import ./all.nix; - overrides = { - Additions = self: { - patchPhase = '' - for p in binary_strat dicho_strat generation log2_implementation shift - do - substituteInPlace $p.v \ - --replace 'Require Import Euclid.' 'Require Import Coq.Arith.Euclid.' - done - ''; - }; - BDDs = self: { - buildInputs = self.buildInputs ++ [ contribs.IntMap ]; - patchPhase = '' - patch Make < -custom "\$(CAMLOPTLINK) -pp 'camlp5o' -o unif unif.mli unif.ml main.ml" unif.ml unif - EOF - coq_makefile -f Make -o Makefile - ''; - postInstall = '' - mkdir -p $out/bin - cp unif $out/bin/ - ''; - }; - Goedel = self: { - buildInputs = self.buildInputs ++ [ contribs.Pocklington ]; - patchPhase = '' - patch Make < interp.mli - EOF - ''; - configurePhase = '' - coq_makefile -f Make -o Makefile - make extract_interpret.vo - rm -f str_little.ml.d - ''; - }; - SMC = self: { - buildInputs = self.buildInputs ++ [ contribs.IntMap ]; - patchPhase = '' - patch Make < -R . CoqEAL - EOF - ''; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = with stdenv.lib; { - homepage = http://www.maximedenes.fr/content/coqeal-coq-effective-algebra-library; - description = "A Coq library for effective algebra, by which is meant formally verified computer algebra algorithms that can be run inside Coq on concrete inputs"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 84f95d4ddea394b9cdbb614bae7db0c8a9b6e2fe..2e6c95bfe3c10e5cb2c2c85f473607b407df73f6 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,27 +1,11 @@ { stdenv, fetchurl, which, coq, ssreflect }: -let param = - let - v2_1_1 = { - version = "2.1.1"; - url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz; - sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km"; - }; - v3_0_1 = { - version = "3.0.1"; +stdenv.mkDerivation { + name = "coq${coq.coq-version}-coquelicot-3.0.1"; + src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz"; sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r"; }; - in { - "8.4" = v2_1_1; - "8.5" = v3_0_1; - "8.6" = v3_0_1; - "8.7" = v3_0_1; -}."${coq.coq-version}"; in - -stdenv.mkDerivation { - name = "coq${coq.coq-version}-coquelicot-${param.version}"; - src = fetchurl { inherit (param) url sha256; }; nativeBuildInputs = [ which ]; buildInputs = [ coq ]; @@ -38,4 +22,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (coq.meta) platforms; }; + + passthru = { inherit (ssreflect) compatibleCoqVersions; }; + } diff --git a/pkgs/development/coq-modules/domains/darcs_context b/pkgs/development/coq-modules/domains/darcs_context deleted file mode 100644 index 5dac711c0c0afcde0ed0d16079873be7dcada506..0000000000000000000000000000000000000000 --- a/pkgs/development/coq-modules/domains/darcs_context +++ /dev/null @@ -1,809 +0,0 @@ - -Context: - -[additional facts about limits on cuts -robdockins@fastmail.fm**20140818025955 - Ignore-this: 6f9c952db425df6ae9d2a14139a8a3d1 -] - -[work on limits -robdockins@fastmail.fm**20140817221707 - Ignore-this: 9811e0cd669b48f3beb7a56d47cbe3c3 -] - -[finish proving that Q field ops commute with injq -robdockins@fastmail.fm**20140817060600 - Ignore-this: a1f6c62b39983e6f6f01d28aca5f8534 -] - -[split up realdom.v and perform associated code motion -robdockins@fastmail.fm**20140817030034 - Ignore-this: 24c74cd459d2ab15dcd3d83ba06f7081 -] - -[recip is canonical and converges -robdockins@fastmail.fm**20140725211947 - Ignore-this: c100dbd94114cca9576b2a3f46c9ddc7 -] - -[improve the proof that 1 is a unit for multiplication -robdockins@fastmail.fm**20140724150124 - Ignore-this: c5ec976f8a9858a7ba1f704b4e84d02e -] - -[complete proof the interval multiplication converges; other minor stuff -robdockins@fastmail.fm**20140724015132 - Ignore-this: bc717baa4c8f9ec31b821c5cfae5b499 -] - -[further progress in realdom.v -robdockins@fastmail.fm**20140723004023 - Ignore-this: f33e18d22ae69c9b6209e28151d18017 -] - -[unmessify rational_intervals patch -robdockins@fastmail.fm**20140721123718 - Ignore-this: 4a125b192a9964a508a1063845e9f160 -] - -[messy updates to rational_intervals.v -robdockins@fastmail.fm**20140721015810 - Ignore-this: 858dac9c55426167c6f397a71ef3fda5 -] - -[implicit arguments for "fixes" -robdockins@fastmail.fm**20140721015739 - Ignore-this: 229ecdd48265fc855319141e399bc522 -] - -[metadata -robdockins@fastmail.fm**20140714201441 - Ignore-this: aa16faaf09c1c404bdc6eaf0d0c39912 -] - -[further beautification -robdockins@fastmail.fm**20140714200516 - Ignore-this: 47d74c51d9fe130a5ac12706b1ddb1d4 -] - -[start working on the recripricol function -robdockins@fastmail.fm**20140714180055 - Ignore-this: c7f93cea17f46daa78a1ea14e86dfcaf -] - -[tweaks to the lambda models -robdockins@fastmail.fm**20140714180031 - Ignore-this: 219788fe70f42f0f6e60176cab464f19 -] - -[beauty edits in st_lam* -robdockins@fastmail.fm**20140714180006 - Ignore-this: a40aa7ae00ed27595ee04073918bd028 -] - -[move stuff to rational_intervals.v / define real_mult and prove some properties -robdockins@fastmail.fm**20140712053232 - Ignore-this: 398c5c03aac9ff37526d4d7c9e1a82c0 -] - -[finish correctness proof for interval multiplication -robdockins@fastmail.fm**20140711191547 - Ignore-this: c9ab138a0ca43fe0b133b208419bbcc4 -] - -[break out facts about rational intervals -robdockins@fastmail.fm**20140711012320 - Ignore-this: b7fe6e9377629a89b5debe3019ae1aa -] - -[updates to ideal completion -robdockins@fastmail.fm**20140707053800 - Ignore-this: 90d1efbd0e5833d8c83f0df056d7a74c -] - -[a pile of additional properties in realdom.v -robdockins@fastmail.fm**20140707053519 - Ignore-this: 7edba1e72a1856f297ef11e698ed989f -] - -[some properties of converging prereals -robdockins@fastmail.fm**20140706041401 - Ignore-this: 273bfbb245302becd7ff402831827ffb -] - -[make realdom compile -robdockins@fastmail.fm**20140630015439 - Ignore-this: 8bfc8eaeed4a1596450b0bb9ddef9aaa -] - -[renaming -robdockins@fastmail.fm**20140630011639 - Ignore-this: a287e083af095790cbf2b48df7a58739 -] - -[reorganize some code -robdockins@fastmail.fm**20140630011446 - Ignore-this: f1375b9e7ad822cb92f0c83d4001eddd -] - -[build the retract for realdom -robdockins@fastmail.fm**20140630001245 - Ignore-this: 4eb9da621588417d1b7b2fc980c7bf70 -] - -[fill out lemmas about cPLT -robdockins@fastmail.fm**20140630001140 - Ignore-this: add9e45c14621e3d6328684098bf8461 -] - -[more facts about cPLT -robdockins@fastmail.fm**20140628073731 - Ignore-this: 101a131ed114902924a1707eff7ebc70 -] - -[continuous domains as retracts of bifinite domains -robdockins@fastmail.fm**20140628035522 - Ignore-this: 5e7c61d49cf8424412b0d94f5fcb5ee6 -] - -[start implementing arithmetic operations in RealDom -robdockins@fastmail.fm**20140620003249 - Ignore-this: c28479b8a933cba263765bdddb112264 -] - -[define the domain of rational intervals -robdockins@fastmail.fm**20140619040809 - Ignore-this: 6cbe1a9cc690e5a9d77f37ee299154b - this domain is useful for describing the semantics of exact real arithmetic. -] - -[show that every effective CUSL is Plotkin -robdockins@fastmail.fm**20140619034433 - Ignore-this: d529a4b1d6d698f79572caa805072394 -] - -[fix notation for octothorpe -robdockins@fastmail.fm**20140614222130 - Ignore-this: 3dc815825f11ceaf4f4f53e4668e6382 -] - -[fix for coq 8.4pl4 -robdockins@fastmail.fm**20140614222049 - Ignore-this: 9745904845aaf54e5569df982fc93d65 -] - -[move swelling lemma into finsets -robdockins@fastmail.fm**20140504080535 - Ignore-this: ffa560e9aa4e4f8b15a55c1f9b1da72e -] - -[documentation improvements and code motion -robdockins@fastmail.fm**20140504070008 - Ignore-this: da7847f82403990342732a8ce226315c -] - -[replace the old finprod -robdockins@fastmail.fm**20140504005534 - Ignore-this: 606cf44422f68d66c8d2d90049e67b93 -] - -[remove the old finprod -robdockins@fastmail.fm**20140504005137 - Ignore-this: 38bd54e16c87d27bbede08496c37bfba -] - -[update st_lam_fix to use the new finprod -robdockins@fastmail.fm**20140504003627 - Ignore-this: 95d0a66e99ccead89bdfef09a1c8c109 -] - -[update st_lam to use the new termmodel -robdockins@fastmail.fm**20140503230854 - Ignore-this: c3d6b2155674b414c5c2e14b85b13760 -] - -[new version of finprod with a better term model -robdockins@fastmail.fm**20140503222035 - Ignore-this: db63e3a063bdb6f2f579644c7b63bd1b -] - -[a few more (hopefully final) lemmas about union -robdockins@fastmail.fm**20140422223924 - Ignore-this: 7b95c75abef9b0d45863b5e33d1c5a37 -] - -[finish proofs about union -robdockins@fastmail.fm**20140422065034 - Ignore-this: 2929c3cdb013c028a48022b0293b2f18 -] - -[powerdomain progress -robdockins@fastmail.fm**20140421064325 - Ignore-this: 592f9c6046f05a27897b460edb2efe10 - Show that powerdomains are endofunctors on PLT. Further, they are monads with - the 'singleton' and 'join' operations. Also make some progress on the additive - portion of the theory, dealing with emptyset and union. -] - -[tweak makefile -robdockins@fastmail.fm**20140420031337 - Ignore-this: d5954b26f731bfed3d79cefacab322fb -] - -[show that semvalue is the weakest condition allowing beta-reduction of strict functions -robdockins@fastmail.fm**20140420020447 - Ignore-this: 16a7ed23f04879f1fb324bdac8a2ffaf -] - -[some additional operations relating to the PLT adjunction -robdockins@fastmail.fm**20140420020351 - Ignore-this: db8eec6e3f74cce3acb67d2b660b104e -] - -[finish building power domain fmap -robdockins@fastmail.fm**20140420020217 - Ignore-this: 556e1cb87576de36cb26f8add3a1b163 -] - -[fix up st_lam.v -robdockins@fastmail.fm**20140329015058 - Ignore-this: 1c31d674b759fbd0cc74fb3125579f96 -] - -[push some proofs into finprod -robdockins@fastmail.fm**20140329000401 - Ignore-this: 49070fdd951e49473e60d3cd0ec431c6 -] - -[documentation and aesthetic changeds -robdockins@fastmail.fm**20140327043141 - Ignore-this: be27b24b78ea6af722a307117e59f5b3 -] - -[finish the st_lam_fix example -robdockins@fastmail.fm**20140322011153 - Ignore-this: e702f564b6eab2f8c11ab16bcb62504b -] - -[clarafications re: countable choice; remove unfinished example from build order -robdockins@fastmail.fm**20140321212852 - Ignore-this: 2a9d5c79c05ba088e1815feab99a5f6c -] - -[break the "fixes" operator into a separate file and prove some facts about it -robdockins@fastmail.fm**20140318013247 - Ignore-this: 80c506cef0719a974a049a1f5870f676 -] - -[minor fix to skiy.v -robdockins@fastmail.fm**20140317054057 - Ignore-this: ffef6fcaf5fa7f8cea80d2808caf4f4c -] - -[add the fixpoint operator; admit proofs -robdockins@fastmail.fm**20140317044648 - Ignore-this: 97ca18e980cdf46a9b40c8252badef14 -] - -[remove the evaluation case for variables -robdockins@fastmail.fm**20140317032932 - Ignore-this: e46d634e735e5b21a18518a48777168d -] - -[start on STLC with fixpoints -- but without fixpoints for now -robdockins@fastmail.fm**20140317031953 - Ignore-this: 3458bc18c73d967bef58418bc73e06cb -] - -[add the eliminator for booleans to st_lam; other additional utility lemmas -robdockins@fastmail.fm**20140317031753 - Ignore-this: 369dd375755cbd9ae5e3c969f3ef6ec -] - -[some minor code motion -robdockins@fastmail.fm**20140228064927 - Ignore-this: 804828472ddb0c5fafc72460fce8387b -] - -[plug final holes in st_lam and add to build order -robdockins@fastmail.fm**20140228044729 - Ignore-this: 3edc7f36bfa97775ba33ffa27c80df59 -] - -[reduce st_lam.v to facts I believe about fresh variables -robdockins@fastmail.fm**20140228010832 - Ignore-this: bde3e73291ddd32337d6fb999e4b1c02 -] - -[fix breakages -robdockins@fastmail.fm**20140226073930 - Ignore-this: 9be54f5255f8ed9d53a79260e9bdf565 -] - -[more work on lambdas -robdockins@fastmail.fm**20140226043753 - Ignore-this: 7f7452670221e2643067a3c7cc180998 -] - -[use new finprod implementation -robdockins@fastmail.fm**20140226043700 - Ignore-this: c9e05df5fcfd31254ed7318fe693490c -] - -[remove old finprod -robdockins@fastmail.fm**20140226043642 - Ignore-this: 2705703a2c782da21a152fbb27c8a972 -] - -[rearrange the interfact to finprod -robdockins@fastmail.fm**20140226043541 - Ignore-this: c44d7c478948f42b188eb8d06469abbf -] - -[fill remaining holes in finprod2 -robdockins@fastmail.fm**20140225205242 - Ignore-this: 1eeb9b8beef92790c28918292f2a9cf4 -] - -[rework some stuff dealing with semidecidable predicates -robdockins@fastmail.fm**20140225092149 - Ignore-this: 32b5ccb2927e08979ea92b9ef67c40f4 -] - -[lots of work on alpha-congrunce in lambdas -robdockins@fastmail.fm**20140225035601 - Ignore-this: fbbec9dac4cb328ff4e0b25df646e0c7 -] - -[terminate is universal in PLT -robdockins@fastmail.fm**20140225035538 - Ignore-this: abc6cd1a60578c435bf9ca596d8d0922 -] - -[new attack on nominal finite products -robdockins@fastmail.fm**20140225035516 - Ignore-this: 3875e713acc6aa5193696612f3ede76d -] - -[push forward a little on lambdas -robdockins@fastmail.fm**20140221095249 - Ignore-this: c690a1b03075702e3fd84aac7e268211 -] - -[update finprod for various changes -robdockins@fastmail.fm**20140221095230 - Ignore-this: a6d787930ed356ae2b0a003af1f4d44 -] - -[better discrete cases lemma -robdockins@fastmail.fm**20140219051301 - Ignore-this: f0ec88e8207257e7657ced933cf687e7 -] - -[start working on simply-typed lambdas -robdockins@fastmail.fm**20140219051238 - Ignore-this: 69bea345376ea39cd1addc0849a43077 -] - -[more messing about with advanced category theory stuff -robdockins@fastmail.fm**20140211095003 - Ignore-this: 9cd3c9d961349e8797f109f716c5f678 -] - -[minor rearrangements and code motion -robdockins@fastmail.fm**20140211041724 - Ignore-this: 642ad6f1395fde7ecd81e5a905fd5428 -] - -[some basic bicategory theory -robdockins@fastmail.fm**20140210083634 - Ignore-this: f47a898fa045a397d3ee70e1512b8baa -] - -[even more notation futzing -robdockins@fastmail.fm**20140209072416 - Ignore-this: d2061652cb3e80f6994f567a9e677b32 -] - -[additional notational futzing -robdockins@fastmail.fm**20140209043308 - Ignore-this: ac42cbbc94df227e6d5e70b96ae65fd3 -] - -[futz around with notations, various other cleanup activities -robdockins@fastmail.fm**20140209005551 - Ignore-this: 3f41a52650aadd956ac490b62e59c1c3 -] - -[complete adequacy for SKI+Y -robdockins@fastmail.fm**20140206050414 - Ignore-this: f730587ac7a42f3e35740976a1439f2e -] - -[minor changes in cpo -robdockins@fastmail.fm**20140206014745 - Ignore-this: 95244704faf1e6c336d62dc7912f9022 -] - -[push through most of SKI+Y adequacy -robdockins@fastmail.fm**20140205214805 - Ignore-this: dc998ef45f2e919e9373bfa21a5ef8c7 -] - -[major simplification of the adequacy proof for SKI -robdockins@fastmail.fm**20140205185605 - Ignore-this: f1f0dc46274db05f3393038dfe2775e2 -] - -[push forward on SKI+Y -robdockins@fastmail.fm**20140205044216 - Ignore-this: daf255aa940b42c1c68ba947a356370d -] - -[continue futzing with the LR statement -robdockins@fastmail.fm**20140203055601 - Ignore-this: f5ef9f06d3b1a11d76317b52cec691ab -] - -[start pushing on adequacy for SKI+Y -robdockins@fastmail.fm**20140202085948 - Ignore-this: 956844809340fad0c13c19e9fa729b5c -] - -[mostly finish soundness for SKI+Y -robdockins@fastmail.fm**20140202060633 - Ignore-this: 4c75fd9eeefa1d6dad6866662abea0fd -] - -[start working on a CCL example -robdockins@fastmail.fm**20140202020748 - Ignore-this: 44c5d7854cc19b0f90414c2be6b3df68 -] - -[make id(A) a parsing-only notation -robdockins@fastmail.fm**20140202020724 - Ignore-this: 68f51f754c0b89e2e815da47b901e4b1 -] - -[the PLT adjunction is strong monodial -robdockins@fastmail.fm**20140202020637 - Ignore-this: 7b29b9a6a5e8efa07440c528ec12d7bd -] - -[fix my broken version of lfp and fixup proofs -robdockins@fastmail.fm**20140202020615 - Ignore-this: 3ac283481318622cbf38378e815a4f09 -] - -[more work on SKI + Y -robdockins@fastmail.fm**20140202020516 - Ignore-this: d1f63e2ef610c6f93d03806c5426cfa5 -] - -[start work on SKI + Y -robdockins@fastmail.fm**20140201085039 - Ignore-this: fb7a405830cf90526cddd8ce37f4da40 -] - -[doc corrections -robdockins@fastmail.fm**20140130015908 - Ignore-this: bca4c04267bfdac8cb202651a0960d92 -] - -[lots of additional inline documentation -robdockins@fastmail.fm**20140129234834 - Ignore-this: ab2c59add5514f44a898de1f0eece98b -] - -[powerdomains form continuous functors in EMBED -robdockins@fastmail.fm**20140126234115 - Ignore-this: d2ee08902f0bdb52efd7f7ce2c594469 -] - -[complete the powerdomain constructions; build some operations -robdockins@fastmail.fm**20140125225202 - Ignore-this: 9c8f2632df05e84fc3794a338ff8720d -] - -[construct the basic powerdomains--still some holes left -robdockins@fastmail.fm**20140125064541 - Ignore-this: c3206d2e1e925096b3e9ff49afacef2f -] - -[generalize the lfp construction to a generic chain_sup operation -robdockins@fastmail.fm**20140124183103 - Ignore-this: 4cc2c1011b9f79365dcb7c76784fbfa6 -] - -[update makefile -robdockins@fastmail.fm**20140124073734 - Ignore-this: a0b7db8383262caa314c21b99e146222 -] - -[new file for recursive lambda domains -robdockins@fastmail.fm**20140124070023 - Ignore-this: 300c02b4da83b6ebd734aa2ccb21cd2d -] - -[more lemmas about antistrict homs -robdockins@fastmail.fm**20140124065953 - Ignore-this: 483c7b350dc3cab59c8ff50e1ac73b8c -] - -[fix breakage related to implicit arguments -robdockins@fastmail.fm**20140124065805 - Ignore-this: 561693d3280851299c6a49a2a34546b3 -] - -[notation tweaks in cpo.v -robdockins@fastmail.fm**20140124053800 - Ignore-this: 83e92d8c14568448074a940ceafbe2c9 -] - -[add if/then/else to the SKI system -robdockins@fastmail.fm**20140124023630 - Ignore-this: 37a9737932a05393a6338380226ca346 -] - -[case analysis for finite types -robdockins@fastmail.fm**20140124012505 - Ignore-this: 6ec1076b2a74f5832501a105a28a6dba -] - -[finish adequacy proof for SKI -robdockins@fastmail.fm**20140123211322 - Ignore-this: 1fe3e626e33431c27e2aa186b3bf91d2 -] - -[additional lemmas about domains -robdockins@fastmail.fm**20140123090037 - Ignore-this: fcad2dd816f805b8b5e7d1be3df60db8 -] - -[most of a proof of adequacy for SKI -robdockins@fastmail.fm**20140123085839 - Ignore-this: d1595c02a6387297018e7f316a3e751 -] - -[more work on finite products -robdockins@fastmail.fm**20140121061158 - Ignore-this: c2f8212e041478104dd4c81c225b42d5 -] - -[begin work on a more flexible "finprod" domain -robdockins@fastmail.fm**20140119021653 - Ignore-this: 249718a2c31964733171b21c84d2effb -] - -[mess with implicit arguments in categories.v -robdockins@fastmail.fm**20140113041450 - Ignore-this: 314cad9207f706e949bd686aaa5c5e1b -] - -[products for CPO, uniformity of lfp -robdockins@fastmail.fm**20140113041421 - Ignore-this: e533abe995e634c732a35e71d66ddb6a -] - -[define the LFP in pointed CPOs, prove the Scott induction principle -robdockins@fastmail.fm**20140112231843 - Ignore-this: 2014174b1c6914bef376d614f34d073f -] - -[build the forgetful functor from EMBED to PLT -robdockins@fastmail.fm**20140110014909 - Ignore-this: 1dacbfc0383e48f4ab35fe0a5fd11cec -] - -[notation changes, prove sum_cases and curry preserve order and equality -robdockins@fastmail.fm**20140110014820 - Ignore-this: d1c6a1d0346a9eba14f3529ac30b5e2f -] - -[prove addl facts about pairs, tweak implicit arguments -robdockins@fastmail.fm**20140110010319 - Ignore-this: 9f0af8abc268b2b22d8b5450d6a4136 -] - -[make 'ob' a coercion -robdockins@fastmail.fm**20140110010204 - Ignore-this: 467c0b0a8b086a7f44bf98875a4380d6 -] - -[copyright notices -robdockins@fastmail.fm**20140106232333 - Ignore-this: f59bafa0ec99e259bd9b4319f2cdbc67 -] - -[add ord_dec coercion -robdockins@fastmail.fm**20140104052750 - Ignore-this: 4ed1cacfd27979f0fe518862be5ac27c -] - -[define the model for CBV lambda calculus -robdockins@fastmail.fm**20140104050626 - Ignore-this: 88ca796d4697bfebb044d3fae27d6129 -] - -[proof a fixpoint lemma for unpointed domains -robdockins@fastmail.fm**20140103231818 - Ignore-this: 4939eb02d09b6a4eecf145c887c64393 -] - -[prove that the adjoint functors between PLT and PPLT extend to continuous functors in EMBED -robdockins@fastmail.fm**20140103000915 - Ignore-this: 54da0101f581731ebe512ed514e0603e -] - -[notation changes for PLT -robdockins@fastmail.fm**20140102234446 - Ignore-this: ad1f82f22d1bf0e057f11c3508a81716 -] - -[move embeddings into their own file; pull TPLT and PPLT into profinite.v -robdockins@fastmail.fm**20140102234424 - Ignore-this: 3704996af47ae32415ba3e539d67cf5c -] - -[Show that PLT is cocartesian; rearrange proof that EMBED(true) is terminated -robdockins@fastmail.fm**20140102213805 - Ignore-this: 3470df6910e7a3e4bda478c0c6ecea62 -] - -[remove unnecessary "inh" hypothesis in the definition of Plotkin order; fixup the fallout -robdockins@fastmail.fm**20140102213646 - Ignore-this: b6a5ad59296f938b377d71852120d48b -] - -[move proofs that empty and unit preorders are effective plotkin -robdockins@fastmail.fm**20140102205530 - Ignore-this: 7324843510fd938d356aa82003c9ec68 -] - -[make epi/mono/iso morphisms into categories -robdockins@fastmail.fm**20131228082442 - Ignore-this: ee75a2b6eb1f3d6fa47f17d6734e5015 -] - -[define the cocartesian and distributive categories -robdockins@fastmail.fm**20131226001612 - Ignore-this: 11e9d8a88bef42bcb800b31d85d28d16 -] - -[remove uses of maximally implict arguments -robdockins@fastmail.fm**20131226001536 - Ignore-this: c0d93a5398aea58cbcc4fbbca3b59b17 -] - -[fixpoints and binary sums for NOMINAL -robdockins@fastmail.fm**20131121092931 - Ignore-this: 8a660dfe2ab16a8208ae559dcf2b7ed0 -] - -[modify bilimit.v to use the general construction from cont_functors.v -robdockins@fastmail.fm**20131120075848 - Ignore-this: 17ea36107ade1646eab5c99aec3561a9 -] - -[generic fixpoint construction for categories with initial objects and directed colimits -robdockins@fastmail.fm**20131119092522 - Ignore-this: 25674dff855a1cecdb4ee919f8bf3a5d -] - -[remove some irritating unit parameters, fix doc typos -robdockins@fastmail.fm**20131118093204 - Ignore-this: 38342d58567d8a13471620d5b7c2b7d4 -] - -[improvements to categories; complete some constructions in nominal -robdockins@fastmail.fm**20131118085737 - Ignore-this: e58cb49a01d0210dabdb021250910adb -] - -[build fixes -robdockins@fastmail.fm**20131113004305 - Ignore-this: 5abffcd1d6b44f816749c5e0cfd5b6e9 -] - -[Documentation additions -robdockins@fastmail.fm**20131113004254 - Ignore-this: 79a913d3a8652866f3fdc64891f6304d -] - -[lots of inline documentation additions -robdockins@fastmail.fm**20131112192736 - Ignore-this: 6aa38112c10ceed3bf43e35dbda98312 -] - -[update makefiles -robdockins@fastmail.fm**20131112192706 - Ignore-this: d834beaa532cdf994cfa0a0b5a562e4f -] - -[continuous functors for binary sum and products -robdockins@fastmail.fm**20131112192605 - Ignore-this: 61520e6e315df909465a02f854816366 -] - -[add the category of nominal types -robdockins@fastmail.fm**20131112192520 - Ignore-this: f0351c5eb0bdacdfe192a6863d9c0bc6 -] - -[split the proof that expF is a continuous functor into a separate file; rearrange some defintions -robdockins@fastmail.fm**20130924013328 - Ignore-this: 4eacee37bb6474d1bdfffe416b98b4c1 -] - -[rearrange definitions of continuous functors. Prove enough plumbing to build the model: D = D->D -robdockins@fastmail.fm**20130924002837 - Ignore-this: a66f9e8833601e244048b70e8bfaab96 -] - -[show that the function space is a continuous functor; other junk -robdockins@fastmail.fm**20130923060521 - Ignore-this: d8f406450688c633ebc1fe1eb0343c91 -] - -[some name changes, other cosmetic fixes -robdockins@fastmail.fm**20130909043234 - Ignore-this: cdd24d1c96a34fb3573c1806153df9fb -] - -[additional cosmetic changes and rearrangements -robdockins@fastmail.fm**20130909020137 - Ignore-this: 77d28bc9452f6c93915194033118dab7 -] - -[reorganize profinite code -robdockins@fastmail.fm**20130909011437 - Ignore-this: 8511bf92ca6998ff8c69d5537624bdb8 -] - -[cosmetic changes -robdockins@fastmail.fm**20130908183909 - Ignore-this: e19039701e58fd26ca4eab79d7b49d14 -] - -[complete the bilimit construction, show how to take fixpoints of continuous functors -robdockins@fastmail.fm**20130908175228 - Ignore-this: 82feab8fdc0c944f13d91605c6a8e571 -] - -[find a MUCH easier path to a bilimit construction -robdockins@fastmail.fm**20130907012151 - Ignore-this: fcc72ad140b045ef37e4b03ad38a8fb0 -] - -[lots of progress, mostly on defining bilimits -robdockins@fastmail.fm**20130905204959 - Ignore-this: abf4bcf03a49fa009f9fb2200ee3abf2 -] - -[start working on the theory of finite preorders, which form a basis for plokin orders -robdockins@fastmail.fm**20130812054451 - Ignore-this: 5be36257a8fdf486bcc31f587d93c457 -] - -[parameterize plotkin orders, build category PPLT -robdockins@fastmail.fm**20130811063623 - Ignore-this: 3f273841bc72098acee0fd618627dbd5 -] - -[complete the details showing PLT is cartesian closed -robdockins@fastmail.fm**20130809230336 - Ignore-this: 13fd1b5a8172dd263cf655421f7584f7 -] - -[add files missed in the first import -robdockins@fastmail.fm**20130809080742 - Ignore-this: 6b59cce866a486d70559f7c80fe99053 -] - -[initial import of development -robdockins@fastmail.fm**20130809080409 - Ignore-this: 44cb5a0df2f1643d289f07dcd4227cbf - First major steps toward a fully effective and usable formalized - domain theory. We formalize the plotkin preorders and show that - they form a cartesian closed category. -] diff --git a/pkgs/development/coq-modules/domains/default.nix b/pkgs/development/coq-modules/domains/default.nix deleted file mode 100644 index 975260c839bd243b00c2f959bca73174ba6d702a..0000000000000000000000000000000000000000 --- a/pkgs/development/coq-modules/domains/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchdarcs, coq}: - -stdenv.mkDerivation rec { - - name = "coq-domains-${coq.coq-version}-${version}"; - version = "ce1a9806"; - - src = fetchdarcs { - url = http://hub.darcs.net/rdockins/domains; - context = ./darcs_context; - sha256 = "0zdqiw08b453i8gdxwbk7nia2dv2r3pncmxsvgr0kva7f3dn1rnc"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = with stdenv.lib; { - homepage = http://rwd.rdockins.name/domains/; - description = "A Coq library for domain theory"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 425ab408c8c6ffc332faef66f7250bd0a49c2b8e..390ced8fdad3c8a04982119d56c124943916b69d 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }: -let param = { +let params = { "8.7" = { version = "0.6.2"; rev = "d76ddde37d918569945774733b7997e8b24daf51"; @@ -16,7 +16,9 @@ let param = { rev = "v0.6"; sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; }; -}."${coq.coq-version}"; in +}; +param = params."${coq.coq-version}"; +in stdenv.mkDerivation { name = "coq${coq.coq-version}-dpdgraph-${param.version}"; @@ -46,4 +48,9 @@ stdenv.mkDerivation { maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = coq.meta.platforms; }; + + passthru = { + compatibleCoqVersions = v: builtins.hasAttr v params; + }; + } diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index eb05a1be53e2be601ee10da799bab3e7c3ec9bc6..1867d9605661aea995d078c39d5edf41c121e0a7 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -3,15 +3,15 @@ let param = { "8.6" = { - version = "1.0-beta"; - rev = "v1.0-beta"; - sha256 = "00pzlh5ij7s2hmpvimq1hjq3fjf0nrk997l3dl51kigx5r5dnvxd"; + version = "1.0"; + rev = "v1.0"; + sha256 = "19ylw9v9g35607w4hm86j7mmkghh07hmkc1ls5bqlz3dizh5q4pj"; }; "8.7" = { - version = "cdf8c53"; - rev = "cdf8c53f1f2274b29506f53bff476409ce717dc5"; - sha256 = "0ipjzmviwnp0ippbkn03ld4j4j0dkzmyidmj4dvpdvymrkv31ai1"; + version = "1.0"; + rev = "v1.0-8.7"; + sha256 = "1bavg4zl1xn0jqrdq8iw7xqzdvdf39ligj9saz5m9c507zri952h"; }; }."${coq.coq-version}" @@ -42,4 +42,8 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index dc411763da5c674fbda4b4248dcd0464293c4423..bc5c0fdd6bb7413afc2e87403a1b7a7c8546b2e4 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -1,22 +1,23 @@ -{stdenv, fetchgit, coq, python27}: +{stdenv, fetchgit, coq, ocamlPackages, python27}: stdenv.mkDerivation rec { name = "coq-fiat-${coq.coq-version}-unstable-${version}"; - version = "2016-10-24"; + version = "2018-02-27"; src = fetchgit { url = "https://github.com/mit-plv/fiat.git"; - rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a"; - sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64"; + rev = "253fc133397f73d6daed0b9518ca7ab5507a1cb0"; + sha256 = "0b5z7nz0cr1s7vy04s996dj0pd7ljqx6g5a8syh4hy2z87ijkjzd"; }; - buildInputs = [ coq.ocaml coq.camlp5 python27 ]; + buildInputs = [ ocamlPackages.ocaml ocamlPackages.camlp5_transitional + ocamlPackages.findlib python27 ]; propagatedBuildInputs = [ coq ]; doCheck = false; - enableParallelBuilding = false; + enableParallelBuilding = true; buildPhase = "make -j$NIX_BUILD_CORES"; installPhase = '' @@ -30,7 +31,9 @@ stdenv.mkDerivation rec { description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; - broken = stdenv.lib.versionAtLeast coq.coq-version "8.6"; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; } diff --git a/pkgs/development/coq-modules/fiat/default.nix b/pkgs/development/coq-modules/fiat/default.nix deleted file mode 100644 index e084497cbf8198a897ca8e4a4c9e509bac4f908d..0000000000000000000000000000000000000000 --- a/pkgs/development/coq-modules/fiat/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{stdenv, fetchurl, coq}: - -stdenv.mkDerivation rec { - - name = "coq-fiat-${coq.coq-version}-${version}"; - version = "20141031"; - - src = fetchurl { - url = "http://plv.csail.mit.edu/fiat/releases/fiat-${version}.tar.gz"; - sha256 = "0c5jrcgbpdj0gfzg2q4naqw7frf0xxs1f451fnic6airvpaj0d55"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - enableParallelBuilding = false; - doCheck = !stdenv.isi686; - - unpackPhase = '' - mkdir fiat - cd fiat - tar xvzf ${src} - ''; - - buildPhase = "make -j$NIX_BUILD_CORES sources"; - checkPhase = "make -j$NIX_BUILD_CORES examples"; - - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Fiat - cp -pR src/* $COQLIB/user-contrib/Fiat - ''; - - meta = with stdenv.lib; { - homepage = http://plv.csail.mit.edu/fiat/; - description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index 5f31fe6dc34118576b3fe172c789055dd683ec31..bf441562b14e344f864612a477d723c4b2f5a7a7 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -24,4 +24,7 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: !stdenv.lib.versionAtLeast v "8.8"; + }; } diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 683ab80b36bb47825de045fcc3e9f5270504adc0..b1036e61f1bb546b9e771c907a737f5133f6d65f 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,24 +1,12 @@ { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp , bignums ? null }: -let param = - if stdenv.lib.versionAtLeast coq.coq-version "8.5" - then { - version = "3.3.0"; - url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; - sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; - } else { - version = "3.1.1"; - url = "https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz"; - sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; - }; -in - stdenv.mkDerivation { - name = "coq${coq.coq-version}-interval-${param.version}"; + name = "coq${coq.coq-version}-interval-3.3.0"; src = fetchurl { - inherit (param) url sha256; + url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; + sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; }; nativeBuildInputs = [ which ]; @@ -36,4 +24,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ vbgl ]; platforms = coq.meta.platforms; }; + + passthru = { inherit (mathcomp) compatibleCoqVersions; }; + } diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index d045ec4223b28714257bb53a7dc8ae4f7184de60..1831cd0c5714c7fe773d40f63596f7130f6ed1db 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchFromGitHub, coq, coqPackages }: - -if ! stdenv.lib.versionAtLeast coq.coq-version "8.6" then - throw "Math-Classes requires Coq 8.6 or later." -else +{ stdenv, fetchFromGitHub, coq, bignums }: stdenv.mkDerivation rec { @@ -16,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wgnczacvkb2pc3vjbni9bwjijfyd5jcdnyyjg8185hkf9zzabgi"; }; - buildInputs = [ coq coqPackages.bignums ]; + buildInputs = [ coq bignums ]; enableParallelBuilding = true; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; @@ -26,4 +22,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ siddharthist jwiegley ]; platforms = coq.meta.platforms; }; + + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + }; + } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 48cb2c4d33fb91a95f67c2788b45a8412536a9ce..79bced9ad0ee604f24c5772b9c3fd1919eb03303 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -2,12 +2,6 @@ let param = { - "8.4" = { - version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - "8.5" = { version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index 564cb6f65717f2be726a489390ec7f6e6055111b..5d39f9b3b0c8407d3363a3c694af4564bb336cd6 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -35,4 +35,8 @@ stdenv.mkDerivation { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 0304cb48b3b9f4427b99964116dba48c9556f14d..f6316f77a1fa72e4169e1e856c1d6581f901f453 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, coq, ocamlPackages, haskellPackages, which, ott +{ stdenv, fetchgit, coq, haskellPackages, which, ott }: stdenv.mkDerivation rec { @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; }; - buildInputs = [ coq.ocaml coq.camlp5 which coq lngen ott ] - ++ (with ocamlPackages; [ findlib ]); + buildInputs = [ coq.ocaml coq.camlp5 which coq lngen ott coq.findlib ]; propagatedBuildInputs = [ coq ]; enableParallelBuilding = true; @@ -50,4 +49,8 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + }; + } diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..aa22c96256f591609f9267dc783c089a7905ff4b --- /dev/null +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-multinomials-${version}"; + version = "1.0"; + src = fetchFromGitHub { + owner = "math-comp"; + repo = "multinomials"; + rev = version; + sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; + inherit (src.meta) homepage; + license = stdenv.lib.licenses.cecill-b; + inherit (coq.meta) platforms; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; +} diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 93ef7c14f1f3c814cdd642de0f17d3a376bb0ba4..94a24eb70858487466768e47d8ca6368910ac64a 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -28,4 +28,8 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 35c23842158d594c887692dbefe8d3e8db299f10..3b53a2831e8c5985839940a60f2cb423cb80f616 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -2,12 +2,6 @@ let param = { - "8.4" = { - version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - "8.5" = { version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index c598345403dbcde8e78387e053488b8abca3af53..ca20e17dd50e13dd41bbcd4a708db59efdaab679 100644 --- a/pkgs/development/coq-modules/ssreflect/generic.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -42,4 +42,8 @@ stdenv.mkDerivation { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 2d30db5a80d4aa06496c11a31f0274289a76c0d7..4748a0dd2385b371c68b3226e3444639b70f6689 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -1,38 +1,27 @@ -{stdenv, fetchsvn, coq}: +{ stdenv, fetchurl, coq }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "20171206"; + name = "coq${coq.coq-version}-tlc-${version}"; - name = "coq-tlc-${coq.coq-version}"; - - src = fetchsvn { - url = svn://scm.gforge.inria.fr/svn/tlc/branches/v3.1; - rev = 240; - sha256 = "0mjnb6n9wzb13y2ix9cvd6irzd9d2gj8dcm2x71wgan0jcskxadm"; + src = fetchurl { + url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz"; + sha256 = "1wc44qb5zmarafp56gdrbka8gllipqna9cj0a6d99jzb361xg4mf"; }; - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - preConfigure = '' - patch Makefile < \$(COQC) -R . Tlc \$< - EOF - ''; + buildInputs = [ coq ]; - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Tlc - cp -p *.vo $COQLIB/user-contrib/Tlc - ''; + installFlags = "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib"; - meta = with stdenv.lib; { - homepage = http://www.chargueraud.org/softs/tlc/; - description = "A general purpose Coq library that provides an alternative to Coq's standard library"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; + meta = { + homepage = "http://www.chargueraud.org/softs/tlc/"; + description = "A non-constructive library for Coq"; + license = stdenv.lib.licenses.free; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (coq.meta) platforms; }; + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + }; } diff --git a/pkgs/development/coq-modules/unimath/default.nix b/pkgs/development/coq-modules/unimath/default.nix deleted file mode 100644 index 8bd6cf5a84dd282aa6e111f8e2520041d45034e6..0000000000000000000000000000000000000000 --- a/pkgs/development/coq-modules/unimath/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchgit, coq}: - -stdenv.mkDerivation rec { - - name = "coq-unimath-${coq.coq-version}-${version}"; - version = "a2714eca"; - - src = fetchgit { - url = git://github.com/UniMath/UniMath.git; - rev = "a2714eca29444a595cd280ea961ec33d17712009"; - sha256 = "0v7dlyipr6bhwgp9v366nxdan018acafh13pachnjkgzzpsjnr7g"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = with stdenv.lib; { - homepage = https://github.com/UniMath/UniMath; - description = "A formalization of a substantial body of mathematics using the univalent point of view"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/ynot/default.nix b/pkgs/development/coq-modules/ynot/default.nix deleted file mode 100644 index d83e2c5c79095cb31d7079e102bff088f5319c9e..0000000000000000000000000000000000000000 --- a/pkgs/development/coq-modules/ynot/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchgit, coq}: - -stdenv.mkDerivation rec { - - name = "coq-ynot-${coq.coq-version}-${version}"; - version = "ce1a9806"; - - src = fetchgit { - url = git://github.com/Ptival/ynot.git; - rev = "ce1a9806c26ffc6e7def41da50a9aac1433cb2f8"; - sha256 = "1pcmcl5zamiimkcg1xvynxnfbv439y02vg1mnz79hqq9mnjyfnpw"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - preBuild = "cd src"; - - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Ynot - cp -pR coq/*.vo $COQLIB/user-contrib/Ynot - ''; - - meta = with stdenv.lib; { - homepage = http://ynot.cs.harvard.edu/; - description = "A library for writing and verifying imperative programs"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix deleted file mode 100644 index b6bee8aead0225cc261b9c4f29a98b7c15c23952..0000000000000000000000000000000000000000 --- a/pkgs/development/eclipse/ecj/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchurl, unzip, ant, jdk7, makeWrapper }: - -let - version = "3.7.2"; - date = "201202080800"; -in - -stdenv.mkDerivation rec { - name = "ecj-${version}"; - - src = fetchurl { - url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.jar"; - sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm"; - }; - - buildInputs = [ unzip ant jdk7 makeWrapper ]; - - unpackPhase = '' - mkdir "${name}" - cd "${name}" - unzip "$src" - ''; - - # Use whatever compiler Ant knows. - buildPhase = "ant build"; - - installPhase = '' - mkdir -pv $out/share/java - cp -v *.jar $out/share/java - - mkdir -pv $out/bin - makeWrapper ${jdk7.jre}/bin/java $out/bin/ecj \ - --add-flags "-cp $out/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main" - - # Add a setup hook that causes Ant to use the ECJ. - mkdir -p $out/nix-support - cat < $out/nix-support/setup-hook - export NIX_ANT_ARGS="-Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter \$NIX_ANT_ARGS" - EOF - ''; - - meta = { - description = "The Eclipse Compiler for Java (ECJ)"; - - longDescription = '' - ECJ is an incremental Java compiler. Implemented as an Eclipse - builder, it is based on technology evolved from VisualAge for Java - compiler. In particular, it allows users to run and debug code which - still contains unresolved errors. - ''; - - homepage = http://www.eclipse.org/jdt/core/index.php; - - # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) - license = stdenv.lib.licenses.epl10; - - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - }; -} diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index 16b8f1df595e915f9a5c6b4c2052894c19d844f3..332fab8e14aa378b9d730488e0ea853c6f63c937 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, emscripten }: +{ pkgs, lib, emscripten, python }: { buildInputs ? [], nativeBuildInputs ? [] @@ -11,8 +11,8 @@ pkgs.stdenv.mkDerivation ( { name = "emscripten-${args.name}"; - buildInputs = [ emscripten ] ++ buildInputs; - nativeBuildInputs = [ emscripten ] ++ nativeBuildInputs; + buildInputs = [ emscripten python ] ++ buildInputs; + nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs; # fake conftest results with emscripten's python magic EMCONFIGURE_JS=2; @@ -38,9 +38,18 @@ pkgs.stdenv.mkDerivation ( runHook postBuild ''; + doCheck = true; + checkPhase = args.checkPhase or '' runHook preCheck + echo "Please provide a test for your emscripten based library/tool, see libxml2 as an exmple on how to use emcc/node to verify your build" + echo "" + echo "In normal C 'unresolved symbols' would yield an error and a breake of execution. In contrast, in emscripten they are only a warning which is ok given that emscripten assumptions about shared libraries." + echo " -> https://github.com/kripken/emscripten/wiki/Linking" + echo "So just assume the dependencies were built using hydra, then YOU WILL NEVER see the warning and your code depending on a library will always fail!" + exit 1 + runHook postCheck ''; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 0d70113727c22c336616cf2755a3bc17360a04e9..77c2687e2911eb1c64381a3076cbf38d95f594f2 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -98,7 +98,7 @@ go.stdenv.mkDerivation ( rmdir goPath '') + (lib.optionalString (extraSrcPaths != []) '' - ${rsync}/bin/rsync -a ${lib.concatMapStrings (p: "${p}/src") extraSrcPaths} go + ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go '') + '' export GOPATH=$NIX_BUILD_TOP/go:$GOPATH @@ -196,6 +196,9 @@ go.stdenv.mkDerivation ( find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; + # Disable go cache, which is not reused in nix anyway + GOCACHE = "off"; + shellHook = '' d=$(mktemp -d "--suffix=-$name") '' + toString (map (dep: '' @@ -220,6 +223,7 @@ go.stdenv.mkDerivation ( meta = { # Add default meta information + homepage = "https://${goPackagePath}"; platforms = go.meta.platforms or lib.platforms.all; } // meta // { # add an extra maintainer to every package diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index 5f82a93c513aeda16ae26efc3e2ea96dac9b8e6f..cfb56790221e45b1c6e72006a9830d4338b2810a 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -23,6 +23,6 @@ in stdenv.mkDerivation { homepage = https://github.com/wingo/fibers; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5203a7c7618df8f7e671af833a990934981ca97f..1e993524b5ce4abfc25534470f7642860501ffac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -15,13 +15,6 @@ with haskellLib; self: super: { - attoparsec-time_1 = super.attoparsec-time_1.override { - doctest = super.doctest_0_13_0; - }; - attoparsec-data = super.attoparsec-data.override { - attoparsec-time = self.attoparsec-time_1; - }; - # This used to be a core package provided by GHC, but then the compiler # dropped it. We define the name here to make sure that old packages which # depend on this library still evaluate (even though they won't compile @@ -39,13 +32,14 @@ self: super: { # compiled on Linux. We provide the name to avoid evaluation errors. unbuildable = throw "package depends on meta package 'unbuildable'"; - # cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with - # Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; }); + # Use the latest version of the Cabal library. + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + + # The test suite depends on old versions of tasty and QuickCheck. hackage-security = dontCheck super.hackage-security; # Link statically to avoid runtime dependency on GHC. - jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; + jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal; # enable using a local hoogle with extra packagages in the database # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" @@ -56,28 +50,23 @@ self: super: { clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; - hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; }; - hspec-core = super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }; + hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; }; + hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; }; + hspec-expectations = dontCheck super.hspec-expectations; HTTP = dontCheck super.HTTP; http-streams = dontCheck super.http-streams; nanospec = dontCheck super.nanospec; options = dontCheck super.options; statistics = dontCheck super.statistics; - - # https://github.com/gilith/hol/pull/1 - hol = appendPatch (doJailbreak super.hol) (pkgs.fetchpatch { - name = "hol.patch"; - url = "https://github.com/gilith/hol/commit/a5171bdcacdbe93c46c9f82ec5a38f2a2b69e632.patch"; - sha256 = "0xkgbhc4in38hspxgz2wcvk56pjalw43gig7lzkjfhgavwxv3jyj"; - }); + vector-builder = dontCheck super.vector-builder; # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; # Use the default version of mysql to build this package (which is actually mariadb). # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; }); + mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; }); # check requires mysql server mysql-simple = dontCheck super.mysql-simple; @@ -88,15 +77,30 @@ self: super: { # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ - git-annex = (overrideCabal (super.git-annex.overrideScope (self: super: { - optparse-applicative = self.optparse-applicative_0_14_0_0; - })) (drv: { + git-annex = ((overrideCabal super.git-annex (drv: { src = pkgs.fetchgit { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "14449sllp81d23mnjwn1m658kzry5qvww2ykxkbkdcrlz6kl6dy0"; + sha256 = "011kiyy1anj99ab70npl5i7pcqri0pdk04s4cvdm39zyas5m9lbd"; }; + })).overrideScope (self: super: { + aws = dontCheck (self.aws_0_18); + conduit = self.conduit_1_2_13_1; + conduit-extra = self.conduit-extra_1_2_3_2; + cryptonite-conduit = dontCheck super.cryptonite-conduit; # test suite does not compile with old versions used here + html-conduit = self.html-conduit_1_2_1_2; + http-conduit = self.http-conduit_2_2_4; + persistent = self.persistent_2_7_3_1; + persistent-sqlite = self.persistent-sqlite_2_6_4; + resourcet = self.resourcet_1_1_11; + xml-conduit = self.xml-conduit_1_7_1_2; + yesod = self.yesod_1_4_5; + yesod-core = self.yesod-core_1_4_37_3; + yesod-form = self.yesod-form_1_4_16; + yesod-persistent = self.yesod-persistent_1_4_3; + yesod-static = self.yesod-static_1_5_3_1; + yesod-test = self.yesod-test_1_5_9_1; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; @@ -109,21 +113,22 @@ self: super: { # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo # see: https://github.com/psibi/shell-conduit/issues/12 - doCheck = !pkgs.stdenv.hostPlatform.isDarwin; - })); + doCheck = !pkgs.stdenv.isDarwin; + })).overrideScope (self: super: { + # shell-conduit doesn't build with conduit 1.3 + # see https://github.com/psibi/shell-conduit/issues/15 + conduit = self.conduit_1_2_13_1; + conduit-extra = self.conduit-extra_1_2_3_2; + resourcet = self.resourcet_1_1_11; + }); # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; - # https://github.com/haskell-works/hw-xml/issues/23 - # Disable building the hw-xml-example executable: - hw-xml = (overrideCabal super.hw-xml (drv: { - postPatch = "sed -i 's/ hs-source-dirs: app/" + - " hs-source-dirs: app\\n" + - " buildable: false/' hw-xml.cabal"; - })); - + # Test suite doesn't terminate hzk = dontCheck super.hzk; + + # Tests require a Kafka broker running locally haskakafka = dontCheck super.haskakafka; # Depends on broken "lss" package. @@ -152,40 +157,12 @@ self: super: { extraLibraries = [ pkgs.openblasCompat ]; }); - LambdaHack = super.LambdaHack.override { sdl2-ttf = super.sdl2-ttf_2_0_1; }; - # The Haddock phase fails for one reason or another. - acme-one = dontHaddock super.acme-one; - attoparsec-conduit = dontHaddock super.attoparsec-conduit; - base-noprelude = dontHaddock super.base-noprelude; - blaze-builder-conduit = dontHaddock super.blaze-builder-conduit; - BNFC-meta = dontHaddock super.BNFC-meta; bytestring-progress = dontHaddock super.bytestring-progress; - comonads-fd = dontHaddock super.comonads-fd; - comonad-transformers = dontHaddock super.comonad-transformers; deepseq-magic = dontHaddock super.deepseq-magic; - diagrams = dontHaddock super.diagrams; - either = dontHaddock super.either; feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 - gl = doJailbreak (dontHaddock super.gl); # jailbreak fixed in unreleased (2017-03-01) https://github.com/ekmett/gl/commit/885e08a96aa53d80c3b62e157b20d2f05e34f133 - groupoids = dontHaddock super.groupoids; - hamlet = dontHaddock super.hamlet; - HaXml = dontHaddock super.HaXml; hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; - http-client-conduit = dontHaddock super.http-client-conduit; - http-client-multipart = dontHaddock super.http-client-multipart; - markdown-unlit = dontHaddock super.markdown-unlit; - network-conduit = dontHaddock super.network-conduit; - shakespeare-js = dontHaddock super.shakespeare-js; - shakespeare-text = dontHaddock super.shakespeare-text; - swagger = dontHaddock super.swagger; # http://hydra.cryp.to/build/2035868/nixlog/1/raw - swagger2 = dontHaddock super.swagger2; - wai-test = dontHaddock super.wai-test; - zlib-conduit = dontHaddock super.zlib-conduit; - - # https://github.com/massysett/rainbox/issues/1 - rainbox = dontCheck super.rainbox; # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; @@ -222,9 +199,6 @@ self: super: { inline-java = addBuildDepend super.inline-java pkgs.jdk; - # tests don't compile for some odd reason - jwt = dontCheck super.jwt; - # https://github.com/mvoidex/hsdev/issues/11 hsdev = dontHaddock super.hsdev; @@ -269,8 +243,11 @@ self: super: { HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; - # https://github.com/NICTA/digit/issues/3 - digit = dontCheck super.digit; + # base bound + digit = doJailbreak super.digit; + + # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat + hnix = doJailbreak super.hnix; # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -332,6 +309,7 @@ self: super: { hashed-storage = dontCheck super.hashed-storage; hashring = dontCheck super.hashring; hath = dontCheck super.hath; + haxl = dontCheck super.haxl; # non-deterministic failure https://github.com/facebook/Haxl/issues/85 haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing hdbi-postgresql = dontCheck super.hdbi-postgresql; hedis = dontCheck super.hedis; @@ -401,12 +379,6 @@ self: super: { th-printf = dontCheck super.th-printf; thumbnail-plus = dontCheck super.thumbnail-plus; tickle = dontCheck super.tickle; - tldr = super.tldr.override { - # shell-conduit determines what commands are available at compile-time, so - # that tldr will not compile unless the shell-conduit it uses is compiled - # with git in its environment. - shell-conduit = addBuildTool self.shell-conduit pkgs.git; - }; tpdb = dontCheck super.tpdb; translatable-intset = dontCheck super.translatable-intset; ua-parser = dontCheck super.ua-parser; @@ -453,9 +425,6 @@ self: super: { # https://github.com/basvandijk/threads/issues/10 threads = dontCheck super.threads; - # https://github.com/purescript/purescript/pull/3041 - purescript = doJailbreak super.purescript; - # Missing module. rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 @@ -472,9 +441,8 @@ self: super: { # https://github.com/vincenthz/hs-asn1/issues/12 asn1-encoding = dontCheck super.asn1-encoding; - # Depends on QuickCheck 1.x. - HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; }; - test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; }; + # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x. + test-framework = dontCheck super.test-framework; # Depends on broken test-framework-quickcheck. apiary = dontCheck super.apiary; @@ -490,35 +458,26 @@ self: super: { apiary-session = dontCheck super.apiary-session; apiary-websockets = dontCheck super.apiary-websockets; - # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) - unlambda = dontHyperlinkSource super.unlambda; - # https://github.com/PaulJohnson/geodetics/issues/1 geodetics = dontCheck super.geodetics; - # https://github.com/AndrewRademacher/aeson-casing/issues/1 - aeson-casing = dontCheck super.aeson-casing; - # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; - # Relax overspecified constraints. Unfortunately, jailbreak won't work. - pandoc = overrideCabal super.pandoc (drv: { - preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal"; - }); - # https://github.com/tych0/xcffib/issues/37 xcffib = dontCheck super.xcffib; # https://github.com/afcowie/locators/issues/1 locators = dontCheck super.locators; - # https://github.com/anton-k/csound-expression-dynamic/issues/1 - csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; - # Test suite won't compile against tasty-hunit 0.9.x. zlib = dontCheck super.zlib; + # Test suite won't compile against tasty-hunit 0.10.x. + binary-parser = dontCheck super.binary-parser; + bytestring-strict-builder = dontCheck super.bytestring-strict-builder; + bytestring-tree-builder = dontCheck super.bytestring-tree-builder; + # https://github.com/ndmitchell/shake/issues/206 # https://github.com/ndmitchell/shake/issues/267 shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; }); @@ -530,8 +489,8 @@ self: super: { 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; + # generic-deriving bound is too tight + aeson = doJailbreak super.aeson; # Won't compile with recent versions of QuickCheck. inilist = dontCheck super.inilist; @@ -549,13 +508,16 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; + # https://github.com/haskell-hvr/lzma/pull/11 + lzma = appendPatch super.lzma ./patches/lzma-tests.patch; + # https://github.com/BNFC/bnfc/issues/140 BNFC = dontCheck super.BNFC; # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; - # https://github.com/jaspervdj/websockets/issues/104 + # QuickCheck version, also set in cabal2nix websockets = dontCheck super.websockets; # Avoid spurious test suite failures. @@ -584,8 +546,8 @@ self: super: { # https://github.com/kazu-yamamoto/logger/issues/42 logger = dontCheck super.logger; - # https://github.com/qnikst/imagemagick/issues/34 - imagemagick = dontCheck super.imagemagick; + # vector dependency < 0.12 + imagemagick = doJailbreak super.imagemagick; # https://github.com/liyang/thyme/issues/36 thyme = dontCheck super.thyme; @@ -608,8 +570,15 @@ self: super: { # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; - # https://github.com/lens/lens-aeson/issues/18 - lens-aeson = dontCheck super.lens-aeson; + # Install icons, metadata and cli program. + bustle = overrideCabal super.bustle (drv: { + buildDepends = [ pkgs.libpcap ]; + buildTools = with pkgs; [ gettext perl help2man intltool ]; + doCheck = false; # https://github.com/wjt/bustle/issues/6 + postInstall = '' + make install PREFIX=$out + ''; + }); # Byte-compile elisp code for Emacs. ghc-mod = overrideCabal super.ghc-mod (drv: { @@ -625,7 +594,8 @@ self: super: { ''; }); - # Fine-tune the build. + # Build the latest git version instead of the official release. This isn't + # ideal, but Chris doesn't seem to make official releases any more. structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: { src = pkgs.fetchFromGitHub { owner = "chrisdone"; @@ -660,9 +630,10 @@ self: super: { ln -s $lispdir $data/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 - })).override { - haskell-src-exts = self.haskell-src-exts_1_19_1; - }; + })); + + # Need newer versions of their dependencies than the ones we have in LTS-11.x. + cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; }); # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; @@ -676,36 +647,23 @@ self: super: { # https://github.com/pxqr/base32-bytestring/issues/4 base32-bytestring = dontCheck super.base32-bytestring; - # https://github.com/JohnLato/listlike/pull/6#issuecomment-137986095 - ListLike = dontCheck super.ListLike; - # https://github.com/goldfirere/singletons/issues/122 singletons = dontCheck super.singletons; - # https://github.com/guillaume-nargeot/hpc-coveralls/issues/52 - hpc-coveralls = disableSharedExecutables super.hpc-coveralls; - # https://github.com/fpco/stackage/issues/838 cryptonite = dontCheck super.cryptonite; # We cannot build this package w/o the C library from . phash = markBroken super.phash; - # https://github.com/sol/hpack/issues/53 - hpack = dontCheck super.hpack; - # https://github.com/deech/fltkhs/issues/16 - fltkhs = overrideCabal super.fltkhs (drv: { - broken = true; # linking fails because the build doesn't pull in the mesa libraries - }); + # linking fails because the build doesn't pull in the libGLU_combined libraries + fltkhs = markBroken super.fltkhs; fltkhs-fluid-examples = dontDistribute super.fltkhs-fluid-examples; # We get lots of strange compiler errors during the test suite run. jsaddle = dontCheck super.jsaddle; - # tinc is a new build driver a la Stack that's not yet available from Hackage. - 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; pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; @@ -714,9 +672,6 @@ self: super: { then appendConfigureFlag super.gtk "-fhave-quartz-gtk" else super.gtk; - # 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 {}; - # vaultenv is not available from Hackage. vaultenv = self.callPackage ../tools/haskell/vaultenv { }; @@ -728,14 +683,9 @@ self: super: { ''; }); - # test suite cannot find its own "idris" binary + # The standard libraries are compiled separately idris = doJailbreak (dontCheck super.idris); - idris_1_1_1 = overrideCabal (doJailbreak (dontCheck super.idris_1_1_1)) (drv: { - # The standard libraries are compiled separately - configureFlags = (drv.configureFlags or []) ++ [ "-fexeconly" ]; - }); - # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; @@ -779,6 +729,7 @@ self: super: { applicative-quoters = doJailbreak super.applicative-quoters; # https://github.com/roelvandijk/terminal-progress-bar/issues/13 + # Still needed because of HUnit < 1.6 terminal-progress-bar = doJailbreak super.terminal-progress-bar; # https://hydra.nixos.org/build/42769611/nixlog/1/raw @@ -804,6 +755,7 @@ self: super: { hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff; # https://github.com/basvandijk/lifted-base/issues/34 + # Still needed as HUnit < 1.5 lifted-base = doJailbreak super.lifted-base; # https://github.com/aslatter/parsec/issues/68 @@ -814,57 +766,23 @@ self: super: { system-filepath = dontCheck super.system-filepath; # https://github.com/basvandijk/case-insensitive/issues/24 + # Still needed as HUnit < 1.6 case-insensitive = doJailbreak super.case-insensitive; # https://github.com/hvr/uuid/issues/28 uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; - # https://github.com/hspec/hspec/issues/307 - hspec-contrib = dontCheck super.hspec-contrib; - # https://github.com/ekmett/lens/issues/713 lens = disableCabalFlag super.lens "test-doctests"; # https://github.com/haskell/fgl/issues/60 + # Needed for QuickCheck < 2.10 fgl = doJailbreak super.fgl; fgl-arbitrary = doJailbreak super.fgl-arbitrary; - # https://github.com/Gabriel439/Haskell-DirStream-Library/issues/8 - dirstream = doJailbreak super.dirstream; - - # https://github.com/xmonad/xmonad-extras/issues/3 - xmonad-extras = doJailbreak super.xmonad-extras; - - # https://github.com/int-e/QuickCheck-safe/issues/2 - QuickCheck-safe = doJailbreak super.QuickCheck-safe; - - # https://github.com/mokus0/dependent-sum-template/issues/7 - dependent-sum-template = doJailbreak super.dependent-sum-template; - - # https://github.com/jcristovao/newtype-generics/issues/13 - newtype-generics = doJailbreak super.newtype-generics; - - # https://github.com/lambdabot/lambdabot/issues/158 - lambdabot-core = doJailbreak super.lambdabot-core; - - # https://github.com/lambdabot/lambdabot/issues/159 - lambdabot = doJailbreak super.lambdabot; - - # https://github.com/jswebtools/language-ecmascript/pull/81 - language-ecmascript = doJailbreak super.language-ecmascript; - - # https://github.com/choener/DPutils/pull/1 - DPutils = doJailbreak super.DPutils; - - # fixed in unreleased (2017-03-01) https://github.com/ekmett/machines/commit/5463cf5a69194faaec2345dff36469b4b7a8aef0 - machines = doJailbreak super.machines; - - # fixed in unreleased (2017-03-01) https://github.com/choener/OrderedBits/commit/7b9c6c6c61d9acd0be8b38939915d287df3c53ab - OrderedBits = doJailbreak super.OrderedBits; - - # https://github.com/haskell-distributed/rank1dynamic/issues/17 - rank1dynamic = doJailbreak super.rank1dynamic; + # The tests spuriously fail + libmpd = dontCheck super.libmpd; # https://github.com/dan-t/cabal-lenses/issues/6 cabal-lenses = doJailbreak super.cabal-lenses; @@ -881,16 +799,9 @@ self: super: { # 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 (new) aeson version - liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_3_0; }; - # Test suite fails: https://github.com/lymar/hastache/issues/46. # Don't install internal mkReadme tool. hastache = overrideCabal super.hastache (drv: { @@ -904,75 +815,33 @@ self: super: { # https://github.com/diagrams/diagrams-solve/issues/4 diagrams-solve = dontCheck super.diagrams-solve; - # version 1.3.1.2 does not compile: syb >=0.1.0.2 && <0.7 - ChasingBottoms = doJailbreak super.ChasingBottoms; - # test suite does not compile with recent versions of QuickCheck integer-logarithms = dontCheck (super.integer-logarithms); - # https://github.com/vincenthz/hs-tls/issues/247 - tls = dontCheck super.tls; - # missing dependencies: blaze-html >=0.5 && <0.9, blaze-markup >=0.5 && <0.8 digestive-functors-blaze = doJailbreak super.digestive-functors-blaze; + digestive-functors = doJailbreak super.digestive-functors; # missing dependencies: doctest ==0.12.* html-entities = doJailbreak super.html-entities; - # Needs a version that's newer than what we have in lts-9. - sbv = super.sbv.override { doctest = self.doctest_0_13_0; }; - # https://github.com/takano-akio/filelock/issues/5 filelock = dontCheck super.filelock; - # https://github.com/alpmestan/taggy/issues/{19,20} - taggy = appendPatch super.taggy (pkgs.fetchpatch { - name = "blaze-markup.patch"; - url = "https://github.com/alpmestan/taggy/commit/5456c2fa4d377f7802ec5df3d5f50c4ccab2e8ed.patch"; - sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7"; - }); - # cryptol-2.5.0 doesn't want happy 1.19.6+. cryptol = super.cryptol.override { happy = self.happy_1_19_5; }; - # https://github.com/jtdaugherty/text-zipper/issues/11 - text-zipper = dontCheck super.text-zipper; - - # https://github.com/graknlabs/grakn-haskell/pull/1 + # Tests try to invoke external process and process == 1.4 grakn = dontCheck (doJailbreak super.grakn); - # cryptonite == 0.24.x, protolude == 0.2.x - wai-secure-cookies = super.wai-secure-cookies.override { - cryptonite = super.cryptonite_0_24; - protolude = super.protolude_0_2; - }; - # test suite requires git and does a bunch of git operations - restless-git = dontCheck super.restless-git; - - # This tool needs the latest hackage-db version. Using the latest version of - # optparse-applicative allows us to generate completions for fish and zsh. - cabal2nix = super.cabal2nix.overrideScope (self: super: { - hackage-db = self.hackage-db_2_0; - optparse-applicative = self.optparse-applicative_0_14_0_0; - }); - - # Break "hpack >=0.17.0 && <0.19". - stack = doJailbreak super.stack; - - # https://github.com/mgajda/json-autotype/issues/15 - json-autotype = doJailbreak super.json-autotype; + # doJailbreak because of hardcoded time, seems to be fixed upstream + restless-git = dontCheck (doJailbreak super.restless-git); # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; fluid-idl-scotty = markBroken super.fluid-idl-scotty; - # depends on amqp >= 0.17 - amqp-utils = super.amqp-utils.override { amqp = dontCheck super.amqp_0_18_1; }; - - # Build with gi overloading feature disabled. - ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; }); - # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 stack2nix = doJailbreak super.stack2nix; @@ -986,6 +855,199 @@ self: super: { rev = "8b79823c32e234c161baec67fdf7907952ca62b8"; sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz"; }; - }).override { language-c = self.language-c_0_7_0; }; + }); + + # Needs pginit to function and pgrep to verify. + tmp-postgres = overrideCabal super.tmp-postgres (drv: { + libraryToolDepends = drv.libraryToolDepends or [] ++ [pkgs.postgresql]; + testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; + }); + + # https://github.com/fpco/stackage/issues/3126 + stack = doJailbreak super.stack; + + # https://github.com/snoyberg/monad-logger/issues/1 + monad-logger = self.monad-logger_0_3_28_5; + + # These packages depend on each other, forming an infinite loop. + scalendar = markBroken (super.scalendar.override { SCalendar = null; }); + SCalendar = markBroken (super.SCalendar.override { scalendar = null; }); + + # Needs QuickCheck <2.10, which we don't have. + edit-distance = doJailbreak super.edit-distance; + blaze-markup = doJailbreak super.blaze-markup; + blaze-html = doJailbreak super.blaze-html; + attoparsec = dontCheck super.attoparsec; # 1 out of 67 tests fails + int-cast = doJailbreak super.int-cast; + nix-derivation = doJailbreak super.nix-derivation; + graphviz = doJailbreak super.graphviz; + + # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 + pointfree = doJailbreak super.pointfree; + + # Needs tasty-quickcheck ==0.8.*, which we don't have. + cryptohash-sha256 = doJailbreak super.cryptohash-sha256; + cryptohash-sha1 = doJailbreak super.cryptohash-sha1; + cryptohash-md5 = doJailbreak super.cryptohash-md5; + text-short = doJailbreak super.text-short; + gitHUD = dontCheck super.gitHUD; + + # https://github.com/aisamanra/config-ini/issues/12 + config-ini = dontCheck super.config-ini; + + # doctest >=0.9 && <0.12 + genvalidity-property = doJailbreak super.genvalidity-property; + path = dontCheck super.path; + + # Test suite fails due to trying to create directories + path-io = dontCheck super.path-io; + + # Duplicate instance with smallcheck. + store = dontCheck super.store; + + # With ghc-8.2.x haddock would time out for unknown reason + # See https://github.com/haskell/haddock/issues/679 + language-puppet = dontHaddock super.language-puppet; + + # Missing FlexibleContexts in testsuite + # https://github.com/EduardSergeev/monad-memo/pull/4 + monad-memo = + let patch = pkgs.fetchpatch + { url = https://github.com/EduardSergeev/monad-memo/pull/4.patch; + sha256 = "14mf9940arilg6v54w9bc4z567rfbmm7gknsklv965fr7jpinxxj"; + }; + in appendPatch super.monad-memo patch; + + # https://github.com/alphaHeavy/protobuf/issues/34 + protobuf = dontCheck super.protobuf; + + # https://github.com/bos/text-icu/issues/32 + text-icu = dontCheck super.text-icu; + + # https://github.com/haskell/cabal/issues/4969 + haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4; + haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; }; + + # Jailbreak "unix-compat >=0.1.2 && <0.5". + darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' darcs.cabal"; }); + + # https://github.com/Twinside/Juicy.Pixels/issues/149 + JuicyPixels = dontHaddock super.JuicyPixels; + + # aarch64 and armv7l fixes. + happy = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + hashable = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 + servant-docs = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs; + servant-swagger = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger; + swagger2 = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; + + # Tries to read a file it is not allowed to in the test suite + load-env = dontCheck super.load-env; + + # Add support for https://github.com/haskell-hvr/multi-ghc-travis. + multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {}; + + # https://github.com/yesodweb/Shelly.hs/issues/162 + shelly = dontCheck super.shelly; + + # Support ansi-terminal 0.7.x. + cabal-plan = appendPatch super.cabal-plan (pkgs.fetchpatch { + url = "https://github.com/haskell-hvr/cabal-plan/pull/16.patch"; + sha256 = "0i889zs46wn09d7iqdy99201zaqxb175cfs8jz2zi3mv4ywx3a0l"; + }); + # Copy hledger man pages from data directory into the proper place. This code + # should be moved into the cabal2nix generator. + hledger = overrideCabal super.hledger (drv: { + postInstall = '' + for i in $(seq 1 9); do + for j in embeddedfiles/*.$i; do + mkdir -p $out/share/man/man$i + cp -v $j $out/share/man/man$i/ + done + done + mkdir -p $out/share/info + cp -v embeddedfiles/*.info* $out/share/info/ + ''; + }); + hledger-ui = overrideCabal super.hledger-ui (drv: { + postInstall = '' + for i in $(seq 1 9); do + for j in *.$i; do + mkdir -p $out/share/man/man$i + cp -v $j $out/share/man/man$i/ + done + done + mkdir -p $out/share/info + cp -v *.info* $out/share/info/ + ''; + }); + hledger-web = overrideCabal super.hledger-web (drv: { + postInstall = '' + for i in $(seq 1 9); do + for j in *.$i; do + mkdir -p $out/share/man/man$i + cp -v $j $out/share/man/man$i/ + done + done + mkdir -p $out/share/info + cp -v *.info* $out/share/info/ + ''; + }); + + # https://github.com/nick8325/twee/pull/1 + twee-lib = dontHaddock super.twee-lib; + + # Needs older hlint + hpio = dontCheck super.hpio; + + # https://github.com/fpco/inline-c/issues/72 + inline-c = dontCheck super.inline-c; + + # https://github.com/GaloisInc/pure-zlib/issues/6 + pure-zlib = doJailbreak super.pure-zlib; + + # https://github.com/strake/lenz-template.hs/issues/1 + lenz-template = doJailbreak super.lenz-template; + + # https://github.com/haskell-hvr/resolv/issues/1 + resolv = dontCheck super.resolv; + + # spdx 0.2.2.0 needs older tasty + # was fixed in spdx master (4288df6e4b7840eb94d825dcd446b42fef25ef56) + spdx = dontCheck super.spdx; + + # The test suite does not know how to find the 'alex' binary. + alex = overrideCabal super.alex (drv: { + testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which]; + preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; + }); + + # This package refers to the wrong library (itself in fact!) + vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; + + vector-sized_1_0_0_0 = super.vector-sized_1_0_0_0.override { + indexed-list-literals = self.indexed-list-literals_0_2_0_0; + }; + + # Both need a more up-to-date version + hlint = super.hlint.override { extra = self.extra_1_6_6; }; + hoogle = super.hoogle.override { extra = self.extra_1_6_6; }; } + +// + +(let + amazonkaOverrides = self: super: { + conduit = self.conduit_1_2_13_1; + conduit-extra = self.conduit-extra_1_2_3_2; + resourcet = self.resourcet_1_1_11; + xml-conduit = self.xml-conduit_1_7_1_2; + http-conduit = self.http-conduit_2_2_4; + }; + amazonka-core = super.amazonka-core.overrideScope amazonkaOverrides; + amazonka = super.amazonka.overrideScope amazonkaOverrides; + amazonka-test = super.amazonka-test.overrideScope amazonkaOverrides; +in { + inherit amazonka amazonka-core amazonka-test; +}) diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix deleted file mode 100644 index 47c8e7fa69ec6a0363a946f547c3aacf3d803ae6..0000000000000000000000000000000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # LLVM is not supported on this GHC; use the latest one. - inherit (pkgs) llvmPackages; - - # Disable GHC 6.12.x core libraries. - array = null; - base = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - directory = null; - dph-base = null; - dph-par = null; - dph-prim-interface = null; - dph-prim-par = null; - dph-prim-seq = null; - dph-seq = null; - extensible-exceptions = null; - ffi = null; - filepath = null; - ghc-binary = null; - ghc-prim = null; - haskell98 = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - random = null; - rts = null; - syb = null; - template-haskell = null; - time = null; - unix = null; - - # These packages are core libraries in GHC 7.10.x, but not here. - 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; - terminfo = self.terminfo_0_4_0_2; - transformers = self.transformers_0_4_3_0; - xhtml = self.xhtml_3000_2_1; - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # We have no working cabal-install at the moment. - cabal-install = markBroken super.cabal-install; - - # https://github.com/tibbe/hashable/issues/85 - hashable = dontCheck super.hashable; - - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_7; }; - - # Haddock chokes on the prologue from the cabal file. - ChasingBottoms = dontHaddock super.ChasingBottoms; - - # https://github.com/glguy/utf8-string/issues/9 - utf8-string = overrideCabal super.utf8-string (drv: { - configureFlags = drv.configureFlags or [] ++ ["-f-bytestring-in-base" "--ghc-option=-XUndecidableInstances"]; - preConfigure = "sed -i -e 's|base >= .* < .*,|base,|' utf8-string.cabal"; - }); - - # https://github.com/haskell/HTTP/issues/80 - HTTP = doJailbreak super.HTTP; - - # 6.12.3 doesn't support the latest version. - primitive = self.primitive_0_5_1_0; - parallel = self.parallel_3_2_0_3; - vector = self.vector_0_10_9_3; - - # These packages need more recent versions of core libraries to compile. - happy = addBuildTools super.happy [self.Cabal_1_18_1_7 self.containers_0_4_2_1]; - network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_7; - stm = addBuildTool super.stm self.Cabal_1_18_1_7; - split = super.split_0_1_4_3; - - # Needs hashable on pre 7.10.x compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - - # Needs void on pre 7.10.x compilers. - conduit = addBuildDepend super.conduit self.void; - -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix deleted file mode 100644 index 6bb96704cc2086f57fff1ed9c50bb4322dbd724d..0000000000000000000000000000000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_34; - - # Disable GHC 7.0.x core libraries. - array = null; - base = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - directory = null; - extensible-exceptions = null; - ffi = null; - filepath = null; - ghc-binary = null; - ghc-prim = null; - haskell2010 = null; - haskell98 = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - random = null; - rts = null; - template-haskell = null; - time = null; - unix = null; - - # These packages are core libraries in GHC 7.10.x, but not here. - binary = self.binary_0_7_6_1; - deepseq = self.deepseq_1_3_0_1; - haskeline = self.haskeline_0_7_3_1; - hoopl = self.hoopl_3_10_2_0; - terminfo = self.terminfo_0_4_0_2; - transformers = self.transformers_0_4_3_0; - xhtml = self.xhtml_3000_2_1; - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/tibbe/hashable/issues/85 - hashable = dontCheck super.hashable; - - # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { - Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; }; - }; - - # Haddock chokes on the prologue from the cabal file. - ChasingBottoms = dontHaddock super.ChasingBottoms; - - # https://github.com/haskell/containers/issues/134 - containers_0_4_2_1 = doJailbreak super.containers_0_4_2_1; - - # These packages need more recent versions of core libraries to compile. - happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1]; - - # Setup: Can't find transitive deps for haddock - doctest = dontHaddock super.doctest; - hsdns = dontHaddock super.hsdns; - - # Newer versions require bytestring >=0.10. - tar = super.tar_0_4_1_0; - - # These builds need additional dependencies on old compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - conduit = addBuildDepend super.conduit self.void; - reflection = addBuildDepend super.reflection self.tagged; - semigroups = addBuildDepend super.semigroups self.nats; - text = addBuildDepend super.text self.bytestring-builder; - - # 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 1a9158fa66513febf213313fb5d1278ca680192d..15220c24b4f2978e4f3fccf1559a017605f719cc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -41,7 +41,8 @@ self: super: { gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_2_0; }; - megaparsec = addBuildDepend super.megaparsec self.fail; + # https://github.com/mrkkrp/megaparsec/issues/282 + megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail; Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; @@ -161,8 +162,7 @@ self: super: { vty-ui = enableCabalFlag super.vty-ui "no-tests"; # https://github.com/fpco/stackage/issues/1112 - vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) - [ self.mtl self.mwc-random ]; + vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) [ self.mtl self.mwc-random ]; # vector with ghc < 8.0 needs semigroups vector = addBuildDepend super.vector self.semigroups; @@ -173,39 +173,61 @@ self: super: { # https://github.com/thoughtpolice/hs-ed25519/issues/13 ed25519 = dontCheck super.ed25519; - # https://github.com/well-typed/hackage-security/issues/157 - # https://github.com/well-typed/hackage-security/issues/158 - hackage-security = dontHaddock (dontCheck super.hackage-security); - # Breaks a dependency cycle between QuickCheck and semigroups hashable = dontCheck super.hashable; unordered-containers = dontCheck super.unordered-containers; # GHC versions prior to 8.x require additional build inputs. - dependent-map = addBuildDepend super.dependent-map self.semigroups; - distributive = addBuildDepend (dontCheck super.distributive) self.semigroups; - mono-traversable = addBuildDepend super.mono-traversable self.semigroups; - attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); - Glob = addBuildDepends super.Glob (with self; [semigroups]); aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; + ansi-wl-pprint = addBuildDepend super.ansi-wl-pprint self.semigroups; + attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); bytes = addBuildDepend super.bytes self.doctest; case-insensitive = addBuildDepend super.case-insensitive self.semigroups; + cmdargs = addBuildDepend super.cmdargs self.semigroups; + contravariant = addBuildDepend super.contravariant self.semigroups; + dependent-map = addBuildDepend super.dependent-map self.semigroups; + distributive = addBuildDepend (dontCheck super.distributive) self.semigroups; + Glob = addBuildDepends super.Glob (with self; [semigroups]); hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; }); hslogger = addBuildDepend super.hslogger self.HUnit; intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); lens = addBuildDepend super.lens self.generic-deriving; - optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; + mono-traversable = addBuildDepend super.mono-traversable self.semigroups; + natural-transformation = addBuildDepend super.natural-transformation self.semigroups; + optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail]; + parsec = addBuildDepends super.parsec [self.fail self.semigroups]; + parser-combinators = addBuildDepend super.parser-combinators self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; + reflection = addBuildDepend super.reflection self.semigroups; semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]); + tar = addBuildDepend super.tar self.semigroups; texmath = addBuildDepend super.texmath self.network-uri; yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); - natural-transformation = addBuildDepend super.natural-transformation self.semigroups; - # cereal must have `fail` in pre-ghc-8.0.x versions - # also tests require bytestring>=0.10.8.1 + + # cereal must have `fail` in pre-ghc-8.0.x versions and tests require + # bytestring>=0.10.8.1. cereal = dontCheck (addBuildDepend super.cereal self.fail); # The test suite requires Cabal 1.24.x or later to compile. comonad = dontCheck super.comonad; semigroupoids = dontCheck super.semigroupoids; + # Newer versions require base >=4.9 && <5. + colour = self.colour_2_3_3; + + # https://github.com/atzedijkstra/chr/issues/1 + chr-pretty = doJailbreak super.chr-pretty; + chr-parse = doJailbreak super.chr-parse; + + # The autogenerated Nix expressions don't take into + # account `if impl(ghc >= x.y)`, which is a common method to depend + # on `semigroups` or `fail` when building with GHC < 8.0. + system-filepath = addBuildDepend super.system-filepath self.semigroups; + haskell-src-exts = addBuildDepend super.haskell-src-exts self.semigroups; + free = addBuildDepend super.free self.fail; + + # Newer versions don't build without base-4.9 + resourcet = self.resourcet_1_1_11; + conduit = self.conduit_1_2_13_1; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix deleted file mode 100644 index de47086409beb26eb9af4fb871e1b9238be77a47..0000000000000000000000000000000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_34; - - # Disable GHC 7.2.x core libraries. - array = null; - base = null; - binary = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - directory = null; - extensible-exceptions = null; - ffi = null; - filepath = null; - ghc-prim = null; - haskell2010 = null; - haskell98 = null; - hoopl = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - time = null; - unix = null; - - # These packages are core libraries in GHC 7.10.x, but not here. - deepseq = self.deepseq_1_3_0_1; - haskeline = self.haskeline_0_7_3_1; - terminfo = self.terminfo_0_4_0_2; - 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 = self.binary_0_8_5_1; process = self.process_1_2_3_0; }; - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/tibbe/hashable/issues/85 - hashable = dontCheck super.hashable; - - # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { - Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; }; - }; - - # Haddock chokes on the prologue from the cabal file. - ChasingBottoms = dontHaddock super.ChasingBottoms; - - # The old containers version won't compile against newer versions of deepseq. - containers_0_4_2_1 = super.containers_0_4_2_1.override { deepseq = self.deepseq_1_3_0_1; }; - - # These packages need more recent versions of core libraries to compile. - happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1]; - - # 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; - nats = addBuildDepend super.nats self.hashable; - - # Newer versions require bytestring >=0.10. - tar = super.tar_0_4_1_0; - - # These builds need additional dependencies on old compilers. - conduit = addBuildDepend super.conduit self.void; - reflection = addBuildDepend super.reflection self.tagged; - semigroups = addBuildDepend super.semigroups self.nats; - optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; - text = addBuildDepend super.text self.bytestring-builder; - - # 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 deleted file mode 100644 index 4b6baed49737ecd68592d17026de99a9362b8ca5..0000000000000000000000000000000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_34; - - # Disable GHC 7.4.x core libraries. - array = null; - base = null; - binary = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - extensible-exceptions = null; - filepath = null; - ghc-prim = null; - haskell2010 = null; - haskell98 = null; - hoopl = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - time = null; - unix = null; - - # These packages are core libraries in GHC 7.10.x, but not here. - haskeline = self.haskeline_0_7_3_1; - terminfo = self.terminfo_0_4_0_2; - 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_5_1; }; - - # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/tibbe/hashable/issues/85 - hashable = dontCheck super.hashable; - - # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; }; - - # Haddock chokes on the prologue from the cabal file. - ChasingBottoms = dontHaddock super.ChasingBottoms; - - # https://github.com/haskell/primitive/issues/16 - primitive = dontCheck super.primitive; - - # https://github.com/tibbe/unordered-containers/issues/96 - unordered-containers = dontCheck super.unordered-containers; - - # The test suite depends on time >=1.4.0.2. - cookie = dontCheck super.cookie ; - - # Work around bytestring >=0.10.2.0 requirement. - streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder; - - # Choose appropriate flags for our version of 'bytestring'. - bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder"; - - # Newer versions require a more recent compiler. - control-monad-free = super.control-monad-free_0_5_3; - - # Needs hashable on pre 7.10.x compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - - # 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; - - # Newer versions require bytestring >=0.10. - tar = super.tar_0_4_1_0; - - # Needs void on pre 7.10.x compilers. - conduit = addBuildDepend super.conduit self.void; - - # Needs tagged on pre 7.6.x compilers. - reflection = addBuildDepend super.reflection self.tagged; - - # 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; - text = addBuildDepend super.text self.bytestring-builder; - vector = addBuildDepend super.vector 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 deleted file mode 100644 index 43a1b1b70bd1c334744b40aa25f7a0a6b5c03989..0000000000000000000000000000000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_34; - - # Disable GHC 7.6.x core libraries. - array = null; - base = null; - binary = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-prim = null; - haskell2010 = null; - haskell98 = null; - hoopl = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - time = null; - unix = null; - - # These packages are core libraries in GHC 7.10.x, but not here. - haskeline = self.haskeline_0_7_3_1; - terminfo = self.terminfo_0_4_0_2; - transformers = self.transformers_0_4_3_0; - xhtml = self.xhtml_3000_2_1; - - # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/tibbe/hashable/issues/85 - hashable = dontCheck super.hashable; - - # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; }; - - # Haddock chokes on the prologue from the cabal file. - ChasingBottoms = dontHaddock super.ChasingBottoms; - - # Later versions require a newer version of bytestring than we have. - aeson = self.aeson_0_7_0_6; - - # The test suite depends on time >=1.4.0.2. - cookie = dontCheck super.cookie; - - # Work around bytestring >=0.10.2.0 requirement. - streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder; - - # Choose appropriate flags for our version of 'bytestring'. - bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder"; - - # Tagged is not part of base in this environment. - contravariant = addBuildDepend super.contravariant self.tagged; - reflection = dontHaddock (addBuildDepend super.reflection self.tagged); - - # The compat library is empty in the presence of mtl 2.2.x. - mtl-compat = dontHaddock super.mtl-compat; - - # Newer versions require a more recent compiler. - control-monad-free = super.control-monad-free_0_5_3; - - # Needs hashable on pre 7.10.x compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - - # https://github.com/magthe/sandi/issues/7 - sandi = overrideCabal super.sandi (drv: { - postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; - }); - - # These packages require additional build inputs on older compilers. - blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder; - text = addBuildDepend super.text self.bytestring-builder; - - # available convertible package won't build with the available - # bytestring and ghc-mod won't build without convertible - convertible = markBroken super.convertible; - ghc-mod = markBroken super.ghc-mod; - - # Needs void on pre 7.10.x compilers. - conduit = addBuildDepend super.conduit self.void; - - # 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 (dontCheck 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; - vector = addBuildDepend super.vector 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; - - # Breaks a dependency cycle between QuickCheck and semigroups - unordered-containers = dontCheck super.unordered-containers; - - # The test suite requires Cabal 1.24.x or later to compile. - comonad = dontCheck super.comonad; - semigroupoids = dontCheck super.semigroupoids; - -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix deleted file mode 100644 index 372155a8791c358782f4f760129a89bd7430aed1..0000000000000000000000000000000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ /dev/null @@ -1,171 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_34; - - # Disable GHC 7.8.x core libraries. - array = null; - base = null; - binary = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-prim = null; - haskeline = null; - haskell2010 = null; - haskell98 = null; - hoopl = null; - hpc = null; - integer-gmp = null; - old-locale = null; - old-time = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - terminfo = null; - time = null; - transformers = null; - unix = null; - xhtml = null; - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; }; - - # mtl 2.2.x needs the latest transformers. - mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; }; - - # Configure mtl 2.1.x. - mtl = self.mtl_2_1_3_1; - transformers-compat = addBuildDepend (enableCabalFlag super.transformers-compat "three") self.mtl; - mtl-compat = addBuildDepend (enableCabalFlag super.mtl-compat "two-point-one") self.transformers-compat; - - # haddock-api 2.16 requires ghc>=7.10 - haddock-api = super.haddock-api_2_15_0_2; - - # This is part of bytestring in our compiler. - bytestring-builder = dontHaddock super.bytestring-builder; - - # Won't compile against mtl 2.1.x. - imports = super.imports.override { mtl = self.mtl_2_2_1; }; - - # Newer versions require mtl 2.2.x. - mtl-prelude = self.mtl-prelude_1_0_3; - - # purescript requires mtl 2.2.x. - purescript = overrideCabal (super.purescript.overrideScope (self: super: { - mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); - mtl = super.mtl_2_2_1; - transformers = super.transformers_0_4_3_0; - haskeline = self.haskeline_0_7_3_1; - transformers-compat = disableCabalFlag super.transformers-compat "three"; - })) (drv: {}); - - # The test suite pulls in mtl 2.2.x - command-qq = dontCheck super.command-qq; - - # Doesn't support GHC < 7.10.x. - bound-gen = dontDistribute super.bound-gen; - ghc-exactprint = dontDistribute super.ghc-exactprint; - ghc-typelits-natnormalise = dontDistribute super.ghc-typelits-natnormalise; - - # Needs directory >= 1.2.2.0. - idris = markBroken super.idris; - - # Newer versions require transformers 0.4.x. - seqid = super.seqid_0_1_0; - seqid-streams = super.seqid-streams_0_1_0; - - # These packages need mtl 2.2.x directly or indirectly via dependencies. - amazonka = markBroken super.amazonka; - apiary-purescript = markBroken super.apiary-purescript; - clac = dontDistribute super.clac; - highlighter2 = markBroken super.highlighter2; - hypher = markBroken super.hypher; - miniforth = markBroken super.miniforth; - xhb-atom-cache = markBroken super.xhb-atom-cache; - xhb-ewmh = markBroken super.xhb-ewmh; - yesod-purescript = markBroken super.yesod-purescript; - yet-another-logger = markBroken super.yet-another-logger; - - # https://github.com/frosch03/arrowVHDL/issues/2 - ArrowVHDL = markBroken super.ArrowVHDL; - - # https://ghc.haskell.org/trac/ghc/ticket/9625 - wai-middleware-preprocessor = dontCheck super.wai-middleware-preprocessor; - incremental-computing = dontCheck super.incremental-computing; - - # Newer versions require base > 4.7 - gloss = super.gloss_1_9_2_1; - - # Workaround for a workaround, see comment for "ghcjs" flag. - jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs"; - in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 - self.webkitgtk3-javascriptcore ]; - - # Needs hashable on pre 7.10.x compilers. - nats_1 = addBuildDepend super.nats_1 self.hashable; - nats = addBuildDepend super.nats self.hashable; - - # needs mtl-compat to build with mtl 2.1.x - cgi = addBuildDepend super.cgi self.mtl-compat; - - # https://github.com/magthe/sandi/issues/7 - sandi = overrideCabal super.sandi (drv: { - postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; - }); - - # Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable. - ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; }; - - # The network library is required in configurations that don't have network-uri. - hxt = addBuildDepend super.hxt self.network; - hxt_9_3_1_7 = addBuildDepend super.hxt_9_3_1_7 self.network; - hxt_9_3_1_10 = addBuildDepend super.hxt_9_3_1_10 self.network; - hxt_9_3_1_12 = addBuildDepend super.hxt_9_3_1_12 self.network; - xss-sanitize = addBuildDepend super.xss-sanitize self.network; - xss-sanitize_0_3_5_4 = addBuildDepend super.xss-sanitize_0_3_5_4 self.network; - xss-sanitize_0_3_5_5 = addBuildDepend super.xss-sanitize_0_3_5_5 self.network; - - # Needs void on pre 7.10.x compilers. - conduit = addBuildDepend super.conduit self.void; - conduit_1_2_5 = addBuildDepend super.conduit_1_2_5 self.void; - - # 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 (dontCheck super.semigroups) (with self; [nats tagged unordered-containers]); - lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); - distributive = addBuildDepend (dontCheck 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; - vector = addBuildDepend super.vector 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; - - # The test suite requires Cabal 1.24.x or later to compile. - comonad = dontCheck super.comonad; - semigroupoids = dontCheck super.semigroupoids; - - # https://github.com/simonmar/happy/issues/103 - happy = super.happy.override { mtl = self.mtl_2_2_1; }; - -} 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 1dee726dcf36d9687d990afe413f0afa5238fbd2..7924a39fa96d3be4691817e0bb56abd869f2b52d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_35; + llvmPackages = pkgs.llvmPackages_37; # Disable GHC 8.0.x core libraries. array = null; @@ -35,9 +35,6 @@ self: super: { unix = null; xhtml = 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"; @@ -60,6 +57,24 @@ self: super: { apply-refact = super.apply-refact_0_3_0_1; # This builds needs the latest Cabal version. - cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; }); + + # Add appropriate Cabal library to build this code. + stack = addSetupDepend super.stack self.Cabal_2_0_1_1; + + # inline-c > 0.5.6.0 requires template-haskell >= 2.12 + inline-c = super.inline-c_0_5_6_1; + inline-c-cpp = super.inline-c-cpp_0_1_0_0; + + # test dep hedgehog pulls in concurrent-output, which does not build + # due to processing version mismatch + either = dontCheck super.either; + + # test dep tasty has a version mismatch + indents = dontCheck super.indents; + # Newer versions require GHC 8.2. + haddock-library = self.haddock-library_1_4_3; + haddock-api = self.haddock-api_2_17_4; + haddock = self.haddock_2_17_5; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index c44edf6b02a36d6ca3293e07109483169b6b4a45..b6fdb75e5506f0ddfe84882028520bbd98aa22ca 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -41,9 +41,6 @@ self: super: { prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal"; }); - # 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.haskell.packages.ghc802.jailbreak-cabal; @@ -56,26 +53,44 @@ 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; - # Work around overly restrictive constraints on the version of 'base'. - ChasingBottoms = doJailbreak super.ChasingBottoms; - hashable = doJailbreak super.hashable; - protolude = doJailbreak super.protolude; - quickcheck-instances = doJailbreak super.quickcheck-instances; - - # https://github.com/aristidb/aws/issues/238 - aws = doJailbreak super.aws; - - # LTS-9 versions do not compile. - path = dontCheck super.path; - path-io = super.path-io_1_3_3; - trifecta = super.trifecta_1_7_1_1; - aeson-compat = dontCheck super.aeson-compat_0_3_7_1; # test suite needs QuickCheck 2.10.* - binary-orphans = dontCheck super.binary-orphans_0_1_8_0; # test suite needs QuickCheck 2.10.* + # Upstream failed to distribute the testsuite for 8.2 + # https://github.com/alanz/ghc-exactprint/pull/60 + ghc-exactprint = dontCheck super.ghc-exactprint; + + # Reduction stack overflow; size = 38 + # https://github.com/jystic/hadoop-tools/issues/31 + hadoop-rpc = + let patch = pkgs.fetchpatch + { url = https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch; + sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp"; + stripLen = 1; + }; + in appendPatch super.hadoop-rpc patch; + + # Custom Setup.hs breaks with Cabal 2 + # https://github.com/NICTA/coordinate/pull/4 + coordinate = + let patch = pkgs.fetchpatch + { url = https://github.com/NICTA/coordinate/pull/4.patch; + sha256 = "06sfxk5cyd8nqgjyb95jkihxxk8m6dw9m3mlv94sm2qwylj86gqy"; + }; + in appendPatch super.coordinate patch; + + # https://github.com/purescript/purescript/issues/3189 + purescript = doJailbreak (super.purescript); + + # These packages need Cabal 2.2.x, which is not the default. + distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: { + Cabal = self.Cabal_2_2_0_1; + haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); + })); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..43c869feff12d56610c126ee6257d7c616ebb35c --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -0,0 +1,608 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: { + + # Use the latest LLVM. + inherit (pkgs) llvmPackages; + + # Disable GHC 8.4.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; + hpc = null; + integer-gmp = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + stm = null; + template-haskell = null; + terminfo = null; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + + ## Shadowed: + + ## Needs bump to a versioned attribute + ## • No instance for (GHC.Base.Semigroup BV) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid BV’ + bv = super.bv_0_5; + + ## Needs bump to a versioned attribute + ## Issue: https://github.com/sol/doctest/issues/189 + doctest = overrideCabal super.doctest_0_15_0 (drv: { + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## + ## Setup: Encountered missing dependencies: + ## QuickCheck >=2.11.3 + doCheck = false; + }); + + ## Needs bump to a versioned attribute + ## Setup: Encountered missing dependencies: + ## Cabal <2.2 + ## Older versions don't compile. + hackage-db = super.hackage-db_2_0_1; + + ## Needs bump to a versioned attribute + haddock-library = overrideCabal super.haddock-library_1_5_0_1 (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## Older versions don't compile + ## + ## Setup: Encountered missing dependencies: + ## QuickCheck ==2.11.* + doCheck = false; + ## Running Haddock on library for haddock-library-1.5.0.1.. + ## Setup: internal error when calculating transitive package dependencies. + ## Debug info: [] + doHaddock = false; + }); + + ## Needs bump to a versioned attribute + hspec = overrideCabal super.hspec_2_5_0 (drv: { + ## Setup: Encountered missing dependencies: + ## hspec-core ==2.4.4, hspec-discover ==2.4.4 + ## + ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: + ## while evaluating the attribute ‘buildInputs’ of the derivation ‘stringbuilder-0.5.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: + ## infinite recursion encountered, at undefined position + ## test suite causes an infinite loop + doCheck = false; + }); + + ## Needs bump to a versioned attribute + hspec-core = overrideCabal super.hspec-core_2_5_0 (drv: { + ## • No instance for (Semigroup Summary) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Summary’ + ## + ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-core-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: + ## while evaluating the attribute ‘buildInputs’ of the derivation ‘silently-1.2.5’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: + ## while evaluating the attribute ‘buildInputs’ of the derivation ‘temporary-1.2.1.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: + ## while evaluating the attribute ‘buildInputs’ of the derivation ‘base-compat-0.9.3’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: + ## while evaluating the attribute ‘propagatedBuildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: + ## infinite recursion encountered, at undefined position + doCheck = false; + }); + + ## Needs bump to a versioned attribute + ## Setup: Encountered missing dependencies: + ## hspec-discover ==2.4.8 + hspec-discover = super.hspec-discover_2_5_0; + + ## On Hackage: + + ## Upstreamed, awaiting a Hackage release + haskell-gi = overrideCabal super.haskell-gi (drv: { + ## Setup: Encountered missing dependencies: + ## haskell-gi-base ==0.20.* + src = pkgs.fetchFromGitHub { + owner = "haskell-gi"; + repo = "haskell-gi"; + rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; + sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; + }; + }); + + ## Upstreamed, awaiting a Hackage release + haskell-gi-base = overrideCabal super.haskell-gi-base (drv: { + ## Setup: Encountered missing dependencies: + ## haskell-gi-base ==0.21.* + src = pkgs.fetchFromGitHub { + owner = "haskell-gi"; + repo = "haskell-gi"; + rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; + sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; + }; + prePatch = "cd base; "; + }); + + ## Upstreamed, awaiting a Hackage release + http-api-data = overrideCabal super.http-api-data (drv: { + ## • No instance for (Semigroup Form) + ## arising from the 'deriving' clause of a data type declaration + ## Possible fix: + src = pkgs.fetchFromGitHub { + owner = "fizruk"; + repo = "http-api-data"; + rev = "83aac9540f4a304927c601c5db12f4dc2bf93816"; + sha256 = "14hy13szr09vsisxi25a4qfajqjwznvn222bqk55dcdlnrgf0zi9"; + }; + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11 + jailbreak = true; + }); + + ## Upstreamed, awaiting a Hackage release + lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: { + ## Setup: Encountered missing dependencies: + ## aeson >=0.9 && <0.12, + ## base >=4.7 && <4.10, + ## directory ==1.2.*, + ## megaparsec ==5.0.*, + ## vector ==0.11.* + src = pkgs.fetchFromGitHub { + owner = "lambdacube3d"; + repo = "lambdacube-compiler"; + rev = "ff6e3b136eede172f20ea8a0f7017ad1ecd029b8"; + sha256 = "0srzrq5s7pdbygn7vdipxl12a3gbyb6bpa7frbh8zwhb9fz0jx5m"; + }; + }); + + ## Upstreamed, awaiting a Hackage release + lambdacube-ir = overrideCabal super.lambdacube-ir (drv: { + ## Setup: Encountered missing dependencies: + ## aeson >=0.9 && <0.12, base >=4.8 && <4.10, vector ==0.11.* + src = pkgs.fetchFromGitHub { + owner = "lambdacube3d"; + repo = "lambdacube-ir"; + rev = "b86318b510ef59606c5b7c882cad33af52ce257c"; + sha256 = "0j4r6b32lcm6jg653xzg9ijxkfjahlb4x026mv5dhs18kvgqhr8x"; + }; + prePatch = "cd lambdacube-ir.haskell; "; + }); + + ## Upstreamed, awaiting a Hackage release + simple-reflect = overrideCabal super.simple-reflect (drv: { + ## • No instance for (Semigroup Expr) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Expr’ + src = pkgs.fetchFromGitHub { + owner = "twanvl"; + repo = "simple-reflect"; + rev = "c357e55da9a712dc5dbbfe6e36394e4ada2db310"; + sha256 = "15q41b00l8y51xzhbj5zhddyh3gi7gvml033w8mm2fih458jf6yq"; + }; + }); + + singletons = super.singletons_2_4_1; + + ## Upstreamed, awaiting a Hackage release + tar = overrideCabal super.tar (drv: { + ## • No instance for (Semigroup (Entries e)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (Entries e)’ + src = pkgs.fetchFromGitHub { + owner = "haskell"; + repo = "tar"; + rev = "abf2ccb8f7da0514343a0b2624cabebe081bdfa8"; + sha256 = "0s33lgrr574i1r7zc1jqahnwx3dv47ny30mbx5zfpdzjw0jdl5ny"; + }; + }); + + th-desugar = super.th-desugar_1_8; + + ## Upstreamed, awaiting a Hackage release + websockets = overrideCabal super.websockets (drv: { + ## • No instance for (Semigroup SizeLimit) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid SizeLimit’ + src = pkgs.fetchFromGitHub { + owner = "jaspervdj"; + repo = "websockets"; + rev = "11ba6d15cf47bace1936b13a58192e37908b0300"; + sha256 = "1swphhnqvs5kh0wlqpjjgx9q91yxi6lasid8akdxp3gqll5ii2hf"; + }; + }); + + + ## Unmerged + + ## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3 + bytestring-trie = overrideCabal super.bytestring-trie (drv: { + ## • Could not deduce (Semigroup (Trie a)) + ## arising from the superclasses of an instance declaration + ## from the context: Monoid a + src = pkgs.fetchFromGitHub { + owner = "RyanGlScott"; + repo = "bytestring-trie"; + rev = "e0ae0cb1ad40dedd560090d69cc36f9760797e29"; + sha256 = "1jkdchvrca7dgpij5k4h1dy4qr1rli3fzbsqajwxmx9865rgiksl"; + }; + ## Setup: Encountered missing dependencies: + ## HUnit >=1.3.1.1 && <1.7, + ## QuickCheck >=2.4.1 && <2.11, + ## lazysmallcheck ==0.6.*, + ## smallcheck >=1.1.1 && <1.2 + doCheck = false; + ## Setup: Encountered missing dependencies: + ## data-or ==1.0.* + libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]); + }); + + ## Unmerged. PR: https://github.com/dhall-lang/dhall-haskell/pull/321 + dhall = overrideCabal super.dhall (drv: { + ## • No instance for (Semigroup (Parser Builder)) + ## arising from a use of ‘<>’ + ## There are instances for similar types: + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "dhall-haskell"; + rev = "38f3d8c861e137da6d8ac8eab88aec1c359efcac"; + sha256 = "1pya7lhdjsygk622k1g3whj0a7jqwyym26ikxbn1anxypnb0n2wy"; + }; + ## Setup: Encountered missing dependencies: + ## prettyprinter >=1.2.0.1 && <1.3 + jailbreak = true; + ## Setup: Encountered missing dependencies: + ## insert-ordered-containers -any, + ## lens-family-core -any, + ## prettyprinter-ansi-terminal -any, + ## repline -any + libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ insert-ordered-containers lens-family-core prettyprinter prettyprinter-ansi-terminal repline ]); + }); + + ## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233 + gtk2hs-buildtools = overrideCabal super.gtk2hs-buildtools (drv: { + ## Setup: Encountered missing dependencies: + ## Cabal >=1.24.0.0 && <2.1 + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "gtk2hs"; + rev = "08c68d5afc22dd5761ec2c92ebf49c6d252e545b"; + sha256 = "06prn5wqq8x225n9wlbyk60f50jyjj8fm2hf181dyqjpf8wq75xa"; + }; + prePatch = "cd tools; "; + }); + + ## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46 + hashtables = overrideCabal super.hashtables (drv: { + ## • No instance for (Semigroup Slot) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Slot’ + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "hashtables"; + rev = "b9eb4b10a50bd6250330422afecc065339a32412"; + sha256 = "0l4nplpvnzzf397zyh7j2k6yiqb46k6bdy00m4zzvhlfp7p1xkaw"; + }; + }); + + ## Unmerged. PR: https://github.com/sol/hpack/pull/277 + ## Issue: https://github.com/sol/hpack/issues/276 + hpack = overrideCabal super.hpack (drv: { + ## • No instance for (Semigroup Dependencies) + ## arising from the 'deriving' clause of a data type declaration + ## Possible fix: + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "hpack"; + rev = "acce0cffcc1d165a0fd9f0b83878dfbd622ea0d6"; + sha256 = "1wv0ya1gb1hwd9w8g4z5aig694q3arsqhxv0d4wcp270xnq9ja8y"; + }; + ## Setup: Encountered missing dependencies: + ## http-client -any, http-client-tls -any, http-types -any + libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ http-client http-client-tls http-types ]); + }); + + ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 + monadplus = overrideCabal super.monadplus (drv: { + ## • No instance for (Semigroup (Partial a b)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (Partial a b)’ + src = pkgs.fetchFromGitHub { + owner = "asr"; + repo = "monadplus"; + rev = "aa09f2473e2c906f2707b8a3fdb0a087405fd6fb"; + sha256 = "0g37s3rih4i3vrn4kjwj12nq5lkpckmjw33xviva9gly2vg6p3xc"; + }; + }); + + ## Unmerged. PR: https://github.com/reflex-frp/reflex/pull/158 + reflex = overrideCabal super.reflex (drv: { + ## • Could not deduce (Semigroup (Event t a)) + ## arising from the superclasses of an instance declaration + ## from the context: (Semigroup a, Reflex t) + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "reflex"; + rev = "4fb50139db45a37493b91973eeaad9885b4c63ca"; + sha256 = "0i7pp6cw394m2vbwcqv9z5ngdarp01sabqr1jkkgchxdkkii94nx"; + }; + ## haddock: internal error: internal: extractDecl (ClsInstD) + ## CallStack (from HasCallStack): + ## error, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1067:16 in main:Haddock.Interface.Create + doHaddock = false; + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11, bifunctors >=5.2 && <5.5 + jailbreak = true; + ## Setup: Encountered missing dependencies: + ## data-default -any, + ## lens -any, + ## monad-control -any, + ## prim-uniq -any, + ## reflection -any, + libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-default haskell-src-exts lens monad-control prim-uniq reflection split template-haskell unbounded-delays ]); + }); + + ## Unmerged. PR: https://github.com/bos/text-format/pull/21 + text-format = overrideCabal super.text-format (drv: { + ## • No instance for (Semigroup Format) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Format’ + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "text-format"; + rev = "a1cda87c222d422816f956c7272e752ea12dbe19"; + sha256 = "0lyrx4l57v15rvazrmw0nfka9iyxs4wyaasjj9y1525va9s1z4fr"; + }; + }); + + ## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17 + wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { + ## Ambiguous occurrence ‘<>’ + ## It could refer to either ‘PP.<>’, + ## imported from ‘Prelude.Compat’ at Text/PrettyPrint/Leijen/Text/Monadic.hs:73:1-36 + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "wl-pprint-text"; + rev = "615b83d1e5be52d1448aa1ab2517b431a617027b"; + sha256 = "1p67v9s878br0r152h4n37smqhkg78v8zxhf4qm6d035s4rzj76i"; + }; + }); + + + ## Non-code, configuration-only change + + adjunctions = overrideCabal super.adjunctions (drv: { + ## Setup: Encountered missing dependencies: + ## free ==4.* + jailbreak = true; + }); + + async = overrideCabal super.async (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.3 && <4.11 + jailbreak = true; + }); + + bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.10 && <2.13 + jailbreak = true; + }); + + deepseq-generics = overrideCabal super.deepseq-generics (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## https://github.com/haskell-hvr/deepseq-generics/pull/4 + jailbreak = true; + }); + + exception-transformers = overrideCabal super.exception-transformers (drv: { + ## Setup: Encountered missing dependencies: + ## HUnit >=1.2 && <1.6 + jailbreak = true; + }); + + github = overrideCabal super.github (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11 + jailbreak = true; + }); + + haddock-library_1_5_0_1 = overrideCabal super.haddock-library_1_5_0_1 (drv: { + ## Setup: Encountered missing dependencies: + ## QuickCheck ==2.11.* + doCheck = false; + doHaddock = false; + }); + + hashable = overrideCabal super.hashable (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.4 && <4.11 + jailbreak = true; + }); + + hashable-time = overrideCabal super.hashable-time (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11 + jailbreak = true; + }); + + haskell-src-meta = overrideCabal super.haskell-src-meta (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.6 && <4.11, template-haskell >=2.8 && <2.13 + jailbreak = true; + }); + + hnix = overrideCabal super.hnix (drv: { + ## Setup: Encountered missing dependencies: + ## deriving-compat ==0.3.* + jailbreak = true; + }); + + integer-logarithms = overrideCabal super.integer-logarithms (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.3 && <4.11 + jailbreak = true; + }); + + jailbreak-cabal = super.jailbreak-cabal.override { + ## • No instance for (Semigroup CDialect) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid CDialect’ + ## Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1: + Cabal = self.Cabal; + }; + + kan-extensions = overrideCabal super.kan-extensions (drv: { + ## Setup: Encountered missing dependencies: + ## free ==4.* + jailbreak = true; + }); + + keys = overrideCabal super.keys (drv: { + ## Setup: Encountered missing dependencies: + ## free ==4.* + jailbreak = true; + }); + + lambdacube-gl = overrideCabal super.lambdacube-gl (drv: { + ## Setup: Encountered missing dependencies: + ## vector ==0.11.* + jailbreak = true; + }); + + lifted-async = overrideCabal super.lifted-async (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + jailbreak = true; + }); + + newtype-generics = overrideCabal super.newtype-generics (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.6 && <4.11 + jailbreak = true; + }); + + protolude = overrideCabal super.protolude (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.6 && <4.11 + jailbreak = true; + }); + + quickcheck-instances = overrideCabal super.quickcheck-instances (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + jailbreak = true; + }); + + rapid = overrideCabal super.rapid (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.8 && <4.11 + jailbreak = true; + }); + + resolv = overrideCabal super.resolv (drv: { + ## Setup: Encountered missing dependencies: + ## tasty >=0.11.2 && <0.12 + doCheck = false; + }); + + setlocale = overrideCabal super.setlocale (drv: { + ## https://bitbucket.org/IchUndNichtDu/haskell-setlocale/issues/1/please-allow-base-412-from-ghc-841 + jailbreak = true; + }); + + stylish-cabal = overrideCabal super.stylish-cabal (drv: { + ## https://github.com/pikajude/stylish-cabal/issues/6 + doHaddock = false; + }); + + tasty-expected-failure = overrideCabal super.tasty-expected-failure (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + jailbreak = true; + }); + + tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.8 && <4.11 + jailbreak = true; + }); + + ## Issue: https://github.com/ChrisPenner/rasa/issues/54 + text-lens = overrideCabal super.text-lens (drv: { + ## Failures: + ## test/Spec.hs:136: + ## 1) TextLens.range gets "" if invalid range + ## uncaught exception: ErrorCall (Data.Text.Array.new: size overflow + ## CallStack (from HasCallStack): + ## error, called at libraries/text/Data/Text/Array.hs:132:20 in text-1.2.3.0:Data.Text.Array) + ## Randomized with seed 1899912238 + ## Finished in 0.0027 seconds + doCheck = false; + ## Setup: Encountered missing dependencies: + ## extra >=1.4.10 && <1.5, lens ==4.14.* + jailbreak = true; + }); + + ## Issue: https://github.com/phadej/tree-diff/issues/15 + tree-diff = overrideCabal super.tree-diff (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11 + jailbreak = true; + }); + + vector-algorithms = overrideCabal super.vector-algorithms (drv: { + ## • Ambiguous type variable ‘mv0’ + doCheck = false; + }); + + wavefront = overrideCabal super.wavefront (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.8 && <4.11 + jailbreak = true; + }); + + # Older versions don't compile. + brick = doJailbreak super.brick_0_36; # https://github.com/jtdaugherty/brick/issues/171 + HaTeX = self.HaTeX_3_19_0_0; + matrix = self.matrix_0_3_6_1; + pandoc = self.pandoc_2_1_3; + pandoc-types = self.pandoc-types_1_17_4_2; + + # https://github.com/xmonad/xmonad/issues/155 + xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch + { url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch; + sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp"; + })) self.semigroups; + + # https://github.com/xmonad/xmonad-contrib/issues/235 + xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch); + + # Contributed by Bertram Felgenhauer . + arrows = appendPatch super.arrows (pkgs.fetchpatch { + url = https://raw.githubusercontent.com/lambdabot/lambdabot/ghc-8.4.1/patches/arrows-0.4.4.1.patch; + sha256 = "0j859vclcfnz8n2mw466mv00kjsa9gdbrppjc1m3b68jbypdmfvr"; + }); + + # Contributed by Bertram Felgenhauer . + flexible-defaults = appendPatch super.flexible-defaults (pkgs.fetchpatch { + url = https://raw.githubusercontent.com/lambdabot/lambdabot/ghc-8.4.1/patches/flexible-defaults-0.0.1.2.patch; + sha256 = "1bpsqq80h6nxm04wddgcgyzn0fjfsmhccmqb211jqswv5209znx8"; + }); + +} diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index f81920edd61a5e1113b1db8f0639a0e1b6f43f86..99003102ec584517f222d968e9456a83b6b2d549 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -47,10 +47,6 @@ self: super: { # We have time 1.5 aeson = disableCabalFlag super.aeson "old-locale"; - # Show works differently for record syntax now, breaking haskell-src-exts' parser tests - # https://github.com/haskell-suite/haskell-src-exts/issues/224 - haskell-src-exts = dontCheck super.haskell-src-exts; - # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index bd35c1cb3ae2bb4bb27e7b41251ad21cac862e78..7a6416b9e13b0af19bf1f356c4632a16f7e0fff7 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -53,19 +53,6 @@ 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 # haddock throws the error: No input file(s). diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 48cd2c96f08ed03c4731fb3dcf933618e4845c38..e15482a6708c93a06feaea020921007bec8d7c06 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,35 +1,36 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.0.2 +compiler: ghc-8.2.2 core-packages: - - array-0.5.1.1 - - base-4.9.1.0 - - binary-0.8.3.0 - - bytestring-0.10.8.1 - - Cabal-1.24.2.0 - - containers-0.5.7.1 - - deepseq-1.4.2.0 - - directory-1.3.0.0 - - filepath-1.4.1.1 - - ghc-8.0.2 - - ghc-boot-8.0.2 - - ghc-boot-th-8.0.2 - - ghci-8.0.2 - - ghc-prim-0.5.0.0 - - haskeline-0.7.3.0 - - hoopl-3.10.2.1 + - array-0.5.2.0 + - base-4.10.1.0 + - binary-0.8.5.1 + - bytestring-0.10.8.2 + - Cabal-2.0.1.0 + - containers-0.5.10.2 + - deepseq-1.4.3.0 + - directory-1.3.0.2 + - filepath-1.4.1.2 + - ghc-8.2.2 + - ghc-boot-8.2.2 + - ghc-boot-th-8.2.2 + - ghc-compact-0.1.0.0 + - ghc-prim-0.5.1.1 + - ghci-8.2.2 + - haskeline-0.7.4.0 + - hoopl-3.10.2.2 - hpc-0.6.0.3 - - integer-gmp-1.0.0.1 + - integer-gmp-1.0.1.0 - pretty-1.1.3.3 - - process-1.4.3.0 + - process-1.6.1.0 - rts-1.0 - - template-haskell-2.11.1.0 - - terminfo-0.4.0.2 - - time-1.6.0.1 + - template-haskell-2.12.0.0 + - terminfo-0.4.1.0 + - time-1.8.0.2 - transformers-0.5.2.0 - - unix-2.7.2.1 - - xhtml-3000.2.1 + - unix-2.7.2.2 + - xhtml-3000.2.2 # Hack: The following package is a core package of GHCJS. If we don't declare # it, then hackage2nix will generate a Hackage database where all dependants @@ -37,223 +38,152 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.13 + # LTS Haskell 11.5 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 - - accelerate ==1.0.0.0 + - accelerate ==1.1.1.0 + - accelerate-arithmetic ==1.0.0.1 + - accelerate-bignum ==0.1.0.0 + - accelerate-blas ==0.1.0.1 + - accelerate-fft ==1.1.0.0 + - accelerate-fftw ==1.0.0.1 + - accelerate-fourier ==1.0.0.5 + - accelerate-io ==1.0.0.1 + - accelerate-llvm ==1.1.0.0 + - accelerate-llvm-native ==1.1.0.1 + - accelerate-llvm-ptx ==1.1.0.1 + - accelerate-utility ==1.0.0.1 - accuerr ==0.2.0.2 - ace ==0.6 - action-permutations ==0.0.0.1 - active ==0.2.0.13 - - AC-Vector ==2.3.2 - - ad ==4.3.4 - - adjunctions ==4.3 - - adler32 ==0.1.1.0 - - aeson ==1.1.2.0 + - ad ==4.3.5 + - adjunctions ==4.4 + - adler32 ==0.1.2.0 + - aern2-mp ==0.1.2.0 + - aern2-real ==0.1.1.0 + - aeson ==1.2.4.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - - aeson-compat ==0.3.6 + - aeson-compat ==0.3.7.1 - aeson-diff ==1.1.0.4 - - aeson-extra ==0.4.0.0 - - aeson-generic-compat ==0.0.1.0 - - aeson-injector ==1.0.10.0 - - aeson-lens ==0.5.0.0 - - aeson-pretty ==0.8.5 + - aeson-extra ==0.4.1.0 + - aeson-generic-compat ==0.0.1.1 + - aeson-injector ==1.1.0.0 + - aeson-picker ==0.1.0.4 + - aeson-pretty ==0.8.7 - aeson-qq ==0.8.2 + - aeson-typescript ==0.1.0.6 - aeson-utils ==0.3.0.2 + - aeson-yak ==0.1.1.3 - Agda ==2.5.3 - - airship ==0.6.0 + - airship ==0.9.3 - alarmclock ==0.4.0.3 - - alerta ==0.1.0.5 - - alex ==3.2.3 + - alerts ==0.1.0.0 + - alex ==3.2.4 + - algebra ==4.3.1 - algebraic-graphs ==0.0.5 - alsa-core ==0.5.0.1 - alsa-mixer ==0.2.0.3 - alsa-pcm ==0.6.0.4 - alsa-seq ==0.6.0.7 - - alternators ==0.1.1.1 + - alternative-vector ==0.0.0 + - alternators ==0.1.2.0 - ALUT ==2.4.0.2 - - amazonka ==1.4.5 - - amazonka-apigateway ==1.4.5 - - amazonka-application-autoscaling ==1.4.5 - - amazonka-appstream ==1.4.5 - - amazonka-autoscaling ==1.4.5 - - amazonka-budgets ==1.4.5 - - amazonka-certificatemanager ==1.4.5 - - amazonka-cloudformation ==1.4.5 - - amazonka-cloudfront ==1.4.5 - - amazonka-cloudhsm ==1.4.5 - - amazonka-cloudsearch ==1.4.5 - - amazonka-cloudsearch-domains ==1.4.5 - - amazonka-cloudtrail ==1.4.5 - - amazonka-cloudwatch ==1.4.5 - - amazonka-cloudwatch-events ==1.4.5 - - amazonka-cloudwatch-logs ==1.4.5 - - amazonka-codebuild ==1.4.5 - - amazonka-codecommit ==1.4.5 - - amazonka-codedeploy ==1.4.5 - - amazonka-codepipeline ==1.4.5 - - amazonka-cognito-identity ==1.4.5 - - amazonka-cognito-idp ==1.4.5 - - amazonka-cognito-sync ==1.4.5 - - amazonka-config ==1.4.5 - - amazonka-core ==1.4.5 - - amazonka-datapipeline ==1.4.5 - - amazonka-devicefarm ==1.4.5 - - amazonka-directconnect ==1.4.5 - - amazonka-discovery ==1.4.5 - - amazonka-dms ==1.4.5 - - amazonka-ds ==1.4.5 - - amazonka-dynamodb ==1.4.5 - - amazonka-dynamodb-streams ==1.4.5 - - amazonka-ec2 ==1.4.5 - - amazonka-ecr ==1.4.5 - - amazonka-ecs ==1.4.5 - - amazonka-efs ==1.4.5 - - amazonka-elasticache ==1.4.5 - - amazonka-elasticbeanstalk ==1.4.5 - - amazonka-elasticsearch ==1.4.5 - - amazonka-elastictranscoder ==1.4.5 - - amazonka-elb ==1.4.5 - - amazonka-elbv2 ==1.4.5 - - amazonka-emr ==1.4.5 - - amazonka-gamelift ==1.4.5 - - amazonka-glacier ==1.4.5 - - amazonka-health ==1.4.5 - - amazonka-iam ==1.4.5 - - amazonka-importexport ==1.4.5 - - amazonka-inspector ==1.4.5 - - amazonka-iot ==1.4.5 - - amazonka-iot-dataplane ==1.4.5 - - amazonka-kinesis ==1.4.5 - - amazonka-kinesis-analytics ==1.4.5 - - amazonka-kinesis-firehose ==1.4.5 - - amazonka-kms ==1.4.5 - - amazonka-lambda ==1.4.5 - - amazonka-lightsail ==1.4.5 - - amazonka-marketplace-analytics ==1.4.5 - - amazonka-marketplace-metering ==1.4.5 - - amazonka-ml ==1.4.5 - - amazonka-opsworks ==1.4.5 - - amazonka-opsworks-cm ==1.4.5 - - amazonka-pinpoint ==1.4.5 - - amazonka-polly ==1.4.5 - - amazonka-rds ==1.4.5 - - amazonka-redshift ==1.4.5 - - amazonka-rekognition ==1.4.5 - - amazonka-route53 ==1.4.5 - - amazonka-route53-domains ==1.4.5 - - amazonka-s3 ==1.4.5 - - amazonka-s3-streaming ==0.2.0.3 - - amazonka-sdb ==1.4.5 - - amazonka-servicecatalog ==1.4.5 - - amazonka-ses ==1.4.5 - - amazonka-shield ==1.4.5 - - amazonka-sms ==1.4.5 - - amazonka-snowball ==1.4.5 - - amazonka-sns ==1.4.5 - - amazonka-sqs ==1.4.5 - - amazonka-ssm ==1.4.5 - - amazonka-stepfunctions ==1.4.5 - - amazonka-storagegateway ==1.4.5 - - amazonka-sts ==1.4.5 - - amazonka-support ==1.4.5 - - amazonka-swf ==1.4.5 - - amazonka-test ==1.4.5 - - amazonka-waf ==1.4.5 - - amazonka-workspaces ==1.4.5 - - amazonka-xray ==1.4.5 - - amqp ==0.15.1 + - amqp ==0.18.1 - annotated-wl-pprint ==0.7.0 - - anonymous-sums ==0.6.0.0 - - ansigraph ==0.3.0.4 - - ansi-terminal ==0.6.3.1 - - ansi-wl-pprint ==0.6.7.3 + - ansigraph ==0.3.0.5 + - ansi-terminal ==0.8.0.2 + - ansi-wl-pprint ==0.6.8.2 + - ANum ==0.2.0.2 + - apecs ==0.2.4.7 - api-field-json-th ==0.1.0.2 - appar ==0.1.4 + - apply-refact ==0.4.1.0 - apportionment ==0.0.0.2 - approximate ==0.3.1 - app-settings ==0.2.0.11 - - arbtt ==0.9.0.13 - - arithmoi ==0.5.0.0 + - arithmoi ==0.6.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrow-list ==0.7 - - arrowp-qq ==0.1.1 - - asciidiagram ==1.3.3 + - asciidiagram ==1.3.3.1 - ascii-progress ==0.3.3.0 - asn1-encoding ==0.9.5 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 + - assert-failure ==0.1.2.2 - astro ==0.4.2.0 - async ==2.1.1.1 - - async-dejafu ==0.1.3.0 - async-extra ==0.2.0.0 - async-refresh ==0.2.0.2 - async-refresh-tokens ==0.3.0.1 - - async-timer ==0.1.4.0 + - async-timer ==0.1.4.1 - atom-basic ==0.2.5 - - atom-conduit ==0.4.0.3 - - atomic-primops ==0.8.1 + - atom-conduit ==0.5.0.1 + - atomic-primops ==0.8.2 - atomic-write ==0.2.0.5 - - attoparsec ==0.13.1.0 + - attoparsec ==0.13.2.2 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 + - attoparsec-ip ==0.0.1 - attoparsec-iso8601 ==1.0.0.0 - - attoparsec-time ==0.1.4 + - attoparsec-path ==0.0.0.1 + - attoparsec-time ==1 + - attoparsec-uri ==0.0.4 - audacity ==0.0.1.2 - - authenticate ==1.3.3.2 + - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - - autoexporter ==1.1.2 + - autoexporter ==1.1.9 - auto-update ==0.1.4 - - avers ==0.0.17.1 - - avers-api ==0.0.18.0 - - avers-api-docs ==0.0.18.0 - - avers-server ==0.0.19.0 - avwx ==0.3.0.2 - - aws ==0.16 - axiom ==0.4.6 - - b9 ==0.5.35 - - backprop ==0.0.3.0 - - bake ==0.5 + - b9 ==0.5.44 + - backprop ==0.1.5.1 - bank-holidays-england ==0.1.0.6 + - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 - base58string ==0.10.0 - base64-bytestring ==1.0.0.1 - base64-string ==0.2 - base-compat ==0.9.3 - - basement ==0.0.4 - - base-noprelude ==4.9.1.0 - - base-orphans ==0.6 + - basement ==0.0.7 + - base-orphans ==0.7 - base-prelude ==1.2.0.1 - base-unicode-symbols ==0.2.2.4 - - basic-prelude ==0.6.1.1 - - bcrypt ==0.0.10 - - bench ==1.0.6 + - basic-prelude ==0.7.0 + - bbdb ==0.8 + - bcrypt ==0.0.11 + - beam-core ==0.7.2.0 + - beam-migrate ==0.3.1.0 + - beam-sqlite ==0.3.2.0 + - bench ==1.0.9 - benchpress ==0.2.2.10 - bencode ==0.6.0.0 - bento ==0.1.0 - between ==0.11.0.0 + - bhoogle ==0.1.2.6 - bibtex ==0.1.0.6 - - bifunctors ==5.4.2 + - bifunctors ==5.5.2 - bimap ==0.3.3 - bimap-server ==0.1.0.1 - binary-bits ==0.5 - - binary-conduit ==1.2.5 + - binary-conduit ==1.3 - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 - - binary-orphans ==0.1.6.0 + - binary-orphans ==0.1.8.0 - binary-parser ==0.5.5 - binary-parsers ==0.2.3.0 - binary-search ==1.0.0.3 + - binary-shared ==0.8.3 - binary-tagged ==0.1.4.2 - - binary-typed ==1.0 - - bindings-DSL ==1.0.23 - - bindings-GLFW ==3.1.2.3 + - bindings-DSL ==1.0.24 + - bindings-GLFW ==3.1.2.4 - bindings-libzip ==1.0.1 + - bindings-uname ==0.1 - bioace ==0.0.1 - bioalign ==0.0.5 - BiobaseNewick ==0.0.0.2 @@ -269,104 +199,106 @@ default-package-overrides: - bitcoin-tx ==0.13.1 - bitcoin-types ==0.9.2 - bits ==0.5.1 - - bitx-bitcoin ==0.11.0.1 + - bitset-word8 ==0.1.1.0 + - bit-stream ==0.1.0.2 + - bitx-bitcoin ==0.12.0.0 - blake2 ==0.2.0 - - blank-canvas ==0.6.1 - - BlastHTTP ==1.2.1 + - blas-carray ==0.0.1.1 + - blas-ffi ==0.0.1.1 + - blas-hs ==0.1.1.0 - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 - - blaze-builder ==0.4.0.2 + - blaze-builder ==0.4.1.0 - blaze-html ==0.9.0.1 - - blaze-markup ==0.8.0.0 + - blaze-markup ==0.8.2.1 - 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.14.0.0 - - bloomfilter ==2.0.1.0 + - bloodhound ==0.15.0.2 - blosum ==0.1.1.4 - bmp ==1.2.6.3 - bno055-haskell ==0.1.0 - - board-games ==0.1.0.6 - - boltzmann-samplers ==0.1.0.0 + - boltzmann-samplers ==0.1.1.0 - bookkeeping ==0.2.1.4 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 - - bool-extras ==0.4.0 - boolsimplifier ==0.1.8 - - boomerang ==1.4.5.3 + - boomerang ==1.4.5.5 + - bordacount ==0.1.0.0 - both ==0.1.1.0 - bound ==2.0.1 - BoundedChan ==1.0.3.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - - boxes ==0.1.4 - - brick ==0.18 + - boxes ==0.1.5 + - brick ==0.34.1 + - brittany ==0.9.0.1 - broadcast-chan ==0.1.1 + - bsb-http-chunked ==0.0.0.2 - bson ==0.3.2.3 - bson-lens ==0.1.1 - btrfs ==0.1.2.3 - - buffer-builder ==0.2.4.4 + - buchhaltung ==0.0.7 + - buffer-builder ==0.2.4.5 - buffer-pipe ==0.0 - - bumper ==0.6.0.3 - - bv ==0.4.1 + - butcher ==1.3.0.0 + - bv ==0.5 + - bv-little ==0.1.0.0 - byteable ==0.1.1 - bytedump ==1.0 - byteorder ==1.0.4 - - bytes ==0.15.3 + - bytes ==0.15.4 - byteset ==0.1.1.0 - bytestring-builder ==0.10.8.1.0 - bytestring-conversion ==0.3.1 - - bytestring-handle ==0.1.0.5 - bytestring-lexing ==0.5.0.2 - - bytestring-progress ==1.0.7 - bytestring-strict-builder ==0.4.5 - bytestring-tree-builder ==0.2.7.1 - bytestring-trie ==0.2.4.1 - - bzlib-conduit ==0.2.1.5 - - c2hs ==0.28.2 - - Cabal ==1.24.2.0 - - cabal-dependency-licenses ==0.2.0.0 - - cabal-doctest ==1.0.3 + - bzlib ==0.5.0.5 + - bzlib-conduit ==0.3.0.1 + - c2hs ==0.28.3 + - Cabal ==2.0.1.1 + - cabal-doctest ==1.0.6 - cabal-file-th ==0.2.4 - - cabal-helper ==0.7.3.0 - - cabal-rpm ==0.11.2 - - cache ==0.1.0.0 - - cacophony ==0.10.0 - - cairo ==0.13.4.1 + - cabal-rpm ==0.12.2 + - cabal-toolkit ==0.0.5 + - cache ==0.1.1.0 + - cairo ==0.13.4.2 - calendar-recycling ==0.0 - call-stack ==0.1.0 + - capataz ==0.1.0.1 - carray ==0.1.6.8 - cartel ==0.18.0.2 - cased ==0.1.0.0 - - case-insensitive ==1.2.0.10 + - case-insensitive ==1.2.0.11 - cases ==0.1.3.2 - - casing ==0.1.2.1 - - cassava ==0.4.5.1 - - cassava-conduit ==0.3.5.1 + - casing ==0.1.4.0 + - cassava ==0.5.1.0 + - cassava-conduit ==0.4.0.2 + - cassava-records ==0.1.0.4 - cassette ==0.1.0 - - cayley-client ==0.4.1 - - cereal ==0.5.4.0 - - cereal-conduit ==0.7.3 + - cast ==0.1.0.2 + - cayley-client ==0.4.5 + - cereal ==0.5.5.0 + - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 + - cereal-time ==0.1.0.0 - cereal-vector ==0.2.0.1 - - cgi ==3001.3.0.2 - - ChannelT ==0.0.0.4 + - ChannelT ==0.0.0.7 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.3 - - Chart ==1.8.2 - - Chart-cairo ==1.8.2 - - Chart-diagrams ==1.8.2 - - chart-unit ==0.4.1 + - Chart ==1.8.3 + - Chart-cairo ==1.8.3 - chaselev-deque ==0.5.0.5 - - cheapskate ==0.1.0.5 + - ChasingBottoms ==1.3.1.4 + - chatwork ==0.1.3.1 + - cheapskate ==0.1.1 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - checkers ==0.4.9.5 - - chell ==0.4.0.1 - choice ==0.2.2 - - chunked-data ==0.3.0 + - chunked-data ==0.3.1 - cipher-aes ==0.2.11 - cipher-aes128 ==0.7.0.3 - cipher-blowfish ==0.0.3 @@ -374,78 +306,83 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - - clang-pure ==0.2.0.2 - - 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 + - cisco-spark-api ==0.1.0.2 + - clang-compilation-database ==0.1.0.1 + - classyplate ==0.3.0.2 + - classy-prelude ==1.4.0 + - classy-prelude-conduit ==1.4.0 + - classy-prelude-yesod ==1.4.0 - clay ==0.12.2 - cli ==0.1.2 - clientsession ==0.9.1.2 - Clipboard ==2.3.2.0 - clock ==0.7.2 - clock-extras ==0.1.0.2 - - clr-host ==0.1.0.0 - - clr-inline ==0.1.0.0 - - clr-marshal ==0.1.0.0 + - clr-host ==0.2.0.1 + - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.0 - - ClustalParser ==1.2.1 - - clustering ==0.3.1 + - ClustalParser ==1.2.3 - cmark ==0.5.6 + - cmark-gfm ==0.1.3 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.18 + - cmdargs ==0.10.20 - code-builder ==0.1.3 + - codec ==0.2.1 - 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.1 + - colorize-haskell ==1.0.1 + - colour ==2.3.4 + - colour-accelerate ==0.2.0.0 + - combinatorial ==0.1 + - comfort-graph ==0.0.3 - commutative ==0.0.1.4 - - comonad ==5.0.2 - - comonads-fd ==4.0 - - comonad-transformers ==4.0 + - comonad ==5.0.3 + - compact ==0.1.0.1 - compactmap ==0.1.4.2.1 - compensated ==0.7.2 + - compiler-warnings ==0.1.0 - composable-associations ==0.1.0.0 - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 - - concise ==0.1.0.0 - - concurrency ==1.1.2.1 - - concurrent-output ==1.9.2 + - composition-prelude ==1.3.0.8 + - compressed ==3.11 + - concise ==0.1.0.1 + - concurrency ==1.4.0.2 + - concurrent-extra ==0.7.0.12 + - concurrent-output ==1.10.5 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - - conduit ==1.2.12.1 - - conduit-combinators ==1.1.1 - - conduit-connection ==0.1.0.3 - - conduit-extra ==1.1.17 - - conduit-iconv ==0.1.1.2 - - conduit-parse ==0.1.2.1 + - cond ==0.4.1.1 + - conduit ==1.3.0.2 + - conduit-algorithms ==0.0.8.0 + - conduit-combinators ==1.3.0 + - conduit-connection ==0.1.0.4 + - conduit-extra ==1.3.0 + - conduit-iconv ==0.1.1.3 + - conduit-throttle ==0.3.1.0 - ConfigFile ==1.1.4 - - configuration-tools ==0.2.15 + - config-ini ==0.2.2.0 + - configuration-tools ==0.3.1 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - connection ==0.2.8 - - connection-pool ==0.2.1 + - connection-pool ==0.2.2 - console-style ==0.0.2.1 - - constraints ==0.9.1 + - constraints ==0.10 - consul-haskell ==0.4.2 - containers-unicode-symbols ==0.3.1.1 - - contravariant ==1.4 - - contravariant-extras ==0.3.3.1 + - contravariant ==1.4.1 + - contravariant-extras ==0.3.4 - control-bool ==0.2.1 - control-monad-free ==0.6.1 - - control-monad-loop ==0.1 - control-monad-omega ==0.3.1 - convertible ==1.1.1.0 - - cookie ==0.4.3 + - cookie ==0.4.4 - countable ==1.0 + - country ==0.1.5 - courier ==0.1.1.5 - cpphs ==1.20.8 - cprng-aes ==0.6.1 @@ -453,23 +390,25 @@ default-package-overrides: - cpuinfo ==0.1.0.1 - cql ==3.1.1 - cql-io ==0.16.0 - - criterion ==1.1.4.0 - - cron ==0.5.0 - - crypto-api ==0.13.2 + - crackNum ==1.9 + - credential-store ==0.1.2 + - criterion ==1.3.0.0 + - cron ==0.6.1 + - crypto-api ==0.13.3 - crypto-api-tests ==0.3 - cryptocipher ==0.6.2 - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - - crypto-enigma ==0.0.2.9 + - cryptocompare ==0.1.1 + - crypto-enigma ==0.0.2.11 - cryptohash ==0.11.9 - - cryptohash-conduit ==0.1.1 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 - cryptohash-sha1 ==0.11.100.1 - - cryptohash-sha256 ==0.11.100.1 + - cryptohash-sha256 ==0.11.101.0 - cryptohash-sha512 ==0.11.100.1 - - cryptonite ==0.23 - - cryptonite-conduit ==0.2.0 + - cryptonite ==0.25 + - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.6 - crypto-pubkey-types ==0.4.3 - crypto-random ==0.0.9 @@ -477,701 +416,609 @@ default-package-overrides: - crypt-sha512 ==0 - csp ==1.3.1 - css-syntax ==0.0.5 - - css-text ==0.1.2.2 + - css-text ==0.1.3.0 - csv ==0.1.2 - - csv-conduit ==0.6.7 - - ctrie ==0.1.1.0 - - cubicbezier ==0.6.0.4 + - csv-conduit ==0.6.8.1 + - ctrie ==0.2 - cubicspline ==0.1.2 - - cue-sheet ==0.1.1 + - cublas ==0.4.0.1 + - cuda ==0.9.0.3 + - cue-sheet ==1.0.1 + - cufft ==0.8.0.0 - curl ==1.3.8 + - curl-runnings ==0.2.0 + - currencies ==0.1.1.1 + - cusolver ==0.1.0.1 + - cusparse ==0.1.0.1 - cutter ==0.0 - - darcs ==2.12.5 + - czipwith ==1.0.0.0 - data-accessor ==0.2.2.7 - data-accessor-mtl ==0.2.0.4 - - data-accessor-template ==0.2.1.14 + - data-accessor-template ==0.2.1.15 - data-accessor-transformers ==0.2.1.7 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - - data-check ==0.1.1 - data-checked ==0.3 - - data-clist ==0.1.2.0 + - data-clist ==0.1.2.1 - 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-diverse ==0.8.1.0 - - data-diverse-lens ==0.1.1.0 - - data-dword ==0.3.1.1 + - data-diverse ==2.0.1.0 + - data-diverse-lens ==2.1.0.0 + - datadog ==0.2.2.0 + - data-dword ==0.3.1.2 - data-endian ==0.1.1 - - data-fix ==0.0.7 - - data-has ==0.2.1.0 + - data-fix ==0.2.0 + - data-has ==0.3.0.0 - data-hash ==0.2.0.1 - - data-inttrie ==0.1.2 + - data-inttrie ==0.1.4 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 - - data-msgpack ==0.0.10 + - data-msgpack ==0.0.11 + - data-msgpack-types ==0.0.1 - 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-serializer ==0.3.4 + - datasets ==0.2.5 - data-textual ==0.3.0.2 + - data-tree-print ==0.1.0.1 - dataurl ==0.1.0.0 - - DAV ==1.3.1 + - DAV ==1.3.2 - dawg-ord ==0.5.1.0 - - dbus ==0.10.13 + - dbcleaner ==0.1.3 + - dbus ==0.10.15 - debian-build ==0.10.1.0 - - Decimal ==0.4.2 - - declarative ==0.5.1 + - debug ==0.1.1 + - Decimal ==0.5.1 + - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - - dejafu ==0.7.3.0 + - dejafu ==1.3.2.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - - derive ==2.6.3 - - deriving-compat ==0.3.6 + - dependent-sum-template ==0.0.0.6 + - deque ==0.2.1 + - deriving-compat ==0.4.1 - descriptive ==0.9.4 - - diagrams ==1.4 - - diagrams-builder ==0.8.0.1 - - diagrams-cairo ==1.4 - - diagrams-canvas ==1.4 - - diagrams-contrib ==1.4.1 - - diagrams-core ==1.4.0.1 - - diagrams-gtk ==1.4 - - diagrams-html5 ==1.4 - - diagrams-lib ==1.4.1.2 - - diagrams-postscript ==1.4 - - diagrams-rasterific ==1.4 - - diagrams-solve ==0.1.1 - - diagrams-svg ==1.4.1.1 - - dictionaries ==0.2.0.3 + - dhall ==1.11.1 + - dhall-json ==1.0.13 + - dice ==0.1 + - dictionaries ==0.2.0.4 - Diff ==0.3.4 - diff3 ==0.3.0 - digest ==0.0.1.2 - digits ==0.3.1 - - dimensional ==1.0.1.3 + - dimensional ==1.1 - directory-tree ==0.12.1 - - direct-sqlite ==2.3.21 - - discord-gateway ==0.2.2 - - discord-hs ==0.4.2 - - discord-rest ==0.2.2 - - discord-types ==0.2.2 + - direct-rocksdb ==0.0.3 + - direct-sqlite ==2.3.23 - discount ==0.1.1 + - discrimination ==0.3 - disk-free-space ==0.1.0.1 - disposable ==0.2.0.4 - distance ==0.1.0.0 - - distributed-closure ==0.3.4.0 + - distributed-closure ==0.4.0 + - distributed-process ==0.7.3 + - distributed-process-lifted ==0.3.0.1 + - distributed-process-monad-control ==0.5.1.3 + - distributed-process-simplelocalnet ==0.2.4 + - distributed-process-tests ==0.4.11 - distributed-static ==0.3.8 - distribution ==1.1.1.0 - distributive ==0.5.3 - diversity ==0.8.1.0 - djinn-ghc ==0.0.2.3 - djinn-lib ==0.0.1.2 - - dlist ==0.8.0.3 + - dlist ==0.8.0.4 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - - dmenu ==0.3.1.1 - - dmenu-pkill ==0.1.0.1 - - dmenu-pmount ==0.1.0.1 - - dmenu-search ==0.1.0.1 - - dns ==2.0.13 + - dns ==3.0.2 + - docker ==0.5.1.1 + - docker-build-cacher ==1.9.2 - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 - - doctemplates ==0.1.0.2 - - doctest ==0.11.4 + - doctemplates ==0.2.2.1 + - doctest ==0.13.0 - doctest-discover ==0.1.0.7 + - doctest-driver-gen ==0.2.0.2 - do-list ==1.0.1 - - dotenv ==0.3.4.0 + - dom-parser ==3.0.0 + - dotenv ==0.5.2.4 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - - download ==0.3.2.5 - - dpor ==0.2.0.0 + - download ==0.3.2.6 - drawille ==0.1.2.0 - DRBG ==0.5.5 - drifter ==0.2.3 - - drifter-postgresql ==0.1.0 - - dsp ==0.2.3.1 - - dual-tree ==0.2.1 + - drifter-postgresql ==0.2.1 + - dsp ==0.2.4 + - dublincore-xml-conduit ==0.1.0.2 - dvorak ==0.1.0.0 - - dynamic-state ==0.2.2.0 + - dynamic-state ==0.3 - dyre ==0.8.12 - - Earley ==0.12.0.1 + - Earley ==0.12.1.0 - easy-file ==0.2.1 - Ebnf2ps ==1.0.15 - echo ==0.1.3 - ed25519 ==0.0.5.0 - - ede ==0.2.8.7 - EdisonAPI ==1.3.1 - - EdisonCore ==1.3.1.1 + - EdisonCore ==1.3.2.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.3 - - either ==4.4.1.1 + - either ==5 - either-unwrap ==1.1 - - ekg ==0.4.0.14 - - ekg-core ==0.1.1.3 + - ekg ==0.4.0.15 + - ekg-core ==0.1.1.4 - ekg-json ==0.1.0.6 - - ekg-statsd ==0.2.2.0 - - ekg-wai ==0.1.0.2 + - ekg-statsd ==0.2.3.0 + - ekg-wai ==0.1.0.3 - elerea ==2.9.0 - - elm-bridge ==0.4.1 + - eliminators ==0.3 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm-export-persistent ==0.1.2 + - elm-export-persistent ==0.2.0 - emailaddress ==0.2.0.0 - - email-validate ==2.3.2 + - email-validate ==2.3.2.5 - enclosed-exceptions ==1.0.2 - - encoding-io ==0.0.1 - - engine-io ==1.2.17 - - engine-io-wai ==1.0.6 - - EntrezHTTP ==1.0.3 - entropy ==0.3.8 - - enummapset ==0.5.2.1 - - enummapset-th ==0.6.1.1 - - enumset ==0.0.4 + - enummapset ==0.5.2.2 + - enumset ==0.0.4.1 - envelope ==0.2.2.0 - envparse ==0.4 - - envy ==1.3.0.2 + - envy ==1.5.0.0 - epub-metadata ==4.5 - - eq ==4.0.4 + - eq ==4.1 - equal-files ==0.0.5.3 - equivalence ==0.3.2 - erf ==2.0.0.0 - - errors ==2.2.2 - - ersatz ==0.4.1 - - esqueleto ==2.5.3 - - etc ==0.2.0.0 - - etcd ==1.0.5 + - errors ==2.2.5 + - errors-ext ==0.4.1 + - error-util ==0.0.1.2 + - ersatz ==0.4.2 - ether ==0.5.1.0 - - euphoria ==0.8.0.0 + - euler-tour-tree ==0.1.0.1 - event ==0.1.4 - - eventful-core ==0.1.3 - - eventful-dynamodb ==0.1.3 - - eventful-memory ==0.1.3 - - eventful-postgresql ==0.1.3 - - eventful-sql-common ==0.1.3 - - eventful-sqlite ==0.1.3 - - eventful-test-helpers ==0.1.3 - - event-list ==0.1.1.3 - - eventstore ==0.15.0.2 + - eventful-core ==0.2.0 + - eventful-memory ==0.2.0 + - eventful-postgresql ==0.2.0 + - eventful-sql-common ==0.2.0 + - eventful-sqlite ==0.2.0 + - eventful-test-helpers ==0.2.0 + - event-list ==0.1.2 + - eventsource-api ==1.3.0 + - eventsource-geteventstore-store ==1.1.0 + - eventsource-store-specs ==1.1.1 + - eventsource-stub-store ==1.0.3 + - eventstore ==1.1.2 + - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - - exact-pi ==0.4.1.2 + - exact-pi ==0.4.1.3 - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 - exceptions ==0.8.3 - - exception-transformers ==0.4.0.5 + - exception-transformers ==0.4.0.6 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 - exhaustive ==1.1.5 - expiring-cache-map ==0.0.6.1 - - explicit-exception ==0.1.9 - - exp-pairs ==0.1.5.2 - - extensible ==0.4.6 - - extensible-effects ==1.11.1.0 + - explicit-exception ==0.1.9.2 + - exp-pairs ==0.1.6.0 + - extensible ==0.4.8 + - extensible-effects ==2.4.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.5.3 + - extra ==1.6.5 - extractable-singleton ==0.0.1 - - extract-dependencies ==0.2.0.1 + - extrapolate ==0.3.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fasta ==0.10.4.2 - fast-builder ==0.0.1.0 - fast-digits ==0.2.1.0 - - fast-logger ==2.4.10 - - fast-math ==1.0.2 - - fb ==1.1.1 - - fclabels ==2.0.3.2 - - fdo-notify ==0.3.1 + - fast-logger ==2.4.11 + - fb ==1.2.0 + - fclabels ==2.0.3.3 - feature-flags ==0.1.0.1 - - fedora-haskell-tools ==0.3 - - feed ==0.3.12.0 + - fedora-haskell-tools ==0.5.1 + - feed ==1.0.0.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - - fgl ==5.5.3.1 - - fgl-arbitrary ==0.2.0.3 - - filecache ==0.2.9 - - file-embed ==0.0.10 + - fgl ==5.6.0.0 + - filecache ==0.3.2 + - file-embed ==0.0.10.1 - filelock ==0.1.1.2 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 + - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - - fingertree ==0.1.2.1 + - fingertree ==0.1.4.1 - fingertree-psqueue ==0.3 - - finite-typelits ==0.1.2.0 + - finite-typelits ==0.1.3.0 + - fitspec ==0.4.4 - fixed ==0.2.1.1 - fixed-length ==0.2 - - fixed-vector ==0.9.0.0 - - fixed-vector-hetero ==0.3.1.2 + - fixed-vector ==1.1.0.0 + - fixed-vector-hetero ==0.4.0.0 - flac ==0.1.2 - flac-picture ==0.1.1 - - flat ==0.3 - flat-mcmc ==1.5.0 - flexible-defaults ==0.0.1.2 + - FloatingHex ==0.4 - floatshow ==0.2.4 - - flock ==0.3.1.8 - - flow ==1.0.9 - - fmlist ==0.9 - - fmt ==0.3.0.0 + - flow ==1.0.12 + - fmlist ==0.9.2 + - fmt ==0.5.0.0 - fn ==0.3.0.2 - focus ==0.1.5.2 - - fold-debounce ==0.2.0.6 - - fold-debounce-conduit ==0.1.0.5 - - foldl ==1.2.5 - - foldl-statistics ==0.1.4.6 + - fold-debounce ==0.2.0.7 + - fold-debounce-conduit ==0.2.0.1 + - foldl ==1.3.7 - folds ==0.7.4 + - follow-file ==0.0.2 - FontyFruity ==0.5.3.3 - force-layout ==0.4.0.6 - foreign-store ==0.2 - ForestStructures ==0.0.0.2 - forma ==0.2.0 - format-numbers ==0.1.0.0 - - formatting ==6.2.5 - - foundation ==0.0.17 - - Frames ==0.1.9 - - free ==4.12.4 + - formatting ==6.3.2 + - foundation ==0.0.20 + - FPretty ==1.1 + - Frames ==0.3.0.2 + - free ==5.0.1 - freenect ==1.2.1 - - freer ==0.2.4.1 - - freer-effects ==0.3.0.1 + - freer-simple ==1.1.0.0 - freetype2 ==0.1.2 - free-vl ==0.1.4 + - friday ==0.2.3.1 + - friday-juicypixels ==0.1.2.4 - friendly-time ==0.4.1 - - frisby ==0.2.1 + - frisby ==0.2.2 - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - fsnotify ==0.2.1.1 - fsnotify-conduit ==0.1.0.0 - - funcmp ==1.8 + - funcmp ==1.9 - functor-classes-compat ==1 - fuzzcheck ==0.1.1 - - fuzzy ==0.1.0.0 - - gauge ==0.1.3 + - fuzzyset ==0.1.0.6 + - gauge ==0.2.1 + - gc ==0.0.2 - gd ==3000.7.3 + - gdax ==0.6.0.0 - Genbank ==1.0.3 - - general-games ==1.0.5 + - general-games ==1.1.1 - generic-aeson ==0.2.0.9 - - generic-deriving ==1.11.2 - - generic-random ==0.5.0.0 - - generics-eot ==0.2.1.1 - - generics-sop ==0.3.1.0 + - generic-arbitrary ==0.1.0 + - generic-deriving ==1.12.1 + - generic-lens ==0.5.1.0 + - GenericPretty ==1.2.2 + - generic-random ==1.1.0.2 + - generics-eot ==0.2.1.2 + - generics-sop ==0.3.2.0 - generics-sop-lens ==0.1.2.1 - generic-xmlpickler ==0.1.0.5 - - geniplate-mirror ==0.7.5 - - getopt-generics ==0.13.0.1 - - ghc-events ==0.6.0 - - ghc-exactprint ==0.5.5.0 - - ghc-heap-view ==0.5.10 - - ghcid ==0.6.8 + - geniplate-mirror ==0.7.6 + - genvalidity ==0.4.0.4 + - genvalidity-aeson ==0.1.0.0 + - genvalidity-bytestring ==0.1.0.0 + - genvalidity-containers ==0.3.0.0 + - genvalidity-hspec ==0.5.0.0 + - genvalidity-hspec-aeson ==0.1.0.2 + - genvalidity-hspec-binary ==0.1.0.0 + - genvalidity-hspec-cereal ==0.1.0.0 + - genvalidity-hspec-hashable ==0.1.0.0 + - genvalidity-path ==0.2.0.2 + - genvalidity-property ==0.1.0.0 + - genvalidity-scientific ==0.1.0.0 + - genvalidity-text ==0.4.0.0 + - genvalidity-time ==0.1.0.1 + - genvalidity-unordered-containers ==0.1.0.0 + - genvalidity-uuid ==0.0.0.0 + - genvalidity-vector ==0.1.0.0 + - getopt-generics ==0.13.0.2 + - ghc-compact ==0.1.0.0 + - ghc-core ==0.5.6 + - ghc-events ==0.7.2 + - ghc-exactprint ==0.5.6.1 + - ghcid ==0.6.10 - ghcjs-base-stub ==0.1.0.4 - ghcjs-codemirror ==0.0.0.1 - ghcjs-perch ==0.3.3.2 + - ghc-parser ==0.2.0.2 - ghc-paths ==0.1.0.9 - - ghc-prof ==1.4.0.3 + - ghc-prof ==1.4.1.1 - ghc-syb-utils ==0.2.3.3 - - ghc-tcplugins-extra ==0.2.1 - - ghc-typelits-extra ==0.2.3 - - ghc-typelits-knownnat ==0.3.1 - - ghc-typelits-natnormalise ==0.5.4 - - gi-atk ==2.0.14 - - gi-cairo ==1.0.14 - - gi-gdk ==3.0.14 - - gi-gdkpixbuf ==2.0.14 - - gi-gio ==2.0.14 - - gi-glib ==2.0.14 - - gi-gobject ==2.0.15 - - gi-gtk ==3.0.17 - - gi-javascriptcore ==3.0.14 - - ginger ==0.5.3.0 - - gio ==0.13.3.1 - - gi-pango ==1.0.15 - - giphy-api ==0.5.2.0 - - gi-soup ==2.4.14 - - git ==0.2.0 - - github ==0.16.0 - - github-release ==1.0.7 + - ghc-tcplugins-extra ==0.2.4 + - ghc-typelits-extra ==0.2.4 + - ghc-typelits-knownnat ==0.4.1 + - ghc-typelits-natnormalise ==0.5.9 + - ghost-buster ==0.1.1.0 + - gi-atk ==2.0.15 + - gi-cairo ==1.0.15 + - gi-glib ==2.0.16 + - gi-gobject ==2.0.16 + - gi-javascriptcore ==4.0.15 + - ginger ==0.7.3.0 + - git ==0.2.1 + - github ==0.19 + - github-release ==1.1.6 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 - - gitlib ==3.1.1 - - gitlib-libgit2 ==3.1.1 - - gitlib-test ==3.1.0.3 + - github-webhooks ==0.9.1 - gitrev ==1.3.1 - - gitson ==0.5.2 - - gi-webkit ==3.0.14 - gl ==0.8.0 - - glabrous ==0.3.3 + - glabrous ==0.3.5 - glaze ==0.3.0.1 - glazier ==0.11.0.1 - glazier-pipes ==0.1.5.1 - - glazier-react ==0.6.0.0 - - glazier-react-widget ==0.6.0.0 - - GLFW-b ==1.4.8.1 + - GLFW-b ==1.4.8.3 - glib ==0.13.5.0 - - Glob ==0.8.0 + - Glob ==0.9.2 - glob-posix ==0.1.0.1 - gloss ==1.11.1.1 + - gloss-accelerate ==2.0.0.1 + - gloss-algorithms ==1.11.1.1 + - gloss-raster ==1.11.1.1 + - gloss-raster-accelerate ==2.0.0.0 - gloss-rendering ==1.11.1.1 - - GLURaw ==2.0.0.3 - - GLUT ==2.7.0.12 + - GLURaw ==2.0.0.4 + - GLUT ==2.7.0.13 - gluturtle ==0.0.58.1 - - gnuplot ==0.5.4.2 - - gogol ==0.3.0 - - gogol-adexchange-buyer ==0.3.0 - - gogol-adexchange-seller ==0.3.0 - - gogol-admin-datatransfer ==0.3.0 - - gogol-admin-directory ==0.3.0 - - gogol-admin-emailmigration ==0.3.0 - - gogol-admin-reports ==0.3.0 - - gogol-adsense ==0.3.0 - - gogol-adsense-host ==0.3.0 - - gogol-affiliates ==0.3.0 - - gogol-analytics ==0.3.0 - - gogol-android-enterprise ==0.3.0 - - gogol-android-publisher ==0.3.0 - - gogol-appengine ==0.3.0 - - gogol-apps-activity ==0.3.0 - - gogol-apps-calendar ==0.3.0 - - gogol-apps-licensing ==0.3.0 - - gogol-apps-reseller ==0.3.0 - - gogol-apps-tasks ==0.3.0 - - gogol-appstate ==0.3.0 - - gogol-autoscaler ==0.3.0 - - gogol-bigquery ==0.3.0 - - gogol-billing ==0.3.0 - - gogol-blogger ==0.3.0 - - gogol-books ==0.3.0 - - gogol-civicinfo ==0.3.0 - - gogol-classroom ==0.3.0 - - gogol-cloudmonitoring ==0.3.0 - - gogol-cloudtrace ==0.3.0 - - gogol-compute ==0.3.0 - - gogol-container ==0.3.0 - - gogol-core ==0.3.0 - - gogol-customsearch ==0.3.0 - - gogol-dataflow ==0.3.0 - - gogol-dataproc ==0.3.0 - - gogol-datastore ==0.3.0 - - gogol-debugger ==0.3.0 - - gogol-deploymentmanager ==0.3.0 - - gogol-dfareporting ==0.3.0 - - gogol-discovery ==0.3.0 - - gogol-dns ==0.3.0 - - gogol-doubleclick-bids ==0.3.0 - - gogol-doubleclick-search ==0.3.0 - - gogol-drive ==0.3.0 - - gogol-firebase-rules ==0.3.0 - - gogol-fitness ==0.3.0 - - gogol-fonts ==0.3.0 - - gogol-freebasesearch ==0.3.0 - - gogol-fusiontables ==0.3.0 - - gogol-games ==0.3.0 - - gogol-games-configuration ==0.3.0 - - gogol-games-management ==0.3.0 - - gogol-genomics ==0.3.0 - - gogol-gmail ==0.3.0 - - gogol-groups-migration ==0.3.0 - - gogol-groups-settings ==0.3.0 - - gogol-identity-toolkit ==0.3.0 - - gogol-kgsearch ==0.3.0 - - gogol-latencytest ==0.3.0 - - gogol-logging ==0.3.0 - - gogol-maps-coordinate ==0.3.0 - - gogol-maps-engine ==0.3.0 - - gogol-mirror ==0.3.0 - - gogol-monitoring ==0.3.0 - - gogol-oauth2 ==0.3.0 - - gogol-pagespeed ==0.3.0 - - gogol-partners ==0.3.0 - - gogol-people ==0.3.0 - - gogol-play-moviespartner ==0.3.0 - - gogol-plus ==0.3.0 - - gogol-plus-domains ==0.3.0 - - gogol-prediction ==0.3.0 - - gogol-proximitybeacon ==0.3.0 - - gogol-pubsub ==0.3.0 - - gogol-qpxexpress ==0.3.0 - - gogol-replicapool ==0.3.0 - - gogol-replicapool-updater ==0.3.0 - - gogol-resourcemanager ==0.3.0 - - gogol-resourceviews ==0.3.0 - - gogol-script ==0.3.0 - - gogol-sheets ==0.3.0 - - gogol-shopping-content ==0.3.0 - - gogol-siteverification ==0.3.0 - - gogol-spectrum ==0.3.0 - - gogol-sqladmin ==0.3.0 - - gogol-storage ==0.3.0 - - gogol-storage-transfer ==0.3.0 - - gogol-tagmanager ==0.3.0 - - gogol-taskqueue ==0.3.0 - - gogol-translate ==0.3.0 - - gogol-urlshortener ==0.3.0 - - gogol-useraccounts ==0.3.0 - - gogol-vision ==0.3.0 - - gogol-webmaster-tools ==0.3.0 - - gogol-youtube ==0.3.0 - - gogol-youtube-analytics ==0.3.0 - - gogol-youtube-reporting ==0.3.0 + - gnuplot ==0.5.5.2 + - goggles ==0.3.2 - google-cloud ==0.0.4 - google-oauth2-jwt ==0.2.2 - GPipe ==2.2.3 - - GPipe-GLFW ==1.4.1.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - - graphs ==0.7 - - graphviz ==2999.18.1.2 + - graphs ==0.7.1 - graph-wrapper ==0.2.5.1 - gravatar ==0.8.0 - graylog ==0.1.0.1 - groom ==0.1.2.1 - - groundhog ==0.8 + - groundhog ==0.8.0.1 - groundhog-inspector ==0.8.0.2 - - groundhog-mysql ==0.8 - - groundhog-postgresql ==0.8.0.1 - - groundhog-sqlite ==0.8 - - groundhog-th ==0.8.0.1 + - groundhog-mysql ==0.8.0.1 + - groundhog-postgresql ==0.8.0.3 + - groundhog-sqlite ==0.8.0.1 + - groundhog-th ==0.8.0.2 - group-by-date ==0.1.0.2 - - grouped-list ==0.2.1.3 - - groupoids ==4.0 - - groups ==0.4.0.0 - - gtk ==0.14.7 - - gtk2hs-buildtools ==0.13.3.0 - - gtk3 ==0.14.7 + - grouped-list ==0.2.2.0 + - groups ==0.4.1.0 + - gtk2hs-buildtools ==0.13.3.1 - H ==0.9.0.1 - h2c ==1.0.0 - - hackage-db ==1.22 - - hackage-security ==0.5.2.2 - - hackernews ==1.2.0.0 - - haddock ==2.17.4 - - haddock-api ==2.17.4 - - haddock-library ==1.4.3 - - haddock-test ==0.0.1 + - hackage-db ==2.0 + - hackage-security ==0.5.3.0 + - haddock-library ==1.4.5 - hailgun ==0.4.1.6 - hailgun-simple ==0.1.0.0 - - hakyll ==4.9.8.0 - - hakyll-favicon ==0.1.0 + - hakyll ==4.12.1.0 - half ==0.2.2.3 - - hamilton ==0.1.0.0 - - hamlet ==1.2.0 + - hamilton ==0.1.0.2 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.3.0 - - happstack-hsp ==7.3.7.3 + - hapistrano ==0.3.5.4 - happstack-jmacro ==7.0.12 - - happstack-server ==7.4.6.4 - - happstack-server-tls ==7.1.6.4 - - happy ==1.19.8 - - harp ==0.4.3 + - happstack-server ==7.5.1 + - happstack-server-tls ==7.1.6.5 + - happy ==1.19.9 - hasbolt ==0.1.3.0 - - hashable ==1.2.6.1 + - hashable ==1.2.7.0 - hashable-time ==0.2.0.1 - - hashmap ==1.3.2 - - hashtables ==1.2.2.1 - - haskeline ==0.7.4.0 - - haskell-gi ==0.20.3 - - haskell-gi-base ==0.20.4 - - haskell-gi-overloading ==1.0 - - haskell-import-graph ==1.0.3 + - hashids ==1.0.2.4 + - hashmap ==1.3.3 + - hashtables ==1.2.3.0 + - haskeline ==0.7.4.2 + - haskell-gi ==0.21.0 + - haskell-gi-base ==0.21.0 + - haskell-gi-overloading ==0.0 - haskell-lexer ==1.0.1 - - haskell-lsp ==0.1.0.0 + - haskell-lsp ==0.2.0.1 + - haskell-lsp-client ==1.0.0.1 + - haskell-names ==0.9.1 - haskell-neo4j-client ==0.3.2.4 - HaskellNet ==0.5.1 - HaskellNet-SSL ==0.3.4.0 - - haskell-packages ==0.5 - haskell-spacegoo ==0.2.0.1 - - haskell-src ==1.0.2.0 - - haskell-src-exts ==1.18.2 - - haskell-src-exts-simple ==1.19.0.0 - - haskell-src-exts-util ==0.2.1.2 - - haskell-src-meta ==0.8.0.1 - - haskell-tools-ast ==0.8.1.0 - - haskell-tools-backend-ghc ==0.8.1.0 - - haskell-tools-cli ==0.8.0.0 - - haskell-tools-daemon ==0.8.1.0 - - haskell-tools-debug ==0.8.1.0 - - haskell-tools-demo ==0.8.1.0 - - haskell-tools-prettyprint ==0.8.1.0 - - haskell-tools-refactor ==0.8.1.0 - - haskell-tools-rewrite ==0.8.1.0 - - haskintex ==0.7.0.1 - - hasmin ==0.3.3.1 - - hasql ==0.19.18.2 + - haskell-src ==1.0.3.0 + - haskell-src-exts ==1.20.2 + - haskell-src-exts-util ==0.2.2 + - haskell-src-meta ==0.8.0.2 + - haskell-tools-ast ==1.0.1.1 + - haskell-tools-backend-ghc ==1.0.1.1 + - haskell-tools-prettyprint ==1.0.1.1 + - haskell-tools-refactor ==1.0.1.2 + - haskell-tools-rewrite ==1.0.1.1 + - haskintex ==0.8.0.0 + - hasmin ==1.0.2 + - hasql ==1.1.1 - hasql-migration ==0.1.3 + - hasql-optparse-applicative ==0.3 - hasql-pool ==0.4.3 - - hasql-transaction ==0.5.2 + - hasql-transaction ==0.6 - hastache ==0.6.1 - - hasty-hamiltonian ==1.3.0 - - HaTeX ==3.17.3.1 - - hatex-guide ==1.3.1.6 + - hasty-hamiltonian ==1.3.2 + - HaTeX ==3.18.0.0 - haxl ==0.5.1.0 - - haxl-amazonka ==0.1.1 - HaXml ==1.25.4 - haxr ==3000.11.2 - hbeanstalk ==0.2.4 - Hclip ==3.0.0.4 - HCodecs ==0.5 - - hcwiid ==0.0.6.1 - - hdaemonize ==0.5.4 + - hdaemonize ==0.5.5 - HDBC ==2.4.0.2 - HDBC-mysql ==0.7.1.0 - HDBC-session ==0.1.1.1 - - hdevtools ==0.1.6.0 - - hdocs ==0.5.2.1 - - heap ==1.0.3 - - heaps ==0.3.5 + - hdevtools ==0.1.6.1 + - heap ==1.0.4 + - heaps ==0.3.6 - heatshrink ==0.1.0.0 - hebrew-time ==0.1.1 - - hedgehog ==0.5 + - hedgehog ==0.5.3 - hedgehog-quickcheck ==0.1 - - hedis ==0.9.11 - - here ==1.2.11 + - hedis ==0.10.1 + - heist ==1.0.1.2 + - here ==1.2.13 - heredoc ==0.2.0.0 - - heterocephalus ==1.0.5.1 + - herms ==1.8.1.4 + - heterocephalus ==1.0.5.2 - hex ==0.1.2 - hexml ==0.3.3 + - hexml-lens ==0.2.1 - hexpat ==0.20.13 - hexstring ==0.11.1 - hformat ==0.3.1.0 - hfsevents ==0.1.6 - hid ==0.2.2 - hidapi ==0.1.4 - - hidden-char ==0.1.0.1 + - hidden-char ==0.1.0.2 - hierarchical-clustering ==0.4.6 + - higher-leveldb ==0.5.0.1 - highjson ==0.4.0.0 - highjson-swagger ==0.4.0.0 - highjson-th ==0.4.0.0 - - highlight ==1.0.0.1 - highlighting-kate ==0.6.4 - hinotify ==0.3.9 - hint ==0.7.0 - - hinterface ==0.5.0.2 - histogram-fill ==0.8.5.0 - hit ==0.6.3 - hjsmin ==0.2.0.2 - - hjsonpointer ==1.2.0 - - hjsonschema ==1.6.3 + - hjsonpointer ==1.3.0 + - hjsonschema ==1.7.2 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.6.1 - - hlint ==2.0.10 - - hmatrix ==0.18.0.0 - - hmatrix-gsl ==0.18.0.1 + - hmatrix ==0.18.2.0 + - hmatrix-backprop ==0.1.2.0 + - hmatrix-gsl ==0.18.2.0 - hmatrix-gsl-stats ==0.4.1.7 + - hmatrix-morpheus ==0.1.1.1 + - hmatrix-repa ==0.1.2.2 - hmatrix-special ==0.4.0.1 - - hmpfr ==0.4.3 - - hoauth2 ==1.3.0 + - hmatrix-vector-sized ==0.1.1.0 + - hmpfr ==0.4.4 - hocilib ==0.2.0 - - holy-project ==0.2.0.1 + - Hoed ==0.5.1 + - hOpenPGP ==2.6 - hopfli ==0.2.2.1 - - hosc ==0.15 + - hosc ==0.16 - hostname ==1.0 - hostname-validate ==1.0.0 - - hourglass ==0.2.10 + - hourglass ==0.2.11 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.8.0.2 + - hpack ==0.27.0 - hpc-coveralls ==1.0.10 - - hPDB ==1.2.0.9 - - hPDB-examples ==1.2.0.7 - HPDF ==1.4.10 - - hpio ==0.8.0.10 - - hpp ==0.4.1 - - hpqtypes ==1.5.1.1 + - hpio ==0.9.0.6 + - hpp ==0.5.2 + - hpqtypes ==1.5.2.0 - hquantlib ==0.0.4.0 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - - hruby ==0.3.4.4 - - hsass ==0.4.2 + - hruby ==0.3.5.1 + - hsass ==0.5.0 - hsb2hs ==0.3.1 - - hs-bibutils ==5.5 - - hscolour ==1.24.1 - - hscurses ==1.4.2.0 - - hsdev ==0.2.5.1 - - hsdns ==1.7 + - hs-bibutils ==6.2.0.1 + - hscolour ==1.24.4 + - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - - hse-cpp ==0.2 - hsemail ==2 - HSet ==0.0.1 - hset ==2.2.0 - - hsexif ==0.6.1.4 + - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 - hsinstall ==1.6 + - HSlippyMap ==3.0 - hslogger ==1.2.10 - - hslua ==0.4.1 - - hslua-aeson ==0.1.0.4 + - hslua ==0.9.5.1 + - hslua-aeson ==0.3.0.1 + - hslua-module-text ==0.1.2.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.4.11 + - HsOpenSSL ==0.11.4.13 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.4.4 + - hspec ==2.4.8 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.4.0 - - hspec-core ==2.4.4 - - hspec-discover ==2.4.4 + - hspec-core ==2.4.8 + - hspec-discover ==2.4.8 - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.4 - - hspec-golden-aeson ==0.2.1.0 - - hspec-megaparsec ==0.3.1 - - hspec-meta ==2.4.4 + - hspec-golden-aeson ==0.5.1.0 + - hspec-megaparsec ==1.0.0 + - hspec-meta ==2.4.6 - hspec-pg-transact ==0.1.0.2 - - hspec-setup ==0.2.1.0 - - hspec-smallcheck ==0.4.2 - - hspec-wai ==0.8.0 - - hspec-wai-json ==0.8.0 + - hspec-smallcheck ==0.5.0 + - hspec-wai ==0.9.0 + - hspec-wai-json ==0.9.0 - hspec-webdriver ==1.2.0 - - hsshellscript ==3.4.1 + - hsshellscript ==3.4.5 - hstatistics ==0.3 - hstatsd ==0.1 - - HStringTemplate ==0.8.6 + - HStringTemplate ==0.8.7 - HSvm ==0.1.0.3.22 - - hsx2hs ==0.14.1.1 - hsx-jmacro ==7.3.8 - hsyslog ==5.0.1 + - hsyslog-udp ==0.2.2 - htaglib ==1.1.1 - - HTF ==0.13.2.2 + - HTF ==0.13.2.4 - html ==1.0.1.2 - - html-conduit ==1.2.1.2 + - html-conduit ==1.3.0 - html-email-validate ==0.2.0.0 + - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - HTTP ==4000.3.7 + - HTTP ==4000.3.11 - http2 ==1.6.3 - - http-api-data ==0.3.7.1 - - http-client ==0.5.7.0 + - http-api-data ==0.3.7.2 + - http-client ==0.5.12 - http-client-openssl ==0.2.1.1 - - http-client-tls ==0.3.5.1 + - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - - http-conduit ==2.2.3.2 + - http-conduit ==2.3.1 - http-date ==0.0.6.1 - - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3 - - http-media ==0.6.4 - - http-reverse-proxy ==0.4.5 - - http-streams ==0.8.5.3 - - http-types ==0.9.1 + - http-media ==0.7.1.2 + - http-reverse-proxy ==0.5.0.1 + - http-streams ==0.8.5.5 + - http-types ==0.12.1 - human-readable-duration ==0.2.0.3 - - HUnit ==1.5.0.0 + - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==0.6.0.0 + - hunit-dejafu ==1.1.0.3 - hvect ==0.4.0.0 - - hw-balancedparens ==0.1.0.2 - - hw-bits ==0.5.0.3 + - hw-balancedparens ==0.2.0.1 + - hw-bits ==0.7.0.2 + - hw-conduit ==0.2.0.3 - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 - - hw-excess ==0.1.0.1 + - hw-excess ==0.2.0.0 + - hw-fingertree ==0.1.0.1 + - hw-fingertree-strict ==0.1.0.3 + - hw-hedgehog ==0.1.0.1 + - hw-hspec-hedgehog ==0.1.0.3 - hw-int ==0.0.0.3 + - hw-json ==0.6.0.0 + - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.4.0.5 - - hw-rankselect ==0.8.0.2 + - hw-prim ==0.5.0.0 + - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.2.0.2 - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 + - hw-xml ==0.1.0.3 - hxt ==9.3.1.16 - hxt-charproperties ==9.2.0.1 - hxt-css ==0.1.0.3 @@ -1182,300 +1029,324 @@ default-package-overrides: - hxt-regex-xmlschema ==9.2.0.3 - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - - hybrid-vectors ==0.2.1 + - hybrid-vectors ==0.2.2 - hyperloglog ==0.4.2 - - hyphenation ==0.7 - - ical ==0.0.1 + - hyphenation ==0.7.1 - iconv ==0.4.1.3 - 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 - - ihs ==0.1.0.1 + - ihaskell ==0.9.0.3 + - ihs ==0.1.0.2 - ilist ==0.3.1.0 - imagesize-conduit ==1.1 - Imlib ==0.1.2 - - imm ==1.2.0.0 - immortal ==0.2.2.1 + - imprint ==0.0.1.0 - include-file ==0.1.0.3 - - incremental-parser ==0.2.5.2 + - incremental-parser ==0.2.5.3 - indentation-core ==0.0.0.1 - indentation-parsec ==0.0.0.1 - - indents ==0.4.0.0 - - inflections ==0.3.0.0 - - ini ==0.3.5 - - inline-c ==0.5.6.1 - - inline-c-cpp ==0.1.0.0 - - inline-java ==0.6.5 - - inline-r ==0.9.0.2 + - indents ==0.4.0.1 + - indexed-list-literals ==0.1.0.1 + - inflections ==0.4.0.1 + - influxdb ==1.3.0.1 + - ini ==0.3.6 + - inline-c ==0.6.0.5 + - inline-c-cpp ==0.2.1.0 + - inline-java ==0.8.2 + - inline-r ==0.9.1 - insert-ordered-containers ==0.2.1.0 + - inspection-testing ==0.2.0.1 - instance-control ==0.1.2.0 - - integer-logarithms ==1.0.2 + - integer-logarithms ==1.0.2.1 - integration ==0.2.1 - - intero ==0.1.23 - - interpolate ==0.1.1 + - intern ==0.9.2 + - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.0 - - interpolation ==0.1.0.1 + - interpolation ==0.1.0.2 - IntervalMap ==0.5.3.1 - intervals ==0.8.1 - - intro ==0.3.0.1 - - invariant ==0.4.3 - - invertible ==0.2.0.2 + - intro ==0.3.1.0 + - invariant ==0.5 + - invertible ==0.2.0.4 - io-choice ==0.0.6 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.4.1.0 + - io-streams ==1.5.0.1 - io-streams-haproxy ==1.0.0.2 + - ip ==1.1.2 - ip6addr ==0.5.3 - - iproute ==1.7.1 - - IPv6Addr ==1.0.1 - - IPv6DB ==0.2.3 + - iproute ==1.7.3 + - IPv6Addr ==1.0.2 + - IPv6DB ==0.2.6 + - ipython-kernel ==0.9.0.2 - irc ==0.6.1.0 - - irc-client ==0.4.4.4 - - irc-conduit ==0.2.2.4 + - irc-client ==1.1.0.2 + - irc-conduit ==0.3.0.1 - irc-ctcp ==0.1.3.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.5.0.1 - iterable ==3.0 + - ixset ==1.0.7 - ixset-typed ==0.3.1.1 - ix-shapable ==0.1.0 - - jack ==0.7.1.1 - - jailbreak-cabal ==1.3.2 + - jack ==0.7.1.3 - javascript-extras ==0.3.2.0 - jmacro ==0.6.14 - jmacro-rpc ==0.3.2 - jmacro-rpc-happstack ==0.3.2 - jmacro-rpc-snap ==0.3 - - jni ==0.3.1 + - jni ==0.6.0 - jose ==0.6.0.3 - - jose-jwt ==0.7.7 + - jose-jwt ==0.7.8 - js-flot ==0.8.3 - - js-jquery ==3.2.1 - - json ==0.9.1 + - js-jquery ==3.3.1 + - json ==0.9.2 + - json-autotype ==1.0.18 - json-builder ==0.3 - - json-rpc-generic ==0.2.1.2 + - json-rpc-generic ==0.2.1.3 - json-schema ==0.7.4.1 - - json-stream ==0.4.1.5 - - JuicyPixels ==3.2.9.1 - - JuicyPixels-extra ==0.2.2 + - json-stream ==0.4.2.3 + - JuicyPixels ==3.2.9.5 + - JuicyPixels-extra ==0.3.0 - JuicyPixels-scale-dct ==0.1.1.2 - - jvm ==0.2.2 - - jvm-streaming ==0.2 + - justified-containers ==0.3.0.0 + - jvm ==0.4.2 + - jvm-batching ==0.1.1 + - jvm-streaming ==0.3.1 - jwt ==0.7.2 - - kan-extensions ==5.0.2 - - kansas-comet ==0.4 - - katip ==0.5.1.0 + - kan-extensions ==5.1 + - kanji ==3.1.0.1 + - katydid ==0.1.1.0 - kawhi ==0.3.0 - kdt ==0.2.4 - - keter ==1.4.3.2 - keycode ==0.2.2 - - keys ==3.11 + - keys ==3.12 - kmeans ==0.1.3 - knob ==0.1.1 - koofr-client ==1.0.0.3 - - kraken ==0.0.3 + - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==0.4.6 + - lackey ==1.0.2 + - lambdabot-core ==5.1.0.1 + - lambdabot-irc-plugins ==5.1.0.1 - lame ==0.1.1 - - language-c ==0.6.1 + - language-c ==0.7.2 - language-c-quote ==0.12.1 - - language-dockerfile ==0.3.6.0 + - language-docker ==2.0.1 - language-ecmascript ==0.17.2.0 - language-fortran ==0.5.1 - language-glsl ==0.2.1 - language-haskell-extract ==0.2.4 - - language-java ==0.2.8 - - language-javascript ==0.6.0.10 - - language-lua2 ==0.1.0.5 - - language-puppet ==1.3.8.1 - - language-python ==0.5.4 - - language-thrift ==0.10.0.0 + - language-java ==0.2.9 + - language-javascript ==0.6.0.11 + - language-puppet ==1.3.17 + - lapack-carray ==0.0.2 + - lapack-ffi ==0.0.2 + - lapack-ffi-tools ==0.1.0.1 + - large-hashable ==0.1.0.4 - largeword ==1.2.5 - latex ==0.1.0.3 - - lattices ==1.5.0 + - lattices ==1.7.1 - lazyio ==0.1.0.4 - - lca ==0.3 - - leancheck ==0.6.7 - - leapseconds-announced ==2017 - - lens ==4.15.4 - - lens-action ==0.2.2 + - lca ==0.3.1 + - leancheck ==0.7.0 + - leapseconds-announced ==2017.1.0.1 + - lens ==4.16.1 + - lens-accelerate ==0.1.0.0 + - lens-action ==0.2.3 - lens-aeson ==1.0.2 - lens-datetime ==0.3 - - lens-family ==1.2.1 - - lens-family-core ==1.2.1 + - lens-family ==1.2.2 + - lens-family-core ==1.2.2 - lens-family-th ==0.5.0.1 - lens-labels ==0.1.0.2 + - lens-properties ==4.11.1 - lens-regex ==0.1.0 - lens-simple ==0.1.0.9 - - lentil ==1.0.9.0 + - lentil ==1.0.11.3 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.1 - - lhs2tex ==1.19 - libffi ==0.1 - libgit ==0.3.1 + - libgraph ==1.14 - libinfluxdb ==0.0.4 - - libmpd ==0.9.0.7 - - libnotify ==0.2 - - librato ==0.2.0.1 + - libmpd ==0.9.0.8 + - liboath-hs ==0.0.1.0 - libsystemd-journal ==1.4.2 - libxml-sax ==0.7.5 - LibZip ==1.0.1 - - licensor ==0.2.1 - - lifted-async ==0.9.3 - - lifted-base ==0.2.3.11 - - lift-generics ==0.1.1 - - line ==3.1.0 + - licensor ==0.2.2 + - lifted-async ==0.9.3.3 + - lifted-base ==0.2.3.12 + - lift-generics ==0.1.2 + - line ==4.0.1 - linear ==1.20.7 - - linear-accelerate ==0.4.1 + - linear-accelerate ==0.5.0.1 - linked-list-with-iterator ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.2.0 - List ==0.6.2 - - list-fusion-probe ==0.1.0.6 - - ListLike ==4.5.1 - - list-prompt ==0.1.1.0 + - ListLike ==4.6 - listsafe ==0.1.0.1 - - list-t ==1.0.0.1 - - llvm-hs ==4.2.0 - - llvm-hs-pure ==4.1.0.0 + - list-t ==1.0.1 + - llvm-hs ==5.1.3 + - llvm-hs-pure ==5.1.2 - lmdb ==0.2.5 - - loch-th ==0.2.1 + - load-env ==0.1.2 + - loch-th ==0.2.2 + - lockfree-queue ==0.2.3.1 - log ==0.9.0.1 - log-base ==0.7.4.0 - - log-domain ==0.11.2 + - log-domain ==0.12 - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.2.1 + - logging-effect ==1.2.5 + - logging-effect-extra ==1.2.2 + - logging-effect-extra-file ==1.1.2 + - logging-effect-extra-handler ==1.1.4 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.2 - log-postgres ==0.7.0.2 + - log-warper ==1.8.11 - loop ==0.3.0 - lrucache ==1.2.0.0 - - lrucaching ==0.3.2 - - lucid ==2.9.9 - - lucid-svg ==0.7.0.0 - - lzma-conduit ==1.1.3.3 + - lrucaching ==0.3.3 + - lucid ==2.9.10 + - lxd-client ==0.1.0.6 + - lxd-client-config ==0.1.0.1 + - lzma ==0.0.0.3 + - lzma-conduit ==1.2.1 - machines ==0.6.3 - machines-binary ==0.3.0.3 - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - - machines-process ==0.2.0.8 - - magic ==1.1 - - magicbane ==0.1.3 - mainland-pretty ==0.6.1 - - makefile ==1.0.0.4 - - managed ==1.0.5 - - mandrill ==0.5.3.2 - - markdown ==0.1.16 - - markdown-unlit ==0.4.0 + - makefile ==1.1.0.0 + - managed ==1.0.6 + - mandrill ==0.5.3.3 + - mapquest-api ==0.3.1 + - map-syntax ==0.2.0.2 + - markdown ==0.1.17.1 + - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - markup ==3.1.0 - - marvin ==0.2.5 + - markup ==4.0.4 - marvin-interpolate ==1.1.2 + - massiv ==0.1.6.1 + - massiv-io ==0.1.2.0 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 - - matplotlib ==0.5.0 + - matplotlib ==0.6.0 - matrices ==0.4.5 - matrix ==0.3.5.0 - matrix-market-attoparsec ==0.1.0.8 - maximal-cliques ==0.1.1 - mbox ==0.3.4 - mbox-utility ==0.0.1 + - mbtiles ==0.6.0.0 - mcmc-types ==1.0.3 - - mediabus ==0.4.0.1 - - mediabus-rtp ==0.4.0.1 - median-stream ==0.7.0.0 - med-module ==0.1.1 - - megaparsec ==5.3.1 - - mega-sdist ==0.3.0.2 - - memory ==0.14.8 - - MemoTrie ==0.6.8 + - megaparsec ==6.4.1 + - memory ==0.14.16 + - MemoTrie ==0.6.9 + - mercury-api ==0.1.0.1 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 - messagepack-rpc ==0.5.1 - metrics ==0.4.1.1 - MFlow ==0.4.6.0 - - mfsolve ==0.3.2.0 - microformats2-parser ==1.0.1.7 - - microlens ==0.4.8.1 - - microlens-aeson ==2.2.0.2 + - microlens ==0.4.8.3 + - microlens-aeson ==2.3.0 - microlens-contra ==0.1.0.1 - microlens-ghc ==0.4.8.0 - - microlens-mtl ==0.1.11.0 + - microlens-mtl ==0.1.11.1 - microlens-platform ==0.3.9.0 - - microlens-th ==0.4.1.1 + - microlens-th ==0.4.1.3 + - microspec ==0.1.0.0 - microstache ==1.0.1.1 - - midi ==0.2.2.1 - - midi-music-box ==0.0.0.4 + - midi ==0.2.2.2 - mighty-metropolis ==1.2.0 + - milena ==0.5.2.1 - mime-mail ==0.4.14 - - mime-mail-ses ==0.3.2.3 + - mime-mail-ses ==0.4.0.0 - mime-types ==0.1.0.7 - - minio-hs ==0.3.1 + - minimorph ==0.1.6.1 + - miniutter ==0.4.7.0 - mintty ==0.1.1 - - miso ==0.4.0.0 + - misfortune ==0.1.1.2 + - miso ==0.14.0.0 - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 - - mixed-types-num ==0.2.0.1 + - mixed-types-num ==0.3.1.4 - mltool ==0.1.0.2 - mmap ==0.5.9 - - mmorph ==1.0.9 + - mmark ==0.0.5.6 + - mmark-cli ==0.0.3.0 + - mmark-ext ==0.2.0.0 + - mmorph ==1.1.2 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - - model ==0.3 - - modify-fasta ==0.8.2.3 - - monad-control ==1.0.2.2 - - monad-control-aligned ==0.0.1 - - monad-coroutine ==0.9.0.3 - - monadcryptorandom ==0.7.1 + - model ==0.4.4 + - modern-uri ==0.2.1.0 + - modify-fasta ==0.8.3.0 + - moesocks ==1.0.0.44 + - mole ==0.0.6 + - monad-control ==1.0.2.3 + - monad-control-aligned ==0.0.1.1 + - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 - - monad-http ==0.1.0.0 - monadic-arrays ==0.2.2 - - monad-journal ==0.7.2 + - monad-journal ==0.8.1 - monadloc ==0.7.1 - - monad-logger ==0.3.25.1 + - monad-logger ==0.3.28.4 - monad-logger-json ==0.1.0.0 - - monad-logger-prefix ==0.1.6 + - monad-logger-prefix ==0.1.9 - monad-logger-syslog ==0.1.4.0 - monad-loops ==0.4.3 - - monad-metrics ==0.1.0.2 + - monad-memo ==0.4.1 + - monad-metrics ==0.2.1.1 + - monad-mock ==0.2.0.0 + - monadoid ==0.0.2 - monad-par ==0.3.4.8 - - monad-parallel ==0.7.2.2 + - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 - monad-peel ==0.2.1.2 - monadplus ==1.4.2 - monad-products ==4.0.1 - MonadPrompt ==1.0.0.5 - MonadRandom ==0.5.1 + - monad-recorder ==0.1.1 - monad-skeleton ==0.1.5 + - monad-st ==0.2.4.1 - monads-tf ==0.1.0.3 - monad-time ==0.2 - monad-unlift ==0.2.0 - - monad-unlift-ref ==0.2.0 - - mongoDB ==2.3.0 - - monoidal-containers ==0.3.0.2 - - monoid-extras ==0.4.2 - - monoid-subclasses ==0.4.4 - - monoid-transformer ==0.0.3 - - mono-traversable ==1.0.4.0 + - monad-unlift-ref ==0.2.1 + - mongoDB ==2.3.0.5 + - monoidal-containers ==0.3.1.0 + - monoid-extras ==0.4.4 + - monoid-subclasses ==0.4.6 + - monoid-transformer ==0.0.4 + - mono-traversable ==1.0.8.1 - mono-traversable-instances ==0.1.0.0 - - morte ==1.6.11 + - morte ==1.6.18 - mountpoints ==1.0.2 - mstate ==0.2.7 - - mtl ==2.2.1 + - mtl ==2.2.2 - mtl-compat ==0.2.1.3 - mtl-prelude ==2.0.3.1 - multiarg ==0.30.0.10 @@ -1484,144 +1355,146 @@ default-package-overrides: - multiset ==0.3.3 - multistate ==0.7.1.2 - murmur-hash ==0.1.0.9 - - mushu ==0.1.1 - - MusicBrainz ==0.3.1 - - mustache ==2.2.3 - - mutable-containers ==0.3.3 - - mwc-probability ==1.3.0 + - mustache ==2.3.0 + - mutable-containers ==0.3.4 + - mwc-probability ==2.0.2 - mwc-random ==0.13.6.0 - - mysql ==0.1.4 - - mysql-haskell ==0.8.0.0 - - mysql-haskell-openssl ==0.8.0.0 - - mysql-simple ==0.4.4 + - mwc-random-accelerate ==0.1.0.0 + - mysql ==0.1.5 + - mysql-haskell ==0.8.3.0 + - mysql-haskell-nem ==0.1.0.0 + - mysql-haskell-openssl ==0.8.3.0 + - mysql-simple ==0.4.5 - nagios-check ==0.3.2 - names-th ==0.2.0.3 - nano-erl ==0.1.0.1 - - nanospec ==0.2.1 + - nanospec ==0.2.2 - naqsha ==0.2.0.1 - - nats ==1.1.1 + - nats ==1.1.2 - natural-sort ==0.1.2 - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.1 + - netlib-carray ==0.0.1.1 + - netlib-ffi ==0.0.1 - netpbm ==1.0.2 - - netwire ==5.0.2 - - netwire-input ==0.0.6 - - netwire-input-glfw ==0.0.6 - - network ==2.6.3.2 + - nettle ==0.2.0 + - netwire ==5.0.3 + - netwire-input ==0.0.7 + - netwire-input-glfw ==0.0.10 + - network ==2.6.3.5 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 - - network-carbon ==1.0.10 - - network-conduit-tls ==1.2.2 + - network-carbon ==1.0.11 + - network-conduit-tls ==1.3.0 - network-house ==0.1.0.2 - - network-info ==0.2.0.8 + - network-info ==0.2.0.10 - network-ip ==0.3.0.2 - - network-msgpack-rpc ==0.0.3 - network-multicast ==0.2.0 - - Network-NineP ==0.4.1 + - Network-NineP ==0.4.2 - network-simple ==0.4.0.5 - - network-transport ==0.4.4.0 - - network-transport-composed ==0.2.0.1 + - network-transport ==0.5.2 + - network-transport-composed ==0.2.1 - network-transport-inmemory ==0.5.2 - - network-transport-tcp ==0.5.1 + - network-transport-tcp ==0.6.0 - network-transport-tests ==0.2.4.2 - network-uri ==2.6.1.0 - newtype ==0.2 - - newtype-generics ==0.5.1 + - newtype-generics ==0.5.3 - next-ref ==0.1.0.2 - nfc ==0.1.0 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - - nix-paths ==1.0.0.1 - - nonce ==1.0.4 + - nix-paths ==1.0.1 + - NoHoed ==0.1.1 + - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3 - non-empty-sequence ==0.2.0.2 - - non-negative ==0.1.1.2 + - non-negative ==0.1.2 + - normalization-insensitive ==2.0.1 - NoTrace ==0.3.0.2 - - nsis ==0.3.1 + - nsis ==0.3.2 + - n-tuple ==0.0.2.0 - numbers ==3000.2.0.1 - numeric-extras ==0.1 - - numeric-prelude ==0.4.2 - - numeric-quest ==0.2.0.1 - - numhask ==0.0.9 - - numhask-range ==0.0.4 + - numeric-prelude ==0.4.3 + - numhask ==0.1.4.0 + - numhask-range ==0.1.3.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.1 - - nvim-hs ==0.2.4 - - nvim-hs-contrib ==0.2.0 - - nvim-hs-ghcid ==0.2.0 - - oanda-rest-api ==0.4.1 - - objective ==1.1.1 + - nvvm ==0.8.0.3 + - oauthenticated ==0.2.1.0 + - objective ==1.1.2 - ObjectName ==1.1.0.1 - - octane ==0.20.2 - - Octree ==0.5.4.3 + - ochintin-daicho ==0.1.0.1 + - o-clock ==0.1.1 - 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 + - one-liner ==0.9.2 + - one-liner-instances ==0.1.1.0 - OneTuple ==0.2.1 - - online ==0.2.0 + - online ==0.2.1.0 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.5.4.0 - - opaleye-trans ==0.3.7 + - opaleye ==0.6.1.0 - OpenAL ==1.7.0.4 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.1 - - OpenGL ==3.0.2.0 - - OpenGLRaw ==3.2.5.0 - - openpgp-asciiarmor ==0.1 + - OpenGL ==3.0.2.1 + - OpenGLRaw ==3.2.7.0 + - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.3 - open-witness ==0.4.0.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - - opml-conduit ==0.6.0.3 - - optional-args ==1.0.1 + - opml-conduit ==0.6.0.4 + - optional-args ==1.0.2 - options ==1.2.1.1 - - optparse-applicative ==0.13.2.0 - - optparse-generic ==1.2.2 - - optparse-helper ==0.2.1.1 - - optparse-simple ==0.0.4 + - optparse-applicative ==0.14.2.0 + - optparse-generic ==1.3.0 + - optparse-simple ==0.1.0 - optparse-text ==0.1.1.0 - - osdkeys ==0.0 - - overloaded-records ==0.4.2.0 + - overhang ==1.0.0 - package-description-remote ==0.2.0.0 - - packdeps ==0.4.3 - - packunused ==0.1.2 + - packdeps ==0.4.4 - pager ==0.1.1.0 - pagerduty ==0.0.8 - pagination ==0.2.1 - palette ==0.1.0.5 - - pandoc ==1.19.2.4 - - pandoc-citeproc ==0.10.5.1 - - pandoc-types ==1.17.0.5 + - pandoc ==2.1.2 + - pandoc-citeproc ==0.14.3 + - pandoc-types ==1.17.3.1 - pango ==0.13.4.0 - - papillon ==0.1.0.4 + - papillon ==0.1.0.5 - parallel ==3.2.1.1 - parallel-io ==0.3.3 - parseargs ==0.2.0.8 - - parsec ==3.1.11 + - parsec ==3.1.13.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==0.1.0 - - parsers ==0.12.7 - - partial-handler ==1.0.2 + - parser-combinators ==0.4.0 + - parsers ==0.12.8 + - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-order ==0.1.2.1 - - patat ==0.5.2.2 - - path ==0.5.13 - - path-extra ==0.0.5 - - path-io ==1.2.2 + - partial-semigroup ==0.3.0.3 + - path ==0.6.1 + - path-extra ==0.0.6 + - path-io ==1.3.3 - path-pieces ==0.2.1 - - pathtype ==0.8 + - path-text-utf8 ==0.0.1.0 + - pathtype ==0.8.1 - pathwalk ==0.3.1.2 - patience ==0.1.1 - pattern-arrows ==0.0.2 + - pcf-font ==0.2.2.0 + - pcf-font-embed ==0.1.2.0 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.0.4 - pcre-utils ==0.1.8.1.1 @@ -1629,19 +1502,21 @@ default-package-overrides: - pdf-toolbox-content ==0.0.5.1 - pdf-toolbox-core ==0.0.4.1 - pdf-toolbox-document ==0.0.7.1 - - pem ==0.2.2 - - perf ==0.1.2 - - persistable-record ==0.5.1.1 + - pell ==0.1.1.0 + - pem ==0.2.4 + - perf ==0.3.1.1 + - perfect-hash-generator ==0.2.0.6 + - persistable-record ==0.6.0.3 - persistable-types-HDBC-pg ==0.0.1.5 - - persistent ==2.7.1 - - persistent-mongoDB ==2.6.0 - - persistent-mysql ==2.6.2.1 - - persistent-mysql-haskell ==0.3.0.0 - - persistent-postgresql ==2.6.2 - - persistent-redis ==2.5.2 + - persistent ==2.8.2 + - persistent-mongoDB ==2.8.0 + - persistent-mysql ==2.8.1 + - persistent-mysql-haskell ==0.4.0 + - persistent-postgresql ==2.8.2.0 + - persistent-redis ==2.5.2.2 - persistent-refs ==0.4 - - persistent-sqlite ==2.6.3 - - persistent-template ==2.5.3 + - persistent-sqlite ==2.8.1.2 + - persistent-template ==2.5.4 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 - phantom-state ==0.2.1.2 @@ -1649,59 +1524,55 @@ default-package-overrides: - picoparsec ==0.1.2.3 - picosat ==0.1.4 - pid1 ==0.1.2.0 - - pinboard ==0.9.12.6 + - pinboard ==0.9.12.9 - pinch ==0.3.2.0 - - pinchot ==0.24.0.0 - - pipes ==4.3.6 + - pipes ==4.3.9 + - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-bytestring ==2.1.6 - - pipes-cacophony ==0.5.0 - - pipes-category ==0.2.0.1 - - pipes-concurrency ==2.0.8 - - pipes-extras ==1.0.12 - - pipes-fluid ==0.5.0.3 - - pipes-group ==1.0.8 - - pipes-misc ==0.3.0.0 + - pipes-category ==0.3.0.0 + - pipes-concurrency ==2.0.10 + - pipes-csv ==1.4.3 + - pipes-extras ==1.0.13 + - pipes-fastx ==0.3.0.0 + - pipes-fluid ==0.6.0.0 + - pipes-group ==1.0.9 + - pipes-misc ==0.4.0.1 - pipes-mongodb ==0.1.0.0 + - pipes-network ==0.6.4.1 - pipes-parse ==3.0.8 - - pipes-random ==1.0.0.3 - - pipes-safe ==2.2.5 + - pipes-random ==1.0.0.4 + - pipes-safe ==2.2.9 - pipes-text ==0.0.2.5 - pipes-wai ==3.2.0 - pixelated-avatar-generator ==0.1.3 - pkcs10 ==0.2.0.0 - placeholders ==0.1 - - plan-b ==0.2.1 - - plot ==0.2.3.8 - - plot-gtk ==0.2.0.4 - - plot-gtk3 ==0.1.0.2 - - plot-gtk-ui ==0.3.0.2 - - plot-light ==0.2.7 - - pointed ==5 + - plot ==0.2.3.9 + - plot-light ==0.2.9 + - pointed ==5.0.1 - pointedlist ==0.6.1 - - pointful ==1.0.9 - pointless-fun ==1.1.0.6 - - point-octree ==0.5.5.3 - - poll ==0.0 + - poll ==0.0.0.1 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 + - pomaps ==0.0.0.4 - pooled-io ==0.0.2.1 - - posix-paths ==0.2.1.1 - - posix-realtime ==0.0.0.4 + - PortMidi ==0.1.6.1 + - posix-paths ==0.2.1.5 - postgresql-binary ==0.12.1 - - postgresql-libpq ==0.9.3.1 - - postgresql-schema ==0.1.13 + - postgresql-libpq ==0.9.4.1 + - postgresql-schema ==0.1.14 - postgresql-simple ==0.5.3.0 - postgresql-simple-migration ==0.1.11.0 - - postgresql-simple-opts ==0.2.0.2 - - postgresql-simple-queue ==0.5.1.1 - - postgresql-simple-url ==0.2.0.0 + - postgresql-simple-queue ==1.0.1 + - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 - - postgresql-typed ==0.5.2 + - postgresql-typed ==0.5.3.0 - post-mess-age ==0.2.1.0 - - pqueue ==1.3.2.3 - - prednote ==0.36.0.4 + - pptable ==0.2.0.0 + - pqueue ==1.4.1.1 - pred-set ==0.0.1 - pred-trie ==0.5.1.2 - prefix-units ==0.2.0 @@ -1713,110 +1584,114 @@ default-package-overrides: - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - - prettyprinter ==1.1.1 - - prettyprinter-ansi-terminal ==1.1.1.1 + - prettyprinter ==1.2.0.1 + - prettyprinter-ansi-terminal ==1.1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - - pretty-show ==1.6.13 - - pretty-simple ==2.0.1.0 + - pretty-show ==1.6.16 + - pretty-simple ==2.1.0.0 - pretty-types ==0.2.3.1 + - prim-array ==0.2.2 - primes ==0.2.1.0 - - primitive ==0.6.2.0 - - printcess ==0.1.0.3 + - primitive ==0.6.3.0 + - prim-uniq ==0.1.0.1 - probability ==0.2.5.1 - - process-extras ==0.7.2 - - product-profunctors ==0.8.0.3 + - process-extras ==0.7.4 + - product-isomorphic ==0.0.3.2 + - product-profunctors ==0.9.0.0 - profiterole ==0.1 - - profiteur ==0.4.3.0 - - profunctor-extras ==4.0 - - profunctors ==5.2.1 + - profunctors ==5.2.2 - projectroot ==0.2.0.1 - - project-template ==0.2.0 - - prometheus-client ==0.2.0 - - prometheus-metrics-ghc ==0.2.0 + - project-template ==0.2.0.1 + - prometheus-client ==0.3.0 + - prometheus-metrics-ghc ==0.3.0 + - promises ==0.3 - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - - protobuf-simple ==0.1.0.4 - - protocol-buffers ==2.4.5 - - protocol-buffers-descriptor ==2.4.5 - - proto-lens ==0.2.1.0 + - protobuf-simple ==0.1.0.5 + - protocol-buffers ==2.4.8 + - protocol-buffers-descriptor ==2.4.8 + - protocol-radius ==0.0.1.0 + - protocol-radius-test ==0.0.1.0 + - proto-lens ==0.2.2.0 - proto-lens-arbitrary ==0.1.1.1 - - proto-lens-combinators ==0.1.0.7 - - proto-lens-descriptors ==0.2.1.0 - - proto-lens-optparse ==0.1.0.4 - - proto-lens-protobuf-types ==0.2.1.0 - - proto-lens-protoc ==0.2.1.0 - - protolude ==0.1.10 + - proto-lens-descriptors ==0.2.2.0 + - proto-lens-optparse ==0.1.1.0 + - protolude ==0.2.2 - proxied ==0.3 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - - psqueues ==0.2.4.0 - - publicsuffix ==0.20170508 + - psqueues ==0.2.6.0 + - pthread ==0.2.0 + - publicsuffix ==0.20171229 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript-bridge ==0.11.1.1 - - pusher-http-haskell ==1.2.0.1 + - purescript-bridge ==0.11.1.2 + - pushbullet-types ==0.4.1.0 + - pusher-http-haskell ==1.5.1.4 - pwstore-fast ==2.4.4 + - qchas ==1.1.0.0 + - qm-interpolated-string ==0.3.0.0 - QuasiText ==0.1.2.6 - - questioner ==0.1.1.0 - quickbench ==1.0 - - QuickCheck ==2.9.2 - - quickcheck-arbitrary-adt ==0.2.0.0 + - QuickCheck ==2.10.1 + - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 + - quickcheck-classes ==0.3.3 - quickcheck-combinators ==0.0.2 - - quickcheck-instances ==0.3.12 + - quickcheck-instances ==0.3.18 - quickcheck-io ==0.2.0 - - quickcheck-simple ==0.1.0.2 + - quickcheck-properties ==0.1 + - quickcheck-simple ==0.1.0.3 - quickcheck-special ==0.1.0.6 + - quickcheck-state-machine ==0.3.1 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.1.0 - - raaz ==0.1.1 + - quickcheck-with-counterexamples ==1.0 + - raaz ==0.2.0 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 + - rakuten ==0.1.1.0 - ramus ==0.1.2 - random ==1.1 - random-fu ==0.2.7.0 - random-shuffle ==0.0.4 - random-source ==0.3.0.6 - random-tree ==0.6.0.5 - - range ==0.1.2.0 - range-set-list ==0.1.2.0 - - rank1dynamic ==0.3.3.0 + - rank1dynamic ==0.4.0 + - rank2classes ==1.0.2 - rank-product ==0.2.0.1 - - Rasterific ==0.7.2.1 - - rasterific-svg ==0.3.3 - - ratel ==0.3.7 - - ratel-wai ==0.2.0 - - rattletrap ==2.5.0 + - Rasterific ==0.7.3 + - rasterific-svg ==0.3.3.1 + - ratel ==1.0.3 + - ratel-wai ==1.0.2 + - ratio-int ==0.1.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 + - rcu ==0.2.2 - rdf ==0.1.0.2 - rdtsc ==1.3.0.1 - - reactive-banana ==1.1.0.1 + - re2 ==0.2 - readable ==0.3.1 - - ReadArgs ==1.2.3 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - readline ==1.0.3.0 - - rebase ==1.0.8.1 - recursion-schemes ==5.0.2 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.2 - refact ==0.3.0.2 - - references ==0.3.3.0 + - references ==0.3.3.1 - ref-fd ==0.4.0.1 - refined ==0.1.2.1 - - reflection ==2.1.2 - - reform ==0.2.7.1 + - reflection ==2.1.3 + - reform ==0.2.7.2 - reform-blaze ==0.2.4.3 - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.2 - - 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 @@ -1826,211 +1701,212 @@ default-package-overrides: - 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 ==1.2.3 - regex-tdfa-text ==1.0.0.3 - - regex-with-pcre ==1.0.1.3 - reinterpret-cast ==0.1.0 - - relational-query ==0.9.5.0 - - relational-query-HDBC ==0.6.4.1 - - relational-record ==0.1.8.0 - - relational-schemas ==0.1.4.1 + - relational-query ==0.11.0.0 + - relational-query-HDBC ==0.6.6.1 + - relational-record ==0.2.1.2 + - relational-schemas ==0.1.6.1 + - rematch ==0.2.0.0 - renderable ==0.2.0.1 - - RepLib ==0.5.4 - - repline ==0.1.6.0 - - req ==0.2.0 - - req-conduit ==0.1.0 - - rerebase ==1.0.3 + - repa ==3.4.1.3 + - repa-algorithms ==3.4.1.2 + - repa-io ==3.4.1.1 + - repline ==0.1.7.0 + - req ==1.0.0 + - req-url-extra ==0.1.0.0 - reroute ==0.4.1.0 - - resolve-trivial-conflicts ==0.3.2.4 - resource-pool ==0.2.3.2 - - resourcet ==1.1.9 - - rest-client ==0.5.1.1 + - resourcet ==1.2.1 - rest-core ==0.39 - - rest-gen ==0.20.0.1 - - rest-happstack ==0.3.1.1 - - rest-snap ==0.2.0.1 - - rest-stringmap ==0.2.0.6 - - rest-types ==1.14.1.1 - - rest-wai ==0.2.0.1 + - rest-snap ==0.3.0.0 + - rest-stringmap ==0.2.0.7 + - rest-types ==1.14.1.2 - result ==0.2.6.0 - - rethinkdb ==2.2.0.10 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.4.3 + - retry ==0.7.6.2 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - - rng-utils ==0.2.1 - - rose-trees ==0.0.4.3 + - riak ==1.1.2.4 + - riak-protobuf ==0.23.0.0 + - rng-utils ==0.3.0 + - roles ==0.2.0.0 + - rollbar-hs ==0.2.0.0 + - rose-trees ==0.0.4.4 - rot13 ==0.2.0.1 - - rotating-log ==0.4.2 - RSA ==2.3.0 - - rss-conduit ==0.3.1.2 + - rss-conduit ==0.4.2.1 - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 - - safe ==0.3.15 - - safecopy ==0.9.3.3 - - safe-exceptions ==0.1.6.0 + - safe ==0.3.17 + - safecopy ==0.9.4.1 + - safe-exceptions ==0.1.7.0 - safe-exceptions-checked ==0.1.0 - - safeio ==0.0.4.0 + - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.2 - - sandi ==0.4.1 - sandman ==0.2.0.1 - say ==0.1.0.0 + - sbp ==2.3.13 + - sbv ==7.5 + - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 - - schematic ==0.1.6.0 - - scientific ==0.3.5.2 - - scotty ==0.11.0 - - scrape-changes ==0.1.0.5 + - schematic ==0.4.2.0 + - scientific ==0.3.5.3 + - scotty ==0.11.1 - scrypt ==0.5.0 - - SDL ==0.6.5.1 - - sdl2 ==2.2.0 + - sdl2 ==2.4.0.1 - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - - sdl2-mixer ==0.1 - - sdl2-ttf ==1.0.0 - - search-algorithms ==0.2.0 - - securemem ==0.1.9 + - sdl2-mixer ==1.1.0 + - sdl2-ttf ==2.0.2 + - search-algorithms ==0.3.0 + - securemem ==0.1.10 - SegmentTree ==0.3 - - selda ==0.1.11.1 - - selda-postgresql ==0.1.7.0 + - selda ==0.1.12.1 + - selda-postgresql ==0.1.7.2 - selda-sqlite ==0.1.6.0 - semigroupoid-extras ==5 - - semigroupoids ==5.2.1 - - semigroups ==0.18.3 + - semigroupoids ==5.2.2 + - semigroups ==0.18.4 - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - sendfile ==0.7.9 - - sensu-run ==0.2.0 + - sensu-run ==0.4.0.5 - seqalign ==0.2.0.4 - seqloc ==0.6.1.1 + - sequence ==0.9.8 - serf ==0.1.1.0 - - servant ==0.11 - - servant-auth-cookie ==0.5.0.5 - - servant-blaze ==0.7.1 - - servant-cassava ==0.9 - - servant-checked-exceptions ==0.4.1.0 - - servant-client ==0.11 - - servant-docs ==0.11 + - servant ==0.13.0.1 + - servant-blaze ==0.8 + - servant-cassava ==0.10 + - servant-client ==0.13.0.1 + - servant-client-core ==0.13.0.1 + - servant-docs ==0.11.2 - servant-elm ==0.4.0.1 - - servant-foreign ==0.10.1 - - servant-js ==0.9.3.1 + - servant-exceptions ==0.1.1 + - servant-foreign ==0.11.1 + - servant-generic ==0.1.0.1 + - servant-github-webhook ==0.4.1.0 + - servant-js ==0.9.3.2 - servant-JuicyPixels ==0.3.0.3 - - servant-lucid ==0.7.1 - - servant-mock ==0.8.3 - - servant-purescript ==0.8.0.1 - - servant-ruby ==0.2.1.0 - - servant-server ==0.11.0.1 - - servant-static-th ==0.1.0.6 - - servant-subscriber ==0.6.0.0 - - servant-swagger ==1.1.4 - - servant-swagger-ui ==0.2.4.3.4.0 + - servant-kotlin ==0.1.1.0 + - servant-lucid ==0.8 + - servant-mock ==0.8.4 + - servant-pandoc ==0.5.0.0 + - servant-purescript ==0.9.0.2 + - servant-ruby ==0.7.0.0 + - servant-server ==0.13.0.1 + - servant-static-th ==0.2.0.1 + - servant-subscriber ==0.6.0.1 + - servant-swagger ==1.1.5 + - servant-swagger-ui ==0.2.5.3.9.1 + - servant-websockets ==1.1.0 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 + - serversession-backend-persistent ==1.0.4 + - serversession-backend-redis ==1.0.3 - serversession-frontend-wai ==1.0 - - serversession-frontend-yesod ==1.0 - servius ==1.2.0.3 - - set-cover ==0.0.8 + - ses-html ==0.4.0.0 + - set-cover ==0.0.9 - setenv ==0.1.1.3 - - setlocale ==1.0.0.5 + - setlocale ==1.0.0.6 - set-monad ==0.2.0.0 - sets ==0.0.5.2 - - SHA ==1.6.4.2 - - shake ==0.15.11 - - shake-language-c ==0.10.1 - - shakespeare ==2.0.14 - - shell-conduit ==4.6.1 - - shelly ==1.6.8.3 - - shikensu ==0.3.7 + - SHA ==1.6.4.4 + - shake ==0.16.4 + - shake-language-c ==0.11.0 + - shakespeare ==2.0.15 + - shelltestrunner ==1.9 + - shelly ==1.7.2 + - shikensu ==0.3.8 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - - show-prettyprint ==0.2 - - sibe ==0.2.0.5 + - show-combinators ==0.1.0.0 + - show-prettyprint ==0.2.0.2 - signal ==0.1.0.4 - silently ==1.2.5 - simple ==0.11.2 - - simple-download ==0.0.2 - simple-log ==0.9.3 - - simple-reflect ==0.3.2 - - simple-sendfile ==0.2.25 + - simple-reflect ==0.3.3 + - simple-sendfile ==0.2.27 - simple-session ==0.10.1.1 - simple-templates ==0.8.0.1 - - singleton-bool ==0.1.2.0 - - singletons ==2.2 + - singleton-bool ==0.1.4 + - singleton-nats ==0.4.0.4 + - singletons ==2.3.1 - siphash ==1.0.3 - skein ==1.0.9.4 - skeletons ==0.4.0 - - skylighting ==0.1.1.5 + - skylighting ==0.6 + - slack-web ==0.2.0.4 - slave-thread ==1.0.2 - slug ==0.1.7 - - smallcaps ==0.6.0.4 - - smallcheck ==1.1.2 - - smallcheck-series ==0.6 - - smoothie ==0.4.2.7 + - smallcheck ==1.1.3.1 + - smoothie ==0.4.2.8 - smtp-mail ==0.1.4.6 + - snap ==1.1.0.0 - snap-blaze ==0.2.1.5 - - snap-core ==1.0.3.1 + - snap-core ==1.0.3.2 - snap-server ==1.0.3.3 - snowflake ==0.1.1.1 - - snowtify ==0.1.0.3 - - soap ==0.2.3.5 + - soap ==0.2.3.6 - soap-openssl ==0.1.0.2 - - soap-tls ==0.1.1.2 + - soap-tls ==0.1.1.4 - socket ==0.8.0.1 - socket-activation ==0.1.0.2 - - socks ==0.5.5 - - solga ==0.1.0.2 - - solga-swagger ==0.1.0.2 + - socks ==0.5.6 - sort ==1.0.0.0 - sorted-list ==0.2.0.0 - - sound-collage ==0.2.0.1 - sourcemap ==0.1.6 - - sox ==0.2.2.7 + - sox ==0.2.3 - soxlib ==0.0.3 - - sparkle ==0.5.0.1 - - sparse-linear-algebra ==0.2.9.8 + - sparkle ==0.7.4 + - sparse-linear-algebra ==0.2.9.9 - spdx ==0.2.2.0 - special-values ==0.1.0.0 + - speculate ==0.3.2 - speculation ==1.5.0.3 - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 - Spintax ==0.3.2 - splice ==0.6.1.1 - - split ==0.2.3.2 + - split ==0.2.3.3 - splitmix ==0 - - split-record ==0.1.1.3 - Spock ==0.12.0.0 - Spock-api ==0.12.0.0 - Spock-api-server ==0.12.0.0 - Spock-core ==0.12.0.0 - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 - - spool ==0.1 - - spreadsheet ==0.1.3.5 - - sqlite-simple ==0.4.14.0 - - sqlite-simple-errors ==0.6.0.0 + - spreadsheet ==0.1.3.7 + - sqlite-simple ==0.4.15.0 - sql-words ==0.1.5.1 - - srcloc ==0.5.1.1 - - stache ==0.2.2 - - stackage-curator ==0.14.5 - - stackage-query ==0.1.2 - - stackage-types ==1.2.0 - - stack-run-auto ==0.1.1.4 + - squeal-postgresql ==0.1.1.4 + - srcloc ==0.5.1.2 + - stache ==1.2.1 - stack-type ==0.1.0.0 + - starter ==0.2.1 + - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - StateVar ==1.1.0.4 - - stateWriter ==0.2.9 - - static-canvas ==0.2.0.3 - - statistics ==0.13.3.0 - - stemmer ==0.5.2 - - stm ==2.4.4.1 + - stateWriter ==0.2.10 + - static-text ==0.2.0.1 + - statistics ==0.14.0.2 + - stb-image-redux ==0.2.1.2 + - stitch ==0.5.0.0 + - stm ==2.4.5.0 - stm-chans ==3.0.0.4 - - stm-conduit ==3.0.0 + - stm-conduit ==4.0.0 - stm-containers ==0.2.16 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 @@ -2038,266 +1914,258 @@ default-package-overrides: - stm-split ==0.0.2 - stm-stats ==0.2.0.0 - stm-supply ==0.2.0.0 - - stopwatch ==0.1.0.4 + - stopwatch ==0.1.0.5 - storable-complex ==0.2.2 - storable-endian ==0.2.6 - - storable-record ==0.0.3.1 + - storable-record ==0.0.4 - storable-tuple ==0.0.3.3 - - storablevector ==0.2.12.1 - - storablevector-carray ==0.0 + - storablevector ==0.2.13 - store ==0.4.3.2 - store-core ==0.4.1 - - Strafunski-StrategyLib ==5.0.0.10 - - stratosphere ==0.6.0 - - streaming ==0.1.4.5 - - streaming-binary ==0.3.0.1 - - streaming-bytestring ==0.1.4.6 - - streaming-commons ==0.1.17 - - streaming-utils ==0.1.4.7 - - streaming-wai ==0.1.1 + - Strafunski-StrategyLib ==5.0.1.0 + - stratosphere ==0.19.1 + - streaming ==0.2.1.0 + - streaming-bytestring ==0.1.6 + - streaming-commons ==0.1.19 + - streamly ==0.1.2 - streamproc ==1.6.2 - streams ==3.3 - strict ==0.3.2 - - strict-base-types ==0.5.0 + - strict-base-types ==0.6.1 + - strict-concurrency ==0.2.4.2 + - strict-types ==0.1.2 - stringable ==0.1.3 - - stringbuilder ==0.5.0 - - string-class ==0.1.6.5 + - stringbuilder ==0.5.1 + - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 - string-qq ==0.0.2 - stringsearch ==0.3.6.6 - - strive ==3.0.4 - - stylish-haskell ==0.8.1.0 + - string-transform ==1.0.0 + - stripe-core ==2.3.0 + - strive ==5.0.4 + - structs ==0.1.1 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 - - superrecord ==0.3.0.0 - svg-builder ==0.1.0.2 - - SVGFonts ==1.6.0.3 - - svg-tree ==0.6.2 + - svg-tree ==0.6.2.2 - swagger ==0.3.0 - - swagger2 ==2.1.6 + - swagger2 ==2.2.1 + - swish ==0.9.2.1 - syb ==0.7 + - syb-with-class ==0.6.1.9 - symbol ==0.2.4 - symengine ==0.1.2.0 - - synthesizer-core ==0.8.1.1 - - synthesizer-dimensional ==0.8.0.2 - - synthesizer-midi ==0.6.0.4 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - system-fileio ==0.3.16.3 - - system-filepath ==0.4.13.4 - - system-posix-redirect ==1.1.0.1 + - system-filepath ==0.4.14 - tabular ==0.2.2.7 - tagchup ==0.4.1 - tagged ==0.8.5 - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.2 - tagshare ==0.0 - - tagsoup ==0.14.1 + - tagsoup ==0.14.6 - tagstream-conduit ==0.5.5.3 - - tar ==0.5.0.3 - - tar-conduit ==0.1.1 + - tar ==0.5.1.0 + - tar-conduit ==0.2.3 - tardis ==0.4.1.0 - - tasty ==0.11.3 - - tasty-ant-xml ==1.1.0 + - tasty ==1.0.1.1 + - tasty-ant-xml ==1.1.3 - tasty-auto ==0.2.0.0 - - tasty-dejafu ==0.6.0.0 - - tasty-discover ==3.0.2 - - tasty-expected-failure ==0.11.0.4 - - tasty-fail-fast ==0.0.3 - - tasty-golden ==2.3.1.1 - - tasty-hspec ==1.1.3.2 + - tasty-dejafu ==1.1.0.2 + - tasty-discover ==4.2.0 + - tasty-expected-failure ==0.11.1.1 + - tasty-golden ==2.3.1.3 + - tasty-hedgehog ==0.1.0.2 + - tasty-hspec ==1.1.4 - tasty-html ==0.4.1.1 - - tasty-hunit ==0.9.2 + - tasty-hunit ==0.10.0.1 - tasty-kat ==0.0.3 - tasty-program ==1.0.5 - - tasty-quickcheck ==0.8.4 - - tasty-rerun ==1.1.7 - - tasty-silver ==3.1.10 + - tasty-quickcheck ==0.9.2 + - tasty-rerun ==1.1.10 + - tasty-silver ==3.1.11 - tasty-smallcheck ==0.8.1 - tasty-stats ==0.2.0.3 - - tasty-tap ==0.0.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 + - tcp-streams ==1.0.1.0 + - tcp-streams-openssl ==1.0.1.0 - tdigest ==0.1 - - tdigest-Chart ==0 - - teardown ==0.1.0.1 + - teardown ==0.3.0.0 - template ==0.2.0.10 - temporary ==1.2.1.1 - temporary-rc ==1.2.0.3 - - tensorflow ==0.1.0.2 - - tensorflow-core-ops ==0.1.0.0 - - tensorflow-opgen ==0.1.0.0 - - tensorflow-ops ==0.1.0.0 - - tensorflow-proto ==0.1.0.0 - tensorflow-test ==0.1.0.0 - termcolor ==0.2.0.0 - - terminal-progress-bar ==0.1.1.1 + - terminal-progress-bar ==0.2 - terminal-size ==0.3.2.1 - - terminfo ==0.4.1.0 - test-fixture ==0.5.1.0 - - test-framework ==0.8.1.1 + - test-framework ==0.8.2.0 - test-framework-hunit ==0.3.0.2 - test-framework-quickcheck2 ==0.3.0.4 - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - testing-feat ==0.4.0.3 - - texmath ==0.9.4.4 - - text ==1.2.2.2 - - text-all ==0.4.1.1 + - texmath ==0.10.1.1 + - text ==1.2.3.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-latin1 ==0.3.1 + - text-ldap ==0.1.1.11 - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.2.3 - text-printer ==0.5 - text-region ==0.3.0.0 - - text-show ==3.6 - - text-show-instances ==3.6 + - text-short ==0.1.2 + - text-show ==3.7.2 + - text-show-instances ==3.6.3 - text-zipper ==0.10.1 - tfp ==1.0.0.2 - tf-random ==0.5 - th-abstraction ==0.2.6.0 - - th-data-compat ==0.0.2.4 - - th-desugar ==1.6 - - these ==0.7.3 - - th-expand-syns ==0.4.3.0 + - th-data-compat ==0.0.2.5 + - th-desugar ==1.7 + - these ==0.7.4 + - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - - th-lift ==0.7.7 + - th-lift ==0.7.8 - th-lift-instances ==0.1.11 - - th-orphans ==0.13.4 - - thread-local-storage ==0.1.1 - - threads ==0.5.1.5 - - threepenny-editors ==0.4.1 - - threepenny-gui ==0.8.2.0 + - th-orphans ==0.13.5 + - thread-hierarchy ==0.3.0.0 + - thread-local-storage ==0.1.2 + - threads ==0.5.1.6 + - threads-extras ==0.1.0.2 + - threepenny-editors ==0.5.6 + - threepenny-gui ==0.8.2.3 - threepenny-gui-flexbox ==0.4.2 - th-reify-compat ==0.0.1.3 - th-reify-many ==0.1.8 + - throttle-io-stream ==0.2.0.1 - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 + - th-strict-compat ==0.1.0.1 - th-to-exp ==0.0.1.1 - - thumbnail-plus ==1.0.5 - th-utilities ==0.2.0.1 - - thyme ==0.3.5.5 - - tidal ==0.9.4 + - tibetan-utils ==0.1.1.5 + - tidal ==0.9.8 + - tile ==0.3.0.0 - time-compat ==0.1.0.3 - - timeit ==1.0.0.0 + - timeit ==2.0 - timelens ==0.2.0.2 - - time-lens ==0.4.0.1 - - time-locale-compat ==0.1.1.3 - - timemap ==0.0.4 + - time-lens ==0.4.0.2 + - time-locale-compat ==0.1.1.4 + - time-locale-vietnamese ==1.0.0.0 + - timemap ==0.0.7 - time-parsers ==0.1.2.0 - timerep ==2.0.0.2 - timespan ==0.3.0.0 - - timezone-olson ==0.1.8 - - timezone-series ==0.1.8 - - tinylog ==0.14.0 + - timezone-olson ==0.1.9 + - timezone-series ==0.1.9 + - tinylog ==0.14.1 - tinytemplate ==0.1.2.0 - titlecase ==1.0.1 - - tldr ==0.2.2 - - tls ==1.3.11 - - tls-debug ==0.4.4 - - tls-session-manager ==0.0.0.1 + - tldr ==0.3.0 + - tls ==1.4.1 + - tls-debug ==0.4.5 + - tls-session-manager ==0.0.0.2 + - tmapchan ==0.0.3 + - tmapmvar ==0.0.4 - tmp-postgres ==0.1.1.1 - token-bucket ==0.1.0.1 - - torrent ==10000.1.1 - tostring ==0.2.1.1 - - tracy ==0.1.4.0 - transformers-base ==0.4.4 + - transformers-bifunctors ==0.1 - transformers-compat ==0.5.1.4 + - transformers-either ==0.0.2 + - transformers-fix ==1.0 - transformers-lift ==0.2.0.1 - transient ==0.5.9.2 - transient-universe ==0.4.6.1 - traverse-with-class ==1.0.0.0 + - tree-diff ==0.0.1 - tree-fun ==0.8.1.0 - - tries ==0.0.4.2 - - trifecta ==1.6.2.1 + - tries ==0.0.5 + - trifecta ==1.7.1.1 - triplesec ==0.1.2.0 - true-name ==0.1.0.3 - tsv2csv ==0.1.0.2 - ttrie ==0.1.2.1 - - tttool ==1.7.0.3 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 - tuple-th ==0.2.5 - - turtle ==1.3.6 + - turtle ==1.5.7 - turtle-options ==0.1.0.4 - - twitter-conduit ==0.2.2.2 - - 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-combinators-singletons ==0.2.1.0 - TypeCompose ==0.9.12 - - typed-process ==0.1.1 + - typed-process ==0.2.2.0 - 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 - - typelits-witnesses ==0.2.3.0 + - typelits-witnesses ==0.3.0.2 + - type-of-html ==1.3.4.0 - type-operators ==0.1.0.4 - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 - - tz ==0.1.3.0 - - tzdata ==0.1.20170320.0 + - tz ==0.1.3.1 + - tzdata ==0.1.20180122.0 - ua-parser ==0.7.4.1 - uglymemo ==0.1.0.1 - - unbound ==0.5.1 - unbounded-delays ==0.1.1.0 - - unbound-generics ==0.3.1 + - unbound-generics ==0.3.2 + - unboxed-ref ==0.4.0.0 - uncertain ==0.3.1.0 - unexceptionalio ==0.3.0 - - unfoldable ==0.9.4 + - unfoldable ==0.9.6 - unfoldable-restricted ==0.0.3 - - unicode ==0.0 + - unicode ==0.0.1 - unicode-show ==0.1.0.2 - - unicode-transforms ==0.3.3 + - unicode-transforms ==0.3.4 - unification-fd ==0.10.0.1 - union ==0.1.1.2 - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 + - Unique ==0.4.7.2 - unique ==0 - - Unique ==0.4.7.1 - unit-constraint ==0.0.0 - - units ==2.4 - - units-defs ==2.0.1.1 - - units-parser ==0.1.1 + - units-parser ==0.1.1.2 - universe ==1.0 - universe-base ==1.0.2.1 - universe-instances-base ==1.0 - universe-instances-extended ==1.0.0.1 - universe-instances-trans ==1.0.0.1 - universe-reverse-instances ==1.0 + - universum ==1.1.0 - unix-bytestring ==0.3.7.3 - - unix-compat ==0.4.3.1 - - unix-time ==0.3.7 - - unliftio ==0.1.1.0 - - unliftio-core ==0.1.0.0 + - unix-compat ==0.5.0.1 + - unix-time ==0.3.8 + - unliftio ==0.2.6.0 + - unliftio-core ==0.1.1.0 - unlit ==0.4.0.0 - - unordered-containers ==0.2.8.0 + - unordered-containers ==0.2.9.0 + - unordered-intmap ==0.1.0.0 - unsafe ==0.0 - - uri-bytestring ==0.2.3.3 - - uri-bytestring-aeson ==0.1.0.4 + - uri-bytestring ==0.3.1.1 + - uri-bytestring-aeson ==0.1.0.6 - uri-encode ==1.5.0.5 - - uri-templater ==0.2.2.0 - - url ==2.1.3 - - urlpath ==5.0.0.1 + - uri-templater ==0.3.1.0 + - urlpath ==8.0.1 + - userid ==0.1.3.2 - users ==0.5.0.0 - users-postgresql-simple ==0.5.0.2 - users-test ==0.5.0.1 @@ -2306,100 +2174,102 @@ default-package-overrides: - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 - - uu-interleaved ==0.2.0.0 - - uu-parsinglib ==2.9.1.1 - vado ==0.0.9 - - validate-input ==0.4.0.0 - - validation ==0.5.5 + - validation ==1 - validationt ==0.2.0.0 + - validity ==0.4.0.4 + - validity-aeson ==0.1.0.0 + - validity-bytestring ==0.2.0.0 + - validity-containers ==0.2.0.0 + - validity-path ==0.2.0.2 + - validity-scientific ==0.1.0.0 + - validity-text ==0.2.0.1 + - validity-time ==0.1.0.0 + - validity-unordered-containers ==0.1.0.0 + - validity-uuid ==0.0.0.0 + - validity-vector ==0.1.0.0 - varying ==0.7.0.3 - - vault ==0.3.0.7 + - vault ==0.3.1.0 - vcswrapper ==0.1.6 - vector ==0.12.0.1 - vector-algorithms ==0.7.0.1 - - vector-binary-instances ==0.2.3.5 + - vector-binary-instances ==0.2.4 - vector-buffer ==0.4.1 + - vector-builder ==0.3.4.1 + - vector-fftw ==0.1.3.8 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-sized ==0.5.1.0 - - vector-space ==0.10.4 + - vector-sized ==0.6.1.0 + - vector-space ==0.13 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - - vectortiles ==1.2.0.5 + - vectortiles ==1.3.0 - verbosity ==0.2.3.0 - - versions ==3.1.1 + - versions ==3.3.2 - vhd ==0.2.2 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.11 - - vinyl ==0.5.3 - - vinyl-utils ==0.3.0.0 + - vinyl ==0.7.0 + - vivid ==0.3.0.2 + - vivid-osc ==0.3.0.0 + - vivid-supercollider ==0.3.0.0 - void ==0.7.2 - - vty ==5.16 - - wai ==3.2.1.1 - - wai-app-static ==3.1.6.1 + - vty ==5.20 + - wai ==3.2.1.2 + - wai-app-static ==3.1.6.2 - wai-cli ==0.1.1 - - wai-conduit ==3.0.0.3 - - wai-cors ==0.2.5 + - wai-conduit ==3.0.0.4 + - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.20.0 + - wai-extra ==3.0.22.0 - wai-handler-launch ==3.0.2.3 - - wai-logger ==2.3.0 - - wai-middleware-auth ==0.1.2.1 + - wai-logger ==2.3.2 - 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.1 - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.4 - - wai-middleware-rollbar ==0.4.0 - - wai-middleware-static ==0.8.1 - - wai-middleware-throttle ==0.2.1.0 - - wai-middleware-verbs ==0.3.2 - - wai-predicates ==0.9.0 - - wai-route ==0.3.1.1 - - wai-routes ==0.10.0 + - wai-middleware-prometheus ==0.3.0 + - wai-middleware-rollbar ==0.10.0 + - wai-middleware-static ==0.8.2 + - wai-middleware-throttle ==0.2.2.0 + - wai-predicates ==0.10.0 + - wai-route ==0.3.1.2 - wai-routing ==0.13.0 - wai-session ==0.3.2 - - wai-session-postgresql ==0.2.1.1 + - wai-session-postgresql ==0.2.1.2 - wai-slack-middleware ==0.2.0 - - waitra ==0.0.4.0 - wai-transformers ==0.0.7 - - wai-websockets ==3.0.1.1 - - warp ==3.2.13 - - warp-tls ==3.2.4 + - wai-websockets ==3.0.1.2 + - warp ==3.2.18.2 + - warp-tls ==3.2.4.2 - wave ==0.1.5 - - wavefront-obj ==0.1.0.1 + - wavefront ==0.7.1.2 - webdriver ==0.8.5 - webdriver-angular ==0.1.11 - - webkitgtk3 ==0.14.2.1 - - webkitgtk3-javascriptcore ==0.14.2.1 - webpage ==0.0.5 - web-plugins ==0.2.9 - - web-routes ==0.27.12 + - web-routes ==0.27.14.2 - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.11 - web-routes-hsp ==0.24.6.1 - - web-routes-th ==0.22.6.2 - - web-routes-wai ==0.24.3 + - web-routes-th ==0.22.6.3 + - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - - websockets ==0.10.0.0 - - websockets-rpc ==0.4.0 - - websockets-simple ==0.0.2 - - websockets-snap ==0.10.2.3 - - weeder ==0.1.7 - - weigh ==0.0.5 + - websockets ==0.12.4.0 + - websockets-rpc ==0.6.0 + - websockets-simple ==0.0.6.3 + - websockets-snap ==0.10.2.5 + - weigh ==0.0.7 + - wide-word ==0.1.0.6 - wikicfp-scraper ==0.1.0.9 - - wild-bind ==0.1.0.3 - - wild-bind-indicator ==0.1.0.1 - - wild-bind-task-x11 ==0.1.0.1 - - wild-bind-x11 ==0.1.0.7 - - Win32 ==2.3.1.1 - - Win32-extras ==0.2.0.1 + - wild-bind ==0.1.2.0 + - wild-bind-x11 ==0.2.0.2 + - Win32 ==2.5.4.1 - Win32-notify ==0.3.0.3 - wire-streams ==0.1.1.0 - - withdependencies ==0.2.4.1 - - witherable ==0.1.3.4 + - withdependencies ==0.2.4.2 + - witherable ==0.2 - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.2 @@ -2412,39 +2282,44 @@ default-package-overrides: - word24 ==2.0.1 - word8 ==0.1.3 - word-trie ==0.3.0 + - word-wrap ==0.4.1 - Workflow ==0.8.3 + - world-peace ==0.1.0.0 - wrap ==0.0.0 - - wreq ==0.5.0.1 + - wrecker ==1.3.1.0 + - wreq ==0.5.2.1 + - wreq-stringless ==0.5.9.1 - writer-cps-full ==0.1.0.0 - 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.5 + - wuss ==1.1.8 - X11 ==1.8 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 - - x509 ==1.7.2 - - x509-store ==1.6.5 + - x509 ==1.7.3 + - x509-store ==1.6.6 - x509-system ==1.6.6 - - x509-validation ==1.6.9 + - x509-validation ==1.6.10 - Xauth ==0.1 - - xdcc ==1.1.4 - xdg-basedir ==0.2.2 - - xeno ==0.2 + - xeno ==0.3.3 - xenstore ==0.1.1 - xhtml ==3000.2.2 - - xlsx ==0.6.0 - - xlsx-tabular ==0.2.2 + - xls ==0.1.1 + - xlsx ==0.7.2 + - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - - xml-basic ==0.1.2 - - xml-conduit ==1.5.1 - - xml-conduit-parse ==0.3.1.1 + - xml-basic ==0.1.3 + - xml-conduit ==1.8.0 - xml-conduit-writer ==0.1.1.2 - - xmlgen ==0.6.2.1 - - xml-hamlet ==0.4.1.1 + - xmlgen ==0.6.2.2 + - xml-hamlet ==0.5.0 + - xmlhtml ==0.2.5.2 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 + - xml-isogen ==0.2.1 - xml-lens ==0.1.6.3 - xml-picklers ==0.3.6 - xml-to-json ==2.0.1 @@ -2455,108 +2330,128 @@ default-package-overrides: - xmonad-extras ==0.13.2 - xss-sanitize ==0.3.5.7 - xturtle ==0.2.0.0 - - yackage ==0.8.1 - - yahoo-finance-api ==0.2.0.2 - - yaml ==0.8.24 - - Yampa ==0.10.6.2 + - xxhash ==0.0.2 + - xxhash-ffi ==0.2.0.0 + - yaml ==0.8.29 + - Yampa ==0.10.7 - YampaSynth ==0.2 - - yesod ==1.4.5 - - yesod-auth ==1.4.19 - - yesod-auth-account ==1.4.3 - - yesod-auth-basic ==0.1.0.2 - - yesod-auth-fb ==1.8.1 - - yesod-auth-hashdb ==1.6.2 - - yesod-bin ==1.5.2.6 - - yesod-core ==1.4.37 - - yesod-default ==1.2.0 - - yesod-eventsource ==1.4.1 - - yesod-fb ==0.4.0 - - yesod-form ==1.4.16 + - yeshql ==3.0.1.3 + - yesod ==1.6.0 + - yesod-alerts ==0.1.2.0 + - yesod-auth ==1.6.3 + - yesod-auth-fb ==1.9.0 + - yesod-auth-hashdb ==1.7 + - yesod-bin ==1.6.0 + - yesod-core ==1.6.3 + - yesod-csp ==0.2.4.0 + - yesod-eventsource ==1.6.0 + - yesod-fb ==0.5.0 + - yesod-form ==1.6.1 - yesod-form-bootstrap4 ==0.1.0.2 - - yesod-form-richtext ==0.1.0.2 - - yesod-gitrepo ==0.2.1.0 - - yesod-gitrev ==0.1.0.0 - - yesod-job-queue ==0.3.0.4 - - yesod-markdown ==0.11.4 - - yesod-newsfeed ==1.6 - - yesod-persistent ==1.4.2 - - yesod-recaptcha2 ==0.1.0.1 - - yesod-sitemap ==1.4.0.1 - - yesod-static ==1.5.3.1 - - yesod-static-angular ==0.1.8 + - yesod-gitrepo ==0.3.0 + - yesod-gitrev ==0.2.0.0 + - yesod-newsfeed ==1.6.1.0 + - yesod-paginator ==0.11.0 + - yesod-persistent ==1.6.0 + - yesod-sitemap ==1.6.0 + - yesod-static ==1.6.0 - yesod-table ==2.0.3 - - yesod-test ==1.5.8 - - yesod-websockets ==0.2.6 + - yesod-test ==1.6.2 + - yesod-websockets ==0.3.0 - yes-precure5-command ==5.5.3 - - yi-core ==0.14.1 - - yi-frontend-vty ==0.14.1 - - yi-fuzzy-open ==0.14.1 - - yi-ireader ==0.14.1 - - yi-keymap-cua ==0.14.1 - - yi-keymap-emacs ==0.14.1 - - yi-keymap-vim ==0.14.1 - - yi-language ==0.14.1 - - yi-misc-modes ==0.14.1 - - yi-mode-haskell ==0.14.1 - - yi-mode-javascript ==0.14.1 - - yi-rope ==0.9 - - yi-snippet ==0.14.1 + - yi-core ==0.17.1 + - yi-frontend-vty ==0.17.1 + - yi-fuzzy-open ==0.17.1 + - yi-ireader ==0.17.1 + - yi-keymap-cua ==0.17.1 + - yi-keymap-emacs ==0.17.1 + - yi-keymap-vim ==0.17.1 + - yi-language ==0.17.1 + - yi-misc-modes ==0.17.1 + - yi-mode-haskell ==0.17.1 + - yi-mode-javascript ==0.17.1 + - yi-rope ==0.10 + - yi-snippet ==0.17.1 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 - - yoga ==0.0.0.1 + - yoga ==0.0.0.2 - youtube ==0.2.1.1 - zero ==0.1.4 - - zeromq4-haskell ==0.6.7 - - zip ==0.1.11 - - zip-archive ==0.3.1.1 - - zippers ==0.2.4 - - ziptastic-client ==0.3.0.3 - - ziptastic-core ==0.2.0.3 - - zlib ==0.6.1.2 + - zeromq4-haskell ==0.7.0 + - zim-parser ==0.2.1.0 + - zip ==1.0.0 + - zip-archive ==0.3.2.4 + - zippers ==0.2.5 + - zlib ==0.6.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - - zm ==0.2.4 - zot ==0.0.3 - - ztail ==1.2 + - zstd ==0.1.0.0 + - ztail ==1.2.0.2 extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x + - aws ^>= 0.18 # pre-lts-11.x versions neeed by git-annex 6.20180227 - 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 - Cabal == 1.24.* # required for jailbreak-cabal etc. + - colour < 2.3.4 # newer versions don't support GHC 7.10.x + - conduit >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - conduit-extra >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227 - containers < 0.5 # required to build alex with GHC 6.12.3 - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock < 2.17 # required on GHC 7.10.x + - haddock == 2.17.* # required on GHC 8.0.x - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x + - haddock-api == 2.17.* # required on GHC 8.0.x - haddock-library == 1.2.* # required for haddock-api-2.16.x + - haddock-library == 1.4.3 # required for haddock-api-2.17.x + - haddock-library == 1.4.4 # required for haddock-api-2.18.x - happy <1.19.6 # newer versions break Agda - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - - haskell-src-exts == 1.18.* # required by hoogle-5.0.4 + - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode + - hoogle == 5.0.14 # required by hie-hoogle + - html-conduit ^>= 1.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - inline-c < 0.6 # required on GHC 8.0.x + - inline-c-cpp < 0.2 # required on GHC 8.0.x - 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 + - persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - QuickCheck < 2 # required by test-framework-quickcheck and its users + - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - 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 + - xml-conduit ^>= 1.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - yesod ^>= 1.4 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - yesod-core < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - yesod-form < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - yesod-persistent < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - yesod-static ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - yesod-test ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 package-maintainers: peti: - - cabal-install - cabal2nix + - cabal2spec + - cabal-install + - distribution-nixpkgs - funcmp - git-annex - hackage-db @@ -2569,9 +2464,14 @@ package-maintainers: - hsemail - hsyslog - jailbreak-cabal + - json-autotype + - lambdabot-core + - lambdabot-irc-plugins - language-nix - logging-facade-syslog + - nix-paths - pandoc + - postmaster - stack - streamproc - structured-haskell-mode @@ -2585,7 +2485,6 @@ package-maintainers: - bson-lens - cased - elm-export-persistent - - pipes-csv - pipes-mongodb - skeletons - streaming-wai @@ -2598,15 +2497,11 @@ package-maintainers: - path-pieces - persistent - persistent-postgresql - - persistent-redis - persistent-sqlite - persistent-template - shakespeare abbradar: - Agda - - lambdabot - alunduil: - - collection-json dont-distribute-packages: # hard restrictions that really belong into meta.platforms @@ -2673,6 +2568,7 @@ dont-distribute-packages: cusparse: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-raster-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] libnvvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + matlab: [ i686-linux, x86_64-linux, x86_64-darwin ] nvvm: [ i686-linux, x86_64-linux, x86_64-darwin ] Obsidian: [ i686-linux, x86_64-linux, x86_64-darwin ] patch-image: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2680,6 +2576,7 @@ dont-distribute-packages: yices-painless: [ i686-linux, x86_64-linux, x86_64-darwin ] # these packages don't evaluate because they have broken dependencies + comark: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] dialog: [ i686-linux, x86_64-linux, x86_64-darwin ] fltkhs-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2692,7 +2589,10 @@ dont-distribute-packages: gi-webkit2webextension: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] gsmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] hbro: [ i686-linux, x86_64-linux, x86_64-darwin ] + hplayground: [ i686-linux, x86_64-linux, x86_64-darwin ] imprevu-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-webkit2gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-webkitgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2708,18 +2608,23 @@ dont-distribute-packages: nomyx-language: [ i686-linux, x86_64-linux, x86_64-darwin ] nomyx-library: [ i686-linux, x86_64-linux, x86_64-darwin ] nomyx-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + passman-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + passman-core: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] spike: [ i686-linux, x86_64-linux, x86_64-darwin ] tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] trasa-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] + treersec: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-brotli: [ i686-linux, x86_64-linux, x86_64-darwin ] web-browser-in-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkitgtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkitgtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] # soft restrictions because of build errors @@ -2727,9 +2632,10 @@ dont-distribute-packages: 4Blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] AAI: [ i686-linux, x86_64-linux, x86_64-darwin ] abacate: [ i686-linux, x86_64-linux, x86_64-darwin ] - abcBridge: [ "x86_64-darwin" ] + abcBridge: [ i686-linux, x86_64-linux, x86_64-darwin ] abcnotation: [ i686-linux, x86_64-linux, x86_64-darwin ] abeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + abnf: [ i686-linux, x86_64-linux, x86_64-darwin ] AbortT-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] AbortT-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] AbortT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2743,14 +2649,8 @@ dont-distribute-packages: AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-VanillaArray: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-llvm-native: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-llvm: [ 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 ] accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] access-time: [ i686-linux, x86_64-linux, x86_64-darwin ] acid-state-dist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2761,6 +2661,7 @@ dont-distribute-packages: acme-hq9plus: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-inator: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-kitchen-sink: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-left-pad: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-miscorder: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-now: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2787,6 +2688,9 @@ dont-distribute-packages: adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ] + ADPfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + ADPfusionForest: [ i686-linux, x86_64-linux, x86_64-darwin ] + ADPfusionSet: [ i686-linux, x86_64-linux, x86_64-darwin ] Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-Basics: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-Net: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2795,20 +2699,20 @@ dont-distribute-packages: AERN-Real: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-RnToRm-Plot: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-RnToRm: [ i686-linux, x86_64-linux, x86_64-darwin ] - aern2-mp: [ i686-linux, x86_64-linux, x86_64-darwin ] - aern2-real: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-diff-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-flowtyped: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-native: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-quick: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-prefix: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-tiled: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-value-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-yak: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] affection: [ i686-linux, x86_64-linux, x86_64-darwin ] affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2824,15 +2728,21 @@ dont-distribute-packages: aip: [ i686-linux, x86_64-linux, x86_64-darwin ] air-th: [ i686-linux, x86_64-linux, x86_64-darwin ] airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ] - aivika-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] + airship: [ i686-linux, x86_64-linux, x86_64-darwin ] + airtable-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-experiment-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] al: [ 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-prelude: [ 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 ] algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] - algebraic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] + algebraic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ] + AlgoRhythm: [ i686-linux, x86_64-linux, x86_64-darwin ] AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ] align-text: [ i686-linux, x86_64-linux, x86_64-darwin ] AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2845,19 +2755,131 @@ dont-distribute-packages: alsa-pcm-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-seq-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + alternative-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] alternative-io: [ i686-linux, x86_64-linux, x86_64-darwin ] altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ] + alto: [ i686-linux, x86_64-linux, x86_64-darwin ] alure: [ i686-linux, x86_64-linux, x86_64-darwin ] - ALUT: [ "x86_64-darwin" ] amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-application-autoscaling: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-appstream: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-athena: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-autoscaling: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-batch: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-budgets: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-certificatemanager: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-clouddirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cloudformation: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cloudfront: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cloudhsm: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cloudhsmv2: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cloudsearch-domains: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cloudsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cloudtrail: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cloudwatch-events: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cloudwatch-logs: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cloudwatch: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-codebuild: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-codecommit: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-codedeploy: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-codepipeline: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-codestar: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cognito-identity: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cognito-idp: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cognito-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-config: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-cur: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-datapipeline: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-devicefarm: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-directconnect: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-dms: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-dynamodb-dax: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-dynamodb: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-ecr: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-ecs: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-efs: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-elasticache: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-elasticbeanstalk: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-elastictranscoder: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-elb: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-elbv2: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-emr: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-gamelift: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-glacier: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-glue: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-greengrass: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-health: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-iam: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-importexport: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-inspector: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-iot-dataplane: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-iot: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-kinesis-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-kinesis-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-kinesis: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-kms: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-lex-models: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-lex-runtime: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-lightsail: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-marketplace-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-marketplace-entitlement: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-marketplace-metering: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-mechanicalturk: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-migrationhub: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-ml: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-mobile: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-opsworks-cm: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-opsworks: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-organizations: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-pinpoint: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-polly: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-pricing: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-rds: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-redshift: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-rekognition: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-resourcegroupstagging: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-route53-domains: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-s3-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-sdb: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-servicecatalog: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-shield: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-sms: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-snowball: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-ssm: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-stepfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-storagegateway: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-sts: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-support: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-swf: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-waf-regional: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-waf: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-workdocs: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-workspaces: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-xray: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] amby: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + amqp-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] analyze-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ] android-activity: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2867,12 +2889,17 @@ dont-distribute-packages: angel: [ i686-linux, x86_64-linux, x86_64-darwin ] angle: [ i686-linux, x86_64-linux, x86_64-darwin ] Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] + animascii: [ i686-linux, x86_64-linux, x86_64-darwin ] + animate-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + animate: [ i686-linux, x86_64-linux, x86_64-darwin ] annah: [ i686-linux, x86_64-linux, x86_64-darwin ] - Annotations: [ i686-linux, x86_64-linux, x86_64-darwin ] anonymous-sums-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + anonymous-sums: [ i686-linux, x86_64-linux, x86_64-darwin ] + ansi-terminal-game: [ i686-linux, x86_64-linux, x86_64-darwin ] antagonist: [ i686-linux, x86_64-linux, x86_64-darwin ] antfarm: [ i686-linux, x86_64-linux, x86_64-darwin ] anticiv: [ i686-linux, x86_64-linux, x86_64-darwin ] + antigate: [ i686-linux, x86_64-linux, x86_64-darwin ] antimirov: [ i686-linux, x86_64-linux, x86_64-darwin ] antisplice: [ i686-linux, x86_64-linux, x86_64-darwin ] antlrc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2892,10 +2919,12 @@ dont-distribute-packages: apiary-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] + apiary-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-session: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary: [ i686-linux, x86_64-linux, x86_64-darwin ] apis: [ i686-linux, x86_64-linux, x86_64-darwin ] + apns-http2: [ i686-linux, x86_64-linux, x86_64-darwin ] apotiki: [ i686-linux, x86_64-linux, x86_64-darwin ] app-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] appc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2906,12 +2935,14 @@ dont-distribute-packages: applicative-splice: [ i686-linux, x86_64-linux, x86_64-darwin ] approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] ApproxFun-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + approximate: [ i686-linux, x86_64-linux, x86_64-darwin ] arb-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] arbb-vm: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbtt: [ "x86_64-darwin" ] + arbtt: [ i686-linux, x86_64-linux, x86_64-darwin ] archiver: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux-web: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux: [ i686-linux, x86_64-linux, x86_64-darwin ] + archnews: [ i686-linux, x86_64-linux, x86_64-darwin ] arff: [ i686-linux, x86_64-linux, x86_64-darwin ] arghwxhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] argon2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2925,7 +2956,6 @@ dont-distribute-packages: arpa: [ i686-linux, x86_64-linux, x86_64-darwin ] arpack: [ i686-linux, x86_64-linux, x86_64-darwin ] array-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] - array-primops: [ i686-linux, x86_64-linux, x86_64-darwin ] ArrayRef: [ i686-linux, x86_64-linux, x86_64-darwin ] arrow-improve: [ i686-linux, x86_64-linux, x86_64-darwin ] arrowapply-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2937,36 +2967,42 @@ dont-distribute-packages: ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] + asciidiagram: [ i686-linux, x86_64-linux, x86_64-darwin ] asic: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ] asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] AspectAG: [ i686-linux, x86_64-linux, x86_64-darwin ] + assert: [ i686-linux, x86_64-linux, x86_64-darwin ] assimp: [ i686-linux, x86_64-linux, x86_64-darwin ] astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] astview: [ i686-linux, x86_64-linux, x86_64-darwin ] - async-dejafu: [ "x86_64-darwin" ] + async-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] + async-dejafu: [ i686-linux, x86_64-linux, x86_64-darwin ] async-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] asynchronous-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + aterm: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-core: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ] + atmos-dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] atndapi: [ i686-linux, x86_64-linux, x86_64-darwin ] atom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] + atp-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + ats-format: [ i686-linux, x86_64-linux, x86_64-darwin ] + ats-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] + ats-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] attic-schedule: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-time: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ] Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ] atuin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2980,6 +3016,8 @@ dont-distribute-packages: authoring: [ i686-linux, x86_64-linux, x86_64-darwin ] AutoForms: [ i686-linux, x86_64-linux, x86_64-darwin ] autom: [ i686-linux, x86_64-linux, x86_64-darwin ] + autonix-deps-kf5: [ i686-linux, x86_64-linux, x86_64-darwin ] + autonix-deps: [ i686-linux, x86_64-linux, x86_64-darwin ] avahi: [ i686-linux, x86_64-linux, x86_64-darwin ] avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-api-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2997,6 +3035,8 @@ dont-distribute-packages: aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-ec2-knownhosts: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-general: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3004,25 +3044,28 @@ dont-distribute-packages: aws-kinesis-reshard: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-kinesis: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-mfa-credentials: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-performance-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-ses-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] 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: [ "x86_64-darwin" ] + aws: [ 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 ] azurify: [ i686-linux, x86_64-linux, x86_64-darwin ] - b-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - babylon: [ "x86_64-darwin" ] + babylon: [ i686-linux, x86_64-linux, x86_64-darwin ] backdropper: [ i686-linux, x86_64-linux, x86_64-darwin ] backtracking-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] backward-state: [ i686-linux, x86_64-linux, x86_64-darwin ] bag: [ i686-linux, x86_64-linux, x86_64-darwin ] Baggins: [ i686-linux, x86_64-linux, x86_64-darwin ] + bake: [ i686-linux, x86_64-linux, x86_64-darwin ] ballast: [ 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 ] @@ -3032,6 +3075,7 @@ dont-distribute-packages: bamboo: [ i686-linux, x86_64-linux, x86_64-darwin ] bamse: [ i686-linux, x86_64-linux, x86_64-darwin ] Bang: [ i686-linux, x86_64-linux, x86_64-darwin ] + bank-holiday-usa: [ i686-linux, x86_64-linux, x86_64-darwin ] banwords: [ i686-linux, x86_64-linux, x86_64-darwin ] barchart: [ i686-linux, x86_64-linux, x86_64-darwin ] barcodes-code128: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3040,27 +3084,37 @@ dont-distribute-packages: Barracuda: [ i686-linux, x86_64-linux, x86_64-darwin ] barrie: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] + base-compat-batteries: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] - base32-bytestring: [ "x86_64-darwin" ] + base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + base64-bytestring-type: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] BASIC: [ 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-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] + battleplace-api: [ i686-linux, x86_64-linux, x86_64-darwin ] battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] + bdcs: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] beam: [ i686-linux, x86_64-linux, x86_64-darwin ] beamable: [ i686-linux, x86_64-linux, x86_64-darwin ] - bearriver: [ 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 ] + belka: [ i686-linux, x86_64-linux, x86_64-darwin ] BenchmarkHistory: [ i686-linux, x86_64-linux, x86_64-darwin ] bencoding: [ i686-linux, x86_64-linux, x86_64-darwin ] berkeleydb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3076,6 +3130,7 @@ dont-distribute-packages: bidirectionalization-combined: [ i686-linux, x86_64-linux, x86_64-darwin ] bidispec-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] bidispec: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiGUL: [ i686-linux, x86_64-linux, x86_64-darwin ] billboard-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-main: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3083,14 +3138,19 @@ dont-distribute-packages: billeksah-services: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-communicator: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-file: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-indexed-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-protocol-zmq: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-serialise-cbor: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] binding-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - binding-wx: [ "x86_64-darwin" ] + binding-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-apr-util: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-apr: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-bfd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3101,32 +3161,28 @@ dont-distribute-packages: bindings-eskit: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-fann: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-friso: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-gpgme: [ "x86_64-darwin" ] bindings-gsl: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-hamlib: [ "x86_64-darwin" ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libg15: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libstemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libv4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-linux-videodev2: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-mmap: [ "x86_64-darwin" ] + bindings-lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-monetdb-mapi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-mpdecimal: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-parport: [ "x86_64-darwin" ] - bindings-portaudio: [ "x86_64-darwin" ] - bindings-posix: [ "x86_64-darwin" ] - bindings-ppdev: [ "x86_64-darwin" ] bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-wlc: [ i686-linux, x86_64-linux, x86_64-darwin ] bindynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] binembed-example: [ i686-linux, x86_64-linux, x86_64-darwin ] binembed: [ i686-linux, x86_64-linux, x86_64-darwin ] + bio-sequence: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3137,37 +3193,44 @@ dont-distribute-packages: BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] - biohazard: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] + BioHMM: [ i686-linux, x86_64-linux, x86_64-darwin ] bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biophd: [ i686-linux, x86_64-linux, x86_64-darwin ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] biostockholm: [ i686-linux, x86_64-linux, x86_64-darwin ] bird: [ i686-linux, x86_64-linux, x86_64-darwin ] BirdPP: [ i686-linux, x86_64-linux, x86_64-darwin ] + bisect-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] bit-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - bit-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitcoin-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] bitcoin-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] bitly-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] Bitly: [ i686-linux, x86_64-linux, x86_64-darwin ] bitmaps: [ i686-linux, x86_64-linux, x86_64-darwin ] bits-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - bits-extras: [ "x86_64-darwin" ] + bits-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] bitset: [ i686-linux, x86_64-linux, x86_64-darwin ] bitspeak: [ i686-linux, x86_64-linux, x86_64-darwin ] bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] + BitStringRandomMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitvec: [ i686-linux, x86_64-linux, x86_64-darwin ] + bizzlelude: [ i686-linux, x86_64-linux, x86_64-darwin ] bkr: [ i686-linux, x86_64-linux, x86_64-darwin ] bla: [ i686-linux, x86_64-linux, x86_64-darwin ] - black-jewel: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum: [ i686-linux, x86_64-linux, x86_64-darwin ] blank-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] + blas-carray: [ i686-linux, x86_64-linux, x86_64-darwin ] + blas-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] blas-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] blas: [ i686-linux, x86_64-linux, x86_64-darwin ] + BlastHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] blatex: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-builder-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - blaze-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-truncate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3181,16 +3244,18 @@ dont-distribute-packages: 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 ] + bloodhound-amazonka-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] bloomfilter-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - bloxorz: [ "x86_64-darwin" ] + blosum: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber-server: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber: [ i686-linux, x86_64-linux, x86_64-darwin ] Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetileutils: [ i686-linux, x86_64-linux, x86_64-darwin ] blunt: [ i686-linux, x86_64-linux, x86_64-darwin ] - BNFC-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] bno055-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] bolt: [ i686-linux, x86_64-linux, x86_64-darwin ] bond-haskell-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3198,68 +3263,83 @@ dont-distribute-packages: bond: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] + bookkeeping-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ] - boolean-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] + boring: [ i686-linux, x86_64-linux, x86_64-darwin ] bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + bowntz: [ i686-linux, x86_64-linux, x86_64-darwin ] braid: [ i686-linux, x86_64-linux, x86_64-darwin ] + brain-bleep: [ i686-linux, x86_64-linux, x86_64-darwin ] brainheck: [ i686-linux, x86_64-linux, x86_64-darwin ] Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] + breve: [ i686-linux, x86_64-linux, x86_64-darwin ] brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] + brick-skylighting: [ i686-linux, x86_64-linux, x86_64-darwin ] + bricks-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + bricks-rendering: [ i686-linux, x86_64-linux, x86_64-darwin ] + bricks-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] + bricks: [ i686-linux, x86_64-linux, x86_64-darwin ] brillig: [ i686-linux, x86_64-linux, x86_64-darwin ] - brittany: [ i686-linux, x86_64-linux, x86_64-darwin ] broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - bsd-sysctl: [ i686-linux, x86_64-linux, x86_64-darwin ] + bronyradiogermany-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] + browscap: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] btree: [ i686-linux, x86_64-linux, x86_64-darwin ] - btrfs: [ "x86_64-darwin" ] - buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] bugzilla: [ i686-linux, x86_64-linux, x86_64-darwin ] buildable: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + bumper: [ i686-linux, x86_64-linux, x86_64-darwin ] + bunz: [ 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-network: [ 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 ] - bustle: [ i686-linux, x86_64-linux, x86_64-darwin ] - butcher: [ i686-linux, x86_64-linux, x86_64-darwin ] + buster: [ i686-linux, x86_64-linux, x86_64-darwin ] butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] + bv-sized: [ 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 ] - bytearray-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-read: [ 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-time: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-tree-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringparser: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - c-mosquitto: [ "x86_64-darwin" ] c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-bounds: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-cargs: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-db: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-dependency-licenses: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-dev: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghc-dynflags: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-graphdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] Cabal-ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-info: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc72: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-mon: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-nirvana: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3267,13 +3347,13 @@ dont-distribute-packages: cabal-query: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-src: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ 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 ] + cabal2ebuild: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal2spec: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalish: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalmdvrpm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3285,6 +3365,7 @@ dont-distribute-packages: cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] + cake: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3296,19 +3377,23 @@ dont-distribute-packages: call: [ i686-linux, x86_64-linux, x86_64-darwin ] camfort: [ i686-linux, x86_64-linux, x86_64-darwin ] campfire: [ i686-linux, x86_64-linux, x86_64-darwin ] + canon: [ i686-linux, x86_64-linux, x86_64-darwin ] canonical-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] + canteven-http: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-listen-http: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-parsedate: [ i686-linux, x86_64-linux, x86_64-darwin ] cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] cao: [ i686-linux, x86_64-linux, x86_64-darwin ] cap: [ i686-linux, x86_64-linux, x86_64-darwin ] Capabilities: [ i686-linux, x86_64-linux, x86_64-darwin ] + capataz: [ i686-linux, x86_64-linux, x86_64-darwin ] capri: [ i686-linux, x86_64-linux, x86_64-darwin ] car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] - caramia: [ "x86_64-darwin" ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] + carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] carte: [ i686-linux, x86_64-linux, x86_64-darwin ] Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ] + casa-abbreviations-and-acronyms: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-internal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3329,13 +3414,11 @@ dont-distribute-packages: casr-logbook: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-cql: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] - cassava-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] cassava-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] Cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] cassy: [ i686-linux, x86_64-linux, x86_64-darwin ] castle: [ i686-linux, x86_64-linux, x86_64-darwin ] casui: [ i686-linux, x86_64-linux, x86_64-darwin ] - catamorphism: [ i686-linux, x86_64-linux, x86_64-darwin ] Catana: [ i686-linux, x86_64-linux, x86_64-darwin ] catch-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3357,6 +3440,7 @@ dont-distribute-packages: 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 ] + cef: [ 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 ] celtchar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3366,6 +3450,7 @@ dont-distribute-packages: cereal-ieee754: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + cereal-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] certificate: [ i686-linux, x86_64-linux, x86_64-darwin ] cf: [ i686-linux, x86_64-linux, x86_64-darwin ] cfipu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3373,24 +3458,25 @@ dont-distribute-packages: cfopu: [ i686-linux, x86_64-linux, x86_64-darwin ] cg: [ i686-linux, x86_64-linux, x86_64-darwin ] cgen: [ i686-linux, x86_64-linux, x86_64-darwin ] + cgi-undecidable: [ i686-linux, x86_64-linux, x86_64-darwin ] cgi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] cgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] + Chart-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-unit: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] chatty-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - chatwork: [ i686-linux, x86_64-linux, x86_64-darwin ] cheapskate-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] check-pvp: [ i686-linux, x86_64-linux, x86_64-darwin ] - checked: [ i686-linux, x86_64-linux, x86_64-darwin ] Checked: [ i686-linux, x86_64-linux, x86_64-darwin ] + checked: [ i686-linux, x86_64-linux, x86_64-darwin ] checkmate: [ i686-linux, x86_64-linux, x86_64-darwin ] chell-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] - chell-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ] chitauri: [ i686-linux, x86_64-linux, x86_64-darwin ] Chitra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3401,9 +3487,10 @@ dont-distribute-packages: chp-spec: [ i686-linux, x86_64-linux, x86_64-darwin ] chp-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] chp: [ i686-linux, x86_64-linux, x86_64-darwin ] + chr-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + chr-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] ChristmasTree: [ i686-linux, x86_64-linux, x86_64-darwin ] chronograph: [ i686-linux, x86_64-linux, x86_64-darwin ] - chronos: [ i686-linux, x86_64-linux, x86_64-darwin ] chu2: [ i686-linux, x86_64-linux, x86_64-darwin ] chuchu: [ i686-linux, x86_64-linux, x86_64-darwin ] chunks: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3416,32 +3503,34 @@ dont-distribute-packages: citation-resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] citeproc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + cj-token: [ i686-linux, x86_64-linux, x86_64-darwin ] cjk: [ i686-linux, x86_64-linux, x86_64-darwin ] clac: [ i686-linux, x86_64-linux, x86_64-darwin ] clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] - clang-compilation-database: [ i686-linux, x86_64-linux, x86_64-darwin ] clang-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] clanki: [ i686-linux, x86_64-linux, x86_64-darwin ] clarifai: [ i686-linux, x86_64-linux, x86_64-darwin ] CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-multisignal: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + Clash-Royale-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-systemverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] clash: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] + classy-miso: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-bugs: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-plugin-ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-plugin-mailinglist: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-plugin-media: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-plugin-page: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-theme-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-geo-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] cld2: [ i686-linux, x86_64-linux, x86_64-darwin ] clean-unions: [ i686-linux, x86_64-linux, x86_64-darwin ] Clean: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3456,6 +3545,7 @@ dont-distribute-packages: clippard: [ i686-linux, x86_64-linux, x86_64-darwin ] clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] clippings: [ i686-linux, x86_64-linux, x86_64-darwin ] + clist: [ i686-linux, x86_64-linux, x86_64-darwin ] clit: [ i686-linux, x86_64-linux, x86_64-darwin ] cloben: [ i686-linux, x86_64-linux, x86_64-darwin ] clocked: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3465,11 +3555,8 @@ dont-distribute-packages: cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] cloud-seeder: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudfront-signer: [ 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 ] @@ -3486,14 +3573,16 @@ dont-distribute-packages: 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 ] + coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ] + codec-beam: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] codemonitor: [ i686-linux, x86_64-linux, x86_64-darwin ] codepad: [ i686-linux, x86_64-linux, x86_64-darwin ] codeworld-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + codex: [ i686-linux, x86_64-linux, x86_64-darwin ] cognimeta-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] coin: [ i686-linux, x86_64-linux, x86_64-darwin ] coinbase-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3502,26 +3591,28 @@ dont-distribute-packages: collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-types: [ i686-linux, x86_64-linux, x86_64-darwin ] collapse-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + collection-json: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] collections: [ i686-linux, x86_64-linux, x86_64-darwin ] - colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] colorless-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] colorless-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] colorless: [ 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 ] columbia: [ i686-linux, x86_64-linux, x86_64-darwin ] com: [ i686-linux, x86_64-linux, x86_64-darwin ] - comark: [ i686-linux, x86_64-linux, x86_64-darwin ] + combinat-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] + combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ] combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ] Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] combobuffer: [ 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 ] commsec-keyexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec: [ i686-linux, x86_64-linux, x86_64-darwin ] commutative: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3532,7 +3623,8 @@ dont-distribute-packages: compact-mutable: [ 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 ] - compact: [ i686-linux, x86_64-linux, x86_64-darwin ] + Compactable: [ i686-linux, x86_64-linux, x86_64-darwin ] + compactable: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-automata: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-dags: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-param: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3540,10 +3632,11 @@ dont-distribute-packages: competition: [ i686-linux, x86_64-linux, x86_64-darwin ] compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] - compose-ltr: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] + composite-aeson-refined: [ i686-linux, x86_64-linux, x86_64-darwin ] + composite-aeson: [ 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 ] compstrat: [ i686-linux, x86_64-linux, x86_64-darwin ] comptrans: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3554,28 +3647,38 @@ dont-distribute-packages: concrete-haskell-autogen: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] + concurrent-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] + Concurrent-Cache: [ i686-linux, x86_64-linux, x86_64-darwin ] + concurrent-dns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] concurrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] Concurrential: [ i686-linux, x86_64-linux, x86_64-darwin ] ConcurrentUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] - condor: [ i686-linux, x86_64-linux, x86_64-darwin ] Condor: [ i686-linux, x86_64-linux, x86_64-darwin ] + condor: [ i686-linux, x86_64-linux, x86_64-darwin ] condorcet: [ i686-linux, x86_64-linux, x86_64-darwin ] + conductive-base: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] + conductive-song: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-find: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-merge: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-throttle: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-tokenize-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] conf: [ i686-linux, x86_64-linux, x86_64-darwin ] conffmt: [ i686-linux, x86_64-linux, x86_64-darwin ] - config-ini: [ i686-linux, x86_64-linux, x86_64-darwin ] + confide: [ i686-linux, x86_64-linux, x86_64-darwin ] + config-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] config-select: [ i686-linux, x86_64-linux, x86_64-darwin ] ConfigFileTH: [ i686-linux, x86_64-linux, x86_64-darwin ] Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] configifier: [ i686-linux, x86_64-linux, x86_64-darwin ] Configurable: [ i686-linux, x86_64-linux, x86_64-darwin ] + configurator-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] congruence-relation: [ i686-linux, x86_64-linux, x86_64-darwin ] conjure: [ i686-linux, x86_64-linux, x86_64-darwin ] conkin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3584,7 +3687,9 @@ dont-distribute-packages: consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] console-program: [ i686-linux, x86_64-linux, x86_64-darwin ] const-math-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + constrained-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ] + constraint-manip: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3592,7 +3697,9 @@ dont-distribute-packages: consumers: [ i686-linux, x86_64-linux, x86_64-darwin ] container: [ i686-linux, x86_64-linux, x86_64-darwin ] containers-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + containers-verified: [ i686-linux, x86_64-linux, x86_64-darwin ] ContArrow: [ i686-linux, x86_64-linux, x86_64-darwin ] + content-store: [ i686-linux, x86_64-linux, x86_64-darwin ] context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] ContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] continue: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3612,6 +3719,7 @@ dont-distribute-packages: convert: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + coordinate: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3625,24 +3733,27 @@ dont-distribute-packages: CoreDump: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] + corenlp-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + coroutine-object: [ i686-linux, x86_64-linux, x86_64-darwin ] Coroutine: [ i686-linux, x86_64-linux, x86_64-darwin ] couch-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] couch-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] couchdb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] couchdb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] CouchDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - counter: [ i686-linux, x86_64-linux, x86_64-darwin ] - courier: [ i686-linux, x86_64-linux, x86_64-darwin ] + countable-inflections: [ i686-linux, x86_64-linux, x86_64-darwin ] court: [ i686-linux, x86_64-linux, x86_64-darwin ] coverage: [ i686-linux, x86_64-linux, x86_64-darwin ] + cparsing: [ i686-linux, x86_64-linux, x86_64-darwin ] CPBrainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] cpio-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] cplex-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ] cprng-aes-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ] + cpython: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-core: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-memory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3664,10 +3775,12 @@ dont-distribute-packages: creatur: [ i686-linux, x86_64-linux, x86_64-darwin ] credential-store: [ i686-linux, x86_64-linux, x86_64-darwin ] credentials-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + credentials: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain1-constrained: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain1: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain2-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain2-tiers: [ i686-linux, x86_64-linux, x86_64-darwin ] + critbit: [ i686-linux, x86_64-linux, x86_64-darwin ] criterion-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] criterion-to-html: [ i686-linux, x86_64-linux, x86_64-darwin ] criu-rpc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3677,6 +3790,7 @@ dont-distribute-packages: cron-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] cruncher-types: [ i686-linux, x86_64-linux, x86_64-darwin ] crunghc: [ i686-linux, x86_64-linux, x86_64-darwin ] + crypt-sha512: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-cipher-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-classical: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3685,17 +3799,12 @@ dont-distribute-packages: crypto-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptocompare: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptoconditions: [ i686-linux, x86_64-linux, x86_64-darwin ] + cryptohash-sha512: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-expression-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-expression-opcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-expression-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-expression: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ] + csg: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3705,11 +3814,12 @@ dont-distribute-packages: ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ] - cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ] + cube: [ i686-linux, x86_64-linux, x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] + currency-codes: [ i686-linux, x86_64-linux, x86_64-darwin ] currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] + curry: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] curryrs: [ i686-linux, x86_64-linux, x86_64-darwin ] curve25519: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3717,12 +3827,12 @@ dont-distribute-packages: custom-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] CV: [ i686-linux, x86_64-linux, x86_64-darwin ] cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] - d-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] dag: [ i686-linux, x86_64-linux, x86_64-darwin ] damnpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] + danibot: [ i686-linux, x86_64-linux, x86_64-darwin ] dao: [ i686-linux, x86_64-linux, x86_64-darwin ] Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] dapi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3734,6 +3844,7 @@ dont-distribute-packages: darcs-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs: [ i686-linux, x86_64-linux, x86_64-darwin ] darcsden: [ i686-linux, x86_64-linux, x86_64-darwin ] DarcsHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] darcswatch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3745,24 +3856,24 @@ dont-distribute-packages: data-accessor-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] data-accessor-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] data-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] data-concurrent-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] data-construction: [ i686-linux, x86_64-linux, x86_64-darwin ] data-cycle: [ i686-linux, x86_64-linux, x86_64-darwin ] data-dispersal: [ i686-linux, x86_64-linux, x86_64-darwin ] data-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] data-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-emoticons: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-extend-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] data-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin: [ i686-linux, x86_64-linux, x86_64-darwin ] data-flagset: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-interval: [ i686-linux, x86_64-linux, x86_64-darwin ] data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] data-kiln: [ i686-linux, x86_64-linux, x86_64-darwin ] data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-lens-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-template: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] data-map-multikey: [ i686-linux, x86_64-linux, x86_64-darwin ] data-nat: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3777,6 +3888,7 @@ dont-distribute-packages: data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-stringmap: [ i686-linux, x86_64-linux, x86_64-darwin ] data-structure-inferrer: [ i686-linux, x86_64-linux, x86_64-darwin ] data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3789,8 +3901,10 @@ dont-distribute-packages: dbcleaner: [ i686-linux, x86_64-linux, x86_64-darwin ] dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ] DBlimited: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbm: [ i686-linux, x86_64-linux, x86_64-darwin ] dbmigrations-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] dbmigrations-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbmigrations-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3798,8 +3912,10 @@ dont-distribute-packages: DBus: [ i686-linux, x86_64-linux, x86_64-darwin ] dclabel: [ i686-linux, x86_64-linux, x86_64-darwin ] dcpu16: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddate: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-base: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-build: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-code: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3814,12 +3930,13 @@ dont-distribute-packages: ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ] ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + dde: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ] + debug: [ 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 ] - decimal-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] DecisionTree: [ i686-linux, x86_64-linux, x86_64-darwin ] decoder-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] dedukti: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3835,29 +3952,27 @@ dont-distribute-packages: definitive-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] definitive-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] definitive-sound: [ i686-linux, x86_64-linux, x86_64-darwin ] - deiko-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - dejafu: [ "x86_64-darwin" ] deka-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] deka: [ i686-linux, x86_64-linux, x86_64-darwin ] delicious: [ i686-linux, x86_64-linux, x86_64-darwin ] + delimiter-separated: [ i686-linux, x86_64-linux, x86_64-darwin ] delta-h: [ i686-linux, x86_64-linux, x86_64-darwin ] Delta-Lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] delta: [ i686-linux, x86_64-linux, x86_64-darwin ] + delude: [ i686-linux, x86_64-linux, x86_64-darwin ] demarcate: [ i686-linux, x86_64-linux, x86_64-darwin ] denominate: [ i686-linux, x86_64-linux, x86_64-darwin ] dependent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] depends: [ i686-linux, x86_64-linux, x86_64-darwin ] dephd: [ i686-linux, x86_64-linux, x86_64-darwin ] - dequeue: [ i686-linux, x86_64-linux, x86_64-darwin ] derangement: [ i686-linux, x86_64-linux, x86_64-darwin ] derivation-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-enumerable: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-gadt: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-IG: [ i686-linux, x86_64-linux, x86_64-darwin ] - derive-storable-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - derive-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive: [ i686-linux, x86_64-linux, x86_64-darwin ] derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] deterministic-game-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] deunicode: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3868,36 +3983,49 @@ dont-distribute-packages: dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ] - dhall-json: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] - dhall-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + dhall-to-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-braille: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-graphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-html5: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-pgf: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-postscript: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-rasterific: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-rubiks-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-tikz: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + dice2tex: [ i686-linux, x86_64-linux, x86_64-darwin ] dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-foundation-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] digitalocean-kzs: [ i686-linux, x86_64-linux, x86_64-darwin ] DigitalOcean: [ i686-linux, x86_64-linux, x86_64-darwin ] dimensional-codata: [ i686-linux, x86_64-linux, x86_64-darwin ] + dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] DimensionalHash: [ i686-linux, x86_64-linux, x86_64-darwin ] - dimensions: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-core: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-example: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3912,39 +4040,42 @@ dont-distribute-packages: directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ] discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + discord-gateway: [ i686-linux, x86_64-linux, x86_64-darwin ] discord-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] discord-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] + discord-types: [ i686-linux, x86_64-linux, x86_64-darwin ] discordian-calendar: [ 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-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + disjoint-set-stateful: [ i686-linux, x86_64-linux, x86_64-darwin ] disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] - diskhash: [ "x86_64-darwin" ] + diskhash: [ i686-linux, x86_64-linux, x86_64-darwin ] + dist-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] Dist: [ i686-linux, x86_64-linux, x86_64-darwin ] - distance-of-time: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-async: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-azure: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-client-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-execution: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-fsm: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-p2p: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-registry: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-simplelocalnet: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-systest: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-task: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] distribution-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + diversity: [ i686-linux, x86_64-linux, x86_64-darwin ] dixi: [ i686-linux, x86_64-linux, x86_64-darwin ] djembe: [ i686-linux, x86_64-linux, x86_64-darwin ] djinn-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + dmenu-pkill: [ i686-linux, x86_64-linux, x86_64-darwin ] + dmenu-pmount: [ i686-linux, x86_64-linux, x86_64-darwin ] + dmenu-search: [ i686-linux, x86_64-linux, x86_64-darwin ] + dmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] DMuCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] DnaProteinAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] dnscache: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3953,9 +4084,9 @@ dont-distribute-packages: doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ] doccheck: [ i686-linux, x86_64-linux, x86_64-darwin ] docidx: [ i686-linux, x86_64-linux, x86_64-darwin ] - docker: [ i686-linux, x86_64-linux, x86_64-darwin ] dockercook: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] + doctest-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-driver-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] docvim: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3965,10 +4096,10 @@ dont-distribute-packages: domain-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] domplate: [ i686-linux, x86_64-linux, x86_64-darwin ] dot-linker: [ i686-linux, x86_64-linux, x86_64-darwin ] + dotenv: [ i686-linux, x86_64-linux, x86_64-darwin ] dotfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - dow: [ "x86_64-darwin" ] + doublify-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] - download: [ i686-linux, x86_64-linux, x86_64-darwin ] dozenal: [ i686-linux, x86_64-linux, x86_64-darwin ] dozens: [ i686-linux, x86_64-linux, x86_64-darwin ] DP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3982,6 +4113,7 @@ dont-distribute-packages: dph-prim-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] dpkg: [ i686-linux, x86_64-linux, x86_64-darwin ] DPM: [ i686-linux, x86_64-linux, x86_64-darwin ] + DPutils: [ i686-linux, x86_64-linux, x86_64-darwin ] drClickOn: [ i686-linux, x86_64-linux, x86_64-darwin ] dresdner-verkehrsbetriebe: [ i686-linux, x86_64-linux, x86_64-darwin ] DrHylo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3992,6 +4124,7 @@ dont-distribute-packages: dropbox-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] dropsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] ds-kanren: [ i686-linux, x86_64-linux, x86_64-darwin ] + DSA: [ i686-linux, x86_64-linux, x86_64-darwin ] dsh-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] DSH: [ i686-linux, x86_64-linux, x86_64-darwin ] dsmc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4006,9 +4139,9 @@ dont-distribute-packages: dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtw: [ i686-linux, x86_64-linux, x86_64-darwin ] + dual: [ i686-linux, x86_64-linux, x86_64-darwin ] dublincore-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] duckling: [ i686-linux, x86_64-linux, x86_64-darwin ] - dumb-cas: [ i686-linux, x86_64-linux, x86_64-darwin ] duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-tools-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4031,11 +4164,11 @@ dont-distribute-packages: dywapitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] eager-sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] earclipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + ease: [ i686-linux, x86_64-linux, x86_64-darwin ] easy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] easyjson: [ i686-linux, x86_64-linux, x86_64-darwin ] easyplot: [ i686-linux, x86_64-linux, x86_64-darwin ] easyrender: [ i686-linux, x86_64-linux, x86_64-darwin ] - easytensor: [ i686-linux, x86_64-linux, x86_64-darwin ] ebeats: [ i686-linux, x86_64-linux, x86_64-darwin ] ebnf-bff: [ i686-linux, x86_64-linux, x86_64-darwin ] ec2-unikernel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4044,6 +4177,7 @@ dont-distribute-packages: ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] ecu: [ i686-linux, x86_64-linux, x86_64-darwin ] eddie: [ i686-linux, x86_64-linux, x86_64-darwin ] + ede: [ i686-linux, x86_64-linux, x86_64-darwin ] edenmodules: [ i686-linux, x86_64-linux, x86_64-darwin ] edenskel: [ i686-linux, x86_64-linux, x86_64-darwin ] edentv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4053,23 +4187,25 @@ dont-distribute-packages: editline: [ i686-linux, x86_64-linux, x86_64-darwin ] EditTimeReport: [ i686-linux, x86_64-linux, x86_64-darwin ] EEConfig: [ i686-linux, x86_64-linux, x86_64-darwin ] - effect-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + effect-handlers: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects-mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects: [ i686-linux, x86_64-linux, x86_64-darwin ] egison-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] ehaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ehs: [ i686-linux, x86_64-linux, x86_64-darwin ] eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - eigen: [ i686-linux, x86_64-linux, x86_64-darwin ] + Eight-Ball-Pool-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-cloudwatch: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-elastic: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-log: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-prometheus-adapter: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-push: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-rrd: [ i686-linux, x86_64-linux, x86_64-darwin ] - elerea-examples: [ "x86_64-darwin" ] - elerea-sdl: [ "x86_64-darwin" ] elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] - eliminators: [ i686-linux, x86_64-linux, x86_64-darwin ] elision: [ i686-linux, x86_64-linux, x86_64-darwin ] + elm-websocket: [ 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 ] @@ -4082,10 +4218,15 @@ dont-distribute-packages: embroidery: [ i686-linux, x86_64-linux, x86_64-darwin ] emgm: [ i686-linux, x86_64-linux, x86_64-darwin ] Emping: [ i686-linux, x86_64-linux, x86_64-darwin ] + Empty: [ i686-linux, x86_64-linux, x86_64-darwin ] enchant: [ i686-linux, x86_64-linux, x86_64-darwin ] + encoding-io: [ i686-linux, x86_64-linux, x86_64-darwin ] encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-growler: [ i686-linux, x86_64-linux, x86_64-darwin ] + engine-io-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + engine-io-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] + engine-io: [ i686-linux, x86_64-linux, x86_64-darwin ] entangle: [ 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 ] @@ -4094,11 +4235,11 @@ dont-distribute-packages: EnumMap: [ i686-linux, x86_64-linux, x86_64-darwin ] enummapmap: [ i686-linux, x86_64-linux, x86_64-darwin ] env-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + envy: [ i686-linux, x86_64-linux, x86_64-darwin ] epanet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] epass: [ i686-linux, x86_64-linux, x86_64-darwin ] - epic: [ "x86_64-darwin" ] + epic: [ i686-linux, x86_64-linux, x86_64-darwin ] epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] - epub-tools: [ "x86_64-darwin" ] epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] EqualitySolver: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4107,32 +4248,38 @@ dont-distribute-packages: eros-client: [ i686-linux, x86_64-linux, x86_64-darwin ] eros-http: [ i686-linux, x86_64-linux, x86_64-darwin ] eros: [ i686-linux, x86_64-linux, x86_64-darwin ] + error-context: [ i686-linux, x86_64-linux, x86_64-darwin ] error-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] error-list: [ i686-linux, x86_64-linux, x86_64-darwin ] error-loc: [ i686-linux, x86_64-linux, x86_64-darwin ] error-message: [ i686-linux, x86_64-linux, x86_64-darwin ] - error-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + ersaconcat: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz: [ i686-linux, x86_64-linux, x86_64-darwin ] ert: [ i686-linux, x86_64-linux, x86_64-darwin ] escape-artist: [ i686-linux, x86_64-linux, x86_64-darwin ] esotericbot: [ i686-linux, x86_64-linux, x86_64-darwin ] EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] + esqueleto: [ i686-linux, x86_64-linux, x86_64-darwin ] ess: [ i686-linux, x86_64-linux, x86_64-darwin ] estimators: [ i686-linux, x86_64-linux, x86_64-darwin ] estreps: [ i686-linux, x86_64-linux, x86_64-darwin ] Etage-Graph: [ i686-linux, x86_64-linux, x86_64-darwin ] Etage: [ i686-linux, x86_64-linux, x86_64-darwin ] - EtaMOO: [ "x86_64-darwin" ] + EtaMOO: [ i686-linux, x86_64-linux, x86_64-darwin ] + etc: [ i686-linux, x86_64-linux, x86_64-darwin ] + etcd: [ i686-linux, x86_64-linux, x86_64-darwin ] Eternal10Seconds: [ i686-linux, x86_64-linux, x86_64-darwin ] eternal: [ i686-linux, x86_64-linux, x86_64-darwin ] + eternity-timestamped: [ i686-linux, x86_64-linux, x86_64-darwin ] + eternity: [ 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-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-analyzer: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-client-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] + euphoria: [ i686-linux, x86_64-linux, x86_64-darwin ] eurofxref: [ i686-linux, x86_64-linux, x86_64-darwin ] Euterpea: [ i686-linux, x86_64-linux, x86_64-darwin ] event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4145,11 +4292,16 @@ dont-distribute-packages: eventstore: [ i686-linux, x86_64-linux, x86_64-darwin ] every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] - ex-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] + exact-cover: [ i686-linux, x86_64-linux, x86_64-darwin ] + exact-real-positional: [ i686-linux, x86_64-linux, x86_64-darwin ] exact-real: [ i686-linux, x86_64-linux, x86_64-darwin ] exception-hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] exception-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] + exception-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + exception-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + exception-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] execs: [ i686-linux, x86_64-linux, x86_64-darwin ] + executor: [ i686-linux, x86_64-linux, x86_64-darwin ] exference: [ i686-linux, x86_64-linux, x86_64-darwin ] exherbo-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] exif: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4157,7 +4309,10 @@ dont-distribute-packages: exinst-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] + exinst: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ i686-linux, x86_64-linux, x86_64-darwin ] + exitcode: [ i686-linux, x86_64-linux, x86_64-darwin ] + exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] expat-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] explain: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4168,18 +4323,14 @@ dont-distribute-packages: explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] explore: [ i686-linux, x86_64-linux, x86_64-darwin ] exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ] - expressions: [ i686-linux, x86_64-linux, x86_64-darwin ] extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] - extended-reals: [ i686-linux, x86_64-linux, x86_64-darwin ] extensible-data: [ i686-linux, x86_64-linux, x86_64-darwin ] extensible-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] Extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + extract-dependencies: [ i686-linux, x86_64-linux, x86_64-darwin ] extractelf: [ i686-linux, x86_64-linux, x86_64-darwin ] - extralife: [ i686-linux, x86_64-linux, x86_64-darwin ] - extrapolate: [ i686-linux, x86_64-linux, x86_64-darwin ] ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] Facts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4187,14 +4338,22 @@ dont-distribute-packages: fadno-braids: [ i686-linux, x86_64-linux, x86_64-darwin ] fadno-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] fadno: [ i686-linux, x86_64-linux, x86_64-darwin ] + failure-detector: [ i686-linux, x86_64-linux, x86_64-darwin ] FailureT: [ i686-linux, x86_64-linux, x86_64-darwin ] fake-type: [ i686-linux, x86_64-linux, x86_64-darwin ] falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ] fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-nats: [ i686-linux, x86_64-linux, x86_64-darwin ] + fasta: [ i686-linux, x86_64-linux, x86_64-darwin ] fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] + fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] fastedit: [ i686-linux, x86_64-linux, x86_64-darwin ] fastirc: [ i686-linux, x86_64-linux, x86_64-darwin ] + FastPush: [ i686-linux, x86_64-linux, x86_64-darwin ] FastxPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ] fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4212,7 +4371,9 @@ dont-distribute-packages: fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fca: [ i686-linux, x86_64-linux, x86_64-darwin ] + fcache: [ i686-linux, x86_64-linux, x86_64-darwin ] fcd: [ i686-linux, x86_64-linux, x86_64-darwin ] + fcg: [ i686-linux, x86_64-linux, x86_64-darwin ] fckeditor: [ i686-linux, x86_64-linux, x86_64-darwin ] fclabels-monadlib: [ i686-linux, x86_64-linux, x86_64-darwin ] FComp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4220,6 +4381,7 @@ dont-distribute-packages: feature-flipper-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] fedora-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + feed-collect: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-crawl: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4234,6 +4396,7 @@ dont-distribute-packages: 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-light: [ i686-linux, x86_64-linux, x86_64-darwin ] ffmpeg-tutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] fgl-extras-decompositions: [ i686-linux, x86_64-linux, x86_64-darwin ] fibon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4244,31 +4407,31 @@ dont-distribute-packages: file-collection: [ i686-linux, x86_64-linux, x86_64-darwin ] file-command-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] file-location: [ i686-linux, x86_64-linux, x86_64-darwin ] - filecache: [ "x86_64-darwin" ] filediff: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] - filepath-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] - filepather: [ i686-linux, x86_64-linux, x86_64-darwin ] - FilePather: [ i686-linux, x86_64-linux, x86_64-darwin ] Files: [ i686-linux, x86_64-linux, x86_64-darwin ] + filestore: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] fillit: [ i686-linux, x86_64-linux, x86_64-darwin ] filtrable: [ i686-linux, x86_64-linux, x86_64-darwin ] + Fin: [ i686-linux, x86_64-linux, x86_64-darwin ] + fin: [ i686-linux, x86_64-linux, x86_64-darwin ] + final-pretty-printer: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] find-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] FiniteMap: [ i686-linux, x86_64-linux, x86_64-darwin ] + firefly-example: [ i686-linux, x86_64-linux, x86_64-darwin ] first-and-last: [ i686-linux, x86_64-linux, x86_64-darwin ] firstify: [ i686-linux, x86_64-linux, x86_64-darwin ] FirstOrderTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] fit: [ i686-linux, x86_64-linux, x86_64-darwin ] fitsio: [ i686-linux, x86_64-linux, x86_64-darwin ] - fitspec: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-symbols-gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-point-vector-space: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4276,17 +4439,18 @@ dont-distribute-packages: fixed-point: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-vector-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-vector-cborg: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-vector-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixer: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixplate: [ "x86_64-darwin" ] + fixie: [ i686-linux, x86_64-linux, x86_64-darwin ] + fizzbuzz: [ i686-linux, x86_64-linux, x86_64-darwin ] flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ] flac: [ i686-linux, x86_64-linux, x86_64-darwin ] flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ] flamingra: [ i686-linux, x86_64-linux, x86_64-darwin ] flat-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] + flat: [ i686-linux, x86_64-linux, x86_64-darwin ] flexible-time: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap-smallcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4303,6 +4467,8 @@ dont-distribute-packages: flower: [ i686-linux, x86_64-linux, x86_64-darwin ] flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] + fluent-logger-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + fluent-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] fmark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4310,6 +4476,8 @@ dont-distribute-packages: fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] + foldl-transduce-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + foldl-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ] folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] follower: [ i686-linux, x86_64-linux, x86_64-darwin ] foma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4321,6 +4489,7 @@ dont-distribute-packages: forecast-io: [ i686-linux, x86_64-linux, x86_64-darwin ] foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ] forest-fire: [ i686-linux, x86_64-linux, x86_64-darwin ] + Forestry: [ i686-linux, x86_64-linux, x86_64-darwin ] forger: [ i686-linux, x86_64-linux, x86_64-darwin ] forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] ForkableT: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4335,17 +4504,19 @@ dont-distribute-packages: formura: [ i686-linux, x86_64-linux, x86_64-darwin ] ForSyDe: [ i686-linux, x86_64-linux, x86_64-darwin ] forth-hll: [ i686-linux, x86_64-linux, x86_64-darwin ] + Fortnite-Hack-Cheats-Free-V-Bucks-Generator: [ i686-linux, x86_64-linux, x86_64-darwin ] + fortytwo: [ i686-linux, x86_64-linux, x86_64-darwin ] foscam-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] foscam-filename: [ i686-linux, x86_64-linux, x86_64-darwin ] foscam-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] Foster: [ i686-linux, x86_64-linux, x86_64-darwin ] - foundation-edge: [ i686-linux, x86_64-linux, x86_64-darwin ] fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] fptest: [ i686-linux, x86_64-linux, x86_64-darwin ] Fractaler: [ i686-linux, x86_64-linux, x86_64-darwin ] fractals: [ i686-linux, x86_64-linux, x86_64-darwin ] frag: [ i686-linux, x86_64-linux, x86_64-darwin ] + Frames: [ i686-linux, x86_64-linux, x86_64-darwin ] franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] fraxl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4361,30 +4532,33 @@ dont-distribute-packages: free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] - freelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + freer-converse: [ i686-linux, x86_64-linux, x86_64-darwin ] + freer-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] FreeTypeGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + fresco-binding: [ i686-linux, x86_64-linux, x86_64-darwin ] fresh: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] + frown: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] - frpnow-gtk3: [ "x86_64-darwin" ] + frpnow-vty: [ 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 ] fsnotify-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] - fswatch: [ 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 ] + ftp-client: [ i686-linux, x86_64-linux, x86_64-darwin ] ftp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] FTPLine: [ i686-linux, x86_64-linux, x86_64-darwin ] ftshell: [ i686-linux, x86_64-linux, x86_64-darwin ] full-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] - full-text-search: [ i686-linux, x86_64-linux, x86_64-darwin ] fullstop: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot-client: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot-git-hook: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4393,7 +4567,9 @@ dont-distribute-packages: function-combine: [ i686-linux, x86_64-linux, x86_64-darwin ] function-instances-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] + functor-infix: [ i686-linux, x86_64-linux, x86_64-darwin ] functor-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + functor: [ i686-linux, x86_64-linux, x86_64-darwin ] functorm: [ i686-linux, x86_64-linux, x86_64-darwin ] Fungi: [ i686-linux, x86_64-linux, x86_64-darwin ] funion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4403,30 +4579,39 @@ dont-distribute-packages: futun: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] - fuzzytime: [ "x86_64-darwin" ] + fuzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] g-npm: [ i686-linux, x86_64-linux, x86_64-darwin ] + g4ip-prover: [ 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 ] game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - Gamgine: [ i686-linux, x86_64-linux, x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] garepinoh: [ i686-linux, x86_64-linux, x86_64-darwin ] + gargoyle-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + gargoyle: [ i686-linux, x86_64-linux, x86_64-darwin ] gbu: [ i686-linux, x86_64-linux, x86_64-darwin ] gc-monitoring-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gcodehs: [ i686-linux, x86_64-linux, x86_64-darwin ] gdax: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - GeBoP: [ "x86_64-darwin" ] + GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] + gedcom: [ i686-linux, x86_64-linux, x86_64-darwin ] geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] geek: [ i686-linux, x86_64-linux, x86_64-darwin ] gegl: [ i686-linux, x86_64-linux, x86_64-darwin ] + gelatin-freetype2: [ i686-linux, x86_64-linux, x86_64-darwin ] + gelatin-fruity: [ i686-linux, x86_64-linux, x86_64-darwin ] + gelatin-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + gelatin-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] + gelatin-shaders: [ i686-linux, x86_64-linux, x86_64-darwin ] gelatin: [ i686-linux, x86_64-linux, x86_64-darwin ] gemstone: [ i686-linux, x86_64-linux, x86_64-darwin ] + gen-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] gen-passwd: [ i686-linux, x86_64-linux, x86_64-darwin ] gencheck: [ i686-linux, x86_64-linux, x86_64-darwin ] gender: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4435,12 +4620,14 @@ dont-distribute-packages: general-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] GeneralTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] generators: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-accessors: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-church: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] genericserialize: [ i686-linux, x86_64-linux, x86_64-darwin ] genesis-test: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4456,70 +4643,114 @@ dont-distribute-packages: GenSmsPdu: [ i686-linux, x86_64-linux, x86_64-darwin ] gentlemark: [ i686-linux, x86_64-linux, x86_64-darwin ] GenussFold: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec-binary: [ 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-scientific: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-time: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-unordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] geo-resolver: [ i686-linux, x86_64-linux, x86_64-darwin ] GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ] geodetic: [ i686-linux, x86_64-linux, x86_64-darwin ] + geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] geojson-types: [ i686-linux, x86_64-linux, x86_64-darwin ] geojson: [ i686-linux, x86_64-linux, x86_64-darwin ] geolite-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] geom2d: [ i686-linux, x86_64-linux, x86_64-darwin ] GeomPredicates-SSE: [ i686-linux, x86_64-linux, x86_64-darwin ] + geos: [ i686-linux, x86_64-linux, x86_64-darwin ] + Get: [ i686-linux, x86_64-linux, x86_64-darwin ] getemx: [ i686-linux, x86_64-linux, x86_64-darwin ] getflag: [ i686-linux, x86_64-linux, x86_64-darwin ] + gf: [ i686-linux, x86_64-linux, x86_64-darwin ] GGg: [ i686-linux, x86_64-linux, x86_64-darwin ] ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-compact: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-core-smallstep: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-datasize: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-dump-util: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dup: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-heap-view: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-make: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-justdoit: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-mod: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-proofs: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-usage: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-time-alloc-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-history-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom-jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-dom-jsffi: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-fetch: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-hplay: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-cairo: [ "x86_64-darwin" ] - gi-gdk: [ "x86_64-darwin" ] + gi-atk: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-dbusmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-dbusmenugtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gdkpixbuf: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdkx11: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gio: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gobject: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gstbase: [ 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-gtk-hs: [ "x86_64-darwin" ] - gi-gtk: [ "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 ] gi-gtkosxapplication: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gtksource: [ "x86_64-darwin" ] + gi-gtksource: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-pangocairo: [ "x86_64-darwin" ] + gi-ostree: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-pangocairo: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-secret: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-soup: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-xlib: [ i686-linux, x86_64-linux, x86_64-darwin ] giak: [ i686-linux, x86_64-linux, x86_64-darwin ] Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ] + ginsu: [ i686-linux, x86_64-linux, x86_64-darwin ] gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] + giphy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] gist: [ i686-linux, x86_64-linux, x86_64-darwin ] GiST: [ i686-linux, x86_64-linux, x86_64-darwin ] git-all: [ i686-linux, x86_64-linux, x86_64-darwin ] git-checklist: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-config: [ i686-linux, x86_64-linux, x86_64-darwin ] git-date: [ i686-linux, x86_64-linux, x86_64-darwin ] git-fmt: [ i686-linux, x86_64-linux, x86_64-darwin ] git-freq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4532,25 +4763,33 @@ dont-distribute-packages: git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] + github-data: [ i686-linux, x86_64-linux, x86_64-darwin ] github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + githud: [ i686-linux, x86_64-linux, x86_64-darwin ] gitignore: [ i686-linux, x86_64-linux, x86_64-darwin ] gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-libgit2: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-sample: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-test: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib: [ i686-linux, x86_64-linux, x86_64-darwin ] gitson: [ i686-linux, x86_64-linux, x86_64-darwin ] gitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + givegif: [ i686-linux, x86_64-linux, x86_64-darwin ] glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ] glapp: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react-widget: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react: [ 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 ] - GLFW: [ "x86_64-darwin" ] - GLHUI: [ "x86_64-darwin" ] gli: [ i686-linux, x86_64-linux, x86_64-darwin ] - glirc: [ i686-linux, x86_64-linux, x86_64-darwin ] - gll: [ i686-linux, x86_64-linux, x86_64-darwin ] + glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] + glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] GLMatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] glob-posix: [ i686-linux, x86_64-linux, x86_64-darwin ] global-config: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4558,12 +4797,15 @@ dont-distribute-packages: global: [ i686-linux, x86_64-linux, x86_64-darwin ] glome-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] - GlomeVec: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeView: [ 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-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 ] + glue-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] + glue-example: [ i686-linux, x86_64-linux, x86_64-darwin ] glue: [ i686-linux, x86_64-linux, x86_64-darwin ] gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] gmndl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4571,7 +4813,6 @@ dont-distribute-packages: gnome-keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gnss-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] - gnuidn: [ i686-linux, x86_64-linux, x86_64-darwin ] goa: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-core: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-geometry: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4580,51 +4821,174 @@ dont-distribute-packages: goat: [ i686-linux, x86_64-linux, x86_64-darwin ] goatee-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] goatee: [ i686-linux, x86_64-linux, x86_64-darwin ] + gochan: [ i686-linux, x86_64-linux, x86_64-darwin ] gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + goggles-gcs: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-adexchange-buyer: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-adexchange-seller: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-admin-datatransfer: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-admin-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-admin-emailmigration: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-admin-reports: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-adsense-host: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-adsense: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-affiliates: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-android-enterprise: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-android-publisher: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-appengine: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-apps-activity: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-apps-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-apps-licensing: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-apps-reseller: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-apps-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-appstate: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-autoscaler: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-bigquery: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-billing: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-blogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-books: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-civicinfo: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-classroom: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-cloudmonitoring: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-cloudtrace: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-compute: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-container: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-containerbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-customsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-dataflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-dataproc: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-datastore: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-deploymentmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-dfareporting: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-dns: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-doubleclick-bids: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-doubleclick-search: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-firebase-dynamiclinks: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-firebase-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-fitness: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-fonts: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-freebasesearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-fusiontables: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-games-configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-games-management: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-games: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-genomics: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-gmail: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-groups-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-groups-settings: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-iam: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-identity-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-kgsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-language: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-latencytest: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-manufacturers: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-maps-coordinate: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-maps-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-mirror: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-ml: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-monitoring: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-pagespeed: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-partners: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-people: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-play-moviespartner: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-plus-domains: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-prediction: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-proximitybeacon: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-pubsub: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-qpxexpress: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-replicapool-updater: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-replicapool: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-resourcemanager: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-resourceviews: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-runtimeconfig: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-safebrowsing: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-script: [ 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-siteverification: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-slides: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-spectrum: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-sqladmin: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-storage-transfer: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-tagmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-taskqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-urlshortener: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-useraccounts: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-vision: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-webmaster-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-youtube-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-youtube-reporting: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-youtube: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-oauth2-for-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-mail-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-maps-geocoding: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-oauth2-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] google-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-search: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-server-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-static-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] + GoogleCodeJam: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleDirections: [ i686-linux, x86_64-linux, x86_64-darwin ] googleplus: [ i686-linux, x86_64-linux, x86_64-darwin ] googlepolyline: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleSB: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleTranslate: [ i686-linux, x86_64-linux, x86_64-darwin ] + gopher-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] gopherbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + gore-and-ash-actor: [ i686-linux, x86_64-linux, x86_64-darwin ] + gore-and-ash-async: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-network: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] GotoT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - gotta-go-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] gpah: [ i686-linux, x86_64-linux, x86_64-darwin ] - gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Collada: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - GPipe-GLFW: [ "x86_64-darwin" ] + GPipe-GLFW: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ] - GPipe: [ "x86_64-darwin" ] + GPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] gps2htmlReport: [ i686-linux, x86_64-linux, x86_64-darwin ] gps: [ i686-linux, x86_64-linux, x86_64-darwin ] gpx-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] GPX: [ i686-linux, x86_64-linux, x86_64-darwin ] graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] + Grafos: [ i686-linux, x86_64-linux, x86_64-darwin ] grakn: [ 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-ui-gtk: [ "x86_64-darwin" ] + graph-matchings: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-rewriting-cl: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-lambdascope: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-ski: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-rewriting-trs: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-ww: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-visit: [ i686-linux, x86_64-linux, x86_64-darwin ] Graph500: [ i686-linux, x86_64-linux, x86_64-darwin ] + Graphalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] graphbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] graphene: [ i686-linux, x86_64-linux, x86_64-darwin ] GraphHammer-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4633,8 +4997,6 @@ dont-distribute-packages: graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphite: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphql-api: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4642,18 +5004,21 @@ dont-distribute-packages: graylog: [ i686-linux, x86_64-linux, x86_64-darwin ] greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] greencard: [ i686-linux, x86_64-linux, x86_64-darwin ] + greenclip: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + greplicate: [ i686-linux, x86_64-linux, x86_64-darwin ] + greskell: [ i686-linux, x86_64-linux, x86_64-darwin ] grid: [ 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 ] gridland: [ i686-linux, x86_64-linux, x86_64-darwin ] grm: [ i686-linux, x86_64-linux, x86_64-darwin ] + gross: [ i686-linux, x86_64-linux, x86_64-darwin ] GroteTrap: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] - group-by-date: [ "x86_64-darwin" ] group-with: [ i686-linux, x86_64-linux, x86_64-darwin ] Grow: [ i686-linux, x86_64-linux, x86_64-darwin ] growler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4664,15 +5029,13 @@ dont-distribute-packages: gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ] - gstreamer: [ "x86_64-darwin" ] - gstreamer: [ i686-linux, x86_64-linux, x86_64-darwin ] + gstorable: [ i686-linux, x86_64-linux, x86_64-darwin ] GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-largeTreeStore: [ "x86_64-darwin" ] gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-strut: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-traymanager: [ "x86_64-darwin" ] gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4683,32 +5046,30 @@ dont-distribute-packages: gtk2hs-rpn: [ i686-linux, x86_64-linux, x86_64-darwin ] Gtk2hsGenerics: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk3-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk3: [ "x86_64-darwin" ] gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkrsync: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtksourceview3: [ i686-linux, x86_64-linux, x86_64-darwin ] guarded-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] guid: [ i686-linux, x86_64-linux, x86_64-darwin ] GuiHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] GuiTV: [ i686-linux, x86_64-linux, x86_64-darwin ] - gulcii: [ i686-linux, x86_64-linux, x86_64-darwin ] gyah-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] + gym-http-api: [ i686-linux, x86_64-linux, x86_64-darwin ] h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ] h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] h2048: [ i686-linux, x86_64-linux, x86_64-darwin ] h2c: [ i686-linux, x86_64-linux, x86_64-darwin ] - H: [ "x86_64-darwin" ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] habit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hablog: [ i686-linux, x86_64-linux, x86_64-darwin ] Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-frontend-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-frontend-monadcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-evhttp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4720,35 +5081,42 @@ dont-distribute-packages: hack-middleware-cleanpath: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-middleware-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-middleware-jsonp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack2-contrib-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-happstack-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-mongrel2-http: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-mirror: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-processing: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-repo-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-sparks: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-whatsnew: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage2hwn: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackager: [ i686-linux, x86_64-linux, x86_64-darwin ] hackernews: [ i686-linux, x86_64-linux, x86_64-darwin ] HackMail: [ i686-linux, x86_64-linux, x86_64-darwin ] hackmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] hactor: [ i686-linux, x86_64-linux, x86_64-darwin ] hactors: [ i686-linux, x86_64-linux, x86_64-darwin ] + haddock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] haddock-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] + haddock-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] haddocset: [ i686-linux, x86_64-linux, x86_64-darwin ] + hadolint: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-formats: [ i686-linux, x86_64-linux, x86_64-darwin ] - hadoop-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] haggis: [ i686-linux, x86_64-linux, x86_64-darwin ] Haggressive: [ i686-linux, x86_64-linux, x86_64-darwin ] haiji: [ i686-linux, x86_64-linux, x86_64-darwin ] + hail: [ i686-linux, x86_64-linux, x86_64-darwin ] hailgun-send: [ i686-linux, x86_64-linux, x86_64-darwin ] hairy: [ i686-linux, x86_64-linux, x86_64-darwin ] hakaru: [ i686-linux, x86_64-linux, x86_64-darwin ] hakismet: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakka: [ i686-linux, x86_64-linux, x86_64-darwin ] hako: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-agda: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-blaze-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4757,6 +5125,9 @@ dont-distribute-packages: hakyll-contrib-hyphenation: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-dir-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-filestore: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4768,11 +5139,11 @@ dont-distribute-packages: halma-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] halma-telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] halma: [ i686-linux, x86_64-linux, x86_64-darwin ] - hamid: [ "x86_64-darwin" ] HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hamtsolo: [ i686-linux, x86_64-linux, x86_64-darwin ] hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] handa-gdata: [ i686-linux, x86_64-linux, x86_64-darwin ] handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4793,11 +5164,12 @@ dont-distribute-packages: happs-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-Util: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-authenticate: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-data: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-dlg: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-fay-ajax: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-hamlet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4805,25 +5177,29 @@ dont-distribute-packages: happstack-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-hstringtemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-monad-peel: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-server-tls-cryptonite: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-static-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-util: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-yui: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara-webkit-server: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara: [ i686-linux, x86_64-linux, x86_64-darwin ] + HappyTree: [ i686-linux, x86_64-linux, x86_64-darwin ] hapstone: [ i686-linux, x86_64-linux, x86_64-darwin ] HaPy: [ i686-linux, x86_64-linux, x86_64-darwin ] + haquery: [ i686-linux, x86_64-linux, x86_64-darwin ] + haquil: [ i686-linux, x86_64-linux, x86_64-darwin ] harchive: [ i686-linux, x86_64-linux, x86_64-darwin ] hardware-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] hark: [ i686-linux, x86_64-linux, x86_64-darwin ] HARM: [ i686-linux, x86_64-linux, x86_64-darwin ] harmony: [ i686-linux, x86_64-linux, x86_64-darwin ] - HarmTrace-Base: [ i686-linux, x86_64-linux, x86_64-darwin ] HarmTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] haroonga-httpd: [ i686-linux, x86_64-linux, x86_64-darwin ] haroonga: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4831,7 +5207,6 @@ dont-distribute-packages: has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] HasCacBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] - hascar: [ i686-linux, x86_64-linux, x86_64-darwin ] hascas: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4842,6 +5217,7 @@ dont-distribute-packages: hash: [ i686-linux, x86_64-linux, x86_64-darwin ] hashable-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] hashable-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] + hashabler: [ i686-linux, x86_64-linux, x86_64-darwin ] hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] hashring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4855,6 +5231,7 @@ dont-distribute-packages: haskdeep: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeem: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeline-class: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelisp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-abci: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-aliyun: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-awk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4862,18 +5239,23 @@ dont-distribute-packages: haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-conll: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-dap: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-gi: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-holes-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-kubernetes: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-lsp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-mpfr: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-names: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-neo4j-client: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-pdf-presenter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-platform-test: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-player: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4889,7 +5271,13 @@ dont-distribute-packages: haskell-tools-ast-fromghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-builtin-refactorings: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-experimental-refactorings: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4925,6 +5313,8 @@ dont-distribute-packages: haskellscript: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellTorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellTutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskey-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskey: [ i686-linux, x86_64-linux, x86_64-darwin ] haskgame: [ i686-linux, x86_64-linux, x86_64-darwin ] haskheap: [ i686-linux, x86_64-linux, x86_64-darwin ] haskhol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4945,33 +5335,44 @@ dont-distribute-packages: haskore-synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] haskore: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskus-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskus-system-build: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskus-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasmin: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-class: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-cursor-query: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-cursor-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-optparse-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-app: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-prim: [ i686-linux, x86_64-linux, x86_64-darwin ] haste: [ i686-linux, x86_64-linux, x86_64-darwin ] hat: [ i686-linux, x86_64-linux, x86_64-darwin ] Hate: [ i686-linux, x86_64-linux, x86_64-darwin ] + hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] hats: [ i686-linux, x86_64-linux, x86_64-darwin ] + haven: [ i686-linux, x86_64-linux, x86_64-darwin ] haverer: [ i686-linux, x86_64-linux, x86_64-darwin ] HaVSA: [ i686-linux, x86_64-linux, x86_64-darwin ] hawitter: [ i686-linux, x86_64-linux, x86_64-darwin ] Hawk: [ i686-linux, x86_64-linux, x86_64-darwin ] hax: [ i686-linux, x86_64-linux, x86_64-darwin ] + haxl-amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] haxl-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] haxparse: [ i686-linux, x86_64-linux, x86_64-darwin ] haxr-th: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4989,6 +5390,8 @@ dont-distribute-packages: hblock: [ i686-linux, x86_64-linux, x86_64-darwin ] HCard: [ i686-linux, x86_64-linux, x86_64-darwin ] hcc: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcg-minus-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcg-minus: [ i686-linux, x86_64-linux, x86_64-darwin ] hcheat: [ i686-linux, x86_64-linux, x86_64-darwin ] hchesslib: [ i686-linux, x86_64-linux, x86_64-darwin ] HCL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5002,35 +5405,47 @@ dont-distribute-packages: hdaemonize-buildfix: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbc-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] HDBC-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdbc-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] HDBC-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdbc-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdf: [ i686-linux, x86_64-linux, x86_64-darwin ] hDFA: [ i686-linux, x86_64-linux, x86_64-darwin ] hdigest: [ i686-linux, x86_64-linux, x86_64-darwin ] hdirect: [ i686-linux, x86_64-linux, x86_64-darwin ] hdis86: [ i686-linux, x86_64-linux, x86_64-darwin ] hdiscount: [ i686-linux, x86_64-linux, x86_64-darwin ] hdm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdocs: [ i686-linux, x86_64-linux, x86_64-darwin ] hdph-closure: [ i686-linux, x86_64-linux, x86_64-darwin ] hdph: [ i686-linux, x86_64-linux, x86_64-darwin ] hdr-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] HDRUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] headergen: [ i686-linux, x86_64-linux, x86_64-darwin ] + heap: [ i686-linux, x86_64-linux, x86_64-darwin ] + heavy-logger-amazon: [ 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-checkers-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hedgehog-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] + hedgehog-gen-json: [ i686-linux, x86_64-linux, x86_64-darwin ] Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hedis-config: [ 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 ] hedis-tags: [ i686-linux, x86_64-linux, x86_64-darwin ] + hedn: [ i686-linux, x86_64-linux, x86_64-darwin ] hein: [ i686-linux, x86_64-linux, x86_64-darwin ] heist-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] heist-async: [ i686-linux, x86_64-linux, x86_64-darwin ] heist: [ i686-linux, x86_64-linux, x86_64-darwin ] helics-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] helics: [ i686-linux, x86_64-linux, x86_64-darwin ] + helisp: [ i686-linux, x86_64-linux, x86_64-darwin ] helium: [ i686-linux, x86_64-linux, x86_64-darwin ] helix: [ i686-linux, x86_64-linux, x86_64-darwin ] hell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5048,6 +5463,7 @@ dont-distribute-packages: herbalizer: [ i686-linux, x86_64-linux, x86_64-darwin ] HerbiePlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] heredocs: [ i686-linux, x86_64-linux, x86_64-darwin ] + herf-time: [ i686-linux, x86_64-linux, x86_64-darwin ] Hermes: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5062,13 +5478,15 @@ dont-distribute-packages: heukarya: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexchat: [ i686-linux, x86_64-linux, x86_64-darwin ] hexif: [ i686-linux, x86_64-linux, x86_64-darwin ] hexml-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpress: [ i686-linux, x86_64-linux, x86_64-darwin ] hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ] + heyefi: [ i686-linux, x86_64-linux, x86_64-darwin ] hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] hfann: [ i686-linux, x86_64-linux, x86_64-darwin ] hfd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5108,13 +5526,12 @@ dont-distribute-packages: hgeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeometry: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeos: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgettext: [ i686-linux, x86_64-linux, x86_64-darwin ] hgis: [ i686-linux, x86_64-linux, x86_64-darwin ] hgithub: [ i686-linux, x86_64-linux, x86_64-darwin ] hgom: [ i686-linux, x86_64-linux, x86_64-darwin ] hgopher: [ i686-linux, x86_64-linux, x86_64-darwin ] HGraphStorage: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgrev: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] hgrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hharp: [ i686-linux, x86_64-linux, x86_64-darwin ] HHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5122,7 +5539,6 @@ dont-distribute-packages: hi: [ i686-linux, x86_64-linux, x86_64-darwin ] hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hid: [ "x86_64-darwin" ] hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5130,24 +5546,23 @@ dont-distribute-packages: hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] HiggsSet: [ i686-linux, x86_64-linux, x86_64-darwin ] - higher-leveldb: [ "x86_64-darwin" ] higherorder: [ i686-linux, x86_64-linux, x86_64-darwin ] + highlight-versions: [ i686-linux, x86_64-linux, x86_64-darwin ] + highlight: [ i686-linux, x86_64-linux, x86_64-darwin ] highWaterMark: [ i686-linux, x86_64-linux, x86_64-darwin ] himg: [ i686-linux, x86_64-linux, x86_64-darwin ] himpy: [ i686-linux, x86_64-linux, x86_64-darwin ] hindley-milner: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinotify-bytestring: [ "x86_64-darwin" ] hinquire: [ i686-linux, x86_64-linux, x86_64-darwin ] hinstaller: [ i686-linux, x86_64-linux, x86_64-darwin ] hint-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hinterface: [ i686-linux, x86_64-linux, x86_64-darwin ] hinvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] hip: [ i686-linux, x86_64-linux, x86_64-darwin ] hipbot: [ i686-linux, x86_64-linux, x86_64-darwin ] hipchat-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] hipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hipmunk-Utils: [ "x86_64-darwin" ] - Hipmunk: [ "x86_64-darwin" ] HipmunkPlayground: [ i686-linux, x86_64-linux, x86_64-darwin ] hircules: [ i686-linux, x86_64-linux, x86_64-darwin ] hirt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5163,6 +5578,8 @@ dont-distribute-packages: hjcase: [ i686-linux, x86_64-linux, x86_64-darwin ] hjs: [ i686-linux, x86_64-linux, x86_64-darwin ] HJScript: [ i686-linux, x86_64-linux, x86_64-darwin ] + hjsonpointer: [ i686-linux, x86_64-linux, x86_64-darwin ] + hjsonschema: [ i686-linux, x86_64-linux, x86_64-darwin ] HJVM: [ i686-linux, x86_64-linux, x86_64-darwin ] hlatex: [ i686-linux, x86_64-linux, x86_64-darwin ] hlbfgsb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5173,9 +5590,7 @@ dont-distribute-packages: HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-iadd: [ 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 ] @@ -5183,34 +5598,38 @@ dont-distribute-packages: 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 ] + 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 ] HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlrdb: [ i686-linux, x86_64-linux, x86_64-darwin ] + hls: [ i686-linux, x86_64-linux, x86_64-darwin ] hlwm: [ i686-linux, x86_64-linux, x86_64-darwin ] hly: [ i686-linux, x86_64-linux, x86_64-darwin ] HMap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmark: [ i686-linux, x86_64-linux, x86_64-darwin ] hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-backprop: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-morpheus: [ 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-special: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmidi: [ "x86_64-darwin" ] hmk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmm: [ i686-linux, x86_64-linux, x86_64-darwin ] HMM: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmm: [ i686-linux, x86_64-linux, x86_64-darwin ] hMollom: [ i686-linux, x86_64-linux, x86_64-darwin ] hmp3: [ i686-linux, x86_64-linux, x86_64-darwin ] Hmpf: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmt-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmt: [ i686-linux, x86_64-linux, x86_64-darwin ] hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ] hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ] hnix: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5222,33 +5641,37 @@ dont-distribute-packages: hobbes: [ i686-linux, x86_64-linux, x86_64-darwin ] hobbits: [ i686-linux, x86_64-linux, x86_64-darwin ] hocilib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hocker: [ i686-linux, x86_64-linux, x86_64-darwin ] hodatime: [ i686-linux, x86_64-linux, x86_64-darwin ] HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] Hoed: [ i686-linux, x86_64-linux, x86_64-darwin ] hofix-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] hog: [ i686-linux, x86_64-linux, x86_64-darwin ] hogg: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoggl: [ i686-linux, x86_64-linux, x86_64-darwin ] hogre-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hogre: [ i686-linux, x86_64-linux, x86_64-darwin ] hois: [ i686-linux, x86_64-linux, x86_64-darwin ] - hol: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoist-error: [ i686-linux, x86_64-linux, x86_64-darwin ] hold-em: [ i686-linux, x86_64-linux, x86_64-darwin ] hole: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-Distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-MapReduce: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-Searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-Storage: [ i686-linux, x86_64-linux, x86_64-darwin ] + holy-project: [ i686-linux, x86_64-linux, x86_64-darwin ] homeomorphic: [ i686-linux, x86_64-linux, x86_64-darwin ] hommage: [ i686-linux, x86_64-linux, x86_64-darwin ] + homoiconic: [ i686-linux, x86_64-linux, x86_64-darwin ] homplexity: [ i686-linux, x86_64-linux, x86_64-darwin ] HongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] honi: [ i686-linux, x86_64-linux, x86_64-darwin ] - honk: [ "x86_64-darwin" ] hoobuddy: [ i686-linux, x86_64-linux, x86_64-darwin ] hood-off: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodie: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-core: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodle-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-publish: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-render: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5260,6 +5683,7 @@ dont-distribute-packages: hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] + hops: [ i686-linux, x86_64-linux, x86_64-darwin ] hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] horizon: [ i686-linux, x86_64-linux, x86_64-darwin ] horname: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5271,18 +5695,21 @@ dont-distribute-packages: hp2any-core: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpack-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpack-dhall: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco: [ i686-linux, x86_64-linux, x86_64-darwin ] hpage: [ i686-linux, x86_64-linux, x86_64-darwin ] hpapi: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaste: [ i686-linux, x86_64-linux, x86_64-darwin ] hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpath: [ "x86_64-darwin" ] HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] + hPDB-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + hPDB: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] + HPhone: [ i686-linux, x86_64-linux, x86_64-darwin ] HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hplayground: [ i686-linux, x86_64-linux, x86_64-darwin ] hplaylist: [ i686-linux, x86_64-linux, x86_64-darwin ] HPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] hpodder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5290,19 +5717,18 @@ dont-distribute-packages: hpqtypes-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] hpqtypes: [ i686-linux, x86_64-linux, x86_64-darwin ] hprotoc-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - hprotoc: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-kmeans: [ i686-linux, x86_64-linux, x86_64-darwin ] + hps: [ i686-linux, x86_64-linux, x86_64-darwin ] hPushover: [ i686-linux, x86_64-linux, x86_64-darwin ] hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ] hquantlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hquery: [ i686-linux, x86_64-linux, x86_64-darwin ] hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] HRay: [ 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 ] + 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 ] @@ -5331,22 +5757,29 @@ dont-distribute-packages: hs-pgms: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pkpass: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-re: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-rs-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-scrape: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-snowtify: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-twitterarchiver: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-watchman: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs2ats: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsaml2: [ 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 ] + hsbc: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher-codespeed: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-auditor: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-db: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5355,6 +5788,8 @@ dont-distribute-packages: hsc3-rec: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-rw: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-sf-hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-sf: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hscaffold: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5364,11 +5799,11 @@ dont-distribute-packages: hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] hscope: [ i686-linux, x86_64-linux, x86_64-darwin ] hScraper: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdif: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsed: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsemail-ns: [ i686-linux, x86_64-linux, x86_64-darwin ] hsenv: [ i686-linux, x86_64-linux, x86_64-darwin ] hsfacter: [ i686-linux, x86_64-linux, x86_64-darwin ] hsfcsh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5382,17 +5817,20 @@ dont-distribute-packages: HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHTSLib: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsI2C: [ "x86_64-darwin" ] + hsignal: [ i686-linux, x86_64-linux, x86_64-darwin ] hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ] HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] hskeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] hslackbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] hslibsvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - HSlippyMap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hslinks: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsluv-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsmodetweaks: [ 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 ] hsnock: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5412,15 +5850,19 @@ dont-distribute-packages: 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-setup: [ 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 ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] hspkcs11: [ i686-linux, x86_64-linux, x86_64-darwin ] hspread: [ i686-linux, x86_64-linux, x86_64-darwin ] hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ] hsprocess: [ i686-linux, x86_64-linux, x86_64-darwin ] hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsql-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsql-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsql-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsql: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel-vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-manic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5431,9 +5873,9 @@ dont-distribute-packages: hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] hsreadability: [ i686-linux, x86_64-linux, x86_64-darwin ] hsseccomp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsshellscript: [ "x86_64-darwin" ] - hssourceinfo: [ "x86_64-darwin" ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] + hssqlppp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] hstats: [ i686-linux, x86_64-linux, x86_64-darwin ] hstest: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5446,19 +5888,19 @@ dont-distribute-packages: 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 ] - HSvm: [ i686-linux, x86_64-linux, x86_64-darwin ] hswip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] hsXenCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] hsyscall: [ i686-linux, x86_64-linux, x86_64-darwin ] hsyslog-tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsyslog-udp: [ i686-linux, x86_64-linux, x86_64-darwin ] hszephyr: [ i686-linux, x86_64-linux, x86_64-darwin ] HTab: [ i686-linux, x86_64-linux, x86_64-darwin ] hTalos: [ i686-linux, x86_64-linux, x86_64-darwin ] htar: [ i686-linux, x86_64-linux, x86_64-darwin ] + htestu: [ i686-linux, x86_64-linux, x86_64-darwin ] HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] + htlset: [ i686-linux, x86_64-linux, x86_64-darwin ] html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] html-tokenizer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5468,12 +5910,18 @@ dont-distribute-packages: http-client-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-request-modifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-client-session: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-conduit-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-conduit-downloader: [ i686-linux, x86_64-linux, x86_64-darwin ] http-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] http-kinder: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-pony-serve-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-response-decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-reverse-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] http-shed: [ i686-linux, x86_64-linux, x86_64-darwin ] http-wget: [ i686-linux, x86_64-linux, x86_64-darwin ] http2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5483,15 +5931,15 @@ dont-distribute-packages: htune: [ i686-linux, x86_64-linux, x86_64-darwin ] htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] hubris: [ i686-linux, x86_64-linux, x86_64-darwin ] - huckleberry: [ "x86_64-darwin" ] + huck: [ i686-linux, x86_64-linux, x86_64-darwin ] HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ] huff: [ i686-linux, x86_64-linux, x86_64-darwin ] + huffman: [ i686-linux, x86_64-linux, x86_64-darwin ] hugs2yc: [ i686-linux, x86_64-linux, x86_64-darwin ] hulk: [ i686-linux, x86_64-linux, x86_64-darwin ] HulkImport: [ i686-linux, x86_64-linux, x86_64-darwin ] hums: [ i686-linux, x86_64-linux, x86_64-darwin ] hunch: [ i686-linux, x86_64-linux, x86_64-darwin ] - hunit-dejafu: [ "x86_64-darwin" ] HUnit-Diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5505,27 +5953,30 @@ dont-distribute-packages: huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-kafka-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-prim-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] + hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hwhile: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hXmixer: [ "x86_64-darwin" ] HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] HXQ: [ i686-linux, x86_64-linux, x86_64-darwin ] hxt-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + hxt-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] hxt-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] hxthelper: [ i686-linux, x86_64-linux, x86_64-darwin ] hxweb: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyahtzee: [ i686-linux, x86_64-linux, x86_64-darwin ] hyakko: [ i686-linux, x86_64-linux, x86_64-darwin ] hybrid: [ i686-linux, x86_64-linux, x86_64-darwin ] hydra-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5539,14 +5990,16 @@ dont-distribute-packages: hydrogen-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-util: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] hylolib: [ i686-linux, x86_64-linux, x86_64-darwin ] hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ] hyloutils: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyper-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyperloglog: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperloglogplus: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperpublic: [ i686-linux, x86_64-linux, x86_64-darwin ] hypher: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5554,13 +6007,17 @@ dont-distribute-packages: i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] iap-verifier: [ i686-linux, x86_64-linux, x86_64-darwin ] ib-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + iban: [ i686-linux, x86_64-linux, x86_64-darwin ] + ical: [ i686-linux, x86_64-linux, x86_64-darwin ] IcoGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] - iconv-typed: [ "x86_64-darwin" ] + icon-fonts: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend-common: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend-server: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] ideas-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + ideas: [ i686-linux, x86_64-linux, x86_64-darwin ] idempotent: [ i686-linux, x86_64-linux, x86_64-darwin ] + identifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] idna2008: [ i686-linux, x86_64-linux, x86_64-darwin ] IDynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5570,23 +6027,15 @@ dont-distribute-packages: IFS: [ i686-linux, x86_64-linux, x86_64-darwin ] ig: [ i686-linux, x86_64-linux, x86_64-darwin ] ige-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] + ige: [ i686-linux, x86_64-linux, x86_64-darwin ] igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] igrf: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-charts: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-display: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-hatex: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-magic: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-rlangqq: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] illuminate: [ i686-linux, x86_64-linux, x86_64-darwin ] imagemagick: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5603,6 +6052,7 @@ dont-distribute-packages: implicit-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ] implicit: [ i686-linux, x86_64-linux, x86_64-darwin ] + importify: [ 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 ] improve: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5610,7 +6060,9 @@ dont-distribute-packages: inch: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] + incremental-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] increments: [ i686-linux, x86_64-linux, x86_64-darwin ] + indents: [ i686-linux, x86_64-linux, x86_64-darwin ] indexed-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] IndexedList: [ i686-linux, x86_64-linux, x86_64-darwin ] indices: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5624,7 +6076,6 @@ dont-distribute-packages: inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inject-function: [ i686-linux, x86_64-linux, x86_64-darwin ] - inline-r: [ "x86_64-darwin" ] inserts: [ i686-linux, x86_64-linux, x86_64-darwin ] inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5633,51 +6084,58 @@ dont-distribute-packages: instant-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + instapaper-sender: [ i686-linux, x86_64-linux, x86_64-darwin ] integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + interlude-l: [ i686-linux, x86_64-linux, x86_64-darwin ] internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] + intero: [ i686-linux, x86_64-linux, x86_64-darwin ] interpol: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] interruptible: [ i686-linux, x86_64-linux, x86_64-darwin ] - intricacy: [ "x86_64-darwin" ] intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] introduction-test: [ i686-linux, x86_64-linux, x86_64-darwin ] introduction: [ 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-hxt: [ i686-linux, x86_64-linux, x86_64-darwin ] + invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] ion: [ i686-linux, x86_64-linux, x86_64-darwin ] IOR: [ i686-linux, x86_64-linux, x86_64-darwin ] IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] + iostring: [ i686-linux, x86_64-linux, x86_64-darwin ] iothread: [ i686-linux, x86_64-linux, x86_64-darwin ] iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] ip2location: [ i686-linux, x86_64-linux, x86_64-darwin ] - ip: [ i686-linux, x86_64-linux, x86_64-darwin ] ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ] ipc: [ i686-linux, x86_64-linux, x86_64-darwin ] ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] IPv6DB: [ i686-linux, x86_64-linux, x86_64-darwin ] - ipython-kernel: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-client: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ] Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] + iri: [ i686-linux, x86_64-linux, x86_64-darwin ] iridium: [ i686-linux, x86_64-linux, x86_64-darwin ] iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ] ironforge: [ i686-linux, x86_64-linux, x86_64-darwin ] + irt: [ i686-linux, x86_64-linux, x86_64-darwin ] + isdicom: [ i686-linux, x86_64-linux, x86_64-darwin ] isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] - isiz: [ "x86_64-darwin" ] ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] IsNull: [ i686-linux, x86_64-linux, x86_64-darwin ] iso8583-bitmaps: [ i686-linux, x86_64-linux, x86_64-darwin ] isobmff-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] isohunt: [ i686-linux, x86_64-linux, x86_64-darwin ] + isotope: [ i686-linux, x86_64-linux, x86_64-darwin ] + itemfield: [ i686-linux, x86_64-linux, x86_64-darwin ] iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5694,17 +6152,17 @@ dont-distribute-packages: ivy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] ixdopp: [ i686-linux, x86_64-linux, x86_64-darwin ] ixmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] + ixshader: [ i686-linux, x86_64-linux, x86_64-darwin ] iyql: [ i686-linux, x86_64-linux, x86_64-darwin ] j2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] jack-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] - jack: [ "x86_64-darwin" ] - jack: [ i686-linux, x86_64-linux, x86_64-darwin ] - jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ] JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ] + jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ] jacobi-roots: [ i686-linux, x86_64-linux, x86_64-darwin ] jail: [ i686-linux, x86_64-linux, x86_64-darwin ] jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ] jalla: [ i686-linux, x86_64-linux, x86_64-darwin ] + jammittools: [ 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 ] @@ -5712,13 +6170,14 @@ dont-distribute-packages: java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] javaclass: [ i686-linux, x86_64-linux, x86_64-darwin ] - javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] Javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] + javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] javav: [ i686-linux, x86_64-linux, x86_64-darwin ] Javav: [ i686-linux, x86_64-linux, x86_64-darwin ] jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] Jdh: [ i686-linux, x86_64-linux, x86_64-darwin ] jdi: [ i686-linux, x86_64-linux, x86_64-darwin ] + jenga: [ i686-linux, x86_64-linux, x86_64-darwin ] jenkinsPlugins2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5727,44 +6186,57 @@ dont-distribute-packages: jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ] jort: [ i686-linux, x86_64-linux, x86_64-darwin ] js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle-clib: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-wkwebview: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsmw: [ i686-linux, x86_64-linux, x86_64-darwin ] json-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-ast-json-encoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-ast-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-autotype: [ i686-linux, x86_64-linux, x86_64-darwin ] json-b: [ i686-linux, x86_64-linux, x86_64-darwin ] JSON-Combinator-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] JSON-Combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-encoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] json-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-feed: [ i686-linux, x86_64-linux, x86_64-darwin ] json-incremental-decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-litobj: [ i686-linux, x86_64-linux, x86_64-darwin ] json-pointer-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] json-python: [ i686-linux, x86_64-linux, x86_64-darwin ] json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ] json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] json2-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] json2: [ i686-linux, x86_64-linux, x86_64-darwin ] JSONb: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsonextfilter: [ i686-linux, x86_64-linux, x86_64-darwin ] JsonGrammar: [ i686-linux, x86_64-linux, x86_64-darwin ] + JSONParser: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonresume: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonrpc-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsons-to-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonsql: [ 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 ] + judge: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] juicy-gcode: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB-driver-gdbm: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + JuPyTer-notebook: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm-batching: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5777,7 +6249,6 @@ dont-distribute-packages: kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] - kanji: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5788,10 +6259,9 @@ dont-distribute-packages: katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] - kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] + kdt: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-environment-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-lightmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-protectedmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5807,11 +6277,13 @@ dont-distribute-packages: keera-posture: [ i686-linux, x86_64-linux, x86_64-darwin ] keiretsu: [ i686-linux, x86_64-linux, x86_64-darwin ] Ketchup: [ i686-linux, x86_64-linux, x86_64-darwin ] + keter: [ i686-linux, x86_64-linux, x86_64-darwin ] kevin: [ i686-linux, x86_64-linux, x86_64-darwin ] keyed: [ i686-linux, x86_64-linux, x86_64-darwin ] keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] keysafe: [ i686-linux, x86_64-linux, x86_64-darwin ] keystore: [ i686-linux, x86_64-linux, x86_64-darwin ] + keyvaluehash: [ i686-linux, x86_64-linux, x86_64-darwin ] keyword-args: [ i686-linux, x86_64-linux, x86_64-darwin ] khph: [ i686-linux, x86_64-linux, x86_64-darwin ] kicad-data: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5822,6 +6294,7 @@ dont-distribute-packages: kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] kit: [ i686-linux, x86_64-linux, x86_64-darwin ] kmeans-par: [ i686-linux, x86_64-linux, x86_64-darwin ] + kmp-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] knead-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] knead: [ i686-linux, x86_64-linux, x86_64-darwin ] knots: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5835,12 +6308,12 @@ dont-distribute-packages: KSP: [ i686-linux, x86_64-linux, x86_64-darwin ] ktx: [ i686-linux, x86_64-linux, x86_64-darwin ] kure-your-boilerplate: [ i686-linux, x86_64-linux, x86_64-darwin ] - kyotocabinet: [ "x86_64-darwin" ] KyotoCabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] l-bfgs-b: [ i686-linux, x86_64-linux, x86_64-darwin ] L-seed: [ i686-linux, x86_64-linux, x86_64-darwin ] labeled-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] laborantin-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + labsat: [ i686-linux, x86_64-linux, x86_64-darwin ] labyrinth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] labyrinth: [ i686-linux, x86_64-linux, x86_64-darwin ] lagrangian: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5871,31 +6344,37 @@ dont-distribute-packages: lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaNet: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaPrettyQuote: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdatex: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdatwit: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaya-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] Lambdaya: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] lame-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] lame: [ i686-linux, x86_64-linux, x86_64-darwin ] + lang: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-ats: [ i686-linux, x86_64-linux, x86_64-darwin ] language-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] language-boogie: [ i686-linux, x86_64-linux, x86_64-darwin ] language-c-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] language-c-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-c-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] language-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-dockerfile: [ i686-linux, x86_64-linux, x86_64-darwin ] language-eiffel: [ i686-linux, x86_64-linux, x86_64-darwin ] language-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] language-gcl: [ i686-linux, x86_64-linux, x86_64-darwin ] language-go: [ i686-linux, x86_64-linux, x86_64-darwin ] language-guess: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-hcl: [ i686-linux, x86_64-linux, x86_64-darwin ] language-java-classfile: [ i686-linux, x86_64-linux, x86_64-darwin ] language-kort: [ i686-linux, x86_64-linux, x86_64-darwin ] language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-lua2: [ i686-linux, x86_64-linux, x86_64-darwin ] language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] language-ninja: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-oberon: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-puppet: [ "x86_64-darwin" ] + language-puppet: [ i686-linux, x86_64-darwin ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5903,6 +6382,11 @@ dont-distribute-packages: language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-webidl: [ i686-linux, x86_64-linux, x86_64-darwin ] + lapack-carray: [ i686-linux, x86_64-linux, x86_64-darwin ] + lapack-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] + lapack: [ i686-linux, x86_64-linux, x86_64-darwin ] LargeCardinalHierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] Lastik: [ i686-linux, x86_64-linux, x86_64-darwin ] lat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5910,23 +6394,25 @@ dont-distribute-packages: latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-image: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - latex-function-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] LATS: [ i686-linux, x86_64-linux, x86_64-darwin ] launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + layered-state: [ i686-linux, x86_64-linux, x86_64-darwin ] layers-game: [ i686-linux, x86_64-linux, x86_64-darwin ] layers: [ i686-linux, x86_64-linux, x86_64-darwin ] layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + layouting: [ i686-linux, x86_64-linux, x86_64-darwin ] + lazy-hash-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] + lazy-hash: [ i686-linux, x86_64-linux, x86_64-darwin ] + lazy-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] lazyarray: [ i686-linux, x86_64-linux, x86_64-darwin ] lazyset: [ i686-linux, x86_64-linux, x86_64-darwin ] lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ] LazyVault: [ i686-linux, x86_64-linux, x86_64-darwin ] lcs: [ i686-linux, x86_64-linux, x86_64-darwin ] - LDAP: [ i686-linux, x86_64-linux, x86_64-darwin ] ldapply: [ i686-linux, x86_64-linux, x86_64-darwin ] ldif: [ i686-linux, x86_64-linux, x86_64-darwin ] leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] - leancheck: [ "x86_64-darwin" ] leapseconds: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5937,19 +6423,21 @@ dont-distribute-packages: legion: [ 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 ] - lens-properties: [ i686-linux, x86_64-linux, x86_64-darwin ] + lens-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ] + lens-toml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] lensref: [ i686-linux, x86_64-linux, x86_64-darwin ] lenz-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + lenz: [ i686-linux, x86_64-linux, x86_64-darwin ] Level0: [ i686-linux, x86_64-linux, x86_64-darwin ] leveldb-haskell-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - leveldb-haskell: [ "x86_64-darwin" ] levmar-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] + lfst: [ i686-linux, x86_64-linux, x86_64-darwin ] lgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] lha: [ i686-linux, x86_64-linux, x86_64-darwin ] lhae: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5962,8 +6450,8 @@ dont-distribute-packages: libcspm: [ i686-linux, x86_64-linux, x86_64-darwin ] libexpect: [ i686-linux, x86_64-linux, x86_64-darwin ] libGenI: [ i686-linux, x86_64-linux, x86_64-darwin ] - libgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] libhbb: [ i686-linux, x86_64-linux, x86_64-darwin ] + libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] liblastfm: [ i686-linux, x86_64-linux, x86_64-darwin ] liblawless: [ i686-linux, x86_64-linux, x86_64-darwin ] liblinear-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5974,17 +6462,16 @@ dont-distribute-packages: libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] librandomorg: [ 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 ] + librato: [ i686-linux, x86_64-linux, x86_64-darwin ] + libstackexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] - libvirt-hs: [ "x86_64-darwin" ] libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] LibZip: [ i686-linux, x86_64-linux, x86_64-darwin ] + lifted-protolude: [ 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 ] @@ -6000,9 +6487,11 @@ dont-distribute-packages: linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] + linear-socket: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] + linearscan: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6011,12 +6500,7 @@ dont-distribute-packages: linode-v4: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-cgroup: [ i686-linux, x86_64-linux, x86_64-darwin ] - linux-evdev: [ "x86_64-darwin" ] - linux-file-extents: [ "x86_64-darwin" ] - linux-inotify: [ "x86_64-darwin" ] linux-kmod: [ i686-linux, x86_64-linux, x86_64-darwin ] - linux-mount: [ "x86_64-darwin" ] - linux-namespaces: [ "x86_64-darwin" ] linux-perf: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-ptrace: [ i686-linux, x86_64-linux, x86_64-darwin ] linx-gateway: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6026,14 +6510,19 @@ dont-distribute-packages: liquid: [ 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 ] + list-fusion-probe: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-prompt: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-remote-forwards: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ] + listenbrainz-client: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + ListT: [ i686-linux, x86_64-linux, x86_64-darwin ] lit: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6049,20 +6538,22 @@ dont-distribute-packages: llvm-general-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-hs: [ "x86_64-darwin" ] + llvm-hs-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-pkg-config: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - lmdb-high-level: [ "x86_64-darwin" ] - lmdb-simple: [ "x86_64-darwin" ] - lmdb: [ "x86_64-darwin" ] + lmdb-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - loc: [ "x86_64-darwin" ] + load-font: [ i686-linux, x86_64-linux, x86_64-darwin ] local-search: [ i686-linux, x86_64-linux, x86_64-darwin ] + located-monad-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] loch: [ i686-linux, x86_64-linux, x86_64-darwin ] + lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] + lockpool: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6094,6 +6585,7 @@ dont-distribute-packages: lookup-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] loop-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] loop-while: [ i686-linux, x86_64-linux, x86_64-darwin ] + loops: [ i686-linux, x86_64-linux, x86_64-darwin ] loopy: [ i686-linux, x86_64-linux, x86_64-darwin ] lord: [ i686-linux, x86_64-linux, x86_64-darwin ] lorem: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6107,8 +6599,12 @@ dont-distribute-packages: lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ] LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + ltext: [ i686-linux, x86_64-linux, x86_64-darwin ] ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] + lua-bc: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] + luautils: [ i686-linux, x86_64-linux, x86_64-darwin ] + lucid-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ] lui: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6121,35 +6617,44 @@ dont-distribute-packages: lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] - lxd-client-config: [ i686-linux, x86_64-linux, x86_64-darwin ] lxd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ] lz4-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + lzma-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma: [ i686-linux, x86_64-linux, x86_64-darwin ] maam: [ i686-linux, x86_64-linux, x86_64-darwin ] macbeth-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + machinecell: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] + machines-process: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] maclight: [ i686-linux, x86_64-linux, x86_64-darwin ] macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] madlang: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] + magic-wormhole: [ i686-linux, x86_64-linux, x86_64-darwin ] + magicbane: [ i686-linux, x86_64-linux, x86_64-darwin ] + MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] magico: [ i686-linux, x86_64-linux, x86_64-darwin ] magma: [ i686-linux, x86_64-linux, x86_64-darwin ] mahoro: [ i686-linux, x86_64-linux, x86_64-darwin ] maid: [ i686-linux, x86_64-linux, x86_64-darwin ] + mailbox-count: [ i686-linux, x86_64-linux, x86_64-darwin ] mailchimp-subscribe: [ i686-linux, x86_64-linux, x86_64-darwin ] mailchimp: [ i686-linux, x86_64-linux, x86_64-darwin ] MailchimpSimple: [ i686-linux, x86_64-linux, x86_64-darwin ] mailgun: [ i686-linux, x86_64-linux, x86_64-darwin ] + main-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ] majority: [ i686-linux, x86_64-linux, x86_64-darwin ] make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ] + make-monofoldable-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] make-package: [ i686-linux, x86_64-linux, x86_64-darwin ] makedo: [ i686-linux, x86_64-linux, x86_64-darwin ] + makefile: [ i686-linux, x86_64-linux, x86_64-darwin ] mallard: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6168,9 +6673,10 @@ dont-distribute-packages: mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - manifolds-core: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] + Mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] + mapquest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6178,20 +6684,19 @@ dont-distribute-packages: marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] marquise: [ i686-linux, x86_64-linux, x86_64-darwin ] mars: [ i686-linux, x86_64-linux, x86_64-darwin ] + marvin: [ i686-linux, x86_64-linux, x86_64-darwin ] masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] MASMGen: [ i686-linux, x86_64-linux, x86_64-darwin ] master-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] matchers: [ i686-linux, x86_64-linux, x86_64-darwin ] mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-qc: [ i686-linux, x86_64-linux, x86_64-darwin ] mattermost-api: [ i686-linux, x86_64-linux, x86_64-darwin ] maude: [ i686-linux, x86_64-linux, x86_64-darwin ] - maxent-learner-hw-gui: [ "x86_64-darwin" ] maxent: [ i686-linux, x86_64-linux, x86_64-darwin ] maxsharing: [ i686-linux, x86_64-linux, x86_64-darwin ] maybench: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6202,6 +6707,7 @@ dont-distribute-packages: 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 ] + mcm: [ 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 ] @@ -6219,19 +6725,24 @@ dont-distribute-packages: 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-rtp: [ i686-linux, x86_64-linux, x86_64-darwin ] + mediabus: [ i686-linux, x86_64-linux, x86_64-darwin ] + median-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] medium-sdk-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - mellon-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - mellon-gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] + mega-sdist: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-web: [ i686-linux, x86_64-linux, x86_64-darwin ] melody: [ i686-linux, x86_64-linux, x86_64-darwin ] + memcache-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + memcache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] memcached-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] memcached: [ i686-linux, x86_64-linux, x86_64-darwin ] memis: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] memoization-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + memorable-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] mercury-api: [ i686-linux, x86_64-linux, x86_64-darwin ] merge-bash-history: [ i686-linux, x86_64-linux, x86_64-darwin ] merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6242,7 +6753,6 @@ dont-distribute-packages: MetaHDBC: [ i686-linux, x86_64-linux, x86_64-darwin ] metaplug: [ i686-linux, x86_64-linux, x86_64-darwin ] metric: [ i686-linux, x86_64-linux, x86_64-darwin ] - metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] metronome: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6256,18 +6766,16 @@ dont-distribute-packages: microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ] microlens-each: [ i686-linux, x86_64-linux, x86_64-darwin ] micrologger: [ i686-linux, x86_64-linux, x86_64-darwin ] + microsoft-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] midair: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi-util: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi: [ i686-linux, x86_64-linux, x86_64-darwin ] midimory: [ i686-linux, x86_64-linux, x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] - mime-string: [ i686-linux, x86_64-linux, x86_64-darwin ] + mikmod: [ i686-linux, x86_64-linux, x86_64-darwin ] minecraft-data: [ i686-linux, x86_64-linux, x86_64-darwin ] minesweeper: [ i686-linux, x86_64-linux, x86_64-darwin ] MiniAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6288,12 +6796,15 @@ dont-distribute-packages: mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] + mmark-cli: [ 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 ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] + Mobile-Legends-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] + model: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - modern-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] + modify-fasta: [ i686-linux, x86_64-linux, x86_64-darwin ] modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6303,32 +6814,34 @@ dont-distribute-packages: modulo: [ i686-linux, x86_64-linux, x86_64-darwin ] MoeDict: [ i686-linux, x86_64-linux, x86_64-darwin ] mohws: [ i686-linux, x86_64-linux, x86_64-darwin ] - mole: [ i686-linux, x86_64-linux, x86_64-darwin ] mollie-api-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-abort-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-dijkstra: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-finally: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-http: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-levels: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-lgbt: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-log: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-lrs: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-mersenne-random: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-open: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-parallel-progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ran: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-resumption: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ste: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-io: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-task: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-tx: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-unify: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-wrap: [ i686-linux, x86_64-linux, x86_64-darwin ] monadacme: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-mtl-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6341,6 +6854,7 @@ dont-distribute-packages: MonadLab: [ i686-linux, x86_64-linux, x86_64-darwin ] monadLib-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] monadloc-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadlog: [ i686-linux, x86_64-linux, x86_64-darwin ] monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadStack: [ i686-linux, x86_64-linux, x86_64-darwin ] monarch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6352,11 +6866,11 @@ dont-distribute-packages: money: [ i686-linux, x86_64-linux, x86_64-darwin ] mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] - monky: [ "x86_64-darwin" ] + monky: [ i686-linux, x86_64-linux, x86_64-darwin ] mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] - monoid-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] + monoid-subclasses: [ i686-linux, x86_64-linux, x86_64-darwin ] monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6365,7 +6879,6 @@ dont-distribute-packages: moonshine: [ i686-linux, x86_64-linux, x86_64-darwin ] morfette: [ i686-linux, x86_64-linux, x86_64-darwin ] morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] - morph: [ i686-linux, x86_64-linux, x86_64-darwin ] mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] motor-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] motor-reflection: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6381,6 +6894,9 @@ dont-distribute-packages: mprover: [ i686-linux, x86_64-linux, x86_64-darwin ] mps: [ i686-linux, x86_64-linux, x86_64-darwin ] mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mqtt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mqtt: [ i686-linux, x86_64-linux, x86_64-darwin ] + mrifk: [ i686-linux, x86_64-linux, x86_64-darwin ] mrm: [ i686-linux, x86_64-linux, x86_64-darwin ] ms: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6393,7 +6909,7 @@ dont-distribute-packages: MTGBuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] mtgoxapi: [ i686-linux, x86_64-linux, x86_64-darwin ] mtl-evil-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - mtl-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + mtl-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] mtlx: [ i686-linux, x86_64-linux, x86_64-darwin ] mtp: [ i686-linux, x86_64-linux, x86_64-darwin ] MuCheck-Hspec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6406,23 +6922,25 @@ dont-distribute-packages: mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + multi-ghc-travis: [ i686-linux, x86_64-linux, x86_64-darwin ] multiaddr: [ i686-linux, x86_64-linux, x86_64-darwin ] + multifile: [ i686-linux, x86_64-linux, x86_64-darwin ] multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] multipass: [ i686-linux, x86_64-linux, x86_64-darwin ] + multipath: [ i686-linux, x86_64-linux, x86_64-darwin ] multiplate-simplified: [ i686-linux, x86_64-linux, x86_64-darwin ] multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec-alt-deriver: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - multirec: [ i686-linux, x86_64-linux, x86_64-darwin ] multisetrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] - multistate: [ i686-linux, x86_64-linux, x86_64-darwin ] multivariant: [ i686-linux, x86_64-linux, x86_64-darwin ] Munkres-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] muon: [ i686-linux, x86_64-linux, x86_64-darwin ] murder: [ i686-linux, x86_64-linux, x86_64-darwin ] murmur: [ i686-linux, x86_64-linux, x86_64-darwin ] murmurhash3: [ i686-linux, x86_64-linux, x86_64-darwin ] + mushu: [ i686-linux, x86_64-linux, x86_64-darwin ] music-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] music-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] music-pitch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6430,6 +6948,7 @@ dont-distribute-packages: music-score: [ i686-linux, x86_64-linux, x86_64-darwin ] music-sibelius: [ i686-linux, x86_64-linux, x86_64-darwin ] music-suite: [ i686-linux, x86_64-linux, x86_64-darwin ] + music-util: [ i686-linux, x86_64-linux, x86_64-darwin ] musicbrainz-email: [ i686-linux, x86_64-linux, x86_64-darwin ] musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6441,19 +6960,27 @@ dont-distribute-packages: mvc: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + mxnet-nn: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-nnvm: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet: [ i686-linux, x86_64-linux, x86_64-darwin ] + my-package-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] + my-test-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] + myanimelist-export: [ i686-linux, x86_64-linux, x86_64-darwin ] + mybitcoin-sci: [ i686-linux, x86_64-linux, x86_64-darwin ] myo: [ i686-linux, x86_64-linux, x86_64-darwin ] MyPrimes: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysql-haskell-nem: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] mystem: [ i686-linux, x86_64-linux, x86_64-darwin ] myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ] mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] + n-ary-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] nakadi-client: [ i686-linux, x86_64-linux, x86_64-darwin ] named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6473,7 +7000,6 @@ dont-distribute-packages: narc: [ i686-linux, x86_64-linux, x86_64-darwin ] nat-sized-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] native: [ i686-linux, x86_64-linux, x86_64-darwin ] - nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] naver-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] NearContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6489,13 +7015,16 @@ dont-distribute-packages: nero-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] nero-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] nero: [ i686-linux, x86_64-linux, x86_64-darwin ] + nest: [ i686-linux, x86_64-linux, x86_64-darwin ] nested-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] NestedFunctor: [ i686-linux, x86_64-linux, x86_64-darwin ] nestedmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + netclock: [ i686-linux, x86_64-linux, x86_64-darwin ] netcore: [ i686-linux, x86_64-linux, x86_64-darwin ] netease-fm: [ i686-linux, x86_64-linux, x86_64-darwin ] netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] - netlink: [ "x86_64-darwin" ] + netrc: [ i686-linux, x86_64-linux, x86_64-darwin ] + netrium: [ i686-linux, x86_64-linux, x86_64-darwin ] NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] netstring-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6508,17 +7037,17 @@ dont-distribute-packages: network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] network-api-support: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bitcoin: [ i686-linux, x86_64-linux, x86_64-darwin ] network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] network-dbus: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-dns: [ i686-linux, x86_64-linux, x86_64-darwin ] network-hans: [ i686-linux, x86_64-linux, x86_64-darwin ] network-interfacerequest: [ i686-linux, x86_64-linux, x86_64-darwin ] network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-msgpack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] network-netpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-protocol-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] network-rpca: [ i686-linux, x86_64-linux, x86_64-darwin ] network-server: [ i686-linux, x86_64-linux, x86_64-darwin ] network-service: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6527,8 +7056,9 @@ dont-distribute-packages: network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] network-topic-models: [ i686-linux, x86_64-linux, x86_64-darwin ] network-transport-amqp: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-transport-zeromq: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-uri-json: [ i686-linux, x86_64-linux, x86_64-darwin ] network-uri-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-voicetext: [ i686-linux, x86_64-linux, x86_64-darwin ] network-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] network-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] neural-network-blashs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6549,8 +7079,12 @@ dont-distribute-packages: nikepub: [ i686-linux, x86_64-linux, x86_64-darwin ] nimber: [ i686-linux, x86_64-linux, x86_64-darwin ] Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] + nirum: [ i686-linux, x86_64-linux, x86_64-darwin ] nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] - nix-paths: [ "x86_64-darwin" ] + nix-delegate: [ i686-linux, x86_64-linux, x86_64-darwin ] + nix-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ] + nix-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] @@ -6567,17 +7101,21 @@ dont-distribute-packages: Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] + non-empty-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] nonlinear-optimization-ad: [ i686-linux, x86_64-linux, x86_64-darwin ] nonlinear-optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + not-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] notcpp: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-web: [ i686-linux, x86_64-linux, x86_64-darwin ] + notzero: [ i686-linux, x86_64-linux, x86_64-darwin ] np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] + nqe: [ i686-linux, x86_64-linux, x86_64-darwin ] ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ] NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ] null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6588,16 +7126,24 @@ dont-distribute-packages: NumberTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-ode: [ i686-linux, x86_64-linux, x86_64-darwin ] + numeric-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-array: [ i686-linux, x86_64-linux, x86_64-darwin ] + numhask-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] + numhask-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask: [ 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 ] + nvim-hs-ghcid: [ i686-linux, x86_64-linux, x86_64-darwin ] + nvim-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] NXT: [ i686-linux, x86_64-linux, x86_64-darwin ] NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] nylas: [ i686-linux, x86_64-linux, x86_64-darwin ] nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ] + o-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] + oanda-rest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ] obd: [ i686-linux, x86_64-linux, x86_64-darwin ] obdd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6606,22 +7152,26 @@ dont-distribute-packages: Object: [ i686-linux, x86_64-linux, x86_64-darwin ] objectid: [ i686-linux, x86_64-linux, x86_64-darwin ] ObjectIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + ocaml-export: [ i686-linux, x86_64-linux, x86_64-darwin ] octane: [ i686-linux, x86_64-linux, x86_64-darwin ] octohat: [ i686-linux, x86_64-linux, x86_64-darwin ] octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] + odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] OddWord: [ i686-linux, x86_64-linux, x86_64-darwin ] oden-go-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] + odpic-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] off-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] oi: [ i686-linux, x86_64-linux, x86_64-darwin ] oidc-client: [ i686-linux, x86_64-linux, x86_64-darwin ] ois-input-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] old-version: [ i686-linux, x86_64-linux, x86_64-darwin ] olwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] + om-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] omaketex: [ i686-linux, x86_64-linux, x86_64-darwin ] + ombra: [ i686-linux, x86_64-linux, x86_64-darwin ] omega: [ i686-linux, x86_64-linux, x86_64-darwin ] Omega: [ i686-linux, x86_64-linux, x86_64-darwin ] omnicodec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6630,15 +7180,18 @@ dont-distribute-packages: onama: [ i686-linux, x86_64-linux, x86_64-darwin ] oneormore: [ i686-linux, x86_64-linux, x86_64-darwin ] online: [ i686-linux, x86_64-linux, x86_64-darwin ] + onpartitions: [ i686-linux, x86_64-linux, x86_64-darwin ] OnRmt: [ i686-linux, x86_64-linux, x86_64-darwin ] onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + opaleye-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-signals: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-symbology: [ i686-linux, x86_64-linux, x86_64-darwin ] open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenAL: [ "x86_64-darwin" ] - opench-meteo: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLWrappers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6661,13 +7214,14 @@ dont-distribute-packages: opentype: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + openweathermap: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] opml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - opn: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + optional: [ i686-linux, x86_64-linux, x86_64-darwin ] optparse-applicative-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + optparse-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] orchestrate: [ i686-linux, x86_64-linux, x86_64-darwin ] OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6676,6 +7230,7 @@ dont-distribute-packages: order-statistic-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] order-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] orders: [ i686-linux, x86_64-linux, x86_64-darwin ] + Ordinary: [ i686-linux, x86_64-linux, x86_64-darwin ] ordrea: [ i686-linux, x86_64-linux, x86_64-darwin ] organize-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6691,22 +7246,31 @@ dont-distribute-packages: oso2pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] ot: [ i686-linux, x86_64-linux, x86_64-darwin ] otp-authenticator: [ i686-linux, x86_64-linux, x86_64-darwin ] + overload: [ i686-linux, x86_64-linux, x86_64-darwin ] + overloaded-records: [ i686-linux, x86_64-linux, x86_64-darwin ] overture: [ i686-linux, x86_64-linux, x86_64-darwin ] pack: [ i686-linux, x86_64-linux, x86_64-darwin ] + package-o-tron: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] packed-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] packed-multikey-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + packed: [ i686-linux, x86_64-linux, x86_64-darwin ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] packman: [ i686-linux, x86_64-linux, x86_64-darwin ] + packunused: [ i686-linux, x86_64-linux, x86_64-darwin ] pacman-memcache: [ i686-linux, x86_64-linux, x86_64-darwin ] padKONTROL: [ i686-linux, x86_64-linux, x86_64-darwin ] pagarme: [ i686-linux, x86_64-linux, x86_64-darwin ] PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ] + pam: [ i686-linux, x86_64-linux, x86_64-darwin ] panda: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-crossref: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-include-code: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-include: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -6714,22 +7278,31 @@ dont-distribute-packages: 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-export: [ i686-linux, x86_64-linux, x86_64-darwin ] + papa-implement: [ i686-linux, x86_64-linux, x86_64-darwin ] + papa-include: [ i686-linux, x86_64-linux, x86_64-darwin ] + papa-prelude-core: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-prelude-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + papa-prelude-semigroupoids: [ i686-linux, x86_64-linux, x86_64-darwin ] + papa-prelude-semigroups: [ i686-linux, x86_64-linux, x86_64-darwin ] + papa-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + paphragen: [ i686-linux, x86_64-linux, x86_64-darwin ] pappy: [ i686-linux, x86_64-linux, x86_64-darwin ] paprika: [ i686-linux, x86_64-linux, x86_64-darwin ] paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] + Parallel-Arrows-Eden: [ i686-linux, x86_64-linux, x86_64-darwin ] parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] - parameterized: [ i686-linux, x86_64-linux, x86_64-darwin ] + paramtree: [ i686-linux, x86_64-linux, x86_64-darwin ] paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco: [ i686-linux, x86_64-linux, x86_64-darwin ] parconc-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] pareto: [ i686-linux, x86_64-linux, x86_64-darwin ] - parport: [ "x86_64-darwin" ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] + parsec-free: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] parseerror-eq: [ i686-linux, x86_64-linux, x86_64-darwin ] parsely: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6739,13 +7312,14 @@ dont-distribute-packages: parsestar: [ i686-linux, x86_64-linux, x86_64-darwin ] partage: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial: [ i686-linux, x86_64-linux, x86_64-darwin ] + partial-order: [ i686-linux, x86_64-linux, x86_64-darwin ] partly: [ i686-linux, x86_64-linux, x86_64-darwin ] passage: [ i686-linux, x86_64-linux, x86_64-darwin ] PasswordGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] pasta: [ i686-linux, x86_64-linux, x86_64-darwin ] pastis: [ i686-linux, x86_64-linux, x86_64-darwin ] pasty: [ i686-linux, x86_64-linux, x86_64-darwin ] + patat: [ i686-linux, x86_64-linux, x86_64-darwin ] patches-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] Pathfinder: [ i686-linux, x86_64-linux, x86_64-darwin ] pathfindingcore: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6755,6 +7329,7 @@ dont-distribute-packages: paypal-adaptive-hoops: [ i686-linux, x86_64-linux, x86_64-darwin ] paypal-api: [ i686-linux, x86_64-linux, x86_64-darwin ] paypal-rest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + pb-next: [ i686-linux, x86_64-linux, x86_64-darwin ] pb: [ i686-linux, x86_64-linux, x86_64-darwin ] pbc4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] PBKDF2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6762,7 +7337,7 @@ dont-distribute-packages: PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT: [ i686-linux, x86_64-linux, x86_64-darwin ] pcre-light-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdfname: [ i686-linux, x86_64-linux, x86_64-darwin ] + pdf-slave: [ i686-linux, x86_64-linux, x86_64-darwin ] pdfsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] pdynload: [ i686-linux, x86_64-linux, x86_64-darwin ] peakachu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6771,6 +7346,7 @@ dont-distribute-packages: peg: [ i686-linux, x86_64-linux, x86_64-darwin ] peggy: [ i686-linux, x86_64-linux, x86_64-darwin ] pell: [ i686-linux, x86_64-linux, x86_64-darwin ] + pencil: [ i686-linux, x86_64-linux, x86_64-darwin ] penny-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] penny-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] penny: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6792,8 +7368,12 @@ dont-distribute-packages: persistent-equivalence: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-relational-record: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-test: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] persona-idp: [ i686-linux, x86_64-linux, x86_64-darwin ] persona: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6806,10 +7386,12 @@ dont-distribute-packages: pg-recorder: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-store: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-transact: [ i686-linux, x86_64-linux, x86_64-darwin ] + pgdl: [ i686-linux, x86_64-linux, x86_64-darwin ] pgsql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] - phoityne: [ "x86_64-darwin" ] + phaser: [ i686-linux, x86_64-linux, x86_64-darwin ] + phone-metadata: [ 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 ] phooey: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6822,25 +7404,37 @@ dont-distribute-packages: pia-forward: [ i686-linux, x86_64-linux, x86_64-darwin ] pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] picologic: [ i686-linux, x86_64-linux, x86_64-darwin ] + picoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] + pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] - piki: [ i686-linux, x86_64-linux, x86_64-darwin ] + pig: [ i686-linux, x86_64-linux, x86_64-darwin ] + pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ] + pinpon: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-break: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-bzip: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-core: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-courier: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-fastx: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-group: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-illumina: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-io: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-lines: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-lzma: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-network-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-p2p-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6850,29 +7444,36 @@ dont-distribute-packages: pipes-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-shell: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-zeromq4: [ i686-linux, x86_64-linux, x86_64-darwin ] pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] + Piso: [ i686-linux, x86_64-linux, x86_64-darwin ] pit: [ i686-linux, x86_64-linux, x86_64-darwin ] pitchtrack: [ 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 ] + pkcs10: [ i686-linux, x86_64-linux, x86_64-darwin ] + pkcs7: [ 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 ] + plan-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] planar-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] plat: [ i686-linux, x86_64-linux, x86_64-darwin ] platinum-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] PlayingCards: [ i686-linux, x86_64-linux, x86_64-darwin ] + plex: [ 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-gtk3: [ "x86_64-darwin" ] - Plot-ho-matic: [ "x86_64-darwin" ] + plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-light: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot-light-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + plots: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] - plumbers: [ i686-linux, x86_64-linux, x86_64-darwin ] png-file: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6880,6 +7481,7 @@ dont-distribute-packages: pocket: [ i686-linux, x86_64-linux, x86_64-darwin ] point-octree: [ i686-linux, x86_64-linux, x86_64-darwin ] pointfree-fancy: [ i686-linux, x86_64-linux, x86_64-darwin ] + pointful: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] pokemon-go-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6889,86 +7491,104 @@ dont-distribute-packages: polh-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] polimorf: [ i686-linux, x86_64-linux, x86_64-darwin ] Pollutocracy: [ i686-linux, x86_64-linux, x86_64-darwin ] + poly-cont: [ i686-linux, x86_64-linux, x86_64-darwin ] poly-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + polydata-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + polydata: [ i686-linux, x86_64-linux, x86_64-darwin ] polynom: [ i686-linux, x86_64-linux, x86_64-darwin ] polynomial: [ i686-linux, x86_64-linux, x86_64-darwin ] polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] pomodoro: [ i686-linux, x86_64-linux, x86_64-darwin ] + pomohoro: [ i686-linux, x86_64-linux, x86_64-darwin ] ponder: [ i686-linux, x86_64-linux, x86_64-darwin ] pong-server: [ i686-linux, x86_64-linux, x86_64-darwin ] pontarius-mediaserver: [ i686-linux, x86_64-linux, x86_64-darwin ] + pontarius-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] pontarius-xpmn: [ i686-linux, x86_64-linux, x86_64-darwin ] pool-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] pool: [ i686-linux, x86_64-linux, x86_64-darwin ] popenhs: [ i686-linux, x86_64-linux, x86_64-darwin ] poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] portager: [ i686-linux, x86_64-linux, x86_64-darwin ] - portaudio: [ "x86_64-darwin" ] porte: [ i686-linux, x86_64-linux, x86_64-darwin ] porter: [ i686-linux, x86_64-linux, x86_64-darwin ] PortFusion: [ i686-linux, x86_64-linux, x86_64-darwin ] ports: [ i686-linux, x86_64-linux, x86_64-darwin ] - positron: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-pty: [ i686-linux, x86_64-linux, x86_64-darwin ] - posix-realtime: [ "x86_64-darwin" ] - posix-timer: [ "x86_64-darwin" ] + posix-realtime: [ 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 ] postgres-embedded: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgres-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-binary: [ 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-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-simple-url: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] - postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] - powermate: [ "x86_64-darwin" ] + potoki-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki: [ i686-linux, x86_64-linux, x86_64-darwin ] + potrace-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - powerqueue-levelmem: [ "x86_64-darwin" ] + powerqueue-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] + powerqueue-levelmem: [ i686-linux, x86_64-linux, x86_64-darwin ] + powerqueue-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] praglude: [ i686-linux, x86_64-linux, x86_64-darwin ] - preamble: [ i686-linux, x86_64-linux, x86_64-darwin ] precis: [ i686-linux, x86_64-linux, x86_64-darwin ] pred-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] prednote-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + prednote: [ i686-linux, x86_64-linux, x86_64-darwin ] prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] + preliminaries: [ i686-linux, x86_64-linux, x86_64-darwin ] prelude-generalize: [ i686-linux, x86_64-linux, x86_64-darwin ] prelude-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] preprocess-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] press: [ i686-linux, x86_64-linux, x86_64-darwin ] presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - prettyprinter-convert-ansi-wl-pprint: [ i686-linux, x86_64-linux, x86_64-darwin ] prettyprinter-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] primesieve: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] + PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + pringletons: [ i686-linux, x86_64-linux, x86_64-darwin ] print-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] + printcess: [ i686-linux, x86_64-linux, x86_64-darwin ] Printf-TH: [ i686-linux, x86_64-linux, x86_64-darwin ] priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] proc: [ i686-linux, x86_64-linux, x86_64-darwin ] + process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] process-iterio: [ i686-linux, x86_64-linux, x86_64-darwin ] process-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] process-listlike: [ i686-linux, x86_64-linux, x86_64-darwin ] process-progress: [ i686-linux, x86_64-linux, x86_64-darwin ] process-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + process-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] processing: [ i686-linux, x86_64-linux, x86_64-darwin ] procrastinating-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6976,16 +7596,21 @@ dont-distribute-packages: producer: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] + profiteur: [ i686-linux, x86_64-linux, x86_64-darwin ] + progress-meter: [ i686-linux, x86_64-linux, x86_64-darwin ] progress: [ i686-linux, x86_64-linux, x86_64-darwin ] progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] progression: [ i686-linux, x86_64-linux, x86_64-darwin ] progressive: [ i686-linux, x86_64-linux, x86_64-darwin ] proj4-hs-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] project-m36: [ i686-linux, x86_64-linux, x86_64-darwin ] + projectile: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog-graph-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] prologue: [ i686-linux, x86_64-linux, x86_64-darwin ] + prometheus-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + prometheus: [ i686-linux, x86_64-linux, x86_64-darwin ] promise: [ i686-linux, x86_64-linux, x86_64-darwin ] propane: [ i686-linux, x86_64-linux, x86_64-darwin ] Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6993,9 +7618,9 @@ dont-distribute-packages: property-list: [ i686-linux, x86_64-linux, x86_64-darwin ] proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] prosper: [ i686-linux, x86_64-linux, x86_64-darwin ] - proteaaudio: [ "x86_64-darwin" ] proto-lens-combinators: [ 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 ] protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7003,30 +7628,36 @@ dont-distribute-packages: proton-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] prove-everywhere-server: [ i686-linux, x86_64-linux, x86_64-darwin ] proxy-kindness: [ i686-linux, x86_64-linux, x86_64-darwin ] + proxy-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] psc-ide: [ i686-linux, x86_64-linux, x86_64-darwin ] + ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] + pub: [ i686-linux, x86_64-linux, x86_64-darwin ] publicsuffixlistcreate: [ i686-linux, x86_64-linux, x86_64-darwin ] pubnub: [ i686-linux, x86_64-linux, x86_64-darwin ] pubsub: [ i686-linux, x86_64-linux, x86_64-darwin ] puffytools: [ i686-linux, x86_64-linux, x86_64-darwin ] + pugixml: [ i686-linux, x86_64-linux, x86_64-darwin ] + pugs-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] pugs-hsregex: [ i686-linux, x86_64-linux, x86_64-darwin ] pugs-HsSyck: [ i686-linux, x86_64-linux, x86_64-darwin ] Pugs: [ i686-linux, x86_64-linux, x86_64-darwin ] PUH-Project: [ i686-linux, x86_64-linux, x86_64-darwin ] - pulseaudio: [ "x86_64-darwin" ] punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] Pup-Events-Demo: [ i686-linux, x86_64-linux, x86_64-darwin ] puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] + pure-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript-bundle-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] + purescript-tsd-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - pursuit-client: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-apn: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + pusher-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] pushme: [ i686-linux, x86_64-linux, x86_64-darwin ] putlenses: [ i686-linux, x86_64-linux, x86_64-darwin ] puzzle-draw-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7035,14 +7666,15 @@ dont-distribute-packages: pyffi: [ i686-linux, x86_64-linux, x86_64-darwin ] pyfi: [ i686-linux, x86_64-linux, x86_64-darwin ] python-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] + q4c12-twofinger: [ i686-linux, x86_64-linux, x86_64-darwin ] qc-oi-testgenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] qd-vec: [ i686-linux, x86_64-linux, x86_64-darwin ] qd: [ i686-linux, x86_64-linux, x86_64-darwin ] qed: [ i686-linux, x86_64-linux, x86_64-darwin ] qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] qif: [ i686-linux, x86_64-linux, x86_64-darwin ] + QIO: [ i686-linux, x86_64-linux, x86_64-darwin ] QLearn: [ i686-linux, x86_64-linux, x86_64-darwin ] - qm-interpolated-string: [ i686-linux, x86_64-linux, x86_64-darwin ] qr-imager: [ i686-linux, x86_64-linux, x86_64-darwin ] qr-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] qt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7060,6 +7692,7 @@ dont-distribute-packages: Quelea: [ i686-linux, x86_64-linux, x86_64-darwin ] quenya-verb: [ i686-linux, x86_64-linux, x86_64-darwin ] querystring-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] + questioner: [ i686-linux, x86_64-linux, x86_64-darwin ] queuelike: [ i686-linux, x86_64-linux, x86_64-darwin ] quick-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7071,26 +7704,30 @@ dont-distribute-packages: quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-report: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-string-random: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] quickset: [ i686-linux, x86_64-linux, x86_64-darwin ] Quickson: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickspec: [ i686-linux, x86_64-linux, x86_64-darwin ] quicktest: [ i686-linux, x86_64-linux, x86_64-darwin ] quickwebapp: [ i686-linux, x86_64-linux, x86_64-darwin ] + quipper-core: [ i686-linux, x86_64-linux, x86_64-darwin ] quipper-rendering: [ i686-linux, x86_64-linux, x86_64-darwin ] quipper: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-groups: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-http: [ i686-linux, x86_64-linux, x86_64-darwin ] + quiver-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] quoridor-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] qux: [ i686-linux, x86_64-linux, x86_64-darwin ] R-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] rad: [ i686-linux, x86_64-linux, x86_64-darwin ] + radian: [ i686-linux, x86_64-linux, x86_64-darwin ] radium-formula-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + radium: [ i686-linux, x86_64-linux, x86_64-darwin ] radix: [ i686-linux, x86_64-linux, x86_64-darwin ] rados-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] raft: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7100,7 +7737,6 @@ dont-distribute-packages: Raincat: [ i686-linux, x86_64-linux, x86_64-darwin ] raketka: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] - rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] raml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7112,12 +7748,16 @@ dont-distribute-packages: random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] random-hypergeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] random-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + random-string: [ i686-linux, x86_64-linux, x86_64-darwin ] RandomDotOrg: [ i686-linux, x86_64-linux, x86_64-darwin ] + range-set-list: [ i686-linux, x86_64-linux, x86_64-darwin ] range-space: [ i686-linux, x86_64-linux, x86_64-darwin ] Range: [ i686-linux, x86_64-linux, x86_64-darwin ] + range: [ i686-linux, x86_64-linux, x86_64-darwin ] rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] rank2classes: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] + rapid-term: [ 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 ] rasa-ext-cmd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7132,14 +7772,14 @@ dont-distribute-packages: rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] - rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasterific-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] raz: [ i686-linux, x86_64-linux, x86_64-darwin ] razom-text-util: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] - rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] + rc: [ i686-linux, x86_64-linux, x86_64-darwin ] rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] rdioh: [ i686-linux, x86_64-linux, x86_64-darwin ] react-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7147,14 +7787,15 @@ dont-distribute-packages: reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-gi-gtk: [ "x86_64-darwin" ] + reactive-banana-bunch: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana-gi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-threepenny: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-wx: [ "x86_64-darwin" ] + reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-jack: [ "x86_64-darwin" ] reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7174,16 +7815,17 @@ dont-distribute-packages: record: [ i686-linux, x86_64-linux, x86_64-darwin ] records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] - recursion-schemes-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] recursors: [ i686-linux, x86_64-linux, x86_64-darwin ] reddit: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] + redland: [ i686-linux, x86_64-linux, x86_64-darwin ] + Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] reduce-equations: [ i686-linux, x86_64-linux, x86_64-darwin ] reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] - reenact: [ "x86_64-darwin" ] + reenact: [ i686-linux, x86_64-linux, x86_64-darwin ] ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - ref: [ i686-linux, x86_64-linux, x86_64-darwin ] Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] + ref: [ i686-linux, x86_64-linux, x86_64-darwin ] refcount: [ i686-linux, x86_64-linux, x86_64-darwin ] Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] refh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7195,9 +7837,11 @@ dont-distribute-packages: reflex-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] - refresht: [ i686-linux, x86_64-linux, x86_64-darwin ] + reformat: [ i686-linux, x86_64-linux, x86_64-darwin ] + refurb: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-pderiv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7206,7 +7850,9 @@ 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 ] + regex: [ i686-linux, x86_64-linux, x86_64-darwin ] regexp-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] regexpr-symbolic: [ i686-linux, x86_64-linux, x86_64-darwin ] regexqq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7222,11 +7868,11 @@ dont-distribute-packages: regular-xmlpickler: [ i686-linux, x86_64-linux, x86_64-darwin ] regular: [ i686-linux, x86_64-linux, x86_64-darwin ] reheat: [ i686-linux, x86_64-linux, x86_64-darwin ] + rei: [ i686-linux, x86_64-linux, x86_64-darwin ] reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] - relational-record-examples: [ 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 ] remark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7239,14 +7885,12 @@ dont-distribute-packages: remote: [ i686-linux, x86_64-linux, x86_64-darwin ] remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-array: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-io: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-linear-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-scalar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7254,26 +7898,36 @@ dont-distribute-packages: repa-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] repl: [ i686-linux, x86_64-linux, x86_64-darwin ] + RepLib: [ i686-linux, x86_64-linux, x86_64-darwin ] replicant: [ i686-linux, x86_64-linux, x86_64-darwin ] repo-based-blog: [ i686-linux, x86_64-linux, x86_64-darwin ] repr: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] reprinter: [ i686-linux, x86_64-linux, x86_64-darwin ] + reproject: [ i686-linux, x86_64-linux, x86_64-darwin ] req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - req: [ i686-linux, x86_64-linux, x86_64-darwin ] reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + rerebase: [ i686-linux, x86_64-linux, x86_64-darwin ] + reroute: [ i686-linux, x86_64-linux, x86_64-darwin ] + reserve: [ i686-linux, x86_64-linux, x86_64-darwin ] resin: [ i686-linux, x86_64-linux, x86_64-darwin ] resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] + resolv: [ i686-linux, x86_64-linux, x86_64-darwin ] + resolve-trivial-conflicts: [ i686-linux, x86_64-linux, x86_64-darwin ] + resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-pool-catchio: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] respond: [ i686-linux, x86_64-linux, x86_64-darwin ] + rest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] rest-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + rest-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] + rest-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] + rest-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] restful-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - restless-git: [ i686-linux, x86_64-linux, x86_64-darwin ] RESTng: [ i686-linux, x86_64-linux, x86_64-darwin ] restricted-workers: [ i686-linux, x86_64-linux, x86_64-darwin ] restyle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7281,6 +7935,7 @@ dont-distribute-packages: rethinkdb-client-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] rethinkdb-model: [ i686-linux, x86_64-linux, x86_64-darwin ] rethinkdb-wereHamster: [ i686-linux, x86_64-linux, x86_64-darwin ] + rethinkdb: [ i686-linux, x86_64-linux, x86_64-darwin ] retryer: [ i686-linux, x86_64-linux, x86_64-darwin ] reverse-geocoding: [ i686-linux, x86_64-linux, x86_64-darwin ] reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7288,23 +7943,26 @@ dont-distribute-packages: rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + rfc3339: [ i686-linux, x86_64-linux, x86_64-darwin ] + rfc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rhine-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] rhine: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - ring-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] riot: [ i686-linux, x86_64-linux, x86_64-darwin ] ripple-federation: [ i686-linux, x86_64-linux, x86_64-darwin ] ripple: [ i686-linux, x86_64-linux, x86_64-darwin ] risc386: [ i686-linux, x86_64-linux, x86_64-darwin ] + riscv-isa: [ i686-linux, x86_64-linux, x86_64-darwin ] rivers: [ i686-linux, x86_64-linux, x86_64-darwin ] rivet-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] rivet-simple-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ] rivet: [ i686-linux, x86_64-linux, x86_64-darwin ] RJson: [ i686-linux, x86_64-linux, x86_64-darwin ] + rl-satton: [ i686-linux, x86_64-linux, x86_64-darwin ] Rlang-QQ: [ i686-linux, x86_64-linux, x86_64-darwin ] rlglue: [ i686-linux, x86_64-linux, x86_64-darwin ] rlwe-challenges: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7314,8 +7972,11 @@ dont-distribute-packages: RNAdraw: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAFold: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAFoldProgs: [ i686-linux, x86_64-linux, x86_64-darwin ] + RNAlien: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAwolf: [ i686-linux, x86_64-linux, x86_64-darwin ] rncryptor: [ i686-linux, x86_64-linux, x86_64-darwin ] + rob: [ i686-linux, x86_64-linux, x86_64-darwin ] + robin: [ i686-linux, x86_64-linux, x86_64-darwin ] robot: [ i686-linux, x86_64-linux, x86_64-darwin ] robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ] roc-cluster-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7324,6 +7985,7 @@ dont-distribute-packages: roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + roku-api: [ i686-linux, x86_64-linux, x86_64-darwin ] roller: [ i686-linux, x86_64-linux, x86_64-darwin ] RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] rope: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7331,6 +7993,7 @@ dont-distribute-packages: rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] roshask: [ i686-linux, x86_64-linux, x86_64-darwin ] rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] + rosmsg: [ i686-linux, x86_64-linux, x86_64-darwin ] rosso: [ i686-linux, x86_64-linux, x86_64-darwin ] rounding: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7345,20 +8008,22 @@ dont-distribute-packages: rsagl-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] - rset: [ i686-linux, x86_64-linux, x86_64-darwin ] rspp: [ i686-linux, x86_64-linux, x86_64-darwin ] rss-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rtnetlink: [ "x86_64-darwin" ] + rss: [ i686-linux, x86_64-linux, x86_64-darwin ] + RtMidi: [ 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 ] - rubberband: [ i686-linux, x86_64-linux, x86_64-darwin ] + ruby-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] ruby-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] ruin: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler: [ i686-linux, x86_64-linux, x86_64-darwin ] rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ] + runmany: [ i686-linux, x86_64-linux, x86_64-darwin ] runtime-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] rws: [ i686-linux, x86_64-linux, x86_64-darwin ] RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7367,9 +8032,10 @@ dont-distribute-packages: safe-globals: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-lazy-io: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-length: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-money: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-printf: [ i686-linux, x86_64-linux, x86_64-darwin ] - safecopy-store: [ i686-linux, x86_64-linux, x86_64-darwin ] + safecopy-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] safeint: [ i686-linux, x86_64-linux, x86_64-darwin ] safepath: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7380,7 +8046,6 @@ dont-distribute-packages: sajson: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - saltine: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7400,24 +8065,26 @@ dont-distribute-packages: satchmo-funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-minisat: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] + savage: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] - sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + sc3-rdu: [ i686-linux, x86_64-linux, x86_64-darwin ] scalable-server: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] - SCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - scat: [ i686-linux, x86_64-linux, x86_64-darwin ] + scc: [ i686-linux, x86_64-linux, x86_64-darwin ] scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + scgi: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] + schedule-planner: [ i686-linux, x86_64-linux, x86_64-darwin ] schedyield: [ i686-linux, x86_64-linux, x86_64-darwin ] + schematic: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-texmath: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants: [ i686-linux, x86_64-linux, x86_64-darwin ] - SciFlow: [ i686-linux, x86_64-linux, x86_64-darwin ] scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] scion: [ i686-linux, x86_64-linux, x86_64-darwin ] scons2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7427,7 +8094,9 @@ dont-distribute-packages: scotty-binding-play: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-format: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-resource: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-session: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-view: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7436,21 +8105,17 @@ dont-distribute-packages: scrape-changes: [ i686-linux, x86_64-linux, x86_64-darwin ] ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ] scrobble: [ i686-linux, x86_64-linux, x86_64-darwin ] + scroll: [ i686-linux, x86_64-linux, x86_64-darwin ] scrz: [ i686-linux, x86_64-linux, x86_64-darwin ] Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ] - SDL-gfx: [ "x86_64-darwin" ] - SDL-image: [ "x86_64-darwin" ] - SDL-mixer: [ "x86_64-darwin" ] - SDL-mpeg: [ "x86_64-darwin" ] - SDL-ttf: [ "x86_64-darwin" ] + sde-solver: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-cairo-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-mixer: [ i686-linux, x86_64-linux, x86_64-darwin ] sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] - search: [ i686-linux, x86_64-linux, x86_64-darwin ] sec: [ i686-linux, x86_64-linux, x86_64-darwin ] secdh: [ i686-linux, x86_64-linux, x86_64-darwin ] seclib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7459,8 +8124,8 @@ dont-distribute-packages: secret-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] secrm: [ i686-linux, x86_64-linux, x86_64-darwin ] sednaDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] - select: [ "x86_64-darwin" ] selectors: [ i686-linux, x86_64-linux, x86_64-darwin ] + SelectSequencesFromMSA: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium-server: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] selinux: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7472,43 +8137,52 @@ dont-distribute-packages: semiring-num: [ i686-linux, x86_64-linux, x86_64-darwin ] semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] - sensei: [ i686-linux, x86_64-linux, x86_64-darwin ] + sendgrid-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + sendgrid-v3: [ i686-linux, x86_64-linux, x86_64-darwin ] sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] sentence-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] + separated: [ i686-linux, x86_64-linux, x86_64-darwin ] seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] seqid-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] sequor: [ i686-linux, x86_64-linux, x86_64-darwin ] + serialise: [ i686-linux, x86_64-linux, x86_64-darwin ] + serialize-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] serokell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] serpentine: [ i686-linux, x86_64-linux, x86_64-darwin ] serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] serv: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-aeson-specs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-cookie: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-acid: [ 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-auth-token-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-client-core: [ 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 ] servant-db: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-ede: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-github: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-iCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-match: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-proto-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-pushbullet-client: [ 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-rawm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7516,22 +8190,28 @@ dont-distribute-packages: 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-xml: [ 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 ] + servant-zeppelin: [ i686-linux, x86_64-linux, x86_64-darwin ] server-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + serverless-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + serversession-frontend-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] services: [ i686-linux, x86_64-linux, x86_64-darwin ] ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] - ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ] SessionLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] + sessiontypes-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] + sessiontypes: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] setgame: [ 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 ] sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] - sfml-audio: [ "x86_64-darwin" ] + sext: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] sfmt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7547,33 +8227,36 @@ dont-distribute-packages: shadowsocks: [ i686-linux, x86_64-linux, x86_64-darwin ] shady-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] shady-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-ats: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-cabal-build: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-pack: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - shared-memory: [ "x86_64-darwin" ] she: [ i686-linux, x86_64-linux, x86_64-darwin ] shelduck: [ i686-linux, x86_64-linux, x86_64-darwin ] shell-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] shellish: [ i686-linux, x86_64-linux, x86_64-darwin ] - shelltestrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] + shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] shoap: [ i686-linux, x86_64-linux, x86_64-darwin ] + shopify: [ 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 ] - si-clock: [ "x86_64-darwin" ] + shuffle: [ i686-linux, x86_64-linux, x86_64-darwin ] + sibe: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7584,8 +8267,11 @@ dont-distribute-packages: simple-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-bluetooth: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-config: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-css: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-download: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-form: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7597,7 +8283,12 @@ dont-distribute-packages: simple-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-pascal: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-sql-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-tar: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + simpleargs: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleGL: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleH: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleirc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7606,54 +8297,64 @@ dont-distribute-packages: simplenote: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleServer: [ i686-linux, x86_64-linux, x86_64-darwin ] - simplessh: [ i686-linux, x86_64-linux, x86_64-darwin ] simplest-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - SimpleTableGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] + singleton-dict: [ i686-linux, x86_64-linux, x86_64-darwin ] + singnal: [ i686-linux, x86_64-linux, x86_64-darwin ] sink: [ i686-linux, x86_64-linux, x86_64-darwin ] siphon: [ i686-linux, x86_64-linux, x86_64-darwin ] + siren-json: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] - sitemap: [ 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-types: [ i686-linux, x86_64-linux, x86_64-darwin ] sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] sized: [ i686-linux, x86_64-linux, x86_64-darwin ] sjsp: [ i686-linux, x86_64-linux, x86_64-darwin ] skeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] skell: [ i686-linux, x86_64-linux, x86_64-darwin ] skemmtun: [ i686-linux, x86_64-linux, x86_64-darwin ] + skulk: [ i686-linux, x86_64-linux, x86_64-darwin ] skylark-client: [ i686-linux, x86_64-linux, x86_64-darwin ] skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] slack-web: [ i686-linux, x86_64-linux, x86_64-darwin ] slack: [ i686-linux, x86_64-linux, x86_64-darwin ] + slave-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] slidemews: [ i686-linux, x86_64-linux, x86_64-darwin ] Slides: [ i686-linux, x86_64-linux, x86_64-darwin ] + sloane: [ i686-linux, x86_64-linux, x86_64-darwin ] slot-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] sloth: [ i686-linux, x86_64-linux, x86_64-darwin ] smallarray: [ i686-linux, x86_64-linux, x86_64-darwin ] smallcheck-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] smallcheck-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + smallcheck-series: [ i686-linux, x86_64-linux, x86_64-darwin ] smallpt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] smallstring: [ i686-linux, x86_64-linux, x86_64-darwin ] smartcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] smartconstructor: [ i686-linux, x86_64-linux, x86_64-darwin ] smartGroup: [ i686-linux, x86_64-linux, x86_64-darwin ] smartword: [ i686-linux, x86_64-linux, x86_64-darwin ] + smcdel: [ i686-linux, x86_64-linux, x86_64-darwin ] sme: [ i686-linux, x86_64-linux, x86_64-darwin ] smerdyakov: [ i686-linux, x86_64-linux, x86_64-darwin ] + smiles: [ i686-linux, x86_64-linux, x86_64-darwin ] Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] + smsaero: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + smtlib2-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] SmtLib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp-mail-ng: [ 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 ] + smtps-gmail: [ 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 ] snap-auth-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-blaze-clay: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-configuration-utilities: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-cors: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-error-collector: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-loader-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7669,6 +8370,7 @@ dont-distribute-packages: snaplet-auth-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-css-min: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-customauth: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-environments: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-ghcjs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7707,24 +8409,29 @@ dont-distribute-packages: snappy-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] sndfile-enumerators: [ i686-linux, x86_64-linux, x86_64-darwin ] sneakyterm: [ i686-linux, x86_64-linux, x86_64-darwin ] - sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] SNet: [ i686-linux, x86_64-linux, x86_64-darwin ] + snipcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] snm: [ i686-linux, x86_64-linux, x86_64-darwin ] snmp: [ i686-linux, x86_64-linux, x86_64-darwin ] snorkels: [ i686-linux, x86_64-linux, x86_64-darwin ] snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] snowflake-core: [ i686-linux, x86_64-linux, x86_64-darwin ] snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + snowtify: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + socket-io: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] + socket-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] socketed: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] socketson: [ i686-linux, x86_64-linux, x86_64-darwin ] sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] soegtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + solga-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] + solga: [ i686-linux, x86_64-linux, x86_64-darwin ] solr: [ i686-linux, x86_64-linux, x86_64-darwin ] sonic-visualiser: [ i686-linux, x86_64-linux, x86_64-darwin ] Sonnex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7737,22 +8444,25 @@ dont-distribute-packages: SourceGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] sousit: [ i686-linux, x86_64-linux, x86_64-darwin ] soyuz: [ i686-linux, x86_64-linux, x86_64-darwin ] + SpaceInvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] SpacePrivateers: [ i686-linux, x86_64-linux, x86_64-darwin ] - spaceprobe: [ i686-linux, x86_64-linux, x86_64-darwin ] + spake2: [ i686-linux, x86_64-linux, x86_64-darwin ] spanout: [ i686-linux, x86_64-linux, x86_64-darwin ] sparkle: [ i686-linux, x86_64-linux, x86_64-darwin ] + sparrow: [ i686-linux, x86_64-linux, x86_64-darwin ] sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsebit: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] spata: [ i686-linux, x86_64-linux, x86_64-darwin ] + spatial-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + spdx: [ i686-linux, x86_64-linux, x86_64-darwin ] special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - species: [ i686-linux, x86_64-linux, x86_64-darwin ] - speculate: [ "x86_64-darwin" ] spelling-suggest: [ i686-linux, x86_64-linux, x86_64-darwin ] sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] sphinx-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + sphinxesc: [ i686-linux, x86_64-linux, x86_64-darwin ] spice: [ i686-linux, x86_64-linux, x86_64-darwin ] SpinCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] spir-v: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7760,8 +8470,16 @@ dont-distribute-packages: spline3: [ i686-linux, x86_64-linux, x86_64-darwin ] splines: [ i686-linux, x86_64-linux, x86_64-darwin ] splitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + splot: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-api-ghcjs: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-api-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-digestive: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock: [ i686-linux, x86_64-linux, x86_64-darwin ] spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ] spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7773,6 +8491,7 @@ dont-distribute-packages: sql-simple-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlcipher: [ i686-linux, x86_64-linux, x86_64-darwin ] + sqlite-simple-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlvalue-list: [ i686-linux, x86_64-linux, x86_64-darwin ] sqsd-local: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7780,19 +8499,32 @@ dont-distribute-packages: srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] sscan: [ i686-linux, x86_64-linux, x86_64-darwin ] sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + ssh-tunnel: [ i686-linux, x86_64-linux, x86_64-darwin ] ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] sshd-lint: [ i686-linux, x86_64-linux, x86_64-darwin ] sssp: [ i686-linux, x86_64-linux, x86_64-darwin ] sstable: [ i686-linux, x86_64-linux, x86_64-darwin ] + SSTG: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-heap: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] + stable-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-bump: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-run-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-run: [ i686-linux, x86_64-linux, x86_64-darwin ] stack2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-build-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-curator: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-query: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7802,29 +8534,40 @@ dont-distribute-packages: stash: [ i686-linux, x86_64-linux, x86_64-darwin ] Stasis: [ i686-linux, x86_64-linux, x86_64-darwin ] state-bag: [ i686-linux, x86_64-linux, x86_64-darwin ] + state-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] state-record: [ i686-linux, x86_64-linux, x86_64-darwin ] state: [ i686-linux, x86_64-linux, x86_64-darwin ] stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - statgrab: [ i686-linux, x86_64-linux, x86_64-darwin ] + stateWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] + static-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] static-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] + static-text: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-dirichlet: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-hypergeometric-genvar: [ i686-linux, x86_64-linux, x86_64-darwin ] stats: [ i686-linux, x86_64-linux, x86_64-darwin ] + statsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] statsd: [ i686-linux, x86_64-linux, x86_64-darwin ] + status-notifier-item: [ i686-linux, x86_64-linux, x86_64-darwin ] stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] stdata: [ i686-linux, x86_64-linux, x86_64-darwin ] stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] steambrowser: [ i686-linux, x86_64-linux, x86_64-darwin ] + steeloverseer: [ i686-linux, x86_64-linux, x86_64-darwin ] stego-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ] - step-function: [ i686-linux, x86_64-linux, x86_64-darwin ] + stemmer-german: [ i686-linux, x86_64-linux, x86_64-darwin ] + stemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - STLinkUSB: [ i686-linux, x86_64-linux, x86_64-darwin ] + stitch: [ i686-linux, x86_64-linux, x86_64-darwin ] + STL: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] + stm-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] + stm-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] stochastic: [ i686-linux, x86_64-linux, x86_64-darwin ] + StockholmAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] storablevector-streamfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7832,7 +8575,6 @@ dont-distribute-packages: Strafunski-ATermLib: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-Sdf2Haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] StrappedTemplates: [ i686-linux, x86_64-linux, x86_64-darwin ] - stratosphere: [ i686-linux, x86_64-linux, x86_64-darwin ] stratum-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux-http: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7842,51 +8584,63 @@ dont-distribute-packages: stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] stream: [ i686-linux, x86_64-linux, x86_64-darwin ] streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-osm: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-png: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-postgresql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] strelka: [ i686-linux, x86_64-linux, x86_64-darwin ] - strict-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] - strict-types: [ i686-linux, x86_64-linux, x86_64-darwin ] StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] strictly: [ i686-linux, x86_64-linux, x86_64-darwin ] + string-isos: [ i686-linux, x86_64-linux, x86_64-darwin ] string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] - stripe-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - stripe-http-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + stripe-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] - structs: [ i686-linux, x86_64-linux, x86_64-darwin ] structural-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] structural-traversal: [ i686-linux, x86_64-linux, x86_64-darwin ] structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] structures: [ i686-linux, x86_64-linux, x86_64-darwin ] + stt: [ 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 ] sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] + submark: [ i686-linux, x86_64-linux, x86_64-darwin ] + suffix-array: [ i686-linux, x86_64-linux, x86_64-darwin ] suffixarray: [ i686-linux, x86_64-linux, x86_64-darwin ] SuffixStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] suitable: [ i686-linux, x86_64-linux, x86_64-darwin ] - sump: [ i686-linux, x86_64-linux, x86_64-darwin ] sunlight: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-server: [ i686-linux, x86_64-linux, x86_64-darwin ] super-user-spark: [ i686-linux, x86_64-linux, x86_64-darwin ] + superbuffer: [ i686-linux, x86_64-linux, x86_64-darwin ] supercollider-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] supercollider-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] superconstraints: [ i686-linux, x86_64-linux, x86_64-darwin ] superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + superevent: [ i686-linux, x86_64-linux, x86_64-darwin ] + supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ] supero: [ i686-linux, x86_64-linux, x86_64-darwin ] + superrecord: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ] + sv: [ i686-linux, x86_64-linux, x86_64-darwin ] SVD2HS: [ i686-linux, x86_64-linux, x86_64-darwin ] + svg-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] + SVGFonts: [ i686-linux, x86_64-linux, x86_64-darwin ] svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] - swagger-test: [ i686-linux, x86_64-linux, x86_64-darwin ] swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] swf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7896,6 +8650,7 @@ dont-distribute-packages: syb-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] syb-with-class-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] SybWidget: [ i686-linux, x86_64-linux, x86_64-darwin ] + syfco: [ i686-linux, x86_64-linux, x86_64-darwin ] sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] sym: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7916,19 +8671,16 @@ dont-distribute-packages: syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] SyntaxMacros: [ i686-linux, x86_64-linux, x86_64-darwin ] syntaxnet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - sysinfo: [ "x86_64-darwin" ] + sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ] Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ] system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-inotify: [ "x86_64-darwin" ] + system-command: [ 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 ] - system-time-monotonic: [ "x86_64-darwin" ] systemstats: [ i686-linux, x86_64-linux, x86_64-darwin ] t-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] t3-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7937,28 +8689,31 @@ dont-distribute-packages: table-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] table-tennis: [ i686-linux, x86_64-linux, x86_64-darwin ] table: [ i686-linux, x86_64-linux, x86_64-darwin ] - tables: [ i686-linux, x86_64-linux, x86_64-darwin ] + tableaux: [ i686-linux, x86_64-linux, x86_64-darwin ] Tables: [ i686-linux, x86_64-linux, x86_64-darwin ] + tables: [ i686-linux, x86_64-linux, x86_64-darwin ] tablestorage: [ i686-linux, x86_64-linux, x86_64-darwin ] + Tablify: [ i686-linux, x86_64-linux, x86_64-darwin ] tablize: [ i686-linux, x86_64-linux, x86_64-darwin ] tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] - taffybar: [ "x86_64-darwin" ] tag-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] + tagged-exception-core: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-th: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-timers: [ i686-linux, x86_64-linux, x86_64-darwin ] - taggy-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - taggy: [ i686-linux, x86_64-linux, x86_64-darwin ] taglib-api: [ i686-linux, x86_64-linux, x86_64-darwin ] tagset-positional: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] + tagsoup-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-selection: [ i686-linux, x86_64-linux, x86_64-darwin ] Tahin: [ i686-linux, x86_64-linux, x86_64-darwin ] - tai: [ "x86_64-darwin" ] - tailfile-hinotify: [ "x86_64-darwin" ] + tai64: [ i686-linux, x86_64-linux, x86_64-darwin ] + tai: [ i686-linux, x86_64-linux, x86_64-darwin ] + tailfile-hinotify: [ i686-linux, x86_64-linux, x86_64-darwin ] takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] + tal: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-term: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-theory: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7969,24 +8724,29 @@ dont-distribute-packages: task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-dejafu: [ "x86_64-darwin" ] + tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-jenkins-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-tap: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-travis: [ i686-linux, x86_64-linux, x86_64-darwin ] TaxonomyTools: [ i686-linux, x86_64-linux, x86_64-darwin ] TBC: [ i686-linux, x86_64-linux, x86_64-darwin ] TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] tbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + tcache-AWS: [ i686-linux, x86_64-linux, x86_64-darwin ] tccli: [ i686-linux, x86_64-linux, x86_64-darwin ] tcod-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp-streams-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + tdigest-Chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + tdigest: [ i686-linux, x86_64-linux, x86_64-darwin ] TeaHS: [ i686-linux, x86_64-linux, x86_64-darwin ] teams: [ i686-linux, x86_64-linux, x86_64-darwin ] + teeth: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7994,8 +8754,10 @@ dont-distribute-packages: 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-compat-v0208: [ i686-linux, x86_64-linux, x86_64-darwin ] template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] template-hsml: [ i686-linux, x86_64-linux, x86_64-darwin ] + template-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] template-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] templateify: [ i686-linux, x86_64-linux, x86_64-darwin ] templatepg: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8014,22 +8776,22 @@ dont-distribute-packages: tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ] term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] + terminal-text: [ i686-linux, x86_64-linux, x86_64-darwin ] termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] termplot: [ i686-linux, x86_64-linux, x86_64-darwin ] terntup: [ i686-linux, x86_64-linux, x86_64-darwin ] terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] - tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-skip: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-framework-th-prime: [ i686-linux, x86_64-linux, x86_64-darwin ] test-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] testbench: [ i686-linux, x86_64-linux, x86_64-darwin ] - testCom: [ i686-linux, x86_64-linux, x86_64-darwin ] + TestExplode: [ i686-linux, x86_64-linux, x86_64-darwin ] testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] testpack: [ i686-linux, x86_64-linux, x86_64-darwin ] testpattern: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8038,19 +8800,19 @@ dont-distribute-packages: TeX-my-math: [ i686-linux, x86_64-linux, x86_64-darwin ] tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] texbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] + texrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] text-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] text-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] text-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-time: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-zipper-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8060,8 +8822,10 @@ dont-distribute-packages: tfp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] tftp: [ i686-linux, x86_64-linux, x86_64-darwin ] tga: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] th-build: [ i686-linux, x86_64-linux, x86_64-darwin ] th-context: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-dict-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] th-fold: [ i686-linux, x86_64-linux, x86_64-darwin ] th-instance-reification: [ i686-linux, x86_64-linux, x86_64-darwin ] th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8070,6 +8834,8 @@ dont-distribute-packages: th-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] th-typegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] thank-you-stars: [ i686-linux, x86_64-linux, x86_64-darwin ] + theatre: [ i686-linux, x86_64-linux, x86_64-darwin ] + themoviedb: [ i686-linux, x86_64-linux, x86_64-darwin ] thentos-cookie-session: [ i686-linux, x86_64-linux, x86_64-darwin ] Theora: [ i686-linux, x86_64-linux, x86_64-darwin ] theoremquest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8078,17 +8844,17 @@ dont-distribute-packages: thimk: [ i686-linux, x86_64-linux, x86_64-darwin ] Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] - threadscope: [ "x86_64-darwin" ] threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] throttled-io-loop: [ i686-linux, x86_64-linux, x86_64-darwin ] + throwable-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + thumbnail-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] tibetan-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] tictactoe3d: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] tie-knot: [ i686-linux, x86_64-linux, x86_64-darwin ] tiempo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8097,19 +8863,24 @@ dont-distribute-packages: tighttp: [ i686-linux, x86_64-linux, x86_64-darwin ] timberc: [ i686-linux, x86_64-linux, x86_64-darwin ] time-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-exts: [ "x86_64-darwin" ] time-http: [ i686-linux, x86_64-linux, x86_64-darwin ] time-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] time-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-series-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] time-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] + timemap: [ i686-linux, x86_64-linux, x86_64-darwin ] timeout: [ i686-linux, x86_64-linux, x86_64-darwin ] timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ] + timerep: [ i686-linux, x86_64-linux, x86_64-darwin ] + timers-tick: [ i686-linux, x86_64-linux, x86_64-darwin ] timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8121,39 +8892,48 @@ dont-distribute-packages: 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 ] - 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 ] to-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-class: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] toboggan: [ i686-linux, x86_64-linux, x86_64-darwin ] + todo: [ i686-linux, x86_64-linux, x86_64-darwin ] todos: [ i686-linux, x86_64-linux, x86_64-darwin ] tofromxml: [ i686-linux, x86_64-linux, x86_64-darwin ] toilet: [ i686-linux, x86_64-linux, x86_64-darwin ] tokenify: [ i686-linux, x86_64-linux, x86_64-darwin ] + tokenizer-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] toktok: [ i686-linux, x86_64-linux, x86_64-darwin ] tokyocabinet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + tokyotyrant-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] tomato-rubato-openal: [ i686-linux, x86_64-linux, x86_64-darwin ] toml: [ 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 ] + TORCS: [ i686-linux, x86_64-linux, x86_64-darwin ] touched: [ i686-linux, x86_64-linux, x86_64-darwin ] Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] toxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + toxiproxy-haskell: [ 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 ] trace-function-call: [ i686-linux, x86_64-linux, x86_64-darwin ] trace: [ i686-linux, x86_64-linux, x86_64-darwin ] traced: [ i686-linux, x86_64-linux, x86_64-darwin ] + tracetree: [ i686-linux, x86_64-linux, x86_64-darwin ] tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] + tracy: [ i686-linux, x86_64-linux, x86_64-darwin ] traildb: [ i686-linux, x86_64-linux, x86_64-darwin ] trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ] + transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ] transf: [ i686-linux, x86_64-linux, x86_64-darwin ] + transfer-db: [ i686-linux, x86_64-linux, x86_64-darwin ] transformations: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformeR: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8161,18 +8941,21 @@ dont-distribute-packages: transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformersStepByStep: [ i686-linux, x86_64-linux, x86_64-darwin ] transient-universe-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] - transient-universe: [ "x86_64-darwin" ] translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ] + translate-cli: [ 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-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + trasa: [ i686-linux, x86_64-linux, x86_64-darwin ] travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] + travis: [ 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 ] tree-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] + tree-traversals: [ i686-linux, x86_64-linux, x86_64-darwin ] TreeCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - treersec: [ i686-linux, x86_64-linux, x86_64-darwin ] TreeStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] Treiber: [ i686-linux, x86_64-linux, x86_64-darwin ] tremulous-query: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8181,9 +8964,11 @@ dont-distribute-packages: triangulation: [ i686-linux, x86_64-linux, x86_64-darwin ] TrieMap: [ i686-linux, x86_64-linux, x86_64-darwin ] tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + trigger: [ 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 ] + trivia: [ 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 ] tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8191,8 +8976,9 @@ dont-distribute-packages: tslib: [ i686-linux, x86_64-linux, x86_64-darwin ] tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] tsparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + tsuntsun: [ i686-linux, x86_64-linux, x86_64-darwin ] tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ] - tuntap-simple: [ "x86_64-darwin" ] + ttask: [ i686-linux, x86_64-linux, x86_64-darwin ] tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] tup-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8201,10 +8987,7 @@ dont-distribute-packages: tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] turing-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] - turing-music: [ "x86_64-darwin" ] - turingMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] tweak: [ i686-linux, x86_64-linux, x86_64-darwin ] - twee: [ i686-linux, x86_64-linux, x86_64-darwin ] tweet-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-eventloop-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-eventloop-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8213,14 +8996,20 @@ dont-distribute-packages: twentefp-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] twentyseven: [ i686-linux, x86_64-linux, x86_64-darwin ] + twfy-api-client: [ i686-linux, x86_64-linux, x86_64-darwin ] twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] twilight-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + twilio: [ i686-linux, x86_64-linux, x86_64-darwin ] twill: [ i686-linux, x86_64-linux, x86_64-darwin ] twiml: [ i686-linux, x86_64-linux, x86_64-darwin ] twine: [ i686-linux, x86_64-linux, x86_64-darwin ] twisty: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-feed: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-types-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] tx: [ i686-linux, x86_64-linux, x86_64-darwin ] txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8231,11 +9020,14 @@ dont-distribute-packages: type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] type-combinators-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] type-digits: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-eq: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-indexed-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] type-int: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-bst: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-natural-number-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-natural-number-operations: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-of-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-natural: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] type-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8243,60 +9035,70 @@ dont-distribute-packages: type-spine: [ i686-linux, x86_64-linux, x86_64-darwin ] type-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeClass: [ 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-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] typehash: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeIlluminator: [ i686-linux, x86_64-linux, x86_64-darwin ] typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] typelevel: [ i686-linux, x86_64-linux, x86_64-darwin ] - TypeNat: [ i686-linux, x86_64-linux, x86_64-darwin ] typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] types-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] typesafe-precure: [ i686-linux, x86_64-linux, x86_64-darwin ] typescript-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - tz: [ "x86_64-darwin" ] + tyro: [ i686-linux, x86_64-linux, x86_64-darwin ] u2f: [ i686-linux, x86_64-linux, x86_64-darwin ] uAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] uber: [ i686-linux, x86_64-linux, x86_64-darwin ] uberlast: [ i686-linux, x86_64-linux, x86_64-darwin ] uconv: [ i686-linux, x86_64-linux, x86_64-darwin ] - udbus-model: [ i686-linux, x86_64-linux, x86_64-darwin ] - udbus: [ i686-linux, x86_64-linux, x86_64-darwin ] udp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] uhc-light: [ i686-linux, x86_64-linux, x86_64-darwin ] + uhc-util: [ i686-linux, x86_64-linux, x86_64-darwin ] uhexdump: [ i686-linux, x86_64-linux, x86_64-darwin ] + uhttpc: [ i686-linux, x86_64-linux, x86_64-darwin ] ui-command: [ i686-linux, x86_64-linux, x86_64-darwin ] UMM: [ i686-linux, x86_64-linux, x86_64-darwin ] + unagi-bloomfilter: [ i686-linux, x86_64-linux, x86_64-darwin ] unagi-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] unamb-custom: [ i686-linux, x86_64-linux, x86_64-darwin ] + unbound: [ i686-linux, x86_64-linux, x86_64-darwin ] unbounded-delays-units: [ i686-linux, x86_64-linux, x86_64-darwin ] unboxed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] unbreak: [ i686-linux, x86_64-linux, x86_64-darwin ] + uni-events: [ i686-linux, x86_64-linux, x86_64-darwin ] + uni-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] + uni-htk: [ i686-linux, x86_64-linux, x86_64-darwin ] + uni-posixutil: [ i686-linux, x86_64-linux, x86_64-darwin ] + uni-reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] + uni-uDrawGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + uni-util: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-normalization: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-show: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] union-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - unique-logic-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - unique-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] uniqueid: [ i686-linux, x86_64-linux, x86_64-darwin ] units-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] + unitym-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-fcntl: [ i686-linux, x86_64-linux, x86_64-darwin ] + unix-handle: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - Unixutils-shadow: [ "x86_64-darwin" ] unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + unordered-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ] unroll-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] unsafely: [ i686-linux, x86_64-linux, x86_64-darwin ] unscramble: [ i686-linux, x86_64-linux, x86_64-darwin ] unsequential: [ i686-linux, x86_64-linux, x86_64-darwin ] + unused: [ i686-linux, x86_64-linux, x86_64-darwin ] + uom-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] up: [ i686-linux, x86_64-linux, x86_64-darwin ] update-nix-fetchgit: [ i686-linux, x86_64-linux, x86_64-darwin ] uploadcare: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8306,8 +9108,11 @@ dont-distribute-packages: uri-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] uri-enumerator-file: [ i686-linux, x86_64-linux, x86_64-darwin ] uri-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + uri-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] + uri-template: [ i686-linux, x86_64-linux, x86_64-darwin ] url-decoders: [ i686-linux, x86_64-linux, x86_64-darwin ] url-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + URLb: [ i686-linux, x86_64-linux, x86_64-darwin ] urlcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] urldecode: [ i686-linux, x86_64-linux, x86_64-darwin ] urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8338,23 +9143,24 @@ dont-distribute-packages: vacuum-ubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum: [ i686-linux, x86_64-linux, x86_64-darwin ] valid-names: [ i686-linux, x86_64-linux, x86_64-darwin ] + validate-input: [ i686-linux, x86_64-linux, x86_64-darwin ] validated-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] Validation: [ i686-linux, x86_64-linux, x86_64-darwin ] - validation: [ i686-linux, x86_64-linux, x86_64-darwin ] validations: [ i686-linux, x86_64-linux, x86_64-darwin ] vampire: [ i686-linux, x86_64-linux, x86_64-darwin ] var: [ i686-linux, x86_64-linux, x86_64-darwin ] + varan: [ i686-linux, x86_64-linux, x86_64-darwin ] variable-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] variables: [ i686-linux, x86_64-linux, x86_64-darwin ] vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcache-trie: [ "x86_64-darwin" ] - vcache: [ "x86_64-darwin" ] vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcsgui: [ "x86_64-darwin" ] + vcf: [ i686-linux, x86_64-linux, x86_64-darwin ] + vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Transform: [ i686-linux, x86_64-linux, x86_64-darwin ] + vec: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-floating-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-floating: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8367,17 +9173,22 @@ dont-distribute-packages: vector-instances-collections: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-random: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-read-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-space-map: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-space-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-text: [ i686-linux, x86_64-linux, x86_64-darwin ] Verba: [ i686-linux, x86_64-linux, x86_64-darwin ] verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict: [ i686-linux, x86_64-linux, x86_64-darwin ] + verify: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] - vgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] + vicinity: [ i686-linux, x86_64-linux, x86_64-darwin ] + ViennaRNA-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] views: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] Villefort: [ i686-linux, x86_64-linux, x86_64-darwin ] + vimeta: [ i686-linux, x86_64-linux, x86_64-darwin ] vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8388,7 +9199,7 @@ dont-distribute-packages: vision: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-graphrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] - vivid: [ i686-linux, x86_64-linux, x86_64-darwin ] + visualize-cbn: [ i686-linux, x86_64-linux, x86_64-darwin ] vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8399,12 +9210,15 @@ dont-distribute-packages: vty-menu: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-ui-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + vulkan-api: [ i686-linux, x86_64-linux, x86_64-darwin ] vulkan: [ i686-linux, x86_64-linux, x86_64-darwin ] wacom-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] waddle: [ i686-linux, x86_64-linux, x86_64-darwin ] wahsp: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-frontend-monadcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-git-http: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-scgi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8416,22 +9230,23 @@ dont-distribute-packages: wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-make-assets: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-brotli: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-consul: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-content-type: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-crowd: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-etag: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-headers: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-hmac-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-json-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-verbs: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-secure-cookies: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8439,6 +9254,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 ] + waitra: [ 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 ] @@ -8447,6 +9263,7 @@ dont-distribute-packages: WashNGo: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] + wavefront-obj: [ i686-linux, x86_64-linux, x86_64-darwin ] WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] wavy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8454,6 +9271,7 @@ dont-distribute-packages: web-css: [ i686-linux, x86_64-linux, x86_64-darwin ] web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-inv-route: [ 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-push: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8475,7 +9293,7 @@ dont-distribute-packages: WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] webfinger-client: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkit2gtk3-javascriptcore: [ "x86_64-darwin" ] + webkit2gtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8494,16 +9312,16 @@ dont-distribute-packages: whiskers: [ i686-linux, x86_64-linux, x86_64-darwin ] whitespace: [ i686-linux, x86_64-linux, x86_64-darwin ] why3: [ i686-linux, x86_64-linux, x86_64-darwin ] - wide-word: [ i686-linux, x86_64-linux, x86_64-darwin ] WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] - wild-bind-task-x11: [ "x86_64-darwin" ] + wild-bind-task-x11: [ i686-linux, x86_64-linux, x86_64-darwin ] windns: [ i686-linux, x86_64-linux, x86_64-darwin ] windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] winio: [ i686-linux, x86_64-linux, x86_64-darwin ] - Wired: [ "x86_64-darwin" ] + wire-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] wires: [ i686-linux, x86_64-linux, x86_64-darwin ] + wiring: [ i686-linux, x86_64-linux, x86_64-darwin ] wkt: [ i686-linux, x86_64-linux, x86_64-darwin ] wl-pprint-ansiterm: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8513,6 +9331,7 @@ dont-distribute-packages: wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ] woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] + word2vec-model: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] wordchoice: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8521,6 +9340,7 @@ dont-distribute-packages: wordpass: [ i686-linux, x86_64-linux, x86_64-darwin ] wordsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] workdays: [ i686-linux, x86_64-linux, x86_64-darwin ] + workflow-extra: [ 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 ] @@ -8529,11 +9349,11 @@ dont-distribute-packages: wrecker-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] wreq-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] - wreq-stringless: [ i686-linux, x86_64-linux, x86_64-darwin ] wright: [ i686-linux, x86_64-linux, x86_64-darwin ] ws: [ i686-linux, x86_64-linux, x86_64-darwin ] wsdl: [ i686-linux, x86_64-linux, x86_64-darwin ] wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ] + wsjtx-udp: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8542,11 +9362,12 @@ dont-distribute-packages: wumpus-microprint: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] WURFL: [ i686-linux, x86_64-linux, x86_64-darwin ] - wx: [ "x86_64-darwin" ] - wxAsteroids: [ "x86_64-darwin" ] - wxc: [ "x86_64-darwin" ] - wxcore: [ "x86_64-darwin" ] + wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxAsteroids: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxc: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] WXDiffCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxdirect: [ i686-linux, x86_64-linux, x86_64-darwin ] wxFruit: [ i686-linux, x86_64-linux, x86_64-darwin ] WxGeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] wxhnotepad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8558,13 +9379,12 @@ dont-distribute-packages: X11-rm: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ] - x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ] x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ] - xbattbar: [ "x86_64-darwin" ] xcffib: [ i686-linux, x86_64-linux, x86_64-darwin ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] xcp: [ i686-linux, x86_64-linux, x86_64-darwin ] - xdot: [ "x86_64-darwin" ] + xdcc: [ i686-linux, x86_64-linux, x86_64-darwin ] + xdot: [ i686-linux, x86_64-linux, x86_64-darwin ] Xec: [ i686-linux, x86_64-linux, x86_64-darwin ] xfconf: [ i686-linux, x86_64-linux, x86_64-darwin ] xhaskell-library: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8573,19 +9393,17 @@ dont-distribute-packages: xhb: [ i686-linux, x86_64-linux, x86_64-darwin ] xine: [ i686-linux, x86_64-linux, x86_64-darwin ] xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - xkbcommon: [ "x86_64-darwin" ] + xkbcommon: [ i686-linux, x86_64-linux, x86_64-darwin ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] - xleb: [ i686-linux, x86_64-linux, x86_64-darwin ] - xls: [ "x86_64-darwin" ] xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] + xlsx-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] + xlsx: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-conduit-decode: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-conduit-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-html-conduit-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-isogen: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8593,11 +9411,14 @@ dont-distribute-packages: xml-push: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-query: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-tydom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmlbf-xeno: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmlbf-xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] + XMLParser: [ i686-linux, x86_64-linux, x86_64-darwin ] xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8606,9 +9427,7 @@ dont-distribute-packages: xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-gpl: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-utils: [ "x86_64-darwin" ] xmonad-vanessa: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-wallpaper: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-windownames: [ i686-linux, x86_64-linux, x86_64-darwin ] xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8619,52 +9438,64 @@ dont-distribute-packages: xpathdsv: [ i686-linux, x86_64-linux, x86_64-darwin ] xsact: [ i686-linux, x86_64-linux, x86_64-darwin ] XSaiga: [ i686-linux, x86_64-linux, x86_64-darwin ] + xsd: [ i686-linux, x86_64-linux, x86_64-darwin ] xslt: [ i686-linux, x86_64-linux, x86_64-darwin ] - xtc: [ "x86_64-darwin" ] + xtc: [ i686-linux, x86_64-linux, x86_64-darwin ] y0l0bot: [ i686-linux, x86_64-linux, x86_64-darwin ] yabi-muno: [ i686-linux, x86_64-linux, x86_64-darwin ] Yablog: [ i686-linux, x86_64-linux, x86_64-darwin ] + yackage: [ i686-linux, x86_64-linux, x86_64-darwin ] YACPong: [ i686-linux, x86_64-linux, x86_64-darwin ] yahoo-finance-api: [ i686-linux, x86_64-linux, x86_64-darwin ] yahoo-finance-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] yahoo-web-search: [ i686-linux, x86_64-linux, x86_64-darwin ] yajl-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] yajl: [ i686-linux, x86_64-linux, x86_64-darwin ] + yam-app: [ i686-linux, x86_64-linux, x86_64-darwin ] + yam-job: [ i686-linux, x86_64-linux, x86_64-darwin ] + yam-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] + yam-transaction-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + yam-transaction-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml2owl: [ i686-linux, x86_64-linux, x86_64-darwin ] yamlkeysdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] - YamlReference: [ "x86_64-darwin" ] yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] - yampa-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + yampa-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ] + yandex-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] yaop: [ i686-linux, x86_64-linux, x86_64-darwin ] yap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yarn-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] + yarn2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] yarr-image-io: [ i686-linux, x86_64-linux, x86_64-darwin ] yarr: [ i686-linux, x86_64-linux, x86_64-darwin ] - yate: [ i686-linux, x86_64-linux, x86_64-darwin ] yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-account: [ 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-bcryptdb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-deskcom: [ 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-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap-native: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-nopassword: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-oauth: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-zendesk: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-content-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8672,11 +9503,17 @@ dont-distribute-packages: yesod-crud-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-crud: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-datatables: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-elements: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-form-richtext: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-gitrev: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-goodies: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-job-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-links: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-media-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8687,40 +9524,45 @@ dont-distribute-packages: yesod-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-raml-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-raml: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-recaptcha: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-routes-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-rst: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-session-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-tableview: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-static-angular: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-test-json: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-text-markdown: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-vend: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] + yet-another-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] YFrob: [ i686-linux, x86_64-linux, x86_64-darwin ] yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-dynamic-configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-frontend-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-monokai: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi: [ i686-linux, x86_64-linux, x86_64-darwin ] yices: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] + yoga: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ] yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] york-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] yql: [ i686-linux, x86_64-linux, x86_64-darwin ] - yst: [ i686-linux, x86_64-linux, x86_64-darwin ] + yu-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + yu-launch: [ i686-linux, x86_64-linux, x86_64-darwin ] yuiGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] + yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + z3-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] zabt: [ i686-linux, x86_64-linux, x86_64-darwin ] zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8742,12 +9584,13 @@ dont-distribute-packages: zifter: [ 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 ] + zip-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - ziptastic-core: [ "x86_64-darwin" ] + ziptastic-core: [ i686-linux, x86_64-linux, x86_64-darwin ] zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] + zm: [ 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 ] zmidi-score: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8758,8 +9601,9 @@ dont-distribute-packages: zoom-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom-refs: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom: [ i686-linux, x86_64-linux, x86_64-darwin ] - zot: [ "x86_64-darwin" ] zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] + ztail: [ i686-linux, x86_64-linux, x86_64-darwin ] + zuramaru: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] - zxcvbn-c: [ "x86_64-darwin" ] + zxcvbn-c: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8146674a94358f80132588cf94fa7e73f92de22a..ef1ebe881f5478df799ae2b4095073b2cf3d3654 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -53,14 +53,13 @@ self: super: builtins.intersectAttrs super { # Use the default version of mysql to build this package (which is actually mariadb). # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; }); + mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; }); # CUDA needs help finding the SDK headers and libraries. cuda = overrideCabal super.cuda (drv: { extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11]; - configureFlags = (drv.configureFlags or []) ++ - pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [ - "--extra-lib-dirs=${pkgs.cudatoolkit}/lib" + configureFlags = (drv.configureFlags or []) ++ [ + "--extra-lib-dirs=${pkgs.cudatoolkit.lib}/lib" "--extra-include-dirs=${pkgs.cudatoolkit}/include" ]; preConfigure = '' @@ -144,6 +143,8 @@ self: super: builtins.intersectAttrs super { 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; + gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; + taffybar = (addPkgconfigDepend super.taffybar pkgs.gtk3).override { dbus = self.dbus_1_0_1; }; # Need WebkitGTK, not just webkit. webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; }; @@ -203,7 +204,7 @@ self: super: builtins.intersectAttrs super { # Tries to mess with extended POSIX attributes, but can't in our chroot environment. xattr = dontCheck super.xattr; - # Needs access to locale data, but looks for it in the wrong place. + # Needs access to locale data, but looks for it in the wrong place. scholdoc-citeproc = dontCheck super.scholdoc-citeproc; # Expect to find sendmail(1) in $PATH. @@ -221,7 +222,7 @@ self: super: builtins.intersectAttrs super { wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; # Test suite wants to connect to $DISPLAY. - hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.mesa); + hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.libGLU_combined); # Tests attempt to use NPM to install from the network into # /homeless-shelter. Disabled. @@ -258,7 +259,7 @@ self: super: builtins.intersectAttrs super { } ); - llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_4; }; + llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -350,7 +351,7 @@ self: super: builtins.intersectAttrs super { # https://github.com/deech/fltkhs/issues/16 fltkhs = overrideCabal super.fltkhs (drv: { libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf]; - librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.mesa_noglu pkgs.libjpeg]; + librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.libGL pkgs.libjpeg]; }); # https://github.com/skogsbaer/hscurses/pull/26 @@ -463,9 +464,6 @@ 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 gi-javascriptcore API version 4 - gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_14; }; - # requires valid, writeable $HOME hatex-guide = overrideCabal super.hatex-guide (drv: { preConfigure = '' @@ -474,10 +472,6 @@ self: super: builtins.intersectAttrs super { ''; }); - # Fails to link against with newer gsl versions because a deprecrated function - # was removed - hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; }; - # tests run executable, relying on PATH # without this, tests fail with "Couldn't launch intero process" intero = overrideCabal super.intero (drv: { @@ -495,16 +489,17 @@ self: super: builtins.intersectAttrs super { liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell); - # Haskell OpenCV bindings need contrib code enabled in the C++ library. - opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; }; - # Without this override, the builds lacks pkg-config. - opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); - - # Written against the 6.X series of megaparsec - htoml-megaparsec = super.htoml-megaparsec.override { megaparsec = self.megaparsec_6_2_0; }; + opencv-extra = addPkgconfigDepend super.opencv-extra pkgs.opencv3; # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; + colour = dontCheck super.colour; + + LDAP = dontCheck (overrideCabal super.LDAP (drv: { + librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; + })); + # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 + blank-canvas = dontCheck super.blank-canvas; } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 1658ce79393649356751dc4692c8737e321d41f4..7b512e46da80498663fbcd7064cee26f80410c0f 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -1,8 +1,9 @@ { pkgs, stdenv, lib, haskellLib, ghc, all-cabal-hashes +, buildHaskellPackages , compilerConfig ? (self: super: {}) , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) -, initialPackages ? import ./hackage-packages.nix +, initialPackages ? import ./initial-packages.nix , configurationCommon ? import ./configuration-common.nix , configurationNix ? import ./configuration-nix.nix }: @@ -14,7 +15,7 @@ let haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; - inherit stdenv haskellLib ghc extensible-self; + inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes; }; commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 3e82003be43c25be426e00e4e819e21608af7abc..52d596da701ae49b2bfa737af6b03ebb9484927d 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,7 +1,14 @@ -{ stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused -, jailbreak-cabal, hscolour, cpphs, nodejs, lib, removeReferencesTo +{ stdenv, buildPackages, buildHaskellPackages, ghc +, jailbreak-cabal, hscolour, cpphs, nodejs +, buildPlatform, hostPlatform }: -let isCross = (ghc.cross or null) != null; in + +let + isCross = buildPlatform != hostPlatform; + inherit (buildPackages) + fetchurl removeReferencesTo + pkgconfig coreutils gnugrep gnused glibcLocales; +in { pname , dontStrip ? (ghc.isGhcjs or false) @@ -17,18 +24,19 @@ let isCross = (ghc.cross or null) != null; in , doBenchmark ? false , doHoogle ? true , editedCabalFile ? null -, enableLibraryProfiling ? false +, enableLibraryProfiling ? true , enableExecutableProfiling ? false +, profilingDetail ? "all-functions" # TODO enable shared libs for cross-compiling -, enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) -, enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) -, enableSplitObjs ? null # OBSOLETE, use enableDeadCodeElimination -, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin +, enableSharedExecutables ? false +, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) +, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? true +, enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , homepage ? "http://hackage.haskell.org/package/${pname}" -, platforms ? ghc.meta.platforms -, hydraPlatforms ? platforms +, platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile +, hydraPlatforms ? null , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable , jailbreak ? false @@ -53,20 +61,17 @@ let isCross = (ghc.cross or null) != null; in , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" +, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all" , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock } @ args: assert editedCabalFile != null -> revision != null; -# OBSOLETE, use enableDeadCodeElimination -assert enableSplitObjs == null; let inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast - concatStringsSep enableFeature optionalAttrs toUpper - filter makeLibraryPath; + concatStringsSep enableFeature optionalAttrs toUpper; isGhcjs = ghc.isGhcjs or false; isHaLVM = ghc.isHaLVM or false; @@ -74,7 +79,11 @@ let then "package-db" else "package-conf"; - nativeGhc = if isCross || isGhcjs then ghc.bootPkgs.ghc else ghc; + # GHC used for building Setup.hs + # + # Same as our GHC, unless we're cross, in which case it is native GHC with the + # same version, or ghcjs, in which case its the ghc used to build ghcjs. + nativeGhc = buildHaskellPackages.ghc; nativePackageDbFlag = if versionOlder "7.6" nativeGhc.version then "package-db" else "package-conf"; @@ -102,12 +111,17 @@ let enableParallelBuilding = (versionOlder "7.8" ghc.version && !hasActiveLibrary) || versionOlder "8.0.1" ghc.version; crossCabalFlags = [ - "--with-ghc=${ghc.cross.config}-ghc" - "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg" - "--with-gcc=${ghc.cc}" - "--with-ld=${ghc.ld}" - "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" - ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]); + "--with-ghc=${ghc.targetPrefix}ghc" + "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" + "--with-gcc=${stdenv.cc.targetPrefix}cc" + "--with-ld=${stdenv.cc.bintools.targetPrefix}ld" + # use the one that comes with the cross compiler. + "--with-hsc2hs=${ghc.targetPrefix}hsc2hs" + "--with-strip=${stdenv.cc.bintools.targetPrefix}strip" + ] ++ optionals (!isHaLVM) [ + "--hsc2hs-option=--cross-compile" + (optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm") + ]; crossCabalFlagsString = stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); @@ -122,25 +136,27 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature (enableDeadCodeElimination && (versionAtLeast "8.0.1" ghc.version)) "split-objs") + (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") + (optionalString ((enableExecutableProfiling || enableLibraryProfiling) && versionOlder "8" ghc.version) "--profiling-detail=${profilingDetail}") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") (optionalString (versionAtLeast ghc.version "7.10") (enableFeature doCoverage "coverage")) - (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla")) + (optionalString (versionOlder "8.4" ghc.version) (enableFeature enableStaticLibraries "static")) (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic")) (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests")) + "--enable-library-vanilla" # TODO: Should this be configurable? + "--enable-library-for-ghci" # TODO: Should this be configurable? ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ "--ghc-option=-split-sections" ] ++ optionals isGhcjs [ "--ghcjs" ] ++ optionals isCross ([ - "--configure-option=--host=${ghc.cross.config}" + "--configure-option=--host=${hostPlatform.config}" ] ++ crossCabalFlags); setupCompileFlags = [ - (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir") - (optionalString isGhcjs "-build-runner") + (optionalString (!coreSetup) "-${nativePackageDbFlag}=$packageConfDir") (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") @@ -152,14 +168,12 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; - nativeBuildInputs = optional (allPkgconfigDepends != []) pkgconfig ++ - buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]; + nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ + buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ - # ghcjs's hsc2hs calls out to the native hsc2hs - optional isGhcjs nativeGhc ++ optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; @@ -168,13 +182,14 @@ let ghcEnv = ghc.withPackages (p: haskellBuildInputs); - 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 ""; - ghcCommand = "${crossPrefix}${ghcCommand'}"; + ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= toUpper ghcCommand'; + nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; + in assert allPkgconfigDepends != [] -> pkgconfig != null; @@ -182,7 +197,7 @@ assert allPkgconfigDepends != [] -> pkgconfig != null; stdenv.mkDerivation ({ name = "${pname}-${version}"; - outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc")); + outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"); setOutputFlags = false; pos = builtins.unsafeGetAttrPos "pname" args; @@ -213,7 +228,6 @@ stdenv.mkDerivation ({ runHook preSetupCompilerEnvironment echo "Build with ${ghc}." - export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} packageConfDir="$TMPDIR/package.conf.d" @@ -222,8 +236,8 @@ stdenv.mkDerivation ({ setupCompileFlags="${concatStringsSep " " setupCompileFlags}" configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" - # nativePkgs defined in stdenv/setup.hs - for p in "''${nativePkgs[@]}"; do + # host.*Pkgs defined in stdenv/setup.hs + for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/ continue @@ -235,7 +249,11 @@ stdenv.mkDerivation ({ configureFlags+=" --extra-lib-dirs=$p/lib" fi done - '' + (optionalString stdenv.isDarwin '' + '' + # only use the links hack if we're actually building dylibs. otherwise, the + # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes + # "ln -s $out/lib/links", which tries to recreate the links dir and fails + + (optionalString (stdenv.isDarwin && enableSharedLibraries) '' # Work around a limit in the macOS Sierra linker on the number of paths # referenced by any one dynamic library: # @@ -243,7 +261,7 @@ stdenv.mkDerivation ({ # 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 + for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'|sort -u); do ln -s "$d/"*.dylib $dynamicLinksDir done # Edit the local package DB to reference the links directory. @@ -264,11 +282,15 @@ stdenv.mkDerivation ({ done echo setupCompileFlags: $setupCompileFlags - ${setupBuilder} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i + ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i runHook postCompileBuildDriver ''; + # Cabal takes flags like `--configure-option=--host=...` instead + configurePlatforms = []; + inherit configureFlags; + configurePhase = '' runHook preConfigure @@ -276,7 +298,7 @@ stdenv.mkDerivation ({ echo configureFlags: $configureFlags ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log" - if ${gnugrep}/bin/egrep -q '^Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then + if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then echo >&2 "*** abort because of serious configure-time warning from Cabal" exit 1 fi @@ -317,13 +339,20 @@ stdenv.mkDerivation ({ local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" ${setupCommand} register --gen-pkg-config=$packageConfFile - local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) - mv $packageConfFile $packageConfDir/$pkgId.conf + if [ -d "$packageConfFile" ]; then + mv "$packageConfFile/"* "$packageConfDir" + rmdir "$packageConfFile" + fi + for packageConfFile in "$packageConfDir/"*; do + local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) + mv $packageConfFile $packageConfDir/$pkgId.conf + done ''} ${optionalString isGhcjs '' for exeDir in "$out/bin/"*.jsexe; do exe="''${exeDir%.jsexe}" printWords '#!${nodejs}/bin/node' > "$exe" + echo >> "$exe" cat "$exeDir/all.js" >> "$exe" chmod +x "$exe" done @@ -336,7 +365,7 @@ stdenv.mkDerivation ({ ''} ${optionalString enableSeparateDocOutput '' - for x in ${docdir "$doc"}/html/src/*.html; do + for x in ${docdir "$doc"}"/html/src/"*.html; do remove-references-to -t $out $x done mkdir -p $doc @@ -350,6 +379,8 @@ stdenv.mkDerivation ({ inherit pname version; + compiler = ghc; + isHaskellLibrary = hasActiveLibrary; # TODO: ask why the split outputs are configurable at all? @@ -362,17 +393,15 @@ stdenv.mkDerivation ({ env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment"; - nativeBuildInputs = [ ghcEnv systemBuildInputs ]; + buildInputs = systemBuildInputs; + nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = optionalString (stdenv.hostPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" # TODO: is this still valid? export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" - 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}"''} @@ -385,7 +414,7 @@ stdenv.mkDerivation ({ // optionalAttrs broken { inherit broken; } // optionalAttrs (description != "") { inherit description; } // optionalAttrs (maintainers != []) { inherit maintainers; } - // optionalAttrs (hydraPlatforms != platforms) { inherit hydraPlatforms; } + // optionalAttrs (hydraPlatforms != null) { inherit hydraPlatforms; } ; } @@ -393,7 +422,6 @@ stdenv.mkDerivation ({ // optionalAttrs (postCompileBuildDriver != "") { inherit postCompileBuildDriver; } // optionalAttrs (preUnpack != "") { inherit preUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; } -// optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } @@ -412,5 +440,5 @@ stdenv.mkDerivation ({ // optionalAttrs (postFixup != "") { inherit postFixup; } // optionalAttrs (dontStrip) { inherit dontStrip; } // optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; } -// optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } +// optionalAttrs (buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e8a39395870d900feeea376afb4895e2fa8aad91..bf7838b2b21b270f4cd11c77f0aa0cdf87f20622 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -269,6 +269,35 @@ self: { homepage = "https://github.com/choener/ADPfusion"; description = "Efficient, high-level dynamic programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ADPfusionForest" = callPackage + ({ mkDerivation, ADPfusion, base, containers, criterion, DPutils + , fgl, ForestStructures, GrammarProducts, PrimitiveArray + , QuickCheck, strict, tasty, tasty-quickcheck, tasty-th, text + , unordered-containers, vector, vector-algorithms, vector-instances + , vector-th-unbox + }: + mkDerivation { + pname = "ADPfusionForest"; + version = "0.0.0.1"; + sha256 = "1ikv9y1hs478s5ns8g42cnsga3kw8qxpn1yc3vi5ix95i6q6wi4v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ADPfusion base containers DPutils fgl ForestStructures + GrammarProducts PrimitiveArray strict text unordered-containers + vector vector-algorithms vector-instances vector-th-unbox + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th + ]; + benchmarkHaskellDepends = [ base criterion ForestStructures ]; + homepage = "https://github.com/choener/ADPfusionForest"; + description = "Dynamic programming on tree and forest structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ADPfusionSet" = callPackage @@ -294,6 +323,7 @@ self: { homepage = "https://github.com/choener/ADPfusionSet"; description = "Dynamic programming for Set data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AERN-Basics" = callPackage @@ -477,9 +507,7 @@ self: { }) {}; "ALUT" = callPackage - ({ mkDerivation, base, freealut, OpenAL, pretty, StateVar - , transformers - }: + ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }: mkDerivation { pname = "ALUT"; version = "2.4.0.2"; @@ -488,11 +516,9 @@ self: { isExecutable = true; libraryHaskellDepends = [ base OpenAL StateVar transformers ]; librarySystemDepends = [ freealut ]; - executableHaskellDepends = [ base pretty ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freealut;}; "AMI" = callPackage @@ -516,9 +542,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ANum"; - version = "0.1.1.0"; - sha256 = "0ilgz1akz66cwwvxd8dkz2fq9gyplc4m206jpmp380ys5n37b4q9"; + version = "0.2.0.2"; + sha256 = "06mvkp9b0hxlp1w2yp7bb6340l88mzs15azx7nma401icqdhvbpn"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; homepage = "https://github.com/DanBurton/ANum#readme"; description = "Num instance for Applicatives provided via the ANum newtype"; license = stdenv.lib.licenses.bsd3; @@ -726,6 +753,8 @@ self: { pname = "Agda"; version = "2.5.3"; sha256 = "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a"; + revision = "5"; + editedCabalFile = "0cly9p549phqv86dlqacxrs2w50y5jmsw21657gpn84ryz3cmjbs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -810,6 +839,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "AlgoRhythm" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, derive + , directory, Euterpea, HCodecs, HUnit, kmeans, lilypond, midi, mtl + , prettify, QuickCheck, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers + }: + mkDerivation { + pname = "AlgoRhythm"; + version = "0.1.0.0"; + sha256 = "03rmcafbnbb43fww1y6rfi8dpbl85yi71rjxmz7mqxh4zn5c9jwz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default derive Euterpea HCodecs kmeans + lilypond midi mtl prettify QuickCheck random template-haskell text + transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring derive directory Euterpea HCodecs HUnit lilypond + QuickCheck random test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; + homepage = "http://github.com/omelkonian/AlgoRhythm/"; + description = "Algorithmic music composition"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "AlgorithmW" = callPackage ({ mkDerivation, base, containers, mtl, pretty }: mkDerivation { @@ -845,22 +904,23 @@ self: { "Allure" = callPackage ({ mkDerivation, async, base, containers, enummapset-th, filepath - , LambdaHack, random, template-haskell, text, zlib + , LambdaHack, optparse-applicative, random, template-haskell, text + , zlib }: mkDerivation { pname = "Allure"; - version = "0.6.2.0"; - sha256 = "1va5xpyw2plq1f82q2zk64xyrdvkprjzv5p6zycircgc2ficz5a1"; + version = "0.7.1.0"; + sha256 = "0lsyp2rgn5g5d7q4wv13m9p5ayh0aqlzp3b11swhf7br77gg17ym"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - async base containers enummapset-th filepath LambdaHack random - template-haskell text zlib + async base containers enummapset-th filepath LambdaHack + optparse-applicative random template-haskell text zlib ]; testHaskellDepends = [ - base containers enummapset-th filepath LambdaHack random - template-haskell text zlib + base containers enummapset-th filepath LambdaHack + optparse-applicative random template-haskell text zlib ]; homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; @@ -910,7 +970,6 @@ self: { testHaskellDepends = [ base mtl multirec parsec ]; description = "Constructing, analyzing and destructing annotated trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ansi2Html" = callPackage @@ -947,12 +1006,11 @@ self: { }) {}; "AppleScript" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation }: mkDerivation { pname = "AppleScript"; version = "0.2.0.1"; sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr"; - libraryHaskellDepends = [ base ]; doHaddock = false; homepage = "https://github.com/reinerp/haskell-AppleScript"; description = "Call AppleScript from Haskell, and then call back into Haskell"; @@ -1186,15 +1244,14 @@ self: { }: mkDerivation { pname = "BNFC-meta"; - version = "0.4.0.3"; - sha256 = "10rfljhygdl75ibmj0xqj7qwdk0ppjr8iw4wmvzdpl28mqjshny2"; + version = "0.6"; + sha256 = "1vw3h7b4n6im9kr2abr3m1d1y7xr5m19f53b0pqh1w1izmi5m6mz"; libraryHaskellDepends = [ alex-meta array base happy-meta haskell-src-meta syb template-haskell ]; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Baggins" = callPackage @@ -1348,6 +1405,7 @@ self: { homepage = "http://www.prg.nii.ac.jp/project/bigul/"; description = "The Bidirectional Generic Update Language"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BigPixel" = callPackage @@ -1390,6 +1448,7 @@ self: { ]; description = "Libary for Hidden Markov Models in HMMER3 format"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Biobase" = callPackage @@ -1612,21 +1671,23 @@ self: { }) {}; "BiobaseTypes" = callPackage - ({ mkDerivation, aeson, base, bimaps, binary, cereal, cereal-text - , 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, aeson, base, bimaps, binary, bytestring, cereal + , cereal-text, cereal-vector, containers, data-default, deepseq + , hashable, intern, lens, mtl, primitive, PrimitiveArray + , QuickCheck, string-conversions, tasty, tasty-quickcheck, tasty-th + , text, text-binary, utf8-string, vector, vector-binary-instances + , vector-th-unbox }: mkDerivation { pname = "BiobaseTypes"; - version = "0.1.2.1"; - sha256 = "11wcwnhz9n7vs8xmsr3jdwa219797kcbaw5dw2qip9jih41gijwj"; + version = "0.1.3.0"; + sha256 = "15yzg4llvz7pq5f0chfwrkaqspwrqxan4xvczrk4mvwa07z3abbp"; libraryHaskellDepends = [ - aeson base bimaps binary cereal cereal-text cereal-vector - data-default deepseq hashable intern primitive PrimitiveArray - QuickCheck string-conversions text text-binary vector - vector-binary-instances vector-th-unbox + aeson base bimaps binary bytestring cereal cereal-text + cereal-vector containers data-default deepseq hashable intern lens + mtl primitive PrimitiveArray QuickCheck string-conversions text + text-binary utf8-string vector vector-binary-instances + vector-th-unbox ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th @@ -1634,6 +1695,7 @@ self: { homepage = "https://github.com/choener/BiobaseTypes"; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseVienna" = callPackage @@ -1654,32 +1716,35 @@ self: { }) {}; "BiobaseXNA" = callPackage - ({ mkDerivation, aeson, base, bimaps, binary, bytes, bytestring - , cereal, cereal-vector, cmdargs, containers, csv, deepseq - , file-embed, hashable, lens, primitive, PrimitiveArray, QuickCheck - , split, tasty, tasty-quickcheck, tasty-th, text, tuple, vector + ({ mkDerivation, aeson, attoparsec, base, bimaps, binary + , BiobaseTypes, bytes, bytestring, cereal, cereal-vector, cmdargs + , containers, csv, deepseq, file-embed, ForestStructures, hashable + , lens, mtl, 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.1"; - sha256 = "0jlcdd0slq7d5wr44h3h6lnfcp310h36cabd4r7l32xhcxns9k6h"; + version = "0.10.0.0"; + sha256 = "0ah8qzr3wv4x1khh970isbrdn2fabsa7f9v92wif7ls798hw5abz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bimaps binary bytes bytestring cereal cereal-vector - containers csv deepseq file-embed hashable lens primitive - PrimitiveArray QuickCheck split text tuple vector - vector-binary-instances vector-th-unbox + aeson attoparsec base bimaps binary BiobaseTypes bytes bytestring + cereal cereal-vector containers csv deepseq file-embed + ForestStructures hashable lens mtl primitive 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"; + description = "Efficient RNA/DNA/Protein Primary/Secondary Structure"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BirdPP" = callPackage @@ -1697,22 +1762,23 @@ self: { }) {}; "BitStringRandomMonad" = callPackage - ({ mkDerivation, base, bitstring, bytestring, mtl, parallel - , primitive, QuickCheck, transformers, vector + ({ mkDerivation, base, bitstring, bytestring, deepseq, mtl + , parallel, primitive, QuickCheck, transformers, vector }: mkDerivation { pname = "BitStringRandomMonad"; - version = "1.0.0.1"; - sha256 = "1snk8ynll0gc82gqgvnkc6zjpnaszrwc6bb1r4a63ca5vsip2r7x"; + version = "1.1.0.2"; + sha256 = "1g19c1dl80chmxlqqpja19y1np7xnfwspyrp895wnrzi2zydh2jm"; libraryHaskellDepends = [ - base bitstring bytestring mtl parallel primitive transformers - vector + base bitstring bytestring deepseq mtl parallel primitive + transformers vector ]; testHaskellDepends = [ base bitstring bytestring mtl parallel primitive QuickCheck transformers vector ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BitSyntax" = callPackage @@ -1743,20 +1809,22 @@ self: { }) {}; "BlastHTTP" = callPackage - ({ mkDerivation, base, biocore, biofasta, blastxml, bytestring - , conduit, HTTP, http-conduit, hxt, mtl, network, transformers + ({ mkDerivation, base, BiobaseBlast, biocore, biofasta, blastxml + , bytestring, conduit, either-unwrap, HTTP, http-conduit, hxt, mtl + , network, transformers }: mkDerivation { pname = "BlastHTTP"; - version = "1.2.1"; - sha256 = "1mav6nyrqyjfl0qs9r7pqdijpd8dh0ddkcq9fbssyc05p87mxs6f"; + version = "1.3.0"; + sha256 = "1hlb6mmhcb7ijpd3xbsq2piw817k9pk09w4lgq1cgfgs1r6f3vdh"; libraryHaskellDepends = [ - base biocore biofasta blastxml bytestring conduit HTTP http-conduit - hxt mtl network transformers + base BiobaseBlast biocore biofasta blastxml bytestring conduit + either-unwrap HTTP http-conduit hxt mtl network transformers ]; homepage = "https://github.com/eggzilla/BlastHTTP"; description = "Libary to interface with the NCBI blast REST interface"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Blobs" = callPackage @@ -1787,21 +1855,19 @@ self: { , containers, data-default, directory, filepath, HaXml, haxr , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc , pandoc-citeproc, pandoc-types, parsec, process, split, strict - , tagsoup, temporary, transformers + , tagsoup, temporary, text, transformers }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.4.3"; - sha256 = "088pfqgp1m1qv7qdi7h4vvflhlsnay40zg6vnsa3nykyvkm9sy2n"; - revision = "1"; - editedCabalFile = "01fpw6xqfdrhm26frf1mm05spk2zp6f3swl48mk4pz3zbffaskps"; + version = "0.8.6.1"; + sha256 = "1hnw8lzbrhpjwjvy19ppkybxmw9v88rgc8y0sp4z056i2fki09jw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blaze-html bool-extras bytestring cmdargs containers data-default directory filepath HaXml haxr highlighting-kate hscolour HTTP lens mtl pandoc pandoc-citeproc pandoc-types parsec - process split strict tagsoup temporary transformers + process split strict tagsoup temporary text transformers ]; executableHaskellDepends = [ base cmdargs ]; homepage = "http://byorgey.wordpress.com/blogliterately/"; @@ -1816,8 +1882,8 @@ self: { }: mkDerivation { pname = "BlogLiterately-diagrams"; - version = "0.2.0.5"; - sha256 = "0j0rs26c6w895k2vhamziqjh8pzc2zjrqd8s6giw7pdxyp7lv94s"; + version = "0.2.0.6"; + sha256 = "1ps9k7x0s7w0pbf8v7fphm1nyfh5dbxjm3zc1bfjxry4ciqljfyq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1827,6 +1893,7 @@ self: { executableHaskellDepends = [ base BlogLiterately ]; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Blogdown" = callPackage @@ -1835,8 +1902,8 @@ self: { }: mkDerivation { pname = "Blogdown"; - version = "0.2.3"; - sha256 = "0xdlcx82nfm74n88fghbg5f6fnjvrajpsz52hrc4bl5afxx63bpx"; + version = "0.2.4"; + sha256 = "04ll74z2yqb99jydz9bw4p602hvpmk03sgix8rzwg0qb38lwvjvm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -2215,13 +2282,14 @@ self: { ({ mkDerivation, array, base, containers, mtl, parsec, readline }: mkDerivation { pname = "CPL"; - version = "0.0.8"; - sha256 = "0f4lkqrqbvsx7hhjprfirqkianw10978d83xy2hbhl421pv69lr0"; + version = "0.0.9"; + sha256 = "0pa0iqaflj8h0w3wcwrc27vmg4k7n0x8ck5sjscxvxdbbrwjg6z1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl parsec readline ]; + homepage = "https://github.com/msakai/cpl"; description = "An interpreter of Hagino's Categorical Programming Language (CPL)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -2251,7 +2319,6 @@ self: { ]; description = "Firing rules semantic of CSPM"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CSPM-Frontend" = callPackage @@ -2460,24 +2527,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_2_0_0_2" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, filepath, pretty, process, QuickCheck, tagged - , tar, tasty, tasty-hunit, tasty-quickcheck, time, unix + "Cabal_2_2_0_1" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, binary + , bytestring, containers, deepseq, Diff, directory, filepath + , integer-logarithms, mtl, optparse-applicative, parsec, pretty + , process, QuickCheck, tagged, tar, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, transformers + , tree-diff, unix }: mkDerivation { pname = "Cabal"; - version = "2.0.0.2"; - sha256 = "0chhl2113jbahd5gychx9rdqj1aw22h7dyj6z44871hzqxngx6bc"; - revision = "1"; - editedCabalFile = "1k4alrrz7yza66kaya69m0rkcz45mw48afrcv1x54q31cka9xyx1"; + version = "2.2.0.1"; + sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath - pretty process time unix + mtl parsec pretty process text time transformers unix ]; testHaskellDepends = [ - array base bytestring containers directory filepath pretty - QuickCheck tagged tar tasty tasty-hunit tasty-quickcheck + array base base-compat base-orphans bytestring containers deepseq + Diff directory filepath integer-logarithms optparse-applicative + pretty process QuickCheck tagged tar tasty tasty-golden tasty-hunit + tasty-quickcheck text tree-diff ]; doCheck = false; homepage = "http://www.haskell.org/cabal/"; @@ -2620,8 +2690,8 @@ self: { pname = "Cassava"; version = "0.5.1.0"; sha256 = "1z9y8vzsb0qxfx72w0nb77n0ibha48dv4sg3wv02xrrbz95nwlrh"; - revision = "1"; - editedCabalFile = "1ijb77wqccqgjq0g04m3rk3iygm6hwbmrc50svah19vpl3mkz102"; + revision = "3"; + editedCabalFile = "15wwzmp1000jrg3kpyk2zh3k8ja21pdrqj2ghrwwish6lzpsk3v0"; libraryHaskellDepends = [ array attoparsec base bytestring bytestring-builder containers deepseq hashable Only scientific text unordered-containers vector @@ -2631,7 +2701,7 @@ self: { quickcheck-instances scientific test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; - homepage = "https://github.com/hvr/cassava"; + homepage = "https://github.com/tfausak/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -2653,8 +2723,8 @@ self: { ({ mkDerivation, base, free, mmorph, mtl, transformers-base }: mkDerivation { pname = "ChannelT"; - version = "0.0.0.4"; - sha256 = "06yr40kpi4jr65r76vlbf68ybh17n4b2k8claj0czgs4igspyhvn"; + version = "0.0.0.7"; + sha256 = "183pghm74vk1vdcn0mdn6g5q284sncpl1cc49lpczz1wbr15s89y"; libraryHaskellDepends = [ base free mmorph mtl transformers-base ]; homepage = "https://github.com/pthariensflame/ChannelT"; description = "Generalized stream processors"; @@ -2667,8 +2737,8 @@ self: { }: mkDerivation { pname = "Chart"; - version = "1.8.2"; - sha256 = "13g27db8ln2n1hr2wvpa855x0x1izk3c10lb85an7972b5lw2hl4"; + version = "1.8.3"; + sha256 = "13s64fhb2pmkdmx5bkgbgcn25qjihs364fvr47a1dw25f804kiy1"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -2684,8 +2754,8 @@ self: { }: mkDerivation { pname = "Chart-cairo"; - version = "1.8.2"; - sha256 = "1hcg80ddq638cad6m69q61aa0fbj3glnb3a6pbbg8gy4ljfvmn3w"; + version = "1.8.3"; + sha256 = "1581k1nkvv28a078mc32fwxh98daxqsn3424k1frbrgsppwvlm94"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -2703,8 +2773,8 @@ self: { }: mkDerivation { pname = "Chart-diagrams"; - version = "1.8.2"; - sha256 = "0hczp9dj9qs3g72hcgikym1bq3ki90graxfx068h5hds0kn1s66a"; + version = "1.8.3"; + sha256 = "1p1spkx1xkwfiqjkji9wxca1ar0h6n6vqn6h45ly4szr9qyixvdy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -2715,6 +2785,7 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-gtk" = callPackage @@ -2723,8 +2794,8 @@ self: { }: mkDerivation { pname = "Chart-gtk"; - version = "1.8.2"; - sha256 = "1jbl482fd1a4hx56za6xyxi15fz1jg2rdq977spq62aylccpij90"; + version = "1.8.3"; + sha256 = "051w4ik5174502z6d4va84hv7a57y31iy94w09gl5qwihzfs7wz4"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time @@ -2758,8 +2829,8 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.3"; - sha256 = "04jwwjs22mqc4hvpp4c3gpb79inrrq5sapks5khknspv2hslm61q"; + version = "1.3.1.4"; + sha256 = "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -2841,6 +2912,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "Clash-Royale-Hack-Cheats" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Clash-Royale-Hack-Cheats"; + version = "1.0.1"; + sha256 = "19cvhy78s7vl9b6pdi04nrf4iqxb7a2yivmq5fymdxxvdxg9ykds"; + revision = "2"; + editedCabalFile = "0lhljmc8nn7mrdxyx3645m8gkwkpqvcdkfp5dal9pi90in9kd4wp"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ClassLaws" = callPackage ({ mkDerivation, base, ChasingBottoms, mtl, QuickCheck }: mkDerivation { @@ -2891,18 +2985,18 @@ self: { }) {}; "ClustalParser" = callPackage - ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text - , vector + ({ mkDerivation, base, cmdargs, either-unwrap, hspec + , hspec-discover, parsec, text, vector }: mkDerivation { pname = "ClustalParser"; - version = "1.2.1"; - sha256 = "17c7fp6vz64521kjq6xbq3z65cdcwip56qdrxmqcnjryrbysjd00"; + version = "1.2.3"; + sha256 = "0wjs6bsbyykrm0hjdybnap86zsnhjjifampm08dqg7fqp7f7pmpy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec text vector ]; executableHaskellDepends = [ base cmdargs either-unwrap ]; - testHaskellDepends = [ base hspec parsec text ]; + testHaskellDepends = [ base hspec hspec-discover parsec text ]; description = "Libary for parsing Clustal tools output"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -3040,6 +3134,7 @@ self: { libraryHaskellDepends = [ base containers transformers vector ]; description = "A generalization for containers that can be stripped of Nothing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Concurrent-Cache" = callPackage @@ -3051,6 +3146,7 @@ self: { libraryHaskellDepends = [ base ]; description = "A Cached variable for IO functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ConcurrentUtils" = callPackage @@ -3325,8 +3421,8 @@ self: { ({ mkDerivation, base, parsec, pretty }: mkDerivation { pname = "CoreErlang"; - version = "0.0.3"; - sha256 = "111012wpnfa3bm9r5xnfhm5xjq8ppsnwx01a6njbvmqi9hcba3nc"; + version = "0.0.4"; + sha256 = "034g6c7dxdp13v1x16gvwgagpc7mw33hwd16cbb8yd3i91vf1w8z"; libraryHaskellDepends = [ base parsec pretty ]; homepage = "http://github.com/amtal/CoreErlang"; description = "Manipulating Core Erlang source code"; @@ -3487,8 +3583,8 @@ self: { }: mkDerivation { pname = "DAV"; - version = "1.3.1"; - sha256 = "02f03grgwsazvlkyn743k6hjck9s7brbcgbzvyxv9gwbiyjzm02w"; + version = "1.3.2"; + sha256 = "0sai0b7bxwif5czmmdik5dx318drx18inid87wfrxckrflsi8cv1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3549,21 +3645,14 @@ self: { }) {}; "DMuCheck" = callPackage - ({ mkDerivation, base, binary, directory, distributed-process - , distributed-process-simplelocalnet, hint, MuCheck - , network-transport-tcp, unix - }: + ({ mkDerivation, base, MuCheck }: mkDerivation { pname = "DMuCheck"; version = "0.3.0.2"; sha256 = "00dhky0hnda85lvrs155jgwxnpqfm36cqakj3wp0yrn2xlz383ad"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - base binary directory distributed-process - distributed-process-simplelocalnet hint MuCheck - network-transport-tcp unix - ]; + executableHaskellDepends = [ base MuCheck ]; homepage = "https://bitbucket.com/osu-testing/d-mucheck"; description = "Distributed Mutation Analysis framework for MuCheck"; license = stdenv.lib.licenses.gpl2; @@ -3642,7 +3731,7 @@ self: { regex-posix split syb time unix ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ array base bytestring HTF ]; + executableHaskellDepends = [ base ]; description = "Darcs Patch Manager"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -3671,6 +3760,7 @@ self: { homepage = "https://github.com/choener/DPutils"; description = "utilities for DP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DRBG" = callPackage @@ -3718,6 +3808,7 @@ self: { ]; description = "Implementation of DSA, based on the description of FIPS 186-4"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DSH" = callPackage @@ -3960,8 +4051,8 @@ self: { }: mkDerivation { pname = "Decimal"; - version = "0.4.2"; - sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5"; + version = "0.5.1"; + sha256 = "0k7kh05mr2f54w1lpgq1nln0h8k6s6h99dyp5jzsb9cfbb3aap2p"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq HUnit QuickCheck test-framework test-framework-hunit @@ -4244,8 +4335,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "Dish"; - version = "0.0.0.5"; - sha256 = "1xhz0yb8xrjdznvx5prpl7r8k73n78n6gmshqbraq5jdh3vcnisx"; + version = "0.0.0.6"; + sha256 = "1adrlc00assbr7sl0bvnkl452k7hnf663y32ih4wdg3p2sb0dhci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -4605,16 +4696,14 @@ self: { "Earley" = callPackage ({ mkDerivation, base, criterion, deepseq, ListLike, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , unordered-containers }: mkDerivation { pname = "Earley"; - version = "0.12.0.1"; - sha256 = "1cfmarpbldayhdynahw5gkxspsgi4kkjcybisk4kzhdj40yaj9pw"; + version = "0.12.1.0"; + sha256 = "07dxsl2cvb40z2z41a263xpg5mhplaqj9p2qjhaw6q5rkjz9653k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ListLike ]; - executableHaskellDepends = [ base unordered-containers ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck ]; @@ -4662,14 +4751,14 @@ self: { }: mkDerivation { pname = "EdisonCore"; - version = "1.3.1.1"; - sha256 = "06shxmcqxcahcn6zgl64vlqix4fnq53d97drcgsh94qp7gp201ry"; + version = "1.3.2.1"; + sha256 = "0fgj5iwiv3v2gdgx7kjcr15dcs4x1kvmjspp3p99wyhh0x6h3ikk"; libraryHaskellDepends = [ array base containers EdisonAPI mtl QuickCheck ]; homepage = "http://rwd.rdockins.name/edison/home/"; - description = "A library of efficent, purely-functional data structures (Core Implementations)"; - license = "unknown"; + description = "A library of efficient, purely-functional data structures (Core Implementations)"; + license = stdenv.lib.licenses.mit; }) {}; "EditTimeReport" = callPackage @@ -4692,6 +4781,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Eight-Ball-Pool-Hack-Cheats" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Eight-Ball-Pool-Hack-Cheats"; + version = "1.0.1"; + sha256 = "0k620c0ia441rfvxaw2q5n43g5pnml4sn1cr1vzclc9iz0mfdy72"; + revision = "2"; + editedCabalFile = "13dkqc5pa7sjf3xfwgs7kajb7f1ai187w35p8pzni5is0hnaxfmz"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "EitherT" = callPackage ({ mkDerivation, base, monad-control, transformers , transformers-base @@ -4777,6 +4889,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "A type class for empty containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Encode" = callPackage @@ -4795,23 +4908,6 @@ self: { }) {}; "EntrezHTTP" = callPackage - ({ mkDerivation, base, biocore, bytestring, conduit, HTTP - , http-conduit, hxt, mtl, network, Taxonomy, text, transformers - }: - mkDerivation { - pname = "EntrezHTTP"; - version = "1.0.3"; - sha256 = "16x8z6s17wgf53wmp8lib9nr7a2jsa1n95714q4gqs2vif646p1r"; - libraryHaskellDepends = [ - base biocore bytestring conduit HTTP http-conduit hxt mtl network - Taxonomy text transformers - ]; - homepage = "https://github.com/eggzilla/EntrezHTTP"; - description = "Libary to interface with the NCBI Entrez REST service"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "EntrezHTTP_1_0_4" = callPackage ({ mkDerivation, base, biocore, bytestring, conduit, HTTP , http-conduit, hxt, mtl, network, Taxonomy, text, transformers }: @@ -4826,7 +4922,6 @@ self: { homepage = "https://github.com/eggzilla/EntrezHTTP"; description = "Libary to interface with the NCBI Entrez REST service"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "EnumContainers" = callPackage @@ -4942,7 +5037,7 @@ self: { homepage = "http://verement.github.io/etamoo"; description = "A new implementation of the LambdaMOO server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) pcre;}; "Etage" = callPackage @@ -5150,6 +5245,8 @@ self: { pname = "FPretty"; version = "1.1"; sha256 = "0hpbm11z95wfh0i1dp2c35maksnz0zxpz9vbxq6f5c13x4i03b5q"; + revision = "1"; + editedCabalFile = "0d6mjr7b37f5bgjijjgx4x4fgfmkbhksphzkaf0p5jyzxp45fasc"; libraryHaskellDepends = [ base containers ]; homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html"; description = "Efficient simple pretty printing combinators"; @@ -5205,6 +5302,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Facebook-Password-Hacker-Online-Latest-Version" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Facebook-Password-Hacker-Online-Latest-Version"; + version = "1.0.1"; + sha256 = "0xvr2bj800i7ssbn6gbz4pknhakrgifkirf3rsn6ln4g35h29m07"; + revision = "1"; + editedCabalFile = "0p70xim6ay9ffs5s69nw64znridyb7fzdfawh3gp0fzlybzmjypy"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs text + ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Facts" = callPackage ({ mkDerivation, AC-Angle, base, containers, digits, QuickCheck , template-haskell @@ -5243,6 +5364,7 @@ self: { homepage = "https://github.com/wyager/FastPush/"; description = "A monad and monad transformer for pushing things onto a stack very fast"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FastxPipe" = callPackage @@ -5394,7 +5516,6 @@ self: { homepage = "https://github.com/tonymorris/filepather"; description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FileSystem" = callPackage @@ -5432,6 +5553,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Fin" = callPackage + ({ mkDerivation, base, clist, natural-induction, peano }: + mkDerivation { + pname = "Fin"; + version = "0.2.0.0"; + sha256 = "0w4gmfhpav73rkia3q7g6m4lncz1smhfa0rl2sr0602sc0694spr"; + libraryHaskellDepends = [ base clist natural-induction peano ]; + description = "Finite totally-ordered sets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Finance-Quote-Yahoo" = callPackage ({ mkDerivation, base, bytestring, http-conduit, network , old-locale, time @@ -5631,6 +5764,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Forestry" = callPackage + ({ mkDerivation, ADPfusion, ADPfusionForest, base, BiobaseNewick + , BiobaseTypes, containers, criterion, ForestStructures + , FormalGrammars, lens, log-domain, PrimitiveArray + , PrimitiveArray-Pretty, QuickCheck, tasty, tasty-quickcheck + , tasty-th, text, vector + }: + mkDerivation { + pname = "Forestry"; + version = "0.0.0.1"; + sha256 = "0l56ajrdxkpk59ahrdzr5qk4vxp8j3i0w6n6vpp1cl414rwg51qz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ADPfusion ADPfusionForest base BiobaseNewick BiobaseTypes + containers ForestStructures FormalGrammars lens log-domain + PrimitiveArray PrimitiveArray-Pretty text vector + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/choener/Forestry"; + description = "Comparison of trees and forests"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ForkableT" = callPackage ({ mkDerivation, base, monad-control, mtl, resourcet }: mkDerivation { @@ -5675,6 +5836,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Fortnite-Hack-Cheats-Free-V-Bucks-Generator" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Fortnite-Hack-Cheats-Free-V-Bucks-Generator"; + version = "1.0.1"; + sha256 = "02qj2lmf74m0d58fr09grylcmzzygi06rkn37bzpaiqr8fb032js"; + revision = "4"; + editedCabalFile = "1k976a5lnjzxgy486c7msh0d35zj4l3w671n4rivqzr9xfwhmb8d"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Foster" = callPackage ({ mkDerivation, array, base, cmdtheline, containers, criterion , random, strict @@ -5747,43 +5931,20 @@ self: { "Frames" = callPackage ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml - , pipes, pretty, primitive, readable, regex-applicative - , template-haskell, temporary, text, transformers - , unordered-containers, vector, vinyl + , HUnit, pipes, pipes-bytestring, pipes-group, pipes-parse + , pipes-safe, pipes-text, pretty, primitive, readable + , regex-applicative, template-haskell, temporary, text + , transformers, unordered-containers, vector, vinyl }: mkDerivation { pname = "Frames"; - version = "0.1.9"; - sha256 = "09bbxdqfgshhax0lrkpzii9zg3rymqmkgk0xr9b73zzkr1jfmshq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base ghc-prim pipes primitive readable template-haskell text - transformers vector vinyl - ]; - testHaskellDepends = [ - base directory hspec htoml pretty regex-applicative - template-haskell temporary text unordered-containers - ]; - benchmarkHaskellDepends = [ base criterion pipes transformers ]; - description = "Data frames For working with tabular data files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Frames_0_2_1_1" = callPackage - ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml - , HUnit, pipes, pretty, primitive, readable, regex-applicative - , template-haskell, temporary, text, transformers - , unordered-containers, vector, vinyl - }: - mkDerivation { - pname = "Frames"; - version = "0.2.1.1"; - sha256 = "19sgkra9i5mn8nbys1h17vhl2j1yhd43hhg4bjr35nz9hj1cjfjs"; + version = "0.3.0.2"; + sha256 = "1a0dq3dfiqj5nmqk5ivn07ds7k51rf24k5kcbk19m8nwy4hvi896"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base ghc-prim pipes primitive readable template-haskell text + base ghc-prim pipes pipes-bytestring pipes-group pipes-parse + pipes-safe pipes-text primitive readable template-haskell text transformers vector vinyl ]; testHaskellDepends = [ @@ -5904,18 +6065,18 @@ self: { }) {}; "GLFW" = callPackage - ({ mkDerivation, base, libX11, mesa, OpenGL }: + ({ mkDerivation, base, libGL, libX11, libXext, libXfixes, OpenGL }: mkDerivation { pname = "GLFW"; version = "0.5.2.5"; sha256 = "029sw2sykr6plffkrmigv5mj2aklllmgi021is5ybsbqv0mxgh9p"; libraryHaskellDepends = [ base OpenGL ]; - librarySystemDepends = [ libX11 mesa ]; + librarySystemDepends = [ libGL libX11 libXext libXfixes ]; homepage = "http://haskell.org/haskellwiki/GLFW"; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;}; "GLFW-OGL" = callPackage ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }: @@ -5933,19 +6094,38 @@ self: { }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "GLFW-b" = callPackage - ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework - , test-framework-hunit + ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "GLFW-b"; + version = "1.4.8.3"; + sha256 = "01dp6akv70wq9c5qib5f8cmrva9xmqrmdcf30k9y4kklrvbk599z"; + libraryHaskellDepends = [ base bindings-GLFW deepseq ]; + testHaskellDepends = [ + base bindings-GLFW deepseq HUnit test-framework + test-framework-hunit + ]; + description = "Bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "GLFW-b_1_4_8_4" = callPackage + ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit + , test-framework, test-framework-hunit }: mkDerivation { pname = "GLFW-b"; - version = "1.4.8.1"; - sha256 = "1sca2wzkqw77jdj9mxnswx7zaicj1dsl5k3gjsaxmjznbkn4k2j3"; - libraryHaskellDepends = [ base bindings-GLFW ]; + version = "1.4.8.4"; + sha256 = "1xww650q80ii9f80v9kpz56lwgd1cirvhqjdca1vq9xs8k30hfd0"; + libraryHaskellDepends = [ base bindings-GLFW deepseq ]; testHaskellDepends = [ - base bindings-GLFW HUnit test-framework test-framework-hunit + base bindings-GLFW deepseq HUnit test-framework + test-framework-hunit ]; description = "Bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GLFW-b-demo" = callPackage @@ -5970,29 +6150,27 @@ self: { ({ mkDerivation, base, GLFW, monad-task, OpenGL, transformers }: mkDerivation { pname = "GLFW-task"; - version = "0.2.0"; - sha256 = "110iwxp6xs3wj4bva8m6mgz7iq90zrcz2dnjlq3s2x3in2m4818p"; + version = "0.3.0"; + sha256 = "1il8npm7ygg0j8byczlxadlnnf6xxy5hn307k75drbhn4z8swcqg"; libraryHaskellDepends = [ base GLFW monad-task OpenGL transformers ]; homepage = "http://github.com/ninegua/GLFW-task"; description = "GLFW utility functions to use together with monad-task"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GLHUI" = callPackage - ({ mkDerivation, base, libX11, mesa }: + ({ mkDerivation, base, libGL, libX11 }: mkDerivation { pname = "GLHUI"; version = "1.1.0"; sha256 = "043xw36hrwzc6xdr5vlydbsv5m8675vnk8pfxycr7qixzwljn0aa"; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ libX11 mesa ]; + librarySystemDepends = [ libGL libX11 ]; description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;}; "GLM" = callPackage ({ mkDerivation, aeson, base, bytestring, interpolate, lens, mtl @@ -6037,34 +6215,31 @@ self: { }) {}; "GLURaw" = callPackage - ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }: + ({ mkDerivation, base, libGL, libGLU, OpenGLRaw, transformers }: mkDerivation { pname = "GLURaw"; - version = "2.0.0.3"; - sha256 = "1vncyxaqyc7apw42wkpyxinyvzgzcnx6x858x4z15h5qq70ghb2q"; + version = "2.0.0.4"; + sha256 = "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq"; libraryHaskellDepends = [ base OpenGLRaw transformers ]; - librarySystemDepends = [ freeglut mesa ]; + librarySystemDepends = [ libGL libGLU ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;}; "GLUT" = callPackage - ({ mkDerivation, array, base, bytestring, containers, OpenGL - , OpenGLRaw, random, StateVar, transformers + ({ mkDerivation, array, base, containers, OpenGL, StateVar + , transformers }: mkDerivation { pname = "GLUT"; - version = "2.7.0.12"; - sha256 = "1dgix79r8jdp0b2ncx14v6abaqcanr3y91h1zr954vl3kyyidxb6"; + version = "2.7.0.13"; + sha256 = "1j5sv95fy0fv1n57qxhkdqm20q0lj4h5x3r7php9jh70wl77q89x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers OpenGL StateVar transformers ]; - executableHaskellDepends = [ - array base bytestring OpenGLRaw random - ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; @@ -6077,8 +6252,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.9.2"; - sha256 = "04k0i27igqzvxmyp2yy5gvd9agymmxwxnnkqxkiv0qjhk1kj8p8r"; + version = "0.10.1"; + sha256 = "08qsa22xhw4cdhdzc8ixlwjazi9s0n48395g4vf5qwfap9r8rdq3"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -6121,7 +6296,7 @@ self: { homepage = "https://github.com/tobbebex/GPipe-Core#readme"; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPipe-Collada" = callPackage @@ -6168,7 +6343,7 @@ self: { homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPipe-TextureLoad" = callPackage @@ -6222,7 +6397,6 @@ self: { ]; description = "Some kind of game library or set of utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ganymede" = callPackage @@ -6270,7 +6444,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -6386,8 +6560,8 @@ self: { ({ mkDerivation, base, ghc-prim, pretty }: mkDerivation { pname = "GenericPretty"; - version = "1.2.1"; - sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php"; + version = "1.2.2"; + sha256 = "0g5frpzq8hr2wqbf91cxcyxqqsw06p1w9f1sm3k6v1hz13kpmspf"; libraryHaskellDepends = [ base ghc-prim pretty ]; homepage = "https://github.com/RazvanRanca/GenericPretty"; description = "A generic, derivable, haskell pretty printer"; @@ -6484,6 +6658,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Get" = callPackage + ({ mkDerivation, base, constraints, singletons }: + mkDerivation { + pname = "Get"; + version = "0.2018.1.10"; + sha256 = "18i6ags8acgi651453g7axw7isiqivjhb4s0nh3lyl87ynqsch6l"; + libraryHaskellDepends = [ base constraints singletons ]; + testHaskellDepends = [ base constraints singletons ]; + homepage = "https://github.com/MarisaKirisame/Get#readme"; + description = "get stuff out of stuff"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GiST" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -6497,14 +6685,15 @@ self: { }) {}; "Gifcurry" = callPackage - ({ mkDerivation, base, cmdargs, directory, filepath, gi-gdk - , gi-glib, gi-gobject, gi-gtk, haskell-gi-base, process, temporary - , text + ({ mkDerivation, base, bytestring, cairo, cmdargs, directory + , filepath, gi-cairo, gi-gdk, gi-glib, gi-gobject, gi-gst + , gi-gstvideo, gi-gtk, haskell-gi, haskell-gi-base, process + , temporary, text, transformers }: mkDerivation { pname = "Gifcurry"; - version = "2.3.0.0"; - sha256 = "1xwmkr68x7mmmimx8kp2fjrfkg02fmsm0wzy93fqsdbs5vi1jqch"; + version = "3.0.0.1"; + sha256 = "0c6wk6kngrpmjwxwixynxfvr92ycvxmivvcvbk171x4a47zcg4sq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -6512,8 +6701,9 @@ self: { base directory filepath process temporary text ]; executableHaskellDepends = [ - base cmdargs directory filepath gi-gdk gi-glib gi-gobject gi-gtk - haskell-gi-base process temporary text + base bytestring cairo cmdargs directory filepath gi-cairo gi-gdk + gi-glib gi-gobject gi-gst gi-gstvideo gi-gtk haskell-gi + haskell-gi-base process temporary text transformers ]; homepage = "https://github.com/lettier/gifcurry"; description = "GIF creation utility"; @@ -6540,31 +6730,8 @@ self: { }: 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; - }) {}; - - "Glob_0_9_1" = 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.9.1"; - sha256 = "0rzmsknl02p332dxmm36fyrz3dpma7bchn0ymyjipxvqil20pjw0"; + version = "0.9.2"; + sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg"; libraryHaskellDepends = [ base containers directory dlist filepath transformers transformers-compat @@ -6577,7 +6744,6 @@ self: { homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GlomeTrace" = callPackage @@ -6604,7 +6770,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Glome"; description = "Simple 3D vector library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (self.llvmPackages) llvm;}; "GlomeView" = callPackage @@ -6652,6 +6817,7 @@ self: { homepage = "http://johannesgerer.com/GoogleCodeJam"; description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GoogleDirections" = callPackage @@ -6737,6 +6903,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Grafos Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GrammarProducts" = callPackage @@ -6839,6 +7006,7 @@ self: { ]; description = "Graph-Theoretic Analysis library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Grempa" = callPackage @@ -7016,7 +7184,6 @@ self: { homepage = "https://tweag.github.io/HaskellR"; description = "The Haskell/R mixed programming environment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "HARM" = callPackage @@ -7257,7 +7424,6 @@ self: { utf8-string ]; librarySystemDepends = [ postgresql ]; - executableSystemDepends = [ postgresql ]; homepage = "http://github.com/hdbc/hdbc-postgresql"; description = "PostgreSQL driver for HDBC"; license = stdenv.lib.licenses.bsd3; @@ -7299,7 +7465,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ]; librarySystemDepends = [ sqlite ]; - executableSystemDepends = [ sqlite ]; homepage = "https://github.com/hdbc/hdbc-sqlite3"; description = "Sqlite v3 driver for HDBC"; license = stdenv.lib.licenses.bsd3; @@ -7373,8 +7538,8 @@ self: { ({ mkDerivation, base, bytestring, fuse, unix }: mkDerivation { pname = "HFuse"; - version = "0.2.4.5"; - sha256 = "1894dk7flfdblyyrx0d1acznrdbjw41dnal45cqvrxz5vy4hd3p2"; + version = "0.2.5.0"; + sha256 = "1sv7w1jn0p2dgdcqy7pnmwgp1dghh4jqz21m7ixvidks0nlfkq02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring unix ]; @@ -7424,8 +7589,8 @@ self: { }: mkDerivation { pname = "HGamer3D"; - version = "0.9.0"; - sha256 = "09psrdhlrxhj8459xjr3j8fwv1mxjrlsn9nkfx0srz5sf0s4sj69"; + version = "0.9.5"; + sha256 = "094jq36n6j8k6gxyqm6gpkn1qxadj93m3bn3nrkg3n0nkqpcjcsb"; libraryHaskellDepends = [ base binary-serialise-cbor bytestring cereal clock containers directory filepath fresco-binding text vect @@ -7956,21 +8121,22 @@ self: { "HList" = callPackage ({ mkDerivation, array, base, base-orphans, cmdargs, directory - , doctest, filepath, ghc-prim, hspec, lens, mtl, process - , profunctors, QuickCheck, syb, tagged, template-haskell + , filepath, ghc-prim, hspec, hspec-expectations, lens, mtl, process + , profunctors, QuickCheck, semigroups, syb, tagged + , template-haskell }: mkDerivation { pname = "HList"; - version = "0.4.2.0"; - sha256 = "15bpglqj33n4y68mg8l2g0rllrcisg2f94wsl3n7rpy43md596fd"; + version = "0.5.0.0"; + sha256 = "16qf076p66caf3cabajbz0lgqzffqzcg0jr6lb4af18kpnpq4zqb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base base-orphans ghc-prim mtl profunctors tagged + array base base-orphans ghc-prim mtl profunctors semigroups tagged template-haskell ]; testHaskellDepends = [ - array base cmdargs directory doctest filepath hspec lens mtl - process QuickCheck syb template-haskell + array base cmdargs directory filepath hspec hspec-expectations lens + mtl process QuickCheck semigroups syb template-haskell ]; description = "Heterogeneous lists"; license = stdenv.lib.licenses.mit; @@ -8028,14 +8194,14 @@ self: { }: mkDerivation { pname = "HMap"; - version = "1.2.7"; - sha256 = "0xq5qr1v74z9bppcgl4g06cpnmyrqmc41kvcyx58272pw70vlv40"; + version = "1.3.0"; + sha256 = "01y8mspmf7k0mxafyanfirbjp46x54wnm4n6lwc2jczw5bb48yx7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base data-default hashable mtl unordered-containers ]; homepage = "https://github.com/atzeus/HMap"; - description = "Fast heterogeneous maps and unconstrained typeable like functionality"; + description = "Fast heterogeneous maps and unconstrained typeable-like functionality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -8167,6 +8333,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Phone number parser and validator - This is now DEPRECATED!"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HPi" = callPackage @@ -8452,15 +8619,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "HSlippyMap"; - version = "2.2"; - sha256 = "17n1kpva97lwhwg2vs7875bfqlwcq6xpl2agqc53qb7j4153p559"; - revision = "2"; - editedCabalFile = "0iw3s7snb255jxj555vyfl3ckgqxf6xivbzl4z9ypy18a5glpzri"; + version = "3.0"; + sha256 = "1kqyahisqzilndargvyh0gqln3471ll1jkpnayirfi9am1by4f93"; libraryHaskellDepends = [ base ]; - homepage = "https://github.com/41px/HSlippyMap"; - description = "OpenStreetMap (OSM) Slippy Map"; + homepage = "https://github.com/apeyroux/HSlippyMap"; + description = "OpenStreetMap Slippy Map"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HSmarty" = callPackage @@ -8521,16 +8685,16 @@ self: { "HStringTemplate" = callPackage ({ mkDerivation, array, base, blaze-builder, bytestring, containers , deepseq, directory, filepath, mtl, old-locale, parsec, pretty - , syb, template-haskell, text, time, void + , semigroups, syb, template-haskell, text, time, void }: mkDerivation { pname = "HStringTemplate"; - version = "0.8.6"; - sha256 = "1kam09fhnz1485swp5z1k8whjiwz9fcscp6zibxkq8hw3sfcn8kh"; + version = "0.8.7"; + sha256 = "03kbmyh0713j3qhhrl7jqbmsvyq1q82h2yxq45cc9rs55sma8kjg"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory - filepath mtl old-locale parsec pretty syb template-haskell text - time void + filepath mtl old-locale parsec pretty semigroups syb + template-haskell text time void ]; description = "StringTemplate implementation in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -8563,7 +8727,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Haskell Bindings for libsvm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HTF" = callPackage @@ -8576,8 +8739,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.13.2.2"; - sha256 = "1fn3w53rylaqmkhwi801phiwlkl7yp9mnj79dbwfb6b6g5mrzd0x"; + version = "0.13.2.4"; + sha256 = "1xibrzs465hg9snwvl6gp6hll6g6c7m8s2ckk8vkfg386pywmi9n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8596,7 +8759,7 @@ self: { ]; homepage = "https://github.com/skogsbaer/HTF/"; description = "The Haskell Test Framework"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; }) {}; "HTTP" = callPackage @@ -8607,8 +8770,8 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.7"; - sha256 = "1s7amm0wai6z4x2arrqh0h6n0gjbrqpkqyz9a7l38i78hkmwrh6m"; + version = "4000.3.11"; + sha256 = "0idnclf1gnvqsygppanr0gj6dfvxj1rsz8q7hhahfw82v0wjplps"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -8675,19 +8838,6 @@ self: { }) {}; "HUnit" = callPackage - ({ mkDerivation, base, call-stack, deepseq, filepath }: - mkDerivation { - pname = "HUnit"; - version = "1.5.0.0"; - sha256 = "186ykl7vxlfgkd2k8k1rq7yzcryzjpqwmn4ci1nn9h6irqbivib5"; - 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; - }) {}; - - "HUnit_1_6_0_0" = callPackage ({ mkDerivation, base, call-stack, deepseq, filepath }: mkDerivation { pname = "HUnit"; @@ -8698,7 +8848,6 @@ self: { 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 @@ -8880,8 +9029,29 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.17.3.1"; - sha256 = "1vq22yf90cxq6a224zw73c1iqqbcsa2swasds605y9kwp9wzf6db"; + version = "3.18.0.0"; + sha256 = "13w1kn85yg8hmhk5m0rv95nr6db5k7z4ycy9s32gs2m3f0v338jz"; + libraryHaskellDepends = [ + base bytestring containers hashable matrix parsec QuickCheck text + transformers wl-pprint-extras + ]; + testHaskellDepends = [ + base parsec 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; + }) {}; + + "HaTeX_3_19_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, matrix + , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers + , wl-pprint-extras + }: + mkDerivation { + pname = "HaTeX"; + version = "3.19.0.0"; + sha256 = "0ja7w9l1pnf4pgbggr8cmsq0234cvsn75b9jzvd64jplhajpgn8z"; libraryHaskellDepends = [ base bytestring containers hashable matrix parsec QuickCheck text transformers wl-pprint-extras @@ -8892,6 +9062,7 @@ self: { 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 @@ -9054,7 +9225,6 @@ self: { base containers HTTP hxt hxt-http mtl network network-uri parsec transformers ]; - executableHaskellDepends = [ base hxt ]; testHaskellDepends = [ base hspec hxt ]; homepage = "https://github.com/egonSchiele/HandsomeSoup"; description = "Work with HTML more easily in HXT"; @@ -9077,6 +9247,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HappyTree" = callPackage + ({ mkDerivation, base, constraints, generics-sop, safe, singletons + }: + mkDerivation { + pname = "HappyTree"; + version = "0.2018.1.8"; + sha256 = "01mc5qh786aw2vbpj5h8kzarhwi5h73bd65m51x7xiyabwfmln0b"; + libraryHaskellDepends = [ + base constraints generics-sop safe singletons + ]; + testHaskellDepends = [ + base constraints generics-sop safe singletons + ]; + homepage = "https://github.com/MarisaKirisame/HappyTree#readme"; + description = "Type Safe and End to End Decision Tree"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HarmTrace" = callPackage ({ mkDerivation, array, base, binary, cmdargs, deepseq, Diff , directory, filepath, ghc-prim, HarmTrace-Base, instant-generics @@ -9110,6 +9299,8 @@ self: { pname = "HarmTrace-Base"; version = "1.6.0.0"; sha256 = "03rma29wkrcixvd5whmmlqkhiznxgff3dq8jmw6w7xzr9fn72f9b"; + revision = "1"; + editedCabalFile = "0fldc14b2lj8pvkmxly0ld9mmx33yvswh7sg85g62w4yixsr6fdl"; libraryHaskellDepends = [ base binary containers ghc-prim ListLike uu-parsinglib ]; @@ -9117,10 +9308,9 @@ self: { base binary containers ghc-prim ListLike QuickCheck random uu-parsinglib ]; - homepage = "https://bitbucket.org/bash/harmtrace-base"; + homepage = "https://github.com/chordify/HarmTrace-Base"; description = "Parsing and unambiguously representing musical chords"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HasCacBDD" = callPackage @@ -9344,15 +9534,16 @@ self: { }) {}; "Hastodon" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types - , MissingH, text + ({ mkDerivation, aeson, base, bytestring, http-client, http-conduit + , http-types, mime-types, MissingH, text }: mkDerivation { pname = "Hastodon"; - version = "0.2.0"; - sha256 = "1ybchvkcv9n4wp8r4xassmgw1z0kdscmkccg3rbhz72lwp3m13zz"; + version = "0.3.2"; + sha256 = "0qdq23mg1nszsf3ldbdawdkcmbv18cmny6529k9kwlfq9fhdm83x"; libraryHaskellDepends = [ - aeson base bytestring http-conduit http-types MissingH text + aeson base bytestring http-client http-conduit http-types + mime-types MissingH text ]; homepage = "https://github.com/syucream/hastodon"; description = "mastodon client module for Haskell"; @@ -9556,7 +9747,6 @@ self: { homepage = "https://github.com/meteficha/Hipmunk"; description = "A Haskell binding for Chipmunk"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Hipmunk-Utils" = callPackage @@ -9570,7 +9760,6 @@ self: { homepage = "https://github.com/suzumiyasmith/Hipmunk-Utils#readme"; description = "Useful functions for Hipmunk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "HipmunkPlayground" = callPackage @@ -9642,19 +9831,26 @@ self: { }) {}; "Hoed" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , directory, filepath, libgraph, mtl, process, regex-posix, time + ({ mkDerivation, array, base, bytestring, cereal, cereal-text + , cereal-vector, clock, containers, deepseq, directory, hashable + , libgraph, open-browser, primitive, process, QuickCheck + , regex-tdfa, regex-tdfa-text, semigroups, strict, template-haskell + , terminal-size, text, transformers, uniplate, unordered-containers + , vector, vector-th-unbox }: mkDerivation { pname = "Hoed"; - version = "0.4.0"; - sha256 = "0l01viv04dkxinysd7wbzn7k5rm8c21ix8k5a4p940hml879m9f1"; - enableSeparateDataOutput = true; + version = "0.5.1"; + sha256 = "1rzlqd1sha6p1cw5w0gpf1w7qsmc6088sjnq1kq44mp12ybxrxm8"; libraryHaskellDepends = [ - array base bytestring cereal containers directory filepath libgraph - mtl process regex-posix time + array base bytestring cereal cereal-text cereal-vector clock + containers deepseq directory hashable libgraph open-browser + primitive process QuickCheck regex-tdfa regex-tdfa-text semigroups + strict template-haskell terminal-size text transformers uniplate + unordered-containers vector vector-th-unbox ]; - homepage = "https://wiki.haskell.org/Hoed"; + testHaskellDepends = [ base process QuickCheck ]; + homepage = "https://github.com/MaartenFaddegon/Hoed"; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -9862,16 +10058,16 @@ self: { }) {}; "HsHTSLib" = callPackage - ({ mkDerivation, base, bytestring, bytestring-lexing - , conduit-combinators, containers, inline-c, mtl, template-haskell + ({ mkDerivation, base, bytestring, bytestring-lexing, conduit + , containers, inline-c, mtl, template-haskell }: mkDerivation { pname = "HsHTSLib"; - version = "1.3.2.2"; - sha256 = "0i4lflc8s8byvsc4idh4fm6yzdspx0v4mahwrqrk7i2dbs84fpkw"; + version = "1.3.2.3"; + sha256 = "1j80lwall9ji5fb2iw1fni2jxplyiss5rx0zfkbx9g5ns1cd98r3"; libraryHaskellDepends = [ - base bytestring bytestring-lexing conduit-combinators containers - inline-c mtl template-haskell + base bytestring bytestring-lexing conduit containers inline-c mtl + template-haskell ]; description = "High level bindings to htslib"; license = stdenv.lib.licenses.mit; @@ -9929,8 +10125,8 @@ self: { }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.11"; - sha256 = "0dgywjkvzxwpr33l642cw8v2gqn3s8kclg97xs1w8a5pqcg647pp"; + version = "0.11.4.13"; + sha256 = "0izzgyjd0s9whqllwyg8gv2xnsfax9sf8j47zq1d2vmk7mpx2p0j"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring integer-gmp network time @@ -10235,8 +10431,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "1.0.1"; - sha256 = "01s2lml150mcb9qfaq0i19fx8ri19c0dba3rzl0q9w30kv8ykxyz"; + version = "1.0.2"; + sha256 = "09gb38m1fw0a1x8saldgsd5x58ycqirk8h6z8dqzpcd7vz23vayn"; libraryHaskellDepends = [ aeson attoparsec base iproute network network-info random text ]; @@ -10256,8 +10452,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.2.3"; - sha256 = "0j51v7y475wdrhjwrqrmlh6574l032vh7zsdhxqx723f7iswjimf"; + version = "0.2.6"; + sha256 = "1dshvq3amnwfvf50g4gs93rc307sk1hi3snjhflzjz0dfn8xa2d4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10406,6 +10602,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IntervalMap_0_6_0_0" = callPackage + ({ mkDerivation, base, Cabal, containers, criterion, deepseq + , fingertree, QuickCheck, random, SegmentTree, weigh + }: + mkDerivation { + pname = "IntervalMap"; + version = "0.6.0.0"; + sha256 = "06hin9wf1by8aqa7820fsi2339bh82184frkwz3jsb9sqa0hszcg"; + libraryHaskellDepends = [ base containers deepseq ]; + testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq fingertree random SegmentTree + weigh + ]; + homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; + description = "Containers for intervals, with efficient search"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Irc" = callPackage ({ mkDerivation, base, data-default, doctest, mtl, network , transformers @@ -10498,6 +10714,7 @@ self: { libraryHaskellDepends = [ base parsec ]; description = "Parse JSON"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JSONb" = callPackage @@ -10516,10 +10733,6 @@ self: { attoparsec base bytestring bytestring-nums bytestring-trie containers utf8-string ]; - executableHaskellDepends = [ - attoparsec base bytestring bytestring-nums bytestring-trie - containers utf8-string - ]; homepage = "http://github.com/solidsnack/JSONb/"; description = "JSON parser that uses byte strings"; license = stdenv.lib.licenses.bsd3; @@ -10650,14 +10863,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "JuPyTer-notebook" = callPackage + ({ mkDerivation, aeson, base, bytestring, json-autotype, text }: + mkDerivation { + pname = "JuPyTer-notebook"; + version = "0.1.0.0"; + sha256 = "1bmnwi0z68fzlzjf2599xs6rzi89p1jpv1gmnsi05cfsh1bysda7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base json-autotype ]; + executableHaskellDepends = [ + aeson base bytestring json-autotype text + ]; + homepage = "http://github.com/mgajda/ipynb"; + description = "JuPyTer notebook parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.9.1"; - sha256 = "1g31zgsg7gq5ac9r5aizghvrg7jwn1a0qs4qwnfillqn4wkw6y5b"; + version = "3.2.9.5"; + sha256 = "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -10667,6 +10898,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-blp" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, directory + , filepath, hashable, JuicyPixels, optparse-simple, text-show + , unordered-containers, vector + }: + mkDerivation { + pname = "JuicyPixels-blp"; + version = "0.1.0.1"; + sha256 = "16fcrd8g4pgwhbvp34mqqvmszlkhjs1qryrn1bll3f0zwirhg3ic"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base binary bytestring hashable JuicyPixels text-show + vector + ]; + executableHaskellDepends = [ + base bytestring directory filepath JuicyPixels optparse-simple + text-show unordered-containers + ]; + homepage = "http://github.com/NCrashed/JuicyPixels-blp#readme"; + description = "BLP format decoder/encoder over JuicyPixels library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "JuicyPixels-canvas" = callPackage ({ mkDerivation, base, containers, JuicyPixels }: mkDerivation { @@ -10684,8 +10939,10 @@ self: { ({ mkDerivation, base, criterion, hspec, JuicyPixels }: mkDerivation { pname = "JuicyPixels-extra"; - version = "0.2.2"; - sha256 = "1f0ysxwd73s04mrqzqj9rfp6dd5441ckc96x2a4zkc1hixgkfzld"; + version = "0.3.0"; + sha256 = "08hf3dklz3zaczbffq11z1yjk3hqf53rnz3g9n989ndw8ybkm865"; + revision = "1"; + editedCabalFile = "17y0d11hgdnzcgv7q7zl3wic2w2xhqn123vzfsdivncgdgqlvy0c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; @@ -10715,8 +10972,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.1.2"; sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs"; - revision = "1"; - editedCabalFile = "08myhf2912c5hd7hhiq58lsylfpj2zwhak5kmhhcffc7zsvhcl24"; + revision = "3"; + editedCabalFile = "0z1ks049q9jsc5ysh12idkqf3rz0bnvv74rhlaw24r5q2xj8lv8i"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -10728,6 +10985,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-stbir" = callPackage + ({ mkDerivation, base, c2hs, data-default-class, JuicyPixels + , vector + }: + mkDerivation { + pname = "JuicyPixels-stbir"; + version = "0.1.0.0"; + sha256 = "0jlb72hbiqbnjm5q63ywrw5dljfzpgbw91xk7ijrsfm209pprcqz"; + libraryHaskellDepends = [ + base data-default-class JuicyPixels vector + ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/mtolly/JuicyPixels-stbir"; + description = "Scale JuicyPixels images with stb_image_resize"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "JuicyPixels-util" = callPackage ({ mkDerivation, base, JuicyPixels, vector }: mkDerivation { @@ -11034,21 +11308,19 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ openldap ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; testSystemDepends = [ openldap ]; homepage = "https://github.com/ezyang/ldap-haskell"; description = "Haskell binding for C LDAP API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openldap;}; "LParse" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "LParse"; - version = "0.1.3.1"; - sha256 = "0gyc1cqbz97cps8awvkl3yfmlvaf7fkvxgs48rq95j1b2xbf417p"; + version = "0.2.2.2"; + sha256 = "0cgmbn6c7fgk6dngx7j1l56sizi37shs5mrdkiqy2k4imb7bc4hl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/MarcusVoelker/LParse#readme"; @@ -11112,41 +11384,59 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "LambdaDesigner" = callPackage + ({ mkDerivation, aeson, base, bytestring, bytestring-trie + , containers, hosc, lens, lens-aeson, matrix, text, transformers + , vector + }: + mkDerivation { + pname = "LambdaDesigner"; + version = "0.1.0.0"; + sha256 = "1lgplxb546f7bdrwnmivb8zwix4rqhkrhv83ni90hzf4nx5fpjcy"; + libraryHaskellDepends = [ + aeson base bytestring bytestring-trie containers hosc lens + lens-aeson matrix text transformers vector + ]; + homepage = "https://github.com/ulyssesp/LambdaDesigner#readme"; + description = "A type-safe EDSL for TouchDesigner written in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "LambdaHack" = callPackage ({ 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 + , filepath, ghc-prim, hashable, hsini, keys, miniutter + , optparse-applicative, pretty-show, random, sdl2, sdl2-ttf, stm + , template-haskell, text, time, transformers, unordered-containers + , vector, vector-binary-instances, zlib }: mkDerivation { pname = "LambdaHack"; - version = "0.6.2.0"; - sha256 = "15fa4kwaa7dzdrppjzkpm8dhazsb5cw372ksfl3smsfxiz8z4af9"; + version = "0.7.1.0"; + sha256 = "1k68vjlfcjnyikissv9bmqfg04zhba1318pvhjc9yb1lb2v745d7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ 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 + keys miniutter optparse-applicative pretty-show random sdl2 + sdl2-ttf stm text time transformers unordered-containers vector + vector-binary-instances zlib ]; executableHaskellDepends = [ 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 + keys miniutter optparse-applicative pretty-show random stm + template-haskell text time transformers unordered-containers vector + vector-binary-instances zlib ]; testHaskellDepends = [ 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 + keys miniutter optparse-applicative pretty-show random stm + template-haskell text time transformers unordered-containers vector + vector-binary-instances zlib ]; homepage = "https://lambdahack.github.io"; description = "A game engine library for roguelike dungeon crawlers"; @@ -11318,8 +11608,8 @@ self: { }: mkDerivation { pname = "Lazy-Pbkdf2"; - version = "3.0.0"; - sha256 = "0rcbsjypr4k5s8jsw1wchl9y3v7b9nvy92046hvzah69rd2hcqj1"; + version = "3.1.1"; + sha256 = "0hvjgw52rm5kl8v4aafzmafqzg34x6a6jdvdx8fxl9arlxzpba87"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base base16-bytestring binary bytestring cryptonite memory @@ -11346,6 +11636,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Learning" = callPackage + ({ mkDerivation, base, containers, hmatrix, vector }: + mkDerivation { + pname = "Learning"; + version = "0.1.0"; + sha256 = "14hlr86c605bpfcawvi4vy0hcwph4ji38ql8pic6bawyvcn7pybn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers hmatrix vector ]; + executableHaskellDepends = [ base containers hmatrix vector ]; + testHaskellDepends = [ base containers hmatrix vector ]; + homepage = "https://github.com/masterdezign/Learning#readme"; + description = "The most frequently used machine learning tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Level0" = callPackage ({ mkDerivation, base, directory, random, SDL, SDL-ttf }: mkDerivation { @@ -11493,26 +11799,43 @@ self: { "ListLike" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string - , vector + , dlist, fmlist, HUnit, QuickCheck, random, semigroups, text + , utf8-string, vector }: mkDerivation { pname = "ListLike"; - version = "4.5.1"; - sha256 = "139aaraprdlana39bldxzrl1pnvymwpiwymikc1xjg2nbcrla1xp"; + version = "4.6"; + sha256 = "16jsj979mzjrgmpa20pls9ganym3wsps49paks1sb1gmlmwyrkf1"; libraryHaskellDepends = [ - array base bytestring containers deepseq dlist fmlist text - utf8-string vector + array base bytestring containers deepseq dlist fmlist semigroups + text utf8-string vector ]; testHaskellDepends = [ array base bytestring containers dlist fmlist HUnit QuickCheck - random text utf8-string vector + random semigroups text utf8-string vector ]; homepage = "http://github.com/JohnLato/listlike"; description = "Generic support for list-like structures"; license = stdenv.lib.licenses.bsd3; }) {}; + "ListT" = callPackage + ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck + , transformers, util + }: + mkDerivation { + pname = "ListT"; + version = "0.1.2.0"; + sha256 = "0ygj695w1xrv0kkpnm55gfjnks7xdbw6vrlqx1a5as4s36hq11zr"; + libraryHaskellDepends = [ base transformers util ]; + testHaskellDepends = [ + base smallcheck tasty tasty-smallcheck transformers util + ]; + description = "List transformer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListTree" = callPackage ({ mkDerivation, base, directory, filepath, List, transformers }: mkDerivation { @@ -11588,9 +11911,6 @@ self: { mtl multiset old-locale operational prefix-units pretty PSQueue sequential-index split stm time transformers void yjtools ]; - executableHaskellDepends = [ - base cereal cmdtheline containers transformers - ]; testHaskellDepends = [ base bytestring cereal composition containers data-ivar directory hslogger hslogger-template HUnit lens MonadCatchIO-transformers @@ -11621,10 +11941,6 @@ self: { MonadCatchIO-transformers stm transformers ]; librarySystemDepends = [ openmpi ]; - executableHaskellDepends = [ - base cereal cmdtheline hslogger LogicGrowsOnTrees - ]; - executableSystemDepends = [ openmpi ]; description = "an adapter for LogicGrowsOnTrees that uses MPI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11647,9 +11963,6 @@ self: { hslogger-template lens LogicGrowsOnTrees MonadCatchIO-transformers mtl network pretty transformers ]; - executableHaskellDepends = [ - base cereal cmdtheline LogicGrowsOnTrees - ]; testHaskellDepends = [ base hslogger hslogger-template HUnit LogicGrowsOnTrees network random stm test-framework test-framework-hunit transformers @@ -11676,9 +11989,6 @@ self: { hslogger hslogger-template LogicGrowsOnTrees MonadCatchIO-transformers process transformers ]; - executableHaskellDepends = [ - base cereal cmdtheline LogicGrowsOnTrees - ]; testHaskellDepends = [ base cereal hslogger hslogger-template HUnit LogicGrowsOnTrees random test-framework test-framework-hunit transformers @@ -11780,8 +12090,8 @@ self: { ({ mkDerivation, base, bytestring, hidapi, mtl }: mkDerivation { pname = "MBot"; - version = "0.2.0.0"; - sha256 = "08n8xyvcj99wx1zipw5pz1w4qsm57b9vzhshvwhcay2pw3jn5x43"; + version = "0.2.4.0"; + sha256 = "1jzjf1p1ld9xdxqb9jf32nyhzmp29mirpinz24s8blwpscia5v56"; libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; @@ -11900,6 +12210,7 @@ self: { homepage = "http://nautilus.cs.miyazaki-u.ac.jp/~skata/MagicHaskeller.html"; description = "Automatic inductive functional programmer by systematic search"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MailchimpSimple" = callPackage @@ -11922,6 +12233,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Mapping" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "Mapping"; + version = "2.0.0.0"; + sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/zaoqi/Mapping.hs"; + description = "Mapping"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MaybeT" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -12034,12 +12358,11 @@ self: { ({ mkDerivation, base, newtype-generics }: mkDerivation { pname = "MemoTrie"; - version = "0.6.8"; - sha256 = "194x8a1x8ch5xwpxaagrmpsjca92x1zjiq6dlqdgckyr49blknaz"; + version = "0.6.9"; + sha256 = "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base newtype-generics ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/conal/MemoTrie"; description = "Trie-based memo functions"; license = stdenv.lib.licenses.bsd3; @@ -12146,6 +12469,8 @@ self: { pname = "MiniAgda"; version = "0.2017.2.18"; sha256 = "0s3xp18y4kcjd1qq87vbhijbbpi9d1p08dgxw7521xlr3gmxkqxw"; + revision = "1"; + editedCabalFile = "0n4sd1b0c9fmgn7xqbhbms6y3ffkdgpa4fw7xcx31vgql2adxb0n"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -12225,6 +12550,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Mobile-Legends-Hack-Cheats" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Mobile-Legends-Hack-Cheats"; + version = "1.0.1"; + sha256 = "1alyhdrliyy6hi88svbnmwf76vl6ipd92r835r2j1qyvbadi63fl"; + revision = "2"; + editedCabalFile = "1vcysv7jsik7i6s8a5jw3fzan0zv8104yv9ggvmlbq5n8sg9yjgq"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Modulo" = callPackage ({ mkDerivation, base, numeric-prelude }: mkDerivation { @@ -12384,6 +12732,8 @@ self: { pname = "MonadRandom"; version = "0.5.1"; sha256 = "11qdfghizww810vdj9ac1f5qr5kdmrk40l6w6qh311bjh290ygwy"; + revision = "1"; + editedCabalFile = "19242r11a7iqr8dnbxsac04c3ylh7xkan70pdv5k3jzcmfwn4shd"; libraryHaskellDepends = [ base fail mtl primitive random transformers transformers-compat ]; @@ -12611,17 +12961,17 @@ self: { "MusicBrainz" = 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 + , time, time-locale-compat, transformers, unliftio-core, vector + , xml-conduit, xml-types }: mkDerivation { pname = "MusicBrainz"; - version = "0.3.1"; - sha256 = "1zgk2ms1a5zd6wndc41z3f8p2pfygiijpijxbjhr1fqwb2bzs61m"; + version = "0.4"; + sha256 = "0aanc1c43di5wq9c2w0b5lw3p24cwpaksgxy79lqm8qxj8qd3jxr"; 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 + transformers unliftio-core vector xml-conduit xml-types ]; homepage = "http://floss.scru.org/hMusicBrainz"; description = "interface to MusicBrainz XML2 and JSON web services"; @@ -12811,6 +13161,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Naperian" = callPackage + ({ mkDerivation, base, containers, ghc-prim, vector }: + mkDerivation { + pname = "Naperian"; + version = "0.1.0.1"; + sha256 = "0h8kijw9y0p7bpy6qr1334xzbkcici3jrnk16w0cm4mxykrqjhwc"; + libraryHaskellDepends = [ base containers ghc-prim vector ]; + homepage = "https://github.com/idontgetoutmuch/Naperian"; + description = "Naperian Functors for APL-like programming"; + license = "unknown"; + }) {}; + "NaturalLanguageAlphabets" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, cereal , containers, criterion, deepseq, file-embed, hashtables @@ -12839,7 +13201,7 @@ self: { }) {}; "NaturalSort" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, strict }: + ({ mkDerivation, base, bytestring, strict }: mkDerivation { pname = "NaturalSort"; version = "0.2.1"; @@ -12847,7 +13209,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring strict ]; - executableHaskellDepends = [ base bytestring QuickCheck strict ]; homepage = "http://github.com/joachifm/natsort"; description = "Natural sorting for strings"; license = stdenv.lib.licenses.bsd3; @@ -12941,8 +13302,8 @@ self: { }: mkDerivation { pname = "Network-NineP"; - version = "0.4.1"; - sha256 = "0jhgjvrh9r30h0n4iq8p543dib7c455na9sy0zqpw7iccxn4aylx"; + version = "0.4.2"; + sha256 = "136pqyxpjyml0hfblpj6hmhsy2i8r796shcnl0rwljmvw1mhcg6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12963,6 +13324,7 @@ self: { libraryHaskellDepends = [ array base integer ]; description = "A binary I/O library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {integer = null;}; @@ -13305,6 +13667,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ONC-RPC" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cereal, containers + , filepath, haskell-src-exts, network, parsec, random, time, unix + , vector + }: + mkDerivation { + pname = "ONC-RPC"; + version = "0.1"; + sha256 = "19smd0rp0jx9i59jgjk149g4czpwjx173szhp1z9dvm5j0pdwyy5"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ + base bytestring Cabal cereal containers filepath haskell-src-exts + parsec vector + ]; + libraryHaskellDepends = [ + base bytestring Cabal cereal containers filepath haskell-src-exts + network parsec random time unix vector + ]; + executableHaskellDepends = [ base filepath ]; + description = "ONC RPC (aka Sun RPC) and XDR library"; + license = stdenv.lib.licenses.asl20; + }) {}; + "OSM" = callPackage ({ mkDerivation, base, comonad-transformers, containers, data-lens , hxt, newtype @@ -13398,26 +13784,32 @@ self: { }) {}; "Octree" = callPackage - ({ mkDerivation, AC-Vector, base, markdown-unlit, QuickCheck }: + ({ mkDerivation, base, criterion, deepseq, ghc-prim, lens, linear + , QuickCheck + }: mkDerivation { pname = "Octree"; - version = "0.5.4.3"; - sha256 = "0rdlf8cqpfz43j9xddc5pqp829nyirndkc2rc7h8f8ycpdzsmn2g"; - libraryHaskellDepends = [ AC-Vector base QuickCheck ]; - testHaskellDepends = [ AC-Vector base markdown-unlit QuickCheck ]; + version = "0.6.0.0"; + sha256 = "1inyjclxx856gxrxdph649s5kdy2xf0lwr8g57rkqnpqpmprj797"; + libraryHaskellDepends = [ base deepseq lens linear QuickCheck ]; + testHaskellDepends = [ base deepseq lens linear QuickCheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq ghc-prim lens linear QuickCheck + ]; homepage = "https://github.com/mgajda/octree"; description = "Simple unbalanced Octree for storing data about 3D points"; license = stdenv.lib.licenses.bsd3; }) {}; "OddWord" = callPackage - ({ mkDerivation, base, QuickCheck }: + ({ mkDerivation, base, criterion, hspec, QuickCheck }: mkDerivation { pname = "OddWord"; - version = "1.0.1.0"; - sha256 = "0aa3pp2ivbddn3632cnkxd3bj8373ns1nf4v2jvz7zcijiz4chx1"; + version = "1.0.2.0"; + sha256 = "14hd7dd3dyfd9cs9kgxjippi2awpambn2ia7s3kxcvinnfbigj3r"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://www.gekkou.co.uk/"; description = "Provides a wrapper for deriving word types with fewer bits"; license = stdenv.lib.licenses.bsd3; @@ -13480,6 +13872,8 @@ self: { pname = "OneTuple"; version = "0.2.1"; sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb"; + revision = "1"; + editedCabalFile = "1kb7f21n9vwwrk4kipqdwdqs94k34zai6yy0kgdn22zi442yicjh"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -13533,6 +13927,7 @@ self: { ]; description = "Assorted utilities to work with AFP data streams"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OpenAL" = callPackage @@ -13549,11 +13944,9 @@ self: { base ObjectName OpenGL StateVar transformers ]; librarySystemDepends = [ openal ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) openal;}; "OpenCL" = callPackage @@ -13604,8 +13997,8 @@ self: { }: mkDerivation { pname = "OpenGL"; - version = "3.0.2.0"; - sha256 = "1yqf8li6h2cwd7s3n99afmqyx628v9xkrf6jy8n4sqadf9cr9ags"; + version = "3.0.2.1"; + sha256 = "1gsrlp2if5zwq0icjmsmva3cj719qpwagsmg6dlvps0xj4dqkjvs"; libraryHaskellDepends = [ base bytestring containers GLURaw ObjectName OpenGLRaw StateVar text transformers @@ -13630,21 +14023,39 @@ self: { }) {}; "OpenGLRaw" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, mesa + ({ mkDerivation, base, bytestring, containers, fixed, half, libGL + , text, transformers + }: + mkDerivation { + pname = "OpenGLRaw"; + version = "3.2.7.0"; + sha256 = "024aln102d1mmsdalq9jd5mmwjbnrb8gxcak73lybrc7q87kswk2"; + libraryHaskellDepends = [ + base bytestring containers fixed half text transformers + ]; + librarySystemDepends = [ libGL ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) libGL;}; + + "OpenGLRaw_3_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, fixed, half, libGL , text, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "3.2.5.0"; - sha256 = "1drxviqsx25isrxdq5f5gr5hrpfpbqcs7pj632qibmvpaqp4s3xg"; + version = "3.3.0.0"; + sha256 = "145j4fa4vs7x5r6x5i0733qc9aw27ggzax3xpjc7pmibmrkri20p"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; - librarySystemDepends = [ mesa ]; + librarySystemDepends = [ libGL ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) mesa;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libGL;}; "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: @@ -13799,6 +14210,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Ordinary" = callPackage + ({ mkDerivation, base, safe, threepenny-gui }: + mkDerivation { + pname = "Ordinary"; + version = "0.2018.1.8"; + sha256 = "0n4mk28cdcj71qxifh1prib2a83fjk4dzw6h5dm8a81z6ijribb1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base safe threepenny-gui ]; + executableHaskellDepends = [ base safe threepenny-gui ]; + testHaskellDepends = [ base safe threepenny-gui ]; + homepage = "https://github.com/MarisaKirisame/Ordinary#readme"; + description = "A Programming Language in Construction"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "PArrows" = callPackage ({ mkDerivation, base, containers, ghc-prim, mtl }: mkDerivation { @@ -13890,6 +14318,8 @@ self: { pname = "PSQueue"; version = "1.1"; sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58"; + revision = "1"; + editedCabalFile = "0gpx33bkhpwya7prnqzwpbnylm4v4nm4x8m02ggmj7d6rkklb2qq"; libraryHaskellDepends = [ base ]; description = "Priority Search Queue"; license = stdenv.lib.licenses.bsd3; @@ -14026,6 +14456,99 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Parallel-Arrows-BaseSpec" = callPackage + ({ mkDerivation, base, deepseq, hspec, Parallel-Arrows-Definition + , split + }: + mkDerivation { + pname = "Parallel-Arrows-BaseSpec"; + version = "0.1.1.0"; + sha256 = "014fy1sv1b82wxd3wpsxvnv3jn07d24r4ph3bi7p6i8aykx2a9f4"; + libraryHaskellDepends = [ + base deepseq hspec Parallel-Arrows-Definition split + ]; + testHaskellDepends = [ + base hspec Parallel-Arrows-Definition split + ]; + homepage = "https://github.com/s4ke/Parrows#readme"; + description = "BaseSpecs used for @Parallel-Arrows-Definition@ and Co"; + license = stdenv.lib.licenses.mit; + }) {}; + + "Parallel-Arrows-Definition" = callPackage + ({ mkDerivation, base, deepseq, split }: + mkDerivation { + pname = "Parallel-Arrows-Definition"; + version = "0.1.1.0"; + sha256 = "1zdsvg0nx2vnvgx9vcwq8l1kanfp056mmiscs3716lswkrvhdlbf"; + libraryHaskellDepends = [ base deepseq split ]; + homepage = "https://github.com/s4ke/Parrows#readme"; + description = "Multithreaded evaluation using Arrows"; + license = stdenv.lib.licenses.mit; + }) {}; + + "Parallel-Arrows-Eden" = callPackage + ({ mkDerivation, base, deepseq, edenmodules, hspec, parallel + , Parallel-Arrows-BaseSpec, Parallel-Arrows-Definition, QuickCheck + , split + }: + mkDerivation { + pname = "Parallel-Arrows-Eden"; + version = "0.1.1.0"; + sha256 = "1iihlxghr2f70zbw3kkilckzfw24sjax6ck0g42272kj61gk2zy7"; + libraryHaskellDepends = [ + base deepseq edenmodules parallel Parallel-Arrows-Definition split + ]; + testHaskellDepends = [ + base deepseq edenmodules hspec parallel Parallel-Arrows-BaseSpec + Parallel-Arrows-Definition QuickCheck split + ]; + homepage = "https://github.com/s4ke/Parrows#readme"; + description = "Eden based backend for @Parallel-Arrows-Definition@"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "Parallel-Arrows-Multicore" = callPackage + ({ mkDerivation, base, deepseq, hspec, parallel + , Parallel-Arrows-BaseSpec, Parallel-Arrows-Definition, split + }: + mkDerivation { + pname = "Parallel-Arrows-Multicore"; + version = "0.1.1.0"; + sha256 = "0g9ag9lk8mvnbfgzay27sq517an6cmv02fapxsn2lmr5vs7k63ar"; + libraryHaskellDepends = [ + base deepseq parallel Parallel-Arrows-Definition split + ]; + testHaskellDepends = [ + base deepseq hspec parallel Parallel-Arrows-BaseSpec + Parallel-Arrows-Definition split + ]; + homepage = "https://github.com/s4ke/Parrows#readme"; + description = "GpH based backend for @Parallel-Arrows-Definition@ in a multicore variant"; + license = stdenv.lib.licenses.mit; + }) {}; + + "Parallel-Arrows-ParMonad" = callPackage + ({ mkDerivation, base, deepseq, hspec, monad-par + , Parallel-Arrows-BaseSpec, Parallel-Arrows-Definition, split + }: + mkDerivation { + pname = "Parallel-Arrows-ParMonad"; + version = "0.1.1.0"; + sha256 = "193794v158wfblriklp2jgxa3hk86p4kxbp8sj1hh16dwb0qa9cr"; + libraryHaskellDepends = [ + base deepseq monad-par Parallel-Arrows-Definition split + ]; + testHaskellDepends = [ + base deepseq hspec monad-par Parallel-Arrows-BaseSpec + Parallel-Arrows-Definition split + ]; + homepage = "https://github.com/s4ke/Parrows#readme"; + description = "Par Monad (@monad-par@) based backend for @Parallel-Arrows-Definition@"; + license = stdenv.lib.licenses.mit; + }) {}; + "Parry" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , ghc-prim, network, old-locale, process, random, RSA @@ -14240,6 +14763,7 @@ self: { homepage = "https://github.com/MedeaMelana/Piso"; description = "Partial isomorphisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PlayHangmanGame" = callPackage @@ -14279,24 +14803,24 @@ self: { "Plot-ho-matic" = callPackage ({ mkDerivation, base, bytestring, cairo, cereal, Chart - , Chart-cairo, containers, data-default-class, generic-accessors - , glib, gtk3, lens, text, time, transformers, vector + , Chart-cairo, colour, containers, data-default-class + , generic-accessors, glib, gtk3, lens, text, time, transformers + , vector }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.12.1.0"; - sha256 = "08210lfmbzaazk5d0j9gw81m7416hk0ldiyahp7g9kpj49nhpmrg"; + version = "0.12.2.1"; + sha256 = "0wxz9skscs72bxb2fac82pyn1wkcxc666l40s42q32rbq17d9x44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cairo cereal Chart Chart-cairo containers + base bytestring cairo cereal Chart Chart-cairo colour containers data-default-class generic-accessors glib gtk3 lens text time transformers vector ]; - executableHaskellDepends = [ base containers generic-accessors ]; description = "Real-time line plotter for generic data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PlslTools" = callPackage @@ -14409,6 +14933,7 @@ self: { homepage = "https://github.com/choener/PrimitiveArray"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PrimitiveArray-Pretty" = callPackage @@ -14618,6 +15143,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "PyF" = callPackage + ({ mkDerivation, base, containers, formatting, haskell-src-meta + , hspec, megaparsec, process, template-haskell, text + }: + mkDerivation { + pname = "PyF"; + version = "0.5.0.0"; + sha256 = "0i0ir7i17r7lzk6c58yybsvz4s9131d1xc3jz3m3lhl3hsvyrgz5"; + libraryHaskellDepends = [ + base containers formatting haskell-src-meta megaparsec + template-haskell text + ]; + testHaskellDepends = [ + base formatting hspec process template-haskell text + ]; + description = "Quasiquotations for a python like interpolated string formater"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "QIO" = callPackage ({ mkDerivation, base, containers, mtl, old-time, random }: mkDerivation { @@ -14628,6 +15172,7 @@ self: { homepage = "https://github.com/alexandersgreen/qio-haskell"; description = "The Quantum IO Monad is a library for defining quantum computations in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QLearn" = callPackage @@ -14738,32 +15283,31 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, containers, random, template-haskell - , test-framework, tf-random, transformers + ({ mkDerivation, base, containers, deepseq, random + , template-haskell, tf-random, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.9.2"; - sha256 = "119np67qvx8hyp9vkg4gr2wv3lj3j6ay2vl4hxspkg43ymb1cp0m"; + version = "2.10.1"; + sha256 = "1rfmns3lj3hl93k1jws85ajkkw7z9ll8cw292n9m7zald1w5dfqx"; libraryHaskellDepends = [ - base containers random template-haskell tf-random transformers - ]; - testHaskellDepends = [ - base containers template-haskell test-framework + 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; }) {}; - "QuickCheck_2_10_1" = callPackage + "QuickCheck_2_11_3" = callPackage ({ mkDerivation, base, containers, deepseq, random , template-haskell, tf-random, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.10.1"; - sha256 = "1rfmns3lj3hl93k1jws85ajkkw7z9ll8cw292n9m7zald1w5dfqx"; + version = "2.11.3"; + sha256 = "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328"; libraryHaskellDepends = [ base containers deepseq random template-haskell tf-random transformers @@ -14799,12 +15343,13 @@ self: { }) {}; "QuickCheckVariant" = callPackage - ({ mkDerivation, base, QuickCheck }: + ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "QuickCheckVariant"; - version = "0.2.0.0"; - sha256 = "10nnwyks1gx9claaagljrplgsyyxkvmz7a17rkx00gbrd5x5bn2s"; + version = "1.0.0.0"; + sha256 = "0gxq90fh1bgy2vcpyzbdgnly7q88bbqx06dq44rmv3fwjs61rc82"; libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/sanjorgek/QuickCheckVariant"; description = "Generator of \"valid\" and \"invalid\" data in a type class"; license = stdenv.lib.licenses.gpl3; @@ -15090,6 +15635,7 @@ self: { ]; description = "Unsupervized construction of RNA family models"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "RNAwolf" = callPackage @@ -15272,8 +15818,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.2.1"; - sha256 = "0x2dyk72krfxwz2kk7w8cr8ws9imv7c2sgy1v4nsffjsb94qcvbz"; + version = "0.7.3"; + sha256 = "0y92h3mjsr1vjcxc06lh1lvszicf53l1bzdaci5mjb5gmiq8f2px"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -15320,6 +15866,7 @@ self: { homepage = "https://github.com/lookunder/RedmineHs"; description = "Library to access Redmine's REST services"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ref" = callPackage @@ -15386,6 +15933,7 @@ self: { homepage = "https://github.com/sweirich/replib"; description = "Generic programming library with representation types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReplicateEffects" = callPackage @@ -15503,6 +16051,7 @@ self: { libraryHaskellDepends = [ base ]; homepage = "https://github.com/riottracker/RtMidi"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "RxHaskell" = callPackage @@ -15551,17 +16100,14 @@ self: { homepage = "https://www.researchgate.net/publication/311582722_Method_of_Managing_Resources_in_a_Telecommunication_Network_or_a_Computing_System"; description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SDL" = callPackage ({ mkDerivation, base, SDL }: mkDerivation { pname = "SDL"; - version = "0.6.5.1"; - sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46"; - revision = "1"; - editedCabalFile = "0gj76j31i8rnlnvkf6hr8ljc6qmqqqcndy0bgrcppji78zg3ygi3"; + version = "0.6.6.0"; + sha256 = "0wpddhq5vwm2m1q8ja1p6draz4f40p1snmdshxwqnyyj3nchqz0z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ SDL ]; @@ -15580,7 +16126,6 @@ self: { librarySystemDepends = [ SDL_gfx ]; description = "Binding to libSDL_gfx"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL_gfx;}; "SDL-image" = callPackage @@ -15596,7 +16141,6 @@ self: { librarySystemDepends = [ SDL_image ]; description = "Binding to libSDL_image"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL_image;}; "SDL-mixer" = callPackage @@ -15612,7 +16156,6 @@ self: { librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL_mixer;}; "SDL-mpeg" = callPackage @@ -15626,7 +16169,6 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage @@ -15640,7 +16182,6 @@ self: { librarySystemDepends = [ SDL_ttf ]; description = "Binding to libSDL_ttf"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL_ttf;}; "SDL2-ttf" = callPackage @@ -15653,6 +16194,7 @@ self: { librarySystemDepends = [ SDL2_ttf ]; description = "Binding to libSDL-ttf"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {SDL2 = null; inherit (pkgs) SDL2_ttf;}; @@ -15743,17 +16285,16 @@ self: { }) {}; "SHA" = callPackage - ({ mkDerivation, array, base, binary, bytestring, directory - , QuickCheck, test-framework, test-framework-quickcheck2 + ({ mkDerivation, array, base, binary, bytestring, QuickCheck + , test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "SHA"; - version = "1.6.4.2"; - sha256 = "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64"; + version = "1.6.4.4"; + sha256 = "0i4b2wjisivdy72synal711ywhx05mfqfba5n65rk8qidggm1nbb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary bytestring ]; - executableHaskellDepends = [ base bytestring directory ]; testHaskellDepends = [ array base binary bytestring QuickCheck test-framework test-framework-quickcheck2 @@ -15839,6 +16380,7 @@ self: { homepage = "https://github.com/AntonXue/SSTG#readme"; description = "STG Symbolic Execution"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "STL" = callPackage @@ -15851,6 +16393,7 @@ self: { homepage = "http://github.com/bergey/STL"; description = "STL 3D geometry format parsing and pretty-printing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "STLinkUSB" = callPackage @@ -15866,7 +16409,6 @@ self: { ]; description = "STLink USB interface in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "STM32-Zombie" = callPackage @@ -15963,6 +16505,7 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SVGPath" = callPackage @@ -16088,10 +16631,8 @@ self: { }: mkDerivation { pname = "SciFlow"; - version = "0.6.0"; - sha256 = "1b57sa2gx3jj00239sq62qmywjykc80lkk587lwzrdp9w5ycl4sb"; - revision = "1"; - editedCabalFile = "1nsakdi9y5nnwm8x9f2a1cvf55k0wnva3wkd9nmz9my8mlk2jfi3"; + version = "0.6.1"; + sha256 = "0axwf7rdwhl3ppq6qlxrffzbzbwvb8q0ygpnlzc2yvksiqzp9h2g"; libraryHaskellDepends = [ aeson base bytestring cereal cereal-text containers data-default-class directory exceptions executable-path fgl @@ -16101,7 +16642,6 @@ self: { ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ScratchFs" = callPackage @@ -16165,8 +16705,8 @@ self: { }: mkDerivation { pname = "SelectSequencesFromMSA"; - version = "1.0.3"; - sha256 = "0i2nzwv0czg1igyfiyk5n748j15fcavn84dwxibiqf48wzjz9gsc"; + version = "1.0.5"; + sha256 = "0m68xiaa6acaq30qlscpd5lm7x0rfrqxyn0krwahkqd5s9h5aj7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16177,8 +16717,9 @@ self: { 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"; + description = "Selects a representative subset of sequences from multiple sequence alignment"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Semantique" = callPackage @@ -16241,15 +16782,18 @@ self: { }) {}; "ShellCheck" = callPackage - ({ mkDerivation, base, containers, directory, json, mtl, parsec - , process, QuickCheck, regex-tdfa + ({ mkDerivation, base, Cabal, containers, directory, json, mtl + , parsec, process, QuickCheck, regex-tdfa }: mkDerivation { pname = "ShellCheck"; - version = "0.4.6"; - sha256 = "1g5ihsma3zgb7q89n2j4772f504nnhfn065xdz6bqgrnjhkrpsqi"; + version = "0.4.7"; + sha256 = "0z0dlx4s0j5v627cvns5qdq1r6kcka5nif8g62hdria29lk5aj8q"; + revision = "1"; + editedCabalFile = "0fbrysx6wb9kmlzbfyjcb7107rnf0rjldlszaqnpib33vwd7l1hx"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ base containers directory json mtl parsec process QuickCheck regex-tdfa @@ -16260,7 +16804,7 @@ self: { testHaskellDepends = [ base containers directory json mtl parsec QuickCheck regex-tdfa ]; - homepage = "http://www.shellcheck.net/"; + homepage = "https://www.shellcheck.net/"; description = "Shell script analysis tool"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -16382,8 +16926,8 @@ self: { ({ mkDerivation, base, GLUT }: mkDerivation { pname = "Shu-thing"; - version = "1.1.3"; - sha256 = "185vcxd3qvii9k0134j634x6znvk7v83sj24a4dnw7jjsax0kqiv"; + version = "1.1.4"; + sha256 = "1j42jgv27lj723mnq3dbc94zirhbbksahzw6y43ay1iylw870yjs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT ]; @@ -16502,21 +17046,25 @@ self: { testHaskellDepends = [ base Cabal ]; description = "Simple table generator"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Sit" = callPackage - ({ mkDerivation, array, base, containers, data-lens-light, mtl }: + ({ mkDerivation, alex, array, base, containers, data-lens-light + , happy, mtl + }: mkDerivation { pname = "Sit"; version = "0.2017.5.2"; sha256 = "1hal35bp7jw2dwmnd68p27hn19mgpdf28lpf8nh0qja59gxk4lff"; + revision = "2"; + editedCabalFile = "1chbiyvp02yn03pvqd4r4z3yprb7yiwmxmw2kl6gr5aml9923w41"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers data-lens-light mtl ]; + executableToolDepends = [ alex happy ]; homepage = "https://github.com/andreasabel/Sit"; description = "Prototypical type checker for Type Theory with Sized Natural Numbers"; license = "unknown"; @@ -16727,6 +17275,7 @@ self: { homepage = "http://www.haskell.org/yampa/"; description = "Video game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SpacePrivateers" = callPackage @@ -16805,6 +17354,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-api" = callPackage @@ -16819,6 +17369,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-api-ghcjs" = callPackage @@ -16848,6 +17399,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-auth" = callPackage @@ -16889,6 +17441,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-digestive" = callPackage @@ -16906,6 +17459,7 @@ self: { homepage = "https://github.com/agrafix/Spock-digestive"; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-lucid" = callPackage @@ -16918,6 +17472,7 @@ self: { homepage = "http://github.com/aelve/Spock-lucid"; description = "Lucid support for Spock"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-worker" = callPackage @@ -16936,6 +17491,7 @@ self: { homepage = "http://github.com/agrafix/Spock-worker"; description = "Background workers for Spock"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SpreadsheetML" = callPackage @@ -17033,14 +17589,15 @@ self: { }: mkDerivation { pname = "StockholmAlignment"; - version = "1.1.1"; - sha256 = "085kw1rw4dkyivjpm7l5alj0x9cgzd8c2ai4f2k1kkcwjkhbpllv"; + version = "1.1.2"; + sha256 = "1x41m0xcmz9j4gypbl4pi6a6v53j6v37ndl8g5rq60fqfl18hizb"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools SVGFonts text vector ]; description = "Libary for Stockholm aligmnent format"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Stomp" = callPackage @@ -17096,10 +17653,8 @@ self: { ({ mkDerivation, base, directory, mtl, syb, transformers }: mkDerivation { pname = "Strafunski-StrategyLib"; - version = "5.0.0.10"; - sha256 = "1hhcx0arzyrw8ij5ispnqysbipxyznbs5g9pkmy63fzn3l2im2ih"; - revision = "1"; - editedCabalFile = "031p57vf33vdhwk1p4d1jzpk8fcl2js8kzdg7gyhz9g11vl2n4j9"; + version = "5.0.1.0"; + sha256 = "15d2m7ahb3jwriariaff0yz93mmrhpv579wink9838w9091cf650"; libraryHaskellDepends = [ base directory mtl syb transformers ]; description = "Library for strategic programming"; license = stdenv.lib.licenses.bsd3; @@ -17133,6 +17688,7 @@ self: { libraryHaskellDepends = [ base mtl ]; homepage = "http://naesten.dyndns.org:8080/repos/StrategyLib"; license = stdenv.lib.licenses.unfree; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Stream" = callPackage @@ -17318,6 +17874,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "TORCS" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, lens + , monad-loops, monad-parallel, MonadRandom, network, process + , random, random-shuffle, time, Yampa + }: + mkDerivation { + pname = "TORCS"; + version = "0.1.0.2"; + sha256 = "0lkp8qcglp2l6hq4py3i3kc1p1s6wvydrszh9dwfm6vk41cjwmnw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory lens monad-loops + monad-parallel MonadRandom network process random random-shuffle + time Yampa + ]; + executableHaskellDepends = [ base bytestring Yampa ]; + description = "Bindings to the TORCS vehicle simulator"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "TTTAS" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -17399,6 +17977,7 @@ self: { homepage = "http://www.storytotell.org/code/tablify"; description = "Tool to render CSV into tables of various formats"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Tahin" = callPackage @@ -17443,7 +18022,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl old-time time ]; - executableHaskellDepends = [ base mtl old-time ]; description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -17463,21 +18041,6 @@ self: { }) {}; "Taxonomy" = callPackage - ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl - , graphviz, parsec, text, vector - }: - mkDerivation { - pname = "Taxonomy"; - version = "1.0.2"; - sha256 = "076j2jj45insbj9v98iygm7ighk210xja3dm8ar9jnjmrpar8gil"; - libraryHaskellDepends = [ - aeson base bytestring either-unwrap fgl graphviz parsec text vector - ]; - description = "Libary for parsing, processing and vizualization of taxonomy data"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "Taxonomy_1_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl , graphviz, parsec, text, vector }: @@ -17490,7 +18053,6 @@ self: { ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TaxonomyTools" = callPackage @@ -17596,6 +18158,7 @@ self: { homepage = "https://github.com/testexplode/testexplode"; description = "Generates testcases from program-snippets"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Theora" = callPackage @@ -18011,7 +18574,6 @@ self: { homepage = "https://github.com/avieth/TypeNat"; description = "Some Nat-indexed types for GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TypingTester" = callPackage @@ -18091,6 +18653,7 @@ self: { homepage = "http://github.com/solidsnack/URLb"; description = "DEPRECATED A simple, liberal URL parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "UTFTConverter" = callPackage @@ -18124,8 +18687,8 @@ self: { }: mkDerivation { pname = "Unique"; - version = "0.4.7.1"; - sha256 = "1a912180fk2xhz6md50n21xz0z89n9ylansyqxq034jgsfkz8b7s"; + version = "0.4.7.2"; + sha256 = "0ssvg5sjhvadsfym02y0l712viv9xk2sfvrfs1q7260p7025aqdm"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; @@ -18161,7 +18724,6 @@ self: { homepage = "http://src.seereason.com/haskell-unixutils-shadow"; description = "A simple interface to shadow passwords (aka, shadow.h)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Updater" = callPackage @@ -18331,17 +18893,18 @@ self: { }) {}; "ViennaRNA-bindings" = callPackage - ({ mkDerivation, array, base, c2hs, QuickCheck, tasty, tasty-hunit - , tasty-silver, tasty-th + ({ mkDerivation, array, base, bytestring, c2hs, QuickCheck, tasty + , tasty-hunit, tasty-silver, tasty-th }: mkDerivation { pname = "ViennaRNA-bindings"; - version = "0.233.1.2"; - sha256 = "1iq4f15znpmfs5i6i3cvrzkn220apxj4rp720yyh0xbji211wg3d"; - libraryHaskellDepends = [ array base ]; + version = "0.233.2.0"; + sha256 = "1hzw4x493vqwmcdjj7ahn8cj7r2zw5mjs8gpl1alnsp1lp0j517y"; + libraryHaskellDepends = [ array base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - array base QuickCheck tasty tasty-hunit tasty-silver tasty-th + array base bytestring QuickCheck tasty tasty-hunit tasty-silver + tasty-th ]; testToolDepends = [ c2hs ]; homepage = "https://github.com/choener/ViennaRNA-bindings"; @@ -18349,6 +18912,31 @@ self: { license = "unknown"; }) {}; + "ViennaRNA-extras" = callPackage + ({ mkDerivation, array, attoparsec, base, BiobaseTypes, BiobaseXNA + , bytestring, deepseq, lens, QuickCheck, streaming + , streaming-bytestring, strict, strict-base-types, tasty + , tasty-quickcheck, tasty-th, vector, ViennaRNA-bindings + }: + mkDerivation { + pname = "ViennaRNA-extras"; + version = "0.0.0.1"; + sha256 = "06az042v9ja888nq59bdcsj6i7zk4dmbjsb9qcbdzqv6xw1lm8ac"; + libraryHaskellDepends = [ + array attoparsec base BiobaseTypes BiobaseXNA bytestring deepseq + lens QuickCheck streaming streaming-bytestring strict + strict-base-types ViennaRNA-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring QuickCheck tasty tasty-quickcheck + tasty-th vector + ]; + homepage = "https://github.com/choener/ViennaRNA-extras"; + description = "ViennaRNA v2 extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ViennaRNAParser" = callPackage ({ mkDerivation, base, hspec, parsec, ParsecTools, process , transformers @@ -18367,24 +18955,26 @@ self: { "Villefort" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC - , HDBC-sqlite3, mtl, process, random, scotty, split, strict, text - , time, transformers, unix + , HDBC-sqlite3, hspec, MissingH, mtl, process, QuickCheck, random + , scotty, split, strict, text, time, transformers, unix, webdriver }: mkDerivation { pname = "Villefort"; - version = "0.1.2.4"; - sha256 = "1dyq8n7filv8v4qf42v53ji2fnyam4jkjvd5aflh2qnib2wqsl04"; + version = "0.1.2.10"; + sha256 = "0c7i5y5h2q55nj4wv692zd8hsai998dws3mdqgj5h1065v48r6im"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring directory filepath HDBC HDBC-sqlite3 mtl process - random scotty split strict text time transformers unix + base bytestring directory filepath HDBC HDBC-sqlite3 MissingH mtl + process random scotty split strict text time transformers unix ]; executableHaskellDepends = [ base HDBC HDBC-sqlite3 random scotty split text time ]; - testHaskellDepends = [ base HDBC HDBC-sqlite3 ]; + testHaskellDepends = [ + base HDBC HDBC-sqlite3 hspec mtl QuickCheck webdriver + ]; homepage = "https://github.com/Chrisr850/Villefort#readme"; description = "Villefort is a task manager and time tracker written in haskell"; license = stdenv.lib.licenses.bsd3; @@ -18698,43 +19288,36 @@ self: { }) {}; "Win32" = callPackage - ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 - , shfolder, user32, winmm + ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 + , msimg32, shell32, shfolder, shlwapi, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.3.1.1"; - sha256 = "1255qx2a2ff95x9f5qg5k9cgy7s5j19vh9gybfa9xfqkkv5gcmsw"; - libraryHaskellDepends = [ base bytestring ]; + version = "2.5.4.1"; + sha256 = "0r1xzm0w3kg8rqq24j17405ic6yix53r9sq9wpl4zl2sajg3w66c"; + libraryHaskellDepends = [ base bytestring filepath ]; librarySystemDepends = [ - advapi32 gdi32 shell32 shfolder 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; shell32 = null; - shfolder = null; user32 = null; winmm = null;}; + }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; + shell32 = null; shfolder = null; shlwapi = null; user32 = null; + winmm = null;}; - "Win32_2_6_1_0" = callPackage - ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 - , msimg32, shell32, shfolder, shlwapi, unbuildable, user32, winmm - }: + "Win32_2_7_0_0" = callPackage + ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.6.1.0"; - sha256 = "1qwwznnnqnr6zqvjzwr35bkvzrvjf7v90j4qkhinzs8p0yx4b97b"; - libraryHaskellDepends = [ base bytestring filepath unbuildable ]; - librarySystemDepends = [ - advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm - ]; + version = "2.7.0.0"; + sha256 = "1583c2x208bpwgvk0gyy2931604vikx57kyiiaxf7mp8shh13fhi"; homepage = "https://github.com/haskell/win32"; - description = "A binding to part of the Win32 library"; + description = "A binding to Windows Win32 API"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; - }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; - shell32 = null; shfolder = null; shlwapi = null; user32 = null; - winmm = null;}; + }) {}; "Win32-console" = callPackage ({ mkDerivation, base, Win32 }: @@ -18812,7 +19395,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory Win32 ]; - executableHaskellDepends = [ base directory ]; description = "A binding to part of the Win32 library for file notification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -18894,7 +19476,6 @@ self: { homepage = "http://www.cse.chalmers.se/~emax/wired/"; description = "Wire-aware hardware description"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "WordAlignment" = callPackage @@ -19015,7 +19596,7 @@ self: { "X11" = callPackage ({ mkDerivation, base, data-default, libX11, libXext, libXinerama - , libXrandr, libXrender + , libXrandr, libXrender, libXScrnSaver }: mkDerivation { pname = "X11"; @@ -19023,14 +19604,14 @@ self: { sha256 = "13lxq36856fzp61y4api78vssykyh8fm2aplr0nsj18ymdm1c6sl"; libraryHaskellDepends = [ base data-default ]; librarySystemDepends = [ - libX11 libXext libXinerama libXrandr libXrender + libX11 libXext libXinerama libXrandr libXrender libXScrnSaver ]; homepage = "https://github.com/xmonad/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; - inherit (pkgs.xorg) libXrender;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: @@ -19146,6 +19727,7 @@ self: { homepage = "xy30.com"; description = "A library to parse xml"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "XMMS" = callPackage @@ -19182,22 +19764,24 @@ self: { }) {}; "XSaiga" = callPackage - ({ mkDerivation, base, cgi, containers, hsparql, network, pretty - , rdf4h, text + ({ mkDerivation, base, bifunctors, bytestring, cgi, containers + , hsparql, mtl, network, pretty, rdf4h, text }: mkDerivation { pname = "XSaiga"; - version = "1.5.0.0"; - sha256 = "0v4f1z8xhwyiq5y2p8dxdxmdg4y2ik02zmamjff5mb7d22bqwpir"; + version = "1.6.0.0"; + sha256 = "1kc48pdqhxiqmmp7fhlidx5lqzr57b34d6sln1hxpvkl862sfmr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers hsparql network pretty rdf4h text + base bifunctors bytestring cgi containers hsparql mtl network + pretty rdf4h text ]; executableHaskellDepends = [ - base cgi containers hsparql network pretty rdf4h text + base bifunctors bytestring cgi containers hsparql mtl network + pretty rdf4h text ]; - homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html"; + homepage = "http://speechweb2.cs.uwindsor.ca/solarman4/demo_sparql.html"; description = "An implementation of a polynomial-time top-down parser suitable for NLP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -19332,17 +19916,18 @@ self: { }) {}; "YamlReference" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, dlist - , hashmap, HUnit, mtl, regex-compat + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , dlist, hashmap, HUnit, mtl, regex-compat }: mkDerivation { pname = "YamlReference"; version = "0.10.0"; sha256 = "01cjddbg98vs1bd66n0v58i415kqn7cfi6cslk384p7j2ivwv2ad"; - revision = "1"; - editedCabalFile = "1pcrd8ww4fm9big1bcafkmsl9kifixkyny9b3z172w8yhamk2wwq"; + revision = "2"; + editedCabalFile = "023997365188qvgrfg8wshmmlrjr7z435329pxcsvmfcywnc739a"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers dlist regex-compat ]; @@ -19356,15 +19941,29 @@ self: { homepage = "http://www.ben-kiki.org/oren/YamlReference"; description = "YAML reference implementation"; license = "LGPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Yampa" = callPackage ({ mkDerivation, base, deepseq, random }: mkDerivation { pname = "Yampa"; - version = "0.10.6.2"; - sha256 = "1d18m2id6dsdkpldmqsjxxi6mpqv8hg87mzpay99l8h937nyhj3g"; + version = "0.10.7"; + sha256 = "1ifijcqk6il68h8yr62mvqh8fqc1ss15slfp73vwd92jkv5kvc8l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq random ]; + testHaskellDepends = [ base ]; + homepage = "http://www.haskell.org/haskellwiki/Yampa"; + description = "Library for programming hybrid systems"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "Yampa_0_11" = callPackage + ({ mkDerivation, base, deepseq, random }: + mkDerivation { + pname = "Yampa"; + version = "0.11"; + sha256 = "0frybgsj73r57rd6ckv9pgd9ff1g72qrlad90plb13cf2s6jdp3f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq random ]; @@ -19372,6 +19971,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Yampa"; description = "Library for programming hybrid systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Yampa-core" = callPackage @@ -19383,8 +19983,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq random vector-space ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; homepage = "https://github.com/ony/Yampa-core"; description = "Library for programming hybrid systems"; license = stdenv.lib.licenses.bsd3; @@ -19627,14 +20225,13 @@ self: { ]; librarySystemDepends = [ abc ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base base-compat ]; testHaskellDepends = [ aig base base-compat directory QuickCheck tasty tasty-ant-xml tasty-hunit tasty-quickcheck vector ]; description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {abc = null;}; "abcnotation" = callPackage @@ -19690,6 +20287,7 @@ self: { homepage = "https://github.com/Xandaros/abnf.git"; description = "Parse ABNF and generate parsers for the specified document"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "abstract-deque" = callPackage @@ -19795,42 +20393,47 @@ self: { }) {}; "accelerate" = 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, ansi-wl-pprint, base, base-orphans, containers + , deepseq, directory, exceptions, fclabels, filepath, ghc-prim + , hashable, hashtables, mtl, template-haskell, time, transformers + , unique, unix, unordered-containers }: mkDerivation { pname = "accelerate"; - version = "1.0.0.0"; - sha256 = "04pix2hazqafyb3zr8ikn1acrc77f9r9061fygpblbl5fxmk9g96"; - revision = "1"; - editedCabalFile = "1n6mhckkry2ga6w5yhc9s37saf055jfs2ixi1g0np5cca6027h10"; + version = "1.1.1.0"; + sha256 = "1qcfhaz48fmn2di5g65mmwmqhvgl194k922nps5qa3mx5d3q5x54"; libraryHaskellDepends = [ - base base-orphans containers deepseq directory exceptions fclabels - filepath ghc-prim hashable hashtables mtl pretty template-haskell - time transformers unique unix unordered-containers + ansi-wl-pprint base base-orphans containers deepseq directory + exceptions fclabels filepath ghc-prim hashable hashtables mtl + 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; }) {}; - "accelerate_1_1_1_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, base-orphans, containers - , deepseq, directory, exceptions, fclabels, filepath, ghc-prim - , hashable, hashtables, mtl, template-haskell, time, transformers - , unique, unix, unordered-containers + "accelerate_1_2_0_0" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, base-orphans + , bytestring, Cabal, cabal-doctest, constraints, containers + , cryptonite, deepseq, directory, doctest, exceptions, filepath + , ghc-prim, half, hashable, hashtables, hedgehog, lens, mtl, tasty + , tasty-expected-failure, tasty-hedgehog, tasty-hunit + , template-haskell, terminal-size, transformers, unique, unix + , unordered-containers, vector }: mkDerivation { pname = "accelerate"; - version = "1.1.1.0"; - sha256 = "1qcfhaz48fmn2di5g65mmwmqhvgl194k922nps5qa3mx5d3q5x54"; + version = "1.2.0.0"; + sha256 = "0y8wx09smrcxkyyklrf4lrilqasbmaw1w1ga9y110bqgywkw4pmj"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - ansi-wl-pprint base base-orphans containers deepseq directory - exceptions fclabels filepath ghc-prim hashable hashtables mtl - template-haskell time transformers unique unix unordered-containers + ansi-terminal ansi-wl-pprint base base-orphans bytestring + constraints containers cryptonite deepseq directory exceptions + filepath ghc-prim half hashable hashtables hedgehog lens mtl tasty + tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell + terminal-size transformers unique unix unordered-containers vector ]; + testHaskellDepends = [ base doctest ]; homepage = "https://github.com/AccelerateHS/accelerate/"; description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; @@ -19843,8 +20446,8 @@ self: { }: mkDerivation { pname = "accelerate-arithmetic"; - version = "0.1"; - sha256 = "02m2zz80v9d64qspsp7hrdqz2gazgq7x5x0brlsd39cbc5142z8g"; + version = "1.0.0.1"; + sha256 = "05hnbsccd8wm984zpkrkk7653rwml33rq3hymy2llzbi010jm82y"; libraryHaskellDepends = [ accelerate accelerate-utility base QuickCheck utility-ht ]; @@ -19854,7 +20457,6 @@ self: { homepage = "http://hub.darcs.net/thielema/accelerate-arithmetic/"; description = "Linear algebra and interpolation using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-bignum" = callPackage @@ -19867,8 +20469,8 @@ self: { pname = "accelerate-bignum"; version = "0.1.0.0"; sha256 = "199h9vq62hxs7pdwch8xh8zcx9kz9x6195yi389k1va6srkw863w"; - revision = "1"; - editedCabalFile = "0gwfw6bzy00spi0nm82p63fjc7sigk733ysnla64znqilca8nrmv"; + revision = "2"; + editedCabalFile = "00s0n5jqahn15m8x81chavv8blzjjb8z6368pl3diaadd8bi8hsv"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell @@ -19887,6 +20489,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-bignum_0_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion + , ghc-prim, hedgehog, llvm-hs-pure, mwc-random, tasty + , tasty-hedgehog, template-haskell, vector, vector-th-unbox + , wide-word + }: + mkDerivation { + pname = "accelerate-bignum"; + version = "0.2.0.0"; + sha256 = "0xhnd39fb17kb7q5z9z8svn8zlv6j1wxrbkv3vij4f1q2hkqkl0p"; + 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 hedgehog + tasty tasty-hedgehog + ]; + 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-blas" = callPackage ({ mkDerivation, accelerate, accelerate-llvm , accelerate-llvm-native, accelerate-llvm-ptx, base, blas-hs @@ -19917,6 +20548,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-blas_0_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, blas-hs + , bytestring, containers, criterion, cublas, cuda, deepseq + , file-embed, hedgehog, hmatrix, llvm-hs-pure, mtl, mwc-random + , mwc-random-accelerate, tasty, tasty-hedgehog + }: + mkDerivation { + pname = "accelerate-blas"; + version = "0.2.0.0"; + sha256 = "0y77wsdw0i7b5bzlfrrn9q4d8q95r8z71g8qy77n24db1pwmjqy9"; + libraryHaskellDepends = [ + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda + file-embed llvm-hs-pure mtl + ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog + tasty tasty-hedgehog + ]; + benchmarkHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base + criterion deepseq hmatrix mwc-random mwc-random-accelerate + ]; + description = "Numeric Linear Algebra in 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, hmatrix @@ -19973,18 +20633,18 @@ self: { }) {}; "accelerate-cufft" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, accelerate-fourier - , accelerate-utility, base, cuda, cufft + ({ mkDerivation, accelerate, accelerate-fourier + , accelerate-llvm-ptx, accelerate-utility, base, cuda, cufft }: mkDerivation { pname = "accelerate-cufft"; - version = "0.0.1"; - sha256 = "0w7j5d2ncabz2ca4q53i07jybwsc116l38q71z2jl842lrlc1vc2"; + version = "1.0"; + sha256 = "1rz5i80scvbz36awh4wgh5vp2vkv8drj3gmwvx02j80cjjqibcij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - accelerate accelerate-cuda accelerate-fourier accelerate-utility - base cuda cufft + accelerate accelerate-fourier accelerate-llvm-ptx + accelerate-utility base cuda cufft ]; homepage = "http://hub.darcs.net/thielema/accelerate-cufft/"; description = "Accelerate frontend to the CUFFT library (Fourier transform)"; @@ -19994,22 +20654,20 @@ self: { "accelerate-examples" = callPackage ({ mkDerivation, accelerate, accelerate-fft, accelerate-io - , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint - , array, base, binary, bmp, bytestring, bytestring-lexing, cereal + , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint, 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 + , normaldistribution, QuickCheck, random, repa, repa-io, scientific + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "1.1.0.0"; - sha256 = "0zpjmk6v314jfda7fy22xghfqlqfh8vyf938qwyp6xjf1mpq1r1x"; - revision = "2"; - editedCabalFile = "1r53mc266gr6h2j0diyb82isaw72g6cdgvlqbhcnlidi3g7vqqcs"; + version = "1.2.0.0"; + sha256 = "1gb4m1ri461f78x913ipxh14ybwl9wzbv81w8943whiwrmb3p5pc"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; @@ -20020,14 +20678,13 @@ self: { test-framework-quickcheck2 ]; executableHaskellDepends = [ - 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 + accelerate accelerate-fft accelerate-io base binary bmp bytestring + bytestring-lexing cereal colour-accelerate containers criterion + directory fclabels filepath gloss gloss-accelerate + gloss-raster-accelerate gloss-rendering 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 + normaldistribution random repa repa-io scientific vector + vector-algorithms ]; homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; @@ -20055,32 +20712,57 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-fft_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, bytestring + , carray, containers, cuda, cufft, fft, file-embed, hashable + , hedgehog, lens-accelerate, mtl, tasty, tasty-hedgehog + , unordered-containers + }: + mkDerivation { + pname = "accelerate-fft"; + version = "1.2.0.0"; + sha256 = "19p9d59vdd3nq97xjprlb6fz2ajlk6gl37cdyvrm9inag4nnk6lp"; + libraryHaskellDepends = [ + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base bytestring carray containers cuda cufft + fft file-embed hashable lens-accelerate mtl unordered-containers + ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog + tasty tasty-hedgehog + ]; + homepage = "https://github.com/AccelerateHS/accelerate-fft"; + description = "FFT using the Accelerate library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-fftw" = callPackage ({ mkDerivation, accelerate, accelerate-io, base, carray, fft , storable-complex }: mkDerivation { pname = "accelerate-fftw"; - version = "0.0"; - sha256 = "03ffsa6xshhrx8a4grld128g46x2nkkydwql8h7jw7b2igr7i1ks"; + version = "1.0.0.1"; + sha256 = "1qakxrm0f61zb21awjvpiw5054p7lhrm9sa2bha4jfzksw9phypy"; libraryHaskellDepends = [ accelerate accelerate-io base carray fft storable-complex ]; - homepage = "http://code.haskell.org/~thielema/accelerate-fftw/"; + homepage = "http://hub.darcs.net/thielema/accelerate-fftw/"; description = "Accelerate frontend to the FFTW library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fourier" = callPackage - ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda - , accelerate-utility, base, containers, criterion, QuickCheck - , transformers, utility-ht + ({ mkDerivation, accelerate, accelerate-arithmetic + , accelerate-llvm-native, accelerate-utility, base, containers + , criterion, QuickCheck, transformers, utility-ht }: mkDerivation { pname = "accelerate-fourier"; - version = "0.0.1"; - sha256 = "10kzv1y520c6z6izfg41g6xqfr36yhjdakx5rkzq1cpplvmgpqrw"; + version = "1.0.0.5"; + sha256 = "03bbs6k6mn76nsgjhi823mzmhl3fsgyqjqix9wsslj8jh2vg3kr8"; libraryHaskellDepends = [ accelerate accelerate-arithmetic accelerate-utility base containers QuickCheck transformers utility-ht @@ -20090,13 +20772,12 @@ self: { utility-ht ]; benchmarkHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-cuda accelerate-utility - base criterion utility-ht + accelerate accelerate-arithmetic accelerate-llvm-native + accelerate-utility base criterion utility-ht ]; homepage = "http://hub.darcs.net/thielema/accelerate-fourier/"; description = "Fast Fourier transform and convolution using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fourier-benchmark" = callPackage @@ -20127,6 +20808,8 @@ self: { pname = "accelerate-io"; version = "1.0.0.1"; sha256 = "1q3l4k4h6p8y9w6qzxjanm5ww3ncz236fna2kqdqndyv18b8v9pm"; + revision = "1"; + editedCabalFile = "1qf7f1swy5h1fqaciw1swvwrvmqrcmi03v0vqsx6ccxf2zxcjlal"; libraryHaskellDepends = [ accelerate array base bmp bytestring repa vector ]; @@ -20135,6 +20818,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate-io_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, array, base, bmp, bytestring, hedgehog + , primitive, repa, tasty, tasty-hedgehog, vector + }: + mkDerivation { + pname = "accelerate-io"; + version = "1.2.0.0"; + sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf"; + libraryHaskellDepends = [ + accelerate array base bmp bytestring primitive repa vector + ]; + testHaskellDepends = [ + accelerate array base hedgehog tasty tasty-hedgehog vector + ]; + homepage = "https://github.com/AccelerateHS/accelerate-io"; + description = "Read and write Accelerate arrays in various formats"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-llvm" = callPackage ({ mkDerivation, abstract-deque, accelerate, base, bytestring , chaselev-deque, containers, data-default-class, deepseq @@ -20156,6 +20859,27 @@ self: { ]; description = "Accelerate backend component generating LLVM IR"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "accelerate-llvm_1_2_0_0" = callPackage + ({ mkDerivation, abstract-deque, accelerate, base, bytestring + , chaselev-deque, containers, data-default-class, deepseq + , directory, dlist, exceptions, filepath, llvm-hs, llvm-hs-pure + , mtl, mwc-random, primitive, template-haskell + , unordered-containers, vector + }: + mkDerivation { + pname = "accelerate-llvm"; + version = "1.2.0.0"; + sha256 = "110zfxqi0lkhg7pk42qvd87qn442r6z264zj7q46jf8ia60l2cdq"; + libraryHaskellDepends = [ + abstract-deque accelerate base bytestring chaselev-deque containers + data-default-class deepseq directory dlist exceptions filepath + llvm-hs llvm-hs-pure mtl mwc-random primitive template-haskell + unordered-containers vector + ]; + description = "Accelerate backend component generating LLVM IR"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -20179,6 +20903,27 @@ self: { libraryToolDepends = [ c2hs ]; description = "Accelerate backend for multicore CPUs"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "accelerate-llvm-native_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring + , c2hs, Cabal, cereal, containers, directory, dlist, filepath, ghc + , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, mtl + , template-haskell, time, unique, unix, vector + }: + mkDerivation { + pname = "accelerate-llvm-native"; + version = "1.2.0.0"; + sha256 = "089j8ic6ns6656a55byiilrj9jvs535jvx4f2m8x1qhgz9q968vb"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base bytestring Cabal cereal containers + directory dlist filepath ghc ghc-prim hashable libffi llvm-hs + llvm-hs-pure mtl template-haskell time unique unix vector + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ accelerate base ]; + description = "Accelerate backend for multicore CPUs"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -20190,10 +20935,8 @@ self: { }: mkDerivation { pname = "accelerate-llvm-ptx"; - version = "1.1.0.0"; - sha256 = "1av0s4wgq7l2jhkmg7cmr1fivwqankqgyjikpwg1q569dapfrasw"; - revision = "1"; - editedCabalFile = "1zap2f9xalxqgc3pkzmq7ykpiini1q4d02kyxibnwbh9cyk1kkvp"; + version = "1.1.0.1"; + sha256 = "0j1j4y0gx219ib8hyklydv0l610j53zg6qan4n7477rs58ninv5j"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring containers cuda deepseq directory dlist fclabels file-embed filepath hashable llvm-hs @@ -20205,6 +20948,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-llvm-ptx_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring + , containers, cuda, deepseq, directory, dlist, file-embed, filepath + , hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty, process + , template-haskell, time, unordered-containers + }: + mkDerivation { + pname = "accelerate-llvm-ptx"; + version = "1.2.0.0"; + sha256 = "1rh0kq10mwn4zd8f5sp19pah2hmmcansaqqssz79183znzfiviz5"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base bytestring containers cuda deepseq + directory dlist file-embed filepath hashable llvm-hs llvm-hs-pure + mtl nvvm pretty process template-haskell time unordered-containers + ]; + testHaskellDepends = [ accelerate base ]; + description = "Accelerate backend for NVIDIA GPUs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-random" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -20244,13 +21008,12 @@ self: { ({ mkDerivation, accelerate, base, utility-ht }: mkDerivation { pname = "accelerate-utility"; - version = "0.1.1"; - sha256 = "0da1wffmghw79i7vqvv845zw1is8h79wlhr8pzdnsppkksd7f3sp"; + version = "1.0.0.1"; + sha256 = "1wdxypkgkjngrlkw4fnxqqqbcy3chaw5fim0xyzcbh52zd0b62wh"; libraryHaskellDepends = [ accelerate base utility-ht ]; homepage = "http://hub.darcs.net/thielema/accelerate-utility/"; description = "Utility functions for the Accelerate framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accentuateus" = callPackage @@ -20460,6 +21223,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "acme-cuteboy" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "acme-cuteboy"; + version = "0.1.0.0"; + sha256 = "1x21mvm1n6cka07c3d3w8ycp84gx58af1nvpsfcaa7sccj13jvj9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/chessai/acme-cuteboy"; + description = "Maybe gives you a cute boy"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "acme-cutegirl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -20615,6 +21393,7 @@ self: { homepage = "https://github.com/marcosdumay/acme-kitchen-sink"; description = "A place for dumping that does-not-feel-right code while you improve it"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-left-pad" = callPackage @@ -20699,6 +21478,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-mutable-package" = callPackage + ({ mkDerivation, base, Cabal }: + mkDerivation { + pname = "acme-mutable-package"; + version = "0"; + sha256 = "16da6pkkdr2g77dn3n4v9x6mwi6yz3xlpisvpn0id2xz0bayipmr"; + revision = "3"; + editedCabalFile = "094kr4ib0hldgccr5bvy9azpfvkf5dmq3hq6xk5hyha6djjkx2gc"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base ]; + description = "A mutable package"; + license = stdenv.lib.licenses.mit; + }) {}; + "acme-now" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -20900,6 +21693,17 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-zalgo" = callPackage + ({ mkDerivation, array, base, random }: + mkDerivation { + pname = "acme-zalgo"; + version = "0.1.2.1"; + sha256 = "1yd3xrdkxf3hgapi4w5vg79nxmw8y5rnyki5pqi00mca9wjspdhz"; + libraryHaskellDepends = [ array base random ]; + description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛"; + license = stdenv.lib.licenses.mit; + }) {}; + "acme-zero" = callPackage ({ mkDerivation }: mkDerivation { @@ -20932,8 +21736,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; - revision = "2"; - editedCabalFile = "1ml42hbvfhqzpdi1y5q6dqp4wq6zqb30f15r34n9ip9iv44qjwwf"; + revision = "4"; + editedCabalFile = "1p2gaazj7r98v45d57hshgv6nxam5l47dl6y9iq65z5zqylmz7q2"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -21018,18 +21822,18 @@ self: { "ad" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad , containers, criterion, data-reify, directory, doctest, erf - , filepath, free, nats, reflection, transformers + , filepath, free, nats, reflection, semigroups, transformers }: mkDerivation { pname = "ad"; - version = "4.3.4"; - sha256 = "0r3qixsj624q5c88xlr444fn7z5c36m32ciyxz732lngg06pvwdz"; - revision = "1"; - editedCabalFile = "0rfxjifhaxvq8nv1n1l8wf49gh13ailcnyachffk7y55nqr0zqdf"; + version = "4.3.5"; + sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw"; + revision = "3"; + editedCabalFile = "14g2lfsw1fi4gn2cgvhglz4gyi797xk9g1r4pf46g734ivfl67c5"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection - transformers + semigroups transformers ]; testHaskellDepends = [ base directory doctest filepath ]; benchmarkHaskellDepends = [ base criterion erf ]; @@ -21157,20 +21961,21 @@ self: { "adjunctions" = callPackage ({ mkDerivation, array, base, comonad, containers, contravariant - , distributive, free, mtl, profunctors, semigroupoids, semigroups - , tagged, transformers, transformers-compat, void + , distributive, free, generic-deriving, hspec, hspec-discover, mtl + , profunctors, semigroupoids, semigroups, tagged, transformers + , transformers-compat, void }: mkDerivation { pname = "adjunctions"; - version = "4.3"; - sha256 = "1k1ykisf96i4g2zm47c45md7p42c4vsp9r73392pz1g8mx7s2j5r"; - revision = "1"; - editedCabalFile = "1079l9szyr7ybi9wcvv1vjsjfrqirkn9z3j7dann8vbk81a4z37q"; + version = "4.4"; + sha256 = "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h"; libraryHaskellDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers transformers-compat void ]; + testHaskellDepends = [ base distributive generic-deriving hspec ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/ekmett/adjunctions/"; description = "Adjunctions and representable functors"; license = stdenv.lib.licenses.bsd3; @@ -21180,10 +21985,8 @@ self: { ({ mkDerivation, base, bytestring, hspec, zlib }: mkDerivation { pname = "adler32"; - version = "0.1.1.0"; - sha256 = "1v18d4xfbgqflx957xy6wiv7zhkgimpy85fy49d91p2ifkmbk32p"; - revision = "1"; - editedCabalFile = "087fykdlay78g9zg1w6a36xwd4pizcyi5wqzvj7cw5sh6gq493km"; + version = "0.1.2.0"; + sha256 = "1936b05mx842wm8swz3g3jv6m9absa04islq4rwysicz72gkrd16"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ base bytestring hspec ]; @@ -21264,8 +22067,10 @@ self: { }: mkDerivation { pname = "aern2-mp"; - version = "0.1.0.1"; - sha256 = "0l217dh94j8cf16rsv3408551qslwzjy068ni0m88i2cwliq9pyi"; + version = "0.1.2.0"; + sha256 = "131wymnajhji593zydnyddyc6cwg0y3nqgvibq8l9h23v4m67rlx"; + revision = "1"; + editedCabalFile = "09b92kf60m4v0xn2nm9h8wkg8wr7dc1na5c9mg2lk3kplf60sfvk"; libraryHaskellDepends = [ base convertible hmpfr hspec integer-gmp integer-logarithms lens mixed-types-num QuickCheck regex-tdfa template-haskell @@ -21274,18 +22079,17 @@ self: { homepage = "https://github.com/michalkonecny/aern2"; description = "Multi-precision floats via MPFR"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aern2-real" = callPackage ({ mkDerivation, aern2-mp, aeson, base, bytestring, containers - , convertible, elm-bridge, hspec, lens, mixed-types-num, QuickCheck - , random, stm, transformers + , convertible, hspec, lens, mixed-types-num, QuickCheck, random + , stm, transformers }: mkDerivation { pname = "aern2-real"; - version = "0.1.0.1"; - sha256 = "0xvag7xzs5azcivlcp641p6wzf6pimz74fvwcl3rmrbah1ij1qv0"; + version = "0.1.1.0"; + sha256 = "1sq2s20vwhm0avdzqg2vb5ck6rj7aw16kcfkdyhda0dl6s2l5q15"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21293,13 +22097,12 @@ self: { mixed-types-num QuickCheck stm transformers ]; executableHaskellDepends = [ - aern2-mp base elm-bridge mixed-types-num QuickCheck random + aern2-mp base mixed-types-num QuickCheck random ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/michalkonecny/aern2"; description = "Exact real numbers via Cauchy sequences and MPFR"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson_0_7_0_6" = callPackage @@ -21338,19 +22141,18 @@ self: { , 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 + , text, th-abstraction, time, time-locale-compat + , unordered-containers, uuid-types, vector }: mkDerivation { pname = "aeson"; - version = "1.1.2.0"; - sha256 = "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p"; - revision = "1"; - editedCabalFile = "06acsik1qcn5r1z1y3n7iw5h8x0h3hdcjii0bq9nf9ncvc71h1d4"; + version = "1.2.4.0"; + sha256 = "16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l"; 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 + ghc-prim hashable scientific tagged template-haskell text + th-abstraction time time-locale-compat unordered-containers + uuid-types vector ]; testHaskellDepends = [ attoparsec base base-compat base-orphans base16-bytestring @@ -21365,7 +22167,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_2_3_0" = callPackage + "aeson_1_3_1_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable @@ -21377,8 +22179,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.2.3.0"; - sha256 = "1gwwqpbj6j93nlm6rvhdmvs0sq8rn17cwpyw7wdphanwjn9cdkda"; + version = "1.3.1.0"; + sha256 = "0ljndkgibz3qbddz2451v1r9w8i440kpslg3al3m7gc82mxz2xrr"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text @@ -21412,6 +22214,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-attoparsec" = callPackage + ({ mkDerivation, aeson, attoparsec, base }: + mkDerivation { + pname = "aeson-attoparsec"; + version = "0.0.0"; + sha256 = "0111qzp381jjhv1iymjg8mr3jslx5x1ll3w2dq4b6f3r8y8871m5"; + libraryHaskellDepends = [ aeson attoparsec base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/athanclark/aeson-attoparsec#readme"; + description = "Embed an Attoparsec text parser into an Aeson parser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-better-errors" = callPackage ({ mkDerivation, aeson, base, bytestring, dlist, mtl, scientific , text, transformers, transformers-compat, unordered-containers @@ -21476,35 +22291,6 @@ self: { }) {}; "aeson-compat" = callPackage - ({ mkDerivation, 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 - }: - mkDerivation { - pname = "aeson-compat"; - version = "0.3.6"; - sha256 = "0hnifh46g218ih666gha3r0hp8bahcl9aj1rr4jqyw2gykcnb8vs"; - revision = "6"; - editedCabalFile = "1hvq2pp7k2wqlzd192l7dz1dhld7m3slhv84hnmh4jz8g618xzsc"; - libraryHaskellDepends = [ - aeson attoparsec 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; - }) {}; - - "aeson-compat_0_3_7_1" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , base-compat, base-orphans, bytestring, containers, exceptions , hashable, QuickCheck, quickcheck-instances, scientific, tagged @@ -21515,6 +22301,8 @@ self: { pname = "aeson-compat"; version = "0.3.7.1"; sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r"; + revision = "3"; + editedCabalFile = "1smql0v6b9f4pb3jnrm8kspyq2ygvznk1wkhzp0x7bjd7psrnmy9"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -21529,7 +22317,6 @@ self: { 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 @@ -21558,37 +22345,30 @@ self: { homepage = "https://github.com/thsutton/aeson-diff"; description = "Extract and apply patches to JSON documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson-extra" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat - , bytestring, containers, exceptions, hashable, parsec - , quickcheck-instances, recursion-schemes, scientific, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, these - , time, time-parsers, unordered-containers, vector + "aeson-diff-generic" = callPackage + ({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring + , containers, dlist, hashable, lens, scientific, tagged + , template-haskell, text, th-abstraction, time + , unordered-containers, uuid-types, vector }: mkDerivation { - pname = "aeson-extra"; - version = "0.4.0.0"; - sha256 = "1555mc2vq74i8ydxrvc9ci9kiajml3i7ha4i4f9c0s4bbzvfvv3q"; - revision = "3"; - editedCabalFile = "11wps0p4wrm68zzck6km0yxj988xnkcbaww1vlyd02jv3vzyb16z"; + pname = "aeson-diff-generic"; + version = "0.0.3"; + sha256 = "12vilqp1v49pchfq8xk8k1f3m8kgl7s5n5m1w680cbh5flj050w2"; libraryHaskellDepends = [ - aeson aeson-compat attoparsec base base-compat bytestring - containers exceptions hashable parsec recursion-schemes scientific - template-haskell text time time-parsers unordered-containers vector - ]; - testHaskellDepends = [ - base containers quickcheck-instances tasty tasty-hunit - tasty-quickcheck these time time-parsers unordered-containers - vector + aeson aeson-diff base base-compat bytestring containers dlist + hashable lens scientific tagged template-haskell text + th-abstraction time unordered-containers uuid-types vector ]; - homepage = "https://github.com/phadej/aeson-extra#readme"; - description = "Extra goodies for aeson"; + description = "Apply a json-patch to any haskell datatype"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson-extra_0_4_1_0" = callPackage + "aeson-extra" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec , attoparsec-iso8601, base, base-compat, bytestring, containers , deepseq, exceptions, hashable, parsec, quickcheck-instances @@ -21600,6 +22380,8 @@ self: { pname = "aeson-extra"; version = "0.4.1.0"; sha256 = "11chkybn96q39j9y4h2wmq5vs0a0sb24qvk0g1qq8kyaiahvsd8y"; + revision = "1"; + editedCabalFile = "0fqhf8prdgjskr3qpryx2pn5s78l9dpapm4kmghak0dxh90sfp33"; libraryHaskellDepends = [ aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat bytestring containers deepseq exceptions hashable parsec @@ -21617,6 +22399,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-extra_0_4_1_1" = callPackage + ({ mkDerivation, aeson, aeson-compat, attoparsec + , attoparsec-iso8601, base, base-compat-batteries, bytestring + , containers, deepseq, exceptions, hashable, parsec + , quickcheck-instances, recursion-schemes, scientific, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, these + , time, time-parsers, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-extra"; + version = "0.4.1.1"; + sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl"; + libraryHaskellDepends = [ + aeson aeson-compat attoparsec attoparsec-iso8601 base + base-compat-batteries bytestring containers deepseq exceptions + hashable parsec recursion-schemes scientific template-haskell text + these time unordered-containers vector + ]; + testHaskellDepends = [ + base containers quickcheck-instances tasty tasty-hunit + tasty-quickcheck these time time-parsers unordered-containers + vector + ]; + homepage = "https://github.com/phadej/aeson-extra#readme"; + description = "Extra goodies for aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-filthy" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, text , unordered-containers @@ -21691,36 +22502,26 @@ self: { ({ mkDerivation, aeson, base }: mkDerivation { pname = "aeson-generic-compat"; - version = "0.0.1.0"; - sha256 = "1bfkj0hmnpw6f5iql86iky3ivj4hv7f8a317gv7g8l0k6m6mx86l"; + version = "0.0.1.1"; + sha256 = "1davhg48x4k9nsizpafjlicwryi05ijfh902bn35x76pay7alims"; libraryHaskellDepends = [ aeson base ]; description = "Compatible generic class names of Aeson"; license = stdenv.lib.licenses.bsd3; }) {}; - "aeson-injector" = callPackage - ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens - , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2 - , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers - , vector - }: + "aeson-generic-compat_0_0_1_2" = callPackage + ({ mkDerivation, aeson, base }: mkDerivation { - pname = "aeson-injector"; - version = "1.0.10.0"; - sha256 = "169zdhc3j2lv9hgv6c2s7jxvwb68xkgimkyqp8c7vwr812asqabk"; - libraryHaskellDepends = [ - aeson base bifunctors deepseq lens servant-docs swagger2 text - unordered-containers - ]; - testHaskellDepends = [ - aeson base HUnit lens QuickCheck quickcheck-text scientific - swagger2 tasty tasty-hunit tasty-quickcheck text vector - ]; - description = "Injecting fields into aeson values"; - license = stdenv.lib.licenses.mit; + pname = "aeson-generic-compat"; + version = "0.0.1.2"; + sha256 = "08h4r8ni7i9x0fqx5gizv6fpwrq84lv8m4c3w6g2hirs0iscw233"; + libraryHaskellDepends = [ aeson base ]; + description = "Compatible generic class names of Aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson-injector_1_1_0_0" = callPackage + "aeson-injector" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, deepseq , hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific , servant-docs, swagger2, tasty, tasty-hunit, tasty-quickcheck @@ -21740,16 +22541,20 @@ self: { ]; description = "Injecting fields into aeson values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-iproute" = callPackage - ({ mkDerivation, aeson, base, iproute, text }: + ({ mkDerivation, aeson, base, doctest, iproute, text + , unordered-containers + }: mkDerivation { pname = "aeson-iproute"; - version = "0.1.1"; - sha256 = "1bsrq5mvxbqyrs3jyryy0rh88dzkh8zaf0q07arnjznlwz5k7iwz"; - libraryHaskellDepends = [ aeson base iproute text ]; + version = "0.2"; + sha256 = "13r6vyyw1pbk5sz32ari5kig23vsg57a5pir037adi7xicrm6kgf"; + libraryHaskellDepends = [ + aeson base iproute text unordered-containers + ]; + testHaskellDepends = [ base doctest ]; homepage = "https://github.com/greydot/aeson-iproute"; description = "Aeson instances for iproute types"; license = stdenv.lib.licenses.bsd3; @@ -21805,6 +22610,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-options" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "aeson-options"; + version = "0.0.0"; + sha256 = "0z2r1rnh819wms8l1scv18l178i2y1ixcjm6ir59vir5bl19wxm0"; + libraryHaskellDepends = [ aeson base ]; + homepage = "https://github.com/serokell/aeson-options"; + description = "Options to derive FromJSON/ToJSON instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "aeson-parsec-picky" = callPackage ({ mkDerivation, aeson, base, parsec, scientific, text , unordered-containers, vector @@ -21821,6 +22638,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-picker" = callPackage + ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }: + mkDerivation { + pname = "aeson-picker"; + version = "0.1.0.4"; + sha256 = "0ln4qwx7app1sc01irmy5lx7bqsq6wsgdig6zihpnp9rbj8263mj"; + libraryHaskellDepends = [ aeson base lens lens-aeson text ]; + testHaskellDepends = [ base hspec text ]; + homepage = "https://github.com/ozzzzz/aeson-picker#readme"; + description = "Tiny library to get fields from JSON format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-prefix" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, mtl, text , unordered-containers, vector @@ -21836,6 +22666,7 @@ self: { homepage = "https://github.com/j1r1k/aeson-prefix#readme"; description = "Hiearchical prefixing for aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-pretty_0_7_2" = callPackage @@ -21866,8 +22697,8 @@ self: { }: mkDerivation { pname = "aeson-pretty"; - version = "0.8.5"; - sha256 = "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx"; + version = "0.8.7"; + sha256 = "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21911,8 +22742,8 @@ self: { }: mkDerivation { pname = "aeson-quick"; - version = "0.1.1.2"; - sha256 = "0b1pp0hl543pmjkhmcq112xxivd8njnfpgklayllyrxdrbrafrp6"; + version = "0.1.2.0"; + sha256 = "18a5gwfyx382dxlhr4gch8yd39kgiamp2fpxsvvgi7bfyc55pq1h"; libraryHaskellDepends = [ aeson attoparsec base deepseq text unordered-containers vector ]; @@ -21923,7 +22754,6 @@ self: { homepage = "https://github.com/libscott/aeson-quick"; description = "Quick JSON extractions with Aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-schema" = callPackage @@ -22059,6 +22889,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-typescript" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, interpolate, mtl, process, template-haskell + , temporary, text, th-abstraction, unordered-containers + }: + mkDerivation { + pname = "aeson-typescript"; + version = "0.1.0.6"; + sha256 = "11q165g6yvd87ahbfvxdpr6w61l0y9znv1x5jmznmj1c9m9s36id"; + libraryHaskellDepends = [ + aeson base containers interpolate mtl template-haskell text + th-abstraction unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath hspec + interpolate mtl process template-haskell temporary text + th-abstraction unordered-containers + ]; + homepage = "https://github.com/codedownio/aeson-typescript#readme"; + description = "Generate TypeScript definition files from your ADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific , text @@ -22067,8 +22921,8 @@ self: { pname = "aeson-utils"; version = "0.3.0.2"; sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi"; - revision = "5"; - editedCabalFile = "0v6p99nb8s61lc07a93xv94lfb4ybmv8aiqjq77lncs6qgpp97xf"; + revision = "6"; + editedCabalFile = "06jpkp95sicqv9kjasgwwd89kfrnz37402ppvgg5567sbg1wm9zh"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific text ]; @@ -22077,51 +22931,49 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, base-prelude, foldl, json-pointer - , json-pointer-aeson, mtl-prelude, scientific, text, transformers - , unordered-containers, vector + ({ mkDerivation, aeson, base-prelude, bytestring, foldl + , json-pointer, json-pointer-aeson, mtl-prelude, scientific, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.12.3"; - sha256 = "1qrd5kdgmwpxf7lxcy0hw0qdzm0251k9d918ggjjhmwssg9ci8zb"; + version = "0.12.4"; + sha256 = "0ya2gbyf2gg1psbmm1cz7qbv9m9kp3lls9rzzkmadhxnqr1wfn2f"; libraryHaskellDepends = [ - aeson base-prelude foldl json-pointer json-pointer-aeson + aeson base-prelude bytestring foldl 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"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-yak" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { pname = "aeson-yak"; - version = "0.1.1.1"; - sha256 = "0q52h6py1fc24f7r51pc3gpziakp7h557wy3r06qfa6rx00yvsk8"; + version = "0.1.1.3"; + sha256 = "0x5a5z0bmiljl9rfapyq6srffp6v3g25qvy0x692a5as66y5ahxg"; libraryHaskellDepends = [ aeson base ]; homepage = "https://github.com/tejon/aeson-yak"; description = "Handle JSON that may or may not be a list, or exist"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "affection" = callPackage - ({ mkDerivation, babl, base, clock, containers, gegl, glib - , monad-loops, monad-parallel, mtl, sdl2, text + ({ mkDerivation, base, bytestring, clock, containers, glib, linear + , monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid }: mkDerivation { pname = "affection"; - version = "0.0.0.6"; - sha256 = "0fc071zl68acm01ik4v1admy0hs4jp787kpadw9ddavwykmr6jdz"; + version = "0.0.0.7"; + sha256 = "0qnlh1ny4cysxzh45vsh1d49gk4kc2kzpdjrqnn3mh66wz2fc177"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - babl base clock containers gegl glib monad-loops monad-parallel mtl - sdl2 text + base bytestring clock containers glib linear monad-loops + monad-parallel mtl OpenGL sdl2 stm text uuid ]; homepage = "https://github.com/nek0/affection#readme"; description = "A simple Game Engine using SDL"; @@ -22291,11 +23143,6 @@ self: { fclabels mtl network pipes pipes-concurrency pipes-network safe snmp time transformers unix ]; - executableHaskellDepends = [ - base binary bitwise bytestring containers data-default Diff - fclabels mtl network pipes pipes-concurrency pipes-network safe - snmp time transformers unix - ]; description = "AgentX protocol for write SNMP subagents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -22305,8 +23152,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "agum"; - version = "2.6"; - sha256 = "1j2qlwnvg7rxjx8fk3y5n3wjkikv1d17p8grh4gzp4c5a7pn5kim"; + version = "2.7"; + sha256 = "1x1yd2wxff2am7g50nvwmk4slw6p31zl61mlm8rdgcjbds4a2qrk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -22452,38 +23299,8 @@ self: { }: mkDerivation { pname = "airship"; - version = "0.6.0"; - sha256 = "1mhz0mqq57xsxi4m9r7aznrn7d4vxl4b2jalv7gm3kfzqpjjpjp4"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring - bytestring-trie case-insensitive containers cryptohash directory - either filepath http-date http-media http-types lifted-base - microlens mime-types mmorph monad-control mtl network old-locale - random text time transformers transformers-base unix - unordered-containers wai wai-extra - ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit tasty-quickcheck text - transformers wai - ]; - homepage = "https://github.com/helium/airship/"; - description = "A Webmachine-inspired HTTP library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "airship_0_9_0" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, bytestring-trie, case-insensitive, containers - , cryptohash, directory, either, filepath, http-date, http-media - , http-types, lifted-base, microlens, mime-types, mmorph - , monad-control, mtl, network, old-locale, random, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-base, unix, unordered-containers, wai, wai-extra - }: - mkDerivation { - pname = "airship"; - version = "0.9.0"; - sha256 = "1hpm99jyb5v131352y1wlja59sp3c3wqw0p935xg142zw4qckacx"; + version = "0.9.3"; + sha256 = "0nildnm2f8n87sy6lrzkfxjypf72vy3d8yknl9qcnzv6kmyq6m72"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring bytestring-trie case-insensitive containers cryptohash directory @@ -22518,18 +23335,20 @@ self: { homepage = "https://github.com/ooblahman/airtable-api"; description = "Requesting and introspecting Tables within an Airtable project"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika" = callPackage - ({ mkDerivation, array, base, binary, containers, deepseq, mtl - , mwc-random, random, vector + ({ mkDerivation, array, base, binary, containers, deepseq + , exceptions, mtl, mwc-random, random, semigroups, vector }: mkDerivation { pname = "aivika"; - version = "5.4"; - sha256 = "1ymzhbmff1wnpksnad0dc47xa0iha5pf6w3ng6gykni2wx8smsgv"; + version = "5.7"; + sha256 = "1zhzb9pchpj9vk0zc3wb9bpxbw7zfn63m7ng37z46lwyv5s55d5m"; libraryHaskellDepends = [ - array base binary containers deepseq mtl mwc-random random vector + array base binary containers deepseq exceptions mtl mwc-random + random semigroups vector ]; homepage = "http://www.aivikasoft.com"; description = "A multi-method simulation library"; @@ -22559,8 +23378,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "1.0"; - sha256 = "1nc0qhmkh75jda3id4wndhs5gmjiqcqi0gwpmwafm5czzg3g6lch"; + version = "1.3"; + sha256 = "1sm56b6z8ajkap3nlcrsl592m40vgb5zmhhnc8al6arrra2j21pc"; libraryHaskellDepends = [ aivika aivika-transformers array base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -22568,7 +23387,6 @@ self: { homepage = "http://www.aivikasoft.com"; description = "Parallel distributed discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-experiment" = callPackage @@ -22577,8 +23395,8 @@ self: { }: mkDerivation { pname = "aivika-experiment"; - version = "5.1"; - sha256 = "1zqw54pinc2cav0svhiwzqkw5s90sdj6sdxkaagjanz0myp4pf1w"; + version = "5.3"; + sha256 = "0ch2h7scg43x5mdmvqyjabh96vhshz94r8b58pi9ikp7w4rm7wk9"; libraryHaskellDepends = [ aivika aivika-transformers base containers directory filepath mtl network-uri parallel-io split @@ -22612,8 +23430,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "5.1"; - sha256 = "1g6ax9a8mywqwhazlx888zrapnl4m2pcar1kjbjxga0j9p8qxrpl"; + version = "5.3"; + sha256 = "10m85nx1jdvv3vyg6rmpjiajpch4pnyamh3vxw6b4dwn140zlqq8"; libraryHaskellDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split @@ -22638,6 +23456,7 @@ self: { homepage = "http://www.aivikasoft.com"; description = "Diagrams-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-gpss" = callPackage @@ -22646,8 +23465,8 @@ self: { }: mkDerivation { pname = "aivika-gpss"; - version = "0.4"; - sha256 = "0yrpbq0ppck1z9d7whzfknia16sac6jpr80mi8bw6g65hjcg3z1g"; + version = "0.6.1"; + sha256 = "06jx9340rr8a23gpzwwzqv0baqnv62w8cf8slcmcmlr0k84lg4ca"; libraryHaskellDepends = [ aivika aivika-transformers base containers hashable mtl unordered-containers @@ -22692,15 +23511,16 @@ self: { }) {}; "aivika-transformers" = callPackage - ({ mkDerivation, aivika, array, base, containers, mtl, mwc-random - , random, vector + ({ mkDerivation, aivika, array, base, containers, exceptions, mtl + , mwc-random, random, semigroups, vector }: mkDerivation { pname = "aivika-transformers"; - version = "5.4"; - sha256 = "0if4i3jsc0bf8l0grdrijyzs5h5c85nq328gkwpmzpmawzssbqr5"; + version = "5.7"; + sha256 = "1nwffb0x7lzl52xqki415dgmag9dg66jv45qirdnmkjs33x0by3r"; libraryHaskellDepends = [ - aivika array base containers mtl mwc-random random vector + aivika array base containers exceptions mtl mwc-random random + semigroups vector ]; homepage = "http://www.aivikasoft.com"; description = "Transformers for the Aivika simulation library"; @@ -22740,8 +23560,8 @@ self: { ({ mkDerivation, base, c2hs, mtl, openal }: mkDerivation { pname = "al"; - version = "0.1.4.1"; - sha256 = "1mmka0cc9kl6s3sq6jgw82qk77psym2yibr922f6c3k3b528rr9h"; + version = "0.1.4.2"; + sha256 = "1lpcdh2dak1r9lwd6irjs8p56p1fjphq58ixwjwbg9syl2rz7w4b"; libraryHaskellDepends = [ base mtl ]; libraryPkgconfigDepends = [ openal ]; libraryToolDepends = [ c2hs ]; @@ -22783,24 +23603,6 @@ self: { }) {}; "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.5"; - sha256 = "1fmdn30nmz0gqa3kqyc675msmwvrdvbissfbgax19xma3yppafal"; - 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; - }) {}; - - "alerta_0_1_0_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, containers , data-default, http-api-data, http-client, servant, servant-client , servant-client-core, servant-server, text, time @@ -22834,17 +23636,15 @@ self: { "alex" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process - , QuickCheck }: mkDerivation { pname = "alex"; - version = "3.2.3"; - sha256 = "0bi1cs9b8ir33h1fl6x2xw4ymygapqbr713ridpf7rmk2wa7jqqs"; + version = "3.2.4"; + sha256 = "0cpjixgsr0b2x4s6hz4aa6gnmjw9i7xd9nlfi8m37zqlidq4v3nm"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - array base containers directory QuickCheck - ]; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base containers directory ]; executableToolDepends = [ happy ]; testHaskellDepends = [ base process ]; homepage = "http://www.haskell.org/alex/"; @@ -22860,6 +23660,8 @@ self: { pname = "alex-meta"; version = "0.3.0.9"; sha256 = "0882p9j272dhq94kgmg6pnxzi3qfwa01fk7npsz748rgx6ggycyr"; + revision = "1"; + editedCabalFile = "0p6j9ilvn5gjx0n7v1war0z8rlmcz1qnvpc8lcik8l7baydz6qjl"; libraryHaskellDepends = [ array base containers haskell-src-meta QuickCheck template-haskell ]; @@ -22878,6 +23680,7 @@ self: { homepage = "https://www.asayers.com/"; description = "Collection of useful functions for writing console applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-tools" = callPackage @@ -22907,6 +23710,7 @@ self: { ]; description = "utility library for Alfred version 2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alg" = callPackage @@ -22958,8 +23762,8 @@ self: { }: mkDerivation { pname = "algebra"; - version = "4.3"; - sha256 = "1h61lvy9fkkzm2gpr78b09bid0yi1fd7xa4mx90jy2sd16gq6k1r"; + version = "4.3.1"; + sha256 = "090jaipyx5pcav2wqcqzds51fwx49l4c9cpp9nnk16bgkf92z615"; libraryHaskellDepends = [ adjunctions array base containers distributive mtl nats semigroupoids semigroups tagged transformers void @@ -23028,13 +23832,12 @@ self: { ({ mkDerivation, base, syb, template-haskell }: mkDerivation { pname = "algebraic-classes"; - version = "0.8"; - sha256 = "1ihrxm3gn4558wlwlm8wagq133ipy04kc3d6wsx0an83wyrcnz1w"; + version = "0.9.1"; + sha256 = "129s5690wc4w92sg246pcmnradzgfdddqpv961a53k2cx9ynmvc6"; 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "algebraic-graphs" = callPackage @@ -23053,21 +23856,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "algebraic-graphs_0_1_1_1" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, containers + , criterion, deepseq, extra, QuickCheck + }: + mkDerivation { + pname = "algebraic-graphs"; + version = "0.1.1.1"; + sha256 = "0c8jrp0z3ibla7isbn1v5nhfka56hwq8h10r7h3vca53yzbafiw7"; + libraryHaskellDepends = [ + array base base-compat containers deepseq + ]; + testHaskellDepends = [ + base base-compat base-orphans containers extra QuickCheck + ]; + benchmarkHaskellDepends = [ + base base-compat containers criterion + ]; + homepage = "https://github.com/snowleopard/alga"; + description = "A library for algebraic graph construction and transformation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "algebraic-prelude" = callPackage ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { pname = "algebraic-prelude"; - version = "0.1.0.1"; - sha256 = "0b8rwbyy9ilykd847rxv37k1hbrhkmzv2kni0dyc1m3ijnr55c4b"; + version = "0.1.1.0"; + sha256 = "0b0fbwxnlm91dlkg3qs27w5iz0ibf7bpzj7m3h0i6v6s1dgr29l9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebra base basic-prelude lens semigroups ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/konn/algebraic-prelude#readme"; description = "Algebraically structured Prelude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "algo-s" = callPackage @@ -23375,6 +24201,27 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; + "alsa-pcm_0_6_1" = callPackage + ({ mkDerivation, alsa-core, alsaLib, array, base + , extensible-exceptions, sample-frame, semigroups, storable-record + }: + mkDerivation { + pname = "alsa-pcm"; + version = "0.6.1"; + sha256 = "0pafjds9xrhzwv3xz9qcknm9f2plz3bvqqjlznss1alhgf7pcga5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alsa-core array base extensible-exceptions sample-frame semigroups + storable-record + ]; + libraryPkgconfigDepends = [ alsaLib ]; + homepage = "http://www.haskell.org/haskellwiki/ALSA"; + description = "Binding to the ALSA Library API (PCM audio)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) alsaLib;}; + "alsa-pcm-tests" = callPackage ({ mkDerivation, alsa, base }: mkDerivation { @@ -23446,6 +24293,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Extra utilities for alternatives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alternative-io" = callPackage @@ -23482,8 +24330,8 @@ self: { ({ mkDerivation, base, mmorph, transformers }: mkDerivation { pname = "alternators"; - version = "0.1.1.1"; - sha256 = "03ivs1iwqgyf5slhyv0alkvik3jn49dqbhqs1vi4h9gwdc9d8l4n"; + version = "0.1.2.0"; + sha256 = "19i2yhi6nsd2nl7sisbj6wrii5nw1z7xj7zk0fjmivyclnj03r5g"; libraryHaskellDepends = [ base mmorph transformers ]; homepage = "https://github.com/louispan/alternators#readme"; description = "Handy functions when using transformers"; @@ -23503,6 +24351,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "alto" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, cryptohash-sha256, directory, exceptions, filepath + , lens, list-tries, MonadRandom, mtl, random, random-string, scrypt + , servant-server, text, warp + }: + mkDerivation { + pname = "alto"; + version = "0"; + sha256 = "0515cghmkrw5szbnafwp3mqglrg5c44cbly8jnvk9z9gf9kdr26k"; + revision = "1"; + editedCabalFile = "0vxcy55zx70ibws59d1n5p86awrhb83xb06yw6iz0hkp7cwk52i2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers + cryptohash-sha256 directory exceptions filepath lens list-tries + MonadRandom mtl random random-string scrypt servant-server text + ]; + executableHaskellDepends = [ base warp ]; + homepage = "https://oss.xkcd.com/"; + description = "Implement a menu experience fit for web users"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alure" = callPackage ({ mkDerivation, alure, base, OpenAL }: mkDerivation { @@ -23588,8 +24462,10 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "1.4.5"; - sha256 = "0p48ra5hns9kpnsgr40imj0zgnd311ww2kk4lz4nnjpa1ppvgrw6"; + version = "1.5.0"; + sha256 = "0g5fb1kwydhhi4pvp4skc0l26gy0kdpbrl3pixmnml5d2fxa86pw"; + revision = "1"; + editedCabalFile = "0v4wfwrm0zjzm1g2gw9qi521hlvzg26dm79x03zy8i2aqg8rqgri"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-conduit ini mmorph monad-control mtl resourcet @@ -23598,7 +24474,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-apigateway" = callPackage @@ -23607,8 +24484,8 @@ self: { }: mkDerivation { pname = "amazonka-apigateway"; - version = "1.4.5"; - sha256 = "0jhf9lihkipb4hsskrzwczif4zr7v70gsijrvvq3snxp69w4zkfc"; + version = "1.5.0"; + sha256 = "1yamp1wlhji496sd0c6gkilx6n3m59wwvxpfh3vpy4wv93xh5494"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23616,7 +24493,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon API Gateway SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-application-autoscaling" = callPackage @@ -23625,8 +24503,8 @@ self: { }: mkDerivation { pname = "amazonka-application-autoscaling"; - version = "1.4.5"; - sha256 = "0kn2xsgmqgdmq4wf0j2x02kkaykbis2ipa6slph7jhpbx0dybd76"; + version = "1.5.0"; + sha256 = "0iwrzk9wfnf46as45lv31qxghlbq823yphkw0dzh39vmqyc2zmfn"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23634,7 +24512,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Application Auto Scaling SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-appstream" = callPackage @@ -23643,8 +24522,8 @@ self: { }: mkDerivation { pname = "amazonka-appstream"; - version = "1.4.5"; - sha256 = "0z2ih9vnyf81hlwa3ybyzmv2cziqbx677idyk3m91pxgw9hdl5bz"; + version = "1.5.0"; + sha256 = "05g5xz68v3azvh8f5hcqijvif6g4jm0bmb3y9fgcn21f4lzl6ibc"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23652,7 +24531,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon AppStream SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-athena" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-athena"; + version = "1.5.0"; + sha256 = "0chg6wgp20qlpz9w5sryy9i2cxbnb9zdh2a6sg94vrivl3q19d5d"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Athena SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-autoscaling" = callPackage @@ -23661,8 +24560,8 @@ self: { }: mkDerivation { pname = "amazonka-autoscaling"; - version = "1.4.5"; - sha256 = "1nkbkqrxrifpwh6471k80rgj7rlpl1cai6gfilidr3pqgygvz1zq"; + version = "1.5.0"; + sha256 = "1jmpz15r5sdc3rmvbhs4jla3qnafyqaq1vyngn9276a6ks338ivk"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23670,7 +24569,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-batch" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-batch"; + version = "1.5.0"; + sha256 = "0dchh04181kabhx1nl5cqw3kcsznggyrkzyrx028nfslww3as3mq"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Batch SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-budgets" = callPackage @@ -23679,8 +24598,8 @@ self: { }: mkDerivation { pname = "amazonka-budgets"; - version = "1.4.5"; - sha256 = "12qxxbkv97x85clw733rskdygvpfz1b10j8q9ag5ps71axh3ndm1"; + version = "1.5.0"; + sha256 = "1kyi34iwg4l85a9ipkbjdac5wb2ij5rb1a49zww0izd09x3yx68a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23688,7 +24607,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Budgets SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-certificatemanager" = callPackage @@ -23697,8 +24617,8 @@ self: { }: mkDerivation { pname = "amazonka-certificatemanager"; - version = "1.4.5"; - sha256 = "1c1j0rnf7fz6m969zj475hqwc0784fwlpfcp640j9ss4004w344r"; + version = "1.5.0"; + sha256 = "0hnw9s9kzkrq9iv940g6zkaljw91xk9d6pya62g2y6dzp8ych5kq"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23706,7 +24626,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Certificate Manager SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-clouddirectory" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-clouddirectory"; + version = "1.5.0"; + sha256 = "157myilbdk79nfyxvyljpajf3mlgqqhnypbp7psd41ypg87ndycd"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon CloudDirectory SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudformation" = callPackage @@ -23715,8 +24655,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudformation"; - version = "1.4.5"; - sha256 = "1xmpvmicn3kr9q4s3h5hdv4q83yrjh8hkb2ifym6nf3fwhg4ghps"; + version = "1.5.0"; + sha256 = "1s43xpwf26i9w2q6c2m3jcg8xr3wpza799krszr1cmhaivi1xmvi"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23724,7 +24664,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudfront" = callPackage @@ -23733,8 +24674,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudfront"; - version = "1.4.5"; - sha256 = "1ldalnim14ry62q9w95psz2i2b0hsd3rnkf9b9gs81xnbagg928f"; + version = "1.5.0"; + sha256 = "05ai52ljar9j8jwlp5bp38zpfdjybsfdm6y3yp7if86md99sq9b0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23742,7 +24683,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudhsm" = callPackage @@ -23751,8 +24693,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "1.4.5"; - sha256 = "0dx8fwy8kl1vafnncjjwxhiw5d72gyj50rv57vhagpyk6waaj501"; + version = "1.5.0"; + sha256 = "1644ldnp11wwn17xilkinm3bq8g9w4zfvyi6d95737xm1gr8gmx5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23760,7 +24702,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-cloudhsmv2" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-cloudhsmv2"; + version = "1.5.0"; + sha256 = "0ix51kbs1ijwlzdy1drinmmyk6bcwrih2azrkqkd27fr6krnhs67"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon CloudHSM V2 SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch" = callPackage @@ -23769,8 +24731,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "1.4.5"; - sha256 = "0nrjpangzwrllr4rrpc72ha2cj98dsrnslvgjqwf90hndrcjpi32"; + version = "1.5.0"; + sha256 = "1pyxz2k7r25wq3pmxgknasxjimszy0f1sf6rwlm7sp412rvfm09c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23778,7 +24740,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch-domains" = callPackage @@ -23787,8 +24750,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "1.4.5"; - sha256 = "12h2x8pj5ka4ay79v01aa1cafnh8nr0m1frpjnlk1knnv6bh62g0"; + version = "1.5.0"; + sha256 = "0kzl1pjzlijvc1m9yv8rf0zj6lwhk7qjgpmdvh8kbzdfpm8ynsrh"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23796,7 +24759,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudtrail" = callPackage @@ -23805,8 +24769,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "1.4.5"; - sha256 = "0xn2rkxcqkrlkafnmriykxadjzs0lgx8pa2mcfjyj0k4lv8hps25"; + version = "1.5.0"; + sha256 = "1m04h5n6hb2vg8hp2ikbdijv3a2mykzpafa1skg4gvy4qrbm5008"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23814,7 +24778,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch" = callPackage @@ -23823,8 +24788,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "1.4.5"; - sha256 = "0092ihps4z99mmp6mwz5sxa8q0bp8qkcihkz9i6mpva9v7wbbrh0"; + version = "1.5.0"; + sha256 = "0n3v9li9fafhmwjfdydj8s495ni28qqf4xx13w7hflv10l6g2c25"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23832,7 +24797,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch-events" = callPackage @@ -23841,8 +24807,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch-events"; - version = "1.4.5"; - sha256 = "0zgwr6yw1vd8ckab9zdjf3m21ckl7is9mggy40l4w43ckq8vi8mi"; + version = "1.5.0"; + sha256 = "0q40yvj7bz5pkkr2w7g9nxspb2xbjdjr6nwnshpgkdjz61pcqb0p"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23850,7 +24816,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Events SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch-logs" = callPackage @@ -23859,8 +24826,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "1.4.5"; - sha256 = "0clhg49d9x68z8mcjrz3w3ag3dw96rmday0bfimj3vpnwcygpkqh"; + version = "1.5.0"; + sha256 = "05hh0lbxwj0cfwv38j4bnp5chjdvsgxgsh8whpza90k45v8kvjnr"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23868,7 +24835,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codebuild" = callPackage @@ -23877,8 +24845,8 @@ self: { }: mkDerivation { pname = "amazonka-codebuild"; - version = "1.4.5"; - sha256 = "1l7xga491f6zw0gnz8rz4cfmcci05vxfizxhscdihw915ch6whi4"; + version = "1.5.0"; + sha256 = "1k85rrcfic92bpg2x20h4apad9f2pgqq6gggv7xs6dga8j596r21"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23886,7 +24854,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeBuild SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codecommit" = callPackage @@ -23895,8 +24864,8 @@ self: { }: mkDerivation { pname = "amazonka-codecommit"; - version = "1.4.5"; - sha256 = "0qw0cqdcx1gb2w8g2q94kgxs0n9jng36fx7yrza809prxlnfv3zw"; + version = "1.5.0"; + sha256 = "0yr4h2ai1v0a2w26ms7v6vpzbn1k4wvchgfip6pqfsfbswq8vpy2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23904,7 +24873,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeCommit SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codedeploy" = callPackage @@ -23913,8 +24883,8 @@ self: { }: mkDerivation { pname = "amazonka-codedeploy"; - version = "1.4.5"; - sha256 = "1dvif2grws2mm7m0vzdhbdjygbzdd53nvzxiylbc211m1lp25w5i"; + version = "1.5.0"; + sha256 = "08q5jgxs3aff5b8bxv1y01rjwrm7j8s8z05kwj84gzpfjw98i8s8"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23922,7 +24892,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codepipeline" = callPackage @@ -23931,8 +24902,8 @@ self: { }: mkDerivation { pname = "amazonka-codepipeline"; - version = "1.4.5"; - sha256 = "1v268rjryqcx4mzxp6vppjqjbi39x36qh2c3pb5rdjddy7wah236"; + version = "1.5.0"; + sha256 = "0j99cgv1p5p7hxn0zc5s0d51l54bdkq4sd54q9p2a64fj6wa39ap"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23940,7 +24911,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodePipeline SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-codestar" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-codestar"; + version = "1.5.0"; + sha256 = "085m8bwvhws3svalmrxjk737ml2f5rr4fajzg7c3n3f7n3jz4qjd"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon CodeStar SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-identity" = callPackage @@ -23949,8 +24940,8 @@ self: { }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "1.4.5"; - sha256 = "01hdyp65arhjn4bdlbgfbyfafmqx0gw4p4158mlhl30v9rlpkb1c"; + version = "1.5.0"; + sha256 = "08l3nzggjhjb2gr1ny0i3as5gb1rw6wkggr4i8hjvg2w68qydrm7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23958,7 +24949,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-idp" = callPackage @@ -23967,8 +24959,8 @@ self: { }: mkDerivation { pname = "amazonka-cognito-idp"; - version = "1.4.5"; - sha256 = "06362bbqqndnk26xwkhszmrlgl6qd2nj5g1217ixzv27id4p7wmw"; + version = "1.5.0"; + sha256 = "18slhckyfq0mkwd2mv6g5dpas21q267sbqrlq2hn8cfglxcbjz3w"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23976,7 +24968,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity Provider SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-sync" = callPackage @@ -23985,8 +24978,8 @@ self: { }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "1.4.5"; - sha256 = "1psf6jk61i2632wfpk9gclkrbv0g21ddjn2gj1i0333rchqm4c8k"; + version = "1.5.0"; + sha256 = "0y3n8k9nfc7pnx5dbxnv9mcwcgmg7lf51sf2629zlbp4gf3pabga"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23994,7 +24987,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-config" = callPackage @@ -24003,8 +24997,8 @@ self: { }: mkDerivation { pname = "amazonka-config"; - version = "1.4.5"; - sha256 = "095ygx63drvif2magxnshv1zrhbsc1zzbajld7p8bcggysgmnp3p"; + version = "1.5.0"; + sha256 = "1lniwdf3fr33skld9916vqsm03q0lghcna8ywsv76rz68hnb6nb3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24012,22 +25006,25 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , case-insensitive, conduit, conduit-extra, cryptonite, deepseq - , exceptions, hashable, http-conduit, http-types, lens, memory, mtl - , QuickCheck, quickcheck-unicode, resourcet, scientific, semigroups - , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, transformers, transformers-compat - , unordered-containers, xml-conduit, xml-types + , case-insensitive, conduit, conduit-extra, cryptonite + , data-ordlist, deepseq, exceptions, hashable, http-conduit + , http-types, lens, memory, mtl, QuickCheck, quickcheck-unicode + , resourcet, scientific, semigroups, tagged, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, time, transformers + , transformers-compat, unordered-containers, xml-conduit, xml-types }: mkDerivation { pname = "amazonka-core"; - version = "1.4.5"; - sha256 = "0zzfrn4m7ixs7dxw2n7d6ajfb9h8bnbk8pw1hw8w48nprv8f24yv"; + version = "1.5.0"; + sha256 = "173mdmk3p9jqnskjf5g9r1kr568plrmshb6p17cq11n1wnngkxnk"; + revision = "2"; + editedCabalFile = "1y1ian4wimsbng4c3ix8jd3pn3b0xhydzwv87blck4sgl41w83vl"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite deepseq exceptions hashable @@ -24036,13 +25033,33 @@ self: { unordered-containers xml-conduit xml-types ]; testHaskellDepends = [ - aeson base bytestring case-insensitive http-types QuickCheck - quickcheck-unicode tasty tasty-hunit tasty-quickcheck - template-haskell text time + aeson base bytestring case-insensitive conduit data-ordlist + http-conduit http-types lens QuickCheck quickcheck-unicode tasty + tasty-hunit tasty-quickcheck template-haskell text time ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Core data types and functionality for Amazonka libraries"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-cur" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-cur"; + version = "1.5.0"; + sha256 = "1ndj6iyi6j9f1py791gcp5mi76h80vzvsclrwvyvz52nnfri6cmc"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Cost and Usage Report Service SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-datapipeline" = callPackage @@ -24051,8 +25068,8 @@ self: { }: mkDerivation { pname = "amazonka-datapipeline"; - version = "1.4.5"; - sha256 = "1dawy8zzzcgmwl82byv4avv6126jd7zk53yix1bbyly5lfli5215"; + version = "1.5.0"; + sha256 = "0fhnff3w8rsng0rzr6l7a3z98spfbn8zq348p23ci0m5v2qi6jk1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24060,7 +25077,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-devicefarm" = callPackage @@ -24069,8 +25087,8 @@ self: { }: mkDerivation { pname = "amazonka-devicefarm"; - version = "1.4.5"; - sha256 = "00l88pd9sixyr53vfy67fg2z2zy3d9s5njpapa302dizr5s2jiza"; + version = "1.5.0"; + sha256 = "1c8vh1aalh48fl810ymk80k8g22dhzvcx9a2q360fm3m11wg1qqf"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24078,7 +25096,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Device Farm SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-directconnect" = callPackage @@ -24087,8 +25106,8 @@ self: { }: mkDerivation { pname = "amazonka-directconnect"; - version = "1.4.5"; - sha256 = "1afyndqyvg2rysmzpblhhn3ci3g34mdgzq14zh3hdmj26da9w4sj"; + version = "1.5.0"; + sha256 = "14kbx10g3izyqaqyrd8gjr6hpljv7v6wafp0dsrgn54275mvjq10"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24096,7 +25115,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-discovery" = callPackage @@ -24105,8 +25125,8 @@ self: { }: mkDerivation { pname = "amazonka-discovery"; - version = "1.4.5"; - sha256 = "1f5dpk6ppky1dinz9gaxvqfzlas2fjvggiizwv64nwysis9q2myz"; + version = "1.5.0"; + sha256 = "0m4kry9vx9jl62adaa9pgxcmaw9c2kxs48krdv5n5vx3ynqf4856"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24114,7 +25134,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Application Discovery Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dms" = callPackage @@ -24123,8 +25144,8 @@ self: { }: mkDerivation { pname = "amazonka-dms"; - version = "1.4.5"; - sha256 = "1z3ia6qzy2qqhrdccyv208a2jx4jrsz9i6y17rwb8v34bjvhjhik"; + version = "1.5.0"; + sha256 = "1d9llyykrd4n6iqhs15f6jvzv8l61w8kalljx7skcxy8q98ydlh2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24132,7 +25153,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Database Migration Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ds" = callPackage @@ -24141,8 +25163,8 @@ self: { }: mkDerivation { pname = "amazonka-ds"; - version = "1.4.5"; - sha256 = "1pa4d73kx1x8al24qf939l2g7yl2jkv8k1q8pjlkacbra93z64g7"; + version = "1.5.0"; + sha256 = "0mr9njmqwrlljwr78i3g4cdrjdyy3a516vvxj7754h5cmg0vbicj"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24150,7 +25172,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Directory Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb" = callPackage @@ -24159,8 +25182,8 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb"; - version = "1.4.5"; - sha256 = "0qnppij7qs3zmj52p9aai1hxqaz2jqaa80a0l7rv5xra05d3vckl"; + version = "1.5.0"; + sha256 = "1j11qc018z6pgcwm80v0jknfrasp4cx6l0f8kv804crasbf2y0n8"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24168,7 +25191,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-dynamodb-dax" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-dynamodb-dax"; + version = "1.5.0"; + sha256 = "036ipy0n16vxqy8agzvias7v4jq1gkcyqh0ppc5dcznsc4mklr0d"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon DynamoDB Accelerator (DAX) SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb-streams" = callPackage @@ -24177,8 +25220,8 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb-streams"; - version = "1.4.5"; - sha256 = "1vgyw5sl31v388yl51jzkfacf5k5cic97h7lnsq65kgvcgbl18w3"; + version = "1.5.0"; + sha256 = "0j80jm7xmfsjxnfa6zj0hfvzjv89clccdqalxn76mzc646qvgki1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24186,7 +25229,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB Streams SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ec2" = callPackage @@ -24195,8 +25239,8 @@ self: { }: mkDerivation { pname = "amazonka-ec2"; - version = "1.4.5"; - sha256 = "166l1i8nc98wn081mifwiyk7pr9n5mxc9axmk6vnjvbvjj7r7974"; + version = "1.5.0"; + sha256 = "0h8zw8jrdh6a4jf92pg5j9lcx242y88iz8spfs9djripv13hs3dh"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24204,7 +25248,7 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -24214,8 +25258,8 @@ self: { }: mkDerivation { pname = "amazonka-ecr"; - version = "1.4.5"; - sha256 = "0339zm44b6g0mlv2bd0xvnkd7gw182vh2cw0yj3jlh12xaa11yn3"; + version = "1.5.0"; + sha256 = "0n6a9zbc8a83l5dnma61gl57zk0sjn1276ds1378ymnj9l5pkgb8"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24223,7 +25267,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Registry SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecs" = callPackage @@ -24232,8 +25277,8 @@ self: { }: mkDerivation { pname = "amazonka-ecs"; - version = "1.4.5"; - sha256 = "0564w843rkxx5sjxcd86bz0cc4ip6ikh0w3vrhx15sgf90j5jwms"; + version = "1.5.0"; + sha256 = "08m2nds8d7pnvjk5s3f0kmrk0ml2ryzichyc4m0q69pc4yyakvj5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24241,7 +25286,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-efs" = callPackage @@ -24250,8 +25296,8 @@ self: { }: mkDerivation { pname = "amazonka-efs"; - version = "1.4.5"; - sha256 = "0l1cnn636j819f8nnzhs7pb8lj74ahxqfmxsjbd9794wvi0a3yz8"; + version = "1.5.0"; + sha256 = "0b9ghl8i02gai4i0dhqv6ys8cblw6nr5338sg1zrkhlsdpkln1j5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24259,7 +25305,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic File System SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticache" = callPackage @@ -24268,8 +25315,8 @@ self: { }: mkDerivation { pname = "amazonka-elasticache"; - version = "1.4.5"; - sha256 = "1fs5prhw55phdw04bpx4nqkmrdxkhjxvyarkp4x47c59y1x2snbg"; + version = "1.5.0"; + sha256 = "05h1i0kbni000wwk4d80iajzqsa7s7qwxy4yybqn82r9gqgc9r75"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24277,7 +25324,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticbeanstalk" = callPackage @@ -24286,8 +25334,8 @@ self: { }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "1.4.5"; - sha256 = "1y2rvy1gnxq76girapsfnaw5cbkhpqnfsazqgxasnldrjcdjkb73"; + version = "1.5.0"; + sha256 = "1cv0sf7x7a4b6fky28454kszzplcbmm1fk7c9b6pm4sxipv2qrbl"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24295,7 +25343,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticsearch" = callPackage @@ -24304,8 +25353,8 @@ self: { }: mkDerivation { pname = "amazonka-elasticsearch"; - version = "1.4.5"; - sha256 = "00sk4nwkdr1m23zy47gy3zfcss8m4rxzfj3h6nsjgpkg4yzziidx"; + version = "1.5.0"; + sha256 = "1mylfs06jx6ziajnm55z0851zwmfc7nzwcimp4c62wk95s9ydwhp"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24313,7 +25362,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elasticsearch Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elastictranscoder" = callPackage @@ -24322,8 +25372,8 @@ self: { }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "1.4.5"; - sha256 = "0fqj5j71n836xpkx15jmjg3fmqs64snclx55rwlkzs5sfann0rrh"; + version = "1.5.0"; + sha256 = "12zkvqmygab6c5j4sf52hzn2fkvmsasmbfw0wq6g7laxdhj6c151"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24331,7 +25381,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elb" = callPackage @@ -24340,8 +25391,8 @@ self: { }: mkDerivation { pname = "amazonka-elb"; - version = "1.4.5"; - sha256 = "0qpb239fzpnnap2yi9a1dlqa8pj1ixkgckrinjfgz2697zwnxjp6"; + version = "1.5.0"; + sha256 = "1zjlvsijp4j7kvbbdwwshr92sh173b8z0k42jwh6zcdk086k8v0c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24349,7 +25400,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elbv2" = callPackage @@ -24358,8 +25410,8 @@ self: { }: mkDerivation { pname = "amazonka-elbv2"; - version = "1.4.5"; - sha256 = "0iyqbpkjv6d8v8j3f07vx41p1jsa8s6z0irxmp183gl55x4qsk7s"; + version = "1.5.0"; + sha256 = "0n6q0dzwmdbkhjn8ik2p156w4kj0lwr78xy3f9sh5g9c3v3wfqxh"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24367,7 +25419,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-emr" = callPackage @@ -24376,8 +25429,8 @@ self: { }: mkDerivation { pname = "amazonka-emr"; - version = "1.4.5"; - sha256 = "1dr4x7h2vah52zvdldzkqn6y9sb5iinwnn59amz5wlrd8fzg169c"; + version = "1.5.0"; + sha256 = "0q5vc4mk8709sfcqgrwilp0vp3n7awnwcanqk46wbml6a0jr4nsw"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24385,7 +25438,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-gamelift" = callPackage @@ -24394,8 +25448,8 @@ self: { }: mkDerivation { pname = "amazonka-gamelift"; - version = "1.4.5"; - sha256 = "0ll1vh41dvw7pkif3l8fxg2apypgimwpacnvq5cgdwsihrslfn70"; + version = "1.5.0"; + sha256 = "1nklqnrgkkq7465c3gz0ljb1gyi75d634yb5s39a1nynhpdiqyxq"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24403,7 +25457,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon GameLift SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-glacier" = callPackage @@ -24412,8 +25467,8 @@ self: { }: mkDerivation { pname = "amazonka-glacier"; - version = "1.4.5"; - sha256 = "1qsjmlsqb1lqj8yvp5pcv790a82r8mfmwa54jq3lffzs06l7v8cw"; + version = "1.5.0"; + sha256 = "1yrhjyn0596r3k59a42pma2v2fhdgwibasw10zd6gpfrcp496iq2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24421,7 +25476,46 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-glue" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-glue"; + version = "1.5.0"; + sha256 = "0hxs5rnri2f5l8vhkn65in2jmyjdd5ckxywdvzwkdbdh3byp9vyc"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Glue SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-greengrass" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-greengrass"; + version = "1.5.0"; + sha256 = "1l6nc2cp2vszb1hd4s2fmz0lbrjln3kscqk2wpfjp774hcjvl2zx"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Greengrass SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-health" = callPackage @@ -24430,8 +25524,8 @@ self: { }: mkDerivation { pname = "amazonka-health"; - version = "1.4.5"; - sha256 = "0q9f3rn6gakknq01py5im66hqxa2p7byqjrcm5jwja9kh4ryy7gc"; + version = "1.5.0"; + sha256 = "07qla81a60k0dgx6iyy617ri6afx0ip68b0b36n7ww3i81jl6qhk"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24439,7 +25533,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Health APIs and Notifications SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iam" = callPackage @@ -24448,8 +25543,8 @@ self: { }: mkDerivation { pname = "amazonka-iam"; - version = "1.4.5"; - sha256 = "1jk8j1r9m0czd7i55x2ndpc1s5j55yi9xb43jsd4bkmxzs0n0z63"; + version = "1.5.0"; + sha256 = "1vmwh4k2bhhf5d7lrk095xhc65pclqig3sk8j7vgxl9nil26cpcs"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24457,7 +25552,29 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-iam-policy" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, doctest, hspec, profunctors, scientific, text, time + }: + mkDerivation { + pname = "amazonka-iam-policy"; + version = "0.0.1"; + sha256 = "1mjc5ym604n9bi9fl7b0581i5z7vy12ri99lz3imz1k3dhr6xwga"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring profunctors scientific text + time + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring doctest hspec + ]; + homepage = "https://github.com/brendanhay/amazonka-iam-policy"; + description = "Amazon IAM Policy Document DSL and Combinators"; + license = stdenv.lib.licenses.mpl20; }) {}; "amazonka-importexport" = callPackage @@ -24466,8 +25583,8 @@ self: { }: mkDerivation { pname = "amazonka-importexport"; - version = "1.4.5"; - sha256 = "1v65b4wvs0lvllg6jnhafz6w8b72az1iqm482qf5725gy7xk3c94"; + version = "1.5.0"; + sha256 = "0sfm6k600vakjx0jrvqwm3mx2hc16nn24f1v1k1fixm2h0kb6s9l"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24475,7 +25592,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-inspector" = callPackage @@ -24484,8 +25602,8 @@ self: { }: mkDerivation { pname = "amazonka-inspector"; - version = "1.4.5"; - sha256 = "12m7kafjxl3yin65jz2plnvhsllqssvsziddl8v32p5xbx9zj244"; + version = "1.5.0"; + sha256 = "0ips5f6y58dglx4igxak3ixsyny383s8nxw4dcwky12b5qm8pn36"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24493,7 +25611,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Inspector SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iot" = callPackage @@ -24502,8 +25621,8 @@ self: { }: mkDerivation { pname = "amazonka-iot"; - version = "1.4.5"; - sha256 = "14v2sv9z38pddhkcsn8qvxk0i3gm5a96qqrc5gbbqyy67xsbpj5s"; + version = "1.5.0"; + sha256 = "0m6dvvxvffb136znnn32jnzc1jvv57sqwb5br7jx2j0nhjvc2dlx"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24511,7 +25630,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon IoT SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iot-dataplane" = callPackage @@ -24520,8 +25640,8 @@ self: { }: mkDerivation { pname = "amazonka-iot-dataplane"; - version = "1.4.5"; - sha256 = "0qnrskv59zh6w5y5y980f83rvkfvjcvrc01n2vxzwd7m0lnw4g9v"; + version = "1.5.0"; + sha256 = "0423d6fpkdby9jq6sya5bmq77ws1mrn7pfaajajixi5mqmsihw25"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24529,7 +25649,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon IoT Data Plane SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis" = callPackage @@ -24538,8 +25659,8 @@ self: { }: mkDerivation { pname = "amazonka-kinesis"; - version = "1.4.5"; - sha256 = "0kd23qphxg8cpj84z08cx71y73df0nvnwmry5l4fijdrykm1wrk9"; + version = "1.5.0"; + sha256 = "07dxdbhwgr33649b6lgr3zz6q4cdzspapb0bjg1rxqz3vnbxdmbc"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24547,7 +25668,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-analytics" = callPackage @@ -24556,8 +25678,8 @@ self: { }: mkDerivation { pname = "amazonka-kinesis-analytics"; - version = "1.4.5"; - sha256 = "12lhwmivpwr8mw8xw1kn3njxaha7m50izzgi4kicmcjiv7c7x49n"; + version = "1.5.0"; + sha256 = "06pbzbrmysj9a61d5kc4a8n5wfpd1lhxm04cqpnrf86lqn89grlr"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24565,7 +25687,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Analytics SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-firehose" = callPackage @@ -24574,8 +25697,8 @@ self: { }: mkDerivation { pname = "amazonka-kinesis-firehose"; - version = "1.4.5"; - sha256 = "00z19k934xpxkig41q70ph3l5mm09ql909z3k2fvjyagwlbcrp7w"; + version = "1.5.0"; + sha256 = "1him47imazymn50820qhdis3z2ini55xryga0ywy9j26qnwzx03z"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24583,7 +25706,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Firehose SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kms" = callPackage @@ -24592,8 +25716,8 @@ self: { }: mkDerivation { pname = "amazonka-kms"; - version = "1.4.5"; - sha256 = "1xphd0f7s29lq2076zf5lxbdhhqbd1syjnmmg07ldvb3lx5n2y45"; + version = "1.5.0"; + sha256 = "0ljpq0z5nw30lmyhwlbmzcccm2h6p45k3lr8k07akwa4p9rw8km4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24601,7 +25725,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lambda" = callPackage @@ -24610,8 +25735,8 @@ self: { }: mkDerivation { pname = "amazonka-lambda"; - version = "1.4.5"; - sha256 = "08ng97wnlhbdir46bf9q18f1y02dkfd9nq3qha25qzbqzx0al45j"; + version = "1.5.0"; + sha256 = "04lw538kpkzs9wmil8h6sjqzw55pjywnvrysdlac83nv0jdm3rmx"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24619,7 +25744,46 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-lex-models" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-lex-models"; + version = "1.5.0"; + sha256 = "15k6r8vc6ijlnmj7dqlip1nqixmf1ns3pjd99p7x4kqdq8p4qzj9"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Lex Model Building Service SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-lex-runtime" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-lex-runtime"; + version = "1.5.0"; + sha256 = "07xx971q204hkk6gd9bgs2025czk6zzk5s702g82pd6j5r5i1slb"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Lex Runtime Service SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lightsail" = callPackage @@ -24628,8 +25792,8 @@ self: { }: mkDerivation { pname = "amazonka-lightsail"; - version = "1.4.5"; - sha256 = "1079qfbw1la3lf4avlq4w28s56r6dwhy798ih2cxv3hfsyja814j"; + version = "1.5.0"; + sha256 = "1ncby9zgmknmpfk1ncsydhb7l4r9kf46r466kg3cwjnb9w9wznkv"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24637,7 +25801,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lightsail SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-analytics" = callPackage @@ -24646,8 +25811,8 @@ self: { }: mkDerivation { pname = "amazonka-marketplace-analytics"; - version = "1.4.5"; - sha256 = "0a5b17qx820q6n61g7gsnl8il0lq3v02vp34ik0alf3s3ssjim23"; + version = "1.5.0"; + sha256 = "0fil2jcs12g0lfkbzw0jjzms6nh90dd91b7s6c6y3ch1yy7a44w0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24655,7 +25820,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Marketplace Commerce Analytics SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-marketplace-entitlement" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-marketplace-entitlement"; + version = "1.5.0"; + sha256 = "0g8diq63yywxrq7i6j8bcchjczdxxayqymc7lzdrvywrlvy52vyb"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Marketplace Entitlement Service SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-metering" = callPackage @@ -24664,8 +25849,8 @@ self: { }: mkDerivation { pname = "amazonka-marketplace-metering"; - version = "1.4.5"; - sha256 = "1piwisfq5cdknpzw1vzi13ymsjwyij14zjhgxi04q096ibj4y53n"; + version = "1.5.0"; + sha256 = "1a9prdrmchnwqz7h8rffmg1df944s0y8cggzxjxvpmydsr8pfrnk"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24673,7 +25858,46 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Marketplace Metering SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-mechanicalturk" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-mechanicalturk"; + version = "1.5.0"; + sha256 = "1qgznzbfxijz8rvara688pa1hvkfjvz14m4x9m639x7aqdrrllh0"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Mechanical Turk SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-migrationhub" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-migrationhub"; + version = "1.5.0"; + sha256 = "1v5sl8xywzr8sf4fbhkgqpq7bm4kcii38ijlfickcds7hv6fa5s1"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Migration Hub SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ml" = callPackage @@ -24682,8 +25906,8 @@ self: { }: mkDerivation { pname = "amazonka-ml"; - version = "1.4.5"; - sha256 = "0ra8ak4ymxg6cv3g3zw2pkhwbccjw6r8jjir9z8kgimx5820v6sp"; + version = "1.5.0"; + sha256 = "0lbp5nji9w2w1dw230z04cyxmqg502jznwy02y8pk1x0i2masjwq"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24691,7 +25915,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-mobile" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-mobile"; + version = "1.5.0"; + sha256 = "0x0qxm4aj9c34zv3i5x4yw8ci86sx69ma9kf88ajxqw4nv1azp53"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Mobile SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks" = callPackage @@ -24700,8 +25944,8 @@ self: { }: mkDerivation { pname = "amazonka-opsworks"; - version = "1.4.5"; - sha256 = "0d4d5zy3lq6mcy9iyqqh73kramxj3z7fb0mkhsfja3fgpp404669"; + version = "1.5.0"; + sha256 = "1hcsz6yxav11xq10vrifspfx06v3gd40y8m2lkc8dwwqa6bpzbq6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24709,7 +25953,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks-cm" = callPackage @@ -24718,8 +25963,8 @@ self: { }: mkDerivation { pname = "amazonka-opsworks-cm"; - version = "1.4.5"; - sha256 = "1lr9kpn6v6rqlss40w41vbriflsb0a2a5zyx27y3sy5k1cmp54ap"; + version = "1.5.0"; + sha256 = "1wf98wd1phavm022a0xznn20h9qfy8ld0d621dnm5cdb3l6wi4w5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24727,7 +25972,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks for Chef Automate SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-organizations" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-organizations"; + version = "1.5.0"; + sha256 = "1n04xzs80nkrcx4742pay5pnzg240240ii0z02baqnkyqpxx55hj"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Organizations SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-pinpoint" = callPackage @@ -24736,8 +26001,8 @@ self: { }: mkDerivation { pname = "amazonka-pinpoint"; - version = "1.4.5"; - sha256 = "1pdwq6d8z5g7cj3csi43181c98ly2d5g40bfxxb5ygj5n01p29li"; + version = "1.5.0"; + sha256 = "0lj556yfwrgkbdspgyvwzf3df4rqz3idwyhzs2nn25f4spba8gwn"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24745,7 +26010,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Pinpoint SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-polly" = callPackage @@ -24754,8 +26020,8 @@ self: { }: mkDerivation { pname = "amazonka-polly"; - version = "1.4.5"; - sha256 = "1infnfp5m348mrlxr6kdv1ggw7vc1h8ah5if33sdm64sghsf5mdm"; + version = "1.5.0"; + sha256 = "11dm2bbr75zl617m9s2zn26zs8d96d4xgl41shdjfhsm6vgc0c7k"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24763,7 +26029,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Polly SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-pricing" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-pricing"; + version = "1.5.0"; + sha256 = "0k4fv6m5m0b6fgs4clry4kg27y7znsvxziphgvpqrjkmjbfsbaxh"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Price List Service SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rds" = callPackage @@ -24772,8 +26058,8 @@ self: { }: mkDerivation { pname = "amazonka-rds"; - version = "1.4.5"; - sha256 = "02x3q846i7i9yvr94pf05xim5h3vsvinq10p4kndin76hhxy0xw3"; + version = "1.5.0"; + sha256 = "0ir608fdj19wb7g4bam8x1givws4d54pd96mkjj9zm0865z19dxn"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24781,7 +26067,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-redshift" = callPackage @@ -24790,8 +26077,8 @@ self: { }: mkDerivation { pname = "amazonka-redshift"; - version = "1.4.5"; - sha256 = "0jm8zxjyrcnfnj8dng51ccw1xfrfb941dxsy8g9jhszza45xdv5p"; + version = "1.5.0"; + sha256 = "1ll4mx404vw403mx8r6k2i9d9yq7nrmj6kqhnf37cnff4k3h0kqy"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24799,7 +26086,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rekognition" = callPackage @@ -24808,8 +26096,8 @@ self: { }: mkDerivation { pname = "amazonka-rekognition"; - version = "1.4.5"; - sha256 = "1gi5g839rhgixj0gsf1cwzzisqdrixrj4jv4hi27qjxag73axhx6"; + version = "1.5.0"; + sha256 = "1sizf0ha3n0712w7g3cmhjy93xscq3kg5mq81shxgdwajab8v49a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24817,7 +26105,27 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Rekognition SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-resourcegroupstagging" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-resourcegroupstagging"; + version = "1.5.0"; + sha256 = "0jsri9l7q3hlrb924104fhzg87zsmqcw1fg7afpczf6p6r2kfrpf"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Resource Groups Tagging API SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53" = callPackage @@ -24826,8 +26134,8 @@ self: { }: mkDerivation { pname = "amazonka-route53"; - version = "1.4.5"; - sha256 = "0pa2v2pd8nx5qxdqq4g6ayafgxi4hafil20ijg4sp57mv0k9ix38"; + version = "1.5.0"; + sha256 = "0saln45sais8cmwpzilwscr88g1mig4whrszwyx805lrhdhb48d4"; libraryHaskellDepends = [ amazonka-core base text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24835,7 +26143,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53-domains" = callPackage @@ -24844,8 +26153,8 @@ self: { }: mkDerivation { pname = "amazonka-route53-domains"; - version = "1.4.5"; - sha256 = "0ggxsixfrmbdlvxqjjizzd0c947x7ramp9zvl7gz86f0l2845dqz"; + version = "1.5.0"; + sha256 = "0fq62hdn1x4p2d0dbkc6m1myjgi9f6z3icd519crdy5sdmczbhl3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24853,7 +26162,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3" = callPackage @@ -24862,8 +26172,8 @@ self: { }: mkDerivation { pname = "amazonka-s3"; - version = "1.4.5"; - sha256 = "1bg45wxcvizdi7j5jggvblxwhd3f7sfy1j0jaq2ajfxcdsb7wabq"; + version = "1.5.0"; + sha256 = "03v5fdn81g2k1pb1kn9c2r0yf52mnv3a8flxl9cms123n4lzhsrg"; libraryHaskellDepends = [ amazonka-core base lens text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24871,19 +26181,19 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3-streaming" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base - , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions - , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet - , text + , bytestring, conduit, deepseq, dlist, exceptions, http-client + , lens, lifted-async, mmap, mmorph, mtl, resourcet }: mkDerivation { pname = "amazonka-s3-streaming"; - version = "0.2.0.3"; - sha256 = "1pndy65mk3kjl51jr75k1dk182wsbzfd2q9zsvcxpalfs0nsaf30"; + version = "0.2.0.5"; + sha256 = "1j9jp409gjq7gnwx163i7qpk4ih3rff7z2icsfmzakiarwmg2ff2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24891,13 +26201,10 @@ self: { dlist exceptions http-client lens lifted-async mmap mmorph mtl resourcet ]; - executableHaskellDepends = [ - amazonka amazonka-core amazonka-s3 base bytestring conduit - conduit-extra text - ]; homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme"; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sdb" = callPackage @@ -24906,8 +26213,8 @@ self: { }: mkDerivation { pname = "amazonka-sdb"; - version = "1.4.5"; - sha256 = "1cn6pvr5fbqgb79l3sa0zmvwnb2mrlcdnmk4lyp0ws44h5gniv7x"; + version = "1.5.0"; + sha256 = "1rgg9w4ry28bx9xcdldw14hp8738bwvlxjnymknhz63d43chgya3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24915,7 +26222,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-servicecatalog" = callPackage @@ -24924,8 +26232,8 @@ self: { }: mkDerivation { pname = "amazonka-servicecatalog"; - version = "1.4.5"; - sha256 = "1rynfj7vk6rri042lbs0wlgn56j16w82v3xvqqddanss2mm11q55"; + version = "1.5.0"; + sha256 = "09kp0af9dh93b7psmyl64l0zhqjna6ksp1d02m05lcv8hf35zy9c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24933,7 +26241,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Service Catalog SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ses" = callPackage @@ -24942,8 +26251,8 @@ self: { }: mkDerivation { pname = "amazonka-ses"; - version = "1.4.5"; - sha256 = "0a8k5vj4ls6hzn845x8vdr9gg4lhdydkx8b7viwxg8nb9mi263x3"; + version = "1.5.0"; + sha256 = "1bb948h51qhz2lsry254bydqzqc0zjfwvm1wzqvv512cl3bx596f"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24951,7 +26260,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-shield" = callPackage @@ -24960,8 +26270,8 @@ self: { }: mkDerivation { pname = "amazonka-shield"; - version = "1.4.5"; - sha256 = "1p1g4kbwj3pbwl0cr80m3ggd8k6wys9hyv8k6cynba7wc72w4blc"; + version = "1.5.0"; + sha256 = "1yw51bqxl92rygg412fbxa8clli2vsn8mf3q45x90f14nk0qpknq"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24969,7 +26279,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Shield SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sms" = callPackage @@ -24978,8 +26289,8 @@ self: { }: mkDerivation { pname = "amazonka-sms"; - version = "1.4.5"; - sha256 = "0y6sn3bnv73sfad12ylsncwm92h6sy9d6j3za4l9knsq5kqgnvsa"; + version = "1.5.0"; + sha256 = "0z8bw4dh9wkr1fpp6kb0vif93c39jjajk9yxkdsb11nnwa4gyrh9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24987,7 +26298,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Server Migration Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-snowball" = callPackage @@ -24996,8 +26308,8 @@ self: { }: mkDerivation { pname = "amazonka-snowball"; - version = "1.4.5"; - sha256 = "07hyhgnl5m86wk3biwak0j173b3m6n10xs6sd4956x08h1rjqzz2"; + version = "1.5.0"; + sha256 = "13wzq3i9ijj627p1sagqpih4094rj6963a2z6552fn95cdnm6l94"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25005,7 +26317,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export Snowball SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sns" = callPackage @@ -25014,8 +26327,8 @@ self: { }: mkDerivation { pname = "amazonka-sns"; - version = "1.4.5"; - sha256 = "10c6i07iapavigdk863bxk0vja4pldcan7agv19rgjsmd8zc4xg8"; + version = "1.5.0"; + sha256 = "0dbka3s5cd1sy7msik0dy9wfp9krl8c60z0dca69pw8r6nncxd41"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25023,7 +26336,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sqs" = callPackage @@ -25032,8 +26346,8 @@ self: { }: mkDerivation { pname = "amazonka-sqs"; - version = "1.4.5"; - sha256 = "1pajmh7mizzjjysrkdvfswx70lcf0x9s4r2arw0968myplkqz8wh"; + version = "1.5.0"; + sha256 = "1imdr5a71n6pkn2fa8irqgnadxhqfqhlszxs0njqf3kfqkc93z06"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25041,7 +26355,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ssm" = callPackage @@ -25050,8 +26365,8 @@ self: { }: mkDerivation { pname = "amazonka-ssm"; - version = "1.4.5"; - sha256 = "0lnza1qsnl9wswf2f8na852vi51bhgiyddldww23kxam5yk6rlgv"; + version = "1.5.0"; + sha256 = "1x7zdv01jc3x4663vxs7c3al4x4phfrcq71slcfjk56g9qp7wrjq"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25059,7 +26374,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Manager (SSM) SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-stepfunctions" = callPackage @@ -25068,8 +26384,8 @@ self: { }: mkDerivation { pname = "amazonka-stepfunctions"; - version = "1.4.5"; - sha256 = "062jy1pfmng6az8api5xh66qcjdz8c5d1nskx8756gpzpb2pj0wr"; + version = "1.5.0"; + sha256 = "0xviq8ml3sr1r2kwrc42kriizankzagh3wv5x8fij622p70q62z2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25077,7 +26393,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Step Functions SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-storagegateway" = callPackage @@ -25086,8 +26403,8 @@ self: { }: mkDerivation { pname = "amazonka-storagegateway"; - version = "1.4.5"; - sha256 = "1sqsy968rp6an5g7n9y17wv73kybmv6vnrycnsmyy4br9vbr5pwc"; + version = "1.5.0"; + sha256 = "0ab4ycaibhm08qbq4adn0mn64dlly1liqx6albdqz3ypd519y9hg"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25095,7 +26412,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sts" = callPackage @@ -25104,8 +26422,8 @@ self: { }: mkDerivation { pname = "amazonka-sts"; - version = "1.4.5"; - sha256 = "1mg3dprk8r94kmzbyqcffvnj7dnrnabdiyg7lm90zhy048hsyfxq"; + version = "1.5.0"; + sha256 = "0c4g0i9088py961f3wxc02ipgl8sh9wm0zl7mfvrb93dps2xmrqy"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25113,7 +26431,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-support" = callPackage @@ -25122,8 +26441,8 @@ self: { }: mkDerivation { pname = "amazonka-support"; - version = "1.4.5"; - sha256 = "0awfvf8rff3q442jk0r26bkgri7hv2hxyrninpbjcckrz8fq8pqk"; + version = "1.5.0"; + sha256 = "1nd1s76w6j2plrbpgc78f9bcanmpmkajsz6xq7lriznvjwgaip84"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25131,7 +26450,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-swf" = callPackage @@ -25140,8 +26460,8 @@ self: { }: mkDerivation { pname = "amazonka-swf"; - version = "1.4.5"; - sha256 = "0a4r4zbq4r5x89zwk6ys3xr8as5qp5v2xhcsh7l69f3vrdlc35s3"; + version = "1.5.0"; + sha256 = "09fiddb9nvl1n5bzh6dzh8fq1lfvw0a5bbnyg51l3z35zyqr64a4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25149,7 +26469,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-test" = callPackage @@ -25161,8 +26482,8 @@ self: { }: mkDerivation { pname = "amazonka-test"; - version = "1.4.5"; - sha256 = "0fjynyb85px3mbf85jf1xvs7n21622w60lasshgjy42brp5p524q"; + version = "1.5.0"; + sha256 = "020qm4za63w69hcbqzbky1r269nv05ajf4zxgvp8jvnz33nj3rs7"; libraryHaskellDepends = [ aeson amazonka-core base bifunctors bytestring case-insensitive conduit conduit-extra groom http-client http-types process @@ -25171,7 +26492,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Common functionality for Amazonka library test-suites"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-waf" = callPackage @@ -25180,8 +26502,8 @@ self: { }: mkDerivation { pname = "amazonka-waf"; - version = "1.4.5"; - sha256 = "0mgirx31c7gffbgp99z9gfa6ps8n45rrqlrmn4kmc0bbf893vipx"; + version = "1.5.0"; + sha256 = "0vv2602f3nhnkfwwj5r7qbkcsd1vflvaakyllnp6a29wrswr29ca"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25189,7 +26511,46 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WAF SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-waf-regional" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-waf-regional"; + version = "1.5.0"; + sha256 = "1rn090nrz2kk50r8fiyhlwyfcz2byzy8i71a5dghx545rsn7jc9x"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon WAF Regional SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "amazonka-workdocs" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-workdocs"; + version = "1.5.0"; + sha256 = "0wypcv4w8m0qylk1ixb3s9zwh9mzz7682xw31w6cq62hxwy3w3gz"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon WorkDocs SDK"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-workspaces" = callPackage @@ -25198,8 +26559,8 @@ self: { }: mkDerivation { pname = "amazonka-workspaces"; - version = "1.4.5"; - sha256 = "1px7nyybmd50mfm2iivkqi294g9sgsgp3a41676g8qdacw15yv1m"; + version = "1.5.0"; + sha256 = "1kjyxmbwkj0p50bl0x3snk5680qc00g1486xhl4b600jrc2p2gkk"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25207,7 +26568,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-xray" = callPackage @@ -25216,8 +26578,8 @@ self: { }: mkDerivation { pname = "amazonka-xray"; - version = "1.4.5"; - sha256 = "0l72rvpgwsly3xlqc6drj79q9n2kr2wwc3lm2z836d1layc3hcz1"; + version = "1.5.0"; + sha256 = "1i9s8l0l98lffc7hvhndrjj8rv4r0j958qhfqic503d7pzq9m0gk"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -25225,7 +26587,8 @@ self: { ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon X-Ray SDK"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amby" = callPackage @@ -25288,34 +26651,6 @@ self: { }) {}; "amqp" = 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; - }) {}; - - "amqp_0_18_1" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations , monad-control, network, network-uri, split, stm, text, vector @@ -25341,7 +26676,6 @@ self: { 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 @@ -25372,8 +26706,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.2.1.5"; - sha256 = "1r0h93nivl0pvl6mppz18jpi3csar37ii867a2yfg7g4a5lra3hf"; + version = "0.3.0.0"; + sha256 = "05yz8pgj1g8m2y35psvkkpf0xr9dr0qz0andqv452w0ak7vy54bk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -25405,6 +26739,7 @@ self: { ]; description = "High level functions for working with message queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amrun" = callPackage @@ -25441,6 +26776,7 @@ self: { homepage = "https://github.com/ejconlon/analyze#readme"; description = "making data science easy and safe with data frames"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "analyze-client" = callPackage @@ -25669,17 +27005,65 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "animascii" = callPackage + ({ mkDerivation, ansi-terminal-game, base, Cabal, config-ini + , directory, filepath, fsnotify, hspec, parsec, process, temporary + , text + }: + mkDerivation { + pname = "animascii"; + version = "0.1.1.0"; + sha256 = "1f474jp121s1w947d6yn6363730hgki2m7mfqyin25ngl4q0isqd"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ + ansi-terminal-game base config-ini directory filepath fsnotify + parsec process temporary text + ]; + testHaskellDepends = [ ansi-terminal-game base hspec parsec ]; + homepage = "http://www.ariis.it/static/articles/animascii/page.html"; + description = "text-file based ASCII animator"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "animate" = callPackage - ({ mkDerivation, base, hspec, vector }: + ({ mkDerivation, aeson, base, bytestring, containers, hspec, text + , vector + }: mkDerivation { pname = "animate"; - version = "0.0.0"; - sha256 = "08d8kfmqayr1nfn4nxrjfvcgn3jjz457r7jbq06vimkmjz1fagb9"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ base hspec vector ]; + version = "0.6.0"; + sha256 = "14fbxn3v4l5z6krqsycpg9ylx91y1xwzwqcxpqy5ihjba2g2r23a"; + libraryHaskellDepends = [ + aeson base bytestring containers text vector + ]; + testHaskellDepends = [ aeson base containers hspec vector ]; + homepage = "https://github.com/jxv/animate#readme"; + description = "Animation for sprites"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "animate-example" = callPackage + ({ mkDerivation, aeson, animate, base, bytestring, containers, sdl2 + , sdl2-image, StateVar, text + }: + mkDerivation { + pname = "animate-example"; + version = "0.2.0"; + sha256 = "07jqlqjdza4jxjc4hic2v0gh1n3jcvz1dnsm54m6y68k1ww68vrz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson animate base bytestring containers sdl2 sdl2-image StateVar + text + ]; homepage = "https://github.com/jxv/animate#readme"; description = "Animation for sprites"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "anki-tools" = callPackage @@ -25762,6 +27146,7 @@ self: { homepage = "http://www.github.com/massysett/anonymous-sums"; description = "Anonymous sum types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "anonymous-sums-tests" = callPackage @@ -25777,6 +27162,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ansi-escape-codes" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ansi-escape-codes"; + version = "0.3.0.0"; + sha256 = "1aj7p937c48laz5kkhil45lgkjiivcidky6vxxp3q5yvkymsijvb"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/joegesualdo/ansi-escape-codes"; + description = "Haskell package to generate ANSI escape codes for styling strings in the terminal"; + license = stdenv.lib.licenses.mit; + }) {}; + "ansi-pretty" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, array, base, bytestring , containers, generics-sop, nats, scientific, semigroups, tagged @@ -25786,8 +27183,8 @@ self: { pname = "ansi-pretty"; version = "0.1.2.1"; sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h"; - revision = "3"; - editedCabalFile = "046w5nybk8fyhicw5wy7qchbx9k4sib189afj2gysrsblj0ki864"; + revision = "4"; + editedCabalFile = "0yp5wihvl22vfcr0x22xdbvrk79hcahx1kyfpwpvv0jkahc5c03q"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -25799,75 +27196,60 @@ self: { }) {}; "ansi-terminal" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "ansi-terminal"; - version = "0.6.3.1"; - sha256 = "15c0c0vb66y3mr11kcvgjf4h0f7dqg7k1xq7zzq9fy11r7h9i3s5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/feuerbach/ansi-terminal"; - description = "Simple ANSI terminal support, with Windows compatibility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ansi-terminal_0_7_1_1" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.7.1.1"; - sha256 = "1z2lllm5f2wy3a1j1198mpwq9cb6qclrxr2gpdzjyxzzvybpdj3g"; + version = "0.8.0.2"; + sha256 = "1yph18lklk9hrj1m5gjwygnqbmpg333zyf4bmmm1zvlzflrwj6l9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/feuerbach/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ansi-wl-pprint" = callPackage - ({ mkDerivation, ansi-terminal, base }: + "ansi-terminal-game" = callPackage + ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal + , clock, hspec, linebreak, split, terminal-size, timers-tick + }: mkDerivation { - pname = "ansi-wl-pprint"; - version = "0.6.7.3"; - sha256 = "025pyphsjf0dnbrmj5nscbi6gzyigwgp3ifxb3psn7kji6mfr29p"; + pname = "ansi-terminal-game"; + version = "0.2.1.0"; + sha256 = "0a227gs7a0hz705lgq97mx4sdlbwqflns0zls7qsr9yr6ljc4836"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ ansi-terminal base ]; - executableHaskellDepends = [ ansi-terminal base ]; - homepage = "http://github.com/ekmett/ansi-wl-pprint"; - description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; - license = stdenv.lib.licenses.bsd3; + libraryHaskellDepends = [ + ansi-terminal array base bytestring cereal clock linebreak split + terminal-size timers-tick + ]; + testHaskellDepends = [ array base hspec linebreak ]; + homepage = "none-yet"; + description = "sdl-like functions for terminal applications, based on ansi-terminal"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ansi-wl-pprint_0_6_8_1" = callPackage + "ansi-wl-pprint" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "ansi-wl-pprint"; - version = "0.6.8.1"; - sha256 = "0qxk0iibbyqk7fmrq5cbkr1269bd6vqbdmj2n8s5bvds0836mnnm"; - revision = "1"; - editedCabalFile = "0miriy5zkssjwg8zk1wzg7wx3l5ljzvrhga33m2iz7j4y0sb4fx7"; + version = "0.6.8.2"; + sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base ]; - executableHaskellDepends = [ ansi-terminal base ]; homepage = "http://github.com/ekmett/ansi-wl-pprint"; description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansigraph" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; - version = "0.3.0.4"; - sha256 = "0gyim5a4b0gc4z45hsbxwl3gn3xcad3068xwcgwh8gc4ikannki9"; + version = "0.3.0.5"; + sha256 = "03ks75ik0jyfz55iz3gcccxgg73v1dw2nn0myl40c2rc31mwz39f"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/BlackBrane/ansigraph"; @@ -25964,6 +27346,7 @@ self: { homepage = "https://github.com/exbb2/antigate"; description = "Interface for antigate.com captcha recognition API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antimirov" = callPackage @@ -26056,7 +27439,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers MissingH mtl ]; - executableHaskellDepends = [ base containers MissingH mtl ]; homepage = "http://software.complete.org/anydbm"; description = "Interface for DBM-like database systems"; license = "GPL"; @@ -26129,8 +27511,26 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.2.4.4"; - sha256 = "05yj40vbsjbylxnqqvczs8f3i42i719mihnps8b9mhrysdvz3wlp"; + version = "0.2.4.7"; + sha256 = "0hqx0q52688zd7hdy6bcmbhycscy1laxggy8fvswglbfdm9m9n8s"; + libraryHaskellDepends = [ + async base containers mtl template-haskell vector + ]; + testHaskellDepends = [ base containers QuickCheck vector ]; + benchmarkHaskellDepends = [ base criterion linear ]; + homepage = "https://github.com/jonascarpay/apecs#readme"; + description = "A fast ECS for game engine programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "apecs_0_3_0_2" = callPackage + ({ mkDerivation, async, base, containers, criterion, linear, mtl + , QuickCheck, template-haskell, vector + }: + mkDerivation { + pname = "apecs"; + version = "0.3.0.2"; + sha256 = "1j9vw55z9igpjmll99x0pxz792m0w0n1r8w1sy96kj0jqk5y2l5i"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -26139,6 +27539,7 @@ self: { homepage = "https://github.com/jonascarpay/apecs#readme"; description = "A fast ECS for game engine programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apelsin" = callPackage @@ -26171,8 +27572,8 @@ self: { }: mkDerivation { pname = "api-builder"; - version = "0.12.0.0"; - sha256 = "16abl6yph5a0kc9rn46ab0564d4xbsvlml45zryhvdswl4jr3jni"; + version = "0.14.0.0"; + sha256 = "12pr670c4zw8dhmj5vgsqr44mw2jz5kqdqn3alfqhmkmb13kzc4v"; libraryHaskellDepends = [ aeson base bifunctors bytestring HTTP http-client http-client-tls http-types text tls transformers @@ -26274,6 +27675,8 @@ self: { pname = "apiary"; version = "2.1.2"; sha256 = "03b3rhjpjfinj1xnkngipz09d1j1dijy25s0z0a5mvygahlf9kvc"; + revision = "1"; + editedCabalFile = "0fznli6f20wxzbg1b5ylnjiyfqrmvm0wi5jcvhg8przmqhvjmcki"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html blaze-markup bytestring bytestring-lexing case-insensitive data-default-class exceptions @@ -26286,7 +27689,7 @@ self: { aeson base bytestring directory http-types HUnit mtl tasty tasty-hunit tasty-quickcheck wai wai-extra ]; - homepage = "https://github.com/philopon/apiary"; + homepage = "https://github.com/winterland1989/apiary"; description = "Simple and type safe web framework that generate web API documentation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -26509,6 +27912,7 @@ self: { homepage = "https://github.com/philopon/apiary"; description = "redis support for apiary web framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apiary-session" = callPackage @@ -26599,6 +28003,7 @@ self: { homepage = "https://github.com/ConferHealth/apns-http2#readme"; description = "Apple Push Notification service HTTP/2 integration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apotiki" = callPackage @@ -26859,6 +28264,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apply-refact_0_5_0_0" = 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.5.0.0"; + sha256 = "1bvlbchpma3vlxfvjbyd01rmzqc9h5q3my9n7v3wal2p7ysvjpqz"; + 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; + }) {}; + "apportionment" = callPackage ({ mkDerivation, base, containers, utility-ht }: mkDerivation { @@ -26924,6 +28361,7 @@ self: { homepage = "http://github.com/analytics/approximate/"; description = "Approximate discrete values and numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "approximate-equality" = callPackage @@ -26997,34 +28435,35 @@ self: { }) {arbb_dev = null;}; "arbtt" = callPackage - ({ mkDerivation, aeson, array, base, binary, bytestring - , bytestring-progress, containers, deepseq, directory, filepath - , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty - , tasty-golden, tasty-hunit, terminal-progress-bar, time - , transformers, unix, utf8-string, X11 + ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring + , bytestring-progress, conduit, containers, deepseq, directory + , exceptions, filepath, mtl, parsec, pcre-light, process-extras + , resourcet, strict, tasty, tasty-golden, tasty-hunit + , terminal-progress-bar, text, time, transformers, unix + , unliftio-core, utf8-string, X11 }: mkDerivation { pname = "arbtt"; - version = "0.9.0.13"; - sha256 = "0ga0jq47s83w36ipmz1wdcrg6ir5z2klppx6kcxpmkikf8f85gl9"; + version = "0.10.0.1"; + sha256 = "0pav5q0xh90vjrj77l7vk38l38xyhqas4750il5wkpqf4f5li877"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson array base binary bytestring bytestring-progress containers - deepseq directory filepath parsec pcre-light strict - terminal-progress-bar time transformers unix utf8-string X11 + aeson array attoparsec base binary bytestring bytestring-progress + conduit containers deepseq directory exceptions filepath mtl parsec + pcre-light resourcet strict terminal-progress-bar text time + transformers unix unliftio-core utf8-string X11 ]; - executableSystemDepends = [ libXScrnSaver ]; testHaskellDepends = [ - base binary bytestring containers deepseq directory parsec + base binary bytestring containers deepseq directory mtl parsec pcre-light process-extras tasty tasty-golden tasty-hunit time transformers unix utf8-string ]; homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; - license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libXScrnSaver;}; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "arcgrid" = callPackage ({ mkDerivation, base, parsec, parsec-numeric }: @@ -27076,6 +28515,7 @@ self: { ]; description = "A library and programs for creating hardlinked incremental archives or backups"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {debian-mirror = null; help = null;}; @@ -27156,6 +28596,7 @@ self: { homepage = "http://archhaskell.wordpress.com/"; description = "Convert Arch Linux package updates in RSS to pretty markdown"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arena" = callPackage @@ -27245,19 +28686,18 @@ self: { }) {}; "argon2" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, tasty - , tasty-quickcheck, text, transformers + ({ mkDerivation, base, bytestring, deepseq, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text-short }: mkDerivation { pname = "argon2"; - version = "1.2.0"; - sha256 = "1zzwlhb47ykqi6psgnpzmf4nlk5rwr4adpl7sz7x7iacy9xmayd5"; - libraryHaskellDepends = [ base bytestring text transformers ]; + version = "1.3.0.1"; + sha256 = "1v0clf78hykdyhv81z8v3kwp86hjgqh6b8a7wfbjv0fyy55bwxry"; + libraryHaskellDepends = [ base bytestring deepseq text-short ]; testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck text + base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/ocharles/argon2.git"; - description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function"; + description = "Memory-hard password hash and proof-of-work function"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -27415,8 +28855,10 @@ self: { }: mkDerivation { pname = "arithmoi"; - version = "0.5.0.0"; - sha256 = "0gja9x6y2nprlg5d2wjycjvxgc7bb4p6y8d4fg3dxxzzwgqgrrab"; + version = "0.6.0.1"; + sha256 = "0dhr55r5vi10d9wqr054fy8rxp7h9z0kfpwvckaly0j90d6gvkqm"; + revision = "3"; + editedCabalFile = "1ah8b17pxa96gdap3sr7872km29lz95bqjwswqzfkirig2njlf9q"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers exact-pi ghc-prim integer-gmp @@ -27434,29 +28876,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "arithmoi_0_6_0_0" = 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 + "arithmoi_0_7_0_0" = callPackage + ({ mkDerivation, array, base, containers, exact-pi, gauge, ghc-prim + , integer-gmp, integer-logarithms, mtl, QuickCheck, random + , smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, transformers, vector }: mkDerivation { pname = "arithmoi"; - version = "0.6.0.0"; - sha256 = "14kcv5n9rm48f9vac333cbazy4hlpb0wqgb4fbv97ivxnjs7g22m"; - revision = "1"; - editedCabalFile = "0408asx3296s0rwpzjmsllfjavdnh9h2rnmbvz908xs7qc5njixd"; + version = "0.7.0.0"; + sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers exact-pi ghc-prim integer-gmp - integer-logarithms mtl random + integer-logarithms mtl random vector ]; testHaskellDepends = [ base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck transformers + tasty-quickcheck tasty-smallcheck transformers vector ]; benchmarkHaskellDepends = [ - base containers criterion integer-logarithms random + base containers gauge integer-logarithms random vector ]; homepage = "https://github.com/cartazio/arithmoi"; description = "Efficient basic number-theoretic functions"; @@ -27478,6 +28918,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "armor" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, HUnit, lens, text + }: + mkDerivation { + pname = "armor"; + version = "0.1"; + sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71"; + libraryHaskellDepends = [ + base bytestring containers directory filepath HUnit lens + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hspec HUnit lens text + ]; + homepage = "https://github.com/mightybyte/armor"; + description = "Armor data structures against serialization backwards compatibility problems"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "arpa" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -27524,6 +28983,8 @@ self: { pname = "array"; version = "0.5.2.0"; sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj"; + revision = "1"; + editedCabalFile = "195c914pc0vk1ya6lz42kb4gmhkam7s0xi7x0dgzhpb5gkcrs5qx"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; @@ -27582,7 +29043,6 @@ self: { benchmarkHaskellDepends = [ base criterion ghc-prim ]; description = "Extra foreign primops for primitive arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "array-utils" = callPackage @@ -27664,26 +29124,9 @@ self: { }) {}; "arrowp-qq" = callPackage - ({ mkDerivation, array, base, containers, haskell-src - , template-haskell, transformers - }: - mkDerivation { - pname = "arrowp-qq"; - version = "0.1.1"; - sha256 = "1khs7xcc234i4xk6gwjakrzmn8gymaradar9inqikb6wkrs61r53"; - 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; - }) {}; - - "arrowp-qq_0_2_1_1" = callPackage - ({ mkDerivation, arrows, base, containers, data-default - , haskell-src-exts, haskell-src-exts-util, haskell-src-meta, NoHoed - , template-haskell, transformers, uniplate + ({ mkDerivation, base, containers, data-default, haskell-src-exts + , haskell-src-exts-util, haskell-src-meta, NoHoed, template-haskell + , transformers, uniplate }: mkDerivation { pname = "arrowp-qq"; @@ -27696,7 +29139,6 @@ self: { haskell-src-meta NoHoed template-haskell transformers uniplate ]; executableHaskellDepends = [ base haskell-src-exts NoHoed ]; - testHaskellDepends = [ arrows base template-haskell ]; homepage = "https://github.com/pepeiborra/arrowp"; description = "A preprocessor and quasiquoter for translating arrow notation"; license = "GPL"; @@ -27707,8 +29149,8 @@ self: { ({ mkDerivation, base, Stream }: mkDerivation { pname = "arrows"; - version = "0.4.4.1"; - sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v"; + version = "0.4.4.2"; + sha256 = "02db4byzz8xb4c36y0v867g9kd3a9p04r4cj1np717k20qrwjnpn"; libraryHaskellDepends = [ base Stream ]; homepage = "http://www.haskell.org/arrows/"; description = "Arrow classes and transformers"; @@ -27867,8 +29309,8 @@ self: { }: mkDerivation { pname = "ascii-table"; - version = "0.3.0.0"; - sha256 = "13lr4ylrwxyv08qmrb20f5i2gazda18gcx804c8qhxywzjm4irf9"; + version = "0.3.0.1"; + sha256 = "01m7rdvjrn0mrqc100d81ji17f1h8lyqyyp5ydv2xzns8cmrcdzp"; libraryHaskellDepends = [ aeson base containers dlist hashable text unordered-containers vector wl-pprint-extras @@ -27921,8 +29363,8 @@ self: { }: mkDerivation { pname = "asciidiagram"; - version = "1.3.3"; - sha256 = "062zcirgkjlypyzj7igjmhyisgs19svyzzqpmgy7vah8ykslhjb9"; + version = "1.3.3.1"; + sha256 = "194jdii485z0fif07nvjcj5468m53zgm2v9x1h3pj8xlmfh9rrly"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27935,6 +29377,7 @@ self: { ]; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asic" = callPackage @@ -28098,6 +29541,7 @@ self: { executableHaskellDepends = [ base containers ghc-binary parsec ]; description = "Haskell Assembler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -28116,6 +29560,7 @@ self: { homepage = "https://github.com/liyang/assert"; description = "Helpers for Control.Exception.assert"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "assert-failure" = callPackage @@ -28146,6 +29591,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "asset-bundle" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "asset-bundle"; + version = "0.1.0.0"; + sha256 = "0fdl3dgnc5q9mv8w5g3qrhyprqhbyp4jrr5gimf9xzd67fwsnf86"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + homepage = "https://github.com/deech/asset-bundle#readme"; + description = "A build-time Cabal library that bundles executables with assets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "assimp" = callPackage ({ mkDerivation, assimp, base, c2hs, haskell98, vect }: mkDerivation { @@ -28166,8 +29623,8 @@ self: { pname = "ast-monad"; version = "0.1.0.0"; sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i"; - revision = "2"; - editedCabalFile = "1l5adjj7bianjclqzgvi4qhlb6lvb7v67qfqx2ghk3arq8ifghwj"; + revision = "3"; + editedCabalFile = "0lj9g3vhlx42hsirxcwfjksy5w6981gpyms7r5xpih7bnz91cxk7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/mouri111/ast-monad#readme"; @@ -28181,8 +29638,8 @@ self: { pname = "ast-monad-json"; version = "0.1.0.1"; sha256 = "0a0pzcma574rrx6klfgk16y6ng22glwj1l5c3rz5w32a22ildfz6"; - revision = "1"; - editedCabalFile = "05gavjyjxfmw8q8l4dvx2p5vxaszg4kbivknn3pg5495bgd8br9s"; + revision = "2"; + editedCabalFile = "0cbayikyr96vcn10253gkwgk0mvx6inymrldv0bhzp8qiv94sm3n"; libraryHaskellDepends = [ ast-monad base text ]; testHaskellDepends = [ ast-monad base hspec text ]; homepage = "https://github.com/mouri111/ast-monad-json#readme"; @@ -28291,6 +29748,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async_2_2_1" = callPackage + ({ mkDerivation, base, hashable, HUnit, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "async"; + version = "2.2.1"; + sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hashable stm ]; + testHaskellDepends = [ + base HUnit stm test-framework test-framework-hunit + ]; + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-ajax" = callPackage ({ mkDerivation, async, base, ghcjs-ajax, text }: mkDerivation { @@ -28303,6 +29780,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "async-combinators" = callPackage + ({ mkDerivation, async, base, hedgehog, HUnit, safe-exceptions + , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, universum + , unliftio-core + }: + mkDerivation { + pname = "async-combinators"; + version = "0.0.0"; + sha256 = "1rj9fahpch74ygkx3lv4282lb775cklxi3c5wys544binnya9v7b"; + libraryHaskellDepends = [ + async base safe-exceptions universum unliftio-core + ]; + testHaskellDepends = [ + base hedgehog HUnit safe-exceptions tasty tasty-discover + tasty-hedgehog tasty-hunit universum + ]; + homepage = "https://github.com/serokell/async-combinators"; + description = "Async combinators"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-dejafu" = callPackage ({ mkDerivation, base, concurrency, dejafu, exceptions, HUnit , hunit-dejafu @@ -28318,7 +29817,7 @@ self: { homepage = "https://github.com/barrucadu/dejafu"; description = "Run MonadConc operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-extra" = callPackage @@ -28420,6 +29919,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-refresh_0_3_0_0" = callPackage + ({ mkDerivation, base, criterion, formatting, HUnit, lifted-async + , microlens, microlens-th, monad-logger, safe-exceptions, stm + , test-framework, test-framework-hunit, text, unliftio + , unliftio-core + }: + mkDerivation { + pname = "async-refresh"; + version = "0.3.0.0"; + sha256 = "1j9llc84f93srw80pyldcglzmssl0l961bzlwsrvbaa84ldhcs6s"; + libraryHaskellDepends = [ + base formatting lifted-async microlens microlens-th monad-logger + safe-exceptions stm text unliftio unliftio-core + ]; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-refresh-tokens" = callPackage ({ mkDerivation, async-refresh, base, bytestring, criterion , formatting, HUnit, lifted-async, microlens, microlens-th @@ -28443,6 +29966,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-refresh-tokens_0_4_0_0" = callPackage + ({ mkDerivation, async-refresh, base, bytestring, criterion + , formatting, HUnit, microlens, microlens-th, monad-logger + , safe-exceptions, test-framework, test-framework-hunit, text + , unliftio, unliftio-core + }: + mkDerivation { + pname = "async-refresh-tokens"; + version = "0.4.0.0"; + sha256 = "1py7ips87gbwdhxdfv0xh4hkgw0my4nkkz4w1vwcb3s296a439v7"; + libraryHaskellDepends = [ + async-refresh base bytestring formatting microlens microlens-th + monad-logger safe-exceptions text unliftio unliftio-core + ]; + testHaskellDepends = [ + base criterion HUnit monad-logger test-framework + test-framework-hunit unliftio + ]; + 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 @@ -28450,8 +29997,8 @@ self: { }: mkDerivation { pname = "async-timer"; - version = "0.1.4.0"; - sha256 = "00kdhxq0wpml4f7gdjvr2h8km8i3yj68bawpa229rzpp0y0yp3k3"; + version = "0.1.4.1"; + sha256 = "1653hcx4a265drbgp0js9bhg3zfaspqxkx12f4v22vrfg64lvan2"; libraryHaskellDepends = [ base lifted-async lifted-base monad-control safe-exceptions transformers-base @@ -28460,9 +30007,29 @@ self: { base containers criterion HUnit lifted-async test-framework test-framework-hunit ]; - homepage = "https://github.com/mtesseract/async-timer"; + homepage = "https://github.com/mtesseract/async-timer#readme"; + description = "Provides API for timer based execution of IO actions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "async-timer_0_2_0_0" = callPackage + ({ mkDerivation, async, base, containers, criterion + , safe-exceptions, tasty, tasty-hunit, unliftio, unliftio-core + }: + mkDerivation { + pname = "async-timer"; + version = "0.2.0.0"; + sha256 = "1q6f0ig8m1ij1yz07b36799gavppb7dkwyvlc724gaj1q72bych6"; + libraryHaskellDepends = [ + async base safe-exceptions unliftio unliftio-core + ]; + testHaskellDepends = [ + async base containers criterion tasty tasty-hunit + ]; + homepage = "https://github.com/mtesseract/async-timer#readme"; description = "Provides API for timer based execution of IO actions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asynchronous-exceptions" = callPackage @@ -28488,6 +30055,7 @@ self: { homepage = "https://svn-agbkb.informatik.uni-bremen.de/Hets/trunk/atermlib"; description = "serialisation for Haskell values with sharing support"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aterm-utils" = callPackage @@ -28551,8 +30119,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.5.0"; - sha256 = "0dzswy71awgxqchb3ydq8idxlvqaalal45fx5prhr7xg4077apm0"; + version = "0.4.6.0"; + sha256 = "1yyc5cp10zqhmi2hay0hiz526lxfcn56g13ikfh25pqzayrxnd8b"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -28602,6 +30170,7 @@ self: { libraryHaskellDepends = [ atmos base dimensional-tf ]; description = "dimensional-tf wrapper on atmos package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atndapi" = callPackage @@ -28659,49 +30228,22 @@ self: { "atom-conduit" = callPackage ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators - , data-default, hlint, lens-simple, mono-traversable, parsers - , quickcheck-instances, resourcet, safe-exceptions, tasty - , tasty-hunit, tasty-quickcheck, text, time, timerep - , uri-bytestring, xml-conduit, xml-types - }: - mkDerivation { - pname = "atom-conduit"; - version = "0.4.0.3"; - sha256 = "0pl5p9zj33fjjgrxkyj2y45r3qyl5p8z9g17zg19gvqzszsk3vr1"; - libraryHaskellDepends = [ - base blaze-builder conduit conduit-combinators lens-simple - mono-traversable parsers safe-exceptions text time timerep - uri-bytestring xml-conduit xml-types - ]; - testHaskellDepends = [ - base conduit data-default hlint lens-simple mono-traversable - parsers quickcheck-instances resourcet safe-exceptions tasty - tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit - xml-types - ]; - description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "atom-conduit_0_5_0_0" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators - , data-default, hlint, lens-simple, mono-traversable, parsers + , data-default, lens-simple, mono-traversable, parsers , quickcheck-instances, resourcet, safe-exceptions, tasty , tasty-hunit, tasty-quickcheck, text, time, timerep , uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "atom-conduit"; - version = "0.5.0.0"; - sha256 = "06a7g93zhsp8smy5m4c45hjhb3yz3l89a60vb09s31l0idgf4j42"; + version = "0.5.0.1"; + sha256 = "1k9ix1br0vfajjqnprlnhzidvkx9a1pmkyiv2rb3nxb7fp3wb24c"; libraryHaskellDepends = [ base blaze-builder conduit conduit-combinators lens-simple mono-traversable parsers safe-exceptions text time timerep uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - base blaze-builder conduit conduit-combinators data-default hlint + base blaze-builder conduit conduit-combinators data-default lens-simple mono-traversable parsers quickcheck-instances resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-types @@ -28724,14 +30266,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "atomic-file-ops" = callPackage + ({ mkDerivation, base, directory, filelock, filepath + , io-string-like + }: + mkDerivation { + pname = "atomic-file-ops"; + version = "0.3.0.0"; + sha256 = "15gg5g9wnypj3hk5lhrqln2xcf86g84ivm8c8aflhmal26x86x44"; + libraryHaskellDepends = [ + base directory filelock filepath io-string-like + ]; + homepage = "https://github.com/clintonmead/atomic-file-ops#readme"; + description = "Functions to atomically write to files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "atomic-modify" = callPackage ({ mkDerivation, base, stm }: mkDerivation { pname = "atomic-modify"; - version = "0.1.0.0"; - sha256 = "138nm3mgrr8yk4dlk4zlrxzrqp250wxl0sj3qbb3n1vyx5mhw02y"; + version = "0.1.0.1"; + sha256 = "0kkfbm7jkarzj42ja7093i1j1h4klg362pfz1cvldvdhzjgs009r"; libraryHaskellDepends = [ base stm ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/atomic-modify"; description = "A typeclass for mutable references that have an atomic modify operation"; license = stdenv.lib.licenses.asl20; }) {}; @@ -28740,8 +30298,8 @@ self: { ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "atomic-primops"; - version = "0.8.1"; - sha256 = "0zqbx0sfgl0hi8bqavvwjxsczayxrhwjqxymaawrvn44xr9g35c1"; + version = "0.8.2"; + sha256 = "0cyr2x6xqz6s233znrz9rnrfj56m9bmnawwnka0lsqqy1hp8gy37"; 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"; @@ -28843,6 +30401,7 @@ self: { homepage = "https://github.com/seereason/atp-haskell"; description = "Translation from Ocaml to Haskell of John Harrison's ATP code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atrans" = callPackage @@ -28857,6 +30416,95 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ats-format" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, Cabal, cli-setup, directory + , file-embed, htoml-megaparsec, language-ats, optparse-applicative + , process, text, unordered-containers + }: + mkDerivation { + pname = "ats-format"; + version = "0.2.0.25"; + sha256 = "0p5pg2ix0ppan0cz4b0pk16ihfcnvqwb8g93k4bh7d304ca5xdk4"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal cli-setup ]; + executableHaskellDepends = [ + ansi-wl-pprint base directory file-embed htoml-megaparsec + language-ats optparse-applicative process text unordered-containers + ]; + description = "A source-code formatter for ATS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ats-pkg" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib + , Cabal, cli-setup, composition-prelude, containers, dependency + , dhall, directory, file-embed, filemanip, hashable, http-client + , http-client-tls, lens, lzma, mtl, optparse-applicative + , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary + , text, unix, zip-archive, zlib + }: + mkDerivation { + pname = "ats-pkg"; + version = "2.10.0.8"; + sha256 = "159nf1dfb4zh7kbk534xxhvap3gi6943j9vrp7k6lkyvp3p2s1q9"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cli-setup ]; + libraryHaskellDepends = [ + ansi-wl-pprint base binary bytestring bzlib Cabal + composition-prelude containers dependency dhall directory + file-embed filemanip hashable http-client http-client-tls lens lzma + mtl parallel-io process shake shake-ats shake-ext tar text unix + zip-archive zlib + ]; + executableHaskellDepends = [ + base composition-prelude directory lens optparse-applicative shake + shake-ats temporary text + ]; + homepage = "https://github.com/vmchale/atspkg#readme"; + description = "A build tool for ATS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ats-setup" = callPackage + ({ mkDerivation, base, bytestring, Cabal, composition-prelude + , dependency, directory, filemanip, http-client, http-client-tls + , parallel-io, process, tar, unix, zlib + }: + mkDerivation { + pname = "ats-setup"; + version = "0.4.0.2"; + sha256 = "13sv7wwz6m6s9x3mr4phsf62ayyn95bdpj6cv93kyzadyi3vfvd6"; + libraryHaskellDepends = [ + base bytestring Cabal composition-prelude dependency directory + filemanip http-client http-client-tls parallel-io process tar unix + zlib + ]; + description = "ATS scripts for Cabal builds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ats-storable" = callPackage + ({ mkDerivation, base, bytestring, composition-prelude, hspec + , microlens, microlens-th, text + }: + mkDerivation { + pname = "ats-storable"; + version = "0.3.0.1"; + sha256 = "1apzmyq9a4hjn9d0fz7pxvxflq61kp26fa6gz3c50pdjby55zhns"; + libraryHaskellDepends = [ + base bytestring composition-prelude microlens microlens-th text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com//ats-generic#readme"; + description = "Marshal ATS types into Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attempt" = callPackage ({ mkDerivation, base, failure }: mkDerivation { @@ -28912,36 +30560,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "attoparsec" = callPackage - ({ 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 + "attomail" = callPackage + ({ mkDerivation, base, bytestring, ConfigFile, directory, doctest + , email-validate, Glob, hsemail-ns, MissingH, mtl, network + , optparse-applicative, parsec, QuickCheck, random, text, time + , transformers, unix, unix-time }: mkDerivation { - pname = "attoparsec"; - version = "0.13.1.0"; - sha256 = "0r1zrrkbqv8w4pb459fj5izd1h85p9nrsp3gyzj7qiayjpa79p2j"; - 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 + pname = "attomail"; + version = "0.1.0.2"; + sha256 = "0yryvw8qcp0vgal4dn48xi7x42wl9b1bwfbh0chnvbi5rwnwspyr"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring ConfigFile directory email-validate hsemail-ns + MissingH mtl network optparse-applicative parsec random text time + transformers unix unix-time ]; - homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; + testHaskellDepends = [ base doctest Glob QuickCheck ]; + description = "Minimal mail delivery agent (MDA) for local mail with maildir support"; + license = stdenv.lib.licenses.bsd2; }) {}; - "attoparsec_0_13_2_0" = callPackage + "attoparsec" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, criterion, deepseq, directory, filepath, ghc-prim , http-types, parsec, QuickCheck, quickcheck-unicode, scientific @@ -28950,8 +30591,8 @@ self: { }: mkDerivation { pname = "attoparsec"; - version = "0.13.2.0"; - sha256 = "1wrwj359r0kgrcc2kw1yl9cpvkihhq0qm3i12kw39707s6m2x0pd"; + version = "0.13.2.2"; + sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -28968,7 +30609,6 @@ self: { homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-arff" = callPackage @@ -28982,6 +30622,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "attoparsec-base64" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, text, word8 }: + mkDerivation { + pname = "attoparsec-base64"; + version = "0.0.0"; + sha256 = "1rvkc7kaya42a8djkyj642r5dq952gwkhinif9r22ijaic656cq8"; + libraryHaskellDepends = [ attoparsec base bytestring text word8 ]; + homepage = "https://github.com/athanclark/attoparsec-base64#readme"; + description = "Fetch only base64 characters, erroring in the attoparsec monad on failure"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "attoparsec-binary" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -29016,6 +30668,7 @@ self: { homepage = "https://github.com/robinbb/attoparsec-csv"; description = "A parser for CSV files that uses Attoparsec"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-data" = callPackage @@ -29033,7 +30686,6 @@ self: { homepage = "https://github.com/nikita-volkov/attoparsec-data"; description = "Parsers for the standard Haskell data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-enumerator" = callPackage @@ -29072,7 +30724,6 @@ self: { homepage = "https://github.com/athanclark/attoparsec-ip#readme"; description = "Parse IP data types with attoparsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-iso8601" = callPackage @@ -29081,6 +30732,8 @@ self: { pname = "attoparsec-iso8601"; version = "1.0.0.0"; sha256 = "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a"; + revision = "1"; + editedCabalFile = "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4"; libraryHaskellDepends = [ attoparsec base base-compat text time ]; homepage = "https://github.com/bos/aeson"; description = "Parsing of ISO 8601 dates, originally from aeson"; @@ -29163,28 +30816,6 @@ self: { }) {}; "attoparsec-time" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, Cabal - , cabal-doctest, directory, doctest, filepath, scientific, text - , time - }: - mkDerivation { - pname = "attoparsec-time"; - version = "0.1.4"; - sha256 = "0b4h530j01wkx8405b0yf0cz5k7mjglzr72lvv8rr7idd7m4k5iw"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - attoparsec base base-prelude scientific text time - ]; - testHaskellDepends = [ - base base-prelude directory doctest filepath - ]; - homepage = "https://github.com/nikita-volkov/attoparsec-time"; - description = "Attoparsec parsers of time"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "attoparsec-time_1" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bytestring, Cabal , cabal-doctest, directory, doctest, filepath, scientific, text , time @@ -29203,7 +30834,6 @@ self: { homepage = "https://github.com/nikita-volkov/attoparsec-time"; description = "Attoparsec parsers of time"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-trans" = callPackage @@ -29225,15 +30855,14 @@ self: { }: mkDerivation { pname = "attoparsec-uri"; - version = "0.0.3"; - sha256 = "1n89gkgnd8zp7ggklv98y58hk3f45l20wr3m1avcpk9a42ig186n"; + version = "0.0.4"; + sha256 = "1wzisb9xnykaxnp1jp0a3lvh1m2swynk2r2mg6nfv5jzlv52q0sf"; libraryHaskellDepends = [ attoparsec attoparsec-ip base bytedump ip strict text vector ]; homepage = "https://github.com/athanclark/attoparsec-uri#readme"; description = "URI parser / printer using attoparsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attosplit" = callPackage @@ -29288,6 +30917,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "audacity_0_0_2" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory + , explicit-exception, filepath, non-empty, semigroups + , storable-record, storablevector, tagchup, transformers + , utility-ht, xml-basic + }: + mkDerivation { + pname = "audacity"; + version = "0.0.2"; + sha256 = "1916phnj3m12apyjarmda48xr2bq19rfn7sn6nskkbg6qjqxzlnr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring deepseq directory explicit-exception filepath + non-empty semigroups 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; + }) {}; + "audiovisual" = callPackage ({ mkDerivation, base, boundingboxes, colors, deepseq, directory , filepath, free, freetype2, hashable, JuicyPixels @@ -29391,18 +31043,18 @@ self: { "authenticate" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, containers, http-conduit, http-types - , monad-control, network-uri, resourcet, tagstream-conduit, text - , transformers, unordered-containers, xml-conduit + , network-uri, resourcet, tagstream-conduit, text, transformers + , unordered-containers, xml-conduit }: mkDerivation { pname = "authenticate"; - version = "1.3.3.2"; - sha256 = "0c3fcl1i32112jz7w2ss0p1x5xpcvsnnk0vbzi3shvk43rwzfpx6"; + version = "1.3.4"; + sha256 = "1f1gjggfq114h3nrlzg2svm0j5ghp6n9zlgb3fnq2pgpzpdndm9z"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring case-insensitive - conduit containers http-conduit http-types monad-control - network-uri resourcet tagstream-conduit text transformers - unordered-containers xml-conduit + conduit containers http-conduit http-types network-uri resourcet + tagstream-conduit text transformers unordered-containers + xml-conduit ]; homepage = "http://github.com/yesodweb/authenticate"; description = "Authentication methods for Haskell web applications"; @@ -29521,12 +31173,12 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.2"; - sha256 = "1n7pzpxz3bb4l20hy53qdda4r1gwf6j47py08n9w568j7hygrklx"; + version = "1.1.9"; + sha256 = "0hm0njnfgjfbnpjjqmhim773zbzgkfq96caxckcv8vkrj78l839v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base Cabal directory filepath ]; homepage = "https://github.com/tfausak/autoexporter#readme"; description = "Automatically re-export modules"; license = stdenv.lib.licenses.mit; @@ -29605,6 +31257,7 @@ self: { ]; description = "Library for Nix expression dependency generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autonix-deps-kf5" = callPackage @@ -29628,6 +31281,7 @@ self: { ]; description = "Generate dependencies for KDE 5 Nix expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autoproc" = callPackage @@ -29720,26 +31374,6 @@ self: { }) {}; "avers-api" = callPackage - ({ mkDerivation, aeson, avers, base, bytestring, cookie - , http-api-data, servant, text, time, vector - }: - mkDerivation { - pname = "avers-api"; - version = "0.0.18.0"; - sha256 = "1i85g3zf3bli3jqh8vrhf8b51agx8bzx99zgk3r6nqr04k9jmfmi"; - revision = "1"; - editedCabalFile = "0znsxj4igjrgs1xg8x8s9vg88830cvrqb880v9gchn1wp34lfihv"; - libraryHaskellDepends = [ - aeson avers base bytestring cookie http-api-data servant text time - vector - ]; - homepage = "http://github.com/wereHamster/avers-api"; - description = "Types describing the core and extended Avers APIs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "avers-api_0_1_0" = callPackage ({ mkDerivation, aeson, avers, base, bytestring, cookie , http-api-data, servant, text, time, vector }: @@ -29778,30 +31412,6 @@ self: { }) {}; "avers-server" = callPackage - ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring - , bytestring, bytestring-conversion, containers, cookie, cryptonite - , either, http-types, memory, mtl, resource-pool - , rethinkdb-client-driver, servant, servant-server, stm, text, time - , transformers, wai, wai-websockets, websockets - }: - mkDerivation { - pname = "avers-server"; - version = "0.0.19.0"; - sha256 = "0qvfswp9ph96iy809q2jqg45j9msanpcvmh04dc12h86mlcwldg7"; - libraryHaskellDepends = [ - aeson avers avers-api base base64-bytestring bytestring - bytestring-conversion containers cookie cryptonite either - http-types memory mtl resource-pool rethinkdb-client-driver servant - servant-server stm text time transformers wai wai-websockets - websockets - ]; - homepage = "http://github.com/wereHamster/avers-server"; - description = "Server implementation of the Avers API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "avers-server_0_1_0" = callPackage ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring , bytestring, bytestring-conversion, containers, cookie, cryptonite , http-types, memory, mtl, resource-pool, rethinkdb-client-driver @@ -29848,6 +31458,7 @@ self: { homepage = "https://github.com/data61/aviation-cessna172-diagrams"; description = "Diagrams for the Cessna 172 aircraft in aviation"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {aviation-cessna172-weight-balance = null; aviation-units = null; aviation-weight-balance = null;}; @@ -29884,15 +31495,15 @@ self: { "avro" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, containers, data-binary-ieee754, entropy, extra, fail - , hashable, hspec, mtl, pure-zlib, QuickCheck, scientific - , semigroups, tagged, template-haskell, text, unordered-containers - , vector + , bytestring, containers, data-binary-ieee754, directory, entropy + , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib + , QuickCheck, scientific, semigroups, tagged, template-haskell + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "avro"; - version = "0.2.0.0"; - sha256 = "1bs2fpka2pz58hj1x8pv27vm2sdap7rp83fasali228iigvlp9cc"; + version = "0.3.0.0"; + sha256 = "0sfi6jc7pcigpwgkfqq9ckwm7bzhfc9kf2rhznrrsy9qw5i7xrll"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -29900,11 +31511,11 @@ self: { ]; testHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers - entropy extra fail hashable hspec mtl pure-zlib QuickCheck - scientific semigroups tagged template-haskell text - unordered-containers vector + directory entropy extra fail hashable hspec lens lens-aeson mtl + pure-zlib QuickCheck scientific semigroups tagged template-haskell + text transformers unordered-containers vector ]; - homepage = "https://github.com/haskell-works/hw-haskell-avro.git"; + homepage = "https://github.com/GaloisInc/avro.git#readme"; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -29985,33 +31596,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {awesomium = null;}; - "aws" = callPackage + "aws_0_18" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring , case-insensitive, cereal, conduit, conduit-combinators - , conduit-extra, containers, cryptohash, data-default, directory + , conduit-extra, containers, cryptonite, data-default, directory , errors, filepath, http-client, http-client-tls, http-conduit - , http-types, lifted-base, monad-control, mtl, network, old-locale - , QuickCheck, quickcheck-instances, resourcet, safe, scientific - , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, transformers-base, unordered-containers + , http-types, lifted-base, memory, monad-control, mtl, network + , old-locale, QuickCheck, quickcheck-instances, resourcet, safe + , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, transformers-base, unordered-containers , utf8-string, vector, xml-conduit }: mkDerivation { pname = "aws"; - version = "0.16"; - sha256 = "1710jajfla76igqrb2hv455gqhr4wap8225z1bffvjgk4w1cddc4"; - revision = "1"; - editedCabalFile = "0q4nbmi6s2zzp9jc4hwvdml101xskgindv0scyjjzcvl2cfa0zk9"; + version = "0.18"; + sha256 = "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring blaze-builder byteable bytestring case-insensitive cereal conduit - conduit-extra containers cryptohash data-default directory filepath - http-conduit http-types lifted-base monad-control mtl network - old-locale resourcet safe scientific tagged text time transformers - unordered-containers utf8-string vector xml-conduit + conduit-extra containers cryptonite data-default directory filepath + http-conduit http-types lifted-base memory monad-control mtl + network old-locale resourcet safe scientific tagged text time + transformers unordered-containers utf8-string vector xml-conduit ]; testHaskellDepends = [ aeson base bytestring conduit-combinators errors http-client @@ -30022,33 +31631,34 @@ self: { homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aws_0_17_1" = callPackage + "aws" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring , case-insensitive, cereal, conduit, conduit-combinators - , conduit-extra, containers, cryptohash, data-default, directory + , conduit-extra, containers, cryptonite, data-default, directory , errors, filepath, http-client, http-client-tls, http-conduit - , http-types, lifted-base, monad-control, mtl, network, old-locale - , QuickCheck, quickcheck-instances, resourcet, safe, scientific - , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, transformers-base, unordered-containers + , http-types, lifted-base, memory, monad-control, mtl, network + , old-locale, QuickCheck, quickcheck-instances, resourcet, safe + , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, transformers-base, unordered-containers , utf8-string, vector, xml-conduit }: mkDerivation { pname = "aws"; - version = "0.17.1"; - sha256 = "1q4qh58vj8447a4fl88n3nkpdc4yv293qsh02w6zvszd6ch61yh7"; + version = "0.19"; + sha256 = "0ykpnm2kyhjf1rf5ldhv0c7zy3zq7jgqmb6xwywk8b2s80ai4fxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring blaze-builder byteable bytestring case-insensitive cereal conduit - conduit-extra containers cryptohash data-default directory filepath - http-conduit http-types lifted-base monad-control mtl network - old-locale resourcet safe scientific tagged text time transformers - unordered-containers utf8-string vector xml-conduit + conduit-extra containers cryptonite data-default directory filepath + http-conduit http-types lifted-base memory monad-control mtl + network old-locale resourcet safe scientific tagged text time + transformers unordered-containers utf8-string vector xml-conduit ]; testHaskellDepends = [ aeson base bytestring conduit-combinators errors http-client @@ -30062,6 +31672,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aws-cloudfront-signed-cookies" = callPackage + ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types + , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog + , lens, lens-aeson, neat-interpolation, optparse-applicative, pem + , text, time, unordered-containers, vector + }: + mkDerivation { + pname = "aws-cloudfront-signed-cookies"; + version = "0.2.0.0"; + sha256 = "0cbhlxrdx09050pblca1p8f0f7n51p4nifp1xk48203ap435dnpj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring + bytestring cookie cryptonite lens lens-aeson optparse-applicative + pem text time unordered-containers vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog neat-interpolation ]; + homepage = "https://github.com/typeclasses/aws-cloudfront-signed-cookies"; + description = "Generate signed cookies for AWS CloudFront"; + license = stdenv.lib.licenses.mit; + }) {}; + "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -30141,6 +31775,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aws-easy" = callPackage + ({ mkDerivation, amazonka, amazonka-dynamodb, amazonka-s3, base + , bytestring, lens, resourcet, split, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "aws-easy"; + version = "0.1.0.1"; + sha256 = "0sl3whg7x02c3cph5p72rlkycsr2m3ni0kad5rs0q644wgvhqvm5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka base bytestring lens resourcet template-haskell + ]; + executableHaskellDepends = [ + amazonka amazonka-dynamodb amazonka-s3 base lens split text + unordered-containers + ]; + homepage = "https://github.com/rcook/aws-easy#readme"; + description = "Helper function and types for working with amazonka"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aws-ec2" = callPackage ({ mkDerivation, aeson, aws, base, base16-bytestring , base64-bytestring, blaze-builder, blaze-markup, byteable @@ -30172,6 +31830,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aws-ec2-knownhosts" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , directory, filepath, io-streams, process, system-filepath, text + , text-format, turtle + }: + mkDerivation { + pname = "aws-ec2-knownhosts"; + version = "0.1.0.0"; + sha256 = "000bwhsxvsfdz6vm5rkil34hx7d4yv8f0zwfjnxfn0xcaxxa9r50"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring directory filepath + io-streams process text text-format + ]; + executableHaskellDepends = [ + aeson base io-streams system-filepath turtle + ]; + homepage = "http://github.com/bitnomial/aws-ec2-knownhosts"; + description = "Capture and manage AWS EC2 known_host pubkeys"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aws-elastic-transcoder" = callPackage ({ mkDerivation, aeson, aws, aws-sign4, base, bytestring, Cabal , conduit, containers, http-conduit, http-types, QuickCheck @@ -30356,6 +32038,7 @@ self: { 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-performance-tests" = callPackage @@ -30478,6 +32161,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aws-ses-easy" = callPackage + ({ mkDerivation, amazonka, amazonka-ses, base, criterion + , exceptions, lens, lucid, mtl, tasty, tasty-hspec, text + , text-conversions + }: + mkDerivation { + pname = "aws-ses-easy"; + version = "0.1.0"; + sha256 = "0wlwff18k1qf6n6q2bhd1n2w58nsdmqx5c1yhhfqxkjyxz9flccn"; + libraryHaskellDepends = [ + amazonka amazonka-ses base exceptions lens lucid mtl text + text-conversions + ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/jxv/aws-ses-easy#readme"; + description = "Wrapper over Amazonka's SES"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aws-sign4" = callPackage ({ mkDerivation, attempt, aws, base, blaze-builder, byteable , bytestring, bytestring-lexing, Cabal, case-insensitive @@ -30519,6 +32223,7 @@ self: { homepage = "https://github.com/agrafix/aws-simple#readme"; description = "Dead simple bindings to commonly used AWS Services"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sns" = callPackage @@ -30561,7 +32266,6 @@ self: { 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 = [ "i686-linux" "x86_64-linux" ]; }) {}; "axiomatic-classes" = callPackage @@ -30581,6 +32285,7 @@ self: { ]; description = "Specify axioms for type classes and quickCheck all available instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {control-invariants = null;}; @@ -30702,6 +32407,8 @@ self: { pname = "b-tree"; version = "0.1.3"; sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb"; + revision = "1"; + editedCabalFile = "0y569gdl9b79c98lkd2zff71svi0b1i64dihc5dmsjlmzkwfzzhw"; libraryHaskellDepends = [ base binary bytestring containers directory errors exceptions filepath lens mmap mtl pipes pipes-interleave transformers vector @@ -30713,42 +32420,75 @@ self: { homepage = "http://github.com/bgamari/b-tree"; description = "Immutable disk-based B* trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "b9" = callPackage ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes , bytestring, conduit, conduit-extra, ConfigFile, directory - , filepath, free, hashable, hspec, hspec-expectations, mtl + , filepath, free, hashable, hspec, hspec-expectations, lens, mtl , optparse-applicative, parallel, parsec, pretty, pretty-show - , process, QuickCheck, random, semigroups, syb, template, text - , time, transformers, unordered-containers, vector, yaml + , process, QuickCheck, random, shake, syb, template, text, time + , transformers, unordered-containers, vector, yaml }: mkDerivation { pname = "b9"; - version = "0.5.35"; - sha256 = "11j2mr03hn9xz7dq1p7kr448mdj1dva360xf6n7qmq3nq4vrl1av"; + version = "0.5.44"; + sha256 = "0fr9s2s4gwh6l80s9j4jj5s10mp92dkxs5fwjlk8vbyg6xi6sgza"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base bifunctors binary boxes bytestring conduit - conduit-extra ConfigFile directory filepath free hashable mtl - parallel parsec pretty pretty-show process QuickCheck random - semigroups syb template text time transformers unordered-containers - vector yaml + conduit-extra ConfigFile directory filepath free hashable lens mtl + parallel parsec pretty pretty-show process QuickCheck random shake + syb template text time transformers unordered-containers vector + yaml ]; executableHaskellDepends = [ - base bytestring directory optparse-applicative + base bytestring directory lens optparse-applicative ]; testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations QuickCheck - semigroups text unordered-containers vector yaml + aeson base bytestring hspec hspec-expectations QuickCheck text + unordered-containers vector yaml ]; homepage = "https://github.com/sheyll/b9-vm-image-builder"; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; }) {}; + "b9_0_5_47" = callPackage + ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes + , bytestring, conduit, conduit-extra, ConfigFile, directory + , filepath, free, hashable, hspec, hspec-expectations, lens, mtl + , optparse-applicative, parallel, parsec, pretty, pretty-show + , process, QuickCheck, random, shake, syb, template, text, time + , transformers, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "b9"; + version = "0.5.47"; + sha256 = "1jnfci7px5hf6i729mz1fbx5sfg35q8l3663ls6pkf6b4kx8qfyz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bifunctors binary boxes bytestring conduit + conduit-extra ConfigFile directory filepath free hashable lens mtl + parallel parsec pretty pretty-show process QuickCheck random shake + syb template text time transformers unordered-containers vector + yaml + ]; + executableHaskellDepends = [ + base bytestring directory lens optparse-applicative + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations QuickCheck text + unordered-containers vector yaml + ]; + homepage = "https://github.com/sheyll/b9-vm-image-builder"; + description = "A tool and library for building virtual machine images"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "babl" = callPackage ({ mkDerivation, babl, base }: mkDerivation { @@ -30777,7 +32517,7 @@ self: { ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backdropper" = callPackage @@ -30799,26 +32539,25 @@ self: { }) {}; "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 + ({ mkDerivation, base, bifunctors, binary, criterion, deepseq + , directory, hmatrix, lens, microlens, mnist-idx, mwc-random + , primitive, reflection, time, transformers, type-combinators , vector }: mkDerivation { pname = "backprop"; - version = "0.0.3.0"; - sha256 = "1rjqv29fk0yqbqygnhm14zrjigicsgbiq5gcvr8j4kqkb8s9l6df"; + version = "0.1.5.1"; + sha256 = "1jii5nwnkh44jxxyfkgm14695ah7p3rpbydcgj84g5ijmhdnmks0"; libraryHaskellDepends = [ - ad base generics-sop microlens microlens-mtl microlens-th mtl - profunctors reflection tagged transformers-base type-combinators + base binary deepseq microlens primitive reflection transformers + type-combinators vector ]; benchmarkHaskellDepends = [ - base bifunctors criterion deepseq directory generics-sop hmatrix - mnist-idx mwc-random time transformers type-combinators vector + base bifunctors criterion deepseq directory hmatrix lens mnist-idx + mwc-random time transformers vector ]; - homepage = "https://github.com/mstksg/backprop"; - description = "Heterogeneous, type-safe automatic backpropagation in Haskell"; + homepage = "https://github.com/mstksg/backprop#readme"; + description = "Heterogeneous automatic differentation (backpropagation)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -30911,6 +32650,7 @@ self: { homepage = "https://github.com/ndmitchell/bake#readme"; description = "Continuous integration system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ballast" = callPackage @@ -31066,8 +32806,8 @@ self: { }) {}; "bamse" = callPackage - ({ mkDerivation, base, com, directory, filepath, HUnit, old-time - , pretty, process, QuickCheck, regex-compat + ({ mkDerivation, base, com, directory, filepath, old-time, pretty + , process, regex-compat }: mkDerivation { pname = "bamse"; @@ -31078,7 +32818,6 @@ self: { libraryHaskellDepends = [ base com directory filepath old-time pretty process regex-compat ]; - executableHaskellDepends = [ HUnit QuickCheck ]; description = "A Windows Installer (MSI) generator framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -31109,6 +32848,7 @@ self: { homepage = "https://github.com/tippenein/BankHoliday"; description = "A library for determining US bank holidays"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bank-holidays-england" = callPackage @@ -31243,6 +32983,7 @@ self: { homepage = "https://github.com/philopon/barrier"; description = "Shields.io style badge generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "barrier-monad" = callPackage @@ -31257,12 +32998,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base_4_10_0_0" = callPackage + "base_4_11_0_0" = callPackage ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: mkDerivation { pname = "base"; - version = "4.10.0.0"; - sha256 = "06sgjlf3v3yyp0rdyi3f7qlp5iqw7kg0zrwml9lmccdy93pahclv"; + version = "4.11.0.0"; + sha256 = "1p18cm61ql911nqfld1kc7h6qpmhfxrf1xyahik180a7rbygbkq3"; libraryHaskellDepends = [ ghc-prim invalid-cabal-flag-settings rts ]; @@ -31284,6 +33025,66 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-compat_0_10_1" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.10.1"; + sha256 = "0vdv28qylnpqhq6jnhiqvnc0rmbrb0dvnsfdvp094sm7sj9j3v5j"; + libraryHaskellDepends = [ base unix ]; + description = "A compatibility layer for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "base-compat-batteries" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.10.1"; + sha256 = "1j8ky6241mj1ymbwm9scvyvbknj7n2r56cnkg9y1zf2xwjpqnmqm"; + libraryHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "base-compat-migrate" = callPackage + ({ mkDerivation, base, base-compat }: + mkDerivation { + pname = "base-compat-migrate"; + version = "0.1.0.0"; + sha256 = "1xppwdkg347k1qq4pibivv89y4k8q70bmj9fmq6qwsbkizp7hsym"; + revision = "1"; + editedCabalFile = "047zifghyzjg7c0pdbjg1r5w3d6v0pz5miifam1jrzp2pp9a2jai"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base base-compat ]; + doHaddock = false; + homepage = "https://github.com/bergmark/base-compat-migrate#readme"; + description = "Helps migrating projects to base-compat(-batteries)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "base-encoding" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, text + }: + mkDerivation { + pname = "base-encoding"; + version = "0.1.0.0"; + sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring text + ]; + description = "Binary-to-text encodings (e.g. base64)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "base-feature-macros" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -31326,21 +33127,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-noprelude"; - version = "4.9.1.0"; - sha256 = "15gq6naaqh3zcbcaib7fi0k4qs1w3ppd34rky6a1d8r62grisq8i"; - libraryHaskellDepends = [ base ]; - doHaddock = false; - homepage = "https://github.com/hvr/base-noprelude"; - description = "\"base\" package sans \"Prelude\" module"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "base-noprelude_4_10_0_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "base-noprelude"; - version = "4.10.0.0"; - sha256 = "1jc1szrja1651vf73kprsa0yq73w331i1g08p54w1znkilf7jalf"; + version = "4.11.0.0"; + sha256 = "11q2cqy865q13hy2kc9k41cprdmlzh172prh5dhy3xp6zsbppjnh"; libraryHaskellDepends = [ base ]; doHaddock = false; homepage = "https://github.com/hvr/base-noprelude"; @@ -31350,13 +33138,15 @@ self: { }) {}; "base-orphans" = callPackage - ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: mkDerivation { pname = "base-orphans"; - version = "0.6"; - sha256 = "03mdww5j0gwai7aqlx3m71ldmjcr99jzpkcclzjfclk6a6kjla67"; + version = "0.7"; + sha256 = "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/haskell-compat/base-orphans#readme"; description = "Backwards-compatible orphan instances for base"; license = stdenv.lib.licenses.mit; @@ -31412,7 +33202,6 @@ self: { homepage = "https://github.com/pxqr/base32-bytestring"; description = "Fast base32 and base32hex codec for ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "base32string" = callPackage @@ -31500,6 +33289,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base64-bytestring-type" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , binary, bytestring, cereal, deepseq, hashable, QuickCheck, tasty + , tasty-quickcheck, text + }: + mkDerivation { + pname = "base64-bytestring-type"; + version = "1"; + sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl"; + revision = "2"; + editedCabalFile = "02ywscryrrh6xwfi0gl4qvxy36jzy7i8y2jsv6mma2av2abr9ms7"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring binary bytestring cereal + deepseq hashable QuickCheck text + ]; + testHaskellDepends = [ + aeson base binary bytestring cereal tasty tasty-quickcheck + ]; + homepage = "https://github.com/futurice/haskell-base64-bytestring-type#readme"; + description = "A newtype around ByteString, for base64 encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base64-conduit" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit , hspec, QuickCheck, transformers @@ -31559,14 +33372,26 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; - version = "0.0.4"; - sha256 = "1zdqv8dbzv8jx6z8fcghinbnxdc5fb97i7sdfswdr1fcp8jq6i38"; + version = "0.0.7"; + sha256 = "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell-foundation/foundation"; description = "Foundation scrap box of array & string"; license = stdenv.lib.licenses.bsd3; }) {}; + "basen-bytestring" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck }: + mkDerivation { + pname = "basen-bytestring"; + version = "0.1.0.1"; + sha256 = "131aamd4kq7jdmpl4ammgqgykbh81mkziaf0kpic5c20al4a73lp"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring QuickCheck ]; + homepage = "https://github.com/FilWisher/basen-bytestring#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "basex-client" = callPackage ({ mkDerivation, base, network, pureMD5, utf8-string }: mkDerivation { @@ -31619,18 +33444,17 @@ self: { "basic-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable - , lifted-base, ReadArgs, safe, text, transformers - , unordered-containers, vector + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "basic-prelude"; - version = "0.6.1.1"; - sha256 = "1irfz57w4966y1vxkgh6bqxdlw3jijwz1pmq3qz9748linnpicgp"; + version = "0.7.0"; + sha256 = "0yckmnvm6i4vw0mykj4fzl4ldsf67v8d2h0vp1bakyj84n4myx8h"; libraryHaskellDepends = [ - base bytestring containers filepath hashable lifted-base ReadArgs - safe text transformers unordered-containers vector + base bytestring containers filepath hashable text transformers + unordered-containers vector ]; - homepage = "https://github.com/snoyberg/basic-prelude"; + homepage = "https://github.com/snoyberg/basic-prelude#readme"; description = "An enhanced core prelude; a common foundation for alternate preludes"; license = stdenv.lib.licenses.mit; }) {}; @@ -31646,6 +33470,7 @@ self: { ]; description = "Basic examples and functions for generics-sop"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "baskell" = callPackage @@ -31666,6 +33491,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "batch" = callPackage + ({ mkDerivation, async, base, hspec, lifted-async, lifted-base + , monad-control, mtl, stm, timespan, transformers-base + }: + mkDerivation { + pname = "batch"; + version = "0.1.0.0"; + sha256 = "18jphm2dpn5gz4514gk525rhhgwflzb6f913rwf08dqaqlshr39r"; + libraryHaskellDepends = [ + async base lifted-async lifted-base monad-control mtl stm timespan + transformers-base + ]; + testHaskellDepends = [ base hspec stm timespan ]; + homepage = "https://github.com/agrafix/batch#readme"; + description = "Simplify queuing up data and processing it in batch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "batch-rename" = callPackage ({ mkDerivation, base, directory, filepath, Glob }: mkDerivation { @@ -31743,6 +33586,60 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "battleplace" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, data-default + , hashable, memory, servant, text, vector + }: + mkDerivation { + pname = "battleplace"; + version = "0.1.0.1"; + sha256 = "1zjjmz36lxxrxgx449212q878mzavjpwx5jad0lk9ninpas16h5v"; + libraryHaskellDepends = [ + aeson base bytestring cereal data-default hashable memory servant + text vector + ]; + description = "Core definitions for BattlePlace.io service"; + license = stdenv.lib.licenses.mit; + }) {}; + + "battleplace-api" = callPackage + ({ mkDerivation, base, battleplace, servant, servant-client }: + mkDerivation { + pname = "battleplace-api"; + version = "0.1.0.1"; + sha256 = "1pi1vcniyrpq1xfrizhvgw7xbrc332649zg4jl1fjbqn4l4xqrlg"; + libraryHaskellDepends = [ + base battleplace servant servant-client + ]; + description = "Public API definitions of BattlePlace.io service"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "battleship-combinatorics" = callPackage + ({ mkDerivation, base, combinatorial, containers, deepseq + , directory, filepath, non-empty, pooled-io, prelude-compat + , QuickCheck, random, semigroups, set-cover, storable-record + , storablevector, temporary, transformers, utility-ht + }: + mkDerivation { + pname = "battleship-combinatorics"; + version = "0.0.0.1"; + sha256 = "00zr3798y5h640rdhls4xkaqmj6n90qnxglq7bq8bvxl68a8ibxd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base combinatorial containers deepseq directory filepath non-empty + pooled-io prelude-compat QuickCheck random semigroups set-cover + storable-record storablevector temporary transformers utility-ht + ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "http://hub.darcs.net/thielema/battleship-combinatorics/"; + description = "Compute number of possible arrangements in the battleship game"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "battleships" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, base64-bytestring , blaze-svg, bytestring, cereal, colour, containers, cookie @@ -31799,14 +33696,15 @@ self: { }) {}; "bbdb" = callPackage - ({ mkDerivation, base, mtl, parsec }: + ({ mkDerivation, base, hspec, parsec }: mkDerivation { pname = "bbdb"; - version = "0.5"; - sha256 = "13pf760i1iwgfnbh33cgmrri2i87rqlnszcnsq8gwn16h23cr883"; - libraryHaskellDepends = [ base mtl parsec ]; - homepage = "http://www.nadineloveshenry.com/haskell/database-bbdb.html"; - description = "Ability to read, write, and examine BBDB files"; + version = "0.8"; + sha256 = "0p1aphzp55h4zlh3h8xnm6mxvsxyrab98ms8f07iqvp4p267kryw"; + libraryHaskellDepends = [ base parsec ]; + testHaskellDepends = [ base hspec parsec ]; + homepage = "https://github.com/henrylaxen/bbdb"; + description = "Ability to read, write, and modify BBDB files"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -31829,8 +33727,8 @@ self: { ({ mkDerivation, base, bytestring, data-default, entropy, memory }: mkDerivation { pname = "bcrypt"; - version = "0.0.10"; - sha256 = "1dhfxpz0nbm39xi28khnvqvriwh1rpycc66p9k5hpggjipzzk604"; + version = "0.0.11"; + sha256 = "1vzwf9g6mvn4v1cn1m0axjyi2l0glnvv8c49v1j51dm7xn41fcz4"; libraryHaskellDepends = [ base bytestring data-default entropy memory ]; @@ -31838,6 +33736,54 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bdcs" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal + , codec-rpm, cond, conduit, conduit-combinators, conduit-extra + , containers, content-store, cpio-conduit, cryptonite, directory + , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree + , gitrev, hspec, http-conduit, HUnit, listsafe, memory + , monad-control, monad-logger, monad-loops, mtl, network-uri + , ostree, parsec, parsec-numbers, persistent, persistent-sqlite + , persistent-template, process, regex-pcre, resourcet, split, tar + , tar-conduit, temporary, text, time, unix, unordered-containers + , xml-conduit + }: + mkDerivation { + pname = "bdcs"; + version = "0.4.0"; + sha256 = "008rd17zfg63w9szp4jrbd9z9sg4zjf4j4a5gm3skhn2nq7qaw9i"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + aeson base bytestring codec-rpm cond conduit conduit-combinators + conduit-extra containers content-store cpio-conduit cryptonite + directory esqueleto exceptions filepath gi-gio gi-glib gi-ostree + gitrev http-conduit listsafe memory monad-control monad-logger mtl + network-uri parsec parsec-numbers persistent persistent-sqlite + persistent-template process regex-pcre resourcet split tar + tar-conduit temporary text time unix unordered-containers + xml-conduit + ]; + libraryPkgconfigDepends = [ ostree ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cond conduit content-store + directory filepath monad-logger monad-loops mtl network-uri + persistent-sqlite process regex-pcre text time + ]; + testHaskellDepends = [ + aeson base bytestring codec-rpm cond conduit conduit-combinators + containers directory esqueleto filepath gi-gio gi-glib hspec HUnit + listsafe monad-logger mtl parsec parsec-numbers persistent + persistent-sqlite persistent-template resourcet text time unix + ]; + homepage = "https://github.com/weldr/bdcs"; + description = "Tools for managing a content store of software packages"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) ostree;}; + "bdd" = callPackage ({ mkDerivation, base, directory, HUnit, mtl, process , test-framework, test-framework-hunit, transformers @@ -31892,6 +33838,8 @@ self: { pname = "beam"; version = "0.3.2.0"; sha256 = "0nkbn87i6pk2cmmcmzlcydlqwk95b7znncsyn135nl8r07vsqvqs"; + revision = "1"; + editedCabalFile = "1nh4hh7cslr75jwsj3dwfdphqm51bl7v0k1qvbaxkiac7wh3f19p"; libraryHaskellDepends = [ base conduit containers convertible HDBC HDBC-sqlite3 microlens mtl pretty semigroups tagged text time uniplate @@ -31902,6 +33850,92 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-core" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty + , tasty-hunit, text, time, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.7.2.0"; + sha256 = "1m3jyz1wh9g14cv5nyklqi6v8rqxi73xnppk308lrjh00iwrvgvb"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri tagged text time vector-sized + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text time + ]; + homepage = "http://travis.athougies.net/projects/beam.html"; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "beam-migrate" = callPackage + ({ mkDerivation, aeson, base, beam-core, bytestring, containers + , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable + , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text + , time, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "beam-migrate"; + version = "0.3.1.0"; + sha256 = "03chg3xbsvpcq4m4vvmr1jwslaj9ik8v3x8fiw8b5r6x401pf8za"; + libraryHaskellDepends = [ + aeson base beam-core bytestring containers deepseq dependent-map + dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel + pqueue pretty scientific text time unordered-containers uuid-types + vector + ]; + homepage = "https://travis.athougies.net/projects/beam.html"; + description = "SQL DDL support and migrations support library for Beam"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "beam-postgres" = callPackage + ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring + , case-insensitive, conduit, free, hashable, haskell-src-exts + , lifted-base, monad-control, mtl, network-uri, postgresql-libpq + , postgresql-simple, scientific, text, time, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "beam-postgres"; + version = "0.3.1.0"; + sha256 = "1nv7r50b4khx1ski5c64dywphzbn1x9xx9hp8b8zfh88i05b5jf6"; + libraryHaskellDepends = [ + aeson base beam-core beam-migrate bytestring case-insensitive + conduit free hashable haskell-src-exts lifted-base monad-control + mtl network-uri postgresql-libpq postgresql-simple scientific text + time unordered-containers uuid vector + ]; + homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-postgres"; + description = "Connection layer between beam and postgres"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "beam-sqlite" = callPackage + ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate + , bytestring, dlist, free, hashable, mtl, network-uri, scientific + , sqlite-simple, text, time, unix + }: + mkDerivation { + pname = "beam-sqlite"; + version = "0.3.2.0"; + sha256 = "06lmsajdlqc2178p4lkgwv2hh49dmjygrfjk081sr2xbhgnslr9s"; + libraryHaskellDepends = [ + aeson attoparsec base beam-core beam-migrate bytestring dlist free + hashable mtl network-uri scientific sqlite-simple text time unix + ]; + homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-sqlite/"; + description = "Beam driver for SQLite"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-th" = callPackage ({ mkDerivation, base, beam, doctest, doctest-discover, microlens , mtl, tasty, tasty-hunit, template-haskell, text, th-expand-syns @@ -31951,16 +33985,17 @@ self: { }) {}; "bearriver" = callPackage - ({ mkDerivation, base, dunai, mtl, transformers }: + ({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }: mkDerivation { pname = "bearriver"; - version = "0.10.4"; - sha256 = "0arykaxbl9wsvlws8lhnaw64xcrhqjq470f0rlpzjljqibi7n4f1"; - libraryHaskellDepends = [ base dunai mtl transformers ]; + version = "0.10.4.3"; + sha256 = "0d8yhccsg66163cjkdccdjf26rkzv4i7fv454fj9vhylxcggzjin"; + libraryHaskellDepends = [ + base dunai MonadRandom mtl transformers + ]; homepage = "keera.co.uk"; description = "A replacement of Yampa based on Monadic Stream Functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "beautifHOL" = callPackage @@ -32046,18 +34081,48 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "belka" = callPackage + ({ mkDerivation, aeson, aeson-value-parser, attoparsec, base + , base-prelude, base64-bytestring, bug, bytestring + , case-insensitive, hashable, http-client, http-client-tls + , http-media, http-types, iri, json-bytes-builder, mtl, potoki + , potoki-core, ptr, QuickCheck, quickcheck-instances, rerebase + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "belka"; + version = "0.8"; + sha256 = "1827pjvw13a2zk69rq98sddg70rp9hzjy79jkkc0xa4c6s7y5fny"; + libraryHaskellDepends = [ + aeson aeson-value-parser attoparsec base base-prelude + base64-bytestring bug bytestring case-insensitive hashable + http-client http-client-tls http-media http-types iri + json-bytes-builder mtl potoki potoki-core ptr semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + bug iri potoki QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/belka"; + description = "HTTP client DSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bench" = callPackage - ({ mkDerivation, base, criterion, optparse-applicative, silently - , text, turtle + ({ mkDerivation, base, criterion, optparse-applicative, process + , silently, text, turtle }: mkDerivation { pname = "bench"; - version = "1.0.6"; - sha256 = "0ss5liap1f71i7igpszdpb6himl30gibydlknx9ka44dsrh7dhq9"; + version = "1.0.9"; + sha256 = "0c58m6w0xci76h97p7dkzcnxn8l9drsl9gz5gihhfzdxiardahrw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base criterion optparse-applicative silently text turtle + base criterion optparse-applicative process silently text turtle ]; homepage = "http://github.com/Gabriel439/bench"; description = "Command-line benchmark tool"; @@ -32261,6 +34326,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "betris" = callPackage + ({ mkDerivation, base, containers, lens, linear, random, stm + , stm-chans, vty + }: + mkDerivation { + pname = "betris"; + version = "0.1.0.0"; + sha256 = "1qn326s4xydvvgmrhqi48cc2pl9b3mp7swc82qk59gj7cx4dx222"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers lens linear random stm stm-chans vty + ]; + executableHaskellDepends = [ + base containers lens linear random stm stm-chans vty + ]; + homepage = "https://github.com/mlang/betris#readme"; + description = "Braille friendly vertical version of tetris"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "between" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -32319,8 +34405,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, time }: mkDerivation { pname = "bgmax"; - version = "0.2.0.1"; - sha256 = "0h1vvk0xd5swlv98ckf2pr0lgrq2dmbgfp8zhxnjaz2mijrvr2if"; + version = "0.2.0.2"; + sha256 = "05mw9zv1r1zarnqbbz5qhgd173y52nkkv099x5zi2w1j96ca2pmd"; libraryHaskellDepends = [ attoparsec base bytestring time ]; homepage = "http://github.com/jonpetterbergman/bgmax"; description = "Parse BgMax-files"; @@ -32343,6 +34429,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bhoogle" = callPackage + ({ mkDerivation, base, brick, bytestring, containers, directory + , filepath, hoogle, lens, process, protolude, text, time, vector + , vty + }: + mkDerivation { + pname = "bhoogle"; + version = "0.1.2.6"; + sha256 = "0p6zh1rh80hzrm36w6d5hr6qjkfc71cr96dk9shrndnxlp8vlxsn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick bytestring containers directory filepath hoogle lens + process protolude text time vector vty + ]; + homepage = "https://github.com/andrevdm/bhoogle#readme"; + description = "Simple terminal GUI for local hoogle"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bibdb" = callPackage ({ mkDerivation, alex, array, async, base, bibtex, bytestring , containers, curl, download-curl, filepath, happy, microlens @@ -32428,21 +34534,24 @@ self: { "bifunctors" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , QuickCheck, semigroups, tagged, template-haskell, transformers - , transformers-compat + , hspec-discover, QuickCheck, semigroups, tagged, template-haskell + , th-abstraction, transformers, transformers-compat }: mkDerivation { pname = "bifunctors"; - version = "5.4.2"; - sha256 = "13fwvw1102ik96pgi85i34kisz1h237vgw88ywsgifsah9kh4qiq"; + version = "5.5.2"; + sha256 = "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark"; + revision = "2"; + editedCabalFile = "0glrvir6md8a1ncr6ah95a5mnn7n9v8yl85afvdx24i9z1nr1319"; libraryHaskellDepends = [ base base-orphans comonad containers semigroups tagged - template-haskell transformers transformers-compat + template-haskell th-abstraction transformers transformers-compat ]; testHaskellDepends = [ base hspec QuickCheck template-haskell transformers transformers-compat ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; @@ -32542,6 +34651,7 @@ self: { homepage = "http://www.leksah.org"; description = "Leksah plugin base"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {leksah-dummy = null; leksah-main = null; leksah-plugin-pane = null;}; @@ -32650,6 +34760,8 @@ self: { pname = "binary"; version = "0.7.6.1"; sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg"; + revision = "1"; + editedCabalFile = "0lq4zn0wzfh7pwc163l2fain297njpd82jgjwkylbza3qs0nfx9m"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -32720,15 +34832,17 @@ self: { }) {}; "binary-conduit" = callPackage - ({ mkDerivation, base, binary, bytestring, conduit, hspec - , QuickCheck, quickcheck-assertions, resourcet, vector + ({ mkDerivation, base, binary, bytestring, conduit, exceptions + , hspec, QuickCheck, quickcheck-assertions, resourcet, vector }: mkDerivation { pname = "binary-conduit"; - version = "1.2.5"; - sha256 = "06sbs5kib5jdfxn0fj2yx2wjysgr7g0alnjg1v6iwi7rw2m1gm11"; + version = "1.3"; + sha256 = "1kfc421r8p0zxn5dkm9kzj4n9pharnl809hkjnr55dbrnr3vvya3"; + revision = "1"; + editedCabalFile = "0y08nw3y5jgrw5waa25b75iwsibnd1m9rbpqrvz5j4xq6baqw6kx"; libraryHaskellDepends = [ - base binary bytestring conduit resourcet vector + base binary bytestring conduit exceptions vector ]; testHaskellDepends = [ base binary bytestring conduit hspec QuickCheck @@ -32782,6 +34896,7 @@ self: { homepage = "https://github.com/A1-Triard/binary-ext"; description = "An alternate with typed errors for Data.Binary.Get monad from 'binary' library."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-file" = callPackage @@ -32871,33 +34986,6 @@ self: { }) {}; "binary-orphans" = 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.6.0"; - sha256 = "19c4avasgjzy81dg0ih4j769kqg0sn40jh6yxwjv5zh0bxzdrqg0"; - revision = "1"; - editedCabalFile = "1knb7lxgvhkai7p2qgb2zmqnrfm08liga6y794p9l5b5j0kcy55i"; - 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; - }) {}; - - "binary-orphans_0_1_8_0" = callPackage ({ mkDerivation, aeson, base, binary, case-insensitive, hashable , QuickCheck, quickcheck-instances, scientific, tagged, tasty , tasty-quickcheck, text, text-binary, time, unordered-containers @@ -32907,6 +34995,8 @@ self: { pname = "binary-orphans"; version = "0.1.8.0"; sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi"; + revision = "2"; + editedCabalFile = "1kvrp3dfqx49lkvjvglv18r7yzb165wisg953yih9sgksm02pxf5"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -32920,7 +35010,6 @@ self: { 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 @@ -32943,6 +35032,7 @@ self: { 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 @@ -32975,6 +35065,7 @@ self: { homepage = "https://github.com/winterland1989/binary-parsers"; description = "Extends binary with parsec/attoparsec style parsing combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-protocol" = callPackage @@ -33027,11 +35118,12 @@ self: { ({ mkDerivation, base, bytestring, cborg, serialise }: mkDerivation { pname = "binary-serialise-cbor"; - version = "0.1.1.0"; - sha256 = "0wrf9skl99aalf9pbb8a43i80r8vimn6vih4sidw615cw3k4yapg"; + version = "0.2.0.0"; + sha256 = "1kcqmxz77jmdkknpbjr860xmqrib3adh9rm99agidicg66ilsavv"; libraryHaskellDepends = [ base bytestring cborg serialise ]; description = "Yet Another Binary Serialisation Library (compatibility shim)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-shared" = callPackage @@ -33075,6 +35167,7 @@ self: { ]; description = "Format to store data using the binary transform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {binary-transform = null;}; @@ -33122,8 +35215,8 @@ self: { pname = "binary-tagged"; version = "0.1.4.2"; sha256 = "1167rlb2lnib1vin9p75hp7fzcjqxljlw56bhmkwn05c5f6an7ri"; - revision = "7"; - editedCabalFile = "04l05gfbf3hf0pnkjpclyfqb9jaa665z4f89kf43lmd19qml6h04"; + revision = "8"; + editedCabalFile = "0a8xcrx2lm8yzcnrf76c1wynn238i87yz3lqlgrg5n9csdc0bhj1"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable nats scientific semigroups SHA tagged text @@ -33145,6 +35238,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-tree" = callPackage + ({ mkDerivation, base, ChasingBottoms, checkers, criterion, deepseq + , doctest, ghc-prim, HUnit, QuickCheck, random, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "binary-tree"; + version = "0.1.0.0"; + sha256 = "12bb144il2ra4l0zbd7ydvdjv9rpbldp2dn80mafx96782ybhikr"; + libraryHaskellDepends = [ base deepseq ghc-prim ]; + testHaskellDepends = [ + base ChasingBottoms checkers doctest HUnit QuickCheck + test-framework test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base criterion random ]; + homepage = "https://github.com/oisdk/binary-tree#readme"; + license = stdenv.lib.licenses.mit; + }) {}; + "binary-typed" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , murmur-hash, tasty, tasty-hunit, tasty-quickcheck @@ -33165,6 +35277,7 @@ self: { homepage = "https://github.com/quchen/binary-typed"; description = "Type-safe binary serialization"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binarydefer" = callPackage @@ -33241,7 +35354,7 @@ self: { homepage = "https://bitbucket.org/accursoft/binding"; description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bindings" = callPackage @@ -33259,8 +35372,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "bindings-DSL"; - version = "1.0.23"; - sha256 = "1rqhkk8hn1xjl3705dvakxx93q89vp0fw22v2cbrlapbir27cv7b"; + version = "1.0.24"; + sha256 = "03n8z5qxrrq4l6h2f3xyav45f5v2gr112g4l4r4jw8yfvr8qyk93"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/jwiegley/bindings-dsl/wiki"; description = "FFI domain specific language, on top of hsc2hs"; @@ -33282,29 +35395,55 @@ self: { }) {esound = null;}; "bindings-GLFW" = callPackage - ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor - , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm - , mesa, template-haskell, test-framework, test-framework-hunit + ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11 + , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr + , libXxf86vm, test-framework, test-framework-hunit }: mkDerivation { pname = "bindings-GLFW"; - version = "3.1.2.3"; - sha256 = "1xmmwxbjpxwndiacrh2mk3lih6cs8d83ax07vg5sgyp5d7qigvik"; - libraryHaskellDepends = [ base bindings-DSL template-haskell ]; + version = "3.1.2.4"; + sha256 = "0d8fjckqykvxy9fs6b7k1fb5161wfbnif5ghrc1q1nlx9ngiykkr"; + libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ - libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr - libXxf86vm mesa + libGL libX11 libXcursor libXext libXfixes libXi libXinerama + libXrandr libXxf86vm ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; - inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; - inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; - inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; - inherit (pkgs) mesa;}; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXxf86vm;}; + + "bindings-GLFW_3_2_1_0" = callPackage + ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11 + , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr + , libXxf86vm, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "bindings-GLFW"; + version = "3.2.1.0"; + sha256 = "1sbbms17yyrv5cmf584bc5k4bh8l2vrrhkz2693nyhkadvjxiavb"; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ + libGL libX11 libXcursor libXext libXfixes libXi libXinerama + libXrandr libXxf86vm + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "Low-level bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXxf86vm;}; "bindings-K8055" = callPackage ({ mkDerivation, base, K8055D }: @@ -33493,6 +35632,7 @@ self: { homepage = "http://github.com/bgamari/bindings-fluidsynth"; description = "Haskell FFI bindings for fluidsynth software synthesizer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fluidsynth;}; "bindings-friso" = callPackage @@ -33543,7 +35683,6 @@ self: { homepage = "https://github.com/jwiegley/bindings-dsl"; description = "Project bindings-* raw interface to gpgme"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gpgme;}; "bindings-gsl" = callPackage @@ -33588,7 +35727,6 @@ self: { homepage = "https://github.com/relrod/hamlib-haskell"; description = "Hamlib bindings for Haskell"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) hamlib;}; "bindings-hdf5" = callPackage @@ -33614,6 +35752,7 @@ self: { homepage = "https://github.com/basvandijk/bindings-levmar"; description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "bindings-libcddb" = callPackage @@ -33743,13 +35882,12 @@ self: { ({ mkDerivation, base, bindings-DSL, ioctl }: mkDerivation { pname = "bindings-linux-videodev2"; - version = "0.1"; - sha256 = "1pqi8ks441m1s1md6nhjr7zhal5fv6s71xq4881zijd539qhq9dq"; + version = "0.1.0.1"; + sha256 = "0k8h0i8qfmx6fg5d7mbh57brp8h896j9070bss9jmds4bhizhpw9"; libraryHaskellDepends = [ base bindings-DSL ioctl ]; - homepage = "https://gitorious.org/hsv4l2"; + homepage = "https://code.mathr.co.uk/bindings-linux-videodev2"; description = "bindings to Video For Linux Two (v4l2) kernel interfaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bindings-lxc" = callPackage @@ -33764,6 +35902,7 @@ self: { description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage @@ -33775,7 +35914,6 @@ self: { libraryHaskellDepends = [ bindings-posix ]; description = "(deprecated) see bindings-posix instead"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-monetdb-mapi" = callPackage @@ -33831,7 +35969,6 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; description = "parport bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-portaudio" = callPackage @@ -33844,7 +35981,6 @@ self: { libraryPkgconfigDepends = [ portaudio ]; description = "Low-level bindings to portaudio library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) portaudio;}; "bindings-posix" = callPackage @@ -33856,7 +35992,6 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; description = "Low level bindings to posix"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-potrace" = callPackage @@ -33881,7 +36016,6 @@ self: { libraryHaskellDepends = [ base bindings-DSL ioctl ]; description = "PPDev bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-saga-cmd" = callPackage @@ -34028,10 +36162,8 @@ self: { ({ mkDerivation, base, binary, bytestring, rank1dynamic }: mkDerivation { pname = "bindynamic"; - version = "1.0.0.0"; - sha256 = "0vi4wyxx4qvfrhir8p66h5laqq2m1q3dh3i0syjfd6vaxa9c7sgi"; - revision = "1"; - editedCabalFile = "1rd7l106zka0hndbixmr3wzdj8gx6vwhlaaxkn170kprf4xs3p6j"; + version = "1.0.0.1"; + sha256 = "1dp52xagwgzmm77f1cm8mvwjy7xnckbkf1inxskq0c7xcch4wbfb"; libraryHaskellDepends = [ base binary bytestring rank1dynamic ]; homepage = "https://github.com/lspitzner/bindynamic"; description = "A variation of Data.Dynamic.Dynamic with a Binary instance"; @@ -34092,8 +36224,7 @@ self: { "bio" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , directory, mtl, old-time, parallel, parsec, process, QuickCheck - , random, tagsoup + , directory, mtl, parallel, parsec, QuickCheck, random, tagsoup }: mkDerivation { pname = "bio"; @@ -34106,9 +36237,7 @@ self: { array base binary bytestring containers directory mtl parallel parsec QuickCheck tagsoup ]; - executableHaskellDepends = [ - base bytestring containers old-time process QuickCheck random - ]; + executableHaskellDepends = [ base bytestring random ]; homepage = "http://biohaskell.org/Libraries/Bio"; description = "A bioinformatics library"; license = "LGPL"; @@ -34130,6 +36259,7 @@ self: { homepage = "https://github.com/biocad/bio-sequence"; description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bioace" = callPackage @@ -34194,26 +36324,23 @@ self: { }) {}; "biohazard" = callPackage - ({ mkDerivation, async, attoparsec, base, base-prelude, binary - , bytestring, containers, directory, exceptions, filepath, hashable - , primitive, random, scientific, stm, text, transformers, unix - , unordered-containers, vector, vector-algorithms, vector-th-unbox - , zlib + ({ mkDerivation, async, attoparsec, base, base-prelude, bytestring + , containers, exceptions, hashable, primitive, stm, text + , transformers, unix, unordered-containers, vector + , vector-algorithms, vector-th-unbox, zlib }: mkDerivation { pname = "biohazard"; - version = "0.6.16"; - sha256 = "05w44blv6bawkiw2vyb32swnv6wg92033xz9p03fhrc2yhl33pps"; + version = "1.0.1"; + sha256 = "0gzsrrapv3ih598qqacnipqgxxzxmci98rzvc54jxv3hajsnxkqb"; libraryHaskellDepends = [ - async attoparsec base base-prelude binary bytestring containers - directory exceptions filepath hashable primitive random scientific - stm text transformers unix unordered-containers vector - vector-algorithms vector-th-unbox zlib + async attoparsec base base-prelude bytestring containers exceptions + hashable primitive stm text transformers unix unordered-containers + vector vector-algorithms vector-th-unbox zlib ]; - homepage = "http://github.com/udo-stenzel/biohazard"; + homepage = "https://bitbucket.org/ustenzel/biohazard"; description = "bioinformatics support library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bioinformatics-toolkit" = callPackage @@ -34221,23 +36348,23 @@ self: { , bytestring-lexing, case-insensitive, clustering, conduit , conduit-combinators, containers, criterion, data-default-class , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit - , IntervalMap, math-functions, matrices, mtl, parallel, primitive - , random, split, statistics, tasty, tasty-golden, tasty-hunit, text - , transformers, unordered-containers, vector, vector-algorithms - , word8 + , IntervalMap, lens, math-functions, matrices, mtl, parallel + , primitive, random, split, statistics, tasty, tasty-golden + , tasty-hunit, text, transformers, unordered-containers, vector + , vector-algorithms, word8 }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.3.2"; - sha256 = "1zgvn1zkajslg221fk345vfgbi9pi9lr5ki3m4qpwgr3pvlz2h10"; + version = "0.5.0"; + sha256 = "1nb549w2rzc9psdnz8xbma0qgm2hj4svrlm3x8vc2i1dklmljmvr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring bytestring-lexing - case-insensitive clustering conduit-combinators containers - data-default-class data-ordlist double-conversion hexpat HsHTSLib - http-conduit IntervalMap math-functions matrices mtl parallel - primitive split statistics text transformers unordered-containers - vector vector-algorithms word8 + case-insensitive clustering conduit containers data-default-class + data-ordlist double-conversion hexpat HsHTSLib http-conduit + IntervalMap lens math-functions matrices mtl parallel primitive + split statistics text transformers unordered-containers vector + vector-algorithms word8 ]; testHaskellDepends = [ base bytestring conduit conduit-combinators data-default-class @@ -34350,6 +36477,59 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bisect-binary" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hashable + , haskeline, integer-logarithms, optparse-applicative, process + , terminal-size, time, yaml + }: + mkDerivation { + pname = "bisect-binary"; + version = "0.1.0.1"; + sha256 = "000dydglclgk65ryb2n2zdrwp1rnzv7phmh2vi8s1gpp67b5l5ad"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory filepath hashable haskeline + integer-logarithms optparse-applicative process terminal-size time + yaml + ]; + homepage = "http://github.com/nomeata/bisect-binary"; + description = "Determine relevant parts of binary data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bishbosh" = callPackage + ({ mkDerivation, array, base, Cabal, containers, data-default + , deepseq, directory, extra, factory, filepath, HUnit, hxt + , hxt-relaxng, mtl, parallel, polyparse, QuickCheck, random, time + , toolshed, unix + }: + mkDerivation { + pname = "bishbosh"; + version = "0.0.0.2"; + sha256 = "18smrav39awp25j43c7k9r1laxwf7iix61qb2yi5h2b6djbgxq9h"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base Cabal containers data-default deepseq extra factory + filepath hxt mtl parallel polyparse random time toolshed + ]; + executableHaskellDepends = [ + array base Cabal containers data-default deepseq directory extra + factory filepath hxt hxt-relaxng mtl parallel polyparse random time + toolshed unix + ]; + testHaskellDepends = [ + array base Cabal containers data-default extra filepath HUnit hxt + mtl polyparse QuickCheck random toolshed + ]; + homepage = "https://functionalley.eu/BishBosh/bishbosh.html"; + description = "Plays chess"; + license = "GPL"; + }) {}; + "bit-array" = callPackage ({ mkDerivation, base, directory, doctest, filepath, numeric-qq }: mkDerivation { @@ -34375,7 +36555,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim vector ]; - executableHaskellDepends = [ base vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck vector @@ -34384,7 +36563,6 @@ self: { homepage = "https://github.com/Bodigrim/bit-stream#readme"; description = "Lazy, infinite, compact stream of Bool with O(1) indexing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bit-vector" = callPackage @@ -34509,6 +36687,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Partial implementation of the Bitcoin protocol (as of 2013)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitcoin-payment-channel" = callPackage @@ -34549,6 +36728,7 @@ self: { 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;}; @@ -34702,8 +36882,8 @@ self: { pname = "bits"; version = "0.5.1"; sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5"; - revision = "2"; - editedCabalFile = "1c209vyxxafr1pf1zqcydy85w9v5gvfjy64i5i6v9asfld6jppig"; + revision = "4"; + editedCabalFile = "188v93jiwy832ifcjq5db7sk5rngpnvira5kk1cb1srw4851hzyl"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; @@ -34777,6 +36957,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bits-extra" = callPackage + ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec + , hw-hedgehog, hw-hspec-hedgehog, vector + }: + mkDerivation { + pname = "bits-extra"; + version = "0.0.0.2"; + sha256 = "067k2kczi56454mgv86x9r0fpzdc0v3m8z4rc0jb93bqd33knq7r"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ + base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog + ]; + benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; + homepage = "https://github.com/haskell-works/bits-extra#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bits-extras" = callPackage ({ mkDerivation, base, gcc_s }: mkDerivation { @@ -34789,7 +36987,6 @@ self: { librarySystemDepends = [ gcc_s ]; description = "Efficient high-level bit operations not found in Data.Bits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {gcc_s = null;}; "bitset" = callPackage @@ -34920,6 +37117,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bittrex" = callPackage + ({ mkDerivation, aeson, base, bytestring, flow, http-client-tls + , lens, lens-aeson, scientific, SHA, split, text, time, turtle + , wreq + }: + mkDerivation { + pname = "bittrex"; + version = "0.6.0.0"; + sha256 = "02h8r753dkkkgpzxhycdmjpccdqfsc5gnmw6qi9kpl1165jrd2fd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring flow http-client-tls lens lens-aeson + scientific SHA split text time wreq + ]; + executableHaskellDepends = [ base text turtle ]; + homepage = "https://github.com/dmjio/bittrex"; + description = "Bindings for the Bittrex API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bitvec" = callPackage ({ mkDerivation, base, HUnit, primitive, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, vector @@ -34936,6 +37154,7 @@ self: { homepage = "https://github.com/mokus0/bitvec"; description = "Unboxed vectors of bits / dense IntSets"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitwise" = callPackage @@ -34944,8 +37163,8 @@ self: { pname = "bitwise"; version = "0.1.1.1"; sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d"; - revision = "1"; - editedCabalFile = "10v3wkjc3y9435kn1rywrp6z0h71pkjcs51p8wl30g9pbpscw5pq"; + revision = "2"; + editedCabalFile = "1dqddxjf4kpb16k51z40qlnl0shw6gmpf1c1ckdn4q8jm61bmlgn"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -34962,8 +37181,8 @@ self: { }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.11.0.1"; - sha256 = "1711zfb7hl31xwpcwkxjnsmn541hzzk01fwa5rf1hhmxhpxmfslj"; + version = "0.12.0.0"; + sha256 = "0wf86pkpm5vlcv5cci2sn6by0ajmq44b3azxc41zivqdpf5kkwii"; libraryHaskellDepends = [ aeson base bytestring deepseq exceptions http-client http-client-tls http-types microlens microlens-th network @@ -34979,15 +37198,18 @@ self: { }) {}; "bizzlelude" = callPackage - ({ mkDerivation, base, containers, directory, text }: + ({ mkDerivation, base-noprelude, containers, directory, text }: mkDerivation { pname = "bizzlelude"; - version = "1.0.3"; - sha256 = "135wbjk79j0ayipkpv761ybnsq1001mvbcry3pl8fg1s8zbdaqfh"; - libraryHaskellDepends = [ base containers directory text ]; + version = "1.2.0"; + sha256 = "1yqp46blrllx5irn1vvvx1v2n06pdfdfmhcng8hvs7q43fcsfgcr"; + libraryHaskellDepends = [ + base-noprelude containers directory text + ]; homepage = "http://github.com/TheBizzle"; description = "A lousy Prelude replacement by a lousy dude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bizzlelude-js" = callPackage @@ -35085,7 +37307,6 @@ self: { homepage = "http://git.kaction.name/black-jewel"; description = "The pirate bay client"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blacktip" = callPackage @@ -35162,26 +37383,26 @@ self: { }) {}; "blank-canvas" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, colour, containers, data-default-class, directory - , http-types, kansas-comet, mime-types, process, scotty, shake, stm - , text, text-show, time, transformers, unix, vector, wai, wai-extra - , warp + ({ mkDerivation, aeson, base, base-compat-batteries + , base64-bytestring, bytestring, colour, containers + , data-default-class, directory, http-types, kansas-comet + , mime-types, process, scotty, semigroups, shake, stm, text + , text-show, time, transformers, unix, vector, wai, wai-extra, warp }: mkDerivation { pname = "blank-canvas"; - version = "0.6.1"; - sha256 = "06jsbqbd67hyb1k2yv0iqn11rhqhycl1c9afrnmwh05bic9wsdf6"; - revision = "1"; - editedCabalFile = "16r1hhdk592da4xpzhscn7zcxczla4vmr2klj968wgnrx8ky5kqy"; + version = "0.6.3"; + sha256 = "1d10ngvsgi2hz6xick59rkq1wzfbsgckply2jmg6gz9mf3zj97bk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring colour - containers data-default-class http-types kansas-comet mime-types - scotty stm text text-show transformers vector wai wai-extra warp + aeson base base-compat-batteries base64-bytestring bytestring + colour containers data-default-class http-types kansas-comet + mime-types scotty semigroups stm text text-show transformers vector + wai wai-extra warp ]; testHaskellDepends = [ - base containers directory process shake stm text time unix vector + base base-compat-batteries containers directory process shake stm + text time unix vector ]; homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; description = "HTML5 Canvas Graphics Library"; @@ -35202,6 +37423,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blas-carray" = callPackage + ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi + , storable-complex, transformers + }: + mkDerivation { + pname = "blas-carray"; + version = "0.0.1.1"; + sha256 = "0ijzcdrbfb9w3vs4g96p30h7ilh9s05ij8n0prinmr1ngmvipbdx"; + libraryHaskellDepends = [ + base blas-ffi carray netlib-carray netlib-ffi storable-complex + transformers + ]; + homepage = "http://hub.darcs.net/thielema/blas-carray/"; + description = "Auto-generated interface to Fortran BLAS via CArrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "blas-ffi" = callPackage + ({ mkDerivation, base, blas, netlib-ffi }: + mkDerivation { + pname = "blas-ffi"; + version = "0.0.1.1"; + sha256 = "0dphqcnnka0ahfgdnshm8r3bd6r5wbpln9kksa6y09yi2nnqh3gf"; + libraryHaskellDepends = [ base netlib-ffi ]; + libraryPkgconfigDepends = [ blas ]; + homepage = "http://hub.darcs.net/thielema/blas-ffi/"; + description = "Auto-generated interface to Fortran BLAS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) blas;}; + "blas-hs" = callPackage ({ mkDerivation, base, blas, storable-complex, vector }: mkDerivation { @@ -35280,8 +37533,8 @@ self: { }: mkDerivation { pname = "blaze-builder"; - version = "0.4.0.2"; - sha256 = "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws"; + version = "0.4.1.0"; + sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i"; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -35331,8 +37584,8 @@ self: { }: mkDerivation { pname = "blaze-colonnade"; - version = "1.1.0"; - sha256 = "0yxkb5qmlgrkz5fciac9qfrznfg7j1xz77929x5vw7ci7n7d2kqr"; + version = "1.2.1"; + sha256 = "0bsax9fw3bmj32a0dsrmp7zrpfp2pgilq3nss6qfa1zh1kdyj1xy"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade text ]; @@ -35340,7 +37593,6 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using blaze-html with colonnade"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-from-html" = callPackage @@ -35453,17 +37705,16 @@ self: { "blaze-markup" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "blaze-markup"; - version = "0.8.0.0"; - sha256 = "03sl7xs6vk4zxbjszgyjpsppi1cknswg7z7rswz2f0rq62wwpq8r"; + version = "0.8.2.1"; + sha256 = "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text + base blaze-builder bytestring containers HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck text ]; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; @@ -35573,8 +37824,8 @@ self: { }: mkDerivation { pname = "ble"; - version = "0.4.1"; - sha256 = "1ascfscxg24crc2bv1vsgdp72gg3lql2pabg66zhv8vcvqcrlcah"; + version = "0.4.2"; + sha256 = "0vpmz66qg4kqkg6rqwpnp21d36yzywxvlcxxfbqrpv2kdy8pm3pb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -35604,6 +37855,8 @@ self: { pname = "blink1"; version = "0.4"; sha256 = "0547wg4qk2xv5gzj1alaxk06j65dhmzhn6y48rjllyr4lc5bm2qj"; + revision = "1"; + editedCabalFile = "107838wpl7dw7r73gf7fkkcprafih7l5wy31ic7yc8wyp9s9hkxi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text unix usb vector ]; @@ -35743,37 +37996,8 @@ self: { }: mkDerivation { pname = "bloodhound"; - 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 - network-uri scientific semigroups text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers errors exceptions generics-sop - hspec http-client http-types mtl network-uri QuickCheck - quickcheck-properties semigroups temporary text time unix-compat - unordered-containers vector - ]; - homepage = "https://github.com/bitemyapp/bloodhound"; - description = "ElasticSearch client library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bloodhound_0_15_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 - , QuickCheck, quickcheck-properties, scientific, semigroups - , temporary, text, time, transformers, unix-compat - , unordered-containers, vector - }: - mkDerivation { - pname = "bloodhound"; - version = "0.15.0.0"; - sha256 = "05q2zxmrxxqmi4vr98dvgfly8gir5h4iaimb3lwiflk0pw8nfn6n"; + version = "0.15.0.2"; + sha256 = "17xw085k72dmw1q4cbqjs07gvvwwfsijcs9lsb3smxxhri1s229i"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers data-default-class exceptions hashable http-client http-types mtl mtl-compat @@ -35789,7 +38013,6 @@ self: { homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloodhound-amazonka-auth" = callPackage @@ -35813,6 +38036,7 @@ self: { homepage = "http://github.com/MichaelXavier/bloodhound-amazonka-auth#readme"; description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloomfilter" = callPackage @@ -35875,6 +38099,7 @@ self: { homepage = "http://github.com/GregorySchwartz/blosum#readme"; description = "BLOSUM generator"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloxorz" = callPackage @@ -35889,7 +38114,6 @@ self: { executableHaskellDepends = [ base GLFW OpenGL ]; description = "OpenGL Logic Game"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "blubber" = callPackage @@ -36061,6 +38285,7 @@ self: { homepage = "http://code.haskell.org/~thielema/games/"; description = "Three games for inclusion in a web server"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bogocopy" = callPackage @@ -36134,10 +38359,8 @@ self: { }: mkDerivation { pname = "boltzmann-samplers"; - version = "0.1.0.0"; - sha256 = "0gw8d4xrwr9xs9k7dflm12xpkn6k0yn41myvzqzj4c6bhdd0c1sp"; - revision = "1"; - editedCabalFile = "00va7bagszricicai4jckyka8azgw6gly9ps5kabnsyv5znylfr0"; + version = "0.1.1.0"; + sha256 = "13l7ml35hm0i2rgw419n7xp2zp58pafm6gmmik3jgbmhfwgkwz6y"; libraryHaskellDepends = [ ad base containers hashable hmatrix ieee754 MonadRandom mtl QuickCheck transformers unordered-containers vector @@ -36237,8 +38460,8 @@ self: { }: mkDerivation { pname = "bookkeeper"; - version = "0.2.4"; - sha256 = "17qzgq5wrl00gby3xlxan547cf3r66iz7h71v57rii5q6mxk2x8g"; + version = "0.2.5"; + sha256 = "1mj3qj97zq5zf7xvg8f62bw8jacij41435rpgcfczjisgylm1nc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36286,14 +38509,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bookkeeping_0_4_0_1" = callPackage + ({ mkDerivation, base, doctest, Glob, mono-traversable, text, time + , transaction + }: + mkDerivation { + pname = "bookkeeping"; + version = "0.4.0.1"; + sha256 = "0afa4g5c9csjn747732qqbs3ghp8c4jyxhfb9k09igfaladrvzfl"; + libraryHaskellDepends = [ + base mono-traversable text time transaction + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/haskell-bookkeeping#readme"; + description = "A module for bookkeeping by double entry"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bookkeeping-jp" = callPackage ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable , text, time }: mkDerivation { pname = "bookkeeping-jp"; - version = "0.1.1.0"; - sha256 = "1hmh8q041p0f4v58ywpwd833v7k0jg900r1la3wh4x1h08bxmbxm"; + version = "0.1.1.3"; + sha256 = "06zfq2153p6dnrmrp3vdq27xij38l5cnx46y3qpzifrpsady6lgd"; libraryHaskellDepends = [ base bookkeeping mono-traversable text time ]; @@ -36301,6 +38542,7 @@ self: { homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme"; description = "Helper functions for Japanese bookkeeping"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bool-extras" = callPackage @@ -36352,26 +38594,22 @@ self: { homepage = "http://xy30.com"; description = "convert numbers to binary coded lists"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boolean-normal-forms" = callPackage - ({ mkDerivation, base, cond, containers, QuickCheck, tasty + ({ mkDerivation, base, cond, containers, deepseq, QuickCheck, tasty , tasty-quickcheck }: mkDerivation { pname = "boolean-normal-forms"; - version = "0.0.0.1"; - sha256 = "11y26whzibxkcfck83lcrmxl34j7qp374wj6nzx2k3l65sdqm2ic"; - revision = "1"; - editedCabalFile = "0xa0lwqmwc93ngd9pmjnzad8bslxw5nw5hq030h0w5xyj46qrjn4"; - libraryHaskellDepends = [ base cond containers ]; + version = "0.0.1"; + sha256 = "12i0jarbv7gq2p8zw0jgh2gq3wqk6s0vsc9rd0g7c36srcmr944b"; + libraryHaskellDepends = [ base cond containers deepseq ]; testHaskellDepends = [ base cond containers QuickCheck tasty tasty-quickcheck ]; description = "Boolean normal form: NNF, DNF & CNF"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boolexpr" = callPackage @@ -36444,12 +38682,14 @@ self: { }) {}; "boomerang" = callPackage - ({ mkDerivation, base, mtl, template-haskell, text }: + ({ mkDerivation, base, mtl, semigroups, template-haskell, text }: mkDerivation { pname = "boomerang"; - version = "1.4.5.3"; - sha256 = "124k13x5wzjy2qlbdgixncgr5l7cxw4glq1hjb8hyk8vfvgs6qfl"; - libraryHaskellDepends = [ base mtl template-haskell text ]; + version = "1.4.5.5"; + sha256 = "0i2svn3bs57hhwgplkydvvpznl178dlm3byi0j4y2ckd9gqpzz4d"; + libraryHaskellDepends = [ + base mtl semigroups template-haskell text + ]; description = "Library for invertible parsing and printing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -36544,6 +38784,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "boring" = callPackage + ({ mkDerivation, adjunctions, base, base-compat, constraints, fin + , generics-sop, streams, tagged, transformers, transformers-compat + , vec + }: + mkDerivation { + pname = "boring"; + version = "0.1"; + sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk"; + libraryHaskellDepends = [ + adjunctions base base-compat constraints fin generics-sop streams + tagged transformers transformers-compat vec + ]; + homepage = "https://github.com/phadej/boring"; + description = "Boring and Absurd types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "boring-game" = callPackage ({ mkDerivation, base, gloss }: mkDerivation { @@ -36561,16 +38820,15 @@ self: { }) {}; "boring-window-switcher" = callPackage - ({ mkDerivation, base, gtk, hspec, transformers, X11 }: + ({ mkDerivation, base, gtk, transformers, X11 }: mkDerivation { pname = "boring-window-switcher"; - version = "0.1.0.4"; - sha256 = "15ii0v9qy55pzz9ykbwigazck61m7vh5k7m782nzbqyi7az7v7sg"; + version = "0.1.0.5"; + sha256 = "062l93lh9y9wgdf8f1xql07ci8rpcspaagpsmcyc6wnikganls9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gtk transformers X11 ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; homepage = "https://github.com/debug-ito/boring-window-switcher"; description = "A boring window switcher"; license = stdenv.lib.licenses.bsd3; @@ -36625,8 +38883,8 @@ self: { pname = "bound"; version = "2.0.1"; sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; - revision = "1"; - editedCabalFile = "0hqs7k5xyfpfcrfms342jj81gzrgxkrkvrl68061nkmsc5xrm4ix"; + revision = "4"; + editedCabalFile = "1gnknncwjil9kcilpj08a5s0r1z3nk5iyg1dlynldxaj6p0z90hx"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -36710,6 +38968,7 @@ self: { homepage = "https://code.mathr.co.uk/bowntz"; description = "audio-visual pseudo-physical simulation of colliding circles"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "box-tuples" = callPackage @@ -36727,8 +38986,8 @@ self: { ({ mkDerivation, base, QuickCheck, split }: mkDerivation { pname = "boxes"; - version = "0.1.4"; - sha256 = "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf"; + version = "0.1.5"; + sha256 = "1hsnmw95i58d4bkpxby3ddsj1cawypw4mdyb18m393s5i8p7iq9q"; libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base QuickCheck split ]; description = "2D text pretty-printing library"; @@ -36781,6 +39040,7 @@ self: { executableHaskellDepends = [ array base containers parsec ]; description = "primitive imperative language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brainfuck" = callPackage @@ -36829,8 +39089,8 @@ self: { }: mkDerivation { pname = "brainheck"; - version = "0.1.0.4"; - sha256 = "0jar6jlid339k9rimlawah9800nqdybbr3l2k44y6i7q5pb656by"; + version = "0.1.0.7"; + sha256 = "17x5jyamc4863glxxdp7qdpnma7kinc67230snyplz2xzifpxq7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36892,6 +39152,7 @@ self: { homepage = "https://github.com/rnhmjoj/breve"; description = "a url shortener"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brians-brain" = callPackage @@ -36910,39 +39171,39 @@ self: { }) {}; "brick" = callPackage - ({ mkDerivation, base, containers, contravariant, data-clist - , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm - , template-haskell, text, text-zipper, transformers, vector, vty + ({ mkDerivation, base, config-ini, containers, contravariant + , data-clist, deepseq, dlist, microlens, microlens-mtl + , microlens-th, stm, template-haskell, text, text-zipper + , transformers, vector, vty, word-wrap }: mkDerivation { pname = "brick"; - version = "0.18"; - sha256 = "1qk3ds8h1krqhl8gk3c6akblybq2zvs9686ispj14im88mzjma8r"; + version = "0.34.1"; + sha256 = "0y07xq5r5qbn5fqkp0cy1s9a50lnqmk35dvmil38xn2g23dgmfys"; + revision = "2"; + editedCabalFile = "0yk4wxlv693gnax8b0gr6g2zqsm53izwar0aagqc4w3bq3llx63b"; 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 - ]; - executableHaskellDepends = [ - base microlens microlens-th text text-zipper vector vty + base config-ini 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; }) {}; - "brick_0_29" = callPackage + "brick_0_36" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl - , microlens-th, stm, template-haskell, text, text-zipper - , transformers, vector, vty, word-wrap + , microlens-th, QuickCheck, stm, template-haskell, text + , text-zipper, transformers, vector, vty, word-wrap }: mkDerivation { pname = "brick"; - version = "0.29"; - sha256 = "05zwp8rrb9iyfcp36pczxr8l035wsi5nnmc4dwv1d5vn7rcbiipw"; + version = "0.36"; + sha256 = "1i1np31hncgz5cvygraxcv9x6l7yn9y3f8f92jih1im38drhp65z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36950,30 +39211,156 @@ self: { microlens microlens-mtl microlens-th stm template-haskell text text-zipper transformers vector vty word-wrap ]; - executableHaskellDepends = [ - base microlens microlens-th text text-zipper vector vty word-wrap - ]; + testHaskellDepends = [ base containers QuickCheck ]; homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "brick-skylighting" = callPackage + ({ mkDerivation, base, brick, containers, skylighting-core, text + , vty + }: + mkDerivation { + pname = "brick-skylighting"; + version = "0.2"; + sha256 = "1x4kfjj4sa5gbxnbvh76b4isrmc6jr11py9b50jsyvs720plq778"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base brick containers skylighting-core text vty + ]; + homepage = "https://github.com/jtdaugherty/brick-skylighting/"; + description = "Show syntax-highlighted text in your Brick UI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bricks" = callPackage - ({ mkDerivation, base, containers, doctest, hedgehog, parsec - , template-haskell, text + ({ mkDerivation, base, bricks-internal, bricks-internal-test + , bricks-parsec, bricks-rendering, bricks-syntax, containers + , doctest, hedgehog, mtl, parsec, template-haskell, text + , transformers }: mkDerivation { pname = "bricks"; - version = "0.0.0.2"; - sha256 = "1iyf9dkifl064x74vxnqdlv096qxiyhvqn91jmj090i4r6m4jlhw"; - libraryHaskellDepends = [ base containers parsec text ]; + version = "0.0.0.4"; + sha256 = "018cp48bm3hk20kfq544hm50s6bik37lv1hnsdpkg6ibgz6a9i4v"; + libraryHaskellDepends = [ + base bricks-internal bricks-parsec bricks-rendering bricks-syntax + containers mtl parsec text transformers + ]; testHaskellDepends = [ - base containers doctest hedgehog parsec template-haskell text + base bricks-internal bricks-internal-test bricks-parsec + bricks-rendering bricks-syntax containers doctest hedgehog mtl + parsec template-haskell text transformers ]; homepage = "https://github.com/chris-martin/bricks#readme"; description = "Bricks is a lazy functional language based on Nix"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bricks-internal" = callPackage + ({ mkDerivation, base, containers, doctest, either-list-functions + , text + }: + mkDerivation { + pname = "bricks-internal"; + version = "0.0.0.4"; + sha256 = "1c4nav1ak6nz06ps6pwsrd6ci8ly3xqi6yd8clsvrhqi1r4cwz80"; + libraryHaskellDepends = [ + base containers either-list-functions text + ]; + testHaskellDepends = [ + base containers doctest either-list-functions text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + + "bricks-internal-test" = callPackage + ({ mkDerivation, base, bricks-internal, containers, hedgehog + , template-haskell, text + }: + mkDerivation { + pname = "bricks-internal-test"; + version = "0.0.0.4"; + sha256 = "1kvhvwi7qd1rxqn6zxz0vmzqnq2w5fzm1dld5yy08v6jr3f7ri8a"; + libraryHaskellDepends = [ + base bricks-internal containers hedgehog template-haskell text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + + "bricks-parsec" = callPackage + ({ mkDerivation, base, bricks-internal, bricks-internal-test + , bricks-rendering, bricks-syntax, containers, doctest, hedgehog + , parsec, text + }: + mkDerivation { + pname = "bricks-parsec"; + version = "0.0.0.4"; + sha256 = "1rgcrdn4h4pmq9sa7fbzlmv93j6g80mhirnrx6f5iqgmshlg4cq0"; + libraryHaskellDepends = [ + base bricks-internal bricks-syntax containers parsec text + ]; + testHaskellDepends = [ + base bricks-internal bricks-internal-test bricks-rendering + bricks-syntax containers doctest hedgehog parsec text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bricks-rendering" = callPackage + ({ mkDerivation, base, bricks-internal, bricks-internal-test + , bricks-syntax, containers, doctest, hedgehog, template-haskell + , text + }: + mkDerivation { + pname = "bricks-rendering"; + version = "0.0.0.4"; + sha256 = "1ixg8qsima8hp547ms3jid4hcr0l605ha353r0bngwjxc5h3ixj4"; + libraryHaskellDepends = [ + base bricks-internal bricks-syntax containers text + ]; + testHaskellDepends = [ + base bricks-internal bricks-internal-test bricks-syntax containers + doctest hedgehog template-haskell text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bricks-syntax" = callPackage + ({ mkDerivation, base, bricks-internal, containers, doctest + , either-list-functions, exceptions, hint, text + }: + mkDerivation { + pname = "bricks-syntax"; + version = "0.0.0.4"; + sha256 = "0bg4vx32fh9fn5lvccayr9dfzynpql08x6ffi0xrw1rkpn2hz415"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bricks-internal containers either-list-functions text + ]; + testHaskellDepends = [ + base bricks-internal containers doctest either-list-functions + exceptions hint text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brillig" = callPackage @@ -36999,35 +39386,79 @@ self: { "brittany" = callPackage ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs - , containers, czipwith, data-tree-print, deepseq, directory, either - , extra, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths - , hspec, monad-memo, mtl, multistate, neat-interpolation, parsec - , pretty, safe, semigroups, strict, syb, text, transformers - , uniplate, unsafe, yaml + , containers, czipwith, data-tree-print, deepseq, directory, extra + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec + , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty + , safe, semigroups, strict, syb, text, transformers, uniplate + , unsafe, yaml }: mkDerivation { pname = "brittany"; - version = "0.8.0.3"; - sha256 = "0a468lq4gnhax4kfrwi2ligc4mjbrs0jqxgh1f4j86ql53k4mpg9"; + version = "0.9.0.1"; + sha256 = "1ndmnakzq6kiyxlxmgrjmzzpknrn4ib5ck5vxxr90qw8rw6yqi88"; + revision = "1"; + editedCabalFile = "1ac9g160kaaz78xk6xdfpkm0qadgkanjghi8g0b9fy17983fiw7a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra ghc ghc-boot-th + ghc-exactprint ghc-paths monad-memo mtl multistate + neat-interpolation pretty safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + executableHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate + neat-interpolation pretty safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + testHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate + neat-interpolation parsec pretty safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + homepage = "https://github.com/lspitzner/brittany/"; + description = "Haskell source code formatter"; + license = stdenv.lib.licenses.agpl3; + }) {}; + + "brittany_0_10_0_0" = callPackage + ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs + , containers, czipwith, data-tree-print, deepseq, directory, extra + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec + , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty + , safe, semigroups, strict, syb, text, transformers, uniplate + , unsafe, yaml + }: + mkDerivation { + pname = "brittany"; + version = "0.10.0.0"; + sha256 = "1fm6l4ial8kp4mafwkp7w79nklc46c07i12p1in3dqxz9r5817r1"; + revision = "1"; + editedCabalFile = "1mq1hgakxwzk4k4d8gwfbngprcprjagnvkvq389z1m1vda3w80i8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory either extra ghc ghc-boot-th + data-tree-print deepseq directory extra filepath ghc ghc-boot-th ghc-exactprint ghc-paths monad-memo mtl multistate neat-interpolation pretty safe semigroups strict syb text transformers uniplate unsafe yaml ]; executableHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory either extra filepath ghc - ghc-boot-th ghc-exactprint ghc-paths hspec monad-memo mtl - multistate neat-interpolation pretty safe semigroups strict syb - text transformers uniplate unsafe yaml + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate + neat-interpolation pretty safe semigroups strict syb text + transformers uniplate unsafe yaml ]; testHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory either extra ghc ghc-boot-th + data-tree-print deepseq directory extra filepath ghc ghc-boot-th ghc-exactprint ghc-paths hspec monad-memo mtl multistate neat-interpolation parsec pretty safe semigroups strict syb text transformers uniplate unsafe yaml @@ -37077,6 +39508,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {broker = null;}; + "bronyradiogermany-common" = callPackage + ({ mkDerivation, aeson, base, bytestring, network-uri, text, time + , tz, uuid-types + }: + mkDerivation { + pname = "bronyradiogermany-common"; + version = "1.0.0.1"; + sha256 = "1hwqif1jnwjhkb22j7rsc7fznvd7373gbfsl46196bb6489bbcvy"; + libraryHaskellDepends = [ + aeson base bytestring network-uri text time tz uuid-types + ]; + description = "Common types and URIs for the BronyRadioGermany API bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "bronyradiogermany-streaming" = callPackage + ({ mkDerivation, aeson, base, bronyradiogermany-common, bytestring + , case-insensitive, http-types, mtl, streaming + , streaming-bytestring, streaming-utils, text, time, uuid + }: + mkDerivation { + pname = "bronyradiogermany-streaming"; + version = "1.0.0.1"; + sha256 = "1a2yz2cbjpcywis7fy5l1w3pipirh6rjfcgs1mdyhgza12qnbx09"; + libraryHaskellDepends = [ + aeson base bronyradiogermany-common bytestring case-insensitive + http-types mtl streaming streaming-bytestring streaming-utils text + time uuid + ]; + description = "Streaming interface for the BronyRadioGermany API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "browscap" = callPackage ({ mkDerivation, base, bytestring, deepseq, ini, lens, lrucache , mtl, text, unordered-containers, wreq @@ -37092,6 +39557,19 @@ self: { homepage = "https://oss.xkcd.com"; description = "A reader and interface for the Browser Capabilities Project data files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bsb-http-chunked" = callPackage + ({ mkDerivation, base, bytestring, bytestring-builder }: + mkDerivation { + pname = "bsb-http-chunked"; + version = "0.0.0.2"; + sha256 = "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8"; + libraryHaskellDepends = [ base bytestring bytestring-builder ]; + homepage = "http://github.com/sjakobi/bsb-http-chunked"; + description = "Chunked HTTP transfer encoding for bytestring builders"; + license = stdenv.lib.licenses.bsd3; }) {}; "bsd-sysctl" = callPackage @@ -37104,7 +39582,6 @@ self: { homepage = "https://github.com:p-alik/bsd-sysctl"; description = "Access to the BSD sysctl(3) interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bson" = callPackage @@ -37272,7 +39749,6 @@ self: { homepage = "https://github.com/redneb/hs-btrfs"; description = "Bindings to the btrfs API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "buchhaltung" = callPackage @@ -37287,8 +39763,8 @@ self: { }: mkDerivation { pname = "buchhaltung"; - version = "0.0.5"; - sha256 = "0sbmabig0b5z71c8v71p0fb5wagm0a8vb40c829w6q337q23m9iq"; + version = "0.0.7"; + sha256 = "1hkiiah2h64gkb9y6bagg5q182rylysdqwqlkn5lvmym4akp8zlb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37312,7 +39788,6 @@ self: { homepage = "http://johannesgerer.com/buchhaltung"; description = "Automates most of your plain text accounting data entry in ledger format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buffer" = callPackage @@ -37333,6 +39808,7 @@ self: { homepage = "https://github.com/nikita-volkov/buffer"; description = "Simple mutable low-level buffer for IO"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buffer-builder" = callPackage @@ -37342,8 +39818,8 @@ self: { }: mkDerivation { pname = "buffer-builder"; - version = "0.2.4.4"; - sha256 = "1n1dvd1xqxi6aklrhnsmymmj7qxf7sfcigqs0j6a1137fzxvmh01"; + version = "0.2.4.5"; + sha256 = "08g47zaqrh40lvkwijpx3x8xflpnjvrijd9bsfv0m94139xrncmc"; libraryHaskellDepends = [ base bytestring mtl text unordered-containers vector ]; @@ -37408,8 +39884,8 @@ self: { }: mkDerivation { pname = "buffon"; - version = "0.1.0.0"; - sha256 = "073a2gzazihqyki175xhb97szqyvv2ijjrh7byik25z1xlkn599d"; + version = "0.1.0.1"; + sha256 = "1v9kxm3yrw871567j8qza7gayllhsb77pxqriin4akvg77llz7l9"; libraryHaskellDepends = [ base monad-primitive mwc-random mwc-random-monad primitive transformers @@ -37432,6 +39908,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bugsnag-haskell" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring + , case-insensitive, doctest, hspec, http-client, http-client-tls + , http-conduit, http-types, iproute, network, parsec + , template-haskell, text, th-lift-instances, time, ua-parser, wai + }: + mkDerivation { + pname = "bugsnag-haskell"; + version = "0.0.1.1"; + sha256 = "09jv8qr795ag12xf035ywpvnd61q7cgsqcx1irvyh9zlmiixb975"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive http-client http-client-tls + http-conduit http-types iproute network parsec template-haskell + text th-lift-instances time ua-parser wai + ]; + testHaskellDepends = [ + aeson aeson-qq base doctest hspec text time + ]; + homepage = "https://github.com/pbrisbin/bugsnag-haskell#readme"; + description = "Bugsnag error reporter for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "bugzilla" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, data-default, http-conduit, http-types, iso8601-time @@ -37448,7 +39949,6 @@ self: { data-default http-conduit http-types iso8601-time resourcet text time transformers unordered-containers vector ]; - executableHaskellDepends = [ base containers text time ]; homepage = "https://github.com/sethfowler/hsbugzilla"; description = "A Haskell interface to the Bugzilla native REST API"; license = stdenv.lib.licenses.bsd3; @@ -37469,18 +39969,15 @@ self: { "buildbox" = callPackage ({ mkDerivation, base, bytestring, containers, directory - , exceptions, mtl, old-locale, pretty, process, stm, temporary - , text, time + , exceptions, mtl, old-locale, process, stm, temporary, text, time }: mkDerivation { pname = "buildbox"; - version = "2.1.9.3"; - sha256 = "1ffvf82qmf05vxzxi70jm1yq8apv5s62nms529n6x1p5lyrwwdr5"; - revision = "1"; - editedCabalFile = "0nqhdmkmgnqgfw8vkjnwbrzrj7lvrhc0gw23p8smxkppvh6y5zv3"; + version = "2.2.1.1"; + sha256 = "19kyi8w3z3k3ydbzw5y57j6m4ffg6y9pachwzsfzjpkfczi7ds7z"; libraryHaskellDepends = [ base bytestring containers directory exceptions mtl old-locale - pretty process stm temporary text time + process stm temporary text time ]; homepage = "http://code.ouroborus.net/buildbox"; description = "Rehackable components for writing buildbots and test harnesses"; @@ -37574,6 +40071,24 @@ self: { homepage = "http://github.com/silkapp/bumper"; description = "Automatically bump package versions, also transitively"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bunz" = callPackage + ({ mkDerivation, base, cmdargs, doctest, hspec, text, unix }: + mkDerivation { + pname = "bunz"; + version = "0.0.7"; + sha256 = "124vas0i5hdx7wmcdmydxal6c3iqy89fypparf9hzpkbb7gwrpwz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + executableHaskellDepends = [ base cmdargs text unix ]; + testHaskellDepends = [ base doctest hspec ]; + homepage = "https://github.com/sendyhalim/bunz"; + description = "CLI tool to beautify JSON string"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "burnt-explorer" = callPackage @@ -37582,8 +40097,8 @@ self: { }: mkDerivation { pname = "burnt-explorer"; - version = "0.1.1"; - sha256 = "1swv8xy06bk3wkhg788mzlpgwghyp7v3g3c22c09jji9kxwsgslv"; + version = "1.0.0"; + sha256 = "1lddgjbm62k7avxvq8mlw7z4swbjavffk05nx5nla5fll7v4q219"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37707,24 +40222,43 @@ self: { homepage = "https://www.freedesktop.org/wiki/Software/Bustle/"; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; - 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 + ({ mkDerivation, base, bifunctors, containers, deque, extra, free + , microlens, microlens-th, mtl, multistate, pretty, transformers + , unsafe, void + }: + mkDerivation { + pname = "butcher"; + version = "1.3.0.0"; + sha256 = "0v85ganhfljxyqy9sfmhbqnfdazikmy8a3mpg1w1y827l4a3nkng"; + revision = "1"; + editedCabalFile = "1zw355fg08p90xv3f1qcray0vz68h4sab0q2zfb3hk3j8mpplgvp"; + libraryHaskellDepends = [ + base bifunctors containers deque 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; + }) {}; + + "butcher_1_3_1_1" = callPackage + ({ mkDerivation, base, bifunctors, containers, deque, extra, free + , hspec, microlens, microlens-th, mtl, multistate, pretty , transformers, unsafe, void }: mkDerivation { pname = "butcher"; - version = "1.2.1.0"; - sha256 = "0vam5lqbp2k8r56d997bcp63lnsc4bbs7yd4lzjvibimr38g032w"; + version = "1.3.1.1"; + sha256 = "1llhsqg8m4f7am14kvw4psm5fb8kcph27mk059vg2mq65xns470z"; libraryHaskellDepends = [ - base bifunctors containers deque either extra free microlens - microlens-th mtl multistate pretty transformers unsafe void + base bifunctors containers deque extra free microlens microlens-th + mtl multistate pretty transformers unsafe void ]; testHaskellDepends = [ - base containers deque either extra free microlens microlens-th mtl + base containers deque extra free hspec microlens microlens-th mtl multistate pretty transformers unsafe ]; homepage = "https://github.com/lspitzner/butcher/"; @@ -37759,8 +40293,8 @@ self: { ({ mkDerivation, base, ghc-prim, integer-gmp }: mkDerivation { pname = "bv"; - version = "0.4.1"; - sha256 = "1fs5rwmd9zn58wdb5s4xrq8vj9rsimwnjp9nd3hpcbkry58222fx"; + version = "0.5"; + sha256 = "1nkvqwqcjl57p6ir0sllb54vbj6q0l3s3w7z3z2svxjq2ymqk884"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; @@ -37769,24 +40303,68 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bv-little" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp + , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "bv-little"; + version = "0.1.0.0"; + sha256 = "0gll7czp8xcm8lcvlxqxfx1gn8wj6cvqm5c9xh0g1s445ykrs93w"; + libraryHaskellDepends = [ + base deepseq hashable integer-gmp mono-traversable primitive + QuickCheck + ]; + testHaskellDepends = [ + base hashable mono-traversable QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "https://github.com/recursion-ninja/bv-little"; + description = "Efficient little-endian bit vector library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "bv-sized" = callPackage + ({ mkDerivation, base, containers, lens, mtl, parameterized-utils + , prettyclass, QuickCheck, random + }: + mkDerivation { + pname = "bv-sized"; + version = "0.4.0"; + sha256 = "18z4k076q0bk23di1i1hh8k0h319psh5hrh6jdv6446c7sg7v1c8"; + libraryHaskellDepends = [ + base containers lens mtl parameterized-utils prettyclass QuickCheck + random + ]; + testHaskellDepends = [ + base lens parameterized-utils prettyclass QuickCheck random + ]; + homepage = "https://github.com/benjaminselfridge/bv-sized"; + description = "a BitVector datatype that is parameterized by the vector width"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "byline" = callPackage ({ mkDerivation, ansi-terminal, base, colour, containers , exceptions, haskeline, mtl, terminfo-hs, text, transformers }: mkDerivation { pname = "byline"; - version = "0.2.4.0"; - sha256 = "1vvyjs8lgqn97li68kvy971m4rbzfk30y40li59jzzy35533lhw2"; + version = "0.3.1.0"; + sha256 = "11kchyzm908ld3s3k8jh8phbryhp4zj5d3aq4sflfd8pkrns321d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base colour containers exceptions haskeline mtl terminfo-hs text transformers ]; - executableHaskellDepends = [ base text ]; homepage = "http://github.com/pjones/byline"; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytable" = callPackage @@ -37824,7 +40402,6 @@ self: { homepage = "https://github.com/nikita-volkov/bytearray-parsing"; description = "Parsing of bytearray-based data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytedump" = callPackage @@ -37862,10 +40439,8 @@ self: { }: mkDerivation { pname = "bytes"; - version = "0.15.3"; - sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q"; - revision = "2"; - editedCabalFile = "07j20bmhysp4dawy8am1j4lhg21s5c2i8ckqby0iykmfgrlsrcv0"; + version = "0.15.4"; + sha256 = "121x3iqlm8pghw8cd9g30cnqbl7jrdpfjxdanmqdqllajw6xivrm"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -37918,6 +40493,8 @@ self: { pname = "bytestring-arbitrary"; version = "0.1.1"; sha256 = "1zbf0liaf071ify0rdyazxqnxdkrfl236innqipwz3kqx4vqvrxv"; + revision = "1"; + editedCabalFile = "165v7l6j6n7zlzlbl4q8lkaknxnhz4a9lazv4vr4kkln4z0l3i73"; libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ]; testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; benchmarkHaskellDepends = [ @@ -38004,6 +40581,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bytestring-encodings" = callPackage + ({ mkDerivation, base, bytestring, gauge, ghc-prim, hedgehog, text + }: + mkDerivation { + pname = "bytestring-encodings"; + version = "0.1.0.1"; + sha256 = "09lx8d92dhd4gicz8pbpj19k2iaig1yl4lksqpxiqgxzybwqn0rc"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring hedgehog ]; + benchmarkHaskellDepends = [ base bytestring gauge text ]; + description = "checks to see if a given bytestring adheres to a certain encoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "bytestring-from" = callPackage ({ mkDerivation, attoparsec, base, bytestring, QuickCheck, tasty , tasty-quickcheck, text @@ -38028,8 +40619,8 @@ self: { }: mkDerivation { pname = "bytestring-handle"; - version = "0.1.0.5"; - sha256 = "10xv4m1k1wxnbabb02slp08fxcmv8m4nsbncbgj24a53bgrjdi52"; + version = "0.1.0.6"; + sha256 = "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -38084,8 +40675,8 @@ self: { pname = "bytestring-plain"; version = "0.1.0.2"; sha256 = "1pgxwrn8m27cc01kbbxq4rd1q15lpapii2izjlhv3ilhbfxgnbcy"; - revision = "1"; - editedCabalFile = "0cjnvc57v2g543d4si3pwcsj56pjsm84sv2hn19yrd44bzajmcna"; + revision = "2"; + editedCabalFile = "06aysffha231adrhar9jqh49m7k3wga3ascvs7a17l4vx6p16ygs"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim hashable ]; @@ -38098,8 +40689,8 @@ self: { ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: mkDerivation { pname = "bytestring-progress"; - version = "1.0.7"; - sha256 = "0c1pz39jp9p8ppajnj3f2phph12nvhhjj7iz8sm580gzdl5rbc4p"; + version = "1.0.9"; + sha256 = "1gqcr15956zzldsc3rvds3ybd43907bv69cw3i7a1c0nfz60zg70"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring terminal-progress-bar time @@ -38199,6 +40790,7 @@ self: { 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 @@ -38216,6 +40808,7 @@ self: { homepage = "https://github.com/klangner/bytestring-time"; description = "Library for Time parsing from ByteString"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-tree-builder" = callPackage @@ -38240,6 +40833,7 @@ self: { homepage = "https://github.com/nikita-volkov/bytestring-tree-builder"; description = "A very efficient ByteString builder implementation based on the binary tree"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-trie" = callPackage @@ -38248,6 +40842,8 @@ self: { pname = "bytestring-trie"; version = "0.2.4.1"; sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g"; + revision = "1"; + editedCabalFile = "0f56pb1k1va7bs9rpn0b8hclxhn5pcjln857k50myhyzrwz8qg7r"; libraryHaskellDepends = [ base binary bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "An efficient finite map from (byte)strings to values"; @@ -38313,8 +40909,8 @@ self: { ({ mkDerivation, base, Cabal, HUnit, QuickCheck, safe }: mkDerivation { pname = "byteunits"; - version = "0.3.0.2"; - sha256 = "1nfr56zxzvh0lf2qqmjb2jiaslmsr4a73bflvh9y5zqp1aivchgq"; + version = "0.4.0.1"; + sha256 = "012n5gry1a3x4qwqbndgzrq0f90hvgkal48c8s9dylh1n6pi871l"; libraryHaskellDepends = [ base safe ]; testHaskellDepends = [ base Cabal HUnit QuickCheck ]; description = "Human friendly conversion between byte units (KB, MB, GB...)"; @@ -38335,25 +40931,27 @@ self: { "bzlib-conduit" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit - , conduit-extra, data-default, hspec, mtl, QuickCheck, random - , resourcet + , data-default-class, hspec, mtl, random, resourcet }: mkDerivation { pname = "bzlib-conduit"; - version = "0.2.1.5"; - sha256 = "1bv78qr6fbf6lg1dx06g3r2904fjnpvb87mlqv6np2kpyzjc11an"; + version = "0.3.0.1"; + sha256 = "0fd2hnr782s7qgipazg2yxwia9qqhkvm9bcm90773c3zkxa13n23"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bindings-DSL bytestring conduit conduit-extra data-default mtl + base bindings-DSL bytestring conduit data-default-class mtl resourcet ]; librarySystemDepends = [ bzip2 ]; testHaskellDepends = [ - base bytestring conduit conduit-extra hspec QuickCheck random + base bindings-DSL bytestring conduit data-default-class hspec mtl + random resourcet + ]; + benchmarkHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl resourcet ]; - benchmarkHaskellDepends = [ base conduit conduit-extra resourcet ]; - homepage = "https://github.com/snoyberg/bzlib-conduit"; + homepage = "https://github.com/snoyberg/bzlib-conduit#readme"; description = "Streaming compression/decompression via conduits"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; @@ -38388,8 +40986,8 @@ self: { }: mkDerivation { pname = "c-mosquitto"; - version = "0.1.2.0"; - sha256 = "1q2g7wv11d8p5ykbh0m7xd8jx4lvm73i503rz5pvsgmgm39fwy98"; + version = "0.1.4.1"; + sha256 = "0adb0sjdvdl3i2mqrpcvdqbi9w7bwcwc7y33ibcsyrgx542jf831"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38401,9 +40999,21 @@ self: { 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; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) mosquitto;}; + "c-storable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "c-storable"; + version = "0.2"; + sha256 = "03ynlm6nbm2hsqp0bpcqj3kp1hbg2pnif44zrgj8rda8dmsczm9j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/elaforge/c-storable"; + description = "CStorable class"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "c-storable-deriving" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -38482,8 +41092,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.28.2"; - sha256 = "17hgj8s08lh7mjddbsahdgssk80wpkhc4qspfc34k7zyr9w185zl"; + version = "0.28.3"; + sha256 = "1k7i2b1s596yz5i86p5kdy0b071a7chnjkiv0hl06z7f8nwnvk40"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -38514,19 +41124,26 @@ self: { }) {}; "c2hsc" = callPackage - ({ mkDerivation, base, cmdargs, containers, directory, filepath - , HStringTemplate, language-c, mtl, pretty, split, transformers + ({ mkDerivation, base, cmdargs, containers, data-default, directory + , filepath, here, hspec, HStringTemplate, language-c, logging + , monad-logger, mtl, pretty, split, temporary, text, transformers }: mkDerivation { pname = "c2hsc"; - version = "0.6.5"; - sha256 = "0c5hzi4nw9n3ir17swbwymkymnpiw958z8r2hw6656ijwqkxvzgd"; - isLibrary = false; + version = "0.7.1"; + sha256 = "02z6bfnhsngl5l4shnyw81alhsw9vhl1lbvy04azlg54fgm9sg9x"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base containers data-default directory filepath HStringTemplate + language-c logging mtl pretty split temporary text transformers + ]; executableHaskellDepends = [ - base cmdargs containers directory filepath HStringTemplate - language-c mtl pretty split transformers + base cmdargs containers data-default directory filepath + HStringTemplate language-c logging pretty split temporary text + transformers ]; + testHaskellDepends = [ base here hspec logging monad-logger text ]; homepage = "https://github.com/jwiegley/c2hsc"; description = "Convert C API header files to .hsc and .hsc.helper.c files"; license = stdenv.lib.licenses.bsd3; @@ -38540,8 +41157,8 @@ self: { }: mkDerivation { pname = "cab"; - version = "0.2.17"; - sha256 = "0lnd8m10999jxyx6x5plbrm135p7bv9q67c80h4l4gy49h07sr87"; + version = "0.2.18"; + sha256 = "0ic1ivxiv217ls4g38q5dwrb8sbsrzvdm6c0idv9ancpjmm8k8jl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38569,6 +41186,7 @@ self: { doHaddock = false; description = "placeholder for Cabal package, you want the upper case Cabal"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {youProbablyWantCapitalCabal = null;}; @@ -38592,19 +41210,21 @@ self: { }) {}; "cabal-bounds" = callPackage - ({ mkDerivation, base, Cabal, cabal-lenses, cmdargs, directory - , either, filepath, Glob, lens, process, strict, tasty - , tasty-golden, transformers, unordered-containers + ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-lenses + , cmdargs, directory, either, filepath, Glob, lens, lens-aeson + , process, strict, tasty, tasty-golden, text, transformers + , unordered-containers }: mkDerivation { pname = "cabal-bounds"; - version = "1.2.0"; - sha256 = "1lbkfz5sw292br1zcki2r3qpzc1q5hk3h40xkbbhflqmw3m1h0fj"; + version = "1.5.0"; + sha256 = "0qkrrbv8b0ij4hrqzlzzkn2rislz77kbvqb67mh0pnlfrn77kwy7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal cabal-lenses cmdargs directory either filepath lens - strict transformers unordered-containers + aeson base bytestring Cabal cabal-lenses cmdargs directory either + filepath lens lens-aeson strict text transformers + unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -38612,6 +41232,7 @@ self: { ]; description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-cargs" = callPackage @@ -38621,8 +41242,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "0.8.1"; - sha256 = "0xzzxzh41k8h6sf04b6j49b44c68gvghh0slifywj171ip4zv5g3"; + version = "0.9.0"; + sha256 = "0w371991841m4d9r73nr86j4jnr0jilj9jnvkmgh9a055vyi573s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38634,6 +41255,7 @@ self: { testHaskellDepends = [ base filepath tasty tasty-golden ]; description = "A command line program for extracting compiler arguments from a cabal file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-constraints" = callPackage @@ -38682,8 +41304,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.36"; - sha256 = "0kwn0drd57wkpz2xl4n8104zc8zjf32gab6sks9vg03zhy4hjvwq"; + version = "4.36.2"; + sha256 = "142y8ng64qcykyjp1yz989ksznhippgij3m5qy5rgh77kdncbpb1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38696,10 +41318,6 @@ self: { executableHaskellDepends = [ base Cabal debian lens mtl pretty Unixutils ]; - testHaskellDepends = [ - base Cabal containers debian Diff directory filepath hsemail HUnit - lens pretty process text - ]; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; @@ -38719,6 +41337,7 @@ self: { homepage = "http://github.com/jaspervdj/cabal-dependency-licenses"; description = "Compose a list of a project's transitive dependencies with their licenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dev" = callPackage @@ -38762,8 +41381,10 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.3"; - sha256 = "1qyqxmw5z1418jda3q5j04pknqirfrfrqigibbxi4n31ajwlfisc"; + version = "1.0.6"; + sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"; + revision = "1"; + editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld"; libraryHaskellDepends = [ base Cabal directory filepath ]; homepage = "https://github.com/phadej/cabal-doctest"; description = "A Setup.hs helper for doctests running"; @@ -38837,36 +41458,36 @@ self: { }) {}; "cabal-helper" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers - , directory, extra, filepath, ghc-prim, mtl, process - , template-haskell, temporary, transformers, unix, utf8-string + ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory + , exceptions, filepath, ghc, ghc-paths, ghc-prim, mtl, process + , semigroupoids, template-haskell, temporary, transformers, unix + , unix-compat, utf8-string }: mkDerivation { pname = "cabal-helper"; - version = "0.7.3.0"; - sha256 = "194j278109q5wdp0kl85y172n3c8hg0sms9gxfn2kl2x43smah3r"; - revision = "1"; - editedCabalFile = "0jhv5hx807zqrsa7fpzmhrhl6l1zjrpm96bvfsq0sq1bmi9y9h0y"; + version = "0.8.0.2"; + sha256 = "0yhsyq2z660qj5vp38lak2cz90r5jy69ifvz6dfipj6miyh2vmm6"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ - base Cabal containers directory filepath process template-haskell - transformers - ]; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ - base Cabal directory filepath ghc-prim mtl process transformers + base Cabal directory filepath ghc-prim mtl process semigroupoids + transformers unix unix-compat ]; executableHaskellDepends = [ - base bytestring Cabal directory filepath ghc-prim mtl process - template-haskell temporary transformers utf8-string + base bytestring Cabal directory exceptions filepath ghc-prim mtl + process template-haskell temporary transformers unix unix-compat + utf8-string ]; + executableToolDepends = [ cabal-install ]; testHaskellDepends = [ - base bytestring Cabal directory extra filepath ghc-prim mtl process - template-haskell temporary transformers unix utf8-string + base bytestring Cabal directory exceptions filepath ghc ghc-paths + ghc-prim mtl process template-haskell temporary transformers unix + unix-compat utf8-string ]; testToolDepends = [ cabal-install ]; doCheck = false; - description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; + description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -38889,37 +41510,30 @@ self: { homepage = "https://github.com/barrucadu/cabal-info"; description = "Read information from cabal files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-install" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, binary , bytestring, Cabal, containers, cryptohash-sha256, deepseq , directory, echo, edit-distance, filepath, hackage-security - , hashable, HTTP, mtl, network, network-uri, pretty, pretty-show - , process, QuickCheck, random, stm, tagged, tar, tasty, tasty-hunit - , tasty-quickcheck, time, unix, zlib + , hashable, HTTP, mtl, network, network-uri, pretty, process + , random, resolv, stm, tar, time, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "2.0.0.0"; - sha256 = "0b9b0sx2nxas894ns1sjyirhvra8y8ixfcsya9pxkw0q5yn0ndsz"; + version = "2.2.0.0"; + sha256 = "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8"; revision = "1"; - editedCabalFile = "047bf57sxaajaa0wi7v3bg6kq19ngfpw5n4cc46zlbqqjbvvq1d5"; - isLibrary = false; + editedCabalFile = "0f1svlhh4cpj3p5fs9bcjpv15qp291lnvlaxxcw7aib8a1gn3wim"; + isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; executableHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal containers cryptohash-sha256 deepseq directory echo edit-distance filepath hackage-security hashable HTTP mtl network network-uri - pretty process random stm tar time unix zlib - ]; - testHaskellDepends = [ - array async base base16-bytestring binary bytestring Cabal - containers cryptohash-sha256 deepseq directory edit-distance - filepath hackage-security hashable HTTP mtl network network-uri - pretty pretty-show process QuickCheck random stm tagged tar tasty - tasty-hunit tasty-quickcheck time unix zlib + pretty process random resolv stm tar time unix zlib ]; doCheck = false; postInstall = '' @@ -39000,14 +41614,15 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.4.9"; - sha256 = "0f4250cssh42xvrr6npnv71303pxkhv3k26bh6j2ifwz489nmfsr"; + version = "0.7.0"; + sha256 = "07xyn4sy2snj8a5983p6g6w9pwklzmd3w9wzj02ig4pdnz7682ls"; libraryHaskellDepends = [ base Cabal either lens strict system-fileio system-filepath text transformers unordered-containers ]; description = "Lenses and traversals for the Cabal library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-macosx" = callPackage @@ -39097,25 +41712,29 @@ self: { }) {}; "cabal-plan" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring - , bytestring, containers, directory, filepath, mtl - , optparse-applicative, text + ({ mkDerivation, aeson, ansi-terminal, base, base-compat + , base-orphans, base16-bytestring, bytestring, containers + , directory, filepath, mtl, optparse-applicative, parsec, text + , vector }: mkDerivation { pname = "cabal-plan"; - version = "0.2.0.0"; - sha256 = "1hxsrk6avv69gqajx94n2nzlivhy3ywwmlx6c0w2nnaz854j1ya0"; + version = "0.3.0.0"; + sha256 = "1axi3a60zq08d760w2x6akmszad599kij0r8zmlq8pin9mmmggls"; + revision = "1"; + editedCabalFile = "1xdmji5y2ssj8pgp0d78m8a5hd3swy2flhiaf1v9qb69502j8lwq"; + configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring containers directory - filepath text + aeson base base-compat base-orphans base16-bytestring bytestring + containers directory filepath text vector ]; executableHaskellDepends = [ - ansi-terminal base bytestring containers mtl optparse-applicative - text + ansi-terminal base base-compat bytestring containers mtl + optparse-applicative parsec text vector ]; - homepage = "https://github.com/hvr/cabal-plan"; + doHaddock = false; description = "Library and utiltity for processing cabal's plan.json file"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -39154,17 +41773,18 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, old-locale - , process, time, unix + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , http-client, http-client-tls, http-conduit, process, time, unix }: mkDerivation { pname = "cabal-rpm"; - version = "0.11.2"; - sha256 = "18k9dbjz97d6nhnjjr0xqs7z49qcisia3l9h0rg58s5xqkjvzq89"; + version = "0.12.2"; + sha256 = "00i3v62ys6fhq2rnw9q2hhc2h54v8my14ll746vpma2gfdy90y1c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base Cabal directory filepath old-locale process time unix + base bytestring Cabal directory filepath http-client + http-client-tls http-conduit process time unix ]; homepage = "https://github.com/juhp/cabal-rpm"; description = "RPM packaging tool for Haskell Cabal-based packages"; @@ -39256,6 +41876,7 @@ self: { homepage = "https://github.com/yesodweb/cabal-src"; description = "Alternative install procedure to avoid the diamond dependency issue"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-test" = callPackage @@ -39321,15 +41942,14 @@ self: { }: mkDerivation { pname = "cabal-toolkit"; - version = "0.0.3"; - sha256 = "1l0ak8jch6hvmk5phibadzphwac60f00l1rkq03irifqs17c9a1f"; + version = "0.0.5"; + sha256 = "1w3c75avp12ig1bmakgjsp10rb8bnnibxi1sbg96y6gx4g3krbcq"; libraryHaskellDepends = [ base binary bytestring Cabal containers ghc template-haskell ]; homepage = "https://github.com/TerrorJack/cabal-toolkit#readme"; description = "Helper functions for writing custom Setup.hs scripts."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-uninstall" = callPackage @@ -39410,6 +42030,7 @@ self: { homepage = "yet"; description = "make gentoo's .ebuild file from .cabal file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal2ghci" = callPackage @@ -39433,37 +42054,30 @@ self: { "cabal2nix" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal - , 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 + , containers, deepseq, directory, distribution-nixpkgs, filepath + , hackage-db, hopenssl, hpack, language-nix, lens, monad-par + , monad-par-extras, mtl, optparse-applicative, pretty, process + , split, tasty, tasty-golden, text, time, transformers, yaml }: mkDerivation { pname = "cabal2nix"; - version = "2.6"; - sha256 = "0zy0pf8s2flykpm7419zz393dx92lxpf04gi9d827m5dwrlr0j3z"; + version = "2.9.2"; + sha256 = "1wcc7a2xzi8kq7k0rv0jc0z4z1w9ry6h71a730m3rz601j8n7q2v"; 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 hopenssl + directory distribution-nixpkgs filepath hackage-db hopenssl hpack language-nix lens optparse-applicative pretty process split text time transformers yaml ]; executableHaskellDepends = [ - aeson ansi-wl-pprint base bytestring Cabal containers deepseq - 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 + aeson base bytestring Cabal containers directory + distribution-nixpkgs filepath hopenssl language-nix lens monad-par + monad-par-extras mtl optparse-applicative pretty ]; testHaskellDepends = [ - aeson ansi-wl-pprint base bytestring Cabal containers deepseq - directory distribution-nixpkgs doctest filepath hackage-db hopenssl - language-nix lens optparse-applicative pretty process split text - time transformers yaml + base Cabal filepath language-nix lens pretty tasty tasty-golden ]; homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; @@ -39472,23 +42086,24 @@ self: { }) {}; "cabal2spec" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , haskell98, old-locale, process, tar, time, unix, Unixutils, zlib + ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty + , tasty-golden, time }: mkDerivation { pname = "cabal2spec"; - version = "1.0"; - sha256 = "08y8rwj86n7f3bqfv2ximlx8qas12zspiz6ix8gg01whsry43nsj"; - isLibrary = false; + version = "2.1"; + sha256 = "0zh3xypxn78z7p7mg46ykxnmj2fv92maqx8wmclj1hqngp8ifnp3"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ base Cabal filepath time ]; executableHaskellDepends = [ - base bytestring Cabal directory filepath haskell98 old-locale - process tar time unix Unixutils zlib + base Cabal filepath optparse-applicative ]; - homepage = "https://fedorahosted.org/cabal2spec/"; - description = "Generates RPM Spec files from cabal files"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; + homepage = "https://github.com/peti/cabal2spec"; + description = "Convert Cabal files into rpm spec files"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabalQuery" = callPackage @@ -39649,13 +42264,13 @@ self: { }: mkDerivation { pname = "cache"; - version = "0.1.0.0"; - sha256 = "1l7vn3fnspbnm3qrrxai7ldcy63wkppa4amspxhpqaajch5f97hl"; + version = "0.1.1.0"; + sha256 = "1zvq5dwckkngf6kzh04pa59kgxf44fx9kli0c7zaz4g9hf1nyx8l"; libraryHaskellDepends = [ base clock hashable stm transformers unordered-containers ]; testHaskellDepends = [ base clock hspec stm transformers ]; - homepage = "https://github.com/hverr/haskell-cache"; + homepage = "https://github.com/hverr/haskell-cache#readme"; description = "An in-memory key/value store with expiration support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -39770,8 +42385,8 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.4.1"; - sha256 = "04ig1v3nyiqycrh2xipmw0mynnsnf6pyr2qgk57dravaisf89s02"; + version = "0.13.4.2"; + sha256 = "0sm3367ikrjfzwhz1f9bkamk6i33p5cginzc9kpgw3x0lk6pbrhg"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -39830,6 +42445,7 @@ self: { ]; description = "A build-system library and driver"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cake3" = callPackage @@ -40038,7 +42654,6 @@ self: { OpenGL OpenGLRaw random template-haskell text transformers vector WAVE ]; - executableHaskellDepends = [ base lens ]; homepage = "https://github.com/fumieval/call"; description = "The call game engine"; license = stdenv.lib.licenses.bsd3; @@ -40144,6 +42759,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "canon" = callPackage + ({ mkDerivation, arithmoi, array, base, containers, polynomial }: + mkDerivation { + pname = "canon"; + version = "0.1.0.4"; + sha256 = "0hy28s1rgzsqcbs600ppj74ls1xvm39fdjjba4p3f1cfw7g5ai1f"; + libraryHaskellDepends = [ + arithmoi array base containers polynomial + ]; + homepage = "https://github.com/grandpascorpion/canon"; + description = "Massive Number Arithmetic"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "canonical-filepath" = callPackage ({ mkDerivation, base, deepseq, directory, filepath }: mkDerivation { @@ -40186,6 +42816,7 @@ self: { homepage = "https://github.com/SumAll/canteven-http"; description = "Utilities for HTTP programming"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "canteven-listen-http" = callPackage @@ -40207,8 +42838,8 @@ self: { }: mkDerivation { pname = "canteven-log"; - version = "2.0.1.0"; - sha256 = "0w7hzhb13g62l08ggld3rj9aamw1jhjkir1bpzc73bl59ls4gdgy"; + version = "2.0.2.1"; + sha256 = "0i4lf46rj4yy8j7xr311kypi1kmmpldh914glzyp2gim08fwy10c"; libraryHaskellDepends = [ aeson base bytestring directory fast-logger filepath monad-logger template-haskell text time transformers yaml @@ -40313,6 +42944,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "capataz" = callPackage + ({ mkDerivation, async, base, bytestring, data-default, microlens + , pretty-show, protolude, safe-exceptions, stm, tasty, tasty-hunit + , tasty-rerun, tasty-smallcheck, teardown, text, time + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "capataz"; + version = "0.1.0.1"; + sha256 = "0ldxnm5mib9gg7qhf29psifkcfzfcrbnfzk93hvnb08lfrdc8d1d"; + libraryHaskellDepends = [ + async base bytestring data-default microlens protolude + safe-exceptions stm teardown text time unordered-containers uuid + vector + ]; + testHaskellDepends = [ + async base bytestring data-default microlens pretty-show protolude + safe-exceptions stm tasty tasty-hunit tasty-rerun tasty-smallcheck + teardown text time unordered-containers uuid vector + ]; + homepage = "https://github.com/roman/Haskell-capataz#readme"; + description = "OTP-like supervision trees in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "capped-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -40387,7 +43044,6 @@ self: { homepage = "https://github.com/Noeda/caramia/"; description = "High-level OpenGL bindings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "carbonara" = callPackage @@ -40443,6 +43099,7 @@ self: { homepage = "https://github.com/master-q/carettah"; description = "A presentation tool written with Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "carray" = callPackage @@ -40526,6 +43183,7 @@ self: { homepage = "https://github.com/tonymorris/casa-abbreviations-and-acronyms"; description = "CASA Abbreviations and Acronyms"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casadi-bindings" = callPackage @@ -40675,8 +43333,8 @@ self: { }: mkDerivation { pname = "case-insensitive"; - version = "1.2.0.10"; - sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6"; + version = "1.2.0.11"; + sha256 = "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7"; libraryHaskellDepends = [ base bytestring deepseq hashable text ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text @@ -40722,6 +43380,18 @@ self: { maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; + "caseof" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "caseof"; + version = "0.0.1"; + sha256 = "1j8r8ldaxgyvka3zpqfl8qp0mbwrnh1s1xl5fgx3jjzqxlisfdp3"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "https://github.com/chrisdone/caseof#readme"; + description = "Combinators for casing on constructors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cases" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, criterion, HTF , HUnit, loch-th, mwc-random, placeholders, QuickCheck, rerebase @@ -40760,12 +43430,13 @@ self: { }) {}; "casing" = callPackage - ({ mkDerivation, base, split }: + ({ mkDerivation, base, split, tasty, tasty-hunit }: mkDerivation { pname = "casing"; - version = "0.1.2.1"; - sha256 = "0f56060n78jy7f6mm14h2g9w48cgsxrjixm65x3mm4a2xpkg5gx8"; + version = "0.1.4.0"; + sha256 = "1mznhlbg8qd2yrjg23rq7s77bijn92nrfx7bvx9sw8sqxwqkd2lf"; libraryHaskellDepends = [ base split ]; + testHaskellDepends = [ base tasty tasty-hunit ]; description = "Convert between various source code casing conventions"; license = stdenv.lib.licenses.mit; }) {}; @@ -40988,49 +43659,20 @@ self: { }) {}; "cassava" = callPackage - ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring - , containers, criterion, deepseq, hashable, HUnit, lazy-csv - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, unordered-containers, vector - }: - mkDerivation { - pname = "cassava"; - version = "0.4.5.1"; - sha256 = "17wxrwq977nyi225zlg3wj32f0ypyvikznhw59k0hxb4vkljlqkw"; - revision = "1"; - editedCabalFile = "05035bnvyqs36sp2bqd1wdjp5x4zs1pnrw6c8hq5nwjwdajjqkf0"; - libraryHaskellDepends = [ - array attoparsec base blaze-builder bytestring containers deepseq - hashable text unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hashable HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - array attoparsec base blaze-builder bytestring containers criterion - deepseq hashable lazy-csv text unordered-containers vector - ]; - homepage = "https://github.com/hvr/cassava"; - description = "A CSV parsing and encoding library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cassava_0_5_1_0" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring - , bytestring-builder, containers, deepseq, hashable, HUnit, Only - , QuickCheck, quickcheck-instances, scientific, test-framework - , test-framework-hunit, test-framework-quickcheck2, text + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances + , scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, text-short , unordered-containers, vector }: mkDerivation { pname = "cassava"; version = "0.5.1.0"; sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n"; + configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ - array attoparsec base bytestring bytestring-builder containers - deepseq hashable Only scientific text unordered-containers vector + array attoparsec base bytestring containers deepseq hashable Only + scientific text text-short unordered-containers vector ]; testHaskellDepends = [ attoparsec base bytestring hashable HUnit QuickCheck @@ -41040,52 +43682,27 @@ self: { 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 - , text - }: - mkDerivation { - pname = "cassava-conduit"; - version = "0.3.5.1"; - sha256 = "1mbmk923hccnlxcg93dlnz80akhqv73kki80v10js8dcvcr3x1a5"; - 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; - }) {}; - - "cassava-conduit_0_4_0_1" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, cassava - , conduit, conduit-extra, containers, criterion, mtl, QuickCheck - , text + , conduit, containers, criterion, mtl, QuickCheck, text }: mkDerivation { pname = "cassava-conduit"; - version = "0.4.0.1"; - sha256 = "0y4zlr0k3hcwh8b9ly1aslpz4fbns7xw2h8jwghfl7zpi52zlj9y"; + version = "0.4.0.2"; + sha256 = "0kqa91m4ihs3jsp4d22q9qvsanfigawkc3i98p7zns54g0qckgiz"; libraryHaskellDepends = [ - array base bifunctors bytestring cassava conduit conduit-extra - containers mtl text + array base bifunctors bytestring cassava conduit containers mtl + text ]; testHaskellDepends = [ - base bytestring cassava conduit conduit-extra QuickCheck text + base bytestring cassava conduit 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-embed" = callPackage @@ -41102,7 +43719,6 @@ self: { libraryHaskellDepends = [ base bytestring cassava template-haskell vector ]; - executableHaskellDepends = [ base cassava template-haskell ]; homepage = "https://github.com/typeable/cassava-embed#readme"; description = "CSV-file embedding library"; license = stdenv.lib.licenses.bsd3; @@ -41116,6 +43732,8 @@ self: { pname = "cassava-megaparsec"; version = "1.0.0"; sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28"; + revision = "1"; + editedCabalFile = "0dk6bxyvlg0iq83m81cbyysiydcj3dsvhlishjc119hzpy8g8xd6"; libraryHaskellDepends = [ base bytestring cassava containers megaparsec unordered-containers vector @@ -41126,7 +43744,29 @@ self: { homepage = "https://github.com/stackbuilders/cassava-megaparsec"; description = "Megaparsec parser of CSV files that plays nicely with Cassava"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cassava-records" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, cassava, containers + , foldl, HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, unordered-containers, vector + }: + mkDerivation { + pname = "cassava-records"; + version = "0.1.0.4"; + sha256 = "13dgcqrlvcqifgisfk80f9siwzzbk96jhhbrnmrpmg95270k5y0i"; + libraryHaskellDepends = [ + attoparsec base bytestring cassava foldl template-haskell text + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring cassava containers foldl HUnit + QuickCheck tasty tasty-hunit tasty-quickcheck template-haskell text + unordered-containers vector + ]; + homepage = "https://github.com/gdevanla/cassava-records#readme"; + description = "Auto-generation of records data type"; + license = stdenv.lib.licenses.bsd3; }) {}; "cassava-streams" = callPackage @@ -41135,10 +43775,8 @@ self: { }: mkDerivation { pname = "cassava-streams"; - version = "0.3.0.1"; - sha256 = "178d1sbfvscbmgwm5basbzciflrj6i6w55w1pmm6wyiibfbcwapf"; - revision = "1"; - editedCabalFile = "0wik7fy8qs1971bxziap6lkc8pxl83mz642gprh07qrx3kfx0qs1"; + version = "0.3.0.2"; + sha256 = "09aiwcc9q768jz7xd7hxymrj3hw6g21imsh6ka4rrw059hi4lzna"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41243,16 +43881,16 @@ self: { }) {}; "catamorphism" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, hspec, QuickCheck, template-haskell }: mkDerivation { pname = "catamorphism"; - version = "0.5.1.0"; - sha256 = "1lhqdr0l3wc59ms1i1xmwp6iy4n4xrd8pi0an0n0jgxw5j2sfbkq"; + version = "0.7.0.0"; + sha256 = "0a01nr2lk80pfv9dr4sxyixwhfpprrvbgh44901as4jnb3gcbk33"; libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/frerich/catamorphism"; - description = "A package exposing a helper function for generating catamorphisms"; + description = "Exposes a Template Haskell function for generating catamorphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "catch-fd" = callPackage @@ -41292,6 +43930,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "category" = callPackage + ({ mkDerivation, alg, base }: + mkDerivation { + pname = "category"; + version = "0.2.0.1"; + sha256 = "0v5b15lgbdjrqpln532kw2d4isl5lf633jbld3clcp7c71vb7l07"; + libraryHaskellDepends = [ alg base ]; + description = "Categorical types and classes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "category-extras" = callPackage ({ mkDerivation, adjunctions, bifunctors, categories, comonad , comonad-extras, comonad-transformers, comonads-fd, contravariant @@ -41365,6 +44014,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cautious" = callPackage + ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec + , genvalidity-hspec-aeson, hspec, hspec-discover, QuickCheck + , transformers, validity + }: + mkDerivation { + pname = "cautious"; + version = "0.0.0.0"; + sha256 = "0kr9aipbi95hz97lbidifsfm51rsjlpjgkbvnyiwrh1cckh6q0zw"; + libraryHaskellDepends = [ + aeson base genvalidity-hspec-aeson hspec hspec-discover QuickCheck + transformers validity + ]; + testHaskellDepends = [ + aeson base genvalidity genvalidity-hspec genvalidity-hspec-aeson + hspec hspec-discover QuickCheck transformers validity + ]; + homepage = "https://github.com/Nickske666/cautious#readme"; + description = "Keep track of warnings and errors during calculations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cautious-file" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, unix }: mkDerivation { @@ -41387,8 +44058,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.4.1"; - sha256 = "11q92jbc4sgvif6akd5vvsdj3ncx0xhwk0mimyc55m4m7srjdplq"; + version = "0.4.5"; + sha256 = "12gmav4bwf3i44wbwc68vgrnal7j6q3428d6wl5zq078pv2c3x7w"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -41444,8 +44115,8 @@ self: { }: mkDerivation { pname = "cbor-tool"; - version = "0.1.0.0"; - sha256 = "1jx51l75hm76fsk9wsc7jhqg857n77s8xb8bcjbkr698qwfbf14m"; + version = "0.2.0.0"; + sha256 = "0m8ic53vbzk06xw8rxs9vndnmbdjmcslc8zqa7lafhnl3lgqaybp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41463,10 +44134,8 @@ self: { }: mkDerivation { pname = "cborg"; - version = "0.1.1.0"; - sha256 = "120ljrwm15zl49nlsn9wb702sb97d2p300mzbpx8wxr2zdzlffpj"; - revision = "1"; - editedCabalFile = "0qqg1gfjf869ynrh20fbrpfhjf2yh6v3i5s6w327sirbhw9ajk6v"; + version = "0.2.0.0"; + sha256 = "1dvzqzk68ym1v1gxrx8kc59hj4jd2l0c8f2bqf67jgm5ld0bv340"; libraryHaskellDepends = [ array base bytestring containers ghc-prim half integer-gmp primitive text @@ -41481,8 +44150,8 @@ self: { }: mkDerivation { pname = "cborg-json"; - version = "0.1.0.0"; - sha256 = "1dx7ap8ks8g3c68jdkni958v2g04swphfi0nkyjznyz0dl6vs9mz"; + version = "0.2.0.0"; + sha256 = "09ps2lyvxg0qpki9f0lydag9hyys20q5ywgxim0jcaa0jky0j92x"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -41577,6 +44246,7 @@ self: { homepage = "http://github.com/picussecurity/haskell-cef.git"; description = "CEF log format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cef3-raw" = callPackage @@ -41645,24 +44315,26 @@ self: { }) {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, base, bytestring, directory, file-embed, filepath + , hspec, megaparsec, mtl, ogmarkup, optparse-generic, pandoc + , raw-strings-qq, shakespeare, text, unordered-containers, yaml }: mkDerivation { pname = "celtchar"; - version = "0.1.0.1"; - sha256 = "19br3ygxn6r4qvix3d9dy71w5nwfxhy5h7qavpkk6k3nl6jmawaj"; + version = "0.1.4.0"; + sha256 = "1bd7b1prihmxc9kbvcsgl107c0bkc56c3wz6jgxvvfrwi372s4j1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base filepath megaparsec mtl ogmarkup pandoc shakespeare text yaml + base filepath megaparsec mtl ogmarkup pandoc shakespeare text + unordered-containers yaml ]; executableHaskellDepends = [ - base directory file-embed filepath optparse-generic text + base bytestring directory file-embed filepath optparse-generic text + yaml ]; testHaskellDepends = [ base hspec raw-strings-qq ]; - homepage = "https://github.com/ogma-project/celtchar#readme"; + homepage = "https://nest.pijul.com/lthms/celtchar"; description = "A tool to build a novel"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -41703,8 +44375,8 @@ self: { }: mkDerivation { pname = "cereal"; - version = "0.5.4.0"; - sha256 = "1rzyr8r9pjlgas5pc8n776r22i0ficanq05ypqrs477jxxd6rjns"; + version = "0.5.5.0"; + sha256 = "08k8y6nf3n8h8gzw4a44mssy7rhgpmfj28lhczjz4vgszc7k55qb"; libraryHaskellDepends = [ array base bytestring containers ghc-prim ]; @@ -41723,13 +44395,15 @@ self: { }: mkDerivation { pname = "cereal-conduit"; - version = "0.7.3"; - sha256 = "18h09j16m4yc4fcp80x7m1p2c87q6f628z36y8bnxbcjc9m95gq5"; + version = "0.8.0"; + sha256 = "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r"; + revision = "1"; + editedCabalFile = "1imyl3g2bni8bc6kajr857xh94fscphksj3286pxfpa8yp9vqqpc"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet transformers ]; testHaskellDepends = [ - base bytestring cereal conduit HUnit mtl resourcet transformers + base bytestring cereal conduit HUnit mtl transformers ]; homepage = "https://github.com/snoyberg/conduit"; description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits"; @@ -41841,6 +44515,7 @@ self: { ]; description = "Use cereal to encode/decode io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-text" = callPackage @@ -42038,6 +44713,7 @@ self: { homepage = "https://github.com/cheecheeo/haskell-cgi"; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cgi-undecidable" = callPackage @@ -42049,6 +44725,7 @@ self: { libraryHaskellDepends = [ base cgi mtl ]; description = "Undecidable instances for the cgi package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cgi-utils" = callPackage @@ -42067,23 +44744,24 @@ self: { }) {}; "cgrep" = callPackage - ({ mkDerivation, ansi-terminal, array, async, base, bytestring - , cmdargs, containers, directory, dlist, either, filepath, ghc-prim - , mtl, process, regex-base, regex-pcre, regex-posix, safe, split - , stm, stringsearch, transformers, unicode-show, unix-compat - , unordered-containers, utf8-string + ({ mkDerivation, aeson, ansi-terminal, array, async, base + , bytestring, cmdargs, containers, directory, dlist, either + , filepath, ghc-prim, mtl, process, regex-base, regex-pcre + , regex-posix, safe, split, stm, stringsearch, transformers + , unicode-show, unix-compat, unordered-containers, utf8-string + , yaml }: mkDerivation { pname = "cgrep"; - version = "6.6.17"; - sha256 = "18si8gmgkfzky9rd53llz489j2wgzaw2b7hgr1djlc9yvp5h7482"; + version = "6.6.24"; + sha256 = "0clnnhr5srrl3z2crfrs7csihrgcq5p9d9vgqbgxsf741jnfmhcx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal array async base bytestring cmdargs containers + aeson ansi-terminal array async base bytestring cmdargs containers directory dlist either filepath ghc-prim mtl process regex-base regex-pcre regex-posix safe split stm stringsearch transformers - unicode-show unix-compat unordered-containers utf8-string + unicode-show unix-compat unordered-containers utf8-string yaml ]; homepage = "http://awgn.github.io/cgrep/"; description = "Command line tool"; @@ -42130,7 +44808,6 @@ self: { array base binary bytestring Codec-Image-DevIL containers data-reify directory GLUT OpenGLRaw process time ]; - executableHaskellDepends = [ base ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/ChalkBoard"; description = "Combinators for building and processing 2D images"; license = stdenv.lib.licenses.bsd3; @@ -42163,6 +44840,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chan" = callPackage + ({ mkDerivation, async, base, stm }: + mkDerivation { + pname = "chan"; + version = "0.0.3"; + sha256 = "0ci20y0wd232qnh1mql3vjqml13mkrpm9dgv005wcgym7w18isgr"; + libraryHaskellDepends = [ async base stm ]; + testHaskellDepends = [ async base stm ]; + homepage = "https://github.com/athanclark/chan#readme"; + description = "Some extra kit for Chans"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chan-split" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -42189,6 +44879,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "changelogged" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, Cabal, cabal-doctest + , doctest, either, exceptions, foldl, Glob, mtl + , optparse-applicative, QuickCheck, system-filepath, text, turtle + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "changelogged"; + version = "0.2.0"; + sha256 = "05viyx641zwxf222gvhyhs5dclwbylp7s32n7h3zzja4bycf03f2"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson ansi-terminal base either exceptions foldl mtl + optparse-applicative system-filepath text turtle + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + ansi-terminal base turtle unordered-containers + ]; + testHaskellDepends = [ + ansi-terminal base doctest Glob QuickCheck turtle + unordered-containers + ]; + homepage = "https://github.com/GetShopTV/changelogged#readme"; + description = "Changelog manager for Git projects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "charade" = callPackage ({ mkDerivation, base, configurator, containers, filepath, heist , lens, mtl, QuickCheck, random, snap, snap-core, snap-extras @@ -42267,56 +44987,34 @@ self: { }) {}; "chart-unit" = callPackage - ({ mkDerivation, ad, base, colour, diagrams-lib - , diagrams-rasterific, diagrams-svg, foldl, formatting, JuicyPixels - , lens, linear, mwc-probability, mwc-random, numhask, numhask-range - , primitive, protolude, reflection, tasty, tasty-hspec, tdigest - , text - }: - mkDerivation { - pname = "chart-unit"; - version = "0.4.1"; - sha256 = "0ry6j00rmkbv9z98d7i6zmj5sxh4ram4nyaw39k2kgaxkgfa1iag"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base colour diagrams-lib diagrams-svg foldl formatting lens linear - numhask numhask-range text - ]; - executableHaskellDepends = [ - ad base diagrams-lib diagrams-rasterific foldl JuicyPixels - mwc-probability mwc-random numhask primitive protolude reflection - tdigest text - ]; - testHaskellDepends = [ base numhask tasty tasty-hspec ]; - homepage = "https://github.com/tonyday567/chart-unit"; - description = "Native haskell charts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "chart-unit_0_5_4" = callPackage - ({ mkDerivation, base, colour, containers, data-default - , diagrams-lib, diagrams-svg, foldl, formatting, lens, linear - , mwc-probability, mwc-random, numhask, numhask-range, palette - , primitive, protolude, SVGFonts, tasty, tasty-hspec, tdigest, text + ({ mkDerivation, base, colour, data-default, diagrams-lib + , diagrams-svg, doctest, foldl, formatting, generic-lens + , generic-lens-labels, lens, linear, mwc-probability, mwc-random + , numhask, numhask-histogram, numhask-prelude, numhask-range + , palette, primitive, protolude, scientific, svg-builder, SVGFonts + , tasty, tasty-hspec, text, time }: mkDerivation { pname = "chart-unit"; - version = "0.5.4"; - sha256 = "1zyfh713sr8bhyn6v2la52xzyq7frg0igwxhfl8ym8l7nhxrrby7"; + version = "0.6.2.0"; + sha256 = "0y6xha20ckj0n0yih1zwwhyp55q1jcdmq06caid9biji8nkahzb0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour data-default diagrams-lib diagrams-svg foldl formatting - lens linear numhask numhask-range palette SVGFonts text + generic-lens lens linear numhask numhask-prelude numhask-range + palette protolude scientific svg-builder SVGFonts text time ]; executableHaskellDepends = [ - base containers diagrams-lib diagrams-svg foldl formatting lens - mwc-probability mwc-random numhask primitive protolude tdigest text + base diagrams-lib formatting generic-lens-labels lens + mwc-probability mwc-random numhask numhask-histogram + numhask-prelude numhask-range primitive protolude text time + ]; + testHaskellDepends = [ + base doctest numhask numhask-prelude numhask-range tasty + tasty-hspec ]; - testHaskellDepends = [ base numhask tasty tasty-hspec text ]; - homepage = "https://github.com/tonyday567/chart-unit"; + homepage = "https://github.com/tonyday567/chart-unit#readme"; description = "Native haskell charts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -42431,8 +45129,8 @@ self: { }: mkDerivation { pname = "chatwork"; - version = "0.1.1.5"; - sha256 = "1r3sayix8lid0hxx8xl424q4zcff89c5gdln7zs17jg3rb9a9x57"; + version = "0.1.3.1"; + sha256 = "0wsr84yk8l9s8fpb6fg4vbjyzlvy0608qply1h12zi09b5zr149i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42451,35 +45149,39 @@ self: { homepage = "https://github.com/matsubara0507/chatwork#readme"; description = "The ChatWork API in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cheapskate" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring, containers - , data-default, http-types, mtl, syb, text, uniplate, wai - , wai-extra, xss-sanitize + "chatwork_0_1_3_2" = 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 = "cheapskate"; - version = "0.1.0.5"; - sha256 = "0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs"; - revision = "1"; - editedCabalFile = "1m88nnrdd2bzvpnaypzi38xa1criwyj5j6c6pzqjkkivmhk3bw99"; + pname = "chatwork"; + version = "0.1.3.2"; + sha256 = "17wvmn2immigdbc5kbckwbl8hsali8w0mdii9mib9lfxykawyh54"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html containers data-default mtl syb text uniplate - xss-sanitize + aeson aeson-casing base bytestring connection data-default-class + http-api-data http-client http-client-tls http-types req text ]; executableHaskellDepends = [ - aeson base blaze-html bytestring http-types text wai wai-extra + aeson aeson-casing base bytestring connection data-default-class + http-api-data http-client http-client-tls http-types req text ]; - homepage = "http://github.com/jgm/cheapskate"; - description = "Experimental markdown processor"; - license = stdenv.lib.licenses.bsd3; + 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cheapskate_0_1_1" = callPackage + "cheapskate" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize }: @@ -42499,7 +45201,6 @@ self: { homepage = "http://github.com/jgm/cheapskate"; description = "Experimental markdown processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate-highlight" = callPackage @@ -42623,6 +45324,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkers_0_4_10" = callPackage + ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: + mkDerivation { + pname = "checkers"; + version = "0.4.10"; + sha256 = "07ki0qrw9rdjp3y2188wnbzx4g287qdsn9dwhg69i2ajdw83kxw9"; + libraryHaskellDepends = [ + array base QuickCheck random semigroupoids + ]; + homepage = "https://github.com/conal/checkers"; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "checkmate" = callPackage ({ mkDerivation, base, bytestring, containers, diff-parse , directory, file-embed, filepath, github, hlint, hspec @@ -42655,14 +45371,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "checksum" = callPackage + ({ mkDerivation, base, explicit-exception, utility-ht }: + mkDerivation { + pname = "checksum"; + version = "0.0"; + sha256 = "0327lihvibnhs2c0gnmm13g6iaw53ka3w2j1rng4d1vnrxphyyik"; + libraryHaskellDepends = [ base explicit-exception utility-ht ]; + homepage = "http://hub.darcs.net/thielema/checksum"; + description = "Compute and verify checksums of ISBN, IBAN, etc"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chell" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, options, patience , random, template-haskell, text, transformers }: mkDerivation { pname = "chell"; - version = "0.4.0.1"; - sha256 = "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz"; + version = "0.4.0.2"; + sha256 = "10ingy9qnbmc8cqh4i9pskcw43l0mzk8f3d76b3qz3fig5ary3j9"; libraryHaskellDepends = [ ansi-terminal base bytestring options patience random template-haskell text transformers @@ -42689,13 +45417,12 @@ self: { ({ mkDerivation, base, chell, QuickCheck, random }: mkDerivation { pname = "chell-quickcheck"; - version = "0.2.5"; - sha256 = "02bkcnx5k6r5csdnnkvk4wfd0l36nxb87i1463ynw17n7ym9s4cs"; + version = "0.2.5.1"; + sha256 = "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a"; libraryHaskellDepends = [ base chell QuickCheck random ]; homepage = "https://john-millikin.com/software/chell/"; description = "QuickCheck support for the Chell testing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chesshs" = callPackage @@ -42906,6 +45633,94 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "chr-core" = callPackage + ({ mkDerivation, base, chr-data, chr-pretty, containers, hashable + , logict-state, mtl, pqueue, unordered-containers + }: + mkDerivation { + pname = "chr-core"; + version = "0.1.0.1"; + sha256 = "07lc9h9k3zy1ylw5b5xv6kls7sj7ppr18gacvzfqz3ppys54kkja"; + libraryHaskellDepends = [ + base chr-data chr-pretty containers hashable logict-state mtl + pqueue unordered-containers + ]; + homepage = "https://github.com/atzedijkstra/chr"; + description = "Constraint Handling Rules"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "chr-data" = callPackage + ({ mkDerivation, array, base, chr-pretty, containers, fclabels + , hashable, microlens, microlens-mtl, microlens-th, mtl + , template-haskell, unordered-containers, vector + }: + mkDerivation { + pname = "chr-data"; + version = "0.1.0.0"; + sha256 = "0igcqrqbxy3l26b3girh6qpmls5z2jcgzywxid2qq348jan88bgh"; + revision = "1"; + editedCabalFile = "1wzhcwzaskbl28plgs0z26jh3mj99mf2rbkn75n75yr6gf8fqs44"; + libraryHaskellDepends = [ + array base chr-pretty containers fclabels hashable microlens + microlens-mtl microlens-th mtl template-haskell + unordered-containers vector + ]; + homepage = "https://github.com/atzedijkstra/chr"; + description = "Datatypes required for chr library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "chr-lang" = callPackage + ({ mkDerivation, base, chr-core, chr-data, chr-parse, chr-pretty + , containers, fgl, hashable, mtl, time, unordered-containers + }: + mkDerivation { + pname = "chr-lang"; + version = "0.1.0.1"; + sha256 = "0dd4xlk2klnqn6xyfh3b7gcy17z8x1lvyps5f5mypk9ijmrckhdy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base chr-core chr-data chr-parse chr-pretty containers fgl hashable + mtl time unordered-containers + ]; + executableHaskellDepends = [ base chr-data ]; + homepage = "https://github.com/atzedijkstra/chr"; + description = "AST + surface language around chr"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "chr-parse" = callPackage + ({ mkDerivation, base, containers, uulib }: + mkDerivation { + pname = "chr-parse"; + version = "0.1.0.0"; + sha256 = "00jlfpanzkawiz0fh5gc4czda9ip5r203pnjwllcqhmy9w04ip9k"; + revision = "1"; + editedCabalFile = "0h3qyn306sxqsvxmz9hfba169nkc3hx7ygkxr5j2sz033fvi31jc"; + libraryHaskellDepends = [ base containers uulib ]; + homepage = "https://github.com/atzedijkstra/chr"; + description = "Parsing for chr library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "chr-pretty" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "chr-pretty"; + version = "0.1.0.0"; + sha256 = "0flm7phvi5x84m8vbkvhd3xq3dwnj1vxwi27fw78ikbzx91q376n"; + revision = "1"; + editedCabalFile = "15v5bv7azi7qw33rg849wggpy07ingd8fp24dm0azwgwsqd05mb9"; + libraryHaskellDepends = [ base containers ]; + homepage = "https://github.com/atzedijkstra/chr"; + description = "Pretty printing for chr library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chronograph" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, thyme, vector-space }: mkDerivation { @@ -42925,27 +45740,28 @@ self: { }: mkDerivation { pname = "chronologique"; - version = "0.3.0.0"; - sha256 = "1pgggmsmb3ah15iqkib9d9ms0vs4j3945a7mbih0zra4xha39dg9"; + version = "0.3.0.1"; + sha256 = "1l3964zp7c4pj3izdcknnvsbn3avyvfychlxs9rl9hr251qbcf14"; libraryHaskellDepends = [ base hourglass time vector ]; testHaskellDepends = [ base hourglass hspec QuickCheck vector ]; + homepage = "https://github.com/afcowie/chronologique/"; description = "Time to manipulate time"; license = stdenv.lib.licenses.bsd3; }) {}; "chronos" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable - , HUnit, primitive, QuickCheck, test-framework + ({ mkDerivation, aeson, attoparsec, base, bytestring, clock + , hashable, HUnit, primitive, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text, torsor , vector }: mkDerivation { pname = "chronos"; - version = "1.0"; - sha256 = "135fb54lac1rqb7ql0810f22a41whmswckhjbmb1xysryv0gv05k"; + version = "1.0.1"; + sha256 = "1vbjjnsp61km96adlk6ywhhfakmcac680aliavbh18rc00vfi3cj"; libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text torsor - vector + aeson attoparsec base bytestring clock hashable primitive text + torsor vector ]; testHaskellDepends = [ attoparsec base bytestring HUnit QuickCheck test-framework @@ -42954,7 +45770,6 @@ self: { homepage = "https://github.com/andrewthad/chronos#readme"; description = "A performant time library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chu2" = callPackage @@ -43001,12 +45816,12 @@ self: { }: mkDerivation { pname = "chunked-data"; - version = "0.3.0"; - sha256 = "0bszq6fijnr4pmadzz89smj7kfmzx0ca3wd9ga8gv0in9jk9vgp1"; + version = "0.3.1"; + sha256 = "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p"; libraryHaskellDepends = [ base bytestring containers semigroups text transformers vector ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Typeclasses for dealing with various chunked data representations"; license = stdenv.lib.licenses.mit; }) {}; @@ -43156,15 +45971,18 @@ self: { }) {}; "cipher-aes128" = callPackage - ({ mkDerivation, base, bytestring, cereal, criterion, crypto-api - , entropy, tagged + ({ mkDerivation, base, bytestring, Cabal, cereal, criterion + , crypto-api, entropy, process, tagged }: mkDerivation { pname = "cipher-aes128"; version = "0.7.0.3"; sha256 = "0fif8626z1p2q6734sjb69s1ascwmqiv9dkmzir7166ipjlbw9vg"; + revision = "1"; + editedCabalFile = "1c3lr80vcdrajlvks9ny9s8m2n2kc9jw14nh65668dfikp0pqc61"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ base bytestring cereal crypto-api tagged ]; @@ -43361,29 +46179,28 @@ self: { }) {}; "cisco-spark-api" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bitset-word8, bytestring - , conduit-combinators, data-default, hspec, http-conduit - , http-types, network-uri, optparse-applicative, text - , thread-hierarchy, utf8-string, wai, warp + ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 + , bytestring, conduit, data-default, hspec, http-conduit + , http-types, network-uri, optparse-applicative, text, utf8-string + , wai, warp }: mkDerivation { pname = "cisco-spark-api"; - version = "0.1.0.0"; - sha256 = "0wiz580v04acjnc05mpx7nwgdz5gk6gsg84lv26p7qlij17038ds"; + version = "0.1.0.2"; + sha256 = "0cgs3d4dlc5vxz51d8c6hjvi1zxsvxzni4nqhqrc0rxnxkimc7bw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base bitset-word8 bytestring conduit-combinators - data-default http-conduit network-uri text + aeson attoparsec base bitset-word8 bytestring conduit data-default + http-conduit network-uri text ]; executableHaskellDepends = [ - aeson base bytestring conduit-combinators data-default http-conduit + aeson base bytestring conduit data-default http-conduit optparse-applicative text utf8-string ]; testHaskellDepends = [ - aeson attoparsec base bytestring conduit-combinators data-default - hspec http-conduit http-types network-uri text thread-hierarchy wai - warp + aeson async attoparsec base bytestring conduit data-default hspec + http-conduit http-types network-uri text wai warp ]; homepage = "https://github.com/nshimaza/cisco-spark-api#readme"; description = "A Haskell bindings for Cisco Spark API"; @@ -43495,6 +46312,7 @@ self: { ]; description = "A new Haskeleton package"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cjk" = callPackage @@ -43630,19 +46448,19 @@ self: { ({ mkDerivation, aeson, base, bytestring, text }: mkDerivation { pname = "clang-compilation-database"; - version = "0.1.0.0"; - sha256 = "1nnbcx9450kppm1qsqspdj4ywjgcmfg2zicgs309hdb7kvszpdla"; + version = "0.1.0.1"; + sha256 = "1a0wvk82k65b5lscsvg5p41shpz98rahq44d5vyf8wclfshh2ihi"; libraryHaskellDepends = [ aeson base bytestring text ]; + testHaskellDepends = [ aeson base bytestring ]; homepage = "https://github.com/lambdageek/clang-compilation-database"; description = "JSON Compilation Database Format encoding and decoding"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clang-pure" = callPackage ({ mkDerivation, base, bytestring, clang, containers, contravariant - , hashable, inline-c, lens, microlens, microlens-contra, singletons - , stm, template-haskell, unordered-containers, vector + , inline-c, microlens, microlens-contra, singletons, stm + , template-haskell, vector }: mkDerivation { pname = "clang-pure"; @@ -43655,9 +46473,6 @@ self: { microlens-contra singletons stm template-haskell vector ]; librarySystemDepends = [ clang ]; - executableHaskellDepends = [ - base bytestring hashable lens unordered-containers - ]; description = "Pure C++ code analysis with libclang"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -43720,59 +46535,58 @@ self: { "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl - , containers, deepseq, directory, filepath, ghc, ghc-boot - , ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, ghci, hashable, haskeline, lens, mtl - , process, text, time, transformers, unbound-generics, uniplate - , unix, unordered-containers + , clash-prelude, concurrent-supply, containers, deepseq, directory + , filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable + , haskeline, integer-gmp, lens, mtl, process, reflection, text + , time, transformers, unbound-generics, uniplate, unix + , unordered-containers }: mkDerivation { pname = "clash-ghc"; - version = "0.7.2"; - sha256 = "1fjimvj07mc8d8z6i9sl9ifyvcil262p53bz6gap833jrirqd3yh"; - revision = "1"; - editedCabalFile = "1np4zs8bqdvzlls8c8zpiwqq91bvx2aiz7qpvza0fzdvc0df2cmj"; + version = "0.99"; + sha256 = "19s6h0ly0pz1wi1zs5ln9wai6kp9f49xdcjyc3z6mskcabv5b8q2"; isLibrary = true; isExecutable = true; 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 - ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable - haskeline lens mtl process text time transformers unbound-generics + concurrent-supply containers deepseq directory filepath ghc + ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens + mtl process reflection 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-lib" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude - , concurrent-supply, containers, data-binary-ieee754, deepseq - , directory, errors, fgl, filepath, ghc, hashable, integer-gmp - , lens, mtl, pretty, process, template-haskell, text, time - , transformers, unbound-generics, unordered-containers - , uu-parsinglib, wl-pprint-text + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , bytestring, clash-prelude, concurrent-supply, containers + , data-binary-ieee754, deepseq, directory, errors, fgl, filepath + , ghc, hashable, integer-gmp, lens, mtl, parsers, prettyprinter + , process, reducers, template-haskell, text, time, transformers + , trifecta, unbound-generics, unordered-containers }: mkDerivation { pname = "clash-lib"; - version = "0.7.1"; - sha256 = "1mml3f10mdirlihjnbzjh3jjnmvgcqfqs16k22a13m8pd4whcw88"; - revision = "2"; - editedCabalFile = "1b8d63wisrizirkyrl58840bfnknjy049sm43zhhr9nbw6fn2c51"; + version = "0.99"; + sha256 = "1dl9pwv9fc5byimdxsl4xa4401nz74bgzrxmgk6hcbyvh7i4b17i"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson attoparsec base bytestring clash-prelude concurrent-supply - containers data-binary-ieee754 deepseq directory errors fgl - filepath ghc hashable integer-gmp lens mtl pretty process - template-haskell text time transformers unbound-generics - unordered-containers uu-parsinglib wl-pprint-text + aeson ansi-wl-pprint attoparsec base bytestring clash-prelude + concurrent-supply containers data-binary-ieee754 deepseq directory + errors fgl filepath ghc hashable integer-gmp lens mtl parsers + prettyprinter process reducers template-haskell text time + transformers trifecta unbound-generics unordered-containers ]; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-multisignal" = callPackage @@ -43788,26 +46602,25 @@ self: { ]; homepage = "https://github.com/ra1u/clash-multisignal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, base, constraints, criterion + ({ mkDerivation, array, base, bifunctors, constraints, criterion , data-binary-ieee754, data-default, deepseq, doctest, ghc-prim , ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, half, integer-gmp, lens, QuickCheck - , reflection, singletons, template-haskell, vector + , reflection, singletons, template-haskell, transformers, vector }: mkDerivation { pname = "clash-prelude"; - version = "0.11.2"; - sha256 = "1ccbcqkqcq5kyfjfvpkis2z40ishc4yqjjjswfsg92qrklk38wcl"; - revision = "2"; - editedCabalFile = "16ak462j0722lvy8ajn2yv400z9jgv8c3l151pmfwh893q6b0i3l"; + version = "0.99"; + sha256 = "13qclvisklwy4syc5hgr5dvcz7wm4nwasgky3xvjhnhjg05wjd6l"; libraryHaskellDepends = [ - array base constraints data-binary-ieee754 data-default deepseq - ghc-prim ghc-typelits-extra ghc-typelits-knownnat + array base bifunctors constraints data-binary-ieee754 data-default + deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise half integer-gmp lens QuickCheck - reflection singletons template-haskell vector + reflection singletons template-haskell transformers vector ]; testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ @@ -43816,6 +46629,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude-quickcheck" = callPackage @@ -43847,6 +46661,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-verilog" = callPackage @@ -43865,6 +46680,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-vhdl" = callPackage @@ -43883,6 +46699,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classify" = callPackage @@ -43913,6 +46730,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "classy-miso" = callPackage + ({ mkDerivation, base, containers, data-default, lens, megaparsec + , miso, network-uri, rfc, transformers, url + }: + mkDerivation { + pname = "classy-miso"; + version = "0.0.0.2"; + sha256 = "12qz2s5qhmjryp5x06jcv2gl3ipjhw0knsn1qawl1kn278hpyvp9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default lens megaparsec miso network-uri rfc + transformers url + ]; + executableHaskellDepends = [ base miso rfc ]; + testHaskellDepends = [ base miso rfc ]; + homepage = "https://github.com/RobertFischer/Classy-Miso#README.md"; + description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classy-parallel" = callPackage ({ mkDerivation, base, lifted-base, monad-control, parallel , resourcet, transformers @@ -43931,110 +46770,51 @@ 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.1"; - sha256 = "0d7s3z4vbp2pq696m0yc1ccd51d3qvz7f50ya7xijfx7771y0zm4"; - 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; - }) {}; - - "classy-prelude_1_3_0" = 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 + , chunked-data, containers, deepseq, dlist, ghc-prim, hashable + , hspec, mono-traversable, mono-traversable-instances, mtl + , mutable-containers, primitive, QuickCheck, say, semigroups, stm + , stm-chans, text, time, transformers, unliftio + , unordered-containers, vector, vector-instances }: mkDerivation { pname = "classy-prelude"; - version = "1.3.0"; - sha256 = "048h2pcp0i2xzd92f6w48hhk5zpic040prmddcf4jp725l1ziid5"; + version = "1.4.0"; + sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb"; 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 + containers deepseq dlist ghc-prim hashable mono-traversable + mono-traversable-instances mtl mutable-containers primitive say + semigroups stm stm-chans text time transformers unliftio unordered-containers vector vector-instances ]; testHaskellDepends = [ base containers hspec QuickCheck transformers unordered-containers ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classy-prelude-conduit" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, conduit - , conduit-combinators, hspec, monad-control, QuickCheck, resourcet - , transformers, void + ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec + , monad-control, QuickCheck, resourcet, transformers, void }: mkDerivation { pname = "classy-prelude-conduit"; - version = "1.2.0"; - sha256 = "0zzc6095205qf58qnnagfnb90svlc0m4hw2q79kd4x6d8b80s294"; + version = "1.4.0"; + sha256 = "096466cyyxxmg3jpq705xjjc4r7v9b607hgbys8vybjlldkjbvrr"; libraryHaskellDepends = [ - base bytestring classy-prelude conduit conduit-combinators - monad-control resourcet transformers void + base bytestring classy-prelude conduit monad-control resourcet + transformers void ]; testHaskellDepends = [ base bytestring conduit hspec QuickCheck transformers ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "classy-prelude together with conduit functions"; license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude-conduit_1_3_0" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, conduit - , conduit-combinators, hspec, monad-control, QuickCheck, resourcet - , transformers, void - }: - mkDerivation { - pname = "classy-prelude-conduit"; - version = "1.3.0"; - sha256 = "09ibih4k72j0k9bv8yhs7lwdg1ic3gbwqfml0wnvmykpqcl2ff0g"; - libraryHaskellDepends = [ - base bytestring classy-prelude conduit conduit-combinators - monad-control resourcet transformers void - ]; - testHaskellDepends = [ - base bytestring conduit hspec QuickCheck transformers - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "classy-prelude together with conduit functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "classy-prelude-yesod" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types @@ -44042,45 +46822,28 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "1.2.0"; - sha256 = "1m9z02fdk7dgz4z12x49jjprsjzsbdgywawaqqyq02yynm5fikq1"; - libraryHaskellDepends = [ - aeson base classy-prelude classy-prelude-conduit data-default - http-conduit http-types persistent yesod yesod-newsfeed - yesod-static - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; - }) {}; - - "classy-prelude-yesod_1_3_0" = callPackage - ({ mkDerivation, aeson, base, classy-prelude - , classy-prelude-conduit, data-default, http-conduit, http-types - , persistent, yesod, yesod-newsfeed, yesod-static - }: - mkDerivation { - pname = "classy-prelude-yesod"; - version = "1.3.0"; - sha256 = "1hnb0kfjly8l08v1krmcxgk6pc1xh1lg85mbkbz34pkhjx0rf7s6"; + version = "1.4.0"; + sha256 = "0a4y9fipcikndzqqna5694f1wcwwin5ir076pjj1nm638a7silhc"; libraryHaskellDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed yesod-static ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classyplate" = callPackage - ({ mkDerivation, base, template-haskell, type-list }: + ({ mkDerivation, base, criterion, parallel, template-haskell + , uniplate + }: mkDerivation { pname = "classyplate"; - version = "0.3.0.0"; - sha256 = "1ijbgkzvgis7wlnngvhvm1vsfmfm4d8g8qa2simda7rfm9swj8m4"; - libraryHaskellDepends = [ base template-haskell type-list ]; + version = "0.3.0.2"; + sha256 = "0dpllaahq81bn7h0vb0h8s1lf6w0knd2dgqyycimrxfc0aqh1md8"; + libraryHaskellDepends = [ base template-haskell ]; + benchmarkHaskellDepends = [ base criterion parallel uniplate ]; description = "Fuseable type-class based generics"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -44098,10 +46861,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clay_0_13_0" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: + mkDerivation { + pname = "clay"; + version = "0.13.0"; + sha256 = "0kyg5ifrjdvd7rxzsa6jjfyv9xx8amlfzbmrfwksrqla2nxqyljl"; + libraryHaskellDepends = [ base mtl text ]; + testHaskellDepends = [ base hspec hspec-expectations mtl text ]; + homepage = "http://fvisser.nl/clay"; + description = "CSS preprocessor as embedded Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks" = callPackage ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base - , blaze-html, bytestring, cereal, containers, directory, filepath - , happstack-authenticate, happstack-hsp, happstack-jmacro + , blaze-html, bytestring, Cabal, cereal, containers, directory + , filepath, happstack-authenticate, happstack-hsp, happstack-jmacro , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs , ixset, jmacro, lens, mtl, network, network-uri, old-locale , openssl, process, random, reform, reform-happstack, reform-hsp @@ -44112,9 +46889,10 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.24.0.4"; - sha256 = "0xpv3qb7w1bzszbnmzriai9dv9qfajnv1pv9y3jdaih4gj73c9ny"; + version = "0.24.0.7"; + sha256 = "1czalrr7y3526jb4cgi8bghxghqwsjwkfhm5vb4q19xzqg3kjqwy"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -44130,7 +46908,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage @@ -44149,7 +46926,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "a command-line interface for adminstrating some aspects of clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-dot-com" = callPackage @@ -44224,7 +47000,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-plugin-mailinglist" = callPackage @@ -44250,7 +47025,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "mailing list plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-plugin-media" = callPackage @@ -44275,21 +47049,22 @@ self: { homepage = "http://clckwrks.com/"; description = "media plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-plugin-page" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks - , containers, directory, filepath, happstack-hsp, happstack-server - , hsp, hsx2hs, ixset, mtl, old-locale, random, reform - , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell - , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins - , web-routes, web-routes-happstack, web-routes-th + ({ mkDerivation, acid-state, aeson, attoparsec, base, Cabal + , clckwrks, containers, directory, filepath, happstack-hsp + , happstack-server, hsp, hsx2hs, ixset, mtl, old-locale, random + , reform, reform-happstack, reform-hsp, safecopy, tagsoup + , template-haskell, text, time, time-locale-compat, uuid + , uuid-orphans, web-plugins, web-routes, web-routes-happstack + , web-routes-th }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.10"; - sha256 = "0ijwfl4wj0pjv6hfac6fbrvcg3all9p2wx2w1lirjvn5kgwjj5r2"; + version = "0.4.3.12"; + sha256 = "0xndx7843laiha1n8xscq13dv6x6fv098v1cdmmzx7qnvfvhhlxj"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -44301,7 +47076,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-theme-bootstrap" = callPackage @@ -44320,7 +47094,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-theme-clckwrks" = callPackage @@ -44357,14 +47130,12 @@ self: { }) {}; "cld2" = callPackage - ({ mkDerivation, base, bytestring, text }: + ({ mkDerivation, base, bytestring, hashable, text }: mkDerivation { pname = "cld2"; - version = "0.1.0.1"; - sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd"; - revision = "1"; - editedCabalFile = "1gfgnhy9ahyq7y74mpc6gsmir8v0c2d6z81klw1zhack6pmnql30"; - libraryHaskellDepends = [ base bytestring text ]; + version = "0.1.1.1"; + sha256 = "04sh2077pn67y1apgzx6rp4z15dw7qbvwg6yrwg416k40ilz7nbd"; + libraryHaskellDepends = [ base bytestring hashable text ]; homepage = "https://github.com/dfoxfranke/haskell-cld2"; description = "Haskell bindings to Google's Compact Language Detector 2"; license = stdenv.lib.licenses.asl20; @@ -44438,6 +47209,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clexer" = callPackage + ({ mkDerivation, base, containers, mtl, parsec }: + mkDerivation { + pname = "clexer"; + version = "0.1.0.0"; + sha256 = "1x2q496jqvgqjbwncszl1h9ylkq6rn8h2fsp7w771xkyslfq46xy"; + libraryHaskellDepends = [ base containers mtl parsec ]; + description = "Lexes C++ code into simple tokens"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cli" = callPackage ({ mkDerivation, base, directory, mtl, QuickCheck, tasty , tasty-quickcheck, terminfo, transformers @@ -44473,6 +47255,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cli-setup" = callPackage + ({ mkDerivation, base, bytestring, directory, file-embed, process + }: + mkDerivation { + pname = "cli-setup"; + version = "0.2.0.4"; + sha256 = "0mkxm1kpbfsiv3khp8d96j9bcq7j4zbidd5ks89r69bxsmrp1z7i"; + libraryHaskellDepends = [ + base bytestring directory file-embed process + ]; + homepage = "https://github.com/vmchale/cli-setup#readme"; + description = "Helper setup scripts for packaging command-line tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "click-clack" = callPackage ({ mkDerivation, base, containers, GLFW, Hipmunk, MonadRandom, mtl , OpenGL, random, StateVar, transformers @@ -44524,11 +47321,11 @@ self: { }: mkDerivation { pname = "clif"; - version = "0.1.0.0"; - sha256 = "1inrhmrajl9y9vbbv5fh1m72a985j9k82vxmz9948k37hwvx6faw"; + version = "0.1.1.0"; + sha256 = "08mamsaycd2k2sjz08sg808yd153hhw9gfi4170448xl8icadkx5"; libraryHaskellDepends = [ base containers QuickCheck ]; testHaskellDepends = [ - base containers QuickCheck tasty tasty-quickcheck tasty-th + base containers tasty tasty-quickcheck tasty-th ]; benchmarkHaskellDepends = [ base time ]; description = "A Clifford algebra number type for Haskell"; @@ -44570,6 +47367,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clifm" = callPackage + ({ mkDerivation, base, brick, byteunits, directory, filepath + , optparse-applicative, pointedlist, process, time, vector, vty + }: + mkDerivation { + pname = "clifm"; + version = "0.3.1.0"; + sha256 = "17kd2cfxc9dswlqv141f2anc0g19xhj9w5mk3xicx7vyr6j43y0y"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick byteunits directory filepath optparse-applicative + pointedlist process time vector vty + ]; + homepage = "https://github.com/pasqu4le/clifm"; + description = "Command Line Interface File Manager"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "clingo" = callPackage ({ mkDerivation, base, bifunctors, clingo, deepseq, exceptions , hashable, mtl, StateVar, text, transformers, wl-pprint-text @@ -44644,17 +47460,16 @@ self: { }) {}; "clist" = callPackage - ({ mkDerivation, base, base-unicode-symbols, peano }: + ({ mkDerivation, base, natural-induction, peano }: mkDerivation { pname = "clist"; - version = "0.1.0.0"; - sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd"; - revision = "1"; - editedCabalFile = "00lxh1v7dcylvm62a2bgzncfcla0b4l1nkhx8q1m3201fzwba22m"; - libraryHaskellDepends = [ base base-unicode-symbols peano ]; + version = "0.3.0.0"; + sha256 = "1wicpkc1rxyjnmnlsdh975d58fwfmfqwhkd50v044g4763i36bdr"; + libraryHaskellDepends = [ base natural-induction peano ]; homepage = "https://github.com/strake/clist.hs"; description = "Counted list"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clit" = callPackage @@ -44781,6 +47596,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "closed" = callPackage + ({ mkDerivation, aeson, base, cassava, deepseq, hashable, hspec + , markdown-unlit, persistent, QuickCheck, text, vector + }: + mkDerivation { + pname = "closed"; + version = "0.2.0"; + sha256 = "0762acn2dik98hp4bvlyvwfy1jfzb4i6ri9pnxa07risain1qc3s"; + libraryHaskellDepends = [ + aeson base cassava deepseq hashable persistent QuickCheck text + ]; + testHaskellDepends = [ + aeson base cassava deepseq hashable hspec markdown-unlit persistent + QuickCheck text vector + ]; + homepage = "https://github.com/frontrowed/closed#readme"; + description = "Integers bounded by a closed interval"; + license = stdenv.lib.licenses.mit; + }) {}; + "closure" = callPackage ({ mkDerivation, base, hashable, unordered-containers }: mkDerivation { @@ -44821,25 +47656,27 @@ self: { "cloud-seeder" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-cloudformation - , amazonka-core, base, bytestring, containers, deepseq, exceptions - , fast-logger, hspec, lens, monad-control, monad-logger, monad-mock - , mtl, optparse-applicative, text, transformers, transformers-base - , unordered-containers, uuid, yaml + , amazonka-core, amazonka-kms, amazonka-s3, base, bytestring + , containers, crypto-api, deepseq, exceptions, fast-logger, hspec + , lens, monad-control, monad-logger, monad-mock, mtl + , optparse-applicative, text, text-conversions, these, transformers + , transformers-base, unordered-containers, uuid, yaml }: mkDerivation { pname = "cloud-seeder"; - version = "0.1.0.0"; - sha256 = "1jyxbk37xzx7dgxkgrmpn7nv7v494l26f4c5r1j665cd1d8x0m4f"; + version = "0.2.0.0"; + sha256 = "0886c6lfqcvwbq3cdxpq2rg25a0p9msjxqv3ncsw02rdcww0dsqc"; libraryHaskellDepends = [ - aeson amazonka amazonka-cloudformation amazonka-core base - containers deepseq exceptions lens monad-control monad-logger mtl - optparse-applicative text transformers transformers-base + aeson amazonka amazonka-cloudformation amazonka-core amazonka-kms + amazonka-s3 base bytestring containers crypto-api deepseq + exceptions lens monad-control monad-logger mtl optparse-applicative + text text-conversions transformers transformers-base unordered-containers uuid yaml ]; testHaskellDepends = [ amazonka-cloudformation base bytestring containers deepseq fast-logger hspec lens monad-logger monad-mock mtl - optparse-applicative text transformers yaml + optparse-applicative text these transformers yaml ]; homepage = "https://github.com/cjdev/cloud-seeder#readme"; description = "A tool for interacting with AWS CloudFormation"; @@ -44871,15 +47708,14 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "1.7.2"; - sha256 = "1w6rdmb5a50vdski2k4xwysrbxaycybijgak0hvpsjhnf16yb04f"; + version = "1.7.3"; + sha256 = "10in4z00in2js5w2zgg6ydm7i2n0f0y2ass421p5rqpfv9q7y179"; 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 @@ -44918,31 +47754,9 @@ self: { 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-host_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory , file-embed, filepath, glib, mono, text, transformers }: @@ -44961,34 +47775,9 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host"; description = "Hosting the Common Language Runtime"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {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"; - revision = "1"; - editedCabalFile = "104d1k1midcmxpzr9r8ng55d04b2zsrl9xqf1b58z4yd5zlfjsfk"; - 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-inline_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive , clr-host, clr-marshal, containers, criterion, directory, extra , filepath, here, hspec, lens, parsec, pipes, process, split @@ -45020,18 +47809,6 @@ self: { }) {}; "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-marshal_0_2_0_0" = callPackage ({ mkDerivation, base, text }: mkDerivation { pname = "clr-marshal"; @@ -45041,7 +47818,6 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-marshal"; description = "Marshaling for the clr"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clr-typed" = callPackage @@ -45055,7 +47831,6 @@ self: { 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 @@ -45133,20 +47908,20 @@ self: { "clustering" = callPackage ({ mkDerivation, base, binary, containers, criterion - , hierarchical-clustering, matrices, mwc-random, parallel - , primitive, Rlang-QQ, split, tasty, tasty-hunit, tasty-quickcheck + , hierarchical-clustering, inline-r, matrices, mwc-random, parallel + , primitive, split, tasty, tasty-hunit, tasty-quickcheck , unordered-containers, vector }: mkDerivation { pname = "clustering"; - version = "0.3.1"; - sha256 = "11kzx27m7r58zq2izg781vyi895530frgw5i6bnzgiylhf028sdw"; + version = "0.4.0"; + sha256 = "16zhg2jb4a823gf8pdbm9y9yknpf1w6l3983563vk3wjna3ypfcn"; libraryHaskellDepends = [ base binary containers matrices mwc-random parallel primitive unordered-containers vector ]; testHaskellDepends = [ - base binary hierarchical-clustering matrices mwc-random Rlang-QQ + base binary hierarchical-clustering inline-r matrices mwc-random split tasty tasty-hunit tasty-quickcheck vector ]; benchmarkHaskellDepends = [ @@ -45368,16 +48143,13 @@ self: { }: mkDerivation { pname = "cmdargs"; - version = "0.10.18"; - sha256 = "1lnmcsf6p9yrwwz1zvrw5lbc32xpff7b70yz4ylawaflnlz6wrlh"; + version = "0.10.20"; + sha256 = "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath process template-haskell transformers ]; - executableHaskellDepends = [ - base filepath process template-haskell transformers - ]; homepage = "https://github.com/ndmitchell/cmdargs#readme"; description = "Command line argument processing"; license = stdenv.lib.licenses.bsd3; @@ -45487,8 +48259,8 @@ self: { ({ mkDerivation, array, base, containers }: mkDerivation { pname = "cmu"; - version = "1.10"; - sha256 = "0zlc6spb51s2k455s9mspqjjk8xm90wwjlj2nm7949ihkim4j5gy"; + version = "1.11"; + sha256 = "1zldm0j4cxhc3zwxz2zn35mbnrqpjagh3v90akvnjz95jy60z171"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers ]; @@ -45506,8 +48278,8 @@ self: { }: mkDerivation { pname = "cmv"; - version = "1.0.6"; - sha256 = "1djqw8szaq8p8mhxp4789gx5mgibdlcwhbkilzc5zcxf619pn3c1"; + version = "1.0.8"; + sha256 = "1l113yawclfpvhb5p3j6mhi3nqh8d1ix64k7d2q9slnvs3vdvphb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45550,16 +48322,33 @@ self: { }) {}; "cndict" = callPackage - ({ mkDerivation, array, base, bytestring, text }: + ({ mkDerivation, array, base, bytestring, file-embed, text }: mkDerivation { pname = "cndict"; - version = "0.8.3"; - sha256 = "1vci3z74jsxfhbbz122mcbcdh6n2371i0l803vgd8ndzawhs13m4"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ array base bytestring text ]; + version = "0.10.0"; + sha256 = "12vybpji4bxwn8in18xqp4l2js1cbnn8fgk3r6m5c8idp769ph2m"; + libraryHaskellDepends = [ array base bytestring file-embed text ]; homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; license = stdenv.lib.licenses.publicDomain; + }) {}; + + "coalpit" = callPackage + ({ mkDerivation, base, generic-random, megaparsec, network-uri + , scientific, tasty, tasty-quickcheck, tasty-travis, time + }: + mkDerivation { + pname = "coalpit"; + version = "0.1.1.0"; + sha256 = "0adays54vg3pyrc3hsdmir0cj7h4r4vvm3a4zakia82gd8bz99iq"; + libraryHaskellDepends = [ + base megaparsec network-uri scientific time + ]; + testHaskellDepends = [ + base generic-random tasty tasty-quickcheck tasty-travis + ]; + description = "Command-line options and DSV parsing and printing"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -45610,6 +48399,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "codec-beam" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath, process + , text, zlib + }: + mkDerivation { + pname = "codec-beam"; + version = "0.1.1"; + sha256 = "1d6dsa4di4wil6wqc2jpfqvf09vk4zw9c2905py5vygl87q1y9jq"; + libraryHaskellDepends = [ base bytestring containers text zlib ]; + testHaskellDepends = [ base bytestring filepath process text ]; + homepage = "https://github.com/hkgumbs/codec-beam#readme"; + description = "Erlang VM byte code assembler"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "codec-libevent" = callPackage ({ mkDerivation, array, base, binary, binary-strict, bytestring , containers, parsec, QuickCheck, regex-compat @@ -45646,25 +48451,26 @@ self: { "codec-rpm" = callPackage ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring - , conduit, conduit-combinators, conduit-extra, cpio-conduit, hspec + , conduit, conduit-extra, cpio-conduit, exceptions, hspec , hspec-attoparsec, HUnit, lzma-conduit, mtl, parsec, pretty , resourcet, text }: mkDerivation { pname = "codec-rpm"; - version = "0.2.0"; - sha256 = "1n977xndg2ii866a868rvbi581p0gbz5zpy1glrg6n9znm6y9l4h"; + version = "0.2.1"; + sha256 = "00ywr4frndvw3chlxpqdx2rimd7jjdyzmjlm1kvw23qbgfyd60is"; libraryHaskellDepends = [ - attoparsec attoparsec-binary base bytestring conduit - conduit-combinators conduit-extra cpio-conduit lzma-conduit mtl - parsec pretty resourcet text + attoparsec attoparsec-binary base bytestring conduit conduit-extra + cpio-conduit exceptions lzma-conduit mtl parsec pretty resourcet + text ]; testHaskellDepends = [ - attoparsec base bytestring hspec hspec-attoparsec HUnit text + attoparsec attoparsec-binary base bytestring hspec hspec-attoparsec + HUnit parsec pretty text ]; homepage = "https://github.com/weldr/codec-rpm"; description = "A library for manipulating RPM files"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -45730,15 +48536,15 @@ self: { "codeworld-api" = callPackage ({ mkDerivation, base, blank-canvas, cereal, cereal-text - , containers, hashable, mtl, random, text, time + , containers, hashable, mtl, random, random-shuffle, text, time }: mkDerivation { pname = "codeworld-api"; - version = "0.2.1.0"; - sha256 = "0llvmw7p5csjfky4ajmwwkb4k5i2pb1vcpla94y3xydlm8pwpn4i"; + version = "0.2.2.1"; + sha256 = "0vb3v8d4jdzk14zs1jv4m5f2wa32bpxsfa0zr4f3w6z77as136sx"; libraryHaskellDepends = [ base blank-canvas cereal cereal-text containers hashable mtl random - text time + random-shuffle text time ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; @@ -45771,6 +48577,7 @@ self: { homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codo-notation" = callPackage @@ -46019,22 +48826,27 @@ self: { }) {}; "collection-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, network-uri - , QuickCheck, quickcheck-instances, test-invariant, text + ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover + , network-arbitrary, network-uri, network-uri-json, QuickCheck + , quickcheck-instances, test-invariant, text }: mkDerivation { pname = "collection-json"; - version = "1.1.0.1"; - sha256 = "1bmjcgnqldysxyb4jn8d1pwa86c938f80s2xqj19w3cvwv261ybc"; - libraryHaskellDepends = [ aeson base network-uri text ]; + version = "1.1.2.1"; + sha256 = "1x43b1rmlrsv8jmr2mawy2ykwljbbb4h8cfcfd6gxrkzxwvlxhsl"; + libraryHaskellDepends = [ + aeson base network-uri network-uri-json text + ]; testHaskellDepends = [ - aeson base bytestring hspec network-uri QuickCheck - quickcheck-instances test-invariant text + aeson base bytestring hspec network-arbitrary network-uri + network-uri-json QuickCheck quickcheck-instances test-invariant + text ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/alunduil/collection-json.hs"; description = "Collection+JSON—Hypermedia Type Tools"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ alunduil ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "collections" = callPackage @@ -46100,8 +48912,8 @@ self: { }: mkDerivation { pname = "colonnade"; - version = "1.1.1"; - sha256 = "1qivzd143lk68k6dp8flj1265x8gw9zhs76bsvmhx6kq139qldhf"; + version = "1.2.0"; + sha256 = "0a9xh1vg64wyby370djsdcvrhg0vx2bdrwdh7csqri9nbxpzj8jn"; libraryHaskellDepends = [ base bytestring contravariant profunctors semigroups text vector ]; @@ -46109,7 +48921,6 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Generic types and functions for columnar encoding and decoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "color-counter" = callPackage @@ -46234,7 +49045,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "colour" = callPackage + "colour_2_3_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "colour"; @@ -46245,6 +49056,25 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Colour"; description = "A model for human colour/color perception"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "colour" = callPackage + ({ mkDerivation, base, QuickCheck, random, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "colour"; + version = "2.3.4"; + sha256 = "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck random test-framework test-framework-quickcheck2 + ]; + homepage = "http://www.haskell.org/haskellwiki/Colour"; + description = "A model for human colour/color perception"; + license = stdenv.lib.licenses.mit; }) {}; "colour-accelerate" = callPackage @@ -46257,6 +49087,18 @@ self: { homepage = "https://github.com/tmcdonell/colour-accelerate"; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "colour-accelerate_0_3_0_0" = callPackage + ({ mkDerivation, accelerate, base }: + mkDerivation { + pname = "colour-accelerate"; + version = "0.3.0.0"; + sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz"; + 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; }) {}; @@ -46304,14 +49146,15 @@ self: { }: mkDerivation { pname = "columbia"; - version = "0.1.3"; - sha256 = "1p211lc448vc5dv9x199pi9w5371sqkdm17gjixvrgcr0dgksqc2"; + version = "0.2"; + sha256 = "065mrgyrb82vsfwwidz3zsj7pnbry9ifz7fspi2jfmyjp69y7cmz"; libraryHaskellDepends = [ array base bytestring containers contravariant data-endian directory filelock invariant mmap mmorph monad-loops mtl parallel pointless-haskell syb-with-class transformers ]; - description = "Enhanced serialization for media that support seeking"; + doHaddock = false; + description = "Enhanced serialization using seeking"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -46364,6 +49207,7 @@ self: { ]; description = "Commonmark (markdown) to HTML renderer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {comark-testutils = null;}; @@ -46390,6 +49234,7 @@ self: { ]; description = "Parser for Commonmark (markdown)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {comark-testutils = null;}; @@ -46424,6 +49269,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "combinat-compat" = callPackage + ({ mkDerivation, array, base, containers, QuickCheck, random + , test-framework, test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "combinat-compat"; + version = "0.2.8.2"; + sha256 = "0mh5f8vmbwnib1qv9vvp45gwwj6942l1jhxnglq9i4za40k1r8ff"; + libraryHaskellDepends = [ + array base containers random transformers + ]; + testHaskellDepends = [ + array base containers QuickCheck random test-framework + test-framework-quickcheck2 transformers + ]; + homepage = "http://code.haskell.org/~bkomuves/"; + description = "Generate and manipulate various combinatorial objects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "combinat-diagrams" = callPackage ({ mkDerivation, array, base, colour, combinat, containers , diagrams-core, diagrams-lib, linear, transformers @@ -46439,6 +49305,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Graphical representations for various combinatorial objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "combinator-interactive" = callPackage @@ -46464,6 +49331,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "combinatorial" = callPackage + ({ mkDerivation, array, base, containers, QuickCheck, transformers + , utility-ht + }: + mkDerivation { + pname = "combinatorial"; + version = "0.1"; + sha256 = "1a5l4iixjhvqca8dvwkx3zvlaimp6ggr3fcm7vk7r77rv6n6svh9"; + revision = "1"; + editedCabalFile = "1bqcg04w48dqk4n1n36j9ykajrmwqdd4qpcjjjfhzvm83z5ypsh7"; + libraryHaskellDepends = [ + array base containers transformers utility-ht + ]; + testHaskellDepends = [ + array base containers QuickCheck transformers utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/combinatorial/"; + description = "Count, enumerate, rank and unrank combinatorial objects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "combinatorial-problems" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-lexing , containers, parsec, random @@ -46510,16 +49398,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "comfort-array" = callPackage + ({ mkDerivation, base, utility-ht }: + mkDerivation { + pname = "comfort-array"; + version = "0.0.1"; + sha256 = "1nbnnhmfbsiq31damx998sm7hz127mdqbnzzybz00962bmlmvp72"; + libraryHaskellDepends = [ base utility-ht ]; + homepage = "http://hub.darcs.net/thielema/comfort-array/"; + description = "Arrays where the index type is a function of the shape type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "comfort-graph" = callPackage - ({ mkDerivation, base, containers, QuickCheck, transformers - , utility-ht + ({ mkDerivation, base, containers, QuickCheck, semigroups + , transformers, utility-ht }: mkDerivation { pname = "comfort-graph"; - version = "0.0.2.1"; - sha256 = "02brkbrvs6q7nss3mpqcqwgz3nmim2xz30nvbkxqy7zdxci6kign"; + version = "0.0.3"; + sha256 = "11s3ag5skk07vs4h6xl20hbmlrbxqcwrj54wfpz2fk73347prmmr"; libraryHaskellDepends = [ - base containers QuickCheck transformers utility-ht + base containers QuickCheck semigroups transformers utility-ht ]; testHaskellDepends = [ base containers QuickCheck transformers utility-ht @@ -46539,6 +49439,7 @@ self: { homepage = "https://oss.xkcd.com/"; description = "A format for describing comics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comma" = callPackage @@ -46619,6 +49520,7 @@ self: { ]; description = "Library for working with commoditized amounts and price histories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "commsec" = callPackage @@ -46682,10 +49584,10 @@ self: { }: mkDerivation { pname = "comonad"; - version = "5.0.2"; - sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v"; - revision = "1"; - editedCabalFile = "1lnsnx8p3wlfhd1xfc68za3b00vq77z2m6b0vqiw2laqmpj9akcw"; + version = "5.0.3"; + sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57"; + revision = "2"; + editedCabalFile = "07gfz719y6q3bfv8jbvak78dda9g1qy4phl18cxisiapqdz31rry"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers contravariant distributive semigroups tagged @@ -46765,7 +49667,6 @@ self: { homepage = "https://github.com/ezyang/compact"; description = "Non-GC'd, contiguous storage for immutable data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compact-map" = callPackage @@ -46848,14 +49749,18 @@ self: { }) {}; "compactable" = callPackage - ({ mkDerivation, base, containers, transformers, vector }: + ({ mkDerivation, base, bifunctors, 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"; + version = "0.1.2.0"; + sha256 = "0kh36h1zfdlhvcz8xzf3c4af0rbypa7p421rl0xsig914r5z519j"; + libraryHaskellDepends = [ + base bifunctors containers transformers vector + ]; + description = "A typeclass for structures which can be catMaybed, filtered, and partitioned"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compactmap" = callPackage @@ -47040,8 +49945,8 @@ self: { pname = "complex-generic"; version = "0.1.1.1"; sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz"; - revision = "1"; - editedCabalFile = "0jf2mq26m0asgl5l0b1c1va30qj61ddvwxyl5xq29d3lpgnlby27"; + revision = "2"; + editedCabalFile = "160lw045p7j5vm4j2sqqfpnfgkxkil2kwjnmi7x6am03gfi9g9kw"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://code.mathr.co.uk/complex-generic"; description = "complex numbers with non-mandatory RealFloat"; @@ -47114,13 +50019,12 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "compose-ltr"; - version = "0.2.3"; - sha256 = "1br7jyp5c0riq9wdd638n1yvwp0s7s8nazqzj9g6kninyf3vnvgp"; + version = "0.2.4"; + sha256 = "1vgllk949s9sc2nhwbpjqx52m06563qcq8yd49kyaf2lq05n23hm"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "More intuitive, left-to-right function composition"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compose-trans" = callPackage @@ -47144,8 +50048,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.5.3.0"; - sha256 = "0pmgrdlrk4l7bmbfvsbvysa3n2h14ca919fl7cr1bg9yk2mb2s7s"; + version = "0.5.4.0"; + sha256 = "08rmv82v5ipkcb46pcadx1s8c1v532l8ma2qlgiflq6jnxf7y0zn"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -47161,6 +50065,7 @@ self: { 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 @@ -47169,14 +50074,15 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.5.3.0"; - sha256 = "07ps031qnkhd5yb7w0c9y69n22npa5y9rzxy934p6x32ni5v0mvz"; + version = "0.5.4.0"; + sha256 = "1x5vkxzj0afar4w2djx9s7h3vy9aa5my9wfks8n4ajlv92fch1zm"; 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 @@ -47186,8 +50092,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.5.3.0"; - sha256 = "0xz264i115nj2b6k74s1csi29lrszambbhy7ibz7nwqr2qs56yzw"; + version = "0.5.4.0"; + sha256 = "0brycxdwf4051qvad4b4ak47dl27qn3izv1bcqlpva01jvb6h21j"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base vinyl @@ -47202,15 +50108,14 @@ self: { }) {}; "composite-ekg" = callPackage - ({ mkDerivation, base, composite-base, ekg, ekg-core, lens, text - , vinyl + ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl }: mkDerivation { pname = "composite-ekg"; - version = "0.5.3.0"; - sha256 = "0fw6rsz7arndmp9d6xgvkx9vqqrv6kvhgchl0hqv4jfaxhwdv3gc"; + version = "0.5.4.0"; + sha256 = "051dw8ncpsk2k05ipvlnkwv2gy6719w69v1hhwrryy3dad0f4wc3"; libraryHaskellDepends = [ - base composite-base ekg ekg-core lens text vinyl + base composite-base ekg-core lens text vinyl ]; homepage = "https://github.com/ConferHealth/composite#readme"; description = "EKG Metrics for Vinyl/Frames records"; @@ -47224,8 +50129,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.5.3.0"; - sha256 = "09sjvs7bxca789pfrhgbsy2v08060mraciwl867byq3s8aq5c971"; + version = "0.5.4.0"; + sha256 = "1k71v4dz4vl70ignjp6hgw6j4c9hdgafd9x973dk7w332m2vjdpn"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -47238,6 +50143,29 @@ self: { homepage = "https://github.com/ConferHealth/composite#readme"; description = "Opaleye SQL for Frames records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "composite-swagger" = callPackage + ({ mkDerivation, base, composite-aeson, composite-base, hspec + , insert-ordered-containers, lens, QuickCheck, swagger2 + , template-haskell, text, vinyl + }: + mkDerivation { + pname = "composite-swagger"; + version = "0.5.4.0"; + sha256 = "0i2jfchl88mrk9kmf8yv7cbv006ghilqsnbic7ddsbkzrjy1vdw0"; + libraryHaskellDepends = [ + base composite-base insert-ordered-containers lens swagger2 + template-haskell text vinyl + ]; + testHaskellDepends = [ + base composite-aeson composite-base hspec insert-ordered-containers + lens QuickCheck swagger2 template-haskell text vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "Swagger for Vinyl/Frames records"; + license = stdenv.lib.licenses.bsd3; }) {}; "composition" = callPackage @@ -47262,12 +50190,13 @@ self: { }) {}; "composition-prelude" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, cpphs }: mkDerivation { pname = "composition-prelude"; - version = "0.1.1.0"; - sha256 = "12lx5cy1bh6girs1cf88pbazwadwhnadvg5b6b8v4kx2h3yqbsa1"; + version = "1.3.0.8"; + sha256 = "17ihwvkv7plwnwnk7ny81cj4xy2v776yk85gssgix92yc65p47b2"; libraryHaskellDepends = [ base ]; + libraryToolDepends = [ cpphs ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -47307,10 +50236,8 @@ self: { }: mkDerivation { pname = "compressed"; - version = "3.10"; - sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw"; - revision = "1"; - editedCabalFile = "1fv1ix8bsqbsrzp44i7nz0wp1dwi3l2wdvqvp46a8vbakp5nif8a"; + version = "3.11"; + sha256 = "0gfxmfyzgpa176igsby50jpfhpfvd078d7nyvwwg2cjx8hpvyyyp"; libraryHaskellDepends = [ base comonad containers fingertree hashable keys pointed reducers semigroupoids semigroups unordered-containers @@ -47318,7 +50245,6 @@ self: { homepage = "http://github.com/ekmett/compressed/"; description = "Compressed containers and reducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compression" = callPackage @@ -47373,41 +50299,41 @@ self: { ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base , constraints, containers, control-monad-loop, convertible , criterion, deepseq, dlist, entropy, equational-reasoning - , ghc-typelits-knownnat, hashable, heaps, hmatrix, hspec, HUnit - , hybrid-vectors, lazysmallcheck, lens, matrix, monad-loops - , MonadRandom, mono-traversable, monomorphic, mtl, parallel, primes - , process, QuickCheck, quickcheck-instances, random, reflection - , semigroups, singletons, sized, smallcheck, tagged - , template-haskell, test-framework, test-framework-hunit, text - , transformers, type-natural, unamb, unordered-containers, vector + , ghc-typelits-knownnat, ghc-typelits-natnormalise + , ghc-typelits-presburger, hashable, heaps, hmatrix, hspec, HUnit + , hybrid-vectors, integer-logarithms, lens, ListLike, matrix + , monad-loops, MonadRandom, mono-traversable, monomorphic, mtl + , parallel, primes, process, QuickCheck, quickcheck-instances + , random, reflection, semigroups, singletons, sized, smallcheck + , tagged, template-haskell, test-framework, test-framework-hunit + , text, transformers, type-natural, unamb, unordered-containers + , vector, vector-algorithms }: mkDerivation { pname = "computational-algebra"; - version = "0.5.0.0"; - sha256 = "0jfsgzjzg5ci2pr5rsdamz062yjykwkl85z9h81i5vzwgiak3rpw"; + version = "0.5.1.0"; + sha256 = "1ivhfw60gv1gxv6fl8z2n3a468dkvrwff8kg1brypaixzwp589gx"; + revision = "1"; + editedCabalFile = "1yhxqqrfqdr9dgzxz7rqk2kisg571dplhhyhd0490jbmd4z40ly6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebra algebraic-prelude arithmoi base constraints containers control-monad-loop convertible deepseq dlist entropy - equational-reasoning ghc-typelits-knownnat hashable heaps hmatrix - hybrid-vectors lens matrix monad-loops MonadRandom mono-traversable - monomorphic mtl parallel primes reflection semigroups singletons - sized tagged template-haskell text type-natural unamb - unordered-containers vector - ]; - executableHaskellDepends = [ - algebra algebraic-prelude base constraints convertible criterion - deepseq equational-reasoning hmatrix lens matrix MonadRandom - parallel random reflection semigroups singletons sized type-natural - vector + equational-reasoning ghc-typelits-knownnat + ghc-typelits-natnormalise ghc-typelits-presburger hashable heaps + hmatrix hybrid-vectors integer-logarithms lens ListLike matrix + monad-loops MonadRandom mono-traversable monomorphic mtl parallel + primes reflection semigroups singletons sized tagged + template-haskell text type-natural unamb unordered-containers + vector vector-algorithms ]; testHaskellDepends = [ algebra base constraints containers convertible deepseq - equational-reasoning hspec HUnit lazysmallcheck lens matrix - MonadRandom monomorphic process QuickCheck quickcheck-instances - reflection singletons sized smallcheck tagged test-framework - test-framework-hunit text transformers type-natural vector + equational-reasoning hspec HUnit lens matrix MonadRandom + monomorphic process QuickCheck quickcheck-instances reflection + singletons sized smallcheck tagged test-framework + test-framework-hunit text type-natural vector ]; benchmarkHaskellDepends = [ algebra base constraints containers criterion deepseq @@ -47416,7 +50342,7 @@ self: { reflection singletons sized smallcheck tagged test-framework test-framework-hunit transformers type-natural vector ]; - homepage = "https://github.com/konn/computational-algebra"; + homepage = "https://konn.github.com/computational-algebra"; description = "Well-kinded computational algebra library, currently supporting Groebner basis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -47482,14 +50408,14 @@ self: { }: mkDerivation { pname = "concise"; - version = "0.1.0.0"; - sha256 = "0ga10djxmc5n37cf5iazkwivfxipav0q2gb8mbkbg3wnn1qhqxmm"; + version = "0.1.0.1"; + sha256 = "09crgc6gjfidlad6263253xx1di6wfhc9awhira21s0z7rddy9sw"; libraryHaskellDepends = [ base bytestring lens text ]; testHaskellDepends = [ base bytestring lens QuickCheck quickcheck-instances tasty tasty-quickcheck text ]; - homepage = "https://github.com/frasertweedal/hs-concise"; + homepage = "https://github.com/frasertweedale/hs-concise"; description = "Utilities for Control.Lens.Cons"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -47577,36 +50503,43 @@ self: { }) {}; "concrete-haskell" = callPackage - ({ mkDerivation, base, binary, bytestring, bzlib - , concrete-haskell-autogen, containers, directory, filepath - , hashable, megaparsec, monad-extras, mtl, network + ({ mkDerivation, base, binary, bytestring, bzlib, bzlib-conduit + , concrete-haskell-autogen, conduit, conduit-combinators + , conduit-extra, containers, cryptohash-conduit, deepseq, directory + , filepath, hashable, lens, megaparsec, monad-extras, mtl, network , optparse-generic, path, path-io, process, QuickCheck, scientific - , stm, tar, text, thrift, time, unordered-containers, uuid, vector - , zip, zlib + , stm, tar, tar-conduit, text, thrift, time, unordered-containers + , uuid, vector, zip, zip-conduit, zlib }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.15"; - sha256 = "1g6nqr82gr5937irjs2h6ybp024k6gzpmpx1lsri8yw70kxgryjl"; + version = "0.1.0.16"; + sha256 = "1bjdbvsi7saqrlxybrzi35x47a08b01nlghvz9r6l04dkikjy2xc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bzlib concrete-haskell-autogen containers - directory filepath hashable megaparsec monad-extras mtl network - optparse-generic path path-io process QuickCheck scientific stm tar - text thrift time unordered-containers uuid vector zip zlib + base binary bytestring bzlib bzlib-conduit concrete-haskell-autogen + conduit conduit-combinators conduit-extra containers + cryptohash-conduit deepseq directory filepath hashable lens + megaparsec monad-extras mtl network optparse-generic path path-io + process QuickCheck scientific stm tar tar-conduit text thrift time + unordered-containers uuid vector zip zip-conduit zlib ]; executableHaskellDepends = [ - base binary bytestring bzlib concrete-haskell-autogen containers - directory filepath hashable megaparsec monad-extras mtl network - optparse-generic path path-io process QuickCheck scientific stm tar - text thrift time unordered-containers uuid vector zip zlib + base binary bytestring bzlib bzlib-conduit concrete-haskell-autogen + conduit conduit-combinators conduit-extra containers + cryptohash-conduit deepseq directory filepath hashable lens + megaparsec monad-extras mtl network optparse-generic path path-io + process QuickCheck scientific stm tar tar-conduit text thrift time + unordered-containers uuid vector zip zip-conduit zlib ]; testHaskellDepends = [ - base binary bytestring bzlib concrete-haskell-autogen containers - directory filepath hashable megaparsec monad-extras mtl network - optparse-generic path path-io process QuickCheck scientific stm tar - text thrift time unordered-containers uuid vector zip zlib + base binary bytestring bzlib bzlib-conduit concrete-haskell-autogen + conduit conduit-combinators conduit-extra containers + cryptohash-conduit deepseq directory filepath hashable lens + megaparsec monad-extras mtl network optparse-generic path path-io + process QuickCheck scientific stm tar tar-conduit text thrift time + unordered-containers uuid vector zip zip-conduit zlib ]; homepage = "https://github.com/hltcoe"; description = "Library for the Concrete data format"; @@ -47677,8 +50610,8 @@ self: { }: mkDerivation { pname = "concurrency"; - version = "1.1.2.1"; - sha256 = "0gadbm9z9qbm208md5f811hz9f2ljw0z9dyldpgklqvic1n8w5xi"; + version = "1.4.0.2"; + sha256 = "07wj25nlmry0hqxksdqrvpbg0b4r4fwzf66vfvbap9cxaqkrlxij"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -47688,14 +50621,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_2_2_0" = callPackage + "concurrency_1_5_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.2.2.0"; - sha256 = "1cnr7c3w09f24rmcgyhj24w2gz84i0dw6y2ncyv3c6jw7fg7vpvw"; + version = "1.5.0.0"; + sha256 = "0c07jkhsi9fy3ssjs19511dxsqq62yqbh9qd90r666wdhs0v86qh"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -47736,6 +50669,7 @@ self: { homepage = "https://github.com/nikita-volkov/concurrent-buffer"; description = "Concurrent expanding buffer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-dns-cache" = callPackage @@ -47745,8 +50679,8 @@ self: { }: mkDerivation { pname = "concurrent-dns-cache"; - version = "0.1.0"; - sha256 = "0bi3mlv2gi8adgh8zmh51idrnbsap15f2kybligccf9b6pcvpljr"; + version = "0.1.1"; + sha256 = "0q6mffxkdag9impmd69nfqvjhpmnb3wy88aqfnlb7q476g84yjkx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47760,6 +50694,7 @@ self: { testHaskellDepends = [ async base dns hspec ]; description = "Concurrent DNS cache"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-extra" = callPackage @@ -47768,8 +50703,8 @@ self: { }: mkDerivation { pname = "concurrent-extra"; - version = "0.7.0.11"; - sha256 = "0bvfgm26hyix074c36l7cqdq40xx8zzml6v50qdfly04g1bb05m5"; + version = "0.7.0.12"; + sha256 = "1y8xk460fvnw0idzdiylmm874sjny4q9jxb1js9fjz8lw2wns3h4"; libraryHaskellDepends = [ base stm unbounded-delays ]; testHaskellDepends = [ async base HUnit random stm test-framework test-framework-hunit @@ -47787,8 +50722,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.3.1"; - sha256 = "0n04gnnv323fk1h9mp8krqbl2v6ljjv1vzw5df38cxvj2xd64y94"; + version = "0.3.1.3"; + sha256 = "1p1zlqa1mywn3mxg94gcryhpnffq8jpirgnvxhff2b1bs4llfaik"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -47807,31 +50742,14 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.9.2"; - sha256 = "1wyrna3j4zg0qiyx8w5kfk6j3k33acrv2677g11f3njwvcx45hiv"; - 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; - }) {}; - - "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"; + version = "1.10.5"; + sha256 = "1hx51zihgr6awgx2widqv8y8hbi0baaq081m5kmr3mb4hqi9dh4q"; 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 @@ -47912,10 +50830,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "concurrent-utilities"; - version = "0.2.0.0"; - sha256 = "12limyhs55ccjxls1dw4cch9ffdn6nrvybaykcyis733w0qvh26i"; - revision = "1"; - editedCabalFile = "0sjgrya7v24lmcfhh2x72b6iyzklcsw0fbbsasb4dl31lf118w9b"; + version = "0.2.0.1"; + sha256 = "168prywiw4fhh2syzj452pyqj8byy4sb929mgkv5srgwkzqr6g0f"; libraryHaskellDepends = [ base ]; homepage = "-"; description = "More utilities and broad-used datastructures for concurrency"; @@ -47991,6 +50907,7 @@ self: { homepage = "http://www.renickbell.net/doku.php?id=conductive-base"; description = "a library for live coding and real-time musical applications"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conductive-clock" = callPackage @@ -48033,9 +50950,10 @@ self: { homepage = "http://www.renickbell.net/doku.php?id=conductive-song"; description = "a library of functions which are useful for composing music"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit" = callPackage + "conduit_1_2_13_1" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, exceptions , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl , mwc-random, primitive, QuickCheck, resourcet, safe, split @@ -48043,8 +50961,8 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.2.12.1"; - sha256 = "0zl6gflh7y36y2vypjhqx13nhkk5y3h12c1zj7kjfclrmwnvnwh0"; + version = "1.2.13.1"; + sha256 = "185kdjmbghpvhsvqxh9c9qsh8y987m1kgdagsbwy6c93nlqvbdkp"; libraryHaskellDepends = [ base exceptions lifted-base mmorph monad-control mtl primitive resourcet transformers transformers-base transformers-compat @@ -48060,30 +50978,64 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, gauge, hspec, kan-extensions + , mono-traversable, mtl, mwc-random, primitive, QuickCheck + , resourcet, safe, silently, split, text, transformers, unix + , unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "conduit"; + version = "1.3.0.2"; + sha256 = "0nqy9bffg2p2ij8isz99r7i5zm7sib0m9fqwisknakjh8b99kw60"; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath mono-traversable mtl + primitive resourcet text transformers unix unliftio-core vector + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hspec + mono-traversable mtl QuickCheck resourcet safe silently split text + transformers unliftio vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq gauge hspec kan-extensions mwc-random + transformers vector + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; }) {}; "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq - , directory, HUnit, mtl, resourcet, stm, stm-conduit - , test-framework, test-framework-hunit, test-framework-th - , transformers + , directory, exceptions, HUnit, lzma-conduit, monad-control, mtl + , resourcet, stm, stm-conduit, streaming-commons, test-framework + , test-framework-hunit, test-framework-th, transformers + , unliftio-core, vector }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.6.1"; - sha256 = "0zs7klxlkirch0j7gasxqalfw9nc4pfslgrg93jwn5vhpxdxhgwk"; + version = "0.0.8.0"; + sha256 = "0i8ikrh3fpwfqli8ksfayc20kml1wacl0rgv8pc00lgrsmd8r9i8"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq mtl resourcet stm stm-conduit - transformers + conduit-extra containers deepseq exceptions lzma-conduit + monad-control mtl resourcet stm stm-conduit streaming-commons + transformers unliftio-core vector ]; testHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory HUnit mtl resourcet stm - stm-conduit test-framework test-framework-hunit test-framework-th - transformers + conduit-extra containers deepseq directory exceptions HUnit + lzma-conduit monad-control mtl resourcet stm stm-conduit + streaming-commons test-framework test-framework-hunit + test-framework-th transformers unliftio-core vector ]; + homepage = "https://github.com/luispedro/conduit-algorithms#readme"; description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -48095,6 +51047,8 @@ self: { pname = "conduit-audio"; version = "0.2.0.3"; sha256 = "089k7l197xbxva0h281hr3p4v8pww1im7r111q7jrq7aqfgifrb1"; + revision = "1"; + editedCabalFile = "0ab8qxh5b60m4dyrdbaak8xj7kxlp3kzbs5fpg3fjxkpcqhnm1mx"; libraryHaskellDepends = [ base conduit vector ]; homepage = "http://github.com/mtolly/conduit-audio"; description = "Combinators to efficiently slice and dice audio streams"; @@ -48109,6 +51063,8 @@ self: { pname = "conduit-audio-lame"; version = "0.1.2.1"; sha256 = "1zyq0m5lblphp892ljvg6ix75rxa1ds5ksfk3cvj7kf074jw66za"; + revision = "1"; + editedCabalFile = "0b4d8n0lbsivpc0j17xl0vm6gp0sm7jjiysyxwh0m2xncx9l57nr"; libraryHaskellDepends = [ base bytestring conduit conduit-audio resourcet transformers vector ]; @@ -48128,6 +51084,8 @@ self: { pname = "conduit-audio-samplerate"; version = "0.1.0.3"; sha256 = "07hbqf7is7010ibp2k5fh4lx3s22vp6c4ihsid05ismk0sdpdypi"; + revision = "1"; + editedCabalFile = "03546czh1jn04kc7df3lrbpjf5pnssh555chjij8b6h25qrx8jrw"; libraryHaskellDepends = [ base conduit conduit-audio resourcet transformers vector ]; @@ -48147,6 +51105,8 @@ self: { pname = "conduit-audio-sndfile"; version = "0.1.2.1"; sha256 = "0b326pdvqpiawqnjkmwfgf5ghvg9jn1afini0ihw8cpc7znx846z"; + revision = "1"; + editedCabalFile = "1v0zcagmgr80wfqs328pd7m7z54q834yw0vn218jl6ld5fv581mg"; libraryHaskellDepends = [ base conduit conduit-audio hsndfile hsndfile-vector resourcet transformers @@ -48157,30 +51117,15 @@ self: { }) {}; "conduit-combinators" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, filepath, hspec, monad-control, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , text, transformers, transformers-base, unix, unix-compat, vector - , void - }: + ({ mkDerivation, base }: mkDerivation { pname = "conduit-combinators"; - version = "1.1.1"; - sha256 = "0609miq03lq9visfb2dqqsxghmvgzm24pq39mqby1jnnah6yh8m0"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra filepath monad-control mono-traversable - mwc-random primitive resourcet text transformers transformers-base - unix unix-compat vector void - ]; - testHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory filepath hspec mono-traversable mtl - mwc-random QuickCheck safe silently text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Commonly used conduit functions, for both chunked and unchunked data"; + version = "1.3.0"; + sha256 = "1lz70vwp4y4lpsivxl0cshq7aq3968rh48r6rjvpyaj2l0bdj5wp"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; + description = "DEPRECATED Functionality merged into the conduit package itself"; license = stdenv.lib.licenses.mit; }) {}; @@ -48191,8 +51136,8 @@ self: { }: mkDerivation { pname = "conduit-connection"; - version = "0.1.0.3"; - sha256 = "16j3h318i7s3nr9cz6n1v27d7nkmz5s6dp4fbahziy1pgb4bk3kr"; + version = "0.1.0.4"; + sha256 = "1z11r3rf6hmz5b00w4xymp6x0s00acyvbyw6n99wd3b9ycbl2y2y"; libraryHaskellDepends = [ base bytestring conduit connection resourcet transformers ]; @@ -48205,21 +51150,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "conduit-extra" = callPackage + "conduit-extra_1_2_3_2" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, criterion, directory, exceptions , filepath, hspec, monad-control, network, primitive, process , QuickCheck, resourcet, stm, streaming-commons, text, transformers - , transformers-base + , transformers-base, typed-process, unliftio-core }: mkDerivation { pname = "conduit-extra"; - version = "1.1.17"; - sha256 = "01haq94kf4jsqrhs6j2kkvxrw4iqhvhnd9rcrqpkdbp1dil493kn"; + version = "1.2.3.2"; + sha256 = "1xihl8zrd6jyfnlmsrqshwwqc8176whs5im4jvxvk9038wl6cnqx"; + revision = "1"; + editedCabalFile = "10smqv7xrjj5vhpdfj9ha89dm8nw04cv09avg58c6y8yybbz5i01"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process resourcet stm streaming-commons text transformers transformers-base + typed-process unliftio-core ]; testHaskellDepends = [ async attoparsec base blaze-builder bytestring bytestring-builder @@ -48233,37 +51181,36 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit-extra_1_2_0" = callPackage - ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring - , bytestring-builder, conduit, criterion, directory, exceptions - , filepath, hspec, monad-control, network, primitive, process - , QuickCheck, resourcet, stm, streaming-commons, text, transformers - , transformers-base + "conduit-extra" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring + , bytestring-builder, conduit, directory, exceptions, filepath + , gauge, hspec, network, primitive, process, QuickCheck, resourcet + , stm, streaming-commons, text, transformers, transformers-base + , typed-process, unliftio-core }: mkDerivation { pname = "conduit-extra"; - version = "1.2.0"; - sha256 = "0f13r6ypch3px7qfh6a2qj2y5yhdzwy53v0f6bxyc9xl0hxf49yq"; + version = "1.3.0"; + sha256 = "1bi2b6kdzy5f9glq46jzsk02has95jkxqz0cchpbmnakzhjwjh9c"; libraryHaskellDepends = [ - async attoparsec base blaze-builder bytestring conduit directory - exceptions filepath monad-control network primitive process - resourcet stm streaming-commons text transformers transformers-base + async attoparsec base bytestring conduit directory filepath network + primitive process resourcet stm streaming-commons text transformers + typed-process unliftio-core ]; testHaskellDepends = [ - async attoparsec base blaze-builder bytestring bytestring-builder - conduit directory exceptions hspec process QuickCheck resourcet stm + async attoparsec base bytestring bytestring-builder conduit + directory exceptions hspec process QuickCheck resourcet stm streaming-commons text transformers transformers-base ]; benchmarkHaskellDepends = [ - base blaze-builder bytestring bytestring-builder conduit criterion - transformers + base bytestring bytestring-builder conduit gauge transformers ]; homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-find" = callPackage @@ -48308,8 +51255,8 @@ self: { }: mkDerivation { pname = "conduit-iconv"; - version = "0.1.1.2"; - sha256 = "02s5jyr6mii45q4nar5fzqr4hsf7b6rw9fyc6g1jrqjr76xk6vsw"; + version = "0.1.1.3"; + sha256 = "1dmcsdx0nz0b9sans2fr8lmrii2n0fsjh41jhwlrlng4h93k0w8w"; libraryHaskellDepends = [ base bytestring conduit ]; testHaskellDepends = [ base bytestring conduit mtl QuickCheck test-framework @@ -48333,6 +51280,7 @@ self: { homepage = "https://github.com/cblp/conduit-merge#readme"; description = "Merge multiple sorted conduits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-network-stream" = callPackage @@ -48352,26 +51300,24 @@ self: { }) {}; "conduit-parse" = callPackage - ({ mkDerivation, base, conduit, conduit-combinators, dlist, hlint - , mtl, parsers, resourcet, safe, safe-exceptions, tasty - , tasty-hunit, text, transformers + ({ mkDerivation, base, conduit, dlist, mtl, parsers, resourcet + , safe, safe-exceptions, tasty, tasty-hunit, text, transformers }: mkDerivation { pname = "conduit-parse"; - version = "0.1.2.1"; - sha256 = "0yc3mkg3fic5bpjsffghidk51sx5dhzvyc1h94ppic9mym985fwd"; + version = "0.2.1.0"; + sha256 = "1qfs61qhbr5gc0ch0mmqcqdm4wvs5pkx2z6rki588fhy1kfdp1dm"; libraryHaskellDepends = [ - base conduit conduit-combinators dlist mtl parsers safe - safe-exceptions text transformers + base conduit dlist mtl parsers safe safe-exceptions text + transformers ]; testHaskellDepends = [ - base conduit hlint mtl parsers resourcet safe-exceptions tasty + base conduit mtl parsers resourcet safe-exceptions tasty tasty-hunit ]; homepage = "https://github.com/k0ral/conduit-parse"; description = "Parsing framework based on conduit"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-resumablesink" = callPackage @@ -48400,8 +51346,8 @@ self: { }: mkDerivation { pname = "conduit-throttle"; - version = "0.3.0.0"; - sha256 = "1kwrryplhck8q6hn6lx6j741d9hllzf84ykmqwiq0h34fjdd0a4r"; + version = "0.3.1.0"; + sha256 = "0ad3balm1r5jm4jvf26pr1kaiqnzvjznjh5kidk2bknxylbddmld"; libraryHaskellDepends = [ async base conduit conduit-combinators conduit-extra monad-control resourcet stm stm-chans throttle-io-stream unliftio unliftio-core @@ -48414,6 +51360,7 @@ self: { homepage = "https://github.com/mtesseract/conduit-throttle#readme"; description = "Throttle Conduit Producers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-tokenize-attoparsec" = callPackage @@ -48434,6 +51381,27 @@ self: { homepage = "http://github.com/haskell-works/conduit-tokenize-attoparsec#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit-zstd" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , conduit-extra, directory, HUnit, test-framework + , test-framework-hunit, test-framework-th, zstd + }: + mkDerivation { + pname = "conduit-zstd"; + version = "0.0.1.0"; + sha256 = "0psy03s9w9gw5s4a2grvfk9xwjd3g63qch7w4i2kvl3cf9yddsa0"; + libraryHaskellDepends = [ base bytestring conduit zstd ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators conduit-extra directory + HUnit test-framework test-framework-hunit test-framework-th zstd + ]; + homepage = "https://github.com/luispedro/conduit-zstd#readme"; + description = "Conduit-based ZStd Compression"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conf" = callPackage @@ -48491,26 +51459,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "confide" = callPackage + ({ mkDerivation, base, deiko-config, exceptions, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "confide"; + version = "0.1.0.3"; + sha256 = "0agq5naldbs1lwpw9nf5jldzrqh6pbc1n5vn5cb3kk7rj7j1a8ik"; + libraryHaskellDepends = [ base deiko-config exceptions text ]; + testHaskellDepends = [ base deiko-config tasty tasty-hunit text ]; + homepage = "https://github.com/amilkov3/confide"; + description = "derive typeclass instances for decoding types from HOCON conf"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "config-ini" = callPackage - ({ mkDerivation, base, containers, directory, doctest, hedgehog - , ini, megaparsec, microlens, text, transformers - , unordered-containers + ({ mkDerivation, base, containers, directory, hedgehog, ini + , megaparsec, text, transformers, unordered-containers }: mkDerivation { pname = "config-ini"; - version = "0.2.0.0"; - sha256 = "1sp62zw4ibgczcv927m7irrpyp4pgm67wdkf7z815699nqjad284"; + version = "0.2.2.0"; + sha256 = "1820w4y8k0qrlilrizkqckwiyli0x4qcdjmagvcngy5bfsw6fk9n"; libraryHaskellDepends = [ base containers megaparsec text transformers unordered-containers ]; testHaskellDepends = [ - base containers directory doctest hedgehog ini microlens text - unordered-containers + base containers directory hedgehog ini text unordered-containers ]; homepage = "https://github.com/aisamanra/config-ini"; description = "A library for simple INI-based configuration files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "config-manager" = callPackage @@ -48536,16 +51517,17 @@ self: { }) {}; "config-parser" = callPackage - ({ mkDerivation, base, hspec, lens, parsec, text }: + ({ mkDerivation, base, extra, hspec, lens, parsec, text }: mkDerivation { pname = "config-parser"; - version = "0.2.0.0"; - sha256 = "0mpqk41inrb7p16bwhxcffvpl7v5ix1qim28bp4j1s00bjyn9n4i"; - libraryHaskellDepends = [ base parsec ]; - testHaskellDepends = [ base hspec lens parsec text ]; + version = "1.2.0.0"; + sha256 = "1jmb8c2ksxp9gfryymg100hjfn5kfshi95a1533d6h18ypqd5zb3"; + libraryHaskellDepends = [ base parsec text ]; + testHaskellDepends = [ base extra hspec lens parsec text ]; homepage = "https://github.com/protoben/config-parser"; description = "Parse config files using parsec and generate parse errors on unhandled keys"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "config-schema" = callPackage @@ -48554,8 +51536,8 @@ self: { }: mkDerivation { pname = "config-schema"; - version = "0.5.0.0"; - sha256 = "108gjzafzc5hv1vilnxagf65bh2xia2rfwxcjw6axzzhw5lszgli"; + version = "0.5.0.1"; + sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -48586,8 +51568,8 @@ self: { ({ mkDerivation, alex, array, base, happy, pretty, text }: mkDerivation { pname = "config-value"; - version = "0.6.3"; - sha256 = "0c7ghasn06m4mlhk3lg5pxpssbsr4l88ibi6vzvp8ylbqha0b3gn"; + version = "0.6.3.1"; + sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z"; libraryHaskellDepends = [ array base pretty text ]; libraryToolDepends = [ alex happy ]; homepage = "https://github.com/glguy/config-value"; @@ -48611,7 +51593,7 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, containers, directory, either, functor-infix , hspec, hspec-discover, mtl, pretty-show, QuickCheck, safe - , scientific, string-conversions, template-haskell, text + , scientific, string-conversions, template-haskell , unordered-containers, vector, yaml }: mkDerivation { @@ -48625,9 +51607,6 @@ self: { functor-infix mtl safe string-conversions template-haskell unordered-containers vector yaml ]; - executableHaskellDepends = [ - base bytestring mtl pretty-show string-conversions text yaml - ]; testHaskellDepends = [ aeson aeson-pretty base case-insensitive hspec hspec-discover mtl pretty-show QuickCheck scientific string-conversions @@ -48655,55 +51634,22 @@ self: { , case-insensitive, connection, data-default, deepseq, directory , dlist, enclosed-exceptions, filepath, http-client , http-client-tls, http-types, monad-control, mtl, network-uri - , optparse-applicative, process, profunctors, text, tls - , transformers, unordered-containers, wai, warp, warp-tls, x509 - , x509-system, x509-validation, yaml - }: - mkDerivation { - pname = "configuration-tools"; - version = "0.2.15"; - sha256 = "07hjfqsyj49piplf5xm5szbhy34bm47mxcmjriwaxn5djflafcc2"; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base-unicode-symbols - base64-bytestring bytestring Cabal case-insensitive connection - data-default deepseq directory dlist enclosed-exceptions filepath - http-client http-client-tls http-types monad-control mtl - network-uri optparse-applicative process profunctors text tls - transformers unordered-containers x509 x509-system x509-validation - yaml - ]; - testHaskellDepends = [ - base base-unicode-symbols bytestring Cabal enclosed-exceptions - http-types monad-control mtl text transformers unordered-containers - wai warp warp-tls yaml - ]; - homepage = "https://github.com/alephcloud/hs-configuration-tools"; - description = "Tools for specifying and parsing configurations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "configuration-tools_0_3_0" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base-unicode-symbols, base64-bytestring, bytestring, Cabal - , case-insensitive, connection, data-default, deepseq, directory - , dlist, enclosed-exceptions, filepath, http-client - , http-client-tls, http-types, monad-control, mtl, network-uri - , optparse-applicative, process, profunctors, text, tls + , optparse-applicative, process, profunctors, semigroups, text, tls , transformers, unordered-containers, wai, warp, warp-tls, x509 , x509-system, x509-validation, yaml }: mkDerivation { pname = "configuration-tools"; - version = "0.3.0"; - sha256 = "0kpjmnmc7vzdarqczk4z1hxizm9fsnbvhazb6xg4y1a7j8ps99wz"; + version = "0.3.1"; + sha256 = "0ivfz3vjf81dnxqlzp4ij8snw0bfy227b26r3j1vvhc4n1qpxpz0"; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base-unicode-symbols base64-bytestring bytestring Cabal case-insensitive connection data-default deepseq directory dlist enclosed-exceptions filepath http-client http-client-tls http-types monad-control mtl - network-uri optparse-applicative process profunctors text tls - transformers unordered-containers x509 x509-system x509-validation - yaml + network-uri optparse-applicative process profunctors semigroups + text tls transformers unordered-containers x509 x509-system + x509-validation yaml ]; testHaskellDepends = [ base base-unicode-symbols bytestring Cabal enclosed-exceptions @@ -48713,7 +51659,6 @@ self: { homepage = "https://github.com/alephcloud/hs-configuration-tools"; description = "Tools for specifying and parsing configurations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "configurator" = callPackage @@ -48779,6 +51724,7 @@ self: { homepage = "http://github.com/lpsmith/configurator-ng"; description = "The next generation of configuration management"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "confsolve" = callPackage @@ -48903,8 +51849,8 @@ self: { }: mkDerivation { pname = "connection-pool"; - version = "0.2.1"; - sha256 = "1p44p266zrcy59m74kp1hvxry0db4zjs8w408w0fpnyhnnkwar13"; + version = "0.2.2"; + sha256 = "0lvkcsd042s936fj5c9y5gg4iiq09n42adkv8q2rnwcbd6vl7kzj"; libraryHaskellDepends = [ base between data-default-class monad-control network resource-pool streaming-commons time transformers-base @@ -48914,6 +51860,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "connection-string" = callPackage + ({ mkDerivation, base, containers, doctest, megaparsec + , parser-combinators, text + }: + mkDerivation { + pname = "connection-string"; + version = "0.1.0.0"; + sha256 = "0hkszhms7n6vp9w8agik0qndz2a3f8l56yxidw9l9mjn3sx769g2"; + revision = "1"; + editedCabalFile = "0zirgds0ha3245cagx3fhssz58bpyzci7zv4mw9rfnc1k48v69b2"; + libraryHaskellDepends = [ + base containers megaparsec parser-combinators + ]; + testHaskellDepends = [ base doctest text ]; + homepage = "https://github.com/Porges/connection-string-hs"; + description = "A library for parsing connection strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "consistent" = callPackage ({ mkDerivation, base, lifted-async, lifted-base, monad-control , stm, transformers, transformers-base, unordered-containers @@ -48939,8 +51904,8 @@ self: { }: mkDerivation { pname = "console-program"; - version = "0.4.2.1"; - sha256 = "1havd30r0yni6vym7zfkryvyhqp1r0q8ijypr31jdk5dsn8zb2py"; + version = "0.4.2.2"; + sha256 = "1zr6c9wdlx16v559zzjah84v0psphyzyq5d837ncshkxmssri8ja"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers directory haskeline parsec parsec-extra split transformers unix utility-ht @@ -48988,12 +51953,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "constaparser" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, vector }: + mkDerivation { + pname = "constaparser"; + version = "0.1.0.0"; + sha256 = "02psvhz05j61b50sqrwhmfsf9cmvgrjd9k3yn2d57139k7qdwr3d"; + libraryHaskellDepends = [ attoparsec base bytestring vector ]; + homepage = "https://github.com/chessai/constaparser"; + description = "Parse ByteStrings of a constant length"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "constrained-categories" = callPackage ({ mkDerivation, base, tagged, void }: mkDerivation { pname = "constrained-categories"; - version = "0.3.0.1"; - sha256 = "0zga3841195dv0aw9x91ww9fl8y61chxicg3i4g6797dy0cv2752"; + version = "0.3.1.0"; + sha256 = "0xxmbvzxa2phwn25haxbr6gv0cnh92c1i2l5anhckqizx29gl668"; libraryHaskellDepends = [ base tagged void ]; homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; @@ -49010,6 +51987,7 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Dynamic typing with retained constraints"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constrained-monads" = callPackage @@ -49043,12 +52021,25 @@ self: { pname = "constrained-normal"; version = "1.0.2"; sha256 = "1mq0w2qndrjx9ap9dkyxvz91fbszsnwlhh4hnm9g2dx020fawgac"; + revision = "1"; + editedCabalFile = "0vlmsqgx7cpl65ibmx23hdqdyplgvbn144j9plkmrcs5aam1jsdj"; libraryHaskellDepends = [ base ]; homepage = "http://dx.doi.org/10.1145/2500365.2500602"; description = "Normalised Deep Embeddings for Constrained Type-Class Instances"; license = stdenv.lib.licenses.bsd3; }) {}; + "constraint" = callPackage + ({ mkDerivation, base, category }: + mkDerivation { + pname = "constraint"; + version = "0.1.1.1"; + sha256 = "0iyz3n8qplp892cw2k2z5pp4pv54p5qaqrcjgpiwfm9jkri0v012"; + libraryHaskellDepends = [ base category ]; + description = "Reified constraints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "constraint-classes" = callPackage ({ mkDerivation, base, constraints, transformers }: mkDerivation { @@ -49070,25 +52061,58 @@ self: { libraryHaskellDepends = [ base indextype ]; description = "Some conviencience type functions for manipulating constraints"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constraints" = callPackage - ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl - , transformers, transformers-compat + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, semigroups, transformers + , transformers-compat }: mkDerivation { pname = "constraints"; - version = "0.9.1"; - sha256 = "11d76051i2a335bvack04dqvsz4zhgcms1jxlvy4a4c670l02vi7"; + version = "0.10"; + sha256 = "1ii6j62xihxwb85akvy8cdd73g9qr7rd5zl37h4925y2acpbh962"; libraryHaskellDepends = [ - base binary deepseq ghc-prim hashable mtl transformers + base binary deepseq ghc-prim hashable mtl semigroups transformers transformers-compat ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/ekmett/constraints/"; description = "Constraint manipulation"; license = stdenv.lib.licenses.bsd2; }) {}; + "constraints-emerge" = callPackage + ({ mkDerivation, base, constraints, containers, ghc, hashable + , hspec, transformers + }: + mkDerivation { + pname = "constraints-emerge"; + version = "0.1.2"; + sha256 = "1l3n5k8q2jfhsiqbzzbpy798zvcv2dvwsvd165c38b2yvxn6zird"; + libraryHaskellDepends = [ + base constraints containers ghc hashable + ]; + testHaskellDepends = [ base constraints hspec transformers ]; + homepage = "https://github.com/isovector/constraints-emerge"; + description = "Defer instance lookups until runtime"; + license = stdenv.lib.licenses.mit; + }) {}; + + "constrictor" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "constrictor"; + version = "0.1.1.0"; + sha256 = "0vid1m5lsmpdx9bpc78ad3nk720z62chd0j9rx03laiz2fjzx2bh"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/chessai/constrictor.git"; + description = "strict versions of many things in base"; + license = stdenv.lib.licenses.mit; + }) {}; + "constructible" = callPackage ({ mkDerivation, arithmoi, base, binary-search, complex-generic }: mkDerivation { @@ -49150,8 +52174,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.1.0.0"; - sha256 = "19pi32g1kpjasapg7bkrn3rxhzwl4ml1ndg5is3pjckm72awkf5y"; + version = "2.1.1.0"; + sha256 = "0p52j96kcgrdiccx48j24jdfsfhwi3n3x2rq75n660qrqiab2gf2"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -49225,15 +52249,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_5_10_2" = callPackage + "containers_0_5_11_0" = 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.2"; - sha256 = "08wc6asnyjdvabqyp15lsbccqwbjy77zjdhwrbg2q9xyj3rgwkm0"; + version = "0.5.11.0"; + sha256 = "0j29w09kvcn1c0yi4clmrdbgs2gqmpxs2m7q80ib2ix1smm25kaq"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -49290,26 +52314,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "containers-verified" = callPackage + ({ mkDerivation, containers }: + mkDerivation { + pname = "containers-verified"; + version = "0.5.11.0"; + sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07"; + revision = "3"; + editedCabalFile = "092g7yj27pxpap1qh4spp2yvb1y22jaca9s4x36rnkafvqn0yyl3"; + libraryHaskellDepends = [ containers ]; + homepage = "https://github.com/nomeata/containers-verified"; + description = "Formally verified drop-in replacement of containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "content-store" = callPackage ({ mkDerivation, aeson, base, bytestring, cond, conduit , conduit-combinators, conduit-extra, cryptonite, directory - , filepath, hspec, htoml, memory, monad-control, mtl, resourcet - , temporary, text, transformers, transformers-base, unix + , filepath, hspec, htoml, lzma-conduit, memory, monad-control, mtl + , resourcet, temporary, text, transformers, transformers-base, unix }: mkDerivation { pname = "content-store"; - version = "0.1.1"; - sha256 = "1rzapw039a2k4g5s0vlw4mm6hrq35xzj6iksp0qpq87150bzy6pp"; + version = "0.2.1"; + sha256 = "1c3l2fmznx3f1853scnpf6c60bbm1z99lkpxx36ldxrxizj2lmaj"; libraryHaskellDepends = [ aeson base bytestring cond conduit conduit-combinators - conduit-extra cryptonite directory filepath htoml memory - monad-control mtl resourcet temporary text transformers + conduit-extra cryptonite directory filepath htoml lzma-conduit + memory monad-control mtl resourcet temporary text transformers transformers-base unix ]; - testHaskellDepends = [ base bytestring hspec memory ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + hspec memory mtl resourcet temporary + ]; homepage = "https://github.com/weldr/content-store"; description = "Store and retrieve data from an on-disk store"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "context-free-grammar" = callPackage @@ -49372,12 +52415,11 @@ self: { ({ mkDerivation, base, criterion, hspec, recursion-schemes }: mkDerivation { pname = "continued-fraction"; - version = "0.1.0.0"; - sha256 = "1vip1ask3zyhy9n0vacx5ipww2m2wxkdhnp2j20c0i2g1jrpspx7"; + version = "0.1.0.8"; + sha256 = "1izjdvm65zj960dcgg8xamg6ysfhn04qjxb9q7mpgzg8yi6f326c"; libraryHaskellDepends = [ base recursion-schemes ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/vmchale/continued-fractions#readme"; description = "Types and functions for working with continued fractions in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -49395,10 +52437,8 @@ self: { }) {}; "continuum" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, data-default - , foldl, hyperleveldb, leveldb-haskell-fork, mtl, nanomsg-haskell - , parallel-io, resourcet, stm, suspend, time, timers, transformers - , transformers-base + ({ mkDerivation, base, bytestring, cereal, containers, mtl + , nanomsg-haskell, time }: mkDerivation { pname = "continuum"; @@ -49409,15 +52449,9 @@ self: { libraryHaskellDepends = [ base bytestring cereal containers mtl nanomsg-haskell time ]; - executableHaskellDepends = [ - base bytestring cereal containers data-default foldl - leveldb-haskell-fork mtl nanomsg-haskell parallel-io resourcet stm - suspend time timers transformers transformers-base - ]; - executableSystemDepends = [ hyperleveldb ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {hyperleveldb = null;}; + }) {}; "continuum-client" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, mtl @@ -49435,15 +52469,14 @@ self: { }) {}; "contravariant" = callPackage - ({ mkDerivation, base, semigroups, StateVar, transformers - , transformers-compat, void + ({ mkDerivation, base, StateVar, transformers, transformers-compat }: mkDerivation { pname = "contravariant"; - version = "1.4"; - sha256 = "117fff8kkrvlmr8cb2jpj71z7lf2pdiyks6ilyx89mry6zqnsrp1"; + version = "1.4.1"; + sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9"; libraryHaskellDepends = [ - base semigroups StateVar transformers transformers-compat void + base StateVar transformers transformers-compat ]; homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; @@ -49451,15 +52484,16 @@ self: { }) {}; "contravariant-extras" = callPackage - ({ mkDerivation, base-prelude, contravariant, template-haskell - , tuple-th + ({ mkDerivation, base, base-prelude, contravariant, semigroups + , template-haskell, tuple-th }: mkDerivation { pname = "contravariant-extras"; - version = "0.3.3.1"; - sha256 = "1mbrgjybdx8fjdck4ldwi8955w4qnmm0ql56zix7dyn0s7s9spgk"; + version = "0.3.4"; + sha256 = "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n"; libraryHaskellDepends = [ - base-prelude contravariant template-haskell tuple-th + base base-prelude contravariant semigroups template-haskell + tuple-th ]; homepage = "https://github.com/nikita-volkov/contravariant-extras"; description = "Extras for the \"contravariant\" package"; @@ -49482,8 +52516,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "control-dotdotdot"; - version = "0.1.0.0"; - sha256 = "0wacfs0s0dy2vzj8yxm3zqsjc93fm8m4iiw5x92wpiz2z2lm3k8d"; + version = "0.1.0.1"; + sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/erisco/control-dotdotdot"; description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`."; @@ -49502,6 +52536,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "control-iso" = callPackage + ({ mkDerivation, base, bytestring, newtype-generics, profunctors + , text + }: + mkDerivation { + pname = "control-iso"; + version = "0.1.0.0"; + sha256 = "1z4z3plxs06w485injj2azk8bl42wy0i6c65c4j7fzkkyk7pqbfj"; + libraryHaskellDepends = [ + base bytestring newtype-generics profunctors text + ]; + description = "A typeclass for type isomorphisms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "control-monad-attempt" = callPackage ({ mkDerivation, attempt, base, transformers }: mkDerivation { @@ -49780,18 +52829,18 @@ self: { }) {}; "convert" = callPackage - ({ mkDerivation, base, bytestring, containers, either, lens, mtl - , old-locale, old-time, template-haskell, text, time + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , data-default, lens, template-haskell, text, utf8-string }: mkDerivation { pname = "convert"; - version = "1.0.2"; - sha256 = "0vwy2j2b0jw435mxmi95q61zmldjqlahhlbf4x9x28qm6kmh519q"; + version = "1.4.2"; + sha256 = "0lmbshg6nx0ifnc6qmhvacr5lr5nlay3sjkjg2n5624qm7aiq806"; libraryHaskellDepends = [ - base bytestring containers either lens mtl old-locale old-time - template-haskell text time + ansi-wl-pprint base bytestring containers data-default lens + template-haskell text utf8-string ]; - homepage = "https://github.com/wdanilo/convert"; + homepage = "https://github.com/luna/convert"; description = "Safe and unsafe data conversion utilities with strong type-level operation. checking."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -49804,8 +52853,8 @@ self: { }: mkDerivation { pname = "convert-annotation"; - version = "0.5.0.1"; - sha256 = "198zkisa1j01wi23z168wkw9xk2xm7z45akj2yxjiz82iy6yp8hi"; + version = "0.5.1.0"; + sha256 = "1m6b5b7drgxb6cc4qqhi9s5k93rpsny7yf83a9m5q0a585nwmk0q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49890,21 +52939,20 @@ self: { }) {}; "cookie" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring - , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck, text, time + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + , time }: mkDerivation { pname = "cookie"; - version = "0.4.3"; - sha256 = "0qpdydhb9gw590ffabqg70x7xvjpg8l74idqnrfbhv5yrr7hryzv"; + version = "0.4.4"; + sha256 = "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j"; libraryHaskellDepends = [ - base blaze-builder bytestring data-default-class deepseq old-locale - text time + base bytestring data-default-class deepseq text time ]; testHaskellDepends = [ - base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit - tasty-quickcheck text time + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + text time ]; homepage = "http://github.com/snoyberg/cookie"; description = "HTTP cookie parsing and rendering"; @@ -49912,20 +52960,17 @@ self: { }) {}; "coordinate" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , QuickCheck, template-haskell, transformers - }: + ({ mkDerivation, base, HUnit, lens, papa, transformers }: mkDerivation { pname = "coordinate"; - version = "0.1.2"; - sha256 = "0lphvgjs9nkrp37hirhi88d285rqbgk7qjz23rbl94v6qrk3x8nv"; - libraryHaskellDepends = [ base lens transformers ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; - homepage = "https://github.com/NICTA/coordinate"; + version = "0.2"; + sha256 = "1sph59d8008amhb4pi4gk8ymwjf2r6iy378phriqb42zy01bn0vb"; + libraryHaskellDepends = [ base lens papa transformers ]; + testHaskellDepends = [ base HUnit lens ]; + homepage = "https://github.com/qfpl/coordinate"; description = "A representation of latitude and longitude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot" = callPackage @@ -50172,6 +53217,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "corenlp-parser" = callPackage + ({ mkDerivation, aeson, async, base, cryptonite, data-default + , directory, process, raw-strings-qq, rocksdb, rocksdb-haskell + , safe-exceptions, split, store, string-class, temporary, text + , unordered-containers + }: + mkDerivation { + pname = "corenlp-parser"; + version = "0.4.0.0"; + sha256 = "0li43xmig52npq9dc1nm5sv876nw7n1g4r3djy5saw3h38sz1zdz"; + libraryHaskellDepends = [ + aeson async base cryptonite data-default directory process + raw-strings-qq rocksdb-haskell safe-exceptions split store + string-class temporary text unordered-containers + ]; + librarySystemDepends = [ rocksdb ]; + homepage = "https://github.com/k-bx/corenlp-parser#readme"; + description = "Launches CoreNLP and parses the JSON output"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) rocksdb;}; + "coroutine-enumerator" = callPackage ({ mkDerivation, base, enumerator, monad-coroutine }: mkDerivation { @@ -50207,6 +53274,7 @@ self: { libraryHaskellDepends = [ base either free mtl transformers ]; description = "Object-oriented programming realization using coroutine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "couch-hs" = callPackage @@ -50359,6 +53427,7 @@ self: { homepage = "https://github.com/tippenein/countable-inflections"; description = "Countable Text Inflections"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "counter" = callPackage @@ -50371,7 +53440,6 @@ self: { homepage = "https://github.com/wei2912/counter"; description = "An object frequency counter"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "country" = callPackage @@ -50380,8 +53448,8 @@ self: { }: mkDerivation { pname = "country"; - version = "0.1.4"; - sha256 = "027i4ncnsyii41wfndn369xmlbkp4vvcrx7m7cdb07n4wlcpz0bl"; + version = "0.1.5"; + sha256 = "0shp4kq8bibfwrjldz8akghgm3n2lq00dybxnq4grmbl5phj3a9s"; libraryHaskellDepends = [ aeson attoparsec base bytestring ghc-prim hashable primitive scientific text unordered-containers @@ -50393,9 +53461,7 @@ self: { }) {}; "country-codes" = callPackage - ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup - , text - }: + ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, text }: mkDerivation { pname = "country-codes"; version = "0.1.3"; @@ -50403,7 +53469,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base shakespeare text ]; - executableHaskellDepends = [ base tagsoup text ]; testHaskellDepends = [ aeson base HTF HUnit ]; homepage = "https://github.com/prowdsponsor/country-codes"; description = "ISO 3166 country codes and i18n names"; @@ -50433,7 +53498,6 @@ self: { homepage = "http://github.com/hargettp/courier"; description = "A message-passing library for simplifying network applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "court" = callPackage @@ -50471,6 +53535,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cparsing" = callPackage + ({ mkDerivation, base, containers, directory, either, filepath + , HUnit, lens, mtl, parsec, split, template-haskell, transformers + }: + mkDerivation { + pname = "cparsing"; + version = "0.1.0.0"; + sha256 = "0yq09q03j9wsgq0pl92b6c4rs9v1nv7znylwzwsbj3x7fp01n6pc"; + libraryHaskellDepends = [ + base containers directory either filepath HUnit lens mtl parsec + split template-haskell transformers + ]; + description = "A simple C++ parser with preprocessor features. C++ refactorings included."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cpio-conduit" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring , conduit, conduit-extra, resourcet @@ -50593,8 +53674,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.4.0"; - sha256 = "01imn0nnb567m1l48bjaa6nqp0555bw5lp40d9bqz56dalh4lnlk"; + version = "3.4.1"; + sha256 = "1sd6h0xw76iwvgl7i4c9wy6q5fmq75inq5vh79rzf3bhmahb1529"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -50671,6 +53752,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-python/"; description = "Bindings for libpython"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) python34;}; "cql" = callPackage @@ -50928,6 +54010,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crackNum_2_0" = callPackage + ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }: + mkDerivation { + pname = "crackNum"; + version = "2.0"; + sha256 = "1wi2k7yrm9z3n1b6vnw5zc3yj4k8drhap7fm2hk1z98wih4qppzp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-binary-ieee754 FloatingHex ieee754 + ]; + executableHaskellDepends = [ + base data-binary-ieee754 FloatingHex ieee754 + ]; + description = "Crack various integer, floating-point data formats"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "craft" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-combinators, conduit-extra @@ -51104,13 +54205,17 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, containers, mtl, tasty, tasty-quickcheck }: + ({ mkDerivation, base, binary, bytestring, containers, Diff + , hashable, mtl, network-info, safe, stm, time, vector + }: mkDerivation { pname = "crdt"; - version = "2.1"; - sha256 = "05dc1whgn7wr0p32i3j8346s09rs80kagfdc7gmc30jb29nsdn9s"; - libraryHaskellDepends = [ base containers mtl ]; - testHaskellDepends = [ base containers tasty tasty-quickcheck ]; + version = "9.3"; + sha256 = "1w1mb43hb6zn8n8r261j623jrgxx54h8jifhcby8nnfyl3h97c69"; + libraryHaskellDepends = [ + base binary bytestring containers Diff hashable mtl network-info + safe stm time vector + ]; homepage = "https://github.com/cblp/crdt#readme"; description = "Conflict-free replicated data types"; license = stdenv.lib.licenses.bsd3; @@ -51149,8 +54254,8 @@ self: { }: mkDerivation { pname = "credential-store"; - version = "0.1.1"; - sha256 = "1qim9hqyak3c7giqjrkvdvlpgwlbgnyz418q6pndwvyrhzm7n21m"; + version = "0.1.2"; + sha256 = "114jdbpiyx8xnjxnpz05nqpnb5s29y1iv330b0i491vik8hvrbad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51183,6 +54288,7 @@ self: { homepage = "https://github.com/brendanhay/credentials"; description = "Secure Credentials Storage and Distribution"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "credentials-cli" = callPackage @@ -51299,6 +54405,8 @@ self: { pname = "critbit"; version = "0.2.0.0"; sha256 = "1xdgaj73ffvj1q1kyi62bifbazmzgamfwzdbdz0c339axw5dga82"; + revision = "1"; + editedCabalFile = "0sfhyrdhnm3803v0yg4ch976nn19hpgwwrlmfdnxnc9agn8m1ja1"; libraryHaskellDepends = [ array base bytestring deepseq text vector ]; @@ -51314,65 +54422,76 @@ self: { homepage = "https://github.com/bos/critbit"; description = "Crit-bit maps and sets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring - , cassava, code-page, containers, deepseq, directory, filepath - , Glob, hastache, HUnit, js-flot, js-jquery, mtl, mwc-random - , optparse-applicative, parsec, QuickCheck, statistics, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms + ({ 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, semigroups, statistics, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, transformers-compat + , vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.1.4.0"; - sha256 = "0xps7jm8g1bg7a2y4b6mj5nhg3b595k5ysprf4711lwyfpy478jk"; - revision = "1"; - editedCabalFile = "0hgy2rbrb0dg1sjdvqk2zivdq075fih4zlf51ffdmqzgcdj3i9b1"; + version = "1.3.0.0"; + sha256 = "0csgk6njr6a3i895d10pajf7z4r9hx8aj2r0c3rj5li6vrm37f8q"; + revision = "3"; + editedCabalFile = "0bdz45r1mf6ydcs7l333xn7da9p583g9y7n3dzvnry4by0fkcqw6"; + isLibrary = true; + isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint base binary bytestring cassava code-page - containers deepseq directory filepath Glob hastache js-flot - js-jquery mtl mwc-random optparse-applicative parsec statistics - text time transformers transformers-compat vector vector-algorithms + 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 semigroups statistics text time transformers + transformers-compat vector vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat optparse-applicative semigroups ]; testHaskellDepends = [ - aeson base bytestring HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector + aeson base base-compat 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; }) {}; - "criterion_1_2_3_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, semigroups, statistics, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, transformers-compat - , vector, vector-algorithms + "criterion_1_4_1_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, bytestring, cassava, code-page + , containers, deepseq, directory, exceptions, filepath, Glob, HUnit + , js-flot, js-jquery, microstache, mtl, mwc-random + , optparse-applicative, parsec, QuickCheck, semigroups, statistics + , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.2.3.0"; - sha256 = "0539rjhsvwnp8gnyv411vdgbrkddc4kqv3nwgsan9z2bkw0dk47h"; + version = "1.4.1.0"; + sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = 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 semigroups statistics text time transformers - transformers-compat vector vector-algorithms + aeson ansi-wl-pprint base base-compat-batteries binary bytestring + cassava code-page containers deepseq directory exceptions filepath + Glob js-flot js-jquery microstache mtl mwc-random + optparse-applicative parsec semigroups statistics text time + transformers transformers-compat vector vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat-batteries optparse-applicative semigroups ]; - executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ - aeson base bytestring deepseq directory HUnit QuickCheck statistics - tasty tasty-hunit tasty-quickcheck vector + aeson base base-compat base-compat-batteries 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"; @@ -51517,32 +54636,8 @@ self: { }: mkDerivation { pname = "cron"; - version = "0.5.0"; - sha256 = "1drmhnb0lx24k2s0g9g0jhs810iwwyacld3hx584n1ffshbwzzzb"; - 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; - }) {}; - - "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"; + version = "0.6.1"; + sha256 = "0l9jigxr271gyf8a69igag5rckvcngv6h93jkf02d43jvqxza6lc"; libraryHaskellDepends = [ attoparsec base data-default-class mtl mtl-compat old-locale semigroups text time @@ -51555,7 +54650,6 @@ self: { 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 @@ -51632,6 +54726,7 @@ self: { homepage = "https://github.com/phadej/crypt-sha512"; description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-api" = callPackage @@ -51640,8 +54735,10 @@ self: { }: mkDerivation { pname = "crypto-api"; - version = "0.13.2"; - sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak"; + version = "0.13.3"; + sha256 = "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"; + revision = "1"; + editedCabalFile = "1z6n1sa5pn3iqvqjrd8hv4bc2pxzsrhm5sh0l8z7g9lbqp6w0wp5"; libraryHaskellDepends = [ base bytestring cereal entropy tagged transformers ]; @@ -51773,8 +54870,8 @@ self: { }: mkDerivation { pname = "crypto-enigma"; - version = "0.0.2.9"; - sha256 = "18nc5gqsy4dsm22van6iz96lqq45f7jqik4fljczgp6n1knyig9z"; + version = "0.0.2.11"; + sha256 = "0wm8jifcwfad2hmh15hm2n93f2vzaxkvm2ndf57l0j97acbvbmy1"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -51941,8 +55038,8 @@ self: { }: mkDerivation { pname = "crypto-rng"; - version = "0.1.0.1"; - sha256 = "1hmml06vkf769cwxjry04zcxigy8w6sgfm9rmzwwv402mqh48dzs"; + version = "0.1.0.2"; + sha256 = "1h7ilx91jbnlmax0z74kvk6f3yr4f14pk15bi9qvhn8kj13i7qf1"; libraryHaskellDepends = [ base bytestring crypto-api DRBG exceptions monad-control mtl transformers-base @@ -52007,8 +55104,8 @@ self: { }: mkDerivation { pname = "cryptocompare"; - version = "0.1.0"; - sha256 = "0ghdaf5m3axxzxbq3zm9klrnzh354maf82389aryskglr9l11fv4"; + version = "0.1.1"; + sha256 = "1cqnhg1ww79k3f6yisdir1fqiil13niv002p5s2kir9ks5phybni"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions http-conduit MissingH text time transformers unordered-containers @@ -52028,16 +55125,16 @@ self: { }: mkDerivation { pname = "cryptoconditions"; - version = "0.1.0.0"; - sha256 = "0dbhlv7nh0awnvi1rwg3s25ksbxgvdlci543bwqp5ilkqdl3vlh0"; + version = "0.2.4"; + sha256 = "1mbi3h21xfzsripixkvakw4kp36n8jzwsyajjxwllq3nxq3lwgp0"; libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types base base64-bytestring + aeson 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 + base64-bytestring bytestring containers cryptonite tasty + tasty-hunit text transformers ]; homepage = "https://github.com/libscott/cryptoconditions-hs"; description = "Interledger Crypto-Conditions"; @@ -52109,8 +55206,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.100.1"; sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi"; - revision = "1"; - editedCabalFile = "1drxjsn5chi9zj3djj85s1d6xqlc28ji70zpyicxl5fals10n5w3"; + revision = "2"; + editedCabalFile = "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -52130,8 +55227,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.100.1"; sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w"; - revision = "1"; - editedCabalFile = "167i2mjyr18949xckzv6f782n763f6w9k114p6kq74gbmxqjvmqb"; + revision = "2"; + editedCabalFile = "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -52144,27 +55241,6 @@ self: { }) {}; "cryptohash-sha256" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, criterion - , SHA, tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "cryptohash-sha256"; - version = "0.11.100.1"; - sha256 = "1mpmq8rqlqp3w9r78d4i175l6ibl9kfj5d48awrkk1k4x4w27c2p"; - revision = "1"; - editedCabalFile = "0ywdlxf2y46pi2p502zkqwf6zpiamxg5s2l178xkpjy1r02d9lhg"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base base16-bytestring bytestring SHA tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - homepage = "https://github.com/hvr/cryptohash-sha256"; - description = "Fast, pure and practical SHA-256 implementation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cryptohash-sha256_0_11_101_0" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , SHA, tasty, tasty-hunit, tasty-quickcheck }: @@ -52172,6 +55248,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.101.0"; sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"; + revision = "1"; + editedCabalFile = "19birnmwga1yh82l4jqc3fygqkqcf5y8dlldnxfswngkzc3rvwp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -52183,7 +55261,6 @@ self: { homepage = "https://github.com/hvr/cryptohash-sha256"; description = "Fast, pure and practical SHA-256 implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cryptohash-sha512" = callPackage @@ -52194,8 +55271,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.100.1"; sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h"; - revision = "1"; - editedCabalFile = "0aj9ryzdpxz79n5bs5wx56s9rjxm25dm7agxbyzqdr93wi2rj8ny"; + revision = "2"; + editedCabalFile = "1xy1j3bn2w8my0q04s7z460rddmnqfdh43l95m86rpk75xpiryil"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -52205,30 +55282,49 @@ self: { homepage = "https://github.com/hvr/cryptohash-sha512"; description = "Fast, pure and practical SHA-512 implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cryptoids" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptoids-types - , cryptonite, directory, exceptions, filepath, memory + ({ mkDerivation, base, binary, bytestring, cryptoids-class + , cryptoids-types, cryptonite, directory, exceptions, filepath + , memory }: mkDerivation { pname = "cryptoids"; - version = "0.4.0.0"; - sha256 = "1km63vgckjsxxrkd45w7c5gc3d5hk6dg6f0y4z4c8wajz4ddp1a3"; + version = "0.5.0.0"; + sha256 = "05xywzs7waz01c0p3y02qlf4yfhfpmpzpdfs2cmv5rmphf1hzck2"; + revision = "4"; + editedCabalFile = "1lghn17a367cvljsc8kddn11qd30nz6a6dl4128xbc6p0bf41pzj"; libraryHaskellDepends = [ - base binary bytestring cryptoids-types cryptonite directory - exceptions filepath memory + base binary bytestring cryptoids-class cryptoids-types cryptonite + directory exceptions filepath memory ]; description = "Reversable and secure encoding of object ids as a bytestring"; license = stdenv.lib.licenses.bsd3; }) {}; + "cryptoids-class" = callPackage + ({ mkDerivation, base, cryptoids-types, exceptions }: + mkDerivation { + pname = "cryptoids-class"; + version = "0.0.0"; + sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy"; + revision = "3"; + editedCabalFile = "1hcdhmksd81sylfjyx0wb4yhrswdwbjlaarq8fbmwcl7fjm4sxfy"; + libraryHaskellDepends = [ base cryptoids-types exceptions ]; + description = "Typeclass-based interface to cryptoids"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptoids-types" = callPackage ({ mkDerivation, base, binary, http-api-data, path-pieces }: mkDerivation { pname = "cryptoids-types"; version = "0.0.0"; sha256 = "0qp6lx1k2mqay1i4wgkwgaqamp33gijw0wb13rh71i0qwyvnr51b"; + revision = "1"; + editedCabalFile = "0i12f6rsphs4plkxc8w3dalyf9iy5q67lkm4fxv4g1zcicqxgmqy"; libraryHaskellDepends = [ base binary http-api-data path-pieces ]; description = "Shared types for encrypting internal object identifiers before exposure"; license = stdenv.lib.licenses.bsd3; @@ -52274,68 +55370,44 @@ self: { }) {}; "cryptonite" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, foundation - , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit - , tasty-kat, tasty-quickcheck - }: - mkDerivation { - pname = "cryptonite"; - version = "0.23"; - sha256 = "1680dxgmnjgj083jhsw3rlljwaw0zqi5099m59x6kwqkxhn1qjpf"; - libraryHaskellDepends = [ - 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; - }) {}; - - "cryptonite_0_24" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, foundation + ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck }: mkDerivation { pname = "cryptonite"; - version = "0.24"; - sha256 = "11js3fg1rbrgy17i0nq19v9w4w28s80zglb6fnlbz6zg8cik3hqp"; + version = "0.25"; + sha256 = "131wbbdr5yavs5k1ah9sz6fqx1ffyvaxf66pwjzsfc47mwc1mgl9"; libraryHaskellDepends = [ - base bytestring deepseq foundation ghc-prim integer-gmp memory + base basement bytestring deepseq ghc-prim integer-gmp memory ]; testHaskellDepends = [ base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck ]; benchmarkHaskellDepends = [ - base bytestring criterion memory random + base bytestring deepseq gauge memory random ]; homepage = "https://github.com/haskell-crypto/cryptonite"; description = "Cryptography Primitives sink"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , conduit-extra, cryptonite, memory, resourcet, tasty, tasty-hunit - , transformers + , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty + , tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "cryptonite-conduit"; - version = "0.2.0"; - sha256 = "0a3nasx5fix5g3vjaq26lg9j4frj27ksifqpz3d0naynkacaxv8m"; + version = "0.2.2"; + sha256 = "1bldcmda4xh52mw1wfrjljv8crhw3al7v7kv1j0vidvr7ymnjpbh"; libraryHaskellDepends = [ - base bytestring conduit conduit-extra cryptonite memory resourcet - transformers + base bytestring conduit conduit-extra cryptonite exceptions memory + resourcet transformers ]; testHaskellDepends = [ base bytestring conduit conduit-combinators cryptonite memory tasty - tasty-hunit + tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/haskell-crypto/cryptonite-conduit"; description = "cryptonite conduit"; @@ -52361,6 +55433,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; + "cryptonite-openssl_0_7" = callPackage + ({ mkDerivation, base, basement, bytestring, cryptonite, memory + , openssl, tasty, tasty-hunit, tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite-openssl"; + version = "0.7"; + sha256 = "1xj41354dx24rfh6i7av7qamvin34z4g6m1hxw1fc9jg4q41qkly"; + libraryHaskellDepends = [ + base basement 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 @@ -52406,6 +55500,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "csg" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, doctest, doctest-discover, gloss, gloss-raster + , QuickCheck, simple-vec3, strict, system-filepath, tasty + , tasty-hunit, tasty-quickcheck, transformers, turtle, vector + }: + mkDerivation { + pname = "csg"; + version = "0.1"; + sha256 = "06fc7j1izwwalngjvgvkg90xvp3cjr53c4laqp5giwl2vdqrj2zs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers QuickCheck simple-vec3 strict + transformers + ]; + executableHaskellDepends = [ + base gloss gloss-raster QuickCheck simple-vec3 strict + system-filepath turtle + ]; + testHaskellDepends = [ + base bytestring doctest doctest-discover simple-vec3 tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion simple-vec3 strict vector + ]; + homepage = "https://github.com/dzhus/csg#readme"; + description = "Analytical CSG (Constructive Solid Geometry) library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "csound-catalog" = callPackage ({ mkDerivation, base, csound-expression, csound-sampler , sharc-timbre, transformers @@ -52420,7 +55547,6 @@ self: { homepage = "https://github.com/anton-k/csound-catalog"; description = "a gallery of Csound instruments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression" = callPackage @@ -52431,8 +55557,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.2.2"; - sha256 = "05vlyd3b2kkpspp6jmxrwhv0474rw6ij6ha7jajrbqyx42a4g8bl"; + version = "5.3.1"; + sha256 = "0fwzsmb9syk144d445cw1d9pjx3vn18pxi161yafv2q7q4m57i3g"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -52441,7 +55567,6 @@ self: { homepage = "https://github.com/anton-k/csound-expression"; description = "library to make electronic music"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-dynamic" = callPackage @@ -52459,7 +55584,6 @@ self: { homepage = "https://github.com/anton-k/csound-expression-dynamic"; description = "dynamic core for csound-expression library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-opcodes" = callPackage @@ -52468,14 +55592,13 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.3.2"; - sha256 = "09vyvai2k6id2vsnbxnv809v2bml0v8spsrfcdg2zgnxnjv9s4s4"; + version = "0.0.4.0"; + sha256 = "1rzkv24xppysmx20x453wzxfapkic99c98jqzpf2iyfyny1qya2w"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; description = "opcodes for the library csound-expression"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-typed" = callPackage @@ -52486,8 +55609,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.0.2"; - sha256 = "1fb3wayix991awxnns6y1a9kmb6kvnay7p4rx62nvj89qa513d82"; + version = "0.2.1.0"; + sha256 = "0w591ij97i1kkv2z5fix8zlvw9shagxq6lpkic71ldpvv1a4cf8q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -52497,7 +55620,6 @@ self: { homepage = "https://github.com/anton-k/csound-expression-typed"; description = "typed core for the library csound-expression"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-sampler" = callPackage @@ -52510,7 +55632,6 @@ self: { homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csp" = callPackage @@ -52527,6 +55648,21 @@ self: { license = "LGPL"; }) {}; + "csp_1_4_0" = callPackage + ({ mkDerivation, base, containers, mtl, nondeterminism, tasty + , tasty-hunit + }: + mkDerivation { + pname = "csp"; + version = "1.4.0"; + sha256 = "15ilx5ycvh12c71wza2d25cp4llvncxc9csmmisjcxwny5gpz1q8"; + libraryHaskellDepends = [ base containers mtl nondeterminism ]; + testHaskellDepends = [ base nondeterminism tasty tasty-hunit ]; + description = "Discrete constraint satisfaction problem (CSP) solver"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cspmchecker" = callPackage ({ mkDerivation, base, directory, filepath, haskeline, libcspm, mtl }: @@ -52593,11 +55729,11 @@ self: { ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: mkDerivation { pname = "css-text"; - version = "0.1.2.2"; - sha256 = "11qrwrjqk2k4bm3bz1qcyscp146raz1hgpzynkd50yaq12n69xfz"; + version = "0.1.3.0"; + sha256 = "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; - homepage = "http://www.yesodweb.com/"; + homepage = "https://github.com/yesodweb/css-text.git#readme"; description = "CSS parser and renderer"; license = stdenv.lib.licenses.mit; }) {}; @@ -52616,25 +55752,19 @@ self: { "csv-conduit" = callPackage ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring , conduit, conduit-extra, containers, data-default, directory - , ghc-prim, HUnit, mmorph, monad-control, mtl, primitive, resourcet - , test-framework, test-framework-hunit, text, transformers - , unordered-containers, vector + , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl + , primitive, resourcet, test-framework, test-framework-hunit, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "csv-conduit"; - version = "0.6.7"; - sha256 = "0gdkxr8ww673wp25ykzv39gfnhy3bspihpqv72x803kggh5nn7jh"; - isLibrary = true; - isExecutable = true; + version = "0.6.8.1"; + sha256 = "0j1hg34h57wg7jd8n15a2plrjnn89mj4w7azg19z6vahhsdn6d5n"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit - conduit-extra containers data-default ghc-prim mmorph monad-control - mtl primitive resourcet text transformers unordered-containers - vector - ]; - executableHaskellDepends = [ - base bytestring containers directory mtl primitive text - transformers vector + conduit-extra containers data-default exceptions ghc-prim mmorph + monad-control mtl primitive resourcet text transformers + unordered-containers vector ]; testHaskellDepends = [ base bytestring containers directory HUnit mtl primitive @@ -52693,20 +55823,23 @@ self: { }) {}; "csv-to-qif" = callPackage - ({ mkDerivation, base, Cabal, explicit-exception, hspec, regex-tdfa - , split, spreadsheet + ({ mkDerivation, base, Cabal, explicit-exception, hspec, parsec + , QuickCheck, regex-tdfa, split, spreadsheet }: mkDerivation { pname = "csv-to-qif"; - version = "0.3.2"; - sha256 = "1mfy19fvi92zzzqn70ga2p5csmc8qm0qnkn3vyl41ic6f69vm73x"; + version = "0.3.3"; + sha256 = "0ln7s3k1m802x00sr0py3l3zsww2wnv2lcb2fb71966pwqrbr4fp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base explicit-exception regex-tdfa split spreadsheet + base explicit-exception parsec regex-tdfa split spreadsheet ]; - testHaskellDepends = [ base Cabal hspec regex-tdfa split ]; - homepage = "https://github.com/mrVanDalo/csv-to-qif/"; + testHaskellDepends = [ + base Cabal explicit-exception hspec parsec QuickCheck regex-tdfa + split spreadsheet + ]; + homepage = "http://mrvandalo.github.io/csv-to-qif/"; description = "A small program that will read csv files and create qif files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -52754,30 +55887,6 @@ self: { }) {}; "ctrie" = callPackage - ({ mkDerivation, async, atomic-primops, base, containers, criterion - , deepseq, hashable, primitive, QuickCheck, random, random-shuffle - , stm, test-framework, test-framework-quickcheck2, transformers - , unordered-containers - }: - mkDerivation { - pname = "ctrie"; - version = "0.1.1.0"; - sha256 = "1f2vz91fs8fin9ykcjjp60mmm0hw886mqmmhbs4ai02rdi7v6d44"; - libraryHaskellDepends = [ atomic-primops base hashable primitive ]; - testHaskellDepends = [ - base containers hashable QuickCheck test-framework - test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - async base containers criterion deepseq hashable random - random-shuffle stm transformers unordered-containers - ]; - homepage = "https://github.com/mcschroeder/ctrie"; - description = "Non-blocking concurrent map"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ctrie_0_2" = callPackage ({ mkDerivation, async, atomic-primops, base, containers, criterion , deepseq, hashable, primitive, QuickCheck, random, random-shuffle , stm, test-framework, test-framework-quickcheck2, transformers @@ -52799,7 +55908,6 @@ self: { homepage = "https://github.com/mcschroeder/ctrie"; description = "Non-blocking concurrent map"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cube" = callPackage @@ -52812,14 +55920,12 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal containers STL ]; - executableHaskellDepends = [ - base bytestring cereal containers hspec STL - ]; testHaskellDepends = [ base bytestring cereal containers hspec STL ]; description = "Cubic DSL for 3D printing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cubical" = callPackage @@ -52848,8 +55954,8 @@ self: { }: mkDerivation { pname = "cubicbezier"; - version = "0.6.0.4"; - sha256 = "1bdrl26fm09vmmwdlg09ihq3b42qbz7dphzq03b983zlzrj1064f"; + version = "0.6.0.5"; + sha256 = "0n17nr20skrds3b9gzy0v86jgnqz8zbds796n9cl0z6rh9bq5jf5"; libraryHaskellDepends = [ base containers fast-math integration matrices microlens microlens-mtl microlens-th mtl vector vector-space @@ -52857,7 +55963,6 @@ self: { 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 @@ -52873,14 +55978,16 @@ self: { "cublas" = callPackage ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half - , storable-complex + , storable-complex, template-haskell }: mkDerivation { pname = "cublas"; - version = "0.3.0.0"; - sha256 = "1i2nqbf0zmc1xpqb8szklccki2jkwpiqslqbaahidzp18bc9cm2r"; + version = "0.4.0.1"; + sha256 = "0fk0yrm6arb85xxy7vr2bnkxgwassahfcl8lf9k99s9f9wqc9glr"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; - libraryHaskellDepends = [ base cuda half storable-complex ]; + libraryHaskellDepends = [ + base cuda half storable-complex template-haskell + ]; libraryToolDepends = [ c2hs ]; description = "FFI bindings to the CUDA BLAS library"; license = stdenv.lib.licenses.bsd3; @@ -52906,8 +56013,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.8.0.1"; - sha256 = "0raaydjcnicg38kxy1mjpxb0k57q5nnzb7p38i8x5ify30bzxw0w"; + version = "0.9.0.3"; + sha256 = "0ym5j3rllxyl9zqji47pngwbi032hzm0bv5j06756d5cb769k44q"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -52943,53 +56050,51 @@ self: { }: mkDerivation { pname = "cue-sheet"; - version = "0.1.1"; - sha256 = "1h0v7jzxavjs2c50p1z3bfvbn1r29z31qcr17mjmd7a9yskp4yhd"; + version = "1.0.1"; + sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1"; + revision = "2"; + editedCabalFile = "09h4phhj0j1m4ab5gbfrz6475jn772x46l21k7l2qlxav6hi9w7x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class exceptions megaparsec mtl QuickCheck text ]; testHaskellDepends = [ - base bytestring exceptions hspec hspec-megaparsec QuickCheck text + base bytestring exceptions hspec hspec-megaparsec 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; }) {}; - "cue-sheet_1_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck - , text + "cufft" = callPackage + ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath + , template-haskell }: mkDerivation { - pname = "cue-sheet"; - version = "1.0.0"; - sha256 = "05fj4iqg0ixrs8076p9jcl5my0qx4hgzcprnaymfkkr0n9x06sz1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-default-class exceptions megaparsec - mtl QuickCheck text - ]; - testHaskellDepends = [ - base bytestring exceptions hspec hspec-megaparsec megaparsec - QuickCheck text + pname = "cufft"; + version = "0.8.0.0"; + sha256 = "0n6x079d41s05s050vjyph67xm0gx8nnl9wbmqqgdfimgc8xiggp"; + setupHaskellDepends = [ + base Cabal cuda directory filepath template-haskell ]; - homepage = "https://github.com/mrkkrp/cue-sheet"; - description = "Support for construction, rendering, and parsing of CUE sheets"; + libraryHaskellDepends = [ base cuda ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/robeverest/cufft"; + description = "Haskell bindings for the CUFFT library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cufft" = callPackage + "cufft_0_9_0_0" = callPackage ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath , template-haskell }: mkDerivation { pname = "cufft"; - version = "0.8.0.0"; - sha256 = "0n6x079d41s05s050vjyph67xm0gx8nnl9wbmqqgdfimgc8xiggp"; + version = "0.9.0.0"; + sha256 = "1is6vk0nhvchi0n7d1kpy4vydf82lsb52pq4hqffiawlp0vp5scv"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; @@ -53002,12 +56107,14 @@ self: { }) {}; "curl" = callPackage - ({ mkDerivation, base, bytestring, curl }: + ({ mkDerivation, base, bytestring, containers, curl }: mkDerivation { pname = "curl"; version = "1.3.8"; sha256 = "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh"; - libraryHaskellDepends = [ base bytestring ]; + revision = "1"; + editedCabalFile = "02sq2bjw5igc2k9f9ssh58k2ivii2xsvk5r00ky3cxh8j61qy86q"; + libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ curl ]; description = "Haskell binding to libcurl"; license = stdenv.lib.licenses.bsd3; @@ -53025,6 +56132,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "curl-runnings" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cmdargs + , directory, hspec, hspec-expectations, http-conduit, text + , unordered-containers, yaml + }: + mkDerivation { + pname = "curl-runnings"; + version = "0.2.0"; + sha256 = "0ss98dn39aaa3q2rvf8qf7w638hwwwb2g20p9grw2n9ki0k76i3n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring directory hspec + hspec-expectations http-conduit text unordered-containers yaml + ]; + executableHaskellDepends = [ base cmdargs text ]; + testHaskellDepends = [ base directory hspec hspec-expectations ]; + homepage = "https://github.com/aviaviavi/curl-runnings#readme"; + description = "A framework for declaratively writing curl based API tests"; + license = stdenv.lib.licenses.mit; + }) {}; + + "curl-runnings_0_3_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , case-insensitive, cmdargs, directory, hspec, hspec-expectations + , http-conduit, http-types, text, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "curl-runnings"; + version = "0.3.0"; + sha256 = "0bcapr5kcwlc65bkg6w3aq69jzrb2rydkw13v99dcf9fn43kwcfj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring case-insensitive directory hspec + hspec-expectations http-conduit http-types text + unordered-containers vector yaml + ]; + executableHaskellDepends = [ base cmdargs text ]; + testHaskellDepends = [ base directory hspec hspec-expectations ]; + homepage = "https://github.com/aviaviavi/curl-runnings#readme"; + description = "A framework for declaratively writing curl based API tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "curlhs" = callPackage ({ mkDerivation, base, bytestring, hspec, rtld, time }: mkDerivation { @@ -53069,15 +56223,21 @@ self: { }) {}; "currency-codes" = callPackage - ({ mkDerivation, aeson, base, bson, random, safe, text }: + ({ mkDerivation, aeson, base, bson, deepseq, hspec, QuickCheck + , random, safe, text + }: mkDerivation { pname = "currency-codes"; - version = "2.0.0.0"; - sha256 = "0sdgnzww38l9vhjxs2b92c4j0db4ssbhxs4zrhvnfh66x6jjvnd5"; - libraryHaskellDepends = [ aeson base bson random safe text ]; + version = "3.0.0.1"; + sha256 = "0b3yqybpd8lk5jw7ajrmn6d4minxqr8l6sq35v1yxhjl81zbria8"; + libraryHaskellDepends = [ + aeson base bson deepseq random safe text + ]; + testHaskellDepends = [ aeson base bson hspec QuickCheck ]; homepage = "https://github.com/chordify/currency-codes"; description = "ISO-4217 Currency Codes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "currency-convert" = callPackage @@ -53109,41 +56269,60 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "curry" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "curry"; + version = "0.0.0.0"; + sha256 = "09kwv72pww29xhp4sp7czp3pgjdggzs5ggj8cmzng8xzzgsgd1dv"; + libraryHaskellDepends = [ base ]; + description = "Curry types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "curry-base" = callPackage - ({ mkDerivation, base, containers, directory, filepath, mtl - , old-time, pretty, syb + ({ mkDerivation, base, Cabal, containers, directory, extra + , filepath, mtl, parsec, pretty, time, transformers }: mkDerivation { pname = "curry-base"; - version = "0.2.9"; - sha256 = "0sdwygsbqmvcbzi7zsr0jd02s2r19pc7zsk4b6hjxv4vzjc9f120"; + version = "1.0.0"; + sha256 = "05j0wv2aj5979j5gq13bn317pd9gis96qjp6inqa08aafc4l3yya"; libraryHaskellDepends = [ - base containers directory filepath mtl old-time pretty syb + base containers directory extra filepath mtl parsec pretty time + transformers ]; - homepage = "http://www.curry-language.org"; + testHaskellDepends = [ base Cabal filepath mtl ]; + homepage = "http://curry-language.org"; description = "Functions for manipulating Curry programs"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.bsd3; }) {}; "curry-frontend" = callPackage - ({ mkDerivation, base, containers, curry-base, filepath, mtl - , old-time, pretty, syb + ({ mkDerivation, base, Cabal, containers, curry-base, directory + , extra, filepath, mtl, network-uri, pretty, process, set-extra + , transformers }: mkDerivation { pname = "curry-frontend"; - version = "0.2.12"; - sha256 = "1igys4i7wwj1ildkf4is66gq22zsjg158kv3ald5xiilwkmvfc4h"; + version = "1.0.1"; + sha256 = "07khd3b5v8ys1vidz3gkxj91k4pwq5hn5zlyr99n0n1rm24vhbf8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - libraryHaskellDepends = [ filepath ]; + libraryHaskellDepends = [ + base containers curry-base directory extra filepath mtl network-uri + pretty process set-extra transformers + ]; executableHaskellDepends = [ - base containers curry-base mtl old-time pretty syb + base containers curry-base directory extra filepath mtl network-uri + pretty process set-extra transformers ]; - homepage = "http://www.curry-language.org"; + testHaskellDepends = [ base Cabal curry-base filepath ]; + homepage = "http://curry-language.org"; description = "Compile the functional logic language Curry to several intermediate formats"; - license = "unknown"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -53241,8 +56420,8 @@ self: { }: mkDerivation { pname = "cusolver"; - version = "0.1.0.0"; - sha256 = "00ki40s6z9llsbxlp4c46qn7iaamrhnr5yfr983gqg2mfc3wx355"; + version = "0.1.0.1"; + sha256 = "1wjwdhy51pzvhvr50v7b1s9ljgk001wp9qlmwkkjih0csk79047k"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cublas cuda cusparse half storable-complex @@ -53259,8 +56438,8 @@ self: { }: mkDerivation { pname = "cusparse"; - version = "0.1.0.0"; - sha256 = "0a45b7y18v50r5lzgkbjapivajqymndl3yvdzp1x25n3imi4knxn"; + version = "0.1.0.1"; + sha256 = "1fsldpi4bglh875fc9blki3mlz14dal2j37651br1l587ky1v55w"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cuda half storable-complex ]; libraryToolDepends = [ c2hs ]; @@ -53318,13 +56497,32 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "cve" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "cve"; + version = "0.1.0.0"; + sha256 = "0ywwkwm3sfm8dx447512jm57pdy8sr29z6bvnd3q58h5prz3r2nm"; + libraryHaskellDepends = [ aeson base text ]; + homepage = "github.com/chessai/cve.git"; + description = "simple and efficient cve datatype"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cyclotomic" = callPackage - ({ mkDerivation, arithmoi, base, containers }: + ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-smallcheck + }: mkDerivation { pname = "cyclotomic"; - version = "0.4.4.1"; - sha256 = "05rbigjqd6cp5g0kivz816vfnvvyn8jbfcds35kk46h8nwwsch2r"; + version = "0.5.0.0"; + sha256 = "1r8hsc2x59g5xwch417iaxd8cldm0bg00wvhjb48cb7d53lx3zf8"; libraryHaskellDepends = [ arithmoi base containers ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-smallcheck + ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -53364,6 +56562,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "czipwith_1_0_1_0" = callPackage + ({ mkDerivation, base, template-haskell, transformers }: + mkDerivation { + pname = "czipwith"; + version = "1.0.1.0"; + sha256 = "0s1gz76789w5grm121fikgrxz1hjca6v6dwmds5zg63j6iir3f0p"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "d-bus" = callPackage ({ mkDerivation, async, attoparsec, base, binary, blaze-builder , bytestring, conduit, conduit-extra, containers @@ -53374,8 +56586,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.7"; - sha256 = "00bd001hxh68cwrv2597qg8rpcdz0n96nn31qkqgyhbc4lni72af"; + version = "0.1.8"; + sha256 = "1s9md4865mzal0n69mmfbrd2xifhs8j40dl3vjympifw4li25l8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53392,7 +56604,6 @@ self: { ]; description = "Permissively licensed D-Bus client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "d3d11binding" = callPackage @@ -53528,6 +56739,7 @@ self: { executableHaskellDepends = [ base optparse-applicative ]; description = "Basic Slack bot framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dao" = callPackage @@ -53583,30 +56795,32 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring - , binary, bytestring, cmdargs, containers, cryptohash, curl + , binary, bytestring, Cabal, cmdargs, containers, cryptohash, curl , data-ordlist, directory, fgl, filepath, FindBin, graphviz , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network , network-uri, old-time, parsec, process, QuickCheck, random - , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar - , terminfo, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-compat, unix, unix-compat, utf8-string, vector - , zip-archive, zlib + , regex-applicative, regex-compat-tdfa, sandi, shelly, split, stm + , tar, temporary, terminfo, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers, unix + , unix-compat, utf8-string, vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.12.5"; - sha256 = "0lrm0sal5pl453mkqn8b9fc9l7lwinc140iqihya9g17bk408nrm"; + version = "2.14.0"; + sha256 = "00r8g27sgwlw5r8gx89q99n2hawcacfz1mjj0nmh6ps8l610iyhr"; + revision = "1"; + editedCabalFile = "0kxvr0rv5936x460k5ydyy85lgjhmrlkrm60zhbqkqks304abs1h"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array async attoparsec base base16-bytestring binary bytestring containers cryptohash data-ordlist directory fgl filepath graphviz hashable haskeline html HTTP mmap mtl network network-uri old-time - parsec process random regex-applicative regex-compat-tdfa sandi tar - terminfo text time transformers transformers-compat unix - unix-compat utf8-string vector zip-archive zlib + parsec process random regex-applicative regex-compat-tdfa sandi stm + tar temporary terminfo text time transformers unix unix-compat + utf8-string vector zip-archive zlib ]; librarySystemDepends = [ curl ]; executableHaskellDepends = [ base ]; @@ -53622,7 +56836,8 @@ self: { ''; homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) curl;}; "darcs-benchmark" = callPackage @@ -54056,8 +57271,8 @@ self: { }: mkDerivation { pname = "data-accessor-template"; - version = "0.2.1.14"; - sha256 = "0r8vb3z40172jy17w131ydg5v1pvi121rgwxyq0cgxx0zwzhnvy4"; + version = "0.2.1.15"; + sha256 = "0vxs6d6xv2lsxz81msgh5l91pvxma9gif69csi23nxq2xxapyaw0"; libraryHaskellDepends = [ base data-accessor template-haskell utility-ht ]; @@ -54104,26 +57319,29 @@ self: { }) {}; "data-basic" = callPackage - ({ mkDerivation, aeson, base, basic, binary, bytestring, cases + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, cases , containers, hssqlppp, lens, lens-aeson, mtl, overload - , postgresql-simple, simple-effects, string-conv, template-haskell - , text, time + , postgresql-simple, scientific, simple-effects, simple-logging + , string-conv, template-haskell, text, time }: mkDerivation { pname = "data-basic"; - version = "0.2.0.3"; - sha256 = "0xmc9cj22nw90c4l9ava7da14d2y3pvip81admgjx8cqgz93255k"; + version = "0.3.0.0"; + sha256 = "0ssixfnkgxd132pp6mlpgrkbwqbkrx5zn4ayd7br9ncjvpj2j0gr"; libraryHaskellDepends = [ - aeson base binary bytestring cases containers hssqlppp lens - lens-aeson mtl overload postgresql-simple simple-effects - string-conv template-haskell text time + aeson attoparsec base binary bytestring cases containers hssqlppp + lens lens-aeson mtl overload postgresql-simple scientific + simple-effects simple-logging string-conv template-haskell text + time + ]; + testHaskellDepends = [ + aeson base lens postgresql-simple string-conv 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;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "data-binary-ieee754" = callPackage ({ mkDerivation, base, binary }: @@ -54215,8 +57433,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.1.2.0"; - sha256 = "09hn47fa2y3gpbl6zdahi0qdn4m17kfg7bwc4ch6024kir73fg6f"; + version = "0.1.2.1"; + sha256 = "05l4gkb9k9p7cykx831n9w8i5yy6qffi4pip2y2l5xg2hvi8464s"; libraryHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/sw17ch/data-clist"; description = "Simple functional ring type"; @@ -54512,8 +57730,8 @@ self: { }: mkDerivation { pname = "data-diverse"; - version = "0.8.1.0"; - sha256 = "1lav14j4p01wym8s7j3haliiaj16lyglw5bbp7gn2xk3xg7z1k3p"; + version = "2.0.1.0"; + sha256 = "0997mn0amfl4k70rvrxjw24dzyr6sv42nr1d24whyy114lsiv05b"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54524,14 +57742,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_1_2_0_3" = callPackage + "data-diverse_3_0_0_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "1.2.0.3"; - sha256 = "0mc9xzh0hja8zvgwnfa65hdwirqzggbw1k07fspgzs699wj9dh6r"; + version = "3.0.0.0"; + sha256 = "1sxv9pyggdpwba0771vpvrawnycjrnvpayq0fjf7ly57mrdi3zd0"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54544,30 +57762,38 @@ self: { }) {}; "data-diverse-lens" = callPackage - ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: + ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens + , profunctors, 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 ]; + version = "2.1.0.0"; + sha256 = "1i71f67agjaflb1cz8v6qpfy1qfwwmw8fjq8zl6kqd28z4k0mms7"; + libraryHaskellDepends = [ + base data-diverse generic-lens lens profunctors tagged + ]; + testHaskellDepends = [ + base data-diverse generic-lens 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-diverse-lens_0_5_1_0" = callPackage - ({ mkDerivation, base, data-diverse, hspec, lens, profunctors - , tagged + "data-diverse-lens_3_0_0_2" = callPackage + ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens + , profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "0.5.1.0"; - sha256 = "0c1hrz9b8a01vphfqmlfgx3mh6ci8hd5wwr8iwpkv6z7ps7sp9kd"; + version = "3.0.0.2"; + sha256 = "0hahvbyb6yr3bq36dlrvdsgzg3nifckyp10h83d2ryqgla7p7rbp"; libraryHaskellDepends = [ - base data-diverse lens profunctors tagged + base data-diverse generic-lens lens profunctors tagged + ]; + testHaskellDepends = [ + base data-diverse generic-lens hspec 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; @@ -54580,8 +57806,8 @@ self: { }: mkDerivation { pname = "data-dword"; - version = "0.3.1.1"; - sha256 = "0dgs30yvs7cpikf6f2x4r7rb1f4fv3xi2rgr579af8nhrb2d6z7p"; + version = "0.3.1.2"; + sha256 = "084invjg8zj7ndxnz9clqmq06ch47k1d9lhxwap6xs0x4807crvb"; libraryHaskellDepends = [ base data-bword ghc-prim hashable template-haskell ]; @@ -54658,6 +57884,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Combinator emoticons: data-aviary in the flavor of emoticons"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-endian" = callPackage @@ -54685,6 +57912,7 @@ self: { homepage = "http://github.com/ylilarry/data-extend-generic"; description = "Extend Haskell data or newtype like in OOP languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-extra" = callPackage @@ -54768,18 +57996,6 @@ self: { }) {}; "data-fix" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "data-fix"; - version = "0.0.7"; - sha256 = "04k9cmb197majyw6xna8zfkhgfyxfdiz2sgb0jy5jyfpiz3cr60h"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/anton-k/data-fix"; - description = "Fixpoint data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-fix_0_2_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; @@ -54789,7 +58005,6 @@ self: { homepage = "https://github.com/anton-k/data-fix"; description = "Fixpoint data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-fix-cse" = callPackage @@ -54832,8 +58047,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "data-foldapp"; - version = "0.1.0.0"; - sha256 = "0m2rwai52q712fxkpk4k23cc8x9dx87c8wwwsg9w5y5pxq78csn8"; + version = "0.1.1.0"; + sha256 = "1415cf59wkf1599qcqmrpn9m4v9br3d763v1809mwg9bm2310x65"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/erisco/data-foldapp"; description = "Fold function applications. Framework for variadic functions."; @@ -54844,8 +58059,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "data-forest"; - version = "0.1.0.5"; - sha256 = "05hpi0xr4bp7jigb6qa48n02widxxcn9npjh1y876mkgsdpd4x01"; + version = "0.1.0.6"; + sha256 = "11iisc82cgma5pp6apnjg112dd4cvqxclwf09zh9rh50lzkml9dk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/chris-martin/data-forest"; @@ -54889,19 +58104,6 @@ self: { }) {}; "data-has" = callPackage - ({ mkDerivation, base, criterion, transformers }: - mkDerivation { - pname = "data-has"; - version = "0.2.1.0"; - sha256 = "147qf3hrgl1rdakifw6jasyflv31dnznp0hsj50np4kla63xjgf1"; - libraryHaskellDepends = [ base ]; - benchmarkHaskellDepends = [ base criterion transformers ]; - homepage = "https://github.com/winterland1989/data-has"; - description = "Simple extensible product"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-has_0_3_0_0" = callPackage ({ mkDerivation, base, criterion, transformers }: mkDerivation { pname = "data-has"; @@ -54912,7 +58114,6 @@ self: { homepage = "https://github.com/winterland1989/data-has"; description = "Simple extensible product"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-hash" = callPackage @@ -54940,6 +58141,8 @@ self: { pname = "data-interval"; version = "1.3.0"; sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9"; + revision = "1"; + editedCabalFile = "09n6gklg64lgn4x1f48ga9ynssyl4fm8x376blls1mx1xg6kgbz6"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -54949,18 +58152,17 @@ self: { ]; description = "Interval datatype, interval arithmetic and interval-based containers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-inttrie" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-inttrie"; - version = "0.1.2"; - sha256 = "1y8xbwy1cdfrswlbr029hlyj3cbsfvayxh4kklsdzbrwgnnygnld"; + version = "0.1.4"; + sha256 = "0m5xww8zvsa0whxl89wndpbdz9p5n03q3h3a904nqrxh966psfkb"; libraryHaskellDepends = [ base ]; - homepage = "http://github.com/luqui/data-inttrie"; - description = "A lazy, infinite trie of integers"; + homepage = "https://github.com/luqui/data-inttrie"; + description = "A simple lazy, infinite trie from integers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -55040,15 +58242,14 @@ self: { }: mkDerivation { pname = "data-lens"; - version = "2.11.1"; - sha256 = "0ciwqxm79a8zdfi7wymy9hhan6362hlhd6n8sz79pyjlsyvhpgpv"; + version = "2.11.2"; + sha256 = "123rxp37qjg0rkwz0521s5181qcm4v9gk94ny2j86vw7311kd0ax"; libraryHaskellDepends = [ base comonad containers semigroupoids transformers ]; homepage = "http://github.com/roconnor/data-lens/"; description = "Used to be Haskell 98 Lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-lens-fd" = callPackage @@ -55063,7 +58264,6 @@ self: { homepage = "http://github.com/roconnor/data-lens-fd/"; description = "Lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-lens-ixset" = callPackage @@ -55121,8 +58321,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-list-zigzag"; - version = "0.1.1.0"; - sha256 = "1pywxmwjlhf81vcb6ivcnf341hlmilgf77pi5kj5iad1hdznkp1y"; + version = "0.1.1.1"; + sha256 = "1gfgdn4v9gs2chmrxn1xh66qa8ivn8w4nb5vv1jg9y3isnvjax6q"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/erisco/data-list-zigzag"; description = "A list but with a balanced enumeration of Cartesian product"; @@ -55156,23 +58356,22 @@ self: { "data-msgpack" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion - , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck - , text, unordered-containers, vector, void + , data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable + , hspec, QuickCheck, text, unordered-containers, vector, void }: mkDerivation { pname = "data-msgpack"; - version = "0.0.10"; - sha256 = "0vpv4l6phsa9b3l0wxk798w9kzkc454v2kk554rcmz94wq3k6n61"; + version = "0.0.11"; + sha256 = "11dq5s1s6zcjfa7n464amwiz4sfrkqa7bb5x1rfqiivxc6bgq119"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 deepseq - hashable QuickCheck text unordered-containers vector void + base binary bytestring data-binary-ieee754 data-msgpack-types text ]; executableHaskellDepends = [ base bytestring groom ]; testHaskellDepends = [ - base bytestring containers hashable hspec QuickCheck text - unordered-containers vector void + base bytestring containers data-msgpack-types hashable hspec + QuickCheck text unordered-containers vector void ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq QuickCheck @@ -55377,7 +58576,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ base ]; homepage = "http://ku-fpg.github.io/software/data-reify/"; description = "Reify a recursive data structure into an explicit graph"; license = stdenv.lib.licenses.bsd3; @@ -55460,14 +58658,14 @@ self: { "data-serializer" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, data-endian - , parsers, semigroups, tasty, tasty-quickcheck + , parsers, semigroups, split, tasty, tasty-quickcheck }: mkDerivation { pname = "data-serializer"; - version = "0.3"; - sha256 = "0bjya0x10y55vaa86da89d5svwcckv8h10dzcyiv14q2rxxgmgn8"; + version = "0.3.4"; + sha256 = "1ijy8l5lxmm8wpzx4h2vh9q21zz66xgh979s32aa4b16l9m1b4z7"; libraryHaskellDepends = [ - base binary bytestring cereal data-endian parsers semigroups + base binary bytestring cereal data-endian parsers semigroups split ]; testHaskellDepends = [ base binary bytestring cereal tasty tasty-quickcheck @@ -55503,6 +58701,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-stm32" = callPackage + ({ mkDerivation, ansi-wl-pprint, attoparsec, base, containers, hxt + , hxt-xpath, pretty-simple, text, time + }: + mkDerivation { + pname = "data-stm32"; + version = "0.1.0.0"; + sha256 = "104m1lnm9kf64m3a0svahsvscmcmnb0ixvwm1vh32r61r1rc9fh1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint attoparsec base containers hxt hxt-xpath + pretty-simple text time + ]; + executableHaskellDepends = [ + ansi-wl-pprint attoparsec base containers hxt hxt-xpath + pretty-simple text time + ]; + testHaskellDepends = [ + ansi-wl-pprint attoparsec base containers hxt hxt-xpath + pretty-simple text time + ]; + homepage = "https://github.com/sorki/data-stm32#readme"; + description = "ARM SVD and CubeMX XML parser and pretty printer for STM32 family"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-store" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, criterion , deepseq, ixset, lens, mtl, QuickCheck, random, safecopy, tables @@ -55547,6 +58772,7 @@ self: { ]; description = "An efficient implementation of maps from strings to arbitrary values"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-structure-inferrer" = callPackage @@ -55641,8 +58867,8 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "data-transform"; - version = "0.1.0.1"; - sha256 = "1ib6znjgcjz50z4saf70z7jg9qz132627vj3kv6r3jx6i9vyv2l6"; + version = "0.1.0.2"; + sha256 = "0r4j295b8688x88knbw19z6f4ggnpxgs7adpl1r00njjykdhdzac"; libraryHaskellDepends = [ base containers mtl ]; description = "Functions to transform data structures"; license = stdenv.lib.licenses.bsd3; @@ -55652,10 +58878,8 @@ self: { ({ mkDerivation, base, pretty, syb }: mkDerivation { pname = "data-tree-print"; - version = "0.1.0.0"; - sha256 = "0dymdf7bv98f0xkdm49yxdn5nlbp7ahrfsadx69wzy8si537fnk5"; - revision = "1"; - editedCabalFile = "0ilk496yh0fdw2qisappr91d1s4xwl6hqaf2bnv3l7ah4qv74436"; + version = "0.1.0.1"; + sha256 = "1zh1akyf8vvsqq39vrbn95v5md5in9fvzmz2jz79adh3w5wc5j6f"; libraryHaskellDepends = [ base pretty syb ]; homepage = "https://github.com/lspitzner/data-tree-print"; description = "Print Data instances as a nested tree"; @@ -55743,19 +58967,28 @@ self: { "datadog" = callPackage ({ mkDerivation, aeson, auto-update, base, buffer-builder - , bytestring, lens, lifted-base, monad-control, network, old-locale - , text, time, transformers-base + , bytestring, Cabal, dlist, exceptions, hspec, http-client + , http-client-tls, http-types, lens, lifted-base, monad-control + , network, old-locale, random, text, time, transformers-base + , unordered-containers, vector }: mkDerivation { pname = "datadog"; - version = "0.1.0.1"; - sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663"; + version = "0.2.2.0"; + sha256 = "0i399f5p9ch4bjmqchq890i6x5jd137pw5lz4v43k5qxlbxvc3s5"; libraryHaskellDepends = [ - aeson auto-update base buffer-builder bytestring lens lifted-base - monad-control network old-locale text time transformers-base + aeson auto-update base buffer-builder bytestring dlist http-client + http-client-tls http-types lens lifted-base monad-control network + old-locale text time transformers-base unordered-containers vector + ]; + testHaskellDepends = [ + aeson auto-update base buffer-builder bytestring Cabal dlist + exceptions hspec http-client http-client-tls http-types lens + lifted-base monad-control network old-locale random text time + transformers-base unordered-containers vector ]; homepage = "https://github.com/iand675/datadog"; - description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming."; + description = "Datadog client for Haskell. Supports both the HTTP API and StatsD."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -55851,8 +59084,8 @@ self: { }: mkDerivation { pname = "datarobot"; - version = "0.1.1"; - sha256 = "1dcr0jnd7wgxplzfgbkbv79civ80iqzlz2nvp3s6hv5zyzbf2pm9"; + version = "1.0.1"; + sha256 = "0arxjghmx50ci9hng6jmcm3jmx7c5k8vycn76d5paw6bjpd1n3mf"; libraryHaskellDepends = [ aeson base bytestring exceptions microlens network-uri safe scientific string-conversions text unordered-containers vector wreq @@ -55918,8 +59151,8 @@ self: { ({ mkDerivation, base, dates, hspec, QuickCheck, time }: mkDerivation { pname = "date-conversions"; - version = "0.1.0.0"; - sha256 = "0348mi754n9611hzs62v17f3qba4vyls9x82capjasy8f2mw1cqn"; + version = "0.3.0.0"; + sha256 = "086vmgq58n2gcmz93idngh2hq1zfz8d231qazjzv19p08np5j3zm"; libraryHaskellDepends = [ base dates time ]; testHaskellDepends = [ base dates hspec QuickCheck time ]; homepage = "https://github.com/thoughtbot/date-conversions#readme"; @@ -56100,6 +59333,7 @@ self: { homepage = "https://github.com/relrod/dbm"; description = "A *simple* database migration tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbmigrations" = callPackage @@ -56181,34 +59415,66 @@ self: { testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ]; description = "The dbmigrations tool built for SQLite databases"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus" = callPackage - ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck - , containers, criterion, deepseq, directory, filepath, libxml-sax - , network, parsec, process, QuickCheck, random, text, transformers - , unix, vector, xml-types + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, directory, extra, filepath, libxml-sax, network, parsec + , process, QuickCheck, random, resourcet, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unix, vector, xml-types }: mkDerivation { pname = "dbus"; - version = "0.10.13"; - sha256 = "1jksgv3c2bhi9d3kshllx6j1znyqmx189j6yml7j9gm0m3xsx55a"; + version = "0.10.15"; + sha256 = "1a5sjavq8mfzz4zxpkd9b6jxsvy0kl1rjq2hhy40gcz2qjfnamb4"; libraryHaskellDepends = [ - base bytestring cereal containers libxml-sax network parsec random - text transformers unix vector xml-types + base bytestring cereal containers deepseq libxml-sax network parsec + random text transformers unix vector xml-types ]; testHaskellDepends = [ - base bytestring cereal chell chell-quickcheck containers directory - filepath libxml-sax network parsec process QuickCheck random text - transformers unix vector xml-types + base bytestring cereal containers directory extra filepath + libxml-sax network parsec process QuickCheck random resourcet tasty + tasty-hunit tasty-quickcheck text transformers unix vector + xml-types ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; + benchmarkHaskellDepends = [ base criterion ]; doCheck = false; homepage = "https://github.com/rblaze/haskell-dbus#readme"; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.gpl3; }) {}; + "dbus_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, directory, extra, filepath, lens, libxml-sax, network + , parsec, process, QuickCheck, random, resourcet, split, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, th-lift + , transformers, unix, vector, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.0.1"; + sha256 = "1xg8wzs7xnh3455v3bbw9nd8inzr06n5939pzlq3nd4ajp3ba9d3"; + libraryHaskellDepends = [ + base bytestring cereal containers deepseq filepath lens libxml-sax + network parsec random split template-haskell text th-lift + transformers unix vector xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath + libxml-sax network parsec process QuickCheck random resourcet tasty + tasty-hunit tasty-quickcheck text transformers unix vector + xml-types + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + homepage = "https://github.com/rblaze/haskell-dbus#readme"; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -56268,8 +59534,8 @@ self: { }: mkDerivation { pname = "dbus-th"; - version = "0.1.2.0"; - sha256 = "02a9xv5kgn9x95aqbqb6kg2snra6nw55mq1jssv8cmr1wy50nmjq"; + version = "0.1.3.0"; + sha256 = "0b1ansjk6j7fzfi2s26dqvka7s85bflw7cl665vplm1sq0is2a0j"; libraryHaskellDepends = [ base containers dbus syb template-haskell text ]; @@ -56283,8 +59549,8 @@ self: { }: mkDerivation { pname = "dbus-th-introspection"; - version = "0.1.0.2"; - sha256 = "1f6lv7jag9mbl8lkk9m4fnggfhbc301g142adk533sx6pwm6zn8x"; + version = "0.1.2.0"; + sha256 = "1d8hqra3sfpvscc3jpgcyllq3gaha24jj0n4y17y4wkhz437ni4f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56362,6 +59628,7 @@ self: { libraryHaskellDepends = [ base dates time ]; description = "Discordian Date Types for Haskell"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-base" = callPackage @@ -56413,6 +59680,7 @@ self: { homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler base libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-core" = callPackage @@ -56669,6 +59937,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dde" = callPackage + ({ mkDerivation, base, criterion, free-vector-spaces, lens, linear + , vector + }: + mkDerivation { + pname = "dde"; + version = "0.2.0"; + sha256 = "0c0mhyvipn7g1sfjgw8r0qybzcvxm3lzmr1ips2xbr8vv2mxmpm4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base free-vector-spaces lens linear vector + ]; + executableHaskellDepends = [ + base free-vector-spaces lens linear vector + ]; + testHaskellDepends = [ + base free-vector-spaces lens linear vector + ]; + benchmarkHaskellDepends = [ + base criterion free-vector-spaces lens linear vector + ]; + homepage = "https://github.com/masterdezign/dde#readme"; + description = "Delay differential equations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dead-code-detection" = callPackage ({ mkDerivation, base, containers, directory, filepath , getopt-generics, ghc, ghc-paths, gitrev, Glob, graph-wrapper @@ -56774,6 +60070,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "debian-build_0_10_1_1" = callPackage + ({ mkDerivation, base, directory, filepath, process, split + , transformers + }: + mkDerivation { + pname = "debian-build"; + version = "0.10.1.1"; + sha256 = "0dv5fs0kp8qmrldly6cj0fkvab7infplii0ay23p1pbx6qjakrnk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath process split transformers + ]; + executableHaskellDepends = [ base filepath transformers ]; + homepage = "http://twitter.com/khibino/"; + description = "Debian package build sequence tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "debug" = callPackage + ({ mkDerivation, aeson, base, bytestring, clock, containers + , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed + , libgraph, open-browser, prettyprinter + , prettyprinter-compat-ansi-wl-pprint, template-haskell, text + , uniplate, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "debug"; + version = "0.1.1"; + sha256 = "0j4jskz8zq2ww81mfarshi5g2m6xfivgl26grkhcacqq6k3483rk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring clock containers deepseq directory extra + ghc-prim hashable Hoed libgraph open-browser prettyprinter + prettyprinter-compat-ansi-wl-pprint template-haskell text uniplate + unordered-containers vector + ]; + executableHaskellDepends = [ aeson base directory filepath yaml ]; + testHaskellDepends = [ + aeson base bytestring containers directory extra filepath text + ]; + homepage = "https://github.com/ndmitchell/debug"; + description = "Simple trace-based debugger"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "debug-diff" = callPackage ({ mkDerivation, base, groom, process, temporary }: mkDerivation { @@ -56814,6 +60160,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "debug-pp" = callPackage + ({ mkDerivation, aeson, base, debug-hoed, directory, filepath, yaml + }: + mkDerivation { + pname = "debug-pp"; + version = "0.1.1"; + sha256 = "1hja3kgczsr9zr7vf0glsi0czdfgb97kchwwqhi1gr5nfdphncjb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base debug-hoed directory filepath yaml + ]; + homepage = "https://github.com/pepeiborra/debug-hoed-pp#readme"; + description = "A preprocessor for the debug package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {debug-hoed = null;}; + "debug-time" = callPackage ({ mkDerivation, base, clock, containers }: mkDerivation { @@ -56827,6 +60192,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "debug-tracy" = callPackage + ({ mkDerivation, base, random, transformers }: + mkDerivation { + pname = "debug-tracy"; + version = "0.1.0.1"; + sha256 = "1cp3m776yrg8r2lmcbn81y5as27qidzgb3j49ksnq4swry78jhg5"; + libraryHaskellDepends = [ base random transformers ]; + description = "More useful trace functions for investigating bugs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "deburr" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -56881,7 +60257,6 @@ self: { homepage = "https://github.com/leftaroundabout/decimal-literals"; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "declarative" = callPackage @@ -56891,8 +60266,8 @@ self: { }: mkDerivation { pname = "declarative"; - version = "0.5.1"; - sha256 = "0966yk9ihl2xawr8xiymz6yp0z6py7dq94ii7zd845klgq393maf"; + version = "0.5.2"; + sha256 = "014spawd3wgasrlfaz0zcz0qf1cnhr9nxm71lzcxjgi8n1gcza0y"; libraryHaskellDepends = [ base hasty-hamiltonian kan-extensions lens mcmc-types mighty-metropolis mwc-probability pipes primitive speedy-slice @@ -57023,6 +60398,8 @@ self: { pname = "deepseq"; version = "1.4.3.0"; sha256 = "0fjdmsd8fqqv78m7111m10pdfswnxmn02zx1fsv2k26b5jckb0bd"; + revision = "1"; + editedCabalFile = "0djisxi7z2xyx3wps550avgz5x56rl4xzks17j996crdsrdrcqh9"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ array base ghc-prim HUnit test-framework test-framework-hunit @@ -57065,8 +60442,8 @@ self: { pname = "deepseq-generics"; version = "0.2.0.0"; sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "1"; - editedCabalFile = "055m914q7a19jagpxh65d8m67z1nl0h7cz77y1r0zp1qmpkisg82"; + revision = "2"; + editedCabalFile = "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -57264,42 +60641,39 @@ self: { homepage = "https://github.com/YoEight/deiko-config"; description = "Small and typesafe configuration library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dejafu" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , leancheck, mtl, random, ref-fd, semigroups, transformers - , transformers-base + , leancheck, profunctors, random, ref-fd, transformers }: mkDerivation { pname = "dejafu"; - version = "0.7.3.0"; - sha256 = "163aw8qw18lqw0q8pr88d3i3m1r1v5ny73xy5ryxlls5wiyn2ds8"; + version = "1.3.2.0"; + sha256 = "1gxwfyyinr1bkab3p4s7swb0d15a4a4d27xwy7ci0nmwgqgb6lf9"; libraryHaskellDepends = [ - base concurrency containers deepseq exceptions leancheck mtl random - ref-fd semigroups transformers transformers-base + base concurrency containers deepseq exceptions leancheck + profunctors random ref-fd transformers ]; homepage = "https://github.com/barrucadu/dejafu"; - description = "Systematic testing for Haskell concurrency"; + description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "dejafu_0_9_0_3" = callPackage + "dejafu_1_5_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , leancheck, random, ref-fd, transformers, transformers-base + , leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "0.9.0.3"; - sha256 = "11nhxn5cmqw0xybbpvq54y9nbrjv915hzysai4hqfr4b1jk3fwbh"; + version = "1.5.0.0"; + sha256 = "1d32y12mzd9vfj2ww2cqn4jsvkc4yysnada6wijk5hm6ax7in822"; libraryHaskellDepends = [ - base concurrency containers deepseq exceptions leancheck random - ref-fd transformers transformers-base + base concurrency containers deepseq exceptions leancheck + profunctors random transformers ]; homepage = "https://github.com/barrucadu/dejafu"; - description = "Systematic testing for Haskell concurrency"; + description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -57416,6 +60790,7 @@ self: { homepage = "https://github.com/atzedijkstra/delimiter-separated"; description = "Library for dealing with tab and/or comma (or other) separated files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "delta" = callPackage @@ -57475,6 +60850,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Generalized the Prelude more functionally"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "demarcate" = callPackage @@ -57531,6 +60907,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dependency" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, binary, containers + , criterion, deepseq, hspec, lens, recursion-schemes, tardis + , transformers + }: + mkDerivation { + pname = "dependency"; + version = "0.1.0.11"; + sha256 = "0nazbm1mf3agjkfc1ll0fy4jxdkb65dzx92jz15jp7xp5y10866h"; + libraryHaskellDepends = [ + ansi-wl-pprint base binary containers deepseq lens + recursion-schemes tardis transformers + ]; + testHaskellDepends = [ base containers hspec ]; + benchmarkHaskellDepends = [ base containers criterion ]; + description = "Dependency resolution for package management"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dependent-map" = callPackage ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { @@ -57630,8 +61025,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "deque"; - version = "0.2"; - sha256 = "0miy1m3lmifrmlsnnmx6djcwq5nb4ar951f2i1bb6n1c94i8sxl6"; + version = "0.2.1"; + sha256 = "0r1jabz5jamm79nrbwjnajzzn77fkhqbjfnmkahg293761z1k781"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/deque"; description = "Double-ended queue"; @@ -57650,7 +61045,6 @@ self: { testHaskellDepends = [ base Cabal cabal-test-quickcheck ]; description = "A typeclass and an implementation for double-ended queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derangement" = callPackage @@ -57698,6 +61092,7 @@ self: { homepage = "https://github.com/ndmitchell/derive#readme"; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-IG" = callPackage @@ -57770,12 +61165,13 @@ self: { pname = "derive-storable"; version = "0.1.1.1"; sha256 = "0rb60s5wznlqqq2s8l2wrvbgzalk719x550h321vf1xx6ck6g8g2"; + revision = "1"; + editedCabalFile = "1rf8k42k35lq7rq4g506s06cn3fn94m39934gn0mcbznbqhmvd8v"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://www.github.com/mkloczko/derive-storable/"; description = "Derive Storable instances with GHC.Generics."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-storable-plugin" = callPackage @@ -57784,8 +61180,8 @@ self: { }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.0.0"; - sha256 = "1s0pm6crwbp3j4dfv5mf3lr75l0cvzy019968gbi4hml8v9wd6iw"; + version = "0.2.1.0"; + sha256 = "1138pkkzkzj4vmh6cnc152fhf50mirys0c9nvyd4n5xi5227rihi"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghc-paths ghci hspec QuickCheck @@ -57796,23 +61192,24 @@ self: { homepage = "https://www.github.com/mkloczko/derive-storable-plugin/"; description = "GHC core plugin supporting the derive-storable package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-topdown" = callPackage - ({ mkDerivation, base, binary, derive, haskell-src, mtl, primitive - , QuickCheck, syb, template-haskell, th-expand-syns, transformers + ({ mkDerivation, base, binary, derive, GenericPretty, haskell-src + , mtl, primitive, QuickCheck, simple-sql-parser, syb + , template-haskell, th-expand-syns, transformers }: mkDerivation { pname = "derive-topdown"; - version = "0.0.0.9"; - sha256 = "0jvmdwd1dif8hxb45s2fw96pca1hm41p5cac68in1pkpsvq7z6cf"; + version = "0.0.1.0"; + sha256 = "0311cnnsq34mc4c24skyhx7458xzd1y9pb9a77mmkc4ils604rql"; libraryHaskellDepends = [ base mtl primitive syb template-haskell th-expand-syns transformers ]; testHaskellDepends = [ - base binary derive haskell-src mtl primitive QuickCheck syb - template-haskell th-expand-syns transformers + base binary derive GenericPretty haskell-src mtl primitive + QuickCheck simple-sql-parser syb template-haskell th-expand-syns + transformers ]; homepage = "https://github.com/HaskellZhangSong/derive-topdown"; description = "Help Haskellers derive class instances for composited data types"; @@ -57835,21 +61232,25 @@ self: { "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged - , template-haskell, transformers, transformers-compat + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat }: mkDerivation { pname = "deriving-compat"; - version = "0.3.6"; - sha256 = "0v9m76hjrlrcbyawdp04y1vv0p867h3jhy00xjxgmqq5cm0sn7qc"; + version = "0.4.1"; + sha256 = "0lzcbnvzcnrrvr61mrqdx4i8fylknf4jwrpncxr9lhpxgp4fqqk4"; + revision = "1"; + editedCabalFile = "12pzj7ng66xyyj6aixd0mds8vf0p9syivngrjz9xcsi63d76dsbn"; libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell transformers - transformers-compat + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat ]; testHaskellDepends = [ base base-compat base-orphans hspec QuickCheck tagged template-haskell transformers transformers-compat ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/haskell-compat/deriving-compat"; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; @@ -57883,8 +61284,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "0.0.3"; - sha256 = "19g7nrgd5z7larkw1nb4vm9hfid1j8s2pcqyqflff4mp764m2ipg"; + version = "1.0.1"; + sha256 = "0y5rm5gg53siax0q43z79a0b95fkq5plk91qz658ihxmjd2fbv67"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -58097,50 +61498,94 @@ self: { }) {}; "dhall" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring - , bytestring, case-insensitive, charset, containers, contravariant - , cryptohash, exceptions, http-client, http-client-tls, lens - , optparse-generic, parsers, prettyprinter, system-fileio - , system-filepath, tasty, tasty-hunit, text, text-format - , transformers, trifecta, unordered-containers, vector + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base + , base16-bytestring, bytestring, case-insensitive, containers + , contravariant, cryptonite, deepseq, directory, exceptions + , filepath, haskeline, http-client, http-client-tls + , insert-ordered-containers, lens-family-core, memory, mtl + , optparse-generic, parsers, prettyprinter + , prettyprinter-ansi-terminal, repline, scientific, tasty + , tasty-hunit, text, text-format, transformers, trifecta + , unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.8.0"; - sha256 = "0bfnylfjqp8065i2akz5b8p55c45396hi8h6lx0jkl1i597567c4"; + version = "1.11.1"; + sha256 = "1vaggm5i89yry8z6xyx8852d91nmcdlmf527bnps37fmgrkvhga4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base base16-bytestring bytestring case-insensitive + containers contravariant cryptonite directory exceptions filepath + http-client http-client-tls insert-ordered-containers + lens-family-core memory parsers prettyprinter + prettyprinter-ansi-terminal scientific text text-format + transformers trifecta unordered-containers vector + ]; + executableHaskellDepends = [ + ansi-terminal base haskeline mtl optparse-generic prettyprinter + prettyprinter-ansi-terminal repline text trifecta + ]; + testHaskellDepends = [ + base deepseq insert-ordered-containers prettyprinter tasty + tasty-hunit text vector + ]; + description = "A configuration language guaranteed to terminate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dhall_1_12_0" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base + , base16-bytestring, bytestring, case-insensitive, containers + , contravariant, cryptonite, deepseq, directory, exceptions + , filepath, formatting, haskeline, http-client, http-client-tls + , insert-ordered-containers, lens-family-core, memory, mtl + , optparse-generic, parsers, prettyprinter + , prettyprinter-ansi-terminal, repline, scientific, tasty + , tasty-hunit, text, transformers, trifecta, unordered-containers + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.12.0"; + sha256 = "065cs20v5ps91mygvha5k5348n62vkhacqyv6fdl4m5b2hs0bkab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base base16-bytestring bytestring case-insensitive - charset containers contravariant cryptohash exceptions http-client - http-client-tls lens parsers prettyprinter system-fileio - system-filepath text text-format transformers trifecta + containers contravariant cryptonite directory exceptions filepath + formatting http-client http-client-tls insert-ordered-containers + lens-family-core memory parsers prettyprinter + prettyprinter-ansi-terminal scientific text transformers trifecta unordered-containers vector ]; executableHaskellDepends = [ - base optparse-generic prettyprinter system-filepath text trifecta + ansi-terminal base haskeline mtl optparse-generic prettyprinter + prettyprinter-ansi-terminal repline text trifecta ]; testHaskellDepends = [ - base containers tasty tasty-hunit text vector + base deepseq insert-ordered-containers prettyprinter tasty + tasty-hunit text vector ]; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-bash" = callPackage - ({ mkDerivation, base, bytestring, containers, dhall - , neat-interpolation, optparse-generic, shell-escape, text - , text-format, trifecta, vector + ({ mkDerivation, base, bytestring, containers, dhall, formatting + , insert-ordered-containers, neat-interpolation, optparse-generic + , shell-escape, text, trifecta }: mkDerivation { pname = "dhall-bash"; - version = "1.0.6"; - sha256 = "1wjwjpprvd90dpmxij5zj1gr5x41bvzmr4qwyfhxd2am6bzg5n5d"; + version = "1.0.11"; + sha256 = "17jgzb43ga8ddmxjp2mliv0zx6zpy0p7m5dihijpya66g7dkm91g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers dhall neat-interpolation shell-escape - text text-format vector + base bytestring containers dhall formatting + insert-ordered-containers neat-interpolation shell-escape text ]; executableHaskellDepends = [ base bytestring dhall optparse-generic text trifecta @@ -58171,41 +61616,57 @@ self: { "dhall-json" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall - , neat-interpolation, optparse-generic, text, trifecta, vector - , yaml + , optparse-generic, text, trifecta, unordered-containers, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.0.8"; - sha256 = "0icwbsx7a6m62klyghllvwj474f2kxghh40d7f5v01l135qrg8a1"; + version = "1.0.13"; + sha256 = "03spz9csxgamj970ha9l5swcpbkrvzbjy9w028c1kswzs806699s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base dhall neat-interpolation text vector + aeson base bytestring dhall text trifecta unordered-containers ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring dhall optparse-generic text - trifecta yaml + aeson aeson-pretty base bytestring dhall optparse-generic text yaml ]; description = "Compile Dhall to JSON or YAML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dhall-lex" = callPackage + ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq + , hspec, hspec-dirstream, scientific + }: + mkDerivation { + pname = "dhall-lex"; + version = "0.2.0.0"; + sha256 = "0yxffkmpkab7apvxj5i8a3x233smb5wps5j39h38d91v6kqf5yy2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring deepseq scientific + ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ base bytestring hspec hspec-dirstream ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Lexer for the Dhall language"; + license = stdenv.lib.licenses.bsd3; }) {}; "dhall-nix" = callPackage - ({ mkDerivation, base, containers, data-fix, dhall, hnix - , neat-interpolation, optparse-generic, text, text-format, trifecta - , vector + ({ mkDerivation, base, containers, data-fix, dhall, formatting + , hnix, insert-ordered-containers, neat-interpolation + , optparse-generic, scientific, text, trifecta }: mkDerivation { pname = "dhall-nix"; - version = "1.0.9"; - sha256 = "06njwk2mmn8virrzd7q1bw91rwagcczkjn21kjhbajn6gzl77dry"; + version = "1.1.2"; + sha256 = "0ssb2ncycx6ayislqggf3ljnvk5xzq65g63fj658jkpmv2vh2wyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-fix dhall hnix neat-interpolation text - text-format vector + base containers data-fix dhall formatting hnix + insert-ordered-containers neat-interpolation scientific text ]; executableHaskellDepends = [ base dhall hnix optparse-generic text trifecta @@ -58219,13 +61680,41 @@ self: { ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.4"; - sha256 = "1ba2sljiq016jhgx7ifh5vjrwxd1czv2gm56h2pig3p0x45ds2wm"; + version = "1.0.8"; + sha256 = "05h534bsggz4jysdc4n62l3a0asqr7ba9mpsminisc76f6k5y54d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dhall optparse-generic text ]; description = "Template text using Dhall"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "dhall-to-cabal" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, contravariant + , dhall, Diff, filepath, formatting, hashable + , insert-ordered-containers, optparse-applicative, prettyprinter + , tasty, tasty-golden, text, transformers, trifecta, vector + }: + mkDerivation { + pname = "dhall-to-cabal"; + version = "1.0.0.1"; + sha256 = "0qs00xhsk09azm7sqfihnwmapilmkybmcim1wzlw3h6y4jj6nmq9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers dhall formatting hashable + insert-ordered-containers text transformers trifecta vector + ]; + executableHaskellDepends = [ + base Cabal contravariant dhall hashable insert-ordered-containers + optparse-applicative prettyprinter text + ]; + testHaskellDepends = [ + base bytestring Cabal Diff filepath tasty tasty-golden text + ]; + homepage = "https://github.com/ocharles/dhall-to-cabal"; + description = "Compile Dhall expressions to Cabal files"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -58328,6 +61817,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "diagrams-braille" = callPackage + ({ mkDerivation, base, containers, diagrams-core, diagrams-lib + , diagrams-rasterific, filepath, hashable, JuicyPixels, lens, mtl + , optparse-applicative, Rasterific, time + }: + mkDerivation { + pname = "diagrams-braille"; + version = "0.1.0.1"; + sha256 = "11xq2mx4mmg12cyhs2r7brjn00jy7rh7rwh15gr7piynmx723xhl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers diagrams-core diagrams-lib diagrams-rasterific + filepath hashable JuicyPixels lens mtl optparse-applicative + Rasterific time + ]; + executableHaskellDepends = [ + base containers diagrams-core diagrams-lib diagrams-rasterific + filepath hashable JuicyPixels lens mtl optparse-applicative + Rasterific time + ]; + homepage = "https://github.com/mlang/diagrams-braille#readme"; + description = "Braille diagrams with plain text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-builder" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript @@ -58337,10 +61853,8 @@ self: { }: mkDerivation { pname = "diagrams-builder"; - version = "0.8.0.1"; - sha256 = "072vzskwp20qb768rv87876ngn6gnj959m91vpzri9ls9jx0x6vf"; - revision = "3"; - editedCabalFile = "00lpy8ch7zjc2z3ifwg8j1jfsrf4sg1fk9pngykl8bqb79hm5h3i"; + version = "0.8.0.2"; + sha256 = "1jr98sza6bhzq9myfb9f2p8lfbs9qcxck67h2hvxisgpvmy0gjn2"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -58357,6 +61871,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -58380,6 +61895,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-canvas" = callPackage @@ -58414,8 +61930,8 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.4.1"; - sha256 = "1apbgicaq7qaij42hwh5aiy67si2fjd0m4lah1hw4vz0cqfxxs2v"; + version = "1.4.2.1"; + sha256 = "1l7xz360chrqj9by6l5v0vwpvy81lniif600r3b6vf9ckyj747yz"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -58439,8 +61955,8 @@ self: { }: mkDerivation { pname = "diagrams-core"; - version = "1.4.0.1"; - sha256 = "0k951bi3b2n33lbjym87l0hcm8v2ww5w2cwfgdmjy8yl4gz1jyff"; + version = "1.4.1"; + sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -58448,6 +61964,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-graphviz" = callPackage @@ -58466,6 +61983,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Graph layout and drawing with GrahpViz and diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-gtk" = callPackage @@ -58474,12 +61992,15 @@ self: { pname = "diagrams-gtk"; version = "1.4"; sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn"; + revision = "1"; + editedCabalFile = "0afpcbgkc897gp0hpqi5frwbzln1qapf36p93v9zxl05my6nj04i"; libraryHaskellDepends = [ base cairo diagrams-cairo diagrams-lib gtk ]; homepage = "http://projects.haskell.org/diagrams/"; description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-haddock" = callPackage @@ -58511,6 +62032,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-hsqml" = callPackage @@ -58548,6 +62070,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-lib" = callPackage @@ -58562,10 +62085,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4.1.2"; - sha256 = "0w16cljv9jcvn46hd19qvw1bfvxijlak286nap9qbvyavq2qhvjb"; - revision = "3"; - editedCabalFile = "14ni87kwmjhbphcihiivvz0nxga355263q36wvbyvvjmxvbdj98n"; + version = "1.4.2.1"; + sha256 = "17vmjcshq6kdpy4qvwabrd7yp7is7zrs6lf3zn25l2ya8a3m0a17"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -58582,6 +62103,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-pandoc" = callPackage @@ -58647,6 +62169,7 @@ self: { homepage = "http://github.com/cchalmers/diagrams-pgf"; description = "PGF backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-postscript" = callPackage @@ -58668,6 +62191,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-qrcode" = callPackage @@ -58696,6 +62220,8 @@ self: { pname = "diagrams-rasterific"; version = "1.4"; sha256 = "190mc32fjjf3770fjp1bmbh3zc8l5bhqhqy30vv48l0pypfjrsns"; + revision = "1"; + editedCabalFile = "0y4hf13l9y4179vhdsak8zq69wyn3rgmwnz9wp0x4rj32gdjjp3j"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core @@ -58705,6 +62231,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-reflex" = callPackage @@ -58732,14 +62259,15 @@ self: { }: mkDerivation { pname = "diagrams-rubiks-cube"; - version = "0.2.0.1"; - sha256 = "14l5qc74hp9ngjh9ndz7ily1nhf5z0swv8brv5yp77a80dzlxxgq"; + version = "0.3.0.0"; + sha256 = "10j9zag6b5mlhhmd3j0p2vxpm26rhm74ihs8xjcwh77xkywbfi7z"; libraryHaskellDepends = [ adjunctions base data-default-class diagrams-lib distributive lens ]; homepage = "https://github.com/timjb/rubiks-cube"; description = "Library for drawing the Rubik's Cube"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-solve" = callPackage @@ -58750,6 +62278,8 @@ self: { pname = "diagrams-solve"; version = "0.1.1"; sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4"; + revision = "1"; + editedCabalFile = "1aabxq020ycmwynm96dvqh9xbvcsw7s4593kca35i4zl2kzg14bb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -58777,6 +62307,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-tikz" = callPackage @@ -58833,21 +62364,21 @@ self: { }) {}; "dib" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, digest - , directory, filepath, mtl, process, text, time + ({ mkDerivation, ansi-terminal, base, bytestring, cereal + , containers, digest, directory, filepath, mtl, process, text, time }: mkDerivation { pname = "dib"; - version = "0.6.1"; - sha256 = "0y7bkmmzqi9rgiq98m006gfjkr3q2wz2hpxx1dn9pyv896g1cr9l"; + version = "0.7.2"; + sha256 = "0r1hk45fdyhygmscnphl4n6dcs0rvgavhbg5si0aqsck4wsnql83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cereal containers digest directory filepath mtl - process text time + ansi-terminal base bytestring cereal containers digest directory + filepath mtl process text time ]; executableHaskellDepends = [ - base containers directory filepath mtl time + base containers directory filepath mtl process time ]; description = "A simple, forward build system"; license = stdenv.lib.licenses.mit; @@ -58897,6 +62428,7 @@ self: { executableHaskellDepends = [ base ]; description = "Convert a Diceware wordlist into a printer-ready LaTeX file"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dicom" = callPackage @@ -58922,8 +62454,8 @@ self: { }: mkDerivation { pname = "dictionaries"; - version = "0.2.0.3"; - sha256 = "0a8d20vfd5gcxrfhsa0530fnzb9fqh47qsjbyhf7pnh0f0p0qbi6"; + version = "0.2.0.4"; + sha256 = "1m581w0fmb9ggwqkyfgxjw6zxfkk6iapmh17sizsqkmg2vbw7qzx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59102,6 +62634,7 @@ self: { homepage = "https://github.com/jml/difftodo#readme"; description = "Generate todo lists from source code"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digamma" = callPackage @@ -59155,7 +62688,6 @@ self: { ]; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-foundation-lucid" = callPackage @@ -59182,8 +62714,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.8.2.0"; - sha256 = "0jkdn8hwpn01hn0ddsc5ary52r512hzvcyn6f422v0a0sikg49mg"; + version = "0.8.3.0"; + sha256 = "00nnhjd85fwav95k8f2pdsfk96rqmg7pc54zysqva3h2n5drhmp6"; libraryHaskellDepends = [ base bytestring containers mtl old-locale text time ]; @@ -59204,8 +62736,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.22"; - sha256 = "1gsvv8kgjjjq7nlpixq3gz6d1j90l83pmh2r3h18019369fcv3ip"; + version = "1.1.24"; + sha256 = "01zizzhq9abyka21600234wj8yy9crx4n8qywiry4gjmq7l8gzm5"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -59225,15 +62757,14 @@ self: { }: mkDerivation { pname = "digestive-functors-blaze"; - version = "0.6.1.0"; - sha256 = "03czax6c5ch3z99azf8a6zpfawvkzfwq2nxicx9kkz460di5irsb"; + version = "0.6.2.0"; + sha256 = "19019nmzg84mgdvhpkyrd4v9dsnd9yjn3cmgcj3aj7yx4z4m1c24"; libraryHaskellDepends = [ base blaze-html blaze-markup digestive-functors text ]; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Blaze frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-happstack" = callPackage @@ -59242,8 +62773,8 @@ self: { }: mkDerivation { pname = "digestive-functors-happstack"; - version = "0.6.1.1"; - sha256 = "0d613rxwja327fb2dm79xh55vhpa4mg8c1ch4xzrgw3jcchykag5"; + version = "0.6.1.2"; + sha256 = "18i4hb39rkgj2jz2ii697gayxi02dqpfbx5arv6zyjvmp1ydynvz"; libraryHaskellDepends = [ base bytestring digestive-functors happstack-server text ]; @@ -59258,8 +62789,8 @@ self: { }: mkDerivation { pname = "digestive-functors-heist"; - version = "0.8.7.0"; - sha256 = "13m7kz8mrc1a0il86xcqc4bfcipml2kynhpw01mjcz7cwxgcrlg6"; + version = "0.8.8.0"; + sha256 = "0i9aqabrlk4hj6l3dbc0fl1vwq6bpdwfgc03m2xl4lwlhj14j56w"; libraryHaskellDepends = [ base blaze-builder digestive-functors heist map-syntax mtl text xmlhtml @@ -59334,15 +62865,16 @@ self: { "digit" = callPackage ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, papa, parsec - , parsers, pretty, semigroupoids, semigroups, tasty, tasty-hedgehog - , tasty-hspec, tasty-hunit, template-haskell, text + , parsers, pretty, scientific, semigroupoids, semigroups, tasty + , tasty-hedgehog, tasty-hspec, tasty-hunit, template-haskell, text }: mkDerivation { pname = "digit"; - version = "0.5.1"; - sha256 = "141w8x7r4b3pkalqvgc71p9rdqsfg9nmhyijcg7vr5336qv52p2a"; + version = "0.5.2"; + sha256 = "18y3dln42avvzj8cxz7hkg6w106zhf64aywx23crywjhilcl5ha0"; libraryHaskellDepends = [ - base lens papa parsers semigroupoids semigroups template-haskell + base lens papa parsers scientific semigroupoids semigroups + template-haskell ]; testHaskellDepends = [ ansi-wl-pprint base hedgehog lens papa parsec parsers pretty tasty @@ -59403,17 +62935,20 @@ self: { }) {}; "dimensional" = callPackage - ({ mkDerivation, base, criterion, deepseq, exact-pi, HUnit - , numtype-dk, vector + ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob + , hspec, ieee754, numtype-dk, QuickCheck, semigroups + , template-haskell, vector }: mkDerivation { pname = "dimensional"; - version = "1.0.1.3"; - sha256 = "19wkm9jm6pjrrwqvafhs8zmfa9g06l5a03pcr8jm6497jajndi9v"; + version = "1.1"; + sha256 = "05jy0xs1nmxz7x3b589313hqk317838crhd974knm5k73jf8h99s"; libraryHaskellDepends = [ - base deepseq exact-pi numtype-dk vector + base deepseq exact-pi ieee754 numtype-dk semigroups vector + ]; + testHaskellDepends = [ + base doctest Glob hspec QuickCheck template-haskell ]; - testHaskellDepends = [ base HUnit ]; benchmarkHaskellDepends = [ base criterion deepseq ]; homepage = "https://github.com/bjornbm/dimensional/"; description = "Statically checked physical dimensions, using Type Families and Data Kinds"; @@ -59443,6 +62978,7 @@ self: { homepage = "http://dimensional.googlecode.com/"; description = "Statically checked physical dimensions, implemented using type families"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dimensions" = callPackage @@ -59456,7 +62992,6 @@ self: { homepage = "https://github.com/achirkin/easytensor#readme"; description = "Safe type-level dimensionality for multidimensional data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dingo-core" = callPackage @@ -59688,13 +63223,13 @@ self: { "direct-sqlite" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, directory - , HUnit, temporary, text + , HUnit, semigroups, temporary, text }: mkDerivation { pname = "direct-sqlite"; - version = "2.3.21"; - sha256 = "101pjvldzbvavjgpzwl0xnpqp0wy7bz1ryfx4sim3w00xj7csfys"; - libraryHaskellDepends = [ base bytestring text ]; + version = "2.3.23"; + sha256 = "0ywkah9gmjnx0zdlvinc2i898jsbdrw4ba315zkpijaaldp6znqz"; + libraryHaskellDepends = [ base bytestring semigroups text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text ]; @@ -59720,12 +63255,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_1_5" = callPackage + "directory_1_3_2_2" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.1.5"; - sha256 = "0zkqihmdfz7bzv3sxh1p9ijl4vra880kfy3qy9h96flq7d2if0f2"; + version = "1.3.2.2"; + sha256 = "0m4dhcz7d1y0y08hn8ny378ly67gqbx676srgardq6800w2iqhzj"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -59866,6 +63401,7 @@ self: { homepage = "https://github.com/jano017/Discord.hs"; description = "An API wrapper for Discord in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "discord-hs" = callPackage @@ -59920,6 +63456,7 @@ self: { homepage = "https://github.com/jano017/Discord.hs"; description = "Type information for discord-hs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "discordian-calendar" = callPackage @@ -59948,6 +63485,18 @@ self: { license = stdenv.lib.licenses.mit; }) {markdown = null;}; + "discrete-intervals" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "discrete-intervals"; + version = "0.0.3"; + sha256 = "1in70wlm6qcmc743v0w1lha4wffjinbwsgcyq44gzk0lb79ix6lb"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/chessai/discrete-intervals"; + description = "Discrete Intervals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "discrete-space-map" = callPackage ({ mkDerivation, adjunctions, base, comonad, distributive, keys , semigroupoids @@ -59989,18 +63538,22 @@ self: { }) {}; "disjoint-containers" = callPackage - ({ mkDerivation, base, containers, doctest, QuickCheck - , transformers + ({ mkDerivation, aeson, base, containers, doctest, QuickCheck + , quickcheck-classes, semigroups, transformers }: mkDerivation { pname = "disjoint-containers"; - version = "0.2.1"; - sha256 = "1082mx4af7h70hvnj0fxgimhnqbgn3ywkh53lm1hyhcfalnmyrs7"; - libraryHaskellDepends = [ base containers transformers ]; - testHaskellDepends = [ base containers doctest QuickCheck ]; + version = "0.2.3"; + sha256 = "0a6y1m0jq3lxj5vwgn4j4ij8xgkrkxb4nr7n3ba98sv8iaf1q8gw"; + libraryHaskellDepends = [ aeson base containers transformers ]; + testHaskellDepends = [ + aeson base containers doctest QuickCheck quickcheck-classes + semigroups + ]; homepage = "https://github.com/andrewthad/disjoint-containers#readme"; description = "Disjoint containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "disjoint-set" = callPackage @@ -60032,6 +63585,7 @@ self: { 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 @@ -60067,8 +63621,8 @@ self: { }: mkDerivation { pname = "diskhash"; - version = "0.0.3.2"; - sha256 = "0sfm7x9pqfbd6p894ivq212ckd7sj2sgdgsdjv5dip2pb95x3i78"; + version = "0.0.4.0"; + sha256 = "03kc5jc63726vk3airvwag69855rilanvjvqcqxi3ylvjg2p9dil"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring directory HUnit QuickCheck test-framework @@ -60076,16 +63630,16 @@ self: { ]; description = "Disk-based hash table"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "display" = callPackage - ({ mkDerivation, base, bytestring }: + ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "display"; - version = "0.0.0"; - sha256 = "1z5spl8l4n2x17szlyra2m1973ppgd9xqw851zgnmrvlp79gr0ls"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.0.1"; + sha256 = "0hn1zdis621h87r4mr35vic9473iwqcdjnmmfgs1j5dfsh62kd6b"; + libraryHaskellDepends = [ base bytestring text ]; homepage = "https://github.com/chrisdone/display#readme"; description = "Display things for humans to read"; license = stdenv.lib.licenses.bsd3; @@ -60127,6 +63681,7 @@ self: { doHaddock = false; description = "Generate/Upload cabal package to Hackage"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distance" = callPackage @@ -60154,7 +63709,6 @@ self: { homepage = "https://github.com/joshuaclayton/distance-of-time#readme"; description = "Generate readable distances between times"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-closure" = callPackage @@ -60163,8 +63717,8 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.3.4.0"; - sha256 = "1c7jf2czaaf24l22aw1j4yj9nksycvsvj708vzj9lb50zhdbpdgg"; + version = "0.4.0"; + sha256 = "1r2ymmnm0misz92x4iz58yqyb4maf3kq8blsvxmclc0d77hblsnm"; libraryHaskellDepends = [ base binary bytestring constraints syb template-haskell ]; @@ -60195,32 +63749,28 @@ self: { homepage = "http://haskell-distributed.github.com/"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-async" = callPackage ({ mkDerivation, ansi-terminal, base, binary, containers - , data-accessor, deepseq, distributed-process - , distributed-process-extras, distributed-process-systest - , exceptions, fingertree, hashable, HUnit, mtl, network - , network-transport, network-transport-tcp, rematch, stm - , test-framework, test-framework-hunit, time, transformers - , unordered-containers + , data-accessor, deepseq, distributed-process, exceptions + , fingertree, hashable, HUnit, mtl, network, network-transport + , network-transport-tcp, rematch, stm, test-framework + , test-framework-hunit, time, transformers, unordered-containers }: mkDerivation { pname = "distributed-process-async"; - version = "0.2.4"; - sha256 = "1v47cjc4w5li2gaz1k1q16r5vkwadw4rqbzz7s2zymzqw83skwgb"; + version = "0.2.4.1"; + sha256 = "1a8a6rpjwm4gp4735z3715y4g99sqdqlbhm0hhzss4d7fprbxqkq"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process - distributed-process-extras exceptions fingertree hashable mtl stm - time transformers unordered-containers + exceptions fingertree hashable mtl stm time transformers + unordered-containers ]; testHaskellDepends = [ - ansi-terminal base binary deepseq distributed-process - distributed-process-extras distributed-process-systest exceptions - HUnit network network-transport network-transport-tcp rematch stm - test-framework test-framework-hunit transformers + ansi-terminal base binary deepseq exceptions HUnit network + network-transport network-transport-tcp rematch stm test-framework + test-framework-hunit transformers ]; homepage = "http://github.com/haskell-distributed/distributed-process-async"; description = "Cloud Haskell Async API"; @@ -60296,7 +63846,6 @@ self: { ]; description = "Collect node stats for EKG"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-execution" = callPackage @@ -60413,8 +63962,8 @@ self: { }: mkDerivation { pname = "distributed-process-lifted"; - version = "0.3.0.0"; - sha256 = "1n0jic03x959rnkaavcywhz0zbqhaya53y0ydh13qs83a1y13m7i"; + version = "0.3.0.1"; + sha256 = "1074f1wblsmx89hkblds3npf2ha3p8ighdq0kjywb5522addbxrk"; libraryHaskellDepends = [ base deepseq distributed-process distributed-process-monad-control lifted-base monad-control mtl network-transport transformers @@ -60446,7 +63995,6 @@ self: { homepage = "http://haskell-distributed.github.io"; description = "Orphan instances for MonadBase and MonadBaseControl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-p2p" = callPackage @@ -60456,8 +64004,8 @@ self: { }: mkDerivation { pname = "distributed-process-p2p"; - version = "0.1.3.2"; - sha256 = "13m283cwlas0xzqxlrmnwmwimwy29hbvymavyqffd1b0k2m6ag31"; + version = "0.1.4.0"; + sha256 = "0wl5cnh2swymj3h4hrvkkfl7d5hrmxl1ayiyv9yjbr6gm72i11vj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60468,7 +64016,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/"; description = "Peer-to-peer node discovery for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-platform" = callPackage @@ -60558,7 +64105,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Simple zero-configuration backend for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-supervisor" = callPackage @@ -60676,7 +64222,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process/tree/master/distributed-process-tests"; description = "Tests and test support tools for distributed-process"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-zookeeper" = callPackage @@ -60697,7 +64242,6 @@ self: { base binary bytestring containers deepseq distributed-process hzk mtl network network-transport network-transport-tcp transformers ]; - executableHaskellDepends = [ base distributed-process ]; testHaskellDepends = [ base bytestring deepseq distributed-process distributed-process-monad-control enclosed-exceptions hspec hzk @@ -60742,21 +64286,21 @@ self: { "distribution-nixpkgs" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , deepseq, doctest, hspec, language-nix, lens, pretty, process - , split + , deepseq, hspec, language-nix, lens, pretty, process, split }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.1"; - sha256 = "15m881mrhpqg1xjdjz65ym8pajp1nijrcvb6dx3vv55430cjw1qx"; + version = "1.1.1"; + sha256 = "1694crd3l9cyc0c5xvqmx62154519g2cnpzc5qmlypwrk258bssm"; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens pretty process split ]; - testHaskellDepends = [ base deepseq doctest hspec lens ]; + testHaskellDepends = [ base deepseq hspec lens ]; homepage = "https://github.com/peti/distribution-nixpkgs#readme"; description = "Types and functions to manipulate the Nixpkgs distribution"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "distribution-plot" = callPackage @@ -60786,8 +64330,8 @@ self: { pname = "distributive"; version = "0.5.3"; sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; - revision = "1"; - editedCabalFile = "0hsq03i0qa0jvw7kaaqic40zvfkzhkd25dgvbdg6hjzylf1k1gax"; + revision = "5"; + editedCabalFile = "0hl43mbw87s5l7p1iqc7iwz5rnzdcmj6g33pmq6hv4s9fg96j8x7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers transformers-compat @@ -60819,6 +64363,7 @@ self: { homepage = "https://github.com/GregorySchwartz/diversity"; description = "Quantify the diversity of a population"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dixi" = callPackage @@ -60935,17 +64480,13 @@ self: { }) {}; "dlist" = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck - , quickcheck-instances - }: + ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; - version = "0.8.0.3"; - sha256 = "0brgai4vs7xz29p06kd6gzg5bpa8iy3k7yzgcc44izspd74q4rw7"; + version = "0.8.0.4"; + sha256 = "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc"; libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ - base Cabal QuickCheck quickcheck-instances - ]; + testHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/spl/dlist"; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; @@ -60972,6 +64513,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; + revision = "2"; + editedCabalFile = "1968b6i0azv0bi3x6cw85ga89md1dh1wdmly3ivvvyb6i9mgwrn6"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -61015,6 +64558,7 @@ self: { homepage = "https://github.com/m0rphism/haskell-dmenu"; description = "Complete bindings to the dmenu and dmenu2 command line tools"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dmenu-pkill" = callPackage @@ -61033,6 +64577,7 @@ self: { homepage = "https://github.com/m0rphism/haskell-dmenu-pkill"; description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dmenu-pmount" = callPackage @@ -61051,6 +64596,7 @@ self: { homepage = "https://github.com/m0rphism/haskell-dmenu-pmount"; description = "Mounting and unmounting linux devices as user with dmenu and pmount"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dmenu-search" = callPackage @@ -61069,25 +64615,26 @@ self: { homepage = "https://github.com/m0rphism/haskell-dmenu-search"; description = "dmenu script for searching the web with customizable search engines"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dns" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring - , bytestring-builder, conduit, conduit-extra, containers, doctest - , hspec, iproute, mtl, network, random, resourcet, safe, word8 + ({ mkDerivation, async, attoparsec, auto-update, base + , base64-bytestring, binary, bytestring, conduit, conduit-extra + , containers, cryptonite, doctest, hspec, iproute, mtl, network + , psqueues, QuickCheck, safe, time, word8 }: mkDerivation { pname = "dns"; - version = "2.0.13"; - sha256 = "0rrv49rvnpd1pf37imhm82ngy9z0vk80sz0zvikpccc0parbmvx0"; + version = "3.0.2"; + sha256 = "193j67jnhxkih3gbfzdx9cpzvqryk4kzc3yhl1yagdg16shrba7i"; libraryHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-extra containers - iproute mtl network random resourcet safe + async attoparsec auto-update base base64-bytestring binary + bytestring conduit conduit-extra containers cryptonite iproute mtl + network psqueues safe time ]; testHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 + base bytestring doctest hspec iproute QuickCheck word8 ]; testTarget = "spec"; description = "DNS library in Haskell"; @@ -61230,23 +64777,23 @@ self: { , lens-aeson, monad-control, mtl, network, process, QuickCheck , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck , temporary, text, time, tls, transformers, transformers-base - , unordered-containers, uuid, vector, x509, x509-store, x509-system - , zlib + , unliftio-core, unordered-containers, uuid, vector, x509 + , x509-store, x509-system, zlib }: mkDerivation { pname = "docker"; - version = "0.4.1.1"; - sha256 = "103j8hcabfwrzjmjzxw3ks7b90nnanznck941v956q1h3240npka"; + version = "0.5.1.1"; + sha256 = "09lska2v4fngbp4pbxxwshcdz6g4sbsyx8apm95hs3hxfpd0j74a"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions filemanip filepath http-client http-conduit http-types monad-control mtl network resourcet scientific tar temporary text - time tls transformers transformers-base unordered-containers uuid - vector x509 x509-store x509-system zlib + time tls transformers transformers-base unliftio-core + unordered-containers uuid vector x509 x509-store x509-system zlib ]; testHaskellDepends = [ - aeson base bytestring connection containers http-client + aeson base bytestring connection containers directory http-client http-client-tls http-types lens lens-aeson process QuickCheck tasty tasty-hunit tasty-quickcheck text transformers unordered-containers vector @@ -61254,25 +64801,43 @@ self: { homepage = "https://github.com/denibertovic/docker-hs"; description = "An API client for docker written in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "docker-build-cacher" = callPackage - ({ mkDerivation, base, containers, foldl, language-dockerfile + ({ mkDerivation, base, containers, foldl, language-docker , system-filepath, text, turtle }: mkDerivation { pname = "docker-build-cacher"; - version = "1.7.1"; - sha256 = "0b10irbr75y0hl9mzpp6ws72gk3vqzpy5axdqa7f45zaxam8iim9"; + version = "1.9.2"; + sha256 = "11k91vvdisnh031w9l5r650ibngjd3fgylkcllp01wz1s67w78v7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base containers foldl language-dockerfile system-filepath text - turtle + base containers foldl language-docker system-filepath text turtle + ]; + homepage = "https://github.com/seatgeek/docker-build-cacher#readme"; + description = "Builds a services with docker and caches all of its intermediate stages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "docker-build-cacher_1_9_3" = callPackage + ({ mkDerivation, base, containers, foldl, language-docker + , system-filepath, text, turtle + }: + mkDerivation { + pname = "docker-build-cacher"; + version = "1.9.3"; + sha256 = "12x91w3wq0hndssz48xka0cb7ajmlrvdv2ysc0pv333smkmclsw1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers foldl language-docker system-filepath text turtle ]; + homepage = "https://github.com/seatgeek/docker-build-cacher#readme"; description = "Builds a services with docker and caches all of its intermediate stages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dockercook" = callPackage @@ -61364,28 +64929,8 @@ self: { }: mkDerivation { pname = "doctemplates"; - version = "0.1.0.2"; - sha256 = "0swal6rjya1293mwvl63jch5fx9ghpsil7qs4v7rpansa0izalmp"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers parsec - scientific text unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec text ]; - homepage = "https://github.com/jgm/doctemplates#readme"; - description = "Pandoc-style document templates"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "doctemplates_0_2_1" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, hspec, parsec, scientific, text, unordered-containers - , vector - }: - mkDerivation { - pname = "doctemplates"; - version = "0.2.1"; - sha256 = "1bfs2kl5j5al2w2y4qpbn68p0xsnb65r7h51l356kpkzc326646p"; + version = "0.2.2.1"; + sha256 = "1gyckfg3kgvzhxw14i7iwrw0crygvsp86sy53bbr1yn7bxbgn33b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers parsec @@ -61395,7 +64940,6 @@ self: { homepage = "https://github.com/jgm/doctemplates#readme"; description = "Pandoc-style document templates"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest" = callPackage @@ -61406,8 +64950,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.11.4"; - sha256 = "09a170wr13p2c0w085d7qbf2blrvj1qmg92j61xqi17rwdwkvyjs"; + version = "0.13.0"; + sha256 = "08g3nmpqbnbkxc95d65hkhfabwax10qrq51vlynr342npn40mn2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61425,7 +64969,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "doctest_0_13_0" = callPackage + "doctest_0_15_0" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -61433,15 +64977,18 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.13.0"; - sha256 = "08g3nmpqbnbkxc95d65hkhfabwax10qrq51vlynr342npn40mn2b"; + version = "0.15.0"; + sha256 = "13c1l8cc8rzbxgpnaa75x13z9vnr7kffng18czh8gwpv83vn5bpi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat code-page deepseq directory filepath ghc ghc-paths process syb transformers ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers + ]; testHaskellDepends = [ base base-compat code-page deepseq directory filepath ghc ghc-paths hspec HUnit mockery process QuickCheck setenv silently @@ -61474,6 +65021,31 @@ self: { homepage = "http://github.com/karun012/doctest-discover"; description = "Easy way to run doctests via cabal"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "doctest-discover_0_1_0_9" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, doctest + , filepath + }: + mkDerivation { + pname = "doctest-discover"; + version = "0.1.0.9"; + sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring directory doctest filepath + ]; + executableHaskellDepends = [ + aeson base bytestring directory doctest filepath + ]; + testHaskellDepends = [ base doctest ]; + doHaddock = false; + homepage = "http://github.com/karun012/doctest-discover"; + description = "Easy way to run doctests via cabal"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover-configurator" = callPackage @@ -61506,17 +65078,15 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.1.0.1"; - sha256 = "0drv2zp8mr4sisd27y0bcjamip8vs26a09k65x6zm5ric4psmhqs"; - revision = "1"; - editedCabalFile = "0005s8byp2ww8y2xnmxvdh24fw5qwly4f6sbmzwbs0yi10zsbfkg"; + version = "0.2.0.2"; + sha256 = "0yil9va8l4q1wp6zz6w699103ym54fw03vsigzj12iql6y06cxxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base doctest ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/Hexirp/doctest-driver-gen#readme"; - description = "Generate doctest-driver.hs"; + description = "Generate driver file for doctest's cabal integration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -61636,6 +65206,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dom-parser_3_1_0" = callPackage + ({ mkDerivation, base, case-insensitive, containers, data-default + , hspec, lens, mtl, scientific, semigroups, shakespeare, text + , transformers, xml-conduit, xml-lens + }: + mkDerivation { + pname = "dom-parser"; + version = "3.1.0"; + sha256 = "1hra4sh34dr1gv4z55dg3f8s2g9l2qb7nlb0j4w0imr71fp5rqfp"; + libraryHaskellDepends = [ + base case-insensitive containers lens mtl scientific semigroups + text transformers xml-conduit xml-lens + ]; + testHaskellDepends = [ + base data-default hspec lens semigroups shakespeare text + xml-conduit + ]; + homepage = "https://github.com/typeable/dom-parser"; + description = "Simple monadic DOM parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dom-selector" = callPackage ({ mkDerivation, base, blaze-html, containers, html-conduit, parsec , QuickCheck, template-haskell, text, th-lift, xml-conduit @@ -61765,54 +65358,28 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, exceptions, hspec - , hspec-megaparsec, megaparsec, optparse-applicative, process, text - , transformers - }: - mkDerivation { - pname = "dotenv"; - version = "0.3.4.0"; - sha256 = "0rbz73wfsw89pc4l06xqk3x9m5r43r0w1swbmnciwy238v9w7bz8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat exceptions megaparsec text transformers - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers - ]; - testHaskellDepends = [ - base base-compat exceptions hspec hspec-megaparsec megaparsec text - transformers - ]; - homepage = "https://github.com/stackbuilders/dotenv-hs"; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dotenv_0_5_1_1" = callPackage - ({ mkDerivation, base, base-compat, exceptions, hspec + ({ mkDerivation, base, base-compat, directory, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text - , transformers + , transformers, yaml }: mkDerivation { pname = "dotenv"; - version = "0.5.1.1"; - sha256 = "1i4892xc2d05qnswcyf40ww5idjd1m3wwqz9wxwhph1jqzvsgc9b"; + version = "0.5.2.4"; + sha256 = "13c6b01gkkykg1sl1dk1374nbayg523w4fiy2bg494bj5ia516di"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base base-compat exceptions megaparsec process text transformers + base base-compat directory exceptions megaparsec process text + transformers yaml ]; executableHaskellDepends = [ base base-compat megaparsec optparse-applicative process text - transformers + transformers yaml ]; testHaskellDepends = [ - base base-compat exceptions hspec hspec-megaparsec megaparsec - process text transformers + base base-compat directory exceptions hspec hspec-megaparsec + megaparsec process text transformers yaml ]; homepage = "https://github.com/stackbuilders/dotenv-hs"; description = "Loads environment variables from dotenv files"; @@ -61862,7 +65429,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/ku-fpg/dotgen"; description = "A simple interface for building .dot graph files."; license = stdenv.lib.licenses.bsd3; @@ -61937,6 +65503,7 @@ self: { homepage = "https://github.com/doublifyapis/toolkit-haskell"; description = "Doublify API toolkit for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dove" = callPackage @@ -61966,21 +65533,19 @@ self: { ]; description = "Dungeons of Wor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "download" = callPackage ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: mkDerivation { pname = "download"; - version = "0.3.2.5"; - sha256 = "1h4rvmjlh1yjmy034x5nhnplqkkrlxa652c1fbzw8zpywhmdkrls"; + version = "0.3.2.6"; + sha256 = "1wpf8kxq924482p7bm5l24nhmvrr75sjqinfjkj6x2x55hd40vd0"; libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/psibi/download"; description = "High-level file download based on URLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "download-curl" = callPackage @@ -62333,14 +65898,16 @@ self: { "drifter-postgresql" = callPackage ({ mkDerivation, base, containers, drifter, either, mtl - , postgresql-simple, tasty, tasty-hunit, text, time + , postgresql-simple, tasty, tasty-hunit, text, time, transformers + , transformers-compat }: mkDerivation { pname = "drifter-postgresql"; - version = "0.1.0"; - sha256 = "0983p5l90kx723h0zaq9spqk4rpc2vxzja4sji3zj8vck04q7pqh"; + version = "0.2.1"; + sha256 = "0p7ddvfmjhf22psga0phhw2m0sdhymsc5k13jrwrdawsxivh2clk"; libraryHaskellDepends = [ - base containers drifter either mtl postgresql-simple time + base containers drifter mtl postgresql-simple time transformers + transformers-compat ]; testHaskellDepends = [ base drifter either postgresql-simple tasty tasty-hunit text @@ -62351,6 +65918,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "drinkery" = callPackage + ({ mkDerivation, base, conduit, conduit-combinators, exceptions + , gauge, list-t, ListT, machines, mtl, pipes, transformers + }: + mkDerivation { + pname = "drinkery"; + version = "0.3"; + sha256 = "10iiffxnmc5hgsa4c5m59zxbz80b3cpddv6293jiw2vxpfq2f7w4"; + libraryHaskellDepends = [ base exceptions mtl transformers ]; + benchmarkHaskellDepends = [ + base conduit conduit-combinators exceptions gauge list-t ListT + machines mtl pipes transformers + ]; + homepage = "https://github.com/fumieval/drinkery#readme"; + description = "Boozy streaming library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "drmaa" = callPackage ({ mkDerivation, base, directory, drmaa, inline-c }: mkDerivation { @@ -62534,15 +66119,15 @@ self: { }) {}; "dsp" = callPackage - ({ mkDerivation, array, base, random }: + ({ mkDerivation, array, base, containers, QuickCheck, random }: mkDerivation { pname = "dsp"; - version = "0.2.3.1"; - sha256 = "18nxj4qw92rm1fx3a69w786pf6i5a11d1zhvgx50pi57y2dirhnm"; + version = "0.2.4"; + sha256 = "0bwvb2axzv19lmv61ifvpmp3kpyzn62vi87agkyyjaip3psxzr7y"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ array base random ]; - executableHaskellDepends = [ array base ]; + libraryHaskellDepends = [ array base containers random ]; + testHaskellDepends = [ array base containers QuickCheck ]; homepage = "http://www.haskell.org/haskellwiki/DSP"; description = "Haskell Digital Signal Processing"; license = "GPL"; @@ -62664,14 +66249,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dual" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dual"; + version = "0.1.0.0"; + sha256 = "02abbnynjxhr2dvqqph3mnzc24v9wc655qkhh70flc168dk0k6hr"; + libraryHaskellDepends = [ base ]; + description = "Dual category"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dual-game" = callPackage + ({ mkDerivation, base, bifunctors, cereal, gloss, network + , websockets + }: + mkDerivation { + pname = "dual-game"; + version = "0.1.0.1"; + sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bifunctors cereal gloss network websockets + ]; + homepage = "https://github.com/fgaz/dual"; + description = "Network multiplayer 2D shooting game"; + license = stdenv.lib.licenses.mit; + }) {}; + "dual-tree" = callPackage ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck , semigroups, testing-feat }: mkDerivation { pname = "dual-tree"; - version = "0.2.1"; - sha256 = "06azc2lwli9aw81a23g82yxiann2qjc3bk7cdyh9kiwimdyj8r94"; + version = "0.2.1.1"; + sha256 = "1wzv6rrhz2kz0v1wirgs28fdlr0r4nwxlix9xda4fphzpp922gzr"; libraryHaskellDepends = [ base monoid-extras newtype-generics semigroups ]; @@ -62684,23 +66299,22 @@ self: { "dublincore-xml-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , data-default, hlint, QuickCheck, quickcheck-instances, resourcet + , data-default, QuickCheck, quickcheck-instances, resourcet , safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text, time , timerep, uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "dublincore-xml-conduit"; - version = "0.1.0.1"; - sha256 = "1irrn82jk0l026l98pajvbbhsgxh6lybjxggyipxijibg7fbkx08"; + version = "0.1.0.2"; + sha256 = "17jzyj49j88xwsz54higi81a6v8kvb8i338n5416z1ni475qsynl"; libraryHaskellDepends = [ base conduit conduit-combinators safe-exceptions text time timerep uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - base bytestring conduit conduit-combinators data-default hlint - QuickCheck quickcheck-instances resourcet safe-exceptions tasty - tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit - xml-types + base bytestring conduit conduit-combinators data-default QuickCheck + quickcheck-instances resourcet safe-exceptions tasty tasty-hunit + tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; homepage = "https://github.com/k0ral/dublincore-xml-conduit"; description = "XML streaming parser/renderer for the Dublin Core standard elements"; @@ -62717,8 +66331,8 @@ self: { }: mkDerivation { pname = "duckling"; - version = "0.1.3.0"; - sha256 = "1nk9rdfd4kcim5i9p891cic562g2wda0l6d1xvkkl4hh4b8bym7k"; + version = "0.1.4.0"; + sha256 = "0m5f71z9rqfvvqxpsvbpr258rgirphgdyfvzb1wv20zdhfi67lzh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62746,8 +66360,8 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.1.1.1"; - sha256 = "0pimlspgrfv04hwz91krbcq0g01fhrp9vgi2sj1kc7wz9hcd1pva"; + version = "0.1.2.0"; + sha256 = "03zyv1p69lhxg3z86rlyywzh305kpld3a79kr6c5swsm3pw8mnh5"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers @@ -62756,7 +66370,6 @@ self: { homepage = "https://github.com/leftaroundabout/dumb-cas"; description = "A computer “algebra” system that knows nothing about algebra, at the core"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dump" = callPackage @@ -62798,12 +66411,15 @@ self: { }) {}; "dunai" = callPackage - ({ mkDerivation, base, transformers, transformers-base }: + ({ mkDerivation, base, MonadRandom, transformers, transformers-base + }: mkDerivation { pname = "dunai"; - version = "0.3.0.0"; - sha256 = "0ncznc3khbanqsq4ab0n246sx30slq13awclafln5bjxvi1cx3yl"; - libraryHaskellDepends = [ base transformers transformers-base ]; + version = "0.4.0.0"; + sha256 = "05xqhbz0x7wzfka4wl2wvfhzr242nx4ci4r3zvm89mcyxn9q7x6n"; + libraryHaskellDepends = [ + base MonadRandom transformers transformers-base + ]; homepage = "https://github.com/ivanperez-keera/dunai"; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; @@ -62944,15 +66560,15 @@ self: { }) {}; "dwarf-el" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, transformers - , utf8-string + ({ mkDerivation, base, binary, bytestring, containers, text + , text-show, transformers }: mkDerivation { pname = "dwarf-el"; - version = "0.2.1.1"; - sha256 = "18ba03v1m7xbsgygjgfrzr9c7fah21lr3300mhvqipicdgrb691w"; + version = "0.3"; + sha256 = "177y84zgl215jivbxifn09w8mdv0k65bxyky0l1hadd64hgp2nq7"; libraryHaskellDepends = [ - base binary bytestring containers transformers utf8-string + base binary bytestring containers text text-show transformers ]; description = "Parser for DWARF debug format"; license = stdenv.lib.licenses.bsd3; @@ -62960,17 +66576,17 @@ self: { "dwarfadt" = callPackage ({ mkDerivation, base, bytestring, bytestring-mmap, containers - , dwarf-el, elf, lens, pretty, transformers + , dwarf-el, elf, lens, pretty, text, text-show, transformers }: mkDerivation { pname = "dwarfadt"; - version = "0.4"; - sha256 = "15mzv6sa2qf0g9skwq4ij35l3lqbc4x3fzwj5hkx93f8pz2bj1hi"; + version = "0.6"; + sha256 = "1fzkigzrm6s9060vmxsgw4bwzpfvcxc510ghb1rkqh5gslqszcb0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring bytestring-mmap containers dwarf-el elf lens pretty - transformers + text text-show transformers ]; executableHaskellDepends = [ base containers dwarf-el ]; description = "High-level wrapper around the dwarf library"; @@ -63070,17 +66686,16 @@ self: { }) {}; "dynamic-graph" = callPackage - ({ mkDerivation, base, cairo, colour, either, GLFW-b, GLUtil - , OpenGL, pango, pipes, transformers + ({ mkDerivation, base, cairo, colour, GLFW-b, GLUtil, OpenGL, pango + , pipes, transformers }: mkDerivation { pname = "dynamic-graph"; - version = "0.1.0.9"; - sha256 = "0paa9y5h0pp4b44kq5yn8m43nir4wg9hgfmns2d76r8qjry617qp"; + version = "0.1.0.12"; + sha256 = "1jygkj2jryjxlkyf0104abhkhjmfdvjaaa4zcyz7kgpny342fhiy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base cairo colour either GLFW-b GLUtil OpenGL pango pipes - transformers + base cairo colour GLFW-b GLUtil OpenGL pango pipes transformers ]; homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; @@ -63197,21 +66812,6 @@ self: { }) {}; "dynamic-state" = callPackage - ({ mkDerivation, base, binary, bytestring, hashable - , unordered-containers - }: - mkDerivation { - pname = "dynamic-state"; - version = "0.2.2.0"; - sha256 = "1ky739y1mqkw7lrs0l2cb9156v46k065srwd9dv19rihh6h4z0s8"; - libraryHaskellDepends = [ - base binary bytestring hashable unordered-containers - ]; - description = "Optionally serializable dynamic state keyed by type"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "dynamic-state_0_3" = callPackage ({ mkDerivation, base, binary, bytestring, hashable , unordered-containers }: @@ -63224,7 +66824,6 @@ self: { ]; description = "Optionally serializable dynamic state keyed by type"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamodb-simple" = callPackage @@ -63233,17 +66832,18 @@ self: { , exceptions, generics-sop, hashable, hspec, lens, monad-loops , monad-supply, safe-exceptions, scientific, semigroups, tagged , template-haskell, text, transformers, unordered-containers - , vector + , uuid-types, vector }: mkDerivation { pname = "dynamodb-simple"; - version = "0.4.0.0"; - sha256 = "0yfa2vy82ksbv2mha10yzrzppa24m8a847w2s6arm4nh34dkd832"; + version = "0.5.0.0"; + sha256 = "12jkl425nzgds8zszhk41ns4mg3rn9mjfmd853b88x6dn9wk95g7"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb base bytestring conduit containers double-conversion exceptions generics-sop hashable lens monad-loops monad-supply scientific semigroups tagged - template-haskell text transformers unordered-containers vector + template-haskell text transformers unordered-containers uuid-types + vector ]; testHaskellDepends = [ amazonka amazonka-dynamodb base conduit containers hashable hspec @@ -63257,15 +66857,13 @@ self: { }) {}; "dynobud" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, casadi-bindings - , casadi-bindings-core, cereal, Chart, Chart-gtk, cmdargs, colour - , containers, data-default-class, directory, distributive, doctest - , generic-accessors, hmatrix, hmatrix-gsl, HUnit, jacobi-roots - , lens, linear, mtl, mwc-random, not-gloss, Plot-ho-matic, process - , QuickCheck, reflection, semigroups, spatial-math, stm + ({ mkDerivation, aeson, base, binary, casadi-bindings + , casadi-bindings-core, cereal, containers, data-default-class + , directory, distributive, doctest, generic-accessors, hmatrix + , hmatrix-gsl, HUnit, jacobi-roots, lens, linear, mtl, mwc-random + , Plot-ho-matic, process, QuickCheck, reflection, spatial-math , test-framework, test-framework-hunit, test-framework-quickcheck2 - , time, unordered-containers, vector, vector-binary-instances - , zeromq4-haskell + , time, vector, vector-binary-instances }: mkDerivation { pname = "dynobud"; @@ -63280,12 +66878,6 @@ self: { mwc-random Plot-ho-matic process reflection spatial-math time vector vector-binary-instances ]; - executableHaskellDepends = [ - base bytestring casadi-bindings casadi-bindings-core cereal Chart - Chart-gtk cmdargs colour containers data-default-class - generic-accessors lens linear mtl not-gloss Plot-ho-matic - semigroups stm time unordered-containers vector zeromq4-haskell - ]; testHaskellDepends = [ base binary casadi-bindings cereal containers doctest hmatrix hmatrix-gsl HUnit linear QuickCheck test-framework @@ -63406,6 +66998,7 @@ self: { libraryHaskellDepends = [ base data-default ]; description = "Robert Penner's easing equations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "easy-api" = callPackage @@ -63486,18 +67079,15 @@ self: { }) {}; "easyrender" = callPackage - ({ mkDerivation, base, bytestring, containers, mtl, superdoc, zlib + ({ mkDerivation, base, bytestring, Cabal, containers, mtl, superdoc + , zlib }: mkDerivation { pname = "easyrender"; - version = "0.1.1.2"; - sha256 = "05m65ap055kayi9jj6c0z6csh0kq9pzk889q4zyrmgh504qmyg9h"; - revision = "1"; - editedCabalFile = "0gpx9gx2swmvkgddsnqncyy80gqjvnl9hwkqzmv72gc0dswkkki6"; - setupHaskellDepends = [ base superdoc ]; - libraryHaskellDepends = [ - base bytestring containers mtl superdoc zlib - ]; + version = "0.1.1.3"; + sha256 = "105s3d5yz7qz9cv5jq005kzd7jfdn2fccnc4s1xgkszk46y83qbx"; + setupHaskellDepends = [ base Cabal superdoc ]; + libraryHaskellDepends = [ base bytestring containers mtl zlib ]; homepage = "http://www.mathstat.dal.ca/~selinger/easyrender/"; description = "User-friendly creation of EPS, PostScript, and PDF files"; license = stdenv.lib.licenses.gpl3; @@ -63518,7 +67108,23 @@ self: { homepage = "https://github.com/achirkin/easytensor#readme"; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "easytest" = callPackage + ({ mkDerivation, async, base, call-stack, containers, mtl, random + , stm, text, transformers + }: + mkDerivation { + pname = "easytest"; + version = "0.2"; + sha256 = "1sd9w5p6z9mmvxid6svmnh7h43r32mrcqilb8k7kiy36ln3n8j0b"; + libraryHaskellDepends = [ + async base call-stack containers mtl random stm text transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/joelburget/easytest"; + description = "Simple, expressive testing library"; + license = stdenv.lib.licenses.mit; }) {}; "ebeats" = callPackage @@ -63637,7 +67243,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/RyanGlScott/echo"; description = "A cross-platform, cross-console way to handle echoing terminal input"; license = stdenv.lib.licenses.bsd3; @@ -63663,6 +67268,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ecstasy" = callPackage + ({ mkDerivation, base, containers, mtl, transformers }: + mkDerivation { + pname = "ecstasy"; + version = "0.1.1.0"; + sha256 = "06j5fpgrcf8nwwvs52gwdd55g7pxxv3ygsz5g08g8ap7wl2i9mby"; + libraryHaskellDepends = [ base containers mtl transformers ]; + homepage = "http://github.com/isovector/ecstasy/"; + description = "A GHC.Generics based entity component system."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ecu" = callPackage ({ mkDerivation, base, bytestring, canlib, digest, directory , process, vcd @@ -63757,6 +67374,7 @@ self: { homepage = "http://github.com/brendanhay/ede"; description = "Templating language with similar syntax and features to Liquid or Jinja2"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "edenmodules" = callPackage @@ -63986,18 +67604,18 @@ self: { homepage = "https://github.com/edofic/effect-handlers"; description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "effect-monad" = callPackage ({ mkDerivation, base, type-level-sets }: mkDerivation { pname = "effect-monad"; - version = "0.7.0.0"; - sha256 = "05jlh86hfxawkbckvw2f2xj8yc36w2hr1w3l6q75359mwa7bp7fy"; + version = "0.8.1.0"; + sha256 = "0lrx586ij1c09hv1rj14l2xi3papzdg8496kas6czdld0kfj8kw1"; libraryHaskellDepends = [ base type-level-sets ]; - description = "Embeds effect systems into Haskell using graded monads"; + description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "effective-aspects" = callPackage @@ -64089,8 +67707,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.7.0"; - sha256 = "01k6ywf4ww302s92wdpbf54wdlrgs0f2a2b56g58gjn4icyp1b9x"; + version = "3.7.10"; + sha256 = "129g0xw951pkizs4rmbn5mhy1w0lhqw06hj2sr8sf7r2wnqmn0dy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -64138,8 +67756,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.6.2"; - sha256 = "1h520r3ans71crkmc50bar0hzqg7bs4wvgrrsc529jxa1nl23p5i"; + version = "3.7.9"; + sha256 = "04xy76737zp1vpnn1b76xd5z4d6hfxd4l707v8s1cd8vb18y3dc0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -64174,7 +67792,7 @@ self: { "ehs" = callPackage ({ mkDerivation, base, bytestring, haskell-src-meta, parsec - , template-haskell, text, time, transformers + , template-haskell, text, transformers }: mkDerivation { pname = "ehs"; @@ -64188,7 +67806,6 @@ self: { base bytestring haskell-src-meta parsec template-haskell text transformers ]; - executableHaskellDepends = [ base bytestring text time ]; homepage = "http://github.com/minpou/ehs/"; description = "Embedded haskell template using quasiquotes"; license = stdenv.lib.licenses.mit; @@ -64231,56 +67848,31 @@ self: { homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "either" = callPackage - ({ mkDerivation, base, bifunctors, exceptions, free, mmorph - , monad-control, MonadRandom, mtl, profunctors, semigroupoids - , semigroups, transformers, transformers-base - }: - mkDerivation { - pname = "either"; - version = "4.4.1.1"; - sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh"; - revision = "2"; - editedCabalFile = "1n7792mcrvfh31qrbj8mpnx372s03kz83mypj7l4fm5h6zi4a3hs"; - libraryHaskellDepends = [ - base bifunctors exceptions free mmorph monad-control MonadRandom - mtl profunctors semigroupoids semigroups transformers - transformers-base - ]; - homepage = "http://github.com/ekmett/either/"; - description = "An either monad transformer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "either_4_5" = callPackage - ({ mkDerivation, base, bifunctors, exceptions, free, mmorph - , monad-control, MonadRandom, mtl, profunctors, semigroupoids - , semigroups, transformers, transformers-base + ({ mkDerivation, base, bifunctors, hedgehog, mtl, profunctors + , semigroupoids, semigroups }: mkDerivation { pname = "either"; - version = "4.5"; - sha256 = "1mzj86pbplgs3h7a49j3rk22s5cbw06wmd992gdm6harm15hzyzc"; + version = "5"; + sha256 = "087lrgvyns9jfgi95rr2lliivxf7fsd4d0hzqzk80kx385vf5kkm"; libraryHaskellDepends = [ - base bifunctors exceptions free mmorph monad-control MonadRandom - mtl profunctors semigroupoids semigroups transformers - transformers-base + base bifunctors mtl profunctors semigroupoids semigroups ]; + testHaskellDepends = [ base hedgehog ]; homepage = "http://github.com/ekmett/either/"; - description = "An either monad transformer"; + description = "Combinators for working with sums"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "either-list-functions" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.0.1"; - sha256 = "1k5zpyii5wkzr1xzfbkl015sj91pghl93ifjs6shgyysyh6b62z5"; + version = "0.0.0.2"; + sha256 = "0m7fkf8r1i0z3zrfmnqsdzk0fc9mhanqmx7x6rjiisjiaf91yr8d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/chris-martin/either-list-functions#readme"; @@ -64318,10 +67910,10 @@ self: { }: mkDerivation { pname = "ekg"; - version = "0.4.0.14"; - sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd"; + version = "0.4.0.15"; + sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8"; revision = "1"; - editedCabalFile = "152b4w3qld6jmwir3a06h6sc1girahla8cc1y2g23bwv6nnhxapp"; + editedCabalFile = "05995gywwysmfhrvalvqnkvw7gh6z85jrb91a1knnvi0jwq4c6m3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -64339,8 +67931,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.10"; - sha256 = "18108haj2gpgbn3lbsgzb1ixbycijjns1h780hllsb3nbcmqv0gw"; + version = "1.0.12"; + sha256 = "1ashmmm5icv4q3808a5bg64cl4rmcjksm1hcf7ajgn3lggrkbxpq"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -64356,8 +67948,8 @@ self: { }: mkDerivation { pname = "ekg-carbon"; - version = "1.0.8"; - sha256 = "0n65c6yv43gckxlckl9bmmf0ags3pp055lvxpi5rbq1d95b29xqd"; + version = "1.0.9"; + sha256 = "00xdyrvwmd9jp59awh9i1yzbnywndzmjmz8qsn87hrcd2848fdnm"; libraryHaskellDepends = [ base ekg-core network network-carbon text time unordered-containers vector @@ -64383,6 +67975,7 @@ self: { homepage = "https://github.com/sellerlabs/ekg-cloudwatch#readme"; description = "An ekg backend for Amazon Cloudwatch"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-core" = callPackage @@ -64391,8 +67984,10 @@ self: { }: mkDerivation { pname = "ekg-core"; - version = "0.1.1.3"; - sha256 = "1qw9zd4q107c4jy7k8wq3jcyh488gnxxvgk97fm7c2xzyv8f4mmc"; + version = "0.1.1.4"; + sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36"; + revision = "1"; + editedCabalFile = "01hp42jjp1cg8z692xahbwlv4x521pdxhyd8d89fjdkvccf8gvnk"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; @@ -64417,19 +68012,21 @@ self: { homepage = "https://github.com/cdodev/ekg-elastic"; description = "Push metrics to elastic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-elasticsearch" = callPackage - ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname - , http-client, lens, text, time, unordered-containers, wreq + ({ mkDerivation, aeson, base, bytestring, data-default-class + , ekg-core, hostname, http-client, lens, req, text, time + , unordered-containers }: mkDerivation { pname = "ekg-elasticsearch"; - version = "0.3.1.1"; - sha256 = "0v78xrmnxx6z0lgx8lvc15hmd0zgm2kqibvkf9sj3cdza75vsr1q"; + version = "0.4.0.0"; + sha256 = "03bh278n6xvvjr9z8lws25nf1x0j5rw12zmd7h55vmfjn0iblajy"; libraryHaskellDepends = [ - aeson base bytestring ekg-core hostname http-client lens text time - unordered-containers wreq + aeson base bytestring data-default-class ekg-core hostname + http-client lens req text time unordered-containers ]; homepage = "https://github.com/cdodev/ekg-elasticsearch"; description = "Push metrics to elasticsearch"; @@ -64451,6 +68048,7 @@ self: { homepage = "https://github.com/angerman/ekg-influxdb"; description = "An EKG backend to send statistics to influxdb"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-json" = callPackage @@ -64460,6 +68058,8 @@ self: { pname = "ekg-json"; version = "0.1.0.6"; sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy"; + revision = "2"; + editedCabalFile = "02lx17l8dch793n83dgalv2r77nrlcj6k4xgpxaxzwr3nyprk2vj"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -64502,6 +68102,7 @@ self: { homepage = "https://github.com/adinapoli/ekg-prometheus-adapter#readme"; description = "Easily expose your EKG metrics to Prometheus"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-push" = callPackage @@ -64517,7 +68118,6 @@ self: { libraryHaskellDepends = [ base bytestring ekg-core text time unordered-containers ]; - executableHaskellDepends = [ base ekg-core ]; homepage = "https://github.com/adarqui/ekg-push"; description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library"; license = stdenv.lib.licenses.bsd3; @@ -64552,8 +68152,8 @@ self: { }: mkDerivation { pname = "ekg-statsd"; - version = "0.2.2.0"; - sha256 = "1z1si5zglmwq0qxhd4s8zmp8rps8z4xqnk4l8wlal79f1qkz9862"; + version = "0.2.3.0"; + sha256 = "05lakyb0sp6g8nziy6jzk2l19v2371cdnih6pp6myyj6iflx9smf"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -64569,8 +68169,8 @@ self: { }: mkDerivation { pname = "ekg-wai"; - version = "0.1.0.2"; - sha256 = "1ridcn930lf8gjj7lqdbhzzmz0i6r668bhid72anbq3v1h6fnhnw"; + version = "0.1.0.3"; + sha256 = "1sd2fz4l4slizm179x9cskqdvrpf6w4d779kah9hrnk3nqbmklxz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath http-types network @@ -64631,7 +68231,6 @@ self: { executableHaskellDepends = [ base elerea GLFW OpenGL ]; description = "Example applications for Elerea"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "elerea-sdl" = callPackage @@ -64644,7 +68243,6 @@ self: { homepage = "http://github.com/singpolyma/elerea-sdl"; description = "Elerea FRP wrapper for SDL"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "elevator" = callPackage @@ -64689,6 +68287,25 @@ self: { homepage = "https://github.com/RyanGlScott/eliminators"; description = "Dependently typed elimination functions using singletons"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "eliminators_0_4_1" = callPackage + ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats + , singletons, template-haskell, th-abstraction, th-desugar + }: + mkDerivation { + pname = "eliminators"; + version = "0.4.1"; + sha256 = "000x3gjwyf2s44ry16a2a9dk7cqjvl0dh21r5k85s19ljrxsxv1v"; + libraryHaskellDepends = [ + base extra singleton-nats singletons template-haskell + th-abstraction th-desugar + ]; + testHaskellDepends = [ base hspec singleton-nats singletons ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/RyanGlScott/eliminators"; + description = "Dependently typed elimination functions using singletons"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -64714,16 +68331,14 @@ self: { }: mkDerivation { pname = "elm-bridge"; - version = "0.4.1"; - sha256 = "1wp813l6bdw5x7vpiq098v1gbxzvv3129n2rl4div9mrj53a3i2l"; - revision = "1"; - editedCabalFile = "05kk6lsh10ligdgj4dw0iyhvv0blnrcvmk94hn27qq70bpv8xcqz"; + version = "0.4.3"; + sha256 = "154i3vwqw5qyam14x8dvpgffcgh2ljdl1hc9zw6xhiwb82vazy3z"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text ]; homepage = "https://github.com/agrafix/elm-bridge"; - description = "Derive Elm types and Json code from Haskell types"; + description = "Derive Elm types and Json code from Haskell types, using aeson's options"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64827,8 +68442,8 @@ self: { }: mkDerivation { pname = "elm-export-persistent"; - version = "0.1.2"; - sha256 = "17fyv33wv38lbfkx55wqhz1xls8as75ndfd14f10r2sknxafyidw"; + version = "0.2.0"; + sha256 = "09by77av5p18q89ryzid52zcr153mgx0zsksp5vg8ps6an5apirc"; libraryHaskellDepends = [ aeson base elm-export persistent scientific text unordered-containers @@ -65050,6 +68665,7 @@ self: { homepage = "http://github.com/rhyskeepence/elm-websocket"; description = "Generate ELM code from a Wai websocket application"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-yesod" = callPackage @@ -65082,20 +68698,20 @@ self: { }) {}; "elocrypt" = callPackage - ({ mkDerivation, base, MonadRandom, proctest, QuickCheck, random - , tasty, tasty-quickcheck, tasty-th + ({ mkDerivation, base, hlint, MonadRandom, proctest, QuickCheck + , random, tasty, tasty-quickcheck, tasty-th }: mkDerivation { pname = "elocrypt"; - version = "1.0.0"; - sha256 = "0kpwzrj9rlq27rifdmx7pd1ax6d13dm1qw2hckzxf2xqv0w3pv6c"; + version = "2.0.0"; + sha256 = "0dz5vdcg68fbwhvwz68zlsz5h2aaj1q6gacp1005hkxfb8156lp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base MonadRandom random ]; executableHaskellDepends = [ base random ]; testHaskellDepends = [ - base MonadRandom proctest QuickCheck random tasty tasty-quickcheck - tasty-th + base hlint MonadRandom proctest QuickCheck random tasty + tasty-quickcheck tasty-th ]; homepage = "https://www.github.com/sgillespie/elocrypt"; description = "Generate easy-to-remember, hard-to-guess passwords"; @@ -65207,8 +68823,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2"; - sha256 = "1h15z89qsp7b08nnjgs2rcwavfhfrkanvh7j8jp0rrx7xh0rz6lv"; + version = "2.3.2.5"; + sha256 = "0k2fczw7qk442b3k0qblypaad8bva06x5sai5zgp7h6ckvlg8kvv"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -65363,6 +68979,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "emoji" = callPackage + ({ mkDerivation, aeson, base, bytestring, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "emoji"; + version = "0.1.0.2"; + sha256 = "1307phy81cki9ijpsl8hfczxm5wi1lrmmvmyxxn9a109nz9aqfla"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring template-haskell text unordered-containers + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/nakaji-dayo/hs-emoji#readme"; + description = "emoji utility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "empty" = callPackage ({ mkDerivation }: mkDerivation { @@ -65479,6 +69114,7 @@ self: { homepage = "https://github.com/TerrorJack/encoding-io#readme"; description = "Encoding-aware file I/O"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "endo" = callPackage @@ -65499,23 +69135,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eng-stemmer" = callPackage + ({ mkDerivation, base, containers, doctest, mtl, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "eng-stemmer"; + version = "0.1.0.2"; + sha256 = "0fz7dwgmhlna906x6m5s5yrk6w5wswsj75irrkc2hrwxrq1f6mqw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers mtl text ]; + executableHaskellDepends = [ base containers text ]; + testHaskellDepends = [ + base containers doctest tasty tasty-hunit text + ]; + homepage = "https://github.com/ChrisCoffey/eng-stemmer"; + description = "An English language stemmer (Porter2)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "engine-io" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring - , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay + , bytestring, errors, free, monad-loops, mwc-random, stm, stm-delay , text, transformers, unordered-containers, vector, websockets }: mkDerivation { pname = "engine-io"; - version = "1.2.17"; - sha256 = "0m5nr1qk15p332dhmiyrpfdm91cf3al2nah6rja55y6gpc2vvvbv"; + version = "1.2.20"; + sha256 = "1kx16zpfbish8mcpr6j5s7c63w277kyhcykvcfq2xgh1npg4p0z7"; libraryHaskellDepends = [ - aeson async attoparsec base base64-bytestring bytestring either + aeson async attoparsec base base64-bytestring bytestring errors free monad-loops mwc-random stm stm-delay text transformers unordered-containers vector websockets ]; homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-growler" = callPackage @@ -65545,14 +69202,15 @@ self: { }: mkDerivation { pname = "engine-io-snap"; - version = "1.0.5"; - sha256 = "03pbdc2pbhrabnbnxcrwlby3z84p7fn9k4h1l3pbx6969m6qn7xa"; + version = "1.0.6"; + sha256 = "1lv9gzz61fcba2y0mqmcml1shk8qjxlw8c1fis4w7xs2xgrwbjbm"; libraryHaskellDepends = [ base bytestring containers engine-io io-streams lifted-base snap-core unordered-containers websockets websockets-snap ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-wai" = callPackage @@ -65562,15 +69220,17 @@ self: { }: mkDerivation { pname = "engine-io-wai"; - version = "1.0.6"; - sha256 = "0jhhvqcjgydwja16hvaif9ldjsvlhzm6r2q7yy4j1i2xiqx3xf4x"; + version = "1.0.8"; + sha256 = "0mph6pg3j81kwwl73dn5hdbw3mndfxi2wqdgwb727znh058xh7zb"; libraryHaskellDepends = [ attoparsec base bytestring either engine-io http-types mtl text transformers transformers-compat unordered-containers wai wai-websockets websockets ]; homepage = "http://github.com/ocharles/engine.io"; + description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-yesod" = callPackage @@ -65633,6 +69293,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "entropy_0_4_1_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , process, unix + }: + mkDerivation { + pname = "entropy"; + version = "0.4.1.1"; + sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf"; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ base bytestring unix ]; + homepage = "https://github.com/TomMD/entropy"; + description = "A platform independent entropy source"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "enumerable" = callPackage ({ mkDerivation, base, control-monad-omega, tagged }: mkDerivation { @@ -65784,12 +69460,12 @@ self: { }) {}; "enummapset" = callPackage - ({ mkDerivation, base, containers, deepseq }: + ({ mkDerivation, base, containers, deepseq, semigroups }: mkDerivation { pname = "enummapset"; - version = "0.5.2.1"; - sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg"; - libraryHaskellDepends = [ base containers deepseq ]; + version = "0.5.2.2"; + sha256 = "0x6fihrgvb2y6m0z2gi8n97b54aidydd8fnbmj02bq3x73gxnbvr"; + libraryHaskellDepends = [ base containers deepseq semigroups ]; homepage = "https://github.com/michalt/enummapset"; description = "IntMap and IntSet with Enum keys/elements"; license = stdenv.lib.licenses.bsd3; @@ -65810,12 +69486,15 @@ self: { }) {}; "enumset" = callPackage - ({ mkDerivation, base, data-accessor, storable-record }: + ({ mkDerivation, base, data-accessor, semigroups, storable-record + }: mkDerivation { pname = "enumset"; - version = "0.0.4"; - sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w"; - libraryHaskellDepends = [ base data-accessor storable-record ]; + version = "0.0.4.1"; + sha256 = "0m6ha4m9hvmzkgnwani3z3vgcllzgv6n578g56x4sb9bgxgi37az"; + libraryHaskellDepends = [ + base data-accessor semigroups storable-record + ]; description = "Sets of enumeration values represented by machine words"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -65886,8 +69565,8 @@ self: { }: mkDerivation { pname = "envy"; - version = "1.3.0.2"; - sha256 = "16w9d0cg2niy766kmnsfgy803s802dm6mr0n3sgwz2fhwy6sz82c"; + version = "1.5.0.0"; + sha256 = "1gqzfjgy58833vi9b5dlfwwzx7fj2548wb340xyh0q8cmsrrkh6d"; libraryHaskellDepends = [ base bytestring containers mtl text time transformers ]; @@ -65897,6 +69576,7 @@ self: { ]; description = "An environmentally friendly way to deal with environment variables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epanet-haskell" = callPackage @@ -65941,7 +69621,7 @@ self: { homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php"; description = "Compiler for a simple functional language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epoll" = callPackage @@ -66018,8 +69698,8 @@ self: { }: mkDerivation { pname = "epub-tools"; - version = "2.9"; - sha256 = "198fzgd04j1dyiv9cpkg6aqvawfiqb4k5awyqbiw6ll84sy0ymgb"; + version = "2.11"; + sha256 = "18k4aipaw6zlzhpxidl5b7q5hvy51sj030p7mw89flrgd8kd3g2p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66029,10 +69709,9 @@ self: { testHaskellDepends = [ base directory epub-metadata filepath HUnit mtl parsec regex-compat ]; - homepage = "http://hub.darcs.net/dino/epub-tools"; + homepage = "https://github.com/dino-/epub-tools.git"; description = "Command line utilities for working with epub files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + license = stdenv.lib.licenses.isc; }) {}; "epubname" = callPackage @@ -66057,8 +69736,8 @@ self: { ({ mkDerivation, base, semigroupoids }: mkDerivation { pname = "eq"; - version = "4.0.4"; - sha256 = "1rdxmkmlgyinpih5p708k18j7qq0rj1c8gv240naa9gbkqg4qbq4"; + version = "4.1"; + sha256 = "10k1xnvga7c6ijmkfq2qd4vc5i2lnkz4xjmba74g0xzhk6gkvp0n"; libraryHaskellDepends = [ base semigroupoids ]; homepage = "http://github.com/ekmett/eq/"; description = "Leibnizian equality"; @@ -66085,16 +69764,16 @@ self: { }) {}; "equational-reasoning" = callPackage - ({ mkDerivation, base, containers, singletons, template-haskell - , th-desugar, th-extras, void + ({ mkDerivation, base, containers, semigroups, singletons + , template-haskell, th-desugar, th-extras, void }: mkDerivation { pname = "equational-reasoning"; - version = "0.5.0.0"; - sha256 = "0qskw6dhnr6x7zpfaj246gyiml6w3196ci08i98cl8n2xkyn6n4c"; + version = "0.5.1.0"; + sha256 = "11203rdw4q9s5ramhmr2hdimgwin3zwjas8csxqxxldkv3x9a05l"; libraryHaskellDepends = [ - base containers singletons template-haskell th-desugar th-extras - void + base containers semigroups singletons template-haskell th-desugar + th-extras void ]; description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = stdenv.lib.licenses.bsd3; @@ -66258,6 +69937,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "error-context" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, katip + , monad-logger, mtl, resourcet, safe-exceptions, tasty, tasty-hunit + , text, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "error-context"; + version = "0.2.0.1"; + sha256 = "033z3niag5hf9dynjxdrg6v9s6f05hpndknfs7xlgkwrrgq3gmnb"; + libraryHaskellDepends = [ + aeson base bytestring exceptions katip monad-logger mtl resourcet + safe-exceptions text unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring exceptions katip monad-logger mtl resourcet + safe-exceptions tasty tasty-hunit text unliftio-core + unordered-containers + ]; + homepage = "https://github.com/mtesseract/error-context#readme"; + description = "Provides API for enriching errors with contexts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "error-continuations" = callPackage ({ mkDerivation, base, either, mtl, transformers }: mkDerivation { @@ -66336,7 +70039,6 @@ self: { homepage = "http://github.com/pmlodawski/error-util"; description = "Set of utils and operators for error handling"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "errorcall-eq-instance" = callPackage @@ -66357,8 +70059,8 @@ self: { }: mkDerivation { pname = "errors"; - version = "2.2.2"; - sha256 = "13sflhglcm5skwrxb48fw96skdcx7ydiy4zg22200733pxhjncpn"; + version = "2.2.5"; + sha256 = "0p3kpipixdcwhwjcwq8ks8iik78dsddglxrn929dfwsm1ibcl5z9"; libraryHaskellDepends = [ base exceptions safe text transformers transformers-compat unexceptionalio @@ -66367,6 +70069,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors-ext" = callPackage + ({ mkDerivation, base, errors, exceptions, HUnit, monad-control + , mtl, transformers + }: + mkDerivation { + pname = "errors-ext"; + version = "0.4.1"; + sha256 = "1xly8pgkbqkm4mb1zg9bga08gx5fj4nrmidzj5p8anqdksq7ib5h"; + libraryHaskellDepends = [ + base errors exceptions monad-control mtl transformers + ]; + testHaskellDepends = [ + base errors exceptions HUnit monad-control mtl transformers + ]; + homepage = "https://github.com/A1-Triard/errors-ext#readme"; + description = "`bracket`-like functions for `ExceptT` over `IO` monad"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ersaconcat" = callPackage ({ mkDerivation, base, directory, doctest, filepath, HTTP , network-uri, process, QuickCheck, tagsoup, template-haskell @@ -66389,28 +70110,31 @@ self: { homepage = "https://github.com/tonymorris/ersaconcat"; description = "A script to concatenate AIP ERSA"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ersatz" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, data-default, directory, doctest - , filepath, lens, mtl, parsec, process, temporary, transformers - , unordered-containers + , filepath, lens, mtl, parsec, process, semigroups, temporary + , transformers, unordered-containers }: mkDerivation { pname = "ersatz"; - version = "0.4.1"; - sha256 = "0na9i2jc5assjis12pfpi08ykf90b79ydsvv1lqsbgsbij9w2w91"; + version = "0.4.2"; + sha256 = "1rr46awz0rbzg0i6424rnrykcwkgwxfzgx5d5qmva4y41l62vkxf"; + revision = "1"; + editedCabalFile = "098i7593rlc81618y1cz6bmsp2y0vlimz8hnqlzja4m8mclfsbx2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array attoparsec base bytestring containers data-default lens mtl - process temporary transformers unordered-containers + process semigroups temporary transformers unordered-containers ]; executableHaskellDepends = [ - array base containers lens mtl parsec + array base containers lens mtl parsec semigroups ]; testHaskellDepends = [ array base directory doctest filepath mtl ]; homepage = "http://github.com/ekmett/ersatz"; @@ -66480,6 +70204,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "escoger" = callPackage + ({ mkDerivation, base, bytestring, criterion, HUnit, mtl + , test-framework, test-framework-hunit, unix, vector + , vector-algorithms, vty + }: + mkDerivation { + pname = "escoger"; + version = "0.1.0.0"; + sha256 = "0xcs1wg5d6dphnx255pcvvcszkpib0v8gy79w25grrrda5gyplvx"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring mtl unix vector vector-algorithms vty + ]; + executableHaskellDepends = [ base bytestring mtl unix vector vty ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion unix vector vty + ]; + doHaddock = false; + description = "Terminal fuzzy selector"; + license = stdenv.lib.licenses.mit; + }) {}; + "esotericbot" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , directory, fgl, mtl, network, stm, stream-fusion, tuple, unix @@ -66527,6 +70277,7 @@ self: { homepage = "https://github.com/bitemyapp/esqueleto"; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ess" = callPackage @@ -66593,26 +70344,22 @@ self: { }) {}; "etc" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , exceptions, hashable, protolude, tasty, tasty-hunit, tasty-rerun - , text, unordered-containers, vector + ({ mkDerivation, aeson, base, hashable, rio, tasty, tasty-hunit + , text, typed-process, unliftio }: mkDerivation { pname = "etc"; - version = "0.2.0.0"; - sha256 = "16l5ap8ag2l3ks6pjwr49wk4njgap44kbxsqb69yr9lr81wrj9fv"; + version = "0.3.1.0"; + sha256 = "0l938jhlx1jgb46b9ykdc741r0v7wkklrc1ga5v81r3b52civb1c"; enableSeparateDataOutput = true; 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 + aeson base hashable rio text typed-process unliftio ]; + testHaskellDepends = [ aeson base rio tasty tasty-hunit ]; 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 @@ -66631,6 +70378,7 @@ self: { testHaskellDepends = [ async base hspec MonadRandom mtl text ]; description = "Client for etcd, a highly-available key value store"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eternal" = callPackage @@ -66650,6 +70398,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eternity" = callPackage + ({ mkDerivation, attoparsec, base, cereal, directory, foldl, potoki + , potoki-cereal, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "eternity"; + version = "0.1.2"; + sha256 = "0rjjdhr9cnpgm55mjvhlkgdvqvi5dmmzrr4vj0jmn9pg7zra34y6"; + libraryHaskellDepends = [ + attoparsec base cereal directory foldl potoki potoki-cereal text + ]; + testHaskellDepends = [ + cereal directory potoki potoki-cereal QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/metrix-ai/eternity"; + description = "Native event-sourcing database"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "eternity-timestamped" = callPackage + ({ mkDerivation, attoparsec, base, cereal, directory, eternity + , generic-random, hashable, potoki, QuickCheck, text, time + , timestamp + }: + mkDerivation { + pname = "eternity-timestamped"; + version = "0.4"; + sha256 = "150xqf7kg4131qxnbjhly4ryy251gni1z6vyqcsy477hig2yv5gr"; + libraryHaskellDepends = [ + attoparsec base cereal directory eternity generic-random hashable + potoki QuickCheck text time timestamp + ]; + homepage = "https://github.com/metrix-ai/eternity-timestamped"; + description = "Automatic timestamping for Eternity"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ether" = callPackage ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim , lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged @@ -66660,6 +70449,8 @@ self: { pname = "ether"; version = "0.5.1.0"; sha256 = "1180l4z2cdgc6zj9pcr2c0lj28ka85kbk8sxd42fis65k2ahr61n"; + revision = "1"; + editedCabalFile = "01q86w79xswdkq08m375xwfqjgix6bzbc4lpxz4phqvzf38lc8i5"; libraryHaskellDepends = [ base exceptions mmorph monad-control mtl reflection tagged template-haskell transformers transformers-base transformers-lift @@ -66685,8 +70476,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer"; - version = "3.1.0"; - sha256 = "0f92wvj70afzp7azrx67rvckylv9d0wdlz42f12ydbfjyfz8dlsc"; + version = "3.3.4"; + sha256 = "0d9xw77i8dzb4sk3j7qhnbdand58vz1bhfvqb0qhvg0qdfg732vi"; libraryHaskellDepends = [ aeson base bimap bytestring containers ethereum-analyzer-deps extra fgl GenericPretty graphviz hexstring hoopl pretty protolude split @@ -66705,25 +70496,25 @@ self: { "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 - , optparse-applicative, optparse-text, protolude, text, tostring - , unordered-containers, vector + , filepath, hexstring, hflags, hoopl, http-conduit, json-rpc + , monad-logger, mtl, optparse-applicative, optparse-text, protolude + , text, time, tostring, unordered-containers, vector }: mkDerivation { pname = "ethereum-analyzer-cli"; - version = "3.1.0"; - sha256 = "125vh338p4a2vvllcip8y94qfq75x4lfqqh6q2h6cygf1x0kpn6h"; + version = "3.3.4"; + sha256 = "1bpr5l8hsn6ggiqs3b4mw27r52ikpqibdhn4w22k1gk8mdfr9gzc"; 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 + ethereum-analyzer ethereum-analyzer-deps exceptions filepath + hexstring hoopl http-conduit json-rpc monad-logger mtl + optparse-applicative optparse-text protolude text time tostring unordered-containers vector ]; executableHaskellDepends = [ - base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger - optparse-applicative optparse-text protolude text + base ethereum-analyzer-deps hflags monad-logger protolude ]; homepage = "https://github.com/zchn/ethereum-analyzer"; description = "A CLI frontend for ethereum-analyzer"; @@ -66738,15 +70529,14 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-deps"; - version = "3.1.0"; - sha256 = "1acydya38c26fkzai9i3j347f3cmbscdzd5kvja6wincl8ym7i88"; + version = "3.3.4"; + sha256 = "00v0f797z99yil4ihgirsyw9l4yiscg3aidlwjq4maixvzsqvr02"; 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 @@ -66759,8 +70549,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-webui"; - version = "3.1.0"; - sha256 = "0kshih6fmg3y5m0dzv3129l2lxbh97vzkxqi12rn1l5krpcs1wlz"; + version = "3.3.4"; + sha256 = "11h5q6xmig8fk3bxk797s231pk5dnsvvxs9r68zbxv7jk466yq97"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66906,6 +70696,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "euler-tour-tree" = callPackage + ({ mkDerivation, base, containers, fingertree, keys, mtl + , parser-combinators, QuickCheck, sequence, tasty, tasty-hunit + , tasty-quickcheck, transformers, Unique + }: + mkDerivation { + pname = "euler-tour-tree"; + version = "0.1.0.1"; + sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4"; + libraryHaskellDepends = [ + base containers fingertree mtl parser-combinators transformers + Unique + ]; + testHaskellDepends = [ + base containers keys QuickCheck sequence tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/k0ral/euler-tour-tree"; + description = "Euler tour trees"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "euphoria" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, elerea , enummapset-th, hashable, HUnit, test-framework @@ -66929,6 +70741,7 @@ self: { homepage = "http://github.com/tsurucapital/euphoria"; description = "Dynamic network FRP with events and continuous values"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eurofxref" = callPackage @@ -66968,6 +70781,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eve-cli" = callPackage + ({ mkDerivation, base, bytestring, eve, lens, mtl, text, vty }: + mkDerivation { + pname = "eve-cli"; + version = "0.2.0.0"; + sha256 = "0l9c7mpmw7i9kgmirnkb84q6lfw0ry5z5j2049sv47klczdv285a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring eve lens mtl text vty ]; + executableHaskellDepends = [ + base bytestring eve lens mtl text vty + ]; + testHaskellDepends = [ base bytestring eve lens mtl text vty ]; + homepage = "https://github.com/ChrisPenner/eve-cli#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "event" = callPackage ({ mkDerivation, base, containers, semigroups, transformers }: mkDerivation { @@ -67006,18 +70836,19 @@ self: { }) {}; "event-list" = callPackage - ({ mkDerivation, base, non-negative, QuickCheck, random + ({ mkDerivation, base, non-negative, QuickCheck, random, semigroups , transformers, utility-ht }: mkDerivation { pname = "event-list"; - version = "0.1.1.3"; - sha256 = "05l4bsq3pglyf81dq26djz9xsjsabxwq5k6z3wi43d7a774510pm"; + version = "0.1.2"; + sha256 = "177q99iswmanh34wlgklw1djvv5v1c0b5ysyi7mdmb70fsw30kk2"; libraryHaskellDepends = [ - base non-negative QuickCheck transformers utility-ht + base non-negative QuickCheck semigroups transformers utility-ht ]; testHaskellDepends = [ - base non-negative QuickCheck random transformers utility-ht + base non-negative QuickCheck random semigroups transformers + utility-ht ]; homepage = "http://code.haskell.org/~thielema/event-list/"; description = "Event lists with relative or absolute time stamps"; @@ -67059,29 +70890,6 @@ self: { }) {}; "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-core_0_2_0" = callPackage ({ mkDerivation, aeson, base, containers, contravariant, hspec , http-api-data, HUnit, path-pieces, sum-type-boilerplate , template-haskell, text, transformers, uuid @@ -67102,36 +70910,9 @@ self: { homepage = "https://github.com/jdreaver/eventful#readme"; description = "Core module for eventful"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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-dynamodb_0_2_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base , bytestring, conduit, eventful-core, eventful-test-helpers, hspec , HUnit, lens, QuickCheck, quickcheck-instances, safe, text @@ -67157,26 +70938,6 @@ self: { }) {}; "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-memory_0_2_0" = callPackage ({ mkDerivation, base, containers, eventful-core , eventful-test-helpers, hspec, HUnit, mtl, safe, stm }: @@ -67194,34 +70955,9 @@ self: { homepage = "https://github.com/jdreaver/eventful#readme"; description = "In-memory implementations for eventful"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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-postgresql_0_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core , eventful-sql-common, eventful-test-helpers, hspec, HUnit, mtl , persistent, persistent-postgresql, text @@ -67246,23 +70982,6 @@ self: { }) {}; "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-sql-common_0_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl , persistent, persistent-template, text, uuid }: @@ -67277,33 +70996,9 @@ self: { homepage = "https://github.com/jdreaver/eventful#readme"; description = "Common library for SQL event stores"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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-sqlite_0_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core , eventful-sql-common, eventful-test-helpers, hspec, HUnit, mtl , persistent, persistent-sqlite, text, uuid @@ -67324,26 +71019,9 @@ self: { homepage = "https://github.com/jdreaver/eventful#readme"; description = "SQLite implementations for eventful"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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; - }) {}; - - "eventful-test-helpers_0_2_0" = callPackage ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra , hspec, monad-logger, text }: @@ -67357,7 +71035,6 @@ self: { homepage = "https://github.com/jdreaver/eventful#readme"; description = "Common module used for eventful tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eventloop" = callPackage @@ -67366,8 +71043,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.5"; - sha256 = "0vl9kc0grhp72rlx922khvf5833qshyx4danismf8n5r3i9f7qr0"; + version = "0.8.2.6"; + sha256 = "1f3dmkrxjfj128pdkarrc6mka09jmh360bn6vgbp4qm2xv5hl16s"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -67379,15 +71056,19 @@ self: { }) {}; "eventsource-api" = callPackage - ({ mkDerivation, aeson, base, containers, mtl, protolude - , unordered-containers, uuid + ({ mkDerivation, aeson, base, bytestring, containers + , enclosed-exceptions, lifted-async, lifted-base, monad-control + , monad-loops, mtl, stm, stm-chans, string-conversions, text + , transformers-base, unordered-containers, uuid }: mkDerivation { pname = "eventsource-api"; - version = "1.1.1"; - sha256 = "0zy59m7iwxwy5c4l15kvj98fk7vrjwhxp0scc3r3v37cxkakg01h"; + version = "1.3.0"; + sha256 = "1xv1j0dyvbl319513ycyl8857jy3gh0dcjvwxfxz4ddsw0sld3bx"; libraryHaskellDepends = [ - aeson base containers mtl protolude unordered-containers uuid + aeson base bytestring containers enclosed-exceptions lifted-async + lifted-base monad-control monad-loops mtl stm stm-chans + string-conversions text transformers-base unordered-containers uuid ]; homepage = "https://github.com/YoEight/eventsource-api#readme"; description = "Provides an eventsourcing high level API"; @@ -67396,15 +71077,16 @@ self: { "eventsource-geteventstore-store" = callPackage ({ mkDerivation, aeson, base, eventsource-api - , eventsource-store-specs, eventstore, mtl, protolude, tasty - , tasty-hspec + , eventsource-store-specs, eventstore, mtl, protolude + , string-conversions, tasty, tasty-hspec, transformers-base }: mkDerivation { pname = "eventsource-geteventstore-store"; - version = "1.0.4"; - sha256 = "0fn75hwarhjnrjalv7i16ry1wnr2z2gqvpj3ls2faappz1drhxmp"; + version = "1.1.0"; + sha256 = "00siad63vciymkdql9b3bszb2qfcylb9y32x04ndd19mvpixhdi3"; libraryHaskellDepends = [ - aeson base eventsource-api eventstore mtl protolude + aeson base eventsource-api eventstore mtl string-conversions + transformers-base ]; testHaskellDepends = [ base eventsource-api eventsource-store-specs eventstore protolude @@ -67417,15 +71099,16 @@ self: { }) {}; "eventsource-store-specs" = callPackage - ({ mkDerivation, aeson, base, eventsource-api, mtl, protolude - , tasty, tasty-hspec, uuid + ({ mkDerivation, aeson, async, base, eventsource-api, mtl, tasty + , tasty-hspec, text, transformers-base, uuid }: mkDerivation { pname = "eventsource-store-specs"; - version = "1.0.1"; - sha256 = "0fg6rma02vp3iij93xgccqivqfx3h9675203jlmk6073mhg2i5id"; + version = "1.1.1"; + sha256 = "1pa4s9y9cgvaadzyp186snhvrgp4jw1xgzxy2w58hxfa2mcxqn4i"; libraryHaskellDepends = [ - aeson base eventsource-api mtl protolude tasty tasty-hspec uuid + aeson async base eventsource-api mtl tasty tasty-hspec text + transformers-base uuid ]; homepage = "https://github.com/YoEight/eventsource-api#readme"; description = "Provides common test specification for Store implementation"; @@ -67433,15 +71116,16 @@ self: { }) {}; "eventsource-stub-store" = callPackage - ({ mkDerivation, aeson, base, containers, eventsource-api + ({ mkDerivation, aeson, async, base, containers, eventsource-api , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec + , transformers-base }: mkDerivation { pname = "eventsource-stub-store"; - version = "1.0.2"; - sha256 = "10c853i9k91gc42jbqzxx3scip2hr1ahwkhzvcryhiw3745qsidr"; + version = "1.0.3"; + sha256 = "12vsn32m2h3bgssp2s6p1x90lj3h814iwplzhiyhmnaapq451h2w"; libraryHaskellDepends = [ - base containers eventsource-api mtl protolude stm + async base containers eventsource-api mtl stm transformers-base ]; testHaskellDepends = [ aeson base eventsource-api eventsource-store-specs protolude tasty @@ -67486,8 +71170,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "0.15.0.2"; - sha256 = "00mamlf121c3dsigpxvshj1mbm2b4hdbil02zyhz7jc6kccgbjwx"; + version = "1.1.2"; + sha256 = "1f2pqmsppln3p0zfw35hck5784np9hhs3f5f6h6j12k43gyj3847"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger @@ -67561,15 +71245,14 @@ self: { }: mkDerivation { pname = "ex-pool"; - version = "0.2"; - sha256 = "0da5grl2fdca24zhlngq2n16smdb4f5vvxqzc29ipsc3j7wkbmva"; + version = "0.2.1"; + sha256 = "0djk2g99jn24jcnq2l5yzrs2ra7wq1h3p80xkqx30arkqq5wbf0d"; libraryHaskellDepends = [ base exceptions hashable stm time transformers vector ]; homepage = "https://github.com/kim/ex-pool"; description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-combinatorics" = callPackage @@ -67585,9 +71268,7 @@ self: { }) {}; "exact-cover" = callPackage - ({ mkDerivation, base, boxes, containers, safe, tasty, tasty-hunit - , vector - }: + ({ mkDerivation, base, containers, tasty, tasty-hunit }: mkDerivation { pname = "exact-cover"; version = "0.1.0.0"; @@ -67595,20 +71276,20 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ base boxes containers safe vector ]; testHaskellDepends = [ base containers tasty tasty-hunit ]; homepage = "https://github.com/arthurl/exact-cover"; description = "Efficient exact cover solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-pi" = callPackage - ({ mkDerivation, base, numtype-dk }: + ({ mkDerivation, base, numtype-dk, semigroups }: mkDerivation { pname = "exact-pi"; - version = "0.4.1.2"; - sha256 = "1qs5zi9c87sypnxdwncdj7dnrylly7s2yvjhm7rx4fxsbxrfdfxj"; - libraryHaskellDepends = [ base numtype-dk ]; + version = "0.4.1.3"; + sha256 = "1r1cjyz6aqbq8ydn3gq4107n3hnd6zbygj7pw299nqdaag38g7jf"; + libraryHaskellDepends = [ base numtype-dk semigroups ]; homepage = "https://github.com/dmcclean/exact-pi/"; description = "Exact rational multiples of pi (and integer powers of pi)"; license = stdenv.lib.licenses.mit; @@ -67644,6 +71325,21 @@ self: { libraryHaskellDepends = [ base ]; description = "Framework for Exact Real Arithmetic in the Positional Number System"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "except-exceptions" = callPackage + ({ mkDerivation, base, exceptions, transformers }: + mkDerivation { + pname = "except-exceptions"; + version = "0.1"; + sha256 = "03d94arrq8ynkbchv8w2vp4q3wka81hkrmkll6bd9p5kwhq28nzs"; + revision = "1"; + editedCabalFile = "09i2w1ry7vmjc0a4d05a4hs7kdj3brn5jrxsy638f6acj41g5dhk"; + libraryHaskellDepends = [ base exceptions transformers ]; + homepage = "https://github.com/thumphries/except-exceptions"; + description = "Safely deal with exceptions in ExceptT"; + license = stdenv.lib.licenses.bsd3; }) {}; "exception-hierarchy" = callPackage @@ -67701,6 +71397,7 @@ self: { ]; description = "Exception monad transformer instances for monads-tf classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-mtl" = callPackage @@ -67714,6 +71411,7 @@ self: { ]; description = "Exception monad transformer instances for mtl classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-transformers" = callPackage @@ -67722,8 +71420,8 @@ self: { }: mkDerivation { pname = "exception-transformers"; - version = "0.4.0.5"; - sha256 = "12q8c64kg2ksz90ld32m6n811c54syhwihnj2fd7blf2qsmalk2n"; + version = "0.4.0.6"; + sha256 = "0abxwkq28wasy06njhaibf8cki9hifk5rjck6r3izbnswjcdn65m"; libraryHaskellDepends = [ base stm transformers transformers-compat ]; @@ -67733,6 +71431,7 @@ self: { ]; description = "Type classes and monads for unchecked extensible exceptions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exceptional" = callPackage @@ -67756,8 +71455,8 @@ self: { pname = "exceptions"; version = "0.8.3"; sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd"; - revision = "2"; - editedCabalFile = "1vl59j0l7m53hkzlcfmdbqbab8dk4lp9gzwryn7nsr6ylg94wayw"; + revision = "5"; + editedCabalFile = "1kfgp41i6mfz9gjczp3flvqxfhnznd81rwldv8j05807n6mnqqii"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -67770,6 +71469,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptions_0_10_0" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers, transformers-compat + }: + mkDerivation { + pname = "exceptions"; + version = "0.10.0"; + sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 transformers + transformers-compat + ]; + homepage = "http://github.com/ekmett/exceptions/"; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "execs" = callPackage ({ mkDerivation, base, directory, process, text }: mkDerivation { @@ -67834,6 +71556,7 @@ self: { homepage = "https://github.com/GianlucaGuarini/executor"; description = "Shell helpers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exference" = callPackage @@ -67922,28 +71645,27 @@ self: { }) {inherit (pkgs) exif;}; "exinst" = callPackage - ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal - , constraints, deepseq, hashable, profunctors, QuickCheck - , singletons, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, aeson, base, binary, bytes, bytestring, cborg + , cereal, constraints, deepseq, hashable, profunctors, QuickCheck + , serialise, singletons, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "exinst"; - version = "0.4"; - sha256 = "0n7fk3gjwyvw8k9paznwfgc8bgg7aiz9brfzkcfl3q57hr84dwj9"; - revision = "1"; - editedCabalFile = "01rwd7q00c86l73pfkq7k1qvw3ijpiy66axckj9702s2xc962dji"; + version = "0.5"; + sha256 = "1r6hy9kkfn24zszb9jd4p6w3wa4nwd2ds8mvb3k9rl20gc3zzhhi"; libraryHaskellDepends = [ - aeson base binary bytes cereal constraints deepseq hashable - profunctors QuickCheck singletons + aeson base binary bytes cborg cereal constraints deepseq hashable + profunctors QuickCheck serialise singletons ]; testHaskellDepends = [ - aeson base binary bytes bytestring cereal constraints deepseq - hashable profunctors QuickCheck singletons tasty tasty-hunit - tasty-quickcheck + aeson base binary bytes bytestring cborg cereal constraints deepseq + hashable profunctors QuickCheck serialise singletons tasty + tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/k0001/exinst"; - description = "Recover type indexes and instances for your existentialized types"; + description = "Dependent pairs and their instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exinst-aeson" = callPackage @@ -68022,6 +71744,7 @@ self: { ]; description = "Existential types with lens-like accessors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {control-invariants = null;}; @@ -68071,6 +71794,7 @@ self: { homepage = "https://github.com/qfpl/exitcode"; description = "Monad transformer for exit codes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exp-extended" = callPackage @@ -68079,25 +71803,26 @@ self: { pname = "exp-extended"; version = "0.1.1.2"; sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r"; - revision = "1"; - editedCabalFile = "1bxlaagjvlhnbf9hh0n46b05gm1vmdrgzzgrc3kbz8mg87j91vyr"; + revision = "2"; + editedCabalFile = "050v0c9l9gi1bxpqbfcl2j9mdiv7xdh1mdfwymxcgpjydv60xwh0"; libraryHaskellDepends = [ base compensated log-domain ]; homepage = "https://code.mathr.co.uk/exp-extended"; description = "floating point with extended exponent range"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exp-pairs" = callPackage ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix - , QuickCheck, random, smallcheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, wl-pprint + , prettyprinter, QuickCheck, random, smallcheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "exp-pairs"; - version = "0.1.5.2"; - sha256 = "17dcmv08xvbq11b8dkka7na9hxdh3r566s00wygnqrjg9gfc5bcd"; + version = "0.1.6.0"; + sha256 = "1qsvly4klhk17r2pk60cf03dyz0cjc449fa2plqrlai9rl7xjfp6"; libraryHaskellDepends = [ - base containers deepseq ghc-prim wl-pprint + base containers deepseq ghc-prim prettyprinter ]; testHaskellDepends = [ base matrix QuickCheck random smallcheck tasty tasty-hunit @@ -68158,6 +71883,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "expiring-containers" = callPackage + ({ mkDerivation, base, containers, hashable, int-multimap, time + , timestamp, unordered-containers + }: + mkDerivation { + pname = "expiring-containers"; + version = "0.1.0.2"; + sha256 = "006n6zwdgrdh0717wd85kwxrbpv3fl5srbc77acglms41pcn72yz"; + libraryHaskellDepends = [ + base containers hashable int-multimap time timestamp + unordered-containers + ]; + homepage = "https://github.com/metrix-ai/expiring-containers"; + description = "Expiring containers"; + license = stdenv.lib.licenses.mit; + }) {}; + "expiring-mvar" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -68186,6 +71928,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "explicit-constraint-lens" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit }: + mkDerivation { + pname = "explicit-constraint-lens"; + version = "0.1.0.0"; + sha256 = "181frvmgv65rcjpiya4gswvpq9ahz97c8lalhgmwknx9jx5nqd98"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/leftaroundabout/explicit-constraint-lens"; + description = "Fully-flexible polymorphic lenses, without any bizarre profunctors"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "explicit-determinant" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -68200,14 +71955,14 @@ self: { }) {}; "explicit-exception" = callPackage - ({ mkDerivation, base, deepseq, transformers }: + ({ mkDerivation, base, deepseq, semigroups, transformers }: mkDerivation { pname = "explicit-exception"; - version = "0.1.9"; - sha256 = "1kxx42kzm3r0mji7756yblpr7ys3lhx937jixgm8q1zsyg36m2hz"; + version = "0.1.9.2"; + sha256 = "1xj9fqh28br5xyzzc28zl23jj913ayhikvwcw9ccj3pqfybh5xk0"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base deepseq transformers ]; + libraryHaskellDepends = [ base deepseq semigroups transformers ]; homepage = "http://www.haskell.org/haskellwiki/Exception"; description = "Exceptions which are explicit in the type signature"; license = stdenv.lib.licenses.bsd3; @@ -68315,22 +72070,19 @@ self: { }) {}; "expressions" = callPackage - ({ mkDerivation, attoparsec, base, containers, lattices, QuickCheck - , singletons, tasty, tasty-quickcheck, text, transformers + ({ mkDerivation, attoparsec, base, containers, lattices, singletons + , text, transformers }: mkDerivation { pname = "expressions"; - version = "0.1.4"; - sha256 = "1dxkg5yc2njq7dpv7vgkmrs73x5np5w1ahi79my6ysamnc2w8a04"; + version = "0.1.5"; + sha256 = "1iw6i922wjvs844gqqvmvhvfaq8c06lxlca806s6rbk0sxq40nmz"; libraryHaskellDepends = [ attoparsec base containers lattices singletons text transformers ]; - testHaskellDepends = [ - base QuickCheck singletons tasty tasty-quickcheck text - ]; + testHaskellDepends = [ base singletons text ]; description = "Expressions and Formulae a la carte"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expressions-z3" = callPackage @@ -68339,14 +72091,16 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.1.1"; - sha256 = "0hk8qhkvlh4v210k7d845krg31px72ma44fmwahbycn6pgy32659"; + version = "0.1.3"; + sha256 = "1hb44k4558lwsx3z02lgmf1i24ajjlbyqbc88lzgjh3vswfahsj8"; libraryHaskellDepends = [ base containers expressions singletons transformers z3 ]; + testHaskellDepends = [ + base containers expressions singletons transformers z3 + ]; description = "Encode and Decode expressions from Z3 ASTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extcore" = callPackage @@ -68405,41 +72159,39 @@ self: { }) {}; "extended-reals" = callPackage - ({ mkDerivation, base, deepseq, hashable, HUnit, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , test-framework-th + ({ mkDerivation, base, deepseq, hashable, HUnit, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-th }: mkDerivation { pname = "extended-reals"; - version = "0.2.2.0"; - sha256 = "14wskq0m3sclb2c1m3aqsaj26rijbzyy021qkvxjdpzskz13higj"; - revision = "2"; - editedCabalFile = "1vsh115lals5sqp2rkj7gp9b1jc0rg92x5fb51p8jckqr4f43pma"; + version = "0.2.3.0"; + sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ - base deepseq HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th + base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-th ]; homepage = "https://github.com/msakai/extended-reals/"; description = "Extension of real numbers with positive/negative infinities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible" = callPackage - ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim - , hashable, lens, monad-skeleton, mtl, primitive, profunctors - , QuickCheck, semigroups, StateVar, tagged, template-haskell - , transformers, vector + ({ mkDerivation, aeson, base, bytestring, cassava, comonad + , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton + , mtl, primitive, profunctors, QuickCheck, semigroups, StateVar + , tagged, template-haskell, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "extensible"; - version = "0.4.6"; - sha256 = "0khi212qc834qnrssbn4xcfiypi2m7x8gwpwvpd6sbi6hi6c052v"; + version = "0.4.8"; + sha256 = "1bm7yqshaknnd50yf6bgb6qxl2lv21pqxhb674v3ifpwx1swrkm2"; libraryHaskellDepends = [ - base comonad constraints deepseq ghc-prim hashable monad-skeleton - mtl primitive profunctors QuickCheck semigroups StateVar tagged - template-haskell transformers vector + aeson base bytestring cassava comonad constraints deepseq ghc-prim + hashable monad-skeleton mtl primitive profunctors QuickCheck + semigroups StateVar tagged template-haskell text transformers + unordered-containers vector ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; homepage = "https://github.com/fumieval/extensible"; @@ -68464,21 +72216,46 @@ self: { }) {}; "extensible-effects" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, transformers, transformers-base, type-aligned - , void + ({ mkDerivation, base, criterion, HUnit, mtl, QuickCheck, silently + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, transformers, transformers-base }: mkDerivation { pname = "extensible-effects"; - version = "1.11.1.0"; - sha256 = "1z2k79pxy73rh7fxp70zbnzrcnqs9kchwm6hciyl2wr66bf58v4b"; - libraryHaskellDepends = [ - base transformers transformers-base type-aligned void + version = "2.4.0.0"; + sha256 = "024566vv5mmnma2fwnbfg9bzayi6inl1a6ys4nqg0cv57rqny6nc"; + libraryHaskellDepends = [ base transformers transformers-base ]; + testHaskellDepends = [ + base HUnit QuickCheck silently test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th ]; + benchmarkHaskellDepends = [ + base criterion HUnit mtl test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th + ]; + homepage = "https://github.com/suhailshergill/extensible-effects"; + description = "An Alternative to Monad Transformers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "extensible-effects_2_5_3_0" = callPackage + ({ mkDerivation, base, criterion, HUnit, monad-control, mtl + , QuickCheck, silently, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, transformers-base + }: + mkDerivation { + pname = "extensible-effects"; + version = "2.5.3.0"; + sha256 = "0dp6wsrlqivghmhwkj5js807i5m71lp9g3v3v8qb7xd3c08awy86"; + libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th void + base HUnit monad-control QuickCheck silently test-framework + test-framework-hunit test-framework-quickcheck2 test-framework-th + ]; + benchmarkHaskellDepends = [ + base criterion HUnit mtl test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th ]; homepage = "https://github.com/suhailshergill/extensible-effects"; description = "An Alternative to Monad Transformers"; @@ -68528,33 +72305,29 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.5.3"; - sha256 = "0w4csmpzj88vkgyngyw4i91f9hfali50xqrqyycr4jh0qyq5sjx4"; + version = "1.6.5"; + sha256 = "05x89gclm8vw1rx4945p3asmsa28055y81nwzvgq91yr5qc4lbgi"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; - testHaskellDepends = [ - base clock directory filepath QuickCheck time unix - ]; + testHaskellDepends = [ base directory filepath QuickCheck unix ]; homepage = "https://github.com/ndmitchell/extra#readme"; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; }) {}; - "extra_1_6" = callPackage + "extra_1_6_6" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, time, unix }: mkDerivation { pname = "extra"; - version = "1.6"; - sha256 = "1pqlggdbbhfj71yaby5595shf4hpzv9700sczksgy36qz9bfcrh7"; + version = "1.6.6"; + sha256 = "17d0fd2hng1bwgdl8ms7vzjb4zzwk8cljci5wsd5ninxi9m6x6br"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; - testHaskellDepends = [ - base clock directory filepath QuickCheck unix - ]; + testHaskellDepends = [ base directory filepath QuickCheck unix ]; homepage = "https://github.com/ndmitchell/extra#readme"; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; @@ -68580,6 +72353,7 @@ self: { homepage = "https://github.com/yamadapc/stack-run-auto"; description = "Given a hackage package outputs the list of its dependencies"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extractable-singleton" = callPackage @@ -68620,23 +72394,22 @@ self: { }: mkDerivation { pname = "extralife"; - version = "0.1.0.1"; - sha256 = "1244qnx99npwq4l6mw5ddh8qz3kcz54phhl2q0fxjmnfsfz8cs3n"; + version = "0.1.0.2"; + sha256 = "1ag8rpj8cyq64w9ig4dm4ssws39y5xyr1c1w0qjrv47vr0vvcpi8"; 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extrapolate" = callPackage ({ mkDerivation, base, leancheck, speculate, template-haskell }: mkDerivation { pname = "extrapolate"; - version = "0.2.4"; - sha256 = "14i1kb4l1wnc47fp2if95yk5jrb4s0p81c8bgda7lwihas9x8h9r"; + version = "0.3.1"; + sha256 = "1hz03mdascy4jvqhyrqqmb1py3pb03g4z3if05z2cbdxgbgsbbn4"; libraryHaskellDepends = [ base leancheck speculate template-haskell ]; @@ -68644,7 +72417,6 @@ self: { homepage = "https://github.com/rudymatela/extrapolate#readme"; description = "generalize counter-examples of test properties"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ez-couch" = callPackage @@ -68691,8 +72463,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.3.0.0"; - sha256 = "0izhwb0plxhlsr4ghk2rybm367n83d598s3nk8ss0mnnv7gv5wpm"; + version = "0.3.1.4"; + sha256 = "0k5bb0imp001f1sj785qqy9k67wvb91mr4fpdcg5riykiv8j9l1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68772,8 +72544,8 @@ self: { }: mkDerivation { pname = "fadno-braids"; - version = "0.1.0"; - sha256 = "0imf4cd8gl5hq4qrrp5jgfhv4k0vmrm2qm124nbnj65zhgxvm9lz"; + version = "0.1.1"; + sha256 = "1d8ca0lnvkpqbrfmvk8mash0kgkxwzlzzspsp35n7csp6iyll543"; libraryHaskellDepends = [ base containers data-default diagrams diagrams-lib diagrams-rasterific lens random @@ -68789,8 +72561,8 @@ self: { }: mkDerivation { pname = "fadno-xml"; - version = "1.1.0"; - sha256 = "0wm4kj544zyg2rfb0qdcc9m60l5awskcc0w0rs5bw0v5jdzk2d3j"; + version = "1.1.1"; + sha256 = "0xsklyavmgi0b2qn7758i3ph7ifnkkjyz0yczw5zj4586q184am5"; libraryHaskellDepends = [ base containers Decimal lens mtl parsec xml ]; @@ -68849,6 +72621,7 @@ self: { ]; description = "Failure Detectors implimented in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fair-predicates" = callPackage @@ -68864,6 +72637,23 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fake" = callPackage + ({ mkDerivation, base, containers, generics-sop, hspec, random + , text, time + }: + mkDerivation { + pname = "fake"; + version = "0.1.1"; + sha256 = "0xp737s8067bynh03d6zhi8w71pl1q8mrk5si80mykn401dzw7ir"; + libraryHaskellDepends = [ + base containers generics-sop random text time + ]; + testHaskellDepends = [ base hspec random text time ]; + homepage = "https://github.com/mightybyte/fake"; + description = "Randomly generated fake data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fake-type" = callPackage ({ mkDerivation, base, base-prelude, libXtst, split, X11 }: mkDerivation { @@ -68964,6 +72754,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-arithmetic" = callPackage + ({ mkDerivation, arithmoi, base, combinat-compat + , composition-prelude, criterion, gmpint, hspec, QuickCheck + }: + mkDerivation { + pname = "fast-arithmetic"; + version = "0.5.0.0"; + sha256 = "17jv9ysnd0bvlzc0sircj0mnbxpwzzby98wf6p6hj76m284acdx6"; + libraryHaskellDepends = [ base composition-prelude gmpint ]; + testHaskellDepends = [ + arithmoi base combinat-compat hspec QuickCheck + ]; + benchmarkHaskellDepends = [ + arithmoi base combinat-compat criterion + ]; + homepage = "https://github.com/vmchale/fast-arithmetic#readme"; + description = "Fast functions on integers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-builder" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, process, QuickCheck, scientific, stm @@ -68983,6 +72794,27 @@ self: { homepage = "http://github.com/takano-akio/fast-builder"; description = "Fast ByteString Builder"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "fast-combinatorics" = callPackage + ({ mkDerivation, base, Cabal, composition-prelude, criterion + , directory, hspec, http-client, http-client-tls, tar, zlib + }: + mkDerivation { + pname = "fast-combinatorics"; + version = "0.1.0.9"; + sha256 = "0p9pdp51ii0ggf6ghh7aijk1q1crf850qwdvyi7nkx65nfi9qc7z"; + setupHaskellDepends = [ + base Cabal directory http-client http-client-tls tar zlib + ]; + libraryHaskellDepends = [ base composition-prelude ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com//fast-combinatorics#readme"; + description = "Fast combinatorics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-digits" = callPackage @@ -69010,8 +72842,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "2.4.10"; - sha256 = "13b7rrv8dw574k6lbl96nar67fx81058gvilsc42v0lgm38sbi6y"; + version = "2.4.11"; + sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix unix-time @@ -69054,6 +72886,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Natural Numbers with no overhead"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-tags" = callPackage @@ -69063,8 +72896,8 @@ self: { }: mkDerivation { pname = "fast-tags"; - version = "1.3"; - sha256 = "1pqz3r2dg0i462fd4fm3fz4p0m05878gic8xr1hxzk2f2ljsc7fq"; + version = "1.4.1"; + sha256 = "0d3i5npmc9nx91nmfbd2cwq33yd48b269gbc9k2ls6sbj9qdi172"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -69129,6 +72962,7 @@ self: { homepage = "https://github.com/GregorySchwartz/fasta"; description = "A simple, mindless parser for fasta files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fastbayes" = callPackage @@ -69156,6 +72990,7 @@ self: { librarySystemDepends = [ fcgi ]; description = "A Haskell library for writing FastCGI programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fcgi;}; "fastedit" = callPackage @@ -69267,30 +73102,31 @@ self: { }) {}; "fay" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, containers - , data-default, data-lens-light, directory, filepath, ghc-paths - , haskell-src-exts, language-ecmascript, mtl, mtl-compat - , optparse-applicative, process, safe, sourcemap, split, spoon, syb - , text, time, transformers, transformers-compat - , traverse-with-class, type-eq, uniplate, unordered-containers - , utf8-string, vector + ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal + , containers, data-default, data-lens-light, directory, filepath + , ghc-paths, haskell-src-exts, language-ecmascript, mtl, mtl-compat + , optparse-applicative, process, safe, shakespeare, sourcemap + , split, spoon, syb, text, time, transformers, transformers-compat + , traverse-with-class, uniplate, unordered-containers, utf8-string + , vector }: mkDerivation { pname = "fay"; - version = "0.23.1.16"; - sha256 = "0r4ac76mn7dykva0dz6ar2zfcij2kiz8kjfcywpgdg40g75zhvn4"; - revision = "8"; - editedCabalFile = "1ybc4vv0d3vya4a1xgr2sbq1zx1bzm82acxivs458i9pj56wp87j"; + version = "0.24.0.0"; + sha256 = "1my71a3cmd637ch5jwsdpyvfx6vsi2vnvshbrwmcx9ya1xm6x7z2"; + revision = "1"; + editedCabalFile = "1bx1dyxir8h0c1qybkfdra36rmdhk7gpgz071v9spl9lplqvpw9s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ aeson base base-compat bytestring containers data-default data-lens-light directory filepath ghc-paths haskell-src-exts - language-ecmascript mtl mtl-compat process safe sourcemap split - spoon syb text time transformers transformers-compat - traverse-with-class type-eq uniplate unordered-containers - utf8-string vector + language-ecmascript mtl mtl-compat process safe shakespeare + sourcemap split spoon syb text time transformers + transformers-compat traverse-with-class uniplate + unordered-containers utf8-string vector ]; executableHaskellDepends = [ base mtl optparse-applicative split ]; homepage = "https://github.com/faylang/fay/wiki"; @@ -69303,8 +73139,8 @@ self: { ({ mkDerivation, base, fay }: mkDerivation { pname = "fay-base"; - version = "0.21.0.0"; - sha256 = "1sj6baw63xzv6hcqmka29hvack00fal3zlp5b97qca56lbh7yhbf"; + version = "0.21.1.0"; + sha256 = "1i19q04a4z3aix8njw5im8ixkw7l53xfhff0rrgx3ibnf9jy752z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base fay ]; homepage = "https://github.com/faylang/fay/"; @@ -69448,32 +73284,62 @@ self: { , base64-bytestring, bytestring, cereal, conduit, conduit-extra , containers, crypto-api, cryptohash, cryptohash-cryptoapi , 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 + , monad-logger, old-locale, QuickCheck, resourcet, text, time + , transformers, transformers-base, unliftio, unliftio-core , unordered-containers }: mkDerivation { pname = "fb"; - version = "1.1.1"; - sha256 = "0rbzcnd0cw06vfyy3k5f1n0f8hr00ygn5pjdws7ayn2f2hsk9ln8"; + version = "1.2.0"; + sha256 = "04ppg1qhm93w5j6arv7ykp0vf85nfwhv6dkpyji34c0nalqzyx6l"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring cereal conduit conduit-extra crypto-api cryptohash 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 + http-types monad-logger old-locale resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers ]; testHaskellDepends = [ aeson base bytestring conduit containers data-default hspec - http-conduit HUnit lifted-base monad-control QuickCheck resourcet - text time transformers + http-conduit HUnit QuickCheck resourcet text time transformers + unliftio ]; homepage = "https://github.com/psibi/fb"; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; }) {}; + "fb_1_2_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, bytestring, cereal, conduit, conduit-extra + , containers, crypto-api, cryptohash, cryptohash-cryptoapi + , data-default, hspec, http-client, http-conduit, http-types, HUnit + , monad-logger, old-locale, QuickCheck, resourcet, text, time + , transformers, transformers-base, unliftio, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "fb"; + version = "1.2.1"; + sha256 = "05ax0pd9j6c64n48r9q03k5pg2axkmv11cz6azjg7k72cfkp1mm9"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring + bytestring cereal conduit conduit-extra crypto-api cryptohash + cryptohash-cryptoapi data-default http-client http-conduit + http-types monad-logger old-locale resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers data-default hspec + http-conduit HUnit QuickCheck resourcet text time transformers + unliftio + ]; + homepage = "https://github.com/psibi/fb"; + description = "Bindings to Facebook's API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fb-persistent" = callPackage ({ mkDerivation, base, cereal, fb, persistent, text, time }: mkDerivation { @@ -69549,6 +73415,7 @@ self: { homepage = "http://github.com/ylilarry/fcache#readme"; description = "Cache a function (a -> b)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fcd" = callPackage @@ -69572,6 +73439,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fcg" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "fcg"; + version = "0.0.0"; + sha256 = "07qbka3fkkmc18crafh6c5ahs7fv1a1kfhga8mxfkm75k3h15h3l"; + isLibrary = false; + isExecutable = true; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fckeditor" = callPackage ({ mkDerivation, base, cgi, HaXml, xhtml }: mkDerivation { @@ -69591,10 +73471,10 @@ self: { }: mkDerivation { pname = "fclabels"; - version = "2.0.3.2"; - sha256 = "1c42f420bih3azhis9hhcdk6ijm10wp9rqa2kh763g68qgzq6pad"; - revision = "3"; - editedCabalFile = "19gd2jwjpfrmq80gpjk05djhn42vvj88fgka5yr7yaq6mfx103by"; + version = "2.0.3.3"; + sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s"; + revision = "1"; + editedCabalFile = "0fs17vv85ybl3ws8k25sg758vq49l19vhn4asm8r6q5j9xic2kvl"; libraryHaskellDepends = [ base mtl template-haskell transformers ]; testHaskellDepends = [ base HUnit mtl template-haskell transformers @@ -69721,15 +73601,15 @@ self: { ({ mkDerivation, base, directory, filepath, process, time, unix }: mkDerivation { pname = "fedora-haskell-tools"; - version = "0.3"; - sha256 = "0ml5laiwkpd68j87px57jdvjc90pw1ma41gsc06h1qjlhnvhhill"; + version = "0.5.1"; + sha256 = "1543i2lxzplqmx1cpggp5773qvqc6jzn4960c1cgyhg9mjd13adr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath process time unix ]; homepage = "https://github.com/fedora-haskell/fedora-haskell-tools"; - description = "Building and tracking tools for Fedora Haskell"; + description = "Building and managing tools for Fedora Haskell"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -69757,30 +73637,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "feed" = callPackage - ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework - , test-framework-hunit, time, time-locale-compat, utf8-string, xml - }: + "fee-estimate" = callPackage + ({ mkDerivation, base, QuickCheck }: mkDerivation { - pname = "feed"; - version = "0.3.12.0"; - sha256 = "0hkrsinspg70bbm3hwqdrvivws6zya1hyk0a3awpaz82j4xnlbfc"; - revision = "2"; - editedCabalFile = "0ggpqv0i2k38dl8dqwn159n7ys0xr8shrsr3l838883rs8rrnf1j"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base old-locale old-time time time-locale-compat utf8-string xml - ]; - testHaskellDepends = [ - base HUnit old-locale old-time test-framework test-framework-hunit - time time-locale-compat utf8-string xml - ]; - homepage = "https://github.com/bergmark/feed"; - description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; + pname = "fee-estimate"; + version = "0.1.0.0"; + sha256 = "06qfc18dhkhxpy0rhs20kw83bf1mzq94wy6azv3zj2ik8shq501r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base QuickCheck ]; + executableHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/sahabi/fee-estimate#readme"; + description = "Short description of your package"; license = stdenv.lib.licenses.bsd3; }) {}; - "feed_1_0_0_0" = callPackage + "feed" = callPackage ({ mkDerivation, base, base-compat, bytestring, HUnit, old-locale , old-time, safe, test-framework, test-framework-hunit, text, time , time-locale-compat, utf8-string, xml-conduit, xml-types @@ -69789,8 +73662,8 @@ self: { pname = "feed"; version = "1.0.0.0"; sha256 = "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck"; - revision = "1"; - editedCabalFile = "19sckdba9c7pz7hhmjqv4hjm16bi5d1dsnknlh3y3f5n86ybj0pr"; + revision = "4"; + editedCabalFile = "0baavcavm3ywykcr9cm07aqr7sna98jba2n68lyn3kany8ri214d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -69804,7 +73677,6 @@ self: { homepage = "https://github.com/bergmark/feed"; description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed-cli" = callPackage @@ -69843,6 +73715,7 @@ self: { homepage = "http://rel4tion.org/projects/feed-collect/"; description = "Watch RSS/Atom feeds (and do with them whatever you like)"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed-crawl" = callPackage @@ -70034,6 +73907,7 @@ self: { homepage = "https://github.com/markus-git/feldspar-signal"; description = "Signal Processing extension for Feldspar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {feldspar-compiler-shim = null; monadic-edsl-priv = null;}; @@ -70182,7 +74056,7 @@ self: { "ffmpeg-light" = callPackage ({ mkDerivation, base, bytestring, either, exceptions, ffmpeg , JuicyPixels, libavcodec, libavdevice, libavformat, libswscale - , monad-loops, mtl, text, transformers, vector + , mtl, transformers, vector }: mkDerivation { pname = "ffmpeg-light"; @@ -70197,13 +74071,10 @@ self: { libraryPkgconfigDepends = [ ffmpeg libavcodec libavdevice libavformat libswscale ]; - executableHaskellDepends = [ - base bytestring JuicyPixels monad-loops mtl text transformers - vector - ]; homepage = "http://github.com/acowley/ffmpeg-light"; description = "Minimal bindings to the FFmpeg library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; libavformat = null; libswscale = null;}; @@ -70256,25 +74127,6 @@ self: { }) {inherit (pkgs) fftw;}; "fgl" = callPackage - ({ mkDerivation, array, base, containers, deepseq, hspec - , microbench, QuickCheck, transformers - }: - mkDerivation { - pname = "fgl"; - version = "5.5.3.1"; - sha256 = "0k1frj6hpiij287sn91qvf1vms1b4zzs3xdq71xbam9cs80p5afy"; - revision = "1"; - editedCabalFile = "00bw87y97ym844ir4mdq0vx5kfb0brzlqmrbqa0iq35lkwsd4k3g"; - libraryHaskellDepends = [ - array base containers deepseq transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - benchmarkHaskellDepends = [ base deepseq microbench ]; - description = "Martin Erwig's Functional Graph Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fgl_5_6_0_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: @@ -70289,7 +74141,6 @@ 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 @@ -70479,8 +74330,8 @@ self: { }: mkDerivation { pname = "file-embed"; - version = "0.0.10"; - sha256 = "04gpylngm2aalqcgdk7gy7jiw291dala1354spxa8wspxif94lgp"; + version = "0.0.10.1"; + sha256 = "0lj164cnzqyd487mli91nnr7137a4h4qsasfwsnsh77sx12fpk9k"; libraryHaskellDepends = [ base bytestring directory filepath template-haskell ]; @@ -70490,22 +74341,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "file-embed_0_0_10_1" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , template-haskell + "file-embed-lzma" = callPackage + ({ mkDerivation, base, base-compat, bytestring, directory, filepath + , lzma, template-haskell, text, th-lift-instances, transformers }: mkDerivation { - pname = "file-embed"; - version = "0.0.10.1"; - sha256 = "0lj164cnzqyd487mli91nnr7137a4h4qsasfwsnsh77sx12fpk9k"; + pname = "file-embed-lzma"; + version = "0"; + sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; + revision = "1"; + editedCabalFile = "18q9dgfdsr7r5mlqzhhgbx0bp4bv2xkpcsrihl655pwaj1lz1v2s"; libraryHaskellDepends = [ - base bytestring directory filepath template-haskell + base base-compat bytestring directory filepath lzma + template-haskell text th-lift-instances transformers ]; - testHaskellDepends = [ base filepath ]; - homepage = "https://github.com/snoyberg/file-embed"; - description = "Use Template Haskell to embed file contents directly"; + testHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/phadej/file-embed-lzma"; + description = "Use Template Haskell to embed (LZMA compressed) data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "file-embed-poly" = callPackage @@ -70589,25 +74442,23 @@ self: { }) {}; "filecache" = callPackage - ({ mkDerivation, base, directory, exceptions, hashable, hinotify - , lens, mtl, stm, strict-base-types, temporary - , unordered-containers + ({ mkDerivation, base, containers, directory, exceptions, filepath + , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time }: mkDerivation { pname = "filecache"; - version = "0.2.9"; - sha256 = "10fxjphldf2mi25pmx5l9j1073zb5lrhana2ysvkiazfmmjcvrh2"; + version = "0.3.2"; + sha256 = "1ddpji3293hrhw7rgl7b41prhffjsb7rgf5x2ijjbiblnzwazr42"; libraryHaskellDepends = [ - base exceptions hashable hinotify lens mtl stm strict-base-types - unordered-containers + base containers directory exceptions filepath fsnotify mtl stm + strict-base-types time ]; testHaskellDepends = [ - base directory temporary unordered-containers + base containers directory filepath hspec stm temporary ]; homepage = "http://lpuppet.banquise.net/"; - description = "A Linux-only cache system associating values to files"; + description = "A cache system associating values to files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "filediff" = callPackage @@ -70673,12 +74524,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filepath_1_4_1_2" = callPackage + "filepath_1_4_2" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "filepath"; - version = "1.4.1.2"; - sha256 = "1hrbi7ckrkqzw73ziqiyh00xp28c79pk0jrj1vqiq5nwfs3hryvv"; + version = "1.4.2"; + sha256 = "0bnryq00xbcsswxmahl42x85bfh23mxsap0gq8q0dm1v67ij7a0q"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/haskell/filepath#readme"; @@ -70689,20 +74540,21 @@ self: { "filepath-crypto" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive - , cryptoids, cryptoids-types, encoding, exceptions, filepath, sandi - , template-haskell + , cryptoids, cryptoids-class, cryptoids-types, exceptions, filepath + , sandi, template-haskell }: mkDerivation { pname = "filepath-crypto"; - version = "0.0.0.2"; - sha256 = "1i6y0bpyndghkfip2l0ijk9mnhia0fjmd6skzl1a3dbh5pibf7fd"; + version = "0.1.0.0"; + sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0"; + revision = "4"; + editedCabalFile = "11ch90kp5qlbhswjf7px1n0rhffn1hwsx7l0p7vpcdnwdkixb414"; libraryHaskellDepends = [ - base binary bytestring case-insensitive cryptoids cryptoids-types - encoding exceptions filepath sandi template-haskell + base binary bytestring case-insensitive cryptoids cryptoids-class + cryptoids-types exceptions filepath sandi template-haskell ]; description = "Reversable and secure encoding of object ids as filepaths"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filepath-io-access" = callPackage @@ -70732,7 +74584,6 @@ self: { homepage = "https://github.com/tonymorris/filepather"; description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fileplow" = callPackage @@ -70759,8 +74610,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.3.1"; - sha256 = "1pnqb816syl8j03wfk1p96vqlb64xkl45cxlkmqsriwi4ar0svw1"; + version = "0.6.3.2"; + sha256 = "0nx16b6nvzvzwrwrbyzjm7dh2ilk3vbrwr6r9m2c62ll1k99100v"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale @@ -70771,6 +74622,7 @@ self: { ]; description = "Interface for versioning file stores"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filesystem-conduit" = callPackage @@ -70884,6 +74736,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fin" = callPackage + ({ mkDerivation, base, deepseq, hashable, inspection-testing + , tagged + }: + mkDerivation { + pname = "fin"; + version = "0.0.1"; + sha256 = "0mqs6qayj2n54siz3bpab9z6sk9030wdaxgvgg9g36983yaqmlil"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ base inspection-testing tagged ]; + homepage = "https://github.com/phadej/vec"; + description = "Nat and Fin: peano naturals and finite numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "final" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -70909,6 +74777,7 @@ self: { ]; description = "Extensible pretty printing with semantic annotations and proportional fonts"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "find-clumpiness" = callPackage @@ -70990,8 +74859,8 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.2.1"; - sha256 = "03vchlbhx9ipjx1w8y4pfc4awb1gjjgr5f95h977lknzb5ad9fx5"; + version = "0.1.4.1"; + sha256 = "192fyzv0pn1437wdpqg1l80rswkk4rw3w61r4bq7dhv354bdqy4p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -71032,6 +74901,8 @@ self: { pname = "finite-field"; version = "0.9.0"; sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643"; + revision = "1"; + editedCabalFile = "0npwa4gv94b87y4bam9valnjlsy3rbhk7n7hdc1mx1bwkn4acyds"; libraryHaskellDepends = [ base deepseq hashable singletons template-haskell ]; @@ -71047,8 +74918,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "finite-typelits"; - version = "0.1.2.0"; - sha256 = "09qmif1xvfcaylz9zfa1w8bs9ls3pcip509b1iyka94p8c6j6liw"; + version = "0.1.3.0"; + sha256 = "17a82djlpapdzw34afv79w99jrpy5nlbdw1k1xjs59bvvqv36wyv"; libraryHaskellDepends = [ base deepseq ]; homepage = "https://github.com/mniip/finite-typelits"; description = "A type inhabited by finitely many values, indexed by type-level naturals"; @@ -71062,8 +74933,8 @@ self: { }: mkDerivation { pname = "firefly"; - version = "0.1.0.0"; - sha256 = "0m7a7n9iw5ylw4w0awwsbafck5gn7jap3jd34064in6qp009s05v"; + version = "0.2.1.0"; + sha256 = "1mhqh9circxlz5vxhl3m4lg5c63jn3is6c963h0r2kawlaaxjkiz"; libraryHaskellDepends = [ aeson base blaze-html bytestring case-insensitive containers cookie http-types mtl regex-pcre text transformers wai warp @@ -71088,6 +74959,7 @@ self: { homepage = "https://github.com/ChrisPenner/Firefly#readme"; description = "A simple example using Firefly"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "first-and-last" = callPackage @@ -71141,8 +75013,8 @@ self: { }: mkDerivation { pname = "fishfood"; - version = "0.0.1.7"; - sha256 = "1b2nabliv1xqi42q2bknri85gizb1xbh7j5729dxv3sybzq50wd8"; + version = "0.0.1.8"; + sha256 = "04wqj8s8b97i6448f66ljv5wk6nhcjs80vapg96vwmlslxwcmhnc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71198,19 +75070,16 @@ self: { }: mkDerivation { pname = "fitspec"; - version = "0.4.3"; - sha256 = "0kbv2bz4cf8bvv8i5ypcldcyxd6l7f6wwsb85vfmjqrq7kn2apr2"; + version = "0.4.4"; + sha256 = "15vmdipw3pz6x4x2c1ywf0h0jbiy14p557mx3hm2zhdpxn1bdwyr"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; - testHaskellDepends = [ base cmdargs leancheck template-haskell ]; - benchmarkHaskellDepends = [ - base cmdargs leancheck pretty template-haskell - ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base pretty ]; homepage = "https://github.com/rudymatela/fitspec#readme"; description = "refining property sets for testing Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fix-imports" = callPackage @@ -71219,8 +75088,8 @@ self: { }: mkDerivation { pname = "fix-imports"; - version = "1.0.5"; - sha256 = "01fy2s94aq7mnnp24g5i8sxvlpb6arnmv8n2fr153lwmg3n2w1qb"; + version = "1.1.0"; + sha256 = "1w2j7l6515khp0zl3cf6pyxsv55c65qqfcxi94vikd8fk88sswd9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -71361,25 +75230,12 @@ self: { ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; - version = "0.9.0.0"; - sha256 = "11scilp5j33pkq4ksg008a3qgm7sxnv0n958r60wc5n9lkx4pdic"; - libraryHaskellDepends = [ base deepseq primitive ]; - testHaskellDepends = [ base doctest filemanip primitive ]; - description = "Generic vectors with statically known size"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fixed-vector_1_0_0_0" = callPackage - ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: - mkDerivation { - pname = "fixed-vector"; - version = "1.0.0.0"; - sha256 = "1y2250frzbx750jpp9qslmhfjdx9bn8aariwng3py3kz392p7x3g"; + version = "1.1.0.0"; + sha256 = "1iclmv1xkyr1wdszrahzdim6ilqvpxrhpsiammcxishg9gwvxl0y"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base doctest filemanip primitive ]; description = "Generic vectors with statically known size"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-binary" = callPackage @@ -71396,7 +75252,6 @@ self: { ]; description = "Binary instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-cborg" = callPackage @@ -71430,33 +75285,28 @@ self: { ]; description = "Cereal instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-hetero" = callPackage - ({ mkDerivation, base, deepseq, fixed-vector, ghc-prim, primitive - , transformers - }: + ({ mkDerivation, base, deepseq, fixed-vector, primitive }: mkDerivation { pname = "fixed-vector-hetero"; - version = "0.3.1.2"; - sha256 = "0l8vphi8ijyzyk372r9i7imq8r6ki1w774gid69c8d2a2b63gvdd"; + version = "0.4.0.0"; + sha256 = "1x163xw7r95xj8m7nrsbi090pvbmvqw6wplg5ki96k6wa5slidin"; revision = "1"; - editedCabalFile = "05scgl0r3g9nnb0pfg39cinylm11wdyqr8f51k69wj5y79fzf5yz"; - libraryHaskellDepends = [ - base deepseq fixed-vector ghc-prim primitive transformers - ]; + editedCabalFile = "0gc12lyp07yjs1xhdbfwllbw2ccdr131w0naxv5cn09bh9iay5xs"; + libraryHaskellDepends = [ base deepseq fixed-vector primitive ]; homepage = "http://github.org/Shimuuar/fixed-vector-hetero"; description = "Generic heterogeneous vectors"; license = stdenv.lib.licenses.bsd3; }) {}; - "fixed-vector-hetero_0_4_0_0" = callPackage + "fixed-vector-hetero_0_5_0_0" = callPackage ({ mkDerivation, base, deepseq, fixed-vector, primitive }: mkDerivation { pname = "fixed-vector-hetero"; - version = "0.4.0.0"; - sha256 = "1x163xw7r95xj8m7nrsbi090pvbmvqw6wplg5ki96k6wa5slidin"; + version = "0.5.0.0"; + sha256 = "1446xsj030xr7zry2pqq0yxv4f0j46jmpisfmp357jb0n9l5kwm3"; libraryHaskellDepends = [ base deepseq fixed-vector primitive ]; homepage = "http://github.org/Shimuuar/fixed-vector-hetero"; description = "Generic heterogeneous vectors"; @@ -71504,6 +75354,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "fixer" = callPackage + ({ mkDerivation, aeson, base, containers, directory, genvalidity + , genvalidity-containers, genvalidity-hspec + , genvalidity-hspec-aeson, genvalidity-text, genvalidity-time + , hspec, http-api-data, http-client, mtl, QuickCheck, servant + , servant-client, stm, text, time, validity, validity-containers + , validity-time, yaml + }: + mkDerivation { + pname = "fixer"; + version = "0.0.0.0"; + sha256 = "044l199r91gsxplahilsh6ims8bxlqdi6srprdvdygqhxzhpvanf"; + libraryHaskellDepends = [ + aeson base containers directory http-api-data http-client mtl + servant servant-client stm text time validity validity-containers + validity-time yaml + ]; + testHaskellDepends = [ + aeson base containers directory genvalidity genvalidity-containers + genvalidity-hspec genvalidity-hspec-aeson genvalidity-text + genvalidity-time hspec http-api-data http-client mtl QuickCheck + servant servant-client stm text time validity validity-containers + validity-time yaml + ]; + homepage = "https://github.com/NorfairKing/fixer#readme"; + description = "A Haskell client for http://fixer.io/"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fixfile" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , directory, exceptions, filepath, hashable, hashtables, lens, mtl @@ -71571,6 +75451,7 @@ self: { homepage = "http://github.com/jxv/fixie#readme"; description = "Opininated testing framework for mtl style (spies, stubs, and mocks)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixplate" = callPackage @@ -71581,6 +75462,8 @@ self: { pname = "fixplate"; version = "0.1.7"; sha256 = "0brll5vkb3341l5iblrc1r50jzg8q6ycvbqvrc9jnj2nc86mslay"; + revision = "1"; + editedCabalFile = "0ynmm06iblqsyzfc068sdvmlpll8zwyccwkdlji3nf535biv56hb"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck @@ -71588,7 +75471,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Uniplate-style generic traversals for optionally annotated fixed-point types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fixpoint" = callPackage @@ -71635,6 +75517,7 @@ self: { libraryHaskellDepends = [ base ]; description = "test"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fizzbuzz-as-a-service" = callPackage @@ -71643,8 +75526,8 @@ self: { }: mkDerivation { pname = "fizzbuzz-as-a-service"; - version = "0.1.0.1"; - sha256 = "1m2pyvhdj8phj2f1zka6v1p72hzhmaigw2v0n1zwkh3k4hkq90kg"; + version = "0.1.0.2"; + sha256 = "0bskyv1zyk469bikh4rh6ad1i8d5ym9s89a88aw34cpphy0vq1zk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71664,6 +75547,8 @@ self: { pname = "flac"; version = "0.1.2"; sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; + revision = "3"; + editedCabalFile = "09xml5mv63q0wzw09s0ssjdzgnq041gr6gjhk63dr252rydnn4zh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions @@ -71688,6 +75573,8 @@ self: { pname = "flac-picture"; version = "0.1.1"; sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w"; + revision = "1"; + editedCabalFile = "02vdh61nzig0yrv6ja6fjlgfcznj5k4iqh3i5f9g5p078ycqb17w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring flac JuicyPixels ]; testHaskellDepends = [ @@ -71706,8 +75593,8 @@ self: { }: mkDerivation { pname = "flaccuraterip"; - version = "0.3.7"; - sha256 = "13xssivcgd561ri1mkp57cc1pi0phxs8bbiwx40xrkg4iy6r1kdh"; + version = "0.3.8"; + sha256 = "0ixk5vbnpnh3j262k5igvnglm4brypsv3b839xc51hlc29q7v9qs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71768,6 +75655,7 @@ self: { homepage = "http://github.com/tittoassini/flat"; description = "Principled and efficient bit-oriented binary serialization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flat-maybe" = callPackage @@ -71792,6 +75680,8 @@ self: { pname = "flat-mcmc"; version = "1.5.0"; sha256 = "1zgi69vgwss7hhv893n5z3av0byb5hiblha7k3ck4bbfmkgakkl7"; + revision = "1"; + editedCabalFile = "1pjkyvs4c6yx6jva08zw2b1qfhhv9q71sy806f5lddjsknnym2fn"; libraryHaskellDepends = [ base formatting mcmc-types monad-par monad-par-extras mwc-probability pipes primitive text transformers vector @@ -71817,15 +75707,17 @@ self: { }) {}; "flay" = callPackage - ({ mkDerivation, base, constraints, tasty, tasty-quickcheck }: + ({ mkDerivation, base, constraints, ghc-prim, tasty + , tasty-quickcheck + }: mkDerivation { pname = "flay"; - version = "0.1"; - sha256 = "18wdvidn1d4cnxcl11nfabqjqx5dpgvijim46wvp3dfvh8lc8kn4"; - libraryHaskellDepends = [ base constraints ]; + version = "0.2"; + sha256 = "1sdwcjjsgq0ba84474pdnvppg66vmqsqn6frb97ricdnyy78lg11"; + libraryHaskellDepends = [ base constraints ghc-prim ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; homepage = "https://github.com/k0001/flay"; - description = "Work on your datatype without knowing its shape nor its contents"; + description = "Work generically on your datatype without knowing its shape nor its contents"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -71939,6 +75831,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "flip-cmd" = callPackage + ({ mkDerivation, base, process, safe-exceptions }: + mkDerivation { + pname = "flip-cmd"; + version = "0.1.0.0"; + sha256 = "1pl31lfsfsc1qlnkrvif3j9imz6pac325bgys7x7365xy46zkad6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base process safe-exceptions ]; + homepage = "https://github.com/aiya000/hs-flip-cmd"; + description = "e.g. `flip systemctl foo.service start` does `systemctl start foo.service`"; + license = stdenv.lib.licenses.mit; + }) {}; + "flippers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -72041,8 +75947,8 @@ self: { pname = "flock"; version = "0.3.1.8"; sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n"; - revision = "2"; - editedCabalFile = "0xsi6bwqd57qwr9bjd2nck7q3gbmbsl9pb1rk6h4bbmm1ciybv19"; + revision = "3"; + editedCabalFile = "06hdirzgghlxpdymb5b5l58v20m34lmn2z8hmp9lwcskc8xfqqfn"; libraryHaskellDepends = [ base lifted-base monad-control transformers unix ]; @@ -72055,8 +75961,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.9"; - sha256 = "1rqljbq4s9swh19r57gpp3nzxwgwa1j0q53m971i455wq1xszx1m"; + version = "1.0.12"; + sha256 = "0c9mg6d8krv7c0sxlkgcpvhcspb8g65hp0h7pgjql4644ivqpn3p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; homepage = "https://github.com/tfausak/flow#readme"; @@ -72243,8 +76149,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.4.1"; - sha256 = "0yclwq488g9mz6wsjcch7c5kwgc97rxp0lqjlfj44vbqbjk72l5x"; + version = "0.5.4.5"; + sha256 = "17iqpnn0zgwifb937kllkfyz8qf37da90z8iyay348gy3siwjxic"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -72340,6 +76246,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "A structured logger for Fluentd (Haskell)"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fluent-logger-conduit" = callPackage @@ -72355,30 +76262,65 @@ self: { ]; description = "Conduit interface for fluent-logger"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "fluffy" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, MonadRandom + , postgresql-simple, resource-pool, text, time, uuid-types + , yesod-core, yesod-static + }: + mkDerivation { + pname = "fluffy"; + version = "0.1.0.71"; + sha256 = "12l05bmy0qvz9ch37m035qhn8f4rz83m5s5m9x47ivnf59ir74fr"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + aeson base bytestring cmdargs MonadRandom postgresql-simple + resource-pool text time uuid-types yesod-core yesod-static + ]; + description = "A simple web application as a online practice website for XDU SE 2017 fall SPM"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "fluffy-parser" = callPackage + ({ mkDerivation, base, binary, bytestring, pandoc, parsec + , postgresql-simple + }: + mkDerivation { + pname = "fluffy-parser"; + version = "0.1.0.50"; + sha256 = "0arxcw5x594dc5c82wyasl3v2jmbw1d5bbs0gafdg3n1n95bv278"; + libraryHaskellDepends = [ + base binary bytestring pandoc parsec postgresql-simple + ]; + description = "The parser for fluffy to parsec the question bank in .docx type"; + license = stdenv.lib.licenses.gpl3; }) {}; "fluid-idl" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, errors - , exceptions, fluid, hspec, lifted-async, monad-control + ({ mkDerivation, aeson, base, blaze-markup, bytestring, containers + , errors, exceptions, hspec, lifted-async, monad-control , monad-logger, mtl, random, safe-exceptions, scientific, text - , text-conversions, tuple, unordered-containers, vector + , text-conversions, unordered-containers, vector }: mkDerivation { pname = "fluid-idl"; - version = "0.0.4"; - sha256 = "1kdiq6mw01dr85ii7vg7bsw8m260y6njjf5afx3p718hsxwiw4yr"; + version = "0.0.6"; + sha256 = "06zdwvjdgv401h5gf3zagvxd01r20pldv327ag3d8clwvg51sgnr"; libraryHaskellDepends = [ - aeson base bytestring containers errors exceptions lifted-async - monad-control monad-logger mtl random safe-exceptions scientific - text text-conversions unordered-containers vector + aeson base blaze-markup bytestring containers errors exceptions + lifted-async monad-control monad-logger mtl random safe-exceptions + scientific text text-conversions unordered-containers vector ]; testHaskellDepends = [ - aeson base containers fluid hspec scientific text tuple vector + aeson base containers hspec scientific text vector ]; - description = "Fluid | The Programmatic IDL"; + description = "Code-generated, Auto-versioned, & Smart Web APIs"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {fluid = null;}; + }) {}; "fluid-idl-http-client" = callPackage ({ mkDerivation, aeson, base, bytestring, fluid-idl, http-client @@ -72448,8 +76390,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fmlist"; - version = "0.9"; - sha256 = "1gzwmsrbxk22v7syf8zfvxphm23dmjzfpysz6qww3qvib8wm64aq"; + version = "0.9.2"; + sha256 = "02868865hqm189h5wjd916abvqwkhbrx5b0119s1dwp70ifvbi4g"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/sjoerdvisscher/fmlist"; description = "FoldMap lists"; @@ -72464,8 +76406,10 @@ self: { }: mkDerivation { pname = "fmt"; - version = "0.3.0.0"; - sha256 = "1dihbcawpf082maxw3g6gsp1n8cmfdil4llqa3wmf37dqyi2bvjm"; + version = "0.5.0.0"; + sha256 = "156iv5c5aqlc6mmc5qcnsa4plhp99n4mzmm8rspxrc84gkl1agnf"; + revision = "1"; + editedCabalFile = "1vdgh45qv5jk1ym4y54sjgk0cnqhrqqi6iirrw8drq20v1srbpl3"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring containers microlens text text-format time time-locale-compat @@ -72482,26 +76426,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fmt_0_5_0_0" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, containers, criterion, deepseq, formatting, hspec - , interpolate, microlens, neat-interpolation, text, text-format - , time, time-locale-compat, vector + "fmt_0_6" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, call-stack + , containers, criterion, deepseq, doctest, doctest-discover + , formatting, hspec, interpolate, microlens, neat-interpolation + , text, time, time-locale-compat, vector }: mkDerivation { pname = "fmt"; - version = "0.5.0.0"; - sha256 = "156iv5c5aqlc6mmc5qcnsa4plhp99n4mzmm8rspxrc84gkl1agnf"; + version = "0.6"; + sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy"; libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring containers - microlens text text-format time time-locale-compat + base base64-bytestring bytestring containers formatting microlens + text time time-locale-compat ]; testHaskellDepends = [ - base bytestring containers hspec neat-interpolation text vector + base bytestring call-stack containers doctest hspec + neat-interpolation text vector ]; + testToolDepends = [ doctest-discover ]; benchmarkHaskellDepends = [ base bytestring containers criterion deepseq formatting interpolate - text text-format vector + text vector ]; homepage = "http://github.com/aelve/fmt"; description = "A new formatting library"; @@ -72570,8 +76516,8 @@ self: { }: mkDerivation { pname = "fold-debounce"; - version = "0.2.0.6"; - sha256 = "133q81c6gvk6zgn3zv5wkvp5sa6b5fvzf9i4facs9s00l7y2nrgk"; + version = "0.2.0.7"; + sha256 = "13y6l6ng5rrva0sx9sa4adp6p2yrpyfz91v3jbkamgh4g99w8zpz"; libraryHaskellDepends = [ base data-default-class stm stm-delay time ]; @@ -72587,8 +76533,8 @@ self: { }: mkDerivation { pname = "fold-debounce-conduit"; - version = "0.1.0.5"; - sha256 = "1k441whksiwss55j7q7iwhr90hdj02dy7jg2rhd2ijz1ysy76gi5"; + version = "0.2.0.1"; + sha256 = "02shx123yd9g9y8n9aj6ai6yrlcb7zjqyhvw530kw68ailnl762z"; libraryHaskellDepends = [ base conduit fold-debounce resourcet stm transformers transformers-base @@ -72604,25 +76550,24 @@ self: { "foldl" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, hashable, mwc-random, primitive - , profunctors, text, transformers, unordered-containers, vector + , profunctors, semigroups, text, transformers, unordered-containers + , vector, vector-builder }: mkDerivation { pname = "foldl"; - version = "1.2.5"; - sha256 = "0jzc00dqwkr3kvy40f8f9klh24s8zvhfk2flrlyichc6zcy5qbda"; - revision = "1"; - editedCabalFile = "02lk5838594mi15bylz2kpcm1c4akbsswj73i7k8xw4ns66iaq04"; + version = "1.3.7"; + sha256 = "113966zyk1jj8l1k1izfix8bc1hmpr9w1zahkz592f56wmvmy8kn"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable - mwc-random primitive profunctors text transformers - unordered-containers vector + mwc-random primitive profunctors semigroups text transformers + unordered-containers vector vector-builder ]; benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; }) {}; - "foldl_1_3_3" = callPackage + "foldl_1_4_0" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, hashable, mwc-random, primitive , profunctors, semigroups, text, transformers, unordered-containers @@ -72630,8 +76575,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.3.3"; - sha256 = "18gzis64sa7ifclaz3n10j2lkh4ikvbakrkz2kkipjddafidvsr3"; + version = "1.4.0"; + sha256 = "16vx35yl853g9ql9ncpa6r29bg5cai40s7jnpjj2d06ij9cad955"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroups text transformers @@ -72667,15 +76612,18 @@ self: { }) {}; "foldl-statistics" = callPackage - ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random - , profunctors, quickcheck-instances, statistics, tasty - , tasty-quickcheck, vector + ({ mkDerivation, base, containers, criterion, foldl, hashable + , math-functions, mwc-random, profunctors, quickcheck-instances + , statistics, tasty, tasty-quickcheck, unordered-containers, vector }: mkDerivation { pname = "foldl-statistics"; - version = "0.1.4.6"; - sha256 = "05ibj8gw86n5jspn5qnvvqyihb1fanmk86xxrm04sghxbfc9szzy"; - libraryHaskellDepends = [ base foldl math-functions profunctors ]; + version = "0.1.5.0"; + sha256 = "1z9qx7kiaidl3icz6g3rd6pyycwnvyv7xyw8g6p1n7rpvz60633b"; + libraryHaskellDepends = [ + base containers foldl hashable math-functions profunctors + unordered-containers + ]; testHaskellDepends = [ base foldl profunctors quickcheck-instances statistics tasty tasty-quickcheck vector @@ -72713,6 +76661,7 @@ self: { ]; description = "Transducers for foldl folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl-transduce-attoparsec" = callPackage @@ -72734,6 +76683,7 @@ self: { ]; description = "Attoparsec and foldl-transduce integration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "folds" = callPackage @@ -72777,16 +76727,20 @@ self: { }) {}; "folgerhs" = callPackage - ({ mkDerivation, base, xml }: + ({ mkDerivation, array, base, containers, gloss + , optparse-applicative, xml + }: mkDerivation { pname = "folgerhs"; - version = "0.1.0.1"; - sha256 = "0kn89abvbk7faynhsyg177rayxddvwnkgsjb5cng8044n9glw9sb"; + version = "0.3.0.2"; + sha256 = "0dxig93mf29778sq71wz913d405g07dzkpbjp8cm4xsz1p86xryh"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base xml ]; - executableHaskellDepends = [ base xml ]; - homepage = "https://github.com/SU-LOSP/tools#readme"; + libraryHaskellDepends = [ array base containers gloss xml ]; + executableHaskellDepends = [ + array base containers gloss optparse-applicative xml + ]; + homepage = "https://github.com/SU-LOSP/folgerhs#readme"; description = "Toolset for Folger Shakespeare Library's XML annotated plays"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -72954,8 +76908,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "1"; - editedCabalFile = "1ydj5ng7wsi9jg6xw9bg8c7wrsg2jpnvjkjvzxaf6n8sjs0gxhvw"; + revision = "2"; + editedCabalFile = "1dj785ih5bla68yzxkpsilwj1p1xv6a8rh76rz799aap5injda0z"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -73029,15 +76983,15 @@ self: { }) {}; "forest" = callPackage - ({ mkDerivation, aeson, base, bifunctors, deepseq, hashable - , profunctors, semigroupoids + ({ mkDerivation, aeson, base, deepseq, hashable, profunctors + , semigroupoids }: mkDerivation { pname = "forest"; version = "0.2"; sha256 = "0z8wfvylzcls994yg3s4bywjxl3592y4ba6gcn2h8ndc7c8w09v4"; libraryHaskellDepends = [ - aeson base bifunctors deepseq hashable profunctors semigroupoids + aeson base deepseq hashable profunctors semigroupoids ]; homepage = "https://github.com/duairc/forest"; description = "Tree and Forest types"; @@ -73050,8 +77004,8 @@ self: { }: mkDerivation { pname = "forest-fire"; - version = "0.2.2"; - sha256 = "053gp1wmzfhn26gq0awhz3fas8vcjbx953cis4r4ahfzwvy71r7r"; + version = "0.3"; + sha256 = "09h8hpb9b0hsj2bpwywxdk2a1ww1si3g5rn5n6ajq5dgvqki8rlp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73104,6 +77058,8 @@ self: { pname = "forma"; version = "0.2.0"; sha256 = "05rd0v908imlfvp5m3lb5mc629790yyazsj79rpx0svhnxgsgl00"; + revision = "1"; + editedCabalFile = "1hqay7gjhnlxya08qwmxnwriy958awafvyi7rws6wla5m1cq0wr6"; libraryHaskellDepends = [ aeson base containers data-default-class mtl text unordered-containers @@ -73205,20 +77161,42 @@ self: { }) {}; "formatting" = callPackage - ({ mkDerivation, base, clock, old-locale, scientific, text - , text-format, time + ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec + , integer-gmp, old-locale, scientific, semigroups, text, time + , transformers }: mkDerivation { pname = "formatting"; - version = "6.2.5"; - sha256 = "0k4z8b9x91m243kplx9gap1rqyvdszf3241aq7pkqwrybbzgm8yh"; + version = "6.3.2"; + sha256 = "1h5jy7y2cd1qaymypw8hfr52924szas0jd2hvjpbr5mrwssvhkqf"; libraryHaskellDepends = [ - base clock old-locale scientific text text-format time + array base bytestring clock ghc-prim integer-gmp old-locale + scientific semigroups text time transformers ]; + testHaskellDepends = [ base hspec semigroups ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_3_4" = callPackage + ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec + , integer-gmp, old-locale, scientific, semigroups, text, time + , transformers + }: + mkDerivation { + pname = "formatting"; + version = "6.3.4"; + sha256 = "1rcnnzbn1671lcwllpppgh3yv99k83y2n40r8mgsk08hsk1qs0wx"; + libraryHaskellDepends = [ + array base bytestring clock ghc-prim integer-gmp old-locale + scientific semigroups text time transformers + ]; + testHaskellDepends = [ base hspec semigroups ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -73303,6 +77281,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "forsyde-shallow" = callPackage + ({ mkDerivation, base, directory, hspec, old-time, process, random + }: + mkDerivation { + pname = "forsyde-shallow"; + version = "3.3.2.0"; + sha256 = "1cfqv2mn1ccbp2j7vnjj123ys2n5s414dqid4ywy1l749pzf7w1j"; + libraryHaskellDepends = [ base directory old-time process random ]; + testHaskellDepends = [ base hspec ]; + homepage = "http://forsyde.ict.kth.se/"; + description = "ForSyDe's Haskell-embedded Domain Specific Language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "forth-hll" = callPackage ({ mkDerivation, array-forth, base, free, mtl }: mkDerivation { @@ -73349,16 +77341,16 @@ self: { }: mkDerivation { pname = "fortytwo"; - version = "1.0.2"; - sha256 = "15imj5ps040iz5abfnzjpgfq726j9c28bwwg06zbf07ji74dz190"; + version = "1.0.3"; + sha256 = "113z46b5dnf6z7bxw1a4vhr84w5pw0iridsi3wjimhjz0rr530cm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base text ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ async base doctest hspec process ]; homepage = "https://github.com/gianlucaguarini/fortytwo#readme"; description = "Interactive terminal prompt"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forward-chan" = callPackage @@ -73447,10 +77439,8 @@ self: { ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; - version = "0.0.17"; - sha256 = "00f2p47h715fjb3rpsxlf4jskgwk9sz5p692r09gspspqmrs5l84"; - revision = "1"; - editedCabalFile = "15y38y0mj4vc694jwh3cjgnq8xv5vv7954g633f7mw5f0hb3yxkn"; + version = "0.0.20"; + sha256 = "0bg4g0xf4pb2vmahnfp8c4f0a3v0av73lb5g8bwnp170khxfcsms"; libraryHaskellDepends = [ base basement ghc-prim ]; testHaskellDepends = [ base basement ]; benchmarkHaskellDepends = [ base basement gauge ]; @@ -73463,15 +77453,12 @@ self: { ({ mkDerivation, bytestring, foundation, text }: mkDerivation { pname = "foundation-edge"; - version = "0.0.2"; - sha256 = "1ddcw4a8gmlcb6pgy2sysp6inpm19i7j1cg9ix3z5fwkpxg2kr71"; - revision = "1"; - editedCabalFile = "01w5bjjavfq76s43c2f0wbna6rn6yilivsq7s8ws5i1kqav9yffx"; + version = "0.0.3"; + sha256 = "0dqpalqn9p10vmz3sw60aga76rpi4d92hrvq2v91pv44p1iva2mb"; libraryHaskellDepends = [ bytestring foundation text ]; - homepage = "https://github.com/haskell-foundation/foundation-edge"; + homepage = "https://github.com/haskell-foundation/foundation"; description = "foundation's edge with the conventional set of packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fountain" = callPackage @@ -73690,6 +77677,7 @@ self: { executableHaskellDepends = [ pretty ]; description = "A simple web framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -73760,18 +77748,20 @@ self: { "free" = callPackage ({ mkDerivation, base, bifunctors, comonad, containers - , distributive, exceptions, mtl, prelude-extras, profunctors - , semigroupoids, semigroups, template-haskell, transformers + , distributive, exceptions, mtl, profunctors, semigroupoids + , semigroups, template-haskell, transformers, transformers-base , transformers-compat }: mkDerivation { pname = "free"; - version = "4.12.4"; - sha256 = "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9"; + version = "5.0.1"; + sha256 = "16b29r9f9j7wpd99zbspkxq22rm6r2shqv1isa1ipqfbzn9bap5p"; + revision = "1"; + editedCabalFile = "0d6wzbazlw9yamka4p01scqypl6kcg2kzh00amim40wx6f4sdyqj"; libraryHaskellDepends = [ base bifunctors comonad containers distributive exceptions mtl - prelude-extras profunctors semigroupoids semigroups - template-haskell transformers transformers-compat + profunctors semigroupoids semigroups template-haskell transformers + transformers-base transformers-compat ]; homepage = "http://github.com/ekmett/free/"; description = "Monads for free"; @@ -73813,8 +77803,8 @@ self: { }: mkDerivation { pname = "free-functors"; - version = "0.8.1"; - sha256 = "0l9l7292vdwsiqynh62f277ilbill3azws6rajyjrv1lp1ll9ys0"; + version = "0.8.4"; + sha256 = "0qdllnqghnx6j51zyxqblnz809w7l86qp0d9dg8a4l4kllp1y703"; libraryHaskellDepends = [ algebraic-classes base bifunctors comonad constraints contravariant profunctors template-haskell transformers @@ -73975,14 +77965,15 @@ self: { }) {}; "free-vector-spaces" = callPackage - ({ mkDerivation, base, lens, linear, MemoTrie, vector, vector-space + ({ mkDerivation, base, lens, linear, MemoTrie, pragmatic-show + , vector, vector-space }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.4.0"; - sha256 = "057l1fnkqyqnjbhzjz2jjlcrsmkcv2gd16gb5n3j99crw97s62xj"; + version = "0.1.5.0"; + sha256 = "0rf6yhjcd2x4yj2jvyl6yc8x55a2hqhj5mxzg4f24734agh720z1"; libraryHaskellDepends = [ - base lens linear MemoTrie vector vector-space + base lens linear MemoTrie pragmatic-show vector vector-space ]; homepage = "https://github.com/leftaroundabout/free-vector-spaces"; description = "Instantiate the classes from the vector-space package with types from linear"; @@ -74032,23 +78023,23 @@ self: { }) {}; "freelude" = callPackage - ({ mkDerivation, array, base, containers, doctest, indextype - , transformers + ({ mkDerivation, array, base, bytestring, containers, doctest + , indextype, text, transformers }: mkDerivation { pname = "freelude"; - version = "0.1.0.1"; - sha256 = "0a16vbm17dvvfk9wp8y9df8qypy14vld4yq20hh273p2cdxx5p2n"; + version = "0.3.2.0"; + sha256 = "1gwgzdpnwjyihmrbq3zx24a9nlcn78g1gjsc091gffszszzf1mxk"; libraryHaskellDepends = [ - array base containers indextype transformers + array base bytestring containers indextype text transformers ]; testHaskellDepends = [ - array base containers doctest indextype transformers + array base bytestring containers doctest indextype text + transformers ]; homepage = "https://github.com/clintonmead/freelude#readme"; description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freenect" = callPackage @@ -74103,6 +78094,7 @@ self: { ]; description = "Handle effects conversely using monadic conversation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freer-effects" = callPackage @@ -74124,6 +78116,33 @@ self: { homepage = "https://github.com/IxpertaSolutions/freer-effects"; description = "Implementation of effect system for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "freer-simple" = callPackage + ({ mkDerivation, base, criterion, extensible-effects, free, mtl + , natural-transformation, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers-base + }: + mkDerivation { + pname = "freer-simple"; + version = "1.1.0.0"; + sha256 = "00dvn620xg24pxw1h9p7dgl5wj25q77mfdsmxlmijsr0ysqwv611"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base natural-transformation transformers-base + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion extensible-effects free mtl + ]; + homepage = "https://github.com/lexi-lambda/freer-simple#readme"; + description = "Implementation of a friendly effect system for Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "freesect" = callPackage @@ -74185,7 +78204,7 @@ self: { }) {}; "freetype2" = callPackage - ({ mkDerivation, array, base }: + ({ mkDerivation, base }: mkDerivation { pname = "freetype2"; version = "0.1.2"; @@ -74193,7 +78212,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ array base ]; description = "Haskell binding for FreeType 2 library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -74211,6 +78229,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "freq" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "freq"; + version = "0.0.0"; + sha256 = "0vrhdmhahhxp43312864mvq38w8100970n92vjd77fj50cbh0r2i"; + doHaddock = false; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fresco-binding" = callPackage ({ mkDerivation, base, binary, binary-serialise-cbor, bytestring , containers, text, unix @@ -74224,6 +78253,7 @@ self: { ]; description = "Fresco binding for Haskell"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fresh" = callPackage @@ -74286,13 +78316,13 @@ self: { }: mkDerivation { pname = "friday-juicypixels"; - version = "0.1.2.1"; - sha256 = "1x0s4m4zmmaz9sa000pwip6cagjza6c8w7i9zikpb8z7xn21i1na"; + version = "0.1.2.4"; + sha256 = "0gxfj3x5w65dfnkf6ymjs27w2i14yv2m218qgmvx1p80wy7q4nbd"; libraryHaskellDepends = [ base friday JuicyPixels vector ]; testHaskellDepends = [ base bytestring file-embed friday hspec JuicyPixels ]; - homepage = "https://github.com/TomMD/friday-juicypixels"; + homepage = "github.com/TomMD/friday-juicypixels"; description = "Converts between the Friday and JuicyPixels image types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -74332,8 +78362,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, semigroups }: mkDerivation { pname = "frisby"; - version = "0.2.1"; - sha256 = "1xlfidsivvq9a152k3cg3ancyma3lc177jcbk6c0cgpd7zzpiib4"; + version = "0.2.2"; + sha256 = "1mdncc38qwakadr8q4ncz9vzvx9scfhlgk2m540y2mjdypdiicy1"; libraryHaskellDepends = [ array base containers mtl semigroups ]; homepage = "http://repetae.net/computer/frisby/"; description = "Linear time composable parser for PEG grammars"; @@ -74381,14 +78411,15 @@ self: { executableHaskellDepends = [ base directory ]; description = "LALR(k) parser generator"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frp-arduino" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "frp-arduino"; - version = "0.1.0.3"; - sha256 = "00659x5f5dq4lb25ss880cqggqc63i7wqik04qvzk1kq3dl9six5"; + version = "0.1.1.0"; + sha256 = "18mnxlwlyh4q18xc9svpwma3qgwp473dfg1z1rmdll6za82zmvzn"; libraryHaskellDepends = [ base containers mtl ]; homepage = "http://github.com/frp-arduino/frp-arduino"; description = "Arduino programming without the hassle of C"; @@ -74454,7 +78485,22 @@ self: { homepage = "https://github.com/george-steel/frpnow-gtk3"; description = "Program GUIs with GTK3 and frpnow!"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + }) {}; + + "frpnow-vty" = callPackage + ({ mkDerivation, base, containers, frpnow, vty }: + mkDerivation { + pname = "frpnow-vty"; + version = "0.2.0.1"; + sha256 = "06rd09a13kssxzbspm1r172m5wf94fph0sjm78jd29d8ml279p1h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base frpnow vty ]; + executableHaskellDepends = [ base containers frpnow vty ]; + homepage = "https://github.com/noughtmare/frpnow-vty"; + description = "Program terminal applications with vty and frpnow!"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frquotes" = callPackage @@ -74532,6 +78578,8 @@ self: { pname = "fsnotify"; version = "0.2.1.1"; sha256 = "146wsblhfwnbclzffxk6m43bqap3sgw332gs67030z6h5ab7anhp"; + revision = "1"; + editedCabalFile = "0kag32lqkjmv03bycf6ip2vd6vzpcpq4iqs6ivyjh93v40252xxp"; libraryHaskellDepends = [ async base containers directory filepath hinotify text time unix-compat @@ -74617,6 +78665,7 @@ self: { homepage = "https://github.com/ixmatus/fswait"; description = "Wait and observe events on the filesystem for a path, with a timeout"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fswatch" = callPackage @@ -74638,7 +78687,6 @@ self: { homepage = "https://github.com/kelemzol/watch"; description = "File System watching tool with cli and slave functionalities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fswatcher" = callPackage @@ -74695,6 +78743,7 @@ self: { homepage = "https://github.com/mr/ftp-client"; description = "Transfer files with FTP and FTPS"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ftp-client-conduit" = callPackage @@ -74713,6 +78762,7 @@ self: { homepage = "https://github.com/mr/ftp-client"; description = "Transfer file with FTP and FTPS with Conduit"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ftp-clientconduit = null;}; @@ -74808,8 +78858,8 @@ self: { }) {}; "full-text-search" = callPackage - ({ mkDerivation, alex, array, base, containers, happy, QuickCheck - , tasty, tasty-quickcheck, text, vector + ({ mkDerivation, array, base, containers, QuickCheck, tasty + , tasty-quickcheck, text, vector }: mkDerivation { pname = "full-text-search"; @@ -74818,13 +78868,11 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers text vector ]; - executableToolDepends = [ alex happy ]; testHaskellDepends = [ array base containers QuickCheck tasty tasty-quickcheck text vector ]; description = "In-memory full text search engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fullstop" = callPackage @@ -74932,36 +78980,39 @@ self: { }) {}; "funcmp" = callPackage - ({ mkDerivation, base, filepath, process }: + ({ mkDerivation, base, filepath, pretty, process }: mkDerivation { pname = "funcmp"; - version = "1.8"; - sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k"; + version = "1.9"; + sha256 = "1d5appkjhajb9ndv2gwnfz8lw2w53v8baajzmrhg26ihzj1bkch8"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base filepath process ]; - homepage = "http://savannah.nongnu.org/projects/funcmp/"; - description = "Functional MetaPost"; + libraryHaskellDepends = [ base filepath pretty process ]; + homepage = "https://github.com/peti/funcmp"; + description = "Functional MetaPost is a Haskell frontend to the MetaPost language"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "funcons-tools" = callPackage - ({ mkDerivation, base, bv, containers, directory, mtl, multiset - , parsec, split, text, vector + ({ mkDerivation, base, bv, containers, directory, funcons-values + , gll, mtl, multiset, random-strings, regex-applicative, split + , text, TypeCompose, vector }: mkDerivation { pname = "funcons-tools"; - version = "0.1.0.0"; - sha256 = "1vwnznj92cm2g1m2xlvj8b5qzaspl3zrygr5z7b8593qylm6bwlr"; - revision = "2"; - editedCabalFile = "0530f406ykmb4xxmh7knmaxgcpym7n2wl6d2ylvrn3azqfdsvsgy"; + version = "0.2.0.1"; + sha256 = "1a27xhzakvrc29kli293ivkzmqfma71s942a9bsyvss15g1881fn"; + revision = "1"; + editedCabalFile = "1lfqgrrc814j0zyx2z8v0nx367bgifr93gb86dd4hshz2vvq5b49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bv containers directory mtl multiset parsec split text vector + base bv containers directory funcons-values gll mtl multiset + random-strings regex-applicative split text TypeCompose vector ]; executableHaskellDepends = [ - base bv containers directory mtl multiset parsec split text vector + base bv containers directory funcons-values gll mtl multiset + random-strings regex-applicative split text TypeCompose vector ]; homepage = "http://plancomps.org"; description = "A modular interpreter for executing funcons"; @@ -74969,6 +79020,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "funcons-values" = callPackage + ({ mkDerivation, base, bv, containers, multiset, random-strings + , text, vector + }: + mkDerivation { + pname = "funcons-values"; + version = "0.1.0.2"; + sha256 = "0pywpqnjhwny1l1kz6hn135rbmgdglzpvfvq4ffjllzdj2w9ciy2"; + libraryHaskellDepends = [ + base bv containers multiset random-strings text vector + ]; + homepage = "http://plancomps.org"; + description = "Library providing values and operations on values"; + license = stdenv.lib.licenses.mit; + }) {}; + "function-combine" = callPackage ({ mkDerivation, base, data-type }: mkDerivation { @@ -75018,6 +79085,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "functor" = callPackage + ({ mkDerivation, base, category }: + mkDerivation { + pname = "functor"; + version = "0.1.0.0"; + sha256 = "03s0gpxg1k5f26lxyq617ly57c56w0k6nm59h6dwdkc3w2ainqiv"; + revision = "1"; + editedCabalFile = "0yl3pxzggr05rjizmpy7fli7ribc157vci46z084dn6jqlnlbh3a"; + libraryHaskellDepends = [ base category ]; + description = "Functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "functor-apply" = callPackage ({ mkDerivation }: mkDerivation { @@ -75038,8 +79119,8 @@ self: { pname = "functor-classes-compat"; version = "1"; sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; - revision = "1"; - editedCabalFile = "04blby010250gyg0v7nwdr9hwzvkapmfy9xn5522h8jmb3yygh8l"; + revision = "2"; + editedCabalFile = "07ldwmqfwi2lgnmia5bb0885664a54g2q55f91swgafb11n0csqg"; libraryHaskellDepends = [ base containers hashable unordered-containers vector ]; @@ -75086,6 +79167,7 @@ self: { homepage = "https://github.com/fmap/functor-infix"; description = "Infix operators for mapping over compositions of functors. Lots of them."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "functor-monadic" = callPackage @@ -75101,13 +79183,13 @@ self: { }) {}; "functor-utils" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base, ghc-prim, lens }: mkDerivation { pname = "functor-utils"; - version = "1.1"; - sha256 = "1finmjwpw4sjzwifjmcpb90wmy7abhdnrhz2p5s7fxw68vccnm50"; - libraryHaskellDepends = [ base ghc-prim ]; - homepage = "https://github.com/wdanilo/functor-utils"; + version = "1.17.1"; + sha256 = "1ixssxdhw94l1kjxd5k4gvq8wz4b9d0vww5mg2al9q3vzb7d4pld"; + libraryHaskellDepends = [ base ghc-prim lens ]; + homepage = "https://github.com/luna/functor-utils"; description = "Collection of functor utilities, providing handy operators, like generalization of (.)."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -75291,6 +79373,7 @@ self: { homepage = "http://github.com/joom/fuzzy"; description = "Filters a list based on a fuzzy string search"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzy-timings" = callPackage @@ -75321,8 +79404,8 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.2"; - sha256 = "1gpx8qw9vxlardjxncgkbbk3zvq8zjrc6nhjk80va7d7ix5zpdhz"; + version = "0.1.0.6"; + sha256 = "18v1zsmdgy5if7l23vciip6dbbhbpgvn0dy0ray0pqwdcw9yh6kk"; libraryHaskellDepends = [ base base-unicode-symbols data-default lens text text-metrics unordered-containers vector @@ -75350,7 +79433,6 @@ self: { ]; description = "A 'ten past six' style clock"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fwgl" = callPackage @@ -75406,12 +79488,12 @@ self: { }) {}; "fx" = callPackage - ({ mkDerivation, base, base-prelude, transformers }: + ({ mkDerivation, base }: mkDerivation { pname = "fx"; - version = "0.7"; - sha256 = "114psjyz9jvda86gk29x9xl2h1r6a6lxxhpl4zw5wkf3zszjsylc"; - libraryHaskellDepends = [ base base-prelude transformers ]; + version = "0.10.1"; + sha256 = "1awscv2y8ywcyyn08hdmlh3qdjs33akr7grfdfls59rmhidg4fhd"; + libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/fx"; description = "Horizontally composable effects"; license = stdenv.lib.licenses.mit; @@ -75446,16 +79528,19 @@ self: { }) {}; "g4ip-prover" = callPackage - ({ mkDerivation, array, base }: + ({ mkDerivation, array, base, directory, system-filepath }: mkDerivation { pname = "g4ip-prover"; - version = "0.1.0.0"; - sha256 = "0sx2qvji1vj8p67bfdj9vdyvyin62r5rh39zfr9njx43m9may48g"; + version = "0.1.0.1"; + sha256 = "1r1i8i5vwy02zaccqjlv6w5qlpbp61lc4im9sz2wlkc8yx2yj8bg"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ array base ]; + executableHaskellDepends = [ + array base directory system-filepath + ]; description = "Theorem prover for intuitionistic propositional logic using G4ip"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gact" = callPackage @@ -75584,6 +79669,7 @@ self: { ]; description = "Automatically spin up and spin down local daemons"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gargoyle-postgresql" = callPackage @@ -75604,6 +79690,20 @@ self: { ]; description = "Manage PostgreSQL servers with gargoyle"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "garlic-bread" = callPackage + ({ mkDerivation, base, hspec, mtl, transformers }: + mkDerivation { + pname = "garlic-bread"; + version = "0.1.0.1"; + sha256 = "1mky2jm8qadlv4534xnzfn4r24dipw6ac8s3wpkf90mxw9s6m8xm"; + libraryHaskellDepends = [ base mtl transformers ]; + testHaskellDepends = [ base hspec mtl transformers ]; + homepage = "https://github.com/parsonsmatt/garlic-bread#readme"; + description = "A monad transformer for keeping track of where you've come from"; + license = stdenv.lib.licenses.bsd3; }) {}; "garsia-wachs" = callPackage @@ -75629,17 +79729,15 @@ self: { }) {}; "gauge" = callPackage - ({ mkDerivation, base, basement, bytestring, code-page, containers - , deepseq, directory, HUnit, math-functions, mwc-random, tasty - , tasty-hunit, vector + ({ mkDerivation, base, basement, bytestring, deepseq, directory + , HUnit, process, tasty, tasty-hunit, vector }: mkDerivation { pname = "gauge"; - version = "0.1.3"; - sha256 = "1i97f00haj4832s2arbnqq19dpna54ygmchvnqkq00hsxk38cyc0"; + version = "0.2.1"; + sha256 = "0401b5jzfib4wxwicqynhkn79q98hnxrpiqk1b353a6wix55hy1d"; libraryHaskellDepends = [ - base basement code-page containers deepseq math-functions - mwc-random vector + base basement deepseq directory process vector ]; testHaskellDepends = [ base bytestring deepseq directory HUnit tasty tasty-hunit @@ -75883,21 +79981,22 @@ self: { }) {}; "gedcom" = callPackage - ({ mkDerivation, array, base, bytestring, containers, megaparsec - , monad-loops, mtl, text-all, time + ({ mkDerivation, array, base, bytestring, containers, hspec + , megaparsec, monad-loops, mtl, text-all, time }: mkDerivation { pname = "gedcom"; - version = "0.1.0.0"; - sha256 = "099y6vgw81v31aijyl81hdijs5vry77jg4qy2gl8w7scn2zp2p58"; + version = "0.2.0.0"; + sha256 = "1hwjrljmwr7ywi213lxvfp6c98ydlxngr7hrhcx7ylngw165al7y"; libraryHaskellDepends = [ array base bytestring containers megaparsec monad-loops mtl text-all time ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec megaparsec text-all ]; homepage = "https://github.com/CLowcay/hs-gedcom"; description = "Parser for the GEDCOM genealogy file format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geek" = callPackage @@ -76005,6 +80104,7 @@ self: { homepage = "https://github.com/schell/gelatin/gelatin-freetype2#readme"; description = "FreeType2 based text rendering for the gelatin realtime rendering system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gelatin-fruity" = callPackage @@ -76017,6 +80117,7 @@ self: { homepage = "https://github.com/schell/gelatin-fruity#readme"; description = "Gelatin's support for rendering TTF outlines, using FontyFruity"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gelatin-gl" = callPackage @@ -76039,6 +80140,7 @@ self: { homepage = "https://github.com/schell/gelatin/gelatin-gl"; description = "OpenGL rendering routines for the gelatin-picture graphics EDSL"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gelatin-sdl2" = callPackage @@ -76057,6 +80159,7 @@ self: { homepage = "https://github.com/schell/gelatin"; description = "An SDL2 backend for the gelatin renderer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gelatin-shaders" = callPackage @@ -76070,6 +80173,7 @@ self: { homepage = "https://github.com/schell/gelatin-shaders#readme"; description = "Gelatin's OpenGL shaders"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gemstone" = callPackage @@ -76091,6 +80195,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gen-imports" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, filepath + , hackage-db, pretty + }: + mkDerivation { + pname = "gen-imports"; + version = "0.1.0.2"; + sha256 = "1qm01lnvicg59cnj659famd7f9z1z6l9r4jsl7gakrq0ylw7mkqd"; + libraryHaskellDepends = [ + base bytestring Cabal containers filepath hackage-db pretty + ]; + homepage = "https://github.com/clintonmead/gen-imports#readme"; + description = "Code to generate instances for the package \"ghc-instances\""; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gen-passwd" = callPackage ({ mkDerivation, base, bytestring, optparse-applicative, random , vector @@ -76183,8 +80304,8 @@ self: { }: mkDerivation { pname = "general-games"; - version = "1.0.5"; - sha256 = "0lra0dn1nnvkbbc5x3sxn10z7vziwzvlvg153l3xi6daqhch6za2"; + version = "1.1.1"; + sha256 = "1h2h6dbd12xzvgwm7a26scpjyfkcwkmpdkw98nkmb2vk8qsrx3lb"; libraryHaskellDepends = [ base monad-loops MonadRandom random random-shuffle ]; @@ -76241,8 +80362,8 @@ self: { }: mkDerivation { pname = "generic-accessors"; - version = "0.6.0.1"; - sha256 = "1jgl1kklix3y6cdr1776pwc2ip12w532f4v0zyx6h8qs48mgvx66"; + version = "0.6.2.0"; + sha256 = "1id0zc617wskz5p8mbawqin03f73vvqy3d8jm6ywzyw3in5y82hs"; libraryHaskellDepends = [ base binary cereal lens linear spatial-math TypeCompose ]; @@ -76251,6 +80372,7 @@ self: { ]; description = "stringly-named getters for generic data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-aeson" = callPackage @@ -76261,8 +80383,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.9"; sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l"; - revision = "1"; - editedCabalFile = "10dy6kdn48pfl6njdhv7zwfkb3qkwazl9238n2sz9gmw575gqnjn"; + revision = "3"; + editedCabalFile = "0dlxl7p1nf8d4yh6r5yfdnrsn4wb5wl7bj9ymln744b498frlfln"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -76310,6 +80432,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "generic-data" = callPackage + ({ mkDerivation, base, contravariant, show-combinators, tasty + , tasty-hunit + }: + mkDerivation { + pname = "generic-data"; + version = "0.1.0.0"; + sha256 = "1fc2q8wzs67ww0dy00wsyyqnhb5igrpqsvi1hwxxsq5z00icvk6z"; + libraryHaskellDepends = [ base contravariant show-combinators ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/Lysxia/generic-data#readme"; + description = "Utilities for GHC.Generics"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-deepseq" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -76339,17 +80476,20 @@ self: { }) {}; "generic-deriving" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell }: mkDerivation { pname = "generic-deriving"; - version = "1.11.2"; - sha256 = "1y92q4dmbyc24hjjvq02474s9grwabxffn16y31gzaqhm0m0z5i9"; + version = "1.12.1"; + sha256 = "0wwl29f5mlxmrigh0kp35q7aj10ymknnjabmdrdfxpi079rkzzgm"; + revision = "1"; + editedCabalFile = "1vr9lyvcrdiar6ndqnspwvhvrbnc1fvsjyx458ivpcr6j75j0l5j"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/dreixel/generic-deriving"; description = "Generic programming library for generalised deriving"; license = stdenv.lib.licenses.bsd3; @@ -76365,27 +80505,60 @@ self: { testHaskellDepends = [ array base bytestring hspec ]; description = "An Enum class that fixes some deficiences with Prelude's Enum"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-lens" = callPackage - ({ mkDerivation, base, criterion, deepseq, inspection-testing, lens - , profunctors, QuickCheck + ({ mkDerivation, base, criterion, deepseq, doctest + , inspection-testing, lens, profunctors, QuickCheck, tagged }: mkDerivation { pname = "generic-lens"; - version = "0.4.1.0"; - sha256 = "1nlizrgnfivabc35199aizahv0za9wvp7dhsqmvhafkjj0sr5113"; - libraryHaskellDepends = [ base profunctors ]; - testHaskellDepends = [ base inspection-testing ]; + version = "0.5.1.0"; + sha256 = "09q13axb00kgy2w9c7lq84sh113vhxlw0g8zcjg07a1kp9wj7l47"; + libraryHaskellDepends = [ base profunctors tagged ]; + testHaskellDepends = [ base doctest inspection-testing lens ]; benchmarkHaskellDepends = [ base criterion deepseq lens QuickCheck ]; homepage = "https://github.com/kcsongor/generic-lens"; description = "Generic data-structure operations exposed as lenses"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "generic-lens_1_0_0_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, HUnit + , inspection-testing, lens, profunctors, QuickCheck, tagged + }: + mkDerivation { + pname = "generic-lens"; + version = "1.0.0.1"; + sha256 = "0j83ynggqfaxp9g36lkjl9af57qixid9j1x1ljglny1zxqkgm888"; + libraryHaskellDepends = [ base profunctors tagged ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lens QuickCheck + ]; + homepage = "https://github.com/kcsongor/generic-lens"; + description = "Generically derive traversals, lenses and prisms"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "generic-lens-labels" = callPackage + ({ mkDerivation, base, generic-lens }: + mkDerivation { + pname = "generic-lens-labels"; + version = "0.1.0.2"; + sha256 = "0lhzxknz8117zc28d7l9wfvln5lp7alxfx8f6q4b986i93dzkl09"; + libraryHaskellDepends = [ base generic-lens ]; + homepage = "https://github.com/duog/generic-lens-labels"; + description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generic-lucid-scaffold" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { @@ -76444,30 +80617,15 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "generic-random"; - version = "0.5.0.0"; - sha256 = "00v514nadzm1g7pni1jqmxyzxs03v4vqj9p1qrxa46grk8ya3zsf"; - revision = "2"; - editedCabalFile = "0h2gyf92p8afgsprb9wnfswh53kgrnlvkdixncmm5vm2dsi45xg5"; - libraryHaskellDepends = [ base QuickCheck ]; - homepage = "http://github.com/lysxia/generic-random"; - description = "Generic random generators"; - license = stdenv.lib.licenses.mit; - }) {}; - - "generic-random_1_0_0_0" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "generic-random"; - version = "1.0.0.0"; - sha256 = "16wlfmfms5544aag1bkzaq9wwsd5zkq7mhwlz9fvsngmkbfa07g7"; - revision = "3"; - editedCabalFile = "12l53dxv400g9fvz07jv42gn7x6825kxsyvpnhd3snsklvjrhl70"; + version = "1.1.0.2"; + sha256 = "0zslrz4cizw8c76q5szgmpc58f25hx4qf01lavxshynn771cx271"; + revision = "1"; + editedCabalFile = "1qhjsxaadvnh41qrlnzp2wxrbxxsbsz9np4mhwq5vck07kqws5bk"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; homepage = "http://github.com/lysxia/generic-random"; description = "Generic random generators"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-records" = callPackage @@ -76521,12 +80679,15 @@ self: { ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "generic-trie"; - version = "0.3.0.2"; - sha256 = "1sgqmc81m7fivla96lx2a8qqm8vg5jczqsaajblf0ygdjmg9lc9q"; + version = "0.3.1"; + sha256 = "1x7f5bp7d13g737198l43y2mf9mzngg9vmhyh1yaxg8xfpzc3anh"; + revision = "1"; + editedCabalFile = "0rr6fncm17ff7z9jdb90gvd03smd8vlhmhzf5b9hzms7s2scnvh6"; libraryHaskellDepends = [ base containers transformers ]; homepage = "http://github.com/glguy/tries"; description = "A map, where the keys may be complex structured data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-xml" = callPackage @@ -76552,8 +80713,8 @@ self: { pname = "generic-xmlpickler"; version = "0.1.0.5"; sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym"; - revision = "3"; - editedCabalFile = "17z1kfyshlqr8ayljs5f2jbahvc58kqyd272afcpqvs7kq1c0aja"; + revision = "7"; + editedCabalFile = "0v4sqm0m8vr2i6hinx0mpax3mz73mvf21bdbga0vdgx7dac2nvkb"; libraryHaskellDepends = [ base generic-deriving hxt text ]; testHaskellDepends = [ base hxt hxt-pickle-utils tasty tasty-hunit tasty-th @@ -76565,28 +80726,51 @@ self: { "generics-eot" = callPackage ({ mkDerivation, base, directory, doctest, filepath, hspec - , interpolate, markdown-unlit, mockery, QuickCheck, shake + , hspec-discover, interpolate, markdown-unlit, mockery, QuickCheck + , shake }: mkDerivation { pname = "generics-eot"; - version = "0.2.1.1"; - sha256 = "1n6h90vjr0q1xckr5xyv2gfncvhs8l4k63r4mf3bqdxdsa6jkbw9"; + version = "0.2.1.2"; + sha256 = "07vaywcqrp9jcsbcgj63i5mcs3zbf69zprkkmh9in3rnkvq9cfjf"; libraryHaskellDepends = [ base markdown-unlit ]; testHaskellDepends = [ base directory doctest filepath hspec interpolate markdown-unlit mockery QuickCheck shake ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/soenkehahn/generics-eot#readme"; description = "A library for generic programming that aims to be easy to understand"; license = stdenv.lib.licenses.bsd3; }) {}; + "generics-eot_0_4" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, hspec + , interpolate, markdown-unlit, mockery, QuickCheck, shake, silently + }: + mkDerivation { + pname = "generics-eot"; + version = "0.4"; + sha256 = "16yfzv9aqyizm57r5m5ddwdnlh05fvlrxjn6m3vqz33kvy3drgjs"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath hspec interpolate markdown-unlit + mockery QuickCheck shake silently + ]; + homepage = "https://generics-eot.readthedocs.io/"; + description = "A library for generic programming that aims to be easy to understand"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.3.1.0"; - sha256 = "1bazlhgmxcwv7vd44jhdx74cnhmaz6yy47jxfycapjj4mjrnp0x7"; + version = "0.3.2.0"; + sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h"; + revision = "2"; + editedCabalFile = "0hc00hjgxm7vzq146d9kwapgqnjbhdi0c7icyvrpc2fhc4cnwlwf"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; @@ -76599,8 +80783,8 @@ self: { pname = "generics-sop-lens"; version = "0.1.2.1"; sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf"; - revision = "2"; - editedCabalFile = "1zavix9vzj6qnr6izfmq1ggsdzsqzz41dlmh228lpvfm2mddx6w2"; + revision = "3"; + editedCabalFile = "1phq0hjpgxfvb8ay9v4ix6axk07mbd266javss9nmqmqmn3vnb51"; libraryHaskellDepends = [ base generics-sop lens ]; homepage = "https://github.com/phadej/generics-sop-lens#readme"; description = "Lenses for types in generics-sop"; @@ -76622,19 +80806,22 @@ self: { "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 + , hspec, monad-control, monad-io-adapter, monad-logger + , monad-persist, persistent, persistent-postgresql + , persistent-sqlite, persistent-template, resource-pool + , template-haskell, text, text-conversions, transformers + , transformers-base }: mkDerivation { pname = "genesis"; - version = "0.0.1.0"; - sha256 = "15l23rf4ifqxziz3fa8ra2p7jch6ph651139cvpqszqbzm9wp4sc"; + version = "0.1.0.0"; + sha256 = "1bz47rf5qkkm809440y3ki1bahyg6sxdlxrfkc4mjy49fcbgh4si"; 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 + monad-io-adapter monad-logger monad-persist persistent + persistent-postgresql persistent-template resource-pool + template-haskell text text-conversions transformers + transformers-base ]; testHaskellDepends = [ base hspec monad-control monad-logger monad-persist @@ -76649,16 +80836,17 @@ self: { "genesis-test" = callPackage ({ mkDerivation, base, envparse, genesis, hspec, hspec-expectations , lifted-base, monad-control, monad-logger, monad-persist - , persistent-postgresql, persistent-template, text + , persistent-postgresql, persistent-template, text, transformers , transformers-base }: mkDerivation { pname = "genesis-test"; - version = "0.0.1.0"; - sha256 = "12s0vg0013465cpxxhyz0xw9sbhh8knkl988dq8jaxvl81d0jzj2"; + version = "0.1.0.0"; + sha256 = "0d93wq9b5wm5cgw9kfvf8smm7d3adv8y4a8kxc6m17lvgjmjjph4"; libraryHaskellDepends = [ base genesis hspec hspec-expectations lifted-base monad-control - monad-logger monad-persist persistent-postgresql transformers-base + monad-logger monad-persist persistent-postgresql transformers + transformers-base ]; testHaskellDepends = [ base envparse genesis hspec monad-logger monad-persist @@ -76784,8 +80972,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.5"; - sha256 = "17vjps2118s5z3k39ij00lkmkxv3mqf8h59wv6qdamlgmhyr36si"; + version = "0.7.6"; + sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb"; libraryHaskellDepends = [ base mtl template-haskell ]; homepage = "https://github.com/danr/geniplate"; description = "Use Template Haskell to generate Uniplate-like functions"; @@ -76845,8 +81033,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.4.0.0"; - sha256 = "006kd5172vra1nyjh7lzkn2rj6jlkk1rarmzipq16fkwx5s8p5br"; + version = "0.4.0.4"; + sha256 = "0gfndjss4j2dmyk46r9ab3ahw8pmc6bry7nzzx7qpgim6zz5597w"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -76875,6 +81063,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for aeson"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-bytestring" = callPackage @@ -76894,6 +81083,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for ByteString"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-containers" = callPackage @@ -76913,6 +81103,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage @@ -76933,6 +81124,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage @@ -76942,8 +81134,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.1.0.0"; - sha256 = "0kyajiqhfnq5cm0qly18sjzz7c6gdf3kp9dzxq67virgkih3hzfw"; + version = "0.1.0.2"; + sha256 = "05h3y3bnq2i9xhjh5i5rghazfwz5n1vsvrmx4r3ircd6zv4nm2g1"; libraryHaskellDepends = [ aeson base bytestring deepseq genvalidity genvalidity-hspec hspec QuickCheck @@ -76955,6 +81147,7 @@ self: { homepage = "http://cs-syd.eu"; description = "Standard spec's for aeson-related instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-binary" = callPackage @@ -76972,6 +81165,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Standard spec's for binary-related Instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-cereal" = callPackage @@ -76989,6 +81183,7 @@ self: { homepage = "http://cs-syd.eu"; description = "Standard spec's for cereal-related instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-hashable" = callPackage @@ -77020,13 +81215,14 @@ self: { }: mkDerivation { pname = "genvalidity-path"; - version = "0.2.0.0"; - sha256 = "1a4h6kgaqb4y52gdqp7baqgs18zllmrnkpk1412m4hmakqykljxm"; + version = "0.2.0.2"; + sha256 = "140myxs62amq43mrxdkyxg33ilj8ll4jwd602c5cwz05x0wn634h"; libraryHaskellDepends = [ base genvalidity path validity-path ]; testHaskellDepends = [ base genvalidity-hspec hspec path ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for Path"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-property" = callPackage @@ -77063,6 +81259,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for Scientific"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-text" = callPackage @@ -77082,6 +81279,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for Text"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-time" = callPackage @@ -77090,8 +81288,8 @@ self: { }: mkDerivation { pname = "genvalidity-time"; - version = "0.1.0.0"; - sha256 = "0jgfrrspyawvymp2p55ba56pxggqkg352c1n2bmyyi9hs99fp0jf"; + version = "0.1.0.1"; + sha256 = "1d9j6scv83kzxk4jngmad4i0843lm2bkr7yq4qsdbxpsj6akkdrg"; libraryHaskellDepends = [ base genvalidity QuickCheck time validity-time ]; @@ -77099,6 +81297,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for time"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-unordered-containers" = callPackage @@ -77120,6 +81319,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for unordered-containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-uuid" = callPackage @@ -77139,6 +81339,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for UUID"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-vector" = callPackage @@ -77158,6 +81359,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for vector"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geo-resolver" = callPackage @@ -77247,22 +81449,24 @@ self: { }) {}; "geodetics" = callPackage - ({ mkDerivation, array, base, dimensional, HUnit, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, array, base, checkers, dimensional, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "geodetics"; - version = "0.0.4"; - sha256 = "1zml9hpbj7shzsjv6hsyzv3p9yzm6cbvxp2cd79nd1fcsdss0zi3"; + version = "0.0.5"; + sha256 = "1fpfdn4bhdqjnrhiqd8yg5j4vs3rwlsr6nav3cjrvrhynlmqlcaq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base dimensional ]; testHaskellDepends = [ - array base dimensional HUnit QuickCheck test-framework + array base checkers dimensional HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; homepage = "https://github.com/PaulJohnson/geodetics"; description = "Terrestrial coordinate systems and geodetic calculations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geohash" = callPackage @@ -77360,6 +81564,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "geos" = callPackage + ({ mkDerivation, base, bytestring, cassava, geos_c, hspec, mtl + , transformers, vector + }: + mkDerivation { + pname = "geos"; + version = "0.1.1.2"; + sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d"; + libraryHaskellDepends = [ + base bytestring mtl transformers vector + ]; + librarySystemDepends = [ geos_c ]; + testHaskellDepends = [ base bytestring cassava hspec mtl vector ]; + testSystemDepends = [ geos_c ]; + description = "Bindings for GEOS"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {geos_c = null;}; + "getemx" = callPackage ({ mkDerivation, base, curl, directory, filepath, haskell98, hxt , mtl, old-locale, process, time @@ -77398,8 +81621,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.13.0.1"; - sha256 = "10sfab5frm53bll8kh6bkwg0y0cv47740sxy6gsnd9fycvixf0k9"; + version = "0.13.0.2"; + sha256 = "0330f63gy5gk461hvyy79jxrz5bcxdh2sgl0r1g1ffl4swjsl176"; libraryHaskellDepends = [ base base-compat base-orphans generics-sop tagged ]; @@ -77427,9 +81650,9 @@ self: { "gf" = callPackage ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi , containers, directory, exceptions, filepath, happy, haskeline - , HTF, httpd-shed, HUnit, json, lifted-base, mtl, network - , network-uri, old-locale, parallel, pretty, process, random - , terminfo, time, time-compat, unix, utf8-string + , HTF, httpd-shed, HUnit, json, mtl, network, network-uri + , old-locale, parallel, pretty, process, random, terminfo, time + , time-compat, unix, utf8-string }: mkDerivation { pname = "gf"; @@ -77445,7 +81668,7 @@ self: { utf8-string ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base containers lifted-base mtl ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base Cabal directory filepath HTF HUnit process ]; @@ -77458,6 +81681,7 @@ self: { homepage = "http://www.grammaticalframework.org/"; description = "Grammatical Framework"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ggtsTC" = callPackage @@ -77476,6 +81700,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gh-labeler" = callPackage + ({ mkDerivation, base, directory, github, memory, text, vector }: + mkDerivation { + pname = "gh-labeler"; + version = "0.1.0"; + sha256 = "05g3lk1ff87qmjlywi6p90mjyycx418idddavpi8i045gr51am4l"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory github memory text vector + ]; + homepage = "https://github.com/vincenthz/gh-labeler#readme"; + description = "Github Standard Labeler"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gh-pocket-knife" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit , QuickCheck, resourcet @@ -77496,20 +81736,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_2_1" = callPackage + "ghc_8_4_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci, happy - , hoopl, hpc, process, template-haskell, terminfo, time - , transformers, unix + , hpc, process, template-haskell, terminfo, time, transformers + , unix }: mkDerivation { pname = "ghc"; - version = "8.2.1"; - sha256 = "0b87bj9n2zsi0v9s5ssf5b9c4y4lji7jbxp9j8s93hb95zlmzq17"; + version = "8.4.1"; + sha256 = "1axvba6vd13bf9z45jffv05r3jy5n5pxly59r8s5pxh369188076"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath - ghc-boot ghc-boot-th ghci hoopl hpc process template-haskell - terminfo time transformers unix + ghc-boot ghc-boot-th ghci hpc process template-haskell terminfo + time transformers unix ]; libraryToolDepends = [ alex happy ]; homepage = "http://www.haskell.org/ghc/"; @@ -77518,16 +81758,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_2_1" = callPackage + "ghc-boot_8_4_1" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.2.1"; - sha256 = "1v9cdbhxsx7pbig4c3gq5gdp46fwq0blq6zn89x4fpq1vl1kcr6h"; - revision = "1"; - editedCabalFile = "0826xd0ccr77v7zqjml266g067qj2bd3mb7d7d8mipqv42j7cy8y"; + version = "8.4.1"; + sha256 = "0abgzvqra66hi61bn901dlk0r0n4s2fg6y7d8w2k2a6w437vgzdd"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -77536,24 +81774,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_2_1" = callPackage + "ghc-boot-th_8_4_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.2.1"; - sha256 = "18gmrfxyqqv0gchpn35bqsk66if1q8yy4amajdz2kh9v8jz4yfz4"; + version = "8.4.1"; + sha256 = "0l9fv1sp4dbq1ssw0l55riw9zpcii8fz75i0yj0vlihccf10lbj9"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-compact" = callPackage + "ghc-call-stack-extras" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ghc-call-stack-extras"; + version = "0.1.0.2"; + sha256 = "01gvyl2r7jqxca33gdavv6l2a6yz4xh2ndmb4v0y2mdgc9sskymc"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/treeowl/ghc-call-stack-extras"; + description = "Extra utilities for HasCallStack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ghc-compact_0_1_0_0" = callPackage ({ mkDerivation, base, bytestring, ghc-prim }: mkDerivation { pname = "ghc-compact"; version = "0.1.0.0"; sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h"; + revision = "1"; + editedCabalFile = "1fwcfk515lv3pjzxz87bddk3kdbkaxswxrr37spdlkvyyfrbxyak"; libraryHaskellDepends = [ base bytestring ghc-prim ]; description = "In memory storage of deeply evaluated data structure"; license = stdenv.lib.licenses.bsd3; @@ -77597,6 +81849,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-core-smallstep" = callPackage + ({ mkDerivation, base, ghc, ghc-paths }: + mkDerivation { + pname = "ghc-core-smallstep"; + version = "0.1.0.1"; + sha256 = "1yz0qzy1h5134sbmhrk7gn192fcw729bnzdkqf5wh8vh9a396l21"; + libraryHaskellDepends = [ base ghc ]; + testHaskellDepends = [ base ghc ghc-paths ]; + description = "A small-step semantics for Core"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-datasize" = callPackage ({ mkDerivation, base, deepseq, ghc-heap-view }: mkDerivation { @@ -77607,6 +81872,22 @@ self: { homepage = "http://felsin9.de/nnis/ghc-datasize"; description = "Determine the size of data structures in GHC's memory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-dump-core" = callPackage + ({ mkDerivation, base, bytestring, filepath, ghc, serialise, text + }: + mkDerivation { + pname = "ghc-dump-core"; + version = "0.1.0.0"; + sha256 = "036hpykq1ibnnb4sm0k4ljcqj2m7qf8kdycdmids9qfhz3kldms2"; + libraryHaskellDepends = [ + base bytestring filepath ghc serialise text + ]; + description = "An AST and compiler plugin for dumping GHC's Core representation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-dump-tree" = callPackage @@ -77635,6 +81916,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-dump-util" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, ghc-dump-core + , hashable, optparse-applicative, regex-tdfa, regex-tdfa-text + , serialise, text, unordered-containers + }: + mkDerivation { + pname = "ghc-dump-util"; + version = "0.1.0.0"; + sha256 = "0d8d5nc9nnfk0qnxjg7mdfc1cfalycwi1bb8x3m1f9ndy29hzrb1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring ghc-dump-core hashable serialise + text unordered-containers + ]; + executableHaskellDepends = [ + ansi-wl-pprint base ghc-dump-core optparse-applicative regex-tdfa + regex-tdfa-text + ]; + description = "Handy tools for working with @ghc-dump@ dumps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-dup" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -77648,40 +81953,22 @@ self: { }) {}; "ghc-events" = 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 bytestring ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-events_0_7_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, text , vector }: mkDerivation { pname = "ghc-events"; - version = "0.7.0"; - sha256 = "12vs1vpi969391k1n7apg2sd399dl5xdkjgb8rbn9sj0dmp9l946"; + version = "0.7.2"; + sha256 = "1gzz71b0xnrri85pz5jl5ar0pyr13gbq31xll1iwv3s45bvl65mh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary bytestring containers text vector ]; executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base bytestring ]; + 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 @@ -77738,8 +82025,8 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.5.0"; - sha256 = "0k3y39k1cwb3bs85333gj7fi6l5p9nr950vgzbyswgj13qb4g7b1"; + version = "0.5.6.1"; + sha256 = "141k6qiys0m0r4br7ikp4i546vs3xcil9cwglzcdfcbnb5nj1z87"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77797,6 +82084,7 @@ self: { testHaskellDepends = [ base deepseq ]; description = "Extract the heap representation of Haskell values and thunks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-imported-from" = callPackage @@ -77836,6 +82124,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-instances" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , deepseq, directory, filepath, ghc, ghc-boot, ghc-compact + , ghc-prim, hoopl, hpc, integer-gmp, process, template-haskell + , time, unix + }: + mkDerivation { + pname = "ghc-instances"; + version = "0.1.0.1"; + sha256 = "0vfqwd2w95lwqa4sbxaz9yl0mk8qj2v28zgzqhmlfg4xg25l76qs"; + revision = "1"; + editedCabalFile = "0rkg9mmxad74fqa1k8np8yj3p0agicpj8cy2983397ibzhyrsjwc"; + libraryHaskellDepends = [ + array base binary bytestring Cabal containers deepseq directory + filepath ghc ghc-boot ghc-compact ghc-prim hoopl hpc integer-gmp + process template-haskell time unix + ]; + homepage = "https://github.com/clintonmead/ghc-instances#readme"; + description = "Easily import all instances contained in GHC distributed libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ghc-justdoit" = callPackage + ({ mkDerivation, base, ghc, hashable, inspection-testing }: + mkDerivation { + pname = "ghc-justdoit"; + version = "0.1"; + sha256 = "0qr6ipsq7g1275svdgqcppcb37r387fvap5fyyn6fn4h84dhvkby"; + libraryHaskellDepends = [ base ghc hashable ]; + testHaskellDepends = [ base inspection-testing ]; + homepage = "https://github.com/nomeata/ghc-justdoit"; + description = "A magic typeclass that just does it"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -77850,7 +82174,6 @@ self: { homepage = "https://github.com/ndmitchell/ghc-make#readme"; description = "Accelerated version of ghc --make"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-man-completion" = callPackage @@ -77873,9 +82196,8 @@ self: { , 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 + , process, safe, semigroups, split, syb, template-haskell + , temporary, text, time, transformers, transformers-base }: mkDerivation { pname = "ghc-mod"; @@ -77907,14 +82229,14 @@ self: { 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; - }) {shelltest = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "ghc-mtl" = callPackage ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl @@ -77952,6 +82274,7 @@ self: { homepage = "https://github.com/ranjitjhala/ghc-options.git"; description = "Utilities for extracting GHC options needed to compile a given Haskell target"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {bin-package-db = null;}; @@ -77985,14 +82308,13 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.2.0.0"; - sha256 = "0jd02qgjs529ac0jvg59rgrjvpm541j993lyfpqr9aqwqj1n3ylp"; + version = "0.2.0.2"; + sha256 = "1130fpddf3jx84k558gsc83j3166qy15jp878w2d3lwgzxjcqx5v"; libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; homepage = "https://github.com/gibiansky/IHaskell"; description = "Haskell source parser from GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-paths" = callPackage @@ -78001,8 +82323,8 @@ self: { pname = "ghc-paths"; version = "0.1.0.9"; sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg"; - revision = "2"; - editedCabalFile = "1gs6biqbcabgmrwhc1bq1bdaxdwwh26v4mpvj5c7cfyigc64gwyk"; + revision = "3"; + editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; @@ -78043,12 +82365,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-prim_0_5_1_0" = callPackage + "ghc-prim_0_5_2_0" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.5.1.0"; - sha256 = "13ypjfpz5b4zpbr2q8x37nbqjd0224l9g8xn62iv7mbqbgynkbf9"; + version = "0.5.2.0"; + sha256 = "1ccvzkw3v4xlj7g126wwlc5rvd480hbv1pcq2rfb85k77rzi6bjr"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -78061,14 +82383,13 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.0.3"; - sha256 = "0zlarx19czj9vrckh9vam58l4vybszznxr4kwn7x2mb3vdhv0ghd"; + version = "1.4.1.1"; + sha256 = "1zxk2fs0zykpqklyfwssbi5hfmzm7hc1yx8l8x1fy29qxim3y2z5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base containers scientific text time ]; - executableHaskellDepends = [ base containers scientific text ]; testHaskellDepends = [ attoparsec base containers directory filepath process tasty tasty-hunit temporary text @@ -78078,6 +82399,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-prof-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }: + mkDerivation { + pname = "ghc-prof-aeson"; + version = "0.1.0.0"; + sha256 = "10vwwxiy53bacdzz0i62ashbr5snzda1v3qlb5bqk4f770fa7mpl"; + libraryHaskellDepends = [ aeson base text vector ]; + testHaskellDepends = [ aeson base bytestring hspec ]; + homepage = "https://github.com/Fuuzetsu/ghc-prof-aeson#readme"; + description = "Parser for GHC's JSON profiling output"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ghc-prof-aeson-flamegraph" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , ghc-prof-aeson, optparse-applicative, text, vector + }: + mkDerivation { + pname = "ghc-prof-aeson-flamegraph"; + version = "0.1.0.0"; + sha256 = "1s1hgvq3lv8krxmwjj4dj2iraz86scpzxb40xj6z1yaqs4lp50rm"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring containers ghc-prof-aeson + optparse-applicative text vector + ]; + homepage = "https://github.com/Fuuzetsu/ghc-prof-aeson-flamegraph#readme"; + description = "Turn GHC `-pj` profiling output into FlameGraph format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-prof-flamegraph" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -78103,7 +82456,6 @@ self: { homepage = "https://github.com/nomeata/ghc-proofs"; description = "GHC plugin to prove program equations by simplification"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-server" = callPackage @@ -78159,10 +82511,8 @@ self: { ({ mkDerivation, array, base, containers, ghc, hpc }: mkDerivation { pname = "ghc-srcspan-plugin"; - version = "0.2.2.0"; - sha256 = "1wdgc1m914iy4876cf8qwxad0q2abqvs10f6dj0dnfs6sgqyqdz1"; - revision = "1"; - editedCabalFile = "1h821qji9xgf9d4sd040fw10v1312dxzin556ppc67wxbx5mjc9i"; + version = "0.2.2.1"; + sha256 = "10zh7i4nx4ds3f1d7m2m1caqnxmi3dh6a900fl8mcp6a09isvglh"; libraryHaskellDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; @@ -78199,14 +82549,27 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.2.1"; - sha256 = "04m8cblgxb3axjhsbwlb18jmlcfhcllm68c1d5pzv6av404ild4z"; + version = "0.2.4"; + sha256 = "03lxph20m33ipa117i917khgk8rv3fljly3fh31j92d0l02bh9sb"; libraryHaskellDepends = [ base ghc ]; homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; description = "Utilities for writing GHC type-checker plugins"; license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-tcplugins-extra_0_2_5" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-tcplugins-extra"; + version = "0.2.5"; + sha256 = "0xkq24dr2div9d9hr4rpz65968syqjignn9xn5q48vmzh1m1xwws"; + libraryHaskellDepends = [ base ghc ]; + homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; + description = "Utilities for writing GHC type-checker plugins"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-time-alloc-prof" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , process, tasty, tasty-hunit, temporary, text, time @@ -78218,7 +82581,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base containers text time ]; - executableHaskellDepends = [ attoparsec base containers text ]; testHaskellDepends = [ attoparsec base directory filepath process tasty tasty-hunit temporary text @@ -78226,6 +82588,7 @@ self: { homepage = "https://github.com/maoe/ghc-time-alloc-prof"; description = "Library for parsing GHC time and allocation profiling reports"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-timers" = callPackage @@ -78243,15 +82606,15 @@ self: { "ghc-typelits-extra" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp - , singletons, tasty, tasty-hunit, template-haskell, transformers + , tasty, tasty-hunit, template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.2.3"; - sha256 = "1fl1bbsn1hkz3i7100k1k0pwniv7iyxnq1l0i50gj5s8ygxi78zw"; + version = "0.2.4"; + sha256 = "0inj776401846brd945p00qkjylniwlvycn1c300p90kyighkpdg"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat - ghc-typelits-natnormalise integer-gmp singletons transformers + ghc-typelits-natnormalise integer-gmp transformers ]; testHaskellDepends = [ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty @@ -78264,34 +82627,55 @@ self: { "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, transformers + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.3.1"; - sha256 = "1kprh0fahkbpf7rqbgi8l6883784a8n7k8g40nkdhii7gal9715g"; + version = "0.4.1"; + sha256 = "0m3flri3y82wvqania3yj7mhnnxvx8z5hxwl6mr5ppavxak169q9"; libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons + base ghc ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers ]; testHaskellDepends = [ - base ghc-typelits-natnormalise singletons tasty tasty-hunit - tasty-quickcheck + base ghc-typelits-natnormalise 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_4_2" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.4.2"; + sha256 = "1h0l5hks2pdaibq4w46b9064idshan615iiyjjbzkc2zg04xsbbr"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra ghc-typelits-natnormalise + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise 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.4"; - sha256 = "1qi4nwjkymjgag8m1yf04hddqzcj3iq1xllfffwwdp7g57b4p917"; + version = "0.5.9"; + sha256 = "1aw0pgcplljll86gk9jvqc22zpnb17amamna11n9b4xzrw2lrnkg"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -78301,14 +82685,14 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_5_7" = callPackage + "ghc-typelits-natnormalise_0_5_10" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5.7"; - sha256 = "0spqlrj7iys6i355sv7r71niimaqx9n3p4p5pfkfck8n5rfc9lq3"; + version = "0.5.10"; + sha256 = "15xn69jdv77pgyd4mgm35zbrc1h0phyvw733j6s5iy01fhrhrdny"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -78320,20 +82704,19 @@ self: { }) {}; "ghc-typelits-presburger" = callPackage - ({ mkDerivation, base, equational-reasoning, ghc - , ghc-tcplugins-extra, presburger, reflection + ({ mkDerivation, base, containers, equational-reasoning, ghc + , ghc-tcplugins-extra, pretty, reflection }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.1.1.0"; - sha256 = "14jg5lny0rcrv9ml42f41lzx50i2bfz4ld7grrsrlq5fqkl0bc5w"; + version = "0.2.0.0"; + sha256 = "0wxcvi71hkjyjlnpwnfph04jffy595qwlqgwylqp377glyz1vgs7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base equational-reasoning ghc ghc-tcplugins-extra presburger + base containers equational-reasoning ghc ghc-tcplugins-extra pretty reflection ]; - executableHaskellDepends = [ base equational-reasoning ]; homepage = "https://github.com/konn/ghc-typelits-presburger#readme"; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -78351,7 +82734,6 @@ self: { executableHaskellDepends = [ base ghc-paths unix ]; description = "Print minimal export lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-vis" = callPackage @@ -78361,8 +82743,8 @@ self: { }: mkDerivation { pname = "ghc-vis"; - version = "0.8"; - sha256 = "03c73ip8k92fjrafaaj3mykql222y2fjiwx13lwvm5jk2p00is78"; + version = "0.9"; + sha256 = "134m5hzpbggifvigw2f4q6ci1lm5r2457va8lb0j7daiadq7xhcw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl @@ -78374,15 +82756,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghci_8_2_1" = callPackage + "ghci_8_4_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell , transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.2.1"; - sha256 = "1nxcqnfnggpg8a04496nk59p4jmvxsjqi7425g6h970cinh2lm5f"; + version = "8.4.1"; + sha256 = "0jlnzkwj4xxs57c0zi3rcy96rksqakx65a7m8xq04055ip388sws"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th template-haskell transformers unix @@ -78492,12 +82874,39 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.6.8"; - sha256 = "1ca8962sh41jkz82lx1snx8fzp8s2v5dsq0mczgzc7aqjgclb35g"; + version = "0.6.10"; + sha256 = "1qqd619pwdlcxvkgfawsqq19a5kl1584ra35ib8769874i6y9awj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs directory extra filepath process time + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + homepage = "https://github.com/ndmitchell/ghcid#readme"; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ghcid_0_7" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.7"; + sha256 = "1dcx12vkjw5w1np4bz8ypaf8bdw1s8yrlhq6i5x2pilvsf1dljqg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base cmdargs directory extra filepath process time unix + ansi-terminal base cmdargs directory extra filepath process time ]; executableHaskellDepends = [ ansi-terminal base cmdargs containers directory extra filepath @@ -78510,6 +82919,7 @@ self: { homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -78567,11 +82977,12 @@ self: { doHaddock = false; description = "DOM library that supports both GHCJS and GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-hello" = callPackage ({ mkDerivation, base, ghcjs-dom, jsaddle, jsaddle-warp - , jsaddle-webkit2gtk, jsaddle-wkwebview, mtl + , jsaddle-webkit2gtk, mtl }: mkDerivation { pname = "ghcjs-dom-hello"; @@ -78584,8 +82995,7 @@ self: { base ghcjs-dom jsaddle jsaddle-warp mtl ]; executableHaskellDepends = [ - base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk jsaddle-wkwebview - mtl + base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl ]; homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; @@ -78603,19 +83013,15 @@ self: { doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-jsffi" = callPackage - ({ mkDerivation, base, ghc-prim, ghcjs-base, ghcjs-prim, text - , transformers - }: + ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; version = "0.9.2.0"; sha256 = "1xj94izrypxnb91lgsq0lfzqqs11sxbs24nkw8sn2wkmmh5pd8vd"; - libraryHaskellDepends = [ - base ghc-prim ghcjs-base ghcjs-prim text transformers - ]; description = "DOM library using JSFFI and GHCJS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -78650,6 +83056,7 @@ self: { homepage = "https://github.com/cocreature/ghcjs-fetch#readme"; description = "GHCJS bindings for the JavaScript Fetch API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-hplay" = callPackage @@ -78708,11 +83115,9 @@ self: { base containers ghc-prim ghcjs-base ghcjs-ffiqq ghcjs-prim split template-haskell ]; - executableHaskellDepends = [ - base containers ghcjs-base ghcjs-ffiqq - ]; description = "Virtual-dom bindings for GHCJS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghcjs-ffiqq = null; ghcjs-prim = null;}; @@ -78833,8 +83238,8 @@ self: { }: mkDerivation { pname = "gi-atk"; - version = "2.0.14"; - sha256 = "0fp5shf2hilziw4rlzbc2hzf43b2gi1cwm3vlr2ggdkw29ic0c7m"; + version = "2.0.15"; + sha256 = "1vmzby12nvbrka6f44pr1pjwccl0p6s984pxvibajzp72x2knxc9"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -78845,6 +83250,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Atk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage @@ -78854,8 +83260,8 @@ self: { }: mkDerivation { pname = "gi-cairo"; - version = "1.0.14"; - sha256 = "0414qhjgh94pvkxrrcnkxg8hac35ykrqnhr5nrn63l66wigp1fxb"; + version = "1.0.15"; + sha256 = "1hm8bcd6j11dimb3ksfjkcqf9wqa9frq1jyjpbr2j5s8srrf7031"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -78870,9 +83276,55 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; + "gi-dbusmenu" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, dbusmenu-glib + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenu"; + version = "0.4.1"; + sha256 = "0fi07jf6bsrxsk101ffpyv17lirjgyx4afz26lhbpkqadnpc3kp4"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ dbusmenu-glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Dbusmenu bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {dbusmenu-glib = null;}; + + "gi-dbusmenugtk3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, dbusmenu-gtk3 + , gi-atk, gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject + , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-dbusmenugtk3"; + version = "0.4.1"; + sha256 = "0gl37jsska2qsakzbmvwvb33lskdrbxpk1hmw907y187d0hq7pry"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf + gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ dbusmenu-gtk3 ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "DbusmenuGtk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {dbusmenu-gtk3 = null;}; + "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 @@ -78881,8 +83333,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "3.0.14"; - sha256 = "0ds8h0sjl4jf8y5vjfl18gsbarhy6pxl6if7nd4lqaznbribw4jl"; + version = "3.0.15"; + sha256 = "17cjg6m69xlmlnwlwa6s23f1j28bfrwkg08v3n5xmz56zvzsgykg"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib @@ -78894,7 +83346,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gdkpixbuf" = callPackage @@ -78904,8 +83356,8 @@ self: { }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.14"; - sha256 = "1p8sksyg9jrva2mm0ipqxv10df0hnmzmiv2rs05ayl1ris366h2q"; + version = "2.0.15"; + sha256 = "0j2bqphjfhgm9nk8pyfpd6zp7i3q4b11s4vlgas9xdwwi9p1md8r"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -78916,6 +83368,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf;}; "gi-gdkx11" = callPackage @@ -78925,8 +83378,8 @@ self: { }: mkDerivation { pname = "gi-gdkx11"; - version = "3.0.1"; - sha256 = "0y9dkiwrx6d7r94ihczc250c2wzg2l4jsz9i198r4kysjdgm7q7v"; + version = "3.0.2"; + sha256 = "0s3iry866p6v2hm4d841fcimrhjsk9miskkqf9js8as7mwlk7jac"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib @@ -78947,8 +83400,8 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.1"; - sha256 = "08jfsfjvdbyd1m1si2r50frc4s3x5x9710r2np6wl1p0y3pk20cf"; + version = "1.0.2"; + sha256 = "17449xz5v5n1i6c7vgrszq395v78q2hp2zjlnc85zxj5qlnkwz64"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -78969,8 +83422,8 @@ self: { }: mkDerivation { pname = "gi-gio"; - version = "2.0.14"; - sha256 = "0dwy8zd66b04jbn0g7c5n511nl2xxjvchzf56bmw8cfcm384r66d"; + version = "2.0.18"; + sha256 = "0h7liqxf63wmhjzgbjshv7pa4fx743jpvkphn5yyjkc0bnfcvsqk"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -78981,6 +83434,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage @@ -78990,8 +83444,8 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.14"; - sha256 = "1pains4g8a4yxacggx6jama3d1rdky684kcm758m6kiigsplkfkp"; + version = "1.0.15"; + sha256 = "1g9bvf850zsbqi4dw8i1nbclqwi599zvwny4fsl0hp8lqb9w7ps6"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject haskell-gi haskell-gi-base @@ -79002,7 +83456,8 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gobjectIntrospection;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.gnome3) gobjectIntrospection;}; "gi-glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib @@ -79011,8 +83466,8 @@ self: { }: mkDerivation { pname = "gi-glib"; - version = "2.0.14"; - sha256 = "09bmrrppbjcy90f66qdhsj2hz3x7ci80mrdgryajzqrin4zs7aqx"; + version = "2.0.16"; + sha256 = "03hl5szq0cyzg37kxh4kyxzciibs4grsypf78ihfsa6nvj4n5fqw"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -79023,6 +83478,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage @@ -79032,8 +83488,8 @@ self: { }: mkDerivation { pname = "gi-gobject"; - version = "2.0.15"; - sha256 = "0h98lld62dhdbw7s0c833jw15wxajy6nmvr69604px3saf4mjrrl"; + version = "2.0.16"; + sha256 = "1bgn4ywx94py0v213iv7mbjjvvy3y7gvpgw4wpn38s2np7al8y65"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib haskell-gi haskell-gi-base @@ -79044,6 +83500,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gst" = callPackage @@ -79053,8 +83510,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.14"; - sha256 = "1yjimqcaqq9ah9nkyd1rq0bvs2sp4vbicfw6d5d0s6pcavqzxhpg"; + version = "1.0.15"; + sha256 = "09h4ilyg85d9b20chqf6fp6zqvxcclqn9i8s02bqw86cq7s19cq4"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -79065,6 +83522,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage @@ -79074,8 +83532,8 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.14"; - sha256 = "1l3cldq3i5anb8cmwya33gfpwj9njbhk3f40nz0772sa29j4311h"; + version = "1.0.15"; + sha256 = "0yw6z11d0wgfa19446s34hr260mfasbsd1h7mzfyd690nzicyh8p"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -79086,6 +83544,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstbase" = callPackage @@ -79095,8 +83554,8 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.15"; - sha256 = "1gb7q5gxdrpblc8xfbrvv4072vfz910v3fg0h38ixda8p30fh30j"; + version = "1.0.16"; + sha256 = "1pqkiqlhvwjkw9b9i36md7nhi8205940d4jbcvaqywa82hv7k2aa"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst haskell-gi @@ -79107,6 +83566,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage @@ -79117,8 +83577,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.14"; - sha256 = "0pjjxqsfrl06v88mz3aacwy5812i752m4h979gw1qn8h431kgg4y"; + version = "1.0.15"; + sha256 = "161wh4rn4f6lsnk8x12fwzn016fv4pymfb3vg6zlfijyj3avhdh9"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio @@ -79140,8 +83600,8 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.14"; - sha256 = "056wbkkjds3gk2x0wm4abskpqqw5f8gyhwscl3ih5j90w78d0a28"; + version = "1.0.15"; + sha256 = "1i5wqrhipyagsv94yfjfg6wmdbgnjg03mjxbfq5mx09g61iznl2r"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -79162,8 +83622,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.14"; - sha256 = "1hr20yf43zgcmpmygca5vdn1qb2fhhqqbh8s24kwjfy7bwl8zly1"; + version = "1.0.15"; + sha256 = "1k35x6cc1kiyhwq978dlckib2sfz7k3w2gxfqsha591a0661k10d"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -79174,6 +83634,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage @@ -79184,8 +83645,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.17"; - sha256 = "1rplvhn3lbss66yps6jrhd9f9m6znj8ybss0rpik3dxwgmac3rw3"; + version = "3.0.22"; + sha256 = "017nnypxsrxsqar7pmbf0kwvbkpdnp3y7dvn8s82b09qiymxa0rz"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -79197,7 +83658,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gtk-hs" = callPackage @@ -79207,8 +83668,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.5.0"; - sha256 = "10vshqkc398lribxfz1lk2zbp2y1iqyb0gszzzkin07y3fzlfhiv"; + version = "0.3.6.1"; + sha256 = "0qa1ig3z44p47badin0v3rnwilck05659jnk7xcvh2pjhmjmpclw"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -79216,7 +83677,7 @@ self: { homepage = "https://github.com/haskell-gi/gi-gtk-hs"; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gi-gtkosxapplication" = callPackage @@ -79226,8 +83687,8 @@ self: { }: mkDerivation { pname = "gi-gtkosxapplication"; - version = "2.0.14"; - sha256 = "1hx01rr99kw8ja1py7s8fzzxy7psaarsyk9g773rijf25xq4b53f"; + version = "2.0.15"; + sha256 = "1znsrbzin2fxdb7gkip0qhr335f9pinaszn2r320j05sz6k8qdfw"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk @@ -79249,8 +83710,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.15"; - sha256 = "09vfxh75wbg3012mbzy39bczlvwyxndiy9wqmhwvhgh3iq0yk2fd"; + version = "3.0.16"; + sha256 = "0fm5bnyq4f9icyhxkyxf42mmanmc2klbdgin75dcdq5r92gipfcp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -79262,40 +83723,18 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "gi-javascriptcore" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , webkitgtk24x-gtk3 - }: - mkDerivation { - pname = "gi-javascriptcore"; - version = "3.0.14"; - sha256 = "1r2q176a38ylbawkrd17vdiqg0cnk5vzbp4rfgrlzfz6vp6gimi4"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; - doHaddock = false; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "JavaScriptCore bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x-gtk3;}; - - "gi-javascriptcore_4_0_14" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers , webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.14"; - sha256 = "00mlnzdi6syay6dl20xz3s32bxsl32gwjhv3y1lbfzmzj7i7f914"; + version = "4.0.15"; + sha256 = "07dz5kisis93x0ywb207w8nv54bfdgsahq325dyvbfvlgkqrxsh3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -79316,8 +83755,8 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.14"; - sha256 = "12ahyx3pn2pf63n22pa8qkwgh36yrdza2hw3n6khqws814g2f0ay"; + version = "0.7.15"; + sha256 = "1lk27dw7kyiikknmj858g4hv9p48161ixs3qq8pb08jkjlzcwfw8"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-glib gi-gobject @@ -79338,8 +83777,8 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.5"; - sha256 = "1w9x0jn2k8wny7925zw2lsmvs18i6j15ijizr515brqff3gyi5fs"; + version = "1.0.6"; + sha256 = "04pq0vz2dcyyq03l2gr0mms1l0dvh4ci17kcla6h1nw1lq5f1l6m"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -79350,7 +83789,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "OSTree bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage @@ -79360,8 +83799,8 @@ self: { }: mkDerivation { pname = "gi-pango"; - version = "1.0.15"; - sha256 = "0ymwbbm5ga31fj6i2mc75743ndqfb7p900576yv5y2p9d8cgp5j1"; + version = "1.0.16"; + sha256 = "1x3q1q4ww1v6v42p1wcaghxsja8cigqaqvklkfg4gxyp2f2cdg57"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -79376,6 +83815,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-pangocairo" = callPackage @@ -79386,8 +83826,8 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.15"; - sha256 = "0vy5fg2867dda19myyjbkxnrrbwgp3n7yqnfwqc67m5n8ziha2sb"; + version = "1.0.16"; + sha256 = "0hp90rx33xbi3w2y3iacf19p9mhkz6s4q8q6hcsrh5jnbavbpjwy"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango @@ -79402,7 +83842,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-poppler" = callPackage @@ -79412,8 +83852,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.14"; - sha256 = "03dgkaqiy7y808x7g1xmmns1m19xc94f4kg0vjhyb1f1xr7k7hzj"; + version = "0.18.15"; + sha256 = "1qbsmgx0nfn3pm6ffkhaq1wy26jdwnq5zjsxs32cf8ipdzlhg3cv"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gio gi-glib gi-gobject @@ -79434,8 +83874,8 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.4"; - sha256 = "12kvdnxvsaj4mljkjhnma7n0d6qav6k9a4laca881ww50hdbwid2"; + version = "0.0.5"; + sha256 = "0jwdv8fmc7wbwbh3nc1may4ij078xz9xc55rkr62x1szxi6ihdq5"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -79446,7 +83886,8 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Libsecret bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) libsecret;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.gnome3) libsecret;}; "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -79455,8 +83896,8 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.14"; - sha256 = "1z0cxhyadampjdibsrvqi6rw3kmcvq0q3mf4gk33ss2xb0f86m75"; + version = "2.4.16"; + sha256 = "01qsq8hy974j8i35spac1iyc46jrl4p0nnlx666nlxqa08a1f438"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -79467,6 +83908,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) libsoup;}; "gi-vte" = callPackage @@ -79476,8 +83918,8 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.16"; - sha256 = "0gv1ab2an6gfk83d5ryjpfz92rwrll2jyl41i48ql6fagbxx0n18"; + version = "2.91.17"; + sha256 = "1pslywq1mkcvrvbb3d5a4nc6vrmr9hvbgmg8dcsjq061fcg6b2aw"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject @@ -79500,8 +83942,8 @@ self: { }: mkDerivation { pname = "gi-webkit"; - version = "3.0.14"; - sha256 = "006jja6hr7bsqff2yxgzjrdnhbccym32fcr9vd7dscyj4wqw1ng1"; + version = "3.0.15"; + sha256 = "1bd2db34bfza9s84fwqd073wpf8cjp9rrjrlgi2q2hb6y6rn26w3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -79524,8 +83966,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.14"; - sha256 = "15r5kq0vq5gc4rsi0icw2f5zbqjw7kgdwpa3fbzn6jx7xmbl39kp"; + version = "4.0.18"; + sha256 = "0qxqsg9p2380z6cyvky8g0a90v1zyf90ff9mmislnzm89fmc8013"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib @@ -79541,20 +83983,20 @@ self: { }) {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 - , haskell-gi-overloading, text, transformers + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-gobject, gi-gtk, gi-javascriptcore, gi-soup, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers , webkitgtk-web-extension }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.14"; - sha256 = "098p54q8rrfd9syzh10q5rcb70lihjkwx7amj7s5y8wix38f372k"; + version = "4.0.16"; + sha256 = "010svwg3p3sdd209l8cnwhsm2dp9n6qf0shzqjdx5l1pkjv32zqm"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gobject gi-gtk gi-javascriptcore - gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text - transformers + base bytestring containers gi-gio gi-gobject gi-gtk + gi-javascriptcore gi-soup haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk-web-extension ]; doHaddock = false; @@ -79570,8 +84012,8 @@ self: { }: mkDerivation { pname = "gi-xlib"; - version = "2.0.1"; - sha256 = "1f1f3jnrvqisdalsad9k9wjr92c4ykw2i1gngsygainflk3hzgia"; + version = "2.0.2"; + sha256 = "0w9dwnd7a9hh1qn3swa48i8hp4gx9kznc92zjf198lrmrbkamp22"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -79582,6 +84024,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) x11;}; "giak" = callPackage @@ -79618,38 +84061,6 @@ self: { }) {}; "ginger" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, filepath - , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "ginger"; - version = "0.5.3.0"; - sha256 = "049ys725scrrkxc2q4wx085hbzdnjpm1jd9wqraqg5fa23vpfy34"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring data-default filepath http-types mtl parsec - safe scientific text time transformers unordered-containers - utf8-string vector - ]; - executableHaskellDepends = [ - aeson base bytestring data-default text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring data-default mtl tasty tasty-hunit - tasty-quickcheck text time transformers unordered-containers - utf8-string - ]; - homepage = "https://bitbucket.org/tdammers/ginger"; - description = "An implementation of the Jinja2 template language in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ginger_0_7_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , data-default, filepath, http-types, mtl, parsec, safe, scientific , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers @@ -79679,7 +84090,6 @@ self: { homepage = "https://bitbucket.org/tdammers/ginger"; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ginsu" = callPackage @@ -79704,6 +84114,7 @@ self: { homepage = "http://repetae.net/computer/ginsu/"; description = "Ginsu Gale Client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "gio" = callPackage @@ -79712,8 +84123,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.3.1"; - sha256 = "09yq753qld2p5h7apg5wyzyh8z47xqkkyx8zvjwk21w044iz8qxc"; + version = "0.13.4.1"; + sha256 = "11w567c4zafcdm5i6wpi1dr4m6mpfvyqyda4llq7wgvjbshy5fqk"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -79757,8 +84168,8 @@ self: { }: mkDerivation { pname = "giphy-api"; - version = "0.5.2.0"; - sha256 = "1sbwv6mvjb17g95b1b1ggryhk6lykp2vwvxja3y6z9rjzb9i2wa4"; + version = "0.6.0.1"; + sha256 = "0146813vcnjgb8clyczlz8g6ngm9l702gib60f2m6rf2bc0bbpwd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79766,7 +84177,6 @@ self: { microlens microlens-th mtl network-uri servant servant-client text transformers ]; - executableHaskellDepends = [ base network-uri text ]; testHaskellDepends = [ aeson base basic-prelude bytestring containers directory hspec lens network-uri text @@ -79774,6 +84184,7 @@ self: { homepage = "http://github.com/passy/giphy-api#readme"; description = "Giphy HTTP API wrapper and CLI search tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gist" = callPackage @@ -79797,17 +84208,17 @@ self: { "git" = callPackage ({ mkDerivation, base, byteable, bytedump, bytestring, containers - , cryptonite, hourglass, memory, mtl, patience, random - , system-fileio, system-filepath, tasty, tasty-quickcheck - , unix-compat, utf8-string, vector, zlib, zlib-bindings + , cryptonite, hourglass, memory, patience, random, system-fileio + , system-filepath, tasty, tasty-quickcheck, unix-compat + , utf8-string, vector, zlib, zlib-bindings }: mkDerivation { pname = "git"; - version = "0.2.0"; - sha256 = "1a4frn53qs31s6rqldw91zmc0i0gr33zm10y9ailqasbsgyxqwyp"; + version = "0.2.1"; + sha256 = "0j0hzlxb58g0q8fibg09ppag6bnhk7ym3nyzmqpwjbr6hxkdidsz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base byteable bytestring containers cryptonite hourglass memory mtl + base byteable bytestring containers cryptonite hourglass memory patience random system-fileio system-filepath unix-compat utf8-string vector zlib zlib-bindings ]; @@ -79842,55 +84253,60 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, case-insensitive - , clientsession, concurrent-output, conduit, conduit-extra - , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus - , 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, 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, split, stm, stm-chans + , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive + , clientsession, concurrent-output, conduit, containers, crypto-api + , cryptonite, curl, data-default, DAV, dbus, 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 + , 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, split, stm, stm-chans, tagsoup + , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun , template-haskell, text, time, torrent, transformers, unix - , unix-compat, unordered-containers, utf8-string, uuid, wai + , unix-compat, unordered-containers, utf8-string, uuid, vector, wai , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core - , yesod-default, yesod-form, yesod-static + , yesod-form, yesod-static }: mkDerivation { pname = "git-annex"; - version = "6.20171109"; - sha256 = "15fl5vazl38yfqi3iz9dqfqkav031wyd306rz1hlgxdqplayz3y5"; + version = "6.20180409"; + sha256 = "05cwyh3x432k3czrd59py0jsvl3qjg8ky7nc0rxkw6pbzwpgcb8c"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" - "-ftahoe" "-ftdfa" "-f-testsuite" "-ftorrentparser" "-fwebapp" + "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" "-fwebapp-secure" "-fwebdav" "-fxmpp" ]; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ + base bytestring Cabal data-default directory exceptions filepath + hslogger IfElse process split unix-compat utf8-string + ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring - case-insensitive clientsession concurrent-output conduit - 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 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 split stm stm-chans 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 yesod-form yesod-static + case-insensitive clientsession concurrent-output conduit 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 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 split stm stm-chans tagsoup tasty tasty-hunit + tasty-quickcheck tasty-rerun template-haskell text time torrent + transformers unix unix-compat unordered-containers utf8-string uuid + vector wai wai-extra warp warp-tls yesod yesod-core yesod-form + yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which ]; - doCheck = false; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; installPhase = "make PREFIX=$out BUILDER=: install"; checkPhase = '' @@ -79903,7 +84319,6 @@ self: { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; @@ -79930,6 +84345,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "git-config" = callPackage + ({ mkDerivation, base, megaparsec, smallcheck, smallcheck-series + , tasty, tasty-discover, tasty-hunit, tasty-smallcheck + , tasty-travis, text, unordered-containers + }: + mkDerivation { + pname = "git-config"; + version = "0.1.1"; + sha256 = "0vspjqscw02x3hr6n0d0d4kyjfh5lij4wy58fp4z301vmyv77vgl"; + libraryHaskellDepends = [ + base megaparsec text unordered-containers + ]; + testHaskellDepends = [ + base megaparsec smallcheck smallcheck-series tasty tasty-discover + tasty-hunit tasty-smallcheck tasty-travis text unordered-containers + ]; + homepage = "https://github.com/dogonthehorizon/git-config#readme"; + description = "A simple parser for Git configuration files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "git-date" = callPackage ({ mkDerivation, base, bytestring, old-locale, QuickCheck , test-framework, test-framework-quickcheck2, time, utf8-string @@ -80257,45 +84694,18 @@ self: { ({ mkDerivation, aeson, aeson-compat, base, base-compat , base16-bytestring, binary, binary-orphans, byteable, bytestring , containers, cryptohash, deepseq, deepseq-generics, exceptions - , file-embed, hashable, hspec, http-client, http-client-tls - , http-link-header, http-types, iso8601-time, mtl, network-uri - , semigroups, text, time, tls, transformers, transformers-compat - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "github"; - version = "0.16.0"; - sha256 = "0cr5cw3057sk86flb3annjn0yndbw4xz059vsigk52xwydjgxyqw"; - libraryHaskellDepends = [ - aeson aeson-compat base base-compat base16-bytestring binary - binary-orphans byteable bytestring containers cryptohash deepseq - deepseq-generics exceptions hashable http-client http-client-tls - http-link-header http-types iso8601-time mtl network-uri semigroups - text time tls transformers transformers-compat unordered-containers - vector vector-instances - ]; - testHaskellDepends = [ - aeson-compat base base-compat file-embed hspec unordered-containers - vector - ]; - homepage = "https://github.com/phadej/github"; - description = "Access to the GitHub API, v3"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "github_0_18" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, base-compat - , base16-bytestring, binary, binary-orphans, byteable, bytestring - , containers, cryptohash, deepseq, deepseq-generics, exceptions - , file-embed, hashable, hspec, http-client, http-client-tls - , http-link-header, http-types, iso8601-time, mtl, network-uri - , semigroups, text, time, tls, transformers, transformers-compat - , unordered-containers, vector, vector-instances + , file-embed, hashable, hspec, hspec-discover, http-client + , http-client-tls, http-link-header, http-types, iso8601-time, mtl + , network-uri, semigroups, text, time, tls, transformers + , transformers-compat, unordered-containers, vector + , vector-instances }: mkDerivation { pname = "github"; - version = "0.18"; - sha256 = "0i4cs6d95ik5c8zs2508nmhjh2v30a0qjyxfqyxhjsz48p9h5p1i"; + version = "0.19"; + sha256 = "1523p2rv4jwsbsqjc9g3qff4cy5dhdy5wzp382x5nr11rmbrpsph"; + revision = "2"; + editedCabalFile = "0ib40npsrwd92mgiqv5rqv21dnhmdh5x6ql84i8ivz8vs2a43hqq"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -80308,34 +84718,33 @@ self: { aeson-compat base base-compat bytestring file-embed hspec unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/phadej/github"; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-backup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory - , exceptions, filepath, git, github, hslogger, IfElse, MissingH - , mtl, network, network-uri, optparse-applicative, pretty-show - , process, text, transformers, unix, unix-compat, utf8-string - , vector + , exceptions, filepath, git, github, hslogger, IfElse, mtl, network + , network-uri, optparse-applicative, pretty-show, process, split + , text, transformers, unix, unix-compat, utf8-string, vector }: mkDerivation { pname = "github-backup"; - version = "1.20170301"; - sha256 = "1c3qjf2c7q3gj2w4zn7k30pxyjb0rzg59ra23s3wi7dczvriaqjy"; + version = "1.20171126"; + sha256 = "0fk3dp11acgw88rhb7pi8kb98m9x96jwdavcb7gz1jdcx391xy4s"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base bytestring Cabal directory exceptions filepath hslogger IfElse - MissingH mtl process unix unix-compat + mtl process split unix unix-compat ]; executableHaskellDepends = [ base bytestring containers directory exceptions filepath github - hslogger IfElse MissingH mtl network network-uri - optparse-applicative pretty-show process text transformers unix - unix-compat utf8-string vector + hslogger IfElse mtl network network-uri optparse-applicative + pretty-show process split text transformers unix unix-compat + utf8-string vector ]; executableToolDepends = [ git ]; homepage = "https://github-backup.branchable.com/"; @@ -80344,6 +84753,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) git;}; + "github-data" = callPackage + ({ mkDerivation, aeson, aeson-compat, base, base-compat + , base16-bytestring, binary, binary-orphans, bytestring, containers + , deepseq, deepseq-generics, exceptions, hashable, http-client + , http-types, iso8601-time, network-uri, text, time, tls + , transformers, transformers-compat, unordered-containers, vector + , vector-instances + }: + mkDerivation { + pname = "github-data"; + version = "0.18"; + sha256 = "1rqnjw8cz4xby1gbc9w8wpk1z0vg8wsm8jq7qz0ncjrm8manii5p"; + libraryHaskellDepends = [ + aeson aeson-compat base base-compat base16-bytestring binary + binary-orphans bytestring containers deepseq deepseq-generics + exceptions hashable http-client http-types iso8601-time network-uri + text time tls transformers transformers-compat unordered-containers + vector vector-instances + ]; + homepage = "https://github.com/strake/github.hs"; + description = "Access to the GitHub API, v3"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github-post-receive" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , email-validate, http-types, text, wai, wai-logger, warp @@ -80368,15 +84802,18 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.0.7"; - sha256 = "17v9rpl6nljf2xa16s3zi6dr8w8385pxdsa1ksyzn84kpq58kdn9"; + version = "1.1.6"; + sha256 = "1amvbrs7sb6d2l20rr4qc8gjj6m9xlhgkbrr13nrnjfg5fg0midn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types mime-types optparse-generic text unordered-containers uri-templater ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types + mime-types optparse-generic text unordered-containers uri-templater + ]; homepage = "https://github.com/tfausak/github-release#readme"; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; @@ -80469,6 +84906,46 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-webhooks" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time + , vector + }: + mkDerivation { + pname = "github-webhooks"; + version = "0.9.1"; + sha256 = "1h4wqix0rgsq7n3dv3nraqa3sbf5hgavq5k9dymfnw68qz5ii68b"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite deepseq + deepseq-generics memory text time vector + ]; + testHaskellDepends = [ aeson base bytestring hspec text vector ]; + homepage = "https://github.com/onrock-eng/github-webhooks#readme"; + description = "Aeson instances for GitHub Webhook payloads"; + license = stdenv.lib.licenses.mit; + }) {}; + + "githud" = callPackage + ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, unix + }: + mkDerivation { + pname = "githud"; + version = "2.0.2"; + sha256 = "0nhik30c7xzn3aqj8d8b8rk05viqmhl8q9ymswxxn9ws2nkm7rk8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl parsec process text unix ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + homepage = "http://github.com/gbataille/gitHUD#readme"; + description = "More efficient replacement to the great git-radar"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gitignore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , http-conduit, network, safe, text @@ -80544,6 +85021,7 @@ self: { ]; description = "API library for working with Git repositories"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-cmdline" = callPackage @@ -80571,6 +85049,7 @@ self: { ]; description = "Gitlib repository backend that uses the git command-line tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-cross" = callPackage @@ -80618,6 +85097,7 @@ self: { ]; description = "Libgit2 backend for gitlib"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-s3" = callPackage @@ -80661,6 +85141,7 @@ self: { ]; description = "Sample backend for gitlib showing the basic structure for any backend"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-test" = callPackage @@ -80679,6 +85160,7 @@ self: { ]; description = "Test library for confirming gitlib backend compliance"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-utils" = callPackage @@ -80749,8 +85231,8 @@ self: { }: mkDerivation { pname = "gitter"; - version = "0.3.0"; - sha256 = "13mi1c4z80nmj00adikbkdjijkciy2zkkyqbvf10r5zilqhdbaw1"; + version = "0.4"; + sha256 = "0lvsjpb1iakpbvh8prnwd90p8fp7hhj5120yp2w5ra9pm5fqcl49"; libraryHaskellDepends = [ aeson base bytestring exceptions lens lens-aeson mtl text wreq ]; @@ -80785,6 +85267,7 @@ self: { homepage = "http://github.com/passy/givegif#readme"; description = "CLI Giphy search tool with previews in iTerm 2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gjk" = callPackage @@ -80804,8 +85287,8 @@ self: { ({ mkDerivation, base, linear }: mkDerivation { pname = "gjk2d"; - version = "0.1.0.1"; - sha256 = "0yvbh660p65njr33py743ifjlm4njmb15b5sghbhhdi5g1b9qn6w"; + version = "0.1.0.2"; + sha256 = "163av54lmkqbayx9vkvviv3mdqq60zwkk9kjn75j7mk13d0iwpp3"; libraryHaskellDepends = [ base linear ]; testHaskellDepends = [ base linear ]; homepage = "https://github.com/suzumiyasmith/gjk2d#readme"; @@ -80814,7 +85297,7 @@ self: { "gl" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath - , fixed, half, hxt, mesa, transformers + , fixed, half, hxt, libGL, transformers }: mkDerivation { pname = "gl"; @@ -80826,10 +85309,10 @@ self: { libraryHaskellDepends = [ base containers fixed half transformers ]; - librarySystemDepends = [ mesa ]; + librarySystemDepends = [ libGL ]; description = "Complete OpenGL raw bindings"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) mesa;}; + }) {inherit (pkgs) libGL;}; "gl-capture" = callPackage ({ mkDerivation, base, bytestring, OpenGL }: @@ -80849,8 +85332,8 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "0.3.3"; - sha256 = "10g1daxf29vdm62l5fyah3lh7sh9q00yvv3xa7wpzhnm6k2liadn"; + version = "0.3.5"; + sha256 = "0n3mqpcmxz9z339r18dac5s4zdgkknlx470cd1mfi9gd932cr4z9"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -80895,23 +85378,23 @@ self: { "glambda" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, directory - , either, haskeline, mtl, parsec, tasty, tasty-hunit - , template-haskell, transformers + , haskeline, mtl, parsec, tasty, tasty-hunit, template-haskell + , transformers }: mkDerivation { pname = "glambda"; - version = "1.0.1"; - sha256 = "0vyiwaydli0mv6xwv2phksi08k133a07sia9s88cv1fr99nnjhns"; + version = "1.0.2"; + sha256 = "03fk3q017h4vbwlzf8pmlzlhgc3rzrc1f4fm0b19g4vw22qigflg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base containers directory either haskeline mtl - parsec transformers + ansi-wl-pprint base containers directory haskeline mtl parsec + transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - ansi-wl-pprint base either mtl parsec tasty tasty-hunit - template-haskell + ansi-wl-pprint base mtl parsec tasty tasty-hunit template-haskell + transformers ]; homepage = "https://github.com/goldfirere/glambda"; description = "A simply typed lambda calculus interpreter, written with GADTs"; @@ -81012,6 +85495,7 @@ self: { 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 @@ -81035,6 +85519,7 @@ self: { 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 @@ -81054,6 +85539,7 @@ self: { 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 @@ -81114,6 +85600,7 @@ self: { testHaskellDepends = [ base data-default hspec lens QuickCheck ]; description = "Glicko-2 implementation in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glider-nlp" = callPackage @@ -81127,6 +85614,7 @@ self: { homepage = "https://github.com/klangner/glider-nlp"; description = "Natural Language Processing library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glintcollider" = callPackage @@ -81153,10 +85641,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.24"; - sha256 = "1fhpwr7v2ad49j9699f5za1ww2m1ln39cvnm82z57cngjghpnngs"; - revision = "1"; - editedCabalFile = "11z35bs1zz6fw61m41cwbns4flwhjgmfk3hnghfga77x8s36nc08"; + version = "2.26"; + sha256 = "1ax2ygzrsr1r21v9cx4ixnlgrax6nxr4rkh090n1wv6xn02kd3j0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -81172,7 +85658,6 @@ self: { homepage = "https://github.com/glguy/irc-core"; description = "Console IRC client"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gll" = callPackage @@ -81181,14 +85666,13 @@ self: { }: mkDerivation { pname = "gll"; - version = "0.4.0.4"; - sha256 = "01qnvynldllb4qdvg29r64qq17qb1fs8yg7jgyj3f8ajgyi5jn9q"; + version = "0.4.0.5"; + sha256 = "09z7i4h5zwgyh3gg5w0l6p0ch1lhzmsnbmk1yfbc9b21gbxna5js"; libraryHaskellDepends = [ array base containers pretty regex-applicative text TypeCompose ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glob-posix" = callPackage @@ -81335,14 +85819,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss_1_12_0_0" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.12.0.0"; + sha256 = "0jxcvvmxvmb7n0wp4lwhvl4axkbhwwv4i6pi4xng357hfanxh1k9"; + 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 = "2.0.0.0"; - sha256 = "1hfiy2j7850yisbakz5nadr6l9k5maqq5mvg1xhak9jj1k1ji9if"; - revision = "1"; - editedCabalFile = "1arsf3j8b59qr5z5sy5sxx5mdddagjginrqs3jb9lpj1s3c3672b"; + version = "2.0.0.1"; + sha256 = "106z8kax0m3hzk0381l8m7gxdapl3wf0fdr1ljwb5fgcjc00pac2"; libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -81362,6 +85861,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-algorithms_1_12_0_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, gloss }: + mkDerivation { + pname = "gloss-algorithms"; + version = "1.12.0.0"; + sha256 = "00vji2mlakawarqsywgvl10yk32jmlxcj2d058a6psjqb0pkq0wb"; + 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 ({ mkDerivation, base, gloss, reactive-banana }: mkDerivation { @@ -81396,10 +85908,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.11.1.1"; - sha256 = "0m5xyr5q6kfb2h5pfd5nj4x39nhhsnr7h8vxghvhvw1khsbh5gj1"; - revision = "2"; - editedCabalFile = "0ldnhqmxs03040m5ym0qw1ig217j893rm1sq7rnjsmvh15ziw4yh"; + version = "1.12.0.0"; + sha256 = "1iimmphkq89h4k8iny52kgz1a0cq6lp8dzr0lkj4j5qnfaj65lhl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81462,6 +85972,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-raster_1_12_0_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering + , repa + }: + mkDerivation { + pname = "gloss-raster"; + version = "1.12.0.0"; + sha256 = "14a1qcajm4fp4hr4y55mw1jl5id747d455yn1818y5kz75m4k7y8"; + 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, base, colour-accelerate, gloss , gloss-accelerate @@ -81470,8 +85997,8 @@ self: { pname = "gloss-raster-accelerate"; version = "2.0.0.0"; sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d"; - revision = "1"; - editedCabalFile = "07c56r31akmq7hq0cyw4lc4h5370laand231wjd5ffwk369x2prg"; + revision = "2"; + editedCabalFile = "0k0a562qa8khj39zpgp4sr8kh8h2q4krjjhbvpbsll4r83067ahj"; libraryHaskellDepends = [ accelerate base colour-accelerate gloss gloss-accelerate ]; @@ -81495,6 +86022,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-rendering_1_12_0_0" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: + mkDerivation { + pname = "gloss-rendering"; + version = "1.12.0.0"; + sha256 = "1g64wlyk13lssf8p71xhpjaqygzdkn5fq6k2bmqwixmq56bhpnb0"; + 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 { @@ -81571,6 +86112,7 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-core" = callPackage @@ -81594,6 +86136,7 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-ekg" = callPackage @@ -81617,6 +86160,7 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-example" = callPackage @@ -81637,6 +86181,7 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gluturtle" = callPackage @@ -81687,6 +86232,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gmpint" = callPackage + ({ mkDerivation, base, gmp, recursion-schemes }: + mkDerivation { + pname = "gmpint"; + version = "0.1.0.11"; + sha256 = "00sml2d5jbfc0qy0nvrmk9xv31zk66anzz5r4d7h049asq0zh20n"; + libraryHaskellDepends = [ base recursion-schemes ]; + librarySystemDepends = [ gmp ]; + description = "GMP integer conversions"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) gmp;}; + "gnome-desktop" = callPackage ({ mkDerivation, base, directory, gconf, glib, gtk, random }: mkDerivation { @@ -81704,25 +86261,25 @@ self: { }) {}; "gnome-keyring" = callPackage - ({ mkDerivation, base, bytestring, c2hs, gnome_keyring, text, time + ({ mkDerivation, base, bytestring, c2hs, gnome-keyring, text, time }: mkDerivation { pname = "gnome-keyring"; version = "0.3.1"; sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8"; libraryHaskellDepends = [ base bytestring text time ]; - librarySystemDepends = [ gnome_keyring ]; - libraryPkgconfigDepends = [ gnome_keyring ]; + librarySystemDepends = [ gnome-keyring ]; + libraryPkgconfigDepends = [ gnome-keyring ]; libraryToolDepends = [ c2hs ]; homepage = "https://john-millikin.com/software/haskell-gnome-keyring/"; description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gnome_keyring;}; + }) {inherit (pkgs.gnome2) gnome-keyring;}; "gnomevfs" = callPackage - ({ mkDerivation, array, base, containers, glib, gnome_vfs - , gnome_vfs_module, gtk, gtk2hs-buildtools, haskell98, mtl + ({ mkDerivation, array, base, containers, glib, gnome-vfs + , gnome-vfs_module, gtk, gtk2hs-buildtools, haskell98, mtl }: mkDerivation { pname = "gnomevfs"; @@ -81731,25 +86288,24 @@ self: { libraryHaskellDepends = [ array base containers glib gtk haskell98 mtl ]; - libraryPkgconfigDepends = [ gnome_vfs gnome_vfs_module ]; + libraryPkgconfigDepends = [ gnome-vfs gnome-vfs_module ]; libraryToolDepends = [ gtk2hs-buildtools ]; homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the GNOME Virtual File System library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;}; + }) {gnome-vfs = null; gnome-vfs_module = null;}; "gnss-converters" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, basic-prelude, binary + ({ mkDerivation, aeson, aeson-pretty, base, basic-prelude , binary-conduit, bytestring, conduit, conduit-extra, exceptions , extra, lens, monad-control, mtl, resourcet, rtcm, sbp, tasty - , tasty-golden, tasty-hunit, text, time, transformers-base - , unordered-containers, vector + , tasty-golden, tasty-hunit, time, transformers-base, vector }: mkDerivation { pname = "gnss-converters"; - version = "0.3.21"; - sha256 = "13r593v6yb78352xf2365n0c49jcb6ijjvkrpsis9rbcglj6cnbx"; + version = "0.3.32"; + sha256 = "0b2v7msj54r6dd2w2wd4c8q6wvywnkmyddaa05r990cnbg9l4i9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81760,9 +86316,8 @@ self: { base basic-prelude binary-conduit conduit conduit-extra ]; testHaskellDepends = [ - aeson aeson-pretty base basic-prelude binary binary-conduit - bytestring conduit conduit-extra lens rtcm sbp tasty tasty-golden - tasty-hunit text time unordered-containers + aeson aeson-pretty base basic-prelude binary-conduit bytestring + conduit conduit-extra lens sbp tasty tasty-golden tasty-hunit time ]; homepage = "http://github.com/swift-nav/gnss-converters"; description = "GNSS Converters"; @@ -81791,24 +86346,24 @@ self: { homepage = "https://john-millikin.com/software/haskell-gnuidn/"; description = "Bindings for GNU IDN"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage ({ mkDerivation, array, base, containers, data-accessor - , data-accessor-transformers, deepseq, filepath, process, temporary - , time, transformers, utility-ht + , data-accessor-transformers, deepseq, filepath, process + , semigroups, temporary, time, transformers, utility-ht }: mkDerivation { pname = "gnuplot"; - version = "0.5.4.2"; - sha256 = "0s7z8a7cqnmfrs551wyqaj557hslhkw401z35nfb7shx6wrdvpq5"; + version = "0.5.5.2"; + sha256 = "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers data-accessor data-accessor-transformers - deepseq filepath process temporary time transformers utility-ht + deepseq filepath process semigroups temporary time transformers + utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; description = "2D and 3D plots using gnuplot"; @@ -81980,7 +86535,6 @@ self: { homepage = "http://khumba.net/projects/goatee"; description = "A monadic take on a 2,500-year-old board game - GTK+ UI"; license = stdenv.lib.licenses.agpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -82004,6 +86558,7 @@ self: { homepage = "http://github.com/cstrahan/gochan"; description = "Go-style channels"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gofer-prelude" = callPackage @@ -82019,6 +86574,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "goggles" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, containers, cryptonite, exceptions, filepath, hspec + , http-client, http-client-tls, http-types, memory, mtl, pem + , QuickCheck, req, scientific, stm, text, time, transformers + , unix-time, x509, x509-store + }: + mkDerivation { + pname = "goggles"; + version = "0.3.2"; + sha256 = "0g798gvxyqr08digpb61cvfcwg626iwmz9dqyg32w5vba332akd6"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring + containers cryptonite exceptions filepath http-client + http-client-tls http-types memory mtl pem req scientific stm text + time transformers unix-time x509 x509-store + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/ocramz/goggles"; + description = "Extensible interface to Web APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "goggles-gcs" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptonite, exceptions + , goggles, memory, mtl, req, text, unix-time + }: + mkDerivation { + pname = "goggles-gcs"; + version = "0.1.2"; + sha256 = "0p1z03y6sy8daqvyfs4mj767yh98zbl23lri72jpy0z213qsjybf"; + libraryHaskellDepends = [ + aeson base bytestring cryptonite exceptions goggles memory mtl req + text unix-time + ]; + homepage = "https://github.com/ocramz/goggles-gcs"; + description = "`goggles` interface to Google Cloud Storage"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit , conduit-extra, cryptonite, directory, exceptions, filepath @@ -82041,6 +86637,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Comprehensive Google Services SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-adexchange-buyer" = callPackage @@ -82053,6 +86650,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Buyer SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-adexchange-seller" = callPackage @@ -82065,6 +86663,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Seller SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-admin-datatransfer" = callPackage @@ -82077,6 +86676,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Data Transfer SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-admin-directory" = callPackage @@ -82089,6 +86689,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Directory SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-admin-emailmigration" = callPackage @@ -82101,6 +86702,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Email Migration API v2 SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-admin-reports" = callPackage @@ -82113,6 +86715,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Reports SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-adsense" = callPackage @@ -82125,6 +86728,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Management SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-adsense-host" = callPackage @@ -82137,6 +86741,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Host SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-affiliates" = callPackage @@ -82149,6 +86754,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Affiliate Network SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-analytics" = callPackage @@ -82174,6 +86780,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play EMM SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-android-publisher" = callPackage @@ -82186,6 +86793,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Developer SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-appengine" = callPackage @@ -82198,6 +86806,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google App Engine Admin SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-apps-activity" = callPackage @@ -82210,6 +86819,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Activity SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-apps-calendar" = callPackage @@ -82222,6 +86832,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Calendar SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-apps-licensing" = callPackage @@ -82234,6 +86845,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise License Manager SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-apps-reseller" = callPackage @@ -82246,6 +86858,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise Apps Reseller SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-apps-tasks" = callPackage @@ -82258,6 +86871,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Tasks SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-appstate" = callPackage @@ -82270,6 +86884,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google App State SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-autoscaler" = callPackage @@ -82282,6 +86897,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Autoscaler SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-bigquery" = callPackage @@ -82294,6 +86910,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google BigQuery SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-billing" = callPackage @@ -82306,6 +86923,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Billing SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-blogger" = callPackage @@ -82318,6 +86936,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Blogger SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-books" = callPackage @@ -82330,6 +86949,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Books SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-civicinfo" = callPackage @@ -82342,6 +86962,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Civic Information SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-classroom" = callPackage @@ -82354,6 +86975,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Classroom SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-cloudmonitoring" = callPackage @@ -82366,6 +86988,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Monitoring SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-cloudtrace" = callPackage @@ -82378,6 +87001,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Trace SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-compute" = callPackage @@ -82390,6 +87014,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-container" = callPackage @@ -82402,6 +87027,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Container Engine SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-containerbuilder" = callPackage @@ -82414,6 +87040,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Container Builder SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-core" = callPackage @@ -82437,6 +87064,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Core data types and functionality for Gogol libraries"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-customsearch" = callPackage @@ -82449,6 +87077,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google CustomSearch SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-dataflow" = callPackage @@ -82461,6 +87090,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Dataflow SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-dataproc" = callPackage @@ -82473,6 +87103,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Dataproc SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-datastore" = callPackage @@ -82485,6 +87116,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Datastore SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-debugger" = callPackage @@ -82497,6 +87129,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Debugger SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-deploymentmanager" = callPackage @@ -82509,6 +87142,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Deployment Manager SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-dfareporting" = callPackage @@ -82521,6 +87155,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google DCM/DFA Reporting And Trafficking SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-discovery" = callPackage @@ -82533,6 +87168,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google APIs Discovery Service SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-dns" = callPackage @@ -82545,6 +87181,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud DNS SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-doubleclick-bids" = callPackage @@ -82557,6 +87194,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Bid Manager SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-doubleclick-search" = callPackage @@ -82569,6 +87207,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Search SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-drive" = callPackage @@ -82581,6 +87220,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Drive SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-firebase-dynamiclinks" = callPackage @@ -82593,6 +87233,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Dynamic Links SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-firebase-rules" = callPackage @@ -82605,6 +87246,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Rules SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-fitness" = callPackage @@ -82617,6 +87259,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Fitness SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-fonts" = callPackage @@ -82629,6 +87272,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Fonts Developer SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-freebasesearch" = callPackage @@ -82641,6 +87285,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Freebase Search SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-fusiontables" = callPackage @@ -82653,6 +87298,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Fusion Tables SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-games" = callPackage @@ -82678,6 +87324,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Publishing SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-games-management" = callPackage @@ -82690,6 +87337,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Management SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-genomics" = callPackage @@ -82702,6 +87350,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Genomics SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-gmail" = callPackage @@ -82714,6 +87363,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Gmail SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-groups-migration" = callPackage @@ -82726,6 +87376,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Migration SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-groups-settings" = callPackage @@ -82738,6 +87389,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Settings SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-iam" = callPackage @@ -82750,6 +87402,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity and Access Management (IAM) SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-identity-toolkit" = callPackage @@ -82762,6 +87415,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity Toolkit SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-kgsearch" = callPackage @@ -82774,6 +87428,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Knowledge Graph Search SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-language" = callPackage @@ -82786,6 +87441,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Natural Language SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-latencytest" = callPackage @@ -82798,6 +87454,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Network Performance Monitoring SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-logging" = callPackage @@ -82810,6 +87467,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Logging SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-manufacturers" = callPackage @@ -82822,6 +87480,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Manufacturer Center SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-maps-coordinate" = callPackage @@ -82834,6 +87493,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Coordinate SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-maps-engine" = callPackage @@ -82846,6 +87506,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Engine SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-mirror" = callPackage @@ -82858,6 +87519,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Mirror SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-ml" = callPackage @@ -82870,6 +87532,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Machine Learning SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-monitoring" = callPackage @@ -82882,6 +87545,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Monitoring SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-oauth2" = callPackage @@ -82894,6 +87558,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google OAuth2 SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-pagespeed" = callPackage @@ -82906,6 +87571,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google PageSpeed Insights SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-partners" = callPackage @@ -82918,6 +87584,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Partners SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-people" = callPackage @@ -82930,6 +87597,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google People SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-play-moviespartner" = callPackage @@ -82942,6 +87610,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Movies Partner SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-plus" = callPackage @@ -82954,6 +87623,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google + SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-plus-domains" = callPackage @@ -82966,6 +87636,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google + Domains SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-prediction" = callPackage @@ -82978,6 +87649,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Prediction SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-proximitybeacon" = callPackage @@ -82990,6 +87662,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Proximity Beacon SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-pubsub" = callPackage @@ -83002,6 +87675,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Pub/Sub SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-qpxexpress" = callPackage @@ -83014,6 +87688,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google QPX Express SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-replicapool" = callPackage @@ -83026,6 +87701,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Manager SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-replicapool-updater" = callPackage @@ -83038,6 +87714,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Updater SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-resourcemanager" = callPackage @@ -83050,6 +87727,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Resource Manager SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-resourceviews" = callPackage @@ -83062,6 +87740,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Groups SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-runtimeconfig" = callPackage @@ -83074,6 +87753,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud RuntimeConfig SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-safebrowsing" = callPackage @@ -83086,6 +87766,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Safe Browsing APIs SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-script" = callPackage @@ -83098,6 +87779,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Script Execution SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-servicecontrol" = callPackage @@ -83110,6 +87792,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Control SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-servicemanagement" = callPackage @@ -83135,6 +87818,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Sheets SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-shopping-content" = callPackage @@ -83147,6 +87831,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Content API for Shopping SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-siteverification" = callPackage @@ -83159,6 +87844,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Site Verification SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-slides" = callPackage @@ -83171,6 +87857,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Slides SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-spectrum" = callPackage @@ -83183,6 +87870,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Spectrum Database SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-sqladmin" = callPackage @@ -83195,6 +87883,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud SQL Administration SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-storage" = callPackage @@ -83207,6 +87896,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Storage JSON SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-storage-transfer" = callPackage @@ -83219,6 +87909,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Storage Transfer SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-tagmanager" = callPackage @@ -83231,6 +87922,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Tag Manager SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-taskqueue" = callPackage @@ -83243,6 +87935,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google TaskQueue SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-translate" = callPackage @@ -83255,6 +87948,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Translate SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-urlshortener" = callPackage @@ -83267,6 +87961,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google URL Shortener SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-useraccounts" = callPackage @@ -83279,6 +87974,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud User Accounts SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-vision" = callPackage @@ -83291,6 +87987,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Vision SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-webmaster-tools" = callPackage @@ -83303,6 +88000,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Search Console SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-youtube" = callPackage @@ -83328,6 +88026,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Analytics SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-youtube-reporting" = callPackage @@ -83340,6 +88039,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Reporting SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gooey" = callPackage @@ -83443,6 +88143,7 @@ self: { homepage = "https://github.com/liyang/google-mail-filters"; description = "Write GMail filters and output to importable XML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-maps-geocoding" = callPackage @@ -83460,6 +88161,7 @@ self: { homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme"; description = "Google Maps Geocoding API bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-oauth2" = callPackage @@ -83481,6 +88183,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "google-oauth2-easy" = callPackage + ({ mkDerivation, aeson, base, criterion, http-api-data, http-client + , mtl, servant, servant-client, tasty, tasty-hspec, text + , text-conversions, unordered-containers + }: + mkDerivation { + pname = "google-oauth2-easy"; + version = "0.0.0"; + sha256 = "03jzlshz7649rvgmql5nsq4hys253dlqpm163xqpccif1s34z59b"; + libraryHaskellDepends = [ + aeson base http-api-data http-client mtl servant servant-client + text text-conversions unordered-containers + ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/jxv/google-oauth2-easy#readme"; + description = "Opininated use of Google Authentication for ease"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "google-oauth2-for-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , hspec, http-types, req, time, unix, wai, warp @@ -83497,7 +88220,6 @@ self: { homepage = "https://github.com/ishiy1993/google-oauth2-for-cli#readme"; description = "Get Google OAuth2 token for CLI tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-oauth2-jwt" = callPackage @@ -83516,6 +88238,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "google-oauth2-jwt_0_3_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL + , RSA, text, unix-time + }: + mkDerivation { + pname = "google-oauth2-jwt"; + version = "0.3.0"; + sha256 = "1mi7mdkq2d7n3pxlspc5zgval7wb2q7sn261k704nwrbm0phzzbj"; + 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-search" = callPackage ({ mkDerivation, base, free, nats, text, time }: mkDerivation { @@ -83526,6 +88265,31 @@ self: { homepage = "https://github.com/liyang/google-search"; description = "EDSL for Google and GMail search expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "google-server-api" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring + , bytestring, HsOpenSSL, http-api-data, http-client + , http-client-tls, mime-mail, monad-control, monad-logger, mtl, RSA + , servant, servant-client, text, time, transformers + , transformers-base, unix-time, unordered-containers, wai + , wai-extra, warp + }: + mkDerivation { + pname = "google-server-api"; + version = "0.2.0.1"; + sha256 = "0d07flz3vpdyq4ifldp466zhj19ll7zlcnwn0ns47d72r79wghiw"; + libraryHaskellDepends = [ + aeson aeson-casing base base64-bytestring bytestring HsOpenSSL + http-api-data http-client http-client-tls mime-mail monad-control + monad-logger mtl RSA servant servant-client text time transformers + transformers-base unix-time unordered-containers wai wai-extra warp + ]; + homepage = "https://github.com/arowM/haskell-google-server-api#readme"; + description = "Google APIs for server to server applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-static-maps" = callPackage @@ -83546,6 +88310,7 @@ self: { homepage = "https://github.com/mpilgrem/google-static-maps#readme"; description = "Bindings to the Google Static Maps API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-translate" = callPackage @@ -83562,6 +88327,7 @@ self: { ]; description = "Google Translate API bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "googleplus" = callPackage @@ -83622,6 +88388,7 @@ self: { homepage = "https://github.com/sternenseemann/gopher-proxy"; description = "proxy gopher over http"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gopherbot" = callPackage @@ -83677,6 +88444,7 @@ self: { homepage = "https://github.com/Teaspot-Studio/gore-and-ash-actor"; description = "Gore&Ash engine extension that implements actor style of programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gore-and-ash-async" = callPackage @@ -83700,6 +88468,7 @@ self: { homepage = "https://github.com/TeaspotStudio/gore-and-ash-async#readme"; description = "Core module for Gore&Ash engine that embeds async IO actions into game loop"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gore-and-ash-demo" = callPackage @@ -83747,10 +88516,9 @@ self: { }) {}; "gore-and-ash-lambdacube" = callPackage - ({ mkDerivation, base, containers, deepseq, exceptions, GLFW-b - , gore-and-ash, gore-and-ash-glfw, hashable, JuicyPixels - , lambdacube-compiler, lambdacube-gl, lambdacube-ir, linear, mtl - , text, transformers, unordered-containers, vector + ({ mkDerivation, base, containers, deepseq, exceptions + , gore-and-ash, hashable, lambdacube-compiler, lambdacube-gl, mtl + , text, unordered-containers }: mkDerivation { pname = "gore-and-ash-lambdacube"; @@ -83762,11 +88530,6 @@ self: { base containers deepseq exceptions gore-and-ash hashable lambdacube-compiler lambdacube-gl mtl text unordered-containers ]; - executableHaskellDepends = [ - base containers deepseq exceptions GLFW-b gore-and-ash - gore-and-ash-glfw JuicyPixels lambdacube-compiler lambdacube-gl - lambdacube-ir linear mtl text transformers vector - ]; homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme"; description = "Core module for Gore&Ash engine that do something"; license = stdenv.lib.licenses.bsd3; @@ -83872,7 +88635,6 @@ self: { homepage = "https://github.com/hot-leaf-juice/gotta-go-fast"; description = "A command line utility for practicing typing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gpah" = callPackage @@ -83926,7 +88688,6 @@ self: { homepage = "http://github.com/tgolson/gpio"; description = "Haskell GPIO interface, designed specifically for the RaspberryPi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gpolyline" = callPackage @@ -84044,8 +88805,8 @@ self: { }: mkDerivation { pname = "grakn"; - version = "0.2.0"; - sha256 = "0k6l3bd9bb5wzlk5b5kqp7pdza9vymhm03b65hjcv1djs8lf8hk4"; + version = "0.3.0"; + sha256 = "1difz80dv4ywyshsdd1i65x5kfb8ix9amh0gn7glcnlqgqjrn2jn"; libraryHaskellDepends = [ aeson base containers http-client http-media mtl process regex-posix scientific servant servant-client text @@ -84056,7 +88817,7 @@ self: { servant-client text ]; homepage = "https://github.com/graknlabs/grakn-haskell"; - description = "A Haskell client for "; + description = "A Haskell client for Grakn"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -84087,8 +88848,8 @@ self: { }: mkDerivation { pname = "grammatical-parsers"; - version = "0.2.1"; - sha256 = "0225lgg44plnz1140fj91rc45x59a7920hw494qavn968cldkv17"; + version = "0.3"; + sha256 = "1dqmjg40h4gm6921yq84sx8x5sdbzhnv8xl7m2ylb872ddbzfwg3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84098,8 +88859,8 @@ self: { base containers monoid-subclasses parsers rank2classes ]; testHaskellDepends = [ - base checkers doctest monoid-subclasses parsers QuickCheck - rank2classes tasty tasty-quickcheck testing-feat + base checkers containers doctest monoid-subclasses parsers + QuickCheck rank2classes tasty tasty-quickcheck testing-feat ]; benchmarkHaskellDepends = [ base containers criterion deepseq monoid-subclasses rank2classes @@ -84189,7 +88950,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "GTK+-based backend for declarative user interface programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "graph-core" = callPackage @@ -84247,6 +89007,7 @@ self: { libraryHaskellDepends = [ base containers fgl ]; description = "An implementation of algorithms for matchings in graphs"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting" = callPackage @@ -84261,6 +89022,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Monadic graph rewriting of hypergraphs with ports and multiedges"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-cl" = callPackage @@ -84299,6 +89061,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "OpenGL interface for interactive port graph rewriting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-lambdascope" = callPackage @@ -84321,6 +89084,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-layout" = callPackage @@ -84337,6 +89101,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Force-directed node placement intended for incremental graph drawing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-ski" = callPackage @@ -84357,6 +89122,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-strategies" = callPackage @@ -84373,6 +89139,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluation strategies for port-graph rewriting systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-trs" = callPackage @@ -84417,6 +89184,7 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-serialize" = callPackage @@ -84594,8 +89362,8 @@ self: { }: mkDerivation { pname = "graphite"; - version = "0.9.5.1"; - sha256 = "0sb8ixz91bcyzylhjk7d44c62gcl1xkfc5vc60sx1z0944f06l1h"; + version = "0.9.8.0"; + sha256 = "1ylpa2kkbdhfgiq7g1kdlvjzs2ln3ag8pssp0widzz1p0is8ldm1"; libraryHaskellDepends = [ base bytestring cassava containers deepseq graphviz hashable process QuickCheck random semigroups text unordered-containers @@ -84606,21 +89374,21 @@ self: { homepage = "https://github.com/alx741/graphite#readme"; description = "Graphs and networks library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphmod" = callPackage ({ mkDerivation, base, Cabal, containers, directory, dotgen - , filepath, haskell-lexer + , filepath, haskell-lexer, pretty }: mkDerivation { pname = "graphmod"; - version = "1.4"; - sha256 = "11gikmhdamsi900nk206hwm9fjjhdcsspj6aa06i8wqg8g4zbblq"; + version = "1.4.1"; + sha256 = "029lrdgms3kvqh5g9r762r31nwr0cjkzwksbc501d9kd0gk0ymjh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal containers directory dotgen filepath haskell-lexer + pretty ]; homepage = "http://github.com/yav/graphmod/wiki"; description = "Present the module dependencies of a program as a \"dot\" graph"; @@ -84649,8 +89417,8 @@ self: { }: mkDerivation { pname = "graphql-api"; - version = "0.2.0"; - sha256 = "08hsrqh4v7fmkmilwnmxpii8iqkhc0affcv3mmjmp3my0qi79xrl"; + version = "0.3.0"; + sha256 = "1rn47xxyz3wkflz2ji0d496r8w0jcf1a0al14gclflbyd4bzkpwy"; libraryHaskellDepends = [ aeson attoparsec base containers exceptions ghc-prim protolude QuickCheck scientific text transformers @@ -84662,10 +89430,9 @@ self: { benchmarkHaskellDepends = [ attoparsec base criterion exceptions protolude transformers ]; - homepage = "https://github.com/jml/graphql-api#readme"; - description = "Sketch of GraphQL stuff"; + homepage = "https://github.com/haskell-graphql/graphql-api#readme"; + description = "GraphQL API"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphs" = callPackage @@ -84674,8 +89441,8 @@ self: { }: mkDerivation { pname = "graphs"; - version = "0.7"; - sha256 = "0k3g5wrznwxmlmki5z08aj4rnlilz9z83dy0mydwksljc2n5d9pf"; + version = "0.7.1"; + sha256 = "02g21jpz8jm8j1kpszk8vglw1733z2jp32dc650z40nxlmxpmlxc"; libraryHaskellDepends = [ array base containers transformers transformers-compat void ]; @@ -84716,34 +89483,6 @@ self: { }) {}; "graphviz" = 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.18.1.2"; - sha256 = "1z453is01v0rnxlv6xx4iyaqv5vrp3bpz829mpv1a341sck2135h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring colour containers directory dlist fgl filepath - polyparse process temporary text transformers wl-pprint-text - ]; - executableHaskellDepends = [ - base bytestring directory filepath 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; - }) {}; - - "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 @@ -84759,9 +89498,6 @@ self: { base bytestring colour containers directory dlist fgl filepath polyparse process temporary text transformers wl-pprint-text ]; - executableHaskellDepends = [ - base bytestring directory filepath text - ]; testHaskellDepends = [ base containers fgl fgl-arbitrary filepath QuickCheck text ]; @@ -84769,7 +89505,6 @@ self: { 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 @@ -84933,6 +89668,7 @@ self: { homepage = "https://github.com/erebe/greenclip#readme"; description = "Simple clipboard manager to be integrated with rofi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greg-client" = callPackage @@ -85016,6 +89752,49 @@ self: { homepage = "https://github.com/NICTA/greplicate"; description = "Generalised replicate functions"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "greskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , greskell-core, hint, hspec, semigroups, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "greskell"; + version = "0.1.1.0"; + sha256 = "1mf1fgp1i3pxayhgkc4jmx3fjx3s16vcn9n2jbg750d6nif6yyxi"; + libraryHaskellDepends = [ + aeson base greskell-core semigroups text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hint + hspec text unordered-containers + ]; + homepage = "https://github.com/debug-ito/greskell/"; + description = "Haskell binding for Gremlin graph query language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "greskell-core" = callPackage + ({ mkDerivation, aeson, base, doctest, doctest-discover, hspec + , QuickCheck, scientific, semigroups, text, unordered-containers + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.1.0"; + sha256 = "0in0ilj337zm00qg0qxcmiai8xvlni5vz4sz0h0dmc3pmg57zmh0"; + libraryHaskellDepends = [ + aeson base scientific semigroups text unordered-containers + ]; + testHaskellDepends = [ + aeson base doctest doctest-discover hspec QuickCheck text + ]; + homepage = "https://github.com/debug-ito/greskell/"; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = stdenv.lib.licenses.bsd3; }) {}; "grid" = callPackage @@ -85150,22 +89929,23 @@ self: { executableHaskellDepends = [ base lens mtl ncurses ]; description = "A spoof on gloss for terminal animation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-builder, bytestring, containers, monad-control, mtl - , resourcet, scientific, text, time, transformers - , transformers-base + , resourcet, safe-exceptions, scientific, text, time, transformers + , transformers-base, transformers-compat }: mkDerivation { pname = "groundhog"; - version = "0.8"; - sha256 = "075ga5yiyrd0if1v9j4nw8c76gpgnkidkk0s1d082x3k8vz5v58n"; + version = "0.8.0.1"; + sha256 = "0qrv2rpw1nqn28j6mcmwn0sjmfsfg5gj68sq5dcydh247q1acp5r"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring - containers monad-control mtl resourcet scientific text time - transformers transformers-base + containers monad-control mtl resourcet safe-exceptions scientific + text time transformers transformers-base transformers-compat ]; homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; @@ -85222,8 +90002,8 @@ self: { }: mkDerivation { pname = "groundhog-mysql"; - version = "0.8"; - sha256 = "0rjn91ncl3mwhb4y8ws6bjrwayjyncrfafikykzq200i2gjqpbai"; + version = "0.8.0.1"; + sha256 = "0h4sckj7hrhlnrfa9639kr9id8rf11ragadsj9rxils1vn4cn35r"; libraryHaskellDepends = [ base bytestring containers groundhog monad-control monad-logger mysql mysql-simple resource-pool resourcet text time transformers @@ -85240,8 +90020,8 @@ self: { }: mkDerivation { pname = "groundhog-postgresql"; - version = "0.8.0.1"; - sha256 = "1s4m1g14jv88qxb2ynj92agjf3z2sa8xibgjgvwn7p3hn4zz73md"; + version = "0.8.0.3"; + sha256 = "0iz21awiblzir01r6p77qnlvqsb8j87x5y11g1q2spnafzj4wlpl"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers groundhog monad-control postgresql-libpq postgresql-simple resource-pool @@ -85258,8 +90038,8 @@ self: { }: mkDerivation { pname = "groundhog-sqlite"; - version = "0.8"; - sha256 = "14ih528kqq22qf890r74j1achddml8aaa24nqa5l0f4vrx5vvjvx"; + version = "0.8.0.1"; + sha256 = "1y6cfnyrrq61vv793crfb7yd21yn0gqmx7j7c9sg8665l34wq2jp"; libraryHaskellDepends = [ base bytestring containers direct-sqlite groundhog monad-control resource-pool resourcet text transformers unordered-containers @@ -85274,8 +90054,8 @@ self: { }: mkDerivation { pname = "groundhog-th"; - version = "0.8.0.1"; - sha256 = "00vk26qa7r6znyz848rh66nn4blybprpqvvyh53h22i9ibrk2b1s"; + version = "0.8.0.2"; + sha256 = "13rxdmnbmsivp608xclkvjnab0dzhzyqc8zjrpm7ml9d5yc8v596"; libraryHaskellDepends = [ aeson base bytestring containers groundhog template-haskell text time unordered-containers yaml @@ -85301,7 +90081,6 @@ self: { homepage = "http://hub.darcs.net/thielema/group-by-date/"; description = "Shell command for grouping files by dates into folders"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "group-with" = callPackage @@ -85322,15 +90101,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "groupBy" = callPackage + ({ mkDerivation, base, code-page, criterion, doctest + , optparse-applicative, QuickCheck, random, utility-ht + }: + mkDerivation { + pname = "groupBy"; + version = "0.1.0.0"; + sha256 = "1w8spv6fhwhfdr6azlfgnjs8dqcyk8sn27hnk2wyi7gpy9zzhxw0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck ]; + benchmarkHaskellDepends = [ + base code-page criterion optparse-applicative random utility-ht + ]; + homepage = "https://github.com/oisdk/groupBy#readme"; + description = "Replacement definition of Data.List.GroupBy"; + license = stdenv.lib.licenses.mit; + }) {}; + "grouped-list" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, pointed - , QuickCheck, tasty, tasty-quickcheck + ({ mkDerivation, base, binary, containers, criterion, deepseq + , pointed, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { pname = "grouped-list"; - version = "0.2.1.3"; - sha256 = "1ggmjn9gmq3ksbavvi0cqb96fnkbmhr9bsadkilpdnnndfdz0rdy"; - libraryHaskellDepends = [ base containers deepseq pointed ]; + version = "0.2.2.0"; + sha256 = "0733wmdflxpd2ryrdx4ygizyclxmbd8xmkdfs7d7s4x8hffk0k5x"; + libraryHaskellDepends = [ base binary containers deepseq pointed ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md"; @@ -85367,8 +90164,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "groups"; - version = "0.4.0.0"; - sha256 = "1kp8h3617cimya8nnadljyy4vk66dzl5nzfm900k2gh3ci8kja6k"; + version = "0.4.1.0"; + sha256 = "0ggkygkyxw5ga4cza82bjvdraavl294k0h6b62d2px7z3nvqhifx"; libraryHaskellDepends = [ base ]; description = "Haskell 98 groups"; license = stdenv.lib.licenses.bsd3; @@ -85514,8 +90311,8 @@ self: { }: mkDerivation { pname = "gssapi"; - version = "0.2.0.0"; - sha256 = "1kvyy05m3wcvcp76ap4i499j5mmm7dlz49i0m0a5vanpn2jfpkwy"; + version = "0.2.0.1"; + sha256 = "0bpwjggsdkckwfgmp89rvkzxjlagiliawrzf9pzvxrka7wk1ip14"; libraryHaskellDepends = [ base bytestring resourcet transformers ]; librarySystemDepends = [ gssapi_krb5 krb5 ]; homepage = "https://github.com/ondrap/gssapi"; @@ -85530,8 +90327,8 @@ self: { }: mkDerivation { pname = "gssapi-wai"; - version = "0.1.2.1"; - sha256 = "0n9295ql2zrsipnf91af24lcc35f8l6d6313cz8xiyx4dhf1arln"; + version = "0.1.2.2"; + sha256 = "1fkgsdc4nkxwkhnz3b8rz6zx8jq6325mgniy5h5s3cr7k0kwnv0s"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive gssapi http-types vault wai wai-extra @@ -85542,6 +90339,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gstorable" = callPackage + ({ mkDerivation, base, generic-storable, ghc-prim, hspec + , QuickCheck + }: + mkDerivation { + pname = "gstorable"; + version = "0.1.0.3"; + sha256 = "0qs18la2w9x44faw9yl6pabcsj7fdrcsapsfhrbhjmbqrdh22rm4"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base generic-storable ghc-prim hspec QuickCheck + ]; + description = "Generic implementation of Storable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, directory, glib , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl @@ -85559,7 +90373,6 @@ self: { 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; }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage @@ -85658,7 +90471,6 @@ self: { testHaskellDepends = [ base containers gtk3 hspec ]; description = "Large TreeStore support for gtk2hs"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gtk-mac-integration" = callPackage @@ -85710,6 +90522,19 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "gtk-strut" = callPackage + ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: + mkDerivation { + pname = "gtk-strut"; + version = "0.1.2.0"; + sha256 = "1v73qca2qdkpvfal2ndmwrxyj1qwgxgmammkbf88azs7wcxcf7y6"; + libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ]; + homepage = "https://github.com/IvanMalison/gtk-strut#readme"; + description = "Libary for creating strut windows with gi-gtk"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gtk-toggle-button-list" = callPackage ({ mkDerivation, base, gtk }: mkDerivation { @@ -85735,18 +90560,17 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk, gtk2, x11 }: + ({ mkDerivation, base, glib, gtk3, x11 }: mkDerivation { pname = "gtk-traymanager"; - version = "0.1.6"; - sha256 = "0hind14k37823jsa9dg2r6bfj7d6y1m70xn8mcr610rhakazac6b"; - libraryHaskellDepends = [ base glib gtk ]; - libraryPkgconfigDepends = [ gtk2 x11 ]; + version = "1.0.1"; + sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di"; + libraryHaskellDepends = [ base glib gtk3 ]; + libraryPkgconfigDepends = [ x11 ]; homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;}; + }) {inherit (pkgs) x11;}; "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory @@ -85754,10 +90578,8 @@ self: { }: mkDerivation { pname = "gtk2hs-buildtools"; - version = "0.13.3.0"; - sha256 = "1kz5631vpi4wbi0jldj7gs1xc86vfxdcs750a72x3nbdddbc0asv"; - revision = "1"; - editedCabalFile = "0nbfvza67z6wi7lgpa8zdr7smqzh5xjvhjd7a4iigls8jj74h78s"; + version = "0.13.3.1"; + sha256 = "0m3irv9cs8f602wc5lq84c7k1pd9yg4vydfzzn2qa6z0l552y3r2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -85905,13 +90727,12 @@ self: { "gtk3" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers - , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time - , transformers + , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text }: mkDerivation { pname = "gtk3"; - version = "0.14.7"; - sha256 = "0mvzpx4ciral5hnz2iimwag4gbjjciqhjxbbdssg8mg4yvzpb99s"; + version = "0.14.8"; + sha256 = "0sxk3dhzhqkmlwqkpvmi1b0ycyqdz19z7zfr5nxhskzn5b522ikw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -85920,13 +90741,9 @@ self: { array base bytestring cairo containers gio glib mtl pango text ]; libraryPkgconfigDepends = [ gtk3 ]; - executableHaskellDepends = [ - array base cairo text time transformers - ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage @@ -86022,7 +90839,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) gtksourceview;}; "gtksourceview3" = callPackage @@ -86042,7 +90858,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "guarded-rewriting" = callPackage @@ -86097,7 +90912,6 @@ self: { homepage = "https://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gutenberg-fibonaccis" = callPackage @@ -86126,6 +90940,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gym-http-api" = callPackage + ({ mkDerivation, aeson, base, exceptions, http-client, servant + , servant-client, servant-lucid, text, unordered-containers + }: + mkDerivation { + pname = "gym-http-api"; + version = "0.1.0.0"; + sha256 = "0id8npw9ziqibm0j5fqkjw7r75la2cd4zlyzsk90rpx2xf5xy20p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base servant servant-client servant-lucid text + unordered-containers + ]; + executableHaskellDepends = [ + base exceptions http-client servant-client + ]; + homepage = "https://github.com/stites/gym-http-api#readme"; + description = "REST client to the gym-http-api project"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "h-booru" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , http-conduit, hxt, mtl, stm, template-haskell, transformers @@ -86388,6 +91225,7 @@ self: { ]; description = "A library for analyzing and transforming LLVM (3.5) assembly codes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {hooplext = null;}; @@ -86410,53 +91248,80 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hOff-display" = callPackage + ({ mkDerivation, base, GLFW, hOff-parser, OpenGL, parsec }: + mkDerivation { + pname = "hOff-display"; + version = "0.1.0.0"; + sha256 = "086a2z57nbfjn7xs2y2mngw4bi0a0d4gxrxd5l5ic15gjr62fa0r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hOff-parser OpenGL ]; + executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ]; + homepage = "https://github.com/Qinka/hOff"; + description = "The tool to transform the OFF to other image format"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "hOff-parser" = callPackage + ({ mkDerivation, base, parsec }: + mkDerivation { + pname = "hOff-parser"; + version = "0.1.0.0"; + sha256 = "1vjvn4sr9nb7dd0in57kay6sb49nqzs377v6k9570h5faaj1dyci"; + libraryHaskellDepends = [ base parsec ]; + homepage = "https://github.com/Qinka/hOff"; + description = "The parser to parser the OFF(Object File Format, Princeton ModelNet)"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hOpenPGP" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, bifunctors, binary, binary-conduit, byteable - , bytestring, bzlib, conduit, conduit-extra, containers, criterion - , crypto-cipher-types, cryptonite, data-default-class, errors - , hashable, incremental-parser, ixset-typed, lens, memory - , monad-loops, nettle, network, network-uri, newtype - , openpgp-asciiarmor, QuickCheck, quickcheck-instances, resourcet - , securemem, semigroups, split, tasty, tasty-hunit - , tasty-quickcheck, text, time, time-locale-compat, transformers - , unordered-containers, wl-pprint-extras, zlib + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-conduit, bytestring, bzlib, conduit, conduit-extra + , containers, criterion, crypto-cipher-types, cryptonite + , data-default-class, errors, hashable, incremental-parser + , ixset-typed, lens, memory, monad-loops, nettle, network + , network-uri, newtype, openpgp-asciiarmor, QuickCheck + , quickcheck-instances, resourcet, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , transformers, unliftio-core, unordered-containers + , wl-pprint-extras, zlib }: mkDerivation { pname = "hOpenPGP"; - version = "2.5.5"; - sha256 = "0m5df5w261nm6v246g6r306a5higmyzpgsskf8cp4m88cnlyy08q"; + version = "2.6"; + sha256 = "0vsrgyzh7zlx9z27fvpjzk4s4gv1zpxwb68n529hvilsphyz35kf"; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring - bifunctors binary binary-conduit byteable bytestring bzlib conduit - conduit-extra containers crypto-cipher-types cryptonite + aeson asn1-encoding attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-conduit bytestring bzlib + conduit conduit-extra containers crypto-cipher-types cryptonite data-default-class errors hashable incremental-parser ixset-typed - lens memory monad-loops nettle network network-uri newtype - openpgp-asciiarmor resourcet securemem semigroups split text time - time-locale-compat transformers unordered-containers + lens memory monad-loops nettle network-uri newtype + openpgp-asciiarmor resourcet semigroups split text time + time-locale-compat transformers unliftio-core unordered-containers wl-pprint-extras zlib ]; testHaskellDepends = [ - aeson attoparsec base base16-bytestring bifunctors binary - binary-conduit byteable bytestring bzlib conduit conduit-extra + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra containers crypto-cipher-types cryptonite data-default-class errors hashable incremental-parser ixset-typed lens memory monad-loops nettle network network-uri newtype QuickCheck quickcheck-instances - resourcet securemem semigroups split tasty tasty-hunit - tasty-quickcheck text time time-locale-compat transformers + resourcet semigroups split tasty tasty-hunit tasty-quickcheck text + time time-locale-compat transformers unliftio-core unordered-containers wl-pprint-extras zlib ]; benchmarkHaskellDepends = [ aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit byteable bytestring bzlib conduit conduit-extra - containers criterion crypto-cipher-types cryptonite - data-default-class errors hashable incremental-parser ixset-typed - lens memory monad-loops nettle network network-uri newtype - openpgp-asciiarmor resourcet securemem semigroups split text time - time-locale-compat transformers unordered-containers - wl-pprint-extras zlib + binary-conduit bytestring bzlib conduit conduit-extra containers + criterion crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype openpgp-asciiarmor resourcet + semigroups split text time time-locale-compat transformers + unliftio-core unordered-containers wl-pprint-extras zlib ]; - homepage = "http://floss.scru.org/hOpenPGP/"; + homepage = "https://salsa.debian.org/clint/hOpenPGP"; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -86470,8 +91335,8 @@ self: { }: mkDerivation { pname = "hPDB"; - version = "1.2.0.9"; - sha256 = "1kcfizpsvs4nsq8yrqk6syvr9kbbff1krlc4azkpmw4s3r68hjs4"; + version = "1.2.0.10"; + sha256 = "10a5995872n6y849nhs9yl7zwp7ywfma3mabgywq7acmpppl5ka0"; libraryHaskellDepends = [ AC-Vector base bytestring containers deepseq directory ghc-prim iterable mmap mtl Octree parallel QuickCheck tagged @@ -86480,6 +91345,7 @@ self: { homepage = "https://github.com/BioHaskell/hPDB"; description = "Protein Databank file format library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB-examples" = callPackage @@ -86490,8 +91356,8 @@ self: { }: mkDerivation { pname = "hPDB-examples"; - version = "1.2.0.7"; - sha256 = "06wqvr7msvvymkbzfc16zpk4klymhpgw95r8hvxaqrwph80y0c1k"; + version = "1.2.0.8"; + sha256 = "0zyfh2693cirr69qcmiwsmk4p8w8v6yacidcs22jcisay95v4qf6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86506,6 +91372,7 @@ self: { homepage = "https://github.com/BioHaskell/hPDB-examples"; description = "Examples for hPDB library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPushover" = callPackage @@ -86662,7 +91529,6 @@ self: { ]; description = "A Gtk mixer GUI application for FreeBSD"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "haar" = callPackage @@ -86741,6 +91607,7 @@ self: { executableHaskellDepends = [ base optparse-applicative text ]; description = "A blog system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hacanon-light" = callPackage @@ -86834,6 +91701,7 @@ self: { libraryHaskellDepends = [ base bytestring cgi containers hack ]; description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack-handler-cgi" = callPackage @@ -87080,6 +91948,7 @@ self: { homepage = "https://github.com/nfjinjing/hack2-contrib"; description = "Hack2 contrib extra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack2-handler-happstack-server" = callPackage @@ -87179,41 +92048,44 @@ self: { }) {}; "hackage-db" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, tar, utf8-string + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, filepath, tar, time, utf8-string }: mkDerivation { pname = "hackage-db"; - version = "1.22"; - sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd"; + version = "2.0"; + sha256 = "09xza82g45nv3gxmryqd2mns4bm8hr6d7hzr7nqdi6zq46s0lfgq"; revision = "1"; - editedCabalFile = "0xj3wwf0wl8qfcz4zsxw0r6f79rg7h010jfv54gsiyzwpf67l9xm"; + editedCabalFile = "1zsdy9c0gngl8k690311zchd3lhl7h64arab77p7v9j5bradziiq"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers directory filepath tar utf8-string + aeson base bytestring Cabal containers directory filepath tar time + utf8-string + ]; + executableHaskellDepends = [ + base bytestring Cabal containers utf8-string ]; - homepage = "http://github.com/peti/hackage-db"; - description = "access Hackage's package database via Data.Map"; + homepage = "https://github.com/peti/hackage-db#readme"; + description = "Access Hackage's package database via Data.Map"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "hackage-db_2_0" = callPackage + "hackage-db_2_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, filepath, tar, time, utf8-string }: mkDerivation { pname = "hackage-db"; - version = "2.0"; - sha256 = "09xza82g45nv3gxmryqd2mns4bm8hr6d7hzr7nqdi6zq46s0lfgq"; + version = "2.0.1"; + sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring Cabal containers directory filepath tar time utf8-string ]; - executableHaskellDepends = [ - base bytestring Cabal containers utf8-string - ]; homepage = "https://github.com/peti/hackage-db#readme"; description = "Access Hackage's package database via Data.Map"; license = stdenv.lib.licenses.bsd3; @@ -87304,6 +92176,7 @@ self: { homepage = "http://hub.darcs.net/thielema/hackage-processing"; description = "Process 00-index.tar.gz from Hackage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-proxy" = callPackage @@ -87333,40 +92206,36 @@ self: { "hackage-repo-tool" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , hackage-security, network, network-uri, optparse-applicative, tar - , time, unix, zlib + , hackage-security, network, network-uri, old-time + , optparse-applicative, tar, time, unix, zlib }: mkDerivation { pname = "hackage-repo-tool"; - version = "0.1.1"; - sha256 = "1x34f28wqa1v935d90fzhra2d1c5kj6nrp79iyp53kj2kmqw5xi3"; - revision = "2"; - editedCabalFile = "04mlgliz33sb9dwzayd858b42pa30a7wpcd9jgmk1kc59dlv1y38"; + version = "0.1.1.1"; + sha256 = "05r4i7zhwbsv9ci4yid57fnb5lkx254pch9arq5a11dvwsvdzvzw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal directory filepath hackage-security network - network-uri optparse-applicative tar time unix zlib + network-uri old-time optparse-applicative tar time unix zlib ]; - homepage = "https://github.com/well-typed/hackage-security"; + homepage = "https://github.com/haskell/hackage-security"; description = "Utility to manage secure file-based package repositories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-security" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, HUnit, mtl, network, network-uri - , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, time, transformers - , zlib + , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec + , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, time, transformers, zlib }: mkDerivation { pname = "hackage-security"; - version = "0.5.2.2"; - sha256 = "0h9wag599x9ysdrgwa643phmpb1xiiwhyh2dix67fji6a5w86yjh"; - revision = "4"; - editedCabalFile = "154xjzmzg14zcqxzhcf0kmdmm6hwnhx19x6kddakkrylfqap14j2"; + version = "0.5.3.0"; + sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -87374,10 +92243,10 @@ self: { transformers zlib ]; testHaskellDepends = [ - base bytestring Cabal containers HUnit network-uri QuickCheck tar - tasty tasty-hunit tasty-quickcheck temporary time zlib + base bytestring Cabal containers network-uri QuickCheck tar tasty + tasty-hunit tasty-quickcheck temporary time zlib ]; - homepage = "https://github.com/well-typed/hackage-security"; + homepage = "https://github.com/haskell/hackage-security"; description = "Hackage security library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -87401,8 +92270,8 @@ self: { }) {}; "hackage-server" = callPackage - ({ mkDerivation, acid-state, aeson, alex, array, async, attoparsec - , base, base16-bytestring, base64-bytestring, binary, blaze-builder + ({ mkDerivation, acid-state, aeson, alex, array, async, base + , base16-bytestring, base64-bytestring, binary, blaze-builder , bytestring, Cabal, cereal, containers, crypto-api, csv, deepseq , directory, filepath, happstack-server, happy, HaXml, hscolour , hslogger, HStringTemplate, HTTP, lifted-base, mime-mail, mtl @@ -87419,7 +92288,7 @@ self: { isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - acid-state aeson array async attoparsec base base16-bytestring + acid-state aeson array async base base16-bytestring base64-bytestring binary blaze-builder bytestring Cabal cereal containers crypto-api csv deepseq directory filepath happstack-server HaXml hscolour hslogger HStringTemplate HTTP @@ -87456,7 +92325,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/hackage-sparks"; description = "Generate sparkline graphs of hackage statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-whatsnew" = callPackage @@ -87465,8 +92333,8 @@ self: { }: mkDerivation { pname = "hackage-whatsnew"; - version = "0.1.0.1"; - sha256 = "0bg0l6y6v0nrjz3ywfjx5jknhn9898q2h04m8q3iz1j5y6pzj80d"; + version = "0.1.0.2"; + sha256 = "0z57nnp0sn15399b11h7kb5dxqmg1gd3l8qv7vw8knxv65yfgra3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87476,7 +92344,6 @@ self: { homepage = "https://github.com/stepcut/hackage-whatsnew"; description = "Check for differences between working directory and hackage"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage2hwn" = callPackage @@ -87525,42 +92392,18 @@ self: { homepage = "https://github.com/dterei/Hackager"; description = "Hackage testing tool"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "hackernews" = 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 = [ - 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_3_0_0" = callPackage + "hackernews" = 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.3.0.0"; - sha256 = "184hf3lwp275dyq5n2szr1mwp5zpa22x48wqddy9c3clxc7lv535"; + version = "1.4.0.0"; + sha256 = "0ilj91vjnsfdlzhjh35nqrr3c1z7p6qfabvk3xdz6iqzmpcq3ys8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87627,8 +92470,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.5.4"; - sha256 = "1gbn6bnlhaafycyfsfh5j4rbkd56nc65qny34ii9clr34d2cwkaq"; + version = "0.5.5"; + sha256 = "0chvf2wvpvbnzf8980sdg9s61c4p100ps7ava85hlr281sng5d60"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87640,9 +92483,9 @@ self: { transformers unix xml zlib ]; testHaskellDepends = [ - base binary bytestring containers deepseq directory - extensible-exceptions filepath HUnit pretty process split time unix - xml + array base binary bytestring containers deepseq directory + extensible-exceptions filepath HUnit parsec pretty process split + time unix xml ]; description = "Hackage and Portage integration tool"; license = "GPL"; @@ -87699,12 +92542,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock" = callPackage + "haddock_2_17_5" = callPackage ({ mkDerivation, base, filepath, haddock-api, hspec }: mkDerivation { pname = "haddock"; - version = "2.17.4"; - sha256 = "1z3h3v7w84dzsm47iavdppc2w899mr4c1agq9fzghgz902i0a655"; + version = "2.17.5"; + sha256 = "1qxy6yxpxgpqpwcs76ydpal45cz4a3hyq3rq07cwma1cs4p034ql"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -87714,14 +92557,15 @@ self: { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock_2_18_1" = callPackage + "haddock" = callPackage ({ mkDerivation, base, filepath, haddock-api, hspec }: mkDerivation { pname = "haddock"; - version = "2.18.1"; - sha256 = "1gg1nl38f2h93xci4pa4zgb5wvcpwv0mab0balmzzgnd4amk3jgv"; + version = "2.19.0.1"; + sha256 = "1g1j9j0hf2yhyyh0gwz6bzbvfvliqz9x8a8hnkmwghm7w3xa6sb7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -87774,7 +92618,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-api" = callPackage + "haddock-api_2_17_4" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths , haddock-library, hspec, QuickCheck, transformers, xhtml @@ -87794,25 +92638,30 @@ self: { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-api_2_18_1" = callPackage + "haddock-api" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths - , haddock-library, hspec, QuickCheck, transformers, xhtml + , haddock-library, hspec, hspec-discover, QuickCheck, transformers + , xhtml }: mkDerivation { pname = "haddock-api"; - version = "2.18.1"; - sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8"; - revision = "1"; - editedCabalFile = "0ncxba7bppgap3vaxv07cyq2q4wsb860xv83znj4dgksvr64xl7y"; + version = "2.19.0.1"; + sha256 = "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-boot ghc-paths haddock-library transformers xhtml ]; - testHaskellDepends = [ base containers ghc hspec QuickCheck ]; + testHaskellDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc ghc-boot ghc-paths haddock-library hspec QuickCheck + transformers xhtml + ]; + testToolDepends = [ hspec-discover ]; homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; @@ -87857,7 +92706,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-library" = callPackage + "haddock-library_1_4_3" = callPackage ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec , QuickCheck, transformers }: @@ -87872,23 +92721,66 @@ self: { homepage = "http://www.haskell.org/haddock/"; description = "Library exposing some functionality of Haddock"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-library_1_4_5" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, bytestring, deepseq - , hspec, QuickCheck, transformers + "haddock-library_1_4_4" = callPackage + ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec + , hspec-discover, QuickCheck, transformers + }: + mkDerivation { + pname = "haddock-library"; + version = "1.4.4"; + sha256 = "0dx5hawfanglhkj5nqq1dwr2j1v35p0syz30xvdk8gld8rif06p9"; + libraryHaskellDepends = [ base bytestring deepseq transformers ]; + testHaskellDepends = [ + base base-compat bytestring deepseq hspec QuickCheck transformers + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haddock-library" = callPackage + ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec + , hspec-discover, QuickCheck, transformers }: mkDerivation { pname = "haddock-library"; version = "1.4.5"; sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9"; + libraryHaskellDepends = [ base bytestring deepseq transformers ]; + testHaskellDepends = [ + base base-compat bytestring deepseq hspec QuickCheck transformers + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haddock-library_1_5_0_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, deepseq + , directory, filepath, hspec, hspec-discover, optparse-applicative + , QuickCheck, transformers, tree-diff + }: + mkDerivation { + pname = "haddock-library"; + version = "1.5.0.1"; + sha256 = "1cmbg8l5xrwpliclwy3l057raypjqy0hsg1h1743ahaj8gq10b7z"; libraryHaskellDepends = [ - attoparsec base bytestring transformers + base bytestring containers deepseq transformers ]; testHaskellDepends = [ - attoparsec base base-compat bytestring deepseq hspec QuickCheck - transformers + base base-compat bytestring containers deepseq directory filepath + hspec optparse-applicative QuickCheck transformers tree-diff ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; homepage = "http://www.haskell.org/haddock/"; description = "Library exposing some functionality of Haddock"; license = stdenv.lib.licenses.bsd3; @@ -87909,6 +92801,7 @@ self: { homepage = "http://www.haskell.org/haddock/"; description = "Test utilities for Haddock"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haddocset" = callPackage @@ -87934,6 +92827,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hadolint" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, dlist + , filepath, gitrev, hspec, HUnit, language-docker + , optparse-applicative, parsec, ShellCheck, split, text, yaml + }: + mkDerivation { + pname = "hadolint"; + version = "1.6.2"; + sha256 = "0nkq1qlhpd6gmrj75vik51a4fndn6sy3vwx2nk91vmdd7ml2f0v8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring dlist language-docker parsec ShellCheck split + text + ]; + executableHaskellDepends = [ + base directory filepath gitrev language-docker optparse-applicative + parsec yaml + ]; + testHaskellDepends = [ + aeson base bytestring hspec HUnit language-docker parsec ShellCheck + split + ]; + homepage = "https://github.com/hadolint/hadolint"; + description = "Dockerfile Linter JavaScript API"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hadoop-formats" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, snappy , text, vector @@ -87972,7 +92894,6 @@ self: { homepage = "http://github.com/jystic/hadoop-rpc"; description = "Use the Hadoop RPC interface from Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hadoop-tools" = callPackage @@ -88123,6 +93044,7 @@ self: { homepage = "https://github.com/TaktInc/hail"; description = "A service for pull-based continuous deployment based on hydra"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hailgun" = callPackage @@ -88215,6 +93137,7 @@ self: { ]; description = "Multi-app web platform framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {quickcheck-lio-instances = null;}; @@ -88339,6 +93262,7 @@ self: { executableHaskellDepends = [ base ]; description = "Minimal akka-inspired actor library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hako" = callPackage @@ -88361,40 +93285,34 @@ self: { "hakyll" = 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 + , file-embed, filepath, fsnotify, http-conduit, http-types + , lrucache, mtl, network-uri, optparse-applicative, pandoc + , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, 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"; + version = "4.12.1.0"; + sha256 = "0hw6j6kq7g9sg03ihw0q1f4d96kkr6dnfg7f2bj4skpwfsslb2cg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = 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 + cryptohash data-default deepseq directory file-embed filepath + fsnotify http-conduit http-types lrucache mtl 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 + regex-tdfa resourcet scientific 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 + base bytestring containers filepath QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers yaml ]; testToolDepends = [ utillinux ]; homepage = "http://jaspervdj.be/hakyll"; @@ -88555,6 +93473,23 @@ self: { homepage = "http://github.com/Minoru/hakyll-convert"; description = "Convert from other blog engines to Hakyll"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hakyll-dir-list" = callPackage + ({ mkDerivation, base, containers, data-default, filepath, hakyll + }: + mkDerivation { + pname = "hakyll-dir-list"; + version = "1.0.0.2"; + sha256 = "0irkfnwbzhchvjsfzndb6i3w76gnwik9fq3fhi3qg3jc7l0cgi76"; + libraryHaskellDepends = [ + base containers data-default filepath hakyll + ]; + homepage = "http://github.com/freylax/hakyll-dir-list"; + description = "Allow Hakyll to create hierarchical menues from directories"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-elm" = callPackage @@ -88600,14 +93535,15 @@ self: { homepage = "https://gitlab.com/aergus/hakyll-filestore"; description = "FileStore utilities for Hakyll"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-ogmarkup" = callPackage ({ mkDerivation, base, hakyll, ogmarkup }: mkDerivation { pname = "hakyll-ogmarkup"; - version = "3.0"; - sha256 = "088hcjy34xxyaphy8c7kj82w88pwzdaww1xww791hjrq0r75icf7"; + version = "4.0"; + sha256 = "1w8wmqdfxf9w4mb9k77gak9iqxysa7mbb5phfh9a0hy30vx2qb1d"; libraryHaskellDepends = [ base hakyll ogmarkup ]; homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme"; description = "Integrate ogmarkup document with Hakyll"; @@ -88890,6 +93826,7 @@ self: { homepage = "http://halvm.org"; description = "A simple, static HaLVM web server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {HALVMCore = null; XenDevice = null;}; @@ -88902,7 +93839,6 @@ self: { libraryHaskellDepends = [ base HCodecs newtype ]; description = "Binding to the OS level Midi services (fork of system-midi)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hamilton" = callPackage @@ -88912,10 +93848,8 @@ self: { }: mkDerivation { pname = "hamilton"; - version = "0.1.0.0"; - sha256 = "1mwqrwxvrdbkigdkrq0fl5djd3pvp8g7g27qzsdsazrf4z9m71ic"; - revision = "2"; - editedCabalFile = "17d4qaib8539pyzagq8vrqyc8g3a1g0jgw67jpzjyjs7v2f0kagh"; + version = "0.1.0.2"; + sha256 = "1fhwvimqim9jj33wps42wsbwjz28h3waqn7wrwhqci307xbcib0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88931,26 +93865,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hamilton_0_1_0_1" = callPackage - ({ mkDerivation, ad, ansi-wl-pprint, base, comonad, containers - , free, hmatrix, hmatrix-gsl, optparse-applicative - , typelits-witnesses, vector, vector-sized, vty + "hamilton_0_1_0_3" = callPackage + ({ mkDerivation, ad, ansi-wl-pprint, base, containers + , finite-typelits, ghc-typelits-knownnat, hmatrix, hmatrix-gsl + , hmatrix-vector-sized, optparse-applicative, typelits-witnesses + , vector, vector-sized, vty }: mkDerivation { pname = "hamilton"; - version = "0.1.0.1"; - sha256 = "12wp6z2dhcpyijvf1bqcx1bamw19crm23wvzgbpbjw3azyi72sn3"; + version = "0.1.0.3"; + sha256 = "06yvmm9641v74kd265csycwp6ywyc19mx0r0csycljcfghhj6xiw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ad base comonad free hmatrix hmatrix-gsl typelits-witnesses + ad base hmatrix hmatrix-gsl hmatrix-vector-sized typelits-witnesses vector-sized ]; executableHaskellDepends = [ - ansi-wl-pprint base containers hmatrix optparse-applicative vector + ansi-wl-pprint base containers finite-typelits + ghc-typelits-knownnat hmatrix optparse-applicative vector vector-sized vty ]; - homepage = "https://github.com/mstksg/hamilton"; + homepage = "https://github.com/mstksg/hamilton#readme"; description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -89031,23 +93967,24 @@ self: { "hamtsolo" = callPackage ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary , bytestring, conduit, conduit-combinators, conduit-extra - , exceptions, optparse-applicative, resourcet, stm-conduit, unix - , word8 + , exceptions, gitrev, optparse-applicative, resourcet, stm-conduit + , unix }: mkDerivation { pname = "hamtsolo"; - version = "1.0.0"; - sha256 = "0lpac24fayd9s40b39l46aak9d51vv3bjslg0drgj2xlp1d9w60y"; + version = "1.0.3"; + sha256 = "0dbhpdfmbs6ydin2p75wqia9lcrw82gfv3kx8659gnw2ll3dmpnh"; 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 + conduit-combinators conduit-extra exceptions gitrev + optparse-applicative resourcet stm-conduit unix ]; homepage = "https://github.com/tfc/hamtsolo#readme"; description = "Intel AMT serial-over-lan (SOL) client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hamusic" = callPackage @@ -89291,6 +94228,7 @@ self: { homepage = "https://github.com/tolysz/hans-pfq"; description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {pfq = null;}; @@ -89314,22 +94252,23 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath, hspec - , mtl, optparse-applicative, path, path-io, process, stm, temporary - , time, transformers, yaml + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, stm, temporary, time, transformers, yaml }: mkDerivation { pname = "hapistrano"; - version = "0.3.3.0"; - sha256 = "1skpygsnzl940703fxd103lxhyi4cjpp5il9kwjqfavsnbfi0c46"; + version = "0.3.5.4"; + sha256 = "02cc7bgld3cl36wq4n1c0n6gf2kbz0klj6ssfgjmjwvxvl064cg5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base filepath mtl path process time transformers + base filepath formatting gitrev mtl path process time transformers ]; executableHaskellDepends = [ - aeson async base optparse-applicative path path-io stm yaml + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml ]; testHaskellDepends = [ base directory filepath hspec mtl path path-io process temporary @@ -89359,7 +94298,7 @@ self: { }) {inherit (pkgs) libappindicator-gtk2;}; "happindicator3" = callPackage - ({ mkDerivation, base, glib, gtk3, libappindicator-gtk3, text }: + ({ mkDerivation, base, glib, gtk3, libappindicator-gtk3 }: mkDerivation { pname = "happindicator3"; version = "0.2.1"; @@ -89368,7 +94307,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base glib gtk3 ]; libraryPkgconfigDepends = [ libappindicator-gtk3 ]; - executableHaskellDepends = [ base gtk3 text ]; homepage = "https://github.com/mlacorte/happindicator3"; description = "Binding to the appindicator library"; license = stdenv.lib.licenses.lgpl21; @@ -89494,8 +94432,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.3.4.8"; - sha256 = "006prds4bgqmj54j0syyf1y1yyqwfcj2a6mdxpcjj6qj3g3976l1"; + version = "2.3.4.11"; + sha256 = "1df9yybqzljfilpqgrz8qpa6iy5lfa3f3vmz0ip8qpvzgcxyhpd7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -89509,7 +94447,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-clientsession" = callPackage @@ -89527,12 +94464,13 @@ self: { homepage = "http://happstack.com"; description = "client-side session data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-contrib" = callPackage ({ mkDerivation, base, bytestring, directory, happstack-data , happstack-ixset, happstack-server, happstack-state - , happstack-util, HTTP, HUnit, mtl, network, old-time, syb, unix + , happstack-util, HTTP, mtl, network, old-time, syb, unix }: mkDerivation { pname = "happstack-contrib"; @@ -89545,7 +94483,6 @@ self: { happstack-server happstack-state happstack-util HTTP mtl network old-time syb unix ]; - executableHaskellDepends = [ HUnit ]; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -89599,8 +94536,8 @@ self: { , filepath, happstack, happstack-data, happstack-hsp , happstack-ixset, happstack-server, happstack-state , happstack-util, harp, hsp, hsx, html, HTTP, json, mtl, network - , old-time, random, RJson, syb, text, time, trhsx, utf8-string - , web-routes, web-routes-mtl + , old-time, random, RJson, syb, text, time, utf8-string, web-routes + , web-routes-mtl }: mkDerivation { pname = "happstack-facebook"; @@ -89615,7 +94552,6 @@ self: { network old-time random RJson syb text time utf8-string web-routes web-routes-mtl ]; - executableToolDepends = [ trhsx ]; homepage = "http://src.seereason.com/happstack-facebook/"; description = "A package for building Facebook applications using Happstack"; license = stdenv.lib.licenses.bsd3; @@ -89636,6 +94572,7 @@ self: { ]; description = "Happstack extension for use with FastCGI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-fay" = callPackage @@ -89830,6 +94767,7 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack minus the useless stuff"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-monad-peel" = callPackage @@ -89869,22 +94807,22 @@ self: { ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network - , network-uri, old-locale, parsec, process, sendfile, syb - , system-filepath, template-haskell, text, threads, time + , network-uri, old-locale, parsec, process, semigroups, sendfile + , syb, system-filepath, template-haskell, text, threads, time , time-compat, transformers, transformers-base, transformers-compat , unix, utf8-string, xhtml, zlib }: mkDerivation { pname = "happstack-server"; - version = "7.4.6.4"; - sha256 = "1fd19qxpdj7iz4rjjwgi527naiw32l09gazr39skgzzf7m8ckiml"; + version = "7.5.1"; + sha256 = "18cfkwffwfz410x9wjbciynbqs9srpzg60rappzx778lb33px1rj"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html monad-control mtl network network-uri old-locale parsec process - sendfile syb system-filepath template-haskell text threads time - time-compat transformers transformers-base transformers-compat unix - utf8-string xhtml zlib + semigroups sendfile syb system-filepath template-haskell text + threads time time-compat transformers transformers-base + transformers-compat unix utf8-string xhtml zlib ]; testHaskellDepends = [ base bytestring containers HUnit parsec zlib @@ -89894,36 +94832,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "happstack-server_7_5_0_1" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring - , containers, directory, exceptions, extensible-exceptions - , filepath, hslogger, html, HUnit, monad-control, mtl, network - , network-uri, old-locale, parsec, process, sendfile, syb - , system-filepath, template-haskell, text, threads, time - , time-compat, transformers, transformers-base, transformers-compat - , unix, utf8-string, xhtml, zlib - }: - mkDerivation { - pname = "happstack-server"; - version = "7.5.0.1"; - sha256 = "05cb20rj4qys7r5kkbvjnm4bknfzwanf4r4yk1jq7a71x2sgcxc0"; - libraryHaskellDepends = [ - base base64-bytestring blaze-html bytestring containers directory - exceptions extensible-exceptions filepath hslogger html - monad-control mtl network network-uri old-locale parsec process - sendfile syb system-filepath template-haskell text threads time - time-compat transformers transformers-base transformers-compat unix - utf8-string xhtml zlib - ]; - testHaskellDepends = [ - base bytestring containers HUnit parsec zlib - ]; - homepage = "http://happstack.com"; - description = "Web related tools and services"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "happstack-server-tls" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile @@ -89931,8 +94839,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.1.6.4"; - sha256 = "1wn0yv4x619sl70fy3ffby78lfjiq9d73d4rsp3mkgr6d3kn45wj"; + version = "7.1.6.5"; + sha256 = "0hp13wxaghs6ldqpbpyf8agph7b1y488fc516z1n6bvbpzcbhbvq"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -89997,6 +94905,7 @@ self: { homepage = "https://github.com/scrive/happstack-static-routing"; description = "Support for static URL routing with overlap detection for Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-util" = callPackage @@ -90072,8 +94981,10 @@ self: { }: mkDerivation { pname = "happy"; - version = "1.19.8"; - sha256 = "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd"; + version = "1.19.9"; + sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"; + revision = "2"; + editedCabalFile = "1zxi8zfwiwxidrhr0yj5srpzp32z66sld9xv0k4yz7046rkl3577"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -90092,6 +95003,8 @@ self: { pname = "happy-meta"; version = "0.2.0.9"; sha256 = "1w3bmwnsg9714kyqxzfrbw0az4i2dqprn2hms3kbdq5984yhi9bg"; + revision = "1"; + editedCabalFile = "1mq8gdq11bqgii498as0078pf8s1mnawh4rvys6hjnd77iaf9nfk"; libraryHaskellDepends = [ array base containers haskell-src-meta mtl template-haskell ]; @@ -90186,6 +95099,30 @@ self: { homepage = "https://github.com/crufter/haquery"; description = "jQuery for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haquil" = callPackage + ({ mkDerivation, base, bv, data-binary-ieee754, data-default + , hTensor, MonadRandom, QuickCheck, random, template-haskell + , vector + }: + mkDerivation { + pname = "haquil"; + version = "0.2.1.14"; + sha256 = "1k15vvhs075b20shiz4fc7h93axk4i1smzzkkbiz7s78r0bqndr8"; + libraryHaskellDepends = [ + base bv data-binary-ieee754 data-default hTensor MonadRandom random + vector + ]; + testHaskellDepends = [ + base bv data-binary-ieee754 data-default hTensor MonadRandom + QuickCheck random template-haskell vector + ]; + homepage = "https://bitbucket.org/functionally/haquil"; + description = "A Haskell implementation of the Quil instruction set for quantum computing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "har" = callPackage @@ -90230,8 +95167,8 @@ self: { }: mkDerivation { pname = "hardware-edsl"; - version = "0.1.2"; - sha256 = "0vf82qkh0wvdi0d3lvnp8wks09a4ngr57l2kd122f2284a868xfx"; + version = "0.1.5"; + sha256 = "112sw9z89s27fi2jmg3a61gsm3far5vd21f1vi9cx2awgfzpi3iw"; libraryHaskellDepends = [ array base bytestring constraints containers deepseq language-vhdl mtl operational-alacarte pretty syntactic @@ -90328,8 +95265,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "harp"; - version = "0.4.3"; - sha256 = "17d9isgwdvrmycbj3ddmmn0810kh4m8b8lmaz4qc8i51i5li8ja7"; + version = "0.4.3.1"; + sha256 = "0g4ig5s5rawlbq7zj1hkydnkw2s1gn7x0sdimd6j6kr5bynrdnhk"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/seereason/harp"; description = "HaRP allows pattern-matching with regular expressions"; @@ -90412,6 +95349,8 @@ self: { pname = "hasbolt"; version = "0.1.3.0"; sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx"; + revision = "1"; + editedCabalFile = "0420drijspw73092rh3mhyrz4i7pph1fz3m0hcshs1zmngqibvv2"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default hex network text transformers @@ -90421,6 +95360,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasbolt-extras" = callPackage + ({ mkDerivation, base, containers, hasbolt, lens + , neat-interpolation, template-haskell, text, th-lift-instances + }: + mkDerivation { + pname = "hasbolt-extras"; + version = "0.0.0.4"; + sha256 = "0dclanbd07knph3bxn5a3kyl9qkqcwhy00y5jnah9sxk4qqhjkk5"; + libraryHaskellDepends = [ + base containers hasbolt lens neat-interpolation template-haskell + text th-lift-instances + ]; + homepage = "https://github.com/biocad/hasbolt-extras#readme"; + description = "Extras for hasbolt library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hascal" = callPackage ({ mkDerivation, base, data-default, split }: mkDerivation { @@ -90444,8 +95400,8 @@ self: { }: mkDerivation { pname = "hascar"; - version = "0.2.1.2"; - sha256 = "1x04yddy74vj7sxwsmq411z4s02n5asb17vc5290ha7s257fr81j"; + version = "0.2.2.1"; + sha256 = "1vz24mi0l9fjj2isgzrh4zjjk9srlcshrc3cwz0kz4fcbv44r9nz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90453,8 +95409,8 @@ self: { text time ]; executableHaskellDepends = [ - ansi-wl-pprint base binary bytestring directory filepath gitrev - optparse-applicative path text transformers unix + ansi-wl-pprint base binary bytestring conduit directory exceptions + filepath gitrev optparse-applicative path text transformers unix ]; testHaskellDepends = [ base bytestring conduit cryptohash hex path @@ -90462,7 +95418,6 @@ self: { homepage = "https://github.com/VirtualForgeGmbH/hascar"; description = "Decompress SAPCAR archives"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascas" = callPackage @@ -90610,10 +95565,8 @@ self: { }: mkDerivation { pname = "hashable"; - version = "1.2.6.1"; - sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll"; - revision = "2"; - editedCabalFile = "0w4756sa04nk2bw3vnysb0y9d09zzg3c77aydkjfxz1hnl1dvnjn"; + version = "1.2.7.0"; + sha256 = "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90712,6 +95665,7 @@ self: { homepage = "https://github.com/jberryman/hashabler"; description = "Principled, portable & extensible hashing of data and types, including an implementation of the FNV-1a and SipHash algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashed-storage" = callPackage @@ -90750,10 +95704,8 @@ self: { ({ mkDerivation, base, bytestring, containers, split }: mkDerivation { pname = "hashids"; - version = "1.0.2.3"; - sha256 = "0d15h8q4llq7x82g3r3pnyj1lw3ryj5q4nvi2i152agpx0sl5mzc"; - revision = "2"; - editedCabalFile = "1l4zz47c0kcpwi7l4dsizddi2c1a6k3v6a0b6w4wjylvzd066fz0"; + version = "1.0.2.4"; + sha256 = "1kzkyni9hfwpvyq9rdv62iziwiax5avzd05ghsh7dgnylv41z697"; libraryHaskellDepends = [ base bytestring containers split ]; testHaskellDepends = [ base bytestring containers split ]; homepage = "http://hashids.org/"; @@ -90789,14 +95741,31 @@ self: { ({ mkDerivation, base, containers, deepseq, hashable }: mkDerivation { pname = "hashmap"; - version = "1.3.2"; - sha256 = "15jppbxwqkwccdif789c7gvlfypyd98gnv1p5dh2kx977r19sh01"; + version = "1.3.3"; + sha256 = "0ma7svf9nanlfbj9nkk6bzk4m98i7xd71xrdc3a5dmmws5yba1nw"; libraryHaskellDepends = [ base containers deepseq hashable ]; homepage = "https://github.com/foxik/hashmap"; description = "Persistent containers Map and Set based on hashing"; license = stdenv.lib.licenses.bsd3; }) {}; + "hashrename" = callPackage + ({ mkDerivation, base, bytestring, cryptohash, directory, filepath + }: + mkDerivation { + pname = "hashrename"; + version = "0.1.1.0"; + sha256 = "19w35cdwxzmyw65l4zwhj67w5s741ayca7dm250wz6w2xlc37f5v"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cryptohash directory filepath + ]; + homepage = "https://gist.github.com/rnhmjoj/20ea1b366d45b1c4c0e8"; + description = "Rename every file in a directory with his SHA1 hash"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hashring" = callPackage ({ mkDerivation, base, containers, hashable, QuickCheck , test-framework, test-framework-quickcheck2 @@ -90838,8 +95807,8 @@ self: { ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { pname = "hashtables"; - version = "1.2.2.1"; - sha256 = "1g7nvj4cmscv1jjhms1pxb2gj4rflg2pcj3pb2z7x9fck8557bbs"; + version = "1.2.3.0"; + sha256 = "19bkpx43f3b5mya4jkygiafw402hvazawp6qr69h3wqkc6xv8mpr"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -91092,20 +96061,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_4_0" = callPackage + "haskeline_0_7_4_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , process, terminfo, transformers, unix + , process, stm, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.4.0"; - sha256 = "0y1rspmgmgfvx91zkwwgfnfwvdp7q4zxcfl2hq81fcqpi5bgbmcs"; + version = "0.7.4.2"; + sha256 = "1sxhdhy9asinxn0gvd4zandbk6xkb04vy1y7lmh66f9jv66fqhsm"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ - base bytestring containers directory filepath process terminfo + base bytestring containers directory filepath process stm terminfo transformers unix ]; - homepage = "http://trac.haskell.org/haskeline"; + homepage = "https://github.com/judah/haskeline"; description = "A command-line interface for user input, written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -91147,6 +96116,7 @@ self: { homepage = "http://github.com/githubuser/haskelisp#readme"; description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-abci" = callPackage @@ -91333,6 +96303,7 @@ self: { homepage = "https://github.com/mgajda/haskell-conll#readme"; description = "Core Types for NLP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-course-preludes" = callPackage @@ -91347,6 +96318,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-dap" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , directory, filepath, ghc, ghc-boot, ghc-paths, ghci, haskeline + , process, text, time, transformers, unix + }: + mkDerivation { + pname = "haskell-dap"; + version = "0.0.3.0"; + sha256 = "0l09s90mfwnyc3nz3xpgja6dh99qm2yvim4r0fxyvh0adfzkmiwn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ + array base bytestring containers deepseq directory filepath ghc + ghc-boot ghc-paths ghci haskeline process text time transformers + unix + ]; + homepage = "https://github.com/phoityne/haskell-dap"; + description = "haskell-dap is a GHCi having DAP interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-disque" = callPackage ({ mkDerivation, base, bytestring, hedis, string-conversions , transformers @@ -91372,8 +96366,8 @@ self: { }: mkDerivation { pname = "haskell-docs"; - version = "4.2.7"; - sha256 = "1mb32kxn7p7xsvs3l32bj0igrmc1563ay9v40da2fmxnx3v1aap8"; + version = "4.2.8"; + sha256 = "00a93rva9mpg0wf3fj0h9l4ljz566vx1dv9hh4xhc5n1zqijycpz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91386,6 +96380,7 @@ self: { homepage = "http://github.com/ivan-m/haskell-docs"; description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-eigen-util" = callPackage @@ -91399,7 +96394,6 @@ self: { homepage = "https://github.com/dilawar/haskell-eigen-util#README.md"; description = "Some utility functions for haskell-eigen library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-exp-parser" = callPackage @@ -91533,8 +96527,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.20.3"; - sha256 = "0429dz3dn9l9nbrx8cd18j3f34cp6cc8zxb34jsvfpvdmafjin8q"; + version = "0.21.0"; + sha256 = "109jgixxrb9xjlkqnwkch9zgb2rj79knd8ivgfi1cc4v30299vwi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91550,36 +96544,53 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; + inherit (pkgs.gnome3) gobjectIntrospection;}; - "haskell-gi-base" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: + "haskell-gi_0_21_1" = 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-base"; - version = "0.20.4"; - sha256 = "00kpn7rxg91im26109q1m3g6hyp8v46v50j3dddz002sj2zycifq"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - homepage = "https://github.com/haskell-gi/haskell-gi-base"; - description = "Foundation for libraries generated by haskell-gi"; + pname = "haskell-gi"; + version = "0.21.1"; + sha256 = "0nhsjw0cv29r6rbajz4lf1ca63lm1m0i57wcs8p6aw10kx246q1n"; + 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; - }) {inherit (pkgs) glib;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; + inherit (pkgs.gnome3) gobjectIntrospection;}; - "haskell-gi-base_0_20_5" = callPackage + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.20.5"; - sha256 = "1854v6z8ragc5bbv4jc1qwbn85pw7z9gsqd17qizps6zmpx3gm9a"; + version = "0.21.0"; + sha256 = "1vrz2vrmvsbahzsp1c06x4qmny5qhbrnz5ybzh5p8z1g3ji9z166"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; - "haskell-gi-overloading_0_0" = callPackage + "haskell-gi-overloading" = callPackage ({ mkDerivation }: mkDerivation { pname = "haskell-gi-overloading"; @@ -91589,10 +96600,9 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Overloading support for haskell-gi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-gi-overloading" = callPackage + "haskell-gi-overloading_1_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "haskell-gi-overloading"; @@ -91602,6 +96612,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Overloading support for haskell-gi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-go-checkers" = callPackage @@ -91616,6 +96627,7 @@ self: { 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 @@ -91637,6 +96649,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "haskell-holes-th" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "haskell-holes-th"; + version = "1.0.0.0"; + sha256 = "13xyxck9f15mwi641zs9zw77cnrgh30p2771f66haby96k8wx9jf"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "https://github.com/8084/haskell-holes-th"; + description = "Infer haskell code by given type"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-igraph" = callPackage ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs , colour, data-default-class, data-ordlist, hashable, hxt, igraph @@ -91729,20 +96754,18 @@ self: { "haskell-lsp" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, filepath, hashable, hslogger, hspec, lens, mtl, parsec - , stm, text, time, transformers, unordered-containers, vector - , yi-rope + , sorted-list, stm, text, time, transformers, unordered-containers + , vector, yi-rope }: mkDerivation { pname = "haskell-lsp"; - version = "0.1.0.0"; - sha256 = "135f9xqzlvz01gwdqwxvdmxiwwqvka5j3iv13zczzzzn7vwfnbbd"; - revision = "1"; - editedCabalFile = "1xn4nlq0a48fcjngigmvwnadh94nxsvvi56wahghi83zgx28s0k1"; + version = "0.2.0.1"; + sha256 = "0xvgm1kkfz5yf1949f07phg5lic1zhwy5pdbgfnqdpaxrwscxm8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers data-default directory filepath - hashable hslogger lens mtl parsec stm text time + hashable hslogger lens mtl parsec sorted-list stm text time unordered-containers yi-rope ]; executableHaskellDepends = [ @@ -91751,12 +96774,33 @@ self: { unordered-containers vector yi-rope ]; testHaskellDepends = [ - aeson base containers directory hashable hspec lens text yi-rope + aeson base containers directory hashable hspec lens sorted-list + text yi-rope ]; homepage = "https://github.com/alanz/haskell-lsp"; description = "Haskell library for the Microsoft Language Server Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haskell-lsp-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , haskell-lsp, lens, process, text, unix + }: + mkDerivation { + pname = "haskell-lsp-client"; + version = "1.0.0.1"; + sha256 = "06zx80nhhf5fik84rijaxzjy9yv1c29g6hwfx73axlav80g176qw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers haskell-lsp lens process text + ]; + executableHaskellDepends = [ + base directory haskell-lsp lens process text unix + ]; + homepage = "https://github.com/noughtmare/haskell-lsp-client#readme"; + description = "A haskell package to build your own Language Server client"; + license = stdenv.lib.licenses.gpl2; }) {}; "haskell-menu" = callPackage @@ -91771,6 +96815,25 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "haskell-ml" = callPackage + ({ mkDerivation, attoparsec, base, binary, hmatrix, MonadRandom + , random-shuffle, singletons, text, vector + }: + mkDerivation { + pname = "haskell-ml"; + version = "0.4.2"; + sha256 = "0843akac5j1nhq6nknshblx33mg8b5h1lykpmgp627zzlbvzc3d3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base binary hmatrix MonadRandom singletons text vector + ]; + executableHaskellDepends = [ base hmatrix random-shuffle ]; + testHaskellDepends = [ base MonadRandom ]; + description = "Machine learning in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-modbus" = callPackage ({ mkDerivation, array, base, bytestring, cereal, hspec }: mkDerivation { @@ -91812,8 +96875,6 @@ self: { ]; librarySystemDepends = [ open-pal open-rte openmpi ]; libraryToolDepends = [ c2hs ]; - executableSystemDepends = [ open-pal open-rte openmpi ]; - executableToolDepends = [ c2hs ]; homepage = "http://github.com/bjpop/haskell-mpi"; description = "Distributed parallel programming in Haskell using MPI"; license = stdenv.lib.licenses.bsd3; @@ -91827,8 +96888,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.0"; - sha256 = "117nywdif86x11kmv5ibfqxn3bjaxb2flygvhp7d62kglqz2l85x"; + version = "0.9.1"; + sha256 = "1ybcdxz6y0l5qsq3vd0ii6m1ifysc2k8852lzw0nfs9i4q9pnwhh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath @@ -91894,22 +96955,23 @@ self: { }) {}; "haskell-packages" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers + ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl , optparse-applicative, tagged, transformers, transformers-compat }: mkDerivation { pname = "haskell-packages"; - version = "0.5"; - sha256 = "0b6hzz5ql6c9x7lxdldi50yw257cccp4d26jbdp51fi5chp2h7y6"; + version = "0.6.1"; + sha256 = "16lsk6djhy34k9clmaqsqrd4277dk7nva77djs91h0nl68zz3hhs"; libraryHaskellDepends = [ - aeson base bytestring Cabal containers deepseq directory filepath + base binary bytestring Cabal containers deepseq directory filepath haskell-src-exts hse-cpp mtl optparse-applicative tagged transformers transformers-compat ]; homepage = "http://documentup.com/haskell-suite/haskell-packages"; description = "Haskell suite library for package management and integration with Cabal"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-pdf-presenter" = callPackage @@ -92099,23 +97161,23 @@ self: { ({ mkDerivation, array, base, happy, pretty, syb }: mkDerivation { pname = "haskell-src"; - version = "1.0.2.0"; - sha256 = "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a"; + version = "1.0.3.0"; + sha256 = "1g4dj1f0j68bhn4ixfac63wjzy6gsp6kwgxryb1k5nl3i0g99d5l"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-exts" = callPackage + "haskell-src-exts_1_19_1" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , tasty, tasty-golden, tasty-smallcheck }: mkDerivation { pname = "haskell-src-exts"; - version = "1.18.2"; - sha256 = "0hq9f6r67gkhad4cc4dhahrwrz9kxfibhk8qrw5j0p7cvh23hn1i"; + version = "1.19.1"; + sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -92126,17 +97188,18 @@ self: { homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-src-exts_1_19_1" = callPackage + "haskell-src-exts" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , tasty, tasty-golden, tasty-smallcheck }: mkDerivation { pname = "haskell-src-exts"; - version = "1.19.1"; - sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh"; + version = "1.20.2"; + sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -92147,7 +97210,6 @@ self: { homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts-observe" = callPackage @@ -92197,12 +97259,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-src-exts-sc" = callPackage + ({ mkDerivation, base, haskell-src-exts }: + mkDerivation { + pname = "haskell-src-exts-sc"; + version = "0.1.0.6"; + sha256 = "1bfkwladavard87pnnr2nigs214hb3k4j3mki0ffd5zfxldb2ncv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base haskell-src-exts ]; + homepage = "https://github.com/achirkin/haskell-src-exts-sc#readme"; + description = "Pretty print haskell code with comments"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-src-exts-simple" = callPackage ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-simple"; - version = "1.19.0.0"; - sha256 = "01i4kaw9sbcygsj7s17xxw7cf8p11kq2msq9af5v32yhwxk93g21"; + version = "1.20.0.0"; + sha256 = "0p79ppmwb14lj2a1wy42zgm3z3zk5jbyn7rfgwxsyw2g424bw1dk"; 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"; @@ -92211,14 +97287,15 @@ self: { "haskell-src-exts-util" = callPackage ({ mkDerivation, base, containers, data-default, haskell-src-exts - , transformers, uniplate + , semigroups, transformers, uniplate }: mkDerivation { pname = "haskell-src-exts-util"; - version = "0.2.1.2"; - sha256 = "1a5y6fvzpjdi6az580rb1aq3gjxlcm6gn5dfd9mixyn5dv32aysv"; + version = "0.2.2"; + sha256 = "14rhwcrdz3kfb69c64qn8kybl7wnpajrjlfz5p95ca4bva4mwclg"; libraryHaskellDepends = [ - base containers data-default haskell-src-exts transformers uniplate + base containers data-default haskell-src-exts semigroups + transformers uniplate ]; homepage = "https://github.com/pepeiborra/haskell-src-exts-util"; description = "Helper functions for working with haskell-src-exts trees"; @@ -92232,8 +97309,10 @@ self: { }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.0.1"; - sha256 = "1i5f21mx061k50nl3pvvffjqsbvvldl50y8d4b9b31g63l0jg5q9"; + version = "0.8.0.2"; + sha256 = "12rc4v5dbbbcwdp7j8isvnm9vqpazv124j5kdfwlgwgwjhxi8ysb"; + revision = "1"; + editedCabalFile = "07xxp2r8amd420bzl7xlyfydhyrcrvaxq24ydnx7y2sz4v2nlzsz"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -92301,36 +97380,20 @@ self: { }) {}; "haskell-tools-ast" = callPackage - ({ mkDerivation, base, ghc, mtl, references, template-haskell - , uniplate - }: - mkDerivation { - pname = "haskell-tools-ast"; - version = "0.8.1.0"; - sha256 = "0ryny34zlbyy15m18f5539gaqwghbk1msz5ijv3x04n1c87vj7h4"; - 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; - }) {}; - - "haskell-tools-ast_0_9_0_0" = callPackage - ({ mkDerivation, base, ghc, mtl, references, template-haskell - , uniplate + ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references + , template-haskell, uniplate }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.9.0.0"; - sha256 = "1hhlp7bvn1q18jsfmi6pig26aggq6961p7lq7p140lk2jlvv9i1i"; + version = "1.0.1.1"; + sha256 = "0ckszqvl843g1gywhc7sj2s4wr58ng2cqyxi0kihdbfq7xmk943b"; libraryHaskellDepends = [ - base ghc mtl references template-haskell uniplate + base classyplate ghc mtl pretty 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-fromghc" = callPackage @@ -92394,26 +97457,8 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "0.8.1.0"; - sha256 = "1abbqgv43rbkwabnhm0p7i39sgiq952hg5xy7bc8g3jbnaallaaf"; - 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; - }) {}; - - "haskell-tools-backend-ghc_0_9_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.9.0.0"; - sha256 = "17v38npf016pm80wiynimdqw83v3y8f1hdjjl7lbkwyj7rgkpx6n"; + version = "1.0.1.1"; + sha256 = "05bn79ysb2bw42hid2ksqddqidimvqsx09nr771wf1ha7qapksmq"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -92421,40 +97466,42 @@ self: { 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 - , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl - , process, references, split, strict, tasty, tasty-hunit, time + "haskell-tools-builtin-refactorings" = callPackage + ({ mkDerivation, aeson, base, Cabal, classyplate, containers + , deepseq, directory, either, filepath, ghc, ghc-paths + , haskell-tools-ast, haskell-tools-backend-ghc + , haskell-tools-prettyprint, haskell-tools-refactor + , haskell-tools-rewrite, minisat-solver, mtl, references, split + , tasty, tasty-hunit, template-haskell, time, transformers + , uniplate }: mkDerivation { - pname = "haskell-tools-cli"; - version = "0.8.0.0"; - sha256 = "02f5fhb20wb49gchqx8mjc6khdlc3g6lfawxl3v0xr8fargyyiz5"; - isLibrary = true; - isExecutable = true; + pname = "haskell-tools-builtin-refactorings"; + version = "1.0.1.1"; + sha256 = "00yp1gvfvg3c2fa9ndnqphxbnsrshifida3247yafd7q9hhgd7q8"; libraryHaskellDepends = [ - base containers directory filepath ghc ghc-paths haskell-tools-ast - haskell-tools-prettyprint haskell-tools-refactor mtl references - split strict + aeson base Cabal classyplate containers deepseq directory filepath + ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite minisat-solver mtl references split + template-haskell transformers uniplate ]; - executableHaskellDepends = [ base directory process split ]; testHaskellDepends = [ - base bytestring directory filepath knob tasty tasty-hunit - ]; - benchmarkHaskellDepends = [ - aeson base bytestring criterion directory filepath knob split time + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl references split tasty tasty-hunit + template-haskell time transformers uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Command-line frontend for Haskell-tools Refact"; + description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-cli_0_9_0_0" = callPackage + "haskell-tools-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, Glob , haskell-tools-builtin-refactorings, haskell-tools-daemon @@ -92463,8 +97510,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "0.9.0.0"; - sha256 = "04ycy6hqnzqj9gc4vqf95flc3yh3swx201n2daggkmxayasiivqj"; + version = "1.0.1.2"; + sha256 = "03s7jhq7449z52h6vq9gbay3xdn66s8ma7snak0kk6nra41zrlpp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92473,8 +97520,8 @@ self: { haskell-tools-refactor mtl references split strict ]; executableHaskellDepends = [ - base directory filepath Glob haskell-tools-builtin-refactorings mtl - optparse-applicative process split + base directory filepath Glob haskell-tools-builtin-refactorings + haskell-tools-daemon mtl optparse-applicative process split ]; testHaskellDepends = [ base bytestring directory filepath @@ -92482,121 +97529,77 @@ self: { ]; benchmarkHaskellDepends = [ aeson base bytestring criterion directory filepath - haskell-tools-builtin-refactorings knob split time + haskell-tools-builtin-refactorings haskell-tools-daemon 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; - broken = true; - }) {haskell-tools-builtin-refactorings = null;}; + }) {}; "haskell-tools-daemon" = 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, aeson, base, bytestring, Cabal, containers + , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob + , haskell-tools-builtin-refactorings, haskell-tools-prettyprint + , haskell-tools-refactor, HUnit, mtl, network, optparse-applicative + , pretty, process, references, split, strict, tasty, tasty-hunit + , template-haskell }: mkDerivation { pname = "haskell-tools-daemon"; - version = "0.8.1.0"; - sha256 = "1h5xh235b68kfjq8hkrmr0zhj6csaslm7qwkaqs3ygxkkrq152ic"; + version = "1.0.1.1"; + sha256 = "0r48z9vkkgzgvlryfri6dzivf090pkjv52k517z9wvis3jxhqi7i"; 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 + aeson base bytestring Cabal containers deepseq Diff directory + filepath fswatch ghc ghc-paths haskell-tools-builtin-refactorings + haskell-tools-prettyprint haskell-tools-refactor mtl network + optparse-applicative pretty process references split strict + template-haskell + ]; + executableHaskellDepends = [ + base directory filepath haskell-tools-builtin-refactorings ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ - aeson base bytestring directory filepath ghc HUnit network process - tasty tasty-hunit + aeson base bytestring directory filepath ghc Glob + haskell-tools-builtin-refactorings 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"; + description = "Background process for Haskell-tools that editors can connect to"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-debug" = 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.1.0"; - sha256 = "1c6apmv2x4wrjh22nm7v151hy4r2sksrbcwin80dc8ya4zc3fqr6"; - 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; - }) {}; - - "haskell-tools-debug_0_9_0_0" = callPackage - ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings - , haskell-tools-prettyprint, haskell-tools-refactor, references - , split, template-haskell + ({ mkDerivation, base, classyplate, criterion, filepath, ghc + , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc + , haskell-tools-builtin-refactorings, haskell-tools-prettyprint + , haskell-tools-refactor, mtl, references, split, template-haskell + , uniplate }: mkDerivation { pname = "haskell-tools-debug"; - version = "0.9.0.0"; - sha256 = "0lbb8ip5y511v41i9xw9yi4nk2f0xmxv8ddcr0faxvy503miv613"; + version = "1.0.1.1"; + sha256 = "1ml4rbkcajgwssi1a0jgbbqnnci9f74w90zj9cxdxxkkck4fkypl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base filepath ghc ghc-paths haskell-tools-ast + base classyplate criterion filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc haskell-tools-builtin-refactorings - haskell-tools-prettyprint haskell-tools-refactor references split - template-haskell + haskell-tools-prettyprint haskell-tools-refactor mtl references + split template-haskell uniplate ]; 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; - broken = true; - }) {haskell-tools-builtin-refactorings = null;}; - - "haskell-tools-demo" = 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.1.0"; - sha256 = "011p9xdqgr93qxwvhcf8k2xr2ycgfjf0d60g8yfgjkgy9zx6fsma"; - 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; }) {}; - "haskell-tools-demo_0_9_0_0" = callPackage + "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings @@ -92606,8 +97609,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.9.0.0"; - sha256 = "1mb2ica5x5x66z68px9sfy0gndla1qmydlb9vcwvvc2wv8jmn8mr"; + version = "1.0.1.1"; + sha256 = "01fkl2xkq7v3mkm5dzfpfz53i2js68xhc3gvkc1lv8mg92zymfbb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92626,34 +97629,48 @@ self: { description = "A web-based demo for Haskell-tools Refactor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {haskell-tools-builtin-refactorings = null;}; + }) {}; - "haskell-tools-prettyprint" = callPackage - ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl - , references, split, text, uniplate + "haskell-tools-experimental-refactorings" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, haskell-tools-rewrite, mtl, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate }: mkDerivation { - pname = "haskell-tools-prettyprint"; - version = "0.8.1.0"; - sha256 = "1zcxg6drw3zfc93awmamhh8mqfyrp1pyrnk137yc0dz4293z9rdw"; + pname = "haskell-tools-experimental-refactorings"; + version = "1.0.1.1"; + sha256 = "0dyiixq7rdzjczzfv57b7f2859r4nmxrk68vq0flkazjqh9w08yb"; libraryHaskellDepends = [ - base containers ghc haskell-tools-ast mtl references split text - uniplate + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + 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-refactor + haskell-tools-rewrite mtl references split tasty tasty-hunit + template-haskell time transformers uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Pretty printing of Haskell-Tools AST"; + description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-prettyprint_0_9_0_0" = callPackage + "haskell-tools-prettyprint" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl , references, split, text, uniplate }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.9.0.0"; - sha256 = "15ym19dhn4lvv2szyp4bj7347bmbj43p76hj5fi1v2z20irjvmfi"; + version = "1.0.1.1"; + sha256 = "0j1ral0azwgxj550yf1jyyxprv0wb0cgd7sfk3dh52caqfwchi2p"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split text uniplate @@ -92661,11 +97678,10 @@ self: { 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 + ({ mkDerivation, aeson, 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 @@ -92674,10 +97690,10 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.8.1.0"; - sha256 = "04jx9qq04krk8wk7v5b6xv7gi8cd1sgzwraw916a11cgn0p52grr"; + version = "1.0.1.2"; + sha256 = "0fbfmbrskhmzqcsrv4aviaf6b4rn7i3zs2ckl3l4r1q7rslxw3fk"; libraryHaskellDepends = [ - base Cabal containers directory filepath ghc ghc-paths + aeson 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 @@ -92692,27 +97708,6 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-refactor_0_9_0_0" = callPackage - ({ mkDerivation, 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 - }: - mkDerivation { - pname = "haskell-tools-refactor"; - version = "0.9.0.0"; - sha256 = "0n9j8rlv613b0l5g3lihqp6rfkxxdm21f1m4fqygbi7fb3d6n7ss"; - 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 - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Refactoring Tool for Haskell"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -92723,30 +97718,8 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "0.8.1.0"; - sha256 = "1ckn103f5jg3yqpf2ki8n62a663hj5q2zyd5mzx6n4nlkr47bc57"; - 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; - }) {}; - - "haskell-tools-rewrite_0_9_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.9.0.0"; - sha256 = "1vdbnb7808v2wycrg7nz0zx6rb8mjb1d50i57g6irfwk3s46k31s"; + version = "1.0.1.1"; + sha256 = "11psrwb8hmxian29n9y9301mlkfhx3y2nb06ml9808yrzpbwg1m2"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -92758,7 +97731,6 @@ self: { 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-tor" = callPackage @@ -92842,14 +97814,14 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.2.10"; - sha256 = "0zcf8ajqkpfcdy25rlyp8c4jsnrfqxrfwbi7891cmclblg52qwg9"; + version = "1.3.1"; + sha256 = "0q2aix579mm3ksi0hipcmw8g2p5xfbgk6ph7jnraq5i2rxjchg7v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal containers directory filepath process ]; - homepage = "http://haskell.org/haskellwiki/Gentoo#haskell-updater"; + homepage = "https://haskell.org/haskellwiki/Gentoo#haskell-updater"; description = "Rebuild Haskell dependencies in Gentoo"; license = "GPL"; }) {}; @@ -93217,6 +98189,7 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HSQL Oracle driver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {hsql-oracle = null;}; @@ -93255,6 +98228,7 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HSQL SQLite driver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {hsql-sqlite = null;}; @@ -93380,16 +98354,16 @@ self: { }) {}; "haskelzinc" = callPackage - ({ mkDerivation, base, containers, filepath, parsec3, pretty - , process + ({ mkDerivation, base, containers, directory, filepath, parsec + , pretty, process }: mkDerivation { pname = "haskelzinc"; - version = "0.3.0.9"; - sha256 = "1vg5jxzn69y2pbpsw2qc6ida0p0v4dhgp68psn4rmpxxbjl7n10s"; + version = "0.3.1.1"; + sha256 = "0dz9sd2i6m4d2jj76zl6yfaynnzj8ihhfis6602cqh37ngxgkxqj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers filepath parsec3 pretty process + base containers directory filepath parsec pretty process ]; description = "CP in Haskell through MiniZinc"; license = stdenv.lib.licenses.bsd3; @@ -93405,8 +98379,8 @@ self: { }: mkDerivation { pname = "haskey"; - version = "0.2.0.0"; - sha256 = "1c0snqs740gqwfzlpyhr8zggaplmba6mzj8cnl8r47sgn006q95i"; + version = "0.3.0.1"; + sha256 = "1v5af0pd015d7ccdi0f2wc3gb60xy4j59kzngx6wh6dljkxrcga7"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions filepath focus haskey-btree list-t lz4 mtl semigroups stm stm-containers @@ -93421,6 +98395,7 @@ self: { homepage = "https://github.com/haskell-haskey"; description = "A transactional, ACID compliant, embeddable key-value store"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskey-btree" = callPackage @@ -93431,8 +98406,8 @@ self: { }: mkDerivation { pname = "haskey-btree"; - version = "0.2.0.0"; - sha256 = "00gp5fh64b26bqrchdrpdl8s46fdzglsqi07xf0cfrfcm867az23"; + version = "0.3.0.0"; + sha256 = "0nj6jhigzgjac45cg0qjbjamn152n7rvir5clkwj5yraisd7sf4h"; libraryHaskellDepends = [ base binary bytestring containers hashable mtl semigroups text transformers vector @@ -93453,8 +98428,8 @@ self: { }: mkDerivation { pname = "haskey-mtl"; - version = "0.2.0.0"; - sha256 = "1n3j4avydrr2w0sa0zjsc2jvmr9fmyxz5s54y6zam40a2cg2wc2l"; + version = "0.3.0.0"; + sha256 = "0jc2wa41gmx01ccb7svv91llncm47adb2g6winm513k23bvk8028"; libraryHaskellDepends = [ base exceptions haskey haskey-btree mtl transformers ]; @@ -93465,6 +98440,7 @@ self: { homepage = "https://github.com/haskell-haskey"; description = "A monad transformer supporting Haskey transactions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskgame" = callPackage @@ -93520,27 +98496,6 @@ self: { }) {}; "haskintex" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text - , transformers - }: - mkDerivation { - pname = "haskintex"; - version = "0.7.0.1"; - sha256 = "06z3vb34rgap99r90l00bncxvd02z59lq6phdy4bxq6ccjcz2ivn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers directory filepath - haskell-src-exts HaTeX hint parsec process text transformers - ]; - executableHaskellDepends = [ base ]; - homepage = "http://daniel-diaz.github.io/projects/haskintex"; - description = "Haskell Evaluation inside of LaTeX code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskintex_0_8_0_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text , transformers @@ -93559,7 +98514,6 @@ self: { homepage = "http://daniel-diaz.github.io/projects/haskintex"; description = "Haskell Evaluation inside of LaTeX code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskmon" = callPackage @@ -93940,7 +98894,6 @@ self: { base data-accessor event-list haskore non-negative numeric-prelude random synthesizer-core synthesizer-filter utility-ht ]; - executableHaskellDepends = [ base synthesizer-core utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Music rendering coded in Haskell"; license = "GPL"; @@ -93961,20 +98914,20 @@ self: { "hasktags" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json - , unix, utf8-string + , utf8-string }: mkDerivation { pname = "hasktags"; - version = "0.69.4"; - sha256 = "1s7phsg20h15p2dnri6viy5k6c4n42gchy684dv3r30qrwwvv0ni"; + version = "0.69.5"; + sha256 = "0jln0r3dzd7g17avxqgnyxzv4nmqlmqaw41vrysb838yql6g6ns8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory filepath json unix utf8-string + base bytestring directory filepath json utf8-string ]; - executableHaskellDepends = [ base directory filepath unix ]; + executableHaskellDepends = [ base directory filepath ]; testHaskellDepends = [ - base bytestring directory filepath HUnit json unix utf8-string + base bytestring directory filepath HUnit json utf8-string ]; homepage = "http://github.com/MarcWeber/hasktags"; description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; @@ -93999,6 +98952,7 @@ self: { homepage = "http://www.haskus.org/system"; description = "Haskus binary format manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-system-build" = callPackage @@ -94019,6 +98973,7 @@ self: { homepage = "http://www.haskus.org/system"; description = "Haskus system build tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-utils" = callPackage @@ -94028,8 +98983,8 @@ self: { }: mkDerivation { pname = "haskus-utils"; - version = "0.7.0.0"; - sha256 = "0s28m6bhc5a1q3z7r1pd9f1l0nhsk5lnsi8y9zqadyg8j4jcv9kx"; + version = "0.8.0.0"; + sha256 = "1r2r1198hhv75f4yqcy5crr764dvvj766bgp3v3b5sdl603q8cl3"; libraryHaskellDepends = [ base containers extra file-embed list-t mtl stm stm-containers template-haskell transformers vector @@ -94038,6 +98993,39 @@ self: { homepage = "http://www.haskus.org/system"; description = "Haskus utility modules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haskyapi" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, containers + , directory, http-conduit, markdown, mtl, network, parsec + , persistent, persistent-sqlite, persistent-template, split + , tagsoup, text, time, utf8-string + }: + mkDerivation { + pname = "haskyapi"; + version = "0.0.0.2"; + sha256 = "1s5krzzmrl8p97xg8p1dimijqmyjbrdfm4i0dpp7jiipj2hzvqyq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html bytestring containers directory http-conduit + markdown mtl network parsec persistent persistent-sqlite + persistent-template split tagsoup text time utf8-string + ]; + executableHaskellDepends = [ + aeson base blaze-html bytestring containers directory http-conduit + markdown mtl network parsec persistent persistent-sqlite + persistent-template split tagsoup text time utf8-string + ]; + testHaskellDepends = [ + aeson base blaze-html bytestring containers directory http-conduit + markdown mtl network parsec persistent persistent-sqlite + persistent-template split tagsoup text time utf8-string + ]; + homepage = "https://github.com/okue/haskyapi#readme"; + description = "HTTP server"; + license = stdenv.lib.licenses.mit; }) {}; "haslo" = callPackage @@ -94078,55 +99066,24 @@ self: { ({ 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.3.1"; - sha256 = "0hcrdyyhaj3s7mam8i0lbaljgs0xmdv5076jaxb3jhh459fl682c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers matrix mtl numbers parsers - text - ]; - executableHaskellDepends = [ - attoparsec base bytestring containers gitrev hopfli matrix mtl - numbers optparse-applicative parsers text - ]; - testHaskellDepends = [ - attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl - QuickCheck text - ]; - benchmarkHaskellDepends = [ base criterion directory text ]; - homepage = "https://github.com/contivero/hasmin#readme"; - description = "CSS Minifier"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hasmin_1_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , criterion, directory, doctest, doctest-discover, gitrev, hopfli - , hspec, hspec-attoparsec, matrix, mtl, numbers - , optparse-applicative, parsers, QuickCheck, text + , optparse-applicative, parsers, QuickCheck, quickcheck-instances + , text }: mkDerivation { pname = "hasmin"; - version = "1.0"; - sha256 = "1a512s1fd472agy2pv9qizp61jrz1jzdpxla3213y6wsahi9wdnm"; + version = "1.0.2"; + sha256 = "13cblc4jcn88w00rsb72dqhiy18mfph388407vm3k6kbg5zxg1d9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers matrix mtl numbers parsers - text + attoparsec base containers matrix mtl numbers parsers text ]; executableHaskellDepends = [ - attoparsec base bytestring containers gitrev hopfli matrix mtl - numbers optparse-applicative parsers text + base bytestring gitrev hopfli optparse-applicative text ]; testHaskellDepends = [ attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl - QuickCheck text + QuickCheck quickcheck-instances text ]; benchmarkHaskellDepends = [ base criterion directory text ]; homepage = "https://github.com/contivero/hasmin#readme"; @@ -94164,54 +99121,25 @@ self: { "hasql" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras - , criterion, data-default-class, dlist, either, hashable - , hashtables, loch-th, mtl, placeholders, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rebase, rerebase, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, transformers, vector - }: - mkDerivation { - pname = "hasql"; - version = "0.19.18.2"; - sha256 = "064866vgiwpp39g3drw0gralra4via77rcqxri8279svm8m5vmbi"; - 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 = [ - bug data-default-class QuickCheck quickcheck-instances rebase - rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - benchmarkHaskellDepends = [ bug criterion rerebase ]; - homepage = "https://github.com/nikita-volkov/hasql"; - description = "An efficient PostgreSQL driver and a flexible mapping API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql_1_1" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , criterion, data-default-class, dlist, either, hashable - , hashtables, loch-th, mtl, placeholders, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rebase, rerebase, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, transformers, vector + , criterion, data-default-class, dlist, hashable, hashtables + , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq + , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, vector }: mkDerivation { pname = "hasql"; - version = "1.1"; - sha256 = "1c2gfdgxki17ng6b5qr3pvmra7v7x3hf9vh75hq4n6jr8rp03iki"; + version = "1.1.1"; + sha256 = "12q83n9ylykk9zkjlk4qfvk7qls9syrfn9g78ljarbq8b8vi8996"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder - contravariant contravariant-extras data-default-class dlist either + contravariant contravariant-extras data-default-class dlist hashable hashtables loch-th mtl placeholders postgresql-binary postgresql-libpq profunctors semigroups text transformers vector ]; testHaskellDepends = [ bug data-default-class QuickCheck quickcheck-instances rebase - rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck + rerebase tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ bug criterion rerebase ]; homepage = "https://github.com/nikita-volkov/hasql"; @@ -94239,23 +99167,22 @@ self: { }) {}; "hasql-class" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , data-default-class, doctest, generics-eot, Glob, hasql, hspec - , process, QuickCheck, quickcheck-instances, string-qq, text, time - , vector, yaml + ({ mkDerivation, base, bytestring, contravariant + , data-default-class, generics-eot, hasql, hspec, process + , QuickCheck, quickcheck-instances, string-qq, text, time, vector }: mkDerivation { pname = "hasql-class"; - version = "0.0.1.0"; - sha256 = "10d61avgsma6104d1bh3sfs1i4hrbpr0rhb7ihgi43xshg6wjvgl"; + version = "0.1.0.0"; + sha256 = "00va6klddkkr60zl9i9mx7lmryn71qbc4qfhw4q8fcwbw69bzc0f"; libraryHaskellDepends = [ base bytestring contravariant data-default-class generics-eot hasql text time vector ]; testHaskellDepends = [ - base bytestring containers contravariant data-default-class doctest - generics-eot Glob hasql hspec process QuickCheck - quickcheck-instances string-qq text time vector yaml + base bytestring contravariant data-default-class generics-eot hasql + hspec process QuickCheck quickcheck-instances string-qq text time + vector ]; homepage = "http://github.com/turingjump/hasql-class#readme"; description = "Encodable and Decodable classes for hasql"; @@ -94303,6 +99230,7 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction"; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-generic" = callPackage @@ -94312,8 +99240,8 @@ self: { }: mkDerivation { pname = "hasql-generic"; - version = "0.1.0.4"; - sha256 = "10ps2kf0q4lxcmrvyqsw7gkamcyqlyjlj3ljgs68fniri0pbw3fn"; + version = "0.1.0.5"; + sha256 = "0prf7ikjccp4bvlxxv78xg34mz0m3gn2y3c2z1lq14jzarya4pcf"; libraryHaskellDepends = [ aeson base binary-parser bytestring containers contravariant generics-sop hasql postgresql-binary scientific text time uuid @@ -94346,6 +99274,7 @@ self: { homepage = "https://github.com/tvh/hasql-migration"; description = "PostgreSQL Schema Migrations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-optparse-applicative" = callPackage @@ -94354,14 +99283,15 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.2.4"; - sha256 = "0gdbwhzcfjriq2yah5kfn9r1anc77f1iyay86zsdgq4z8qi6asvr"; + version = "0.3"; + sha256 = "05i9hij1z67l1sc53swwcmd88544dypc3qkzkh8f4n6nlmv82190"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; homepage = "https://github.com/sannsyn/hasql-optparse-applicative"; description = "\"optparse-applicative\" parsers for \"hasql\""; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-pool" = callPackage @@ -94374,6 +99304,7 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-pool"; description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-postgres" = callPackage @@ -94444,6 +99375,7 @@ self: { homepage = "https://github.com/agrafix/hasql-simple#readme"; description = "A somewhat opinionated \"simpler\" API to hasql"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-th" = callPackage @@ -94468,8 +99400,8 @@ self: { }: mkDerivation { pname = "hasql-transaction"; - version = "0.5.2"; - sha256 = "0w4y65vqgc4pk66xpip9jzzbas6cpnss4gx1w91rg7j48491cmym"; + version = "0.6"; + sha256 = "00dxm78wscj88zb6wbyg48ps4a5cc41jbbknjrmxlgp0iw4hr06b"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers @@ -94478,6 +99410,7 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-transaction"; description = "A composable abstraction over the retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hastache" = callPackage @@ -94700,8 +99633,8 @@ self: { }: mkDerivation { pname = "hasty-hamiltonian"; - version = "1.3.0"; - sha256 = "0cgvxr4zywnvd7q109qlcrcpcfszj4w5viyjz9g7mafdfay17xqm"; + version = "1.3.2"; + sha256 = "17nc33q9vkq13wp5dqrq2vq6bz408ll8h84fg7mapks5w5r9sag6"; libraryHaskellDepends = [ base kan-extensions lens mcmc-types mwc-probability pipes primitive transformers @@ -94751,6 +99684,7 @@ self: { ]; description = "HaTeX User's Guide"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hath" = callPackage @@ -94846,6 +99780,7 @@ self: { ]; description = "Recursively retrieve maven dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haverer" = callPackage @@ -94966,6 +99901,7 @@ self: { homepage = "http://github.com/tvh/haxl-amazonka#readme"; description = "Haxl data source for accessing AWS services through amazonka"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxl-facebook" = callPackage @@ -95071,7 +100007,7 @@ self: { }) {}; "hayland" = callPackage - ({ mkDerivation, base, data-flags, mesa, process, template-haskell + ({ mkDerivation, base, data-flags, libGL, process, template-haskell , time, wayland, xml }: mkDerivation { @@ -95083,13 +100019,13 @@ self: { libraryHaskellDepends = [ base data-flags process template-haskell time xml ]; - librarySystemDepends = [ mesa wayland ]; + librarySystemDepends = [ libGL wayland ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base process xml ]; description = "Haskell bindings for the C Wayland library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) mesa; inherit (pkgs) wayland;}; + }) {inherit (pkgs) libGL; inherit (pkgs) wayland;}; "hayoo-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types @@ -95228,18 +100164,16 @@ self: { }) {inherit (pkgs) SDL_mixer;}; "hblas" = callPackage - ({ mkDerivation, base, blas, HUnit, liblapack, primitive - , storable-complex, tasty, tasty-hunit, vector + ({ mkDerivation, base, blas, hspec, liblapack, primitive + , storable-complex, vector }: mkDerivation { pname = "hblas"; - version = "0.3.2.1"; - sha256 = "05c2mqhwjq0r8jyaj0cncaxn4n5x27dd8z6lv8g8cdc7r749q59y"; - revision = "2"; - editedCabalFile = "02cxp6nxr2x1ka8bq8zjlx6kjy54lzsc9bdw1zf981f3i8yz9cj8"; + version = "0.4.0.1"; + sha256 = "1jclawfvykdsd5b5wmqyz6fb0kx6yr626w4g86w9q1127k8l102k"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ blas liblapack ]; - testHaskellDepends = [ base HUnit tasty tasty-hunit vector ]; + testHaskellDepends = [ base hspec primitive vector ]; homepage = "http://github.com/wellposed/hblas/"; description = "Human friendly BLAS and Lapack bindings for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -95367,33 +100301,34 @@ self: { }) {}; "hcg-minus" = callPackage - ({ mkDerivation, base, colour }: + ({ mkDerivation, base, colour, random }: mkDerivation { pname = "hcg-minus"; - version = "0.15"; - sha256 = "04g0f4sr7904w3ynyl0gnbyi2sl0z7ziv5q15mfb6c7h0zl25d5r"; + version = "0.16"; + sha256 = "0578yi5zc61chmp936s5wczdd8j3593br24zx57sqr5a50c0mwmc"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base colour ]; + libraryHaskellDepends = [ base colour random ]; homepage = "http://rd.slavepianos.org/t/hcg-minus"; description = "haskell cg (minus)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hcg-minus-cairo" = callPackage - ({ mkDerivation, base, cairo, colour, filepath, hcg-minus - , utf8-string + ({ mkDerivation, base, cairo, colour, filepath, hcg-minus, process }: mkDerivation { pname = "hcg-minus-cairo"; - version = "0.15"; - sha256 = "002gh8adqzhcjfnqkbcnpzz8qiqbj9zkbk6jj11dnnxjigc4l2q9"; + version = "0.16"; + sha256 = "0q51m7rac2dij9y34pp74xpz8qsskjb2if7i5dynpk9jnpqkj26h"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base cairo colour filepath hcg-minus utf8-string + base cairo colour filepath hcg-minus process ]; homepage = "http://rd.slavepianos.org/t/hcg-minus-cairo"; description = "haskell cg (minus) (cairo rendering)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hcheat" = callPackage @@ -95564,8 +100499,8 @@ self: { }: mkDerivation { pname = "hdaemonize"; - version = "0.5.4"; - sha256 = "0r6bfb2bc9lg4iywbql7ik9swvvn4lfhq0qn7r20v4gq5fkpwgvw"; + version = "0.5.5"; + sha256 = "17q2zr9bv6xwnldgbsh1idwfgybp8q4xzq79p2lmmi3f0q6cnl6j"; libraryHaskellDepends = [ base bytestring extensible-exceptions filepath hsyslog mtl unix ]; @@ -95762,8 +100697,8 @@ self: { }: mkDerivation { pname = "hdevtools"; - version = "0.1.6.0"; - sha256 = "0yp270sbz501vla87nhzv53ag0b64ny9gza6chr8mbjqkj86d5j5"; + version = "0.1.6.1"; + sha256 = "0h1l74ky9a5an7j60i9razifm49v232g8f8p8fg1arv59b7nmr77"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95791,8 +100726,30 @@ self: { homepage = "http://rd.slavepianos.org/t/hdf"; description = "HDF: Uniform Rate Audio Signal Processing in Haskell"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hdf5-lite" = callPackage + ({ mkDerivation, base, c2hs, containers, exceptions, ghc-prim, hdf5 + , hspec, inline-c, primitive, QuickCheck, template-haskell, text + , vector + }: + mkDerivation { + pname = "hdf5-lite"; + version = "0.1.1.0"; + sha256 = "1c13qg0zx9g6zmhmy2snmbnkhmmgchm6qlh0vn4i3df2vdi4rb8v"; + libraryHaskellDepends = [ + base containers exceptions ghc-prim inline-c primitive + template-haskell text vector + ]; + librarySystemDepends = [ hdf5 ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/ocramz/hdf5-lite"; + description = "High-level bindings to the HDF5 \"lite\" interface"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) hdf5;}; + "hdigest" = callPackage ({ mkDerivation, base, cgi, Crypto, network, parsec, random, time }: @@ -95892,6 +100849,7 @@ self: { ]; description = "A Digital Ocean client in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdocs" = callPackage @@ -95917,6 +100875,7 @@ self: { homepage = "https://github.com/mvoidex/hdocs"; description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdph" = callPackage @@ -96010,14 +100969,13 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "heap"; - version = "1.0.3"; - sha256 = "00plmd5b8dlgb8324h1dbd168apfcx3hkv65rhi463a8lff7xmcv"; - revision = "1"; - editedCabalFile = "0j1f0xl3y2vqiyh3m9w5vssxyi62s6qic3zmpkm429vawyh4yad5"; + version = "1.0.4"; + sha256 = "0ahpsfmb76728w71xn4021ad7z752n6aqqgzdpcyis9i22g4ihm4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heaps" = callPackage @@ -96026,10 +100984,10 @@ self: { }: mkDerivation { pname = "heaps"; - version = "0.3.5"; - sha256 = "1p1nsglsf8hric63cn3n1iw1nlbiv3lgk3n5gq0znajj7j7s64qv"; - revision = "1"; - editedCabalFile = "05avm1b16gj3rlm9sjqkxb0flq055r6gqhnacp7yzw4j1bghm5j7"; + version = "0.3.6"; + sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q"; + revision = "2"; + editedCabalFile = "0iym09z8039b2v0kfzh1b66b7ky7kqjv85mx1h0xhsayxdy135in"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; @@ -96039,19 +100997,31 @@ self: { }) {}; "heapsort" = callPackage - ({ mkDerivation, array, base, QuickCheck }: + ({ mkDerivation, array, base }: mkDerivation { pname = "heapsort"; version = "0.1.0"; sha256 = "0fzws9fjhqsygsbwj7nvj786j16264vqvqzc97dr73y72538k9qa"; isLibrary = true; isExecutable = true; - executableHaskellDepends = [ array base QuickCheck ]; + executableHaskellDepends = [ array base ]; homepage = "http://wiki.cs.pdx.edu/bartforge/heapsort"; description = "Heapsort of MArrays as a demo of imperative programming"; license = stdenv.lib.licenses.bsd3; }) {}; + "heartbeat-streams" = callPackage + ({ mkDerivation, async, base, io-streams, time }: + mkDerivation { + pname = "heartbeat-streams"; + version = "0.1.0.0"; + sha256 = "0019qgdc4ylyv7bb8w094qp38qiv81jb6x00s6z64j0zgy3lg4ss"; + libraryHaskellDepends = [ async base io-streams time ]; + homepage = "https://github.com/bitnomial/heartbeat-streams"; + description = "Heartbeats for io-streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "heatshrink" = callPackage ({ mkDerivation, base, bytestring, c2hs, cereal, pcre-heavy, tasty , tasty-golden, tasty-hunit, text @@ -96080,8 +101050,8 @@ self: { }: mkDerivation { pname = "heavy-logger"; - version = "0.3.1.0"; - sha256 = "0cmanxnahxgk52ffpni0zx4z22vdrh6r5my4llvsdd94bpfmxpi4"; + version = "0.3.2.0"; + sha256 = "1kx6l7ysniqjzzp7l74vjcfbi8qz5xqjqvisb49k18cnf22mikvv"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default fast-logger hsyslog lifted-base monad-control monad-logger mtl stm @@ -96106,6 +101076,28 @@ self: { homepage = "https://github.com/portnov/heavy-logger-amazon#readme"; description = "heavy-logger compatibility with amazonka-core logging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "heavy-logger-instances" = callPackage + ({ mkDerivation, base, binary, exceptions, heavy-logger, hsyslog + , mtl, template-haskell, text, text-format-heavy + }: + mkDerivation { + pname = "heavy-logger-instances"; + version = "0.2.0.0"; + sha256 = "0flh5j79ijkvdwhjg1gn3qkhybzspvg1jh8nib18fgzmvcx8zckm"; + libraryHaskellDepends = [ + base binary exceptions heavy-logger hsyslog mtl template-haskell + text text-format-heavy + ]; + testHaskellDepends = [ + base binary exceptions heavy-logger hsyslog mtl template-haskell + text text-format-heavy + ]; + homepage = "https://github.com/portnov/heavy-logger#readme"; + description = "Orphan instances for data types in heavy-logger package"; + license = stdenv.lib.licenses.bsd3; }) {}; "hebrew-time" = callPackage @@ -96157,95 +101149,141 @@ self: { 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 + , random, resourcet, semigroups, stm, template-haskell, text + , th-lift, time, transformers, transformers-base, unix + , wl-pprint-annotated }: mkDerivation { pname = "hedgehog"; - version = "0.5"; - sha256 = "02dy5fmwmrjgwj6p8rvr53rg362qayavbc184gf2f9q196rgijpk"; + version = "0.5.3"; + sha256 = "1vv8vnkv6d0fvm0vwfm11ajyd9da3hfy2wdkd4p7dhfyscq9cwx4"; revision = "1"; - editedCabalFile = "13079sdirdzch3r199lyxa7xrcq4xpaayxhdvg8v0d27w9z1chln"; + editedCabalFile = "0hhzkl88xk9j62897y11f4xx84qdh0mdap55iw30cl4zwlgp10ir"; 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 + pretty-show primitive random resourcet semigroups stm + template-haskell text th-lift time transformers transformers-base + unix wl-pprint-annotated ]; testHaskellDepends = [ - base containers pretty-show text transformers + base containers pretty-show semigroups text transformers ]; homepage = "https://hedgehog.qa"; description = "Hedgehog will eat all your bugs"; license = stdenv.lib.licenses.bsd3; }) {}; - "hedgehog-quickcheck" = callPackage - ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: + "hedgehog-checkers" = callPackage + ({ mkDerivation, base, containers, either, hedgehog, semigroupoids + , semigroups + }: 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"; + pname = "hedgehog-checkers"; + version = "0.1.0.0"; + sha256 = "0fr0jmvh3c6a1mvdppbjxxc1ps94p4kc1crxwdmw1487jlg2z8ps"; + libraryHaskellDepends = [ + base containers hedgehog semigroupoids semigroups + ]; + testHaskellDepends = [ base either hedgehog ]; + homepage = "https://github.com/bitemyapp/hedgehog-checkers#readme"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hedis" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, HUnit, mtl, network, resource-pool, scanner - , slave-thread, stm, test-framework, test-framework-hunit, text - , time, unordered-containers, vector + "hedgehog-checkers-lens" = callPackage + ({ mkDerivation, base, hedgehog, hedgehog-checkers, lens }: + mkDerivation { + pname = "hedgehog-checkers-lens"; + version = "0.1.0.0"; + sha256 = "0zfk967xzpwfh3y3ys8d0c3zcz251dnp41xha11613ji3yfk0wff"; + libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ]; + testHaskellDepends = [ base hedgehog hedgehog-checkers lens ]; + homepage = "https://github.com/bitemyapp/hedgehog-checkers#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hedgehog-corpus" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hedgehog-corpus"; + version = "0.1.0"; + sha256 = "1whrszkd03d9a86vqnp38sq8gs2hfdc39wxcf5c12w3767c9qmn3"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/tmcgilchrist/hedgehog-corpus"; + description = "hedgehog-corpus"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hedgehog-gen-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , hedgehog, lens, protolude, regex-genex, regex-pcre, scientific + , tasty, tasty-hedgehog, text, time, timerep, tz + , unordered-containers, vector }: mkDerivation { - pname = "hedis"; - version = "0.9.11"; - sha256 = "1ya5jpf57zs66hqvr58xyj0k7jq5cmdci1yxzwj19cag1wfq47rb"; + pname = "hedgehog-gen-json"; + version = "0.3.0"; + sha256 = "09b362v9cdl9jwrx0hyb7hhf2krg3rhrsgssz4dl3sjz3y2a8i1h"; libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq mtl network - resource-pool scanner stm text time unordered-containers vector + aeson base bytestring containers exceptions hedgehog lens protolude + regex-genex scientific text time timerep tz unordered-containers + vector ]; testHaskellDepends = [ - async base bytestring HUnit mtl slave-thread stm test-framework - test-framework-hunit text time + aeson base bytestring containers exceptions hedgehog lens protolude + regex-genex regex-pcre scientific tasty tasty-hedgehog text time + timerep tz unordered-containers vector ]; - benchmarkHaskellDepends = [ base mtl time ]; - homepage = "https://github.com/informatikr/hedis"; - description = "Client library for the Redis datastore: supports full command set, pipelining"; + homepage = "https://github.com/amrhassan/haskell-hedgehog-gen-json"; + description = "JSON generators for Hedgehog"; + license = stdenv.lib.licenses.mit; + 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_0_9_12" = callPackage + "hedis" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, HUnit, mtl, network, resource-pool, scanner - , slave-thread, stm, test-framework, test-framework-hunit, text - , time, unordered-containers, vector + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, slave-thread, stm, test-framework + , test-framework-hunit, text, time, unordered-containers, vector }: mkDerivation { pname = "hedis"; - version = "0.9.12"; - sha256 = "0z9d0d1f394xf1c6fsi4c0ib3pgn0w3d6iw2h34774bxrmglf5aa"; + version = "0.10.1"; + sha256 = "1xzma70f1p6zfihwpsnc23bdzw09yg50pig7knkj6bxkv19czbsn"; libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq mtl network - resource-pool scanner stm text time unordered-containers vector + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time + unordered-containers vector ]; testHaskellDepends = [ - async base bytestring HUnit mtl slave-thread stm test-framework - test-framework-hunit text time + async base bytestring doctest HUnit mtl slave-thread stm + test-framework test-framework-hunit text time ]; benchmarkHaskellDepends = [ base mtl time ]; homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -96262,6 +101300,7 @@ self: { homepage = "https://bitbucket.org/s9gf4ult/hedis-config"; description = "Easy trivial configuration for Redis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-monadic" = callPackage @@ -96354,26 +101393,27 @@ self: { "hedn" = callPackage ({ mkDerivation, attoparsec, base, base-compat, bytestring - , containers, deepseq, hspec, HUnit, mtl, QuickCheck, scientific - , stringsearch, template-haskell, text, time, time-locale-compat - , utf8-string, vector + , containers, deepseq, hspec, hspec-contrib, HUnit, mtl, QuickCheck + , scientific, stringsearch, template-haskell, text, time + , time-locale-compat, utf8-string, vector }: mkDerivation { pname = "hedn"; - version = "0.1.8.2"; - sha256 = "15f1zrp5cb1m2xhy974v8f67xg08yks6w43m3sbky4v5mbfy12ig"; + version = "0.1.9.0"; + sha256 = "077wf446x0rrac3bdzmyhpacb54smx02msdz45cra3yzn3n0rq7l"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq mtl scientific stringsearch text time time-locale-compat utf8-string vector ]; testHaskellDepends = [ - base bytestring containers hspec HUnit QuickCheck template-haskell - text time vector + base bytestring containers hspec hspec-contrib HUnit QuickCheck + template-haskell text time vector ]; homepage = "https://bitbucket.org/dpwiz/hedn"; description = "EDN parsing and encoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hein" = callPackage @@ -96407,10 +101447,50 @@ self: { }: mkDerivation { pname = "heist"; - version = "1.0.1.0"; - sha256 = "1jwbqr2n7jv8cykjgg1a0bdwjszmrbg5qflikvmkyiy1pz0z6kzx"; - revision = "6"; - editedCabalFile = "1r0gqv2y2sar3j4vwnvc6gsdbs9813gviiaa348j9jyc0j6dy4qw"; + version = "1.0.1.2"; + sha256 = "0kpn5c3j7d42l12axd05hglhxqc4y7l0rz57lcqh3yznjl7mzv71"; + revision = "3"; + editedCabalFile = "0siqhy0svk9lfi8rx7lhjhjihrmjk6plvyjnhhyhvyakmycggqpc"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers directory directory-tree dlist filepath hashable + lifted-base map-syntax monad-control mtl process random text time + transformers transformers-base unordered-containers vector xmlhtml + ]; + testHaskellDepends = [ + aeson attoparsec base bifunctors blaze-builder blaze-html + bytestring containers directory directory-tree dlist filepath + hashable HUnit lens lifted-base map-syntax monad-control mtl + process QuickCheck random test-framework test-framework-hunit + test-framework-quickcheck2 text time transformers transformers-base + unordered-containers vector xmlhtml + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers criterion directory directory-tree dlist filepath + hashable HUnit lifted-base map-syntax monad-control mtl process + random statistics test-framework test-framework-hunit text time + transformers transformers-base unordered-containers vector xmlhtml + ]; + homepage = "http://snapframework.com/"; + description = "An Haskell template system supporting both HTML5 and XML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "heist_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder + , blaze-html, bytestring, containers, criterion, directory + , directory-tree, dlist, filepath, hashable, HUnit, lens + , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck + , random, statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unordered-containers, vector, xmlhtml + }: + mkDerivation { + pname = "heist"; + version = "1.1"; + sha256 = "15hdq3i041ph0ry6f9dn6vx2w9hzgkvi9db4p6cy6czwbp53kjbq"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -96549,6 +101629,7 @@ self: { homepage = "http://www.codersbase.com/index.php/Helisp"; description = "An incomplete Elisp compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "helium" = callPackage @@ -96903,8 +101984,8 @@ self: { }: mkDerivation { pname = "here"; - version = "1.2.11"; - sha256 = "1jpcwzi5pq82zlv1w987dlpfyi566gvabaj2wywyr9i95hv97jk8"; + version = "1.2.13"; + sha256 = "001wfyvigl2xswqysnpignkl124hybf833875mkcsn8yp8krqvs0"; libraryHaskellDepends = [ base haskell-src-meta mtl parsec template-haskell ]; @@ -96953,6 +102034,7 @@ self: { testHaskellDepends = [ base doctest ]; description = "haskell time manipulation in a 'kerf like' style"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hermit" = callPackage @@ -97007,8 +102089,29 @@ self: { }: mkDerivation { pname = "herms"; - version = "1.8.1.2"; - sha256 = "1avyf8xz4wkv6xijg3wrj0398wy5jcwlp50iil1z8jdlfwh72f18"; + version = "1.8.1.4"; + sha256 = "1hgrwp39q6fwq0ssfkbfq8ndwmyiv1szpl8qa1p0fss5ddf002bc"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + ansi-terminal base brick directory microlens microlens-th + optparse-applicative semigroups split vty + ]; + homepage = "https://github.com/JackKiefer/herms"; + description = "A command-line manager for delicious kitchen recipes"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "herms_1_8_2_2" = callPackage + ({ mkDerivation, ansi-terminal, base, brick, directory, microlens + , microlens-th, optparse-applicative, semigroups, split, vty + }: + mkDerivation { + pname = "herms"; + version = "1.8.2.2"; + sha256 = "0x6h1l9kikjqzyyxa23y9df6bdw529cr07g74qc2qbdbg39713zq"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -97205,8 +102308,8 @@ self: { }: mkDerivation { pname = "heterocephalus"; - version = "1.0.5.1"; - sha256 = "01klxr6wmibav30yaxz0mf8xhd57frs6ika8c26qsgwjlj5qd94p"; + version = "1.0.5.2"; + sha256 = "08sr2ps3kb2v6pglkls814w6fpvwkysd3k2s15pj9fhmhx82kf2h"; libraryHaskellDepends = [ base blaze-html blaze-markup containers dlist mtl parsec shakespeare template-haskell text transformers @@ -97217,6 +102320,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "heterogeneous-list-literals" = callPackage + ({ mkDerivation, base, OneTuple }: + mkDerivation { + pname = "heterogeneous-list-literals"; + version = "0.1.0.1"; + sha256 = "0cb38kpw01fzwfrhlgi2l1869b8hd9cd7kzbyr1ap6ik5gkljq6k"; + libraryHaskellDepends = [ base OneTuple ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/davidm-d/heterogeneous-list-literals"; + description = "Allows the use of tuples as literals for Heterogeneous collections"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "heterolist" = callPackage ({ mkDerivation, base, constraint-manip, hspec, indextype, polydata }: @@ -97316,6 +102432,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hex-text" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, doctest, text + }: + mkDerivation { + pname = "hex-text"; + version = "0.1.0.0"; + sha256 = "0if46jkzd67jwp56vmvd021qq2vfzpmaf1v2w07cy0w61icfvjxr"; + libraryHaskellDepends = [ base base16-bytestring bytestring text ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/typeclasses/hex-text"; + description = "ByteString-Text hexidecimal conversions"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "hexchat" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "hexchat"; + version = "0.0.2.0"; + sha256 = "1bx49z3ycc24bsn0x0617x0gmgapan6qnwnwq6v0w06gjrahr4r4"; + libraryHaskellDepends = [ base containers ]; + homepage = "https://github.com/mniip/hexchat-haskell"; + description = "Haskell scripting interface for HexChat"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hexdump" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -97427,6 +102570,7 @@ self: { homepage = "https://github.com/tel/hexpat-lens"; description = "Lenses for Hexpat"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-pickle" = callPackage @@ -97507,7 +102651,6 @@ self: { homepage = "https://github.com/allonsy/hexpress"; description = "An express-like http framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexquote" = callPackage @@ -97563,16 +102706,16 @@ self: { "heyefi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, configurator - , containers, directory, exceptions, filepath, HandsomeSoup, hspec - , hspec-wai, http-types, hxt, iso8601-time, MissingH, mtl - , multipart, optparse-applicative, random, silently, stm, tar - , temporary, text, time, transformers, unix, unordered-containers - , utf8-string, wai, wai-extra, warp + , directory, exceptions, filepath, HandsomeSoup, hspec, hspec-wai + , http-types, hxt, iso8601-time, MissingH, mtl, multipart + , optparse-applicative, random, silently, stm, tar, temporary, text + , time, transformers, unix, unordered-containers, utf8-string, wai + , wai-extra, warp }: mkDerivation { pname = "heyefi"; - version = "1.1.0.0"; - sha256 = "04ycaily7p53sdjgixzihl6mqaid74ak4mk7r0gwwiivzljixfyx"; + version = "2.0.0.2"; + sha256 = "1dhjvg5hhqj7apbsz5sq5p05rp3g07igc00r8qa7dmgixrp0a77b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97582,15 +102725,16 @@ self: { transformers unix unordered-containers utf8-string wai warp ]; testHaskellDepends = [ - base bytestring case-insensitive configurator containers directory - exceptions filepath HandsomeSoup hspec hspec-wai http-types hxt - iso8601-time MissingH mtl multipart optparse-applicative random - silently stm tar temporary text time transformers unix - unordered-containers utf8-string wai wai-extra warp + base bytestring case-insensitive configurator directory exceptions + filepath HandsomeSoup hspec hspec-wai http-types hxt iso8601-time + MissingH mtl multipart optparse-applicative random silently stm tar + temporary text time transformers unix unordered-containers + utf8-string wai wai-extra warp ]; homepage = "https://github.com/ryantm/heyefi"; description = "A server for Eye-Fi SD cards"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hfann" = callPackage @@ -97604,8 +102748,6 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ doublefann ]; libraryPkgconfigDepends = [ fann ]; - executableHaskellDepends = [ base ]; - executableSystemDepends = [ doublefann ]; description = "Haskell binding to the FANN library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -97651,10 +102793,8 @@ self: { ({ mkDerivation, base, containers, template-haskell, text }: mkDerivation { pname = "hflags"; - version = "0.4.2"; - sha256 = "1i9c1xszaymiqxh3ss7601cw8m8zpzvzg3k92jvdj4a0gxihvlrc"; - revision = "1"; - editedCabalFile = "1kasg8y0ia3q2iy6vmjvwwn9dyxzy59s6s9chwxhdgsvncx38ra1"; + version = "0.4.3"; + sha256 = "0lmjgwgfp1s2ag2fbi6n8yryafb5qz87yb0p122lxzm3487sf98h"; libraryHaskellDepends = [ base containers template-haskell text ]; homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; @@ -97662,25 +102802,26 @@ self: { }) {}; "hfmt" = callPackage - ({ 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, ansi-wl-pprint, base, bytestring, Cabal, conduit + , conduit-combinators, Diff, directory, exceptions, filepath + , haskell-src-exts, hindent, hlint, HUnit, optparse-applicative + , path, path-io, pretty, stylish-haskell, test-framework + , test-framework-hunit, text, transformers, yaml }: mkDerivation { pname = "hfmt"; - version = "0.1.1"; - sha256 = "0cg5vaihyrdsigpvj82a2xdmq6wj1vbqg10ldcp4c2pxwsgz97mh"; + version = "0.2.1"; + sha256 = "06g3l0qbj1bdrxis9ryl3cgmhs129l1lfiah5kpn0xbv1h3p3id5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal directory exceptions filepath - haskell-src-exts hindent hlint HUnit path path-io pipes - stylish-haskell text transformers yaml + base bytestring Cabal conduit conduit-combinators Diff directory + exceptions filepath haskell-src-exts hindent hlint HUnit path + path-io pretty stylish-haskell text transformers yaml ]; executableHaskellDepends = [ - ansi-wl-pprint base Diff optparse-applicative pipes pretty + ansi-wl-pprint base conduit conduit-combinators directory + optparse-applicative ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -97763,13 +102904,13 @@ self: { "hfsevents" = callPackage ({ mkDerivation, base, bytestring, cereal, Cocoa, CoreServices, mtl - , text, unix + , text }: mkDerivation { pname = "hfsevents"; version = "0.1.6"; sha256 = "019zbnvfd866ch49gax0c1c93zv92142saim1hrgypz5lprz7hvl"; - libraryHaskellDepends = [ base bytestring cereal mtl text unix ]; + libraryHaskellDepends = [ base bytestring cereal mtl text ]; librarySystemDepends = [ Cocoa ]; libraryToolDepends = [ CoreServices ]; homepage = "http://github.com/luite/hfsevents"; @@ -97956,48 +103097,45 @@ self: { }) {geos_c = null;}; "hgettext" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath - , haskell-src-exts, process, setlocale, uniplate + ({ mkDerivation, base, Cabal, containers, deepseq, directory + , filepath, haskell-src-exts, process, setlocale, uniplate }: mkDerivation { pname = "hgettext"; - version = "0.1.30"; - sha256 = "1pgzyd1nqzl7g88pcw7sncija5sd2k4zif9d8qfw96cw6m6kli96"; - revision = "2"; - editedCabalFile = "1j65m70j7j64an9psqzhasrqdrmpg4p1h4hd1kvinygvg5gg3bxj"; + version = "0.1.31.0"; + sha256 = "0s7kgpjlkkw32rbksic099m9g07czi0vrhcn7mbiyi0lyhcbc7ym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal containers directory filepath process setlocale ]; - executableHaskellDepends = [ base haskell-src-exts uniplate ]; - homepage = "https://github.com/vasylp/hgettext"; + executableHaskellDepends = [ + base Cabal containers deepseq filepath haskell-src-exts uniplate + ]; description = "Bindings to libintl.h (gettext, bindtextdomain)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgis" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart - , Chart-cairo, Chart-diagrams, colour, composition + , Chart-cairo, Chart-diagrams, colour, composition-prelude , data-binary-ieee754, data-default, directory, filepath, hspec - , lens, monad-loops, optparse-applicative, transformers + , lens, monad-loops, optparse-applicative }: mkDerivation { pname = "hgis"; - version = "0.1.3.6"; - sha256 = "1f4hj30ivx37lcxpmhvxchn153rbdxz91lcdphagf1j1j3imx1zw"; + version = "0.1.3.8"; + sha256 = "10lqv0v4lnah22qwlyh1ixhcvl0abs9brlpddw0a24xdym4j0xhf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring Chart Chart-cairo - Chart-diagrams colour composition data-binary-ieee754 data-default - directory filepath lens monad-loops optparse-applicative - transformers + Chart-diagrams colour composition-prelude data-binary-ieee754 + data-default directory filepath lens monad-loops + optparse-applicative ]; 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; @@ -98039,6 +103177,7 @@ self: { homepage = "http://code.haskell.org/~thielema/hgl-example/"; description = "Various animations generated using HGL"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {HTam = null;}; @@ -98048,6 +103187,8 @@ self: { pname = "hgmp"; version = "0.1.1"; sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr"; + revision = "2"; + editedCabalFile = "0v318nifmgqq5jg1d5q0jspfgyqp7cfnkz3ikqaz9xjg8inzl8mr"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://code.mathr.co.uk/hgmp"; @@ -98108,6 +103249,7 @@ self: { homepage = "https://github.com/thumphries/hgrep"; description = "Search Haskell source code from the command line"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgrev" = callPackage @@ -98124,7 +103266,6 @@ self: { homepage = "https://github.com/bitnomial/hgrev"; description = "Compile Mercurial (hg) version info into Haskell code"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgrib" = callPackage @@ -98140,7 +103281,6 @@ self: { libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ grib_api ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec ]; homepage = "https://github.com/mjakob/hgrib"; description = "Unofficial bindings for GRIB API"; @@ -98262,7 +103402,6 @@ self: { homepage = "https://github.com/phaazon/hid"; description = "Interface to hidapi library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) hidapi;}; "hidapi" = callPackage @@ -98286,12 +103425,14 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "hidden-char"; - version = "0.1.0.1"; - sha256 = "17g9wbk34x8gkgrlvj3barhirq0jkshysqrxhs8nxp60hb2zpxip"; + version = "0.1.0.2"; + sha256 = "167l83cn37mkq394pbanybz1kghnbim1m74fxskws1nclxr9747a"; + revision = "2"; + editedCabalFile = "1d0k297hxff31k0x5xbli6l7c151d2y9wq4w0x0prgagjc0l7z5n"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/rcook/hidden-char#readme"; - description = "Provides getHiddenChar function"; + description = "Provides cross-platform getHiddenChar function"; license = stdenv.lib.licenses.mit; }) {}; @@ -98360,8 +103501,8 @@ self: { }: mkDerivation { pname = "hierarchy"; - version = "0.3.1.2"; - sha256 = "07aldpvbsc2mjg7v2gi46il66qg0hk9ly7sw4vd7h0lkk5q3vb6h"; + version = "0.3.1.4"; + sha256 = "0bli7mv2d6lmxc89fysmkhb9kamhzs2rqx75rn4mbcw61il1cznq"; libraryHaskellDepends = [ base exceptions free mmorph monad-control mtl pipes semigroups transformers transformers-base transformers-compat @@ -98432,26 +103573,24 @@ self: { "higher-leveldb" = callPackage ({ mkDerivation, base, bytestring, cereal, data-default, exceptions - , hspec, leveldb-haskell, lifted-base, monad-control, mtl, process - , resourcet, transformers, transformers-base + , hspec, leveldb-haskell, mtl, process, resourcet, transformers + , transformers-base, unliftio, unliftio-core }: mkDerivation { pname = "higher-leveldb"; - version = "0.4.0.1"; - sha256 = "0ia3ssxr414jqvb4gzkaaa4a8d3rd7b395cfh0m2hz2jn6q7z651"; + version = "0.5.0.1"; + sha256 = "0p7rsawd4d5cbsxlj8ddgx5blg2yw853zjfqcy78gdqn6kk8vz24"; libraryHaskellDepends = [ - base bytestring cereal data-default exceptions leveldb-haskell - lifted-base monad-control mtl resourcet transformers - transformers-base + base bytestring cereal data-default exceptions leveldb-haskell mtl + resourcet transformers transformers-base unliftio-core ]; testHaskellDepends = [ - base bytestring cereal hspec leveldb-haskell lifted-base - monad-control mtl process resourcet transformers transformers-base + base bytestring cereal hspec leveldb-haskell mtl process resourcet + transformers transformers-base unliftio ]; homepage = "https://github.com/jeremyjh/higher-leveldb"; description = "A rich monadic API for working with leveldb databases"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "higherorder" = callPackage @@ -98556,6 +103695,7 @@ self: { homepage = "https://github.com/cdepillabout/highlight"; description = "Command line tool for highlighting parts of files matching a regex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "highlight-versions" = callPackage @@ -98572,6 +103712,7 @@ self: { ]; description = "Highlight package versions which differ from the latest version on Hackage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "highlighter" = callPackage @@ -98587,16 +103728,13 @@ self: { libraryHaskellDepends = [ base blaze-html bytestring filepath mtl pcre-light text ]; - executableHaskellDepends = [ - base blaze-html bytestring filepath mtl pcre-light text - ]; description = "source code highlighting"; license = stdenv.lib.licenses.bsd3; }) {}; "highlighter2" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , containers, filepath, mtl, pcre-light, text + ({ mkDerivation, base, blaze-html, bytestring, containers, filepath + , mtl, pcre-light, text }: mkDerivation { pname = "highlighter2"; @@ -98607,10 +103745,6 @@ self: { libraryHaskellDepends = [ base blaze-html bytestring containers filepath mtl pcre-light text ]; - executableHaskellDepends = [ - base blaze-html blaze-markup bytestring containers filepath mtl - pcre-light text - ]; description = "source code highlighting"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -98631,7 +103765,6 @@ self: { base blaze-html bytestring containers mtl parsec pcre-light utf8-string ]; - executableHaskellDepends = [ base blaze-html containers filepath ]; testHaskellDepends = [ base blaze-html containers Diff directory filepath process ]; @@ -98648,6 +103781,8 @@ self: { pname = "hills"; version = "0.1.2.6"; sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh"; + revision = "1"; + editedCabalFile = "1qdn733rdn4c15avgncgns10j2hw0bvnzdkd5f9yzm3s8vq8sqv9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -98676,6 +103811,7 @@ self: { homepage = "http://www.haskell.org/himerge"; description = "Haskell Graphical User Interface for Emerge"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {mozembed = null;}; @@ -98725,21 +103861,21 @@ self: { }) {}; "hindent" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , descriptive, Diff, directory, exceptions, ghc-prim - , haskell-src-exts, hspec, monad-loops, mtl, path, path-io, text - , transformers, unix-compat, utf8-string, yaml + ({ mkDerivation, base, bytestring, Cabal, containers, criterion + , deepseq, descriptive, Diff, directory, exceptions, filepath + , ghc-prim, haskell-src-exts, hspec, monad-loops, mtl, path + , path-io, text, transformers, unix-compat, utf8-string, yaml }: mkDerivation { pname = "hindent"; - version = "5.2.4.1"; - sha256 = "0m35gd2r49cnaxsn9k82g8arj5pz66glsijlji2g77psd9a3flff"; + version = "5.2.5"; + sha256 = "19lckzwsqy8d1wry7hlg5vcg10dc5isai1z0n8srap5hlqvifw1g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers exceptions haskell-src-exts monad-loops - mtl text transformers utf8-string yaml + base bytestring Cabal containers directory exceptions filepath + haskell-src-exts monad-loops mtl text transformers utf8-string yaml ]; executableHaskellDepends = [ base bytestring deepseq descriptive directory exceptions ghc-prim @@ -98811,9 +103947,12 @@ self: { pname = "hinduce-classifier-decisiontree"; version = "0.0.0.1"; sha256 = "1hdz4lbbpy2yc5j7chkagjvslsakmv3hbz2s7lpz0isfq7ls9idl"; + revision = "1"; + editedCabalFile = "16zh2f474ga3s1jzg58hv6q103gdxb3kl25g2cj0k14jxr4k15a2"; libraryHaskellDepends = [ base convertible hinduce-classifier hinduce-missingh layout ]; + homepage = "https://github.com/roberth/hinduce-classifier-decisiontree#readme"; description = "Decision Tree Classifiers for hInduce"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -98855,6 +103994,8 @@ self: { pname = "hinotify"; version = "0.3.9"; sha256 = "16fzql0s34my9k1ib4rdjf9fhhijkmmbrvi148f865m51160wj7j"; + revision = "1"; + editedCabalFile = "0df5pak0586626k3ryzg2lb26ys562l3i94jr9vpa0krs8iia209"; libraryHaskellDepends = [ async base containers directory unix ]; testHaskellDepends = [ base directory ]; homepage = "https://github.com/kolmodin/hinotify.git"; @@ -98862,6 +104003,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hinotify_0_3_10" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , unix + }: + mkDerivation { + pname = "hinotify"; + version = "0.3.10"; + sha256 = "17ax3n68a5c2ddazp86aciliskrh6znd3bnry0wcllmb6dbpsaxg"; + revision = "1"; + editedCabalFile = "07z0n5rvki3w0kjr190bwv7sq8p3myspv8999ilz9rlsqf5a0324"; + libraryHaskellDepends = [ async base bytestring containers unix ]; + testHaskellDepends = [ base bytestring directory unix ]; + homepage = "https://github.com/kolmodin/hinotify.git"; + description = "Haskell binding to inotify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hinotify-bytestring" = callPackage ({ mkDerivation, base, bytestring, containers, directory , posix-paths, unix, utf8-string @@ -98879,7 +104038,6 @@ self: { homepage = "https://github.com/hasufell/hinotify-bytestring.git"; description = "Haskell binding to inotify, using ByteString filepaths"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hinquire" = callPackage @@ -98929,8 +104087,8 @@ self: { pname = "hint"; version = "0.7.0"; sha256 = "0mc17qdq0wb57zgh755viwcnby2jkmyv9r7fvq5jwsxx91c776i9"; - revision = "1"; - editedCabalFile = "07afndz6accq6g4d90xhvjh84ybhbffk5xl1qb3jrymf9vj5ad50"; + revision = "2"; + editedCabalFile = "1w96sfg6vlrw5q7cjdg1rz9jf2yl47fyas9qg3jfa9bcfmvs8cg2"; libraryHaskellDepends = [ base directory exceptions filepath ghc ghc-paths mtl random unix ]; @@ -98982,6 +104140,7 @@ self: { homepage = "https://github.com/LTI2000/hinterface"; description = "Haskell / Erlang interoperability library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinvaders" = callPackage @@ -99295,6 +104454,8 @@ self: { pname = "histogram-fill"; version = "0.8.5.0"; sha256 = "0csijwl60v81inn7awl27b302c9ibblplr58ka7xih17dxyidpgv"; + revision = "1"; + editedCabalFile = "0pa5i5187g0y7r7ngy4gf9lqp76k9saz5qjri4nx0f98kwsacagg"; libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ]; benchmarkHaskellDepends = [ base criterion mwc-random vector ]; homepage = "https://github.com/Shimuuar/histogram-fill/"; @@ -99302,6 +104463,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "histogram-fill_0_9_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-prim, mwc-random + , primitive, vector + }: + mkDerivation { + pname = "histogram-fill"; + version = "0.9.0.0"; + sha256 = "00j4ncqy0s5wil158wx1f8x0n2mj4ki2hgs4hmkrx0vbkc2pil56"; + libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; + homepage = "https://github.com/Shimuuar/histogram-fill/"; + description = "Library for histograms creation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "histogram-fill-binary" = callPackage ({ mkDerivation, base, binary, histogram-fill, vector }: mkDerivation { @@ -99481,29 +104658,6 @@ self: { }) {}; "hjsonpointer" = 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; - }) {}; - - "hjsonpointer_1_3_0" = callPackage ({ mkDerivation, aeson, base, hashable, hspec, http-types , QuickCheck, semigroups, text, unordered-containers, vector }: @@ -99536,8 +104690,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.6.3"; - sha256 = "1phvxkwqxzsi7jzxs4z2zsak7hsgfqvld7m95jk1a0qysxf9gzx3"; + version = "1.7.2"; + sha256 = "1czxfwfhl7zxx8385x8qskiym8qb1fpjdxmbywl8p4p102cb9083"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-types pcre-heavy profunctors @@ -99552,24 +104706,27 @@ self: { homepage = "https://github.com/seagreen/hjsonschema"; description = "JSON Schema library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hjsonschema_1_7_1" = callPackage + "hjsonschema_1_8_0" = 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 + , http-client, http-client-tls, http-types, pcre-heavy, profunctors + , protolude, QuickCheck, safe-exceptions, scientific, semigroups + , text, unordered-containers, vector, wai-app-static, warp }: mkDerivation { pname = "hjsonschema"; - version = "1.7.1"; - sha256 = "0x9w33scdnbfdmadxpx2c4fgkmpvny9ipsl2y7fq56zr6fa0ybfz"; + version = "1.8.0"; + sha256 = "06jf3f7samp5mq3771ywv6r458kkyav4psagkkdqavrx53s4y4xl"; + revision = "1"; + editedCabalFile = "0c0y28js9jj10hmbk2syqfv681jp3px2ps02b1n99sz84va70h4i"; 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 + hjsonpointer http-client http-client-tls http-types pcre-heavy + profunctors protolude QuickCheck safe-exceptions scientific + semigroups text unordered-containers vector ]; testHaskellDepends = [ aeson async base bytestring directory filepath hjsonpointer hspec @@ -99614,8 +104771,8 @@ self: { "hlatex" = callPackage ({ mkDerivation, base, base-unicode-symbols, containers, derive - , directory, filepath, frquotes, mtl, process, template-haskell - , transformers, uniplate, utf8-string + , directory, filepath, mtl, process, template-haskell, transformers + , uniplate, utf8-string }: mkDerivation { pname = "hlatex"; @@ -99627,9 +104784,6 @@ self: { base base-unicode-symbols containers derive directory filepath mtl process template-haskell transformers uniplate utf8-string ]; - executableHaskellDepends = [ - base base-unicode-symbols containers frquotes mtl transformers - ]; description = "A library to build valid LaTeX files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -99704,34 +104858,31 @@ self: { "hledger" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , cmdargs, containers, criterion, csv, data-default, Diff + , cmdargs, containers, criterion, csv, data-default, Decimal, Diff , 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 + , hledger-lib, html, HUnit, lucid, 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, utility-ht, wizards }: mkDerivation { pname = "hledger"; - version = "1.4"; - sha256 = "146llzlpijcai3cfqcd4l4dcyjq6j6wd6pinkllja73vpx7wyi75"; - revision = "1"; - editedCabalFile = "16q9ji8qrgpxchxmx0k77qq3hhfz5h09qyc7r3pkav04nx3pv1sg"; + version = "1.9"; + sha256 = "10lsh1rayzg7gri6b2mn01ncjziga5dzw0s5a91068brrrf4rymm"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Diff 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 utility-ht wizards + data-default Decimal Diff directory file-embed filepath hashable + haskeline here hledger-lib HUnit lucid megaparsec mtl mtl-compat + old-time pretty-show process regex-tdfa safe shakespeare split + tabular temporary terminfo text time transformers + unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv - data-default directory file-embed filepath haskeline here + data-default Decimal 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 utility-ht @@ -99739,7 +104890,7 @@ self: { ]; testHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv - data-default directory file-embed filepath haskeline here + data-default Decimal 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 @@ -99764,13 +104915,10 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.4"; - sha256 = "00vpl1ch1v80f37y8yn2psdzm7ccxpfn3jp93xqxbasksxfawfa7"; - revision = "1"; - editedCabalFile = "1q3fvasxg32xza2pgf725x0j5dsz4rklng3blyw0kq70bccgdaka"; + version = "1.9"; + sha256 = "00bqsz8hkmx78r9d692kihbpmldkpnsdmpljs3ivi14jfay4avim"; isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring containers Decimal docopt either hledger hledger-lib microlens microlens-platform safe servant-server @@ -99779,7 +104927,6 @@ self: { homepage = "http://hledger.org"; description = "Web API server for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-chart" = callPackage @@ -99806,8 +104953,8 @@ self: { ({ mkDerivation, base, hledger-lib, text, time }: mkDerivation { pname = "hledger-diff"; - version = "0.2.0.11"; - sha256 = "1y5f7xdw1rriz2d7qxnkywyjsa09bk6712rks3l1zkihi5i3fnr7"; + version = "0.2.0.13"; + sha256 = "0kngmnpn5qk76hbf1ynfz9zfzwvsslq7klih78k103zl76ggdvsv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hledger-lib text time ]; @@ -99820,37 +104967,34 @@ self: { "hledger-iadd" = callPackage ({ mkDerivation, base, brick, containers, directory, free , hledger-lib, hspec, megaparsec, microlens, microlens-th - , optparse-applicative, QuickCheck, semigroups, text, text-format - , text-zipper, time, transformers, unordered-containers, vector - , vty, xdg-basedir + , optparse-applicative, QuickCheck, semigroups, text, text-zipper + , time, transformers, unordered-containers, vector, vty + , xdg-basedir }: mkDerivation { pname = "hledger-iadd"; - version = "1.2.6"; - sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36"; - revision = "6"; - editedCabalFile = "06bk66lcd6ps370nwqns0dn00vxivg27hhln5bz57syjqlamfd0j"; + version = "1.3.4"; + sha256 = "1dii629ynrb04q4hmli6zxpz1ylkw0rm1vf8jrrcm81drvdxw6qm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers directory free hledger-lib megaparsec microlens microlens-th optparse-applicative semigroups text - text-format text-zipper time transformers unordered-containers - vector vty xdg-basedir + text-zipper time transformers unordered-containers vector vty + xdg-basedir ]; executableHaskellDepends = [ base brick directory free hledger-lib megaparsec microlens - optparse-applicative text text-format text-zipper time transformers + optparse-applicative text text-zipper time transformers unordered-containers vector vty xdg-basedir ]; testHaskellDepends = [ - base free hledger-lib hspec megaparsec QuickCheck text text-format - text-zipper time transformers vector + base free hledger-lib hspec megaparsec QuickCheck text text-zipper + time transformers vector ]; homepage = "https://github.com/hpdeifel/hledger-iadd#readme"; description = "A terminal UI as drop-in replacement for hledger add"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-interest" = callPackage @@ -99878,8 +105022,8 @@ self: { }: mkDerivation { pname = "hledger-irr"; - version = "0.1.1.11"; - sha256 = "1rxpv70xfr7z8yn65dcac1a7l4mb2p1z30ld4bw75gr34lkirb1y"; + version = "0.1.1.13"; + sha256 = "16y195h5wjs8vrccs18dx65kz3xrcifcwy1ggrsblf0kgml0cj7l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99893,31 +105037,28 @@ self: { "hledger-lib" = callPackage ({ 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 + , Decimal, deepseq, directory, doctest, easytest, extra, 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 }: mkDerivation { pname = "hledger-lib"; - version = "1.4"; - sha256 = "15hyrpn0ifwx4x22hggjdm1xz0jyk8p5wnrynzxy9ali0wci1qxq"; - revision = "1"; - editedCabalFile = "0nyf7cvv5qhz1n48qj3ib1d56q694zj1b1wfqlrzzfj2a7mi2p4c"; - enableSeparateDataOutput = true; + version = "1.9"; + sha256 = "0bm4vdzjxyxjmq000wng6hkx9kinbzw5hx7m0i1vjj500gcp0zq1"; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring - cmdargs containers csv data-default Decimal deepseq directory + cmdargs containers csv data-default Decimal deepseq directory extra filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec - pretty-show regex-tdfa safe semigroups split text time transformers - uglymemo utf8-string + pretty-show regex-tdfa safe split text time transformers uglymemo + utf8-string ]; testHaskellDepends = [ 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 + doctest easytest extra 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 ]; @@ -99935,13 +105076,10 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.4"; - sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33"; - revision = "5"; - editedCabalFile = "0lplgg7xffpjk6qjzvjp2klmb178bc06wnyq0qlh6fm29g8d18yp"; + version = "1.9"; + sha256 = "0z5w69vxl8f1gdc8753ndnm4mcm5xw3abjfqidyrn3gsi800pxzd"; isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; executableHaskellDepends = [ ansi-terminal async base base-compat brick cmdargs containers data-default directory filepath fsnotify hledger hledger-lib HUnit @@ -99984,13 +105122,10 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.4"; - sha256 = "1l5mxvhgvn3q1ds9qmqkdmrs82619nvs13gmjsynr0vbbx52zw7h"; - revision = "1"; - editedCabalFile = "14ayvky2pjaj2hnxajpb5h0hi2r6fl2ps401abn4apk36y3w16ab"; + version = "1.9.1"; + sha256 = "0fkanj21ivrf5la7zxij1jws955hc0y98n2lg4qkbyw5fz54i9dj"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat blaze-html blaze-markup bytestring clientsession cmdargs conduit-extra data-default directory filepath hjsmin @@ -100084,7 +105219,24 @@ self: { pname = "hlibsass"; version = "0.1.6.1"; sha256 = "0j88b1fm0al8w7h6sdw89jpsfs8aplj9q050k41gaib44r7hl4iy"; - configureFlags = [ "-fexternallibsass" ]; + 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;}; + + "hlibsass_0_1_7_0" = callPackage + ({ mkDerivation, base, Cabal, directory, hspec, libsass }: + mkDerivation { + pname = "hlibsass"; + version = "0.1.7.0"; + sha256 = "0vcz3hndksfp9rmz07y67rvqinaz7cxzvrhjcwy30wc79m25r9v2"; + configureFlags = [ "-fexternalLibsass" ]; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsass ]; @@ -100104,8 +105256,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.0.10"; - sha256 = "1kmjgdj652lx269sppa35wga8a2376nzjd548nnc6h52kdpgix30"; + version = "2.1.3"; + sha256 = "08i7b894vm0p8ipilvhx0pp04r6zgrf44w0mnlmsydq971y59g3a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -100121,6 +105273,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hlint-test" = callPackage + ({ mkDerivation, base, hlint }: + mkDerivation { + pname = "hlint-test"; + version = "0.1.0.0"; + sha256 = "1lvbhhcxs9axvpm5m3axni30aafa9d32jrx00072kywm536gnnny"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hlint ]; + executableHaskellDepends = [ base hlint ]; + homepage = "https://github.com/Siprj/hlint-test#readme"; + description = "Run hlint in test suite"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hlist" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hlist"; + version = "0.0.0.0"; + sha256 = "128y1l4bjyrsvx188mx58x8a98j7jk931h0nv5bprpxjkc71c32k"; + libraryHaskellDepends = [ base ]; + description = "Heterogeneous list"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hlogger" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -100152,6 +105331,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hlrdb" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite + , hashable, hedis, hlrdb-core, memory, random, store, time + , unordered-containers + }: + mkDerivation { + pname = "hlrdb"; + version = "0.2.0.0"; + sha256 = "1x7vw2mcwd703dr5mjghsjd04yxwl6z7wzdysgk75i4l7f0lcqfq"; + libraryHaskellDepends = [ + base base64-bytestring bytestring cryptonite hashable hedis + hlrdb-core memory random store time unordered-containers + ]; + homepage = "https://github.com/identicalsnowflake/hlrdb"; + description = "High-level Redis Database"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hlrdb-core" = callPackage + ({ mkDerivation, base, bytestring, hashable, hedis, lens, mtl + , profunctors, random, time, unordered-containers + }: + mkDerivation { + pname = "hlrdb-core"; + version = "0.1.1.0"; + sha256 = "0jxpzbwlcf8ix08sbxppcbvlvq2hhs8ya0mkk9b262zb2bfv3m4i"; + libraryHaskellDepends = [ + base bytestring hashable hedis lens mtl profunctors random time + unordered-containers + ]; + homepage = "https://github.com/identicalsnowflake/hlrdb-core"; + description = "High-level Redis Database Core API"; + license = stdenv.lib.licenses.mit; + }) {}; + "hls" = callPackage ({ mkDerivation, base, containers, hcg-minus, hps }: mkDerivation { @@ -100163,6 +105378,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hls"; description = "Haskell Lindenmayer Systems"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlwm" = callPackage @@ -100176,7 +105392,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base stm transformers unix X11 ]; - executableHaskellDepends = [ base stm transformers unix X11 ]; homepage = "https://github.com/hpdeifel/hlwm-haskell"; description = "Bindings to the herbstluftwm window manager"; license = stdenv.lib.licenses.bsd2; @@ -100184,13 +105399,15 @@ self: { }) {}; "hly" = callPackage - ({ mkDerivation, base, directory, filepath, hmt, process }: + ({ mkDerivation, base, directory, filepath, hmt, process, split }: mkDerivation { pname = "hly"; - version = "0.15"; - sha256 = "192szfq39g3fdcdsxj4bsi13bfha8gjbqbixav3iywmdsgxp1hj8"; + version = "0.16"; + sha256 = "0ccd5w4vzwki6p9dc69hx65ac1mkbjh5dx96gp2cb8qj3w3cas2m"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base directory filepath hmt process ]; + libraryHaskellDepends = [ + base directory filepath hmt process split + ]; homepage = "http://rd.slavepianos.org/t/hly"; description = "Haskell LilyPond"; license = "GPL"; @@ -100233,44 +105450,48 @@ self: { "hmatrix" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq - , openblasCompat, random, split, storable-complex, vector + , openblasCompat, random, semigroups, split, storable-complex + , vector }: mkDerivation { pname = "hmatrix"; - version = "0.18.0.0"; - sha256 = "1ziwj4d52hakb8lsw8qyy99r5h5mm50bgj7i3s47l8pp9bxnsxim"; - configureFlags = [ "-fopenblas" ]; + version = "0.18.2.0"; + sha256 = "0q452gpmyxb0qp7pnwyrvvw3nc650qm68z3g0cd88s1x2j0xq34n"; + configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; libraryHaskellDepends = [ - array base binary bytestring deepseq random split storable-complex - vector + array base binary bytestring deepseq random semigroups split + storable-complex vector ]; librarySystemDepends = [ openblasCompat ]; - preConfigure = "sed -i hmatrix.cabal -e '/\\/usr\\//D'"; homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openblasCompat;}; - "hmatrix_0_18_1_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq - , openblasCompat, random, split, storable-complex, vector + "hmatrix-backprop" = callPackage + ({ mkDerivation, ANum, backprop, base, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog + , hmatrix, hmatrix-vector-sized, microlens, microlens-platform + , vector, vector-sized }: mkDerivation { - pname = "hmatrix"; - version = "0.18.1.0"; - sha256 = "07zkwvg872hfk6jyn4s54ws8mvclynazaxf7fsbqi16dmf9dn61c"; - configureFlags = [ "-fopenblas" ]; + pname = "hmatrix-backprop"; + version = "0.1.2.0"; + sha256 = "0lrdy5zxl8kvzfsgb4i5lqvdaqpnwixgjnjsvkm89fw6ms86bqac"; libraryHaskellDepends = [ - array base binary bytestring deepseq random split storable-complex - vector + ANum backprop base finite-typelits ghc-typelits-knownnat + ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens + vector vector-sized ]; - librarySystemDepends = [ openblasCompat ]; - preConfigure = "sed -i hmatrix.cabal -e '/\\/usr\\//D'"; - homepage = "https://github.com/albertoruiz/hmatrix"; - description = "Numeric Linear Algebra"; + testHaskellDepends = [ + backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized + microlens microlens-platform vector-sized + ]; + homepage = "https://github.com/mstksg/hmatrix-backprop#readme"; + description = "hmatrix operations lifted for backprop"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) openblasCompat;}; + }) {}; "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, liblapack, transformers }: @@ -100316,8 +105537,8 @@ self: { }: mkDerivation { pname = "hmatrix-gsl"; - version = "0.18.0.1"; - sha256 = "0mflm7zg6c6a5vy092pa429rzpyv5drc1589r3x4fbmvcyqc79gx"; + version = "0.18.2.0"; + sha256 = "0gvghbyavlk808826qwy4r667i9mxf2ml5xjsbna5slx4sbj7jfs"; libraryHaskellDepends = [ array base hmatrix process random vector ]; @@ -100398,8 +105619,8 @@ self: { ({ mkDerivation, base, doctest, hmatrix, nlopt-haskell, vector }: mkDerivation { pname = "hmatrix-nlopt"; - version = "0.1.0.0"; - sha256 = "12h2svm2x3bc9ivii90f8cr4npwpagchazlmgj36x381aqradsf2"; + version = "0.1.1.0"; + sha256 = "1fgicpzi811ifdyrc8gzd8dgb0f14lw92rdidmbps3yisczysz29"; libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/peddie/hmatrix-nlopt"; @@ -100409,17 +105630,17 @@ self: { }) {}; "hmatrix-quadprogpp" = callPackage - ({ mkDerivation, base, hmatrix, QuadProgpp, vector }: + ({ mkDerivation, base, hmatrix, quadprog, vector }: mkDerivation { pname = "hmatrix-quadprogpp"; - version = "0.3.0.1"; - sha256 = "1m6iag3vv9vlxzigg0pzb4ci7x5jc20s6zxm9cz6yamgsx52iadl"; + version = "0.4.0.0"; + sha256 = "0bvgph7x5niryn4f1ah6726np2nv8xnrvqn3hbiw8f5m7314iv5l"; libraryHaskellDepends = [ base hmatrix vector ]; - librarySystemDepends = [ QuadProgpp ]; + librarySystemDepends = [ quadprog ]; description = "Bindings to the QuadProg++ quadratic programming library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {QuadProgpp = null;}; + }) {quadprog = null;}; "hmatrix-repa" = callPackage ({ mkDerivation, base, hmatrix, repa, vector }: @@ -100443,7 +105664,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Interface to GSL special functions"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmatrix-static" = callPackage @@ -100514,6 +105734,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hmatrix-vector-sized" = callPackage + ({ mkDerivation, base, ghc-typelits-knownnat, hedgehog, hmatrix + , vector, vector-sized + }: + mkDerivation { + pname = "hmatrix-vector-sized"; + version = "0.1.1.0"; + sha256 = "079vq2n3w3f32dnlyxa8kn6dif0dd6nr8n1g9lnfw0d339cxqklb"; + libraryHaskellDepends = [ base hmatrix vector vector-sized ]; + testHaskellDepends = [ + base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized + ]; + homepage = "https://github.com/mstksg/hmatrix-vector-sized#readme"; + description = "Conversions between hmatrix and vector-sized types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hmeap" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-lexing , delimited-text, parsec @@ -100611,7 +105848,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Binding to the OS level MIDI services"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmk" = callPackage @@ -100653,17 +105889,17 @@ self: { }) {}; "hmm-hmatrix" = callPackage - ({ mkDerivation, array, base, containers, explicit-exception - , hmatrix, lazy-csv, non-empty, random, semigroups, transformers - , utility-ht + ({ mkDerivation, array, base, containers, deepseq + , explicit-exception, hmatrix, lazy-csv, non-empty, random + , semigroups, transformers, utility-ht }: mkDerivation { pname = "hmm-hmatrix"; - version = "0.0.1"; - sha256 = "1kkikv3spnvqms59980p8aappw3wh26y9qs2c8ykia5fpz9zag4h"; + version = "0.1"; + sha256 = "1ww2hxy9s9d2mywf5v5ka5fac9105ir3frm9vafgw2ydq64rdivx"; libraryHaskellDepends = [ - array base containers explicit-exception hmatrix lazy-csv non-empty - random semigroups transformers utility-ht + array base containers deepseq explicit-exception hmatrix lazy-csv + non-empty random semigroups transformers utility-ht ]; homepage = "http://hub.darcs.net/thielema/hmm-hmatrix"; description = "Hidden Markov Models using HMatrix primitives"; @@ -100697,8 +105933,8 @@ self: { ({ mkDerivation, base, integer-gmp, mpfr }: mkDerivation { pname = "hmpfr"; - version = "0.4.3"; - sha256 = "09q4gmj2gr3krh7vpkc8xwiy874d7mr6v57hv2i3n481yhky0yir"; + version = "0.4.4"; + sha256 = "1x8n5245rm0brjl7vhcabazh1k69dcjdas70pnrnlkx26bqfpb9b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base integer-gmp ]; librarySystemDepends = [ mpfr ]; @@ -100708,24 +105944,25 @@ self: { }) {inherit (pkgs) mpfr;}; "hmt" = callPackage - ({ mkDerivation, array, base, bytestring, colour, containers - , data-ordlist, directory, filepath, lazy-csv, logict - , multiset-comb, parsec, permutation, primes, safe, split - , utf8-string + ({ mkDerivation, aeson, array, base, bytestring, colour, containers + , data-ordlist, directory, fgl, filepath, lazy-csv, logict + , modular-arithmetic, multiset-comb, parsec, permutation, primes + , random, safe, split, text }: mkDerivation { pname = "hmt"; - version = "0.15"; - sha256 = "051kgsh9nl5f1nw8a24x7ds18g6ppzbhk3d9lf74nvvnccnzg3a9"; + version = "0.16"; + sha256 = "1s6fjyphq57wh15vryj6y493ikaqa3g14x6hj9lg2h6wf6g8042h"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring colour containers data-ordlist directory - filepath lazy-csv logict multiset-comb parsec permutation primes - safe split utf8-string + aeson array base bytestring colour containers data-ordlist + directory fgl filepath lazy-csv logict modular-arithmetic + multiset-comb parsec permutation primes random safe split text ]; homepage = "http://rd.slavepianos.org/t/hmt"; description = "Haskell Music Theory"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmt-diagrams" = callPackage @@ -100744,6 +105981,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hmt-diagrams"; description = "Haskell Music Theory Diagrams"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmumps" = callPackage @@ -100798,21 +106036,20 @@ self: { "hnix" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, criterion - , data-fix, deepseq, deriving-compat, parsers, semigroups, tasty - , tasty-hunit, tasty-th, text, transformers, trifecta - , unordered-containers + , data-fix, deepseq, deriving-compat, parsers, regex-tdfa + , regex-tdfa-text, semigroups, tasty, tasty-hunit, tasty-th, text + , transformers, trifecta, unordered-containers }: mkDerivation { pname = "hnix"; - version = "0.3.4"; - sha256 = "1wnvbal093c207vr68i0zyrxvmb3yyxdr8p7lbw2yy4ari2hi2gc"; - revision = "1"; - editedCabalFile = "01svkjznkz51742k3hcc0ssz5m0kymk53ydrdwg4a24ygvb408iw"; + version = "0.4.0"; + sha256 = "0rgx97ckv5zvly6x76h7nncswfw0ik4bhnlj8n5bpl4rqzd7d4fd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base containers data-fix deepseq deriving-compat - parsers semigroups text transformers trifecta unordered-containers + parsers regex-tdfa regex-tdfa-text semigroups text transformers + trifecta unordered-containers ]; executableHaskellDepends = [ ansi-wl-pprint base containers data-fix deepseq @@ -100854,6 +106091,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; license = stdenv.lib.licenses.unfree; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hnormalise" = callPackage @@ -100869,8 +106107,8 @@ self: { }: mkDerivation { pname = "hnormalise"; - version = "0.5.0.0"; - sha256 = "01xiqkm94amm7kdwvdgcm3f4slylmvc04qxkbddh2xsm8wz4c9a2"; + version = "0.5.1.0"; + sha256 = "11p207fmkfkc6jimnq9y30xj3l1msc5r090qvg1klmyvmhjkh702"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100937,52 +106175,23 @@ self: { }) {}; "hoauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , http-conduit, http-types, microlens, text, unordered-containers - , uri-bytestring, uri-bytestring-aeson, wai, warp - }: - mkDerivation { - pname = "hoauth2"; - version = "1.3.0"; - sha256 = "1aymrl28gs4dlzfxcnglfhnxk9l9ws0va0yvi1a966yfp0ps7w1n"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-conduit http-types microlens - text unordered-containers uri-bytestring uri-bytestring-aeson - ]; - executableHaskellDepends = [ - aeson base bytestring containers http-conduit http-types text - uri-bytestring wai warp - ]; - homepage = "https://github.com/freizl/hoauth2"; - description = "Haskell OAuth2 authentication client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoauth2_1_5_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , http-conduit, http-types, microlens, text, unordered-containers - , uri-bytestring, uri-bytestring-aeson, wai, warp + ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit + , http-types, microlens, text, unordered-containers, uri-bytestring + , uri-bytestring-aeson }: mkDerivation { pname = "hoauth2"; - version = "1.5.0"; - sha256 = "0dfrqdjrvc94f94xl8vqggdvzbkiwj3xfkmwilkskvnfg1s1hg8q"; + version = "1.7.1"; + sha256 = "05l2ngns8p3jvx20iv8w4yrzn1agfxafgaynfwv0340czchl7s5s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring exceptions http-conduit http-types microlens text unordered-containers uri-bytestring uri-bytestring-aeson ]; - executableHaskellDepends = [ - aeson base bytestring containers http-conduit http-types text - uri-bytestring wai warp - ]; homepage = "https://github.com/freizl/hoauth2"; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hob" = callPackage @@ -101071,6 +106280,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {ocilib = null;}; + "hocker" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, async, base + , bytestring, concurrentoutput, containers, cryptonite, data-fix + , deepseq, directory, exceptions, filepath, foldl, hnix + , http-client, http-types, lens, lens-aeson, lifted-base, memory + , mtl, neat-interpolation, network, network-uri, nix-paths + , optional-args, optparse-applicative, optparse-generic, pooled-io + , pureMD5, scientific, tar, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, temporary, text, time + , transformers, turtle, unordered-containers, uri-bytestring + , vector, wreq, zlib + }: + mkDerivation { + pname = "hocker"; + version = "1.0.5"; + sha256 = "0xv22kiw44y72asrnk027h9gxpfhjzgdm8sbcy70s4ipn8n62hha"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-wl-pprint async base bytestring + concurrentoutput containers cryptonite data-fix deepseq directory + exceptions filepath foldl hnix http-client http-types lens + lens-aeson lifted-base memory mtl neat-interpolation network + network-uri nix-paths optparse-applicative optparse-generic + pooled-io pureMD5 scientific tar temporary text time transformers + turtle unordered-containers uri-bytestring vector wreq zlib + ]; + executableHaskellDepends = [ + base bytestring cryptonite data-fix filepath hnix lens mtl network + optional-args optparse-applicative optparse-generic temporary text + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint base bytestring containers cryptonite mtl + network network-uri tasty tasty-golden tasty-hunit tasty-quickcheck + tasty-smallcheck text unordered-containers + ]; + homepage = "https://github.com/awakesecurity/hocker#readme"; + description = "Interact with the docker registry and generate nix build instructions"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hodatime" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , directory, filepath, mtl, random, tasty, tasty-hunit @@ -101185,6 +106437,7 @@ self: { ]; description = "Bindings to the Toggl.com REST API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hogre" = callPackage @@ -101248,6 +106501,7 @@ self: { libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hol" = callPackage @@ -101278,7 +106532,6 @@ self: { ]; description = "Higher order logic"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hold-em" = callPackage @@ -101349,6 +106602,7 @@ self: { homepage = "http://github.com/yogsototh/holy-project"; description = "Start your Haskell project with cabal, git and tests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "homeomorphic" = callPackage @@ -101404,6 +106658,7 @@ self: { homepage = "github.com/mikeizbicki/homoiconic"; description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "homplexity" = callPackage @@ -101456,7 +106711,6 @@ self: { homepage = "https://lambda.xyz/honk/"; description = "Cross-platform interface to the PC speaker"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hoobuddy" = callPackage @@ -101483,11 +106737,10 @@ self: { ({ mkDerivation, array, base, FPretty, ghc-prim }: mkDerivation { pname = "hood"; - version = "0.3"; - sha256 = "08k15fvrqjnh3fab90ck3b3mb5wr15js6bw76m9k86nh0pxjv5pi"; - revision = "1"; - editedCabalFile = "0r2awfxb2xfvfr725g7a6a0s5d850fqglxv4z6j1syvlgyfdzfgr"; + version = "0.3.1"; + sha256 = "0bi1knfp6h6x7rrw5gggiip0h7ynhw2ds7k2q2fynrhsg9jdp5qv"; libraryHaskellDepends = [ array base FPretty ghc-prim ]; + testHaskellDepends = [ base ghc-prim ]; homepage = "http://ku-fpg.github.io/software/hood"; description = "Debugging by observing in place"; license = stdenv.lib.licenses.bsd3; @@ -101650,6 +106903,7 @@ self: { homepage = "http://ianwookim.org/hoodle"; description = "Hoodle file parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoodle-publish" = callPackage @@ -101717,19 +106971,54 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoogle" = callPackage + "hoogle_5_0_14" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot , js-jquery, mmap, network, network-uri, old-locale, process - , process-extras, QuickCheck, resourcet, tar, template-haskell + , process-extras, QuickCheck, resourcet, storable-tuple, tar + , template-haskell, text, time, transformers, uniplate, utf8-string + , vector, wai, wai-logger, warp, warp-tls, zlib + }: + mkDerivation { + pname = "hoogle"; + version = "5.0.14"; + sha256 = "1y5vjwp60s35h13bnhjh4ga731m3vz004dbg8w5s7mwnfk5akkz7"; + revision = "3"; + editedCabalFile = "14973295rif9gsyaxfrw7y5p59sxnz4znki3jm3bk73y0b3j1l5d"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary bytestring cmdargs conduit conduit-extra + connection containers deepseq directory extra filepath + haskell-src-exts http-conduit http-types js-flot js-jquery mmap + network network-uri old-locale process process-extras QuickCheck + resourcet storable-tuple tar template-haskell text time + transformers uniplate utf8-string vector wai wai-logger warp + warp-tls zlib + ]; + executableHaskellDepends = [ base ]; + testTarget = "--test-option=--no-net"; + homepage = "http://hoogle.haskell.org/"; + description = "Haskell API Search"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hoogle" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit + , conduit-extra, connection, containers, deepseq, directory, extra + , filepath, haskell-src-exts, http-conduit, http-types, js-flot + , js-jquery, mmap, network, network-uri, old-locale, process-extras + , QuickCheck, resourcet, storable-tuple, tar, template-haskell , text, time, transformers, uniplate, utf8-string, vector, wai , wai-logger, warp, warp-tls, zlib }: mkDerivation { pname = "hoogle"; - version = "5.0.13"; - sha256 = "1wxdzkifgm3bnpzr45sf49dyqwnb8bnc5wmqbv5yhxv19gmjk8kn"; + version = "5.0.17.3"; + sha256 = "174gp41v0krzj37m75pnr3aawyhkbk2wq4q6zk2z3zh0avvvmgk6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -101737,8 +107026,8 @@ self: { aeson base binary bytestring cmdargs conduit conduit-extra connection containers deepseq directory extra filepath haskell-src-exts http-conduit http-types js-flot js-jquery mmap - network network-uri old-locale process process-extras QuickCheck - resourcet tar template-haskell text time transformers uniplate + network network-uri old-locale process-extras QuickCheck resourcet + storable-tuple tar template-haskell text time transformers uniplate utf8-string vector wai wai-logger warp warp-tls zlib ]; executableHaskellDepends = [ base ]; @@ -101788,8 +107077,10 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.1.1.0"; - sha256 = "11gbk92wqcakmqqrvggjypxxpgdccacqbrrzicwy8113hd6kiw75"; + version = "0.2"; + sha256 = "17sj62b78a22alq9hpsrjcri5yxz7yzxdar521yd6x7jv3xxpix2"; + revision = "1"; + editedCabalFile = "1g4zijk8f4rff0g2y0m0308zmnwsbx0a3swbx8i8gvfd6v1g4cf6"; libraryHaskellDepends = [ base bytestring HsOpenSSL HsOpenSSL-x509-system network socks ]; @@ -101807,6 +107098,8 @@ self: { pname = "hoopl"; version = "3.10.2.2"; sha256 = "15rbb9a8mza3zv8h3p237zhmy29bxc4k48ik27kzzj7islb16yq9"; + revision = "2"; + editedCabalFile = "0j6pz4jzhvviyrhhn1j22ikmjvzrg60nzvq26lbpkcb6y4q6rlyx"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers filepath mtl parsec test-framework @@ -101894,10 +107187,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.19.5"; - sha256 = "1yb6slxphz7lghclv1cjs2kwig1ll1dxzcaf4js26nanq280lqz0"; - revision = "2"; - editedCabalFile = "1w9ban4w6zm7cknfnlzhgx649xg2j0vsrhqdlnd5g8qzcbbhh0si"; + version = "0.20.1"; + sha256 = "1nidlipz0isj65vg6zhi79ln14i9kxvnn164s0haf086vm81kw32"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -101910,7 +107201,7 @@ self: { wl-pprint-extras wl-pprint-terminfo yaml ]; executableToolDepends = [ alex happy ]; - homepage = "http://floss.scru.org/hopenpgp-tools"; + homepage = "https://salsa.debian.org/clint/hOpenPGP"; description = "hOpenPGP-based command-line tools"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -101996,6 +107287,8 @@ self: { pname = "hopfli"; version = "0.2.2.1"; sha256 = "061as7aa806xzcpch35isrkqbgqhwdy48fs049f491wwb47xqwad"; + revision = "1"; + editedCabalFile = "116jns5im51sb9xiwpx308wz3pr67335633anrf8f704pz8vwjka"; libraryHaskellDepends = [ base bytestring zlib ]; testHaskellDepends = [ base bytestring hspec QuickCheck zlib ]; homepage = "https://github.com/ananthakumaran/hopfli"; @@ -102008,8 +107301,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.3.2"; - sha256 = "04ah438igxykyspzlhpa5y50z1accrb9sxhv2sn8riqfhdz2sych"; + version = "0.4.0"; + sha256 = "186pb32mqwvb5n1a9v2p0cs3g01lrdw5j3p3ddjqdkss7mq6sacz"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -102025,8 +107318,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.3.3"; - sha256 = "18n48kkf6pcmcwb85a74kqh84aadpm1s9jv1r56b43rya8ra3mgw"; + version = "0.4.0"; + sha256 = "0dk5xhxiw697pb1df544yixsfhiivpp8irllvvjbij7hfbivi409"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; @@ -102040,8 +107333,8 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "hoppy-runtime"; - version = "0.3.1"; - sha256 = "0cbnhpwy3m0l7gcarg7xr1f5y6nwdnfa269vvza0fm4fhf3lz6g5"; + version = "0.4.0"; + sha256 = "0vi1i2wa64gdxsc3705vpmimkajf3dz6dakxils1alyxp5ih8f4z"; libraryHaskellDepends = [ base Cabal containers directory filepath ]; @@ -102055,8 +107348,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.3.0"; - sha256 = "0rgvqkslhj6d9craiwb5g75217jh7s34980rpcbjbjba8pscpxjb"; + version = "0.4.0"; + sha256 = "0kb9myfnradifyihigjw08navl5fwcfqznqrp9xjmkwkp8k2h0p5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -102098,6 +107391,7 @@ self: { homepage = "http://akc.is/hops"; description = "Handy Operations on Power Series"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoq" = callPackage @@ -102176,24 +107470,18 @@ self: { }) {}; "hosc" = callPackage - ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion - , data-binary-ieee754, deepseq, network, QuickCheck, test-framework - , test-framework-quickcheck2, time, transformers + ({ mkDerivation, base, binary, blaze-builder, bytestring + , data-binary-ieee754, network, time, transformers }: mkDerivation { pname = "hosc"; - version = "0.15"; - sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf"; + version = "0.16"; + sha256 = "1xj5kkpkzzwfi26n28s0gkr9vzkmvp276n9jb75j2ccbr8q79vbj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary blaze-builder bytestring data-binary-ieee754 network time transformers ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; homepage = "http://rd.slavepianos.org/t/hosc"; description = "Haskell Open Sound Control"; license = "GPL"; @@ -102201,16 +107489,17 @@ self: { "hosc-json" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , hosc, json, text, unordered-containers, utf8-string, vector + , hosc, json, text, transformers, unordered-containers, utf8-string + , vector }: mkDerivation { pname = "hosc-json"; - version = "0.15"; - sha256 = "0sask4nr5njf9grzigldflrbp7460z55fsam1pc3wcnsa575hxhi"; + version = "0.16"; + sha256 = "059wpgvr2vbkdq2gmy8mrwqkqv1zrh2qz499v6i242q0z9m4gr3m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring hosc json text - unordered-containers utf8-string vector + transformers unordered-containers utf8-string vector ]; homepage = "http://rd.slavepianos.org/t/hosc-json"; description = "Haskell Open Sound Control JSON Serialisation"; @@ -102236,6 +107525,7 @@ self: { homepage = "http://rd.slavepianos.org/?t=hosc-utils"; description = "Haskell Open Sound Control Utilities"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {www-minus = null;}; @@ -102314,19 +107604,19 @@ self: { }) {}; "hourglass" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, mtl - , old-locale, tasty, tasty-hunit, tasty-quickcheck, time + ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale + , tasty, tasty-hunit, tasty-quickcheck, time }: mkDerivation { pname = "hourglass"; - version = "0.2.10"; - sha256 = "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym"; + version = "0.2.11"; + sha256 = "0lag9sgj7ndrbfmab6jhszlv413agg0zzaj5r9f2fmf07wqbp9hq"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time ]; benchmarkHaskellDepends = [ - base bytestring criterion deepseq mtl old-locale time + base bytestring deepseq gauge mtl old-locale time ]; homepage = "https://github.com/vincenthz/hs-hourglass"; description = "simple performant time related library"; @@ -102414,8 +107704,8 @@ self: { "hp2any-graph" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , freeglut, GLUT, hp2any-core, mesa, network, OpenGL, parseargs - , process + , freeglut, GLUT, hp2any-core, libGL, libGLU, network, OpenGL + , parseargs, process }: mkDerivation { pname = "hp2any-graph"; @@ -102428,12 +107718,13 @@ self: { base bytestring containers directory filepath GLUT hp2any-core network OpenGL parseargs process ]; - executableSystemDepends = [ freeglut mesa ]; + executableSystemDepends = [ freeglut libGL libGLU ]; homepage = "http://www.haskell.org/haskellwiki/Hp2any"; description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; + inherit (pkgs) libGLU;}; "hp2any-manager" = callPackage ({ mkDerivation, array, base, bytestring, cairo, containers @@ -102491,33 +107782,78 @@ self: { }) {}; "hpack" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal - , containers, deepseq, directory, filepath, Glob, hspec, HUnit - , interpolate, mockery, pretty, QuickCheck, temporary, text - , unordered-containers, yaml + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , http-client, http-client-tls, http-types, HUnit, interpolate + , mockery, pretty, QuickCheck, scientific, template-haskell + , temporary, text, transformers, unordered-containers, vector, yaml }: mkDerivation { pname = "hpack"; - version = "0.19.3"; - sha256 = "16czxklzgxv36s30zaqym80wb3jc40nnd32r8gswb1xi85y97fgr"; + version = "0.27.0"; + sha256 = "1vrbf2b5bin9sdm80bj0jkcwc2d9zh29jh4qjhfvcpk4ggbl8iym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base-compat bytestring Cabal containers deepseq - directory filepath Glob pretty text unordered-containers yaml + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types pretty scientific text transformers unordered-containers + vector yaml ]; executableHaskellDepends = [ - aeson base base-compat bytestring Cabal containers deepseq - directory filepath Glob pretty text unordered-containers yaml + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types pretty scientific text transformers unordered-containers + vector yaml ]; testHaskellDepends = [ - aeson base base-compat bytestring Cabal containers deepseq - directory filepath Glob hspec HUnit interpolate mockery pretty - QuickCheck temporary text unordered-containers yaml + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit interpolate mockery pretty QuickCheck scientific + template-haskell temporary text transformers unordered-containers + vector yaml + ]; + homepage = "https://github.com/sol/hpack#readme"; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hpack_0_28_2" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , http-client, http-client-tls, http-types, HUnit, interpolate + , mockery, pretty, QuickCheck, scientific, template-haskell + , temporary, text, transformers, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.28.2"; + sha256 = "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types pretty scientific text transformers unordered-containers + vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types pretty scientific text transformers unordered-containers + vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit interpolate mockery pretty QuickCheck scientific + template-haskell temporary text transformers unordered-containers + vector 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-convert" = callPackage @@ -102550,6 +107886,32 @@ self: { homepage = "https://github.com/yamadapc/hpack-convert#readme"; description = "Convert Cabal manifests into hpack's package.yamls"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hpack-dhall" = callPackage + ({ mkDerivation, aeson, base, dhall, dhall-json, hpack, hspec + , interpolate, mockery, text, transformers, trifecta + }: + mkDerivation { + pname = "hpack-dhall"; + version = "0.1.0"; + sha256 = "1yz1ypq88lmxdz9728w8q0ag1whwzlkwcdvx8dhyav5k3ifgp2x0"; + revision = "3"; + editedCabalFile = "02pvzwqrs163mgxdydgv6pa1gq75xav68kpjycrxgdbpag6s9ynv"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base dhall dhall-json hpack text transformers trifecta + ]; + testHaskellDepends = [ + aeson base dhall dhall-json hpack hspec interpolate mockery text + transformers trifecta + ]; + homepage = "https://github.com/sol/hpack-dhall#readme"; + description = "Dhall support for Hpack"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpaco" = callPackage @@ -102678,24 +108040,23 @@ self: { "hpath" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions - , hspec, HUnit, process, QuickCheck, simple-sendfile, unix + , hspec, HUnit, IfElse, process, QuickCheck, simple-sendfile, unix , unix-bytestring, utf8-string, word8 }: mkDerivation { pname = "hpath"; - version = "0.8.0"; - sha256 = "19xbzgz51dwjm5w11j170bp8nv0b19qk6b8mx75c367n4xshgxc3"; + version = "0.9.2"; + sha256 = "1b8fni11zk3p3yx6pi9sx6cxq9vm31fqx3gm7y6nz5cykpncsx27"; libraryHaskellDepends = [ - base bytestring deepseq exceptions hspec simple-sendfile unix - unix-bytestring utf8-string word8 + base bytestring deepseq exceptions hspec IfElse simple-sendfile + unix unix-bytestring utf8-string word8 ]; testHaskellDepends = [ - base bytestring doctest hspec HUnit process QuickCheck unix + base bytestring doctest hspec HUnit IfElse process QuickCheck unix unix-bytestring utf8-string ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hpc_0_6_0_3" = callPackage @@ -102793,8 +108154,8 @@ self: { ({ mkDerivation, base, random }: mkDerivation { pname = "hpg"; - version = "0.7"; - sha256 = "0p2a8h9z5kbqpb99rclgkll1yv2in2fni5xvhrrzyphyhpqi1f6a"; + version = "0.8"; + sha256 = "1in245bwnymzxp1bzvzkmfwxs2pxnhw94c9j8z9v3vxvz7g0fygs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random ]; @@ -102804,46 +108165,15 @@ self: { }) {}; "hpio" = callPackage - ({ mkDerivation, async, base, base-compat, bytestring, containers - , directory, doctest, exceptions, filepath, hlint, hspec, mtl - , mtl-compat, optparse-applicative, QuickCheck, text, transformers - , transformers-compat, unix, unix-bytestring - }: - mkDerivation { - pname = "hpio"; - version = "0.8.0.10"; - sha256 = "05cpfym6jb27z557i1954jnz9v3ghjg45h4rjfl9ql54cx6bx429"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat bytestring containers directory exceptions - filepath mtl mtl-compat QuickCheck text transformers - transformers-compat unix unix-bytestring - ]; - executableHaskellDepends = [ - async base base-compat exceptions mtl mtl-compat - optparse-applicative transformers transformers-compat - ]; - testHaskellDepends = [ - async base base-compat bytestring containers directory doctest - exceptions filepath hlint hspec mtl mtl-compat QuickCheck text - transformers transformers-compat unix unix-bytestring - ]; - homepage = "https://github.com/quixoftic/hpio"; - description = "Monads for GPIO in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hpio_0_9_0_2" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory - , doctest, exceptions, filepath, hlint, hspec, monad-control - , monad-logger, mtl, optparse-applicative, protolude, QuickCheck - , text, transformers, transformers-base, unix, unix-bytestring + , doctest, exceptions, filepath, hspec, monad-control, monad-logger + , mtl, optparse-applicative, protolude, QuickCheck, text + , transformers, transformers-base, unix, unix-bytestring }: mkDerivation { pname = "hpio"; - version = "0.9.0.2"; - sha256 = "0jxmmch6y897rk02rql4rs82qmdj3r3xpbsrv75sgc2mb09cx2zy"; + version = "0.9.0.6"; + sha256 = "07443kb6w1kwcg78j8jaffb5pblv9si7bvsmlg4dbm32m4wd66xx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102856,13 +108186,12 @@ self: { transformers ]; testHaskellDepends = [ - base containers directory doctest exceptions filepath hlint hspec + base containers directory doctest exceptions filepath hspec protolude QuickCheck ]; homepage = "https://github.com/quixoftic/hpio#readme"; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplayground" = callPackage @@ -102925,8 +108254,8 @@ self: { }: mkDerivation { pname = "hpp"; - version = "0.4.1"; - sha256 = "0va60lvxgy52i064i62hln7kca55xk5f494khiax74bsn8iin7pq"; + version = "0.5.2"; + sha256 = "1r1sas1rcxcra4q3vjw3qmiv0xc4j263m7p93y6bwm1fvpxlkvcc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102934,28 +108263,29 @@ self: { transformers ]; executableHaskellDepends = [ base directory filepath time ]; + testHaskellDepends = [ base bytestring transformers ]; homepage = "https://github.com/acowley/hpp"; description = "A Haskell pre-processor"; license = stdenv.lib.licenses.bsd3; }) {}; "hpqtypes" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , data-default-class, exceptions, HUnit, lifted-base, monad-control - , mtl, postgresql, QuickCheck, random, resource-pool, scientific - , test-framework, test-framework-hunit, text, text-show, time - , transformers, transformers-base, unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , data-default-class, directory, exceptions, filepath, HUnit + , lifted-base, monad-control, mtl, postgresql, QuickCheck, random + , resource-pool, scientific, semigroups, test-framework + , test-framework-hunit, text, text-show, time, transformers + , transformers-base, unordered-containers, vector }: mkDerivation { pname = "hpqtypes"; - version = "1.5.1.1"; - sha256 = "0nkrah6ny24qayr03dyar5yhb90k5as3fn19pzsp6df8gi6j375r"; - revision = "1"; - editedCabalFile = "0k255rbvzinwrav3k7f3n2hssiv9p3bb51fg4vp2mhnm9igfy5b9"; + version = "1.5.2.0"; + sha256 = "0ghqrayylsm68nkqzrb7y81n3zslqv0rjpd0fyya67cy26ks43gw"; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson base bytestring containers data-default-class exceptions - lifted-base monad-control mtl resource-pool text text-show time - transformers transformers-base vector + lifted-base monad-control mtl resource-pool semigroups text + text-show time transformers transformers-base vector ]; librarySystemDepends = [ postgresql ]; testHaskellDepends = [ @@ -102972,18 +108302,18 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, exceptions, fields-json, hpqtypes, lifted-base - , log-base, monad-control, mtl, safe, tasty, tasty-hunit, text - , text-show, transformers + , cryptohash, data-default, exceptions, fields-json, hpqtypes + , lifted-base, log-base, monad-control, mtl, safe, semigroups + , tasty, tasty-hunit, text, text-show, transformers }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.3.1.1"; - sha256 = "01ckscym6lgb6k63n6g0q9972imabv4kncsxr2h37xkahfyh68hk"; + version = "1.6.1.0"; + sha256 = "1k23dk3f1d3d3a1qdkvwjk91nw7iz4906clnwhd9k2s70zgsw111"; libraryHaskellDepends = [ - base base16-bytestring bytestring containers cryptohash exceptions - fields-json hpqtypes lifted-base log-base monad-control mtl safe - text text-show + base base16-bytestring bytestring containers cryptohash + data-default exceptions fields-json hpqtypes lifted-base log-base + monad-control mtl safe semigroups text text-show ]; testHaskellDepends = [ base exceptions hpqtypes lifted-base log-base monad-control tasty @@ -103002,8 +108332,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.5"; - sha256 = "0f4h9b5c6s523967hkqg6wz57g350awa26r2y2wlfr4f39qgjwx3"; + version = "2.4.8"; + sha256 = "1h3zjl1z80h7n1k1sk4a2qwsnq17c48f1lmzrdhrs9h5bnm9mjhk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103021,7 +108351,6 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hprotoc-fork" = callPackage @@ -103055,21 +108384,17 @@ self: { }) {}; "hps" = callPackage - ({ mkDerivation, base, directory, filepath, hcg-minus, random }: + ({ mkDerivation, base, filepath, hcg-minus, process }: mkDerivation { pname = "hps"; - version = "0.15"; - sha256 = "0kmmrjg93rr6cjmg5n821p00qr4m3q46nnyfhql2s2nf20p7kprh"; - isLibrary = true; - isExecutable = true; + version = "0.16"; + sha256 = "0y819776sk97hdwf67x67289gdqmxn2g39l7ri0n8z8vdap5rq96"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base hcg-minus ]; - executableHaskellDepends = [ - base directory filepath hcg-minus random - ]; - homepage = "http://rd.slavepianos.org/?t=hps"; + libraryHaskellDepends = [ base filepath hcg-minus process ]; + homepage = "http://rd.slavepianos.org/t/hps"; description = "Haskell Postscript"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hps-cairo" = callPackage @@ -103212,7 +108537,6 @@ self: { ]; description = "A query language for transforming HTML5"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hranker" = callPackage @@ -103308,8 +108632,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.4.4"; - sha256 = "08997g32rnmwznzywf1k0bmki0kbcwss9s4lka6s501l54gp1ij9"; + version = "0.3.5.1"; + sha256 = "0gzg7yhkrzgqaip5fd1lbd15j1274w28kqv0k6ls6sfk52gq56wn"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector @@ -103336,18 +108660,6 @@ self: { }) {GeoIP = null;}; "hs-bibutils" = callPackage - ({ mkDerivation, base, syb }: - mkDerivation { - pname = "hs-bibutils"; - version = "5.5"; - sha256 = "0pf5lh179rw9jkmw16ss3kiwydlj6zgfk868mjl5s57kx55z7ycm"; - libraryHaskellDepends = [ base syb ]; - homepage = "http://istitutocolli.org/repos/hs-bibutils/"; - description = "Haskell bindings to bibutils, the bibliography conversion utilities"; - license = "GPL"; - }) {}; - - "hs-bibutils_6_2_0_1" = callPackage ({ mkDerivation, base, syb }: mkDerivation { pname = "hs-bibutils"; @@ -103357,7 +108669,6 @@ self: { homepage = "https://github.com/wilx/hs-bibutils"; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-blake2" = callPackage @@ -103402,6 +108713,7 @@ self: { homepage = "https://github.com/iand675/brotli#readme"; description = "Compression and decompression in the brotli format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {brotli = null; brotlidec = null; brotlienc = null; libbrotlidec = null; libbrotlienc = null;}; @@ -103574,6 +108886,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fltk; fltk_images = null;}; + "hs-functors" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "hs-functors"; + version = "0.1.1.0"; + sha256 = "0fd9sn0l5q6qxk8br0pa6k3sbv3r0ccij6lb9jm1a174kxjfxzma"; + libraryHaskellDepends = [ base transformers ]; + description = "Functors from products of Haskell and its dual to Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-gchart" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -103643,8 +108966,8 @@ self: { }: mkDerivation { pname = "hs-java"; - version = "0.3.4"; - sha256 = "1qv6zwp9fws9s6502d9afwwbsh025xfpw4vsq8wgh2i0gvlskzq7"; + version = "0.4.1"; + sha256 = "1wpibfwxv9m1ldn9xqfrvjld18q8x31h06flvb4sbk26hqjrkr6f"; libraryHaskellDepends = [ array base binary binary-state bytestring containers control-monad-exception data-binary-ieee754 data-default directory @@ -103852,6 +109175,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hs-rs-notify" = callPackage + ({ mkDerivation, base, filepath, notifier, process, protolude, text + , unix + }: + mkDerivation { + pname = "hs-rs-notify"; + version = "0.1.0.18"; + sha256 = "0ffs9bbs076i3a44zszhv8kdxalz2m2yfg0fham971jil33gx2pc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath process protolude text unix + ]; + executableHaskellDepends = [ base protolude ]; + executableSystemDepends = [ notifier ]; + testHaskellDepends = [ base protolude ]; + homepage = "https://github.com/NoRedInk/hs-rs-notify#readme"; + description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {notifier = null;}; + "hs-scrape" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , exceptions, hspec, html-conduit, lens, retry, safe, tasty @@ -103875,8 +109220,7 @@ self: { }) {}; "hs-server-starter" = callPackage - ({ mkDerivation, base, directory, http-types, HUnit, network - , temporary, unix, wai, warp + ({ mkDerivation, base, directory, HUnit, network, temporary, unix }: mkDerivation { pname = "hs-server-starter"; @@ -103885,7 +109229,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory network ]; - executableHaskellDepends = [ base http-types network wai warp ]; 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"; @@ -103907,6 +109250,7 @@ self: { homepage = "https://github.com/aiya000/hs-snowtify#README.md"; description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-twitter" = callPackage @@ -104000,6 +109344,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hs2ats" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude + , cpphs, criterion, deepseq, haskell-src-exts, hspec + , hspec-dirstream, language-ats, lens, system-filepath + }: + mkDerivation { + pname = "hs2ats"; + version = "0.3.0.1"; + sha256 = "1z8afx8bc9igd0iv6anw635zfj6vwqq10kp4j95p3fs58wyjg21v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base casing composition-prelude cpphs deepseq + haskell-src-exts language-ats lens + ]; + testHaskellDepends = [ + base hspec hspec-dirstream system-filepath + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/vmchale/hs2ats#readme"; + description = "Create ATS types from Haskell types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs2bf" = callPackage ({ mkDerivation, array, base, containers, directory, filepath , haskell-src, mtl @@ -104062,7 +109431,6 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; description = "I2C access for Haskell and Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsSqlite3" = callPackage @@ -104096,6 +109464,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {xenctrl = null;}; + "hsaml2" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring + , bytestring, cryptonite, data-default, http-types, HUnit, hxt + , hxt-charproperties, hxt-http, hxt-unicode, invertible + , invertible-hxt, lens, libxml2, memory, mtl, network-uri, process + , semigroups, template-haskell, time, x509, zlib + }: + mkDerivation { + pname = "hsaml2"; + version = "0.1"; + sha256 = "0mpw13cicx16zhsk7km2qsndah9cdmyylz4r5ank5cxj0rzmkjck"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base base64-bytestring bytestring + cryptonite data-default http-types hxt hxt-charproperties + hxt-unicode invertible invertible-hxt lens memory mtl network-uri + process semigroups template-haskell time x509 zlib + ]; + libraryPkgconfigDepends = [ libxml2 ]; + testHaskellDepends = [ + base bytestring HUnit hxt hxt-http network-uri semigroups time x509 + ]; + description = "OASIS Security Assertion Markup Language (SAML) V2.0"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libxml2;}; + "hsass" = callPackage ({ mkDerivation, base, bytestring, data-default-class, filepath , hlibsass, hspec, hspec-discover, monad-loops, temporary @@ -104103,8 +109497,10 @@ self: { }: mkDerivation { pname = "hsass"; - version = "0.4.2"; - sha256 = "0hv2falrm3dcmdx08mpk2z8yxfr1hahgrd3ff9yvw6xjcjzab5yh"; + version = "0.5.0"; + sha256 = "07jhny061fnxqiijr2rqac85qzlxz24w8dms5pn844as8nkwdi4d"; + revision = "1"; + editedCabalFile = "00va8x51p6rbg8jbkxpyz74pa2pfm5dsrpi57icbyickx39iaydd"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers @@ -104118,21 +109514,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hsass_0_5_0" = callPackage + "hsass_0_7_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, filepath - , hlibsass, hspec, hspec-discover, monad-loops, temporary + , hlibsass, hspec, hspec-discover, monad-loops, temporary, text , transformers }: mkDerivation { pname = "hsass"; - version = "0.5.0"; - sha256 = "07jhny061fnxqiijr2rqac85qzlxz24w8dms5pn844as8nkwdi4d"; + version = "0.7.0"; + sha256 = "0mqsj1jm37pqc1vwjs5y5mh4sfhdyclp1vdr7q5nq2a3pa3qwxbk"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers ]; testHaskellDepends = [ base bytestring data-default-class hspec hspec-discover temporary + text ]; homepage = "https://github.com/jakubfijalkowski/hsass"; description = "Integrating Sass into Haskell applications"; @@ -104202,6 +109599,7 @@ self: { executableHaskellDepends = [ attoparsec base text vector ]; description = "A command line calculator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsbencher" = callPackage @@ -104274,8 +109672,8 @@ self: { ({ mkDerivation, base, containers, directory, filepath, process }: mkDerivation { pname = "hsc2hs"; - version = "0.68.2"; - sha256 = "061ns6ig52pcjwi9cgdcasya4cgm3zlb5s2mzq9p01vw4iy702gn"; + version = "0.68.3"; + sha256 = "0q46l4mvclw7lys53zljgrcj142rbwzk5zc2djk2qj956ah1i25h"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -104287,19 +109685,19 @@ self: { }) {}; "hsc3" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-default - , data-ordlist, directory, filepath, hashable, hosc, network - , process, random, safe, split, transformers + ({ mkDerivation, array, base, binary, bytestring, containers + , data-default, data-ordlist, directory, filepath, hashable, hosc + , network, process, random, safe, split, transformers, vector }: mkDerivation { pname = "hsc3"; - version = "0.15.1"; - sha256 = "1ad5q4rq82v7l556rinaiikglr1kjswi5raw0dxqwsfjbp8imbha"; + version = "0.16"; + sha256 = "0m6pas8dx48mx91159s7p7fljnivs13cg34gys906nhq11dmjdqn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base binary bytestring containers data-default data-ordlist + array base binary bytestring containers data-default data-ordlist directory filepath hashable hosc network process random safe split - transformers + transformers vector ]; homepage = "http://rd.slavepianos.org/t/hsc3"; description = "Haskell SuperCollider"; @@ -104320,6 +109718,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-auditor"; description = "Haskell SuperCollider Auditor"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-cairo" = callPackage @@ -104366,14 +109765,15 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-db"; description = "Haskell SuperCollider Unit Generator Database"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-dot" = callPackage ({ mkDerivation, base, directory, filepath, hsc3, process }: mkDerivation { pname = "hsc3-dot"; - version = "0.15"; - sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m"; + version = "0.16"; + sha256 = "0jz3x6s6svgil1cyalq4xkv09s55d8r44cc2ksp0npmgpmp3x454"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath hsc3 process ]; homepage = "http://rd.slavepianos.org/t/hsc3-dot"; @@ -104404,10 +109804,9 @@ self: { "hsc3-graphs" = callPackage ({ mkDerivation, array, base, binary, bytestring, cairo, containers - , data-default, directory, filepath, hashable, hls, hmt, hosc, hps - , hsc3, hsc3-cairo, hsc3-lang, hsc3-sf, hsc3-unsafe, hsc3-utils - , hsharc, MonadRandom, primes, process, random, random-shuffle - , sc3-rdu, she, split + , data-default, directory, filepath, hls, hmt, hosc, hps, hsc3 + , hsc3-cairo, hsc3-lang, hsc3-sf, hsc3-unsafe, hsc3-utils, hsharc + , MonadRandom, primes, random, random-shuffle, sc3-rdu, she, split }: mkDerivation { pname = "hsc3-graphs"; @@ -104422,12 +109821,7 @@ self: { hsc3-sf hsc3-unsafe hsc3-utils hsharc MonadRandom primes random random-shuffle sc3-rdu she split ]; - executableHaskellDepends = [ - array base binary bytestring cairo containers directory filepath - hashable hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang hsc3-sf - hsc3-unsafe hsharc MonadRandom primes process random random-shuffle - sc3-rdu split - ]; + executableHaskellDepends = [ base ]; homepage = "http://rd.slavepianos.org/t/hsc3-graphs"; description = "Haskell SuperCollider Graphs"; license = "GPL"; @@ -104511,7 +109905,6 @@ self: { base bytestring containers data-default directory filepath hosc hsc3 process time time-compat transformers ]; - executableHaskellDepends = [ base data-default hosc hsc3 ]; homepage = "https://github.com/kaoskorobase/hsc3-process"; description = "Create and control scsynth processes"; license = "GPL"; @@ -104555,7 +109948,7 @@ self: { , failure, hashtables, hosc, hsc3, hsc3-process, lifted-base , ListZipper, monad-control, QuickCheck, random, resourcet , test-framework, test-framework-quickcheck2, transformers - , transformers-base, unix + , transformers-base }: mkDerivation { pname = "hsc3-server"; @@ -104568,9 +109961,6 @@ self: { hosc hsc3 hsc3-process lifted-base ListZipper monad-control resourcet transformers transformers-base ]; - executableHaskellDepends = [ - base hosc hsc3 random transformers unix - ]; testHaskellDepends = [ base failure QuickCheck random test-framework test-framework-quickcheck2 transformers @@ -104592,6 +109982,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-sf-hsndfile" = callPackage @@ -104609,6 +110000,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-unsafe" = callPackage @@ -104725,6 +110117,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hscharm" = callPackage + ({ mkDerivation, base, random, random-shuffle }: + mkDerivation { + pname = "hscharm"; + version = "0.0.2"; + sha256 = "17713j542kph74n8rvjrx847r19yk96dz80n04nl8w6vzabj5wng"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base random random-shuffle ]; + description = "minimal ncurses-like library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsclock" = callPackage ({ mkDerivation, base, cairo, glib, gtk, old-time }: mkDerivation { @@ -104744,8 +110150,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "hscolour"; - version = "1.24.1"; - sha256 = "1j3rpzjygh3igvnd1n2xn63bq68rs047cjxr2qi6xyfnivgf6vz4"; + version = "1.24.4"; + sha256 = "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -104836,49 +110242,49 @@ self: { ({ mkDerivation, base, hscurses, random, safe, unix }: mkDerivation { pname = "hscurses-fish-ex"; - version = "1.3.1"; - sha256 = "1s7b2v3cl0nl2b55agn5wkvxn30f2bgp6mznkn33148vlbya1mzs"; + version = "1.3.2"; + sha256 = "08qmnf8qrk3zlq3flkma8sll84czdaydv6nmyb79jaz5fknv12rn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hscurses random safe unix ]; - homepage = "http://ui3.info/darcs/hscurses-fish-ex/"; + homepage = "http://hub.darcs.net/dino/hscurses-fish-ex"; description = "hscurses swimming fish example"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.isc; }) {}; "hsdev" = callPackage ({ mkDerivation, aeson, aeson-lens, 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, hspec, 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 - , unordered-containers, vector + , data-default, deepseq, direct-sqlite, directory, exceptions + , filepath, fsnotify, ghc, ghc-boot, ghc-paths, ghc-syb-utils + , haddock-api, haskell-names, haskell-src-exts, hdocs, hformat + , hlint, hspec, HTTP, lens, lifted-base, mmorph, monad-control + , monad-loops, mtl, network, optparse-applicative, process + , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm + , syb, template-haskell, text, text-region, time, transformers + , transformers-base, uniplate, unix, unordered-containers, vector }: mkDerivation { pname = "hsdev"; - version = "0.2.5.1"; - sha256 = "15rr12mric0gm4xfskwsqh89kdiqxzvg47nkddbyr7hah1rjmcn4"; + version = "0.3.1.3"; + sha256 = "1xrggdkaq3b1vsnkrcsm2ji6wcrmxv53lf8x3ki7py9blgjj3vrj"; 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 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 + containers cpphs data-default deepseq direct-sqlite directory + exceptions filepath fsnotify ghc ghc-boot ghc-paths ghc-syb-utils + haddock-api haskell-names 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 sqlite-simple stm syb template-haskell text text-region + time transformers transformers-base uniplate unix unordered-containers vector ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers data-default deepseq - directory exceptions filepath haskell-src-exts lens monad-loops mtl - network optparse-applicative process text transformers - unordered-containers vector + aeson aeson-pretty base bytestring containers deepseq directory + exceptions filepath monad-loops mtl network optparse-applicative + process text transformers unordered-containers ]; testHaskellDepends = [ aeson aeson-lens async base containers data-default deepseq @@ -104887,6 +110293,7 @@ self: { homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdif" = callPackage @@ -104923,13 +110330,12 @@ self: { ({ mkDerivation, adns, base, containers, network }: mkDerivation { pname = "hsdns"; - version = "1.7"; - sha256 = "1lsw422k64b8m7s98j1i6qxll1kyzpv3bb0a2wwf7lghw74hm5j8"; + version = "1.7.1"; + sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers network ]; librarySystemDepends = [ adns ]; - executableHaskellDepends = [ base network ]; homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.lgpl3; @@ -104996,17 +110402,16 @@ self: { }) {}; "hsemail-ns" = callPackage - ({ mkDerivation, base, mtl, old-time, parsec }: + ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }: mkDerivation { pname = "hsemail-ns"; - version = "1.3.2"; - sha256 = "03d0pnsba7yj5x7zrg8b80kxsnqn5g40vd2i717s1dnn3bd3vz4s"; - enableSeparateDataOutput = true; + version = "1.7.7"; + sha256 = "01vnlcv5gj7zj33b6m8mc4n6n8d15casywgicn1lr699hkh287hg"; libraryHaskellDepends = [ base mtl old-time parsec ]; - homepage = "http://patch-tag.com/r/hsemail-ns/home"; + testHaskellDepends = [ base doctest hspec old-time parsec ]; + homepage = "https://github.com/phlummox/hsemail-ns/tree/hsemail-ns"; description = "Internet Message Parsers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsenv" = callPackage @@ -105064,8 +110469,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.1.4"; - sha256 = "1ip2nyljjka99azygg2sx6a6d00vac6b8rd5y93yyhy6sp5d8m2r"; + version = "0.6.1.5"; + sha256 = "0vmhd6l9vkzm4pqizqh3hjb86f4vk212plvlzfd6rd5dc08fl4ig"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -105210,6 +110615,7 @@ self: { homepage = "http://code.haskell.org/hsignal"; description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; @@ -105237,8 +110643,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.4"; - sha256 = "1xngy3qnk6nr0yvvkq7cqay0kkhnp0v4ah27w8r5v3q4malraa1l"; + version = "0.8.5"; + sha256 = "05gdzl4h67rjpw2nhk6dvd9l8lmx1kdg4cy9hmk5l36vrk8s9ic6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105251,6 +110657,7 @@ self: { ]; description = "A command line program for extending the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsini" = callPackage @@ -105342,10 +110749,11 @@ self: { ]; description = "Resolves links to Haskell identifiers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslogger" = callPackage - ({ mkDerivation, base, containers, directory, HUnit, mtl, network + ({ mkDerivation, base, containers, directory, mtl, network , old-locale, process, time, unix }: mkDerivation { @@ -105355,7 +110763,6 @@ self: { libraryHaskellDepends = [ base containers directory mtl network old-locale process time unix ]; - testHaskellDepends = [ base HUnit ]; homepage = "http://software.complete.org/hslogger"; description = "Versatile logging framework"; license = stdenv.lib.licenses.bsd3; @@ -105434,46 +110841,26 @@ self: { }) {}; "hslua" = callPackage - ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit - , lua5_1, QuickCheck, quickcheck-instances, text - }: - mkDerivation { - pname = "hslua"; - version = "0.4.1"; - sha256 = "0gqp6qhp4v24kzv2j49kgk7bxqzw0w10x0zr0r2j9wkfavqb9wid"; - 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; - }) {inherit (pkgs) lua5_1;}; - - "hslua_0_9_2" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, fail - , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty + , lua5_3, mtl, QuickCheck, quickcheck-instances, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "0.9.2"; - sha256 = "1n1fw2ak3xk4llv3d3bbpcayjd6h2a83n06i96m2k30lzanbg0ys"; + version = "0.9.5.1"; + sha256 = "1l3lkmzcal3106acw2bvky5dlblz4n331gnl1ly18j79flbzn7v8"; configureFlags = [ "-fsystem-lua" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text ]; - librarySystemDepends = [ lua5_1 ]; + librarySystemDepends = [ lua5_3 ]; testHaskellDepends = [ base bytestring containers QuickCheck quickcheck-instances tasty tasty-expected-failure tasty-hunit tasty-quickcheck text ]; description = "A Lua language interpreter embedding in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) lua5_1;}; + }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit @@ -105482,8 +110869,10 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "0.1.0.4"; - sha256 = "179dgqx6827l7bk7h1dxpwprijdqgmjqxn5g5cfqa3mkzpgc51x8"; + version = "0.3.0.1"; + sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w"; + revision = "1"; + editedCabalFile = "02p97fsn7g6n0l5i9k0mrffqhw2a3y74vi0zaynsl224r4vwqsbp"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -105493,30 +110882,35 @@ self: { quickcheck-instances scientific text unordered-containers vector ]; homepage = "https://github.com/tarleb/hslua-aeson#readme"; - description = "Glue between aeson and hslua"; + description = "Allow aeson data types to be used with lua"; license = stdenv.lib.licenses.mit; }) {}; - "hslua-aeson_0_3_0_1" = callPackage - ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit - , ieee754, QuickCheck, quickcheck-instances, scientific, text - , unordered-containers, vector - }: + "hslua-module-text" = callPackage + ({ mkDerivation, base, hslua, tasty, tasty-hunit, text }: mkDerivation { - pname = "hslua-aeson"; - version = "0.3.0.1"; - sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w"; - libraryHaskellDepends = [ - aeson base hashable hslua scientific text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base hashable hslua hspec HUnit ieee754 QuickCheck - quickcheck-instances scientific text unordered-containers vector - ]; - homepage = "https://github.com/tarleb/hslua-aeson#readme"; - description = "Allow aeson data types to be used with lua"; + pname = "hslua-module-text"; + version = "0.1.2.1"; + sha256 = "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf"; + revision = "1"; + editedCabalFile = "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"; + libraryHaskellDepends = [ base hslua text ]; + testHaskellDepends = [ base hslua tasty tasty-hunit text ]; + homepage = "https://github.com/hslua/hslua-module-test"; + description = "Lua module for text"; license = stdenv.lib.licenses.mit; + }) {}; + + "hsluv-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, colour, containers }: + mkDerivation { + pname = "hsluv-haskell"; + version = "0.1.0.0"; + sha256 = "1pdp1qfhqjv33mfgayay2by7bf5p1acw5791kgay20a8r5wvalab"; + libraryHaskellDepends = [ base colour ]; + testHaskellDepends = [ aeson base bytestring colour containers ]; + description = "HSLuv conversion utility"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -105566,6 +110960,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsmodetweaks" = callPackage + ({ mkDerivation, base, containers, directory, hpack, protolude + , text + }: + mkDerivation { + pname = "hsmodetweaks"; + version = "0.1.0.1"; + sha256 = "1nwmfd6wvwis58z97amgzix42mcqj5nsj915593w2cw7j5sv5y17"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory hpack protolude text + ]; + homepage = "https://github.com/mwotton/scriptable/#hsmodetweaks"; + description = "Tool for generating .dir-locals.el for intero"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsmtpclient" = callPackage ({ mkDerivation, array, base, directory, network, old-time }: mkDerivation { @@ -105854,8 +111267,31 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.4.4"; - sha256 = "08fg8w38xbhidw3pfn13ag3mnpp3rb1lzp7xpq47cncwv92k46mh"; + version = "2.4.8"; + sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l"; + 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; + }) {}; + + "hspec_2_5_0" = callPackage + ({ mkDerivation, base, call-stack, directory, hspec-core + , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck + , stringbuilder, transformers + }: + mkDerivation { + pname = "hspec"; + version = "2.5.0"; + sha256 = "16vp3k8bdqvsdhv12srahda3anf1pia7blczh201snib52is9vdb"; libraryHaskellDepends = [ base call-stack hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -105868,6 +111304,7 @@ self: { homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -105916,49 +111353,133 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-contrib_0_5_0" = callPackage + ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }: + mkDerivation { + pname = "hspec-contrib"; + version = "0.5.0"; + sha256 = "13579xdqwbsy8k0vxdcvgy932d4p76mij1rzkzbpqbspfn7399yv"; + libraryHaskellDepends = [ base hspec-core HUnit ]; + testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ]; + homepage = "http://hspec.github.io/"; + description = "Contributed functionality for Hspec"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-core" = callPackage - ({ mkDerivation, ansi-terminal, array, async, base, call-stack + ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq + , directory, filepath, hspec-expectations, hspec-meta, HUnit + , process, QuickCheck, quickcheck-io, random, setenv, silently, stm + , temporary, tf-random, time, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.4.8"; + sha256 = "02zr6n7mqdncvf1braf38zjdplaxrkg11x9k8717k4yg57585ji4"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack deepseq directory filepath + hspec-expectations HUnit QuickCheck quickcheck-io random setenv stm + tf-random time transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack deepseq directory filepath + hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random time + transformers + ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hspec-core_2_5_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, temporary, tf-random, time, transformers + , silently, stm, temporary, tf-random, transformers }: mkDerivation { pname = "hspec-core"; - version = "2.4.4"; - sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0"; + version = "2.5.0"; + sha256 = "1p88sxarrpfzic4h37n9crpvmklisv514cm0v6fxmk1f2jvf3rgj"; libraryHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory + ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv tf-random time transformers + setenv stm tf-random transformers ]; testHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory + ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently temporary tf-random time + quickcheck-io random setenv silently stm temporary tf-random transformers ]; testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hspec-dirstream" = callPackage + ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core + , pipes, pipes-safe, system-filepath, text + }: + mkDerivation { + pname = "hspec-dirstream"; + version = "1.0.0.0"; + sha256 = "0xj7qj6j3mp1j3q4pdm0javjc4rw586brcd399ygh74vpa669pgf"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base dirstream filepath hspec hspec-core pipes pipes-safe + system-filepath text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://hub.darcs.net/vmchale/hspec-dirstream"; + description = "Helper functions to simplify adding integration tests"; + license = stdenv.lib.licenses.bsd3; }) {}; "hspec-discover" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta }: + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: mkDerivation { pname = "hspec-discover"; - version = "2.4.4"; - sha256 = "0isx9nc59nw8pkh4r6ynd55dghqnzgrzn9pvrq6ail1y5z3knhkn"; + version = "2.4.8"; + sha256 = "0llwdfpjgfpi7dr8caw0fldb9maqznmqh4awkvx72bz538gqmlka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ base directory filepath hspec-meta ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; homepage = "http://hspec.github.io/"; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_5_0" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.5.0"; + sha256 = "1r91g9hqdn815i86hsrv5bagv76rhq4n0avkmhkh670kkryc0iry"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + 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 { @@ -106000,6 +111521,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-expectations-match" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations, template-haskell + , transformers-base + }: + mkDerivation { + pname = "hspec-expectations-match"; + version = "0.2.0.0"; + sha256 = "16ca3fqjigj08y1cz2vvzsqfxnwypdi62hm5rw31flih45nb5nq1"; + libraryHaskellDepends = [ + base hspec-expectations template-haskell transformers-base + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/cjdev/hspec-expectations-match#readme"; + description = "An hspec expectation that asserts a value matches a pattern"; + license = stdenv.lib.licenses.isc; + }) {}; + "hspec-expectations-pretty" = callPackage ({ mkDerivation, base, deepseq, hspec-expectations , wl-pprint-extras, wl-pprint-terminfo @@ -106054,8 +111592,8 @@ self: { }: mkDerivation { pname = "hspec-golden-aeson"; - version = "0.2.1.0"; - sha256 = "0qb50fbni4ma87lx356j412ii18b82svkrg8gv2kx67n1f84hisq"; + version = "0.5.1.0"; + sha256 = "0d3ww44c0al841j6z5w6br1qa91v5nr0lfbzaa4cdydynvi4s6lq"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec QuickCheck quickcheck-arbitrary-adt random transformers @@ -106126,25 +111664,6 @@ self: { }) {}; "hspec-megaparsec" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-expectations - , megaparsec - }: - mkDerivation { - pname = "hspec-megaparsec"; - version = "0.3.1"; - sha256 = "0kaif74f1qq92nvksnq12h0imsrr02q1nawgprbg1s9cpilq2vw2"; - libraryHaskellDepends = [ - base containers hspec-expectations megaparsec - ]; - testHaskellDepends = [ - base containers hspec hspec-expectations megaparsec - ]; - homepage = "https://github.com/mrkkrp/hspec-megaparsec"; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hspec-megaparsec_1_0_0" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec }: @@ -106159,7 +111678,6 @@ self: { homepage = "https://github.com/mrkkrp/hspec-megaparsec"; description = "Utility functions for testing Megaparsec parsers with Hspec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-meta" = callPackage @@ -106169,8 +111687,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.4.4"; - sha256 = "117n4j56wfh48xj02mv0wkp10bkr2xkyvwg7n7r2ynp03wrf9ykm"; + version = "2.4.6"; + sha256 = "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106285,6 +111803,7 @@ self: { homepage = "https://github.com/yamadapc/haskell-hspec-setup"; description = "Add an hspec test-suite in one command"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-shouldbe" = callPackage @@ -106313,20 +111832,45 @@ self: { }) {}; "hspec-smallcheck" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }: + ({ mkDerivation, base, call-stack, hspec, hspec-core, HUnit + , QuickCheck, smallcheck + }: mkDerivation { pname = "hspec-smallcheck"; - version = "0.4.2"; - sha256 = "1lsy71ri0lfvs6w1drwa4p69bcy0nrpb62dah3bg4vqwxfrd82ds"; - libraryHaskellDepends = [ base hspec-core smallcheck ]; + version = "0.5.0"; + sha256 = "0lff095qm855y7dd055c4h5ip8lcx1i6pady2b81fby4wgf78g1m"; + libraryHaskellDepends = [ + base call-stack hspec-core HUnit smallcheck + ]; testHaskellDepends = [ - base hspec hspec-core QuickCheck smallcheck + base call-stack hspec hspec-core HUnit QuickCheck smallcheck ]; homepage = "http://hspec.github.io/"; description = "SmallCheck support for the Hspec testing framework"; license = stdenv.lib.licenses.mit; }) {}; + "hspec-smallcheck_0_5_2" = callPackage + ({ mkDerivation, base, base-orphans, call-stack, hspec, hspec-core + , HUnit, QuickCheck, smallcheck + }: + mkDerivation { + pname = "hspec-smallcheck"; + version = "0.5.2"; + sha256 = "06c1ym793zkdwi4bxk5f4l7m1n1bg5jmnm0p68q2pa9rlhk1lc4s"; + libraryHaskellDepends = [ + base call-stack hspec-core HUnit smallcheck + ]; + testHaskellDepends = [ + base base-orphans call-stack hspec hspec-core HUnit QuickCheck + smallcheck + ]; + homepage = "http://hspec.github.io/"; + description = "SmallCheck support for the Hspec testing framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-snap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, directory, HandsomeSoup, hspec, hspec-core @@ -106417,34 +111961,9 @@ self: { testHaskellDepends = [ base hspec test-sandbox ]; description = "Hspec convenience functions for use with test-sandbox"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-wai" = callPackage - ({ mkDerivation, base, base-compat, bytestring, case-insensitive - , hspec, hspec-core, hspec-expectations, http-types, QuickCheck - , text, transformers, wai, wai-extra - }: - mkDerivation { - pname = "hspec-wai"; - version = "0.8.0"; - sha256 = "0h8i78kjc5bv8aly4r7m5p2a8mw5j9ms8qm79mkwqadx877y4zlb"; - libraryHaskellDepends = [ - base base-compat bytestring case-insensitive hspec-core - hspec-expectations http-types QuickCheck text transformers wai - wai-extra - ]; - testHaskellDepends = [ - base base-compat bytestring case-insensitive hspec hspec-core - hspec-expectations http-types QuickCheck text transformers wai - wai-extra - ]; - homepage = "https://github.com/hspec/hspec-wai#readme"; - description = "Experimental Hspec support for testing WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-wai_0_9_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, case-insensitive , hspec, hspec-core, hspec-expectations, http-types, QuickCheck , text, transformers, wai, wai-extra @@ -106466,28 +111985,9 @@ self: { homepage = "https://github.com/hspec/hspec-wai#readme"; description = "Experimental Hspec support for testing WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-wai-json" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring - , case-insensitive, hspec, hspec-wai, template-haskell - }: - mkDerivation { - pname = "hspec-wai-json"; - version = "0.8.0"; - sha256 = "1s46dggwq1f14x3d9ga9va9bq78fwlj5bnln8q4lgcmpk20k0ya6"; - libraryHaskellDepends = [ - aeson aeson-qq base bytestring case-insensitive hspec-wai - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-wai ]; - homepage = "https://github.com/hspec/hspec-wai#readme"; - description = "Testing JSON APIs with hspec-wai"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-wai-json_0_9_0" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, hspec, hspec-wai, template-haskell }: @@ -106503,7 +112003,6 @@ self: { homepage = "https://github.com/hspec/hspec-wai#readme"; description = "Testing JSON APIs with hspec-wai"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-webdriver" = callPackage @@ -106542,8 +112041,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheckVariant }: mkDerivation { pname = "hspecVariant"; - version = "0.1.0.1"; - sha256 = "0vl6l8mkx3lmkr12340v3zh64nxs3i07jrcf10r8fw9wahgcqkym"; + version = "1.0.0.0"; + sha256 = "0y45jizkf2kfj3yjjkq96kavkfp74vf5dyyjvi9pj3kshf8sx8il"; libraryHaskellDepends = [ base hspec QuickCheckVariant ]; homepage = "https://github.com/sanjorgek/hspecVariant"; description = "Spec for testing properties for variant types"; @@ -106551,24 +112050,19 @@ self: { }) {}; "hspkcs11" = callPackage - ({ mkDerivation, base, bytestring, c2hs, cipher-aes, cprng-aes - , crypto-api, RSA, testpack, unix, utf8-string + ({ mkDerivation, base, base64-bytestring, bytestring, c2hs + , cipher-aes, cprng-aes, crypto-api, RSA, unix, utf8-string }: mkDerivation { pname = "hspkcs11"; - version = "0.3"; - sha256 = "1cgp0fqwh4r33c4g7pm95cim78kjr9yyq7z1n79f3c30lnvsany9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring crypto-api RSA unix utf8-string - ]; + version = "0.7"; + sha256 = "0xbwwnj4n674c3ybxq966w6l71xfg992yig8989gbww4x21n9cy2"; + libraryHaskellDepends = [ base bytestring unix utf8-string ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ - base bytestring cipher-aes cprng-aes crypto-api RSA testpack unix - utf8-string + testHaskellDepends = [ + base base64-bytestring bytestring cipher-aes cprng-aes crypto-api + RSA unix utf8-string ]; - executableToolDepends = [ c2hs ]; homepage = "https://github.com/denisenkom/hspkcs11"; description = "Wrapper for PKCS #11 interface"; license = stdenv.lib.licenses.mit; @@ -106653,6 +112147,7 @@ self: { libraryHaskellDepends = [ base old-time ]; description = "Database access from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsql-mysql" = callPackage @@ -106680,6 +112175,7 @@ self: { librarySystemDepends = [ unixODBC ]; description = "A Haskell Interface to ODBC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) unixODBC;}; "hsql-postgresql" = callPackage @@ -106692,6 +112188,7 @@ self: { librarySystemDepends = [ postgresql ]; description = "A Haskell Interface to PostgreSQL via the PQ library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) postgresql;}; "hsql-sqlite3" = callPackage @@ -106704,6 +112201,7 @@ self: { librarySystemDepends = [ sqlite ]; description = "SQLite3 driver for HSQL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) sqlite;}; "hsqml" = callPackage @@ -106712,8 +112210,8 @@ self: { }: mkDerivation { pname = "hsqml"; - version = "0.3.5.0"; - sha256 = "1im7jm144vvyvrmkvblxwhbya55xsyxl8z10bs4anwxxjlf9sggc"; + version = "0.3.5.1"; + sha256 = "046inz0pa5s052w653pk2km9finj44c6y2yx7iqihn4h4vnqbim0"; setupHaskellDepends = [ base Cabal filepath template-haskell ]; libraryHaskellDepends = [ base containers filepath tagged text transformers @@ -106912,16 +112410,13 @@ self: { ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: mkDerivation { pname = "hsshellscript"; - version = "3.4.1"; - sha256 = "0y7byqjcq8qwxz754v5z9s9h3y9g9384fmh02mri8lxdc0934931"; - revision = "1"; - editedCabalFile = "1gfz3ipvippjb8lmhi7j7di2pignibj1x662m1b2qhcpyhlqnabp"; + version = "3.4.5"; + sha256 = "0d66gsm7s2j4f60cjca6fsddg4i1m3l6rcyq29ywskifhfaxbgvx"; libraryHaskellDepends = [ base directory parsec random unix ]; libraryToolDepends = [ c2hs ]; homepage = "http://www.volker-wysk.de/hsshellscript/"; description = "Haskell for Unix shell scripting tasks"; license = "LGPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hssourceinfo" = callPackage @@ -106937,7 +112432,6 @@ self: { ]; description = "get haskell source code info"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hssqlppp" = callPackage @@ -106960,6 +112454,7 @@ self: { homepage = "http://jakewheat.github.com/hssqlppp/"; description = "SQL parser and type checker"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hssqlppp-th" = callPackage @@ -106979,6 +112474,7 @@ self: { homepage = "http://jakewheat.github.com/hssqlppp/"; description = "hssqlppp extras which need template-haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstatistics" = callPackage @@ -107311,8 +112807,8 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.1.1"; - sha256 = "0hymdradb2vsx7gpdwrlmkv1qg4p2r5l6pfiqc4ijyn152jrgr7b"; + version = "0.14.1.3"; + sha256 = "15y7mk01cffc1xgsddkqqmi76npbi7mikgia6xa3xk4916kwsl91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107360,8 +112856,8 @@ self: { }: mkDerivation { pname = "hsyslog-tcp"; - version = "0.2.0.0"; - sha256 = "1zbp8l5lj2xb6yczijd76dhdbxfzxpl7han1b01bc8qfw7pkj4g9"; + version = "0.2.1.0"; + sha256 = "09kr9mcjd41xl5an8ddfrcyx8dc1fgfq70mkw6m96dvcmhryf0gv"; libraryHaskellDepends = [ base bytestring hsyslog hsyslog-udp network text time ]; @@ -107377,8 +112873,8 @@ self: { }: mkDerivation { pname = "hsyslog-udp"; - version = "0.1.2"; - sha256 = "1bm4pbvyqjpfr55l0rzfdq76bsfx1g2bzd83c01scl4i0cc1svhs"; + version = "0.2.2"; + sha256 = "1fr8cn3jwasnp9q23q5pmz3z6zh7z04jhcv77igacwpgw0729hd4"; libraryHaskellDepends = [ base bytestring hsyslog network text time unix ]; @@ -107386,7 +112882,6 @@ self: { homepage = "https://github.com/ThoughtLeadr/hsyslog-udp"; description = "Log to syslog over a network via UDP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hszephyr" = callPackage @@ -107410,6 +112905,8 @@ self: { pname = "htaglib"; version = "1.1.1"; sha256 = "0a4rzw1343zixkmdy84bg7j35qxbnpx7pjr23857cil906wi33r3"; + revision = "1"; + editedCabalFile = "0znih19z9ly4m1nadwkalq28xz0vy6pc0yyamyz2fz5s5nv69lr0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring text transformers ]; librarySystemDepends = [ taglib ]; @@ -107419,6 +112916,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) taglib;}; + "htaglib_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , hspec-discover, taglib, text, transformers + }: + mkDerivation { + pname = "htaglib"; + version = "1.2.0"; + sha256 = "0ph04j1ysjzzrcyllgibzrzfv5g5mgpa6s0ksxww15aryipw65sa"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring text transformers ]; + librarySystemDepends = [ taglib ]; + testHaskellDepends = [ base directory filepath hspec ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/mrkkrp/htaglib"; + description = "Bindings to TagLib, audio meta-data library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) taglib;}; + "htags" = callPackage ({ mkDerivation, base, directory, filepath, haskell-src, mtl }: mkDerivation { @@ -107478,6 +112994,7 @@ self: { homepage = "https://github.com/nkartashov/htestu"; description = "A library for testing correctness of pseudo random number generators in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gcc;}; "htiled" = callPackage @@ -107535,6 +113052,7 @@ self: { homepage = "https://github.com/kelemzol/htlset"; description = "Heterogenous Set"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "html" = callPackage @@ -107548,7 +113066,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "html-conduit" = callPackage + "html-conduit_1_2_1_2" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , containers, hspec, HUnit, resourcet, tagstream-conduit, text , transformers, xml-conduit, xml-types @@ -107567,6 +113085,28 @@ self: { homepage = "https://github.com/snoyberg/xml"; description = "Parse HTML documents using xml-conduit datatypes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "html-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers, hspec + , HUnit, resourcet, tagstream-conduit, text, transformers + , xml-conduit, xml-types + }: + mkDerivation { + pname = "html-conduit"; + version = "1.3.0"; + sha256 = "15pf15w55g39h2fwl4wlq1f0jbfknajb6qyk1l7xv6q7fphhkgvq"; + libraryHaskellDepends = [ + base bytestring conduit containers resourcet tagstream-conduit text + transformers xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring containers hspec HUnit xml-conduit + ]; + homepage = "https://github.com/snoyberg/xml"; + description = "Parse HTML documents using xml-conduit datatypes"; + license = stdenv.lib.licenses.mit; }) {}; "html-email-validate" = callPackage @@ -107587,27 +113127,39 @@ self: { }) {}; "html-entities" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, Cabal - , cabal-doctest, directory, doctest, filepath, text + ({ mkDerivation, attoparsec, base, base-prelude, text , unordered-containers }: mkDerivation { pname = "html-entities"; - version = "1.1.4.1"; - sha256 = "1x6z5fv1sdhdmhwd10kwahvjjkhrza3dm7xzk9ypfkkmyi1piwpi"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "1.1.4.2"; + sha256 = "1ryfslp60s0d0ygmnxfgw9p8s7l2xq1i5kmj86g2ghdljf8hq6hn"; libraryHaskellDepends = [ attoparsec base base-prelude text unordered-containers ]; - testHaskellDepends = [ - base base-prelude directory doctest filepath - ]; homepage = "https://github.com/nikita-volkov/html-entities"; description = "A codec library for HTML-escaped text and HTML-entities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "html-entity-map" = callPackage + ({ mkDerivation, base, criterion, text, unordered-containers }: + mkDerivation { + pname = "html-entity-map"; + version = "0.1.0.0"; + sha256 = "0k1l1pbmrfmh44v9cc9ka01bx9xm1x4jabbl675fc5c57v1h0dlq"; + revision = "2"; + editedCabalFile = "1ycg39ys6zzfi6j88l03gdyyzwjpfzzlzy7dbs6i8p1l70ywizfr"; + libraryHaskellDepends = [ base text unordered-containers ]; + benchmarkHaskellDepends = [ + base criterion text unordered-containers + ]; + homepage = "https://github.com/mrkkrp/html-entity-map"; + description = "Map from HTML5 entity names to the corresponding Unicode text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "html-kure" = callPackage ({ mkDerivation, base, hxt, kure }: mkDerivation { @@ -107671,20 +113223,22 @@ self: { }) {}; "html-tokenizer" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, case-insensitive - , conversion, conversion-case-insensitive, conversion-text - , directory, doctest, filepath, text + ({ mkDerivation, attoparsec, base, base-prelude, html-entities + , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder, vector + , vector-builder }: mkDerivation { pname = "html-tokenizer"; - version = "0.4.1"; - sha256 = "1h8pxphfx4pic0ds6mivk74ca761wkiklyd3bmfyqgbnhllsfxhh"; + version = "0.6.4"; + sha256 = "1ws1y05qxyz5zx3y7lwj10giiviqzlka9h2bqj4y3wpzjdbrd4rk"; libraryHaskellDepends = [ - attoparsec base-prelude case-insensitive conversion - conversion-case-insensitive conversion-text text + attoparsec base base-prelude html-entities semigroups text + text-builder vector vector-builder ]; testHaskellDepends = [ - base base-prelude directory doctest filepath + attoparsec QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/nikita-volkov/html-tokenizer"; description = "An \"attoparsec\"-based HTML tokenizer"; @@ -107795,26 +113349,23 @@ self: { "htoml-megaparsec" = callPackage ({ mkDerivation, aeson, base, bytestring, composition-prelude , containers, criterion, deepseq, file-embed, hspec, megaparsec - , mtl, old-locale, tasty, tasty-hspec, tasty-hunit, text, time + , mtl, tasty, tasty-hspec, tasty-hunit, text, time , unordered-containers, vector }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.0.1.11"; - sha256 = "09810a4s0gfza0sh4ldh355sbp3810qy8gkcpvq2048h6ajh2kz5"; + version = "1.1.0.3"; + sha256 = "0bzja2n7hxj530d3pfh58zn29vapl341fy7x6ggvp5sfgsysg7ll"; libraryHaskellDepends = [ - base composition-prelude containers deepseq megaparsec mtl - old-locale text time unordered-containers vector + base composition-prelude containers deepseq megaparsec mtl text + time unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers file-embed hspec megaparsec tasty tasty-hspec tasty-hunit text time unordered-containers vector ]; - benchmarkHaskellDepends = [ - aeson base containers criterion text time unordered-containers - vector - ]; - homepage = "https://github.com/vmchale/htoml-megaparsec"; + benchmarkHaskellDepends = [ base criterion text ]; + homepage = "https://hub.darcs.net/vmchale/htoml-megaparsec"; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -107925,14 +113476,14 @@ self: { "http-api-data" = callPackage ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring , Cabal, cabal-doctest, containers, directory, doctest, filepath - , hashable, hspec, http-types, HUnit, QuickCheck + , hashable, hspec, hspec-discover, 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.7.1"; - sha256 = "1zbmf0kkfsw7pfznisi205gh7jd284gfarxsyiavd2iw26akwqwc"; + version = "0.3.7.2"; + sha256 = "10kcpxl9m1q2dl4z2ig6ysrhrdmdg35skfh8kwx0h7f0n7d6wlb8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base bytestring containers hashable @@ -107943,11 +113494,40 @@ self: { base bytestring directory doctest filepath hspec HUnit QuickCheck quickcheck-instances text time unordered-containers uuid ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/fizruk/http-api-data"; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; }) {}; + "http-api-data_0_3_8_1" = callPackage + ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring + , Cabal, cabal-doctest, containers, directory, doctest, filepath + , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck + , quickcheck-instances, text, time, time-locale-compat + , unordered-containers, uri-bytestring, uuid-types + }: + mkDerivation { + pname = "http-api-data"; + version = "0.3.8.1"; + sha256 = "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + 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 + quickcheck-instances text time unordered-containers uuid-types + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/fizruk/http-api-data"; + description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, http-types }: mkDerivation { @@ -107962,27 +113542,26 @@ self: { }) {}; "http-client" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , deepseq, directory, exceptions, filepath, ghc-prim, hspec - , http-types, mime-types, monad-control, network, network-uri - , random, streaming-commons, text, time, transformers, zlib + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, deepseq, directory + , exceptions, filepath, ghc-prim, hspec, http-types, memory + , mime-types, monad-control, network, network-uri, random, stm + , streaming-commons, text, time, transformers, zlib }: mkDerivation { pname = "http-client"; - version = "0.5.7.0"; - sha256 = "18zza3smv5fn5clgq2nij0wqnakh950xif9lwlfqbkam5k1flhg2"; + version = "0.5.12"; + sha256 = "1m4c4zyl8y3i8bzyrgqv9kcjqzj17rwnf49dvn6745bn8kiyq6v0"; libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie deepseq exceptions filepath - ghc-prim http-types mime-types network network-uri random - streaming-commons text time transformers + array base blaze-builder bytestring case-insensitive containers + cookie deepseq exceptions filepath ghc-prim http-types memory + mime-types network network-uri random stm 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 + async base 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"; @@ -107990,6 +113569,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client_0_5_12_1" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, deepseq, directory + , exceptions, filepath, ghc-prim, hspec, http-types, memory + , mime-types, monad-control, network, network-uri, random, stm + , streaming-commons, text, time, transformers, zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.5.12.1"; + sha256 = "0gnnkcy2d2v1k44ip59s7l86jgigllsp3lsqsac08zr19lr1clab"; + libraryHaskellDepends = [ + array base blaze-builder bytestring case-insensitive containers + cookie deepseq exceptions filepath ghc-prim http-types memory + mime-types network network-uri random stm streaming-commons text + time transformers + ]; + testHaskellDepends = [ + async base 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"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -108121,6 +113729,7 @@ self: { homepage = "https://github.com/sannsyn/http-client-session"; description = "A simple abstraction over the \"http-client\" connection manager"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-streams" = callPackage @@ -108142,21 +113751,23 @@ self: { "http-client-tls" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection - , containers, criterion, cryptonite, data-default-class, exceptions + , containers, cryptonite, data-default-class, exceptions, gauge , hspec, http-client, http-types, memory, network, network-uri , text, tls, transformers }: mkDerivation { pname = "http-client-tls"; - version = "0.3.5.1"; - sha256 = "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1"; + version = "0.3.5.3"; + sha256 = "0qj3pcpgbsfsc4m52dz35khhl4hf1i0nmcpa445z82d9567vy6j7"; libraryHaskellDepends = [ base bytestring case-insensitive connection containers cryptonite data-default-class exceptions http-client http-types memory network network-uri text tls transformers ]; - testHaskellDepends = [ base hspec http-client http-types ]; - benchmarkHaskellDepends = [ base criterion http-client ]; + testHaskellDepends = [ + base connection hspec http-client http-types + ]; + benchmarkHaskellDepends = [ base gauge http-client ]; doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; @@ -108181,7 +113792,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-conduit" = callPackage + "http-conduit_2_2_4" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, exceptions, hspec, http-client @@ -108191,8 +113802,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.3.2"; - sha256 = "1f0yqka43gp7vhv7yr4q6pqr8qw0qq2yh4y2lnayhc876zpw6ng3"; + version = "2.2.4"; + sha256 = "1wcl3lpg4v1ylq9j77j9fmf6l9qbmp8dmj3a9829q19q6bbgza7l"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra exceptions http-client http-client-tls http-types lifted-base monad-control mtl resourcet @@ -108209,6 +113820,36 @@ self: { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-conduit" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, connection, cookie + , data-default-class, hspec, http-client, http-client-tls + , http-types, HUnit, mtl, network, resourcet, streaming-commons + , temporary, text, time, transformers, unliftio, unliftio-core + , utf8-string, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.3.1"; + sha256 = "0nbq3xklz5nfc4k50qj413q2acwcbs0g5am4pncbjhiamgqc6lc2"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra http-client + http-client-tls http-types mtl resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit network resourcet streaming-commons + temporary text time transformers unliftio utf8-string wai + wai-conduit warp warp-tls + ]; + doCheck = false; + homepage = "http://www.yesodweb.com/book/http-conduit"; + description = "HTTP client package with conduit interface and HTTPS support"; + license = stdenv.lib.licenses.bsd3; }) {}; "http-conduit-browser" = callPackage @@ -108256,6 +113897,7 @@ self: { homepage = "https://github.com/bazqux/http-conduit-downloader"; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-date" = callPackage @@ -108274,6 +113916,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-date_0_0_7" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, doctest + , hspec, old-locale, time + }: + mkDerivation { + pname = "http-date"; + version = "0.0.7"; + sha256 = "1hpzs646qqzp2g2qy7rx1bf3knf1hw38n82vcq6bs4mm1xzdryff"; + libraryHaskellDepends = [ array attoparsec base bytestring time ]; + testHaskellDepends = [ + base bytestring doctest hspec old-locale time + ]; + description = "HTTP Date parser/formatter"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-dispatch" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, hspec, http-client, http-client-tls, http-types @@ -108347,6 +114006,7 @@ self: { homepage = "https://github.com/owensmurray/http-grammar"; description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-kinder" = callPackage @@ -108435,34 +114095,16 @@ self: { }) {}; "http-media" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "http-media"; - version = "0.6.4"; - sha256 = "1ly93k3d6kilma8gv6y1vf4d3lz4xg5xwi5p8x10w9al13sjqxpg"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers QuickCheck - test-framework test-framework-quickcheck2 - ]; - homepage = "https://github.com/zmthy/http-media"; - description = "Processing HTTP Content-Type and Accept headers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-media_0_7_1_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , QuickCheck, test-framework, test-framework-quickcheck2 , utf8-string }: mkDerivation { pname = "http-media"; - version = "0.7.1.1"; - sha256 = "0k58368im14jwsd4wpyw9kl166zbi14ccl3adjigx8yf8k61n7zz"; + version = "0.7.1.2"; + sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy"; + revision = "1"; + editedCabalFile = "0lxlig3mhw52ixqq65c9fzawviia2fl00d7hn1diny964h8klwgc"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -108473,23 +114115,22 @@ self: { 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 - , utility-ht + , HTTP, lazyio, network, network-uri, parsec, semigroups + , transformers, utility-ht }: mkDerivation { pname = "http-monad"; - version = "0.1.1.1"; - sha256 = "0mb34zkixyrp0bmw1q8s8g6rprq6k7wq946n8as6dkwm9aya0gmd"; + version = "0.1.1.2"; + sha256 = "0s2ajy2iwi7k5zrs6asp5ncyy06jnphp4ncc130cg2kpnf32yyfz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers explicit-exception HTTP lazyio network - network-uri parsec transformers utility-ht + network-uri parsec semigroups transformers utility-ht ]; description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation"; license = stdenv.lib.licenses.bsd3; @@ -108530,6 +114171,7 @@ self: { homepage = "https://github.com/nfjinjing/http-pony-serve-wai"; description = "Serve a WAI application with http-pony"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-pony-transformer-case-insensitive" = callPackage @@ -108576,18 +114218,18 @@ self: { ({ mkDerivation, async, base, blaze-builder, bytestring , bytestring-lexing, case-insensitive, conduit, conduit-extra , connection, hspec, http-client, http-conduit, http-types, mtl - , network, QuickCheck, random, resourcet, text, tls, transformers - , vault, wai, wai-conduit, warp, warp-tls + , network, QuickCheck, random, resourcet, streaming-commons, text + , tls, transformers, vault, wai, wai-conduit, warp, warp-tls }: mkDerivation { pname = "http-proxy"; - version = "0.1.0.5"; - sha256 = "1n4l31vaq0ch4w7krycvbdycn7v6q0cnr9qm3ll4v3g0kbqy81j4"; + version = "0.1.0.6"; + sha256 = "0ixj9bcz8pw6rgdlzbp7p12v43vrkajbmr5b8fnsmzwcz6s3i3zg"; libraryHaskellDepends = [ async base blaze-builder bytestring bytestring-lexing case-insensitive conduit conduit-extra http-client http-conduit - http-types mtl network resourcet text tls transformers wai - wai-conduit warp warp-tls + http-types mtl network resourcet streaming-commons text tls + transformers wai wai-conduit warp warp-tls ]; testHaskellDepends = [ async base blaze-builder bytestring bytestring-lexing @@ -108636,6 +114278,7 @@ self: { homepage = "https://github.com/sannsyn/http-response-decoder"; description = "Declarative DSL for parsing an HTTP response"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-reverse-proxy" = callPackage @@ -108647,8 +114290,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.4.5"; - sha256 = "0v1f1z3gmc51sbxmxhnp4sspzj6mdm0ihl5x30218p1ynz9ssxjn"; + version = "0.5.0.1"; + sha256 = "1fl4gsp5743a7kzd12d7r3mwyvdq3fb7ngxlkywzphjlx61asl2y"; libraryHaskellDepends = [ async base blaze-builder bytestring case-insensitive conduit conduit-extra containers data-default-class http-client http-types @@ -108663,6 +114306,7 @@ self: { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-server" = callPackage @@ -108706,10 +114350,10 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.8.5.3"; - sha256 = "1qz55rxzd98d00qdp5hp60i5cc8f0hfir6dhq15z2jzj5bsz9nna"; + version = "0.8.5.5"; + sha256 = "1g2ygxyfq2x923df5q83wkrwhy2631r33zvffgj3fn0zwr024hhf"; revision = "1"; - editedCabalFile = "0ki3gv5lhs69hj17ng4asyqaw4wcjjpwqda79az9wkizxyvbc0ay"; + editedCabalFile = "0mgj62khq2abq53y03qww66k74pxhnid8yiqrlhggj9cjv7m2my5"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring @@ -108771,46 +114415,22 @@ self: { }) {}; "http-types" = callPackage - ({ mkDerivation, array, base, blaze-builder, bytestring - , case-insensitive, doctest, hspec, QuickCheck - , quickcheck-instances, text - }: - mkDerivation { - pname = "http-types"; - version = "0.9.1"; - sha256 = "0l7mnvqyppxpnq6ds4a9f395zdbl22z3sxiry1myfs8wvj669vbv"; - libraryHaskellDepends = [ - array base blaze-builder bytestring case-insensitive text - ]; - testHaskellDepends = [ - base blaze-builder bytestring doctest hspec QuickCheck - quickcheck-instances text - ]; - homepage = "https://github.com/aristidb/http-types"; - description = "Generic HTTP types for Haskell (for both client and server code)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-types_0_10" = callPackage - ({ mkDerivation, array, base, blaze-builder, bytestring - , case-insensitive, doctest, hspec, QuickCheck - , quickcheck-instances, text + ({ mkDerivation, array, base, bytestring, case-insensitive, doctest + , hspec, QuickCheck, quickcheck-instances, text }: mkDerivation { pname = "http-types"; - version = "0.10"; - sha256 = "1bim98ax7yqhwmq7d5zr7ii5vkx9xjsdqp6wm2ww56lzry1d8i1q"; + version = "0.12.1"; + sha256 = "1wv9k6nlvkdsxwlr7gaynphvzmvi5211gvwq96mbcxgk51a739rz"; libraryHaskellDepends = [ - array base blaze-builder bytestring case-insensitive text + array base bytestring case-insensitive text ]; testHaskellDepends = [ - base blaze-builder bytestring doctest hspec QuickCheck - quickcheck-instances text + base bytestring doctest hspec QuickCheck quickcheck-instances text ]; homepage = "https://github.com/aristidb/http-types"; description = "Generic HTTP types for Haskell (for both client and server code)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-wget" = callPackage @@ -108843,11 +114463,6 @@ self: { array base bytestring bytestring-builder case-insensitive containers psqueues stm ]; - executableHaskellDepends = [ - aeson aeson-pretty array base bytestring bytestring-builder - case-insensitive containers directory filepath hex text - unordered-containers vector word8 - ]; testHaskellDepends = [ aeson aeson-pretty array base bytestring bytestring-builder case-insensitive containers directory doctest filepath Glob hex @@ -108863,18 +114478,18 @@ self: { }) {}; "http2-client" = callPackage - ({ mkDerivation, async, base, bytestring, connection, containers - , data-default-class, http2, network, optparse-applicative, time - , tls + ({ mkDerivation, async, base, bytestring, containers + , data-default-class, deepseq, http2, network, optparse-applicative + , stm, time, tls }: mkDerivation { pname = "http2-client"; - version = "0.5.0.0"; - sha256 = "1vzbh65ifndpbwdwaam1zcy7myqxk39sl0m8244pg7ixy8yrnc25"; + version = "0.8.0.0"; + sha256 = "1c9nn6b9fs30prrkalx7n7i4a4a5ss53ky4x2nba4vcq4rgipch3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring connection containers http2 network time tls + async base bytestring containers deepseq http2 network stm time tls ]; executableHaskellDepends = [ async base bytestring data-default-class http2 optparse-applicative @@ -109064,6 +114679,7 @@ self: { homepage = "https://github.com/tmcgilchrist/huck"; description = "huck"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "huckleberry" = callPackage @@ -109076,7 +114692,6 @@ self: { homepage = "https://github.com/mitsuji/huckleberry#readme"; description = "Haskell IOT on Intel Edison and other Linux computers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "huff" = callPackage @@ -109110,6 +114725,7 @@ self: { libraryHaskellDepends = [ base containers fingertree ]; description = "Pure Haskell implementation of the Huffman encoding algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hugs2yc" = callPackage @@ -109161,8 +114777,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "human-parse"; - version = "0.1.0.2"; - sha256 = "1p7r26b3845fbdp2lxv6pqbqrlfzna8qsh7k3b1rkj3qlbw64rym"; + version = "0.1.0.3"; + sha256 = "0lr2m5gci1k0x7w1i49cb6nhbnnkym4raaagn916ahf79y05jv7d"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for parsing text entered by humans"; @@ -109187,8 +114803,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "human-text"; - version = "0.1.0.2"; - sha256 = "1jq9ksszwiy0bddw5c0zx037ig0gvsc5k030h6znkvmkpcvg096q"; + version = "0.1.0.3"; + sha256 = "0v6wrs9mcmiwk9ladjcibw1yqpbbl0y6v9i3ni39v0byby0a2zpa"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for converting values to human-friendly text"; @@ -109248,21 +114864,20 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.6.0.0"; - sha256 = "0nw906gq8jzn6kr7iq40qna3r3q1s0dvfyxz84xfp5452g56a1ah"; + version = "1.1.0.3"; + sha256 = "18zpvc77p0djay8d8lz3d6y7ppmdjk2cihakhlin7bqpzmyydkbl"; 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; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "hunit-dejafu_0_7_0_2" = callPackage + "hunit-dejafu_1_2_0_0" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.7.0.2"; - sha256 = "1n3vq17rl18kaill8ig30qvmaw60dq8w0phss5v8hhgfij64gmm6"; + version = "1.2.0.0"; + sha256 = "0djn982mlz4m58hxsghxxj34vsw78i57scxx9a1i3zk7qznmingv"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -109345,6 +114960,8 @@ self: { pname = "hunt-searchengine"; version = "0.3.0.1"; sha256 = "1y8pq158jwdl3zq5f0xdgszihp8z181lhwd92d66ckw9nh0sllw6"; + revision = "1"; + editedCabalFile = "1srw68r0ccar89vx72ndqxd3009pflx7iyy3cnlp4v50v0imsn4x"; libraryHaskellDepends = [ aeson aeson-pretty base binary bytestring containers data-default data-r-tree data-stringmap deepseq dlist filepath hslogger @@ -109410,21 +115027,21 @@ self: { homepage = "http://github.com/hunt-framework"; description = "A Command line Interface for the Hunt server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {hunt-client = null;}; "hup" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, doctest - , filepath, Glob, hspec, hspec-wai, http-client, http-client-tls - , http-types, mtl, QuickCheck, shelly, simple, split, tagsoup, tar - , temporary, text, transformers, wai, wai-extra, zlib + , filepath, Glob, hspec, hspec-core, hspec-wai, http-client + , http-client-tls, http-types, mtl, QuickCheck, shelly, simple + , split, tagsoup, tar, temporary, text, transformers, wai + , wai-extra, zlib }: mkDerivation { pname = "hup"; - version = "0.2.0.0"; - sha256 = "1blq502m6nsgshzkjdm3j694zcm5qd52rnacj7md27ram8cxkldd"; - revision = "1"; - editedCabalFile = "14fhz0s4ybnscqiz6m7ixfrkgbdkybj0mrbq70ync6dgpsb3nmm9"; + version = "0.3.0.0"; + sha256 = "1aby486naf17d3sp0mmhhpm9rvy3x85574zap6fjnkjvrr07b9iz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109436,8 +115053,9 @@ self: { transformers ]; testHaskellDepends = [ - base bytestring doctest filepath Glob hspec hspec-wai http-client - http-types QuickCheck simple temporary transformers wai wai-extra + base bytestring doctest filepath Glob hspec hspec-core hspec-wai + http-client http-types QuickCheck simple temporary transformers wai + wai-extra ]; homepage = "https://github.com/phlummox/hup"; description = "Upload packages or documentation to a hackage server"; @@ -109603,29 +115221,6 @@ self: { }) {}; "hw-balancedparens" = callPackage - ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess - , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector - }: - mkDerivation { - pname = "hw-balancedparens"; - version = "0.1.0.2"; - sha256 = "1s14dkwvm0ya75z6jqbhy3d8vyfh7dw33d3k9c3xgzwzvznbhq02"; - libraryHaskellDepends = [ - base hw-bits hw-excess hw-prim hw-rankselect-base storable-tuple - vector - ]; - testHaskellDepends = [ - base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector - ]; - benchmarkHaskellDepends = [ - base criterion hw-bits hw-prim vector - ]; - homepage = "http://github.com/haskell-works/hw-balancedparens#readme"; - description = "Balanced parentheses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-balancedparens_0_2_0_1" = callPackage ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector }: @@ -109646,30 +115241,9 @@ self: { homepage = "http://github.com/haskell-works/hw-balancedparens#readme"; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-bits" = callPackage - ({ mkDerivation, base, bytestring, criterion, hspec, hw-int - , hw-prim, hw-string-parse, QuickCheck, safe, vector - }: - mkDerivation { - pname = "hw-bits"; - version = "0.5.0.3"; - sha256 = "1xkzxfz25ah7p4zybdm0c1081kkca7515jh1d7vjysxs34w8h1yn"; - libraryHaskellDepends = [ - base bytestring hw-int hw-prim hw-string-parse safe vector - ]; - testHaskellDepends = [ - base bytestring hspec hw-prim QuickCheck vector - ]; - benchmarkHaskellDepends = [ base criterion hw-prim vector ]; - homepage = "http://github.com/haskell-works/hw-bits#readme"; - description = "Bit manipulation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-bits_0_7_0_2" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hw-int , hw-prim, hw-string-parse, QuickCheck, safe, vector }: @@ -109687,7 +115261,6 @@ self: { homepage = "http://github.com/haskell-works/hw-bits#readme"; description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-conduit" = callPackage @@ -109743,14 +115316,14 @@ self: { "hw-excess" = callPackage ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base - , QuickCheck, safe, vector + , QuickCheck, safe, storable-record, vector }: mkDerivation { pname = "hw-excess"; - version = "0.1.0.1"; - sha256 = "0q6mrmlii351iji1b0c4j7sck74zgs1hxfyj8cd3k5a6q8j3nkb1"; + version = "0.2.0.0"; + sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi"; libraryHaskellDepends = [ - base hw-bits hw-prim hw-rankselect-base safe vector + base hw-bits hw-prim hw-rankselect-base safe storable-record vector ]; testHaskellDepends = [ base hspec hw-bits hw-prim QuickCheck vector @@ -109760,24 +115333,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-excess_0_2_0_0" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base - , QuickCheck, safe, storable-record, vector + "hw-fingertree" = callPackage + ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit + , hw-hspec-hedgehog, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { - pname = "hw-excess"; - version = "0.2.0.0"; - sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi"; - libraryHaskellDepends = [ - base hw-bits hw-prim hw-rankselect-base safe storable-record vector + pname = "hw-fingertree"; + version = "0.1.0.1"; + sha256 = "1nlla161156w21g3kdcv42bm5rfz9aslh5lw7rmlw8pdrgg6g3f3"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 ]; + homepage = "https://github.com/haskell-works/hw-fingertree#readme"; + description = "Generic finger-tree structure, with example instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-fingertree-strict" = callPackage + ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit + , hw-hspec-hedgehog, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree-strict"; + version = "0.1.0.3"; + sha256 = "03njx1g23f8s8a9dcyanpfm8pzgcbyds4zwkmp7g8mshk1rljfcm"; + libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ - base hspec hw-bits hw-prim QuickCheck vector + base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 ]; - homepage = "http://github.com/haskell-works/hw-excess#readme"; - description = "Excess"; + homepage = "https://github.com/haskell-works/hw-fingertree-strict#readme"; + description = "Generic strict finger-tree structure"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-hedgehog" = callPackage @@ -109797,11 +115388,11 @@ self: { ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: mkDerivation { pname = "hw-hspec-hedgehog"; - version = "0.1.0.0"; - sha256 = "1f1yqcjdn1jbqcpm6qxajqlkirhpyshvy5zi5ccd64anz691dqdw"; + version = "0.1.0.3"; + sha256 = "0bnqvbh8jkpnannfgx1ghv5b4qvj37w1p29ap730s2bbfpsaldq2"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; testHaskellDepends = [ base hedgehog hspec ]; - homepage = "https://github.com/githubuser/hw-hspec-hedgehog#readme"; + homepage = "https://github.com/haskell-works/hw-hspec-hedgehog#readme"; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -109858,6 +115449,7 @@ self: { homepage = "http://github.com/haskell-works/hw-json#readme"; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json-lens" = callPackage @@ -109892,29 +115484,25 @@ self: { homepage = "http://github.com/haskell-works/hw-json-lens#readme"; description = "Lens for hw-json"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache , containers, errors, hashable, hspec, http-client, http-types, mtl - , pure-zlib, QuickCheck, semigroups, servant, servant-client, text - , transformers, unordered-containers + , pure-zlib, QuickCheck, semigroups, servant, servant-client + , tagged, text, transformers, unordered-containers }: mkDerivation { pname = "hw-kafka-avro"; - version = "1.3.0"; - sha256 = "0lryr18gcmgfxa10gmd5y43l62x684ahpzk53wx5z5qww0chy7fa"; + version = "1.4.0"; + sha256 = "19lk0vyrl6hcd8f053yh7m1hym2hqs9srhjq9isq19s8nqgpijc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable http-client http-types mtl pure-zlib semigroups servant - servant-client text transformers unordered-containers - ]; - executableHaskellDepends = [ - aeson avro base binary bytestring cache containers errors hashable - http-client mtl pure-zlib semigroups servant servant-client text - transformers unordered-containers + servant-client tagged text transformers unordered-containers ]; testHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable @@ -109929,13 +115517,13 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, rdkafka, regex-posix, temporary - , transformers, unix + , either, hspec, monad-loops, rdkafka, temporary, transformers + , unix }: mkDerivation { pname = "hw-kafka-client"; - version = "2.1.3"; - sha256 = "006lkyjwjsn1npznzv9ysqsap2f7w3gsxn8rimlpv0manvk8h5bg"; + version = "2.4.3"; + sha256 = "18pyayl0xyb045db5584cfbbvzvmkwm3zkpvks30vrz9sb5jx1qd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109943,17 +115531,12 @@ self: { ]; librarySystemDepends = [ rdkafka ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ - base bifunctors bytestring containers temporary transformers unix - ]; testHaskellDepends = [ base bifunctors bytestring containers either hspec monad-loops - regex-posix ]; homepage = "https://github.com/haskell-works/hw-kafka-client"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rdkafka;}; "hw-kafka-conduit" = callPackage @@ -109963,17 +115546,14 @@ self: { }: mkDerivation { pname = "hw-kafka-conduit"; - version = "2.0.0"; - sha256 = "0j1qwn9an397vl3y3mlrzhjw3c8jbmw1c0wpsywk0v0p7rfjg5nn"; + version = "2.4.0"; + sha256 = "0xzsdslkc069wccqihd50zxvm9jx6p5izwf4v44dizn42lfymm75"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bifunctors bytestring conduit conduit-extra containers exceptions hw-kafka-client mtl resourcet transformers ]; - executableHaskellDepends = [ - base bifunctors bytestring conduit containers resourcet - ]; testHaskellDepends = [ base bifunctors bytestring conduit conduit-extra containers extra hspec hw-kafka-client mtl QuickCheck resourcet transformers @@ -109981,7 +115561,6 @@ self: { homepage = "https://github.com/haskell-works/hw-kafka-conduit"; description = "Conduit bindings for hw-kafka-client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-mquery" = callPackage @@ -110036,19 +115615,6 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: - mkDerivation { - pname = "hw-prim"; - version = "0.4.0.5"; - sha256 = "1d2fs0w2bccxiw66m3brdbg0ynzb8kr8avj1rzid7g7v65nhpn5v"; - libraryHaskellDepends = [ base bytestring vector ]; - testHaskellDepends = [ base bytestring hspec QuickCheck vector ]; - homepage = "http://github.com/haskell-works/hw-prim#readme"; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_5_0_0" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { pname = "hw-prim"; @@ -110059,7 +115625,6 @@ self: { homepage = "http://github.com/haskell-works/hw-prim#readme"; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim-bits" = callPackage @@ -110085,25 +115650,38 @@ self: { }) {}; "hw-rankselect" = callPackage - ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim - , hw-rankselect-base, QuickCheck, vector + ({ mkDerivation, base, bytestring, conduit, criterion, deepseq + , directory, hedgehog, hspec, hw-balancedparens, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap + , QuickCheck, resourcet, vector }: mkDerivation { pname = "hw-rankselect"; - version = "0.8.0.2"; - sha256 = "0b9ki066c5nypy81dqyj91ghj00p1y5glhg1jpf267q6r0mjkwcm"; + version = "0.10.0.3"; + sha256 = "1jqlyprb83bnffmq6ck6xpx27mqnmrarn890r2dn8k06asghf7da"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector + base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base + vector + ]; + executableHaskellDepends = [ + base directory hw-bits hw-prim hw-rankselect-base mmap vector ]; testHaskellDepends = [ - base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector + base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog + hw-prim hw-rankselect-base mmap QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion directory hw-bits hw-prim + hw-rankselect-base mmap resourcet vector ]; homepage = "http://github.com/haskell-works/hw-rankselect#readme"; description = "Rank-select"; license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_10_0_3" = callPackage + "hw-rankselect_0_11_0_0" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, hedgehog, hspec, hw-balancedparens, hw-bits , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap @@ -110111,8 +115689,8 @@ self: { }: mkDerivation { pname = "hw-rankselect"; - version = "0.10.0.3"; - sha256 = "1jqlyprb83bnffmq6ck6xpx27mqnmrarn890r2dn8k06asghf7da"; + version = "0.11.0.0"; + sha256 = "0sywcqzrrxmlwgg4glj8fm8fn4n1a33f20lmj9bvchzh20gg340c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110158,6 +115736,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-rankselect-base_0_3_0_0" = callPackage + ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec + , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim + , hw-string-parse, QuickCheck, safe, vector + }: + mkDerivation { + pname = "hw-rankselect-base"; + version = "0.3.0.0"; + sha256 = "19gclmljps2nplfqch26grzagvsraafr4540s6x19x2m58aa3m7g"; + libraryHaskellDepends = [ + base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector + ]; + testHaskellDepends = [ + base bits-extra hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-prim QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bits-extra criterion hw-bits hw-prim vector + ]; + homepage = "http://github.com/haskell-works/hw-rankselect-base#readme"; + description = "Rank-select base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-string-parse" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { @@ -110207,23 +115810,23 @@ self: { "hw-xml" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, cereal, conduit, containers, criterion, ghc-prim - , hspec, hw-balancedparens, hw-bits, hw-conduit, hw-parser, hw-prim - , hw-rankselect, hw-rankselect-base, lens, mmap, mtl, QuickCheck - , resourcet, transformers, vector, word8 + , bytestring, cereal, conduit, containers, criterion, deepseq + , ghc-prim, hspec, hw-balancedparens, hw-bits, hw-conduit + , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap + , mtl, QuickCheck, resourcet, transformers, vector, word8 }: mkDerivation { pname = "hw-xml"; - version = "0.1.0.1"; - sha256 = "0fhf0l6zpmrj76gkhbym8ds9dg270y22hdpqxrg11gxyrdymdnbd"; + version = "0.1.0.3"; + sha256 = "15vycayfmykds6dka0kw106fjk2wg3qgifk698fwkj1i4chsia97"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array attoparsec base bytestring cereal conduit - containers ghc-prim hw-balancedparens hw-bits hw-conduit hw-parser - hw-prim hw-rankselect hw-rankselect-base lens mtl resourcet - transformers vector word8 + containers deepseq ghc-prim hw-balancedparens hw-bits hw-conduit + hw-parser hw-prim hw-rankselect hw-rankselect-base lens mtl + resourcet transformers vector word8 ]; executableHaskellDepends = [ base bytestring hw-balancedparens hw-bits hw-prim hw-rankselect @@ -110284,6 +115887,28 @@ self: { homepage = "http://github.com/aycanirican/hweblib"; description = "Haskell Web Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hwhile" = callPackage + ({ mkDerivation, alex, array, base, Cabal, containers, filepath + , happy, haskeline, mtl, repline + }: + mkDerivation { + pname = "hwhile"; + version = "0.1.1.2"; + sha256 = "1zilz8fdy90dpq6rzj98d70jw5j668fqpx28jhkpj50k72xlrpkb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers filepath haskeline mtl repline + ]; + executableHaskellDepends = [ array base containers filepath mtl ]; + executableToolDepends = [ alex happy ]; + testHaskellDepends = [ array base Cabal containers mtl ]; + description = "An implementation of Neil D. Jones' While language"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hworker" = callPackage @@ -110504,6 +116129,7 @@ self: { homepage = "https://github.com/UweSchmidt/hxt"; description = "Cache for HXT XML Documents and other binary data"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-charproperties" = callPackage @@ -110608,8 +116234,8 @@ self: { pname = "hxt-pickle-utils"; version = "0.1.0.3"; sha256 = "1id9459yphsbxqa0z89dhsmqqcgvk2axv91d05aw3n6r4ygs3nwx"; - revision = "2"; - editedCabalFile = "109jh2iibhnllkwpqpiyfwdqjn3v06ap58fhyzikjdqzz0rzwgh5"; + revision = "3"; + editedCabalFile = "0d5fg718y7xzw76ip33q0w1liqk70q9074qkd198mjnijxjcrkf3"; libraryHaskellDepends = [ base hxt mtl ]; homepage = "https://github.com/silkapp/hxt-pickle-utils"; description = "Utility functions for using HXT picklers"; @@ -110748,6 +116374,7 @@ self: { homepage = "http://github.com/DamienCassou/HYahtzee"; description = "A Yahtzee game implementation in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyakko" = callPackage @@ -110792,14 +116419,14 @@ self: { }) {}; "hybrid-vectors" = callPackage - ({ mkDerivation, base, deepseq, primitive, vector }: + ({ mkDerivation, base, deepseq, primitive, semigroups, vector }: mkDerivation { pname = "hybrid-vectors"; - version = "0.2.1"; - sha256 = "18nc6qw7f9rxi0h6qk28yq6i0x19gwjzq2v9mi2ajxnwzvydip1f"; - revision = "1"; - editedCabalFile = "1i73cfi226l8nivqw9dxnxajkdsgxkh89h00mgsrplf60kdh4wzh"; - libraryHaskellDepends = [ base deepseq primitive vector ]; + version = "0.2.2"; + sha256 = "1mw69xjdncj6kqa2mvag8xc79y4jijnh2qg6ahrhifb4vxqw7ij1"; + libraryHaskellDepends = [ + base deepseq primitive semigroups vector + ]; homepage = "http://github.com/ekmett/hybrid-vectors"; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; license = stdenv.lib.licenses.bsd3; @@ -111156,6 +116783,7 @@ self: { ]; description = "Display instances for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyper-haskell-server" = callPackage @@ -111264,6 +116892,7 @@ self: { homepage = "http://github.com/analytics/hyperloglog"; description = "An approximate streaming (constant space) unique object counter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyperloglogplus" = callPackage @@ -111319,10 +116948,10 @@ self: { }: mkDerivation { pname = "hyphenation"; - version = "0.7"; - sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s"; + version = "0.7.1"; + sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52"; revision = "2"; - editedCabalFile = "0bf147dfnp8lw4kmscgkmd4pnawzv0yc63hhjr7sjvk5xyyvb5mq"; + editedCabalFile = "1pbsq3y0f0j6cl17narqrwxwwpxsvwgazfbqa5k08m2n0s885pfk"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -111333,7 +116962,7 @@ self: { ]; homepage = "http://github.com/ekmett/hyphenation"; description = "Configurable Knuth-Liang hyphenation"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "hypher" = callPackage @@ -111398,6 +117027,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hzenity" = callPackage + ({ mkDerivation, base, containers, data-default, process + , process-extras, text, time + }: + mkDerivation { + pname = "hzenity"; + version = "0.1"; + sha256 = "04y0a72rczwsmxig029f6jgdkc15rmf2fnsbc5pvy26nksh5i7zk"; + libraryHaskellDepends = [ + base containers data-default process process-extras text time + ]; + homepage = "https://github.com/emilaxelsson/hzenity"; + description = "Haskell interface to Zenity dialogs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hzk" = callPackage ({ mkDerivation, base, bytestring, resource-pool, tasty , tasty-hunit, time, zookeeper_mt @@ -111549,6 +117194,7 @@ self: { homepage = "https://github.com/ibotty/iban"; description = "Validate and generate IBANs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ibus-hs" = callPackage @@ -111581,17 +117227,19 @@ self: { homepage = "http://github.com/chrisdone/ical#readme"; description = "iCalendar format parser and org-mode converter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "icon-fonts" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "icon-fonts"; - version = "0.2.1.0"; - sha256 = "0i0gxrvmvlklsdr70fgajj9padgz8s743hs3i8lb4wnp71n7vyvl"; + version = "0.2.1.1"; + sha256 = "0lc5filf2xydjrsq9d5qlwz3y76pn590pjiqjjhibkk4dhnys3gs"; libraryHaskellDepends = [ base ]; description = "Package for handling icon fonts in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iconv" = callPackage @@ -111620,7 +117268,6 @@ self: { homepage = "https://github.com/adinapoli/iconv-typed#readme"; description = "Type safe iconv wrapper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ide-backend" = callPackage @@ -111738,6 +117385,8 @@ self: { pname = "ideas"; version = "1.6"; sha256 = "0xl49alcsrr913yk7nj0ln86r7428arb12r1nvx2rywmrfppv9yy"; + revision = "1"; + editedCabalFile = "1c4l8z3pkccwhza10yry74dkji48y614i9hkx40rfz8aw3rg16ls"; libraryHaskellDepends = [ base cgi containers Diff directory filepath parsec QuickCheck random time uniplate wl-pprint @@ -111745,6 +117394,7 @@ self: { homepage = "http://ideas.cs.uu.nl/www/"; description = "Feedback services for intelligent tutoring systems"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ideas-math" = callPackage @@ -111788,8 +117438,8 @@ self: { pname = "identicon"; version = "0.2.2"; sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n"; - revision = "1"; - editedCabalFile = "0jlm9cmw0ycbyifab7bzkmykj8w7vn2wyc6pfadfjrhb76zyvcxr"; + revision = "3"; + editedCabalFile = "0vya6zm3nnbdv3wmj3dwqwwjgsagql8q17078knhjddv2lm8m49q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring JuicyPixels ]; testHaskellDepends = [ @@ -111803,6 +117453,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "identicon-style-squares" = callPackage + ({ mkDerivation, base, bytestring, cryptohash, identicon + , JuicyPixels, polyvariadic + }: + mkDerivation { + pname = "identicon-style-squares"; + version = "0.1.0.0"; + sha256 = "12iawbazg5dd6n2giyib3ihj42xh9fnp53lgi3a5gd5x8spixwi9"; + libraryHaskellDepends = [ + base identicon JuicyPixels polyvariadic + ]; + testHaskellDepends = [ + base bytestring cryptohash identicon JuicyPixels + ]; + homepage = "https://github.com/fgaz/identicon-styles"; + description = "Squares style for the identicon package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "identifiers" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, containers , criterion, deepseq, hashable, ListLike, QuickCheck @@ -111825,6 +117494,7 @@ self: { ]; description = "Numeric identifiers for values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "idiii" = callPackage @@ -111898,65 +117568,20 @@ 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, 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 = "1.0"; - sha256 = "1srbz0cyvd0k1yqgbrwnfj94yg5y3z533q1kzac96z1h7v454s5h"; - configureFlags = [ "-fcurses" "-f-execonly" "-fffi" "-fgmp" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async - base base64-bytestring binary blaze-html blaze-markup bytestring - 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 = [ - base directory filepath haskeline transformers - ]; - testHaskellDepends = [ - base bytestring containers directory filepath haskeline - optparse-applicative process tagged tasty tasty-golden tasty-rerun - time transformers - ]; - homepage = "http://www.idris-lang.org/"; - description = "Functional Programming Language with Dependent Types"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) gmp;}; - - "idris_1_1_1" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, array, async, base, base64-bytestring, binary , blaze-html, blaze-markup, bytestring, Cabal, cheapskate , code-page, containers, deepseq, directory, filepath, fingertree - , fsnotify, gmp, haskeline, ieee754, libffi, mtl, network - , optparse-applicative, parsers, pretty, process, regex-tdfa, safe + , fsnotify, gmp, haskeline, ieee754, libffi, megaparsec, mtl + , network, optparse-applicative, 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 + , text, time, transformers, uniplate, unix, unordered-containers + , utf8-string, vector, vector-binary-instances, zip-archive }: mkDerivation { pname = "idris"; - version = "1.1.1"; - sha256 = "0rq43i3mf7b4yiwzrzzpyh3ldka3j514ms9cf31vsfpy0jn3bvkp"; + version = "1.2.0"; + sha256 = "0bim5lmr1wh3sc5nj5axy8xa2qq8rajp13x363mb9kkrnfy5wbxk"; configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -111966,11 +117591,11 @@ self: { aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async base base64-bytestring binary blaze-html blaze-markup bytestring 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 + fingertree fsnotify haskeline ieee754 libffi megaparsec mtl network + optparse-applicative pretty process regex-tdfa safe split + terminal-size text time transformers uniplate unix + unordered-containers utf8-string vector vector-binary-instances + zip-archive ]; librarySystemDepends = [ gmp ]; executableHaskellDepends = [ @@ -111984,7 +117609,6 @@ self: { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -112144,6 +117768,7 @@ self: { homepage = "https://github.com/olynch/ige"; description = "An keyboard-driven interactive graph editor"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ige-mac-integration" = callPackage @@ -112231,8 +117856,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.9.0.1"; - sha256 = "1xfp0pzxsfcz8h4f27fqvbc6pprwz45cgq5sa393z3wqy17ni4lq"; + version = "0.9.0.3"; + sha256 = "13cblc7wy92gbsvvbmxmp1r9c3fkmzl61adan8v9zxqbgw1w284p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -112254,7 +117879,6 @@ self: { homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-aeson" = callPackage @@ -112263,8 +117887,8 @@ self: { }: mkDerivation { pname = "ihaskell-aeson"; - version = "0.3.0.0"; - sha256 = "0h2bbkqwl8mdyn24n0lphcjfrvmfq8ckincv3rncspp9h0v705m7"; + version = "0.3.0.1"; + sha256 = "1ds13a2j2bdr86gcb6vr8dfsb9fjia670lzwwqk4hsvyjgsbd2d7"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring here ihaskell text ]; @@ -112291,13 +117915,12 @@ self: { ({ mkDerivation, base, blaze-html, blaze-markup, ihaskell }: mkDerivation { pname = "ihaskell-blaze"; - version = "0.3.0.0"; - sha256 = "1il3iz1nksh5v753srvchrjdazf7dqsd3q59w7crzbyrlx81v97b"; + version = "0.3.0.1"; + sha256 = "1733lg13v3pn95249gxbxrvbwfg2a95badvf98vkx6hx2mbxv9q7"; libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-charts" = callPackage @@ -112306,8 +117929,8 @@ self: { }: mkDerivation { pname = "ihaskell-charts"; - version = "0.3.0.0"; - sha256 = "0nlimyx953v1s4xgzdb9987i9bw1bdralkg2x6cp41kzqd49i4f3"; + version = "0.3.0.1"; + sha256 = "1m7jxl1pxl0hcfa24xgjcwj4k50an8phm2lkpr4493yr1x2isk35"; libraryHaskellDepends = [ base bytestring Chart Chart-cairo data-default-class directory ihaskell @@ -112315,7 +117938,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-diagrams" = callPackage @@ -112324,8 +117946,8 @@ self: { }: mkDerivation { pname = "ihaskell-diagrams"; - version = "0.3.1.0"; - sha256 = "18q7m6xrshn1ixn0j75bdvpgvjq63sic3dfjzcz9zk73zmvpj4qz"; + version = "0.3.2.1"; + sha256 = "0ssczqr41nrbrdr95vz457mwxcpmcrwd1bihzccmici1fvjd13rx"; libraryHaskellDepends = [ active base bytestring diagrams diagrams-cairo diagrams-lib directory ihaskell text @@ -112349,17 +117971,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ihaskell-gnuplot" = callPackage + ({ mkDerivation, base, bytestring, gnuplot, ihaskell }: + mkDerivation { + pname = "ihaskell-gnuplot"; + version = "0.1.0.1"; + sha256 = "1qdcx0y52w805z5dg2xwsy1ykbbk05i4k04y0w3r4r3wwjvq3kk6"; + libraryHaskellDepends = [ base bytestring gnuplot ihaskell ]; + homepage = "http://www.github.com/gibiansky/ihaskell"; + description = "IHaskell display instance for Gnuplot (from gnuplot package)"; + license = stdenv.lib.licenses.mit; + }) {}; + "ihaskell-hatex" = callPackage ({ mkDerivation, base, HaTeX, ihaskell, text }: mkDerivation { pname = "ihaskell-hatex"; - version = "0.2.1.0"; - sha256 = "098mbabwsl5i5dnvdy732ivrpzyb5njpr4483zss22axdni9p68i"; + version = "0.2.1.1"; + sha256 = "0rsfavpxm14bbrjcsi9rps3p1bjhhgvam0znhn8vwfmic3fpsda8"; libraryHaskellDepends = [ base HaTeX ihaskell text ]; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for hatex"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-inline-r" = callPackage @@ -112378,7 +118011,6 @@ self: { homepage = "https://tweag.github.io/HaskellR/"; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-juicypixels" = callPackage @@ -112386,15 +118018,14 @@ self: { }: mkDerivation { pname = "ihaskell-juicypixels"; - version = "0.3.0.0"; - sha256 = "0apsll540z4hzzs39bqk14iadnr4rjp873q712la7lp2xnyf4k0y"; + version = "1.1.0.1"; + sha256 = "1fjngq27572rlri9m6674ddbgqh5ygl5dagma3z50m1l8n0g7z6s"; libraryHaskellDepends = [ base bytestring directory ihaskell JuicyPixels ]; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-magic" = callPackage @@ -112403,8 +118034,8 @@ self: { }: mkDerivation { pname = "ihaskell-magic"; - version = "0.3.0.0"; - sha256 = "05jvyca163daqrmpb7fhk1wng04vk4bayffp0lp68sy3zskrjndl"; + version = "0.3.0.1"; + sha256 = "02zqlvnl73qkbx1yx7fc9dwcg3k7fk9jr9iqn22l38wsk01nm7c2"; libraryHaskellDepends = [ base base64-bytestring bytestring ihaskell ipython-kernel magic text utf8-string @@ -112412,7 +118043,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-parsec" = callPackage @@ -112433,16 +118063,15 @@ self: { }) {}; "ihaskell-plot" = callPackage - ({ mkDerivation, base, bytestring, ihaskell, plot }: + ({ mkDerivation, base, bytestring, hmatrix, ihaskell, plot }: mkDerivation { pname = "ihaskell-plot"; - version = "0.3.0.0"; - sha256 = "17qp2ln9v4sv9i3biyxgyq0csqikxwm5gs612fn5zsl1ixznj1h1"; - libraryHaskellDepends = [ base bytestring ihaskell plot ]; + version = "0.3.0.1"; + sha256 = "12bi8im5489kmy0d26kn3hljkj4c1xynsa97h6nh5dp53awklm3y"; + libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ]; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instance for Plot (from plot package)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-rlangqq" = callPackage @@ -112470,8 +118099,8 @@ self: { }: mkDerivation { pname = "ihaskell-widgets"; - version = "0.2.3.1"; - sha256 = "0ay3wpv8ayyxvky3cpyzmwpbgkxc76avr119nb632a7nig74rzvp"; + version = "0.2.3.2"; + sha256 = "18kp3s534k241ld1s0ds5hln47pc863dfs3i6r9w67adnf6qhff8"; libraryHaskellDepends = [ aeson base containers ihaskell ipython-kernel scientific singletons text unix unordered-containers vector vinyl @@ -112479,15 +118108,14 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IPython standard widgets for IHaskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihs" = callPackage ({ mkDerivation, base, process }: mkDerivation { pname = "ihs"; - version = "0.1.0.1"; - sha256 = "0q7wa5pgf4ga7pmjwjxacqmdbhqricsv9xkzfrcg314lag8wvdgb"; + version = "0.1.0.2"; + sha256 = "0cprv8g7kz07s5954020ac9yfggf3d2wmwp4xa61q4sz5rs7wiwq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -112596,7 +118224,6 @@ self: { base bytestring filepath resourcet text transformers vector ]; libraryPkgconfigDepends = [ imagemagick ]; - executablePkgconfigDepends = [ imagemagick ]; testHaskellDepends = [ base bytestring directory filepath lifted-base QuickCheck resourcet tasty tasty-hunit text transformers vector @@ -112636,8 +118263,8 @@ self: { pname = "imagesize-conduit"; version = "1.1"; sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i"; - revision = "1"; - editedCabalFile = "1gq749v6558zkvvn8iqkd4iqv4giiysxjqb2kncarnhghkkbgbaf"; + revision = "3"; + editedCabalFile = "0p4zmizr01pg3d7gb0q88j1alvvlzbdvzyf1wbgajng68a4g0li9"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions ]; @@ -112658,8 +118285,8 @@ self: { }: mkDerivation { pname = "imap"; - version = "0.3.0.4"; - sha256 = "021ya9pkf8q1nk805ck5hhm06q9lnp22d78hr0nz112xbxm5rqkw"; + version = "0.3.0.6"; + sha256 = "1acmjpp2l4d7p5yxayd3w6h8mc29siq3y3s50cj0n8japmqrrcgm"; libraryHaskellDepends = [ attoparsec base bytestring connection containers derive either exceptions hslogger list-t network pipes random rolling-queue stm @@ -112737,44 +118364,94 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "imm" = 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 + "imj-animation" = callPackage + ({ mkDerivation, base, imj-base, imj-prelude, mtl }: + mkDerivation { + pname = "imj-animation"; + version = "0.1.0.2"; + sha256 = "1v0rji1b45n309wn4ld5fs60rri8gn4xg0wz319f2mcqqrih6ir4"; + libraryHaskellDepends = [ base imj-base imj-prelude mtl ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-animation/README.md"; + description = "Animation Framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imj-base" = callPackage + ({ mkDerivation, ansi-terminal, base, imj-prelude, mtl, primitive + , random, terminal-size, text, time, vector, vector-algorithms }: mkDerivation { - pname = "imm"; - version = "1.2.0.0"; - sha256 = "1bpcsahzvf4qa1pzga84wqflk259wcqd41r3rfxk2w3rzdlns999"; - revision = "1"; - editedCabalFile = "1yk1vih0fr53wrq5ksjwi21ba51r6qxhvyzz30iycdbv3zm53pmw"; + pname = "imj-base"; + version = "0.1.0.2"; + sha256 = "1b42xqzbgr47r2rkhy9299p68z9imgx19xc1d5rvfc3qyg8ciph2"; 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 + ansi-terminal base imj-prelude mtl primitive random terminal-size + text time vector vector-algorithms ]; - 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; + executableHaskellDepends = [ + ansi-terminal base imj-prelude mtl text time + ]; + testHaskellDepends = [ + ansi-terminal base imj-prelude mtl text time + ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-base/README.md"; + description = "Game engine with geometry, easing, animated text, delta rendering"; + license = stdenv.lib.licenses.bsd3; }) {}; - "imm_1_2_1_0" = callPackage + "imj-game-hamazed" = callPackage + ({ mkDerivation, base, containers, imj-animation, imj-base + , imj-prelude, matrix, mtl, terminal-size, text, vector + }: + mkDerivation { + pname = "imj-game-hamazed"; + version = "0.1.0.2"; + sha256 = "0s0a2c1pfp5mwfmh1fjbq83ws68d8k5r526b7qmq36p4n78hx22g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers imj-animation imj-base imj-prelude matrix mtl + terminal-size text vector + ]; + executableHaskellDepends = [ base imj-prelude ]; + testHaskellDepends = [ base imj-base mtl text ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-game-hamazed//README.md"; + description = "A game with flying numbers and 8-bit color animations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imj-measure-stdout" = callPackage + ({ mkDerivation, base, imj-prelude, optparse-applicative }: + mkDerivation { + pname = "imj-measure-stdout"; + version = "0.1.0.2"; + sha256 = "15s7dd241z9lzm0nb46yr0y7rjryy6jydwfgigcsalv5my4p2j6x"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base imj-prelude optparse-applicative + ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-measure-stdout/README.md"; + description = "An application to determine the maximum capacity of stdout buffer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imj-prelude" = callPackage + ({ mkDerivation, base, mtl, text }: + mkDerivation { + pname = "imj-prelude"; + version = "0.1.0.2"; + sha256 = "1nv3fxps3i4znibv98qygxdl22dzri5zkw6hjaqajb4nlnh4bd0v"; + libraryHaskellDepends = [ base mtl text ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-prelude/README.md"; + description = "Prelude library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imm" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base , blaze-html, blaze-markup, bytestring, case-insensitive , chunked-data, comonad, conduit, conduit-combinators, connection @@ -112829,6 +118506,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "immortal_0_3" = callPackage + ({ mkDerivation, base, stm, tasty, tasty-hunit, transformers + , unliftio-core + }: + mkDerivation { + pname = "immortal"; + version = "0.3"; + sha256 = "120znjn7jrmcnzgka8zbiih4g8imh732iivjdzzbpj1kgywrvj0i"; + libraryHaskellDepends = [ base stm unliftio-core ]; + testHaskellDepends = [ base stm tasty tasty-hunit transformers ]; + homepage = "https://github.com/feuerbach/immortal"; + description = "Spawn threads that never die (unless told to do so)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "imparse" = callPackage ({ mkDerivation, ascetic, base, compilation, containers, directory , indents, MissingH, parsec, richreports, split, staticanalysis @@ -112959,6 +118652,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "importify" = callPackage + ({ mkDerivation, aeson, aeson-pretty, autoexporter, base + , bytestring, Cabal, containers, filepath, fmt, foldl, hashable + , haskell-names, haskell-src-exts, hse-cpp, hspec, log-warper + , microlens-platform, optparse-applicative, path, path-io + , pretty-simple, syb, template-haskell, text, text-format, turtle + , universum, unordered-containers, yaml + }: + mkDerivation { + pname = "importify"; + version = "1.0.1"; + sha256 = "1snm75p3p3nvjclqis6qglb17gr0pm2dw0i980jpzrqm3n3kciy3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty autoexporter base bytestring Cabal containers + filepath fmt foldl hashable haskell-names haskell-src-exts hse-cpp + log-warper microlens-platform path path-io pretty-simple syb + template-haskell text text-format turtle universum + unordered-containers yaml + ]; + executableHaskellDepends = [ + base log-warper optparse-applicative path path-io text universum + ]; + testHaskellDepends = [ + base filepath hspec log-warper microlens-platform path path-io + universum unordered-containers + ]; + homepage = "https://github.com/serokell/importify"; + description = "Tool for haskell imports refactoring"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "imports" = callPackage ({ mkDerivation, base, directory, filepath, mtl }: mkDerivation { @@ -112977,10 +118704,10 @@ self: { ({ mkDerivation, base, lens }: mkDerivation { pname = "impossible"; - version = "1.0.0"; - sha256 = "1qkpwa2am439bpngiiwgh14cg19d4mp6s9qqa890rvm5pqh8skvz"; + version = "1.1.1"; + sha256 = "0drq4rzbljql51hc2d8ldsm6xhsj7imlsxclivmf3lr9lykkp0p1"; libraryHaskellDepends = [ base lens ]; - homepage = "https://github.com/wdanilo/impossible"; + homepage = "https://github.com/luna/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."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -113005,6 +118732,7 @@ self: { homepage = "http://www.nomyx.net"; description = "Reactive programming language based on a DSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {Imprevu = null;}; @@ -113030,6 +118758,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "imprint" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, hspec }: + mkDerivation { + pname = "imprint"; + version = "0.0.1.0"; + sha256 = "0f56zy6ay6wvcvqfplvc3gckngxngxm9r62h1w36lxm74xy8544v"; + revision = "1"; + editedCabalFile = "13418pfcsanj7cl651v4qqbypgjkrpld2gs560kpw3k2lj6w4wa0"; + libraryHaskellDepends = [ base binary bytestring constraints ]; + testHaskellDepends = [ base binary constraints hspec ]; + homepage = "https://github.com/mrkkrp/imprint"; + description = "Serialization of arbitrary Haskell expressions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "improve" = callPackage ({ mkDerivation, base, mtl, yices }: mkDerivation { @@ -113051,8 +118794,8 @@ self: { }: mkDerivation { pname = "impure-containers"; - version = "0.4.1"; - sha256 = "06z74yxa3pxwa0ad1464riqjzylnsldzkzfpw1di7n4a8a0g0n0x"; + version = "0.4.3"; + sha256 = "003r3ppwdwndg8q84bnh299f04b88bhnxxl65nbrz9xl77lfz2y0"; libraryHaskellDepends = [ base containers ghc-prim hashable primitive vector ]; @@ -113106,10 +118849,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "inchworm"; - version = "1.0.2.1"; - sha256 = "19fx9nrx1jia4qz3rhjsdmmmas7bn5rl59b2y2lnzyyz6n83sfzc"; - revision = "1"; - editedCabalFile = "0yg8x27fk0kr99ways4h64a5wbxmnh59l8mis9xd0faqx7hadic7"; + version = "1.0.2.2"; + sha256 = "0r8a8hg3fzfc619zsjdnid1la0njnfrijhqfgqjmis4ncivah52h"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/DDCSF/inchworm"; description = "Inchworm Lexer Framework"; @@ -113133,6 +118874,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "incremental" = callPackage + ({ mkDerivation, base, containers, deepseq, semigroups }: + mkDerivation { + pname = "incremental"; + version = "0"; + sha256 = "01fvc963gln6svash9cf9v2wbfnssh4j5r49l6y23zmnmqnzxs8x"; + libraryHaskellDepends = [ base containers deepseq semigroups ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/fumieval/incremental#readme"; + description = "incremental update library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "incremental-computing" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers , deepseq, dlist, fingertree, order-maintenance, QuickCheck @@ -113185,8 +118939,8 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.2.5.2"; - sha256 = "0qlawnlghp8cz96sc6kjzhp0dlinmnyh38gjcp6i1wfn2qy8qy7d"; + version = "0.2.5.3"; + sha256 = "0646hxjd25hpmffabbdp6bxa5720gd99hgg31ifcx8nprlm8sl7a"; libraryHaskellDepends = [ base monoid-subclasses ]; testHaskellDepends = [ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck @@ -113197,6 +118951,7 @@ self: { homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -113310,13 +119065,14 @@ self: { ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }: mkDerivation { pname = "indents"; - version = "0.4.0.0"; - sha256 = "15flb4wb5d2pwzqqnh5szzd82nr9gxrc89b2qpzi5m2dxbwd6y4l"; + version = "0.4.0.1"; + sha256 = "0zv8mzn6r14fjgm2llg3babzgdfdkb97r2avj34lfjzmql4yrkql"; libraryHaskellDepends = [ base mtl parsec ]; testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; homepage = "http://github.com/jaspervdj/indents"; description = "indentation sensitive parser-combinators for parsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "index-core" = callPackage @@ -113382,6 +119138,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indexed-list-literals" = callPackage + ({ mkDerivation, base, OneTuple }: + mkDerivation { + pname = "indexed-list-literals"; + version = "0.1.0.1"; + sha256 = "1l38x0s90gfsrfz43k9sx0xbv4pg93m2pfm6hy3rk52wdxrw0qad"; + libraryHaskellDepends = [ base OneTuple ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/davidm-d/indexed-list-literals"; + description = "Type safe indexed list literals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "indexed-list-literals_0_2_0_0" = callPackage + ({ mkDerivation, base, Only }: + mkDerivation { + pname = "indexed-list-literals"; + version = "0.2.0.0"; + sha256 = "0n0j5x4v099000fm2ar0lmn06f21gnq39srmimy9bm3zisx8zmzd"; + libraryHaskellDepends = [ base Only ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/davidm-d/indexed-list-literals"; + description = "Type safe indexed list literals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "indextype" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -113545,33 +119328,14 @@ self: { }) {}; "inflections" = callPackage - ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec - , megaparsec, QuickCheck, text, unordered-containers - }: - mkDerivation { - pname = "inflections"; - version = "0.3.0.0"; - sha256 = "1w96i4rnsxxzrjjvqzjs7dqbs4h4nrdw84cxvizb4bq19y0cp483"; - libraryHaskellDepends = [ - base exceptions megaparsec text unordered-containers - ]; - testHaskellDepends = [ - base hspec hspec-megaparsec megaparsec QuickCheck text - ]; - homepage = "https://github.com/stackbuilders/inflections-hs"; - description = "Inflections library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inflections_0_4_0_0" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , hspec-megaparsec, megaparsec, QuickCheck, text , unordered-containers }: mkDerivation { pname = "inflections"; - version = "0.4.0.0"; - sha256 = "1m42sigx621yzd6sznaas6917skyw8lf5ynfcjd87jybhv2r9g2k"; + version = "0.4.0.1"; + sha256 = "1vc04afp5lvh5drs4pf6djmkn80513h4phkw5gs4g4d37h3d3jg2"; libraryHaskellDepends = [ base exceptions megaparsec text unordered-containers ]; @@ -113581,7 +119345,6 @@ self: { homepage = "https://github.com/stackbuilders/inflections-hs"; description = "Inflections library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inflist" = callPackage @@ -113599,34 +119362,61 @@ self: { }) {}; "influxdb" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clock - , containers, foldl, http-client, http-types, HUnit, lens, mtl - , mwc-random, network, optional-args, scientific, tasty - , tasty-hunit, tasty-quickcheck, tasty-th, text, time - , unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck + , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, text, time, unordered-containers, vector }: mkDerivation { pname = "influxdb"; - version = "1.2.2"; - sha256 = "09fabf4yx0k1rb6i2msmlszvx1v318n35gmc9aakvicnzkvxarrm"; + version = "1.3.0.1"; + sha256 = "08i7bflcmvg5s4r5hv1xxd5niyq5irnawnjwmbz7w3ys0ink1bfl"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers foldl http-client http-types lens network optional-args scientific text time unordered-containers vector ]; - executableHaskellDepends = [ - aeson base bytestring containers foldl http-client lens mwc-random - network optional-args text time vector + testHaskellDepends = [ + base doctest http-client HUnit mtl QuickCheck tasty tasty-hunit + tasty-quickcheck tasty-th template-haskell text vector + ]; + homepage = "https://github.com/maoe/influxdb-haskell"; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "influxdb_1_6_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck + , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, time, unordered-containers + , vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.6.0"; + sha256 = "1fmz5n3mp3w1v2axp9g1nw9h5sj6cw3xbs44xczn59sgpmz5hv34"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector ]; testHaskellDepends = [ - base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck - tasty-th text vector + base doctest http-client HUnit mtl QuickCheck tasty tasty-hunit + tasty-quickcheck tasty-th template-haskell text vector ]; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -113661,8 +119451,8 @@ self: { ({ mkDerivation, attoparsec, base, text, unordered-containers }: mkDerivation { pname = "ini"; - version = "0.3.5"; - sha256 = "1iicavbjr4qmlcdxh32cgqxlxd80xvzyxxskrs3hji1qzrnq7lxz"; + version = "0.3.6"; + sha256 = "1n9wsl7nz910bc8jx9ps7pvpql4hlnryjkqbdpfq0phjb9sf7fzw"; libraryHaskellDepends = [ attoparsec base text unordered-containers ]; @@ -113738,12 +119528,11 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "inline-c" = callPackage + "inline-c_0_5_6_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring - , containers, cryptohash, directory, filepath, gsl, gslcblas - , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq - , regex-posix, template-haskell, transformers, unordered-containers - , vector + , containers, cryptohash, directory, filepath, hashable, hspec, mtl + , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix + , template-haskell, transformers, unordered-containers, vector }: mkDerivation { pname = "inline-c"; @@ -113756,7 +119545,6 @@ self: { directory filepath hashable mtl parsec parsers QuickCheck template-haskell transformers unordered-containers vector ]; - executableSystemDepends = [ gsl gslcblas ]; testHaskellDepends = [ ansi-wl-pprint base containers hashable hspec parsers QuickCheck raw-strings-qq regex-posix template-haskell transformers @@ -113764,13 +119552,14 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) gsl; gslcblas = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; - "inline-c_0_6_0_5" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, gsl - , gslcblas, hashable, hspec, mtl, parsec, parsers, QuickCheck - , raw-strings-qq, regex-posix, template-haskell, transformers - , unordered-containers, vector + "inline-c" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, template-haskell, transformers, unordered-containers + , vector }: mkDerivation { pname = "inline-c"; @@ -113782,7 +119571,6 @@ self: { ansi-wl-pprint base bytestring containers hashable mtl parsec parsers template-haskell transformers unordered-containers vector ]; - executableSystemDepends = [ gsl gslcblas ]; testHaskellDepends = [ ansi-wl-pprint base containers hashable hspec parsers QuickCheck raw-strings-qq regex-posix template-haskell transformers @@ -113790,10 +119578,9 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gsl; gslcblas = null;}; + }) {}; - "inline-c-cpp" = callPackage + "inline-c-cpp_0_1_0_0" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { pname = "inline-c-cpp"; @@ -113803,9 +119590,10 @@ self: { testHaskellDepends = [ base ]; description = "Lets you embed C++ code into Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "inline-c-cpp_0_2_1_0" = callPackage + "inline-c-cpp" = callPackage ({ mkDerivation, base, hspec, inline-c, safe-exceptions , template-haskell }: @@ -113819,7 +119607,6 @@ self: { testHaskellDepends = [ base hspec inline-c safe-exceptions ]; description = "Lets you embed C++ code into Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inline-c-win32" = callPackage @@ -113839,40 +119626,14 @@ self: { }) {}; "inline-java" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, containers - , directory, distributed-closure, filepath, ghc-heap-view, hspec - , inline-c, jni, jvm, language-java, process, singletons, syb - , template-haskell, temporary, text, thread-local-storage, vector - }: - mkDerivation { - pname = "inline-java"; - version = "0.6.5"; - sha256 = "1pqai3jblcz52z76hwshzzajpnb5c62bs0i1b87hk8f8s0isask9"; - revision = "1"; - editedCabalFile = "1va62gdb22sjq5z3ydl9nbcdy1x8935q3zsdn9dibp6af1v45f5b"; - libraryHaskellDepends = [ - base binary bytestring Cabal containers directory - distributed-closure filepath ghc-heap-view inline-c jni jvm - language-java process singletons syb template-haskell temporary - text thread-local-storage vector - ]; - testHaskellDepends = [ - base bytestring hspec jni jvm singletons text - ]; - homepage = "http://github.com/tweag/inline-java#readme"; - description = "Java interop via inline Java code in Haskell modules"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "inline-java_0_7_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc , hspec, jni, jvm, language-java, mtl, process, template-haskell , temporary, text }: mkDerivation { pname = "inline-java"; - version = "0.7.0"; - sha256 = "12lzh63wg0nk1lcn9627mbyf251ijlcc65iasmmnwljkxg0qrkf7"; + version = "0.8.2"; + sha256 = "0f38w4p29xzrzqjdn2r3yfh2m9iai6dwbj52jhrliiy87gnvwwmy"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ghc jni jvm language-java mtl process template-haskell temporary text @@ -113881,13 +119642,12 @@ self: { homepage = "http://github.com/tweag/inline-java#readme"; description = "Java interop via inline Java code in Haskell modules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inline-r" = callPackage - ({ mkDerivation, aeson, base, bytestring, c2hs, containers - , criterion, data-default-class, deepseq, directory, exceptions - , filepath, ieee754, mtl, pretty, primitive, process + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , data-default-class, deepseq, directory, exceptions, filepath + , ieee754, inline-c, mtl, pretty, primitive, process , quickcheck-assertions, R, reflection, setenv, silently , singletons, strict, tasty, tasty-expected-failure, tasty-golden , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text @@ -113895,16 +119655,15 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.9.0.2"; - sha256 = "1swxdilr1l7h3pk313fyjgpg58g20v6560j9g4cxz0gakqqhb3jc"; + version = "0.9.1"; + sha256 = "1wpvyagc56yjkxvaw7a64gl2i4qfn4cgb47nx53pc6wcph7cyras"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq - exceptions mtl pretty primitive process reflection setenv + exceptions inline-c mtl pretty primitive process reflection setenv singletons template-haskell text th-lift th-orphans transformers unix vector ]; libraryPkgconfigDepends = [ R ]; - libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring directory filepath ieee754 mtl process quickcheck-assertions silently singletons strict tasty @@ -113918,7 +119677,6 @@ self: { homepage = "https://tweag.github.io/HaskellR"; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -113936,7 +119694,7 @@ self: { lucid-extras plotlyhs text time ]; executableHaskellDepends = [ base text ]; - testHaskellDepends = [ base text time ]; + testHaskellDepends = [ base text ]; homepage = "https://github.com/diffusionkinetics/open/inliterate"; description = "Interactive literate programming"; license = stdenv.lib.licenses.mit; @@ -113953,6 +119711,7 @@ self: { executableHaskellDepends = [ aether base text ]; description = "Console client for encyclopedias"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {aether = null;}; @@ -113965,8 +119724,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.1.0"; sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "3"; - editedCabalFile = "0ik4n32rvamxvlp80ixjrbhskivynli7b89s4hk6401bcy3ykp3g"; + revision = "6"; + editedCabalFile = "0dna826vhnal6m213llszn68phjs27pd43f7s8wdhdmjdx1nzk72"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -113977,7 +119736,7 @@ self: { unordered-containers ]; homepage = "https://github.com/phadej/insert-ordered-containers#readme"; - description = "Associative containers retating insertion order for traversals"; + description = "Associative containers retaining insertion order for traversals"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -114012,12 +119771,16 @@ self: { }) {}; "inspection-testing" = callPackage - ({ mkDerivation, base, containers, ghc, template-haskell }: + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: mkDerivation { pname = "inspection-testing"; - version = "0.1.1.2"; - sha256 = "1q8xqm63s0filhlg942kql71m9w85dgr409z4wzr7fsrvqydmaqi"; - libraryHaskellDepends = [ base containers ghc template-haskell ]; + version = "0.2.0.1"; + sha256 = "1551dvk63xb4lr2zsyg3ri8v1nsjs050k2jsf8v0vfasx7w9ns8z"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; testHaskellDepends = [ base ]; homepage = "https://github.com/nomeata/inspection-testing"; description = "GHC plugin to do inspection testing"; @@ -114169,6 +119932,7 @@ self: { homepage = "https://github.com/spinda/instapaper-sender#readme"; description = "Basic HTTP gateway to save articles to Instapaper"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "instinct" = callPackage @@ -114200,10 +119964,8 @@ self: { }: mkDerivation { pname = "int-cast"; - version = "0.1.2.0"; - sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb"; - revision = "2"; - editedCabalFile = "14i728sy9y38zjm9xcjqyg9jjnayzdpzplpff2cdpc9jk596fmcs"; + version = "0.2.0.0"; + sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -114213,14 +119975,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "integer-gmp_1_0_0_1" = callPackage + "int-multimap" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + }: + mkDerivation { + pname = "int-multimap"; + version = "0.1.0.1"; + sha256 = "0xi0n9hhra6pzqnxahf109qgifxnsgvc9v9jl0qmnxzz5yki1pvg"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + homepage = "https://github.com/metrix-ai/int-multimap"; + description = "A data structure that associates each Int key with a set of values"; + license = stdenv.lib.licenses.mit; + }) {}; + + "integer-gmp_1_0_1_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "1.0.0.1"; - sha256 = "08f1qcp57aj5mjy26dl3bi3lcg0p8ylm0qw4c6zbc1vhgnmxl4gg"; + version = "1.0.1.0"; + sha256 = "1xrdqksharn0jg8m1d7zm8nhbsq3abw2k25kzw0z7m0zm14n1nlw"; revision = "1"; - editedCabalFile = "1mfl651b2v82qhm5h279mjhq4ilzf6x1yydi3npa10ja6isifvb1"; + editedCabalFile = "02xp5ldq3xxx1qdxg7gbs2zcqpf1dxbdrvrzizxnjwhpiqxcigy3"; libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; @@ -114234,8 +120011,8 @@ self: { }: mkDerivation { pname = "integer-logarithms"; - version = "1.0.2"; - sha256 = "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii"; + version = "1.0.2.1"; + sha256 = "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j"; libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -114370,14 +120147,15 @@ self: { }: mkDerivation { pname = "interlude-l"; - version = "0.2.0.1"; - sha256 = "0jrmxph2m0ql48k6l743dhk4hdjxpdm7qqflwk2n3pw58ffajsk8"; + version = "0.3.0.0"; + sha256 = "0aa26cgap70ji6qjy555039i8zrynibmfsxpdpkww6pqj3hwrc93"; libraryHaskellDepends = [ aeson base exceptions lens monad-control MonadRandom mtl protolude string-conv text transformers witherable ]; description = "Prelude replacement based on protolude"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intern" = callPackage @@ -114386,8 +120164,8 @@ self: { }: mkDerivation { pname = "intern"; - version = "0.9.1.4"; - sha256 = "0snjar5mil9zsyy1ml13a8p1g2cvq62c5r8547i6z451w06j1zk0"; + version = "0.9.2"; + sha256 = "081fyiq00cvx4nyagr34kwnag9njv65wdps5j4ydin6sjq7b58wk"; libraryHaskellDepends = [ array base bytestring hashable text unordered-containers ]; @@ -114419,18 +120197,20 @@ self: { "intero" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec - , process, regex-compat, syb, temporary, time, transformers, unix + , mtl, network, process, random, regex-compat, syb, temporary, time + , transformers, unix }: mkDerivation { pname = "intero"; - version = "0.1.23"; - sha256 = "17247yscz7z1axhml2f5m4i4sxgyydpvcidk75ng350dk6z1wd4x"; + version = "0.1.30"; + sha256 = "0axjmswi9jgyd9kkhyjwbviqbh693vvki4hvwcg7rq6dsgl0lgk8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot-th - ghc-paths ghci haskeline process syb time transformers unix + ghc-paths ghci haskeline mtl network process random syb time + transformers unix ]; testHaskellDepends = [ base directory filepath hspec process regex-compat temporary @@ -114439,6 +120219,7 @@ self: { homepage = "https://github.com/commercialhaskell/intero"; description = "Complete interactive development program for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpol" = callPackage @@ -114467,16 +120248,16 @@ self: { }) {}; "interpolate" = callPackage - ({ mkDerivation, base, bytestring, haskell-src-meta, hspec - , QuickCheck, quickcheck-instances, template-haskell, text + ({ mkDerivation, base, base-compat, bytestring, haskell-src-meta + , hspec, QuickCheck, quickcheck-instances, template-haskell, text }: mkDerivation { pname = "interpolate"; - version = "0.1.1"; - sha256 = "120ygxs8vfsjcc7xr9v8p8bcyqidhlg1rd568ym2bsl1nhx4h22b"; + version = "0.2.0"; + sha256 = "1gkaj98yz363v38fv78sqby236mp8yqwqcilx7kr2b9z0w3204bf"; libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; testHaskellDepends = [ - base bytestring haskell-src-meta hspec QuickCheck + base base-compat bytestring haskell-src-meta hspec QuickCheck quickcheck-instances template-haskell text ]; homepage = "https://github.com/sol/interpolate#readme"; @@ -114533,23 +120314,6 @@ self: { }) {}; "interpolation" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: - mkDerivation { - pname = "interpolation"; - version = "0.1.0.1"; - sha256 = "0j19k0j4ys7wd4p6knkvr4p5didavq9j3y1vgncwd5r0gm43wsdc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base utility-ht ]; - testHaskellDepends = [ - array base containers QuickCheck utility-ht - ]; - homepage = "http://hub.darcs.net/thielema/interpolation/"; - description = "piecewise linear and cubic Hermite interpolation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "interpolation_0_1_0_2" = callPackage ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: mkDerivation { pname = "interpolation"; @@ -114564,7 +120328,6 @@ self: { homepage = "http://hub.darcs.net/thielema/interpolation/"; description = "piecewise linear and cubic Hermite interpolation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interruptible" = callPackage @@ -114622,8 +120385,8 @@ self: { pname = "intervals"; version = "0.8.1"; sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww"; - revision = "1"; - editedCabalFile = "0im2m4acx6g638h7yz0x3qyaipfmri59q4zdq1w7n608r3i406dj"; + revision = "3"; + editedCabalFile = "1dzv19jq6xwf9zff6xkzmn9vab2ch2mds75n7hg9n0xg664q1b95"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base distributive ghc-prim ]; testHaskellDepends = [ @@ -114642,8 +120405,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.7.0.1"; - sha256 = "05nz32z4gyjprh22dddwk3jb45nl2bm558d1sh09g4n2rvx0m4i7"; + version = "0.7.1.1"; + sha256 = "1s947b71r0m3f81w8sid2cwgh9j16bxsmlpi498rzxajq32cd5yk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -114656,27 +120419,41 @@ self: { homepage = "http://mbays.freeshell.org/intricacy"; description = "A game of competitive puzzle-design"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + }) {}; + + "intrinsic-superclasses" = callPackage + ({ mkDerivation, base, containers, haskell-src-meta, mtl + , template-haskell + }: + mkDerivation { + pname = "intrinsic-superclasses"; + version = "0.3.0.0"; + sha256 = "18xvpdip1zdgylqcngvk8hz6dsnl3bp681pc31nb562vg2crqzz6"; + libraryHaskellDepends = [ + base containers haskell-src-meta mtl template-haskell + ]; + homepage = "https://github.com/daig/intrinsic-superclasses#readme"; + description = "A quasiquoter for better instance deriving and default methods"; + license = stdenv.lib.licenses.mit; }) {}; "intro" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytestring, containers - , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck, safe - , text, transformers, unordered-containers, writer-cps-mtl + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , dlist, extra, hashable, lens, mtl, QuickCheck, safe, text + , transformers, unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.3.0.1"; - sha256 = "0yc163r255w7df0hjly30bh5dqgx38f1z5lk3x3i7jh93j97cpn0"; + version = "0.3.1.0"; + sha256 = "14kl6nx62qkm19fjn593m62iy4myjwg94yyr38kkbna438n5wpns"; libraryHaskellDepends = [ - base bifunctors binary bytestring containers deepseq dlist extra - hashable mtl safe text transformers unordered-containers - writer-cps-mtl + base binary bytestring containers deepseq dlist extra hashable mtl + safe text transformers unordered-containers writer-cps-mtl ]; testHaskellDepends = [ - base bifunctors binary bytestring containers deepseq dlist extra - hashable lens mtl QuickCheck safe text transformers - unordered-containers writer-cps-mtl + base binary bytestring containers deepseq dlist extra hashable lens + mtl QuickCheck safe text transformers unordered-containers + writer-cps-mtl ]; homepage = "https://github.com/minad/intro#readme"; description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; @@ -114744,21 +120521,12 @@ self: { }) {}; "intset" = callPackage - ({ mkDerivation, base, bits-extras, bytestring, containers - , criterion, deepseq, QuickCheck, test-framework - , test-framework-quickcheck2 - }: + ({ mkDerivation, base, bits-extras, bytestring, deepseq }: mkDerivation { pname = "intset"; version = "0.1.1.0"; sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0"; libraryHaskellDepends = [ base bits-extras bytestring deepseq ]; - testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq - ]; homepage = "https://github.com/pxqr/intset"; description = "Pure, mergeable, succinct Int sets"; license = stdenv.lib.licenses.bsd3; @@ -114774,8 +120542,10 @@ self: { }: mkDerivation { pname = "invariant"; - version = "0.4.3"; - sha256 = "17nfm5w6hp4ajg7gslvdvzj4nkds8zk8yp1zi6pi6lax71613rz0"; + version = "0.5"; + sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0"; + revision = "1"; + editedCabalFile = "04sxa2jfv613ff3fxpnk0cn31f6fr80gzr7va47nrc0abp34vd7y"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors semigroups StateVar stm tagged template-haskell @@ -114795,10 +120565,8 @@ self: { }: mkDerivation { pname = "invertible"; - version = "0.2.0.2"; - sha256 = "1a45hgsz46rqx2bfi0cgnf443pr28ik2rqi2f745q2qr41pvdqgf"; - revision = "1"; - editedCabalFile = "1jbk0mcn66j2931yka1923j7k45jgv6174q8rr3plidyn8fgm2hg"; + version = "0.2.0.4"; + sha256 = "0hrg58p5yz97n2xi9mbad69skldr163mr1wdvykdsvwyyxhfl4q4"; libraryHaskellDepends = [ base haskell-src-meta invariant lens partial-isomorphisms semigroupoids template-haskell transformers TypeCompose @@ -114806,6 +120574,26 @@ self: { testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "invertible_0_2_0_5" = callPackage + ({ mkDerivation, base, haskell-src-meta, invariant, lens + , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell + , transformers + }: + mkDerivation { + pname = "invertible"; + version = "0.2.0.5"; + sha256 = "1fwdbg0pimi9hfyp20fsvyxpicjd7jxg4vsh5kykkxviyfhxl2ha"; + libraryHaskellDepends = [ + base haskell-src-meta invariant lens partial-isomorphisms + semigroupoids template-haskell transformers + ]; + testHaskellDepends = [ base QuickCheck transformers ]; + description = "bidirectional arrows, bijective functions, and invariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-hlist" = callPackage @@ -114831,6 +120619,7 @@ self: { ]; description = "invertible transformer instances for HXT Picklers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-syntax" = callPackage @@ -114964,32 +120753,6 @@ self: { }) {}; "io-streams" = 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.1.0"; - sha256 = "0d6m7hq6l3zabqm2kga9qs1742vh5rnhfsa76svpkyn32z8n1i1w"; - 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; - }) {}; - - "io-streams_1_5_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , deepseq, directory, filepath, HUnit, mtl, network, primitive , process, QuickCheck, test-framework, test-framework-hunit @@ -115000,7 +120763,7 @@ self: { pname = "io-streams"; version = "1.5.0.1"; sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx"; - configureFlags = [ "-fnointeractivetests" ]; + configureFlags = [ "-fNoInteractiveTests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive process text time transformers vector zlib-bindings @@ -115013,7 +120776,6 @@ self: { ]; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-streams-haproxy" = callPackage @@ -115024,6 +120786,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.0.2"; sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"; + revision = "1"; + editedCabalFile = "0mm20k4d6xcjjghwkgbfap9n35nixzvk3y0n52f88cq0rfrn1y0r"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -115052,6 +120816,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-string-like" = callPackage + ({ mkDerivation, base, binary, bytestring, text }: + mkDerivation { + pname = "io-string-like"; + version = "0.1.0.1"; + sha256 = "0p8p4xp9qj7h1xa9dyizqpr85j8qjiccj3y9kplbskaqazl9pyqp"; + revision = "1"; + editedCabalFile = "1q10d2pjhy3k549pw3lid2lda5z4790x0vmg1qajwyapm7q5cma6"; + libraryHaskellDepends = [ base binary bytestring text ]; + homepage = "https://github.com/clintonmead/io-string-like#readme"; + description = "Classes to handle Prelude style IO functions for different datatypes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "io-throttle" = callPackage ({ mkDerivation, base, SafeSemaphore, threads }: mkDerivation { @@ -115122,6 +120900,7 @@ self: { homepage = "http://cs-syd.eu"; description = "A class of strings that can be involved in IO"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iothread" = callPackage @@ -115158,8 +120937,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.1.0"; - sha256 = "0a5dc019jmkx77kk3jmgvk79ffigam38fanjwajaqsxy5ysp5xyf"; + version = "1.1.2"; + sha256 = "16vjbcrjpvs4wh89r4k3d5hpkklvcvrk50qjnx67bsi2jjhcn0aj"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -115174,6 +120953,33 @@ self: { homepage = "https://github.com/andrewthad/haskell-ip#readme"; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "ip_1_2_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , quickcheck-classes, semigroups, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "ip"; + version = "1.2.0"; + sha256 = "09d1y0x5cri08kx5c52jblnj1679z0yw0byigjvwics6pwkgrx0f"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive semigroups text + vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + homepage = "https://github.com/andrewthad/haskell-ip#readme"; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -115307,8 +121113,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.1"; - sha256 = "1viyxq3m1aifl05w0hxwrhhhcfpmvwz4ymil2gngi4nfm0yd1f2p"; + version = "1.7.3"; + sha256 = "0zhfn0rxwakspx1b9pxcqb9vbi8lr786hhb5s9j15xiszkl8hf4s"; libraryHaskellDepends = [ appar base byteorder containers network ]; @@ -115368,13 +121174,13 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers - , directory, filepath, mtl, parsec, process, SHA, temporary, text + , directory, filepath, mtl, process, SHA, temporary, text , transformers, unordered-containers, uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.9.0.0"; - sha256 = "04byvmf4n55sdanw2lg5hicp2h7ivn2620wybd8i43hgcckx1ach"; + version = "0.9.0.2"; + sha256 = "01l22myk73igczzjj4b239brp80b3pfamw9w67lw4l4w6n7lc8sr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -115383,13 +121189,9 @@ self: { process SHA temporary text transformers unordered-containers uuid zeromq4-haskell ]; - executableHaskellDepends = [ - base filepath mtl parsec text transformers - ]; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc" = callPackage @@ -115422,44 +121224,24 @@ self: { }) {}; "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit - , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text - , time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "0.4.4.4"; - sha256 = "0y858xsjl16vlb9ifvw7akw727zmg06i5ald78r8828c8piqa259"; - libraryHaskellDepends = [ - base bytestring conduit connection irc-conduit irc-ctcp - network-conduit-tls old-locale stm stm-conduit text time tls - transformers x509 x509-store x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-client"; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_1_0_0_1" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-conduit + , network-conduit-tls, old-locale, profunctors, stm, stm-chans , text, time, tls, transformers, x509, x509-store, x509-validation }: mkDerivation { pname = "irc-client"; - version = "1.0.0.1"; - sha256 = "0qg4bvl82wwm7jlrxsmc4aw51rfdygq8qzm6x7j4121av5wbk095"; + version = "1.1.0.2"; + sha256 = "1y9camx7vwpgr2qvqnkzk7rz9k0wkxrb35wflar4g9k0q6xqp2mi"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-conduit text time tls transformers x509 + profunctors stm stm-chans text time tls transformers x509 x509-store x509-validation ]; homepage = "https://github.com/barrucadu/irc-client"; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -115480,8 +121262,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.2.2.4"; - sha256 = "118ksbf8kh0bmwk5m32qv609kggwssm3a56zc14f8bg67bkdkrc4"; + version = "0.3.0.1"; + sha256 = "0lividbrrc2yydqp55xqji8q6wigb49skrzw9vki6iivxcszka5h"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -115500,6 +121282,8 @@ self: { pname = "irc-core"; version = "2.3.0"; sha256 = "08nbdnszdakbam1x0fps3n3ziqv21d8ndhmrc7za69pm97wkicjf"; + revision = "2"; + editedCabalFile = "1pynqcahr66yq9h0ykdv1lz7jshn8zw0n9ggmycvsybw27ci10xn"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -115532,8 +121316,8 @@ self: { pname = "irc-dcc"; version = "2.0.1"; sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234"; - revision = "5"; - editedCabalFile = "1m0p5pyaghwjz9rwh4jmm02hrax2yz4z0nlgjij8673hjr8ggdzz"; + revision = "7"; + editedCabalFile = "01mvdqabbxa68abq49s2kwpl0y8gb6lf258jjg7w098f5v0p4m36"; libraryHaskellDepends = [ attoparsec base binary bytestring io-streams iproute irc-ctcp mtl network path safe-exceptions transformers utf8-string @@ -115639,12 +121423,18 @@ self: { }: mkDerivation { pname = "ircbot"; - version = "0.6.5.1"; - sha256 = "1cam9f7ppxj7yh1am0qjkh8b19haggrqdmkd26xik1ymn7nq9iyd"; + version = "0.6.5.3"; + sha256 = "0i9wrnlwf51wp3xgksj451nw6rxf2qghyhcjz7ihdxmqivbc6167"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers directory filepath irc mtl network parsec random SafeSemaphore stm time unix ]; + executableHaskellDepends = [ + base bytestring containers directory filepath irc mtl network + parsec random SafeSemaphore stm time unix + ]; homepage = "https://github.com/stepcut/ircbot"; description = "A library for writing IRC bots"; license = stdenv.lib.licenses.bsd3; @@ -115672,6 +121462,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "iri" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , contravariant, hashable, ip, profunctors, ptr, punycode + , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text + , text-builder, th-lift, th-lift-instances, unordered-containers + , vector, vector-builder, vector-instances + }: + mkDerivation { + pname = "iri"; + version = "0.3.4"; + sha256 = "071vg01q5swwscvfsqqyk6ysqbl1yqpwnwklhj0h985sxv9zdkm6"; + libraryHaskellDepends = [ + attoparsec base base-prelude bug bytestring contravariant hashable + ip profunctors ptr punycode semigroups template-haskell text + text-builder th-lift th-lift-instances unordered-containers vector + vector-builder vector-instances + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/iri"; + description = "RFC-based International Resource Identifier library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "iridium" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers , extra, foldl, http-conduit, lifted-base, monad-control @@ -115746,14 +121564,15 @@ self: { homepage = "https://github.com/argiopetech/irt"; description = "Item Response Theory functions for use in computerized adaptive testing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "is" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "is"; - version = "0.4"; - sha256 = "0bg7irvyzmlay3xkwsqn08waiylpllyvpkj3n3vwib6iwizqnqkz"; + version = "0.4.1"; + sha256 = "1133npzv5rvcfxarafbmm6jfam45qdm3r33wc5qq920m0w60xi2a"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Generic pattern predicates"; @@ -115778,6 +121597,7 @@ self: { homepage = "https://github.com/tonymorris/isdicom"; description = "An executable and library to determine if a file is a DICOM file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isevaluated" = callPackage @@ -115803,7 +121623,6 @@ self: { executableHaskellDepends = [ base gtk3 ]; description = "A program to show the size of image and whether suitable for wallpaper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "islink" = callPackage @@ -115866,8 +121685,8 @@ self: { }: mkDerivation { pname = "iso8583-bitmaps"; - version = "0.1.0.0"; - sha256 = "0w6m8ygpy1g95zvmbzq9402rxh4dj48i5bhcdzc4s0kig239gzqd"; + version = "0.1.1.0"; + sha256 = "04i557469q2ablwmlwg35jazh7mpd1cgbrzl02xbvn4xbg7n2fcr"; libraryHaskellDepends = [ base binary bytestring containers parsec syb template-haskell th-lift @@ -115951,6 +121770,7 @@ self: { 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; }) {}; "ispositive" = callPackage @@ -116008,6 +121828,7 @@ self: { ]; description = "A brick Widget for selectable summary of many elements on a terminal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iter-stats" = callPackage @@ -116122,7 +121943,6 @@ self: { libraryHaskellDepends = [ base bytestring containers ListLike MonadCatchIO-mtl mtl unix ]; - executableHaskellDepends = [ base ]; homepage = "http://inmachina.net/~jwlato/haskell/iteratee"; description = "Iteratee-based I/O"; license = stdenv.lib.licenses.bsd3; @@ -116430,6 +122250,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "iwlib" = callPackage + ({ mkDerivation, base, wirelesstools }: + mkDerivation { + pname = "iwlib"; + version = "0.1.0"; + sha256 = "0khmfwql4vwj55idsxmhjhrbqzfir3g9wm5lmpvnf77mm95cfpdz"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ wirelesstools ]; + homepage = "https://github.com/jaor/iwlib"; + description = "Bindings for the iw C library"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) wirelesstools;}; + "ix-shapable" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -116505,6 +122338,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ixset-typed_0_4" = callPackage + ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck + , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck + , template-haskell + }: + mkDerivation { + pname = "ixset-typed"; + version = "0.4"; + sha256 = "0xjj7vjyp4p6cid5xcin36xd8lwqah0vix4rj2d4mnmbb9ch19aa"; + libraryHaskellDepends = [ + base containers deepseq safecopy syb template-haskell + ]; + testHaskellDepends = [ + base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Efficient relational queries on Haskell sets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ixshader" = callPackage ({ mkDerivation, base, ghc-prim, indexed, language-glsl, parsec , prettyclass, singletons, template-haskell, text @@ -116520,6 +122373,7 @@ self: { homepage = "https://github.com/schell/ixshader#readme"; description = "A shallow embedding of the OpenGL Shading Language in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iyql" = callPackage @@ -116576,23 +122430,23 @@ self: { "jack" = callPackage ({ mkDerivation, array, base, bytestring, enumset, event-list - , explicit-exception, libjack2, midi, non-negative, transformers + , explicit-exception, libjack2, midi, non-negative, semigroups + , transformers }: mkDerivation { pname = "jack"; - version = "0.7.1.1"; - sha256 = "0h3c62knq5hblsplgp25wm94hbv6id8c97wv8xgzbvalj4lmsyyi"; + version = "0.7.1.3"; + sha256 = "1n0znnk3q8vic47k1vlv6mdqghrklagcwalvz1arsdfvpy74ig4c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring enumset event-list explicit-exception midi - non-negative transformers + non-negative semigroups transformers ]; libraryPkgconfigDepends = [ libjack2 ]; homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libjack2;}; "jack-bindings" = callPackage @@ -116656,13 +122510,13 @@ self: { ({ mkDerivation, base, Cabal }: mkDerivation { pname = "jailbreak-cabal"; - version = "1.3.2"; - sha256 = "1x2h54sx4ycik34q8f9g698xc2b7fai18918cd08qx7w7ny8nai1"; + version = "1.3.3"; + sha256 = "076h7nbf94zfwvfijcpv03r3s2nyynb2y9v354m4bxqz3anhib3b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal ]; homepage = "https://github.com/peti/jailbreak-cabal#readme"; - description = "Strip version restrictions from build dependencies in Cabal files"; + description = "Strip version restrictions from Cabal files"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -116713,8 +122567,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.3.2"; - sha256 = "0wym2mz4bvcmwg10v90dx14n41qhmn58bgccnxy7li9ahqwvj0f0"; + version = "0.5.5"; + sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116725,7 +122579,8 @@ self: { executableHaskellDepends = [ base boxes directory filepath ]; homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "japanese-holidays" = callPackage @@ -116977,16 +122832,17 @@ self: { "jbi" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, Cabal, directory - , filepath, optparse-applicative, process, tagged, text + , filepath, monad-parallel, optparse-applicative, process, tagged + , text }: mkDerivation { pname = "jbi"; - version = "0.1.0.0"; - sha256 = "13jswxfka5v8n2sdxg0p75ykhgvb351cih2zlid8x05lpiqlw87c"; + version = "0.2.0.0"; + sha256 = "0h08p1lra76yx0grxr08z2q83al1yn4a8rbpcahpz47cxxydwry4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base Cabal directory filepath process tagged + aeson base Cabal directory filepath monad-parallel process tagged ]; executableHaskellDepends = [ aeson-pretty base optparse-applicative text @@ -117052,6 +122908,7 @@ self: { 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 @@ -117188,43 +123045,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "jni" = callPackage - ({ mkDerivation, base, bytestring, choice, containers, cpphs - , inline-c, jdk, singletons, thread-local-storage + "jml-web-service" = callPackage + ({ mkDerivation, base, bytestring, clock, data-default, http-types + , monad-logger, optparse-applicative, prometheus-client + , prometheus-metrics-ghc, protolude, tasty, text, wai, wai-extra + , warp }: mkDerivation { - pname = "jni"; - version = "0.3.1"; - sha256 = "00acvi2yz2f61xqbck4k2zi87s7zx99z551zwi4llmaqlnz16ipd"; + pname = "jml-web-service"; + version = "0.1.0"; + sha256 = "1gs3qmcx87wh7372a4sa3g5f4w1lbyvd8iwr1w5pay21f0kcgnxk"; libraryHaskellDepends = [ - base bytestring choice containers inline-c singletons - thread-local-storage + base bytestring clock data-default http-types monad-logger + optparse-applicative prometheus-client prometheus-metrics-ghc + protolude text wai wai-extra warp ]; - librarySystemDepends = [ jdk ]; - libraryToolDepends = [ cpphs ]; - homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; - description = "Complete JNI raw bindings"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) jdk;}; + testHaskellDepends = [ base protolude tasty ]; + homepage = "https://github.com/jml/jml-web-service#readme"; + description = "Common utilities for running a web service"; + license = stdenv.lib.licenses.asl20; + }) {}; - "jni_0_4_0" = callPackage + "jni" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, containers - , cpphs, deepseq, inline-c, jdk, singletons, thread-local-storage + , cpphs, deepseq, inline-c, jdk, singletons }: mkDerivation { pname = "jni"; - version = "0.4.0"; - sha256 = "19nmhygwxb9cpw39bcl6wjhvfzsl1yqiz2127r531hwmlmhfwzw7"; + version = "0.6.0"; + sha256 = "04phf6sqfp8g9rqfj2lxg2j43350wlini1dnsjwyr6yvy888z9ba"; libraryHaskellDepends = [ base bytestring choice constraints containers deepseq inline-c - singletons thread-local-storage + singletons ]; librarySystemDepends = [ jdk ]; libraryToolDepends = [ cpphs ]; homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; description = "Complete JNI raw bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) jdk;}; "jobqueue" = callPackage @@ -117358,18 +123216,53 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_7_0_0" = 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.7.0.0"; + sha256 = "051rjqfskizgm9j927zh500q54lii3scldsymgcdfbaw40d0mncc"; + 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 - , memory, mtl, QuickCheck, text, time, unordered-containers, vector + , memory, mtl, QuickCheck, text, time, transformers + , transformers-compat, unordered-containers, vector }: mkDerivation { pname = "jose-jwt"; - version = "0.7.7"; - sha256 = "07mq4w4gvak8gahxdx3rwykwqqisxma8faxi4k0xfk6jcpai0snl"; + version = "0.7.8"; + sha256 = "0azkqllqc35hp2d2q50cwk472amhf0q5fkqs04a4kpnj50z6kqfk"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers cryptonite - either memory mtl text time unordered-containers vector + either memory mtl text time transformers transformers-compat + unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring cryptonite doctest either hspec HUnit memory @@ -117381,6 +123274,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jot" = callPackage + ({ mkDerivation, base, data-default, dhall, docopt, extra, filepath + , process, time, turtle, yaml + }: + mkDerivation { + pname = "jot"; + version = "0.1.0.3"; + sha256 = "1rw5ah60kfazycpf2f0sin98rba99d06gkqfci30m64wpkcm9l4g"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base data-default dhall docopt extra filepath process time turtle + yaml + ]; + homepage = "http://gitlab.com/locallycompact/jot"; + description = "Tiny markdown notebook"; + license = stdenv.lib.licenses.isc; + }) {}; + "jpeg" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -117423,8 +123335,8 @@ self: { ({ mkDerivation, base, HTTP }: mkDerivation { pname = "js-jquery"; - version = "3.2.1"; - sha256 = "03qymiwnk24sigqjnl42i77rsx6vrgg5wjday0f2j0d6s213sl30"; + version = "3.3.1"; + sha256 = "16q68jzbs7kp07dnq8cprdcc8fd41rim38039vg0w4x11lgniq70"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; @@ -117452,6 +123364,7 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-clib" = callPackage @@ -117467,6 +123380,7 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-dom" = callPackage @@ -117482,6 +123396,7 @@ self: { ]; description = "DOM library that uses jsaddle to support both GHCJS and GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-hello" = callPackage @@ -117581,9 +123496,8 @@ self: { }) {}; "jsc" = callPackage - ({ mkDerivation, base, glib, gtk3, hslogger, jmacro, lens - , template-haskell, text, transformers, webkitgtk3 - , webkitgtk3-javascriptcore + ({ mkDerivation, base, jmacro, lens, template-haskell, text + , transformers, webkitgtk3, webkitgtk3-javascriptcore }: mkDerivation { pname = "jsc"; @@ -117593,10 +123507,6 @@ self: { base jmacro lens template-haskell text transformers webkitgtk3 webkitgtk3-javascriptcore ]; - testHaskellDepends = [ - base glib gtk3 hslogger jmacro lens template-haskell text - transformers webkitgtk3 webkitgtk3-javascriptcore - ]; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -117620,8 +123530,8 @@ self: { }: mkDerivation { pname = "json"; - version = "0.9.1"; - sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn"; + version = "0.9.2"; + sha256 = "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6"; libraryHaskellDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -117658,8 +123568,8 @@ self: { }: mkDerivation { pname = "json-assertions"; - version = "1.0.9"; - sha256 = "02wq1xxcvg8yf2sjdvn1wh0yyfiykjlqn7ghvcm913b3b4snw12s"; + version = "1.0.11"; + sha256 = "000a528gmkb25zcl7am6qh8fjrq2v2l71c27fxzm6wpf0ml0vv7z"; libraryHaskellDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; @@ -117700,6 +123610,7 @@ self: { homepage = "https://github.com/sannsyn/json-ast-json-encoder"; description = "Encoders of JSON AST"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-ast-quickcheck" = callPackage @@ -117726,10 +123637,10 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "1.0.17"; - sha256 = "06wsx4m4x6h65jqr29ddgp93y56xmkd1h5gp80ks6734sawnnpl4"; - revision = "1"; - editedCabalFile = "1ng3dg8ra752mms2xnz2q4l7asd8mcr3shi1z62iaw66pkw2accx"; + version = "1.0.18"; + sha256 = "0h2aiq7k6s2qw81mrj77i86vfaci0387cwm6lbfzfag3r4993w7h"; + revision = "2"; + editedCabalFile = "1b7q8af32zpsrq32m34d4h4245ww19kxfqjrbq6s2mfx5qd5s5y6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117750,7 +123661,40 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + + "json-autotype_1_1_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, GenericPretty, hashable, lens, mtl + , optparse-applicative, pretty, process, QuickCheck, scientific + , smallcheck, text, uniplate, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "json-autotype"; + version = "1.1.2"; + sha256 = "1gf7g5y46wpkkhdnmvi85h518a59yb5j8ffgrnb82cs5zjwjpa9j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers filepath GenericPretty hashable lens mtl + pretty process scientific text uniplate unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers filepath GenericPretty hashable + lens mtl optparse-applicative pretty process scientific text + uniplate unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath GenericPretty + hashable lens mtl optparse-applicative pretty process QuickCheck + scientific smallcheck text uniplate unordered-containers vector + ]; + homepage = "https://github.com/mgajda/json-autotype"; + description = "Automatic type declaration for JSON input data"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "json-b" = callPackage @@ -117795,17 +123739,18 @@ self: { }) {}; "json-bytes-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, scientific - , semigroups, text + ({ mkDerivation, aeson, base, base-prelude, bytestring, criterion + , rebase, scientific, semigroups, text }: mkDerivation { pname = "json-bytes-builder"; - version = "0.5"; - sha256 = "1bd3xyjjja58bd3najkbnscgm4awzn89g2f0npvgsr51y1713hdj"; + version = "0.5.2"; + sha256 = "1a7bak30av58739wsxqv8p11nb3ljpj3xfd43yc563z5s3qnchqk"; libraryHaskellDepends = [ base base-prelude bytestring scientific semigroups text ]; - benchmarkHaskellDepends = [ base-prelude bytestring text ]; + testHaskellDepends = [ base-prelude bytestring text ]; + benchmarkHaskellDepends = [ aeson criterion rebase ]; homepage = "https://github.com/nikita-volkov/json-bytes-builder"; description = "Direct-to-bytes JSON Builder"; license = stdenv.lib.licenses.mit; @@ -117827,6 +123772,7 @@ self: { homepage = "https://github.com/sannsyn/json-encoder"; description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-enumerator" = callPackage @@ -117872,8 +123818,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "0.0.2"; - sha256 = "0ka8g2d3hn8z122k8r7gxs8m72s4ys46j6s2yc2ys045r1fhzlc1"; + version = "1.0.1"; + sha256 = "16x0k1iwq9z9sq7z6a2007w8cczy6yd7sniylhacqnf1gsjfb4q6"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -117884,7 +123830,6 @@ self: { homepage = "https://github.com/tfausak/json-feed#readme"; description = "JSON Feed"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-fu" = callPackage @@ -118054,6 +123999,7 @@ self: { homepage = "https://github.com/xenog/json-rpc"; description = "Fully-featured JSON-RPC 2.0 library"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-rpc-client" = callPackage @@ -118066,8 +124012,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "1"; - editedCabalFile = "14dx9a1cb6813vgxp86f9w7fcx5cw8xr0af2wsz3fcfzh7if5paq"; + revision = "5"; + editedCabalFile = "0fi7cij476s4lhjpi7m1yp9p30qv7pyv0hlcj30kd0zq74nwwrdz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118091,8 +124037,8 @@ self: { }: mkDerivation { pname = "json-rpc-generic"; - version = "0.2.1.2"; - sha256 = "1nhd3k7ji5fqdqbc23072ayzylwz987a458jc11skil9nwl5yswl"; + version = "0.2.1.3"; + sha256 = "105v0x610hb8vnbbmfm7myn15vblxkcvcryhgx363wgg0qqyakna"; libraryHaskellDepends = [ aeson aeson-generic-compat base bytestring containers dlist scientific text transformers unordered-containers vector @@ -118114,8 +124060,8 @@ self: { pname = "json-rpc-server"; version = "0.2.6.0"; sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn"; - revision = "1"; - editedCabalFile = "0r0lshhf40l5a88axrzwp28r3bfa013z4m34n7rh50b19dqik8jw"; + revision = "4"; + editedCabalFile = "19nasv4sxjn3j0xvr1pd9x6bf8f8566wwd15y3wwll89bpnyd4z9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118140,8 +124086,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an"; - revision = "9"; - editedCabalFile = "0g7hyapnlzid4ix7nrw3rxgn1vcd63hb34blyj5ldmzwz76qqp0b"; + revision = "13"; + editedCabalFile = "07r9sdkhhp7wp7zyrw8mnr9dk1z83drm3jfcayv9gz28jnr3gpv1"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -118162,6 +124108,8 @@ self: { pname = "json-sop"; version = "0.2.0.3"; sha256 = "0ay2cymy4aar23cixcyqam91bs9x4z0vqiw2k0nvgy9nyqfz2r9h"; + revision = "1"; + editedCabalFile = "1bvmfl6fqdr8fklv8zai5jgzlnv1jf9xy8i656lfz1ys95q9yr48"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -118187,20 +124135,20 @@ self: { }) {}; "json-stream" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec + ({ mkDerivation, aeson, base, bytestring, directory, hspec , QuickCheck, quickcheck-unicode, scientific, text , unordered-containers, vector }: mkDerivation { pname = "json-stream"; - version = "0.4.1.5"; - sha256 = "0h5g76grhi60idvmxdhydpz5f3198bydwywfyv9pghlmbrzjnkih"; + version = "0.4.2.3"; + sha256 = "0ijic6vfrpykzy7j3li94fjmaj1vclvp0in1ymb5z5whvljlynw7"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring directory doctest hspec QuickCheck - quickcheck-unicode scientific text unordered-containers vector + aeson base bytestring directory hspec QuickCheck quickcheck-unicode + scientific text unordered-containers vector ]; homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; @@ -118266,6 +124214,7 @@ self: { homepage = "https://github.com/autotaker/json-tracer#readme"; description = "A polymorphic, type-safe, json-structured tracing library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-types" = callPackage @@ -118356,6 +124305,7 @@ self: { homepage = "https://github.com/mackeyrms/jsonextfilter#readme"; description = "Filter select values in JSON objects to unix programs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsonresume" = callPackage @@ -118426,6 +124376,7 @@ self: { homepage = "https://github.com/garetht/jsons-to-schema/README.md"; description = "JSON to JSON Schema"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsonschema-gen" = callPackage @@ -118554,14 +124505,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "judge" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , bytestring, containers, directory, filepath, mtl + , optparse-applicative, pointedlist, terminal-size, texmath, text + , transformers, unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "judge"; + version = "0.1.3.0"; + sha256 = "02lyd1ql4qj5da0p3mhpkh0gq8lrc6xmz3yg5hnc8mk5d3a381hw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base bytestring containers mtl + pointedlist terminal-size texmath text transformers + unordered-containers utf8-string vector yaml + ]; + executableHaskellDepends = [ + ansi-wl-pprint attoparsec base directory filepath + optparse-applicative text unordered-containers yaml + ]; + homepage = "https://github.com/slakkenhuis/judge#readme"; + description = "Tableau-based theorem prover for justification logic"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "judy" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, hspec, Judy , QuickCheck }: mkDerivation { pname = "judy"; - version = "0.3.0"; - sha256 = "17fblav2npg47kn2dq82lcpf299igd91pi0ynffklf5hr8dw70zl"; + version = "0.4.1"; + sha256 = "0inm77n75066jcjw820cdpklqjfy76i7by4qz136c83x2x7w6fsm"; libraryHaskellDepends = [ base bytestring ghc-prim ]; librarySystemDepends = [ Judy ]; testHaskellDepends = [ base hspec QuickCheck ]; @@ -118577,8 +124556,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.3"; - sha256 = "0czb1vb1nwn1wzx52vpvnpki2kfwwb775wg512rn46snm5wibvzv"; + version = "0.1.0.5"; + sha256 = "0gjkch103fisvr35dc86hbfbir76cmwh9cs1ppqlxajspgan9bz1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -118598,8 +124577,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.3"; - sha256 = "0fpzbijv73drgk79rf8qyr2w4kfvxbpysbi9y9v2qx5na9y3krci"; + version = "0.3.2"; + sha256 = "098vli26hrgkjxw3y1sfc7fi3wj72ka1dqy1k49z22rigisffbwj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118674,8 +124653,8 @@ self: { }: mkDerivation { pname = "justified-containers"; - version = "0.2.0.1"; - sha256 = "0k2vw8d37hkjj786kx52hjs7qlmmv4hr8bp9dd2rskgsnwjizmw2"; + version = "0.3.0.0"; + sha256 = "11ryff281gbn46zz7vax97h0qn5xn1mk7gdjpb38xs9ns36c0c6q"; libraryHaskellDepends = [ base containers roles ]; testHaskellDepends = [ base containers ghc-prim hspec QuickCheck should-not-typecheck @@ -118686,44 +124665,49 @@ self: { }) {}; "jvm" = callPackage - ({ mkDerivation, base, bytestring, choice, criterion - , distributed-closure, hspec, jni, singletons, template-haskell + ({ mkDerivation, base, bytestring, choice, constraints, criterion + , deepseq, distributed-closure, exceptions, hspec, jni, singletons , text, vector }: mkDerivation { pname = "jvm"; - version = "0.2.2"; - sha256 = "1xfi63qw8lz82b1mjji3bxacpl9q0kf86h7dcbjgiw2bqq65xcak"; + version = "0.4.2"; + sha256 = "1z3lk2f7bmhi8bj4v32fymjr2bf9czjd73qm6gk33z4mxknddwbh"; libraryHaskellDepends = [ - base bytestring choice distributed-closure jni singletons - template-haskell text vector + base bytestring choice constraints distributed-closure exceptions + jni singletons text vector + ]; + testHaskellDepends = [ base bytestring hspec jni text ]; + benchmarkHaskellDepends = [ + base criterion deepseq jni singletons ]; - testHaskellDepends = [ base bytestring hspec text ]; - benchmarkHaskellDepends = [ base criterion jni ]; homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; description = "Call JVM methods from Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; - "jvm_0_3_0" = callPackage - ({ mkDerivation, base, bytestring, choice, constraints, criterion - , deepseq, distributed-closure, exceptions, hspec, jni, singletons - , text, vector + "jvm-batching" = callPackage + ({ mkDerivation, base, bytestring, Cabal, criterion, deepseq + , distributed-closure, hspec, inline-java, jni, jvm, singletons + , split, text, vector }: mkDerivation { - pname = "jvm"; - version = "0.3.0"; - sha256 = "1fjaanz7h3z5py71kq880wc140jp48khs18chx3gzwas22cpw9ap"; + pname = "jvm-batching"; + version = "0.1.1"; + sha256 = "06vxhlpvb8ilj0xm5k7chzpsn0f7m48l7728g2m7likh55rs2dxq"; + setupHaskellDepends = [ base Cabal inline-java ]; libraryHaskellDepends = [ - base bytestring choice constraints distributed-closure exceptions - jni singletons text vector + base bytestring distributed-closure inline-java jni jvm singletons + text vector + ]; + testHaskellDepends = [ + base bytestring hspec inline-java jvm text vector ]; - testHaskellDepends = [ base bytestring hspec jni text ]; benchmarkHaskellDepends = [ - base criterion deepseq jni singletons + base criterion deepseq jvm split vector ]; - homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; - description = "Call JVM methods from Haskell"; + homepage = "http://github.com/tweag/inline-java/tree/master/jvm-batching#readme"; + description = "Provides batched marshalling of values between Java and Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -118748,6 +124732,7 @@ self: { homepage = "https://github.com/ucla-pls/jvm-binary#readme"; description = "A library for reading Java class-files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jvm-parser" = callPackage @@ -118767,34 +124752,23 @@ self: { }) {}; "jvm-streaming" = callPackage - ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni - , jvm, singletons, streaming + ({ mkDerivation, base, Cabal, criterion, deepseq + , distributed-closure, hspec, inline-java, jni, jvm, jvm-batching + , singletons, streaming, text, vector }: mkDerivation { pname = "jvm-streaming"; - version = "0.2"; - sha256 = "1frhdh8issnc806901xhkiz0z593z5m7ldajr1d88did37hfyl92"; + version = "0.3.1"; + sha256 = "0kgr2l1gcxy2z30xr89fx1f51h5yycphhh3mpf00wahlkdz7q6wd"; + setupHaskellDepends = [ base Cabal inline-java jvm-batching ]; libraryHaskellDepends = [ - base distributed-closure inline-java jni jvm singletons streaming + base distributed-closure inline-java jni jvm jvm-batching + singletons streaming vector ]; - testHaskellDepends = [ base hspec inline-java jvm streaming ]; - homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; - description = "Expose Java iterators as streams from the streaming package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "jvm-streaming_0_2_1" = callPackage - ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni - , jvm, singletons, streaming - }: - mkDerivation { - pname = "jvm-streaming"; - version = "0.2.1"; - sha256 = "06n660fa5xbmw20064gyjp2sx3mvqs1cx12s77w7wn1cfk0ckair"; - libraryHaskellDepends = [ - base distributed-closure inline-java jni jvm singletons streaming + testHaskellDepends = [ base hspec inline-java jvm streaming text ]; + benchmarkHaskellDepends = [ + base criterion deepseq jvm streaming text vector ]; - testHaskellDepends = [ base hspec inline-java jvm streaming ]; homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; description = "Expose Java iterators as streams from the streaming package"; license = stdenv.lib.licenses.bsd3; @@ -118830,6 +124804,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "jwt_0_8_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + , doctest, HsOpenSSL, http-types, HUnit, lens, lens-aeson, memory + , network-uri, QuickCheck, RSA, scientific, semigroups, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "jwt"; + version = "0.8.0"; + sha256 = "0ij921vgm0sqlc2ryymqxz6ipgl2iwm0916ny7g5l47qh2fjhcjg"; + libraryHaskellDepends = [ + aeson base bytestring containers cryptonite HsOpenSSL http-types + memory network-uri RSA scientific semigroups text time + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers cryptonite doctest HsOpenSSL + http-types HUnit lens lens-aeson memory network-uri QuickCheck RSA + scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th + text time unordered-containers vector + ]; + homepage = "https://bitbucket.org/ssaasen/haskell-jwt"; + description = "JSON Web Token (JWT) decoding and encoding"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kademlia" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl, network , QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck @@ -118853,9 +124855,8 @@ self: { }) {}; "kafka-client" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, digest - , dlist, hspec, hspec-discover, network, process, QuickCheck - , snappy, temporary, time, zlib + ({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec + , hspec-discover, network, QuickCheck, snappy, time, zlib }: mkDerivation { pname = "kafka-client"; @@ -118865,8 +124866,7 @@ self: { base bytestring cereal digest dlist network snappy time zlib ]; testHaskellDepends = [ - base bytestring cereal containers hspec hspec-discover network - process QuickCheck temporary time + base bytestring cereal hspec hspec-discover QuickCheck time ]; homepage = "https://github.com/abhinav/kafka-client"; description = "Low-level Haskell client library for Apache Kafka 0.7."; @@ -119039,19 +125039,22 @@ self: { "kan-extensions" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers - , contravariant, distributive, fail, free, mtl, semigroupoids - , tagged, transformers + , contravariant, distributive, fail, free, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat }: mkDerivation { pname = "kan-extensions"; - version = "5.0.2"; - sha256 = "0bj88bgwxlx490f5r979idsm9dpdsb0ldzar9sa0jhj2jn2xx7hw"; + version = "5.1"; + sha256 = "019jyrilk97i5bj8v044ig03m66h02q4b073m1fksrk7y9c8wgqr"; + revision = "1"; + editedCabalFile = "1xaam291gxmsbibi2ai4l6c36iwkpmfy6vik1916j6jp326pa3z9"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant - distributive fail free mtl semigroupoids tagged transformers + distributive fail free mtl profunctors semigroupoids tagged + transformers transformers-compat ]; homepage = "http://github.com/ekmett/kan-extensions/"; - description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads"; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -119069,17 +125072,58 @@ self: { }) {}; "kanji" = callPackage - ({ mkDerivation, base, bytestring, containers, microlens, text }: + ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion + , deepseq, hashable, HUnit-approx, microlens, microlens-aeson + , microlens-platform, optparse-applicative, protolude, tasty + , tasty-hunit, text + }: mkDerivation { pname = "kanji"; - version = "2.0.0"; - sha256 = "0g0549c96vc4ndvs1c5dazwha6d3s28h4xwkskmvgli1kxdm2iqm"; + version = "3.1.0.1"; + sha256 = "1qxjaqqb3i8w65qda3nxnqxwvgcpfics38yifzf3chy49c3v04wj"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring containers microlens text + aeson base containers deepseq hashable text ]; - homepage = "https://github.com/fosskers/nanq"; + executableHaskellDepends = [ + aeson aeson-pretty base containers microlens microlens-aeson + microlens-platform optparse-applicative protolude text + ]; + testHaskellDepends = [ + aeson base containers HUnit-approx tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ aeson base containers criterion text ]; + homepage = "https://github.com/fosskers/kanji"; description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "kanji_3_3_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion + , deepseq, hashable, HUnit-approx, microlens, microlens-aeson + , optparse-applicative, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "kanji"; + version = "3.3.0"; + sha256 = "0wapqdrh18344j0dz3y3g08vcfharc43xlcgkk8ksj5r30zq1vff"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers deepseq hashable text + ]; + executableHaskellDepends = [ + aeson aeson-pretty base containers microlens microlens-aeson + optparse-applicative text transformers + ]; + testHaskellDepends = [ + aeson base containers HUnit-approx tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ aeson base containers criterion text ]; + homepage = "https://github.com/fosskers/kanji"; + description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -119091,8 +125135,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "11"; - editedCabalFile = "0l56snbdxbcwrmh7gna4237873d366dfbwp59a4wq1s51clhmb4z"; + revision = "13"; + editedCabalFile = "0qdj3giwfjic87xln1lkrfa9dw8yj31s7x3dsr7n1343jcap2m7n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -119111,8 +125155,8 @@ self: { }: mkDerivation { pname = "kansas-lava"; - version = "0.2.4.4"; - sha256 = "0pbciwh79y1pzqlpd2f8pm5w8bjq5bs47slqw71q09f7jlgs0i7d"; + version = "0.2.4.5"; + sha256 = "0pcxmsf18ykvf1mbm3w8qn86rdmr69ilcakrgidl1ag6liq1s6zc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -119121,7 +125165,6 @@ self: { directory dotgen filepath netlist netlist-to-vhdl process random sized-types strict template-haskell ]; - executableHaskellDepends = [ base ]; homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava"; description = "Kansas Lava is a hardware simulator and VHDL generator"; license = stdenv.lib.licenses.bsd3; @@ -119143,7 +125186,6 @@ self: { ansi-terminal base bytestring data-default directory filepath kansas-lava network sized-types ]; - executableHaskellDepends = [ base ]; homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava"; description = "FPGA Cores Written in Kansas Lava"; license = stdenv.lib.licenses.bsd3; @@ -119254,18 +125296,18 @@ self: { , safe-exceptions, scientific, semigroups, stm, 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, unix, unliftio-core, unordered-containers }: mkDerivation { pname = "katip"; - version = "0.5.1.0"; - sha256 = "1jcvjia4r6x2fwsyq0f038y63fr673r2jh4gm1xfn6qxis7im68n"; + version = "0.5.4.0"; + sha256 = "1144krzz4wvwhdh1b2673302xn7svz2b6kjfvq9728f1bzkkspad"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet safe-exceptions scientific semigroups stm string-conv template-haskell text time transformers transformers-base - transformers-compat unix unordered-containers + transformers-compat unix unliftio-core unordered-containers ]; testHaskellDepends = [ aeson base bytestring containers directory microlens @@ -119286,18 +125328,18 @@ self: { ({ mkDerivation, aeson, async, base, bloodhound, bytestring , containers, criterion, deepseq, enclosed-exceptions, exceptions , http-client, http-types, katip, lens, lens-aeson - , quickcheck-instances, random, retry, scientific, stm, stm-chans - , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, uuid, vector + , quickcheck-instances, random, retry, scientific, semigroups, stm + , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unordered-containers, uuid, vector }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.4.0.3"; - sha256 = "0aji0738dz7i0lry30y6rpfbhvcpc79mfqc77nlvaplb3plw0m51"; + version = "0.4.1.0"; + sha256 = "19gpgxg8wz5zdx8a0sspbdk9ypjcrclni0da6sh1hz80yydcfzb1"; libraryHaskellDepends = [ aeson async base bloodhound bytestring enclosed-exceptions - exceptions http-client http-types katip retry scientific stm - stm-chans text time transformers unordered-containers uuid + exceptions http-client http-types katip retry scientific semigroups + stm stm-chans text time transformers unordered-containers uuid ]; testHaskellDepends = [ aeson base bloodhound bytestring containers http-client http-types @@ -119315,6 +125357,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip-rollbar" = callPackage + ({ mkDerivation, aeson, async, base, hostname, http-client, katip + , rollbar-hs, stm-chans, text, time + }: + mkDerivation { + pname = "katip-rollbar"; + version = "0.3.0.1"; + sha256 = "1phci2x12qmih9aaly0j1g1a07wcd80rrkwqgfy3pxnbjx6d6817"; + libraryHaskellDepends = [ + aeson async base hostname http-client katip rollbar-hs stm-chans + text time + ]; + homepage = "https://github.com/joneshf/katip-rollbar#readme"; + description = "Katip scribe that logs to Rollbar"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "katip-scalyr-scribe" = callPackage + ({ mkDerivation, aeson, base, katip, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "katip-scalyr-scribe"; + version = "0.1.0.1"; + sha256 = "0pbq4mawa0aq2gzzhkrk9avv0pv20hjhq2qv0lvs0wyhv5jnmkqr"; + libraryHaskellDepends = [ + aeson base katip scientific text unordered-containers + ]; + testHaskellDepends = [ + aeson base katip scientific text unordered-containers + ]; + homepage = "https://github.com/reactormonk/katip-scalyr-scribe#readme"; + description = "A katip scribe for logging to json"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "katip-syslog" = callPackage ({ mkDerivation, aeson, base, bytestring, hsyslog, katip , string-conv, text @@ -119379,6 +125457,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "katydid_0_2_0_1" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, directory + , filepath, HUnit, hxt, json, mtl, parsec, regex-tdfa, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "katydid"; + version = "0.2.0.1"; + sha256 = "1m3rclgrjc7f1rirn39w55rw4vlr769kvm0byw53kg2ib95l2nlg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers deepseq hxt json mtl parsec regex-tdfa + ]; + executableHaskellDepends = [ base mtl ]; + testHaskellDepends = [ + base containers directory filepath HUnit hxt json mtl parsec tasty + tasty-hunit + ]; + benchmarkHaskellDepends = [ + base criterion deepseq directory filepath hxt mtl text + ]; + homepage = "https://github.com/katydid/katydid-haskell"; + description = "A haskell implementation of Katydid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "kawa" = callPackage + ({ mkDerivation, attoparsec, base, directory, hashable, hedgehog + , optparse-applicative, text, unordered-containers + }: + mkDerivation { + pname = "kawa"; + version = "0.1.0.0"; + sha256 = "1rd5k12my1693sjnkqr6jn7p7byrycpcszf98z5s9pxaxblz4gdk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base hashable text unordered-containers + ]; + executableHaskellDepends = [ + base directory optparse-applicative text unordered-containers + ]; + testHaskellDepends = [ base hedgehog text unordered-containers ]; + homepage = "https://github.com/thoferon/kawa#readme"; + description = "Key-value store in single files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "kawaii" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, hakyll , hspec, lens, lifted-base, monad-control, monad-logger, mtl @@ -119449,7 +125577,6 @@ self: { homepage = "http://github.com/asakamirai/kazura-queue"; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kbq-gu" = callPackage @@ -119484,6 +125611,7 @@ self: { homepage = "https://github.com/marcelbuesing/kcd"; description = "Kayak .kcd parsing library."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {kcd-parser = null;}; @@ -119538,6 +125666,7 @@ self: { homepage = "https://github.com/giogadi/kdt"; description = "Fast and flexible k-d trees for various types of point queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keenser" = callPackage @@ -119594,7 +125723,6 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Rapid Gtk Application Development - I18N"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-mvc-controller" = callPackage @@ -119945,6 +126073,7 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Web application deployment manager, focusing on Haskell web frameworks"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kevin" = callPackage @@ -119968,14 +126097,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "key-state" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "key-state"; + version = "0.2.0"; + sha256 = "1n8bp8g2w16mb7ifafx4ypyx393lra4r2vnnmasxjc22fvyiwvsl"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/jxv/key-state#readme"; + description = "Manage key and button states and statuses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keycode" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "keycode"; version = "0.2.2"; sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "1"; - editedCabalFile = "0pyh8cadgw8pn9xdg8lbvsh108i84iaynia8j42qmgmls2zakvja"; + revision = "2"; + editedCabalFile = "0g19sjk2sh1w9ahn93dnvjkim4mqapq0plmdd37179qfgi49qnp8"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -120006,7 +126148,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base udbus ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/lunaryorn/haskell-keyring"; description = "Keyring access"; license = stdenv.lib.licenses.mit; @@ -120015,18 +126156,19 @@ self: { "keys" = callPackage ({ mkDerivation, array, base, comonad, containers, free, hashable - , semigroupoids, semigroups, transformers, transformers-compat - , unordered-containers + , semigroupoids, semigroups, tagged, transformers + , transformers-compat, unordered-containers }: mkDerivation { pname = "keys"; - version = "3.11"; - sha256 = "1cn45h27hxwb4ci1iyd2qn0fzyb2y85qq4821a9xm37bwsvrgwqc"; - revision = "1"; - editedCabalFile = "1lyg4wyi7mkqvbfl9lvfln3j4vys47jih56zyjba7nx36kbw185i"; + version = "3.12"; + sha256 = "0may9nrlfji2mmypl9q47lcpg4r793hmm4i22x7j4l6zz67sggyl"; + revision = "2"; + editedCabalFile = "0cy2fdxxqg0bgkb8xhnw6zws00d78bpk48xv7zzmvnj549l819ib"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids - semigroups transformers transformers-compat unordered-containers + semigroups tagged transformers transformers-compat + unordered-containers ]; homepage = "http://github.com/ekmett/keys/"; description = "Keyed functors and containers"; @@ -120039,14 +126181,14 @@ self: { , exceptions, fast-logger, filepath, http-client, lifted-base , MonadRandom, network, optparse-applicative, process, raaz, random , random-shuffle, readline, SafeSemaphore, secret-sharing, servant - , servant-client, servant-server, socks, split, stm, text, time - , token-bucket, transformers, unbounded-delays, unix, unix-compat - , utf8-string, wai, warp, zxcvbn-c + , servant-client, servant-server, socks, split, stm, text + , text-short, time, token-bucket, transformers, unbounded-delays + , unix, unix-compat, utf8-string, wai, warp, zxcvbn-c }: mkDerivation { pname = "keysafe"; - version = "0.20170811"; - sha256 = "12akw0r3m4pz8gb1sxa8azm17jq8564300wwh3c5f47dy29p23py"; + version = "0.20180326"; + sha256 = "01kagnpliw0qmhhrx1lcaxdg41sq76km3c1gzk3b9siyqkszhq08"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -120055,8 +126197,8 @@ self: { http-client lifted-base MonadRandom network optparse-applicative process raaz random random-shuffle readline SafeSemaphore secret-sharing servant servant-client servant-server socks split - stm text time token-bucket transformers unbounded-delays unix - unix-compat utf8-string wai warp zxcvbn-c + stm text text-short time token-bucket transformers unbounded-delays + unix unix-compat utf8-string wai warp zxcvbn-c ]; homepage = "https://keysafe.branchable.com/"; description = "back up a secret key securely to the cloud"; @@ -120111,6 +126253,7 @@ self: { ]; description = "Pure Haskell key/value store implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keyword-args" = callPackage @@ -120169,20 +126312,21 @@ self: { }) {}; "kicad-data" = callPackage - ({ mkDerivation, base, ieee754, lens-family, parsec, parsec-numbers - , pretty-compact, QuickCheck, test-framework - , test-framework-quickcheck2 + ({ mkDerivation, base, charsetdetect, encoding, HUnit, ieee754 + , lens-family, parsec, pretty-compact, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "kicad-data"; - version = "0.4.0"; - sha256 = "098yfgrf9wiib8agx6frdgd766lyzkqyifx9lbj4ssyrgp03qnm5"; + version = "0.5.0"; + sha256 = "0nbzprp6j1d6l507h9s9c82y130w5b0jqlmc3dxd1ns2q5qf8cin"; libraryHaskellDepends = [ - base ieee754 lens-family parsec parsec-numbers pretty-compact + base ieee754 lens-family parsec pretty-compact ]; testHaskellDepends = [ - base ieee754 lens-family parsec parsec-numbers pretty-compact - QuickCheck test-framework test-framework-quickcheck2 + base charsetdetect encoding HUnit ieee754 lens-family parsec + pretty-compact QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 ]; homepage = "http://github.com/kasbah/haskell-kicad-data"; description = "Parser and writer for KiCad files"; @@ -120341,6 +126485,7 @@ self: { homepage = "https://github.com/paolino/kmp-dfa"; description = "KMP algorithm implementation, based on Deterministic Finite State Automata"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "knead" = callPackage @@ -120459,6 +126604,7 @@ self: { ]; description = "Utilities for working with many HStringTemplate templates from files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {string-templates = null;}; @@ -120516,23 +126662,6 @@ self: { }) {}; "kraken" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, mtl - }: - mkDerivation { - pname = "kraken"; - version = "0.0.3"; - sha256 = "178y3d9gxfv03as4p3f5hdf4csnc3dfkpabwbyc38m0m8p2y20a0"; - revision = "2"; - editedCabalFile = "0w8w1frkx54ldyhxp09ddm2y1l7q72xfl1p6py7y6ywxnq23lr4h"; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls mtl - ]; - description = "Kraken.io API client"; - license = stdenv.lib.licenses.mit; - }) {}; - - "kraken_0_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, mtl }: @@ -120545,7 +126674,6 @@ self: { ]; description = "Kraken.io API client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "krapsh" = callPackage @@ -120645,6 +126773,8 @@ self: { pname = "kure"; version = "2.16.12"; sha256 = "1n95f1ijxjxgbq8a33jzmd91yk15bgxx8damxs04y99kzih7sgjc"; + revision = "2"; + editedCabalFile = "07x04clvlzl2wr20pmis52jfyw4fanyaq00zx76r2zn7zdcvysy3"; libraryHaskellDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -120675,7 +126805,6 @@ self: { homepage = "https://github.com/bitonic/kyotocabinet"; description = "Mid level bindings to Kyoto Cabinet"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) kyotocabinet;}; "l-bfgs-b" = callPackage @@ -120764,6 +126893,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "labsat" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, lifted-async, lifted-base, optparse-generic + , preamble, scientific, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "labsat"; + version = "0.0.5"; + sha256 = "02c6bx1pwjcqni8nx7899mk3mzzfrpdpxjiwnkizzianrzmwz0mw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring conduit conduit-extra lifted-async + lifted-base preamble scientific text + ]; + executableHaskellDepends = [ base optparse-generic preamble text ]; + testHaskellDepends = [ + attoparsec base bytestring preamble tasty tasty-hunit + ]; + homepage = "https://github.com/swift-nav/labsat"; + description = "LabSat TCP Interface Wrapper"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "labyrinth" = callPackage ({ mkDerivation, base, containers, derive, HTF, HUnit, lens , monad-loops, MonadRandom, mtl, parsec, QuickCheck, random @@ -120826,8 +126980,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "0.4.6"; - sha256 = "162nlb96l7mzyr449lw15c3l8ljx9821bnijlzcq47vyrjlh2ym5"; + version = "1.0.2"; + sha256 = "00zvbdls0nr4q18889xr8z3cpfldi5gg3m2g7d572bcxvwfhm4y4"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; homepage = "https://github.com/tfausak/lackey#readme"; @@ -120970,12 +127124,12 @@ self: { ({ mkDerivation, base, containers, mtl, read-bounded }: mkDerivation { pname = "lambda-options"; - version = "0.9.0.1"; - sha256 = "16q4skxkmc6xaj23ys5ddpazwcxvck7dvvilm8n4k0wam0llhs2h"; + version = "0.9.1.0"; + sha256 = "0rylch5v4lpd5ynyhrzzj72npqdv6q8mp2rx9v7p641r0njw5r5n"; libraryHaskellDepends = [ base containers mtl read-bounded ]; homepage = "https://github.com/thomaseding/lambda-options"; - description = "A modern command-line parser for Haskell"; - license = "unknown"; + description = "Declarative command line parser using type-driven pattern matching"; + license = stdenv.lib.licenses.bsd2; }) {}; "lambda-placeholders" = callPackage @@ -121103,7 +127257,6 @@ self: { homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {}; "lambdabot-core" = callPackage @@ -121130,6 +127283,7 @@ self: { homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "lambdabot-haskell-plugins" = callPackage @@ -121143,8 +127297,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.1.0.1"; - sha256 = "1nmkqs62f4xdzcqh24953svvd8j3n8gjc95ljmk1jx0hxhspdkzw"; + version = "5.1.0.2"; + sha256 = "1vr4f92zsjdr2j1zxb2v1hmyrb4lvq32c08jgind7apkmvqjgm19"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -121174,6 +127328,7 @@ self: { homepage = "https://wiki.haskell.org/Lambdabot"; description = "IRC plugins for lambdabot"; license = "GPL"; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "lambdabot-misc-plugins" = callPackage @@ -121379,12 +127534,10 @@ self: { }) {}; "lambdacube-compiler" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, async, base - , base64-bytestring, bytestring, containers, deepseq, directory - , exceptions, filepath, JuicyPixels, lambdacube-ir, megaparsec - , monad-control, mtl, optparse-applicative, patience, pretty-show - , process, QuickCheck, semigroups, tasty, tasty-quickcheck, text - , time, vect, vector, websockets + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + , containers, directory, exceptions, filepath, lambdacube-ir + , megaparsec, mtl, optparse-applicative, pretty-show, semigroups + , text, vector }: mkDerivation { pname = "lambdacube-compiler"; @@ -121398,11 +127551,7 @@ self: { lambdacube-ir megaparsec mtl pretty-show semigroups text vector ]; executableHaskellDepends = [ - aeson ansi-wl-pprint async base base64-bytestring bytestring - containers deepseq directory exceptions filepath JuicyPixels - lambdacube-ir megaparsec monad-control mtl optparse-applicative - patience pretty-show process QuickCheck semigroups tasty - tasty-quickcheck text time vect vector websockets + aeson base bytestring filepath optparse-applicative ]; homepage = "http://lambdacube3d.com"; description = "LambdaCube 3D is a DSL to program GPUs"; @@ -121485,10 +127634,8 @@ self: { }) {}; "lambdacube-gl" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , containers, exceptions, GLFW-b, JuicyPixels, lambdacube-ir, mtl - , network, OpenGLRaw, text, time, vector, vector-algorithms - , wavefront, websockets + ({ mkDerivation, base, bytestring, containers, JuicyPixels + , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms }: mkDerivation { pname = "lambdacube-gl"; @@ -121500,11 +127647,6 @@ self: { base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw vector vector-algorithms ]; - executableHaskellDepends = [ - aeson base base64-bytestring bytestring containers exceptions - GLFW-b JuicyPixels lambdacube-ir mtl network OpenGLRaw text time - vector wavefront websockets - ]; homepage = "http://lambdacube3d.com"; description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D"; license = stdenv.lib.licenses.bsd3; @@ -121565,6 +127707,7 @@ self: { homepage = "http://github.com/NorfairKing/lambdatex"; description = "Type-Safe LaTeX EDSL"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdatwit" = callPackage @@ -121636,6 +127779,8 @@ self: { pname = "lame"; version = "0.1.1"; sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; + revision = "4"; + editedCabalFile = "0r364limqm570a8xd82wwpcvmcx2j7nfndg5kad022vz2v5n0smz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class directory exceptions filepath @@ -121653,23 +127798,36 @@ self: { }) {mp3lame = null;}; "lame-tester" = callPackage - ({ mkDerivation, base, bifunctors, containers, semigroups, tasty - , tasty-hunit, validation + ({ mkDerivation, base-noprelude, bizzlelude, containers, semigroups + , tasty, tasty-hunit, validation }: mkDerivation { pname = "lame-tester"; - version = "1.2.1"; - sha256 = "19hj6mij3ps1qc8y7ncdaqj9gw96lfljpxjzgrsya3wc7hqjjcgi"; + version = "1.4.0"; + sha256 = "0rlq0hmsrfvs3m3bp4whaljqxpwxs9svgmy02yg152vjmg0vv971"; libraryHaskellDepends = [ - base bifunctors containers semigroups validation + base-noprelude bizzlelude containers semigroups validation ]; - testHaskellDepends = [ base containers tasty tasty-hunit ]; + testHaskellDepends = [ bizzlelude containers tasty tasty-hunit ]; homepage = "http://github.com/TheBizzle"; description = "A strange and unnecessary selective test-running library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lang" = callPackage + ({ mkDerivation, base, bytestring, http-streams, Mapping }: + mkDerivation { + pname = "lang"; + version = "0.2.2"; + sha256 = "1nmyirpf07q7lrgfdqxwaspa173a2g3077gy9k7rpviw8pg2az0w"; + libraryHaskellDepends = [ base bytestring http-streams Mapping ]; + homepage = "语.ml"; + description = "A Lisp"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-asn1" = callPackage ({ mkDerivation, base, parsec, syb }: mkDerivation { @@ -121684,6 +127842,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-ats" = callPackage + ({ mkDerivation, alex, ansi-wl-pprint, array, base + , composition-prelude, containers, cpphs, criterion, deepseq, happy + , hspec, hspec-dirstream, lens, recursion-schemes, system-filepath + , transformers + }: + mkDerivation { + pname = "language-ats"; + version = "1.2.0.8"; + sha256 = "0609xpjcq294ypjq4blw1cb3a6jnjzm9gwzr54dnp3afhindbq3m"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + ansi-wl-pprint array base composition-prelude containers deepseq + lens recursion-schemes transformers + ]; + libraryToolDepends = [ alex cpphs happy ]; + testHaskellDepends = [ + base hspec hspec-dirstream system-filepath + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Parser and pretty-printer for ATS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-bash" = callPackage ({ mkDerivation, base, parsec, pretty, process, QuickCheck, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck @@ -121705,9 +127888,8 @@ self: { }) {}; "language-boogie" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers, filepath - , HUnit, lens, mtl, parsec, pretty, random, stream-monad, time - , transformers + ({ mkDerivation, ansi-terminal, base, cmdargs, containers, lens + , mtl, parsec, pretty, random, stream-monad, time, transformers }: mkDerivation { pname = "language-boogie"; @@ -121720,8 +127902,8 @@ self: { transformers ]; executableHaskellDepends = [ - ansi-terminal base cmdargs containers filepath HUnit lens mtl - parsec pretty random stream-monad time transformers + ansi-terminal base cmdargs containers lens mtl parsec pretty random + stream-monad time transformers ]; homepage = "https://bitbucket.org/nadiapolikarpova/boogaloo"; description = "Interpreter and language infrastructure for Boogie"; @@ -121735,27 +127917,8 @@ self: { }: mkDerivation { pname = "language-c"; - version = "0.6.1"; - sha256 = "1s1pz8lxnc3fbs84a4spayzrww1avkn7jszmazn90r740jfxrji3"; - libraryHaskellDepends = [ - array base bytestring containers directory filepath pretty process - syb - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ base directory filepath process ]; - homepage = "http://visq.github.io/language-c/"; - description = "Analysis and generation of C code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-c_0_7_0" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, filepath, happy, pretty, process, syb - }: - mkDerivation { - pname = "language-c"; - version = "0.7.0"; - sha256 = "1j4slggwj5g0rnrdxafgn2savv14sl2nqk7lfy3qj73vmpn1d86d"; + version = "0.7.2"; + sha256 = "1ra9spagayal2iw996qc0vafglxgyjf04fa2sv44f5z5v3fj5bb3"; libraryHaskellDepends = [ array base bytestring containers directory filepath pretty process syb @@ -121765,7 +127928,6 @@ self: { homepage = "http://visq.github.io/language-c/"; description = "Analysis and generation of C code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-c-comments" = callPackage @@ -121795,7 +127957,6 @@ self: { array base containers filepath language-c-quote mainland-pretty template-haskell ]; - testHaskellDepends = [ base language-c-quote ]; homepage = "https://github.com/mchakravarty/language-c-inline/"; description = "Inline C & Objective-C code in Haskell for language interoperability"; license = stdenv.lib.licenses.bsd3; @@ -121825,6 +127986,33 @@ self: { 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; + }) {}; + + "language-c-quote_0_12_2" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , exception-mtl, exception-transformers, filepath, happy + , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb + , symbol, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "language-c-quote"; + version = "0.12.2"; + sha256 = "15c6rdj91768jf8lqzf4fkbi8k6kz9gch5w81x6qzy2l256rncgb"; + libraryHaskellDepends = [ + array base bytestring containers exception-mtl + exception-transformers filepath haskell-src-meta mainland-pretty + mtl srcloc syb symbol template-haskell + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring HUnit mainland-pretty srcloc symbol test-framework + test-framework-hunit + ]; + 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; }) {}; "language-cil" = callPackage @@ -121840,10 +128028,9 @@ self: { }) {}; "language-conf" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, directory - , filepath, hspec, hspec-megaparsec, megaparsec - , optparse-applicative, pretty, QuickCheck, scientific, semigroups - , text, transformers, unordered-containers, vector, yaml + ({ mkDerivation, aeson, base, deepseq, directory, filepath, hspec + , hspec-megaparsec, megaparsec, pretty, QuickCheck, scientific + , semigroups, text, transformers, unordered-containers, vector }: mkDerivation { pname = "language-conf"; @@ -121855,10 +128042,6 @@ self: { aeson base deepseq directory filepath megaparsec pretty scientific semigroups text unordered-containers vector ]; - executableHaskellDepends = [ - aeson base bytestring filepath megaparsec optparse-applicative - pretty text yaml - ]; testHaskellDepends = [ aeson base directory filepath hspec hspec-megaparsec megaparsec pretty QuickCheck semigroups text transformers @@ -121893,6 +128076,55 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-docker" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, free + , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck + , semigroups, split, template-haskell, text, th-lift + , th-lift-instances, time, transformers, unordered-containers, yaml + }: + mkDerivation { + pname = "language-docker"; + version = "2.0.1"; + sha256 = "0xd7r6npr7kzdh3pxcidvqff3lrww6dqyyksg58chnb57d87b0sc"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath free Glob mtl parsec + pretty semigroups split template-haskell text th-lift + th-lift-instances time transformers unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath free Glob hspec HUnit mtl + parsec pretty process QuickCheck semigroups split template-haskell + text th-lift th-lift-instances time transformers + unordered-containers yaml + ]; + homepage = "https://github.com/hadolint/language-docker#readme"; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "language-docker_4_0_1" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, free, Glob + , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split + , template-haskell, text, th-lift, time + }: + mkDerivation { + pname = "language-docker"; + version = "4.0.1"; + sha256 = "0z1jifvinq90qh4106azd6ss80ds5p8acvl8x73j4zmqpn2d95xa"; + libraryHaskellDepends = [ + base bytestring free mtl parsec pretty split template-haskell text + th-lift time + ]; + testHaskellDepends = [ + base bytestring directory filepath free Glob hspec HUnit mtl parsec + pretty process QuickCheck split template-haskell text th-lift time + ]; + homepage = "https://github.com/hadolint/language-docker#readme"; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -121911,11 +128143,6 @@ self: { pretty ShellCheck split template-haskell text th-lift th-lift-instances transformers unordered-containers yaml ]; - executableHaskellDepends = [ - 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 = [ aeson base bytestring directory filepath free Glob hspec HUnit mtl parsec pretty process QuickCheck ShellCheck split template-haskell @@ -121925,6 +128152,7 @@ self: { homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-dot" = callPackage @@ -121966,6 +128194,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-ecmascript_0_18" = callPackage + ({ mkDerivation, ansi-wl-pprint, 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 + }: + mkDerivation { + pname = "language-ecmascript"; + version = "0.18"; + sha256 = "0gg608hniq1v7f1d56akyk44zyrmd0acr33m53cbdlcq8w1c8h70"; + libraryHaskellDepends = [ + ansi-wl-pprint base charset containers data-default-class Diff mtl + parsec QuickCheck template-haskell testing-feat uniplate + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers data-default-class Diff directory + filepath HUnit mtl parsec QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 uniplate + ]; + homepage = "http://github.com/jswebtools/language-ecmascript"; + description = "JavaScript parser and pretty-printer library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-ecmascript-analysis" = callPackage ({ mkDerivation, base, containers, language-ecmascript, parsec , uniplate @@ -122120,25 +128374,24 @@ self: { homepage = "https://github.com/beijaflor-io/haskell-language-hcl#readme"; description = "HCL parsers and pretty-printers for the Haskell programming language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-java" = callPackage - ({ mkDerivation, alex, array, base, cpphs, directory, filepath - , HUnit, mtl, parsec, pretty, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, alex, array, base, directory, filepath, mtl + , parsec, pretty, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "language-java"; - version = "0.2.8"; - sha256 = "0ry3x4riqyjr2bwrk64992aw2g7jxzrsk8f291iby62bkq49wy0b"; - libraryHaskellDepends = [ array base cpphs parsec pretty ]; + version = "0.2.9"; + sha256 = "03hrj8hgyjmw2fvvk4ik30fdmbi3hndpkvf1bqcnpzqy5anwh58x"; + libraryHaskellDepends = [ array base parsec pretty ]; libraryToolDepends = [ alex ]; testHaskellDepends = [ - base directory filepath HUnit mtl QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 + base directory filepath mtl tasty tasty-hunit tasty-quickcheck ]; homepage = "http://github.com/vincenthz/language-java"; - description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer"; + description = "Java source manipulation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122167,8 +128420,8 @@ self: { }: mkDerivation { pname = "language-javascript"; - version = "0.6.0.10"; - sha256 = "0m1yk0v4myzjjv3czhavwlsgzp8ffpmbkwks97d3yipl1d0lrwfa"; + version = "0.6.0.11"; + sha256 = "0hv1rj3yarv035mpnnnbqys4sgd0awqlm5hyf29wp051r6dnwxfl"; libraryHaskellDepends = [ array base blaze-builder bytestring containers mtl text utf8-string ]; @@ -122182,6 +128435,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-js" = callPackage + ({ mkDerivation, base, hspec, parsec }: + mkDerivation { + pname = "language-js"; + version = "0.2.0"; + sha256 = "0j87w6sqyl67ad9qar2q240kbzksds3a301cdykjfa3n6a0r81z1"; + libraryHaskellDepends = [ base parsec ]; + testHaskellDepends = [ base hspec parsec ]; + homepage = "https://github.com/diasbruno/language-js#readme"; + description = "javascript parser for es6 and es7"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-kort" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, QuickCheck , random, razom-text-util, regex-applicative, smaoin, text @@ -122252,9 +128518,9 @@ self: { "language-lua2" = callPackage ({ mkDerivation, base, containers, deepseq, Earley - , lexer-applicative, microlens, optparse-applicative, QuickCheck - , regex-applicative, semigroups, srcloc, tasty, tasty-hunit - , tasty-quickcheck, transformers, unordered-containers, wl-pprint + , lexer-applicative, microlens, QuickCheck, regex-applicative + , semigroups, srcloc, tasty, tasty-hunit, tasty-quickcheck + , transformers, unordered-containers, wl-pprint }: mkDerivation { pname = "language-lua2"; @@ -122267,9 +128533,6 @@ self: { regex-applicative semigroups srcloc transformers unordered-containers wl-pprint ]; - executableHaskellDepends = [ - base Earley lexer-applicative optparse-applicative srcloc wl-pprint - ]; testHaskellDepends = [ base deepseq lexer-applicative QuickCheck semigroups srcloc tasty tasty-hunit tasty-quickcheck unordered-containers @@ -122277,7 +128540,6 @@ self: { homepage = "http://github.com/mitchellwrosen/language-lua2"; description = "Lua parser and pretty printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-mixal" = callPackage @@ -122358,6 +128620,34 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "language-oberon" = callPackage + ({ mkDerivation, base, containers, directory, either, filepath + , grammatical-parsers, optparse-applicative, parsers, prettyprinter + , rank2classes, repr-tree-syb, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "language-oberon"; + version = "0.1.1"; + sha256 = "0b63yryiaw4fr793qif2bq64fcx4ml3yi8wgkz1rg77j0nnga2vs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory either filepath grammatical-parsers + parsers prettyprinter rank2classes text + ]; + executableHaskellDepends = [ + base containers either filepath grammatical-parsers + optparse-applicative prettyprinter rank2classes repr-tree-syb text + ]; + testHaskellDepends = [ + base directory either filepath tasty tasty-hunit + ]; + homepage = "https://github.com/blamario/language-oberon"; + description = "Parser and pretty-printer for the Oberon programming language"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-objc" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, newtype, pretty, process, syb @@ -122418,88 +128708,42 @@ self: { "language-puppet" = 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 + , cryptonite, directory, exceptions, filecache, filepath + , formatting, Glob, hashable, hruby, hslogger, hspec + , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson + , megaparsec, memory, mtl, operational, optparse-applicative + , parallel-io, parsec, pcre-utils, process, protolude, random + , regex-pcre-builtin, scientific, servant, servant-client, split + , stm, strict-base-types, temporary, text, time, transformers, unix , unordered-containers, vector, yaml }: mkDerivation { pname = "language-puppet"; - version = "1.3.8.1"; - sha256 = "0hk1fx574hkmm275rm4jv66vr9gixllaw2vqklhpx54rgjwpcclv"; - revision = "1"; - editedCabalFile = "1v6vd8mfa4rk7l952d9lysv38w0prvrlhiacfqpxwx8fxj0m5kxc"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = 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 = [ "i686-linux" "x86_64-linux" ]; - }) {}; - - "language-puppet_1_3_12_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, 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.12.1"; - sha256 = "1nznlw81qnnrvfpwrliyz88f1i6wmsg8kksjnwk5zv69q9nxg3z1"; + version = "1.3.17"; + sha256 = "0n71grhaw59z3vqkys499kx06q10fn6l5r4sfim17vyxdy0bz8xq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring case-insensitive containers cryptonite directory 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 + filecache filepath formatting hashable hruby hslogger hspec + http-api-data http-client lens lens-aeson megaparsec memory mtl + operational parsec pcre-utils process protolude random + regex-pcre-builtin scientific servant servant-client split stm + strict-base-types text time transformers unix unordered-containers + vector yaml ]; executableHaskellDepends = [ aeson ansi-wl-pprint 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 + regex-pcre-builtin 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 + base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl + protolude scientific strict-base-types temporary text transformers + unordered-containers vector ]; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; @@ -122575,6 +128819,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-rust" = callPackage + ({ mkDerivation, aeson, alex, array, base, bytestring, criterion + , deepseq, directory, filepath, happy, HUnit, prettyprinter + , process, statistics, template-haskell, test-framework + , test-framework-hunit, text, time, transformers + , unordered-containers, utf8-string, vector, weigh + }: + mkDerivation { + pname = "language-rust"; + version = "0.1.1.26"; + sha256 = "1f363j2kpvww0v7l13lg8a2a0v0h2zw7q3x8fyssvrw3yn5afwyn"; + libraryHaskellDepends = [ + array base bytestring deepseq prettyprinter template-haskell + transformers utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit prettyprinter + process test-framework test-framework-hunit text time + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion directory filepath process + statistics weigh + ]; + homepage = "https://github.com/harpocrates/language-rust"; + description = "Parsing and pretty printing of Rust code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-sally" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, text }: @@ -122683,6 +128957,7 @@ self: { homepage = "https://github.com/abhinav/language-thrift#readme"; description = "Parser and pretty printer for the Thrift IDL format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-typescript" = callPackage @@ -122719,6 +128994,80 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Parser and Pretty Printer for WebIDL"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lapack" = callPackage + ({ mkDerivation, base, blas-ffi, comfort-array, lapack-ffi + , netlib-ffi, non-empty, transformers, utility-ht + }: + mkDerivation { + pname = "lapack"; + version = "0.1"; + sha256 = "195v3jpz5n5vksa8svqng1kwc629ds2kd1p55f6npz2q2j6k8lac"; + libraryHaskellDepends = [ + base blas-ffi comfort-array lapack-ffi netlib-ffi non-empty + transformers utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/lapack/"; + description = "Numerical Linear Algebra using LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lapack-carray" = callPackage + ({ mkDerivation, base, carray, lapack-ffi, netlib-carray + , netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "lapack-carray"; + version = "0.0.2"; + sha256 = "1dr4mbhc5y21mbnksyi530rsvckfp4mclhhig2rjhx3b06cksfna"; + libraryHaskellDepends = [ + base carray lapack-ffi netlib-carray netlib-ffi storable-complex + transformers + ]; + homepage = "http://hub.darcs.net/thielema/lapack-carray/"; + description = "Auto-generated interface to Fortran LAPACK via CArrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lapack-ffi" = callPackage + ({ mkDerivation, base, liblapack, netlib-ffi }: + mkDerivation { + pname = "lapack-ffi"; + version = "0.0.2"; + sha256 = "11759avf0kzkqy4s24kn556j93l10x28njpg6h14y915pdl35dyl"; + libraryHaskellDepends = [ base netlib-ffi ]; + libraryPkgconfigDepends = [ liblapack ]; + homepage = "http://hub.darcs.net/thielema/lapack-ffi/"; + description = "Auto-generated interface to Fortran LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) liblapack;}; + + "lapack-ffi-tools" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers + , explicit-exception, filepath, non-empty, optparse-applicative + , parsec, pathtype, transformers, unordered-containers, utility-ht + , vector + }: + mkDerivation { + pname = "lapack-ffi-tools"; + version = "0.1.0.1"; + sha256 = "0cddhc6hm72sjkj3i5f38z3bf4m0cy44jnbgv2v5ck5x0h55173w"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring cassava containers explicit-exception filepath + non-empty optparse-applicative parsec pathtype transformers + unordered-containers utility-ht vector + ]; + homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/"; + description = "Generator for Haskell interface to Fortran LAPACK"; + license = stdenv.lib.licenses.bsd3; }) {}; "large-hashable" = callPackage @@ -122912,34 +129261,9 @@ self: { homepage = "https://github.com/unitb/latex-function-tables"; description = "Function table specifications in latex"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lattices" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, QuickCheck - , semigroups, tagged, tasty, tasty-quickcheck, transformers - , universe-base, universe-reverse-instances, unordered-containers - , void - }: - mkDerivation { - pname = "lattices"; - version = "1.5.0"; - sha256 = "07sxli1xix9gi8smk6crgx4ijs7mjq6g95ci423r0fsh6i1zpqy6"; - revision = "1"; - editedCabalFile = "04l5x09f48vdkljzl79g2cybbm5wdxa0bf4xvlwdkcbky9h0qvan"; - libraryHaskellDepends = [ - base containers deepseq hashable semigroups tagged universe-base - universe-reverse-instances unordered-containers void - ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-quickcheck transformers - ]; - homepage = "http://github.com/phadej/lattices/"; - description = "Fine-grained library for constructing and manipulating lattices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lattices_1_7" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty , tasty-quickcheck, transformers, universe-base @@ -122948,8 +129272,10 @@ self: { }: mkDerivation { pname = "lattices"; - version = "1.7"; - sha256 = "1p5bqr3a8haib4wsdzy08z61jv8cq91n7rzj7wanh1nwp3r2n1nc"; + version = "1.7.1"; + sha256 = "0bcv28dazaz0n166jbd579vim0hr4c20rmg0s34284fdr6p50m3x"; + revision = "2"; + editedCabalFile = "0ngxvs48hqdr5353fbblcrq5hqrwr89xl39akxg8rkridkr3hq96"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -122962,7 +129288,6 @@ self: { 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 @@ -123017,6 +129342,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "layered-state" = callPackage + ({ mkDerivation, base, constraints, criterion, data-default + , deepseq, either, exceptions, kan-extensions, lens, lens-utils + , monad-branch, monoid, mtl, mtl-c, primitive, profunctors + , prologue, timeit, transformers, typelevel + }: + mkDerivation { + pname = "layered-state"; + version = "1.1.2"; + sha256 = "1z9xz9nvzlqvzrp4dva9skci70g70lzzf5d5d38ilxvfk7kh56h6"; + libraryHaskellDepends = [ + base constraints data-default exceptions lens lens-utils + monad-branch monoid mtl primitive profunctors prologue transformers + typelevel + ]; + benchmarkHaskellDepends = [ + criterion deepseq either kan-extensions mtl-c timeit + ]; + homepage = "https://github.com/luna/layered-state"; + description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "layers" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -123088,6 +129437,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "layouting" = callPackage + ({ mkDerivation, base, container, layered-state, prologue + , terminal-text, text + }: + mkDerivation { + pname = "layouting"; + version = "1.1.2"; + sha256 = "1j3bki62ldi5gbl3asa31rjjlah2842rhgylxwab13c3r50a7p85"; + libraryHaskellDepends = [ + base container layered-state prologue terminal-text text + ]; + homepage = "https://github.com/luna/layouting"; + description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers."; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lazy-csv" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -123117,6 +129483,7 @@ self: { ]; description = "Identifiers for not-yet-computed values"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lazy-hash-cache" = callPackage @@ -123135,6 +129502,7 @@ self: { ]; description = "Storing computed values for re-use when the same program runs again"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lazy-io" = callPackage @@ -123158,6 +129526,7 @@ self: { libraryHaskellDepends = [ base bytestring io-streams ]; description = "Get lazy with your io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lazy-search" = callPackage @@ -123252,15 +129621,16 @@ self: { }) {}; "lca" = callPackage - ({ mkDerivation, base, doctest }: + ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: mkDerivation { pname = "lca"; - version = "0.3"; - sha256 = "081fk0ci5vb84w4zwah6qwbr0i78v2pr6m6nn1y226vv5w3kakza"; + version = "0.3.1"; + sha256 = "0kj3zsmzckczp51w70x1aqayk2fay4vcqwz8j6sdv0hdw1d093ca"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/ekmett/lca/"; - description = "O(log n) persistent on-line lowest common ancestor calculation without preprocessing"; + description = "O(log n) persistent online lowest common ancestor search without preprocessing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -123411,14 +129781,13 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.6.7"; - sha256 = "1aia20p6r9b4xncv5r7y1a2zff37ky0v0m3fd5idlg3sshsd02kv"; + version = "0.7.0"; + sha256 = "1mz6fwh3rbwkfx514imh044v1ng7065sd5bivcd94xw0cb530p3f"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; homepage = "https://github.com/rudymatela/leancheck#readme"; description = "Cholesterol-free property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "leankit-api" = callPackage @@ -123449,19 +129818,6 @@ self: { }) {}; "leapseconds-announced" = callPackage - ({ mkDerivation, base, QuickCheck, time }: - mkDerivation { - pname = "leapseconds-announced"; - version = "2017"; - sha256 = "1avx8wm98nrv04cfkv4npy1fwr42nnp7i8njl3dg31ybrwlwknvz"; - libraryHaskellDepends = [ base time ]; - testHaskellDepends = [ base QuickCheck time ]; - homepage = "https://github.com/bjornbm/leapseconds-announced"; - description = "Leap seconds announced at library release time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "leapseconds-announced_2017_1_0_1" = callPackage ({ mkDerivation, base, QuickCheck, time }: mkDerivation { pname = "leapseconds-announced"; @@ -123472,7 +129828,6 @@ self: { homepage = "https://github.com/bjornbm/leapseconds-announced"; description = "Leap seconds announced at library release time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "learn" = callPackage @@ -123558,6 +129913,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "left4deadrl" = callPackage + ({ mkDerivation, base, hscharm, random, random-shuffle }: + mkDerivation { + pname = "left4deadrl"; + version = "0.0.2"; + sha256 = "1lwpkhlhiy8dbw3ln0dz65ci8my7cmqs7d08f5wy728ixmmcn84w"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base hscharm random random-shuffle ]; + description = "left4dead-inspired roguelike"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "legion" = callPackage ({ mkDerivation, aeson, base, binary, binary-conduit, bytestring , canteven-http, conduit, conduit-extra, containers @@ -123762,8 +130130,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.15.4"; - sha256 = "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl"; + version = "4.16.1"; + sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -123795,12 +130163,25 @@ self: { pname = "lens-accelerate"; version = "0.1.0.0"; sha256 = "0j4mbkpdwycpc4m9vh43ylxw1k7ayhbjm8r50jb1dha24fb3d9z4"; - revision = "1"; - editedCabalFile = "0mgh4px2gpbny3fnbxv91ml5anvq3gmxs3w3q0zgsbnhaw73w4cf"; + revision = "2"; + editedCabalFile = "1yk1zjwp7sabh90rgz4sa15vqj1wq837nypqjb0qhymslmrnvvnl"; + libraryHaskellDepends = [ accelerate base lens ]; + homepage = "https://github.com/tmcdonell/lens-accelerate"; + description = "Instances to mix lens with accelerate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "lens-accelerate_0_2_0_0" = callPackage + ({ mkDerivation, accelerate, base, lens }: + mkDerivation { + pname = "lens-accelerate"; + version = "0.2.0.0"; + sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk"; libraryHaskellDepends = [ accelerate base lens ]; homepage = "https://github.com/tmcdonell/lens-accelerate"; description = "Instances to mix lens with accelerate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-action" = callPackage @@ -123810,8 +130191,8 @@ self: { }: mkDerivation { pname = "lens-action"; - version = "0.2.2"; - sha256 = "1skhczbl774sb0202b8allm96b67wqsl5fd7jdr9i6a20hyx1gqr"; + version = "0.2.3"; + sha256 = "1q4q190lv6gh3bvdz9n177hwrckkkbfbwcw64b9ksz11gxn8m106"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids @@ -123832,8 +130213,8 @@ self: { pname = "lens-aeson"; version = "1.0.2"; sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3"; - revision = "1"; - editedCabalFile = "1xkxncl218ni4idq90g6bdd7vnwxshcpa1xk11fd3kc3i3j90pqs"; + revision = "4"; + editedCabalFile = "1gas30rarvr8337a06z089m3dp5kvdcvhyac2mrp5pjlfp4zz226"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -123860,21 +130241,6 @@ self: { }) {}; "lens-family" = callPackage - ({ mkDerivation, base, containers, lens-family-core, mtl - , transformers - }: - mkDerivation { - pname = "lens-family"; - version = "1.2.1"; - sha256 = "1dwsrli94i8vs1wzfbxbxh49qhn8jn9hzmxwgd3dqqx07yx8x0s1"; - libraryHaskellDepends = [ - base containers lens-family-core mtl transformers - ]; - description = "Lens Families"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens-family_1_2_2" = callPackage ({ mkDerivation, base, containers, lens-family-core, mtl , transformers }: @@ -123887,21 +130253,9 @@ self: { ]; description = "Lens Families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-family-core" = callPackage - ({ mkDerivation, base, containers, transformers }: - mkDerivation { - pname = "lens-family-core"; - version = "1.2.1"; - sha256 = "190r3n25m8x24nd6xjbbk9x0qhs1mw22xlpsbf3cdp3cda3vkqwm"; - libraryHaskellDepends = [ base containers transformers ]; - description = "Haskell 98 Lens Families"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens-family-core_1_2_2" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "lens-family-core"; @@ -123910,7 +130264,6 @@ self: { libraryHaskellDepends = [ base containers transformers ]; description = "Haskell 98 Lens Families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-family-th" = callPackage @@ -123919,6 +130272,8 @@ self: { pname = "lens-family-th"; version = "0.5.0.1"; sha256 = "00rpx75hh8p2991m36jp1cb91m048xjn8f02kj2zqsfwfhimfdzs"; + revision = "1"; + editedCabalFile = "190jxqskd61irc97zb95h08zlkszlhpik4zmb7y4vk7x06zz00m6"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec lens-family template-haskell ]; homepage = "http://github.com/DanBurton/lens-family-th#readme"; @@ -123938,6 +130293,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-labels_0_2_0_0" = callPackage + ({ mkDerivation, base, ghc-prim, profunctors, tagged }: + mkDerivation { + pname = "lens-labels"; + version = "0.2.0.0"; + sha256 = "137axpd2j7q4k34mav0338spk985ksh760nfv3vsm59aq9ab76xf"; + libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; + homepage = "https://github.com/google/proto-lens#readme"; + description = "Integration of lenses with OverloadedLabels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lens-named" = callPackage + ({ mkDerivation, base, lens, template-haskell }: + mkDerivation { + pname = "lens-named"; + version = "0.1.0.2"; + sha256 = "1w6y1caah0yr7gilwsv7ji7pp3mz1m9wlx5zpq0n0z1q2wbdsmfp"; + libraryHaskellDepends = [ base lens template-haskell ]; + homepage = "https://github.com/vmchale/lens-named#readme"; + description = "Helper for use with lens"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-prelude" = callPackage ({ mkDerivation, array, base, bytestring, containers, contravariant , either, hashable, lens, mtl, text, time, transformers @@ -123954,19 +130334,21 @@ self: { homepage = "https://github.com/andrewthad/lens-prelude"; description = "Alternate prelude that exports lens combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-properties" = callPackage ({ mkDerivation, base, lens, QuickCheck, transformers }: mkDerivation { pname = "lens-properties"; - version = "4.11"; - sha256 = "0cg0n75ss5ayy31igwyz9yz2sh0smcaiidbbm1wkrk1krzbws31w"; + version = "4.11.1"; + sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; + revision = "1"; + editedCabalFile = "1b9db7dbfq46q63y6w1471nffj77rb363rk4b1l3l23g15cq6a5i"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-regex" = callPackage @@ -124059,6 +130441,7 @@ self: { homepage = "https://github.com/xngns/lens-toml-parser"; description = "Lenses for toml-parser"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-tutorial" = callPackage @@ -124075,13 +130458,17 @@ self: { }) {}; "lens-utils" = callPackage - ({ mkDerivation, base, lens }: + ({ mkDerivation, aeson, base, containers, data-default, lens + , monoid, template-haskell + }: mkDerivation { pname = "lens-utils"; - version = "1.2"; - sha256 = "1ysr9ph03f8klvnbhvzjn45vsnxbfp1ry34lbcrhdm6gy7x0maib"; - libraryHaskellDepends = [ base lens ]; - homepage = "https://github.com/wdanilo/lens-utils"; + version = "1.4.2"; + sha256 = "1sgsahb2cgfhbv3vw0h1cqls5g5kgbq9crx4w0rfjxcwk9d5jzds"; + libraryHaskellDepends = [ + aeson base containers data-default lens monoid template-haskell + ]; + homepage = "https://github.com/luna/lens-utils"; description = "Collection of missing lens utilities"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -124137,8 +130524,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.0.9.0"; - sha256 = "14ygg1f8f2rpwvgjii3g8k6q87iy20i78n10ia2gggn6yhkdl0s4"; + version = "1.0.11.3"; + sha256 = "0kb9fydcv0skp94bhvhbqggam8vrq2wv5iradxmggaf41h0ly123"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124157,14 +130544,19 @@ self: { }) {}; "lenz" = callPackage - ({ mkDerivation, base, base-unicode-symbols, transformers }: + ({ mkDerivation, base, base-unicode-symbols, hs-functors + , transformers + }: mkDerivation { pname = "lenz"; - version = "0.1.2.2"; - sha256 = "1hzvw76fgaf5d5l1dca9662c0pplgv0h53dwfr42cwg0hxj6c876"; - libraryHaskellDepends = [ base base-unicode-symbols transformers ]; + version = "0.3.0.0"; + sha256 = "17a3d91az0qv138q7x8wbka797z9pfxl3mbyydcr7i7p87dk48k3"; + libraryHaskellDepends = [ + base base-unicode-symbols hs-functors transformers + ]; description = "Van Laarhoven lenses"; - license = "unknown"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz-template" = callPackage @@ -124173,8 +130565,10 @@ self: { }: mkDerivation { pname = "lenz-template"; - version = "0.1.0.1"; - sha256 = "1j11cg76w9kyc1nn395qhzj9cp64ff0jq8y0h5x9lcn2r18zihhi"; + version = "0.2.0.0"; + sha256 = "0g073wfh8522hvmy80dp8an5jr6qjnkfj3119ms3sir7dkfzljqn"; + revision = "1"; + editedCabalFile = "05rgdgqk2yb92wlfs13844bdh7a2k2rddnxf9fcnz1c3qq4wkyi5"; libraryHaskellDepends = [ base base-unicode-symbols containers lenz template-haskell ]; @@ -124196,7 +130590,7 @@ self: { }) {}; "leveldb-haskell" = callPackage - ({ mkDerivation, async, base, bytestring, data-default, directory + ({ mkDerivation, base, bytestring, data-default, directory , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty , tasty-quickcheck, temporary, transformers }: @@ -124211,9 +130605,6 @@ self: { transformers ]; librarySystemDepends = [ leveldb ]; - executableHaskellDepends = [ - async base bytestring data-default resourcet transformers - ]; testHaskellDepends = [ base bytestring data-default directory exceptions mtl QuickCheck tasty tasty-quickcheck temporary transformers @@ -124221,13 +130612,12 @@ self: { homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage - ({ mkDerivation, async, base, bytestring, data-default, filepath - , hspec, hspec-expectations, leveldb, mtl, process, QuickCheck - , resourcet, transformers + ({ mkDerivation, base, bytestring, data-default, filepath, hspec + , hspec-expectations, leveldb, mtl, process, QuickCheck, resourcet + , transformers }: mkDerivation { pname = "leveldb-haskell-fork"; @@ -124239,9 +130629,6 @@ self: { base bytestring data-default filepath resourcet transformers ]; librarySystemDepends = [ leveldb ]; - executableHaskellDepends = [ - async base bytestring data-default resourcet transformers - ]; testHaskellDepends = [ base bytestring data-default hspec hspec-expectations mtl process QuickCheck transformers @@ -124266,8 +130653,7 @@ self: { }) {}; "levmar-chart" = callPackage - ({ mkDerivation, base, Chart, colour, data-accessor, levmar, random - }: + ({ mkDerivation, base, Chart, colour, data-accessor, levmar }: mkDerivation { pname = "levmar-chart"; version = "0.2"; @@ -124275,9 +130661,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Chart colour data-accessor levmar ]; - executableHaskellDepends = [ - base Chart colour data-accessor levmar random - ]; description = "Plots the results of the Levenberg-Marquardt algorithm in a chart"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -124311,6 +130694,7 @@ self: { homepage = "https://github.com/ci-fst/lfst"; description = "L-Fuzzy Set Theory implementation in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lgtk" = callPackage @@ -124377,13 +130761,7 @@ self: { }) {}; "lhc" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring - , bytestring-trie, Cabal, containers, core, derive, digest - , directory, extensible-exceptions, filepath, haskell98, HUnit, mtl - , parallel, pretty, process, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck, time, unix - , xhtml - }: + ({ mkDerivation }: mkDerivation { pname = "lhc"; version = "0.10"; @@ -124391,13 +130769,6 @@ self: { isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ - ansi-wl-pprint base binary bytestring bytestring-trie Cabal - containers core derive digest directory extensible-exceptions - filepath haskell98 HUnit mtl parallel pretty process QuickCheck - test-framework test-framework-hunit test-framework-quickcheck time - unix xhtml - ]; homepage = "http://lhc.seize.it/"; description = "LHC Haskell Compiler"; license = stdenv.lib.licenses.publicDomain; @@ -124451,24 +130822,6 @@ self: { }) {}; "lhs2tex" = callPackage - ({ mkDerivation, base, directory, filepath, mtl, process - , regex-compat - }: - mkDerivation { - pname = "lhs2tex"; - version = "1.19"; - sha256 = "03mhhkrqjjqmmh18im8di1cl6wqv30lsib5hv73f0wsnv5bhbbi4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath mtl process regex-compat - ]; - homepage = "http://www.andres-loeh.de/lhs2tex/"; - description = "Preprocessor for typesetting Haskell sources with LaTeX"; - license = "GPL"; - }) {}; - - "lhs2tex_1_20" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, mtl, process , regex-compat }: @@ -124487,7 +130840,6 @@ self: { homepage = "https://github.com/kosmikus/lhs2tex"; description = "Preprocessor for typesetting Haskell sources with LaTeX"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lhslatex" = callPackage @@ -124637,7 +130989,6 @@ self: { homepage = "http://maartenfaddegon.nl"; description = "Store and manipulate data in a graph"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libhbb" = callPackage @@ -124709,13 +131060,14 @@ self: { ]; description = "Jenkins API interface"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "liblastfm" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, hspec, hspec-expectations-lens, http-client - , http-client-tls, HUnit, lens, lens-aeson, network-uri - , profunctors, semigroups, text, transformers, xml-conduit + , http-client-tls, lens, lens-aeson, network-uri, profunctors + , semigroups, text, transformers, xml-conduit , xml-html-conduit-lens }: mkDerivation { @@ -124729,8 +131081,8 @@ self: { ]; testHaskellDepends = [ aeson base bytestring cereal containers cryptonite hspec - hspec-expectations-lens http-client http-client-tls HUnit lens - lens-aeson network-uri profunctors text transformers xml-conduit + hspec-expectations-lens http-client http-client-tls lens lens-aeson + network-uri profunctors text transformers xml-conduit xml-html-conduit-lens ]; description = "Lastfm API interface"; @@ -124799,7 +131151,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/mainland/libltdl"; description = "FFI interface to libltdl"; license = stdenv.lib.licenses.bsd3; @@ -124846,8 +131197,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.9.0.7"; - sha256 = "08i6v4i8xbv0vv4w0yqqh2pp7z0fb5dc9chgwyclkrvy480g5w0p"; + version = "0.9.0.8"; + sha256 = "0kpdj4ciwrfd6vmr60y7c276h5z2r40avs26a0x8s51rbr00lasq"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -124983,6 +131334,8 @@ self: { pname = "librato"; version = "0.2.0.1"; sha256 = "1l0q8kx0v563glplz5blg5scnvwf1aak04w08abxkrbfdjq6a8z4"; + revision = "1"; + editedCabalFile = "06md1545pfywdd3ggm6ss9lk8fzph1psl9jip3gp0qsxmv3diyix"; libraryHaskellDepends = [ aeson attoparsec base bytestring either http-client http-conduit http-types mtl resourcet text unordered-containers uri-templater @@ -124991,6 +131344,7 @@ self: { homepage = "https://github.com/SaneTracker/librato"; description = "Bindings to the Librato API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libravatar" = callPackage @@ -124999,13 +131353,15 @@ self: { }: mkDerivation { pname = "libravatar"; - version = "0.4.0.1"; - sha256 = "0ki2xw3m0iq4n25ylv8am26j8s517v1l6b6avca6ymgn5qxq79kp"; + version = "0.4.0.2"; + sha256 = "1i86l8kw2501na1xy6q6nc1xqna5a55ks0bk36nhxhi0hqlr5vdh"; + revision = "1"; + editedCabalFile = "1hc8j8ki9nc10cqwiz0xhg5x9l6yqfmlfd47aximwk56n8sqp0nn"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class dns memory random text uri-bytestring url ]; - homepage = "https://rel4.seek-together.space/projects/libravatar/"; + homepage = "https://hub.darcs.net/fr33domlover/libravatar"; description = "Use Libravatar, the decentralized avatar delivery service"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -125024,25 +131380,22 @@ self: { }) {}; "libssh2" = callPackage - ({ mkDerivation, base, bytestring, c2hs, libssh2, network, select - , syb, time + ({ mkDerivation, base, bytestring, c2hs, libssh2, network, syb + , time, unix }: mkDerivation { pname = "libssh2"; - version = "0.2.0.5"; - sha256 = "0l224pd8bb9d29043qdy40dbknnhmwnjc95r3yyc93lhwd5fsqma"; + version = "0.2.0.6"; + sha256 = "17v006ixkn9wblhnq1nyx1xi7sc9lshyh1ma2y82483w18n849s1"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base bytestring network select syb time - ]; + libraryHaskellDepends = [ base bytestring network syb time unix ]; librarySystemDepends = [ libssh2 ]; libraryPkgconfigDepends = [ libssh2 ]; libraryToolDepends = [ c2hs ]; 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;}; "libssh2-conduit" = callPackage @@ -125061,7 +131414,6 @@ self: { homepage = "https://github.com/portnov/libssh2-hs"; description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libstackexchange" = callPackage @@ -125079,6 +131431,7 @@ self: { homepage = "https://github.com/supki/libstackexchange"; description = "StackExchange API interface"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libsystemd-daemon" = callPackage @@ -125181,11 +131534,13 @@ self: { pname = "libxml"; version = "0.1.1"; sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi"; + configureFlags = [ + "--extra-include-dir=${libxml2.dev}/include/libxml2" + ]; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ libxml2 ]; description = "Binding to libxml2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libxml2;}; "libxml-enumerator" = callPackage @@ -125254,8 +131609,8 @@ self: { }: mkDerivation { pname = "licensor"; - version = "0.2.1"; - sha256 = "1is281xsrfdh2vsank07j1gw634iadz0sp8ssabpfqgnb3a98rvz"; + version = "0.2.2"; + sha256 = "0kxcsw1ds9q8apsmhbnwcz76kxfhabv08b8myadbflwm4wj0szlz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125290,10 +131645,10 @@ self: { }: mkDerivation { pname = "lift-generics"; - version = "0.1.1"; - sha256 = "1jrh74a1c95cd70xr371fslqsjar8jb8mnlmapjb1dvg8722rkq7"; + version = "0.1.2"; + sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf"; revision = "1"; - editedCabalFile = "03vpmdgarz41zx1q51a4bx3x3qfvs7wfnqym8xiv4i9sxdr82yy8"; + editedCabalFile = "02hg33ikmwl81zsw8fgppix740rdc3h8fv6nr9b9h37vizhs50zw"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell ]; @@ -125312,8 +131667,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.9.3"; - sha256 = "0qdlc64kf02g97rzpragm4943ppy2cx74kbjcpbv32jcyc3q75wp"; + version = "0.9.3.3"; + sha256 = "1gqd4ih72mky1s97120yx9gmabaxb1l54b3jwijsl8fxng5djdxf"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -125327,6 +131682,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_10_0_1" = callPackage + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit + , tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.0.1"; + sha256 = "1cf44j2jr2svp8g03hzf3xfmjlh7xcd40ra1k7dv6vzyzwb5p4hd"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty tasty-hunit + tasty-th + ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; + homepage = "https://github.com/maoe/lifted-async"; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -125334,8 +131712,8 @@ self: { }: mkDerivation { pname = "lifted-base"; - version = "0.2.3.11"; - sha256 = "1ass00wfa91z5xp2xmm97xrvwm7j5hdkxid5cqvr3xbwrsgpmi4f"; + version = "0.2.3.12"; + sha256 = "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base HUnit monad-control test-framework test-framework-hunit @@ -125365,6 +131743,7 @@ self: { homepage = "https://github.com/parsonsmat/lifted-protolude"; description = "A sensible set of defaults for writing lifted custom Preludes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-threads" = callPackage @@ -125457,8 +131836,7 @@ self: { transformers ]; testHaskellDepends = [ - aeson api-builder base bytestring hspec http-client http-client-tls - http-types network text transformers + aeson api-builder base bytestring hspec text transformers ]; homepage = "https://github.com/cmoresid/lightning-haskell#readme"; description = "Haskell client for lightning-viz REST API"; @@ -125617,30 +131995,6 @@ self: { }) {}; "line" = 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; - }) {}; - - "line_4_0_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text @@ -125662,7 +132016,6 @@ self: { homepage = "https://github.com/utatti/line"; description = "Haskell SDK for the LINE API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "line-break" = callPackage @@ -125719,8 +132072,8 @@ self: { pname = "linear"; version = "1.20.7"; sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b"; - revision = "1"; - editedCabalFile = "0ghmlkk5cy0pylx47rwr37p403ml7x6sg0sapz9c7534nzzhxq0g"; + revision = "4"; + editedCabalFile = "11fxa2bqpyf99iv2b3yzi9z17y0r70afqij52lmifsyzr24zizv3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -125743,10 +132096,10 @@ self: { }: mkDerivation { pname = "linear-accelerate"; - version = "0.4.1"; - sha256 = "1hhmn446ggm66r3aibg8dyc923lw68fmkb1y8q37jsw13s1lkdlp"; - revision = "1"; - editedCabalFile = "18bll3ay0d1586jhfnzw93glv6f4bvz57va46jc2wm2hdfbnvy6d"; + version = "0.5.0.1"; + sha256 = "0khbh6z348pv2jwyfip50hvls7pqa91bwkzks4988vxh54mp2i1l"; + revision = "2"; + editedCabalFile = "0b7amkafmf82q6a8q49q6n3v33xs16n5h6y005jva5bhpxkmn26w"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear @@ -125757,14 +132110,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "linear-accelerate_0_5_0_1" = callPackage + "linear-accelerate_0_6_0_0" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear }: mkDerivation { pname = "linear-accelerate"; - version = "0.5.0.1"; - sha256 = "0khbh6z348pv2jwyfip50hvls7pqa91bwkzks4988vxh54mp2i1l"; + version = "0.6.0.0"; + sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear @@ -125863,6 +132216,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "linear-socket" = callPackage + ({ mkDerivation, base, bytestring, hlint, hspec, network + , tasty-hspec + }: + mkDerivation { + pname = "linear-socket"; + version = "0.3.3.2"; + sha256 = "1a3ddpay2wyl5bwlnysx037ca0x0bh93ingxl6c2wlxab351zm4h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring network ]; + executableHaskellDepends = [ base hlint ]; + testHaskellDepends = [ base hspec network tasty-hspec ]; + description = "Typed sockets"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-vect" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -125922,6 +132293,7 @@ self: { homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan-hoopl" = callPackage @@ -126163,7 +132535,6 @@ self: { homepage = "http://github.com/bgamari/linux-evdev"; description = "Bindings to Linux evdev input device interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-file-extents" = callPackage @@ -126178,7 +132549,6 @@ self: { homepage = "https://github.com/redneb/linux-file-extents"; description = "Retrieve file fragmentation information under Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-inotify" = callPackage @@ -126190,7 +132560,6 @@ self: { libraryHaskellDepends = [ base bytestring hashable unix ]; description = "Thinner binding to the Linux Kernel's inotify interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-kmod" = callPackage @@ -126217,7 +132586,6 @@ self: { homepage = "https://github.com/tensor5/linux-mount"; description = "Mount and unmount filesystems"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-namespaces" = callPackage @@ -126230,7 +132598,6 @@ self: { homepage = "https://github.com/redneb/hs-linux-namespaces"; description = "Create new or enter an existing linux namespaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-perf" = callPackage @@ -126430,8 +132797,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.7.0.5"; - sha256 = "081z90vcqrmfjc3jna419a8ziif2rcrag4ba4h902lrjh5hpvpaj"; + version = "0.7.0.7"; + sha256 = "1b1pf6cgbgnd0lqn1r4lb8y6hm7qybyc45rr51kxnvqryvb9g9cz"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -126460,31 +132827,31 @@ self: { ({ 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 + , ghc-paths, ghc-prim, gitrev, hashable, hpc, hscolour + , liquid-fixpoint, located-base, mtl, optparse-applicative + , optparse-simple, 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.8.2.0"; - sha256 = "17fm1jn00wns6nkwvxm96j85jwiiaqmw3s7w4ilkslzgr9wslp8f"; + version = "0.8.2.4"; + sha256 = "07cbw14301pa2h4faxrjb1kfp2r5zdwpv5slm491kldzm53y8ry3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ 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 + fingertree ghc ghc-boot ghc-paths ghc-prim gitrev hashable hpc + hscolour liquid-fixpoint located-base mtl optparse-simple parsec + pretty process QuickCheck syb template-haskell temporary text + text-format th-lift time transformers unordered-containers vector ]; executableHaskellDepends = [ - base cmdargs deepseq ghc ghc-boot hint hpc liquid-fixpoint - located-base pretty process time + base cmdargs deepseq ghc ghc-boot hpc liquid-fixpoint located-base + pretty process time ]; testHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot @@ -126496,7 +132863,6 @@ self: { 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 @@ -126555,12 +132921,13 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "list-fusion-probe"; - version = "0.1.0.6"; - sha256 = "1cd6pbaliavasjl76bz86swa5zdymh84grs3cx01hspbc1a190kn"; + version = "0.1.0.7"; + sha256 = "0j1sp6sskjhqwczvx08dvddhrbgzxk2f98vm1b07jdz842yldzr5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "testing list fusion for success"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-grouping" = callPackage @@ -126601,15 +132968,13 @@ self: { libraryHaskellDepends = [ ansi-terminal base data-default stm terminal-size vty ]; - executableHaskellDepends = [ - ansi-terminal base data-default stm terminal-size vty - ]; testHaskellDepends = [ ansi-terminal base data-default hspec stm terminal-size vty ]; homepage = "https://github.com/yamadapc/list-prompt.git"; description = "A simple list prompt UI for the terminal"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-remote-forwards" = callPackage @@ -126636,6 +133001,7 @@ self: { ]; description = "List all remote forwards for mail accounts stored in a SQL database"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t" = callPackage @@ -126644,11 +133010,10 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1.0.0.1"; - sha256 = "00gpz0fn91cj3chf13r1y83y5ifwj4b55j1c0zc2ss9yffrjjjaa"; + version = "1.0.1"; + sha256 = "0wv78c3fg4g98pwdamsaasfnww4mdyffp4fhvb685s12kpg8shy3"; libraryHaskellDepends = [ - base base-prelude mmorph monad-control mtl transformers - transformers-base + base mmorph monad-control mtl transformers transformers-base ]; testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; homepage = "https://github.com/nikita-volkov/list-t"; @@ -126719,15 +133084,15 @@ self: { }) {}; "list-t-libcurl" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, curlhs, either - , list-t, mtl-prelude, resource-pool, stm + ({ mkDerivation, base, base-prelude, bytestring, curlhs, list-t + , mtl-prelude, resource-pool, stm }: mkDerivation { pname = "list-t-libcurl"; - version = "0.3.1"; - sha256 = "0bfyz3k38ns8zak1lyyz4bkl6gd8yylwqpgwddxdpdbk9n4smj7h"; + version = "0.3.3"; + sha256 = "0sm1aflzh5ahnpyp0rbrx6c7pl53agd1170hffn3y9w45zp3dpq2"; libraryHaskellDepends = [ - base base-prelude bytestring curlhs either list-t mtl-prelude + base base-prelude bytestring curlhs list-t mtl-prelude resource-pool stm ]; homepage = "https://github.com/nikita-volkov/list-t-libcurl"; @@ -126760,8 +133125,8 @@ self: { ({ mkDerivation, base, doctest, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.0.3"; - sha256 = "13pasfggjbzldy85d0kaydw95myxna63299k021fmbaifz26q2fx"; + version = "1.0.4"; + sha256 = "0zia1b2phk4skv39q2k481jsagz1syd6rkgfcdra15i2s5dhzvyp"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/Gabriel439/Haskell-List-Transformer-Library"; @@ -126776,8 +133141,8 @@ self: { }: mkDerivation { pname = "list-tries"; - version = "0.6.4"; - sha256 = "0l1qm1n3sh6shzcl4g00w705gx0xy8qwnj68dlm18hsa9y0z572h"; + version = "0.6.5"; + sha256 = "1bdqja3favvxxlqxyh4r07xhkgsxan7lg8vb0nrahkfbifa4m6by"; libraryHaskellDepends = [ base binary containers dlist ]; testHaskellDepends = [ base binary ChasingBottoms HUnit QuickCheck template-haskell @@ -126786,6 +133151,7 @@ self: { homepage = "http://iki.fi/matti.niemenmaa/list-tries/"; description = "Tries and Patricia tries: finite sets and maps for list keys"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-zip-def" = callPackage @@ -126807,8 +133173,8 @@ self: { }: mkDerivation { pname = "listenbrainz-client"; - version = "1.0.1"; - sha256 = "0xrya35nwfkcx0dd5pislm8kw0pxfsh2azjk0yd7yn1668y2zrxd"; + version = "1.1.1"; + sha256 = "0lp72jg1ndahc4jxzg2wk1amb3mbbbgs1w7sirangw864j477q4m"; libraryHaskellDepends = [ aeson base free freer-effects http-client kan-extensions mtl servant servant-client text time transformers @@ -126816,6 +133182,7 @@ self: { homepage = "https://github.com/ocharles/listenbrainz-client"; description = "A client library to the ListenBrainz project"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "listlike-instances" = callPackage @@ -126890,25 +133257,24 @@ self: { "live-sequencer" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, bytestring, cgi , concurrent-split, containers, data-accessor - , data-accessor-transformers, directory, event-list - , explicit-exception, filepath, html, httpd-shed, midi, midi-alsa - , network, network-uri, non-empty, non-negative, parsec, pretty - , process, stm, stm-split, strict, transformers, unix, utility-ht - , wx, wxcore + , data-accessor-transformers, event-list, explicit-exception, html + , httpd-shed, midi, midi-alsa, network, network-uri, non-empty + , non-negative, parsec, pathtype, pretty, process, semigroups, stm + , stm-split, strict, transformers, unix, utility-ht, wx, wxcore }: mkDerivation { pname = "live-sequencer"; - version = "0.0.6"; - sha256 = "0gsbixz0cmy9cajqj4s8iaf8mjk42162sd39bpcdp4xqyxfj5g63"; + version = "0.0.6.2"; + sha256 = "12v1xfsi1cnnfakd5pzvligrpv5pfzl3vkr1gxvrigawipsj4b9f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base event-list non-negative ]; executableHaskellDepends = [ alsa-core alsa-seq base bytestring cgi concurrent-split containers - data-accessor data-accessor-transformers directory - explicit-exception filepath html httpd-shed midi midi-alsa network - network-uri non-empty parsec pretty process stm stm-split strict + data-accessor data-accessor-transformers explicit-exception html + httpd-shed midi midi-alsa network network-uri non-empty parsec + pathtype pretty process semigroups stm stm-split strict transformers unix utility-ht wx wxcore ]; homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer"; @@ -126937,6 +133303,7 @@ self: { executableHaskellDepends = [ base ]; description = "Liveplotting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {andromeda = null;}; @@ -127232,31 +133599,30 @@ self: { ({ 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 + , template-haskell, temporary, transformers, utf8-string }: mkDerivation { pname = "llvm-hs"; - version = "4.2.0"; - sha256 = "12rclc9l85yqh1h0y7m6m65fpb81crzafmkcwq90vl7i5bf1bv1j"; + version = "5.1.3"; + sha256 = "0swpc431w16g9yip5w67kd77ilc6yqqk526h7sl5n4sn7xlc9nnc"; + revision = "1"; + editedCabalFile = "0r8xgz6r2miw1l3az343jwz8f9jgzqywxnzl2xhanv05g3i462yh"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure - mtl template-haskell transformers transformers-compat utf8-string + mtl template-haskell transformers 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 = [ "i686-linux" "x86_64-linux" ]; }) {llvm-config = null;}; - "llvm-hs_5_1_0" = callPackage + "llvm-hs_6_0_0" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , containers, exceptions, llvm-config, llvm-hs-pure, mtl , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -127264,8 +133630,10 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "5.1.0"; - sha256 = "1l6r409zviis70qd3w8ysycy479q0sqjd85kd6z8b0ngjvq1y5ik"; + version = "6.0.0"; + sha256 = "1hll3s40bbrzyylyfnh0w907cpkbxx6qn3a6wv7kfi107zfx2rgd"; + revision = "1"; + editedCabalFile = "1apyscxr48g37qw15wmqb98si8gcnx8cky6bj68ai3jfjfphbjly"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -127282,43 +133650,68 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {llvm-config = null;}; + "llvm-hs-pretty" = callPackage + ({ mkDerivation, array, base, bytestring, directory, filepath + , llvm-hs, llvm-hs-pure, mtl, pretty-show, tasty, tasty-golden + , tasty-hspec, tasty-hunit, text, transformers, wl-pprint-text + }: + mkDerivation { + pname = "llvm-hs-pretty"; + version = "0.2.0.0"; + sha256 = "133kyksbp88q0wavp3wdjg69h9fpwi7nq626nvikdy46cf7lgklh"; + libraryHaskellDepends = [ + array base bytestring llvm-hs-pure text wl-pprint-text + ]; + testHaskellDepends = [ + base directory filepath llvm-hs llvm-hs-pure mtl pretty-show tasty + tasty-golden tasty-hspec tasty-hunit text transformers + ]; + homepage = "https://github.com/llvm-hs/llvm-hs-pretty"; + description = "Pretty printer for LLVM IR"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "llvm-hs-pure" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, mtl - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers, transformers-compat + ({ mkDerivation, attoparsec, base, bytestring, containers, fail + , hspec, mtl, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, transformers, unordered-containers }: mkDerivation { pname = "llvm-hs-pure"; - version = "4.1.0.0"; - sha256 = "1gfj977jxr78m3wixajzc0c50qqp5786dn3dgy1anq43hrjal2l7"; + version = "5.1.2"; + sha256 = "0m6r8l37151y5a7ad5bbb1xw5f18y4hm91ildmz10wnsmhx9kl64"; libraryHaskellDepends = [ - attoparsec base bytestring containers mtl template-haskell - transformers transformers-compat + attoparsec base bytestring containers fail mtl template-haskell + transformers unordered-containers ]; testHaskellDepends = [ - base containers mtl tasty tasty-hunit tasty-quickcheck transformers - transformers-compat + base bytestring containers hspec mtl tasty tasty-hunit + tasty-quickcheck text transformers unordered-containers ]; homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "Pure Haskell LLVM functionality (no FFI)"; license = stdenv.lib.licenses.bsd3; }) {}; - "llvm-hs-pure_5_1_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, mtl - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers + "llvm-hs-pure_6_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, fail + , hspec, mtl, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, transformers, unordered-containers }: mkDerivation { pname = "llvm-hs-pure"; - version = "5.1.0"; - sha256 = "0m4ahrh2d0h9vfky9852y99g1xwsi7s7qr3xxnbgnw8zci7966f5"; + version = "6.0.0"; + sha256 = "005414p1jv5nyf3awiybksc1paf092a9070x23l2y6fvd9jhy0sl"; + revision = "1"; + editedCabalFile = "05idczj2c9iv3kb7fyfhc0ypfsmcjkf9n46w24ivarjbs8fykrb3"; libraryHaskellDepends = [ - attoparsec base bytestring containers mtl template-haskell - transformers + attoparsec base bytestring containers fail mtl template-haskell + transformers unordered-containers ]; testHaskellDepends = [ - base containers mtl tasty tasty-hunit tasty-quickcheck transformers + base bytestring containers hspec mtl tasty tasty-hunit + tasty-quickcheck text transformers unordered-containers ]; homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "Pure Haskell LLVM functionality (no FFI)"; @@ -127359,6 +133752,7 @@ self: { ]; description = "Generate Pkg-Config configuration file for LLVM"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-pretty" = callPackage @@ -127373,10 +133767,9 @@ self: { }) {}; "llvm-pretty-bc-parser" = callPackage - ({ mkDerivation, abstract-par, array, base, bytestring, cereal - , containers, deepseq, directory, fgl, fgl-visualize, filepath - , llvm-pretty, monad-par, monadLib, pretty, process, random - , temporary, time, transformers, xml + ({ mkDerivation, array, base, bytestring, cereal, containers + , directory, fgl, fgl-visualize, filepath, llvm-pretty, monadLib + , pretty, process }: mkDerivation { pname = "llvm-pretty-bc-parser"; @@ -127389,9 +133782,8 @@ self: { pretty ]; executableHaskellDepends = [ - abstract-par array base bytestring cereal containers deepseq - directory fgl fgl-visualize filepath llvm-pretty monad-par monadLib - pretty process random temporary time transformers xml + array base bytestring cereal containers fgl fgl-visualize + llvm-pretty monadLib pretty ]; testHaskellDepends = [ base bytestring directory filepath llvm-pretty process @@ -127402,16 +133794,17 @@ self: { "llvm-tf" = callPackage ({ mkDerivation, base, containers, enumset, fixed-length, llvm-ffi - , non-empty, storable-record, tfp, transformers, utility-ht + , non-empty, semigroups, storable-record, tfp, transformers + , utility-ht }: mkDerivation { pname = "llvm-tf"; - version = "3.1.0.2"; - sha256 = "165zz8mgygc5q8ck4s3jc26bi79pf6m42wr8g1xahr6vkjc1csjn"; + version = "3.1.1"; + sha256 = "0mhlz1jv81rl353qp0vbm39qz15yms9n0xlb0s27jj88yf66zks1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers enumset fixed-length llvm-ffi non-empty + base containers enumset fixed-length llvm-ffi non-empty semigroups storable-record tfp transformers utility-ht ]; description = "Bindings to the LLVM compiler toolkit using type families"; @@ -127458,7 +133851,6 @@ self: { homepage = "http://github.com/dmbarbour/haskell-lmdb"; description = "Lightning MDB bindings"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lmdb;}; "lmdb-high-level" = callPackage @@ -127482,7 +133874,6 @@ self: { homepage = "https://github.com/andrewthad/lmdb-high-level"; description = "Higher level API for working with LMDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lmdb-simple" = callPackage @@ -127491,15 +133882,15 @@ self: { }: mkDerivation { pname = "lmdb-simple"; - version = "0.3.1.0"; - sha256 = "1d43gss6ri05rnjsjfmaxpzb91gfvnjhz41ls7rjmqa1x8ym2lsn"; + version = "0.4.0.0"; + sha256 = "1bq8zdym2x1yyzafyyw2syn9pg4w33y107qyrid67492zmck10zi"; libraryHaskellDepends = [ base bytestring lmdb serialise ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/verement/lmdb-simple#readme"; description = "Simple API for LMDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lmonad" = callPackage @@ -127548,8 +133939,8 @@ self: { ({ mkDerivation, base, containers, hslogger, PSQueue, stm }: mkDerivation { pname = "load-balancing"; - version = "1.0.1.0"; - sha256 = "17xrgq7ww56dx1jy1ksqgx0c0zgzapc7ikdy2cwv65cigd1pqaik"; + version = "1.0.1.1"; + sha256 = "1vszir1b79fdn545k3k86mgqhivyg8s5vv5v24y4cp4cc47aiwmi"; libraryHaskellDepends = [ base containers hslogger PSQueue stm ]; homepage = "https://github.com/SumAll/haskell-load-balancing"; description = "Client-side load balancing utilities"; @@ -127557,17 +133948,36 @@ self: { }) {}; "load-env" = callPackage - ({ mkDerivation, base, directory, hspec, HUnit, parsec }: + ({ mkDerivation, base, directory, hspec, parsec }: mkDerivation { pname = "load-env"; - version = "0.1.1"; - sha256 = "05pxxplp96pcnzk61xcckxnxljl3hjl13ckn4xrr93zmlw49rqwg"; + version = "0.1.2"; + sha256 = "1d5xms4q969w1ry3j3qv4gz82sc9j9qhw7nyc25rbn66gznxlb06"; libraryHaskellDepends = [ base directory parsec ]; - testHaskellDepends = [ base directory hspec HUnit parsec ]; + testHaskellDepends = [ base directory hspec parsec ]; + homepage = "https://github.com/pbrisbin/load-env#readme"; description = "Load environment variables from a file"; license = stdenv.lib.licenses.bsd3; }) {}; + "load-font" = callPackage + ({ mkDerivation, base, c2hs, Cabal }: + mkDerivation { + pname = "load-font"; + version = "0.1.0.2"; + sha256 = "06vzgyi8r1fhlc1ykdfynll7y4a0wwvjq9x0xg08csr4ypfgj6m3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/deech/load-font#readme"; + description = "A cross platform library for loading bundled fonts into your application"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "loadavg" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -127580,25 +133990,24 @@ self: { }) {}; "loc" = callPackage - ({ mkDerivation, base, containers, doctest, hedgehog, loc-test }: + ({ mkDerivation, base, containers, doctest, hedgehog }: mkDerivation { pname = "loc"; - version = "0.1.3.1"; - sha256 = "0irwsh3ib9rb1h6chs060vzr7bhczqb3qxrizxvsqiymgd1yjjgx"; + version = "0.1.3.2"; + sha256 = "1p8df8jyddma3mk54azgiqf6adlq0l4g00cjffdvx8bk30xnrank"; libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers doctest hedgehog loc-test ]; + testHaskellDepends = [ base containers doctest hedgehog ]; homepage = "https://github.com/chris-martin/loc"; description = "Types representing line and column positions and ranges in text files"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "loc-test" = callPackage ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { pname = "loc-test"; - version = "0.1.3.1"; - sha256 = "0z2d1fi77msbgzipz87q32z5fmfb6aj923j2wh1565qbjaf7qjxx"; + version = "0.1.3.2"; + sha256 = "06yccmyxk7cvkxjra28ardxc61h6h59w0rw08d27llppfjh5bn01"; libraryHaskellDepends = [ base containers hedgehog loc ]; homepage = "https://github.com/chris-martin/loc"; description = "Test-related utilities related to the /loc/ package"; @@ -127635,6 +134044,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "localization" = callPackage + ({ mkDerivation, base, containers, text, transformers }: + mkDerivation { + pname = "localization"; + version = "1.0.1.20180226"; + sha256 = "1172rmrk5xgqsy9igg9bspbybvhmbpakvjijn6gnp715a01gfadd"; + libraryHaskellDepends = [ base containers text transformers ]; + description = "Library for localization (l10n)"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "localize" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , directory, filepath, Glob, haskell-gettext, mtl, setlocale, text @@ -127689,6 +134109,7 @@ self: { homepage = "https://github.com/MailOnline/located-monad-logger#readme"; description = "Location-aware logging without Template Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "locators" = callPackage @@ -127697,8 +134118,8 @@ self: { }: mkDerivation { pname = "locators"; - version = "0.2.4.2"; - sha256 = "172fbxb51p09afsgp9g28zpbisxnf0wxdr3bwi6hwp40ac3363g4"; + version = "0.2.4.3"; + sha256 = "0wcp56hy8zs7sngspzywyq4j39y0pji0xwqj7x1i26rg77wi7xw4"; libraryHaskellDepends = [ base bytestring cereal containers cryptohash ]; @@ -127729,8 +134150,8 @@ self: { ({ mkDerivation, base, pretty, template-haskell }: mkDerivation { pname = "loch-th"; - version = "0.2.1"; - sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p"; + version = "0.2.2"; + sha256 = "1hvdkcyrlnv65q8x8h0441x30wr9bbfbg3961xd3fy9an5r961fc"; libraryHaskellDepends = [ base pretty template-haskell ]; homepage = "https://github.com/liskin/loch-th"; description = "Support for precise error locations in source files (Template Haskell version)"; @@ -127739,27 +134160,24 @@ self: { "lock-file" = callPackage ({ mkDerivation, base, data-default-class, directory, exceptions - , filepath, HUnit, tagged-exception-core, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers + , filepath, HUnit, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "lock-file"; - version = "0.5.0.2"; - sha256 = "1l4slkykw59p20kw9iqaa4pjczqx701a9z14nvbzwrmgs2acnki7"; - revision = "4"; - editedCabalFile = "0fs4mrhzj90pnc64nvm6k5v095998rxqcq3875aypkgjn2fwfsrc"; + version = "0.7.0.0"; + sha256 = "1vpaw3hh1as00p9vbj90cyd8nhjimgyp9hn8axgiwc1l47ddp6vc"; libraryHaskellDepends = [ - base data-default-class directory exceptions tagged-exception-core - transformers + base data-default-class directory exceptions ]; testHaskellDepends = [ base data-default-class directory exceptions filepath HUnit - tagged-exception-core test-framework test-framework-hunit - test-framework-quickcheck2 transformers + test-framework test-framework-hunit test-framework-quickcheck2 ]; - homepage = "https://github.com/trskop/lock-file"; + homepage = "https://github.com/trskop/lock-file#readme"; description = "Provide exclusive access to a resource using lock file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "locked-poll" = callPackage @@ -127805,6 +134223,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lockpool" = callPackage + ({ mkDerivation, base, clock, stm }: + mkDerivation { + pname = "lockpool"; + version = "0.1.0.0"; + sha256 = "004lipzc3rbvixhmx4ssngmpsp3pcrdd1hw9byqmi0jp4xm17xxi"; + libraryHaskellDepends = [ base clock stm ]; + homepage = "https://github.com/chessai/lockpool.git"; + description = "set a maximum on the number of concurrent actions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log" = callPackage ({ mkDerivation, aeson, base, bloodhound, bytestring, ekg , exceptions, hpqtypes, http-client, http-types, log-base @@ -127853,31 +134284,6 @@ self: { }) {}; "log-domain" = callPackage - ({ 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.2"; - sha256 = "0cywq1zv57p30419hdg6s7srd14g6r2kixnk8gmj72h0rx7fc2cd"; - revision = "1"; - editedCabalFile = "0frl4vwwlkfvz73pkiay4qh1vm576z4kj2gsbbq1za6b6pya4qhw"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base binary bytes cereal comonad deepseq distributive hashable - safecopy semigroupoids semigroups vector - ]; - testHaskellDepends = [ - base doctest generic-deriving semigroups simple-reflect - ]; - homepage = "http://github.com/ekmett/log-domain/"; - description = "Log-domain arithmetic"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "log-domain_0_12" = callPackage ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal , comonad, deepseq, distributive, doctest, generic-deriving , hashable, semigroupoids, semigroups, simple-reflect, vector @@ -127886,6 +134292,8 @@ self: { pname = "log-domain"; version = "0.12"; sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi"; + revision = "2"; + editedCabalFile = "1yjphyqyn8122ikxxv0a10fh2cbavy7xyb435jxq6gln8sw3m54d"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable @@ -127897,7 +134305,6 @@ self: { homepage = "http://github.com/ekmett/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-effect" = callPackage @@ -127939,6 +134346,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-elasticsearch_0_10_0_0" = 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.10.0.0"; + sha256 = "0bjsng7ganwbqxvj9zi7w7l547iw9yh972bc0mc82cnwd6awclj5"; + 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 @@ -127988,30 +134416,34 @@ self: { "log-warper" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, containers - , data-default, deepseq, directory, dlist, errors, exceptions - , extra, filepath, fmt, formatting, hashable, hspec, HUnit, lens - , mmorph, monad-control, monad-loops, mtl, network, QuickCheck - , text, text-format, time, transformers, transformers-base - , universum, unix, unordered-containers, yaml + , data-default, deepseq, directory, filepath, fmt, hspec + , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens + , microlens-mtl, microlens-platform, mmorph, monad-control + , monad-loops, mtl, o-clock, QuickCheck, text, time, transformers + , transformers-base, universum, unix, unordered-containers, vector + , yaml }: mkDerivation { pname = "log-warper"; - version = "1.6.0"; - sha256 = "0g40cxcyk9x1hfvy8lp8k5mn898022k866drpzv68i171wsjb81a"; + version = "1.8.11"; + sha256 = "0xhvipk5dlv7r2pmgn5mf46rrz092xhm6ar611y5lrr99i2kg172"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base containers deepseq directory dlist errors - exceptions extra filepath fmt formatting hashable lens mmorph - monad-control monad-loops mtl network text text-format time - transformers transformers-base universum unix unordered-containers - yaml + aeson ansi-terminal base containers deepseq directory filepath fmt + lifted-async microlens-platform mmorph monad-control monad-loops + mtl o-clock text time transformers transformers-base universum unix + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + base markdown-unlit microlens monad-control mtl o-clock text + universum yaml ]; - executableHaskellDepends = [ base exceptions text universum yaml ]; testHaskellDepends = [ - async base data-default directory filepath hspec HUnit lens - QuickCheck universum unordered-containers + async base data-default directory filepath hspec HUnit + microlens-mtl QuickCheck universum unordered-containers ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/serokell/log-warper"; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; @@ -128111,8 +134543,8 @@ self: { }: mkDerivation { pname = "logging"; - version = "3.0.4"; - sha256 = "0qkv19bmkh7gak6rzzcy0mgdz835gpc59iq1l10wjj7gb8vv0kd0"; + version = "3.0.5"; + sha256 = "0cd00pjxjdq69n6hxa01x31s2vdfd39kkvj0d0ssqj3n6ahssbxi"; libraryHaskellDepends = [ base binary bytestring fast-logger lifted-base monad-control old-locale regex-compat text time time-locale-compat transformers @@ -128130,8 +134562,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.2.1"; - sha256 = "1jjw2ach3mni7pnfcw29z2fw5vffhq8i8qh8sn4n4jcya2mfp7xd"; + version = "1.2.5"; + sha256 = "1db8x2rihkddww54cyzww0c65vk90nlnp82xrw226wliknbikri3"; libraryHaskellDepends = [ async base exceptions free monad-control mtl semigroups stm stm-delay text time transformers transformers-base wl-pprint-text @@ -128151,8 +134583,8 @@ self: { }: mkDerivation { pname = "logging-effect-extra"; - version = "1.2.0"; - sha256 = "0d4n4swwgwz4hw750a9firyi516mhb83nr3gqpnrbfyf4mqnr1bc"; + version = "1.2.2"; + sha256 = "0jra1fxz3880ds8pip1mlibiss8ihd1a9dpi3mv1py7lnc6ikjzw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128171,8 +134603,8 @@ self: { }: mkDerivation { pname = "logging-effect-extra-file"; - version = "1.1.1"; - sha256 = "198mil2v6z13gv7m37lqhqpdfsgk3l231rm9anq9pj7z2x4xqcpw"; + version = "1.1.2"; + sha256 = "1dxi4rq734zmjf2ljlh771ivr45i2cwz94vym3gw38ji4s0k8cym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128190,8 +134622,8 @@ self: { }: mkDerivation { pname = "logging-effect-extra-handler"; - version = "1.1.0"; - sha256 = "01kkkcn49m684rbf7vgyl5swbfv6yv7h1nkwcii2caghkc0yxapi"; + version = "1.1.4"; + sha256 = "0932i0qrwrr2j7w40bf3q5dlazz4800drc0chvr1kpbpk6b4njim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128317,8 +134749,8 @@ self: { ({ mkDerivation, base, logict, mtl, transformers }: mkDerivation { pname = "logict-state"; - version = "0.1.0.2"; - sha256 = "1b2iqz1andmgibb30s1x32ak0vac7zy4gw7jihm2hhlpyycah5bp"; + version = "0.1.0.4"; + sha256 = "0mkwggh97c3x96v7a4y7i4scdvr38d49an3617i9zgj328xkr6w9"; libraryHaskellDepends = [ base logict mtl transformers ]; homepage = "https://github.com/atzedijkstra/logict-state"; description = "Library for logic programming based on haskell package logict"; @@ -128627,6 +135059,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "long-double" = callPackage + ({ mkDerivation, base, integer-gmp }: + mkDerivation { + pname = "long-double"; + version = "0.1"; + sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j"; + libraryHaskellDepends = [ base integer-gmp ]; + homepage = "https://code.mathr.co.uk/long-double"; + description = "FFI bindings for C long double"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "longboi" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "longboi"; + version = "1.0.0"; + sha256 = "0jm231i9mnbkn8ffdv6w2mhd95i8lwlbxi5h9nywvqbclgf95977"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/chessai/longboi"; + description = "Dependently-typed linked list implementation"; + license = stdenv.lib.licenses.mit; + }) {}; + "lookup-tables" = callPackage ({ mkDerivation, base, primitive, tasty, tasty-hunit , template-haskell @@ -128700,6 +135156,7 @@ self: { benchmarkHaskellDepends = [ base criterion transformers vector ]; description = "Fast imperative-style loops"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "loopy" = callPackage @@ -128901,9 +135358,6 @@ self: { base containers FontyFruity gasp JuicyPixels lens linear lp-diagrams lucid-svg mtl optparse-applicative svg-tree text vector ]; - executableHaskellDepends = [ - base containers FontyFruity gasp lens lp-diagrams - ]; description = "SVG Backend for lp-diagrams"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -128927,8 +135381,10 @@ self: { }: mkDerivation { pname = "lrucaching"; - version = "0.3.2"; - sha256 = "1vg6ip77vlqixj2ghvwm036yb4qhkif175k8gfd27nmr4w5rv2ns"; + version = "0.3.3"; + sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; + revision = "2"; + editedCabalFile = "0ypilhv8im5vqwdy6wk9ql2dlpr4cykag6ikvyjapl8bpyfm44xa"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -128998,6 +135454,7 @@ self: { homepage = "https://github.com/dbp/lss"; description = "Lexical Style Sheets - a language for writing styles that is focused around lexical (ie, static) scoping and re-use of large components"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {language-css-attoparsec = null;}; @@ -129045,6 +135502,7 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltiv1p1" = callPackage @@ -129118,6 +135576,7 @@ self: { homepage = "https://github.com/GaloisInc/lua-bc"; description = "Lua bytecode parser"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lua-bytecode" = callPackage @@ -129172,6 +135631,7 @@ self: { ]; description = "Helpers for Haskell integration with Lua"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lub" = callPackage @@ -129193,8 +135653,10 @@ self: { }: mkDerivation { pname = "lucid"; - version = "2.9.9"; - sha256 = "0cqdlm1kamfn8kv3r3vphz16j2xi9yf15kpb6440rhsyvwddbani"; + version = "2.9.10"; + sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0"; + revision = "1"; + editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -129210,6 +135672,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lucid-colonnade" = callPackage + ({ mkDerivation, base, colonnade, lucid, text }: + mkDerivation { + pname = "lucid-colonnade"; + version = "1.0"; + sha256 = "13jb1vh2pxz1w2ycswdmyhr05c00i0x30agcwf93i359rwzcmbmc"; + revision = "1"; + editedCabalFile = "08zcksc8pd7sh4z78i80rinlmr3mghhclhcqn8kdkgv4p7ynldlv"; + libraryHaskellDepends = [ base colonnade lucid text ]; + homepage = "https://github.com/andrewthad/colonnade#readme"; + description = "Helper functions for using lucid with colonnade"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lucid-extras" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory, lucid , text @@ -129255,6 +135731,7 @@ self: { homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; description = "DSL for SVG using lucid for HTML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucienne" = callPackage @@ -129493,8 +135970,8 @@ self: { }: mkDerivation { pname = "lxd-client"; - version = "0.1.0.3"; - sha256 = "0kywqhd4nd7j2nm7fwx9f3h94m6r5dv85xs1ix796iq0vdxxpmys"; + version = "0.1.0.6"; + sha256 = "06w0m9h2xzkd6ynbb6kjvsaq8xj4zzfd64d31s83xb8al5pvnl4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129533,7 +136010,6 @@ self: { homepage = "https://github.com/hverr/haskell-lxd-client-config#readme"; description = "Read the configuration file of the standard LXD client"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lye" = callPackage @@ -129578,8 +136054,8 @@ self: { }: mkDerivation { pname = "lz4-conduit"; - version = "0.2"; - sha256 = "18zl3cxa8f6n64p1iz9l834vkk93bjdb37h69jj5wdd4q6hc51km"; + version = "0.3"; + sha256 = "18yjrf9iw4bwq25x7fd95lf99qcqj9nm3hdq6lkgxc5plgy94nyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129605,8 +136081,8 @@ self: { pname = "lzma"; version = "0.0.0.3"; sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg"; - revision = "1"; - editedCabalFile = "0y89blvpswvji1ya7h67gcx322iqi93di3jmwx47l6mic3ki4r2d"; + revision = "2"; + editedCabalFile = "0c6jkr22w797jvmad9vki2mm7cdzxpqqxkpv836fh5m248nnc618"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ lzma ]; testHaskellDepends = [ @@ -129631,18 +136107,17 @@ self: { }) {}; "lzma-conduit" = callPackage - ({ mkDerivation, base, base-compat, bindings-DSL, bytestring - , conduit, HUnit, lzma, QuickCheck, resourcet, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers + ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit + , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers }: mkDerivation { pname = "lzma-conduit"; - version = "1.1.3.3"; - sha256 = "19bdjgr394cji254y2qp1ibdiyqlys2vf0g1v9psi4cqcdlhdk0p"; + version = "1.2.1"; + sha256 = "0hm72da7xk9l3zxjh274yg444vf405djxqbkf3q3p2qhicmxlmg9"; libraryHaskellDepends = [ - base bindings-DSL bytestring conduit resourcet transformers + base bytestring conduit lzma resourcet transformers ]; - librarySystemDepends = [ lzma ]; testHaskellDepends = [ base base-compat bytestring conduit HUnit QuickCheck resourcet test-framework test-framework-hunit test-framework-quickcheck2 @@ -129650,7 +136125,8 @@ self: { homepage = "http://github.com/alphaHeavy/lzma-conduit"; description = "Conduit interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) lzma;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "lzma-enumerator" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit @@ -129784,22 +136260,23 @@ self: { }) {}; "machinecell" = callPackage - ({ mkDerivation, base, free, hspec, mtl, profunctors, QuickCheck - , semigroups, transformers + ({ mkDerivation, base, doctest, free, hspec, mtl, profunctors + , QuickCheck, semigroups, transformers }: mkDerivation { pname = "machinecell"; - version = "3.3.2"; - sha256 = "0gjzn4i9iwclgpki599g52dvsipzc3iplpr8pz4d2s85nm54c9b6"; + version = "4.0.1"; + sha256 = "1j2gzs7icvffga3b71dmik5ryb2mivmx5dvzii453nivgcxwyw22"; libraryHaskellDepends = [ base free mtl profunctors semigroups transformers ]; testHaskellDepends = [ - base hspec mtl profunctors QuickCheck semigroups + base doctest hspec mtl profunctors QuickCheck semigroups ]; homepage = "http://github.com/as-capabl/machinecell"; description = "Arrow based stream transducers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines" = callPackage @@ -129812,8 +136289,8 @@ self: { pname = "machines"; version = "0.6.3"; sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; - revision = "1"; - editedCabalFile = "045qh0qwjiyrwcfsfw9galhqr6w7c96zpg7fnib3jaw8509d53x5"; + revision = "6"; + editedCabalFile = "0ga5x9lpik7gz2fx4j3jnn6dw8xkd9cxg19ngj8iwrx4b946m1w7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -129919,6 +136396,7 @@ self: { homepage = "http://github.com/aloiscochard/machines-process"; description = "Process (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines-zlib" = callPackage @@ -130020,28 +136498,29 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, Cabal, composition-prelude - , containers, criterion, directory, file-embed, hspec - , hspec-megaparsec, http-client, http-client-tls, megaparsec - , MonadRandom, mtl, optparse-applicative, process, random-shuffle - , recursion-schemes, recursion-schemes-ext, tar, template-haskell - , text, th-lift-instances, titlecase, zip-archive, zlib + ({ mkDerivation, ansi-wl-pprint, base, binary, Cabal, cli-setup + , composition-prelude, containers, criterion, directory, file-embed + , hspec, hspec-megaparsec, http-client, http-client-tls, megaparsec + , MonadRandom, mtl, optparse-applicative, random-shuffle + , recursion-schemes, tar, template-haskell, text, th-lift-instances + , titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "3.1.1.18"; - sha256 = "00np5hkbab7hi46056hp6maa7fc63vbx227pj0y3d5q502hgf3jj"; + version = "4.0.2.7"; + sha256 = "08zi6v7p5wy8764505n7wk69iliab1hy40agz9qvgsq9iqi20h3f"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal directory process ]; + setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - ansi-wl-pprint base composition-prelude containers directory + ansi-wl-pprint base binary composition-prelude containers directory file-embed http-client http-client-tls megaparsec MonadRandom mtl - optparse-applicative random-shuffle recursion-schemes - recursion-schemes-ext tar template-haskell text th-lift-instances - titlecase zip-archive zlib + random-shuffle recursion-schemes tar template-haskell text + th-lift-instances titlecase zip-archive zlib + ]; + executableHaskellDepends = [ + base directory megaparsec optparse-applicative text ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-megaparsec text ]; benchmarkHaskellDepends = [ base criterion megaparsec text ]; homepage = "https://hub.darcs.net/vmchale/madlang"; @@ -130079,34 +136558,67 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) file;}; + "magic-wormhole" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + , hashable, hedgehog, memory, network, network-uri + , optparse-applicative, pqueue, process, protolude, saltine, spake2 + , stm, tasty, tasty-hedgehog, tasty-hspec, text + , unordered-containers, websockets + }: + mkDerivation { + pname = "magic-wormhole"; + version = "0.1.0"; + sha256 = "0lkwnbr76chiakc7j51pm23q15q26l3xqglg1rj5blwybkymg29x"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers cryptonite hashable memory network + network-uri pqueue protolude saltine spake2 stm + unordered-containers websockets + ]; + executableHaskellDepends = [ + aeson base optparse-applicative protolude spake2 text + ]; + testHaskellDepends = [ + aeson base bytestring hedgehog memory process protolude saltine + spake2 stm tasty tasty-hedgehog tasty-hspec + ]; + homepage = "https://github.com/LeastAuthority/haskell-magic-wormhole#readme"; + description = "Interact with Magic Wormhole"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "magicbane" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude - , conduit, conduit-combinators, data-default, data-has, either + ({ mkDerivation, aeson, aeson-qq, async, attoparsec, base + , bytestring, conduit, conduit-combinators, data-default, data-has , 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 + , http-client, http-client-tls, http-conduit, http-link-header + , http-types, lifted-async, lifted-base, monad-control + , monad-logger, monad-metrics, mono-traversable, mtl, network-uri + , raw-strings-qq, refined, safe-exceptions, servant-server, split + , string-conversions, text, transformers, transformers-base , unordered-containers, wai, wai-cli, wai-middleware-metrics }: mkDerivation { pname = "magicbane"; - version = "0.1.3"; - sha256 = "164zljyc0wvisj8xb6q5j0xlhjhxw7068jl9s9y4rkd3x637j3as"; - 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 + version = "0.2.0"; + sha256 = "0v67mycp7mgawcwnkw68pivyicp9p2nj0f9isrdb14x5smm1f1zd"; + libraryHaskellDepends = [ + aeson aeson-qq async attoparsec base bytestring conduit + conduit-combinators data-default data-has ekg-core ekg-wai envy + errors fast-logger http-api-data http-client http-client-tls + http-conduit http-link-header http-types lifted-async lifted-base + monad-control monad-logger monad-metrics mono-traversable mtl + network-uri raw-strings-qq refined safe-exceptions servant-server + split string-conversions text transformers transformers-base unordered-containers wai wai-cli wai-middleware-metrics ]; homepage = "https://github.com/myfreeweb/magicbane#readme"; - description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…"; + description = "A web framework that integrates Servant, EKG, fast-logger, wai-cli…"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "magico" = callPackage @@ -130206,6 +136718,7 @@ self: { ]; description = "Count mailboxes in a SQL database"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mailchimp" = callPackage @@ -130271,6 +136784,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "main-tester" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, hspec + , hspec-core, QuickCheck, text + }: + mkDerivation { + pname = "main-tester"; + version = "0.1.0.0"; + sha256 = "0sagm9fkdgjv8x602bjj32glcrivjf3yz47gpbbm48k0mk0dj2dc"; + libraryHaskellDepends = [ base bytestring directory ]; + testHaskellDepends = [ + base bytestring doctest hspec hspec-core QuickCheck text + ]; + homepage = "https://gitlab.com/igrep/main-tester#readme"; + description = "Capture stdout/stderr/exit code, and replace stdin of your main function"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mainland-pretty" = callPackage ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { @@ -130285,6 +136816,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mainland-pretty_0_7" = callPackage + ({ mkDerivation, base, containers, srcloc, text, transformers }: + mkDerivation { + pname = "mainland-pretty"; + version = "0.7"; + sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "majordomo" = callPackage ({ mkDerivation, base, bytestring, cmdargs, monad-loops, old-locale , threads, time, unix, zeromq-haskell @@ -130346,6 +136892,7 @@ self: { libraryHaskellDepends = [ base mono-traversable ]; description = "Make a MonoFoldable type into an ordinary Foldable type"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "make-package" = callPackage @@ -130384,22 +136931,6 @@ self: { }) {}; "makefile" = 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; - }) {}; - - "makefile_1_1_0_0" = callPackage ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, tasty , tasty-hunit, tasty-quickcheck, text }: @@ -130451,8 +136982,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; - version = "1.0.5"; - sha256 = "1q3j8w6z8jaxh5a0ifzj51vipyhfrb1hk6l87pm319ysv91rkjdr"; + version = "1.0.6"; + sha256 = "1kbrw99yh5x5blykmx2n88mplbbi4ss1ij5j17b7asw6q0ihm9zi"; libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; @@ -130848,8 +137379,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.3.2"; - sha256 = "1jzlfi7b4djkwm0vx9ii55db0jf4v8av3idkgg8x3ix95pvps397"; + version = "0.5.3.3"; + sha256 = "0hhyif8lqq16i25bvpz7z54n2rmnq9q198pjdm4vssh02597lnn8"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types lens mtl @@ -130929,8 +137460,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.4.4.0"; - sha256 = "1qihbyhmf9abyb7fh4gf6qxwbk2a1jwnxdpnjinfi3x87xasvajj"; + version = "0.4.5.0"; + sha256 = "0z21jcrzky80fq172b2s0hwna4g1kzfzval40cdl6glf0l2zfimv"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -130945,23 +137476,24 @@ self: { ({ mkDerivation, base, call-stack, comonad, constrained-categories , containers, deepseq, free, free-vector-spaces, lens, linear , linearmap-category, manifolds-core, MemoTrie, number-show - , placeholders, pragmatic-show, semigroups, tagged, tasty - , tasty-hunit, tasty-quickcheck, transformers, vector, vector-space - , void + , placeholders, pragmatic-show, QuickCheck, semigroups, tagged + , tasty, tasty-hunit, tasty-quickcheck, transformers, vector + , vector-space, void }: mkDerivation { pname = "manifolds"; - version = "0.4.4.0"; - sha256 = "1wsqar82w0sqspihyvkd9jndw2q6818nci82clqgxb1dawyna5vx"; + version = "0.4.5.0"; + sha256 = "0paq7x9nhna74q4y7gvwlvwfpzxil9dx9ysg3r6k5as4i9687442"; libraryHaskellDepends = [ base call-stack comonad constrained-categories containers deepseq free free-vector-spaces lens linear linearmap-category manifolds-core MemoTrie number-show placeholders pragmatic-show - semigroups tagged transformers vector vector-space void + QuickCheck semigroups tagged transformers vector vector-space void ]; testHaskellDepends = [ - base constrained-categories containers lens linearmap-category - pragmatic-show tasty tasty-hunit tasty-quickcheck vector-space + base constrained-categories containers lens linear + linearmap-category pragmatic-show tasty tasty-hunit + tasty-quickcheck vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; @@ -130973,26 +137505,42 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.4.4.0"; - sha256 = "00b24ry943f6m46wkbxh8452q9xswcn2ri9c511r9bsinhzg653q"; + version = "0.4.5.0"; + sha256 = "1g2lb8f2l9gwpflifm8idvf2w6if497gc6pgpr7j6s9c7byh8p3p"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "map-classes" = callPackage + ({ mkDerivation, array, base, bytestring, containers + , kan-extensions, transformers, utility-ht + }: + mkDerivation { + pname = "map-classes"; + version = "0.1.0.0"; + sha256 = "1bimmnr6k1a87l24a7gzylx02gal64jcvg0zv6ci82nxbb7i1v0c"; + libraryHaskellDepends = [ + array base bytestring containers kan-extensions transformers + utility-ht + ]; + homepage = "https://github.com/clintonmead/map-classes"; + description = "A set of classes and instances for working with key/value mappings"; + license = stdenv.lib.licenses.bsd3; }) {}; "map-exts" = callPackage ({ mkDerivation, base, bytestring, cassava, containers }: mkDerivation { pname = "map-exts"; - version = "0.1.0.1"; - sha256 = "0zkcwxdvl4m4lw9yjjxk7mx22hr0kp9hn3vzry2s8n489i0r4sw3"; + version = "0.2.0.0"; + sha256 = "038k2d5vir65n2xi4gv5jvd3ya877iazjkinyg20wn4aj317b8bq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base bytestring cassava containers ]; - homepage = "http://github.com/elsen-trading/map-extensions#readme"; + homepage = "http://github.com/charles-cooper/map-exts#readme"; description = "Extensions to Data.Map"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -131005,14 +137553,31 @@ self: { pname = "map-syntax"; version = "0.2.0.2"; sha256 = "12jdv9myffpkhhrwm5kzhbqzbxfb0rb4fvww33d0yq4s6sk9b3xi"; - revision = "1"; - editedCabalFile = "0k27w9bw4lri2nfm7s7v7gq49mr0him5g2dsc0wha5kzj4gmy87q"; + revision = "2"; + editedCabalFile = "12b3pbrd70xpx634ngl4dcvda5p9494wq6mc8s1wv4624hwlgja6"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ + base containers deepseq hspec HUnit mtl QuickCheck transformers + ]; + description = "Syntax sugar for defining maps"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "map-syntax_0_3" = callPackage + ({ mkDerivation, base, containers, deepseq, hspec, HUnit, mtl + , QuickCheck, transformers + }: + mkDerivation { + pname = "map-syntax"; + version = "0.3"; + sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers ]; description = "Syntax sugar for defining maps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mappy" = callPackage @@ -131039,6 +137604,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mapquest-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, goggles, mtl + , req, text + }: + mkDerivation { + pname = "mapquest-api"; + version = "0.3.1"; + sha256 = "11bvba2yyif31srkpwc8hzgfks4528l4v2m9jgvyh5hqp4hr4cs3"; + libraryHaskellDepends = [ + aeson base bytestring exceptions goggles mtl req text + ]; + homepage = "https://github.com/ocramz/mapquest-api"; + description = "Bindings to the MapQuest API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "marihana" = callPackage + ({ mkDerivation, base, directory }: + mkDerivation { + pname = "marihana"; + version = "0.1.1.0"; + sha256 = "1wcrmjxw39pcarvwn4cfzd4wimvsf57qg8vl5lykcd9s4p2dnyvw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory ]; + executableHaskellDepends = [ base directory ]; + testHaskellDepends = [ base directory ]; + homepage = "https://github.com/suzukeno/marihana#readme"; + license = stdenv.lib.licenses.mit; + }) {}; + "marionetta" = callPackage ({ mkDerivation, base, containers, gloss, mtl, splines, vector , vector-space @@ -131060,22 +137657,22 @@ self: { "markdown" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , conduit, conduit-extra, containers, data-default, directory - , filepath, hspec, text, transformers, xml-conduit, xml-types - , xss-sanitize + , call-stack, conduit, conduit-extra, containers, data-default + , directory, filepath, hspec, text, transformers, xml-conduit + , xml-types, xss-sanitize }: mkDerivation { pname = "markdown"; - version = "0.1.16"; - sha256 = "11gdawvwji7301lm07z5q94g5jlf9iq63wf6k7f6sc88w99b7c08"; + version = "0.1.17.1"; + sha256 = "0n1vcw0vmhpgsmyxxafc82r2kp27g081zwx9md96zj5x5642vxz1"; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup conduit conduit-extra containers data-default text transformers xml-conduit xml-types xss-sanitize ]; testHaskellDepends = [ - base blaze-html conduit conduit-extra containers directory filepath - hspec text transformers + base blaze-html call-stack conduit conduit-extra containers + directory filepath hspec text transformers ]; homepage = "https://github.com/snoyberg/markdown"; description = "Convert Markdown to HTML, with XSS protection"; @@ -131123,8 +137720,8 @@ self: { }: mkDerivation { pname = "markdown-unlit"; - version = "0.4.0"; - sha256 = "1kj2bffl7ndd8ygwwa3r1mbpwbxbfhyfgnbla8k8g9i6ffp0qrbw"; + version = "0.5.0"; + sha256 = "1gy79vr85vcp13rdjh0hz7zv6daqqffww4j0cqn2lpjjh9xhsbg7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat ]; @@ -131211,41 +137808,40 @@ self: { }) {}; "markup" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad - , lucid, mmorph, monad-control, monad-logger, mtl, path-extra - , resourcet, text, transformers-base, urlpath + ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup + , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl + , path-extra, resourcet, text, transformers-base, urlpath }: mkDerivation { pname = "markup"; - version = "3.1.0"; - sha256 = "0g8dg03r7i4r71bg834kf1cgh0igmb74334skkydlq9q911hclf7"; - revision = "1"; - editedCabalFile = "1ax30n6qyy7kjcz2qyd6idaif1hxxz4n37p6lpfn5bnvg585ddmg"; + version = "4.0.4"; + sha256 = "1brk619d2abryvwyw9pj7g4axs1rc6p51cf4yf5q1p6f0zvi2dyb"; libraryHaskellDepends = [ - base blaze-html blaze-markup clay comonad lucid mmorph - monad-control monad-logger mtl path-extra resourcet text + attoparsec-uri base blaze-html blaze-markup clay comonad lucid + mmorph monad-control monad-logger mtl path-extra resourcet text transformers-base urlpath ]; description = "Abstraction for HTML-embedded content"; license = stdenv.lib.licenses.mit; }) {}; - "markup_4_0_3" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad - , lucid, mmorph, monad-control, monad-logger, mtl, path-extra - , resourcet, text, transformers-base, urlpath + "markup_4_2_0" = callPackage + ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup + , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl + , path, path-extra, resourcet, text, transformers-base, urlpath }: mkDerivation { pname = "markup"; - version = "4.0.3"; - sha256 = "1a4n89j8z3sgyigbxkc10lb3kz6x5bf0kdcs1k0hydcj0vdvwqh3"; + version = "4.2.0"; + sha256 = "065pq5m12hk9k6c8lzrgr5mzgz2rzpafhlaql6bvv422j3pbkfgs"; libraryHaskellDepends = [ - base blaze-html blaze-markup clay comonad lucid mmorph - monad-control monad-logger mtl path-extra resourcet text - transformers-base urlpath + attoparsec-uri base blaze-html blaze-markup clay comonad lucid + mmorph monad-control monad-logger mtl path path-extra resourcet + text transformers-base urlpath ]; + homepage = "https://github.com/athanclark/markup#readme"; description = "Abstraction for HTML-embedded content"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -131271,10 +137867,10 @@ self: { }) {}; "marmalade-upload" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, data-default - , directory, exceptions, filepath, http-client, http-client-tls - , http-types, keyring, mtl, network, optparse-applicative, process - , shake, split, tasty, tasty-hunit, text, transformers, zip-archive + ({ mkDerivation, aeson, base, bytestring, data-default, directory + , exceptions, filepath, http-client, http-client-tls, http-types + , keyring, mtl, network, optparse-applicative, tasty, tasty-hunit + , text, transformers }: mkDerivation { pname = "marmalade-upload"; @@ -131287,9 +137883,8 @@ self: { http-types mtl network text transformers ]; executableHaskellDepends = [ - aeson base bytestring Cabal data-default directory filepath keyring - optparse-applicative process shake split text transformers - zip-archive + aeson base bytestring data-default directory filepath keyring + optparse-applicative text transformers ]; testHaskellDepends = [ aeson base exceptions tasty tasty-hunit text transformers @@ -131385,6 +137980,7 @@ self: { homepage = "https://marvin.readthedocs.io"; description = "A framework for modular, portable chat bots"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "marvin-interpolate" = callPackage @@ -131406,8 +138002,8 @@ self: { "marxup" = callPackage ({ mkDerivation, base, configurator, containers, directory, dlist - , filepath, graphviz, haskell-src-exts, labeled-tree, lens - , lp-diagrams, mtl, parsek, pretty, process, text + , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl + , parsek, pretty, process, text }: mkDerivation { pname = "marxup"; @@ -131421,7 +138017,7 @@ self: { lens lp-diagrams mtl process text ]; executableHaskellDepends = [ - base configurator dlist graphviz lens lp-diagrams parsek pretty + base configurator dlist parsek pretty ]; description = "Markup language preprocessor for Haskell"; license = stdenv.lib.licenses.gpl2; @@ -131451,6 +138047,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "massiv" = callPackage + ({ mkDerivation, base, data-default, data-default-class, deepseq + , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.1.6.1"; + sha256 = "1ifkzalbhp3jv41x9zwsn0ks3ahrab6gs1x57c4y0ww56qf0gv2y"; + libraryHaskellDepends = [ + base data-default-class deepseq ghc-prim primitive vector + ]; + testHaskellDepends = [ + base data-default deepseq hspec QuickCheck safe-exceptions vector + ]; + homepage = "https://github.com/lehins/massiv"; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "massiv-io" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq, directory + , filepath, JuicyPixels, massiv, netpbm, process, vector + }: + mkDerivation { + pname = "massiv-io"; + version = "0.1.2.0"; + sha256 = "02va411j1alsja009xms30x0zhwansjiy81djz2za06ghyg4f6a1"; + libraryHaskellDepends = [ + base bytestring data-default deepseq directory filepath JuicyPixels + massiv netpbm process vector + ]; + homepage = "https://github.com/lehins/massiv"; + description = "Import/export of Image files into massiv Arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -131675,31 +138307,9 @@ self: { description = "Matlab bindings and interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {eng = null; mat = null; mx = null;}; + }) {eng = null; mat = null; inherit (pkgs) mx;}; "matplotlib" = 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; - }) {}; - - "matplotlib_0_6_0" = callPackage ({ mkDerivation, ad, aeson, base, bytestring, containers, deepseq , filepath, process, random, raw-strings-qq, split, tasty , tasty-expected-failure, tasty-golden, tasty-hunit, temporary @@ -131754,6 +138364,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "matrix_0_3_6_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, loop, primitive + , QuickCheck, semigroups, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "matrix"; + version = "0.3.6.1"; + sha256 = "0b1v17rc9q7ni44gkzp124kmc5d6xmlpiqvskgjrq54qpjinr5zs"; + libraryHaskellDepends = [ + base deepseq loop primitive semigroups vector + ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "A native implementation of matrix operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "matrix-market" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -131820,35 +138448,40 @@ self: { }) {}; "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, aeson, aspell-pipe, async, base, base-compat + , brick, brick-skylighting, bytestring, cheapskate, checkers + , config-ini, connection, containers, directory, filepath, gitrev + , hashable, Hclip, mattermost-api, mattermost-api-qc + , microlens-platform, mtl, process, quickcheck-text, semigroups + , skylighting, stm, stm-delay, strict, string-conversions, tasty + , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time + , timezone-olson, timezone-series, transformers, Unique, unix + , unordered-containers, utf8-string, vector, vty, word-wrap + , xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "40000.1.0"; - sha256 = "0zqbaqdvcq45sgkiii7w2y8b3m8fv8zqj1y85rdkycjfy7h8lkjd"; + version = "40800.0.2"; + sha256 = "0fgk0my3r0vcw545xqjcda8ikj5cbfzgg9vxfs3jzdcnsa0rgcyf"; 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 + aeson aspell-pipe async base base-compat brick brick-skylighting + bytestring cheapskate config-ini connection containers directory + filepath gitrev hashable Hclip mattermost-api microlens-platform + mtl process semigroups skylighting stm stm-delay strict temporary + text text-zipper time timezone-olson timezone-series transformers + unix unordered-containers utf8-string vector vty word-wrap + 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 + quickcheck-text semigroups stm strict string-conversions tasty + tasty-hunit tasty-quickcheck text text-zipper time timezone-olson + timezone-series transformers Unique unordered-containers vector vty + xdg-basedir ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; @@ -131858,23 +138491,21 @@ self: { "mattermost-api" = callPackage ({ mkDerivation, aeson, base, binary, 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 + , microlens-th, mtl, network-uri, pretty-show, process + , resource-pool, stm, tasty, tasty-hunit, template-haskell, text + , time, unordered-containers, websockets }: mkDerivation { pname = "mattermost-api"; - version = "40000.1.0"; - sha256 = "076b5l2hqjbspdm6j321inf141jsr07c9dsckqvq02wxjaz8ws80"; + version = "40800.0.2"; + sha256 = "1l2yb9nvy2haw5kyjjij465g45w8xm8vm97jbkx5jb3p4cs44xl8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring connection containers gitrev hashable HTTP memory microlens microlens-th network-uri pretty-show process - stm template-haskell text time unordered-containers websockets - ]; - executableHaskellDepends = [ - aeson base connection pretty-show process text unordered-containers + resource-pool stm template-haskell text time unordered-containers + websockets ]; testHaskellDepends = [ aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit @@ -131891,8 +138522,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40000.1.0"; - sha256 = "11yxkq19f0iczh69hglv7plv466wfzdskkygp9vh6a7bjwwr8hzk"; + version = "40800.0.2"; + sha256 = "04whpcbcd5cqnwfrskk3r2gjmyvap2m7d8xsjdry56kil6iqznk5"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -131986,7 +138617,6 @@ self: { homepage = "https://github.com/george-steel/maxent-learner"; description = "GUI for maxent-learner-hw"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "maximal-cliques" = callPackage @@ -132061,6 +138691,8 @@ self: { pname = "mbox"; version = "0.3.4"; sha256 = "1pkiagxb013an71d3si3kldgn7rl9l5zi2s3s6hjhfg0pcwbbr6w"; + revision = "1"; + editedCabalFile = "11jikczq21fnhsvr6n33qbb5q6ixbhab4s0js8n39zwgmglighz5"; libraryHaskellDepends = [ base safe text time time-locale-compat ]; description = "Read and write standard mailbox files"; license = stdenv.lib.licenses.bsd3; @@ -132068,7 +138700,7 @@ self: { "mbox-tools" = callPackage ({ mkDerivation, base, bytestring, codec-mbox, containers, fclabels - , hsemail, mtl, parsec, process, pureMD5, random + , hsemail, mtl, parsec, process, pureMD5 }: mkDerivation { pname = "mbox-tools"; @@ -132078,7 +138710,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring codec-mbox containers fclabels hsemail mtl parsec - process pureMD5 random + process pureMD5 ]; homepage = "https://github.com/np/mbox-tools"; description = "A collection of tools to process mbox files"; @@ -132170,6 +138802,7 @@ self: { homepage = "http://interfaces.org.uk/mcm"; description = "Manages the contents of files and directories"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mcmaster-gloss-examples" = callPackage @@ -132229,7 +138862,7 @@ self: { }) {}; "mcpi" = callPackage - ({ mkDerivation, base, network, pipes, split, transformers }: + ({ mkDerivation, base, network, split, transformers }: mkDerivation { pname = "mcpi"; version = "0.0.1.2"; @@ -132237,7 +138870,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network split transformers ]; - executableHaskellDepends = [ base network pipes transformers ]; + executableHaskellDepends = [ base transformers ]; homepage = "https://github.com/DougBurke/hmcpi"; description = "Connect to MineCraft running on a Raspberry PI"; license = stdenv.lib.licenses.publicDomain; @@ -132449,6 +139082,7 @@ self: { 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 @@ -132516,6 +139150,7 @@ self: { 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 @@ -132529,6 +139164,7 @@ self: { homepage = "https://github.com/caneroj1/median-stream#readme"; description = "Constant-time queries for the median of a stream of numeric data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mediawiki" = callPackage @@ -132614,59 +139250,61 @@ self: { }) {}; "mega-sdist" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude-conduit - , conduit-extra, directory, filepath, http-conduit, optparse-simple - , tar-conduit, temporary, typed-process, yaml + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , http-conduit, optparse-simple, rio, tar-conduit, yaml }: mkDerivation { pname = "mega-sdist"; - version = "0.3.0.2"; - sha256 = "0zxillzaiq6ygiili8par8apm1pxh6lv9gk2f2a5nl8nv7n0sv7h"; + version = "0.3.2"; + sha256 = "05v061giv1q0gq4n8x1g44pyfxjy95aqxnnv5bc4cclrp233m5b1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring classy-prelude-conduit conduit-extra directory - filepath http-conduit optparse-simple tar-conduit temporary - typed-process yaml + base bytestring conduit conduit-extra http-conduit optparse-simple + rio tar-conduit yaml ]; - homepage = "https://github.com/snoyberg/mega-sdist"; + homepage = "https://github.com/snoyberg/mega-sdist#readme"; description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "megaparsec" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , exceptions, hspec, hspec-expectations, mtl, QuickCheck - , scientific, text, transformers, weigh + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, hspec, hspec-expectations, mtl + , parser-combinators, QuickCheck, scientific, text, transformers + , weigh }: mkDerivation { pname = "megaparsec"; - version = "5.3.1"; - sha256 = "06myn8l6jcbd494i3wr6q27npbbxd6c2gfkd2jdzwbjqjqbpv0j8"; + version = "6.4.1"; + sha256 = "0w0kw8g7c6c3sp0fpgfqjc2w032dv9s7jnyn1dx71hk5mifh2h6y"; + revision = "2"; + editedCabalFile = "0vh4l2kl9nfxlr8l82qicldybwiv6vbksi3jdk0xjzxmkvgm0jnf"; libraryHaskellDepends = [ - base bytestring containers deepseq exceptions mtl QuickCheck - scientific text transformers + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers ]; testHaskellDepends = [ - base bytestring containers exceptions hspec hspec-expectations mtl - QuickCheck scientific text transformers + base bytestring containers hspec hspec-expectations mtl QuickCheck + scientific text transformers ]; - benchmarkHaskellDepends = [ base criterion deepseq weigh ]; + benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; homepage = "https://github.com/mrkkrp/megaparsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_6_2_0" = callPackage + "megaparsec_6_5_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers - , criterion, deepseq, hspec, hspec-expectations, mtl - , parser-combinators, QuickCheck, scientific, text, transformers - , weigh + , criterion, deepseq, hspec, hspec-discover, hspec-expectations + , mtl, parser-combinators, QuickCheck, scientific, text + , transformers, weigh }: mkDerivation { pname = "megaparsec"; - version = "6.2.0"; - sha256 = "1kyn7fcyckbjngpyxd2d4mny95sy71rk2s22yrkwyjgkza0fvslg"; + version = "6.5.0"; + sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -132675,6 +139313,7 @@ self: { base bytestring containers hspec hspec-expectations mtl QuickCheck scientific text transformers ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; homepage = "https://github.com/mrkkrp/megaparsec"; description = "Monadic parser combinators"; @@ -132696,73 +139335,75 @@ self: { }) {}; "mellon-core" = callPackage - ({ mkDerivation, async, base, doctest, hlint, hspec, mtl + ({ mkDerivation, async, base, doctest, hspec, mtl, protolude , QuickCheck, quickcheck-instances, time, transformers }: mkDerivation { pname = "mellon-core"; - version = "0.8.0.2"; - sha256 = "0fl9pwh67diibj2ki75xcwylbhvw0nqn0b0azla4ndr3fxdgnh30"; - libraryHaskellDepends = [ async base mtl time transformers ]; + version = "0.8.0.7"; + sha256 = "1nlqqkmm4163260zgl9cqxrd47iy3fpdyhd52y79c2cr1mqjw39q"; + libraryHaskellDepends = [ + async base mtl protolude time transformers + ]; testHaskellDepends = [ - async base doctest hlint hspec mtl QuickCheck quickcheck-instances - time transformers + async base doctest hspec mtl protolude QuickCheck + quickcheck-instances time transformers ]; - homepage = "https://github.com/quixoftic/mellon/"; + homepage = "https://github.com/quixoftic/mellon#readme"; description = "Control physical access devices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mellon-gpio" = callPackage - ({ mkDerivation, base, hlint, hpio, mellon-core }: + ({ mkDerivation, base, hpio, mellon-core, protolude }: mkDerivation { pname = "mellon-gpio"; - version = "0.8.0.2"; - sha256 = "1dx31nyyi4gar2wlmmgfnqi48x4pzwh53q87xg8rrbghc9vfqygj"; - libraryHaskellDepends = [ base hpio mellon-core ]; - testHaskellDepends = [ base hlint ]; - homepage = "https://github.com/quixoftic/mellon/"; + version = "0.8.0.7"; + sha256 = "0hg878il0d31lfqwkb3rsd7gxbhs5cb1sxgc3rwdv70fdg63iirp"; + libraryHaskellDepends = [ base hpio mellon-core protolude ]; + homepage = "https://github.com/quixoftic/mellon#readme"; description = "GPIO support for mellon"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mellon-web" = callPackage ({ 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 + , exceptions, hpio, hspec, hspec-wai, http-client, http-client-tls + , http-types, lens, lucid, mellon-core, mellon-gpio, mtl, network + , optparse-applicative, protolude, QuickCheck, quickcheck-instances + , servant, servant-client, servant-client-core, 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.8.0.2"; - sha256 = "03awn8qcqn5iz5cd082cr6ap15zlbidp5l2aacz24m0fn5vdgjlf"; + version = "0.8.0.7"; + sha256 = "1m3ch98i8wzhi7g2c2l9klp0a3xcqfwfbq6ad6grl43v8fh1q737"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ 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 + lucid mellon-core protolude servant servant-client + servant-client-core 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 http-types mellon-core mellon-gpio mtl network optparse-applicative - servant-client time transformers warp + protolude servant-client servant-client-core time transformers warp ]; testHaskellDepends = [ - 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 + aeson aeson-pretty base bytestring doctest hspec hspec-wai + http-client http-types lens lucid mellon-core network protolude + QuickCheck quickcheck-instances servant servant-client + servant-client-core servant-docs servant-lucid servant-server + servant-swagger servant-swagger-ui swagger2 text time transformers + wai wai-extra warp ]; - homepage = "https://github.com/quixoftic/mellon/"; + homepage = "https://github.com/quixoftic/mellon#readme"; description = "A REST web service for Mellon controllers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -132814,8 +139455,8 @@ self: { "memcache-conduit" = callPackage ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring - , conduit, conduit-extra, containers, hashtables, memcache-haskell - , monad-control, mtl, network, resourcet, split, stm, transformers + , conduit, conduit-extra, memcache-haskell, mtl, network, resourcet + , split }: mkDerivation { pname = "memcache-conduit"; @@ -132827,19 +139468,14 @@ self: { attoparsec attoparsec-binary base bytestring conduit conduit-extra memcache-haskell mtl network resourcet split ]; - executableHaskellDepends = [ - base bytestring conduit conduit-extra containers hashtables - memcache-haskell monad-control mtl network resourcet stm - transformers - ]; description = "Conduit library for memcache procotol"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memcache-haskell" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, conduit-extra - , containers, hashable, hashtables, HUnit, mtl, network, QuickCheck - , resourcet, split, stm, test-framework, test-framework-hunit + ({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit + , network, QuickCheck, split, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers }: mkDerivation { @@ -132851,16 +139487,13 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring hashable network split transformers ]; - executableHaskellDepends = [ - base bytestring conduit-extra containers hashtables mtl resourcet - stm transformers - ]; testHaskellDepends = [ base bytestring HUnit network QuickCheck split test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; description = "Memcache procotol library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memcached" = callPackage @@ -132963,13 +139596,13 @@ self: { }) {}; "memo-sqlite" = callPackage - ({ mkDerivation, base, direct-sqlite }: + ({ mkDerivation, base, direct-sqlite, text }: mkDerivation { pname = "memo-sqlite"; - version = "0.1"; - sha256 = "1gijza29wj79k8czfg4mghq7nqsbpyf1scnm9hmg2ykhnllpzvy3"; - libraryHaskellDepends = [ base direct-sqlite ]; - homepage = "https://gitorious.org/memo-sqlite"; + version = "0.2"; + sha256 = "0x6vpf5kcr4icli0hjdqzphbpsakh0yn2ih2jyh65hnk1nh4j8n7"; + libraryHaskellDepends = [ base direct-sqlite text ]; + homepage = "https://code.mathr.co.uk/memo-sqlite"; description = "memoize functions using SQLite3 database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -133031,22 +139664,21 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Generate human memorable strings from binary data"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memory" = callPackage - ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, basement, bytestring, deepseq, foundation + , ghc-prim }: mkDerivation { pname = "memory"; - version = "0.14.8"; - sha256 = "093jin2yckha0wccswwxqaak2di7fz2v2rid03h1q0pjm4q9vmyk"; + version = "0.14.16"; + sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v"; libraryHaskellDepends = [ - base bytestring deepseq foundation ghc-prim - ]; - testHaskellDepends = [ - base foundation tasty tasty-hunit tasty-quickcheck + base basement bytestring deepseq foundation ghc-prim ]; + testHaskellDepends = [ base basement bytestring foundation ]; homepage = "https://github.com/vincenthz/hs-memory"; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; @@ -133091,8 +139723,8 @@ self: { pname = "mercury-api"; version = "0.1.0.1"; sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr"; - revision = "1"; - editedCabalFile = "0k8k9lcvpwkvz4w0ydrxzzmfgch8885h6vdybvqi7ra4kvhf4gzs"; + revision = "2"; + editedCabalFile = "093c8afmcrnbfliz1ykpyc4w40dli2wig0qi0xcwg8445idwp2kg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133159,6 +139791,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "merkle-tree" = callPackage + ({ mkDerivation, base, bytestring, cereal, cryptonite, memory + , protolude, QuickCheck, random, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "merkle-tree"; + version = "0.1.0"; + sha256 = "0k9ifkl8ywp0svn83rlczrq2s1aamwri2vx25cs42f64bgxr7ics"; + revision = "1"; + editedCabalFile = "1ibsr79qmzykn2i7p8zvzp8v79lsr54gc3zdqmfgk2cjx1x8k6dz"; + libraryHaskellDepends = [ + base bytestring cereal cryptonite memory protolude random + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite memory protolude QuickCheck + random tasty tasty-quickcheck + ]; + homepage = "https://github.com/adjoint-io/merkle-tree#readme"; + description = "An implementation of a Merkle Tree and merkle tree proofs"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mersenne-random" = callPackage ({ mkDerivation, base, old-time }: mkDerivation { @@ -133364,7 +140018,6 @@ self: { ]; description = "High-performance application metric tracking"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "metricsd-client" = callPackage @@ -133475,6 +140128,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "micro-recursion-schemes" = callPackage + ({ mkDerivation, base, cpphs, HUnit, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "micro-recursion-schemes"; + version = "5.0.2.1"; + sha256 = "1n1sza3a87vh74hx1da4mcfwarbjkz2cfvnkldnqwfnqvngq1gaq"; + libraryHaskellDepends = [ base template-haskell th-abstraction ]; + libraryToolDepends = [ cpphs ]; + testHaskellDepends = [ base HUnit template-haskell ]; + description = "Simple recursion schemes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "microbench" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -133561,42 +140229,59 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "microgroove"; - version = "0.1.0.0"; - sha256 = "0mzgx3ljf7k7b0c6kdryamcyvahhr2q1j836ghhsk58r4j67qh13"; + version = "0.2.1.0"; + sha256 = "1dfkiiiksb4wnf6kgxmla37w1xmmxpzim4ribjckvn58pd2hn2a0"; libraryHaskellDepends = [ base primitive vector ]; - homepage = "https://github.com/daig/microgroove"; + homepage = "https://github.com/daig/microgroove#readme"; description = "Array-backed extensible records"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "microlens" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.8.1"; - sha256 = "0iqagqc3c6b6ihydhc6s7dlibwwf7pr1k9gixls3jikj6hfxzf0p"; + version = "0.4.8.3"; + sha256 = "17qx2mbqdrlnkc3gxq8njbp7qw8nh51drmz6fc8khgj9bls5ni2k"; + 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."; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "microlens_0_4_9_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microlens"; + version = "0.4.9.1"; + sha256 = "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51"; 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."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens - , scientific, tasty, tasty-hunit, text, unordered-containers - , vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, hashable, lens, lens-aeson, microlens, scientific, tasty + , tasty-hunit, text, unordered-containers, vector }: mkDerivation { pname = "microlens-aeson"; - version = "2.2.0.2"; - sha256 = "05zk6pfb9s48kgfpim1lj32vh3p54g633d5x4771inxihlskqd4d"; + version = "2.3.0"; + sha256 = "1iahlh505jrlpd9ndkr5asfnzdpp6m6m2lm44ds15461py485wpj"; libraryHaskellDepends = [ - aeson attoparsec base bytestring microlens scientific text - unordered-containers vector + aeson attoparsec base bytestring deepseq hashable microlens + scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring microlens tasty tasty-hunit text - unordered-containers vector + aeson base bytestring deepseq hashable microlens tasty tasty-hunit + text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion deepseq hashable lens lens-aeson + microlens text unordered-containers vector ]; homepage = "http://github.com/fosskers/microlens-aeson/"; description = "Law-abiding lenses for Aeson, using microlens"; @@ -133644,14 +140329,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-ghc_0_4_9" = callPackage + ({ mkDerivation, array, base, bytestring, containers, microlens + , transformers + }: + mkDerivation { + pname = "microlens-ghc"; + version = "0.4.9"; + sha256 = "0wdwra9s7gllw0i7sf7d371h6d5qwlk6jrvhdm8hafj4fxagafma"; + libraryHaskellDepends = [ + array base bytestring containers microlens transformers + ]; + homepage = "http://github.com/aelve/microlens"; + description = "microlens + array, bytestring, containers, transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-mtl" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat }: mkDerivation { pname = "microlens-mtl"; - version = "0.1.11.0"; - sha256 = "1885kc8sgcrv05q2sya4q562gph7hgp1hd66mgy7r1vnnz43zfjf"; + version = "0.1.11.1"; + sha256 = "0l6z1gkzwcpv89bxf5vgfrjb6gq2pj7sjjc53nvi5b9alx34zryk"; libraryHaskellDepends = [ base microlens mtl transformers transformers-compat ]; @@ -133677,12 +140379,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-platform_0_3_10" = callPackage + ({ mkDerivation, base, hashable, microlens, microlens-ghc + , microlens-mtl, microlens-th, text, unordered-containers, vector + }: + mkDerivation { + pname = "microlens-platform"; + version = "0.3.10"; + sha256 = "1d4nhmgf9jq0ixc7qhwm7aaw3xdr0nalw58d0ydsydgf02cyazwv"; + libraryHaskellDepends = [ + base hashable microlens microlens-ghc microlens-mtl microlens-th + text unordered-containers vector + ]; + homepage = "http://github.com/aelve/microlens"; + description = "Feature-complete microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-th" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { pname = "microlens-th"; - version = "0.4.1.1"; - sha256 = "0yvaabxs80fbmbg0yc1q7c147ks15bpn6fdq1zc0ay2pp06l06jv"; + version = "0.4.1.3"; + sha256 = "15a12cqxlgbcn1n73zwrxnp2vfm8b0ma0a0sdd8zmjbs8zy3np4f"; libraryHaskellDepends = [ base containers microlens template-haskell ]; @@ -133691,6 +140411,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-th_0_4_2_1" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell + , th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.2.1"; + sha256 = "0hpwwk50a826s87ad0k6liw40qp6av0hmdhnsdfhhk5mka710mzc"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens ]; + homepage = "http://github.com/aelve/microlens"; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -133710,6 +140449,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "microsoft-translator" = callPackage + ({ mkDerivation, base, bytestring, http-api-data, http-client + , http-client-tls, http-media, mtl, safe, servant, servant-client + , text, time, xml + }: + mkDerivation { + pname = "microsoft-translator"; + version = "0.1.1"; + sha256 = "12f5ki7i7cd8b6dzkg5q8chk1vnlr0izm3r62b371xf8hpmxn0av"; + libraryHaskellDepends = [ + base bytestring http-api-data http-client http-client-tls + http-media mtl safe servant servant-client text time xml + ]; + homepage = "https://github.com/BlackBrane/microsoft-translator"; + description = "Bindings to the Microsoft Translator API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microspec" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -133730,6 +140488,8 @@ self: { pname = "microstache"; version = "1.0.1.1"; sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax"; + revision = "1"; + editedCabalFile = "1var5mgzvkxl9s78hbxylkvv67z7fnbs5rb1l9q0cqxyw85cbr6j"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -133802,16 +140562,16 @@ self: { "midi" = callPackage ({ mkDerivation, base, binary, bytestring, event-list , explicit-exception, monoid-transformer, non-negative, QuickCheck - , random, transformers, utility-ht + , random, semigroups, transformers, utility-ht }: mkDerivation { pname = "midi"; - version = "0.2.2.1"; - sha256 = "1kq3218g5cisyg6vmm4pm096zjs1954s6ng4pkdx8pxp39rk26a4"; + version = "0.2.2.2"; + sha256 = "0fv9980k35qv9qk73g2mp88xvhchyq0lq37cl7i26gx4f64vaz6y"; libraryHaskellDepends = [ base binary bytestring event-list explicit-exception - monoid-transformer non-negative QuickCheck random transformers - utility-ht + monoid-transformer non-negative QuickCheck random semigroups + transformers utility-ht ]; testHaskellDepends = [ base bytestring event-list explicit-exception non-negative @@ -133820,7 +140580,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Handling of MIDI messages and files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-alsa" = callPackage @@ -133835,7 +140594,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Convert between datatypes of the midi and the alsa packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midi-music-box" = callPackage @@ -133896,7 +140655,6 @@ self: { homepage = "http://github.com/mtolly/midi-util"; description = "Utility functions for processing MIDI files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-utils" = callPackage @@ -133918,17 +140676,19 @@ self: { }) {}; "midimory" = callPackage - ({ mkDerivation, alsa-core, alsa-seq, base, containers, random - , transformers, wx, wxcore + ({ mkDerivation, alsa-core, alsa-seq, array, base, containers + , optparse-applicative, random, transformers, utility-ht, wx + , wxcore }: mkDerivation { pname = "midimory"; - version = "0.0.0.2"; - sha256 = "13bfb2s6ybvspmmq427v55nb2csvcp4ijfgm9fvfh6cab2pm1dyz"; + version = "0.0.2.1"; + sha256 = "07p0f7a0nm7h8li8rl6adrszrz7hhzn19mfy0vgkw8axdaira66r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - alsa-core alsa-seq base containers random transformers wx wxcore + alsa-core alsa-seq array base containers optparse-applicative + random transformers utility-ht wx wxcore ]; homepage = "http://www.youtube.com/watch?v=cOlR73h2uII"; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; @@ -133987,8 +140747,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "3.4.1"; - sha256 = "1mfqpmvypr67f7kxlagbqydf45lji59zyvwmflyhwjmyc8kcf90g"; + version = "3.4.2"; + sha256 = "0a5i9cs0rjap7i4gyda6dgglckn3ys0ldl0qkvnxvm87bcyyfc3k"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -134040,6 +140800,7 @@ self: { homepage = "https://github.com/evanrinehart/mikmod"; description = "MikMod bindings"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mikrokosmos" = callPackage @@ -134091,8 +140852,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.2.0"; - sha256 = "06gx1j9bxzxnagsymgr0nzhs1s6jsr14mhh2qx38h85n5g12zpvb"; + version = "0.5.2.1"; + sha256 = "1mylkqp8vha9gq7li5cir5h3i27zb573alxgxnvr1y938z2nimf2"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base monad-control mtl murmur-hash network random resource-pool @@ -134161,8 +140922,8 @@ self: { }: mkDerivation { pname = "mime-mail-ses"; - version = "0.3.2.3"; - sha256 = "0k2dgw3alnfjj4byr30d687b27hmwh4pacm0jwh15prcdhw7gy83"; + version = "0.4.0.0"; + sha256 = "0w87ba8a5kli7xv7d8x5viz1c2rmm3ahaxp5d797n8bb13yn09mw"; libraryHaskellDepends = [ base base64-bytestring byteable bytestring conduit cryptohash http-client http-conduit http-types mime-mail old-locale text time @@ -134173,20 +140934,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "mime-mail-ses_0_4_0_0" = callPackage + "mime-mail-ses_0_4_1" = callPackage ({ mkDerivation, base, base64-bytestring, byteable, bytestring - , conduit, cryptohash, http-client, http-conduit, http-types - , mime-mail, old-locale, text, time, transformers, xml-conduit - , xml-types + , conduit, cryptohash, http-client, http-client-tls, http-conduit + , http-types, mime-mail, old-locale, text, time, transformers + , xml-conduit, xml-types }: mkDerivation { pname = "mime-mail-ses"; - version = "0.4.0.0"; - sha256 = "0w87ba8a5kli7xv7d8x5viz1c2rmm3ahaxp5d797n8bb13yn09mw"; + version = "0.4.1"; + sha256 = "1w6k4cm5yab9dhg7yn6mp7jzk1zdwpnzc6c1xb3vz3rdwp8jjvx7"; libraryHaskellDepends = [ base base64-bytestring byteable bytestring conduit cryptohash - http-client http-conduit http-types mime-mail old-locale text time - transformers xml-conduit xml-types + http-client http-client-tls http-conduit http-types mime-mail + old-locale text time transformers xml-conduit xml-types ]; homepage = "http://github.com/snoyberg/mime-mail"; description = "Send mime-mail messages via Amazon SES"; @@ -134208,7 +140969,6 @@ self: { ]; description = "MIME implementation for String's"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime-types" = callPackage @@ -134374,33 +141134,35 @@ self: { }) {}; "minio-hs" = callPackage - ({ mkDerivation, async, base, bytestring, case-insensitive, conduit - , conduit-combinators, conduit-extra, containers, cryptonite - , cryptonite-conduit, data-default, 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 - , text-format, time, transformers, transformers-base, xml-conduit + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , case-insensitive, conduit, conduit-combinators, conduit-extra + , containers, cryptonite, cryptonite-conduit, data-default + , 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, text-format + , time, transformers, transformers-base, vector, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "0.3.1"; - sha256 = "0mrrkd3yl1lbii5gjmhcky3g26anvki3liswrzmfjkff0l7s3riv"; + version = "0.3.2"; + sha256 = "0yfhnvngw27h05hxywxp76fcy4566djsm0l3x2kx8n4ppwi5p6r4"; 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 text-format time transformers transformers-base xml-conduit + aeson async base base64-bytestring 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 text-format time + transformers transformers-base vector xml-conduit ]; testHaskellDepends = [ - async base bytestring case-insensitive conduit conduit-combinators - conduit-extra containers cryptonite cryptonite-conduit data-default - 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 text-format time transformers transformers-base - xml-conduit + aeson async base base64-bytestring bytestring case-insensitive + conduit conduit-combinators conduit-extra containers cryptonite + cryptonite-conduit data-default 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 text-format time + transformers transformers-base vector xml-conduit ]; homepage = "https://github.com/minio/minio-hs#readme"; description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; @@ -134531,8 +141293,8 @@ self: { }: mkDerivation { pname = "miniutter"; - version = "0.4.6.0"; - sha256 = "093ahw66byzgc9scvmlihl3sa2zph9mszpf9kdjd9ydi5gv6mrmx"; + version = "0.4.7.0"; + sha256 = "10nwg3vw0p8hb8hgc34xspg4vrwf8xyhi22b9j57ms3045marjdd"; libraryHaskellDepends = [ base binary containers ghc-prim minimorph text ]; @@ -134587,17 +141349,21 @@ self: { }) {}; "mios" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, vector }: + ({ mkDerivation, base, bytestring, ghc-prim, primitive, vector }: mkDerivation { pname = "mios"; - version = "1.4.0"; - sha256 = "0b9wmhw6dria5j9a8jk85gdnlz7bqgx2b4ziw8y8bwj9k3yr3j1w"; + version = "1.6.0"; + sha256 = "1pwcv24csffb734q4z4amjlgv8kkzncz8bjhn4s3wji021ndj1b7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring ghc-prim vector ]; - executableHaskellDepends = [ base bytestring ghc-prim vector ]; + libraryHaskellDepends = [ + base bytestring ghc-prim primitive vector + ]; + executableHaskellDepends = [ + base bytestring ghc-prim primitive vector + ]; homepage = "https://github.com/shnarazk/mios"; - description = "A Minisat-based SAT solver in Haskell"; + description = "A Minisat-based CDCL SAT solver in Haskell"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -134644,33 +141410,34 @@ self: { }) {}; "miso" = callPackage - ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers - , lucid, servant, servant-lucid, text, vector + ({ mkDerivation, aeson, base, bytestring, containers, http-api-data + , http-types, lucid, network-uri, servant, servant-lucid, text + , transformers, vector }: mkDerivation { pname = "miso"; - version = "0.4.0.0"; - sha256 = "1pfmmc14fsydv6km45sc5w0mgqnsww7l053qh0vrqmzb88zp8h7b"; + version = "0.14.0.0"; + sha256 = "16qi1wcijncjjrjdwxs90jn3xclw1cgb0j1gby1w9d457ys6hmnx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base BoundedChan bytestring containers lucid servant - servant-lucid text vector + aeson base bytestring containers http-api-data http-types lucid + network-uri servant servant-lucid text transformers vector ]; homepage = "http://github.com/dmjio/miso"; description = "A tasty Haskell front-end framework"; license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_9_0_0" = callPackage + "miso_0_19_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "0.9.0.0"; - sha256 = "09m34q1d65j2rhnnb66z6hmbj3vma8dgj7dbakx9w2w6z9y7bz1z"; + version = "0.19.0.0"; + sha256 = "0xnnhs36rnbaq8q4s6r2lhm9g4qdvm0qm0pj3hgrkgn22cs2fq21"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134745,26 +141512,8 @@ self: { }: 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; - }) {}; - - "mixed-types-num_0_3_1_3" = callPackage - ({ mkDerivation, base, convertible, hspec, hspec-smallcheck - , QuickCheck, smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; - version = "0.3.1.3"; - sha256 = "0945zl9g1lpvpgqmaqm168zx6l1zydw9waivh7nm4alfr8awys60"; + version = "0.3.1.4"; + sha256 = "0061in4wv9hs5d8bvq5ycv8x176z3fz8fcfymwghmbjybbmgzzy4"; libraryHaskellDepends = [ base convertible hspec hspec-smallcheck QuickCheck smallcheck template-haskell @@ -134773,7 +141522,6 @@ self: { 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 @@ -134862,6 +141610,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mltool_0_2_0_0" = callPackage + ({ mkDerivation, ascii-progress, base, deepseq, hmatrix + , hmatrix-gsl, hmatrix-morpheus, HUnit, MonadRandom, random + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector + }: + mkDerivation { + pname = "mltool"; + version = "0.2.0.0"; + sha256 = "0yjq9wbvni9sgh966jccfcsm6ajicrfkgvwg08383rwnsqbbjm8q"; + libraryHaskellDepends = [ + ascii-progress base deepseq hmatrix hmatrix-gsl hmatrix-morpheus + MonadRandom random vector + ]; + testHaskellDepends = [ + base hmatrix hmatrix-morpheus 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmap" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -134875,35 +141648,89 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmorph" = callPackage - ({ mkDerivation, base, mtl, transformers, transformers-compat }: + "mmark" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, data-default-class, deepseq, dlist, email-validate + , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid + , megaparsec, microlens, microlens-th, modern-uri, mtl + , parser-combinators, QuickCheck, text, text-metrics + , unordered-containers, weigh, yaml + }: mkDerivation { - pname = "mmorph"; - version = "1.0.9"; - sha256 = "0qs5alhy719a14lrs7rnh2qsn1146czg68gvgylf4m5jh4w7vwp1"; + pname = "mmark"; + version = "0.0.5.6"; + sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers data-default-class deepseq + dlist email-validate foldl hashable html-entity-map lucid + megaparsec microlens microlens-th modern-uri mtl parser-combinators + text text-metrics unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + homepage = "https://github.com/mmark-md/mmark"; + description = "Strict markdown processor for writers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mmark-cli" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, gitrev, lucid + , megaparsec, mmark, mmark-ext, optparse-applicative, stache, text + , unordered-containers + }: + mkDerivation { + pname = "mmark-cli"; + version = "0.0.3.0"; + sha256 = "0nb17k23bs21qi7a888qp81w682ax2qvih9fbvdkdh6c2n6yklrp"; revision = "1"; - editedCabalFile = "1xxf78qi08qsis2q785s0ra29wjxnxw8pyns0dsqp4a6cybd3mjd"; + editedCabalFile = "0rzz4m7z02m6rmigmmpgqhik1d7kc0i4mri0gpj1i3j7a59p7s1q"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring directory gitrev lucid megaparsec mmark + mmark-ext optparse-applicative stache text unordered-containers + ]; + homepage = "https://github.com/mmark-md/mmark-cli"; + description = "Command line interface to MMark markdown processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mmark-ext" = callPackage + ({ mkDerivation, base, foldl, hspec, lucid, microlens, mmark + , modern-uri, skylighting, text + }: + mkDerivation { + pname = "mmark-ext"; + version = "0.2.0.0"; + sha256 = "1ccfdjsn8z80x2m5p9q17r2hf14zj63nkxkrg9s7knwr1j08gj1k"; + revision = "1"; + editedCabalFile = "0sql0z4123v5kzqcganfaag6ijl3j7lw52d3c50r9qwwg8q2dydz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base mtl transformers transformers-compat + base foldl lucid microlens mmark modern-uri skylighting text ]; - description = "Monad morphisms"; + testHaskellDepends = [ base hspec lucid mmark text ]; + homepage = "https://github.com/mmark-md/mmark-ext"; + description = "Commonly useful extensions for MMark markdown processor"; license = stdenv.lib.licenses.bsd3; }) {}; - "mmorph_1_1_0" = callPackage + "mmorph" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; - version = "1.1.0"; - sha256 = "1pklvg28hjfsq5r66x4igjrxbdq0l74g6lirrvsh6ckmc1av9g61"; - revision = "1"; - editedCabalFile = "0ppf6icblgrmiaa09s2plg1m2818pp2l9rd7c821q0zq266v79wi"; + version = "1.1.2"; + sha256 = "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; description = "Monad morphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmtf" = callPackage @@ -135015,33 +141842,14 @@ self: { }) {}; "model" = callPackage - ({ mkDerivation, base, containers, deepseq, ghc-prim, ListLike - , pretty, tasty, tasty-hunit, transformers - }: - mkDerivation { - pname = "model"; - version = "0.3"; - sha256 = "1hifwd7caxmbvi6n87w6x8mb42x0q3wqzkjfwxsz6g416c1f56jl"; - libraryHaskellDepends = [ - base containers deepseq ListLike pretty transformers - ]; - testHaskellDepends = [ - base containers ghc-prim pretty tasty tasty-hunit - ]; - homepage = "http://github.com/tittoassini/model"; - description = "Derive a model of a data type using Generics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "model_0_4_2" = callPackage ({ mkDerivation, base, containers, convertible, deepseq, doctest , either, filemanip, ghc-prim, pretty, tasty, tasty-hunit , tasty-quickcheck, transformers }: mkDerivation { pname = "model"; - version = "0.4.2"; - sha256 = "0ynv6fwns4ix0nhz8b3aqsw6q9avn7n60spakhpa30lya9asinjb"; + version = "0.4.4"; + sha256 = "1mmv1m78ychgqp0mblm56fszfmnxap3jwvxviy0h06s6wl2adq24"; libraryHaskellDepends = [ base containers convertible deepseq either pretty transformers ]; @@ -135075,16 +141883,19 @@ self: { "modern-uri" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-megaparsec - , megaparsec, profunctors, QuickCheck, template-haskell, text - , weigh + , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged + , template-haskell, text, weigh }: mkDerivation { pname = "modern-uri"; - version = "0.1.1.0"; - sha256 = "0j2h4rh8ws4zcc47kcs0q8zr543aqnc1i6y4vkv2a8a5v2h2wzxr"; + version = "0.2.1.0"; + sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6"; + revision = "4"; + editedCabalFile = "00vr4g5cmhd3d1329hwcdq55yjq8n5jxz15sgl0sawcg5mw5ihyy"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions - megaparsec profunctors QuickCheck template-haskell text + megaparsec mtl profunctors QuickCheck reflection tagged + template-haskell text ]; testHaskellDepends = [ base bytestring hspec hspec-megaparsec megaparsec QuickCheck text @@ -135095,18 +141906,17 @@ self: { homepage = "https://github.com/mrkkrp/modern-uri"; description = "Modern library for working with URIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split - , text, text-show + , text, text-show, transformers }: mkDerivation { pname = "modify-fasta"; - version = "0.8.2.3"; - sha256 = "0pj6qymvz1b7rm5i1p2vys7ayp6p6pp8m8f3giahrccp9zg0gvnw"; + version = "0.8.3.0"; + sha256 = "1hvn55c0cg4h2980ia28b2n2r9p7p0rqyfr5wvkkqyhz4si7dp9r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135115,11 +141925,12 @@ self: { ]; executableHaskellDepends = [ base containers fasta mtl optparse-applicative pipes pipes-text - semigroups split text + semigroups split text transformers ]; homepage = "https://github.com/GregorySchwartz/modify-fasta"; description = "Modify fasta (and CLIP) files in several optional ways"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modsplit" = callPackage @@ -135147,8 +141958,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "modular-arithmetic"; - version = "1.2.1.2"; - sha256 = "0xm1p63r4a8gdpsrdrsf80bihra11blnik2gwvlpph494pvk27wj"; + version = "1.2.1.3"; + sha256 = "1f5k25gqnn037fpan3l956ly0g5cgwnw7qxyc6sm6hgdcl91wn1l"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/TikhonJelvis/modular-arithmetic"; @@ -135283,8 +142094,8 @@ self: { }: mkDerivation { pname = "moesocks"; - version = "1.0.0.42"; - sha256 = "17817g4fyy03la1jh718mrncpjf6vjh819rpvgjcmzk6dl2p0a49"; + version = "1.0.0.44"; + sha256 = "1j7181sjj5p6r419z9j8b8ikshhcgm2zwfbl4f1brbpyvwvs4ddz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135348,7 +142159,6 @@ self: { ]; description = "A glorified string replacement tool"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mollie-api-haskell" = callPackage @@ -135372,20 +142182,21 @@ self: { }) {}; "monad-abort-fd" = callPackage - ({ mkDerivation, base, monad-control, mtl, transformers - , transformers-abort, transformers-base + ({ mkDerivation, base, mtl, stm, transformers, transformers-abort + , transformers-base, transformers-compat }: mkDerivation { pname = "monad-abort-fd"; - version = "0.5"; - sha256 = "1yyqbs2zq6rkz0rk36k1c4p7d4f2r6jkf1pzg3a0wbjdqk01ayb7"; + version = "0.7"; + sha256 = "0w1v39n93zg6i22qx312m6z8pc35im3whp5sb13wfvj2ws0nl1z7"; libraryHaskellDepends = [ - base monad-control mtl transformers transformers-abort - transformers-base + base mtl stm transformers transformers-abort transformers-base + transformers-compat ]; homepage = "https://github.com/mvv/monad-abort-fd"; description = "A better error monad transformer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-atom" = callPackage @@ -135437,6 +142248,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-branch" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "monad-branch"; + version = "1.0.3"; + sha256 = "15nk9lvwz4s6lx8g08x5npai0bk13s6mj26vz6biwy3shpf5v11r"; + libraryHaskellDepends = [ base mtl transformers ]; + homepage = "https://github.com/luna/monad-branch"; + description = "Monadic abstraction for computations that can be branched and run independently"; + license = stdenv.lib.licenses.asl20; + }) {}; + "monad-classes" = callPackage ({ mkDerivation, base, conduit, data-lens-light, ghc-prim, mmorph , monad-control, peano, reflection, tasty, tasty-hunit @@ -135457,6 +142280,7 @@ self: { homepage = "https://github.com/strake/monad-classes.hs"; description = "more flexible mtl"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-classes-logging" = callPackage @@ -135476,6 +142300,7 @@ self: { 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 @@ -135488,7 +142313,6 @@ self: { homepage = "https://github.com/kawu/monad-codec"; description = "Monadic conversion between complex data structures and unique integers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-connect" = callPackage @@ -135513,8 +142337,8 @@ self: { }: mkDerivation { pname = "monad-control"; - version = "1.0.2.2"; - sha256 = "0cz4ww3vp96crdqrh7w86rzrs7gs8c1z7rq84yxxhbiz28fs4d0y"; + version = "1.0.2.3"; + sha256 = "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c"; libraryHaskellDepends = [ base stm transformers transformers-base transformers-compat ]; @@ -135529,8 +142353,8 @@ self: { }: mkDerivation { pname = "monad-control-aligned"; - version = "0.0.1"; - sha256 = "11s226d80dbzq7as6ik077hg82swfj2svlk662l32sc9y03m3dyx"; + version = "0.0.1.1"; + sha256 = "1xhiw1g0p8zljhy8yz43ljnwhhqn6dwxqi06mdsfji365p9qzrs4"; libraryHaskellDepends = [ base stm transformers transformers-base transformers-compat ]; @@ -135545,8 +142369,8 @@ self: { }: mkDerivation { pname = "monad-coroutine"; - version = "0.9.0.3"; - sha256 = "1r69cjmkgplgwf94bqm0hz4aiyp5fkn6fyqr72i128zgk62gxah8"; + version = "0.9.0.4"; + sha256 = "1rsxzry8qk5229vx4iw4jrzbbc82m80m1nlxlq73k5k20h9gzq0k"; libraryHaskellDepends = [ base monad-parallel transformers transformers-compat ]; @@ -135606,6 +142430,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-finally" = callPackage + ({ mkDerivation, base, monad-abort-fd, monad-control, transformers + , transformers-abort, transformers-base, transformers-compat + }: + mkDerivation { + pname = "monad-finally"; + version = "0.1.2"; + sha256 = "1vg9mg748frf63l428wsdjdbf25pphjqixdslvlwgvf8d1ayl2xz"; + libraryHaskellDepends = [ + base monad-abort-fd monad-control transformers transformers-abort + transformers-base transformers-compat + ]; + homepage = "https://github.com/mvv/monad-finally"; + description = "Guard monadic computations with cleanup actions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-fork" = callPackage ({ mkDerivation, base, monad-control }: mkDerivation { @@ -135656,8 +142498,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "14ki66l60la1mmm544vvzn930liaygj6zrql10nr192shf3v0cx3"; - revision = "6"; - editedCabalFile = "0xnh69yfpgz1i43x2695gyrxar1582m02cwrzmvfymzvvqbkcwld"; + revision = "7"; + editedCabalFile = "19qsjwcdg39is6ipwl6hgr42c7gyc7p1cs5f8isxy90hb4xjghrh"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -135666,6 +142508,7 @@ self: { homepage = "https://github.com/futurice/haskell-monad-http#readme"; description = "A class of monads which can do http requests"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-interleave" = callPackage @@ -135681,37 +142524,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-journal" = callPackage - ({ mkDerivation, base, either, monad-control, mtl, transformers - , transformers-base + "monad-io-adapter" = callPackage + ({ mkDerivation, base, exceptions, hspec, monad-control + , monad-logger, mtl, transformers, transformers-base }: mkDerivation { - pname = "monad-journal"; - version = "0.7.2"; - sha256 = "024xqvbbhfg5miy86nm3bvjplkqv3mds0qa89ia9hhcrpmvadcbj"; + pname = "monad-io-adapter"; + version = "0.1.0.0"; + sha256 = "0lbgc89d4wh7ciiv9mdp9fr1zfffqgsj504jxv9v6v1ba25fy9is"; libraryHaskellDepends = [ - base either monad-control mtl transformers transformers-base + base exceptions monad-control monad-logger mtl transformers + transformers-base ]; - homepage = "http://github.com/phaazon/monad-journal"; - description = "Pure logger typeclass and monad transformer"; - license = stdenv.lib.licenses.bsd3; + testHaskellDepends = [ base hspec transformers-base ]; + homepage = "https://github.com/cjdev/monad-io-adapter#readme"; + description = "Adapters between MonadIO and MonadBase IO"; + license = stdenv.lib.licenses.isc; }) {}; - "monad-journal_0_8_0" = callPackage - ({ mkDerivation, base, either, monad-control, mtl, transformers + "monad-journal" = callPackage + ({ mkDerivation, base, monad-control, mtl, transformers , transformers-base }: mkDerivation { pname = "monad-journal"; - version = "0.8.0"; - sha256 = "0l78flvvvhpk2zcb39ax0qjqpidi8ydnc3ipnh4vy63c8w02w39n"; + version = "0.8.1"; + sha256 = "1b05l40832ck44m52izj2lxw0ghi0ip4isb4377vb0b010hc42p2"; libraryHaskellDepends = [ - base either monad-control mtl transformers transformers-base + base monad-control mtl transformers transformers-base ]; homepage = "http://github.com/phaazon/monad-journal"; description = "Pure logger typeclass and monad transformer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-levels" = callPackage @@ -135770,27 +142614,50 @@ self: { }) {}; "monad-logger" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, conduit - , conduit-extra, exceptions, fast-logger, lifted-base - , monad-control, monad-loops, mtl, resourcet, stm, stm-chans - , template-haskell, text, transformers, transformers-base - , transformers-compat + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core }: mkDerivation { pname = "monad-logger"; - version = "0.3.25.1"; - sha256 = "0yv4fsi566zrn30j2g5l901lyqgmflhvzy4hji7ikcbh5d45m920"; + version = "0.3.28.4"; + sha256 = "1pqay81lk6divcfslg4dqcpyq2wv7vpdzb73kb2g4203mmpjcpv4"; libraryHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra exceptions - fast-logger lifted-base monad-control monad-loops mtl resourcet stm - stm-chans template-haskell text transformers transformers-base - transformers-compat + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core ]; - homepage = "https://github.com/kazu-yamamoto/logger"; + homepage = "https://github.com/snoyberg/monad-logger#readme"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_28_5" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.28.5"; + sha256 = "1w9700v2vbrydpwr5jjivnkrqcrbl7xbklym0w15qdqd5p6xfpi2"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + homepage = "https://github.com/snoyberg/monad-logger#readme"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -135813,15 +142680,15 @@ self: { }: mkDerivation { pname = "monad-logger-prefix"; - version = "0.1.6"; - sha256 = "14jdx72wx6yavjjaaxx5p270vy5cdshynfbp5ss4mdi3h84rfxpv"; + version = "0.1.9"; + sha256 = "1xvw1nd9arn2v2x4a8r0nljfv0a4z9kqa5pbrhmskgr70l9py4jm"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl resourcet text transformers transformers-base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion monad-logger ]; - homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme"; + homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme"; description = "Add prefixes to your monad-logger output"; license = stdenv.lib.licenses.asl20; }) {}; @@ -135910,7 +142777,6 @@ self: { homepage = "https://github.com/EduardSergeev/monad-memo"; description = "Memoization monad transformer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-mersenne-random" = callPackage @@ -135927,39 +142793,21 @@ self: { }) {}; "monad-metrics" = callPackage - ({ mkDerivation, base, clock, containers, ekg-core, microlens, mtl - , text, transformers - }: - mkDerivation { - pname = "monad-metrics"; - version = "0.1.0.2"; - sha256 = "0xi2hjyv5icjq1z2xvlw655xhjmrn9s4z1wji3rw0870xcx5ykm6"; - libraryHaskellDepends = [ - base clock containers ekg-core microlens mtl text transformers - ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/sellerlabs/monad-metrics#readme"; - description = "A convenient wrapper around EKG metrics"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-metrics_0_2_0_0" = callPackage - ({ mkDerivation, base, clock, ekg-core, hashable, microlens, mtl - , text, transformers, unordered-containers + ({ mkDerivation, base, clock, ekg-core, exceptions, hashable + , microlens, mtl, text, transformers, unordered-containers }: mkDerivation { pname = "monad-metrics"; - version = "0.2.0.0"; - sha256 = "04rnblrxvax8pns5xp2ic04c9s78cikyphsw5w2894ll08b3srh9"; + version = "0.2.1.1"; + sha256 = "11gr6ir4678alscv9m6w33l6nbn0k1xspy4lzlgdqpfq5narl5zy"; libraryHaskellDepends = [ - base clock ekg-core hashable microlens mtl text transformers - unordered-containers + base clock ekg-core exceptions hashable microlens mtl text + transformers unordered-containers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/sellerlabs/monad-metrics#readme"; description = "A convenient wrapper around EKG metrics"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-mock" = callPackage @@ -136051,8 +142899,8 @@ self: { }: mkDerivation { pname = "monad-parallel"; - version = "0.7.2.2"; - sha256 = "1czg23k9qpggj58fksi4zqyig2flqqi1fznq17iw276fivnimgb0"; + version = "0.7.2.3"; + sha256 = "12ahni860pfkdj70f9d0dg2h93gl0d9qav8llcmgh5z7dg1vi3qj"; libraryHaskellDepends = [ base parallel transformers transformers-compat ]; @@ -136075,6 +142923,7 @@ self: { homepage = "https://github.com/mnacamura/monad-parallel-progressbar"; description = "Parallel execution of monadic computations with a progress bar"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-param" = callPackage @@ -136131,6 +142980,7 @@ self: { homepage = "https://github.com/cjdev/monad-persist#readme"; description = "An mtl-style typeclass and transformer for persistent"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-primitive" = callPackage @@ -136175,8 +143025,8 @@ self: { }: mkDerivation { pname = "monad-recorder"; - version = "0.1.0"; - sha256 = "1n3bp3vian88b6wq2r3qybbnvnflphf1815g1qd6kb9r7d4z2g9i"; + version = "0.1.1"; + sha256 = "05d27h3lx7p4qzby8jrxf6wj5z69s11pgpbkdacxrag0v8vynqq8"; libraryHaskellDepends = [ base exceptions monad-control mtl transformers transformers-base ]; @@ -136190,13 +143040,12 @@ self: { ({ mkDerivation, base, mmorph, mtl, transformers }: mkDerivation { pname = "monad-resumption"; - version = "0.1.2.0"; - sha256 = "09yz5cbvjlmqdlr25adxggpdz52jxyryyyrzix1pkdjr6aqpidkr"; + version = "0.1.3.0"; + sha256 = "0zi4p8v02shw0m471xsq1d3wbskz6jd2j92wpdi3qcd8fx4i283q"; libraryHaskellDepends = [ base mmorph mtl transformers ]; homepage = "https://github.com/igraves/resumption_monads"; description = "Resumption and reactive resumption monads for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-skeleton" = callPackage @@ -136251,7 +143100,6 @@ self: { homepage = "http://github.com/joeyadams/hs-monad-statevar"; description = "Concise, overloaded accessors for IORef, STRef, TVar"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-ste" = callPackage @@ -136314,24 +143162,23 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "monad-supply"; - version = "0.6"; - sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir"; + version = "0.7"; + sha256 = "1786rj4n0rrjpp07gn2y8vwpf6ijkjaim1q34rq7lvbjx1fhr2z5"; libraryHaskellDepends = [ base mtl ]; description = "Stateful supply monad"; - license = "unknown"; + license = stdenv.lib.licenses.mit; }) {}; "monad-task" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "monad-task"; - version = "0.1.0"; - sha256 = "01w3wqmsfl9w96kfpdiwfyghm2zjn70x78l436bzxfrcm1d3ayi8"; + version = "0.2.0"; + sha256 = "02qp31w0zgms07b13km3aiina4iqbzxkiajab3b0czmc17xv4kx4"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://github.com/ninegua/monad-task"; description = "A monad transformer that turns event processing into co-routine programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-time" = callPackage @@ -136349,6 +143196,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-time_0_3_1_0" = callPackage + ({ mkDerivation, base, mtl, time }: + mkDerivation { + pname = "monad-time"; + version = "0.3.1.0"; + sha256 = "0z30c0k5bqlz86vwajnm6kj26i09zx6dzqwd00z6ba8hqyzm1x0a"; + libraryHaskellDepends = [ base mtl time ]; + testHaskellDepends = [ base mtl time ]; + homepage = "https://github.com/scrive/monad-time"; + description = "Type class for monads which carry the notion of the current time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-timing" = callPackage ({ mkDerivation, base, containers, exceptions, hlint, hspec , monad-control, mtl, time, transformers, transformers-base @@ -136416,8 +143277,8 @@ self: { }: mkDerivation { pname = "monad-unlift-ref"; - version = "0.2.0"; - sha256 = "1qac8ijilndn4pcdf142f1vpqqaqrnh7zmq0jh86bpnwhhrwqym9"; + version = "0.2.1"; + sha256 = "078xjz3a6rgqqgf8zg9ngspixf9pgch845l6gs5ssy3l54wra18g"; libraryHaskellDepends = [ base constraints exceptions monad-control monad-unlift mtl mutable-containers resourcet stm transformers transformers-base @@ -136427,6 +143288,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-var" = callPackage + ({ mkDerivation, base, base-compat, stm }: + mkDerivation { + pname = "monad-var"; + version = "0.2.1.0"; + sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88"; + libraryHaskellDepends = [ base base-compat stm ]; + homepage = "https://github.com/effectfully/monad-var#readme"; + description = "Generic operations over variables"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monad-wrap" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -136436,6 +143309,7 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Wrap functions such as catch around different monads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monadIO" = callPackage @@ -136504,8 +143378,8 @@ self: { }: mkDerivation { pname = "monadcryptorandom"; - version = "0.7.1"; - sha256 = "1rxrqs52a58y4bhbhw4p5m7hznbcn3ivvl18p9zkbliwfispihw5"; + version = "0.7.2.1"; + sha256 = "03bn19wkshs9bjfl65p8klagydva6c543zasibv3y0w1hrpknib9"; libraryHaskellDepends = [ base bytestring crypto-api exceptions mtl tagged transformers transformers-compat @@ -136649,6 +143523,7 @@ self: { ]; description = "A simple and fast logging monad"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monadoid" = callPackage @@ -136711,10 +143586,9 @@ self: { }) {}; "monarch" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , doctest, hspec, lifted-base, monad-control, mtl, network - , pool-conduit, stm, tokyotyrant-haskell, transformers - , transformers-base + ({ mkDerivation, base, binary, bytestring, containers, doctest + , lifted-base, monad-control, mtl, network, pool-conduit, stm + , transformers, transformers-base }: mkDerivation { pname = "monarch"; @@ -136724,12 +143598,7 @@ self: { base binary bytestring containers lifted-base monad-control mtl network pool-conduit stm transformers transformers-base ]; - testHaskellDepends = [ - base bytestring doctest hspec transformers - ]; - benchmarkHaskellDepends = [ - base bytestring criterion tokyotyrant-haskell - ]; + testHaskellDepends = [ base doctest ]; homepage = "https://github.com/notogawa/monarch"; description = "Monadic interface for TokyoTyrant"; license = stdenv.lib.licenses.bsd3; @@ -136796,8 +143665,10 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.3.0"; - sha256 = "024w6183nnaq30r9jnfiy5pjv422mnnkawqdgzgzafngi7sad322"; + version = "2.3.0.5"; + sha256 = "13pa30qgk08846hngh9gy1w6ay0amchwr8aj32558i41nnrhl9j9"; + revision = "2"; + editedCabalFile = "0bx2vdwp53c9dgil09qg22hd1j1dilwqcg6ighp28ajmnxkyl8j0"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -136808,9 +143679,9 @@ self: { 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 + bytestring containers criterion cryptohash data-default-class + 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"; @@ -136892,7 +143763,7 @@ self: { ]; description = "A system state collecting library and application"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mono-foldable" = callPackage @@ -136909,15 +143780,15 @@ self: { }) {}; "mono-traversable" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, foldl + ({ mkDerivation, base, bytestring, containers, foldl, gauge , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split , text, transformers, unordered-containers, vector , vector-algorithms }: mkDerivation { pname = "mono-traversable"; - version = "1.0.4.0"; - sha256 = "0qwmzjf25gradzajr4f9zw3a48m4hw26qvqnb134daqkyxpkzf13"; + version = "1.0.8.1"; + sha256 = "0d9r6z3a8gkhl1j5yq8hjg5wcndi5yixxm9xwbrf4z6pgdwr04lr"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -136926,8 +143797,8 @@ self: { 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"; + benchmarkHaskellDepends = [ base gauge mwc-random vector ]; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; }) {}; @@ -136962,6 +143833,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monoid" = callPackage + ({ mkDerivation, base, containers, lens, mtl }: + mkDerivation { + pname = "monoid"; + version = "0.1.8"; + sha256 = "15mwj4w46wszawhiabykamaf020m795zg017jb2j49gpzk8abqjf"; + libraryHaskellDepends = [ base containers lens mtl ]; + homepage = "https://github.com/luna/monoid"; + description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used."; + license = stdenv.lib.licenses.asl20; + }) {}; + "monoid-absorbing" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -136979,10 +143862,8 @@ self: { }: mkDerivation { pname = "monoid-extras"; - version = "0.4.2"; - sha256 = "07r86ip6jfa2ka84dpilap01g1pg8r5bqz2nk7js6mlnbh2lxzqk"; - revision = "2"; - editedCabalFile = "04h78r48rg2ppi53869vb8y226g135fxgy9ryi1v08nqsiqi1vvw"; + version = "0.4.4"; + sha256 = "1ik88ilg5zjrajqllg3zjp92bz8mhvrc8q9mx6llkwry5k3avsfx"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion ]; description = "Various extra monoid-related definitions and utilities"; @@ -137031,7 +143912,6 @@ self: { homepage = "https://github.com/Shimuuar/monoid-statistics"; description = "Monoids for calculation of statistics of sample"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-subclasses" = callPackage @@ -137040,8 +143920,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "0.4.4"; - sha256 = "1ycrcrw3gnsb8zxx8hvrfclj1skfapkvxp37r2j4j31wjhv3fycp"; + version = "0.4.6"; + sha256 = "1rsipvaab5wpzi4qxzzb3gihg1gnsdiv0iz00gdskgjifggamh8m"; libraryHaskellDepends = [ base bytestring containers primes text vector ]; @@ -137052,29 +143932,31 @@ self: { homepage = "https://github.com/blamario/monoid-subclasses/"; description = "Subclasses of Monoid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-transformer" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, semigroups }: mkDerivation { pname = "monoid-transformer"; - version = "0.0.3"; - sha256 = "1f06ppvv50w5pacm4bs89zwkydih626cgbd2z6xqbp8cmhg6dj4l"; - libraryHaskellDepends = [ base ]; + version = "0.0.4"; + sha256 = "1243r77m5ywphwyhw7kn9vb2ha5m5zj375bd61fprdfiwi3z3as3"; + libraryHaskellDepends = [ base semigroups ]; description = "Monoid counterparts to some ubiquitous monad transformers"; license = stdenv.lib.licenses.bsd3; }) {}; "monoidal-containers" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype - , unordered-containers + , semigroups, unordered-containers }: mkDerivation { pname = "monoidal-containers"; - version = "0.3.0.2"; - sha256 = "1ivjf0wi77kf07jq6q8mf01bi8zr29qjkvsi2sqpm34kl7hlhsij"; + version = "0.3.1.0"; + sha256 = "11gpqp4c54q6kmsdfpl0lcrfj6687h51mjpgirl299j6bam2bhs4"; libraryHaskellDepends = [ - base containers deepseq hashable lens newtype unordered-containers + base containers deepseq hashable lens newtype semigroups + unordered-containers ]; homepage = "http://github.com/bgamari/monoidal-containers"; description = "Containers with monoidal accumulation"; @@ -137143,6 +144025,7 @@ self: { homepage = "http://github.com/bumptech/montage"; description = "Riak Resolution Proxy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {riak-bump = null; stats-web = null;}; @@ -137166,6 +144049,7 @@ self: { homepage = "http://github.com/bumptech/montage-haskell-client"; description = "Riak Resolution Proxy Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {riak-bump = null; stats-web = null;}; @@ -137256,6 +144140,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "more-containers" = callPackage + ({ mkDerivation, base, containers, hspec }: + mkDerivation { + pname = "more-containers"; + version = "0.1.0.5"; + sha256 = "1q1fs56a61ryild0zp43ash5mm83162v5v61x29vmc3hv1h79bnm"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + homepage = "https://github.com/mtth/more-containers#readme"; + description = "A few more collections"; + license = stdenv.lib.licenses.mit; + }) {}; + "more-extensible-effects" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -137326,31 +144223,31 @@ self: { executableHaskellDepends = [ base ]; description = "A simple database migrator for PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "morte" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers - , criterion, deepseq, Earley, http-client, http-client-tls - , microlens, microlens-mtl, mtl, optparse-applicative, pipes - , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit - , tasty-quickcheck, text, text-format, transformers + , criterion, deepseq, Earley, formatting, http-client + , http-client-tls, microlens, microlens-mtl, mtl + , optparse-applicative, pipes, QuickCheck, system-fileio + , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "morte"; - version = "1.6.11"; - sha256 = "10zwdf82hxjgxh7zs7wlnvyzjpaqalwj7rlg454jjlml59ifzvmw"; + version = "1.6.18"; + sha256 = "1cnwk2rihbywwkpxw7bd22zh33hkffpaza7d4crr5x2p7rdvhmjp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client + array base binary containers deepseq Earley formatting http-client http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers + system-filepath text transformers ]; libraryToolDepends = [ alex ]; executableHaskellDepends = [ - base code-page optparse-applicative text text-format + base code-page formatting optparse-applicative text ]; testHaskellDepends = [ base mtl QuickCheck system-filepath tasty tasty-hunit @@ -137470,20 +144367,23 @@ self: { }) {}; "movie-monad" = callPackage - ({ mkDerivation, base, gi-gdk, gi-gdkx11, gi-glib, gi-gobject - , gi-gst, gi-gstvideo, gi-gtk, gi-xlib, haskell-gi-base, MissingH - , process, text + ({ mkDerivation, base, bytestring, filepath, gi-gdk, gi-gdkpixbuf + , gi-glib, gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi + , haskell-gi-base, haskell-gi-overloading, MissingH, network-uri + , process, system-fileio, system-filepath, text, time }: mkDerivation { pname = "movie-monad"; - version = "0.0.1.0"; - sha256 = "02sj8x49lw80nhzlwsnddj7r9w6xfv1vks4rpgds89pmkr4b5bvn"; + version = "0.0.5.0"; + sha256 = "02hqkgz3855d3lgvyq6nyqm70x5c0ycfzvw6pxndhv8ly5i61nby"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base gi-gdk gi-gdkx11 gi-glib gi-gobject gi-gst gi-gstvideo gi-gtk - gi-xlib haskell-gi-base MissingH process text + base bytestring filepath gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-gst gi-gstvideo gi-gtk haskell-gi haskell-gi-base + haskell-gi-overloading MissingH network-uri process system-fileio + system-filepath text time ]; homepage = "https://github.com/lettier/movie-monad"; description = "Plays videos using GStreamer and GTK+"; @@ -137505,28 +144405,28 @@ self: { }) {}; "mp" = callPackage - ({ mkDerivation, base, binary, bytestring, ConfigFile, daemons - , directory, filepath, glib, gstreamer, hgettext, MissingH, mtl - , network, random, setlocale, text, unix, unordered-containers - , utf8-string, vty, vty-ui + ({ mkDerivation, async, base, binary, ConfigFile, containers + , daemons, directory, exceptions, filepath, gi-glib, gi-gobject + , gi-gst, haskell-gi-base, haskell-gi-overloading, lens, MissingH + , mtl, network, random, resourcet, simple-ui, template-haskell + , text, utf8-string, vty }: mkDerivation { pname = "mp"; - version = "0.2.2"; - sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir"; - revision = "1"; - editedCabalFile = "1cc85zdja69m16h32ii1jw1qkfz7jq3gp0m0m6pfaj146l8qcmwc"; + version = "1.0.2"; + sha256 = "07npcr1rjypjbxrv3hccqfac3piq00psc7yxgh7iw8pl8izqrwl7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base binary bytestring ConfigFile daemons directory filepath glib - gstreamer hgettext MissingH mtl network random setlocale text unix - unordered-containers utf8-string vty vty-ui + async base binary ConfigFile containers daemons directory + exceptions filepath gi-glib gi-gobject gi-gst haskell-gi-base + haskell-gi-overloading lens MissingH mtl network random resourcet + simple-ui template-haskell text utf8-string vty ]; - homepage = "https://bitbucket.org/borekpiotr/linux-music-player"; + homepage = "http://bitbucket.org/borekpiotr/linux-music-player"; description = "Music player for linux"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -137707,6 +144607,7 @@ self: { 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 @@ -137724,6 +144625,7 @@ self: { homepage = "http://github.com/k00mi/mqtt-hs"; description = "A MQTT client library"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mrifk" = callPackage @@ -137737,6 +144639,7 @@ self: { executableHaskellDepends = [ array base containers mtl ]; description = "Decompiles Glulx files"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mrm" = callPackage @@ -137967,12 +144870,10 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "mtl"; - version = "2.2.1"; - sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa"; - revision = "1"; - editedCabalFile = "0fsa965g9h23mlfjzghmmhcb9dmaq8zpm374gby6iwgdx47q0njb"; + version = "2.2.2"; + sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8"; libraryHaskellDepends = [ base transformers ]; - homepage = "http://github.com/ekmett/mtl"; + homepage = "http://github.com/haskell/mtl"; description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -137995,8 +144896,8 @@ self: { pname = "mtl-compat"; version = "0.2.1.3"; sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34"; - revision = "3"; - editedCabalFile = "0igfsrc7q326ggvw47xwq1xffa4r225akla0nwgmqhd7y1n5753c"; + revision = "4"; + editedCabalFile = "1mfrx8cpx0502sjv0bmlfkl0h46c4krldg8m89k4fj6iawwg2ab5"; libraryHaskellDepends = [ base mtl ]; doHaddock = false; homepage = "https://github.com/haskell-compat/mtl-compat"; @@ -138029,6 +144930,7 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Higher order versions of MTL classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mtl-prelude_1_0_3" = callPackage @@ -138057,15 +144959,14 @@ self: { }) {}; "mtl-tf" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "mtl-tf"; - version = "0.1"; - sha256 = "0qfmswdkj95bh6wkic8hh002wsxqlrylw45k6w9iyzv4saqnl22f"; - libraryHaskellDepends = [ base ]; - description = "Monad transformer library using type families"; + version = "0.2.1.0"; + sha256 = "0z9vinxhbbg4lpf8mxi0h3jbz4kv6x3ih05q44kjh4z8mpm9szzy"; + libraryHaskellDepends = [ base transformers ]; + description = "Monad Transformer Library with Type Families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mtl-unleashed" = callPackage @@ -138233,15 +145134,33 @@ self: { }) {}; "mulang" = callPackage - ({ mkDerivation, aeson, base, bytestring, haskell-src, hspec }: + ({ mkDerivation, aeson, alex, base, bytestring, containers, happy + , hashable, haskell-src, hspec, inflections, language-java + , language-javascript, neat-interpolation, parsec, ParsecTools + , process, scientific, split, text, unordered-containers, vector + }: mkDerivation { pname = "mulang"; - version = "0.1.0.0"; - 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"; - license = stdenv.lib.licenses.mit; + version = "3.6.1"; + sha256 = "0phpy2dickbam17n6ppq10qlfjxmhf1c7jb67qjk7672rxyrqfzb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable haskell-src inflections + language-java language-javascript parsec ParsecTools process + scientific split text unordered-containers vector + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + aeson base bytestring neat-interpolation process text + ]; + executableToolDepends = [ alex happy ]; + testHaskellDepends = [ + aeson base bytestring hspec neat-interpolation text + ]; + testToolDepends = [ alex happy ]; + description = "An intermediate language designed to perform advanced code analysis"; + license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -138285,8 +145204,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "multi-instance"; - version = "0.0.0.1"; - sha256 = "09kqgh966z2n54mkrm1hbllfl8cws6s8caqlld1p8z502axmy5sk"; + version = "0.0.0.2"; + sha256 = "11r7wy143zy9drjrz7l57bdsbaj2fd3sjwbiz7pcmcdr1bxxga63"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/chris-martin/multi-instance#readme"; @@ -138365,6 +145284,7 @@ self: { homepage = "xy30.com"; description = "create many files from one"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multifocal" = callPackage @@ -138487,6 +145407,7 @@ self: { homepage = "https://github.com/SupraSummus/haskell-multipath"; description = "Parser and builder for unix-path-like objects"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multiplate" = callPackage @@ -138537,14 +145458,13 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "multirec"; - version = "0.7.7"; - sha256 = "1rv2jfj9kz2lzspn5klrx7aibj0wqai3cqkd7rkmzdadhwz6ahpk"; + version = "0.7.8"; + sha256 = "0n5rsjrg8b98aim1wsv1s2i17299h8g4k2gb7mgn1swzldrigjhz"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic programming for families of recursive datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multirec-alt-deriver" = callPackage @@ -138631,6 +145551,27 @@ self: { homepage = "https://github.com/lspitzner/multistate"; description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "multistate_0_8_0_0" = callPackage + ({ mkDerivation, base, hspec, monad-control, mtl, tagged + , transformers, transformers-base + }: + mkDerivation { + pname = "multistate"; + version = "0.8.0.0"; + sha256 = "0sax983yjzcbailza3fpjjszg4vn0wb11wjr11jskk22lccbagq1"; + revision = "1"; + editedCabalFile = "1p5xf8i7y56fb4m7is0x1z852cq82sv0342z1h4qz1mi8vpln7zz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base monad-control mtl tagged transformers transformers-base + ]; + testHaskellDepends = [ base hspec transformers ]; + homepage = "https://github.com/lspitzner/multistate"; + description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -138802,6 +145743,7 @@ self: { homepage = "https://github.com/elaye/mushu#README.md"; description = "Minimalist MPD client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "music-articulation" = callPackage @@ -139028,6 +145970,7 @@ self: { ]; description = "Utility for developing the Music Suite"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "musicbrainz-email" = callPackage @@ -139108,8 +146051,8 @@ self: { }: mkDerivation { pname = "mustache"; - version = "2.2.3"; - sha256 = "1gy21h97ckjy7lkncm7zyn7bfcpyj488cc7cqy65qapryr9sa5aj"; + version = "2.3.0"; + sha256 = "1q3vadcvv2pxg6rpp92jq5zy784jxphdfpf6xn9y6wg9g3jn7201"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139176,21 +146119,21 @@ self: { }) {}; "mutable-containers" = callPackage - ({ mkDerivation, base, containers, criterion, ghc-prim, hspec + ({ mkDerivation, base, containers, gauge, ghc-prim, hspec , mono-traversable, primitive, QuickCheck, vector }: mkDerivation { pname = "mutable-containers"; - version = "0.3.3"; - sha256 = "1svwa54prfdmhdlmv118lnkwv3jx3rx7v5x30wbdsy39n75kjyks"; + version = "0.3.4"; + sha256 = "0zhkhlvg9yw45fg3srvzx7j81547djpkfw7higdvlj7fmph6c6b4"; libraryHaskellDepends = [ base containers ghc-prim mono-traversable primitive vector ]; testHaskellDepends = [ base containers hspec primitive QuickCheck vector ]; - benchmarkHaskellDepends = [ base containers criterion ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + benchmarkHaskellDepends = [ base containers gauge vector ]; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Abstactions and concrete implementations of mutable containers"; license = stdenv.lib.licenses.mit; }) {}; @@ -139236,10 +146179,10 @@ self: { ({ mkDerivation, base, safe-exceptions }: mkDerivation { pname = "mvar-lock"; - version = "0.1.0.0"; - sha256 = "1j38hjj7nqz9f8qs0a2kvgh9v80l7ip16fm9qjl675hj479z668p"; + version = "0.1.0.1"; + sha256 = "0kdf7811kxwfj032d8g18za0nn9jlssh7dpvvr8kzjk01b77804r"; libraryHaskellDepends = [ base safe-exceptions ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/mvar-lock"; description = "A trivial lock based on MVar"; license = stdenv.lib.licenses.asl20; }) {}; @@ -139250,8 +146193,8 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.1.5"; - sha256 = "18izqidmhiw2b3xs0q8w7dv73v3300d2xqk3prnk70326bsrvrid"; + version = "1.1.6"; + sha256 = "1n7mdyz781cr0mmfcrj8agx3zdd6qh7hlb98kd63bz9msri4zfrz"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -139296,10 +146239,8 @@ self: { ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; - version = "1.3.0"; - sha256 = "0vqzzsifar0q33ar1583c0g7250bi8fwpjpiwdq7gsigz8isd6qg"; - revision = "1"; - editedCabalFile = "1b1w504ycphpkcq279bjr2m1laxmv7xzhrbqaf6ayym265f75mnb"; + version = "2.0.2"; + sha256 = "1v2k0vpz33xmf58dhidwnjjvhkczfqizlcgwalf1vk19sw1ls3x5"; libraryHaskellDepends = [ base mwc-random primitive transformers ]; homepage = "http://github.com/jtobin/mwc-probability"; description = "Sampling function-based probability distributions"; @@ -139307,10 +146248,7 @@ self: { }) {}; "mwc-random" = callPackage - ({ mkDerivation, base, HUnit, math-functions, primitive, QuickCheck - , statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, vector - }: + ({ mkDerivation, base, math-functions, primitive, time, vector }: mkDerivation { pname = "mwc-random"; version = "0.13.6.0"; @@ -139318,10 +146256,6 @@ self: { libraryHaskellDepends = [ base math-functions primitive time vector ]; - testHaskellDepends = [ - base HUnit QuickCheck statistics test-framework - test-framework-hunit test-framework-quickcheck2 vector - ]; doCheck = false; homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; @@ -139334,8 +146268,8 @@ self: { pname = "mwc-random-accelerate"; version = "0.1.0.0"; sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih"; - revision = "1"; - editedCabalFile = "0xgl1glq4jxs48x7wp8wh6pk3zad8483bvppwp89p3k0vlh6yqq3"; + revision = "2"; + editedCabalFile = "16llz1jvpq841a20wvv2j8kkb357y970i54w340hwk4c187hypic"; libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; @@ -139393,6 +146327,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mxnet-nn" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , exceptions, ghc-prim, lens, mmorph, mtl, mxnet, resourcet + , streaming, streaming-bytestring, streaming-utils + , unordered-containers, vector + }: + mkDerivation { + pname = "mxnet-nn"; + version = "0.0.1.2"; + sha256 = "0w5ri77ccav65dza3a4aanzvylcwscs4rf4yqylc12w03xh0rshp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lens mtl mxnet resourcet unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions ghc-prim + mmorph mtl mxnet resourcet streaming streaming-bytestring + streaming-utils unordered-containers vector + ]; + homepage = "http://github.com/pierric/mxnet-nn"; + description = "Train a neural network with MXNet in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mxnet-nnvm" = callPackage ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }: mkDerivation { @@ -139408,6 +146368,56 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mxnet;}; + "my-package-testing" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "my-package-testing"; + version = "1.0.6"; + sha256 = "188f5k556z8pxg67l16si99n4h4c408za8n123p3y0c95ixnvr4h"; + revision = "1"; + editedCabalFile = "03x6fh9c0d9l0klv67v3kwy5qf78cmy3qxwvmyz2pmrknc4cmkvs"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs text + ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "my-test-docs" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "my-test-docs"; + version = "1.0.12"; + sha256 = "1q3fzwqyams7748cy8q7adkn93jh4dds83x0ns44n9ca4myjvrxj"; + revision = "1"; + editedCabalFile = "0mzmqcz800pacp1h4qwz6ynjqr7jsjgq3xkrzvxkx7s32gmqkzyn"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs text + ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "spam"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "myTestlll" = callPackage ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring , Cabal, CCA, containers, deepseq, Euterpea, ghc-prim, HCodecs @@ -139434,6 +146444,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "myanimelist-export" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit + , conduit-extra, containers, directory, exceptions, http-client + , http-client-tls, network-uri, tagstream-conduit, text, yaml + }: + mkDerivation { + pname = "myanimelist-export"; + version = "0.2.0.0"; + sha256 = "1d9fqna5qavp1lzpsg8yg816m3smybdsx25gafqr9wc2555rj1gg"; + revision = "1"; + editedCabalFile = "1ni5bmhfra2rlxlv55iah865shyibz7bwl2zz6161v4s35bs68dj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring conduit containers exceptions http-client + network-uri tagstream-conduit text + ]; + executableHaskellDepends = [ + aeson base bytestring conduit conduit-extra directory http-client + http-client-tls network-uri text yaml + ]; + homepage = "https://github.com/mat8913/myanimelist-export#readme"; + description = "Export from MyAnimeList"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mybitcoin-sci" = callPackage ({ mkDerivation, base, cgi, curl, directory, mtl, process, split }: mkDerivation { @@ -139445,6 +146482,7 @@ self: { ]; description = "Binding to mybitcoin.com's Shopping Cart Interface."; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "myo" = callPackage @@ -139514,8 +146552,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.4"; - sha256 = "13k6vdmkdbhjlgfsjw6r2smrxhkbiqkw9rdnfx554lc843dpb1lv"; + version = "0.1.5"; + sha256 = "0x9hdwg94s0baw7jn7ba2mk0rr7qpf1hyf88pm6gv4vdgz86gcs9"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ mysql ]; @@ -139545,30 +146583,6 @@ self: { }) {}; "mysql-haskell" = 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.0.0"; - 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; - }) {}; - - "mysql-haskell_0_8_3_0" = callPackage ({ mkDerivation, base, binary, binary-ieee754, binary-parsers , blaze-textual, bytestring, bytestring-lexing, cryptonite , io-streams, memory, monad-loops, network, scientific, tasty @@ -139609,27 +146623,10 @@ self: { homepage = "https://github.com/lorenzo/mysql-haskell-nem#readme"; description = "Adds a interface like mysql-simple to mysql-haskell"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "mysql-haskell-openssl" = callPackage - ({ mkDerivation, base, HsOpenSSL, io-streams, mysql-haskell - , network, tcp-streams, tcp-streams-openssl, wire-streams - }: - mkDerivation { - pname = "mysql-haskell-openssl"; - version = "0.8.0.0"; - sha256 = "05mn4zzjk9g5csy4yk2qdc2brl5h879ajh7pq98dl67f6jlg6gb5"; - libraryHaskellDepends = [ - base HsOpenSSL io-streams mysql-haskell network tcp-streams - tcp-streams-openssl wire-streams - ]; - homepage = "https://github.com/winterland1989/mysql-haskell"; - description = "TLS support for mysql-haskell package using openssl"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mysql-haskell-openssl_0_8_3_0" = callPackage + "mysql-haskell-openssl" = callPackage ({ mkDerivation, base, binary, HsOpenSSL, mysql-haskell , tcp-streams, tcp-streams-openssl, wire-streams }: @@ -139649,18 +146646,18 @@ self: { "mysql-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light - , text, time + , blaze-textual, bytestring, containers, hspec, mysql, old-locale + , pcre-light, text, time }: mkDerivation { pname = "mysql-simple"; - version = "0.4.4"; - sha256 = "1rrwhc9szdsn1wm5y510kyj0cfhavw01j61vywf96yw57132y75m"; + version = "0.4.5"; + sha256 = "1cbwdsxysz6a4182fgkkd869hm44v834lqv2igwsfbx6v0p44g5h"; libraryHaskellDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual - bytestring mysql old-locale pcre-light text time + bytestring containers mysql old-locale pcre-light text time ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base blaze-builder hspec text ]; homepage = "https://github.com/paul-rouse/mysql-simple"; description = "A mid-level MySQL client library"; license = stdenv.lib.licenses.bsd3; @@ -139756,6 +146753,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "n-ary-functor" = callPackage + ({ mkDerivation, base, doctest, doctest-discover }: + mkDerivation { + pname = "n-ary-functor"; + version = "0.1.0.0"; + sha256 = "1v1ki6mfgj7jhj7w94w15sisd57akwlb0c2s3bczvj47f7f8p7vi"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest doctest-discover ]; + homepage = "https://github.com/gelisam/n-ary-functor"; + description = "An n-ary version of Functor"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "n-m" = callPackage ({ mkDerivation, base, HSH, mtl, process }: mkDerivation { @@ -139774,8 +146785,8 @@ self: { ({ mkDerivation, base, singletons, vector }: mkDerivation { pname = "n-tuple"; - version = "0.0.1.1"; - sha256 = "1pwz4rs0bbanhlwcm7v06s4dkwr3h41w203kab1s7k201na7j9r1"; + version = "0.0.2.0"; + sha256 = "0gq2s7cfivzspr446h21c79md6wzg2q8wzmx8kivbxiixsr3bxva"; libraryHaskellDepends = [ base singletons vector ]; homepage = "https://github.com/athanclark/n-tuple#readme"; description = "Homogeneous tuples of arbitrary length"; @@ -139844,31 +146855,35 @@ self: { "nakadi-client" = callPackage ({ mkDerivation, aeson, aeson-casing, async, base, bytestring , classy-prelude, conduit, conduit-combinators, conduit-extra - , containers, hashable, http-client, http-client-tls, http-conduit - , http-types, iso8601-time, lens, lens-aeson, monad-logger, mtl + , containers, exceptions, fast-logger, hashable, http-client + , http-client-tls, http-conduit, http-types, iso8601-time, lens + , lens-aeson, lifted-async, monad-control, monad-logger, mtl , random, resourcet, retry, safe-exceptions, say, scientific, split - , tasty, tasty-hunit, template-haskell, text, time, transformers - , unordered-containers, uuid, vector + , stm, stm-chans, stm-conduit, tasty, tasty-hunit, template-haskell + , text, time, transformers, transformers-base, unliftio + , unliftio-core, unordered-containers, uuid, vector, wai, warp }: mkDerivation { pname = "nakadi-client"; - version = "0.3.0.0"; - sha256 = "14cr81b6x7cf10zja1vvpqhz9wanq50wwxhkvfx8w1s44skwvasy"; + version = "0.5.0.3"; + sha256 = "0c0jrvvlk3mxwka6b1996gylgkhqqh023wc4vxg98qaaxpy851x4"; libraryHaskellDepends = [ aeson aeson-casing base bytestring conduit conduit-combinators - conduit-extra containers hashable http-client http-client-tls - http-conduit http-types iso8601-time lens monad-logger mtl - resourcet retry safe-exceptions scientific split tasty - template-haskell text time transformers unordered-containers uuid - vector + conduit-extra containers exceptions hashable http-client + http-client-tls http-conduit http-types iso8601-time lens + monad-control monad-logger mtl resourcet retry safe-exceptions + scientific split template-haskell text time transformers + transformers-base unliftio-core unordered-containers uuid vector ]; testHaskellDepends = [ aeson aeson-casing async base bytestring classy-prelude conduit - conduit-combinators conduit-extra containers hashable http-client - http-client-tls http-conduit http-types iso8601-time lens - lens-aeson monad-logger mtl random resourcet retry safe-exceptions - say scientific split tasty tasty-hunit template-haskell text time - transformers unordered-containers uuid vector + conduit-combinators conduit-extra containers exceptions fast-logger + hashable http-client http-client-tls http-conduit http-types + iso8601-time lens lens-aeson lifted-async monad-control + monad-logger mtl random resourcet retry safe-exceptions say + scientific split stm stm-chans stm-conduit tasty tasty-hunit + template-haskell text time transformers transformers-base unliftio + unliftio-core unordered-containers uuid vector wai warp ]; homepage = "https://github.com/mtesseract/nakadi-haskell#readme"; description = "Client library for the Nakadi Event Broker"; @@ -139880,8 +146895,8 @@ self: { ({ mkDerivation, aeson, attoparsec, base, lens, text, wreq }: mkDerivation { pname = "namecoin-update"; - version = "0.2.1.0"; - sha256 = "1vz4n57xk8zbyqiwsm69mls31f36ng0bh9av5axi3rq7car2jlxz"; + version = "0.2.2.0"; + sha256 = "09g3mjvmfgynlna17nvynh1gwzkski0kg07d82zvdmd7j8qvdrvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base lens text wreq ]; @@ -139890,6 +146905,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "named" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "named"; + version = "0.1.0.0"; + sha256 = "0n26085hhqcqazwb02j5ippicl04caln935dbsq8sgkaj1imryp7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Named parameters (keyword arguments) for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "named-formlet" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, mtl , text, transformers @@ -140124,17 +147151,18 @@ self: { ({ mkDerivation, base, hspec, silently }: mkDerivation { pname = "nanospec"; - version = "0.2.1"; - sha256 = "0jq2l1lmy4hcl6r975xcg86xr1y7jfxr3qn27ibsmjbzlnxdkjyv"; + version = "0.2.2"; + sha256 = "1rcmhl9bhyfvanalnf1r86wkx6rq6wdvagnw1h011jcnnb1cq56g"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec silently ]; + homepage = "https://github.com/hspec/nanospec#readme"; description = "A lightweight implementation of a subset of Hspec's API"; license = stdenv.lib.licenses.mit; }) {}; "nanovg" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, freeglut, GLEW - , hspec, inline-c, mesa, QuickCheck, text, vector + ({ mkDerivation, base, bytestring, c2hs, containers, GLEW, hspec + , inline-c, libGL, libGLU, QuickCheck, text, vector }: mkDerivation { pname = "nanovg"; @@ -140145,14 +147173,14 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers text vector ]; - librarySystemDepends = [ freeglut GLEW mesa ]; + librarySystemDepends = [ GLEW libGL libGLU ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; homepage = "https://github.com/cocreature/nanovg-hs"; description = "Haskell bindings for nanovg"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; - }) {GLEW = null; inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + }) {GLEW = null; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; "nanq" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers @@ -140286,14 +147314,41 @@ self: { ({ mkDerivation }: mkDerivation { pname = "nats"; - version = "1.1.1"; - sha256 = "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k"; + version = "1.1.2"; + sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr"; doHaddock = false; homepage = "http://github.com/ekmett/nats/"; description = "Natural numbers"; license = stdenv.lib.licenses.bsd3; }) {}; + "nats-client" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , criterion, data-default, exceptions, hedgehog, hslogger + , monad-control, mtl, network, random, resource-pool + , test-framework, text, time, transformers + }: + mkDerivation { + pname = "nats-client"; + version = "0.1.0.0"; + sha256 = "0xpxsz0y3f7mgqbbhk33yd9n7q260h3lf7brynmvqwmfbbkplkrg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers data-default exceptions + hslogger monad-control network random resource-pool text + transformers + ]; + executableHaskellDepends = [ base bytestring network ]; + testHaskellDepends = [ + aeson base bytestring hedgehog mtl test-framework + ]; + benchmarkHaskellDepends = [ base criterion time ]; + homepage = "https://bitbucket.org/jpgneves/nats-client#readme"; + description = "Another Haskell client for NATS (https://nats.io)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nats-queue" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , dequeue, hspec, network, network-uri, random, text @@ -140312,7 +147367,17 @@ self: { ]; description = "Haskell API for NATS messaging system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "natural-induction" = callPackage + ({ mkDerivation, base, peano }: + mkDerivation { + pname = "natural-induction"; + version = "0.2.0.0"; + sha256 = "1brkmvkwpgqsxra210h8fkb9bpvawmbdwwvvhsd58kzmkd599alr"; + libraryHaskellDepends = [ base peano ]; + description = "Induction over natural numbers"; + license = stdenv.lib.licenses.bsd3; }) {}; "natural-number" = callPackage @@ -140364,8 +147429,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "2"; - editedCabalFile = "1j90pd1zznr18966axskad5w0kx4dvqg62r65rmw1ihqwxm1ndix"; + revision = "4"; + editedCabalFile = "1zppa1fcc7pl7ak0hs3w3pkx34398nrfiiwa3w689ib08kqkdpby"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -140423,8 +147488,8 @@ self: { }: mkDerivation { pname = "nbt"; - version = "0.6"; - sha256 = "0lcnxlj0cfrw840saay3lxyjmc00rxhksqa6ccyhg8119y20gcjd"; + version = "0.7"; + sha256 = "10iby4sg50la1k635ygdqf5h50rvidl0k871brdjs8b9hi1vlv5r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring cereal text ]; testHaskellDepends = [ @@ -140658,8 +147723,8 @@ self: { }: mkDerivation { pname = "nemesis"; - version = "2016.3.19"; - sha256 = "0dc62gnpf0brcl8dxxnhmmagd95xf61mq5bij5vgr8jwiisq69d7"; + version = "2018.1.27"; + sha256 = "197ajy30wxhfccn0h0crwkgbl7zhlb3w37h4zxplyxz2az1s1bvr"; libraryHaskellDepends = [ base containers directory dlist Glob lens mtl process time ]; @@ -140761,42 +147826,48 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nest" = callPackage + ({ mkDerivation, base, bytestring, containers, hedgehog, text + , transformers, unix + }: + mkDerivation { + pname = "nest"; + version = "0.0.1"; + sha256 = "1ndd93z9yqa1slhb8wq3j5fr3rc2fna0cb5xqh9s3dynb966zqqk"; + libraryHaskellDepends = [ + base bytestring containers text transformers unix + ]; + testHaskellDepends = [ base bytestring containers hedgehog text ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nested-routes" = callPackage - ({ mkDerivation, attoparsec, base, bifunctors, bytestring - , composition-extra, errors, exceptions, extractable-singleton - , hashable, hashtables, HSet, hspec, hspec-wai, http-types - , monad-control-aligned, 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, warp + ({ mkDerivation, attoparsec, base, errors, exceptions + , extractable-singleton, hashable, hspec, hspec-wai, http-types + , monad-control-aligned, mtl, poly-arity, pred-trie, regex-compat + , tasty, tasty-hspec, text, tries, unordered-containers, wai + , wai-middleware-content-type, wai-middleware-verbs + , wai-transformers }: mkDerivation { pname = "nested-routes"; - version = "8.0.1"; - sha256 = "19m1aqhyzs86gdskv93lgr1rfgqy3spxz4sv21ych1mw719q0lzl"; - isLibrary = true; - isExecutable = true; + version = "9.0.0.1"; + sha256 = "1y9562nq2hylcd0ahc28cfb9q1bsl4dg8ilrdsy64ls776dkj951"; libraryHaskellDepends = [ - attoparsec base bifunctors bytestring errors exceptions - extractable-singleton hashable hashtables monad-control-aligned mtl - poly-arity pred-set pred-trie regex-compat semigroups text - transformers tries unordered-containers wai-middleware-content-type + attoparsec base errors exceptions extractable-singleton hashable + monad-control-aligned mtl poly-arity pred-trie regex-compat text + tries unordered-containers wai wai-middleware-content-type wai-middleware-verbs wai-transformers ]; - executableHaskellDepends = [ - attoparsec base bytestring composition-extra errors exceptions - hashable hashtables HSet http-types mtl poly-arity pred-set - pred-trie regex-compat semigroups text transformers tries - unordered-containers wai-middleware-content-type - wai-middleware-verbs wai-transformers warp - ]; testHaskellDepends = [ - 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 + attoparsec base errors exceptions extractable-singleton hashable + hspec hspec-wai http-types monad-control-aligned mtl poly-arity + pred-trie regex-compat tasty tasty-hspec text tries + unordered-containers wai wai-middleware-content-type wai-middleware-verbs wai-transformers ]; + homepage = "https://github.com/athanclark/nested-routes#readme"; description = "Declarative, compositional Wai responses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -140862,6 +147933,7 @@ self: { homepage = "http://phaul.hobby-site.org/node/4123"; description = "Concurrent over the network execution library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -140875,6 +147947,7 @@ self: { homepage = "http://netclock.slab.org/"; description = "Netclock protocol"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netcore" = callPackage @@ -140940,6 +148013,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "netlib-carray" = callPackage + ({ mkDerivation, base, carray, netlib-ffi, transformers }: + mkDerivation { + pname = "netlib-carray"; + version = "0.0.1.1"; + sha256 = "1vxyffhpayyxwak36b9i7gw35gz61ym9lxnhk45l0h4js3v05iwv"; + libraryHaskellDepends = [ base carray netlib-ffi transformers ]; + homepage = "http://hub.darcs.net/thielema/netlib-carray/"; + description = "Helper modules for CArray wrappers to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "netlib-ffi" = callPackage + ({ mkDerivation, base, storable-complex, transformers }: + mkDerivation { + pname = "netlib-ffi"; + version = "0.0.1"; + sha256 = "1v973ibi6jsv09q3n9bmyavv9wqvnljzr9nrvf4pbi6p5l2kyjnw"; + libraryHaskellDepends = [ base storable-complex transformers ]; + homepage = "http://hub.darcs.net/thielema/netlib-ffi/"; + description = "Helper modules for FFI to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "netlib-ffi_0_1" = callPackage + ({ mkDerivation, base, storable-complex, transformers }: + mkDerivation { + pname = "netlib-ffi"; + version = "0.1"; + sha256 = "0ckwa5r8fx2j7qb5phy6gm3xbg9crr9amglcicdxgnzgjd8aap2h"; + libraryHaskellDepends = [ base storable-complex transformers ]; + homepage = "http://hub.darcs.net/thielema/netlib-ffi/"; + description = "Helper modules for FFI to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "netlines" = callPackage ({ mkDerivation, base, bytestring, contstuff, enumerator, HTF , random, text, time @@ -140965,8 +148075,8 @@ self: { }: mkDerivation { pname = "netlink"; - version = "1.1.0.0"; - sha256 = "10zhvpvf677cf660gyc299sfg8fwlg9iq7gdpawdmqxj49w9mxa8"; + version = "1.1.1.0"; + sha256 = "1q8sxycv93sap6dgbw70scklnpjj5vav6qlvsxm5500jlvb3jnf0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140976,7 +148086,6 @@ self: { homepage = "https://github.com/Ongy/netlink-hs"; description = "Netlink communication for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "netlist" = callPackage @@ -140994,8 +148103,8 @@ self: { ({ mkDerivation, base, netlist, pretty }: mkDerivation { pname = "netlist-to-vhdl"; - version = "0.3.2"; - sha256 = "107pkkihj62qjkfwrnhwfscpph5r76lx6r3s0m3b0dbsf1jy2a61"; + version = "0.3.3"; + sha256 = "1f62l4i1l1z47gbrv49xx5y78ykcf6iq6bish3sx5fw46mhcr1j4"; libraryHaskellDepends = [ base netlist pretty ]; description = "Convert a Netlist AST to VHDL"; license = stdenv.lib.licenses.bsd3; @@ -141031,8 +148140,8 @@ self: { pname = "netrc"; version = "0.2.0.0"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "3"; - editedCabalFile = "1j0s7r9hzisi8zacs505rxh9pk05m5hrrcxn8jnh7w8yphyqbv4j"; + revision = "4"; + editedCabalFile = "0g1c3nbalpb7qh6kddir5b84wwg57j2852al2fg5xza3akdd8jsr"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -141040,6 +148149,27 @@ self: { homepage = "https://github.com/hvr/netrc"; description = "Parser for .netrc files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "netrium" = callPackage + ({ mkDerivation, base, containers, directory, filepath, HaXml + , pretty, process, time + }: + mkDerivation { + pname = "netrium"; + version = "0.6.0"; + sha256 = "1cs6fxg0cpd2d1vhkzaazpzxya6n6cxlsnnwy3lnvqbaz68sipc0"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base containers HaXml process time ]; + executableHaskellDepends = [ + base containers directory filepath HaXml pretty process + ]; + description = "Contract normaliser and simulator"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netspec" = callPackage @@ -141156,8 +148286,8 @@ self: { }: mkDerivation { pname = "netwire"; - version = "5.0.2"; - sha256 = "10yd28himql3gkilxzwky3d87k2nva43vmb7s5ayaqicchchyyad"; + version = "5.0.3"; + sha256 = "0bi2xyipz11vsai4wghdrh5yywzl0bkinfpmh0qdp77y7qlygpgi"; libraryHaskellDepends = [ base containers deepseq parallel profunctors random semigroups time transformers @@ -141168,28 +148298,29 @@ self: { }) {}; "netwire-input" = callPackage - ({ mkDerivation, base, netwire }: + ({ mkDerivation, base, deepseq, netwire }: mkDerivation { pname = "netwire-input"; - version = "0.0.6"; - sha256 = "13mq1pxp844brqi6pkgjprcgwdgc8xsx6zhjxzm7311mf4iwa12a"; - libraryHaskellDepends = [ base netwire ]; + version = "0.0.7"; + sha256 = "1f9xxlcpy2brqn5hv0mdc428fav402jsqa1b8h4s8b09qa3v1ii9"; + libraryHaskellDepends = [ base deepseq netwire ]; homepage = "https://www.github.com/Mokosha/netwire-input"; description = "Input handling abstractions for netwire"; license = stdenv.lib.licenses.mit; }) {}; "netwire-input-glfw" = callPackage - ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm + ({ mkDerivation, base, containers, deepseq, GLFW-b, mtl + , netwire-input, stm }: mkDerivation { pname = "netwire-input-glfw"; - version = "0.0.6"; - sha256 = "01nxv6bkwhafk5dg85lg5ggcvqlhv2kiwnm75zbscp002pwmq2fx"; + version = "0.0.10"; + sha256 = "1r186xwr5lycs0snr8amvyxvbq2l5jd9p20v8n12zyjm60kmi90y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers GLFW-b mtl netwire-input stm + base containers deepseq GLFW-b mtl netwire-input stm ]; homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; @@ -141255,26 +148386,20 @@ self: { }) {}; "network" = callPackage - ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework - , test-framework-hunit, unix - }: + ({ mkDerivation, base, bytestring, doctest, hspec, HUnit, unix }: mkDerivation { pname = "network"; - version = "2.6.3.2"; - sha256 = "1dn092zfqmxfbzln6d0khka4gizzjivf2yja9w9hwb5g9q3pfi1m"; - revision = "1"; - editedCabalFile = "17234sy0vqic8g9wg8gmfmc0by50scjwbdk8bkcl9kjf3fvs4nyx"; + version = "2.6.3.5"; + sha256 = "0h84pv672psxhh5ls407w175cik0gbyx39zynzmw991hr7jgc64s"; libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ - base bytestring doctest HUnit test-framework test-framework-hunit - ]; + testHaskellDepends = [ base bytestring doctest hspec HUnit ]; homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; }) {}; "network-address" = callPackage - ({ mkDerivation, base, Cabal, criterion, QuickCheck, test-framework + ({ mkDerivation, base, Cabal, QuickCheck, test-framework , test-framework-quickcheck2 }: mkDerivation { @@ -141284,7 +148409,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal ]; - executableHaskellDepends = [ base Cabal criterion ]; testHaskellDepends = [ base Cabal QuickCheck test-framework test-framework-quickcheck2 ]; @@ -141355,8 +148479,8 @@ self: { }: mkDerivation { pname = "network-api-support"; - version = "0.3.2"; - sha256 = "1wzigwxdql9v6m9kwvnlgaachkr0rk9ldghnazrkkxba8di5kpsi"; + version = "0.3.3"; + sha256 = "1dp9fp907sc1r0mshby18vlbkji9bggikbycjbdlb6mzg7mjmiav"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive http-client http-client-tls http-types text time tls @@ -141367,6 +148491,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-arbitrary" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, hspec + , hspec-discover, http-media, http-types, network-uri, QuickCheck + , test-invariant + }: + mkDerivation { + pname = "network-arbitrary"; + version = "0.3.0.0"; + sha256 = "13mr3gxgc4g1ij0fj8xwn1md0hi9l1gpka06y072ffh8ib7qg98c"; + libraryHaskellDepends = [ + base bytestring http-media http-types network-uri QuickCheck + ]; + testHaskellDepends = [ + base bytestring case-insensitive hspec http-media http-types + network-uri QuickCheck test-invariant + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/alunduil/network-arbitrary"; + description = "Arbitrary Instances for Network Types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, enclosed-exceptions , exceptions, hspec, lifted-base, monad-control, mtl, network @@ -141455,8 +148602,8 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.10"; - sha256 = "0fl6dxsarfrj0da3a1ajzisrnrgcjfwpag1997b0byvvkw47kspc"; + version = "1.0.11"; + sha256 = "1nkyj9114k2b6gwdd93yfrmf9zbziymbnbh3wxnz0vnk1hl2j5yq"; libraryHaskellDepends = [ base bytestring network text time vector ]; @@ -141480,17 +148627,16 @@ self: { "network-conduit-tls" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra - , connection, cprng-aes, data-default, HUnit, monad-control, mtl - , network, streaming-commons, tls, transformers, transformers-base + , connection, data-default-class, HUnit, mtl, network + , streaming-commons, tls, transformers, unliftio-core }: mkDerivation { pname = "network-conduit-tls"; - version = "1.2.2"; - sha256 = "11xh5g0c7arf6d0klilacajf2mg24pb47wbzwn2hb7fimkgwv8hj"; + version = "1.3.0"; + sha256 = "11a9s8spqccnv2x41846pqgkwvb554lrq7qdas78p7biw1d28vbl"; libraryHaskellDepends = [ - base bytestring conduit conduit-extra connection cprng-aes - data-default monad-control network streaming-commons tls - transformers transformers-base + base bytestring conduit conduit-extra connection data-default-class + network streaming-commons tls transformers unliftio-core ]; testHaskellDepends = [ base bytestring conduit conduit-extra connection HUnit mtl @@ -141546,22 +148692,26 @@ self: { }) {}; "network-dns" = callPackage - ({ mkDerivation, base, binary, bytestring, cereal, containers - , data-textual, hashable, network-ip, parsers, tagged, text-latin1 - , text-printer + ({ mkDerivation, base, bytestring, containers, data-serializer + , data-textual, hashable, network-ip, parsers, posix-socket + , text-latin1, text-printer, type-hint }: mkDerivation { pname = "network-dns"; - version = "1.0.0.1"; - sha256 = "0gg1g1gnbi6dzw5anz3dam2gh09q948d3k7q84agkswa64c0azn8"; + version = "1.1.0.1"; + sha256 = "0q709qfhph93k8yni6047yr2zhswmc3cvizyyk63vmh3h2dwfmgs"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base binary bytestring cereal containers data-textual hashable - network-ip parsers tagged text-latin1 text-printer + base bytestring containers data-serializer data-textual hashable + network-ip parsers text-latin1 text-printer type-hint + ]; + executableHaskellDepends = [ + base data-serializer data-textual network-ip posix-socket ]; homepage = "https://github.com/mvv/network-dns"; description = "Domain Name System data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-enumerator" = callPackage @@ -141620,8 +148770,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-info"; - version = "0.2.0.8"; - sha256 = "0xndvg776241fgjmynxfpy81f1csjmh8dg33yf0c8m71ychz3pzc"; + version = "0.2.0.10"; + sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; @@ -141712,22 +148862,28 @@ self: { "network-msgpack-rpc" = callPackage ({ mkDerivation, async, base, binary, binary-conduit, bytestring - , conduit, conduit-extra, data-default-class, data-msgpack + , conduit, conduit-extra, data-default-class + , data-default-instances-base, data-msgpack, data-msgpack-types , exceptions, hspec, MissingH, monad-control, mtl, network, tagged + , text }: mkDerivation { pname = "network-msgpack-rpc"; - version = "0.0.3"; - sha256 = "02r0qciia05sv3rkdfh4akl10m5w2ay2rc7hxfh2cvhj5789rgvl"; + version = "0.0.4"; + sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r"; + revision = "2"; + editedCabalFile = "0nw2pgyw077ncbmiij99xyy414635vvdmb2das7dkzppsfx47rn3"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra - data-default-class data-msgpack exceptions MissingH monad-control - mtl network tagged + data-default-class data-default-instances-base data-msgpack + data-msgpack-types exceptions MissingH monad-control mtl network + tagged text ]; testHaskellDepends = [ async base bytestring hspec mtl network ]; homepage = "http://msgpack.org/"; description = "A MessagePack-RPC Implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-multicast" = callPackage @@ -141788,7 +148944,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-xmpp/"; description = "Client library for the XMPP protocol"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-rpca" = callPackage @@ -141825,9 +148980,7 @@ self: { }) {}; "network-service" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, network - , network-simple - }: + ({ mkDerivation, base, base64-bytestring, bytestring, network }: mkDerivation { pname = "network-service"; version = "0.1.0.0"; @@ -141837,9 +148990,6 @@ self: { libraryHaskellDepends = [ base base64-bytestring bytestring network ]; - executableHaskellDepends = [ - base base64-bytestring bytestring network network-simple - ]; homepage = "https://github.com/angerman/network-service"; description = "Provide a service at the data type level"; license = stdenv.lib.licenses.mit; @@ -141950,24 +149100,6 @@ self: { }) {}; "network-transport" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, hashable - , transformers - }: - mkDerivation { - pname = "network-transport"; - version = "0.4.4.0"; - sha256 = "1n3ywsmbcsh35h5dcyxr50nfgxh5qq6i9wgskn9dc79vpjdvq4cf"; - revision = "1"; - editedCabalFile = "1gq1qnx3n59kci6imk2rf1dahvsq9ifsnb50fh98h9b7yhczj4ag"; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable transformers - ]; - homepage = "http://haskell-distributed.github.com"; - description = "Network abstraction layer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport_0_5_2" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, hashable , transformers }: @@ -141981,7 +149113,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Network abstraction layer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-amqp" = callPackage @@ -142011,20 +149142,6 @@ self: { }) {}; "network-transport-composed" = callPackage - ({ mkDerivation, base, bytestring, network-transport }: - mkDerivation { - pname = "network-transport-composed"; - version = "0.2.0.1"; - sha256 = "0kvj85yx7mvj1rjgv90cb9sfm9f4dqi8mahcp2bqxsn2w4n9wpwn"; - revision = "1"; - editedCabalFile = "1fwn9wix1k2kccs1dqp4z2ym98bskdkhjff9in7d6myaz93f23gw"; - libraryHaskellDepends = [ base bytestring network-transport ]; - homepage = "http://haskell-distributed.github.com"; - description = "Compose network transports"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport-composed_0_2_1" = callPackage ({ mkDerivation, base, bytestring, network-transport }: mkDerivation { pname = "network-transport-composed"; @@ -142034,7 +149151,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Compose network transports"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-inmemory" = callPackage @@ -142059,25 +149175,6 @@ self: { }) {}; "network-transport-tcp" = callPackage - ({ mkDerivation, base, bytestring, containers, data-accessor - , network, network-transport, network-transport-tests - }: - mkDerivation { - pname = "network-transport-tcp"; - version = "0.5.1"; - sha256 = "1svvxkxknlzdgc4xcr7lvq1xvy8ki3mwysfkk6y3w8gq11yxdhy4"; - libraryHaskellDepends = [ - base bytestring containers data-accessor network network-transport - ]; - testHaskellDepends = [ - base network network-transport network-transport-tests - ]; - homepage = "http://haskell-distributed.github.com"; - description = "TCP instantiation of Network.Transport"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport-tcp_0_6_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , network, network-transport, network-transport-tests }: @@ -142094,7 +149191,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-tests" = callPackage @@ -142116,10 +149212,9 @@ self: { "network-transport-zeromq" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers - , criterion, data-accessor, distributed-process - , distributed-process-tests, exceptions, network, network-transport - , network-transport-tests, random, semigroups, stm, stm-chans - , tasty, tasty-hunit, test-framework, transformers, zeromq4-haskell + , criterion, data-accessor, distributed-process, exceptions + , network-transport, network-transport-tests, random, semigroups + , stm, stm-chans, tasty, tasty-hunit, transformers, zeromq4-haskell }: mkDerivation { pname = "network-transport-zeromq"; @@ -142132,13 +149227,9 @@ self: { network-transport random semigroups stm stm-chans transformers zeromq4-haskell ]; - executableHaskellDepends = [ - base binary bytestring criterion distributed-process - ]; testHaskellDepends = [ - base bytestring containers distributed-process-tests network - network-transport network-transport-tests stm stm-chans tasty - tasty-hunit test-framework zeromq4-haskell + base network-transport network-transport-tests tasty tasty-hunit + zeromq4-haskell ]; benchmarkHaskellDepends = [ base binary bytestring criterion distributed-process @@ -142146,7 +149237,6 @@ self: { homepage = "https://github.com/tweag/network-transport-zeromq"; description = "ZeroMQ backend for network-transport"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-uri" = callPackage @@ -142184,20 +149274,23 @@ self: { }) {}; "network-uri-json" = callPackage - ({ mkDerivation, aeson, base, hspec, network-uri, QuickCheck - , test-invariant, text + ({ mkDerivation, aeson, base, hspec, hspec-discover + , network-arbitrary, network-uri, QuickCheck, test-invariant, text }: mkDerivation { pname = "network-uri-json"; - version = "0.1.0.0"; - sha256 = "0q4h37zf8n56s7jjd5nalk8q6q5hh5d612p7w9agjqwjhl26p782"; + version = "0.1.2.1"; + sha256 = "1xnlyghpyrbllzzr8bdmzgm12lsa1sg4miynh6d4awdppai9y433"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ - aeson base hspec network-uri QuickCheck test-invariant text + aeson base hspec network-arbitrary network-uri QuickCheck + test-invariant text ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/alunduil/network-uri-json"; description = "FromJSON and ToJSON Instances for Network.URI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-uri-static" = callPackage @@ -142214,6 +149307,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-voicetext" = callPackage + ({ mkDerivation, base, bytestring, exceptions, http-client-tls + , http-conduit, http-types, resourcet, transformers, utf8-string + }: + mkDerivation { + pname = "network-voicetext"; + version = "0.0.0.1"; + sha256 = "0fhmrif3liw61f17kl6208m4bhvdy57h9cpzdnv0af0rjnxgr7ki"; + libraryHaskellDepends = [ + base bytestring exceptions http-client-tls http-conduit http-types + resourcet transformers utf8-string + ]; + homepage = "https://github.com/zaneli/network-voicetext"; + description = "VoiceText Web API wrapper"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-wai-router" = callPackage ({ mkDerivation, base, wai }: mkDerivation { @@ -142249,8 +149360,8 @@ self: { pname = "networked-game"; version = "0.1.0.1"; sha256 = "12sy97cgqrsmqywh0cznp8wbsw8z2yahlfalsjy32qarcz44banz"; - revision = "2"; - editedCabalFile = "0bnf9c2f176f0sgxa7h78ikd6hn3rxz0xz31sjm0yzx1r7gaxzrw"; + revision = "4"; + editedCabalFile = "1rcqsw6f6b1a7sfk38hvil0278cxsq071jwwvfcsi6qhy6kb4jh0"; libraryHaskellDepends = [ base binary bytestring containers network time transformers ]; @@ -142380,9 +149491,8 @@ self: { "newt" = callPackage ({ mkDerivation, array, base, bytestring, cmdargs, containers - , directory, filemanip, filepath, HUnit, mtl, process, QuickCheck - , safe, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, Unixutils, uuid + , directory, filemanip, filepath, mtl, process, safe, text + , Unixutils }: mkDerivation { pname = "newt"; @@ -142394,11 +149504,7 @@ self: { array base bytestring cmdargs containers directory filemanip filepath mtl process safe text Unixutils ]; - executableHaskellDepends = [ - base cmdargs containers directory filepath HUnit mtl process - QuickCheck safe test-framework test-framework-hunit - test-framework-quickcheck2 Unixutils uuid - ]; + executableHaskellDepends = [ base cmdargs containers mtl ]; description = "A trivially simple app to create things from simple templates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -142434,14 +149540,19 @@ self: { }) {}; "newtype-generics" = callPackage - ({ mkDerivation, base, hspec, HUnit, transformers }: + ({ mkDerivation, base, criterion, hspec, hspec-discover, semigroups + , transformers + }: mkDerivation { pname = "newtype-generics"; - version = "0.5.1"; - sha256 = "1cm9v5agz6dmqd2ijwl1llgabihk49zjvx0wxrvhlmdfj6b44gr7"; + version = "0.5.3"; + sha256 = "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj"; libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base hspec HUnit ]; - description = "A typeclass and set of functions for working with newtypes, with generics support"; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion semigroups ]; + homepage = "http://github.com/sjakobi/bsb-http-chunked"; + description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142512,7 +149623,7 @@ self: { }) {}; "nfc" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, c2hs, nfc }: + ({ mkDerivation, base, bytestring, c2hs, nfc }: mkDerivation { pname = "nfc"; version = "0.1.0"; @@ -142522,7 +149633,6 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ nfc ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base base16-bytestring bytestring ]; homepage = "https://github.com/centromere/nfc#readme"; description = "libnfc bindings"; license = stdenv.lib.licenses.publicDomain; @@ -142550,15 +149660,16 @@ self: { }) {}; "ngx-export" = callPackage - ({ mkDerivation, async, base, binary, bytestring, monad-loops - , template-haskell, unix + ({ mkDerivation, async, base, binary, bytestring, deepseq + , monad-loops, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.9.1.2"; - sha256 = "1428pkzj7kam7ya21fb3qchq95lvp6dp9dnh5qj41nkw9x5dz517"; + version = "1.4.1"; + sha256 = "1a9swysq72igyfbqw078fj3j8vw6hw1v5h4f64kh9wvvdcrdl2rh"; libraryHaskellDepends = [ - async base binary bytestring monad-loops template-haskell unix + async base binary bytestring deepseq monad-loops template-haskell + unix ]; homepage = "http://github.com/lyokha/nginx-haskell-module"; description = "Helper module for Nginx haskell module"; @@ -142606,21 +149717,22 @@ self: { "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 + , bytestring, containers, criterion, data-default-class, deepseq + , free, lens, lucid, pretty-show, recursion-schemes, shakespeare + , template-haskell, text, transformers, type-of-html, vector, weigh }: mkDerivation { pname = "nice-html"; - version = "0.3.0"; - sha256 = "1ns6qrzm9lwbgjcr7mw58g0qivbqac4yxisvbfy9j2cq3dqzm6d3"; + version = "0.4.1"; + sha256 = "117wrpg4fgh69bqgdr9jmj68izd4jk28lx91pvsj2425ajhdfsma"; libraryHaskellDepends = [ - base bifunctors blaze-markup bytestring data-default-class deepseq - free recursion-schemes template-haskell text transformers vector + base bifunctors blaze-markup bytestring containers + data-default-class deepseq free lens recursion-schemes + template-haskell text transformers vector ]; benchmarkHaskellDepends = [ base blaze-html blaze-markup bytestring criterion lucid pretty-show - text weigh + shakespeare text transformers type-of-html weigh ]; homepage = "https://github.com/mikeplus64/nice-html#readme"; description = "A fast and nice HTML templating library with distinct compilation/rendering phases"; @@ -142710,6 +149822,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nirum" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, cmark + , containers, directory, email-validate, filepath, fsnotify + , heterocephalus, hlint, hspec, hspec-core, hspec-meta, htoml + , interpolatedstring-perl6, megaparsec, mtl, optparse-applicative + , parsec, pretty, process, semigroups, semver, shakespeare, stm + , string-qq, template-haskell, temporary, text, turtle + , unordered-containers, uri + }: + mkDerivation { + pname = "nirum"; + version = "0.3.3"; + sha256 = "0ilrhkfv1q2w49wsj27dssaavw8v5w77vyf2mynb5aam1yax3d3v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring cmark containers directory + email-validate filepath fsnotify heterocephalus htoml + interpolatedstring-perl6 megaparsec mtl optparse-applicative parsec + pretty semver shakespeare stm template-haskell text + unordered-containers uri + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers directory email-validate + filepath htoml interpolatedstring-perl6 megaparsec mtl parsec + pretty semver text unordered-containers + ]; + testHaskellDepends = [ + base blaze-html bytestring containers directory email-validate + filepath hlint hspec hspec-core hspec-meta htoml + interpolatedstring-perl6 megaparsec mtl parsec pretty process + semigroups semver string-qq temporary text turtle + unordered-containers + ]; + homepage = "http://nirum.org/"; + description = "IDL compiler and RPC/distributed object framework for microservices"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nist-beacon" = callPackage ({ mkDerivation, base, bytestring, http-conduit, xml }: mkDerivation { @@ -142737,6 +149889,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nix-delegate" = callPackage + ({ mkDerivation, base, foldl, managed, neat-interpolation + , optparse-applicative, text, turtle + }: + mkDerivation { + pname = "nix-delegate"; + version = "1.0.0"; + sha256 = "1fzk6a2izs8sf2gq93m91m6l7h8i3374as8979h106588ww2ghhb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base foldl managed neat-interpolation optparse-applicative text + turtle + ]; + executableHaskellDepends = [ base ]; + description = "Convenient utility for distributed Nix builds"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nix-deploy" = callPackage + ({ mkDerivation, base, neat-interpolation, optparse-applicative + , optparse-generic, text, turtle + }: + mkDerivation { + pname = "nix-deploy"; + version = "1.0.2"; + sha256 = "07cirn4gaaarw5va128f63jp2q7jlghmg4kclya4fvapx963qbya"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base neat-interpolation optparse-applicative optparse-generic text + turtle + ]; + homepage = "https://github.com/awakesecurity/nix-deploy#readme"; + description = "Deploy Nix-built software to a NixOS machine"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nix-derivation" = callPackage ({ mkDerivation, attoparsec, base, containers, criterion, deepseq , pretty-show, QuickCheck, system-filepath, text, vector @@ -142759,6 +149951,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nix-diff" = callPackage + ({ mkDerivation, attoparsec, base, containers, Diff, mtl + , nix-derivation, optparse-generic, system-filepath, text, unix + , vector + }: + mkDerivation { + pname = "nix-diff"; + version = "1.0.1"; + sha256 = "0xk8ggng32czhy4wxgzw7g28xj18jcbncmfshviqlw17rccrm2fx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base containers Diff mtl nix-derivation optparse-generic + system-filepath text unix vector + ]; + homepage = "https://github.com/Gabriel439/nix-diff"; + description = "Explain why two Nix derivations differ"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nix-eval" = callPackage ({ mkDerivation, base, hindent, process, QuickCheck, strict, tasty , tasty-quickcheck @@ -142773,22 +149986,21 @@ self: { homepage = "http://chriswarbo.net/git/nix-eval"; description = "Evaluate Haskell expressions using Nix to get packages"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-paths" = callPackage ({ mkDerivation, base, nix, process }: mkDerivation { pname = "nix-paths"; - version = "1.0.0.1"; - sha256 = "05gkx79p532zciqjrsq16231pmzb5rixxip9j0vdc85a5h2a4bbl"; - revision = "1"; - editedCabalFile = "17l6x5azdiklwmiwkk05zxg50gqgdq9n5a1nyfywy05b6h7m33il"; + version = "1.0.1"; + sha256 = "1y09wl1ihxmc9p926g595f70pdcsx78r3q5n5rna23lpq8xicdxb"; libraryHaskellDepends = [ base process ]; libraryToolDepends = [ nix ]; homepage = "https://github.com/peti/nix-paths"; description = "Knowledge of Nix's installation directories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) nix;}; "nixfromnpm" = callPackage @@ -142854,8 +150066,8 @@ self: { ({ mkDerivation, base, nlopt, vector }: mkDerivation { pname = "nlopt-haskell"; - version = "0.1.0.0"; - sha256 = "0skh0bsms2nsw3dwi4ibjs579bbpc8ya158nrhyn3yxgdx79qgnj"; + version = "0.1.1.0"; + sha256 = "1jgszhkr6xc94rjasrhbfm618yz5l37zkibaxycn50fzvsilgfgg"; libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ nlopt ]; testHaskellDepends = [ base vector ]; @@ -142936,9 +150148,25 @@ self: { homepage = "https://github.com/v0d1ch/nmis-parser#readme"; description = "NMIS file parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {Nmis = null;}; + "nn" = callPackage + ({ mkDerivation, base, random, split, tasty, tasty-hspec + , tasty-quickcheck + }: + mkDerivation { + pname = "nn"; + version = "0.2.0"; + sha256 = "1jl267495x7rc34x35dzrwb05z57w1w97vzgj774ld6z2w1yri7l"; + libraryHaskellDepends = [ base random split ]; + testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ]; + homepage = "https://github.com/saschagrunert/nn#readme"; + description = "A tiny neural network"; + license = stdenv.lib.licenses.mit; + }) {}; + "nntp" = callPackage ({ mkDerivation, base, bytestring, monad-loops, mtl, network , old-locale, parsec, time @@ -143009,8 +150237,8 @@ self: { ({ mkDerivation, array, base, containers, regex-compat }: mkDerivation { pname = "nofib-analyse"; - version = "8.1.0.20160428"; - sha256 = "18af70lpf60xhmfksmhyj22awcdmy44s1klm0kmwr9f5fxs88wi6"; + version = "8.5.0.20180213"; + sha256 = "04jdbbkjh0kmxn25hy7rqli8cmysvx8vbdqfnfxx35w93kpsndxf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers regex-compat ]; @@ -143198,6 +150426,7 @@ self: { homepage = "http://www.nomyx.net"; description = "Web gui for Nomyx"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {nomyx-auth = null;}; @@ -143228,6 +150457,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty-text" = callPackage + ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, text }: + mkDerivation { + pname = "non-empty-text"; + version = "0.1.1"; + sha256 = "1s2rzcaiilid2dv462hkr3mxg4gk1dqyyayvwhs5nl81y7a35krd"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base doctest Glob hspec QuickCheck text ]; + homepage = "https://github.com/acatton/haskell-non-empty-text#readme"; + description = "Non empty Data.Text type"; + license = "unknown"; + }) {}; + "non-empty-zipper" = callPackage ({ mkDerivation, base, checkers, QuickCheck }: mkDerivation { @@ -143238,16 +150480,17 @@ self: { testHaskellDepends = [ base checkers QuickCheck ]; description = "The Zipper for NonEmpty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "non-negative" = callPackage - ({ mkDerivation, base, QuickCheck, utility-ht }: + ({ mkDerivation, base, QuickCheck, semigroups, utility-ht }: mkDerivation { pname = "non-negative"; - version = "0.1.1.2"; - sha256 = "1y5ayazrbw614g61ihilm8vn468dia1cphvsxwm8s0x3iw9gljs6"; - libraryHaskellDepends = [ base QuickCheck utility-ht ]; - testHaskellDepends = [ base QuickCheck utility-ht ]; + version = "0.1.2"; + sha256 = "0f01q916dzkl1i0v15qrw9cviycki5g3fgi6x8gs45iwbzssq52n"; + libraryHaskellDepends = [ base QuickCheck semigroups utility-ht ]; + testHaskellDepends = [ base QuickCheck semigroups utility-ht ]; homepage = "http://code.haskell.org/~thielema/non-negative/"; description = "Non-negative numbers"; license = "GPL"; @@ -143255,14 +150498,15 @@ self: { "nonce" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text - , transformers + , transformers, unliftio, unliftio-core }: mkDerivation { pname = "nonce"; - version = "1.0.4"; - sha256 = "1xkf107sbcm3pvm6r4xk4719sccaq2kzja6nf8bky9m7vpiilrji"; + version = "1.0.7"; + sha256 = "1q9ph0aq51mvdvydnriqd12sfin36pfb8f588zgac1ybn8r64ksb"; libraryHaskellDepends = [ base base64-bytestring bytestring entropy text transformers + unliftio unliftio-core ]; homepage = "https://github.com/prowdsponsor/nonce"; description = "Generate cryptographic nonces"; @@ -143297,8 +150541,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "nonfree"; - version = "0.1.0.2"; - sha256 = "1wmh8bp06rxzakcri25sg5vpmjqci8nz6dg158c5vbs6vizj1hz0"; + version = "0.1.0.3"; + sha256 = "1qdrzc0r37sw2knfgr9yqp7j8bcp1fayprjjg9xwkgxsjfsqp30b"; libraryHaskellDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; @@ -143317,19 +150561,20 @@ self: { }) {}; "nonlinear-optimization-ad" = callPackage - ({ mkDerivation, ad, base, csv, nonlinear-optimization, primitive + ({ mkDerivation, ad, base, nonlinear-optimization, primitive , reflection, vector }: mkDerivation { pname = "nonlinear-optimization-ad"; version = "0.2.2"; sha256 = "07a80ggl8wxjllam1cqlamwmh61lkxag1410gj8n53hdd55slqxj"; + revision = "1"; + editedCabalFile = "038242cdiddjck2m995622862wd8ykla1asl9c8njbr1k0iacgbf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ad base nonlinear-optimization primitive reflection vector ]; - executableHaskellDepends = [ base csv ]; homepage = "https://github.com/msakai/nonlinear-optimization-ad"; description = "Wrapper of nonlinear-optimization package for using with AD package"; license = stdenv.lib.licenses.gpl3; @@ -143373,6 +150618,8 @@ self: { pname = "normalization-insensitive"; version = "2.0.1"; sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v"; + revision = "2"; + editedCabalFile = "0djclsv0vzd56139ddzhykbwb3ny9mf8k2pryp8w33h9i4hv7axc"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -143415,6 +150662,7 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -143536,6 +150784,7 @@ self: { homepage = "https://github.com/NICTA/notzero"; description = "A data type for representing numeric values, except zero"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "np-extras" = callPackage @@ -143586,13 +150835,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nqe" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , containers, exceptions, hspec, lifted-async, lifted-base + , monad-control, stm, stm-conduit, text, transformers-base + }: + mkDerivation { + pname = "nqe"; + version = "0.1.0.0"; + sha256 = "1cg9f0bjf8sar3scln73ij0av4jwwv8ki44fdh1dbhcy1c9fn5d4"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra containers lifted-async + lifted-base monad-control stm transformers-base + ]; + testHaskellDepends = [ + async base bytestring conduit conduit-extra exceptions hspec stm + stm-conduit text + ]; + homepage = "https://github.com/xenog/nqe#readme"; + description = "Concurrency library in the style of Erlang/OTP"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: mkDerivation { pname = "nsis"; - version = "0.3.1"; - sha256 = "14jwy2sysps1h0sav8zcgpd3i1kppps9l9m1fq782b7jv0qy4iyp"; + version = "0.3.2"; + sha256 = "1jhmiydkiii350h6gdj8f6k8d0drsbp6a2dji4nik72nca6mp65r"; libraryHaskellDepends = [ base transformers uniplate ]; testHaskellDepends = [ base directory process transformers uniplate @@ -143753,17 +151025,18 @@ self: { }) {}; "number-length" = callPackage - ({ mkDerivation, base, criterion, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, criterion, HUnit, QuickCheck + , quickcheck-instances, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "number-length"; - version = "0.1.0.1"; - sha256 = "1ig9d1rgd5k9fxqmrdxi7mq6fgnxla7ba1083di1lxcakanll0kc"; + version = "0.2.1.0"; + sha256 = "1cdlwdas09q39jag5jl398wmw7ifbgdpp6p5kh0fi71m1c4f05w9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 + base HUnit QuickCheck quickcheck-instances test-framework + test-framework-hunit test-framework-quickcheck2 ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/trskop/number-length"; @@ -143926,19 +151199,18 @@ self: { "numeric-prelude" = callPackage ({ mkDerivation, array, base, containers, deepseq, non-negative - , parsec, QuickCheck, random, storable-record, utility-ht + , parsec, QuickCheck, random, semigroups, storable-record + , utility-ht }: mkDerivation { pname = "numeric-prelude"; - version = "0.4.2"; - sha256 = "1i6qavz3av3dbf70li7yqsh184bl618l1sm9s9ia15srrkzsj9sk"; - revision = "1"; - editedCabalFile = "1qpzdfy4xijb1vfiy0sxinchwg0wkfwfpjbyfvnpf4gz2j5i5gxc"; + version = "0.4.3"; + sha256 = "0bc937gblm8rz68fr3q2ms19hqjwi20wkmn1k1c0b675c2kgky5q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers deepseq non-negative parsec QuickCheck random - storable-record utility-ht + semigroups storable-record utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; description = "An experimental alternative hierarchy of numeric type classes"; @@ -143961,18 +151233,17 @@ self: { homepage = "https://github.com/nikita-volkov/numeric-qq"; description = "Quasi-quoters for numbers of different bases"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numeric-quest" = callPackage - ({ mkDerivation, array, base }: + ({ mkDerivation, array, base, prelude-compat }: mkDerivation { pname = "numeric-quest"; - version = "0.2.0.1"; - sha256 = "110v2frn085pggjzl3l8wqgr4vcdd5h29x2wak2a59x16ngjg7ga"; - revision = "1"; - editedCabalFile = "0bh9zzya42dbpc5c7j7fnyphm5nndib1ycbmanplgx0b707x1sda"; + version = "0.2.0.2"; + sha256 = "0agwfmbxyig502ac7xvf7208m0v7wdrcg7m30d1iw22c687ph5k9"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ array base ]; + libraryHaskellDepends = [ array base prelude-compat ]; homepage = "http://www.haskell.org/haskellwiki/Numeric_Quest"; description = "Math and quantum mechanics"; license = "GPL"; @@ -144020,98 +151291,129 @@ self: { }) {}; "numhask" = callPackage - ({ mkDerivation, adjunctions, base, distributive, doctest - , protolude, QuickCheck, tasty, tasty-quickcheck, vector + ({ mkDerivation, base, doctest, protolude, QuickCheck, tasty + , tasty-quickcheck }: mkDerivation { pname = "numhask"; - version = "0.0.9"; - sha256 = "16ss7lqwvmsgwgrj1smvdr5zzj33svi1mj1k5lhik1mm6dhd1c9x"; + version = "0.1.4.0"; + sha256 = "1324d4fqsjidrq3i0n869a5xq1w1nl2q2lpcf7bpb5a7wgmsfmgj"; libraryHaskellDepends = [ - adjunctions base distributive protolude QuickCheck vector + base protolude QuickCheck tasty tasty-quickcheck + ]; + testHaskellDepends = [ + base doctest protolude QuickCheck tasty tasty-quickcheck ]; - testHaskellDepends = [ base doctest tasty tasty-quickcheck ]; - homepage = "https://github.com/tonyday567/numhask"; + homepage = "https://github.com/tonyday567/numhask#readme"; description = "A numeric prelude"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numhask_0_1_2" = callPackage - ({ mkDerivation, adjunctions, base, distributive, doctest, matrix - , protolude, QuickCheck, singletons, tasty, tasty-quickcheck - , vector - }: + "numhask_0_2_0_0" = callPackage + ({ mkDerivation, base }: mkDerivation { pname = "numhask"; - version = "0.1.2"; - sha256 = "0vxs2qwgrq7ylp34r87hdnd2rxfyri2iyv933si8hzkgdg54zqk3"; - libraryHaskellDepends = [ - adjunctions base distributive matrix protolude QuickCheck - singletons vector - ]; - testHaskellDepends = [ base doctest tasty tasty-quickcheck ]; - homepage = "https://github.com/tonyday567/numhask"; - description = "A numeric prelude"; + version = "0.2.0.0"; + sha256 = "1n465rjgmpwjixnnwn054323rg55abbj98brqzw4ff17hrvy97g0"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/tonyday567/numhask#readme"; + description = "numeric classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest - , ghc-typelits-natnormalise, numhask, protolude, singletons - , typelits-witnesses, vector + ({ mkDerivation, adjunctions, base, deepseq, dimensions + , distributive, doctest, numhask-prelude, protolude, QuickCheck + , singletons, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "numhask-array"; - version = "0.0.2"; - sha256 = "0gbmwkpxdp1flzyndsqc5zgm2nlrpc8q4s0d2z8pws8g2gyymyj9"; + version = "0.2.0.1"; + sha256 = "05y41d8xnrzgrb5w6skkac5hr6c7npwzmryx308cd0lp4nbfmvql"; + libraryHaskellDepends = [ + adjunctions base deepseq dimensions distributive numhask-prelude + protolude QuickCheck singletons vector + ]; + testHaskellDepends = [ + base doctest numhask-prelude tasty tasty-quickcheck + ]; + homepage = "https://github.com/tonyday567/numhask-array#readme"; + description = "n-dimensional arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "numhask-histogram" = callPackage + ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude + , numhask-range, protolude, tasty, tdigest + }: + mkDerivation { + pname = "numhask-histogram"; + version = "0.1.1.0"; + sha256 = "18xnkwmf7bwnj2ldj20afg38ykpzdnpg773pgj9af9yzk40vpd28"; libraryHaskellDepends = [ - adjunctions base deepseq distributive ghc-typelits-natnormalise - numhask protolude singletons typelits-witnesses vector + base containers foldl numhask-prelude numhask-range tdigest ]; - testHaskellDepends = [ base doctest numhask ]; - homepage = "https://github.com/tonyday567/numhask-array"; + testHaskellDepends = [ base doctest protolude tasty ]; + homepage = "https://github.com/tonyday567/numhask-histogram#readme"; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numhask-range" = callPackage - ({ mkDerivation, base, containers, foldl, formatting, lens, linear - , numhask, protolude, QuickCheck, tasty, tasty-quickcheck + "numhask-prelude" = callPackage + ({ mkDerivation, base, doctest, numhask, protolude, QuickCheck + , tasty, tasty-quickcheck }: mkDerivation { - pname = "numhask-range"; - version = "0.0.4"; - sha256 = "06crxqgsryw7iixjm0rcsq49xgzirx6qm74iw6bx85a48f1snzqx"; + pname = "numhask-prelude"; + version = "0.0.3.0"; + sha256 = "128hnq32826d2rmrlik4p0c72jnsy586gz9lgfk7hnx0fqpr94gy"; libraryHaskellDepends = [ - base containers foldl formatting lens linear numhask protolude - QuickCheck + base numhask protolude QuickCheck tasty tasty-quickcheck ]; - testHaskellDepends = [ base numhask tasty tasty-quickcheck ]; - homepage = "https://github.com/tonyday567/numhask-range"; - description = "Numbers that are range representations"; + testHaskellDepends = [ base doctest tasty ]; + homepage = "https://github.com/tonyday567/numhask#readme"; + description = "A numeric prelude"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numhask-range_0_1_1" = callPackage + "numhask-range" = callPackage ({ mkDerivation, adjunctions, base, distributive, doctest, numhask - , protolude, QuickCheck, semigroupoids, tasty, tasty-quickcheck + , protolude, QuickCheck, semigroupoids, tasty }: mkDerivation { pname = "numhask-range"; - version = "0.1.1"; - sha256 = "09vg6b1ddd8v5lsz15x1g9164c33m5jv48g9f1i5ylbn4vyld90n"; + version = "0.1.3.0"; + sha256 = "1h42p48ridvvaxzjjh17pfjmfw9sjlzlmippi952m7jf1rfjxjpi"; libraryHaskellDepends = [ adjunctions base distributive numhask protolude QuickCheck semigroupoids ]; - testHaskellDepends = [ - base doctest numhask tasty tasty-quickcheck + testHaskellDepends = [ base doctest numhask tasty ]; + homepage = "https://github.com/tonyday567/numhask-range#readme"; + description = "Numbers that are range representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "numhask-range_0_2_1_0" = callPackage + ({ mkDerivation, adjunctions, base, distributive, doctest + , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty + }: + mkDerivation { + pname = "numhask-range"; + version = "0.2.1.0"; + sha256 = "1i6kpx0jdr0q2lp19m0aqfd73wsi1dm6qhl1w9x8wp4px12j4caz"; + libraryHaskellDepends = [ + adjunctions base distributive numhask-prelude protolude QuickCheck + semigroupoids ]; - homepage = "https://github.com/tonyday567/numhask-range"; + testHaskellDepends = [ base doctest numhask-prelude tasty ]; + homepage = "https://github.com/tonyday567/numhask-range#readme"; description = "Numbers that are range representations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -144186,81 +151488,87 @@ self: { }) {}; "nvim-hs" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal - , cereal-conduit, conduit, conduit-extra, containers, data-default - , 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, base, bytestring, cereal, cereal-conduit, conduit + , containers, data-default, deepseq, directory, dyre, filepath + , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec + , messagepack, mtl, network, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck, resourcet + , setenv, stm, streaming-commons, template-haskell, text, time + , time-locale-compat, transformers, transformers-base, unliftio + , unliftio-core, utf8-string, void }: mkDerivation { pname = "nvim-hs"; - version = "0.2.4"; - sha256 = "16zfaps34r6dbjrvrj1a08sndv8nxqhnwy4vgl1flnc6q6xbi7f5"; + version = "1.0.0.1"; + sha256 = "05kqrnzxhydns3iyqk1rhdgx3cyqgcskhfwa1d87hcyx0p4w51pw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring cereal cereal-conduit conduit - 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 + base bytestring cereal cereal-conduit conduit containers + data-default deepseq directory dyre filepath foreign-store hslogger + megaparsec messagepack mtl network optparse-applicative + prettyprinter prettyprinter-ansi-terminal process resourcet setenv + stm streaming-commons template-haskell text time time-locale-compat + transformers transformers-base unliftio unliftio-core utf8-string + void ]; executableHaskellDepends = [ base data-default ]; testHaskellDepends = [ - 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 megaparsec messagepack mtl network optparse-applicative + base bytestring cereal cereal-conduit conduit containers + data-default directory dyre filepath foreign-store hslogger hspec + hspec-discover HUnit megaparsec messagepack mtl network + optparse-applicative prettyprinter prettyprinter-ansi-terminal process QuickCheck resourcet setenv stm streaming-commons template-haskell text time time-locale-compat transformers - transformers-base utf8-string + transformers-base unliftio unliftio-core utf8-string ]; homepage = "https://github.com/neovimhaskell/nvim-hs"; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvim-hs-contrib" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, data-default - , directory, exceptions, filepath, hspec, hspec-discover - , messagepack, mtl, nvim-hs, QuickCheck, text, time, utf8-string - , yaml + ({ mkDerivation, base, bytestring, data-default, directory + , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs + , prettyprinter, prettyprinter-ansi-terminal, QuickCheck, text + , time, utf8-string, yaml }: mkDerivation { pname = "nvim-hs-contrib"; - version = "0.2.0"; - sha256 = "05999ma4whng6brn37bw2wbw7yf2hq9yw8sr12kwykdygxvykrbf"; + version = "1.0.0.0"; + sha256 = "150kg8gkai4cz7yv42vgn3b6rl6p44vfksq897kjaa3b12yjwd5x"; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring data-default directory exceptions - filepath messagepack mtl nvim-hs text time utf8-string yaml + base bytestring data-default directory filepath messagepack mtl + nvim-hs prettyprinter prettyprinter-ansi-terminal text time + utf8-string yaml ]; testHaskellDepends = [ base hspec hspec-discover nvim-hs QuickCheck ]; - homepage = "https://github.com/neovimhaskell/nvim-hs"; + homepage = "https://github.com/neovimhaskell/nvim-hs-contrib"; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvim-hs-ghcid" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers, yaml + , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers + , unliftio, yaml }: mkDerivation { pname = "nvim-hs-ghcid"; - version = "0.2.0"; - sha256 = "108fi3pnsc0yj5kmm0awqr7f3xqhyxg1yg29p2kw6bk8vvwjdlvf"; + version = "1.0.0.0"; + sha256 = "06yz73sx2z86dm1yhs3pqpi8g88157885fpm8hd6gkl2q4pjcwc8"; libraryHaskellDepends = [ base bytestring containers directory filepath ghcid nvim-hs - nvim-hs-contrib resourcet transformers yaml + nvim-hs-contrib resourcet transformers unliftio yaml ]; homepage = "https://github.com/saep/nvim-hs-ghcid"; description = "Neovim plugin that runs ghcid to update the quickfix list"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvvm" = callPackage @@ -144269,8 +151577,8 @@ self: { }: mkDerivation { pname = "nvvm"; - version = "0.8.0.0"; - sha256 = "1vs3694ybfzi9zv04mjnmcsy0b8w43pw2fw8yjnlzvknwzcf2sw3"; + version = "0.8.0.3"; + sha256 = "1kwmgl1bp0mlv4bdnjl6m1v34k68pgg6z00z3i7x3wfjff8gd5sr"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; @@ -144333,6 +151641,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "o-clock" = callPackage + ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob + , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec + , tiempo, time-units, type-spec + }: + mkDerivation { + pname = "o-clock"; + version = "0.1.1"; + sha256 = "1adksq9s86gqxvn74qpa22w4fciq8k8j5v3qh0cas2rwabxqdr00"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ghc-prim ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog + tasty-hspec type-spec + ]; + benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ]; + homepage = "https://github.com/serokell/o-clock"; + description = "Type-safe time library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "oanda-rest-api" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens @@ -144356,6 +151688,30 @@ self: { 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; + }) {}; + + "oasis-xrd" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , text, time, uri-bytestring, xml-conduit, xml-conduit-writer + }: + mkDerivation { + pname = "oasis-xrd"; + version = "1.0"; + sha256 = "105m258yqfdmp1n7gd824gsry07xqlhfnpla2kb7sn36nckqr3a0"; + revision = "1"; + editedCabalFile = "1jwvncyyn8njzhjdgqwakqfddp34h26abnhypzbdsgn4nyxad1qs"; + libraryHaskellDepends = [ + aeson base bytestring containers text time uri-bytestring + xml-conduit xml-conduit-writer + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers text time + uri-bytestring xml-conduit xml-conduit-writer + ]; + homepage = "https://gitlab.com/dpwiz/oasis-xrd"; + description = "Extensible Resource Descriptor"; + license = stdenv.lib.licenses.bsd3; }) {}; "oauth10a" = callPackage @@ -144380,20 +151736,26 @@ self: { "oauthenticated" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, case-insensitive, crypto-random, cryptohash, either - , exceptions, http-client, http-types, mtl, network, network-uri - , text, time, transformers + , bytestring, case-insensitive, cryptonite, exceptions, hspec + , hspec-expectations, http-client, http-client-tls, http-types + , memory, mtl, network, network-uri, text, time, transformers }: mkDerivation { pname = "oauthenticated"; - version = "0.1.3.4"; - sha256 = "1l6qir6qnipq8295cljl66mhlws2rrqjvz9nsl7rq2ldqv711bbm"; + version = "0.2.1.0"; + sha256 = "08njax7jchkmha1angh98v0p3haxn8zj12lajl5npcmzlihd0k6l"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive crypto-random cryptohash either exceptions - http-client http-types mtl network network-uri text time - transformers + case-insensitive cryptonite exceptions http-client http-types + memory mtl network network-uri text time transformers + ]; + testHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + case-insensitive cryptonite exceptions hspec hspec-expectations + http-client http-client-tls http-types memory mtl network + network-uri text time transformers ]; + homepage = "https://github.com/tel/oauthenticated.git#readme"; description = "Simple OAuth for http-client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -144445,8 +151807,7 @@ self: { "oberon0" = callPackage ({ mkDerivation, array, AspectAG, base, containers, ghc-prim, HList - , language-c, mtl, murder, template-haskell, transformers - , uu-parsinglib, uulib + , mtl, murder, template-haskell, transformers, uu-parsinglib, uulib }: mkDerivation { pname = "oberon0"; @@ -144458,10 +151819,6 @@ self: { array AspectAG base containers ghc-prim HList mtl murder template-haskell transformers uu-parsinglib uulib ]; - executableHaskellDepends = [ - AspectAG base containers HList language-c murder uu-parsinglib - uulib - ]; doHaddock = false; homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo"; description = "Oberon0 Compiler"; @@ -144512,19 +151869,18 @@ self: { }) {}; "objective" = callPackage - ({ mkDerivation, base, containers, either, exceptions, free - , hashable, monad-skeleton, mtl, profunctors, template-haskell - , transformers, transformers-compat, unordered-containers, void - , witherable + ({ mkDerivation, base, containers, exceptions, free, hashable + , monad-skeleton, mtl, profunctors, template-haskell, transformers + , transformers-compat, unordered-containers, void, witherable }: mkDerivation { pname = "objective"; - version = "1.1.1"; - sha256 = "0d36v2w8f9g68zh2cdf8hnkzdafv0z6np895ak610n8bkxvqxlbs"; + version = "1.1.2"; + sha256 = "0i36r3ygwpzb57ga0jjkp9rzikpsp15l777dclp7yi1zvqz2ikrg"; revision = "1"; - editedCabalFile = "0p1w5zabfqqksyxxv880f6d27rl2vx9101vvflkxwhyfw0az6zin"; + editedCabalFile = "039j3xac9ish0yk4w04bmip6g9p6ndfd9ngh46ya125ms4nhmyj4"; libraryHaskellDepends = [ - base containers either exceptions free hashable monad-skeleton mtl + base containers exceptions free hashable monad-skeleton mtl profunctors template-haskell transformers transformers-compat unordered-containers void witherable ]; @@ -144545,31 +151901,67 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "octane" = callPackage - ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers - , data-default-class, file-embed, http-client, http-client-tls - , overloaded-records, rattletrap, text + "ocaml-export" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, filepath, formatting, hspec, hspec-golden-aeson, mtl + , process, QuickCheck, quickcheck-arbitrary-adt, servant + , servant-server, split, template-haskell, text, time + , typelits-witnesses, wai, wai-extra, warp, wl-pprint-text }: mkDerivation { - pname = "octane"; - version = "0.20.2"; - sha256 = "09z69sl782i7ky4dr9aw1ikjaqpwsp0b92x3m2pqlzg4bdfz7s7z"; - isLibrary = true; - isExecutable = true; + pname = "ocaml-export"; + version = "0.7.0.0"; + sha256 = "10cvzzqnv7za9albnma112cx0pr4ranjqg3r38k5x6jmj4n5s4bp"; libraryHaskellDepends = [ - aeson base bimap binary bytestring containers data-default-class - file-embed overloaded-records rattletrap text + aeson base bytestring containers directory file-embed filepath + formatting hspec hspec-golden-aeson mtl QuickCheck + quickcheck-arbitrary-adt servant servant-server split + template-haskell text time typelits-witnesses wl-pprint-text ]; - executableHaskellDepends = [ - aeson base binary bytestring http-client http-client-tls + testHaskellDepends = [ + aeson base bytestring containers directory filepath hspec + hspec-golden-aeson process QuickCheck quickcheck-arbitrary-adt + servant servant-server template-haskell text time + typelits-witnesses wai wai-extra warp ]; - homepage = "https://github.com/tfausak/octane#readme"; - description = "Parse Rocket League replays"; + homepage = "https://github.com/plow-technologies/ocaml-export#readme"; + description = "Convert Haskell types in OCaml types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ochintin-daicho" = callPackage + ({ mkDerivation, base, bookkeeping, doctest, Glob, text }: + mkDerivation { + pname = "ochintin-daicho"; + version = "0.1.0.1"; + sha256 = "1s2n0k8ix4lc9x07s2qhgiiln6xyfswkkz14ri6jm1k9k3hr946l"; + libraryHaskellDepends = [ base bookkeeping text ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/haskell-ochintin-daicho#readme"; + description = "A module to manage payroll books for Japanese companies"; + license = stdenv.lib.licenses.mit; + }) {}; + + "ochintin-daicho_0_3_1_1" = callPackage + ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable + , text, transaction + }: + mkDerivation { + pname = "ochintin-daicho"; + version = "0.3.1.1"; + sha256 = "06xdr5763xipzpl83190p8ha1rm9akqa49dh0588ibbhk2zbk0ln"; + libraryHaskellDepends = [ + base bookkeeping mono-traversable text transaction + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/haskell-ochintin-daicho#readme"; + description = "A module to manage payroll books for Japanese companies"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "octane_0_20_3" = callPackage + "octane" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers , data-default-class, file-embed, http-client, http-client-tls , overloaded-records, rattletrap, text @@ -144650,8 +152042,8 @@ self: { }) {}; "oculus" = callPackage - ({ mkDerivation, base, either, libX11, libXinerama, mesa, monads-tf - , ovr, systemd, transformers, vect-floating + ({ mkDerivation, base, either, libGL, libX11, libXinerama + , monads-tf, ovr, systemd, transformers, vect-floating }: mkDerivation { pname = "oculus"; @@ -144660,13 +152052,42 @@ self: { libraryHaskellDepends = [ base either monads-tf transformers vect-floating ]; - librarySystemDepends = [ libX11 libXinerama mesa ovr systemd ]; + librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ]; homepage = "http://github.com/cpdurham/oculus"; description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; - inherit (pkgs) mesa; ovr = null; systemd = null;}; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXinerama; ovr = null; systemd = null;}; + + "odbc" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , formatting, hspec, optparse-applicative, QuickCheck, semigroups + , text, time, transformers, unixODBC, unliftio-core, weigh + }: + mkDerivation { + pname = "odbc"; + version = "0.0.4"; + sha256 = "1fh8yqdycna3if5dd55qc6hic70nwy71vjy2yflzvpjpqkdd8qz6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq formatting semigroups text + time transformers unliftio-core + ]; + librarySystemDepends = [ unixODBC ]; + executableHaskellDepends = [ + base bytestring optparse-applicative text + ]; + testHaskellDepends = [ + base bytestring hspec QuickCheck text time + ]; + benchmarkHaskellDepends = [ async base text weigh ]; + homepage = "https://github.com/fpco/odbc"; + description = "Haskell binding to the ODBC API, aimed at SQL Server driver"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) unixODBC;}; "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text @@ -144685,6 +152106,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "odpic-raw" = callPackage + ({ mkDerivation, base, c2hs, conduit, hspec, monad-control + , monad-logger, odpic, QuickCheck, resourcet, text, time + }: + mkDerivation { + pname = "odpic-raw"; + version = "0.1.11"; + sha256 = "0via5p0sfma91ny5rw87sirmp4189663ww25dfwi6jlha4d82hlh"; + libraryHaskellDepends = [ + base conduit monad-control resourcet text time + ]; + librarySystemDepends = [ odpic ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base conduit hspec monad-logger QuickCheck resourcet + ]; + homepage = "https://github.com/leptonyu/odpic-raw#readme"; + description = "Oracle Database Bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {odpic = null;}; + "oeis" = callPackage ({ mkDerivation, base, HTTP, HUnit, network, network-uri , test-framework, test-framework-hunit @@ -144737,16 +152180,15 @@ self: { }: mkDerivation { pname = "ogmarkup"; - version = "3.1.0"; - sha256 = "0za23qz85r9xmw57gxi84x2zy8ddxwcdphawyfzkmxqny9kplx1r"; + version = "5.0"; + sha256 = "19lgfgsfkfk51dbjimc45yclxfh7ncmh21gnc6f7dihsyhkdfsx7"; libraryHaskellDepends = [ base megaparsec mtl ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec shakespeare text ]; - homepage = "http://github.com/ogma-project/ogmarkup"; + homepage = "https://nest.pijul.com/lthms/ogmarkup"; description = "A lightweight markup language for story writers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ohloh-hs" = callPackage @@ -144893,6 +152335,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "om-elm" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , http-types, safe, safe-exceptions, template-haskell, text, unix + , wai + }: + mkDerivation { + pname = "om-elm"; + version = "1.0.0.1"; + sha256 = "1fvpsiv5xdc7jamhdsaw2kzm32qrbg7c2b5s5zhhhcd7j4vgn3xq"; + libraryHaskellDepends = [ + base bytestring Cabal containers directory http-types safe + safe-exceptions template-haskell text unix wai + ]; + homepage = "https://github.com/owensmurray/om-elm"; + description = "Haskell utilities for building embedded Elm programs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "omaketex" = callPackage ({ mkDerivation, base, optparse-applicative, shakespeare-text , shelly, text @@ -144921,6 +152382,8 @@ self: { pname = "ombra"; version = "1.1.0.0"; sha256 = "00cki27h3wpgpmcc3rv8fip1dmh9zsg5n0m5gfgdy0xs36xlyn4m"; + revision = "1"; + editedCabalFile = "0747v6b50lpwpbmmm5zyyq98dp40rkg0i88g5mp9w8wdwcsws0d8"; libraryHaskellDepends = [ base Boolean gl hashable hashtables MemoTrie monad-control transformers transformers-base unordered-containers vector-space @@ -144928,6 +152391,7 @@ self: { homepage = "https://github.com/ziocroc/Ombra"; description = "Render engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "omega" = callPackage @@ -145066,14 +152530,28 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "one-line-aeson-text" = callPackage + ({ mkDerivation, aeson, base, doctest, text, unordered-containers + }: + mkDerivation { + pname = "one-line-aeson-text"; + version = "0.1.0.0"; + sha256 = "026qycb9nvc2v648p2cc74h6xqczkv9mvpawq54zx4r3vlc4lppn"; + libraryHaskellDepends = [ aeson base text unordered-containers ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/typeclasses/one-line-aeson-text"; + description = "Pretty-printing short Aeson values as text"; + license = stdenv.lib.licenses.asl20; + }) {}; + "one-liner" = callPackage ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit , profunctors, tagged, transformers }: mkDerivation { pname = "one-liner"; - version = "0.9.1"; - sha256 = "18jys0qvywd7il4yzyf2yb22md7apzhxvnzr067d90srqdva7cpf"; + version = "0.9.2"; + sha256 = "1my7ykfbfgx8z4qcklqxacycs5hl736fqh5s22cdm19nhfqmcc5b"; libraryHaskellDepends = [ base bifunctors contravariant ghc-prim profunctors tagged transformers @@ -145084,6 +152562,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "one-liner_1_0" = callPackage + ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit + , profunctors, tagged, transformers + }: + mkDerivation { + pname = "one-liner"; + version = "1.0"; + sha256 = "1diigbl8l0m8q1sl0kxjjqbhl3vkpf0rrzxlbqaamp3ahpmgpx67"; + libraryHaskellDepends = [ + base bifunctors contravariant ghc-prim profunctors tagged + transformers + ]; + testHaskellDepends = [ base contravariant HUnit ]; + homepage = "https://github.com/sjoerdvisscher/one-liner"; + description = "Constraint-based generics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "one-liner-instances" = callPackage + ({ mkDerivation, base, one-liner }: + mkDerivation { + pname = "one-liner-instances"; + version = "0.1.1.0"; + sha256 = "0yb5rdy735lalwrxvmvvjnpyikdqs2y2fjldjcbjj0r3d912azxn"; + libraryHaskellDepends = [ base one-liner ]; + homepage = "https://github.com/mstksg/one-liner-instances#readme"; + description = "Generics-based implementations for common typeclasses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "one-time-password" = callPackage ({ mkDerivation, base, bytestring, cereal, cryptonite, memory , tasty, tasty-hunit, time @@ -145129,17 +152638,44 @@ self: { }) {}; "online" = callPackage - ({ mkDerivation, base, foldl, numhask, protolude, tdigest, vector - , vector-algorithms + ({ mkDerivation, base, doctest, foldl, formatting, numhask + , optparse-generic, perf, protolude, scientific, tasty, tdigest + , text, vector, vector-algorithms }: mkDerivation { pname = "online"; - version = "0.2.0"; - sha256 = "13vg34h09ds49r5j6dg8kqh90iqhbadr6jv57y0766h1pmr5i8kh"; + version = "0.2.1.0"; + sha256 = "16s1hcf2jk8lzs3z0v2xp4jn2q6idzhqaksy97r64hcgnys7sylx"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base foldl numhask protolude tdigest vector vector-algorithms ]; - homepage = "https://github.com/tonyday567/online"; + executableHaskellDepends = [ + base foldl formatting numhask optparse-generic perf protolude + scientific text + ]; + testHaskellDepends = [ base doctest protolude tasty ]; + homepage = "https://github.com/tonyday567/online#readme"; + description = "online statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "online_0_2_3_0" = callPackage + ({ mkDerivation, base, doctest, foldl, numhask-prelude, protolude + , tasty, tdigest, vector, vector-algorithms + }: + mkDerivation { + pname = "online"; + version = "0.2.3.0"; + sha256 = "04yh51gdmb2nycsxjrfzkb07byxdmn1n9wrk7wv7nh3ki7jxi15d"; + libraryHaskellDepends = [ + base foldl numhask-prelude protolude tdigest vector + vector-algorithms + ]; + testHaskellDepends = [ base doctest protolude tasty ]; + homepage = "https://github.com/tonyday567/online#readme"; description = "online statistics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -145168,6 +152704,7 @@ self: { homepage = "https://github.com/paolino/onpartitions"; description = "partition lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "onu-course" = callPackage @@ -145195,33 +152732,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, dotenv - , hspec, hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, semigroups, text - , time, time-locale-compat, transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.5.4.0"; - sha256 = "0dyvaci8dpd5rnr40ib1al2mw2ivza02wbsdz1m5qc7hn30374yv"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant dotenv hspec hspec-discover - multiset postgresql-simple product-profunctors profunctors - QuickCheck semigroups text time transformers - ]; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_6_0_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -145230,8 +152740,10 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.6.0.0"; - sha256 = "0prwlxp96qpnhdm34slwhp3j8hj961xl99xkl6fbrxgxxjngfg1q"; + version = "0.6.1.0"; + sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l"; + revision = "1"; + editedCabalFile = "07sz4a506hlx8da2ppiglja6hm9ipb2myh6s702ac6xx700cnl7f"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -145246,7 +152758,6 @@ self: { homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -145296,28 +152807,6 @@ self: { }) {}; "opaleye-trans" = callPackage - ({ mkDerivation, base, mtl, opaleye, postgresql-simple - , product-profunctors, transformers, transformers-base - }: - mkDerivation { - pname = "opaleye-trans"; - version = "0.3.7"; - sha256 = "17yfa0kgd3v8dlz77nlgplyi23f622f46z9q2xyswnrrf5w2c4z0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base mtl opaleye postgresql-simple product-profunctors transformers - transformers-base - ]; - executableHaskellDepends = [ - base opaleye postgresql-simple product-profunctors - ]; - homepage = "https://github.com/WraithM/opaleye-trans"; - description = "A monad transformer for Opaleye"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye-trans_0_4_2" = callPackage ({ mkDerivation, base, exceptions, mtl, opaleye, postgresql-simple , product-profunctors, transformers }: @@ -145403,6 +152892,7 @@ self: { testHaskellDepends = [ base ]; description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-symbology" = callPackage @@ -145414,6 +152904,7 @@ self: { libraryHaskellDepends = [ attoparsec base conduit mtl text ]; homepage = "https://github.com/alphaHeavy/open-symbology"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-typerep" = callPackage @@ -145472,13 +152963,12 @@ self: { ({ mkDerivation, aeson, base, data-default, text, time }: mkDerivation { pname = "opench-meteo"; - version = "0.1.1.0"; - sha256 = "02v5nxdwkfmyda2x6dw64i7bwgaxq8d7ibbxx4rya3ddairs4y29"; + version = "0.2.0.2"; + sha256 = "0xj9v7xl11j6p4kk5dz64kqpmyc5d68sldakiaby0j8qvyw7sf9r"; 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opencog-atomspace" = callPackage @@ -145505,8 +152995,8 @@ self: { }: mkDerivation { pname = "opencv"; - version = "0.0.2.0"; - sha256 = "1v3a97qrqxssl56bwip98ifkism9lzjhmizbgxbdhn8dbrmn8jgg"; + version = "0.0.2.1"; + sha256 = "1bwl3csl2bsgz32i7s59hb25hxj05vn9g3fa8xix9klz8kyrzam1"; configureFlags = [ "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++" ]; @@ -145539,8 +153029,8 @@ self: { }: mkDerivation { pname = "opencv-extra"; - version = "0.2.0.0"; - sha256 = "0qdcikwr3shxjx3sdsnawwbg0h6pc1pn29cxq15hpjbv37yg2fc1"; + version = "0.2.0.1"; + sha256 = "0l4bphpsc9nv6kjvbyjqx0345mq4ryigi93ak64vv0bwp84xk5xz"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bindings-DSL bytestring containers inline-c inline-c-cpp @@ -145762,23 +153252,24 @@ self: { }) {}; "openpgp-asciiarmor" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , cereal, HUnit, test-framework, test-framework-hunit + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , bytestring, criterion, tasty, tasty-hunit }: mkDerivation { pname = "openpgp-asciiarmor"; - version = "0.1"; - sha256 = "1xrv0n7n1n8izvxvqm8wmj6mkn5l6wcq18bxs9zd1q5riynmmm2w"; + version = "0.1.1"; + sha256 = "01zna9zifixnzgalr3k21g9dv143cn49imawm4q9x37i2r9kybxr"; libraryHaskellDepends = [ - attoparsec base base64-bytestring bytestring cereal + attoparsec base base64-bytestring binary bytestring ]; testHaskellDepends = [ - attoparsec base base64-bytestring bytestring cereal HUnit - test-framework test-framework-hunit + attoparsec base base64-bytestring binary bytestring tasty + tasty-hunit ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "http://floss.scru.org/openpgp-asciiarmor"; description = "OpenPGP (RFC4880) ASCII Armor codec"; - license = "unknown"; + license = stdenv.lib.licenses.isc; }) {}; "openpgp-crypto-api" = callPackage @@ -146147,6 +153638,7 @@ self: { ]; description = "Access data at OpenWeatherMap"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "operate-do" = callPackage @@ -146235,7 +153727,7 @@ self: { "opml-conduit" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, conduit - , conduit-combinators, containers, data-default, hlint, lens-simple + , conduit-combinators, containers, data-default, lens-simple , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck , quickcheck-instances, resourcet, safe-exceptions, semigroups , tasty, tasty-hunit, tasty-quickcheck, text, time, timerep @@ -146243,8 +153735,8 @@ self: { }: mkDerivation { pname = "opml-conduit"; - version = "0.6.0.3"; - sha256 = "1flzv6v1mds7w9v3ap3g7gfwlvq54z0j1w7g2b07d17x334lyhgb"; + version = "0.6.0.4"; + sha256 = "07axacfa0wik2cnpzcnjjp9w6ws8sjhinzxdc4vrxdxaj1v5a2s8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base case-insensitive conduit conduit-combinators containers @@ -146253,7 +153745,7 @@ self: { ]; testHaskellDepends = [ base bytestring conduit conduit-combinators containers data-default - hlint lens-simple mono-traversable mtl parsers QuickCheck + lens-simple mono-traversable mtl parsers QuickCheck quickcheck-instances resourcet semigroups tasty tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit ]; @@ -146269,8 +153761,8 @@ self: { }: mkDerivation { pname = "opn"; - version = "0.1.2"; - sha256 = "0x53kvcpbd9fh00zs8wdkb3xsl8hf1bsqgl83ci17di1jyg3m4ch"; + version = "0.1.3"; + sha256 = "17ysp1xzqbcr58ibzwf88bim58yyc309kf71jw66gn0brp0b0w1h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146280,7 +153772,6 @@ self: { homepage = "http://github.com/akc/opn"; description = "Open files or URLs using associated programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optimal-blocks" = callPackage @@ -146315,15 +153806,14 @@ self: { }: mkDerivation { pname = "optimization"; - version = "0.1.7"; - sha256 = "1y490h96qvn9w3z360adbxmbcvw3zpirgfs02hbjkarxi13z4shn"; + version = "0.1.9"; + sha256 = "0v1bi97jvdnn4jfknsnayaqdawckh7xxcnkr5nwvxqnpckg89yyf"; libraryHaskellDepends = [ ad base distributive linear semigroupoids vector ]; homepage = "http://github.com/bgamari/optimization"; description = "Numerical optimization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optimusprime" = callPackage @@ -146370,14 +153860,15 @@ self: { homepage = "https://github.com/tonymorris/optional"; description = "Using type-classes for optional function arguments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optional-args" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "optional-args"; - version = "1.0.1"; - sha256 = "16gxy78r868k8hc88hayclhdkn8chyry08fbf99ipyy1xgb081ll"; + version = "1.0.2"; + sha256 = "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f"; libraryHaskellDepends = [ base ]; description = "Optional function arguments"; license = stdenv.lib.licenses.bsd3; @@ -146414,30 +153905,13 @@ self: { }) {}; "optparse-applicative" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck - , transformers, transformers-compat - }: - mkDerivation { - pname = "optparse-applicative"; - version = "0.13.2.0"; - sha256 = "18kcjldpzay3k3309rvb9vqrp5b1gqp0hgymynqx7x2kgv7cz0sw"; - libraryHaskellDepends = [ - ansi-wl-pprint base process transformers transformers-compat - ]; - testHaskellDepends = [ base QuickCheck ]; - homepage = "https://github.com/pcapriotti/optparse-applicative"; - description = "Utilities and combinators for parsing command line options"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "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"; + version = "0.14.2.0"; + sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -146445,7 +153919,6 @@ self: { 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 @@ -146454,10 +153927,10 @@ self: { }: mkDerivation { pname = "optparse-applicative-simple"; - version = "1.0.1"; - sha256 = "05zr4wcqln1vq2v1vaq4bfjiz5b7fmmjmzbnm6drplr5scsy9igm"; + version = "1.0.2"; + sha256 = "0kn740shja07mpaj9hy5blw1bcgy6ncpfyz3rqy3cglh2fzswsk2"; libraryHaskellDepends = [ - attoparsec base-prelude optparse-applicative text + attoparsec attoparsec-data base-prelude optparse-applicative text ]; testHaskellDepends = [ attoparsec-data rerebase ]; homepage = "https://github.com/nikita-volkov/optparse-applicative-simple"; @@ -146484,31 +153957,14 @@ self: { }: 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; - }) {}; - - "optparse-generic_1_2_3" = callPackage - ({ mkDerivation, base, bytestring, Only, optparse-applicative - , semigroups, system-filepath, text, time, transformers, void - }: - mkDerivation { - pname = "optparse-generic"; - version = "1.2.3"; - sha256 = "1wxzpj4xj3bafg3piarwsr69xxzp75fdglx9c3spbahl1aq9wzgk"; + version = "1.3.0"; + sha256 = "13rr3hq26dpmbami8vb6d1ig9ywk6jia22sp5dkp6jkfc1c9k4l0"; 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 @@ -146521,21 +153977,22 @@ self: { homepage = "https://github.com/pharpend/optparse-helper"; description = "Helper functions for optparse-applicative"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-simple" = callPackage - ({ mkDerivation, base, bytestring, directory, either, gitrev + ({ mkDerivation, base, bytestring, directory, gitrev , optparse-applicative, template-haskell, transformers }: mkDerivation { pname = "optparse-simple"; - version = "0.0.4"; - sha256 = "1md24dlz6949rqv6y2x9d5r07lrqw42c21kdy09nk5y8r3mq43x0"; + version = "0.1.0"; + sha256 = "1g2cf4pcf1fa001z77g8gwnx0cxdpqs1iw9xp0kb9qrxm9gpk3c3"; libraryHaskellDepends = [ - base either gitrev optparse-applicative template-haskell - transformers + base gitrev optparse-applicative template-haskell transformers ]; testHaskellDepends = [ base bytestring directory ]; + homepage = "https://github.com/fpco/optparse-simple#readme"; description = "Simple interface to optparse-applicative"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146840,8 +154297,8 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.1.2"; - sha256 = "11q8n9sy841klms368bs0wl14wg0q5dq5gfcipzm25pw6jswfgyy"; + version = "0.1.3"; + sha256 = "16vla9aq12hvv1b18j7zl8n1dhr31p4hb361gjfd0b1wf95j81r5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147117,20 +154574,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "overhang" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "overhang"; + version = "1.0.0"; + sha256 = "07iafybg45130jhwin6jj2fnkgcwra367f5df91xn34kaj9zas0x"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/jship/overhang#readme"; + description = "Hang loose with your lambdas!"; + license = stdenv.lib.licenses.mit; + }) {}; + "overload" = callPackage ({ mkDerivation, base, simple-effects, template-haskell , th-expand-syns }: mkDerivation { pname = "overload"; - version = "0.1.0.4"; - sha256 = "16sry2c4wrly3y3k47gry53klxf4kvbym6fybb8f7z9hqffx18a9"; + version = "0.1.0.5"; + sha256 = "046lxmcrk072l08rxbbzb883gd7cffxx76l3x29h78d10aai6cac"; libraryHaskellDepends = [ base simple-effects template-haskell th-expand-syns ]; homepage = "https://gitlab.com/LukaHorvat/overload"; description = "Finite overloading"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "overloaded-records" = callPackage @@ -147153,6 +154623,7 @@ self: { homepage = "https://github.com/trskop/overloaded-records"; description = "Overloaded Records based on current GHC proposal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "overture" = callPackage @@ -147217,6 +154688,7 @@ self: { ]; description = "Utilities for working with cabal packages and your package database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "package-vt" = callPackage @@ -147235,35 +154707,52 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "packcheck" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "packcheck"; + version = "0.3.0"; + sha256 = "02ixa91wp0jxdc046gi5qxyyw332znkgknfz5chf4j3ydn7qjlha"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/harendra-kumar/packcheck"; + description = "Universal build and CI testing for Haskell packages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "packdeps" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, split, tar, text, time + , filepath, optparse-applicative, process, semigroups, split, tar + , text, time }: mkDerivation { pname = "packdeps"; - version = "0.4.3"; - sha256 = "0sqiy737czdv8n1mr6xx6rgpb5li9im0n1zl5v6pz38mp5mbvm58"; + version = "0.4.4"; + sha256 = "0zlbcbid9q1fyl9gqr2h3z1bmdip1xzxr14q6kgwgdjw785x9a2l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring Cabal containers directory filepath split tar text time ]; - executableHaskellDepends = [ base Cabal ]; + executableHaskellDepends = [ + base Cabal containers optparse-applicative process semigroups + ]; homepage = "http://packdeps.haskellers.com/"; description = "Check your cabal packages for lagging dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; - "packdeps_0_4_4" = callPackage + "packdeps_0_4_5" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, optparse-applicative, process, semigroups, split, tar , text, time }: mkDerivation { pname = "packdeps"; - version = "0.4.4"; - sha256 = "0zlbcbid9q1fyl9gqr2h3z1bmdip1xzxr14q6kgwgdjw785x9a2l"; + version = "0.4.5"; + sha256 = "07nsnxxs5y77w0v5dxw9mqgq98s3riws5846qshlnhq4l5q73php"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147279,6 +154768,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "packed" = callPackage + ({ mkDerivation, base, containers, gauge, ghc-prim, hedgehog + , primitive, tasty, tasty-hedgehog, tasty-hunit + }: + mkDerivation { + pname = "packed"; + version = "0.1.0"; + sha256 = "1isacbh8w24awsh3nn7djcnmy8am4s4i5npsidnqm5qgcqikpfh8"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + testHaskellDepends = [ + base containers ghc-prim hedgehog tasty tasty-hedgehog tasty-hunit + ]; + benchmarkHaskellDepends = [ base gauge ]; + homepage = "https://github.com/andrewthad/bytearray#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "packed-dawg" = callPackage ({ mkDerivation, base, binary, criterion, deepseq, HUnit, mtl , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -147381,8 +154888,8 @@ self: { }: mkDerivation { pname = "packman"; - version = "0.3.0"; - sha256 = "07raaqqf9vz2mc3nasqzf2bz8370diy0j0lj60pqz2cg89y0q4cq"; + version = "0.5.0"; + sha256 = "1xnh1jl33a84pi0cyz62wxwrgfx3amdwc3f906a1wa9bwy7xkcih"; libraryHaskellDepends = [ array base binary bytestring ghc-prim primitive ]; @@ -147414,6 +154921,7 @@ self: { homepage = "https://github.com/hvr/packunused"; description = "Tool for detecting redundant Cabal package dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pacman-memcache" = callPackage @@ -147448,6 +154956,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pads-haskell" = callPackage + ({ mkDerivation, base, byteorder, bytestring, Cabal, containers + , directory, Glob, haskell-src, haskell-src-meta, HUnit + , mainland-pretty, mtl, normaldistribution, old-locale, parsec + , QuickCheck, random, regex-posix, syb, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , th-lift, time, transformers + }: + mkDerivation { + pname = "pads-haskell"; + version = "0.0.0.1"; + sha256 = "1glf9zfzl8lg6hvqzh76y7kpi1d8jhxgxplnkzz4pdzrh1dfzm9a"; + revision = "1"; + editedCabalFile = "1nfh2i2g4xzqr534hkwa7gygkgsdvyjk4g075n78dp6r48zynbz6"; + libraryHaskellDepends = [ + base byteorder bytestring containers Glob haskell-src + haskell-src-meta HUnit mainland-pretty normaldistribution + old-locale parsec random regex-posix syb template-haskell th-lift + time transformers + ]; + testHaskellDepends = [ + base byteorder bytestring Cabal containers directory Glob + haskell-src haskell-src-meta HUnit mainland-pretty mtl old-locale + parsec QuickCheck regex-posix syb template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 th-lift time + transformers + ]; + homepage = "http://www.padsproj.org"; + description = "PADS data description language for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pagarme" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, lens, text , wreq @@ -147520,6 +155060,8 @@ self: { pname = "pagination"; version = "0.2.1"; sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48"; + revision = "2"; + editedCabalFile = "0wvwi3hymp2vhhpzpycdc65zbsqmi2h0c6r0nf8p5nkgsk4pm1k2"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; homepage = "https://github.com/mrkkrp/pagination"; @@ -147594,8 +155136,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) pam;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {pam = null;}; "panda" = callPackage ({ mkDerivation, base, cgi, containers, data-default, directory @@ -147620,72 +155162,24 @@ self: { }) {}; "pandoc" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , Cabal, cmark, containers, criterion, data-default, deepseq, Diff - , directory, doctemplates, executable-path, extensible-exceptions - , filemanip, filepath, ghc-prim, haddock-library, hslua, HTTP - , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl - , network, network-uri, old-time, pandoc-types, parsec, process - , QuickCheck, random, scientific, SHA, skylighting, syb, tagsoup - , temporary, test-framework, test-framework-hunit - , test-framework-quickcheck2, texmath, text, time, unix - , unordered-containers, vector, xml, yaml, zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "1.19.2.4"; - sha256 = "0mim429mpakrcnm50csxyqk3ljcx2l26r5grk6w9isnggwgqrq5v"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson array base base64-bytestring binary blaze-html blaze-markup - bytestring cmark containers data-default deepseq directory - doctemplates extensible-exceptions filemanip filepath ghc-prim - haddock-library hslua HTTP http-client http-client-tls http-types - JuicyPixels mtl network network-uri old-time pandoc-types parsec - process random scientific SHA skylighting syb tagsoup temporary - texmath text time unordered-containers vector xml yaml zip-archive - zlib - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory extensible-exceptions - filepath HTTP network network-uri pandoc-types skylighting texmath - text unix yaml - ]; - testHaskellDepends = [ - ansi-terminal base bytestring containers Diff directory - executable-path filepath HUnit pandoc-types process QuickCheck - skylighting syb test-framework test-framework-hunit - test-framework-quickcheck2 text zip-archive - ]; - benchmarkHaskellDepends = [ base criterion syb ]; - doCheck = false; - homepage = "http://pandoc.org"; - description = "Conversion between markup formats"; - license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "pandoc_2_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default - , deepseq, Diff, directory, doctemplates, executable-path, filepath - , Glob, haddock-library, hslua, HTTP, http-client, http-client-tls - , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types - , parsec, process, QuickCheck, random, safe, scientific, SHA - , skylighting, split, syb, tagsoup, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, temporary, texmath, text, time - , unix, unordered-containers, vector, xml, yaml, zip-archive, zlib + , deepseq, Diff, directory, doctemplates, exceptions + , executable-path, filepath, Glob, haddock-library, hslua + , hslua-module-text, HTTP, http-client, http-client-tls, http-types + , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec + , process, QuickCheck, random, safe, scientific, SHA, skylighting + , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, temporary, texmath, text, time, unix + , unordered-containers, vector, xml, yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.0.2"; - sha256 = "1ygrxq5hpzr29pdmir3ms2crihg1bqrdjlxjvm6yfq4pjdlxg7xp"; + version = "2.1.2"; + sha256 = "0rgba2vfh2n7kh2g75hmxa6pbjk6p73a4zwj00pfsvhwyvpjc2yw"; + revision = "1"; + editedCabalFile = "1vk5g5dbk7q8w9pncqgkn4wbdj83p20ca6ipb5vca532x2294x5b"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -147694,18 +155188,19 @@ self: { libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive cmark-gfm containers - data-default deepseq directory doctemplates filepath Glob - haddock-library hslua HTTP http-client http-client-tls http-types - JuicyPixels mtl network network-uri pandoc-types parsec process - random safe scientific SHA skylighting split syb tagsoup temporary - texmath text time unix unordered-containers vector xml yaml - zip-archive zlib + data-default deepseq directory doctemplates exceptions filepath + Glob haddock-library hslua hslua-module-text HTTP http-client + http-client-tls http-types JuicyPixels mtl network network-uri + pandoc-types parsec process random safe scientific SHA skylighting + split syb tagsoup temporary texmath text time unix + unordered-containers vector xml yaml zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring containers Diff directory executable-path filepath - hslua pandoc-types process QuickCheck tasty tasty-golden - tasty-hunit tasty-quickcheck temporary text zip-archive + base base64-bytestring bytestring containers Diff directory + executable-path filepath Glob hslua pandoc-types process QuickCheck + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time + xml zip-archive ]; benchmarkHaskellDepends = [ base bytestring containers criterion text time @@ -147714,83 +155209,93 @@ self: { homepage = "http://pandoc.org"; description = "Conversion between markup formats"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, 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 + "pandoc_2_1_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , Cabal, case-insensitive, cmark-gfm, containers, criterion + , data-default, deepseq, Diff, directory, doctemplates, exceptions + , executable-path, filepath, Glob, haddock-library, hslua + , hslua-module-text, HTTP, http-client, http-client-tls, http-types + , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec + , process, QuickCheck, random, safe, scientific, SHA, skylighting + , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, temporary, texmath, text, time, unix + , unordered-containers, vector, weigh, xml, yaml, zip-archive, zlib }: mkDerivation { - pname = "pandoc-citeproc"; - version = "0.10.5.1"; - sha256 = "10x7rpz48611696fw7h9m62qm1y9qxzvrc2jk0b9h840mn08n0s9"; - revision = "1"; - editedCabalFile = "0w8r8z34m934cbja0qkhna04aac97k9i899l4c59cd0ym21148cz"; + pname = "pandoc"; + version = "2.1.3"; + sha256 = "023h0jdn996q37p8b5wdi1hifq17drrwbfq92c6imxwk2a4rl3jf"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; 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 containers directory - filepath mtl pandoc pandoc-types process syb temporary text vector - yaml + aeson aeson-pretty base base-compat base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive cmark-gfm + containers data-default deepseq directory doctemplates exceptions + filepath Glob haddock-library hslua hslua-module-text HTTP + http-client http-client-tls http-types JuicyPixels mtl network + network-uri pandoc-types parsec process random safe scientific SHA + skylighting split syb tagsoup temporary texmath text time unix + unordered-containers vector xml yaml zip-archive zlib ]; + executableHaskellDepends = [ base base-compat ]; testHaskellDepends = [ - aeson base bytestring directory filepath mtl pandoc pandoc-types - process temporary text yaml + base base-compat base64-bytestring bytestring containers Diff + directory executable-path filepath Glob hslua pandoc-types process + QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck + temporary text time xml zip-archive + ]; + benchmarkHaskellDepends = [ + base base-compat bytestring containers criterion mtl text time + weigh ]; doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; + homepage = "https://pandoc.org"; + description = "Conversion between markup formats"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc-citeproc_0_12_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, 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 + "pandoc-citeproc" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat + , bytestring, Cabal, 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.12.1"; - sha256 = "1b62bzvdmxb6dlpfawvvimaa0pd8nq9l3mbnwgzw3xzj1idv44kz"; + version = "0.14.3"; + sha256 = "1z27x8bd8zxmqrxlapzxkc0g65ix7ig96d0bwzq3i521fzig85bj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; 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 + aeson base base-compat 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 containers directory - filepath mtl pandoc pandoc-types process syb temporary text vector - yaml + aeson aeson-pretty attoparsec base base-compat bytestring filepath + pandoc pandoc-types syb text yaml ]; testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml + aeson base base-compat bytestring containers 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 @@ -147813,13 +155318,14 @@ self: { "pandoc-crossref" = callPackage ({ mkDerivation, base, containers, data-accessor , data-accessor-template, data-accessor-transformers, data-default - , directory, filepath, hspec, mtl, pandoc, pandoc-types - , roman-numerals, syb, template-haskell, text, utility-ht + , deepseq, directory, filepath, hspec, mtl, open-browser + , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb + , template-haskell, temporary, text, utility-ht }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.7.0"; - sha256 = "1nh9yi2p7i8ms45rfd5859639f8rh5vxnvdqrdi399rmnp74vj9k"; + version = "0.3.1.0"; + sha256 = "11lvsr30f0x2vsqnwr4s3j9v3n4zxx5a83qc95j5c1xijlrzcc3k"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -147831,9 +155337,9 @@ self: { ]; executableHaskellDepends = [ base containers data-accessor data-accessor-template - data-accessor-transformers data-default directory filepath mtl - pandoc pandoc-types roman-numerals syb template-haskell text - utility-ht + data-accessor-transformers data-default deepseq directory filepath + mtl open-browser optparse-applicative pandoc pandoc-types + roman-numerals syb template-haskell temporary text utility-ht ]; testHaskellDepends = [ base containers data-accessor data-accessor-template @@ -147861,6 +155367,32 @@ self: { homepage = "https://github.com/baig/pandoc-csv2table-filter"; description = "Convert CSV to Pandoc Table Markdown"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pandoc-emphasize-code" = callPackage + ({ mkDerivation, base, filepath, hashable, lucid, mtl, pandoc-types + , process, tasty, tasty-discover, tasty-hspec, tasty-hunit, text + , unordered-containers + }: + mkDerivation { + pname = "pandoc-emphasize-code"; + version = "0.2.3"; + sha256 = "09jk13binvv6yqpdgkadx54npngn4vbg6z7k2q78cj4ypirbcpl0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath hashable lucid mtl pandoc-types process text + unordered-containers + ]; + executableHaskellDepends = [ base pandoc-types ]; + testHaskellDepends = [ + base pandoc-types tasty tasty-discover tasty-hspec tasty-hunit + unordered-containers + ]; + homepage = "https://github.com/owickstrom/pandoc-emphasize-code"; + description = "A Pandoc filter for emphasizing code in fenced blocks"; + license = stdenv.lib.licenses.mpl20; }) {}; "pandoc-filter-graphviz" = callPackage @@ -147902,23 +155434,28 @@ self: { homepage = "https://github.com/steindani/pandoc-include"; description = "Include other Markdown files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-include-code" = callPackage - ({ mkDerivation, base, filepath, mtl, pandoc-types, process, tasty - , tasty-hunit, text, unordered-containers + ({ mkDerivation, base, filepath, hspec, hspec-expectations, mtl + , pandoc-types, process, tasty, tasty-hspec, tasty-hunit, text + , unordered-containers }: mkDerivation { pname = "pandoc-include-code"; - version = "1.2.0.1"; - sha256 = "1qcmhdx47grgjydq0dzcz6iss247p0y8432bpw908ygr222gkqhp"; + version = "1.3.0.0"; + sha256 = "1klmshyakhli0g9prqnllyrh9hsj67lps5b1cxh3jjlb6mxg5ic4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath mtl pandoc-types process text unordered-containers ]; executableHaskellDepends = [ base pandoc-types ]; - testHaskellDepends = [ base pandoc-types tasty tasty-hunit ]; + testHaskellDepends = [ + base hspec hspec-expectations pandoc-types tasty tasty-hspec + tasty-hunit + ]; homepage = "https://github.com/owickstrom/pandoc-include-code"; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; @@ -147949,14 +155486,13 @@ self: { ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { pname = "pandoc-lens"; - version = "0.6.2"; - sha256 = "18v22salncjdghpg6gz78mpf9wp5qk622jia77qwlh9di36jdqg5"; - revision = "1"; - editedCabalFile = "1b3qk1afdd9l6i625spm26cgzmmd3bqmyp0lfszjnaf32ac7sldd"; + version = "0.6.3"; + sha256 = "1gv9n753qp8l7fivi96sgb8qsia5bijw2fla21dxyn81qza3fk6v"; libraryHaskellDepends = [ base containers lens pandoc-types ]; homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-placetable" = callPackage @@ -148036,29 +155572,30 @@ self: { }) {}; "pandoc-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers }: mkDerivation { pname = "pandoc-types"; - version = "1.17.0.5"; - sha256 = "1csipjdq00iiq77k2wlrg4i7afrzlh8nl585q785xzw7nn45b0n8"; - revision = "4"; - editedCabalFile = "1ljvzl41ikfwwdh253mwpqjr7c4vf1ib01sxvp66ahi7vpxshm7n"; + version = "1.17.3.1"; + sha256 = "0dhp5bcjl6605n2chiab5rp51zir3671gxkmwy34znh0s3vp85jb"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb + transformers ]; testHaskellDepends = [ aeson base bytestring containers HUnit QuickCheck string-qq syb test-framework test-framework-hunit test-framework-quickcheck2 ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-types_1_17_3" = callPackage + "pandoc-types_1_17_4_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -148066,8 +155603,10 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.17.3"; - sha256 = "0k6z5ixgpi7gm4wlpvy2j7zzv68xsqak7fhajrf0fb60dpn4ac0n"; + version = "1.17.4.2"; + sha256 = "1jiy4siyfcf4z0m0kn0z58cbrsvggavlxljrcb4srwblih55xqap"; + revision = "1"; + editedCabalFile = "0izgzjfl7l4fb6xd5iqcy5zca4m1vzvr5xqgccw45vkm8q3arqnf"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -148156,6 +155695,23 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) pango;}; + "pangraph" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , hexml, HUnit + }: + mkDerivation { + pname = "pangraph"; + version = "0.1.1.5"; + sha256 = "0p03sm5sna88h1j7gxkwdq0j5zhak38spqyhjlwc2vsrxjc4vjiy"; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers hexml + ]; + testHaskellDepends = [ base bytestring containers HUnit ]; + homepage = "https://github.com/tuura/pangraph#readme"; + description = "A set of parsers for graph languages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "panhandle" = callPackage ({ mkDerivation, aeson, base, containers, derive , lazysmallcheck2012, pandoc, pandoc-types, QuickCheck, syb, tagged @@ -148176,6 +155732,7 @@ self: { homepage = "http://chriswarbo.net/projects/activecode"; description = "Pandoc filter to unwrap nested blocks"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {lazysmallcheck2012 = null;}; @@ -148274,8 +155831,8 @@ self: { ({ mkDerivation, base, semigroups }: mkDerivation { pname = "papa-base-export"; - version = "0.3.1"; - sha256 = "13gd3ldpiwmms3di80smk68x4mf9nigy0irz506cayd9bwqpw3jv"; + version = "0.4"; + sha256 = "120b3ks9h3m9w6z365hmqrcp349kh3w8ii4kgki1zxjhh9z05mnm"; libraryHaskellDepends = [ base semigroups ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; @@ -148353,6 +155910,7 @@ self: { homepage = "https://github.com/data61/papa-export"; description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-implement" = callPackage @@ -148375,6 +155933,7 @@ self: { homepage = "https://github.com/data61/papa"; description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-include" = callPackage @@ -148392,6 +155951,7 @@ self: { homepage = "https://github.com/data61/papa-include"; description = "Third party libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-lens" = callPackage @@ -148447,6 +156007,7 @@ self: { homepage = "https://github.com/data61/papa-prelude"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-prelude-core" = callPackage @@ -148464,6 +156025,7 @@ self: { homepage = "https://github.com/data61/papa-prelude-core"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-prelude-lens" = callPackage @@ -148499,6 +156061,7 @@ self: { homepage = "https://github.com/data61/papa-prelude-semigroupoids"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-prelude-semigroups" = callPackage @@ -148516,6 +156079,7 @@ self: { homepage = "https://github.com/data61/papa-prelude-semigroups"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-semigroupoids" = callPackage @@ -148605,6 +156169,7 @@ self: { executableHaskellDepends = [ base bytestring containers ]; description = "A passphrase generator"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papillon" = callPackage @@ -148613,8 +156178,8 @@ self: { }: mkDerivation { pname = "papillon"; - version = "0.1.0.4"; - sha256 = "0g2kanpy8jqi6kmhwk0xy5bjpafnc21cgzp49xxw5zgmpn14amis"; + version = "0.1.0.5"; + sha256 = "1c42mmhgwgdz2adpby9134cyzgp8nfyxl0671d1fs3ybsl2zz17k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148628,14 +156193,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "papillon_0_1_0_5" = callPackage + "papillon_0_1_0_6" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, monads-tf , template-haskell, transformers }: mkDerivation { pname = "papillon"; - version = "0.1.0.5"; - sha256 = "1c42mmhgwgdz2adpby9134cyzgp8nfyxl0671d1fs3ybsl2zz17k"; + version = "0.1.0.6"; + sha256 = "1j0sxac7pgwfbgb545ysjsw7haz6m41m6gz5z8v3xawjhx662nib"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148746,6 +156311,8 @@ self: { pname = "parallel"; version = "3.2.1.1"; sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj"; + revision = "1"; + editedCabalFile = "12sgigg7r4nmyhbfn1p09ajf4s576yca31b7daj5zpp1mxgb5x7i"; libraryHaskellDepends = [ array base containers deepseq ]; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; @@ -148801,14 +156368,13 @@ self: { ({ mkDerivation, base, data-diverse, hspec, transformers }: mkDerivation { pname = "parameterized"; - version = "0.4.0.0"; - sha256 = "0jv0ff4frpds69a6bljyh2jzm0yj7hjd923xss136xsrb4dka700"; + version = "0.5.0.0"; + sha256 = "0iik6wx6i52sqgiah9xb70cv4p29yi2fr0q6ri4c9wviqrrw8syp"; libraryHaskellDepends = [ base data-diverse transformers ]; testHaskellDepends = [ base data-diverse hspec transformers ]; homepage = "https://github.com/louispan/parameterized#readme"; description = "Parameterized/indexed monoids and monads using only a single parameter type variable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parameterized-data" = callPackage @@ -148823,6 +156389,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parameterized-utils" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, hashable + , hashtables, lens, mtl, QuickCheck, tasty, tasty-ant-xml + , tasty-hunit, tasty-quickcheck, template-haskell, text + , th-abstraction, vector + }: + mkDerivation { + pname = "parameterized-utils"; + version = "1.0.0"; + sha256 = "0x1h38j61rwk6biz6nfqx252q1qy4wjrm7g4yv2bb9rddn131vaw"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim hashable hashtables lens mtl + template-haskell text th-abstraction vector + ]; + testHaskellDepends = [ + base ghc-prim hashable hashtables lens mtl QuickCheck tasty + tasty-ant-xml tasty-hunit tasty-quickcheck + ]; + description = "Classes and data structures for working with data-kind indexed types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "paramtree" = callPackage ({ mkDerivation, base, bytestring, containers, tasty, tasty-golden , tasty-hunit, temporary @@ -148838,6 +156426,7 @@ self: { homepage = "https://github.com/merijn/paramtree"; description = "Generate labelled test/benchmark trees from sets of parameters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "paranoia" = callPackage @@ -148920,13 +156509,12 @@ self: { }) {}; "parconc-examples" = callPackage - ({ mkDerivation, abstract-par, accelerate, accelerate-io, array - , async, base, binary, bytestring, containers, deepseq, directory + ({ mkDerivation, abstract-par, accelerate, array, async, base + , binary, bytestring, containers, deepseq, directory , distributed-process, distributed-process-simplelocalnet - , distributed-static, fclabels, filepath, http-conduit, monad-par - , network, network-uri, normaldistribution, parallel, random, repa - , stm, template-haskell, time, transformers, utf8-string, vector - , xml + , distributed-static, filepath, http-conduit, monad-par, network + , network-uri, normaldistribution, parallel, random, repa, stm + , template-haskell, time, transformers, utf8-string, vector, xml }: mkDerivation { pname = "parconc-examples"; @@ -148935,12 +156523,12 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ - abstract-par accelerate accelerate-io array async base binary - bytestring containers deepseq directory distributed-process - distributed-process-simplelocalnet distributed-static fclabels - filepath http-conduit monad-par network network-uri - normaldistribution parallel random repa stm template-haskell time - transformers utf8-string vector xml + abstract-par accelerate array async base binary bytestring + containers deepseq directory distributed-process + distributed-process-simplelocalnet distributed-static filepath + http-conduit monad-par network network-uri normaldistribution + parallel random repa stm template-haskell time transformers + utf8-string vector xml ]; homepage = "http://github.com/simonmar/parconc-examples"; description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\""; @@ -148970,7 +156558,6 @@ self: { libraryHaskellDepends = [ array base ]; description = "Simply interfacing the parallel port on linux"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "parse-dimacs" = callPackage @@ -149025,13 +156612,15 @@ self: { }: mkDerivation { pname = "parsec"; - version = "3.1.11"; - sha256 = "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg"; + version = "3.1.13.0"; + sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq"; + revision = "1"; + editedCabalFile = "1dpr1wfpykkl6kayp4wnyn0n1zv7pvqksax2i54dhdgjijj8qynd"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ - base HUnit test-framework test-framework-hunit + base HUnit mtl test-framework test-framework-hunit ]; - homepage = "https://github.com/aslatter/parsec"; + homepage = "https://github.com/hvr/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -149061,6 +156650,7 @@ self: { homepage = "https://github.com/jwiegley/parsec-free"; description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec-numbers" = callPackage @@ -149269,25 +156859,12 @@ self: { ({ 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-combinators_0_2_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "parser-combinators"; - version = "0.2.0"; - sha256 = "1gz3kh56471924y12vvmrc5w4bx85a53qrp2j8fp33nn78bvx8v8"; + version = "0.4.0"; + sha256 = "1azkz0a6ikym02s8wydjcklp7rz8k512bs4s9lp9g1g03m0yj95i"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mrkkrp/parser-combinators"; description = "Lightweight package providing commonly useful parser combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parser-helper" = callPackage @@ -149345,23 +156922,21 @@ self: { }) {}; "parsers" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal - , cabal-doctest, charset, containers, directory, doctest, filepath - , mtl, parsec, QuickCheck, quickcheck-instances, scientific - , semigroups, text, transformers, unordered-containers + ({ mkDerivation, attoparsec, base, base-orphans, bytestring + , charset, containers, mtl, parsec, QuickCheck + , quickcheck-instances, scientific, semigroups, text, transformers + , unordered-containers }: mkDerivation { pname = "parsers"; - version = "0.12.7"; - sha256 = "032dgh0ydy4cbvnjhgp0krnqnvlibphvm30gvmqvpxk9l4pmn435"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.12.8"; + sha256 = "1j3bh008klx5nqpp9566k783c2msjsv5ia2w2jdx6frzspyhmfjs"; libraryHaskellDepends = [ attoparsec base base-orphans charset containers mtl parsec scientific semigroups text transformers unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring containers directory doctest filepath - parsec QuickCheck quickcheck-instances + attoparsec base bytestring parsec QuickCheck quickcheck-instances ]; homepage = "http://github.com/ekmett/parsers/"; description = "Parsing combinators"; @@ -149427,23 +157002,20 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "partial"; - version = "0.1.0.0"; - sha256 = "0ybh0yz68gawbfswk1s498asc1z7qw6b8qys7rasw5i5iw6vjvr8"; - revision = "1"; - editedCabalFile = "0wp1cqv9n9ff4wlxk7q17m0vd1dfh8wxljmmdc01l41gzc6bp77l"; + version = "1.0.0.0"; + sha256 = "1pgmiddwhk40bzhwznv6lwmxglsnp41z45qhpd5cm0nh2wmzgx5p"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/paf31/partial"; description = "A nullary type class for partial functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-handler" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "partial-handler"; - version = "1.0.2"; - sha256 = "1wd4dad207ljw4pfcx4v1qx38mbppjdjjwz17gmk2rhlyj8z5sgs"; + version = "1.0.3"; + sha256 = "0cf1748zyr07zv0ffi44rf5b9f7ygdybbdcl7m7c0zj14kq2miwl"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/partial-handler"; description = "A composable exception handler"; @@ -149494,14 +157066,15 @@ self: { homepage = "https://github.com/mtesseract/haskell-partial-order"; description = "Provides typeclass suitable for types admitting a partial order"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup" = callPackage ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.3.0.2"; - sha256 = "0r2rhcq73lb18j03h5nk7j6vzv9qxjnw8zsir3zy6cynkv4w35zd"; + version = "0.3.0.3"; + sha256 = "1vsn82kpv2ny4yjj8gq8xaq8kvi55wzy8ix0k4lsppsda8j3s9rx"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog ]; homepage = "https://github.com/chris-martin/partial-semigroup"; @@ -149589,6 +157162,53 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "passman-cli" = callPackage + ({ mkDerivation, base, conduit, contravariant, haskeline + , optparse-applicative, passman-core, resourcet, text, X11, yaml + }: + mkDerivation { + pname = "passman-cli"; + version = "0.2.0.0"; + sha256 = "0l0cbhngg2dxsy95a24x1g19cpnmngcgdkxklzjymmcnqmxp7jd8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base conduit contravariant haskeline optparse-applicative + passman-core resourcet text X11 yaml + ]; + homepage = "https://github.com/PasswordManager/passman-cli#readme"; + description = "Deterministic password generator command line interface"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "passman-core" = callPackage + ({ mkDerivation, aeson, async, base, bcrypt, bytestring, conduit + , conduit-extra, containers, cryptohash-md5, csv-conduit + , data-ordlist, directory, filepath, int-cast, memory, QuickCheck + , quickcheck-unicode, resourcet, template-haskell, temporary, text + , unix-compat, yaml + }: + mkDerivation { + pname = "passman-core"; + version = "0.2.0.0"; + sha256 = "03l43n8r0jdxbc07qjdazkanzd7lj1kp814ylhvn0ri9zzyfcgm7"; + libraryHaskellDepends = [ + aeson base bcrypt bytestring conduit conduit-extra containers + cryptohash-md5 csv-conduit data-ordlist directory filepath int-cast + memory resourcet text unix-compat yaml + ]; + testHaskellDepends = [ + async base conduit filepath QuickCheck quickcheck-unicode + template-haskell temporary text yaml + ]; + doHaddock = false; + homepage = "https://github.com/PasswordManager/passman-core#readme"; + description = "Deterministic password generator core"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "passwords" = callPackage ({ mkDerivation, base, containers, MonadRandom, random }: mkDerivation { @@ -149653,8 +157273,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.5.2.2"; - sha256 = "01g74kw9qszz4781srqsjvf4vxf0rvb4q8yy5nbx3zyp4lwggv3j"; + version = "0.6.1.0"; + sha256 = "1i6vql76j5439bwdd1z7haphgm4x82rh08s22fc70hmfzkrln733"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -149666,6 +157286,7 @@ self: { homepage = "http://github.com/jaspervdj/patat"; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "patch-combinators" = callPackage @@ -149730,22 +157351,6 @@ self: { }) {}; "path" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , filepath, hashable, hspec, mtl, template-haskell - }: - mkDerivation { - pname = "path"; - 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 @@ -149754,6 +157359,8 @@ self: { pname = "path"; version = "0.6.1"; sha256 = "0nayla4k1gb821k8y5b9miflv1bi8f0czf9rqr044nrr2dddi2sb"; + revision = "1"; + editedCabalFile = "05b1zwx2a893h4h5wvgpc5g5pyx71hfmx409rqisd8s1bq1hn463"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell ]; @@ -149763,21 +157370,9 @@ self: { ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-extra" = callPackage - ({ mkDerivation, base, exceptions, path }: - mkDerivation { - pname = "path-extra"; - version = "0.0.5"; - sha256 = "0ks2h5w4zmgimhcxj6vxv3xrrkpjlfc21pdd8w4gbxci1gsd2jyh"; - libraryHaskellDepends = [ base exceptions path ]; - description = "Chris Done's path library, enriched with URL-related goodies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "path-extra_0_0_6" = callPackage ({ mkDerivation, base, exceptions, path }: mkDerivation { pname = "path-extra"; @@ -149786,30 +157381,28 @@ self: { libraryHaskellDepends = [ base exceptions path ]; description = "Chris Done's path library, enriched with URL-related goodies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "path-io" = callPackage - ({ mkDerivation, base, containers, directory, exceptions, filepath - , hspec, path, temporary, time, transformers, unix-compat + "path-extra_0_2_0" = callPackage + ({ mkDerivation, attoparsec, base, path, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text }: mkDerivation { - pname = "path-io"; - version = "1.2.2"; - sha256 = "0ipy07jb1d34jisy8khwx1j2p2s4lm2z8dy5siywi1a206fmy9bj"; - revision = "1"; - editedCabalFile = "1r73clpws32ql3wnh6gp9dn4knzxgcgl6j7ihdkmq6ai21bznw6m"; - libraryHaskellDepends = [ - base containers directory exceptions filepath path temporary time - transformers unix-compat + pname = "path-extra"; + version = "0.2.0"; + sha256 = "0fh4m3vidf75j43rk1n46y3bsn0j4247bz71s35651vi9s8vw27b"; + libraryHaskellDepends = [ attoparsec base path text ]; + testHaskellDepends = [ + attoparsec base path QuickCheck quickcheck-instances tasty + tasty-quickcheck text ]; - testHaskellDepends = [ base exceptions hspec path unix-compat ]; - homepage = "https://github.com/mrkkrp/path-io"; - description = "Interface to ‘directory’ package for users of ‘path’"; + homepage = "https://github.com/athanclark/path-extra#readme"; + description = "URLs without host information"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "path-io_1_3_3" = callPackage + "path-io" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: @@ -149817,6 +157410,8 @@ self: { pname = "path-io"; version = "1.3.3"; sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a"; + revision = "3"; + editedCabalFile = "1h9hsibbflkxpjl2fqamqiv3x3gasf51apnmklrs9l9x8r32hzcc"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -149827,7 +157422,6 @@ self: { 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 @@ -149849,12 +157443,14 @@ self: { ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { pname = "path-text-utf8"; - version = "0.0.0.2"; - sha256 = "0m1rmzyjsiwb1k1rpj7mwjmbg6y9rmbv69bxqm0pbc6ylkh678ja"; + version = "0.0.1.0"; + sha256 = "0z7k6wj4p9192blrxnnmq79km4f6sm8lagp01vznc1gmy1p0w4cg"; + revision = "1"; + editedCabalFile = "1m04dyqqamh9lkkmcbf2dg7ivd5kb2dxqh9b844lr7mk5qganar6"; libraryHaskellDepends = [ base bytestring path safe-exceptions text ]; - homepage = "https://github.com/chris-martin/path-text-utf8#readme"; + homepage = "https://github.com/chris-martin/path-text-utf8"; description = "Read and write UTF-8 text files"; license = stdenv.lib.licenses.asl20; }) {}; @@ -149872,13 +157468,19 @@ self: { }) {}; "pathfindingcore" = callPackage - ({ mkDerivation, array, base, HUnit, split, tasty, tasty-hunit }: + ({ mkDerivation, array, base-noprelude, bizzlelude, split, tasty + , tasty-hunit, text + }: mkDerivation { pname = "pathfindingcore"; - version = "1.2.1"; - sha256 = "1q6zh1s414xw9plzapf2gwv4pk7sfnb4pmzsyzd8hxcfyy54ykyj"; - libraryHaskellDepends = [ array base split ]; - testHaskellDepends = [ array base HUnit tasty tasty-hunit ]; + version = "1.3.0"; + sha256 = "1hrq9xj7hw90v4b336awvlcvdyj2q7n87zf00vk59srdjqg41hjs"; + libraryHaskellDepends = [ + array base-noprelude bizzlelude split text + ]; + testHaskellDepends = [ + array base-noprelude bizzlelude tasty tasty-hunit + ]; homepage = "http://github.com/TheBizzle"; description = "A toy pathfinding library"; license = stdenv.lib.licenses.bsd3; @@ -149887,14 +157489,15 @@ self: { "paths" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath - , time + , template-haskell, text, time }: mkDerivation { pname = "paths"; - version = "0.1"; - sha256 = "0cccvc2p04rmhbg61jaa592jd86dp08ipamk3ddvswr5ih3rhdgx"; + version = "0.2.0.0"; + sha256 = "18pzjlnmx7w79riig7qzyhw13jla92lals9lwayl23qr02ndna4v"; libraryHaskellDepends = [ - base bytestring deepseq directory filepath time + base bytestring deepseq directory filepath template-haskell text + time ]; description = "Library for representing and manipulating type-safe file paths"; license = stdenv.lib.licenses.bsd3; @@ -149902,17 +157505,17 @@ self: { "pathtype" = callPackage ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck - , random, tagged, time, transformers, utility-ht + , random, semigroups, tagged, time, transformers, utility-ht }: mkDerivation { pname = "pathtype"; - version = "0.8"; - sha256 = "15vqybkblvf89v83j0ypvmgy506r804wq3mlzqghcai27k8bkqql"; + version = "0.8.1"; + sha256 = "03rlj8klzxqimjv44h07xbij0acr63pddxppq9yfjlyggmaxrrnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base deepseq directory old-time QuickCheck tagged time transformers - utility-ht + base deepseq directory old-time QuickCheck semigroups tagged time + transformers utility-ht ]; testHaskellDepends = [ base random ]; homepage = "http://hub.darcs.net/thielema/pathtype/"; @@ -150096,6 +157699,7 @@ self: { homepage = "https://github.com/githubuser/pb-next#readme"; description = "Utility CLI for working with protobuf files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pbc4hs" = callPackage @@ -150234,8 +157838,8 @@ self: { }: mkDerivation { pname = "pcf-font-embed"; - version = "0.1.1.0"; - sha256 = "0mp4kwx77vx6l2cl7kzqw4pa4wdwdm58g8imph814waygxkbrj4g"; + version = "0.1.2.0"; + sha256 = "0lgx62ig2rvxcv9sgk53pfr8gkfimb1xm6lxpc2rr74mdzp52pf5"; libraryHaskellDepends = [ base bytestring pcf-font template-haskell vector ]; @@ -150250,8 +157854,8 @@ self: { }: mkDerivation { pname = "pcg-random"; - version = "0.1.3.4"; - sha256 = "1bl9dp7p0pxy886z36flh6f3a3w48f44k8iwci1v37x3fl4cbzj1"; + version = "0.1.3.5"; + sha256 = "1920g1babivacds27m0gbjs9mylwiknjykvbrpagzq7r0n4gyhyy"; libraryHaskellDepends = [ base bytestring entropy primitive random ]; @@ -150373,6 +157977,7 @@ self: { homepage = "https://github.com/NCrashed/pdf-slave#readme"; description = "Tool to generate PDF from haskintex templates and YAML input"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-slave-server" = callPackage @@ -150407,6 +158012,7 @@ self: { homepage = "https://github.com/NCrashed/pdf-slave-server#readme"; description = "Web service for pdf-slave tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {pdf-slave-server-api = null;}; @@ -150549,7 +158155,6 @@ self: { homepage = "https://github.com/asr/pdfname#readme"; description = "Name a PDF file using information from the pdfinfo command"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdfsplit" = callPackage @@ -150663,6 +158268,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pedersen-commitment" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, memory + , mtl, protolude, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , text + }: + mkDerivation { + pname = "pedersen-commitment"; + version = "0.1.0"; + sha256 = "10flwinxxs1vg2giqqyazcgxrykqsj6m0kgd62b8f4wzmygws4r1"; + libraryHaskellDepends = [ + base bytestring containers cryptonite memory mtl protolude text + ]; + testHaskellDepends = [ + base bytestring containers cryptonite memory mtl protolude + QuickCheck tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/adjoint-io/pedersen-commitment#readme"; + description = "An implementation of Pedersen commitment schemes"; + license = stdenv.lib.licenses.asl20; + }) {}; + "peg" = callPackage ({ mkDerivation, base, containers, filepath, haskeline, logict, mtl , parsec @@ -150696,7 +158322,6 @@ self: { base hashtables haskell-src-meta ListLike monad-control mtl template-haskell ]; - executableHaskellDepends = [ base ]; homepage = "http://tanakh.github.com/Peggy"; description = "The Parser Generator for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -150723,16 +158348,15 @@ self: { }) {}; "pem" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, HUnit, mtl + ({ mkDerivation, base, basement, bytestring, HUnit, memory , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 }: mkDerivation { pname = "pem"; - version = "0.2.2"; - sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base base64-bytestring bytestring mtl ]; + version = "0.2.4"; + sha256 = "1m7qjsxrd8m88cvkqmr8kscril500j2a9y0iynvksjyjkhdlq33p"; + libraryHaskellDepends = [ base basement bytestring memory ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 @@ -150742,6 +158366,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pencil" = callPackage + ({ mkDerivation, base, data-default, directory, doctest + , edit-distance, feed, filepath, hashable, hsass, mtl, pandoc + , parsec, semigroups, text, time, unordered-containers, vector, xml + , yaml + }: + mkDerivation { + pname = "pencil"; + version = "0.1.2"; + sha256 = "0wgs79vsz52cnmbcfzbb3avn98ciadnispgr98h6kwhgj5pmaxbm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default directory edit-distance feed filepath hashable + hsass mtl pandoc parsec semigroups text time unordered-containers + vector xml yaml + ]; + executableHaskellDepends = [ base text unordered-containers ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/elben/pencil"; + description = "Static site generator"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "penn-treebank" = callPackage ({ mkDerivation, base, containers, parsec }: mkDerivation { @@ -150920,76 +158569,72 @@ self: { }) {}; "perf" = callPackage - ({ mkDerivation, base, chart-unit, containers, foldl, formatting - , mwc-probability, optparse-generic, protolude, rdtsc, tdigest + ({ mkDerivation, base, containers, doctest, foldl, formatting + , numhask, optparse-generic, protolude, rdtsc, scientific, tdigest , text, time, vector }: mkDerivation { pname = "perf"; - version = "0.1.2"; - sha256 = "0ym5dy1zxbiaxf0jpwsf9ivf90lf5zhxznwvf4xynqvqkw602cmz"; + version = "0.3.1.1"; + sha256 = "0zwv6d18sxjn7xz4z0mx43gj3bavm4vyw1sxys6zlxr6xfpka20q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers foldl protolude rdtsc tdigest time + base containers foldl numhask protolude rdtsc tdigest time ]; executableHaskellDepends = [ - base chart-unit foldl formatting mwc-probability optparse-generic - protolude tdigest text vector + base formatting numhask optparse-generic protolude scientific text + vector ]; - homepage = "https://github.com/tonyday567/perf"; + testHaskellDepends = [ base doctest protolude ]; + homepage = "https://github.com/tonyday567/perf#readme"; description = "low-level performance statistics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "perf_0_3_0" = callPackage - ({ mkDerivation, base, containers, doctest, foldl, formatting - , numhask, optparse-generic, protolude, rdtsc, tdigest, text, time - , vector + "perf_0_4_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, doctest, foldl, rdtsc + , text, time, transformers }: mkDerivation { pname = "perf"; - version = "0.3.0"; - sha256 = "0l8q2jc3gfyair7x7jlx6aqs25m9f2ib9hdmzc3vfrh91ky67x1q"; - isLibrary = true; - isExecutable = true; + version = "0.4.0.1"; + sha256 = "1am2wzj43gi0naz5mwpvja9i005g05d6gpkqw0qvdy63mddz9b96"; libraryHaskellDepends = [ - base containers foldl numhask protolude rdtsc tdigest time - ]; - executableHaskellDepends = [ - base formatting numhask optparse-generic protolude text vector + base containers deepseq foldl rdtsc text time transformers ]; - testHaskellDepends = [ base doctest protolude ]; - homepage = "https://github.com/tonyday567/perf"; - description = "low-level performance statistics"; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/tonyday567/perf#readme"; + description = "Low-level run time measurement"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "perfect-hash-generator" = callPackage - ({ mkDerivation, base, containers, data-ordlist, directory - , filepath, hashable, HUnit, optparse-applicative, random - , test-framework, test-framework-hunit, unordered-containers - , vector + ({ mkDerivation, base, binary, bytestring, containers, data-ordlist + , directory, filepath, hashable, HUnit, optparse-applicative + , random, test-framework, test-framework-hunit, text + , unordered-containers, vector }: mkDerivation { pname = "perfect-hash-generator"; - version = "0.1.0.4"; - sha256 = "1g3z5q3wq1rzch3l6nb9x3k828hlrmqwqwyr5iz979rm0iif7yfy"; + version = "0.2.0.6"; + sha256 = "045iyxjnx1yzl9xqk5fv8qxjz29sg2pfndry1v24z6a5r88pcwnz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-ordlist directory filepath hashable - unordered-containers vector + base binary bytestring containers data-ordlist directory filepath + hashable text unordered-containers vector ]; executableHaskellDepends = [ - base containers hashable optparse-applicative random - unordered-containers vector + base binary bytestring containers hashable optparse-applicative + random text unordered-containers vector ]; testHaskellDepends = [ - base hashable HUnit optparse-applicative test-framework - test-framework-hunit unordered-containers vector + base binary bytestring hashable HUnit optparse-applicative + test-framework test-framework-hunit text unordered-containers + vector ]; homepage = "https://github.com/kostmo/perfect-hash-generator#readme"; description = "Perfect minimal hashing implementation in native Haskell"; @@ -151116,32 +158761,14 @@ self: { }) {}; "persistable-record" = callPackage - ({ mkDerivation, array, base, containers, dlist, names-th - , quickcheck-simple, template-haskell, th-data-compat, transformers - }: - mkDerivation { - pname = "persistable-record"; - version = "0.5.1.1"; - sha256 = "0n0ycgssq9aslbb024a59c3hgxbgwmd7cz8hz03ac07xdl7z9sc0"; - 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; - }) {}; - - "persistable-record_0_6_0_0" = callPackage ({ mkDerivation, array, base, containers, dlist, names-th , product-isomorphic, quickcheck-simple, template-haskell , th-data-compat, transformers }: mkDerivation { pname = "persistable-record"; - version = "0.6.0.0"; - sha256 = "097h8hx0si5mbi7c8l0mnwwzj166hn2vlfpgkkys17jxr8h6h31x"; + version = "0.6.0.3"; + sha256 = "12arj395b1famyy0hxp394ci2y3mkly68i82a26p67g5dpmdm466"; libraryHaskellDepends = [ array base containers dlist names-th product-isomorphic template-haskell th-data-compat transformers @@ -151150,7 +158777,6 @@ self: { 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 @@ -151170,26 +158796,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "persistent" = callPackage + "persistent_2_7_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers - , exceptions, fast-logger, hspec, http-api-data, lifted-base - , monad-control, monad-logger, mtl, old-locale, path-pieces - , resource-pool, resourcet, scientific, silently, tagged - , template-haskell, text, time, transformers, transformers-base - , unordered-containers, vector + , exceptions, fast-logger, haskell-src-meta, hspec, http-api-data + , lifted-base, monad-control, monad-logger, mtl, old-locale + , path-pieces, resource-pool, resourcet, scientific, silently + , tagged, template-haskell, text, time, transformers + , transformers-base, unordered-containers, vector }: mkDerivation { pname = "persistent"; - version = "2.7.1"; - sha256 = "079r6b1rvvwgagznxwf4j5i29jpqrvnck545ig004v2853r6x2f2"; + version = "2.7.3.1"; + sha256 = "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p"; + revision = "1"; + editedCabalFile = "17kdzvhakjqkif1xxrbgh1lwjd0sfd0ikl1jxrjn4il16jy7gazz"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers exceptions fast-logger http-api-data - lifted-base monad-control monad-logger mtl old-locale path-pieces - resource-pool resourcet scientific silently tagged template-haskell - text time transformers transformers-base unordered-containers - vector + bytestring conduit containers exceptions fast-logger + haskell-src-meta http-api-data lifted-base monad-control + monad-logger mtl old-locale path-pieces resource-pool resourcet + scientific silently tagged template-haskell text time transformers + transformers-base unordered-containers vector ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring @@ -151201,6 +158829,40 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + + "persistent" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, blaze-markup, bytestring, conduit, containers + , fast-logger, haskell-src-meta, hspec, http-api-data + , monad-control, monad-logger, mtl, old-locale, path-pieces + , resource-pool, resourcet, scientific, silently, tagged + , template-haskell, text, time, transformers, unliftio-core + , unordered-containers, vector, void + }: + mkDerivation { + pname = "persistent"; + version = "2.8.2"; + sha256 = "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html blaze-markup + bytestring conduit containers fast-logger haskell-src-meta + http-api-data monad-logger mtl old-locale path-pieces resource-pool + resourcet scientific silently tagged template-haskell text time + transformers unliftio-core unordered-containers vector void + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data monad-control + monad-logger mtl old-locale path-pieces resource-pool resourcet + scientific tagged template-haskell text time transformers + unordered-containers vector + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, multi-backend data serialization"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -151343,18 +159005,18 @@ self: { "persistent-mongoDB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal - , conduit, containers, http-api-data, monad-control, mongoDB - , network, path-pieces, persistent, resource-pool, resourcet, text - , time, transformers + , conduit, containers, http-api-data, mongoDB, network, path-pieces + , persistent, resource-pool, resourcet, text, time, transformers + , unliftio-core }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.6.0"; - sha256 = "1y94k4ymrwb1p881gzf6g3ppv41dsvc097cq4myfjcm22xaf4kp3"; + version = "2.8.0"; + sha256 = "12hp7cqdz672r5rhad6xvjpxhrs8v1swiz0d9n7xbn41g11a247l"; libraryHaskellDepends = [ aeson attoparsec base bson bytestring cereal conduit containers - http-api-data monad-control mongoDB network path-pieces persistent - resource-pool resourcet text time transformers + http-api-data mongoDB network path-pieces persistent resource-pool + resourcet text time transformers unliftio-core ]; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using mongoDB"; @@ -151363,17 +159025,17 @@ self: { "persistent-mysql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, mysql, mysql-simple - , persistent, resource-pool, resourcet, text, transformers + , containers, monad-logger, mysql, mysql-simple, persistent + , resource-pool, resourcet, text, transformers, unliftio-core }: mkDerivation { pname = "persistent-mysql"; - version = "2.6.2.1"; - sha256 = "0rk3rplz8y0b9macvb19w7m7ljnkq4gkmrjrdqdqcpga6ih357ik"; + version = "2.8.1"; + sha256 = "0m76hsrgv118bg6sawna6xwg30q8vl84zqa8qc9kll4hzbw2kk40"; libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger mysql mysql-simple persistent - resource-pool resourcet text transformers + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core ]; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using MySQL database server"; @@ -151382,45 +159044,20 @@ self: { "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-haskell"; - version = "0.3.0.0"; - sha256 = "19iy0whg8h59ahqrkdfilhs8rpbldk8ffa4sv3b9wvwl3ivb9cg4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - 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 = "A pure haskell backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - }) {}; - - "persistent-mysql-haskell_0_3_5" = 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 + , io-streams, monad-logger, mysql-haskell, network, persistent + , persistent-template, resource-pool, resourcet, text, time, tls + , transformers, unliftio-core }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.3.5"; - sha256 = "0sc6hw112d8jk1rflyrmcc8gkjddl41bbw6hksyv7a5w6sc7z33n"; + version = "0.4.0"; + sha256 = "1gcvfvyg0xf4m6qm78czdkqabqnx07wqkr6b6myfwy2g1frdhb0d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring conduit containers io-streams monad-control - monad-logger mysql-haskell network persistent resource-pool - resourcet text time tls transformers + aeson base bytestring conduit containers io-streams monad-logger + mysql-haskell network persistent resource-pool resourcet text time + tls transformers unliftio-core ]; executableHaskellDepends = [ base monad-logger persistent persistent-template transformers @@ -151451,6 +159088,7 @@ self: { homepage = "https://github.com/gbwey/persistent-odbc"; description = "Backend for the persistent library using ODBC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-parser" = callPackage @@ -151467,18 +159105,18 @@ 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 + , containers, monad-logger, persistent, postgresql-libpq + , postgresql-simple, resource-pool, resourcet, text, time + , transformers, unliftio-core }: mkDerivation { pname = "persistent-postgresql"; - version = "2.6.2"; - sha256 = "0140cki5c5aj21qg2cvqm5a511l6n4zbx3vb94hpfr1bs9nmfjam"; + version = "2.8.2.0"; + sha256 = "0j9g12fk1rlxhd45frxrj9bkmzrk1qbz611296af8nhxkw5wiwzj"; libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger persistent postgresql-libpq - postgresql-simple resource-pool resourcet text time transformers + aeson base blaze-builder bytestring conduit containers monad-logger + persistent postgresql-libpq postgresql-simple resource-pool + resourcet text time transformers unliftio-core ]; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; @@ -151514,6 +159152,7 @@ self: { homepage = "https://github.com/jprider63/persistent-ratelimit"; description = "A library for rate limiting activities with a persistent backend"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-redis" = callPackage @@ -151524,8 +159163,8 @@ self: { }: mkDerivation { pname = "persistent-redis"; - version = "2.5.2"; - sha256 = "04rbszmdykk3ks5qpfbvw6gpgqic6lqyyw49rjf3g4p1yhlmd9kv"; + version = "2.5.2.2"; + sha256 = "1mkdc3s39h0zqzf86zzwyfxfpc4fasrhpfdypkj8mkljbh7v1i1l"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring hedis http-api-data monad-control mtl path-pieces persistent scientific text time @@ -151538,7 +159177,6 @@ self: { ]; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-refs" = callPackage @@ -151563,8 +159201,8 @@ self: { }: mkDerivation { pname = "persistent-relational-record"; - version = "0.1.1.0"; - sha256 = "145am29vwjvvs93z8kqj4dgh71h64ascmqnd70w9g9qszb2rjwrm"; + version = "0.1.2.0"; + sha256 = "1xbrkf7vw872hxk6g7bv4c5hx0708x6sqf38a4qm0m9bf2qiakgd"; libraryHaskellDepends = [ base conduit containers mtl persistable-record persistent relational-query resourcet template-haskell text @@ -151579,16 +159217,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "persistent-sqlite" = callPackage + "persistent-sqlite_2_6_4" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-control, monad-logger, old-locale - , persistent, persistent-template, resource-pool, resourcet + , persistent, persistent-template, resource-pool, resourcet, sqlite , temporary, text, time, transformers, unordered-containers }: mkDerivation { pname = "persistent-sqlite"; - version = "2.6.3"; - sha256 = "0wgj8v6wkqvj60klmxlmhgmbl6yp3i425v95p8s45wm96phpzn9l"; + version = "2.6.4"; + sha256 = "16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm"; + configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151596,7 +159235,7 @@ self: { monad-logger old-locale persistent resource-pool resourcet text time transformers unordered-containers ]; - executableHaskellDepends = [ base monad-logger ]; + librarySystemDepends = [ sqlite ]; testHaskellDepends = [ base hspec persistent persistent-template temporary text time transformers @@ -151604,8 +159243,38 @@ 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 ]; - }) {}; + }) {inherit (pkgs) sqlite;}; + + "persistent-sqlite" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , hspec, microlens-th, monad-logger, old-locale, persistent + , persistent-template, resource-pool, resourcet, sqlite, temporary + , text, time, transformers, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.8.1.2"; + sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + old-locale persistent resource-pool resourcet text time + transformers unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + 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 ]; + }) {inherit (pkgs) sqlite;}; "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers @@ -151615,8 +159284,10 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.5.3"; - sha256 = "1b8n99l2dh4ng1pf86541q5s2is30scnsx3p3vzh0kif9myrk5cy"; + version = "2.5.4"; + sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc"; + revision = "1"; + editedCabalFile = "18mjv4z29cbrqjrsk2gm4bbc988437v8zxc5dynhj99fzjxzs9yr"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -151631,6 +159302,46 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-test" = callPackage + ({ mkDerivation, aeson, aeson-compat, attoparsec, base + , base64-bytestring, blaze-builder, blaze-html, blaze-markup + , bytestring, cereal, conduit, containers, exceptions, fast-logger + , hashable, hspec, hspec-expectations, http-api-data, HUnit + , lifted-base, monad-logger, mtl, network, old-locale, path-pieces + , persistent, persistent-sqlite, persistent-template, QuickCheck + , quickcheck-instances, random, resource-pool, resourcet + , scientific, semigroups, silently, system-fileio, system-filepath + , tagged, template-haskell, text, time, transformers + , transformers-base, unliftio, unliftio-core, unordered-containers + , vector + }: + mkDerivation { + pname = "persistent-test"; + version = "2.0.0.3"; + sha256 = "1xjjbr780ipzxkbnj8cly0xl8wxbvqjvm293aqm0rnkyqwndhbn3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-compat attoparsec base base64-bytestring blaze-builder + blaze-html blaze-markup bytestring cereal conduit containers + exceptions fast-logger hashable hspec hspec-expectations + http-api-data HUnit lifted-base monad-logger mtl network old-locale + path-pieces persistent persistent-sqlite persistent-template + QuickCheck quickcheck-instances random resource-pool resourcet + scientific semigroups silently tagged template-haskell text time + transformers transformers-base unliftio unliftio-core + unordered-containers vector + ]; + executableHaskellDepends = [ + base hspec persistent resourcet scientific system-fileio + system-filepath + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Tests for Persistent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-vector" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck , test-framework, test-framework-quickcheck2 @@ -151826,8 +159537,8 @@ self: { ({ mkDerivation, base, bytestring, HTTP }: mkDerivation { pname = "pg-harness-client"; - version = "0.4.0"; - sha256 = "0ifkrsgnihpn8g0g45yr7gap25dcxhrzlsnzriqajxb3sfk9xwpc"; + version = "0.5.0"; + sha256 = "0bqvrhkiwmqqp6w82d9xz7s31yjv2i0c3md0pc4fgvyr4gj2r2ki"; libraryHaskellDepends = [ base bytestring HTTP ]; homepage = "https://github.com/BardurArantsson/pg-harness"; description = "Client library for pg-harness-server"; @@ -151836,17 +159547,18 @@ self: { "pg-harness-server" = callPackage ({ mkDerivation, async, base, ini, postgresql-simple, random - , scotty, text, transformers + , scotty, text, transformers, warp }: mkDerivation { pname = "pg-harness-server"; - version = "0.4.0"; - sha256 = "0cfyjczs29qksh8kiyq256wv26yvw4ph7p0cvz5hnfjfjpj6r963"; + version = "0.5.1"; + sha256 = "0l7g99wh2znn3y3ma862j6yrmxdl9bjg2p4qaqf4iijxqxcrb1lq"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ async base ini postgresql-simple random scotty text transformers + warp ]; homepage = "https://github.com/BardurArantsson/pg-harness"; description = "REST service for creating temporary PostgreSQL databases"; @@ -151889,8 +159601,8 @@ self: { }: mkDerivation { pname = "pg-store"; - version = "0.4.3"; - sha256 = "1qqy79yqhwjw094p8i4qanmjwlvym7lndnqiw10mgp0xn63rznid"; + version = "0.5.0"; + sha256 = "0f81jqs5k6gb2rnpqhawc5g2z3dziksjxrncjc844xlq3ybmr5an"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring hashable haskell-src-meta mtl postgresql-libpq scientific tagged @@ -151938,10 +159650,10 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.9"; - sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; - revision = "7"; - editedCabalFile = "1blwncbg1r8is1jq2qbxqnsnr4k0n7qqws7xyh6xfyxpz4pr843g"; + version = "10.10"; + sha256 = "0wqj7i4shdcy80aiib0dkp3y6ccilqq4g3p8bvndh4vl3cyd2pwv"; + revision = "1"; + editedCabalFile = "17d525qv26y15zbc7kl0vdxfi7n1v1g8v9r821a96dd49zkccsck"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151952,6 +159664,7 @@ self: { ]; description = "browse directory listing webpages and download files from them"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgm" = callPackage @@ -152068,6 +159781,7 @@ self: { homepage = "https://github.com/quickdudley/phaser"; description = "Incremental multiple pass parser library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "phash" = callPackage @@ -152127,28 +159841,29 @@ self: { testHaskellDepends = [ base hspec ]; description = "Deprecated - ghci debug viewer with simple editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "phoityne-vscode" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cmdargs, conduit - , conduit-extra, ConfigFile, containers, directory, filepath - , fsnotify, hslogger, MissingH, mtl, parsec, process, resourcet - , safe, split, text, transformers + , conduit-extra, ConfigFile, containers, data-default, directory + , filepath, fsnotify, hslogger, lens, MissingH, mtl, parsec + , process, resourcet, safe, safe-exceptions, split, text + , transformers }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.18.0"; - sha256 = "1y9qrl1sskfyqdh7n6n467rjsf3zh969f072v3hrlrmlrd7y7vq0"; + version = "0.0.22.0"; + sha256 = "0ala51fps5yd1lk47blsbfby6sysnz2v39frmc53ggqzzlsls2q7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring Cabal cmdargs conduit conduit-extra - ConfigFile containers directory filepath fsnotify hslogger MissingH - mtl parsec process resourcet safe split text transformers + ConfigFile containers data-default directory filepath fsnotify + hslogger lens MissingH mtl parsec process resourcet safe + safe-exceptions split text transformers ]; homepage = "https://github.com/phoityne/phoityne-vscode"; - description = "ghci debug viewer on Visual Studio Code"; + description = "Haskell Debug Adapter for Visual Studio Code"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -152163,6 +159878,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Phonenumber Metadata - NOTE: this is now deprecated!"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "phone-numbers" = callPackage @@ -152235,8 +159951,8 @@ self: { }: mkDerivation { pname = "photoname"; - version = "3.2"; - sha256 = "1ygwhs79jrv5h1l407w41vfs96nd3kn2bl248j8bc1fh67kf6kka"; + version = "3.3"; + sha256 = "1fcl0m5hm6xvnzvn8v0l69vr7yh2q58six62147mwf4nlzny61gd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -152248,7 +159964,7 @@ self: { ]; homepage = "http://hub.darcs.net/dino/photoname"; description = "Rename photo image files based on EXIF shoot date"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -152481,6 +160197,7 @@ self: { homepage = "https://bitbucket.org/blamario/picoparsec"; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "picosat" = callPackage @@ -152508,6 +160225,7 @@ self: { executableHaskellDepends = [ base matrix transformers xml ]; description = "Converts a svg image to tikz code"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pid1" = callPackage @@ -152531,8 +160249,8 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "pidfile"; - version = "0.1.0.1"; - sha256 = "1ps8whs4aapwkl78yp55zfi7yzfgqmmhm7bz0llm4qwn8fcaiwas"; + version = "0.1.0.2"; + sha256 = "1iriansay0vq1b6crd1gc86ghv6iqcrnpflsa5b22x1lrlvxcwmj"; libraryHaskellDepends = [ base unix ]; homepage = "https://github.com/jonpetterbergman/pidfile"; description = "Run an IO action protected by a pidfile"; @@ -152553,12 +160271,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pig" = callPackage + ({ mkDerivation, base, containers, random, random-shuffle }: + mkDerivation { + pname = "pig"; + version = "0.0.1"; + sha256 = "0fh8lv85h2w6gs7zv1bqb4gc4id84c3vp3ivdrd9cvnxksr50ffr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers random random-shuffle ]; + executableHaskellDepends = [ + base containers random random-shuffle + ]; + description = "dice game"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "piki" = callPackage ({ mkDerivation, base, mtl, parsec, text }: mkDerivation { pname = "piki"; - version = "0.5.2"; - sha256 = "0rsc2anh20hlr2dfyh07dyrrfns0l1pibz6w129fp5l8m6h3xjin"; + version = "0.5.3"; + sha256 = "0704yazn6k4615chz4vkh4y1as9ks6kjgmmsggwrzsja7hk04hal"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -152566,7 +160301,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/piki/"; description = "Yet another text-to-html converter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinboard" = callPackage @@ -152578,8 +160312,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.12.6"; - sha256 = "0z5sfgvbckd636hi1girlfpfz2v21xydzi3d1py3q6hyq34b67iq"; + version = "0.9.12.9"; + sha256 = "0h2w2ah7cqv0blb2pcdlzd4ww1f92x5ixr5ksqdqdcyzij2pbmbn"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random @@ -152634,6 +160368,7 @@ self: { homepage = "http://www.github.com/massysett/pinchot"; description = "Write grammars, not parsers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ping-parser-attoparsec" = callPackage @@ -152682,6 +160417,42 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "pinpon" = callPackage + ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core + , amazonka-sns, base, bytestring, containers, doctest, exceptions + , hpio, http-client, http-client-tls, http-types, lens, lucid, mtl + , network, optparse-applicative, optparse-text, protolude + , resourcet, servant, servant-client, servant-docs, servant-lucid + , servant-server, servant-swagger, servant-swagger-ui, swagger2 + , text, time, transformers, transformers-base, wai, warp + }: + mkDerivation { + pname = "pinpon"; + version = "0.2.0.2"; + sha256 = "1fwdzmzm1s0bpxcw79hifpsc0ksaz2rdn76hprk7bqiw81c4amxs"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty amazonka amazonka-core amazonka-sns base + bytestring containers exceptions http-client http-types lens lucid + mtl protolude resourcet servant servant-client servant-docs + servant-lucid servant-server servant-swagger servant-swagger-ui + swagger2 text time transformers transformers-base wai warp + ]; + executableHaskellDepends = [ + amazonka amazonka-sns base bytestring containers exceptions hpio + http-client http-client-tls http-types lens mtl network + optparse-applicative optparse-text protolude servant-client text + time transformers warp + ]; + testHaskellDepends = [ base doctest protolude ]; + homepage = "https://github.com/quixoftic/pinpon#readme"; + description = "A gateway for various cloud notification services"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipe-enumerator" = callPackage ({ mkDerivation, base, enumerator, pipes, transformers }: mkDerivation { @@ -152718,8 +160489,8 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.3.6"; - sha256 = "0nwap7bjwv6q0jis1j452r1zgfl4pfdip4lzs047r8zh75cvc5h8"; + version = "4.3.9"; + sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w"; libraryHaskellDepends = [ base exceptions mmorph mtl semigroups transformers void ]; @@ -152749,6 +160520,7 @@ self: { homepage = "https://github.com/k0001/pipes-aeson"; description = "Encode and decode JSON streams using Aeson and Pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-async" = callPackage @@ -152867,6 +160639,7 @@ self: { 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-bytestring" = callPackage @@ -152883,6 +160656,7 @@ self: { ]; description = "ByteString support for pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-bzip" = callPackage @@ -152907,6 +160681,7 @@ self: { homepage = "https://github.com/chemist/pipes-bzip"; description = "Streaming compression/decompression via pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) bzip2;}; "pipes-cacophony" = callPackage @@ -152928,21 +160703,6 @@ self: { }) {}; "pipes-category" = callPackage - ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-extras - , transformers - }: - mkDerivation { - pname = "pipes-category"; - version = "0.2.0.1"; - sha256 = "0yb6mlgccqz859fqcvlskhakqm3m0qjlgd1s1nnmn49h7g54d84x"; - libraryHaskellDepends = [ base lens mtl pipes pipes-extras ]; - testHaskellDepends = [ base hspec pipes transformers ]; - homepage = "https://github.com/louispan/pipes-category#readme"; - description = "Allows instances for Category, Arrow and ArrowChoice for Pipes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-category_0_3_0_0" = callPackage ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-extras , transformers }: @@ -152955,7 +160715,6 @@ self: { homepage = "https://github.com/louispan/pipes-category#readme"; description = "Allows instances for Category, Arrow and ArrowChoice for Pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-cellular" = callPackage @@ -153037,13 +160796,15 @@ self: { }) {}; "pipes-concurrency" = callPackage - ({ mkDerivation, async, base, contravariant, pipes, stm, void }: + ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm + , void + }: mkDerivation { pname = "pipes-concurrency"; - version = "2.0.8"; - sha256 = "0ak6vnjl12q4615waifbpdxbm96yz5yzqzwjj1zwvvb2jfk5snwz"; + version = "2.0.10"; + sha256 = "1qrnwr7m8yjn80k4qzcr75g64jvbh7f903apvmlsqrgppwfp4xa6"; libraryHaskellDepends = [ - async base contravariant pipes stm void + async base contravariant pipes semigroups stm void ]; testHaskellDepends = [ async base pipes stm ]; description = "Concurrency for the pipes ecosystem"; @@ -153112,7 +160873,7 @@ self: { ]; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jb55 ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-errors" = callPackage @@ -153163,8 +160924,8 @@ self: { }: mkDerivation { pname = "pipes-extras"; - version = "1.0.12"; - sha256 = "0sr7n0p8nwsyp52dybq3lgswz353jc239hysqlxhlsa4hh1l5q61"; + version = "1.0.13"; + sha256 = "04adszpz02a72zz8kjj9lcw62n296p74rq4xds3b8g345m6c51g1"; libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -153186,6 +160947,7 @@ self: { ]; description = "Streaming parsers for Fasta and Fastq"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-files" = callPackage @@ -153217,29 +160979,6 @@ self: { }) {}; "pipes-fluid" = callPackage - ({ mkDerivation, async, base, constraints, hspec, lens - , lifted-async, mmorph, monad-control, mtl, pipes - , pipes-concurrency, pipes-misc, semigroups, stm, these - , transformers, transformers-base - }: - mkDerivation { - pname = "pipes-fluid"; - version = "0.5.0.3"; - sha256 = "0f9b1fkdi0g09g3fk1zbcmyymiv6sp3g25ax9xmgjblr2qzg0bhd"; - libraryHaskellDepends = [ - base constraints lens lifted-async monad-control pipes semigroups - stm these transformers transformers-base - ]; - testHaskellDepends = [ - async base constraints hspec lens lifted-async mmorph monad-control - mtl pipes pipes-concurrency pipes-misc stm transformers - ]; - homepage = "https://github.com/louispan/pipes-fluid#readme"; - description = "Reactively combines Producers so that a value is yielded as soon as possible"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-fluid_0_6_0_0" = callPackage ({ mkDerivation, async, base, constraints, hspec, lens , lifted-async, mmorph, monad-control, mtl, pipes , pipes-concurrency, pipes-misc, semigroups, stm, these @@ -153260,7 +160999,6 @@ self: { homepage = "https://github.com/louispan/pipes-fluid#readme"; description = "Reactively combines Producers so that a value is yielded as soon as possible"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-group" = callPackage @@ -153269,14 +161007,15 @@ self: { }: mkDerivation { pname = "pipes-group"; - version = "1.0.8"; - sha256 = "0zcmhq46972zxjj5nmr46fdvvwb3q0i42q9m70i758a3iwkmnr3a"; + version = "1.0.9"; + sha256 = "16yczij987r6j7gzp3nvgl1c5x2b7skvqsq38ns7p9z34kvy8sby"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; testHaskellDepends = [ base doctest lens-family-core ]; description = "Group streams into substreams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-http" = callPackage @@ -153364,8 +161103,8 @@ self: { }: mkDerivation { pname = "pipes-key-value-csv"; - version = "0.4.0.2"; - sha256 = "0v7gqic7d4prdgwjkncnx1fzk38nxwfij9pnpnp7d8n0kwdcnbix"; + version = "0.4.0.3"; + sha256 = "02wdna1kjjz0pkap3pfvzl336aapjv6ylmg5qwa6hr07d7sfbh3l"; libraryHaskellDepends = [ base bifunctors containers data-default-class lens mtl pipes pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text @@ -153396,6 +161135,7 @@ self: { homepage = "https://github.com/mindreader/pipes-lines"; description = "Pipes for grouping by lines with carriage returns"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-lzma" = callPackage @@ -153420,27 +161160,6 @@ self: { }) {}; "pipes-misc" = callPackage - ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl - , pipes, pipes-category, pipes-concurrency, semigroups, stm - , transformers - }: - mkDerivation { - pname = "pipes-misc"; - version = "0.3.0.0"; - sha256 = "1yb1y039kq70kpg82kcklaalxsp2fjpfmjiwlvn483cw695lw80x"; - libraryHaskellDepends = [ - base clock Decimal lens mmorph mtl pipes pipes-category - pipes-concurrency semigroups stm transformers - ]; - testHaskellDepends = [ - base hspec lens mmorph pipes pipes-concurrency stm transformers - ]; - homepage = "https://github.com/louispan/pipes-misc#readme"; - description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-misc_0_4_0_1" = callPackage ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl , pipes, pipes-category, pipes-concurrency, semigroups, stm , transformers @@ -153459,7 +161178,6 @@ self: { homepage = "https://github.com/louispan/pipes-misc#readme"; description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-mongodb" = callPackage @@ -153609,9 +161327,12 @@ self: { ({ mkDerivation, base, mwc-random, pipes, vector }: mkDerivation { pname = "pipes-random"; - version = "1.0.0.3"; - sha256 = "14qinfky4mcd3xs6lm6fmfw1k5inkiry8mn6m6q4hq7pwick773j"; + version = "1.0.0.4"; + sha256 = "17k510v2f5ziysqh7sknyw3rgxf8iblw800z3hh8gymaszkhfajl"; + revision = "1"; + editedCabalFile = "0m32wz3rwxx9gdcl1chk64yspyd1ls13z03zcgjcn865mpbhz97h"; libraryHaskellDepends = [ base mwc-random pipes vector ]; + homepage = "https://github.com/fosskers/pipes-random"; description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -153642,6 +161363,8 @@ self: { pname = "pipes-s3"; version = "0.3.0.3"; sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa"; + revision = "2"; + editedCabalFile = "1sm1s8paqyh4d05179lfbjix5irc6j7ryrir5s29xpjxslanl01x"; libraryHaskellDepends = [ aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers @@ -153658,15 +161381,15 @@ self: { "pipes-safe" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control, mtl - , pipes, transformers, transformers-base + , pipes, primitive, transformers, transformers-base }: mkDerivation { pname = "pipes-safe"; - version = "2.2.5"; - sha256 = "0z560n3cfidp6d6my29vdkwqnga24pd0d6wp9kcmpp2kg3kcyhh2"; + version = "2.2.9"; + sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p"; libraryHaskellDepends = [ - base containers exceptions monad-control mtl pipes transformers - transformers-base + base containers exceptions monad-control mtl pipes primitive + transformers transformers-base ]; description = "Safety for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; @@ -153723,28 +161446,31 @@ self: { homepage = "https://github.com/michaelt/text-pipes"; description = "properly streaming text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-transduce" = callPackage ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest , foldl, free, microlens, pipes, pipes-bytestring , pipes-concurrency, pipes-group, pipes-parse, pipes-safe - , pipes-text, tasty, tasty-hunit, text, transformers, void + , pipes-text, streaming, tasty, tasty-hunit, text, transformers + , void }: mkDerivation { pname = "pipes-transduce"; - version = "0.4"; - sha256 = "0krcjw7bry726bgkjfsv72wq6z930jz8n5yj5dzfh51n5ps8qkcq"; + version = "0.4.3.2"; + sha256 = "0q4xc2r0yzyj6gpg16z9scdxm0a3fjzsm1r6qihkr2zks9sac36x"; libraryHaskellDepends = [ base bifunctors bytestring conceit foldl free microlens pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse - pipes-safe pipes-text text transformers void + pipes-safe pipes-text streaming text transformers void ]; testHaskellDepends = [ base doctest foldl free pipes tasty tasty-hunit text ]; description = "Interfacing pipes with foldl folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-vector" = callPackage @@ -153810,12 +161536,10 @@ self: { libraryHaskellDepends = [ base bytestring pipes pipes-safe semigroups zeromq4-haskell ]; - executableHaskellDepends = [ - base bytestring pipes pipes-safe semigroups zeromq4-haskell - ]; homepage = "https://github.com/peddie/pipes-zeromq4"; description = "Pipes integration for ZeroMQ messaging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-zlib" = callPackage @@ -153827,6 +161551,8 @@ self: { pname = "pipes-zlib"; version = "0.4.4.1"; sha256 = "1sdxhb3000k57ck1mbasdwaxmkmw2bbh2m1ry3fvpgsilq91xb4g"; + revision = "1"; + editedCabalFile = "1vjvbww9b0892p1r1vz3biim3r5zaxkg8ks8w9cj2nc6i0bs7qy1"; libraryHaskellDepends = [ base bytestring pipes streaming-commons transformers ]; @@ -153837,7 +161563,6 @@ self: { homepage = "https://github.com/k0001/pipes-zlib"; description = "Zlib and GZip compression and decompression for Pipes streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pisigma" = callPackage @@ -153982,6 +161707,7 @@ self: { homepage = "https://github.com/fcomb/pkcs10-hs#readme"; description = "PKCS#10 library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pkcs7" = callPackage @@ -153995,6 +161721,7 @@ self: { homepage = "https://github.com/kisom/pkcs7"; description = "PKCS #7 padding in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pkggraph" = callPackage @@ -154066,6 +161793,7 @@ self: { ]; description = "Applicative/Arrow for resource estimation and progress tracking"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plan-b" = callPackage @@ -154076,8 +161804,8 @@ self: { pname = "plan-b"; version = "0.2.1"; sha256 = "038w0y90k7fn13ba5vrpyxa6vjn03lxqdnd2vgki9hmb4idxiakv"; - revision = "1"; - editedCabalFile = "0ci5x3vvwgasy47rxmqk2d1z7qakhh34zwgjbc3gydii2vapd7zh"; + revision = "2"; + editedCabalFile = "03vi68kp16lcly2rv6nq5a64k00hd4a5zvdf8pbz76450fik2c1j"; libraryHaskellDepends = [ base exceptions path path-io transformers ]; @@ -154104,6 +161832,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "plankton" = callPackage + ({ mkDerivation, adjunctions, base, protolude }: + mkDerivation { + pname = "plankton"; + version = "0.0.0.1"; + sha256 = "049dqzxygj81kzb5zqpw8cc3ql1hakwl3j84dzqhrc6vk6r9a50q"; + libraryHaskellDepends = [ adjunctions base protolude ]; + homepage = "https://github.com/chessai/plankton"; + description = "The core of a numeric prelude, taken from numhask"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plat" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, utf8-string }: mkDerivation { @@ -154149,8 +161889,8 @@ self: { }: mkDerivation { pname = "playlists"; - version = "0.4.1.0"; - sha256 = "0flcgcppqjv045qp7yc6x2df78c9dqnabm000frnbr7s51dwlzvh"; + version = "0.5.0.0"; + sha256 = "0653aifikinz69wq3d6sfkchcchhwlndh1lf40qrk96941qss0d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154168,24 +161908,44 @@ self: { }) {}; "playlists-http" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, either, exceptions - , http-client, mtl, playlists, text + ({ mkDerivation, attoparsec, base, bytestring, exceptions + , http-client, mtl, playlists, text, transformers }: mkDerivation { pname = "playlists-http"; - version = "0.1.1.0"; - sha256 = "1jr6pcnw652jf07q79drk8h132c31232rdxf552i458i62xawpig"; + version = "0.2.1.0"; + sha256 = "1kzc1awfqk979h2hmpqh2pjiy33v140pibbp703hqbq0fkrynj2k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring either exceptions http-client mtl - playlists text + attoparsec base bytestring exceptions http-client mtl playlists + text transformers ]; homepage = "https://github.com/pjones/playlists-http"; description = "Library to glue together playlists and http-client"; license = stdenv.lib.licenses.bsd3; }) {}; + "plex" = callPackage + ({ mkDerivation, async, base, bytestring, deepseq, hspec + , QuickCheck, unix + }: + mkDerivation { + pname = "plex"; + version = "0.2.0.0"; + sha256 = "0y0a3d30k4d3111smfidzzv1z7cq0i47wxvyh9iwbnn223s3446y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ async base bytestring deepseq unix ]; + testHaskellDepends = [ + async base bytestring deepseq hspec QuickCheck unix + ]; + homepage = "https://github.com/phlummox/hs-plex#readme"; + description = "run a subprocess, combining stdout and stderr"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "plist" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, hxt }: mkDerivation { @@ -154263,8 +162023,8 @@ self: { }: mkDerivation { pname = "plot"; - version = "0.2.3.8"; - sha256 = "1in77bvn77wyg9b8vixxd2m5vfnz90in89j3f31v9zbz7fxh2l4m"; + version = "0.2.3.9"; + sha256 = "1cyg4znyn0w0rll5ghc68rjknyfncfykl15i1984dg0hf1j6q566"; libraryHaskellDepends = [ array base cairo colour hmatrix mtl pango transformers ]; @@ -154300,6 +162060,7 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; description = "A quick way to use Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-gtk3" = callPackage @@ -154314,7 +162075,6 @@ self: { homepage = "http://code.haskell.org/plot"; description = "GTK3 plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plot-lab" = callPackage @@ -154337,17 +162097,19 @@ self: { "plot-light" = callPackage ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg - , colour, hspec, mtl, palette, QuickCheck, scientific, text, time + , colour, containers, data-default, hspec, mtl, palette, QuickCheck + , scientific, text, time }: mkDerivation { pname = "plot-light"; - version = "0.2.7"; - sha256 = "0w1mbhws7fs0kld61fd9f9xyvfpzsjhh6ic6ny89gka4421p002s"; + version = "0.2.9"; + sha256 = "0sz69a8q6r67s9d75vgb3x7iyp8vgrd2q85w2pykzpnpbdi56q5m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - attoparsec base blaze-svg colour mtl palette scientific text time + attoparsec base blaze-svg colour containers data-default hspec mtl + palette QuickCheck scientific text time ]; executableHaskellDepends = [ attoparsec attoparsec-time base blaze-svg colour palette scientific @@ -154357,6 +162119,47 @@ self: { homepage = "https://github.com/ocramz/plot-light"; description = "A lightweight plotting library, exporting to SVG"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "plot-light_0_3_2_1" = callPackage + ({ mkDerivation, base, blaze-svg, colour, containers + , data-default-class, hspec, mtl, QuickCheck, scientific, text + , time + }: + mkDerivation { + pname = "plot-light"; + version = "0.3.2.1"; + sha256 = "00gl17lsavwn1cglaa8jqzl1v3vczskkiz0zg51xg4g7v1v1irr7"; + libraryHaskellDepends = [ + base blaze-svg colour containers data-default-class mtl 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "plot-light-examples" = callPackage + ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg + , colour, plot-light, scientific, text, time + }: + mkDerivation { + pname = "plot-light-examples"; + version = "0.2.0.0"; + sha256 = "0sw7hxp96s8sbaghs3lzl856q72y0gxn58px0wd4568fdbvgd6vl"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ attoparsec base ]; + executableHaskellDepends = [ + attoparsec attoparsec-time base blaze-svg colour plot-light + scientific text time + ]; + homepage = "https://github.com/ocramz/plot-light-examples"; + description = "Example binaries for plot-light"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -154390,14 +162193,18 @@ self: { }) {}; "ploton" = callPackage - ({ mkDerivation, base, hspec, optparse-applicative, process }: + ({ mkDerivation, base, hspec, optparse-applicative, process, split + , transformers + }: mkDerivation { pname = "ploton"; - version = "1.0.0.0"; - sha256 = "1x2ypljgknyya3pwg2y323va1hl396qm30lfy982sa6p0d0m8hfg"; + version = "1.1.3.0"; + sha256 = "1bq2qnzlms6j6hl7d728h5mc672h0lpbxcxfh2bz327nhhqid3hn"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base optparse-applicative process ]; + libraryHaskellDepends = [ + base optparse-applicative process split transformers + ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/ishiy1993/ploton#readme"; @@ -154429,6 +162236,7 @@ self: { homepage = "http://github.com/cchalmers/plots"; description = "Diagrams based plotting library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plotserver-api" = callPackage @@ -154448,15 +162256,13 @@ self: { }: mkDerivation { pname = "plugins"; - version = "1.5.6.0"; - sha256 = "1l40i9n4iqsj2pw5kv7p8mkfg9vninplasz27zdgfs4hxd9pxl8q"; - revision = "1"; - editedCabalFile = "0l4sx1d9lgs6yr23dq4ccz1la9i94cz4nfvpdkpr5wni40mzl2m3"; + version = "1.5.7"; + sha256 = "1l9ymnsxvgjp7p2j5mvyygrsg7qf2yam1k4y3gz8s2l6kl78ri5f"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random ]; - homepage = "http://hub.darcs.net/stepcut/plugins"; + homepage = "https://github.com/stepcut/plugins"; description = "Dynamic linking for Haskell and C objects"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -154501,12 +162307,23 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "plumbers"; - version = "0.0.3"; - sha256 = "1grw827jhxwka1zl0n5ycgrpc4ljw8bxg3psms8lsxfiiz6mwmq9"; + version = "0.0.4"; + sha256 = "1lih19zjz5yrrjvrgk8zv5xrvld57ykdxxhdrvhwh6bqyzzarqjj"; libraryHaskellDepends = [ base template-haskell ]; description = "Pointless plumbing combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "plural" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec }: + mkDerivation { + pname = "plural"; + version = "0.0.2"; + sha256 = "1f35w7rzwq6f1zzdpglij41ra8pwyzjklv2pbnpmbp9q6rpi836p"; + libraryHaskellDepends = [ base bytestring containers ]; + testHaskellDepends = [ base hspec ]; + description = "Pluralize"; + license = stdenv.lib.licenses.bsd3; }) {}; "ply-loader" = callPackage @@ -154665,10 +162482,8 @@ self: { }: mkDerivation { pname = "pointed"; - version = "5"; - sha256 = "05sxac90xv4j8glmf2mxs0smmv6vhia0qaaag5v37ar5a6pvh1l9"; - revision = "1"; - editedCabalFile = "170gqax34qch77zzqwq95z2lzq9da8gmfxg1vcll4aphhafwgzzp"; + version = "5.0.1"; + sha256 = "1p91a762xglckscnhpflxzav8byf49a02mli3983i4kpr2jkaimr"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -154732,8 +162547,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.4"; - sha256 = "1llqlxcgafbgzb84gzgwldb0lsa9nnqsn3irbrlljralx2zfhxk3"; + version = "1.1.1.7"; + sha256 = "1xw2p96ghclfxmc12kwxyh25r5k9k6h3zriaf38wz5d3j36npa7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154747,7 +162562,7 @@ self: { transformers ]; description = "Tool for refactoring expressions into pointfree form"; - license = "unknown"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -154757,10 +162572,8 @@ self: { }: mkDerivation { pname = "pointful"; - version = "1.0.9"; - sha256 = "1mmc7kjspak2597d9jzkqgga4gh9v5dljkifbgminx8rchiq263a"; - revision = "1"; - editedCabalFile = "13lwn5zy44cbmax8ic1j8dhrzn7hxws5mcjrjyjwqcn2abmwc2js"; + version = "1.0.11.0"; + sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154770,6 +162583,7 @@ self: { homepage = "http://github.com/23Skidoo/pointful"; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pointless-fun" = callPackage @@ -154955,8 +162769,8 @@ self: { ({ mkDerivation, base, enumset, utility-ht }: mkDerivation { pname = "poll"; - version = "0.0"; - sha256 = "0v4cyrr506zqvxqbxkncss2pl2j38skl02p1vj6cjxcvlzb2y43p"; + version = "0.0.0.1"; + sha256 = "0agdl2bxw7ca05kqyc8dix4kvjdh67i91hn1scmcngjd3gz8gzmr"; libraryHaskellDepends = [ base enumset utility-ht ]; description = "Bindings to poll.h"; license = stdenv.lib.licenses.bsd3; @@ -154973,6 +162787,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "poly-cont" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "poly-cont"; + version = "0.1.0.0"; + sha256 = "05pkz6v2xyva73ibb5v97c7fh5zjpvkhahfgnnxycrlnsag5ckgy"; + libraryHaskellDepends = [ base mtl transformers ]; + description = "Poly-kinded continuations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "poly-control" = callPackage ({ mkDerivation, base, lens }: mkDerivation { @@ -155013,6 +162839,7 @@ self: { ]; description = "Wrap together data and it's constraints"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polydata-core" = callPackage @@ -155025,6 +162852,7 @@ self: { homepage = "https://github.com/clintonmead/polydata-core#readme"; description = "Core data definitions for the \"polydata\" package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polymap" = callPackage @@ -155168,14 +162996,39 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "polyvariadic"; - version = "0.3.0.1"; - sha256 = "0bnwcpk5bgp784d68427vbcdvyavqpj87khwr5gdyxr58apih2z6"; + version = "0.3.0.3"; + sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1"; libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; homepage = "https://github.com/fgaz/polyvariadic"; description = "Creation and application of polyvariadic functions"; license = stdenv.lib.licenses.bsd3; }) {}; + "pomaps" = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, criterion + , deepseq, doctest, ghc-prim, Glob, lattices, random, tasty + , tasty-hspec, tasty-quickcheck, vector + }: + mkDerivation { + pname = "pomaps"; + version = "0.0.0.4"; + sha256 = "0mjfzj2j8b6337ivvnry7ylrw5g1ajxpqqzar1wmscm73ybr0xbn"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim lattices + ]; + testHaskellDepends = [ + base ChasingBottoms containers doctest Glob lattices tasty + tasty-hspec tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lattices random vector + ]; + homepage = "https://github.com/sgraf812/pomaps#readme"; + description = "Maps and sets of partial orders"; + license = stdenv.lib.licenses.mit; + }) {}; + "pomodoro" = callPackage ({ mkDerivation, base, bytestring, cereal, directory, filepath , heredoc, libnotify, network, process, time, unix, wx, wxcore @@ -155217,6 +163070,7 @@ self: { homepage = "https://github.com/kqr/pomohoro#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ponder" = callPackage @@ -155309,6 +163163,7 @@ self: { homepage = "https://github.com/pontarius/pontarius-xmpp/"; description = "An XMPP client library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pontarius-xpmn" = callPackage @@ -155429,8 +163284,8 @@ self: { }: mkDerivation { pname = "poppler"; - version = "0.14.1"; - sha256 = "1djx8qj68md11kdgcljd7mq3bidw6ynh9mwfxm9bj7kr2h57lmsv"; + version = "0.14.2"; + sha256 = "17q8br6w9v7vcz8ricvlrhhaw0ngka9w0i0jazr7m1j0dv1m4xsf"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -155510,7 +163365,6 @@ self: { homepage = "http://code.haskell.org/portaudio"; description = "Haskell bindings for the PortAudio library"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) portaudio;}; "porte" = callPackage @@ -155595,7 +163449,6 @@ self: { homepage = "https://github.com/xtendo-org/positron#readme"; description = "Experiment"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "posix-acl" = callPackage @@ -155657,8 +163510,8 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.1.1"; - sha256 = "0pr414vnf441zsgb00qgyqx6abr8i6fzgqjwwb2b52v4lhp37xfz"; + version = "0.2.1.5"; + sha256 = "1pyi25gz2r3pc64f1i5awyp3mg5w74ik9wh5s9i9hs7bfmkjk1as"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring doctest HUnit QuickCheck unix @@ -155696,20 +163549,36 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; description = "POSIX Realtime functionality"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "posix-socket" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, data-flags + , network-ip, transformers-base, unix + }: + mkDerivation { + pname = "posix-socket"; + version = "0.3"; + sha256 = "0al0am4nnzaiknxhlfid1qafh5kh15vl13ba1w0bivcsiyfb62in"; + libraryHaskellDepends = [ + base bytestring data-default-class data-flags network-ip + transformers-base unix + ]; + homepage = "https://github.com/mvv/posix-socket"; + description = "Bindings to the POSIX socket API"; + license = stdenv.lib.licenses.bsd3; }) {}; "posix-timer" = callPackage ({ mkDerivation, base, transformers-base, unix }: mkDerivation { pname = "posix-timer"; - version = "0.3"; - sha256 = "0z4j98pb46gzhi5i5pvxxm7an7am5i757p43cp2jv8pirx33k8zd"; + version = "0.3.0.1"; + sha256 = "01s9hd23xcgdnryi72vj635435ccryv98a911l0zipxmvq4d8ri8"; libraryHaskellDepends = [ base transformers-base unix ]; homepage = "https://github.com/mvv/posix-timer"; description = "Bindings to POSIX clock and timer functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "posix-waitpid" = callPackage @@ -155764,17 +163633,17 @@ self: { "postgres-embedded" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, network - , postgresql-simple, shell-conduit + , postgresql-simple, process }: mkDerivation { pname = "postgres-embedded"; - version = "0.1.7"; - sha256 = "19jwgrqx8sycfy9lrz9qgz0hqksfh4z0a44ij7xsm8jvbmaqfqhy"; + version = "0.2.0"; + sha256 = "1xaf6iqlv1adg0xcmzj6ynfq3r43qafs98z9lfk2hms28g03a71y"; libraryHaskellDepends = [ - base directory filepath network shell-conduit + base directory filepath network process ]; testHaskellDepends = [ - base bytestring filepath postgresql-simple shell-conduit + base bytestring filepath postgresql-simple process ]; homepage = "https://github.com/ilya-murzinov/postgres-embedded"; description = "Library for easily running embedded PostgreSQL server for tests"; @@ -155786,14 +163655,51 @@ self: { ({ mkDerivation, base, bytestring, postgresql-simple, text }: mkDerivation { pname = "postgres-tmp"; - version = "0.1.0.1"; - sha256 = "1r3pnqqvq6ar9fxbwya2nn85x15pgczh5gfn2srpgi7j0vdjw0vd"; + version = "0.2.0"; + sha256 = "1zx5inxczzlhyb5f89f92f0ngzln49qahzraqr6ksvi5r7n7gk86"; 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"; license = stdenv.lib.licenses.bsd3; }) {}; + "postgres-websockets" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base64-bytestring + , bytestring, configurator, containers, contravariant, either + , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json + , http-types, jose, jwt, lens, lens-aeson, optparse-applicative + , postgresql-libpq, protolude, retry, stm, stm-containers + , stringsearch, text, time, transformers, unordered-containers, wai + , wai-app-static, wai-extra, wai-websockets, warp, websockets + }: + mkDerivation { + pname = "postgres-websockets"; + version = "0.4.2.1"; + sha256 = "0jh4ms9lz456as24v9d4vqj2b52i9gw7svk5lzvb65nhfdpb4kfp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring contravariant either hasql hasql-pool + http-types jose jwt lens lens-aeson postgresql-libpq protolude + retry stm stm-containers stringsearch text time + unordered-containers wai wai-websockets websockets + ]; + executableHaskellDepends = [ + ansi-wl-pprint base base64-bytestring bytestring configurator hasql + hasql-pool heredoc optparse-applicative protolude text time + transformers wai wai-app-static wai-extra warp + ]; + testHaskellDepends = [ + aeson base containers hasql hasql-pool hspec hspec-wai + hspec-wai-json http-types protolude stm unordered-containers + wai-extra + ]; + homepage = "https://github.com/diogob/postgres-websockets#readme"; + description = "Middleware to map LISTEN/NOTIFY messages to Websockets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-binary" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, bytestring-strict-builder, containers, conversion @@ -155823,6 +163729,7 @@ self: { homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-config" = callPackage @@ -155849,8 +163756,8 @@ self: { }: mkDerivation { pname = "postgresql-connector"; - version = "0.2.4"; - sha256 = "0ly6p75c7vsrwlc7zsb91k19ffz0va6xc38djyc184qlji52hr1w"; + version = "0.2.5"; + sha256 = "0ilw7z16jzlys3pv4bvdd5ajprq4dbzgg3ivwpgzxrpnh2mfjkqq"; libraryHaskellDepends = [ base bytestring exceptions lens mtl postgresql-simple resource-pool resourcet time transformers-base @@ -155896,14 +163803,15 @@ self: { }) {}; "postgresql-libpq" = callPackage - ({ mkDerivation, base, bytestring, postgresql }: + ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: mkDerivation { pname = "postgresql-libpq"; - version = "0.9.3.1"; - sha256 = "0x0bjnwqhdlxba345yjkf978wfsy8g5xsjdbrckrnb2dvsfscqih"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.9.4.1"; + sha256 = "0ssn12cs643nd1bliaks0l0ssainydsrzjr3l5p7hm3wnqwa77qd"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; - homepage = "http://github.com/lpsmith/postgresql-libpq"; + homepage = "https://github.com/lpsmith/postgresql-libpq"; description = "low-level binding to libpq"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; @@ -155956,7 +163864,7 @@ self: { "postgresql-query" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , containers, data-default, derive, either, exceptions, file-embed + , containers, data-default, derive, exceptions, file-embed , haskell-src-meta, hreader, hset, inflections, monad-control , monad-logger, mtl, postgresql-simple, QuickCheck , quickcheck-assertions, quickcheck-instances, resource-pool @@ -155966,12 +163874,12 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.3.0"; - sha256 = "0ilny7vj5ch77kic1bmpm160phv3yxm1cd3ksj6j8gc2nvaysrr8"; + version = "3.4.0"; + sha256 = "1f69rjwhww6knivk8gkx82b8xp8hkg0mhb9z2lm69vv3k5fxv8mb"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers - data-default either exceptions file-embed haskell-src-meta hreader - hset inflections monad-control monad-logger mtl postgresql-simple + data-default exceptions file-embed haskell-src-meta hreader hset + inflections monad-control monad-logger mtl postgresql-simple resource-pool semigroups template-haskell text th-lift th-lift-instances time transformers transformers-base transformers-compat type-fun @@ -155993,8 +163901,8 @@ self: { }: mkDerivation { pname = "postgresql-schema"; - version = "0.1.13"; - sha256 = "03f4hfdp632wyhygh72c6k8xwpqy2ijv51zkx3d176pb1429l0fi"; + version = "0.1.14"; + sha256 = "0wnmhh8pzs9hzsmqkvr89jbdbbd1j87fnly2c80rsd7wr5qcrpkk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -156020,6 +163928,8 @@ self: { pname = "postgresql-simple"; version = "0.5.3.0"; sha256 = "0h8f4d09f25p0dlz2mxvgp5b5pr56hnhng3yhb69pmv0dmj7n38y"; + revision = "1"; + editedCabalFile = "1hvry7nhk629yas6nbm3wnyy0bgwh6r8511rmsq9r8xkl7qm76r2"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable postgresql-libpq scientific @@ -156051,6 +163961,7 @@ self: { ]; description = "FFI-like bindings for PostgreSQL stored functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-migration" = callPackage @@ -156078,26 +163989,6 @@ self: { }) {}; "postgresql-simple-opts" = callPackage - ({ mkDerivation, base, bytestring, data-default, either, hspec - , optparse-applicative, optparse-generic, postgresql-simple - }: - mkDerivation { - pname = "postgresql-simple-opts"; - version = "0.2.0.2"; - sha256 = "0jwhlafbpkg75rc2b4hv8pg1d2q200h70lwn0acilikf55r3vlj1"; - libraryHaskellDepends = [ - base bytestring data-default either optparse-applicative - optparse-generic postgresql-simple - ]; - testHaskellDepends = [ - base bytestring hspec optparse-applicative postgresql-simple - ]; - homepage = "https://github.com/jfischoff/postgresql-simple-opts#readme"; - description = "An optparse-applicative parser for postgresql-simple's connection options"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "postgresql-simple-opts_0_3_0_0" = callPackage ({ mkDerivation, base, bytestring, data-default, either , generic-deriving, hspec, optparse-applicative, optparse-generic , postgresql-simple, split, uri-bytestring @@ -156124,21 +164015,22 @@ self: { "postgresql-simple-queue" = callPackage ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec , hspec-discover, hspec-expectations-lifted, hspec-pg-transact - , monad-control, pg-transact, postgresql-simple, random, text, time - , transformers + , monad-control, pg-transact, postgresql-simple, random, split, stm + , text, time, transformers }: mkDerivation { pname = "postgresql-simple-queue"; - version = "0.5.1.1"; - sha256 = "05bzpfawf5pllmlqhsypp69rjrhady9vdql0khi9k75kk4ndl9r3"; + version = "1.0.1"; + sha256 = "0gss9s2splrvwgxhkjpqvx0cg9kx9dqpw4aq2wbh8l879v2nj2rk"; libraryHaskellDepends = [ aeson base bytestring exceptions monad-control pg-transact - postgresql-simple random text time transformers + postgresql-simple random stm text time transformers ]; testHaskellDepends = [ - aeson async base bytestring hspec hspec-discover - hspec-expectations-lifted hspec-pg-transact pg-transact - postgresql-simple + aeson async base bytestring exceptions hspec hspec-discover + hspec-expectations-lifted hspec-pg-transact monad-control + pg-transact postgresql-simple random split stm text time + transformers ]; homepage = "https://github.com/jfischoff/postgresql-queue#readme"; description = "A PostgreSQL backed queue"; @@ -156183,10 +164075,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-url"; - version = "0.2.0.0"; - sha256 = "0k7anqkw9gn5mm3y93pzp8rqzlg1526pxikcllxcciyhgpz5mn7p"; - revision = "1"; - editedCabalFile = "1z9qk3kplc5y93h3xbb9gialhdmnblwrmf2943wkj70qg975hajb"; + version = "0.2.1.0"; + sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -156196,6 +164086,7 @@ self: { homepage = "https://github.com/futurice/postgresql-simple-url"; description = "Parse postgres:// url into ConnectInfo"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-syntax" = callPackage @@ -156212,6 +164103,7 @@ self: { homepage = "https://github.com/nikita-volkov/postgresql-syntax"; description = "PostgreSQL SQL syntax utilities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {pg_query = null;}; "postgresql-transactional" = callPackage @@ -156235,8 +164127,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.5.2"; - sha256 = "0ws9xmh199jsvdmxjxkhm59j05ljfsrf16xchkbxqd8p1pg8786c"; + version = "0.5.3.0"; + sha256 = "0apq662lhkjc1xl4alpz20yz20x6mf3gz6li7wb86sp94441rh5k"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite haskell-src-meta HDBC memory network old-locale postgresql-binary @@ -156273,9 +164165,9 @@ self: { "postgrest" = callPackage ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async, base , base64-bytestring, bytestring, 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 + , configurator-ng, containers, contravariant, cookie, either + , gitrev, hasql, hasql-pool, hasql-transaction, heredoc + , hjsonschema, hspec, hspec-wai, hspec-wai-json, HTTP, http-types , insert-ordered-containers, interpolatedstring-perl6, jose, lens , lens-aeson, monad-control, network-uri, optparse-applicative , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe @@ -156285,17 +164177,17 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "0.4.3.0"; - sha256 = "1a0l5j755h6nlnv3xww0l88pz6ny5y40d1as9vfn1i1ybk4jx5gq"; + version = "0.4.4.0"; + sha256 = "1dj0gzwjq5psxqmjx0jhbvwa0jlf52dvsbdmbx6ry0yqhsa0yvjr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base base64-bytestring bytestring case-insensitive cassava configurator-ng containers contravariant - cookie either hasql hasql-pool hasql-transaction heredoc HTTP - http-types insert-ordered-containers interpolatedstring-perl6 jose - lens lens-aeson network-uri optparse-applicative parsec protolude - Ranged-sets regex-tdfa safe scientific swagger2 text + cookie either gitrev hasql hasql-pool hasql-transaction heredoc + HTTP http-types insert-ordered-containers interpolatedstring-perl6 + jose lens lens-aeson network-uri optparse-applicative parsec + protolude Ranged-sets regex-tdfa safe scientific swagger2 text unordered-containers vector wai wai-cors wai-extra wai-middleware-static ]; @@ -156306,9 +164198,9 @@ self: { testHaskellDepends = [ aeson aeson-qq async base base64-bytestring bytestring case-insensitive cassava containers contravariant hasql hasql-pool - heredoc hjsonpointer hjsonschema hspec hspec-wai hspec-wai-json - http-types lens lens-aeson monad-control process protolude - regex-tdfa transformers-base wai wai-extra + heredoc hjsonschema hspec hspec-wai hspec-wai-json http-types lens + lens-aeson monad-control process protolude regex-tdfa + transformers-base wai wai-extra ]; homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; @@ -156355,8 +164247,8 @@ self: { "postie" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cprng-aes - , data-default-class, mtl, network, pipes, pipes-bytestring - , pipes-parse, stringsearch, tls, transformers, uuid + , data-default-class, mtl, network, pipes, pipes-parse + , stringsearch, tls, transformers, uuid }: mkDerivation { pname = "postie"; @@ -156368,9 +164260,6 @@ self: { attoparsec base bytestring cprng-aes data-default-class mtl network pipes pipes-parse stringsearch tls transformers uuid ]; - executableHaskellDepends = [ - base bytestring data-default-class pipes pipes-bytestring tls - ]; description = "SMTP server library to receive emails from within Haskell programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -156382,15 +164271,14 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.2.2"; - sha256 = "043q69v629r6y8ljij8nmfjz4qs3181278wrnlfgagfahh98pg0b"; + version = "0.2.3"; + sha256 = "140z6r01byld665471dbk5zdqaf6lrcxwqp0wvbs5fbpjq37mfmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers http-client-tls http-types network-api-support text ]; - executableHaskellDepends = [ base text ]; homepage = "https://github.com/apiengine/postmark"; description = "Library for postmarkapp.com HTTP Api"; license = stdenv.lib.licenses.bsd3; @@ -156403,15 +164291,14 @@ self: { }: mkDerivation { pname = "postmark-streams"; - version = "0.1.0.0"; - sha256 = "0kpwnkiykdaxlykmpnnr8pf4k176y1yv24hwr69mmf480r60mhsv"; + version = "0.1.0.1"; + sha256 = "16ag5jghbvz6gialpcpy491x63cq2z7kwrh9ahy8z2ryilcp64vi"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring binary bytestring http-streams io-streams text time ]; description = "Send email via Postmark using io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postmaster" = callPackage @@ -156431,6 +164318,7 @@ self: { homepage = "http://github.com/peti/postmaster"; description = "Postmaster ESMTP Server"; license = "GPL"; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "potato-tool" = callPackage @@ -156448,6 +164336,86 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "potoki" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bytestring + , directory, foldl, hashable, potoki-core, profunctors, ptr + , QuickCheck, quickcheck-instances, random, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan + , unordered-containers, vector + }: + mkDerivation { + pname = "potoki"; + version = "0.11.2"; + sha256 = "1c07q872d6k75cah1rfjw7wfam76fn8dc4x265v0xrngys6k9iwh"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring directory foldl hashable + potoki-core profunctors ptr text transformers unagi-chan + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances random rerebase tasty + tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/metrix-ai/potoki"; + description = "Simple streaming in IO"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "potoki-cereal" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, cereal, potoki + , potoki-core, text + }: + mkDerivation { + pname = "potoki-cereal"; + version = "0.1.6"; + sha256 = "0mr3wv8mx88xzbkcrndq833wcq753dyp9z4610pxa34cfalnbvhf"; + libraryHaskellDepends = [ + base base-prelude bytestring cereal potoki potoki-core text + ]; + homepage = "https://github.com/metrix-ai/potoki-cereal"; + description = "Streaming serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "potoki-core" = callPackage + ({ mkDerivation, base, profunctors, QuickCheck + , quickcheck-instances, rerebase, stm, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "potoki-core"; + version = "1.5.2"; + sha256 = "1qkr3g7xfbkmvy2a4gcy0zxg22000mxdgw0dapq16pymj9wqf2si"; + libraryHaskellDepends = [ base profunctors stm ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/metrix-ai/potoki-core"; + description = "Low-level components of \"potoki\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "potoki-hasql" = callPackage + ({ mkDerivation, base, bytestring, hasql, potoki, potoki-core + , profunctors, text, vector + }: + mkDerivation { + pname = "potoki-hasql"; + version = "1.2"; + sha256 = "1viq19rycrm8zdwj3anqam45hlmdlh9wqji3xf120nk8ffqnwks1"; + libraryHaskellDepends = [ + base bytestring hasql potoki potoki-core profunctors text vector + ]; + homepage = "https://github.com/metrix-ai/potoki-hasql"; + description = "Integration of \"potoki\" and \"hasql\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "potrace" = callPackage ({ mkDerivation, base, bindings-potrace, bytestring, containers , data-default, JuicyPixels, vector @@ -156476,6 +164444,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Potrace bindings for the diagrams library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "powermate" = callPackage @@ -156491,7 +164460,6 @@ self: { homepage = "https://github.com/ppelleti/powermate"; description = "bindings for Griffin PowerMate USB"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "powerpc" = callPackage @@ -156538,6 +164506,7 @@ self: { homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A distributed worker backend for powerqueu"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "powerqueue-levelmem" = callPackage @@ -156565,7 +164534,7 @@ self: { homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A high performance in memory and LevelDB backend for powerqueue"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;}; "powerqueue-sqs" = callPackage @@ -156580,6 +164549,7 @@ self: { homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A Amazon SQS backend for powerqueue"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ppm" = callPackage @@ -156615,14 +164585,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pptable_0_3_0_0" = callPackage + ({ mkDerivation, base, boxes, containers, generic-deriving, HUnit + , markdown-unlit, pretty, QuickCheck, syb, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "pptable"; + version = "0.3.0.0"; + sha256 = "05wkvnk2h3xvjivk8cd6z8xlscipvd2az1v1n4sdianf9r0gzdwq"; + revision = "1"; + editedCabalFile = "0c1srvgwyczbfnw3zw5pbsjqgxifq9yb1h60w3aq91q7iamrvdgb"; + libraryHaskellDepends = [ + base boxes containers generic-deriving pretty syb vector + ]; + testHaskellDepends = [ + base boxes containers HUnit markdown-unlit QuickCheck tasty + tasty-hunit tasty-quickcheck vector + ]; + homepage = "https://github.com/gdevanla/pptable#readme"; + description = "Pretty Print containers in a tabular format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pqc" = callPackage - ({ mkDerivation, base, ChasingBottoms, QuickCheck, random, stm }: + ({ mkDerivation, base, QuickCheck, random, stm }: mkDerivation { pname = "pqc"; version = "0.8"; sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4"; libraryHaskellDepends = [ base QuickCheck random stm ]; - testHaskellDepends = [ base ChasingBottoms ]; homepage = "http://hub.darcs.net/shelarcy/pqc"; description = "Parallel batch driver for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -156633,8 +164626,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "pqueue"; - version = "1.3.2.3"; - sha256 = "062l0vm4yymlm7vahczczpm29awgaksv0sdy532g7jlspi78nara"; + version = "1.4.1.1"; + sha256 = "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Reliable, persistent, fast priority queues"; @@ -156700,14 +164693,14 @@ self: { }) {}; "pragmatic-show" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck - , vector-space + ({ mkDerivation, base, containers, tasty, tasty-hunit + , tasty-quickcheck, vector-space }: mkDerivation { pname = "pragmatic-show"; - version = "0.1.1.0"; - sha256 = "0zkvdgghzyarvkx0ggcbpmmcbrkkk9dhbiq6xz4ljvdc9872hya6"; - libraryHaskellDepends = [ base ]; + version = "0.1.2.0"; + sha256 = "1nkwimmnk10p0pnv2hr3mxgfs1r2rjfhiaccmhd68a6279whp6p7"; + libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector-space ]; @@ -156718,28 +164711,24 @@ self: { "preamble" = callPackage ({ mkDerivation, aeson, base, basic-prelude, exceptions - , fast-logger, lens, monad-control, monad-logger, MonadRandom, mtl - , network, resourcet, safe, shakers, template-haskell, text - , text-manipulate, time, transformers-base, unordered-containers - , uuid + , fast-logger, lens, lifted-base, monad-control, monad-logger + , MonadRandom, mtl, network, resourcet, safe, template-haskell + , text, text-manipulate, time, transformers-base + , unordered-containers, uuid }: mkDerivation { pname = "preamble"; - version = "0.0.53"; - sha256 = "0y0745i8mq803zv73l36k78j36z0h4vb44pwbvc4qsdkh5760nnz"; - isLibrary = true; - isExecutable = true; + version = "0.0.61"; + sha256 = "16zs8mqmbvzi4pmjqmga3d17mjk6kriclv3qg3rxhs3rd2gyipqa"; libraryHaskellDepends = [ - aeson base basic-prelude exceptions fast-logger lens monad-control - monad-logger MonadRandom mtl network resourcet safe + aeson base basic-prelude exceptions fast-logger lens lifted-base + monad-control 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"; description = "Yet another prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "precis" = callPackage @@ -156821,6 +164810,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pred-trie_0_6_0_1" = callPackage + ({ mkDerivation, attoparsec, base, containers, criterion, deepseq + , errors, hashable, hashtables, mtl, poly-arity, pred-set + , QuickCheck, semigroups, sets, strict, tasty, tasty-hunit + , tasty-quickcheck, text, tries, unordered-containers + }: + mkDerivation { + pname = "pred-trie"; + version = "0.6.0.1"; + sha256 = "0hymhjh7idpibzdx0214laf0zjf3a4anhsmxn0p5g9xkgh7l7m72"; + libraryHaskellDepends = [ + base containers deepseq hashable hashtables mtl poly-arity pred-set + QuickCheck semigroups strict tries unordered-containers + ]; + testHaskellDepends = [ + attoparsec base containers deepseq errors hashable hashtables mtl + poly-arity pred-set QuickCheck semigroups strict tasty tasty-hunit + tasty-quickcheck text tries unordered-containers + ]; + benchmarkHaskellDepends = [ + attoparsec base containers criterion deepseq hashable hashtables + mtl poly-arity pred-set QuickCheck semigroups sets strict text + tries unordered-containers + ]; + homepage = "https://github.com/athanclark/pred-trie#readme"; + description = "Predicative tries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "predicate-class" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "predicate-class"; + version = "0.1.0.1"; + sha256 = "03rw51jpfcl827nrv1fxlghqwg0mk89l1rkqwd743lnsydwzi15h"; + libraryHaskellDepends = [ base ]; + description = "Helper class for passing context along a predicate value"; + license = stdenv.lib.licenses.mit; + }) {}; + "predicates" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -156864,6 +164894,7 @@ self: { homepage = "http://www.github.com/massysett/prednote"; description = "Evaluate and display trees of predicates"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prednote-test" = callPackage @@ -156890,6 +164921,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "prefix-expression" = callPackage + ({ mkDerivation, base, hspec, regex-pcre-builtin }: + mkDerivation { + pname = "prefix-expression"; + version = "1.2.6"; + sha256 = "0brw6rrykfsg67ckcfs3d5x4n7m8c6vbnh9hqrk1iq9whlz6vpwy"; + libraryHaskellDepends = [ base regex-pcre-builtin ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/VonFry/prefix-expression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prefix-units" = callPackage ({ mkDerivation, base, Cabal, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -156909,10 +164952,9 @@ self: { }) {}; "prefork" = callPackage - ({ mkDerivation, async, base, blaze-builder, bytestring, cab - , cmdargs, containers, data-default, directory, filepath, hspec - , http-types, network, process, stm, system-argv0, system-filepath - , unix, wai, warp + ({ mkDerivation, base, cab, containers, data-default, directory + , filepath, hspec, process, stm, system-argv0, system-filepath + , unix }: mkDerivation { pname = "prefork"; @@ -156924,10 +164966,6 @@ self: { base containers data-default process stm system-argv0 system-filepath unix ]; - executableHaskellDepends = [ - async base blaze-builder bytestring cmdargs containers http-types - network stm unix wai warp - ]; testHaskellDepends = [ base cab containers directory filepath hspec process stm unix ]; @@ -156976,6 +165014,7 @@ self: { homepage = "http://github.com/kerscher/preliminaries"; description = "A larger alternative to the Prelude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prelude-compat" = callPackage @@ -157198,14 +165237,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pretty_1_1_3_5" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }: + "pretty_1_1_3_6" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-prim, QuickCheck }: mkDerivation { pname = "pretty"; - version = "1.1.3.5"; - sha256 = "0ibgg8hrizf8dqbpznk85w612nyn349l26c5pwg9b9qmg56rs05h"; + version = "1.1.3.6"; + sha256 = "1s363nax6zxqs4bnciddsfc2sanv1lp4x02y58z3yzdgrciwq4pb"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://github.com/haskell/pretty"; description = "Pretty-printing library"; license = stdenv.lib.licenses.bsd3; @@ -157232,6 +165272,8 @@ self: { pname = "pretty-compact"; version = "3.0"; sha256 = "06m8n5rx1d62hwd017ss8nlxas5ia57lgxddm2hv2046938a5wm8"; + revision = "2"; + editedCabalFile = "04c309cdfrfwh031g8syyrwwn0lxdjj9f7d8szabscm19zwbi399"; libraryHaskellDepends = [ base base-compat containers ]; benchmarkHaskellDepends = [ aeson base base-compat bytestring criterion deepseq pretty text @@ -157299,8 +165341,8 @@ self: { }: mkDerivation { pname = "pretty-show"; - version = "1.6.13"; - sha256 = "1kbx72ybrpw0kh5zsd2kdw143qykbmd9lgmsvj57659y0k5l7fjm"; + version = "1.6.16"; + sha256 = "0l03mhbdnf0sj6kw2s3cf2xhfbl0809jr9fhj7cmpkhjpxv89vnv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -157314,20 +165356,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pretty-show_1_7" = callPackage + ({ mkDerivation, array, base, filepath, ghc-prim, happy + , haskell-lexer, pretty, text + }: + mkDerivation { + pname = "pretty-show"; + version = "1.7"; + sha256 = "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base filepath ghc-prim haskell-lexer pretty text + ]; + libraryToolDepends = [ happy ]; + executableHaskellDepends = [ base ]; + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived `Show` instances and generic inspection of values"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-simple" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , criterion, doctest, Glob, mtl, parsec, text, transformers + ({ mkDerivation, ansi-terminal, base, containers, criterion + , doctest, Glob, mtl, parsec, text, transformers }: mkDerivation { pname = "pretty-simple"; - version = "2.0.1.0"; - sha256 = "0a72kns4ydh22q1kwbljknrbgcpvh9l4jx16fm2s3hkkw9fivl27"; + version = "2.1.0.0"; + sha256 = "1jiq9l2zlgk3yzy6mif84fdzvwx3vzzbsh9zvwdph12zxa2y4b68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base containers mtl parsec text transformers ]; - executableHaskellDepends = [ aeson base bytestring text ]; testHaskellDepends = [ base doctest Glob ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/cdepillabout/pretty-simple"; @@ -157346,6 +165409,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-terminal" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "pretty-terminal"; + version = "0.1.0.0"; + sha256 = "0rr5mwg4j2zw0k1p2y042z5769l53vlxn5c9bf23jw7whi6gfxlf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + executableHaskellDepends = [ base text ]; + homepage = "https://github.com/loganmac/pretty-terminal#readme"; + description = "Styling and coloring terminal output with ANSI escape sequences"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pretty-tree" = callPackage ({ mkDerivation, base, boxes, containers }: mkDerivation { @@ -157395,17 +165473,15 @@ self: { "prettyprinter" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck - , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text, transformers + , random, tasty, tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "prettyprinter"; - version = "1.1.1"; - sha256 = "1kzfgwpsg3br3dkvqjhldv1bjqw7k8sg3xqinkk3c1219pk2xcx0"; + version = "1.2.0.1"; + sha256 = "0rh5bb6inq4yvv6r53sc1q3msmpvjcq8fw4sn3vwivrq44c7nf8i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; - executableHaskellDepends = [ base template-haskell text ]; testHaskellDepends = [ base bytestring doctest pgp-wordlist tasty tasty-hunit tasty-quickcheck text @@ -157424,10 +165500,8 @@ self: { }: mkDerivation { pname = "prettyprinter-ansi-terminal"; - version = "1.1.1.1"; - sha256 = "1d3sr74c0bd1nzp0cy4ip6mk85cp1v8svh6yhggsd89r0wzkb6nl"; - revision = "1"; - editedCabalFile = "1giafm5d5yjdkm7fxf208a4scsa2z1sh73zwvfrycgrhqp746brf"; + version = "1.1.1.2"; + sha256 = "0ha6vz707qzb5ky7kdsnw2zgphg2dnxrpbrxy8gaw119vwhb9q6k"; libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/quchen/prettyprinter"; @@ -157441,8 +165515,8 @@ self: { pname = "prettyprinter-compat-annotated-wl-pprint"; version = "1"; sha256 = "0zpmpbpnyxqswfb7gdj0kwz7hw606fj1iwkpl1qv0xcxk6n9n99c"; - revision = "2"; - editedCabalFile = "175bchsbx8vws1gx83z9f0l30p95353l0gyds5b0k5b5sj4fzw13"; + revision = "3"; + editedCabalFile = "0vzi7id60pfj35xp61akzvfx9x6py45r5b8343i48ljpir91rvgw"; libraryHaskellDepends = [ base prettyprinter text ]; homepage = "http://github.com/quchen/prettyprinter"; description = "Prettyprinter compatibility module for previous users of the annotated-wl-pprint package"; @@ -157457,6 +165531,8 @@ self: { pname = "prettyprinter-compat-ansi-wl-pprint"; version = "1.0.1"; sha256 = "0gzpjddnxl4z8pvb0lyal13jbr94dk900k8g4qwcq9fs26vnnb81"; + revision = "1"; + editedCabalFile = "0rzvap56ygygzs95091ipmcdc7n76sczc2dk88g4nr7zskb2nf1k"; libraryHaskellDepends = [ base prettyprinter prettyprinter-ansi-terminal text ]; @@ -157471,8 +165547,8 @@ self: { pname = "prettyprinter-compat-wl-pprint"; version = "1.0.0.1"; sha256 = "17jj8m9s3cp1s1szpy67g7wni9ssid78jqksh3aym7p6ci81y8km"; - revision = "2"; - editedCabalFile = "0j495j9crv6qi7rq044x6bx8688zqybx5w02cbv54w208ii1pzcl"; + revision = "3"; + editedCabalFile = "0cb1i1hmr6wl8lacy3w822h273lapqhp537snxgbmhf9xvfckbpr"; libraryHaskellDepends = [ base prettyprinter text ]; homepage = "http://github.com/quchen/prettyprinter"; description = "Prettyprinter compatibility module for previous users of the wl-pprint package"; @@ -157497,7 +165573,6 @@ self: { homepage = "http://github.com/quchen/prettyprinter"; description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettyprinter-vty" = callPackage @@ -157529,12 +165604,12 @@ self: { }) {}; "prim-array" = callPackage - ({ mkDerivation, base, ghc-prim, primitive }: + ({ mkDerivation, base, ghc-prim, primitive, semigroups }: mkDerivation { pname = "prim-array"; - version = "0.2.1"; - sha256 = "1ng4yhlv12h84gvz7ll9dkk8sydidb31da836y1q9ygdnhh7ipaf"; - libraryHaskellDepends = [ base ghc-prim primitive ]; + version = "0.2.2"; + sha256 = "0lr7qni6wfiazn2gj6hnlkfzxdwvfhfqfkacj43w26s34irda4g3"; + libraryHaskellDepends = [ base ghc-prim primitive semigroups ]; homepage = "https://github.com/andrewthad/prim-array#readme"; description = "Primitive byte array with type variable"; license = stdenv.lib.licenses.bsd3; @@ -157630,10 +165705,8 @@ self: { ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; - version = "0.6.2.0"; - sha256 = "1q9a537av81c0lvcdzc8i5hqjx3209f5448d1smkyaz22c1dgs5q"; - revision = "1"; - editedCabalFile = "0d61g8ppsdajdqykl2kc46kq00aamsf12v60ilgrf58dbji9sz56"; + version = "0.6.3.0"; + sha256 = "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd"; libraryHaskellDepends = [ base ghc-prim transformers ]; testHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell/primitive"; @@ -157641,6 +165714,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive-checked" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-checked"; + version = "0.6.3.0"; + sha256 = "02097f658qidmcfaisrcl4k3vmipx8w8p6mcbnajc8ndb3m58bbl"; + libraryHaskellDepends = [ base primitive ]; + homepage = "https://github.com/andrewthad/primitive-checked#readme"; + description = "primitive functions with bounds-checking"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primitive-simd" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive , random, vector @@ -157715,6 +165800,7 @@ self: { homepage = "https://github.com/andrewthad/pringletons"; description = "Classes and data structures complementing the singletons library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "print-debugger" = callPackage @@ -157745,6 +165831,7 @@ self: { homepage = "https://github.com/m0rphism/printcess/"; description = "Pretty printing with indentation, mixfix operators, and automatic line breaks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "printf-mauke" = callPackage @@ -157773,6 +165860,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prints" = callPackage + ({ mkDerivation, base, hscolour, pretty-show, pretty-simple, text + , transformers + }: + mkDerivation { + pname = "prints"; + version = "0.1.0.2"; + sha256 = "0qngdky3rj9kzn2j8aqsnrrrgx4jc375m6lipx5m8j7wxqzyc8if"; + libraryHaskellDepends = [ + base hscolour pretty-show pretty-simple text transformers + ]; + homepage = "https://github.com/evturn/prints"; + description = "The Artist Formerly Known as Prints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "printxosd" = callPackage ({ mkDerivation, base, xosd }: mkDerivation { @@ -157836,15 +165939,15 @@ self: { }) {}; "privileged-concurrency" = callPackage - ({ mkDerivation, base, contravariant, lifted-base, monad-control - , stm, transformers-base + ({ mkDerivation, base, contravariant, lifted-base, stm, unliftio + , unliftio-core }: mkDerivation { pname = "privileged-concurrency"; - version = "0.6.1"; - sha256 = "0dky434kdnb84a4wxlx3jcg1f7c7g4xh0llfiqv48wpk7lwkaic2"; + version = "0.7.0"; + sha256 = "0yapp7imds78rqb59rdr8bx82c6iifabf3x59n937srxiws55dik"; libraryHaskellDepends = [ - base contravariant lifted-base monad-control stm transformers-base + base contravariant lifted-base stm unliftio unliftio-core ]; description = "Provides privilege separated versions of the concurrency primitives"; license = stdenv.lib.licenses.bsd3; @@ -157891,10 +165994,8 @@ self: { }: mkDerivation { pname = "probable"; - version = "0.1.2"; - sha256 = "0lypxz3lz4gj5x98k7mwg3xagjld0qhzrxdk8l4gjxj77m00hkfz"; - revision = "1"; - editedCabalFile = "1iwv4ygfm53q3jyiiniqhsixps549h9c2apif10pjg5jib04yv85"; + version = "0.1.3"; + sha256 = "196m3v30818q034x7jdnqdwfqffx5pfj64yyw0q2blhwzkhc0f9n"; libraryHaskellDepends = [ base mtl mwc-random primitive statistics transformers vector ]; @@ -157934,18 +166035,18 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring network unix ]; - description = "Parse /proc/net/ tcp,tcp6,udp,udp6"; + description = "Parse /proc/net/{tcp,tcp6,udp,udp6}"; license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_2_0" = callPackage + "process_1_6_3_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.2.0"; - sha256 = "0gsyzwvid2w1z5m0w492sqb8q8c86q9wa7iqjadcdhbv8ag9z6xm"; + version = "1.6.3.0"; + sha256 = "0lxkl0gmyy2sn3r9c7dyz8vz1cm6nvygmgrizilliir5bp42m8cc"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -157972,6 +166073,7 @@ self: { homepage = "http://github.com/snoyberg/process-conduit"; description = "Conduits for processes (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "process-extras" = callPackage @@ -157980,8 +166082,8 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.7.2"; - sha256 = "0n79m1kj59w4s2a86m1hm98019452mhh06szn0jwsvb9xhqi0v77"; + version = "0.7.4"; + sha256 = "0klqgr37f1z2z6i0a9b0giapmq0p35l5k9kz1p7f0k1597w7agi9"; libraryHaskellDepends = [ base bytestring data-default deepseq generic-deriving ListLike mtl process text @@ -158089,8 +166191,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.9.1.2"; - sha256 = "0kjq8bylhab6zhszf9vfnvzjkzfkh3bcgkkys7f13f6mrdp02bjz"; + version = "0.9.3.0"; + sha256 = "06x2xcjbhwhnwyml8kxqa5wl89mr9fbbpgplysd68d01yhm2dnmr"; libraryHaskellDepends = [ base bifunctors bytestring conceit free kan-extensions pipes pipes-bytestring pipes-concurrency pipes-parse pipes-safe @@ -158107,6 +166209,7 @@ self: { ]; description = "Streaming interface to system processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "processing" = callPackage @@ -158237,35 +166340,67 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "product" = callPackage + ({ mkDerivation, base, category }: + mkDerivation { + pname = "product"; + version = "0.1.0.0"; + sha256 = "1dh1bf5mc2q6jb4srajn448fww5s8ixcwiswqp7pk9638sdh6dgk"; + libraryHaskellDepends = [ base category ]; + description = "Product category"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "product-isomorphic" = callPackage ({ mkDerivation, base, template-haskell, th-data-compat }: mkDerivation { pname = "product-isomorphic"; - version = "0.0.3.1"; - sha256 = "1vm502d3byxiyd01h3pddar9wvh522awvi3awsb34p8s2w01p70i"; + version = "0.0.3.2"; + sha256 = "1yqpfdbdq0zh69mbpgns8faj0ajc9a8wgp3c8sgn373py2as9jxl"; libraryHaskellDepends = [ base template-haskell th-data-compat ]; + testHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/khibino/haskell-product-isomorphic"; description = "Weaken applicative functor on products"; license = stdenv.lib.licenses.bsd3; }) {}; "product-profunctors" = callPackage - ({ mkDerivation, base, contravariant, profunctors, tagged - , template-haskell + ({ mkDerivation, base, bifunctors, contravariant, criterion + , deepseq, profunctors, tagged, template-haskell }: mkDerivation { pname = "product-profunctors"; - version = "0.8.0.3"; - sha256 = "1j8cqhx2691pxnb4kwwbm3a3fzq2lyaic00yy5g3112gpb3b392g"; + version = "0.9.0.0"; + sha256 = "1kzadxbhqyhhihp3m38pckbkyflhgianpvf08ybvry1ng73577jn"; libraryHaskellDepends = [ - base contravariant profunctors tagged template-haskell + base bifunctors contravariant profunctors tagged template-haskell ]; testHaskellDepends = [ base profunctors ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; description = "product-profunctors"; license = stdenv.lib.licenses.bsd3; }) {}; + "product-profunctors_0_10_0_0" = callPackage + ({ mkDerivation, base, bifunctors, contravariant, criterion + , deepseq, profunctors, tagged, template-haskell + }: + mkDerivation { + pname = "product-profunctors"; + version = "0.10.0.0"; + sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd"; + libraryHaskellDepends = [ + base bifunctors contravariant profunctors tagged template-haskell + ]; + testHaskellDepends = [ base profunctors ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "https://github.com/tomjaguarpaw/product-profunctors"; + description = "product-profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prof2dot" = callPackage ({ mkDerivation, base, containers, filepath, haskell98, parsec }: mkDerivation { @@ -158329,8 +166464,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.3.0"; - sha256 = "1swsy006axh06f1nwvfbvs3rsd1y1733n6b3xyncnc6vifnf7gz2"; + version = "0.4.4.0"; + sha256 = "08pnybyr6l39h7lxvgxi014wb7cf6i8qfygx4xkfzkj9p23mp3h9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -158341,6 +166476,7 @@ self: { homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "profunctor-extras" = callPackage @@ -158358,15 +166494,17 @@ self: { "profunctors" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad - , contravariant, distributive, tagged, transformers + , contravariant, distributive, semigroups, tagged, transformers }: mkDerivation { pname = "profunctors"; - version = "5.2.1"; - sha256 = "0pcwjp813d3mrzb7qf7dzkspf85xnfj1m2snhjgnvwx6vw07w877"; + version = "5.2.2"; + sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9"; + revision = "1"; + editedCabalFile = "1g6fvxq2npnyi8wv9mvwy35an68lrm5bf7xmx9x61mbwdxb6d0cg"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive - tagged transformers + semigroups tagged transformers ]; homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; @@ -158386,15 +166524,16 @@ self: { }) {}; "progress-meter" = callPackage - ({ mkDerivation, async, base, containers, stm }: + ({ mkDerivation, ansi-terminal, async, base, stm }: mkDerivation { pname = "progress-meter"; - version = "0.1.0"; - sha256 = "0xbrs2ydi64vllwz55b100ggwdcixi2p8zxlbxg7hg7s6ki244xf"; - libraryHaskellDepends = [ async base containers stm ]; + version = "1.0.0.1"; + sha256 = "1mdzwbzkf9ja7i21hds26gqn2ll4hnidbcq145yigkfzv93r6hq6"; + libraryHaskellDepends = [ ansi-terminal async base stm ]; homepage = "https://github.com/esoeylemez/progress-meter"; description = "Live diagnostics for concurrent activity"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "progress-reporting" = callPackage @@ -158403,6 +166542,8 @@ self: { pname = "progress-reporting"; version = "1.1.0"; sha256 = "02j1i28hcd54w1j9p0d8xzc1bns7swd8js5f6d6ppikc82hlb9bj"; + revision = "1"; + editedCabalFile = "1a20ziwki29chw069jqrjm2rb64j4sfxbi7xyqxqd6vh9gpwdmm1"; libraryHaskellDepends = [ base deepseq mtl time ]; description = "Functionality for reporting function progress"; license = stdenv.lib.licenses.lgpl3; @@ -158417,7 +166558,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base io-reactive ]; - executableHaskellDepends = [ base ]; description = "Progressbar API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -158550,8 +166690,8 @@ self: { }: mkDerivation { pname = "project-template"; - version = "0.2.0"; - sha256 = "0433a2cmximz2jbg0m97h80pvmb7vafjvw3qzjpsncavg38xgaxf"; + version = "0.2.0.1"; + sha256 = "1p69ww4rhah2qxragl615wl4a6mk4x9w09am8knmz3s4lxpljlpb"; libraryHaskellDepends = [ base base64-bytestring bytestring conduit conduit-extra containers directory filepath mtl resourcet text transformers @@ -158583,6 +166723,7 @@ self: { homepage = "https://github.com/roman/Haskell-projectile#readme"; description = "Go to README.md"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "projection" = callPackage @@ -158662,20 +166803,25 @@ self: { }) {}; "prologue" = callPackage - ({ mkDerivation, base, bifunctors, binary, cond, container, convert - , data-default, data-layer, errors, functor-utils, impossible, lens - , lens-utils, mtl, pretty-show, string-qq, text, transformers - , transformers-base, tuple, typelevel, vector + ({ mkDerivation, base, bifunctors, binary, comonad, cond, container + , convert, data-default, deepseq, deriving-compat, either, errors + , exceptions, functor-utils, ghc-prim, impossible, lens, lens-utils + , monoid, mtl, neat-interpolation, placeholders, pointed + , pretty-show, primitive, raw-strings-qq, recursion-schemes + , semigroupoids, string-qq, template-haskell, text, transformers + , transformers-base, typelevel, vector }: mkDerivation { pname = "prologue"; - version = "1.0.7"; - sha256 = "0nwk6m93c2mgzagzad1zkp5p6wnjdz668bw109vwwb0yi23c3s1p"; + version = "3.1.7"; + sha256 = "024ygn8q24sxdxdr1mip9pcjjmzm254am7fyzbqpmj5cjg1kykq6"; libraryHaskellDepends = [ - base bifunctors binary cond container convert data-default - data-layer errors functor-utils impossible lens lens-utils mtl - pretty-show string-qq text transformers transformers-base tuple - typelevel vector + base bifunctors binary comonad cond container convert data-default + deepseq deriving-compat either errors exceptions functor-utils + ghc-prim impossible lens lens-utils monoid mtl neat-interpolation + placeholders pointed pretty-show primitive raw-strings-qq + recursion-schemes semigroupoids string-qq template-haskell text + transformers transformers-base typelevel vector ]; homepage = "https://github.com/wdanilo/prologue"; description = "Better, more general Prelude exporting common utilities"; @@ -158685,19 +166831,21 @@ self: { "prometheus" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, containers - , http-types, text, transformers, wai, warp + , http-client, http-types, lens, proto-lens, proto-lens-protoc + , text, transformers, wai, warp, wreq }: mkDerivation { pname = "prometheus"; - version = "0.4.2"; - sha256 = "0k5avxjv1z4cfrx5x368ygzv30ghwykv4ngifigy1ydnmp7c7n1h"; + version = "0.5.0"; + sha256 = "0bfm9frngj0lfpbmrxb0qg5x7bx447wyc8x8x79ah0r9l1l1bfsb"; libraryHaskellDepends = [ - atomic-primops base bytestring containers http-types text - transformers wai warp + atomic-primops base bytestring containers http-client http-types + lens proto-lens proto-lens-protoc text transformers wai warp wreq ]; homepage = "http://github.com/bitnomial/prometheus"; description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prometheus-client" = callPackage @@ -158707,8 +166855,8 @@ self: { }: mkDerivation { pname = "prometheus-client"; - version = "0.2.0"; - sha256 = "15iqacx6gygd5xp17i1c7sd0mvndqfxqvjjs17hndxiqjgxvlr1z"; + version = "0.3.0"; + sha256 = "0nyh90ixf4g54q8qy315fv310rn0sw6rypkj37876isdhq5w8a2z"; libraryHaskellDepends = [ atomic-primops base bytestring clock containers mtl stm transformers utf8-string @@ -158751,14 +166899,15 @@ self: { homepage = "https://github.com/ocharles/prometheus-effect"; description = "Instrument applications with metrics and publish/push to Prometheus"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prometheus-metrics-ghc" = callPackage ({ mkDerivation, base, doctest, prometheus-client, utf8-string }: mkDerivation { pname = "prometheus-metrics-ghc"; - version = "0.2.0"; - sha256 = "0j3lk2khnqbf9l3lri4n7fn0riinwakp911l05h2qywjcj0v5vm0"; + version = "0.3.0"; + sha256 = "0cgcgzd7f39fhi0hxwjawif55a3i5mnnv7afxrrbk7gnhqb589nx"; libraryHaskellDepends = [ base prometheus-client utf8-string ]; testHaskellDepends = [ base doctest prometheus-client ]; homepage = "https://github.com/fimad/prometheus-haskell"; @@ -158807,6 +166956,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "proof-combinators" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "proof-combinators"; + version = "0.1.0.0"; + sha256 = "1wcm5wxzqm4lq340l3ga15cmjfabpf8njnvma3zagwyhmndabxfw"; + libraryHaskellDepends = [ base ]; + homepage = "http://nikivazou.github.io/"; + description = "Proof Combinators used in Liquid Haskell for Theorem Proving"; + license = stdenv.lib.licenses.mit; + }) {}; + "propane" = callPackage ({ mkDerivation, base, colour, containers, directory, filepath , repa, repa-devil, spawn @@ -158831,8 +166992,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.9.0"; - sha256 = "1pciifl4hm5bmdx2li4hj3cm41ffj7s23r4ivkr8x3zghmik3n88"; + version = "5.3.4"; + sha256 = "0wzaca3hcvbdfb326srj6sivzkbyshxv6j0lvng6k8dqwiipnvwb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158929,7 +167090,7 @@ self: { }) {}; "proteaaudio" = callPackage - ({ mkDerivation, base, bytestring, c2hs, filepath, libpulseaudio }: + ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }: mkDerivation { pname = "proteaaudio"; version = "0.7.0.1"; @@ -158939,10 +167100,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ libpulseaudio ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base bytestring filepath ]; description = "Simple audio library for Windows, Linux, OSX"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libpulseaudio;}; "proto-lens" = callPackage @@ -158952,8 +167111,8 @@ self: { }: mkDerivation { pname = "proto-lens"; - version = "0.2.1.0"; - sha256 = "1nibz7cqlwj0vp350km80df10330s2hqvhwr36liiqc92ghphvzg"; + version = "0.2.2.0"; + sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class lens-family parsec pretty text transformers void @@ -158963,20 +167122,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens_0_2_2_0" = callPackage + "proto-lens_0_3_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default-class, lens-family, parsec, pretty, text - , transformers, void + , data-default-class, deepseq, lens-family, lens-labels, parsec + , pretty, text, transformers, void }: mkDerivation { pname = "proto-lens"; - version = "0.2.2.0"; - sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj"; + version = "0.3.0.0"; + sha256 = "0skbqawzz58ilpvkdcx1hmpaj67pyjz449qmdrp2scdpdcc1nica"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - attoparsec base bytestring containers data-default-class - lens-family parsec pretty text transformers void + attoparsec base bytestring containers data-default-class deepseq + lens-family lens-labels parsec pretty text transformers void ]; - homepage = "https://github.com/google/proto-lens"; + homepage = "https://github.com/google/proto-lens#readme"; description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -158998,71 +167158,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens-combinators" = callPackage - ({ mkDerivation, base, Cabal, data-default-class, HUnit - , lens-family, lens-family-core, proto-lens, proto-lens-protoc - , test-framework, test-framework-hunit, transformers + "proto-lens-arbitrary_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, lens-family + , proto-lens, QuickCheck, text }: mkDerivation { - pname = "proto-lens-combinators"; - version = "0.1.0.7"; - sha256 = "0c00ipxpyqizzgd3fg0hfqs1bqypah90zysjb0c4pl5hhaqi9bak"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + pname = "proto-lens-arbitrary"; + version = "0.1.2.0"; + sha256 = "1xkvv822qsi1h99f7xpbprq4j9yf5ykz6bd5lj5jn8626vfq0n67"; libraryHaskellDepends = [ - base data-default-class lens-family proto-lens proto-lens-protoc - transformers - ]; - testHaskellDepends = [ - base HUnit lens-family lens-family-core proto-lens - proto-lens-protoc test-framework test-framework-hunit + base bytestring containers lens-family proto-lens QuickCheck text ]; - homepage = "https://github.com/google/proto-lens"; - description = "Utilities functions to proto-lens"; + homepage = "https://github.com/google/proto-lens#readme"; + description = "Arbitrary instances for proto-lens"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "proto-lens-combinators_0_1_0_8" = callPackage + "proto-lens-combinators" = callPackage ({ 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.8"; - sha256 = "0byz61d1xd1khksvh170q7a7qvziigxf76ngcsd650fahqaardzz"; + version = "0.1.0.9"; + sha256 = "1kkns9p2ipq4b3jy1l4lbh9h1m3vvg1l5r6ncqs0ydc2rqy1iasf"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ - base data-default-class lens-family proto-lens proto-lens-protoc - transformers + base data-default-class lens-family proto-lens-protoc transformers ]; testHaskellDepends = [ base HUnit lens-family lens-family-core proto-lens proto-lens-protoc test-framework test-framework-hunit ]; - homepage = "https://github.com/google/proto-lens"; + homepage = "https://github.com/google/proto-lens#readme"; description = "Utilities functions to proto-lens"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-descriptors" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , lens-family, lens-labels, proto-lens, text - }: - mkDerivation { - pname = "proto-lens-descriptors"; - version = "0.2.1.0"; - sha256 = "1qaprwdxck8h06wha6hp94kia5m247bc73973rz870c7hk2pdh6s"; - libraryHaskellDepends = [ - base bytestring containers data-default-class lens-family - lens-labels proto-lens text - ]; - description = "Protocol buffers for describing the definitions of messages"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-descriptors_0_2_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , lens-family, lens-labels, proto-lens, text }: @@ -159076,50 +167212,35 @@ self: { ]; description = "Protocol buffers for describing the definitions of messages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-optparse" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.0.4"; - sha256 = "1wywg2jzc35483qlqxy1a4ms6v6cb08d10z4pgwb50ljv5hqlwwb"; + version = "0.1.1.0"; + sha256 = "0m32sb05mjajwli9ivrcblkxyy8hrgi8sm2zwjlrjai6aq0ckh1c"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; - homepage = "https://github.com/google/proto-lens"; + homepage = "https://github.com/google/proto-lens#readme"; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = stdenv.lib.licenses.bsd3; }) {}; "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-protobuf-types_0_2_2_0" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, text }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.2.2.0"; - sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72"; + version = "0.3.0.0"; + sha256 = "1r9pbpapgi8bq938m1fliwbv8cxr18v3a3hbziq33psvas48kwa4"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base lens-family proto-lens proto-lens-protoc text ]; - homepage = "https://github.com/google/proto-lens"; + homepage = "https://github.com/google/proto-lens#readme"; description = "Basic protocol buffer message types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -159127,50 +167248,26 @@ self: { "proto-lens-protoc" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers - , data-default-class, directory, filepath, haskell-src-exts - , lens-family, lens-labels, process, proto-lens - , proto-lens-descriptors, text + , data-default-class, deepseq, directory, filepath + , haskell-src-exts, lens-family, lens-labels, pretty, process + , proto-lens, text }: mkDerivation { pname = "proto-lens-protoc"; - 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 lens-labels process - proto-lens proto-lens-descriptors text - ]; - executableHaskellDepends = [ - base bytestring containers data-default-class filepath - haskell-src-exts lens-family proto-lens proto-lens-descriptors text - ]; - description = "Protocol buffer compiler for the proto-lens library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-protoc_0_2_2_3" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers - , data-default-class, directory, filepath, haskell-src-exts - , lens-family, lens-labels, process, proto-lens - , proto-lens-descriptors, text - }: - mkDerivation { - pname = "proto-lens-protoc"; - version = "0.2.2.3"; - sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq"; + version = "0.3.0.0"; + sha256 = "0fh6q3alm8pw32zsg6yrf8b3gf2ww5yqsjax2hmij3y20fl26s79"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers data-default-class directory - filepath haskell-src-exts lens-family lens-labels process - proto-lens proto-lens-descriptors text + base bytestring Cabal containers data-default-class deepseq + directory filepath haskell-src-exts lens-family lens-labels pretty + process proto-lens text ]; executableHaskellDepends = [ - base bytestring containers data-default-class filepath - haskell-src-exts lens-family proto-lens proto-lens-descriptors text + base bytestring containers data-default-class deepseq filepath + haskell-src-exts lens-family proto-lens text ]; + homepage = "https://github.com/google/proto-lens#readme"; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -159230,8 +167327,8 @@ self: { }: mkDerivation { pname = "protobuf-simple"; - version = "0.1.0.4"; - sha256 = "1164f2v0wyqfvzbmfp8g2hi7jzx1pykzaix36mlh9rvd58s1h1m2"; + version = "0.1.0.5"; + sha256 = "1w8nx700pyq0r909akyihcajsx5pgj76f2nfvwabib2fy4kv8ikb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159255,8 +167352,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.5"; - sha256 = "1dcyv89z3869zd43wkby7xrzb1gz1iy2jrdr7yk45q2d1i63ssh4"; + version = "2.4.8"; + sha256 = "0inwj82pqbfqbgrzbs47g51k5nkx74hvbr76qc0a7kq0ss0rgnyb"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -159270,8 +167367,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.5"; - sha256 = "0rz1v9iab012sc2m45yvmag94xg64gjrw0pqddp8gvw67i5lfan3"; + version = "2.4.8"; + sha256 = "1j8q6qj1gck13qxwrq2cslhw3pcc9kr6h7iqs4229lhsf73lql9a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -159317,40 +167414,55 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "protolude" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , ghc-prim, mtl, safe, stm, text, transformers + "protocol-radius" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, cryptonite + , dlist, memory, template-haskell, text, transformers }: mkDerivation { - pname = "protolude"; - version = "0.1.10"; - sha256 = "19f7w4n1k3xb3y00b10rxr781yxivl7byh7hrnfk5mzh32jrcchn"; + pname = "protocol-radius"; + version = "0.0.1.0"; + sha256 = "1ygn7kd6rdmgb4hy4iby0l9m1hm6w0linhjipgv7vczd8b0mw35f"; libraryHaskellDepends = [ - async base bytestring containers deepseq ghc-prim mtl safe stm text - transformers + base bytestring cereal containers cryptonite dlist memory + template-haskell text transformers ]; - homepage = "https://github.com/sdiehl/protolude"; - description = "A sensible set of defaults for writing custom Preludes"; - license = stdenv.lib.licenses.mit; + description = "parser and printer for radius protocol packet"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "protocol-radius-test" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers + , protocol-radius, QuickCheck, quickcheck-simple, transformers + }: + mkDerivation { + pname = "protocol-radius-test"; + version = "0.0.1.0"; + sha256 = "185d85d9gfylcg575rvr43p4p8wzh0mi9frvkm2cn3liwwarmk5m"; + libraryHaskellDepends = [ + base bytestring cereal containers protocol-radius QuickCheck + quickcheck-simple transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + description = "testsuit of protocol-radius haskell package"; + license = stdenv.lib.licenses.bsd3; }) {}; - "protolude_0_2" = callPackage + "protolude" = callPackage ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text - , transformers + , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text + , transformers, transformers-compat }: mkDerivation { pname = "protolude"; - version = "0.2"; - sha256 = "1ky72pv1icrcj9s3al23nwylyv7l60s2h0m2hs85wdb3kn1c042n"; + version = "0.2.2"; + sha256 = "0z251xxv8rhds981acdf6dr34ac2kc062mbq9gl2nj339grhqpb8"; libraryHaskellDepends = [ array async base bytestring containers deepseq ghc-prim hashable - mtl mtl-compat safe stm text transformers + mtl mtl-compat stm text transformers transformers-compat ]; homepage = "https://github.com/sdiehl/protolude"; description = "A small prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protolude-lifted" = callPackage @@ -159447,6 +167559,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proxy-mapping" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "proxy-mapping"; + version = "0.1.0.1"; + sha256 = "12lwn64znci7l5l7sa3g7hm0rmnjvykci7k65mz5c2zdwx3zgvdd"; + libraryHaskellDepends = [ base ]; + description = "Mapping of Proxy Types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "psc-ide" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , edit-distance, either, filepath, fsnotify, hspec, http-client @@ -159488,6 +167612,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.6.0"; sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra"; + revision = "1"; + editedCabalFile = "11n7wcfpahbyg8lmq90vvq11fm2ls4761qf9q7pkbvd7vkm6by2n"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -159558,8 +167684,8 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.4.0"; - sha256 = "1lbjm6mnw91qg1ik73mwh48cq79k4kkaj4l380ilqp0p05a386j9"; + version = "0.2.6.0"; + sha256 = "0n39s1i88j6s7vvsdhpbhcr3gpbwlzabwcc3nbd7nqb4kb4i0sls"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged @@ -159603,24 +167729,26 @@ self: { "ptr" = callPackage ({ mkDerivation, base, base-prelude, bug, bytestring, contravariant - , mtl, profunctors, quickcheck-instances, rerebase, semigroups - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers + , mtl, profunctors, QuickCheck, quickcheck-instances, rerebase + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers }: mkDerivation { pname = "ptr"; - version = "0.15.7"; - sha256 = "0zbyr8kzz47c1rfjpw8rk0kh4rys8qd8vihz69wmnxgy0fa4z7l4"; + version = "0.16.4"; + sha256 = "0na3by8mh43cd0xn1s1l7hi3mmm3damr9swgv6mzyg9lhilsndxb"; libraryHaskellDepends = [ base base-prelude bug bytestring contravariant mtl profunctors semigroups text time transformers ]; testHaskellDepends = [ - bug quickcheck-instances rerebase tasty tasty-hunit + bug QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/nikita-volkov/ptr"; description = "Abstractions for operations on pointers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pub" = callPackage @@ -159639,6 +167767,7 @@ self: { ]; description = "Pipe stdin to a redis pub/sub channel"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "publicsuffix" = callPackage @@ -159647,31 +167776,14 @@ self: { }: 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; - }) {}; - - "publicsuffix_0_20170802" = callPackage - ({ mkDerivation, base, criterion, filepath, hspec, random - , template-haskell - }: - mkDerivation { - pname = "publicsuffix"; - version = "0.20170802"; - sha256 = "0a2cfvf7ahaic62jn80sazmraqny20mcfsr6j8bji9fcgxjj150w"; + version = "0.20171229"; + sha256 = "03qvd0a13r4b45rz2wbf7kad17v0x3f6mrcv2slhyh0x4a1ca2s0"; 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 @@ -159813,6 +167925,7 @@ self: { homepage = "https://github.com/philopon/pugixml-hs"; description = "pugixml binding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pugs-DrIFT" = callPackage @@ -159869,6 +167982,7 @@ self: { ]; description = "Portable Haskell/POSIX layer for Pugs"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pugs-hsregex" = callPackage @@ -159918,10 +168032,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers stm unix ]; librarySystemDepends = [ libpulseaudio ]; - executableHaskellDepends = [ base ]; description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libpulseaudio;}; "punkt" = callPackage @@ -159998,6 +168110,7 @@ self: { homepage = "https://github.com/bosu/pure-cdb"; description = "Another pure-haskell CDB (Constant Database) implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pure-fft" = callPackage @@ -160060,8 +168173,8 @@ self: { }: mkDerivation { pname = "pure-zlib"; - version = "0.6"; - sha256 = "1igbg3d5l8sf53kpx0451dha5lr099hpqgwy7jfjkyjvxzxi8y5b"; + version = "0.6.2"; + sha256 = "022ciqcsw39wi4r577q92s9awjwkc2da61ljqi8n5qsal83vhayh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160117,20 +168230,20 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.11.6"; - sha256 = "0cl4lyx9b1fk4sf94nj6zjj1n5s7wr56ygrxyi0ac7fbav8r42w0"; + version = "0.11.7"; + sha256 = "1q6nzxchmwdqrx3bxx0k1h8a62iihz9kcfwybzhb9x13p9nbx9np"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ 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 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 stringsearch syb - text time transformers transformers-base transformers-compat - unordered-containers utf8-string vector + data-ordlist deepseq directory dlist edit-distance file-embed + filepath 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 + stringsearch syb text time transformers transformers-base + transformers-compat unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson aeson-better-errors ansi-terminal ansi-wl-pprint base @@ -160148,9 +168261,9 @@ self: { testHaskellDepends = [ 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 + data-ordlist deepseq directory dlist edit-distance file-embed + 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 @@ -160171,8 +168284,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.11.1.1"; - sha256 = "023j88q724l38zqry6v916na1hlqhcinb5pw3cqssmql0cf32ajh"; + version = "0.11.1.2"; + sha256 = "1ihm5x42aa0qda5k96i7m43cx3j8ywcxgm13y7dasll697zwl04w"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -160184,6 +168297,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "purescript-bridge_0_12_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.12.0.0"; + sha256 = "1kh3ydqn7vs3ybda9ic8gbmzzjigiiibls9w1nh5ffgwf42dij7j"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "purescript-bundle-fast" = callPackage ({ mkDerivation, base, containers, directory, filepath , optparse-applicative, text, vector @@ -160203,6 +168337,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "purescript-tsd-gen" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, mtl, optparse-applicative, purescript, text + }: + mkDerivation { + pname = "purescript-tsd-gen"; + version = "0.1.0.0"; + sha256 = "0wnj2gvibwcdpbwz9hbn773ircp8rm85klb318933s27fl2z0zfb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath mtl purescript + text + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory filepath mtl + optparse-applicative purescript text + ]; + homepage = "https://github.com/minoki/purescript-tsd-gen#readme"; + description = "TypeScript Declaration File (.d.ts) generator for PureScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pursuit-client" = callPackage ({ mkDerivation, base, http-client, lens, taggy-lens, text, wreq }: mkDerivation { @@ -160218,7 +168376,6 @@ self: { homepage = "https://github.com/soupi/pursuit-client"; description = "A cli client for pursuit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "push-notify" = callPackage @@ -160253,8 +168410,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.1.0.5"; - sha256 = "1gxna2ikq6q1gnarqwsy1xcbqz19j5015girn4mc52sai852ny5z"; + version = "0.1.0.7"; + sha256 = "1rkd7vr2l5136jv1afknqvg6lgvny5wdadh3fcy2k5phihmv9qfd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160335,8 +168492,8 @@ self: { }: mkDerivation { pname = "pushbullet-types"; - version = "0.4.0.0"; - sha256 = "0fds6lhkmyfs8hrnaq29fbglcmampa4n8j93x1jkynxbp1in66z6"; + version = "0.4.1.0"; + sha256 = "0ny8nlk50cn6zgikg7xwylkrablj05vcm5gjm9y4zdzhbz7s4qb4"; libraryHaskellDepends = [ aeson base http-api-data microlens microlens-th scientific text time unordered-containers @@ -160365,50 +168522,27 @@ self: { "pusher-http-haskell" = 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.1"; - sha256 = "0cm2g49vpsfq92dik89vahkcjz8a17ihx973mhpg70cx3plpz8g8"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptohash hashable - http-client http-types text time transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec http-client http-types QuickCheck text - transformers unordered-containers - ]; - homepage = "https://github.com/pusher-community/pusher-http-haskell"; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pusher-http-haskell_1_5_0_1" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , containers, cryptonite, hashable, hspec, HTTP, http-client - , http-types, memory, network-uri, QuickCheck, scientific, text - , time, transformers, unordered-containers, vector + , cryptonite, hashable, hspec, http-client, http-types, memory + , QuickCheck, scientific, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.0.1"; - sha256 = "08fgyvm1lp1yr9p9a6fr111x78rlzhr02gbsd6q6hjxnlffya4vf"; + version = "1.5.1.4"; + sha256 = "1h6dl0h9ybbnjqs834bd1n5w4cx0vdbmi52mqdk2y9y267qc9k4a"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring containers cryptonite - hashable HTTP http-client http-types memory text time transformers + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-types memory text time transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hspec HTTP - http-client http-types memory network-uri QuickCheck scientific - text time transformers unordered-containers vector + aeson base base16-bytestring bytestring cryptonite hspec + http-client http-types QuickCheck scientific text time transformers + unordered-containers vector ]; homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -160419,8 +168553,8 @@ self: { }: mkDerivation { pname = "pusher-ws"; - version = "0.1.0.1"; - sha256 = "0i5659wljhaindimm8b6khibr8mcmcr5iaags2a33zjb67gjbsd7"; + version = "0.1.1.0"; + sha256 = "04nk5jdw7pv57366hjscl5sdhbhyplpfb34y1dj3i31d8s20yn1a"; libraryHaskellDepends = [ aeson base bytestring containers deepseq hashable http-conduit lens lens-aeson network scientific stm text time transformers @@ -160429,6 +168563,7 @@ self: { homepage = "https://github.com/barrucadu/pusher-ws"; description = "Implementation of the Pusher WebSocket protocol"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pushme" = callPackage @@ -160441,8 +168576,8 @@ self: { }: mkDerivation { pname = "pushme"; - version = "2.0.2"; - sha256 = "12gd31fbsm3adxmcwkikx4zwq5a7snv8mc0jd73crqfy46spm6zw"; + version = "2.1.1"; + sha256 = "1adgdbnifilzpxgkzdv0wxd475s7kl0ib8qqpd8ifx1cnm1zggjw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160452,7 +168587,7 @@ self: { system-fileio system-filepath temporary text text-format time transformers unix unordered-containers yaml ]; - homepage = "https://github.com/jwiegley/pushme"; + homepage = "https://github.com/jwiegley/pushme#readme"; description = "Tool to synchronize directories with rsync, zfs or git-annex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -160721,6 +168856,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "q4c12-twofinger" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, deepseq + , doctest, lens, lens-properties, semigroupoids, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "q4c12-twofinger"; + version = "0.2"; + sha256 = "0c4fm6pdl1mlh4xnp8syjifknyvbdqwdyiika9pkww4xmf12lv7z"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base containers deepseq semigroupoids ]; + testHaskellDepends = [ + base doctest lens lens-properties tasty tasty-quickcheck + ]; + homepage = "https://github.com/quasicomputational/mega/tree/master/packages/twofinger"; + description = "Efficient alternating finger trees"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qc-oi-testgenerator" = callPackage ({ mkDerivation, base, fclabels, QuickCheck, template-haskell }: mkDerivation { @@ -160737,13 +168892,17 @@ self: { }) {}; "qchas" = callPackage - ({ mkDerivation, base, hmatrix, random, tasty, tasty-hunit }: + ({ mkDerivation, base, hmatrix, linear, random, tasty, tasty-hunit + }: mkDerivation { pname = "qchas"; - version = "1.0.1.0"; - sha256 = "12hvhprcpwznxkdl2165ydsrh1r10xz4q4px1dyzyy5i8pkmddam"; - libraryHaskellDepends = [ base hmatrix random ]; - testHaskellDepends = [ base hmatrix tasty tasty-hunit ]; + version = "1.1.0.0"; + sha256 = "1q1i7ppgd7121xqf6f4fr798nx52cw4g50nx42shk6qzpxsah58f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hmatrix linear random ]; + executableHaskellDepends = [ base hmatrix ]; + testHaskellDepends = [ base hmatrix linear tasty tasty-hunit ]; homepage = "https://github.com/ardeleanasm/qchas#readme"; description = "A library for implementing Quantum Algorithms"; license = stdenv.lib.licenses.bsd3; @@ -160835,8 +168994,8 @@ self: { }: mkDerivation { pname = "qm-interpolated-string"; - version = "0.2.1.0"; - sha256 = "09qzlhrzhv0hcc7m8qwfh64nprf3wq4x9lrcdnqpqw2airh5cbn3"; + version = "0.3.0.0"; + sha256 = "1brbs4qwvb16bkmcg51spjjrzc83hwgi1fbsix25vrri2myk6sz8"; libraryHaskellDepends = [ base bytestring haskell-src-meta template-haskell text ]; @@ -160844,27 +169003,38 @@ self: { homepage = "https://github.com/unclechu/haskell-qm-interpolated-string"; description = "Implementation of interpolated multiline strings"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "qq-literals" = callPackage + ({ mkDerivation, base, network-uri, template-haskell }: + mkDerivation { + pname = "qq-literals"; + version = "0.1.0.0"; + sha256 = "1fsl1639jzik9zrkks1badx6pd303rjdm3dmnb6cfjjb1jg50cqr"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base network-uri template-haskell ]; + homepage = "https://github.com/hdgarrood/qq-literals"; + description = "Compile-time checked literal values via QuasiQuoters"; + license = stdenv.lib.licenses.mit; }) {}; "qr-imager" = callPackage - ({ mkDerivation, aeson, base, bytestring, cryptonite, directory + ({ mkDerivation, base, binary, bytestring, cryptonite, directory , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode - , microlens, MissingH, optparse-applicative, process, vector + , microlens, process, split, vector }: mkDerivation { pname = "qr-imager"; - version = "1.0.1.1"; - sha256 = "1jx81ha39khy115als4sai7xz8n49i44a8nxix0gvr48p8in8cv0"; + version = "2.0.0.0"; + sha256 = "01886bwkap8qk39iihlyrfa9g8cw6sicrynwk7r24nd5ib60csc3"; libraryHaskellDepends = [ - aeson base bytestring cryptonite directory haskell-qrencode - jose-jwt JuicyPixels microlens MissingH optparse-applicative - process vector + base binary bytestring cryptonite directory haskell-qrencode + jose-jwt JuicyPixels microlens process split vector ]; libraryPkgconfigDepends = [ libqrencode ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/vmchale/QRImager#readme"; - description = "Library to generate QR codes from bytestrings and objects"; + description = "Library to generate images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libqrencode;}; @@ -160922,11 +169092,14 @@ self: { qtc_opengl = null; qtc_script = null; qtc_tools = null;}; "qtah-cpp-qt5" = callPackage - ({ mkDerivation, base, process, qtah-generator, qtbase }: + ({ mkDerivation, base, Cabal, directory, filepath, process + , qtah-generator, qtbase + }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.3.1"; - sha256 = "0yy6q10lsjhjnvirs2d8pdivs9d0kdilwsm4j7s59jz5xhwzbqzl"; + version = "0.4.0"; + sha256 = "03m45jc5jpkjfcx0dr1lb2nsajbhkfb5phsx7v909hj8d7j7swvz"; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; homepage = "http://khumba.net/projects/qtah"; @@ -160941,8 +169114,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.3.0"; - sha256 = "0scb00dilgbiqzp1jq0jknx76qb0fc9l9wsv214k9x741q7cv71b"; + version = "0.4.0"; + sha256 = "0q8k2diyrxpvsnhlw484lxy3j6qbk07hkqj0hg2cxv8whhi02bp9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160955,15 +169128,17 @@ self: { }) {}; "qtah-generator" = callPackage - ({ mkDerivation, base, containers, directory, filepath, haskell-src - , hoppy-generator, hoppy-std, mtl, process, transformers + ({ mkDerivation, base, Cabal, containers, directory, filepath + , haskell-src, hoppy-generator, hoppy-std, mtl, process + , transformers }: mkDerivation { pname = "qtah-generator"; - version = "0.3.0"; - sha256 = "0zyhpb70lcp9r8skq6lzw4xqpa3fndbq4vxk098diqivknl064ff"; + version = "0.4.0"; + sha256 = "1fxv8g3rrhf9q7g90phqji4q5yb2l0sfi0qm81zp9ya91wmcfsg5"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base containers directory filepath haskell-src hoppy-generator @@ -160977,13 +169152,15 @@ self: { }) {}; "qtah-qt5" = callPackage - ({ mkDerivation, base, binary, bytestring, hoppy-runtime, HUnit - , qtah, qtah-cpp-qt5, qtah-generator, qtbase + ({ mkDerivation, base, binary, bytestring, Cabal, directory + , filepath, hoppy-runtime, HUnit, qtah, qtah-cpp-qt5 + , qtah-generator, qtbase }: mkDerivation { pname = "qtah-qt5"; - version = "0.3.0"; - sha256 = "0rrg0ymkhvgdhwcabr4n4alrqkzyyzyggdclygmjp7l2lq4md1ad"; + version = "0.4.0"; + sha256 = "1b20wrbyldxx6vsxax3kdfxikv0v79m3qcbwhjwgyp586gk9pl63"; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -161072,15 +169249,16 @@ self: { }) {}; "quantification" = callPackage - ({ mkDerivation, aeson, base, ghc-prim, hashable, path-pieces, text - , vector + ({ mkDerivation, aeson, base, containers, ghc-prim, hashable + , path-pieces, text, unordered-containers, vector }: mkDerivation { pname = "quantification"; - version = "0.2"; - sha256 = "13mvhhg7j47ff741zrbnr11f5x2bv4gqdz02g2h8rr116shb31ia"; + version = "0.3"; + sha256 = "0hljd4m55254kmcrp3iar8ya7ky5a73vk3vrmgandmb15fsp2wvy"; libraryHaskellDepends = [ - aeson base ghc-prim hashable path-pieces text vector + aeson base containers ghc-prim hashable path-pieces text + unordered-containers vector ]; homepage = "https://github.com/andrewthad/quantification#readme"; description = "Rage against the quantification"; @@ -161188,6 +169366,98 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "queryparser" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , fixed-list, hashable, mtl, parsec, predicate-class, pretty + , QuickCheck, semigroups, text, unordered-containers, yaml + }: + mkDerivation { + pname = "queryparser"; + version = "0.1.0.1"; + sha256 = "1rz3v3cks7ys6313gispxbs8wzm8h5lccl27f9nhha7rpzl9qkcj"; + libraryHaskellDepends = [ + aeson base bytestring containers fixed-list hashable mtl parsec + predicate-class pretty QuickCheck semigroups text + unordered-containers yaml + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Analysis and parsing library for SQL queries"; + license = stdenv.lib.licenses.mit; + }) {}; + + "queryparser-demo" = callPackage + ({ mkDerivation, base, containers, pretty, queryparser + , queryparser-vertica, text, unordered-containers + }: + mkDerivation { + pname = "queryparser-demo"; + version = "0.1.0.0"; + sha256 = "1ndm7rdwnl8sgfi5058hh1l7xisxbvxl8ign91hwpkyqfmgx3ypi"; + libraryHaskellDepends = [ + base containers pretty queryparser queryparser-vertica text + unordered-containers + ]; + description = "Demo package containing queryparser examples"; + license = stdenv.lib.licenses.mit; + }) {}; + + "queryparser-hive" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, fixed-list + , hashable, mtl, parsec, predicate-class, pretty, queryparser + , QuickCheck, regex-tdfa, semigroups, text, unordered-containers + , yaml + }: + mkDerivation { + pname = "queryparser-hive"; + version = "0.1.0.1"; + sha256 = "0rj1v715wr3z76mp7i581bsjfvl9038kh4ccwlvjzi67afvds0b8"; + libraryHaskellDepends = [ + aeson base bytestring containers fixed-list hashable mtl parsec + predicate-class pretty queryparser QuickCheck regex-tdfa semigroups + text unordered-containers yaml + ]; + description = "Parsing for Hive SQL queries"; + license = stdenv.lib.licenses.mit; + }) {}; + + "queryparser-presto" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, fixed-list + , hashable, mtl, parsec, predicate-class, pretty, queryparser + , QuickCheck, regex-tdfa, semigroups, text, unordered-containers + , yaml + }: + mkDerivation { + pname = "queryparser-presto"; + version = "0.1.0.1"; + sha256 = "0ibcbv76c1qv8w50v7gzq6vv3l9hbda5ir95k44rk1da6n53hj3b"; + libraryHaskellDepends = [ + aeson base bytestring containers fixed-list hashable mtl parsec + predicate-class pretty queryparser QuickCheck regex-tdfa semigroups + text unordered-containers yaml + ]; + description = "Parsing for Presto SQL queries"; + license = stdenv.lib.licenses.mit; + }) {}; + + "queryparser-vertica" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, fixed-list + , hashable, mtl, parsec, predicate-class, pretty, queryparser + , QuickCheck, regex-tdfa, semigroups, text, unordered-containers + , yaml + }: + mkDerivation { + pname = "queryparser-vertica"; + version = "0.1.0.1"; + sha256 = "0pkkgb3schbb25pw8k9varx3c0iwhfc47w4f2692y6s39vpm4d5z"; + libraryHaskellDepends = [ + aeson base bytestring containers fixed-list hashable mtl parsec + predicate-class pretty queryparser QuickCheck regex-tdfa semigroups + text unordered-containers yaml + ]; + description = "Parsing for Vertica SQL queries"; + license = stdenv.lib.licenses.mit; + }) {}; + "querystring-pickle" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, test-framework , test-framework-quickcheck2, text @@ -161217,10 +169487,10 @@ self: { libraryHaskellDepends = [ ansi-terminal base readline terminal-size ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/yamadapc/haskell-questioner.git"; description = "A package for prompting values from the command-line"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "queue" = callPackage @@ -161302,9 +169572,8 @@ self: { "quickbooks" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring - , doctest, email-validate, fast-logger, http-client - , http-client-tls, http-types, interpolate, old-locale, text, thyme - , yaml + , email-validate, fast-logger, http-client, http-client-tls + , http-types, interpolate, old-locale, text, thyme, yaml }: mkDerivation { pname = "quickbooks"; @@ -161315,7 +169584,6 @@ self: { http-client http-client-tls http-types interpolate old-locale text thyme yaml ]; - testHaskellDepends = [ base doctest ]; description = "QuickBooks API binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -161327,8 +169595,8 @@ self: { }: mkDerivation { pname = "quickcheck-arbitrary-adt"; - version = "0.2.0.0"; - sha256 = "1ny04h3kxqdhlfxbvcdzsl6n7vgs5xdk9p0b9hb2jpvqlazqv6fr"; + version = "0.3.1.0"; + sha256 = "1fa5gb111m740q399l7wbr9n03ws9rasq48jhnx7dvvd6qh2wjjw"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base hspec lens QuickCheck template-haskell transformers @@ -161338,6 +169606,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-arbitrary-template" = callPackage + ({ mkDerivation, base, QuickCheck, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "quickcheck-arbitrary-template"; + version = "0.2.0.0"; + sha256 = "1bn0g3gg7cpjwap1vgvahw91yjn0v8sy1hiy60w54gdg5rrll5j9"; + libraryHaskellDepends = [ base QuickCheck safe template-haskell ]; + testHaskellDepends = [ + base QuickCheck safe tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme"; + description = "Generate QuickCheck Gen for Sum Types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-assertions" = callPackage ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }: mkDerivation { @@ -161352,20 +169638,44 @@ self: { }) {}; "quickcheck-classes" = callPackage - ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck }: + ({ mkDerivation, aeson, base, containers, prim-array, primitive + , QuickCheck, transformers, vector + }: mkDerivation { pname = "quickcheck-classes"; - version = "0.1"; - sha256 = "0fjr4fagl9wblw6998675pljhgwr554kxfahpjfk46kiknghqic1"; + version = "0.3.3"; + sha256 = "1czppkc56ny7nvfc11wdv96gng4vln7bkx87sgwlpdkw0q73rc14"; libraryHaskellDepends = [ - aeson base prim-array primitive QuickCheck + aeson base containers prim-array primitive QuickCheck transformers ]; - testHaskellDepends = [ aeson base primitive QuickCheck ]; + testHaskellDepends = [ aeson base primitive QuickCheck vector ]; homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-classes_0_4_9" = callPackage + ({ mkDerivation, aeson, base, bifunctors, containers, primitive + , QuickCheck, semigroupoids, semigroups, tagged, transformers + , vector + }: + mkDerivation { + pname = "quickcheck-classes"; + version = "0.4.9"; + sha256 = "1m5qszs50hjfycds84arfcfqj7z4l622479bd2w55vin49mp12pn"; + libraryHaskellDepends = [ + aeson base bifunctors containers primitive QuickCheck semigroupoids + semigroups tagged transformers + ]; + testHaskellDepends = [ + aeson base primitive QuickCheck tagged transformers vector + ]; + homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; + description = "QuickCheck common typeclasses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -161378,26 +169688,6 @@ self: { }) {}; "quickcheck-instances" = callPackage - ({ mkDerivation, array, base, bytestring, containers, hashable - , old-time, QuickCheck, scientific, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.12"; - sha256 = "1wwvkzpams7i0j7nk5qj8vvhj8x5zcbgbgrpczszgvshva4bkmfx"; - revision = "2"; - editedCabalFile = "1v1r7gidkjc2v4dw1id57raqnjqv4rc10pa2l6xhhg0dzrnw28a3"; - libraryHaskellDepends = [ - array base bytestring containers hashable old-time QuickCheck - scientific text time unordered-containers vector - ]; - homepage = "https://github.com/aslatter/qc-instances"; - description = "Common quickcheck instances"; - 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 @@ -161405,10 +169695,10 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.16"; - sha256 = "07xqbjb3rb5hzhjak3qpvj4hl91gc0z2272n60hv67zmv3w8kcf1"; + version = "0.3.18"; + sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55"; revision = "1"; - editedCabalFile = "1sfqjhk7z185l0gxrvn5pi3s8mvnqv1d1yzrx0k0mi48y5421jcm"; + editedCabalFile = "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific tagged text time @@ -161421,7 +169711,6 @@ self: { homepage = "https://github.com/phadej/qc-instances"; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -161478,17 +169767,12 @@ self: { }) {}; "quickcheck-property-monad" = callPackage - ({ mkDerivation, base, directory, doctest, either, filepath - , QuickCheck, transformers - }: + ({ mkDerivation, base, either, QuickCheck, transformers }: mkDerivation { pname = "quickcheck-property-monad"; version = "0.2.4"; sha256 = "0sp7592jfh6i8xsykl2lv8bspnp755fnpqvqa09dhwq6hm0r1r9c"; libraryHaskellDepends = [ base either QuickCheck transformers ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck - ]; homepage = "http://github.com/bennofs/quickcheck-property-monad/"; description = "A monad for generating QuickCheck properties without Arbitrary instances"; license = stdenv.lib.licenses.bsd3; @@ -161577,8 +169861,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; - version = "0.1.0.2"; - sha256 = "0p1ky7sj42crn9sas9d2cs5cwz03wsk20p55x2wgmlj5rmpr5mla"; + version = "0.1.0.3"; + sha256 = "08f87mqnm04sgi21q5snvr4li3zm4m86jydc3s4b71i9czy4q8wg"; libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -161590,6 +169874,8 @@ self: { pname = "quickcheck-special"; version = "0.1.0.6"; sha256 = "1dhwgy1jwglp4y3nbysr1i182415aibqlcsrvwxn2c5x162qjwwm"; + revision = "1"; + editedCabalFile = "1whwmij115vw0qwkzlkc4z4yhj7iwwqjhf5aaxn5np0gh2gzihb3"; libraryHaskellDepends = [ base QuickCheck special-values ]; homepage = "https://github.com/minad/quickcheck-special#readme"; description = "Edge cases and special values for QuickCheck Arbitrary instances"; @@ -161604,8 +169890,8 @@ self: { }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.2.0"; - sha256 = "19d8n0dx3qw1ln7g1klyl6dd43gpldiczml7cy9cygi70rcrzhwr"; + version = "0.3.1"; + sha256 = "141rs0m67p830n2v30jkpvbqpygqc7i8cka9c9bbycxnwdax5jj4"; libraryHaskellDepends = [ ansi-wl-pprint async base containers lifted-async lifted-base monad-control mtl QuickCheck quickcheck-with-counterexamples random @@ -161623,8 +169909,8 @@ self: { }: mkDerivation { pname = "quickcheck-string-random"; - version = "0.1.0.0"; - sha256 = "04pbv5s3j0v9kv9sjhfkh892n9w210fb20k5j9innkxwvaj1bh6y"; + version = "0.1.0.1"; + sha256 = "1yx1kyd6p58b7s10v0lkq1v162vnz90p6m9jlwbr4s6qxa0sm31r"; libraryHaskellDepends = [ base QuickCheck string-random text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck text @@ -161632,7 +169918,6 @@ self: { homepage = "https://github.com/hiratara/hs-string-random#readme"; description = "Helper to build generators with Text.StringRandom"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-text" = callPackage @@ -161705,8 +169990,7 @@ self: { }) {}; "quickpull" = callPackage - ({ mkDerivation, barecheck, base, directory, filepath, QuickCheck - }: + ({ mkDerivation, base, directory, filepath, QuickCheck }: mkDerivation { pname = "quickpull"; version = "0.4.2.2"; @@ -161714,9 +169998,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath QuickCheck ]; - executableHaskellDepends = [ - barecheck base directory filepath QuickCheck - ]; + executableHaskellDepends = [ base directory filepath QuickCheck ]; testHaskellDepends = [ base directory filepath QuickCheck ]; homepage = "http://www.github.com/massysett/quickpull"; description = "Generate Main module with QuickCheck tests"; @@ -161749,19 +170031,24 @@ self: { }) {}; "quickspec" = callPackage - ({ mkDerivation, array, base, containers, ghc-prim, QuickCheck - , random, spoon, transformers + ({ mkDerivation, base, constraints, containers, data-lens-light + , dlist, QuickCheck, random, reflection, template-haskell + , transformers, twee-lib, uglymemo }: mkDerivation { pname = "quickspec"; - version = "0.9.6"; - sha256 = "0prwzxsrvfqryl75rmma229d4y7ra61vc3d72kyqi4l44ga2ay21"; + version = "2"; + sha256 = "0hdyw114f5skc66v0n0mghcx1ax8gfgilm42h4wqkwzyj6rkiy6r"; + revision = "1"; + editedCabalFile = "1nic3b13khhnykpvynzw7xjsw7ldvc4jfxdbjfj6xxsyig7lk4qb"; libraryHaskellDepends = [ - array base containers ghc-prim QuickCheck random spoon transformers + base constraints containers data-lens-light dlist QuickCheck random + reflection template-haskell transformers twee-lib uglymemo ]; homepage = "https://github.com/nick8325/quickspec"; description = "Equational laws for free!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickterm" = callPackage @@ -161852,6 +170139,7 @@ self: { homepage = "http://www.mathstat.dal.ca/~selinger/quipper/"; description = "An embedded, scalable functional programming language for quantum computing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quipper-rendering" = callPackage @@ -161998,6 +170286,7 @@ self: { ]; description = "Extra instances for Quiver"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quiver-interleave" = callPackage @@ -162084,30 +170373,6 @@ self: { }) {}; "raaz" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, criterion - , deepseq, hspec, HUnit, mtl, pretty, QuickCheck, transformers - , vector - }: - mkDerivation { - pname = "raaz"; - version = "0.1.1"; - sha256 = "19v7pkkyd03alwkdwz6mqjisja6mzmyal9lmmbqk6nhkd6hi1071"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring deepseq mtl vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring hspec HUnit QuickCheck transformers vector - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion pretty - ]; - homepage = "http://github.com/raaz-crypto/raaz"; - description = "The raaz cryptographic library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "raaz_0_2_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, criterion , deepseq, hspec, hspec-discover, HUnit, optparse-applicative , pretty, QuickCheck, transformers, vector @@ -162130,7 +170395,6 @@ self: { homepage = "http://github.com/raaz-crypto/raaz"; description = "The raaz cryptographic library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rabocsv2qif" = callPackage @@ -162165,20 +170429,17 @@ self: { }) {}; "radian" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , profunctors, QuickCheck, template-haskell - }: + ({ mkDerivation, base, HUnit, lens, profunctors }: mkDerivation { pname = "radian"; - version = "0.0.6"; - sha256 = "0p6caw8vnlzmamcka9wfsbgsfffgp2y6jjf5yyibvnb9av8zdnzp"; + version = "0.1"; + sha256 = "150vb9wk73avh8rrsz92y1fcwlm30w4k23lbdncb8ivinqhdi4pv"; libraryHaskellDepends = [ base profunctors ]; - testHaskellDepends = [ - base directory doctest filepath lens QuickCheck template-haskell - ]; - homepage = "https://github.com/NICTA/radian"; + testHaskellDepends = [ base HUnit lens ]; + homepage = "https://github.com/qfpl/radian"; description = "Isomorphisms for measurements that use radians"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "radium" = callPackage @@ -162196,6 +170457,7 @@ self: { homepage = "https://github.com/klangner/radium"; description = "Chemistry"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "radium-formula-parser" = callPackage @@ -162221,8 +170483,8 @@ self: { }: mkDerivation { pname = "radius"; - version = "0.4.0.0"; - sha256 = "0bdixglg4yy5n6chw0n5mpk563dbkhh7iyzrmp9q2vpzxxvvdi06"; + version = "0.5.0.1"; + sha256 = "0mrgcrhi99imclc400lp666gimxv4gkg4svjr49p9aip5dx03bjh"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -162246,6 +170508,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "radixtree" = callPackage + ({ mkDerivation, attoparsec, base, containers, criterion, deepseq + , microlens, mtl, parsers, QuasiText, smallcheck, store, tasty + , tasty-smallcheck, text, vector + }: + mkDerivation { + pname = "radixtree"; + version = "0.4.0.0"; + sha256 = "074s2gbprpq9qvipj8hayh906pdy1jfayph82hzamnwvz4199gmj"; + libraryHaskellDepends = [ + base containers deepseq microlens mtl parsers store text vector + ]; + testHaskellDepends = [ + attoparsec base smallcheck tasty tasty-smallcheck text + ]; + benchmarkHaskellDepends = [ + attoparsec base criterion deepseq QuasiText text vector + ]; + homepage = "https://gitlab.com/transportengineering/radixtree"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rados-haskell" = callPackage ({ mkDerivation, async, base, bytestring, containers, criterion , hspec, HUnit, mtl, rados, transformers, uuid @@ -162316,20 +170600,22 @@ self: { }) {}; "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, base, base-compat, base16-bytestring + , base64-bytestring, bytestring, containers, cryptonite, filepath + , http-types, pbkdf, ruby-marshal, semigroups, string-conv, tasty + , tasty-hspec, transformers, vector }: mkDerivation { pname = "rails-session"; - version = "0.1.1.0"; - sha256 = "1y4822g316wx04nsjc3pai1zmgy5c961jwqjc7c3c6glcvscd6qx"; + version = "0.1.2.0"; + sha256 = "0r1jiy7x7497zk1gvg1zbpqx2vh2i0j9x7gzscgx6gylkjkkppir"; libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring cryptonite http-types - pbkdf ruby-marshal string-conv vector + base base-compat base16-bytestring base64-bytestring bytestring + containers cryptonite http-types pbkdf ruby-marshal string-conv + vector ]; testHaskellDepends = [ - base bytestring filepath ruby-marshal tasty tasty-hspec + base bytestring filepath ruby-marshal semigroups tasty tasty-hspec transformers vector ]; homepage = "http://github.com/iconnect/rails-session#readme"; @@ -162461,21 +170747,46 @@ self: { ({ mkDerivation, aeson, base, bytestring, connection, constraints , data-default-class, extensible, hspec, http-api-data, http-client , http-client-tls, http-types, lens, req, servant-server, text - , unordered-containers, warp + , warp }: mkDerivation { pname = "rakuten"; - version = "0.1.0.3"; - sha256 = "1l09lw0cr32vizzad7rgmwgfz7yy535n4fawikdr8lm8yzs0nr6d"; + version = "0.1.1.0"; + sha256 = "13m8rg805aw5rj2a5j16yj06k5ws99ssl89r5s62xlq6lbzhc84c"; + libraryHaskellDepends = [ + aeson base bytestring connection constraints data-default-class + extensible http-api-data http-client http-client-tls http-types + lens req text + ]; + testHaskellDepends = [ + aeson base bytestring connection constraints data-default-class + extensible hspec http-api-data http-client http-client-tls + http-types lens req servant-server text warp + ]; + homepage = "https://github.com/matsubara0507/rakuten#readme"; + description = "The Rakuten API in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + + "rakuten_0_1_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, constraints + , data-default-class, extensible, hspec, http-api-data, http-client + , http-client-tls, http-types, lens, req, servant-server, text + , warp + }: + mkDerivation { + pname = "rakuten"; + version = "0.1.1.1"; + sha256 = "01p6f8vapygcw6viwq7kkg6b5fifqzbkski0763x9by49h5gpbsi"; libraryHaskellDepends = [ aeson base bytestring connection constraints data-default-class extensible http-api-data http-client http-client-tls http-types - lens req text unordered-containers + lens req text ]; testHaskellDepends = [ aeson base bytestring connection constraints data-default-class extensible hspec http-api-data http-client http-client-tls - http-types lens req servant-server text unordered-containers warp + http-types lens req servant-server text warp ]; homepage = "https://github.com/matsubara0507/rakuten#readme"; description = "The Rakuten API in Haskell"; @@ -162575,6 +170886,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rando" = callPackage + ({ mkDerivation, base, containers, microspec, tf-random, vector }: + mkDerivation { + pname = "rando"; + version = "0.0.0.4"; + sha256 = "1cvwmp4882xdavfzhg5hwssddg0wjgwh8jxpd3251plf96jz9f4f"; + libraryHaskellDepends = [ base tf-random vector ]; + testHaskellDepends = [ + base containers microspec tf-random vector + ]; + description = "Easy-to-use randomness for livecoding"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "random" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -162607,8 +170932,8 @@ self: { }: mkDerivation { pname = "random-bytestring"; - version = "0.1.2"; - sha256 = "132xlls7qw94y2ljc74m0qhlzb19yv3yfxmwhi25cnghggsb22qz"; + version = "0.1.3.1"; + sha256 = "1d0f3y8n87fyyvlkn1c87d47xi50qn4cn11bnsn052860kyjda1k"; libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; benchmarkHaskellDepends = [ async base bytestring criterion cryptonite entropy ghc-prim @@ -162619,6 +170944,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "random-class" = callPackage + ({ mkDerivation, base, primitive, transformers, util }: + mkDerivation { + pname = "random-class"; + version = "0.2.0.2"; + sha256 = "11nda6dgi0f3b3bzy2wahdsadf382c06xrz1dx2gnq89ym7k7qbp"; + libraryHaskellDepends = [ base primitive transformers util ]; + description = "Class of random value generation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "random-derive" = callPackage ({ mkDerivation, base, random, template-haskell }: mkDerivation { @@ -162721,6 +171057,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "random-names" = callPackage + ({ mkDerivation, base, QuickCheck, random, safe, text }: + mkDerivation { + pname = "random-names"; + version = "0.1.0.0"; + sha256 = "1sj88ccw4pnqlwbga78pvsvzib4irg7xzz4lhqs89xkdz7l043dy"; + libraryHaskellDepends = [ base QuickCheck random safe text ]; + homepage = "https://github.com/aiya000/hs-random-names"; + description = "Expose Random and Arbitrary instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "random-shuffle" = callPackage ({ mkDerivation, base, MonadRandom, random }: mkDerivation { @@ -162762,6 +171110,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "random-string" = callPackage + ({ mkDerivation, base, base16-bytestring, base58-bytestring + , base64-bytestring, bytestring, entropy + }: + mkDerivation { + pname = "random-string"; + version = "0.1.0.1"; + sha256 = "0gmb5i5sykwfr1l4b2isn9j92pzxgalbxkf9dnhs14pj3i6ygl80"; + libraryHaskellDepends = [ + base base16-bytestring base58-bytestring base64-bytestring + bytestring entropy + ]; + description = "Generate a random base 16, 58, or 64 string"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "random-strings" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, random }: mkDerivation { @@ -162875,6 +171240,7 @@ self: { homepage = "https://bitbucket.org/robertmassaioli/range"; description = "This has a bunch of code for specifying and managing ranges in your code"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "range-set-list" = callPackage @@ -162896,6 +171262,7 @@ self: { homepage = "https://github.com/phadej/range-set-list#readme"; description = "Memory efficient sets with ranges of elements"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "range-space" = callPackage @@ -162956,23 +171323,6 @@ self: { }) {}; "rank1dynamic" = callPackage - ({ mkDerivation, base, binary, HUnit, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "rank1dynamic"; - version = "0.3.3.0"; - sha256 = "02wg4fw6p6cwy4mg07klzdmgs7m5zn9p7vj3j20frwsw8zldscna"; - libraryHaskellDepends = [ base binary ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - homepage = "http://haskell-distributed.github.com"; - description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rank1dynamic_0_4_0" = callPackage ({ mkDerivation, base, binary, HUnit, test-framework , test-framework-hunit }: @@ -162987,19 +171337,18 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rank2classes" = callPackage ({ mkDerivation, base, doctest, template-haskell, transformers }: mkDerivation { pname = "rank2classes"; - version = "0.2.1.1"; - sha256 = "0h28979zg3ac642m3i01f1brbhh73ri909zlh3is4kx8h6qbkr5b"; + version = "1.0.2"; + sha256 = "1qkknjas2w0zrv5kx47i1cxaiyv7814fqj8y69kywsl93q919p42"; 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"; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -163008,8 +171357,8 @@ self: { ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { pname = "rapid"; - version = "0.1.3"; - sha256 = "0n4py9ndri6xy3n2rkr78f0y146didxg3625nhm72jsqcd1qjfhn"; + version = "0.1.4"; + sha256 = "0f86j4r3sm74w49v9x9s58wahgcgick6z7awl6piq83iqaiy4sh7"; libraryHaskellDepends = [ async base containers foreign-store stm ]; @@ -163024,14 +171373,15 @@ self: { }: mkDerivation { pname = "rapid-term"; - version = "0.1.2"; - sha256 = "0q65c8rjqvikpfghpmmsb69d9qmx5bha36qs4iwbsh6iq08xiw18"; + version = "0.1.2.1"; + sha256 = "0pyqsj07g2am9n84232cpy20r6w54mah01x9kl7rczab0yvfplbc"; libraryHaskellDepends = [ base clock kan-extensions process transformers unix ]; homepage = "https://github.com/esoeylemez/rapid-term"; description = "External terminal support for rapid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa" = callPackage @@ -163281,8 +171631,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.3.3"; - sha256 = "0jqdqf3y61z98sxdziqhafgsf5m01a00gkfdnv1w4vd6zli8xpaa"; + version = "0.3.3.1"; + sha256 = "110ivmmgajv232hyg9pc30lzg3l72q8ykyp1zrjs3k5n309ymdfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163296,15 +171646,16 @@ self: { ]; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rate-limit" = callPackage - ({ mkDerivation, base, time-units }: + ({ mkDerivation, base, stm, time, time-units }: mkDerivation { pname = "rate-limit"; - version = "1.1.1"; - sha256 = "1d1dfj05vi8jr2cfy42a58wnm84zm6cmx7fabp2rb83qqm4l2riz"; - libraryHaskellDepends = [ base time-units ]; + version = "1.4.0"; + sha256 = "0p0bnfnn790kkpgj6v6646fbczznf28a65zsf92xyiab00jw6ilb"; + libraryHaskellDepends = [ base stm time time-units ]; homepage = "http://github.com/acw/rate-limit"; description = "A basic library for rate-limiting IO actions"; license = stdenv.lib.licenses.bsd3; @@ -163312,18 +171663,21 @@ self: { "ratel" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, http-client, http-client-tls, http-types - , tasty, tasty-hspec, text, uuid + , containers, filepath, hspec, http-client, http-client-tls + , http-types, text, uuid }: mkDerivation { pname = "ratel"; - version = "0.3.7"; - sha256 = "0jwmlnxnaaldi1gr988gdy82y3ylvmi9ylnrsas8rg6pwyj76v9c"; + version = "1.0.3"; + sha256 = "1f49nrkvyms9a8q46dpjgcx3h51l1x4zlq6pxnw26bvf8xx0yj4h"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid ]; - testHaskellDepends = [ base filepath tasty tasty-hspec ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers filepath hspec + http-client http-client-tls http-types text uuid + ]; homepage = "https://github.com/tfausak/ratel#readme"; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; @@ -163335,31 +171689,14 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "0.2.0"; - sha256 = "04arqf5925dzr5wdgzlxzxglxzlnn72jhn2gibbbllk2xq8w4517"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - homepage = "https://github.com/tfausak/ratel-wai#readme"; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel-wai_0_3_1" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "0.3.1"; - sha256 = "13p5ny1x752l9xqiyxdxvjfjqggsb0g9hpqqcmdr828lvr9qxi6s"; + version = "1.0.2"; + sha256 = "07hpsmv3c75r8lc9fpa2mn5xsz5xml5nadzlzq8dihbgv6ma4mss"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; homepage = "https://github.com/tfausak/ratel-wai#readme"; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rating-systems" = callPackage @@ -163387,72 +171724,48 @@ self: { }) {}; "rattletrap" = callPackage - ({ mkDerivation, aeson, aeson-casing, base, bimap, binary - , binary-bits, bytestring, containers, data-binary-ieee754 - , filepath, hspec, template-haskell, temporary, text, vector + ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits + , bytestring, containers, filepath, http-client, http-client-tls + , HUnit, template-haskell, temporary, text, transformers }: 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; - }) {}; - - "rattletrap_3_1_0" = callPackage - ({ mkDerivation, aeson, base, bimap, binary, binary-bits - , bytestring, containers, data-binary-ieee754, filepath, hspec - , http-client, http-client-tls, template-haskell, temporary, text - , vector - }: - mkDerivation { - pname = "rattletrap"; - version = "3.1.0"; - sha256 = "1yv24p76w6zz91qjx5xhrcp7r72lqijfh32gzyjavvs6p1rnq61w"; + version = "4.0.8"; + sha256 = "05rad5dckya26mai39623n5bvhvk13yjxikrc6r7yc6nvlkkh8zb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bimap binary binary-bits bytestring containers - data-binary-ieee754 http-client http-client-tls template-haskell - text vector + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers ]; executableHaskellDepends = [ - aeson base bimap binary binary-bits bytestring containers - data-binary-ieee754 http-client http-client-tls template-haskell - text vector + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers ]; testHaskellDepends = [ - aeson base bimap binary binary-bits bytestring containers - data-binary-ieee754 filepath hspec http-client http-client-tls - template-haskell temporary text vector + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls HUnit template-haskell + temporary text transformers ]; 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 + ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl + , network, random, resourcet, text, time, unordered-containers + , uuid }: mkDerivation { pname = "raven-haskell"; - version = "0.1.0.1"; - sha256 = "0yy79834sk75zsmwci2r1nkakccwqypychff6779ljyr6ibyn7pg"; + version = "0.1.2.0"; + sha256 = "1g6102p6adn5jc2jvqjgyzpylvacv52yj754rki21l6d13cn07a4"; libraryHaskellDepends = [ - aeson base bytestring http-conduit network random text time - unordered-containers uuid + aeson base bytestring http-conduit mtl network random resourcet + text time unordered-containers uuid ]; testHaskellDepends = [ aeson base bytestring hspec unordered-containers @@ -163620,6 +171933,7 @@ self: { 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;}; @@ -163639,6 +171953,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rc" = callPackage + ({ mkDerivation, base, dde, hmatrix, Learning, random, vector }: + mkDerivation { + pname = "rc"; + version = "0.1.0.1"; + sha256 = "0hcivi8lpf8qfsanxqhxbjyrhhkx4aa5lzwgwir0zq08fakbxadm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dde hmatrix Learning random vector + ]; + executableHaskellDepends = [ + base dde hmatrix Learning random vector + ]; + testHaskellDepends = [ base dde hmatrix Learning random vector ]; + homepage = "https://github.com/masterdezign/rc#readme"; + description = "Reservoir Computing, fast RNNs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rclient" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 , network, QuickCheck, split @@ -163662,10 +171997,10 @@ self: { }: mkDerivation { pname = "rcu"; - version = "0.2.1"; - sha256 = "114w0nhlcg6wd9v6xg0ax74y5xbwb408b37hdkra863xr7dibdp0"; - revision = "1"; - editedCabalFile = "138vbjy6z2lh4x4icdssh0xz0rcwiw4lczcb3w375cnyjjn3b6ly"; + version = "0.2.2"; + sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk"; + revision = "2"; + editedCabalFile = "0s9rd1ys6y770xwfgljmrkyw968jqwsa39xpa3x88wzb93qzypmr"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -163681,7 +172016,6 @@ self: { homepage = "http://github.com/ekmett/rcu/"; description = "Read-Copy-Update for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rdf" = callPackage @@ -163704,22 +172038,22 @@ self: { }) {}; "rdf4h" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , deepseq, directory, hashable, hgal, HTTP, HUnit, hxt, network - , network-uri, parsec, QuickCheck, safe, tasty, tasty-hunit - , tasty-quickcheck, text, text-binary, unordered-containers - , utf8-string + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , criterion, deepseq, directory, hashable, hgal, HTTP, HUnit, hxt + , mtl, network, network-uri, parsec, parsers, QuickCheck, safe + , tasty, tasty-hunit, tasty-quickcheck, text, text-binary + , unordered-containers, utf8-string }: mkDerivation { pname = "rdf4h"; - version = "3.0.1"; - sha256 = "0d45gwldxh1rai1jsvxnb794wdhvxqhjnnqfyh9ql0rzwcwzbv54"; + version = "3.0.3"; + sha256 = "0lidqww0d8ckm4iipjx4gq32jspxidz0g009m5xrf8x6qsl26sx0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers deepseq directory hashable hgal - HTTP hxt network network-uri parsec text text-binary - unordered-containers utf8-string + attoparsec base binary bytestring containers deepseq directory + hashable hgal HTTP hxt mtl network network-uri parsec parsers text + text-binary unordered-containers utf8-string ]; executableHaskellDepends = [ base containers network network-uri text @@ -163728,7 +172062,7 @@ self: { base bytestring containers directory HUnit network network-uri QuickCheck safe tasty tasty-hunit tasty-quickcheck text ]; - benchmarkHaskellDepends = [ base criterion text ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; homepage = "https://github.com/robstewart57/rdf4h"; description = "A library for RDF processing in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -163783,17 +172117,18 @@ self: { }) {}; "re2" = callPackage - ({ mkDerivation, base, bytestring, chell, vector }: + ({ mkDerivation, base, bytestring, HUnit, re2, vector }: mkDerivation { pname = "re2"; - version = "0.1"; - sha256 = "08mmbxj9dpnb56b6vh0lz7nimp3w3v9g2c6ypxgz8ahvlia0a4f5"; + version = "0.2"; + sha256 = "0qfmiwy4kc87a736fpzh4cscvldiywq641gb9kvn4hc3sq7dh1k9"; libraryHaskellDepends = [ base bytestring vector ]; - testHaskellDepends = [ base bytestring chell vector ]; - homepage = "https://john-millikin.com/software/haskell-re2/"; + librarySystemDepends = [ re2 ]; + testHaskellDepends = [ base bytestring HUnit vector ]; + homepage = "https://github.com/rblaze/haskell-re2#readme"; description = "Bindings to the re2 regular expression library"; license = stdenv.lib.licenses.mit; - }) {}; + }) {inherit (pkgs) re2;}; "react-flux" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, mtl @@ -163809,7 +172144,6 @@ self: { aeson base bytestring deepseq mtl template-haskell text time unordered-containers ]; - executableHaskellDepends = [ aeson base deepseq text time ]; homepage = "https://bitbucket.org/wuzzeb/react-flux"; description = "A binding to React based on the Flux application architecture for GHCJS"; license = stdenv.lib.licenses.bsd3; @@ -163937,24 +172271,26 @@ self: { "reactive-banana" = callPackage ({ mkDerivation, base, containers, hashable, HUnit, pqueue - , psqueues, test-framework, test-framework-hunit, transformers - , unordered-containers, vault + , psqueues, semigroups, test-framework, test-framework-hunit + , transformers, unordered-containers, vault }: mkDerivation { pname = "reactive-banana"; - version = "1.1.0.1"; - sha256 = "1hvhzr3cvg91l8kwxia0idg3n9jrh4knlcrmzm9j978dckzrc3mc"; + version = "1.2.0.0"; + sha256 = "1bwzkpackjpzk2igmlahr2qhgacad62v48lam97g9q85zww70p29"; libraryHaskellDepends = [ - base containers hashable pqueue transformers unordered-containers - vault + base containers hashable pqueue semigroups transformers + unordered-containers vault ]; testHaskellDepends = [ - base containers hashable HUnit pqueue psqueues test-framework - test-framework-hunit transformers unordered-containers vault + base containers hashable HUnit pqueue psqueues semigroups + test-framework test-framework-hunit transformers + unordered-containers vault ]; homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Library for functional reactive programming (FRP)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-bunch" = callPackage @@ -163971,6 +172307,7 @@ self: { homepage = "http://hub.darcs.net/thielema/reactive-banana-bunch/"; description = "Extend reactive-banana to multiple events per time point"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-gi-gtk" = callPackage @@ -163988,7 +172325,7 @@ self: { homepage = "https://github.com/mr/reactive-banana-gi-gtk"; description = "Simple reactive programming with GTK GObject Introspection"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-sdl" = callPackage @@ -164045,7 +172382,7 @@ self: { pname = "reactive-banana-wx"; version = "1.1.1.0"; sha256 = "1yzymc6qpjj8d0fal09vxy2yicbrgrg42khylbbsrzmdgqfnf3kr"; - configureFlags = [ "-f-buildexamples" ]; + configureFlags = [ "-f-buildExamples" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -164055,7 +172392,7 @@ self: { homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-fieldtrip" = callPackage @@ -164119,16 +172456,17 @@ self: { ({ mkDerivation, base, containers, data-accessor, event-list , explicit-exception, extensible-exceptions, jack, midi , non-negative, random, reactive-banana-bunch, reactive-midyim - , transformers, utility-ht + , semigroups, transformers, utility-ht }: mkDerivation { pname = "reactive-jack"; - version = "0.4"; - sha256 = "13j51qg9ph4vq5v4z94q8i5lfd8sr3v6ln1740g24v90j28gh87i"; + version = "0.4.1"; + sha256 = "124fpfv486dm8cpgfdnrmckkk8y6ia4nwzapvnfghkslizzlbfab"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception extensible-exceptions jack midi non-negative random - reactive-banana-bunch reactive-midyim transformers utility-ht + reactive-banana-bunch reactive-midyim semigroups transformers + utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana and JACK"; @@ -164139,16 +172477,17 @@ self: { "reactive-midyim" = callPackage ({ mkDerivation, base, containers, data-accessor , data-accessor-transformers, event-list, midi, non-negative - , random, reactive-banana-bunch, transformers, utility-ht + , random, reactive-banana-bunch, semigroups, transformers + , utility-ht }: mkDerivation { pname = "reactive-midyim"; - version = "0.4.0.1"; - sha256 = "1ck2f8nhlhcw9vyh42svp94xrnd4jcvic2kzxikw50vjcd4w6rrf"; + version = "0.4.1"; + sha256 = "1dx07c4d4sw7a797d1ap9ja48lhx37hbizhajgcf1qpilxgd4lvv"; libraryHaskellDepends = [ base containers data-accessor data-accessor-transformers event-list - midi non-negative random reactive-banana-bunch transformers - utility-ht + midi non-negative random reactive-banana-bunch semigroups + transformers utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana"; @@ -164370,6 +172709,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "real-day-end" = callPackage + ({ mkDerivation, base, quickcheck-instances, tasty + , tasty-quickcheck, time + }: + mkDerivation { + pname = "real-day-end"; + version = "0.0.1"; + sha256 = "0k96r3z3cbr67z1q55g63zy92i46qmigw52ar53c0hx0d1jfiazs"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ + base quickcheck-instances tasty tasty-quickcheck time + ]; + homepage = "https://github.com/s9gf4ult/real-day-end"; + description = "Tiny library to calculate date considering when your day realy ends"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "really-simple-xml-parser" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -164419,30 +172775,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.0.8.1"; - sha256 = "111wslzm76qrabpdbsnpb3sydbd3vc71d3mf088klkgbb0k2arxp"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void - ]; - homepage = "https://github.com/nikita-volkov/rebase"; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_1_1" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, stm, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; - version = "1.1.1"; - sha256 = "0rhfpdh8hmna02pbiljkiy623sdy1nqk60azr43cdx5q9aw1b3jy"; + version = "1.2.3"; + sha256 = "1glnxvgf79qm2iz4xxdn6zygjff42cyakk1nah2wrzkkrr11axqk"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -164452,7 +172786,6 @@ self: { homepage = "https://github.com/nikita-volkov/rebase"; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rebindable" = callPackage @@ -164642,6 +172975,8 @@ self: { pname = "recursion-schemes"; version = "5.0.2"; sha256 = "1lmayskniljw3lxk64apvshn9h90gwfpflgxilfivsqhrjxnaj9s"; + revision = "2"; + editedCabalFile = "13l08kal330r1nln13q6qn60mcs0iwcz0hx23na743xllha76nnl"; libraryHaskellDepends = [ base base-orphans bifunctors comonad free semigroups template-haskell transformers transformers-compat @@ -164654,22 +172989,22 @@ self: { "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq - , hspec, lens, recursion-schemes, template-haskell + , hspec, lens, recursion-schemes }: mkDerivation { pname = "recursion-schemes-ext"; - version = "0.2.1.0"; - sha256 = "0hm042kqb2dq9j68nsy8a6qgmxicfqclgdg4v3i7q1griscazyjr"; + version = "1.0.0.3"; + sha256 = "00yj7h46pmy76iqsx1n0mlg04gzdrhyq10xm1xcl28y13jcjx9lc"; libraryHaskellDepends = [ - base composition-prelude deepseq lens recursion-schemes - template-haskell + base composition-prelude lens recursion-schemes + ]; + testHaskellDepends = [ base deepseq hspec recursion-schemes ]; + benchmarkHaskellDepends = [ + base criterion deepseq recursion-schemes ]; - testHaskellDepends = [ base hspec ]; - benchmarkHaskellDepends = [ base criterion ]; homepage = "https://hub.darcs.net/vmchale/recursion-schemes-ext#readme"; description = "Amateur addenda to recursion-schemes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "recursive-line-count" = callPackage @@ -164743,16 +173078,16 @@ self: { }: mkDerivation { pname = "reddit"; - version = "0.2.1.0"; - sha256 = "0874swpm11l33p27dpsik8qj0by40cxjp864v6zbf2jfl0aavra9"; + version = "0.2.2.2"; + sha256 = "0k94rsnrnanjc7bwqfjzlk8l005gc3141mm8iqq680d8pdcgf8m8"; libraryHaskellDepends = [ aeson api-builder base bytestring data-default-class free http-client http-client-tls http-types network text time transformers unordered-containers vector ]; testHaskellDepends = [ - aeson api-builder base bytestring Cabal hspec http-client - http-client-tls text time transformers + aeson api-builder base bytestring Cabal data-default-class hspec + http-client http-client-tls text time transformers ]; homepage = "https://github.com/intolerable/reddit"; description = "Library for interfacing with Reddit's API"; @@ -164859,6 +173194,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "redland" = callPackage + ({ mkDerivation, base, deepseq, raptor2, redland }: + mkDerivation { + pname = "redland"; + version = "0.2.0.1"; + sha256 = "080bp01x6vlfw116zcl75vr7pb753mn8892rkh7aqgaf8ajkhb2c"; + libraryHaskellDepends = [ base deepseq ]; + libraryPkgconfigDepends = [ raptor2 redland ]; + description = "Redland RDF library bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {raptor2 = null; redland = null;}; + "redo" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, pureMD5 @@ -164962,7 +173310,7 @@ self: { ]; description = "A reimplementation of the Reactive library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reexport-crypto-random" = callPackage @@ -165075,8 +173423,8 @@ self: { }: mkDerivation { pname = "references"; - version = "0.3.3.0"; - sha256 = "186x1j6yg2fh4a96b68jq7kwx2s1kxdbl4yi4izfgvxwimpzcr8w"; + version = "0.3.3.1"; + sha256 = "03n18skl989ksssi2lv50bns1iw9qixacabs9qvli4b36rnn01xw"; libraryHaskellDepends = [ array base containers directory either filepath instance-control mtl template-haskell text transformers uniplate @@ -165126,8 +173474,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "reflection"; - version = "2.1.2"; - sha256 = "0f9w0akbm6p8h7kzgcd2f6nnpw1wy84pqn45vfz1ch5j0hn8h2d9"; + version = "2.1.3"; + sha256 = "01g4ilgj073vvn6dx4y1fkiq81xk01ccswbhvr8iw8fpmciiky48"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/ekmett/reflection"; description = "Reifies arbitrary terms into types that can be reflected back into terms"; @@ -165172,10 +173520,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.4.0"; - sha256 = "173b8ysrghrw2fvdsqf6ybik9f24kw4ji1h8w4wj5kspbi12s36n"; - revision = "2"; - editedCabalFile = "14nrr41ndyfbdgpsi69xl9hmz5m6lank4cjbzxblvh3k0chg13z8"; + version = "0.4.0.1"; + sha256 = "1v4wwy2qc1gb914w5nqjvf7gibdw9yakmhdg260yjxbv1fkg8gyc"; libraryHaskellDepends = [ base containers dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups @@ -165412,12 +173758,12 @@ self: { }) {}; "reform" = callPackage - ({ mkDerivation, base, containers, mtl, text }: + ({ mkDerivation, base, containers, mtl, semigroups, text }: mkDerivation { pname = "reform"; - version = "0.2.7.1"; - sha256 = "0c4jh64rszp9rk62kh8nqyhafnbi5vm9lmc2rx7fx237j24j3gjr"; - libraryHaskellDepends = [ base containers mtl text ]; + version = "0.2.7.2"; + sha256 = "14as5chpwfrrqdfxk5g03f4zia0dx10npb802cphfq2j598mjczv"; + libraryHaskellDepends = [ base containers mtl semigroups text ]; homepage = "http://www.happstack.com/"; description = "reform is a type-safe HTML form generation and validation library"; license = stdenv.lib.licenses.bsd3; @@ -165479,22 +173825,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reformat" = callPackage + ({ mkDerivation, base, parsec }: + mkDerivation { + pname = "reformat"; + version = "0.1.0.1"; + sha256 = "1cvffbx2vhv18k4p95p0ddcxzyn8f10hg2bxa2da60fy9zkjg3am"; + libraryHaskellDepends = [ base parsec ]; + homepage = "https://github.com/Qinka/reformat"; + description = "The parser and render to parsec and render the string"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "refresht" = callPackage ({ mkDerivation, base, data-default, exceptions, lens, mtl }: mkDerivation { pname = "refresht"; version = "0.1.1.0"; sha256 = "0gv3ph1j7j9fgysldh0k6yirya6xhdlzlcwv85k18akdq13hnd87"; + revision = "2"; + editedCabalFile = "141phadslw4iy3fc60ny4qmgh6p6s53f4f81577s9ms5y4w45jhr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-default exceptions lens mtl ]; - executableHaskellDepends = [ - base data-default exceptions lens mtl - ]; homepage = "https://github.com/konn/refresht#readme"; description = "Environment Monad with automatic resource refreshment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "refty" = callPackage @@ -165536,6 +173893,7 @@ self: { 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 @@ -165557,6 +173915,7 @@ self: { homepage = "http://regex.uk"; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-applicative" = callPackage @@ -165583,8 +173942,8 @@ self: { pname = "regex-applicative-text"; version = "0.1.0.1"; sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh"; - revision = "1"; - editedCabalFile = "1w8aqqq6j1lhwpi2d0qj9h32cia3nr9l43a0mspqawb1nsmpjyic"; + revision = "2"; + editedCabalFile = "19sdafr0i252xyy017yxmz76ipl5bdg3hiv3ka8sjbwryj16gdwi"; libraryHaskellDepends = [ base regex-applicative text ]; homepage = "https://github.com/phadej/regex-applicative-text#readme"; description = "regex-applicative on text"; @@ -165730,6 +174089,7 @@ self: { 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 @@ -165869,8 +174229,8 @@ self: { }: mkDerivation { pname = "regex-tdfa"; - version = "1.2.2"; - sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb"; + version = "1.2.3"; + sha256 = "1n80ssz9k73s444b4hda6fhp1vyzg0fc5fvz0309fi9dh6xpxcc9"; libraryHaskellDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -166016,6 +174376,7 @@ self: { homepage = "http://regex.uk"; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-xmlschema" = callPackage @@ -166038,8 +174399,8 @@ self: { }: mkDerivation { pname = "regexchar"; - version = "0.9.0.15"; - sha256 = "05p3m9phi84lj94vw2l1jdzcxpq96rch64q85jc0wvcb22y6rfm7"; + version = "0.9.0.16"; + sha256 = "01bn4vazmnqvng8a989l50v7vy9bd7g57x9v44d6cn78q773vfzh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -166058,15 +174419,15 @@ self: { }) {}; "regexdot" = callPackage - ({ mkDerivation, base, data-default, deepseq, parallel, parsec - , toolshed + ({ mkDerivation, base, data-default, deepseq, extra, parallel + , parsec, toolshed }: mkDerivation { pname = "regexdot"; - version = "0.12.0.1"; - sha256 = "0r30lrgbklymc9vkl6bcrmjrxbpqi5g4ngm4c2sjhw7bc4466vdr"; + version = "0.12.1.0"; + sha256 = "11hv0mc48y42dz0bjfcvjxjxcbag33kvdc2gxbx0lsgyb4lm0q8j"; libraryHaskellDepends = [ - base data-default deepseq parallel parsec toolshed + base data-default deepseq extra parallel parsec toolshed ]; homepage = "http://functionalley.eu/RegExDot/regExDot.html"; description = "A polymorphic, POSIX, extended regex-engine"; @@ -166342,6 +174703,7 @@ self: { homepage = "https://github.com/kerkomen/rei"; description = "Process lists easily"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reified-records" = callPackage @@ -166454,29 +174816,6 @@ self: { }) {}; "relational-query" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, quickcheck-simple, sql-words - , template-haskell, text, th-reify-compat, time, time-locale-compat - , transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.9.5.0"; - sha256 = "17skrxqh3cpjkjjvbnhdlagfymdp0i3y2c5d92pg0krhc2dfida0"; - 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; - }) {}; - - "relational-query_0_10_0_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -166484,8 +174823,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.10.0.0"; - sha256 = "0a5gqfi0ns1gh1p2csv63m2b0psyq8dl3wzxrvj07p4gqq0m36gb"; + version = "0.11.0.0"; + sha256 = "0v0syrcagwmwqs9gikhdj0ji3cypfvfy9if8zyajkvxdkxpwvmaz"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record product-isomorphic sql-words template-haskell text th-reify-compat @@ -166497,77 +174836,38 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Typeful, Modular, Relational, algebraic query engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-query-HDBC" = 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.4.1"; - sha256 = "0bnksx9sq99hknj67wgg25yjbnkfdlaswhr2n6ndrrjpvkrx2lsi"; - 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; - }) {}; - - "relational-query-HDBC_0_6_5_0" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic - , relational-query, relational-schemas, template-haskell + , relational-query, relational-schemas, sql-words, template-haskell , th-data-compat, transformers }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.6.5.0"; - sha256 = "0d609xbxxanvggv5lqf7lwfrzzmw6k46b212g5kv19p9v5bx6k7c"; + version = "0.6.6.1"; + sha256 = "1aa4bjkv9i2an2igfdc0rvq2hmd6wv5zfgcbgw32y3qmy0zb3v2g"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query - relational-schemas template-haskell th-data-compat transformers + relational-schemas sql-words 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-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; - }) {}; - - "relational-record_0_2_0_0" = callPackage ({ mkDerivation, base, persistable-record , persistable-types-HDBC-pg, product-isomorphic, relational-query , relational-query-HDBC }: mkDerivation { pname = "relational-record"; - version = "0.2.0.0"; - sha256 = "0qbkpli2bdzwpp13sqxsk8li6hczvs6k0yybrbgwyjdrqnha09d3"; + version = "0.2.1.2"; + sha256 = "068d6a9xp9byhc3k1rb9a1zwifyg7mhxv3r6xisgdjv4w6fizbay"; libraryHaskellDepends = [ base persistable-record persistable-types-HDBC-pg product-isomorphic relational-query relational-query-HDBC @@ -166575,18 +174875,17 @@ self: { 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, product-isomorphic, relational-query - , relational-query-HDBC, relational-schemas, template-haskell, time + , persistable-record, relational-query, relational-query-HDBC + , relational-schemas, template-haskell }: mkDerivation { pname = "relational-record-examples"; - version = "0.4.0.0"; - sha256 = "0ch075l87sxxgmvis6hnrpc72lr0v21nx0xhw0ahpirqbw01ndqh"; + version = "0.5.0.0"; + sha256 = "0p49sb8ssvhbhmq4wicj7b46q53vibw686rr3xfy6iz82j64mklb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166594,12 +174893,8 @@ self: { relational-query relational-query-HDBC relational-schemas template-haskell ]; - executableHaskellDepends = [ - base product-isomorphic relational-query template-haskell time - ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -166608,31 +174903,14 @@ self: { }: mkDerivation { pname = "relational-schemas"; - version = "0.1.4.1"; - sha256 = "1szxxh3m11rfndw7rsbsks4iagk61r5w0l6s4k2zh7xhzcfrhs83"; - 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; - }) {}; - - "relational-schemas_0_1_5_0" = callPackage - ({ mkDerivation, base, bytestring, containers, relational-query - , template-haskell, time - }: - mkDerivation { - pname = "relational-schemas"; - version = "0.1.5.0"; - sha256 = "0q76z6bcr27x2anqfgh7gkms7m2dk6xz0i7p0czcq64x2hy7cjnz"; + version = "0.1.6.1"; + sha256 = "1lkqaahfrdm2dlyqz3wn9dm0sw8cypmndasrigc67q94ha4lrv81"; 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 @@ -166650,6 +174928,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "relevant-time" = callPackage + ({ mkDerivation, aeson, base, chronos, text, torsor }: + mkDerivation { + pname = "relevant-time"; + version = "0.1.0.0"; + sha256 = "0i9g6rqq31y6y9jnc9bi0vfrpxmjr3vqfjz2w4q7jc87dplyd2qk"; + libraryHaskellDepends = [ aeson base chronos text torsor ]; + homepage = "https://github.com/chessai/relevant-time.git"; + description = "humanised relevant time"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "relit" = callPackage ({ mkDerivation, base, regex-base, template-haskell }: mkDerivation { @@ -166966,6 +175256,8 @@ self: { pname = "repa"; version = "3.4.1.3"; sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy"; + revision = "2"; + editedCabalFile = "0kmypfnpzjszdzhpd1lskp0plja8zyr8r2y9xyscx4g5md9hh0zp"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -166980,11 +175272,12 @@ self: { pname = "repa-algorithms"; version = "3.4.1.2"; sha256 = "11lqq5j4g7p1dd47y65mfhzfsj8r27h7qj6qpc43g7kmf7h9gd87"; + revision = "1"; + editedCabalFile = "1dj9gq4v9y8818d5vx2zlsdl4fspwi4aywfbminr7dvlljhf415k"; libraryHaskellDepends = [ base repa vector ]; homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-array" = callPackage @@ -167026,8 +175319,8 @@ self: { }: mkDerivation { pname = "repa-convert"; - version = "4.2.3.1"; - sha256 = "19b5z4al37vkxqnyn9a80ij3lj9vfr8fl06j15fkqc3nrkya7i48"; + version = "4.2.3.2"; + sha256 = "10fx1sa85na4xs31c5b3w4dih3xp4kzy68whpg91227ic5ah17ag"; libraryHaskellDepends = [ base bytestring double-conversion primitive repa-scalar text vector ]; @@ -167061,6 +175354,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Low-level parallel operators on bulk random-accessble arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-examples" = callPackage @@ -167071,8 +175365,8 @@ self: { pname = "repa-examples"; version = "3.4.1.1"; sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039"; - revision = "1"; - editedCabalFile = "0acl57w635zi1il4r4jxzp3r1kd0zdqdiihinpbla5vnp3a5zg13"; + revision = "3"; + editedCabalFile = "0vdzcx1fixvgqzmjxra8gfwhzs56qdrzixscq074sddv7jh5iz2f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -167082,7 +175376,6 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Examples using the Repa array library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-fftw" = callPackage @@ -167133,15 +175426,14 @@ self: { pname = "repa-io"; version = "3.4.1.1"; sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm"; - revision = "1"; - editedCabalFile = "0z0wbaz7svqdzjpmx7d9wwfjl31w0i29pcc1v11r26f9avw3g9qi"; + revision = "2"; + editedCabalFile = "0zslqm87abzrsbrw2dlnsmm8jnpvg7ldi2d83d7p5sih78ksfmmm"; libraryHaskellDepends = [ base binary bmp bytestring old-time repa vector ]; homepage = "http://repa.ouroborus.net"; description = "Read and write Repa arrays in various formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-linear-algebra" = callPackage @@ -167180,8 +175472,8 @@ self: { }: mkDerivation { pname = "repa-scalar"; - version = "4.2.3.1"; - sha256 = "1xwk583hvyssalc2y2n1a2pkmz2k2qsaawnghbh1d3n2ma6ncbfc"; + version = "4.2.3.2"; + sha256 = "1w5q7b38zy08s13nllwjisxx6mxx9pnqhh3v5ydi1b32hrkyfk7c"; libraryHaskellDepends = [ base bytestring double-conversion primitive time vector ]; @@ -167214,9 +175506,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hsndfile repa ]; - executableHaskellDepends = [ - base hsndfile hsndfile-vector repa vector - ]; testHaskellDepends = [ base directory filepath hsndfile hsndfile-vector repa vector ]; @@ -167324,12 +175613,9 @@ self: { ({ mkDerivation, base, containers, haskeline, mtl, process }: mkDerivation { pname = "repline"; - version = "0.1.6.0"; - sha256 = "0nraj30fpws1gdac9s0bhz74j7jdvhkwi1232r2iabczrp701y31"; - isLibrary = true; - isExecutable = true; + version = "0.1.7.0"; + sha256 = "1pjmkr5lnc6vdy8g90wnxlh1rzq6f3sc0j1facfc42iqi9fh6fjh"; libraryHaskellDepends = [ base containers haskeline mtl process ]; - executableHaskellDepends = [ base containers mtl process ]; homepage = "https://github.com/sdiehl/repline"; description = "Haskeline wrapper for GHCi-like REPL interfaces"; license = stdenv.lib.licenses.mit; @@ -167447,16 +175733,16 @@ self: { }) {}; "reprinter" = callPackage - ({ mkDerivation, base, bytestring, mtl, syb, syz, transformers - , uniplate + ({ mkDerivation, base, mtl, syb, syz, text, transformers, uniplate }: mkDerivation { pname = "reprinter"; - version = "0.1.0.0"; - sha256 = "0l2vz9h5y9p10kqlg2fm5fvkg5vmrs4d8kyz8ami978ic9fv6fig"; + version = "0.2.0.0"; + sha256 = "1b3hdz7qq9qk7pbx0ny4ziagjm9hi9wfi9rl0aq0b8p70zzyjiq1"; libraryHaskellDepends = [ - base bytestring mtl syb syz transformers uniplate + base mtl syb syz text transformers uniplate ]; + homepage = "https://github.com/camfort/reprinter#readme"; description = "Scrap Your Reprinter"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -167473,40 +175759,10 @@ self: { 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 - , hspec, hspec-core, http-api-data, http-client, http-client-tls - , http-types, mtl, QuickCheck, text, time, transformers - , unordered-containers - }: - mkDerivation { - pname = "req"; - version = "0.2.0"; - sha256 = "1g7b431hq6cqmckq3hlnf56qn1a9zbpid19c7vw6vh0y5xi5ckp6"; - revision = "3"; - editedCabalFile = "1lqspa275mq04chvz6pvjkrlxkd9gscaxy2rcsj5wy0123x1azxp"; - enableSeparateDataOutput = true; - 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 text time transformers - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class hspec hspec-core http-client http-types mtl - QuickCheck text time unordered-containers - ]; - doCheck = false; - 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_0_5_0" = callPackage + "req" = 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 @@ -167515,8 +175771,10 @@ self: { }: mkDerivation { pname = "req"; - version = "0.5.0"; - sha256 = "0wrlbmix8avvvl3mwijsbzajpbkz4n208gvqim8xyhw0ic5lxf3q"; + version = "1.0.0"; + sha256 = "1s2yd61pw316llxyap7qwi18vrqxl6hhsmbgr79chjv5g119c087"; + revision = "2"; + editedCabalFile = "08yr09gfpml94ny6jmps2hn13bsb7r37rdn92gr2kmbryb188d1l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -167527,13 +175785,12 @@ self: { testHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class hspec hspec-core http-client http-types - monad-control mtl QuickCheck retry text time unordered-containers + monad-control mtl QuickCheck text time unordered-containers ]; doCheck = false; 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 @@ -167542,10 +175799,10 @@ self: { }: mkDerivation { pname = "req-conduit"; - version = "0.1.0"; - sha256 = "0ix4bj3gqjnq0dqxqlvm0x8js48p288hprfjn2d8afavan98b6k8"; - revision = "2"; - editedCabalFile = "0yx6858chc3kxx26lakr7gwqq8kdx32z05s51jyk4ii1a6kcyv6w"; + version = "1.0.0"; + sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; + revision = "3"; + editedCabalFile = "1gnaq7ya4grjwadz58r9g10dybgg50ch89bhbnhyicdins2aa9b2"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -167562,30 +175819,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "req-conduit_0_2_1" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec - , http-client, req, resourcet, temporary, transformers, weigh + "req-oauth2" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , data-default-class, hspec, http-client, http-types, lens + , modern-uri, req, req-url-extra, text, transformers }: mkDerivation { - pname = "req-conduit"; - version = "0.2.1"; - sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c"; - revision = "3"; - editedCabalFile = "0g56b7jqgz45dk674y8pklcvgsmai8vj3ibdylmajij0b4gcsvwd"; + pname = "req-oauth2"; + version = "0.1.0.0"; + sha256 = "1qx5f4flyainc0m87fjyn6z65bfh10y6bh6vbbqmyy4m4aw47wia"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring conduit http-client req resourcet transformers - ]; - testHaskellDepends = [ - base bytestring conduit conduit-extra hspec req resourcet temporary + aeson base base64-bytestring bytestring data-default-class + http-client http-types lens modern-uri req req-url-extra text transformers ]; - benchmarkHaskellDepends = [ - base bytestring conduit conduit-extra req resourcet temporary weigh + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/rcook/req-oauth2#readme"; + description = "Provides OAuth2 authentication for use with Req"; + license = stdenv.lib.licenses.mit; + }) {}; + + "req-url-extra" = callPackage + ({ mkDerivation, aeson, base, data-default-class, hspec, modern-uri + , req, text + }: + mkDerivation { + pname = "req-url-extra"; + version = "0.1.0.0"; + sha256 = "113xsf37kra3k3jhf2wh37rsgphxz24rsn3dy8zw1cwzsim2dpmk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base modern-uri req ]; + executableHaskellDepends = [ + aeson base data-default-class modern-uri req text ]; - 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; + testHaskellDepends = [ base hspec modern-uri req ]; + homepage = "https://github.com/rcook/req-url-extra#readme"; + description = "Provides URI/URL helper functions for use with Req"; + license = stdenv.lib.licenses.mit; }) {}; "reqcatcher" = callPackage @@ -167594,8 +175868,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.1.0.0"; - sha256 = "0lcismi3aj6h2s2snv80w2pdk389zffd0cjrbd2y9285vw401mvm"; + version = "0.1.0.1"; + sha256 = "1ywh83ydy48mlix7mglnkhsjj3b13jqs2gs52by6q1g438nb31in"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -167623,20 +175897,8 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.0.3"; - sha256 = "1gpz8acmw08klgar2lvaff6g6a2y6jnmh1lkh3rdzsqgrmr2wlv3"; - libraryHaskellDepends = [ rebase ]; - homepage = "https://github.com/nikita-volkov/rerebase"; - description = "Reexports from \"base\" with a bunch of other standard libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rerebase_1_1_2" = callPackage - ({ mkDerivation, rebase }: - mkDerivation { - pname = "rerebase"; - version = "1.1.2"; - sha256 = "1nlms737hwk8b9jb354w1czgsg0hgjm8xdj7rjhxv99zkhmp8bmi"; + version = "1.2.1"; + sha256 = "02j119pabivn2x23mvvmzlkypxwi31p7s2fpakavhqfs6bmbnb2a"; libraryHaskellDepends = [ rebase ]; homepage = "https://github.com/nikita-volkov/rerebase"; description = "Reexports from \"base\" with a bunch of other standard libraries"; @@ -167667,6 +175929,7 @@ self: { homepage = "http://github.com/agrafix/Spock"; description = "abstract implementation of typed and untyped web routing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reserve" = callPackage @@ -167690,6 +175953,7 @@ self: { ]; description = "Reserve reloads web applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resin" = callPackage @@ -167730,6 +175994,8 @@ self: { pname = "resolv"; version = "0.1.1.1"; sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; + revision = "1"; + editedCabalFile = "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -167738,6 +176004,7 @@ self: { ]; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resolve" = callPackage @@ -167756,6 +176023,7 @@ self: { homepage = "https://github.com/riaqn/resolve#readme"; description = "A name resolusion library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resolve-trivial-conflicts" = callPackage @@ -167775,6 +176043,7 @@ self: { homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; description = "Remove trivial conflict markers in a git repository"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resource-effect" = callPackage @@ -167880,23 +176149,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "resourcet" = callPackage + "resourcet_1_1_11" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base - , transformers-compat + , transformers-compat, unliftio-core }: mkDerivation { pname = "resourcet"; - version = "1.1.9"; - sha256 = "1x9f2qz57agl3xljp1wi0ab51p13czrpf6qjp3506rl9dg99j6as"; + version = "1.1.11"; + sha256 = "1n94m2c7rxk2bgm8wywrkp9pmqlnv2dl35yaylninzm8xk1xavil"; + revision = "1"; + editedCabalFile = "09sgrzaaishx645hrfflxckyaq0dwk22agjf4sz8nwjafyv3ssh9"; libraryHaskellDepends = [ base containers exceptions lifted-base mmorph monad-control mtl - transformers transformers-base transformers-compat + transformers transformers-base transformers-compat unliftio-core ]; testHaskellDepends = [ base hspec lifted-base transformers ]; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "resourcet" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , primitive, transformers, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.2.1"; + sha256 = "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7"; + libraryHaskellDepends = [ + base containers exceptions mtl primitive transformers unliftio-core + ]; + testHaskellDepends = [ base exceptions hspec transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; }) {}; "respond" = callPackage @@ -167938,10 +176227,8 @@ self: { }: mkDerivation { pname = "rest-client"; - version = "0.5.1.1"; - sha256 = "0qzn56bj821l9gcxyq6lcgwfa2444igiqczajybrnyy8yb4j792x"; - revision = "1"; - editedCabalFile = "1q7ad9lhlszbmdv5r9zzqj9c3rh9x5hlrl4dyb4wb0xf0v3bj3kx"; + version = "0.5.2.3"; + sha256 = "1c4p68n3vb5w5xv0ha5bfq73qkcaqkyz0srfdn27pipy2s1h6p22"; libraryHaskellDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-client http-conduit http-types hxt hxt-pickle-utils @@ -167950,6 +176237,7 @@ self: { ]; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-core" = callPackage @@ -167981,6 +176269,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rest-core_0_39_0_2" = callPackage + ({ mkDerivation, aeson, aeson-utils, base, base-compat, bytestring + , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils + , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap + , rest-types, safe, split, test-framework, test-framework-hunit + , text, transformers, transformers-compat, unordered-containers + , uri-encode, utf8-string, uuid + }: + mkDerivation { + pname = "rest-core"; + version = "0.39.0.2"; + sha256 = "0vr538sp8i5qwgd91bzvq9fxv939imxck6358xfzlgrk6x89cr1z"; + libraryHaskellDepends = [ + aeson aeson-utils base base-compat bytestring case-insensitive + errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat + multipart random rest-stringmap rest-types safe split text + transformers transformers-compat unordered-containers uri-encode + utf8-string uuid + ]; + testHaskellDepends = [ + aeson base bytestring HUnit mtl test-framework test-framework-hunit + transformers transformers-compat unordered-containers + ]; + description = "Rest API library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rest-example" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , generic-aeson, generic-xmlpickler, hxt, json-schema, mtl @@ -168015,8 +176331,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.20.0.1"; - sha256 = "0fa4mz7drfy60lcg1j73qajy00byvhy759x195prj4nvbrsn5x31"; + version = "0.20.0.3"; + sha256 = "1kd8i5kqjsdc3pl5gpg3i3lhy807qd6x4gxc86hr9a8kkv7y7hfn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory @@ -168030,6 +176346,7 @@ self: { ]; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-happstack" = callPackage @@ -168047,28 +176364,10 @@ self: { ]; description = "Rest driver for Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-snap" = callPackage - ({ mkDerivation, base, base-compat, bytestring, case-insensitive - , rest-core, safe, snap-core, unordered-containers, uri-encode - , utf8-string - }: - mkDerivation { - pname = "rest-snap"; - version = "0.2.0.1"; - sha256 = "1m82qhrkawcabm0ra7cralbag8p54jnf9cfq0idc1ah852w5gzr4"; - revision = "1"; - editedCabalFile = "0y39l49ywl1cx0hdr37sgacm31q7sdh4y81qk5115sy68wgxn1gw"; - libraryHaskellDepends = [ - base base-compat bytestring case-insensitive rest-core safe - snap-core unordered-containers uri-encode utf8-string - ]; - description = "Rest driver for Snap"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rest-snap_0_3_0_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, case-insensitive , rest-core, safe, snap-core, unordered-containers, uri-encode , utf8-string @@ -168083,7 +176382,6 @@ self: { ]; description = "Rest driver for Snap"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-stringmap" = callPackage @@ -168092,10 +176390,8 @@ self: { }: mkDerivation { pname = "rest-stringmap"; - version = "0.2.0.6"; - sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6"; - revision = "7"; - editedCabalFile = "14jqqpxxs7vkrf6syycrg2ymh79gl83z13kq261alw5gy8yjnszv"; + version = "0.2.0.7"; + sha256 = "0l2l46c1mqpxq7hi37vjhaihfyapifjaxbzyi1bdhjkybx7n9m32"; libraryHaskellDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -168111,10 +176407,8 @@ self: { }: mkDerivation { pname = "rest-types"; - version = "1.14.1.1"; - sha256 = "16lnwd7rwjb67sqklrwl40bq4h8qhp3wj1893y4vs85fpdjqxq5p"; - revision = "4"; - editedCabalFile = "04s5xcjycbw9fqhmpx0kmy5wmkpgcs84vam68w428rb7y64099mb"; + version = "1.14.1.2"; + sha256 = "0cjxnb4zvj7iafgy9h4wq8817wkm1mvas45xcb9346kwd3yqgvmy"; libraryHaskellDepends = [ aeson base base-compat case-insensitive generic-aeson generic-xmlpickler hxt json-schema rest-stringmap text uuid @@ -168132,14 +176426,15 @@ self: { pname = "rest-wai"; version = "0.2.0.1"; sha256 = "00hd7i28p5diy00m18yi6f2jp5cxbvb9s2fv24phakjsp2vmw81q"; - revision = "1"; - editedCabalFile = "1j2n7bypgjajwsaahvp50cdwrl7y0nbv67bd3kfdq03yvz5s1py3"; + revision = "2"; + editedCabalFile = "1n3sd3vszi0ifw098jf2yan8xcnrxckr22jssl61k0vn74573hw3"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers http-types mime-types mtl rest-core text unordered-containers wai ]; description = "Rest driver for WAI applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "restful-snap" = callPackage @@ -168179,7 +176474,6 @@ self: { homepage = "https://github.com/lessrest/restless-git"; description = "Easy Git repository serialization"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "restricted-workers" = callPackage @@ -168243,9 +176537,9 @@ self: { }) {}; "rethinkdb" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring - , binary, bytestring, containers, criterion, data-default, doctest - , mtl, network, scientific, text, time, unordered-containers + ({ mkDerivation, aeson, async, base, base64-bytestring, binary + , bytestring, containers, criterion, data-default, doctest, mtl + , network, scientific, text, time, unordered-containers , utf8-string, vector }: mkDerivation { @@ -168259,12 +176553,12 @@ self: { data-default mtl network scientific text time unordered-containers utf8-string vector ]; - executableHaskellDepends = [ attoparsec base text ]; 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 @@ -168335,18 +176629,19 @@ self: { "retry" = callPackage ({ mkDerivation, base, data-default-class, exceptions, ghc-prim - , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers + , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog + , tasty-hunit, time, transformers }: mkDerivation { pname = "retry"; - version = "0.7.4.3"; - sha256 = "0i47gmlljz00fwf2qwkrh24hgsyw5sz2npaighx4wxvykf00d390"; + version = "0.7.6.2"; + sha256 = "0bmrp2h6pf43hr7sd6562qixw755h2xgszj700157pk2hxcz16ad"; libraryHaskellDepends = [ base data-default-class exceptions ghc-prim random transformers ]; testHaskellDepends = [ - base data-default-class exceptions ghc-prim hspec HUnit mtl - QuickCheck random stm time transformers + base data-default-class exceptions ghc-prim hedgehog HUnit mtl + random stm tasty tasty-hedgehog tasty-hunit time transformers ]; homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; @@ -168515,6 +176810,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rfc" = callPackage + ({ mkDerivation, aeson, aeson-diff, attoparsec, base, binary + , blaze-html, bytestring, classy-prelude, containers, data-default + , envy, hedis, http-api-data, http-client, http-client-tls + , http-types, lens, lifted-async, markdown, miso, monad-control + , mono-traversable, mtl, natural-transformation, network + , network-uri, postgresql-typed, resource-pool, servant + , servant-blaze, servant-client, servant-docs, servant-server + , servant-swagger, simple-logger, swagger2, temporary, text + , text-conversions, time, time-units, unliftio, unliftio-core + , unordered-containers, url, uuid-types, wai, wai-cli, wai-cors + , wai-extra, warp, wreq + }: + mkDerivation { + pname = "rfc"; + version = "0.0.0.25"; + sha256 = "1yzi8cb90iy54wi463cpk9h961k53cilgdjcf252yw4qsvxcqh5i"; + libraryHaskellDepends = [ + aeson aeson-diff attoparsec base binary blaze-html bytestring + classy-prelude containers data-default envy hedis http-api-data + http-client http-client-tls http-types lens lifted-async markdown + miso monad-control mono-traversable mtl natural-transformation + network network-uri postgresql-typed resource-pool servant + servant-blaze servant-client servant-docs servant-server + servant-swagger simple-logger swagger2 temporary text + text-conversions time time-units unliftio unliftio-core + unordered-containers url uuid-types wai wai-cli wai-cors wai-extra + warp wreq + ]; + homepage = "https://github.com/RobertFischer/rfc#README.md"; + description = "Robert Fischer's Common library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rfc1413-server" = callPackage ({ mkDerivation, base, network-simple, rfc1413-types }: mkDerivation { @@ -168549,6 +176879,7 @@ self: { doHaddock = false; description = "Parse and display time according to RFC3339 (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rfc5051" = callPackage @@ -168560,18 +176891,29 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; - executableHaskellDepends = [ base bytestring containers ]; description = "Simple unicode collation as per RFC5051"; license = stdenv.lib.licenses.bsd3; }) {}; + "rgb-color-model" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "rgb-color-model"; + version = "0.2.0.0"; + sha256 = "0vhqw2hylv0228g48b4q81fs0pjgmv68rzlasnz39g6yqddws97c"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/joegesualdo/rgb-color-model"; + description = "Haskell types for working with RGB colors"; + license = stdenv.lib.licenses.mit; + }) {}; + "rhine" = callPackage ({ mkDerivation, base, containers, dunai, free, time, transformers }: mkDerivation { pname = "rhine"; - version = "0.2.0.0"; - sha256 = "03vskqdgf52lrqm5fjzhyh6sd05xkpvz6n92vd53piklnpvf25gh"; + version = "0.4.0.0"; + sha256 = "18fav38bd2ysk8y5s24xxc6v381mag3g2lqpb9qayvcfj2zndx1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168583,6 +176925,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rhine-gloss" = callPackage + ({ mkDerivation, base, dunai, gloss, rhine }: + mkDerivation { + pname = "rhine-gloss"; + version = "0.4.0.0"; + sha256 = "1sidp1f3is889g0kgdcbzpjrqndrvwvq6k713daqlkzarg9wngnj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dunai gloss rhine ]; + executableHaskellDepends = [ base ]; + description = "Wrapper to run reactive programs written in Rhine with Gloss as backend"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rhythm-game-tutorial" = callPackage ({ mkDerivation, base, call, containers, lens, mtl, objective , split @@ -168604,7 +176961,7 @@ self: { }) {}; "riak" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, binary + ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary , blaze-builder, bytestring, containers, criterion , data-default-class, deepseq, enclosed-exceptions, exceptions , hashable, HUnit, mersenne-random-pure64, monad-control, mtl @@ -168615,15 +176972,15 @@ self: { }: mkDerivation { pname = "riak"; - version = "1.1.2.0"; - sha256 = "1vin0klwg8ajbcirxr82bk5g4yg3d2v7d40dxbpkncksbzva6wjj"; - libraryHaskellDepends = [ - 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 + version = "1.1.2.4"; + sha256 = "1j67p29jnw6zy3294qwsc947akdk8xawa426fvnflbba5lmzxial"; + libraryHaskellDepends = [ + aeson async attoparsec base bifunctors 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 = [ aeson base bytestring containers data-default-class HUnit mtl @@ -168631,10 +176988,9 @@ self: { tasty-quickcheck template-haskell text yaml ]; benchmarkHaskellDepends = [ base bytestring criterion semigroups ]; - homepage = "http://github.com/markhibberd/riak-haskell-client"; + homepage = "http://github.com/riak-haskell-client/riak-haskell-client"; description = "A Haskell client for the Riak decentralized data store"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riak-protobuf" = callPackage @@ -168643,16 +176999,38 @@ self: { }: mkDerivation { pname = "riak-protobuf"; - version = "0.22.0.0"; - sha256 = "06b9b9xv9y5kjrzkbycmzq9xyqxynk45qvl000ccrgwpjql7dd9j"; + version = "0.23.0.0"; + sha256 = "0cyarnp2yqlj98zdbd51krpz3ls75vcl8am6h4wf98b6vdmx1jsx"; libraryHaskellDepends = [ array base parsec protocol-buffers protocol-buffers-descriptor ]; - homepage = "http://github.com/markhibberd/riak-haskell-client"; + homepage = "http://github.com/riak-haskell-client/riak-haskell-client"; description = "Haskell types for the Riak protocol buffer API"; license = "unknown"; }) {}; + "riak-protobuf-lens" = callPackage + ({ mkDerivation, base, bytestring, containers, microlens + , microlens-th, riak-protobuf, template-haskell + }: + mkDerivation { + pname = "riak-protobuf-lens"; + version = "0.23.0.0"; + sha256 = "0i01p6ix5304hd9alahq5bpmcf1rzc9k2qqy6n7c002fmnwsw2zw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers riak-protobuf + ]; + executableHaskellDepends = [ + base bytestring containers microlens microlens-th riak-protobuf + template-haskell + ]; + homepage = "https://github.com/riak-haskell-client/riak-haskell-client#readme"; + description = "Lenses for riak-protobuf"; + license = "unknown"; + }) {}; + "richreports" = callPackage ({ mkDerivation, ascetic, base, MissingH }: mkDerivation { @@ -168776,7 +177154,50 @@ self: { homepage = "http://github.com/bgamari/ring-buffer"; description = "A concurrent, mutable ring-buffer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rio" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, microlens, mtl, primitive + , process, text, time, typed-process, unix, unliftio + , unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.1.0"; + sha256 = "0mr78bd5xcq4gxc7vhz1k70gxbng2rbpip648fs4k0hb7gf2z0ds"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens mtl primitive process text time typed-process + unix unliftio unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens mtl primitive process text time + typed-process unix unliftio unordered-containers vector + ]; + homepage = "https://github.com/commercialhaskell/rio#readme"; + description = "A standard library for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + + "rio-orphans" = callPackage + ({ mkDerivation, base, exceptions, hspec, monad-control, resourcet + , rio, transformers-base + }: + mkDerivation { + pname = "rio-orphans"; + version = "0.1.0.0"; + sha256 = "09wy9h6smh532lrh13qzmni91yfb702x8i97r24d3ny6i3krzqi7"; + libraryHaskellDepends = [ + base exceptions monad-control resourcet rio transformers-base + ]; + testHaskellDepends = [ + base exceptions hspec monad-control resourcet rio transformers-base + ]; + homepage = "https://github.com/commercialhaskell/rio#readme"; + description = "Orphan instances for the RIO type in the rio package"; + license = stdenv.lib.licenses.mit; }) {}; "riot" = callPackage @@ -168870,6 +177291,7 @@ self: { homepage = "https://github.com/cocreature/riscv-isa#readme"; description = "Haskell representation of the RISC-V instruction set architecture"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rison" = callPackage @@ -169010,6 +177432,7 @@ self: { homepage = "https://github.com/grwlf/rl"; description = "Collection of Reinforcement Learning algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rlglue" = callPackage @@ -169120,17 +177543,6 @@ self: { }) {}; "rng-utils" = callPackage - ({ mkDerivation, base, bytestring, mwc-random, vector }: - mkDerivation { - pname = "rng-utils"; - version = "0.2.1"; - sha256 = "11yy6v0dbdf0cn823vlyd90zc5q5aw0zjzylpz5s9c94wsd4pjfa"; - libraryHaskellDepends = [ base bytestring mwc-random vector ]; - description = "RNG within an MVar for convenient concurrent use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rng-utils_0_3_0" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog, random , tasty, tasty-hedgehog }: @@ -169146,6 +177558,28 @@ self: { homepage = "https://bitbucket.org/soostone/rng-utils"; description = "RNG within an IORef for convenient concurrent use"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "rob" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs + , directory, ede, filepath, fortytwo, Glob, pathwalk, text, time + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "rob"; + version = "0.0.2"; + sha256 = "1bbhv502c9r8d0kmrvl3q7yl12ykjwfvknlm0kmgnsv5lpz2zx59"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmdargs directory ede filepath + fortytwo Glob pathwalk text time unordered-containers vector yaml + ]; + executableHaskellDepends = [ base cmdargs ]; + testHaskellDepends = [ base directory ]; + homepage = "https://github.com/gianlucaguarini/rob#readme"; + description = "Simple projects generator"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -169167,6 +177601,7 @@ self: { homepage = "https://www.github.com/ktvoelker/robin"; description = "A build daemon for Haskell development"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "robot" = callPackage @@ -169190,8 +177625,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.4"; - sha256 = "18dkha42dcxl9f9771wpkji11m12v139wnscb47bm7s693w7p4nc"; + version = "0.4.1.5"; + sha256 = "025dm3rv4cpig8j02yzkr7xinzfcqmfiaaj8x5kzjw8mgcb1qpn3"; libraryHaskellDepends = [ attoparsec base bytestring old-locale time ]; @@ -169241,16 +177676,17 @@ self: { }) {}; "rocksdb-haskell" = callPackage - ({ mkDerivation, base, binary, bytestring, data-default, filepath - , hspec, hspec-expectations, process, QuickCheck, resourcet - , rocksdb, temporary, transformers + ({ mkDerivation, base, binary, bytestring, data-default, directory + , filepath, hspec, hspec-expectations, process, QuickCheck + , resourcet, rocksdb, temporary, transformers }: mkDerivation { pname = "rocksdb-haskell"; - version = "1.0.0"; - sha256 = "0raipwawmah4h9ryja65b881dcj4yadrhh4c4718fdr0n89wgnzd"; + version = "1.0.1"; + sha256 = "1zsdxnmi2nyg54ic7xszdw7pz4c8ja18nmcaawhjwg2h7y9pqh5q"; libraryHaskellDepends = [ - base binary bytestring data-default filepath resourcet transformers + base binary bytestring data-default directory filepath resourcet + transformers ]; librarySystemDepends = [ rocksdb ]; testHaskellDepends = [ @@ -169337,6 +177773,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "roku-api" = callPackage + ({ mkDerivation, base, bytestring, http-client, network, text, xml + , xml-extractors + }: + mkDerivation { + pname = "roku-api"; + version = "0.1.0.0"; + sha256 = "01vqmzqpdj40qxym3iapn1csr10ld9a9imci1pyncdly6q3a343c"; + libraryHaskellDepends = [ + base bytestring http-client network text xml xml-extractors + ]; + description = "Bindings to Roku's External Control API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "roles" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -169351,21 +177803,44 @@ self: { "rollbar" = callPackage ({ mkDerivation, aeson, base, basic-prelude, http-conduit - , monad-control, network, resourcet, text, vector + , lifted-base, monad-control, network, resourcet, text, vector }: mkDerivation { pname = "rollbar"; - version = "1.0.0"; - sha256 = "01rljwfb7cgw544pk6iwmxlxzid51q7ig8f5y8v9i75vskqkip7j"; + version = "1.1.1"; + sha256 = "0fwkmp55qddajbbc9dkd3y0z8x14ybvyad8pb5d7i0snxksksjrg"; libraryHaskellDepends = [ - aeson base basic-prelude http-conduit monad-control network - resourcet text vector + aeson base basic-prelude http-conduit lifted-base monad-control + network resourcet text vector ]; homepage = "https://github.com/azara/rollbar-haskell"; description = "error tracking through rollbar.com"; license = stdenv.lib.licenses.mit; }) {}; + "rollbar-hs" = 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 + }: + mkDerivation { + pname = "rollbar-hs"; + version = "0.2.0.0"; + sha256 = "0w4a0bl0vyzb094car4zh599j5g4zknlqia1ja0jpr62bblrkmw5"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive hostname http-client + http-conduit http-types network text time unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers hspec + hspec-golden-aeson lens lens-aeson QuickCheck text + ]; + homepage = "https://github.com/joneshf/rollbar-hs#readme"; + description = "Core Rollbar data types and APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "roller" = callPackage ({ mkDerivation, base, optparse-applicative, random , regex-applicative @@ -169459,6 +177934,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rope-utf16-splay" = callPackage + ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "rope-utf16-splay"; + version = "0.2.0.0"; + sha256 = "078hkv21maydvks57pz6z3qyz0r4s1c6ypdmlr4xlmakyldrdlc3"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/ollef/rope-utf16-splay"; + description = "Ropes optimised for updating using UTF-16 code units and row/column pairs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rosa" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, lens , namecoin-update, optparse-applicative, text, unordered-containers @@ -169479,35 +177971,6 @@ self: { }) {}; "rose-trees" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, hashable - , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups - , sets, tasty, tasty-quickcheck, unordered-containers, witherable - }: - mkDerivation { - pname = "rose-trees"; - version = "0.0.4.3"; - sha256 = "09p4sna1payzrz6sx8gszr0bcz7ga5qxx81512pid4wmgsr81ldx"; - libraryHaskellDepends = [ - base containers deepseq hashable mtl QuickCheck - quickcheck-instances semigroupoids semigroups sets - unordered-containers witherable - ]; - testHaskellDepends = [ - base containers deepseq hashable QuickCheck quickcheck-instances - semigroupoids semigroups sets tasty tasty-quickcheck - unordered-containers witherable - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq hashable mtl QuickCheck - quickcheck-instances semigroupoids semigroups sets - unordered-containers witherable - ]; - description = "A collection of rose tree structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "rose-trees_0_0_4_4" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, hashable , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups , sets, tasty, tasty-quickcheck, unordered-containers, witherable @@ -169614,6 +178077,7 @@ self: { homepage = "https://github.com/RoboticsHS/rosmsg#readme"; description = "ROS message parser, render, TH"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rosmsg-bin" = callPackage @@ -169687,8 +178151,8 @@ self: { }: mkDerivation { pname = "rotating-log"; - version = "0.4.2"; - sha256 = "1v2lyyapsbyrnswggy8lfn5qq2xrzdrw3vc881xkhc4yrdzaxw3f"; + version = "0.4.3"; + sha256 = "1xpfm07kd6mz13zwzmrwcp2cmc0dr0j94nhy1gzw1064jmd7b482"; libraryHaskellDepends = [ base bytestring directory filepath old-locale time time-locale-compat @@ -169837,6 +178301,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "row-types" = callPackage + ({ mkDerivation, base, constraints, criterion, deepseq, hashable + , text, unordered-containers + }: + mkDerivation { + pname = "row-types"; + version = "0.2.2.0"; + sha256 = "1xv42yzv0xrb1bwqlmpmk7wwmq2mcf6d73g91aycq99hjq18bmcq"; + libraryHaskellDepends = [ + base constraints deepseq hashable text unordered-containers + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Open Records and Variants"; + license = stdenv.lib.licenses.mit; + }) {}; + + "rowdy" = callPackage + ({ mkDerivation, base, containers, dlist, hspec, mtl }: + mkDerivation { + pname = "rowdy"; + version = "0.0.1.0"; + sha256 = "19nafk4zmhx76j0qzg1d5kh6mnzwnr5x3kvvxi56x24kfmvrq5qq"; + libraryHaskellDepends = [ base containers dlist mtl ]; + testHaskellDepends = [ base containers dlist hspec mtl ]; + homepage = "https://github.com/parsonsmatt/rowdy#readme"; + description = "An EDSL for web application routes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rowdy-yesod" = callPackage + ({ mkDerivation, base, hspec, rowdy, yesod-core }: + mkDerivation { + pname = "rowdy-yesod"; + version = "0.0.1.0"; + sha256 = "17k9bbxwpmxpswkmax6jrlcfrp6qhgdkjixsp4d6rn7mj676010g"; + libraryHaskellDepends = [ base rowdy yesod-core ]; + testHaskellDepends = [ base hspec rowdy yesod-core ]; + homepage = "https://github.com/parsonsmatt/rowdy#readme"; + description = "An EDSL for web application routes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rowrecord" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -169988,7 +178495,6 @@ self: { homepage = "https://github.com/lovasko/rset"; description = "Range set"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rspp" = callPackage @@ -170018,48 +178524,21 @@ self: { homepage = "https://github.com/basvandijk/rss"; description = "A library for generating RSS 2.0 feeds."; license = stdenv.lib.licenses.publicDomain; - }) {}; - - "rss-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , 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.1.2"; - sha256 = "19a2x5xkfbkzz36l47v4m0fd7qp0pn3r4r77jaca0a3m7k74rxf1"; - 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-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 standard"; - license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rss-conduit_0_4_2_0" = callPackage + "rss-conduit" = callPackage ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring , conduit, conduit-combinators, containers, data-default - , dublincore-xml-conduit, hlint, lens-simple, mono-traversable - , QuickCheck, quickcheck-instances, resourcet, safe - , safe-exceptions, singletons, tasty, tasty-hunit, tasty-quickcheck - , text, time, timerep, uri-bytestring, vinyl, xml-conduit - , xml-types + , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck + , quickcheck-instances, resourcet, safe, safe-exceptions + , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time + , timerep, uri-bytestring, vinyl, xml-conduit, xml-types }: mkDerivation { pname = "rss-conduit"; - version = "0.4.2.0"; - sha256 = "1fgaf15i2fbr1v2kd0s80zkbafsl50sv4b48my0nvs8vqhha5n7y"; + version = "0.4.2.1"; + sha256 = "04jpc3zrm9sh1ncqz2n0qr7wgabgpi56vsj24rppqiwrx31jrxdq"; libraryHaskellDepends = [ atom-conduit base conduit conduit-combinators containers dublincore-xml-conduit lens-simple safe safe-exceptions singletons @@ -170067,11 +178546,10 @@ self: { ]; testHaskellDepends = [ atom-conduit base blaze-builder bytestring conduit - conduit-combinators data-default dublincore-xml-conduit hlint - lens-simple mono-traversable QuickCheck quickcheck-instances - resourcet safe-exceptions singletons tasty tasty-hunit - tasty-quickcheck text time uri-bytestring vinyl xml-conduit - xml-types + conduit-combinators data-default dublincore-xml-conduit lens-simple + mono-traversable QuickCheck quickcheck-instances resourcet + safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text + time uri-bytestring vinyl xml-conduit xml-types ]; description = "Streaming parser/renderer for the RSS standard"; license = stdenv.lib.licenses.publicDomain; @@ -170106,14 +178584,13 @@ self: { "rtcm" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-bits, binary-conduit, bytestring - , conduit, conduit-combinators, conduit-extra, lens, lens-aeson - , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text, word24 + , conduit, conduit-extra, lens, lens-aeson, random, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, word24 }: mkDerivation { pname = "rtcm"; - version = "0.2.8"; - sha256 = "014cs6lsg6hdm7s2747j681xj87lh60l77mqbjijcl4lxh9brglw"; + version = "0.2.16"; + sha256 = "0sfllzq97yl1dn3f9avi538121kn7bj5syc27g7139fqrjhvjy18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170122,14 +178599,14 @@ self: { ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-combinators conduit-extra + conduit-extra ]; testHaskellDepends = [ base basic-prelude binary binary-bits bytestring lens random tasty - tasty-hunit tasty-quickcheck word24 + tasty-hunit tasty-quickcheck text word24 ]; homepage = "http://github.com/swift-nav/librtcm"; - description = "RTCM Library"; + description = "Haskell bindings for RTCM"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -170178,7 +178655,7 @@ self: { homepage = "https://gitlab.com/formaltech/rtnetlink-hs"; description = "Manipulate network devices, addresses, and routes on Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rtorrent-rpc" = callPackage @@ -170258,7 +178735,7 @@ self: { homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -170278,6 +178755,7 @@ self: { homepage = "https://github.com/filib/ruby-marshal"; description = "Parse a subset of Ruby objects serialised with Marshal.dump."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ruby-qq" = callPackage @@ -170333,17 +178811,18 @@ self: { }) {}; "ruler" = callPackage - ({ mkDerivation, base, containers, mtl, shuffle, uhc-util, uuagc - , uuagc-cabal, uulib + ({ mkDerivation, base, Cabal, containers, mtl, shuffle, uhc-util + , uuagc, uuagc-cabal, uulib }: mkDerivation { pname = "ruler"; - version = "0.4.0.2"; - sha256 = "1kcca2h3gvp63s9frnq4dmhaiw5pxhk5ji86bar0cwyrc9all8v5"; + version = "0.4.1.0"; + sha256 = "1qa0d2jaws5wn2npjcsc66m59d64dxbm074h7lkysawdgq9hzdy1"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal shuffle uuagc uuagc-cabal ]; executableHaskellDepends = [ - base containers mtl shuffle uhc-util uuagc uuagc-cabal uulib + base Cabal containers mtl shuffle uhc-util uuagc uuagc-cabal uulib ]; homepage = "https://github.com/UU-ComputerScience/ruler"; description = "Ruler tool for UHC"; @@ -170416,6 +178895,7 @@ self: { homepage = "https://github.com/jwiegley/runmany"; description = "Run multiple commands, interleaving output and errors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "runmemo" = callPackage @@ -170494,23 +178974,34 @@ self: { }) {}; "s-cargot" = callPackage - ({ mkDerivation, base, containers, parsec, QuickCheck, text }: + ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck, text + }: mkDerivation { pname = "s-cargot"; - version = "0.1.2.0"; - sha256 = "068ysjnparlrwrppqxi91yxqpskz8nqzyypp3qnad04fyz3l36mm"; - revision = "2"; - editedCabalFile = "0ighpd2cnci0afxv9v873ccsd7gpkc1z1qdciqcqzzgy7n8504ik"; + version = "0.1.4.0"; + sha256 = "0bay3ids11acs0b95gn99s6m93x3d8hl45yf008lv4wcxwaq77sd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers parsec text ]; - executableHaskellDepends = [ base containers parsec text ]; - testHaskellDepends = [ base parsec QuickCheck text ]; + testHaskellDepends = [ base HUnit parsec QuickCheck text ]; homepage = "https://github.com/aisamanra/s-cargot"; description = "A flexible, extensible s-expression library"; license = stdenv.lib.licenses.bsd3; }) {}; + "s-cargot-letbind" = callPackage + ({ mkDerivation, base, HUnit, parsec, s-cargot, text }: + mkDerivation { + pname = "s-cargot-letbind"; + version = "0.2.2.0"; + sha256 = "0yv15kqfx21qwrm4i7rkwb1iybx27314f86xqbf2yyh4ala35wr1"; + libraryHaskellDepends = [ base s-cargot text ]; + testHaskellDepends = [ base HUnit parsec s-cargot text ]; + homepage = "https://github.com/GaloisInc/s-cargot-letbind"; + description = "Enables let-binding and let-expansion for s-cargot defined S-expressions"; + license = stdenv.lib.licenses.isc; + }) {}; + "s-expression" = callPackage ({ mkDerivation, base, derive-monoid, lens, semigroups }: mkDerivation { @@ -170542,12 +179033,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "s3-signer_0_4_0_0" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-builder, byteable + , bytestring, case-insensitive, cryptohash, http-types, time + , utf8-string + }: + mkDerivation { + pname = "s3-signer"; + version = "0.4.0.0"; + sha256 = "1s1l5zj4azbgl0p6w52498d6shc5c0yqnzrbjfz1hh45hh2182qf"; + libraryHaskellDepends = [ + base base64-bytestring blaze-builder byteable bytestring + case-insensitive cryptohash http-types time utf8-string + ]; + testHaskellDepends = [ base blaze-builder bytestring time ]; + doHaddock = false; + homepage = "https://github.com/dmjio/s3-signer"; + description = "Pre-signed Amazon S3 URLs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "safe"; - version = "0.3.15"; - sha256 = "0bbalr2n92akwcgdyl5ff45h8d4waamj1lp7ly6mdgda17k4lpm3"; + version = "0.3.17"; + sha256 = "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/ndmitchell/safe#readme"; @@ -170567,14 +179079,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safe-coerce" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "safe-coerce"; + version = "0.1.0.0"; + sha256 = "0qv4a6p547cnyvchnjrya8paq39gqpnbska9v5l64lqn3a28yk8p"; + libraryHaskellDepends = [ base ]; + description = "A friendly shorthand for an old friend"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "safe-exceptions" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, transformers , void }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.6.0"; - sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i"; + version = "0.1.7.0"; + sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; + revision = "3"; + editedCabalFile = "0y1b9pw5wriyiffcmvk9g53imh6lm5fgfbjsgpn2w96qspaagdb5"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -170590,8 +179115,8 @@ self: { pname = "safe-exceptions-checked"; version = "0.1.0"; sha256 = "0gyaq2pf87dqn0l6n3mi0qamf99y3zj5xxh513c0iqwdh8mma1yq"; - revision = "2"; - editedCabalFile = "18fwk5yr8zm4y215vbsl149jkn9pxyv3m8mgq3979pvs1c4kqivz"; + revision = "3"; + editedCabalFile = "004id0k46j545zvkldfcv5qjgxzl35brm9h6fq72y43b9hl2y55f"; libraryHaskellDepends = [ base deepseq safe-exceptions transformers ]; @@ -170687,23 +179212,26 @@ self: { "safe-money" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal - , constraints, deepseq, hashable, store, tasty, tasty-hunit - , tasty-quickcheck + , constraints, deepseq, hashable, serialise, store, tasty + , tasty-hunit, tasty-quickcheck, text, vector-space, xmlbf }: mkDerivation { pname = "safe-money"; - version = "0.3"; - sha256 = "0whd73vlkxzfr9rb9xfimxms56xzm0f1ninny16b4w6fg91ccqp5"; + version = "0.5"; + sha256 = "09ia4sf98ggl2y8xl0gn1vjapvwbbqq3ibfrci2p2akkyykg2vk8"; libraryHaskellDepends = [ - aeson base binary cereal constraints deepseq hashable store + aeson base binary cereal constraints deepseq hashable serialise + store text vector-space xmlbf ]; testHaskellDepends = [ aeson base binary bytestring cereal constraints deepseq hashable - store tasty tasty-hunit tasty-quickcheck + serialise store tasty tasty-hunit tasty-quickcheck text + vector-space xmlbf ]; homepage = "https://github.com/k0001/safe-money"; description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-plugins" = callPackage @@ -170750,8 +179278,8 @@ self: { }: mkDerivation { pname = "safecopy"; - version = "0.9.3.3"; - sha256 = "17msazxg0iqvmsn4cwlnr1hwcw5bfp276zsg7x5r47ifi9j748nb"; + version = "0.9.4.1"; + sha256 = "110fa0x7dq4flaprwhzlwxa7j1465a6mnj9jl8xskb5s6p0whxhl"; libraryHaskellDepends = [ array base bytestring cereal containers old-time template-haskell text time vector @@ -170781,6 +179309,7 @@ self: { homepage = "http://github.com/aelve/safecopy-migrate"; description = "Making SafeCopy migrations easier"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safecopy-store" = callPackage @@ -170791,8 +179320,8 @@ self: { }: mkDerivation { pname = "safecopy-store"; - version = "0.9.5"; - sha256 = "177v32sn3bxk3a4f4lg9vh4yc1lgylzrwzs0n6k4jrs8jxlz74iw"; + version = "0.9.6"; + sha256 = "1x82j4zw26pp38bcx4rnmz7ikpz8nf9mc4pkpcg9c9x76p8kxsfa"; libraryHaskellDepends = [ array base bytestring containers old-time store store-core template-haskell text time vector @@ -170805,7 +179334,6 @@ self: { homepage = "https://github.com/NCrashed/safecopy"; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safeint" = callPackage @@ -170828,22 +179356,23 @@ self: { "safeio" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , directory, filepath, HUnit, resourcet, test-framework + , directory, exceptions, filepath, HUnit, resourcet, test-framework , test-framework-hunit, test-framework-th, unix }: mkDerivation { pname = "safeio"; - version = "0.0.4.0"; - sha256 = "1abbg6nxpz4va54r2005swlyw8k4y61xjhcz4s3rshc09cmrrn6l"; + version = "0.0.5.0"; + sha256 = "04g3070cbjdqj0h9l9ii6470xcbn40xfv4fr89a8yvnkdim9nyfm"; libraryHaskellDepends = [ - base bytestring conduit conduit-combinators directory filepath - resourcet unix + base bytestring conduit conduit-combinators directory exceptions + filepath resourcet unix ]; testHaskellDepends = [ - base bytestring conduit conduit-combinators directory filepath - HUnit resourcet test-framework test-framework-hunit + base bytestring conduit conduit-combinators directory exceptions + filepath HUnit resourcet test-framework test-framework-hunit test-framework-th unix ]; + homepage = "https://github.com/luispedro/safeio#readme"; description = "Write output to disk atomically"; license = stdenv.lib.licenses.mit; }) {}; @@ -170970,21 +179499,21 @@ self: { "saltine" = callPackage ({ mkDerivation, base, bytestring, libsodium, profunctors - , QuickCheck, test-framework, test-framework-quickcheck2 + , QuickCheck, semigroups, test-framework + , test-framework-quickcheck2 }: mkDerivation { pname = "saltine"; - version = "0.1.0.0"; - sha256 = "1hkdvw4fr2p2wmgq9ghna0kq9x9yv3kc9sm9wh0c71cl7gxk9g52"; + version = "0.1.0.1"; + sha256 = "05m3w0xibnhk3whzp7rzn2y2hv9f2i8pyvjnmzsxwbs8ws30cac5"; libraryHaskellDepends = [ base bytestring profunctors ]; libraryPkgconfigDepends = [ libsodium ]; testHaskellDepends = [ - base bytestring QuickCheck test-framework + base bytestring QuickCheck semigroups test-framework 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 @@ -171012,8 +179541,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "0.0.9"; - sha256 = "0x16rdrm8i2jwbi1zd7zj43r3h7jb9fzb33b5nbwkwfh397sm11h"; + version = "1.0.2"; + sha256 = "0c5022vd2pll27q49s4jq47jip27v1kr417wzip7dw5z3b3dd1ni"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/tfausak/salve#readme"; @@ -171182,10 +179711,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "samtools" = callPackage - ({ mkDerivation, base, bytestring, c2hs, filepath, process, seqloc - , vector, zlib + "sampling_0_3_3" = callPackage + ({ mkDerivation, base, containers, criterion, foldl, mwc-random + , primitive, vector }: + mkDerivation { + pname = "sampling"; + version = "0.3.3"; + sha256 = "038fl0mdim3r25jsj8bgvnmkd7iy00hpwbc0yqwijsqyss9xrgn8"; + libraryHaskellDepends = [ + base containers foldl mwc-random primitive vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/jtobin/sampling"; + description = "Sample values from collections"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "samtools" = callPackage + ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }: mkDerivation { pname = "samtools"; version = "0.2.4.3"; @@ -171195,11 +179741,6 @@ self: { libraryHaskellDepends = [ base bytestring seqloc vector ]; librarySystemDepends = [ zlib ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ - base bytestring filepath process seqloc vector - ]; - executableSystemDepends = [ zlib ]; - executableToolDepends = [ c2hs ]; homepage = "http://www.ingolia-lab.org/samtools-tutorial.html"; description = "Binding to the C samtools library"; license = stdenv.lib.licenses.mit; @@ -171243,8 +179784,7 @@ self: { }) {}; "samtools-iteratee" = callPackage - ({ mkDerivation, base, bytestring, iteratee, monads-tf, samtools - , transformers + ({ mkDerivation, base, bytestring, iteratee, samtools, transformers }: mkDerivation { pname = "samtools-iteratee"; @@ -171255,9 +179795,6 @@ self: { libraryHaskellDepends = [ base bytestring iteratee samtools transformers ]; - executableHaskellDepends = [ - base bytestring iteratee monads-tf samtools transformers - ]; description = "Iteratee interface to SamTools library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -171270,8 +179807,8 @@ self: { }: mkDerivation { pname = "sandi"; - version = "0.4.1"; - sha256 = "08y691z8m79qm4ajx5csmgv8f9x8q4r0bcfm8gb8x88lvg19493j"; + version = "0.4.2"; + sha256 = "0dvkpk91n9kz2ha04rvp231ra9sgd1ilyc1qkzf9l03iir7zrh9b"; libraryHaskellDepends = [ base bytestring conduit exceptions stringsearch ]; @@ -171518,8 +180055,8 @@ self: { }: mkDerivation { pname = "savage"; - version = "1.0.2"; - sha256 = "0fs4nbcmxcq62jmfa5ds52c3qra9dypac7grppsgxcbva7jfpw7l"; + version = "1.0.3"; + sha256 = "1pxh2qa3ryfx8xrp3mk69d1x97yyngma32p18wxccvl5zvwbkz9c"; libraryHaskellDepends = [ base bytestring containers exceptions mmorph monad-control mtl primitive random resourcet text time transformers transformers-base @@ -171528,6 +180065,26 @@ self: { homepage = "https://github.com/chessai/savage"; description = "re-export of the random generators from Hedgehog"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "sax" = callPackage + ({ mkDerivation, base, bytestring, deepseq, hspec, mtl, streaming + , text, xeno + }: + mkDerivation { + pname = "sax"; + version = "0.1.0.0"; + sha256 = "08hw88sccb1jb6iki622a988b8j5panbnjpgqcmsi1yx2c9nyxkj"; + revision = "3"; + editedCabalFile = "1gzalbr1v4x99cgrbs5s81fr2y0lzh0qhhi7r5fbxigc2yk9z0gg"; + libraryHaskellDepends = [ + base bytestring deepseq mtl streaming text xeno + ]; + testHaskellDepends = [ base bytestring hspec ]; + homepage = "https://github.com/dredozubov/sax-parser"; + description = "Monadic streaming XML parser"; + license = stdenv.lib.licenses.bsd3; }) {}; "say" = callPackage @@ -171552,31 +180109,55 @@ self: { ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, unordered-containers, yaml + , resourcet, tasty, tasty-hunit, template-haskell, text, yaml }: mkDerivation { pname = "sbp"; - version = "2.3.0"; - sha256 = "14y8d8zlvf6bzc393mzdqjyw4if7wm3nwy6v89cdylyknf2klqls"; + version = "2.3.13"; + sha256 = "0gvjqddnvbr3vn7qaajqqbh23p17vavj0p97zwh6fbizkxpj25k9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base64-bytestring basic-prelude binary bytestring data-binary-ieee754 lens lens-aeson monad-loops template-haskell - text unordered-containers + text ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit conduit-extra resourcet yaml ]; - testHaskellDepends = [ - aeson base base64-bytestring basic-prelude bytestring QuickCheck - tasty tasty-hunit tasty-quickcheck + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + homepage = "https://github.com/swift-nav/libsbp"; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + + "sbp_2_3_16" = callPackage + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-conduit, bytestring, conduit + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.3.16"; + sha256 = "0m8i5n47bzlifp5pq6hkal7zbjga5j305sfccgjyrbiwpp1sxfg3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-extra resourcet time yaml ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; homepage = "https://github.com/swift-nav/libsbp"; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -171608,8 +180189,36 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.4"; - sha256 = "0yylg2zdrcqzckhmlz9d5chac1jawbnrdp7fn49ia1nsl0i3jggc"; + version = "7.5"; + sha256 = "1c5drbqz0qld54v0k29zkra1zj09izkzf0rrmgcmgvzz7dfac4ik"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum data-binary-ieee754 deepseq + directory filepath generic-deriving ghc mtl pretty process + QuickCheck random syb template-haskell time + ]; + testHaskellDepends = [ + base bytestring containers data-binary-ieee754 directory doctest + filepath Glob hlint mtl random syb tasty tasty-golden tasty-hunit + template-haskell + ]; + testSystemDepends = [ z3 ]; + homepage = "http://leventerkok.github.com/sbv/"; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) z3;}; + + "sbv_7_6" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , crackNum, data-binary-ieee754, deepseq, directory, doctest + , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty + , process, QuickCheck, random, syb, tasty, tasty-golden + , tasty-hunit, template-haskell, time, z3 + }: + mkDerivation { + pname = "sbv"; + version = "7.6"; + sha256 = "0ycrwmyi1ba5v71qjladn0mn2hlrxdswy5mlx2dxzhrf2r6k6zd9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -171617,14 +180226,15 @@ self: { QuickCheck random syb template-haskell time ]; testHaskellDepends = [ - base bytestring data-binary-ieee754 directory doctest filepath Glob - hlint mtl random syb tasty tasty-golden tasty-hunit + base bytestring containers data-binary-ieee754 directory doctest + filepath Glob hlint mtl random syb tasty tasty-golden tasty-hunit template-haskell ]; testSystemDepends = [ z3 ]; homepage = "http://leventerkok.github.com/sbv/"; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "sbvPlugin" = callPackage @@ -171645,7 +180255,6 @@ self: { homepage = "http://github.com/LeventErkok/sbvPlugin"; description = "Formally prove properties of Haskell programs using SBV/SMT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sc3-rdu" = callPackage @@ -171659,6 +180268,7 @@ self: { homepage = "http://rd.slavepianos.org/t/sc3-rdu"; description = "Haskell bindings to sc3-rdu (sc3 rd ugens)"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scalable-server" = callPackage @@ -171695,7 +180305,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "scalendar" = callPackage + "scalendar_1_1_1" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }: mkDerivation { pname = "scalendar"; @@ -171710,6 +180320,24 @@ self: { homepage = "https://www.researchgate.net/publication/311582722_Method_of_Managing_Resources_in_a_Telecommunication_Network_or_a_Computing_System"; description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "scalendar" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, SCalendar + , text, time + }: + mkDerivation { + pname = "scalendar"; + version = "1.2.0"; + sha256 = "1b33w7fh9jfsr9wrdvnhc7nvn7km69f4qb03d0hb4zlylf6mxj7m"; + libraryHaskellDepends = [ base containers text time ]; + testHaskellDepends = [ + base containers hspec QuickCheck SCalendar text time + ]; + homepage = "https://github.com/stackbuilders/scalendar"; + description = "A library for handling calendars and resource availability over time"; + license = stdenv.lib.licenses.mit; }) {}; "scalp-webhooks" = callPackage @@ -171802,6 +180430,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "scanf" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "scanf"; + version = "0.1.0.0"; + sha256 = "0xf3g3dajaci71mgnd7z5xy4a29w40gg43a41x3fvd1a2wpi6xan"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/Lysxia/scanf#readme"; + description = "Easy and type-safe format strings for parsing and printing"; + license = stdenv.lib.licenses.mit; + }) {}; + "scanner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion , hspec, text @@ -171855,7 +180496,6 @@ self: { homepage = "https://github.com/redelmann/scat"; description = "Generates unique passwords for various websites from a single password"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scc" = callPackage @@ -171889,6 +180529,7 @@ self: { homepage = "http://trac.haskell.org/SCC/"; description = "Streaming component combinators"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scenegraph" = callPackage @@ -171922,6 +180563,7 @@ self: { ]; description = "A Haskell library for writing SCGI programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "schedevr" = callPackage @@ -171959,6 +180601,7 @@ self: { ]; description = "Find the ideal lesson layout"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "schedyield" = callPackage @@ -171987,31 +180630,6 @@ self: { }) {}; "schematic" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, hspec-core - , hspec-discover, hspec-smallcheck, HUnit, lens, regex-compat - , scientific, singletons, smallcheck, smallcheck-series, tagged - , text, unordered-containers, validationt, vector, vinyl - }: - mkDerivation { - pname = "schematic"; - version = "0.1.6.0"; - sha256 = "1pk75lrcw187nv3qf2xddi2v3pkmrq6vy6frv5piaaw12qzflfah"; - 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 lens regex-compat singletons smallcheck - smallcheck-series tagged text unordered-containers validationt - vinyl - ]; - description = "JSON-biased spec and validation tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "schematic_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens , mtl, profunctors, regex-tdfa, regex-tdfa-text, scientific @@ -172108,9 +180726,8 @@ self: { split syb tagsoup text time vector xml-conduit yaml ]; executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring containers directory - filepath process scholdoc scholdoc-types syb temporary text vector - yaml + aeson aeson-pretty attoparsec base bytestring filepath + scholdoc-types syb text yaml ]; testHaskellDepends = [ aeson base bytestring directory filepath process scholdoc @@ -172124,8 +180741,8 @@ self: { "scholdoc-texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, network-uri, parsec, process, scholdoc-types, split, syb - , temporary, text, utf8-string, xml + , mtl, parsec, process, scholdoc-types, split, syb, temporary, text + , utf8-string, xml }: mkDerivation { pname = "scholdoc-texmath"; @@ -172136,7 +180753,6 @@ self: { libraryHaskellDepends = [ base containers mtl parsec scholdoc-types syb xml ]; - executableHaskellDepends = [ network-uri ]; testHaskellDepends = [ base bytestring directory filepath process split temporary text utf8-string xml @@ -172222,10 +180838,8 @@ self: { }: mkDerivation { pname = "scientific"; - version = "0.3.5.2"; - sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w"; - revision = "1"; - editedCabalFile = "1gnz52yrd9bnq4qvd4v9kd00clx0sfbh64phafdq5g2hbk9yrg0v"; + version = "0.3.5.3"; + sha256 = "0j67qa7iqlkx0l9xlgxsyzv53bnrs7fdhv2xj1zlnkn22wsd39hj"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-gmp integer-logarithms primitive text @@ -172380,27 +180994,27 @@ self: { "scotty" = callPackage ({ mkDerivation, aeson, async, base, blaze-builder, bytestring - , case-insensitive, data-default-class, directory, fail, hspec - , hspec-wai, http-types, lifted-base, monad-control, mtl, nats - , network, regex-compat, text, transformers, transformers-base - , transformers-compat, wai, wai-extra, warp + , case-insensitive, data-default-class, directory, exceptions, fail + , hpc-coveralls, hspec, hspec-discover, hspec-wai, http-types + , lifted-base, monad-control, mtl, nats, network, regex-compat + , text, transformers, transformers-base, transformers-compat, wai + , wai-extra, warp }: mkDerivation { pname = "scotty"; - version = "0.11.0"; - sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; - revision = "6"; - editedCabalFile = "040jqfmaqy6g8hv903kjsd1bx4sr7pxsispj314gsdy8i7cb2n50"; + version = "0.11.1"; + sha256 = "1xcdfx43v1p2a20jjmnb70v2sm34iprn17ssa81fcfnabcn4blhw"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive - data-default-class fail http-types monad-control mtl nats network - regex-compat text transformers transformers-base + data-default-class exceptions fail http-types monad-control mtl + nats network regex-compat text transformers transformers-base transformers-compat wai wai-extra warp ]; testHaskellDepends = [ - async base data-default-class directory hspec hspec-wai http-types - lifted-base network text wai + async base bytestring data-default-class directory hpc-coveralls + hspec hspec-wai http-types lifted-base network text wai ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; @@ -172498,6 +181112,7 @@ self: { homepage = "https://github.com/potomak/scotty-format#readme"; description = "Response format helper for the Scotty web framework"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-hastache" = callPackage @@ -172541,21 +181156,22 @@ self: { }: mkDerivation { pname = "scotty-resource"; - version = "0.2.0.0"; - sha256 = "0210zl0ad80scjcl1dlz5z55g2rf0ybr7vj2qdl83niri8511794"; + version = "0.2.0.1"; + sha256 = "0y39sxvin9ljwk2jxnb18wr79d0ap9363vr2mh8xbc4llq0yjavj"; libraryHaskellDepends = [ base containers http-types scotty text transformers wai ]; homepage = "https://github.com/taphu/scotty-resource"; description = "A Better way of modeling web resources"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-rest" = callPackage - ({ mkDerivation, aeson, base, base-prelude, bytestring, convertible - , hspec, hspec-wai, http-date, http-media, http-types, mtl - , QuickCheck, scotty, sqlite-simple, string-conversions, text, time - , transformers, wai, wai-extra + ({ mkDerivation, base, base-prelude, bytestring, convertible, hspec + , hspec-wai, http-date, http-media, http-types, mtl, QuickCheck + , scotty, string-conversions, text, time, transformers, wai + , wai-extra }: mkDerivation { pname = "scotty-rest"; @@ -172568,9 +181184,6 @@ self: { http-types mtl scotty string-conversions text time transformers wai wai-extra ]; - executableHaskellDepends = [ - aeson base mtl scotty sqlite-simple text wai-extra - ]; testHaskellDepends = [ base bytestring hspec hspec-wai mtl QuickCheck scotty string-conversions text wai @@ -172744,6 +181357,7 @@ self: { homepage = "https://joeyh.name/code/scroll/"; description = "scroll(6), a roguelike game"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scrypt" = callPackage @@ -172798,8 +181412,8 @@ self: { }: mkDerivation { pname = "scuttlebutt-types"; - version = "0.3.0"; - sha256 = "015pg2y2k0s88wgjjv3h1h8gl3f07lbj2v8s9i1cqk5qzrs7jhrm"; + version = "0.4.0"; + sha256 = "17srdak7xbwwagm3mv7wyqff27yi217a6pjkzl2gz3n5z3h210ri"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptonite ed25519 memory text vector @@ -172848,6 +181462,7 @@ self: { homepage = "https://github.com/davnils/sde-solver"; description = "Distributed SDE solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sdf2p1-parser" = callPackage @@ -172874,8 +181489,8 @@ self: { }: mkDerivation { pname = "sdl2"; - version = "2.2.0"; - sha256 = "1164g29vb77kn5xdl71fsv95kf1h59gq8jhszyj3jrckv3x86fjs"; + version = "2.4.0.1"; + sha256 = "0kb4nl653b0p7bcv9h4b2bhpgdb49v2d49ri3cs4yykdrl58v2cs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -172888,27 +181503,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; - "sdl2_2_3_0" = callPackage - ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 - , StateVar, text, transformers, vector - }: - mkDerivation { - pname = "sdl2"; - version = "2.3.0"; - sha256 = "0av74p5m93c3g490pcz9042f9sfjknxbh5cvwvakhcfrkvfdlva4"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) SDL2;}; - "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, sdl2 }: mkDerivation { @@ -173001,54 +181595,33 @@ self: { "sdl2-mixer" = callPackage ({ mkDerivation, base, bytestring, data-default-class, lifted-base - , monad-control, sdl2, SDL2_mixer, template-haskell, text - , transformers, vector + , monad-control, sdl2, SDL2_mixer, template-haskell, vector }: mkDerivation { pname = "sdl2-mixer"; - version = "0.1"; - sha256 = "1h1b5q5jrns4ia5ih9qrhqvld96vfc1f4z1m5pcyx1qwkqfz696r"; + version = "1.1.0"; + sha256 = "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring data-default-class lifted-base monad-control sdl2 - template-haskell text transformers vector + template-haskell vector ]; librarySystemDepends = [ SDL2_mixer ]; libraryPkgconfigDepends = [ SDL2_mixer ]; - executableHaskellDepends = [ base data-default-class sdl2 vector ]; description = "Bindings to SDL2_mixer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2_mixer;}; "sdl2-ttf" = callPackage - ({ mkDerivation, base, linear, SDL2, sdl2, SDL2_ttf, transformers - }: - mkDerivation { - pname = "sdl2-ttf"; - version = "1.0.0"; - sha256 = "07z57y44hsfa7nbh7jl9c2yska98vddi906kjmbf1qlj15g1b6rl"; - revision = "1"; - editedCabalFile = "0170h5gk6l20lb5c56sfd6xjgmaan0x8hgj3qlinqfh75qxx3kyp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base sdl2 transformers ]; - librarySystemDepends = [ SDL2 SDL2_ttf ]; - 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;}; - - "sdl2-ttf_2_0_1" = callPackage ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf , template-haskell, text, transformers }: mkDerivation { pname = "sdl2-ttf"; - version = "2.0.1"; - sha256 = "0sk1lnb9zrh2ip4lhxx4g6q4j23c35k62jvbzckzy4ajlbs3029v"; + version = "2.0.2"; + sha256 = "1r0ajm5macas0gy9xd845bb8p85974hcp92ri9pa0qy4b62cmihd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173057,7 +181630,7 @@ self: { libraryPkgconfigDepends = [ SDL2 SDL2_ttf ]; description = "Bindings to SDL2_ttf"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -173074,22 +181647,22 @@ self: { "sdr" = callPackage ({ mkDerivation, array, base, bytestring, cairo, cereal, Chart , Chart-cairo, colour, containers, criterion, Decimal - , dynamic-graph, either, fftwRaw, GLFW-b, mwc-random, OpenGL + , dynamic-graph, fftwRaw, GLFW-b, mwc-random, OpenGL , optparse-applicative, pango, pipes, pipes-bytestring , pipes-concurrency, primitive, pulse-simple, QuickCheck, rtlsdr , storable-complex, test-framework, test-framework-quickcheck2 - , time, tuple, vector + , time, transformers, tuple, vector }: mkDerivation { pname = "sdr"; - version = "0.1.0.9"; - sha256 = "0mabbapd1hvf26j1z3mfgpf8qyq7ccvsda57wkscsc6rkw2jaxqd"; + version = "0.1.0.11"; + sha256 = "0gkf7ql1a40vpb4qaivcyygvlykp4whljmhp2jy37bk56zr45yvv"; libraryHaskellDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour - containers Decimal dynamic-graph either fftwRaw GLFW-b mwc-random - OpenGL optparse-applicative pango pipes pipes-bytestring - pipes-concurrency primitive pulse-simple rtlsdr storable-complex - time tuple vector + containers Decimal dynamic-graph fftwRaw GLFW-b mwc-random OpenGL + optparse-applicative pango pipes pipes-bytestring pipes-concurrency + primitive pulse-simple rtlsdr storable-complex time transformers + tuple vector ]; testHaskellDepends = [ base primitive QuickCheck storable-complex test-framework @@ -173199,15 +181772,14 @@ self: { homepage = "http://github.com/ekmett/search/"; description = "Infinite search in finite time with Hilbert's epsilon"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "search-algorithms" = callPackage ({ mkDerivation, base, containers, doctest, hspec }: mkDerivation { pname = "search-algorithms"; - version = "0.2.0"; - sha256 = "1kw8352akwy9646nvr39a3q33hbg2a0dmnlywfcrxnawm9r930vk"; + version = "0.3.0"; + sha256 = "046v424bvfnvf3hw38k9isdn9f05l4jk8k1fb2p3zn5zgb4h77aa"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hspec ]; homepage = "https://github.com/devonhollowood/search-algorithms#readme"; @@ -173414,12 +181986,12 @@ self: { ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }: mkDerivation { pname = "securemem"; - version = "0.1.9"; - sha256 = "0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy"; + version = "0.1.10"; + sha256 = "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j"; libraryHaskellDepends = [ base byteable bytestring ghc-prim memory ]; - homepage = "http://github.com/vincenthz/hs-securemem"; + homepage = "https://github.com/vincenthz/hs-securemem"; description = "abstraction to an auto scrubbing and const time eq, memory chunk"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -173447,25 +182019,45 @@ self: { }: mkDerivation { pname = "selda"; - version = "0.1.11.1"; - sha256 = "0vml5lmhabzps8la9h361bpsj29yq0n7azhvrpdkdmyjvw28svrs"; + version = "0.1.12.1"; + sha256 = "1iq0fnk17qn74vwl8mjv7zr1y90f3x1hwniy0dmg3h0s5clpcqa9"; 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"; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = stdenv.lib.licenses.mit; }) {}; + "selda_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers + }: + mkDerivation { + pname = "selda"; + version = "0.2.0.0"; + sha256 = "1l9ad4d1m0ylfihg0hpfxanxil09c658jl1bmgzn8268akqay9nj"; + libraryHaskellDepends = [ + base bytestring exceptions hashable mtl psqueues text time + unordered-containers + ]; + homepage = "https://selda.link"; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text }: mkDerivation { pname = "selda-postgresql"; - version = "0.1.7.0"; - sha256 = "0smx2hvpdxjcw58zchwmzcqz4xr5m1idv5y5rrj20df190r4l3l2"; + version = "0.1.7.2"; + sha256 = "06z5zrika018433p5l011wxc308zw7l9ilnkgwcykagsnmai4y7z"; + revision = "1"; + editedCabalFile = "08f2xdfpmbwhrwkjaqfmd9k25c3xn3p477d7a1mnnn7kf7328782"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -173482,6 +182074,8 @@ self: { pname = "selda-sqlite"; version = "0.1.6.0"; sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; + revision = "2"; + editedCabalFile = "198pg9i0lfx3fwf7b7cw0x5kial6vbf0dqwh18jnh7na3pyn1jr6"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -173500,7 +182094,6 @@ self: { homepage = "http://nonempty.org/software/haskell-select"; description = "Wrap the select(2) POSIX function"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "selections" = callPackage @@ -173669,20 +182262,20 @@ self: { "semigroupoids" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, Cabal , cabal-doctest, comonad, containers, contravariant, distributive - , doctest, hashable, semigroups, tagged, transformers - , transformers-compat, unordered-containers + , doctest, hashable, semigroups, tagged, template-haskell + , transformers, transformers-compat, unordered-containers }: mkDerivation { pname = "semigroupoids"; - version = "5.2.1"; - sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r"; - revision = "2"; - editedCabalFile = "049j2jl6f5mxqnavi1aadx37j4bk5xksvkxsl43hp4rg7n53p11z"; + version = "5.2.2"; + sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4"; + revision = "3"; + editedCabalFile = "1k7iq54rkiqrx5kdcc6mc11agqqcnp1hgrw6c6rl3yjybz1vc5y4"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant - distributive hashable semigroups tagged transformers - transformers-compat unordered-containers + distributive hashable semigroups tagged template-haskell + transformers transformers-compat unordered-containers ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/ekmett/semigroupoids"; @@ -173716,8 +182309,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "semigroups"; - version = "0.18.3"; - sha256 = "1jm9wnb5jmwdk4i9qbwfay69ydi76xi0qqi9zqp6wh3jd2c7qa9m"; + version = "0.18.4"; + sha256 = "09sxd17h1kcjsjaf1am2nwpb4vaq8d0q718fbkxwysws691317jq"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/semigroups/"; description = "Anything that associates"; @@ -173738,10 +182331,7 @@ self: { }) {}; "semiring" = callPackage - ({ mkDerivation, base, Boolean, containers, HUnit, monoids - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: + ({ mkDerivation, base, Boolean, containers, monoids }: mkDerivation { pname = "semiring"; version = "0.3"; @@ -173749,10 +182339,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Boolean containers monoids ]; - executableHaskellDepends = [ - base Boolean containers HUnit monoids QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; homepage = "http://github.com/srush/SemiRings/tree/master"; description = "Semirings, ring-like structures used for dynamic programming applications"; license = stdenv.lib.licenses.bsd3; @@ -173797,6 +182383,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semirings" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "semirings"; + version = "0.0.0"; + sha256 = "0dc4vi7zlpvz12b9hvq5b6v621aw84hp331rcbn617gpw7dvflcq"; + doHaddock = false; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "semver" = callPackage ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty , tasty-hunit, text @@ -173819,8 +182416,8 @@ self: { }: mkDerivation { pname = "semver-range"; - version = "0.2.2"; - sha256 = "0rmllgibgyixqq59265qnygxlgp87lp1cfqzlfpzvvwl1kaixds5"; + version = "0.2.7"; + sha256 = "04492jx61yj4vq9bf1jg3xnviy22wb03d1kf358dy7w6xx1zzlfc"; libraryHaskellDepends = [ base classy-prelude parsec text unordered-containers ]; @@ -173860,6 +182457,23 @@ self: { homepage = "https://owainlewis.com"; description = "Sengrid API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "sendgrid-v3" = callPackage + ({ mkDerivation, aeson, base, lens, semigroups, tasty, tasty-hunit + , text, wreq + }: + mkDerivation { + pname = "sendgrid-v3"; + version = "0.1.0.0"; + sha256 = "0sn1a47155d13w15jjbcbcl5sqnl286mf8q7k39qhir98qlq045s"; + libraryHaskellDepends = [ aeson base lens semigroups text wreq ]; + testHaskellDepends = [ base semigroups tasty tasty-hunit text ]; + homepage = "https://github.com/marcelbuesing/sendgrid-v3"; + description = "Sendgrid v3 API library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sensei" = callPackage @@ -173870,8 +182484,8 @@ self: { }: mkDerivation { pname = "sensei"; - version = "0.3.0"; - sha256 = "0ya5pb7plr3qgh2vh8yqffwcb6alk2k581wv3yfp0zwxpflwppvh"; + version = "0.4.0"; + sha256 = "18p3hrc0av30ri678rgzdarp5m3qpia0y1nc6rb8zzvs0cspmfvd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173888,7 +182502,6 @@ self: { homepage = "https://github.com/hspec/sensei#readme"; description = "Automatically run Hspec tests on file modifications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sensenet" = callPackage @@ -173913,38 +182526,40 @@ self: { "sensu-run" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client , http-types, lens, network, optparse-applicative, process - , temporary, text, time, unix, vector, wreq + , temporary, text, time, unix, unix-compat, vector, wreq }: mkDerivation { pname = "sensu-run"; - version = "0.2.0"; - sha256 = "066pi6smcvffs7gsl1l45r2dshkw570p6h4s4nwsp5skf6k3568r"; + version = "0.4.0.5"; + sha256 = "0mmpfxc4vzcz1714fgskbjkrfb9bxh6wjcpd66cwbkb9d8nsa0f7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring filepath http-client http-types lens network - optparse-applicative process temporary text time unix vector wreq + optparse-applicative process temporary text time unix unix-compat + 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; }) {}; - "sensu-run_0_4_0_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, http-client - , http-types, lens, network, optparse-applicative, process - , temporary, text, time, unix, unix-compat, vector, wreq + "sensu-run_0_5_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, filepath + , http-client, http-client-tls, http-types, lens, network + , optparse-applicative, process, temporary, text, time, unix + , unix-compat, vector, wreq }: mkDerivation { pname = "sensu-run"; - version = "0.4.0.2"; - sha256 = "1hsl9p9gzbjlalnrlbia7bvi2rs159d3h5mv5zzi81c20y5ybkjk"; + version = "0.5.0"; + sha256 = "0826al67dwzdyazqkvrcsbxdv6gg6zk52q32avfz7l8dlpswgr9m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring filepath http-client http-types lens network - optparse-applicative process temporary text time unix unix-compat - vector wreq + aeson async base bytestring filepath http-client http-client-tls + http-types lens network optparse-applicative process temporary text + time unix unix-compat vector wreq ]; homepage = "https://github.com/maoe/sensu-run#readme"; description = "A tool to send command execution results to Sensu"; @@ -173967,6 +182582,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sentiwordnet-parser" = callPackage + ({ mkDerivation, base, Decimal, hashable, parsers, safe + , string-class, text, trifecta, unordered-containers, vector + }: + mkDerivation { + pname = "sentiwordnet-parser"; + version = "0.2.0.0"; + sha256 = "0gbzzrd5wivxrcha8w0ncgqz7qr29f4aclz4i7z607lz2lywrifm"; + libraryHaskellDepends = [ + base Decimal hashable parsers safe string-class text trifecta + unordered-containers vector + ]; + homepage = "https://github.com/k-bx/sentiwordnet-parser#readme"; + description = "Parser for the SentiWordNet tab-separated file"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sentry" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal, cmdargs , directory, filepath, old-locale, old-time, process, safecopy @@ -174001,14 +182633,15 @@ self: { }) {}; "separated" = callPackage - ({ mkDerivation, base, bifunctors, deriving-compat, directory - , doctest, filepath, lens, parsec, QuickCheck, semigroupoids - , semigroups, template-haskell + ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest + , deriving-compat, directory, doctest, filepath, lens, parsec + , QuickCheck, semigroupoids, semigroups, template-haskell }: mkDerivation { pname = "separated"; - version = "0.3.0"; - sha256 = "1ivgx1iaqs4k4zj4n0l92090zvx9x46j6kp56zf60b1bn9s3fcs0"; + version = "0.3.2.1"; + sha256 = "0xnpxaz9qr2qqg7kmgv1qsbd4943r54m1vva3xivn4cxf1gnxcaw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors deriving-compat lens semigroupoids semigroups ]; @@ -174018,6 +182651,7 @@ self: { homepage = "https://github.com/qfpl/separated"; description = "A data type with elements separated by values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqaid" = callPackage @@ -174151,7 +182785,7 @@ self: { attoparsec base biocore bytestring cmdtheline conduit conduit-extra filepath hashable iteratee lifted-base monads-tf pretty QuickCheck random resourcet seqloc transformers transformers-base - unordered-containers vector + unordered-containers ]; testHaskellDepends = [ attoparsec base biocore bytestring conduit conduit-extra directory @@ -174188,7 +182822,6 @@ self: { libraryHaskellDepends = [ base bytestring containers ghc transformers ]; - executableHaskellDepends = [ base bytestring containers ]; homepage = "https://github.com/lukemaurer/sequent-core"; description = "Alternative Core language for GHC plugins"; license = stdenv.lib.licenses.bsd3; @@ -174283,33 +182916,34 @@ self: { ({ mkDerivation, aeson, array, base, base16-bytestring , base64-bytestring, binary, bytestring, cborg, cereal , cereal-vector, containers, criterion, deepseq, directory - , filepath, ghc-prim, half, hashable, old-locale, pretty, primitive - , QuickCheck, quickcheck-instances, scientific, store, tar, tasty - , tasty-hunit, tasty-quickcheck, text, time, unordered-containers - , vector, zlib + , filepath, ghc-prim, half, hashable, pretty, primitive, QuickCheck + , quickcheck-instances, scientific, store, tar, tasty, tasty-hunit + , tasty-quickcheck, text, time, unordered-containers, vector, zlib }: mkDerivation { pname = "serialise"; - version = "0.1.0.0"; - sha256 = "1a28rhnhfgpkpgr9a5c5fvpfj28mfx716kb6rlhziwkm1y675iw3"; + version = "0.2.0.0"; + sha256 = "1iqkawxy946dhldam30cc1k9h4g2w4cp34fg57ln9k7507mvcns0"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable - old-locale primitive text time unordered-containers vector + primitive text time unordered-containers vector ]; testHaskellDepends = [ aeson array base base16-bytestring base64-bytestring binary bytestring cborg containers deepseq directory filepath ghc-prim - half hashable QuickCheck quickcheck-instances scientific tasty - tasty-hunit tasty-quickcheck text time unordered-containers vector + half hashable primitive QuickCheck quickcheck-instances scientific + tasty tasty-hunit tasty-quickcheck text time unordered-containers + vector ]; benchmarkHaskellDepends = [ aeson array base binary bytestring cborg cereal cereal-vector containers criterion deepseq directory filepath ghc-prim half - old-locale pretty store tar text time vector zlib + pretty store tar text time vector zlib ]; homepage = "https://github.com/well-typed/cborg"; description = "A binary serialisation library for Haskell values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serialize-instances" = callPackage @@ -174327,6 +182961,7 @@ self: { ]; description = "Instances for Serialize of cereal"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serialport" = callPackage @@ -174343,32 +182978,33 @@ self: { }) {}; "serokell-util" = callPackage - ({ mkDerivation, acid-state, aeson, ansi-terminal, base - , base16-bytestring, base64-bytestring, bytestring, clock - , containers, deepseq, directory, exceptions, extra, filepath - , formatting, hashable, hspec, lens, log-warper, monad-control, mtl - , optparse-applicative, parsec, QuickCheck, quickcheck-instances - , safecopy, scientific, semigroups, stm, template-haskell, text - , text-format, time-units, transformers, universum + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , base64-bytestring, bytestring, clock, containers, deepseq + , directory, exceptions, extra, filepath, fmt, formatting, hashable + , hspec, hspec-discover, lens, log-warper, monad-control, mtl + , o-clock, optparse-applicative, parsec, QuickCheck + , quickcheck-instances, safecopy, scientific, semigroups, stm + , template-haskell, text, text-format, transformers, universum , unordered-containers, vector, yaml }: mkDerivation { pname = "serokell-util"; - version = "0.5.0"; - sha256 = "0z460j5k1h74y1v0b7lwdw08qdp5c8ayvsvfa17xdhpb0p8dzriw"; - libraryHaskellDepends = [ - acid-state aeson ansi-terminal base base16-bytestring - base64-bytestring bytestring clock containers deepseq directory - exceptions extra filepath formatting hashable lens log-warper - monad-control mtl optparse-applicative parsec QuickCheck - quickcheck-instances safecopy scientific semigroups stm - template-haskell text text-format time-units transformers universum - unordered-containers vector yaml + version = "0.8.0"; + sha256 = "0v8vy66pbb37w7vaal42w8z0dld93j3d0bfpp3gc8mkmv12gh49p"; + libraryHaskellDepends = [ + aeson ansi-terminal base base16-bytestring base64-bytestring + bytestring clock containers deepseq directory exceptions extra + filepath fmt formatting hashable lens log-warper monad-control mtl + o-clock optparse-applicative parsec QuickCheck quickcheck-instances + scientific semigroups stm template-haskell text text-format + transformers universum unordered-containers vector yaml ]; testHaskellDepends = [ aeson base bytestring hspec QuickCheck quickcheck-instances - safecopy scientific text text-format unordered-containers vector + safecopy scientific text text-format universum unordered-containers + vector ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/serokell/serokell-util"; description = "General-purpose functions by Serokell"; license = stdenv.lib.licenses.mit; @@ -174438,63 +183074,31 @@ self: { "servant" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat - , 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 + , bytestring, Cabal, cabal-doctest, case-insensitive, doctest + , hspec, hspec-discover, http-api-data, http-media, http-types + , mmorph, mtl, natural-transformation, network-uri, QuickCheck + , quickcheck-instances, singleton-bool, string-conversions, tagged + , text, vault }: mkDerivation { pname = "servant"; - version = "0.11"; - sha256 = "00vbhijdxb00n8ha068zdwvqlfqv1iradkkdchzzvnhg2jpzgcy5"; - revision = "2"; - editedCabalFile = "1b5zxz1cqf0n2y1jfvb1rsza95hdyhn9fc6fl73bxr5m9apv511z"; - 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 tagged text - vault - ]; - testHaskellDepends = [ - aeson aeson-compat attoparsec base base-compat bytestring directory - doctest filemanip filepath hspec QuickCheck quickcheck-instances - string-conversions text url - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant_0_12" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat - , 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.12"; - sha256 = "0h8xjidjjq1bzp4grcndpybp3migka5qzgyx1sxpps28gndmbz89"; + version = "0.13.0.1"; + sha256 = "0vfypxdhz1yqkj6ini41ylas91jklvn05rrnarp4d57rli498jx7"; 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 tagged text - vault + natural-transformation network-uri singleton-bool + string-conversions tagged text vault ]; testHaskellDepends = [ - aeson aeson-compat attoparsec base base-compat bytestring directory - doctest filemanip filepath hspec QuickCheck quickcheck-instances - string-conversions text url + aeson aeson-compat attoparsec base base-compat bytestring doctest + hspec QuickCheck quickcheck-instances string-conversions text ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-JuicyPixels" = callPackage @@ -174526,8 +183130,8 @@ self: { }: mkDerivation { pname = "servant-aeson-specs"; - version = "0.5.2.0"; - sha256 = "1pgj44hi9akj7irrbzr6f96pih7g9pb35jrhnwx4483rgj4ywa17"; + version = "0.6.1.0"; + sha256 = "0246bdrcy0rq0jyba2c945hlz8csaff9zakv0g5qpzylsc5dnwmd"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random @@ -174549,24 +183153,25 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "servant-auth"; - version = "0.3.0.1"; - sha256 = "1nd7wfkkwwpl7iq3d6vx2nizqsxxh5v030rjpy61phhd7jxgmbyb"; + version = "0.3.1.0"; + sha256 = "0fa8r5rwrihsadzv74npb16yfvw3lzn3faajw660n5vxz36l56ia"; libraryHaskellDepends = [ base ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "Authentication combinators for servant"; license = stdenv.lib.licenses.bsd3; }) {}; "servant-auth-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec - , http-client, http-types, jose, QuickCheck, servant, servant-auth - , servant-auth-server, servant-client, servant-client-core - , servant-server, text, time, transformers, wai, warp + , hspec-discover, http-client, http-types, jose, QuickCheck + , servant, servant-auth, servant-auth-server, servant-client + , servant-client-core, servant-server, text, time, transformers + , wai, warp }: mkDerivation { pname = "servant-auth-client"; - version = "0.3.1.0"; - sha256 = "0kinczwmr32zasjb3f7csbiv865r4vz7yf6ga4j1yk857zx4zdys"; + version = "0.3.2.0"; + sha256 = "1504cdqcq6fzr8f483662xdxcp99fpsxbizva1gqk248ymrxi2i5"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core text @@ -174576,42 +183181,14 @@ self: { servant servant-auth servant-auth-server servant-client servant-server time transformers wai warp ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-client/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-cookie" = 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; - }) {}; - - "servant-auth-cookie_0_6_0" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , cereal, cereal-time, cookie, criterion, cryptonite, data-default , deepseq, exceptions, hspec, http-api-data, http-types, memory @@ -174620,8 +183197,8 @@ self: { }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.6.0"; - sha256 = "04pyy8534hnwwa5z423d6p5j2d5mzwbgls2q11hcma35nkz8y0xw"; + version = "0.6.0.3"; + sha256 = "12cwqvva4f2kricvwq645f5c759pjz4w2b9yhx9iz7agc95ghkv0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174643,14 +183220,14 @@ self: { }) {}; "servant-auth-docs" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec, lens - , QuickCheck, servant, servant-auth, servant-docs, template-haskell - , text + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-docs, template-haskell, text }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.8.0"; - sha256 = "1qw0mf3cg8iljynxd7qidxv8m6h41sygh0v6512d3gv6cgkqc5yj"; + version = "0.2.9.0"; + sha256 = "173gmbgyka6hg6hgchkaw96wv4nb7qr3qwypym520k6zi7cn8b9l"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -174659,10 +183236,10 @@ self: { base doctest hspec lens QuickCheck servant servant-auth servant-docs template-haskell text ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-hmac" = callPackage @@ -174704,15 +183281,16 @@ self: { "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, tagged - , text, time, transformers, unordered-containers, wai, warp, wreq + , crypto-api, data-default-class, entropy, hspec, hspec-discover + , http-api-data, http-client, http-types, jose, lens, lens-aeson + , markdown-unlit, monad-time, mtl, QuickCheck, servant-auth + , servant-server, tagged, text, time, transformers + , unordered-containers, wai, warp, wreq }: mkDerivation { pname = "servant-auth-server"; - version = "0.3.1.0"; - sha256 = "1mx8yp7nabnh9ymm6sd5xrb0x8qkx075h5pz7i5fd63k2axi8kbb"; + version = "0.3.2.0"; + sha256 = "1ykjjd1lqivavsxdg8akj9vfh4miblslcwdyhlrgz2ci2f31wify"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174731,20 +183309,21 @@ self: { jose lens lens-aeson mtl QuickCheck servant-server time wai warp wreq ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-swagger" = callPackage - ({ mkDerivation, base, hspec, lens, QuickCheck, servant - , servant-auth, servant-swagger, swagger2, text + ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck + , servant, servant-auth, servant-swagger, swagger2, text }: mkDerivation { pname = "servant-auth-swagger"; - version = "0.2.8.0"; - sha256 = "0g2dyjj401qlpmxf0gk6lvqv5qivyxjp9r3navn0r0c9xf0b513r"; + version = "0.2.9.0"; + sha256 = "10vldaywdjshb21ifw418i68i2nnvm0l89plyk7hkf7br2qnfwjc"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -174752,10 +183331,10 @@ self: { base hspec lens QuickCheck servant servant-auth servant-swagger swagger2 text ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-swagger/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token" = callPackage @@ -174765,8 +183344,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.5.0.0"; - sha256 = "1ivlc7ivn4rn2appxyv2cgn4s812s82d3a8q9ykfy1yhpjygk9hp"; + version = "0.5.3.0"; + sha256 = "04zg9a2brpca39gx0hk1s2mnccw8d5n3gxd082w31f3axji6rm3a"; libraryHaskellDepends = [ aeson-injector base bytestring containers http-api-data mtl pwstore-fast servant servant-auth-token-api servant-server text @@ -174786,8 +183365,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.5.0.0"; - sha256 = "1hvslg23l43k6wz6z84xcm3sv0lxgnvcsrx7z8493zyav9lnlx6h"; + version = "0.5.3.0"; + sha256 = "1fwzsx13lvqaaxh8cfs7zi8l2a0c7kgz8gnnwgssrasnk27jsc20"; libraryHaskellDepends = [ acid-state aeson-injector base bytestring containers ghc-prim monad-control mtl safe safecopy servant-auth-token @@ -174806,8 +183385,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.4.2.2"; - sha256 = "0dnaqhri1hg1c3gmlpnpyk21q4cq9j513fnd3g1m9k7mkc6h6bgv"; + version = "0.5.2.0"; + sha256 = "1cb04lcqlb0iw729l97dm3xxxhwzinlsf4ipgda2dix8j29v7h5b"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -174826,8 +183405,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-leveldb"; - version = "0.5.0.0"; - sha256 = "1v1h9jpc9ypdd6sfcb9w4lhv2ldsnlcpmmsghbdky50vqmq1y8qj"; + version = "0.5.3.0"; + sha256 = "0jj7px9w67d2kmcvap02ccmw6y4x9fz1mmwndhb4rjxyr1kkwkja"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens leveldb-haskell monad-control mtl resourcet safe @@ -174849,8 +183428,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-persistent"; - version = "0.6.0.0"; - sha256 = "18y9g9pfzbhv35pfcr4973h320p8ify8nf4vllcdv83whfm48bc1"; + version = "0.6.3.0"; + sha256 = "1rxcmccfj0rirjngqm3p5azrwlrcf8bfr3fm7m046b6w031cfh9y"; libraryHaskellDepends = [ aeson-injector base bytestring containers monad-control mtl persistent persistent-template servant-auth-token @@ -174872,8 +183451,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-rocksdb"; - version = "0.5.0.0"; - sha256 = "0cr8qgkv89sps6ykv0v1bng2xk4g7r00fjnmgjp58kpc18pvg4vl"; + version = "0.5.3.0"; + sha256 = "01nx1aj15kjg9g2k5vl0b0zrvih951sm06qybl28mm97kgcdiam1"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens monad-control mtl resourcet rocksdb-haskell safe @@ -174888,14 +183467,15 @@ self: { }) {}; "servant-blaze" = callPackage - ({ mkDerivation, base, blaze-html, http-media, servant }: + ({ mkDerivation, base, blaze-html, http-media, servant + , servant-server, wai, warp + }: mkDerivation { pname = "servant-blaze"; - version = "0.7.1"; - sha256 = "0ii60xn5khsj8w3glvwqpwrpd6v9yc1n52gk9qsfwfxq49x1rvch"; - revision = "6"; - editedCabalFile = "051m44rqmxkl30n96qcbz1xwwsw2n7l7laflnc0xydc40ws0bj96"; + version = "0.8"; + sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6"; libraryHaskellDepends = [ base blaze-html http-media servant ]; + testHaskellDepends = [ base blaze-html servant-server wai warp ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Blaze-html support for servant"; license = stdenv.lib.licenses.bsd3; @@ -174903,49 +183483,47 @@ self: { "servant-cassava" = callPackage ({ mkDerivation, base, base-compat, bytestring, cassava, http-media - , servant, vector + , servant, servant-server, vector, wai, warp }: mkDerivation { pname = "servant-cassava"; - version = "0.9"; - sha256 = "08g1yjrfx2q79r0ldjnxr05437bg889virfy52i3s66d5h69d9q3"; + version = "0.10"; + sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; revision = "2"; - editedCabalFile = "1whcfyncvnjsf3iarpzk60q2f1srail41mjgf31hg6xahhjgqg3m"; + editedCabalFile = "11f5azqs007dfk5zr6sa43cri809k7jlf680gf3d7zcwhlf3xiq4"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; + testHaskellDepends = [ + base base-compat bytestring cassava http-media servant + servant-server wai warp + ]; 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-api-data, http-client, http-media - , natural-transformation, optparse-applicative, profunctors - , servant, servant-client, servant-docs, servant-server, tagged - , tasty, tasty-hspec, tasty-hunit, text, wai, warp + , hspec-wai, http-media, http-types, profunctors, servant + , servant-client, servant-client-core, servant-docs, servant-server + , tagged, tasty, tasty-hspec, tasty-hunit, text, wai }: mkDerivation { pname = "servant-checked-exceptions"; - version = "0.4.1.0"; - sha256 = "19h0vywlh6b41mdjpka4b7rz4l6gxmjlvji8nzbgkllsjgr81g3g"; - revision = "1"; - editedCabalFile = "07srldxvgzgzxq5dik787ays7xylwsdmz8bv3ffvp435nvvpmrzr"; + version = "1.1.0.0"; + sha256 = "1zvpha9czj4pnvdd53qcyl609x3w1hkaqxva7hk68bk65zd296jk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring deepseq http-media profunctors servant - servant-client servant-docs servant-server tagged text - ]; - executableHaskellDepends = [ - aeson base http-api-data http-client natural-transformation - optparse-applicative servant servant-client servant-docs - servant-server text wai warp + aeson base bytestring deepseq http-media http-types profunctors + servant servant-client servant-client-core servant-docs + servant-server tagged text wai ]; testHaskellDepends = [ - base bytestring doctest Glob hspec-wai servant servant-server tasty - tasty-hspec tasty-hunit wai + base bytestring doctest Glob hspec-wai http-types servant + servant-server tasty tasty-hspec tasty-hunit wai ]; homepage = "https://github.com/cdepillabout/servant-checked-exceptions"; description = "Checked exceptions for Servant APIs"; @@ -174953,54 +183531,22 @@ self: { }) {}; "servant-client" = 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 - , http-types, HUnit, monad-control, mtl, network, network-uri - , QuickCheck, safe, semigroupoids, servant, servant-server - , string-conversions, text, transformers, transformers-base - , transformers-compat, wai, warp - }: - mkDerivation { - pname = "servant-client"; - version = "0.11"; - sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga"; - revision = "2"; - editedCabalFile = "0w3b3036rv9vfya5ayn9z70rkwk7hd9zisl7klgxzk4fgfmc3sgd"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat base64-bytestring bytestring - exceptions generics-sop http-api-data http-client http-client-tls - http-media http-types monad-control mtl network-uri safe - semigroupoids servant string-conversions text transformers - transformers-base transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring deepseq generics-sop hspec - http-api-data http-client http-media http-types HUnit mtl network - QuickCheck servant servant-server text transformers - transformers-compat wai warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "automatical derivation of querying functions for servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client_0_12_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , containers, deepseq, exceptions, generics-sop, hspec - , http-api-data, http-client, http-client-tls, http-media - , http-types, HUnit, monad-control, mtl, network, QuickCheck - , semigroupoids, servant, servant-client-core, servant-server, text - , transformers, transformers-base, transformers-compat, wai, warp + , hspec-discover, http-api-data, http-client, http-client-tls + , http-media, http-types, HUnit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, stm, text, time, transformers, transformers-base + , transformers-compat, wai, warp }: mkDerivation { pname = "servant-client"; - version = "0.12.0.1"; - sha256 = "12apsxsxqxc9xxcpn6l4y69x3q22407gni3ixxa7c0afcr5jnani"; + version = "0.13.0.1"; + sha256 = "120qs135arlby811p9z6zqjyrhsm517dq1xq41x3s2f167zkd7q8"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions http-client http-client-tls http-media http-types monad-control mtl - semigroupoids servant-client-core text transformers + semigroupoids servant-client-core stm text time transformers transformers-base transformers-compat ]; testHaskellDepends = [ @@ -175009,28 +183555,29 @@ self: { network QuickCheck servant servant-client-core servant-server text transformers transformers-compat wai warp ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-client-core" = callPackage ({ mkDerivation, base, base-compat, base64-bytestring, bytestring , containers, deepseq, exceptions, generics-sop, hspec - , http-api-data, http-media, http-types, mtl, network-uri - , QuickCheck, safe, servant, text + , hspec-discover, http-api-data, http-media, http-types, mtl + , network-uri, QuickCheck, safe, servant, text }: mkDerivation { pname = "servant-client-core"; - version = "0.12"; - sha256 = "0wb36sgirhyfqa32zjs6gz3fwzcim6qvhb6w6a3anpi2nlfaq355"; + version = "0.13.0.1"; + sha256 = "0fr5lb5ra0nzjay9rm3xyyc01ijqxwr9wa0yxsjx1vippfnbds70"; libraryHaskellDepends = [ base base-compat base64-bytestring bytestring containers exceptions generics-sop http-api-data http-media http-types mtl network-uri safe servant text ]; testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Core functionality and class for client function generation for servant APIs"; license = stdenv.lib.licenses.bsd3; @@ -175086,10 +183633,6 @@ self: { base bytestring containers postgresql-query postgresql-simple servant servant-db text ]; - executableHaskellDepends = [ - base bytestring monad-logger postgresql-query servant-db time - transformers-base - ]; testHaskellDepends = [ base bytestring derive hspec HUnit monad-logger optparse-applicative postgresql-query QuickCheck @@ -175104,41 +183647,15 @@ self: { "servant-docs" = 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 - , unordered-containers + , hspec-discover, http-media, http-types, lens, servant + , string-conversions, text, unordered-containers }: mkDerivation { pname = "servant-docs"; - version = "0.11"; - sha256 = "02bzp1bcvc54cx0kcnnsqqiva7rwbrn46a7gdxzqqiqrmm0a0fm0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring case-insensitive - control-monad-omega hashable http-media http-types lens servant - string-conversions text unordered-containers - ]; - executableHaskellDepends = [ - aeson base lens servant string-conversions text - ]; - testHaskellDepends = [ - aeson base hspec lens servant string-conversions - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "generate API docs for your servant webservice"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-docs_0_11_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 - , unordered-containers - }: - mkDerivation { - pname = "servant-docs"; - version = "0.11.1"; - sha256 = "1i2680jzgrlcajxmakcg1hvddkbx6fbz4vvrbz0ca660hil2vlb2"; + version = "0.11.2"; + sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b"; + revision = "2"; + editedCabalFile = "17nv36pm0vv0lgfyk5ay65h7i5bdfq48n0npawcvmqfjsls61xs4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175152,10 +183669,10 @@ self: { testHaskellDepends = [ aeson base hspec lens servant string-conversions ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-ede" = callPackage @@ -175180,6 +183697,7 @@ self: { homepage = "http://github.com/alpmestan/servant-ede"; description = "Combinators for rendering EDE templates in servant web applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-ekg" = callPackage @@ -175209,9 +183727,8 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, Diff, directory, elm-export, hspec - , HUnit, interpolate, lens, mockery, process, servant - , servant-foreign, text, wl-pprint-text + ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens + , servant, servant-foreign, text, wl-pprint-text }: mkDerivation { pname = "servant-elm"; @@ -175222,14 +183739,35 @@ self: { libraryHaskellDepends = [ base elm-export lens servant servant-foreign text wl-pprint-text ]; - executableHaskellDepends = [ base elm-export servant text ]; testHaskellDepends = [ - aeson base Diff directory elm-export hspec HUnit interpolate - mockery process servant text + aeson base Diff elm-export hspec HUnit servant text + ]; + homepage = "http://github.com/mattjbray/servant-elm#readme"; + description = "Automatically derive Elm functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-elm_0_5_0_0" = callPackage + ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens + , servant, servant-foreign, text, wl-pprint-text + }: + mkDerivation { + pname = "servant-elm"; + version = "0.5.0.0"; + sha256 = "0l5rjml46qbnq4p3d7zjk8zl9gnpz8m5n6n8yf8kgy89ybm6xnfr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base elm-export lens servant servant-foreign text wl-pprint-text + ]; + testHaskellDepends = [ + aeson base Diff elm-export hspec HUnit servant text ]; homepage = "http://github.com/mattjbray/servant-elm#readme"; description = "Automatically derive Elm functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-examples" = callPackage @@ -175256,39 +183794,84 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-exceptions" = callPackage + ({ mkDerivation, aeson, base, exceptions, http-media, http-types + , mtl, servant, servant-server, text, wai, warp + }: + mkDerivation { + pname = "servant-exceptions"; + version = "0.1.1"; + sha256 = "1qdb6ins7l0ryyrmg9j5pw428rlhkmzpbq5jqawfn01j8vf9yav5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base exceptions http-media http-types mtl servant + servant-server text wai + ]; + executableHaskellDepends = [ + aeson base exceptions http-types servant-server text warp + ]; + homepage = "https://github.com/ch1bo/servant-exceptions#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-flatten" = callPackage + ({ mkDerivation, base, servant }: + mkDerivation { + pname = "servant-flatten"; + version = "0.2"; + sha256 = "0j8dv8010yr63sl3ks0an64ry53ajc2xd47vpd6i1svhb9b6l79i"; + libraryHaskellDepends = [ base servant ]; + homepage = "https://github.com/alpmestan/servant-flatten"; + description = "Utilities for flattening servant API types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-foreign" = callPackage - ({ mkDerivation, base, hspec, http-types, lens, servant, text }: + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , http-types, lens, servant, text + }: mkDerivation { pname = "servant-foreign"; - version = "0.10.1"; - sha256 = "1j69mv1i6q5z790asbj0n24h62biz3dlnm2zrxnmwn4k4aygbwl8"; - libraryHaskellDepends = [ base http-types lens servant text ]; + version = "0.11.1"; + sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735"; + revision = "1"; + editedCabalFile = "1g9631l7cw0kgnsidi943fnzkvddjnm3vgm11ha5vh10pczvn6rb"; + libraryHaskellDepends = [ + base base-compat http-types lens servant text + ]; testHaskellDepends = [ base hspec servant ]; + testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; }) {}; - "servant-foreign_0_10_2" = callPackage - ({ mkDerivation, base, hspec, http-types, lens, servant, text }: + "servant-generate" = callPackage + ({ mkDerivation, base, servant, servant-server }: mkDerivation { - pname = "servant-foreign"; - version = "0.10.2"; - sha256 = "16r42df628jsw9khv5kjwb702ajwmxg4kya19acm10660c0gxygs"; - libraryHaskellDepends = [ base http-types lens servant text ]; - testHaskellDepends = [ base hspec servant ]; - description = "Helpers for generating clients for servant APIs in any programming language"; + pname = "servant-generate"; + version = "0.1"; + sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw"; + revision = "1"; + editedCabalFile = "1viavg5pijjsdcmmdi7ibr9cvfz3r3b646jxxvmya10ss3zvlzh4"; + libraryHaskellDepends = [ base servant servant-server ]; + homepage = "https://github.com/alpmestan/servant-generate"; + description = "Utilities for generating mock server implementations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-generic" = callPackage - ({ mkDerivation, base, servant, servant-server, text, warp }: + ({ mkDerivation, base, network-uri, servant, servant-server, text + , warp + }: mkDerivation { pname = "servant-generic"; - version = "0.1.0.0"; - sha256 = "03gh879j9qdm666lvl2j2xiqyrgclfg2k4f1l4lslby5y81r4lv6"; + version = "0.1.0.1"; + sha256 = "1zgw5j3wx4fyb9nhifslzsbfla3iagkvix86vb1x3d9fyz117wif"; libraryHaskellDepends = [ base servant servant-server ]; - testHaskellDepends = [ base servant servant-server text warp ]; + testHaskellDepends = [ + base network-uri servant servant-server text warp + ]; description = "Specify Servant APIs with records"; license = stdenv.lib.licenses.mit; }) {}; @@ -175320,20 +183903,21 @@ self: { "servant-github-webhook" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, github, http-types, memory, servant, servant-server - , string-conversions, text, transformers, wai, warp + , cryptonite, github, github-webhooks, http-types, memory, servant + , servant-server, string-conversions, text, transformers + , unordered-containers, wai, warp }: mkDerivation { pname = "servant-github-webhook"; - version = "0.3.1.0"; - sha256 = "0px2pxw6piqjh2vawf0mkhcf96pqk2rm0izvbsy5xcd011qlvfhq"; + version = "0.4.1.0"; + sha256 = "0v6gd7swhl58x3sqbb5cmn5ac6x1p5mg7jqbwk9ny9bzggz9pglb"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite github - http-types memory servant servant-server string-conversions text - transformers wai + github-webhooks http-types memory servant servant-server + string-conversions text transformers unordered-containers wai ]; testHaskellDepends = [ - aeson base bytestring servant-server transformers wai warp + aeson base bytestring servant-server text transformers wai warp ]; homepage = "https://github.com/tsani/servant-github-webhook"; description = "Servant combinators to facilitate writing GitHub webhooks"; @@ -175376,18 +183960,20 @@ self: { pname = "servant-iCalendar"; version = "0.1.0.1"; sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; + revision = "1"; + editedCabalFile = "07jib9s2kg6srr1dj3l1bz0sp3fyikkvv7z0v2a62zl1c9z9xapx"; libraryHaskellDepends = [ base data-default http-media iCalendar servant ]; homepage = "https://github.com/fgaz/servant-iCalendar#readme"; description = "Servant support for iCalendar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-jquery" = callPackage - ({ mkDerivation, aeson, base, charset, filepath, hspec - , hspec-expectations, language-ecmascript, lens, servant - , servant-server, stm, text, transformers, warp + ({ mkDerivation, base, charset, hspec, hspec-expectations + , language-ecmascript, lens, servant, text }: mkDerivation { pname = "servant-jquery"; @@ -175396,9 +183982,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base charset lens servant text ]; - executableHaskellDepends = [ - aeson base filepath servant servant-server stm transformers warp - ]; testHaskellDepends = [ base hspec hspec-expectations language-ecmascript lens servant ]; @@ -175409,28 +183992,26 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec + ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, servant-server, stm, text, transformers - , warp + , servant, servant-foreign, text }: mkDerivation { pname = "servant-js"; - version = "0.9.3.1"; - sha256 = "01an3s6xnjng7vwzha658hcf3n28v99dviindqq0qv7dbrf3r1ri"; + version = "0.9.3.2"; + sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02"; + revision = "1"; + editedCabalFile = "11q54f0hx8ggfsrklaf8dk1gra597097gl60j667bmy8266l33ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat charset lens servant servant-foreign text ]; - executableHaskellDepends = [ - aeson base filepath lens servant servant-server stm transformers - warp - ]; testHaskellDepends = [ base base-compat hspec hspec-expectations language-ecmascript lens QuickCheck servant text ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; @@ -175443,8 +184024,8 @@ self: { }: mkDerivation { pname = "servant-kotlin"; - version = "0.1.0.1"; - sha256 = "1bv6chggrpil6332nal8blnchnn6ahiblcf5q7syray7wkkmgpjk"; + version = "0.1.1.0"; + sha256 = "14z1vf4mj041ydps7nyfs0bmdpq0vb18xfscsq3i1f5hfr9swj50"; libraryHaskellDepends = [ base containers directory formatting lens servant servant-foreign text time wl-pprint-text @@ -175463,19 +184044,38 @@ self: { }) {}; "servant-lucid" = callPackage - ({ mkDerivation, base, http-media, lucid, servant }: + ({ mkDerivation, base, http-media, lucid, servant, servant-server + , wai, warp + }: mkDerivation { pname = "servant-lucid"; - version = "0.7.1"; - sha256 = "0h7yw140ymigrzrzp2vkkhg13gg1d8pj9xmcpq8bw2cv2myvl9pc"; - revision = "6"; - editedCabalFile = "0bz3j6xjig6qj7qwkvzv9kqvivd6qvz0kn42lpwg1kcf1j6w31mc"; + version = "0.8"; + sha256 = "0vkhh6n51672l3cvd64xdddnzr351j9hd80j7raqkq6k1wrygfi5"; libraryHaskellDepends = [ base http-media lucid servant ]; + testHaskellDepends = [ base lucid servant-server wai warp ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant support for lucid"; license = stdenv.lib.licenses.bsd3; }) {}; + "servant-match" = callPackage + ({ mkDerivation, base, bytestring, hspec, http-types, network-uri + , servant, text, utf8-string + }: + mkDerivation { + pname = "servant-match"; + version = "0.1.1"; + sha256 = "1jh817sflbkqmv38rpd20jfz5nbpyxz1n0gqx7446n745jnc2ga0"; + libraryHaskellDepends = [ + base bytestring http-types network-uri servant text utf8-string + ]; + testHaskellDepends = [ base hspec network-uri servant text ]; + homepage = "https://github.com/cocreature/servant-match#readme"; + description = "Standalone implementation of servant’s dispatching mechanism"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-matrix-param" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , hspec, http-client, http-types, servant, servant-aeson-specs @@ -175498,19 +184098,22 @@ self: { }) {}; "servant-mock" = callPackage - ({ mkDerivation, aeson, base, bytestring, bytestring-conversion - , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server - , transformers, wai, warp + ({ mkDerivation, aeson, base, base-compat, bytestring + , bytestring-conversion, hspec, hspec-discover, hspec-wai + , http-types, QuickCheck, servant, servant-server, transformers + , wai, warp }: mkDerivation { pname = "servant-mock"; - version = "0.8.3"; - sha256 = "0fwkygv4rx98qys8apj7aby4xhssgzqdgsxmb6vh4ky71vjq0q5m"; + version = "0.8.4"; + sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr"; + revision = "1"; + editedCabalFile = "0izm1slx384cgfaf16r3w1h6cqpssahphb9b0ccy2m04ysgy7chp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring http-types QuickCheck servant servant-server - transformers wai + base base-compat bytestring http-types QuickCheck servant + servant-server transformers wai ]; executableHaskellDepends = [ aeson base QuickCheck servant-server warp @@ -175519,6 +184122,7 @@ self: { aeson base bytestring-conversion hspec hspec-wai QuickCheck servant servant-server wai ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; @@ -175531,8 +184135,8 @@ self: { }: mkDerivation { pname = "servant-multipart"; - version = "0.11"; - sha256 = "1m3mzqsg09mcdkr88rba2fq4j19kqrgmrq9nd70dwivfqbh5nvpj"; + version = "0.11.1"; + sha256 = "06wnmazi4f2lgk2ziyh0wjnjl5gs88rsb0f6bpphxkv7wy3agv4q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175583,6 +184187,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-pagination" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, safe, servant + , servant-server, text + }: + mkDerivation { + pname = "servant-pagination"; + version = "2.1.0"; + sha256 = "00mbg8sxjwaxa6xjgaahdzjqppc01y6qzph6g5sc40rnp3j8ws2g"; + revision = "1"; + editedCabalFile = "0vb7v8yb1g1aqnnypa2hjsh58q2m9zhgz04dyj1vna1pg4yl3691"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base safe servant servant-server text ]; + testHaskellDepends = [ base hspec QuickCheck servant-server text ]; + homepage = "https://github.com/chordify/haskell-servant-pagination"; + description = "Type-safe pagination for Servant APIs"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, http-media , lens, pandoc-types, servant-docs, string-conversions, text @@ -175590,15 +184213,14 @@ self: { }: mkDerivation { pname = "servant-pandoc"; - version = "0.4.1.4"; - sha256 = "0hsmbrn7i6zbwfw5j2l8qppnjx1cl2g0iksim514ajga6zfjm96j"; + version = "0.5.0.0"; + sha256 = "0qq4ahwl8vc8xgmvbh8qac7751hizgdcbp43gc0kxfs7xpy0kmqj"; libraryHaskellDepends = [ base bytestring case-insensitive http-media lens pandoc-types servant-docs string-conversions text unordered-containers ]; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pool" = callPackage @@ -175634,31 +184256,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-purescript" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, http-types, lens, mainland-pretty, purescript-bridge - , servant, servant-foreign, servant-server, servant-subscriber - , text + "servant-proto-lens" = callPackage + ({ mkDerivation, async, base, bytestring, data-default-class + , http-client, http-media, HUnit, lens, proto-lens + , proto-lens-protobuf-types, servant, servant-client + , servant-server, test-framework, test-framework-hunit, warp }: mkDerivation { - pname = "servant-purescript"; - version = "0.8.0.1"; - sha256 = "12azs60ki6g002p5cz54cg84xr4kwhdf9z1r8bmx99xyvcpxynn5"; + pname = "servant-proto-lens"; + version = "0.1.0.2"; + sha256 = "1p97yp3x8lhdr9z33f0pdaxj1bqjqc36gs54j69laxfq2650v3nx"; libraryHaskellDepends = [ - aeson base bytestring containers directory filepath http-types lens - mainland-pretty purescript-bridge servant servant-foreign - servant-server servant-subscriber text + base bytestring http-media proto-lens servant ]; testHaskellDepends = [ - aeson base containers lens mainland-pretty purescript-bridge - servant servant-foreign servant-subscriber text + async base data-default-class http-client HUnit lens proto-lens + proto-lens-protobuf-types servant-client servant-server + test-framework test-framework-hunit warp ]; - homepage = "https://github.com/eskimor/servant-purescript#readme"; - description = "Generate PureScript accessor functions for you servant API"; + homepage = "https://github.com/plredmond/servant-proto-lens"; + description = "Servant Content-Type for proto-lens protobuf modules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-purescript_0_9_0_1" = callPackage + "servant-purescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, http-types, lens, mainland-pretty, purescript-bridge , servant, servant-foreign, servant-server, servant-subscriber @@ -175666,8 +184288,8 @@ self: { }: mkDerivation { pname = "servant-purescript"; - version = "0.9.0.1"; - sha256 = "11jpgqk1nmwjihghxbfv05fsb6n351822ryh6w08wdz3alsv4zk6"; + version = "0.9.0.2"; + sha256 = "1axj4rar4ncy20xiwa231hc67vpz6yi2vzddq8m6nswmdg6kja7p"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign @@ -175680,7 +184302,6 @@ self: { homepage = "https://github.com/eskimor/servant-purescript#readme"; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pushbullet-client" = callPackage @@ -175691,8 +184312,8 @@ self: { }: mkDerivation { pname = "servant-pushbullet-client"; - version = "0.4.0.0"; - sha256 = "0v2mkriwh7lara66w02kkzwlnr5y8ahb6djpsnhvch1asa5klsnk"; + version = "0.5.0.0"; + sha256 = "1pdqb2kff033zga35n9ycgnw3zb42b5hpap3f4fjkxfbxz5cq3zz"; libraryHaskellDepends = [ aeson base http-api-data http-client http-client-tls microlens microlens-th pushbullet-types scientific servant servant-client @@ -175700,13 +184321,13 @@ self: { ]; description = "Bindings to the Pushbullet API using servant-client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-py" = callPackage - ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring - , charset, filepath, hspec, hspec-expectations, lens, QuickCheck - , servant, servant-blaze, servant-foreign, servant-server, stm - , text, wai, warp + ({ mkDerivation, aeson, base, base-compat, bytestring, charset + , hspec, hspec-expectations, lens, QuickCheck, servant + , servant-foreign, text }: mkDerivation { pname = "servant-py"; @@ -175717,10 +184338,6 @@ self: { libraryHaskellDepends = [ aeson base bytestring charset lens servant servant-foreign text ]; - executableHaskellDepends = [ - aeson base blaze-html bytestring filepath servant servant-blaze - servant-foreign servant-server stm text wai warp - ]; testHaskellDepends = [ aeson base base-compat bytestring hspec hspec-expectations lens QuickCheck servant servant-foreign text @@ -175732,17 +184349,17 @@ self: { }) {}; "servant-quickcheck" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring + ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring , case-insensitive, clock, data-default-class, hspec, hspec-core - , http-client, http-media, http-types, mtl, pretty, process - , QuickCheck, quickcheck-io, servant, servant-client - , servant-server, split, string-conversions, temporary, text, time - , transformers, warp + , hspec-discover, http-client, http-media, http-types, mtl, pretty + , process, QuickCheck, quickcheck-io, servant, servant-blaze + , servant-client, servant-server, split, string-conversions + , temporary, text, time, transformers, warp }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.3.1"; - sha256 = "0ylpw1px56y08h6kl1dbn7xwwwv0abzk7llfs3dkjb9xmhh990ks"; + version = "0.0.7.0"; + sha256 = "1a0ipg1zds393ywjb1f5yphb23ccb39gv8rc6qv5b7y523cgwri2"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -175750,10 +184367,11 @@ self: { split string-conversions temporary text time warp ]; testHaskellDepends = [ - aeson base base-compat bytestring hspec hspec-core http-client - QuickCheck quickcheck-io servant servant-client servant-server - transformers warp + aeson base base-compat blaze-html bytestring hspec hspec-core + http-client QuickCheck quickcheck-io servant servant-blaze + servant-client servant-server text transformers warp ]; + testToolDepends = [ hspec-discover ]; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -175763,8 +184381,7 @@ self: { ({ mkDerivation, base, bytestring, doctest, filepath, Glob , hspec-wai, http-client, http-media, http-types, lens, resourcet , servant, servant-client, servant-docs, servant-server, tasty - , tasty-hspec, tasty-hunit, text, transformers, wai, wai-app-static - , warp + , tasty-hspec, tasty-hunit, transformers, wai, wai-app-static, warp }: mkDerivation { pname = "servant-rawm"; @@ -175777,11 +184394,6 @@ self: { resourcet servant-client servant-docs servant-server wai wai-app-static ]; - executableHaskellDepends = [ - base bytestring http-client http-media http-types servant - servant-client servant-docs servant-server text transformers wai - warp - ]; testHaskellDepends = [ base bytestring doctest Glob hspec-wai http-client http-media http-types servant servant-client servant-server tasty tasty-hspec @@ -175829,33 +184441,18 @@ self: { }) {}; "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-ruby_0_3_0_0" = callPackage ({ mkDerivation, base, casing, doctest, lens, QuickCheck , servant-foreign, text }: mkDerivation { pname = "servant-ruby"; - version = "0.3.0.0"; - sha256 = "14azm41iwj09ra8yyr0xvpirw8yxl3bs1fhgnpkk3538dz6n005s"; + version = "0.7.0.0"; + sha256 = "0r39ixsmqslbygd38bvz61a7n0r7g54zfrcgjfn506599ybianm9"; libraryHaskellDepends = [ base casing lens servant-foreign text ]; testHaskellDepends = [ base doctest QuickCheck ]; 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-scotty" = callPackage @@ -175881,60 +184478,24 @@ self: { "servant-server" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , 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 - , tagged, temporary, text, transformers, transformers-base - , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 + , directory, doctest, exceptions, filepath, hspec, hspec-discover + , hspec-wai, http-api-data, http-media, http-types, monad-control + , mtl, network, network-uri, parsec, QuickCheck, resourcet, safe + , servant, should-not-typecheck, split, string-conversions + , system-filepath, tagged, temporary, text, transformers + , transformers-base, transformers-compat, wai, wai-app-static + , wai-extra, warp, word8 }: mkDerivation { pname = "servant-server"; - version = "0.11.0.1"; - sha256 = "0yrcs1ixy7mzifdyssi58m34xn95mfy9zxbkm9k5z6svqnv1qp72"; - isLibrary = true; - isExecutable = true; - 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 tagged text transformers - transformers-base transformers-compat wai wai-app-static warp word8 - ]; - executableHaskellDepends = [ aeson base servant text wai warp ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring directory - doctest exceptions filemanip filepath hspec hspec-wai http-types - mtl network parsec QuickCheck resourcet safe servant - should-not-typecheck string-conversions temporary text transformers - transformers-compat wai wai-extra warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-server_0_12" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat - , 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 - , tagged, temporary, text, transformers, transformers-base - , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 - }: - mkDerivation { - pname = "servant-server"; - version = "0.12"; - sha256 = "1iiwk4d945z4xkxm3hn4d9ybi04n1ig4niip7vk3xp0wzikk7wk5"; + version = "0.13.0.1"; + sha256 = "0fggdqz2d6q96x8vnm64yvarg4fgxqh0jd3vis6yxpybfi174arm"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring - containers exceptions filepath http-api-data http-types + containers exceptions filepath http-api-data http-media http-types monad-control mtl network network-uri resourcet safe servant split string-conversions system-filepath tagged text transformers transformers-base transformers-compat wai wai-app-static warp word8 @@ -175942,15 +184503,15 @@ self: { executableHaskellDepends = [ aeson base servant text wai warp ]; testHaskellDepends = [ aeson base base-compat base64-bytestring bytestring directory - doctest exceptions filemanip filepath hspec hspec-wai http-types - mtl network parsec QuickCheck resourcet safe servant - should-not-typecheck string-conversions temporary text transformers - transformers-compat wai wai-extra warp + doctest exceptions hspec hspec-wai http-types mtl network parsec + QuickCheck resourcet safe servant should-not-typecheck + string-conversions temporary text transformers transformers-compat + wai wai-extra warp ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-smsc-ru" = callPackage @@ -175989,8 +184550,8 @@ self: { }: mkDerivation { pname = "servant-snap"; - version = "0.8.0.1"; - sha256 = "06n9zvz18hwizi5iqldlhgwr1m83fg5l3dzlaarl2rgvr1dnkh2i"; + version = "0.8.1"; + sha256 = "0l85gs987g6z3r6pqrf79279l1jmxq3pl8xjz62ps0p3ww1rp296"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176001,7 +184562,7 @@ self: { ]; executableHaskellDepends = [ aeson base bytestring either errors heist lens map-syntax servant - snap snap-core snap-server text transformers + snap snap-core snap-cors snap-server text transformers ]; testHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers @@ -176020,12 +184581,12 @@ self: { ({ 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, warp + , tasty-hspec, tasty-hunit, template-haskell, text, wai }: mkDerivation { pname = "servant-static-th"; - version = "0.1.0.6"; - sha256 = "19rb7xmfnls8wkgyq6gf5b6rri6b6z4qfj1m2pxa9rwx5hfajiax"; + version = "0.2.0.1"; + sha256 = "1np3sh8jcil63kd56smlkcxqg25zsn01s4dx0d1i4cmc610nb33l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176033,7 +184594,6 @@ self: { semigroups servant servant-blaze servant-server template-haskell text ]; - executableHaskellDepends = [ base servant-server wai warp ]; testHaskellDepends = [ base blaze-html bytestring directory doctest filepath Glob hspec-wai servant servant-blaze servant-server tasty tasty-hspec @@ -176045,35 +184605,6 @@ self: { }) {}; "servant-subscriber" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder - , bytestring, case-insensitive, containers, directory, filepath - , http-types, lens, lifted-base, monad-control, monad-logger - , network-uri, purescript-bridge, servant, servant-foreign - , servant-server, stm, text, time, transformers, wai - , wai-websockets, warp, websockets - }: - mkDerivation { - pname = "servant-subscriber"; - version = "0.6.0.0"; - sha256 = "0pa0zwb8qqs6y2fcs8acwljym9jmha273gb2v5nyhhfyimdl8x8q"; - revision = "1"; - editedCabalFile = "16r1ry5zd67mj5f2mi2sv9ls3vvc6y78ryijp8fcw1rif7mynf7h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base blaze-builder bytestring - case-insensitive containers directory filepath http-types lens - lifted-base monad-control monad-logger network-uri servant - servant-foreign servant-server stm text time transformers wai - wai-websockets warp websockets - ]; - executableHaskellDepends = [ base purescript-bridge ]; - homepage = "http://github.com/eskimor/servant-subscriber#readme"; - description = "When REST is not enough ..."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "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 @@ -176098,28 +184629,32 @@ self: { homepage = "http://github.com/eskimor/servant-subscriber#readme"; description = "When REST is not enough ..."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal - , cabal-doctest, directory, doctest, filepath, hspec, http-media - , insert-ordered-containers, lens, QuickCheck, servant, swagger2 - , text, time, unordered-containers + , cabal-doctest, directory, doctest, filepath, hspec + , hspec-discover, http-media, insert-ordered-containers, lens + , QuickCheck, servant, singleton-bool, swagger2, text, time + , unordered-containers }: mkDerivation { pname = "servant-swagger"; - version = "1.1.4"; - sha256 = "0xcs019v0kmaa265a15zbqj591d3nrrj19r5176816pldq8q213i"; + version = "1.1.5"; + sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg"; + revision = "1"; + editedCabalFile = "005b3z7wxcrad8210yw3qsndh3zh0v2h8j50qxl8sj1l6wqb7zs6"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers - lens QuickCheck servant swagger2 text unordered-containers + lens QuickCheck servant singleton-bool swagger2 text + unordered-containers ]; testHaskellDepends = [ aeson aeson-qq base directory doctest filepath hspec lens QuickCheck servant swagger2 text time ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/haskell-servant/servant-swagger"; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; @@ -176134,10 +184669,10 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.2.4.3.4.0"; - sha256 = "1vb1bp7hjjyhb1p6x0j7z2ky05n72qm7zcmwgnsmnqalaxdnsvri"; + version = "0.2.5.3.9.1"; + sha256 = "1fbznhlzh9xnnhxsazan46w5x439a31lglb8mh7j945axyh7l09m"; revision = "1"; - editedCabalFile = "1bd920kkwyfz4jvy57k026nqdjlxla09hb5z2rfc6y9d5qx05rfk"; + editedCabalFile = "16lixcz9vkkgvcfwdfj3p6pmf458hymyywklzwnbhk7z16wjjhnv"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -176153,6 +184688,108 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-ui_0_3_0_3_13_2" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.3.0.3.13.2"; + sha256 = "0llkcag9bnhvni6ddar966i0pwql93s5icvw6pxa9ra5v14v7p5n"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + homepage = "https://github.com/phadej/servant-swagger-ui"; + description = "Servant swagger ui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-swagger-ui-core" = callPackage + ({ mkDerivation, base, blaze-markup, bytestring, http-media + , servant, servant-blaze, servant-server, swagger2, text + , transformers, transformers-compat, wai-app-static + }: + mkDerivation { + pname = "servant-swagger-ui-core"; + version = "0.3"; + sha256 = "1ji54q9x787dr5l81qn0shw2n3b8k9aglli03gxfbvs0l7ga5xrd"; + libraryHaskellDepends = [ + base blaze-markup bytestring http-media servant servant-blaze + servant-server swagger2 text transformers transformers-compat + wai-app-static + ]; + homepage = "https://github.com/phadej/servant-swagger-ui"; + description = "Servant swagger ui core components"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-swagger-ui-jensoleg" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui-jensoleg"; + version = "0.3"; + sha256 = "1ymw2lkfn0bkmddvpmv0ikv45fqac2zidnli8bfyp92jf0b5dnik"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + homepage = "https://github.com/phadej/servant-swagger-ui"; + description = "Servant swagger ui: Jens-Ole Graulund theme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-swagger-ui-redoc" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui-redoc"; + version = "0.3.0.1.21.2"; + sha256 = "1p3mq7m5hvid7g7jwpf2jz923512wlprh6gikq5x2vcb14d40qwl"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + homepage = "https://github.com/phadej/servant-swagger-ui"; + description = "Servant swagger ui: ReDoc theme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-tracing" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, bytestring-lexing + , containers, hashable, http-api-data, http-client, HUnit + , lifted-base, monad-control, mtl, QuickCheck, random, servant + , servant-server, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, wai, warp + }: + mkDerivation { + pname = "servant-tracing"; + version = "0.1.0.1"; + sha256 = "0dff51fywa1z1png1hhwpn4f8av2jxdsplin8h80aad459czaid2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring bytestring-lexing containers hashable + http-api-data http-client lifted-base monad-control mtl random + servant servant-server text time unordered-containers wai + ]; + executableHaskellDepends = [ + async base bytestring containers http-client lifted-base + monad-control mtl servant servant-server text transformers wai warp + ]; + testHaskellDepends = [ + aeson base containers http-api-data HUnit monad-control mtl + QuickCheck tasty tasty-hunit tasty-quickcheck text time + transformers + ]; + homepage = "https://github.com/ChrisCoffey/haskell-opentracing-light#readme"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-websockets" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit , exceptions, resourcet, servant-server, text, wai, wai-websockets @@ -176160,8 +184797,8 @@ self: { }: mkDerivation { pname = "servant-websockets"; - version = "1.0.0"; - sha256 = "05y9yyrg5c99xdlyfzwddylrklpspabijdd08f5c75bhdi2i4cb2"; + version = "1.1.0"; + sha256 = "0l8a5zc6wiwdfxv2kirb7kxky4zwj71rcrrg1zh07gc3vf4lqf33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176176,6 +184813,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-xml" = callPackage + ({ mkDerivation, base, bytestring, http-media, servant, xmlbf + , xmlbf-xeno + }: + mkDerivation { + pname = "servant-xml"; + version = "1.0.1.2"; + sha256 = "16zyvxscplgb08jljg7k728lq17b8xmrri6xbq47j74namp2n55z"; + libraryHaskellDepends = [ + base bytestring http-media servant xmlbf xmlbf-xeno + ]; + homepage = "https://github.com/fosskers/servant-xml"; + description = "Servant support for the XML Content-Type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-yaml" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, http-media , servant, servant-server, wai, warp, yaml @@ -176184,8 +184838,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9"; - revision = "17"; - editedCabalFile = "1525b9dm2g8r2xrisciypi0ihm3rmbs3g3f9nvg01qwa3q1sxf70"; + revision = "18"; + editedCabalFile = "038paj9z77rx6jc06vg5f4f9gvwaq73ggw7ppgrw6vwhsl4nd84q"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -176208,6 +184862,7 @@ self: { homepage = "https://github.com/martyall/servant-zeppelin#readme"; description = "Types and definitions of servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-zeppelin-client" = callPackage @@ -176280,6 +184935,7 @@ self: { homepage = "https://github.com/martyall/servant-zeppelin#readme"; description = "Swagger instances for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "server-generic" = callPackage @@ -176299,6 +184955,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "serverless-haskell" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive + , hspec, hspec-discover, lens, raw-strings-qq, text, time, unix + , unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.4.3"; + sha256 = "0sdx28v81b6d5iankxbyb6psbrrsz5s2y01q36b7kbmg5sc4jiyy"; + libraryHaskellDepends = [ + aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis + amazonka-s3 base bytestring case-insensitive lens text time unix + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis + amazonka-s3 base bytestring case-insensitive hspec hspec-discover + lens raw-strings-qq text time unix unordered-containers + ]; + homepage = "https://github.com/seek-oss/serverless-haskell#readme"; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -176377,8 +185059,8 @@ self: { }: mkDerivation { pname = "serversession-backend-redis"; - version = "1.0.2"; - sha256 = "05zrkdxsb86qb0zgjfk8swihfg0cs8kds51xvsqnny9yz216cx6p"; + version = "1.0.3"; + sha256 = "059nak15x4cbwmfbvfih6ndwa6i5jhcba22h9gz44f6s84vhljyf"; libraryHaskellDepends = [ base bytestring hedis path-pieces serversession tagged text time transformers unordered-containers @@ -176446,6 +185128,7 @@ self: { homepage = "https://github.com/yesodweb/serversession"; description = "Yesod bindings for serversession"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "services" = callPackage @@ -176516,7 +185199,6 @@ self: { ]; description = "Send HTML formatted emails using Amazon's SES REST API with blaze"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html-snaplet" = callPackage @@ -176558,8 +185240,10 @@ self: { }: mkDerivation { pname = "sessiontypes"; - version = "0.1.1"; - sha256 = "0l9chnnyq8mblxqyg89nlfa55cadwy62mj29arakrc988l6ja3gq"; + version = "0.1.2"; + sha256 = "1xjf3yjapz9ipjkqhm8fljgbj6fww3iyl1mx1kjwh18s6b9ymq5s"; + revision = "1"; + editedCabalFile = "0qd48i92nn5yhp1lzs5vvvcmq5db785nr736y2yxgi7z4pk80r84"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176570,6 +185254,7 @@ self: { homepage = "https://github.com/Ferdinand-vW/sessiontypes#readme"; description = "Session types library"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sessiontypes-distributed" = callPackage @@ -176579,8 +185264,10 @@ self: { }: mkDerivation { pname = "sessiontypes-distributed"; - version = "0.1.0"; - sha256 = "1q0y37iwjafcb70fv42hny44ay0bpzbvss48h10dahvsmzpqkk8a"; + version = "0.1.1"; + sha256 = "0fi263sdpshzjwc51h9rqgg0zj7f5a6igrfj9487lbdgaz1cb1ya"; + revision = "1"; + editedCabalFile = "0r4xn7p21xwdimzpdd5jqjawds9mhniqzmg84bfipcpm3mwhjq5x"; libraryHaskellDepends = [ base binary bytestring distributed-process distributed-static exceptions rank1dynamic sessiontypes @@ -176591,19 +185278,21 @@ self: { homepage = "https://github.com/Ferdinand-vW/sessiontypes-distributed#readme"; description = "Session types distributed"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "set-cover" = callPackage - ({ mkDerivation, base, containers, enummapset, psqueues, utility-ht + ({ mkDerivation, base, containers, enummapset, psqueues, semigroups + , utility-ht }: mkDerivation { pname = "set-cover"; - version = "0.0.8"; - sha256 = "1lcmx9c2bi45v01vr44fm75z3afv221psd3rsk8knkl2dqdklv8q"; + version = "0.0.9"; + sha256 = "1qbk5y2pg6jlclszd2nras5240r0ahapsibykkcqrxhgq0hgvsxg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers enummapset psqueues utility-ht + base containers enummapset psqueues semigroups utility-ht ]; homepage = "http://hub.darcs.net/thielema/set-cover/"; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; @@ -176705,8 +185394,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "setlocale"; - version = "1.0.0.5"; - sha256 = "1w4zgpjjy56bpgjjcxh2fj3v4pqwmfhfwwvs5nhys12h8y8q8hsp"; + version = "1.0.0.6"; + sha256 = "1rl8qb8vzv8fdbczy2dxwgn4cb68lfrjdxf2w8nn9wy1acqzcyjq"; libraryHaskellDepends = [ base ]; homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale"; description = "Haskell bindings to setlocale"; @@ -176730,6 +185419,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "setop" = callPackage + ({ mkDerivation, base, containers, doctest, hlint, hspec + , optparse-applicative, protolude, text + }: + mkDerivation { + pname = "setop"; + version = "0.1.0.1"; + sha256 = "0rgx5dn9xj9mpbb0rickncb9xd93sgqsz0s058zqyg08pjafrp31"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers protolude ]; + executableHaskellDepends = [ + base optparse-applicative protolude text + ]; + testHaskellDepends = [ + base containers doctest hlint hspec protolude + ]; + homepage = "https://github.com/fmind/setop"; + description = "Perform set operations on files"; + license = stdenv.lib.licenses.mit; + }) {}; + "setops" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -176825,18 +185536,18 @@ self: { "sexp-grammar" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, happy, mtl, profunctors, QuickCheck, scientific - , semigroups, split, tagged, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, transformers, wl-pprint-text + , criterion, happy, mtl, prettyprinter, profunctors, QuickCheck + , scientific, semigroups, split, tagged, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, transformers }: mkDerivation { pname = "sexp-grammar"; - version = "1.2.3"; - sha256 = "107mfa4g13k6asfwddfbjphjpgnc58ddjir85srz2dmp06paf539"; + version = "1.3.0"; + sha256 = "0h9b9rmymfy0qwr51yllapmp7g0j3f70pmhwyzag782giff8q0x3"; libraryHaskellDepends = [ - array base bytestring containers mtl profunctors scientific - semigroups split tagged template-haskell text transformers - wl-pprint-text + array base bytestring containers mtl prettyprinter profunctors + scientific semigroups split tagged template-haskell text + transformers ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -176867,9 +185578,7 @@ self: { }) {}; "sexpr" = callPackage - ({ mkDerivation, base, base64-string, binary, bytestring, pretty - , QuickCheck, random - }: + ({ mkDerivation, base, base64-string, binary, bytestring, pretty }: mkDerivation { pname = "sexpr"; version = "0.2.1"; @@ -176879,7 +185588,6 @@ self: { libraryHaskellDepends = [ base base64-string binary bytestring pretty ]; - executableHaskellDepends = [ QuickCheck random ]; description = "S-expression printer and parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -176902,6 +185610,7 @@ self: { homepage = "https://github.com/dzhus/sext#readme"; description = "Lists, Texts, ByteStrings and Vectors with type-encoded length"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sfml-audio" = callPackage @@ -176915,7 +185624,6 @@ self: { homepage = "http://patch-tag.com/r/shahn/sfml-audio"; description = "minimal bindings to the audio module of sfml"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;}; "sfmt" = callPackage @@ -177060,22 +185768,26 @@ self: { }) {}; "shadowsocks" = callPackage - ({ mkDerivation, aeson, async, base, binary, bytestring - , conduit-combinators, conduit-extra, containers, cryptohash - , HsOpenSSL, HUnit, iproute, network, optparse-applicative, process + ({ mkDerivation, aeson, async, base, binary, bytestring, conduit + , conduit-extra, containers, cryptohash, directory, HsOpenSSL + , HUnit, iproute, network, optparse-applicative, process , streaming-commons, unordered-containers }: mkDerivation { pname = "shadowsocks"; - version = "1.20151028"; - sha256 = "0z43hlgzklynb0y9b6bz2qmr2590v5nfp241i8b3rq7flb5lhlmp"; - isLibrary = false; + version = "1.20180408"; + sha256 = "19yn788j58i4h2bfi7rxy4a9h9q8ppp7bg2yln6ni563wa6x52p2"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary bytestring conduit containers cryptohash + directory HsOpenSSL iproute network optparse-applicative + unordered-containers + ]; executableHaskellDepends = [ - aeson async base binary bytestring conduit-combinators - conduit-extra containers cryptohash HsOpenSSL iproute network - optparse-applicative streaming-commons unordered-containers + async base bytestring conduit conduit-extra network + streaming-commons ]; testHaskellDepends = [ base binary bytestring containers cryptohash HUnit process @@ -177132,14 +185844,14 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.15.11"; - sha256 = "1fxi4vl6fffq0h84rxd9cqik58mj8jk7gmspm9vkjmp97j1hslh5"; + version = "0.16.4"; + sha256 = "0dhlkcn1zsg1w97vzs1yrpkn6iwhlzh36dwclx2lafzbdjja6cmp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery process random time transformers unix + js-flot js-jquery primitive process random time transformers unix unordered-containers utf8-string ]; executableHaskellDepends = [ @@ -177149,44 +185861,28 @@ self: { ]; testHaskellDepends = [ base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery process QuickCheck random time transformers unix - unordered-containers utf8-string + js-flot js-jquery primitive process QuickCheck random time + transformers unix unordered-containers utf8-string ]; - homepage = "http://shakebuild.com"; + homepage = "https://shakebuild.com"; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; - "shake_0_16" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, directory - , extra, filepath, hashable, js-flot, js-jquery, primitive, process - , QuickCheck, random, time, transformers, unix - , unordered-containers, utf8-string + "shake-ats" = callPackage + ({ mkDerivation, base, binary, dependency, directory, hashable + , hs2ats, language-ats, lens, shake, shake-ext, text }: mkDerivation { - pname = "shake"; - version = "0.16"; - sha256 = "039b8yrp7nskya30fahzcf8w2rl8jj277hddrcfx3zwbxlcfldcg"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; + pname = "shake-ats"; + version = "1.8.0.1"; + sha256 = "0rl0a2d55r55w705jx4si17n403l06jk3d6mrf3gd2ghn93hb13a"; libraryHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process random time transformers unix - unordered-containers utf8-string + base binary dependency directory hashable hs2ats language-ats lens + shake shake-ext text ]; - executableHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process random time transformers unix - unordered-containers utf8-string - ]; - testHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process QuickCheck random time - transformers unix unordered-containers utf8-string - ]; - homepage = "http://shakebuild.com"; - description = "Build system library, like Make, but more accurate dependencies"; + homepage = "https://github.com/vmchale/shake-ats#readme"; + description = "Utilities for building ATS projects with shake"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -177208,6 +185904,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shake-ext" = callPackage + ({ mkDerivation, base, Cabal, cdeps, composition-prelude, cpphs + , directory, shake, template-haskell + }: + mkDerivation { + pname = "shake-ext"; + version = "2.11.0.1"; + sha256 = "09gg30b8xiq2krz58lkavcgi1gybc5sn6snscdq8nj3qbxcvd0av"; + libraryHaskellDepends = [ + base Cabal cdeps composition-prelude cpphs directory shake + template-haskell + ]; + homepage = "https://hub.darcs.net/vmchale/shake-ext"; + description = "Helper functions for linting with shake"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {cdeps = null;}; + "shake-extras" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , shake @@ -177231,8 +185946,8 @@ self: { }: mkDerivation { pname = "shake-language-c"; - version = "0.10.1"; - sha256 = "0802chyihjbj5k2z0rdmzqbip7slfyabr56mdixq1m54yxs48ina"; + version = "0.11.0"; + sha256 = "07ck1y3z3081s1m3yff37z6v2lp0gilqj0jb0l4vphszkckasx11"; libraryHaskellDepends = [ base data-default-class fclabels process shake split unordered-containers @@ -177244,14 +185959,14 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "shake-language-c_0_11_0" = callPackage + "shake-language-c_0_12_0" = callPackage ({ mkDerivation, base, data-default-class, directory, doctest , fclabels, hspec, process, shake, split, unordered-containers }: mkDerivation { pname = "shake-language-c"; - version = "0.11.0"; - sha256 = "07ck1y3z3081s1m3yff37z6v2lp0gilqj0jb0l4vphszkckasx11"; + version = "0.12.0"; + sha256 = "1c0smbshksjw114m09n5i1ynkhibvd9kix9n7h696p75g40ka7k6"; libraryHaskellDepends = [ base data-default-class fclabels process shake split unordered-containers @@ -177289,14 +186004,15 @@ self: { homepage = "https://github.com/LukeHoersten/shake-pack"; description = "Shake File Pack Rule"; license = stdenv.lib.licenses.bsd3; + 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"; + version = "0.0.0.1"; + sha256 = "0sjw0hcs6i9c8vfirrk90y5xd3cf0f9c0wa2p5pqimc5wfid9plk"; libraryHaskellDepends = [ base path path-io shake ]; homepage = "http://cs-syd.eu"; description = "path alternatives to shake functions"; @@ -177353,23 +186069,18 @@ self: { }) {}; "shakers" = callPackage - ({ mkDerivation, base, basic-prelude, deepseq, directory - , regex-compat, shake + ({ mkDerivation, base, basic-prelude, directory, lifted-base, shake }: mkDerivation { pname = "shakers"; - version = "0.0.36"; - sha256 = "1l2dn9s1pijh84l0difw7sb2b3id49p64fn235lj5qybww60ijhw"; - isLibrary = true; - isExecutable = true; + version = "0.0.48"; + sha256 = "1b2rwa6k4qj94mblfkvdj8asp26lknl6gfb4nfiqvi7m9kq27n45"; libraryHaskellDepends = [ - base basic-prelude deepseq directory regex-compat shake + base basic-prelude directory lifted-base shake ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/swift-nav/shakers"; description = "Shake helpers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shakespeare" = callPackage @@ -177380,8 +186091,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.14"; - sha256 = "0j5zx8ka7d7scvb9shm7k3376qzl3k4kpim9aqqfs6n86901zpl4"; + version = "2.0.15"; + sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -177589,7 +186300,6 @@ self: { homepage = "https://github.com/nh2/shared-memory"; description = "POSIX shared memory"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sharedio" = callPackage @@ -177655,23 +186365,22 @@ self: { "shell-conduit" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , control-monad-loop, directory, filepath, hspec - , hspec-expectations, monad-control, monads-tf, process, resourcet - , semigroups, split, template-haskell, text, transformers - , transformers-base, unix + , directory, filepath, hspec, hspec-expectations, monads-tf + , process, resourcet, semigroups, split, template-haskell, text + , transformers, unix, unliftio }: mkDerivation { pname = "shell-conduit"; - version = "4.6.1"; - sha256 = "0hmdfrq2i1smgn6sjnxxzz4hyx9x8i1dwjpycia2xrssn3w63lc6"; + version = "4.7.0"; + sha256 = "0c5yvm08l37qblqks1r23znixxas39gl1d3mlm6rq8a6zfvcacbg"; libraryHaskellDepends = [ - async base bytestring conduit conduit-extra control-monad-loop - directory filepath monad-control monads-tf process resourcet - semigroups split template-haskell text transformers - transformers-base unix + async base bytestring conduit conduit-extra directory filepath + monads-tf process resourcet semigroups split template-haskell text + transformers unix unliftio ]; testHaskellDepends = [ - base hspec hspec-expectations template-haskell + base bytestring conduit conduit-extra hspec hspec-expectations + template-haskell ]; homepage = "https://github.com/psibi/shell-conduit"; description = "Write shell scripts with Conduit"; @@ -177773,6 +186482,22 @@ self: { homepage = "https://github.com/valderman/shellmate"; description = "Extra functionality for shellmate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "shellout" = callPackage + ({ mkDerivation, async, base, stm, text, typed-process }: + mkDerivation { + pname = "shellout"; + version = "0.1.0.0"; + sha256 = "0cinrxwr4jclx37c3h9r1swkj6l78z7fmja6242z53ai1kjqj9kp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ async base stm text typed-process ]; + executableHaskellDepends = [ async base stm text typed-process ]; + homepage = "https://github.com/loganmac/shellout#readme"; + description = "A threaded manager for Haskell that can run and stream external process output/err/exits"; + license = stdenv.lib.licenses.bsd3; }) {}; "shelltestrunner" = callPackage @@ -177782,10 +186507,8 @@ self: { }: mkDerivation { pname = "shelltestrunner"; - version = "1.3.5"; - sha256 = "0ad8sc4md8mp0l0s40yx7qbgaabqzd4nz8lx15ajcdbwr2ffnra2"; - revision = "2"; - editedCabalFile = "1d72n8k72w2mdi3y9s74ydlwxj407mc237albx6zx42lsjx1fw34"; + version = "1.9"; + sha256 = "1a5kzqbwg6990249ypw0cx6cqj6663as1kbj8nzblcky8j6kbi6b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -177793,53 +186516,35 @@ self: { pretty-show process regex-tdfa safe test-framework test-framework-hunit utf8-string ]; - homepage = "http://joyful.com/shelltestrunner"; - description = "A tool for testing command-line programs"; + homepage = "https://github.com/simonmichael/shelltestrunner"; + description = "Easy, repeatable testing of CLI programs/commands"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shelly" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async - , lifted-base, monad-control, mtl, process, system-fileio - , system-filepath, text, time, transformers, transformers-base - , unix-compat - }: + "shellwords" = callPackage + ({ mkDerivation, base, hspec, megaparsec, text }: mkDerivation { - pname = "shelly"; - version = "1.6.8.3"; - sha256 = "11w47a1kd19f08d1m4hg8hmx18lyxbj3n027dcbl0ns549n77bkq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring containers directory enclosed-exceptions - exceptions lifted-async lifted-base monad-control mtl process - system-fileio system-filepath text time transformers - transformers-base unix-compat - ]; - testHaskellDepends = [ - async base bytestring containers directory enclosed-exceptions - exceptions hspec HUnit lifted-async lifted-base monad-control mtl - process system-fileio system-filepath text time transformers - transformers-base unix-compat - ]; - homepage = "https://github.com/yesodweb/Shelly.hs"; - description = "shell-like (systems) programming in Haskell"; - license = stdenv.lib.licenses.bsd3; + pname = "shellwords"; + version = "0.1.1.0"; + sha256 = "1k3wmkmxr1rvjjrgg2swz8pl2nwf723q8zwpybadss4kz0f4w314"; + libraryHaskellDepends = [ base megaparsec text ]; + testHaskellDepends = [ base hspec text ]; + homepage = "https://github.com/pbrisbin/hs-shellwords#readme"; + description = "Parse strings into words, like a shell would"; + license = stdenv.lib.licenses.mit; }) {}; - "shelly_1_6_8_5" = callPackage + "shelly" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory - , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async - , lifted-base, monad-control, mtl, process, system-fileio - , system-filepath, text, time, transformers, transformers-base - , unix-compat + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , system-fileio, system-filepath, text, time, transformers + , transformers-base, unix-compat }: mkDerivation { pname = "shelly"; - version = "1.6.8.5"; - sha256 = "036p32xrcv698wsgs3cdxy9rirkzql2myczzyz30iahk91hl2qiw"; + version = "1.7.2"; + sha256 = "04gi3vixi69s95kwbbh0yxmfrkga1aafdp80zs2zfwcai13cfqkn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177850,14 +186555,13 @@ self: { ]; testHaskellDepends = [ async base bytestring containers directory enclosed-exceptions - exceptions hspec HUnit lifted-async lifted-base monad-control mtl - process system-fileio system-filepath text time transformers - transformers-base unix-compat + exceptions filepath hspec hspec-contrib HUnit lifted-async + lifted-base monad-control mtl process system-fileio system-filepath + text time transformers transformers-base unix-compat ]; homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly-extra" = callPackage @@ -177922,8 +186626,8 @@ self: { }: mkDerivation { pname = "shikensu"; - version = "0.3.7"; - sha256 = "1gi1l8rs093s2jxyqwpg7yjbyjc9km87hdxai2j832viwrd828b5"; + version = "0.3.8"; + sha256 = "0sji1lw1ma8js9kylixn694108nv74g8qpbfd198fwqvcqx5jhwh"; libraryHaskellDepends = [ aeson base bytestring directory filepath flow Glob text unordered-containers @@ -177938,6 +186642,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shimmer" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath, haskeline + , text + }: + mkDerivation { + pname = "shimmer"; + version = "0.1.3.2"; + sha256 = "1mr8y0f83bs0ay02hm6nj173x6djz7dkfpriymjgicnaicn0mvrh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers filepath haskeline text + ]; + executableHaskellDepends = [ + base bytestring containers filepath haskeline text + ]; + description = "The Reflective Lambda Machine"; + license = stdenv.lib.licenses.mit; + }) {}; + "shine" = callPackage ({ mkDerivation, base, ghcjs-dom, ghcjs-prim, keycode, mtl, time , transformers @@ -177953,6 +186677,7 @@ self: { homepage = "https://github.com/fgaz/shine"; description = "Declarative graphics for the browser using GHCJS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghcjs-prim = null;}; @@ -178019,6 +186744,7 @@ self: { homepage = "https://oss.xkcd.com/"; description = "A haskell API binding for shopify.com"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shortcircuit" = callPackage @@ -178097,13 +186823,32 @@ self: { license = "GPL"; }) {}; + "show-combinators" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "show-combinators"; + version = "0.1.0.0"; + sha256 = "11ihjlpa5hgqhcbwcyclldgddppzgdqsz8hx1hqvamchqx3mgi12"; + revision = "1"; + editedCabalFile = "09zd78jap17ralla3833gwv6bwmh93bpjgdshkyf7j06xg2c1mq8"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/Lysxia/show-combinators#readme"; + description = "Combinators to write Show instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "show-please" = callPackage - ({ mkDerivation, base, mtl, parsec, template-haskell, time }: + ({ mkDerivation, base, mtl, parsec, template-haskell, th-orphans + , time + }: mkDerivation { pname = "show-please"; - version = "0.4.2"; - sha256 = "16frhvbq395p3n54r5iv0xfjlj679gjm4sgsdbawanp9h1yhiwnl"; - libraryHaskellDepends = [ base mtl parsec template-haskell time ]; + version = "0.5.4"; + sha256 = "0rb6mpbr1qz80zgs4r92ckp28afzlcz9l988y20xhfrvq3bikzkx"; + libraryHaskellDepends = [ + base mtl parsec template-haskell th-orphans time + ]; homepage = "https://github.com/ddssff/show-please"; description = "A wrapper type V with improved Show instances"; license = stdenv.lib.licenses.bsd3; @@ -178115,10 +186860,8 @@ self: { }: mkDerivation { pname = "show-prettyprint"; - version = "0.2"; - sha256 = "14yjffqjkadmb0aw3zf2n1v525vn293rinhmbwby71ch76nij42w"; - revision = "1"; - editedCabalFile = "1hkfq59kpx3p4rgka49l3hvim80xlqf5h3q8f1xb4arysrq3pvi4"; + version = "0.2.0.2"; + sha256 = "1snkahqn081rnm6qs54hwgc3y2pwgadrvh8a81lw7rl1mfp261kg"; libraryHaskellDepends = [ ansi-wl-pprint base prettyprinter trifecta ]; @@ -178209,10 +186952,11 @@ self: { }: mkDerivation { pname = "shuffle"; - version = "0.1.3.3"; - sha256 = "0ngva3p3838xay3zz442n99ilhk5d9majg342x6y7hs796lqbrrd"; + version = "0.1.4.0"; + sha256 = "1xqppg8yi6rqfnd7j7qrw1j7qqnp3hhzrcdv6d2hzmrhfzgrnmic"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal uuagc uuagc-cabal ]; libraryHaskellDepends = [ array base Cabal containers directory filepath network network-uri process uhc-util uuagc uuagc-cabal uulib @@ -178221,6 +186965,7 @@ self: { homepage = "https://github.com/UU-ComputerScience/shuffle"; description = "Shuffle tool for UHC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shunya-library" = callPackage @@ -178258,7 +187003,6 @@ self: { ]; description = "An interface to the Silicon Labs Si5351 clock chip"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sibe" = callPackage @@ -178285,6 +187029,7 @@ self: { homepage = "https://github.com/mdibaiee/sibe"; description = "Machine Learning algorithms"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sieve" = callPackage @@ -178375,6 +187120,8 @@ self: { pname = "sign"; version = "0.4.3"; sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp"; + revision = "1"; + editedCabalFile = "112xj46k2fzhxiqsnh2fs7fmfrhs6k4q65jxw8mkn58mwl9sr86f"; libraryHaskellDepends = [ base containers deepseq hashable lattices universe-base ]; @@ -178444,18 +187191,20 @@ self: { }) {}; "silvi" = callPackage - ({ mkDerivation, base, bytestring, chronos, http-types, ip - , quantification, savage, text + ({ mkDerivation, attoparsec, base, bytestring, chronos, http-types + , ip, quantification, savage, text }: mkDerivation { pname = "silvi"; - version = "0.0.2"; - sha256 = "1rls25wifkgkz1fg4xw4bvpxa1807dp1h2q8kk7j7if7b66pj0cx"; + version = "0.1.0"; + sha256 = "1sgx40fmlf3188j4bl647f8psvpf7xfbzzzilgicg3w49dwxxq2q"; libraryHaskellDepends = [ - base bytestring chronos http-types ip quantification savage text + attoparsec base bytestring chronos http-types ip quantification + savage text ]; + testHaskellDepends = [ base quantification savage text ]; homepage = "https://github.com/chessai/silvi#readme"; - description = "A generator for different kinds of logs"; + description = "A generator for different kinds of data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -178622,6 +187371,7 @@ self: { homepage = "http://github.com/jwiegley/simple-conduit"; description = "A simple streaming I/O library based on monadic folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-config" = callPackage @@ -178673,26 +187423,28 @@ self: { homepage = "https://github.com/TerrorJack/simple-download#readme"; description = "A simple wrapper of http-conduit for file download"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-effects" = callPackage - ({ mkDerivation, array, base, criterion, exceptions, list-t - , monad-control, MonadRandom, mtl, text, transformers - , transformers-base + ({ mkDerivation, array, async, base, bytestring, criterion + , exceptions, list-t, monad-control, MonadRandom, mtl, text + , transformers, transformers-base }: mkDerivation { pname = "simple-effects"; - version = "0.9.0.1"; - sha256 = "1n5jr909g410zfy0vk4pvl5phy981hhxsx61hcm6p99f0vdybcwx"; + version = "0.10.0.1"; + sha256 = "1fixv7gymd03bnn8aysyyr7jwp1j943xyd69659xcjmljknd1h5m"; libraryHaskellDepends = [ - array base exceptions list-t monad-control MonadRandom mtl text - transformers transformers-base + array async base bytestring exceptions list-t monad-control + MonadRandom mtl text transformers transformers-base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion mtl transformers ]; homepage = "https://gitlab.com/LukaHorvat/simple-effects"; description = "A simple effect system that integrates with MTL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-eval" = callPackage @@ -178859,8 +187611,8 @@ self: { }: mkDerivation { pname = "simple-logging"; - version = "0.2.0.2"; - sha256 = "1a917vvwnzmv9jqrrmk6knv8wfrxwkbal6gxp24a2xkiqcjpgbjw"; + version = "0.2.0.3"; + sha256 = "12ayxv1j2zzql01gka1p8m7pixjh6f87r5hamz3ydcyzn4vrl5j1"; libraryHaskellDepends = [ aeson base bytestring directory exceptions filepath hscolour iso8601-time lens mtl simple-effects string-conv text time uuid @@ -179002,8 +187754,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "simple-reflect"; - version = "0.3.2"; - sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq"; + version = "0.3.3"; + sha256 = "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7"; libraryHaskellDepends = [ base ]; homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions"; description = "Simple reflection of expressions containing variables"; @@ -179028,10 +187780,8 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.25"; - sha256 = "0k99j9xfcf83c55jmn202hdinhjaa4yn3dal4rvjk2w2rlhqirha"; - revision = "1"; - editedCabalFile = "1axghvn2iz0gzlc0ics4q8abl15ggwvcwcmly5cxhmc32hqv8y5c"; + version = "0.2.27"; + sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -179109,13 +187859,29 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; - executableHaskellDepends = [ base mtl parsec pretty ]; testHaskellDepends = [ base HUnit mtl parsec pretty test-framework test-framework-hunit ]; homepage = "http://jakewheat.github.io/simple-sql-parser/latest"; description = "A parser for SQL queries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "simple-src-utils" = callPackage + ({ mkDerivation, base, extra, tasty, tasty-hunit, text }: + mkDerivation { + pname = "simple-src-utils"; + version = "0.1"; + sha256 = "0cfa2l7a0c8kgr0707jnk2qzh12a2564bdzzynjzcdjdqda6d5ch"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ base extra text ]; + testHaskellDepends = [ base extra tasty tasty-hunit text ]; + homepage = "https://github.com/elaforge/simple-src-utils"; + description = "source code editing utilities"; + license = stdenv.lib.licenses.bsd3; }) {}; "simple-stacked-vm" = callPackage @@ -179161,6 +187927,7 @@ self: { ]; description = "Simple, pure, file-system-free reading of tar files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-templates" = callPackage @@ -179199,25 +187966,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-ui" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, lens, mtl + , stm, template-haskell, transformers, vector, vty + }: + mkDerivation { + pname = "simple-ui"; + version = "0.1.1"; + sha256 = "1phag0frz7l4xgrgjc72x9iwjl1z1l6mpz7lnifjgn7zp3wdkwzs"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base data-default-class exceptions lens mtl stm template-haskell + transformers vector vty + ]; + description = "UI library for terminal"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "simple-vec3" = callPackage - ({ mkDerivation, base, criterion, QuickCheck, tasty - , tasty-quickcheck, tasty-th, vector, vector-th-unbox + ({ mkDerivation, base, criterion, doctest, doctest-discover + , QuickCheck, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "simple-vec3"; - version = "0.2"; - sha256 = "107nw2dw3f3famp1msqzf7d8v8kpiw1xza024yf53zzbx1z9ia35"; - libraryHaskellDepends = [ base QuickCheck vector vector-th-unbox ]; + version = "0.4.0.1"; + sha256 = "17nvwph2g5xzi8lqgyrsbskdm9flwr7h3ch7yf4rnbx3bg37bvsh"; + libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ - base QuickCheck tasty tasty-quickcheck tasty-th vector - vector-th-unbox - ]; - benchmarkHaskellDepends = [ - base criterion QuickCheck vector vector-th-unbox + base doctest doctest-discover tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion vector ]; homepage = "https://github.com/dzhus/simple-vec3#readme"; description = "Three-dimensional vectors of doubles with basic operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-zipper" = callPackage @@ -179231,6 +188013,7 @@ self: { homepage = "https://github.com/DanielWaterworth/simple-zipper"; description = "Zippers made slightly easier"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simpleargs" = callPackage @@ -179244,6 +188027,22 @@ self: { homepage = "http://malde.org/~ketil/simpleargs"; description = "Provides a more flexible getArgs function with better error reporting"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "simpleconfig" = callPackage + ({ mkDerivation, base, containers, generic-deriving, lens, text }: + mkDerivation { + pname = "simpleconfig"; + version = "0.0.9"; + sha256 = "1xk8kxdnw118gzwh3i58iy0bdqi80f8li3bjydaqfn073106nf87"; + libraryHaskellDepends = [ base containers lens ]; + testHaskellDepends = [ + base containers generic-deriving lens text + ]; + homepage = "https://github.com/koterpillar/simpleconfig#readme"; + description = "Short description of your package"; + license = stdenv.lib.licenses.bsd3; }) {}; "simpleirc" = callPackage @@ -179277,6 +188076,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simplemesh" = callPackage + ({ mkDerivation, base, linear }: + mkDerivation { + pname = "simplemesh"; + version = "0.1.0.0"; + sha256 = "1cq8h96kr1qnxqma7if3pmxcw05nrirpnw703r4cba75xwgwlqcl"; + libraryHaskellDepends = [ base linear ]; + homepage = "https://github.com/jonascarpay/simplemesh#readme"; + description = "Generators for primitive meshes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simplenote" = callPackage ({ mkDerivation, base, bytestring, curl, dataenc, download-curl , HTTP, json, time, utf8-string @@ -179330,14 +188141,13 @@ self: { ({ mkDerivation, base, bytestring, libssh2, mtl }: mkDerivation { pname = "simplessh"; - version = "0.2.0.5"; - sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq"; + version = "0.2.0.6"; + sha256 = "1w67k70740dyrrp1k2xz5vbj6qm2smrq9g867z81dphwscqaknm3"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ libssh2 ]; - homepage = "http://hub.darcs.net/thoferon/simplessh"; + homepage = "https://github.com/thoferon/simplessh"; description = "Simple wrapper around libssh2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libssh2;}; "simplest-sqlite" = callPackage @@ -179424,6 +188234,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "since" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "since"; + version = "0.0.0"; + sha256 = "1zy1vwna8a0421l3jvdm8mg36xwgj4xl3p2xkf678ahbzk0179vs"; + libraryHaskellDepends = [ base time ]; + homepage = "https://github.com/athanclark/since#readme"; + description = "Get the number of seconds since the last invocation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sindre" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers , libXft, mtl, parsec, permute, process, regex-pcre, setlocale @@ -179456,10 +188278,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "singleton-bool"; - version = "0.1.2.0"; - sha256 = "17a49mka1h7cd5jmgd3wm0dr45pwmc5i76xjaq7jcqsk193d1frk"; - revision = "1"; - editedCabalFile = "13x8chqhrlmrsca0018p7z5by3przlr9921yhjc072c8433br586"; + version = "0.1.4"; + sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/phadej/singleton-bool#readme"; description = "Type level booleans"; @@ -179476,30 +188296,44 @@ self: { homepage = "https://github.com/amiddelk/singleton-dict#readme"; description = "Typelevel balanced search trees via a singletonized Data.Map"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singleton-nats" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.4.0.3"; - sha256 = "150pfyfgyvksx600c9c7pyw154dvjgfiykas3wxfzkm3l9mhg32v"; + version = "0.4.0.4"; + sha256 = "1cizvqiv1hw7an2c2k1mbj9089n6rrggyf5pv2pcl7knpy07hph4"; libraryHaskellDepends = [ base singletons ]; homepage = "https://github.com/AndrasKovacs/singleton-nats"; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-typelits" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singleton-typelits"; + version = "0.0.0.0"; + sha256 = "00f2nvs4avl3kxijcl7wb17ip1mcnb4fzqq5ckcz0a247qvv4yig"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mniip/singleton-typelits"; + description = "Singletons and induction over GHC TypeLits"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "singletons" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl - , process, syb, tasty, tasty-golden, template-haskell, th-desugar + , process, syb, tasty, tasty-golden, template-haskell, text + , th-desugar }: mkDerivation { pname = "singletons"; - version = "2.2"; - sha256 = "1bwcsp1x8bivmvkv8a724lsnwyjharhb0x0hl0isp3jgigh0dg9k"; + version = "2.3.1"; + sha256 = "1i5fmz2fqk3ijcv38ig1wmbjlva5r4imlwgindir63nmhpgy93fa"; libraryHaskellDepends = [ - base containers mtl syb template-haskell th-desugar + base containers mtl syb template-haskell text th-desugar ]; testHaskellDepends = [ base Cabal directory filepath process tasty tasty-golden @@ -179509,20 +188343,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "singletons_2_3_1" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl - , process, syb, tasty, tasty-golden, template-haskell, text - , th-desugar + "singletons_2_4_1" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc-boot-th + , mtl, process, syb, tasty, tasty-golden, template-haskell, text + , th-desugar, transformers }: mkDerivation { pname = "singletons"; - version = "2.3.1"; - sha256 = "1i5fmz2fqk3ijcv38ig1wmbjlva5r4imlwgindir63nmhpgy93fa"; + version = "2.4.1"; + sha256 = "1kzrl9njvkbvxylk9jg61vy3ksmxmzymci5hdp0ilpsah4620yjx"; libraryHaskellDepends = [ - base containers mtl syb template-haskell text th-desugar + base containers ghc-boot-th mtl syb template-haskell text + th-desugar transformers ]; testHaskellDepends = [ - base Cabal directory filepath process tasty tasty-golden + base directory filepath process tasty tasty-golden ]; homepage = "http://www.github.com/goldfirere/singletons"; description = "A framework for generating singleton types"; @@ -179540,6 +188375,7 @@ self: { homepage = "https://github.com/zaoqi/Signal.hs"; description = "Singnal"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sink" = callPackage @@ -179577,20 +188413,20 @@ self: { "siphon" = callPackage ({ mkDerivation, attoparsec, base, bytestring, colonnade - , contravariant, either, HUnit, pipes, profunctors, QuickCheck - , streaming, test-framework, test-framework-hunit + , contravariant, doctest, either, HUnit, pipes, profunctors + , QuickCheck, streaming, test-framework, test-framework-hunit , test-framework-quickcheck2, text, transformers, vector }: mkDerivation { pname = "siphon"; - version = "0.7"; - sha256 = "1k03gzgi9d27yzcvmxzibpgc5l6k7g41048x1qxd3l67qpxxbsl9"; + version = "0.8.0"; + sha256 = "1ssjbpl4vdx7z2gbl3xywlljk8iq25kaqgcsryigsmx9mgv7194q"; libraryHaskellDepends = [ attoparsec base bytestring colonnade streaming text transformers vector ]; testHaskellDepends = [ - base bytestring colonnade contravariant either HUnit pipes + base bytestring colonnade contravariant doctest either HUnit pipes profunctors QuickCheck streaming test-framework test-framework-hunit test-framework-quickcheck2 text ]; @@ -179602,26 +188438,29 @@ self: { "siren-json" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, hspec, http-media, http-types, network-uri - , QuickCheck, quickcheck-instances, test-invariant, text - , unordered-containers + , containers, hspec, hspec-discover, http-media, http-types + , network-arbitrary, network-uri, network-uri-json, QuickCheck + , quickcheck-instances, test-invariant, text, unordered-containers }: mkDerivation { pname = "siren-json"; - version = "0.1.0.1"; - sha256 = "1wm1pkdq6wrnw8rkyf5sq4iic8qijzliwd1nmqsvrq35vid5ms2i"; + version = "0.1.3.1"; + sha256 = "1chwf9kldwf039qad55la4yh13wjax64g0pi99hw2b46x7dx4qm1"; libraryHaskellDepends = [ aeson base bytestring containers http-media http-types network-uri - text unordered-containers + network-uri-json text unordered-containers ]; testHaskellDepends = [ aeson base bytestring case-insensitive containers hspec http-media - http-types network-uri QuickCheck quickcheck-instances - test-invariant text unordered-containers + http-types network-arbitrary network-uri network-uri-json + QuickCheck quickcheck-instances test-invariant text + unordered-containers ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/alunduil/siren-json.hs"; description = "Siren Tools for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sirkel" = callPackage @@ -179651,7 +188490,6 @@ self: { homepage = "http://github.com/alpmestan/sitemap"; description = "Sitemap parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sitepipe" = callPackage @@ -179662,8 +188500,8 @@ self: { }: mkDerivation { pname = "sitepipe"; - version = "0.2.0.0"; - sha256 = "15cynic59qkfgb8d3ca6hr3dag0cs48af266xaiblpvim39rk1fb"; + version = "0.3.0.0"; + sha256 = "0h1qcc9d721yczd1szylxpxc1nzi2np6xa5b1rlsck6yjr238bwz"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache @@ -179673,6 +188511,7 @@ self: { 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 @@ -179701,6 +188540,8 @@ self: { pname = "size-based"; version = "0.1.0.0"; sha256 = "1h791s39nr057w5f2fr4v7p1czw9jm0dk5qrhr26qyw97j4ysngx"; + revision = "2"; + editedCabalFile = "1p4iglrrl5s47cxn520saiszw5wwr4x1kn9xbgn7awz29mv7pmd2"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -179710,26 +188551,49 @@ self: { "sized" = callPackage ({ mkDerivation, base, constraints, containers, deepseq - , equational-reasoning, hashable, lens, ListLike, mono-traversable - , monomorphic, singletons, type-natural, vector + , equational-reasoning, ghc-typelits-presburger, hashable, lens + , ListLike, mono-traversable, singletons, type-natural, vector }: mkDerivation { pname = "sized"; - version = "0.2.1.1"; - sha256 = "1agy5yyj6ci89v1jp6k2lj2316h9sap7x65j8n5w7d4ldqsb3i7z"; + version = "0.3.0.0"; + sha256 = "1w00s0wgbr1n2x2ariixixy07bhxiyp5728givdrz0xg63gnw1s7"; libraryHaskellDepends = [ - base constraints containers deepseq equational-reasoning hashable - lens ListLike mono-traversable monomorphic singletons type-natural - vector + base constraints containers deepseq equational-reasoning + ghc-typelits-presburger hashable lens ListLike mono-traversable + singletons type-natural vector ]; description = "Sized sequence data-types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sized-grid" = callPackage + ({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad + , constraints, distributive, generics-sop, hedgehog, HUnit, lens + , markdown-unlit, mtl, random, tasty, tasty-hedgehog, tasty-hunit + , vector, vector-space + }: + mkDerivation { + pname = "sized-grid"; + version = "0.1.0.0"; + sha256 = "1dj5sgmr8114i5ldpdmybwbwg5gkbm30kbk2196pq65jjcvjinxx"; + libraryHaskellDepends = [ + adjunctions aeson base comonad constraints distributive + generics-sop lens mtl random vector vector-space + ]; + testHaskellDepends = [ + adjunctions aeson ansi-terminal base comonad distributive + generics-sop hedgehog HUnit lens markdown-unlit tasty + tasty-hedgehog tasty-hunit vector-space + ]; + homepage = "https://github.com/edwardwas/sized-grid"; + description = "Multidimensional grids with sized specified at compile time"; + license = stdenv.lib.licenses.mit; + }) {}; + "sized-types" = callPackage - ({ mkDerivation, array, base, base-compat, containers, QuickCheck - , singletons + ({ mkDerivation, array, base, base-compat, containers, singletons }: mkDerivation { pname = "sized-types"; @@ -179742,11 +188606,10 @@ self: { libraryHaskellDepends = [ array base base-compat containers singletons ]; - executableHaskellDepends = [ base base-compat ]; - testHaskellDepends = [ base QuickCheck ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools"; description = "Sized types in Haskell using the GHC Nat kind"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sized-vector" = callPackage @@ -179929,6 +188792,7 @@ self: { homepage = "http://github.com/geekyfox/skulk"; description = "Eclectic collection of utility functions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylark-client" = callPackage @@ -179956,73 +188820,93 @@ self: { }) {}; "skylighting" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring - , case-insensitive, containers, criterion, Diff, directory - , filepath, HUnit, hxt, mtl, pretty-show, random - , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit, text - , utf8-string + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random + , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, text, utf8-string }: mkDerivation { pname = "skylighting"; - version = "0.1.1.5"; - sha256 = "0g5i6cz2b1rlx1h66zjl2lcdr6li7rk4sdmxhr9x7vng5imncjqa"; + version = "0.6"; + sha256 = "1027rcj6zqmnwm6is5k5v28r8af8bsf6i36dwi128h5g92pg206f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base blaze-html bytestring case-insensitive containers - directory filepath hxt mtl regex-pcre-builtin safe text utf8-string - ]; - executableHaskellDepends = [ - aeson base blaze-html bytestring case-insensitive containers - directory filepath hxt pretty-show regex-pcre-builtin safe text - utf8-string + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe text utf8-string ]; testHaskellDepends = [ aeson base bytestring containers Diff directory filepath HUnit - pretty-show random tasty tasty-golden tasty-hunit text + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text ]; benchmarkHaskellDepends = [ - base criterion directory filepath text + base containers criterion directory filepath text ]; homepage = "https://github.com/jgm/skylighting"; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_4_3_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary - , blaze-html, bytestring, case-insensitive, containers, criterion - , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random - , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit, text + "skylighting_0_7_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, directory, filepath, hxt + , mtl, regex-pcre-builtin, safe, skylighting-core, text , utf8-string }: mkDerivation { pname = "skylighting"; - version = "0.4.3.2"; - sha256 = "00qs35kjj68z75vmc0ijqn5ghrq2gdyi5q2j9x4lchvizgq6czhw"; + version = "0.7.1"; + sha256 = "0x7mn1dn6hsqwvcq6l3yx74g5lpq1zwh96mba9h24xsw0zqd9g60"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring binary blaze-html - bytestring case-insensitive containers directory filepath hxt mtl - regex-pcre-builtin safe text utf8-string + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe skylighting-core text + utf8-string ]; - executableHaskellDepends = [ - aeson base base64-bytestring binary blaze-html bytestring - case-insensitive containers directory filepath hxt pretty-show - regex-pcre-builtin safe text utf8-string + homepage = "https://github.com/jgm/skylighting"; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "skylighting-core" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random + , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, text, transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.7.1"; + sha256 = "0gkjv36cbqyzvxvqfjdz816901x949zjmyasrvgwwlyvahsj5zjg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe text transformers + utf8-string ]; testHaskellDepends = [ aeson base bytestring containers Diff directory filepath HUnit - pretty-show random tasty tasty-golden tasty-hunit text + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text ]; benchmarkHaskellDepends = [ base containers criterion directory filepath text ]; homepage = "https://github.com/jgm/skylighting"; description = "syntax highlighting library"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.bsd3; }) {}; "skype4hs" = callPackage @@ -180062,6 +188946,7 @@ self: { homepage = "https://github.com/jdevelop/skypelogexport/wiki"; description = "Export Skype chat logs to text files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -180133,8 +189018,8 @@ self: { }: mkDerivation { pname = "slack-web"; - version = "0.2.0.2"; - sha256 = "18hp8s5qcl2756p6sdx98d49p6bjk44616z9mcpd2ic9gcrs60q5"; + version = "0.2.0.4"; + sha256 = "1wbqz6shqm39ivmw7k2pwslaygxf4rxxbkiczxzpvd29y5pm81ah"; libraryHaskellDepends = [ aeson base containers errors http-api-data http-client http-client-tls megaparsec mtl servant servant-client @@ -180150,6 +189035,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "slate" = callPackage + ({ mkDerivation, base, directory, filepath, htoml + , optparse-applicative, process, string-conversions + , unordered-containers + }: + mkDerivation { + pname = "slate"; + version = "0.10.0.0"; + sha256 = "0f21bmv0dckdim27mm5m7vphci45h6fjbxyzpahai2nlydilhnc6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath htoml optparse-applicative process + string-conversions unordered-containers + ]; + executableHaskellDepends = [ + base directory filepath htoml optparse-applicative process + string-conversions unordered-containers + ]; + testHaskellDepends = [ + base directory filepath htoml optparse-applicative process + string-conversions unordered-containers + ]; + homepage = "https://github.com/evuez/slate#readme"; + description = "A note taking CLI tool"; + license = stdenv.lib.licenses.mit; + }) {}; + "slave-thread" = callPackage ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore @@ -180169,6 +189082,7 @@ self: { homepage = "https://github.com/nikita-volkov/slave-thread"; description = "A principal solution to ghost threads and silent exceptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sleep" = callPackage @@ -180258,6 +189172,7 @@ self: { homepage = "http://akc.is/sloane"; description = "A command line interface to Sloane's OEIS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slope-field" = callPackage @@ -180317,6 +189232,8 @@ self: { pname = "slug"; version = "0.1.7"; sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp"; + revision = "3"; + editedCabalFile = "1kqaqhg8bkrkax41pbi18612s0m9w2324n5akn5nhmxq0zla73vh"; libraryHaskellDepends = [ aeson base exceptions http-api-data path-pieces persistent QuickCheck text @@ -180348,8 +189265,8 @@ self: { }: mkDerivation { pname = "smallcaps"; - version = "0.6.0.4"; - sha256 = "1lw5zzfpizwrbpm981xr7sx1ac7iwkhwp541g276sszq927ls8n5"; + version = "0.6.0.5"; + sha256 = "06cqknha64gmf3rjjmcr3358fd5rii6xlgph5fvan0h25cnlk7nw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180368,8 +189285,8 @@ self: { ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }: mkDerivation { pname = "smallcheck"; - version = "1.1.2"; - sha256 = "14690ahl3iq99hw638qk0bpmkmspghjz2yh8p1nyccli92y23xjm"; + version = "1.1.3.1"; + sha256 = "1lmx0sxkhryra7laln8m7z0518jshahsvz121xybajjcz9pz3xcz"; libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; @@ -180421,6 +189338,7 @@ self: { homepage = "https://github.com/jdnavarro/smallcheck-series"; description = "Extra SmallCheck series and utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallpt-hs" = callPackage @@ -180539,6 +189457,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "smcdel" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, base, containers + , criterion, cudd, directory, file-embed, filepath, graphviz, happy + , HasCacBDD, hspec, js-jquery, lens, process, QuickCheck, scotty + , tagged, template-haskell, temporary, text, time + }: + mkDerivation { + pname = "smcdel"; + version = "1.0.0"; + sha256 = "1yi2qw76i9cch1flnqd7gsradkm2gr31i8595rwf11xgvj3r3s3f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers cudd graphviz HasCacBDD lens process + QuickCheck tagged temporary text time + ]; + executableHaskellDepends = [ + ansi-terminal base directory file-embed filepath HasCacBDD + js-jquery process scotty template-haskell text + ]; + executableToolDepends = [ alex happy ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ base containers criterion time ]; + homepage = "https://github.com/jrclogic/SMCDEL"; + description = "Symbolic Model Checking for Dynamic Epistemic Logic"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sme" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -180581,14 +189528,15 @@ self: { testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; homepage = "https://github.com/zmactep/smiles#readme"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smoothie" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; - version = "0.4.2.7"; - sha256 = "1cnyckmwqj0caw2vcbmvzha8hs1207pq11mlmwpk2w6qccs1qml4"; + version = "0.4.2.8"; + sha256 = "0fy0rygg2r73zfcgxmamlz1xfbpfxbljxcwjx9rnp0c8v9aq2m2s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base linear text vector ]; homepage = "https://github.com/phaazon/smoothie"; @@ -180611,6 +189559,7 @@ self: { homepage = "https://github.com/GetShopTV/smsaero"; description = "SMSAero API and HTTP client based on servant library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smt-lib" = callPackage @@ -180705,6 +189654,7 @@ self: { ]; description = "Helper functions to create SMTLib expressions in QuickCheck"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smtlib2-timing" = callPackage @@ -180789,6 +189739,7 @@ self: { homepage = "https://github.com/enzoh/smtps-gmail"; description = "Gmail SMTP Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snake" = callPackage @@ -180821,19 +189772,19 @@ self: { "snap" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal , clientsession, configurator, containers, deepseq, directory - , directory-tree, dlist, filepath, Glob, hashable, heist - , http-streams, HUnit, lens, lifted-base, map-syntax, monad-control - , mtl, mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core + , directory-tree, dlist, filepath, hashable, heist, http-streams + , HUnit, lens, lifted-base, map-syntax, monad-control, mtl + , mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core , snap-server, stm, syb, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-smallcheck, text, time , transformers, transformers-base, unordered-containers, xmlhtml }: mkDerivation { pname = "snap"; - version = "1.0.0.2"; - sha256 = "0jx2prq0lxq9jqxqk8f059lwjm2yqxzwb9lx6iviq57flx4zxyqq"; - revision = "1"; - editedCabalFile = "1df44l26sxfk2qprs2vcfigzyzkxxwxi8siaaikbvmjzyjm0mby1"; + version = "1.1.0.0"; + sha256 = "166ilpc4dd4020mmqn2lrfs3j5dl4a2mvqag1sz4mx7jcndrjbc8"; + revision = "3"; + editedCabalFile = "0jkxlbbx4whwqqxb1c04xp1zanzmda4b4bwz8swk2pcixmmzx2xa"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -180844,7 +189795,7 @@ self: { testHaskellDepends = [ aeson async attoparsec base bytestring cereal clientsession configurator containers deepseq directory directory-tree dlist - filepath Glob hashable heist http-streams HUnit lens lifted-base + filepath hashable heist http-streams HUnit lens lifted-base map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck smallcheck snap-core snap-server stm syb test-framework test-framework-hunit test-framework-quickcheck2 @@ -180886,20 +189837,21 @@ self: { "snap-auth-cli" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , clientsession, cmdargs, snap, text, unordered-containers - , utf8-string + , clientsession, cmdargs, snap, snaplet-sqlite-simple + , sqlite-simple, text, unordered-containers, utf8-string }: mkDerivation { pname = "snap-auth-cli"; - version = "0.1.0.1"; - sha256 = "0spdn7zazd17yrcx004m4yag8vy4bac4997f81nfvy25jvg87hhl"; + version = "0.2"; + sha256 = "1h93v7fkrdpp5ls2b2g7r7wnf6abfl8q0nld1qzzqj927lzgnzwa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson aeson-pretty base bytestring clientsession cmdargs snap text - unordered-containers utf8-string + aeson aeson-pretty base bytestring clientsession cmdargs snap + snaplet-sqlite-simple sqlite-simple text unordered-containers + utf8-string ]; - homepage = "https://github.com/dzhus/snap-auth-cli"; + homepage = "https://github.com/dzhus/snap-auth-cli#readme"; description = "Command-line tool to manage Snap AuthManager database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -180956,10 +189908,8 @@ self: { }: mkDerivation { pname = "snap-core"; - version = "1.0.3.1"; - sha256 = "0m2pbz7r5dllk859r8bs3yjkmdh4xrw0vafz390jfmj15vaz0j87"; - revision = "1"; - editedCabalFile = "0yf3i0pb14zff083cnz4lszg5bkbbzg5r1v3yj9s66dchrszrjbd"; + version = "1.0.3.2"; + sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -180982,21 +189932,16 @@ self: { }) {}; "snap-cors" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, case-insensitive - , hashable, network, network-uri, snap, text, unordered-containers - }: + ({ mkDerivation, snap-core }: mkDerivation { pname = "snap-cors"; - version = "1.2.11"; - sha256 = "0d5gmii970z9nr4fp911xar6b6798dmjhnxhvids420why5k3gc1"; - libraryHaskellDepends = [ - attoparsec base bytestring case-insensitive hashable network - network-uri snap text unordered-containers - ]; - homepage = "http://github.com/ocharles/snap-cors"; + version = "1.3.0"; + sha256 = "182l2wfkjanxa5n2g5ypsvdgvigfnk5f4n0am37c26lgk3n6zi9a"; + libraryHaskellDepends = [ snap-core ]; + doHaddock = false; + homepage = "https://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-elm" = callPackage @@ -181021,8 +189966,8 @@ self: { }: mkDerivation { pname = "snap-error-collector"; - version = "1.1.4"; - sha256 = "0k9nddbqdd6c12vrl5pqsl02pv38bhcxk5j02sq8lx7pk05w0mam"; + version = "1.1.5"; + sha256 = "0xpz24f2h1rzqs9j15skz1cmk18mh472zsix620shp3qjlma3da4"; libraryHaskellDepends = [ async base containers lifted-base monad-loops snap stm time transformers @@ -181044,8 +189989,8 @@ self: { }: mkDerivation { pname = "snap-extras"; - version = "0.12.1.0"; - sha256 = "1lkdva37dcg6zvy02v65qi8pwzia7wai0ny744jdr659lmninn4g"; + version = "0.12.1.1"; + sha256 = "0x5j5d4g605i2pnkaryy1d7pxikdwz2pmns7lp9sliii7h6yq2n6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -181071,8 +190016,8 @@ self: { }: mkDerivation { pname = "snap-language"; - version = "0.1.0.2"; - sha256 = "0dm99hdl2npl9g213d6smiwk4ir0fd7xc4f2c2hz4dkgfxbz44lq"; + version = "0.1.0.3"; + sha256 = "18nw841pl2ba1ms3gksd9m928ihkhrh9553jq616sf22gwg7ykjh"; libraryHaskellDepends = [ attoparsec base bytestring containers snap-core ]; @@ -181107,6 +190052,8 @@ self: { pname = "snap-loader-static"; version = "1.0.0.0"; sha256 = "04i9fn84101w8ybns8m2830zlw2vvg81pzrs0vmj6s691y3ivxas"; + revision = "1"; + editedCabalFile = "0ghxjdh5hv2nb3m1rax3rlgszxrfv4x1dxb5n4f1h6xaya9ya0hh"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://snapframework.com/"; description = "Snap static loader"; @@ -181171,8 +190118,8 @@ self: { pname = "snap-server"; version = "1.0.3.3"; sha256 = "1vjfpgcl09l974mdsvgxdlqcl68xmn33z1scx3sfyvcnz32xnnkl"; - revision = "1"; - editedCabalFile = "1laqh4q98ia8l7znhsv4vpx04rb9sdb9dgycx4aychfrb0fbb3pc"; + revision = "3"; + editedCabalFile = "0y0rd2skx59knkxm53zg6m4mi0p4rj9jw32vsj9mbl8sy2vw9hlj"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -181182,12 +190129,46 @@ self: { io-streams-haproxy lifted-base mtl network old-locale openssl-streams snap-core text time unix unix-compat vector ]; - executableHaskellDepends = [ + testHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + bytestring-builder case-insensitive clock containers deepseq + directory filepath HsOpenSSL http-common http-streams HUnit + io-streams io-streams-haproxy lifted-base monad-control mtl network + old-locale openssl-streams parallel QuickCheck random snap-core + test-framework test-framework-hunit test-framework-quickcheck2 text + threads time transformers unix unix-compat vector + ]; + benchmarkHaskellDepends = [ attoparsec base blaze-builder bytestring bytestring-builder - case-insensitive clock containers directory HsOpenSSL io-streams + criterion io-streams io-streams-haproxy snap-core vector + ]; + homepage = "http://snapframework.com/"; + description = "A web server for the Snap Framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "snap-server_1_1_0_0" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, bytestring-builder, case-insensitive, clock + , containers, criterion, deepseq, directory, filepath, HsOpenSSL + , http-common, http-streams, HUnit, io-streams, io-streams-haproxy + , lifted-base, monad-control, mtl, network, old-locale + , openssl-streams, parallel, QuickCheck, random, snap-core + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, threads, time, transformers, unix, unix-compat, vector + }: + mkDerivation { + pname = "snap-server"; + version = "1.1.0.0"; + sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4"; + configureFlags = [ "-fopenssl" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers filepath HsOpenSSL io-streams io-streams-haproxy lifted-base mtl network old-locale - openssl-streams snap-core text time transformers unix unix-compat - vector + openssl-streams snap-core text time unix unix-compat vector ]; testHaskellDepends = [ attoparsec base base16-bytestring blaze-builder bytestring @@ -181205,6 +190186,7 @@ self: { homepage = "http://snapframework.com/"; description = "A web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-templates" = callPackage @@ -181214,10 +190196,8 @@ self: { }: mkDerivation { pname = "snap-templates"; - version = "1.0.0.0"; - sha256 = "06sns89y2b2y8ln9ci99vph9v67yphcvw7fwdqgp41wx2x496a7n"; - revision = "1"; - editedCabalFile = "0y86zbaw4ain6ia15b7fpr48sxxz37x230qvrf28dicxcxm8jmva"; + version = "1.0.0.1"; + sha256 = "1l6gc2ppsvbaf783namglpyzghhynlg97q3ajc2ralibs21vsn7c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -181408,6 +190388,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snaplet-customauth" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary + , binary-orphans, bytestring, configurator, containers, errors + , heist, hoauth2, http-client, http-client-tls, lens, map-syntax + , mtl, random, snap, snap-core, text, time, transformers + , unordered-containers, uri-bytestring, xmlhtml + }: + mkDerivation { + pname = "snaplet-customauth"; + version = "0.1.0"; + sha256 = "1xc45lvhr3psqhv87n75f5968q129fgz3cz6362qvcnbnyyiznz3"; + libraryHaskellDepends = [ + aeson base base64-bytestring binary binary-orphans bytestring + configurator containers errors heist hoauth2 http-client + http-client-tls lens map-syntax mtl random snap snap-core text time + transformers unordered-containers uri-bytestring xmlhtml + ]; + description = "Alternate authentication snaplet"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snaplet-environments" = callPackage ({ mkDerivation, base, bson, configurator, mtl, regex-tdfa, snap , snap-core, text, unordered-containers @@ -181706,21 +190708,21 @@ self: { "snaplet-persistent" = callPackage ({ mkDerivation, base, bytestring, clientsession, configurator - , errors, heist, lens, monad-logger, MonadCatchIO-transformers, mtl - , persistent, persistent-postgresql, persistent-template, readable + , errors, heist, lens, map-syntax, monad-logger, mtl, persistent + , persistent-postgresql, persistent-template, readable , resource-pool, resourcet, safe, snap, text, time, transformers , unordered-containers }: mkDerivation { pname = "snaplet-persistent"; - version = "0.5"; - sha256 = "1zbxknmsg9q6jwbxr4nh8nkfgkjmxb7pr2wwqa7rgr0wvh8ipx5k"; + version = "0.6.0"; + sha256 = "1gvnf4fkylazq8bjb8kcv70vcd2k1r2dw5l53r624d10p23fsa8k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clientsession configurator errors heist lens - monad-logger MonadCatchIO-transformers mtl persistent - persistent-postgresql persistent-template readable resource-pool - resourcet safe snap text time transformers unordered-containers + map-syntax monad-logger mtl persistent persistent-postgresql + persistent-template readable resource-pool resourcet safe snap text + time transformers unordered-containers ]; homepage = "https://github.com/soostone/snaplet-persistent"; description = "persistent snaplet for the Snap Framework"; @@ -181805,10 +190807,9 @@ self: { }) {}; "snaplet-redis" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, clientsession - , configurator, hedis, heist, lens, monad-control, mtl, network - , snap, snap-core, snap-server, text, time, transformers - , unordered-containers, xmlhtml + ({ mkDerivation, base, bytestring, cereal, clientsession + , configurator, hedis, lens, mtl, network, snap, snap-core, text + , time, transformers, unordered-containers }: mkDerivation { pname = "snaplet-redis"; @@ -181820,10 +190821,6 @@ self: { base bytestring cereal clientsession configurator hedis lens mtl network snap snap-core text time transformers unordered-containers ]; - executableHaskellDepends = [ - aeson base bytestring hedis heist lens monad-control mtl snap - snap-core snap-server text time xmlhtml - ]; homepage = "https://github.com/dzhus/snaplet-redis#readme"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -182214,6 +191211,7 @@ self: { homepage = "https://github.com/nmattia/snipcheck#readme"; description = "Markdown tester"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snippet-extractor" = callPackage @@ -182411,6 +191409,7 @@ self: { homepage = "https://github.com/aiya000/hs-snowtify#README.md"; description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap" = callPackage @@ -182421,8 +191420,8 @@ self: { }: mkDerivation { pname = "soap"; - version = "0.2.3.5"; - sha256 = "01xprcrgy0galalh27by3csbm8m2m9dxlw3y83s4qnassv8zf2xs"; + version = "0.2.3.6"; + sha256 = "0xmiabnx814rwdwrcipv0kja6ljgwqr4x58sa8s07nrs3ph8xz6d"; libraryHaskellDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -182445,6 +191444,8 @@ self: { pname = "soap-openssl"; version = "0.1.0.2"; sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210"; + revision = "1"; + editedCabalFile = "1b3aivn9jfaax00id7x4cqvpmd6lgynslchlry0qsmq1lj466cdf"; libraryHaskellDepends = [ base configurator data-default HsOpenSSL http-client http-client-openssl soap text @@ -182461,8 +191462,8 @@ self: { }: mkDerivation { pname = "soap-tls"; - version = "0.1.1.2"; - sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4"; + version = "0.1.1.4"; + sha256 = "051shlb128lsacd2cjm4kpyqkmzdcwcj7ppl7l4n1k5j9g6k72yf"; libraryHaskellDepends = [ base configurator connection data-default http-client http-client-tls soap text tls x509 x509-store x509-validation @@ -182537,14 +191538,15 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.8"; - sha256 = "08zwn8p1nkizgs8spdkdmw1xkfsz6ryviv8shnbc8mnpxfs6wl7q"; + version = "1.3.9"; + sha256 = "1bn0x8l288rgq1x04a6xlaky8zwzqzs5zpbv80fvnnzqb4810035"; libraryHaskellDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-sctp" = callPackage @@ -182577,6 +191579,7 @@ self: { homepage = "https://github.com/vyacheslavhashov/haskell-socket-unix#readme"; description = "Unix domain sockets"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socketed" = callPackage @@ -182666,13 +191669,11 @@ self: { ({ mkDerivation, base, bytestring, cereal, network }: mkDerivation { pname = "socks"; - version = "0.5.5"; - sha256 = "0s689w1hh9g8ifl75xhzbv96ir07hwn04b4lgvbxzl8swa9ylir6"; - revision = "1"; - editedCabalFile = "0nz8q0xvd8y6f42bd1w3q8d8bg1qzl8ggx0a23kb3jb60g36dmvw"; + version = "0.5.6"; + sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs"; libraryHaskellDepends = [ base bytestring cereal network ]; homepage = "http://github.com/vincenthz/hs-socks"; - description = "Socks proxy (version 5) implementation"; + description = "Socks proxy (ver 5)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -182724,6 +191725,7 @@ self: { homepage = "https://github.com/chpatrick/solga"; description = "Simple typesafe web routing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "solga-swagger" = callPackage @@ -182742,6 +191744,7 @@ self: { homepage = "https://github.com/chpatrick/solga"; description = "Swagger generation for Solga"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "solr" = callPackage @@ -182824,19 +191827,15 @@ self: { }) {}; "sort-by-pinyin" = callPackage - ({ mkDerivation, air, air-extra, air-th, base, bytestring - , containers, text - }: + ({ mkDerivation, air, base, bytestring, containers, text }: mkDerivation { pname = "sort-by-pinyin"; - version = "2014.5.19"; - sha256 = "1ksfx5zhagg2y8virg8am1w8ljrzc9ddmf7xgvi5gx88zibi32fd"; + version = "2017.10.18"; + sha256 = "0gxz5kmkcmq8330v1iclhxqzfb6p9qk4prnskm16qmv2i4dp1p34"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ - air air-extra air-th base bytestring containers text - ]; + libraryHaskellDepends = [ air base bytestring containers text ]; homepage = "https://github.com/nfjinjing/sort-by-pinyin"; - description = "Sort simplified Chinese by PinYin"; + description = "Sort Simplified Chinese by PinYin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -183012,16 +192011,16 @@ self: { "sox" = callPackage ({ mkDerivation, base, containers, explicit-exception - , extensible-exceptions, process, sample-frame, transformers, unix - , utility-ht + , extensible-exceptions, process, sample-frame, semigroups + , transformers, unix, utility-ht }: mkDerivation { pname = "sox"; - version = "0.2.2.7"; - sha256 = "1z6jqrn7n66583pf5gafblh50j82s72w1mx31rj0ii8x70lggkbx"; + version = "0.2.3"; + sha256 = "145dmcj9vj58wrndidarnr7bbkybvzyda88awrxw4p3iqy8s2xb0"; libraryHaskellDepends = [ base containers explicit-exception extensible-exceptions process - sample-frame transformers unix utility-ht + sample-frame semigroups transformers unix utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Sox"; description = "Play, write, read, convert audio signals using Sox"; @@ -183132,19 +192131,20 @@ self: { homepage = "https://github.com/SeanRBurton/spaceprobe"; description = "Optimization over arbitrary search spaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spake2" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, memory - , optparse-applicative, protolude, QuickCheck, tasty, tasty-hspec + ({ mkDerivation, aeson, base, bytestring, cryptonite, memory + , optparse-applicative, process, protolude, QuickCheck, tasty + , tasty-hspec }: mkDerivation { pname = "spake2"; - version = "0.2.0"; - sha256 = "16yqr9kvhf71iajn6mld8y4svq0l5yz5ljpjmajnfw6lw8fbjrim"; + version = "0.4.2"; + sha256 = "02zvlh7pva2d2k56n3070wdp4chv6avhwzn7mg2zax1mzswd21r4"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cryptonite memory protolude ]; @@ -183152,11 +192152,13 @@ self: { base cryptonite memory optparse-applicative protolude ]; testHaskellDepends = [ - base cryptonite protolude QuickCheck tasty tasty-hspec + aeson base bytestring cryptonite memory process 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spanout" = callPackage @@ -183179,23 +192181,25 @@ self: { }) {}; "sparkle" = callPackage - ({ mkDerivation, base, binary, bytestring, choice - , distributed-closure, filepath, jni, jvm, jvm-streaming, process - , regex-tdfa, singletons, streaming, text, vector, zip-archive + ({ mkDerivation, base, binary, bytestring, Cabal, choice + , constraints, distributed-closure, filepath, inline-java, jni, jvm + , jvm-streaming, process, regex-tdfa, singletons, streaming + , temporary, text, unix, vector, zip-archive }: mkDerivation { pname = "sparkle"; - version = "0.5.0.1"; - sha256 = "0cyihfhxry3jrwyqrki14s6nw652w39m32ramg0nf1c85ahmhd3b"; + version = "0.7.4"; + sha256 = "174rs21fgj43rq3nshzgff6mydi93n26nkcq9cadq0bzcasc2n3q"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal inline-java jvm-streaming ]; libraryHaskellDepends = [ - base binary bytestring choice distributed-closure jni jvm - jvm-streaming singletons streaming text vector + base binary bytestring choice constraints distributed-closure + inline-java jni jvm jvm-streaming singletons streaming text vector ]; executableHaskellDepends = [ - base bytestring filepath process regex-tdfa text zip-archive + base bytestring filepath process regex-tdfa temporary text unix + zip-archive ]; homepage = "http://github.com/tweag/sparkle#readme"; description = "Distributed Apache Spark applications in Haskell"; @@ -183203,29 +192207,48 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sparkle_0_6" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, choice - , distributed-closure, filepath, inline-java, jni, jvm - , jvm-streaming, process, regex-tdfa, singletons, streaming, text - , vector, zip-archive + "sparql-protocol" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , http-client, lens, text, wreq }: mkDerivation { - pname = "sparkle"; - version = "0.6"; - sha256 = "11i0bk9yl8ba84xm2hfxlnspygfafdannafg42iqfg1q6f8h2y7w"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal inline-java ]; + pname = "sparql-protocol"; + version = "1.1.0.0"; + sha256 = "0nzgficvcbidxgsga106kgzwavf92qb75b6cd49fbp0fmw02krj7"; libraryHaskellDepends = [ - base binary bytestring choice distributed-closure inline-java jni - jvm jvm-streaming singletons streaming text vector + aeson base bytestring containers exceptions http-client lens text + wreq ]; - executableHaskellDepends = [ - base bytestring filepath process regex-tdfa text zip-archive + testHaskellDepends = [ base ]; + homepage = "https://github.com/ardamose123/sparql-protocol"; + description = "An SPARQL 1.1 Protocol client library."; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "sparrow" = callPackage + ({ mkDerivation, aeson, aeson-attoparsec, async, attoparsec + , attoparsec-uri, base, bytestring, deepseq, exceptions + , extractable-singleton, hashable, http-client, http-client-tls + , http-types, list-t, monad-control, monad-control-aligned, mtl + , nested-routes, path, path-extra, pred-trie, stm, strict, text + , tmapchan, tmapmvar, transformers, unordered-containers, urlpath + , uuid, wai, wai-middleware-content-type, wai-transformers + , websockets, websockets-simple, wuss + }: + mkDerivation { + pname = "sparrow"; + version = "0.0.1.4"; + sha256 = "0awj1gbrcdq4xp9dgj7q3jbfivjb4pjhkhd3acfgdqk08142fzj7"; + libraryHaskellDepends = [ + aeson aeson-attoparsec async attoparsec attoparsec-uri base + bytestring deepseq exceptions extractable-singleton hashable + http-client http-client-tls http-types list-t monad-control + monad-control-aligned mtl nested-routes path path-extra pred-trie + stm strict text tmapchan tmapmvar transformers unordered-containers + urlpath uuid wai wai-middleware-content-type wai-transformers + websockets websockets-simple wuss ]; - homepage = "http://github.com/tweag/sparkle#readme"; - description = "Distributed Apache Spark applications in Haskell"; + description = "Unified streaming dependency management for web apps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -183284,8 +192307,31 @@ self: { }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.2.9.8"; - sha256 = "19rhcnrlx6nf4yidb119wd3mm4xb5ls99wqk7vdif0cxlpnsycch"; + version = "0.2.9.9"; + sha256 = "1n3cxrmj5v0l5g1x1zb017sd59whpr6kfkzw3pckl1f93yh0jhf1"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers exceptions hspec mtl primitive QuickCheck + transformers vector vector-algorithms + ]; + testHaskellDepends = [ + base containers exceptions hspec matrix-market-attoparsec mtl + mwc-random primitive QuickCheck scientific + ]; + homepage = "https://github.com/ocramz/sparse-linear-algebra"; + description = "Numerical computing in native Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "sparse-linear-algebra_0_3_1" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec + , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck + , scientific, transformers, vector, vector-algorithms + }: + mkDerivation { + pname = "sparse-linear-algebra"; + version = "0.3.1"; + sha256 = "1jfwydr0pzph932h7jvnmp1d8qqrhxsq7rbb6cjbmga55s5pfqn7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers exceptions hspec mtl primitive QuickCheck @@ -183296,8 +192342,9 @@ self: { mwc-random primitive QuickCheck scientific ]; homepage = "https://github.com/ocramz/sparse-linear-algebra"; - description = "Numerical computation in native Haskell"; + description = "Numerical computing in native Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sparsebit" = callPackage @@ -183362,8 +192409,8 @@ self: { }: mkDerivation { pname = "spatial-math"; - version = "0.4.0.0"; - sha256 = "1qy5hk2zbjzwgdhl9n0q8p3jlrv2njxm5qflnylawl6ack7rwjz5"; + version = "0.5.0.0"; + sha256 = "0hkvpr9l5x7gjwzskr0ci62mr3mzg0yfdbvdsjwrn37201cajmg2"; libraryHaskellDepends = [ base binary cereal ghc-prim lens linear TypeCompose ]; @@ -183372,6 +192419,7 @@ self: { ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spawn" = callPackage @@ -183396,6 +192444,7 @@ self: { homepage = "https://github.com/phadej/spdx"; description = "SPDX license expression language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spe" = callPackage @@ -183488,32 +192537,28 @@ self: { }: mkDerivation { pname = "species"; - version = "0.4"; - sha256 = "04n9lrh058n66175drw3vsn57fd64j8wmn9wdchfb0557yqcjcmn"; - revision = "1"; - editedCabalFile = "0j69s6gpq0bzv42hkalz3nw35q07m5agdcs8kxv11s62jcm6idrs"; + version = "0.4.0.1"; + sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell ]; description = "Computational combinatorial species"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculate" = callPackage ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.3.0"; - sha256 = "05xc8dkrzf60pdbxw4mpdy2yqd4l3vxsqkq27f2wf6qqf6bc4vsh"; + version = "0.3.2"; + sha256 = "0cf8121hfmyj1jrklf2i1bp2q4517627vgaz1flf363n93jnckfk"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; homepage = "https://github.com/rudymatela/speculate#readme"; description = "discovery of properties about Haskell functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "speculation" = callPackage @@ -183646,6 +192691,7 @@ self: { homepage = "https://github.com/mackeyrms/sphinxesc#readme"; description = "Transform queries for sphinx input"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spice" = callPackage @@ -183839,8 +192885,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "split"; - version = "0.2.3.2"; - sha256 = "0fmnkvq1ky4dgyh1z2mvdal5pw103irvkf4p9d5x8wyl1nnylhs9"; + version = "0.2.3.3"; + sha256 = "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Combinator library for splitting lists"; @@ -183896,6 +192942,8 @@ self: { pname = "splitmix"; version = "0"; sha256 = "0qa86iflw1v8vqci8krj4kdvp648hnl8wx3wyhnd1c95jrla0fpi"; + revision = "2"; + editedCabalFile = "0fl7z9lxkyvqk0d14d778j3lk8zi8jgncwq41gqi4z78a20xb2pg"; libraryHaskellDepends = [ base random time ]; testHaskellDepends = [ base base-compat bytestring random tf-random @@ -183942,6 +192990,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Splot"; description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spool" = callPackage @@ -184010,8 +193059,8 @@ self: { }: mkDerivation { pname = "spreadsheet"; - version = "0.1.3.5"; - sha256 = "1h5a2ifr10ihaqvl819d0g3vnn2wzp27wqlfbk21v8wv07wrwckk"; + version = "0.1.3.7"; + sha256 = "180vv2bka5b97gl1g6vdsri2yrfyy6ivdq4jw98qiw50pz66c2l4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184063,6 +193112,7 @@ self: { homepage = "https://bitbucket.org/tdammers/sprinkles"; description = "JSON API to HTML website wrapper"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {pandoc-creole = null;}; @@ -184297,6 +193347,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sql-words_0_1_6_0" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-simple }: + mkDerivation { + pname = "sql-words"; + version = "0.1.6.0"; + sha256 = "065ymcym5vm5xmprbzgv88wk3b09j44ajvsd59apw6qr32j218rn"; + 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 @@ -184318,26 +193382,27 @@ self: { }) {inherit (pkgs) openssl;}; "sqlcli" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, base, logging, text, transformers, unixODBC }: mkDerivation { pname = "sqlcli"; - version = "0.1.0.0"; - sha256 = "1xkq7pjvmhb4gc85val4fnd6jsbx7dmybq842r40vdbbxj8swh5v"; - libraryHaskellDepends = [ base transformers ]; + version = "0.2.0.1"; + sha256 = "09x9g3rjz1idyr0rh885y4pdddn08g7hwcspa47n6yf5wlx33gln"; + libraryHaskellDepends = [ base logging text transformers ]; + librarySystemDepends = [ unixODBC ]; homepage = "http://hub.darcs.net/mihaigiurgeanu/sqlcli"; description = "Sql Call-Level Interface bindings for Haskell"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) unixODBC;}; "sqlcli-odbc" = callPackage - ({ mkDerivation, base, sqlcli }: + ({ mkDerivation, base, logging, sqlcli }: mkDerivation { pname = "sqlcli-odbc"; - version = "0.1.0.1"; - sha256 = "176jz0y435rdg1cg03a9aa2jd1a26gi5id9d3fbm91wv6fyjj6lm"; - libraryHaskellDepends = [ base sqlcli ]; - homepage = "https://hub.darcs.com/mihaigiurgeanu/sqlcli-odbc"; - description = "Specific ODBC definitions to be used by SQL CLI clients"; + version = "0.2.0.1"; + sha256 = "1rfhdaa0wmvc78nbjhi93p9sv66xa6rjr79yyhlkqi1d335b8vb5"; + libraryHaskellDepends = [ base logging sqlcli ]; + homepage = "https://hub.darcs.net/mihaigiurgeanu/sqlcli-odbc"; + description = "ODBC specific definitions to be used by SQL CLI clients"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -184362,15 +193427,15 @@ self: { "sqlite-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only - , text, time, transformers + , semigroups, text, time, transformers }: mkDerivation { pname = "sqlite-simple"; - version = "0.4.14.0"; - sha256 = "0zx4fdv6larfyj6m1d4livb5cqdx10yi06yd6px2n0wnxcmvdyj9"; + version = "0.4.15.0"; + sha256 = "1qk9dzrqfyjavyl9p0l24hbncp2c1faxx0yvjz5iq3s4dl6fswf0"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers - direct-sqlite Only text time transformers + direct-sqlite Only semigroups text time transformers ]; testHaskellDepends = [ base base16-bytestring bytestring direct-sqlite HUnit text time @@ -184384,13 +193449,14 @@ self: { ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }: mkDerivation { pname = "sqlite-simple-errors"; - version = "0.6.0.0"; - sha256 = "106rpzxdnsp7g84fh5yvmj145pz5ghrd5cicg1yj5pxlyrgvm5z6"; + version = "0.6.1.0"; + sha256 = "0vvim8zcrl3yqhf30j69x59qs5f6sdx5bvy4ihwmimkldm5gh0ai"; libraryHaskellDepends = [ base parsec sqlite-simple text ]; testHaskellDepends = [ base mtl sqlite-simple text ]; homepage = "https://github.com/caneroj1/sqlite-simple-errors"; description = "Wrapper around errors from sqlite-simple"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sqlite-simple-typed" = callPackage @@ -184474,14 +193540,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "squeal-postgresql_0_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest + , generics-sop, lifted-base, mmorph, monad-control, mtl, network-ip + , postgresql-binary, postgresql-libpq, resource-pool, scientific + , text, time, transformers, transformers-base, uuid-types, vector + }: + mkDerivation { + pname = "squeal-postgresql"; + version = "0.2.1.0"; + sha256 = "1qfz1c4yzjshgvc64plahy3aar96yvcmn2m5giyp17nrfgq266qs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring deepseq generics-sop lifted-base mmorph + monad-control mtl network-ip postgresql-binary postgresql-libpq + resource-pool scientific text time transformers transformers-base + uuid-types vector + ]; + executableHaskellDepends = [ + base bytestring generics-sop mtl text transformers + transformers-base vector + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/morphismtech/squeal"; + description = "Squeal PostgreSQL Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "squeeze" = callPackage - ({ mkDerivation, base, Cabal, data-default, directory, factory - , filepath, mtl, QuickCheck, random, toolshed + ({ mkDerivation, base, Cabal, data-default, directory, extra + , factory, filepath, mtl, QuickCheck, random, toolshed }: mkDerivation { pname = "squeeze"; - version = "1.0.4.13"; - sha256 = "0s6qkfkm8vxqc3vwgzdhayalyrdgbybxw5p1imvsgn409i7vhiyd"; + version = "1.0.4.16"; + sha256 = "0ywlxh7988i87qxpmja79a98ri9myzk4648d2j3aihsfdm34w2cr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184490,7 +193585,9 @@ self: { executableHaskellDepends = [ base Cabal data-default factory filepath mtl random toolshed ]; - testHaskellDepends = [ base factory QuickCheck toolshed ]; + testHaskellDepends = [ + base Cabal extra factory QuickCheck toolshed + ]; homepage = "http://functionalley.eu/Squeeze/squeeze.html"; description = "A file-packing application"; license = "GPL"; @@ -184539,8 +193636,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "srcloc"; - version = "0.5.1.1"; - sha256 = "05qsyrpzbbawpnfmq8v1rr36kvnycarlr3v91hmbj33vk73acj1i"; + version = "0.5.1.2"; + sha256 = "0vn0zqsk191ghh2993hls05hp7kvnskaafnfrrqhfbmpdg7dp7h6"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mainland/srcloc"; description = "Data types for managing source code locations"; @@ -184653,7 +193750,6 @@ self: { isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base iproute text ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit iproute QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text unix @@ -184679,6 +193775,7 @@ self: { homepage = "https://github.com/Teaspot-Studio/ssh-tunnel#readme"; description = "Proxy http-client via ssh tunnel"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sshd-lint" = callPackage @@ -184840,6 +193937,7 @@ self: { libraryHaskellDepends = [ base ghc-prim hashtables ]; description = "Memoization based on argument identity"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stable-tree" = callPackage @@ -184869,36 +193967,6 @@ self: { }) {}; "stache" = 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.2"; - sha256 = "0vmqfs956cziwb3q2v4nzn4b9d87062z9pixwfr7iiwd0ypmmiv6"; - revision = "2"; - editedCabalFile = "1bwdg0y98bw8p1857isjcg3f51d0nv52zbfc0s6f9syq70ahbhz9"; - enableSeparateDataOutput = true; - 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; - }) {}; - - "stache_1_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec , megaparsec, mtl, template-haskell, text, unordered-containers @@ -184908,6 +193976,8 @@ self: { pname = "stache"; version = "1.2.1"; sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; + revision = "4"; + editedCabalFile = "03qy0mlyiwpv98aq74m3pyarg6v6w9vn8qlq6ljdlb40xi1p9s7z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -184923,74 +193993,90 @@ self: { 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, base64-bytestring, binary - , binary-tagged, blaze-builder, bytestring, Cabal, clock, conduit - , conduit-extra, containers, cryptonite, cryptonite-conduit - , deepseq, directory, echo, either, errors, exceptions, extra - , fast-logger, file-embed, filelock, filepath, fsnotify - , generic-deriving, ghc-prim, gitrev, hackage-security, hashable - , hastache, hpack, hpc, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-async, lifted-base, memory - , microlens, microlens-mtl, mintty, 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, store-core - , 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 + , attoparsec, base, base64-bytestring, bindings-uname + , blaze-builder, bytestring, Cabal, clock, conduit, conduit-extra + , containers, cryptonite, cryptonite-conduit, deepseq, directory + , echo, exceptions, extra, fast-logger, file-embed, filelock + , filepath, fsnotify, generic-deriving, gitrev, hackage-security + , hashable, hastache, hpack, hpc, hspec, http-client + , http-client-tls, http-conduit, http-types, memory, microlens + , microlens-mtl, mintty, monad-logger, mono-traversable, mtl + , neat-interpolation, network-uri, open-browser + , optparse-applicative, optparse-simple, path, path-io, persistent + , persistent-sqlite, persistent-template, pid1, pretty, primitive + , process, project-template, QuickCheck, regex-applicative-text + , resourcet, retry, semigroups, smallcheck, split, stm, store + , store-core, streaming-commons, tar, template-haskell, temporary + , text, text-metrics, th-reify-many, time, tls, transformers + , unicode-transforms, unix, unix-compat, unliftio + , unordered-containers, vector, yaml, zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.5.1"; - sha256 = "1hw8lwk4dxfzw27l64g2z7gscpnp7adw5cc8kplldazj0y2cnf6x"; + version = "1.6.5"; + sha256 = "0f5a0znxwmib03vhqkw0yiv89a82z43wlm7zwfyx30gfz6iqqp7f"; revision = "1"; - editedCabalFile = "1ywghpdjnwzk1m67fg5hzz16hxf7pqf5wayyzk1xjbnnl989gll6"; + editedCabalFile = "11bmzlf3gxbz2gij0l2999a296z4c12l27f7jfyfka8l1k15d6b1"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base-compat base64-bytestring binary binary-tagged blaze-builder - bytestring Cabal clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo either errors exceptions - extra fast-logger file-embed filelock filepath fsnotify - generic-deriving ghc-prim hackage-security hashable hastache hpack - hpc http-client http-client-tls http-conduit http-types - lifted-async lifted-base memory microlens microlens-mtl mintty - 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 store-core - 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 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 = [ - async attoparsec base bytestring Cabal conduit conduit-extra - containers cryptonite directory exceptions filepath hashable hspec - http-client-tls http-conduit monad-logger mono-traversable - neat-interpolation optparse-applicative path path-io process - QuickCheck resourcet retry smallcheck store template-haskell - temporary text th-reify-many transformers unix-compat - unordered-containers vector yaml + base64-bytestring bindings-uname blaze-builder bytestring Cabal + clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory echo exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + hackage-security hashable hastache hpack hpc http-client + http-client-tls http-conduit http-types memory microlens + microlens-mtl mintty monad-logger mono-traversable mtl + neat-interpolation network-uri open-browser optparse-applicative + path path-io persistent persistent-sqlite persistent-template pid1 + pretty primitive process project-template regex-applicative-text + resourcet retry semigroups split stm store store-core + streaming-commons tar template-haskell temporary text text-metrics + th-reify-many time tls transformers unicode-transforms unix + unix-compat unliftio unordered-containers vector yaml zip-archive + zlib + ]; + executableHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal async attoparsec base + base64-bytestring bindings-uname blaze-builder bytestring Cabal + clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory echo exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + gitrev hackage-security hashable hastache hpack hpc http-client + http-client-tls http-conduit http-types memory microlens + microlens-mtl mintty monad-logger mono-traversable mtl + neat-interpolation network-uri open-browser optparse-applicative + optparse-simple path path-io persistent persistent-sqlite + persistent-template pid1 pretty primitive process project-template + regex-applicative-text resourcet retry semigroups split stm store + store-core streaming-commons tar template-haskell temporary text + text-metrics th-reify-many time tls transformers unicode-transforms + unix unix-compat unliftio unordered-containers vector yaml + zip-archive zlib + ]; + testHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal async attoparsec base + base64-bytestring bindings-uname blaze-builder bytestring Cabal + clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory echo exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + hackage-security hashable hastache hpack hpc hspec http-client + http-client-tls http-conduit http-types memory microlens + microlens-mtl mintty monad-logger mono-traversable mtl + neat-interpolation network-uri open-browser optparse-applicative + path path-io persistent persistent-sqlite persistent-template pid1 + pretty primitive process project-template QuickCheck + regex-applicative-text resourcet retry semigroups smallcheck split + stm store store-core streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -185058,6 +194144,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stack-lib" = callPackage + ({ mkDerivation, base, monad-logger, path, stack, time + , transformers + }: + mkDerivation { + pname = "stack-lib"; + version = "0.1.0.0"; + sha256 = "0fb7svqqp2p3q3a2w5nkxxlqk3v3lmkhrdhfk8cfkkwjz2gpb4bf"; + libraryHaskellDepends = [ + base monad-logger path stack time transformers + ]; + homepage = "https://github.com/clintonmead/stack-lib#readme"; + description = "Wrapper to use stack as a library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stack-prism" = callPackage ({ mkDerivation, base, profunctors, tagged, template-haskell , transformers @@ -185073,6 +194175,7 @@ self: { homepage = "https://github.com/MedeaMelana/stack-prism"; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-run" = callPackage @@ -185093,6 +194196,7 @@ self: { homepage = "https://github.com/yamadapc/stack-run"; description = "An equivalent to cabal run for stack"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-run-auto" = callPackage @@ -185121,6 +194225,7 @@ self: { homepage = "http://github.com/yamadapc/stack-run-auto#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-type" = callPackage @@ -185135,6 +194240,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stack-yaml" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, filepath + , Glob, text, yaml + }: + mkDerivation { + pname = "stack-yaml"; + version = "0.1.0.0"; + sha256 = "14cs9mds6xfy39nzyariisqxkzpkzi0r86ldb0kw60g4wgy9m6m5"; + libraryHaskellDepends = [ + base bytestring directory filepath text yaml + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/phlummox/stack-yaml"; + description = "Parse a stack.yaml file"; + license = stdenv.lib.licenses.mit; + }) {}; + "stack2nix" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , data-fix, directory, filepath, Glob, hnix, monad-parallel @@ -185245,54 +194367,10 @@ self: { homepage = "https://www.stackage.org/package/stackage-cli"; description = "A CLI library for stackage commands"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-curator" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async - , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal - , classy-prelude-conduit, conduit, conduit-extra, containers - , cryptohash, cryptohash-conduit, data-default-class, directory - , exceptions, filepath, hashable, hspec, html-conduit, http-client - , http-client-tls, http-conduit, lucid, mime-types, monad-unlift - , monad-unlift-ref, mono-traversable, mtl, old-locale - , optparse-applicative, optparse-simple, process, QuickCheck - , resourcet, safe, semigroups, stm, store, streaming-commons, syb - , system-fileio, system-filepath, tar, temporary, text, time - , transformers, unix-compat, unordered-containers, utf8-string - , vector, xml-conduit, xml-types, yaml, zlib - }: - mkDerivation { - pname = "stackage-curator"; - version = "0.14.5"; - sha256 = "11ccjjv6lvivjnkwcgr565hlxgs1sispx561fl1hkxw0mwp1q0hi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 async base - base16-bytestring blaze-html byteable bytestring Cabal - classy-prelude-conduit conduit conduit-extra containers cryptohash - cryptohash-conduit data-default-class directory exceptions filepath - hashable html-conduit http-client http-client-tls http-conduit - lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl - old-locale process resourcet safe semigroups stm store - streaming-commons syb system-fileio system-filepath tar temporary - text time transformers unix-compat unordered-containers utf8-string - vector xml-conduit xml-types yaml zlib - ]; - executableHaskellDepends = [ - aeson base http-client http-client-tls optparse-applicative - optparse-simple system-filepath text - ]; - testHaskellDepends = [ - base Cabal classy-prelude-conduit containers directory hspec - http-client http-client-tls QuickCheck text yaml - ]; - homepage = "https://github.com/fpco/stackage-curator"; - description = "Tools for curating Stackage bundles"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stackage-curator_0_15_1_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, blaze-html, bytestring, Cabal, classy-prelude-conduit , conduit, conduit-extra, containers, cryptonite @@ -185308,8 +194386,8 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.15.1.0"; - sha256 = "158bxk5g1bc139nmdqvr4fid5igmsgqa1d4nxy0dpl8xb68l69jp"; + version = "0.16.0.0"; + sha256 = "17mnrxnnb70fd0h571i049pfkmpmsxrgpr970z6w6jli6mp1721j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185370,6 +194448,8 @@ self: { pname = "stackage-metadata"; version = "0.3.0.0"; sha256 = "08hs6gnya0ci07gsacc01hvjamwh9xnfni9ihg7wf77w4vrncssx"; + revision = "1"; + editedCabalFile = "1kfdzvvfxlc0y23mdwklm3szb91zjwpzibb68jgjf1hkmv5kfzk3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185382,8 +194462,9 @@ self: { stackage-install stackage-update tar text transformers yaml ]; homepage = "https://github.com/commercialhaskell/all-cabal-metadata-tool"; - description = "Grab current metadata for all packages"; + description = "DEPRECATED Grab current metadata for all packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-query" = callPackage @@ -185403,6 +194484,7 @@ self: { homepage = "https://github.com/juhp/stackage-query"; description = "Stackage package query"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-sandbox" = callPackage @@ -185424,6 +194506,7 @@ self: { homepage = "https://www.stackage.org/package/stackage-sandbox"; description = "Work with shared stackage sandboxes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-setup" = callPackage @@ -185467,6 +194550,7 @@ self: { homepage = "https://github.com/fpco/stackage-types"; description = "Shared data types between various Stackage packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-update" = callPackage @@ -185505,6 +194589,7 @@ self: { homepage = "https://github.com/fpco/stackage-upload"; description = "A more secure version of cabal upload which uses HTTPS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage2nix" = callPackage @@ -185517,8 +194602,8 @@ self: { }: mkDerivation { pname = "stackage2nix"; - version = "0.3.0"; - sha256 = "1cgcdgsw8qbc7dcfvj2jhwaja5x03fqa8f67c8f86fzrn0wcvw47"; + version = "0.6.1"; + sha256 = "0wqa6lrn2l38grg4h24ihacchavsyglbvlmlsfh4s9h1300dngab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185532,7 +194617,7 @@ self: { testHaskellDepends = [ base bytestring Cabal hspec pretty shakespeare text yaml ]; - homepage = "https://github.com/4e6/stackage2nix#readme"; + homepage = "https://github.com/typeable/stackage2nix#readme"; description = "Convert Stack files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -185551,19 +194636,22 @@ self: { }) {}; "stagen" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default - , directory, filemanip, lucid, markdown, mtl, optparse-applicative - , parallel, parsec, text + ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring + , data-default, directory, feed, filemanip, json-feed, lucid + , markdown, mtl, network-uri, optparse-applicative, parallel + , parsec, text, text-conversions, time, xml, xml-conduit, xml-types }: mkDerivation { pname = "stagen"; - version = "0.0.0"; - sha256 = "17hvijrkc0lczppp8c73n8drjghn7mmwhdai0m4rilga3vminw7r"; + version = "0.2.1"; + sha256 = "14gyak2gg05xbrx93bl1x7jfy2rwmzczpvip7h21bysqk964rh8j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base blaze-html bytestring data-default directory filemanip - lucid markdown mtl optparse-applicative parallel parsec text + aeson base base-compat blaze-html bytestring data-default directory + feed filemanip json-feed lucid markdown mtl network-uri + optparse-applicative parallel parsec text text-conversions time xml + xml-conduit xml-types ]; executableHaskellDepends = [ base ]; description = "Static site generator"; @@ -185606,8 +194694,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "star"; - version = "0.0.0.2"; - sha256 = "1xg1gfdkskhkvd1a2nlaxc9942xi1j406p58i4ycb15lqcz8nz27"; + version = "0.0.1.0"; + sha256 = "03lk46s8v3pgxgk4ddyf382rspqvkf61v9bffhym0pd4didnz9d5"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/chessai/star#readme"; description = "*-semirings"; @@ -185672,6 +194760,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "starter" = callPackage + ({ mkDerivation, base, fsnotify }: + mkDerivation { + pname = "starter"; + version = "0.2.1"; + sha256 = "1lghrnygc984a4ybdisp11kdcljwygx5ybiacnk7d0p1x8205zk0"; + libraryHaskellDepends = [ base fsnotify ]; + homepage = "https://github.com/rkaippully/starter#readme"; + description = "Develop applications without restarts"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "stash" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , hashable, text, vector @@ -185742,6 +194842,7 @@ self: { testHaskellDepends = [ base checkers mtl QuickCheck ]; description = "MonadPlus for StateT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "state-record" = callPackage @@ -185763,8 +194864,10 @@ self: { }: mkDerivation { pname = "stateWriter"; - version = "0.2.9"; - sha256 = "0kvkf3lh60sz0nfscjd6skr52b11mh7wk4ls64z5hmdjr4cnjgmm"; + version = "0.2.10"; + sha256 = "0g1r7zn1ahky9wmqbimjryca3hkylx15xpqwhc42gkyf7h7kq2b8"; + revision = "1"; + editedCabalFile = "19zp7wy2k6f5dqw0wfj9wzarjgfr20nvw5rmqiv79h66qssjl9i6"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base free hspec mtl QuickCheck ]; benchmarkHaskellDepends = [ @@ -185773,6 +194876,7 @@ self: { ]; description = "A faster variant of the RWS monad transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statechart" = callPackage @@ -185819,8 +194923,8 @@ self: { pname = "statestack"; version = "0.2.0.5"; sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl"; - revision = "1"; - editedCabalFile = "0kf1jdhdv9fiwlbn2915sg39x23lfxlyp2qb7jkrvx8p8v2sam7i"; + revision = "2"; + editedCabalFile = "0c10cv107ls0wm7gs3gvknd8a1gqvrkk97frn8lp1ch697mz44rp"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -185837,6 +194941,7 @@ self: { libraryHaskellDepends = [ applicative base transformers ]; description = "The ST monad and STRefs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {applicative = null;}; @@ -185855,7 +194960,6 @@ self: { homepage = "http://github.com/brendanhay/statgrab"; description = "Collect system level metrics and statistics"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libstatgrab;}; "static-canvas" = callPackage @@ -185864,10 +194968,30 @@ self: { pname = "static-canvas"; version = "0.2.0.3"; sha256 = "0jfp3nk9flzjw0qjkbh7rk7q0g6dsmgqb2xwrfmg5pnf13gj821p"; + revision = "1"; + editedCabalFile = "1z3mi5z590xxmipd5fxylcmf39rrwvmwva2rkk6km1nxb5kfasl7"; libraryHaskellDepends = [ base double-conversion free mtl text ]; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "static-closure" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, containers + , ghc-instances, template-haskell + }: + mkDerivation { + pname = "static-closure"; + version = "0.1.0.0"; + sha256 = "16cjjyn51wsv3ngc8fbivlshnjp085xxxnv0snyywyxpna1nn79d"; + libraryHaskellDepends = [ + base binary bytestring constraints containers ghc-instances + template-haskell + ]; + homepage = "https://github.com/clintonmead/static-closure#readme"; + description = "Serialisable static pointers to functions"; + license = stdenv.lib.licenses.bsd3; }) {}; "static-hash" = callPackage @@ -185909,8 +195033,8 @@ self: { }: mkDerivation { pname = "static-tensor"; - version = "0.2.0.0"; - sha256 = "1jnl9gv2z4554arzfkrna49vn646i4q57l3g8pq4phzzmq79hh1p"; + version = "0.2.1.0"; + sha256 = "0h95kmrm2kqs84kcp2n3cdrkqn7ygnypqj357gvwxv3wj6zldrp2"; libraryHaskellDepends = [ base deepseq lens mono-traversable singletons split template-haskell @@ -185927,6 +195051,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "static-text" = callPackage + ({ mkDerivation, base, bytestring, doctest, doctest-discover, tasty + , tasty-hunit, template-haskell, text, vector + }: + mkDerivation { + pname = "static-text"; + version = "0.2.0.1"; + sha256 = "0acj953bclr2b9qd1i5b1grxrz07pr38f9q720j92v4xpk8i4pgd"; + libraryHaskellDepends = [ + base bytestring template-haskell text vector + ]; + testHaskellDepends = [ + base bytestring doctest doctest-discover tasty tasty-hunit + template-haskell + ]; + homepage = "https://github.com/dzhus/static-text#readme"; + description = "Lists, Texts, ByteStrings and Vectors of statically known length"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "staticanalysis" = callPackage ({ mkDerivation, base, MissingH }: mkDerivation { @@ -185939,30 +195084,6 @@ self: { }) {}; "statistics" = callPackage - ({ mkDerivation, aeson, base, 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 - }: - mkDerivation { - pname = "statistics"; - version = "0.13.3.0"; - sha256 = "1vc12c3mnpspbycwkl0b22jqrdbg9fpmr1fxdxlmqwl603qy0zvf"; - libraryHaskellDepends = [ - aeson base binary deepseq erf math-functions monad-par mwc-random - primitive vector vector-algorithms vector-binary-instances - ]; - testHaskellDepends = [ - 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.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 @@ -185973,6 +195094,8 @@ self: { pname = "statistics"; version = "0.14.0.2"; sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l"; + revision = "1"; + editedCabalFile = "0gg7hq8qvbnhp7lnrykh401ggr51izffylgdmy6nip2a81q9dxi0"; libraryHaskellDepends = [ aeson base base-orphans binary deepseq erf math-functions monad-par mwc-random primitive vector vector-algorithms @@ -185986,7 +195109,6 @@ self: { 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 @@ -186099,6 +195221,7 @@ self: { homepage = "https://github.com/keithduncan/statsd-client"; description = "Statsd UDP client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statsd-datadog" = callPackage @@ -186117,6 +195240,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "status-notifier-item" = callPackage + ({ mkDerivation, base, bytestring, containers, dbus, filepath + , hslogger, lens, mtl, network, optparse-applicative, spool + , template-haskell, transformers, vector + }: + mkDerivation { + pname = "status-notifier-item"; + version = "0.1.0.0"; + sha256 = "1g1gf3anqrg8mfdyjvymk5wlg0h4pfc0pv4wlw5phk6r93dxah1n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dbus filepath hslogger lens mtl network + spool template-haskell transformers vector + ]; + executableHaskellDepends = [ + base dbus hslogger optparse-applicative + ]; + homepage = "https://github.com/IvanMalison/status-notifier-item#readme"; + description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "statvfs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -186137,8 +195284,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.1.2"; - sha256 = "01ag624x240ybnapc49vcsiw5kz4n1v3csn1572phdav6dlpap35"; + version = "0.2.1.4"; + sha256 = "1lhj8cbn8x1dxd9pv0sr298i304vaj4zdpasz1r9avpyxwcq6shc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186149,8 +195296,7 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring Cabal filepath hspec http-client http-client-tls - QuickCheck semigroups 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?"; @@ -186173,13 +195319,11 @@ self: { ({ mkDerivation, base, hspec, vector }: mkDerivation { pname = "stb-image-redux"; - version = "0.2.1.0"; - sha256 = "07gbj7qqgm3dwx6bign8qma3a0187p5nil7z612976bdpz9abr60"; - revision = "2"; - editedCabalFile = "1ils1w36y3c4ik0mxnadrhxw1fy426av438ckg2fgnzys0i5zqp2"; + version = "0.2.1.2"; + sha256 = "1s23f38za0zv9vzj4qn5qq2ajhgr6g9gsd2nck2hmkqfjpw1mx1v"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec vector ]; - homepage = "https://github.com/sasinestro/stb-image-redux#readme"; + homepage = "https://github.com/typedrat/stb-image-redux#readme"; description = "Image loading and writing microlibrary"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -186275,6 +195419,7 @@ self: { homepage = "https://github.com/schell/steeloverseer#readme"; description = "A file watcher and development tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stego-uuid" = callPackage @@ -186302,6 +195447,7 @@ self: { homepage = "http://www.github.com/bgamari/stemmer"; description = "Haskell bindings to the Snowball stemming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stemmer-german" = callPackage @@ -186313,14 +195459,15 @@ self: { libraryHaskellDepends = [ base text ]; description = "Extract the stem of a German inflected word form"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "step-function" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck }: mkDerivation { pname = "step-function"; - version = "0.1.1.1"; - sha256 = "01by500w17156mvjy7mgic68cch25pn56fxj40jn0pqih331mxly"; + version = "0.1.1.2"; + sha256 = "1lsa84mc752lghpjszhwhky9hnpihy7wivdm0r6yl70k721s3ifk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base Cabal cabal-test-quickcheck QuickCheck @@ -186328,7 +195475,6 @@ self: { homepage = "https://github.com/jonpetterbergman/step-function"; description = "Step functions, staircase functions or piecewise constant functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stepwise" = callPackage @@ -186345,11 +195491,10 @@ self: { "stgi" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers - , deepseq, doctest, parsers, prettyprinter - , prettyprinter-ansi-terminal, QuickCheck, semigroups, smallcheck - , tasty, tasty-html, tasty-hunit, tasty-quickcheck, tasty-rerun - , tasty-smallcheck, template-haskell, text, th-lift, transformers - , trifecta + , deepseq, parsers, prettyprinter, prettyprinter-ansi-terminal + , QuickCheck, semigroups, smallcheck, tasty, tasty-html + , tasty-hunit, tasty-quickcheck, tasty-rerun, tasty-smallcheck + , template-haskell, text, th-lift, transformers, trifecta }: mkDerivation { pname = "stgi"; @@ -186364,9 +195509,9 @@ self: { ]; executableHaskellDepends = [ ansi-terminal base semigroups text ]; testHaskellDepends = [ - ansi-wl-pprint base containers deepseq doctest prettyprinter - QuickCheck semigroups smallcheck tasty tasty-html tasty-hunit - tasty-quickcheck tasty-rerun tasty-smallcheck template-haskell text + ansi-wl-pprint base containers deepseq prettyprinter QuickCheck + semigroups smallcheck tasty tasty-html tasty-hunit tasty-quickcheck + tasty-rerun tasty-smallcheck template-haskell text ]; homepage = "https://github.com/quchen/stgi#readme"; description = "Educational implementation of the STG (Spineless Tagless G-machine)"; @@ -186391,24 +195536,24 @@ self: { }: mkDerivation { pname = "stitch"; - version = "0.4.0.0"; - sha256 = "0xxdj4k4ci0gkvnnvb1rl0v31pjv209yyz88dzpdpr5x58i19hbj"; + version = "0.5.0.0"; + sha256 = "0dk9h9arldzwsfg8cad374w7lipi4w43ady7dsmima4jyg4724h9"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base Cabal hspec text ]; benchmarkHaskellDepends = [ base criterion ]; description = "lightweight CSS DSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.4.4.1"; - sha256 = "111kpy1d6f5c0bggh6hyfm86q5p8bq1qbqf6dw2x4l4dxnar16cg"; - revision = "1"; - editedCabalFile = "0kzw4rw9fgmc4qyxmm1lwifdyrx5r1356150xm14vy4mp86diks9"; + version = "2.4.5.0"; + sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri"; libraryHaskellDepends = [ array base ]; + homepage = "https://wiki.haskell.org/Software_transactional_memory"; description = "Software Transactional Memory"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -186425,11 +195570,14 @@ self: { }) {}; "stm-chans" = callPackage - ({ mkDerivation, base, stm }: + ({ mkDerivation, base, Cabal, stm }: mkDerivation { pname = "stm-chans"; version = "3.0.0.4"; sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13"; + revision = "1"; + editedCabalFile = "0v9axxcfszqdmf3dhjxy34ybh22x3r5c48mdnbvjh5i5lp7g7vp2"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base stm ]; homepage = "http://code.haskell.org/~wren/"; description = "Additional types of channels for STM"; @@ -186452,25 +195600,24 @@ self: { "stm-conduit" = callPackage ({ mkDerivation, async, base, cereal, cereal-conduit, conduit - , conduit-combinators, conduit-extra, directory, doctest, ghc-prim - , HUnit, lifted-async, lifted-base, monad-control, monad-loops + , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops , QuickCheck, resourcet, stm, stm-chans, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers - , void + , unliftio }: mkDerivation { pname = "stm-conduit"; - version = "3.0.0"; - sha256 = "02d83mji1rlijdn315q7fik6jy5q49fjwygd64c9kf4z0qy6cvyg"; + version = "4.0.0"; + sha256 = "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z"; libraryHaskellDepends = [ - async base cereal cereal-conduit conduit conduit-combinators - conduit-extra directory ghc-prim lifted-async lifted-base - monad-control monad-loops resourcet stm stm-chans transformers void + async base cereal cereal-conduit conduit conduit-extra directory + exceptions monad-loops resourcet stm stm-chans transformers + unliftio ]; testHaskellDepends = [ - base conduit conduit-combinators directory doctest HUnit QuickCheck - resourcet stm stm-chans test-framework test-framework-hunit - test-framework-quickcheck2 transformers + base conduit directory doctest HUnit QuickCheck resourcet stm + stm-chans test-framework test-framework-hunit + test-framework-quickcheck2 transformers unliftio ]; homepage = "https://github.com/cgaebel/stm-conduit"; description = "Introduces conduits to channels, and promotes using conduits concurrently"; @@ -186504,6 +195651,7 @@ self: { homepage = "https://github.com/nikita-volkov/stm-containers"; description = "Containers for STM"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-delay" = callPackage @@ -186609,6 +195757,7 @@ self: { homepage = "http://www.github.com/danr/stm-promise"; description = "Simple STM Promises for IO computations and external processes"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-queue-extras" = callPackage @@ -186716,6 +195865,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stocks" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit, semigroups + }: + mkDerivation { + pname = "stocks"; + version = "0.1.0.0"; + sha256 = "10ws7mg0236iqkjclajwph2lb5719adkay5imaxrsj13d10f8ssq"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit semigroups + ]; + homepage = "https://github.com/dabcoder/stocks#readme"; + description = "Library for the IEX Trading API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stomp-conduit" = callPackage ({ mkDerivation, base, conduit, mime, mtl, resourcet, stomp-queue , stompl @@ -186786,8 +195950,8 @@ self: { ({ mkDerivation, base, clock, hspec, transformers }: mkDerivation { pname = "stopwatch"; - version = "0.1.0.4"; - sha256 = "1hmmn4jf3rwk68himknzm9vy1mxbz4gvv810zp4r351mjcpw5x5r"; + version = "0.1.0.5"; + sha256 = "0q9l27cpfz5hs3ggxij0lk8p3vrgkjg1binhv2nwss4dvygdc7j6"; libraryHaskellDepends = [ base clock transformers ]; testHaskellDepends = [ base clock hspec ]; homepage = "https://github.com/debug-ito/stopwatch"; @@ -186833,14 +195997,16 @@ self: { }) {}; "storable-record" = callPackage - ({ mkDerivation, base, transformers, utility-ht }: + ({ mkDerivation, base, semigroups, transformers, utility-ht }: mkDerivation { pname = "storable-record"; - version = "0.0.3.1"; - sha256 = "1fmdzngikc8bi8bfk04bdd046j3i3v99g5bm2dfn5dz097pcxrbl"; + version = "0.0.4"; + sha256 = "0hjs1km0fc9ch0i1rbycxia5w3939hk4p4md73ikgg4aipqb5zyf"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base transformers utility-ht ]; + libraryHaskellDepends = [ + base semigroups transformers utility-ht + ]; homepage = "http://code.haskell.org/~thielema/storable-record/"; description = "Elegant definition of Storable instances for records"; license = stdenv.lib.licenses.bsd3; @@ -186874,16 +196040,16 @@ self: { "storablevector" = callPackage ({ mkDerivation, base, bytestring, deepseq, non-negative - , QuickCheck, random, sample-frame, syb, transformers, unsafe - , utility-ht + , QuickCheck, random, sample-frame, semigroups, syb, transformers + , unsafe, utility-ht }: mkDerivation { pname = "storablevector"; - version = "0.2.12.1"; - sha256 = "0y855kfwksrxspd18ppj7x1zyhbi3ackf4p01wsjal84b8ml1qd2"; + version = "0.2.13"; + sha256 = "1zmr738vwnhnyxbikayqnaz31ilv2qlmscp6iqgl7adcfbal4dzq"; libraryHaskellDepends = [ - base deepseq non-negative QuickCheck syb transformers unsafe - utility-ht + base deepseq non-negative QuickCheck semigroups syb transformers + unsafe utility-ht ]; testHaskellDepends = [ base bytestring QuickCheck random utility-ht @@ -186909,9 +196075,7 @@ self: { }) {}; "storablevector-streamfusion" = callPackage - ({ mkDerivation, base, binary, bytestring, old-time, storablevector - , stream-fusion, utility-ht - }: + ({ mkDerivation, base, storablevector, stream-fusion, utility-ht }: mkDerivation { pname = "storablevector-streamfusion"; version = "0.0"; @@ -186921,9 +196085,6 @@ self: { libraryHaskellDepends = [ base storablevector stream-fusion utility-ht ]; - executableHaskellDepends = [ - base binary bytestring old-time stream-fusion - ]; homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; description = "Conversion between storablevector and stream-fusion lists with fusion"; license = stdenv.lib.licenses.bsd3; @@ -187017,56 +196178,47 @@ self: { }) {}; "stratosphere" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.6.0"; - sha256 = "0mv21ac8lnrrgmay4j4bfmw9k8r7cw4mh0i9145drl62p0zi26g2"; + version = "0.19.1"; + sha256 = "0wfpqbhbr15qvvp9k0v1m1az02hpp25pglj4yl0ay7smm2848wi9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers + aeson aeson-pretty base bytestring containers 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 + aeson aeson-pretty base bytestring containers hashable hspec + hspec-discover lens 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; }) {}; - "stratosphere_0_11_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable - , hspec, hspec-discover, lens, template-haskell, text + "stratosphere_0_21_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.11.0"; - sha256 = "1l9wyyw8zvmb7z0qvs5qk0mxbjnlm1405sxiz7wzff6ibxvk9kn5"; + version = "0.21.0"; + sha256 = "14bahvq1yz51dwa6ljyj4l3aw3sv2njin00k01bvbizsqnbl8j8k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers + aeson aeson-pretty base bytestring containers hashable lens + template-haskell text unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring hashable hspec hspec-discover - lens template-haskell text unordered-containers + aeson aeson-pretty base bytestring containers hashable hspec + hspec-discover lens template-haskell text unordered-containers ]; homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; @@ -187230,6 +196382,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "streamdeck" = callPackage + ({ mkDerivation, base, bytestring, hidapi, mtl }: + mkDerivation { + pname = "streamdeck"; + version = "0.0.1"; + sha256 = "05qdnhhjqjs7cg7yvg9ryzxlw1mw3y5y55z4dy1cf5g98j01s449"; + libraryHaskellDepends = [ base bytestring hidapi mtl ]; + homepage = "https://github.com/wuest/haskell-streamdeck"; + description = "Control library for the Elgato Stream Deck"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streamed" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, containers , data-accessor, data-accessor-transformers, event-list, midi @@ -187251,23 +196415,68 @@ self: { }) {}; "streaming" = callPackage - ({ mkDerivation, base, containers, exceptions, ghc-prim, mmorph - , monad-control, mtl, resourcet, time, transformers - , transformers-base + ({ mkDerivation, base, containers, ghc-prim, mmorph, mtl + , semigroups, transformers, transformers-base }: mkDerivation { pname = "streaming"; - version = "0.1.4.5"; - sha256 = "0hv8vajs0syi5r5bbqra0lp2ycfd7gw3x0n51x431slcq3i21afn"; + version = "0.2.1.0"; + sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1"; libraryHaskellDepends = [ - base containers exceptions ghc-prim mmorph monad-control mtl - resourcet time transformers transformers-base + base containers ghc-prim mmorph mtl semigroups transformers + transformers-base ]; - homepage = "https://github.com/michaelt/streaming"; + homepage = "https://github.com/haskell-streaming/streaming"; description = "an elementary streaming prelude and general stream type"; license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, streaming + , streaming-bytestring, tasty, tasty-hunit + }: + mkDerivation { + pname = "streaming-attoparsec"; + version = "1.0.0"; + sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z"; + libraryHaskellDepends = [ + attoparsec base bytestring streaming streaming-bytestring + ]; + testHaskellDepends = [ + attoparsec base bytestring streaming streaming-bytestring tasty + tasty-hunit + ]; + homepage = "https://github.com/haskell-streaming/streaming-attoparsec"; + description = "Attoparsec integration for the streaming ecosystem"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "streaming-benchmarks" = callPackage + ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit + , csv, deepseq, directory, gauge, list-t, list-transformer, logict + , machines, mtl, pipes, random, split, streaming, streamly, text + , transformers, typed-process, vector + }: + mkDerivation { + pname = "streaming-benchmarks"; + version = "0.1.0"; + sha256 = "0nyv4z828fj8jhan7q0bx2s351xmbxz9z81g2x3nyk4ad1rqjpyq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Chart Chart-diagrams csv directory split text + typed-process + ]; + benchmarkHaskellDepends = [ + base conduit deepseq gauge list-t list-transformer logict machines + mtl pipes random streaming streamly transformers vector + ]; + homepage = "http://github.com/composewell/streaming-benchmarks"; + description = "Benchmarks to compare streaming packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-binary" = callPackage ({ mkDerivation, base, binary, bytestring, hspec, streaming , streaming-bytestring @@ -187294,8 +196503,8 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.4.6"; - sha256 = "00kars95baxdg97vfp904phnfszv4sicq7248wijkkzbg3frgmc9"; + version = "0.1.6"; + sha256 = "1lsklavhk6wcsgjr2rcwkkv827gnd9spv4zwz5i5zf3njvy27my1"; libraryHaskellDepends = [ base bytestring deepseq exceptions mmorph mtl resourcet streaming transformers transformers-base @@ -187304,7 +196513,7 @@ self: { base bytestring smallcheck streaming tasty tasty-smallcheck transformers ]; - homepage = "https://github.com/michaelt/streaming-bytestring"; + homepage = "https://github.com/haskell-streaming/streaming-bytestring"; description = "effectful byte steams, or: bytestring io done right"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -187316,8 +196525,8 @@ self: { }: mkDerivation { pname = "streaming-cassava"; - version = "0.1.0.0"; - sha256 = "17swzhq069rr041l33bwa5ybx1j6w9lvh3l3xs40m842njli2bac"; + version = "0.1.0.1"; + sha256 = "0dr58azgyw7ihxrabva7fh0yafq2kx12yvap4jl6ljnlwvcapa5i"; libraryHaskellDepends = [ base bytestring cassava mtl streaming streaming-bytestring transformers @@ -187328,18 +196537,17 @@ self: { ]; description = "Cassava support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-commons" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring - , criterion, deepseq, directory, hspec, network, process - , QuickCheck, random, stm, text, transformers, unix, zlib + , deepseq, directory, gauge, hspec, network, process, QuickCheck + , random, stm, text, transformers, unix, zlib }: mkDerivation { pname = "streaming-commons"; - version = "0.1.17"; - sha256 = "1abxyjkn8xc8d33yhqxy1ki01kpzf4hy55f167qg4vk2ig5kh2p5"; + version = "0.1.19"; + sha256 = "19qp8bnnfs31jk08991lmj3dywbjxh9iydriifbdjj2mvy8axz23"; libraryHaskellDepends = [ array async base blaze-builder bytestring directory network process random stm text transformers unix zlib @@ -187349,33 +196557,31 @@ self: { QuickCheck text unix zlib ]; benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text + base blaze-builder bytestring deepseq gauge text ]; homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; 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 + "streaming-commons_0_2_0_0" = callPackage + ({ mkDerivation, array, async, base, bytestring, deepseq, directory + , gauge, hspec, network, process, QuickCheck, random, stm, text + , transformers, unix, zlib }: mkDerivation { pname = "streaming-commons"; - version = "0.1.18"; - sha256 = "1jw3y3clh2l0kmsrkhhn6n1b8i8gnwz5cwbczj1kq00sj3xjxbr7"; + version = "0.2.0.0"; + sha256 = "0pyfibrz30azq22zq7zl4wvbl0mm9wrqw1047p437h950d3biqpl"; libraryHaskellDepends = [ - array async base blaze-builder bytestring directory network process - random stm text transformers unix zlib + array async base 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 + array async base bytestring deepseq hspec network QuickCheck text + unix zlib ]; + benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; @@ -187383,14 +196589,14 @@ self: { }) {}; "streaming-concurrency" = callPackage - ({ mkDerivation, base, exceptions, hspec, lifted-async + ({ mkDerivation, base, exceptions, hspec, HUnit, lifted-async , monad-control, QuickCheck, quickcheck-instances, stm, streaming - , streaming-with, transformers-base + , streaming-with, testbench, transformers-base }: mkDerivation { pname = "streaming-concurrency"; - version = "0.3.0.1"; - sha256 = "040x4g1q520s6a1kxi4j730r6vr7n539wg92mdcvg9bswa620yqj"; + version = "0.3.1.1"; + sha256 = "1qpcplkwdw8dinhn20wwnfgqf07gzyp61lx6m6w0126hr8fq9r35"; libraryHaskellDepends = [ base exceptions lifted-async monad-control stm streaming streaming-with transformers-base @@ -187398,8 +196604,13 @@ self: { testHaskellDepends = [ base hspec QuickCheck quickcheck-instances streaming ]; + benchmarkHaskellDepends = [ + base exceptions HUnit lifted-async monad-control streaming + testbench + ]; description = "Concurrency support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-conduit" = callPackage @@ -187408,8 +196619,8 @@ self: { }: mkDerivation { pname = "streaming-conduit"; - version = "0.1.2.0"; - sha256 = "1vzw0lfj8l4ic1fcw0iqiwygg4zrfxw9xdjbl7qpkfsjsbjqyg2q"; + version = "0.1.2.2"; + sha256 = "0g2x8a6gksc1na3qn1fnd9c7cckn4r54x11x4rxnmy2v04sv0h8z"; libraryHaskellDepends = [ base bytestring conduit streaming streaming-bytestring transformers ]; @@ -187438,6 +196649,7 @@ self: { ]; description = "Translate pull-based stream folds into push-based iteratees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-histogram" = callPackage @@ -187477,6 +196689,34 @@ self: { ]; description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "streaming-pcap" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, pcap + , streaming, streaming-bytestring, streaming-utils, tasty + , tasty-hunit + }: + mkDerivation { + pname = "streaming-pcap"; + version = "1.1.1"; + sha256 = "1riw6n3n5rbzfqlm0z6qbznlx2lc8bk2s1qjy8a9zx90wbys0xp1"; + libraryHaskellDepends = [ + attoparsec base bytestring pcap streaming streaming-bytestring + streaming-utils + ]; + testHaskellDepends = [ + attoparsec base bytestring pcap streaming streaming-bytestring + streaming-utils tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion pcap streaming + streaming-bytestring streaming-utils + ]; + homepage = "https://github.com/fosskers/streaming-pcap"; + description = "Stream packets via libpcap"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-png" = callPackage @@ -187498,6 +196738,7 @@ self: { homepage = "http://github.com/bch29/streaming-png#readme"; description = "Perfectly streaming PNG image decoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-postgresql-simple" = callPackage @@ -187507,16 +196748,36 @@ self: { }: mkDerivation { pname = "streaming-postgresql-simple"; - version = "0.2.0.1"; - sha256 = "1ffsxwgsaxqnf49n4lnyrh2zy6q9zc1i3ssd03m08ip813pk5j8k"; - revision = "1"; - editedCabalFile = "1y5j3p3gphr3mnzl1dvfmbm8iipsdy0vq2fk0klxgid1dsqfl2vn"; + version = "0.2.0.3"; + sha256 = "1gy6yy14q18zfbbj6rvsnhvhkra78m2jwbyd3hnpbx25jgvz230n"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers ]; description = "Stream postgresql-query results using the streaming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "streaming-sort" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, exceptions + , hspec, QuickCheck, streaming, streaming-binary + , streaming-bytestring, streaming-with, transformers + }: + mkDerivation { + pname = "streaming-sort"; + version = "0.1.0.2"; + sha256 = "0877zzip19zdfn7a5b59x911rh7cjxqmxyrr9ivhahgh8igfsjf9"; + libraryHaskellDepends = [ + base binary bytestring directory exceptions streaming + streaming-binary streaming-bytestring streaming-with transformers + ]; + testHaskellDepends = [ + base binary directory exceptions hspec QuickCheck streaming + streaming-with transformers + ]; + description = "Sorting streams"; + license = stdenv.lib.licenses.mit; }) {}; "streaming-utils" = callPackage @@ -187537,6 +196798,7 @@ self: { homepage = "https://github.com/michaelt/streaming-utils"; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-wai" = callPackage @@ -187562,8 +196824,8 @@ self: { }: mkDerivation { pname = "streaming-with"; - version = "0.2.0.0"; - sha256 = "02cdjmq7dxqfpqs73v7c63iwavbwb56fdd3pk4qs91vm6d0lfbrp"; + version = "0.2.1.1"; + sha256 = "0wyq183z10sr0sdx28n316x22f4h8v67cg164qir3fb7q09pmqbg"; libraryHaskellDepends = [ base exceptions managed streaming-bytestring temporary transformers ]; @@ -187571,6 +196833,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streamly" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion + , exceptions, hspec, lifted-base, lockfree-queue, monad-control + , mtl, stm, transformers, transformers-base + }: + mkDerivation { + pname = "streamly"; + version = "0.1.2"; + sha256 = "1axqac7zi2b87q91hxv75dpk4pfd4d4fcvsna7cjgkhkdvvjarzp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base containers exceptions lifted-base + lockfree-queue monad-control mtl stm transformers transformers-base + ]; + testHaskellDepends = [ base containers hspec ]; + benchmarkHaskellDepends = [ atomic-primops base criterion mtl ]; + homepage = "https://github.com/composewell/streamly"; + description = "Beautiful Streaming, Concurrent and Reactive Composition"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -187609,8 +196893,8 @@ self: { }: mkDerivation { pname = "strelka"; - version = "2.0.1"; - sha256 = "12bmfbsrgplyd42scppp74d5zck0a7vakc5jjz07lpvw0qahvxr4"; + version = "2.0.2.1"; + sha256 = "0wh702y5m7045jlr3qf2k852x68d7ylr16hanb6jjw2f476fnc7i"; libraryHaskellDepends = [ attoparsec attoparsec-data base base-prelude base64-bytestring bifunctors bytestring bytestring-tree-builder hashable http-media @@ -187647,8 +196931,8 @@ self: { }: mkDerivation { pname = "strelka-wai"; - version = "1.0.1"; - sha256 = "0zbz8aa5gvh4y5brypzkp8bn1gkkz4pcdmd3ga62xpym8hhf83cc"; + version = "1.0.1.1"; + sha256 = "05l26v777fifb5rpvmkyvaqr12f7q8i9780savx6wfabi6wvqh5i"; libraryHaskellDepends = [ base base-prelude bytestring case-insensitive http-types strelka-core text unordered-containers wai warp @@ -187690,8 +196974,8 @@ self: { }: mkDerivation { pname = "strict-base-types"; - version = "0.5.0"; - sha256 = "1jx10iqkdmrhakk1aq2g9vf8lfm8gd9y560s2s69qzzrszrsvg7y"; + version = "0.6.1"; + sha256 = "0yihvjijag9g55ihrgqj0vwn6ksvscj3r0n2zzxz2qbxrhx6m1pq"; libraryHaskellDepends = [ aeson base bifunctors binary deepseq ghc-prim hashable lens QuickCheck strict @@ -187711,7 +196995,6 @@ self: { homepage = "https://github.com/ygale/strict-concurrency"; description = "Strict concurrency abstractions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-data" = callPackage @@ -187791,7 +197074,6 @@ self: { homepage = "https://github.com/pepeiborra/strict-types"; description = "A type level predicate ranging over strict types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-writer" = callPackage @@ -187850,10 +197132,10 @@ self: { ({ mkDerivation, base, bytestring, tagged, text }: mkDerivation { pname = "string-class"; - version = "0.1.6.5"; - sha256 = "0yi3fagwqkgr8pf6wnl360qikyvfb649qs2y6gp0n7jjw0zc27c2"; + version = "0.1.7.0"; + sha256 = "1s0bj0wvwriw4516za6ar7w7zsz5mmnf1dba0ch239n27rb00nwf"; libraryHaskellDepends = [ base bytestring tagged text ]; - homepage = "https://github.com/bairyn/string-class"; + homepage = "https://github.com/string-class/string-class"; description = "String class library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -187917,13 +197199,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-isos" = callPackage + ({ mkDerivation, base, bytestring, mono-traversable, safe, text + , type-iso + }: + mkDerivation { + pname = "string-isos"; + version = "0.1.0.1"; + sha256 = "0sjla0l2pgc2bz1f0hlaxpzjl6ngpxca7l5x7mfsqi0grs8g4jqw"; + libraryHaskellDepends = [ + base bytestring mono-traversable safe text type-iso + ]; + description = "Tools for working with isomorphisms of strings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "string-qq" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, Cabal, process, template-haskell }: mkDerivation { pname = "string-qq"; version = "0.0.2"; sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp"; + revision = "1"; + editedCabalFile = "1flc6mr1nnv8mx69cy1ilwk5gxsidcns82vjdg8dcs8z5axg95kp"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ base template-haskell ]; description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; license = stdenv.lib.licenses.publicDomain; @@ -187984,8 +197285,25 @@ self: { }: mkDerivation { pname = "string-transform"; - version = "0.1.0"; - sha256 = "1hcb1mx2n01gxlfh3ndgsi8phjl1n04xxmhpr6175p9mxc61rsb4"; + version = "1.0.0"; + sha256 = "0556blv06jl973pnkcab36bsa3kjzjhzs396q31qmkqnqlpday4d"; + libraryHaskellDepends = [ base bytestring text utf8-string ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string + ]; + homepage = "https://github.com/ncaq/string-transform#readme"; + description = "simple and easy haskell string transform wrapper"; + license = stdenv.lib.licenses.mit; + }) {}; + + "string-transform_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , tasty-smallcheck, text, utf8-string + }: + mkDerivation { + pname = "string-transform"; + version = "1.1.0"; + sha256 = "1f76aiimm2knc68g08dc9j495mjkas87jw8w27silrsq3pzayzad"; libraryHaskellDepends = [ base bytestring text utf8-string ]; testHaskellDepends = [ base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string @@ -187993,6 +197311,7 @@ self: { homepage = "https://github.com/ncaq/string-transform#readme"; description = "simple and easy haskell string transform wrapper"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-typelits" = callPackage @@ -188027,8 +197346,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "stringbuilder"; - version = "0.5.0"; - sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9"; + version = "0.5.1"; + sha256 = "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "A writer monad for multi-line string literals"; @@ -188147,8 +197466,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.2.3"; - sha256 = "0vyqmz0q2davlqj2673pzj5qxawvrxypm2jd839igb5y0wnj9idv"; + version = "2.3.0"; + sha256 = "08656c3s9326kgppwiys7whil47yw6qibjzmivjzykh6858j0kfm"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -188162,13 +197481,12 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { pname = "stripe-haskell"; - version = "2.2.3"; - sha256 = "086baq9f9pzacf5vqvi2ikx47sijyb8r6ndnqph9r8qvjgc2xy2x"; + version = "2.3.0"; + sha256 = "18358axxx2rkv06bh1n48hsx3bh3bj4h3xx1ma3hvv68l9cprwsm"; libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-http-streams" = callPackage @@ -188177,8 +197495,8 @@ self: { }: mkDerivation { pname = "stripe-http-streams"; - version = "2.2.3"; - sha256 = "0bdl85xwm7ym1kf2d0vjn4652z3bgvzj2l7z5lgsxzr5acn6q02p"; + version = "2.3.0"; + sha256 = "0nn244ghmyibdrvzfz9k8skhsfh47sh8g34v1c63rkswqb4wpnsp"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text @@ -188189,7 +197507,6 @@ self: { doCheck = false; description = "Stripe API for Haskell - http-streams backend"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-tests" = callPackage @@ -188199,8 +197516,8 @@ self: { }: mkDerivation { pname = "stripe-tests"; - version = "2.2.3"; - sha256 = "1yks2wabqirq4hi1a52k9302pyp1w4q7b6chg6a7r28wsjlv27hs"; + version = "2.3.0"; + sha256 = "14j0zvnrl0s2br0vwpm105wscdyddan62iqwrf0fg8c4mj6kpfrw"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers @@ -188208,6 +197525,7 @@ self: { homepage = "https://github.com/dmjio/stripe-haskell"; description = "Tests for Stripe API bindings for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strips" = callPackage @@ -188232,36 +197550,20 @@ self: { }: mkDerivation { pname = "strive"; - version = "3.0.4"; - sha256 = "0bd2zq2v9fl97vadzs78h9v5ib4a7laqlqxaqgfk5y6hh42yvcyk"; + version = "5.0.4"; + sha256 = "1lj3fqyl1a6nix32y5irvlvsdl518gv7zvz67my5dp5fa3z9hklg"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers ]; - testHaskellDepends = [ base bytestring markdown-unlit time ]; - homepage = "https://github.com/tfausak/strive#readme"; - description = "A client for the Strava V3 API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "strive_4_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, markdown-unlit - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "strive"; - version = "4.0.1"; - sha256 = "1bws8z9ky5zryzy7njllm2f7lddbncb1rxz2ngq6kqcdnc14ph2v"; - libraryHaskellDepends = [ + testHaskellDepends = [ aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers + http-client-tls http-types markdown-unlit template-haskell text + time transformers ]; - testHaskellDepends = [ base bytestring markdown-unlit time ]; homepage = "https://github.com/tfausak/strive#readme"; description = "A client for the Strava V3 API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strptime" = callPackage @@ -188284,6 +197586,8 @@ self: { pname = "structs"; version = "0.1.1"; sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z"; + revision = "1"; + editedCabalFile = "16ws2j3bhwawf6z1ipraiz73yvg65dg5l7hvj1lgbrqvn5lqizj3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell @@ -188294,7 +197598,6 @@ self: { homepage = "http://github.com/ekmett/structs/"; description = "Strict GC'd imperative object-oriented programming with cheap pointers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "structural-induction" = callPackage @@ -188395,9 +197698,9 @@ self: { ({ mkDerivation, array, base, bytestring, containers, contravariant , criterion, deepseq, directory, doctest, filepath, free, ghc , ghc-prim, hashable, hlint, hybrid-vectors, lens, monad-st - , MonadRandom, mwc-random, parallel, primitive, QuickCheck - , semigroups, tasty, tasty-quickcheck, tasty-th, transformers - , unordered-containers, vector, vector-algorithms + , MonadRandom, parallel, primitive, QuickCheck, semigroups, tasty + , tasty-quickcheck, tasty-th, transformers, unordered-containers + , vector, vector-algorithms }: mkDerivation { pname = "structures"; @@ -188414,7 +197717,7 @@ self: { unordered-containers ]; benchmarkHaskellDepends = [ - array base containers criterion deepseq MonadRandom mwc-random + array base containers criterion deepseq MonadRandom unordered-containers vector ]; homepage = "http://github.com/ekmett/structures"; @@ -188437,6 +197740,7 @@ self: { ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stunclient" = callPackage @@ -188512,28 +197816,54 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stylish-cabal" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring + , Cabal, containers, data-default, deepseq, haddock-library, hspec + , hspec-core, microlens, microlens-th, mtl, optparse-applicative + , split, template-haskell, utf8-string + }: + mkDerivation { + pname = "stylish-cabal"; + version = "0.4.0.1"; + sha256 = "00jwq35dr60c9gjwy8hg3i8b39gxknr92mrz21657gazl90cxy4z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base base-compat Cabal containers data-default + deepseq haddock-library hspec hspec-core microlens microlens-th mtl + split template-haskell utf8-string + ]; + executableHaskellDepends = [ + base base-compat bytestring optparse-applicative + ]; + testHaskellDepends = [ base base-compat bytestring hspec ]; + doHaddock = false; + description = "Format Cabal files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative - , strict, syb, test-framework, test-framework-hunit, yaml + , file-embed, 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"; + version = "0.9.0.2"; + sha256 = "0w0hh08b1zlp3disxp20yrg20vblqgk5y3arf8xbfiznzf05x5zr"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers directory filepath + aeson base bytestring containers directory file-embed filepath haskell-src-exts mtl syb yaml ]; executableHaskellDepends = [ - aeson base bytestring containers directory filepath + aeson base bytestring containers directory file-embed filepath haskell-src-exts mtl optparse-applicative strict syb yaml ]; testHaskellDepends = [ - aeson base bytestring containers directory filepath + aeson base bytestring containers directory file-embed filepath haskell-src-exts HUnit mtl syb test-framework test-framework-hunit yaml ]; @@ -188661,6 +197991,7 @@ self: { homepage = "https://github.com/dahlia/submark#readme"; description = "Extract a part from CommonMark/Markdown docs"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "subnet" = callPackage @@ -188676,13 +198007,17 @@ self: { }) {}; "substring-parser" = callPackage - ({ mkDerivation, attoparsec, base, hspec, NoTrace, text }: + ({ mkDerivation, attoparsec, base, dlist, hspec, NoTrace + , QuickCheck, text + }: mkDerivation { pname = "substring-parser"; - version = "0.2.0.0"; - sha256 = "1bk50vsx9l1bys0fb37k818zh607221mxn6h8fmyl7ql623d6r87"; - libraryHaskellDepends = [ attoparsec base NoTrace text ]; - testHaskellDepends = [ attoparsec base hspec NoTrace text ]; + version = "0.4.0.0"; + sha256 = "0xi3yjgp87515g99qxnhjkcr2ddqc0b6rz0whg2zsi00z1sb6wc3"; + libraryHaskellDepends = [ attoparsec base dlist NoTrace text ]; + testHaskellDepends = [ + attoparsec base hspec NoTrace QuickCheck text + ]; homepage = "https://gitlab.com/igrep/substring-parser"; description = "Match / replace substrings with a parser combinators"; license = stdenv.lib.licenses.asl20; @@ -188726,6 +198061,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "subzero" = callPackage + ({ mkDerivation, base, containers, hspec }: + mkDerivation { + pname = "subzero"; + version = "0.1.0.8"; + sha256 = "0vf5crr60nixklxndpay1lp9yvhxjzmza8g5b5gz97hkyqicaid7"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + homepage = "https://github.com/code5hot/subzero#readme"; + description = "Helps when going \"seed values\" -> alternatives and optional -> answers"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "success" = callPackage ({ mkDerivation, base, monad-control, mtl, transformers , transformers-base @@ -188746,8 +198094,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "successors"; - version = "0.1"; - sha256 = "0mkb9wsmd1q6d9qll15xf0fxp2hlyp5hsj7j7wv60a32si3cjvk3"; + version = "0.1.0.1"; + sha256 = "1m5flnn2rswc3380dccnfnhmyjp1dqr23dljd0515jxawbgjkzmg"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nomeata/haskell-successors"; description = "An applicative functor to manage successors"; @@ -188773,6 +198121,7 @@ self: { homepage = "https://github.com/kadoban/suffix-array#readme"; description = "Simple and moderately efficient suffix array implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "suffixarray" = callPackage @@ -188858,7 +198207,6 @@ self: { homepage = "http://github.com/bgamari/sump"; description = "A Haskell interface to SUMP-compatible logic analyzers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sundown" = callPackage @@ -189018,6 +198366,7 @@ self: { 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 @@ -189101,17 +198450,48 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "superevent" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit + , containers, contravariant, hashable, hasql, hasql-migration + , hasql-pool, hasql-transaction, hspec, mtl, QuickCheck, random + , stm, string-qq, temporary, text, time, timespan, transformers + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "superevent"; + version = "0.1.0.1"; + sha256 = "0bda6fpljydp9i3sdyb8n0sy0dbfnryz83hpmnz59jarhhzw6nxd"; + libraryHaskellDepends = [ + aeson async base bytestring conduit containers contravariant + hashable hasql hasql-migration hasql-pool hasql-transaction mtl + random stm string-qq text time timespan transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson async base conduit hspec mtl QuickCheck stm temporary text + transformers uuid vector + ]; + homepage = "https://github.com/agrafix/superevent#readme"; + description = "A simple opinionated event store implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "supermonad" = callPackage - ({ mkDerivation, base, containers, fgl, ghc, mtl, transformers }: + ({ mkDerivation, base, containers, fgl, ghc, mtl, QuickCheck + , transformers + }: mkDerivation { pname = "supermonad"; - version = "0.1"; - sha256 = "0qlf3alrfi8zibqzlnd6gd422vwbhz37inr0ycdl7cz5x7m4g5pd"; + version = "0.2.0.1"; + sha256 = "15hw8bzafvg492zcdj5f0r67fmrqay5kj9jwfm9wd3qv7k8iszrk"; libraryHaskellDepends = [ base containers fgl ghc mtl transformers ]; + testHaskellDepends = [ base containers ghc QuickCheck ]; description = "Plugin and base library to support supermonads in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supero" = callPackage @@ -189152,6 +198532,7 @@ self: { homepage = "https://github.com/agrafix/superrecord#readme"; description = "Supercharged anonymous records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supervisor" = callPackage @@ -189189,6 +198570,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "surjective" = callPackage + ({ mkDerivation, base, lens, mtl, template-haskell }: + mkDerivation { + pname = "surjective"; + version = "0.1.0.0"; + sha256 = "1nhq7lfzsbh9ra1m1n7649q35ch6l1lgm110p1qbxgvv6w6xmz41"; + libraryHaskellDepends = [ base lens mtl template-haskell ]; + homepage = "https://github.com/gelisam/surjective"; + description = "An output coverage checker"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "suspend" = callPackage ({ mkDerivation, base, lifted-base, transformers-base }: mkDerivation { @@ -189200,6 +198593,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sv" = callPackage + ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors + , bytestring, charset, containers, contravariant, deepseq, hedgehog + , lens, mtl, parsec, parsers, profunctors, readable, semigroupoids + , semigroups, tasty, tasty-hedgehog, tasty-hunit, text + , transformers, trifecta, utf8-string, validation, vector, void + }: + mkDerivation { + pname = "sv"; + version = "0.1"; + sha256 = "0rd4jf4qqfc66xxddvaa37fjmpmmjzb7n928gclds0xibzm9ls7s"; + libraryHaskellDepends = [ + ansi-wl-pprint attoparsec base bifunctors bytestring charset + containers contravariant deepseq lens mtl parsec parsers + profunctors readable semigroupoids semigroups text transformers + trifecta utf8-string validation vector void + ]; + testHaskellDepends = [ + ansi-wl-pprint base bytestring contravariant hedgehog lens parsers + semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text + trifecta utf8-string validation vector + ]; + homepage = "https://github.com/qfpl/sv"; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "sv-cassava" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit, sv + , text, utf8-string, validation, vector + }: + mkDerivation { + pname = "sv-cassava"; + version = "0.1"; + sha256 = "050f2ji5zhispjqm66n6jbdq4x20dijzrkl20vpgx4i42z7fmn15"; + libraryHaskellDepends = [ + attoparsec base bytestring cassava sv utf8-string vector + ]; + testHaskellDepends = [ + base bytestring cassava HUnit sv text validation vector + ]; + homepage = "https://github.com/qfpl/sv"; + description = "Integration to use sv with cassava's parser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "svg-builder" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, hashable, text , unordered-containers @@ -189241,14 +198681,15 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.6.2"; - sha256 = "1vrrjdid864s86dqs9a37s8jw7a4pb3ghfxii45dd9phwnd5vr1b"; + version = "0.6.2.2"; + sha256 = "1iva5vb76z2laygvlh31zbhhcfzympk9s765499j7p356ycl0s1s"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "svg2q" = callPackage @@ -189285,7 +198726,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the libsvg-cairo library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) librsvg;}; + }) {inherit (pkgs.gnome3) librsvg;}; "svgutils" = callPackage ({ mkDerivation, base, filepath, xml }: @@ -189393,8 +198834,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.6"; - sha256 = "0whvh1b2s6jzr885avakswrcriv8hs4x36gdx22hg0fj77dh3b5q"; + version = "0.0.1.8"; + sha256 = "1rslv21lg7jfc6vb8yyb6kkg3cma2300h4hld3m8zwfxgzcq79h7"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -189439,21 +198880,23 @@ self: { homepage = "https://github.com/rodrigosetti/swagger-test"; description = "Testing of Swagger APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swagger2" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , 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 + , hashable, hspec, hspec-discover, http-media, HUnit + , insert-ordered-containers, lens, mtl, network, QuickCheck + , quickcheck-instances, scientific, template-haskell, text, time + , transformers, transformers-compat, unordered-containers + , uuid-types, vector }: mkDerivation { pname = "swagger2"; - version = "2.1.6"; - sha256 = "01a29h56vfyw0ilij1pn6qwy50ca90kyj884vs1q52vvh572758j"; + version = "2.2.1"; + sha256 = "11i0yg2g4bw8pjz9p0w7qz7hpriji9zkiz3y5gr26pwb3fzab5qz"; + revision = "1"; + editedCabalFile = "00snyp95rjh3h7yqfwg3x4y9gjhypm6zfv45i2sag4w5cydvkzb5"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat bytestring containers generics-sop hashable @@ -189464,37 +198907,41 @@ self: { testHaskellDepends = [ aeson aeson-qq base base-compat bytestring containers doctest Glob hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - text time unordered-containers vector + quickcheck-instances text time unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; }) {}; - "swagger2_2_2" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring - , 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 + "swagger2_2_2_2" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat-batteries + , bytestring, Cabal, cabal-doctest, containers, doctest + , generics-sop, Glob, hashable, hspec, hspec-discover, http-media + , HUnit, insert-ordered-containers, lens, mtl, network, QuickCheck + , quickcheck-instances, scientific, template-haskell, text, time + , transformers, transformers-compat, unordered-containers + , uuid-types, vector }: mkDerivation { pname = "swagger2"; - version = "2.2"; - sha256 = "0byzfz52mbnxcmspmk4s43bhprfwrjnh2mkpyfrdir64axqx7yf6"; + version = "2.2.2"; + sha256 = "1jkfmfrldqrfqqnjf0g4spd03w9xjmi35k33xnhsmfj122455lw2"; 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 transformers-compat - unordered-containers uuid-types vector + aeson base base-compat-batteries bytestring containers generics-sop + hashable http-media insert-ordered-containers lens mtl network + scientific template-haskell text time transformers + transformers-compat unordered-containers uuid-types vector ]; testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - text time unordered-containers vector + aeson aeson-qq base base-compat-batteries bytestring containers + doctest Glob hashable hspec HUnit insert-ordered-containers lens + mtl QuickCheck quickcheck-instances text time unordered-containers + vector ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; @@ -189578,8 +199025,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.9.1.10"; - sha256 = "10nx8vx6vprsdchqd726vx3cfzxy0jkz9ylw4p2mkcam9s72dd7c"; + version = "0.9.2.1"; + sha256 = "0zrzihgwn5lg23zmg2iqwilpfj6r77rh1am8g6rwkyf42bgvwhzg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -189594,7 +199041,7 @@ self: { ]; homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home"; description = "A semantic web toolkit"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; }) {}; "sws" = callPackage @@ -189604,8 +199051,10 @@ self: { }: mkDerivation { pname = "sws"; - version = "0.4.0.1"; - sha256 = "072njwc5b5jmlh50520nd9ck60xhni6mk3x7c9m8c0bv3h67rnn8"; + version = "0.4.1.0"; + sha256 = "1xcbmwpwp2nvi7adihkddpgi9pkdc7q7ly08vm57r56lcpzvs70p"; + revision = "1"; + editedCabalFile = "1mlyk1959yy4lmx7zsc5iafw1y7vj1d39dndn9as34pqd1rvdk5j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -189613,7 +199062,7 @@ self: { network resourcet transformers wai wai-extra wai-middleware-static warp warp-tls ]; - description = "A simple web server for serving directories, similar to weborf"; + description = "A simple web server for serving directories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -189666,8 +199115,8 @@ self: { }: mkDerivation { pname = "syb-with-class"; - version = "0.6.1.8"; - sha256 = "01b187jhhfp77l4zgks5gszkn9jmgjc44mw9yympw1fsfskljiz3"; + version = "0.6.1.9"; + sha256 = "1apvvzzc19lbchmbginmhxzcrvrcg76dvdgsk51pxrnr4glnva86"; libraryHaskellDepends = [ array base bytestring containers template-haskell ]; @@ -189706,6 +199155,7 @@ self: { homepage = "https://github.com/reactive-systems/syfco"; description = "Synthesis Format Conversion Tool / Library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sylvia" = callPackage @@ -189739,8 +199189,8 @@ self: { ({ mkDerivation, base, containers, hashable, QuickCheck, vector }: mkDerivation { pname = "sym"; - version = "0.12.1"; - sha256 = "0qh023v5008byrfcc5ryj8fcl2pck3g8yjqdnrdij0jb4fhx3prw"; + version = "0.13.0"; + sha256 = "0ppgdhhxn5w05194mwcsca6m853h8hh5bxsm2l3jz52y388pi0ic"; libraryHaskellDepends = [ base containers hashable vector ]; testHaskellDepends = [ base hashable QuickCheck ]; homepage = "https://github.com/akc/sym"; @@ -189768,8 +199218,8 @@ self: { }: mkDerivation { pname = "symantic"; - version = "6.3.0.20170807"; - sha256 = "1w2yyy35w9k3p53x9a51hn5cfja74i6g62jcw2l1bq5cgaakfjgn"; + version = "6.3.1.20180213"; + sha256 = "16bbby4lcyna842gvf95ss8fvsp5kgzpn996yxzv3jjhxg00ls5d"; libraryHaskellDepends = [ base containers mono-traversable symantic-document symantic-grammar text transformers @@ -189782,8 +199232,8 @@ self: { ({ mkDerivation, ansi-terminal, base, text }: mkDerivation { pname = "symantic-document"; - version = "0.0.0.20170623"; - sha256 = "0va9q2lp6vp81sm0vfm10s7ybp34i89bk6p2ry2f0fcr0lhb09i0"; + version = "0.0.0.20180213"; + sha256 = "0f3rr8117cr78nkcw7kpddcpisbmvsyw03ym7cq6ms0z8zqynwpm"; libraryHaskellDepends = [ ansi-terminal base text ]; description = "Document symantics"; license = stdenv.lib.licenses.gpl3; @@ -189795,8 +199245,8 @@ self: { }: mkDerivation { pname = "symantic-grammar"; - version = "0.2.0.20170709"; - sha256 = "0vr0j7v2l9sfw8fcfdrhdcb9imgzklmm7p8n6jh9vlshl2d9piwy"; + version = "0.3.0.20180213"; + sha256 = "0kqy27c4ix16v7n7zqhc57alrg1n1xksdf7ijsbvpjs4597vpwih"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base megaparsec tasty tasty-hunit text transformers @@ -189806,21 +199256,22 @@ self: { }) {}; "symantic-lib" = callPackage - ({ mkDerivation, base, containers, ghc-prim, megaparsec + ({ mkDerivation, base, bytestring, containers, megaparsec , monad-classes, mono-traversable, symantic, symantic-grammar - , tasty, tasty-hunit, text, transformers + , tasty, tasty-golden, tasty-hunit, text, transformers }: mkDerivation { pname = "symantic-lib"; - version = "0.0.2.20170703"; - sha256 = "0ar1ikm42a0apy222y6ii7mjd7fr7n2kpyycyhfznc902jknxk2w"; + version = "0.0.3.20180213"; + sha256 = "17y4rmw9l4j3j9g2i60las3q6y7rlklzr48xr8arkhi0i5zi1qw2"; libraryHaskellDepends = [ - base containers ghc-prim monad-classes mono-traversable symantic - symantic-grammar text transformers + base containers mono-traversable symantic symantic-grammar text + transformers ]; testHaskellDepends = [ - base containers megaparsec monad-classes mono-traversable symantic - symantic-grammar tasty tasty-hunit text transformers + base bytestring containers megaparsec monad-classes + mono-traversable symantic symantic-grammar tasty tasty-golden + tasty-hunit text transformers ]; description = "Symantics for common types"; license = stdenv.lib.licenses.gpl3; @@ -190019,6 +199470,7 @@ self: { homepage = "http://github.com/brentlintner/synt"; description = "Similar code analysis"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {Synt = null;}; @@ -190216,10 +199668,9 @@ self: { "synthesizer" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , directory, event-list, filepath, gnuplot, non-negative - , numeric-prelude, numeric-quest, old-time, process, QuickCheck - , random, sox, storable-record, storablevector, transformers - , utility-ht + , event-list, filepath, gnuplot, non-negative, numeric-prelude + , numeric-quest, process, QuickCheck, random, sox, storable-record + , storablevector, transformers, utility-ht }: mkDerivation { pname = "synthesizer"; @@ -190232,7 +199683,6 @@ self: { non-negative numeric-prelude numeric-quest process QuickCheck random sox storable-record storablevector transformers utility-ht ]; - executableHaskellDepends = [ directory old-time ]; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing coded in Haskell"; license = "GPL"; @@ -190260,31 +199710,31 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Control synthesizer effects via ALSA/MIDI"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-core" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, event-list, explicit-exception, filepath , non-empty, non-negative, numeric-prelude, numeric-quest, old-time - , process, QuickCheck, random, sample-frame-np, sox + , process, QuickCheck, random, sample-frame-np, semigroups, sox , storable-record, storable-tuple, storablevector, timeit , transformers, utility-ht }: mkDerivation { pname = "synthesizer-core"; - version = "0.8.1.1"; - sha256 = "0drh5lmia3bvmdc7f7zl8y3ls43dl7mvb11383k49xlh0adlllka"; + version = "0.8.2"; + sha256 = "0r8lik2gmaxn1ay0wyjvq2r51jb8vy99hypvrnhbc6hsjybdh8aa"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude - numeric-quest process QuickCheck random sample-frame-np sox - storable-record storable-tuple storablevector transformers + numeric-quest process QuickCheck random sample-frame-np semigroups + sox storable-record storable-tuple storablevector transformers utility-ht ]; testHaskellDepends = [ base containers event-list non-empty non-negative numeric-prelude - QuickCheck random storable-tuple storablevector utility-ht + QuickCheck random storable-tuple storablevector transformers + utility-ht ]; benchmarkHaskellDepends = [ array base binary bytestring directory numeric-prelude old-time @@ -190297,19 +199747,19 @@ self: { "synthesizer-dimensional" = callPackage ({ mkDerivation, base, bytestring, event-list, non-negative - , numeric-prelude, random, sox, storable-record, storablevector - , synthesizer-core, transformers, utility-ht + , numeric-prelude, random, semigroups, sox, storable-record + , storablevector, synthesizer-core, transformers, utility-ht }: mkDerivation { pname = "synthesizer-dimensional"; - version = "0.8.0.2"; - sha256 = "17d1q57bs7qkd0688qn47fh5m22nfamihdh35sahdl9jf68cb1yn"; + version = "0.8.1"; + sha256 = "0a8frn0k4dc0kh71arcqpc1z4dilr8c7yqpp6j80llh12lrcp6f4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring event-list non-negative numeric-prelude random sox - storable-record storablevector synthesizer-core transformers - utility-ht + base bytestring event-list non-negative numeric-prelude random + semigroups sox storable-record storablevector synthesizer-core + transformers utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing with static physical dimensions"; @@ -190351,6 +199801,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing with dynamic physical dimensions"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {UniqueLogicNP = null;}; @@ -190386,19 +199837,19 @@ self: { "synthesizer-midi" = callPackage ({ mkDerivation, array, base, containers, data-accessor , data-accessor-transformers, deepseq, event-list, midi - , non-negative, numeric-prelude, sox, storable-record + , non-negative, numeric-prelude, semigroups, sox, storable-record , storablevector, synthesizer-core, synthesizer-dimensional , transformers, utility-ht }: mkDerivation { pname = "synthesizer-midi"; - version = "0.6.0.4"; - sha256 = "1xbzqhshhqa8i29gmj503p2bgxzm4sm7rz3kkbw2i4l0vpas2zb0"; + version = "0.6.1"; + sha256 = "02z6sywk047vn2is9fq9nr4agdy9xis9ydbl15pmrb0vlmvpx3qr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers data-accessor data-accessor-transformers - deepseq event-list midi non-negative numeric-prelude sox + deepseq event-list midi non-negative numeric-prelude semigroups sox storable-record storablevector synthesizer-core synthesizer-dimensional transformers utility-ht ]; @@ -190409,7 +199860,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Render audio signals from MIDI files or realtime messages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sys-auth-smbclient" = callPackage @@ -190444,6 +199894,7 @@ self: { homepage = "https://github.com/NICTA/sys-process"; description = "A replacement for System.Exit and System.Process."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sysinfo" = callPackage @@ -190457,7 +199908,6 @@ self: { homepage = "https://github.com/psibi/sysinfo#readme"; description = "Haskell Interface for getting overall system statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "system-argv0" = callPackage @@ -190507,6 +199957,19 @@ self: { homepage = "https://github.com/tonymorris/system-command"; description = "A replacement for System.Exit and System.Process"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "system-error" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "system-error"; + version = "1.0.0"; + sha256 = "1hig7m7arrj6hmgix8abkidy6wf1a4a4y72k81csq90kv5jhynxk"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/heroin-moose/system-error"; + description = "Error reporting functions"; + license = stdenv.lib.licenses.bsd3; }) {}; "system-extra" = callPackage @@ -190544,13 +200007,16 @@ self: { }) {}; "system-filepath" = callPackage - ({ mkDerivation, base, bytestring, chell, chell-quickcheck, deepseq - , QuickCheck, text + ({ mkDerivation, base, bytestring, Cabal, chell, chell-quickcheck + , deepseq, QuickCheck, text }: mkDerivation { pname = "system-filepath"; - version = "0.4.13.4"; - sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l"; + version = "0.4.14"; + sha256 = "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn"; + revision = "1"; + editedCabalFile = "18llfvisghrn9w9yfgacqn51gs50a0lngah3bmg852h0swj7vkp8"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring chell chell-quickcheck QuickCheck text @@ -190576,8 +200042,8 @@ self: { ({ mkDerivation, attoparsec, base, process, text }: mkDerivation { pname = "system-info"; - version = "0.1.0.10"; - sha256 = "164f8x4npp5pywplpz7x7q2qrmc7fc2hlqxm8zw083402sw668m7"; + version = "0.4.0.0"; + sha256 = "1sl1m19ia5n8rws49596lipjzx5q3jn9yjqhjlfs4vvh9rc2dnkh"; libraryHaskellDepends = [ attoparsec base process text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -190595,7 +200061,6 @@ self: { homepage = "http://darcs.imperialviolet.org/system-inotify"; description = "Binding to Linux's inotify interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "system-lifted" = callPackage @@ -190722,7 +200187,6 @@ self: { homepage = "https://github.com/joeyadams/haskell-system-time-monotonic"; description = "Simple library for using the system's monotonic clock"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "system-util" = callPackage @@ -190745,6 +200209,7 @@ self: { homepage = "https://github.com/jcristovao/system-util"; description = "Various system utils lifted to EitherT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {easy-data = null;}; @@ -190763,11 +200228,6 @@ self: { template-haskell ]; librarySystemDepends = [ libossp_uuid ]; - executableHaskellDepends = [ - base binary bytestring containers murmur-hash parsec - template-haskell - ]; - executableSystemDepends = [ libossp_uuid ]; homepage = "http://github.com/solidsnack/system-uuid/"; description = "Bindings to system UUID functions"; license = stdenv.lib.licenses.bsd3; @@ -190940,8 +200400,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.8.0.0"; - sha256 = "0lr2jddm4qsfhl77sx837vva1rpnaf9a45a8wfc57xqrspapjhlz"; + version = "0.8.0.1"; + sha256 = "12glh66b7ih6zxhry1s1a9pbc2arpz0m4z1hvx3r3ji8s87i18kh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190987,6 +200447,7 @@ self: { ]; description = "An interactive theorem prover based on semantic tableaux"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tables" = callPackage @@ -191074,6 +200535,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tabs" = callPackage + ({ mkDerivation, base, filepath, monadlist, mtl, tagged }: + mkDerivation { + pname = "tabs"; + version = "0.1.0.0"; + sha256 = "1188rjlq2s2azbjxwfp40j8aidn3hz2lhmcaghj2ig6n5w2jpg98"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base filepath monadlist mtl tagged ]; + executableHaskellDepends = [ base filepath monadlist mtl tagged ]; + description = "Indents source files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tabular" = callPackage ({ mkDerivation, base, csv, html, mtl }: mkDerivation { @@ -191087,37 +200562,37 @@ self: { }) {}; "taffybar" = callPackage - ({ mkDerivation, base, cairo, containers, dbus, dyre - , enclosed-exceptions, filepath, gtk, gtk-traymanager, gtk2 - , HStringTemplate, HTTP, mtl, network, network-uri, old-locale - , parsec, process, safe, split, stm, text, time, time-locale-compat - , transformers, utf8-string, X11, xdg-basedir, xmonad - , xmonad-contrib + ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers + , dbus, directory, dyre, either, enclosed-exceptions, filepath + , glib, gtk-traymanager, gtk3, HStringTemplate, HTTP, mtl, multimap + , network, network-uri, old-locale, parsec, process, rate-limit + , safe, split, stm, text, time, time-locale-compat, time-units + , transformers, tuple, unix, utf8-string, X11, xdg-basedir, xml + , xml-helpers, xmonad, xmonad-contrib }: mkDerivation { pname = "taffybar"; - version = "0.4.6"; - sha256 = "1xfaw32yq17a6wm6gzvpdnpabxfnskwbs541h1kk1lvrkm31h2b2"; + version = "1.0.1"; + sha256 = "1agx7q73h8x53cl8i408yifrr80fbm47pwn46mi6abcp61s92chn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base cairo containers dbus dyre enclosed-exceptions filepath gtk - gtk-traymanager HStringTemplate HTTP mtl network network-uri - old-locale parsec process safe split stm text time - time-locale-compat transformers utf8-string X11 xdg-basedir xmonad - xmonad-contrib + alsa-mixer base cairo ConfigFile containers dbus directory dyre + either enclosed-exceptions filepath glib gtk-traymanager gtk3 + HStringTemplate HTTP mtl multimap network network-uri old-locale + parsec process rate-limit safe split stm text time + time-locale-compat time-units transformers tuple unix utf8-string + X11 xdg-basedir xml xml-helpers xmonad xmonad-contrib ]; - libraryPkgconfigDepends = [ gtk2 ]; executableHaskellDepends = [ - base dyre filepath gtk safe xdg-basedir + base containers directory dyre filepath glib gtk3 mtl safe split + utf8-string X11 xdg-basedir ]; - executablePkgconfigDepends = [ gtk2 ]; homepage = "http://github.com/travitch/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {gtk2 = pkgs.gnome2.gtk;}; + }) {}; "tag-bits" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -191164,7 +200639,6 @@ self: { base bytestring containers data-accessor explicit-exception non-empty transformers utility-ht xml-basic ]; - executableHaskellDepends = [ base xml-basic ]; testHaskellDepends = [ base xml-basic ]; benchmarkHaskellDepends = [ base bytestring containers data-accessor explicit-exception @@ -191183,8 +200657,8 @@ self: { pname = "tagged"; version = "0.8.5"; sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74"; - revision = "1"; - editedCabalFile = "15mqdimbgrq5brqljjl7dbxkyrxppap06q53cp7ml7w3l08v5mx8"; + revision = "2"; + editedCabalFile = "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5"; libraryHaskellDepends = [ base deepseq template-haskell transformers transformers-compat ]; @@ -191218,6 +200692,7 @@ self: { homepage = "https://github.com/trskop/tagged-exception-core"; description = "Reflect exceptions using phantom types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagged-identity" = callPackage @@ -191319,10 +200794,8 @@ self: { }: mkDerivation { pname = "taggy"; - version = "0.2.0"; - sha256 = "01q2ccf3a8akaifh79ajnfr5yrjsq4xihq0pl7lsz173n7mhnsy3"; - revision = "1"; - editedCabalFile = "02xmvs9m977szhf5cgy31rbadi662g194giq3djzvsd41c1sshq3"; + version = "0.2.1"; + sha256 = "1xmxwg024k5q4ah0pfn6nhyrznskgwg6anw558qzb4k5rjk3b7nq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -191341,7 +200814,6 @@ self: { homepage = "http://github.com/alpmestan/taggy"; description = "Efficient and simple HTML/XML parsing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "taggy-lens" = callPackage @@ -191361,7 +200833,6 @@ self: { homepage = "http://github.com/alpmestan/taggy-lens"; description = "Lenses for the taggy html/xml parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "taglib" = callPackage @@ -191423,14 +200894,17 @@ self: { }) {}; "tagsoup" = callPackage - ({ mkDerivation, base, bytestring, containers, text }: + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , process, QuickCheck, text, time + }: mkDerivation { pname = "tagsoup"; - version = "0.14.1"; - sha256 = "1ssaqvwjjaqv30z44jm6z3xjpbvjxb57217rk67r3q34m1hfd2q2"; - isLibrary = true; - isExecutable = true; + version = "0.14.6"; + sha256 = "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb"; libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring deepseq directory process QuickCheck time + ]; homepage = "https://github.com/ndmitchell/tagsoup#readme"; description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; license = stdenv.lib.licenses.bsd3; @@ -191476,6 +200950,7 @@ self: { homepage = "https://github.com/kseo/tagsoup-megaparsec#readme"; description = "A Tag token parser and Tag specific parsing combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagsoup-parsec" = callPackage @@ -191538,7 +201013,7 @@ self: { homepage = "https://oss.xkcd.com/"; description = "Support library to enable TAI usage on systems with time kept in UTC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tai64" = callPackage @@ -191558,6 +201033,7 @@ self: { homepage = "https://github.com/kim/tai64"; description = "Tai64 Labels for Haskell"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tailfile-hinotify" = callPackage @@ -191580,7 +201056,7 @@ self: { ]; description = "Tail files in Unix, using hinotify"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tak" = callPackage @@ -191635,9 +201111,7 @@ self: { }) {}; "takusen-oracle" = callPackage - ({ mkDerivation, base, clntsh, mtl, old-time, QuickCheck, random - , time - }: + ({ mkDerivation, base, clntsh, mtl, old-time, time }: mkDerivation { pname = "takusen-oracle"; version = "0.9.4.1"; @@ -191646,9 +201120,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base mtl old-time time ]; librarySystemDepends = [ clntsh ]; - executableHaskellDepends = [ - base mtl old-time QuickCheck random time - ]; homepage = "https://github.com/paulrzcz/takusen-oracle.git"; description = "Database library with left-fold interface for Oracle"; license = stdenv.lib.licenses.bsd3; @@ -191669,6 +201140,7 @@ self: { homepage = "https://github.com/sweirich/tal"; description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tamarin-prover" = callPackage @@ -191776,6 +201248,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tao" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "tao"; + version = "1.0.0"; + sha256 = "0iqsah4l87bd25cpk575hsq5qbx506gz1ajf6fyv6pmi0sb1w2hb"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/jship/tao#readme"; + description = "Type-level assertion operators"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tao-example" = callPackage + ({ mkDerivation, base, tao }: + mkDerivation { + pname = "tao-example"; + version = "1.0.0"; + sha256 = "1ch09fgj46fy5h33rcqlbkm02v8cq246bpxswxfdj8p9g1dkkpk5"; + libraryHaskellDepends = [ base tao ]; + homepage = "https://github.com/jship/tao#readme"; + description = "Example usage of the tao package"; + license = stdenv.lib.licenses.mit; + }) {}; + "tar_0_4_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, old-time }: mkDerivation { @@ -191792,13 +201288,13 @@ self: { "tar" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-handle - , containers, criterion, deepseq, directory, filepath, old-time - , QuickCheck, tasty, tasty-quickcheck, time + , containers, criterion, deepseq, directory, filepath, QuickCheck + , tasty, tasty-quickcheck, time }: mkDerivation { pname = "tar"; - version = "0.5.0.3"; - sha256 = "18qq94j9bm91iswnxq2dm5dws5c7wm4k01q2rpf8py35cf3svnfq"; + version = "0.5.1.0"; + sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -191808,21 +201304,35 @@ self: { ]; benchmarkHaskellDepends = [ array base bytestring containers criterion deepseq directory - filepath old-time time + filepath time ]; description = "Reading, writing and manipulating \".tar\" archive files."; license = stdenv.lib.licenses.bsd3; }) {}; "tar-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit-combinators }: + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , containers, criterion, deepseq, directory, filepath, hspec + , QuickCheck, safe-exceptions, text, unix, weigh + }: mkDerivation { pname = "tar-conduit"; - version = "0.1.1"; - sha256 = "189dy1j32c44mjr3waljcvch1hqlijnax7myp4jih7y12hji6i9r"; - libraryHaskellDepends = [ base bytestring conduit-combinators ]; + version = "0.2.3"; + sha256 = "1is2q5662zrrxgb2dm2n1qa1aqdrwf4g7il5jdpxhri28m7pp7jp"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + safe-exceptions text unix + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators containers deepseq + directory filepath hspec QuickCheck weigh + ]; + benchmarkHaskellDepends = [ + base bytestring conduit conduit-combinators containers criterion + deepseq directory filepath hspec + ]; homepage = "https://github.com/snoyberg/tar-conduit#readme"; - description = "Parse tar files using conduit for streaming"; + description = "Extract and create tar files using conduit for streaming"; license = stdenv.lib.licenses.mit; }) {}; @@ -191886,8 +201396,8 @@ self: { }: mkDerivation { pname = "tart"; - version = "0.1.1"; - sha256 = "1a1nh093lklih1hq7lhkqp9l48wf66axlf1hsb8h2zmkv09z517h"; + version = "0.1.2"; + sha256 = "1ik86xbai9513gr9k60m55xf5pj5bdw3wbjc0gd260j9k9j4p73k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191980,40 +201490,20 @@ self: { }) {}; "tasty" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers - , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged - , unbounded-delays, unix - }: - mkDerivation { - pname = "tasty"; - version = "0.11.3"; - sha256 = "1g5394akq4j7y93b7cqwqf9lacqh2k21rrj6srbnh2sg97ng7j1b"; - libraryHaskellDepends = [ - ansi-terminal async base clock containers deepseq mtl - optparse-applicative regex-tdfa stm tagged unbounded-delays unix - ]; - homepage = "https://github.com/feuerbach/tasty"; - description = "Modern and extensible testing framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty_0_12" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers - , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged - , unbounded-delays, unix + ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl + , optparse-applicative, stm, tagged, unbounded-delays, unix }: mkDerivation { pname = "tasty"; - version = "0.12"; - sha256 = "0840ziawhj0lrzn927nx9lww6wxc5krvf0c3xygl577vvxh4adg1"; + version = "1.0.1.1"; + sha256 = "1czfvgm3wb9dlxccr7h49929m6rag7rc6q5hlj9yw0l4lm0hv4hs"; libraryHaskellDepends = [ - ansi-terminal async base clock containers deepseq mtl - optparse-applicative regex-tdfa stm tagged unbounded-delays unix + ansi-terminal async base clock containers mtl optparse-applicative + stm tagged unbounded-delays unix ]; homepage = "https://github.com/feuerbach/tasty"; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -192023,8 +201513,8 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.1.0"; - sha256 = "1xnh4yyzi4m21182n1hr5lak6gkgnpp4m6ixjk19gn4fnzwarz8d"; + version = "1.1.3"; + sha256 = "0nxrvxk83mv29yhywswg21q156zdzs02xrwqambnz78pldsrbk4n"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -192060,21 +201550,20 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.6.0.0"; - sha256 = "0qcfypb69052rdrfvssy3py2im86i71rmlv7w954y9rmbby1kl4n"; + version = "1.1.0.2"; + sha256 = "0navsbmga0zzia6v8halqm0hli8x8zs0g80zix2170a55w8k3f0h"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "tasty-dejafu_0_7_0_3" = callPackage + "tasty-dejafu_1_2_0_0" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.7.0.3"; - sha256 = "0xvqlw5w5rwz1xxi277r9w7iad7prds5i1rrmy8wz3x3vh9kbnmm"; + version = "1.2.0.0"; + sha256 = "0dhrcra1vzrw7xxnph28iz3c9pkmkhza0m9xjb9qxc75p2f684p3"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -192083,35 +201572,14 @@ self: { }) {}; "tasty-discover" = 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; - }) {}; - - "tasty-discover_4_1_1" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-discover"; - version = "4.1.1"; - sha256 = "0lsz73rnvwb6z522bxfhlslvvymnjw7kw4fs8llwr3w6cvzl5vfj"; + version = "4.2.0"; + sha256 = "19qs3sg28anjjajwvkd79xsh5iip59w6bwphc88sy7gyybq6q586"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192128,17 +201596,14 @@ self: { 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 = "0r555f18d2gj96pjyc13chn1nxaxl81am4xgip3mvvjhw8s5mva1"; - revision = "1"; - editedCabalFile = "07sz28vm5rllp9yj1ibhz015s6c4gcq1vzxlphhqam1ah096jc42"; + version = "0.11.1.1"; + sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji"; libraryHaskellDepends = [ base tagged tasty ]; homepage = "http://github.com/nomeata/tasty-expected-failure"; description = "Mark tasty tests as failure expected"; @@ -192160,6 +201625,7 @@ self: { homepage = "http://github.com/MichaelXavier/tasty-fail-fast#readme"; description = "Adds the ability to fail a tasty test suite on first test failure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-golden" = callPackage @@ -192169,8 +201635,8 @@ self: { }: mkDerivation { pname = "tasty-golden"; - version = "2.3.1.1"; - sha256 = "0pcf5hsyp5mmbqn7krdm49jxpkjm6rb4j83j28f76h7q55dzm1wy"; + version = "2.3.1.3"; + sha256 = "1xri8bnj22gzxkxz4hi2vqx0aaz51ww3zz9ac0ig0lw653kbj61p"; libraryHaskellDepends = [ async base bytestring containers deepseq directory filepath mtl optparse-applicative process tagged tasty temporary @@ -192208,10 +201674,10 @@ self: { }: mkDerivation { pname = "tasty-hedgehog"; - version = "0.1.0.1"; - sha256 = "1sqwj5vzmc2rcr8yh2pqwmkdr11cwf20fv5z4wr5xsp9qnv3bzl1"; + version = "0.1.0.2"; + sha256 = "0cjdi0kpwpb4m5ad1y47x52336xfza4m82h5zg76r75f7fvzzh8x"; revision = "1"; - editedCabalFile = "1aq46lrx467r3c6i8figzgyhwkg1n34zq9r39j6144mmmmgh2wpz"; + editedCabalFile = "1kmmry6zawyhxgi20v3j62m58lqjcjzvap0qp6b35yj31vbzl727"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -192221,19 +201687,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-hedgehog_0_2_0_0" = callPackage + ({ mkDerivation, base, hedgehog, tagged, tasty + , tasty-expected-failure + }: + mkDerivation { + pname = "tasty-hedgehog"; + version = "0.2.0.0"; + sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s"; + revision = "3"; + editedCabalFile = "1r1sbcz12j9kmbdfr7mjc6z22c3737jc7mf0kdk1v6a3zr6n1js9"; + libraryHaskellDepends = [ base hedgehog tagged tasty ]; + testHaskellDepends = [ + base hedgehog tasty tasty-expected-failure + ]; + homepage = "https://github.com/qfpl/tasty-hedgehog"; + description = "Integration for tasty and hedgehog"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-hspec" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random - , tagged, tasty, tasty-quickcheck, tasty-smallcheck + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty + , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-hspec"; - version = "1.1.3.2"; - sha256 = "0n4pn89jz9i8d7mxsdp6ynwkg5gjyaipdy261parx64m3nxi4vcv"; - revision = "1"; - editedCabalFile = "05fl6jirj479lax2wqg6h5m82mkc475lhas7wmpx91kv1kfklx54"; + version = "1.1.4"; + sha256 = "17f4rcga0qnynf1h047chwm5nicmik79lw04kiwpw48ahwc0zkp3"; libraryHaskellDepends = [ - base hspec hspec-core QuickCheck random tagged tasty - tasty-quickcheck tasty-smallcheck + base hspec hspec-core QuickCheck tasty tasty-quickcheck + tasty-smallcheck ]; homepage = "https://github.com/mitchellwrosen/tasty-hspec"; description = "Hspec support for the Tasty test framework"; @@ -192259,13 +201743,13 @@ self: { }) {}; "tasty-hunit" = callPackage - ({ mkDerivation, base, tasty }: + ({ mkDerivation, base, call-stack, tasty }: mkDerivation { pname = "tasty-hunit"; - version = "0.9.2"; - sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf"; - libraryHaskellDepends = [ base tasty ]; - homepage = "http://documentup.com/feuerbach/tasty"; + version = "0.10.0.1"; + sha256 = "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g"; + libraryHaskellDepends = [ base call-stack tasty ]; + homepage = "https://github.com/feuerbach/tasty"; description = "HUnit support for the Tasty test framework"; license = stdenv.lib.licenses.mit; }) {}; @@ -192404,31 +201888,35 @@ self: { }) {}; "tasty-quickcheck" = callPackage - ({ mkDerivation, base, pcre-light, QuickCheck, tagged, tasty - , tasty-hunit + ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged + , tasty, tasty-hunit }: mkDerivation { pname = "tasty-quickcheck"; - version = "0.8.4"; - sha256 = "15rjxib5jmjq0hzj47x15kgp3awc73va4cy1pmpf7k3hvfv4qprn"; - libraryHaskellDepends = [ base QuickCheck tagged tasty ]; + version = "0.9.2"; + sha256 = "0wsqm4fjxnh64sjlccjapvgvw4dhl603qpxl79g3sa3fmgg0m4n5"; + libraryHaskellDepends = [ base QuickCheck random tagged tasty ]; testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; - homepage = "http://documentup.com/feuerbach/tasty"; + homepage = "https://github.com/feuerbach/tasty"; description = "QuickCheck support for the Tasty test framework"; license = stdenv.lib.licenses.mit; }) {}; - "tasty-quickcheck_0_9_1" = callPackage - ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged - , tasty, tasty-hunit + "tasty-quickcheck_0_10" = callPackage + ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck + , random, tagged, tasty, tasty-hunit }: mkDerivation { pname = "tasty-quickcheck"; - version = "0.9.1"; - sha256 = "03db6aknm5rdl14mn98lxhb38357ywvs7agygyz1hbc5iv7rggxa"; - libraryHaskellDepends = [ base QuickCheck random tagged tasty ]; + version = "0.10"; + sha256 = "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h"; + revision = "1"; + editedCabalFile = "1ndkkywcqgb2wj339vgckjv5915da5kd4ixlkaww9fsba3qsrnwx"; + libraryHaskellDepends = [ + base optparse-applicative QuickCheck random tagged tasty + ]; testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; - homepage = "http://documentup.com/feuerbach/tasty"; + homepage = "https://github.com/feuerbach/tasty"; description = "QuickCheck support for the Tasty test framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -192440,8 +201928,8 @@ self: { }: mkDerivation { pname = "tasty-rerun"; - version = "1.1.7"; - sha256 = "18hz1xqinf59mzvd68ygj9333v0a32qxfcas7crn4iniq5zv71kj"; + version = "1.1.10"; + sha256 = "1776fx700wlc9spn0dh3x4nh44x2yg33z9zyqzqlpwrhrkpaz91b"; libraryHaskellDepends = [ base containers mtl optparse-applicative reducers split stm tagged tasty transformers @@ -192454,17 +201942,17 @@ self: { "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit - , temporary, text, transformers + , process-extras, regex-tdfa, semigroups, stm, tagged, tasty + , tasty-hunit, temporary, text, transformers }: mkDerivation { pname = "tasty-silver"; - version = "3.1.10"; - sha256 = "1yvfkl1dkp2bmcaa0bjamw13ky007rhn4wci3cia97glpy9nv24f"; + version = "3.1.11"; + sha256 = "1rvky2661s77wnm8c0jh0hkp3jjp5c1vndv9ilg4s47kw77708az"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa - stm tagged tasty temporary text + semigroups stm tagged tasty temporary text ]; testHaskellDepends = [ base directory filepath process tasty tasty-hunit temporary @@ -192495,8 +201983,8 @@ self: { pname = "tasty-stats"; version = "0.2.0.3"; sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b"; - revision = "1"; - editedCabalFile = "1kvvz549gs7vm9w6gypr8pa1klsab335rzmdq7v638rvijgqfbn8"; + revision = "2"; + editedCabalFile = "1gkan66glb235kakvwkidmxd0cn7s9405w3njiwa5k6cvkpkny4x"; libraryHaskellDepends = [ base containers directory process stm tagged tasty time ]; @@ -192520,6 +202008,7 @@ self: { homepage = "https://github.com/michaelxavier/tasty-tap"; description = "TAP (Test Anything Protocol) Version 13 formatter for tasty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-th" = callPackage @@ -192543,8 +202032,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "tasty-travis"; - version = "0.2.0"; - sha256 = "1k0cgjbj2dgf5d8j13ns2nk9kw74ixa62bwk7wmj1gr1yfwv1klx"; + version = "0.2.0.1"; + sha256 = "05k9zddmhbcs2xf9n6ln3591cscxix7pakc42j4arw4iwrfiqp17"; libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; homepage = "https://github.com/merijn/tasty-travis"; @@ -192612,6 +202101,7 @@ self: { ]; description = "tcache using Amazon Web Services as default persistence mechanism"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tccli" = callPackage @@ -192663,7 +202153,6 @@ self: { base bytestring containers inline-c repa sdl2 vector ]; librarySystemDepends = [ tcod ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/ncrashed/tcod-haskell#readme"; description = "Bindings to libtcod roguelike engine"; license = stdenv.lib.licenses.bsd3; @@ -192695,30 +202184,6 @@ self: { }) {}; "tcp-streams" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, directory - , HUnit, io-streams, network, pem, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, tls, x509 - , x509-store, x509-system - }: - mkDerivation { - pname = "tcp-streams"; - version = "0.6.0.0"; - sha256 = "1g0g9r62gklsn99ncqkyxlk8qwmxd7iyhshq03k7ghdlsj9linfg"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring data-default-class io-streams network pem tls x509 - x509-store x509-system - ]; - testHaskellDepends = [ - base bytestring directory HUnit io-streams network QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "https://github.com/winterland1989/tcp-streams"; - description = "One stop solution for tcp client and server with tls support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tcp-streams_1_0_1_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, directory , HUnit, io-streams, network, pem, test-framework , test-framework-hunit, tls, x509, x509-store, x509-system @@ -192739,35 +202204,9 @@ self: { homepage = "https://github.com/didi-FP/tcp-streams"; description = "One stop solution for tcp client and server with tls support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tcp-streams-openssl" = callPackage - ({ mkDerivation, base, bytestring, directory, HsOpenSSL - , HsOpenSSL-x509-system, HUnit, io-streams, network, QuickCheck - , tcp-streams, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "tcp-streams-openssl"; - version = "0.6.0.0"; - sha256 = "154dpw0aqj5a2zqfqkhkv8n9rsmzzxwildpjgr875qqz0gnihk2c"; - libraryHaskellDepends = [ - base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network - tcp-streams - ]; - testHaskellDepends = [ - base bytestring directory HUnit io-streams network QuickCheck - tcp-streams test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - homepage = "https://github.com/winterland1989/tcp-streams"; - description = "Tcp streams using openssl for tls support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "tcp-streams-openssl_1_0_1_0" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system , HUnit, io-streams, network, tcp-streams, test-framework , test-framework-hunit @@ -192841,21 +202280,43 @@ self: { homepage = "https://github.com/futurice/haskell-tdigest#readme"; description = "On-line accumulation of rank-based statistics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tdigest_0_2" = callPackage + ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest + , deepseq, doctest, reducers, semigroupoids, semigroups, tasty + , tasty-quickcheck, transformers, vector, vector-algorithms + }: + mkDerivation { + pname = "tdigest"; + version = "0.2"; + sha256 = "1wii4rkk1xqqdkwd24g6xb3imrrgr4y2vq0a7kg606g3a5mllsvq"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat binary deepseq reducers semigroupoids transformers + vector vector-algorithms + ]; + testHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tdigest-Chart" = callPackage ({ mkDerivation, base, base-compat, Chart, Chart-diagrams, colour - , lens, mwc-random, semigroupoids, semigroups, statistics, tdigest - , vector + , lens, mwc-random, semigroupoids, statistics, tdigest, vector }: mkDerivation { pname = "tdigest-Chart"; - version = "0"; - sha256 = "19vhyk2wgvxnaad32vj9fm0vw8rl5n1lp540dp4yn9dsbilhda3l"; - revision = "2"; - editedCabalFile = "139qimahwi9q2vm2z6m42ghk59drgii71lrgcj2dbai5x5fnfcgb"; + version = "0.2"; + sha256 = "1ciq7d187as9sk1dpccm2s02b6jdhij1l477wff0a7labgw21l0l"; libraryHaskellDepends = [ - base base-compat Chart colour lens semigroupoids semigroups tdigest + base base-compat Chart colour lens semigroupoids tdigest ]; testHaskellDepends = [ base base-compat Chart Chart-diagrams lens mwc-random statistics @@ -192864,6 +202325,7 @@ self: { homepage = "https://github.com/futurice/haskell-tdigest#readme"; description = "Chart generation from tdigest"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tdoc" = callPackage @@ -192896,46 +202358,46 @@ self: { "teardown" = callPackage ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest - , Glob, protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit - , tasty-rerun, tasty-smallcheck, text, time + , exceptions, Glob, protolude, QuickCheck, safe-exceptions, tasty + , tasty-hspec, tasty-hunit, tasty-rerun, tasty-smallcheck, text + , time }: mkDerivation { pname = "teardown"; - version = "0.1.0.1"; - sha256 = "0jxhr73dq4gvbzrwhbqsrwg1v8qa2mj1nfygb44kj60diwa4cwj2"; + version = "0.3.0.0"; + sha256 = "0v47863md56nbkq0dwq4v7fw6krjjnz9m6fgag6qcbd3yx4lydc2"; libraryHaskellDepends = [ - ansi-wl-pprint base deepseq protolude text time + ansi-wl-pprint base deepseq exceptions protolude safe-exceptions + text time ]; testHaskellDepends = [ - base doctest Glob protolude QuickCheck tasty tasty-hspec - tasty-hunit tasty-rerun tasty-smallcheck text time + base doctest Glob protolude QuickCheck safe-exceptions tasty + tasty-hspec tasty-hunit tasty-rerun tasty-smallcheck text time + ]; + benchmarkHaskellDepends = [ + base criterion protolude safe-exceptions 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"; + description = "Build composable components for your application with clear teardown semantics"; license = stdenv.lib.licenses.mit; }) {}; - "teardown_0_3_0_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest - , exceptions, Glob, protolude, QuickCheck, safe-exceptions, tasty - , tasty-hspec, tasty-hunit, tasty-rerun, tasty-smallcheck, text - , time + "teardown_0_4_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, criterion, rio, tasty + , tasty-hunit, typed-process, unliftio }: mkDerivation { pname = "teardown"; - version = "0.3.0.0"; - sha256 = "0v47863md56nbkq0dwq4v7fw6krjjnz9m6fgag6qcbd3yx4lydc2"; + version = "0.4.0.0"; + sha256 = "0y2ihw74fnnygzp22nyy7285d3rcp6kw2gjkzys82blwrbdwdlsk"; libraryHaskellDepends = [ - ansi-wl-pprint base deepseq exceptions protolude safe-exceptions - text time + ansi-wl-pprint base rio typed-process unliftio ]; testHaskellDepends = [ - base doctest Glob protolude QuickCheck safe-exceptions tasty - tasty-hspec tasty-hunit tasty-rerun tasty-smallcheck text time + base rio tasty tasty-hunit typed-process unliftio ]; benchmarkHaskellDepends = [ - base criterion protolude safe-exceptions text time + base criterion rio typed-process unliftio ]; homepage = "https://github.com/roman/Haskell-teardown#readme"; description = "Build composable components for your application with clear teardown semantics"; @@ -192953,6 +202415,7 @@ self: { homepage = "https://github.com/expipiplus1/teeth"; description = "Dental data types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "telegram" = callPackage @@ -192972,26 +202435,27 @@ self: { }) {}; "telegram-api" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath - , hjpath, hspec, http-api-data, http-client, http-client-tls - , http-media, http-types, mime-types, mtl, optparse-applicative - , servant, servant-client, string-conversions, text, transformers + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + , containers, filepath, hjpath, hspec, http-api-data, http-client + , http-client-tls, http-media, http-types, mime-types, mtl + , optparse-applicative, random, servant, servant-client + , servant-client-core, string-conversions, text, transformers , utf8-string }: mkDerivation { pname = "telegram-api"; - version = "0.6.3.0"; - sha256 = "0fp8ryh9pdpfycyknd9d1r9z1v0p06r87nf19x7azv4i1yl5msia"; + version = "0.7.2.0"; + sha256 = "1aixgyxz3izv9z3zwwsbvdnlg4lrhy7aa33zw98v70072a0rqaj2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring http-api-data http-client http-media - http-types mime-types mtl servant servant-client string-conversions - text transformers + aeson base bytestring containers http-api-data http-client + http-media http-types mime-types mtl servant servant-client + servant-client-core string-conversions text transformers ]; testHaskellDepends = [ aeson ansi-wl-pprint base filepath hjpath hspec http-client - http-client-tls http-types optparse-applicative servant - servant-client text transformers utf8-string + http-client-tls http-types optparse-applicative random servant + servant-client servant-client-core text transformers utf8-string ]; homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; description = "Telegram Bot API bindings"; @@ -193134,12 +202598,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "template-haskell_2_12_0_0" = callPackage + "template-haskell_2_13_0_0" = callPackage ({ mkDerivation, base, ghc-boot-th, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.12.0.0"; - sha256 = "0lbmqagknkdrj9mwqdd5p12ay78wk0g509g75a243jrbm46i6dar"; + version = "2.13.0.0"; + sha256 = "0j61d0xnlsywgn33k72a6dmnp9i93zjn0gba1fhxs9qwdb1xcfk3"; libraryHaskellDepends = [ base ghc-boot-th pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -193156,6 +202620,7 @@ self: { homepage = "https://github.com/nikita-volkov/template-haskell-compat-v0208"; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template-haskell-util" = callPackage @@ -193210,6 +202675,7 @@ self: { homepage = "https://github.com/kobargh/template-toolkit"; description = "Template Toolkit implementation for Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template-yj" = callPackage @@ -193340,8 +202806,8 @@ self: { ({ mkDerivation, base, Boolean }: mkDerivation { pname = "temporal-media"; - version = "0.6.1"; - sha256 = "1bmnii427fdpms23p8dinhs1zi34cin3qfap2csgrmsgcn1qs6bc"; + version = "0.6.2"; + sha256 = "0dsvpag8j2lfn6nz9wbzcbdfrzmq35ww9n8p5db638b11749sc97"; libraryHaskellDepends = [ base Boolean ]; homepage = "https://github.com/anton-k/temporal-media"; description = "data types for temporal media"; @@ -193409,6 +202875,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "temporary_1_3" = callPackage + ({ mkDerivation, base, base-compat, directory, exceptions, filepath + , random, tasty, tasty-hunit, transformers, unix + }: + mkDerivation { + pname = "temporary"; + version = "1.3"; + sha256 = "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c"; + libraryHaskellDepends = [ + base directory exceptions filepath random transformers unix + ]; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "temporary-rc" = callPackage ({ mkDerivation, base, directory, exceptions, filepath , transformers, unix @@ -193742,16 +203228,16 @@ self: { }) {}; "terminal-progress-bar" = callPackage - ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework - , test-framework-hunit + ({ mkDerivation, async, base, HUnit, stm, stm-chans, terminal-size + , test-framework, test-framework-hunit }: mkDerivation { pname = "terminal-progress-bar"; - version = "0.1.1.1"; - sha256 = "1y9mpmnbc12bbybaqq7cqwhvbbdbx31zxkb63mymiaz1bnhi58fp"; + version = "0.2"; + sha256 = "052az3lxmhfssvm1i5md5d9la7vhfy560ls101kvw73vdzxk9cfn"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base stm stm-chans ]; + libraryHaskellDepends = [ async base stm stm-chans terminal-size ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; @@ -193771,6 +203257,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "terminal-text" = callPackage + ({ mkDerivation, ansi-terminal, base, container, layered-state + , prologue, text + }: + mkDerivation { + pname = "terminal-text"; + version = "1.1.1"; + sha256 = "1jgdxqck3ck65mppi694w0f5x0547148y5agi100zggp8r3yxsy3"; + libraryHaskellDepends = [ + ansi-terminal base container layered-state prologue text + ]; + homepage = "https://github.com/luna/terminal-text"; + description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "termination-combinators" = callPackage ({ mkDerivation, base, containers, contravariant }: mkDerivation { @@ -193784,12 +203287,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "terminfo_0_4_1_0" = callPackage + "terminfo_0_4_1_1" = callPackage ({ mkDerivation, base, ncurses }: mkDerivation { pname = "terminfo"; - version = "0.4.1.0"; - sha256 = "0pgzx7byi4p2fwk6hcqnbs59bv4igzmhfkr5wrkkfsh4msqxflrz"; + version = "0.4.1.1"; + sha256 = "1pfd2vdk298v23af2zqcl66xxivrzwjjpdf3dr0fa0isl70fi3hp"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; homepage = "https://github.com/judah/terminfo"; @@ -193882,7 +203385,6 @@ self: { homepage = "http://mbays.freeshell.org/tersmu"; description = "A semantic parser for lojban"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-fixture" = callPackage @@ -193907,22 +203409,24 @@ self: { }) {}; "test-framework" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers - , hostname, old-locale, random, regex-posix, time, xml + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, bytestring + , containers, hostname, HUnit, libxml, old-locale, QuickCheck + , random, regex-posix, semigroups, time, xml }: mkDerivation { pname = "test-framework"; - version = "0.8.1.1"; - sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq"; - revision = "2"; - editedCabalFile = "1mp1h0fzwxa3xxnbw33lp8hj0rb8vwkd712r5ak8ny5nmawh2c9y"; - isLibrary = true; - isExecutable = true; + version = "0.8.2.0"; + sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml ]; - homepage = "https://batterseapower.github.io/test-framework/"; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base bytestring containers hostname + HUnit libxml old-locale QuickCheck random regex-posix semigroups + time xml + ]; + homepage = "http://haskell.github.io/test-framework/"; description = "Framework for running and organising tests, with HUnit and QuickCheck support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -194013,6 +203517,8 @@ self: { pname = "test-framework-quickcheck2"; version = "0.3.0.4"; sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp"; + revision = "1"; + editedCabalFile = "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff"; libraryHaskellDepends = [ base extensible-exceptions QuickCheck random test-framework ]; @@ -194120,7 +203626,6 @@ self: { ]; description = "Template Haskell for test framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-invariant" = callPackage @@ -194269,6 +203774,7 @@ self: { ]; description = "Simple Perl inspired testing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testCom" = callPackage @@ -194286,7 +203792,6 @@ self: { ]; description = "Write your tests in comments"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testPkg" = callPackage @@ -194304,24 +203809,21 @@ self: { }) {}; "testbench" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers, criterion - , deepseq, dlist, HUnit, optparse-applicative, process, resourcet - , statistics, streaming, streaming-bytestring, streaming-cassava - , temporary, transformers, weigh + ({ mkDerivation, base, bytestring, cassava, criterion, deepseq + , dlist, HUnit, optparse-applicative, process, statistics + , streaming, streaming-cassava, streaming-with, temporary + , transformers, weigh }: mkDerivation { pname = "testbench"; - version = "0.2.1.0"; - sha256 = "0pka1vmzh4x0pzwlrxzzsjaxjd7py43m5ph3barwfrbjkqbyjzj6"; + version = "0.2.1.1"; + sha256 = "0ps4q86258j41iv3xisxw3154xgxg0dmk3khc4ibr1k0dbvkr8r6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cassava criterion deepseq dlist HUnit - optparse-applicative process resourcet statistics streaming - streaming-bytestring streaming-cassava temporary transformers weigh - ]; - executableHaskellDepends = [ - base bytestring containers criterion HUnit + optparse-applicative process statistics streaming streaming-cassava + streaming-with temporary transformers weigh ]; description = "Create tests and benchmarks together"; license = stdenv.lib.licenses.mit; @@ -194335,6 +203837,8 @@ self: { pname = "testing-feat"; version = "0.4.0.3"; sha256 = "1kh7ak9qlxsr34hxccfgyz1ga90xxiaxqndk3jaln1f495w9rjil"; + revision = "1"; + editedCabalFile = "05j5i1sfg1k94prhwmg6z50w0flb9k181nhabwr3m9gkrrqzb4b4"; libraryHaskellDepends = [ base mtl QuickCheck tagshare template-haskell ]; @@ -194460,8 +203964,8 @@ self: { }: mkDerivation { pname = "texbuilder"; - version = "0.1.1.2"; - sha256 = "069y2d2k87sfx4mkmd8219iiyh9s6x79kigxbdi9swfa4k9xa1gm"; + version = "0.1.4.1"; + sha256 = "0d8fwnrqlfjcls229iiq6x4v1a4yxm5qfsyymbqf6xwj8mcmqhb6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -194477,43 +203981,18 @@ self: { "texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, network-uri, pandoc-types, parsec, process, split, syb - , temporary, text, utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.9.4.4"; - sha256 = "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - executableHaskellDepends = [ network-uri ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - }) {}; - - "texmath_0_10" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, network-uri, pandoc-types, parsec, process, split, syb - , temporary, text, utf8-string, xml + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml }: mkDerivation { pname = "texmath"; - version = "0.10"; - sha256 = "0i9haxii7kklz6qrfidb54iv5cl73p201zy24mwkf4bf56lff1pa"; + version = "0.10.1.1"; + sha256 = "0q2fld5mdcd6j1n3rrg3bjpndbgbn17cwg0xbnvscrpa0s767jaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl pandoc-types parsec syb xml ]; - executableHaskellDepends = [ network-uri ]; testHaskellDepends = [ base bytestring directory filepath process split temporary text utf8-string xml @@ -194521,7 +204000,6 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -194542,6 +204020,7 @@ self: { ]; description = "Functions for running Tex from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text" = callPackage @@ -194552,8 +204031,8 @@ self: { }: mkDerivation { pname = "text"; - version = "1.2.2.2"; - sha256 = "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii"; + version = "1.2.3.0"; + sha256 = "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp ]; @@ -194563,7 +204042,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; doCheck = false; - homepage = "https://github.com/bos/text"; + homepage = "https://github.com/haskell/text"; description = "An efficient packed Unicode text type"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -194573,8 +204052,8 @@ self: { }: mkDerivation { pname = "text-all"; - version = "0.4.1.1"; - sha256 = "195f1l4s6vfg4dhpmkfsd178rldknw0gdkl1qpbn3kzhba044y7w"; + version = "0.4.2"; + sha256 = "0mh2dwd0b732jcg2bak04iwrb34cy28hq2dppb8pp5r5a0g4925g"; libraryHaskellDepends = [ base bytestring text text-format utf8-string ]; @@ -194620,8 +204099,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.4.2"; - sha256 = "1k3dna9l438cxlcyl2a28ld68ki3a7qrc35vrssn2dlcf5l89ng4"; + version = "0.5.1"; + sha256 = "1x5dacn3zkc3v72kspdicmp0c1cr8yq83xp115lfj7aq5riw6z1r"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -194633,6 +204112,7 @@ self: { homepage = "https://github.com/nikita-volkov/text-builder"; description = "An efficient strict text builder"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-containers" = callPackage @@ -194713,8 +204193,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.5.0"; - sha256 = "127h2pw3p9ixx34jiql9kgpjbjmkmwigm56iklaz6wxd69zr0sfx"; + version = "0.1.5.1"; + sha256 = "14hmzsxhbqr95r7sbpziv897akdw8p54fhwh56j0h9hqnpwxxwgd"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -194840,14 +204320,15 @@ self: { "text-latin1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, data-checked - , hashable, text + , hashable, semigroups, text }: mkDerivation { pname = "text-latin1"; - version = "0.3"; - sha256 = "1cs09qwkcljbnckakzr1wnpclkzjb0in3nnz6fpjyl4mxp5bqaw9"; + version = "0.3.1"; + sha256 = "1wxbv6m567n3330baw2k0xxd50nhn2k6w3lgmpk6zq7x1jp84x3c"; libraryHaskellDepends = [ - base bytestring case-insensitive data-checked hashable text + base bytestring case-insensitive data-checked hashable semigroups + text ]; homepage = "https://github.com/mvv/text-latin1"; description = "Latin-1 (including ASCII) utility functions"; @@ -194855,23 +204336,42 @@ self: { }) {}; "text-ldap" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , containers, dlist, QuickCheck, quickcheck-simple, random - , semigroups, transformers + ({ mkDerivation, attoparsec, base, bytestring, containers, dlist + , memory, QuickCheck, quickcheck-simple, random, transformers }: mkDerivation { pname = "text-ldap"; - version = "0.1.1.8"; - sha256 = "0ff057nr4v6hvwsa7avkz14nw63542l0zfsjb91q9nr60kvnsipj"; + version = "0.1.1.11"; + sha256 = "1921cdq9akvcn0hsgs07g2bvbpdvhb1h389yv9703472d0sz7pfs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base base64-bytestring bytestring containers dlist - semigroups transformers + attoparsec base bytestring containers dlist memory transformers ]; executableHaskellDepends = [ base bytestring ]; testHaskellDepends = [ - base bytestring QuickCheck quickcheck-simple random semigroups + base bytestring QuickCheck quickcheck-simple random + ]; + description = "Parser and Printer for LDAP text data stream"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "text-ldap_0_1_1_12" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, dlist + , memory, QuickCheck, quickcheck-simple, random, transformers + }: + mkDerivation { + pname = "text-ldap"; + version = "0.1.1.12"; + sha256 = "1kfp77nm8mvzi6h44334djr88z2w6syrwrvrqy2jfb65d0p9crbx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers dlist memory transformers + ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-simple random ]; description = "Parser and Printer for LDAP text data stream"; license = stdenv.lib.licenses.bsd3; @@ -194973,6 +204473,8 @@ self: { pname = "text-metrics"; version = "0.3.0"; sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q"; + revision = "2"; + editedCabalFile = "1371qwwmq8w4p6zg0z43qnrpf9yb8yadnw97ka56mx4jlagrdm8n"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -195074,8 +204576,8 @@ self: { }: mkDerivation { pname = "text-regex-replace"; - version = "0.1.1.1"; - sha256 = "0n0jk3qdcdhy3b91x7xkyc87xk3405g49qrgcfzb3ksr9qyw89rg"; + version = "0.1.1.2"; + sha256 = "1v6gjimq4qzldpc3ihvf0mn24n3mfk4vs87b7xzgmzk63sbpijyk"; libraryHaskellDepends = [ attoparsec base text text-icu ]; testHaskellDepends = [ base hspec QuickCheck smallcheck text text-icu @@ -195124,19 +204626,37 @@ self: { homepage = "http://github.com/thinkpad20/text-render"; description = "A type class for rendering objects as text, pretty-printing, etc"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "text-replace" = callPackage + ({ mkDerivation, base, containers, hedgehog, neat-interpolation + , optparse-applicative, parsec, text + }: + mkDerivation { + pname = "text-replace"; + version = "0.0.0.2"; + sha256 = "1qd3i8sj6z0vgb2yn345wh16w0lvmqdvywrkpcdsmbc00j8cwkjq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base optparse-applicative parsec ]; + testHaskellDepends = [ base hedgehog neat-interpolation text ]; + homepage = "https://github.com/chris-martin/text-replace"; + description = "Simple text replacements from a list of search/replace pairs"; + license = stdenv.lib.licenses.asl20; }) {}; "text-short" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, hashable - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim + , hashable, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, text }: mkDerivation { pname = "text-short"; - version = "0.1.1"; - sha256 = "1c912nn1xqqvg27rndb8qvqwhw4iivhr19qjkgy3nfbi6krzkvsm"; + version = "0.1.2"; + sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk"; libraryHaskellDepends = [ - base binary bytestring deepseq hashable text + base binary bytestring deepseq ghc-prim hashable text ]; testHaskellDepends = [ base binary quickcheck-instances tasty tasty-hunit tasty-quickcheck @@ -195144,28 +204664,28 @@ self: { ]; 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 , criterion, deepseq, 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 + , ghc-boot-th, ghc-prim, hspec, hspec-discover, 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"; - sha256 = "0gvg1fpgvws75zhvxdkcg03m6sy5rv4m77fynjh8v6rakbiy7gb4"; - revision = "1"; - editedCabalFile = "052zp68y3fbwvg9xigngaqfv7afjw9prfns5qlx6s7mv3i8dc2mk"; + version = "3.7.2"; + sha256 = "0gb7y83w81zvfi7szb62d17w0qi7ca7ybri81adqk141c3cxc83s"; + revision = "2"; + editedCabalFile = "0fjysjlmvvzvndxsni2ja92kr1pyqgl4dyc5c7x2ffaf02g9h2d2"; 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-lift - transformers transformers-compat void + 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 @@ -195174,6 +204694,7 @@ self: { QuickCheck quickcheck-instances semigroups tagged template-haskell text th-lift transformers transformers-compat void ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant criterion deepseq generic-deriving @@ -195185,36 +204706,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "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 + "text-show_3_7_3" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers + , contravariant, criterion, deepseq, deriving-compat + , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover + , 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"; + version = "3.7.3"; + sha256 = "1d8wmdndl8qsz90fb67xxbrprlmmp47p4f3ik6psp5m6r0cdvpzg"; 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 + array base base-compat-batteries 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 + array base base-compat-batteries 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 ]; + testToolDepends = [ hspec-discover ]; 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 + array base base-compat-batteries 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"; @@ -195225,18 +204750,16 @@ self: { "text-show-instances" = 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 + , haskeline, hoopl, hpc, hspec, hspec-discover, 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"; - sha256 = "111s9sw9j3pq0wdv6f4wbpf4wff6iiyj8ysq3k1d527f5ln7idmi"; - revision = "1"; - editedCabalFile = "1cw1zjkvfjjgmn8p20lqx5hly5zjlvp69gqp9xdf9zfs3fsgyp8r"; + version = "3.6.3"; + sha256 = "14b5bz0xxihi44nd80c8ma81khn7yjcpl8xvavsdfqy4jz9sb9fr"; libraryHaskellDepends = [ base base-compat bifunctors binary bytestring containers directory ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process @@ -195252,39 +204775,42 @@ self: { th-orphans time transformers transformers-compat unix unordered-containers vector xhtml ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; }) {}; - "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 + "text-show-instances_3_6_4" = callPackage + ({ mkDerivation, base, base-compat-batteries, bifunctors, binary + , bytestring, containers, directory, generic-deriving, ghc-boot-th + , ghc-prim, haskeline, hoopl, hpc, hspec, hspec-discover + , 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"; + version = "3.6.4"; + sha256 = "1a2aacy6l58b49868hhvqws4900rq9dpb8zwkb5cz45gsb7zpgjf"; 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 + base base-compat-batteries 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 + base base-compat-batteries 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 ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; @@ -195323,6 +204849,7 @@ self: { homepage = "https://github.com/klangner/text-time"; description = "Library for Time parsing from Text into UTCTime"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-utf7" = callPackage @@ -195416,16 +204943,16 @@ self: { }) {}; "text1" = callPackage - ({ mkDerivation, base, binary, directory, doctest, filepath, lens - , papa, QuickCheck, semigroups, template-haskell, text + ({ mkDerivation, base, binary, HUnit, lens, QuickCheck, semigroups + , text }: mkDerivation { pname = "text1"; - version = "0.0.5"; - sha256 = "16rz92gvpn1gji6bknilklw397rr118rsdqxysk9wmj10alsxqsp"; - libraryHaskellDepends = [ base binary lens papa semigroups text ]; + version = "0.0.6"; + sha256 = "105y6dbmc3bdbh02v5m6bjsm932d68i262csii1n8kls6rggnfy2"; + libraryHaskellDepends = [ base binary lens semigroups text ]; testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + base HUnit lens QuickCheck semigroups text ]; homepage = "https://github.com/qfpl/text1"; description = "Non-empty values of `Data.Text`."; @@ -195602,6 +205129,8 @@ self: { pname = "th-abstraction"; version = "0.2.6.0"; sha256 = "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5"; + revision = "1"; + editedCabalFile = "0k4s4nbg9jlgaza38842jnzs8s01ig85fzmjgd10k9hl02gc3r44"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -195629,6 +205158,7 @@ self: { homepage = "https://github.com/jkarni/th-alpha"; description = "Alpha equivalence for TH Exp"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-build" = callPackage @@ -195697,19 +205227,19 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.0.2.4"; - sha256 = "0zs36p32khrvdi5m6zhf93jyrcv184bhyxp49w8cj0fms51w2vcs"; + version = "0.0.2.5"; + sha256 = "1q2gggciz9s9ksn3h0mc5zffawz6j7pg6k1k96pqsx39f1bbrbqs"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = stdenv.lib.licenses.bsd3; }) {}; - "th-data-compat_0_0_2_5" = callPackage + "th-data-compat_0_0_2_6" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.0.2.5"; - sha256 = "1q2gggciz9s9ksn3h0mc5zffawz6j7pg6k1k96pqsx39f1bbrbqs"; + version = "0.0.2.6"; + sha256 = "1gbqrrpib065yw53063i7ydvm9ghwja30zc6s13mr2pp1l5a4bs2"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = stdenv.lib.licenses.bsd3; @@ -195722,10 +205252,10 @@ self: { }: mkDerivation { pname = "th-desugar"; - version = "1.6"; - sha256 = "0kv3gxvr7izvg1s86p92b5318bv7pjghig2hx9q21cg9ppifry68"; - revision = "2"; - editedCabalFile = "0rimjzkqky6sq4yba7vqra7hj29903f9xsn2g8rc23abrm35vds3"; + version = "1.7"; + sha256 = "1iqlqadax1ahgv9h1vdyddf55v2h4ghqrxfyqirrvk97iyk1rcsj"; + revision = "1"; + editedCabalFile = "06cxv8yx2dwppzzb9vjqiic2hiaiiqakg0kv0byp9k00sidabbm3"; libraryHaskellDepends = [ base containers mtl syb template-haskell th-expand-syns th-lift th-orphans @@ -195739,14 +205269,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-desugar_1_7" = callPackage + "th-desugar_1_8" = 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"; + version = "1.8"; + sha256 = "0nbsgf3lxmjj43f1xdjb1z486h8av47mym6v1y5pzdv39wgiykdv"; + revision = "1"; + editedCabalFile = "13jvl6ijxjwbd7df0cq5pnijs3wrs8x5r9ykyyj180dak66909wd"; libraryHaskellDepends = [ base containers mtl syb template-haskell th-expand-syns th-lift th-orphans @@ -195761,12 +205293,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "th-dict-discovery" = callPackage + ({ mkDerivation, base, constraints, template-haskell }: + mkDerivation { + pname = "th-dict-discovery"; + version = "0.1.0.0"; + sha256 = "1dmkj8is73mwngy1dw3ba34744whqj0jc243bjnkyrrwkbwn55ih"; + libraryHaskellDepends = [ base constraints template-haskell ]; + homepage = "http://github.com/isovector/th-dict-discovery/"; + description = "Automatically discover available dictionaries at compile time"; + 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.3.0"; - sha256 = "17b73q0d5r8xixhvdp0hv4ap96l7s3f2y0j5cknp81b1hyinivlz"; + version = "0.4.4.0"; + sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc"; libraryHaskellDepends = [ base containers syb template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/DanielSchuessler/th-expand-syns"; @@ -195799,6 +205344,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "th-format" = callPackage + ({ mkDerivation, base, Earley, haskell-src-meta, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "th-format"; + version = "0.1.1.0"; + sha256 = "1axan3icxz9yxkra2kb9r66h9h51v4zbjncd1xsvgiplqmwf6fjl"; + libraryHaskellDepends = [ + base Earley haskell-src-meta template-haskell text + ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + homepage = "https://github.com/mtesseract/th-format#readme"; + description = "Template Haskell based support for format strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-inline-io-action" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -195893,8 +205455,8 @@ self: { ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "th-lift"; - version = "0.7.7"; - sha256 = "1dfb0z42vrmdx579lkam07ic03d3v5y19339a3ca0bwpprpzmihn"; + version = "0.7.8"; + sha256 = "0ay10b78x3969rpqqrgzy8srkl6iby2cljbf3mm17na8x22k7y1c"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base ghc-prim template-haskell ]; homepage = "http://github.com/mboes/th-lift"; @@ -195921,18 +205483,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-nowq" = callPackage + ({ mkDerivation, base, markdown-unlit, template-haskell, time }: + mkDerivation { + pname = "th-nowq"; + version = "0.1.0.2"; + sha256 = "1r9qwj3aw5adxzgxb1kgr9s1scrqclf4jfmlhv8nz1dhbqwg84h1"; + libraryHaskellDepends = [ base template-haskell time ]; + testHaskellDepends = [ base markdown-unlit ]; + homepage = "https://github.com/dzhus/th-nowq#readme"; + description = "Template Haskell splice that expands to current time"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-orphans" = callPackage - ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift - , th-lift-instances, th-reify-many + ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell + , th-lift, th-lift-instances, th-reify-many }: mkDerivation { pname = "th-orphans"; - version = "0.13.4"; - sha256 = "0cab6hmyii42p157jhm0sd5jzdlxms4ip2ncrmcmc47dl3pxk5gk"; + version = "0.13.5"; + sha256 = "1b9599vyn0wjwbq7b7n0w25s3wbihdxr958hscfpwc8lg55lsr4m"; + revision = "1"; + editedCabalFile = "1rgsrnh0qvlriz0c2c3q8wbb3ykby8d3lli0j553ml3n1sn9k4zv"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -195949,20 +205527,23 @@ self: { }) {}; "th-printf" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hspec, HUnit - , QuickCheck, template-haskell, text, transformers + ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bytestring + , charset, containers, criterion, hspec, HUnit, QuickCheck + , template-haskell, text, transformers, trifecta, utf8-string }: mkDerivation { pname = "th-printf"; - version = "0.3.1"; - sha256 = "089grlpavvqv90graa9rdwg9x1ph484g5bj7sfjklqy8mgwwqg7a"; + version = "0.5.1"; + sha256 = "0dgi93pb3zci1isxjmnzhn6apm4pyg12ayz8l1gxlilli8q1z4l6"; libraryHaskellDepends = [ - attoparsec base bytestring template-haskell text transformers + ansi-wl-pprint attoparsec base charset containers template-haskell + text transformers trifecta utf8-string ]; testHaskellDepends = [ base bytestring hspec HUnit QuickCheck template-haskell text ]; - homepage = "https://github.com/joelteon/th-printf"; + benchmarkHaskellDepends = [ base criterion text ]; + homepage = "https://github.com/pikajude/th-printf"; description = "Compile-time printf"; license = stdenv.lib.licenses.mit; }) {}; @@ -195979,6 +205560,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-reify-compat_0_0_1_4" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-reify-compat"; + version = "0.0.1.4"; + sha256 = "08lal845ixcw62skw2rsi98y9v3dgj7bq4ygmlxm6k3lfgd9v7q8"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "http://github.com/khibino/haskell-th-reify-compat/"; + description = "Compatibility for the result type of TH reify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-reify-many" = callPackage ({ mkDerivation, base, containers, mtl, safe, template-haskell , th-expand-syns @@ -196047,19 +205641,27 @@ self: { }) {}; "th-typegraph" = callPackage - ({ 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, aeson, attoparsec, base, bytestring, cereal + , containers, deepseq, dlist, fail, fgl, ghc-prim, hashable, HUnit + , lens, mtl, network-uri, parsec, pretty, safecopy, scientific + , semigroups, split, sr-extra, syb, tagged, template-haskell, text + , th-desugar, th-lift, th-lift-instances, th-orphans, time + , transformers, unordered-containers, userid, vector, web-routes }: mkDerivation { pname = "th-typegraph"; - version = "1.0.2"; - sha256 = "09yf7igwki0h7mv946x066955bj9154pfvqkmr3fy5j9j69gwin1"; + version = "1.4"; + sha256 = "0nfcsmv7dsh28c9smp2vwm9r43c5ann98rxdvyp7w96gpawjwwz4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - 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 + attoparsec base bytestring cereal containers deepseq dlist fail fgl + ghc-prim hashable lens mtl parsec pretty safecopy scientific + semigroups split sr-extra syb tagged template-haskell text + th-desugar th-lift th-lift-instances th-orphans time transformers + unordered-containers userid vector web-routes + ]; + testHaskellDepends = [ + aeson base HUnit network-uri syb template-haskell th-lift ]; homepage = "https://github.com/seereason/th-typegraph"; description = "Graph of the subtype relation"; @@ -196094,8 +205696,8 @@ self: { }: mkDerivation { pname = "thank-you-stars"; - version = "0.2.0"; - sha256 = "0a1mv7k7m4yaadfrmb45s09aa5zy0wd2jccjsyqhp63v89m58z8j"; + version = "0.3.0"; + sha256 = "0cks475c8ivhikci7h8zkvxhxmp7n9w85b16wvx998q3bjrbkj04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196126,23 +205728,23 @@ self: { homepage = "https://github.com/nikita-volkov/theatre"; description = "Minimalistic actor library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "themoviedb" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, either - , http-client, http-client-tls, http-types, mtl, tasty, tasty-hunit - , text, text-binary, time, time-locale-compat, transformers + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-types, mtl, tasty, tasty-hunit, text + , text-binary, time, time-locale-compat, transformers }: mkDerivation { pname = "themoviedb"; - version = "1.1.3.0"; - sha256 = "0bw3y1vlh36dnsc8npx3nf00n86qbz61xfkjvlp1knidda3q0d1c"; + version = "1.1.4.0"; + sha256 = "0sx59hi3cv5b71x6gdm8vpj5hchw52vndhksnshblndm8kgxnfa6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring either http-client http-client-tls - http-types mtl text text-binary time time-locale-compat - transformers + aeson base binary bytestring http-client http-client-tls http-types + mtl text text-binary time time-locale-compat transformers ]; executableHaskellDepends = [ base text time time-locale-compat transformers @@ -196153,6 +205755,7 @@ self: { homepage = "http://github.com/pjones/themoviedb"; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "themplate" = callPackage @@ -196231,34 +205834,6 @@ self: { }) {}; "these" = 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.3"; - sha256 = "16rx5929skbpn7f5v4hnnyps01y3bm51cr4z5b5zzjn23q8rqcql"; - revision = "4"; - editedCabalFile = "1hkhibphw12xshs24nnx20pkb0mdn5df67kjldj7phkvg88jmcyw"; - 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; - }) {}; - - "these_0_7_4" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, containers , data-default-class, deepseq, hashable, keys, mtl, profunctors , QuickCheck, quickcheck-instances, semigroupoids, tasty @@ -196269,8 +205844,8 @@ self: { pname = "these"; version = "0.7.4"; sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; - revision = "1"; - editedCabalFile = "15vrym6g4vh4fbji8zxy1kxajnickmg6bq83m4hcy5bfv7rf9y39"; + revision = "6"; + editedCabalFile = "16dglq7aj28ag4h11m4ym8lm3jjq5kx3y0bycbhqm4q9xpnwfvfb"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -196284,7 +205859,6 @@ self: { 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 @@ -196368,16 +205942,12 @@ self: { }) {}; "thread-hierarchy" = callPackage - ({ mkDerivation, base, containers, hspec, lifted-base - , monad-control, stm, transformers-base - }: + ({ mkDerivation, base, containers, hspec, stm }: mkDerivation { pname = "thread-hierarchy"; - version = "0.2.0.0"; - sha256 = "1y11q5ijb9hqvxgcf5jig6d24895nrrg06ig8sy7fk1s32rr0bqm"; - libraryHaskellDepends = [ - base containers lifted-base monad-control stm transformers-base - ]; + version = "0.3.0.0"; + sha256 = "064s46pg3l015lp4zvz9kj0yki48hvwqccfjxqs52jz5pd9rd1z8"; + libraryHaskellDepends = [ base containers stm ]; testHaskellDepends = [ base containers hspec stm ]; homepage = "https://github.com/nshimaza/thread-hierarchy#readme"; description = "Simple Haskel thread management in hierarchical manner"; @@ -196385,20 +205955,6 @@ self: { }) {}; "thread-local-storage" = callPackage - ({ mkDerivation, atomic-primops, base, containers, criterion }: - mkDerivation { - pname = "thread-local-storage"; - version = "0.1.1"; - sha256 = "1jj5k24b0q4lzlsb3cs305radc25x6nmm5r96pikjgdzgakxz80i"; - 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; - }) {}; - - "thread-local-storage_0_1_2" = callPackage ({ mkDerivation, atomic-primops, base, containers, criterion }: mkDerivation { pname = "thread-local-storage"; @@ -196410,7 +205966,6 @@ self: { 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 @@ -196444,8 +205999,8 @@ self: { }: mkDerivation { pname = "threads"; - version = "0.5.1.5"; - sha256 = "0phbspm8k2k6w66hv6ldccvy3kc4rjnspj0jwabiwklinkv7wpd1"; + version = "0.5.1.6"; + sha256 = "0bjnjhnq3km6xqk0fn1fgyz5xdw4h6lylbwwbcmkkfzwcz0c76hk"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ @@ -196509,8 +206064,8 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.9"; - sha256 = "1ayn5ahfkdh367m8x0xwr8f5pqy8z41wmc60b78a1d3p44j86aq7"; + version = "0.2.10"; + sha256 = "1wmj5a7kfyj8msi9gfvd48rr4vpl4ggd251yrj09ly5la98zs8pv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -196522,7 +206077,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ThreadScope"; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "threefish" = callPackage @@ -196543,25 +206097,6 @@ self: { }) {}; "threepenny-editors" = callPackage - ({ mkDerivation, base, casing, containers, data-default - , generics-sop, profunctors, threepenny-gui - }: - mkDerivation { - pname = "threepenny-editors"; - version = "0.4.1"; - sha256 = "1fzipaqzhayqg581r4p02byxxxql8ydsyxpwdhvqw738a46afqxg"; - 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-editors_0_5_6" = callPackage ({ mkDerivation, base, bifunctors, casing, containers, generics-sop , profunctors, text, threepenny-gui }: @@ -196575,14 +206110,9 @@ self: { base bifunctors casing containers generics-sop profunctors text threepenny-gui ]; - executableHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors text - threepenny-gui - ]; homepage = "https://github.com/pepeiborra/threepenny-editors"; description = "Composable algebraic editors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threepenny-gui" = callPackage @@ -196594,8 +206124,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.8.2.0"; - sha256 = "1qmvrkha68f30kdv8hvdkj25sgsski7rnd6dqmvbhqrn6fpsqm8r"; + version = "0.8.2.3"; + sha256 = "17lh51ifw29a641xhkpcclnpxl7jvp6dmx9rbxqn5wgqclvi5qwb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -196726,8 +206256,8 @@ self: { pname = "through-text"; version = "0.1.0.0"; sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk"; - revision = "2"; - editedCabalFile = "1qbzxll2zfc2y9r17yk2077lyq6f2dw1745kxn5f4r33970128k6"; + revision = "3"; + editedCabalFile = "1gia9j7zq3g74kqvkzwp68d690nhddix1kpmj23d5a3zns3rxasn"; 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"; @@ -196750,6 +206280,7 @@ self: { 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thumbnail" = callPackage @@ -196784,6 +206315,7 @@ self: { homepage = "https://github.com/prowdsponsor/thumbnail-plus"; description = "Generate thumbnails easily and safely"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thyme" = callPackage @@ -196857,15 +206389,17 @@ self: { }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; "tibetan-utils" = callPackage - ({ mkDerivation, base, composition, either, hspec, hspec-megaparsec - , megaparsec, text, text-show + ({ mkDerivation, base, composition-prelude, either, hspec + , hspec-megaparsec, megaparsec, text, text-show }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.4"; - sha256 = "0xr31py60q915a8qg590c55mjprf7w5w4cdlcjg1gz6wqq9kdjam"; + version = "0.1.1.5"; + sha256 = "09bqix2a2js98rhp748qx2i0vnxya3c6zvpjizbbnf5fwpspy01q"; + revision = "1"; + editedCabalFile = "0wmfv4dxjhjwsnkc8n7jfhbkvc7zwgcmkj7pvabmhcjzn5ch0dck"; libraryHaskellDepends = [ - base composition either megaparsec text text-show + base composition-prelude either megaparsec text text-show ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec text @@ -196910,24 +206444,22 @@ self: { }) {}; "tickle" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, directory, doctest - , filepath, lens, mtl, QuickCheck, semigroupoids, semigroups - , template-haskell, transformers, validation + ({ mkDerivation, base, bifunctors, bytestring, checkers, filepath + , lens, mtl, papa, QuickCheck, semigroupoids, semigroups, tasty + , tasty-hunit, tasty-quickcheck, transformers, validation }: mkDerivation { pname = "tickle"; - version = "0.0.6"; - sha256 = "19xv9s3qz2q2jvgzig8rfc47c25m8xl3d10xdx1d4dsmhbj1nw55"; - revision = "1"; - editedCabalFile = "1j0npns8ilxq84087gfdg1isncjssp9q0ijgrpg849cip8h0y5y1"; + version = "0.0.9"; + sha256 = "10fq51mvks300yhhzzsjfmjd0g888z35x7qc4b7a2i7307zjrjml"; libraryHaskellDepends = [ - base bifunctors bytestring filepath lens mtl semigroupoids + base bifunctors bytestring filepath mtl papa semigroupoids semigroups transformers validation ]; testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/NICTA/tickle"; + homepage = "https://github.com/qfpl/tickle"; description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -196948,21 +206480,41 @@ self: { "tidal" = callPackage ({ mkDerivation, base, colour, containers, hashable, hosc - , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit - , text, time, websockets + , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty + , tasty-hunit, text, time, websockets }: mkDerivation { pname = "tidal"; - version = "0.9.4"; - sha256 = "1i290r4invm7haw1pcq2v60iz7wr73c6qfxkghx6kfgawyl0v3pn"; + version = "0.9.8"; + sha256 = "08a8k4kdq6wmhggf3bm4c5a6xck2waf6n6815csms919rhlbkbpb"; + libraryHaskellDepends = [ + base colour containers hashable hosc mersenne-random-pure64 mtl + parsec safe semigroups text time websockets + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://tidalcycles.org/"; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "tidal_0_9_9" = callPackage + ({ mkDerivation, base, colour, containers, hashable, hosc + , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty + , tasty-hunit, text, time, websockets + }: + mkDerivation { + pname = "tidal"; + version = "0.9.9"; + sha256 = "1zpbnn1kw2ybmlg6g9yj39jhfp6sl12335rxqns0nfi8l2jjgbgr"; libraryHaskellDepends = [ base colour containers hashable hosc mersenne-random-pure64 mtl - parsec safe text time websockets + parsec safe semigroups 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 @@ -196971,15 +206523,14 @@ self: { }: mkDerivation { pname = "tidal-midi"; - version = "0.9.4"; - sha256 = "09np70rmkm75g246bm5wl2f52618ri3kd66hqhwawq586mmjj1hv"; + version = "0.9.10"; + sha256 = "0d59s9vq2jmlb8b1bbay6n5911fjm9j04c9545p4i5visniv61b4"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; homepage = "http://tidal.lurk.org/"; description = "MIDI support for tidal"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-serial" = callPackage @@ -197145,14 +206696,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_8_0_3" = callPackage + "time_1_9_1" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.8.0.3"; - sha256 = "0mbz76v74q938ramsgipgsvk8hvnplcnffplaq439z202zkyar1h"; + version = "1.9.1"; + sha256 = "1nsvkxfm4gvmsmwd88ybpbpbny99b9k9z1f5cdkwlghvr0amg7s7"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -197212,8 +206763,8 @@ self: { }: mkDerivation { pname = "time-exts"; - version = "3.0.3"; - sha256 = "0v3q4n3zj613sywnh7p9fx5shq23ybagnz2bkk9drj1gypbpzjhs"; + version = "3.0.4"; + sha256 = "08nffyg181m1bgna4b6bv74w04byizzd5j80ad5xjb0mifbynzdd"; libraryHaskellDepends = [ attoparsec base bindings-DSL deepseq lens-simple mtl old-locale random text time tz @@ -197225,7 +206776,6 @@ self: { homepage = "https://github.com/enzoh/time-exts"; description = "Yet another time library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "time-http" = callPackage @@ -197281,9 +206831,10 @@ self: { ({ mkDerivation, base, data-lens-light, time }: mkDerivation { pname = "time-lens"; - version = "0.4.0.1"; - sha256 = "0916qfan93aq91icf87ifvskrq6s6s75rhkajvl8pxp74j28hlwz"; + version = "0.4.0.2"; + sha256 = "07nh97x1mx5hc48xqv3gk3cgls6xpb829h3bzsjx8rwqnzybijyq"; libraryHaskellDepends = [ base data-lens-light time ]; + homepage = "https://github.com/feuerbach/time-lens"; description = "Lens-based interface to Data.Time data structures"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -197292,14 +206843,40 @@ self: { ({ mkDerivation, base, old-locale, time }: mkDerivation { pname = "time-locale-compat"; - version = "0.1.1.3"; - sha256 = "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i"; + version = "0.1.1.4"; + sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj"; 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"; + description = "Compatibile module for time-format locale"; license = stdenv.lib.licenses.bsd3; }) {}; + "time-locale-vietnamese" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "time-locale-vietnamese"; + version = "1.0.0.0"; + sha256 = "0xhbfdzrlhj3096w2dgk2ijpzs4kzym11sz3r0h8r19a3jrjs1ln"; + libraryHaskellDepends = [ base time ]; + homepage = "https://github.com/tungd/time-locale-vietnamese#readme"; + description = "Vietnamese locale for date and time format"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "time-machine" = callPackage + ({ mkDerivation, base, hspec, HUnit, mtl, time, tz }: + mkDerivation { + pname = "time-machine"; + version = "0.1.0"; + sha256 = "1nz14g7n4igy46gkw3xvksmi062vxkbbmp8q5hbjky2x7jnc8h8j"; + libraryHaskellDepends = [ base mtl time tz ]; + testHaskellDepends = [ base hspec HUnit mtl time tz ]; + homepage = "https://github.com/y-taka-23/time-machine#readme"; + description = "A library to mock the current time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-out" = callPackage ({ mkDerivation, base, data-default-class, exceptions , time-interval, time-units, transformers @@ -197326,8 +206903,8 @@ self: { pname = "time-parsers"; version = "0.1.2.0"; sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f"; - revision = "1"; - editedCabalFile = "1fvk31ab241v4ib7lg718q6qwrc3w7axq9kinccbdnn7b7d259gj"; + revision = "2"; + editedCabalFile = "1qvhmwkdb4a0msxpfssyqdz0fmi45iv7iwmw7b1mf4flqz6jvaql"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -197336,6 +206913,7 @@ self: { homepage = "https://github.com/phadej/time-parsers#readme"; description = "Parsers for types in `time`"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-patterns" = callPackage @@ -197414,6 +206992,7 @@ self: { homepage = "https://github.com/klangner/time-series-lib"; description = "Library for Time Series processing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-units" = callPackage @@ -197446,14 +207025,14 @@ self: { "time-warp" = callPackage ({ mkDerivation, ansi-terminal, array, async, attoparsec, base , binary, binary-conduit, bytestring, conduit, conduit-extra - , containers, data-default, data-msgpack, deepseq, directory - , exceptions, extra, formatting, hashable, hslogger, hspec, lens - , lifted-base, log-warper, mmorph, monad-control, monad-loops - , MonadRandom, mtl, network, optparse-simple, pqueue, QuickCheck - , quickcheck-instances, random, resourcet, safe, semigroups - , serokell-util, slave-thread, stm, stm-chans, stm-conduit - , streaming-commons, template-haskell, text, text-format, time - , time-units, transformers, transformers-base, unordered-containers + , containers, data-default, data-msgpack, deepseq, exceptions + , extra, formatting, hashable, hspec, lens, lifted-base, log-warper + , mmorph, monad-control, monad-loops, MonadRandom, mtl, network + , pqueue, QuickCheck, quickcheck-instances, random, safe + , semigroups, serokell-util, slave-thread, stm, stm-chans + , stm-conduit, streaming-commons, template-haskell, text + , text-format, time, time-units, transformers, transformers-base + , unordered-containers }: mkDerivation { pname = "time-warp"; @@ -197471,14 +207050,6 @@ self: { streaming-commons template-haskell text text-format time time-units transformers transformers-base unordered-containers ]; - executableHaskellDepends = [ - async attoparsec base binary binary-conduit bytestring conduit - conduit-extra containers data-default data-msgpack directory - exceptions extra formatting hslogger hspec lens log-warper - monad-control monad-loops MonadRandom mtl optparse-simple - QuickCheck random resourcet serokell-util stm text text-format time - time-units transformers unordered-containers - ]; testHaskellDepends = [ async base data-default data-msgpack exceptions hspec lens log-warper mtl QuickCheck random serokell-util stm text text-format @@ -197522,10 +207093,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "timeit"; - version = "1.0.0.0"; - sha256 = "0dkjbp636dp882zlbwvvz76k4g7ga28wksd41w6mh0k8z45xjj5x"; + version = "2.0"; + sha256 = "1sliqpvl501rlcj6s0lhmsf5ym24j4h881wzc1f1wdyvg3jz8kd1"; libraryHaskellDepends = [ base ]; - description = "Time a computation"; + homepage = "https://github.com/merijn/timeit"; + description = "Time monadic computations with an IO base"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -197609,33 +207181,28 @@ self: { "timemap" = callPackage ({ mkDerivation, base, containers, criterion, focus, hashable , list-t, QuickCheck, quickcheck-instances, stm, stm-containers - , tasty, tasty-hunit, tasty-quickcheck, time, unordered-containers + , tasty, tasty-quickcheck, time, unordered-containers }: mkDerivation { pname = "timemap"; - version = "0.0.4"; - sha256 = "1qyrs6yg30rqcp5izm20wadclpdb5jvxscswcgdm54gx4z3qaz3f"; - isLibrary = true; - isExecutable = true; + version = "0.0.7"; + sha256 = "06rx5q1b0r4chiiy9wi9k0q9qc4yxjk794hcq8dr7gpixgcrjjrg"; libraryHaskellDepends = [ base containers focus hashable list-t stm stm-containers time unordered-containers ]; - executableHaskellDepends = [ - base containers focus hashable list-t stm stm-containers time - unordered-containers - ]; testHaskellDepends = [ base containers focus hashable list-t QuickCheck - quickcheck-instances stm stm-containers tasty tasty-hunit - tasty-quickcheck time unordered-containers + quickcheck-instances stm stm-containers tasty tasty-quickcheck time + unordered-containers ]; benchmarkHaskellDepends = [ base containers criterion focus hashable list-t stm stm-containers time unordered-containers ]; - description = "A mutable hashmap, implicitly indexed by UTCTime"; + homepage = "https://github.com/athanclark/timemap#readme"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timeout" = callPackage @@ -197750,6 +207317,7 @@ self: { homepage = "https://github.com/HugoDaniel/timerep"; description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timers" = callPackage @@ -197767,6 +207335,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timers-tick" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "timers-tick"; + version = "0.4.0.0"; + sha256 = "02da32j9jz21awmsf38rrj3l3ks7s9a6vvqadr98c35shx3sxzcq"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "http://ariis.it/static/articles/timers-tick/page.html"; + description = "tick based timers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "timers-updatable" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -197812,6 +207394,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "timestamp" = callPackage + ({ mkDerivation, base, cereal, foldl, generic-random, hashable + , QuickCheck, time + }: + mkDerivation { + pname = "timestamp"; + version = "0.2"; + sha256 = "1cl57lf53kqmrhplf944zqhp59vjah57yakqd9m2rn0m5n6hz6sg"; + libraryHaskellDepends = [ + base cereal foldl generic-random hashable QuickCheck time + ]; + homepage = "https://github.com/metrix-ai/timestamp"; + description = "Space-efficient Unix timestamp and utilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "timestamp-subprocess-lines" = callPackage ({ mkDerivation, base, bytestring, process, split, time , transformers @@ -197850,8 +207448,8 @@ self: { }: mkDerivation { pname = "timezone-olson"; - version = "0.1.8"; - sha256 = "0irpvmqpiw4j2wq4rn3jrndgn2jg10yvrnxvsrb1l6g5b80h2sxr"; + version = "0.1.9"; + sha256 = "05abywx1nrcaz0nqzfy4zw62bc5qd7pdfnjvv4drxkwv084ha8rj"; libraryHaskellDepends = [ base binary bytestring extensible-exceptions time timezone-series ]; @@ -197866,8 +207464,8 @@ self: { }: mkDerivation { pname = "timezone-olson-th"; - version = "0.1.0.3"; - sha256 = "0jagq78mp09x8zhy3ygdd0pw2ms12c72qi9r7gqaird09rggs44w"; + version = "0.1.0.4"; + sha256 = "0xrf3hn8246s6n31bhq5arvn3xkwhfibmlfs5ahn5li2iblkn585"; libraryHaskellDepends = [ base template-haskell time timezone-olson timezone-series ]; @@ -197880,8 +207478,8 @@ self: { ({ mkDerivation, base, deepseq, time }: mkDerivation { pname = "timezone-series"; - version = "0.1.8"; - sha256 = "1xndlg0n46qjdh5yjzkkg285x3k76073aaizx1ibdzbq9q7dj6c1"; + version = "0.1.9"; + sha256 = "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5"; libraryHaskellDepends = [ base deepseq time ]; homepage = "http://projects.haskell.org/time-ng/"; description = "Enhanced timezone handling for Data.Time"; @@ -197977,8 +207575,8 @@ self: { ({ mkDerivation, base, c2hs, text }: mkDerivation { pname = "tinyfiledialogs"; - version = "0.2.0.0"; - sha256 = "16vzn532204vs39lfsf7q20zkhncqgk1vzqls9x2cy8kzdzrqlm4"; + version = "0.2.1.0"; + sha256 = "1nbsbzh33q4py5164lsif08ll98ysiz5d2ysvz4lcrf4jh9vgggg"; libraryHaskellDepends = [ base text ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/mtolly/tinyfiledialogs"; @@ -197992,8 +207590,8 @@ self: { }: mkDerivation { pname = "tinylog"; - version = "0.14.0"; - sha256 = "1skk59sxz2n96nv8vbc9yxla8m2jkj3ll8z5m0v78w0ih0bmcbrj"; + version = "0.14.1"; + sha256 = "01yz41l45qmc878gzhbchzkvr4ha2cfmvvjv31hwivgwgl8rcgni"; libraryHaskellDepends = [ base bytestring containers double-conversion fast-logger text transformers unix-time @@ -198138,12 +207736,12 @@ self: { }) {}; "tkyprof" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , cmdargs, conduit, conduit-extra, containers, data-default - , directory, exceptions, filepath, http-types, mtl, resourcet - , rosezipper, shakespeare, stm, template-haskell, text, time - , transformers, unordered-containers, vector, wai, wai-extra, warp - , web-routes, yesod, yesod-core, yesod-form, yesod-static + ({ mkDerivation, aeson, attoparsec, base, bytestring, cmdargs + , conduit, conduit-extra, containers, data-default, directory + , exceptions, filepath, http-types, mtl, resourcet, rosezipper + , shakespeare, stm, template-haskell, text, time, transformers + , unordered-containers, vector, wai, wai-extra, warp, web-routes + , yesod, yesod-core, yesod-form, yesod-static }: mkDerivation { pname = "tkyprof"; @@ -198153,12 +207751,11 @@ self: { isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - aeson attoparsec base blaze-builder bytestring cmdargs conduit - conduit-extra containers data-default directory exceptions filepath - http-types mtl resourcet rosezipper shakespeare stm - template-haskell text time transformers unordered-containers vector - wai wai-extra warp web-routes yesod yesod-core yesod-form - yesod-static + aeson attoparsec base bytestring cmdargs conduit conduit-extra + containers data-default directory exceptions filepath http-types + mtl resourcet rosezipper shakespeare stm template-haskell text time + transformers unordered-containers vector wai wai-extra warp + web-routes yesod yesod-core yesod-form yesod-static ]; homepage = "https://github.com/maoe/tkyprof"; description = "A web-based visualizer for GHC Profiling Reports"; @@ -198180,12 +207777,12 @@ self: { "tldr" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory - , filepath, optparse-applicative, semigroups, shell-conduit, text + , filepath, optparse-applicative, semigroups, text, typed-process }: mkDerivation { pname = "tldr"; - version = "0.2.2"; - sha256 = "0ybg8d3zf4762525w0xmxrszb15vpiry8f0m9355pbxxvppq7dbl"; + version = "0.3.0"; + sha256 = "1wnc1l1c9d56y64d5hlkj2z1m4vl87shfya7ix49h22l77df0jq7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198193,13 +207790,12 @@ self: { ]; executableHaskellDepends = [ base directory filepath optparse-applicative semigroups - shell-conduit + typed-process ]; 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 @@ -198210,36 +207806,8 @@ self: { }: mkDerivation { pname = "tls"; - 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 - x509-validation - ]; - testHaskellDepends = [ - base bytestring cereal cryptonite data-default-class hourglass mtl - QuickCheck tasty tasty-quickcheck x509 x509-validation - ]; - benchmarkHaskellDepends = [ - base bytestring criterion cryptonite data-default-class hourglass - mtl QuickCheck tasty-quickcheck x509 x509-validation - ]; - homepage = "http://github.com/vincenthz/hs-tls"; - description = "TLS/SSL protocol native implementation (Server and Client)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tls_1_4_0" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring - , cereal, criterion, cryptonite, data-default-class, hourglass - , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck - , transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "tls"; - version = "1.4.0"; - sha256 = "1fhpyimmvhwfv6k4k00rlnc5lmk9bw3sckmfsdkv20q4cjb0hac3"; + version = "1.4.1"; + sha256 = "1y083724mym28n6xfaz7pcc7zqxdhjpaxpbvzxfbs25qq2px3smv"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal cryptonite data-default-class memory mtl network transformers x509 x509-store @@ -198257,30 +207825,9 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls-debug" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, pem, time, tls, x509, x509-store, x509-system - , x509-validation - }: - mkDerivation { - pname = "tls-debug"; - version = "0.4.4"; - sha256 = "07amgj4hyxxrdadk1dpncqznygc49n87m8acpbjivwiqvqbf9rz5"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring cryptonite data-default-class network pem time tls - x509 x509-store x509-system x509-validation - ]; - homepage = "http://github.com/vincenthz/hs-tls"; - description = "Set of programs for TLS testing and debugging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tls-debug_0_4_5" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system , x509-validation @@ -198298,7 +207845,6 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "Set of programs for TLS testing and debugging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls-extra" = callPackage @@ -198326,10 +207872,8 @@ self: { ({ mkDerivation, auto-update, base, clock, psqueues, tls }: mkDerivation { pname = "tls-session-manager"; - version = "0.0.0.1"; - sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8"; - revision = "1"; - editedCabalFile = "0hnhxfqmvkkhf37rr2ir52xyd59070jjm6s6al0alsanid2m4p01"; + version = "0.0.0.2"; + sha256 = "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5"; libraryHaskellDepends = [ auto-update base clock psqueues tls ]; description = "In-memory TLS session manager"; license = stdenv.lib.licenses.bsd3; @@ -198358,16 +207902,15 @@ self: { }: mkDerivation { pname = "tmapmvar"; - version = "0.0.3"; - sha256 = "1w5afnh7v04cjwb6qmgmmzgqhqj58rrxl6m31myk2rgd8i9j1fvf"; + version = "0.0.4"; + sha256 = "1qxl48wcbqvg6fymb8kpr4wz25ixkfvnvli2c7ncjxzdigyqrrd6"; libraryHaskellDepends = [ base containers hashable stm unordered-containers ]; testHaskellDepends = [ - async base containers QuickCheck quickcheck-instances stm tasty - tasty-quickcheck + async base containers hashable QuickCheck quickcheck-instances stm + tasty tasty-quickcheck unordered-containers ]; - homepage = "https://github.com/athanclark/tmapmvar#readme"; description = "A single-entity stateful Map in STM, similar to tmapchan"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -198391,7 +207934,6 @@ self: { homepage = "https://github.com/jfischoff/tmp-postgres#readme"; description = "Start and stop a temporary postgres for testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tmpl" = callPackage @@ -198514,6 +208056,7 @@ self: { libraryHaskellDepends = [ base ]; description = "A todo bottom"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "todos" = callPackage @@ -198587,8 +208130,8 @@ self: { pname = "token-bucket"; version = "0.1.0.1"; sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii"; - revision = "2"; - editedCabalFile = "03kkavw01mlgaxgc0ifvldn8pkq2dfncrwqrf0r33ldggfzm6qm3"; + revision = "3"; + editedCabalFile = "1gqlxy3rwrgag4qbjkh1f2kya4gcy1x5ic9xn997nzc6yi334v7m"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; homepage = "https://github.com/hvr/token-bucket"; @@ -198626,9 +208169,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tokenizer-monad" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "tokenizer-monad"; + version = "0.1.0.0"; + sha256 = "1n31n3wql93ljjgzfxpl5qd7kdb3dmr00yw0sz0wkkfgh2id1m99"; + libraryHaskellDepends = [ base text ]; + description = "An efficient and easy-to-use tokenizer monad"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "toktok" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, filepath - , gf, haskell98, HUnit, iconv, progression, QuickCheck + ({ mkDerivation, base, bytestring, containers, gf, haskell98, iconv }: mkDerivation { pname = "toktok"; @@ -198637,10 +208191,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers haskell98 ]; - executableHaskellDepends = [ - base bytestring criterion filepath gf HUnit iconv progression - QuickCheck - ]; + executableHaskellDepends = [ base bytestring gf iconv ]; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -198671,7 +208222,7 @@ self: { homepage = "http://www.polarmobile.com/"; description = "FFI bindings to libtokyotyrant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; "tomato-rubato-openal" = callPackage @@ -198723,33 +208274,32 @@ self: { }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.19"; - sha256 = "1ql24s1wy4c34rmxh8x8lggnkpx686l8x5zsp3asdsxlx0k8n8zp"; - isLibrary = true; + version = "0.1.0.23"; + sha256 = "0m58rrjrrd2n1w313806s9gyj840nzsm7vwdz40639mr3a6vaifg"; + isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ + executableHaskellDepends = [ base htoml-megaparsec megaparsec optparse-generic text ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/vmchale/tomlcheck#readme"; description = "Command-line tool to check syntax of TOML files"; license = stdenv.lib.licenses.bsd3; }) {}; "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq - , directory, filepath, HUnit, QuickCheck, random + , directory, extra, filepath, HUnit, QuickCheck, random }: mkDerivation { pname = "toolshed"; - version = "0.17.0.2"; - sha256 = "10cyg48dlv34xndx7aqhldxlglnkijmc88abxkg3jwk7q06ckm93"; + version = "0.18.0.0"; + sha256 = "0x8sn6gvmns81xjkzs1r5jfaar3qjhcyl6q9dbniyglk5y7w35gm"; libraryHaskellDepends = [ array base containers data-default deepseq directory filepath QuickCheck random ]; - testHaskellDepends = [ base containers HUnit QuickCheck random ]; + testHaskellDepends = [ + base containers extra HUnit QuickCheck random + ]; homepage = "http://functionalley.eu"; description = "Ill-defined library"; license = "GPL"; @@ -198763,8 +208313,8 @@ self: { }: mkDerivation { pname = "top"; - version = "0.2.2"; - sha256 = "1j97n3a66983pxnajk11c4jm4ccckvmf4xjvfxbmqj23ixl6isfp"; + version = "0.2.4"; + sha256 = "0kqyhcd407jyxpb487bx5jqnzaycycp5i8yxasgl37g45cdgb4gr"; libraryHaskellDepends = [ acid-state async base bytestring containers data-default-class deepseq extra filepath flat hslogger mtl pipes pretty safecopy @@ -198776,6 +208326,7 @@ self: { homepage = "http://github.com/tittoassini/top"; description = "Top (typed oriented protocol) API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "topkata" = callPackage @@ -198955,19 +208506,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {toxcore = null;}; + "toxiproxy-haskell" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, http-client + , process, servant, servant-client, silently, text, time + }: + mkDerivation { + pname = "toxiproxy-haskell"; + version = "0.2.1.0"; + sha256 = "0c0xrl2ynk3b31ja4bh2pfmf8zhb4fxlazj7l07477f1yws7vqla"; + libraryHaskellDepends = [ + aeson base containers http-client servant servant-client text + ]; + testHaskellDepends = [ + base containers hspec http-client process servant servant-client + silently time + ]; + homepage = "https://github.com/jpittis/toxiproxy-haskell#readme"; + description = "Client library for Toxiproxy: a TCP failure testing proxy"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "toysolver" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring - , bytestring-builder, clock, containers, criterion, data-default - , data-default-class, data-interval, deepseq, directory - , extended-reals, filepath, finite-field, ghc-prim, hashable - , hashtables, haskeline, heaps, intern, lattices, log-domain, loop - , megaparsec, mtl, multiset, mwc-random, OptDir, parsec - , prettyclass, primes, primitive, process, pseudo-boolean, queue - , QuickCheck, scientific, semigroups, sign, split, stm, tasty - , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell - , temporary, text, time, transformers, transformers-compat - , unbounded-delays, unordered-containers, vector, vector-space - , xml-conduit + ({ mkDerivation, array, base, bytestring, bytestring-builder, clock + , containers, criterion, data-default, data-default-class + , data-interval, deepseq, directory, extended-reals, filepath + , finite-field, ghc-prim, hashable, hashtables, haskeline, heaps + , intern, lattices, log-domain, loop, megaparsec, mtl, multiset + , mwc-random, OptDir, parsec, prettyclass, primes, primitive + , process, pseudo-boolean, queue, QuickCheck, scientific + , semigroups, sign, stm, tasty, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, temporary, text, time, transformers + , transformers-compat, unbounded-delays, unordered-containers + , vector, vector-space, xml-conduit }: mkDerivation { pname = "toysolver"; @@ -198986,11 +208557,11 @@ self: { vector-space xml-conduit ]; executableHaskellDepends = [ - array attoparsec base bytestring bytestring-builder clock - containers data-default data-default-class directory filepath - haskeline intern megaparsec mtl mwc-random OptDir parsec process - pseudo-boolean scientific split temporary text time transformers - transformers-compat unbounded-delays unordered-containers vector + array base bytestring bytestring-builder clock containers + data-default data-default-class directory filepath haskeline intern + megaparsec mtl mwc-random OptDir parsec process pseudo-boolean + scientific temporary text time transformers transformers-compat + unbounded-delays vector ]; testHaskellDepends = [ array base bytestring bytestring-builder containers @@ -199070,6 +208641,7 @@ self: { ]; description = "Applications for interacting with the Pushbullet API"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tpdb" = callPackage @@ -199162,10 +208734,8 @@ self: { }: mkDerivation { pname = "tracetree"; - version = "0.1.0.1"; - sha256 = "05aigx15kyvy19gdzh9si2avl5a7g8c4yzrcp7sgy1d94dwypl0j"; - revision = "1"; - editedCabalFile = "0yppsjjvq2zpk9k3fpi7q9msww4biz6hn02waschca65s2gbc84y"; + version = "0.1.0.2"; + sha256 = "0ga78nkrfg2hlanqfd65il0yw596n7xy9jx76l7sffs438mx4wvr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199173,6 +208743,7 @@ self: { ]; description = "Visualize Haskell data structures as edge-labeled trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tracker" = callPackage @@ -199187,6 +208758,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "trackit" = callPackage + ({ mkDerivation, base, brick, fsnotify, mtl, optparse-generic + , process, process-extras, stm, text, time, vty + }: + mkDerivation { + pname = "trackit"; + version = "0.3"; + sha256 = "0n4ypg2g82ajnmvv94sgympvbwji0bkw5kmd4zfzrvzrdxq91yvh"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick fsnotify mtl optparse-generic process process-extras stm + text time vty + ]; + description = "A command-line tool for live monitoring"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tracy" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -199196,6 +208785,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Convenience wrappers for non-intrusive debug tracing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "traildb" = callPackage @@ -199205,8 +208795,8 @@ self: { }: mkDerivation { pname = "traildb"; - version = "0.1.2.0"; - sha256 = "0a6pjkslq4vi84l04g8s640hwg2yki3015z1glcslyyj4x4wb47m"; + version = "0.1.4.0"; + sha256 = "1qp3m8vfjy9kim9jikhxplyp6c21scj18n9qnb0pfd0hpjyigd9b"; libraryHaskellDepends = [ base bytestring containers directory exceptions primitive profunctors text time transformers unix vector @@ -199244,6 +208834,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "transaction" = callPackage + ({ mkDerivation, base, doctest, Glob, hspec, mono-traversable + , QuickCheck + }: + mkDerivation { + pname = "transaction"; + version = "0.1.1.3"; + sha256 = "1if04fm2kvkd25ksk1llqqkwaqy8y7pafbywmz70mrr68wrb2r6j"; + libraryHaskellDepends = [ base mono-traversable ]; + testHaskellDepends = [ + base doctest Glob hspec mono-traversable QuickCheck + ]; + homepage = "https://github.com/arowM/haskell-transaction#readme"; + description = "Monadic representation of transactions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transactional-events" = callPackage ({ mkDerivation, base, ListZipper, MonadPrompt, stm }: mkDerivation { @@ -199277,6 +208885,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "transfer-db" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, clock + , console-program, containers, cpu, hspec, logging, monad-control + , QuickCheck, sqlcli, sqlcli-odbc, stm, store, store-core + , temporary, text, th-utilities, time, transformers, yaml + }: + mkDerivation { + pname = "transfer-db"; + version = "0.3.1.2"; + sha256 = "1vpcf4k78cnpb5n1bwn2v9l7g38nlgr2y9j8kvmi7ncfvh1nvbqw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring clock containers logging monad-control sqlcli + sqlcli-odbc stm store store-core temporary text th-utilities time + transformers + ]; + executableHaskellDepends = [ + aeson base bytestring cassava clock console-program containers + logging monad-control sqlcli sqlcli-odbc stm time transformers yaml + ]; + testHaskellDepends = [ + base bytestring cpu hspec QuickCheck sqlcli store time transformers + ]; + homepage = "http://hub.darcs.net/mihaigiurgeanu/transfer-db"; + description = "ODBC database transfer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformations" = callPackage ({ mkDerivation, base, containers, criterion, mtl, multirec, parsec , QuickCheck, regular, template-haskell @@ -199357,6 +208995,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-base_0_4_5_2" = callPackage + ({ mkDerivation, base, base-orphans, stm, transformers + , transformers-compat + }: + mkDerivation { + pname = "transformers-base"; + version = "0.4.5.2"; + sha256 = "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h"; + libraryHaskellDepends = [ + base base-orphans stm transformers transformers-compat + ]; + homepage = "https://github.com/mvv/transformers-base"; + description = "Lift computations from the bottom of a transformer stack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformers-bifunctors" = callPackage ({ mkDerivation, base, mmorph, transformers }: mkDerivation { @@ -199381,6 +209036,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-compat_0_6_1_6" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "transformers-compat"; + version = "0.6.1.6"; + sha256 = "0db1l90pp4f1b829b3gv6xxklc8cnhkqq383rzd7r9b4hyjdvpmx"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + homepage = "http://github.com/ekmett/transformers-compat/"; + description = "A small compatibility shim for the transformers library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformers-compose" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -199432,8 +209100,8 @@ self: { }: mkDerivation { pname = "transformers-eff"; - version = "0.2.0.0"; - sha256 = "1na8gvbhbsdfkxvhy57f3qi91rksjin10lr8nsar4nimrd7nmghn"; + version = "0.2.1.0"; + sha256 = "0miam7n85ch39v7pym8m53nxyymwwnc5v52lip4x4h0vffpnq8lx"; libraryHaskellDepends = [ base free list-transformer mmorph transformers ]; @@ -199443,9 +209111,48 @@ self: { homepage = "https://github.com/ocharles/transformers-eff"; description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {effect-interpreters = null;}; + "transformers-either" = callPackage + ({ mkDerivation, base, text, transformers }: + mkDerivation { + pname = "transformers-either"; + version = "0.0.2"; + sha256 = "1122rgspazl3n9vghlzzg14hv6p0a66lf6r7hkim14p0rcagvx5a"; + libraryHaskellDepends = [ base text transformers ]; + description = "An Either monad transformer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "transformers-either_0_1_0" = callPackage + ({ mkDerivation, base, exceptions, text, transformers }: + mkDerivation { + pname = "transformers-either"; + version = "0.1.0"; + sha256 = "18a99isv93yf65b6j4863j23ss9j1mp1f815sblhgs2xaywswhvm"; + libraryHaskellDepends = [ base exceptions text transformers ]; + homepage = "http://github.com/tmcgilchrist/transformers-either/"; + description = "An Either monad transformer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "transformers-fix" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "transformers-fix"; + version = "1.0"; + sha256 = "02aapq88k81q9r6wmvmg9zjyrmz9qzi4gss75p18lkc4dgrzzlb5"; + revision = "1"; + editedCabalFile = "126gyjr8jp42md6nblx7c0kan97jgsakvsf2vzv2pj828ax1icrs"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/thumphries/transformers-fix"; + description = "Monad transformer for evaluating to a fixpoint"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-free" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -199465,6 +209172,8 @@ self: { pname = "transformers-lift"; version = "0.2.0.1"; sha256 = "17g03r5hpnygx0c9ybr9za6208ay0cjvz47rkyplv1r9zcivzn0b"; + revision = "1"; + editedCabalFile = "1dy9vg0drkm9ria80hlfx6v72ji2fwmv3ik7lryv7i7hk0bdzk8l"; libraryHaskellDepends = [ base transformers writer-cps-transformers ]; @@ -199517,6 +209226,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient_0_6_0_1" = callPackage + ({ mkDerivation, atomic-primops, base, bytestring, containers + , directory, mtl, random, stm, time, transformers + }: + mkDerivation { + pname = "transient"; + version = "0.6.0.1"; + sha256 = "1k3zh4ahzzmj5ni0jyahzhfhbnvksa1ybq93541faa4g98h44ggy"; + libraryHaskellDepends = [ + atomic-primops base bytestring containers directory mtl random stm + time transformers + ]; + testHaskellDepends = [ + atomic-primops base bytestring containers directory mtl random stm + time transformers + ]; + homepage = "https://github.com/transient-haskell/transient"; + description = "composing programs with multithreading, events and distributed computing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transient-universe" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network @@ -199548,21 +209279,53 @@ self: { homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Remote execution and map-reduce: distributed computing for Transient"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + }) {}; + + "transient-universe_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , directory, filepath, hashable, HTTP, iproute, mtl, network + , network-info, network-uri, process, random, stm, TCache, text + , time, transformers, transient, vector, websockets + }: + mkDerivation { + pname = "transient-universe"; + version = "0.5.0.0"; + sha256 = "1d3bp4xjpi28ph7fa9wm49ssg53jfvlq77ka0zvrkilw1j6f8v3l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP iproute mtl network network-info network-uri process + random stm TCache text time transformers transient vector + websockets + ]; + 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 + stm TCache text time transformers transient vector websockets + ]; + homepage = "https://github.com/transient-haskell/transient-universe"; + description = "Remote execution and map-reduce: distributed computing for Transient"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transient-universe-tls" = callPackage - ({ mkDerivation, base, bytestring, certificate, cprng-aes - , data-default, network, tls, transient, transient-universe - , x509-store + ({ mkDerivation, base, bytestring, cprng-aes, data-default, network + , tls, transient, transient-universe, x509-store, x509-system }: mkDerivation { pname = "transient-universe-tls"; - version = "0.1.0.0"; - sha256 = "0rw4plnc98ydb5za85hgdvprfxh1cry7ifyfzm93cyny09b38jwz"; + version = "0.1.1.0"; + sha256 = "0fawvdgm7a1s65jc3d3lfl38pak6xx39ian0cbx5sj3aqa7m99hs"; libraryHaskellDepends = [ - base bytestring certificate cprng-aes data-default network tls - transient transient-universe x509-store + base bytestring cprng-aes data-default network tls transient + transient-universe x509-store x509-system ]; homepage = "http://github.com/transient-haskell/transient-universe-tls"; description = "transient with secure communications"; @@ -199614,6 +209377,7 @@ self: { homepage = "https://github.com/andys8/translate-cli#readme"; description = "Translation cli tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trasa" = callPackage @@ -199636,6 +209400,7 @@ self: { homepage = "https://github.com/haskell-trasa/trasa#readme"; description = "Type Safe Web Routing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trasa-client" = callPackage @@ -199695,6 +209460,7 @@ self: { homepage = "https://github.com/haskell-trasa/trasa#readme"; description = "Type safe web server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "traverse-with-class" = callPackage @@ -199725,6 +209491,7 @@ self: { homepage = "http://github.com/tomtau/travis#readme"; description = "A simple client implementation using Travis CI API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "travis-meta-yaml" = callPackage @@ -199818,8 +209585,10 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.0.0.1"; - sha256 = "0km6himykj2q9ymaivv67dvlk7ia9dli2zhyx6g8yh8963mcn91v"; + version = "0.0.1"; + sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz"; + revision = "3"; + editedCabalFile = "04ajimrbywfnnnlx9axz3hmbi33c4g62hrmv52plgifjiw6c4y2y"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -199859,6 +209628,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tree-traversals" = callPackage + ({ mkDerivation, base, containers, doctest, mtl }: + mkDerivation { + pname = "tree-traversals"; + version = "0.1.0.0"; + sha256 = "0wdy1p94096qdc00w8pmbz6qcawc0ivlhy0sg0b3jir0s2ksdccb"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest mtl ]; + homepage = "https://github.com/rampion/tree-traversals"; + description = "Functions and newtype wrappers for traversing Trees"; + license = stdenv.lib.licenses.cc0; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tree-view" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -199889,19 +209672,20 @@ self: { }) {}; "treemap" = callPackage - ({ mkDerivation, base, containers, deepseq, semigroups, strict - , tasty, tasty-hunit, text, transformers + ({ mkDerivation, base, containers, deepseq, mono-traversable + , semigroups, strict, tasty, tasty-hunit, text, transformers }: mkDerivation { pname = "treemap"; - version = "2.0.0.20161218"; - sha256 = "18xhsih3q9vmakzjk3mhb9ckp9m7vs16dikf9ry4yhfsyv2v57vh"; + version = "2.4.0.20180213"; + sha256 = "1yf0ihawdp51n6j1j5b4s7f1xxsyg0spaamhwpd8pmm0fncr8c2s"; libraryHaskellDepends = [ - base containers deepseq semigroups strict transformers + base containers deepseq mono-traversable semigroups strict + transformers ]; testHaskellDepends = [ - base containers semigroups strict tasty tasty-hunit text - transformers + base containers mono-traversable semigroups strict tasty + tasty-hunit text transformers ]; description = "A tree of Data.Map."; license = stdenv.lib.licenses.gpl3; @@ -199958,6 +209742,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "treeseq" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "treeseq"; + version = "1.0.0.20180213"; + sha256 = "105gj9s8gp4xc4i7ank8m6pjc80kywl7vn53qdxfrndaljv4kark"; + libraryHaskellDepends = [ base containers ]; + description = "Library for a multi-way tree (rose tree), using Seq (finger tree) for forests"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "treeviz" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, random }: mkDerivation { @@ -199967,10 +209762,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl QuickCheck random ]; - executableHaskellDepends = [ - base containers mtl QuickCheck random - ]; - testHaskellDepends = [ base containers mtl QuickCheck random ]; homepage = "http://www.haskell.org/haskellwiki/Treeviz"; description = "Visualization of computation decomposition trees"; license = stdenv.lib.licenses.bsd3; @@ -200022,26 +209813,30 @@ self: { "tries" = callPackage ({ mkDerivation, base, bytestring, bytestring-trie, composition - , composition-extra, containers, criterion, deepseq, hashable, keys - , mtl, QuickCheck, quickcheck-instances, rose-trees, semigroups - , sets, tasty, tasty-quickcheck, unordered-containers + , containers, criterion, deepseq, hashable, keys, mtl, QuickCheck + , quickcheck-instances, rose-trees, semigroups, sets, tasty + , tasty-quickcheck, unordered-containers }: mkDerivation { pname = "tries"; - version = "0.0.4.2"; - sha256 = "152rs6g3p6nc4xw3fnh0psmlqmchq038y0p18nandgggsnl2ck0n"; + version = "0.0.5"; + sha256 = "1xljwkdwfwd962f7bdbds89m93hw24b54624d4fqlq4n0dyq50x0"; libraryHaskellDepends = [ - base bytestring bytestring-trie composition composition-extra - containers deepseq hashable keys QuickCheck quickcheck-instances - rose-trees semigroups sets unordered-containers + base bytestring bytestring-trie composition containers deepseq + hashable keys QuickCheck quickcheck-instances rose-trees semigroups + sets unordered-containers ]; testHaskellDepends = [ - base containers mtl QuickCheck quickcheck-instances tasty - tasty-quickcheck + base bytestring bytestring-trie composition containers deepseq + hashable keys mtl QuickCheck quickcheck-instances rose-trees + semigroups sets tasty tasty-quickcheck unordered-containers ]; benchmarkHaskellDepends = [ - base containers criterion mtl rose-trees unordered-containers + base bytestring bytestring-trie composition containers criterion + deepseq hashable keys mtl QuickCheck quickcheck-instances + rose-trees semigroups sets unordered-containers ]; + homepage = "https://github.com/athanclark/tries#readme"; description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -200049,56 +209844,50 @@ self: { "trifecta" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base - , blaze-builder, blaze-html, blaze-markup, bytestring, charset - , comonad, containers, deepseq, directory, doctest, filepath + , 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.6.2.1"; - sha256 = "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs"; - revision = "1"; - editedCabalFile = "0qy2nqxn2h20fp9gf5chvgimb2281pjwm075ap7ar7pk2k4n8ljr"; + version = "1.7.1.1"; + sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31"; + revision = "4"; + editedCabalFile = "12dv7mipmqc7ykazjqql6slbgdgi5f6hglw2cbdi6brvkwxk7w9z"; + 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 directory doctest filepath parsers QuickCheck - ]; + 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; }) {}; - "trifecta_1_7_1_1" = 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 + "trigger" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, clock, directory + , exceptions, filepath, formatting, fsnotify, Glob, hspec, process + , protolude, text, time, twitch, yaml }: mkDerivation { - pname = "trifecta"; - version = "1.7.1.1"; - sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31"; - revision = "1"; - editedCabalFile = "17i9137mqcm74s8zwdnkcg5kj583zzwqjyyz1z0af4anxfs1hvng"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + pname = "trigger"; + version = "1.0.2.0"; + sha256 = "1nhhn3ackzhbikpn5q62kzqrk1g0lnzkddkw2p1c3iis3my148ik"; + isLibrary = true; + isExecutable = true; 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 + aeson ansi-terminal base clock directory exceptions filepath + formatting fsnotify Glob process protolude text time twitch yaml ]; - testHaskellDepends = [ base doctest parsers QuickCheck ]; - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; + executableHaskellDepends = [ base protolude ]; + testHaskellDepends = [ base hspec protolude ]; + homepage = "https://github.com/rhyskeepence/trigger"; + description = "Trigger is a cross platform file system watcher for super fast build-and-restart workflows"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -200165,6 +209954,7 @@ self: { homepage = "https://github.com/fumieval/trivia"; description = "The trivial monad and comonad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trivial-constraint" = callPackage @@ -200282,6 +210072,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tsetchan" = callPackage + ({ mkDerivation, async, base, containers, stm }: + mkDerivation { + pname = "tsetchan"; + version = "0.0.0"; + sha256 = "1jb1d18hq4vyinx5z2qrj3kw969snp4rmwv3gmqpjfynxwgn0jhx"; + libraryHaskellDepends = [ base containers stm ]; + testHaskellDepends = [ async base stm ]; + homepage = "https://github.com/githubuser/tsetchan#readme"; + description = "Hides duplicating channels when broadcasting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tskiplist" = callPackage ({ mkDerivation, array, base, containers, random, stm }: mkDerivation { @@ -200368,8 +210171,8 @@ self: { }) {}; "tsparse" = callPackage - ({ mkDerivation, base, Decimal, parsec, pretty, process, random - , split, time + ({ mkDerivation, base, Decimal, parsec, pretty, process, split + , time }: mkDerivation { pname = "tsparse"; @@ -200380,9 +210183,6 @@ self: { libraryHaskellDepends = [ base Decimal parsec pretty process split time ]; - executableHaskellDepends = [ - base Decimal parsec pretty process random split time - ]; homepage = "http://www.github.com/massysett/tsparse"; description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements"; license = stdenv.lib.licenses.bsd3; @@ -200420,6 +210220,7 @@ self: { homepage = "https://github.com/Fuuzetsu/tsuntsun"; description = "Interacts with tesseract to ease reading of RAW Japanese manga"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tsv2csv" = callPackage @@ -200477,6 +210278,7 @@ self: { homepage = "https://github.com/tokiwoousaka/ttask#readme"; description = "This is task management tool for yourself, that inspired by scrum"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ttrie" = callPackage @@ -200508,23 +210310,23 @@ self: { }) {}; "tttool" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , directory, executable-path, filepath, hashable, haskeline, HPDF - , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec - , process, random, split, spool, template-haskell, time, vector - , yaml, zlib + ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-svg + , bytestring, containers, directory, executable-path, filepath + , hashable, haskeline, HPDF, JuicyPixels, mtl, natural-sort + , optparse-applicative, parsec, process, random, split, spool + , template-haskell, text, time, vector, yaml, zlib }: mkDerivation { pname = "tttool"; - version = "1.7.0.3"; - sha256 = "0r8ha8wgzlf2ymyxylj16hfshf8w5dl13cwmdkl6ih2niwkzk9ch"; + version = "1.8"; + sha256 = "0j4lgkjg28i7wlz5rnlrii6mzx2bqsagrg3wiiw1z2ncik6qm472"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base binary bytestring containers directory executable-path - filepath hashable haskeline HPDF JuicyPixels mtl natural-sort - optparse-applicative parsec process random split spool - template-haskell time vector yaml zlib + aeson base base64-bytestring binary blaze-svg bytestring containers + directory executable-path filepath hashable haskeline HPDF + JuicyPixels mtl natural-sort optparse-applicative parsec process + random split spool template-haskell text time vector yaml zlib ]; homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; @@ -200572,7 +210374,6 @@ self: { homepage = "https://github.com/riaqn/tuntap-simple#readme"; description = "A simple tun/tap library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tup-functor" = callPackage @@ -200666,6 +210467,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tuple-ops" = callPackage + ({ mkDerivation, base, type-combinators }: + mkDerivation { + pname = "tuple-ops"; + version = "0.0.0.2"; + sha256 = "05hmw9s4bync4j9sr8cs9nknkgpzwqd55aiw5s3iax4qnbxsccyp"; + libraryHaskellDepends = [ base type-combinators ]; + homepage = "https://github.com/pierric/tuple-ops"; + description = "various operations on n-ary tuples via GHC.Generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "tuple-sop" = callPackage + ({ mkDerivation, base, generics-sop }: + mkDerivation { + pname = "tuple-sop"; + version = "0.1.0.0"; + sha256 = "08g0jzqngw1bkrn212rj6d5h7ppfar7q1p8b79049ivrich6zspj"; + libraryHaskellDepends = [ base generics-sop ]; + testHaskellDepends = [ base generics-sop ]; + homepage = "https://github.com/Ferdinand-vW/tuple-sop#readme"; + description = "functions on n-ary tuples using generics-sop"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tuple-th" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -200739,20 +210565,23 @@ self: { executableHaskellDepends = [ ALUT base ]; description = "Plays music generated by Turing machines with 5 states and 2 symbols"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "turingMachine" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, hspec, hspecVariant, mtl + , QuickCheck, QuickCheckVariant + }: mkDerivation { pname = "turingMachine"; - version = "0.1.3.0"; - sha256 = "1z7sgvnfdj70lqd330pmv3ms8mxxd0xh8pp41hxggg95kxqmbci6"; - libraryHaskellDepends = [ base containers ]; + version = "1.0.0.0"; + sha256 = "04lpvqandjqwwy494a5mb4nvig8lw3fn9ncrb8d2gkfklxga17gp"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ + base containers hspec hspecVariant QuickCheck QuickCheckVariant + ]; homepage = "https://github.com/sanjorgek/turingMachine"; description = "An implementation of Turing Machine and Automaton"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turkish-deasciifier" = callPackage @@ -200771,6 +210600,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "turn-loop" = callPackage + ({ mkDerivation, base, containers, stm }: + mkDerivation { + pname = "turn-loop"; + version = "0.1.0"; + sha256 = "180yplkjf0c4n17a5ad2pakjwnh7830rldzmaqjj7gwcl3pg0lc6"; + libraryHaskellDepends = [ base containers stm ]; + homepage = "https://github.com/jxv/turn-loop#readme"; + description = "Manage multiple turned-based sessions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "turni" = callPackage ({ mkDerivation, base, containers, MonadRandom, random }: mkDerivation { @@ -200787,49 +210628,25 @@ self: { "turtle" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , criterion, directory, doctest, foldl, hostname, managed - , optional-args, optparse-applicative, process, semigroups, stm - , system-fileio, system-filepath, temporary, text, time - , transformers, unix, unix-compat - }: - mkDerivation { - pname = "turtle"; - version = "1.3.6"; - sha256 = "0fr8p6rnk2lrsgbfh60jlqcjr0nxrh3ywxsj5d4psck0kgyhvg1m"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock directory foldl hostname - managed optional-args optparse-applicative process semigroups stm - system-fileio system-filepath temporary text time transformers unix - unix-compat - ]; - testHaskellDepends = [ base doctest system-filepath temporary ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_4_4" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , criterion, directory, doctest, foldl, hostname, managed - , optional-args, optparse-applicative, process, semigroups, stm - , system-fileio, system-filepath, temporary, text, time - , transformers, unix, unix-compat + , containers, criterion, directory, doctest, exceptions, foldl + , hostname, managed, optional-args, optparse-applicative, process + , semigroups, stm, system-fileio, system-filepath, temporary, text + , time, transformers, unix, unix-compat }: mkDerivation { pname = "turtle"; - version = "1.4.4"; - sha256 = "0ixq9fdmcg2adiy9zgg3qmk6dwdahyw95aaqnf98jxi2j1h2aijz"; + version = "1.5.7"; + sha256 = "1qh33akv57wv11qg5bk8wa0gbjjq89gxakcg40b93qc8d0dd86wk"; libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock directory foldl hostname - managed optional-args optparse-applicative process semigroups stm - system-fileio system-filepath temporary text time transformers unix - unix-compat + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process semigroups stm system-fileio + system-filepath temporary text time transformers unix unix-compat ]; testHaskellDepends = [ base doctest system-filepath temporary ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -200877,47 +210694,60 @@ self: { }) {}; "twee" = callPackage - ({ mkDerivation, base, containers, dlist, ghc-prim, jukebox, pretty - , primitive, split, transformers + ({ mkDerivation, base, containers, jukebox, pretty, split, twee-lib }: mkDerivation { pname = "twee"; - version = "2.0"; - sha256 = "18raccm4glf0gysj625wiwkk2b295863g0hgypc9335cxb65n8k0"; - isLibrary = true; + version = "2.1.4"; + sha256 = "0anln0il67j8xhz1m73r8b02560mc8yd1rzmc03p4f7vmgxqaphv"; + isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - base containers dlist ghc-prim pretty primitive transformers - ]; executableHaskellDepends = [ - base containers jukebox pretty split + base containers jukebox pretty split twee-lib + ]; + homepage = "http://github.com/nick8325/twee"; + description = "An equational theorem prover"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "twee-lib" = callPackage + ({ mkDerivation, base, containers, dlist, ghc-prim, pretty + , primitive, transformers, vector + }: + mkDerivation { + pname = "twee-lib"; + version = "2.1.4"; + sha256 = "0fapi6g8f6fp90hvff1g606wzi7jaacf1mnq1h801yzzi4sj3yms"; + libraryHaskellDepends = [ + base containers dlist ghc-prim pretty primitive transformers vector ]; homepage = "http://github.com/nick8325/twee"; description = "An equational theorem prover"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion , data-default, directory, extra, hspec, htoml-megaparsec - , http-client, http-client-tls, http-types, lens, megaparsec + , http-client, http-client-tls, http-types, megaparsec, microlens , optparse-applicative, split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.27"; - sha256 = "1jd902al2xajf2404bqg8y7k06mrncyyipp0gdfqd864bfqxivz6"; + version = "1.0.1.37"; + sha256 = "14csa7p3z4ywxwybs0y4ylymsqg1m8scp5fhcm3mayy9cdz2g49n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring - composition-prelude containers data-default directory extra - htoml-megaparsec http-client http-client-tls http-types lens - megaparsec optparse-applicative split text unordered-containers + composition-prelude containers data-default extra htoml-megaparsec + http-client http-client-tls http-types megaparsec microlens split + text unordered-containers + ]; + executableHaskellDepends = [ + base bytestring directory optparse-applicative ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; @@ -201091,6 +210921,7 @@ self: { homepage = "https://github.com/wiggly/twfy-api-client#readme"; description = "They Work For You API Client Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twhs" = callPackage @@ -201161,28 +210992,31 @@ self: { }) {}; "twilio" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal - , containers, errors, exceptions, free, http-client + ({ mkDerivation, aeson, base, binary, bytestring, Cabal, containers + , deepseq, errors, exceptions, free, hashable, hspec, http-client , http-client-tls, http-types, mtl, network-uri, old-locale - , scientific, text, time, transformers, unordered-containers + , QuickCheck, quickcheck-instances, scientific, template-haskell + , text, time, transformers, unordered-containers }: mkDerivation { pname = "twilio"; - version = "0.1.3.2"; - sha256 = "1vbb846cdav6csm2y9asrdzvmh9s3pf4apyharrr1hwd2xz3jcga"; + version = "0.2.0.0"; + sha256 = "0shjhdb3iabbs7hy89hv3fawzxilc7djgpacgydnzl2290dm17yl"; libraryHaskellDepends = [ - aeson base bifunctors bytestring containers errors exceptions free - http-client http-client-tls http-types mtl network-uri old-locale - scientific text time transformers unordered-containers + aeson base binary bytestring containers deepseq errors exceptions + free hashable http-client http-client-tls http-types mtl + network-uri old-locale scientific template-haskell text time + transformers unordered-containers ]; testHaskellDepends = [ - aeson base bytestring Cabal http-client http-client-tls network-uri - text transformers + aeson base bytestring Cabal hspec http-client http-client-tls + network-uri QuickCheck quickcheck-instances text transformers ]; doCheck = false; homepage = "https://github.com/markandrus/twilio-haskell"; description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twill" = callPackage @@ -201304,15 +211138,15 @@ self: { ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base , bytestring, Cabal, cabal-doctest, case-insensitive, conduit , conduit-extra, containers, data-default, doctest, exceptions - , hlint, hspec, http-client, http-conduit, http-types, lens - , lens-aeson, network-uri, resourcet, template-haskell, text, time - , transformers, transformers-base, twitter-types - , twitter-types-lens + , hlint, hspec, hspec-discover, http-client, http-conduit + , http-types, lens, lens-aeson, network-uri, resourcet + , template-haskell, text, time, transformers, transformers-base + , twitter-types, twitter-types-lens }: mkDerivation { pname = "twitter-conduit"; - version = "0.2.2.2"; - sha256 = "00bxqd77ccxa0cbbrgwhnivyi8jvmm5w0xx7fnx592yn7y9kgfip"; + version = "0.2.3"; + sha256 = "1xspyig287y2x9y0f6390jd8zmzc2nf2zcsnjd9y69a1qjchviv9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base bytestring conduit @@ -201328,9 +211162,11 @@ self: { lens-aeson network-uri resourcet template-haskell text time twitter-types twitter-types-lens ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-enumerator" = callPackage @@ -201373,6 +211209,7 @@ self: { homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types" = callPackage @@ -201397,6 +211234,7 @@ self: { homepage = "https://github.com/himura/twitter-types"; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types-lens" = callPackage @@ -201415,6 +211253,7 @@ self: { homepage = "https://github.com/himura/twitter-types"; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tx" = callPackage @@ -201626,8 +211465,8 @@ self: { ({ mkDerivation, base, singletons, type-combinators }: mkDerivation { pname = "type-combinators-singletons"; - version = "0.1.0.0"; - sha256 = "11sc0fjlppp35fy35bk4vxzx8c4ws7j3zww59cg1abrpfk7i82mh"; + version = "0.2.1.0"; + sha256 = "00cwlfcka2d1wcp7159r3sk3gz852dmc71jvjfr8bn1rrr781n0q"; libraryHaskellDepends = [ base singletons type-combinators ]; homepage = "https://github.com/mstksg/type-combinators-singletons"; description = "Interop between /type-combinators/ and /singletons/"; @@ -201659,6 +211498,7 @@ self: { homepage = "http://github.com/glaebhoerl/type-eq"; description = "Type equality evidence you can carry around"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-equality" = callPackage @@ -201743,6 +211583,7 @@ self: { homepage = "https://github.com/oisdk/type-indexed-queues"; description = "Queues with verified and unverified versions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-int" = callPackage @@ -201758,12 +211599,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "type-interpreter" = callPackage + ({ mkDerivation, base, containers, mtl, template-haskell }: + mkDerivation { + pname = "type-interpreter"; + version = "0.1.3"; + sha256 = "0gv1782vj48v9cybsyc8wqsgndg966gkpnzxaw7s9f2g1c18jj1s"; + libraryHaskellDepends = [ base containers mtl template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "Interpreter for Template Haskell types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "type-iso" = callPackage ({ mkDerivation, base, data-default, nats, numericpeano, text }: mkDerivation { pname = "type-iso"; - version = "0.1.0.0"; - sha256 = "03qs8frsj0a2jxpk1rrmhaivf68hg8dhjn4s3q85h4zrsxwfskjx"; + version = "1.0.0.0"; + sha256 = "11xcadzvvp9y7gm54k0nfsnx0hfr3g5bd8g8f8mlfqy24p0mq1m1"; libraryHaskellDepends = [ base data-default nats numericpeano text ]; @@ -201876,8 +211729,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "type-level-sets"; - version = "0.8.5.0"; - sha256 = "1ahfrwrlbdh61w6vh2v5j2ammkvcjxvw53d28pgqy296mpxikwvz"; + version = "0.8.7.0"; + sha256 = "1i5yzjdfw6q868ihhqmpk4psbnqwmz8liwha7dzn1rbw4h357ky7"; libraryHaskellDepends = [ base ghc-prim ]; description = "Type-level sets and finite maps (with value-level counterparts)"; license = stdenv.lib.licenses.bsd3; @@ -201904,6 +211757,7 @@ self: { libraryHaskellDepends = [ base singletons ]; description = "Operations on type-level lists and tuples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-map" = callPackage @@ -201912,10 +211766,8 @@ self: { }: mkDerivation { pname = "type-map"; - version = "0.1.0.0"; - sha256 = "1hssaqpic5l53l9pxvj75j87ywdnx985j6jgrqr8m9vx5hr1xrl4"; - revision = "1"; - editedCabalFile = "0821rnwnk0h9n62pnnfy68iyf1jjnb3dr72gs0667yj09r1x7cw2"; + version = "0.1.2.0"; + sha256 = "0cm2b4xkassjh71ndc5nddpmqyr5bcf3fqxs74wzd11dycmfqfaa"; libraryHaskellDepends = [ base containers ghc-prim vector ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -201927,43 +211779,43 @@ self: { "type-natural" = callPackage ({ mkDerivation, base, constraints, equational-reasoning - , ghc-typelits-natnormalise, ghc-typelits-presburger, monomorphic - , singletons, template-haskell + , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons + , template-haskell }: mkDerivation { pname = "type-natural"; - version = "0.7.1.3"; - sha256 = "1qlyaaq37w2yvxxhk835xansij3kipff20snyxcfiaf7nlprdlsn"; - revision = "1"; - editedCabalFile = "08yv53ia3p97419lab4j6bx934kan53d1ki3y1pjklhgi06w5n4p"; + version = "0.8.0.1"; + sha256 = "0ybcivp219h8xw9k31f5cimlnj63y5s2br3rahxgdacvhdb678zg"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise - ghc-typelits-presburger monomorphic singletons template-haskell + ghc-typelits-presburger singletons template-haskell ]; homepage = "https://github.com/konn/type-natural"; description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion - , double-conversion, ghc-prim, hspec, QuickCheck, text + ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq + , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck + , random, temporary, text, weigh }: mkDerivation { pname = "type-of-html"; - version = "1.1.0.0"; - sha256 = "18a7pfqab0pk2mn11f3y5slx18m6vpdmzbq91p3wp86v59wsid2d"; + version = "1.3.4.0"; + sha256 = "11drppw8xl3wzjj5qks8mqrbl83yrj7c4r01s06v38bc319g8ksf"; libraryHaskellDepends = [ base bytestring double-conversion ghc-prim text ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ - base blaze-html bytestring criterion QuickCheck text + base blaze-html bytestring criterion deepseq ghc ghc-paths random + temporary text weigh ]; homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-operators" = callPackage @@ -202116,6 +211968,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "type-tree" = callPackage + ({ mkDerivation, base, base-compat, Cabal, cabal-doctest + , containers, doctest, mtl, pretty, template-haskell, zenc + }: + mkDerivation { + pname = "type-tree"; + version = "0.2.0.1"; + sha256 = "1gwa8dklc9hipgwcx068p4a49m9hgjh97qp5q3p5yai6jdg24j94"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat containers mtl pretty template-haskell zenc + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/pikajude/type-tree"; + description = "Tree representations of datatypes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-unary" = callPackage ({ mkDerivation, applicative-numbers, base, constraints, newtype , ty, vector-space @@ -202166,21 +212037,19 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring - , conduit, conduit-extra, exceptions, hspec, http-conduit, process - , stm, temporary, transformers + ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec + , process, stm, temporary, transformers }: mkDerivation { pname = "typed-process"; - version = "0.1.1"; - sha256 = "1n93jy1z2xyin8j5dy972hdv2ydwfdbf5x1bygvn8cc6llb4wsml"; + version = "0.2.2.0"; + sha256 = "0c6gvgvjyncbni9a5bvpbglknd4yclr3d3hfg9bhgahmkj40dva2"; libraryHaskellDepends = [ - async base bytestring conduit conduit-extra exceptions process stm - transformers + async base bytestring process stm transformers ]; testHaskellDepends = [ - async base base64-bytestring bytestring conduit conduit-extra hspec - http-conduit temporary + async base base64-bytestring bytestring hspec process stm temporary + transformers ]; homepage = "https://haskell-lang.org/library/typed-process"; description = "Run external processes, with strong typing of streams"; @@ -202193,17 +212062,15 @@ self: { }: mkDerivation { pname = "typed-spreadsheet"; - version = "1.1.0"; - sha256 = "0068krzx11gvp2w227z190s33yb4n48av1kcmz800xpqrdab8f3q"; + version = "1.1.2"; + sha256 = "10bbgyj6spc3c11fwgcrgk8yba97ijzkz82pabpf64r3xzr3pv2y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base diagrams-cairo diagrams-gtk diagrams-lib foldl gtk microlens stm text transformers ]; - executableHaskellDepends = [ - base diagrams-cairo diagrams-lib text - ]; + executableHaskellDepends = [ base diagrams-lib text ]; description = "Typed and composable spreadsheets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -202271,7 +212138,6 @@ self: { homepage = "http://github.com/typed-wire/hs-typed-wire-utils#readme"; description = "Haskell utility library required for code generated by typed-wire compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typedflow" = callPackage @@ -202319,13 +212185,18 @@ self: { }) {}; "typelevel" = callPackage - ({ mkDerivation, base, pretty, pretty-show }: + ({ mkDerivation, base, constraints, convert, exceptions, lens, mtl + , pretty, pretty-show, primitive, transformers + }: mkDerivation { pname = "typelevel"; - version = "1.0.4"; - sha256 = "1hhx8zgsxpd5y2lp72c7dpyp7p678fjp63cqd14wiy9cdqd17j0w"; - libraryHaskellDepends = [ base pretty pretty-show ]; - homepage = "https://github.com/wdanilo/typelevel"; + version = "1.2.2"; + sha256 = "0baigk89rd5cdy35v3abvdwh7g11fnz2rpnzfy4ahr0q1lj395f5"; + libraryHaskellDepends = [ + base constraints convert exceptions lens mtl pretty pretty-show + primitive transformers + ]; + homepage = "https://github.com/luna/typelevel"; description = "Useful type level operations (type families and related operators)"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -202356,8 +212227,8 @@ self: { }: mkDerivation { pname = "typelits-witnesses"; - version = "0.2.3.0"; - sha256 = "0311zz3anvngjgrgry2zij5jkb8mjxfcb8rvmrik06myq7wr4vm5"; + version = "0.3.0.2"; + sha256 = "0k76ir1c6ga44cj3qmjcsnikzz2nnb2kyzkcirb3ila7yfgwc9kf"; libraryHaskellDepends = [ base base-compat constraints reflection transformers ]; @@ -202431,8 +212302,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.4.0.0"; - sha256 = "0lwsa7zfja6sqvrd4ihqc8x6k2bbrj2qayxrgkxd0p4qvxfdzp7y"; + version = "0.6.1.1"; + sha256 = "0dmdwlfn73anw4ap74aqnldp42383c2mi12r9y7sf1j1gyy872ac"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -202511,6 +212382,7 @@ self: { homepage = "https://github.com/rlupton20/tyro#readme"; description = "Type derived JSON parsing using Aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tz" = callPackage @@ -202522,8 +212394,8 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.1.3.0"; - sha256 = "1h2w9pswfbnzpdm30xpgknhvfb1vs8ipyczpslrbsv6v6xhqh44p"; + version = "0.1.3.1"; + sha256 = "1ygzrkx01y1x729y7x2fs81gpcw69q6ijy4fxq00xsb0gff74m0b"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -202539,7 +212411,6 @@ self: { homepage = "https://github.com/nilcons/haskell-tz"; description = "Efficient time zone handling"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tzdata" = callPackage @@ -202549,8 +212420,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.1.20170320.0"; - sha256 = "11ffj8ipcvvsm811w1jm23ry7vrmvj2q487640ic4ghq39dx91is"; + version = "0.1.20180122.0"; + sha256 = "17fv2jvmbplyaxw4jpq78kqws4cmwc53mlnnjw70vmagx52xh6x3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq vector @@ -202696,8 +212567,8 @@ self: { }: mkDerivation { pname = "udbus"; - version = "0.2.1"; - sha256 = "0a7kksh99nll91q41z4xgrcwc8pnfm0p71bxw6yymcd7yb0v09fk"; + version = "0.2.3"; + sha256 = "1ifl280n2ib26j4h7h46av6k7ms0j1n2wy4shbqk5xli5bbj3k9n"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -202708,7 +212579,6 @@ self: { homepage = "http://github.com/vincenthz/hs-udbus"; description = "Small DBus implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "udbus-model" = callPackage @@ -202723,7 +212593,6 @@ self: { homepage = "http://github.com/vincenthz/hs-udbus"; description = "Model API for udbus introspection and definitions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "udcode" = callPackage @@ -202738,9 +212607,7 @@ self: { }) {}; "udev" = callPackage - ({ mkDerivation, base, bytestring, libudev, posix-paths, select - , unix - }: + ({ mkDerivation, base, bytestring, libudev, posix-paths, unix }: mkDerivation { pname = "udev"; version = "0.1.0.0"; @@ -202749,7 +212616,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring posix-paths unix ]; libraryPkgconfigDepends = [ libudev ]; - executableHaskellDepends = [ base bytestring select ]; homepage = "https://github.com/pxqr/udev"; description = "libudev bindings"; license = stdenv.lib.licenses.bsd3; @@ -202773,6 +212639,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "udp-streaming" = callPackage + ({ mkDerivation, base, bytestring, network, resourcet, streaming }: + mkDerivation { + pname = "udp-streaming"; + version = "0.2.0.0"; + sha256 = "18xamvak7zr4d826141jqkhs45ij2xgp4s5b2fn955prs0iq7bnb"; + libraryHaskellDepends = [ + base bytestring network resourcet streaming + ]; + homepage = "https://hub.darcs.net/mihaigiurgeanu/udp-streaming"; + description = "Streaming to and from UDP socket"; + license = stdenv.lib.licenses.mit; + }) {}; + "uglymemo" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -202785,27 +212665,27 @@ self: { }) {}; "uhc-light" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, fgl, filepath, hashable, mtl, network, old-locale - , primitive, process, syb, transformers, uhc-util, utf8-string - , uulib, vector + ({ mkDerivation, array, base, binary, bytestring, chr-data + , containers, directory, fgl, filepath, hashable, mtl, network + , old-locale, primitive, process, syb, transformers, uhc-util + , utf8-string, uulib, vector }: mkDerivation { pname = "uhc-light"; - version = "1.1.9.5"; - sha256 = "07b8hvam9n801ldwrm6jjds691gxjw4yp33zsg4bbbv2mk6z7fpa"; + version = "1.1.10.0"; + sha256 = "0l8p6jn5f2lakdq5lvish0w62cpc0dsx7xm0jcwy6bml3ivlpzw9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - hashable mtl network old-locale primitive process syb transformers - uhc-util utf8-string uulib vector + array base binary bytestring chr-data containers directory fgl + filepath hashable mtl network old-locale primitive process syb + transformers uhc-util utf8-string uulib vector ]; executableHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - hashable mtl network old-locale primitive process syb transformers - uhc-util utf8-string uulib vector + array base binary bytestring chr-data containers directory fgl + filepath hashable mtl network old-locale primitive process syb + transformers uhc-util utf8-string uulib vector ]; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; @@ -202814,22 +212694,24 @@ self: { }) {}; "uhc-util" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, fclabels, fgl, hashable, logict-state, mtl, pqueue - , process, time, time-compat, transformers, uulib + ({ mkDerivation, array, base, binary, bytestring, chr-core + , chr-data, chr-parse, chr-pretty, containers, directory, fclabels + , fgl, hashable, logict-state, mtl, pqueue, process, time + , time-compat, transformers, uulib, vector }: mkDerivation { pname = "uhc-util"; - version = "0.1.6.7"; - sha256 = "0xaa9xp7yaj6mjq392x2jyi6rdplfabmhbwwq4ammr4wbqbjfjyl"; + version = "0.1.7.0"; + sha256 = "1xz7r5sk18aqqzxmblihk6y271qr7dsv89xxxrz5n8ds9fmj4y3k"; libraryHaskellDepends = [ - array base binary bytestring containers directory fclabels fgl - hashable logict-state mtl pqueue process time time-compat - transformers uulib + array base binary bytestring chr-core chr-data chr-parse chr-pretty + containers directory fclabels fgl hashable logict-state mtl pqueue + process time time-compat transformers uulib vector ]; homepage = "https://github.com/UU-ComputerScience/uhc-util"; description = "UHC utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uhexdump" = callPackage @@ -202854,8 +212736,8 @@ self: { pname = "uhttpc"; version = "0.1.1.0"; sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb"; - revision = "2"; - editedCabalFile = "02fzrhc3599am6nm9prm6q4anmwlgzjc2wx3hqf027z9i65zfhdq"; + revision = "3"; + editedCabalFile = "1s35m2mrcaamj0293yb78ya185fzm71zdx0jq62im7rc5fdhfiry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202868,6 +212750,7 @@ self: { homepage = "https://github.com/hvr/uhttpc"; description = "Minimal HTTP client library optimized for benchmarking"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ui-command" = callPackage @@ -202950,8 +212833,8 @@ self: { }: mkDerivation { pname = "unagi-bloomfilter"; - version = "0.1.1.0"; - sha256 = "03ssvfcn2a6bwpifajrvd2bncb2ikim2zwg56xbjihn0hg2dinsc"; + version = "0.1.1.2"; + sha256 = "0i1dz2cb8ikgbqan8kg6gwnyyn3sp2g182xkx8anj6lxqjnzcckf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202960,6 +212843,7 @@ self: { homepage = "http://github.com/jberryman/unagi-bloomfilter"; description = "A fast, cache-efficient, concurrent bloom filter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unagi-chan" = callPackage @@ -202968,8 +212852,8 @@ self: { }: mkDerivation { pname = "unagi-chan"; - version = "0.4.0.0"; - sha256 = "04m1ns6jc1yb1i9pmqmi8k21mwgkrq4q9fbcj4af1a9khxrjxcny"; + version = "0.4.1.0"; + sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb"; libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ]; testHaskellDepends = [ atomic-primops base containers ghc-prim primitive @@ -202996,8 +212880,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "unamb"; - version = "0.2.5"; - sha256 = "12cbqlc7qf2sf2m4zmisx06bcc104bwivnzq2df0jqdf09bg0n9k"; + version = "0.2.7"; + sha256 = "0v4c4zyr2fw6g86isa4n8mbflh7mwhzl70sp48mmpr1335n403xs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -203037,28 +212921,27 @@ self: { homepage = "https://github.com/sweirich/replib"; description = "Generic support for programming with names and binders"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unbound-generics" = callPackage - ({ mkDerivation, base, containers, contravariant, criterion - , deepseq, deepseq-generics, mtl, profunctors, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, transformers - , transformers-compat + ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant + , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , transformers, transformers-compat }: mkDerivation { pname = "unbound-generics"; - version = "0.3.1"; - sha256 = "0h34gaxzk86vwrcwnxq18xwlv4q4kpig3jwbcgmcpj6ziqn6g18z"; + version = "0.3.2"; + sha256 = "1g691ijcn7yxmn7w0zmd4h9w8nr578jifg3yhlyckka2jm97f20g"; libraryHaskellDepends = [ - base containers contravariant deepseq mtl profunctors - template-haskell transformers transformers-compat + ansi-wl-pprint base containers contravariant deepseq exceptions mtl + profunctors template-haskell transformers transformers-compat ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck ]; - benchmarkHaskellDepends = [ - base criterion deepseq deepseq-generics - ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; homepage = "http://github.com/lambdageek/unbound-generics"; description = "Support for programming with names and binders using GHC Generics"; license = stdenv.lib.licenses.bsd3; @@ -203155,12 +213038,11 @@ self: { }) {}; "unconstrained" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation }: mkDerivation { pname = "unconstrained"; - version = "0.1.0.1"; - sha256 = "0wzkf8fqlqd11rcb7cvb7zsyg1ws5wyplgmsll6xbfbh68adh32p"; - libraryHaskellDepends = [ base ]; + version = "0.1.0.2"; + sha256 = "03811shhcfkcrsai3a1vw99g0pmg8m3cfi8gfiaf8b13l1k7lwfj"; description = "Null constraint"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -203183,8 +213065,8 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "0.9.4"; - sha256 = "0qqjr060d79g5lnsdzx9ff6ava78441h8wvkn38hs7y3rvzw9vzd"; + version = "0.9.6"; + sha256 = "18gaay37mjgyd5rfpfs84p4q7vqdnv4lcjabaprgm315pblym46d"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -203231,6 +213113,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Event handling for the uniform workbench"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-graphs" = callPackage @@ -203247,6 +213130,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Graphs"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-htk" = callPackage @@ -203264,6 +213148,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/htk/"; description = "Graphical User Interface for Haskell Programs"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-posixutil" = callPackage @@ -203280,6 +213165,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Posix utilities for the uniform workbench"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-reactor" = callPackage @@ -203295,6 +213181,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Reactors for the uniform workbench"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-uDrawGraph" = callPackage @@ -203312,6 +213199,7 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb"; description = "Graphs binding"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-util" = callPackage @@ -203329,19 +213217,20 @@ self: { homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Utilities for the uniform workbench"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode" = callPackage - ({ mkDerivation, base, containers, utility-ht }: + ({ mkDerivation, base, containers, semigroups, utility-ht }: mkDerivation { pname = "unicode"; - version = "0.0"; - sha256 = "0fy89j864dy5dzfj15aavm8bqpv2f51zf42dyjvs50qah3shh5yl"; + version = "0.0.1"; + sha256 = "10cv8kk3c028bylkjz8jx0xhmkzrjbmhm1hhbdsyvszl9mfykga9"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers ]; + libraryHaskellDepends = [ base containers semigroups ]; testHaskellDepends = [ base containers utility-ht ]; - homepage = "http://code.haskell.org/~thielema/unicode/"; + homepage = "http://hub.darcs.net/thielema/unicode/"; description = "Construct and transform unicode characters"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -203427,21 +213316,20 @@ self: { }) {}; "unicode-transforms" = callPackage - ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq - , filepath, getopt-generics, optparse-applicative, path, path-io + ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath + , gauge, getopt-generics, optparse-applicative, path, path-io , QuickCheck, split, text }: mkDerivation { pname = "unicode-transforms"; - version = "0.3.3"; - sha256 = "04ga6dhsz9x279w3ik2sjphgmr8s6y0wd0bpg37ymn5mxp68lx2r"; + version = "0.3.4"; + sha256 = "0lh8bj6kxvpkmc14qa34vdrmcsis82mvnq6gs11ddqyjlz5sr7l2"; libraryHaskellDepends = [ base bitarray bytestring text ]; testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text ]; benchmarkHaskellDepends = [ - base criterion deepseq filepath optparse-applicative path path-io - text + base deepseq filepath gauge optparse-applicative path path-io text ]; homepage = "http://github.com/harendra-kumar/unicode-transforms"; description = "Unicode normalization"; @@ -203538,8 +213426,8 @@ self: { pname = "union"; version = "0.1.1.2"; sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw"; - revision = "1"; - editedCabalFile = "17n6f3bpw7zwa9kgfpk6sa9bwg0gsi840kkzifwmp9lakykjf0cw"; + revision = "3"; + editedCabalFile = "1llczfg153qqrkp2biqaa9qqyzy6li5cnxbyp5p24d7f2dr0d5fc"; libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; @@ -203601,6 +213489,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uniprot-kb" = callPackage + ({ mkDerivation, attoparsec, base, hspec, neat-interpolation + , QuickCheck, text + }: + mkDerivation { + pname = "uniprot-kb"; + version = "0.1.1.2"; + sha256 = "15mlmappp5k8lamgmpkmyahi5vimxk3a1821c6cabs28r4d9rywy"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + attoparsec base hspec neat-interpolation QuickCheck text + ]; + homepage = "https://github.com/biocad/uniprot-kb#readme"; + description = "UniProt-KB format parser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uniq-deep" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { @@ -203630,41 +213535,41 @@ self: { }) {}; "unique-logic" = callPackage - ({ mkDerivation, base, non-empty, QuickCheck, transformers - , utility-ht + ({ mkDerivation, base, explicit-exception, non-empty, QuickCheck + , semigroups, transformers, utility-ht }: mkDerivation { pname = "unique-logic"; - version = "0.3"; - sha256 = "0pjkqvam73d6xy528r9zf75km2yr997in902174raj6kw3kgdl41"; - libraryHaskellDepends = [ base transformers utility-ht ]; + version = "0.4"; + sha256 = "0lza0g7mvij6fj07nfyrgl7vy6hpqmmmzbnxylq71jb4a90sn28j"; + libraryHaskellDepends = [ + base explicit-exception transformers utility-ht + ]; testHaskellDepends = [ - base non-empty QuickCheck transformers utility-ht + base non-empty QuickCheck semigroups transformers utility-ht ]; - homepage = "http://code.haskell.org/~thielema/unique-logic/"; + homepage = "http://hub.darcs.net/thielema/unique-logic/"; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unique-logic-tf" = callPackage - ({ mkDerivation, base, containers, explicit-exception, non-empty - , QuickCheck, transformers, utility-ht + ({ mkDerivation, base, containers, data-ref, non-empty, QuickCheck + , semigroups, transformers, utility-ht }: mkDerivation { pname = "unique-logic-tf"; - version = "0.4.1.2"; - sha256 = "1gdcp5fh5krhpcmzsbzkd8sk7y41cjdcfvv5zcaafw19pbrh81nh"; + version = "0.5"; + sha256 = "05v9ky3lrh4yzjsfgxa2sz44l7dlsvi5iv4h9rnsj2sd3hj2xcsa"; libraryHaskellDepends = [ - base containers explicit-exception transformers utility-ht + base containers data-ref semigroups transformers utility-ht ]; testHaskellDepends = [ base non-empty QuickCheck transformers utility-ht ]; - homepage = "http://code.haskell.org/~thielema/unique-logic-tf/"; + homepage = "http://hub.darcs.net/thielema/unique-logic-tf/"; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uniqueid" = callPackage @@ -203680,16 +213585,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "uniquely-represented-sets" = callPackage + ({ mkDerivation, base, checkers, containers, criterion, deepseq + , doctest, QuickCheck, random + }: + mkDerivation { + pname = "uniquely-represented-sets"; + version = "0.1.0.0"; + sha256 = "0qzg8fp1bqg4nl5n901wndfp36nwg7dmv88s51v1sg0hqq1mr4yz"; + libraryHaskellDepends = [ base containers deepseq ]; + testHaskellDepends = [ + base checkers containers doctest QuickCheck + ]; + benchmarkHaskellDepends = [ base criterion random ]; + homepage = "https://github.com/oisdk/uniquely-represented-sets#readme"; + license = stdenv.lib.licenses.mit; + }) {}; + "unit" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "unit"; - version = "0.1.0.0"; - sha256 = "0x6wivpbrf17czbpvg727bv82zbm0abhg75p8d1vcswf786cqiq7"; + version = "0.1.0.1"; + sha256 = "1v7fv4xpb2jvcicbl6mhjkgqmap4m842dwc41fpidd9l9pb8mpaz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/cxfreeio/unit#readme"; - description = "Aliases for ()"; + homepage = "https://github.com/amohrland/haskell-unit"; + description = "Aliases for `()`"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -203711,8 +213633,8 @@ self: { }: mkDerivation { pname = "units"; - version = "2.4"; - sha256 = "0hd6d8nxyr5x3mlywjv3hyqx1r4dq5bpn18bnq5n4aw3b8lyyq2h"; + version = "2.4.1"; + sha256 = "1xvr2sivvmwpvqrpckqlkl8qr8h45aqimkwiq9m2ab45slnwwqwb"; libraryHaskellDepends = [ base containers deepseq lens linear mtl multimap singletons syb template-haskell th-desugar units-parser vector-space @@ -203762,8 +213684,8 @@ self: { }: mkDerivation { pname = "units-parser"; - version = "0.1.1"; - sha256 = "0d39r1vcwqs61529gjz3329a41fp4pwx0x4j4kw4xl2lza3wr164"; + version = "0.1.1.2"; + sha256 = "06kmrqswlivsas183jswsnqi21rmdh6cqw392b3ycj2x5avghqqa"; libraryHaskellDepends = [ base containers mtl multimap parsec ]; testHaskellDepends = [ base containers mtl multimap parsec syb tasty tasty-hunit @@ -203825,6 +213747,7 @@ self: { homepage = "https://github.com/bhurt/unitym#readme"; description = "Implementation of the unity monad for the Yesod framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universal-binary" = callPackage @@ -203875,6 +213798,8 @@ self: { pname = "universe-instances-base"; version = "1.0"; sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2"; + revision = "1"; + editedCabalFile = "13s8gxsvkw6phwvd79h9f3xaqbyzsx1svpysbmq72z1hv3mqyz8a"; libraryHaskellDepends = [ base containers universe-base ]; homepage = "https://github.com/dmwit/universe"; description = "Universe instances for types from the base package"; @@ -203889,8 +213814,8 @@ self: { pname = "universe-instances-extended"; version = "1.0.0.1"; sha256 = "15y9f0hbxqsksclxrssj4h08y0yb3nm9clqasjw6nsmi04kjfnv6"; - revision = "1"; - editedCabalFile = "1nsi34kjpyski2vip436m19m41as7zf1h8npd50sh8xa6cjhl98r"; + revision = "2"; + editedCabalFile = "1di3jk3ciikjrxzr76i0mqqza26mclnbxxak7ybkk4l06yqanj38"; libraryHaskellDepends = [ adjunctions base comonad universe-instances-base void ]; @@ -203923,6 +213848,8 @@ self: { pname = "universe-reverse-instances"; version = "1.0"; sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79"; + revision = "1"; + editedCabalFile = "0rq6h7yghnzrnv56pxnlfr6cfih8dbnhc6hh5416pgy5bxsa0ydj"; libraryHaskellDepends = [ base containers universe-instances-base ]; @@ -203957,20 +213884,23 @@ self: { "universum" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl - , safe, safe-exceptions, semigroups, stm, text, text-format - , transformers, type-operators, unordered-containers, utf8-string - , vector + , doctest, ghc-prim, Glob, hashable, hedgehog, microlens + , microlens-mtl, mtl, safe-exceptions, semigroups, stm, tasty + , tasty-hedgehog, text, text-format, transformers, type-operators + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "0.7.1.1"; - sha256 = "08q3ldx0saahlxh2zkwmsq71lkwrvfrs19nzbgwwdvd31y4r0iq6"; + version = "1.1.0"; + sha256 = "0k1gk9dba9f7w852m6y46gq1md3z0w29bgv4qy7xp3pk16h3axhp"; libraryHaskellDepends = [ - base bytestring containers deepseq exceptions ghc-prim hashable - microlens microlens-mtl mtl safe safe-exceptions stm text - text-format transformers type-operators unordered-containers - utf8-string vector + base bytestring containers deepseq ghc-prim hashable microlens + microlens-mtl mtl safe-exceptions stm text text-format transformers + type-operators unordered-containers utf8-string vector + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string ]; benchmarkHaskellDepends = [ base containers criterion deepseq hashable mtl semigroups text @@ -203987,6 +213917,8 @@ self: { pname = "unix"; version = "2.7.2.2"; sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq"; + revision = "1"; + editedCabalFile = "0cag1vm2pmzgy0v1j27lhp37iipck06n6gjlphpl26p5xw3gwd31"; libraryHaskellDepends = [ base bytestring time ]; homepage = "https://github.com/haskell/unix"; description = "POSIX functionality"; @@ -204010,31 +213942,16 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "unix-compat"; - version = "0.4.3.1"; - sha256 = "09vykw89x981fywy0w1pci2v8zy3ajyjwh9z2n610vjacmd1v03j"; - revision = "2"; - editedCabalFile = "0b5jicn8nm53yxxzwlvfcv4xp5rrqp98x5wwqh234wn9x44z54d2"; - libraryHaskellDepends = [ base unix ]; - homepage = "http://github.com/jystic/unix-compat"; - description = "Portable POSIX-compatibility layer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unix-compat_0_5" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "unix-compat"; - version = "0.5"; - sha256 = "0jx7r35q83sx0h46khl39azjg3zplpvgf3aiz4r4qmp3x50hwy98"; + version = "0.5.0.1"; + sha256 = "1gdf3h2knbymkivm784vq51mbcyj5y91r480awyxj5cw8gh9kwn2"; libraryHaskellDepends = [ base unix ]; homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unix-fcntl" = callPackage - ({ mkDerivation, base, foreign-var, unix }: + ({ mkDerivation, base, foreign-var }: mkDerivation { pname = "unix-fcntl"; version = "0.0.0"; @@ -204042,7 +213959,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base foreign-var ]; - executableHaskellDepends = [ base foreign-var unix ]; homepage = "https://github.com/maoe/unix-fcntl"; description = "Comprehensive bindings to fcntl(2)"; license = stdenv.lib.licenses.bsd3; @@ -204058,6 +213974,7 @@ self: { libraryHaskellDepends = [ base unix ]; description = "POSIX operations on Handles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unix-io-extra" = callPackage @@ -204130,8 +214047,8 @@ self: { }: mkDerivation { pname = "unix-time"; - version = "0.3.7"; - sha256 = "1qdlc9raih8s0m3x8x3n7q3ngh4faw2alv9l78sp6gnx648k0c8i"; + version = "0.3.8"; + sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw"; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ base bytestring doctest hspec old-locale old-time QuickCheck time @@ -204143,15 +214060,16 @@ self: { "unjson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , free, hashable, HUnit, invariant, pretty, primitive, scientific - , text, time, unordered-containers, vector + , semigroups, text, time, unordered-containers, vector }: mkDerivation { pname = "unjson"; - version = "0.14.1.3"; - sha256 = "18aclqjyqj7428yyal9hj32r290ipd77lnaf176sn8fk42gk5qj3"; + version = "0.15.2.0"; + sha256 = "040s1b9frl0sj8saa9b0bzsnqhmb4vdrscff2jzzcdn0papn5rbj"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable invariant - pretty primitive scientific text time unordered-containers vector + pretty primitive scientific semigroups text time + unordered-containers vector ]; testHaskellDepends = [ aeson attoparsec base bytestring containers free hashable HUnit @@ -204178,15 +214096,19 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath - , monad-logger, resourcet, transformers, unix, unliftio-core + ({ mkDerivation, async, base, deepseq, directory, filepath, hspec + , process, stm, time, transformers, unix, unliftio-core }: mkDerivation { pname = "unliftio"; - version = "0.1.1.0"; - sha256 = "1hhqcxvfh906xl9qhqk6wrsd2xc6rkwh5lqgwfizlb2wns7irkkd"; + version = "0.2.6.0"; + sha256 = "0rmklk2d2ip1mcizqn8j38lbqy58lc8h9hwigvab5ggilxpmnzgq"; libraryHaskellDepends = [ - async base deepseq directory filepath monad-logger resourcet + async base deepseq directory filepath process stm time transformers + unix unliftio-core + ]; + testHaskellDepends = [ + async base deepseq directory filepath hspec process stm time transformers unix unliftio-core ]; homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; @@ -204198,14 +214120,31 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "unliftio-core"; - version = "0.1.0.0"; - sha256 = "0wxv6s91wpfv2f5x17lwm04fvghcfnmzqw7p65117pr1r6yz5fcj"; + version = "0.1.1.0"; + sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m"; + revision = "1"; + editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2"; libraryHaskellDepends = [ base transformers ]; - homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio-core#readme"; + homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = stdenv.lib.licenses.mit; }) {}; + "unliftio-pool" = callPackage + ({ mkDerivation, base, resource-pool, time, transformers + , unliftio-core + }: + mkDerivation { + pname = "unliftio-pool"; + version = "0.1.0.1"; + sha256 = "1z4h20jn3i3582i63vmih2ccr0pljp6whb3h4pbpj36s1q75bmgp"; + libraryHaskellDepends = [ + base resource-pool time transformers unliftio-core + ]; + description = "Data.Pool generalized to MonadUnliftIO."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unlit" = callPackage ({ mkDerivation, base, directory, text }: mkDerivation { @@ -204256,8 +214195,8 @@ self: { }: mkDerivation { pname = "unordered-containers"; - version = "0.2.8.0"; - sha256 = "1a7flszhhgyjn0nm9w7cm26jbf6vyx9ij1iij4sl11pjkwsqi8d4"; + version = "0.2.9.0"; + sha256 = "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck @@ -204305,6 +214244,7 @@ self: { ]; description = "Graph library using unordered-containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unordered-intmap" = callPackage @@ -204340,6 +214280,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unpacked-containers" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, ghc-prim }: + mkDerivation { + pname = "unpacked-containers"; + version = "0"; + sha256 = "17hm6r84kark7akn18lsvb0z6q5hcy4ap89nbkhxfhkchrqc6bfr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default-class deepseq ghc-prim + ]; + executableHaskellDepends = [ base ]; + doHaddock = false; + homepage = "http://github.com/ekmett/unpacked-containers/"; + description = "Unpacked containers via backpack"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "unroll-ghc-plugin" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -204387,7 +214345,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; homepage = "http://github.com/konn/unsafely"; description = "Flexible access control for unsafe operations and instances"; license = stdenv.lib.licenses.bsd3; @@ -204486,6 +214443,7 @@ self: { homepage = "https://github.com/joshuaclayton/unused#readme"; description = "A command line tool to identify unused code"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uom-plugin" = callPackage @@ -204505,6 +214463,7 @@ self: { homepage = "https://github.com/adamgundry/uom-plugin"; description = "Units of measure as a GHC typechecker plugin"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "up" = callPackage @@ -204674,36 +214633,6 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ 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.3"; - sha256 = "050bimfsc912dh5sb2kjvvdd80ggjhakqq1dbn46cnp98zr8p0rx"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - template-haskell th-lift-instances - ]; - testHaskellDepends = [ - 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 - network-uri - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring_0_3_0_1" = callPackage ({ mkDerivation, attoparsec, base, base-compat, blaze-builder , bytestring, containers, criterion, deepseq, deepseq-generics , fail, generics-sop, HUnit, network-uri, QuickCheck @@ -204713,8 +214642,8 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.3.0.1"; - sha256 = "10bg6ia6l2blfb5068ppbnkk46linnda0c79yq99ls4j1x91wwgw"; + version = "0.3.1.1"; + sha256 = "1ysmwf2zqv6kky2656nk6i2azpngzl0rkgy5fab7ja3xhx998y3z"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers fail template-haskell th-lift-instances @@ -204731,15 +214660,14 @@ self: { homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-bytestring-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { pname = "uri-bytestring-aeson"; - version = "0.1.0.4"; - sha256 = "1nm9d3xq56rrjggky28q72n8afk5nh6m1bbi6j5z538qwccyg348"; + version = "0.1.0.6"; + sha256 = "02pgzkgmcam06qy1lqbmmjbah95b08hl5d5q61smmx78f83mzgfq"; libraryHaskellDepends = [ aeson base bytestring text uri-bytestring ]; @@ -204836,6 +214764,7 @@ self: { homepage = "https://github.com/luminescent-dreams/uri-parse#readme"; description = "A simple library for parsing and generating URIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-template" = callPackage @@ -204850,30 +214779,10 @@ self: { executableHaskellDepends = [ base ]; description = "URI template library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-templater" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, charset, containers, dlist - , HTTP, HUnit, mtl, parsers, template-haskell, text, trifecta - , unordered-containers, vector - }: - mkDerivation { - pname = "uri-templater"; - version = "0.2.2.0"; - sha256 = "13dgpsiihlgd0k18bh67ssrv5hgmp38xwicfgss84rar47m61hw6"; - libraryHaskellDepends = [ - ansi-wl-pprint base charset containers dlist HTTP mtl parsers - template-haskell text trifecta unordered-containers vector - ]; - testHaskellDepends = [ - ansi-wl-pprint base HUnit mtl template-haskell - ]; - homepage = "https://github.com/iand675/uri-templater"; - description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; - license = stdenv.lib.licenses.mit; - }) {}; - - "uri-templater_0_3_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, charset , containers, dlist, HTTP, HUnit, mtl, parsers, template-haskell , text, time, trifecta, unordered-containers, uuid-types, vector @@ -204882,6 +214791,8 @@ self: { pname = "uri-templater"; version = "0.3.1.0"; sha256 = "1hj93jgn8xch9bw9fs76qsfqarb15csfy0ddnr1dxcq04vznbri1"; + revision = "1"; + editedCabalFile = "0vl1nv40yzns9fnaz6h34x72vpfaaws8f0zm8qlr82333pxg2scw"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring charset containers dlist HTTP mtl parsers template-haskell text time trifecta unordered-containers @@ -204893,7 +214804,6 @@ self: { homepage = "https://github.com/iand675/uri-templater"; description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "url" = callPackage @@ -205007,39 +214917,42 @@ self: { }) {}; "urlpath" = callPackage - ({ mkDerivation, base, exceptions, mmorph, monad-control - , monad-logger, mtl, path-extra, resourcet, transformers - , transformers-base + ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph + , monad-control, monad-control-aligned, monad-logger, mtl + , path-extra, resourcet, split, strict, text, transformers + , transformers-base, vector }: mkDerivation { pname = "urlpath"; - version = "5.0.0.1"; - sha256 = "1qvwb2yjzz3nkm5vb6vgnhav8fqw13n7h4pr5nw9nq1n9ijq1vh3"; + version = "8.0.1"; + sha256 = "04w5ivbvfbh60jsfdsmznvm5cxracslmr1hyqhf0qdva29vcxj4z"; libraryHaskellDepends = [ - base exceptions mmorph monad-control monad-logger mtl path-extra - resourcet transformers transformers-base + attoparsec-uri base exceptions mmorph monad-control + monad-control-aligned monad-logger mtl path-extra resourcet split + strict text transformers transformers-base vector ]; description = "Painfully simple URL deployment"; license = stdenv.lib.licenses.mit; }) {}; - "urlpath_7_0_1" = callPackage + "urlpath_9_0_0" = callPackage ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph - , monad-control, monad-control-aligned, monad-logger, mtl + , monad-control, monad-control-aligned, monad-logger, mtl, path , path-extra, resourcet, split, strict, text, transformers , transformers-base, vector }: mkDerivation { pname = "urlpath"; - version = "7.0.1"; - sha256 = "05n1lmd8dd71l2ghgrb3i7jsrh541nappwps5vqqppq2hvv90rpz"; + version = "9.0.0"; + sha256 = "1ysjhb42sk34j29xy7hgf9b4qp90p6hrkqcmwdalvsasbwk8kgwh"; libraryHaskellDepends = [ attoparsec-uri base exceptions mmorph monad-control - monad-control-aligned monad-logger mtl path-extra resourcet split - strict text transformers transformers-base vector + monad-control-aligned monad-logger mtl path path-extra resourcet + split strict text transformers transformers-base vector ]; + homepage = "https://github.com/athanclark/urlpath#readme"; description = "Painfully simple URL deployment"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -205100,8 +215013,8 @@ self: { }: mkDerivation { pname = "usb"; - version = "1.3.0.5"; - sha256 = "0r3v6w0nqcwz2vcaz0pdkfb8fs4ry2nlg9pfy77avv7mjwlvp7r1"; + version = "1.3.0.6"; + sha256 = "1ipjcm8kxhi0lhqhypnppn5jk7z70rnrybawxwhdij9gj4jz3bhh"; libraryHaskellDepends = [ base bindings-libusb bytestring containers ghc-prim text vector ]; @@ -205204,8 +215117,8 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.3.1"; - sha256 = "12alrvzh1z15md5gbvci58xffw35g4626qr30v7cz6sz4pplfnb9"; + version = "0.1.3.2"; + sha256 = "0ym8r3jg7waypc74liv1v32sc1rv419axgbz97xznssb9wshcv3a"; libraryHaskellDepends = [ aeson base boomerang cereal safecopy web-routes web-routes-th ]; @@ -205366,14 +215279,25 @@ self: { pname = "utf8-string"; version = "1.0.1.1"; sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv"; - revision = "2"; - editedCabalFile = "1b97s9picjl689hcz8scinv7c8k5iaal1livqr0l1l8yc4h0imhr"; + revision = "3"; + editedCabalFile = "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/glguy/utf8-string/"; description = "Support for reading and writing UTF8 Strings"; license = stdenv.lib.licenses.bsd3; }) {}; + "util" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "util"; + version = "0.1.5.0"; + sha256 = "0rll7fv31bamnqcy3hcm8vdgzz5wjzlqhvz5lnbp1gfymx43jrga"; + libraryHaskellDepends = [ base ]; + description = "Utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "util-plus" = callPackage ({ mkDerivation, array, base, containers, hashable, HTF, QuickCheck , safe, unordered-containers @@ -205555,13 +215479,13 @@ self: { }: mkDerivation { pname = "uuagc-cabal"; - version = "1.0.6.0"; - sha256 = "02xqj4vz7hir0llxl8n517qv22jlmilknhqzx4l55gccffg7zj6w"; + version = "1.1.0.0"; + sha256 = "0bdvrxdbs9672gfmf3r2j2nasc7map2jr191crf1d0jhmg6dmlzj"; libraryHaskellDepends = [ base Cabal containers directory filepath mtl process uulib ]; - homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; - description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System"; + homepage = "https://github.com/UU-ComputerScience/uuagc"; + description = "Cabal plugin for UUAGC"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -205637,14 +215561,17 @@ self: { "uuid-crypto" = callPackage ({ mkDerivation, base, binary, bytestring, cryptoids - , cryptoids-types, exceptions, uuid + , cryptoids-class, cryptoids-types, exceptions, uuid }: mkDerivation { pname = "uuid-crypto"; - version = "1.3.1.0"; - sha256 = "10r6phn23f3piqs4jhx764pcl6f3dbxq75pvwsnmwcszdi970a3l"; + version = "1.4.0.0"; + sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn"; + revision = "3"; + editedCabalFile = "0av141dwy2hf9288nhz59jw8jp38rpbvbqfq3k5ifrzqsap9gr2x"; libraryHaskellDepends = [ - base binary bytestring cryptoids cryptoids-types exceptions uuid + base binary bytestring cryptoids cryptoids-class cryptoids-types + exceptions uuid ]; description = "Reversable and secure encoding of object ids as uuids"; license = stdenv.lib.licenses.bsd3; @@ -205717,8 +215644,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uulib"; - version = "0.9.22"; - sha256 = "1b9in4xbyi518iix5ln765z99q8prdw6p6lx5dz3ckl36dfs3l6d"; + version = "0.9.23"; + sha256 = "1v9gwy1zdkyc8f36n52p127gz1r95ykaqklshg0abiai4xnr1yy6"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/UU-ComputerScience/uulib"; description = "Haskell Utrecht Tools Library"; @@ -205949,6 +215876,7 @@ self: { homepage = "https://github.com/agrafix/validate-input"; description = "Input validation combinator library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validated-literals" = callPackage @@ -205978,42 +215906,20 @@ self: { }) {}; "validation" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, mtl, QuickCheck, semigroupoids, semigroups - , template-haskell, transformers - }: - mkDerivation { - pname = "validation"; - version = "0.5.5"; - sha256 = "0fgwgpwcisbabzyq11pkj57gp0kydi4px9gmgzqcq2hn6xb43qkd"; - libraryHaskellDepends = [ - base bifunctors lens mtl semigroupoids semigroups transformers - ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; - homepage = "https://github.com/qfpl/validation"; - description = "A data-type like Either but with an accumulating Applicative"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "validation_0_6_2" = callPackage - ({ mkDerivation, base, bifunctors, hedgehog, HUnit, lens, mtl - , semigroupoids, semigroups, transformers + ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens + , semigroupoids, semigroups }: mkDerivation { pname = "validation"; - version = "0.6.2"; - sha256 = "0631g3ffxchgg6hpy8w94a3713plgqp1k45zq85vaxyjg2x5bh7r"; + version = "1"; + sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh"; libraryHaskellDepends = [ - base bifunctors lens mtl semigroupoids semigroups transformers + base bifunctors deepseq lens semigroupoids semigroups ]; testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; homepage = "https://github.com/qfpl/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -206061,8 +215967,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.4.0.0"; - sha256 = "0ngivfphp468bp6djj8r76rwv2pcwgmawx04pnaw89m0wa5n27vw"; + version = "0.4.0.4"; + sha256 = "1iva60sfaqnkwdk5b2w6skvsg6096x24bjyd5h057n9dlbimiblx"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -206114,8 +216020,8 @@ self: { ({ mkDerivation, base, filepath, path, validity }: mkDerivation { pname = "validity-path"; - version = "0.2.0.0"; - sha256 = "1n84mnvyi1zf3888xvy2vvmca5fq594g0gqql5nisd3w1mrczw1f"; + version = "0.2.0.2"; + sha256 = "0c01nzd998fgxpkiddz6p91s84i10202md9pa1zmza0gik4rcv6y"; libraryHaskellDepends = [ base filepath path validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for Path"; @@ -206138,8 +216044,8 @@ self: { ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { pname = "validity-text"; - version = "0.2.0.0"; - sha256 = "1h123s8hbsimd3l05s217lncimfhzvy4xmwqafl4qw9dbmcxnsah"; + version = "0.2.0.1"; + sha256 = "1r96nn0y7hgm49y79kf3n86960z7gbz2mw4wcnsi9qlccnjq5qk4"; libraryHaskellDepends = [ base bytestring text validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for text"; @@ -206278,6 +216184,7 @@ self: { ]; description = "Process mpileup output to identify significant differences"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "variable-precision" = callPackage @@ -206346,14 +216253,15 @@ self: { }) {}; "vault" = callPackage - ({ mkDerivation, base, containers, hashable, unordered-containers + ({ mkDerivation, base, containers, hashable, semigroups + , unordered-containers }: mkDerivation { pname = "vault"; - version = "0.3.0.7"; - sha256 = "1w36ldr5iv0yiqbvibm7b1c66hf1ps5rbassz348zmi113d8k4cy"; + version = "0.3.1.0"; + sha256 = "17wp9i64k5ms4bqwjwqjj7llcbmyvgf81sah7w3zdqfsqd1shq6r"; libraryHaskellDepends = [ - base containers hashable unordered-containers + base containers hashable semigroups unordered-containers ]; homepage = "https://github.com/HeinrichApfelmus/vault"; description = "a persistent store for values of arbitrary types"; @@ -206366,8 +216274,8 @@ self: { }: mkDerivation { pname = "vault-tool"; - version = "0.0.0.1"; - sha256 = "1s7q6xsq5y0hkxkb47hgnxhgy6545fvxdwsziybcsz9fbvhv7qvb"; + version = "0.1.0.0"; + sha256 = "00hnbd34chi7nm8vwq80vhl0629gklfkyfwic80q7i17kzsdvx90"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types text unordered-containers @@ -206383,8 +216291,8 @@ self: { }: mkDerivation { pname = "vault-tool-server"; - version = "0.0.0.1"; - sha256 = "03gmjna82v1ir2iafchvkc32gndcfnw3skvyl7s5cilc75igrrnd"; + version = "0.1.0.0"; + sha256 = "06h4cslkb54p3yydcnkzlzysn54cy801i5fwc02hc4gi3kvia84k"; libraryHaskellDepends = [ aeson async base bytestring filepath http-client process temporary text vault-tool @@ -206437,7 +216345,6 @@ self: { homepage = "http://github.com/dmbarbour/haskell-vcache"; description = "semi-transparent persistence for Haskell using LMDB, STM"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcache-trie" = callPackage @@ -206454,7 +216361,6 @@ self: { homepage = "http://github.com/dmbarbour/haskell-vcache-trie"; description = "patricia tries modeled above VCache"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcard" = callPackage @@ -206513,6 +216419,7 @@ self: { ]; description = "A package to parse VCF files inspired in similar python libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcs-revision" = callPackage @@ -206560,7 +216467,7 @@ self: { homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcswrapper" = callPackage @@ -206587,6 +216494,29 @@ self: { license = "GPL"; }) {}; + "vec" = callPackage + ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq + , distributive, fin, hashable, inspection-testing, lens + , semigroupoids, tagged, vector + }: + mkDerivation { + pname = "vec"; + version = "0.1"; + sha256 = "0m70ld5vy96vca4wdm45q1ixwznl3yfj8jzil2kjfkzzac5fym5y"; + revision = "1"; + editedCabalFile = "0ffzb4jps0grlpbq99vx30cp4g7mad87mwcng3s1w6xqa96xr6xh"; + libraryHaskellDepends = [ + adjunctions base base-compat deepseq distributive fin hashable lens + semigroupoids + ]; + testHaskellDepends = [ base fin inspection-testing tagged ]; + benchmarkHaskellDepends = [ base criterion fin vector ]; + homepage = "https://github.com/phadej/vec"; + description = "Vec: length-indexed (sized) list"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vect" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -206662,8 +216592,8 @@ self: { pname = "vector"; version = "0.12.0.1"; sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i"; - revision = "1"; - editedCabalFile = "1xjv8876kx9vh86w718vdaaai40pwnsiw8368c5h88ch8iqq10qb"; + revision = "2"; + editedCabalFile = "0vzr8kra73anchp86knkmkq2afkd1hw6hirldn9vn69frynb1n6y"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base HUnit QuickCheck random template-haskell test-framework @@ -206675,8 +216605,8 @@ self: { }) {}; "vector-algorithms" = callPackage - ({ mkDerivation, base, bytestring, containers, mtl, mwc-random - , primitive, QuickCheck, vector + ({ mkDerivation, base, bytestring, containers, primitive + , QuickCheck, vector }: mkDerivation { pname = "vector-algorithms"; @@ -206687,7 +216617,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring primitive vector ]; - executableHaskellDepends = [ base mtl mwc-random vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector ]; @@ -206714,10 +216643,10 @@ self: { }: mkDerivation { pname = "vector-binary-instances"; - version = "0.2.3.5"; - sha256 = "0niad09lbxz3cj20qllyj92lwbc013ihw4lby8fv07x5xjx5a4p1"; + version = "0.2.4"; + sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb"; revision = "1"; - editedCabalFile = "0yk61mifvcc31vancsfsd0vskqh5k3a3znx1rbz8wzcs4ijjzh48"; + editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; benchmarkHaskellDepends = [ @@ -206774,8 +216703,8 @@ self: { }) {}; "vector-bytestring" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, directory - , ghc-prim, primitive, QuickCheck, random, vector + ({ mkDerivation, base, bytestring, deepseq, directory, ghc-prim + , primitive, QuickCheck, random, vector }: mkDerivation { pname = "vector-bytestring"; @@ -206786,7 +216715,6 @@ self: { libraryHaskellDepends = [ base bytestring deepseq ghc-prim primitive vector ]; - executableHaskellDepends = [ base bytestring criterion deepseq ]; testHaskellDepends = [ base directory QuickCheck random ]; homepage = "https://github.com/basvandijk/vector-bytestring"; description = "ByteStrings as type synonyms of Storable Vectors of Word8s"; @@ -206840,6 +216768,8 @@ self: { pname = "vector-fftw"; version = "0.1.3.8"; sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6"; + revision = "1"; + editedCabalFile = "0417f7grdvs3ws508a7k9ngpnisw7f7b6bcmmasflvvr66m6166f"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ fftw ]; homepage = "http://hackage.haskell.org/package/vector-fftw"; @@ -206950,25 +216880,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vector-shuffling" = callPackage + ({ mkDerivation, base, random, vector }: + mkDerivation { + pname = "vector-shuffling"; + version = "1.1"; + sha256 = "04kpp7529jd4avhprfxdy6nfikx3d3ans0knhz3lspms4iky068i"; + libraryHaskellDepends = [ base random vector ]; + homepage = "https://github.com/metrix-ai/vector-shuffling"; + description = "Algorithms for vector shuffling"; + license = stdenv.lib.licenses.mit; + }) {}; + "vector-sized" = callPackage ({ mkDerivation, base, deepseq, finite-typelits, vector }: mkDerivation { pname = "vector-sized"; - version = "0.5.1.0"; - sha256 = "1rcs6rifan5zzcibxgn7fvycpzramb9wf2i9nb7b7rhk4h4bs5i1"; + version = "0.6.1.0"; + sha256 = "08bqyvkxs2bbbm5ljsymj178iiqp6izzbchlzav7hmwmj893wvjd"; + revision = "1"; + editedCabalFile = "0lcm7gdzqnp5v0rfd9f611yspa493j4azdj3gzy71398z3zda5w4"; libraryHaskellDepends = [ base deepseq finite-typelits vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; }) {}; - "vector-sized_0_6_1_0" = callPackage - ({ mkDerivation, base, deepseq, finite-typelits, vector }: + "vector-sized_1_0_0_0" = callPackage + ({ mkDerivation, base, deepseq, finite-typelits + , indexed-list-literals, primitive, vector + }: mkDerivation { pname = "vector-sized"; - version = "0.6.1.0"; - sha256 = "08bqyvkxs2bbbm5ljsymj178iiqp6izzbchlzav7hmwmj893wvjd"; - libraryHaskellDepends = [ base deepseq finite-typelits vector ]; + version = "1.0.0.0"; + sha256 = "1jn00l5nw2ws4j6z8fd2h312003vpi8a4ygakmrdg4580cwnjmls"; + libraryHaskellDepends = [ + base deepseq finite-typelits indexed-list-literals primitive vector + ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; @@ -206979,23 +216927,11 @@ self: { ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.10.4"; - sha256 = "18pxpvf6rx0qbx5whshxq61pgj1njs5d0vpmjbjxkcbmqsgwq4mp"; - libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; - description = "Vector & affine spaces, linear maps, and derivatives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-space_0_12" = callPackage - ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: - mkDerivation { - pname = "vector-space"; - version = "0.12"; - sha256 = "16nzp2m6pcbqp27dm54v9a009j7jdjkrhw2hm1rgvh5jh4alyzi3"; + version = "0.13"; + sha256 = "05yn93vnhzhpp2i6qb4b3dasvmpk71rab6vhssqvpb3qhdvxb482"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space-map" = callPackage @@ -207009,6 +216945,7 @@ self: { homepage = "https://github.com/conklech/vector-space-map"; description = "vector-space operations for finite maps using Data.Map"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space-opengl" = callPackage @@ -207035,8 +216972,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; - revision = "2"; - editedCabalFile = "0jnnzhwkc82flvaxqc1vv30d8vpdwnyi82614c34j79m51wcmvya"; + revision = "3"; + editedCabalFile = "07jrxmjw7yzrgkncam4axy3b3j5iha1d632kyd24n805b6p7vym3"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; @@ -207083,6 +217020,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-text" = callPackage + ({ mkDerivation, base, binary, prologue, text, vector + , vector-binary-instances + }: + mkDerivation { + pname = "vector-text"; + version = "1.1.3"; + sha256 = "00x35fv78vp8rffvd7hsccl8vdxzzdzjrqzwvj0mr6g1wmg3p4i3"; + libraryHaskellDepends = [ + base binary prologue text vector vector-binary-instances + ]; + homepage = "https://github.com/luna/vector-text"; + description = "Text implementation based on unboxed char vector"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-th-unbox" = callPackage ({ mkDerivation, base, data-default, template-haskell, vector }: mkDerivation { @@ -207096,29 +217050,66 @@ self: { }) {}; "vectortiles" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, criterion - , deepseq, hex, microlens, microlens-platform, protobuf, tasty - , tasty-hunit, text, transformers, vector + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , hashable, hex, microlens, microlens-platform, protocol-buffers + , protocol-buffers-descriptor, tasty, tasty-hunit, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "vectortiles"; - version = "1.2.0.5"; - sha256 = "0pbilwfrz2lv10x9fgy1ndxnz1as0v41r9g36yc5g41dhyhnp82l"; + version = "1.3.0"; + sha256 = "1hvnk2b3g6dm58az7wyl8bcq4h8s0fkz0v0pig9gpad5smkmgjk0"; + revision = "2"; + editedCabalFile = "0c3xkk3xks9c4kn1l6d58v0qsg7q3pdjwdwgpwd93npcjl3isc19"; libraryHaskellDepends = [ - base bytestring cereal containers deepseq protobuf text - transformers vector + base bytestring containers deepseq hashable protocol-buffers + protocol-buffers-descriptor text transformers unordered-containers + vector ]; testHaskellDepends = [ - base bytestring cereal containers hex protobuf tasty tasty-hunit - text vector + base bytestring containers hashable hex protocol-buffers + protocol-buffers-descriptor tasty tasty-hunit text + unordered-containers vector ]; benchmarkHaskellDepends = [ - base bytestring cereal containers criterion microlens - microlens-platform protobuf text vector + base bytestring containers criterion hashable microlens + microlens-platform protocol-buffers protocol-buffers-descriptor + text unordered-containers vector ]; homepage = "https://github.com/fosskers/vectortiles"; description = "GIS Vector Tiles, as defined by Mapbox"; - license = stdenv.lib.licenses.asl20; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "vectortiles_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , hashable, hex, microlens, microlens-platform, mtl + , protocol-buffers, protocol-buffers-descriptor, tasty, tasty-hunit + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "vectortiles"; + version = "1.4.0"; + sha256 = "1h0mx5sl379486panyxpanld8qrlhak9knhz7jzqqv7is3rw8g1r"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable mtl protocol-buffers + protocol-buffers-descriptor text transformers unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers hashable hex mtl protocol-buffers + protocol-buffers-descriptor tasty tasty-hunit text + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion hashable microlens + microlens-platform mtl protocol-buffers protocol-buffers-descriptor + text unordered-containers vector + ]; + homepage = "https://github.com/fosskers/vectortiles"; + description = "GIS Vector Tiles, as defined by Mapbox"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verbalexpressions" = callPackage @@ -207177,7 +217168,6 @@ self: { libraryHaskellDepends = [ aeson base containers text unordered-containers vector verdict ]; - executableHaskellDepends = [ aeson base containers verdict ]; testHaskellDepends = [ aeson base containers hspec unordered-containers vector verdict ]; @@ -207206,6 +217196,7 @@ self: { ]; description = "A new Haskeleton package"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verilog" = callPackage @@ -207223,27 +217214,13 @@ self: { }) {}; "versions" = callPackage - ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens - , tasty, tasty-hunit, text - }: - mkDerivation { - pname = "versions"; - 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; - }) {}; - - "versions_3_3_0" = callPackage ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "versions"; - version = "3.3.0"; - sha256 = "11qgmkdinf0nhgylzfkwlcz22q7g8l4zki05hdwlb77dm2a5fam5"; + version = "3.3.2"; + sha256 = "1w4b6a9dvl69bw132nic40a65y2142z1qzzg1qxgylwarfwqmsfg"; libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; testHaskellDepends = [ base checkers microlens QuickCheck tasty tasty-hunit @@ -207251,7 +217228,6 @@ self: { ]; description = "Types and parsers for software version numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vgrep" = callPackage @@ -207263,8 +217239,8 @@ self: { }: mkDerivation { pname = "vgrep"; - version = "0.2.1.0"; - sha256 = "0k74bpi995wqxmin6h7bx3yjiwh403c708yjp19igbw1971irxjr"; + version = "0.2.2.0"; + sha256 = "11kcf59c1raqj4mwwjhr9435sqilgxgmryq1kimgra2j64ldyl3k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207282,7 +217258,6 @@ self: { homepage = "http://github.com/fmthoma/vgrep#readme"; description = "A pager for grep"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vhd" = callPackage @@ -207322,19 +217297,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vicinity" = callPackage + ({ mkDerivation, base, containers, doctest, QuickCheck + , quickcheck-classes, semigroups + }: + mkDerivation { + pname = "vicinity"; + version = "0.1.0"; + sha256 = "0yy1arybixrbkgmdnfv0y2rmkl3qf5fa2rymklqbyr00av3dr25j"; + libraryHaskellDepends = [ base semigroups ]; + testHaskellDepends = [ + base containers doctest QuickCheck quickcheck-classes + ]; + homepage = "https://github.com/andrewthad/vicinity#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "viewprof" = callPackage - ({ mkDerivation, base, brick, containers, ghc-prof, lens + ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: mkDerivation { pname = "viewprof"; - version = "0.0.0.11"; - sha256 = "1j0pafrfqkp00z3jqcp2v49v2m931wyp9plwap2445b6ncpz1fhv"; + version = "0.0.0.16"; + sha256 = "123dqm0rardrvvvrj8sjjs9z8yysk9qzwvrs3skqzxrq5pffyarp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick containers ghc-prof lens scientific text vector - vector-algorithms vty + base brick containers directory ghc-prof lens scientific text + vector vector-algorithms vty ]; homepage = "https://github.com/maoe/viewprof"; description = "Text-based interactive GHC .prof viewer"; @@ -207404,8 +217396,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.2.3.0"; - sha256 = "0023jrn5my1wgyspf4nq4m3xr7i4w277p4328j6l8hq7fda04ig4"; + version = "0.2.4.0"; + sha256 = "1pa1l1rirj19cnvdaqkf5jscsfkfyam60yk3gqiypbpd102zas6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207418,6 +217410,7 @@ self: { homepage = "http://github.com/pjones/vimeta"; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vimus" = callPackage @@ -207473,37 +217466,40 @@ self: { }) {}; "vinyl" = callPackage - ({ mkDerivation, base, criterion, doctest, ghc-prim, lens, linear - , mwc-random, singletons, vector + ({ mkDerivation, base, criterion, doctest, ghc-prim, hspec, lens + , linear, mwc-random, primitive, should-not-typecheck, singletons + , vector }: mkDerivation { pname = "vinyl"; - version = "0.5.3"; - sha256 = "19h8fssvykx18dzhjfrz87xwarqa2cmy9akd49jcacplvr1nmy00"; + version = "0.7.0"; + sha256 = "1gch1cx10466j2cyj7q4x0s3g9sjy35l5j9mvq4sfnf4sql1cfps"; libraryHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base doctest lens singletons ]; + testHaskellDepends = [ + base doctest hspec lens should-not-typecheck singletons + ]; benchmarkHaskellDepends = [ - base criterion lens linear mwc-random vector + base criterion lens linear mwc-random primitive vector ]; description = "Extensible Records"; license = stdenv.lib.licenses.mit; }) {}; - "vinyl_0_6_0" = callPackage - ({ mkDerivation, base, criterion, doctest, ghc-prim, hspec, lens - , linear, mwc-random, primitive, should-not-typecheck, singletons - , vector + "vinyl_0_8_1_1" = callPackage + ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec + , lens, linear, microlens, mwc-random, primitive + , should-not-typecheck, singletons, tagged, vector }: mkDerivation { pname = "vinyl"; - version = "0.6.0"; - sha256 = "1gig8ki9v4spxy4x8irhfvjb55shsd9a7a9g37v2r0hfl6k3yc4b"; - libraryHaskellDepends = [ base ghc-prim ]; + version = "0.8.1.1"; + sha256 = "0gwgsk7xf64291s6crvzlry1bvcvwaqmvxpl605id4bb099kqfnh"; + libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ - base doctest hspec lens should-not-typecheck singletons + base doctest hspec lens microlens should-not-typecheck singletons ]; benchmarkHaskellDepends = [ - base criterion lens linear mwc-random primitive vector + base criterion linear microlens mwc-random primitive tagged vector ]; description = "Extensible Records"; license = stdenv.lib.licenses.mit; @@ -207517,8 +217513,8 @@ self: { }: mkDerivation { pname = "vinyl-gl"; - version = "0.3.1"; - sha256 = "0rnwsz9ad7sxpk68qfmav05d6pkv8w2wg7ax31v090nd9bgwhv6a"; + version = "0.3.3"; + sha256 = "09nd2v7550ivgjfby3kd27rf4b5b5ih8l7nx6v5h7r9s42vadb0r"; libraryHaskellDepends = [ base containers GLUtil linear OpenGL tagged transformers vector vinyl @@ -207589,8 +217585,8 @@ self: { ({ mkDerivation, base, contravariant, transformers, vinyl }: mkDerivation { pname = "vinyl-utils"; - version = "0.3.0.0"; - sha256 = "0gqlqh0apymn3zydxklqjfp4sr9h170n2r9rai5z2phxv666dmz6"; + version = "0.3.0.1"; + sha256 = "0lcpg2mxmr41lqpn5ksc35c0w16s45z6qq9wjbm0cv8r047k9bq5"; libraryHaskellDepends = [ base contravariant transformers vinyl ]; homepage = "https://github.com/marcinmrotek/vinyl-utils"; description = "Utilities for vinyl"; @@ -207723,21 +217719,22 @@ self: { "visualize-cbn" = callPackage ({ mkDerivation, ansi-terminal, base, blaze-html, blaze-markup - , containers, data-default, mtl, optparse-applicative, parsec - , template-haskell + , containers, data-default, optparse-applicative, parsec + , template-haskell, text }: mkDerivation { pname = "visualize-cbn"; - version = "0.1.0.0"; - sha256 = "146rqrsmvclhykx6l2pljjl97340zx89zknwisrav9rz88rcjrx2"; + version = "0.1.0.1"; + sha256 = "0aj8s3gn2qha409n1sf9a5psh5mvb2qcmqax62c2miw5i79rh7ap"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal base blaze-html blaze-markup containers data-default - mtl optparse-applicative parsec template-haskell + optparse-applicative parsec template-haskell text ]; description = "Visualize CBN reduction"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vivid" = callPackage @@ -207757,7 +217754,6 @@ self: { ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vivid-osc" = callPackage @@ -207956,8 +217952,10 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.16"; - sha256 = "1zxjr4g7xl50zhjpbzk1a16cp2i1k75abpkna2q37hy1ss6sw637"; + version = "5.20"; + sha256 = "0l9xlk4z8xlkd7qzhzkj4l0qb2gwl27mabr2hhkpz3yfv7z6j0a3"; + revision = "1"; + editedCabalFile = "01awxbjxls9v9jh7d7mic7lzmaabsx8g9lqks8fbrjixhka321fl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207980,7 +217978,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_18_1" = callPackage + "vty_5_21" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , deepseq, directory, filepath, hashable, HUnit, microlens , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck @@ -207991,8 +217989,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.18.1"; - sha256 = "1sv04sirif4faj0zb2x2ls22xlrh6d2pca9bzhs27y0x4gf759qw"; + version = "5.21"; + sha256 = "0nvsjc5awr6kwrsv02sz64vgza6g8phk9g6g07dx1sm2yfsvhyas"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208053,9 +218051,9 @@ self: { }) {}; "vty-ui" = callPackage - ({ mkDerivation, array, base, bytestring, containers, data-default - , directory, filepath, mtl, QuickCheck, random, regex-base, stm - , text, time, unix, vector, vty + ({ mkDerivation, array, base, containers, data-default, directory + , filepath, mtl, QuickCheck, random, regex-base, stm, text, unix + , vector, vty }: mkDerivation { pname = "vty-ui"; @@ -208068,9 +218066,7 @@ self: { array base containers data-default directory filepath mtl regex-base stm text unix vector vty ]; - executableHaskellDepends = [ - base bytestring mtl QuickCheck random text time vty - ]; + executableHaskellDepends = [ base QuickCheck random text vty ]; homepage = "http://jtdaugherty.github.com/vty-ui/"; description = "An interactive terminal user interface library for Vty"; license = stdenv.lib.licenses.bsd3; @@ -208093,8 +218089,8 @@ self: { ({ mkDerivation, base, vector-sized, vulkan }: mkDerivation { pname = "vulkan"; - version = "1.7.0.0"; - sha256 = "0rg9hv04j62z0ab2dg23qk09hkx4hnniwjmkqkv83vmdc5q47j0p"; + version = "2.0.0.0"; + sha256 = "1lm92sgv1nbc4h4znyilyp3hqlj5xl6i9zcrax0fxx69a9q2jg2l"; libraryHaskellDepends = [ base vector-sized ]; librarySystemDepends = [ vulkan ]; homepage = "http://github.com/expipiplus1/vulkan#readme"; @@ -208103,6 +218099,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {vulkan = null;}; + "vulkan-api" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "vulkan-api"; + version = "1.1.1.0"; + sha256 = "17209hslyqfx3lyh1a8sii3gn1ygsb5a81nampx1ym6f6gx9g3lh"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/achirkin/vulkan#readme"; + description = "Low-level low-overhead vulkan api bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wacom-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, Glob, libnotify, process, select, text, udev @@ -208175,19 +218184,18 @@ self: { }) {}; "wai" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring - , bytestring-builder, hspec, http-types, network, text - , transformers, vault + ({ mkDerivation, base, bytestring, hspec, hspec-discover + , http-types, network, text, transformers, vault }: mkDerivation { pname = "wai"; - version = "3.2.1.1"; - sha256 = "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x"; + version = "3.2.1.2"; + sha256 = "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8"; libraryHaskellDepends = [ - base blaze-builder bytestring bytestring-builder http-types network - text transformers vault + base bytestring http-types network text transformers vault ]; - testHaskellDepends = [ base blaze-builder bytestring hspec ]; + testHaskellDepends = [ base bytestring hspec ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; license = stdenv.lib.licenses.mit; @@ -208225,8 +218233,8 @@ self: { }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.1.3"; - sha256 = "0fxgan4r10rvq2mwh7d66shxmxmyqs7z824f3s0yzyl4gysivkkg"; + version = "3.1.4"; + sha256 = "1gcrfcvll4lpd8qrpcai00cn2zs8ql46z1chlqkbi7jk31r14qy0"; libraryHaskellDepends = [ array attoparsec attoparsec-conduit base blaze-builder blaze-html bytestring case-insensitive conduit conduit-extra containers @@ -208245,25 +218253,25 @@ self: { }) {}; "wai-app-static" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, containers, cryptonite, directory, file-embed - , filepath, hspec, http-date, http-types, memory, mime-types - , mockery, network, old-locale, optparse-applicative - , template-haskell, temporary, text, time, transformers - , unix-compat, unordered-containers, wai, wai-extra, warp, zlib + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , containers, cryptonite, directory, file-embed, filepath, hspec + , http-date, http-types, memory, mime-types, mockery, network + , old-locale, optparse-applicative, template-haskell, temporary + , text, time, transformers, unix-compat, unordered-containers, wai + , wai-extra, warp, zlib }: mkDerivation { pname = "wai-app-static"; - version = "3.1.6.1"; - sha256 = "0s36i0ca440l78d35isaam98z9x0dc0llx0ry48r901f3vrsq65k"; + version = "3.1.6.2"; + sha256 = "0gnwq6ad5m8w8sqq4dzpz23l5rjdphfsf8h9h27lrvv1prkabc6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring containers - cryptonite directory file-embed filepath http-date http-types - memory mime-types old-locale optparse-applicative template-haskell - text time transformers unix-compat unordered-containers wai - wai-extra warp zlib + base blaze-html blaze-markup bytestring containers cryptonite + directory file-embed filepath http-date http-types memory + mime-types old-locale optparse-applicative template-haskell text + time transformers unix-compat unordered-containers wai wai-extra + warp zlib ]; executableHaskellDepends = [ base bytestring containers directory mime-types text @@ -208298,15 +218306,15 @@ self: { }) {}; "wai-conduit" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, conduit - , http-types, transformers, wai + ({ mkDerivation, base, bytestring, conduit, http-types + , transformers, wai }: mkDerivation { pname = "wai-conduit"; - version = "3.0.0.3"; - sha256 = "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4"; + version = "3.0.0.4"; + sha256 = "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417"; libraryHaskellDepends = [ - base blaze-builder bytestring conduit http-types transformers wai + base bytestring conduit http-types transformers wai ]; homepage = "https://github.com/yesodweb/wai"; description = "conduit wrappers for WAI"; @@ -208321,8 +218329,8 @@ self: { }: mkDerivation { pname = "wai-cors"; - version = "0.2.5"; - sha256 = "0vkn5nws9vcjn809qv2jfhf9ckfcgvfhs1v3xx1b03iy0j59n215"; + version = "0.2.6"; + sha256 = "11m9d8hn9pb9brprz0kglldmcqj83kjkjdwdpxdbl12430ii1ina"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base base-unicode-symbols bytestring case-insensitive @@ -208422,8 +218430,10 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.20.0"; - sha256 = "0w8r0azjhl132sa8wzqjd8vs359h8dc7l6afr3g5wbw1kr9clqxd"; + version = "3.0.22.0"; + sha256 = "0rwksl5jkhkgd10qi0wvhfw28g1qci60pc6chrv5bg0w0xqkv532"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -208440,6 +218450,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_22_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, HUnit, iproute, lifted-base, network, old-locale + , resourcet, streaming-commons, stringsearch, text, time + , transformers, unix, unix-compat, vault, void, wai, wai-logger + , word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.22.1"; + sha256 = "0bvj0nc3m314hh6n4rpz6dzb4bqg24b1sz4x0w7bj5ah8msr0z3y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types iproute lifted-base network + old-locale resourcet streaming-commons stringsearch text time + transformers unix unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base bytestring case-insensitive cookie fast-logger hspec + http-types HUnit resourcet text time transformers wai zlib + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -208454,6 +218496,32 @@ self: { ]; description = "Run CGI apps on WAI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-git-http" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, containers, directory + , filepath, hspec, http-types, network, process, sockaddr, text + , wai, wai-conduit, warp + }: + mkDerivation { + pname = "wai-git-http"; + version = "0.0.0"; + sha256 = "15j0zkrd0m0qs0yg6b6zwhgfq283a2j8dxf1aqs9l9cbagzsg75g"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring case-insensitive conduit + conduit-extra containers directory filepath http-types network + process sockaddr text wai wai-conduit + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra directory hspec process wai + warp + ]; + homepage = "https://github.com/NorfairKing/wai-git-http"; + description = "Git http-backend CGI App of WAI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-graceful" = callPackage @@ -208520,6 +218588,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-handler-launch_3_0_2_4" = callPackage + ({ mkDerivation, async, base, bytestring, http-types, process + , streaming-commons, transformers, wai, warp + }: + mkDerivation { + pname = "wai-handler-launch"; + version = "3.0.2.4"; + sha256 = "0019vz9ha2mvliz3drjbj62v26mwhl9bl1vqr06ki40865hrr78f"; + libraryHaskellDepends = [ + async base bytestring http-types process streaming-commons + transformers wai warp + ]; + description = "Launch a web app in the default browser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-handler-scgi" = callPackage ({ mkDerivation, base, bytestring, wai, wai-extra }: mkDerivation { @@ -208657,23 +218742,46 @@ self: { }) {}; "wai-logger" = callPackage - ({ mkDerivation, base, blaze-builder, byteorder, bytestring - , case-insensitive, doctest, fast-logger, http-types, network, unix - , unix-time, wai + ({ mkDerivation, base, byteorder, bytestring, case-insensitive + , doctest, fast-logger, http-types, network, unix, unix-time, wai }: mkDerivation { pname = "wai-logger"; - version = "2.3.0"; - sha256 = "1w0b0vinsyqr37wciljkz8g5dcmfi2r210lq194a0wkycly9kkch"; + version = "2.3.2"; + sha256 = "0w5ldq4gplc16zzk5ikmbbjw79imaqvw8p6lylaw3hlsbn3zzm4d"; libraryHaskellDepends = [ - base blaze-builder byteorder bytestring case-insensitive - fast-logger http-types network unix unix-time wai + base byteorder bytestring case-insensitive fast-logger http-types + network unix unix-time wai ]; testHaskellDepends = [ base doctest ]; description = "A logging system for WAI"; license = stdenv.lib.licenses.bsd3; }) {}; + "wai-logger-buffered" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , http-types, time, wai, warp + }: + mkDerivation { + pname = "wai-logger-buffered"; + version = "0.1.0.1"; + sha256 = "0ksyh5g3wsldg739gzjvvmw9r1wrm5vq84n3shjqsl2y29r4kbls"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers data-default time wai + ]; + executableHaskellDepends = [ + base bytestring containers data-default http-types time wai warp + ]; + testHaskellDepends = [ + base bytestring containers data-default time wai + ]; + homepage = "https://github.com/ChrisCoffey/wai-logger-buffered#readme"; + description = "Buffer requets before logging them"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-logger-prefork" = callPackage ({ mkDerivation, base, bytestring, date-cache, fast-logger , http-types, unix, wai, wai-logger @@ -208750,6 +218858,7 @@ self: { ]; description = "Authentication middleware that secures WAI application"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-brotli" = callPackage @@ -208894,8 +219003,7 @@ self: { ({ mkDerivation, async, base, base-prelude, bytestring, conduit , conduit-extra, consul-haskell, enclosed-exceptions, http-client , http-types, monad-control, monad-logger, network, process - , resourcet, text, transformers, void, wai, wai-app-static - , wai-conduit, wai-extra, warp + , resourcet, text, transformers, void, wai, wai-conduit }: mkDerivation { pname = "wai-middleware-consul"; @@ -208909,10 +219017,6 @@ self: { monad-control monad-logger network process resourcet text transformers void wai wai-conduit ]; - executableHaskellDepends = [ - async base base-prelude monad-logger transformers wai - wai-app-static wai-extra warp - ]; homepage = "https://github.com/fpco/wai-middleware-consul"; description = "Wai Middleware for Consul"; license = stdenv.lib.licenses.mit; @@ -208923,29 +219027,31 @@ self: { ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring , clay, exceptions, extractable-singleton, hashable, hspec , hspec-wai, http-media, http-types, lucid, mmorph, monad-control - , monad-control-aligned, monad-logger, mtl, pandoc, pandoc-types - , resourcet, shakespeare, tasty, tasty-hspec, text, transformers - , transformers-base, unordered-containers, urlpath, wai, wai-logger - , wai-transformers, warp + , monad-control-aligned, monad-logger, mtl, resourcet, shakespeare + , tasty, tasty-hspec, text, transformers, transformers-base + , unordered-containers, urlpath, wai, wai-logger, wai-transformers + , warp }: mkDerivation { pname = "wai-middleware-content-type"; - version = "0.5.1"; - sha256 = "1xvb38nq7mb4gpraj46j39hgf9vqcqng3hxhlj52zj7yn7d6279q"; + version = "0.6.1.2"; + sha256 = "057xrb6nik8imxg91chyhakddb0ywm7ccfkwjlyrbwrd5hm84j8r"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay exceptions extractable-singleton hashable http-media http-types lucid mmorph - monad-control monad-control-aligned monad-logger mtl pandoc - resourcet shakespeare text transformers transformers-base + monad-control monad-control-aligned monad-logger mtl resourcet + shakespeare text transformers transformers-base unordered-containers urlpath wai wai-logger wai-transformers ]; testHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay exceptions - hashable hspec hspec-wai http-media http-types lucid mmorph - monad-control monad-logger mtl pandoc pandoc-types resourcet - shakespeare tasty tasty-hspec text transformers transformers-base - unordered-containers urlpath wai wai-transformers warp + extractable-singleton hashable hspec hspec-wai http-media + http-types lucid mmorph monad-control monad-control-aligned + monad-logger mtl resourcet shakespeare tasty tasty-hspec text + transformers transformers-base unordered-containers urlpath wai + wai-logger wai-transformers warp ]; + homepage = "https://github.com/athanclark/wai-middleware-content-type#readme"; description = "Route to different middlewares based on the incoming Accept header"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -208980,6 +219086,7 @@ self: { ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-etag" = callPackage @@ -209069,9 +219176,6 @@ self: { cryptohash http-client http-types mtl old-locale time transformers word8 ]; - executableHaskellDepends = [ - base bytestring http-client transformers - ]; description = "WAI HMAC Authentication Middleware Client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -209094,7 +219198,6 @@ self: { homepage = "https://github.com/orbital/wai-middleware-json-errors#readme"; description = "Converts errors from plaintext to json"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-metrics" = callPackage @@ -209141,16 +219244,16 @@ self: { }) {}; "wai-middleware-prometheus" = callPackage - ({ mkDerivation, base, bytestring, data-default, doctest - , http-types, prometheus-client, text, time, wai + ({ mkDerivation, base, bytestring, clock, data-default, doctest + , http-types, prometheus-client, text, wai }: mkDerivation { pname = "wai-middleware-prometheus"; - version = "0.1.1"; - sha256 = "0dd730nmbnbly4kdxwri3bwzl9dzdxgmz4lgmm86m70mvncgp4mj"; + version = "0.3.0"; + sha256 = "04ymaaby1pk60gg3bnz1a3mz0r7bl4p41kksbn40nvj5ahz41i6f"; libraryHaskellDepends = [ - base bytestring data-default http-types prometheus-client text time - wai + base bytestring clock data-default http-types prometheus-client + text wai ]; testHaskellDepends = [ base doctest prometheus-client ]; homepage = "https://github.com/fimad/prometheus-haskell"; @@ -209159,23 +219262,16 @@ self: { }) {}; "wai-middleware-rollbar" = 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, aeson, base, bytestring, hostname, http-client + , http-conduit, http-types, rollbar-hs, text, time, uuid, wai }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.4.0"; - sha256 = "14dr25jn7xdx68ykrplcbnk1qvwbaxqpa63a6m56sfpwa4qj03ja"; + version = "0.10.0"; + sha256 = "1905cgmcgmsy0v2c84q33aharlklffqxhr6bwr1zvi138c9bivd6"; 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 + aeson base bytestring hostname http-client http-conduit http-types + rollbar-hs text time uuid wai ]; homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme"; description = "Middleware that communicates to Rollbar"; @@ -209206,22 +219302,18 @@ self: { "wai-middleware-static" = callPackage ({ mkDerivation, base, bytestring, containers, cryptonite - , directory, expiring-cache-map, filepath, hpc-coveralls - , http-types, memory, mime-types, mtl, old-locale, semigroups, text - , time, wai + , directory, expiring-cache-map, filepath, http-types, memory + , mime-types, mtl, old-locale, semigroups, text, time, wai }: mkDerivation { pname = "wai-middleware-static"; - version = "0.8.1"; - sha256 = "0xaksnb1lzbw6rj62l4x9jpx40c1l2c33x5cb5vqk08g84zz3dg0"; - revision = "3"; - editedCabalFile = "1k6wvqwckccxdvpfi0cinw7pw907rigvgcsj5mib4wxpfwpg5cam"; + version = "0.8.2"; + sha256 = "1z5yapcf8j9w71f2na30snmalsajlyi8an2f9qrjdmajabyykr0b"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups text time wai ]; - testHaskellDepends = [ base hpc-coveralls ]; homepage = "https://github.com/scotty-web/wai-middleware-static"; description = "WAI middleware that serves requests to static files"; license = stdenv.lib.licenses.bsd3; @@ -209267,76 +219359,48 @@ self: { }) {}; "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, hspec - , http-types, HUnit, network, stm, token-bucket, transformers, wai - , wai-extra + ({ mkDerivation, base, bytestring, bytestring-builder, containers + , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm + , text, token-bucket, transformers, wai, wai-extra }: mkDerivation { pname = "wai-middleware-throttle"; - version = "0.2.1.0"; - sha256 = "0z7qziy3y0lxzaaf72hr598zkgg6w9288fd6ar7ipqn8p1xw0al6"; + version = "0.2.2.0"; + sha256 = "0k5q6vziq67bscfrm1dx6i4wkvw30wa35mgdd7x1dzniibx87dva"; libraryHaskellDepends = [ - base containers hashable http-types network stm token-bucket - transformers wai + base bytestring bytestring-builder containers hashable http-types + mtl network stm text token-bucket transformers wai ]; testHaskellDepends = [ - base bytestring hspec http-types HUnit stm transformers wai - wai-extra + base bytestring hspec http-types HUnit QuickCheck stm transformers + wai wai-extra ]; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; }) {}; "wai-middleware-verbs" = callPackage - ({ mkDerivation, base, errors, exceptions, hashable, http-types - , mmorph, monad-logger, mtl, resourcet, text, transformers - , transformers-base, unordered-containers, wai - , wai-middleware-content-type, wai-transformers, warp + ({ mkDerivation, base, bytestring, exceptions, hashable, http-types + , mmorph, monad-control, monad-control-aligned, monad-logger, mtl + , resourcet, transformers, transformers-base, unordered-containers + , wai, wai-transformers }: mkDerivation { pname = "wai-middleware-verbs"; - version = "0.3.2"; - sha256 = "0rma394hfpycaqfyr9bpal2v27559hrm7yd83x7dh13jv9zsj7v9"; - isLibrary = true; - isExecutable = true; + version = "0.4.0.1"; + sha256 = "1x4x41b1gbr2xvfw1q766wcvdl13wwv9spa9zxvjdykg71knnw93"; libraryHaskellDepends = [ - base errors exceptions hashable http-types mmorph monad-logger mtl - resourcet transformers transformers-base unordered-containers wai - ]; - executableHaskellDepends = [ - base errors exceptions hashable http-types mmorph monad-logger mtl - resourcet text transformers transformers-base unordered-containers - wai wai-middleware-content-type wai-transformers warp + base bytestring exceptions hashable http-types mmorph monad-control + monad-control-aligned monad-logger mtl resourcet transformers + transformers-base unordered-containers wai wai-transformers ]; - description = "Route different middleware responses based on the incoming HTTP verb"; + homepage = "https://github.com/athanclark/wai-middleware-verbs#readme"; + description = "Route Wai middlewares based on HTTP verbs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-predicates" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , bytestring-conversion, case-insensitive, cookie, http-types - , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers - , vault, vector, wai - }: - mkDerivation { - pname = "wai-predicates"; - version = "0.9.0"; - sha256 = "0l0v9qfnz63j39g39l3rw9k6hgm80ijic5f1kh2f077cijmd60hq"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion case-insensitive - cookie http-types singletons transformers vault vector wai - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive http-types tasty - tasty-hunit tasty-quickcheck wai - ]; - homepage = "https://gitlab.com/twittner/wai-predicates/"; - description = "WAI request predicates"; - license = "unknown"; - }) {}; - - "wai-predicates_0_10_0" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, cookie, http-types , singletons, tasty, tasty-hunit, tasty-quickcheck, text @@ -209357,7 +219421,6 @@ self: { homepage = "https://gitlab.com/twittner/wai-predicates/"; description = "WAI request predicates"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-request-spec" = callPackage @@ -209393,25 +219456,6 @@ self: { }) {}; "wai-route" = callPackage - ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck - , tasty, tasty-quickcheck, unordered-containers, wai - }: - mkDerivation { - pname = "wai-route"; - version = "0.3.1.1"; - sha256 = "03rckjjrsr741iawlc1vncydqn9x6m11d6rhgbv8ihx3ym97vzj3"; - libraryHaskellDepends = [ - base bytestring http-types unordered-containers wai - ]; - testHaskellDepends = [ - base bytestring http-types mtl QuickCheck tasty tasty-quickcheck - wai - ]; - description = "Minimalistic, efficient routing for WAI"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "wai-route_0_3_1_2" = callPackage ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck , tasty, tasty-quickcheck, unordered-containers, wai }: @@ -209428,7 +219472,6 @@ self: { ]; description = "Minimalistic, efficient routing for WAI"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-router" = callPackage @@ -209453,8 +219496,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.10.0"; - sha256 = "1yqd79gm0xl7p8ag2pii4kcn3vb90qkli54dq4jb619bia9lsfsy"; + version = "0.10.1"; + sha256 = "1ahlvyplg1mh3w2yxag0nk67w13k70rff77b96grgr48a8b9b82g"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -209467,6 +219510,7 @@ self: { 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 @@ -209595,8 +219639,8 @@ self: { }: mkDerivation { pname = "wai-session-postgresql"; - version = "0.2.1.1"; - sha256 = "0yab46s0xyd49s46skrgm9hk4pvzqv3sr8mzr58231jvn7lijyf9"; + version = "0.2.1.2"; + sha256 = "10xc34a1l6g2lr8b4grvv17281689gdb8q1vh3kkip5lk7fp1m9r"; libraryHaskellDepends = [ base bytestring cereal cookie data-default entropy postgresql-simple resource-pool text time transformers wai @@ -209740,6 +219784,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-transformers_0_1_0" = callPackage + ({ mkDerivation, base, exceptions, extractable-singleton + , monad-control-aligned, transformers, wai, wai-websockets + , websockets + }: + mkDerivation { + pname = "wai-transformers"; + version = "0.1.0"; + sha256 = "14l5ihyvg2n0kmmkxy0r5mx1jk3p5jhv1vynsnnrb2md1g4318qp"; + libraryHaskellDepends = [ + base exceptions extractable-singleton monad-control-aligned + transformers wai wai-websockets websockets + ]; + homepage = "https://github.com/athanclark/wai-transformers#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-util" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , http-accept, http-types, network-uri, text, transformers, wai @@ -209759,24 +219821,23 @@ self: { }) {}; "wai-websockets" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , file-embed, http-types, network, text, transformers, wai - , wai-app-static, warp, websockets + ({ mkDerivation, base, bytestring, case-insensitive, file-embed + , http-types, network, text, transformers, wai, wai-app-static + , warp, websockets }: mkDerivation { pname = "wai-websockets"; - version = "3.0.1.1"; - sha256 = "0ccasczm9x8sx6bpywd8ga3qji2rqkz1l2fy856qz7jdazmazgka"; + version = "3.0.1.2"; + sha256 = "0b2xmdsrsqpssyib53wbr6r8hf75789ndyyanv37sv99iyqcwz4i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive http-types network - transformers wai websockets + base bytestring case-insensitive http-types network transformers + wai websockets ]; executableHaskellDepends = [ - base blaze-builder bytestring case-insensitive file-embed - http-types network text transformers wai wai-app-static warp - websockets + base bytestring case-insensitive file-embed http-types network text + transformers wai wai-app-static warp websockets ]; homepage = "http://github.com/yesodweb/wai"; description = "Provide a bridge between WAI and the websockets package"; @@ -209809,7 +219870,7 @@ self: { "waitra" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , http-types, regex-applicative, tasty, tasty-hunit - , template-haskell, text, wai, wai-app-static, wai-extra, warp + , template-haskell, text, wai, wai-extra }: mkDerivation { pname = "waitra"; @@ -209823,13 +219884,13 @@ self: { aeson base bytestring directory filepath http-types regex-applicative template-haskell text wai ]; - executableHaskellDepends = [ aeson base wai wai-app-static warp ]; testHaskellDepends = [ aeson base http-types tasty tasty-hunit wai wai-extra ]; homepage = "https://github.com/futurice/waitra"; description = "A very simple Wai router"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "waldo" = callPackage @@ -209918,34 +219979,33 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , bytestring, bytestring-builder, case-insensitive, containers - , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP - , http-date, http-types, http2, HUnit, iproute, lifted-base - , network, process, QuickCheck, silently, simple-sendfile, stm - , streaming-commons, text, time, transformers, unix, unix-compat - , vault, wai, word8 + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, doctest + , gauge, ghc-prim, hashable, hspec, http-client, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 }: mkDerivation { pname = "warp"; - version = "3.2.13"; - sha256 = "0964l8xcbdqnrz0mnk0b732n66i7q8grwzzax96mqbh15ps5nfcj"; + version = "3.2.18.2"; + sha256 = "01jmwq9a5xxig14qh30w2fspjv4rhprv6q6i6bsv1qy9m9n2mczb"; libraryHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers ghc-prim hashable - http-date http-types http2 iproute network simple-sendfile stm - streaming-commons text unix unix-compat vault wai word8 + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + unix unix-compat vault wai word8 ]; testHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers directory doctest - ghc-prim hashable hspec HTTP http-date http-types http2 HUnit - iproute lifted-base network process QuickCheck silently - simple-sendfile stm streaming-commons text time transformers unix - unix-compat vault wai word8 + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory doctest ghc-prim hashable + hspec http-client http-date http-types http2 HUnit iproute + lifted-base network process QuickCheck silently simple-sendfile stm + streaming-commons text time transformers unix unix-compat vault wai + word8 ]; benchmarkHaskellDepends = [ - auto-update base bytestring containers criterion hashable http-date + auto-update base bytestring containers gauge hashable http-date http-types network unix unix-compat ]; homepage = "http://github.com/yesodweb/wai"; @@ -209999,8 +220059,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.2.4"; - sha256 = "05vfjlgi574nnydfmfpyp3q6mf389iyj9mv94djnm8d1izasml85"; + version = "3.2.4.2"; + sha256 = "08g74490mpaghrvkb5z6pa6b6bby1a83js52pg5jlm9b5zfwcj2w"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class network streaming-commons tls tls-session-manager wai warp @@ -210010,10 +220070,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp-tls_3_2_4_3" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, streaming-commons, tls, tls-session-manager, wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.2.4.3"; + sha256 = "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4"; + libraryHaskellDepends = [ + base bytestring cryptonite data-default-class network + 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"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-tls-uid" = callPackage ({ mkDerivation, base, bytestring, certificate, conduit - , crypto-random, http-types, network, network-conduit, pem, tls - , tls-extra, unix, wai, warp + , crypto-random, network, network-conduit, pem, tls, tls-extra + , unix, wai, warp }: mkDerivation { pname = "warp-tls-uid"; @@ -210025,15 +220103,29 @@ self: { base bytestring certificate conduit crypto-random network network-conduit pem tls tls-extra unix wai warp ]; - executableHaskellDepends = [ - base bytestring certificate conduit crypto-random http-types - network network-conduit pem tls tls-extra unix wai warp - ]; description = "set group and user id before running server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "warped" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, conduit, http-types + , lifted-async, monad-control, preamble, uuid, wai, wai-conduit + , wai-cors, warp + }: + mkDerivation { + pname = "warped"; + version = "0.0.5"; + sha256 = "1gk7mfainbw8iyg8vqii39yl7n2dz052p8nrphhjbzphibl349jf"; + libraryHaskellDepends = [ + aeson base blaze-builder conduit http-types lifted-async + monad-control preamble uuid wai wai-conduit wai-cors warp + ]; + homepage = "https://github.com/swift-nav/warped"; + description = "Warp and Wai Library"; + license = stdenv.lib.licenses.mit; + }) {}; + "watchdog" = callPackage ({ mkDerivation, base, mtl, time }: mkDerivation { @@ -210114,6 +220206,8 @@ self: { pname = "wave"; version = "0.1.5"; sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5"; + revision = "1"; + editedCabalFile = "1wvgxay0r5rpcc7yxkznxxcp1za0ifxvk87w0xrilxgb35r3izz8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers data-default-class transformers @@ -210133,8 +220227,8 @@ self: { }: mkDerivation { pname = "wavefront"; - version = "0.7.1.1"; - sha256 = "1d9hh3si3fwbb42y9nlqwp3ccl8gpip65fh75gidfzzricjyw7fw"; + version = "0.7.1.2"; + sha256 = "047hdcvrkh4xwyp8i18w45qx7nhd59iii34nrh6ih9k77l6rr4qj"; libraryHaskellDepends = [ attoparsec base dlist filepath mtl text transformers vector ]; @@ -210160,6 +220254,7 @@ self: { homepage = "https://github.com/sasinestro/wavefront-obj#readme"; description = "Wavefront .obj file loader"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wavesurfer" = callPackage @@ -210203,9 +220298,7 @@ self: { }) {}; "wcwidth" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , setlocale, utf8-string - }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "wcwidth"; version = "0.0.2"; @@ -210213,9 +220306,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ - attoparsec base bytestring containers setlocale utf8-string - ]; homepage = "http://github.com/solidsnack/wcwidth/"; description = "Native wcwidth"; license = stdenv.lib.licenses.bsd3; @@ -210307,16 +220397,17 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.1"; - sha256 = "16iv72jyay844668rnzmk3w98ia5cdijg8hpzy7qdhc29n3p2kzf"; + version = "0.1.2"; + sha256 = "1qhs2gi1591bphdr1wxbn2za7kfskywndz4bcr741q825m2bakhd"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text transformers unordered-containers wai ]; testHaskellDepends = [ base bytestring HUnit network-uri text ]; - description = "Composable, reversible, efficient web routing based on invertible invariants and bijections"; + description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-mongrel2" = callPackage @@ -210422,10 +220513,8 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.12"; - sha256 = "0c0wqr3f79gx26pfknvv4zka8g8fkfxw5fqb0qpq8zv0mv5rflba"; - revision = "1"; - editedCabalFile = "1pdp6x3q5423m99n24nhwlqmi0xyz0dhz02v2m8n4nkbg33lrv1q"; + version = "0.27.14.2"; + sha256 = "0jpps7ay2hw41595hlfrx5k4lh9p2nib02n3rhd1vphpbnf392xg"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -210519,8 +220608,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.6.2"; - sha256 = "1j661bdl5nb7a02gvsi89dybzaczjynp3d6kxnrgc4jc41rwbgj8"; + version = "0.22.6.3"; + sha256 = "1zamjbvjxryc43wac95cdavbq4czjlfx5kgxykadx8sw63vfnk4x"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -210548,8 +220637,8 @@ self: { }: mkDerivation { pname = "web-routes-wai"; - version = "0.24.3"; - sha256 = "070gldklv52gpvas676nw9igr4d3cd1f23prlmd2qjrjn3qvhdq7"; + version = "0.24.3.1"; + sha256 = "0j9h22nsj7zf5qpf4i07jdcih00r2fivdilvj8wsylk4d23x27wf"; libraryHaskellDepends = [ base bytestring http-types text wai web-routes ]; @@ -210585,8 +220674,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.5.5.0"; - sha256 = "0cnkrkjwmn8mz559nbfaxq3s1wksb2p5p68djgyjz5d3cz8icpq4"; + version = "0.6.0.0"; + sha256 = "1dwwxvh11867f18lw9g2rjqsjawqa92p6063x64izdl1qj5qnwv9"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptonite http-client http-client-tls memory template-haskell text @@ -210845,6 +220934,7 @@ self: { ]; description = "Parser and Pretty Printer for the Web IDL Language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {LEXER = null;}; @@ -210855,8 +220945,8 @@ self: { }: mkDerivation { pname = "webify"; - version = "0.1.8.0"; - sha256 = "031gim7g15ssjj3pzc5nk7r8dsfj35pf3kzjzaxfijklwzj0zj9q"; + version = "0.1.9.0"; + sha256 = "0gfdzxy7qsxpqqrkm3dy37d68xp8nvx0q9189msbfp3x4yalfb1z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -210913,7 +221003,7 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) webkitgtk;}; "webkitgtk3" = callPackage @@ -211011,87 +221101,50 @@ self: { "websockets" = 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.10.0.0"; - sha256 = "1sx27ys3zwxjp8nafnkv0f38i5748cf5jv9kgn5944ird2k6zr9y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text - ]; - executableHaskellDepends = [ - 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; - }) {}; - - "websockets_0_12_2_0" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, containers + , bytestring, bytestring-builder, case-insensitive, containers , criterion, entropy, HUnit, network, QuickCheck, random, SHA , streaming-commons, test-framework, test-framework-hunit , test-framework-quickcheck2, text }: mkDerivation { pname = "websockets"; - version = "0.12.2.0"; - sha256 = "1jjb3qp6kniddn7jf4vv25v3fqainiclw0f3iyk4shq49clllki1"; + version = "0.12.4.0"; + sha256 = "1sq488nm8bjrg1q9vypag9pd8vljfibx3kacgkcfi1zqmr14x8x3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA - streaming-commons text - ]; - executableHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text + attoparsec base base64-bytestring binary bytestring + bytestring-builder 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 + attoparsec base base64-bytestring binary bytestring + bytestring-builder 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 + attoparsec base base64-bytestring binary bytestring + bytestring-builder 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, hashable, monad-control, MonadRandom, mtl, QuickCheck + , 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.4.0"; - sha256 = "13rvlh5yvznm8f6x8yiqghnrwn6gyr0xcqzvs338lvsaqanggg0p"; + version = "0.6.0"; + sha256 = "1kii5d0xfs8cj8j19g1hfx7h0fk0g7hx441xhs8wavsh75nmpkgg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211100,10 +221153,6 @@ self: { unordered-containers uuid wai-transformers websockets websockets-simple ]; - executableHaskellDepends = [ - aeson async base exceptions MonadRandom mtl wai-transformers - websockets - ]; testHaskellDepends = [ aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck ]; @@ -211111,70 +221160,76 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets-rpc_0_6_0" = callPackage + "websockets-rpc_0_7_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , exceptions, hashable, monad-control, MonadRandom, mtl, QuickCheck + , 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; + version = "0.7.0"; + sha256 = "0iywpaqp0y1mbysphz438adpj8mvlyr58wr1avj22wwm9n29yhin"; libraryHaskellDepends = [ aeson async base bytestring containers exceptions hashable monad-control mtl QuickCheck stm text transformers unordered-containers uuid wai-transformers websockets websockets-simple ]; - executableHaskellDepends = [ - aeson async base exceptions MonadRandom mtl wai-transformers - websockets websockets-simple - ]; testHaskellDepends = [ - aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck + 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 ]; + homepage = "https://github.com/athanclark/websockets-rpc#readme"; 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, exceptions - , monad-control, stm, wai-transformers, websockets + ({ 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.2"; - sha256 = "1vkq7qp3gkhh9a7g3ickwnb68xdzynaxbbc2rpzpr1x6lik5vi8a"; + version = "0.0.6.3"; + sha256 = "057gm855nqx4rbmhsai4fw4l7p42a40d27567pgnb81chj638w9g"; libraryHaskellDepends = [ - aeson async base bytestring exceptions monad-control stm - wai-transformers websockets + 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; }) {}; - "websockets-simple_0_0_6_3" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, every, exceptions - , hspec, monad-control, stm, tasty, tasty-hspec, transformers - , wai-transformers, websockets + "websockets-simple_0_1_2_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, exceptions + , extractable-singleton, hspec, monad-control-aligned, profunctors + , stm, tasty, tasty-hspec, transformers, vector, wai-transformers + , websockets }: mkDerivation { pname = "websockets-simple"; - version = "0.0.6.3"; - sha256 = "057gm855nqx4rbmhsai4fw4l7p42a40d27567pgnb81chj638w9g"; + version = "0.1.2.1"; + sha256 = "1g3cqbdycjx82px06xvh4q3jjnp71llzsw4v0s815933fgfcck54"; libraryHaskellDepends = [ - aeson async base bytestring every exceptions monad-control stm - transformers wai-transformers websockets + aeson async base bytestring exceptions extractable-singleton + monad-control-aligned profunctors stm transformers vector + wai-transformers websockets + ]; + testHaskellDepends = [ + aeson async base bytestring exceptions extractable-singleton hspec + monad-control-aligned profunctors stm tasty tasty-hspec + transformers vector 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"; + description = "Composable websockets clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -211185,8 +221240,8 @@ self: { }: mkDerivation { pname = "websockets-snap"; - version = "0.10.2.3"; - sha256 = "0zdpim80yyw33k90r22jxac3g6h64jk2f831s3kw9z98l0m4gqlm"; + version = "0.10.2.5"; + sha256 = "14kxk6x5pygxlyn6421lkmc3lld5r545zq5qx6098mgn6bg2yknj"; libraryHaskellDepends = [ base bytestring bytestring-builder io-streams mtl snap-core snap-server websockets @@ -211231,17 +221286,17 @@ self: { }) {}; "wedged" = callPackage - ({ mkDerivation, array, base, colour, containers, diagrams-cairo - , diagrams-lib, MonadRandom, strict + ({ mkDerivation, array, base, colour, containers, diagrams-lib + , diagrams-rasterific, MonadRandom, strict }: mkDerivation { pname = "wedged"; - version = "1"; - sha256 = "1phq3zrx5adclzxri61hr7977jxpq8ycbaan00qxvr3bbk4247g4"; + version = "2"; + sha256 = "1aw29dk0h25zw60m288423bakz36k0jpmzdhy7kq2wns3l5k6jqs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base colour containers diagrams-cairo diagrams-lib + array base colour containers diagrams-lib diagrams-rasterific MonadRandom strict ]; description = "Wedged postcard generator"; @@ -211256,8 +221311,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "0.1.7"; - sha256 = "0mvpy2qzwjdl204k3qfi1cjz44rknzyrc187wp9lvxv40mb2kyd6"; + version = "1.0.3"; + sha256 = "14hmxg7p2mq3lh7ydmjk22xr95hd37q3c95d3k6rqi2jxhjs1gvp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -211270,20 +221325,17 @@ self: { }) {}; "weigh" = callPackage - ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl - , process, random, split, template-haskell, temporary - , unordered-containers + ({ mkDerivation, base, deepseq, mtl, process, split + , template-haskell, temporary }: mkDerivation { pname = "weigh"; - version = "0.0.5"; - sha256 = "0s4bk2bglc5bf569zrbap7h6svd96sfgmvmrx57xwyinard7jfz9"; + version = "0.0.7"; + sha256 = "1k5mxk0cn82x1lc1j0ik4sfkr0q4ipa2ls9sm5g39hl6bjwp1lp3"; libraryHaskellDepends = [ base deepseq mtl process split template-haskell temporary ]; - testHaskellDepends = [ - base bytestring-trie containers deepseq random unordered-containers - ]; + testHaskellDepends = [ base deepseq ]; homepage = "https://github.com/fpco/weigh#readme"; description = "Measure allocations of a Haskell functions/values"; license = stdenv.lib.licenses.bsd3; @@ -211555,14 +221607,13 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.0.5"; - sha256 = "0aj0jpj2w46fdzvddc76l62cmcwvsndc1vj6z391bybw4q8khlmd"; + version = "0.1.0.6"; + sha256 = "0y3wdd5kslz71nlk32nvmi3yqd331jjl49njm58bixqanyc0k30x"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ]; homepage = "https://github.com/erikd/wide-word"; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wigner-symbols" = callPackage @@ -211594,6 +221645,7 @@ self: { homepage = "https://github.com/Haskell-mouse/wigner-ville-accelerate"; description = "Wigner-ville transform using the Accelerate library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {wigner = null;}; @@ -211637,13 +221689,15 @@ self: { "wild-bind" = callPackage ({ mkDerivation, base, containers, hspec, microlens, QuickCheck - , stm, text, transformers + , semigroups, stm, text, transformers }: mkDerivation { pname = "wild-bind"; - version = "0.1.0.3"; - sha256 = "0zvkkxmlpfgb107cx2rcp7igsqxhdng88sk4hw6y7bikkd5pdxgj"; - libraryHaskellDepends = [ base containers text transformers ]; + version = "0.1.2.0"; + sha256 = "0c1nb713p11pd89ykwz76i60sk437q9cy48bingiiig1g9dfg3p6"; + libraryHaskellDepends = [ + base containers semigroups text transformers + ]; testHaskellDepends = [ base hspec microlens QuickCheck stm transformers ]; @@ -211658,8 +221712,8 @@ self: { }: mkDerivation { pname = "wild-bind-indicator"; - version = "0.1.0.1"; - sha256 = "0lvhczw0ah8kb1hd9k7rnjcs1pmn0qg1i2v0szvhh2ji8iznjznm"; + version = "0.2.0.0"; + sha256 = "09p7x77ksh9qp4ir5cy470y978m4ln0sp44pffm0mld1apdam27x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers gtk text transformers wild-bind @@ -211675,8 +221729,8 @@ self: { }: mkDerivation { pname = "wild-bind-task-x11"; - version = "0.1.0.1"; - sha256 = "1hvsaa8655wl74sikp59qgmi94285sbdnifynllgxdjdvzm4g4yl"; + version = "0.2.0.1"; + sha256 = "0n8sg0qg0ambh0744c19zwxxky2b0vwpmn464i3mp587dkfpm0p2"; libraryHaskellDepends = [ base text transformers wild-bind wild-bind-indicator wild-bind-x11 ]; @@ -211684,26 +221738,41 @@ self: { homepage = "https://github.com/debug-ito/wild-bind"; description = "Task to install and export everything you need to use WildBind in X11"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-x11" = callPackage - ({ mkDerivation, base, containers, fold-debounce, hspec, QuickCheck - , stm, text, time, transformers, wild-bind, X11 + ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl + , semigroups, stm, text, time, transformers, wild-bind, X11 }: mkDerivation { pname = "wild-bind-x11"; - version = "0.1.0.7"; - sha256 = "0vdhmjkpy09w21xqhrqaxc645ghyb0ify1yq37wrlabqdqqms08d"; + version = "0.2.0.2"; + sha256 = "0vf6jm5gw76hcrwrqmfrq8niwh4z5p2wg0j0rh74wn9vbs6cm8cl"; libraryHaskellDepends = [ - base containers fold-debounce stm text transformers wild-bind X11 + base containers fold-debounce mtl semigroups stm text transformers + wild-bind X11 + ]; + testHaskellDepends = [ + async base hspec text time transformers wild-bind X11 ]; - testHaskellDepends = [ base hspec QuickCheck time wild-bind X11 ]; homepage = "https://github.com/debug-ito/wild-bind"; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; }) {}; + "wilton-ffi" = callPackage + ({ mkDerivation, aeson, base, bytestring, utf8-string }: + mkDerivation { + pname = "wilton-ffi"; + version = "0.2.0.0"; + sha256 = "1n2cgf0cnpr7f9rgf2369qnz3mm1qvylpzncc7s42vcrrq4x3wj7"; + libraryHaskellDepends = [ aeson base bytestring utf8-string ]; + homepage = "https://github.com/wilton-iot/wilton-ffi#readme"; + description = "Haskell modules support for Wilton JavaScript runtime"; + license = stdenv.lib.licenses.mit; + }) {}; + "win-hp-path" = callPackage ({ mkDerivation, base, process, split }: mkDerivation { @@ -211725,8 +221794,8 @@ self: { pname = "windns"; version = "0.1.0.0"; sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c"; - revision = "1"; - editedCabalFile = "0kz6gv4dpppnnnyl57ibxi9gvykmkbmaz22yssx92mq306wbyimv"; + revision = "2"; + editedCabalFile = "19n1nb65mgz9rdp37z7sdmjxwcl2wnlrflqcwbhr99ly2anx0sy7"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library"; @@ -211807,6 +221876,7 @@ self: { homepage = "https://github.com/winterland1989/wire-streams"; description = "Fast binary io-streams adapter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wires" = callPackage @@ -211815,8 +221885,8 @@ self: { }: mkDerivation { pname = "wires"; - version = "0.2.0"; - sha256 = "1c4ic3v3rrqanr6n3yhm8vy5i8sn5lwraks09kav60f4cc42s1nx"; + version = "0.2.1"; + sha256 = "0dh0kpmja296miax80y3qqq3s8rmab4d7yqdcxrhmy9gzq350hri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211843,6 +221913,7 @@ self: { homepage = "http://github.com/seanparsons/wiring/"; description = "Wiring, promotion and demotion of types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wiringPi" = callPackage @@ -211891,8 +221962,8 @@ self: { }: mkDerivation { pname = "withdependencies"; - version = "0.2.4.1"; - sha256 = "16mxhm0as0598z4w4rhfqxbnasjnzlzsb5nj12b7m8hdg5cg3x6a"; + version = "0.2.4.2"; + sha256 = "04pk5giqlnls1p62fz9p0sb1288c9qk3ivsq2kb5207cjifyslgz"; libraryHaskellDepends = [ base conduit containers mtl profunctors ]; @@ -211903,23 +221974,6 @@ self: { }) {}; "witherable" = callPackage - ({ mkDerivation, base, base-orphans, containers, hashable - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "witherable"; - version = "0.1.3.4"; - sha256 = "0rqdbxl5381bfvy75bdgr8q40g1ypqgfj29ca5lzsykw5d7i4nzl"; - libraryHaskellDepends = [ - base base-orphans containers hashable transformers - unordered-containers vector - ]; - homepage = "https://github.com/fumieval/witherable"; - description = "filterable traversable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "witherable_0_2" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable , transformers, unordered-containers, vector }: @@ -211934,7 +221988,6 @@ self: { homepage = "https://github.com/fumieval/witherable"; description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witness" = callPackage @@ -212006,6 +222059,8 @@ self: { pname = "wl-pprint"; version = "1.2"; sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r"; + revision = "1"; + editedCabalFile = "04w1mm6c0k39x3aglrz5rgqjxszxb6jld0s7qrl4zhndl92nzi5c"; libraryHaskellDepends = [ base ]; description = "The Wadler/Leijen Pretty Printer"; license = stdenv.lib.licenses.bsd3; @@ -212113,6 +222168,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wl-pprint-text_1_1_1_1" = callPackage + ({ mkDerivation, base, base-compat, text }: + mkDerivation { + pname = "wl-pprint-text"; + version = "1.1.1.1"; + sha256 = "1v227rc24ibb6qxiyhq9v9hv8ilkrm6i1snl5icblm8zgvpymplb"; + libraryHaskellDepends = [ base base-compat text ]; + description = "A Wadler/Leijen Pretty Printer for Text values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wlc-hs" = callPackage ({ mkDerivation, base, c2hs, containers, data-default, lens, pretty , process, transformers, wlc, xkbcommon @@ -212203,13 +222270,13 @@ self: { "wolf" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring , conduit, directory, filepath, http-types, lifted-async - , lifted-base, optparse-generic, preamble, process, shakers, time - , uuid, yaml + , lifted-base, optparse-generic, preamble, process, time, uuid + , yaml }: mkDerivation { pname = "wolf"; - version = "0.3.34"; - sha256 = "1g4sh2k0wkz847pxkjcpm21mf22z5lp4j428sqkvklgry1wk512q"; + version = "0.3.44"; + sha256 = "096j1f0xzjrnk8z7niyx19w05nx5222rgfbhgx8df8jwhfz0ymw7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212217,7 +222284,7 @@ self: { filepath http-types lifted-async lifted-base preamble process time uuid yaml ]; - executableHaskellDepends = [ base optparse-generic shakers ]; + executableHaskellDepends = [ base optparse-generic ]; homepage = "https://github.com/swift-nav/wolf"; description = "Amazon Simple Workflow Service Wrapper"; license = stdenv.lib.licenses.mit; @@ -212298,6 +222365,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "word2vec-model" = callPackage + ({ mkDerivation, attoparsec, base, binary, binary-ieee754 + , bytestring, conduit, conduit-combinators, conduit-extra, hspec + , HUnit, text, unordered-containers, vector + }: + mkDerivation { + pname = "word2vec-model"; + version = "0.1.0.0"; + sha256 = "1dz6q7ym5z5l0pkzmvawpdpjh8z6pf5ph26m0b7k9q95q42qypmj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base binary binary-ieee754 bytestring text + unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec base binary binary-ieee754 bytestring conduit + conduit-combinators conduit-extra text unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base binary binary-ieee754 bytestring hspec HUnit text + unordered-containers vector + ]; + homepage = "https://gonito.net/gitlist/word2vec-model.git"; + description = "Reading word2vec binary models"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "word8" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec }: mkDerivation { @@ -212314,23 +222410,25 @@ self: { "wordchoice" = callPackage ({ mkDerivation, base, binary, bytestring, Chart, Chart-diagrams , composition-prelude, containers, criterion, directory, Glob, lens - , optparse-applicative, pandoc, system-filepath, text + , optparse-applicative, pandoc, system-filepath, text, transformers }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.1"; - sha256 = "0b9la9lh00x0rnh4mpgl8djgik72x75q5070r96ibzkl5hp6483w"; + version = "0.1.2.6"; + sha256 = "16x595vv9fbq6j634a8wqnd1agmzbv09372sc99lq1a997crmq2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring Chart Chart-diagrams composition-prelude - containers directory Glob lens optparse-applicative pandoc - system-filepath text + containers directory Glob lens pandoc system-filepath text + transformers + ]; + executableHaskellDepends = [ + base binary bytestring containers directory lens + optparse-applicative text ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/githubuser/wordchoice#readme"; + benchmarkHaskellDepends = [ base criterion pandoc text ]; description = "Get word counts and distributions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -212464,6 +222562,7 @@ self: { 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "workflow-osx" = callPackage @@ -212531,18 +222630,13 @@ self: { }) {}; "workflow-windows" = callPackage - ({ mkDerivation, base, c-storable-deriving, doctest, free, hspec - , QuickCheck, StateVar, transformers, workflow-types - }: + ({ mkDerivation, base, doctest, hspec, QuickCheck }: mkDerivation { pname = "workflow-windows"; version = "0.0.0"; sha256 = "14pzzm7c17sg76lmxjaw0d5avgpafgj4q66diqmh502mx8k2z4jc"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base c-storable-deriving free StateVar transformers workflow-types - ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hspec QuickCheck ]; homepage = "http://github.com/sboosali/workflow-windows#readme"; @@ -212551,6 +222645,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "world-peace" = callPackage + ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors + , tagged + }: + mkDerivation { + pname = "world-peace"; + version = "0.1.0.0"; + sha256 = "19anwyh9n9agpcdhzfbh0l28nm0mdn8616klihbw55yxkiwqaxkk"; + libraryHaskellDepends = [ aeson base deepseq profunctors tagged ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/world-peace"; + description = "Open Union and Open Product Types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wp-archivebot" = callPackage ({ mkDerivation, base, feed, HTTP, network, parallel, tagsoup }: mkDerivation { @@ -212613,43 +222722,38 @@ self: { }) {}; "wrecker" = callPackage - ({ mkDerivation, aeson, aeson-qq, ansi-terminal, ansigraph, array + ({ mkDerivation, aeson, ansi-terminal, ansigraph, array , authenticate-oauth, base, base64-bytestring, blaze-builder , bytestring, case-insensitive, clock, clock-extras, connection , containers, cookie, cryptonite, data-default, data-default-class - , deepseq, exceptions, filepath, hspec, hspec-discover, http-client + , deepseq, exceptions, fast-logger, filepath, http-client , http-client-tls, http-types, immortal, lens, markdown-unlit , memory, mime-types, network, network-uri, next-ref - , optparse-applicative, random, scotty, statistics, stm, stm-chans + , optparse-applicative, random, statistics, stm, stm-chans , streaming-commons, tabular, tdigest, text, threads - , threads-extras, time, tls, transformers, unagi-chan, unix - , unordered-containers, vector, vty, wai, warp, wreq + , threads-extras, time, tls, transformers, unix + , unordered-containers, vector, vty, wreq }: mkDerivation { pname = "wrecker"; - version = "1.2.2.0"; - sha256 = "03iw04jg3lmar97l9mhgd5kabfjps1dh84s7r5p9cbc6rsy5knsh"; + version = "1.3.1.0"; + sha256 = "0z0a9k88npw09n54mplg2aa98y4p8kmk14v8ks2dc2ilf24lrri7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal ansigraph array authenticate-oauth base base64-bytestring blaze-builder bytestring case-insensitive clock clock-extras connection containers cookie cryptonite data-default - data-default-class deepseq exceptions filepath http-client - http-client-tls http-types immortal memory mime-types network - network-uri next-ref optparse-applicative random statistics stm - stm-chans streaming-commons tabular tdigest text threads - threads-extras time tls transformers unagi-chan unix - unordered-containers vector vty wreq + data-default-class deepseq exceptions fast-logger filepath + http-client http-client-tls http-types immortal memory mime-types + network network-uri next-ref optparse-applicative random statistics + stm stm-chans streaming-commons tabular tdigest text threads + threads-extras time tls transformers unix unordered-containers + vector vty wreq ]; executableHaskellDepends = [ base http-client http-client-tls lens markdown-unlit - optparse-applicative wreq - ]; - testHaskellDepends = [ - aeson aeson-qq base bytestring connection hspec hspec-discover - http-client immortal markdown-unlit network next-ref scotty text - transformers unordered-containers wai warp wreq + optparse-applicative transformers wreq ]; homepage = "https://github.com/lorenzo/wrecker#readme"; description = "An HTTP Performance Benchmarker"; @@ -212670,8 +222774,8 @@ self: { }: mkDerivation { pname = "wrecker-ui"; - version = "3.0.0.0"; - sha256 = "0plzkb9bhsrd14h07f6rd9689hxx79kdr9gs5r5qsxsk3zpn4rs6"; + version = "3.3.1.0"; + sha256 = "08xlf26c45nir84ayss6zsjimabwa17yk55hzrdl1li9448wq89p"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -212685,6 +222789,7 @@ self: { postgresql-simple postgresql-simple-url process resource-pool resourcet scotty stm temporary text time transformers wai-cors ]; + homepage = "https://github.com/seatgeek/wrecker-ui#readme"; description = "A web interface for Wrecker, the HTTP Performance Benchmarker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -212693,64 +222798,27 @@ self: { "wreq" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring - , byteable, bytestring, case-insensitive, containers, cryptohash - , directory, doctest, exceptions, filepath, ghc-prim, hashable - , http-client, http-client-tls, http-types, HUnit, lens, lens-aeson - , mime-types, network-info, psqueues, QuickCheck, snap-core - , snap-server, template-haskell, temporary, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , time-locale-compat, transformers, unix-compat - , unordered-containers, uuid, vector - }: - mkDerivation { - pname = "wreq"; - version = "0.5.0.1"; - sha256 = "138n138rczs5xb7pr25b5a2ajhhxph7vfrh02x71w2alh2xr4akc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec authenticate-oauth base base16-bytestring byteable - bytestring case-insensitive containers cryptohash exceptions - ghc-prim hashable http-client http-client-tls http-types lens - lens-aeson mime-types psqueues template-haskell text time - time-locale-compat unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bytestring - case-insensitive containers directory doctest filepath hashable - http-client http-types HUnit lens lens-aeson network-info - QuickCheck snap-core snap-server temporary test-framework - test-framework-hunit test-framework-quickcheck2 text time - transformers unix-compat unordered-containers uuid vector - ]; - homepage = "http://www.serpentine.com/wreq"; - description = "An easy-to-use HTTP client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wreq_0_5_1_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec - , authenticate-oauth, base, base16-bytestring, base64-bytestring - , byteable, bytestring, case-insensitive, containers, cryptohash - , directory, doctest, exceptions, filepath, ghc-prim, hashable - , http-client, http-client-tls, http-types, HUnit, lens, lens-aeson - , mime-types, network-info, psqueues, QuickCheck, snap-core - , snap-server, template-haskell, temporary, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , time-locale-compat, transformers, unix-compat + , bytestring, Cabal, cabal-doctest, case-insensitive, containers + , cryptonite, directory, doctest, exceptions, filepath, ghc-prim + , hashable, http-client, http-client-tls, http-types, HUnit, lens + , lens-aeson, memory, mime-types, network-info, psqueues + , QuickCheck, snap-core, snap-server, template-haskell, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, transformers, unix-compat , unordered-containers, uuid, vector }: mkDerivation { pname = "wreq"; - version = "0.5.1.0"; - sha256 = "1p8cn9yzm2ggb3kac17xc3if6sdxjdh544k730imvvhm0szx4j76"; + version = "0.5.2.1"; + sha256 = "0dqj94lky93jwrkq65pn4nfl2cv8yjgqaxdwbvfyr6vhinrnkl5k"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - aeson attoparsec authenticate-oauth base base16-bytestring byteable - bytestring case-insensitive containers cryptohash exceptions + aeson attoparsec authenticate-oauth base base16-bytestring + bytestring case-insensitive containers cryptonite exceptions ghc-prim hashable http-client http-client-tls http-types lens - lens-aeson mime-types psqueues template-haskell text time + lens-aeson memory mime-types psqueues template-haskell text time time-locale-compat unordered-containers ]; testHaskellDepends = [ @@ -212764,7 +222832,6 @@ self: { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wreq-sb" = callPackage @@ -212810,13 +222877,12 @@ self: { ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: mkDerivation { pname = "wreq-stringless"; - version = "0.5.1.0"; - sha256 = "1f23f1dxim8xkx7jj0z7fr4xjpmxc8cr0rbh84hhb359mkfklhvf"; + version = "0.5.9.1"; + sha256 = "0dgjjybbc4nza1a0af2j8jxscyhlcwdspmvy8zsmcczzcdhx2b2h"; libraryHaskellDepends = [ base bytestring text utf8-string wreq ]; homepage = "https://github.com/j-keck/wreq-stringless#readme"; description = "Simple wrapper to use wreq without Strings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wright" = callPackage @@ -212971,23 +223037,26 @@ self: { }) {}; "ws" = callPackage - ({ mkDerivation, async, base, bytestring, exceptions, haskeline - , mtl, network, network-uri, optparse-applicative, text, websockets - , wuss + ({ mkDerivation, async, attoparsec, attoparsec-uri, base + , bytestring, exceptions, haskeline, mtl, network + , optparse-applicative, strict, text, vector, websockets, wuss }: mkDerivation { pname = "ws"; - version = "0.0.1"; - sha256 = "1i9jglq199pwxs9giigf3xgndspiwp30s2fb833mc7fl5s5mghhh"; + version = "0.0.4"; + sha256 = "00jz7a7x260ix2rg46bmp6c3rjnra9c7j4p0in7cpk2iap28106q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring exceptions haskeline mtl network network-uri - text websockets wuss + async attoparsec-uri base bytestring exceptions haskeline mtl + network text websockets wuss ]; executableHaskellDepends = [ - base exceptions network-uri optparse-applicative + async attoparsec attoparsec-uri base bytestring exceptions + haskeline mtl network optparse-applicative strict text vector + websockets wuss ]; + homepage = "https://github.com/athanclark/ws#readme"; description = "A simple CLI utility for interacting with a websocket"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -213054,6 +223123,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wsjtx-udp" = callPackage + ({ mkDerivation, aeson, base, binary, binary-parsers, bytestring + , network, text, time + }: + mkDerivation { + pname = "wsjtx-udp"; + version = "0.1.0.6"; + sha256 = "04c44jbpnplil3l69s1bvn2dk2jbs4vkf82vlxpfrljnpfckllbc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary binary-parsers bytestring network text time + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/MarcFontaine/wsjtx-udp"; + description = "WSJT-X UDP protocol"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wtk" = callPackage ({ mkDerivation, base, old-locale, time, transformers }: mkDerivation { @@ -213171,8 +223260,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.5"; - sha256 = "0n7sixmvy084hggvagkd9nq06gxhisrklm1b8fahkjylahbzh2qd"; + version = "1.1.8"; + sha256 = "1isw32n4qdaip350928v7v7cph4p4sb28hva5vd3jvq4309n65df"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -213192,7 +223281,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxAsteroids" = callPackage @@ -213208,7 +223297,7 @@ self: { homepage = "https://wiki.haskell.org/WxAsteroids"; description = "Try to avoid the asteroids with your space ship"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxFruit" = callPackage @@ -213261,7 +223350,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; @@ -213283,7 +223372,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell core"; license = "unknown"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) wxGTK;}; "wxdirect" = callPackage @@ -213302,6 +223391,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "helper tool for building wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxhnotepad" = callPackage @@ -213431,10 +223521,10 @@ self: { }: mkDerivation { pname = "x509"; - version = "1.7.2"; - sha256 = "0yyfw07bw73gkh93z653lnncc30wj3g3rf26cwxjpyxvwalia0yw"; + version = "1.7.3"; + sha256 = "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21"; revision = "1"; - editedCabalFile = "07mphpmj4zk5mzhp5x50a7q6w134kgymf557dcgbp643cbkcmc66"; + editedCabalFile = "06zzirygvzp0ssdg9blipdwmd0b41p4gxh3ldai7ngjyjsdclwsx"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -213455,8 +223545,8 @@ self: { }: mkDerivation { pname = "x509-store"; - version = "1.6.5"; - sha256 = "1lg9gy0bmzjmlk4gfnzx2prfar1qha4hfjsw8yvjg33zm0fv3ahs"; + version = "1.6.6"; + sha256 = "0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring containers cryptonite directory filepath mtl pem x509 @@ -213502,24 +223592,22 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Utility for X509 certificate and chain"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-validation" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, base, byteable - , bytestring, containers, cryptonite, data-default-class, hourglass - , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store + ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring + , containers, cryptonite, data-default-class, hourglass, memory + , mtl, pem, tasty, tasty-hunit, x509, x509-store }: mkDerivation { pname = "x509-validation"; - version = "1.6.9"; - sha256 = "005m5jxjz5cx3lriayv4a17xa19qc2qxw7kz2f9wvj7hgjnwww44"; + version = "1.6.10"; + sha256 = "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n"; revision = "1"; - editedCabalFile = "02n9s0wizi4wivs6is4cyapqjjnbrx3zdk34q0cnlfsvbbvyhjax"; + editedCabalFile = "1isap8v1gh31q4pj3gn155ya8nd1da0a5a3cryqh4yhf0ivbwl0w"; libraryHaskellDepends = [ - asn1-encoding asn1-types base byteable bytestring containers - cryptonite data-default-class hourglass memory mtl pem x509 - x509-store + asn1-encoding asn1-types base bytestring containers cryptonite + data-default-class hourglass memory mtl pem x509 x509-store ]; testHaskellDepends = [ asn1-encoding asn1-types base bytestring cryptonite @@ -213581,15 +223669,14 @@ self: { homepage = "https://github.com/polachok/xbattbar"; description = "Simple battery indicator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xcb-types" = callPackage ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.8.0"; - sha256 = "02ym42r556ibzh7s937blgmkfpb6bqrgz100vwccyljwrwddzdbd"; + version = "0.9.0"; + sha256 = "14bxm6djq4571w313q0qj3v2mfrb2ji2cy0sgl5fh5bsbk2m5i3g"; libraryHaskellDepends = [ base containers mtl pretty xml ]; homepage = "http://community.haskell.org/~aslatter/code/xcb-types"; description = "Parses XML files used by the XCB project"; @@ -213604,8 +223691,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.5.1"; - sha256 = "13dpi3g53mj2la9n2igidcnb4376nqkv9z09nx0g2yq6hix7ng8x"; + version = "0.6.0"; + sha256 = "1cwwj68lfz51npkll4w024555rq9ra86xh4j9ksd1fqgadzf4rwn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213685,6 +223772,7 @@ self: { homepage = "https://github.com/JanGe/xdcc"; description = "A wget-like utility for retrieving files from XDCC bots on IRC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xdg-basedir" = callPackage @@ -213732,7 +223820,7 @@ self: { ]; description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xeno" = callPackage @@ -213742,8 +223830,8 @@ self: { }: mkDerivation { pname = "xeno"; - version = "0.2"; - sha256 = "09nd0z1ysgjj6wb6xzjkn1fbrbk88l0kdqj7vfqyr6q890c3cmmg"; + version = "0.3.3"; + sha256 = "034d38kcgpil1xf32cl131jh7b0x8awhxwv1nnc790x5wn876c0x"; libraryHaskellDepends = [ array base bytestring deepseq mtl mutable-containers vector ]; @@ -213785,8 +223873,6 @@ self: { libraryHaskellDepends = [ base glib ]; libraryPkgconfigDepends = [ libxfconf ]; libraryToolDepends = [ gtk2hs-buildtools ]; - executablePkgconfigDepends = [ libxfconf ]; - executableToolDepends = [ gtk2hs-buildtools ]; homepage = "http://patch-tag.com/r/obbele/xfconf/home"; description = "FFI bindings to xfconf"; license = stdenv.lib.licenses.gpl3; @@ -213892,12 +223978,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xhtml_3000_2_2" = callPackage + "xhtml_3000_2_2_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "xhtml"; - version = "3000.2.2"; - sha256 = "0z34m5jfvjyzqjr81kk6mp2dyf0iay5zl8xlzwl3k5zdfl5hsz74"; + version = "3000.2.2.1"; + sha256 = "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; @@ -214014,7 +224100,7 @@ self: { benchmarkHaskellDepends = [ base random time vector ]; description = "Haskell bindings for libxkbcommon"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libxkbcommon;}; "xkcd" = callPackage @@ -214037,7 +224123,7 @@ self: { }) {}; "xleb" = callPackage - ({ mkDerivation, base, containers, mtl, pretty-show, xml }: + ({ mkDerivation, base, containers, mtl, xml }: mkDerivation { pname = "xleb"; version = "0.1.0"; @@ -214047,11 +224133,9 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl xml ]; - executableHaskellDepends = [ base pretty-show xml ]; homepage = "https://github.com/aisamanra/xleb"; description = "A simple monadic language for parsing XML structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xls" = callPackage @@ -214060,8 +224144,8 @@ self: { }: mkDerivation { pname = "xls"; - version = "0.1.0"; - sha256 = "1w23dqrzc532vgzsmjkks1hm1r0i4jnj1bfxak9c71j9svna50n5"; + version = "0.1.1"; + sha256 = "0a09zw90xiaklr68w932md38s95jzwid914lw7frnf3qd8j12xq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214074,7 +224158,6 @@ self: { homepage = "http://github.com/harendra-kumar/xls"; description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xlsior" = callPackage @@ -214102,31 +224185,33 @@ self: { }) {}; "xlsx" = callPackage - ({ mkDerivation, base, base64-bytestring, binary-search, bytestring - , conduit, containers, data-default, Diff, errors, extra, filepath - , groom, lens, mtl, mtl-compat, network-uri, old-locale - , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit - , tasty-smallcheck, text, time, transformers, vector, xml-conduit - , zip-archive, zlib + ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search + , bytestring, conduit, containers, criterion, data-default, deepseq + , Diff, errors, extra, filepath, groom, lens, mtl, network-uri + , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xeno + , xml-conduit, zip-archive, zlib }: mkDerivation { pname = "xlsx"; - version = "0.6.0"; - sha256 = "1a6xvk8b0lsqr3m712879vr3z84snkzcfb9ykikf2azz69kn7y4k"; + version = "0.7.2"; + sha256 = "00qigyz4nc23abawapxhw0sgmj9c5qplkkvyv6xxffanx9kh8mmj"; 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 + attoparsec base base64-bytestring binary-search bytestring conduit + containers data-default deepseq errors extra filepath lens mtl + network-uri old-locale safe text time transformers vector xeno + 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 ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; 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 @@ -214135,8 +224220,8 @@ self: { }: mkDerivation { pname = "xlsx-tabular"; - version = "0.2.2"; - sha256 = "0mjmyx7bnbzbwvfiwgsmchl9gyzhn0dbvmr2bwcg4fmddqzmrnfl"; + version = "0.2.2.1"; + sha256 = "0bgxs1a0prnq6ljvv1g3rs39565w4609hv3ckq0gk0fz85yqkpa8"; libraryHaskellDepends = [ aeson base bytestring containers data-default lens text xlsx ]; @@ -214144,6 +224229,7 @@ self: { homepage = "https://github.com/kkazuo/xlsx-tabular"; description = "Xlsx table cell value extraction utility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xlsx-templater" = callPackage @@ -214180,14 +224266,15 @@ self: { "xml-basic" = callPackage ({ mkDerivation, base, containers, data-accessor - , explicit-exception, utility-ht + , explicit-exception, semigroups, utility-ht }: mkDerivation { pname = "xml-basic"; - version = "0.1.2"; - sha256 = "1s8415gj65zm6mbbrmkav92zkwi0q8mf892ajc2qz9hfmhxab27q"; + version = "0.1.3"; + sha256 = "0ma3bjjsvijknmdnywfk5ch9v5pymxbmkwgzzq58iiv26hkd3n4q"; libraryHaskellDepends = [ - base containers data-accessor explicit-exception utility-ht + base containers data-accessor explicit-exception semigroups + utility-ht ]; description = "Basics for XML/HTML representation and processing"; license = stdenv.lib.licenses.bsd3; @@ -214211,20 +224298,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xml-conduit" = callPackage + "xml-conduit_1_7_1_2" = 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 + , data-default-class, deepseq, hspec, HUnit, monad-control + , resourcet, text, transformers, xml-types }: mkDerivation { pname = "xml-conduit"; - version = "1.5.1"; - sha256 = "0d4pb9d0mdz9djh8aiy5r8088rqh7w34mbqmg8mmaq1i7vx2dzks"; + version = "1.7.1.2"; + sha256 = "0n4k0rq9j5cc9kdvj9xbx8gmiqlyk5x6pw8yxzw5wfsw7qkych2s"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring - conduit conduit-extra containers data-default deepseq monad-control - resourcet text transformers xml-types + conduit conduit-extra containers data-default-class deepseq + monad-control resourcet text transformers xml-types ]; testHaskellDepends = [ base blaze-markup bytestring conduit containers hspec HUnit @@ -214233,22 +224320,23 @@ self: { 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_1_7_0" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers + "xml-conduit" = callPackage + ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup + , bytestring, conduit, conduit-extra, containers , data-default-class, deepseq, hspec, HUnit, monad-control , resourcet, text, transformers, xml-types }: mkDerivation { pname = "xml-conduit"; - version = "1.7.0"; - sha256 = "0g0a6h52n6q3w09350d6vgjpvb6xj224isp4lphgwbmd2xr12i76"; + version = "1.8.0"; + sha256 = "0di0ll2p4ykqnlipf2jrlalirxdf9wkli292245rgr3vcb9vz0h3"; libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - conduit conduit-extra containers data-default-class deepseq - monad-control resourcet text transformers xml-types + attoparsec base blaze-html blaze-markup bytestring conduit + conduit-extra containers data-default-class deepseq monad-control + resourcet text transformers xml-types ]; testHaskellDepends = [ base blaze-markup bytestring conduit containers hspec HUnit @@ -214257,7 +224345,6 @@ self: { 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 @@ -214283,25 +224370,24 @@ self: { "xml-conduit-parse" = callPackage ({ mkDerivation, base, conduit, conduit-parse, containers - , data-default, exceptions, hlint, parsers, resourcet, tasty - , tasty-hunit, text, xml-conduit, xml-types + , data-default, exceptions, parsers, resourcet, tasty, tasty-hunit + , text, xml-conduit, xml-types }: mkDerivation { pname = "xml-conduit-parse"; - version = "0.3.1.1"; - sha256 = "1i20smw7cs2bjh7z1606grac779a60fcwpc8qrqavagbmkhx0ba8"; + version = "0.3.1.2"; + sha256 = "0233jcpv7lzan2hh6siw2rrjkjp4f5i1kkpjpdfija01f8by3an1"; libraryHaskellDepends = [ base conduit conduit-parse containers exceptions parsers text xml-conduit xml-types ]; testHaskellDepends = [ - base conduit conduit-parse data-default hlint parsers resourcet - tasty tasty-hunit + base conduit conduit-parse data-default parsers resourcet tasty + tasty-hunit ]; homepage = "https://github.com/k0ral/xml-conduit-parse"; description = "Streaming XML parser based on conduits"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-writer" = callPackage @@ -214382,8 +224468,8 @@ self: { }: mkDerivation { pname = "xml-hamlet"; - version = "0.4.1.1"; - sha256 = "0bfhk3hdg70j91g5i9ygz0nmbpffnxa4kh5h828fdgml54i5sv2d"; + version = "0.5.0"; + sha256 = "18qmj14jzh379fni477h5hrzcy1x7dajfczx1s3w4wiyv2mc1kkv"; libraryHaskellDepends = [ base containers parsec shakespeare template-haskell text xml-conduit @@ -214492,6 +224578,30 @@ self: { homepage = "https://github.com/typeable/xml-isogen"; description = "Generate XML-isomorphic types"; license = stdenv.lib.licenses.mit; + }) {}; + + "xml-isogen_0_3_0" = callPackage + ({ mkDerivation, base, data-default, deepseq, dom-parser + , generic-arbitrary, hspec, lens, mtl, QuickCheck + , quickcheck-instances, semigroups, template-haskell, text + , xml-conduit, xml-conduit-writer + }: + mkDerivation { + pname = "xml-isogen"; + version = "0.3.0"; + sha256 = "05qa83jzmfqa5yhzgp3n3bxi0dvyy9xdfgq1ymi0wa6xnmxjv0cz"; + libraryHaskellDepends = [ + base deepseq dom-parser lens mtl QuickCheck semigroups + template-haskell text xml-conduit xml-conduit-writer + ]; + testHaskellDepends = [ + base data-default deepseq dom-parser generic-arbitrary hspec + QuickCheck quickcheck-instances semigroups xml-conduit + xml-conduit-writer + ]; + homepage = "https://github.com/typeable/xml-isogen"; + description = "Generate XML-isomorphic types"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -214620,6 +224730,7 @@ self: { homepage = "https://github.com/sannsyn/xml-query"; description = "A parser-agnostic declarative API for querying XML-documents"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-query-xml-conduit" = callPackage @@ -214811,6 +224922,72 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xmlbf" = callPackage + ({ mkDerivation, base, bytestring, containers, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "xmlbf"; + version = "0.4"; + sha256 = "1f63ibvv7ywly7paam238y4bjhvg7jmn87368dnv5lsz28mq432m"; + libraryHaskellDepends = [ + base bytestring containers text transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck text transformers unordered-containers + ]; + homepage = "https://gitlab.com/k0001/xmlbf"; + description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "xmlbf-xeno" = callPackage + ({ mkDerivation, base, bytestring, html-entities, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , unordered-containers, xeno, xmlbf + }: + mkDerivation { + pname = "xmlbf-xeno"; + version = "0.1.1"; + sha256 = "0cnxcw1sh92ljcpla2j7pg0md8yj7j48jgjlsn0f9ha0j90lw73c"; + libraryHaskellDepends = [ + base bytestring html-entities text unordered-containers xeno xmlbf + ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck text unordered-containers xmlbf + ]; + homepage = "https://gitlab.com/k0001/xmlbf"; + description = "xeno backend support for the xmlbf library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "xmlbf-xmlhtml" = callPackage + ({ mkDerivation, base, bytestring, html-entities, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , unordered-containers, xmlbf, xmlhtml + }: + mkDerivation { + pname = "xmlbf-xmlhtml"; + version = "0.1.1"; + sha256 = "0x8fr4dqa1i3ylwh98r69xavrfgl2i97s9iili14wpqap0pg8aa4"; + libraryHaskellDepends = [ + base bytestring html-entities text unordered-containers xmlbf + xmlhtml + ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck text unordered-containers xmlbf + ]; + homepage = "https://gitlab.com/k0001/xmlbf"; + description = "xmlhtml backend support for the xmlbf library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmlgen" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text @@ -214818,8 +224995,8 @@ self: { }: mkDerivation { pname = "xmlgen"; - version = "0.6.2.1"; - sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh"; + version = "0.6.2.2"; + sha256 = "1milbbr2iqwckqbq6i9sypinvs4hs7mzqn274x350psjfy6ajvwj"; libraryHaskellDepends = [ base blaze-builder bytestring containers mtl text ]; @@ -214839,8 +225016,8 @@ self: { }: mkDerivation { pname = "xmlhtml"; - version = "0.2.5.1"; - sha256 = "1m8jiadx7s990xxdw03ac43c4vxa391kgci77axqx6bkai2yak8k"; + version = "0.2.5.2"; + sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -214848,11 +225025,11 @@ self: { testHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers directory hspec HUnit text + unordered-containers ]; homepage = "https://github.com/snapframework/xmlhtml"; description = "XML parser and renderer with HTML 5 quirks mode"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmltv" = callPackage @@ -214911,27 +225088,32 @@ self: { "xmobar" = callPackage ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring - , containers, dbus, directory, filepath, hinotify, HTTP, libmpd - , libXpm, libXrandr, libXrender, mtl, old-locale, parsec, process - , regex-compat, stm, time, timezone-olson, timezone-series - , transformers, unix, utf8-string, wirelesstools, X11, X11-xft + , containers, dbus, directory, filepath, hinotify, hspec, HTTP + , iwlib, libmpd, libXpm, libXrandr, libXrender, mtl, old-locale + , parsec, process, regex-compat, stm, time, timezone-olson + , timezone-series, transformers, unix, utf8-string, wirelesstools + , X11, X11-xft }: mkDerivation { pname = "xmobar"; - version = "0.24.5"; - sha256 = "0sdzfj2wa4wpig1i2i5n9qpwm90jp88qifsmaa7j37yhhs6snfir"; + version = "0.26"; + sha256 = "19g40vqj3cs94i27f66194k7d5cazrv1lx54bz9kc0qy2npxjzgz"; configureFlags = [ "-fall_extensions" ]; isLibrary = false; isExecutable = true; executableHaskellDepends = [ alsa-core alsa-mixer base bytestring containers dbus directory - filepath hinotify HTTP libmpd mtl old-locale parsec process + filepath hinotify HTTP iwlib libmpd mtl old-locale parsec process regex-compat stm time timezone-olson timezone-series transformers unix utf8-string X11 X11-xft ]; executableSystemDepends = [ libXpm libXrandr libXrender wirelesstools ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec mtl old-locale + parsec process regex-compat stm time transformers unix X11 + ]; homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; @@ -215122,24 +225304,22 @@ self: { homepage = "https://github.com/LeifW/xmonad-utils"; description = "A small collection of X utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xmonad-vanessa" = callPackage - ({ mkDerivation, base, composition, containers, hspec, process - , transformers, X11, xmonad, xmonad-contrib + ({ mkDerivation, base, composition-prelude, containers, hspec + , process, transformers, X11, xmonad, xmonad-contrib }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.1.4"; - sha256 = "1qbapbb72qa78n174x8y9q2zzb1g1bw6dgg260hxxzc7v9kb88xm"; + version = "0.1.1.8"; + sha256 = "17w7hj4bgz1xkirj9dwgkbif4vpqvjnp5g2dvjna7qg5rw2hk3zj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base composition containers process transformers X11 xmonad + base composition-prelude containers process transformers X11 xmonad xmonad-contrib ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec xmonad ]; homepage = "https://hub.darcs.net/vmchale/xmonad-vanessa"; description = "Custom xmonad, which builds with stack or cabal"; @@ -215151,12 +225331,11 @@ self: { ({ mkDerivation, base, magic, mtl, random, unix, xmonad }: mkDerivation { pname = "xmonad-wallpaper"; - version = "0.0.1.3"; - sha256 = "0vw1pcfpsxcaqnq9s5p7my3jr6q38ndm7qd5x7m06wmakcalcbyy"; + version = "0.0.1.4"; + sha256 = "0f6214kqp86xnk1zginjiprnqlj2fzcvh3w5sv3yvqg98mwdd0cg"; libraryHaskellDepends = [ base magic mtl random unix xmonad ]; description = "xmonad wallpaper extension"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-windownames" = callPackage @@ -215366,6 +225545,7 @@ self: { homepage = "https://github.com/tonymorris/xsd"; description = "XML Schema data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xsha1" = callPackage @@ -215424,7 +225604,7 @@ self: { homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xtest" = callPackage @@ -215564,6 +225744,7 @@ self: { homepage = "http://github.com/snoyberg/yackage"; description = "Personal Hackage replacement for testing new packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-finance-api" = callPackage @@ -215573,8 +225754,8 @@ self: { }: mkDerivation { pname = "yahoo-finance-api"; - version = "0.2.0.2"; - sha256 = "0frwwpcf7xwbh28sx6k7v9yw9kswx0wrbqgmsr6kcyzbxl2i54pj"; + version = "0.2.0.3"; + sha256 = "19mwjbz43rp7qdysw3iaa6mhkzk6xkrjd42111ccai75x0372rbx"; libraryHaskellDepends = [ aeson base either http-api-data http-client mtl servant servant-client text time transformers vector @@ -215662,6 +225843,88 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yam-app" = callPackage + ({ mkDerivation, aeson, base, conduit, containers, ctrie + , data-default, directory, exceptions, fast-logger, monad-control + , monad-logger, mtl, persistent, persistent-sqlite, random + , resource-pool, resourcet, string-conversions, text, time + , transformers, unordered-containers, wai-logger, yaml + }: + mkDerivation { + pname = "yam-app"; + version = "0.1.11"; + sha256 = "0qbc7s5l030yilq8zlq5hszk6hgqjxp6yablap1ykm2211wipbq3"; + libraryHaskellDepends = [ + aeson base conduit containers ctrie data-default directory + exceptions fast-logger monad-control monad-logger mtl persistent + persistent-sqlite random resource-pool resourcet string-conversions + text time transformers unordered-containers wai-logger yaml + ]; + homepage = "https://github.com/leptonyu/yam/tree/master/yam-app#readme"; + description = "Yam App"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yam-job" = callPackage + ({ mkDerivation, base, cron, yam-app }: + mkDerivation { + pname = "yam-job"; + version = "0.1.11"; + sha256 = "0hs46q1xwwx44f4zxhs4245cdnr9g4r2a67cm191n1wd86sfhrpc"; + libraryHaskellDepends = [ base cron yam-app ]; + homepage = "https://github.com/leptonyu/yam/tree/master/yam-job#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yam-servant" = callPackage + ({ mkDerivation, aeson, base, http-types, lens, servant + , servant-server, servant-swagger, servant-swagger-ui, swagger2 + , text, wai, wai-extra, warp, yam-app, yam-job + }: + mkDerivation { + pname = "yam-servant"; + version = "0.1.11"; + sha256 = "0z1my2jgcbvdx4v5zh66yw99vnck5rbi54s6adbp26v4szc8j40s"; + libraryHaskellDepends = [ + aeson base http-types lens servant servant-server servant-swagger + servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job + ]; + homepage = "https://github.com/leptonyu/yam/tree/master/yam-app#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yam-transaction-odbc" = callPackage + ({ mkDerivation, base, containers, persistent-odbc, yam-app }: + mkDerivation { + pname = "yam-transaction-odbc"; + version = "0.1.10"; + sha256 = "18nzdzzpykdp42sdsailhinxlrpwcrfys2n967ky9yizj7n8dcrx"; + libraryHaskellDepends = [ + base containers persistent-odbc yam-app + ]; + homepage = "https://github.com/leptonyu/yam/tree/master/yam-transaction-odbc#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yam-transaction-postgresql" = callPackage + ({ mkDerivation, base, containers, persistent-postgresql, yam-app + }: + mkDerivation { + pname = "yam-transaction-postgresql"; + version = "0.1.11"; + sha256 = "1li9vmnnj9xw1j60gmjym9rxlljjic9w7bkxip22yhb6qnmidpc9"; + libraryHaskellDepends = [ + base containers persistent-postgresql yam-app + ]; + homepage = "https://github.com/leptonyu/yam/tree/master/yam-transaction-postgresql#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yamemo" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -215675,47 +225938,17 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat - , bytestring, conduit, containers, directory, filepath, hspec - , HUnit, libyaml, mockery, resourcet, scientific, semigroups - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.8.24"; - sha256 = "08cawq5q2bm23fi48m56x1h6qdf52wn9i9y770v6q2810wj2f7n1"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath resourcet scientific semigroups template-haskell text - transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit directory hspec - HUnit mockery resourcet temporary text transformers - unordered-containers vector - ]; - homepage = "http://github.com/snoyberg/yaml/"; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; - - "yaml_0_8_25" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat - , bytestring, conduit, containers, directory, filepath, hspec - , HUnit, libyaml, mockery, resourcet, scientific, semigroups - , template-haskell, temporary, text, transformers - , unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, resourcet, scientific, semigroups, template-haskell + , temporary, text, transformers, unordered-containers, vector }: mkDerivation { pname = "yaml"; - version = "0.8.25"; - sha256 = "16bx7vkj455796wdklh8h13zm98h5m81dl8np0sjbx9hcsrfdbyp"; + version = "0.8.29"; + sha256 = "0x0gs80cq83i65b7g1xg6dvggkxlxhn1qs3py63c4wsjsplmyphs"; + revision = "1"; + editedCabalFile = "0hxmf36ydqr0gdwiagp57df7fxwhfy99r6s7mj861m8rflha0dks"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -215725,16 +225958,14 @@ self: { transformers unordered-containers vector ]; libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit directory hspec - HUnit mockery resourcet temporary text transformers - unordered-containers vector + aeson base base-compat bytestring conduit directory hspec HUnit + mockery resourcet temporary text transformers unordered-containers + vector ]; homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; "yaml-combinators" = callPackage @@ -215744,8 +225975,8 @@ self: { }: mkDerivation { pname = "yaml-combinators"; - version = "1.1"; - sha256 = "045zi5lipnjw161xz2awr5zwnzhiszsrrpwin64q4r5pxjkh7ala"; + version = "1.1.1"; + sha256 = "0zrvg0ccqn20gj8bbnc3xnlmbvf226qq7synx3q962cw95l53cyl"; libraryHaskellDepends = [ aeson base bytestring generics-sop scientific text transformers unordered-containers vector yaml @@ -215794,8 +226025,8 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.3.3"; - sha256 = "1kqia8i7vi7fbcrlwjv7yn09xnlm34k40qhb050rqzfrmyhpk2kq"; + version = "0.3.3.4"; + sha256 = "1vvwgb302w2nz05c97gzxkjx7m2lp25bpp3l16bzh92mjvqddpbd"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -215927,17 +226158,16 @@ self: { }) {}; "yampa-canvas" = callPackage - ({ mkDerivation, base, blank-canvas, stm, text, time, Yampa }: + ({ mkDerivation, base, blank-canvas, stm, time, Yampa }: mkDerivation { pname = "yampa-canvas"; version = "0.2.2"; sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; - revision = "1"; - editedCabalFile = "0jpksvr3ycw0mraryn113x0b44f0574fkd0n24lbga3ha5armscq"; + revision = "4"; + editedCabalFile = "1bqjfmssgg0jd6j5x727clk6wawbbh0hq8v0qpj4d5bfv4931pkb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; - executableHaskellDepends = [ base blank-canvas text Yampa ]; description = "blank-canvas frontend for Yampa"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -215964,7 +226194,7 @@ self: { "yampa-glut" = callPackage ({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space - , vector-space-opengl, Yampa-core + , Yampa-core }: mkDerivation { pname = "yampa-glut"; @@ -215975,13 +226205,28 @@ self: { libraryHaskellDepends = [ base GLUT newtype OpenGL vector-space Yampa-core ]; - executableHaskellDepends = [ - base GLUT newtype OpenGL vector-space vector-space-opengl - Yampa-core - ]; homepage = "https://github.com/ony/yampa-glut"; description = "Connects Yampa and GLUT"; license = stdenv.lib.licenses.gpl3; + }) {}; + + "yampa-sdl2" = callPackage + ({ mkDerivation, base, data-memocombinators, linear, sdl2, StateVar + , text, vector, Yampa + }: + mkDerivation { + pname = "yampa-sdl2"; + version = "0.1.0.2"; + sha256 = "17wcfb04dvdfcx8s21f36g4s3j3mvxgdfvm468gqqj3d3ks22zgp"; + libraryHaskellDepends = [ + base data-memocombinators linear sdl2 StateVar text vector Yampa + ]; + testHaskellDepends = [ + base data-memocombinators linear sdl2 StateVar text vector Yampa + ]; + homepage = "https://github.com/Simre1/YampaSDL2#readme"; + description = "Yampa and SDL2 made easy"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -216002,8 +226247,8 @@ self: { "yandex-translate" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default-class - , exceptions, hspec, hspec-core, lens, lens-aeson, text - , transformers, unordered-containers, wreq + , exceptions, lens, lens-aeson, text, transformers + , unordered-containers, wreq }: mkDerivation { pname = "yandex-translate"; @@ -216013,11 +226258,9 @@ self: { aeson base bytestring data-default-class exceptions lens lens-aeson text transformers unordered-containers wreq ]; - testHaskellDepends = [ - base data-default-class hspec hspec-core lens text transformers - ]; description = "Bindings to Yandex translate API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaop" = callPackage @@ -216066,6 +226309,44 @@ self: { homepage = "https://github.com/Profpatsch/yarn-lock#readme"; description = "Represent and parse yarn.lock files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yarn2nix" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async-pool, base + , bytestring, containers, data-fix, directory, either, filepath + , hnix, mtl, neat-interpolation, optparse-applicative, process + , protolude, regex-tdfa, regex-tdfa-text, stm, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text, unix, unordered-containers + , yarn-lock + }: + mkDerivation { + pname = "yarn2nix"; + version = "0.5.0"; + sha256 = "1vnhf7na4ljlybxpwi0n7ivmigc1mwjzn1vbcl4rrwlr4qcvaylp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint async-pool base bytestring containers data-fix + directory either filepath hnix mtl process protolude regex-tdfa + regex-tdfa-text stm text unordered-containers yarn-lock + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint async-pool base bytestring containers data-fix + directory either filepath hnix mtl optparse-applicative process + protolude regex-tdfa regex-tdfa-text stm text unix + unordered-containers yarn-lock + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint async-pool base bytestring containers data-fix + directory either filepath hnix mtl neat-interpolation process + protolude regex-tdfa regex-tdfa-text stm tasty tasty-hunit + tasty-quickcheck tasty-th text unordered-containers yarn-lock + ]; + homepage = "https://github.com/Profpatsch/yarn2nix#readme"; + description = "Convert yarn.lock files to nix expressions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yarr" = callPackage @@ -216115,7 +226396,6 @@ self: { ]; description = "Yet Another Template Engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yavie" = callPackage @@ -216239,10 +226519,9 @@ self: { ]; description = "YesQL-style SQL database abstraction"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod" = callPackage + "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 @@ -216264,6 +226543,31 @@ 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" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , conduit, data-default-class, directory, fast-logger, 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.6.0"; + sha256 = "0wx77nbpzdh40p1bm527kimfj48vs9d2avpvvz2w42zi3pz2y94a"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring conduit + data-default-class directory fast-logger 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-alerts" = callPackage @@ -216272,8 +226576,8 @@ self: { }: mkDerivation { pname = "yesod-alerts"; - version = "0.1.1.0"; - sha256 = "15vzc9ajq3jwmqfs9x4snp7msnj4gn15wh4qxm7dl4r12ha2rass"; + version = "0.1.2.0"; + sha256 = "0vqlkcb2q3wz6hp6ay6gj41vwlmq4x7flfbgq36ygnwwxjkwhllf"; libraryHaskellDepends = [ alerts base blaze-html blaze-markup safe text yesod-core ]; @@ -216348,24 +226652,25 @@ self: { , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra , containers, cryptonite, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, memory + , http-client, http-client-tls, http-conduit, http-types, 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 + , time, transformers, unliftio, unliftio-core, unordered-containers + , wai, yesod-core, yesod-form, yesod-persistent }: mkDerivation { pname = "yesod-auth"; - version = "1.4.19"; - sha256 = "1r6ykh9q9080wrshicmgxkjjlxb1rxv56kabqnyx44xihhcr19jp"; + version = "1.6.3"; + sha256 = "1f4qhsfgar7c2yq7rsm7g3wndg6hhwbmcmjz8dbljdwmzmxl5px0"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit 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 + file-embed http-client http-client-tls http-conduit http-types + memory mime-mail network-uri nonce persistent persistent-template + random resourcet safe shakespeare template-haskell text time + transformers unliftio unliftio-core unordered-containers wai + yesod-core yesod-form yesod-persistent ]; homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; @@ -216393,6 +226698,7 @@ self: { homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account-fork" = callPackage @@ -216456,6 +226762,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-auth-bcryptdb" = callPackage + ({ mkDerivation, aeson, base, bcrypt, bytestring, persistent, text + , yesod-auth, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod-auth-bcryptdb"; + version = "0.3.0.1"; + sha256 = "0n8h8j5xxnsj2mmj0dwcfrf3wmn9p670092va83w40dbapj98jw0"; + libraryHaskellDepends = [ + aeson base bcrypt bytestring persistent text yesod-auth yesod-core + yesod-form yesod-persistent + ]; + homepage = "https://github.com/yusent/yesod-auth-bcryptdb"; + description = "Authentication plugin for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-deskcom" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, byteable , bytestring, cipher-aes, cprng-aes, crypto-api, crypto-random @@ -216481,17 +226805,16 @@ self: { "yesod-auth-fb" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit - , lifted-base, shakespeare, text, time, transformers, wai + , resourcet, shakespeare, text, time, transformers, unliftio, wai , yesod-auth, yesod-core, yesod-fb }: mkDerivation { pname = "yesod-auth-fb"; - version = "1.8.1"; - sha256 = "0y7vl91ih3w2wdv62hpa180l2536778s64w9vqygh7cd9rmikdzg"; + version = "1.9.0"; + sha256 = "1hj6xb7rv28dz8jzygckqg5m5igy78zx0gpc6zmp7g5j0dvinxg8"; libraryHaskellDepends = [ - aeson base bytestring conduit fb http-conduit lifted-base - shakespeare text time transformers wai yesod-auth yesod-core - yesod-fb + aeson base bytestring conduit fb http-conduit resourcet shakespeare + text time transformers unliftio wai yesod-auth yesod-core yesod-fb ]; homepage = "https://github.com/psibi/yesod-auth-fb"; description = "Authentication backend for Yesod using Facebook"; @@ -216507,8 +226830,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.6.2"; - sha256 = "1cydpwy8i5z1ya5k3kn3qx0np3lhv9cka5c6gajwvla8kpgy11df"; + version = "1.7"; + sha256 = "072g8c2phhgphj0469qg9chbninxwjkigy2pzhfl51zbm50skfb5"; libraryHaskellDepends = [ aeson base bytestring persistent text yesod-auth yesod-core yesod-form yesod-persistent @@ -216531,8 +226854,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hmac-keccak"; - version = "0.0.0.3"; - sha256 = "1x5qnhdhy0n6kf9gljkig2q4dsfay1rv8gg3xc5ly5dvbbmy4zp8"; + version = "0.0.0.5"; + sha256 = "1va81j58abhfi2hwgiac8d819yisy4g6nxq6l6gh0qvsg5r36j0g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring cryptonite mtl persistent random shakespeare @@ -216630,18 +226953,19 @@ self: { homepage = "https://github.com/danpalmer/yesod-auth-nopassword#readme"; description = "A plugin for Yesod to provide email-only authentication"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-oauth" = callPackage - ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base - , text, transformers, yesod-auth, yesod-core, yesod-form + ({ mkDerivation, authenticate-oauth, base, bytestring, text + , transformers, unliftio, yesod-auth, yesod-core, yesod-form }: mkDerivation { pname = "yesod-auth-oauth"; - version = "1.4.2"; - sha256 = "09vrr8k3kgwps4n8isl54zm7n3j5xvz82pbphcp688r42k6v05f1"; + version = "1.6.0"; + sha256 = "1czm2zs9w8aicpqxmcn97c6skrhcy7g57q51vvnf40pffblvh33g"; libraryHaskellDepends = [ - authenticate-oauth base bytestring lifted-base text transformers + authenticate-oauth base bytestring text transformers unliftio yesod-auth yesod-core yesod-form ]; homepage = "http://www.yesodweb.com/"; @@ -216651,29 +226975,26 @@ self: { }) {}; "yesod-auth-oauth2" = callPackage - ({ mkDerivation, aeson, authenticate, base, bytestring, containers - , hoauth2, hspec, http-client, http-conduit, http-types - , lifted-base, load-env, network-uri, random, text, transformers - , vector, warp, yesod, yesod-auth, yesod-core, yesod-form + ({ mkDerivation, aeson, base, bytestring, errors, hoauth2, hspec + , http-client, http-conduit, http-types, microlens, random + , safe-exceptions, text, transformers, uri-bytestring, yesod-auth + , yesod-core }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.2.4"; - sha256 = "1gpyra5j6hi25r0hrjifjmkar8yb0f74cln4rygdjsvczllkri9a"; + version = "0.4.1.0"; + sha256 = "1p0sxgi7cl6lqzkx478zva2byzanna6jicdrgdns2p91cnw5hlh9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson authenticate base bytestring hoauth2 http-client http-conduit - http-types lifted-base network-uri random text transformers vector - yesod-auth yesod-core yesod-form - ]; - executableHaskellDepends = [ - base containers http-conduit load-env text warp yesod yesod-auth + aeson base bytestring errors hoauth2 http-client http-conduit + http-types microlens random safe-exceptions text transformers + uri-bytestring yesod-auth yesod-core ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec uri-bytestring ]; homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -216732,37 +227053,36 @@ self: { }) {}; "yesod-bin" = 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, attoparsec, base, base64-bytestring, blaze-builder + , bytestring, Cabal, conduit, conduit-extra, containers + , data-default-class, directory, file-embed, filepath, fsnotify + , http-client, http-client-tls, http-reverse-proxy, http-types + , network, optparse-applicative, parsec, process, project-template + , resourcet, say, shakespeare, split, stm, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp + , warp-tls, yaml, zlib }: mkDerivation { pname = "yesod-bin"; - version = "1.5.2.6"; - sha256 = "1in4c0q2w0h36lm1cf48ai0zpl9r8x0z116j85mfmq66wxmd6h9r"; + version = "1.6.0"; + sha256 = "096yxpb6dxy44s2ydf137rmd0b7zm5ww4yqkf7mnapslhc25wznn"; 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 + attoparsec base base64-bytestring blaze-builder bytestring Cabal + conduit conduit-extra containers data-default-class directory + file-embed filepath fsnotify http-client http-client-tls + http-reverse-proxy http-types network optparse-applicative parsec + process project-template resourcet say shakespeare split stm + streaming-commons tar template-haskell text time transformers + transformers-compat unix-compat unliftio 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 @@ -216780,6 +227100,7 @@ self: { homepage = "https://github.com/andrewthad/haskell-bootstrap"; description = "Bootstrap widgets for yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-colonnade" = callPackage @@ -216788,8 +227109,8 @@ self: { }: mkDerivation { pname = "yesod-colonnade"; - version = "1.1.0"; - sha256 = "0d0apypsy5v48gk5liy5mfky1ncbvzkhb8hbj0bivh0qhqfbwgqn"; + version = "1.2.0"; + sha256 = "1xbcwaklbly80fimmbi04j9wpl06knjdf1zy0m8i8cb1xmd8nh0k"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade text yesod-core ]; @@ -216862,7 +227183,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-core" = callPackage + "yesod-core_1_4_37_3" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -216877,8 +227198,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.37"; - sha256 = "0ww8hl0cx2g58zrdx3j6d5m2xwhssbajdqws1xk6rzl7rpfm1b9j"; + version = "1.4.37.3"; + sha256 = "1jw1302p5s9jy7xghxzg9j63pn6b1hp957n1808qyk1iz7yrfsg0"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit @@ -216903,6 +227224,47 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-core" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, byteable, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec + , hspec-expectations, http-types, HUnit, monad-logger, mtl, network + , old-locale, parsec, path-pieces, primitive, QuickCheck, random + , resourcet, safe, semigroups, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.3"; + sha256 = "0k2gwnbrpwwbna03bbi53fppgyn7x5g9167jyjcfyjb8qfn4pwxg"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup byteable bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq deepseq-generics directory fast-logger + http-types monad-logger mtl old-locale parsec path-pieces primitive + random resourcet safe semigroups shakespeare template-haskell text + time transformers unix-compat unliftio unordered-containers vector + wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces QuickCheck random resourcet shakespeare + streaming-commons template-haskell text transformers unliftio wai + wai-extra + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text transformers + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-crud" = callPackage @@ -216945,17 +227307,17 @@ self: { }) {}; "yesod-csp" = callPackage - ({ mkDerivation, attoparsec, base, hspec, mono-traversable - , network-uri, semigroups, syb, template-haskell, text, uniplate - , yesod, yesod-core, yesod-test + ({ mkDerivation, attoparsec, base, case-insensitive, hspec + , mono-traversable, network-uri, semigroups, syb, template-haskell + , text, wai, yesod, yesod-core, yesod-test }: mkDerivation { pname = "yesod-csp"; - version = "0.2.1.0"; - sha256 = "15af948x2z9qyj358ba9ggil65jw9bc5d99h6xcydxpnlgvmg0q6"; + version = "0.2.4.0"; + sha256 = "19cjmjg2byyswdcxa9llqarclzi6jslbd0yxxkn8l3kdgn2k2pg0"; libraryHaskellDepends = [ - attoparsec base mono-traversable network-uri semigroups syb - template-haskell text uniplate yesod yesod-core + attoparsec base case-insensitive mono-traversable network-uri + semigroups syb template-haskell text wai yesod yesod-core ]; testHaskellDepends = [ attoparsec base hspec network-uri semigroups template-haskell yesod @@ -217029,6 +227391,7 @@ self: { ]; description = "DSL for generating Yesod subsite to manage an RDBMS;"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-elements" = callPackage @@ -217040,6 +227403,7 @@ self: { libraryHaskellDepends = [ base blaze-html yesod-core ]; description = "Non template haskell markup building function in the spirit of lucid"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-eventsource" = callPackage @@ -217048,8 +227412,8 @@ self: { }: mkDerivation { pname = "yesod-eventsource"; - version = "1.4.1"; - sha256 = "04ry7mzrwxjvgx5y2mcjsjghv6b39dh6zsg834vw5maf0wnph6a0"; + version = "1.6.0"; + sha256 = "12s11q6zga37xyynll7b30gpv02k7jmmzfassshci02y9niyrkkg"; libraryHaskellDepends = [ base blaze-builder conduit transformers wai wai-eventsource wai-extra yesod-core @@ -217127,22 +227491,22 @@ self: { "yesod-fb" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, crypto-api, fb - , http-conduit, text, wai, yesod-core + , http-client-tls, http-conduit, text, wai, yesod-core }: mkDerivation { pname = "yesod-fb"; - version = "0.4.0"; - sha256 = "043k4rzvzyjibyq94vjsk2mvs4l2bwfn41h1jrhfsppw42zh3pcm"; + version = "0.5.0"; + sha256 = "1ns113f2ylim1b3r2dgwgc65yfy6qxjh9miqfz2fx29fq4250dyy"; libraryHaskellDepends = [ - aeson base bytestring conduit crypto-api fb http-conduit text wai - yesod-core + aeson base bytestring conduit crypto-api fb http-client-tls + http-conduit text wai yesod-core ]; homepage = "https://github.com/psibi/yesod-fb"; description = "Useful glue functions between the fb library and Yesod"; license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-form" = callPackage + "yesod-form_1_4_16" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -217164,6 +227528,31 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-form" = 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 + }: + mkDerivation { + pname = "yesod-form"; + version = "1.6.1"; + sha256 = "05pnsgnhcsq74w91r74p8psh567yxbmyhddj04mnrfzlzzm19zxq"; + 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"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-form-bootstrap4" = callPackage @@ -217209,21 +227598,22 @@ self: { homepage = "http://github.com/geraldus/yesod-form-richtext#readme"; description = "Various rich-text WYSIWYG editors for Yesod forms"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-gitrepo" = callPackage - ({ mkDerivation, base, directory, enclosed-exceptions, http-types - , lifted-base, process, temporary, text, wai, yesod-core + ({ mkDerivation, base, directory, http-types, process, temporary + , text, unliftio, wai, yesod-core }: mkDerivation { pname = "yesod-gitrepo"; - version = "0.2.1.0"; - sha256 = "1v47d6gvw3d19mqip36y54c4d84f48jgybdwgdl8r20zfwvhyvkf"; + version = "0.3.0"; + sha256 = "07lqhih9jcb5rdjdkjsrg7s9l5f3y9lrsxa1rc1c8gxw0v2nfg5h"; libraryHaskellDepends = [ - base directory enclosed-exceptions http-types lifted-base process - temporary text wai yesod-core + base directory http-types process temporary text unliftio wai + yesod-core ]; - homepage = "https://github.com/snoyberg/yesod-gitrepo"; + homepage = "https://github.com/snoyberg/yesod-gitrepo#readme"; description = "Host content provided by a Git repo"; license = stdenv.lib.licenses.mit; }) {}; @@ -217233,13 +227623,17 @@ self: { }: mkDerivation { pname = "yesod-gitrev"; - version = "0.1.0.0"; - sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih"; + version = "0.2.0.0"; + sha256 = "0lp0zraj6015bl8pcgi9b9w4d1yf0lb4awy25jv5xrcrc173g7yz"; + revision = "1"; + editedCabalFile = "1b0df34lz569gnwbbz0p20dml6bi2nbva9wfdsxyvva0dhvxjaz5"; libraryHaskellDepends = [ aeson base gitrev template-haskell yesod-core ]; + homepage = "https://github.com/DanBurton/yesod-gitrev"; description = "A subsite for displaying git information"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-goodies" = callPackage @@ -217281,11 +227675,9 @@ self: { }) {}; "yesod-job-queue" = callPackage - ({ mkDerivation, aeson, api-field-json-th, base, bytestring - , classy-prelude-yesod, cron, file-embed, hedis, lens - , monad-control, monad-logger, persistent-sqlite, resourcet, stm - , text, time, transformers, uuid, yesod, yesod-core - , yesod-persistent + ({ mkDerivation, aeson, api-field-json-th, base, bytestring, cron + , file-embed, hedis, lens, monad-control, monad-logger, stm, text + , time, transformers, uuid, yesod, yesod-core, yesod-persistent }: mkDerivation { pname = "yesod-job-queue"; @@ -217298,14 +227690,11 @@ self: { monad-control monad-logger stm text time transformers uuid yesod yesod-core yesod-persistent ]; - executableHaskellDepends = [ - base classy-prelude-yesod hedis monad-logger persistent-sqlite - resourcet yesod yesod-core - ]; testHaskellDepends = [ base ]; homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme"; description = "Background jobs library for Yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-json" = callPackage @@ -217342,17 +227731,13 @@ self: { libraryHaskellDepends = [ base lucid monads-tf text yesod-core ]; description = "Lucid support for Yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-mangopay" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra - , containers, country-codes, data-default, directory, fast-logger - , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay - , monad-control, monad-logger, persistent, persistent-postgresql - , persistent-template, resourcet, shakespeare, template-haskell - , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod - , yesod-auth, yesod-core, yesod-form, yesod-persistent - , yesod-static + ({ mkDerivation, base, containers, http-conduit, http-types + , lifted-base, mangopay, persistent-template, text, time, yesod + , yesod-core }: mkDerivation { pname = "yesod-mangopay"; @@ -217364,15 +227749,6 @@ self: { base containers http-conduit http-types lifted-base mangopay persistent-template text time yesod yesod-core ]; - executableHaskellDepends = [ - aeson base bytestring conduit conduit-extra containers - country-codes data-default directory fast-logger hamlet hjsmin - http-conduit lifted-base mangopay monad-control monad-logger - persistent persistent-postgresql persistent-template resourcet - shakespeare template-haskell text time wai wai-extra wai-logger - warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent - yesod-static - ]; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Yesod library for MangoPay API access"; license = stdenv.lib.licenses.bsd3; @@ -217381,16 +227757,16 @@ self: { "yesod-markdown" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , directory, hspec, pandoc, persistent, shakespeare, texmath, text + , directory, hspec, pandoc, persistent, shakespeare, text , xss-sanitize, yesod-core, yesod-form }: mkDerivation { pname = "yesod-markdown"; - version = "0.11.4"; - sha256 = "05m9h70s50bl1s2xbzbnfa2xy3aizq5cjsfi3rqj4fal0ralqbpa"; + version = "0.12.3"; + sha256 = "10vnip7yifq3li4jwql5pzrdaqf1z2bb4h99rf1iqzvd3b8mqq30"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent - shakespeare texmath text xss-sanitize yesod-core yesod-form + shakespeare text xss-sanitize yesod-core yesod-form ]; testHaskellDepends = [ base blaze-html hspec text ]; homepage = "http://github.com/pbrisbin/yesod-markdown"; @@ -217422,8 +227798,8 @@ self: { }: mkDerivation { pname = "yesod-newsfeed"; - version = "1.6"; - sha256 = "05kmnv0by94la3np715j6my41y8wqlvc0h8rf09zvrrg003bqvaf"; + version = "1.6.1.0"; + sha256 = "05cnyz9g76hnfmhqfav16mghr0x42fqnz1zi0ki4bjkl5mcrf2vd"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring containers shakespeare text time xml-conduit yesod-core @@ -217467,8 +227843,7 @@ self: { "yesod-paginator" = callPackage ({ mkDerivation, base, data-default, hspec, persistent, resourcet - , text, transformers, wai-extra, warp, yesod, yesod-core - , yesod-test + , text, transformers, wai-extra, yesod, yesod-core, yesod-test }: mkDerivation { pname = "yesod-paginator"; @@ -217479,7 +227854,6 @@ self: { libraryHaskellDepends = [ base persistent resourcet text transformers yesod ]; - executableHaskellDepends = [ base warp yesod ]; testHaskellDepends = [ base data-default hspec wai-extra yesod-core yesod-test ]; @@ -217502,6 +227876,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-persistent_1_4_3" = 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.3"; + sha256 = "0kiksw46c8ww9yiwl28pkrppx8d6fhsasr0hvmsliqbrp16likj8"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-persistent" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet @@ -217509,10 +227906,8 @@ self: { }: mkDerivation { pname = "yesod-persistent"; - version = "1.4.2"; - sha256 = "0mhh7gka86spc51qcsi3y9nwdx9cn2fnm421dqm7yyp21518jf6r"; - revision = "1"; - editedCabalFile = "1aa1c3qbq223v3mslgj62jix10qff38zif8f6c8y3h7m0hix2fsf"; + version = "1.6.0"; + sha256 = "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2"; libraryHaskellDepends = [ base blaze-builder conduit persistent persistent-template resource-pool resourcet transformers yesod-core @@ -217674,6 +228069,7 @@ self: { ]; description = "RAML style route definitions for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-raml-bin" = callPackage @@ -217713,6 +228109,7 @@ self: { ]; description = "A html documentation generator library for RAML"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-raml-mock" = callPackage @@ -217765,31 +228162,14 @@ self: { }: mkDerivation { pname = "yesod-recaptcha2"; - version = "0.1.0.1"; - sha256 = "0avlm1jchp0j65c3f6bj9gv9kba0cvvk77sq918dzjvx54hnygf3"; - 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-recaptcha2_0_2_3" = callPackage - ({ mkDerivation, base, classy-prelude-yesod, http-conduit - , yesod-auth - }: - mkDerivation { - pname = "yesod-recaptcha2"; - version = "0.2.3"; - sha256 = "1q7anpls9nczvx65ba64nd1gmqgkznfd1ghv6c7z7pndq5cy91in"; + version = "0.2.4"; + sha256 = "1aw104i2v9m6dc5z5iqzihjfybfxg90l0rj0pazb672qzp9yqj18"; 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes" = callPackage @@ -217830,6 +228210,7 @@ self: { homepage = "https://github.com/frontrowed/yesod-routes-flow"; description = "Generate Flow routes for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes-typescript" = callPackage @@ -217928,8 +228309,8 @@ self: { }: mkDerivation { pname = "yesod-sitemap"; - version = "1.4.0.1"; - sha256 = "0ri67r3yjngn4m2lj071n2v3r9w7pvsl24rayf41k7w9j3ylk100"; + version = "1.6.0"; + sha256 = "1mnv658z36ja1avig0g4pirb2i9vqriycykhfky74xymvjmhdyp5"; libraryHaskellDepends = [ base conduit containers data-default text time xml-conduit xml-types yesod-core @@ -217939,7 +228320,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-static" = callPackage + "yesod-static_1_5_3_1" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra , containers, cryptonite, cryptonite-conduit, css-text @@ -217972,14 +228353,49 @@ self: { 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" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, byteable, bytestring, conduit, containers + , cryptonite, cryptonite-conduit, css-text, data-default, directory + , exceptions, file-embed, filepath, hashable, hjsmin, hspec + , http-types, HUnit, memory, 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.6.0"; + sha256 = "03l8jjn3pw7j38i91hakf1lgr4lf2lc610a783i7zhmr9f9ga2xx"; + libraryHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder byteable + bytestring conduit containers cryptonite cryptonite-conduit + css-text data-default directory exceptions file-embed filepath + hashable hjsmin http-types memory 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 containers + cryptonite cryptonite-conduit data-default directory exceptions + file-embed filepath hjsmin hspec http-types HUnit memory 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; }) {}; "yesod-static-angular" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-markup , bytestring, data-default, directory, filepath, hamlet, hspec , HUnit, language-javascript, mime-types, shakespeare - , template-haskell, text, yesod, yesod-core, yesod-static - , yesod-test + , template-haskell, text, yesod-core, yesod-static, yesod-test }: mkDerivation { pname = "yesod-static-angular"; @@ -217992,9 +228408,6 @@ self: { directory filepath hamlet language-javascript mime-types shakespeare template-haskell text yesod-core yesod-static ]; - executableHaskellDepends = [ - base data-default shakespeare yesod yesod-static - ]; testHaskellDepends = [ base bytestring hamlet hspec HUnit shakespeare template-haskell text yesod-core yesod-static yesod-test @@ -218002,6 +228415,7 @@ self: { homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular"; description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-table" = callPackage @@ -218029,10 +228443,9 @@ self: { libraryHaskellDepends = [ base hamlet persistent yesod ]; description = "Table view for Yesod applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-test" = callPackage + "yesod-test_1_5_9_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, containers, cookie , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base @@ -218042,8 +228455,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.5.8"; - sha256 = "0rvbvr8pa60b9rvhnsd1wcbs0x49s2rhqc76nqzv2i0qry5aym7h"; + version = "1.5.9.1"; + sha256 = "05l5n28azbh6r1vsi7xvz1h19if5zrwn1b3jsr2913axfs3d9r3y"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit @@ -218057,6 +228470,34 @@ self: { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-test" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , network, persistent, pretty-show, semigroups, text, time + , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.2"; + sha256 = "172m7nafq8w1j3cm6p110vlxzy14y6pgm8ica357b1qn0wvzd39x"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit network persistent pretty-show semigroups text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit text + unliftio wai wai-extra xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-test-json" = callPackage @@ -218160,17 +228601,16 @@ self: { }) {}; "yesod-websockets" = callPackage - ({ mkDerivation, async, base, conduit, enclosed-exceptions - , monad-control, transformers, wai, wai-websockets, websockets - , yesod-core + ({ mkDerivation, base, conduit, mtl, transformers, unliftio, wai + , wai-websockets, websockets, yesod-core }: mkDerivation { pname = "yesod-websockets"; - version = "0.2.6"; - sha256 = "0agfpvm3xig9rwq2rm658ahzv8r0pw6k284s8m1lqgzkl00ij4cq"; + version = "0.3.0"; + sha256 = "0ip4fjjxhz79fj1gm0wl23jkkb64hqn9rwn0vaqy69wy4212jr2a"; libraryHaskellDepends = [ - async base conduit enclosed-exceptions monad-control transformers - wai wai-websockets websockets yesod-core + base conduit mtl transformers unliftio wai wai-websockets + websockets yesod-core ]; homepage = "https://github.com/yesodweb/yesod"; description = "WebSockets support for Yesod"; @@ -218240,6 +228680,7 @@ self: { homepage = "https://github.com/alephcloud/hs-yet-another-logger"; description = "Yet Another Logger"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yhccore" = callPackage @@ -218257,9 +228698,9 @@ self: { "yi" = callPackage ({ mkDerivation, base, microlens-platform, mtl - , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty - , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell - , yi-mode-javascript, yi-rope + , optparse-applicative, yi-core, yi-frontend-vty, yi-keymap-emacs + , yi-keymap-vim, yi-misc-modes, yi-mode-haskell, yi-mode-javascript + , yi-rope }: mkDerivation { pname = "yi"; @@ -218270,13 +228711,12 @@ self: { isExecutable = true; executableHaskellDepends = [ base microlens-platform mtl optparse-applicative yi-core - yi-frontend-pango yi-frontend-vty yi-keymap-emacs yi-keymap-vim - yi-misc-modes yi-mode-haskell yi-mode-javascript yi-rope + yi-frontend-vty yi-keymap-emacs yi-keymap-vim yi-misc-modes + yi-mode-haskell yi-mode-javascript yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-contrib" = callPackage @@ -218300,49 +228740,6 @@ self: { }) {}; "yi-core" = callPackage - ({ mkDerivation, 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, 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.1"; - sha256 = "0lhx476whdsz9f6p996p12ys3vi7rz14rb3rgfw0qi12czc61hav"; - libraryHaskellDepends = [ - 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 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; - }) {}; - - "yi-core_0_17_1" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring , containers, criterion, data-default, deepseq, directory, dlist , dynamic-state, exceptions, filepath, hashable, ListLike @@ -218371,7 +228768,6 @@ self: { 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 @@ -218389,7 +228785,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Dynamic configuration support for Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-emacs-colours" = callPackage @@ -218422,28 +228817,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Pango frontend for Yi editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-frontend-vty" = 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.1"; - sha256 = "1ahiq7pf5dm6r6x7zpkrn9dbdqf4p1wr8g1zlffjncywk81h34f3"; - 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; - }) {}; - - "yi-frontend-vty_0_17_1" = callPackage ({ mkDerivation, base, containers, data-default, dlist , microlens-platform, pointedlist, stm, text, vty, yi-core , yi-language, yi-rope @@ -218459,28 +228835,9 @@ self: { 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 - , yi-language, yi-rope - }: - mkDerivation { - pname = "yi-fuzzy-open"; - version = "0.14.1"; - sha256 = "0qj8dlxdmsbas68zzmb99m5kw5jwp2vfj983s66a379z23zrg7wx"; - 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; - }) {}; - - "yi-fuzzy-open_0_17_1" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, pointedlist, text, transformers-base, vector , yi-core, yi-language, yi-rope @@ -218497,7 +228854,6 @@ self: { 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 @@ -218513,23 +228869,6 @@ self: { }) {}; "yi-ireader" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-default - , microlens-platform, text, yi-core, yi-language, yi-rope - }: - mkDerivation { - pname = "yi-ireader"; - version = "0.14.1"; - sha256 = "0r10g7gw889snclv0jdrg8k6db9hm9zlkaxqvm7f22fj1ddb5kbi"; - 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; - }) {}; - - "yi-ireader_0_17_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , microlens-platform, text, yi-core, yi-language, yi-rope }: @@ -218544,26 +228883,9 @@ self: { 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.14.1"; - sha256 = "1s1nh2h1v4zhgklhzlzix1plfg1z458yhl6y77xbq5r81ammpr5v"; - 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; - }) {}; - - "yi-keymap-cua_0_17_1" = callPackage ({ mkDerivation, base, microlens-platform, text, yi-core , yi-keymap-emacs, yi-rope }: @@ -218577,29 +228899,9 @@ self: { 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-emacs" = 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.1"; - sha256 = "17fx1vhj4sdgbvih6ha6jqp74bfq0bcxilxlgm1vwlcafvc2vyfl"; - 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; - }) {}; - - "yi-keymap-emacs_0_17_1" = callPackage ({ mkDerivation, base, containers, filepath, Hclip , microlens-platform, mtl, oo-prototypes, text, transformers-base , yi-core, yi-language, yi-misc-modes, yi-rope @@ -218615,39 +228917,9 @@ self: { 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-vim" = 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.1"; - sha256 = "19wdfhsvzy90jm9pskla40q94kvil5hvmx9r6a2frsbqjlbjk5ja"; - enableSeparateDataOutput = true; - 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; - }) {}; - - "yi-keymap-vim_0_17_1" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, data-default , directory, filepath, Hclip, microlens-platform, mtl , oo-prototypes, pointedlist, QuickCheck, safe, tasty, tasty-hunit @@ -218672,38 +228944,9 @@ self: { 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-language" = 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.1"; - sha256 = "1miszrvls06k5q78w5aswc7z5pbq8b1qvdxkhnfp0zw0vbs7wmgm"; - 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; - }) {}; - - "yi-language_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -218729,29 +228972,9 @@ self: { 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 - , yi-rope - }: - mkDerivation { - pname = "yi-misc-modes"; - version = "0.14.1"; - sha256 = "1ivpp0yyyvybs05h6i4x4jgdpakwis5wvj9bp8273bskw128sw1c"; - 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; - }) {}; - - "yi-misc-modes_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: @@ -218767,28 +228990,9 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor miscellaneous modes"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-mode-haskell" = 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.1"; - sha256 = "1z119jwpdj2i4dxvl7imhlpxjd03mxxxnvcha5jp3rxjlbsdp7zs"; - 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; - }) {}; - - "yi-mode-haskell_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: @@ -218804,29 +229008,9 @@ self: { 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 - , yi-rope - }: - mkDerivation { - pname = "yi-mode-javascript"; - version = "0.14.1"; - sha256 = "182bs6pnn2v2vvp0vl4sjpfdqcas1d35zf7ky00dyz9g24h8l2f5"; - 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; - }) {}; - - "yi-mode-javascript_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, dlist , filepath, microlens-platform, mtl, text, yi-core, yi-language , yi-rope @@ -218843,7 +229027,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor javascript mode"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-monokai" = callPackage @@ -218860,27 +229043,6 @@ self: { }) {}; "yi-rope" = 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; - }) {}; - - "yi-rope_0_10" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , fingertree, hspec, QuickCheck, quickcheck-instances, text }: @@ -218897,31 +229059,9 @@ self: { 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 - , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector - , yi-core, yi-rope - }: - mkDerivation { - pname = "yi-snippet"; - version = "0.14.1"; - sha256 = "14319na0hn21qrkkcfrqh5qvlx10f7462m466hhpfhq7rka8b28h"; - 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; - }) {}; - - "yi-snippet_0_17_1" = callPackage ({ mkDerivation, base, binary, containers, data-default, free , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector , yi-core, yi-rope @@ -218940,7 +229080,6 @@ self: { 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 @@ -219121,14 +229260,14 @@ self: { ({ mkDerivation, base, bindings-DSL, ieee754 }: mkDerivation { pname = "yoga"; - version = "0.0.0.1"; - sha256 = "0allfj4ld6h77m5l9m1f9whrlhs18fvmcwa5jq25bv5prk9928bv"; + version = "0.0.0.2"; + sha256 = "1gkql9c7dd7h0wfq98mfhgjmqlxkdf4b66qympc7r8vyx38jps1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bindings-DSL ieee754 ]; - executableHaskellDepends = [ base ]; description = "Bindings to Facebook's Yoga layout library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yoko" = callPackage @@ -219214,8 +229353,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.6"; - sha256 = "059mbh2x4i521kg99b2mmgvc2rwbid641ilzc14ri7ym7ljkw1mv"; + version = "0.7"; + sha256 = "1dvny64v5v3qrahymn647jsjjdraa0mrkpvmqiwihh8n9xbnq1s7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -219227,9 +229366,95 @@ self: { homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; + }) {}; + + "yu-auth" = callPackage + ({ mkDerivation, base, cryptonite, memory, MonadRandom, random + , yu-utils + }: + mkDerivation { + pname = "yu-auth"; + version = "0.1.1.10"; + sha256 = "165m0ppp60gh5c6wlyjbvqlsh5gbpr0xz173ivkprjalxivr4r6j"; + libraryHaskellDepends = [ base cryptonite memory yu-utils ]; + testHaskellDepends = [ base MonadRandom random yu-utils ]; + homepage = "https://github.com/Qinka/Yu"; + description = "Auth module for Yu"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "yu-core" = callPackage + ({ mkDerivation, base, blaze-markup, hspec, yu-auth, yu-utils }: + mkDerivation { + pname = "yu-core"; + version = "0.1.1.2"; + sha256 = "17wdvwa6hs38asvsysv2g0xzjc654479c0229hggpyq17flfzwjs"; + libraryHaskellDepends = [ base yu-auth yu-utils ]; + testHaskellDepends = [ base blaze-markup hspec yu-utils ]; + homepage = "https://github.com/Qinka/Yu"; + description = "The core of Yu"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yu-launch" = callPackage + ({ mkDerivation, base, cmdargs, yaml, yu-auth, yu-core, yu-utils }: + mkDerivation { + pname = "yu-launch"; + version = "0.1.1.0"; + sha256 = "0nh40iy79m6jc4z5x773sra7i6jr21w80809vbh5xvjhg9l4aym8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cmdargs yaml yu-auth yu-core yu-utils + ]; + homepage = "https://github.com/Qinka/Yu"; + description = "The launcher for Yu"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yu-tool" = callPackage + ({ mkDerivation, base, cmdargs, directory, echo, filepath, process + , yu-auth, yu-utils + }: + mkDerivation { + pname = "yu-tool"; + version = "0.1.1.30"; + sha256 = "00pkw78pfwl089608y6ambw522v6qgnp7fgky98jdb9p5kbv6nyi"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cmdargs directory echo filepath process yu-auth yu-utils + ]; + homepage = "https://github.com/Qinka/Yu"; + description = "Tool for Yu"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "yu-utils" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , cmdargs, conduit, exceptions, fast-logger, gitrev, http-types + , monad-control, monad-logger, mongoDB, mtl, network, parsec + , resource-pool, shakespeare, signal, template-haskell, text, time + , transformers, wai, wai-extra, wai-logger, warp, xml-hamlet + , yesod-core + }: + mkDerivation { + pname = "yu-utils"; + version = "0.1.1.0"; + sha256 = "1njmfs0m1xj5vwqj8qmhblnnzqwdjxxf732bdinp4x9wv7x68vz6"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring cmdargs conduit + exceptions fast-logger gitrev http-types monad-control monad-logger + mongoDB mtl network parsec resource-pool shakespeare signal + template-haskell text time transformers wai wai-extra wai-logger + warp xml-hamlet yesod-core + ]; + description = "Utils for Yu"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "yuiGrid" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -219303,6 +229528,7 @@ self: { ]; description = "Utilities for reading and writing Alteryx .yxdb files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "z3" = callPackage @@ -219310,8 +229536,8 @@ self: { }: mkDerivation { pname = "z3"; - version = "4.1.2"; - sha256 = "09wph5hp5835npfib07852x4d122p8nh35cbwyr80a83a77l7yym"; + version = "4.2.0"; + sha256 = "1rzdsn54508y6w965a8y2g118ylx6588gxbdi3dd9ihqh9mdzg31"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl ]; @@ -219332,6 +229558,7 @@ self: { testHaskellDepends = [ base containers hspec z3 ]; description = "High-level assertion encoding to Z3 solver"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zabt" = callPackage @@ -219583,8 +229810,8 @@ self: { }: mkDerivation { pname = "zeromq4-haskell"; - version = "0.6.7"; - sha256 = "1kjgmy8pbq9b00s8ak469afwgvhvnyyk7430x20amw01jcjbicll"; + version = "0.7.0"; + sha256 = "17q756mldxx9b8a2nx9lvjrgvbmgjbnp896sqcgnijq7wr751m2q"; libraryHaskellDepends = [ async base bytestring containers exceptions monad-control semigroups transformers transformers-base @@ -219623,22 +229850,22 @@ self: { }) {}; "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, ansi-terminal, async, base, colour, 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.3"; - sha256 = "0hams2ayxm73p2m032vjxnrdpg7d8iz293sx29h011siv1xjyaab"; + version = "0.0.1.6"; + sha256 = "0bswk4z26v020qkcm09cjkjkvwxsx1mrzrf3kajhwwzpb8vzxbdh"; 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 + ansi-terminal base colour directory genvalidity genvalidity-hspec genvalidity-path hspec path path-io QuickCheck stm ]; homepage = "http://cs-syd.eu"; @@ -219653,8 +229880,8 @@ self: { }: mkDerivation { pname = "zifter-cabal"; - version = "0.0.0.2"; - sha256 = "009vhy3x5hb24n1ylr31hvgfk2bic1r9yy8nk78ym1yhjb4vrrj5"; + version = "0.0.0.3"; + sha256 = "04nwyma5p6ka86zh2hczli4842l5hg6kvhsv3bwwf722bkhzdznq"; libraryHaskellDepends = [ base directory filepath path path-io process safe zifter ]; @@ -219668,8 +229895,8 @@ self: { ({ mkDerivation, base, path, process, zifter }: mkDerivation { pname = "zifter-git"; - version = "0.0.0.0"; - sha256 = "0mq5aa7nljbdgimvs948kzn16m74771jyswbk0fq6jqyrb80li4j"; + version = "0.0.0.1"; + sha256 = "1fsrair0c0a6j2jmghcxvbs3dr6j7gzh3yfimflva64nvwfx8vb8"; libraryHaskellDepends = [ base path process zifter ]; homepage = "http://cs-syd.eu"; description = "zifter-git"; @@ -219683,8 +229910,8 @@ self: { }: mkDerivation { pname = "zifter-google-java-format"; - version = "0.0.0.0"; - sha256 = "0kl3mgg4hbzl9ifd8x30nnczrygs5ziqhmz47l5nzx40ja177546"; + version = "0.0.0.1"; + sha256 = "00am6djnk7ivb9cd5v59axlbi3da70m2fzfghmzq6dgvlkghng0c"; libraryHaskellDepends = [ base filepath path path-io process safe zifter ]; @@ -219700,8 +229927,8 @@ self: { }: mkDerivation { pname = "zifter-hindent"; - version = "0.0.0.1"; - sha256 = "10qwlvw1zq5q530xlh69ag9ap4jl5gv5xj7sc4bwjglbbcw39iag"; + version = "0.0.0.2"; + sha256 = "106iv5gqqlmvdjs1z4n7p3m11c36x4531395fpxh5sfzc8mrhgg2"; libraryHaskellDepends = [ base directory filepath path path-io process safe zifter ]; @@ -219716,10 +229943,8 @@ self: { }: mkDerivation { pname = "zifter-hlint"; - version = "0.0.0.0"; - sha256 = "0bvp6l5k42ls996h3qc7wy4qgcx0phd8hf0l99kcqan2gpx8qn6p"; - revision = "1"; - editedCabalFile = "08wmzid4g3av9w86ysybvg2mwkfx63b19v2i71hvik48bl5v6mlv"; + version = "0.0.0.1"; + sha256 = "1303crjb500psmsnc3ivy67qgz5gdbd3dsfnf3qis39amxmw1wf4"; libraryHaskellDepends = [ base filepath hlint path path-io safe zifter ]; @@ -219730,16 +229955,20 @@ self: { }) {}; "zifter-stack" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, path, path-io - , process, safe, zifter + ({ mkDerivation, base, Cabal, directory, filepath, hspec, path + , path-io, process, safe, stm, zifter }: mkDerivation { pname = "zifter-stack"; - version = "0.0.0.6"; - sha256 = "0z2y77fd9ij8s9qqyjik1syh5ry169bda6wlsa4lj658f8yghggc"; + version = "0.0.0.10"; + sha256 = "1qsxim5rmj2s4k615390iqy4691ilrx5h75fd38ds599kvxgvwni"; libraryHaskellDepends = [ base Cabal directory filepath path path-io process safe zifter ]; + testHaskellDepends = [ + base Cabal directory filepath hspec path path-io process safe stm + zifter + ]; homepage = "http://cs-syd.eu"; description = "zifter-stack"; license = stdenv.lib.licenses.mit; @@ -219787,84 +230016,57 @@ self: { "zip" = 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.11"; - sha256 = "0adflrr7h6aqq4nz0751chs65zfj0ljz1mjwyym3s080sbrwncjn"; - revision = "1"; - editedCabalFile = "0f97aidxiw149m64bv6qnb6ba2xlmllv3cwalihvccc0vh5kn0as"; - 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; - }) {}; - - "zip_0_2_0" = callPackage - ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive - , cereal, conduit, conduit-extra, containers, digest, exceptions - , filepath, hspec, monad-control, mtl, path, path-io, plan-b - , QuickCheck, resourcet, text, time, transformers + , cereal, conduit, conduit-extra, containers, digest, directory + , dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers , transformers-base }: mkDerivation { pname = "zip"; - version = "0.2.0"; - sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr"; + version = "1.0.0"; + sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9"; + revision = "3"; + editedCabalFile = "0af1qpyn6vfzcdyi1md7aq39fznswxijzm0ap7mdwp0g0l7pcdyh"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit - conduit-extra containers digest exceptions filepath monad-control - mtl path path-io plan-b resourcet text time transformers + conduit-extra containers digest directory dlist exceptions filepath + monad-control mtl resourcet text time transformers transformers-base ]; testHaskellDepends = [ - base bytestring conduit containers exceptions filepath hspec path - path-io QuickCheck text time transformers + base bytestring conduit containers directory dlist exceptions + filepath hspec QuickCheck temporary 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, containers + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, zip, zlib + , process, temporary, text, time, unix, unzip, zlib }: mkDerivation { pname = "zip-archive"; - version = "0.3.1.1"; - sha256 = "09c3y13r77shyamibr298i4l0rp31i41w3rg1ksnrl3gkrj8x1ly"; - revision = "1"; - editedCabalFile = "0n8f1075gz5q2k9mqzadca6is0fi1bgi91sfw1yq2kqakkbrbkqy"; + version = "0.3.2.4"; + sha256 = "119p7f9dbims5swf23czyg4r4p0sjmgwfh042bpxw54d9p9jwq90"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base binary bytestring containers digest directory filepath mtl old-time pretty text time unix zlib ]; - executableHaskellDepends = [ base bytestring directory ]; + libraryToolDepends = [ unzip ]; testHaskellDepends = [ - base bytestring directory HUnit old-time process temporary time - unix + base bytestring directory filepath HUnit old-time process temporary + time unix ]; - testToolDepends = [ zip ]; homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) zip;}; + }) {inherit (pkgs) unzip;}; "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra @@ -219904,8 +230106,8 @@ self: { }: mkDerivation { pname = "zip-stream"; - version = "0.1.0.1"; - sha256 = "17ndw8a6br9bgkr5s2jn54kq69bg4hwi55dfh899dbyzyl0yzxaq"; + version = "0.1.1"; + sha256 = "1wnjj1sp5y24iqd1ffmz6lmsvh0527v05zhzygqaf65j8sny535q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219918,6 +230120,7 @@ self: { ]; description = "ZIP archive streaming using conduits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zipedit" = callPackage @@ -219961,21 +230164,22 @@ self: { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic zipper for families of recursive datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zippers" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest - , lens, profunctors, semigroupoids + , lens, profunctors, semigroupoids, semigroups }: mkDerivation { pname = "zippers"; - version = "0.2.4"; - sha256 = "1nzjs1s0lb0gr0n2qib4pdp24k7q707261n8icxzg81f0c04yafb"; - revision = "1"; - editedCabalFile = "18a7wlklxvl9fhk8j7njf8ifn2781vfiqz0vxk6ljx30f1p7plq1"; + version = "0.2.5"; + sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id"; + revision = "2"; + editedCabalFile = "03vmfmj38sa6pn858wa4fcbn3b0jw5pcypzv0kls600fgdbjfqbm"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base lens profunctors semigroupoids ]; + libraryHaskellDepends = [ + base lens profunctors semigroupoids semigroups + ]; testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion lens ]; homepage = "http://github.com/ekmett/zippers/"; @@ -220036,7 +230240,7 @@ self: { 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; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zlib" = callPackage @@ -220045,8 +230249,8 @@ self: { }: mkDerivation { pname = "zlib"; - version = "0.6.1.2"; - sha256 = "1fx2k2qmgm2dj3fkxx2ry945fpdn02d4dkihjxma21xgdiilxsz4"; + version = "0.6.2"; + sha256 = "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ @@ -220116,40 +230320,18 @@ self: { }) {}; "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; - }) {}; - - "zm_0_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, convertible , cryptonite, deepseq, doctest, either, filemanip, flat, memory - , model, mtl, pretty, tasty, tasty-hunit, tasty-quickcheck, text - , timeit, transformers + , model, pretty, tasty, tasty-hunit, tasty-quickcheck, text, timeit + , transformers }: mkDerivation { pname = "zm"; - version = "0.3.1"; - sha256 = "0cdggfyzb0h3xfjm91l3rx28yq1ksxfprn1wp1mdj1zm7y0paiiv"; + version = "0.3.2"; + sha256 = "02f7qm3l3xmdpv6w0hxhnzimxc1pab921c0rzprj4l5mvv69adx0"; libraryHaskellDepends = [ base bytestring containers convertible cryptonite deepseq either - flat memory model mtl pretty text transformers + flat memory model pretty text transformers ]; testHaskellDepends = [ base bytestring containers doctest filemanip flat model pretty @@ -220181,8 +230363,8 @@ self: { ({ mkDerivation, base, binary, bytestring, containers }: mkDerivation { pname = "zmidi-core"; - version = "0.8.1"; - sha256 = "1n6bcblk8ck1xgbyd7gspisg3i3zw3pqzi6s402ivsi03ns0iysv"; + version = "0.8.2"; + sha256 = "02895shbxbswnczgljafr9k7vfrxg7w2sqhnlx8azixkw84lk5mh"; libraryHaskellDepends = [ base binary bytestring containers ]; homepage = "https://github.com/stephentetley/zmidi-core"; description = "Read and write MIDI files"; @@ -220353,7 +230535,6 @@ self: { executableHaskellDepends = [ base monads-tf ]; description = "Zot language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "zre" = callPackage @@ -220426,10 +230607,8 @@ self: { }: mkDerivation { pname = "ztail"; - version = "1.2"; - sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk"; - revision = "2"; - editedCabalFile = "0da9vwpn7nv37zznav18vp9h4knr0d433964dp3mvnh42ajb0490"; + version = "1.2.0.2"; + sha256 = "05vpq3kiv1xrby2k1qn41s42cxxxblcgxpnw1sgyznx63pal2hx1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -220438,6 +230617,46 @@ self: { ]; description = "Multi-file, colored, filtered log tailer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zuramaru" = callPackage + ({ mkDerivation, base, cmdargs, containers, distributive, doctest + , either, extensible, extra, lens, megaparsec, mono-traversable + , mtl, profunctors, readline, safe, safe-exceptions, silently + , singletons, string-qq, tasty, tasty-discover, tasty-hunit + , template-haskell, text, text-show, throwable-exceptions + , transformers + }: + mkDerivation { + pname = "zuramaru"; + version = "0.1.0.0"; + sha256 = "0g8kkwyjmsj5wqsqn6yxg9qr79ljfskc5qy4wg0xvlb8781xbj8m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs containers distributive either extensible extra lens + megaparsec mono-traversable mtl profunctors readline safe + safe-exceptions singletons string-qq template-haskell text + text-show throwable-exceptions transformers + ]; + executableHaskellDepends = [ + base cmdargs containers distributive either extensible extra lens + megaparsec mono-traversable mtl profunctors readline safe + safe-exceptions singletons string-qq template-haskell text + text-show throwable-exceptions transformers + ]; + testHaskellDepends = [ + base cmdargs containers distributive doctest either extensible + extra lens megaparsec mono-traversable mtl profunctors readline + safe safe-exceptions silently singletons string-qq tasty + tasty-discover tasty-hunit template-haskell text text-show + throwable-exceptions transformers + ]; + homepage = "https://github.com/aiya000/hs-zuramaru"; + description = "A lisp processor, An inline-lisp, in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zxcvbn-c" = callPackage @@ -220449,7 +230668,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Password strength estimation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; } diff --git a/pkgs/development/haskell-modules/initial-packages.nix b/pkgs/development/haskell-modules/initial-packages.nix new file mode 100644 index 0000000000000000000000000000000000000000..6ab7da969119899c07c779216bc07dd8c04539d0 --- /dev/null +++ b/pkgs/development/haskell-modules/initial-packages.nix @@ -0,0 +1,2 @@ +args@{ pkgs, stdenv, callPackage }: self: + (import ./hackage-packages.nix args self) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 96520dce2b2d0e442fe3598807196707a0483d03..ff86e06979c1de4293a7ec54d16b8f08e561e995 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -3,33 +3,139 @@ { pkgs, lib }: rec { + /* This function takes a file like `hackage-packages.nix` and constructs + a full package set out of that. + */ makePackageSet = import ./make-package-set.nix; + /* The function overrideCabal lets you alter the arguments to the + mkDerivation function. + + Example: + + First, note how the aeson package is constructed in hackage-packages.nix: + + "aeson" = callPackage ({ mkDerivation, attoparsec, + }: + mkDerivation { + pname = "aeson"; + + homepage = "https://github.com/bos/aeson"; + }) + + The mkDerivation function of haskellPackages will take care of putting + the homepage in the right place, in meta. + + > haskellPackages.aeson.meta.homepage + "https://github.com/bos/aeson" + + > x = haskell.lib.overrideCabal haskellPackages.aeson (old: { homepage = old.homepage + "#readme"; }) + > x.meta.homepage + "https://github.com/bos/aeson#readme" + + */ overrideCabal = drv: f: (drv.override (args: args // { mkDerivation = drv: (args.mkDerivation drv).override f; })) // { overrideScope = scope: overrideCabal (drv.overrideScope scope) f; }; + # : 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; + + /* doCoverage modifies a haskell package to enable the generation + and installation of a coverage report. + + See https://wiki.haskell.org/Haskell_program_coverage + */ doCoverage = drv: overrideCabal drv (drv: { doCoverage = true; }); + + /* dontCoverage modifies a haskell package to disable the generation + and installation of a coverage report. + */ dontCoverage = drv: overrideCabal drv (drv: { doCoverage = false; }); + /* doHaddock modifies a haskell package to enable the generation and + installation of API documentation from code comments using the + haddock tool. + */ doHaddock = drv: overrideCabal drv (drv: { doHaddock = true; }); + + /* dontHaddock modifies a haskell package to disable the generation and + installation of API documentation from code comments using the + haddock tool. + */ dontHaddock = drv: overrideCabal drv (drv: { doHaddock = false; }); + /* doJailbreak enables the removal of version bounds from the cabal + file. You may want to avoid this function. + + This is useful when a package reports that it can not be built + due to version mismatches. In some cases, removing the version + bounds entirely is an easy way to make a package build, but at + the risk of breaking software in non-obvious ways now or in the + future. + + Instead of jailbreaking, you can patch the cabal file. + */ doJailbreak = drv: overrideCabal drv (drv: { jailbreak = true; }); + + /* dontJailbreak restores the use of the version bounds the check + the use of dependencies in the package description. + */ dontJailbreak = drv: overrideCabal drv (drv: { jailbreak = false; }); + /* doCheck enables dependency checking, compilation and execution + of test suites listed in the package description file. + */ doCheck = drv: overrideCabal drv (drv: { doCheck = true; }); + /* dontCheck disables dependency checking, compilation and execution + of test suites listed in the package description file. + */ dontCheck = drv: overrideCabal drv (drv: { doCheck = false; }); + /* doBenchmark enables dependency checking, compilation and execution + for benchmarks listed in the package description file. + */ doBenchmark = drv: overrideCabal drv (drv: { doBenchmark = true; }); + /* dontBenchmark disables dependency checking, compilation and execution + for benchmarks listed in the package description file. + */ dontBenchmark = drv: overrideCabal drv (drv: { doBenchmark = false; }); + /* doDistribute enables the distribution of binaries for the package + via hydra. + */ doDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = drv.platforms or ["i686-linux" "x86_64-linux" "x86_64-darwin"]; }); + /* dontDistribute disables the distribution of binaries for the package + via hydra. + */ dontDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = []; }); + /* appendConfigureFlag adds a single argument that will be passed to the + cabal configure command, after the arguments that have been defined + in the initial declaration or previous overrides. + + Example: + + > haskell.lib.appendConfigureFlag haskellPackages.servant "--profiling-detail=all-functions" + */ appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; }); + + /* removeConfigureFlag drv x is a Haskell package like drv, but with + all cabal configure arguments that are equal to x removed. + + > haskell.lib.removeConfigureFlag haskellPackages.servant "--verbose" + */ removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = lib.remove x (drv.configureFlags or []); }); addBuildTool = drv: x: addBuildTools drv [x]; @@ -50,12 +156,15 @@ rec { enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}"; disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}"; - markBroken = drv: overrideCabal drv (drv: { broken = true; }); + markBroken = drv: overrideCabal drv (drv: { broken = true; hydraPlatforms = []; }); markBrokenVersion = version: drv: assert drv.version == version; markBroken drv; enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; }); disableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = false; }); + enableExecutableProfiling = drv: overrideCabal drv (drv: { enableExecutableProfiling = true; }); + disableExecutableProfiling = drv: overrideCabal drv (drv: { enableExecutableProfiling = false; }); + enableSharedExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = true; }); disableSharedExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = false; }); @@ -76,17 +185,28 @@ rec { disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; }); - # Controls if Nix should strip the binary files (removes debug symbols) + /* Let Nix strip the binary files. + * This removes debugging symbols. + */ doStrip = drv: overrideCabal drv (drv: { dontStrip = false; }); + + /* Stop Nix from stripping the binary files. + * This keeps debugging symbols. + */ dontStrip = drv: overrideCabal drv (drv: { dontStrip = true; }); - # Useful for debugging segfaults with gdb. - # -g: enables debugging symbols - # --disable-*-stripping: tell GHC not to strip resulting binaries - # dontStrip: see above + /* Useful for debugging segfaults with gdb. + * This includes dontStrip. + */ enableDWARFDebugging = drv: + # -g: enables debugging symbols + # --disable-*-stripping: tell GHC not to strip resulting binaries + # dontStrip: see above appendConfigureFlag (dontStrip drv) "--ghc-options=-g --disable-executable-stripping --disable-library-stripping"; + /* Create a source distribution tarball like those found on hackage, + instead of building the package. + */ sdistTarball = pkg: lib.overrideDerivation pkg (drv: { name = "${drv.pname}-source-${drv.version}"; # Since we disable the haddock phase, we also need to override the @@ -99,19 +219,27 @@ rec { fixupPhase = ":"; }); + /* Use the gold linker. It is a linker for ELF that is designed + "to run as fast as possible on modern systems" + */ 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 + /* 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"; - } // lib.optionalAttrs (pkgs.hostPlatform.isDarwin) { - configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"]; }); + /* Build a source distribution tarball instead of using the source files + directly. The effect is that the package is built as if it were published + on hackage. This can be used as a test for the source distribution, + assuming the build fails when packaging mistakes are in the cabal file. + */ buildFromSdist = pkg: lib.overrideDerivation pkg (drv: { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' echo "Source tarball is at ${src}/${tarname}.tar.gz" @@ -120,10 +248,22 @@ rec { ''; }); + /* Build the package in a strict way to uncover potential problems. + This includes buildFromSdist and failOnAllWarnings. + */ buildStrictly = pkg: buildFromSdist (failOnAllWarnings pkg); + /* Turn on most of the compiler warnings and fail the build if any + of them occur. */ failOnAllWarnings = drv: appendConfigureFlag drv "--ghc-option=-Wall --ghc-option=-Werror"; + /* Add a post-build check to verify that dependencies declared in + the cabal file are actually used. + + The first attrset argument can be used to configure the strictness + of this check and a list of ignored package names that would otherwise + cause false alarms. + */ checkUnusedPackages = { ignoreEmptyImports ? false , ignoreMainModule ? false @@ -142,9 +282,99 @@ rec { buildStackProject = pkgs.callPackage ./generic-stack-builder.nix { }; + /* Add a dummy command to trigger a build despite an equivalent + earlier build that is present in the store or cache. + */ triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); + /* Override the sources for the package and optionaly the version. + This also takes of removing editedCabalFile. + */ overrideSrc = drv: { src, version ? drv.version }: overrideCabal drv (_: { inherit src version; editedCabalFile = null; }); + # Extract the haskell build inputs of a haskell package. + # This is useful to build environments for developing on that + # package. + getHaskellBuildInputs = p: + (p.override { mkDerivation = extractBuildInputs p.compiler; + }).haskellBuildInputs; + + # Under normal evaluation, simply return the original package. Under + # nix-shell evaluation, return a nix-shell optimized environment. + shellAware = p: if lib.inNixShell then p.env else p; + + ghcInfo = ghc: + rec { isCross = (ghc.cross or null) != null; + isGhcjs = ghc.isGhcjs or false; + nativeGhc = if isCross || isGhcjs + then ghc.bootPkgs.ghc + else ghc; + }; + + ### mkDerivation helpers + # These allow external users of a haskell package to extract + # information about how it is built in the same way that the + # generic haskell builder does, by reusing the same functions. + # Each function here has the same interface as mkDerivation and thus + # can be called for a given package simply by overriding the + # mkDerivation argument it used. See getHaskellBuildInputs above for + # an example of this. + + # Some information about which phases should be run. + controlPhases = ghc: let inherit (ghcInfo ghc) isCross; in + { doCheck ? !isCross && (lib.versionOlder "7.4" ghc.version) + , doBenchmark ? false + , ... + }: { inherit doCheck doBenchmark; }; + + # Divide the build inputs of the package into useful sets. + extractBuildInputs = ghc: + { setupHaskellDepends ? [], extraLibraries ? [] + , librarySystemDepends ? [], executableSystemDepends ? [] + , pkgconfigDepends ? [], libraryPkgconfigDepends ? [] + , executablePkgconfigDepends ? [], testPkgconfigDepends ? [] + , benchmarkPkgconfigDepends ? [], testDepends ? [] + , testHaskellDepends ? [], testSystemDepends ? [] + , testToolDepends ? [], benchmarkDepends ? [] + , benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [] + , benchmarkToolDepends ? [], buildDepends ? [] + , libraryHaskellDepends ? [], executableHaskellDepends ? [] + , ... + }@args: + let inherit (ghcInfo ghc) isGhcjs nativeGhc; + inherit (controlPhases ghc args) doCheck doBenchmark; + isHaskellPkg = x: x ? isHaskellLibrary; + allPkgconfigDepends = + pkgconfigDepends ++ libraryPkgconfigDepends ++ + executablePkgconfigDepends ++ + lib.optionals doCheck testPkgconfigDepends ++ + lib.optionals doBenchmark benchmarkPkgconfigDepends; + otherBuildInputs = + setupHaskellDepends ++ extraLibraries ++ + librarySystemDepends ++ executableSystemDepends ++ + allPkgconfigDepends ++ + lib.optionals doCheck ( testDepends ++ testHaskellDepends ++ + testSystemDepends ++ testToolDepends + ) ++ + # ghcjs's hsc2hs calls out to the native hsc2hs + lib.optional isGhcjs nativeGhc ++ + lib.optionals doBenchmark ( benchmarkDepends ++ + benchmarkHaskellDepends ++ + benchmarkSystemDepends ++ + benchmarkToolDepends + ); + propagatedBuildInputs = + buildDepends ++ libraryHaskellDepends ++ + executableHaskellDepends; + allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; + isHaskellPartition = + lib.partition isHaskellPkg allBuildInputs; + in + { haskellBuildInputs = isHaskellPartition.right; + systemBuildInputs = isHaskellPartition.wrong; + inherit propagatedBuildInputs otherBuildInputs + allPkgconfigDepends; + }; + } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 61043252155e14d9c3a332c4dde239cf0da91c05..bde4f85f67846c5da436a3340a4356b3d26dd384 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -1,7 +1,14 @@ # This expression takes a file like `hackage-packages.nix` and constructs # a full package set out of that. -{ # package-set used for non-haskell dependencies (all of nixpkgs) +{ # package-set used for build tools (all of nixpkgs) + buildPackages + +, # A haskell package set for Setup.hs, compiler plugins, and similar + # build-time uses. + buildHaskellPackages + +, # package-set used for non-haskell dependencies (all of nixpkgs) pkgs , # stdenv to use for building haskell packages @@ -15,8 +22,8 @@ , # compiler to use ghc -, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and `self` - # as second, and returns a set of haskell packages +, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and + # `self` as second, and returns a set of haskell packages package-set , # The final, fully overriden package set usable with the nixpkgs fixpoint @@ -28,19 +35,18 @@ self: let + inherit (stdenv) buildPlatform hostPlatform; inherit (stdenv.lib) fix' extends makeOverridable; inherit (haskellLib) 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; + nodejs = buildPackages.nodejs-slim; + inherit buildHaskellPackages; inherit (self) ghc; - hscolour = overrideCabal self.hscolour (drv: { + inherit (buildHaskellPackages) jailbreak-cabal; + hscolour = overrideCabal buildHaskellPackages.hscolour (drv: { isLibrary = false; doHaddock = false; hyperlinkSource = false; # Avoid depending on hscolour for this build. @@ -75,8 +81,8 @@ let # 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; + drv = if stdenv.lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (stdenv.lib.functionArgs drv) scope; # this wraps the `drv` function to add a `overrideScope` function to the result. drvScope = allArgs: drv allArgs // { @@ -95,26 +101,26 @@ let defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; - withPackages = packages: callPackage ./with-packages-wrapper.nix { + withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix { inherit (self) llvmPackages; - haskellPackages = self; + inherit ghc; inherit packages; }; - haskellSrc2nix = { name, src, sha256 ? null }: + haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; - in pkgs.stdenv.mkDerivation { + in pkgs.buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; - buildInputs = [ pkgs.haskellPackages.cabal2nix ]; + nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ]; preferLocalBuild = true; phases = ["installPhase"]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.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" + cabal2nix --compiler=${ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" ''; }; @@ -130,57 +136,58 @@ let src = "${component}/${name}.cabal"; }; + # Adds a nix file as an input to the haskell derivation it + # produces. This is useful for callHackage / callCabal2nix to + # prevent the generated default.nix from being garbage collected + # (requiring it to be frequently rebuilt), which can be an + # annoyance. + callPackageKeepDeriver = src: args: + overrideCabal (self.callPackage src args) (orig: { + preConfigure = '' + # Generated from ${src} + ${orig.preConfigure or ""} + ''; + }); + in package-set { inherit pkgs stdenv callPackage; } self // { inherit mkDerivation callPackage haskellSrc2nix hackage2nix; - callHackage = name: version: self.callPackage (self.hackage2nix name version); + inherit (haskellLib) packageSourceOverrides; + + callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: args: if builtins.typeOf src != "path" - then self.callPackage (haskellSrc2nix { inherit name src; }) args - else - # When `src` is a Nix path literal, only use `cabal2nix` on - # the cabal file, so that the "import-from-derivation" is only - # recomputed when the cabal file changes, and so your source - # code isn't duplicated into the nix store on every change. - # This can only be done when `src` is a Nix path literal - # because that is the only kind of source that - # `builtins.filterSource` works on. But this filtering isn't - # usually important on other kinds of sources, like - # `fetchFromGitHub`. - overrideCabal (self.callPackage (haskellSrc2nix { - inherit name; - src = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src; - }) args) (_: { inherit src; }); - - # : 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; + callCabal2nix = name: src: args: let + filter = path: type: + pkgs.lib.hasSuffix "${name}.cabal" path || + baseNameOf path == "package.yaml"; + expr = haskellSrc2nix { + inherit name; + src = if pkgs.lib.canCleanSource src + then pkgs.lib.cleanSourceWith { inherit src filter; } + else src; + }; + in overrideCabal (callPackageKeepDeriver expr args) (orig: { + inherit src; + }); # : { root : Path # , source-overrides : Defaulted (Either Path VersionNumber) # , overrides : Defaulted (HaskellPackageOverrideSet) + # , modifier : Defaulted # } -> 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: {} }: + # function, an optional set of arbitrary overrides, and an optional + # haskell package modifier, return a derivation appropriate + # for nix-build or nix-shell to build that package. + developPackage = { root, source-overrides ? {}, overrides ? self: super: {}, modifier ? drv: drv }: 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; + in if pkgs.lib.inNixShell then (modifier drv).env else modifier drv; ghcWithPackages = selectFrom: withPackages (selectFrom self); @@ -192,6 +199,52 @@ in package-set { inherit pkgs stdenv callPackage; } self // { }; in withPackages (packages ++ [ hoogle ]); + # Returns a derivation whose environment contains a GHC with only + # the dependencies of packages listed in `packages`, not the + # packages themselves. Using nix-shell on this derivation will + # give you an environment suitable for developing the listed + # packages with an incremental tool like cabal-install. + # + # # default.nix + # with import {}; + # haskellPackages.extend (haskell.lib.packageSourceOverrides { + # frontend = ./frontend; + # backend = ./backend; + # common = ./common; + # }) + # + # # shell.nix + # (import ./.).shellFor { + # packages = p: [p.frontend p.backend p.common]; + # withHoogle = true; + # } + # + # -- cabal.project + # packages: + # frontend/ + # backend/ + # common/ + # + # bash$ nix-shell --run "cabal new-build all" + shellFor = { packages, withHoogle ? false, ... } @ args: + let + selected = packages self; + packageInputs = builtins.map (p: p.override { mkDerivation = haskellLib.extractBuildInputs p.compiler; }) selected; + haskellInputs = + builtins.filter + (input: pkgs.lib.all (p: input.outPath != p.outPath) selected) + (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs); + systemInputs = pkgs.lib.concatMap (p: p.systemBuildInputs) packageInputs; + withPackages = if withHoogle then self.ghcWithHoogle else self.ghcWithPackages; + mkDrvArgs = builtins.removeAttrs args ["packages" "withHoogle"]; + in pkgs.stdenv.mkDerivation (mkDrvArgs // { + name = "ghc-shell-for-packages"; + nativeBuildInputs = [(withPackages (_: haskellInputs))] ++ mkDrvArgs.nativeBuildInputs or []; + buildInputs = systemInputs ++ mkDrvArgs.buildInputs or []; + phases = ["installPhase"]; + installPhase = "echo $nativeBuildInputs $buildInputs > $out"; + }); + ghc = ghc // { withPackages = self.ghcWithPackages; withHoogle = self.ghcWithHoogle; diff --git a/pkgs/development/haskell-modules/patches/hie-testsuite.patch b/pkgs/development/haskell-modules/patches/hie-testsuite.patch new file mode 100644 index 0000000000000000000000000000000000000000..86cac15c2464ff4ab513bd2f6e863592dd3fd259 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/hie-testsuite.patch @@ -0,0 +1,40 @@ +diff --git a/test/HaRePluginSpec.hs b/test/HaRePluginSpec.hs +index 039c094..d0d1fa4 100644 +--- a/test/HaRePluginSpec.hs ++++ b/test/HaRePluginSpec.hs +@@ -326,35 +326,6 @@ hareSpec = do + $ List [TextEdit (Range (Position 4 0) (Position 8 12)) + "parseStr = char '\"' *> (many1 (noneOf \"\\\"\")) <* char '\"'"]) + Nothing) +- it "finds definition across components" $ do +- let u = filePathToUri "./app/Main.hs" +- let lreq = setTypecheckedModule u +- let req = findDef u (toPos (7,8)) +- r <- dispatchRequestPGoto $ lreq >> req +- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib.hs") +- (Range (toPos (6,1)) (toPos (6,9)))] +- let req2 = findDef u (toPos (7,20)) +- r2 <- dispatchRequestPGoto $ lreq >> req2 +- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs") +- (Range (toPos (5,1)) (toPos (5,2)))] +- it "finds definition in the same component" $ do +- let u = filePathToUri "./src/Lib2.hs" +- let lreq = setTypecheckedModule u +- let req = findDef u (toPos (6,5)) +- r <- dispatchRequestPGoto $ lreq >> req +- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib.hs") +- (Range (toPos (6,1)) (toPos (6,9)))] +- it "finds local definitions" $ do +- let u = filePathToUri "./src/Lib2.hs" +- let lreq = setTypecheckedModule u +- let req = findDef u (toPos (7,11)) +- r <- dispatchRequestPGoto $ lreq >> req +- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs") +- (Range (toPos (10,9)) (toPos (10,10)))] +- let req2 = findDef u (toPos (10,13)) +- r2 <- dispatchRequestPGoto $ lreq >> req2 +- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs") +- (Range (toPos (9,9)) (toPos (9,10)))] + + + -- --------------------------------- diff --git a/pkgs/development/haskell-modules/patches/lzma-tests.patch b/pkgs/development/haskell-modules/patches/lzma-tests.patch new file mode 100644 index 0000000000000000000000000000000000000000..db9e62ee3c5f098bcd8b740574d1e5825c18ab7c --- /dev/null +++ b/pkgs/development/haskell-modules/patches/lzma-tests.patch @@ -0,0 +1,11 @@ +--- a/lzma.cabal ++++ b/lzma.cabal +@@ -76,7 +76,7 @@ + -- additional dependencies that require version bounds + build-depends: HUnit >= 1.2 && <1.7 + , QuickCheck >= 2.8 && <2.11 +- , tasty >= 0.10 && <0.13 ++ , tasty >= 0.10 && <1.1 + , tasty-hunit >= 0.9 && <0.11 + , tasty-quickcheck >= 0.8.3.2 && <0.10 + diff --git a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..3917c2f0afd72187337cc74033ae40fffe3da636 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch @@ -0,0 +1,107 @@ +From 86595e193e8d46c769ab2a1cee961e8e04dfd1b9 Mon Sep 17 00:00:00 2001 +From: Michiel Derhaeg +Date: Tue, 20 Mar 2018 22:06:18 +0100 +Subject: [PATCH] update to work with GHC 8.4.1 + +--- + XMonad/Hooks/FadeWindows.hs | 6 +++++- + XMonad/Hooks/WallpaperSetter.hs | 6 +++++- + XMonad/Layout/Mosaic.hs | 6 +++++- + xmonad-contrib.cabal | 5 +++-- + 5 files changed, 33 insertions(+), 5 deletions(-) + +diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs +index 4b8e62b6..01d06792 100644 +--- a/XMonad/Hooks/FadeWindows.hs ++++ b/XMonad/Hooks/FadeWindows.hs +@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask + ,asks) + import Control.Monad.State (gets) + import qualified Data.Map as M +-import Data.Monoid ++import Data.Monoid hiding ((<>)) ++import Data.Semigroup + + import Graphics.X11.Xlib.Extras (Event(..)) + +@@ -134,6 +135,9 @@ instance Monoid Opacity where + r `mappend` OEmpty = r + _ `mappend` r = r + ++instance Semigroup Opacity where ++ (<>) = mappend ++ + -- | A FadeHook is similar to a ManageHook, but records window opacity. + type FadeHook = Query Opacity + +diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs +index 00a3b1c3..d4f5ccb2 100644 +--- a/XMonad/Hooks/WallpaperSetter.hs ++++ b/XMonad/Hooks/WallpaperSetter.hs +@@ -41,7 +41,8 @@ import Data.Ord (comparing) + import Control.Monad + import Control.Applicative + import Data.Maybe +-import Data.Monoid ++import Data.Monoid hiding ((<>)) ++import Data.Semigroup + + -- $usage + -- This module requires imagemagick and feh to be installed, as these are utilized +@@ -86,6 +87,9 @@ instance Monoid WallpaperList where + mappend (WallpaperList w1) (WallpaperList w2) = + WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1) + ++instance Semigroup WallpaperList where ++ (<>) = mappend ++ + -- | Complete wallpaper configuration passed to the hook + data WallpaperConf = WallpaperConf { + wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/) +diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs +index 05655d4c..da44fc50 100644 +--- a/XMonad/Layout/Mosaic.hs ++++ b/XMonad/Layout/Mosaic.hs +@@ -38,7 +38,8 @@ import Control.Monad(mplus) + import Data.Foldable(Foldable,foldMap, sum) + import Data.Function(on) + import Data.List(sortBy) +-import Data.Monoid(Monoid,mempty, mappend) ++import Data.Monoid(Monoid,mempty, mappend, (<>)) ++import Data.Semigroup + + + -- $usage +@@ -202,6 +203,9 @@ instance Monoid (Tree a) where + mappend x Empty = x + mappend x y = Branch x y + ++instance Semigroup (Tree a) where ++ (<>) = mappend ++ + makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a + makeTree _ [] = Empty + makeTree _ [x] = Leaf x +diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal +index dde3ccda..c401c6e6 100644 +--- a/xmonad-contrib.cabal ++++ b/xmonad-contrib.cabal +@@ -36,7 +36,7 @@ cabal-version: >= 1.6 + build-type: Simple + bug-reports: https://github.com/xmonad/xmonad-contrib/issues + +-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1 ++tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1 + + source-repository head + type: git +@@ -66,7 +66,8 @@ library + unix, + X11>=1.6.1 && < 1.9, + xmonad>=0.13 && < 0.14, +- utf8-string ++ utf8-string, ++ semigroups + + if flag(use_xft) + build-depends: X11-xft >= 0.2 diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index ac484b3c1124b85be06b15c428e8a11d365dfee0..03f0a1dd0a3e15b9fc2d92eee04caf8d11cfe536 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,7 +1,6 @@ -{ stdenv, lib, ghc, llvmPackages, packages, symlinkJoin, makeWrapper -, ignoreCollisions ? false, withLLVM ? false +{ lib, targetPlatform, ghc, llvmPackages, packages, symlinkJoin, makeWrapper +, withLLVM ? false , postBuild ? "" -, haskellPackages , ghcLibdir ? null # only used by ghcjs, when resolving plugins }: @@ -36,9 +35,8 @@ let 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"; - crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; - ghcCommand = "${crossPrefix}${ghcCommand'}"; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; @@ -46,10 +44,10 @@ let paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); hasLibraries = lib.any (x: x.isHaskellLibrary) paths; # CLang is needed on Darwin for -fllvm to work: - # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html + # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm llvm = lib.makeBinPath ([ llvmPackages.llvm ] - ++ lib.optional stdenv.isDarwin llvmPackages.clang); + ++ lib.optional targetPlatform.isDarwin llvmPackages.clang); in if paths == [] && !withLLVM then ghc else symlinkJoin { @@ -58,8 +56,6 @@ symlinkJoin { # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; - extraOutputsToInstall = [ "out" "doc" ]; - inherit ignoreCollisions; postBuild = '' . ${makeWrapper}/nix-support/setup-hook @@ -99,7 +95,16 @@ symlinkJoin { makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" fi done - '' + (lib.optionalString stdenv.isDarwin '' + + # haddock was referring to the base ghc, https://github.com/NixOS/nixpkgs/issues/36976 + if [[ -x "${ghc}/bin/haddock" ]]; then + rm -f $out/bin/haddock + makeWrapper ${ghc}/bin/haddock $out/bin/haddock \ + --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"' \ + --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" + fi + + '' + (lib.optionalString targetPlatform.isDarwin '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; local dynamicLinksDir="$out/lib/links" @@ -107,7 +112,7 @@ symlinkJoin { # 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 + for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'|sort -u); do ln -s $d/*.dylib $dynamicLinksDir done for f in $packageConfDir/*.conf; do @@ -133,6 +138,5 @@ symlinkJoin { passthru = { preferLocalBuild = true; inherit (ghc) version meta; - inherit haskellPackages; }; } diff --git a/pkgs/development/idris-modules/README.md b/pkgs/development/idris-modules/README.md index 005ed3602851ccee3a0dba23da67976335751471..80b7ccefbcfa9fec9d9fc2aa34a70e1c49317981 100644 --- a/pkgs/development/idris-modules/README.md +++ b/pkgs/development/idris-modules/README.md @@ -1,39 +1 @@ -Idris packages -============== - -This directory contains build rules for idris packages. In addition, -it contains several functions to build and compose those packages. -Everything is exposed to the user via the `idrisPackages` attribute. - -callPackage ------------- - -This is like the normal nixpkgs callPackage function, specialized to -idris packages. - -builtins ---------- - -This is a list of all of the libraries that come packaged with Idris -itself. - -build-idris-package --------------------- - -A function to build an idris package. Its sole argument is a set like -you might pass to `stdenv.mkDerivation`, except `build-idris-package` -sets several attributes for you. See `build-idris-package.nix` for -details. - -build-builtin-package ----------------------- - -A version of `build-idris-package` specialized to builtin libraries. -Mostly for internal use. - -with-packages -------------- - -Bundle idris together with a list of packages. Because idris currently -only supports a single directory in its library path, you must include -all desired libraries here, including `prelude` and `base`. \ No newline at end of file +Moved to [/doc/languages-frameworks/idris.section.md](/doc/languages-frameworks/idris.section.md) diff --git a/pkgs/development/idris-modules/array.nix b/pkgs/development/idris-modules/array.nix new file mode 100644 index 0000000000000000000000000000000000000000..cab7ccbcf7a8937a6b102ef46140c346a88f24a7 --- /dev/null +++ b/pkgs/development/idris-modules/array.nix @@ -0,0 +1,30 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "array"; + version = "2016-10-14"; + + idrisDeps = [ prelude base ]; + + extraBuildInputs = [ idris ]; + + src = fetchFromGitHub { + owner = "idris-hackers"; + repo = "idris-array"; + rev = "eb5c034d3c65b5cf465bd0715e65859b8f69bf15"; + sha256 = "148dnyd664vnxi04zjsyjbs1y51dq0zz98005q9c042k4jcfpfjh"; + }; + + meta = { + description = "Primitive flat arrays containing Idris values"; + homepage = https://github.com/idris-hackers/idris-array; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix new file mode 100644 index 0000000000000000000000000000000000000000..fb43fbf209bb5b4e606ef57baebbe83baf6af2e7 --- /dev/null +++ b/pkgs/development/idris-modules/bi.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, pruviloj +, lib +, idris +}: +build-idris-package { + name = "bi"; + version = "2018-01-17"; + + idrisDeps = [ prelude contrib pruviloj ]; + + src = fetchFromGitHub { + owner = "sbp"; + repo = "idris-bi"; + rev = "8ab40bc482ca948ac0f6ffb5b4c545a73688dd3a"; + sha256 = "1lra945q2d6anwzjs94srprqj867lrz66rsns08p8828vg55fv97"; + }; + + meta = { + description = "Idris Binary Integer Arithmetic, porting PArith, NArith, and ZArith from Coq"; + homepage = https://github.com/sbp/idris-bi; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix new file mode 100644 index 0000000000000000000000000000000000000000..d8212fa3830a7bf40b498e06255b16102e2bc734 --- /dev/null +++ b/pkgs/development/idris-modules/bifunctors.nix @@ -0,0 +1,31 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "bifunctors"; + version = "2017-02-07"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "japesinator"; + repo = "Idris-Bifunctors"; + rev = "be7b8bde88331ad3af87e5c0a23fc0f3d52f3868"; + sha256 = "0cfp58lhm2g0g1vrpb0mh71qb44n2yvg5sil9ndyf2sqd5ria6yq"; + }; + + postUnpack = '' + rm source/test.ipkg + ''; + + meta = { + description = "A small bifunctor library for idris"; + homepage = https://github.com/japesinator/Idris-Bifunctors; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index 6de3f8b16669556c89f12116efcb2dc8ddeb9434..44efa97a53193a34d6f1e9e170afcccc486535b7 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,4 +1,4 @@ -# Build one of the packages that come with idris +# Build one of the packages that comes with idris # name: The name of the package # deps: The dependencies of the package { idris, build-idris-package, lib }: name: deps: @@ -6,20 +6,16 @@ let inherit (builtins.parseDrvName idris.name) version; in build-idris-package { - name = "${name}-${version}"; - - propagatedBuildInputs = deps; + inherit name version; inherit (idris) src; + idrisDeps = deps; + postUnpack = '' sourceRoot=$sourceRoot/libs/${name} ''; - postPatch = '' - sed -i ${name}.ipkg -e "/^opts/ s|-i \\.\\./|-i $IDRIS_LIBRARY_PATH/|g" - ''; - meta = idris.meta // { description = "${name} builtin Idris library"; }; diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 9dfa3430ed8be8e45d3721d8c6d82f09342b01a1..0416e76afa9e0a06e78fbe90742a77f94aaff086 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -1,41 +1,46 @@ # Build an idris package -# -# args: Additional arguments to pass to mkDerivation. Generally should include at least -# name and src. -{ stdenv, idris, gmp }: args: stdenv.mkDerivation ({ - preHook = '' - # Library import path - export IDRIS_LIBRARY_PATH=$PWD/idris-libs - mkdir -p $IDRIS_LIBRARY_PATH - - # Library install path - export IBCSUBDIR=$out/lib/${idris.name} - mkdir -p $IBCSUBDIR - - addIdrisLibs () { - if [ -d $1/lib/${idris.name} ]; then - ln -sv $1/lib/${idris.name}/* $IDRIS_LIBRARY_PATH - fi - } - - envHooks+=(addIdrisLibs) +{ stdenv, idrisPackages, gmp }: + { idrisDeps ? [] + , name + , version + , src + , meta + , extraBuildInputs ? [] + , postUnpack ? "" + , doCheck ? true + }: +let + idris-with-packages = idrisPackages.with-packages idrisDeps; +in +stdenv.mkDerivation ({ + + name = "${name}-${version}"; + + inherit postUnpack src doCheck meta; + + + # Some packages use the style + # opts = -i ../../path/to/package + # rather than the declarative pkgs attribute so we have to rewrite the path. + postPatch = '' + sed -i *.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g" ''; buildPhase = '' - ${idris}/bin/idris --build *.ipkg + ${idris-with-packages}/bin/idris --build *.ipkg ''; - doCheck = true; - checkPhase = '' if grep -q test *.ipkg; then - ${idris}/bin/idris --testpkg *.ipkg + ${idris-with-packages}/bin/idris --testpkg *.ipkg fi ''; installPhase = '' - ${idris}/bin/idris --install *.ipkg --ibcsubdir $IBCSUBDIR + ${idris-with-packages}/bin/idris --install *.ipkg --ibcsubdir $out/libs ''; - buildInputs = [ gmp ]; -} // args) + buildInputs = [ gmp ] ++ extraBuildInputs; + + propagatedBuildInputs = idrisDeps; +}) diff --git a/pkgs/development/idris-modules/bytes.nix b/pkgs/development/idris-modules/bytes.nix new file mode 100644 index 0000000000000000000000000000000000000000..2e5518c953c4b29da8638d322862429c379a64a4 --- /dev/null +++ b/pkgs/development/idris-modules/bytes.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, lib +, idris +}: + +build-idris-package { + name = "bytes"; + version = "2018-02-10"; + + idrisDeps = [ prelude ]; + + extraBuildInputs = [ idris ]; + + src = fetchFromGitHub { + owner = "ziman"; + repo = "idris-bytes"; + rev = "c0ed9db526d4529780f9d7d2636a40faa07661a5"; + sha256 = "1xyb7k0mrk5imjf5jr2gvqwvasbfy6j4lxvz99r9icfz7crz8dfp"; + }; + + meta = { + description = "FFI-based byte buffers for Idris"; + homepage = https://github.com/ziman/idris-bytes; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix new file mode 100644 index 0000000000000000000000000000000000000000..f29d59e50508e2d8110d2f1398d5e3d60ee8ec40 --- /dev/null +++ b/pkgs/development/idris-modules/canvas.nix @@ -0,0 +1,26 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, lib +, idris +}: +build-idris-package { + name = "canvas"; + version = "2017-11-09"; + + idrisDeps = [ prelude ]; + + src = fetchFromGitHub { + owner = "JinWuZhao"; + repo = "idriscanvas"; + rev = "2957c78c0721ec3afaee9d64e051a8f8d9b6f426"; + sha256 = "0jirkqciv3j1phpm2v6fmch40b5a01rmqdng16y8mihq1wb70ayy"; + }; + + meta = { + description = "Idris FFI binding for html5 canvas 2d api"; + homepage = https://github.com/JinWuZhao/idriscanvas; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix new file mode 100644 index 0000000000000000000000000000000000000000..32be0f6a379571916f87b78124ebfafd9f122260 --- /dev/null +++ b/pkgs/development/idris-modules/categories.nix @@ -0,0 +1,27 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "categories"; + version = "2017-03-01"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "danilkolikov"; + repo = "categories"; + rev = "933fe418d154e10df39ddb09a74419cb4c4a57e8"; + sha256 = "1dmpcv13zh7j4k6s2nlpf08gmpawaqaqkbqbg8zrgw253piwb0ci"; + }; + + meta = { + description = "Category Theory"; + homepage = https://github.com/danilkolikov/categories; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix new file mode 100644 index 0000000000000000000000000000000000000000..ed51bcfec6d0663ea5b1b8f51408d77864229319 --- /dev/null +++ b/pkgs/development/idris-modules/coda.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "coda"; + version = "2018-01-25"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "ostera"; + repo = "idris-coda"; + rev = "0d8b29b7b73aa1ea80bf216e5e6dea5e81156e32"; + sha256 = "07wps3pyp4ph0vj3640x561gkjkbcdq1if9h6sjjb30924sbdxfg"; + }; + + meta = { + description = "Some Idris libraries including nodejs bindings and ISO8601 Date and Time"; + homepage = https://github.com/ostera/idris-coda; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/comonad.nix b/pkgs/development/idris-modules/comonad.nix new file mode 100644 index 0000000000000000000000000000000000000000..5ecd6d9c585eb779f3092859c873c21686fed962 --- /dev/null +++ b/pkgs/development/idris-modules/comonad.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "comonad"; + version = "2018-02-26"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "vmchale"; + repo = "comonad"; + rev = "23282592d4506708bdff79bfe1770c5f7a4ccb92"; + sha256 = "0iiknx6gj4wr9s59iz439c63h3887pilymxrc80v79lj1lsk03ac"; + }; + + meta = { + description = "Comonads for Idris"; + homepage = https://github.com/vmchale/comonad; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/composition.nix b/pkgs/development/idris-modules/composition.nix new file mode 100644 index 0000000000000000000000000000000000000000..17dda31a5d157a278f3b8064436524afb8378516 --- /dev/null +++ b/pkgs/development/idris-modules/composition.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, hezarfen +, lib +, idris +}: +build-idris-package { + name = "composition"; + version = "2017-11-12"; + + idrisDeps = [ prelude hezarfen ]; + + src = fetchFromGitHub { + owner = "vmchale"; + repo = "composition"; + rev = "8f05e8db750793a9992b315dc0a2c327b837ec8b"; + sha256 = "05424xzxx6f3ig0ravib15nr34nqvaq8spcj6b1512raqrvkkay8"; + }; + + meta = { + description = "Composition extras for Idris"; + homepage = https://github.com/vmchale/composition; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/config.nix b/pkgs/development/idris-modules/config.nix new file mode 100644 index 0000000000000000000000000000000000000000..29cb828e061542d9fd40c20dcf28e8be4ff1ed97 --- /dev/null +++ b/pkgs/development/idris-modules/config.nix @@ -0,0 +1,31 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, containers +, lightyear +, test +, lib +, idris +}: +build-idris-package { + name = "config"; + version = "2017-11-06"; + + idrisDeps = [ prelude effects containers lightyear test ]; + + src = fetchFromGitHub { + owner = "benclifford"; + repo = "idris-config"; + rev = "92f98652f5cb06a76c47809f16c661ec6cf11048"; + sha256 = "1w2w2l4drvkf8mdzh3lwn6l5lnkbxlx9p22s7spw82n5s4wib6c9"; + }; + + meta = { + description = "Parsers for various configuration files written in Idris."; + homepage = https://github.com/benclifford/idris-config; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/console.nix b/pkgs/development/idris-modules/console.nix new file mode 100644 index 0000000000000000000000000000000000000000..27b85c97c68ea60202cef602fcc15cbba0639584 --- /dev/null +++ b/pkgs/development/idris-modules/console.nix @@ -0,0 +1,30 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, idrisscript +, hrtime +, webgl +, lib +, idris +}: +build-idris-package { + name = "console"; + version = "2017-04-20"; + + idrisDeps = [ prelude idrisscript hrtime webgl ]; + + src = fetchFromGitHub { + owner = "pierrebeaucamp"; + repo = "idris-console"; + rev = "14b6bd6bf6bd78dd3935e3de12e16f8ee41e29e4"; + sha256 = "0cn4fwnf3sg6269pbfbhnmsvyaya4d8479n2hy039idxzzkxw0yb"; + }; + + meta = { + description = "An Idris library to interact with the browser console"; + homepage = https://github.com/pierrebeaucamp/idris-console; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix new file mode 100644 index 0000000000000000000000000000000000000000..fe4e729d0e04e0bdc892f102504164ef9ec0fbbb --- /dev/null +++ b/pkgs/development/idris-modules/containers.nix @@ -0,0 +1,34 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, test +, lib +, idris +}: + +build-idris-package { + name = "containers"; + version = "2017-09-10"; + + idrisDeps = [ prelude effects test ]; + + src = fetchFromGitHub { + owner = "jfdm"; + repo = "idris-containers"; + rev = "fb96aaa3f40faa432cd7a36d956dbc4fe9279234"; + sha256 = "0vyjadd9sb8qcbzvzhnqwc8wa7ma770c10xhn96jsqsnzr81k52d"; + }; + + postUnpack = '' + rm source/containers-travis.ipkg + ''; + + meta = { + description = "Various data structures for use in the Idris Language."; + homepage = https://github.com/jfdm/idris-containers; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/cube.nix b/pkgs/development/idris-modules/cube.nix new file mode 100644 index 0000000000000000000000000000000000000000..ce46c4538b5bb8428c77b6c70c0754fd5c562f7a --- /dev/null +++ b/pkgs/development/idris-modules/cube.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: + +build-idris-package { + name = "cube"; + version = "2017-07-05"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "aatxe"; + repo = "cube.idr"; + rev = "edf66d82b3a363dc65c6f5416c9e24e746bad71e"; + sha256 = "11k45j0b4qabj6zhwjvynyj56nmssf7d4fnkv66bd2w1pxnshzxg"; + }; + + meta = { + description = "An implementation of the Lambda Cube in Idris"; + homepage = https://github.com/aatxe/cube.idr; + license = lib.licenses.agpl3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/curses.nix b/pkgs/development/idris-modules/curses.nix new file mode 100644 index 0000000000000000000000000000000000000000..71bd9023840c60803c44552a381e1b4a8059cf02 --- /dev/null +++ b/pkgs/development/idris-modules/curses.nix @@ -0,0 +1,36 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, lib +, idris +, ncurses +}: +build-idris-package { + name = "curses"; + version = "2017-10-12"; + + idrisDeps = [ prelude effects ]; + + extraBuildInputs = [ ncurses.out ncurses.dev ]; + + postUnpack = '' + sed -i 's/^libs = curses$/libs = ncurses/g' source/curses.ipkg + sed -i 's/\#include /#include \/g' source/src/cursesrun.h + ''; + + src = fetchFromGitHub { + owner = "JakobBruenker"; + repo = "curses-idris"; + rev = "ea4bbcfcf691f0dc731f2dfa676011809db084cb"; + sha256 = "17q8hg5f61lk2kh3j4cwrwja282sihlcjdrx233z4237alp9w4g1"; + }; + + meta = { + description = "libusb binding for idris and Effectful curses programming"; + homepage = https://github.com/JakobBruenker/curses-idris; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/data.nix b/pkgs/development/idris-modules/data.nix new file mode 100644 index 0000000000000000000000000000000000000000..3cb78eabe96c00d9b5049ea91f7762d3dd366cae --- /dev/null +++ b/pkgs/development/idris-modules/data.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: +build-idris-package { + name = "data"; + version = "2018-03-19"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "jdevuyst"; + repo = "idris-data"; + rev = "105b78ac13235edc596287367a675d7cd04ce5d5"; + sha256 = "17wz4jddan39984qibx2x7nv2zkqznv0fpab20nrm4zgy17v77ii"; + }; + + meta = { + description = "Functional data structures in Idris"; + homepage = https://github.com/jdevuyst/idris-data; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 16f6c65b094a13d08feca3eb118c9d38d727fd01..12fbc8dfd17a7fa124b03b1f285441d676e3e6a7 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -25,22 +25,188 @@ pruviloj = [ self.prelude self.base ]; }; - files = builtins.filter (n: n != "default") (pkgs.lib.mapAttrsToList (name: type: let - m = builtins.match "(.*)\\.nix" name; - in if m == null then "default" else builtins.head m) (builtins.readDir ./.)); - in (builtins.listToAttrs (map (name: { - inherit name; - - value = callPackage (./. + "/${name}.nix") {}; - }) files)) // { + in + { inherit idris-no-deps callPackage; - # See #10450 about why we have to wrap the executable + + # Idris wrapper with specified compiler and library paths, used to build packages + idris = (pkgs.callPackage ./idris-wrapper.nix {}) idris-no-deps { path = [ pkgs.gcc ]; lib = [pkgs.gmp]; }; - # A list of all of the libraries that come with idris + # Utilities for building packages + + with-packages = callPackage ./with-packages.nix {} ; + + build-builtin-package = callPackage ./build-builtin-package.nix {}; + + build-idris-package = callPackage ./build-idris-package.nix {}; + + # The set of libraries that comes with idris + builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_; + + # Libraries + + array = callPackage ./array.nix {}; + + bi = callPackage ./bi.nix {}; + + bifunctors = callPackage ./bifunctors.nix {}; + + bytes = callPackage ./bytes.nix {}; + + canvas = callPackage ./canvas.nix {}; + + categories = callPackage ./categories.nix {}; + + coda = callPackage ./coda.nix {}; + + config = callPackage ./config.nix {}; + + comonad = callPackage ./comonad.nix {}; + + composition = callPackage ./composition.nix {}; + + console = callPackage ./console.nix {}; + + containers = callPackage ./containers.nix {}; + + cube = callPackage ./cube.nix {}; + + curses = callPackage ./curses.nix {}; + + data = callPackage ./data.nix {}; + + derive = callPackage ./derive.nix {}; + + descncrunch = callPackage ./descncrunch.nix {}; + + dict = callPackage ./dict.nix {}; + + dom = callPackage ./dom.nix {}; + + electron = callPackage ./electron.nix {}; + + eternal = callPackage ./eternal.nix {}; + + farrp = callPackage ./farrp.nix {}; + + free = callPackage ./free.nix {}; + + fsm = callPackage ./fsm.nix {}; + + glfw = callPackage ./glfw.nix {}; + + graphviz = callPackage ./graphviz.nix {}; + + hamt = callPackage ./hamt.nix {}; + + html = callPackage ./html.nix {}; + + heyting-algebra = callPackage ./heyting-algebra.nix {}; + + hezarfen = callPackage ./hezarfen.nix {}; + + hrtime = callPackage ./hrtime.nix {}; + + http = callPackage ./http.nix {}; + + http4idris = callPackage ./http4idris.nix {}; + + iaia = callPackage ./iaia.nix {}; + + idrishighlighter = callPackage ./idrishighlighter.nix {}; + + idrisscript = callPackage ./idrisscript.nix {}; + + ipkgparser = callPackage ./ipkgparser.nix {}; + + jheiling-extras = callPackage ./jheiling-extras.nix {}; + + jheiling-js = callPackage ./jheiling-js.nix {}; + + js = callPackage ./js.nix {}; + + lens = callPackage ./lens.nix {}; + + lightyear = callPackage ./lightyear.nix {}; + + logic = callPackage ./logic.nix {}; + + mapping = callPackage ./mapping.nix {}; + + mhd = callPackage ./mhd.nix {}; + + pacman = callPackage ./pacman.nix {}; + + patricia = callPackage ./patricia.nix {}; + + permutations = callPackage ./permutations.nix {}; + + pfds = callPackage ./pfds.nix {}; + + pipes = callPackage ./pipes.nix {}; + + posix = callPackage ./posix.nix {}; + + protobuf = callPackage ./protobuf.nix {}; + + rationals = callPackage ./rationals.nix {}; + + recursion_schemes = callPackage ./recursion_schemes.nix {}; + + refined = callPackage ./refined.nix {}; + + sdl = callPackage ./sdl.nix {}; + + sdl2 = callPackage ./sdl2.nix {}; + + semidirect = callPackage ./semidirect.nix {}; + + setoids = callPackage ./setoids.nix {}; + + smproc = callPackage ./smproc.nix {}; + + snippets = callPackage ./snippets.nix {}; + + software_foundations = callPackage ./software_foundations.nix {}; + + specdris = callPackage ./specdris.nix {}; + + tap = callPackage ./tap.nix {}; + + test = callPackage ./test.nix {}; + + tlhydra = callPackage ./tlhydra.nix {}; + + tomladris = callPackage ./tomladris.nix {}; + + tp = callPackage ./tp.nix {}; + + tparsec = callPackage ./tparsec.nix {}; + + transducers = callPackage ./transducers.nix {}; + + trees = callPackage ./trees.nix {}; + + union_type = callPackage ./union_type.nix {}; + + vecspace = callPackage ./vecspace.nix {}; + + webgl = callPackage ./webgl.nix {}; + + wl-pprint = callPackage ./wl-pprint.nix {}; + + wyvern = callPackage ./wyvern.nix {}; + + xhr = callPackage ./xhr.nix {}; + + yaml = callPackage ./yaml.nix {}; + + yampa = callPackage ./yampa.nix {}; + } // builtins_; in fix' (extends overrides idrisPackages) diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix new file mode 100644 index 0000000000000000000000000000000000000000..6cc2ead71fc6316ffabe0e41881b06b557087a27 --- /dev/null +++ b/pkgs/development/idris-modules/derive.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, pruviloj +, lib +, idris +}: +build-idris-package { + name = "derive"; + version = "2018-02-15"; + + idrisDeps = [ prelude contrib pruviloj ]; + + src = fetchFromGitHub { + owner = "davlum"; + repo = "derive-all-the-instances"; + rev = "2c8956807bd094ba33569227de921c6726401c42"; + sha256 = "0l7263s04r52ql292vnnx2kngld6s1dipmaz5na7m82lj9p4x17y"; + }; + + meta = { + description = "Type class deriving with elaboration reflection"; + homepage = https://github.com/davlum/derive-all-the-instances; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/descncrunch.nix b/pkgs/development/idris-modules/descncrunch.nix new file mode 100644 index 0000000000000000000000000000000000000000..736b25c9684d0a7d8cbac0478f5041f5ccd972ec --- /dev/null +++ b/pkgs/development/idris-modules/descncrunch.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, pruviloj +, lib +, idris +}: +build-idris-package { + name = "descncrunch"; + version = "2017-11-15"; + + idrisDeps = [ prelude pruviloj ]; + + src = fetchFromGitHub { + owner = "ahmadsalim"; + repo = "desc-n-crunch"; + rev = "261d9718504b8f0572c4fe7ae407a0231779bcab"; + sha256 = "09fh334aga1z1hbw79507rdv7qsh0mqzb89lvpznn7vzi9zkl8fx"; + }; + + meta = { + description = "Descriptions, levitation, and reflecting the elaborator"; + homepage = https://github.com/ahmadsalim/desc-n-crunch; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/dict.nix b/pkgs/development/idris-modules/dict.nix new file mode 100644 index 0000000000000000000000000000000000000000..ea1cd5a9fe1927168be834eb1dfbca818d87db99 --- /dev/null +++ b/pkgs/development/idris-modules/dict.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: +build-idris-package { + name = "dict"; + version = "2016-12-26"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "be5invis"; + repo = "idris-dict"; + rev = "dddc7c9f45e079b151ee03c9752b968ceeab9dab"; + sha256 = "18riq40vapg884y92w10w51j4896ah984zm5hisfv1sm9qbgx8ii"; + }; + + postUnpack = '' + sed -i 's/\"//g' source/dict.ipkg + ''; + + meta = { + description = "Dict k v in Idris"; + homepage = https://github.com/be5invis/idris-dict; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/dom.nix b/pkgs/development/idris-modules/dom.nix new file mode 100644 index 0000000000000000000000000000000000000000..0aee97f92e6196727b59ef5d16a0f107cb0f1ab5 --- /dev/null +++ b/pkgs/development/idris-modules/dom.nix @@ -0,0 +1,30 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, idrisscript +, html +, xhr +, lib +, idris +}: +build-idris-package { + name = "dom"; + version = "2017-04-22"; + + idrisDeps = [ prelude idrisscript html xhr ]; + + src = fetchFromGitHub { + owner = "pierrebeaucamp"; + repo = "idris-dom"; + rev = "6e5a2d143f62ef422358924ee7db6e8147cdc531"; + sha256 = "16z9mykw2d9rjikn07kd6igb53jgaqi8zby4nc4n0gmplmhwdx4x"; + }; + + meta = { + description = "Idris library to interact with the DOM"; + homepage = https://github.com/pierrebeaucamp/idris-dom; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix new file mode 100644 index 0000000000000000000000000000000000000000..7dabfd8f45c452260c95410d5a84cf4d77833a22 --- /dev/null +++ b/pkgs/development/idris-modules/electron.nix @@ -0,0 +1,36 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, jheiling-extras +, jheiling-js +, lib +, idris +}: + +build-idris-package { + name = "electron"; + version = "2016-03-07"; + + idrisDeps = [ prelude contrib jheiling-extras jheiling-js ]; + + src = fetchFromGitHub { + owner = "jheiling"; + repo = "idris-electron"; + rev = "f0e86f52b8e5a546a2bf714709b659c1c0b04395"; + sha256 = "1rpa7yjvfpzl06h0qbk54jd2n52nmgpf7nq5aamcinqh7h5gbiwn"; + }; + + postUnpack = '' + rm source/example_main.ipkg + rm source/example_view.ipkg + ''; + + meta = { + description = "Electron bindings for Idris"; + homepage = https://github.com/jheiling/idris-electron; + license = lib.licenses.unlicense; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/eternal.nix b/pkgs/development/idris-modules/eternal.nix new file mode 100644 index 0000000000000000000000000000000000000000..ddbc0d79b84e58bcaefa23f37c788d25000a362b --- /dev/null +++ b/pkgs/development/idris-modules/eternal.nix @@ -0,0 +1,35 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, lib +, idris +}: +build-idris-package { + name = "eternal"; + version = "2018-01-25"; + + idrisDeps = [ prelude effects ]; + + src = fetchFromGitHub { + owner = "Heather"; + repo = "Control.Eternal.Idris"; + rev = "7ead56ce6065b55104460ace945adbce38fb13eb"; + sha256 = "0b4zys4mhl6r4rbpdxr7n2n20cdc0nkh4lm8n5v4wxkmjzna5cpd"; + }; + + postUnpack = '' + printf 'makefile = Makefile\n' >> source/eternal.ipkg + printf 'objs = readProcess.o\n' >> source/eternal.ipkg + sed -i 's/\/usr\/local\/idris\/readProcess.h/readProcess.h/g' source/Control/Eternal/System/Process.idr + sed -i 's/\/usr\/local\/idris\/readProcess.o/readProcess.o/g' source/Control/Eternal/System/Process.idr + ''; + + meta = { + description = "Infix pipe operators and some Nat, Float, String conversions"; + homepage = https://github.com/Heather/Control.Eternal.Idris; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/farrp.nix b/pkgs/development/idris-modules/farrp.nix new file mode 100644 index 0000000000000000000000000000000000000000..2c88399eb3c04be3a1aafa05b635ef6cf7d81877 --- /dev/null +++ b/pkgs/development/idris-modules/farrp.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, lib +, idris +}: +build-idris-package { + name = "farrp"; + version = "2018-02-13"; + + idrisDeps = [ prelude effects ]; + + src = fetchFromGitHub { + owner = "lambda-11235"; + repo = "FarRP"; + rev = "d592957232968743f8862e49d5a8d52e13340444"; + sha256 = "1zrf750d7x1cz7kkgcx4ipa87hkg10adwii4qqvz9vpjap7vh7h0"; + }; + + meta = { + description = "Arrowized FRP library for Idris with static safety guarantees"; + homepage = https://github.com/lambda-11235/FarRP; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix new file mode 100644 index 0000000000000000000000000000000000000000..cc0820d3c646345157a0f62e4222f3030dd988f5 --- /dev/null +++ b/pkgs/development/idris-modules/free.nix @@ -0,0 +1,27 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, lib +, idris +}: +build-idris-package { + name = "free"; + version = "2017-07-03"; + + idrisDeps = [ prelude ]; + + src = fetchFromGitHub { + owner = "idris-hackers"; + repo = "idris-free"; + rev = "919950fb6a9d97c139c2d102402fec094a99c397"; + sha256 = "1n4daf1acjkd73an4m31yp9g616crjb7h5z02f1gj29wm3dbx5s7"; + }; + + meta = { + description = "Free Monads and useful constructions to work with them"; + homepage = https://github.com/idris-hackers/idris-free; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/fsm.nix b/pkgs/development/idris-modules/fsm.nix new file mode 100644 index 0000000000000000000000000000000000000000..24f57af5257e70862d521894e5d9856274ef764b --- /dev/null +++ b/pkgs/development/idris-modules/fsm.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "fsm"; + version = "2017-04-16"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "ctford"; + repo = "flying-spaghetti-monster"; + rev = "9253db1048d155b9d72dd5319f0a2072b574d406"; + sha256 = "0n1kqpxysl3dji0zd8c47ir4144s0n3pb8i1mqp6ylma3r7rlg1l"; + }; + + meta = { + description = "Comonads for Idris"; + homepage = https://github.com/ctford/flying-spaghetti-monster; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix new file mode 100644 index 0000000000000000000000000000000000000000..041c18faedcdfd409e0b64ed0513e0539dab3535 --- /dev/null +++ b/pkgs/development/idris-modules/glfw.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, lib +, idris +, pkgs +}: + +build-idris-package { + name = "glfw"; + version = "2016-12-05"; + + idrisDeps = [ prelude effects ]; + + extraBuildInputs = [ pkgs.glfw ]; + + src = fetchFromGitHub { + owner = "eckart"; + repo = "glfw-idris"; + rev = "10220a734b69f3b884683041a1a9c533800b663a"; + sha256 = "045ylaj66g5m4syzhqxlaxmivy8y7jznkcf1y7w4awa4y5znyqqd"; + }; + + meta = { + description = "GLFW bindings for Idris"; + homepage = https://github.com/eckart/glfw-idris; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/graphviz.nix b/pkgs/development/idris-modules/graphviz.nix new file mode 100644 index 0000000000000000000000000000000000000000..3ea20d3d906e9e7410c504196dc6cbb4a34f13c3 --- /dev/null +++ b/pkgs/development/idris-modules/graphviz.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitLab +, prelude +, lightyear +, lib +, idris +}: +build-idris-package { + name = "graphviz"; + version = "2017-01-16"; + + idrisDeps = [ prelude lightyear ]; + + src = fetchFromGitLab { + owner = "mgttlinger"; + repo = "idris-graphviz"; + rev = "805da92ac888530134c3b4090fae0d025d86bb05"; + sha256 = "12kzgjlwq6adflfc5zxpgjnaiszhiab6dcp878ysbz3zr2sihljx"; + }; + + postUnpack = '' + sed -i "/^author /cauthor = Merlin Goettlinger" source/graphviz.ipkg + ''; + + meta = { + description = "Parser and library for graphviz dot files"; + homepage = https://github.com/mgttlinger/idris-graphviz; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix new file mode 100644 index 0000000000000000000000000000000000000000..7a2d0d77c8322f1c937c6c7f1f84e18f28327ff3 --- /dev/null +++ b/pkgs/development/idris-modules/hamt.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, effects +, lib +, idris +}: +build-idris-package { + name = "idris-hamt"; + version = "2016-11-15"; + + idrisDeps = [ prelude contrib effects ]; + + src = fetchFromGitHub { + owner = "bamboo"; + repo = "idris-hamt"; + rev = "e70f3eedddb5ccafea8e386762b8421ba63c495a"; + sha256 = "0m2yjr20dxkfmn3nzc68l6vh0rdaw6b637yijwl4c83b5xiac1mi"; + }; + + meta = { + description = "Idris Hash Array Mapped Trie"; + homepage = https://github.com/bamboo/idris-hamt; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/pkgs/development/idris-modules/heyting-algebra.nix new file mode 100644 index 0000000000000000000000000000000000000000..8a283eada8a12bc767002f9c228c737b8f68320e --- /dev/null +++ b/pkgs/development/idris-modules/heyting-algebra.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: +build-idris-package { + name = "heyting-algebra"; + version = "2017-08-18"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "Risto-Stevcev"; + repo = "idris-heyting-algebra"; + rev = "2c814c48246a5e19bff66e64a753208c7d59d397"; + sha256 = "199cvhxiimlhchvsc66zwn0dls78f9lamam256ad65mv4cjmxv40"; + }; + + meta = { + description = "Interfaces for heyting algebras and verified bounded join and meet semilattices"; + homepage = https://github.com/Risto-Stevcev/idris-heyting-algebra; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/hezarfen.nix b/pkgs/development/idris-modules/hezarfen.nix new file mode 100644 index 0000000000000000000000000000000000000000..712508220a6b23cfb76ed948afac3eb8eccdca73 --- /dev/null +++ b/pkgs/development/idris-modules/hezarfen.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "hezarfen"; + version = "2018-02-03"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "joom"; + repo = "hezarfen"; + rev = "079884d85619cd187ae67230480a1f37327f8d78"; + sha256 = "0z4150gavpx64m3l0xbjjz9dcir7zij9hvd69k98zvhw7i27b1xp"; + }; + + meta = { + description = "a theorem prover for intuitionistic propositional logic in Idris, with metaprogramming features"; + homepage = https://github.com/joom/hezarfen; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix new file mode 100644 index 0000000000000000000000000000000000000000..ba4df28ab26eabece8a1aafd3003e7d21de8e2d3 --- /dev/null +++ b/pkgs/development/idris-modules/hrtime.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, idrisscript +, lib +, idris +}: +build-idris-package { + name = "hrtime"; + version = "2017-04-16"; + + idrisDeps = [ prelude idrisscript ]; + + src = fetchFromGitHub { + owner = "pierrebeaucamp"; + repo = "idris-hrtime"; + rev = "e1f54ce74bde871010ae76d9afd42048cd2aae83"; + sha256 = "0rmmpi1kp1h7ficmcxbxkny9lq9pjli2qhwy17vgbgx8fx60m8l0"; + }; + + meta = { + description = "Idris library for high resolution time"; + homepage = https://github.com/pierrebeaucamp/idris-hrtime; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/html.nix b/pkgs/development/idris-modules/html.nix new file mode 100644 index 0000000000000000000000000000000000000000..deec5b0eb6dcb1323f4f263e26bd23c348d91873 --- /dev/null +++ b/pkgs/development/idris-modules/html.nix @@ -0,0 +1,34 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, idrisscript +, hrtime +, webgl +, lib +, idris +}: +build-idris-package { + name = "html"; + version = "2017-04-23"; + + idrisDeps = [ prelude idrisscript hrtime webgl ]; + + src = fetchFromGitHub { + owner = "pierrebeaucamp"; + repo = "idris-html"; + rev = "f59ecc560d7008ba26dda83f11319bb24ed6c508"; + sha256 = "0r2clvkyld3y3r6smkfb7s47qnndikwds3bx9hphidbn41wjnh0i"; + }; + + postUnpack = '' + sed -i "s/hrTime/hrtime/g" source/html.ipkg + ''; + + meta = { + description = "Idris library to interact with HTML"; + homepage = https://github.com/pierrebeaucamp/idris-html; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/http.nix b/pkgs/development/idris-modules/http.nix new file mode 100644 index 0000000000000000000000000000000000000000..800a3a2eeb49c7cf1a397ae411ae884dc506a03c --- /dev/null +++ b/pkgs/development/idris-modules/http.nix @@ -0,0 +1,30 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lightyear +, bytes +, lib +, idris +}: +build-idris-package { + name = "http"; + version = "2018-02-25"; + + idrisDeps = [ prelude contrib lightyear bytes ]; + + src = fetchFromGitHub { + owner = "uwap"; + repo = "idris-http"; + rev = "dc4a31543f87c0bc44cbaa98192f0303cd8dd82e"; + sha256 = "1abrwi5ikymff4g7a0g5wskycvhpnn895z1z1bz9r71ks554ypl8"; + }; + + meta = { + description = "An HTTP library for idris"; + homepage = https://github.com/uwap/idris-http; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/http4idris.nix b/pkgs/development/idris-modules/http4idris.nix new file mode 100644 index 0000000000000000000000000000000000000000..5b79644c3a0b2ac7dbf3a9d8771008331473079f --- /dev/null +++ b/pkgs/development/idris-modules/http4idris.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: + +build-idris-package { + name = "http4idris"; + version = "2018-01-16"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "A1kmm"; + repo = "http4idris"; + rev = "f44ffd2a15628869c7aadf241e3c9b1ee7b40941"; + sha256 = "16bs7rxbsq7m7jm96zkqiq8hj68l907m8xgmjrcxzl158qvzhw1w"; + }; + + meta = { + description = "An experimental HTTP framework for Idris"; + homepage = https://github.com/A1kmm/http4idris; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/httpclient.nix b/pkgs/development/idris-modules/httpclient.nix deleted file mode 100644 index ec41956b9634e3be902914d57e65a477655c2193..0000000000000000000000000000000000000000 --- a/pkgs/development/idris-modules/httpclient.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs -, build-idris-package -, fetchFromGitHub -, lightyear -, contrib -, lib -, idris -}: - -let - date = "2016-12-20"; -in -build-idris-package { - name = "httpclient-${date}"; - - src = fetchFromGitHub { - owner = "justjoheinz"; - repo = "idris-httpclient"; - rev = "4a7296d572d7f7fde87d27da07d5c9566dc4ff14"; - sha256 = "0sy0q7gri9lwbqdmx9720pby3w1470w7wzn62bf2rir532219hhl"; - }; - - propagatedBuildInputs = [ pkgs.curl lightyear contrib ]; - - meta = { - description = "HTTP Client for Idris"; - homepage = https://github.com/justjoheinz/idris-httpclient; - inherit (idris.meta) platforms; - }; -} diff --git a/pkgs/development/idris-modules/iaia.nix b/pkgs/development/idris-modules/iaia.nix new file mode 100644 index 0000000000000000000000000000000000000000..5b4f450fdf7ec507b83d6e504dbd1697e99fef92 --- /dev/null +++ b/pkgs/development/idris-modules/iaia.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: +build-idris-package { + name = "iaia"; + version = "2017-11-10"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "sellout"; + repo = "Iaia"; + rev = "dce68d2b63a26dad7c94459773eae2d42686fa05"; + sha256 = "0209fhv8x3sw6ijrwc8a85pch97z821ygaz78va3l274xam4l659"; + }; + + meta = { + description = "Recursion scheme library for Idris"; + homepage = https://github.com/sellout/Iaia; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index 32424ba1f862e0a143564faeaa17fe0beb8cdd9a..fcd02c4da2462a54066c508e03e24a19b5332beb 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -5,10 +5,10 @@ symlinkJoin { src = idris.src; paths = [ idris ]; buildInputs = [ makeWrapper ]; + meta.platforms = idris.meta.platforms; postBuild = '' wrapProgram $out/bin/idris \ --suffix PATH : ${ stdenv.lib.makeBinPath path } \ --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} ''; } - diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix new file mode 100644 index 0000000000000000000000000000000000000000..f3d06216976e6a72300cb4e59beec79ba4f97bde --- /dev/null +++ b/pkgs/development/idris-modules/idrishighlighter.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, lightyear +, lib +, idris +}: +build-idris-package { + name = "idrishighlighter"; + version = "2018-02-22"; + + idrisDeps = [ prelude effects lightyear ]; + + src = fetchFromGitHub { + owner = "david-christiansen"; + repo = "idris-code-highlighter"; + rev = "708a29c7d1433adf7b0f69d1aec50e69b2915bba"; + sha256 = "16ahzf2jzh7wzi4jjq94s5z9nzkgnj2962dy13s1crim53csjgw5"; + }; + + meta = { + description = "Semantic highlighter for Idris code"; + homepage = https://github.com/david-christiansen/idris-code-highlighter; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/idrisscript.nix b/pkgs/development/idris-modules/idrisscript.nix new file mode 100644 index 0000000000000000000000000000000000000000..fd2f9e582180354605a8854781da05cb96b466f0 --- /dev/null +++ b/pkgs/development/idris-modules/idrisscript.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, lib +, idris +}: + +build-idris-package { + name = "idrisscript"; + version = "2017-07-01"; + + idrisDeps = [ prelude ]; + + src = fetchFromGitHub { + owner = "idris-hackers"; + repo = "IdrisScript"; + rev = "4bb7019182392f24d2246a3e616f829156c8f091"; + sha256 = "074ignh2hqwq4ng5nk7dswga4lm7342w7h4bmx4n03ygrn7w89ff"; + }; + + meta = { + description = "FFI Bindings to interact with the unsafe world of JavaScript"; + homepage = https://github.com/idris-hackers/IdrisScript; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/ipkgparser.nix b/pkgs/development/idris-modules/ipkgparser.nix new file mode 100644 index 0000000000000000000000000000000000000000..cdc1d593c0113888306d846ac7208041fbc20f47 --- /dev/null +++ b/pkgs/development/idris-modules/ipkgparser.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, effects +, lightyear +, lib +, idris +}: +build-idris-package { + name = "ipkgparser"; + version = "2017-11-14"; + + idrisDeps = [ prelude contrib effects lightyear ]; + + src = fetchFromGitHub { + owner = "emptyflash"; + repo = "idris-ipkg-parser"; + rev = "35cc2f54d4f3b3710f637d0a8c897bfbb32fe183"; + sha256 = "0vn3pigqddfy7cld0386hxzdv2nkl8mdpsx97hvyvqzrdpz4wl2q"; + }; + + meta = { + description = "Parser for Idris iPkg files written in Idris using Lightyear"; + homepage = https://github.com/emptyflash/idris-ipkg-parser; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/jheiling-extras.nix b/pkgs/development/idris-modules/jheiling-extras.nix new file mode 100644 index 0000000000000000000000000000000000000000..34981d28d3ea42898dc69ab8b50df2902eaa51aa --- /dev/null +++ b/pkgs/development/idris-modules/jheiling-extras.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: + +build-idris-package { + name = "extras"; + version = "2018-03-06"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "jheiling"; + repo = "idris-extras"; + rev = "20e79087043ddb00301cdc3036964a2b1c5b1c5f"; + sha256 = "0j34a7vawrkc7nkwwnv6lsjjdcr00d85csjw06nnbh8rj4vj5ps0"; + }; + + meta = { + description = "Some useful functions for Idris"; + homepage = https://github.com/jheiling/idris-extras; + license = lib.licenses.unlicense; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix new file mode 100644 index 0000000000000000000000000000000000000000..5139631b9d5252f91b1cc5b6842cc6b75a3367dc --- /dev/null +++ b/pkgs/development/idris-modules/jheiling-js.nix @@ -0,0 +1,30 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, jheiling-extras +, lib +, idris +}: + +build-idris-package { + name = "jheiling-js"; + version = "2016-03-09"; + + idrisDeps = [ prelude contrib jheiling-extras ]; + + src = fetchFromGitHub { + owner = "jheiling"; + repo = "idris-js"; + rev = "59763cd0c9715a9441931ae1077e501bb2ec6020"; + sha256 = "1mvpxwszh56cfrf509qiadn7gp2l4syanhvdq6v1br0y03g8wk9v"; + }; + + meta = { + description = "Js library for Idris"; + homepage = https://github.com/jheiling/idris-js; + license = lib.licenses.unlicense; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/js.nix b/pkgs/development/idris-modules/js.nix new file mode 100644 index 0000000000000000000000000000000000000000..0792a8c0f5d7fc769806a5cbb3694c924a25f5c1 --- /dev/null +++ b/pkgs/development/idris-modules/js.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, pruviloj +, lib +, idris +}: +build-idris-package { + name = "js"; + version = "2018-11-27"; + + idrisDeps = [ prelude contrib pruviloj ]; + + src = fetchFromGitHub { + owner = "rbarreiro"; + repo = "idrisjs"; + rev = "1ce91ecec69a7174c20bff927aeac3928a01ed3f"; + sha256 = "13whhccb7yjq10hnngdc8bc9z9vvyir1wjkclpz006cr4cd266ca"; + }; + + meta = { + description = "Js libraries for idris"; + homepage = https://github.com/rbarreiro/idrisjs; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/lens.nix b/pkgs/development/idris-modules/lens.nix new file mode 100644 index 0000000000000000000000000000000000000000..e97c7cfafda197e68f5bb5dc9a2592b555eed9ac --- /dev/null +++ b/pkgs/development/idris-modules/lens.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, bifunctors +, lib +, idris +}: + +build-idris-package { + name = "lens"; + version = "2017-09-25"; + + idrisDeps = [ prelude bifunctors ]; + + src = fetchFromGitHub { + owner = "HuwCampbell"; + repo = "idris-lens"; + rev = "421aa76c19607693ac2f23003dc0fe82c1a3760a"; + sha256 = "1q6lmhrwd1qg18s253sim4hg2a2wk5439p3izy1f9ygi6pv4a6mk"; + }; + + meta = { + description = "van Laarhoven lenses for Idris"; + homepage = https://github.com/HuwCampbell/idris-lens; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix index 27828e6f41f63aef0e871dfe919019549ec46c51..6cedda0170f220281a148759a8c69fa8bbe5c53b 100644 --- a/pkgs/development/idris-modules/lightyear.nix +++ b/pkgs/development/idris-modules/lightyear.nix @@ -7,11 +7,11 @@ , idris }: -let - date = "2017-09-10"; -in -build-idris-package { - name = "lightyear-${date}"; +build-idris-package { + name = "lightyear"; + version = "2017-09-10"; + + idrisDeps = [ prelude base effects ]; src = fetchFromGitHub { owner = "ziman"; @@ -20,13 +20,11 @@ build-idris-package { sha256 = "05x66abhpbdm6yr0afbwfk6w04ysdk78gylj5alhgwhy4jqakv29"; }; - propagatedBuildInputs = [ prelude base effects ]; - meta = { description = "Parser combinators for Idris"; homepage = https://github.com/ziman/lightyear; license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.siddharthist ]; + maintainers = with lib.maintainers; [ siddharthist brainrape ]; inherit (idris.meta) platforms; }; } diff --git a/pkgs/development/idris-modules/logic.nix b/pkgs/development/idris-modules/logic.nix new file mode 100644 index 0000000000000000000000000000000000000000..342a84882cd916cbbf6329341e3a8d6deb7ee2bb --- /dev/null +++ b/pkgs/development/idris-modules/logic.nix @@ -0,0 +1,31 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, bifunctors +, lib +, idris +}: +build-idris-package { + name = "logic"; + version = "2016-12-02"; + + idrisDeps = [ prelude bifunctors ]; + + src = fetchFromGitHub { + owner = "yurrriq"; + repo = "idris-logic"; + rev = "e0bed57e17fde1237fe0358cb77b25f488a04d2f"; + sha256 = "0kvn1p0v71vkwlchf20243c47jcfid44w5r0mx4dydijq9gylxfz"; + }; + + # tests fail + doCheck = false; + + meta = { + description = "Propositional logic tools, inspired by the Coq standard library"; + homepage = https://github.com/yurrriq/idris-logic; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/mapping.nix b/pkgs/development/idris-modules/mapping.nix new file mode 100644 index 0000000000000000000000000000000000000000..84429c88765ecf930c4d3c75430dd7a0a7927d3a --- /dev/null +++ b/pkgs/development/idris-modules/mapping.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, lib +, idris +}: + +build-idris-package { + name = "mapping"; + version = "2018-02-27"; + + idrisDeps = [ prelude ]; + + src = fetchFromGitHub { + owner = "zaoqi"; + repo = "Mapping.idr"; + rev = "4f226933d4491b8fd09f9d9a7b862c0cc646b936"; + sha256 = "1skkb7jz2lv0xg4n5m0vd9xddg3x01459dwx1jxnpc7ifask4cda"; + }; + + meta = { + description = "Idris mapping library"; + homepage = https://github.com/zaoqi/Mapping.idr; + license = lib.licenses.agpl3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix new file mode 100644 index 0000000000000000000000000000000000000000..eae30886cd63fa41c057af2290bae32ebd4c39ca --- /dev/null +++ b/pkgs/development/idris-modules/mhd.nix @@ -0,0 +1,33 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, effects +, libmicrohttpd +, lib +, idris +}: + +build-idris-package { + name = "mhd"; + version = "2016-04-22"; + + idrisDeps = [ prelude contrib effects ]; + + extraBuildInputs = [ libmicrohttpd ]; + + src = fetchFromGitHub { + owner = "colin-adams"; + repo = "idris-libmicrohttpd"; + rev = "a8808bc06fa292d4b3389f32cb00716e43122a46"; + sha256 = "0wvp1qi3bn4hk52vsid6acfwvwbs58sggylbpjvkxzycsbhz4nx4"; + }; + + meta = { + description = "A binding of the GNU libmicrohttpd library to the Idris C backend"; + homepage = https://github.com/colin-adams/idris-libmicrohttpd; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/pacman.nix b/pkgs/development/idris-modules/pacman.nix new file mode 100644 index 0000000000000000000000000000000000000000..3650a3990f24506d43baf379977c7889f6f93101 --- /dev/null +++ b/pkgs/development/idris-modules/pacman.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, sdl2 +, lib +, idris +}: +build-idris-package { + name = "pacman"; + version = "2017-11-10"; + + idrisDeps = [ prelude contrib sdl2 ]; + + src = fetchFromGitHub { + owner = "jdublu10"; + repo = "pacman"; + rev = "263ae58aeb5147e2af9cc76411970ccd90fa9121"; + sha256 = "02m3ic2fk3a8j50xdpq70yx30hkxzjg6idsia482sm1nlkmxxin9"; + }; + + postUnpack = '' + mv source/src/board.idr source/src/Board.idr + ''; + + meta = { + description = "Proof that Idris is pacman complete"; + homepage = https://github.com/jdublu10/pacman; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix new file mode 100644 index 0000000000000000000000000000000000000000..e3c1cb82f28c6b17fe3254a3dceca38e674861b0 --- /dev/null +++ b/pkgs/development/idris-modules/patricia.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, specdris +, lib +, idris +}: +build-idris-package { + name = "patricia"; + version = "2017-10-27"; + + idrisDeps = [ prelude specdris ]; + + src = fetchFromGitHub { + owner = "ChShersh"; + repo = "idris-patricia"; + rev = "24724e6d0564f2f813d0d0a58f5c5db9afe35313"; + sha256 = "093q3qjmr93wv8pqwk0zfm3hzf14c235k9c9ip53rhg6yzcm0yqz"; + }; + + postUnpack = '' + rm source/patricia-nix.ipkg + ''; + + meta = { + description = "Immutable map from integer keys to values based on patricia tree. Basically persistent array."; + homepage = https://github.com/ChShersh/idris-patricia; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix new file mode 100644 index 0000000000000000000000000000000000000000..af93f4af5e03b2e7345473a4e05092a976f7f9ad --- /dev/null +++ b/pkgs/development/idris-modules/permutations.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "permutations"; + version = "2018-01-19"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "vmchale"; + repo = "permutations"; + rev = "f0de6bc721bb9d31e16f9168ded6eb6e34935881"; + sha256 = "1dirzqy40fczbw7gp2jr51lzqsnq5vcx9z5l6194lcrq2vxgzv1s"; + }; + + postUnpack = '' + rm source/test.ipkg + ''; + + meta = { + description = "Type-safe way of working with permutations in Idris"; + homepage = https://github.com/vmchale/permutations; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/pfds.nix b/pkgs/development/idris-modules/pfds.nix new file mode 100644 index 0000000000000000000000000000000000000000..8ab75b9ee5096f7d5d31e7e8bbff650309d5346a --- /dev/null +++ b/pkgs/development/idris-modules/pfds.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: +build-idris-package { + name = "pfds"; + version = "2017-09-25"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "timjb"; + repo = "idris-pfds"; + rev = "9ba39348adc45388eccf6463855f42b81333620a"; + sha256 = "0jbrwdpzg5hgmkfk2kj5y8lgaynl79h48qdvkl1glypfh392w35f"; + }; + + meta = { + description = "Purely functional data structures in Idris"; + homepage = https://github.com/timjb/idris-pfds; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/pipes.nix b/pkgs/development/idris-modules/pipes.nix new file mode 100644 index 0000000000000000000000000000000000000000..943d8e470f07dbdb6cdc31bf963cb987845f12cb --- /dev/null +++ b/pkgs/development/idris-modules/pipes.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "pipes"; + version = "2017-12-02"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "QuentinDuval"; + repo = "IdrisPipes"; + rev = "888abe405afce42015014899682c736028759d42"; + sha256 = "1dxbqzg0qy7lkabmkj0qypywdjz5751g7h2ql8b2253dy3v0ndbs"; + }; + + meta = { + description = "Composable and effectful production, transformation and consumption of streams of data"; + homepage = https://github.com/QuentinDuval/IdrisPipes; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/posix.nix b/pkgs/development/idris-modules/posix.nix new file mode 100644 index 0000000000000000000000000000000000000000..c6c44874b064ac86679fda3c34c227879c8cc1dd --- /dev/null +++ b/pkgs/development/idris-modules/posix.nix @@ -0,0 +1,30 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "posix"; + version = "2017-11-18"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "idris-hackers"; + repo = "idris-posix"; + rev = "1e4787bc4dfcf901f2e1858e5334a6bafa5d27c4"; + sha256 = "14y51vn18v23k56gi3b33rjjwpf02qfb00w8cfy8qycrl8rbgsmb"; + }; + + # tests need file permissions + doCheck = false; + + meta = { + description = "System POSIX bindings for Idris."; + homepage = https://github.com/idris-hackers/idris-posix; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/protobuf.nix b/pkgs/development/idris-modules/protobuf.nix new file mode 100644 index 0000000000000000000000000000000000000000..4b4c26942022d9e429d88bd176ee21e13ce5b462 --- /dev/null +++ b/pkgs/development/idris-modules/protobuf.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, lightyear +, lib +, idris +}: +build-idris-package { + name = "protobuf"; + version = "2017-08-12"; + + idrisDeps = [ prelude lightyear ]; + + src = fetchFromGitHub { + owner = "artagnon"; + repo = "idris-protobuf"; + rev = "c21212534639518453d16ae1b0f07d94464ff8eb"; + sha256 = "0n5w7bdbxqca3b7hzg95md01mx4sfvl9fi82xjm0hzds33akmn05"; + }; + + meta = { + description = "A partial implementation of Protocol Buffers in Idris"; + homepage = https://github.com/artagnon/idris-protobuf; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/rationals.nix b/pkgs/development/idris-modules/rationals.nix new file mode 100644 index 0000000000000000000000000000000000000000..693d580fdd57a54d270808ce24ab1cbaa7663c64 --- /dev/null +++ b/pkgs/development/idris-modules/rationals.nix @@ -0,0 +1,28 @@ +{ curl +, build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: +build-idris-package { + name = "rationals"; + version = "2017-04-29"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "mcgordonite"; + repo = "idris-binary-rationals"; + rev = "0d7010b267662d89e76e2cc8b27fd95ecca009b8"; + sha256 = "0fc93n4pyqyrjxrspnr3vjzc09m78ni1ardq1vx9g40vmvl0n49s"; + }; + + meta = { + description = "An idris rational number type built from paths in the Stern Brocot tree"; + homepage = https://github.com/mcgordonite/idris-binary-rationals; + inherit (idris.meta) platforms; + maintainers = [ lib.maintainers.brainrape ]; + }; +} diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix new file mode 100644 index 0000000000000000000000000000000000000000..06e99da36089e2d3a17ac631ff25b3ece5529271 --- /dev/null +++ b/pkgs/development/idris-modules/recursion_schemes.nix @@ -0,0 +1,36 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, free +, composition +, comonad +, bifunctors +, hezarfen +, lib +, idris +}: +build-idris-package { + name = "recursion_schemes"; + version = "2018-01-19"; + + idrisDeps = [ prelude free composition comonad bifunctors hezarfen ]; + + src = fetchFromGitHub { + owner = "vmchale"; + repo = "recursion_schemes"; + rev = "6bcbe0da561f461e7a05e29965a18ec9f87f8d82"; + sha256 = "0rbx0yqa0fb7h7qfsvqvirc5q85z51rcwbivn6351jgn3a0inmhf"; + }; + + postUnpack = '' + rm source/test.ipkg + ''; + + meta = { + description = "Recursion schemes for Idris"; + homepage = https://github.com/vmchale/recursion_schemes; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix new file mode 100644 index 0000000000000000000000000000000000000000..bd8e37f2b7f9976c4b46e4558b4d9a133fde1b48 --- /dev/null +++ b/pkgs/development/idris-modules/refined.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "refined"; + version = "2017-12-28"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "janschultecom"; + repo = "idris-refined"; + rev = "e21cdef16106a77b42d193806c1749ba6448a128"; + sha256 = "1am7kfc51p2zlml954v8cl9xvx0g0f1caq7ni3z36xvsd7fh47yh"; + }; + + postUnpack = '' + rm source/idris-refined-test.ipkg + ''; + + meta = { + description = "Port of Scala/Haskell Refined library to Idris"; + homepage = https://github.com/janschultecom/idris-refined; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/sdl.nix b/pkgs/development/idris-modules/sdl.nix new file mode 100644 index 0000000000000000000000000000000000000000..181959dca063dbc7b5a57d2a7d3bc732b3e0af82 --- /dev/null +++ b/pkgs/development/idris-modules/sdl.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, lib +, idris +, SDL +, SDL_gfx +}: + +build-idris-package { + name = "sdl"; + version = "2017-03-24"; + + idrisDeps = [ prelude effects ]; + + extraBuildInputs = [ idris SDL SDL_gfx ]; + + src = fetchFromGitHub { + owner = "edwinb"; + repo = "SDL-idris"; + rev = "095ce70da7ea9f163b018b690105edf375f1befe"; + sha256 = "0nryssnaqfq2pvz2mbl2kkx6mig310f9dpgrbcx788nxi0qzsig6"; + }; + + meta = { + description = "SDL-idris framework for Idris"; + homepage = https://github.com/edwinb/SDL-idris; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix new file mode 100644 index 0000000000000000000000000000000000000000..46d4e9fb8ddcede8919250e1fa732ffb808f6299 --- /dev/null +++ b/pkgs/development/idris-modules/sdl2.nix @@ -0,0 +1,33 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, lib +, idris +, pkgconfig +, SDL2 +, SDL2_gfx +}: + +build-idris-package { + name = "sdl2"; + version = "2018-01-19"; + + idrisDeps = [ prelude effects ]; + + extraBuildInputs = [ idris pkgconfig SDL2 SDL2_gfx ]; + + src = fetchFromGitHub { + owner = "steshaw"; + repo = "idris-sdl2"; + rev = "ebc36a0efb3e8086f2999120e7a8a8ac4952c6f6"; + sha256 = "060k0i1pjilrc4pcz7v70hbipaw2crz14yxjlyjlhn6qm03131q0"; + }; + + meta = { + description = "SDL2 binding for Idris"; + homepage = https://github.com/steshaw/idris-sdl2; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix new file mode 100644 index 0000000000000000000000000000000000000000..d10a85eb4f4a0b0734cc66ea80563d9534b179e0 --- /dev/null +++ b/pkgs/development/idris-modules/semidirect.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, patricia +, lib +, idris +}: +build-idris-package { + name = "semidirect"; + version = "2018-02-06"; + + idrisDeps = [ prelude contrib patricia ]; + + src = fetchFromGitHub { + owner = "clayrat"; + repo = "idris-semidirect"; + rev = "884c26c095784f8fd489c323d6673f2a8710a741"; + sha256 = "0w36xkfxsqm6r91f0vs6qpmallrfwa09ql8i317xwm86nfk7akj9"; + }; + + meta = { + description = "Semidirect products in Idris"; + homepage = https://github.com/clayrat/idris-semidirect; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/setoids.nix b/pkgs/development/idris-modules/setoids.nix new file mode 100644 index 0000000000000000000000000000000000000000..76bf127818ce3cacb4e3e641b05379ff2252e505 --- /dev/null +++ b/pkgs/development/idris-modules/setoids.nix @@ -0,0 +1,26 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, lib +, idris +}: +build-idris-package { + name = "setoids"; + version = "2017-03-13"; + + idrisDeps = [ prelude ]; + + src = fetchFromGitHub { + owner = "danilkolikov"; + repo = "setoids"; + rev = "a50cfc010cb4321cc9b7988c0a4f387d83d34839"; + sha256 = "0q0h2qj9vylkm16h70l78l2p5xjkx4qmg2a2ixfl8vq8b1zm8gch"; + }; + + meta = { + description = "Idris proofs for extensional equalities"; + homepage = https://github.com/danilkolikov/setoids; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/smproc.nix b/pkgs/development/idris-modules/smproc.nix new file mode 100644 index 0000000000000000000000000000000000000000..c751f27d1c970c091b72389dc3bc49e8e1663823 --- /dev/null +++ b/pkgs/development/idris-modules/smproc.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, contrib +, lib +, idris +}: +build-idris-package { + name = "smproc"; + version = "2018-02-08"; + + idrisDeps = [ prelude base contrib ]; + + src = fetchFromGitHub { + owner = "jameshaydon"; + repo = "smproc"; + rev = "b292d6c94fe005bcd984b8e5134b6f99933aa0af"; + sha256 = "02gqa2a32dwrvgz6pwsg8bniszbzwxlkzm53fq81sz3l9ja8ax1n"; + }; + + meta = { + description = "Well-typed symmetric-monoidal category of concurrent processes"; + homepage = https://github.com/jameshaydon/smproc; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix new file mode 100644 index 0000000000000000000000000000000000000000..9dc2dd3f8e23473510b7e8ebd023b6911aa30812 --- /dev/null +++ b/pkgs/development/idris-modules/snippets.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: +build-idris-package { + name = "snippets"; + version = "2018-03-17"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "palladin"; + repo = "idris-snippets"; + rev = "c26d6f5ffc1cc0456279f5ac74fec5af8c09025e"; + sha256 = "1vwyzck6yan3wifsyj02ji9l6x9rs2r02aybm90gl676s2x4mhjn"; + }; + + meta = { + description = "Collection of Idris snippets"; + homepage = https://github.com/palladin/idris-snippets; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/software_foundations.nix b/pkgs/development/idris-modules/software_foundations.nix new file mode 100644 index 0000000000000000000000000000000000000000..3d16e91e10f3b8b7c17e06d8fa059fe194500c39 --- /dev/null +++ b/pkgs/development/idris-modules/software_foundations.nix @@ -0,0 +1,27 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, pruviloj +, lib +, idris +}: +build-idris-package { + name = "software_foundations"; + version = "2017-11-04"; + + idrisDeps = [ prelude pruviloj ]; + + src = fetchFromGitHub { + owner = "idris-hackers"; + repo = "software-foundations"; + rev = "eaa63d1a572c78e7ce68d27fd49ffdc01457e720"; + sha256 = "1rkjm0x79n1r3ah041a5bik7sc3rvqs42a2c3g139hlg5xd028xf"; + }; + + meta = { + description = "Code for Software Foundations in Idris"; + homepage = https://github.com/idris-hackers/software-foundations; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/specdris.nix b/pkgs/development/idris-modules/specdris.nix new file mode 100644 index 0000000000000000000000000000000000000000..b18d4a07d46f4a03ba95dfb37b66c7136c290734 --- /dev/null +++ b/pkgs/development/idris-modules/specdris.nix @@ -0,0 +1,30 @@ +{ build-idris-package +, fetchgit +, prelude +, base +, effects +, lib +, idris +}: + +build-idris-package { + name = "specdris"; + version = "2018-01-23"; + + src = fetchgit { + url = "https://github.com/pheymann/specdris"; + rev = "625f88f5e118e53f30bcf5e5f3dcf48eb268ac21"; + sha256 = "1gc717xf4i7z75aqazy5wqm7b1dqfyx5pprdypxz1h3980m67fsa"; + }; + + idrisDeps = [ prelude base effects idris ]; + + # tests use a different ipkg and directory structure + doCheck = false; + + meta = { + description = "A testing library for Idris"; + homepage = https://github.com/pheymann/specdris; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix new file mode 100644 index 0000000000000000000000000000000000000000..5f6eccd98cd5e9934c163cd714728ddf71322075 --- /dev/null +++ b/pkgs/development/idris-modules/tap.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: +build-idris-package { + name = "tap"; + version = "2017-04-08"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "ostera"; + repo = "tap-idris"; + rev = "0d019333e1883c1d60e151af1acb02e2b531e72f"; + sha256 = "0fhlmmivq9xv89r7plrnhmvay1j7bapz3wh7y8lygwvcrllh9zxs"; + }; + + postUnpack = '' + rm source/Draft.ipkg + ''; + + meta = { + description = "A simple TAP producer and consumer/reporter for Idris"; + homepage = https://github.com/ostera/tap-idris; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/test.nix b/pkgs/development/idris-modules/test.nix new file mode 100644 index 0000000000000000000000000000000000000000..d0688c54a65941fc81d26dc2c2f4109051a69a01 --- /dev/null +++ b/pkgs/development/idris-modules/test.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, lib +, idris +}: + +build-idris-package { + name = "test"; + version = "2017-03-30"; + + idrisDeps = [ prelude effects ]; + + src = fetchFromGitHub { + owner = "jfdm"; + repo = "idris-testing"; + rev = "604d56f77054931b21975198be669e22427b1f52"; + sha256 = "1pmyhs3jx6wd0pzjd3igfxb9zjs8pqmk4ah352bxjrqdnhqwrl51"; + }; + + + doCheck = false; + + meta = { + description = "Testing Utilities for Idris programs"; + homepage = https://github.com/jfdm/idris-testing; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/tlhydra.nix b/pkgs/development/idris-modules/tlhydra.nix new file mode 100644 index 0000000000000000000000000000000000000000..9106e485c5f0beedb69d5e856cdd295bc9ea20d8 --- /dev/null +++ b/pkgs/development/idris-modules/tlhydra.nix @@ -0,0 +1,30 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, effects +, contrib +, lightyear +, lib +, idris +}: + +build-idris-package { + name = "tlhydra"; + version = "2017-13-26"; + + idrisDeps = [ prelude effects contrib lightyear ]; + + src = fetchFromGitHub { + owner = "Termina1"; + repo = "tlhydra"; + rev = "3fc9049447d9560fe16f4d36a2f2996494ac2b33"; + sha256 = "1y3gcbc1ypv00vwa0w3v0n6ckf7gnz26xsfmgnidsaxzff3y0ymh"; + }; + + meta = { + description = "Idris parser and serializer/deserealizer for TL language"; + homepage = https://github.com/Termina1/tlhydra; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/tomladris.nix b/pkgs/development/idris-modules/tomladris.nix new file mode 100644 index 0000000000000000000000000000000000000000..a5d99d1928435d529f527d51a18462e578d09bb7 --- /dev/null +++ b/pkgs/development/idris-modules/tomladris.nix @@ -0,0 +1,30 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lightyear +, lib +, idris +}: + +build-idris-package { + name = "tomladris"; + version = "2017-11-14"; + + idrisDeps = [ prelude lightyear contrib ]; + + src = fetchFromGitHub { + owner = "emptyflash"; + repo = "tomladris"; + rev = "0fef663e20528c455f410f01124c8e3474a96606"; + sha256 = "0a0fc0bsr356plgzsr5sr4qmqx4838998wjwmflz10qwsv1j3zsw"; + }; + + meta = { + description = "TOML parser for Idris"; + homepage = https://github.com/emptyflash/tomladris; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siddharthist brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/tp.nix b/pkgs/development/idris-modules/tp.nix new file mode 100644 index 0000000000000000000000000000000000000000..db45f0408ab9d1b46a2de1b82f322bb63cd75430 --- /dev/null +++ b/pkgs/development/idris-modules/tp.nix @@ -0,0 +1,31 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "tp"; + version = "2017-08-15"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "superfunc"; + repo = "tp"; + rev = "ef59ccf355ae462bd4f55d596e6d03a9376b67b2"; + sha256 = "1a924qvm1dqfg419x8n35w0sz74vyyqsynz5g393f82jsrrwci8z"; + }; + + # tests fail with permission error + doCheck = false; + + meta = { + description = "Strongly Typed Paths for Idris"; + homepage = https://github.com/superfunc/tp; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix new file mode 100644 index 0000000000000000000000000000000000000000..a2077fca20d757b691a427bfe1afa5257d21d5fe --- /dev/null +++ b/pkgs/development/idris-modules/tparsec.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, lib +, idris +}: + +build-idris-package { + name = "tparsec"; + version = "2017-12-12"; + + idrisDeps = [ prelude ]; + + src = fetchFromGitHub { + owner = "gallais"; + repo = "idris-tparsec"; + rev = "fb87d08f8f58c934f37d8324b43b0979abcf2183"; + sha256 = "0362076bfs976gqki4b4pxblhnk4xglgx5v2aycjpxsxlpxh6cfd"; + }; + + meta = { + description = "TParsec - Total Parser Combinators in Idris"; + homepage = https://github.com/gallais/idris-tparsec; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/transducers.nix b/pkgs/development/idris-modules/transducers.nix new file mode 100644 index 0000000000000000000000000000000000000000..d63a11a0234630bd6d4a33d3f63a610d03487122 --- /dev/null +++ b/pkgs/development/idris-modules/transducers.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "transducers"; + version = "2017-07-28"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "QuentinDuval"; + repo = "IdrisReducers"; + rev = "2947ffa3559b642baeb3e43d7bb382e16bd073a8"; + sha256 = "0wzbbp5n113mva99mqr119zwp5pgj4l6wq9033z4f0kbm2nhmcfr"; + }; + + meta = { + description = "Composable algorithmic transformation"; + homepage = https://github.com/QuentinDuval/IdrisReducers; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/trees.nix b/pkgs/development/idris-modules/trees.nix new file mode 100644 index 0000000000000000000000000000000000000000..78ad70690b3a3d4c321eaf1b2d26877008137793 --- /dev/null +++ b/pkgs/development/idris-modules/trees.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, bi +, lib +, idris +}: +build-idris-package { + name = "trees"; + version = "2018-03-19"; + + idrisDeps = [ prelude contrib bi ]; + + src = fetchFromGitHub { + owner = "clayrat"; + repo = "idris-trees"; + rev = "dc17f9598bd78ec2b283d91b3c58617960d88c85"; + sha256 = "1c3p69875qc4zdk28im9xz45zw46ajgcmxpqmig63y0z4v3gwxww"; + }; + + meta = { + description = "Trees in Idris"; + homepage = https://github.com/clayrat/idris-trees; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/union_type.nix b/pkgs/development/idris-modules/union_type.nix new file mode 100644 index 0000000000000000000000000000000000000000..845bec3d84e809084fa5e754a9a079c0d8b81c4a --- /dev/null +++ b/pkgs/development/idris-modules/union_type.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, lib +, idris +}: +build-idris-package { + name = "union_type"; + version = "2018-01-30"; + + idrisDeps = [ prelude base ]; + + src = fetchFromGitHub { + owner = "berewt"; + repo = "UnionType"; + rev = "f7693036237585fe324a815a96ad101d9659c689"; + sha256 = "1ky0h03kja2y1fjg18j46akw03wi5ng80pghh2j3ib6hxlg1rbs7"; + }; + + meta = { + description = "UnionType in Idris"; + homepage = https://github.com/berewt/UnionType; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/vecspace.nix b/pkgs/development/idris-modules/vecspace.nix new file mode 100644 index 0000000000000000000000000000000000000000..d2fa9e31ae38ba399715c7e4bc513c8a7ef83bd9 --- /dev/null +++ b/pkgs/development/idris-modules/vecspace.nix @@ -0,0 +1,27 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lib +, idris +}: +build-idris-package { + name = "vecspace"; + version = "2018-01-12"; + + idrisDeps = [ prelude contrib ]; + + src = fetchFromGitHub { + owner = "clayrat"; + repo = "idris-vecspace"; + rev = "6830fa13232f25e9874b3f857b79508b5f82cb99"; + sha256 = "1dwz69cmzblyh7lnyqq2gp0a042z7h02sh5q5wf4xb500vizwkq2"; + }; + + meta = { + description = "Abstract vector spaces in Idris"; + homepage = https://github.com/clayrat/idris-vecspace; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/webgl.nix b/pkgs/development/idris-modules/webgl.nix new file mode 100644 index 0000000000000000000000000000000000000000..3793a812e57f2a5f297a37482a3332cdbf1d9883 --- /dev/null +++ b/pkgs/development/idris-modules/webgl.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, idrisscript +, lib +, idris +}: +build-idris-package { + name = "webgl"; + version = "2017-05-08"; + + idrisDeps = [ prelude idrisscript ]; + + src = fetchFromGitHub { + owner = "pierrebeaucamp"; + repo = "idris-webgl"; + rev = "1b4ee00a06b0bccfe33eea0fa8f068cdae690e9e"; + sha256 = "097l2pj8p33d0n3ryb8y2vp0n5isnc8bkdnad3y6raa9z1xjn3d6"; + }; + + meta = { + description = "Idris library to interact with WebGL"; + homepage = https://github.com/pierrebeaucamp/idris-webgl; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index d2b09808ec153413a9b1aeb4e748c75a410587ea..1631555eee4a163949015b2eea05d93574d2b99d 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -1,46 +1,20 @@ # Build a version of idris with a set of packages visible # packages: The packages visible to idris -{ stdenv, idris }: packages: stdenv.mkDerivation { - inherit (idris) name; +{ stdenv, idris, symlinkJoin, makeWrapper }: packages: - buildInputs = packages; +let paths = stdenv.lib.closePropagation packages; +in +symlinkJoin { - preHook = '' - mkdir -p $out/lib/${idris.name} + name = idris.name + "-with-packages"; - installIdrisLib () { - if [ -d $1/lib/${idris.name} ]; then - ln -fsv $1/lib/${idris.name}/* $out/lib/${idris.name} - fi - } + paths = paths ++ [idris] ; - envHooks+=(installIdrisLib) - ''; + buildInputs = [ makeWrapper ]; - unpackPhase = '' - cat >idris.c < - #include - #include + postBuild = '' + wrapProgram $out/bin/idris \ + --set IDRIS_LIBRARY_PATH $out/libs + ''; - int main (int argc, char ** argv) { - /* idris currently only supports a single library path, so respect it if the user set it */ - setenv("IDRIS_LIBRARY_PATH", "$out/lib/${idris.name}", 0); - execv("${idris}/bin/idris", argv); - perror("executing ${idris}/bin/idris"); - return 127; - } - EOF - ''; - - buildPhase = '' - $CC -O3 -o idris idris.c - ''; - - installPhase = '' - mkdir -p $out/bin - mv idris $out/bin - ''; - - stripAllList = [ "bin" ]; } diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index 12e9b28d81c02d36870b947d6878fb35b0fc5628..55a926d780d6a1cc0518993cf055b48743961bc7 100644 --- a/pkgs/development/idris-modules/wl-pprint.nix +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -6,20 +6,17 @@ , idris }: build-idris-package { - name = "wl-pprint-2016-09-28"; + name = "wl-pprint"; + version = "2017-03-13"; src = fetchFromGitHub { owner = "shayan-najd"; repo = "wl-pprint"; - rev = "4cc88a0865620a3b997863e4167d3b98e1a41b52"; - sha256 = "1yxxh366k5njad75r0xci2q5c554cddvzgrwk43b0xn8rq0vm11x"; + rev = "97590d1679b3db07bb430783988b4cba539e9947"; + sha256 = "0ifp76cqg340jkkzanx69vg76qivv53vh1lzv9zkp5f49prkwl5d"; }; - # The tests for this package fail. We should attempt to enable them when - # updating this package again. - doCheck = false; - - propagatedBuildInputs = [ prelude base ]; + idrisDeps = [ prelude base ]; meta = { description = "Wadler-Leijen pretty-printing library"; diff --git a/pkgs/development/idris-modules/wyvern.nix b/pkgs/development/idris-modules/wyvern.nix new file mode 100644 index 0000000000000000000000000000000000000000..a1724476f6c4829609c0d97f3e58d7e01351b143 --- /dev/null +++ b/pkgs/development/idris-modules/wyvern.nix @@ -0,0 +1,33 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, effects +, lib +, idris +}: +build-idris-package { + name = "wyvern"; + version = "2017-06-26"; + + idrisDeps = [ prelude contrib effects ]; + + src = fetchFromGitHub { + owner = "ericqweinstein"; + repo = "wyvern"; + rev = "b9e3e5747c5b23608c6ed5e2ccf43b86caa04292"; + sha256 = "0zihf95w7i0903zy1mzn1ldn697nf57yl80nl32dpgji72h98kh2"; + }; + + postUnpack = '' + sed -i "s/Wyvern.Core/Wyvern.Main/g" source/src/Wyvern.idr + ''; + + meta = { + description = "Little web server written in Idris"; + homepage = https://github.com/ericqweinstein/wyvern; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/xhr.nix b/pkgs/development/idris-modules/xhr.nix new file mode 100644 index 0000000000000000000000000000000000000000..15573cc94611c227f527ddfd63edcf99753e9573 --- /dev/null +++ b/pkgs/development/idris-modules/xhr.nix @@ -0,0 +1,28 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, idrisscript +, lib +, idris +}: +build-idris-package { + name = "xhr"; + version = "2017-04-22"; + + idrisDeps = [ prelude idrisscript ]; + + src = fetchFromGitHub { + owner = "pierrebeaucamp"; + repo = "idris-xhr"; + rev = "fb32a748ccdb9070de3f2d6048564e34c064b362"; + sha256 = "0l07mnarvrb4xdw0b2xqgyxq4rljw1axz5mc9w4gmhvcrzxnyfnr"; + }; + + meta = { + description = "Idris library to interact with xhr"; + homepage = https://github.com/pierrebeaucamp/idris-xhr; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix new file mode 100644 index 0000000000000000000000000000000000000000..ff935753ce9361c3545939f1526a1b9b92dbea93 --- /dev/null +++ b/pkgs/development/idris-modules/yaml.nix @@ -0,0 +1,29 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, contrib +, lightyear +, lib +, idris +}: +build-idris-package { + name = "yaml"; + version = "2018-01-25"; + + idrisDeps = [ prelude contrib lightyear ]; + + src = fetchFromGitHub { + owner = "Heather"; + repo = "Idris.Yaml"; + rev = "5afa51ffc839844862b8316faba3bafa15656db4"; + sha256 = "1g4pi0swmg214kndj85hj50ccmckni7piprsxfdzdfhg87s0avw7"; + }; + + meta = { + description = "Idris YAML lib"; + homepage = https://github.com/Heather/Idris.Yaml; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix new file mode 100644 index 0000000000000000000000000000000000000000..661a55bfd744083e3aef0eb575db22f92be14c83 --- /dev/null +++ b/pkgs/development/idris-modules/yampa.nix @@ -0,0 +1,27 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, bifunctors +, lib +, idris +}: +build-idris-package { + name = "yampa"; + version = "2016-07-05"; + + idrisDeps = [ prelude bifunctors ]; + + src = fetchFromGitHub { + owner = "BartAdv"; + repo = "idris-yampa"; + rev = "2120dffb3ea0de906ba2b40080956c900457cf33"; + sha256 = "0zp495zpbvsagdzrmg9iig652zbm34qc0gdr81x0viblwqxhicx6"; + }; + + meta = { + description = "Idris implementation of Yampa FRP library as described in Reactive Programming through Dependent Types"; + homepage = https://github.com/BartAdv/idris-yampa; + maintainers = [ lib.maintainers.brainrape ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 16734c184eb8751aaaa904a61461d3e9c79c0899..14b9a78af46e1c4ab39de6b8b22486f81e8bff53 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -3,11 +3,11 @@ sbcl }: let hashes = { - "7.4" = "04jb789nks9llwysxz1zw9pq1dh0j39b5fcmivcc4bq9v9cga2l1"; + "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; }; in stdenv.mkDerivation rec { name = "acl2-${version}"; - version = "7.4"; + version = "8.0"; src = fetchFromGitHub { owner = "acl2-devel"; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 2608388e1526189bec1d03333d615af9418d90f2..01348c753484857c8aab52c843de5f0805deddd4 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="angelscript"; - version = "2.31.2"; + version = "2.32.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "1cl1yg36ad4wq0vks4xg0hv7iyvq6yzsd4y1jng5qdf8qybq02qc"; + sha256 = "0675hza06v3grxyqfy70gzm57idmbbm7qvi6bg5vf8m6mpw757dl"; }; buildInputs = [ unzip diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index ed2c4db20f7cd09c2a6ce41c412e3aef5dd5383a..b35f6032d5aa677306226c711e00cd2c2e5ed7bd 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }: +{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }: -let version = "1.8.0"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "clojure-${version}"; + version = "1.9.0.358"; src = fetchurl { - url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; - sha256 = "1nip095fz5c492sw15skril60i1vd21ibg6szin4jcvyy3xr6cym"; + url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; + sha256 = "0fi5kni6rdqjy6qgklf4xf7p1pgbsrdwd17iy6lrlg2vb8n8nksp"; }; - buildInputs = [ unzip ant jdk makeWrapper ]; + buildInputs = [ makeWrapper ]; - buildPhase = "ant jar"; + outputs = [ "out" "prefix" ]; installPhase = '' - mkdir -p $out/share/java $out/bin - install -t $out/share/java clojure.jar - makeWrapper ${jdk.jre}/bin/java $out/bin/clojure --add-flags "-cp $out/share/java/clojure.jar clojure.main" + mkdir -p $prefix/libexec + cp clojure-tools-${version}.jar $prefix/libexec + cp {,example-}deps.edn $prefix + + substituteInPlace clojure --replace PREFIX $prefix + + install -Dt $out/bin clj clojure + wrapProgram $out/bin/clj --suffix PATH ${rlwrap}/bin + wrapProgram $out/bin/clojure --suffix PATH ${jdk}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 3d19f7ba2911d12b474d277b4879095b3976b36f..17f124e798906c4b567b730c22fbd6e4cb7ba7c1 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -1,26 +1,51 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, version }: let - version = "1.16.1"; + + sources = let + + base = "https://storage.googleapis.com/dart-archive/channels"; + stable = "${base}/stable/release"; + dev = "${base}/dev/release"; + + in { + "1.16.1-x86_64-linux" = fetchurl { + url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip"; + sha256 = "01cbnc8hd2wwprmivppmzvld9ps644k16wpgqv31h1596l5p82n2"; + }; + "1.16.1-i686-linux" = fetchurl { + url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip"; + sha256 = "0jfwzc3jbk4n5j9ka59s9bkb25l5g85fl1nf676mvj36swcfykx3"; + }; + "1.24.3-x86_64-linux" = fetchurl { + url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip"; + sha256 = "e323c97c35e6bc5d955babfe2e235a5484a82bb1e4870fa24562c8b9b800559b"; + }; + "1.24.3-i686-linux" = fetchurl { + url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip"; + sha256 = "d67b8f8f9186e7d460320e6bce25ab343c014b6af4b2f61369ee83755d4da528"; + }; + "2.0.0-dev.26.0-x86_64-linux" = fetchurl { + url = "${dev}/${version}/sdk/dartsdk-linux-x64-release.zip"; + sha256 = "18360489a7914d5df09b34934393e16c7627ba673c1e9ab5cfd11cd1d58fd7df"; + }; + "2.0.0-dev.26.0-i686-linux" = fetchurl { + url = "${dev}/${version}/sdk/dartsdk-linux-ia32-release.zip"; + sha256 = "83ba8b64c76f48d8de4e0eb887e49b7960053f570d27e7ea438cc0bac789955e"; + }; + }; + in + stdenv.mkDerivation { + name = "dart-${version}"; nativeBuildInputs = [ unzip ]; - - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "01cbnc8hd2wwprmivppmzvld9ps644k16wpgqv31h1596l5p82n2"; - } - else - fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0jfwzc3jbk4n5j9ka59s9bkb25l5g85fl1nf676mvj36swcfykx3"; - }; + + src = sources."${version}-${stdenv.system}" or (throw "unsupported version/system: ${version}/${stdenv.system}"); installPhase = '' mkdir -p $out diff --git a/pkgs/development/interpreters/dhall/default.nix b/pkgs/development/interpreters/dhall/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8e1df36e4127742311b28879410ae0d1727f61f0 --- /dev/null +++ b/pkgs/development/interpreters/dhall/default.nix @@ -0,0 +1,18 @@ +{ haskell, haskellPackages, stdenvNoCC }: + +let + static = haskell.lib.justStaticExecutables haskellPackages.dhall; + +in static.overrideAttrs (old: { + passthru = old.passthru or {} // { + prelude = stdenvNoCC.mkDerivation { + name = "dhall-prelude"; + inherit (old) src; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + mkdir $out + cp -r Prelude/* $out/ + ''; + }; + }; +}) diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3cdc89fb3fd21c47a706751aa83c835c09d92fd4 --- /dev/null +++ b/pkgs/development/interpreters/duktape/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "duktape-${version}"; + version = "2.2.0"; + src = fetchurl { + url = "http://duktape.org/duktape-${version}.tar.xz"; + sha256 = "050csp065ll67dck94s0vdad5r5ck4jwsz1fn1y0fcvn88325xv2"; + }; + + buildPhase = '' + make -f Makefile.sharedlibrary + make -f Makefile.cmdline + ''; + installPhase = '' + install -d $out/bin + install -m755 duk $out/bin/ + install -d $out/lib + install -d $out/include + make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out + ''; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "An embeddable Javascript engine, with a focus on portability and compact footprint"; + homepage = "http://duktape.org/"; + downloadPage = "http://duktape.org/download.html"; + license = licenses.mit; + maintainers = [ maintainers.fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix index 469502a3f85e09c382550387e4d4e33fffeca668..d32f91275652b93ee67b93b950c2729ac4ce7691 100644 --- a/pkgs/development/interpreters/elixir/1.5.nix +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.5.2"; - sha256 = "0ng7z2gz1c8lkn07fric18b3awcw886s9xb864kmnn2iah5gc65j"; + version = "1.5.3"; + sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5"; minimumOTPVersion = "18"; } diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix new file mode 100644 index 0000000000000000000000000000000000000000..816bd92d5eed1f46e3858494ae6845b52f74202f --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.6.4"; + sha256 = "0li2zb5ha7fdkjnzjbj3dxb9xls8xn6xr23fqwl7gp2697vcw3ws"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/setup-hook.sh b/pkgs/development/interpreters/elixir/setup-hook.sh index 2ed3b2e6454b17a260d8cce919f57bd96e50c8a6..501eca3cf02a3f3f621dbce2e36338672da29986 100644 --- a/pkgs/development/interpreters/elixir/setup-hook.sh +++ b/pkgs/development/interpreters/elixir/setup-hook.sh @@ -2,4 +2,4 @@ addErlLibPath() { addToSearchPath ERL_LIBS $1/lib/elixir/lib } -envHooks+=(addErlLibPath) +addEnvHooks "$hostOffset" addErlLibPath diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix deleted file mode 100644 index 123d813fc77ab59691a7a4b3ed11abee6696d073..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/erlang/R16.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ mkDerivation, fetchurl }: - -mkDerivation rec { - version = "16B03-1"; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; - sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; - }; - - 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 - ''; - - # 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 '' - 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 - ''; -} diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix deleted file mode 100644 index a5f79c197d637dcf6d476b727298e02b36c9c44c..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ pkgs, mkDerivation }: - -mkDerivation rec { - baseName = "erlang"; - version = "16B02"; - - src = pkgs.fetchFromGitHub { - owner = "basho"; - repo = "otp"; - rev = "OTP_R16B02_basho8"; - sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x"; - }; - - 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"@$(pwd)/bootstrap/bin/escript@g -i lib/diameter/bin/diameterc - - ./otp_build autoconf - ''; - - enableHipe = false; - - # Do not install docs, instead use prebuilt versions. - installTargets = "install"; - postInstall = let - manpages = pkgs.fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; - sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p"; - }; - in '' - 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%/*}" - ensureDir "$out/share/man/''${prefix##*/}" - ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" - done - ''; - - meta = { - homepage = https://github.com/basho/otp/; - description = "Programming language used for massively scalable soft real-time systems, Basho fork"; - - 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. - This version of Erlang is Basho's version, forked from Ericsson's - repository. - ''; - - platforms = ["x86_64-linux" "x86_64-darwin"]; - license = pkgs.stdenv.lib.licenses.asl20; - maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ]; - }; -} diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix new file mode 100644 index 0000000000000000000000000000000000000000..714924514edb7ea94ca4f001f08fe07ee553f762 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -0,0 +1,65 @@ +{ pkgs, mkDerivation }: + +mkDerivation rec { + baseName = "erlang"; + version = "16B02.basho10"; + + src = pkgs.fetchFromGitHub { + owner = "basho"; + repo = "otp"; + rev = "OTP_R16B02_basho10"; + sha256 = "1s2c3ag9dnp6xmcr27kh95n1w50xly97n1mp8ivc2a3gpv4blqmj"; + }; + + 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"@$(pwd)/bootstrap/bin/escript@g -i lib/diameter/bin/diameterc + + ./otp_build autoconf + ''; + + enableHipe = false; + + # Do not install docs, instead use prebuilt versions. + installTargets = "install"; + postInstall = let + manpages = pkgs.fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R16B02.tar.gz"; + sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p"; + }; + in '' + 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%/*}" + mkdir -p "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done + ''; + + meta = { + homepage = https://github.com/basho/otp/; + description = "Programming language used for massively scalable soft real-time systems, Basho fork"; + + 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. + This version of Erlang is Basho's version, forked from Ericsson's + repository. + ''; + + knownVulnerabilities = [ "CVE-2017-1000385" ]; + + platforms = ["x86_64-linux" "x86_64-darwin"]; + 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 deleted file mode 100644 index 02d7513331eb0599d151c16fc9f1e646f0c4d8dd..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/erlang/R17.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ mkDerivation, fetchurl }: - -mkDerivation rec { - version = "17.5"; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "0x34hj1a4j3rphqdaapdld7la4sqiqillamcz06wac0vk0684a1w"; - }; - - 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 - ''; - - # 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 '' - 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 - ''; -} diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 39a1a8a0048e1dd2b89daec9e3a5d1cb8c1f778f..ee524feb4c6c9c0d3da5a4a2acd5c4ad84daa041 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -12,8 +12,8 @@ let }; in mkDerivation rec { - version = "18.3.4.4"; - sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; + version = "18.3.4.8"; + sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g"; patches = [ rmAndPwdPatch diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 5e2e1c7f215d1b296f52cd2ae98b003318ac544e..d0ba1912e9a4c3ae749b09abf2f3a9b1a8dea22f 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl, fetchpatch }: mkDerivation rec { - version = "19.3"; - sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; + version = "19.3.6.6"; + sha256 = "05l81gig0hmr951pjvwknc9x2qvpm95ph9z072hn4jqg13rzbgvg"; patches = [ # macOS 10.13 crypto fix from OTP-20.1.2 diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index cf94a8800f9c3b041170f89ab9c19f65b3dd8728..42aaed0b6590867457e450cc5ea56e4619a6311f 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl }: mkDerivation rec { - version = "20.1"; - sha256 = "13f53lzgq2himg9kax41f66rzv5pjfrb1ln8b54yv9spkqx2hqqi"; + version = "20.3.2"; + sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1"; 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 index af728b942ebb82e4c78225595f7de9f8714c68c7..6ea3ac73a4b11a5add71d13f5a8ec3681b5f4dea 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport -, mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport +, libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport }: { baseName ? "erlang" @@ -17,7 +17,7 @@ , enableKernelPoll ? true , javacSupport ? false, javacPackages ? [ openjdk ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] -, wxSupport ? true, wxPackages ? [ mesa wxGTK xorg.libX11 ] +, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" @@ -26,12 +26,12 @@ , installTargets ? "install install-docs" , checkPhase ? "", preCheck ? "", postCheck ? "" , fixupPhase ? "", preFixup ? "", postFixup ? "" -, meta ? null +, meta ? {} }: assert wxSupport -> (if stdenv.isDarwin then wxmac != null - else mesa != null && wxGTK != null && xorg != null); + else libGLU_combined != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk != null; @@ -65,9 +65,9 @@ in stdenv.mkDerivation ({ ''; postPatch = '' - ${postPatch} - patchShebangs make + + ${postPatch} ''; preConfigure = '' @@ -88,9 +88,9 @@ in stdenv.mkDerivation ({ # (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 + + ${postInstall} ''; # Some erlang bin/ scripts run sed and awk @@ -101,7 +101,7 @@ in stdenv.mkDerivation ({ setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + 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"; @@ -118,7 +118,7 @@ in stdenv.mkDerivation ({ platforms = platforms.unix; maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ]; license = licenses.asl20; - }; + } // meta); } // optionalAttrs (preUnpack != "") { inherit preUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; } @@ -140,5 +140,4 @@ in stdenv.mkDerivation ({ // optionalAttrs (fixupPhase != "") { inherit fixupPhase; } // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } -// optionalAttrs (meta != null) { inherit meta; } ) diff --git a/pkgs/development/interpreters/erlang/setup-hook.sh b/pkgs/development/interpreters/erlang/setup-hook.sh index 68c0f762dfc5c2283577231f65e8ac0ad3cee757..3962d154ba9f7459a8660952b1bb78674c59b1bd 100644 --- a/pkgs/development/interpreters/erlang/setup-hook.sh +++ b/pkgs/development/interpreters/erlang/setup-hook.sh @@ -2,4 +2,4 @@ addErlangLibPath() { addToSearchPath ERL_LIBS $1/lib/erlang/lib } -envHooks+=(addErlangLibPath) +addEnvHooks "$hostOffset" addErlangLibPath diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 4d38545a44f0b9a674bd74c004cfa67e6dfde44b..599126d2eff9efd3fa0ef8fa4840044847e51991 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, readline, gettext, ncurses }: -with stdenv.lib; stdenv.mkDerivation rec { name = "gnu-apl-${version}"; version = "1.7"; @@ -12,7 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; - patchPhase = optionalString stdenv.isDarwin '' + # Needed with GCC 7 + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=int-in-bool-context" + + stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=null-dereference"; + + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" ''; @@ -21,7 +24,7 @@ stdenv.mkDerivation rec { find $out/share/doc/support-files -name 'Makefile*' -delete ''; - meta = { + meta = with stdenv.lib; { description = "Free interpreter for the APL programming language"; homepage = http://www.gnu.org/software/apl/; license = licenses.gpl3Plus; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index e203a1d09f40bcfe5d5ce0655da71ace05b3f372..968d9f1e8fb07521258e49f89988fab837b48bc3 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.12"; + version = "2.4.15"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1dm7m221pqbgh3lp1q1nvv6qc0fpja3cgsd0mx3ghahcfsfa3fck"; + sha256 = "1vaa1wjnaza04hvp1n4kh10hvxx8370liz2ndm908dqv9mxa6k5x"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index c50a5fbab077ce32f3eedbf8d39bca8418fa5475..cf42c9a7b6830fb2fce245ddab747ac9d55a4c34 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -1,33 +1,41 @@ -{ fetchurl, stdenv, libtool, readline, gmp -, gawk, makeWrapper }: +{ stdenv, buildPackages +, buildPlatform, hostPlatform +, fetchurl, makeWrapper, gawk, pkgconfig +, libtool, readline, gmp +}: stdenv.mkDerivation rec { name = "guile-1.8.8"; src = fetchurl { - url = "mirror://gnu/guile/" + name + ".tar.gz"; + url = "mirror://gnu/guile/${name}.tar.gz"; sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3"; }; - patches = [ ./cpp-4.5.patch ]; - outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise # GCC 4.6 raises a number of set-but-unused warnings. configureFlags = [ "--disable-error-on-warning" ]; - nativeBuildInputs = [ makeWrapper gawk ]; - propagatedBuildInputs = [ readline gmp libtool ]; - selfNativeBuildInput = true; + depsBuildBuild = [ buildPackages.stdenv.cc ] + ++ stdenv.lib.optional (hostPlatform != buildPlatform) + buildPackages.buildPackages.guile_1_8; + nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + buildInputs = [ readline libtool ]; - postInstall = '' - wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" - ''; + propagatedBuildInputs = [ + gmp - preBuild = '' - sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c - ''; + # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l' + # flags for them without corresponding '-L' flags. Adding them here will add + # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags, + # see below. + libtool + ]; + + + patches = [ ./cpp-4.5.patch ]; # Guile needs patching to preset results for the configure tests # about pthreads, which work only in native builds. @@ -37,6 +45,22 @@ stdenv.mkDerivation rec { fi ''; + preBuild = '' + sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c + ''; + + + 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"-*.pc \ + -e "s|-lltdl|-L${libtool.lib}/lib -lltdl|g" + ''; + # One test fails. # ERROR: file: "libtest-asmobs", message: "file not found" # This is fixed here: @@ -46,17 +70,16 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - description = "GNU Guile, an embeddable Scheme interpreter"; + description = "Embeddable Scheme implementation"; + homepage = http://www.gnu.org/software/guile/; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.unix; + longDescription = '' GNU Guile is an interpreter for the Scheme programming language, packaged as a library that can be embedded into programs to make them extensible. It supports many SRFIs. ''; - - homepage = http://www.gnu.org/software/guile/; - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 5746300fca09bf911e77e396c0c816ddbf77439c..2c9aec5b6952c9c59e3eccc49eef5fe7e02dbea9 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -1,6 +1,8 @@ -{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring -, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null -, hostPlatform +{ stdenv, buildPackages +, buildPlatform, hostPlatform +, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig +, libffi, libtool, readline, gmp, boehmgc, libunistring +, coverageAnalysis ? null, gnu ? null }: # Do either a coverage analysis build or a standard build. @@ -19,18 +21,21 @@ outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise + depsBuildBuild = [ buildPackages.stdenv.cc ] + ++ stdenv.lib.optional (hostPlatform != buildPlatform) + buildPackages.buildPackages.guile_2_0; 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 + propagatedBuildInputs = [ + gmp boehmgc + + # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l' + # flags for them without corresponding '-L' flags. 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; + libtool libunistring + ]; enableParallelBuilding = true; @@ -40,6 +45,7 @@ url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; }) + ./riscv.patch ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); @@ -67,11 +73,12 @@ 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" \ + + '' + sed -i "$out/lib/pkgconfig/guile"-*.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 ; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index fe9f94beed17d5c4ac305ff7913e0f4f8f34fd47..3d5c51dc420b7def49c03edd5155023b2bca1908 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,6 +1,8 @@ -{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring -, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null -, hostPlatform +{ stdenv, buildPackages +, buildPlatform, hostPlatform +, fetchurl, makeWrapper, gawk, pkgconfig +, libffi, libtool, readline, gmp, boehmgc, libunistring +, coverageAnalysis ? null, gnu ? null }: # Do either a coverage analysis build or a standard build. @@ -10,33 +12,37 @@ (rec { name = "guile-${version}"; - version = "2.2.0"; + version = "2.2.3"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "05dmvhd1y135x7w5qfw4my42cfp6l8bbhjfxvchcc1cbdvzri0f1"; + sha256 = "11j01agvnci2cx32wwpqs9078856yxmvs15gcsz7ganpkj2ahlw3"; }; outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise + depsBuildBuild = [ buildPackages.stdenv.cc ] + ++ stdenv.lib.optional (hostPlatform != buildPlatform) + buildPackages.buildPackages.guile; 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 + propagatedBuildInputs = [ + gmp boehmgc + + # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l' + # flags for them without corresponding '-L' flags. 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; + libtool libunistring + ]; enableParallelBuilding = true; patches = [ ./eai_system.patch + ./riscv.patch ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); @@ -63,11 +69,12 @@ 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.2.pc" \ + + '' + sed -i "$out/lib/pkgconfig/guile"-*.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 ; diff --git a/pkgs/development/interpreters/guile/riscv.patch b/pkgs/development/interpreters/guile/riscv.patch new file mode 100644 index 0000000000000000000000000000000000000000..b835e16138384062d4d8eeed7af581b97512eb1e --- /dev/null +++ b/pkgs/development/interpreters/guile/riscv.patch @@ -0,0 +1,13 @@ +diff --git a/module/system/base/target.scm b/module/system/base/target.scm +index 95ab8d8c9..93616f4a3 100644 +--- a/module/system/base/target.scm ++++ b/module/system/base/target.scm +@@ -86,6 +86,8 @@ + (endianness big)) + ((string=? "aarch64" cpu) + (endianness little)) ++ ((string-match "riscv[1-9][0-9]*" cpu) ++ (endianness little)) + (else + (error "unknown CPU endianness" cpu))))) + diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh index fd1dc944ed44b2664a02ed04a1be65d0f8589378..c7fb4f70fc6a80358a088819ce81d137e46fb297 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh @@ -10,4 +10,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook-2.2.sh b/pkgs/development/interpreters/guile/setup-hook-2.2.sh index 86c1e0d3e4a9db245ef1e61ef0749bc56af4668f..73e700bde026c07dd2adf989396856c7f695d506 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.2.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.2.sh @@ -10,4 +10,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook.sh b/pkgs/development/interpreters/guile/setup-hook.sh index c1d19e579ed532ee0b6a99cf5d3cc6b9d7eaed6d..bf04fee1e89360d6e6313f791a2cecc03f662345 100644 --- a/pkgs/development/interpreters/guile/setup-hook.sh +++ b/pkgs/development/interpreters/guile/setup-hook.sh @@ -5,4 +5,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 3cafd956277ad386c6dd262713ff4e169a2c68bf..3f08ca8f7c22bd7bbd80d644adc94790670d792a 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -2,15 +2,21 @@ pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.12.1"; + version = "0.14.0"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; - sha256 = "1fjip998k336r26i1gpri18syvfjg7z46wng1n58dmc238wm53sx"; + sha256 = "0cbdh1q0zm00p4h7i44kir4qhw0p6sid78xf6llrx2p21llsnv98"; }; propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ]; + # The build generates a .json parser file in the home directory under .cache. + # This is needed to get it to not try and open files in /homeless-shelter + preConfigure = '' + export HOME=$TMP + ''; + meta = { description = "A LISP dialect embedded in Python"; homepage = http://hylang.org/; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 773a2c86028b6e0ab6bfdd9c2d38f820efe80df3..6c0568d68134ab600b855fcbd522ea4bd81d2a00 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, - ncurses, freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile, + ncurses, freetype, libGLU_combined, libpng, libtiff, libjpeg, readline, libsndfile, libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ zlib sqlite gmp libffi cairo ncurses freetype - mesa libpng libtiff libjpeg readline libsndfile libxml2 + libGLU_combined libpng libtiff libjpeg readline libsndfile libxml2 freeglut libsamplerate pcre libevent libedit yajl pkgconfig glfw openssl libpthreadstubs libXdmcp libmemcached python3 diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 94641e20e1bc28aed66e765a59edae15f042319c..cb351446301d4bd82bba01c81aa886f98a8278c8 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,57 +1,79 @@ -{ stdenv, fetchurl, readline }: +{ stdenv, fetchFromGitHub, readline, libedit }: stdenv.mkDerivation rec { name = "j-${version}"; - version = "701_b"; - src = fetchurl { - url = "http://www.jsoftware.com/download/j${version}_source.tar.gz"; - sha256 = "1gmjlpxcd647x690c4dxnf8h6ays8ndir6cib70h3zfnkrc34cys"; + version = "808"; + jtype = "release"; + src = fetchFromGitHub { + owner = "jsoftware"; + repo = "jsource"; + rev = "j${version}-${jtype}"; + sha256 = "1sshm04p3yznlhfp6vyc7g8qxw95y67vhnh92cmz3lfy69n2q6bf"; }; - buildInputs = [ readline ]; + + buildInputs = [ readline libedit ]; bits = if stdenv.is64bit then "64" else "32"; + platform = + /*if stdenv.isRaspberryPi then "raspberry" else*/ + if stdenv.isLinux then "linux" else + if stdenv.isDarwin then "darwin" else + "unknown"; doCheck = true; buildPhase = '' - sed -i bin/jconfig -e ' - s@bits=32@bits=${bits}@g; - s@readline=0@readline=1@; - s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@; - s@-W1,soname,libj.so@-Wl,-soname,libj.so@ - ' - sed -i bin/build_libj -e 's@>& make.txt@ 2>\&1 | tee make.txt@' + export SOURCE_DIR=$(pwd) + export HOME=$TMPDIR + export JBIN=$HOME/j${bits}/bin + export JLIB=$SOURCE_DIR/jlibrary + mkdir -p $JBIN + + cd make + + patchShebangs . + sed -i jvars.sh -e ' + s@~/gitdev/jsource@$SOURCE_DIR@; + s@~/jbld@$HOME@; + s@linux@${platform}@; + ' - sed -i f2.c -e 's/_isnan(\*wv)/_isnan(y)/' + sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;" - touch *.c *.h - sh -o errexit bin/build_jconsole - [ -e j/bin/jconsole ] - sh -o errexit bin/build_libj - [ -e j/bin/libj.so ] - sh -o errexit bin/build_defs - [ -e defs/hostdefs.ijs ] && [ -e defs/netdefs.ijs ] - sh -o errexit bin/build_tsdll - [ -x libtsdll.so ] + # For future versions, watch + # https://github.com/jsoftware/jsource/pull/4 + cp ./jvars.sh $HOME - sed -i j/bin/profile.ijs -e " - s@userx=[.] *'.j'@userx=. '/.j'@; - s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ; - /install=./ainstall=. install,'/share/j' - " + echo ' + #define jversion "${version}" + #define jplatform "${platform}" + #define jtype "${jtype}" // release,beta,... + #define jlicense "GPL3" + #define jbuilder "unknown" // website or email + ' > ../jsrc/jversion.h + + ./build_jconsole.sh j${bits} + ./build_libj.sh j${bits} ''; checkPhase = '' - echo 'i. 5' | j/bin/jconsole | fgrep "0 1 2 3 4" + echo 'i. 5' | $JBIN/jconsole | fgrep "0 1 2 3 4" + + # Now run the real tests + cd $SOURCE_DIR/test + # for f in *.ijs + # do + # echo $f + # $JBIN/jconsole < $f + # done ''; installPhase = '' mkdir -p "$out" - cp -r j/bin "$out/bin" - rm "$out/bin/profilex_template.ijs" + cp -r $JBIN "$out/bin" mkdir -p "$out/share/j" - - cp -r docs j/addons j/system "$out/share/j" + cp -r $JLIB/{addons,system} "$out/share/j" + cp -r $JLIB/bin "$out" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 8906c9c5d2493262e2dc2473de08567df5fbd816..929827ce1120fb39bc1a022b432f7b9290dd7aad 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "joker-${version}"; - version = "0.8.6"; + version = "0.9.1"; goPackagePath = "github.com/candid82/joker"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "0m6xi1jgss6f4maxqpwjyyhyyc71wy5a7jpm908m49xx80mz5ams"; + sha256 = "10flfjnb9mz3dir3882agcs1lyr5qdpd9qfyvphrh08zr3jnb3hz"; }; preBuild = "go generate ./..."; diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix index d5cc0bc44b0b40a6ea4f86c5df93221b6efb2296..ee99aeab69f8874e589dcaa6998c3ef83d7a0021 100644 --- a/pkgs/development/interpreters/joker/deps.nix +++ b/pkgs/development/interpreters/joker/deps.nix @@ -8,4 +8,13 @@ sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc"; }; } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } ] diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index ff192c072865f13e19863cdc95a631d51c4c5b20..b9cc38ee68a334ed8111796e44aad09b1fa798f3 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.1.13.0"; + version = "9.1.16.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "021rmm5c18js569i4z6vj1bb193j4nska43jfiqz5hisc936c5cx"; + sha256 = "0nj8v4dcg4jj0z3fk661v6mzrgg4613xr0k9xzzsz81jkqsjnb6r"; }; buildInputs = [ makeWrapper ]; @@ -36,7 +36,7 @@ jruby = stdenv.mkDerivation rec { addToSearchPath GEM_PATH \$1/${passthru.gemPath} } - envHooks+=(addGemPath) + addEnvHooks "$hostOffset" addGemPath EOF ''; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 255bd03512988dbb26228eb87851ca46c199858e..07ce9347cf708c58e1c97be60e15fa9cc191c716 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, mesa, openal, luajit, +{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 + SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake ]; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 114749e90da37a164975f6c6d4e483f4aea76946..884225b6483ea7656a70c9a48a47bf515cfbc0f5 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL, mesa, openal, lua +, SDL, libGLU_combined, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL mesa openal lua + SDL libGLU_combined openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 4e999eca9eebc927386be3848abbfb65bbb9086c..5fbb34bf213a2f7c39cf9c902a0c9a2dc1b59388 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL, mesa, openal, lua +, SDL, libGLU_combined, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL mesa openal lua + SDL libGLU_combined openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 83c485f065dd277f97aaa66cbac263c79675d122..425239af22420ef98e3279a1ce6b2a03c15399d8 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL2, mesa, openal, luajit +, SDL2, libGLU_combined, openal, luajit , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL2 mesa openal luajit + SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index cdbb2324dc65ead74b8eec4526304c35b6cd2618..1c4fcd2811d112afb4c98a53eb2595845fbe906a 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -8,7 +8,8 @@ let }; in stdenv.mkDerivation rec { - name = "lua-5.1.5"; + name = "lua-${version}"; + version = "5.1.5"; luaversion = "5.1"; src = fetchurl { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDFLAGS="" CC="$CC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.5.1.5.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' ) ''; diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 43e289cd36903fc351d7710af0f4dfed0105dc1e..acddbcfd303c8533641f953b846db4d7dd73344a 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"; }; - nativeBuildInputs = [ readline ]; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch ]; configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' ) ''; @@ -56,31 +56,6 @@ stdenv.mkDerivation rec { EOF ''; - crossAttrs = let - inherit (hostPlatform) isDarwin isMingw; - in { - configurePhase = '' - makeFlagsArray=( - INSTALL_TOP=$out - INSTALL_MAN=$out/share/man/man1 - V=${luaversion} - R=${version} - ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' - ''} - ) - '' + stdenv.lib.optionalString isMingw '' - installFlagsArray=( - TO_BIN="lua.exe luac.exe" - TO_LIB="liblua.a lua52.dll" - INSTALL_DATA="cp -d" - ) - ''; - } // stdenv.lib.optionalAttrs isDarwin { - postPatch = '' - sed -i -e 's/-Wl,-soname[^ ]* *//' src/Makefile - ''; - }; - meta = { homepage = http://www.lua.org; description = "Powerful, fast, lightweight, embeddable scripting language"; diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index a512a25131345798e15c6a4beed33eb079fd8f5c..7f0703c62884dd53dad88495be8f0461c6d67819 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; }; - nativeBuildInputs = [ readline ]; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else []; configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version}) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' ) cat ${./lua-5.3-dso.make} >> src/Makefile sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile @@ -55,31 +55,6 @@ stdenv.mkDerivation rec { EOF ''; - crossAttrs = let - inherit (hostPlatform) isDarwin isMingw; - in { - configurePhase = '' - makeFlagsArray=( - INSTALL_TOP=$out - INSTALL_MAN=$out/share/man/man1 - V=${luaversion} - R=${version} - ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' - ''} - ) - '' + stdenv.lib.optionalString isMingw '' - installFlagsArray=( - TO_BIN="lua.exe luac.exe" - TO_LIB="liblua.a lua52.dll" - INSTALL_DATA="cp -d" - ) - ''; - } // stdenv.lib.optionalAttrs isDarwin { - postPatch = '' - sed -i -e 's/-Wl,-soname[^ ]* *//' src/Makefile - ''; - }; - meta = { homepage = http://www.lua.org; description = "Powerful, fast, lightweight, embeddable scripting language"; diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index 21f656044a3396346b0e214b54ffad9f5ed38d46..7aa41e95cc9b7368f54ca941466bad9a07d72cf4 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/keplerproject/luafilesystem; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.flosse ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix index b83b920497de28b549a184e2727f7fa60af30a6e..d8a789e9209e37859eba665bbfce5a7fd83cf287 100644 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ b/pkgs/development/interpreters/lua-5/sockets.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://w3.impa.br/~diego/software/luasocket/; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 3f8554a298e4ffc6f0c04f3483261225312e1997..59394d3ccc88715887c430ac1029fd93d9b23e4d 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -26,7 +26,7 @@ rec { homepage = http://luajit.org; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers ; [ thoughtpolice smironov vcunat ]; + maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ]; }; generic = @@ -61,7 +61,8 @@ rec { enableParallelBuilding = true; installPhase = '' - make install INSTALL_INC="$out"/include PREFIX="$out" + make install PREFIX="$out" + ( cd "$out/include"; ln -s luajit-*/* . ) ln -s "$out"/bin/luajit-* "$out"/bin/lua '' + stdenv.lib.optionalString (!isStable) diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index a39e79badb6ca495b0e6b16fd639a803377c4457..9575409f9868c70e9284cc985a43e1da12bc59c5 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, mesa, SDL -, blas, binutils, intltool, gettext, zlib, libSM}: +{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, libGLU_combined, SDL +, blas, libbfd, intltool, gettext, zlib, libSM}: stdenv.mkDerivation rec { baseName = "lush"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 libSM xproto indent readline gsl freeglut mesa SDL blas binutils + libX11 libSM xproto indent readline gsl freeglut libGLU_combined SDL blas libbfd intltool gettext zlib ]; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 7f38f388c354570ca044f6e37cd0d95b7a5ae7cc..277993339e239d8841e598521655d48419037431 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -18,5 +18,6 @@ in stdenv.mkDerivation { homepage = https://github.com/shlevy/nix-exec; license = stdenv.lib.licenses.mit; platforms = nix.meta.platforms; + broken = true; }; } diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index ab1dc4b5fe1d968b2f2c67184eeb7901719ab453..ce3ce584434fcb6c3620afd79b36b62236c9cc72 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull -, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk +, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGLU_combined, fltk , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - version = "4.2.1"; + version = "4.2.2"; name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.gz"; - sha256 = "0frk0nk3aaic8hj3g45h11rnz3arp7pjsq0frbx50sspk1iqzhl0"; + sha256 = "0vkjfrpv7aikcn73bxqkph1qrhrdx7jqy193n8d8lwp7v2al7f3p"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional (jdk != null) jdk) ++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (python != null) python) - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ]) + ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGLU_combined libX11 ]) ; # makeinfo is required by Octave at runtime to display help diff --git a/pkgs/development/interpreters/perl/MakeMaker-cross.patch b/pkgs/development/interpreters/perl/MakeMaker-cross.patch new file mode 100644 index 0000000000000000000000000000000000000000..40626c51f9bd1941c88ae87af8c2f0bc862b1a9c --- /dev/null +++ b/pkgs/development/interpreters/perl/MakeMaker-cross.patch @@ -0,0 +1,17 @@ +diff -Naur a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2017-06-30 17:03:20.000000000 -0400 ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2018-02-28 10:06:37.031237946 -0500 +@@ -1267,7 +1267,12 @@ + my $value = shift; + return $value if $UNDER_CORE; + my $tvalue = ''; +- require B; ++ eval { ++ require B; ++ }; ++ if ($@) { ++ return $tvalue; ++ } + my $sv = B::svref_2object(\$value); + my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef; + while ( $magic ) { diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 97e395d2a6dfe93cd3339e63c96c263fcbae5d1e..0fd55bd8d71be1d797970aba70de76710a67df16 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurlBoot, enableThreading ? stdenv ? glibc }: +{ lib, stdenv, fetchurlBoot, buildPackages +, enableThreading ? stdenv ? glibc, fetchpatch, makeWrapper +}: with lib; @@ -19,7 +21,8 @@ let libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; libcInc = lib.getDev libc; libcLib = lib.getLib libc; - common = { version, sha256 }: stdenv.mkDerivation rec { + crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; + common = { version, sha256 }: stdenv.mkDerivation (rec { name = "perl-${version}"; src = fetchurlBoot { @@ -28,23 +31,33 @@ let }; # TODO: Add a "dev" output containing the header files. - outputs = [ "out" "man" "devdoc" ]; + outputs = [ "out" "man" "devdoc" ] ++ + stdenv.lib.optional crossCompiling "dev"; setOutputFlags = false; patches = - [ # Do not look in /usr etc. for dependencies. - ./no-sys-dirs.patch - ] + [ ] + # Do not look in /usr etc. for dependencies. + ++ optional (versionOlder version "5.26") ./no-sys-dirs.patch + ++ optional (versionAtLeast version "5.26") ./no-sys-dirs-5.26.patch + ++ optional (versionAtLeast version "5.24") ( + # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 + fetchurlBoot { + url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch"; + sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0"; + }) ++ optional stdenv.isSunOS ./ld-shared.patch ++ optional stdenv.isDarwin ./cpp-precomp.patch - ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch; + ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch + ++ optional crossCompiling ./MakeMaker-cross.patch; postPatch = '' pwd="$(type -P pwd)" substituteInPlace dist/PathTools/Cwd.pm \ --replace "/bin/pwd" "$pwd" + '' + stdenv.lib.optionalString crossCompiling '' + substituteInPlace cnf/configure_tool.sh --replace "cc -E -P" "cc -E" ''; - sandboxProfile = sandbox.allow "ipc-sysv-sem"; # Build a thread-safe Perl with a dynamic libperls.o. We need the # "installstyle" option to ensure that modules are put under @@ -52,8 +65,10 @@ let # contains the string "perl", Configure would select $out/lib. # Miniperl needs -lm. perl needs -lrt. configureFlags = - [ "-de" - "-Dcc=cc" + (if crossCompiling + then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" ] + else [ "-de" "-Dcc=cc" ]) + ++ [ "-Uinstallusrbinperl" "-Dinstallstyle=lib/perl5" "-Duseshrplib" @@ -63,14 +78,13 @@ let ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads"; - configureScript = "${stdenv.shell} ./Configure"; + configureScript = stdenv.lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; - dontAddPrefix = true; + dontAddPrefix = !crossCompiling; - enableParallelBuilding = true; + enableParallelBuilding = !crossCompiling; - preConfigure = - '' + preConfigure = optionalString (!crossCompiling) '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" '' + optionalString (stdenv.isArm || stdenv.isMips) '' configureFlagsArray=(-Dldflags="-lm -lrt") @@ -107,6 +121,28 @@ let if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path" }" /no-such-path \ --replace "$man" /no-such-path + '' + stdenv.lib.optionalString crossCompiling + '' + mkdir -p $dev/lib/perl5/cross_perl/${version} + for dir in cnf/{stub,cpan}; do + cp -r $dir/* $dev/lib/perl5/cross_perl/${version} + done + + mkdir -p $dev/bin + install -m755 miniperl $dev/bin/perl + + export runtimeArch="$(ls $out/lib/perl5/site_perl/${version})" + # wrapProgram should use a runtime-native SHELL by default, but + # it actually uses a buildtime-native one. If we ever fix that, + # we'll need to fix this to use a buildtime-native one. + # + # Adding the arch-specific directory is morally incorrect, as + # miniperl can't load the native modules there. However, it can + # (and sometimes needs to) load and run some of the pure perl + # code there, so we add it anyway. When needed, stubs can be put + # into $dev/lib/perl5/cross_perl/${version}. + wrapProgram $dev/bin/perl --prefix PERL5LIB : \ + "$dev/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch" ''; # */ meta = { @@ -115,7 +151,37 @@ let maintainers = [ maintainers.eelco ]; platforms = platforms.all; }; - }; + } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { + crossVersion = "1.1.8"; + + perl-cross-src = fetchurlBoot { + url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz"; + sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; + }; + + # https://github.com/arsv/perl-cross/issues/60 + perl-cross-gcc7-patch = fetchpatch { + url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch"; + sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810"; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; + + postUnpack = '' + unpackFile ${perl-cross-src} + cd perl-cross-* + patch -Np1 -i ${perl-cross-gcc7-patch} + cd .. + cp -R perl-cross-${crossVersion}/* perl-${version}/ + ''; + + configurePlatforms = [ "build" "host" "target" ]; + + inherit version; + + # TODO merge setup hooks + setupHook = ./setup-hook-cross.sh; + }); in rec { perl = perl524; @@ -128,4 +194,9 @@ in rec { version = "5.24.3"; sha256 = "1m2px85kq2fyp2d4rx3bw9kg3car67qfqwrs5vlv96dx0x8rl06b"; }; + + perl526 = common { + version = "5.26.1"; + sha256 = "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7"; + }; } diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch new file mode 100644 index 0000000000000000000000000000000000000000..ad65d1339f362c0ccb8582896ecccc7a1d2a5c51 --- /dev/null +++ b/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch @@ -0,0 +1,250 @@ +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure +--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 ++++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 +@@ -106,15 +106,7 @@ + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1337,8 +1329,7 @@ + archname='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1349,17 +1340,12 @@ + + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" ++glibpth="" + + : Private path used by Configure to find libraries. Its value + : is prepended to libpth. This variable takes care of special +@@ -1391,8 +1377,6 @@ + libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2446,7 +2430,6 @@ + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth $sysroot/lib $sysroot/usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -4936,7 +4919,7 @@ + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in +@@ -8600,13 +8583,8 @@ + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -19900,9 +19878,10 @@ + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +Only in perl-5.20.0/: Configure.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL +--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 +@@ -126,11 +126,7 @@ + if ($dep =~ /(\S+errno\.h)/) { + $file{$1} = 1; + } +- } elsif ($^O eq 'linux' && +- $Config{gccversion} ne '' && +- $Config{gccversion} !~ /intel/i +- # might be using, say, Intel's icc +- ) { ++ } elsif (0) { + # When cross-compiling we may store a path for gcc's "sysroot" option: + my $sysroot = $Config{sysroot} || ''; + # Some Linuxes have weird errno.hs which generate +Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh +--- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 ++++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 +@@ -119,21 +119,21 @@ + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh +--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 +@@ -150,25 +150,6 @@ + ;; + esac + +-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries +-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us +-# where to look. We don't want gcc's own libraries, however, so we +-# filter those out. +-# This could be conditional on Unbuntu, but other distributions may +-# follow suit, and this scheme seems to work even on rather old gcc's. +-# This unconditionally uses gcc because even if the user is using another +-# compiler, we still need to find the math library and friends, and I don't +-# know how other compilers will cope with that situation. +-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, +-# we don't want its libraries. So we try to prefer the system gcc +-# Still, as an escape hatch, allow Configure command line overrides to +-# plibpth to bypass this check. +-if [ -x /usr/bin/gcc ] ; then +- gcc=/usr/bin/gcc +-else +- gcc=gcc +-fi +- + case "$plibpth" in + '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | + cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` +@@ -178,32 +159,6 @@ + ;; + esac + +-case "$libc" in +-'') +-# If you have glibc, then report the version for ./myconfig bug reporting. +-# (Configure doesn't need to know the specific version since it just uses +-# gcc to load the library for all tests.) +-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they +-# are insufficiently precise to distinguish things like +-# libc-2.0.6 and libc-2.0.7. +- for p in $plibpth +- do +- for trylib in libc.so.6 libc.so +- do +- if $test -e $p/$trylib; then +- libc=`ls -l $p/$trylib | awk '{print $NF}'` +- if $test "X$libc" != X; then +- break +- fi +- fi +- done +- if $test "X$libc" != X; then +- break +- fi +- done +- ;; +-esac +- + if ${sh:-/bin/sh} -c exit; then + echo '' + echo 'You appear to have a working bash. Good.' +@@ -367,33 +322,6 @@ + ;; + esac + +-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than +-# true libraries. The scripts cause binding against static +-# version of -lgdbm which is a bad idea. So if we have 'nm' +-# make sure it can read the file +-# NI-S 2003/08/07 +-case "$nm" in +- '') ;; +- *) +- for p in $plibpth +- do +- if $test -r $p/libndbm.so; then +- if $nm $p/libndbm.so >/dev/null 2>&1 ; then +- echo 'Your shared -lndbm seems to be a real library.' +- _libndbm_real=1 +- break +- fi +- fi +- done +- if $test "X$_libndbm_real" = X; then +- echo 'Your shared -lndbm is not a real library.' +- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` +- shift +- libswanted="$*" +- fi +- ;; +-esac +- + # Linux on Synology. + if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then + # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/perl/setup-hook-cross.sh b/pkgs/development/interpreters/perl/setup-hook-cross.sh new file mode 100644 index 0000000000000000000000000000000000000000..95aae0b2670fa7aa7f6a8374952c12d9e7cf4c23 --- /dev/null +++ b/pkgs/development/interpreters/perl/setup-hook-cross.sh @@ -0,0 +1,12 @@ +addPerlLibPath () { + addToSearchPath PERL5LIB $1/lib/perl5/site_perl/@version@ + addToSearchPath PERL5LIB $1/lib/perl5/site_perl/cross_perl/@version@ + # Adding the arch-specific directory is morally incorrect, as + # miniperl can't load the native modules there. However, it can + # (and sometimes needs to) load and run some of the pure perl + # code there, so we add it anyway. When needed, stubs can be put + # into $1/lib/perl5/site_perl/cross_perl/@version@ + addToSearchPath PERL5LIB $1/lib/perl5/site_perl/@version@/@runtimeArch@ +} + +addEnvHooks "$targetOffset" addPerlLibPath diff --git a/pkgs/development/interpreters/perl/setup-hook.sh b/pkgs/development/interpreters/perl/setup-hook.sh index a8656b8531dbca0c2b0d98a69be8e8bf5c2d2bca..7909412806c825e202a31bf9d5d94368e66fbc60 100644 --- a/pkgs/development/interpreters/perl/setup-hook.sh +++ b/pkgs/development/interpreters/perl/setup-hook.sh @@ -2,4 +2,4 @@ addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl } -envHooks+=(addPerlLibPath) +addEnvHooks "$hostOffset" addPerlLibPath diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index db4eb6eaee0c063d484e95102aab3055c41333a6..7cb9b4dea7f6b2c05399a680901d31a4ab5f7dfa 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -4,7 +4,7 @@ , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds -, uwimap, pam, gmp, apacheHttpd, libiconv, systemd }: +, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium }: let @@ -12,9 +12,8 @@ let { version, sha256 }: let php7 = lib.versionAtLeast version "7.0"; - mysqlHeaders = mysql.lib.dev or mysql; mysqlndSupport = config.php.mysqlnd or false; - mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders; + mysqlBuildInputs = lib.optional (!mysqlndSupport) mysql.connector-c; in composableDerivation.composableDerivation {} (fixed: { @@ -121,7 +120,7 @@ let }; mysqli = { - configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysqlHeaders}/bin/mysql_config"}"]; + configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"]; buildInputs = mysqlBuildInputs; }; @@ -132,7 +131,7 @@ let }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysqlHeaders}"]; + configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"]; buildInputs = mysqlBuildInputs; }; @@ -226,6 +225,11 @@ let calendar = { configureFlags = ["--enable-calendar"]; }; + + sodium = { + configureFlags = ["--with-sodium=${libsodium.dev}"]; + buildInputs = [libsodium]; + }; }; cfg = { @@ -265,6 +269,7 @@ let mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin)); ztsSupport = config.php.zts or false; calendarSupport = config.php.calendar or true; + sodiumSupport = (lib.versionAtLeast version "7.2") && config.php.sodium or true; }; hardeningDisable = [ "bindnow" ]; @@ -314,7 +319,7 @@ let description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = licenses.php301; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ globin etu ]; platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; }; @@ -333,17 +338,22 @@ let in { php56 = generic { - version = "5.6.32"; - sha256 = "0lfbmdkvijkm6xc4p9sykv66y8xwhws0vsmka8v5cax4bxx4xr1y"; + version = "5.6.35"; + sha256 = "14ivsxdny0s7qm9pf773pafs8xzlzzpmaz039lwymn11rblsfy7f"; }; php70 = generic { - version = "7.0.25"; - sha256 = "09fc2lj447phprvilvq2sb6n0r1snj142f8faphrd896s6b4v8lm"; + version = "7.0.29"; + sha256 = "1g1z1nhnmq0idsb9rfb46cdddfimaacw3yal291i2ypzqpal54cq"; }; php71 = generic { - version = "7.1.11"; - sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn"; + version = "7.1.16"; + sha256 = "1rg7n12rd2v1p2yar615kqcdxpvphw3p89lpgajjgwy0qzwjm3il"; + }; + + php72 = generic { + version = "7.2.4"; + sha256 = "1wvy8jdd1l5hmdqgw7lq2ynkim3mxfsx8q7vp4il1jadfq6qlr8i"; }; } diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index e78b743471981a9f1568650664b52e8321f99f37..62ab7b02585ebd679266fe2a8198ef39a8ebc018 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -47,6 +47,5 @@ stdenv.mkDerivation rec { downloadPage = https://code.google.com/p/picoc/downloads/list; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index b196af8e3ae4cc389d505b1ea858b89160a7bf9c..928a551732431a4f137336aff3f193c3e0bf32a4 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -3,7 +3,7 @@ variant ? "jit", buildWithPypy ? false }: let - commit-count = "1356"; + commit-count = "1364"; common-flags = "--thread --gcrootfinder=shadowstack --continuation"; variants = { jit = { flags = "--opt=jit"; target = "target.py"; }; @@ -13,8 +13,8 @@ let }; pixie-src = fetchgit { url = "https://github.com/pixie-lang/pixie.git"; - rev = "d2a4267ea088f711af36a74928e8dfd8360584ad"; - sha256 = "1asf6yx7zy9cx4bsg8iai57dy3r3m45xcmkmw2vix70xvfy23ryf"; + rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62"; + sha256 = "0pf31x5h2m6dpxlidv98qay1y179qw40cw4cb4v4xa88gmq2f3vm"; }; pypy-tag = "91db1a9"; pypy-src = fetchurl { @@ -56,30 +56,38 @@ let RPYTHON="`pwd`/pypy-src/rpython/bin/rpython"; cd pixie-src $PYTHON $RPYTHON ${common-flags} ${target} - export LD_LIBRARY_PATH="${library-path}:$LD_LIBRARY_PATH" find pixie -name "*.pxi" -exec ./pixie-vm -c {} \; )''; + LD_LIBRARY_PATH = library-path; + C_INCLUDE_PATH = include-path; + LIBRARY_PATH = library-path; + PATH = bin-path; installPhase = '' mkdir -p $out/share $out/bin cp pixie-src/pixie-vm $out/share/pixie-vm cp -R pixie-src/pixie $out/share/pixie - makeWrapper $out/share/pixie-vm $out/bin/pixie-vm \ - --prefix LD_LIBRARY_PATH : ${library-path} \ - --prefix C_INCLUDE_PATH : ${include-path} \ - --prefix LIBRARY_PATH : ${library-path} \ - --prefix PATH : ${bin-path} - cat > $out/bin/pxi <&2 echo "[\$\$] WARNING: 'pxi' is a deprecated alias for 'pixie-vm', please update your scripts." - exec $out/bin/pixie-vm "\$@" - EOF - chmod +x $out/bin/pxi + makeWrapper $out/share/pixie-vm $out/bin/pixie \ + --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \ + --prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \ + --prefix LIBRARY_PATH : ${LIBRARY_PATH} \ + --prefix PATH : ${PATH} + ''; + doCheck = true; + checkPhase = '' + RES=$(./pixie-src/pixie-vm -e "(print :ok)") + if [ "$RES" != ":ok" ]; then + echo "ERROR Unexpected output: '$RES'" + return 1 + else + echo "$RES" + fi ''; meta = { description = "A clojure-like lisp, built with the pypy vm toolkit"; homepage = https://github.com/pixie-lang/pixie; license = stdenv.lib.licenses.lgpl3; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; }; in build (builtins.getAttr variant variants) diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index 34b4711319383f7bcf54bd492df66589d9dbe89c..4a7f3423defdae240db4299714fcffedb6feabed 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies"; homepage = src.meta.homepage; license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 133329f4f203424a30478e99a0d5dda486c67896..c2b120576ea2e585b390ba0a59a07bb63db94ad1 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -3,14 +3,12 @@ stdenv.mkDerivation rec { baseName="pure"; - project="pure-lang"; - version="0.66"; + version="0.68"; name="${baseName}-${version}"; - extension="tar.gz"; src = fetchurl { - url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - sha256="42df6832476e8bee3a7ca179671284c1edd7bc82b71062fa0de62fd2117ee676"; + url="https://github.com/agraef/pure-lang/releases/download/${name}/${name}.tar.gz"; + sha256="0px6x5ivcdbbp2pz5n1r1cwg1syadklhjw8piqhl63n91i4r7iyb"; }; buildInputs = [ bison flex makeWrapper ]; diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix index 1beff0ebd834be5d42c94ec1faeff09ed2b73d49..911078a5e340b2990dee85266c0b9c22c9afb6b0 100644 --- a/pkgs/development/interpreters/python/build-python-package-flit.nix +++ b/pkgs/development/interpreters/python/build-python-package-flit.nix @@ -10,7 +10,7 @@ attrs // { buildInputs = [ flit ]; buildPhase = attrs.buildPhase or '' runHook preBuild - flit wheel + flit build --format wheel runHook postBuild ''; diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix index a09febb492b1bfe6299a50739d6632f707c25c52..bc512357acd58ff8914263ad8e85db1fb2837929 100644 --- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -21,18 +21,18 @@ let setuppy = ./run_setup.py; in attrs // { - # we copy nix_run_setup.py over so it's executed relative to the root of the source + # we copy nix_run_setup over so it's executed relative to the root of the source # many project make that assumption buildPhase = attrs.buildPhase or '' runHook preBuild - cp ${setuppy} nix_run_setup.py - ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel + cp ${setuppy} nix_run_setup + ${python.interpreter} nix_run_setup ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel runHook postBuild ''; installCheckPhase = attrs.checkPhase or '' runHook preCheck - ${python.interpreter} nix_run_setup.py test + ${python.interpreter} nix_run_setup test runHook postCheck ''; diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index b26bf1539cd5c04ea1eda5c8d53c5da7dc7dff25..6a07a006c6b5756838a8940a325bd12c25c23e86 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -1,11 +1,14 @@ -/* This function provides a generic Python package builder. It is - intended to work with packages that use `distutils/setuptools' - (http://pypi.python.org/pypi/setuptools/), which represents a large - number of Python packages nowadays. */ +# This function provides a generic Python package builder, +# and can build packages that use distutils, setuptools or flit. { lib , python -, mkPythonDerivation +, wrapPython +, setuptools +, unzip +, ensureNewerSourcesForZipFilesHook +, toPythonModule +, namePrefix , bootstrapped-pip , flit }: @@ -15,6 +18,9 @@ let flit-specific = import ./build-python-package-flit.nix { inherit python flit; }; wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; + mkPythonDerivation = import ./mk-python-derivation.nix { + inherit lib python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix; + }; in { diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index eb2a46cb3b793e6032460f4e1ebca895fedff074..98e5b4b1da0e7b1cc2c73eda9d919a7b5a9e65f0 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, hostPlatform, fetchurl +{ stdenv, hostPlatform, buildPlatform, buildPackages, fetchurl , bzip2 , gdbm , fetchpatch @@ -16,6 +16,8 @@ , libffi , CF, configd, coreutils , python-setup-hook +# Some proprietary libs assume UCS2 unicode, especially on darwin :( +, ucsEncoding ? 4 # For the Python package set , pkgs, packageOverrides ? (self: super: {}) }: @@ -58,6 +60,8 @@ let ./properly-detect-curses.patch + ] ++ optionals (x11Support && stdenv.isDarwin) [ + ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since @@ -86,7 +90,6 @@ let # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. ./python-2.7-distutils-C++.patch - ]; preConfigure = '' @@ -107,7 +110,7 @@ let configureFlags = [ "--enable-shared" "--with-threads" - "--enable-unicode=ucs4" + "--enable-unicode=ucs${toString ucsEncoding}" ] ++ optionals (hostPlatform.isCygwin || hostPlatform.isAarch64) [ "--with-system-ffi" ] ++ optionals hostPlatform.isCygwin [ @@ -115,6 +118,28 @@ let "ac_cv_func_bind_textdomain_codeset=yes" ] ++ optionals stdenv.isDarwin [ "--disable-toolbox-glue" + ] ++ optionals (hostPlatform != buildPlatform) [ + "PYTHON_FOR_BUILD=${getBin buildPackages.python}/bin/python" + "ac_cv_buggy_getaddrinfo=no" + # Assume little-endian IEEE 754 floating point when cross compiling + "ac_cv_little_endian_double=yes" + "ac_cv_big_endian_double=no" + "ac_cv_mixed_endian_double=no" + "ac_cv_x87_double_rounding=yes" + "ac_cv_tanh_preserves_zero_sign=yes" + # Generally assume that things are present and work + "ac_cv_posix_semaphores_enabled=yes" + "ac_cv_broken_sem_getvalue=no" + "ac_cv_wchar_t_signed=yes" + "ac_cv_rshift_extends_sign=yes" + "ac_cv_broken_nice=no" + "ac_cv_broken_poll=no" + "ac_cv_working_tzset=yes" + "ac_cv_have_long_long_format=yes" + "ac_cv_have_size_t_format=yes" + "ac_cv_computed_gotos=yes" + "ac_cv_file__dev_ptmx=yes" + "ac_cv_file__dev_ptc=yes" ]; postConfigure = if hostPlatform.isCygwin then '' @@ -129,6 +154,9 @@ let ++ [ db gdbm ncurses sqlite readline ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ++ optionals stdenv.isDarwin ([ CF ] ++ optional (configd != null) configd); + nativeBuildInputs = + optionals (hostPlatform != buildPlatform) + [ buildPackages.stdenv.cc buildPackages.python ]; mkPaths = paths: { C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; @@ -142,13 +170,14 @@ in stdenv.mkDerivation { name = "python-${version}"; pythonVersion = majorVersion; - inherit majorVersion version src patches buildInputs + inherit majorVersion version src patches buildInputs nativeBuildInputs preConfigure configureFlags; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2" + + optionalString hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000"; DETERMINISTIC_BUILD = 1; setupHook = python-setup-hook sitePackages; @@ -185,7 +214,8 @@ in stdenv.mkDerivation { # Determinism: Windows installers were not deterministic. # We're also not interested in building Windows installers. find "$out" -name 'wininst*.exe' | xargs -r rm -f - + '' + optionalString (stdenv.hostPlatform == stdenv.buildPlatform) + '' # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails # We rebuild three times, once for each optimization level @@ -199,9 +229,9 @@ in stdenv.mkDerivation { passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { - inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; + inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch ucsEncoding; executable = libPrefix; - buildEnv = callPackage ../../wrapper.nix { python = self; }; + buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; pkgs = pythonPackages; isPy2 = true; @@ -225,7 +255,7 @@ in stdenv.mkDerivation { ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ]; + maintainers = with stdenv.lib.maintainers; [ fridh ]; # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2` # in case both 2 and 3 are installed. priority = -100; diff --git a/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..b73f62b97ec502a8d2d94bd56b9bbbc9551acfe8 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch @@ -0,0 +1,48 @@ +diff --git a/setup.py b/setup.py +index 2779658..902d0eb 100644 +--- a/setup.py ++++ b/setup.py +@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +- if (host_platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without +@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if host_platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if host_platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs) +@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') +- + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, + include_dirs = include_dirs, diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index a924b543fe38568b1cd4f28eeb34a4b862ad6f2c..797a5be40ff39cf5d060c62a582e1d7d59b57141 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.4"; - minorVersion = "7"; + minorVersion = "8"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "06wx2ag0dnixny67jfdl5z10243fjga898cgxhnr4dnxaqmwy547"; + sha256 = "1sn3i9z9m56inlfrqs250qv8snl8w211wpig2pfjlyrcj3x75919"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -67,6 +67,8 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch ./ld_library_path.patch + ] ++ optionals (x11Support && stdenv.isDarwin) [ + ./use-correct-tcl-tk-on-darwin.patch ]; postPatch = '' @@ -103,6 +105,9 @@ in stdenv.mkDerivation { ${optionalString stdenv.isDarwin '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" export MACOSX_DEPLOYMENT_TARGET=10.6 + '' + + optionalString stdenv.hostPlatform.isMusl '' + export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" ''} ''; @@ -160,7 +165,7 @@ in stdenv.mkDerivation { in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; - buildEnv = callPackage ../../wrapper.nix { python = self; }; + buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; pkgs = pythonPackages; isPy3 = true; @@ -185,6 +190,6 @@ in stdenv.mkDerivation { ''; license = licenses.psfl; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ chaoflow domenkozar cstrahan ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..b73f62b97ec502a8d2d94bd56b9bbbc9551acfe8 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch @@ -0,0 +1,48 @@ +diff --git a/setup.py b/setup.py +index 2779658..902d0eb 100644 +--- a/setup.py ++++ b/setup.py +@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +- if (host_platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without +@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if host_platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if host_platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs) +@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') +- + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, + include_dirs = include_dirs, diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index abe220e0a3e509a3a02cefdaa396cf0b7b9488e7..6dbf9a09cf5653dbf2ed5195d6793218de81b35b 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.5"; - minorVersion = "4"; + minorVersion = "5"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0k68ai0a204piwibz013ds6ck7hgj9gk4nin2259y41vpgx3pncl"; + sha256 = "02ahsijk3a42sdzfp2il49shx0v4birhy7kkj0dikmh20hxjqg86"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -67,6 +67,8 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch ./ld_library_path.patch + ] ++ optionals (x11Support && stdenv.isDarwin) [ + ./use-correct-tcl-tk-on-darwin.patch ]; postPatch = '' @@ -97,6 +99,9 @@ in stdenv.mkDerivation { ${optionalString stdenv.isDarwin '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" export MACOSX_DEPLOYMENT_TARGET=10.6 + '' + + optionalString stdenv.hostPlatform.isMusl '' + export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" ''} ''; @@ -154,7 +159,7 @@ in stdenv.mkDerivation { in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; - buildEnv = callPackage ../../wrapper.nix { python = self; }; + buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; pkgs = pythonPackages; isPy3 = true; @@ -178,6 +183,6 @@ in stdenv.mkDerivation { ''; license = licenses.psfl; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ chaoflow domenkozar cstrahan ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..b73f62b97ec502a8d2d94bd56b9bbbc9551acfe8 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch @@ -0,0 +1,48 @@ +diff --git a/setup.py b/setup.py +index 2779658..902d0eb 100644 +--- a/setup.py ++++ b/setup.py +@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +- if (host_platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without +@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if host_platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if host_platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs) +@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') +- + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, + include_dirs = include_dirs, diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 1614159a7ef0568cfad94691c3b0688741131dc1..cc8f6228f623eed697a1628266f480999c607de2 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl, fetchpatch, buildPackages , glibc , bzip2 , expat @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "3"; + minorVersion = "5"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -39,16 +39,19 @@ let ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; + nativeBuildInputs = + optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.python3; + in stdenv.mkDerivation { name = "python3-${version}"; pythonVersion = majorVersion; inherit majorVersion version; - inherit buildInputs; + inherit buildInputs nativeBuildInputs; src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1nl1raaagr4car787a2hmjv2dw6gqny53xfd6wisbgx4r5kxk9yd"; + sha256 = "19l7inxm056jjw33zz97z0m02hsi7jnnx5kyb76abj5ml4xhad7l"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -66,6 +69,8 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch + ] ++ optionals (x11Support && stdenv.isDarwin) [ + ./use-correct-tcl-tk-on-darwin.patch ]; postPatch = '' @@ -87,6 +92,27 @@ in stdenv.mkDerivation { "--without-ensurepip" "--with-system-expat" "--with-system-ffi" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_buggy_getaddrinfo=no" + # Assume little-endian IEEE 754 floating point when cross compiling + "ac_cv_little_endian_double=yes" + "ac_cv_big_endian_double=no" + "ac_cv_mixed_endian_double=no" + "ac_cv_x87_double_rounding=yes" + "ac_cv_tanh_preserves_zero_sign=yes" + # Generally assume that things are present and work + "ac_cv_posix_semaphores_enabled=yes" + "ac_cv_broken_sem_getvalue=no" + "ac_cv_wchar_t_signed=yes" + "ac_cv_rshift_extends_sign=yes" + "ac_cv_broken_nice=no" + "ac_cv_broken_poll=no" + "ac_cv_working_tzset=yes" + "ac_cv_have_long_long_format=yes" + "ac_cv_have_size_t_format=yes" + "ac_cv_computed_gotos=yes" + "ac_cv_file__dev_ptmx=yes" + "ac_cv_file__dev_ptc=yes" ]; preConfigure = '' @@ -96,6 +122,9 @@ in stdenv.mkDerivation { ${optionalString stdenv.isDarwin '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" export MACOSX_DEPLOYMENT_TARGET=10.6 + '' + + optionalString stdenv.hostPlatform.isMusl '' + export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" ''} ''; @@ -139,7 +168,7 @@ in stdenv.mkDerivation { 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 - + '' + optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails # We rebuild three times, once for each optimization level @@ -153,7 +182,7 @@ in stdenv.mkDerivation { in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; - buildEnv = callPackage ../../wrapper.nix { python = self; }; + buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; pkgs = pythonPackages; isPy3 = true; @@ -178,6 +207,6 @@ in stdenv.mkDerivation { ''; license = licenses.psfl; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ chaoflow domenkozar cstrahan kragniz ]; + maintainers = with maintainers; [ fridh kragniz ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..b73f62b97ec502a8d2d94bd56b9bbbc9551acfe8 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch @@ -0,0 +1,48 @@ +diff --git a/setup.py b/setup.py +index 2779658..902d0eb 100644 +--- a/setup.py ++++ b/setup.py +@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +- if (host_platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without +@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if host_platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if host_platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs) +@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') +- + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, + include_dirs = include_dirs, diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 098ab0b1719f88ed39268e150a9343aae294c2fb..96a9cdf0c6158a6f7495044e0c7668040cd0849b 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -1,19 +1,22 @@ -/* Generic builder for Python packages that come without a setup.py. */ +# Generic builder. { lib , python , wrapPython , setuptools , unzip -, ensureNewerSourcesHook +, ensureNewerSourcesForZipFilesHook +# Whether the derivation provides a Python module or not. +, toPythonModule +, namePrefix }: { name ? "${attrs.pname}-${attrs.version}" -# by default prefix `name` e.g. "python3.3-${name}" -, namePrefix ? python.libPrefix + "-" +# Build-time dependencies for the package +, nativeBuildInputs ? [] -# Dependencies for building the package +# Run-time dependencies for the package , buildInputs ? [] # Dependencies needed for running the checkPhase. @@ -40,6 +43,12 @@ # Skip wrapping of python programs altogether , dontWrapPythonPrograms ? false +# Remove bytecode from bin folder. +# When a Python script has the extension `.py`, bytecode is generated +# Typically, executables in bin have no extension, so no bytecode is generated. +# However, some packages do provide executables with extensions, and thus bytecode is generated. +, removeBinBytecode ? true + , meta ? {} , passthru ? {} @@ -54,18 +63,23 @@ if disabled then throw "${name} not supported for interpreter ${python.executable}" else -python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"] // { +toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ + "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" + ] // { name = namePrefix + name; - inherit pythonPath; + nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ] + ++ nativeBuildInputs; - buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath - ++ [ (ensureNewerSourcesHook { year = "1980"; }) ] - ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) - ++ lib.optionals doCheck checkInputs; + buildInputs = [ wrapPython ] + ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip + ++ lib.optionals doCheck checkInputs + ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools + ++ buildInputs + ++ pythonPath; - # propagate python/setuptools to active setup-hook in nix-shell + # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; # Python packages don't have a checkPhase, only an installCheckPhase @@ -74,6 +88,11 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs" postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms + '' + lib.optionalString removeBinBytecode '' + if [ -d "$out/bin" ]; then + rm -rf "$out/bin/__pycache__" # Python 3 + find "$out/bin" -type f -name "*.pyc" -delete # Python 2 + fi '' + lib.optionalString catchConflicts '' # 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. @@ -81,17 +100,9 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs" ${python.interpreter} ${./catch_conflicts}/catch_conflicts.py '' + attrs.postFixup or ''''; - passthru = { - inherit python; # The python interpreter - } // passthru; - - meta = with lib.maintainers; { + meta = { # default to python's platforms platforms = python.meta.platforms; - } // meta // { - # add extra maintainer(s) to every package - maintainers = (meta.maintainers or []) ++ [ chaoflow ]; - # a marker for release utilities to discover python packages isBuildPythonPackage = python.meta.platforms; - }; -}) + } // meta; +})) diff --git a/pkgs/development/interpreters/python/pypy/2.7/2604-skip-urandom-fd-test.patch b/pkgs/development/interpreters/python/pypy/2.7/2604-skip-urandom-fd-test.patch deleted file mode 100644 index d7040501b136703fc76a67f91df87eb7a96ce70a..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/python/pypy/2.7/2604-skip-urandom-fd-test.patch +++ /dev/null @@ -1,21 +0,0 @@ -# HG changeset patch -# User Armin Rigo -# Date 1500108588 -7200 -# Node ID 20f7723ff895430c2f45647e7d0c0ca56d93e40a -# Parent d135217574a6bd2e87a883e1d495f82c5e89bc8b -(ronan, arigo) - -Issue #2604: skip this test (fails on some Linux because pypy uses the -new getrandom() syscall) - -diff --git a/lib-python/2.7/test/test_os.py b/lib-python/2.7/test/test_os.py ---- a/lib-python/2.7/test/test_os.py -+++ b/lib-python/2.7/test/test_os.py -@@ -580,6 +580,7 @@ - "getentropy() does not use a file descriptor") - class URandomFDTests(unittest.TestCase): - @unittest.skipUnless(resource, "test requires the resource module") -+ @test_support.impl_detail(pypy=False) # on Linux, may use getrandom() - def test_urandom_failure(self): - # Check urandom() failing when it is not able to open /dev/random. - # We spawn a new process to make the test more robust (if getrlimit() diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 1d382207e98949a6e113f04dab3630a896f08d78..e68cfc3148ffdf279474f0e885f7d2e99cebbfaf 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi +{ stdenv, substituteAll, 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 @@ -9,7 +10,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "5.8"; + majorVersion = "5.10"; minorVersion = "0"; minorVersionSuffix = ""; pythonVersion = "2.7"; @@ -20,128 +21,124 @@ let pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); in stdenv.mkDerivation rec { - name = "pypy-${version}"; - inherit majorVersion version pythonVersion; - - src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; - sha256 = "0dibf1bx4icrbi8zsqk7cfwgwsd3hfx6biz59k8j5rys3fx9z418"; - }; - - patches = [ - # https://bitbucket.org/pypy/pypy/issues/2604/lib-python-27-test-test_ospy - ./2604-skip-urandom-fd-test.patch - ]; - - postPatch = '' - substituteInPlace "lib-python/2.7/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] - ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc - ++ stdenv.lib.optional zlibSupport zlib; - - hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; - - C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs; - LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); - - preConfigure = '' - # hint pypy to find nix ncurses - substituteInPlace pypy/module/_minimal_curses/fficurses.py \ - --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ - --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ - --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \ - --replace "libraries=['curses']" "libraries=['ncurses']" - - # tkinter hints - substituteInPlace lib_pypy/_tkinter/tklib_build.py \ - --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \ - --replace "linklibs = ['tcl' + _ver, 'tk' + _ver]" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \ - --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']" - - sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py - ''; - - buildPhase = '' - ${pythonForPypy.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 = python-setup-hook sitePackages; - - postBuild = '' - cd ./lib_pypy - ../pypy-c ./_audioop_build.py - ../pypy-c ./_curses_build.py - ../pypy-c ./_pwdgrp_build.py - ../pypy-c ./_sqlite3_build.py - ../pypy-c ./_syslog_build.py - ../pypy-c ./_tkinter/tklib_build.py - cd .. - ''; - - doCheck = true; - checkPhase = '' - export TERMINFO="${ncurses.out}/share/terminfo/"; - export TERM="xterm"; - export HOME="$TMPDIR"; - # disable shutils because it assumes gid 0 exists - # disable socket because it has two actual network tests that fail - # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) - # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure - # disable test_zipfile64 because it causes ENOSPACE - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 )' lib-python - ''; - - installPhase = '' - mkdir -p $out/{bin,include,lib,pypy-c} - - cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c - cp libpypy-c.so $out/lib/ - ln -s $out/pypy-c/pypy-c $out/bin/pypy - chmod +x $out/bin/pypy - - # other packages expect to find stuff according to libPrefix - ln -s $out/pypy-c/include $out/include/${libPrefix} - ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} - - # We must wrap the original, not the symlink. - # PyPy uses argv[0] to find its standard library, and while it knows - # how to follow symlinks, it doesn't know about wrappers. So, it - # will think the wrapper is the original. As long as the wrapper has - # the same path as the original, this is OK. - wrapProgram "$out/pypy-c/pypy-c" \ - --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ - --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" - - # verify cffi modules - $out/bin/pypy -c "import Tkinter;import sqlite3;import curses" - - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - ''; - - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; - in rec { - inherit zlibSupport libPrefix sitePackages; - executable = "pypy"; - isPypy = true; - buildEnv = callPackage ../../wrapper.nix { python = self; }; - interpreter = "${self}/bin/${executable}"; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - }; - - enableParallelBuilding = true; # almost no parallelization without STM - - meta = with stdenv.lib; { - homepage = http://pypy.org/; - description = "Fast, compliant alternative implementation of the Python language (2.7.13)"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar ]; - }; + name = "pypy-${version}"; + inherit majorVersion version pythonVersion; + + src = fetchurl { + url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; + sha256 = "10j1s6r6iv80nvpi6gv8w05v505h2ndj9xx31yz7d50ab04dfg23"; + }; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ + bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db + ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc + ++ stdenv.lib.optional zlibSupport zlib; + + hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; + + C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); + + patches = [ + (substituteAll { + src = ./tk_tcl_paths.patch; + inherit tk tcl; + tk_dev = tk.dev; + tcl_dev = tcl; + tk_libprefix = tk.libPrefix; + tcl_libprefix = tcl.libPrefix; + }) + ]; + + postPatch = '' + substituteInPlace "lib-python/2.7/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + + # hint pypy to find nix ncurses + substituteInPlace pypy/module/_minimal_curses/fficurses.py \ + --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ + --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ + --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \ + --replace "libraries=['curses']" "libraries=['ncurses']" + + sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py + ''; + + buildPhase = '' + ${pythonForPypy.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 = python-setup-hook sitePackages; + + doCheck = true; + checkPhase = '' + export TERMINFO="${ncurses.out}/share/terminfo/"; + export TERM="xterm"; + export HOME="$TMPDIR"; + # disable shutils because it assumes gid 0 exists + # disable socket because it has two actual network tests that fail + # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) + # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure + # disable test_zipfile64 because it causes ENOSPACE + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 )' lib-python + ''; + + installPhase = '' + mkdir -p $out/{bin,include,lib,pypy-c} + + cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c + cp libpypy-c.so $out/lib/ + ln -s $out/pypy-c/pypy-c $out/bin/pypy + chmod +x $out/bin/pypy + + # other packages expect to find stuff according to libPrefix + ln -s $out/pypy-c/include $out/include/${libPrefix} + ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} + + # We must wrap the original, not the symlink. + # PyPy uses argv[0] to find its standard library, and while it knows + # how to follow symlinks, it doesn't know about wrappers. So, it + # will think the wrapper is the original. As long as the wrapper has + # the same path as the original, this is OK. + wrapProgram "$out/pypy-c/pypy-c" \ + --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ + --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" + + # verify cffi modules + $out/bin/pypy -c "import Tkinter;import sqlite3;import curses" + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + ''; + + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { + inherit zlibSupport libPrefix sitePackages; + executable = "pypy"; + isPypy = true; + buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; + interpreter = "${self}/bin/${executable}"; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; + }; + + enableParallelBuilding = true; # almost no parallelization without STM + + meta = with stdenv.lib; { + homepage = http://pypy.org/; + description = "Fast, compliant alternative implementation of the Python language (2.7.13)"; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/interpreters/python/pypy/2.7/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/2.7/tk_tcl_paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..92bbfc557b3599bde67212c939cfbcd5583ab80e --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/2.7/tk_tcl_paths.patch @@ -0,0 +1,17 @@ +--- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py 2017-10-03 11:49:20.000000000 +0100 ++++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py 2017-11-21 13:20:51.398607530 +0000 +@@ -24,11 +24,11 @@ + else: + # On some Linux distributions, the tcl and tk libraries are + # stored in /usr/include, so we must check this case also +- libdirs = [] ++ libdirs = ["@tcl@/lib", "@tk@/lib"] + found = False + for _ver in ['', '8.6', '8.5']: +- incdirs = ['/usr/include/tcl' + _ver] +- linklibs = ['tcl' + _ver, 'tk' + _ver] ++ incdirs = ['@tcl_dev@/include', '@tk_dev@/include'] ++ linklibs = ['@tcl_libprefix@', '@tk_libprefix@'] + if os.path.isdir(incdirs[0]): + found = True + break diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh index dda9bed39f85e71e91f20c5cb14e0fc4c986d1a1..77ec9e9ac0bf88560169c9259dc1941703e5b0cc 100644 --- a/pkgs/development/interpreters/python/setup-hook.sh +++ b/pkgs/development/interpreters/python/setup-hook.sh @@ -12,10 +12,13 @@ toPythonPath() { echo $result } -envHooks+=(addPythonPath) +addEnvHooks "$hostOffset" 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; +# Determinism. Whenever Python is included, it should not check user site-packages. +# This option is only relevant when the sandbox is disabled. +export PYTHONNOUSERSITE=1; diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 37bd5b097395ba7615467eab6602bfafa8e25921..01b573e6ad5d870e5665a3a6e7a93a0e87b4d253 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -83,7 +83,7 @@ wrapPythonProgramsIn() { # Adds the lib and bin directories to the PYTHONPATH and PATH variables, # respectively. Recurses on any paths declared in -# `propagated-native-build-inputs`, while avoiding duplicating paths by +# `propagated-build-inputs`, while avoiding duplicating paths by # flagging the directories it has visited in `pythonPathsSeen`. _addToPythonPath() { local dir="$1" @@ -96,7 +96,7 @@ _addToPythonPath() { addToSearchPath program_PATH $dir/bin # Inspect the propagated inputs (if they exist) and recur on them. - local prop="$dir/nix-support/propagated-native-build-inputs" + local prop="$dir/nix-support/propagated-build-inputs" if [ -e $prop ]; then local new_path for new_path in $(cat $prop); do diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index f42caf92c17034965179e4030a0d4dc813b2dfb1..8d4e68bf57cae090d628daa9bd16318cabac0fd2 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -2,18 +2,20 @@ , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" -, ignoreCollisions ? false }: +, ignoreCollisions ? false +, requiredPythonModules +, }: # Create a python executable that knows about additional packages. let - recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; env = let - paths = stdenv.lib.closePropagation (extraLibs ++ [ python recursivePthLoader ] ) ; + paths = requiredPythonModules (extraLibs ++ [ python ] ) ; in buildEnv { name = "${python.name}-env"; inherit paths; - inherit ignoreCollisions extraOutputsToInstall; + inherit ignoreCollisions; + extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; postBuild = '' . "${makeWrapper}/nix-support/setup-hook" diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index f949e16321dadad8507af43555a82211705838b9..32d24fa88356e2752a3424ef44e2b91da74e4643 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -4,6 +4,7 @@ , libpng, libtool, mpfr, openssl, pango, poppler , readline, sqlite , disableDocs ? false +, CoreFoundation }: let @@ -33,18 +34,27 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.11"; + version = "6.12"; - src = fetchurl { - url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1nk7705x24jjlbqqhj8yvbgqkfscxx3m81bry1g56kjxysjmf3sw"; + src = (stdenv.lib.makeOverridable ({ name, sha256 }: + fetchurl rec { + url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + inherit sha256; + } + )) { + inherit name; + sha256 = "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"; }; FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; + NIX_LDFLAGS = stdenv.lib.concatStringsSep " " [ + (stdenv.lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s") + (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") + ]; - buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ]; + buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ]; preConfigure = '' unset AR @@ -64,7 +74,7 @@ stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}"; + wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}"; done ''; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix new file mode 100644 index 0000000000000000000000000000000000000000..c63d0040cfee1108fd29bd6c4b69352f5092c35e --- /dev/null +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -0,0 +1,19 @@ +{ racket +}: + +racket.overrideAttrs (oldAttrs: rec { + name = "racket-minimal-${oldAttrs.version}"; + src = oldAttrs.src.override { + inherit name; + sha256 = "0c565jy2y3gjl5lncd5adjsrj8c24p4i062kphv26ni5q1nn5ip5"; + }; + + meta = oldAttrs.meta // { + description = "Racket without bundled packages, such as Dr. Racket."; + longDescription = ''The essential package racket-libs is included, + as well as libraries that live in collections. In particular, raco + and the pkg library are still bundled. + ''; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +}) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index cc3eba52bf2d36953557f007dcfc5b6134dd6dd7..a992717d94f3ce7d1ba25906ca10abbf9b5f0d4a 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,38 +1,44 @@ { stdenv, fetchurl, pythonPackages, pkgconfig, SDL2 -, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib +, libpng, ffmpeg, freetype, glew, libGLU_combined, fribidi, zlib , glib }: with pythonPackages; -stdenv.mkDerivation { - name = "renpy-6.99.12.4"; +stdenv.mkDerivation rec { + name = "renpy-${version}"; + version = "6.99.14.3"; - meta = { + meta = with stdenv.lib; { 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; + license = licenses.mit; + platforms = platforms.linux; }; src = fetchurl { - url = "http://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2"; - sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35"; + url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; + sha256 = "15n29ybblcpnfbmhc31gm5vj7cpqd8cwrcqxlwnxy0gjpbc50x73"; }; + patches = [ + ./launcherenv.patch + ]; + + postPatch = '' + substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter} + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python cython wrapPython - SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib + python cython wrapPython tkinter + SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib ]; - pythonPath = [ pygame_sdl2 ]; + pythonPath = [ pygame_sdl2 tkinter ]; RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [ - SDL2 SDL2.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 libGLU_combined fribidi zlib ]); buildPhase = '' @@ -41,7 +47,9 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/share/renpy - cp -r renpy renpy.py $out/share/renpy + cp -vr * $out/share/renpy + rm -rf $out/share/renpy/module + python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module makeWrapper ${python}/bin/python $out/bin/renpy \ diff --git a/pkgs/development/interpreters/renpy/launcherenv.patch b/pkgs/development/interpreters/renpy/launcherenv.patch new file mode 100644 index 0000000000000000000000000000000000000000..85a6c6439b9c003afc716712b8e1830a8706a959 --- /dev/null +++ b/pkgs/development/interpreters/renpy/launcherenv.patch @@ -0,0 +1,14 @@ +# The launcher game starts projects in a separate python process +# with the -E flag, which prevents the nix set PYTHONPATH envvar +# from taking effect, preventing the loading of pygame_sdl2 +--- a/launcher/game/project.rpy ++++ b/launcher/game/project.rpy +@@ -239,7 +239,7 @@ + raise Exception("Python interpreter not found: %r", executables) + + # Put together the basic command line. +- cmd = [ executable, "-EO", sys.argv[0] ] ++ cmd = [ executable, "-O", sys.argv[0] ] + + cmd.append(self.path) + cmd.extend(args) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d664c00bc31ddc01b04c58caf0dd9d773cd0aecd..4ebc488d9988f2e144b3f2e356c080a57cdf387d 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,7 +1,8 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub +{ stdenv, buildPackages, lib +, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , autoconf, darwin ? null -, buildEnv, bundler, bundix +, buildEnv, bundler, bundix, Foundation } @ args: let @@ -22,14 +23,22 @@ let # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; + # Needed during postInstall + buildRuby = + if stdenv.hostPlatform == stdenv.buildPlatform + then "$out/bin/ruby" + else "${buildPackages.ruby}/bin/ruby"; + generic = { version, sha256 }: let ver = version; tag = ver.gitTag; isRuby20 = ver.majMin == "2.0"; isRuby21 = ver.majMin == "2.1"; + isRuby25 = ver.majMin == "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( - { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub + { stdenv, buildPackages, lib + , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , zlib, zlibSupport ? true , openssl, opensslSupport ? true @@ -40,7 +49,7 @@ let , libffi, fiddleSupport ? true , autoreconfHook, bison, autoconf , darwin ? null - , buildEnv, bundler, bundix + , buildEnv, bundler, bundix, Foundation }: let rubySrc = if useRailsExpress then fetchFromGitHub { @@ -64,9 +73,13 @@ let unpackdir rubySrc; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. - NROFF = "${groff}/bin/nroff"; + NROFF = if docSupport then "${groff}/bin/nroff" else null; - nativeBuildInputs = ops useRailsExpress [ autoreconfHook bison ]; + nativeBuildInputs = + ops useRailsExpress [ autoreconfHook bison ] + ++ ops (stdenv.buildPlatform != stdenv.hostPlatform) [ + buildPackages.ruby + ]; buildInputs = (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ]) @@ -75,17 +88,17 @@ let ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) + ++ (op isRuby25 autoconf) # Looks like ruby fails to build on darwin without readline even if curses # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're # running on darwin ++ (op (!cursesSupport && stdenv.isDarwin) readline) + ++ (op (isRuby25 && stdenv.isDarwin) Foundation) ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ])); enableParallelBuilding = true; - hardeningDisable = lib.optional isRuby20 "format"; - patches = (import ./patchsets.nix { inherit patchSet useRailsExpress ops; @@ -97,12 +110,10 @@ let pushd ${sourceRoot}/rubygems patch -p1 < ${rubygemsPatch} popd - '' + opString isRuby21 '' - rm "$sourceRoot/enc/unicode/name2ctype.h" ''; - postPatch = if isRuby21 then '' - rm tool/config_files.rb + postPatch = if isRuby25 then '' + sed -i configure.ac -e '/config.guess/d' cp ${config}/config.guess tool/ cp ${config}/config.sub tool/ '' @@ -121,28 +132,35 @@ let "--with-out-ext=tk" # on yosemite, "generating encdb.h" will hang for a very long time without this flag "--with-setjmp-type=setjmp" - ]; + ] + ++ op (stdenv.hostPlatform != stdenv.buildPlatform) + "--with-baseruby=${buildRuby}"; + + preInstall = '' + # Ruby installs gems here itself now. + mkdir -pv "$out/${passthru.gemPath}" + export GEM_HOME="$out/${passthru.gemPath}" + ''; installFlags = stdenv.lib.optionalString docSupport "install-doc"; # Bundler tries to create this directory postInstall = '' # Update rubygems pushd rubygems - $out/bin/ruby setup.rb + ${buildRuby} setup.rb popd # Remove unnecessary groff reference from runtime closure, since it's big sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb # Bundler tries to create this directory - mkdir -pv $out/${passthru.gemPath} mkdir -p $out/nix-support cat > $out/nix-support/setup-hook < true -@@ -186,6 +187,7 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len) - } - return Qtrue; - } -+#endif /* HAVE_RAND_EGD */ - - /* - * call-seq: -@@ -219,7 +221,9 @@ Init_ossl_rand(void) - DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1); - DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1); - DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1); -+#ifdef HAVE_RAND_EGD - DEFMETH(mRandom, "egd", ossl_rand_egd, 1); - DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2); -+#endif /* HAVE_RAND_EGD */ - DEFMETH(mRandom, "status?", ossl_rand_status, 0) - } diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix index 99870e6ba2ca9ed8c1a02d5ecbe6219314de2143..cb36c96a4c52a8e9596a79391abd1ba6f20449cf 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.13" -, sha256 ? "1j98ww8cz9y4wwshg7p4i4acrmls3ywkyj1nlkh4k3bywwm50hfh" +, version ? "2.7.6" +, sha256 ? "1sqy6z1kngq91nxmv1hw4xhw1ycwx9s76hfbpcdlgkm9haji9xv7" }: 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 c60d6e3728d0439256168ae9bcad95ca88129f71..1598cbc56e1dbb954ea11b2d2c32862f63df7da9 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "15f5df0fba0e2fb489856b5bdb67a52fb9745f94"; - sha256 = "0vdgr7xp3gbmsyaz4q78qlbwmp006b1gkgj0kwi6h8d80dclbzny"; + rev = "ba5a3c6f972e1b957b4b3fe28b5730ef0e27bff3"; + sha256 = "0sjmhhb8hshxa58x062j44w0xdck8ykgpsg33wjr0wv9npwpkwrz"; } diff --git a/pkgs/development/interpreters/ruby/ssl_v3.patch b/pkgs/development/interpreters/ruby/ssl_v3.patch deleted file mode 100644 index faa4021657513c069d7822bbc1550f5820f1fd8a..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/ruby/ssl_v3.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/ext/openssl/ossl_ssl.c 2015-11-26 16:41:03.775058140 +0000 -+++ b/ext/openssl/ossl_ssl.c 2015-11-26 16:40:56.191907346 +0000 -@@ -138,9 +138,12 @@ - OSSL_SSL_METHOD_ENTRY(SSLv2_server), - OSSL_SSL_METHOD_ENTRY(SSLv2_client), - #endif -+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \ -+ defined(HAVE_SSLV3_CLIENT_METHOD) - OSSL_SSL_METHOD_ENTRY(SSLv3), - OSSL_SSL_METHOD_ENTRY(SSLv3_server), - OSSL_SSL_METHOD_ENTRY(SSLv3_client), -+#endif - OSSL_SSL_METHOD_ENTRY(SSLv23), - OSSL_SSL_METHOD_ENTRY(SSLv23_server), - OSSL_SSL_METHOD_ENTRY(SSLv23_client), - diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix index da5fc193a222e7a57dd4e319f596bb4645b5cd6e..9c47ebe79b6e1388e05d3fd14128f7d5f0c372db 100644 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix @@ -18,6 +18,16 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + patches = [ + (fetchurl { + name = "jsoptparse-gcc7.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/mozjs17.git/plain/" + + "mozjs17.0.0-gcc7.patch?id=43b846629a299f"; + sha256 = "17plyaq0jwf9wli4zlgvh4ri3zyk6nj1fiakh3wnd37nsl90raf9"; + }) + ]; + patchFlags = "-p3"; + postPatch = '' # Fixes an issue with version detection under perl 5.22.x sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 75c7c64e324d7bc89266a0a4eb0ed736e1abad4d..4992ea04f1105e955a7cea54c4cacff6d905ede7 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,61 +1,52 @@ -{ stdenv, fetchurl, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: -stdenv.mkDerivation rec { - version = "52.2.1gnome1"; +let + version = "52.6.0"; +in stdenv.mkDerivation rec { name = "spidermonkey-${version}"; - # the release notes point to some guys home directory, see - # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 - # probably it would be more ideal to pull a particular tag/revision - # from the mercurial repo src = fetchurl { - url = "mirror://gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${version}.tar.gz"; - sha256 = "1bxhz724s1ch1c0kdlzlg9ylhg1mk8kbhdgfkax53fyvn51pjs9i"; + url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; + sha256 = "0hhyd4ni4jja7jd687dm0csi1jcjxahf918zbjzr8njz655djz2q"; }; buildInputs = [ readline icu zlib nspr ]; nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + patches = [ + # needed to build gnome3.gjs + (fetchpatch { + name = "mozjs52-disable-mozglue.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be; + sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0"; + }) + ]; preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out export PYTHON="${python2.interpreter}" + + cd js/src + + autoconf ''; configureFlags = [ - "--enable-threadsafe" "--with-system-nspr" "--with-system-zlib" "--with-system-icu" "--with-intl-api" "--enable-readline" - - # enabling these because they're wanted by 0ad. They may or may - # not be good defaults for other uses. - "--enable-gcgenerational" "--enable-shared-js" ]; - # This addresses some build system bug. It's quite likely to be safe - # to re-enable parallel builds if the source revision changes. enableParallelBuilding = true; - postFixup = '' - # The headers are symlinks to a directory that doesn't get put - # into $out, so they end up broken. Fix that by just resolving the - # symlinks. - for i in $(find $out -type l); do - cp --remove-destination "$(readlink "$i")" "$i"; - done - ''; - meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = https://developer.mozilla.org/en/SpiderMonkey; - # TODO: MPL/GPL/LGPL tri-license. - + license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 642fd928f41d444d2accc4d4d43bfa4b1ff0d465..2d3509542135b30d2dd09e6237b881b55484d991 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.8.0"; + version = "3.9.2"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "053b2xc2x1sczvlb41w6iciqlwy0zyfiv3jrynx4f8jgd6mizsm6"; + sha256 = "0d3cb6dw8jz7ijriqn3rlwin24gffczp69hl17pzxj1d5w57yj44"; }; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index b3c3e1732e0d6248aa62d8dd29d23c47949050e9..499b2c65b7700c875d8ab32019d10f6fdd246792 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -13,8 +13,8 @@ in stdenv.mkDerivation rec { propagatedBuildInput = [ maven ] ++ flatDeps; - find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; - copy = ''cp -rsfu ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2''; + find = ''find ${concatStringsSep " " (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; + copy = ''cp -rsfu ${concatStringsSep " " (map (x: x + "/m2/*") flatDeps)} $out/m2''; phases = [ "unpackPhase" "buildPhase" ]; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..474eaa0e1dc4fef22bd540a9e984f49c8459c2a2 --- /dev/null +++ b/pkgs/development/java-modules/jogl/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev }: + +let + # workaround https://github.com/NixOS/nixpkgs/issues/37364 + jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk; +in +{ + jogl_2_3_2 = + let + version = "2.3.2"; + + gluegen-src = fetchgit { + url = git://jogamp.org/srv/scm/gluegen.git; + rev = "v${version}"; + sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0"; + fetchSubmodules = true; + }; + in stdenv.mkDerivation rec { + name = "jogl-${version}"; + + src = fetchgit { + url = http://jogamp.org/srv/scm/jogl.git; + rev = "v${version}"; + sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3"; + fetchSubmodules = true; + }; + + buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ]; + + buildPhase = '' + cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen + chmod -R +w $NIX_BUILD_TOP/gluegen + ( cd ../gluegen/make + ant ) + + ( cd make + + # force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers + # if arm/aarch64 support will be added, this block might be commented out on those platforms + # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so + cp build-newt.xml build-newt.xml.old + fgrep -v 'if="setup.addNativeBroadcom"' build-newt.xml.old > build-newt.xml + + ant ) + ''; + + installPhase = '' + mkdir -p $out/share/java + cp $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/ + cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar $out/share/java/ + ''; + + meta = with stdenv.lib; { + description = "Java libraries for 3D Graphics, Multimedia and Processing"; + homepage = http://jogamp.org/; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + }; + }; +} diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index 5017cb39602e4ff4cc7a649a0e386940a751b744..a7bfa545908ab3d41e02d7f64ecf115c9f87634d 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -19,7 +19,7 @@ in rec { m2Path = "/junit/junit/${version}"; meta = { - homepage = http://junit.org/junit4/; + homepage = https://junit.org/junit4/; description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks"; license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fcb708c829befd707b941b8db1651622c9bfa677 --- /dev/null +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, unzip, xorg, libGLU_combined }: + +stdenv.mkDerivation rec { + name = "AntTweakBar-1.16"; + + buildInputs = [ unzip xorg.libX11 libGLU_combined ]; + + src = fetchurl { + url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; + sha256 = "0z3frxpzf54cjs07m6kg09p7nljhr7140f4pznwi7srwq4cvgkpv"; + }; + + postPatch = "cd src"; + installPhase = '' + mkdir -p $out/lib/ + cp ../lib/{libAntTweakBar.so,libAntTweakBar.so.1,libAntTweakBar.a} $out/lib/ + cp -r ../include $out/ + ''; + + meta = { + description = "Add a light/intuitive GUI to OpenGL applications"; + longDescription = '' + A small and easy-to-use C/C++ library that allows to quickly add a light + and intuitive graphical user interface into graphic applications based on OpenGL + (compatibility and core profiles), DirectX 9, DirectX 10 or DirectX 11 + to interactively tweak parameters on-screen + ''; + homepage = http://anttweakbar.sourceforge.net/; + license = stdenv.lib.licenses.zlib; + maintainers = [ stdenv.lib.maintainers.razvan ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index e4eb8d3ab2ecb80ac89abd6d0dd2f73e083dbb14..cdb37a84c8012d2af78ea54029804622badad179 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.9"; + version = "4.11.1"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "044amgml1x5h17rpkck2azmxrmjvlzzykv71cjh5hlajsi88cid5"; + sha256 = "04nn1lzsjdglzjygc72cq09xrvpqwwnbf6l0xz8bfwfp4x9g10jf"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index df9d126ad719ef9bfa6a2a19b69a10c35378e018..384178d2c8df1eb7b8aa4fda81523ecb1fe6a2ca 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = http://www.laszip.org; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index e71ad14b11fd1d9589aa679334d267d15bfd03c6..5e1c527eb8b5839a45622c3217f0cbe240299243 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap -, openglSupport ? false, mesa_noglu, mesa_glu +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv +, openglSupport ? false, libGL, libGLU , alsaSupport ? true, alsaLib , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr , pulseaudioSupport ? true, libpulseaudio @@ -7,13 +7,32 @@ , hostPlatform, buildPlatform }: -# OSS is no longer supported, for it's much crappier than ALSA and -# PulseAudio. -assert hostPlatform.isLinux -> alsaSupport || pulseaudioSupport; +# NOTE: When editing this expression see if the same change applies to +# SDL2 expression too + +with lib; + +assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; +assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null); let - inherit (stdenv.lib) optional optionals; + + configureFlagsFun = attrs: [ + "--disable-oss" + "--disable-video-x11-xme" + "--enable-rpath" + # Building without this fails on Darwin with + # + # ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32' + # SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) + # + # Please try revert the change that introduced this comment when updating SDL. + ] ++ optional stdenv.isDarwin "--disable-x11-shared" + ++ optional (!x11Support) "--without-x" + ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"; + in + stdenv.mkDerivation rec { name = "SDL-${version}"; version = "1.2.15"; @@ -23,40 +42,35 @@ stdenv.mkDerivation rec { sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; + # make: *** No rule to make target 'build/*.lo', needed by 'build/libSDL.la'. Stop. + postPatch = "patchShebangs ./configure"; + outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config nativeBuildInputs = [ pkgconfig ]; - # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = - optionals x11Support [ libXext libICE libXrandr ] ++ - optional alsaSupport alsaLib ++ - optional stdenv.isLinux libcap ++ - optionals openglSupport [ mesa_noglu mesa_glu ] ++ - optional pulseaudioSupport libpulseaudio ++ - optional stdenv.isDarwin Cocoa; - - buildInputs = let - notMingw = !hostPlatform.isMinGW; - in optional notMingw audiofile - ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ]; - - # XXX: By default, SDL wants to dlopen() PulseAudio, in which case - # we must arrange to add it to its RPATH; however, `patchelf' seems - # to fail at doing this, hence `--disable-pulseaudio-shared'. - configureFlags = [ - "--disable-oss" - "--disable-video-x11-xme" - "--disable-x11-shared" - "--disable-alsa-shared" - "--enable-rpath" - "--disable-pulseaudio-shared" - "--disable-osmesa-shared" - ] ++ optional (!x11Support) "--without-x" - ++ optional (alsaSupport && hostPlatform != buildPlatform) "--with-alsa-prefix=${alsaLib.out}/lib"; + propagatedBuildInputs = [ ] + ++ optionals x11Support [ libXext libICE libXrandr ] + ++ optional stdenv.isLinux libcap + ++ optionals openglSupport [ libGL libGLU ] + ++ optional alsaSupport alsaLib + ++ optional pulseaudioSupport libpulseaudio + ++ optional stdenv.isDarwin Cocoa; + + buildInputs = [ libiconv ] + ++ optional (!hostPlatform.isMinGW) audiofile + ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; + + configureFlags = configureFlagsFun { inherit alsaLib; }; + + crossAttrs = { + configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; + }; patches = [ + ./find-headers.patch + # Fix window resizing issues, e.g. for xmonad # Ticket: http://bugzilla.libsdl.org/show_bug.cgi?id=1430 (fetchpatch { @@ -74,11 +88,16 @@ stdenv.mkDerivation rec { url = "http://hg.libsdl.org/SDL/raw-rev/95abff7adcc2"; sha256 = "0i8x0kx0pw12ld5bfxhyzs466y3c0n9dscw1ijhq1b96r72xyhqq"; }) + # https://bugzilla.libsdl.org/show_bug.cgi?id=1769 + (fetchpatch { + url = "http://hg.libsdl.org/SDL/raw-rev/91ad7b43317a"; + sha256 = "15g537vbl2my4mfrjxfkcx9ri6bk2gjvaqj650rjdxwk2nkdkn4b"; + }) # Workaround X11 bug to allow changing gamma # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222 (fetchpatch { name = "SDL_SetGamma.patch"; - url = "http://pkgs.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d"; + url = "http://src.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d"; sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv"; }) # Fix a build failure on OS X Mavericks @@ -91,10 +110,20 @@ stdenv.mkDerivation rec { url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87"; sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv"; }) - ./find-headers.patch ]; - postFixup = ''moveToOutput share/aclocal "$dev" ''; + postInstall = '' + moveToOutput share/aclocal "$dev" + ''; + + # See the same place in the expression for SDL2 + postFixup = '' + for lib in $out/lib/*.so* ; do + if [[ -L "$lib" ]]; then + patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath propagatedBuildInputs}" "$lib" + fi + done + ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/development/libraries/SDL/setup-hook.sh index 3696e743a07a104c33222fffc851ded761ffacef..20382f18f529a025557d44a53b29957b5a9b8632 100644 --- a/pkgs/development/libraries/SDL/setup-hook.sh +++ b/pkgs/development/libraries/SDL/setup-hook.sh @@ -4,8 +4,4 @@ addSDLPath () { fi } -if test -n "$crossConfig"; then - crossEnvHooks+=(addSDLPath) -else - envHooks+=(addSDLPath) -fi +addEnvHooks "$hostOffset" addSDLPath diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d2ffa45626be983801213c4e4cc3cfe73bbcef06..fe19ecadd0ef0ebc0412ff5eab291764ff987d39 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, audiofile -, openglSupport ? false, mesa_noglu +, openglSupport ? false, libGL , alsaSupport ? true, alsaLib , x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr , waylandSupport ? true, wayland, wayland-protocols, libxkbcommon @@ -8,57 +8,59 @@ , ibusSupport ? false, ibus , pulseaudioSupport ? true, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL +, libiconv }: -# OSS is no longer supported, for it's much crappier than ALSA and -# PulseAudio. -assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; +# NOTE: When editing this expression see if the same change applies to +# SDL expression too + +with lib; -assert openglSupport -> (stdenv.isDarwin || mesa_noglu != null && x11Support); +assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; +assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null); let + configureFlagsFun = attrs: [ - "--disable-oss" "--disable-x11-shared" "--disable-wayland-shared" - "--disable-pulseaudio-shared" "--disable-alsa-shared" - ] ++ lib.optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib" - ++ lib.optional (!x11Support) "--without-x"; + "--disable-oss" + ] ++ optional (!x11Support) "--without-x" + ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"; + in + stdenv.mkDerivation rec { name = "SDL2-${version}"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf"; + sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd"; }; outputs = [ "out" "dev" ]; + outputBin = "dev"; # sdl-config patches = [ ./find-headers.patch ]; nativeBuildInputs = [ pkgconfig ]; - # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++ - lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ - lib.optional pulseaudioSupport libpulseaudio; - - buildInputs = [ audiofile ] ++ - lib.optional openglSupport mesa_noglu ++ - lib.optional alsaSupport alsaLib ++ - lib.optional dbusSupport dbus ++ - lib.optional udevSupport udev ++ - lib.optional ibusSupport ibus ++ - lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; + propagatedBuildInputs = [ libiconv ] + ++ optional dbusSupport dbus + ++ optional udevSupport udev + ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] + ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] + ++ optional alsaSupport alsaLib + ++ optional pulseaudioSupport libpulseaudio; - # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 - dontDisableStatic = true; + buildInputs = [ audiofile ] + ++ optional openglSupport libGL + ++ optional ibusSupport ibus + ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; - enableParallelBuilding = true; + # /build/SDL2-2.0.7/src/video/wayland/SDL_waylandevents.c:41:10: fatal error: + # pointer-constraints-unstable-v1-client-protocol.h: No such file or directory + enableParallelBuilding = false; - # XXX: By default, SDL wants to dlopen() PulseAudio, in which case - # we must arrange to add it to its RPATH; however, `patchelf' seems - # to fail at doing this, hence `--disable-pulseaudio-shared'. configureFlags = configureFlagsFun { inherit alsaLib; }; crossAttrs = { @@ -71,6 +73,28 @@ stdenv.mkDerivation rec { moveToOutput bin/sdl2-config "$dev" ''; + # SDL is weird in that instead of just dynamically linking with + # libraries when you `--enable-*` (or when `configure` finds) them + # it `dlopen`s them at runtime. In principle, this means it can + # ignore any missing optional dependencies like alsa, pulseaudio, + # some x11 libs, wayland, etc if they are missing on the system + # and/or work with wide array of versions of said libraries. In + # nixpkgs, however, we don't need any of that. Moreover, since we + # don't have a global ld-cache we have to stuff all the propagated + # libraries into rpath by hand or else some applications that use + # SDL API that requires said libraries will fail to start. + # + # You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to + # confirm that they actually use most of the `propagatedBuildInputs` + # from above in this way. This is pretty weird. + postFixup = '' + for lib in $out/lib/*.so* ; do + if [[ -L "$lib" ]]; then + patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath propagatedBuildInputs}" "$lib" + fi + done + ''; + setupHook = ./setup-hook.sh; passthru = { inherit openglSupport; }; diff --git a/pkgs/development/libraries/SDL2/setup-hook.sh b/pkgs/development/libraries/SDL2/setup-hook.sh index 5a26440f37b314041f7e14dab4696267ac05368b..3acce9d473c565a01d281f399e90466a5b2603b0 100644 --- a/pkgs/development/libraries/SDL2/setup-hook.sh +++ b/pkgs/development/libraries/SDL2/setup-hook.sh @@ -4,8 +4,4 @@ addSDL2Path () { fi } -if test -n "$crossConfig"; then - crossEnvHooks+=(addSDL2Path) -else - envHooks+=(addSDL2Path) -fi +addEnvHooks "$hostOffset" addSDL2Path diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index a7ef0290734b770f7226c9fca15e9497f9eb9249..04ec3f9652c2a73545e8b000e099db73b44f6a74 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, SDL2 }: +{ stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { - name = "SDL2_gfx-${version}"; - version = "1.0.1"; + name = "${pname}-${version}"; + pname = "SDL2_gfx"; + version = "1.0.4"; src = fetchurl { - url = "mirror://sourceforge/sdl2gfx/${name}.tar.gz"; - sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; + url = "http://www.ferzkopp.net/Software/${pname}/${name}.tar.gz"; + sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; }; - buildInputs = [ SDL2 ]; + buildInputs = [ SDL2 ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx"; @@ -34,10 +36,9 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = https://sourceforge.net/projects/sdlgfx/; + homepage = http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/; license = licenses.zlib; - - maintainers = with maintainers; [ bjg ]; - platforms = platforms.linux; + maintainers = with maintainers; [ cpages ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 548f8e686ba8ebf6cbbd73dad1c8a5f94218207d..b0f2d0e8b8d18c42e2d03923c739f67173aca793 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib }: +{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib, Foundation }: stdenv.mkDerivation rec { name = "SDL2_image-${version}"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; - sha256 = "1s3ciydixrgv34vlf45ak5syq5nlfaqf19wf162lbz4ixxd0gpvj"; + sha256 = "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m"; }; - buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]; + buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ] + ++ stdenv.lib.optional stdenv.isDarwin Foundation; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "SDL image library"; homepage = http://www.libsdl.org/projects/SDL_image/; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.zlib; + maintainers = with maintainers; [ cpages ]; }; } diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 6eada0c83e527fa2b3bc994928f98c4d31282245..00251adb9153ce9e94a10039f4c0deda92d57d10 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which , SDL2, libogg, libvorbis, smpeg2, flac, libmodplug +, CoreServices, AudioUnit, AudioToolbox , enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { @@ -17,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig which ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; configureFlags = [ "--disable-music-ogg-shared" ] @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; - platforms = platforms.linux; + platforms = platforms.unix; homepage = https://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index cf81fc0cac8359ed12a71877bde861e412698612..780444d51f4fb5389a4ec0f2caf776df504300a2 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2 }: +{ stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { name = "SDL2_net-${version}"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + propagatedBuildInputs = [ SDL2 ]; meta = with stdenv.lib; { @@ -16,6 +18,6 @@ stdenv.mkDerivation rec { homepage = https://www.libsdl.org/projects/SDL_net; license = licenses.zlib; maintainers = with maintainers; [ MP2E ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 010ca46695a3ea125531da4dfe3dbf037a351bca..4558317ce3e339a380a510713a34884b44b50acc 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, freetype, mesa_noglu }: +{ stdenv, darwin, fetchurl, SDL2, freetype, libGL }: stdenv.mkDerivation rec { name = "SDL2_ttf-${version}"; @@ -9,11 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; - buildInputs = [ SDL2 freetype mesa_noglu ]; + buildInputs = [ SDL2 freetype libGL ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; meta = with stdenv.lib; { description = "SDL TrueType library"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.zlib; homepage = https://www.libsdl.org/projects/SDL_ttf/; }; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 1d7d96f7536dd4bee7b5da993b402672aecba49e..83a2ffc077c3350c2908872bfa6111361eed53b9 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "SDL_gfx-${version}"; - version = "2.0.25"; + version = "2.0.26"; src = fetchurl { url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; - sha256 = "1h2rj34dxi5xlwpvm293v2d91gsirhnpzlmnjns9xwkcdg0fsvjm"; + sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; }; buildInputs = [ SDL ] ; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 865ddac06bea2e706907864a1dd36be07a397763..d328d80d38987eaec0861b5e26e134a23114cc95 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl" - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 8cadc7290aa93163384eb381958e105951b201ac..f28ab55010b6ce07b4d513da53a1bac627d78113 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -3,10 +3,8 @@ stdenv.mkDerivation { name = "Xaw3d-1.6.2"; src = fetchurl { - urls = [ - ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.tar.bz2 - ]; - sha256 = "099kx6ni5vkgr3kf40glif8m6r1m1hq6hxqlqrblaj1w5cphh8hi"; + url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2; + sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [imake gccmakedep libXpm libXp bison flex]; @@ -14,6 +12,6 @@ stdenv.mkDerivation { meta = { description = "3D widget set based on the Athena Widget set"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index e45a9f2f38715e0f36a3d74de9d30f0df1ccf37f..a50c92924e9aa87e00c0592478fa4e44da7c8f72 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "accounts-qt-${version}"; - version = "1.13"; + version = "1.15"; src = fetchFromGitLab { - sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl"; - rev = version; + sha256 = "0cnra7g2mcgzh8ykrj1dpb4khkx676pzdr4ia1bvsp0cli48691w"; + rev = "VERSION_${version}"; repo = "libaccounts-qt"; owner = "accounts-sso"; }; @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { description = "Qt library for accessing the online accounts database"; homepage = https://gitlab.com/accounts-sso; license = licenses.lgpl21; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index d1b3b9b98271ae9c85f8730d9ae2133ccad01688..f12dfb4635b2490d450b2dbd097991922ec2e8a8 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.45"; + version = "0.6.46"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "09pg25ir7kjigvp2cxd9fkfw8c8ql8vrswfvymg9zmbmma9w43zv"; + sha256 = "09ddndbha2wh22a0k5150d2wy0v8k8zj3vmbdijyirqwhf5vjr8q"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 42988e334b0719cb6755c43141fee0e3ba15c5a2..d61315f7db85352fad272390385d8f36da4784e4 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.4.3"; + version = "6.4.7"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "07dvpi3abmjvg7m0aak4x82aj8cvw5zl2cqj525wd3fl6y0pn3mq"; + sha256 = "1zbncdxkkwnx4aphy0apnp7xn4aspxvq2h9bbjh33dpsy0j81afd"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index dc9e4e6ff18b9aaf64326b593c0c0f7861ba8706..f9bb982a7842a68d689aa89576bf4d03681f1c03 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -18,15 +18,18 @@ stdenv.mkDerivation rec { patchPhase = '' echo "Removing C++-style comments from include/acl.h" sed -e '/^\/\//d' -i include/acl.h + + patchShebangs . ''; - configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip ECHO=echo SED=sed AWK=gawk"; + configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ZIP=gzip" "ECHO=echo" "SED=sed" "AWK=gawk" ]; - installTargets = "install install-lib install-dev"; + installTargets = [ "install" "install-lib" "install-dev" ]; - meta = { - homepage = http://savannah.nongnu.org/projects/acl; + meta = with stdenv.lib; { + homepage = "http://savannah.nongnu.org/projects/acl"; description = "Library and tools for manipulating access control lists"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 815e0f20b54e12cf077a5bd4a6236c8452af1212..c72572139c68887f09d3c5c27faa7344f0234c30 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "0.14"; + version = "0.15"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "0qx72w6lwskp18q608f95j5dcxb9xr4q4mzdkxp01sgib8v2v56l"; + sha256 = "0c2vfib4fmljy98c3s3s7jmpjlqxvsbv7wf6qxr38kamwzbryrjj"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix index 25e6ff6667fe8b24ab2afbaf929a00c382b60007..0e4f1da6e14078a54f53e604b1be7748034f5e4c 100644 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ b/pkgs/development/libraries/agda/pretty/default.nix @@ -21,5 +21,6 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ fuuzetsu ]; + broken = true; # 2018-04-11 }; }) diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 2edf4e232260aad3ed1d112b570db064e59689dd..ab309858095060e504f764c82f0628d75a4a4723 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib"; + configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib --enable-examples=no"; + + # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o + # libtool: error: cannot find the library 'libexamples.la' + enableParallelBuilding = false; meta = { description = "High quality rendering engine for C++"; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index bd540cdd50053de75f29bfeabcf3013c5fcddda6..2276264e03f1a4ebb64cd4ec5fcd2a7cdcc0eef7 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5 }: +{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }: stdenv.mkDerivation rec { name = "alembic-${version}"; - version = "1.7.4"; + version = "1.7.7"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "00r6d8xk2sq5hdl5lp14nhyh1b2d68fxpzbm69fk6iq2f2gv0iqv"; + sha256 = "16cgzn8cz3qbfpfh53bhn4ibwp5ddam3vxgz8zaglbj7z1a3pxfv"; }; outputs = [ "bin" "dev" "out" "lib" ]; - buildInputs = [ unzip cmake openexr hdf5 ]; + nativeBuildInputs = [ unzip cmake ]; + buildInputs = [ openexr hdf5-threadsafe ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index dc2775b1979dec9313407b8b77ef75e51c8d14aa..e20b2700f0e2144ab87ae3b5c5aa5dba8743228f 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac +, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac , inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora , physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs , libXdmcp @@ -9,19 +9,19 @@ stdenv.mkDerivation rec { name = "allegro-${version}"; - version = "5.2.3.0"; + version = "5.2.4.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "0bx240x0filalfarylqjgqf3g80c7dhzhy4m162swjlg0vjpgblr"; + sha256 = "01y3hirn5b08f188nnhb2cbqj4vzysr7l2qpz2208srv8arzmj2d"; }; buildInputs = [ texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa + xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined kbproto libjpeg flac inputproto libXi fixesproto libXfixes enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index c0451486c1443f9e432672dd6b35161a642838cb..12b2cbf07071d5d90112d8d91ac52f5de1c51480 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, mesa }: +, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined }: stdenv.mkDerivation rec { name = "allegro-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa + xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index c71dced918ac606f75b51e016f758bb0bd573f76..fc79cae36f836a21b5a63d46544a082e5e8ac8c1 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "apache-activemq-${version}"; - version = "5.13.4"; + version = "5.14.5"; src = fetchurl { - sha256 = "0sp806bmv9vs19zbzlv71ag09p1jbl2wn2wpxfwa20mndri8lsmz"; + sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54"; url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index d177c3acfa710808b88e0a339833806b38311134..2499a424c85c2e8e015da827669216e0d636f3cf 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,30 +1,53 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib -, gtk_doc, libarchive, gobjectIntrospection -, sqlite, libsoup, gcab, attr, acl, docbook_xsl -, libuuid, json_glib, meson, gperf, ninja +{ stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib +, gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant +, sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42 +, libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.2"; + name = "appstream-glib-0.7.7"; + + outputs = [ "out" "dev" "man" "installedTests" ]; + outputBin = "dev"; src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "1jvwfida12d2snc8p9lpbpqzrixw2naaiwfmsrldwkrxsj3i19pl"; + sha256 = "127m5ds355i1vfvmn9nd4zqqnqm16jpqcn4p2p2pvn7i4wqxra40"; }; - nativeBuildInputs = [ meson pkgconfig ninja ]; - buildInputs = [ glib gtk_doc gettext sqlite libsoup - gcab attr acl docbook_xsl libuuid json_glib - libarchive gobjectIntrospection gperf ]; + nativeBuildInputs = [ + meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 + ]; + buildInputs = [ + glib gettext sqlite libsoup + gcab attr acl libuuid json-glib + libarchive gobjectIntrospection gperf + ]; propagatedBuildInputs = [ gtk3 ]; - mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ]; + + patches = [ + (substituteAll { + src = ./paths.patch; + pngquant= "${pngquant}/bin/pngquant"; + }) + ]; + + mesonFlags = [ + "-Drpm=false" + "-Dstemmer=false" + "-Ddep11=false" + ]; + + postInstall = '' + moveToOutput "share/installed-tests" "$installedTests" + ''; meta = with stdenv.lib; { description = "Objects and helper methods to read and write AppStream metadata"; - homepage = https://github.com/hughsie/appstream-glib; - license = licenses.lgpl21Plus; - platforms = platforms.linux; + homepage = https://people.freedesktop.org/~hughsient/appstream-glib/; + license = licenses.lgpl2Plus; + platforms = platforms.linux; maintainers = with maintainers; [ lethalman matthewbauer ]; }; } diff --git a/pkgs/development/libraries/appstream-glib/paths.patch b/pkgs/development/libraries/appstream-glib/paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..5c6396988a17ad60e72d212c0caf50266e5d6a5c --- /dev/null +++ b/pkgs/development/libraries/appstream-glib/paths.patch @@ -0,0 +1,11 @@ +--- a/libappstream-builder/asb-utils.c ++++ b/libappstream-builder/asb-utils.c +@@ -294,7 +294,7 @@ + { + g_autofree gchar *standard_error = NULL; + gint exit_status = 0; +- const gchar *argv[] = { "/usr/bin/pngquant", "--skip-if-larger", ++ const gchar *argv[] = { "@pngquant@", "--skip-if-larger", + "--strip", "--ext", ".png", + "--force", "--speed", "1", filename, NULL }; + if (!g_file_test (argv[0], G_FILE_TEST_IS_EXECUTABLE)) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index b79f274b9c3a8dd62cb2cc7506be9eb567e71418..61ee182ce627080708d261b783330d8078fbb63d 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,37 +1,55 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, intltool -, xmlto, docbook_xsl, docbook_xml_dtd_45 -, glib, xapian, libxml2, libyaml, gobjectIntrospection +{ stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext +, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt +, libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection , pcre, itstool }: stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.10.6"; + version = "0.11.8"; src = fetchFromGitHub { - owner = "ximion"; - repo = "appstream"; - rev = "APPSTREAM_0_10_6"; - sha256 = "1fg7zxx2qhkyj7fmcpwbf80b72d16kyi8dadi111kf00sgzfbiyy"; + owner = "ximion"; + repo = "appstream"; + rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; + sha256 = "07vzz57g1p5byj2jfg17y5n3il0g07d9wkiynzwra71mcxar1p08"; }; + patches = [ + # drop this in version 0.11.9 and above + (fetchpatch { + name = "define-location-and-soname.patch"; + url = "https://github.com/ximion/appstream/commit/3e58f9c9.patch"; + sha256 = "1ffgbdfg80yq5vahjrvdd4f8xsp32ksm9vyasfmc7hzhx294s78w"; + }) + ]; + nativeBuildInputs = [ - cmake pkgconfig gettext intltool - xmlto docbook_xsl docbook_xml_dtd_45 + meson ninja pkgconfig gettext + libxslt xmlto docbook_xsl docbook_xml_dtd_45 gobjectIntrospection itstool ]; - buildInputs = [ pcre glib xapian libxml2 libyaml ]; + buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ]; - cmakeFlags = '' - -DSTEMMING=off - ''; + prePatch = '' + substituteInPlace meson.build \ + --replace /usr/include ${libstemmer}/include + + substituteInPlace data/meson.build \ + --replace /etc $out/etc + ''; + + mesonFlags = [ + "-Dapidocs=false" + "-Ddocs=false" + "-Dgir=false" + ]; meta = with stdenv.lib; { description = "Software metadata handling library"; homepage = https://www.freedesktop.org/wiki/Distributions/AppStream/; - longDescription = - '' + longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides specifications for meta-information which is shipped by upstream projects and diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix new file mode 100644 index 0000000000000000000000000000000000000000..beff83f2365b488e6e5c8fccde22be621f1c2071 --- /dev/null +++ b/pkgs/development/libraries/appstream/qt.nix @@ -0,0 +1,25 @@ +{ stdenv, appstream, qtbase, qttools }: + +stdenv.mkDerivation rec { + name = "appstream-qt-${version}"; + inherit (appstream) version src patches prePatch; + + buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; + + nativeBuildInputs = appstream.nativeBuildInputs ++ [ qttools ]; + + mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; + + postInstall = '' + rm -rf $out/{bin,etc,include/appstream,lib/pkgconfig,lib/libappstream.so*,share} + ''; + + preFixup = '' + patchelf --add-needed ${appstream}/lib/libappstream.so.4 \ + $out/lib/libAppStreamQt.so + ''; + + meta = appstream.meta // { + description = "Software metadata handling library - Qt"; + }; +} diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 3251693f5742e15a499c913f63110e2dd2bbe076..7e7864cef52ccbc6ea694c5e83fc4075718ab6a9 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.6.0"; + name = "apr-util-1.6.1"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - sha256 = "0k6a90d67xl36brz69s7adgkswjmw7isnjblm1naqmjblwzwjx44"; + sha256 = "0nq3s1yn13vplgl6qfm09f7n0wm08malff9s59bqf9nid9xjzqfk"; }; 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 9abf48289ae02a9c5c2dc1f8857ef8393c30c8ae..ecdeb35f6edaa04d95de0e104413a1b549601c4c 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.6.2"; + name = "apr-1.6.3"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - sha256 = "1gffipa87pflvgvw01dbkvgh75p8n2sr56m1pcl01avv6zm9q409"; + sha256 = "0wiik6amxn6lkc55fv9yz5i3kbxnqbp36alrzabx1avsdp8hc7qk"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..912ea53c3d3ac8e321bd6eb7b0f6ed42ed372270 --- /dev/null +++ b/pkgs/development/libraries/arguments/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, libminc, bicpl }: + +stdenv.mkDerivation rec { + pname = "arguments"; + name = "${pname}-2015-11-30"; + + owner = "BIC-MNI"; + + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = "b3aad97f6b6892cb8733455d0d448649a48fa108"; + sha256 = "1ar8lm1w1jflz3vdmjr5c4x6y7rscvrj78b8gmrv79y95qrgzv6s"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ ]; + + #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" "-DBUILD_TESTING=FALSE" ]; + + checkPhase = "ctest --output-on-failure"; + doCheck = false; + # internal_volume_io.h: No such file or directory + + meta = with stdenv.lib; { + homepage = "https://github.com/${owner}/${pname}"; + description = "Library for argument handling for MINC programs"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix b/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix deleted file mode 100755 index 8adbef8f5764ed92a4b340f4454c66044ec42154..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{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 deleted file mode 100755 index 29e349e0a820f3e1028e69c57b168eef9c1f5657..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{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 7a3e0b2083cc828faebe9d578a3ed7e2d025d5a9..a5ca79c0d82e9fbb3a5719d0f860fad75a06a643 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "7.800.1"; + version = "8.400.0"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1nxq2jp4jlvinynv0l04rpdzpnkzdsng0d5vi3hilc0hlsjnbnjs"; + sha256 = "16yxhn904ll48879vmycv84rja28im0mrcfgb03nm7bs8lpvrdjw"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch b/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch index b6fdddcaf2da4d0121f0ba439bf5119bfe8ee1c8..a1442d1411930620c1a95d7ca231983578f700b1 100644 --- a/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch +++ b/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch @@ -1,10 +1,9 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -84,7 +84,7 @@ message(STATUS "DETECT_HDF5 = ${DETECT_HDF5}" ) - ## - ## Find LAPACK and BLAS libraries, or their optimised versions - ## -- +@@ -152,6 +152,7 @@ message(STATUS "DETECT_HDF5 = ${DETECT_HDF5}" ) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_aux/Modules/") + +set(APPLE false) if(APPLE) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..952f7435c0694376584b99ba1ab81552430d58d3 --- /dev/null +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -0,0 +1,44 @@ +{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, python, rapidjson, snappy, zlib, zstd }: + +stdenv.mkDerivation rec { + name = "arrow-cpp-${version}"; + version = "0.9.0"; + + src = fetchurl { + url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; + sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy"; + }; + + sourceRoot = "apache-arrow-${version}/cpp"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost python.pkgs.python python.pkgs.numpy ]; + + preConfigure = '' + substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + ''; + + BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; }; + FLATBUFFERS_HOME = flatbuffers; + GTEST_HOME = gtest; + GFLAGS_HOME = gflags; + LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; }; + RAPIDJSON_HOME = rapidjson; + SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; + ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; + ZSTD_HOME = zstd; + + cmakeFlags = [ + "-DARROW_PYTHON=ON" + ]; + + meta = { + description = "A cross-language development platform for in-memory data"; + homepage = https://arrow.apache.org/; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index dae8657388f70a91c829d32c0e42ed81aaadcee3..1126b4a7f2c9c1a33fe108218aa5e096d3963f54 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.8"; + name = "asio-1.12.1"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "0jgdl4fxw0hwy768rl3lhdc0czz7ak7czf3dg10j21pdpfpfvpi6"; + sha256 = "0nln45662kg799ykvqx5m9z9qcsmadmgg6r5najryls7x16in2d9"; }; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 0f6f5e8dd147cac12a606f5cf656eacd9bda2671..d0e93337a39026fdbbe191260d95651b9bafd07f 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, perl -, searchNixProfiles ? true}: +{ stdenv, fetchurl, fetchpatch, perl +, searchNixProfiles ? true +}: stdenv.mkDerivation rec { name = "aspell-0.60.6.1"; @@ -9,13 +10,19 @@ stdenv.mkDerivation rec { sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"; }; - patchPhase = '' + patches = [ + (fetchpatch { # remove in >= 0.60.7 + name = "gcc-7.patch"; + url = "https://github.com/GNUAspell/aspell/commit/8089fa02122fed0a.diff"; + sha256 = "1b3p1zy2lqr2fknddckm58hyk95hw4scf6hzjny1v9iaic2p37ix"; + }) + ] ++ stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; + + postPatch = '' patch interfaces/cc/aspell.h < ${./clang.patch} - '' + stdenv.lib.optionalString searchNixProfiles '' - patch -p1 < ${./data-dirs-from-nix-profiles.patch} ''; - buildInputs = [ perl ]; + nativeBuildInputs = [ perl ]; doCheck = true; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index fc6b47e8a63cff528ec0e8dad5c84b1b75f8f0c7..096ac80e5a70a8af7bbf94ad06915b896d5018dc 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -1,32 +1,113 @@ -{stdenv, fetchurl, aspell, which}: +{lib, stdenv, fetchurl, aspell, which}: + +with lib; + +/* HOWTO: + + * Add some of these to your profile or systemPackages. + + ~~~~ + environment.systemPackages = [ + aspell + aspellDicts.en + aspellDicts.en-computers + aspellDicts.en-science + ]; + ~~~~ + + * Rebuild and switch to the new profile. + * Add something like + + ~~~~ + master en_US + extra-dicts en-computers.rws + add-extra-dicts en_US-science.rws + ~~~~ + + to `/etc/aspell.conf` or `~/.aspell.conf`. + * Check that `aspell -a` starts without errors. + * (optional) Check your config with `aspell dump config | grep -vE '^(#|$)'`. + * Enjoy. + +*/ let /* Function to compile an Aspell dictionary. Fortunately, they all build in the exact same way. */ buildDict = - {shortName, fullName, src, postInstall ? ""}: + {shortName, fullName, ...}@args: - stdenv.mkDerivation { + stdenv.mkDerivation ({ name = "aspell-dict-${shortName}"; - inherit src; - buildInputs = [aspell which]; dontAddPrefix = true; preBuild = "makeFlagsArray=(dictdir=$out/lib/aspell datadir=$out/lib/aspell)"; - inherit postInstall; - meta = { description = "Aspell dictionary for ${fullName}"; platforms = stdenv.lib.platforms.all; - }; - }; - -in { + } // (args.meta or {}); + } // removeAttrs args [ "meta" ]); + + /* Function to compile txt dict files into Aspell dictionaries. */ + buildTxtDict = + {langInputs ? [], ...}@args: + buildDict ({ + propagatedUserEnvPackages = langInputs; + + preBuild = '' + # Aspell can't handle multiple data-dirs + # Copy everything we might possibly need + ${concatMapStringsSep "\n" (p: '' + cp -a ${p}/lib/aspell/* . + '') ([ aspell ] ++ langInputs)} + export ASPELL_CONF="data-dir $(pwd)" + + aspell-create() { + target=$1 + shift + echo building $target + aspell create "$@" master ./$target.rws + } + + words-only() { + awk -F'\t' '{print $1}' | sort | uniq + } + + # drop comments + aspell-affix() { + words-only \ + | grep -v '#' \ + | aspell-create "$@" + } + + # Hack: drop comments and words with affixes + aspell-plain() { + words-only \ + | grep -v '#' \ + | grep -v '/' \ + | aspell-create "$@" + } + + aspell-install() { + install -d $out/lib/aspell + for a in "$@"; do + echo installing $a + install -t $out/lib/aspell $a.rws + done + } + ''; + + phases = [ "preBuild" "buildPhase" "installPhase" ]; + } // args); + +in rec { + + ### Languages ca = buildDict { shortName = "ca-2.1.5-1"; @@ -212,6 +293,15 @@ in { }; }; + tr = buildDict { + shortName = "tr-0.50-0"; + fullName = "Turkish"; + src = fetchurl { + url = mirror://gnu/aspell/dict/tr/aspell-tr-0.50-0.tar.bz2; + sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; + }; + }; + uk = buildDict { shortName = "uk-1.4.0-0"; fullName = "Ukrainian"; @@ -221,4 +311,53 @@ in { }; }; + ### Jargons + + en-computers = buildTxtDict rec { + shortName = "en-computers"; + fullName = "English Computer Jargon"; + + src = fetchurl { + url = https://mrsatterly.com/computer.dic; + sha256 = "1vzk7cdvcm9r1c6mgxpabrdcpvghdv9mjmnf6iq5wllcif5nsw2b"; + }; + + langInputs = [ en ]; + + buildPhase = "cat $src | aspell-affix en-computers --dont-validate-words --lang=en"; + installPhase = "aspell-install en-computers"; + + meta = { + homepage = https://mrsatterly.com/spelling.html; + }; + }; + + en-science = buildTxtDict rec { + shortName = "en-science"; + fullName = "English Scientific Jargon"; + + src1 = fetchurl { + url = http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt; + sha256 = "1psqm094zl4prk2f8h18jv0d471hxykzd1zdnrlx7gzrzy6pz5r3"; + }; + + src2 = fetchurl { + url = http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt; + sha256 = "17ss1sdr3k70zbyx2z9xf74345slrp41gbkpih8axrmg4x92fgm1"; + }; + + langInputs = [ en ]; + + buildPhase = '' + cat $src1 | aspell-plain en_US-science --dont-validate-words --lang=en + cat $src2 | aspell-plain en_GB-science --dont-validate-words --lang=en + ''; + installPhase = "aspell-install en_US-science en_GB-science"; + + meta = { + homepage = http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/; + }; + + }; + } diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index e342d8ab6c09c620235bd892f3f7b350efc99c8b..219c8df803b762d7679e67571c424c29155f8b80 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "assimp-${version}"; - version = "3.3.1"; + version = "4.1.0"; src = fetchFromGitHub{ owner = "assimp"; repo = "assimp"; rev = "v${version}"; - sha256 = "13y44fymj13h6alig0nqab91j2qch0yh9gq8yql2zz744ch2s5vc"; + sha256 = "00g61g3ixmfszzjncpvm8x7gp2livaj4lmhbycjmrw4x3gfqlc4r"; }; buildInputs = [ cmake boost zlib ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index e2350cf2cd133c392178ef34c8e18b9656d34165..86f35d7f578e814ffe979f476d762617a9da7f93 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi -, intltool, dbus_glib, at_spi2_core, libSM }: +, intltool, dbus-glib, at-spi2-core, libSM }: stdenv.mkDerivation rec { versionMajor = "2.26"; - versionMinor = "0"; + versionMinor = "1"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "d25e528e1406a10c7d9b675aa15e638bcbf0a122ca3681f655a30cce83272fb9"; + sha256 = "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi - intltool dbus_glib at_spi2_core libSM ]; + dbus-glib at-spi2-core libSM ]; meta = with stdenv.lib; { platforms = platforms.unix; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 95de186a29a3fd056eb4f35a190ef217627fbcc4..6715a59579b59725d71b15ad8b09466a26ffa01b 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,33 +1,29 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib +{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { versionMajor = "2.26"; - versionMinor = "0"; + versionMinor = "2"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "511568a65fda11fdd5ba5d4adfd48d5d76810d0e6ba4f7460f1b2ec0dbbbc337"; + sha256 = "0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ]; buildInputs = [ - python popt intltool dbus_glib + python popt dbus-glib libX11 xextproto libSM libICE libXtst libXi - gobjectIntrospection ]; # ToDo: on non-NixOS we create a symlink from there? configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; - NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl"; - meta = with stdenv.lib; { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 1574d8d037c73ba093cea6fa9b2f6f7c2691d267..63fd7a4986f95fb74c6ae26d6d4f6bc9bdeb9aa2 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,28 +1,48 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: +{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib +, fixDarwinDylibNames, gobjectIntrospection, gnome3 +}: let - ver_maj = "2.26"; - ver_min = "0"; + pname = "atk"; + version = "2.28.1"; in + stdenv.mkDerivation rec { - name = "atk-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; - sha256 = "eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd"; }; - enableParallelBuilding = true; + patches = [ + # darwin linker arguments https://bugzilla.gnome.org/show_bug.cgi?id=794326 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=369680; + sha256 = "11v8fhpsbapa04ifb2268cga398vfk1nq8i628441632zjz1diwg"; + }) + ]; outputs = [ "out" "dev" ]; - buildInputs = libintlOrEmpty; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; - nativeBuildInputs = [ pkgconfig perl ]; + propagatedBuildInputs = [ + # Required by atk.pc + glib + ]; - propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ]; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - #doCheck = true; # no checks in there (2.22.0) + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = { description = "Accessibility toolkit"; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 6a94cb0c0e239abd7287cfa9f7a5249f42f2dfa2..96fe5b89a18ceac12f8fe8a201aa61a385469f36 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ stdenv, fetchurl, gettext, hostPlatform }: stdenv.mkDerivation rec { name = "attr-2.4.47"; @@ -12,13 +12,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; - configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk"; + configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ECHO=echo" "SED=sed" "AWK=gawk" ]; - installTargets = "install install-lib install-dev"; + installTargets = [ "install" "install-lib" "install-dev" ]; - meta = { - homepage = http://savannah.nongnu.org/projects/attr/; + patches = if (hostPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null; + + postPatch = '' + for script in install-sh include/install-sh; do + patchShebangs $script + done + ''; + + meta = with stdenv.lib; { + homepage = "http://savannah.nongnu.org/projects/attr/"; description = "Library and tools for manipulating extended attributes"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/attr/fix-headers-musl.patch b/pkgs/development/libraries/attr/fix-headers-musl.patch new file mode 100644 index 0000000000000000000000000000000000000000..e969f640eeeff5a278c9e08e9bdbc3b0dfad2cfa --- /dev/null +++ b/pkgs/development/libraries/attr/fix-headers-musl.patch @@ -0,0 +1,54 @@ +--- attr-2.4.47/include/xattr.h ++++ attr-2.4.47/include/xattr.h +@@ -31,33 +31,37 @@ + #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ + + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + extern int setxattr (const char *__path, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + extern int lsetxattr (const char *__path, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + extern int fsetxattr (int __filedes, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + + extern ssize_t getxattr (const char *__path, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + extern ssize_t lgetxattr (const char *__path, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + extern ssize_t fgetxattr (int __filedes, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + + extern ssize_t listxattr (const char *__path, char *__list, +- size_t __size) __THROW; ++ size_t __size); + extern ssize_t llistxattr (const char *__path, char *__list, +- size_t __size) __THROW; ++ size_t __size); + extern ssize_t flistxattr (int __filedes, char *__list, +- size_t __size) __THROW; ++ size_t __size); + +-extern int removexattr (const char *__path, const char *__name) __THROW; +-extern int lremovexattr (const char *__path, const char *__name) __THROW; +-extern int fremovexattr (int __filedes, const char *__name) __THROW; ++extern int removexattr (const char *__path, const char *__name); ++extern int lremovexattr (const char *__path, const char *__name); ++extern int fremovexattr (int __filedes, const char *__name); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif /* __XATTR_H__ */ diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index e13b102c78873cc87a4a71c5b20c6fd1da25e463..51ae14be4046b7b15d172822b03b86898dc5b953 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate -, libsndfile, pkgconfig, python3 +, libsndfile, pkgconfig, python }: stdenv.mkDerivation rec { - name = "aubio-0.4.5"; + name = "aubio-0.4.6"; src = fetchurl { url = "http://aubio.org/pub/${name}.tar.bz2"; - sha256 = "1xkshac4wdm7r5sc04c38d6lmvv5sk4qrb5r1yy0xgsgdx781hkh"; + sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile python3 ]; + nativeBuildInputs = [ pkgconfig python ]; + buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; - configurePhase = "${python3.interpreter} waf configure --prefix=$out"; + configurePhase = "python waf configure --prefix=$out"; - buildPhase = "${python3.interpreter} waf"; + buildPhase = "python waf"; - installPhase = "${python3.interpreter} waf install"; + installPhase = "python waf install"; meta = with stdenv.lib; { description = "Library for audio labelling"; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index 7057b020d42971f5d6d671421fb82f547bb793fa..4e316ff1c99119b3c94d89cc53b90d89426616d9 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index 9a87e31cbd299a026cce5911ba6be6f8a38da72a..ac6f0470a0a8c1da5ac87c9ecbc83f49dfa59610 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromBitbucket, cmake }: let - version = "0.6.1"; + version = "0.6.2"; in stdenv.mkDerivation { name = "libgme-${version}"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "mpyne"; repo = "game-music-emu"; rev = version; - sha256 = "04vwpv3pmjcil1jw5vcnlg45nch5awqs06y3xqdlp3ibx5i4k199"; + sha256 = "00vlbfk5h99dq5rbwxk20dv72dig6wdwpgf83q451avsscky0jvk"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix index 595dd9e0a53642dd4a0050cfe85b57a48471587b..4a632d07006bbe1686ca5b04adc4314766d223fb 100644 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "lv2-unstable-${version}"; - version = "2016-10-23"; + version = "2017-07-08"; src = fetchgit { url = "http://lv2plug.in/git/cgit.cgi/lv2.git"; - rev = "b36868f3b96a436961c0c51b5b2dd71d05da9b12"; - sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm"; + rev = "39c7c726cd52b2863fcea356cafe1bcab2ba7f37"; + sha256 = "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index b0b0c6bc59af0ef8b8f22d5ee4f3c1fbd977bcc5..63e3ae36028b0218355481cd9d7010238289b093 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "raul-unstable-${rev}"; - rev = "2016-09-20"; + rev = "2017-07-23"; src = fetchgit { url = "http://git.drobilla.net/cgit.cgi/raul.git"; - rev = "f8bf77d3c3b77830aedafb9ebb5cdadfea7ed07a"; - sha256 = "1lby508fb0n8ks6iz959sh18fc37br39d6pbapwvbcw5nckdrxwj"; + rev = "4db870b2b20b0a608ec0283139056b836c5b1624"; + sha256 = "04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index b2cfb0be8bec003df2663100b46b5aa90f015283..63f43ac7a2c0117b68240f36ec19e9cdf39b0844 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -8,12 +8,12 @@ assert !(withQt4 && withQt5); stdenv.mkDerivation rec { pname = "suil"; - version = "0.8.4"; + version = "0.10.0"; name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; src = fetchurl { url = "http://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf"; + sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index a7576e07f2dd0d15211835dbee0057768cf3f966..182471acf4ae5af03f93b026e259583df2cfcb9c 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -1,4 +1,14 @@ -{ stdenv, fetchurl, alsaLib, AudioUnit, CoreServices }: +{ stdenv, fetchurl, fetchpatch, alsaLib, AudioUnit, CoreServices }: + +let + + fetchDebianPatch = { name, debname, sha256 }: + fetchpatch { + inherit sha256 name; + url = "https://salsa.debian.org/multimedia-team/audiofile/raw/debian/0.3.6-4/debian/patches/${debname}"; + }; + +in stdenv.mkDerivation rec { name = "audiofile-0.3.6"; @@ -15,7 +25,46 @@ stdenv.mkDerivation rec { sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; - patches = [ ./CVE-2015-7747.patch ./gcc-6.patch ]; + patches = [ + ./gcc-6.patch + ./CVE-2015-7747.patch + + (fetchDebianPatch { + name = "CVE-2017-6829.patch"; + debname = "04_clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch"; + sha256 = "04qxl51i64c53v69q2kx61qdq474f4vapk8rq97cipj7yrar392m"; + }) + (fetchDebianPatch { + name = "CVE-2017-6827+CVE-2017-6828+CVE-2017-6832+CVE-2017-6835+CVE-2017-6837.patch"; + debname = "05_Always-check-the-number-of-coefficients.patch"; + sha256 = "1ih03kfkabffi6ymp6832q470i28rsds78941vzqlshnqjb2nnxw"; + }) + (fetchDebianPatch { + name = "CVE-2017-6839.patch"; + debname = "06_Check-for-multiplication-overflow-in-MSADPCM-decodeSam.patch"; + sha256 = "0a8s2z8rljlj03p7l1is9s4fml8vyzvyvfrh1m6xj5a8vbi635d0"; + }) + (fetchDebianPatch { + name = "CVE-2017-6830+CVE-2017-6834+CVE-2017-6836+CVE-2017-6838.patch"; + debname = "07_Check-for-multiplication-overflow-in-sfconvert.patch"; + sha256 = "0rfba8rkasl5ycvc0kqlzinkl3rvyrrjvjhpc45h423wmjk2za2l"; + }) + (fetchDebianPatch { + name = "audiofile-fix-multiplyCheckOverflow-signature.patch"; + debname = "08_Fix-signature-of-multiplyCheckOverflow.-It-returns-a-b.patch"; + sha256 = "032p5jqp7q7jgc5axdnazz00zm7hd26z6m5j55ifs0sykr5lwldb"; + }) + (fetchDebianPatch { + name = "CVE-2017-6831.patch"; + debname = "09_Actually-fail-when-error-occurs-in-parseFormat.patch"; + sha256 = "0csikmj8cbiy6cigg0rmh67jrr0sgm56dfrnrxnac3m9635nxlac"; + }) + (fetchDebianPatch { + name = "CVE-2017-6833.patch"; + debname = "10_Check-for-division-by-zero-in-BlockCodec-runPull.patch"; + sha256 = "1rlislkjawq98bbcf1dgl741zd508wwsg85r37ca7pfdf6wgl6z7"; + }) + ]; meta = with stdenv.lib; { description = "Library for reading and writing audio files in various formats"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8b787855c4deee18be700508a95ad94552253c07 --- /dev/null +++ b/pkgs/development/libraries/avro-c/default.nix @@ -0,0 +1,30 @@ +{ stdenv, bash, cmake, fetchurl, pkgconfig, jansson, zlib }: + +let + version = "1.8.2"; +in stdenv.mkDerivation rec { + name = "avro-c-${version}"; + + src = fetchurl { + url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; + sha256 = "03pixl345kkpn1jds03rpdcwjabi41rgdzi8f7y93gcg5cmrhfa6"; + }; + + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ jansson zlib ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A C library which implements parts of the Avro Specification"; + homepage = https://avro.apache.org/; + license = licenses.asl20; + maintainers = with maintainers; [ lblasc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index fe06bcfab6d34d05e3fea15acb1e242a06408f05..0ab102a5ec431d601bd64f9613590db6f2839743 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -3,6 +3,7 @@ apis ? ["*"] , # Whether to enable AWS' custom memory management. customMemoryManagement ? true +, darwin }: let @@ -14,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.1.18"; + version = "1.4.33"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1i85zpns3gj5by45ppg4rfk9csix8mjazpyj6dqic40b2wshnw8c"; + sha256 = "0fl4m3vsycd35gkrrlqsjlv0myh12bgb0jg3pm548l19qwrc0pm7"; }; # FIXME: might be nice to put different APIs in different outputs @@ -28,10 +29,16 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = [ cmake curl ]; + nativeBuildInputs = [ cmake curl ]; + buildInputs = [ zlib curl openssl ] + ++ lib.optionals (stdenv.isDarwin && + ((builtins.elem "text-to-speech" apis) || + (builtins.elem "*" apis))) + (with darwin.apple_sdk.frameworks; [ CoreAudio AudioToolbox ]); cmakeFlags = lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF" ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; @@ -51,9 +58,7 @@ in stdenv.mkDerivation rec { rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp ''; - NIX_LDFLAGS = lib.concatStringsSep " " ( - (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib")) - [ curl openssl zlib stdenv.cc.cc ]); + NIX_CFLAGS_COMPILE = [ "-Wno-error=noexcept-type" ]; meta = { description = "A C++ interface for Amazon Web Services"; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 133b39d07974710baf36160820f8ea21a7e7dd65..285f4dea802afc36681afe1759cca7ddede4c682 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.34"; + name = "babl-0.1.46"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0nwakj313l2dh5npx18avkg4z17i2prkxbl6vj547a08n6ry1gsy"; + sha256 = "0nwyhvfca6m35wjcccvwca7fcihzgdfyc012qi703y5d3cxl1hmv"; }; - meta = with stdenv.lib; { + doCheck = true; + + meta = with stdenv.lib; { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ jtojnar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 69faf913abfeeb96939e65d4cbf176b9b3227cd4..5439c7657e08091424a21d27102222ecc84d41ba 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; baseName = "bctoolbox"; - version = "0.2.0"; + version = "0.6.0"; buildInputs = [cmake mbedtls bcunit srtp]; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "09mjqdfjxy4jy1z68b2i99hgkbnhhk7vnbfhj9sdpd1p3jk2ha33"; + sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909"; }; meta = { diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 2484e287016b372d15a2663fffb5b3d7f1c1f321..02c67d7dbf8b11bfa79e6b43f04e60becc789eea 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -12,7 +12,7 @@ , libXext , python3 , ocl-icd -, mesa_noglu +, libGL , makeWrapper , beignet }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libXdmcp libXdamage ocl-icd - mesa_noglu + libGL ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8805dc74a26c30accff751400d84a74d2777bbd5 --- /dev/null +++ b/pkgs/development/libraries/belcard/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }: + +stdenv.mkDerivation rec { + baseName = "belcard"; + version = "1.0.2"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk"; + }; + + buildInputs = [ bctoolbox belr ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib;{ + description = "Belcard is a C++ library to manipulate VCard standard format"; + homepage = https://github.com/BelledonneCommunications/belcard; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index b055b2358a54075cfddc0c6fb731e78838bf1147..003fce0ea8c31d7397986873e9fe6fcb8047fedc 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { baseName = "belle-sip"; - version = "1.5.0"; + version = "1.6.3"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "0hnm64hwgq003wicz6c485fryjfhi820fgin8ndknq60kvwxsrzn"; + sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk"; }; nativeBuildInputs = [ jre cmake ]; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..214abb21f2cda16d44e4e0a055b6be67c6f55067 --- /dev/null +++ b/pkgs/development/libraries/belr/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }: + +stdenv.mkDerivation rec { + baseName = "belr"; + version = "0.1.3"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w"; + }; + + buildInputs = [ bctoolbox ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib;{ + description = "Belr is Belledonne Communications' language recognition library"; + homepage = https://github.com/BelledonneCommunications/belr; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 9805930c7bfa4587ad173c290d2a2029dab64545..dd7d6a34867173208a79936cc05d643f03d8e4ab 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { homepage = https://fbb-git.github.io/bobcat/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 1ac96e2b4f0465754f30a928f36a4c72886c0220..d4e91deb74499ceb71e4aadc0fcd3e02d4fec1d7 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,13 +1,17 @@ -{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops, enableLargeConfig ? false , buildPlatform, hostPlatform }: stdenv.mkDerivation rec { - name = "boehm-gc-7.6.0"; + name = "boehm-gc-${version}"; + version = "7.6.4"; src = fetchurl { - url = http://www.hboehm.info/gc/gc_source/gc-7.6.0.tar.gz; - sha256 = "143x7g0d0k6250ai6m2x3l4y352mzizi4wbgrmahxscv2aqjhjm1"; + urls = [ + "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" + "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" + ]; + sha256 = "076dzsqqyxd3nlzs0z277vvhqjp8nv5dqi763s0m90zr6ljiyk5r"; }; buildInputs = [ libatomic_ops ]; @@ -16,20 +20,28 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux; + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" + ''; + + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/85b6a600996bdd71162b357e9ba93d8559342432/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; + sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3"; + }) ] ++ + # https://github.com/ivmai/bdwgc/pull/208 + lib.optional hostPlatform.isRiscV ./riscv.patch; + configureFlags = [ "--enable-cplusplus" ] - ++ lib.optional enableLargeConfig "--enable-large-config"; + ++ lib.optional enableLargeConfig "--enable-large-config" + ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; # not cross; # Don't run the native `strip' when cross-compiling. dontStrip = hostPlatform != buildPlatform; - postInstall = - '' - mkdir -p $out/share/doc - mv $out/share/gc $out/share/doc/gc - ''; + enableParallelBuilding = true; meta = { description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; diff --git a/pkgs/development/libraries/boehm-gc/riscv.patch b/pkgs/development/libraries/boehm-gc/riscv.patch new file mode 100644 index 0000000000000000000000000000000000000000..249137d0a0dc98d027697ebe42aeefc425b81d42 --- /dev/null +++ b/pkgs/development/libraries/boehm-gc/riscv.patch @@ -0,0 +1,53 @@ +diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h +index a8e55dd2..439cc88d 100644 +--- a/include/private/gcconfig.h ++++ b/include/private/gcconfig.h +@@ -650,6 +650,15 @@ + # endif + # define mach_type_known + # endif ++# if defined(__riscv) && defined(LINUX) ++# if __riscv_xlen == 32 ++# define RISCV32 ++# define mach_type_known ++# elif __riscv_xlen == 64 ++# define RISCV64 ++# define mach_type_known ++# endif ++# endif + + # if defined(SN_TARGET_PSP2) + # define mach_type_known +@@ -2970,6 +2979,32 @@ + # endif + # endif + ++# ifdef RISCV32 ++# define CPP_WORDSZ 32 ++# define MACH_TYPE "RISC-V 32" ++# define ALIGNMENT 4 ++# ifdef LINUX ++# define OS_TYPE "LINUX" ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)__data_start) ++# define LINUX_STACKBOTTOM ++# define DYNAMIC_LOADING ++# endif ++# endif ++ ++# ifdef RISCV64 ++# define CPP_WORDSZ 64 ++# define MACH_TYPE "RISC-V 64" ++# define ALIGNMENT 8 ++# ifdef LINUX ++# define OS_TYPE "LINUX" ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)__data_start) ++# define LINUX_STACKBOTTOM ++# define DYNAMIC_LOADING ++# endif ++# endif ++ + #if defined(__GLIBC__) && !defined(DONT_USE_LIBC_PRIVATES) + /* Use glibc's stack-end marker. */ + # define USE_LIBC_PRIVATES diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 0f899e4324c1a131d56a652deef00147c5c1abe6..9ec27d3e9ebced05ed57ede074912ec2cb945885 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -3,11 +3,11 @@ let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in stdenv.mkDerivation rec { - name = "boolstuff-0.1.15"; + name = "boolstuff-0.1.16"; src = fetchurl { url = "${baseurl}/${name}.tar.gz"; - sha256 = "1mzw4368hqw0b6xr01yqcbs9jk9ma3qq9hk3iqxmkiwqqxgirgln"; + sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index 2666b1d6c5d2946c920bbb62809003b02df96c42..603d7883c647ea4ffa6e5c6ce1b5919236a1473d 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -8,33 +8,33 @@ callPackage ./generic.nix (args // rec { sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; }; - patches = if stdenv.isCygwin then [ - ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch - ./cygwin-fedora-boost-1.50.0-pool.patch - ./cygwin-fedora-boost-1.57.0-mpl-print.patch - ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch - ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch - ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch - ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch - ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch - ./cygwin-fedora-boost-1.57.0-move-is_class.patch - ./cygwin-1.40.0-cstdint-cygwin.patch - ./cygwin-1.57.0-asio-cygwin.patch - ./cygwin-1.55.0-asio-MSG_EOR.patch - ./cygwin-1.57.0-config-cygwin.patch - ./cygwin-1.57.0-context-cygwin.patch - ./cygwin-1.57.0-filesystem-cygwin.patch - ./cygwin-1.55.0-interlocked-cygwin.patch - ./cygwin-1.40.0-iostreams-cygwin.patch - ./cygwin-1.57.0-locale-cygwin.patch - ./cygwin-1.57.0-log-cygwin.patch - ./cygwin-1.40.0-python-cygwin.patch - ./cygwin-1.40.0-regex-cygwin.patch - ./cygwin-1.57.0-smart_ptr-cygwin.patch - ./cygwin-1.57.0-system-cygwin.patch - ./cygwin-1.45.0-jam-cygwin.patch - ./cygwin-1.50.0-jam-pep3149.patch - ] else null; + patches = stdenv.lib.optionals stdenv.isCygwin [ + ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch + ./cygwin-fedora-boost-1.50.0-pool.patch + ./cygwin-fedora-boost-1.57.0-mpl-print.patch + ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch + ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch + ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch + ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch + ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch + ./cygwin-fedora-boost-1.57.0-move-is_class.patch + ./cygwin-1.40.0-cstdint-cygwin.patch + ./cygwin-1.57.0-asio-cygwin.patch + ./cygwin-1.55.0-asio-MSG_EOR.patch + ./cygwin-1.57.0-config-cygwin.patch + ./cygwin-1.57.0-context-cygwin.patch + ./cygwin-1.57.0-filesystem-cygwin.patch + ./cygwin-1.55.0-interlocked-cygwin.patch + ./cygwin-1.40.0-iostreams-cygwin.patch + ./cygwin-1.57.0-locale-cygwin.patch + ./cygwin-1.57.0-log-cygwin.patch + ./cygwin-1.40.0-python-cygwin.patch + ./cygwin-1.40.0-regex-cygwin.patch + ./cygwin-1.57.0-smart_ptr-cygwin.patch + ./cygwin-1.57.0-system-cygwin.patch + ./cygwin-1.45.0-jam-cygwin.patch + ./cygwin-1.50.0-jam-pep3149.patch + ]; }) diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix new file mode 100644 index 0000000000000000000000000000000000000000..02cf511a6fdff63a31130756eb3bcd5493de21b5 --- /dev/null +++ b/pkgs/development/libraries/boost/1.66.nix @@ -0,0 +1,13 @@ +{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.66_0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_66_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_66_0.html + sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; + }; + + toolset = if stdenv.cc.isClang then "clang" else null; +}) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 3f9ae113f849130a16482edb88bc5db8aec1a880..14ea512afbd28209f58a8a3f3ba85c4f611703c5 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv -, buildPlatform, hostPlatform -, toolset ? if stdenv.cc.isClang then "clang" else null +, which +, buildPackages, buildPlatform, hostPlatform +, toolset ? /**/ if stdenv.cc.isClang then "clang" + else if stdenv.cc.isGNU && hostPlatform != buildPlatform then "gcc-cross" + else null , enableRelease ? true , enableDebug ? false , enableSingleThreaded ? false , enableMultiThreaded ? true , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now , enableStatic ? !enableShared -, enablePIC ? false -, enableExceptions ? false , enablePython ? hostPlatform == buildPlatform -, enableNumpy ? false, numpy ? null +, enableNumpy ? enablePython && stdenv.lib.versionAtLeast version "1.65" , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) -, patches ? null +, patches ? [] , mpi ? null # Attributes inherit from specific versions @@ -21,8 +22,9 @@ }: # We must build at least one type of libraries -assert !enableShared -> enableStatic; +assert enableShared || enableStatic; +# Python isn't supported when cross-compiling assert enablePython -> hostPlatform == buildPlatform; assert enableNumpy -> enablePython; @@ -46,86 +48,41 @@ let # To avoid library name collisions layout = if taggedLayout then "tagged" else "system"; - cflags = if enablePIC && enableExceptions then - "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC" - else if enablePIC then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if enableExceptions then - "cflags=-fexceptions" - else - ""; - - withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}"; - - genericB2Flags = [ + b2Args = concatStringsSep " " ([ "--includedir=$dev/include" "--libdir=$out/lib" "-j$NIX_BUILD_CORES" "--layout=${layout}" "variant=${variant}" "threading=${threading}" - ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [ + "runtime-link=${runtime-link}" "link=${link}" - "${cflags}" - ] ++ optional (variant == "release") "debug-symbols=off" - ++ optional (!enablePython) "--without-python"; - - nativeB2Flags = [ "-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_LIBPATH=${expat.out}/lib" - ] ++ optional (toolset != null) "toolset=${toolset}" - ++ optional (mpi != null) "--user-config=user-config.jam"; - nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags); - - crossB2Flags = [ - "-sEXPAT_INCLUDE=${expat.crossDrv}/include" - "-sEXPAT_LIBPATH=${expat.crossDrv}/lib" - "--user-config=user-config.jam" - "toolset=gcc-cross" - ] ++ optionals (hostPlatform.libc == "msvcrt") [ + ] ++ optional (variant == "release") "debug-symbols=off" + ++ optional (toolset != null) "toolset=${toolset}" + ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam" + ++ optionals (hostPlatform.libc == "msvcrt") [ "target-os=windows" "threadapi=win32" "binary-format=pe" "address-model=${toString hostPlatform.parsed.cpu.bits}" "architecture=x86" - ]; - crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags); - - builder = b2Args: '' - ./b2 ${b2Args} - ''; - - installer = b2Args: '' - # boostbook is needed by some applications - mkdir -p $dev/share/boostbook - cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ - - # Let boost install everything else - ./b2 ${b2Args} install - ''; - - commonConfigureFlags = [ - "--includedir=$(dev)/include" - "--libdir=$(out)/lib" - ]; - - fixup = '' - # Make boost header paths relative so that they are not runtime dependencies - ( - cd "$dev" - find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ - -exec sed '1i#line 1 "{}"' -i '{}' \; - ) - '' + optionalString (hostPlatform.libc == "msvcrt") '' - ${stdenv.cc.prefix}ranlib "$out/lib/"*.a - ''; + ]); in stdenv.mkDerivation { name = "boost-${version}"; - inherit src patches; + inherit src; + + patchFlags = optionalString (hostPlatform.libc == "msvcrt") "-p0"; + patches = patches ++ optional (hostPlatform.libc == "msvcrt") (fetchurl { + url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/" + + "boost-mingw.patch"; + sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; + }); meta = { homepage = http://boost.org/; @@ -142,9 +99,13 @@ stdenv.mkDerivation { --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)"; fi; '' + optionalString (mpi != null) '' - cat << EOF > user-config.jam + cat << EOF >> user-config.jam using mpi : ${mpi}/bin/mpiCC ; EOF + '' + optionalString (hostPlatform != buildPlatform) '' + cat << EOF >> user-config.jam + using gcc : cross : ${stdenv.cc.targetPrefix}c++ ; + EOF ''; NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin @@ -152,46 +113,43 @@ stdenv.mkDerivation { enableParallelBuilding = true; + nativeBuildInputs = [ which buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (hostPlatform == buildPlatform) icu ++ optional stdenv.isDarwin fixDarwinDylibNames ++ optional enablePython python - ++ optional enableNumpy numpy; + ++ optional enableNumpy python.pkgs.numpy; configureScript = "./bootstrap.sh"; - configureFlags = commonConfigureFlags - ++ [ "--with-python=${python.interpreter}" ] - ++ optional (hostPlatform == buildPlatform) "--with-icu=${icu.dev}" + configurePlatforms = []; + configureFlags = [ + "--includedir=$(dev)/include" + "--libdir=$(out)/lib" + ] ++ optional enablePython "--with-python=${python.interpreter}" + ++ [ (if hostPlatform == buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ] ++ optional (toolset != null) "--with-toolset=${toolset}"; - buildPhase = builder nativeB2Args; + buildPhase = '' + ./b2 ${b2Args} + ''; + + installPhase = '' + # boostbook is needed by some applications + mkdir -p $dev/share/boostbook + cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ - installPhase = installer nativeB2Args; + # Let boost install everything else + ./b2 ${b2Args} install + ''; - postFixup = fixup; + postFixup = '' + # Make boost header paths relative so that they are not runtime dependencies + cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ + -exec sed '1i#line 1 "{}"' -i '{}' \; + '' + optionalString (hostPlatform.libc == "msvcrt") '' + $RANLIB "$out/lib/"*.a + ''; outputs = [ "out" "dev" ]; setOutputFlags = false; - - crossAttrs = rec { - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--without-icu ${concatStringsSep " " commonConfigureFlags}" - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ''; - buildPhase = builder crossB2Args; - installPhase = installer crossB2Args; - postFixup = fixup; - } // optionalAttrs (hostPlatform.libc == "msvcrt") { - patches = fetchurl { - url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/" - + "boost-mingw.patch"; - sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; - }; - - patchFlags = "-p0"; - }; } diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index 727c6bfc4f3f9629e610099bba44a32f5030ba85..160f6230594525e9820ff567759ab85d688bb087 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { platform = if stdenv.isLinux then "linux" else if stdenv.isDarwin then "macosx" - else abort "unrecognized platform"; + else throw "unrecognized system ${stdenv.system}"; buildInputs = [ premake4 ]; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 61f0fac7ffd003fe2e00a9b2a9a35fa807862661..e65980be320eb963e04f5e522e831d6278dde33d 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, mesa, freeglut, libX11, xproto, inputproto +{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xproto, inputproto , libXi, pkgconfig }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - unzip cmake mesa freeglut libX11 xproto inputproto libXi + unzip cmake libGLU_combined freeglut libX11 xproto inputproto libXi ]; cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ]; diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 313ac086726ff0967a0f73409944ea46f3b60a7c..00e236eba8c3d0ada10ec0fddfaddb14ea960c2d 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Binary decision diagram package"; license = "as-is"; - platforms = with stdenv.lib.platforms; allBut cygwin; + platforms = stdenv.lib.platforms.unix; # Once had cygwin problems maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/bullet/bullet283.nix b/pkgs/development/libraries/bullet/bullet283.nix deleted file mode 100644 index 36790dbe3a2be493c9cd02f459f6f133fde4c082..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/bullet/bullet283.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, cmake, mesa, freeglut }: - -stdenv.mkDerivation rec { - name = "bullet-2.83.7"; # vdrift 2012-07-22 doesn't build with 2.81 - src = fetchurl { - url = "https://github.com/bulletphysics/bullet3/archive/2.83.7.tar.gz"; - sha256 = "0hqjnmlb2p29yiasrm7kvgv0nklz5zkwhfk4f78zz1gf0vrdil80"; - }; - - buildInputs = [ cmake mesa freeglut ]; - configurePhase = '' - cmake -DBUILD_SHARED_LIBS=ON -DINSTALL_EXTRA_LIBS=TRUE \ - -DCMAKE_INSTALL_PREFIX=$out . - ''; - - enableParallelBuilding = true; - - meta = { - description = "A professional free 3D Game Multiphysics Library"; - longDescription = '' - Bullet 3D Game Multiphysics Library provides state of the art collision - detection, soft body and rigid body dynamics. - ''; - homepage = https://github.com/bulletphysics/bullet3; - license = stdenv.lib.licenses.zlib; - maintainers = with stdenv.lib.maintainers; [ aforemny ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index e7b500905370f9dc942ea854070c948f237fd38f..4d94faa9566aaa17215f447035c0a8fca137e288 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,34 +1,40 @@ -{ stdenv, fetchFromGitHub, cmake, mesa, freeglut, darwin }: +{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut, darwin }: stdenv.mkDerivation rec { name = "bullet-${version}"; - version = "2.86.1"; + version = "2.87"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "1k81hr5y9rs2nsal6711fal21rxp6h573cpmjjk8x8ji2crqbqlz"; + sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3"; }; buildInputs = [ cmake ] ++ (if stdenv.isDarwin then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ] - else [mesa freeglut]); + else [libGLU_combined freeglut]); + + patches = [ ./gwen-narrowing.patch ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ] ++ - stdenv.lib.optionals stdenv.isDarwin [ - "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\"" - "-DOPENGL_FOUND=true" - "-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" - "-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" - "-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" - "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_CPU_DEMOS=OFF" + "-DINSTALL_EXTRA_LIBS=ON" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\"" + "-DOPENGL_FOUND=true" + "-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" + "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/bullet/gwen-narrowing.patch b/pkgs/development/libraries/bullet/gwen-narrowing.patch new file mode 100644 index 0000000000000000000000000000000000000000..c6c06325dae07264c72b50b89c1dc19e3566a45c --- /dev/null +++ b/pkgs/development/libraries/bullet/gwen-narrowing.patch @@ -0,0 +1,22 @@ +commit a5d3497577c78b03c05c69d17df972fa9fb54f53 +Author: Linus Heckemann +Date: Fri Jan 5 23:57:09 2018 +0100 + + Add -Wno-narrowing to GWEN's CMakeLists + + This avoids the compilation issue that occurs on aarch64 with gcc6. + (nixpkgs-specific patch) + +diff --git a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt +index 82fa0ffba..26c4bbd37 100644 +--- a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt ++++ b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt +@@ -15,7 +15,7 @@ IF(NOT WIN32 AND NOT APPLE) + ADD_DEFINITIONS("-DDYNAMIC_LOAD_X11_FUNCTIONS=1") + ENDIF() + +-ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB ) ++ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB -Wno-narrowing ) + + FILE(GLOB gwen_SRCS "*.cpp" "Controls/*.cpp" "Controls/Dialog/*.cpp" "Controls/Dialogs/*.cpp" "Controls/Layout/*.cpp" "Controls/Property/*.cpp" "Input/*.cpp" "Platforms/*.cpp" "Renderers/*.cpp" "Skins/*.cpp") + FILE(GLOB gwen_HDRS "*.h" "Controls/*.h" "Controls/Dialog/*.h" "Controls/Dialogs/*.h" "Controls/Layout/*.h" "Controls/Property/*.h" "Input/*.h" "Platforms/*.h" "Renderers/*.h" "Skins/*.h") diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 6dc658c03e3e1980da1fcb14e6d64c492056e148..76c041e2ad565a12878ac871309d0339398d5076 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bwidget-${version}"; - version = "1.9.10"; + version = "1.9.12"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "025lmriaq4qqy99lh826wx2cnqqgxn7srz4m3q06bl6r9ch15hr6"; + sha256 = "0qrj8k4zzrnhwgdn5dpa6j0q5j739myhwn60ssnqrzq77sljss1g"; }; dontBuild = true; diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cdc660ca3f3261855ab6c557db070a4acb812f9a --- /dev/null +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }: + +stdenv.mkDerivation rec { + baseName = "bzrtp"; + version = "1.0.6"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45"; + }; + + buildInputs = [ bctoolbox sqlite ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol"; + homepage = https://github.com/BelledonneCommunications/bzrtp; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 14ff7a5f16c3092158f8d3a8e02bbe52e3dff774..6b3b69f999711c6149225f2af1ca7893ae39f4be 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, writeTextDir }: +let self = stdenv.mkDerivation rec { name = "c-ares-1.13.0"; @@ -14,4 +15,28 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; }; -} + + # Adapted from running a cmake build + passthru.cmake-config = writeTextDir "c-ares-config.cmake" + '' + set(c-ares_INCLUDE_DIR "${self}/include") + + set(c-ares_LIBRARY c-ares::cares) + + add_library(c-ares::cares SHARED IMPORTED) + + set_target_properties(c-ares::cares PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${self}/include" + INTERFACE_LINK_LIBRARIES "nsl;rt" + ) + set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(c-ares::cares PROPERTIES + IMPORTED_LOCATION_RELEASE "${self}/lib/libcares.so.2.2.0" + IMPORTED_SONAME_RELEASE "libcares.so.2" + ) + add_library(c-ares::cares_shared INTERFACE IMPORTED) + set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") + set(c-ares_SHARED_LIBRARY c-ares::cares_shared) + ''; + +}; in self diff --git a/pkgs/development/libraries/c-ares/release.patch b/pkgs/development/libraries/c-ares/release.patch new file mode 100644 index 0000000000000000000000000000000000000000..e745648062a5b0ab7e85dfa185114af21c260c30 --- /dev/null +++ b/pkgs/development/libraries/c-ares/release.patch @@ -0,0 +1,19 @@ +diff -aur c-ares-cares-1_13_0/ares_version.h c-ares-1.13.0/ares_version.h +--- c-ares-cares-1_13_0/ares_version.h 2017-06-20 02:00:21.000000000 -0400 ++++ c-ares-1.13.0/ares_version.h 2017-06-20 02:03:54.000000000 -0400 +@@ -6,12 +6,12 @@ + #define ARES_COPYRIGHT "2004 - 2016 Daniel Stenberg, ." + + #define ARES_VERSION_MAJOR 1 +-#define ARES_VERSION_MINOR 12 +-#define ARES_VERSION_PATCH 1 ++#define ARES_VERSION_MINOR 13 ++#define ARES_VERSION_PATCH 0 + #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\ + (ARES_VERSION_MINOR<<8)|\ + (ARES_VERSION_PATCH)) +-#define ARES_VERSION_STR "1.12.1-DEV" ++#define ARES_VERSION_STR "1.13.0" + + #if (ARES_VERSION >= 0x010700) + # define CARES_HAVE_ARES_LIBRARY_INIT 1 diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index d3b6722b36cd24e661b9e03574e70a2de4a06dc0..1e764aff4cc1f10caaec15ab05e9e35593ec64b0 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,25 +2,17 @@ stdenv.mkDerivation rec { name = "actor-framework-${version}"; - version = "0.15.3"; + version = "0.15.7"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = "${version}"; - sha256 = "0202nsdriigdh6sxi1k3hddvmf1x54qpykbvf2ghfhzyh0m1q7j2"; + sha256 = "0qmb18k162xdvf8z03mybjazkwb2vqda5xd1qh5bwkvxracwq3sb"; }; - # See https://github.com/actor-framework/actor-framework/issues/545 and remove on next release that incorporates this - patches = [ (fetchpatch { - url = "https://github.com/actor-framework/actor-framework/commit/c5a3ee26a6e76b28dd4226f35230b280f291386d.patch"; - sha256 = "1l0323cqyqlp3lvggm709fmfm6lk6av1smdbd420adhi3ksj2vhj"; - }) ]; - nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "An open source implementation of the actor model in C++"; homepage = http://actor-framework.org/; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7c0e36d40689d6e0eb285ce9d75696f3fc71fc07..6a7beb1cc1a868dc7dd351d14686dd50946ee596 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv -, libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg +, libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 -, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency +, glSupport ? true, libGL ? null # libGLU_combined is no longer a big dependency , pdfSupport ? true , darwin }: -assert glSupport -> mesa_noglu != null; +assert glSupport -> libGL != null; let inherit (stdenv.lib) optional optionals; in @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libiconv - ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libintl + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText ApplicationServices @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ] ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib - ++ optional glSupport mesa_noglu + ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? configureFlags = if stdenv.isDarwin then [ diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index b1ee0b8d2736a6a07ea6526f4773a4b7b8b41448..09d162db85322f28232fffbfaa840a955184556f 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: let ver_maj = "1.12"; - ver_min = "0"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - #url = "http://www.cairographics.org/releases/${name}.tar.gz"; + url = "http://www.cairographics.org/releases/${name}.tar.gz"; # gnome doesn't have the latest version ATM; beware: same name but different hash - url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; - sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; + # url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; + sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 6c20f4d6c91097e4d09cf46d89a45dd2b46cb0a1..116216d500e25367f999e619c03e1c26872ed5ee 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "catch-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch"; rev = "v${version}"; - sha256 = "0v9yw7ydvhydp78hh7cmaif4h73k5qxqpm1g7xn8i882i3s84s2s"; + sha256 = "0hkcmycvyyazzi9dywnyiipnmbx399iirh5xk5g957c8zl0505kd"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index a97ca5cc6980ee0fd1a1e5df8b31ebd30ebdf86e..19f39217fd0253586882d58552031eb05d52e85c 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { name = "cdk-${version}"; - version ="5.0-20161210"; + version ="5.0-20171209"; buildInputs = [ ncurses ]; src = fetchurl { - url = "ftp://invisible-island.net/cdk/cdk-${version}.tgz"; - sha256 = "1bazwcwz4qhxyc8jaahdd2nlm30f5dhy0f6cnix5rjjhi35mhxcy"; + urls = [ + "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" + "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" + ]; + sha256 = "0jq0dx7gm7gl6lv5mhlfkxhw5362g9dxqdlpjlrag069nns8xdc8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index 561be1ba2819d5a840d7856c0023a85a5fee9c36..e45d74345d446df9966d4320dd7f399f0fde34d5 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -7,4 +7,11 @@ callPackage ./generic.nix (args // rec{ url = "http://downloads.xiph.org/releases/celt/celt-${version}.tar.gz"; sha256 = "0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw"; }; + + # Don't build tests due to badness with ec_ilog + prePatch = '' + substituteInPlace Makefile.in \ + --replace 'SUBDIRS = libcelt tests' \ + 'SUBDIRS = libcelt' + ''; }) diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 4ab554561f73bfed442da0ab256ebbed1f353cc7..9d861f2c4328e0eba073ee080a920861eabb9e00 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -1,5 +1,6 @@ { stdenv, version, src , liboggSupport ? true, libogg ? null # if disabled only the library will be built +, prePatch ? "" , ... }: @@ -10,6 +11,8 @@ stdenv.mkDerivation rec { inherit src; + inherit prePatch; + buildInputs = [] ++ stdenv.lib.optional liboggSupport libogg; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 77e0cb7735d9805302c2d41c5744cd8bf21e2663..1e2017ef0e7f2f37972c19f9328ef6c89594fd6a 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -12,11 +12,11 @@ assert runTests -> google-gflags != null; stdenv.mkDerivation rec { name = "ceres-solver-${version}"; - version = "1.12.0"; + version = "1.14.0"; src = fetchurl { url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; - sha256 = "15f8mwhcy9f5qggcc9dqwl5y687ykvmlidr686aqdq0ia7azwnvl"; + sha256 = "13lfxy8x58w8vprr0nkbzziaijlh0vvqshgahvcgw0mrqdgh0i27"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 93c187ec35ef2058648bedf7159a95c2e3119e49..ecf5fb1f02fd2bce7cb6fc994352db9350d18439 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation { - name = "cfitsio-3.41"; + name = "cfitsio-3.430"; src = fetchurl { - url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3410.tar.gz"; - sha256 = "0k3knn5hz1vhzzvm46xa1y6fnpliwkwgw76lnkf4amcnl5zaqmm5"; + url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3430.tar.gz"; + sha256 = "07fghxh5fl8nqk3q0dh8rvc83npnm0hisxzcj16a6r7gj5pmp40l"; }; # Shared-only build diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 1db991f63feea663e602b071e9042e34a8db26eb..ddaf022edfd409803dc1220e17d6571abd4f534a 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "check-${version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; - sha256 = "05jn1pgb7hqb937xky2147nnq3r4qy5wwr79rddpax3bms5a9xr4"; + sha256 = "0d22h8xshmbpl9hba9ch3xj8vb9ybm5akpsbbh7yj07fic4h2hj6"; }; # Test can randomly fail: http://hydra.nixos.org/build/7243912 diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 2c50d8138057699c0d685a428c90dbbfa4f91205..ad233402f1982761c9796c3dbfc6eb6937e553e3 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, freeglut, mesa, glfw2, glew, libX11, xproto +{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xproto , inputproto, libXi, libXmu }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = - [ freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; + [ freeglut libGLU_combined glfw2 glew libX11 xproto inputproto libXi libXmu ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index b26327dd77545270fd229213809fdf8b8f1a4394..7c44c2e0ab0cf017e46002dedb8cc63beb11ea4f 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: +{stdenv, fetchFromGitHub, SDL, libGLU_combined, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { version = "1.2.3"; diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..31af3758782119f22dc810b231cd6c8b48e41f0d --- /dev/null +++ b/pkgs/development/libraries/clipper/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, ninja, unzip }: + +stdenv.mkDerivation rec { + version = "6.4.2"; + name = "Clipper-${version}"; + src = fetchurl { + url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip"; + sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1"; + }; + + sourceRoot = "cpp"; + + buildInputs = [ ]; + + nativeBuildInputs = [ cmake ninja unzip ]; + + meta = with stdenv.lib; { + longDescription = '' + The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or, + and line & polygon offsetting. The library is based on Vatti's clipping algorithm. + ''; + homepage = https://www.angusj.com/delphi/clipper.php; + license = licenses.boost; + maintainers = with maintainers; [ mpickering ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 9d7c9c4f30f853c174e619867d119f71a364e973..e39386dca3f43fb473f31b96fc3272c345c4bdfb 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "C/C++ library for numbers, a part of GiNaC"; homepage = http://www.ginac.de/CLN/; maintainers = [ ]; - platforms = with stdenv.lib.platforms; allBut cygwin; + platforms = stdenv.lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index 2c49e0363589f0cc6074df1a7ab59b081b2bf20b..442b115a408221f41a05858824f2976a4217735d 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = with stdenv.lib.platforms; allBut cygwin; + platforms = stdenv.lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix index ccd938283199d34f4913f3821425b96d272de307..fa4e19f716ae8917d3b71f4b3e261221eccfa549 100644 --- a/pkgs/development/libraries/cloog/0.18.0.nix +++ b/pkgs/development/libraries/cloog/0.18.0.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = with stdenv.lib.platforms; allBut cygwin; + platforms = stdenv.lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 5da29273a8be731449a5c50d27948f2afc33ec6e..902e0b26687b9914f443e5c518ed8958727524cd 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = with stdenv.lib.platforms; allBut cygwin; + platforms = stdenv.lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 2b5f7069681c0253298a6f7896ab00ff246bf49f..962ca9ff9b53659070a4a2e7a58ecb7365d13e69 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,13 +1,14 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }: +{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3 }: -stdenv.mkDerivation rec { - major = "3.0"; - minor = "24"; - name = "clutter-gst-${major}.${minor}"; +let + pname = "clutter-gst"; + version = "3.0.26"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz"; - sha256 = "0v6cg0syh4vx7y7ni47jsvr2r57q0j3h1f1gjlp0ciscixywiwg9"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq"; }; propagatedBuildInputs = [ clutter gtk3 glib cogl ]; @@ -15,6 +16,12 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "GStreamer bindings for clutter"; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index bada2c2c709c3f1c0ed2b24609a4183d1ae89124..71789b45a283493f77c3d845c11af47a7aa6136a 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,12 +1,13 @@ -{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: - +{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3, gnome3 }: +let + pname = "clutter-gtk"; + version = "1.8.4"; +in stdenv.mkDerivation rec { - major = "1.8"; - minor = "4"; - name = "clutter-gtk-${major}.${minor}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; }; @@ -15,6 +16,12 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "Clutter-GTK"; homepage = http://www.clutter-project.org/; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 3292c8e353fe56b508b127bc9c5706573fc41aad..eba94288e8fe079b39a25f34a9654fb899711205 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,31 +1,37 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, -gobjectIntrospection, gtk3 +{ stdenv, fetchurl, glib, pkgconfig, libGLU_combined, libX11, libXext, libXfixes +, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib, +gobjectIntrospection, gtk3, gnome3 }: let - ver_maj = "1.26"; - ver_min = "2"; + pname = "clutter"; + version = "1.26.2"; in stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7"; }; buildInputs = [ gtk3 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection libxcb + [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango + atk json-glib gobjectIntrospection libxcb ]; configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK #doCheck = true; # no tests possible without a display + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "Library for creating fast, dynamic graphical user interfaces"; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 5fdd1edfd972c293c9c3b3c0f6d2df6edbb599d4..81df7e8631936328a80c392209fdc94b4a8612c5 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.27.1"; + version = "0.28.3"; name = "cmark-${version}"; src = fetchFromGitHub { owner = "jgm"; repo = "cmark"; rev = version; - sha256 = "06miwq3rl2bighkn6iq7bdwzmvcqa53qwpa0pqjqa8yn44j8ijj8"; + sha256 = "1lal6n6q7l84njgdcq1xbfxan56qlvr8xaw9m2jbd0jk4y2wkczg"; }; nativeBuildInputs = [ cmake ]; - doCheck = true; + doCheck = !stdenv.isDarwin; checkPhase = '' export LD_LIBRARY_PATH=$(readlink -f ./src) CTEST_OUTPUT_ON_FAILURE=1 make test diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index a13b42a08a8f6425d801be6d58253e6b95638574..cb4f3e39aefa7389e703cd767f2ecc7f2f5ff314 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cminpack-1.3.4"; + name = "cminpack-1.3.6"; src = fetchurl { url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz"; - sha256 = "1jh3ymxfcy3ykh6gnvds5bbkf38aminvjgc8halck356vkvpnl9v"; + sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw"; }; patchPhase = '' diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 1ac34f7608bc320302dba721c0a81555d89eb1d9..e06c71c15db4ffc367bb9078cc62eef1e58a1d2d 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland +{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl +, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3 +, mesa_noglu , gstreamerSupport ? true, gst_all_1 }: let - ver_maj = "1.22"; - ver_min = "2"; -in -stdenv.mkDerivation rec { - name = "cogl-${ver_maj}.${ver_min}"; + pname = "cogl"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "1.22.2"; src = fetchurl { - url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libintl ]; configureFlags = [ "--enable-introspection" @@ -25,10 +25,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection wayland - mesa_noglu libXrandr libXfixes libXcomposite libXdamage + glib gdk_pixbuf gobjectIntrospection wayland mesa_noglu + libGL libXrandr libXfixes libXcomposite libXdamage ] - ++ libintlOrEmpty ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; @@ -38,10 +37,14 @@ stdenv.mkDerivation rec { = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - #doCheck = true; # all tests fail (no idea why) + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "A small open source library for using 3D graphics hardware for rendering"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index ce78a6fc1347083bdaad3ce95876a77baa0ebaf4..442ed2a4b9a5a085590c9abb6075a6c38972b19f 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mesa }: +{ fetchurl, stdenv, libGLU_combined }: stdenv.mkDerivation rec { name = "coin3d-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ./sbhashentry.patch ]; - buildInputs = [ mesa ]; + buildInputs = [ libGLU_combined ]; meta = { homepage = http://www.coin3d.org/; diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix index 95af4d94cf5f747813cd93ff5c6f7b121d2e8c71..3257dfe5d37c2f8b2cccfd20bac0f3dc0713ba09 100644 --- a/pkgs/development/libraries/confuse/default.nix +++ b/pkgs/development/libraries/confuse/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "confuse-2.7"; + name = "confuse-${version}"; + version = "3.2.1"; src = fetchurl { - url = "mirror://savannah/confuse/${name}.tar.gz"; - sha256 = "0y47r2ashz44wvnxdb18ivpmj8nxhw3y9bf7v9w0g5byhgyp89g3"; + url = "https://github.com/martinh/libconfuse/releases/download/v${version}/${name}.tar.xz"; + sha256 = "0pnjmlj9i0alp407qd7c0vq83sz7gpsjrbdgpcn4xvzjp9r35ii3"; }; meta = { diff --git a/pkgs/development/libraries/cpp-gsl/default.nix b/pkgs/development/libraries/cpp-gsl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..833275c72bd0c8c81dda43dca329e42f4f361eca --- /dev/null +++ b/pkgs/development/libraries/cpp-gsl/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, catch }: + +stdenv.mkDerivation rec { + pname = "GSL-unstable"; + version = "2017-02-15"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "Microsoft"; + repo = "GSL"; + rev = "c87c123d1b3e64ae2cf725584f0c004da4d90f1c"; + sha256 = "0h8py468bvxnydkjs352d7a9s8hk0ihc7msjkcnzj2d7nzp5nsc1"; + }; + + NIX_CFLAGS_COMPILE = "-Wno-error=sign-conversion"; + nativeBuildInputs = [ cmake catch ]; + + meta = with stdenv.lib; { + homepage = https://github.com/Microsoft/GSL; + description = "C++ Core Guideline support library"; + longDescription = '' + The Guideline Support Library (GSL) contains functions and types that are suggested for + use by the C++ Core Guidelines maintained by the Standard C++ Foundation. + This package contains Microsoft's implementation of GSL. + ''; + platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ yuriaisaka ]; + }; +} diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index ecc730597c3148ec15fd93239364027b63094b5f..e5391e7100d53db016ee246c813b929e3946426c 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { homepage = http://cpp-netlib.org; license = licenses.boost; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 72fa309b721f28409c0a2cf1806c80902956d26e..07c6e1490e7e2dbc5b3538642aea65ff8e7618ea 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, sqlite, libmysql, postgresql, unixODBC }: +{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }: stdenv.mkDerivation rec { name = "cppdb"; @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake sqlite libmysql postgresql unixODBC ]; + buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ]; cmakeFlags = [ "--no-warn-unused-cli" ]; + NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; meta = with stdenv.lib; { homepage = http://cppcms.com/sql/cppdb/; @@ -23,4 +24,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.juliendehos ]; }; } - diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 301b245a9f54b53f93cb6e9918c93d54fa3a472b..9933d1034af8c9f1facbf088d681deccdcc226dc 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "4.2.1"; + version = "4.2.3"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "0hy8yxb22siimq0pf6jq6kdp9lvi5f6al1xd12c9i1jyajhp1lhk"; + sha256 = "1yjs25ra5s8zs0rhk50w3f1rrrl80hhq784lwdhh1m3risk740sa"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index d316b5bf2d1e1103f0ee8b90d6beaba91d7c6a72..aa8b4231a86986556dbd80230420002f680d7461 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libintlOrEmpty, zlib, gettext }: +{ stdenv, fetchurl, zlib, gettext }: stdenv.mkDerivation rec { name = "cracklib-2.9.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0hrkb0prf7n92w6rxgq0ilzkk6rkhpys2cfqkrbzswp27na7dkqp"; }; - buildInputs = [ libintlOrEmpty zlib gettext ]; + buildInputs = [ zlib gettext ]; meta = with stdenv.lib; { homepage = https://github.com/cracklib/cracklib; diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8f66b65e49acee6c0432749c9fc957eda66ee141 --- /dev/null +++ b/pkgs/development/libraries/csfml/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, sfml }: + +let + version = "2.4"; +in + +stdenv.mkDerivation { + name = "csfml-${version}"; + src = fetchFromGitHub { + owner = "SFML"; + repo = "CSFML"; + rev = "b5facb85d13bff451a5fd2d088a97472a685576c"; + sha256 = "1q716gd7c7jlxzwpq5z4rjj5lsrn71ql2djphccdf9jannllqizn"; + }; + buildInputs = [ cmake sfml ]; + cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ]; + + meta = with stdenv.lib; { + homepage = http://www.sfml-dev.org/; + description = "Simple and fast multimedia library"; + longDescription = '' + SFML is a simple, fast, cross-platform and object-oriented multimedia API. + It provides access to windowing, graphics, audio and network. + It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python. + ''; + license = licenses.zlib; + maintainers = [ maintainers.jpdoyle ]; + + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index c1579b71748440999a251c7da627703836427d7b..c1c867abcdf58b4555f096f2162c168676fd3ed2 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl ]; meta = with stdenv.lib; { - homepage = http://josephp91.github.io/curlcpp/; + homepage = https://josephp91.github.io/curlcpp/; description = "Object oriented C++ wrapper for CURL"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index eb19283caeaf3201c82152045f50a5c0ce83b7a4..ba1d02380e2921ec75f8ea469009994b2951d15a 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ Unit Testing Easy Environment"; - homepage = http://codesink.org/cutee_unit_testing.html; + homepage = http://www.codesink.org/cutee_unit_testing.html; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 68398e93764c089dec04463fbe3f6c2e06fd8e4f..7a9e3991aadb52540f7f15436f4e864bed57e0b1 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { patches = [ ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 - (fetchpatch { # CVE-2013-4122 + (fetchpatch { + name = "CVE-2013-4122.patch"; url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff"; sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2"; }) diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix index 0b4aeeb0801de53b6d43a511c4534799dbc15b6f..9c9d8513422423fac6176a4154ab928fd7785a9d 100644 --- a/pkgs/development/libraries/czmq/3.x.nix +++ b/pkgs/development/libraries/czmq/3.x.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb"; }; + patches = [ ./czmq3-gcc7.patch ]; + # Fix build on Glibc 2.24. NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix index 971d15686cab5c9b99ec2557532ab9f904a330da..840fa34d6ae1bab919df8aa9ca07988ab74d0ead 100644 --- a/pkgs/development/libraries/czmq/4.x.nix +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zeromq }: +{ stdenv, fetchurl, fetchpatch, zeromq }: stdenv.mkDerivation rec { version = "4.0.2"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "12gbh57xnz2v82x1g80gv4bwapmyzl00lbin5ix3swyac8i7m340"; }; + patches = [ + (fetchpatch { + url = https://patch-diff.githubusercontent.com/raw/zeromq/czmq/pull/1618.patch; + sha256 = "1dssy7k0fni6djail8rz0lk8p777158jvrqhgn500i636gkxaxhp"; + }) + ]; + # Needs to be propagated for the .pc file to work propagatedBuildInputs = [ zeromq ]; diff --git a/pkgs/development/libraries/czmq/czmq3-gcc7.patch b/pkgs/development/libraries/czmq/czmq3-gcc7.patch new file mode 100644 index 0000000000000000000000000000000000000000..4ab14685a6c19d77f06b6f2356dda89f5ff14b1f --- /dev/null +++ b/pkgs/development/libraries/czmq/czmq3-gcc7.patch @@ -0,0 +1,26 @@ +diff --git a/src/zgossip_engine.inc b/src/zgossip_engine.inc +index 37dbb4eb..727aaa9b 100644 +--- a/src/zgossip_engine.inc ++++ b/src/zgossip_engine.inc +@@ -258,7 +258,7 @@ engine_set_log_prefix (client_t *client, const char *string) + { + if (client) { + s_client_t *self = (s_client_t *) client; +- snprintf (self->log_prefix, sizeof (self->log_prefix) - 1, ++ snprintf (self->log_prefix, sizeof (self->log_prefix), + "%6d:%-33s", self->unique_id, string); + } + } +diff --git a/src/zsys.c b/src/zsys.c +index 4d0bb8a1..f07db9c8 100644 +--- a/src/zsys.c ++++ b/src/zsys.c +@@ -1071,7 +1071,7 @@ zsys_run_as (const char *lockfile, const char *group, const char *user) + } + } + // We record the current process id in the lock file +- char pid_buffer [10]; ++ char pid_buffer [32]; + snprintf (pid_buffer, sizeof (pid_buffer), "%6d\n", getpid ()); + if (write (handle, pid_buffer, strlen (pid_buffer)) != strlen (pid_buffer)) { + zsys_error ("cannot write to lockfile: %s", strerror (errno)); diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index ee7afbbf25221b7a21793dcb2c5c7496b8807ba3..051405811438009cdc07d44661b05ea3ed842ab7 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -10,11 +10,26 @@ stdenv.mkDerivation rec { sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw"; }; - patches = [( fetchurl { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/dbus-c%2B%2B/files/dbus-c%2B%2B-0.9.0-gcc-4.7.patch; - name = "gcc-4.7.patch"; - sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g"; - })]; + patches = [ + (fetchurl { + name = "gcc-4.7.patch"; + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/" + + "dbus-c%2B%2B/files/dbus-c%2B%2B-0.9.0-gcc-4.7.patch"; + sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g"; + }) + (fetchurl { + name = "writechar.patch"; # since gcc7 + url = "https://src.fedoraproject.org/cgit/rpms/dbus-c++.git/plain/" + + "dbus-c++-writechar.patch?id=7f371172f5c"; + sha256 = "1kkg4gbpm4hp87l25zw2a3r9c58g7vvgzcqgiman734i66zsbb9l"; + }) + (fetchurl { + name = "threading.patch"; # since gcc7 + url = "https://src.fedoraproject.org/cgit/rpms/dbus-c++.git/plain/" + + "dbus-c++-threading.patch?id=7f371172f5c"; + sha256 = "1h362anx3wyxm5lq0v8girmip1jmkdbijrmbrq7k5pp47zkhwwrq"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus glib expat ]; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index aa2af9a2ebc3f745cbe120ffed8b130969a1d3e0..55484b85a8e683c272140da81bc5cdc17b876573 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.24"; - sha256 = "06ydmrg76l1kwl3190d72zpiy3qxy248x6gskxbj9qiqfsr4w63i"; + version = "1.12.6"; + sha256 = "05picaq8j60wlwyi84qvw5liw3nd0cws9va3krnc3pms0wm906v2"; self = stdenv.mkDerivation { name = "dbus-${version}"; diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index 71da22ee37483f738ea33726f1e1ca7ffdbf1cb0..b5bf2b230007f8b36d896ddd54f90ffe2f630cf5 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -24,16 +24,17 @@ runCommand "dbus-1" rewritePrefix="file://${dbus}/share/xml/dbus/"/> ''; + nativeBuildInputs = [ libxslt.bin ]; } '' mkdir -p $out - ${libxslt.bin}/bin/xsltproc --nonet \ + xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ --stringparam suidHelper "$suidHelper" \ ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \ > $out/system.conf - ${libxslt.bin}/bin/xsltproc --nonet \ + xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \ > $out/session.conf diff --git a/pkgs/development/libraries/dbus/make-system-conf.xsl b/pkgs/development/libraries/dbus/make-system-conf.xsl index 3d8b823437d680fd4be5411fafeebb9f65e2a5f0..dd644b4bce7c5c987f7aa4a340e020307672f961 100644 --- a/pkgs/development/libraries/dbus/make-system-conf.xsl +++ b/pkgs/development/libraries/dbus/make-system-conf.xsl @@ -27,6 +27,7 @@ /share/dbus-1/system-services /etc/dbus-1/system.d + /share/dbus-1/system.d diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix index 7cb7187a3ceb83bd1183dd6fa6ef32f6f7af7d92..5b05d64f0727ba38ff56cd99972f1bebca5b020e 100644 --- a/pkgs/development/libraries/dirac/default.nix +++ b/pkgs/development/libraries/dirac/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "A general-purpose video codec based on wavelets"; platforms = platforms.linux; license = with licenses; [ mpl11 gpl2 lgpl21 ]; - maintainer = maintainers.igsha; + maintainers = [ maintainers.igsha ]; }; } diff --git a/pkgs/development/libraries/dleyna-core/setup-hook.sh b/pkgs/development/libraries/dleyna-core/setup-hook.sh index 046a77d5a4dd3c4659df7da600239d1d198d63b9..87b5c67dff581196fb188a8523665320e9eb83b1 100644 --- a/pkgs/development/libraries/dleyna-core/setup-hook.sh +++ b/pkgs/development/libraries/dleyna-core/setup-hook.sh @@ -5,5 +5,4 @@ addDleynaConnectorPath () { fi } -envHooks+=(addDleynaConnectorPath) - +addEnvHooks "$targetOffset" addDleynaConnectorPath diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index b9b8d8fbd75066edf34564816e67f04500a28d2e..176b05126b2be8652ca364554c4c6b1095ebda1f 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp_av, gupnp_dlna, libsoup, makeWrapper }: +{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup, makeWrapper }: stdenv.mkDerivation rec { name = "dleyna-renderer"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp_av gupnp_dlna libsoup ]; + buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; preFixup = '' wrapProgram "$out/libexec/dleyna-renderer-service" \ diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 8668cff644ed24d2d7f4e4c105fd7e2ce7b4ddc0..d36e665bd85db101f362763ac3de5f9843796fdc 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp_av, gupnp_dlna, libsoup }: +{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }: stdenv.mkDerivation rec { name = "dleyna-server"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp_av gupnp_dlna libsoup ]; + buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; preFixup = '' wrapProgram "$out/libexec/dleyna-server-service" \ diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 61932b29e62ccdbed50fd788fdbf23a77891d6ef..eaae1f7ecdad680ee96262d278647db929553af1 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "19.6"; + version = "19.9"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "1nlx4z53jnk7wysaxrzbyyqb65m45rw4g1fagazl2jvwh1qn49ds"; + sha256 = "0lc54r928j9dg7f2wn25m887z24d31wrc14v2hn6aknp1z084lrc"; }; postPatch = '' @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.dlib.net; license = licenses.boost; maintainers = with maintainers; [ christopherpoole ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 47c165c1bad1acffebf5bb3301aafd1c09f7ec3d..7a33559cbc7958fe1712ecb7f5feb7169a7e5766 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, lib, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "double-conversion-${version}"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b"; + sha256 = "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz"; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + # Case sensitivity issue + preConfigure = lib.optionalString stdenv.isDarwin '' + rm BUILD + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index a46c6bab64794533d6c31167381bcdb9b800a4b0..ab25a651844a5e64384732053a8b45aeb2e3afcd 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.1.0"; + version = "1.1.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2"; - sha256 = "13pkfqrav30bbcddgf1imd7jk6lpqbxkz1qv31718pdl446jq7df"; + sha256 = "0avwxr6n9ra7narxc5lmkhdqi8ix10gmif8rpd06wp4g9iv46xrn"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index fe14a1b2b77cef4e3641f0de47e6e9e1d960ecd3..8c6337cfaf60aa2acb37e04ee5d42e134d7a28d5 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -1,18 +1,26 @@ +# To use this package with a CMake and pkg-config build: +# pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp) +# add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { name = "easyloggingpp-${version}"; - version = "9.95.0"; + version = "9.96.4"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "0gzmznw6ffag9x55lixxffy6x7mvb7691x0md4q9rbh88zkws7kq"; + sha256 = "0l0b8cssxkj0wlfqjj8hfnfvrjcxa81h947d54w86iadrilrsprb"; }; + nativeBuildInputs = [cmake]; buildInputs = [gtest]; - cmakeFlags = [ "-Dtest=ON" "-Dbuild_static_lib=ON"]; + cmakeFlags = [ "-Dtest=ON" ]; NIX_CFLAGS_COMPILE = "-std=c++11" + stdenv.lib.optionalString stdenv.isLinux " -pthread"; + postInstall = '' + mkdir -p $out/include + cp ../src/easylogging++.cc $out/include + ''; meta = { description = "C++ logging library"; homepage = https://muflihun.github.io/easyloggingpp/; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 672fed2f015a07c7d23cce71b0b9bfbe467293c8..49dcb31c0478b23660b224a4b6923fcb166292e9 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.2.0"; + version = "2.7.0"; src = fetchurl { - url = https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-2.2.0-Source.tar.gz; - sha256 = "1hzl0akjfxphqivnaj2kg131w8ki80ba3872h0a45f4pchci4h8s"; + url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; + sha256 = "0slfim64wdyd97nwv7ry0xwhiarphl93ij2v19c8a1c0dz7ld3qi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix index 94652b12934529866cf454deaa8a081ac2d4901b..5d13fb09dccaeb8a6460dc65763a736a6d949e82 100644 --- a/pkgs/development/libraries/eigen/3.3.nix +++ b/pkgs/development/libraries/eigen/3.3.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - version = "3.3.3"; + version = "3.3.4"; in stdenv.mkDerivation { name = "eigen-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; - sha256 = "0pz7k8kd9nydmsj2prjs67apixipl6pll3f0cjy0y3bvlazqr1wl"; + sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5287db756094c182b871eabedc8b68bffb7703fc --- /dev/null +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: + +stdenv.mkDerivation { + name = "elementary-cmake-modules"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "cmake-modules"; + rev = "319ec5336e9f05f3f22b886cc2053ef3d4b6599e"; + sha256 = "191hhvdxyqvh9axzndaqld7vrmv7xkn0czks908zhb2zpjhv9rby"; + }; + + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake" + ''; + + propagatedBuildInputs = [ cmake pkgconfig ]; + + setupHook = ./setup-hook.sh; + + meta = with lib; { + platforms = platforms.linux ++ platforms.darwin; + homepage = https://github.com/elementary/cmake-modules; + license = licenses.gpl3Plus; + maintainers = [ maintainers.samdroid-apps ]; + }; +} diff --git a/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh b/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..6408ac471577a18d2732d254d78d1f4e92bd50a2 --- /dev/null +++ b/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh @@ -0,0 +1,4 @@ +_elementaryCMakeEnvHook() { + cmakeFlagsArray+=(-DCMAKE_MODULE_PATH=@out@/lib/cmake) +} +addEnvHooks "$targetOffset" _elementaryCMakeEnvHook diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..458b23c33e94a0f4c19f3d3950b0ecb266159f89 --- /dev/null +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }: + +let + version = "2.2.3"; + pname = "enchant"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib hunspell ]; + propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file + + meta = with stdenv.lib; { + description = "Generic spell checking library"; + homepage = https://abiword.github.io/enchant/; + license = licenses.lgpl21Plus; # with extra provision for non-free checkers + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 18ce05af07a8f58059f3e7d0fa94c56c786e5f61..e0f8e9ff8c7642090638eaad845bf5e1ea8f897c 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -1,29 +1,35 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python -, mesa, libX11 +, libGL, libX11 }: +with stdenv.lib; + stdenv.mkDerivation rec { name = "epoxy-${version}"; - version = "1.3.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "anholt"; repo = "libepoxy"; - rev = "v${version}"; - sha256 = "0dfkd4xbp7v5gwsf6qwaraz54yzizf3lj5ymyc0msjn0adq3j5yl"; + rev = "${version}"; + sha256 = "1ixpqb10pmdy3n9nxd5inflig9dal5502ggadcns5b58j6jr0yv0"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ]; - buildInputs = [ mesa libX11 ]; + buildInputs = [ libGL libX11 ]; - preConfigure = stdenv.lib.optional stdenv.isDarwin '' + preConfigure = optionalString stdenv.isDarwin '' substituteInPlace configure --replace build_glx=no build_glx=yes substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" ''; - meta = with stdenv.lib; { + patches = [ ./libgl-path.patch ]; + + NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"''; + + meta = { description = "A library for handling OpenGL function pointer management"; homepage = https://github.com/anholt/libepoxy; license = licenses.mit; diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/epoxy/libgl-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..6f50b9d262b50c33ba07bec1d78904d6bbb791a2 --- /dev/null +++ b/pkgs/development/libraries/epoxy/libgl-path.patch @@ -0,0 +1,35 @@ +From 4046e0ac8ed93354c01de5f3b5cae790cce70404 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 29 Mar 2018 07:21:02 -0500 +Subject: [PATCH] Explicitly search LIBGL_PATH as fallback, if defined. + +--- + src/dispatch_common.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/dispatch_common.c b/src/dispatch_common.c +index bc2fb94..776237b 100644 +--- a/src/dispatch_common.c ++++ b/src/dispatch_common.c +@@ -306,6 +306,18 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail) + pthread_mutex_lock(&api.mutex); + if (!*handle) { + *handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL); ++#ifdef LIBGL_PATH ++ if (!*handle) { ++ char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1]; ++ int l = snprintf(pathbuf, sizeof(pathbuf), "%s/%s", LIBGL_PATH, lib_name); ++ if (l < 0 || l >= sizeof(pathbuf)) { ++ // This really shouldn't happen ++ fprintf(stderr, "Error prefixing library pathname\n"); ++ exit(1); ++ } ++ *handle = dlopen(pathbuf, RTLD_LAZY | RTLD_LOCAL); ++ } ++#endif + if (!*handle) { + if (exit_on_fail) { + fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror()); +-- +2.16.3 + diff --git a/pkgs/development/libraries/esdl/default.nix b/pkgs/development/libraries/esdl/default.nix index af8258a019669d11eba03f763a0ff20dadc29265..7b40359837a3780940077a2e6bafbf6b5d436a9b 100644 --- a/pkgs/development/libraries/esdl/default.nix +++ b/pkgs/development/libraries/esdl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, mesa, rebar, erlang}: +{stdenv, fetchurl, SDL, libGLU_combined, rebar, erlang}: stdenv.mkDerivation rec { name = "esdl-1.3.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ erlang rebar ]; - propagatedBuildInputs = [ SDL mesa ]; + propagatedBuildInputs = [ SDL libGLU_combined ]; buildPhase = '' rebar compile diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index b486a327466d9048f2b4a21d5b05e6e77ba5bd1c..1f58fd698da3c74a76ae7124be46b3fa4d07a630 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { - name = "exempi-2.4.2"; + name = "exempi-2.4.5"; src = fetchurl { url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; - sha256 = "1v665fc7x0yi7x6lzskvd8bd2anf7951svn2vd5384dblmgv43av"; + sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; }; configureFlags = [ diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index a1a07b43197ff237bf2dfd18da8f3b44d7d7ce82..7f5f190351791edce02f9bd008cf1b8de526df72 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -7,6 +7,24 @@ stdenv.mkDerivation rec { url = "http://www.exiv2.org/builds/${name}-trunk.tar.gz"; sha256 = "1yza317qxd8yshvqnay164imm0ks7cvij8y8j86p1gqi1153qpn7"; }; + + patches = [ + (fetchurl rec { + name = "CVE-2017-9239.patch"; + url = let patchname = "0006-1296-Fix-submitted.patch"; + in "https://src.fedoraproject.org/lookaside/pkgs/exiv2/${patchname}" + + "/sha512/${sha512}/${patchname}"; + sha512 = "3f9242dbd4bfa9dcdf8c9820243b13dc14990373a800c4ebb6cf7eac5653cfef" + + "e6f2c47a94fbee4ed24f0d8c2842729d721f6100a2b215e0f663c89bfefe9e32"; + }) + (fetchpatch { + # many CVEs - see https://github.com/Exiv2/exiv2/pull/120 + url = "https://patch-diff.githubusercontent.com/raw/Exiv2/exiv2/pull/120.patch"; + sha256 = "1szl22xmh12hibzaqf2zi8zl377x841m52x4jm5lziw6j8g81sj8"; + excludes = [ "test/bugfixes-test.sh" ]; + }) + ]; + postPatch = "patchShebangs ./src/svn_version.sh"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 01f3c11ac737091e5d5f207fd56368668e4ad069..e341ce842eb66f2f44e8cc3ca32e2d87814a72c3 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputMan = "dev"; # tiny page for a dev tool - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = true; # not cross; preCheck = '' patchShebangs ./run.sh diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 554337860028b8b1e482ca8d57a27e68846c96d4..5169688614820ccb47217539954209fd3f088572 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -8,11 +8,11 @@ assert mp4v2Support -> (mp4v2 != null); with stdenv.lib; stdenv.mkDerivation rec { name = "faac-${version}"; - version = "1.29.3"; + version = "1.29.9.2"; src = fetchurl { url = "mirror://sourceforge/faac/${name}.tar.gz"; - sha256 = "0gssrz2vq52mj8x2hvdqc9bwkp64s4f4g7yj7ac6dwxs8dw8kwnf"; + sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl"; }; configureFlags = [ ] @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optional mp4v2Support mp4v2; + enableParallelBuilding = true; + meta = { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; homepage = http://www.audiocoding.com/faac.html; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 865bedf09ba2639c61d5fdc648b0f5b020fb650e..04a6b9c53545173cb08dc04bdb733e138a0b1658 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -5,10 +5,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "faad2-${version}"; - version = "2.7"; + version = "2.8.8"; src = fetchurl { - url = "mirror://sourceforge/faac/${name}.tar.bz2"; + url = "mirror://sourceforge/faac/${name}.tar.gz"; sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; }; diff --git a/pkgs/development/libraries/facile/default.nix b/pkgs/development/libraries/facile/default.nix deleted file mode 100644 index 4050bdfd9eb04f8fe01b17aeb2f76ad4e1de0fcb..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/facile/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, ocaml }: - -stdenv.mkDerivation rec { - name = "facile-1.1"; - - src = fetchurl { - url = "${meta.homepage}/distrib/${name}.tar.gz"; - sha256 = "1jp59ankjds8mh4vm0b5h4fd1lcbfn0rd6n151cgh14ihsknnym8"; - }; - - dontAddPrefix = 1; - - patches = [ ./ocaml_4.xx.patch ]; - - postPatch = "sed -e 's@mkdir@mkdir -p@' -i Makefile"; - - postConfigure = "make -C src .depend"; - - makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile"; - - buildInputs = [ ocaml ]; - - meta = { - homepage = http://www.recherche.enac.fr/log/facile; - license = "LGPL"; - description = "A Functional Constraint Library"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/facile/ocaml_4.xx.patch b/pkgs/development/libraries/facile/ocaml_4.xx.patch deleted file mode 100644 index 429405fabdaa9f994c5f6b7da3ecb2db46deac48..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/facile/ocaml_4.xx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN facile-1.1/src/fcl_data.ml facile-1.1-patched//src/fcl_data.ml ---- facile-1.1/src/fcl_data.ml 2004-09-08 11:51:02.000000000 +0200 -+++ facile-1.1-patched//src/fcl_data.ml 2012-12-16 13:49:36.286722670 +0100 -@@ -16,7 +16,7 @@ end - - module Hashtbl = struct - type ('a, 'b) t = ('a, 'b) Hashtbl.t -- let create = Hashtbl.create -+ let create x = Hashtbl.create x - let get h = h - - let add h k d = diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index 3f309f06630b7a3578295f895044bf291e95d934..7c0addea5e8b70eca9fdb13ddde4f0b991425607 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 = "3"; + version = "4"; src = fetchgit { - url = "http://git.suckless.org/farbfeld"; + url = "https://git.suckless.org/farbfeld"; rev = "refs/tags/${version}"; - sha256 = "1k9cnw2zk9ywcn4hibf7wgi4czwyxhgjdmia6ghpw3wcz8vi71xl"; + sha256 = "0pkmkvv5ggpzqwqdchd19442x8gh152xy5z1z13ipfznhspsf870"; }; buildInputs = [ libpng libjpeg ]; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 034738813395c08bc810b03854915db00af2af7e..020d04542864a31d6283fb84287add1b915ae67a 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base -, gst-python, gupnp_igd +, gst-python, gupnp-igd, gobjectIntrospection , gst-plugins-good, gst-plugins-bad, gst-libav }: @@ -7,21 +7,25 @@ let inherit (pythonPackages) python pygobject2; in stdenv.mkDerivation rec { name = "farstream-0.2.8"; + + outputs = [ "out" "dev" ]; + src = fetchurl { - url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz"; + url = "https://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz"; sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb"; }; - buildInputs = [ libnice python pygobject2 gupnp_igd libnice ]; + buildInputs = [ libnice python pygobject2 gupnp-igd libnice ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - propagatedBuildInputs = [ gstreamer gst-plugins-base gst-python + propagatedBuildInputs = [ + gstreamer gst-plugins-base gst-python gst-plugins-good gst-plugins-bad gst-libav - ]; + ]; meta = { - homepage = http://www.freedesktop.org/wiki/Software/Farstream; + homepage = https://www.freedesktop.org/wiki/Software/Farstream; description = "Audio/Video Communications Framework formely known as farsight"; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e781e2aab838e090faabe6be947d5ff0eba8a103 --- /dev/null +++ b/pkgs/development/libraries/fastpbkdf2/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation { + name = "fastpbkdf2-1.0.0"; + + src = fetchFromGitHub { + owner = "ctz"; + repo = "fastpbkdf2"; + rev = "v1.0.0"; + sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2"; + }; + + buildInputs = [ openssl ]; + + preBuild = '' + makeFlagsArray=(CFLAGS="-std=c99 -O3 -g") + ''; + + installPhase = '' + mkdir -p $out/{lib,include/fastpbkdf2} + cp *.a $out/lib + cp fastpbkdf2.h $out/include/fastpbkdf2 + ''; + + meta = with stdenv.lib; { + description = "A fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C"; + homepage = https://github.com/ctz/fastpbkdf2; + license = licenses.cc0; + maintainers = with maintainers; [ ledif ]; + }; +} diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 59dc4721812c484f4b8348eb77387607bb307700..903f43b1e6854519db626118115b58ed147bc96b 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fdk-aac-${version}"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz"; - sha256 = "1msdkcf559agmpycd4bk0scm2s2h9jyzbnnw1yrfarxlcwm5jr11"; + sha256 = "1bfkpqba0v2jgxqwaf9xsrr63a089wckrir497lm6nbbmi11pdma"; }; configureFlags = [ ] diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 0e4e897e27a43daf03cb1e41c0cf0fb659079126..edea352ae2dd12e1b1d68afc19ad7217af4b2c8c 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fflas-ffpack"; - version = "2.2.2"; + version = "2.3.2"; src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd"; + sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index b50025aa108a4ed6bc1eaf99139cba58d226285a..db39be465485a871da4102c68b1769ca2a9b4e2d 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm +{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm , hostPlatform /* * Licensing options (yes some are listed twice, filters and such are not listed) @@ -102,7 +102,7 @@ #, opencl ? null # OpenCL code , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering -, openglExtlib ? false, mesa ? null # OpenGL rendering +, openglExtlib ? false, libGLU_combined ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder , openjpeg_1 ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null @@ -119,7 +119,7 @@ #, utvideo ? null # Ut Video de/encoder , vid-stab ? null # Video stabilization #, vo-aacenc ? null # AAC encoder -#, vo-amrwbenc ? null # AMR-WB encoder +, vo-amrwbenc ? null # AMR-WB encoder , wavpack ? null # Wavpack encoder , x264 ? null # H.264/AVC encoder , x265 ? null # H.265/HEVC encoder @@ -225,20 +225,21 @@ assert gnutls != null -> !opensslExtlib; assert libxcbshmExtlib -> libxcb != null; assert libxcbxfixesExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null; -assert openglExtlib -> mesa != null; +assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.4"; + version = "3.4.2"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "1vzvpx8ixy8m44f8qwp833hv253hpghybgzbc4n8b3div3j0dvmf"; + sha256 = "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib"; }; - patchPhase = ''patchShebangs . + prePatch = '' + patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c '' + stdenv.lib.optionalString (frei0r != null) '' @@ -379,7 +380,7 @@ stdenv.mkDerivation rec { #(enableFeature (utvideo != null && gplLicensing) "libutvideo") (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0 #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") - #(enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") + (enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") (enableFeature (wavpack != null) "libwavpack") (enableFeature (x264 != null && gplLicensing) "libx264") (enableFeature (x265 != null && gplLicensing) "libx265") @@ -404,8 +405,9 @@ stdenv.mkDerivation rec { libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr - samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib - ] ++ optional openglExtlib mesa + samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore + zeromq4 zlib + ] ++ optional openglExtlib libGLU_combined ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] @@ -438,7 +440,7 @@ stdenv.mkDerivation rec { crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.prefix}" + "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" "--target_os=${hostPlatform.parsed.kernel.name}" "--arch=${hostPlatform.arch}" diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 513654e98f74980c60329045531975fb9401da0c..98cbfdf43f6c8a4345ba23b504097e9070e60de7 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage +{ stdenv, callPackage, fetchpatch # Darwin frameworks , Cocoa, CoreMedia , ... @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4"; - sha256 = "0pn8g3ab937ahslqd41crk0g4j4fh7kwimsrlfc0rl0pc3z132ax"; + branch = "3.4.2"; + sha256 = "0nkq4451masmzlx3p4vprqwc0sl2iwqxbzjrngmvj29q4azp00zb"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 1bd8b7392601a9e6f70c02a37b68b925d3f26997..985f328a22dd96d9730a468f079a60f6bc21230a 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -3,7 +3,7 @@ , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus , hostPlatform -, openglSupport ? false, mesa ? null +, openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , multithreadBuild ? true # Multithreading via pthreads/win32 threads @@ -60,7 +60,7 @@ let vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm); in -assert openglSupport -> mesa != null; +assert openglSupport -> libGLU_combined != null; stdenv.mkDerivation rec { @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus - ] ++ optional openglSupport mesa + ] ++ optional openglSupport libGLU_combined ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isArm) libva ++ optional isLinux alsaLib @@ -173,9 +173,9 @@ stdenv.mkDerivation rec { crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.prefix}" + "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" - "--target_os=${hostPlatform.parsed.kernel}" + "--target_os=${hostPlatform.parsed.kernel.name}" "--arch=${hostPlatform.arch}" ]; }; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 5cf83752aa703e1a7c244b141746511f0080edc8..701209971074d0d5368e49a0ca447087da425647 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -5,7 +5,7 @@ with lib; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; let - version = "3.3.6-pl1"; + version = "3.3.7"; withDoc = stdenv.cc.isGNU; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; - sha256 = "0g8qk98lgq770ixdf7n36yd5xjsgm2v3wzvnphwmhy6r4y2amx0y"; + sha256 = "0wsms8narnbhfsa8chdflv2j9hzspvflblnqdn7hw8x5xdzrnq1v"; }; outputs = [ "out" "dev" "man" ] @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # all x86_64 have sse2 # however, not all float sizes fit ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" - ++ optional stdenv.cc.isGNU "--enable-openmp" + ++ optional (stdenv.cc.isGNU && !stdenv.hostPlatform.isMusl) "--enable-openmp" # doc generation causes Fortran wrapper generation which hard-codes gcc ++ optional (!withDoc) "--disable-doc"; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index add520558ba9d657858f88f1e4ae896281faab2d..fb74c4ff4d2441f92ec2f10917cde25c04792e00 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "flatbuffers-${version}"; - version = "1.4.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "0jsqk49h521d5h4c9gk39a8968g6rcd6520a8knbfc7ssc4028y0"; + sha256 = "1qq8qbv8wkiiizj8s984f17bsbjsrhbs9q1nw1yjgrw0grcxlsi9"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 94cc7688cc8b2f97c233018a1e390474339752e4..67bf7503db9879ecca1e4bed030e650d26403704 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -1,14 +1,51 @@ -{stdenv, fetchurl, gmp, mpir, mpfr, openblas, ntl}: +{ stdenv +, fetchurl +, fetchpatch +, gmp +, mpir +, mpfr +, ntl +, openblas ? null +, withBlas ? true +}: + +assert withBlas -> openblas != null; + stdenv.mkDerivation rec { name = "flint-${version}"; - version = "2.5.2"; - # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + version = "2.5.2"; # remove libflint.so.MAJOR patch when updating src = fetchurl { url = "http://www.flintlib.org/flint-${version}.tar.gz"; sha256 = "11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb"; }; - buildInputs = [gmp mpir mpfr openblas ntl]; - configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-blas=${openblas} --with-ntl=${ntl}"; + buildInputs = [ + gmp + mpir + mpfr + ntl + ] ++ stdenv.lib.optionals withBlas [ + openblas + ]; + propagatedBuildInputs = [ + mpfr # flint.h includes mpfr.h + ]; + configureFlags = [ + "--with-gmp=${gmp}" + "--with-mpir=${mpir}" + "--with-mpfr=${mpfr}" + "--with-ntl=${ntl}" + ] ++ stdenv.lib.optionals withBlas [ + "--with-blas=${openblas}" + ]; + patches = [ + (fetchpatch { + # Always produce libflint.so.MAJOR; will be included in the next flint version + # See https://github.com/wbhart/flint2/pull/347 + url = "https://github.com/wbhart/flint2/commit/49fbcd8f736f847d3f9667f9f7d5567ef4550ecb.patch"; + sha256 = "09w09bpq85kjf752bd3y3i5lvy59b8xjiy7qmrcxzibx2a21pj73"; + }) + ]; + doCheck = true; meta = { inherit version; description = ''Fast Library for Number Theory''; diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 483f02f823fd04d6f8a6e563b69ce4aef34c91ef..0b4172cdc764a0ed8409c089dadefc5b2336c040 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchFromGitHub, alsaLib }: stdenv.mkDerivation rec { - name = "flite-1.9.0"; + name = "flite-2.1.0"; - src = fetchurl { - url = "http://www.festvox.org/bard/${name}-current.tar.bz2"; - sha256 = "197cc2a1f045b1666a29a9b5f035b3d676db6db94a4439d99a03b65e551ae2e0"; + src = fetchFromGitHub { + owner = "festvox"; + repo = "flite"; + rev = "d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e"; + sha256 = "1kx43jvdln370590gfjhxxz3chxfi6kq18504wmdpljib2l0grjq"; }; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib ]; - configureFlags = '' - --enable-shared - ''; + configureFlags = [ + "--enable-shared" + "--with-audio=alsa" + ]; + + enableParallelBuilding = true; meta = { description = "A small, fast run-time speech synthesis engine"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index a1e4bb8274e0586e7510be92e7ca1bb7e6df5792..ddc962d0aab64292332fcc7e657f2d2a56a44337 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,5 +1,5 @@ { stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi -, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng +, freeglut, libGLU_combined, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} , darwin, libtiff, freetype }: @@ -29,7 +29,7 @@ composableDerivation.composableDerivation {} { # this could be tidied up (?).. eg why does it require freeglut without glSupport? edf { name = "cygwin"; } # use the CygWin libraries default=no // edf { name = "debug"; } # turn on debugging default=no - // edf { name = "gl"; enable = { buildInputs = [ mesa ]; }; } # turn on OpenGL support default=yes + // edf { name = "gl"; enable = { buildInputs = [ libGLU_combined ]; }; } # turn on OpenGL support default=yes // edf { name = "shared"; } # turn on shared libraries default=no // edf { name = "threads"; } # enable multi-threading support // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 4abe7cf8507b3c93439eb9b6a182935df5d33495..d3ba4b889094217d5a18ea621224769bda8f90a4 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent -, double_conversion, glog, google-gflags, python, libiberty, openssl }: +, double-conversion, glog, google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2017.11.06.00"; + version = "2018.04.16.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "11sn4gwqw94ygc2s4bzqy5k67v3rr20gy375brdcrl5rv0r2hhc0"; + sha256 = "10wivnszpqcbg2hbvfal94lcjw20pjz0d8p0m4qa7i4v4z90q37p"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; - buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ]; + buildInputs = [ libiberty boost libevent double-conversion glog google-gflags openssl ]; postPatch = "cd folly"; preBuild = '' diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 9c4116c8f0ba461a82d15f22f0efc0f9b034b3ad..29838fe1ffa1c735289abf75546a8e0a5d258d80 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchurl, fetchpatch -, pkgconfig, freetype, expat, libxslt, dejavu_fonts +, pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts , hostPlatform }: @@ -18,11 +18,12 @@ let configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations in stdenv.mkDerivation rec { - name = "fontconfig-2.12.1"; + name = "fontconfig-${version}"; + version = "2.12.6"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.bz2"; - sha256 = "1wy7svvp7df6bjpg1m5vizb3ngd7rhb20vpclv3x3qa71khs6jdl"; + sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g"; }; patches = [ @@ -30,22 +31,12 @@ stdenv.mkDerivation rec { src = ./config-compat.patch; inherit configVersion; }) - (fetchpatch { - name = "glibc-2.25.diff"; - url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c"; - sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz"; - }) ]; - # additionally required for the glibc-2.25 patch; avoid requiring gperf - postPatch = '' - sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf} - touch src/* - ''; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gperf ]; buildInputs = [ expat ]; configureFlags = [ diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 9aa1a905ec98e602f113918948ad813cb126f6da..8b534edd2498ace4364f175eda1c8e0bb2c16f14 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -24,4 +24,8 @@ runCommand "fc-cache" mkdir -p $out fc-cache -sv + + # This is not a cache dir in the normal sense -- it won't be automatically + # recreated. + rm "$out/CACHEDIR.TAG" '' diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 63ec6233616329124a983481b2e38c6eb7441e35..a0ba954801294553f2c55f372996a0d4bacde63e 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor -, libXrandr, mesa, libXft, libXfixes, xinput +, libXrandr, libGLU_combined, libXft, libXfixes, xinput , CoreServices }: let - version = "1.6.49"; + version = "1.6.56"; in stdenv.mkDerivation rec { @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; - sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; + sha256 = "1ckcb12gblz1ad1371ah1qirxn3r9zdngh9w0357hsqfmkyfa5y5"; }; buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr - libXft mesa libXfixes xinput + libXft libGLU_combined libXfixes xinput ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; doCheck = true; diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index b377061fe97e9e5c4a8690a17b73edd90e7c7058..2dd757bf82161b004c3bfd95c20e33e459bf786e 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fplll"; - version = "5.0.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "${pname}"; repo = "${pname}"; rev = "${version}"; - sha256 = "0rl98rx284giyhj3pf6iydn1a06jis8c8mnsc7kqs4rcmiw4bjpx"; + sha256 = "0931i4q49lzlifsg9zd8a2yzj626i1s2bqhkfxvcxv94c38s0nh1"; }; nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook]; buildInputs = [gmp mpfr]; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 6737e059b212079b4b16518ff140891a5c0b62e6..c34d9591d38686919a9c6486a0f135c63a8a6d10 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa_noglu, mesa_glu, xlibsWrapper, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -11,12 +11,12 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - buildInputs = [ libXi libXrandr libXxf86vm mesa_noglu mesa_glu xlibsWrapper cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper cmake ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${mesa_noglu}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa_noglu}/lib/libGL.dylib" - "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib" + "-DOPENGL_INCLUDE_DIR=${libGL}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib" + "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index c77c3b3640b70b740d80f18a71a89c34a5d3f72d..3771880d36081994f67a1c843cbb08d40f30969b 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }: +{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu +, GLUT, Cocoa + }: stdenv.mkDerivation rec { name = "freenect-${version}"; - version = "0.5.5"; + version = "0.5.7"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "0qmbagfkxjgbwd2ajn7i5lkic9gx5y02bsnmqm7cjay99zfw9ifx"; + sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6"; }; - buildInputs = [ libusb freeglut mesa libXi libXmu ]; + buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ] + ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; + nativeBuildInputs = [ cmake pkgconfig ]; meta = { description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; inherit version; homepage = http://openkinect.org; - license = with stdenv.lib.licenses; [ gpl2 asl20 ]; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ gpl2 asl20 ]; + maintainers = with lib.maintainers; [ bennofs ]; + platforms = with lib.platforms; linux ++ darwin ; }; } diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index d764121e8d6bece583401718f0283029121b9abb..b097e5cbb64c8a7f35950f4ffb5c82ceabc0e197 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -6,11 +6,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.70"; + version = "1.00.80"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "1ydh0c89nb6wh6wakbkqad7mdwpymygvgbcrk8c2mp7abgv1jqzp"; + sha256 = "17s15avxcyhfk0zsj8rggizhpd2j2sa41w5xlnshzd2r3piqyl6k"; }; configureFlags = [ diff --git a/pkgs/development/libraries/freetype/cve-2017-8105.patch b/pkgs/development/libraries/freetype/cve-2017-8105.patch deleted file mode 100644 index dc4327a52a886f7bbaf2becc2b41fefd70daae11..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/freetype/cve-2017-8105.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=f958c48ee43 - -diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c -index af7b465..7dd4513 100644 ---- a/src/psaux/t1decode.c -+++ b/src/psaux/t1decode.c -@@ -780,10 +780,19 @@ - /* point without adding any point to the outline */ - idx = decoder->num_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 deleted file mode 100644 index 7ccf4f3278b7acd2b2d5d4a3928a9a3698bec205..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/freetype/cve-2017-8287.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 8f16f85cabf767025765520a780c46ce90a26cf4..3fccce02def4fd3652ba8ce47f04cac106d7dbf8 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, copyPathsToStore , hostPlatform -, pkgconfig, which +, pkgconfig, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). @@ -11,10 +11,10 @@ let inherit (stdenv.lib) optional optionals optionalString; - version = "2.7.1"; name = "freetype-" + version; -in stdenv.mkDerivation { - inherit name; +in stdenv.mkDerivation rec { + name = "freetype-${version}"; + version = "2.9"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,24 +33,17 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "121gm15ayfg3rglby8ifh8384mcjb9dhmx9j40zl7yszw72b4frs"; + sha256 = "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkgconfig which ] + nativeBuildInputs = [ pkgconfig which makeWrapper ] # 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 + [ ./enable-table-validation.patch ] ++ optional useEncumberedCode ./enable-subpixel-rendering.patch; @@ -65,7 +58,10 @@ in stdenv.mkDerivation { doCheck = true; - postInstall = glib.flattenInclude; + postInstall = glib.flattenInclude + '' + wrapProgram "$dev/bin/freetype-config" \ + --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" + ''; crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") { # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead diff --git a/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch b/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch deleted file mode 100644 index 95ed83c60f8fccec3dc2fbe964263856a2e847c9..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch +++ /dev/null @@ -1,553 +0,0 @@ -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 deleted file mode 100644 index c1685c5116cc76e273b179c4422e277d9e3949e9..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/freetype/pcf-introduce-driver.patch +++ /dev/null @@ -1,68 +0,0 @@ -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/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index bdfbb97f021871d67b3dc5ed2bf79f044033cf1a..a107c9a478f23bcd36193ab80af25ac22588bc5d 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,22 +1,26 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { name = "fribidi-${version}"; version = "0.19.7"; - src = fetchurl { - url = "http://fribidi.org/download/${name}.tar.bz2"; - sha256 = "13jsb5qadlhsaxkbrb49nqslmbh904vvzhsm5mm2ghmv29i2l8h8"; + src = fetchFromGitHub { + owner = "fribidi"; + repo = "fribidi"; + rev = version; + sha256 = "10q5jfch5qzrj2w4fbkr086ank66plx8hp7ra9a01irj80pbk96d"; }; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + # Configure script checks for glib, but it is only used for tests. outputs = [ "out" "devdoc" ]; meta = with stdenv.lib; { - homepage = http://fribidi.org/; + homepage = https://github.com/fribidi/fribidi; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; - license = licenses.gpl2; + license = licenses.lgpl21; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix deleted file mode 100644 index d4afc7ad481a1c87ed69c5cac6170ec2d5c499de..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/ftgl/2.1.2.nix +++ /dev/null @@ -1,44 +0,0 @@ -{stdenv, fetchurl, freetype, mesa}: - -let - name = "ftgl-2.1.2"; -in -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "mirror://sourceforge/ftgl/${name}.tar.gz"; - sha256 = "0xa00fnn6wd3rnkrkcs1wpv21lxdsb83r4hjn3l33dn0zbawnn97"; - }; - - buildInputs = [freetype mesa]; - - NIX_LDFLAGS = "-lGLU -lGL"; - - patches = [ ./gcc.patch ]; - - configureFlags = "--enable-shared"; - - preConfigure = '' - cd unix - cd docs - tar vxf ../../docs/html.tar.gz - cd .. - ''; - - meta = { - homepage = https://sourceforge.net/apps/mediawiki/ftgl/; - description = "Font rendering library for OpenGL applications"; - license = stdenv.lib.licenses.gpl3Plus; - - longDescription = '' - FTGL is a free cross-platform Open Source C++ library that uses - Freetype2 to simplify rendering fonts in OpenGL applications. FTGL - supports bitmaps, pixmaps, texture maps, outlines, polygon mesh, - and extruded polygon rendering modes. - ''; - - platforms = stdenv.lib.platforms.gnu; - maintainers = []; - }; -} diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 5e94618376ba4d74c77663642eef11a44cd63411..8808af49f9e42605044f7aa41281d304fc77a38c 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, freetype, mesa}: +{stdenv, fetchurl, freetype, libGLU_combined}: let name = "ftgl-2.1.3-rc5"; @@ -11,7 +11,9 @@ stdenv.mkDerivation { sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"; }; - buildInputs = [freetype mesa]; + buildInputs = [ freetype libGLU_combined ]; + + enableParallelBuilding = true; meta = { homepage = https://sourceforge.net/apps/mediawiki/ftgl/; @@ -25,7 +27,7 @@ stdenv.mkDerivation { and extruded polygon rendering modes. ''; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.unix; maintainers = []; }; } diff --git a/pkgs/development/libraries/ftgl/gcc.patch b/pkgs/development/libraries/ftgl/gcc.patch deleted file mode 100644 index 6e9871476c8122e6bd5ece85a4628c8768eab382..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/ftgl/gcc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/FTTextureGlyph.h b/include/FTTextureGlyph.h -index c263f72..8959cb3 100755 ---- a/include/FTTextureGlyph.h -+++ b/include/FTTextureGlyph.h -@@ -52,7 +52,7 @@ class FTGL_EXPORT FTTextureGlyph : public FTGlyph - * Reset the currently active texture to zero to get into a known state before - * drawing a string. This is to get round possible threading issues. - */ -- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;} -+ static void ResetActiveTexture(){ activeTextureID = 0;} - - private: - /** diff --git a/pkgs/development/libraries/gamin/debian-patches.nix b/pkgs/development/libraries/gamin/debian-patches.nix index f784b8ccfee0abe4167b908607fc09cd07279fa5..a8f334fb3c394b2e1d4d350ec7ddf26dffd56ccb 100644 --- a/pkgs/development/libraries/gamin/debian-patches.nix +++ b/pkgs/development/libraries/gamin/debian-patches.nix @@ -1,6 +1,6 @@ # Generated by debian-patches.sh from debian-patches.txt let - prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4.1"; + prefix = "https://sources.debian.org/data/main/g/gamin/0.1.10-4.1/debian/patches"; in [ { diff --git a/pkgs/development/libraries/gamin/debian-patches.txt b/pkgs/development/libraries/gamin/debian-patches.txt index 4faad71d44d03bb711187089e73b9e61d90be68d..46d2420b21edee30aa9c046254981dcc1598e8ed 100644 --- a/pkgs/development/libraries/gamin/debian-patches.txt +++ b/pkgs/development/libraries/gamin/debian-patches.txt @@ -1,2 +1,2 @@ -gamin/0.1.10-4 +gamin/0.1.10-4.1 17_deprecated_const_return.patch diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index e6b1875a9e0c28ea2e5aa91be3e0d7e64b7802f3..2af7bbce18bc8871040e68745f45bd068ed06326 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, python, pkgconfig, glib }: +{ stdenv, fetchurl, fetchpatch, python, pkgconfig, glib }: stdenv.mkDerivation (rec { name = "gamin-0.1.10"; src = fetchurl { - url = "http://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz"; + url = "https://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz"; sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; @@ -18,7 +18,12 @@ stdenv.mkDerivation (rec { patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) - ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch; + ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "fix-pthread-mutex.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; + sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; + }); meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index dd16ebd5c8864ab98bc4949b77bc2861d77e08de..6745bc1ecf5fae5b926261c500a82bcce3384326 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gbenchmark-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "1gld3zdxgc0c0466qvnsi70h2ksx8qprjrx008rypdhzp6660m48"; + sha256 = "1qx2dp7y0haj6wfbbfw8hx8sxb8ww0igdfrmmaaxfl0vhckylrxh"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 38a36fc4e546c58f2efb9448b309b287f80505bf..0758d125227499fac805541d40a14d9301772b40 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchurl, intltool, gobjectIntrospection, pkgconfig }: +{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig, meson, ninja, glibcLocales, git, vala, glib, zlib }: stdenv.mkDerivation rec { name = "gcab-${version}"; - version = "0.7"; + version = "1.1"; + + LC_ALL = "en_US.UTF-8"; src = fetchurl { url = "mirror://gnome/sources/gcab/${version}/${name}.tar.xz"; - sha256 = "1vxdsiky3492zlyrym02sdwf09y19rl2z5h5iin7qm0wizw5wvm1"; + sha256 = "0l19sr6pg0cfcddmi5n79d08mjjbhn427ip5jlsy9zddq9r24aqr"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gobjectIntrospection ]; + nativeBuildInputs = [ meson ninja glibcLocales git pkgconfig vala gettext gobjectIntrospection ]; + + buildInputs = [ glib zlib ]; + + mesonFlags = [ + "-Ddocs=false" + "-Dtests=false" + ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 984d3da811983c8cca8153f9318524d99f873592..562d79b00921215c402a282871abf0ded6754f16 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -8,12 +8,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.2.4"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "0rk0p0k787whzzdl8m1f9wcrm7h9bf1pny3z96d93b4383arhw4j"; + sha256 = "0y1237m2wilxgrsd0cdjpbf1zj9z954sd8518g53hlmkmk8v27j4"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--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-mysql=${mysql.connector-c or mysql}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index c9f0c07610197ce8356ebbcc2253c10d440aab5b..7a80ce7fdb667c3440db9ac817beec8132d072cc 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl +, postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl , libpng }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql.lib.dev}/bin/mysql_config" + "--with-mysql=${mysql57.connector-c}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-python" # optional "--with-static-proj4=${proj}" # optional diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 3b78225a447f2d7f8d6bea69c3010e7a76669ca6..3fd0bb0824404a00e84196333ba776f6d6b0a89a 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.13"; + name = "gdbm-1.14.1"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx"; + sha256 = "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd"; }; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; # not cross; # Linking static stubs on cygwin requires correct ordering. # Consider upstreaming this. diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 2d7e26b9e1a8ffa069934cede1d3e8090df8dfe9..dcdb6a2297b24fd307342e1d979b73fea48a80f4 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.6.4"; + version = "2.8.6"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "14bysjdldq7xb9k1ayskxijm08dy2n45v9bg379dqrcz1q5xq5mi"; + sha256 = "07q7w2qvpknvncp3g6m5f6b3m1ld4pzns52bqah8da7pabgwspjy"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 38c1b6197a5f52416624dc350318cfa9b796b6d8..6bfa6bdc2fb9bd9d1388fbd592e5aeb0b58c5a23 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11 -, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }: +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3 +, jasper, gobjectIntrospection, doCheck ? false }: let - ver_maj = "2.36"; - ver_min = "7"; + pname = "gdk-pixbuf"; + version = "2.36.7"; # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which apparently requires access to shared_mime_info files during runtime. + # which apparently requires access to shared-mime-info files during runtime. in stdenv.mkDerivation rec { - name = "gdk-pixbuf-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 gobjectIntrospection ] ++ libintlOrEmpty; + buildInputs = [ libX11 gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig ]; @@ -47,6 +47,13 @@ stdenv.mkDerivation rec { # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit (doCheck); + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gdk_pixbuf"; + }; + }; + meta = with stdenv.lib; { description = "A library for image loading and manipulation"; homepage = http://library.gnome.org/devel/gdk-pixbuf/; @@ -54,4 +61,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index ba7ab82f50b4828600f619002e11895fc82a9974..5a7dcd79299694e26c1863cb37e8259c19a12dbe 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -14,4 +14,4 @@ findGdkPixbufLoaders() { } -envHooks+=(findGdkPixbufLoaders) +addEnvHooks "$hostOffset" findGdkPixbufLoaders diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index a0f3dc636f923a02ab7c62931dc43c752d2f9cef..db2b14d71fdb734cd7439e371ccabc4b8c5dc2b3 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl, bash, perl }: stdenv.mkDerivation rec { name = "gecode-${version}"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77"; }; - buildInputs = [ perl ]; + nativeBuildInputs = [ bash perl ]; + + preConfigure = "patchShebangs configure"; meta = with stdenv.lib; { license = licenses.mit; diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index 5d683de404d9663f32d753c017a7a7f7027ff005..83ec0edfb49fde0a39550efa90d1c96e50df353c 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gecode-${version}"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { url = "http://www.gecode.org/download/${name}.tar.gz"; - sha256 = "0yz7m4msp7g2jzsn216q74d9n7rv6qh8abcv0jdc1n7y2nhjzzzl"; + sha256 = "0dp7bm6k790jx669y4jr0ffi5cdfpwsqm1ykj2c0zh56jsgs6hfs"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 48b1e47e0edc500f632a860389385003d12ab85f..fee630c32a81065e12138ffbd8740d76090bf406 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw }: +, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw +, libwebp, gnome3, libintl }: stdenv.mkDerivation rec { - name = "gegl-0.3.18"; + name = "gegl-0.3.30"; src = fetchurl { url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; - sha256 = "1ywihjav9yhmsvbrdyx9c5q71rqdkjg8l66ywca6s4yydvr8x1fp"; + sha256 = "0lg5j5kn24qvyb6fn7khxf3jadkacbpnb9nrqzy7w665s8xakd7q"; }; hardeningDisable = [ "format" ]; @@ -14,17 +15,24 @@ stdenv.mkDerivation rec { # needs fonts otherwise don't know how to pass them configureFlags = "--disable-docs"; + enableParallelBuilding = true; + + doCheck = true; + buildInputs = [ - babl libpng cairo libjpeg librsvg pango gtk bzip2 which json_glib intltool - libraw + libpng cairo libjpeg librsvg pango gtk bzip2 + libraw libwebp gnome3.gexiv2 ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc + + nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ]; - meta = { + meta = with stdenv.lib; { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 304d8110ad461c5e8fff6497454801db3a7f0313..8c93428a078036912d3f4c208820aedabdb110f5 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk2, bzip2, intltool +, librsvg, pango, gtk2, bzip2, intltool, libintl , OpenGL ? null }: stdenv.mkDerivation rec { @@ -20,14 +20,12 @@ stdenv.mkDerivation rec { # needs fonts otherwise don't know how to pass them configureFlags = "--disable-docs"; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool ] + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 6e043f5994df54e649d8bf54439be74c05013e03..5796425e4385affeee8ed7d540312d433aa85b78 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -1,14 +1,20 @@ { stdenv, fetchurl , pkgconfig -, python3 +, python3Packages +, wrapGAppsHook +, atk , dbus_libs , evemu , frame +, gdk_pixbuf +, gobjectIntrospection , grail +, gtk3 , libX11 , libXext , libXi , libXtst +, pango , xorgserver }: @@ -25,8 +31,23 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-format -Wno-misleading-indentation -Wno-error"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python3 dbus_libs evemu frame grail libX11 libXext libXi libXtst xorgserver ]; + pythonPath = with python3Packages; + [ pygobject3 ]; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; + buildInputs = [ atk dbus_libs evemu frame gdk_pixbuf gobjectIntrospection grail + gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver + ]; + + patchPhase = '' + substituteInPlace python/geis/geis_v2.py --replace \ + "ctypes.util.find_library(\"geis\")" "'$out/lib/libgeis.so'" + ''; + + preFixup = '' + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") + ''; meta = { description = "A library for input gesture recognition"; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 483ee39c2da1b5123151e966dae25606bec02e5b..495a113391e3853c95b5221b084e1623520d7901 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip -, dbus, dbus_glib, modemmanager, avahi, glib_networking, wrapGAppsHook +{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip +, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection }: with stdenv.lib; @@ -15,21 +15,20 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig intltool wrapGAppsHook + pkgconfig intltool wrapGAppsHook gobjectIntrospection ]; - buildInputs = libintlOrEmpty ++ - [ glib json_glib libsoup geoip - dbus dbus_glib avahi + buildInputs = [ glib json-glib libsoup geoip + dbus dbus-glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; - propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ]; preConfigure = '' substituteInPlace configure --replace "-Werror" "" ''; - configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ] ++ + configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--enable-introspection" ] ++ optionals stdenv.isDarwin [ "--disable-silent-rules" "--disable-3g-source" @@ -37,14 +36,13 @@ stdenv.mkDerivation rec { "--disable-modem-gps-source" "--disable-nmea-source" ]; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - postInstall = '' sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" ''; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; + homepage = https://freedesktop.org/wiki/Software/GeoClue/; maintainers = with maintainers; [ raskin garbas ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index ff65ca97eb7426cf648f563a0158a77f1bf0945c..bf0af502d017c7ac65a418b7a208b6a7a1e3f848 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, - libxslt, glib_networking }: +{ stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2, + libxslt, glib-networking }: stdenv.mkDerivation rec { name = "geoclue-0.12.0"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ]; + buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ]; - propagatedBuildInputs = [dbus glib dbus_glib]; + propagatedBuildInputs = [dbus glib dbus-glib]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 60d40b10aa420ff6dc6330f810a14c4bddab0d91..cb8138dc115e07aedd776270c0100f004b072b8c 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,18 +1,23 @@ # in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP # e.g. geolite-legacy -{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }: +{ stdenv, fetchFromGitHub, autoreconfHook +, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }: -let version = "1.6.2"; +let version = "1.6.12"; dataDir = if (stdenv.lib.isDerivation geoipDatabase) then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; in stdenv.mkDerivation { name = "${drvName}-${version}"; - src = fetchurl { - url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz"; - sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7"; + src = fetchFromGitHub { + owner = "maxmind"; + repo = "geoip-api-c"; + rev = "v${version}"; + sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv"; }; - postPatch = '' + nativeBuildInputs = [ autoreconfHook ]; + + postConfigure = '' find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index de7111f6be364654b3e423aa92adafe606dabd5b..24e3b4842fafa37e80c722b192d9ddb851ef4101 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, python }: stdenv.mkDerivation rec { - name = "geos-3.6.1"; + name = "geos-3.6.2"; src = fetchurl { url = "http://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja"; + sha256 = "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..779534460df2ea7850cd305b904898291ecbf3b3 --- /dev/null +++ b/pkgs/development/libraries/getdns/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, libtool, unbound, libidn, m4, file +, openssl, doxygen, autoreconfHook, automake }: + +stdenv.mkDerivation rec { + pname = "getdns"; + name = "${pname}-${version}"; + version = "1.4.1"; + + src = fetchurl { + url = "https://getdnsapi.net/releases/${pname}-1-4-1/${pname}-${version}.tar.gz"; + sha256 = "07n5n5m4dnnh2xkh7wrnlx8s8myrvjf2nbs7n5m5nq8gg3f36li4"; + }; + + nativeBuildInputs = [ libtool m4 autoreconfHook automake file ]; + + buildInputs = [ unbound libidn openssl doxygen ]; + + patchPhase = '' + substituteInPlace m4/acx_openssl.m4 \ + --replace /usr/local/ssl ${openssl.dev} + ''; + + meta = with stdenv.lib; { + description = "A modern asynchronous DNS API"; + longDescription = '' + getdns is an implementation of a modern asynchronous DNS API; the + specification was originally edited by Paul Hoffman. It is intended to make all + types of DNS information easily available to application developers and non-DNS + experts. DNSSEC offers a unique global infrastructure for establishing and + enhancing cryptographic trust relations. With the development of this API the + developers intend to offer application developers a modern and flexible + interface that enables end-to-end trust in the DNS architecture, and which will + inspire application developers to implement innovative security solutions in + their applications. +''; + homepage = https://getdnsapi.net; + maintainers = with maintainers; [ leenaars ]; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index a35d2380ededb8acd8ffe490f6649b35da82a1eb..6dec7747c7e8675d3def1bbb4f52e8ac140decb8 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -48,6 +48,9 @@ stdenv.mkDerivation rec { # HACK, see #10874 (and 14664) buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; + setupHook = ./gettext-setup-hook.sh; + gettextNeedsLdflags = hostPlatform.libc != "glibc" && !hostPlatform.isMusl; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..074d313e48aab4915d35a401fd602bab0198cec9 --- /dev/null +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -0,0 +1,28 @@ +gettextDataDirsHook() { + if [ -d "$1/share/gettext" ]; then + addToSearchPath GETTEXTDATADIRS "$1/share/gettext" + fi +} + +addEnvHooks "$hostOffset" gettextDataDirsHook + +# libintl must be listed in load flags on non-Glibc +# it doesn't hurt to have it in Glibc either though +gettextLdflags() { + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + export NIX_${role}LDFLAGS+=" -lintl" +} + +if [ ! -z "@gettextNeedsLdflags@" ]; then + addEnvHooks "$hostOffset" gettextLdflags +fi diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix deleted file mode 100644 index 95038284cd60dfb5c0b9e8e3a0267caee86d7c56..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/giflib/5.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: - -stdenv.mkDerivation { - name = "giflib-5.0.6"; - src = fetchurl { - url = mirror://sourceforge/giflib/giflib-5.0.6.tar.bz2; - sha256 = "1sk9ysh27nabwb6z7a38n8gy2y2rnl3vjkbapv7pbjnzrff862c9"; - }; - - buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; - meta = { - description = "A library for reading and writing gif images"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - branch = "5.0"; - }; -} diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 335afa566dbead8827a64c4376197eef65fa8210..3556acb0590dda88277db892ee35704aa5d7531a 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -1,16 +1,34 @@ -{stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx}: +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx +, optimize ? false # impure +}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "givaro"; - version = "4.0.2"; + version = "4.0.4"; src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; rev = "v${version}"; - sha256 = "04n1lyc823z3l1d7mnmqpc9z1pkn646szjchasbfkn74m7cb0qz7"; + sha256 = "199p8wyj5i63jbnk7j8qbdbfp5rm2lpmcxyk3mdjy9bz7ygx3hhy"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool gmpxx]; + configureFlags = [ + "--disable-optimization" + ] ++ stdenv.lib.optionals (!optimize) [ + # disable SIMD instructions (which are enabled *when available* by default) + "--disable-sse" + "--disable-sse2" + "--disable-sse3" + "--disable-ssse3" + "--disable-sse41" + "--disable-sse42" + "--disable-avx" + "--disable-avx2" + "--disable-fma" + "--disable-fma4" + ]; + doCheck = true; meta = { inherit version; description = ''A C++ library for arithmetic and algebraic computations''; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..339e0d8d60b9e7c2ae2bd26a9b61116cf49831c9 --- /dev/null +++ b/pkgs/development/libraries/glbinding/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "glbinding"; + version = "2.1.4"; + + src = fetchFromGitHub { + owner = "cginternals"; + repo = pname; + rev = "v${version}"; + sha256 = "1yic3p2iqzxc7wrjnqclx7vcaaqx5fiysq9rqbi6v390jqkg3zlz"; + }; + + buildInputs = [ cmake libGLU xlibsWrapper ]; + + meta = with stdenv.lib; { + homepage = https://github.com/cginternals/glbinding/; + description = "A C++ binding for the OpenGL API, generated using the gl.xml specification"; + license = licenses.mit; + maintainers = [ maintainers.mt-caret ]; + }; +} diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index 64f51a56fd37e33e9f5af444919a82dfe60a3545..1980c633474f57f716677f1babca99184ec72f63 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, mesa, freeglut, libX11, libXt, libXmu, libXi, libXext}: +{stdenv, fetchurl, libGLU_combined, freeglut, libX11, libXt, libXmu, libXi, libXext}: stdenv.mkDerivation { name = "gle-3.1.0"; - buildInputs = [mesa freeglut libX11 libXt libXmu libXi libXext]; + buildInputs = [libGLU_combined freeglut libX11 libXt libXmu libXi libXext]; src = fetchurl { urls = [ "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz" diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 3f8119d36d65dc5eade7a50223bfa1d998cb9978..fafcf82258ab1b24e9a077bb347a3fbb367824ad 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi +{ stdenv, fetchurl, libGLU, x11, libXmu, libXi , buildPlatform, hostPlatform , AGL ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; - propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 57bb4cb631d4ae4dde0ed0606e9c8f51b7a4c6b1..a8add880090f25611464a0ace0fe7baeab9c9028 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,26 +1,27 @@ -{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi +{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , buildPlatform, hostPlatform }: with stdenv.lib; stdenv.mkDerivation rec { - name = "glew-2.0.0"; + name = "glew-2.1.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5"; + sha256 = "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4"; }; outputs = [ "bin" "out" "dev" "doc" ]; buildInputs = [ xlibsWrapper libXmu libXi ]; - propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux + substituteInPlace config/Makefile.darwin --replace /usr/local "$out" ${optionalString (hostPlatform != buildPlatform) '' - sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile + sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile ''} ''; @@ -43,6 +44,8 @@ stdenv.mkDerivation rec { "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel.name}" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "An OpenGL extension loading library for C(++)"; homepage = http://glew.sourceforge.net/; diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index a017ff3d988c43c1723d19387b0546bfde7f1064..b1118b473b6f02468d2f26cbfcd54d4b5548276f 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, mesa_noglu, libX11, libXext }: +{ stdenv, fetchurl, libGLU, libGL, libX11, libXext }: stdenv.mkDerivation rec { name = "glfw-2.7.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; - buildInputs = [ mesa_glu mesa_noglu libX11 libXext ]; + buildInputs = [ libGLU libGL libX11 libXext ]; buildPhase = '' make x11 diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index c10b3c05986a10cc43c814de431b71196dcbc94a..8d4d4d10038a247c379de77be4103ce5c8d90181 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, mesa_noglu, libXrandr, libXinerama, libXcursor, libX11 +{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11 , darwin, fixDarwinDylibNames }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - propagatedBuildInputs = [ mesa_noglu ]; + propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index fd8055fd0b396cf27a35fe5060478812f543cd6e..c3bcb3aa1c45a4c178427f91554b4e5e14659cd6 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,35 +1,49 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy -, gsettings_desktop_schemas }: +{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, glib, gettext, gnutls, p11-kit, libproxy, gnome3 +, gsettings-desktop-schemas }: let - ver_maj = "2.54"; - ver_min = "0"; + pname = "glib-networking"; + version = "2.56.0"; in stdenv.mkDerivation rec { - name = "glib-networking-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "5961b3779080b72314b373ff5d4790eb7e41b75ca91816ad7a81ef32922f7096"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "14vw8xwajd7m31bpavg2psk693plhjikwpk8bzf3jl1fmsy11za7"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + patches = [ + # Use GNUTLS system trust for certificates + (fetchpatch { + url = https://git.gnome.org/browse/glib-networking/patch/?id=f1c8feee014007cc913b71357acb609f8d1200df; + sha256 = "1rbxqsrcb5if3xs2d18pqzd9xnjysdj715ijc41n5w326fsawg7i"; + }) + ]; - preBuild = '' - sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) + PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "lib/gio/modules"; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ pkgconfig intltool ]; - propagatedBuildInputs = [ glib gnutls libproxy gsettings_desktop_schemas ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ]; doCheck = false; # tests need to access the certificates (among other things) + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Network-related giomodules for glib"; license = licenses.lgpl2Plus; platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index b82fd5f1e2992ed355ee90bc1f489526ecfb8aec..d2dc9a8c637ba1c32e482f17e7e16b76d332c157 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,10 +1,10 @@ -{ stdenv, hostPlatform, fetchurl, pkgconfig, gettext, perl, python -, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf +{ stdenv, hostPlatform, fetchurl, gettext, pkgconfig, perl, python +, libiconv, zlib, libffi, pcre, libelf, gnome3 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null # this is just for tests (not in closure of any regular package) -, coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false +, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false }: with stdenv.lib; @@ -42,20 +42,20 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - ver_maj = "2.54"; - ver_min = "1"; + version = "2.56.0"; in stdenv.mkDerivation rec { - name = "glib-${ver_maj}.${ver_min}"; + name = "glib-${version}"; src = fetchurl { - url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "50c01b1419324f10fbf9b9709ec2164b18586968bdce7540583bf32302cf47a3"; + url = "mirror://gnome/sources/glib/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch - ++ optional doCheck ./skip-timer-test.patch; + ++ optional doCheck ./skip-timer-test.patch + ++ [ ./schema-override-variable.patch ]; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; @@ -64,21 +64,23 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre ] ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount - ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; + ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; - nativeBuildInputs = [ pkgconfig gettext perl python ]; + nativeBuildInputs = [ pkgconfig perl python ]; - propagatedBuildInputs = [ zlib libffi libiconv ] - ++ libintlOrEmpty; + propagatedBuildInputs = [ zlib libffi gettext libiconv ]; # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ optional stdenv.isDarwin "--disable-compile-warnings" - ++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu" - ++ optional stdenv.isSunOS "--disable-dtrace"; + ++ optional stdenv.isSunOS "--disable-dtrace" + # Can't run this test when cross-compiling + ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) + [ "glib_cv_stack_grows=no" "glib_cv_uscore=no" ] + # GElf only supports elf64 hosts + ++ optional (!stdenv.hostPlatform.is64bit) "--disable-libelf"; - NIX_CFLAGS_COMPILE = optional stdenv.isDarwin "-lintl" - ++ optional stdenv.isSunOS "-DBSD_COMP"; + NIX_CFLAGS_COMPILE = optional stdenv.isSunOS "-DBSD_COMP"; preConfigure = optionalString stdenv.isSunOS '' sed -i -e 's|inotify.h|foobar-inotify.h|g' configure @@ -116,7 +118,7 @@ stdenv.mkDerivation rec { export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" - export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" + export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" @@ -135,8 +137,9 @@ stdenv.mkDerivation rec { ''; passthru = { - gioModuleDir = "lib/gio/modules"; - inherit flattenInclude; + gioModuleDir = "lib/gio/modules"; + inherit flattenInclude; + updateScript = gnome3.updateScript { packageName = "glib"; }; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/glib/schema-override-variable.patch b/pkgs/development/libraries/glib/schema-override-variable.patch new file mode 100644 index 0000000000000000000000000000000000000000..1cb5a730351b1b0e65954abc646ccbd852dd0065 --- /dev/null +++ b/pkgs/development/libraries/glib/schema-override-variable.patch @@ -0,0 +1,12 @@ +--- a/gio/gsettingsschema.c ++++ b/gio/gsettingsschema.c +@@ -352,6 +352,9 @@ + + try_prepend_data_dir (g_get_user_data_dir ()); + ++ if ((path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL) ++ try_prepend_dir (path); ++ + if ((path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL) + try_prepend_dir (path); + diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index c5cf293902cd43daba16014a70f8378f9856a889..233845c6541fe19fc55bc99837f0fe751aa9c41c 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -5,13 +5,13 @@ make_glib_find_gsettings_schemas() { addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"* fi } -envHooks+=(make_glib_find_gsettings_schemas) +addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas # Install gschemas, if any, in a package-specific directory glibPreInstallPhase() { installFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/") } -preInstallPhases+=(glibPreInstallPhase) +preInstallPhases+=" glibPreInstallPhase" glibPreFixupPhase() { # Move gschemas in case the install flag didn't help @@ -22,5 +22,4 @@ glibPreFixupPhase() { addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name" } -preFixupPhases+=(glibPreFixupPhase) - +preFixupPhases+=" glibPreFixupPhase" diff --git a/pkgs/development/libraries/glibc/2.26-115to131.diff.gz b/pkgs/development/libraries/glibc/2.26-115to131.diff.gz new file mode 100644 index 0000000000000000000000000000000000000000..3d866c567a790b088e2446bf2d4048710a19a9eb Binary files /dev/null and b/pkgs/development/libraries/glibc/2.26-115to131.diff.gz differ diff --git a/pkgs/development/libraries/glibc/2.26-75to115.diff.gz b/pkgs/development/libraries/glibc/2.26-75to115.diff.gz new file mode 100644 index 0000000000000000000000000000000000000000..9bf1a4f7d39b2d42fb92dcb0d347152425d503b7 Binary files /dev/null and b/pkgs/development/libraries/glibc/2.26-75to115.diff.gz differ diff --git a/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch b/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch new file mode 100644 index 0000000000000000000000000000000000000000..ce18b874c4272a993c00a84aea55ef8b67b472d8 --- /dev/null +++ b/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch @@ -0,0 +1,39 @@ +diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure +index cace758c01..38fe7fe0b0 100644 +--- a/sysdeps/unix/sysv/linux/configure ++++ b/sysdeps/unix/sysv/linux/configure +@@ -69,7 +69,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel header at least $minimum_kernel" >&5 + $as_echo_n "checking for kernel header at least $minimum_kernel... " >&6; } + decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; +-abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; ++abinum=`echo "2.6.32.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include +diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac +index 13abda0a51..6abc12eaed 100644 +--- a/sysdeps/unix/sysv/linux/configure.ac ++++ b/sysdeps/unix/sysv/linux/configure.ac +@@ -50,7 +50,7 @@ fi + AC_MSG_CHECKING(for kernel header at least $minimum_kernel) + changequote(,)dnl + decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; +-abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; ++abinum=`echo "2.6.32.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; + changequote([,])dnl + AC_TRY_COMPILE([#include + #if LINUX_VERSION_CODE < $decnum +diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h +index 823cd8224d..482caaeeec 100644 +--- a/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ b/sysdeps/unix/sysv/linux/dl-osinfo.h +@@ -39,7 +39,7 @@ + GLRO(dl_osversion) = version; \ + \ + /* Now we can test with the required version. */ \ +- if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION) \ ++ if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION && version != 0x020620) \ + /* Not sufficent. */ \ + FATAL ("FATAL: kernel too old\n"); \ + } \ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 7894d75fbe6763bc5953cf661d1f5420e833488d..517c98e9f6442f04314ea8768fd82c4e2892b5ff 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -4,9 +4,10 @@ { stdenv, lib , buildPlatform, hostPlatform , buildPackages -, fetchurl +, fetchurl, fetchpatch ? null , linuxHeaders ? null , gd ? null, libpng ? null +, bison }: { name @@ -19,9 +20,9 @@ } @ args: let - version = "2.26"; - patchSuffix = "-75"; - sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5"; + version = "2.27"; + patchSuffix = ""; + sha256 = "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji"; cross = if buildPlatform != hostPlatform then hostPlatform else null; in @@ -29,7 +30,7 @@ assert withLinuxHeaders -> linuxHeaders != null; assert withGd -> gd != null && libpng != null; stdenv.mkDerivation ({ - inherit installLocales; + inherit version installLocales; linuxHeaders = if withLinuxHeaders then linuxHeaders else null; # The host/target system. @@ -41,13 +42,6 @@ stdenv.mkDerivation ({ patches = [ - /* No tarballs for stable upstream branch, only https://sourceware.org/git/?p=glibc.git - $ git co release/2.25/master; git describe - glibc-2.25-49-gbc5ace67fe - $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz - */ - ./2.26-75.patch.gz - /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch @@ -64,33 +58,49 @@ 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 + + /* Allow running with RHEL 6 -like kernels. The patch adds an exception + for glibc to accept 2.6.32 and to tag the ELFs as 2.6.32-compatible + (otherwise the loader would refuse libc). + Note that glibc will fully work only on their heavily patched kernels + and we lose early mismatch detection on 2.6.32. + + On major glibc updates we should check that the patched kernel supports + all the required features. ATM it's verified up to glibc-2.26-131. + # HOWTO: check glibc sources for changes in kernel requirements + git log -p glibc-2.25.. sysdeps/unix/sysv/linux/x86_64/kernel-features.h sysdeps/unix/sysv/linux/kernel-features.h + # get kernel sources (update the URL) + mkdir tmp && cd tmp + curl http://vault.centos.org/6.9/os/Source/SPackages/kernel-2.6.32-696.el6.src.rpm | rpm2cpio - | cpio -idmv + tar xf linux-*.bz2 + # check syscall presence, for example + less linux-*?/arch/x86/kernel/syscall_table_32.S + */ + ./allow-kernel-2.6.32.patch ] - ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch; + ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch + ++ lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + name = "fix-with-musl.patch"; + url = "https://sourceware.org/bugzilla/attachment.cgi?id=10151&action=diff&collapsed=&headers=1&format=raw"; + sha256 = "18kk534k6da5bkbsy1ivbi77iin76lsna168mfcbwv4ik5vpziq2"; + }); postPatch = - # Needed for glibc to build with the gnumake 3.82 - # http://comments.gmane.org/gmane.linux.lfs.support/31227 '' + # Needed for glibc to build with the gnumake 3.82 + # http://comments.gmane.org/gmane.linux.lfs.support/31227 sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile - '' - # nscd needs libgcc, and we don't want it dynamically linked - # because we don't want it to depend on bootstrap-tools libs. - + '' + + # nscd needs libgcc, and we don't want it dynamically linked + # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile - '' - # Replace the date and time in nscd by a prefix of $out. - # It is used as a protocol compatibility check. - # Note: the size of the struct changes, but using only a part - # would break hash-rewriting. When receiving stats it does check - # that the struct sizes match and can't cause overflow or something. - + '' - cat ${./glibc-remove-datetime-from-nscd.patch} \ - | sed "s,@out@,$out," | patch -p1 ''; configureFlags = [ "-C" "--enable-add-ons" + "--enable-obsolete-nsl" "--enable-obsolete-rpc" "--sysconfdir=/etc" "--enable-stackguard-randomization" @@ -103,7 +113,6 @@ stdenv.mkDerivation ({ ] ++ lib.optionals withLinuxHeaders [ "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (cross != null) [ - (if cross.withTLS then "--with-tls" else "--without-tls") (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" @@ -120,7 +129,8 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; - nativeBuildInputs = lib.optional (cross != null) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ bison ]; buildInputs = lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to @@ -132,8 +142,7 @@ stdenv.mkDerivation ({ // (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // { - name = name + "-${version}${patchSuffix}" + - lib.optionalString (cross != null) "-${cross.config}"; + name = name + "-${version}${patchSuffix}"; src = fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.xz"; @@ -166,14 +175,7 @@ stdenv.mkDerivation ({ 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"; @@ -207,6 +209,6 @@ stdenv.mkDerivation ({ # To avoid a dependency on the build system 'bash'. preFixup = '' - rm $bin/bin/{ldd,tzselect,catchsegv,xtrace} + rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace} ''; }) diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch index fc14553c3ee070602532b74ccbd729bf758a4ab1..f84b1049adf8470a50223d26e0c5fad3a7a44a25 100644 --- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch +++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch @@ -1,7 +1,7 @@ -diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c ---- glibc-2.16.0-orig/elf/ldconfig.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/elf/ldconfig.c 2012-09-18 11:59:27.463284814 -0400 -@@ -50,7 +50,7 @@ +diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c +--- glibc-2.27-orig/elf/ldconfig.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/elf/ldconfig.c 2018-02-17 22:43:17.232175182 -0500 +@@ -51,7 +51,7 @@ #endif #ifndef LD_SO_CONF @@ -10,31 +10,31 @@ diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c #endif /* Get libc version number. */ -diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile ---- glibc-2.16.0-orig/elf/Makefile 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400 -@@ -415,12 +415,12 @@ +diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile +--- glibc-2.27-orig/elf/Makefile 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/elf/Makefile 2018-02-17 22:44:50.334006750 -0500 +@@ -559,13 +559,13 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) -SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' --CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +-CFLAGS-ldconfig.c += $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +PREFIX-FLAGS := -D'PREFIX="$(prefix)"' -+CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ ++CFLAGS-ldconfig.c += $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ -D'SLIBDIR="$(slibdir)"' libof-ldconfig = ldconfig --CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) --CFLAGS-cache.c = $(SYSCONF-FLAGS) --CFLAGS-rtld.c = $(SYSCONF-FLAGS) -+CFLAGS-dl-cache.c = $(PREFIX-FLAGS) -+CFLAGS-cache.c = $(PREFIX-FLAGS) -+CFLAGS-rtld.c = $(PREFIX-FLAGS) +-CFLAGS-dl-cache.c += $(SYSCONF-FLAGS) +-CFLAGS-cache.c += $(SYSCONF-FLAGS) +-CFLAGS-rtld.c += $(SYSCONF-FLAGS) ++CFLAGS-dl-cache.c += $(PREFIX-FLAGS) ++CFLAGS-cache.c += $(PREFIX-FLAGS) ++CFLAGS-rtld.c += $(PREFIX-FLAGS) cpp-srcs-left := $(all-rtld-routines:=.os) lib := rtld -diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h ---- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400 +diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h +--- glibc-2.27-orig/sysdeps/generic/dl-cache.h 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/sysdeps/generic/dl-cache.h 2018-02-17 22:45:20.471598816 -0500 @@ -28,7 +28,7 @@ #endif diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index debd7b39c86a0529b466ab36c83f4732d6ac4808..7090c5ceceeca95f5e7ce36914eb2ef7910ff03d 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -6,7 +6,7 @@ https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED */ -{ stdenv, callPackage, writeText +{ stdenv, buildPackages, callPackage, writeText , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] }: @@ -26,7 +26,7 @@ callPackage ./common.nix { inherit stdenv; } { # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. buildPhase = '' - mkdir -p $TMPDIR/"${stdenv.cc.libc.out}/lib/locale" + mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale" # Hack to allow building of the locales (needed since glibc-2.12) sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch index eeaf21901a39bbf4b09aa2f9c45b044b276e9e33..39312951fcf911cc8510ab5b755b746d104b498e 100644 --- a/pkgs/development/libraries/glibc/nix-locale-archive.patch +++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch @@ -1,114 +1,118 @@ -diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive.c ---- glibc-2.16.0-orig/locale/loadarchive.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/loadarchive.c 2012-09-18 11:57:57.277515212 -0400 -@@ -123,6 +123,25 @@ +diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c +--- glibc-2.27-orig/locale/loadarchive.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/loadarchive.c 2018-02-17 22:32:25.680169462 -0500 +@@ -123,6 +123,23 @@ + return MAX (namehash_end, MAX (string_end, locrectab_end)); } - +static int +open_locale_archive (void) +{ + int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ const char *usualpath = "/usr/lib/locale/locale-archive"; -+ if (path) -+ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (path2 && fd < 0) -+ fd = open_not_cancel_2 (path2, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); ++ if (versioned_path) ++ fd = __open_nocancel (versioned_path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (path && fd < 0) ++ fd = __open_nocancel (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + if (fd < 0) -+ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + if (fd < 0) -+ fd = open_not_cancel_2 (usualpath, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = __open_nocancel ("/usr/lib/locale/locale-archive", O_RDONLY|O_LARGEFILE|O_CLOEXEC); + return fd; +} + -+ + /* Find the locale *NAMEP in the locale archive, and return the internalized data structure for its CATEGORY data. If this locale has - already been loaded from the archive, just returns the existing data -@@ -202,7 +221,7 @@ +@@ -202,7 +219,7 @@ archmapped = &headmap; /* The archive has never been opened. */ -- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); +- fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + fd = open_locale_archive (); if (fd < 0) /* Cannot open the archive, for whatever reason. */ return NULL; -@@ -393,8 +412,7 @@ +@@ -397,8 +414,7 @@ if (fd == -1) { struct stat64 st; -- fd = open_not_cancel_2 (archfname, -- O_RDONLY|O_LARGEFILE|O_CLOEXEC); +- fd = __open_nocancel (archfname, +- O_RDONLY|O_LARGEFILE|O_CLOEXEC); + fd = open_locale_archive (); if (fd == -1) /* Cannot open the archive, for whatever reason. */ return NULL; -diff -ru glibc-2.16.0-orig/locale/programs/locale.c glibc-2.16.0/locale/programs/locale.c ---- glibc-2.16.0-orig/locale/programs/locale.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/programs/locale.c 2012-09-18 11:53:03.719920947 -0400 -@@ -628,6 +628,20 @@ - ((const struct nameent *) b)->name); - } +diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/locale.c +--- glibc-2.27-orig/locale/programs/locale.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/programs/locale.c 2018-02-17 22:36:39.726293213 -0500 +@@ -633,6 +633,24 @@ -+static int -+open_nix_locale_archive (const char * fname, int access) + + static int ++open_locale_archive (void) +{ + int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); ++ if (versioned_path) ++ fd = open64 (versioned_path, O_RDONLY); ++ if (path && fd < 0) ++ fd = open64 (path, O_RDONLY); ++ if (fd < 0) ++ fd = open64 (ARCHIVE_NAME, O_RDONLY); + if (fd < 0) -+ fd = open64 (fname, access); ++ fd = open64 ("/usr/lib/locale/locale-archive", O_RDONLY); + return fd; +} - - static int ++ ++ ++static int write_archive_locales (void **all_datap, char *linebuf) -@@ -641,7 +655,7 @@ + { + struct stat64 st; +@@ -644,7 +662,7 @@ int fd, ret = 0; uint32_t cnt; - fd = open64 (ARCHIVE_NAME, O_RDONLY); -+ fd = open_nix_locale_archive (ARCHIVE_NAME, O_RDONLY); ++ fd = open_locale_archive (); if (fd < 0) return 0; -diff -ru glibc-2.16.0-orig/locale/programs/locarchive.c glibc-2.16.0/locale/programs/locarchive.c ---- glibc-2.16.0-orig/locale/programs/locarchive.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/programs/locarchive.c 2012-09-18 11:53:03.720920942 -0400 -@@ -509,6 +509,20 @@ - *ah = new_ah; +diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/programs/locarchive.c +--- glibc-2.27-orig/locale/programs/locarchive.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/programs/locarchive.c 2018-02-17 22:40:51.245293975 -0500 +@@ -117,6 +117,22 @@ } + +static int -+open_nix_locale_archive (const char * fname, int access) ++open_locale_archive (const char * archivefname, int flags) +{ + int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); ++ if (versioned_path) ++ fd = open64 (versioned_path, flags); ++ if (path && fd < 0) ++ fd = open64 (path, flags); + if (fd < 0) -+ fd = open64 (fname, access); ++ fd = open64 (archivefname, flags); + return fd; +} - - void - open_archive (struct locarhandle *ah, bool readonly) -@@ -528,7 +542,7 @@ ++ ++ + static void + create_archive (const char *archivefname, struct locarhandle *ah) + { +@@ -578,7 +594,7 @@ while (1) { /* Open the archive. We must have exclusive write access. */ - fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); -+ fd = open_nix_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); ++ fd = open_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); if (fd == -1) { - /* Maybe the file does not yet exist. */ + /* Maybe the file does not yet exist? If we are opening diff --git a/pkgs/development/libraries/glm/0954.nix b/pkgs/development/libraries/glm/0954.nix deleted file mode 100644 index 4eb3497b0392583451343906d0c911909142bf8d..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/glm/0954.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "glm-0.9.5.4"; - - src = fetchurl { - url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "0v14xssysy3q1h2mga6rqlz722mwbis4rrx76zmvhjqh17qh4l62"; - }; - - buildInputs = [ unzip ]; - - outputs = [ "out" "doc" ]; - - installPhase = '' - mkdir -p "$out/include" - cp -r glm "$out/include" - - mkdir -p "$doc/share/doc/glm" - cp -r doc/* "$doc/share/doc/glm" - ''; - - meta = with stdenv.lib; { - description = "OpenGL Mathematics library for C++"; - longDescription = '' - OpenGL Mathematics (GLM) is a header only C++ mathematics library for - graphics software based on the OpenGL Shading Language (GLSL) - specification and released under the MIT license. - ''; - homepage = http://glm.g-truc.net/; - license = licenses.mit; - branch = "0.9.5.4"; - platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - }; -} diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 0841990fa95d74aabbb8a6a819de9164b0185ee6..319a0359c58169567c59a20fa3da23bc41c9d67a 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,23 +1,39 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, fetchzip, cmake }: stdenv.mkDerivation rec { - name = "glm-0.9.6.1"; + version = "0.9.8.5"; + name = "glm-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "1s1kpf9hpyq6bdf87nhlkxyr2ay0ip9wqicdma9h8yz4vs20r2hs"; + src = fetchzip { + url = "https://github.com/g-truc/glm/releases/download/${version}/${name}.zip"; + sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "doc" ]; - installPhase = '' - mkdir -p "$out/include" - cp -r glm "$out/include" + cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ]; - mkdir -p "$doc/share/doc/glm" - cp -r doc/* "$doc/share/doc/glm" + # fetch newer version of platform.h which correctly supports gcc 7.3 + gcc7PlatformPatch = fetchurl { + url = "https://raw.githubusercontent.com/g-truc/glm/384dab02e45a8ad3c1a3fa0906e0d5682c5b27b9/glm/simd/platform.h"; + sha256 = "0ym0sgwznxhfyi014xs55x3ql7r65fjs34sqb5jiaffkdhkqgzia"; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}' + cp ${gcc7PlatformPatch} glm/simd/platform.h + ''; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ + "-DGLM_COMPILER=0" + ]; + + postInstall = '' + mkdir -p $doc/share/doc/glm + cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm ''; meta = with stdenv.lib; { @@ -33,3 +49,4 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } + diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index 5b55a09db6258198ca805163815844f54540be6b..3ef279616f757091d3c1c0fb29581bc61aaca7d1 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; description = "Library for interacting with smart card devices"; license = licenses.gpl3; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 4ab61a2d2826972aab00dd019ffab452dedb9abc..b9634e01900e58ff307dd1b19084a458d52f3b25 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.63"; + name = "glpk-4.65"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "1xp7nclmp8inp20968bvvfcwmz3mz03sbm0v3yjz8aqwlpqjfkci"; + sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; }; doCheck = true; diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix index 35d97712fa40e10873dfaa73256b15810e4e9748..59357bf6fb1bd20c842e2d823880de0c90a79888 100644 --- a/pkgs/development/libraries/glui/default.nix +++ b/pkgs/development/libraries/glui/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, freeglut, mesa, libXmu, libXext, libX11, libXi}: +{stdenv, fetchurl, freeglut, libGLU_combined, libXmu, libXext, libX11, libXi}: stdenv.mkDerivation { name = "glui-2.35"; - buildInputs = [freeglut mesa libXmu libXext libX11 libXi]; + buildInputs = [freeglut libGLU_combined libXmu libXext libX11 libXi]; preConfigure = ''cd src''; installPhase = '' mkdir -p "$out"/{bin,lib,share/glui/doc,include} diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index d6877e72a1f99e4e5702fd60d362b6b2b5454849..66d0cf88bd0260a8cd35a906cda16af2204517ca 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, gpgme, libidn, gobjectIntrospection }: stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.0.5"; name = "gmime-${version}"; src = fetchurl { url = "mirror://gnome/sources/gmime/3.0/${name}.tar.xz"; - sha256 = "001y93b8mq9alzkvli6vfh3pzdcn5c5iy206ml23lzhhhvm5k162"; + sha256 = "1q45gd1ahnz9q1milc2lqqwl7j3q0wd6kiswhp25iak222n56lrg"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index e3bacc86d58ea50d5f6c1d43fa2d232163ca2f97..5973c89cef79768054321bf29441361213e82bd5 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, m4, cxx ? true , buildPackages -, buildPlatform, hostPlatform , withStatic ? false }: let inherit (stdenv.lib) optional optionalString; in @@ -19,8 +18,8 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; passthru.static = self.out; - nativeBuildInputs = [ m4 ] - ++ stdenv.lib.optional (buildPlatform != hostPlatform) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ m4 ]; configureFlags = # Build a "fat binary", with routines for several sub-architectures @@ -43,7 +42,7 @@ let self = stdenv.mkDerivation rec { configureFlagsArray+=("--build=$(./configfsf.guess)") ''; - doCheck = buildPlatform == hostPlatform; + doCheck = true; # not cross; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0fac97aaa43974c15d9d17a21c33b29e6b45ac5f --- /dev/null +++ b/pkgs/development/libraries/gmtk/default.nix @@ -0,0 +1,32 @@ +{stdenv, substituteAll, fetchFromGitHub, libtool, pkgconfig, intltool, glib, gtk3 +, libpulseaudio, mplayer, gnome_mplayer }: + +stdenv.mkDerivation rec { + name = "gmtk-${version}"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = "kdekorte"; + repo = "gmtk"; + rev = "v${version}"; + sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i"; + }; + + nativeBuildInputs = [ libtool pkgconfig intltool ]; + buildInputs = [ glib gtk3 libpulseaudio ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + mplayer = "${mplayer}/bin/mplayer"; + }) + ]; + + meta = with stdenv.lib; { + description = "Common functions for gnome-mplayer and gecko-mediaplayer"; + homepage = https://sites.google.com/site/kdekorte2/gnomemplayer; + license = licenses.gpl2; + maintainers = gnome_mplayer.meta.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gmtk/fix-paths.patch b/pkgs/development/libraries/gmtk/fix-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..64738300aba42fb1284790bace05075ecf22fd12 --- /dev/null +++ b/pkgs/development/libraries/gmtk/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/src/gmtk_media_player.c ++++ b/src/gmtk_media_player.c +@@ -2449,7 +2449,7 @@ + player->minimum_mplayer = detect_mplayer_features(player); + + if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { +- argv[argn++] = g_strdup_printf("mplayer"); ++ argv[argn++] = g_strdup_printf("@mplayer@"); + } else { + argv[argn++] = g_strdup_printf("%s", player->mplayer_binary); + } +@@ -4135,7 +4135,7 @@ + return ret; + + if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", player->mplayer_binary); + } diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 6691928c021ee4af0b26d1a7ea3c9ee166ff6af9..940b4e2aee4e3ee0f8659275d004578b98d10abb 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnu-efi-${version}"; - version = "3.0.6"; + version = "3.0.8"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; - sha256 = "149cyadpn2jm4zxfn1qmpm520iqssp9p07d650rs5ghgv015jl91"; + sha256 = "08mpw8s79azip9jbzm6msq0999pnkqzd82axydrcyyynm276s03n"; }; buildInputs = [ pciutils ]; @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=\${out}" - "CC=gcc" - "AS=as" - "LD=ld" - "AR=ar" - "RANLIB=ranlib" - "OBJCOPY=objcopy" - ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm"; + "CC=${stdenv.cc.targetPrefix}gcc" + "AS=${stdenv.cc.targetPrefix}as" + "LD=${stdenv.cc.targetPrefix}ld" + "AR=${stdenv.cc.targetPrefix}ar" + "RANLIB=${stdenv.cc.targetPrefix}ranlib" + "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm" + ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64"; meta = with stdenv.lib; { description = "GNU EFI development toolchain"; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 0e8457a8c54b874b864e8e025dc81ef8645931fe..472ec83fb02c404d43f4cca272bcb10a5ab854fc 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv +, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake , yacc, texinfo @@ -52,7 +52,7 @@ stdenv.mkDerivation { # systemkey-args.h. enableParallelBuilding = false; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp + buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp autogen gperftools gperf gettext automake yacc texinfo ] ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv @@ -84,7 +84,7 @@ stdenv.mkDerivation { layer. It adds TLS-KDH ciphers: Kerberos + Diffie-Hellman. ''; - homepage = http://www.gnu.org/software/gnutls://github.com/arpa2/gnutls-kdh; + homepage = https://github.com/arpa2/gnutls-kdh; license = licenses.lgpl21Plus; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gnutls/3.5.10.nix b/pkgs/development/libraries/gnutls/3.5.10.nix index a1eab1a84c117eae5fe666544bde4f6a020d9d63..a44e2b04ed71abda7c7debfb43da1855dc0b0a29 100644 --- a/pkgs/development/libraries/gnutls/3.5.10.nix +++ b/pkgs/development/libraries/gnutls/3.5.10.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix (args // rec { version = "3.5.10"; src = fetchurl { - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; + url = "mirror://gnupg/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 deleted file mode 100644 index 55c917f212e9077e39592196d2c719625de870d3..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "3.5.15"; - - src = fetchurl { - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "1mgsxkbs44csw07ngwbqns2y2s03m975lk1sl5ay87wbic882q04"; - }; - - # 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/3.6.nix b/pkgs/development/libraries/gnutls/3.6.nix new file mode 100644 index 0000000000000000000000000000000000000000..7fb1af70a289df3accc0f2cccfd3380c39af5a7c --- /dev/null +++ b/pkgs/development/libraries/gnutls/3.6.nix @@ -0,0 +1,20 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "3.6.2"; + + src = fetchurl { + url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; + sha256 = "07wdffklwmxpa9i50sh5nwrc5ajb47skrldm6rzjc0jf4dxxpmdw"; + }; + + # 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 + # Change p11-kit test to use pkg-config to find p11-kit + postPatch = '' + sed '2iexit 77' -i tests/pkgconfig.sh + sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c + sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh + ''; +}) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index d2947cd7c6b52f40ad819ce939900db92e812a2f..984603827c8d36adcca10c22fef6b0641a05fad6 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv +, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring , unbound, dns-root-data, gettext @@ -40,9 +40,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ] - ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv - ++ lib.optional stdenv.isDarwin gettext + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound gettext libiconv ] ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile ++ buildInputs; diff --git a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch new file mode 100644 index 0000000000000000000000000000000000000000..f7e1bedd3e183d1260a80ce8f2ab1b488f3d37a3 --- /dev/null +++ b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch @@ -0,0 +1,11 @@ +--- a/gir/cairo-1.0.gir.in ++++ b/gir/cairo-1.0.gir.in +@@ -5,7 +5,7 @@ + xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> + + + 0: -+ match = os.path.join(options.fallback_libpath, match) -+ shlibs.append(match) ++ shlibs.append(os.path.join(options.fallback_libpath, m.group(1))) break if len(patterns) > 0: -diff --git a/giscanner/utils.py b/giscanner/utils.py -index 660081e..c9c767a 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py -@@ -109,17 +109,11 @@ def extract_libtool_shlib(la_file): +@@ -113,17 +113,11 @@ if dlname is None: return None diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index f629b9a8a3c33072ad7ff56a01cf423b6caaccb3..f79511897fbe93647105bb1e9767d6f6a01c8124 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,31 +1,31 @@ { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python -, libintlOrEmpty, cctools +, libintl, cctools, cairo, gnome3 , substituteAll, nixStoreDir ? builtins.storeDir +, x11Support ? true }: # now that gobjectIntrospection creates large .gir files (eg gtk3 case) # it may be worth thinking about using multiple derivation outputs # In that case its about 6MB which could be separated let - ver_maj = "1.54"; - ver_min = "1"; + pname = "gobject-introspection"; + version = "1.56.0"; in with stdenv.lib; stdenv.mkDerivation rec { - name = "gobject-introspection-${ver_maj}.${ver_min}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; - sha256 = "0zl7pfkzkm07733391b4f3cwjbnvb1nwvpmajf5bajh6bxgfv3dq"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d"; }; outputs = [ "out" "dev" ]; outputBin = "dev"; outputMan = "dev"; # tiny pages - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libintl ]; buildInputs = [ flex bison python setupHook/*move .gir*/ ] - ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin cctools; propagatedBuildInputs = [ libffi glib ]; @@ -38,10 +38,23 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - patches = stdenv.lib.singleton (substituteAll { - src = ./absolute_shlib_path.patch; - inherit nixStoreDir; - }); + patches = [ + (substituteAll { + src = ./absolute_shlib_path.patch; + inherit nixStoreDir; + }) + ] ++ stdenv.lib.optional x11Support # https://github.com/NixOS/nixpkgs/issues/34080 + (substituteAll { + src = ./absolute_gir_path.patch; + cairoLib = "${getLib cairo}/lib"; + }); + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gobjectIntrospection"; + }; + }; meta = with stdenv.lib; { description = "A middleware layer between C libraries and language bindings"; diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index 583d8475ec3b49551489c214332bf93c2a513988..a79ce05a38df073e4ef08aa7de89ef2aeda6405d 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -1,5 +1,4 @@ make_gobject_introspection_find_gir_files() { - # required for .typelib files, eg mypaint git version if [ -d "$1/lib/girepository-1.0" ]; then addToSearchPath GI_TYPELIB_PATH $1/lib/girepository-1.0 @@ -11,11 +10,18 @@ make_gobject_introspection_find_gir_files() { fi } -envHooks+=(make_gobject_introspection_find_gir_files) +addEnvHooks "$hostOffset" make_gobject_introspection_find_gir_files + +giDiscoverSelf() { + if [ -d "$prefix/lib/girepository-1.0" ]; then + addToSearchPath GI_TYPELIB_PATH $prefix/lib/girepository-1.0 + fi +} + +preFixupHooks+=(giDiscoverSelf) _multioutMoveGlibGir() { moveToOutput share/gir-1.0 "${!outputDev}" } preFixupHooks+=(_multioutMoveGlibGir) - diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..940882b1742db1adb0124049b896279dfe6f45ce --- /dev/null +++ b/pkgs/development/libraries/godot_headers/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "godot_headers"; + version = "2018-02-09"; + src = fetchFromGitHub { + owner = "GodotNativeTools"; + repo = "godot_headers"; + rev = "51bca3bf5d917341f3e15076c5a9191f8a5118ae"; + sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh"; + }; + buildPhase = "true"; + installPhase = '' + mkdir $out + cp -r . $out/include + ''; + meta = { + homepage = "https://github.com/GodotNativeTools/godot_headers/"; + description = "Headers for the Godot API supplied by the GDNative module"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.twey ]; + }; +} diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 7971448133eafcdf5ecee103a92e94f2b2a9ace8..6cdd19f307dfd895cd522a62ad1bddcf33f65a61 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: stdenv.mkDerivation rec { - name = "goffice-0.10.35"; + name = "goffice-0.10.39"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "c19001afca09dc5446e06605a113d81a57124018a09c5889aeebba16cf1d5738"; + sha256 = "73f23fbf05f3fa98343208b751db04b31a7ff743c2d828e1a0a130c566f1bc4f"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..026f58079f6d15ef9e117ab37e0a260300dea45f --- /dev/null +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobjectIntrospection, python2, gtk3, cairo, glib }: + +let + version = "2.0.4"; +in stdenv.mkDerivation rec { + name = "goocanvas-${version}"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz"; + sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; + }; + + nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; + buildInputs = [ gtk3 cairo glib ]; + + configureFlags = [ + "--disable-python" + ]; + + meta = with stdenv.lib; { + description = "Canvas widget for GTK+ based on the the Cairo 2D library"; + homepage = https://wiki.gnome.org/Projects/GooCanvas; + license = licenses.lgpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix index 1a3a165872748fefdbd638edf7bdb3ae6d57cc96..dbcb0342156b885d4783aae9bdff60dd1f2e5f13 100644 --- a/pkgs/development/libraries/google-gflags/default.nix +++ b/pkgs/development/libraries/google-gflags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "google-gflags-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "gflags"; repo = "gflags"; rev = "v${version}"; - sha256 = "1y5808ky8qhjwv1nf134czz0h2p2faqvjhxa9zxf8mg8hn4ns9wp"; + sha256 = "12wkihc4f07qmhyqk3cjylj8v5xz2bjrq75p7aq1vvvj60fbp58k"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 9773ef8b896e8ae0dfe9735539ac8630df36fb76..68762e344bdb4f5bb909616d2142566bbb83197c 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan -, qtbase ? null }: +, file, which +, autoreconfHook +, git +, texinfo5 +, qtbase ? null +, withPython ? false, swig2 ? null, python ? null +}: let inherit (stdenv) lib system; in stdenv.mkDerivation rec { - name = "gpgme-1.9.0"; + name = "gpgme-${version}"; + version = "1.10.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v"; + sha256 = "14q619lxbk64vz7lih5gjb928qm28jrnn1h3yhsrrff3jw8yv3qs"; }; - 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 @@ -26,11 +25,17 @@ stdenv.mkDerivation rec { [ libgpgerror glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; - nativeBuildInputs = [ pkgconfig gnupg ]; + nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo5 ] + ++ lib.optionals withPython [ python swig2 which ]; + + postPatch ='' + substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file + ''; configureFlags = [ "--enable-fixed-path=${gnupg}/bin" - ]; + "--with-libgpg-error-prefix=${libgpgerror.dev}" + ] ++ lib.optional withPython "--enable-languages=python"; NIX_CFLAGS_COMPILE = # qgpgme uses Q_ASSERT which retains build inputs at runtime unless diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index be869063111c7ecf66bd4e44c8e414fc2fca7818..8243775c6bc176fb9628342d2e6e40902ad21c33 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,22 +1,42 @@ -{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { - majorVersion = "0.4"; - minorVersion = "0.1"; - name = "granite-${majorVersion}.${minorVersion}"; - src = fetchurl { - url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz"; - sha256 = "1pf4jkz3xyn1sqv70063im80ayb5kdsqwqwx11dc7vgypsl458cm"; + name = "granite-${version}"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "granite"; + rev = version; + sha256 = "15l8z1jkqhvappnr8jww27lfy3dwqybgsxk5iccyvnvzpjdh2s0h"; }; - cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [perl cmake vala gobjectIntrospection glib gtk3 gnome3.libgee gettext]; - meta = { + + cmakeFlags = [ + "-DINTROSPECTION_GIRDIR=share/gir-1.0/" + "-DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0" + ]; + + nativeBuildInputs = [ + vala + pkgconfig + cmake + ninja + perl + gettext + gobjectIntrospection + ]; + buildInputs = [ + glib + gtk3 + gnome3.libgee + ]; + + meta = with stdenv.lib; { 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."; - homepage = https://launchpad.net/granite; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.vozz ]; + homepage = https://github.com/elementary/granite; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = [ maintainers.vozz ]; }; } diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/development/libraries/grantlee/5/setup-hook.sh index d11ef5883a1fd85d29bd7db54f0b78f2ad7c1c51..b51cb4a319091ccb168aa0b5ad31d121cd1f6bfb 100644 --- a/pkgs/development/libraries/grantlee/5/setup-hook.sh +++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh @@ -4,20 +4,10 @@ providesGrantleeRuntime() { [ -d "$1/$grantleePluginPrefix" ] } -_grantleeCrossEnvHook() { - if providesQtRuntime "$1"; then - propagatedBuildInputs+=" $1" - propagatedUserEnvPkgs+=" $1" - fi -} -crossEnvHooks+=(_grantleeCrossEnvHook) - _grantleeEnvHook() { if providesGrantleeRuntime "$1"; then - propagatedNativeBuildInputs+=" $1" - if [ -z "$crossConfig" ]; then + propagatedBuildInputs+=" $1" propagatedUserEnvPkgs+=" $1" - fi fi } -envHooks+=(_grantleeEnvHook) +addEnvHooks "$hostOffset" _grantleeEnvHook diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index f091fedeb2deccbc15b1f97a05b30cf093db2f07..61409279ded7e697c2fc17976de8efa581866e82 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec{ name = "grib-api-${version}"; - version = "1.19.0"; + version = "1.26.0"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz"; - sha256 = "07cj9mw5bb249lxx1m9nmfdqb8b2a8cm7s6x62cdwca3sp16dv6a"; + sha256 = "00cmmj44bhdlzhqbvwb3bb4xks3bpva669m6g3g6ffjaqm25b90c"; }; preConfigure = '' diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9f9166e43c9fb786373bff0afab80fa5a90ef7d1 --- /dev/null +++ b/pkgs/development/libraries/grpc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: + +stdenv.mkDerivation rec { + version = "1.10.0"; + name = "grpc-${version}"; + src = fetchurl { + url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz"; + sha256 = "0wngrb44bpryrvrnx5y1ncrhi2097qla929wqjwvs0razbk3v9rr"; + }; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; + cmakeFlags = + [ "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_SSL_PROVIDER=package" + "-DgRPC_PROTOBUF_PROVIDER=package" + "-DgRPC_GFLAGS_PROVIDER=package" + ]; + enableParallelBuilds = true; + + meta = with stdenv.lib; { + description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; + license = licenses.asl20; + homepage = https://grpc.io/; + }; +} diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9e893932a64c6eeae57f89d8a9878dfc51ac57b4 --- /dev/null +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchbzr, pkgconfig, qmake, qtbase, qtdeclarative, glib, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsettings-qt-${version}"; + version = "0.1.20170824"; + + src = fetchbzr { + url = http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk; + rev = "85"; + sha256 = "1kcw0fgdyndx9c0dyha11wkj0gi05spdc1adf1609mrinbb4rnyi"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + gobjectIntrospection + ]; + + buildInputs = [ + glib + qtdeclarative + ]; + + patchPhase = '' + # force ordered build of subdirs + sed -i -e "\$aCONFIG += ordered" gsettings-qt.pro + + # It seems that there is a bug in qtdeclarative: qmlplugindump fails + # because it can not find or load the Qt platform plugin "minimal". + # A workaround is to set QT_PLUGIN_PATH and QML2_IMPORT_PATH explicitly. + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + export QML2_IMPORT_PATH=${qtdeclarative.bin}/${qtbase.qtQmlPrefix} + + substituteInPlace GSettings/gsettings-qt.pro \ + --replace '$$[QT_INSTALL_QML]' "$out/$qtQmlPrefix" \ + --replace '$$[QT_INSTALL_BINS]/qmlplugindump' "qmlplugindump" + + substituteInPlace src/gsettings-qt.pro \ + --replace '$$[QT_INSTALL_LIBS]' "$out/lib" \ + --replace '$$[QT_INSTALL_HEADERS]' "$out/include" + ''; + + preInstall = '' + # do not install tests + for f in tests/Makefile{,.cpptest}; do + substituteInPlace $f \ + --replace "install: install_target" "install: " + done + ''; + + meta = with stdenv.lib; { + description = "Qt/QML bindings for GSettings"; + homepage = https://launchpad.net/gsettings-qt; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index afd6391d719b6c3c72498b4eb20ca3d27d7e67f2..f1eed726eb2ba33af460326433c62114e9a0e9ed 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html ]; - doCheck = stdenv.system != "i686-linux"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html + # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html + doCheck = stdenv.system != "i686-linux" && stdenv.system != "aarch64-linux"; meta = { description = "The GNU Scientific Library, a large numerical library"; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 42d36b8406e21933d97125eb44bdb681a0203d72..57112e2825eeb954a7592f48f22993f407e32a93 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { name = "gsm-${version}"; - version = "1.0.14"; + version = "1.0.17"; src = fetchurl { url = "http://www.quut.com/gsm/${name}.tar.gz"; - sha256 = "0b1mx69jq88wva3wk0hi6fcl5a52qhnq2f9p3f3jdh5k61ma252q"; + sha256 = "00bns0d4wwrvc60lj2w7wz4yk49q1f6rpdrwqzrxsha9d78mfnl5"; }; patchPhase = '' diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 55e20065732c78e9d24f058769ce16ca949b2e17..d48ba9082af216c10d8eba92cb98b2a1dfb78346 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gssdp-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz"; - sha256 = "1qfj4gir1qf6v86z70ryzmjb75ns30q6zi5p89vhd3621gs6f7b0"; + sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 2e0e711ce71d1b4a65d3f775b2599f41140a153e..73cbaa0f8070afd35ef280c49b27723a08f695ea 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc +{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext +, pkgconfig, python, gst-plugins-base, orc , faacSupport ? false, faac ? null -, gtkSupport ? false, gtk3 ? null , faad2, libass, libkate, libmms -, libmodplug, mpeg2dec, mpg123 +, libmodplug, mpeg2dec , openjpeg, libopus, librsvg , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls, mjpegtools -, mesa, libintlOrEmpty, libgme +, libGLU_combined, libintl, libgme , openssl, x265, libxml2 }: assert faacSupport -> faac != null; -assert gtkSupport -> gtk3 != null; let inherit (stdenv.lib) optional optionalString; + + # OpenJPEG version is hardcoded in package source + openJpegVersion = with stdenv; + lib.concatStringsSep "." (lib.lists.take 2 + (lib.splitString "." (lib.getVersion openjpeg))); + in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.12.2"; + name = "gst-plugins-bad-1.14.0"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -29,35 +34,47 @@ stdenv.mkDerivation rec { a real live maintainer, or some actual wide use. ''; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; + preConfigure = '' + patchShebangs . + ''; + + patches = [ + (fetchpatch { + url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370409"; + sha256 = "0hy0rcn35alq65yqwri4fqjz2hf3nyyg5c7rnndk51msmqjxpprk"; + }) + ./fix_pkgconfig_includedir.patch + ]; + src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0dwyq03g2m0p16dwx8q5qvjn5x9ia72h21sf87mp97gmwkfpwb4w"; + sha256 = "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ meson ninja pkgconfig python gettext ]; buildInputs = [ gst-plugins-base orc - faad2 gtk3 libass libkate libmms - libmodplug mpeg2dec mpg123 + faad2 libass libkate libmms + libmodplug mpeg2dec openjpeg libopus librsvg fluidsynth libvdpau - libwebp xvidcore gnutls mesa - mjpegtools libgme openssl x265 libxml2 + libwebp xvidcore gnutls libGLU_combined + libgme openssl x265 libxml2 + libintl ] - ++ 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 - ++ optional (!stdenv.isDarwin) wildmidi; + ++ optional (!stdenv.isDarwin) wildmidi + # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin + ++ optional (!stdenv.isDarwin) mjpegtools; - LDFLAGS = optionalString stdenv.isDarwin "-lintl"; + enableParallelBuilding = true; } diff --git a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch new file mode 100644 index 0000000000000000000000000000000000000000..c687fffc9c08a5f7c8d1e2a01df22250ccf929b2 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build +index 271f327f3..7e2afa754 100644 +--- a/pkgconfig/meson.build ++++ b/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', join_paths(get_option('prefix'))) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', api_version) + pkgconf.set('VERSION', gst_version) + diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 2ff429179642fc77919e10bff1e9c5b592a282cd..b3a4f445289ed16bc98c2817d7776f61670470ea 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection -, orc, alsaLib, libXv, pango, libtheora -, cdparanoia, libvisual, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, meson +, ninja, gettext, gobjectIntrospection, python +, gstreamer, orc, alsaLib, libXv, pango, libtheora +, wayland, cdparanoia, libvisual, libintl }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.12.2"; + name = "gst-plugins-base-1.14.0"; meta = { description = "Base plugins and helper libraries"; @@ -15,32 +16,34 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "0x86a7aph0y6gyq178plvwvbbyhkfb3hf0gadx9sk5z1mzixqrsh"; + sha256 = "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig python gobjectIntrospection + pkgconfig python meson ninja gettext gobjectIntrospection ]; buildInputs = [ - orc libXv pango libtheora cdparanoia + orc libXv pango libtheora cdparanoia libintl wayland ] - ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isLinux alsaLib ++ stdenv.lib.optional (!stdenv.isDarwin) libvisual; propagatedBuildInputs = [ gstreamer ]; - configureFlags = if stdenv.isDarwin then [ - # Does not currently build on Darwin - "--disable-libvisual" - # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia - "--disable-cdparanoia" - ] else null; - - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + preConfigure = '' + patchShebangs . + ''; enableParallelBuilding = true; + + patches = [ + (fetchpatch { + url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370414"; + sha256 = "07x43xis0sr0hfchf36ap0cibx0lkfpqyszb3r3w9dzz301fk04z"; + }) + ./fix_pkgconfig_includedir.patch + ]; } diff --git a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch new file mode 100644 index 0000000000000000000000000000000000000000..04486a4647f9114e65620be488b7ea00a75488e1 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build +index 04abfbee5..88c86b431 100644 +--- a/pkgconfig/meson.build ++++ b/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', get_option('prefix')) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', api_version) + pkgconf.set('VERSION', gst_version) + pkgconf.set('LIBM', libm.found() ? '-lm' : '') diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index fa69d358394cb176125a9311c0a23b40401cdf9c..ab3f78767a1c3b7e91e39d793024b46197776b4b 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection -, glib, makeWrapper -, darwin +{ stdenv, fetchurl, fetchpatch, meson, ninja +, pkgconfig, gettext, gobjectIntrospection +, bison, flex, python3, glib, makeWrapper +, libcap,libunwind, darwin }: stdenv.mkDerivation rec { - name = "gstreamer-1.12.2"; + name = "gstreamer-1.14.0"; meta = { description = "Open source multimedia framework"; @@ -16,31 +17,37 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "1fllz7n58lavyy4nh64xc7izd4ffhl12a2ff0yg4z67al8wkzplz"; + sha256 = "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw"; }; + patches = [ + (fetchpatch { + url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370411"; + sha256 = "16plzzmkk906k4892zq68j3c9z8vdma5nxzlviq20jfv04ykhmk2"; + }) + ./fix_pkgconfig_includedir.patch + ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; nativeBuildInputs = [ - pkgconfig perl bison flex python gobjectIntrospection makeWrapper + meson ninja pkgconfig gettext bison flex python3 makeWrapper gobjectIntrospection ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; + buildInputs = [ libcap libunwind ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; propagatedBuildInputs = [ glib ]; - enableParallelBuilding = true; - - preConfigure = '' - configureFlagsArray+=("--exec-prefix=$dev") - ''; - postInstall = '' for prog in "$dev/bin/"*; do wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" done ''; + preConfigure= '' + patchShebangs . + ''; + preFixup = '' moveToOutput "share/bash-completion" "$dev" ''; diff --git a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch new file mode 100644 index 0000000000000000000000000000000000000000..c388a82fa2a8409ad823d7cc4d5e410e22117bd9 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build +index edb0586c2..7ed46dfce 100644 +--- a/pkgconfig/meson.build ++++ b/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', join_paths(get_option('prefix'))) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', apiversion) + pkgconf.set('VERSION', gst_version) + pkgconf.set('LIBM', mathlib.found() ? '-lm' : '') diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh index 3dd7812ece6dbdcda5c77af65d76160ee0c2cdf3..b8c741af578fd05aa678ab7a4d55cae89aec6ae6 100644 --- a/pkgs/development/libraries/gstreamer/core/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh @@ -5,5 +5,5 @@ addGstreamer1LibPath () { fi } -envHooks+=(addGstreamer1LibPath) +addEnvHooks "$hostOffset" addGstreamer1LibPath diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 76cffa89dbc533e6f7a30ccc7e4437d3ee0264e3..9aec87634040905815c7a03ec55a81d29059e41c 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ callPackage, libva-full }: +{ callPackage }: rec { gstreamer = callPackage ./core { }; @@ -13,17 +13,14 @@ rec { gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; }; - gst-libav = callPackage ./libav { inherit gst-plugins-base; }; + gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base; }; - gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; + gst-libav = callPackage ./libav { inherit gst-plugins-base; }; - # TODO: gnonlin is deprecated in gst-editing-services, better switch to nle - # (Non Linear Engine). - gst-editing-services = callPackage ./ges { inherit gnonlin; }; + gst-editing-services = callPackage ./ges { inherit gst-plugins-base; }; gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; - libva = libva-full; # looks also for libva-{x11,wayland} }; gst-validate = callPackage ./validate { inherit gst-plugins-base; }; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index e206f317d4ba1be5df5417f540f767b9fed40109..895f298c826966176fb13a28f9d9236864c6f0a1 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, python, gobjectIntrospection -, gnonlin, libxml2, flex, perl +{ stdenv, fetchurl, fetchpatch, meson, ninja +, pkgconfig, python, gst-plugins-base, libxml2 +, flex, perl, gettext, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.12.2"; + name = "gstreamer-editing-services-1.14.0"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -14,12 +15,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "0bi0f487949k9xnl1r6ngysgaibmmswwgdqcrchg0dixnnbm9isr"; + sha256 = "14cdd6y9p4k603hsnyhdjw2igg855gwpx0362jmg8k1gagmr0pwd"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection python flex perl ]; - propagatedBuildInputs = [ gnonlin libxml2 ]; + propagatedBuildInputs = [ gst-plugins-base libxml2 ]; + + patches = [ + (fetchpatch { + url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370413"; + sha256 = "1xcgbs18g6n5p7z7kqj7ffakwmkxq7ijajyvhyl7p3zvqll9dc7x"; + }) + ./fix_pkgconfig_includedir.patch + ]; } diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch new file mode 100644 index 0000000000000000000000000000000000000000..1e12f3bbfbeac417eee9dca65ac5d5e4f0284fd5 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build +index a612b21b..c017eaff 100644 +--- a/pkgconfig/meson.build ++++ b/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', get_option('prefix')) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', apiversion) + pkgconf.set('VERSION', gst_version) + diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix deleted file mode 100644 index c04b64ae3c6a389c87ca5af06d02dc54668a1f42..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig -, gst-plugins-base -}: - -stdenv.mkDerivation rec { - name = "gnonlin-1.4.0"; - - meta = with stdenv.lib; { - description = "Gstreamer Non-Linear Multimedia Editing Plugins"; - homepage = "https://gstreamer.freedesktop.org"; - longDescription = '' - Gnonlin is a library built on top of GStreamer which provides - support for writing non-linear audio and video editing - applications. It introduces the concept of a timeline. - ''; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - }; - - src = fetchurl { - url = "${meta.homepage}/src/gnonlin/${name}.tar.xz"; - sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ gst-plugins-base ]; -} diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 1c7f7951e916cf1dbc941c5ef17b17d8cab02881..5c10221b27d7994e6280707a21ecb8e01407d686 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, python -, gst-plugins-base, orc, bzip2 +{ stdenv, fetchurl, meson, ninja, pkgconfig, python +, gst-plugins-base, orc, bzip2, gettext , libv4l, libdv, libavc1394, libiec61883 , libvpx, speex, flac, taglib, libshout , cairo, gdk_pixbuf, aalib, libcaca -, libsoup, libpulseaudio, libintlOrEmpty -, darwin +, libsoup, libpulseaudio, libintl +, darwin, lame, mpg123, twolame +, gtkSupport ? false, gtk3 ? null }: +assert gtkSupport -> gtk3 != null; + let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.12.2"; + name = "gst-plugins-good-1.14.0"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -27,27 +30,22 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "15pfw54fsh9s9xwrnbap4z4njwgqdfvq52k562d2hc5b11rfx4am"; + sha256 = "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python ]; + patches = [ ./fix_pkgconfig_includedir.patch ]; + + nativeBuildInputs = [ pkgconfig python meson ninja gettext ]; buildInputs = [ gst-plugins-base orc bzip2 libdv libvpx speex flac taglib cairo gdk_pixbuf aalib libcaca - libsoup libshout + libsoup libshout lame mpg123 twolame libintl ] - ++ libintlOrEmpty ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; - preFixup = '' - mkdir -p "$dev/lib/gstreamer-1.0" - mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0" - ''; - - LDFLAGS = optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch new file mode 100644 index 0000000000000000000000000000000000000000..f68ad603a37cc075c8cdf194f84715af8333836e --- /dev/null +++ b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build +index b3bf0d4d4..3e6e576c0 100644 +--- a/pkgconfig/meson.build ++++ b/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', get_option('prefix')) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', api_version) + pkgconf.set('VERSION', gst_version) + diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index f6138fafaefce24c0f3824f9fa44b8d89ed32a30..14e27ab6068c61f3c5f1af7e9829db375ce4b492 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1 }: let - ver_maj = "1.8"; + ver_maj = "1.10"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,16 +9,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz"; - sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry"; + sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y"; }; - patches = [ - (fetchurl { - url = https://bug783628.bugzilla-attachments.gnome.org/attachment.cgi?id=354765; - sha256 = "082510a934bl05mz4cyakp8mfmd97cdj7vdrbvyqc4g58dcskvz0"; - }) - ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig file ]; @@ -31,8 +24,8 @@ stdenv.mkDerivation rec { description = "C++ interface for GStreamer"; homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html; license = licenses.lgpl21Plus; + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index bdb1b6c7bb7a4cb07467555e5d42e59f8ee55ab2..77465645d2376d59fb55ddb3be20e09a245929b5 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { sha256 = "148lw51dm6pgw8vc6v0fpvm7p233wr11nspdzmvq7bjp2cd7vbhf"; }; + postInstall = '' + # Fixes CVE-2016-9447 + # Does not actually impact NSF playback + rm -v $out/lib/gstreamer-0.10/libgstnsf.so + ''; + buildInputs = [ pkgconfig glib gstreamer gst-plugins-base libdvdnav libdvdread orc ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 2c2e1b0da122edb3f2faaacf9f448b26dc9d6c47..8371b2780409214dfc66ec8cb199cde3d3f64565 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc -, libintlOrEmpty +, libintl , ApplicationServices , # Whether to build no plugins that have external dependencies # (except the ALSA plugin). @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # TODO : v4l, libvisual buildInputs = - [ pkgconfig glib cairo orc ] + [ pkgconfig glib cairo orc libintl ] # can't build alsaLib on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) @@ -37,11 +37,8 @@ stdenv.mkDerivation rec { liboil ] # can't build cdparanoia on darwin ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia - ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - propagatedBuildInputs = [ gstreamer ]; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index d533f798d99945745eba2526ca80b25d607766cf..75583624f5457e4a2e6c7355c74f60c674cc7492 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc -, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty +, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl , # Whether to build no plugins that have external dependencies # (except the PulseAudio plugin). minimalDeps ? false @@ -23,15 +23,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-experimental" "--disable-oss" ]; buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base ] + [ pkgconfig glib gstreamer gst-plugins-base libintl ] ++ lib.optional stdenv.isLinux libpulseaudio - ++ libintlOrEmpty ++ lib.optionals (!minimalDeps) [ aalib libcaca cairo libdv flac libjpeg libpng speex taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ]; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - enableParallelBuilding = true; postInstall = lib.optionalString (!minimalDeps) '' diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 5c289fb3911445c41bda4b3f2b2f1d96564fc758..ac680f8432ab062684699a9d2f3ea5df099779e9 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base -, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintlOrEmpty }: +, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintl }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-0.10.19"; @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty; - - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + [ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame libintl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index 55d34a3fada330c3fa541cbe7719c2d8860713a0..e46ecfb7612708af4c8d6d4a3770e45334786789 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintlOrEmpty }: +{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintl }: stdenv.mkDerivation rec { name = "gstreamer-0.10.36"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libintl ]; buildInputs = [ perl bison flex ]; - propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty; + propagatedBuildInputs = [ glib libxml2 ]; patchPhase = '' sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh index e89aeda5bc1cb7d8a7544b9e0d543096c33950d8..65ce26112519dd1b0548bdedb4ba96384b374b72 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh @@ -5,4 +5,4 @@ addGstreamerLibPath () { fi } -envHooks+=(addGstreamerLibPath) +addEnvHooks "$hostOffset" addGstreamerLibPath diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 7c0a05f8202be1785e9f59e05f068165a12e4a69..564b37fab7945d14e1a02665bd1d3f41827fa3e5 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, python, yasm -, gst-plugins-base, orc, bzip2 -, withSystemLibav ? true, libav ? null +{ stdenv, fetchurl, meson, ninja, pkgconfig +, python, yasm, gst-plugins-base, orc, bzip2 +, gettext, withSystemLibav ? true, libav ? null }: # Note that since gst-libav-1.6, libav is actually ffmpeg. See @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.12.2"; + name = "gst-libav-1.14.0"; meta = { homepage = https://gstreamer.freedesktop.org; @@ -19,16 +19,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "1crdahkjm23byg1awcrjkmgfbalfpvvac7h7whm6b2r1pfwkbdsv"; + sha256 = "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv"; }; outputs = [ "out" "dev" ]; - configureFlags = stdenv.lib.optionalString withSystemLibav - "--with-system-libav"; - nativeBuildInputs = with stdenv.lib; - [ pkgconfig python ] + [ meson ninja gettext pkgconfig python ] ++ optional (!withSystemLibav) yasm ; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9ff799b0a27b5d4f749067201b837b86b4108f1a --- /dev/null +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig +, gst-plugins-base, gettext, gobjectIntrospection +}: + +stdenv.mkDerivation rec { + name = "gst-rtsp-server-1.14.0"; + + meta = with stdenv.lib; { + description = "Gstreamer RTSP server"; + homepage = "https://gstreamer.freedesktop.org"; + longDescription = '' + a library on top of GStreamer for building an RTSP server. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ bkchr ]; + }; + + src = fetchurl { + url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz"; + sha256 = "0mlp9ms5hfbyzyvmc9xgi7934g4zrh1sbgky2p9zc5fqprvs0rbb"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ meson ninja gettext gobjectIntrospection pkgconfig ]; + + buildInputs = [ gst-plugins-base ]; +} diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 610f10075a8deac32bb711beb14e321c5b113d08..a5449abb9f7d0bc474a3fbb9ae7aa6fa522e8d23 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, python -, gst-plugins-base, orc +{ stdenv, fetchurl, meson, ninja, pkgconfig, python +, gst-plugins-base, orc, gettext , a52dec, libcdio, libdvdread -, lame, libmad, libmpeg2, x264, libintlOrEmpty +, libmad, libmpeg2, x264, libintl }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.12.2"; + name = "gst-plugins-ugly-1.14.0"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -22,18 +22,17 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "0rplyp1qk359c97ig9i2vc1v34g92khd8dslwfipva1ypwmr9hqw"; + sha256 = "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ meson ninja gettext pkgconfig python ]; buildInputs = [ gst-plugins-base orc a52dec libcdio libdvdread - lame libmad libmpeg2 x264 - ] ++ libintlOrEmpty; - - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + libmad libmpeg2 x264 + libintl + ]; } diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index becd4cf0d921ea069d7bcd03e6231e8c2015480e..11b451e76fdfce3957e30817c65138e51f31152f 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,32 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland -, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm +{ stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland +, libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm , libvpx, python }: stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "1.12.2"; + version = "1.14.0"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "0fhncs27hcdcnb9a4prkxlyvr883hnzsx148zzk7lg2b8zh19ir3"; + sha256 = "1whxk428badv8ibji00sn6hj17cp8l9n93rr948bz2gjbq41zqz4"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ meson ninja pkgconfig bzip2 ]; buildInputs = [ gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM - xorg.libICE mesa nasm libvpx python + xorg.libICE libGLU_combined nasm libvpx python ]; - preConfigure = " + preConfigure = '' export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0 mkdir -p $GST_PLUGIN_PATH_1_0 - "; - configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0"; + ''; meta = { homepage = https://gstreamer.freedesktop.org; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 9704ca1d743c07e22432bdb7c26eb11470565b85..bd33d9c528078dc70c0960a71397493a61d223a7 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base -, python, gobjectIntrospection, json_glib +, python, gobjectIntrospection, json-glib }: stdenv.mkDerivation rec { - name = "gst-validate-1.12.2"; + name = "gst-validate-1.14.0"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "1pgycs35bwmp4aicyxwyzlfy1i5l2rzmh2a8ivhgy21azp8jaykb"; + sha256 = "1pzzxqkv1spjrzpzpazdm2h4s2wk7gg5gag8nxj5v2gjfyzhiprk"; }; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python json_glib + python json-glib ]; propagatedBuildInputs = [ gstreamer gst-plugins-base ]; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 45222b7d7fcc1e249223ff3edd96c1dba35b5a3a..d35e47f312f9f3d5bca32ce84f687324aeaa4aaf 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg -, gdk_pixbuf, libintlOrEmpty, xlibsWrapper +, gdk_pixbuf, xlibsWrapper, gobjectIntrospection , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null , gdktarget ? "x11" @@ -12,11 +12,11 @@ assert cupsSupport -> cups != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "gtk+-2.24.31"; + name = "gtk+-2.24.32"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658"; + sha256 = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -24,11 +24,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = optionalString (libintlOrEmpty != []) "-lintl"; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ setupHook perl pkgconfig gettext ]; + nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ]; patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ]; @@ -38,7 +36,6 @@ stdenv.mkDerivation rec { libXrandr libXrender libXcomposite libXi libXcursor ] ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ] - ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ] ++ optionals stdenv.isDarwin [ AppKit Cocoa ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 1d0930d8d03c09f7721f2b093d5b4c20e1fc2312..dc6a519dfadec26e974768591eefecf9cfe180f7 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xorg, epoxy, json_glib, libxkbcommon, gmp -, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols +{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info +, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection +, xorg, epoxy, json-glib, libxkbcommon, gmp +, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null -, darwin +, darwin, gnome3 }: assert cupsSupport -> cups != null; @@ -12,37 +12,40 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - ver_maj = "3.22"; - ver_min = "24"; - version = "${ver_maj}.${ver_min}"; + version = "3.22.29"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b"; + url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz"; + sha256 = "1y5vzdbgww9l7xcrg13azff2rs94kggkywmpcsh39h7w76wn8zd0"; }; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl makeWrapper ]; - patches = [ ./3.0-immodules.cache.patch ]; + patches = [ + ./3.0-immodules.cache.patch + (fetchpatch { + name = "Xft-setting-fallback-compute-DPI-properly.patch"; + url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; + sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; + }) + ]; - buildInputs = [ libxkbcommon epoxy json_glib ]; + buildInputs = [ libxkbcommon epoxy json-glib ]; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk + [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] - ++ optionals waylandSupport [ wayland wayland-protocols ] + ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; #TODO: colord? - NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl"; - # demos fail to install, no idea where's the problem preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; @@ -67,8 +70,20 @@ stdenv.mkDerivation rec { moveToOutput bin/gtk-update-icon-cache "$out" # Launcher moveToOutput bin/gtk-launch "$out" + + # TODO: patch glib directly + for f in $dev/bin/gtk-encode-symbolic-svg; do + wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + done ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtk+"; + attrPath = "gtk3"; + }; + }; + meta = with stdenv.lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index f9ce0aa4b81edb600247215d50b43c4bd7d33561..0171a4b6833b071db23143ca1374a35f257ed653 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, gobjectIntrospection }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gtk-mac-integration-2.0.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobjectIntrospection ]; buildInputs = [ glib ]; propagatedBuildInputs = [ gtk ]; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index ffbab3fce421b153e9d475dfaed633c35dd8388e..5a4cf75048f7dcdbf33df0dec26e2912c118292e 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D binding and OO wrapper for GTK+"; homepage = https://gtkd.org; - licence = licenses.lgpl3Plus; + license = licenses.lgpl3Plus; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index de5fd8343e3e70844dff136989cd78d6ec471ef8..d074f51d3ca0e7b93f74b5c42872d835948a7552 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2 }: stdenv.mkDerivation rec { - name = "gtkdatabox-0.9.2.0"; + name = "gtkdatabox-0.9.3.0"; src = fetchurl { url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz"; - sha256 = "0h20685bzw5j5h6mw8c6apbrbrd9w518c6xdhr55147px11nhnkl"; + sha256 = "1wigd4bdlrz4pma2l2wd3z8sx7pqmsvq845nya5vma9ibi96nhhz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 469c6adc6f76532b698d1076eb606eb59067e6b5..69fd3f30e92dc193f408b184594694f948817692 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -11,12 +11,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; doCheck = true; + enableParallelBuilding = true; + meta = { description = "C++ interface to the GTK+ graphical user interface library"; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch b/pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch rename to pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..673eb1e52c444e95c59b45c6045e51ab8c80e11f --- /dev/null +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40 +, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }: + +let + checkInputs = [ xvfb_run dbus ]; +in stdenv.mkDerivation rec { + name = "gtksourceview-${version}"; + version = "3.24.6"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; + }; + + propagatedBuildInputs = [ + # Required by gtksourceview-3.0.pc + gtk3 + # Used by gtk_source_language_manager_guess_language + shared-mime-info + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection vala_0_40 ] + ++ stdenv.lib.optionals doCheck checkInputs; + + buildInputs = [ atk cairo glib pango libxml2 ]; + + preBuild = '' + substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" + ''; + + patches = [ ./3.x-nix_share_path.patch ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + + enableParallelBuilding = true; + + doCheck = stdenv.isLinux; + checkPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtksourceview"; + attrPath = "gnome3.gtksourceview"; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GtkSourceView; + platforms = with platforms; linux ++ darwin; + license = licenses.lgpl21; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch b/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch new file mode 100644 index 0000000000000000000000000000000000000000..a35d9a88d0df28315094b4d8edfc3b8cb0902f93 --- /dev/null +++ b/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch @@ -0,0 +1,11 @@ +--- a/gtksourceview/gtksourceutils.c ++++ b/gtksourceview/gtksourceutils.c +@@ -232,6 +232,8 @@ + NULL)); + } + ++ g_ptr_array_add (dirs, g_build_filename (DATADIR, GSV_DATA_SUBDIR, basename, NULL)); ++ + g_ptr_array_add (dirs, NULL); + + return (gchar **) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..2501e0253b39d53f33877446f51bdecc4848cb31 --- /dev/null +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40 +, libxml2, perl, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }: + +let + checkInputs = [ xvfb_run dbus ]; +in stdenv.mkDerivation rec { + name = "gtksourceview-${version}"; + version = "4.0.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0amkspjsvxr3rjznmnwjwsgw030hayf6bw49ya4nligslwl7lp3f"; + }; + + propagatedBuildInputs = [ + # Required by gtksourceview-4.0.pc + gtk3 + # Used by gtk_source_language_manager_guess_language + shared-mime-info + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig gettext perl gobjectIntrospection vala_0_40 ] + ++ stdenv.lib.optionals doCheck checkInputs; + + buildInputs = [ atk cairo glib pango libxml2 ]; + + patches = [ ./4.x-nix_share_path.patch ]; + + enableParallelBuilding = true; + + doCheck = stdenv.isLinux; + checkPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtksourceview"; + attrPath = "gnome3.gtksourceview"; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GtkSourceView; + platforms = with platforms; linux ++ darwin; + license = licenses.lgpl21; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 5376482e58a5531f96bb8d22ceeb4b173a5a30fe..90bc4fc7f820625245b885e28e524e387c061d15 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -1,18 +1,22 @@ -{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, intltool}: +{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobjectIntrospection}: stdenv.mkDerivation rec { name = "gtkspell-${version}"; version = "3.0.9"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.xz"; sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54"; }; - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ aspell gtk3 enchant ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; + buildInputs = [ aspell gtk3 enchant isocodes ]; propagatedBuildInputs = [ enchant ]; + configureFlags = [ "--enable-introspection" ]; + meta = with stdenv.lib; { homepage = http://gtkspell.sourceforge.net/; description = "Word-processor-style highlighting GtkTextView widget"; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 59b3a34f7bdd4af918ab1d2c2abde7228c6a179b..770f743fd260a08b2f1d5b7156ba8fd1f48f5a10 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; + buildInputs = [ glib gettext ]; meta = { homepage = http://gts.sourceforge.net/; diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..17ca323a5fef3e5f85a6af83eb2667932a85ec8b --- /dev/null +++ b/pkgs/development/libraries/gumbo/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "gumbo-${version}"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "gumbo-parser"; + rev = "v${version}"; + sha256 = "0xslckwdh2i0g2qjsb6rnm8mjmbagvziz0hjlf7d1lbljfms1iw1"; + }; + + buildInputs = [ autoconf automake libtool ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "C99 HTML parsing algorithm"; + homepage = https://github.com/google/gumbo-parser; + maintainers = [ maintainers.nico202 ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 78f507ca1465addceb78cec0437582898212157a..238edddaf3adc08194950d9f465c2ff79c652f6c 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,38 +1,76 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libtool -, glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit -, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma -, libxml2, libxslt, docbook_xsl, samba, libmtp -, gnomeSupport ? false, gnome, makeWrapper }: +{ stdenv, meson, ninja, fetchurl, pkgconfig, gettext, gnome3 +, glib, libgudev, udisks2, libgcrypt, libcap, polkit +, libgphoto2, avahi, libarchive, fuse, libcdio +, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp +, gnomeSupport ? false, gnome, makeWrapper +, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh +, libsecret, libgdata +# Remove when switching back to meson +, autoreconfHook, lzma, bzip2 +}: + +# TODO: switch to meson when upstream fixes a non-deterministic build failure +# See https://bugzilla.gnome.org/show_bug.cgi?id=794549 + +# Meson specific things are commented out and annotated, so switching back +# should simply require deleting autotools specific things and adding back meson +# flags etc. let - ver_maj = "1.34"; - version = "${ver_maj}.1"; + pname = "gvfs"; + version = "1.36.1"; in stdenv.mkDerivation rec { - name = "gvfs-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz"; - sha256 = "1d3j6f252mk316hrspwy63inrhxk6l78l4bmlmql401lqapb5yby"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "09phj9kqk8lzcmkjfq7qmzpkj4xp1vg4mskv6d2s9j62hvrxyh1q"; }; + # Uncomment when switching back to meson + # postPatch = '' + # chmod +x meson_post_install.py # patchShebangs requires executable file + # patchShebangs meson_post_install.py + # ''; + nativeBuildInputs = [ - pkgconfig intltool libtool file makeWrapper - libxml2 libxslt docbook_xsl + autoreconfHook # Remove when switching to meson + # meson ninja + pkgconfig gettext makeWrapper + libxml2 libxslt docbook_xsl docbook_xml_dtd_42 ]; buildInputs = - [ glib dbus udev libgudev udisks2 libgcrypt - libgphoto2 avahi libarchive fuse libcdio lzma bzip2 - samba libmtp libcap polkit + [ glib libgudev udisks2 libgcrypt + libgphoto2 avahi libarchive fuse libcdio + samba libmtp libcap polkit libimobiledevice libbluray + libcdio-paranoia libnfs openssh + # Remove when switching back to meson + lzma bzip2 # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - libsoup libgnome_keyring gconf gcr - # ToDo: not working and probably useless until gnome3 from x-updates + libsoup gcr + gnome-online-accounts libsecret libgdata ]); + # Remove when switching back to meson configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr"; + # Uncomment when switching back to meson + # mesonFlags = [ + # "-Dgio_module_dir=lib/gio/modules" + # "-Dsystemduserunitdir=lib/systemd/user" + # "-Ddbus_service_dir=share/dbus-1/services" + # "-Dtmpfilesdir=no" + # ] ++ stdenv.lib.optionals (!gnomeSupport) [ + # "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" + # "-Dgoogle=false" + # ] ++ stdenv.lib.optionals (samba == null) [ + # # Xfce don't want samba + # "-Dsmb=false" + # ]; + enableParallelBuilding = true; preFixup = '' @@ -43,9 +81,16 @@ stdenv.mkDerivation rec { done ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; + license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ maintainers.lethalman ] ++ gnome3.maintainers; }; } diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index f5756d1f570220abb703e559426b2b84c8f50fea..d098dd8fd1464808961a399d3a50cded6f97dc05 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it }: let - version = "1.5.1"; + version = "1.7.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 = "56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51"; + sha256 = "16rf7qwgy1gza74v2ws79zdwwb1lpvgz2abwwm8ws9j82cwysyys"; }; outputs = [ "out" "dev" ]; @@ -25,9 +25,8 @@ stdenv.mkDerivation { ( "--with-icu=" + (if withIcu then "yes" else "no") ) ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib freetype cairo ] # recommended by upstream - ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig libintl ]; + buildInputs = [ glib freetype cairo ]; # recommended by upstream propagatedBuildInputs = [] ++ optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ] diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 8f1aadc3a26e0465f517f4cd19e8d42d9ea377db..75dd8693d2cf6f6369dc10f7e859213f1dd984eb 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m"; }; - meta = { + meta = with stdenv.lib; { homepage = http://herqq.org; description = "A software library for building UPnP devices and control points"; - inherit (qt5.qtbase.meta) platforms; + platforms = platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 7b4b9866d041b0a5312996afbcc5202b0672f636..b2e2dbd35a4030e80498bca7348306399d5f6dd9 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.14"; + version = "1.3.15"; src = fetchurl { url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; - sha256 = "0aqv28prjcmc66znw0wgaxjijg5mjm44bgn1iil8a4dlbsgv4p7b"; + sha256 = "02vzipzrp1gr87rn7mkhyzr4zdjkp2dzcvvb223x7i0ch8ci7r4c"; }; patches = [ ./hivex-syms.patch ]; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 6b08a0fd86f76beef7bf627ab9e69a85c47c0138..edb1dc01aa80b0a7deea7a7f5bade59d2d9215e0 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hpx-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = "${version}"; - sha256 = "0k79gw4c0v4i7ps1hw6x4m7svxbfml5xm6ly7p00dvg7z9521zsk"; + sha256 = "0xlhnycmpy2jgiqyzpwmkdrl6drf46ywdsl0qm4vksvjxqfgk9z3"; }; buildInputs = [ boost hwloc gperftools ]; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 60a1435462b78bb8b276af12ec871d70437becea..5d4eae4e06392fecfadeef210e093d79bb9bf20f 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }: let - version = "2.7.0"; + version = "2.8.1"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "0rqij6v6wv1giwx4prfa082kw1nka5d9vlb06zkc8mwszq1vzidh"; + sha256 = "15ids8k2f0xhnnxh4m85w2f78pg5ndiwrpl24kyssznnp1l5yqai"; }; patches = [ ./build-shared.patch ]; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index dfb45aa598d78947f0d0c1c441bbf9f29af8d9be..ecbfbb7da0b85d4f0123bd5277829c606c8bf04e 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.6.2"; name = "hunspell-${version}"; src = fetchurl { url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz"; - sha256 = "0j9c20sj7bgd6f77193g1ihy8w905byk2gdhdc0r9dsh7irr7x9h"; + sha256 = "1i7lsv2cm0713ia3j5wjkcrhpfp3lqpjpwp4d3v18n7ycaqcxn9w"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 37c00f3e2aa8cb3ca2504be6cf3cb1276ddcae0f..ee8a5107b341f8254bf538e50ae314a3024f3cd0 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip }: +{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: let @@ -61,6 +61,51 @@ let ''; }; + mkDictFromDSSO = + { shortName, shortDescription, dictFileName }: + mkDict rec { + inherit dictFileName; + version = "2.40"; + # Should really use a string function or something + _version = "2-40"; + name = "hunspell-dict-${shortName}-dsso-${version}"; + _name = "ooo_swedish_dict_${_version}"; + readmeFile = "LICENSE_en_US.txt"; + src = fetchurl { + url = "https://extensions.libreoffice.org/extensions/swedish-spelling-dictionary-den-stora-svenska-ordlistan/${version}/@@download/file/${_name}.oxt"; + sha256 = "b982881cc75f5c4af1199535bd4735ee476bdc48edf63e3f05fb4f715654a7bc"; + }; + meta = with stdenv.lib; { + longDescription = '' + Svensk ordlista baserad på DSSO (den stora svenska ordlistan) och Göran + Anderssons (goran@init.se) arbete med denna. Ordlistan hämtas från + LibreOffice då dsso.se inte längre verkar vara med oss. + ''; + description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; + license = licenses.lgpl3; + platforms = platforms.all; + }; + buildInputs = [ unzip ]; + phases = "unpackPhase installPhase"; + sourceRoot = "."; + unpackCmd = '' + unzip $src dictionaries/${dictFileName}.dic dictionaries/${dictFileName}.aff $readmeFile + ''; + installPhase = '' + # hunspell dicts + install -dm755 "$out/share/hunspell" + install -m644 dictionaries/${dictFileName}.dic "$out/share/hunspell/" + install -m644 dictionaries/${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/" + # docs + install -dm755 "$out/share/doc" + install -m644 ${readmeFile} $out/share/doc/${name}.txt + ''; + }; + mkDictFromDicollecte = { shortName, shortDescription, longDescription, dictFileName }: mkDict rec { @@ -168,6 +213,42 @@ let }; }; + mkDictFromJ3e = + { shortName, shortDescription, dictFileName }: + stdenv.mkDerivation rec { + name = "hunspell-dict-${shortName}-j3e-${version}"; + version = "20161207"; + + src = fetchurl { + url = "https://j3e.de/ispell/igerman98/dict/igerman98-${version}.tar.bz2"; + sha256 = "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p"; + }; + + buildInputs = [ ispell perl hunspell ]; + + phases = ["unpackPhase" "installPhase"]; + installPhase = '' + patchShebangs bin + make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic + # hunspell dicts + install -dm755 "$out/share/hunspell" + install -m644 hunspell/${dictFileName}.dic "$out/share/hunspell/" + install -m644 hunspell/${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 = https://www.j3e.de/ispell/igerman98/index_en.html; + description = shortDescription; + license = with licenses; [ gpl2 gpl3 ]; + maintainers = with maintainers; [ timor ]; + platforms = platforms.all; + }; + }; + in { /* ENGLISH */ @@ -427,4 +508,39 @@ in { }) ]; }; + + /* SWEDISH */ + + sv-se = mkDictFromDSSO rec { + shortName = "sv-se"; + dictFileName = "sv_SE"; + shortDescription = "Swedish (Sweden)"; + }; + + # Finlandian Swedish (hello Linus Torvalds) + sv-fi = mkDictFromDSSO rec { + shortName = "sv-fi"; + dictFileName = "sv_FI"; + shortDescription = "Swedish (Finland)"; + }; + + /* GERMAN */ + + de-de = mkDictFromJ3e { + shortName = "de-de"; + shortDescription = "German (Germany)"; + dictFileName = "de_DE"; + }; + + de-at = mkDictFromJ3e { + shortName = "de-at"; + shortDescription = "German (Austria)"; + dictFileName = "de_AT"; + }; + + de-ch = mkDictFromJ3e { + shortName = "de-ch"; + shortDescription = "German (Switzerland)"; + dictFileName = "de_CH"; + }; } diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index e1acacc328cc10c88d26cb0bf19e42350886e015..ad39a4fde319229dac69ba133c261eda431a838e 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,16 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 -, pciutils, numactl }: +{ stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl +, x11Support ? false, libX11 ? null, cairo ? null +}: + +assert x11Support -> libX11 != null && cairo != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "hwloc-1.11.6"; + name = "hwloc-1.11.9"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; - sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn"; + sha256 = "0r2im1s5lp7zjwqalcqcnlxx0dsky1bnx5waf2r3rmj888c36hrr"; }; + configureFlags = [ + "--localstatedir=/var" + ]; + # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. nativeBuildInputs = [ pkgconfig ]; @@ -18,7 +25,7 @@ stdenv.mkDerivation rec { # derivation and set optional dependencies to `null'. buildInputs = stdenv.lib.filter (x: x != null) ([ expat ncurses ] - ++ (optionals (!stdenv.isCygwin) [ cairo libX11 ]) + ++ (optionals x11Support [ cairo libX11 ]) ++ (optionals stdenv.isLinux [ numactl ])); propagatedBuildInputs = @@ -37,7 +44,7 @@ stdenv.mkDerivation rec { test -d "$numalibdir" fi - sed -i "$out/lib/libhwloc.la" \ + sed -i "$lib/lib/libhwloc.la" \ -e "s|-lnuma|-L$numalibdir -lnuma|g" ''; @@ -45,6 +52,8 @@ stdenv.mkDerivation rec { # fail on some build machines. doCheck = false; + outputs = [ "out" "lib" "dev" "doc" "man" ]; + meta = { description = "Portable abstraction of hierarchical architectures for high-performance computing"; longDescription = '' @@ -65,8 +74,8 @@ stdenv.mkDerivation rec { # http://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; - homepage = http://www.open-mpi.org/projects/hwloc/; - maintainers = [ ]; + homepage = https://www.open-mpi.org/projects/hwloc/; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix index e5b80f4b2700bc7a2dcae4c2d45380b3e2baae18..f7763ba49da14ae04d6adf6d3bbc21d40874d7a8 100644 --- a/pkgs/development/libraries/icu/58.nix +++ b/pkgs/development/libraries/icu/58.nix @@ -1,4 +1,4 @@ -args @ { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +fetchurl: let keywordFix = fetchurl { url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; @@ -11,4 +11,4 @@ import ./base.nix { sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; patches = [ keywordFix ]; patchFlags = "-p4"; -} args +} diff --git a/pkgs/development/libraries/icu/60.nix b/pkgs/development/libraries/icu/60.nix new file mode 100644 index 0000000000000000000000000000000000000000..e56135b15c6283a6682aa9e6e3c495c3a1226a5c --- /dev/null +++ b/pkgs/development/libraries/icu/60.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "60.2"; + sha256 = "065l3n0q9wqaw8dz20x82srshhm6i987fr9ync5xf9mr6n7ylwzh"; +} diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 8a7cf8365a5bd554fe91135d60a8aa33e3b9247a..87551ee6ee032f4f768fd19a8a8640d971a16d02 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,60 +1,95 @@ { version, sha256, patches ? [], patchFlags ? "" }: -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames + # Cross-compiled icu4c requires a build-root of a native compile +, buildRootOnly ? false, nativeBuildRoot, buildPlatform, hostPlatform +}: let pname = "icu4c"; -in -stdenv.mkDerivation { - name = pname + "-" + version; - src = fetchurl { - url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" - + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - inherit sha256; - }; + baseAttrs = { + src = fetchurl { + url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; + inherit sha256; + }; + + postUnpack = '' + sourceRoot=''${sourceRoot}/source + echo Source root reset to ''${sourceRoot} + ''; - outputs = [ "out" "dev" ]; - outputBin = "dev"; + # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 + postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") + then "substituteInPlace i18n/digitlst.cpp --replace '' ''" + else null; # won't find locale_t on darwin - # FIXME: This fixes dylib references in the dylibs themselves, but - # not in the programs in $out/bin. - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + inherit patchFlags patches; - postUnpack = '' - sourceRoot=''${sourceRoot}/source - echo Source root reset to ''${sourceRoot} - ''; + preConfigure = '' + sed -i -e "s|/bin/sh|${stdenv.shell}|" configure - # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 - postPatch = if stdenv ? glibc - then "substituteInPlace i18n/digitlst.cpp --replace '' ''" - else null; # won't find locale_t on darwin + # $(includedir) is different from $(prefix)/include due to multiple outputs + sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in + '' + 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 + ''; - inherit patchFlags patches; + configureFlags = "--disable-debug" + + stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath" + + stdenv.lib.optionalString (buildPlatform != hostPlatform) " --with-cross-build=${nativeBuildRoot}"; - 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 - ''; + enableParallelBuilding = true; - configureFlags = "--disable-debug" + - stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath"; + meta = with stdenv.lib; { + description = "Unicode and globalization support library"; + homepage = http://site.icu-project.org/; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; + }; + }; + + realAttrs = baseAttrs // { + name = pname + "-" + version; - # 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 - ''; + outputs = [ "out" "dev" ]; + outputBin = "dev"; - postFixup = ''moveToOutput lib/icu "$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; - enableParallelBuilding = true; + # 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 + '' + '' + substituteInPlace "$dev/bin/icu-config" \ + --replace \''${pkglibdir}/Makefile.inc "$dev/lib/icu/Makefile.inc" + ''; - meta = with stdenv.lib; { - description = "Unicode and globalization support library"; - homepage = http://site.icu-project.org/; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.all; + postFixup = ''moveToOutput lib/icu "$dev" ''; }; -} + + buildRootOnlyAttrs = baseAttrs // { + name = pname + "-build-root-" + version; + + preConfigure = baseAttrs.preConfigure + '' + mkdir build + cd build + configureScript=../configure + ''; + + postBuild = '' + cd .. + mv build $out + echo "Doing build-root only, exiting now" >&2 + exit 0 + ''; + }; + + attrs = if buildRootOnly + then buildRootOnlyAttrs + else realAttrs; +in +stdenv.mkDerivation attrs diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index 4cee28630935016f406b82bfbabf44c55d220f4a..442da700f34554eb3466a8fcd74912fa63b4749d 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - name = "idnkit-1.0"; + name = "idnkit-${version}"; + version = "2.3"; src = fetchurl { - url = "http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${name}-src.tar.gz"; - sha256 = "1z4i6fmyv67sflmjg763ymcxrcv84rbj1kv15im0s655h775zk8n"; + url = "https://jprs.co.jp/idn/${name}.tar.bz2"; + sha256 = "0zp9yc84ff5s0g2i6v9yfyza2n2x4xh0kq7hjd3anhh0clbp3l16"; }; buildInputs = [ libiconv ]; diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 66b21b6fae6cf7a965eaf9d083f0ea01c0da57b4..867ce024d2fec25e35046bb38186d1f3ad95a9e9 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://ignitionrobotics.org/libraries/math; + homepage = https://ignitionrobotics.org/libraries/math; description = "Math library by Ingition Robotics, created for the Gazebo project"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 8206338fb080b8e7ac3db013e50ab9f5c9b9223a..3568edb7890ce3c3a3449465383d2c1a5a2bd4b2 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://ignitionrobotics.org/libraries/math; + homepage = https://ignitionrobotics.org/libraries/math; description = "Math library by Ingition Robotics, created for the Gazebo project"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; platforms = platforms.all; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 21c2c46105e52c0ce01537c4b83dc84e15da9afb..956a8667be5f2250c80dbea1a1b907ab9bb04a34 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, which }: stdenv.mkDerivation rec { - name = "ilmbase-2.2.0"; + name = "ilmbase-2.2.1"; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c"; + sha256 = "17k0hq19wplx9s029kjrq6c51x2ryrfmaavcappkd0g67gk0dhna"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 54c70197af4dcfd083213a174ae3ff5095b4c097..18b42ea4b4fa41c01180b187213fc2b2d1db495c 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.10"; + name = "imlib2-1.5.0"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; - sha256 = "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z"; + sha256 = "0kg28b5wp886hiy12v7abdybrvlymb7g3nvg0ysn2y8h883s5w8m"; }; buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ] diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index b4fea7c1fa4aaa8fc9b084d5a0b465e01a96d562..36b637c62bb2f22a59dea38c381c3bc436d520e9 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, json_glib +, glib, dbus-glib, json-glib , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - glib dbus_glib json_glib + glib dbus-glib json-glib gtk2 libindicator-gtk2 libdbusmenu-gtk2 libappindicator-gtk2 ]; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 03afd6f1e878993629153b1241e5f1e55f294d18..3d7c20691ab5d344a6a0eb8e72eb257433609135 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, json_glib +, glib, dbus-glib, json-glib , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: with lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - glib dbus_glib json_glib + glib dbus-glib json-glib gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3 ]; diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index e586b30393e62578f82555e278968673233a9287..8beda8663c5ca4ceb9be01358edcbc5415f64455 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { patches = ./no-usr.patch; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace -Wl,-soname= -Wl,-install_name, + ''; + doCheck = true; preCheck = "patchShebangs test/make-tests.sh"; diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 109510df79b131a72e8a88b056bd01daa3a2ba00..82a4ec337555126bef328c6cd68ac6c09a5e3146 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = http://www.ip2location.com/developers/c-7; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 336f446cdf101af1248953483bd80f861fc665a5..d28ae012e574752746e43fdbea35e90dcc6b17ff 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, mesa, unzip, libXrandr, libX11, libXxf86vm }: +{ stdenv, fetchzip, libGLU_combined, unzip, libXrandr, libX11, libXxf86vm }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ]; + buildInputs = [ unzip libGLU_combined libXrandr libX11 libXxf86vm ]; meta = { homepage = http://irrlicht.sourceforge.net/; diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index 63140dba37f7cc3c41d91c4135d5d7bc24059421..cdb018d297b646df5663a78ed01caf1d359a0bdb 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; + url = "http://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.kotnet.org/~skimo/isl/; + homepage = https://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix index d7143b8747ee8646f033510005365ba2770f6afc..880f91fccedc931de5eb8b2f7b522c6cc9121461 100644 --- a/pkgs/development/libraries/isl/0.12.2.nix +++ b/pkgs/development/libraries/isl/0.12.2.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.kotnet.org/~skimo/isl/; + homepage = https://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix index 8196dec283ac40b4a339a751f3406bd3fe583fc2..1ff4b7ec18a00aea7b5898cfd4dc862a49c9c74c 100644 --- a/pkgs/development/libraries/isl/0.14.1.nix +++ b/pkgs/development/libraries/isl/0.14.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.kotnet.org/~skimo/isl/; + homepage = https://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.15.0.nix b/pkgs/development/libraries/isl/0.15.0.nix index eca3372ad4d0b5b139c19fa0d0aad7beaa6c5863..8b6080c2880a8c2736a146214aa0ae3df382427a 100644 --- a/pkgs/development/libraries/isl/0.15.0.nix +++ b/pkgs/development/libraries/isl/0.15.0.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.kotnet.org/~skimo/isl/; + homepage = https://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix index 2136969c0752d379ca883504504188dc9d0e3897..59d4d38ce574db47df5ba31c807b0f3fc88fd868 100644 --- a/pkgs/development/libraries/isl/0.17.1.nix +++ b/pkgs/development/libraries/isl/0.17.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.kotnet.org/~skimo/isl/; + homepage = https://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 7d07408236e6dccc657fd9650e319b28dcd5051d..4dfe190124b175eab520c451277d784f32f298f9 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, gettext, python3, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.74"; + name = "iso-codes-${version}"; + version = "3.79"; src = fetchurl { - url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "1vkaxkcx8h8lbg3z3jjfjs1x1rz1l01j6ll46ysza2gym37g7x11"; + url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz"; + sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb"; }; patchPhase = '' for i in `find . -name \*.py` diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 3865aa226f9a24fd60c3401f3b1bd00a3c2b984e..5280a95afb4012aabbdde0d4f92d71a1f35c6989 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,25 +1,20 @@ { stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { - name = "itk-4.11.0"; + name = "itk-4.13.0"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz; - sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6"; + url = mirror://sourceforge/itk/InsightToolkit-4.13.0.tar.xz; + sha256 = "09d1gmqx3wbdfgwf7r91r12m2vknviv0i8wxwh2q9w1vrpizrczy"; }; - # 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_ITKMINC=ON" "-DModule_ITKIOMINC=ON" + "-DModule_ITKIOTransformMINC=ON" "-DModule_ITKVtkGlue=ON" "-DModule_ITKReview=ON" ]; diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 55f44df2b4f3ce941d4b2cb53f89931969b9fa99..36eedadc4c2e793083a78cb308f6279f1bb4bcc2 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.5"; src = fetchurl { - url = http://math.nist.gov/tnt/jama125.zip; + url = https://math.nist.gov/tnt/jama125.zip; sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://math.nist.gov/tnt/; + homepage = https://math.nist.gov/tnt/; description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 2fbb2e3948ce256a20705b7e5b0bb5d2828f7a96..b1167efdfee68e55f4116f21b66d06cfb0fcff2c 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.10"; + name = "jansson-2.11"; src = fetchurl { url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; - sha256 = "0iv4rxsnamqm3ldpg7dyhjq0x9cp023nc7ac820jdd3pwb8ml8bq"; + sha256 = "1x5jllzzqamq6kahx9d9a5mrarm9m3f30vfxvcqpi6p4mcnz91bf"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index af543c4e1976530ddd6ac2167131bb0fce8a26b9..d374c935a2a4deee689786900f2f142cb89a9671 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-9055.patch"; + url = "http://paste.opensuse.org/view/raw/330751ce"; + sha256 = "0m798m6c4v9yyhql7x684j5kppcm6884n1rrb9ljz8p9aqq2jqnm"; + }) + ]; + + # newer reconf to recognize a multiout flag nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ libjpeg ]; diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix deleted file mode 100644 index 82e02d06906b14667e2e216eff8c3e7db181c63b..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/java/classpath/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk2, gconf, ecj }: - -stdenv.mkDerivation rec { - name = "classpath-0.99"; - - src = fetchurl { - url = "mirror://gnu/classpath/${name}.tar.gz"; - sha256 = "1j7cby4k66f1nvckm48xcmh352b1d1b33qk7l6hi7dp9i9zjjagr"; - }; - - patches = [ ./missing-casts.patch ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ javac jvm antlr gtk2 gconf ecj ]; - - configurePhase = '' - # GCJ tries to compile all of Classpath during the `configure' run when - # trying to build in the source tree (see - # http://www.mail-archive.com/classpath@gnu.org/msg15079.html), thus we - # build out-of-tree. - mkdir ../build - cd ../build - echo "building in \`$PWD'" - - ../${name}/configure --prefix="$out" \ - --enable-fast-install --disable-dependency-tracking \ - ${configureFlags} - ''; - - /* Plug-in support requires Xulrunner and all that. Maybe someday, - optionally. - - Compilation with `-Werror' is disabled because of this: - - native/jni/native-lib/cpnet.c: In function 'cpnet_addMembership': - native/jni/native-lib/cpnet.c:583: error: dereferencing type-punned pointer will break strict-aliasing rules - native/jni/native-lib/cpnet.c: In function 'cpnet_dropMembership': - native/jni/native-lib/cpnet.c:598: error: dereferencing type-punned pointer will break strict-aliasing rules - - */ - - configureFlags = "--disable-Werror --disable-plugin --with-antlr-jar=${antlr}/lib/antlr.jar"; - - meta = { - description = "Essential libraries for Java"; - - longDescription = '' - GNU Classpath, Essential Libraries for Java, is a GNU project to create - free core class libraries for use with virtual machines and compilers - for the Java programming language. - ''; - - homepage = http://www.gnu.org/software/classpath/; - - # The exception makes it similar to LGPLv2+ AFAICS. - license = stdenv.lib.licenses.gpl2ClasspathPlus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/java/classpath/missing-casts.patch b/pkgs/development/libraries/java/classpath/missing-casts.patch deleted file mode 100644 index 863ca2cac8ceb6503ca170a33106da39726146ed..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/java/classpath/missing-casts.patch +++ /dev/null @@ -1,80 +0,0 @@ -Add missing casts. The GCC folks applied a similar patch in -GCC's own copy of Classpath: -http://gcc.gnu.org/ml/java/2007-05/msg00039.html . - ---- classpath-0.98/javax/management/NotificationBroadcasterSupport.java 2009-07-30 16:52:08.000000000 +0200 -+++ classpath-0.98/javax/management/NotificationBroadcasterSupport.java 2009-07-30 16:51:58.000000000 +0200 -@@ -218,7 +218,7 @@ - { - if (info == null || info.length == 0) - return new MBeanNotificationInfo[0]; -- return info.clone(); -+ return (MBeanNotificationInfo[]) info.clone(); - } - - /** - ---- classpath-0.98/java/util/concurrent/CopyOnWriteArrayList.java 2008-03-27 18:39:25.000000000 +0100 -+++ classpath-0.98/java/util/concurrent/CopyOnWriteArrayList.java 2009-07-30 17:08:30.000000000 +0200 -@@ -147,7 +148,7 @@ public class CopyOnWriteArrayList - */ - public CopyOnWriteArrayList(E[] array) - { -- data = array.clone(); -+ data = (E[]) array.clone(); - } - - /** -@@ -364,7 +365,7 @@ public class CopyOnWriteArrayList - public synchronized E set(int index, E e) - { - E result = data[index]; -- E[] newData = data.clone(); -+ E[] newData = (E[]) data.clone(); - newData[index] = e; - data = newData; - return result; - ---- classpath-0.98/java/util/EnumMap.java 2007-07-24 17:26:36.000000000 +0200 -+++ classpath-0.98/java/util/EnumMap.java 2009-07-30 17:12:19.000000000 +0200 -@@ -398,7 +398,7 @@ public class EnumMap, - // Can't happen. - result = null; - } -- result.store = store.clone(); -+ result.store = (V[]) store.clone(); - return result; - } - ---- classpath-0.98/gnu/java/lang/reflect/GenericSignatureParser.java 2008-03-01 11:13:31.000000000 +0100 -+++ classpath-0.98/gnu/java/lang/reflect/GenericSignatureParser.java 2009-07-30 17:14:24.000000000 +0200 -@@ -75,7 +75,7 @@ final class TypeVariableImpl extends Typ - public Type[] getBounds() - { - resolve(bounds); -- return bounds.clone(); -+ return (Type[]) bounds.clone(); - } - - public GenericDeclaration getGenericDeclaration() -@@ -154,7 +154,7 @@ final class ParameterizedTypeImpl extend - - public Type[] getActualTypeArguments() - { -- return typeArgs.clone(); -+ return (Type[]) typeArgs.clone(); - } - - public Type getRawType() - ---- classpath-0.98/external/jsr166/java/util/ArrayDeque.java 2006-12-10 21:25:40.000000000 +0100 -+++ classpath-0.98/external/jsr166/java/util/ArrayDeque.java 2009-07-30 17:15:35.000000000 +0200 -@@ -787,7 +790,7 @@ public class ArrayDeque extends Abstr - ArrayDeque result = (ArrayDeque) super.clone(); - // Classpath local: we don't have Arrays.copyOf yet. - // result.elements = Arrays.copyOf(elements, elements.length); -- result.elements = elements.clone(); -+ result.elements = (E[]) elements.clone(); - return result; - - } catch (CloneNotSupportedException e) { diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index a35eaa0b260a39485c10abc39e94f604cc838fc7..eff57d6f2fd9eaf89d73470bc37d2dd67df19ca8 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.8.1"; + version = "1.16.1"; name = "commons-compress-${version}"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz"; - sha256 = "11viabgf34r3zx1avj51n00hzmx89kym3i90l6a5v5dbfh61h0lp"; + sha256 = "0yz2m3qac1idg9346i64mjfrkq4kniajzx2manyybhj43v9dpx37"; }; installPhase = '' diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index d49165ac521a2568a500fc5f3e47786d96b41163..03b083328da42b0af3a31fba692676cf9d38ee63 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.4"; + version = "2.6"; name = "commons-io-${version}"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz"; - sha256 = "0m5xmjfr9k2zmbrz425q530jd0lm6368c4wm3jsjlsrqmqjpsvz1"; + sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn"; }; installPhase = '' diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 8ca3bf1cd34a0438f3614dbc5607f90dd43e9a74..23adfd80caac427d4bb0028b901bfa5625d2c6ff 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation { sed -i -e "s|all: bin doc man|all: bin|" \ -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile ''; - maintainers = [ stdenv.lib.maintainers.sander ]; meta = { platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index ad849a4d6d53c4c2b4be743748333a0fc615a915..97ffcb647d621fc060cfe131d8da999c5b128437 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ }: stdenv.mkDerivation { - name = "hsqldb-1.8.0.9"; + name = "hsqldb-2.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://sourceforge/hsqldb/hsqldb_1_8_0_9.zip; - sha256 = "e98d1d8bca15059f4ef4f0d3dde2d75778a5e1bbe8bc12abd4ec2cac39d5adec"; + sha256 = "1v5dslwsqb7csjmi5g78pghsay2pszidvlzhyi79y18mra5iv3g9"; }; buildInputs = [ unzip diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index df4a19efd2c49e36dd9d93265d5f12b6daca2f34..8775353316989476c314d6365041ecebfee710d2 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; + url = http://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; PREFIX=''''${out}''; buildInputs = [ jdk ]; - maintainers = [ stdenv.lib.maintainers.sander ]; meta = { platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 05ad908b3c3614f1a73e907b543d46ef454c1445..df9b3f96c87179890eef82cfc521324efc4748ab 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,13 +1,18 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lombok-1.16.8"; + name = "lombok-1.16.20"; + src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "0s7ak6gx1h04da2rdhvc0fk896cwqm2m7g3chqcjpsrkgfdv4cpy"; + sha256 = "0v8fq4qlpjh4b87xx35m32y2xpnj4d05xflrgghia6mar8c8n5y5"; }; - phases = [ "installPhase" ]; - installPhase = "mkdir -p $out/share/java; cp $src $out/share/java/lombok.jar"; + + buildCommand = '' + mkdir -p $out/share/java + cp $src $out/share/java/lombok.jar + ''; + meta = { description = "A library that can write a lot of boilerplate for your Java project"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index fcd884f0a419e966ac845fc19a436b1f28b55d78..ca9aa8fc36e8be7471b53613a31cae6fdd349efd 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,22 +1,83 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation { - name = "saxon-6.5.3"; - builder = ./unzip-builder.sh; - src = fetchurl { - url = mirror://sourceforge/saxon/saxon6_5_3.zip; - sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; +{ stdenv, fetchurl, unzip, jre }: + +let + common = { pname, version, src, description + , prog ? null, jar ? null, license ? stdenv.lib.licenses.mpl20 }: + stdenv.mkDerivation { + name = "${pname}-${version}"; + inherit pname version src; + + nativeBuildInputs = [ unzip ]; + + buildCommand = let + prog' = if prog == null then pname else prog; + jar' = if jar == null then pname else jar; + in '' + unzip $src -d $out + mkdir -p $out/bin $out/share $out/share/java + cp -s "$out"/*.jar "$out/share/java/" # */ + rm -rf $out/notices + mv $out/doc $out/share + cat > $out/bin/${prog'} < -Date: Wed, 14 Oct 2015 06:47:01 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - src/khelpclient.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 +index fbbc0fa..cb78741 100644 --- a/src/khelpclient.cpp +++ b/src/khelpclient.cpp @@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) QString docPath; const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { + for (const QString &dir : desktopDirs) { - QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); + QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { const QString desktopPath(it.next()); KDesktopFile desktopFile(desktopPath); --- -2.5.2 - +@@ -75,4 +75,3 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) + // launch khelpcenter, or a browser for URIs not handled by khelpcenter + QDesktopServices::openUrl(url); + } +- diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 6658e4dca1002a3697b9b2eba9cb6a10aeb8199c..cd5f2163dd955984833946c0f7113fb1f7cea6b1 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, writeScript, extra-cmake-modules, - qtbase, qttools, shared_mime_info + qtbase, qttools, shared-mime-info }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttools shared_mime_info ]; + buildInputs = [ qttools shared-mime-info ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 6937a4056b2863512326a8723482b41943973aba..7e3de9d4d141501d0e82898de4299086334eb36f 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -5,7 +5,7 @@ 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 + networkmanager, qtbase, qtsvg, qttools, qtx11extras, xorg }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { propagatedNativeBuildInputs = [ kdoctools ]; buildInputs = [ kcompletion kconfig kded kglobalaccel ki18n kio kservice kwidgetsaddons - kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM + kxmlgui networkmanager qtsvg qtx11extras xorg.libSM ]; propagatedBuildInputs = [ kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons kdesignerplugin diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 661e89e30782accdf8bbfa2d8246da40ec76d14a..0a600fe8d05709102687858f0b68ec055023f9bd 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -8,10 +8,18 @@ mkDerivation { name = "kdoctools"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedNativeBuildInputs = [ perl perlPackages.URI ]; + nativeBuildInputs = [ + extra-cmake-modules + # The build system insists on having native Perl. + perl perlPackages.URI + ]; + propagatedBuildInputs = [ + # kdoctools at runtime actually needs Perl for the platform kdoctools is + # running on, not necessarily native perl. + perl perlPackages.URI + qtbase + ]; buildInputs = [ karchive ki18n ]; - propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; patches = [ ./kdoctools-no-find-docbook-xml.patch ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh index 5cfffbd622d12d060e40f58fcd72eaaf9fd70f51..2928d9b34dbed15924a941f79365889e2456a2cb 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh @@ -2,4 +2,4 @@ addXdgData() { addToSearchPath XDG_DATA_DIRS "$1/share" } -envHooks+=(addXdgData) +addEnvHooks "$targetOffset" addXdgData diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 05fde45f17d20d007df89e104ee4d27a27781624..ae945ab73384e9efa2406597731de5f1474e4497 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -13,8 +13,4 @@ mkDerivation { 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/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 3b9ca74bbd0774ec3b53e905f8e2475ed3bb1b0e..ee7d13af5b1e896d6dfbf56512c28078bbfeb221 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, gettext, python, qtbase, qtdeclarative, qtscript, }: @@ -13,4 +13,10 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python ]; buildInputs = [ qtdeclarative qtscript ]; + patches = [ + (fetchpatch { + url = "https://phabricator.kde.org/D12216?download=true"; + sha256 = "04gpyb11vlgivqjx3lqdwgqb4ss5bphy5zmh65k57bbv4rnlsm15"; + }) + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 26a8637bafc2943ffea6641c9e329766cbb341a7..29748a5f7f424ec9546e8468ea98851b2a9da9b4 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -12,5 +12,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive openexr qtbase ]; outputs = [ "out" ]; # plugins only - NIX_CFLAGS_COMPILE = "-I${getDev ilmbase}/include/OpenEXR"; + CXXFLAGS = "-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 1036ea2774524edcf489744a989b5ccc23427885..538078fd7457ff6bc65881b51e167017ddd41bb0 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -14,10 +14,10 @@ mkDerivation { 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"'' + CXXFLAGS = [ + ''-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" diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 3ac4f4dc2688dead3abce64bc71573a1be7b773e..356e6537a4fd2038160ca719c184a17ce63c5ce2 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -2,7 +2,7 @@ mkDerivation, lib, copyPathsToStore, bison, extra-cmake-modules, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, - qtbase, shared_mime_info, + qtbase, shared-mime-info, }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { kcrash kdbusaddons ki18n kwindowsystem qtbase ]; propagatedBuildInputs = [ kconfig kcoreaddons ]; - propagatedUserEnvPkgs = [ shared_mime_info ]; # for kbuildsycoca5 + propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5 patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index d3a81b50bf176169359d8a7b57a7f1f681ab04d7..44005ec7d282566d18407207f208a2ec03aff585 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -4,7 +4,7 @@ kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui, - qtbase, qtdeclarative, qtscript, qtx11extras, + qtbase, qtdeclarative, qtscript, qtx11extras, kirigami2, qtquickcontrols2 }: mkDerivation { @@ -14,7 +14,8 @@ mkDerivation { buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications - kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras + kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras kirigami2 + qtquickcontrols2 ]; propagatedBuildInputs = [ kpackage kservice qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index f87d632af0c6e69865e2abece81a6dc15e2a8b32..8e2187f29574492fe60839ed49c7cc43a5c1bfa2 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,611 +3,627 @@ { attica = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/attica-5.40.0.tar.xz"; - sha256 = "1ng76yhljl1ny0wvb7yckiivwqn3llmhk0h4j82zag5965q906iz"; - name = "attica-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/attica-5.45.0.tar.xz"; + sha256 = "1vzbajj2ldhg26ssxh0vkahj7fw5v9nhrv000vbxlhsrcczq81n5"; + name = "attica-5.45.0.tar.xz"; }; }; baloo = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/baloo-5.40.0.tar.xz"; - sha256 = "09hqw8xl34galpiv6rwnq2rrbdp6z9nkx9j71jf87ia22sclz55a"; - name = "baloo-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/baloo-5.45.0.tar.xz"; + sha256 = "0zr2pg946q3wc6bhsbngpmca0ylhw8ckfdrs6ym36v7xz3h5fhds"; + name = "baloo-5.45.0.tar.xz"; }; }; bluez-qt = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/bluez-qt-5.40.0.tar.xz"; - sha256 = "0js212bi7h09bcbd2lr7ic10fy3z09w3v0d0r5210p989qd42a5a"; - name = "bluez-qt-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/bluez-qt-5.45.0.tar.xz"; + sha256 = "056xl29yf7bkqrn655c9b2wdx69021q7cz176rx4daid70i8nx49"; + name = "bluez-qt-5.45.0.tar.xz"; }; }; breeze-icons = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/breeze-icons-5.40.0.tar.xz"; - sha256 = "1gdpv6w9a6bhr0dgaldi9pj24a2qvz1ax4jya8i4ck7dl9cgkq96"; - name = "breeze-icons-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/breeze-icons-5.45.0.tar.xz"; + sha256 = "0nzi4wy0p7lkb76nynmwbgnrsrfbhfxn3269mkbqwakq6i4mxsj8"; + name = "breeze-icons-5.45.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/extra-cmake-modules-5.40.0.tar.xz"; - sha256 = "02k3dr4w12l9rdgl3l1v3d8zhaf51km4w3p1c3sy8x24r24qir43"; - name = "extra-cmake-modules-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/extra-cmake-modules-5.45.0.tar.xz"; + sha256 = "0g7njdz6bqjcswq100mb2jr4l1mdicqq24wdw3a8f63syg5rvm76"; + name = "extra-cmake-modules-5.45.0.tar.xz"; }; }; frameworkintegration = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/frameworkintegration-5.40.0.tar.xz"; - sha256 = "1r480hx18irycaygbxbxsgf1qrk6cdj0ccfi4rqcygxkv52gcxxj"; - name = "frameworkintegration-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/frameworkintegration-5.45.0.tar.xz"; + sha256 = "0s300vp674rq2dinhjjsp7v4gmv6ybxsk1r3asv3x789zwz1lr3i"; + name = "frameworkintegration-5.45.0.tar.xz"; }; }; kactivities = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kactivities-5.40.0.tar.xz"; - sha256 = "0c6dgmzs6l33kr4a7aivs8ijf6yw616pz5gmh7sdjw2ny4gxdzab"; - name = "kactivities-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kactivities-5.45.0.tar.xz"; + sha256 = "0h3hym4am055f9kyhg98gabw00nb1h10b9dvbs3hs3178dyi5gjg"; + name = "kactivities-5.45.0.tar.xz"; }; }; kactivities-stats = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kactivities-stats-5.40.0.tar.xz"; - sha256 = "0cdnq2nh3p7baxcag0f1sid5mrmmidfpsd77bb9s0xj11jvs95bx"; - name = "kactivities-stats-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kactivities-stats-5.45.0.tar.xz"; + sha256 = "0jcvikr7yvjik8zdz46mkrxf2c3ydns194a07njw7hd15x1czqjl"; + name = "kactivities-stats-5.45.0.tar.xz"; }; }; kapidox = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kapidox-5.40.0.tar.xz"; - sha256 = "1wvnbmxjxmrm0z1digbfbf5ssf6klzdmzf5lbw7ilf5mkah1bdpy"; - name = "kapidox-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kapidox-5.45.0.tar.xz"; + sha256 = "1996akdnhrky1bk63xraj0qawx6ar1vk6ia4rmdgq0bqjk804g1p"; + name = "kapidox-5.45.0.tar.xz"; }; }; karchive = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/karchive-5.40.0.tar.xz"; - sha256 = "1cbvv6rdrnag2vjbrzdg59csmqi247d594xan7r319qb76ai860y"; - name = "karchive-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/karchive-5.45.0.tar.xz"; + sha256 = "0gl86ybjkmjz6sl4s00j8mi43admj7xnjnmv92q5lngk75k1zbhq"; + name = "karchive-5.45.0.tar.xz"; }; }; kauth = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kauth-5.40.0.tar.xz"; - sha256 = "072wjhvscyyh2q61knxm8ipqr9r01dzhqd8dihp6c5zmbbpz29ss"; - name = "kauth-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kauth-5.45.0.tar.xz"; + sha256 = "1j6pgbkqjw70lnpk84wqi9m81hc55f1z4cfxkd8hhdk578pry56i"; + name = "kauth-5.45.0.tar.xz"; }; }; kbookmarks = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kbookmarks-5.40.0.tar.xz"; - sha256 = "1i28pic968llggh24hn84kiq9nhdcv3pn4hbhb0lqb4chrmm322i"; - name = "kbookmarks-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kbookmarks-5.45.0.tar.xz"; + sha256 = "0ii0gi4vlngp0qypyn2780dnqpkg24k0wb5jpngllrvrf37132md"; + name = "kbookmarks-5.45.0.tar.xz"; }; }; kcmutils = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kcmutils-5.40.0.tar.xz"; - sha256 = "1pjvjidv9nx8kg5wvkmxanp9y6ins9f43cn933q6g9gczy2hfcbl"; - name = "kcmutils-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcmutils-5.45.0.tar.xz"; + sha256 = "0w082wr9h2rpk9jyads9bwdimhqjl6f68l710miwjglzcmfy4dgq"; + name = "kcmutils-5.45.0.tar.xz"; }; }; kcodecs = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kcodecs-5.40.0.tar.xz"; - sha256 = "0zq9d5006zhp0v31ydc7q0i117l6f8b04l5jgqcl719q1a2hk1x4"; - name = "kcodecs-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcodecs-5.45.0.tar.xz"; + sha256 = "0si694a64dbb65m7gzcvz474gd61nyvj71wh77chsbsh6hvl1xzx"; + name = "kcodecs-5.45.0.tar.xz"; }; }; kcompletion = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kcompletion-5.40.0.tar.xz"; - sha256 = "17dzal655xdxdsifk2dmgyj2hja03pcvdqvzpsyq259qbm42cal4"; - name = "kcompletion-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcompletion-5.45.0.tar.xz"; + sha256 = "0lqp0m715hqh8ci1cq7r1y00828ajjzz5y04xpxw78gk9gprakf8"; + name = "kcompletion-5.45.0.tar.xz"; }; }; kconfig = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kconfig-5.40.0.tar.xz"; - sha256 = "0pr9ammqgbz3gkg6iczp3v9s36cfzzh40kbz2bz29qaxa966b5kb"; - name = "kconfig-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kconfig-5.45.0.tar.xz"; + sha256 = "00r7vh2myh518wfngfr1gmz6svmnvjfx9bxv8px5z1ap0yda181p"; + name = "kconfig-5.45.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kconfigwidgets-5.40.0.tar.xz"; - sha256 = "0g5xm3fm3d6a63hbdq1xxiv539z15bhrs36ariq93flc4f912pbz"; - name = "kconfigwidgets-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kconfigwidgets-5.45.0.tar.xz"; + sha256 = "0kj0a2x6f27hkzyl7pfz20b0mv4625nxr7iqdq130wdy5x0wv71l"; + name = "kconfigwidgets-5.45.0.tar.xz"; }; }; kcoreaddons = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kcoreaddons-5.40.0.tar.xz"; - sha256 = "0n4gvfayaiahvavrx1y3ass6anz30965zm81iczi2749hva9s415"; - name = "kcoreaddons-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcoreaddons-5.45.0.tar.xz"; + sha256 = "15zgz8yhw7z31rljgj63hd949sp48syd1ggbay5nmnsb91ly0z92"; + name = "kcoreaddons-5.45.0.tar.xz"; }; }; kcrash = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kcrash-5.40.0.tar.xz"; - sha256 = "01h41zz3x0m5hc3zm2v0mifzc42akp5bwxwjzaaryl8pcg8v5lln"; - name = "kcrash-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcrash-5.45.0.tar.xz"; + sha256 = "1ny3m1jqazf7b2qrh4dlprwyf60cddk2c88dxhmzr02a8040gckv"; + name = "kcrash-5.45.0.tar.xz"; }; }; kdbusaddons = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kdbusaddons-5.40.0.tar.xz"; - sha256 = "09zbdy8lzhq6lvd9j9667r90k6p6a882bxans6am1yxx4y0jd9i4"; - name = "kdbusaddons-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdbusaddons-5.45.0.tar.xz"; + sha256 = "071zr5d95j1cd1djqd5nkfz5n224dmzsbx2a446dsp9liklhqaz6"; + name = "kdbusaddons-5.45.0.tar.xz"; }; }; kdeclarative = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kdeclarative-5.40.0.tar.xz"; - sha256 = "10yp7g9awv4mdf5zl6ljxplfy50jzmixp45vdqcmcixiq72440d6"; - name = "kdeclarative-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdeclarative-5.45.0.tar.xz"; + sha256 = "0h84nla5symfdyrv5dvgs8b1mz0czclipiki16xglzdsja9z9xpl"; + name = "kdeclarative-5.45.0.tar.xz"; }; }; kded = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kded-5.40.0.tar.xz"; - sha256 = "0jf4xahsz86hiv50vs9yhwd2g410d5wjds8mdm5hi8085f7dcf84"; - name = "kded-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kded-5.45.0.tar.xz"; + sha256 = "0qr4ycqqz2g5k9pzllahc7aj1b6fyh0zidvaxvbw600wjr5v3acw"; + name = "kded-5.45.0.tar.xz"; }; }; kdelibs4support = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/portingAids/kdelibs4support-5.40.0.tar.xz"; - sha256 = "1pwmi490hwnijpwjm80zdvbwanlslhnfh8nrlxmiham7ls551mzr"; - name = "kdelibs4support-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kdelibs4support-5.45.0.tar.xz"; + sha256 = "0kil35fj9p8g99jmmkvch326j32wfjqrhypzwg0sa0d74vc2pv5s"; + name = "kdelibs4support-5.45.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kdesignerplugin-5.40.0.tar.xz"; - sha256 = "00wl4d001ix0ql2hzp818cvhyyr52g06b7zz92qhcyi4x1cf2mqd"; - name = "kdesignerplugin-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdesignerplugin-5.45.0.tar.xz"; + sha256 = "0gqvga5akilmqldhzmgjyngbz2dmxmkcjq2g5diq6pijiafsx8kj"; + name = "kdesignerplugin-5.45.0.tar.xz"; }; }; kdesu = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kdesu-5.40.0.tar.xz"; - sha256 = "13dv54c9cw6a2zcn7arrqnda08r3rw2q3nqagrrn013xd3dlrac7"; - name = "kdesu-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdesu-5.45.0.tar.xz"; + sha256 = "0znncn74vmczcqffc0n6q39q3mk4vsfwj3zn5kglzzsg0x730aly"; + name = "kdesu-5.45.0.tar.xz"; }; }; kdewebkit = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kdewebkit-5.40.0.tar.xz"; - sha256 = "1n7cn3yg8ianfk9ymd7hgf1yr2qcck5pg2mcp2bam0zfk4clbcgf"; - name = "kdewebkit-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdewebkit-5.45.0.tar.xz"; + sha256 = "0jdxaaysgdgp15yn2fnxf6m22djyvnl4jcyyrjxz7mz0s0lc4pg9"; + name = "kdewebkit-5.45.0.tar.xz"; }; }; kdnssd = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kdnssd-5.40.0.tar.xz"; - sha256 = "10la98wshran4my7s50w85ifvdibvbw3mb4007x8znz92x1ikdfj"; - name = "kdnssd-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdnssd-5.45.0.tar.xz"; + sha256 = "181slqgyp7xsg6xz92zris6yjmzysglvkbiyiii4245z1ms9pf0x"; + name = "kdnssd-5.45.0.tar.xz"; }; }; kdoctools = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kdoctools-5.40.0.tar.xz"; - sha256 = "1zzgnqkysdvqc7dkb37gcmxfhwik0bkmd23c4y2av00ra6nzymim"; - name = "kdoctools-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdoctools-5.45.0.tar.xz"; + sha256 = "0b2bkn9a7nxyynn5cy53kb62khfklayj8fwgfdh3sr5a15yjycm5"; + name = "kdoctools-5.45.0.tar.xz"; }; }; kemoticons = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kemoticons-5.40.0.tar.xz"; - sha256 = "1jqifvqbj441jif79j5jqrpksyajarill01v625l30kvd584042c"; - name = "kemoticons-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kemoticons-5.45.0.tar.xz"; + sha256 = "1981430xbypxswayrjf5c9bvk65dd2gsima8k0rvysbcqlnyqq7s"; + name = "kemoticons-5.45.0.tar.xz"; }; }; kfilemetadata = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kfilemetadata-5.40.0.tar.xz"; - sha256 = "1yivydc32y4q6kd1myv529lhcs66j0y388g7qv4zjz4plv6kyxvb"; - name = "kfilemetadata-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kfilemetadata-5.45.0.tar.xz"; + sha256 = "0wcgsbpkvi8pls9zh24z4c328dl7lq8km4r7dag9vw4200bncwa6"; + name = "kfilemetadata-5.45.0.tar.xz"; }; }; kglobalaccel = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kglobalaccel-5.40.0.tar.xz"; - sha256 = "1qslksbln3yhhzal88b04zyi4iibffv687gbsm07i4f68pyp0sgn"; - name = "kglobalaccel-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kglobalaccel-5.45.0.tar.xz"; + sha256 = "1iwmwpdxrymsyryvp007n3kz2w9syhl4h9jk6x77hprnmwj62cym"; + name = "kglobalaccel-5.45.0.tar.xz"; }; }; kguiaddons = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kguiaddons-5.40.0.tar.xz"; - sha256 = "02hln4pafph1zny4jnmblydc4wnx66pjj4g6dqxafz6hpvdmncp1"; - name = "kguiaddons-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kguiaddons-5.45.0.tar.xz"; + sha256 = "16cgi9a9laiwzg2fbp5hl3qlxjmhq0l7dw5kjpkzm7xvlj0rm5cn"; + name = "kguiaddons-5.45.0.tar.xz"; + }; + }; + kholidays = { + version = "5.45.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.45/kholidays-5.45.0.tar.xz"; + sha256 = "02bcybzkzp26sz6rjnsh60jmwidmjg8wnixzxs5fk7h8qfygm4ra"; + name = "kholidays-5.45.0.tar.xz"; }; }; khtml = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/portingAids/khtml-5.40.0.tar.xz"; - sha256 = "0v73ia4dgpx5d7h3lpl54cy7p3qavgahj5h2x5vah7fb2gysy7z0"; - name = "khtml-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/khtml-5.45.0.tar.xz"; + sha256 = "1ligyb5hpp53q13r9a2w1xi7b5dc1xqqi9bf3jri01n9pf5d4ynq"; + name = "khtml-5.45.0.tar.xz"; }; }; ki18n = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/ki18n-5.40.0.tar.xz"; - sha256 = "1nv89yi0f2wnb3lc929zfl6bjwznm2q3p449rp3yzp43lx00sym9"; - name = "ki18n-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/ki18n-5.45.0.tar.xz"; + sha256 = "1xjwwlr46x0wr26xn4z086rlzm2bgzyi1ck91cbcc0jv6p6n43mp"; + name = "ki18n-5.45.0.tar.xz"; }; }; kiconthemes = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kiconthemes-5.40.0.tar.xz"; - sha256 = "0i6yjx5fvpbh4hd15wbm69v2qqgxbyfhn1cqp7w7ghgb262b90vx"; - name = "kiconthemes-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kiconthemes-5.45.0.tar.xz"; + sha256 = "0wir8drhv5lx00f4n984yh5xavpi75vg1vpyrf68dd490klwzg45"; + name = "kiconthemes-5.45.0.tar.xz"; }; }; kidletime = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kidletime-5.40.0.tar.xz"; - sha256 = "0q6s73vpasfvzxis5br01k2xl8hnxymq8i1k8l60i8b1v46abr99"; - name = "kidletime-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kidletime-5.45.0.tar.xz"; + sha256 = "0057az4a9jvn120j94jsmf78lxw03c6s534mjn4r8ns9j46c060i"; + name = "kidletime-5.45.0.tar.xz"; }; }; kimageformats = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kimageformats-5.40.0.tar.xz"; - sha256 = "1ld47qkb26gzwvr6bmqa16p4rwf3avi4fm15rpmmxjlbc9pm9n51"; - name = "kimageformats-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kimageformats-5.45.0.tar.xz"; + sha256 = "0kdcrlpj56sw9gy9wf6dxlrsa11k3hv6ayvv6irry3iv1akfx7yp"; + name = "kimageformats-5.45.0.tar.xz"; }; }; kinit = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kinit-5.40.0.tar.xz"; - sha256 = "1296dr1iln5g55j75fb1l5b8c1lj32lsccb82qvpaf57h22fp5ya"; - name = "kinit-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kinit-5.45.0.tar.xz"; + sha256 = "0phqwp60368vynnkh0hl3kdz6p0kisa5ab6fvgvks5p9h1nb6l2h"; + name = "kinit-5.45.0.tar.xz"; }; }; kio = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kio-5.40.0.tar.xz"; - sha256 = "16rqmh0mdncyyq2vidfpyml94n7vmz7rx71v53salpwr3cihpsih"; - name = "kio-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kio-5.45.0.tar.xz"; + sha256 = "05bb27jfinpfdh3vz76prkdvpp574sx1sr41b6qk267y37l14x9y"; + name = "kio-5.45.0.tar.xz"; }; }; kirigami2 = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kirigami2-5.40.0.tar.xz"; - sha256 = "0a22cwxfrkp0hd5isisaz9bnx2sjixi2cm9l35yvbzdnlmm6qjrb"; - name = "kirigami2-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kirigami2-5.45.0.tar.xz"; + sha256 = "00miz1zwhq5ikwyqvvl6ha8w1dra7rxgw59wfg1ac74kjpb964ng"; + name = "kirigami2-5.45.0.tar.xz"; }; }; kitemmodels = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kitemmodels-5.40.0.tar.xz"; - sha256 = "0ij5q0g0cq793znslb7sz6qcrmcdlcx706an8ciznidlwayh9fx9"; - name = "kitemmodels-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kitemmodels-5.45.0.tar.xz"; + sha256 = "08mbvs6lcfwbprk51fjswig0sprn5pcgrhy34qbbnim5ijf8gkw1"; + name = "kitemmodels-5.45.0.tar.xz"; }; }; kitemviews = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kitemviews-5.40.0.tar.xz"; - sha256 = "0347nx4n5sr0dz2zjzdp7s1ca5gnmcr9d881raj50knsgcwgb3m3"; - name = "kitemviews-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kitemviews-5.45.0.tar.xz"; + sha256 = "19cm7vxkp7qiqhjj7ma2nx4lvp2hiffnakiic26jqzb9sb0vkq2n"; + name = "kitemviews-5.45.0.tar.xz"; }; }; kjobwidgets = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kjobwidgets-5.40.0.tar.xz"; - sha256 = "0m2bfa397mzifgxvpw8hpks95yx5krak0285qk14innr21n62qnk"; - name = "kjobwidgets-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kjobwidgets-5.45.0.tar.xz"; + sha256 = "1946wqa6dpi82771nw70nz123w1xa9znhn9kgb0q5ypzc89498gj"; + name = "kjobwidgets-5.45.0.tar.xz"; }; }; kjs = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/portingAids/kjs-5.40.0.tar.xz"; - sha256 = "0nkddm9zjjnsmky71112n8ik6f0am52dmhlarcym2i08zy05chdm"; - name = "kjs-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kjs-5.45.0.tar.xz"; + sha256 = "1xmc57fv3692vk0pzmrs1wyzgd69dhp6by0i1kw4a76w8h0lh5sr"; + name = "kjs-5.45.0.tar.xz"; }; }; kjsembed = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/portingAids/kjsembed-5.40.0.tar.xz"; - sha256 = "0fc3454almq5llhwmkhrwpcl2m1nfjyyhvpnmm879yhrbjf7vnid"; - name = "kjsembed-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kjsembed-5.45.0.tar.xz"; + sha256 = "15jlbr5nw3c3p4cylr01c6w8isf78wnljsym8fsl9513k8cfabif"; + name = "kjsembed-5.45.0.tar.xz"; }; }; kmediaplayer = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/portingAids/kmediaplayer-5.40.0.tar.xz"; - sha256 = "13pykc6zvcv6p0k6m9cqf1fx93jb39ilgn1zlvkws7s1jq4ifkpl"; - name = "kmediaplayer-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kmediaplayer-5.45.0.tar.xz"; + sha256 = "0p3fm448xdcw7qmpbadx9rb6q1zx8bbap0a3xm11ni27s7dpvwgf"; + name = "kmediaplayer-5.45.0.tar.xz"; }; }; knewstuff = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/knewstuff-5.40.0.tar.xz"; - sha256 = "0i4ybzx165js2pl85k8si1waywn4yp47gj16szdx7snlrzvhmq3i"; - name = "knewstuff-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/knewstuff-5.45.0.tar.xz"; + sha256 = "0jk2zsxkj558rf2ar120mljjv13f261js9p27272wr6ily55navn"; + name = "knewstuff-5.45.0.tar.xz"; }; }; knotifications = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/knotifications-5.40.0.tar.xz"; - sha256 = "013r52a6wl9ayp42mvzrq7s8r5mx73bk1j56zxk3yz45xv6gsm0v"; - name = "knotifications-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/knotifications-5.45.0.tar.xz"; + sha256 = "0rnqlfg7n86g7fdmx32l337xjr03g1ri88dg94wci3v9rpffy839"; + name = "knotifications-5.45.0.tar.xz"; }; }; knotifyconfig = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/knotifyconfig-5.40.0.tar.xz"; - sha256 = "1c89k1qnbqyq7d9dsccd9645cq7n6vfyn10sh9f7zraqybi75k3k"; - name = "knotifyconfig-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/knotifyconfig-5.45.0.tar.xz"; + sha256 = "0qxfzrw8pmnm6jrl98d50d12x9azgj3f9bin2irim2w6zcsfqs37"; + name = "knotifyconfig-5.45.0.tar.xz"; }; }; kpackage = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kpackage-5.40.0.tar.xz"; - sha256 = "17hhj8x5r3cpb6cx32f1chg6mklxvcwgmw16c3h2sh4p6bgmibmq"; - name = "kpackage-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kpackage-5.45.0.tar.xz"; + sha256 = "0ddmpn688dil3sdlr91iqczi52rz58nwifij00c0gvj5pgp6agvg"; + name = "kpackage-5.45.0.tar.xz"; }; }; kparts = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kparts-5.40.0.tar.xz"; - sha256 = "1vvmgsqwgics6q86c413wx2yk9mgwvj4wm3fk6my0pi3l166djrl"; - name = "kparts-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kparts-5.45.0.tar.xz"; + sha256 = "0mhmy6sq21c4rgl4lfz9sr3r4zhzn2wfapm3g7qzf8554rinzs5z"; + name = "kparts-5.45.0.tar.xz"; }; }; kpeople = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kpeople-5.40.0.tar.xz"; - sha256 = "1yfs0k3pwcgkzyf0x568jmmjb5gb757c7qdwmz7g0s3gdnhm1mbr"; - name = "kpeople-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kpeople-5.45.0.tar.xz"; + sha256 = "1dm8nb9ckivww867541w6bfjvhg6hi64drzx61ak1ix3ha6n24g1"; + name = "kpeople-5.45.0.tar.xz"; }; }; kplotting = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kplotting-5.40.0.tar.xz"; - sha256 = "1hnnvxvz74s7ir5bgqrvd0iv6fl7d18rqi6yjxy5j8b0f8bgrp7i"; - name = "kplotting-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kplotting-5.45.0.tar.xz"; + sha256 = "1fdvbd57f8aikgi6xa5qb16a32398zkn83xb6vq5rjd3jrzyk4bi"; + name = "kplotting-5.45.0.tar.xz"; }; }; kpty = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kpty-5.40.0.tar.xz"; - sha256 = "1r5lddjhr6g3gzwfmcs7mkc585mz4j6ngnn2m5mlgz2cf8bgf277"; - name = "kpty-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kpty-5.45.0.tar.xz"; + sha256 = "0g8daxvybiraax0395sb05468qfzdg0cjgq810kz78512carsg7f"; + name = "kpty-5.45.0.tar.xz"; }; }; kross = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/portingAids/kross-5.40.0.tar.xz"; - sha256 = "1y89sksha028rxdf534kc3ljnccm2zy111lfnb36vq22wzi7198p"; - name = "kross-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kross-5.45.0.tar.xz"; + sha256 = "1s8y36cn9nj5lqf8f667yyqdk0m4ankqb0fr3s9c7llb87ca8iqn"; + name = "kross-5.45.0.tar.xz"; }; }; krunner = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/krunner-5.40.0.tar.xz"; - sha256 = "19g02k7g2i92fv68gssyqrc1gwlhh924glmzhswp52rkwz4rqf2c"; - name = "krunner-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/krunner-5.45.0.tar.xz"; + sha256 = "18rq5nzdxr8x55s3hqp5b3mibfa51sbybirhdp49igz9x2la2j9x"; + name = "krunner-5.45.0.tar.xz"; }; }; kservice = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kservice-5.40.0.tar.xz"; - sha256 = "0dpd7zpw6x4iqb27a13aazbk9rgbngrdkxz76pq4x32ynzrzzhzc"; - name = "kservice-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kservice-5.45.0.tar.xz"; + sha256 = "0qrawj6hvy6q68k278nqkmdnjqk1cwr6iym9wmiq3lphsab08nl7"; + name = "kservice-5.45.0.tar.xz"; }; }; ktexteditor = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/ktexteditor-5.40.0.tar.xz"; - sha256 = "0xlhxgsj1cyvxrhj4d0ydcns1p18x51igh9bda66rp5p3wx8xm5n"; - name = "ktexteditor-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/ktexteditor-5.45.0.tar.xz"; + sha256 = "1gp5f9v01f0824j96wmv7a48561wkcndnk75q1qdbkknxk4cmnnp"; + name = "ktexteditor-5.45.0.tar.xz"; }; }; ktextwidgets = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/ktextwidgets-5.40.0.tar.xz"; - sha256 = "0dm2nka8vyazz10hi55d1imi49ip2lfns1dimwnwbi15j3a14m6r"; - name = "ktextwidgets-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/ktextwidgets-5.45.0.tar.xz"; + sha256 = "1r76qvn02m6b1rvzmp966xfxr6ifflzd7g7ln0sxccsd9c46lh2b"; + name = "ktextwidgets-5.45.0.tar.xz"; }; }; kunitconversion = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kunitconversion-5.40.0.tar.xz"; - sha256 = "1qp0jcds7khbdxbi025ngz62xbw0k35psy204yz95wrmg302hvnw"; - name = "kunitconversion-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kunitconversion-5.45.0.tar.xz"; + sha256 = "0alm5s3c6g3w66gzii7jjsb0cn4naiimsnm5dag6idhix79wa1kr"; + name = "kunitconversion-5.45.0.tar.xz"; }; }; kwallet = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kwallet-5.40.0.tar.xz"; - sha256 = "0lyx3vdql9n2bwr37wjk6l0k9n2si16gx74vmn1f4r7vqyhij8nd"; - name = "kwallet-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwallet-5.45.0.tar.xz"; + sha256 = "1yis49k3wyk8vhmdhgjrn42jq5kah5z7dg8wgy09dhq61w50sdi9"; + name = "kwallet-5.45.0.tar.xz"; }; }; kwayland = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kwayland-5.40.0.tar.xz"; - sha256 = "00x4df45d80p1nvb0pjbg4y2vmcsghy9hnsr6mwyrhbkdrqdwkid"; - name = "kwayland-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwayland-5.45.0.tar.xz"; + sha256 = "0pk242h8ggd3szyw6jlk0zz8q4rw4ppbbidkilzv3lx340jr1qkq"; + name = "kwayland-5.45.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kwidgetsaddons-5.40.0.tar.xz"; - sha256 = "16h65q1ibmwc5rmwf9jixxrawcd3jvrb5z4z2pcmh8242n1hyhk8"; - name = "kwidgetsaddons-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwidgetsaddons-5.45.0.tar.xz"; + sha256 = "0ywya6fa0q7vdwj7almkvdi16m839c48ma7j9sd87rc0dhigv0p0"; + name = "kwidgetsaddons-5.45.0.tar.xz"; }; }; kwindowsystem = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kwindowsystem-5.40.0.tar.xz"; - sha256 = "0cw062m9phy7z5yg75yg7qwg2lpz8270mwbmmwcbw9bl6qqkbwzz"; - name = "kwindowsystem-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwindowsystem-5.45.0.tar.xz"; + sha256 = "0139413wk8ifyfwadln87ik55jrp5bccy3lbz6ya191fygglx16k"; + name = "kwindowsystem-5.45.0.tar.xz"; }; }; kxmlgui = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kxmlgui-5.40.0.tar.xz"; - sha256 = "07a7h9l0qwsnlwkh7pf50wmq21939mwynplm2zzzv3hkhfj89v6v"; - name = "kxmlgui-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kxmlgui-5.45.0.tar.xz"; + sha256 = "1vb5izjp27qb9685haidagjg2p14a335fwzagzal20z3j2a7j3hv"; + name = "kxmlgui-5.45.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/kxmlrpcclient-5.40.0.tar.xz"; - sha256 = "01zbgnqf2sfjgmx8nn6ljzpvqjg777j2yh2jm55rc4yh15qvvn0l"; - name = "kxmlrpcclient-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kxmlrpcclient-5.45.0.tar.xz"; + sha256 = "0kfkai1cc4xb7vcspbmf6zd951dfz2yxiyjdar4d21s5krvcfh5l"; + name = "kxmlrpcclient-5.45.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/modemmanager-qt-5.40.0.tar.xz"; - sha256 = "0i0jpcy4c8zak9vv5jzcp4m78vk8mcv27dqi464jh9vaz9z7znfj"; - name = "modemmanager-qt-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/modemmanager-qt-5.45.0.tar.xz"; + sha256 = "16qdvy19q5pjk82amn3mncwgvk3g2qrbdzl9wpfxhqcny18xbwdd"; + name = "modemmanager-qt-5.45.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/networkmanager-qt-5.40.0.tar.xz"; - sha256 = "178rm4c3304fn2h1jbfvf9zji8kkvnzkmnpnk0nkjh9dyqa80jvp"; - name = "networkmanager-qt-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/networkmanager-qt-5.45.0.tar.xz"; + sha256 = "00ipzc92v229bz9vv6kga37qhpcnqrxn2h47v9n5myfr1p6acgw0"; + name = "networkmanager-qt-5.45.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/oxygen-icons5-5.40.0.tar.xz"; - sha256 = "057v69r3rvrw2qjqmb93k0m29ssgifb4sgm8xbfqx17b5iqms9f3"; - name = "oxygen-icons5-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/oxygen-icons5-5.45.0.tar.xz"; + sha256 = "1va0296118x7apb7idjf0qjx5f0flamspmzicc03znbh4hx1fxyc"; + name = "oxygen-icons5-5.45.0.tar.xz"; }; }; plasma-framework = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/plasma-framework-5.40.0.tar.xz"; - sha256 = "1mjgy3116pdzvmw43yqhrqz74nyw200yhnnynxk569krgymvalvg"; - name = "plasma-framework-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/plasma-framework-5.45.0.tar.xz"; + sha256 = "1db8pyq1bdkswi59aihaqgas3xzzlfsfd9yn34g4q00gzc17ird5"; + name = "plasma-framework-5.45.0.tar.xz"; }; }; prison = { - version = "5.40.0"; + version = "5.45.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.45/prison-5.45.0.tar.xz"; + sha256 = "1g6rnyx84sz28cf427y9yp0lcbdhrlgx4ns80jz34gyzcgi4bxi0"; + name = "prison-5.45.0.tar.xz"; + }; + }; + purpose = { + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/prison-5.40.0.tar.xz"; - sha256 = "18drqs6j1dx76224hlrp3xmk1hxq6q8638wpf5vmn6vqw8q304vw"; - name = "prison-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/purpose-5.45.0.tar.xz"; + sha256 = "0mfx2gl78w2wwkykl0zch88i7d10zq5cm2xqwxjfpkpdjwb7pflb"; + name = "purpose-5.45.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/qqc2-desktop-style-5.40.0.tar.xz"; - sha256 = "0jpdnsq8yf58p4a7qsgvn3pp7ms7q1pgy4rwrlviyjdrlfc1pv49"; - name = "qqc2-desktop-style-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/qqc2-desktop-style-5.45.0.tar.xz"; + sha256 = "1dc20wkh2cfyhd7wkg1v1b5f6asz70m8ksml6r5hzs807sdqvrsa"; + name = "qqc2-desktop-style-5.45.0.tar.xz"; }; }; solid = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/solid-5.40.0.tar.xz"; - sha256 = "1kj2rs771hyrbbn8qykbrj5fvdv8g7niajbrf6mydbdvqc96zj8x"; - name = "solid-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/solid-5.45.0.tar.xz"; + sha256 = "175hsj2hdsdnz4wkg1l56275390nn1kjpwcyb7ryzzqabn7hdqmd"; + name = "solid-5.45.0.tar.xz"; }; }; sonnet = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/sonnet-5.40.0.tar.xz"; - sha256 = "1a947kgnx5dp7lv63dwzzlxm331c6h0cycv1lcdfcskan1wsmwk8"; - name = "sonnet-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/sonnet-5.45.0.tar.xz"; + sha256 = "0msrwxfvc4vr4xqpwavnj0w4cwkflfjql8nhgm5bvk6cpcxs92ss"; + name = "sonnet-5.45.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/syntax-highlighting-5.40.0.tar.xz"; - sha256 = "0xc06nd95q1mqw41pwrgh798jp9p994qylncabimxbcis39x138l"; - name = "syntax-highlighting-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/syntax-highlighting-5.45.0.tar.xz"; + sha256 = "1v73jzansk6z0kwq65gxvkcm7vcmgw2jvl7916aqzj8xjx8kp433"; + name = "syntax-highlighting-5.45.0.tar.xz"; }; }; threadweaver = { - version = "5.40.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.40/threadweaver-5.40.0.tar.xz"; - sha256 = "0in3cp75n6nxlc38fr2pycfgh4k0azi70cnyzc8glyf3f2rw8d9g"; - name = "threadweaver-5.40.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/threadweaver-5.45.0.tar.xz"; + sha256 = "16s1pgyxhs6v1w7pwg3rr97xkd24xmf23x24pcm15ybd9g38a5yp"; + name = "threadweaver-5.45.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix index 853f02f566a0f01ce70fb1b586881ae30aee51e2..50f3e6a6c025bb35158e25882abec7f8862d0940 100644 --- a/pkgs/development/libraries/kdiagram/default.nix +++ b/pkgs/development/libraries/kdiagram/default.nix @@ -13,7 +13,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtbase qtsvg ]; meta = { - shortDescription = "Libraries for creating business diagrams"; + description = "Libraries for creating business diagrams"; license = lib.licenses.gpl2; platforms = qtbase.meta.platforms; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch b/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch new file mode 100644 index 0000000000000000000000000000000000000000..a0fa625538b740472498e7d55ffe7c1ff324907d --- /dev/null +++ b/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch @@ -0,0 +1,10 @@ +--- a/lib/hx509/Makefile.am 2018-03-21 15:41:38.622968809 +0100 ++++ b/lib/hx509/Makefile.am 2018-03-21 15:41:32.655162197 +0100 +@@ -9,6 +9,8 @@ + sel-gram.h \ + $(gen_files_ocsp:.x=.c) \ + $(gen_files_pkcs10:.x=.c) \ ++ ocsp_asn1.h \ ++ pkcs10_asn1.h \ + hx509_err.c \ + hx509_err.h diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 81f878daaaaa9123c023972ab1899067e8e47537..b72a00d242e9cfe8ec131f03d2da73a4d913c823 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -12,15 +12,17 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}heimdal-${version}"; - version = "7.4.0"; + version = "7.5.0"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; rev = "heimdal-${version}"; - sha256 = "01ch6kqjrxi9fki54yjj2fhxhdkxijz161w2inh5k8mcixlf67vp"; + sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d"; }; + patches = [ ./heimdal-make-missing-headers.patch ]; + nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] ++ (with perlPackages; [ JSON ]) ++ optional (!libOnly) texinfo; @@ -44,6 +46,10 @@ stdenv.mkDerivation rec { "--with-capng" ]; + postUnpack = '' + sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common + ''; + buildPhase = optionalString libOnly '' (cd include; make -j $NIX_BUILD_CORES) (cd lib; make -j $NIX_BUILD_CORES) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 1e64a4d66005de6942c77b7770d6a51d00cb45eb..98073b7bbdc469ab10bb13c13395de62fec0cf49 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -19,10 +19,18 @@ stdenv.mkDerivation rec { sha256 = "0zn8s7anb10hw3nzwjz7vg10fgmmgvwnibn2zrn3nppjxn9f6f8n"; }; + outputs = [ "out" "dev" ]; + configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] - ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""''; + ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""'' + ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) + [ "krb5_cv_attr_constructor_destructor=yes,yes" + "ac_cv_func_regcomp=yes" + "ac_cv_printf_positional=yes" + ]; - nativeBuildInputs = [ pkgconfig perl yacc ] + nativeBuildInputs = [ pkgconfig perl ] + ++ optional (!libOnly) yacc # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; buildInputs = [ openssl ] @@ -31,20 +39,26 @@ stdenv.mkDerivation rec { preConfigure = "cd ./src"; buildPhase = optionalString libOnly '' - (cd util; make -j $NIX_BUILD_CORES) - (cd include; make -j $NIX_BUILD_CORES) - (cd lib; make -j $NIX_BUILD_CORES) - (cd build-tools; make -j $NIX_BUILD_CORES) + MAKE="make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES" + (cd util; $MAKE) + (cd include; $MAKE) + (cd lib; $MAKE) + (cd build-tools; $MAKE) ''; installPhase = optionalString libOnly '' - mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}} - (cd util; make -j $NIX_BUILD_CORES install) - (cd include; make -j $NIX_BUILD_CORES install) - (cd lib; make -j $NIX_BUILD_CORES install) - (cd build-tools; make -j $NIX_BUILD_CORES install) - rm -rf $out/{sbin,share} - find $out/bin -type f | grep -v 'krb5-config' | xargs rm + mkdir -p "$out"/{bin,sbin,lib/pkgconfig,share/{et,man/man1}} \ + "$dev"/include/{gssapi,gssrpc,kadm5,krb5} + (cd util; $MAKE install) + (cd include; $MAKE install) + (cd lib; $MAKE install) + (cd build-tools; $MAKE install) + ${postInstall} + ''; + + # not via outputBin, due to reference from libkrb5.so + postInstall = '' + moveToOutput bin "$dev" ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 5ce1b8ec13ccc705dd8266bebc2a7f5de3430656..5110908e0f272f1d38b5914bc16d58b97da88844 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk_doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool gnome3.gnome_common gtk_doc gnome3.gtk3 + autoconf automake libtool gnome3.gnome-common gtk-doc gnome3.gtk3 python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2 ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index f4158f7edbb4b954059645256931a616ed3edc27..cf4b85043bb27d5464bd059e996f2284fc40d1c1 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk_doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool gnome3.gnome_common gtk_doc + autoconf automake libtool gnome3.gnome-common gtk-doc libX11 libXext libXrender gobjectIntrospection gtk3 ]; diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix deleted file mode 100644 index 1127f3e197df5a71139626f35b4107814ea503d3..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/kirigami/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig -, plasma-framework, qtbase, qttranslations -, qtquickcontrols ? null -, qtquickcontrols2 ? null }: - -let - pname = "kirigami"; - - 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; - }; - }; - -in { - kirigami_1 = generic rec { - name = "${pname}-${version}"; - version = "1.1.0"; - sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6"; - qtqc = qtquickcontrols; - broken = false; - }; - - 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/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 490732c38025a127f102d79012919f1d7bdbf4a9..8be8eb71357264b2d591d7265e76d1e4541eb338 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }: stdenv.mkDerivation rec { - name = "kmsxx-2017-10-10"; + pname = "kmsxx"; + version = "2017-10-10"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "tomba"; diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 8532a8880ce830288f62ebdcd2baadee15f268f6..2a2f0c79490ee6897652a7d217e4b99fc5b99b00 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.0.3"; + version = "3.3.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "17lqrp39w31fm7haigwq23cp92zwk3czjzqa2fhn3wafx3vafwd2"; + sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq"; }; buildInputs = [ diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 57eaf74d290817da0bd726d933fcd5724d26527f..935f52eeb71c2f7fbc5c29a72d4c422446361734 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patches = [(fetchurl { name = "gcc6.patch"; - url = "http://pkgs.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch"; + url = "http://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch"; sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23"; })]; diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 725bc714db2816f5288196858a15fd42cb968e73..1a73a46d28728321240cb5251041904bd0c3f699 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive , libxml2, icu , languageMachines }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "frog-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive + buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 icu languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index d5c232ae776759887eb7d90917f26f2d4ea3939c..a6f5adb955951c0d74e3c43c94970e658a603800 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2, icu +, libxml2, icu, bzip2, libtar , languageMachines }: let @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive libxml2 icu languageMachines.ticcutils ]; + buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 2ffabac1ede9aadb79cceb3ca31ffcd4aa787032..3bc78a96a063203f39f216dbc1c68cb694ec0bbd 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive , libxml2 , languageMachines }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive + buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index d12c970d4dc48ae096ee70be661eb78ed3364bfb..3ab38a9e84ac86d3f7e2d1393042834792ab1c57 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2 +, libxml2, bzip2, libtar , languageMachines }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive + buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils ]; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index 7a07e9f33a8aea963d53514bc3a8b2fac06fe597..ee1579540c33e5ee20b9ff2ec842e90078c396ee 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive , libxml2 , languageMachines }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive + buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index 5c12a2142cc147675ea728244e80ece70745a851..8f917c2265d2b738539a0be000ef6bc00a35cbc8 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2, icu +, libxml2, icu, bzip2, libtar , languageMachines }: @@ -14,8 +14,8 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive - icu libxml2 + buildInputs = [ automake autoconf bzip2 libtool autoconf-archive + icu libtar libxml2 languageMachines.ticcutils languageMachines.libfolia languageMachines.uctodata diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 09001b6a6f088689ba65f161e8bd8d6358d67766..acd0d35a5f08e5c27af5253c9d41ca0abef5163d 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk_doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: +{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ autoconf automake glib gobjectIntrospection gtk_doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; + buildInputs = [ autoconf automake glib gobjectIntrospection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; configurePhase = '' ./configure --with-pkg-config=$PKG_CONFIG_PATH \ diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 6fde8305da50fe577dcdb307562e88850b37ad9a..5d307dcfa7ad5130127a391b0b8c4bb1e5d2c7c4 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libtiff, libjpeg, zlib }: stdenv.mkDerivation rec { - name = "lcms2-2.8"; + name = "lcms2-2.9"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "08pvl289g0mbznzx5l6ibhaldsgx41kwvdn2c974ga9fkli2pl36"; + sha256 = "083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index f465cf1cc44169febf0b01548afe5fae471bca48..6c2a8f84d2323b55236e876a42f81eccb0dae21e 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, perl, dns-root-data}: +{ stdenv, fetchurl, fetchpatch, openssl, perl, dns-root-data }: stdenv.mkDerivation rec { pname = "ldns"; @@ -8,10 +8,25 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; - sha1 = "ceeeccf8a27e61a854762737f6ee02f44662c1b8"; + sha256 = "1k56jw4hz8njspfxcfw0czf1smg0n48ylia89ziwyx5k9wdmp7y1"; }; - patchPhase = '' + patches = [ + (fetchpatch { + name = "CVE-2017-1000231.patch"; + url = "https://git.nlnetlabs.nl/ldns/patch/?id=c8391790"; + sha256 = "1rprfh0y1c28dqiy3vgwvwdhn7b5rsylfzzblx5xdhwfqgdw8vn0"; + excludes = [ "Changelog" ]; + }) + (fetchpatch { + name = "CVE-2017-1000232.patch"; + url = "https://git.nlnetlabs.nl/ldns/patch/?id=3bdeed02"; + sha256 = "0bv0s5jjp0sswfg8da47d346iwp9yjhj9w7fa3bxh174br0zj07r"; + excludes = [ "Changelog" ]; + }) + ]; + + postPatch = '' patchShebangs doc/doxyparse.pl ''; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index be033c3860cf0752433d25dfba1e21d59b294cdb..44d527e1304b7c5c75da0d7e7a43252de003a401 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { - sha256 = "1pcbfgq9khlcvxjsqpdshjskwljzawryzps0ickazwm7l3m7hrln"; + sha256 = "0whlyzz0imv4lm69xkwhcd6jzh3s0rzlqjmwimbqz96p4771ivpd"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 2a109e0366fd1513e73842246223d22dca93ffa0..2b50c09af5cceb39ce4a7e5ecfc972866f64a747 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, sqlite, kyotocabinet }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "leveldb-${version}"; @@ -11,19 +11,25 @@ stdenv.mkDerivation rec { sha256 = "1bnsii47vbyqnbah42qgq6pbmmcg4k3fynjnw7whqfv6lpdgmb8d"; }; - buildInputs = [ sqlite kyotocabinet ]; - buildPhase = '' - make all db_bench{,_sqlite3,_tree_db} leveldbutil libmemenv.a + make all leveldbutil libmemenv.a ''; - installPhase = " + installPhase = (stdenv.lib.optionalString stdenv.isDarwin '' + for file in *.dylib*; do + install_name_tool -id $out/lib/$file $file + done + '') + # XXX consider removing above after transition to cmake in the next release + " mkdir -p $out/{bin,lib,include} + cp -r include $out - cp lib* $out/lib - cp db_bench{,_sqlite3,_tree_db} leveldbutil $out/bin mkdir -p $out/include/leveldb/helpers cp helpers/memenv/memenv.h $out/include/leveldb/helpers + + cp lib* $out/lib + + cp leveldbutil $out/bin "; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 31dfe6085ee16d5c9adac4cf007789e45f0a33ae..7de72ed73a65d9d54420bb463aa30e3a4c5dee1c 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "libHX-3.21"; + name = "libHX-3.22"; src = fetchurl { - url = "mirror://sourceforge/libhx/libHX/3.21/${name}.tar.xz"; - sha256 = "0wcr6kbhsw6v4js7q4p7fhli37c39dv1rryjf768rkwshl2z8f6v"; + url = "mirror://sourceforge/libhx/libHX/3.22/${name}.tar.xz"; + sha256 = "18w39j528lyg2026dr11f2xxxphy91cg870nx182wbd8cjlqf86c"; }; patches = []; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 20531adcd1c7201d66a5116473e133d63f7b39ef..272a9774a7f4ccc1fb573020d0d0434810a49f0e 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip }: +{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "libLAS-1.8.1"; @@ -9,14 +9,24 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ]; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + cmakeFlags = [ + "-DGDAL_CONFIG=${gdal}/bin/gdal-config" + "-DWITH_LASZIP=ON" + "-DLASZIP_INCLUDE_DIR=${LASzip}/include" + ]; + + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib + ''; meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; homepage = http://www.liblas.org; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.michelk ]; }; } diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 71a28085541d2075e4a521ef8a0355cf4ee0acd3..187e06239c10418c59ca08defeb2d31f82b9d638 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libabw-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; - sha256 = "0zi1zj4fpxgpglbbb5n1kg3dmhqq5rpf46lli89r5daavp19iing"; + sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"; }; # Boost 1.59 compatability fix diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index e410b6d4aa522ac0dd1f3c084cf65acf86f6c300..4bb806b91d8ae25af4c3c2c3b0d3cec7563d6b73 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitLab, autoconf, automake, glib -, gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: +, gtk-doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: -let version = "1.18"; in +let version = "1.23"; in stdenv.mkDerivation rec { name = "libaccounts-glib-${version}"; src = fetchFromGitLab { - sha256 = "02p23vrqhw2l2w6nrwlk4bqxf7z9kplkc2d43716x9xakxr291km"; - rev = version; + sha256 = "11cvl3ch0y93756k90mw1swqv0ylr8qgalmvcn5yari8z4sg6cgg"; + rev = "VERSION_${version}"; repo = "libaccounts-glib"; owner = "accounts-sso"; }; buildInputs = [ glib libxml2 libxslt sqlite ]; - nativeBuildInputs = [ autoconf automake gtk_doc libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake gtk-doc libtool pkgconfig ]; postPatch = '' NOCONFIGURE=1 ./autogen.sh diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 1c9e8eca0d577660c1fd05aea7d41a85933e4d87..49e5bcdd9058e74e3c09b752048c20adc867283f 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc -, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, mesa +, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined , libsndfile, portaudio, mysql, fontconfig }: @@ -19,16 +19,17 @@ stdenv.mkDerivation rec { "--enable-nls=yes" "--with-gettext=${gettext}" "--with-jpeg=${libjpeg.dev}" - "--with-gl=${mesa}" - "--with-mysql=yes" + "--with-gl=${libGLU_combined}" + "--with-mysql=${mysql.connector-c}" "--with-manpages=yes" ]; outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ pkgconfig libtool gettext ]; + buildInputs = [ - bsdbuild perl xlibsWrapper libXinerama SDL mesa mysql.client mandoc + bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined mysql.connector-c mandoc freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile ]; diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..85972e67e103168b50789844d84179508bc2883c --- /dev/null +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + name = "libamqpcpp-${version}"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "CopernicaMarketingSoftware"; + repo = "AMQP-CPP"; + rev = "v${version}"; + sha256 = "0n93wy2v2hx9zalpyn8zxsxihh0xpgcd472qwvwsc253y97v8ngv"; + }; + + buildInputs = [ openssl ]; + + patches = [ ./libamqpcpp-darwin.patch ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Library for communicating with a RabbitMQ server"; + homepage = https://github.com/CopernicaMarketingSoftware/AMQP-CPP; + license = licenses.asl20; + maintainers = [ maintainers.mjp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch b/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..9f8d700929b415e78d1fefd347bd18c633632f46 --- /dev/null +++ b/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch @@ -0,0 +1,13 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -0,0 +1 @@ ++CXX ?= g++ +@@ -43 +44 @@ ${SHARED_LIB}: ${SHARED_OBJECTS} +- ${LD} ${LD_FLAGS} -Wl,${SONAMEPARAMETER},lib$(LIBRARY_NAME).so.$(SONAME) -o $@ ${SHARED_OBJECTS} ++ ${CXX} ${LD_FLAGS} -Wl,${SONAMEPARAMETER},lib$(LIBRARY_NAME).so.$(SONAME) -o $@ ${SHARED_OBJECTS} +@@ -52 +53 @@ ${SHARED_OBJECTS}: +- ${CPP} ${CPPFLAGS} -fpic -o $@ ${@:%.o=%.cpp} ++ ${CXX} ${CPPFLAGS} -fpic -o $@ ${@:%.o=%.cpp} +@@ -55 +56 @@ ${STATIC_OBJECTS}: +- ${CPP} ${CPPFLAGS} -o $@ ${@:%.s.o=%.cpp} ++ ${CXX} ${CPPFLAGS} -o $@ ${@:%.s.o=%.cpp} diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 3a1c89384050a7cd16e2353d12c7943b6f195d25..826f72b1f5fb3efa74e2153129dbcddd46a5a0e0 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,33 +1,42 @@ -{ lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, libpulseaudio, alsaLib, libcap , CoreAudio, CoreServices, AudioUnit , usePulseAudio }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.2.2"; name = "libao-${version}"; - src = fetchurl { - url = "http://downloads.xiph.org/releases/ao/${name}.tar.gz"; - sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83"; + + # the github mirror is more up to date than downloads.xiph.org + src = fetchFromGitHub { + owner = "xiph"; + repo = "libao"; + rev = "${version}"; + sha256 = "0svgk4sc9kdhcsfyvbvgm5vpbg3sfr6z5rliflrw49v3x2i4vxq5"; }; + configureFlags = [ + "--disable-broken-oss" + "--enable-alsa-mmap" + ]; + outputs = [ "out" "dev" "man" "doc" ]; - buildInputs = - [ pkgconfig ] ++ - lib.optional usePulseAudio libpulseaudio ++ - lib.optional stdenv.isLinux alsaLib ++ - lib.optional stdenv.isLinux libcap ++ + buildInputs = [ ] ++ + lib.optional usePulseAudio libpulseaudio ++ + lib.optionals stdenv.isLinux [ alsaLib libcap ] ++ lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; - meta = { + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + meta = with stdenv.lib; { longDescription = '' Libao is Xiph.org's cross-platform audio library that allows programs to output audio using a simple API on a wide variety of platforms. ''; homepage = https://xiph.org/ao/; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.gpl2; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d11bec2cb4ff212a208d7d022aaaed1ff6f39792 --- /dev/null +++ b/pkgs/development/libraries/libaom/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libaom-0.1.0"; + + src = fetchgit { + url = "https://aomedia.googlesource.com/aom"; + rev = "105e9b195bb90c9b06edcbcb13b6232dab6db0b7"; + sha256 = "1fl2sca4df01gyn00s0xcwwirxccfnjppvjdrxdnb8f2naj721by"; + }; + + buildInputs = [ perl yasm ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ + "-DCONFIG_UNIT_TESTS=0" + ]; + + meta = with stdenv.lib; { + description = "AV1 Bitstream and Decoding Library"; + homepage = https://aomedia.org/av1-features/get-started/; + maintainers = with maintainers; [ kiloreux ]; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 3a26dd407e4ee56eac8489149cbf6bd0546c74f3..6c87588fd3d70855fb8aadf632cab3160ff4680a 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -2,10 +2,10 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, gtkVersion +, glib, dbus-glib, gtkVersion , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null -, python2Packages, gobjectIntrospection, vala_0_23 +, python2Packages, gobjectIntrospection, vala , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { else [ gtk3 libdbusmenu-gtk3 ]; buildInputs = [ - glib dbus_glib - python pygobject2 pygtk gobjectIntrospection vala_0_23 + glib dbus-glib + python pygobject2 pygtk gobjectIntrospection vala ] ++ (if gtkVersion == "2" then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ libindicator-gtk3 ]); diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index 79cbf09317cfef298c88dc8c558c962459e68fc7..a1a04a1dd7b2e1a05f3a1cf36434ada60f2c4db2 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libargon2-${version}"; - version = "20161029"; + version = "20171227"; src = fetchFromGitHub { owner = "P-H-C"; repo = "phc-winner-argon2"; rev = "${version}"; - sha256 = "021g8wi4g67ywm8zf3yncqwrmfz7ypgm1ih9wcmnxip5n75rymh5"; + sha256 = "0sc9zca1anqk41017vjpas4kxi4cbn0zvicv8vj8p2sb2gy94bh8"; }; installPhase = '' @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = https://www.argon2.com/; license = with licenses; [ asl20 cc0 ]; maintainers = with maintainers; [ taeer olynch ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 058839f70f8a861b384baf735f77f16a8985fb58..d7ebf781a04949bf2e7251d24fd6d7a34d48fde6 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.7"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; - sha256 = "17byv926w1mxn56n896sxvdq4m0yv1l7qbm688h6zr3nzgsyarbh"; + sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index bad2a060cdca7648dd6d7df56e3905a96b37df97..91ceb959779e29bf7339245d4829d7b414946c26 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,17 +1,17 @@ -{ fetchurl, stdenv, pth, libgpgerror }: +{ fetchurl, stdenv, gettext, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.4.3"; + name = "libassuan-2.5.1"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "0w9bmasln4z8mn16s1is55a06w3nv8jbyal496z5jvr5vcxkm112"; + sha256 = "0jb4nb4nrjr949gd3lw8lh4v5d6qigxaq6xwy24w5apjnhvnrya7"; }; outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # libassuan-config - buildInputs = [ libgpgerror pth ]; + buildInputs = [ libgpgerror pth gettext]; doCheck = true; @@ -20,18 +20,16 @@ stdenv.mkDerivation rec { sed -i 's,#include ,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h ''; - meta = { + meta = with stdenv.lib; { description = "IPC library used by GnuPG and related software"; - longDescription = '' Libassuan is a small library implementing the so-called Assuan protocol. This protocol is used for IPC between most newer GnuPG components. Both, server and client side functions are provided. ''; - homepage = http://gnupg.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index 900bcac415698cdbc98bc0af0905d4ac31e13ed9..bcfee04447562d33f71ad71e9e43c6e49b7f1ebb 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation rec { name = "libast-${version}"; - version = "0.7"; - + version = "0.7.1"; + src = fetchurl { url = "http://www.eterm.org/download/${name}.tar.gz"; sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index eedc0993d736541564844125a69e38537f31f8b3..fde8a06eb4162ad374b1aad56c06e1b8ce62d7f5 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, autoconf, automake, libtool }: +{ stdenv, fetchurl, autoconf, automake, libtool, hostPlatform }: stdenv.mkDerivation rec { name = "libatomic_ops-${version}"; - version = "7.6.0"; + version = "7.6.4"; src = fetchurl { 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"; + sha256 = "0knxncsjhbknlyy6lx7ycxhpzfk3sykhvicgxyp0rmsxd1d3v0jv"; }; + outputs = [ "out" "dev" "doc" ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; preConfigure = stdenv.lib.optionalString stdenv.isCygwin '' @@ -23,6 +25,6 @@ stdenv.mkDerivation rec { description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + platforms = with stdenv.lib.platforms; unix ++ windows; }; } diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index 81e32ab2c931290f1141d66e4b4c032957a81736..aab8fcd4beb8b439d90d181fbb7c23a3136c2803 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, dbus-glib }: stdenv.mkDerivation rec { name = "libaudclient-3.5-rc2"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus_glib ]; + buildInputs = [ glib dbus-glib ]; meta = with stdenv.lib; { description = "Legacy D-Bus client library for Audacious"; - homepage = http://audacious-media-player.org/; + homepage = https://audacious-media-player.org/; license = licenses.bsd2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index e348fe0fae28582b9bedb9febcedcb678a4a2f2a..317768518c3919aa54629ed079b77f60a90bdb89 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl +{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl, bash , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -28,9 +28,9 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in let result = { # e.g. https://libav.org/releases/libav-11.11.tar.xz.sha1 - libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; - libav_11 = libavFun "11.11" "d7444fa4f135bdd7347cc962ab4b5228796b0f23"; - libav_12 = libavFun "12.2" "3784b15f88076ca0ab8fb6b0377e975b83a5c9f5"; + libav_0_8 = libavFun "0.8.21" "d858f65128dad0bac1a8c3a51e5cbb27a7c79b3f"; + libav_11 = libavFun "11.12" "61d5dcab5fde349834af193a572b12a5fd6a4d42"; + libav_12 = libavFun "12.3" "386c18c8b857f23dfcf456ce40370716130211d9"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { @@ -45,7 +45,11 @@ let ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch ; - preConfigure = "patchShebangs doc/texi2pod.pl"; + postPatch = '' + patchShebangs . + # another shebang was hidden in a here document text + substituteInPlace ./configure --replace "#! /bin/sh" "#!${bash}/bin/sh" + ''; configureFlags = assert stdenv.lib.all (x: x!=null) buildInputs; @@ -71,8 +75,8 @@ let ++ optional freetypeSupport "--enable-libfreetype" ; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lame yasm zlib bzip2 SDL ] + nativeBuildInputs = [ pkgconfig perl ]; + buildInputs = [ lame yasm zlib bzip2 SDL bash ] ++ [ perl ] # for install-man target ++ optional mp3Support lame ++ optional speexSupport speex @@ -95,6 +99,7 @@ let # alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc. buildFlags = "all alltools install-man"; + postInstall = '' moveToOutput bin "$bin" # alltools target compiles an executable in tools/ for every C @@ -110,7 +115,7 @@ let crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.prefix}" + "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" "--target_os=linux" "--arch=${hostPlatform.arch}" @@ -125,7 +130,6 @@ let license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.vcunat ]; }; }; # libavFun diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index a427bd99dd5874e421a24510ea191c8cdda440c8..54fb89df0451812fbde2e06e8824d972bb17b700 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libbap-${version}"; - version = "master-2017-02-08"; + version = "master-2018-03-01"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "b3da5bd5cdb3d646015ccdeb886b5ea8fd85a108"; - sha256 = "0cwfyfpxbi9bm4kkpamyd7mgsm5b6j1rh217fqb5gi05wg45rkbb"; + rev = "bd125c379a784d4265c2ddcf1f6e34bde2e568d4"; + sha256 = "0dp90djyjc262v1b1cw5irp424a8394y86fyprdk8z741wg56m3v"; }; nativeBuildInputs = [ autoreconfHook which ]; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3f244d399f7e776d7c33617fb3f9ac00cd84ac0e --- /dev/null +++ b/pkgs/development/libraries/libbfd/default.nix @@ -0,0 +1,59 @@ +{ stdenv, buildPackages +, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped +, libiberty, zlib +}: + +stdenv.mkDerivation rec { + name = "libbfd-${version}"; + inherit (binutils-unwrapped) version src; + + outputs = [ "out" "dev" ]; + + patches = binutils-unwrapped.patches ++ [ + ../../tools/misc/binutils/build-components-separately.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; + sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q"; + }) + ]; + + # We just want to build libbfd + postPatch = '' + cd bfd + ''; + + postAutoreconf = '' + echo "Updating config.guess and config.sub from ${gnu-config}" + cp -f ${gnu-config}/config.{guess,sub} ../ + ''; + + # We update these ourselves + dontUpdateAutotoolsGnuConfigScripts = true; + + nativeBuildInputs = [ autoreconfHook264 bison ]; + buildInputs = [ libiberty zlib ]; + + configurePlatforms = [ "build" "host" ]; + configureFlags = [ + "--enable-targets=all" "--enable-64-bit-bfd" + "--enable-install-libbfd" + "--enable-shared" + "--with-system-zlib" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A library for manipulating containers of machine code"; + longDescription = '' + BFD is a library which provides a single interface to read and write + object files, executables, archive files, and core files in any format. + It is associated with GNU Binutils, and elsewhere often distributed with + it. + ''; + homepage = http://www.gnu.org/software/binutils/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ericson2314 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 8948a74ad63003856975ed914e9567e23c239d35..3f4f48775c1b7aad41ef77053bc15120dcd11afa 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -2,14 +2,14 @@ , libusb1, udev }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.9.0"; name = "libbladeRF-v${version}"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "1y00hqsmqaix4dql8mb75zx87zvn8b483yxv53x9qyjspksbs60c"; + sha256 = "0frvphp4xxdxwzmi94b0asl7b891sd3fk8iw9kfk8h6f3cdhj8xa"; }; nativeBuildInputs = [ pkgconfig ]; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; maintainers = with maintainers; [ funfunctor ]; - platforms = platforms.linux; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 8b67d52b875e2d8a0f49f054b5393db613197699..fea4744a075a88a3b93379be0f306ecc97911580 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { name = "libbluray-${version}"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; - sha256 = "1k3lag4lxi2jjd3zh4wcb5l3hadzm54j5kagh92yzfy76p9svqzp"; + sha256 = "1zxfnw1xbghcj7b3zz5djndv6gwssxda19cz1lrlqrkg8577r7kd"; }; patches = optional withJava ./BDJ-JARFILE-path.patch; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; configureFlags = with stdenv.lib; - optional (! withJava) "--disable-bdjava" + optional (! withJava) "--disable-bdjava-jar" ++ optional (! withMetadata) "--without-libxml2" ++ optional (! withFonts) "--without-freetype" ; diff --git a/pkgs/development/libraries/libbrotli/default.nix b/pkgs/development/libraries/libbrotli/default.nix deleted file mode 100644 index 03604e3a93e2caeb58f3266a76154eccefc617c8..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libbrotli/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable }: - -stdenv.mkDerivation rec { - name = "libbrotli-${version}"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "bagder"; - repo = "libbrotli"; - rev = name; - sha256 = "0apd3hpy3vaa7brkv8v0xwz05zbd5xv86rcbkwns4x39klba3m3y"; - }; - - nativeBuildInputs = [ autoconf automake libtool ]; - - preConfigure = '' - cp -r ${brotliUnstable.src}/* brotli/ - chmod -R +700 brotli - mkdir m4 - autoreconf --install --force --symlink - ''; - - meta = with stdenv.lib; { - description = "Meta project to build libraries from the brotli source code"; - longDescription = '' - Wrapper scripts and code around the brotli code base. - Builds libraries out of the brotli decode and encode sources. Uses autotools. - 'brotlidec' is the library for decoding, decompression - 'brotlienc' is the library for encoding, compression - ''; - - homepage = https://github.com/bagder/libbrotli; - license = licenses.mit; - platforms = platforms.all; - maintainers = []; - }; -} diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch new file mode 100644 index 0000000000000000000000000000000000000000..81822654aeb436aeadd9d7b89ca4dfa361524cf7 --- /dev/null +++ b/pkgs/development/libraries/libbsd/cdefs.patch @@ -0,0 +1,222 @@ +From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:41:35 +0100 +Subject: Handle systems missing + +This is a non-portable header, and we cannot expect it to be provided by +the system libc (e.g. musl). We just need and rely on declaration that +we have defined ourselves in our own . So we switch to +only ever assume that. + +Fixes: https://bugs.freedesktop.org/105281 +--- + include/bsd/libutil.h | 4 ++++ + include/bsd/md5.h | 4 ++++ + include/bsd/nlist.h | 4 ++++ + include/bsd/readpassphrase.h | 4 ++++ + include/bsd/stdlib.h | 4 ++++ + include/bsd/string.h | 4 ++++ + include/bsd/stringlist.h | 5 +++++ + include/bsd/sys/queue.h | 4 ++++ + include/bsd/sys/tree.h | 4 ++++ + include/bsd/timeconv.h | 4 ++++ + include/bsd/vis.h | 4 ++++ + include/bsd/wchar.h | 4 ++++ + 12 files changed, 49 insertions(+) + +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index 45b3b15..ccca29a 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -40,7 +40,11 @@ + #define LIBBSD_LIBUTIL_H + + #include ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + #include +diff --git a/include/bsd/md5.h b/include/bsd/md5.h +index 5f3ae46..bf36a30 100644 +--- a/include/bsd/md5.h ++++ b/include/bsd/md5.h +@@ -27,7 +27,11 @@ typedef struct MD5Context { + uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ + } MD5_CTX; + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h +index cb297e8..8767117 100644 +--- a/include/bsd/nlist.h ++++ b/include/bsd/nlist.h +@@ -27,7 +27,11 @@ + #ifndef LIBBSD_NLIST_H + #define LIBBSD_NLIST_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + struct nlist { + union { +diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h +index 14744b8..5eb8021 100644 +--- a/include/bsd/readpassphrase.h ++++ b/include/bsd/readpassphrase.h +@@ -31,7 +31,11 @@ + #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ + #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index ebc9638..8d33d1f 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -42,7 +42,11 @@ + #ifndef LIBBSD_STDLIB_H + #define LIBBSD_STDLIB_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 6798bf6..29097f6 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -33,7 +33,11 @@ + #ifndef LIBBSD_STRING_H + #define LIBBSD_STRING_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h +index ff30cac..dd71496 100644 +--- a/include/bsd/stringlist.h ++++ b/include/bsd/stringlist.h +@@ -31,7 +31,12 @@ + + #ifndef LIBBSD_STRINGLIST_H + #define LIBBSD_STRINGLIST_H ++ ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + /* +diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h +index 4a94ea7..ac00026 100644 +--- a/include/bsd/sys/queue.h ++++ b/include/bsd/sys/queue.h +@@ -33,7 +33,11 @@ + #ifndef LIBBSD_SYS_QUEUE_H + #define LIBBSD_SYS_QUEUE_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + /* + * This file defines four types of data structures: singly-linked lists, +diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h +index 628bec0..325b382 100644 +--- a/include/bsd/sys/tree.h ++++ b/include/bsd/sys/tree.h +@@ -30,7 +30,11 @@ + #ifndef LIBBSD_SYS_TREE_H + #define LIBBSD_SYS_TREE_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + /* + * This file defines data structures for different types of trees: +diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h +index e2a2c55..a426bd3 100644 +--- a/include/bsd/timeconv.h ++++ b/include/bsd/timeconv.h +@@ -41,7 +41,11 @@ + #ifndef LIBBSD_TIMECONV_H + #define LIBBSD_TIMECONV_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + +diff --git a/include/bsd/vis.h b/include/bsd/vis.h +index 970dfdd..ab5430c 100644 +--- a/include/bsd/vis.h ++++ b/include/bsd/vis.h +@@ -72,7 +72,11 @@ + */ + #define UNVIS_END 1 /* no more characters */ + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + __BEGIN_DECLS + char *vis(char *, int, int, int); +diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h +index 33a500e..7216503 100644 +--- a/include/bsd/wchar.h ++++ b/include/bsd/wchar.h +@@ -40,7 +40,11 @@ + #define LIBBSD_WCHAR_H + + #include ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +-- +cgit v1.1 + diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch index a9ac414e93df924ec2abdbf44a8841f2fe50cdc9..4bddec6b0ffd91caf77d3718f6ee848a799d3c32 100644 --- a/pkgs/development/libraries/libbsd/darwin.patch +++ b/pkgs/development/libraries/libbsd/darwin.patch @@ -1,5 +1,5 @@ diff --git a/configure.ac b/configure.ac -index c909878..60c540e 100644 +index 88ccd91..0857782 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,7 @@ AS_CASE([$host_os], @@ -31,7 +31,7 @@ index c909878..60c540e 100644 + os_is_macosx=false + nonLinuxOS=false + ;; -+esac ++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])]) @@ -58,7 +58,7 @@ index 45b3b15..d0d4043 100644 #include #include diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h -index 4b69983..8e2ac75 100644 +index 4b69983..c75151b 100644 --- a/include/bsd/stdio.h +++ b/include/bsd/stdio.h @@ -48,12 +48,16 @@ @@ -69,37 +69,60 @@ index 4b69983..8e2ac75 100644 /* 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) - LIBBSD_DEPRECATED("This functions cannot be safely ported, " - "use getline(3) instead, as it is supported " - "by GNU and POSIX.1-2008."); +- LIBBSD_DEPRECATED("This functions cannot be safely ported, " +- "use getline(3) instead, as it is supported " +- "by GNU and POSIX.1-2008."); ++ __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/stdlib.h b/include/bsd/stdlib.h +index ebc9638..6cd7943 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb, + const unsigned char *table, unsigned endbyte); + + void *reallocf(void *ptr, size_t size); +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) ++#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ) ++#if !__GLIBC_PREREQ(2, 26) + void *reallocarray(void *ptr, size_t nmemb, size_t size); + #endif ++#endif + + long long strtonum(const char *nptr, long long minval, long long maxval, + const char **errstr); diff --git a/include/bsd/string.h b/include/bsd/string.h -index ee2f953..a3ab077 100644 +index 6798bf6..6baaa14 100644 --- a/include/bsd/string.h +++ b/include/bsd/string.h -@@ -37,11 +37,14 @@ +@@ -37,6 +37,12 @@ #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); ++char *bsd_strnstr(const char *str, const char *find, size_t str_len); +void bsd_strmode(mode_t mode, char *str); +#else - void strmode(mode_t mode, char *str); -- -+#endif + 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); +@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str); + #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) void explicit_bzero(void *buf, size_t len); + #endif ++#endif __END_DECLS + #endif diff --git a/src/Makefile.am b/src/Makefile.am index ad83dbf..0f2a7ee 100644 --- a/src/Makefile.am @@ -519,18 +542,17 @@ index 462535a..e7eb46f 100644 +} #endif diff --git a/src/funopen.c b/src/funopen.c -index 1e05c7e..ed8ce85 100644 +index 1e05c7e..75e61ea 100644 --- a/src/funopen.c +++ b/src/funopen.c -@@ -137,7 +137,7 @@ funopen(const void *cookie, - - return fopencookie(cookiewrap, mode, funcswrap); - } --#elif defined(__MUSL__) -+#elif defined(__MUSL__) || defined(darwin) || defined(__APPLE__) || defined(MACOSX) - /* - * This is unimplementable on musl based systems, and upstream has stated +@@ -143,6 +143,7 @@ funopen(const void *cookie, * they will not add the needed support to implement it. Just ignore this + * interface there, as it has never been provided anyway. + */ ++#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX) + #else + #error "Function funopen() needs to be ported or disabled." + #endif diff --git a/src/getentropy.c b/src/getentropy.c index 3f11a1e..8a23a07 100644 --- a/src/getentropy.c @@ -563,13 +585,15 @@ index 4f368a1..ab22fc1 100644 #define SHA512_DIGEST_LENGTH 64 diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c -index b3c8d5e..4fade0f 100644 +index b3c8d5e..f69013d 100644 --- a/src/hash/sha512c.c +++ b/src/hash/sha512c.c -@@ -25,7 +25,11 @@ +@@ -25,7 +25,13 @@ */ #include ++__FBSDID("$FreeBSD$"); ++ +#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) +#include +#else @@ -579,24 +603,25 @@ index b3c8d5e..4fade0f 100644 #include diff --git a/src/nlist.c b/src/nlist.c -index 0932f59..a3ba2be 100644 +index 0932f59..598a329 100644 --- a/src/nlist.c +++ b/src/nlist.c -@@ -27,6 +27,8 @@ +@@ -27,6 +27,10 @@ * 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 */ #include #include -@@ -265,3 +267,5 @@ nlist(const char *name, struct nlist *list) +@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list) (void)close(fd); return (n); } -+ -+#endif ++#endif /* _NLIST_DO_ELF */ diff --git a/src/setproctitle.c b/src/setproctitle.c index 038ac7d..d0ef01b 100644 --- a/src/setproctitle.c diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 7e112caf3c78c6c907c2b81a83a9f7d665b14199..ff9412ceb58040b64d7a9be733c1de2d70ad2b2c 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -2,18 +2,27 @@ stdenv.mkDerivation rec { name = "libbsd-${version}"; - version = "0.8.6"; + version = "0.8.7"; src = fetchurl { url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "11wnkzims5grprvhb1ssmq9pc2lcgh2r2rk8gwgz36ply6fvyzs6"; + sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m"; }; # darwin changes configure.ac which means we need to regenerate # the configure scripts nativeBuildInputs = [ autoreconfHook ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch + # Suitable for all, but limited to musl to avoid rebuilds + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 + ./non-glibc.patch + # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd + ./cdefs.patch + # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404 + ./features.patch + ]; meta = with stdenv.lib; { description = "Common functions found on BSD systems"; diff --git a/pkgs/development/libraries/libbsd/features.patch b/pkgs/development/libraries/libbsd/features.patch new file mode 100644 index 0000000000000000000000000000000000000000..66bd1e9232bad2d803e1ca1f559720b9213ea718 --- /dev/null +++ b/pkgs/development/libraries/libbsd/features.patch @@ -0,0 +1,26 @@ +From b20272f5a966333b49fdf2bda797e2a9f0227404 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:42:52 +0100 +Subject: Remove inclusion from + +This is a non-portable header, and we should not assume it is present. +Let the first system header pull it in if needed. +--- + include/bsd/libutil.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index ccca29a..e5f148a 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -39,7 +39,6 @@ + #ifndef LIBBSD_LIBUTIL_H + #define LIBBSD_LIBUTIL_H + +-#include + #ifdef LIBBSD_OVERLAY + #include + #else +-- +cgit v1.1 + diff --git a/pkgs/development/libraries/libbsd/non-glibc.patch b/pkgs/development/libraries/libbsd/non-glibc.patch new file mode 100644 index 0000000000000000000000000000000000000000..f61e0d242943af4a10a2feaa7b28ad3169bb47b4 --- /dev/null +++ b/pkgs/development/libraries/libbsd/non-glibc.patch @@ -0,0 +1,74 @@ +From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:39:45 +0100 +Subject: Fix function declaration protection for glibc already providing them +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On non-glibc based systems we cannot unconditionally use the +__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead, +if it is undefined, define it to 0. + +We should also always declare these functions on non-glibc based +systems. And on systems with a new enough glibc, which provides these +functions, we should still provide the declarations if _GNU_SOURCE +is *not* defined. + +Reported-by: Jörg Krause +--- + include/bsd/stdlib.h | 3 ++- + include/bsd/string.h | 3 ++- + include/bsd/sys/cdefs.h | 8 ++++++++ + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index 8d33d1f..a5b063c 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb, + const unsigned char *table, unsigned endbyte); + + void *reallocf(void *ptr, size_t size); +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) ++#if !defined(__GLIBC__) || \ ++ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) + void *reallocarray(void *ptr, size_t nmemb, size_t size); + #endif + +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 29097f6..f987fee 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz); + char *strnstr(const char *str, const char *find, size_t str_len); + void strmode(mode_t mode, char *str); + +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) ++#if !defined(__GLIBC__) || \ ++ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) + void explicit_bzero(void *buf, size_t len); + #endif + __END_DECLS +diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h +index b4c8f30..d1cc419 100644 +--- a/include/bsd/sys/cdefs.h ++++ b/include/bsd/sys/cdefs.h +@@ -59,6 +59,14 @@ + #endif + + /* ++ * On non-glibc based systems, we cannot unconditionally use the ++ * __GLIBC_PREREQ macro as it gets expanded before evaluation. ++ */ ++#ifndef __GLIBC_PREREQ ++#define __GLIBC_PREREQ(maj, min) 0 ++#endif ++ ++/* + * Some kFreeBSD headers expect those macros to be set for sanity checks. + */ + #ifndef _SYS_CDEFS_H_ +-- +cgit v1.1 + diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 28a6aee67c1e632fb343c992cc59c253fcce2a60..6b370f46e70d1102f740509429ab4f14d645d2bb 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libbson-${version}"; - version = "1.8.0"; + version = "1.9.4"; src = fetchFromGitHub { owner = "mongodb"; repo = "libbson"; rev = version; - sha256 = "1bd9z07q3faq5k4521d9inv0j836w6hrsd0vj2sapjlq8jmqgslg"; + sha256 = "01lyikbpqky1ib8g4vhwpb5rjwyzm6g1z24z8m73lk4vcdl65190"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f49c449f9ea38c37a5ca68638eae2ac6b9d7ce07..76977b745197f93b702b83f6a5824676962fece1 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libburn-${version}"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "0wbh49s3az3sfpai09z1zdgynq7wnwrk31v5589033274nmzldlx"; + sha256 = "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..48e632ba52d813dfb266bb4080fc1eca228bd2da --- /dev/null +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig, + libiconv, IOKit, DiskArbitration}: + +stdenv.mkDerivation { + name = "libcdio-paranoia-0.94+2"; + + src = fetchFromGitHub { + owner = "rocky"; + repo = "libcdio-paranoia"; + rev = "release-10.2+0.94+2"; + sha256 = "1wjgmmaca4baw7k5c3vdap9hnjc49ciagi5kvpvync3aqfmdvkha"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libcdio ] ++ + stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; + + propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration; + + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + "--disable-ld-version-script" + ]; + + meta = with stdenv.lib; { + description = "CD paranoia on top of libcdio"; + longDescription = '' + This is a port of xiph.org's cdda paranoia to use libcdio for CDROM + access. By doing this, cdparanoia runs on platforms other than GNU/Linux. + ''; + license = licenses.gpl3; + homepage = https://github.com/rocky/libcdio-paranoia; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.pbogdan ]; + }; +} diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix deleted file mode 100644 index a4b2e6078d2b3fa512b1957eeb11f7b2e14c5255..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libcdio/0.82.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }: - -stdenv.mkDerivation rec { - name = "libcdio-0.82"; - - src = fetchurl { - url = "mirror://gnu/libcdio/${name}.tar.gz"; - sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libcddb ncurses help2man ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; - - # Disabled because one test (check_paranoia.sh) fails. - #doCheck = true; - - meta = with stdenv.lib; { - description = "A library for OS-independent CD-ROM and CD image access"; - longDescription = '' - GNU libcdio is a library for OS-independent CD-ROM and - CD image access. It includes a library for working with - ISO-9660 filesystems (libiso9660), as well as utility - programs such as an audio CD player and an extractor. - ''; - license = licenses.gpl2Plus; - homepage = http://www.gnu.org/software/libcdio/; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index f7596b9c702bfdd0040f1b1701e3ddc4f3bd78ec..bb81721feeaece9d5e8bb5347e406a08709066ef 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }: +{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }: stdenv.mkDerivation rec { - name = "libcdio-0.93"; + name = "libcdio-2.0.0"; src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.bz2"; - sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; + sha256 = "0jr8ppdm80c533nzmrpz3iffnpc6nhvsria1di9f4jg1l19a03fd"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libcddb ncurses help2man ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; - # Disabled because one test (check_paranoia.sh) fails. - #doCheck = true; + # Disabled due to several spurious test failures. + # doCheck = true; meta = with stdenv.lib; { description = "A library for OS-independent CD-ROM and CD image access"; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 670484f0ae61cd790876093974c3a0a88115636a..6d8cafcfaa6048b556d3223fad9af05d99f3e03c 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost }: +{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { - name = "libcdr-0.1.1"; + name = "libcdr-0.1.4"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2"; - sha256 = "0javd72wmaqd6vprsh3clm393b3idjdjzbb7vyn44li7yaxppzkj"; + url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7"; }; - buildInputs = [ libwpg libwpd lcms librevenge icu boost ]; + buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index 228dccea3e399698b2a2d85d583b8ce658cb5359..0005525a7cd29dd0f5e45a324ade5beffcc6159b 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake }: -let version = "2.0.1"; in +let version = "2.1.0.1"; in stdenv.mkDerivation { name = "p8-platform-${version}"; src = fetchurl { url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"; - sha256 = "1kslq24p2zams92kc247qcczbxb2n89ykk9jfyiilmwh7qklazp9"; + sha256 = "18381y54f7d18ckpzf9cfxbz1ws6imprbbm9pvhcg5c86ln8skq6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/development/libraries/libcerf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fd5ee8dcaaf96527e307be3b5ca249baeab09d7f --- /dev/null +++ b/pkgs/development/libraries/libcerf/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation { + name = "libcerf-1.5"; + + src = fetchurl { + url = "http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.5.tgz"; + sha256 = "11jwr8ql4a9kmv04ycgwk4dsqnlv4l65a8aa0x1i3y7zwx3w2vg3"; + }; + + meta = with lib; { + description = "Complex error (erf), Dawson, Faddeeva, and Voigt function library"; + homepage = http://apps.jcns.fz-juelich.de/doku/sc/libcerf; + license = licenses.mit; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 514a1fa8534352f5faf29c8cac653ac9cd5effec..74e5bbc952aec5e91f30bea277082a4d41c1981b 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,37 +1,43 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite -, clutter_gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: +{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite, gnome3 +, clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: +let + pname = "libchamplain"; + version = "0.12.16"; +in stdenv.mkDerivation rec { - major = "0.12"; - version = "${major}.16"; - name = "libchamplain-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ]; + propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { - inherit version; - homepage = http://projects.gnome.org/libchamplain/; + homepage = https://wiki.gnome.org/Projects/libchamplain; license = licenses.lgpl2Plus; description = "C library providing a ClutterActor to display maps"; - longDescription = - '' libchamplain is a C library providing a ClutterActor to display - maps. It also provides a Gtk+ widget to display maps in Gtk+ - applications. Python and Perl bindings are also available. It - supports numerous free map sources such as OpenStreetMap, - OpenCycleMap, OpenAerialMap, and Maps for free. - ''; + longDescription = '' + libchamplain is a C library providing a ClutterActor to display + maps. It also provides a Gtk+ widget to display maps in Gtk+ + applications. Python and Perl bindings are also available. It + supports numerous free map sources such as OpenStreetMap, + OpenCycleMap, OpenAerialMap, and Maps for free. + ''; - maintainers = [ ]; + maintainers = gnome3.maintainers; platforms = platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index 0521ae8a04003333b3178ef5936aa366f10fb820..d3ef799ef605e7aca1826dcd908b6b47bab1c07b 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ name = "libchewing-${version}"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/chewing/libchewing/releases/download/v${version}/libchewing-${version}.tar.bz2"; - sha256 = "1j5g5j4w6yp73k03pmsq9n2r0p458hqriq0sd5kisj9xrssbynp5"; + sha256 = "0aqp2vqgxczydpn7pxi7r6xf3l1hgl710f0gbi1k8q7s2lscc24p"; }; buildInputs = [ sqlite ]; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index c5ba65e7b6d7367df28be331ddb1d68e27f1124d..a83a3c672c0fc52ee3530e837519f502eeec753a 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,16 +1,22 @@ -{ stdenv, fetchFromGitHub, python2, llvm_4, clang }: +{ stdenv, fetchFromGitHub, python, llvmPackages }: + +let + llvm = llvmPackages.llvm; + clang = llvmPackages.clang; +in stdenv.mkDerivation { - name = "libclc-2017-02-25"; + name = "libclc-2017-11-29"; src = fetchFromGitHub { owner = "llvm-mirror"; repo = "libclc"; - rev = "17648cd846390e294feafef21c32c7106eac1e24"; - sha256 = "1c20jyh3sdwd9r37zs4vvppmsx8vhf2xbx0cxsrc27bhx5245p0s"; + rev = "d6384415ab854c68777dd77451aa2bc0d959da99"; + sha256 = "10fqrlnqlknh58x7pfsbg9r07fblfg2mgq2m4fr1jbb836ncn3wh"; }; - buildInputs = [ python2 llvm_4 clang ]; + nativeBuildInputs = [ python ]; + buildInputs = [ llvm clang ]; postPatch = '' sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py @@ -18,7 +24,7 @@ stdenv.mkDerivation { ''; configurePhase = '' - ${python2.interpreter} ./configure.py --prefix=$out + ${python.interpreter} ./configure.py --prefix=$out ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index 587e72409c45f144841226d7a99e34ae40b05096..f101eb223106e1b8b45d7dc4cb7389de97d12b4c 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { homepage = http://sites.dparrish.com/libcli; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fc857bf1ad4642f940cac2ba21b1faa1137ca6c5 --- /dev/null +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, meson, ninja, gtk-doc, docbook_xsl, glib }: + +# TODO: Add installed tests once https://gitlab.gnome.org/Incubator/libcloudproviders/issues/4 is fixed + +let + pname = "libcloudproviders"; + version = "0.2.5"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://gitlab.gnome.org/Incubator/${pname}/repository/archive.tar.gz?ref=${version}"; + sha256 = "1c3vfg8wlsv0fmi1lm9qhsqdvp4k33yvwn6j680rh49laayf7k3g"; + }; + + patches = [ + ./fix-include.patch + ]; + + outputs = [ "out" "dev" "devdoc" ]; + + mesonFlags = [ + "-Denable-gtk-doc=true" + ]; + + nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl ]; + + buildInputs = [ glib ]; + + meta = with stdenv.lib; { + description = "DBus API that allows cloud storage sync clients to expose their services"; + homepage = https://gitlab.gnome.org/Incubator/libcloudproviders; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libcloudproviders/fix-include.patch b/pkgs/development/libraries/libcloudproviders/fix-include.patch new file mode 100644 index 0000000000000000000000000000000000000000..d6f626436a62240c963ad812a6dcddc4efc71275 --- /dev/null +++ b/pkgs/development/libraries/libcloudproviders/fix-include.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -46,7 +46,7 @@ + bindir = get_option ('bindir') + datadir = get_option ('datadir') + servicedir = join_paths (datadir, 'dbus-1', 'services') +-incdir = join_paths (prefix, 'include', 'cloudproviders') ++incdir = join_paths (prefix, get_option('includedir'), 'cloudproviders') + + gnome = import('gnome') + diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index f6d9d7ca69b8c559b2e03e7dfdcb9401c41664ec..e4e61c942836760461033e34c48bf2ec8a2969b6 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -5,14 +5,17 @@ overrideDerivation collectd (oldAttrs: { name = "libcollectdclient-${collectd.version}"; buildInputs = [ ]; - configureFlags = [ - "--without-daemon" + NIX_CFLAGS_COMPILE = oldAttrs.NIX_CFLAGS_COMPILE ++ [ + "-Wno-error=unused-function" ]; - makeFlags = [ - "-C src/libcollectdclient/" + configureFlags = oldAttrs.configureFlags ++ [ + "--disable-daemon" + "--disable-all-plugins" ]; + postInstall = "rm -rf $out/{bin,etc,sbin,share}"; + }) // { meta = with stdenv.lib; { description = "C Library for collectd, a daemon which collects system performance statistics periodically"; diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index a89bdec2c8afb6d33076e232ec2ecc325ec4dd41..29398ac8aac5d72dcdf86fc92e625bdbf378c141 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "libconfuse-${version}"; - version = "3.0"; + version = "3.2.1"; src = fetchFromGitHub { - sha256 = "0021768bxqdxn84yaipncgi64889zrhc0r4ifmlfxirwq101dgr5"; + sha256 = "1pb74wpg1cxz9hpp0p8i1qq6anaq06mh4xljd8dllm653fxvbjdz"; rev = "v${version}"; repo = "libconfuse"; owner = "martinh"; @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # On darwin the tests depend on the installed libraries because of install_name. + doInstallCheck = true; + installCheckTarget = "check"; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -32,6 +34,5 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; 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 2fccee0160b346ecc3de20f2abf7f97c59b96115..c3050bf8c676bd035cc553d16d7e46ae4baa1e2c 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.7.6"; + version = "2.8.6"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "13g7r0mcmrj37mihj6g1x1ckpaps659c4qwnw3ixrg7p5mb3p41f"; + sha256 = "1in0fdl5mgzhwmd8kvniqkizi7isf2g2gvbknfbbdmxkki7a8p95"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index e217f5d96db1475dd7d64854aa31096208674b1c..fb0f0d3d3f9c0356b07573fabd3479580951afa1 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcue-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "lipnitsk"; repo = "libcue"; rev = "v${version}"; - sha256 = "14a84d6sq3yp8s8i05lxvifjpkgpjwfpchrqf3bbpbwa8gvrc0rj"; + sha256 = "0znn9scamy1nsz1dzvsamqg46zr7ldfvpxiyzi1ss9d6gbcm0frs"; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index 526890ed56376136a15c24ecd6adc0b7cbe1aeb9..7b4d39f955aabf87d5d29c72bf8f4c9397f7d5e9 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -1,11 +1,13 @@ -{stdenv, fetchurl, xercesc }: +{ stdenv, fetchurl, xercesc }: +let + major = "1.9"; + minor = "0"; +in with stdenv; with lib; mkDerivation rec { - name = "libcutl-${meta.major}.${meta.minor}"; + name = "libcutl-${major}.${minor}"; meta = { - major = "1.9"; - minor = "0"; description = "A collection of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks" ; platforms = platforms.all; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index 07d5b77efc4fb336eb14838ca0bcf5a36bdd0a08..59e576fd39231e85582d1feb35f2a3def9dd45fa 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libdaemon-0.14"; src = fetchurl { @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx"; }; - configureFlags = [ "--disable-lynx" ]; + configureFlags = [ "--disable-lynx" ] + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + [ # Can't run this test while cross-compiling + "ac_cv_func_setpgrp_void=yes" + ]; meta = { description = "Lightweight C library that eases the writing of UNIX daemons"; @@ -20,4 +24,8 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; -} +} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl { + # This patch should be applied unconditionally, but doing so will cause mass rebuild. + patches = ./fix-includes.patch; +}) + diff --git a/pkgs/development/libraries/libdaemon/fix-includes.patch b/pkgs/development/libraries/libdaemon/fix-includes.patch new file mode 100644 index 0000000000000000000000000000000000000000..51c5133afedefc302369ec01e359910f05108678 --- /dev/null +++ b/pkgs/development/libraries/libdaemon/fix-includes.patch @@ -0,0 +1,13 @@ +--- libdaemon-0.14.orig/examples/testd.c ++++ libdaemon-0.14/examples/testd.c +@@ -21,9 +21,9 @@ + #include + #include + #include ++#include + #include + #include +-#include + #include + + #include diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 57b56c372339ea8de11cec7a8537dc06625d2c7e..fc0221b93889f2c63271528f17140fd8c994dae0 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.18.3"; + version = "3.19.1"; name = "libdap-${version}"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "0azjf4gjqvp1fdf1wb3s98x52zfy4viq1m3j9lggaidldfinmv8c"; + sha256 = "0gnki93z3kkzp65x7n1kancy7bd503j4qja5fhzvm1gkmi5l65aj"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..faa8b483a78043990aef3955c8916d65d0eb7b38 --- /dev/null +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -0,0 +1,55 @@ +{ stdenv, pkgs, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2 +, gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }: + +let + version = "3.28.1"; + pname = "libdazzle"; +in +stdenv.mkDerivation { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; + + src = fetchurl { + url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "04j9pjigpgxddq6y90y73k8qyjixlalip87q121ss5d8zp8xnz32"; + }; + + nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ]; + buildInputs = [ glib gtk3 ]; + + mesonFlags = [ + "-Denable_gtk_doc=true" + ]; + + doCheck = true; + + checkPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A library to delight your users with fancy features"; + longDescription = '' + The libdazzle library is a companion library to GObject and Gtk+. It + provides various features that we wish were in the underlying library but + cannot for various reasons. In most cases, they are wildly out of scope + for those libraries. In other cases, our design isn't quite generic + enough to work for everyone. + ''; + homepage = https://wiki.gnome.org/Apps/Builder; + license = licenses.gpl3Plus; + maintainers = gnome3.maintainers; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 77c09f3ed1583c0f90beefa9891bc8fbb7177641..2a03efd632ff1b14dce4ab2fcfd775cb3e303a16 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, libdbi -, libmysql ? null, sqlite ? null, postgresql ? null +, mysql ? null +, sqlite ? null +, postgresql ? null }: with stdenv.lib; @@ -11,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi libmysql sqlite postgresql ]; + buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c; postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; @@ -24,16 +26,18 @@ stdenv.mkDerivation rec { "--enable-libdbi" "--with-dbi-incdir=${libdbi}/include" "--with-dbi-libdir=${libdbi}/lib" - ] ++ optionals (libmysql != null) [ + ] ++ optionals (mysql != null) [ "--with-mysql" - ] ++ optionals (postgresql != null) [ - "--with-pgsql" - "--with-pgsql_incdir=${postgresql}/include" - "--with-pgsql_libdir=${postgresql.lib}/lib" + "--with-mysql-incdir=${mysql.connector-c}/include/mysql" + "--with-mysql-libdir=${mysql.connector-c}/lib/mysql" ] ++ optionals (sqlite != null) [ "--with-sqlite3" "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite" "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite" + ] ++ optionals (postgresql != null) [ + "--with-pgsql" + "--with-pgsql_incdir=${postgresql}/include" + "--with-pgsql_libdir=${postgresql.lib}/lib" ]; installFlags = [ "DESTDIR=\${out}" ]; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 96e9c0624f217a1ea425a2dca357d994804c94f4..220cc5a2eeb423dc8fb83bcf903eac67a44343bd 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, intltool -, glib, dbus_glib, json_glib -, gobjectIntrospection, vala_0_23, gnome_doc_utils +, glib, dbus-glib, json-glib +, gobjectIntrospection, vala_0_38, gnome-doc-utils , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: with lib; @@ -10,19 +10,19 @@ stdenv.mkDerivation rec { name = let postfix = if gtkVersion == null then "glib" else "gtk${gtkVersion}"; in "libdbusmenu-${postfix}-${version}"; version = "${versionMajor}.${versionMinor}"; - versionMajor = "12.10"; - versionMinor = "2"; + versionMajor = "16.04"; + versionMinor = "0"; src = fetchurl { url = "${meta.homepage}/${versionMajor}/${version}/+download/libdbusmenu-${version}.tar.gz"; - sha256 = "9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9"; + sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - glib dbus_glib json_glib - gobjectIntrospection vala_0_23 gnome_doc_utils + glib dbus-glib json-glib + gobjectIntrospection vala_0_38 gnome-doc-utils ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' @@ -49,10 +49,11 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" + "typelibdir=\${out}/lib/girepository-1.0" ]; meta = { - description = "A library for passing menu structures across DBus"; + description = "Library for passing menu structures across DBus"; homepage = https://launchpad.net/dbusmenu; license = with licenses; [ gpl3 lgpl21 lgpl3 ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 20e74cdc1517335646479a0e2926655e6925bc5e..f88d20bee7036f1ae405fe18ca8a2e712b91f030 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa_noglu +{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL , libX11, pkgconfig, OpenGL }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa_noglu libX11 ] + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index a8b2e4b342093262630e84f9404841bda27f1314..6ff8a03175e8153f2b95ed8c3af848ff68dd45a4 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { - version = "3.12.0.1317"; + version = "3.13.3.1365"; name = "libdigidocpp-${version}"; src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.12.0.1317.orig.tar.xz"; - sha256 = "8059e1dbab99f062d070b9da0b1334b7226f1ab9badcd7fddea3100519d1f9a9"; + url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.3.1365.orig.tar.xz"; + sha256 = "1xmvjh5xzspm6ja8hz6bzblwly7yn2jni2m6kx8ny9g65zjrj2iw"; }; unpackPhase = '' diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index 23ab36fe09f07101f12269db0088d857fbe25a9c..a09e48dcc1d9bc90761803e9788f1c2a4257c1de 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdivecomputer-${version}"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { url = "http://www.libdivecomputer.org/releases/${name}.tar.gz"; - sha256 = "11n2qpqg4b2h7mqifp9qm5gm1aqwy7wj1j4j5ha0wdjf55zzy30y"; + sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 992b1ea70dcaa51977eae8774ef53370a453dd45..82307e9ab1638cef546f03740f4726ae96e8c388 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.84"; + name = "libdrm-2.4.91"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "7ae9c24d91139ac9a2cdee06fe46dbe1c401a1eda1c0bd2a6d1ecf72f479e0aa"; + sha256 = "0068dn47c478vm1lyyhy02gilrpsma0xmcblhvs0dzqyrk80wjk3"; }; outputs = [ "out" "dev" "bin" ]; @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-install-test-programs" ] - ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] + ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) + [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index ecfa14a43c9a5d0a3da80f34fcda43e8575536ab..0984eb6e00bf654b0bcb3507816a4b3f5c332d5e 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdvbpsi-${version}"; - version = "0.2.2"; + version = "1.3.2"; src = fetchurl { url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2"; - sha256 = "1lry2swxqm8mhq0a4rjnc819ngsf2pxnfjajb57lml7yr12j79ls"; + sha256 = "1zn5hfv4qbahmydbwh59a3b480s3m5ss27r6ml35gqdip7r3jkmc"; }; meta = { diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 63978cfd740f1b853621e18d406a2d07a9dee692..66cb5215a8a9b8df65e5e8420b8d9a9b7238ca27 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libdvdcss-${version}"; - version = "1.4.0"; + version = "1.4.1"; buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2"; - sha256 = "0nl45ifc4xcb196snv9d6hinfw614cqpzcqp92dg43c0hickg290"; + sha256 = "1b7awvyahivglp7qmgx2g5005kc5npv257gw7wxdprjsnx93f1zb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index a26b927a883a3e0e831c2797870c0d178b875012..42321b2f866a97a85398329ef65c3a08906ffbd4 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdvdnav-${version}"; - version = "5.0.3"; + version = "6.0.0"; src = fetchurl { url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2"; - sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"; + sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index be7e20f00eb5e6d75edcc5b988df7fe77dd0574d..95815f4abcdac931eebf26a88f7002e055e1a841 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdvdread-${version}"; - version = "5.0.3"; + version = "6.0.0"; src = fetchurl { url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2"; - sha256 = "0ayqiq0psq18rcp6f5pz82sxsq66v0kwv0y55dbrcg68plnxy71j"; + sha256 = "0dgr23fzcjhb7ck54xkr9zmf4jcq3ph0dz3fbyvla1c6ni9ijfxk"; }; buildInputs = [libdvdcss]; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 4bb91878bd35c7d561e600b08644da558560a86e..6057dae4be2e59004545f78a27b3d7010d0d3308 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, libelf }: let - version = "20170709"; + version = "20180129"; src = fetchurl { url = "http://www.prevanders.net/libdwarf-${version}.tar.gz"; - sha512 = "afff6716ef1af5d8aae2b887f36b9a6547fb576770bc6f630b82725ed1e59cbd" - + "387779aa729bbd1a5ae026a25ac76aacf64b038cd898b2419a8676f9aa8c59f1"; + # Upstream displays this hash broken into three parts: + sha512 = "02f8024bb9959c91a1fe322459f7587a589d096595" + + "6d643921a173e6f9e0a184db7aef66f0fd2548d669" + + "5be7f9ee368f1cc8940cea4ddda01ff99d28bbf1fe58"; }; meta = { homepage = https://www.prevanders.net/dwarf.html; diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 8deec094866c8633e995c5df2c9900d3f49330dc..93ece69cf05649344df06fd3b020486adac04107 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation { "-DDYND_BUILD_BENCHMARKS=OFF" ]; + # added to fix build with gcc7 + NIX_CFLAGS_COMPILE = [ + "-Wno-error=implicit-fallthrough" + "-Wno-error=nonnull" + ]; + buildInputs = [ cmake ]; outputs = [ "out" "dev" ]; @@ -24,5 +30,6 @@ stdenv.mkDerivation { description = "C++ dynamic ndarray library, with Python exposure."; homepage = http://libdynd.org; license = licenses.bsd2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index 8281036e7491255ffc44483270694e143572567f..6a4078f92cf3a4d094ccd55b8b6b6b4f8449c01b 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.2.4"; name = "libebur128-${version}"; src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; rev = "v${version}"; - sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm"; + sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index c61876713c10395f6468142166ad851629efd905..1541281442013b9e37cf203820acadd6f7ad0d1c 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, ncurses, groff }: stdenv.mkDerivation rec { - name = "libedit-20160903-3.1"; + name = "libedit-20170329-3.1"; src = fetchurl { url = "http://thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "0rvmm8z6hal5bbp5pljp7yvkpqi4pkas1amizhvg35v0skkx5jqc"; + sha256 = "1gnlgl0x8g9ky59s70nriy5gv47676d1s4ypvbv8y11apl7xkwli"; }; outputs = [ "out" "dev" ]; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. - NROFF = "${groff}/bin/nroff"; + # NROFF = "${groff}/bin/nroff"; patches = [ ./01-cygwin.patch ]; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index bd0d23bd0cdbc7f2f39f4f68a7f5dc7725d60a9f..bb1dbe51765e63b51ffa7ffe19b4c0d582512d59 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, gettext, glibc +{ stdenv +, fetchurl, autoreconfHook, gettext , buildPlatform, hostPlatform }: @@ -17,12 +17,20 @@ stdenv.mkDerivation rec { doCheck = true; - # 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 hostPlatform.isDarwin "--disable-nls"; - - nativeBuildInputs = [ gettext ]; + configureFlags = [] + # Configure check for dynamic lib support is broken, see + # http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html + ++ stdenv.lib.optional (hostPlatform != buildPlatform) "mr_cv_target_elf=yes" + # Libelf's custom NLS macros fail to determine the catalog file extension + # on Darwin, so disable NLS for now. + ++ stdenv.lib.optional hostPlatform.isDarwin "--disable-nls"; + + nativeBuildInputs = [ gettext ] + # Need to regenerate configure script with newer version in order to pass + # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper` + # which doesn't work with the bootstrapTools bash, so can only do this + # for cross builds when `stdenv.shell` is a newer bash. + ++ stdenv.lib.optional (hostPlatform != buildPlatform) autoreconfHook; meta = { description = "ELF object file access library"; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..980cee2e68799beb0c78d25c21b7fa3e21f27ccf --- /dev/null +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libESMTP-${version}"; + version = "1.0.6"; + + src = fetchurl { + url = "http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2"; + sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh"; + }; + + meta = with stdenv.lib; { + homepage = http://brianstafford.info/libesmtp/index.html; + description = "A Library for Posting Electronic Mail"; + license = licenses.lgpl21; + }; +} + diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index 063633619431975b0b9e2b5318ccec8e09a2ebb6..b09c2dd0f47ead7d9db018eec57d7601e17af4da 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -1,6 +1,6 @@ { autoconf, automake, fetchgit, libtool, stdenv, openssl }: -let version = "1.6"; in +let version = "1.8"; in stdenv.mkDerivation { name = "libetpan-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/dinhviethoa/libetpan"; rev = "refs/tags/" + version; - sha256 = "13hv49271rr9yj7ifxqqmc0jfy1f26llivhp22s5wigick7qjxky"; + sha256 = "09xqy1n18qn63x7idfrpwm59lfkvb1p5vxkyksywvy4f6mn4pyxk"; }; buildInputs = [ autoconf automake libtool openssl ]; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 090a12f63de1a6aefc88cfeffff771dede879217..5bcb9a1ede229f5d2b651ff5e9fb23344fb75862 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.5.7"; + name = "libevdev-1.5.8"; src = fetchurl { url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "08nl3p6226k51zph52fhilxvi3b31spp6fz8szzrglzhl8vrxrd1"; + sha256 = "0vac7n1miqdprikq4g63vsk681q8v416r0nbh2xai7b08qgdi0v0"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index e14f4cbf5d6339378a759d66f4ed2d993b7f4c85..871437f1908292321469463c429d801e15bc88d7 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, findutils +{ stdenv, fetchurl, findutils, fixDarwinDylibNames , sslSupport? true, openssl }: @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional stdenv.isCygwin findutils + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ; postInstall = stdenv.lib.optionalString sslSupport '' diff --git a/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch b/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch deleted file mode 100644 index 54878303589df67931ad6cdce247bd59d6c7d338..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch +++ /dev/null @@ -1,20 +0,0 @@ -Patch from Debian: -https://sources.debian.net/data/main/libe/libewf/20140608-6/debian/patches/04-fix-FTBFS-GCC5.patch - -Description: fix a FTBFS with GCC-5. Thanks to Linn Crosetto for - the first fix (see #777938). This patch closes #777945. -Author: Joao Eriberto Mota Filho -Last-Update: 2015-07-02 -Index: libewf-20140608/libuna/Makefile.am -=================================================================== ---- libewf-20140608.orig/libuna/Makefile.am -+++ libewf-20140608/libuna/Makefile.am -@@ -3,7 +3,7 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ - @LIBCSTRING_CPPFLAGS@ \ -- @LIBCERROR_CPPFLAGS@ -+ @LIBCERROR_CPPFLAGS@ -std=gnu89 - - noinst_LTLIBRARIES = libuna.la - diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index ec53b50b5af2c8a5bab3787022798313793ee38e..b1a6238a3780168cd0e6d95a22a2d1efc137e4e7 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, zlib, openssl, libuuid, file, fuse, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - version = "20140608"; + version = "20171104"; name = "libewf-${version}"; + src = fetchurl { - url = "https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/libewf-20140608.tar.gz"; - sha256 = "0wfsffzxk934hl8cpwr14w8ixnh8d23x0xnnzcspjwi2c7730h6i"; + url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; + sha256 = "0h7036gpj5cryvh17aq6i2cpnbpwg5yswmfydxbbwvd9yfxd6dng"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib openssl libuuid ]; - patches = [ ./04-fix-FTBFS-GCC5.patch ]; meta = { description = "Library for support of the Expert Witness Compression Format"; diff --git a/pkgs/development/libraries/libewf/default.upstream b/pkgs/development/libraries/libewf/default.upstream deleted file mode 100644 index a071132463f8c5c89e8c399cc7a424124e1dce67..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libewf/default.upstream +++ /dev/null @@ -1,7 +0,0 @@ -url https://code.google.com/p/libewf/ -version_link 'googledrive[.]com' -version_link '[.]tar[.]' -do_overwrite () { - do_overwrite_just_version - set_var_value url "$CURRENT_URL" -} diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a61d51aa6b72897b588b8580798768f34728b385 --- /dev/null +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + name = "libexecinfo-${version}"; + version = "1.1"; + + src = fetchurl { + url = "http://distcache.freebsd.org/local-distfiles/itetcu/${name}.tar.bz2"; + sha256 = "07wvlpc1jk1sj4k5w53ml6wagh0zm9kv2l1jngv8xb7xww9ik8n9"; + }; + + patches = [ + (fetchpatch { + name = "10-execinfo.patch"; + url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + sha256 = "0lnphrad4vspyljnvmm62dyxj98vgp3wabj4w3vfzfph7j8piw7g"; + }) + (fetchpatch { + name = "20-define-gnu-source.patch"; + url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302"; + }) + (fetchpatch { + name = "30-linux-makefile.patch"; + url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf"; + }) + ]; + + makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; + + patchFlags = "-p0"; + + installPhase = '' + install -Dm644 execinfo.h stacktraverse.h -t $out/include + install -Dm755 libexecinfo.{a,so.1} -t $out/lib + ln -s $out/lib/libexecinfo.so{.1,} + ''; + + meta = with stdenv.lib; { + description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility"; + license = licenses.bsd2; + homepage = https://www.freshports.org/devel/libexecinfo; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index a9b6394ed5bae2abd8e9faf4adbc6d7cb0722778..0ba703585bbbace402340b00da9c097c9d40ede8 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libexttextcat-3.4.1"; + name = "libexttextcat-3.4.5"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; - sha256 = "0g1spzpsfbv3y8k9m1v53imz18437q93iq101hind7m4x00j6wpl"; + sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"; }; meta = { diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 78901e2f013ec31f92c91e69ce934668a1e01bbc..2de407e8f63935cbaea1660f529ca032df893e7a 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "libf2c-20100903"; + name = "libf2c-20160102"; src = fetchurl { url = http://www.netlib.org/f2c/libf2c.zip; - sha256 = "1mcp1lh7gay7hm186dr0wvwd2bc05xydhnc1qy3dqs4n3r102g7i"; + sha256 = "1q78y8j8xpl8zdzdxmn5ablss56hi5a7vz3idam9l2nfx5q40h6a"; }; unpackPhase = '' diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index c6482842cacd17116de4d6d03019edccf5429a41..513a4dc3d3844e2f8ab0f2e3d96b8d0eff56b9ff 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libffcall-${version}"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz"; - sha256 = "0v0rh3vawb8z5q40fs3kr2f9zp06n2fq4rr2ww4562nr96sd5aj1"; + sha256 = "0iwcad6w78jp84vd6xaz5fwqm84n3cb42bdf5m5cj5xzpa5zp4d0"; }; enableParallelBuilding = false; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index e48db6c9928be2c195915afd2177e57f97d11386..50cf8526c36275dda9a73a350596020ad894c0f2 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, dejagnu, doCheck ? false -, buildPlatform, hostPlatform +{ stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false +, buildPlatform, hostPlatform, autoreconfHook }: stdenv.mkDerivation rec { @@ -10,16 +10,40 @@ stdenv.mkDerivation rec { sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh"; }; - patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch ++ - stdenv.lib.optional stdenv.isAarch64 (fetchurl { + patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch + ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch { url = https://src.fedoraproject.org/rpms/libffi/raw/ccffc1700abfadb0969495a6e51b964117fc03f6/f/libffi-aarch64-rhbz1174037.patch; sha256 = "1vpirrgny43hp0885rswgv3xski8hg7791vskpbg3wdjdpb20wbc"; - }); + }) + ++ stdenv.lib.optional hostPlatform.isMusl (fetchpatch { + name = "gnu-linux-define.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580"; + sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2"; + }) + ++ stdenv.lib.optional hostPlatform.isRiscV (fetchpatch { + name = "riscv-support.patch"; + url = https://github.com/sorear/libffi-riscv/commit/e46492e8bb1695a19bc1053ed869e6c2bab02ff2.patch; + sha256 = "1vl1vbvdkigs617kckxvj8j4m2cwg62kxm1clav1w5rnw9afxg0y"; + }) + ++ stdenv.lib.optionals stdenv.isMips [ + (fetchpatch { + name = "0001-mips-Use-compiler-internal-define-for-linux.patch"; + url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000"; + sha256 = "1gc53lw90p6hc0cmhj3csrwincfz7va5ss995ksw5gm0yrr9mrvb"; + }) + (fetchpatch { + name = "0001-mips-fix-MIPS-softfloat-build-issue.patch"; + url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000"; + sha256 = "0l8xgdciqalg4z9rcwyk87h8fdxpfv4hfqxwsy2agpnpszl5jjdq"; + }) + ]; outputs = [ "out" "dev" "man" "info" ]; buildInputs = stdenv.lib.optional doCheck dejagnu; + nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook; + configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 0df0f570b2e650a4c2e1ae2e2ad2d5939a04cc36..3b27ffc6d386e76da54ad381afba8852d57b3189 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.11.1"; + version = "0.12.1"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "1xv4is3zaz66h6iblj9pikapsjasjcbxx31bhkgn62xdq1sadfpc"; + sha256 = "1gbqm42dd0m3fvqz3bk53889479dvn8679zp6ba8a9q2br2wkvv0"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index f56dc60771d6cecebb7e731a24c5d880e3a55071..2d2d56dda4f2cfe194ce3540226635ece7faa6e1 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name="libfixposix-${version}"; - version="0.4.1"; + version="0.4.3"; src = fetchFromGitHub { owner = "sionescu"; repo = "libfixposix"; rev = "v${version}"; - sha256 = "19wjb43mn16f4lin5a2dfi3ym2hy7kqibs0z631d205b16vxas15"; + sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 353c82aa1935be5f9cf8d60eb9317f33a1244f0e..d54b05b1c828e0f0af343c045619618a33f6daa6 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.3"; + name = "libftdi1-1.4"; src = fetchurl { url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; - sha256 = "1x41mbzh4qy7mrv2n86r2cr176rx03iacn0a99c3dkzv9g4rb34s"; + sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "A library to talk to FTDI chips using libusb"; homepage = https://www.intra2net.com/en/developer/libftdi/; license = with licenses; [ lgpl2 gpl2 ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 2f499d3af87f88222c32c91a78aa4c60dfeb3af1..f90e741a57e9b766d3e2a5e5d22b8d8a339ca096 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libftdi-0.20"; - + src = fetchurl { url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; @@ -14,11 +14,19 @@ stdenv.mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; + configureFlags = [ "--with-async-mode" ]; + + # allow async mode. from ubuntu. see: + # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff + patchPhase = '' + substituteInPlace ./src/ftdi.c \ + --replace "ifdef USB_CLASS_PTP" "if 0" + ''; meta = { description = "A library to talk to FTDI chips using libusb"; homepage = https://www.intra2net.com/en/developer/libftdi/; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix index 9e0510debd027d3a6a8cd6a8583be5a1c7714939..dec9676d5729fe18be1d0945d326b8c142e58921 100644 --- a/pkgs/development/libraries/libgap/default.nix +++ b/pkgs/development/libraries/libgap/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gmp}: stdenv.mkDerivation rec { name = "libgap-${version}"; - version = "4.8.3"; + version = "4.8.6"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "http://mirrors.mit.edu/sage/spkg/upstream/libgap/libgap-${version}.tar.gz"; - sha256 = "0ng4wlw7bj63spf4vkdp43v3ja1fp782lxzdsyf51x26z21idrsq"; + sha256 = "1h5fx5a55857w583ql7ly2jl49qyx9mvs7j5abys00ra9gzrpn5v"; }; buildInputs = [gmp]; meta = { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index e32ba050c38ff713ed8f9b844d6d84712f57ba02..6f36199bd1a57304604c78d2f3246d30f9a7b0e1 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap +, buildPackages +}: assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "1cvqd9jk5qshbh48yh3ixw4zyr4n5k50r3475rrh20xfn7w7aa3s"; + sha256 = "01sca9m8hm6b5v8hmqsfdjhyz013869p1f0fxw9ln52qfnp4q1n8"; }; outputs = [ "out" "dev" "info" ]; @@ -19,9 +21,19 @@ stdenv.mkDerivation rec { # The build enables -O2 by default for everything else. hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + buildInputs = [ libgpgerror ] + ++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optional enableCapabilities libcap; + preConfigure = stdenv.lib.optionalString stdenv.isCross '' + # This is intentional: gpg-error-config is a shell script that will work during the build + mkdir -p "$NIX_BUILD_TOP"/bin + ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin" + export PATH="$NIX_BUILD_TOP/bin:$PATH" + ''; + # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' diff --git a/pkgs/development/libraries/libgee/0.6.nix b/pkgs/development/libraries/libgee/0.6.nix deleted file mode 100644 index 51487b41573f89fe9f5197476bd9192a4fbd1701..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libgee/0.6.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib }: - -let - ver_maj = "0.6"; - ver_min = "8"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6"; - }; - - buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - homepage = http://live.gnome.org/Libgee; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/libgee/0.8.nix b/pkgs/development/libraries/libgee/0.8.nix deleted file mode 100644 index 747cb9d4b2373a4cf1583d0fc73d9077ce52d5dc..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libgee/0.8.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib }: - -let - ver_maj = "0.8"; - ver_min = "6"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1mp3bfghc8qh2v8h2pfhksda22mgy2d5ygm1jr3bir544nr8i4fg"; - }; - - buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - homepage = http://live.gnome.org/Libgee; - maintainers = with maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 4adb7e5357891e3586b573181ee46077b58437fd..90d41e30502f2ac8567e21cf90e31e9fa7520d10 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: +{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "libgig-svn-${version}"; - version = "2334"; + name = "libgig-${version}"; + version = "4.1.0"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/libgig/trunk"; - rev = "${version}"; - sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc"; + src = fetchurl { + url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + sha256 = "02xx6bqxzgkvrawwnzrnxx1ypk244q4kpwfd58266f9ji8kq18h6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libsndfile libtool libuuid ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - preConfigure = "make -f Makefile.cvs"; + buildInputs = [ libsndfile libuuid ]; + + preConfigure = "make -f Makefile.svn"; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 7bd551e70d56671eec5fe0549831aeaf7e7a76da..652848d8a955c357d058f48de21611d849cc4784 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perl, perlXMLParser, - autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo + autoreconfHook, intltool, docbook_xsl, xauth, sudo }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook intltool gtk_doc docbook_xsl wrapGAppsHook + pkgconfig autoreconfHook intltool docbook_xsl wrapGAppsHook ]; buildInputs = [ gtk2 gnome2.GConf libstartup_notification - gnome3.libgnome_keyring libgtop gnome2.libglade perl perlXMLParser + gnome3.libgnome-keyring libgtop gnome2.libglade perl perlXMLParser ]; enableParallelBuilding = true; @@ -67,6 +67,10 @@ stdenv.mkDerivation rec { intltoolize --force --copy --automake ''; + configureFlags = [ + "--disable-gtk-doc" + ]; + meta = { description = "A library for integration of su into applications"; longDescription = '' diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index cc285979c6c1e8819af533c1d6f3e1a44eb012eb..4bc1d1addcfbe145aeed0971f1c0cc258bff8eaa 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,15 +1,16 @@ -{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, mesa_noglu, libX11, libXext, glproto }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }: -# Git version is needed for EGL and GLES handling. - -stdenv.mkDerivation rec { - name = "libglvnd-2016-12-22"; +let + driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; +in stdenv.mkDerivation rec { + name = "libglvnd-${version}"; + version = "1.0.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libglvnd"; - rev = "dc16f8c337703ad141f83583a4004fcf42e07766"; - sha256 = "1dbwf1216np77xf1kx3ci3y7hfa1p4vgrrzg71gw36hqxf36vg5f"; + rev = "v${version}"; + sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; @@ -17,11 +18,21 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" - "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${mesa_noglu.driverLink}/share/glvnd/egl_vendor.d\"" + # FHS paths are added so that non-NixOS applications can find vendor files. + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" ]; + # Upstream patch fixing use of libdl, should be in next release. + patches = [ + (fetchpatch { + url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch"; + sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d"; + }) + ]; outputs = [ "out" "dev" ]; + passthru = { inherit driverLink; }; + meta = with stdenv.lib; { description = "The GL Vendor-Neutral Dispatch library"; homepage = https://github.com/NVIDIA/libglvnd; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 56bf9b177b563f01f4f561eb9f00ca6b453de674..2fcf6701ab8f40ba8763e61ff30bc5155cf5c067 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,25 +1,53 @@ -{ stdenv, fetchurl, gettext }: +{ stdenv, lib, fetchpatch, buildPackages, fetchurl, gettext +, genPosixLockObjOnly ? false +}: let + genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { + buildPhase = '' + cd src + make gen-posix-lock-obj + ''; + + installPhase = '' + mkdir -p $out/bin + install -m755 gen-posix-lock-obj $out/bin + ''; -stdenv.mkDerivation rec { + outputs = [ "out" ]; + outputBin = "out"; + }; +in stdenv.mkDerivation (rec { name = "libgpg-error-${version}"; - version = "1.27"; + version = "1.28"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg"; + sha256 = "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry"; }; - postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; + patches = [ + # Fix builds on ARM, AArch64 + (fetchpatch { + url = "https://github.com/gpg/libgpg-error/commit/791177de023574223eddf7288eb7c5a0721ac623.patch"; + sha256 = "0vqfw0ak1j37wf6sk9y9vmdyk3kxdxkldhs0bv2waa76s11cmdx0"; + }) + ]; + + postPatch = '' + sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h + ''; outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # deps want just the lib, most likely # If architecture-dependent MO files aren't available, they're generated # during build, so we need gettext for cross-builds. - crossAttrs.buildInputs = [ gettext ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ gettext ]; postConfigure = - stdenv.lib.optionalString stdenv.isSunOS + lib.optionalString stdenv.isSunOS # For some reason, /bin/sh on OpenIndiana leads to this at the end of the # `config.status' run: # ./config.status[1401]: shift: (null): bad number @@ -27,7 +55,7 @@ stdenv.mkDerivation rec { # Thus, re-run it with Bash. "${stdenv.shell} config.status"; - doCheck = true; + doCheck = true; # not cross meta = with stdenv.lib; { homepage = https://www.gnupg.org/related_software/libgpg-error/index.html; @@ -44,5 +72,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = [ maintainers.fuuzetsu maintainers.vrthra ]; }; -} - +} // genPosixLockObjOnlyAttrs) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index c498871956a852330d4a2a47f9643168cc7b8ae5..9c0ea4a3a73e0f80a350174a77dc4d9dd856cb81 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "gphoto"; repo = "libgphoto2"; rev = "${meta.tag}"; - sha256 = "0chwnw3d2d1k8g4xidzkpy9f3ci30yz7yvxq1mipp2rbndl1y2am"; + sha256 = "1svbpmxqm56pqkv0rxhlyk4vw7mjgjz8zz4p669qvmw630082yj9"; }; patches = []; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.12"; - tag = "libgphoto2-2_5_12-release"; + version = "2.5.16"; + tag = "libgphoto2-2_5_16-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 1da6cffe3f2c9b9fa428a7b592118c689dd0592b..89fcfdfde8daad3f754093a73ffc41dd4c52c17d 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libgringotts-${version}"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "http://libgringotts.sourceforge.net/current/${name}.tar.bz2"; - sha256 = "1bzfnpf2gwc2bisbrw06s63g9z9v4mh1n9ksqr6pbgj2prz7bvlk"; + url = "https://sourceforge.net/projects/gringotts.berlios/files/${name}.tar.bz2"; + sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index ac6c9d297cc3232cbd26bf65b3ab2ba799a5ceef..bd5a5f068515e05fdbf7b72a863d2fc8ff48f8df 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd"; }; + patches = [ ./no-warnings-as-errors.patch ]; + buildInputs = [ cmake libav SDL2 chromaprint libebur128 ]; meta = with stdenv.lib; { @@ -18,6 +20,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/andrewrk/libgroove; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.andrewrk ]; + maintainers = with maintainers; [ andrewrk ma27 ]; }; } diff --git a/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch b/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch new file mode 100644 index 0000000000000000000000000000000000000000..86a8a935769c925207a5a06fe526c3d9172fc462 --- /dev/null +++ b/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a1e8541..6bc9c30 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -135,8 +135,8 @@ configure_file ( + "${PROJECT_BINARY_DIR}/config.h" + ) + +-set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L") +-set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -g") ++set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L") ++set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Wall -g") + set(EXAMPLE_INCLUDES "${PROJECT_SOURCE_DIR}") + + add_library(groove SHARED ${LIBGROOVE_SOURCES} ${LIBGROOVE_HEADERS}) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 6e036522b1cbf5383f526c55119140ba493b95de..b0013d0f94912e8cb5af6b421bb0a08c24af5ca6 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,31 +1,28 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }: +, python, perl, gdk_pixbuf, libiconv, libintl }: let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { - name = "libgsf-1.14.41"; + name = "libgsf-1.14.42"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "1lq87wnrsjbjafpk3c8xwd56gqx319fhck9xkg2da88hd9c9h2qm"; + sha256 = "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool libintl ]; buildInputs = [ gettext bzip2 zlib python ] ++ stdenv.lib.optional doCheck perl; - propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ] - ++ libintlOrEmpty; + propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ]; outputs = [ "out" "dev" ]; doCheck = true; preCheck = "patchShebangs ./tests/"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = with stdenv.lib; { description = "GNOME's Structured File Library"; homepage = https://www.gnome.org/projects/libgsf; diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..612946f73ed5a137f8fedfa62644e7a1571eccc3 --- /dev/null +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, kerberos }: + +stdenv.mkDerivation rec { + name = "libgssglue-0.4"; + + src = fetchurl { + url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/${name}.tar.gz"; + sha256 = "0fh475kxzlabwz30wz3bf7i8kfqiqzhfahayx3jj79rba1sily9z"; + }; + + postPatch = '' + sed s:/etc/gssapi_mech.conf:$out/etc/gssapi_mech.conf: -i src/g_initialize.c + ''; + + postInstall = '' + mkdir -p $out/etc + cat < $out/etc/gssapi_mech.conf + ${kerberos}/lib/libgssapi_krb5.so mechglue_internal_krb5_init + EOF + ''; + + meta = with stdenv.lib; { + homepage = http://www.citi.umich.edu/projects/nfsv4/linux/; + description = "Exports a gssapi interface which calls other random gssapi libraries"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ corngood ]; + }; +} diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix index eaf2eb170956be27ae3f855c50bba429e577249e..e29b3ed89dea479f3f953bc75a8db7274abedc24 100644 --- a/pkgs/development/libraries/libgsystem/default.nix +++ b/pkgs/development/libraries/libgsystem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection , glib, attr, systemd }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - autoreconfHook pkgconfig gtk_doc gobjectIntrospection + autoreconfHook pkgconfig gtk-doc gobjectIntrospection ]; propagatedBuildInputs = [ glib attr systemd ]; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 49cd1d163a60d5b13d9e892ea523af488210d3b7..656395b8867dfe8ba8e9d7b5eab049fd8a544341 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection, libintlOrEmpty }: +{ stdenv, fetchurl, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, gnome3 }: +let + pname = "libgtop"; + version = "2.38.0"; +in stdenv.mkDerivation rec { - name = "libgtop-${version}"; - major = "2.38"; - version = "${major}.0"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libgtop/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"; }; propagatedBuildInputs = [ glib ]; - buildInputs = libintlOrEmpty; - nativeBuildInputs = [ pkgconfig perl intltool gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig perl gettext gobjectIntrospection ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; - meta = { - platforms = with stdenv.lib.platforms; linux ++ darwin; + meta = with stdenv.lib; { + description = "A library that reads information about processes and the running system"; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index a5f8f5036d0465555e84d68064322d9c23309a4c..1e1f3eeb4c73eb4fd7bb09c40ef4b6304b821fdd 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, udev, glib }: +{ stdenv, fetchurl, pkgconfig, udev, glib, gnome3 }: -stdenv.mkDerivation rec { +let + pname = "libgudev"; +in stdenv.mkDerivation rec { name = "libgudev-${version}"; version = "232"; src = fetchurl { - url = "mirror://gnome/sources/libgudev/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860"; }; @@ -15,9 +17,16 @@ stdenv.mkDerivation rec { # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. configureFlags = [ "--disable-umockdev" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/libgudev; - maintainers = [ maintainers.eelco ]; + maintainers = [ maintainers.eelco ] ++ gnome3.maintainers; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/development/libraries/libguestfs/appliance.nix b/pkgs/development/libraries/libguestfs/appliance.nix new file mode 100644 index 0000000000000000000000000000000000000000..d47b0902818d9617de9c42efee503e455fbe7e16 --- /dev/null +++ b/pkgs/development/libraries/libguestfs/appliance.nix @@ -0,0 +1,7 @@ +{ fetchzip }: + +fetchzip { + name = "libguestfs-appliance-1.38.0"; + url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz"; + sha256 = "15rxwj5qjflizxk7slpbrj9lcwkd2lgm52f5yv101qba4yyn3g76"; +} diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index bfdd0cf8fd74d1e74bd4101e2be8936cd4e2110e..106de68d367a0c2be1958b6701966bb2ca1397bf 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -2,20 +2,20 @@ , 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, libapparmor -, getopt, perlPackages, ocamlPackages }: +, getopt, perlPackages, ocamlPackages +, appliance ? null +, javaSupport ? false, jdk ? null }: + +assert appliance == null || stdenv.lib.isDerivation appliance; +assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.36.3"; - - appliance = fetchurl { - url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz"; - sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125"; - }; + version = "1.38.0"; src = fetchurl { - url = "http://libguestfs.org/download/1.36-stable/libguestfs-${version}.tar.gz"; - sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m"; + url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; + sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3"; }; nativeBuildInputs = [ pkgconfig ]; @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { 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 libapparmor getopt perlPackages.ModuleBuild - ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]); + ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) + ++ stdenv.lib.optional javaSupport jdk; prePatch = '' # build-time scripts @@ -40,7 +41,8 @@ stdenv.mkDerivation rec { # some scripts hardcore /usr/bin/env which is not available in the build env patchShebangs . ''; - configureFlags = "--disable-appliance --disable-daemon"; + configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ] + ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; installFlags = "REALLY_INSTALL=yes"; @@ -49,14 +51,31 @@ stdenv.mkDerivation rec { postInstall = '' for bin in $out/bin/*; do wrapProgram "$bin" \ - --prefix "PATH" : "$out/bin:${hivex}/bin:${qemu}/bin" \ - --prefix "PERL5LIB" : "$PERL5LIB:$out/lib/perl5/site_perl" + --prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \ + --prefix PERL5LIB : "$out/lib/perl5/site_perl" done ''; - postFixup = '' - mkdir -p "$out/lib/guestfs" - tar -Jxvf "$appliance" --strip 1 -C "$out/lib/guestfs" + postFixup = stdenv.lib.optionalString (appliance != null) '' + mkdir -p $out/{lib,lib64} + ln -s ${appliance} $out/lib64/guestfs + ln -s ${appliance} $out/lib/guestfs + ''; + + doInstallCheck = appliance != null; + installCheckPhase = '' + export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish + + ${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G + + $out/bin/guestfish <<'EOF' + add-drive disk1.img + run + list-filesystems + part-disk /dev/sda mbr + mkfs ext2 /dev/sda1 + list-filesystems + EOF ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgumbo/default.nix b/pkgs/development/libraries/libgumbo/default.nix deleted file mode 100644 index 210a66e654a7bf54ee3b0cfbe22c0b846948f8d0..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libgumbo/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - name = "libgumbo-${version}"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "google"; - repo = "gumbo-parser"; - rev = "v${version}"; - sha256 = "0xslckwdh2i0g2qjsb6rnm8mjmbagvziz0hjlf7d1lbljfms1iw1"; - }; - - buildInputs = [ autoconf automake libtool ]; - - preConfigure = "./autogen.sh"; - - meta = with stdenv.lib; { - description = "C99 HTML parsing algorithm"; - homepage = https://github.com/google/gumbo-parser; - maintainers = [ maintainers.nico202 ]; - platforms = platforms.linux; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 88a3ebbc4fbeccad2f3c426e362cb556a5b4ad5f..6af3f5225d4ddae29e4363855b8fe3f7e5773077 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,29 +1,41 @@ -{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}: +{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf +, gnome3, glib, json-glib, libarchive, libsoup, gobjectIntrospection }: -stdenv.mkDerivation rec { - major = "0.4"; - minor = "5"; - version = "${major}.${minor}"; - - name = "libhttpseverywhere-${version}"; +let + pname = "libhttpseverywhere"; + version = "0.8.2"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz"; - sha256 = "07sgcw285rl9wqr5k7srs3fj7fhgrrw6w780jx8wy8jw2bfwlvj2"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0vcnimlfcscyvjbh845xbnjb9qc8x0mliaqz2gczxxpakxrbl3gh"; }; - nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ]; - buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ]; + nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig ]; + buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; + + mesonFlags = [ "-Denable_valadoc=true" ]; doCheck = true; - checkPhase = "./httpseverywhere_test"; + checkPhase = "(cd test && ./httpseverywhere_test)"; + + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + + outputs = [ "out" "devdoc" ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; - meta = { - description = "library to use HTTPSEverywhere in desktop applications"; - homepage = https://git.gnome.org/browse/libhttpseverywhere; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + meta = with stdenv.lib; { + description = "Library to use HTTPSEverywhere in desktop applications"; + homepage = https://git.gnome.org/browse/libhttpseverywhere; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ sternenseemann ] ++ gnome3.maintainers; }; } diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 1f5ab2cf0969b8d00ae803c2d1267ea34d42214e..516e6bbbe88c8cf45715b30d737181232c37b8a3 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,15 +1,20 @@ -{ stdenv, lib, fetchurl, gcc, staticBuild ? false }: +{ stdenv, buildPackages, fetchurl, staticBuild ? false }: + +let inherit (buildPackages.buildPackages) gcc; in stdenv.mkDerivation rec { name = "libiberty-${gcc.cc.version}"; inherit (gcc.cc) src; + outputs = [ "out" "dev" ]; + postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; - configureFlags = [ "--enable-install-libiberty" ] ++ lib.optional (!staticBuild) "--enable-shared"; + configureFlags = [ "--enable-install-libiberty" ] + ++ stdenv.lib.optional (!staticBuild) "--enable-shared"; - postInstall = lib.optionalString (!staticBuild) '' + postInstall = stdenv.lib.optionalString (!staticBuild) '' cp pic/libiberty.a $out/lib*/libiberty.a ''; @@ -17,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://gcc.gnu.org/; license = licenses.lgpl2; description = "Collection of subroutines used by various GNU programs"; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar ericson2314 ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 899465124100133c41edaa6f7ae7d8433b9fd83a..a4e6fed88e1cdb4645b6a09a4db04c721aa2232e 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,8 +1,9 @@ { fetchurl, stdenv, lib , buildPlatform, hostPlatform +, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt }: -assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross +# assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross stdenv.mkDerivation rec { name = "libiconv-${version}"; @@ -13,20 +14,16 @@ stdenv.mkDerivation rec { sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc"; }; + setupHook = ./setup-hook.sh; + postPatch = lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) '' sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h ''; - configureFlags = - lib.optional stdenv.isFreeBSD "--with-pic"; - - crossAttrs = { - # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW). - dontStrip = true; - dontCrossStrip = true; - }; + configureFlags = lib.optional stdenv.isFreeBSD "--with-pic" + ++ lib.optional enableStatic "--enable-static"; meta = { description = "An iconv(3) implementation"; diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..78222dddbf1d47d9fe36ec45c15e4266a0b4445e --- /dev/null +++ b/pkgs/development/libraries/libiconv/setup-hook.sh @@ -0,0 +1,18 @@ +# libiconv must be listed in load flags on non-Glibc +# it doesn't hurt to have it in Glibc either though +iconvLdflags() { + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + export NIX_${role}LDFLAGS+=" -liconv" +} + +addEnvHooks "$hostOffset" iconvLdflags diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index df92693de5a6e5661818ccd3a7da88642bb1b477..54d669f1913b1d9bb6f8f2e6b370a7a46dbc09c4 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "info" "devdoc" ]; - doCheck = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin; + # broken with gcc-7 + #doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isMusl; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 521fe00b56d7465e715b94739bf71167e8084779..46cb579c56c4a05a0afc5484b3bec931f8129d69 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn }: +{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn, buildPackages }: with stdenv.lib; @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { patches = optional stdenv.isDarwin ./fix-error-darwin.patch; - buildInputs = [ libunistring ronn ] - ++ optionals stdenv.isDarwin [ libiconv help2man ]; + nativeBuildInputs = optional stdenv.isDarwin help2man; + buildInputs = [ libunistring ] ++ optional stdenv.isDarwin libiconv; + depsBuildBuild = [ buildPackages.stdenv.cc ]; meta = { homepage = "https://www.gnu.org/software/libidn/#libidn2"; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 9f75f17caeed85ae0d455156b4c7da8d80e4b02f..445a505b68c8f869480f8fbe487b83a0d163e41f 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -2,9 +2,9 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, libdbusmenu-glib +, glib, dbus-glib, libdbusmenu-glib , gtkVersion, gtk2 ? null, gtk3 ? null -, pythonPackages, gobjectIntrospection, vala_0_23, gnome_doc_utils +, pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: @@ -24,11 +24,11 @@ in stdenv.mkDerivation rec { sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ]; buildInputs = [ - glib dbus_glib libdbusmenu-glib - python pygobject2 pygtk gobjectIntrospection vala_0_23 gnome_doc_utils + glib dbus-glib libdbusmenu-glib + python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ gtk3 ]); diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 835c7d6f2262f055bbdc114e9877d4190c7e405f..944cf7a6f5e2038ff0336f0aedc7e3435b68667a 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -4,7 +4,7 @@ , 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 -, libintlOrEmpty }: +, libintl }: let edf = flag: feature: (if flag then "--with-" else "--without-") + feature; @@ -12,21 +12,21 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.6.5"; + name = "libinfinity-0.7.1"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1idsxb6rz4i55g3vi2sv7hmm57psbccpb57yc4jgphaq6ydgqsr6"; + sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 gsasl libidn gss libintlOrEmpty ] + buildInputs = [ glib libxml2 gsasl libidn gss libintl ] ++ optional gtkWidgets gtk2 ++ optional documentation gtkdoc ++ optional avahiSupport avahi ++ optional daemon libdaemon; propagatedBuildInputs = [ gnutls ]; - + configureFlags = '' ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"} ${edf gtkWidgets "inftextgtk"} @@ -36,8 +36,6 @@ 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"; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index d39a71e16da933703020339cd942989f7ecb6300..0e2458a389596b26666ec4e8dfe9817887800bfc 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1y3559146zlfizncky1jlly226i66vwikxhpdkw0jg8v47j0sy7h"; + sha256 = "0mrzsf0349d1g68lizkzxw7vaw459fl8xhl7v0s8njb31hp2riy2"; }; outputs = [ "out" "dev" ]; @@ -50,8 +50,6 @@ stdenv.mkDerivation rec { doCheck = testsSupport; - checkPhase = "meson test"; - meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = http://www.freedesktop.org/wiki/Software/libinput; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 267d3097c997d2d04d76de10f3eb680fca15bd43..738c11161955649b36fe779353e92de247236b93 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }: stdenv.mkDerivation rec { - name = "libiodbc-3.52.8"; + name = "libiodbc-3.52.12"; src = fetchurl { url = "mirror://sourceforge/iodbc/${name}.tar.gz"; - sha256 = "16hjb6fcval85gnkgkxfhw4c5h3pgf86awyh8p2bhnnvzc0ma5hq"; + sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index e113d62c5f7d99aab4ae449d58e181df15e8ffc4..6e77641760919c574f1999a75962e503158a1643 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisoburn-${version}"; - version = "1.4.4"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "1mn2dwkwdrdcjnd59czxali7r5nlxdx92clyxnsfpmw20f9s20kv"; + sha256 = "19d53j17pn18vfxxqqlqwam5lm21ljyp8nai5434068g7x3m1kwi"; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index a0205fb234ca2fb085a5160e6afd76f61ae7618c..d0217a908b9f79d8482bd97802907bb6794f6058 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisofs-${version}"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "02m5g6lbmmkh2xc5xzq5zaf3ma6v31gls66aj886b3cq9qw0paql"; + sha256 = "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw"; }; buildInputs = [ attr zlib ]; diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 479deb7593d6990f1efc4a97e51145d68a12b61d..51a7ab4851c37df3d89e03cd8f3edf9cefe66179 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.9.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "1y2iylsgs8am5br7an0xkrgshq6k2zkk8jfsaa7vdw2dh3qvc9pr"; + sha256 = "07zypi3f02ygl7h5yc9sy136iiwgdi3r3nkjai9bq4gzjmzsvyl9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index eac919612f0b5c201b66097bba65a97295d41b37..ed595505fae1b9b06585a1e10802298b1dd87524 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libivykis-${version}"; - version = "0.41"; + version = "0.42.1"; src = fetchurl { url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; - sha256 = "1igk3svf36i5xgb6ipc507xpj6zjm4xi9j1j2cdqaachllwlb4rc"; + sha256 = "0c90cfpxipw2m8i3ajr7vy7lb8gvcz2kh5n8sd542zphr4na8whq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 77f9d999de441a236f74190e421949e2e92c2bbc..4ec0e5ebd9f4ff1bfd1a716fc08989761b1c6cb2 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "libjpeg-turbo-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "0a5m0psfp5952y5vrcs0nbdz1y9wqzg2ms0xwrx752034wxr964h"; + sha256 = "08r5b5mywwrxv4axvq80dm31cklz81grczlzlxr2xqa6pgi90j5j"; }; # github releases still need autotools, surprisingly patches = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; # not cross; checkTarget = "test"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 77f047b4c58623b9f5e32fb91e9b50d6822d9338..6c7e5881a784ebcb87cac83764e15fec7aba3fd5 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libogg, libpng }: stdenv.mkDerivation rec { - name = "libkate-0.3.8"; + name = "libkate-0.4.1"; src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${name}.tar.gz"; - sha256 = "00d6561g31la9bb8q99b7l4rvi67yiwm50ky8dhlsjd88h7rks2n"; + sha256 = "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4"; }; buildInputs = [ libogg libpng ]; diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 326d9c4f9d78cb27cd3969f14704940dcf98ae31..93f3b2a4f84d1fb7d0288b607aaba5c4f8dd8ec9 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { homepage = http://www.ibrahimshaath.co.uk/keyfinder/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 8bff5a21cd0975580c9cc270ee5a23ea85047fb6..0611e0e57e7b24c9a10ff31e583090a2c0456383 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror }: +{ stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { name = "libksba-1.3.5"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; + buildInputs = [ gettext ]; propagatedBuildInputs = [ libgpgerror ]; postInstall = '' diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..95b6b657fa2bedf9c7d8c95b3f74bf203c379e76 --- /dev/null +++ b/pkgs/development/libraries/liblcf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }: + +stdenv.mkDerivation rec { + name = "liblcf-${version}"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "EasyRPG"; + repo = "liblcf"; + rev = version; + sha256 = "1y3pbl3jxan9f0cb1rxkibqjc0h23jm3jlwlv0xxn2pgw8l0fk34"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ expat icu ]; + + meta = with stdenv.lib; { + homepage = https://github.com/EasyRPG/liblcf; + license = licenses.mit; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index 9059fe8f84531aa06aaa6f5770ecf5fb2a526d99..ae1d458b0d52a04b3a6fc0634af505af90b9d3e7 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "liblo-0.26"; + name = "liblo-0.29"; src = fetchurl { - url = "mirror://sourceforge/liblo/liblo/0.26/${name}.tar.gz"; - sha256 = "0n124fv9m8yjxs2yxnp3l1i30b8qgg1zx51y63ax12hpz04zndm6"; + url = "mirror://sourceforge/liblo/liblo/0.29/${name}.tar.gz"; + sha256 = "0sn0ckc1d0845mhsaa62wf7f9v0c0ykiq796a30ja5096kib9qdc"; }; meta = { diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index 4667a6e76014c92c5486c583a8028434a2a916d7..dd852e1de85aec05d19dde8c88df2d8857b12458 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "liblogging-1.0.5"; + name = "liblogging-1.0.6"; src = fetchurl { url = "http://download.rsyslog.com/liblogging/${name}.tar.gz"; - sha256 = "02w94j344q0ywlj4mdf9fnzwggdsn3j1yn43sdlsddvr29lw239i"; + sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bde1ff4e4936909d133b6f0499fd76277302fca8 --- /dev/null +++ b/pkgs/development/libraries/liblouis/default.nix @@ -0,0 +1,57 @@ +{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, gettext, python3 +, texinfo, help2man, libyaml, perl +}: + +let + version = "3.5.0"; +in stdenv.mkDerivation rec { + name = "liblouis-${version}"; + + src = fetchFromGitHub { + owner = "liblouis"; + repo = "liblouis"; + rev = "v${version}"; + sha256 = "0klmyh6cg9khv59j4xdsrwwjzdgylw689gvrjiy5jsvqll58fcsd"; + }; + + outputs = [ "out" "dev" "man" "info" "doc" ]; + + nativeBuildInputs = [ + autoreconfHook pkgconfig gettext python3 + # Docs, man, info + texinfo help2man + ]; + + buildInputs = [ + # lou_checkYaml + libyaml + # maketable.d + perl + ]; + + configureFlags = [ + # Required by Python bindings + "--enable-ucs4" + ]; + + postPatch = '' + patchShebangs tests + substituteInPlace python/louis/__init__.py.in --replace "###LIBLOUIS_SONAME###" "$out/lib/liblouis.so" + ''; + + postInstall = '' + pushd python + python setup.py install --prefix="$out" --optimize=1 + popd + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Open-source braille translator and back-translator"; + homepage = http://liblouis.org/; + license = licenses.lgpl21; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index c89b21de0d641d6895575af72307dead7a5ddb1d..1a5a4baf80868d843b2399b403afc6c9cce7d686 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { - name = "liblscp-svn-${version}"; - version = "2319"; + name = "liblscp-${version}"; + version = "0.6.0"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/liblscp/trunk"; - rev = "${version}"; - sha256 = "0jgdy9gi9n8x2pqrbll9158vhx8293lnxv8vzl0szcincslgk7hi"; + src = fetchurl { + url = "https://download.linuxsampler.org/packages/${name}.tar.gz"; + sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - preConfigure = "make -f Makefile.svn"; + preConfigure = "make -f Makefile.git"; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix index ec306e0f7c34f49526a7a18257b82de7e0e7bb3b..dfc2402a7ec6bb7fe4a115c1e29772eb76ed806d 100644 --- a/pkgs/development/libraries/libltc/default.nix +++ b/pkgs/development/libraries/libltc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libltc-1.1.4"; + name = "libltc-1.3.0"; src = fetchurl { - url = https://github.com/x42/libltc/releases/download/v1.1.4/libltc-1.1.4.tar.gz; - sha256 = "0xas0zbi11nhq15al6cxn0iwa563s6fcz01hw0np1clh25h4773x"; + url = https://github.com/x42/libltc/releases/download/v1.3.0/libltc-1.3.0.tar.gz; + sha256 = "0p7fgp44i9d1lrgbk5zj3sm5yzavx428zn36xb3bl7y65c2xxcda"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 9355c43642a461645fef4078a272d2a235cf735e..f1b15a91ccac61ccd4034470098d3b93b91528e1 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmaxminddb-${version}"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${name}.tar.gz"; - sha256 = "0dxdyw6sxxmpzk2a96qp323r5kdmw7vm6m0l5a8gr52gf7nmks0z"; + sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 1c8e65dafd4b53456a86962d842a9c95ef6e5459..431770ef12d1cd3fcc802add3fbe9b4c86c08a6d 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.14.2"; + name = "libmbim-1.16.0"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "1krirl9881dnx7l29zhvagk2qlhi26vpvkzdifjklhrjhimzxji2"; + sha256 = "1hpsjc7bzmakzvj8z9fffvqknc38fa8ridpmklq46jyxxnz51jn8"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index 8951017a4b5c65dd3620f75d00e796d315c74d77..2da8e5ebf738b66f1fbf5c7b645c086e3eb4b758 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libmd"; - version = "0.0.0"; + version = "1.0.0"; src = fetchurl { url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "121s73pgbqsnmy6xblbrkj9y44c5zzzpf2hcmh6zvcvg4dk26gzx"; + sha256 = "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 25a597ea4daff6051c0b4b714a028a3e0ae2fb35..8c204ba4006f18d615b96865816ca99a23c8572e 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 = "17.10"; + version = "18.03.1"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "00m1b4m37c9lm16yhh63p5pidg2sr3qvsw36672lklmcv3y1ic30"; + sha256 = "183gcb6h81blgvssfl5lxsv8h5izkgg6b86z0jy9g699adgkchq2"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 086ba8f32d2133e3e62674d9f65ea48e8cfdf682..15e642832df60a4352998ad6bae81300aa07ef1c 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -17,11 +17,14 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8"; - }); + }) + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; buildInputs = [ libevent ]; propagatedBuildInputs = [ cyrus_sasl ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive"/*gcc7*/ ]; + meta = with stdenv.lib; { homepage = http://libmemcached.org; description = "Open source C/C++ client library and tools for the memcached server"; diff --git a/pkgs/development/libraries/libmemcached/musl-fixes.patch b/pkgs/development/libraries/libmemcached/musl-fixes.patch new file mode 100644 index 0000000000000000000000000000000000000000..eb2a6bc980eb2e94b5548aea6b86e4ef77e1c57a --- /dev/null +++ b/pkgs/development/libraries/libmemcached/musl-fixes.patch @@ -0,0 +1,58 @@ +diff --git a/libhashkit/fnv_64.cc b/libhashkit/fnv_64.cc +index 68e4dd0..64656b7 100644 +--- a/libhashkit/fnv_64.cc ++++ b/libhashkit/fnv_64.cc +@@ -37,8 +37,9 @@ + + + #include ++#include + +-#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH) ++#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH) + + /* FNV hash'es lifted from Dustin Sallings work */ + static uint64_t FNV_64_INIT= 0xcbf29ce484222325; +diff --git a/libhashkit/has.cc b/libhashkit/has.cc +index 843e32e..4153e5e 100644 +--- a/libhashkit/has.cc ++++ b/libhashkit/has.cc +@@ -37,6 +37,7 @@ + + + #include ++#include + + bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo) + { +@@ -44,7 +45,7 @@ bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo) + { + case HASHKIT_HASH_FNV1_64: + case HASHKIT_HASH_FNV1A_64: +-#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH) ++#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH) + return true; + #else + return false; +diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc +index 29a22de..161c646 100644 +--- a/libtest/cmdline.cc ++++ b/libtest/cmdline.cc +@@ -61,7 +61,7 @@ using namespace libtest; + #include + #include + +-#ifndef __USE_GNU ++#ifndef _GNU_SOURCE + static char **environ= NULL; + #endif + +@@ -201,7 +201,7 @@ Application::error_t Application::run(const char *args[]) + + fatal_assert(posix_spawnattr_setsigmask(&spawnattr, &mask) == 0); + +-#if defined(POSIX_SPAWN_USEVFORK) || defined(__linux__) ++#if defined(POSIX_SPAWN_USEVFORK) || defined(__GLIBC__) + // Use USEVFORK on linux + flags |= POSIX_SPAWN_USEVFORK; + #endif diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 68156c0c2171e7869173591647426e8a9e4d7f36..041e0d98d654fbf8fdb42e78da2b13cdefb6e41e 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintlOrEmpty }: +{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.55"; + name = "libmicrohttpd-${version}"; + version = "0.9.59"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "1y6h1slav5l6k8zyb01dpw65dscdgxxgfa3a0z9qnn7jr66sn70c"; + sha256 = "0g4jgnv43yddr9yxrqg11632rip0lg5c53gmy5wy3c0i1dywv74v"; }; outputs = [ "out" "dev" "devdoc" "info" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libgcrypt curl gnutls ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv libintlOrEmpty ]; + buildInputs = [ libgcrypt curl gnutls libiconv libintl ]; preCheck = '' # Since `localhost' can't be resolved in a chroot, work around it. @@ -37,4 +37,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 8071d386db0f526a7bda9d0a8aaf0bf72e52cb0a..c509fcd2b4f898dffe496be1d22b4694e08415d2 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.11"; + name = "libmikmod-3.3.11.1"; src = fetchurl { url = "mirror://sourceforge/mikmod/${name}.tar.gz"; - sha256 = "1smb291jr4qm2cdk3gfpmh0pr23rx3jw3fw0j1zr3b4ih7727fni"; + sha256 = "06bdnhb0l81srdzg6gn2v2ydhhaazza7rshrcj3q8dpqr3gn97dd"; }; buildInputs = [ texinfo ] diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index 217ce20c6cfba6392f644ec6a372a935be673708..704c73284ae1ff9cd5e2d5a708a08f2b62bc98a7 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -1,27 +1,42 @@ -{ stdenv, fetchurl, cmake, zlib, netcdf, hdf5 }: +{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }: stdenv.mkDerivation rec { - _name = "libminc"; - name = "${_name}-2.3.00"; + pname = "libminc"; + name = "${pname}-2017-09-14"; - src = fetchurl { - url = "https://github.com/BIC-MNI/${_name}/archive/${_name}-2-3-00.tar.gz"; - sha256 = "04ngqx4wkssxs9qqcgq2bvfs1cldcycmpcx587wy3b3m6lwf004c"; + owner = "BIC-MNI"; + + # current master is significantly ahead of most recent release, so use Git version: + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = "e11c6df9321b4061bf87a7d43171ec55e9e3908f"; + sha256 = "0lmd0js3jgni2mw1zfvd4qg6byxiv3ndgv2z3nm7975i83zw48xk"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib netcdf hdf5 ]; + buildInputs = [ zlib netcdf nifticlib hdf5 ]; + + cmakeFlags = [ "-DBUILD_TESTING=${if doCheck then "TRUE" else "FALSE"}" + "-DLIBMINC_MINC1_SUPPORT=TRUE" + "-DLIBMINC_BUILD_SHARED_LIBS=TRUE" + "-DLIBMINC_USE_SYSTEM_NIFTI=TRUE" ]; - cmakeFlags = [ "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" - "-DLIBMINC_MINC1_SUPPORT=ON" ]; - checkPhase = "ctest"; + checkPhase = '' + export LD_LIBRARY_PATH="$(pwd)" # see #22060 + ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure + # ezminc_rw_test can't find libminc_io.so.5.2.0; minc_conversion hits netcdf compilation issue + ''; doCheck = true; + enableParallelBuilding = true; + meta = with stdenv.lib; { - homepage = https://github.com/BIC-MNI/libminc; + homepage = "https://github.com/${owner}/${pname}"; description = "Medical imaging library based on HDF5"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; + license = licenses.free; }; } diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index ff627499855cb464ea7af0394890cc69546d70dc..749a5d60e46743478fc5efd794ad779b9210a8bd 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }: stdenv.mkDerivation rec { - name = "libmng-2.0.2"; + name = "libmng-2.0.3"; src = fetchurl { url = "mirror://sourceforge/libmng/${name}.tar.xz"; - sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317"; + sha256 = "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 33ccccea2e95b5f3d190f3ec185f42e6ec456d3e..2dbdb60b4b66dbc1d40647d45c246f3b6e2934d5 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { This library aims to provide simple helpers that allows you to re-use code and to avoid re-inventing the wheel. ''; - homepage = http://netfilter.org/projects/libmnl/index.html; + homepage = https://netfilter.org/projects/libmnl/index.html; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index f6a816ef96f6bfdd16554bbd45bd15e4a95ffef8..10bd7af7fadd48e25f2bbed1936b98bf7ba3efd2 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmodbus-3.0.6"; + name = "libmodbus-3.1.4"; src = fetchurl { url = "http://libmodbus.org/releases/${name}.tar.gz"; - sha256 = "1dkijjv3dq0c5vc5z5f1awm8dlssbwg6ivsnvih22pkm1zqn6v84"; + sha256 = "0drnil8bzd4n4qb0wv3ilm9zvypxvwmzd65w96d6kfm7x6q65j68"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix index 600d7faace20bd1c179f13d6fbbd693047fb9127..8580049101600435400cbdf63d173e25567562c6 100644 --- a/pkgs/development/libraries/libmodplug/default.nix +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - version = "0.8.8.5"; + version = "0.8.9.0"; in stdenv.mkDerivation rec { name = "libmodplug-${version}"; @@ -15,6 +15,6 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz"; - sha256 = "1bfsladg7h6vnii47dd66f5vh1ir7qv12mfb8n36qiwrxq92sikp"; + sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25"; }; } diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index 06a98bcdcebfc194364d37eff4731ecfd620c9e7..b23701837fa0ad7bcf2f848218514547da9d5a34 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmowgli-0.9.50"; + name = "libmowgli-${version}"; + version = "2.1.3"; src = fetchurl { - url = "http://distfiles.atheme.org/${name}.tar.bz2"; - sha256 = "0wbnpd2rzk5jg6pghgxyx7brjrdmsyg4p0mm9blwmrdrj5ybxx9z"; + url = "https://github.com/atheme/libmowgli-2/archive/v${version}.tar.gz"; + sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp"; }; meta = { diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index e9bc2a646b7158f3332625755f5ed49d11bdc680..2754c726da2bd66c97eb739e31b8c60257d62407 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { rev = version; sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; }; - LIBTOOL = "libtool"; - buildInputs = [ libtool ]; - preInstall = '' - export PREFIX=$out - ''; + + nativeBuildInputs = [ libtool ]; + + makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" ]; + meta = with stdenv.lib; { description = "Simple implementation of msgpack in C"; homepage = https://github.com/tarruda/libmpack/; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 4be59af6f0c24eeb9a54ce65ddf0a9803f654952..106f6fe6c37c156e9544035923284038d8aebb46 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -1,24 +1,21 @@ { stdenv, fetchurl , gmp, mpfr -, buildPlatform, hostPlatform }: let - version = "1.0.3"; + version = "1.1.0"; in stdenv.mkDerivation rec { name = "libmpc-${version}"; # to avoid clash with the MPD client src = fetchurl { - url = "http://www.multiprecision.org/mpc/download/mpc-${version}.tar.gz"; - sha256 = "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1"; + url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; + sha256 = "0biwnhjm3rx3hc0rfpvyniky4lpzsvdcwhmcn7f0h4iw2hwcb1b9"; }; buildInputs = [ gmp mpfr ]; - CFLAGS = "-I${gmp.dev}/include"; - - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; meta = { description = "Library for multiprecision complex arithmetic with exact rounding"; diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 9cac26bf2be1e16b2ff7d2f075e111bddae6a501..88ef55715a7c81b9f51942c969b3d248b0ace964 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.13"; + name = "libmtp-1.1.15"; src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "0h3dv9py5mmvxhfxmkr8ky4s80hgq3d66cmrfnnnlcdwpwpy0kj9"; + sha256 = "089h79nkz7wcr3lbqi7025l8p75hbp0aigxk3wdk2zkm8q5r0h6h"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index e1ac659683c92bf71003ab4224cb0f84bb24d49f..35137a09cd9cb4cfb25e8e2807c7fb30c5d04a25 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.10"; + version="0.3.13"; name="${baseName}-${version}"; - hash="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj"; - url="https://netcologne.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.10/libmwaw-0.3.10.tar.xz"; - sha256="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj"; + hash="1sjs3nc39im232h5bf81w3il8ivd7w2bc2qssxf7k74g8hlcfmfv"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.13/libmwaw-0.3.13.tar.xz"; + sha256="1sjs3nc39im232h5bf81w3il8ivd7w2bc2qssxf7k74g8hlcfmfv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 897a769b014d5dbf428b128d90eef5eea33c3fc6..42bcf5b64740b015735eaaf361b5482a01e8644f 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , libtool, pkgconfig, automake, autoconf, intltool -, glib, gobjectIntrospection, gtk2, gtk_doc -, clutter, clutter_gtk +, glib, gobjectIntrospection, gtk2, gtk-doc +, clutter, clutter-gtk }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { automake autoconf libtool intltool gobjectIntrospection glib - gtk2 gtk_doc clutter clutter_gtk + gtk2 gtk-doc clutter clutter-gtk ]; # patch to resolve GL errors diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8719f19acc1dd3048a2b3a81b722fc69a25fe092 --- /dev/null +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -0,0 +1,40 @@ +{stdenv, autoconf, automake, fetchFromGitHub, fetchpatch, glib, intltool, json_c, libtool, pkgconfig}: + +let + version = "1.3.0"; +in stdenv.mkDerivation rec { + name = "libmypaint-${version}"; + + src = fetchFromGitHub { + owner = "mypaint"; + repo = "libmypaint"; + rev = "v${version}"; + sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc"; + }; + + patches = [ + # build with automake 1.16 + (fetchpatch { + url = https://github.com/mypaint/libmypaint/commit/40d9077a80be13942476f164bddfabe842ab2a45.patch; + sha256 = "1dclh7apgvr2bvzy9z3rgas3hk9pf2hpf5h52q94kmx8s4a47qpi"; + }) + ]; + + nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ]; + + buildInputs = [ glib ]; + + propagatedBuildInputs = [ json_c ]; # for libmypaint.pc + + doCheck = true; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + homepage = http://mypaint.org/; + description = "Library for making brushstrokes which is used by MyPaint and other projects"; + license = licenses.isc; + maintainers = with maintainers; [ goibhniu jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 3905ba1b2716960e96110a9a08b9e2b22bc87912..9eefbcfdb49ee13eb46f7e9f1f1e869637ad0474 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmysqlconnectorcpp-${version}"; - version = "1.1.7"; + version = "1.1.9"; src = fetchurl { url = "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; - sha256 = "0qy7kxz8h1zswr50ysyl2cc9gy0ip2j7ikl714m7lq3gsay3ydav"; + sha256 = "1r6j17sy5816a2ld759iis2k6igc2w9p70y4nw9w3rd4d5x88c9y"; }; buildInputs = [ cmake boost mysql ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMYSQL_LIB_DIR=${mysql}/lib" ]; meta = { - homepage = http://dev.mysql.com/downloads/connector/cpp/; + homepage = https://dev.mysql.com/downloads/connector/cpp/; description = "C++ library for connecting to mysql servers."; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index fe38755f10c55f67a275d69c0fa0fc3fcadccf4b..9b692e9e3b2e683095f7f71eccbcccea686b07e8 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation (rec { maintainers = [ ]; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { - NIX_LDFLAGS = "-liconv"; propagatedBuildInputs = [ libiconv ]; }) diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index a93c16d784de07f4ea12bad8852d4ba00622676c..f642ad5ccfab893963a8d6626bd184f0b3e9f6a2 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; }; + patches = [ ./fix-includes.patch ]; + meta = with stdenv.lib; { homepage = https://github.com/sam-github/libnet; description = "Portable framework for low-level network packet construction"; diff --git a/pkgs/development/libraries/libnet/fix-includes.patch b/pkgs/development/libraries/libnet/fix-includes.patch new file mode 100644 index 0000000000000000000000000000000000000000..5eb86bc37b79d5554520a0de7d32d5bf3f43401a --- /dev/null +++ b/pkgs/development/libraries/libnet/fix-includes.patch @@ -0,0 +1,29 @@ +--- libnet-1.1.6.orig/src/libnet_link_linux.c ++++ libnet-1.1.6/src/libnet_link_linux.c +@@ -30,26 +30,15 @@ + #include + + #include +-#if (__GLIBC__) + #include + #include +-#else +-#include +-#include +-#endif + + #if (HAVE_PACKET_SOCKET) + #ifndef SOL_PACKET + #define SOL_PACKET 263 + #endif /* SOL_PACKET */ +-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 + #include + #include /* the L2 protocols */ +-#else +-#include +-#include +-#include /* The L2 protocols */ +-#endif + #endif /* HAVE_PACKET_SOCKET */ + + #include "../include/libnet.h" diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index a94bf28cd972f9b5dcc0fb422f02fea84a400a97..1b4c471a2567fb14690e2aabbbdd93f13005b6a1 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.6"; src = fetchurl { - url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; sha256 = "1svzyf3rq9nbrcw1jsricgyhh7x1am8iqn6kjr6mzrw42810ik7g"; }; @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used by conntrack-tools among many other applications ''; - homepage = http://netfilter.org/projects/libnetfilter_conntrack/; + homepage = https://netfilter.org/projects/libnetfilter_conntrack/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index f30e12a416310dda5c7b88a428ca5fc053ebf70f..d16155374ca8339df61344167cd47555aad6a46d 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.0"; src = fetchurl { - url = "http://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2"; sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { With this library, you can create, update and delete timeout policies that can be attached to traffic flows. This library is used by conntrack-tools. ''; - homepage = http://netfilter.org/projects/libnetfilter_cttimeout/; + homepage = https://netfilter.org/projects/libnetfilter_cttimeout/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index e3c8447549d145f19c1b485b5d4c9491f400ad30..0d8de14513edccec8181ad653a9fd6b623e2584a 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.1"; src = fetchurl { - url = "http://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2"; sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l"; }; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { 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/; + homepage = https://netfilter.org/projects/libnetfilter_log/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ orivej nckx ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 5de9409b729f7e414db2a7e22b351092bab1155f..12a45d088ef6d06f9157b9ed5a93e19064aeedbc 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: stdenv.mkDerivation rec { - name = "libnetfilter_queue-1.0.2"; + version = "1.0.3"; + name = "libnetfilter_queue-${version}"; src = fetchurl { - url = "ftp://ftp.netfilter.org/pub/libnetfilter_queue/${name}.tar.bz2"; - sha256 = "0chsmj9ky80068vn458ijz9sh4sk5yc08dw2d6b8yddybpmr1143"; + url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${name}.tar.bz2"; + sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch b/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch new file mode 100644 index 0000000000000000000000000000000000000000..074bef42b97ab2f66e7435ea957d9e2116281c65 --- /dev/null +++ b/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch @@ -0,0 +1,499 @@ +From patchwork Fri Apr 3 22:04:46 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: Use stdlib uint* instead of u_int* +From: Nathan McSween +X-Patchwork-Id: 458131 +X-Patchwork-Delegate: pablo@netfilter.org +Message-Id: <1428098686-17843-1-git-send-email-nwmcsween@gmail.com> +To: netfilter-devel@vger.kernel.org +Cc: Nathan McSween +Date: Fri, 3 Apr 2015 22:04:46 +0000 + +Signed-off-by: Nathan McSween +--- + include/libnfnetlink/libnfnetlink.h | 25 +++++----- + include/libnfnetlink/linux_nfnetlink.h | 11 +++-- + include/libnfnetlink/linux_nfnetlink_compat.h | 6 ++- + src/iftable.c | 9 ++-- + src/iftable.h | 6 ++- + src/libnfnetlink.c | 71 ++++++++++++++------------- + src/rtnl.c | 5 +- + src/rtnl.h | 3 +- + 8 files changed, 73 insertions(+), 63 deletions(-) + +diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h +index 1d8c49d..cd0be3d 100644 +--- a/include/libnfnetlink/libnfnetlink.h ++++ b/include/libnfnetlink/libnfnetlink.h +@@ -15,6 +15,7 @@ + #define aligned_u64 unsigned long long __attribute__((aligned(8))) + #endif + ++#include + #include /* for sa_family_t */ + #include + #include +@@ -55,7 +56,7 @@ struct nfnlhdr { + struct nfnl_callback { + int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); + void *data; +- u_int16_t attr_count; ++ uint16_t attr_count; + }; + + struct nfnl_handle; +@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); + extern int nfnl_close(struct nfnl_handle *); + + extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, +- u_int8_t, u_int8_t, ++ uint8_t, uint8_t, + unsigned int); + extern void nfnl_subsys_close(struct nfnl_subsys_handle *); + +@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, + const struct iovec *iov, unsigned int num, + unsigned int flags); + extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, +- unsigned int, u_int8_t, u_int16_t, u_int16_t, +- u_int16_t); ++ unsigned int, uint8_t, uint16_t, uint16_t, ++ uint16_t); + extern __attribute__((deprecated)) int + nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, + unsigned, struct nlmsghdr *, +@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, + /* receiving */ + extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); + extern int nfnl_callback_register(struct nfnl_subsys_handle *, +- u_int8_t type, struct nfnl_callback *cb); +-extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); ++ uint8_t type, struct nfnl_callback *cb); ++extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); + extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); + + /* parsing */ +@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); + + /* nfnl attribute handling functions */ + extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); +-extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); +-extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); +-extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); ++extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); ++extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); ++extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); + extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); +-extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); +-extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); ++extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); ++extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); + extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + #define nfnl_parse_nested(tb, max, nfa) \ + nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) +@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) + + extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, ++ uint16_t type, uint32_t len, + unsigned char *val); + extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, + unsigned int size); +diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h +index 76a8550..7b843c6 100644 +--- a/include/libnfnetlink/linux_nfnetlink.h ++++ b/include/libnfnetlink/linux_nfnetlink.h +@@ -1,5 +1,6 @@ + #ifndef _NFNETLINK_H + #define _NFNETLINK_H ++#include + #include + #include + +@@ -25,9 +26,9 @@ enum nfnetlink_groups { + /* General form of address family dependent message. + */ + struct nfgenmsg { +- u_int8_t nfgen_family; /* AF_xxx */ +- u_int8_t version; /* nfnetlink version */ +- u_int16_t res_id; /* resource id */ ++ uint8_t nfgen_family; /* AF_xxx */ ++ uint8_t version; /* nfnetlink version */ ++ uint16_t res_id; /* resource id */ + }; + + #define NFNETLINK_V0 0 +@@ -59,7 +60,7 @@ struct nfnl_callback + int (*call)(struct sock *nl, struct sk_buff *skb, + struct nlmsghdr *nlh, struct nlattr *cda[]); + const struct nla_policy *policy; /* netlink attribute policy */ +- const u_int16_t attr_count; /* number of nlattr's */ ++ const uint16_t attr_count; /* number of nlattr's */ + }; + + struct nfnetlink_subsystem +@@ -76,7 +77,7 @@ extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); + extern int nfnetlink_has_listeners(unsigned int group); + extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, + int echo); +-extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); ++extern int nfnetlink_unicast(struct sk_buff *skb, uint32_t pid, int flags); + + #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ + MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) +diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h +index e145176..cd094fc 100644 +--- a/include/libnfnetlink/linux_nfnetlink_compat.h ++++ b/include/libnfnetlink/linux_nfnetlink_compat.h +@@ -3,6 +3,8 @@ + #ifndef __KERNEL__ + /* Old nfnetlink macros for userspace */ + ++#include ++ + /* nfnetlink groups: Up to 32 maximum */ + #define NF_NETLINK_CONNTRACK_NEW 0x00000001 + #define NF_NETLINK_CONNTRACK_UPDATE 0x00000002 +@@ -20,8 +22,8 @@ + + struct nfattr + { +- u_int16_t nfa_len; +- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest ++ uint16_t nfa_len; ++ uint16_t nfa_type; /* we use 15 bits for the type, and the highest + * bit to indicate whether the payload is nested */ + }; + +diff --git a/src/iftable.c b/src/iftable.c +index 5976ed8..3411c4c 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -9,6 +9,7 @@ + /* IFINDEX handling */ + + #include ++#include + #include + #include + #include +@@ -27,10 +28,10 @@ + struct ifindex_node { + struct list_head head; + +- u_int32_t index; +- u_int32_t type; +- u_int32_t alen; +- u_int32_t flags; ++ uint32_t index; ++ uint32_t type; ++ uint32_t alen; ++ uint32_t flags; + char addr[8]; + char name[16]; + }; +diff --git a/src/iftable.h b/src/iftable.h +index 8df7f24..0cc5335 100644 +--- a/src/iftable.h ++++ b/src/iftable.h +@@ -1,8 +1,10 @@ + #ifndef _IFTABLE_H + #define _IFTABLE_H + +-int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); +-int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); ++#include ++ ++int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); ++int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); + + int iftable_init(void); + void iftable_fini(void); +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 398b7d7..b8958dc 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -36,6 +36,7 @@ + * minor cleanups + */ + ++#include + #include + #include + #include +@@ -72,9 +73,9 @@ + + struct nfnl_subsys_handle { + struct nfnl_handle *nfnlh; +- u_int32_t subscriptions; +- u_int8_t subsys_id; +- u_int8_t cb_count; ++ uint32_t subscriptions; ++ uint8_t subsys_id; ++ uint8_t cb_count; + struct nfnl_callback *cb; /* array of callbacks */ + }; + +@@ -86,11 +87,11 @@ struct nfnl_handle { + int fd; + struct sockaddr_nl local; + struct sockaddr_nl peer; +- u_int32_t subscriptions; +- u_int32_t seq; +- u_int32_t dump; +- u_int32_t rcv_buffer_size; /* for nfnl_catch */ +- u_int32_t flags; ++ uint32_t subscriptions; ++ uint32_t seq; ++ uint32_t dump; ++ uint32_t rcv_buffer_size; /* for nfnl_catch */ ++ uint32_t flags; + struct nlmsghdr *last_nlhdr; + struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; + }; +@@ -145,7 +146,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) + static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) + { + int i, err; +- u_int32_t new_subscriptions = nfnlh->subscriptions; ++ uint32_t new_subscriptions = nfnlh->subscriptions; + + for (i = 0; i < NFNL_MAX_SUBSYS; i++) + new_subscriptions |= nfnlh->subsys[i].subscriptions; +@@ -273,8 +274,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) + * a valid address that points to a nfnl_subsys_handle structure is returned. + */ + struct nfnl_subsys_handle * +-nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, +- u_int8_t cb_count, u_int32_t subscriptions) ++nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, ++ uint8_t cb_count, uint32_t subscriptions) + { + struct nfnl_subsys_handle *ssh; + +@@ -435,10 +436,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, + */ + void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, + struct nlmsghdr *nlh, unsigned int len, +- u_int8_t family, +- u_int16_t res_id, +- u_int16_t msg_type, +- u_int16_t msg_flags) ++ uint8_t family, ++ uint16_t res_id, ++ uint16_t msg_type, ++ uint16_t msg_flags) + { + assert(ssh); + assert(nlh); +@@ -849,14 +850,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr ++ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header + * @type: type of new attribute + * @data: content of new attribute + */ +-int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) ++int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) + { + assert(n); + assert(maxlen > 0); +@@ -866,7 +867,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + } + + /** +- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr ++ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -875,7 +876,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + * + */ + int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -885,7 +886,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr ++ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -894,7 +895,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(n); + assert(maxlen > 0); +@@ -904,7 +905,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + } + + /** +- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr ++ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -913,7 +914,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + * + */ + int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -923,7 +924,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr ++ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -932,7 +933,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(n); + assert(maxlen > 0); +@@ -980,7 +981,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) + * + */ + void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, unsigned char *val) ++ uint16_t type, uint32_t len, unsigned char *val) + { + assert(iov); + assert(nfa); +@@ -1115,7 +1116,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, + * appropiately. + */ + int nfnl_callback_register(struct nfnl_subsys_handle *ssh, +- u_int8_t type, struct nfnl_callback *cb) ++ uint8_t type, struct nfnl_callback *cb) + { + assert(ssh); + assert(cb); +@@ -1138,7 +1139,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, + * On sucess, 0 is returned. On error, -1 is returned and errno is + * set appropiately. + */ +-int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) ++int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) + { + assert(ssh); + +@@ -1161,8 +1162,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, + assert(nfa); + + int min_len; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + const struct nfnl_subsys_handle *ssh; + struct nfnl_callback *cb; + +@@ -1212,8 +1213,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, + int len) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + int err = 0; + + if (subsys_id > NFNL_MAX_SUBSYS) +@@ -1243,7 +1244,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) + { + + while (len >= NLMSG_SPACE(0)) { +- u_int32_t rlen; ++ uint32_t rlen; + struct nlmsghdr *nlh = (struct nlmsghdr *)buf; + + if (nlh->nlmsg_len < sizeof(struct nlmsghdr) +@@ -1285,8 +1286,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) + static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + + /* Is this an error message? */ + if (nfnl_is_error(h, nlh)) { +diff --git a/src/rtnl.c b/src/rtnl.c +index 7b4ac7d..34802fe 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -11,6 +11,7 @@ + /* rtnetlink - routing table netlink interface */ + + #include ++#include + #include + #include + #include +@@ -30,7 +31,7 @@ + #define rtnl_log(x, ...) + + static inline struct rtnl_handler * +-find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) ++find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) + { + struct rtnl_handler *h; + for (h = rtnl_handle->handlers; h; h = h->next) { +@@ -41,7 +42,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) + } + + static int call_handler(struct rtnl_handle *rtnl_handle, +- u_int16_t type, ++ uint16_t type, + struct nlmsghdr *hdr) + { + struct rtnl_handler *h = find_handler(rtnl_handle, type); +diff --git a/src/rtnl.h b/src/rtnl.h +index 0c403dc..9858ae5 100644 +--- a/src/rtnl.h ++++ b/src/rtnl.h +@@ -1,13 +1,14 @@ + #ifndef _RTNL_H + #define _RTNL_H + ++#include + #include + #include + + struct rtnl_handler { + struct rtnl_handler *next; + +- u_int16_t nlmsg_type; ++ uint16_t nlmsg_type; + int (*handlefn)(struct nlmsghdr *h, void *arg); + void *arg; + }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index be60612a4ff2eabc7e8883a62687cad906bb57e2..5395b5b2e99c85415b3eae6a953031505ac55959 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"; }; + patches = [ + ./Use-stdlib-uint-instead-of-u_int.patch + ]; + meta = { description = "Low-level library for netfilter related kernel/userspace communication"; longDescription = '' diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index d9149a1fbac523b81feeb92db9ed5fdc55586fb0..2955aaebc010276832768d18a93e8cfc63ea4a92 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare"; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 074c1a9dfd2863774300283f752588259e1a25c9..ad8c7626661ebc8d21209fbb7171ec62a8c96336 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnftnl-1.0.7"; + version = "1.0.9"; + name = "libnftnl-${version}"; src = fetchurl { - url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "10irjrylcfkbp11617yr19vpfhgl54w0kw02jhj0i1abqv5nxdlv"; + url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; + sha256 = "0d9nkdbdck8sg6msysqyv3m9kjr9sjif5amf26dfa0g3mqjdihgy"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b6d5912581ba0e3e603ce7954c5fc85f7c44eedb --- /dev/null +++ b/pkgs/development/libraries/libngspice/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, bison, flex, fftw}: + +# Note that this does not provide the ngspice command-line utility. For that see +# the ngspice derivation. +stdenv.mkDerivation { + name = "libngspice-26"; + + src = fetchurl { + url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz"; + sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108"; + }; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ fftw ]; + + configureFlags = [ "--with-ngshared" "--enable-xspice" "--enable-cider" ]; + + meta = with stdenv.lib; { + description = "The Next Generation Spice (Electronic Circuit Simulator)"; + homepage = http://ngspice.sourceforge.net; + license = with licenses; [ "BSD" gpl2 ]; + maintainers = with maintainers; [ bgamari ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 7e9ae1608d2b74f4d59a6dd1aeb60363528e1302..c7967c3fb6fc951c1a0d8fa169b8b19f27069abe 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1, gnutls }: +{ stdenv, fetchurl, pkgconfig, glib, gupnp-igd, gst_all_1, gnutls }: stdenv.mkDerivation rec { name = "libnice-0.1.14"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; - propagatedBuildInputs = [ glib gupnp_igd ]; + propagatedBuildInputs = [ glib gupnp-igd ]; meta = { homepage = https://nice.freedesktop.org/wiki/; diff --git a/pkgs/development/libraries/libnsl/cdefs.patch b/pkgs/development/libraries/libnsl/cdefs.patch new file mode 100644 index 0000000000000000000000000000000000000000..dbbe800a347956fd47f0da3ec3c281afdd67f35b --- /dev/null +++ b/pkgs/development/libraries/libnsl/cdefs.patch @@ -0,0 +1,30 @@ +--- a/src/rpcsvc/nislib.h ++++ b/src/rpcsvc/nislib.h +@@ -19,6 +19,7 @@ + #ifndef __RPCSVC_NISLIB_H__ + #define __RPCSVC_NISLIB_H__ + ++#include + #include + + __BEGIN_DECLS +--- a/src/rpcsvc/ypclnt.h ++++ b/src/rpcsvc/ypclnt.h +@@ -20,6 +20,7 @@ + #ifndef __RPCSVC_YPCLNT_H__ + #define __RPCSVC_YPCLNT_H__ + ++#include + #include + + /* Some defines */ +--- a/src/rpcsvc/ypupd.h ++++ b/src/rpcsvc/ypupd.h +@@ -33,6 +33,7 @@ + #ifndef __RPCSVC_YPUPD_H__ + #define __RPCSVC_YPUPD_H__ + ++#include + #include + + #include diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index d4af280c3cd8f89ea76549cb558cf833d5723255..9e8a46b2e6b313843c674f1f5c6c4610556d8db0 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libtirpc ]; + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ./cdefs.patch ./nis_h.patch ]; + meta = with stdenv.lib; { description = "Client interface library for NIS(YP) and NIS+"; homepage = https://github.com/thkukuk/libnsl; diff --git a/pkgs/development/libraries/libnsl/nis_h.patch b/pkgs/development/libraries/libnsl/nis_h.patch new file mode 100644 index 0000000000000000000000000000000000000000..199259df2e8dc61724cb6d7186467542e1eaf16d --- /dev/null +++ b/pkgs/development/libraries/libnsl/nis_h.patch @@ -0,0 +1,45 @@ +--- a/src/rpcsvc/nis.h ++++ b/src/rpcsvc/nis.h +@@ -32,6 +32,7 @@ + #ifndef _RPCSVC_NIS_H + #define _RPCSVC_NIS_H 1 + ++#include + #include + #include + #include +@@ -56,6 +57,34 @@ + * + */ + ++#ifndef rawmemchr ++#define rawmemchr(s,c) memchr((s),(size_t)-1,(c)) ++#endif ++ ++#ifndef __asprintf ++#define __asprintf asprintf ++#endif ++ ++#ifndef __mempcpy ++#define __mempcpy mempcpy ++#endif ++ ++#ifndef __strtok_r ++#define __strtok_r strtok_r ++#endif ++ ++#ifndef __always_inline ++#define __always_inline __attribute__((__always_inline__)) ++#endif ++ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(exp) ({ \ ++typeof (exp) _rc; \ ++ do { \ ++ _rc = (exp); \ ++ } while (_rc == -1 && errno == EINTR); \ ++ _rc; }) ++#endif + + #ifndef __nis_object_h + #define __nis_object_h diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 77c049949564752fa0c2c286e1065fca69f1ed9d..1c8f33d82f72d4d291bb0a6f91778959cd80baca 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.10"; + name = "libofx-0.9.12"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "15gnbh4mszfxk70srdcjkdykk7dbhzqxi3pxgh48a9zg8i4nmqjl"; + sha256 = "0wvkgffq9qjhjrggg8r1nbhmw65j3lcl4y4cdpmmkrqiz9ia0py1"; }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index c5cb85d91ba2700404c798955418eb1ec55af325..8bf62890fac444fd9463b2f9dba4775910a8e489 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libogg-1.3.2"; + name = "libogg-1.3.3"; src = fetchurl { url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; - sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z"; + sha256 = "022wjlzn8fx7mfby4pcgyjwx8zir7jr7cizichh3jgaki8bwcgsg"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 5140402eacb9a9dede87b9b46baf43bf397dba21..28c8a915c63572210590ba3dabec114d5f0874cf 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${name}.tar.gz"; sha256 = "0k6p6h4npn8p1qlgq6z3jbfld6n1bqswzvxzndki937gr0lhfg2r"; }; - + + configureFlags = + stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ]; + patches = [ ./fedora-fixes.patch ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c918c61abf0d64a8d9023ae4b86f4fb7f7319c6a --- /dev/null +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -0,0 +1,44 @@ +{ stdenv, buildPackages +, fetchurl, autoreconfHook264, bison, binutils-unwrapped +, libiberty, libbfd +}: + +stdenv.mkDerivation rec { + name = "libopcodes-${version}"; + inherit (binutils-unwrapped) version src; + + outputs = [ "out" "dev" ]; + + patches = binutils-unwrapped.patches ++ [ + ../../tools/misc/binutils/build-components-separately.patch + ]; + + # We just want to build libopcodes + postPatch = '' + cd opcodes + find . ../include/opcode -type f -exec sed {} -i -e 's/"bfd.h"//' \; + ''; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ autoreconfHook264 bison ]; + buildInputs = [ libiberty ]; + # dis-asm.h includes bfd.h + propagatedBuildInputs = [ libbfd ]; + + configurePlatforms = [ "build" "host" ]; + configureFlags = [ + "--enable-targets=all" "--enable-64-bit-bfd" + "--enable-install-libbfd" + "--enable-shared" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A library from binutils for manipulating machine code"; + homepage = http://www.gnu.org/software/binutils/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ericson2314 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index db534d20c89cfb1e0a7c10611f595cf0a8c33119..0175e21bbc72978c2b83e39a74746ef664d3e1e7 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,23 +1,43 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, libsoup -, libxslt, check, vala_0_23 ? null +{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl +, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: stdenv.mkDerivation rec { - name = "libosinfo-0.2.12"; + name = "libosinfo-1.1.0"; src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/libosinfo/${name}.tar.gz"; - sha256 = "1vcg8ylh7q69s9y6hj94dqfffwfbann3i28yqgfc01navf6yl07s"; + url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; + sha256 = "0diigllgni6m0sc2h8aid6hmyaq9qb54pm5305m0irfsm2j463v0"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - intltool gobjectIntrospection libsoup libxslt check vala_0_23 + outputs = [ "out" "dev" "devdoc" ]; + + nativeBuildInputs = [ + pkgconfig vala intltool gobjectIntrospection gtk-doc docbook_xsl + ] ++ stdenv.lib.optionals doCheck checkInputs; + checkInputs = [ check curl perl ]; + buildInputs = [ glib libsoup libxml2 libxslt ]; + + patches = [ + ./osinfo-db-data-dir.patch + ]; + + postPatch = '' + patchShebangs . + substituteInPlace osinfo/osinfo_loader.c --subst-var-by OSINFO_DB_DATA_DIR "${osinfo-db}/share" + ''; + + configureFlags = [ + "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids" + "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids" + "--enable-gtk-doc" ]; + doCheck = true; + meta = with stdenv.lib; { - description = "Info about OSs, hypervisors and (virtual) hardware devices"; - homepage = http://libosinfo.org/; + description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; + homepage = https://libosinfo.org/; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch b/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch new file mode 100644 index 0000000000000000000000000000000000000000..8d202a92d095b8fb33a8c72c709269a40597c3f2 --- /dev/null +++ b/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch @@ -0,0 +1,11 @@ +--- a/osinfo/osinfo_loader.c ++++ b/osinfo/osinfo_loader.c +@@ -2304,7 +2304,7 @@ + } else { + path = g_getenv("OSINFO_SYSTEM_DIR"); + if (!path) +- path = DATA_DIR "/osinfo"; ++ path = "@OSINFO_DB_DATA_DIR@/osinfo"; + + file = g_file_new_for_path(path); + } diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index aaa1abacab800f2aaca462c5cb69044075b45199..1304aff9e3b3ca6e67426828415c63a160f9d4b0 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libowfat-0.29"; + name = "libowfat-0.31"; src = fetchurl { - url = "http://dl.fefe.de/${name}.tar.bz2"; - sha256 = "09v4phf1d4y617fdqwn214jmkialf7xqcsyx3rzk7x5ysvpbvbab"; + url = "https://www.fefe.de/libowfat/${name}.tar.xz"; + sha256 = "04lagr62bd2cr0k8h59qfnx2klh2cf73k5kxsx8xrdybzhfarr6i"; }; makeFlags = "prefix=$(out)"; - + meta = with stdenv.lib; { homepage = http://www.fefe.de/libowfat/; license = licenses.gpl2; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 26e754317df07557b98f82788617047f45a251f0..54e2616e782ff63256db79039e1b36150d3e6808 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libp11-${version}"; - version = "0.4.4"; + version = "0.4.7"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; rev = name; - sha256 = "1jnpnwipmw3skw112qff36w046nyz5amiil228rn5divpkvx4axa"; + sha256 = "0n1i0pxj6l0vdq8gpdwfp5p9qd7wkymg0lpy6a17ix8hpqsljlhr"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 6d7606428f6907779b3e7eee95976891607a5856..cf97744069b30a588aa80e918113811b1222f3ca 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { patches = [ ./libpar2-0.4-external-verification.patch ]; + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + meta = { homepage = http://parchive.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 0cd9d758725c213d609fa67515f53d4536b8c9ae..bef5f9a9da34cd7a72d8a82982b50272cee7dba2 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -26,6 +26,15 @@ stdenv.mkDerivation rec { url = "https://sources.debian.net/data/main/libp/libpcap/1.8.1-3/debian/patches/disable-remote.diff"; sha256 = "0dvjax9c0spvq8cdjnkbnm65wlzaml259yragf95kzg611vszfmj"; }) + # See https://github.com/wjt/bustle/commit/f62cf6bfa662af4ae39effbbd4891bc619e3b4e9 + (fetchpatch { + url = "https://github.com/the-tcpdump-group/libpcap/commit/2be9c29d45fb1fab8e9549342a30c160b7dea3e1.patch"; + sha256 = "1g8mh942vr0abn48g0bdvi4gmhq1bz0l80276603y7064qhy3wq5"; + }) + (fetchpatch { + url = "https://github.com/the-tcpdump-group/libpcap/commit/1a6b088a88886eac782008f37a7219a32b86da45.patch"; + sha256 = "1n5ylm7ch3i1lh4y2q16b0vabgym8g8mqiqxpqcdkjdn05c1wflr"; + }) ]; preInstall = ''mkdir -p $out/bin''; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 34b09d45044dd7ad2b69c320e75cf3bfbd013151..a74d838e2eb6cbff05e37db0356a479184a39d09 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.8.0"; + version = "4.9.0"; name = "libpfm-${version}"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; - sha256 = "0s6gcvrhj2h928cqc8399189annif7yl74k6wda446r0fdx7i4wi"; + sha256 = "1qp4g4n6dw42p2w5rkwzdb7ynk8h7g5vg01ybpmvxncgwa7bw3yv"; }; installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index 15d1419904176d53c369c23b0af6583d3db6c8b0..26694eb37770a4a85b3de2a1161b0d062d4c9f6a 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -2,14 +2,13 @@ let modelData = fetchurl { - url = "mirror://sourceforge/libpinyin/models/model12.text.tar.gz"; - sha256 = "1fijhhnjgj8bj1xr5pp7c4qxf11cqybgfqg7v36l3x780d84hfnd"; + url = "mirror://sourceforge/libpinyin/models/model14.text.tar.gz"; + sha256 = "0qqk30nflj07zjhs231c95ln4yj4ipzwxxiwrxazrg4hb8bhypqq"; }; in - stdenv.mkDerivation rec { name = "libpinyin-${version}"; - version = "1.6.0"; + version = "2.1.91"; nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { owner = "libpinyin"; repo = "libpinyin"; rev = version; - sha256 = "0k40a7wfp8zj9d426afv0am5sr3m2i2p309fq0vf8qrb050hj17f"; + sha256 = "0jbvn65p3zh0573hh27aasd3qly5anyfi8jnps2dxi0my09wbrq3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index 4da6a0b3cbc77613f8abfe36eac2bbca3aa78f03..e11527ca10c9134e15085673b8980ea6b5051506 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: - + stdenv.mkDerivation rec { - name = "libpipeline-1.4.1"; - + name = "libpipeline-1.5.0"; + src = fetchurl { url = "mirror://savannah/libpipeline/${name}.tar.gz"; - sha256 = "1vmrs4nvdsmb550bk10cankrd42ffczlibpsnafxpak306rdfins"; + sha256 = "0avg525wvifcvjrwa6i1r6kvahmsswj0mpxrsxzzdzra9wpf2whd"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index c4a6a246b9092bab5b8b6a951ad798017e097d5d..5ad9cf1e7b771a867c8310471766b9d432bca893 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -30,7 +30,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 = hostPlatform == buildPlatform; + doCheck = true; # not cross; passthru = { inherit zlib; }; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 51cb1c48e54c17eeaca27d2892734f5fde7d4f8e..a6dd719a38123dc56f6eca8397e3dd52a4f44572 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchurl, postgresql, python2, gnused }: +{ lib, stdenv, fetchFromGitHub, postgresql, doxygen, xmlto, python2, gnused }: stdenv.mkDerivation rec { - name = "libpqxx-4.0.1"; + name = "libpqxx-${version}"; + version = "6.2.2"; - src = fetchurl { - url = "http://pqxx.org/download/software/libpqxx/${name}.tar.gz"; - sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09"; + src = fetchFromGitHub { + owner = "jtv"; + repo = "libpqxx"; + rev = version; + sha256 = "0f7mkl29v6d47kkdpl2gkb9xc5lnih2pq9pk3cq6nc2j6w758yp5"; }; - buildInputs = [ postgresql python2 gnused ]; + nativeBuildInputs = [ gnused python2 ]; + buildInputs = [ postgresql doxygen xmlto ]; preConfigure = '' patchShebangs . diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 614890e929f7499ada617e4264723a9df18730d3..bf9e2d079cd6e9991f9d9edb639ca2b613560bf4 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, zlib +, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 +, SystemConfiguration, CoreFoundation, JavaScriptCore }: stdenv.mkDerivation rec { name = "libproxy-${version}"; @@ -16,7 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager spidermonkey_38 pcre python2 python3 ]; + buildInputs = [ pcre python2 python3 zlib ] + ++ (if stdenv.hostPlatform.isDarwin + then [ SystemConfiguration CoreFoundation JavaScriptCore ] + else [ spidermonkey_38 dbus networkmanager ]); preConfigure = '' cmakeFlagsArray+=( @@ -27,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; homepage = http://libproxy.github.io/libproxy/; description = "A library that provides automatic proxy configuration management"; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index c35c7e1bc0f5380963fe27bdcfd6a358bceeb198..f5c92e11c357566f870bc2216ead1b5b53baa136 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu +{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk-doc, icu , libxslt, pkgconfig, python2 }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ icu libxslt ]; - nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl gtk-doc pkgconfig python2 ]; postPatch = '' substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h @@ -64,6 +64,5 @@ in stdenv.mkDerivation rec { homepage = http://rockdaboot.github.io/libpsl/; license = licenses.mit; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index b19008449abe62bcb9c49f4873b3baffbe42ddc1..cb30a890f401b887dbe29e1356ab1f978b5f0fdf 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.70"; + name = "libpst-0.6.71"; src = fetchurl { url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "1m378vxh1sf9ry8k11x773xpy5f6cab5gkzqglz0jp9hc431r60r"; + sha256 = "130nksrwgi3ih32si5alvxwzd5kmlg8yi7p03w0h7w9r3b90i4pv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 0e67f970b763000571816b12ac5a64e9f9d0c891..1b15769465e1d73c8133cc3ad20372a47c6d5fdd 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "2.1.0"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "036f284bssvavyz6pgpcdafvxa59h2wdrh8xl7nmxxnw9v7n2n7l"; + sha256 = "1wrd9ajf00h1ja56r25vljjsgklg0qlzmziax7x26wjqkigc28iq"; }; outputs = [ "out" "dev" "doc" ]; @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { substituteInPlace libqalculate/Calculator.cc \ --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ --replace '"gnuplot -"' '"${gnuplot}/bin/gnuplot -"' + '' + stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/qalc.cc \ + --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))' ''; preBuild = '' diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index eef9e05ca03657cadbc6f4d82f00d8e0f39bdba2..e68c5052beb8bb6b39126d35f9221b4c5a81e843 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { name = "libqglviewer-2.6.3"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; }; - buildInputs = [ qt4 qmake4Hook ]; + buildInputs = [ qt4 qmake4Hook ] + ++ stdenv.lib.optional stdenv.isDarwin AGL; postPatch = '' diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f537013d2fecf58de56c1db9939f35ac280ab4c0 --- /dev/null +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, cmake +, qtbase }: + +# This doesn't actually do anything really yet as it doesn't support dynamic building +# When it does, quaternion and tensor should use it + +stdenv.mkDerivation rec { + name = "libqmatrixclient-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "QMatrixClient"; + repo = "libqmatrixclient"; + rev = "v${version}-q0.0.5"; + sha256 = "1m53yxsqjxv2jq0h1xipwsgaj5rca4fk4cl3azgvmf19l9yn00ck"; + }; + + buildInputs = [ qtbase ]; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/lib *.a + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description= "A Qt5 library to write cross-platfrom clients for Matrix"; + homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index afa8a0451ac06e1d4311117266d9b73cd104d04e..a0f5ac7376792ab3cd37f37daa10e67226792366 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }: stdenv.mkDerivation rec { - name = "libqmi-1.18.0"; + name = "libqmi-1.20.0"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "1v4cz3nsmh7nn3smhlhwzrb7yh6l1f270bwf40qacxayjdajr950"; + sha256 = "1d3fca477sdwbv4bsq1cl98qc8sixrzp0gqjcmjj8mlwfk9qqhi1"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix index 337d9423aa3df00dd2b83b31e365bab0f7050831..7c1844bf281e18b9fb04f838cf83a5c9fc085c98 100644 --- a/pkgs/development/libraries/libqrencode/default.nix +++ b/pkgs/development/libraries/libqrencode/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "libqrencode-${version}"; - version = "3.4.4"; + version = "4.0.0"; src = fetchurl { url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; sha1 = "644054a76c8b593acb66a8c8b7dcf1b987c3d0b2"; - sha256 = "0wiagx7i8p9zal53smf5abrnh9lr31mv0p36wg017401jrmf5577"; + sha256 = "10da4q5pym7pzxcv21w2kc2rxmq7sp1rg58zdklwfr0jjci1nqjv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 93d8ced49cea926a74e84e7d98138730cf03a3d8..b291ec2fdf0b9aa044deb0b9028ab60cd0239b1f 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools -, mesa, libX11 +, libGLU_combined, libX11 , libass, openal, ffmpeg, libuchardet , alsaLib, libpulseaudio, libva }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase qtmultimedia qtquick1 - mesa libX11 + libGLU_combined libX11 libass openal ffmpeg libuchardet alsaLib libpulseaudio libva ]; @@ -28,9 +28,9 @@ mkDerivation rec { }; # 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"]; + # by adding libGLU_combined to rpath. Not sure why it wasn't done automatically like + # the other libraries as `libGLU_combined` is part of our `buildInputs`. + NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGLU_combined}/lib"]; preFixup = '' mkdir -p "$out/bin" diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 0b88cd02df700968a03f29821dd1515c953e57bd..d4ad1c038601739326fab15ec7d7059eb8948538 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.18.5"; + version = "0.18.8"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "0y519nlvl4bfnnxbwry35f6gbcv6jbbpd2lmiwv6pbyzv4a7saps"; + sha256 = "1qi0fkw2zmd0yplrf79z7lgpz0hxl45dj5rdgpaj7283jzys9b2n"; }; outputs = [ "out" "lib" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index c767ef9a9ea7ff3d1e7d9bad9e96fb6014760231..39d5c64f64fcc4b9e6d56b1c1d44de42e887b634 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libraw1394-2.1.1"; + name = "libraw1394-2.1.2"; src = fetchurl { url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz"; - sha256 = "0x6az154wr7wv3945485grjvpk604khv34dbaph6vmc1zdasqq59"; + sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 56272b319917d556aff41da149d8e4e0e282ffcc..ceff244670f36a7b61349fc83ec92416de777741 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }: stdenv.mkDerivation rec { - name = "rasqal-0.9.32"; + name = "rasqal-0.9.33"; src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "eeba03218e3b7dfa033934d523a1a64671a9a0f64eadc38a01e4b43367be2e8f"; + sha256 = "0z6rrwn4jsagvarg8d5zf0j352kjgi33py39jqd29gbhcnncj939"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 8e6fa005635fbab3f9333bb49336793dc4b85a3b..402af5d6f5830d05dd8ac44855bbbaef4129cf89 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl libxslt curl pcre libxml2 ] - ++ stdenv.lib.optional withMysql mysql + ++ stdenv.lib.optional withMysql mysql.connector-c ++ stdenv.lib.optional withSqlite sqlite ++ stdenv.lib.optional withPostgresql postgresql ++ stdenv.lib.optional withBdb db; diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix index 791e59cbc906a9a731b49a7008cf5eb698c4d640..3b84ead7cec15e4afdc64d0c53d9843a80ac3b72 100644 --- a/pkgs/development/libraries/librdmacm/default.nix +++ b/pkgs/development/libraries/librdmacm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "librdmacm-${version}"; - version = "1.0.21"; + version = "1.1.0"; src = fetchurl { url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz"; - sha256 = "0yx2wr5dvmf5apvc4f4r2f2mlvn05piwvxsqfb60p3rk4jfx56dx"; + sha256 = "1ic0qd5ayvkybh4pxc5qx7sqvny1fv4anhxlf1nmsn0h926q844g"; }; buildInputs = [ libibverbs ]; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 8bef305a0ecc22dc10a70f2c778d22afff905da4..ebe765a0d0d4df5e44e6ef2e14351aa40bd78c74 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,16 +1,13 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.5.1"; + version = "0.5.7"; name = "libre-${version}"; - src=fetchurl { + src = fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "1qs6gpflgwic2pp1nplhhyl585h9q0kf74h5z29ajr5ij0j65rsa"; + sha256 = "0f8h224xfzvnb2ngvhxz8gzxqjlkkfr6d0nj8zqivzr81ihibk2x"; }; - buildInputs = [zlib openssl]; - makeFlags = [ - "USE_ZLIB=1" "USE_OPENSSL=1" - ''PREFIX=$(out)'' - ] + buildInputs = [ zlib openssl ]; + makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" ; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index adc00b56a287071ffd48aead68723c79f765b8fc..55bb22e660b043eb8fc265c7551f10ae48c60c61 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.12"; + name = "librelp-1.2.15"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "1mvvxqfsfg96rb6xv3fw7mcsqmyfnsb74sc53gnhpcpp4h2p6m83"; + sha256 = "16d9km99isa4mwk6psf8brny1sfl45dijlkdwzp0yrjnj0nq6cd9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index a3e98d260cea8e4e10e33a6d636244d512ce4948..f6e041e57322cc7b7ce3d75e711cca261e9bea23 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.5.2"; name = "librem-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; - sha256 = "1n1ajy1ccw0xw6bndad4js2pnj977s2angzs7lawadh7x5wnalbb"; + sha256 = "1sv4986yyq42irk9alwp20gc3r5y0r6kix15sl8qmljgxn0lxigv"; }; buildInputs = [zlib openssl libre]; makeFlags = [ diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index c74a7981458d58f437339ba524d3f910ca8ca59f..5b3beda1eb8bad2b60c55f7a377d7afe26105d1d 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "librep-${version}"; - version = "0.92.6"; + version = "0.92.7"; sourceName = "librep_${version}"; src = fetchurl { url = "http://download.tuxfamily.org/librep/${sourceName}.tar.xz"; - sha256 = "1k6c0hmyzxh8459r790slh9vv9vwy9d7w3nlmrqypbx9mk855hgy"; + sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/librep/setup-hook.sh b/pkgs/development/libraries/librep/setup-hook.sh index 420d63d6c5132977e2bb459f0c5718a79774fd03..4d875b6933040468701076842681740110099152 100644 --- a/pkgs/development/libraries/librep/setup-hook.sh +++ b/pkgs/development/libraries/librep/setup-hook.sh @@ -2,4 +2,4 @@ addRepDLLoadPath () { addToSearchPath REP_DL_LOAD_PATH $1/lib/rep } -envHooks+=(addRepDLLoadPath) +addEnvHooks "$hostOffset" addRepDLLoadPath diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 4818a720a30c6da4effdfe1efed475e6ad9fd208..ae03ef7ecb976fa09a8efa991a2949bb6b00f6ef 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -33,7 +33,7 @@ in { }; libressl_2_6 = generic { - version = "2.6.2"; - sha256 = "0y64grb2zx98rjp2lbwihyhbml4z5ih3v7ydbxdvmabj5d4x4adh"; + version = "2.6.4"; + sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3"; }; } diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 3523eb5c37bc544b77e5d92485d9d95e64eca735..2c6e792ae8ce0d1a6d6b19f6e6c219cc26c73096 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -21,11 +21,10 @@ stdenv.mkDerivation { inherit (s) url sha256; }; - # Clang generates warnings in Boost's header files + # Clang and gcc-7 generate warnings, and # -Werror causes these warnings to be interpreted as errors # Simplest solution: disable -Werror - configureFlags = if stdenv.cc.isClang - then [ "--disable-werror" ] else null; + configureFlags = [ "--disable-werror" ]; # Fix an issue with boost 1.59 # This is fixed upstream so please remove this when updating diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index a8877bdb2da943c47e88845c04abdd4045c89701..e6d2612fe626f3899a33d8c47baff8fab27a41e5 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "librime-${version}"; - version = "1.2.9"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rime"; repo = "librime"; - rev = "rime-${version}"; - sha256 = "14jgnfm61ynm086x9v7wfmv2p14h0qp8lq4d2jqm21n821jsraj6"; + rev = "${version}"; + sha256 = "1y0h3nnz97smx9z8h5fzk4c27mvrwv8kajxffqc43bhyvxvb2jd6"; }; nativeBuildInputs = [ cmake ]; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Rime Input Method Engine, the core library"; license = licenses.bsd3; maintainers = with maintainers; [ sifmelcara ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3993451e19f087be6baab51854e6a33adfa6a4a3 --- /dev/null +++ b/pkgs/development/libraries/libroxml/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "libroxml-2.3.0"; + src = fetchurl { + url = "http://download.libroxml.net/pool/v2.x/libroxml-2.3.0.tar.gz"; + sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x"; + }; + meta = with stdenv.lib; { + homepage = "http://www.libroxml.net/"; + description = "This library is minimum, easy-to-use, C implementation for xml file parsing."; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ mpickering ]; + }; +} diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 09a0f4444b5489ae1b94419437fc6f55f56d4a04..c2e1739117b568b767695d21fd289f751a79303e 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,33 +1,32 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintlOrEmpty, darwin +, bzip2, libcroco, libintl, darwin, rust, gnome3 , withGTK ? false, gtk3 ? null -, gobjectIntrospection ? null, enableIntrospection ? false }: - -# no introspection by default, it's too big +, vala, gobjectIntrospection }: +let + pname = "librsvg"; + version = "2.42.2"; +in stdenv.mkDerivation rec { - name = "librsvg-2.40.19"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz"; - sha256 = "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562"; }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - outputs = [ "out" "dev" ]; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] - ++ stdenv.lib.optional enableIntrospection gobjectIntrospection; + buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ]; propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobjectIntrospection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); - configureFlags = [ "--enable-introspection=auto" ] + configureFlags = [ "--enable-introspection" "--enable-vala" ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; NIX_CFLAGS_COMPILE @@ -60,7 +59,17 @@ stdenv.mkDerivation rec { rm $GDK_PIXBUF/loaders.cache.tmp ''; - meta = { - platforms = stdenv.lib.platforms.unix; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A small library to render SVG images to Cairo surfaces"; + homepage = https://wiki.gnome.org/Projects/LibRsvg; + license = licenses.lgpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 3409948f59eb753eed0735536137a0b85267bc51..80acaf57d62529f81b73b238b08d42ffc5837943 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librsync-${version}"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "0yad7nkw6d8j824qkxrj008ak2wq6yw5p894sbhr35yc1wr5mki6"; + sha256 = "1qnr4rk93mhggqjh2025clmlhhgnjhq983p1vbh8i1g8aiqdnapi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 2d8b2a3b5f15bc353b7e6c67a17020e877ee7139..540d84dc2440ff8d7799e284f189ee1c1ef73cb9 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchFromGitHub, curl, libxml2 }: stdenv.mkDerivation { - name = "libs3-2015-04-23"; + name = "libs3-2017-06-01"; src = fetchFromGitHub { owner = "bji"; repo = "libs3"; - rev = "11a4e976c28ba525e7d61fbc3867c345a2af1519"; - sha256 = "0xjjwyw14sk9am6s2m25hxi55vmsrc2yiawd6ln2lvg59xjcr48i"; + rev = "fd8b149044e429ad30dc4c918f0713cdd40aadd2"; + sha256 = "0a4c9rsd3wildssvnvph6cd11adn0p3rd4l02z03lvxkjhm20gw3"; }; buildInputs = [ curl libxml2 ]; + # added to fix build with gcc7, review on update + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; + DESTDIR = "\${out}"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 75bc9668fca11091294240654bca30dce25330ae..ec4fa6b7427aebf21fdc68a875c029a046d02c6e 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.4.5"; + version = "3.5.2"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x"; + sha256 = "1qjpicbjsj9gf8s00ma0d6kw6qfnc29fhrqdkvq8427wfffj654r"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 3898071c85829a53cc3e3eba263479080958688f..fae6dc82fcf66152014d6501d0322825029929a5 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.calrama ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 3b365c0e971265e76f6e204e1b328b8b611d3127..e0c77a0cf357c116f5451c35ea1f65fb1b9ad01c 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "3ddc8c037956c0a5ac19664ece4194743f59e1ccd4adde848f4f0dae7f77bca1"; + sha256 = "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz"; }; + outputs = [ "out" "lib" "dev" "man" ]; + buildInputs = [ getopt makeWrapper ]; patchPhase = '' @@ -23,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/seccomp/libseccomp"; license = licenses.lgpl21; platforms = platforms.linux; + badPlatforms = platforms.riscv; maintainers = with maintainers; [ thoughtpolice wkennington ]; }; } diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 0f8207e83c825678b930dd100ce45c840098d51b..b77ba49822fdbfbeee2f9113f8c911039c354f16 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc -, libgcrypt, gobjectIntrospection, vala_0_32 }: +{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc +, libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }: let + pname = "libsecret"; version = "0.18.5"; in stdenv.mkDerivation rec { - name = "libsecret-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libsecret/0.18/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww"; }; outputs = [ "out" "dev" ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ]; - buildInputs = [ libgcrypt gobjectIntrospection vala_0_32 ]; + nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl libintl ]; + buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ]; # optional: build docs with gtk-doc? (probably needs a flag as well) + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "A library for storing and retrieving passwords and other secrets"; homepage = https://wiki.gnome.org/Projects/Libsecret; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index 812847ea123b95f3b7f6b19fceeb20ff59061d39..90f0afa5796ce2e9bf53bde2b9389fb6ec0e4413 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libserialport-0.1.1"; src = fetchurl { - url = "http://sigrok.org/download/source/libserialport/${name}.tar.gz"; + url = "https://sigrok.org/download/source/libserialport/${name}.tar.gz"; sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform shared library for serial port access"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; # macOS, Windows and Android is also supported (according to upstream). platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix index c8751c3e5dd451d954cef6c6243c741e0b1535f2..49cdb2c95ba0d931ddcb687efd9ca9b71fab5a45 100644 --- a/pkgs/development/libraries/libsexy/default.nix +++ b/pkgs/development/libraries/libsexy/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of GTK+ widgets"; - homepage = http://blog.chipx86.com/tag/libsexy/; + homepage = https://blog.chipx86.com/tag/libsexy/; license = licenses.lgpl21; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 4a309a87f2ec85fbf8160b8cd21efddd3e803b5e..f6bfff78fa2698b9adf93978ae9924d0a60452c4 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -10,11 +10,6 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz"; sha256 = "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81"; }; - patches = [(fetchpatch { - url = "https://anonscm.debian.org/cgit/collab-maint/libsigc++-2.0.git/plain" - + "/debian/patches/0002-Enforce-c-11-via-pkg-config.patch?id=d451a4d195b1"; - sha256 = "19g19473syp2z3kg8vdrli89lm9kcvaqajkqfmdig1vfpkbq0nci"; - })]; nativeBuildInputs = [ pkgconfig gnum4 ]; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 8e1079bfbc8a02912b029adc7570c8048048b4c2..8152c1ea8524625616a6ae273472a77135c31e1d 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -4,16 +4,16 @@ }: stdenv.mkDerivation rec { - name = "libsigsegv-2.11"; + name = "libsigsegv-2.12"; src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; - sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x"; + sha256 = "1dlhqf4igzpqayms25lkhycjq1ccavisx8cnb3y4zapbkqsszq9s"; }; patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; meta = { homepage = http://www.gnu.org/software/libsigsegv/; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..521391b1bef8246a70605171c80dc8e079a74172 --- /dev/null +++ b/pkgs/development/libraries/libskk/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, fetchFromGitHub, + libtool, gettext, pkgconfig, + vala, gnome-common, gobjectIntrospection, + libgee, json-glib, skk-dicts }: + +stdenv.mkDerivation rec { + name = "libskk-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "ueno"; + repo = "libskk"; + rev = version; + sha256 = "092bjir866f350s4prq9q0yg34s91vmr8wbgf2vh3kcax1yj1axm"; + }; + + buildInputs = [ skk-dicts ]; + nativeBuildInputs = [ vala gnome-common gobjectIntrospection libtool gettext pkgconfig ]; + propagatedBuildInputs = [ libgee json-glib ]; + + preConfigure = '' + ./autogen.sh + ''; + + # link SKK-JISYO.L from skkdicts for the bundled tool `skk` + preInstall = '' + dictDir=$out/share/skk + mkdir -p $dictDir + ln -s ${skk-dicts}/share/SKK-JISYO.L $dictDir/ + ''; + + enableParallelBuilding = true; + + meta = { + description = "A library to deal with Japanese kana-to-kanji conversion method"; + longDescription = '' + Libskk is a library that implements basic features of SKK including: + new word registration, completion, numeric conversion, abbrev mode, kuten input, + hankaku-katakana input, Lisp expression evaluation (concat only), and re-conversion. + It also supports various typing rules including: romaji-to-kana, AZIK, TUT-Code, and NICOLA, + as well as various dictionary types including: file dictionary (such as SKK-JISYO.[SML]), + user dictionary, skkserv, and CDB format dictionary. + ''; + homepage = https://github.com/ueno/libskk; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch b/pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch new file mode 100644 index 0000000000000000000000000000000000000000..2eee84d1c4b84a10476f5a9188c9d7b6b82707b7 --- /dev/null +++ b/pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch @@ -0,0 +1,41 @@ +Adapted from https://github.com/zcash/libsnark/pull/10 + +diff --git a/depends/libff/libff/common/profiling.cpp b/depends/libff/libff/common/profiling.cpp +index f2a1985..319149c 100755 +--- a/depends/libff/libff/common/profiling.cpp ++++ b/depends/libff/libff/common/profiling.cpp +@@ -27,6 +27,13 @@ + #include + #endif + ++#ifdef __MACH__ ++#include ++#include ++#include ++#include ++#endif ++ + namespace libff { + + long long get_nsec_time() +@@ -42,10 +49,20 @@ long long get_nsec_cpu_time() + return 0; + #else + ::timespec ts; ++#ifdef __MACH__ ++ clock_serv_t cclock; ++ mach_timespec_t mts; ++ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); ++ clock_get_time(cclock, &mts); ++ mach_port_deallocate(mach_task_self(), cclock); ++ ts.tv_sec = mts.tv_sec; ++ ts.tv_nsec = mts.tv_nsec; ++#else + if ( ::clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) ) + throw ::std::runtime_error("clock_gettime(CLOCK_PROCESS_CPUTIME_ID) failed"); + // If we expected this to work, don't silently ignore failures, because that would hide the problem and incur an unnecessarily system-call overhead. So if we ever observe this exception, we should probably add a suitable #ifdef . + //TODO: clock_gettime(CLOCK_PROCESS_CPUTIME_ID) is not supported by native Windows. What about Cygwin? Should we #ifdef on CLOCK_PROCESS_CPUTIME_ID or on __linux__? ++#endif + return ts.tv_sec * 1000000000ll + ts.tv_nsec; + #endif + } diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..578053bbb42738c56a408b06ad3052d7f393517b --- /dev/null +++ b/pkgs/development/libraries/libsnark/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps, fetchpatch, patchutils }: + +let + rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; + inherit (stdenv) lib; +in stdenv.mkDerivation rec { + name = "libsnark-pre${version}"; + version = stdenv.lib.substring 0 8 rev; + + buildInputs = [ cmake pkgconfig openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; + + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "scipr-lab"; + repo = "libsnark"; + sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; + fetchSubmodules = true; + }; + + patches = [ ./darwin-fix-clock-gettime.patch ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "C++ library for zkSNARKs"; + homepage = https://github.com/scipr-lab/libsnark; + license = licenses.mit; + 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 53d927219e21c279786a3c38a25e32ae6d5e9084..a68b5b2b6d5effad2986039ba59f8d65ad72d64f 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -11,25 +11,30 @@ stdenv.mkDerivation rec { }; patches = [ - # CVE-2017-12562 (fetchurl { - url = "https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8.patch"; - sha256 = "1jg3wq30wdn9nv52mcyv6jyi4d80h4r1h9p96czcria7l91yh4sy"; + name = "CVE-2017-12562.patch"; + url = "https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8.patch"; + sha256 = "1jg3wq30wdn9nv52mcyv6jyi4d80h4r1h9p96czcria7l91yh4sy"; }) - # CVE-2017-6892 (fetchurl { - url = "https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748.patch"; - sha256 = "05xkmz2ihc1zcj73sbmj1ikrv9qlcym2bkp1v6ak7w53ky619mwq"; + name = "CVE-2017-6892.patch"; + url = "https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748.patch"; + sha256 = "05xkmz2ihc1zcj73sbmj1ikrv9qlcym2bkp1v6ak7w53ky619mwq"; }) - # CVE-2017-8361, CVE-2017-8363, CVE-2017-8363 (fetchurl { - url = "https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3.patch"; - sha256 = "0ccndnvjzx5fw18zvy03vnb29rr81h5vsh1m16msqbxk8ibndln2"; + name = "CVE-2017-8361+CVE-2017-8363+CVE-2017-8365.patch"; + url = "https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3.patch"; + sha256 = "0ccndnvjzx5fw18zvy03vnb29rr81h5vsh1m16msqbxk8ibndln2"; }) - # CVE-2017-8362 (fetchurl { - url = "https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808.patch"; - sha256 = "1xyv30ga71cpy4wx5f76sc4dma91la2lcc6s9f3pk9rndyi7gj9x"; + name = "CVE-2017-8362.patch"; + url = "https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808.patch"; + sha256 = "1xyv30ga71cpy4wx5f76sc4dma91la2lcc6s9f3pk9rndyi7gj9x"; + }) + (fetchurl { + name = "CVE-2017-14634.patch"; + url = "https://github.com/erikd/libsndfile/commit/85c877d5072866aadbe8ed0c3e0590fbb5e16788.patch"; + sha256 = "0kc7vp22qsxidhvmlc6nfamw7k92n0hcfpmwhb3gaksjamwhb2df"; }) ]; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 5d4535676e7b6ee6469c0663b7b0cd2b756a4cdd..0b341b38917d95a7883b7038e14da5f3bc50c610 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.15"; + name = "libsodium-1.0.16"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "1x3qw7lsz44vcxpcn1dvwig410phg6gmv31jwj94arrgka3rwspv"; + sha256 = "0cq5pn7qcib7q70mm1lgjwj75xdxix27v0xl1xl0kvxww7hwgbgf"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 480891e98af924df73a1d58b7f54150bef3a3ddb..2d5fa20c7cf8ecd0cf2be593126a2bd16cc9fc3a 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.6.23"; + rev = "0.6.34"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "08ba7yx0br421lk6zf5mp0yl6nznkmc2vbka20qwm2lx5f0a25xg"; + sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7"; }; cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true"; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index 18d18941b88786fc26d368ca87feca42e63daeca..7803b2a5ff11ba3556bc4d27213baa9c720a47d2 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio }: +{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }: stdenv.mkDerivation rec { version = "1.1.0"; @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p"; }; - buildInputs = [ cmake alsaLib libjack2 libpulseaudio ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libjack2 libpulseaudio ] + ++ stdenv.lib.optional stdenv.isLinux alsaLib + ++ stdenv.lib.optional stdenv.isDarwin AudioUnit; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; meta = with stdenv.lib; { description = "Cross platform audio input and output"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 229a92d84bf5867ecd3c1bed12b7d413634cc744..92e9c3662c9f16756827a215a3325bfa3296d2c0 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection -, valaSupport ? true, vala_0_32 -, libintlOrEmpty -, intltool, python }: +{ stdenv, fetchurl, glib, libxml2, pkgconfig, gnome3 +, gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection +, valaSupport ? true, vala_0_40 +, intltool, python3 }: + let - majorVersion = "2.60"; - version = "${majorVersion}.0"; + pname = "libsoup"; + version = "2.62.0"; in -stdenv.mkDerivation { - name = "libsoup-${version}"; +stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "b324edbecda0884143c0853b4a2bd5bd37fb3761f12f293c621ff34b9acdc84c"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1b5aff1igbsx1h4v3wmkffvzgiy8rscibqka7fmjf2lxs7l7lz5b"; }; prePatch = '' @@ -24,21 +24,29 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] - ++ stdenv.lib.optionals valaSupport [ vala_0_32 ]; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] - ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ]; - passthru.propagatedUserEnvPackages = [ glib_networking.out ]; + buildInputs = [ python3 sqlite ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ] + ++ stdenv.lib.optionals valaSupport [ vala_0_40 ]; + propagatedBuildInputs = [ glib libxml2 ]; - # glib_networking is a runtime dependency, not a compile-time dependency - configureFlags = "--disable-tls-check" - + " --enable-vala=${if valaSupport then "yes" else "no"}" - + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; + # glib-networking is a runtime dependency, not a compile-time dependency + configureFlags = [ + "--disable-tls-check" + "--enable-vala=${if valaSupport then "yes" else "no"}" + "--with-gnome=${if gnomeSupport then "yes" else "no"}" + ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + passthru = { + propagatedUserEnvPackages = [ glib-networking.out ]; + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = { + description = "HTTP client/server library for GNOME"; + homepage = https://wiki.gnome.org/Projects/libsoup; + license = stdenv.lib.licenses.gpl2; inherit (glib.meta) maintainers platforms; }; } diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 660d7e16310f6d1466c58269f4352260b87e88fb..aa3aaa1c59bcaad139383c738a15c00d3ffa62a0 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "1.8.1"; in +let version = "1.8.5"; in stdenv.mkDerivation rec { name = "libspatialindex-${version}"; src = fetchurl { url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; - sha256 = "1ay1kxn4baccd0cqx466v7fn8c8gcfbhlnd5mbdnd7s4aw0ix88j"; + sha256 = "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw"; }; enableParallelBuilding = true; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Extensible spatial index library in C++"; homepage = http://libspatialindex.github.io/; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 19ccc9159a3e728ddeb0ed0eb1a7e89f198425d3..253c5365c8a3175aaad1b2e26ae94671347c4fa9 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -3,11 +3,11 @@ with lib; stdenv.mkDerivation rec { - name = "libspatialite-4.2.0"; + name = "libspatialite-4.3.0a"; src = fetchurl { url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz"; - sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz"; + sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index a2e94c33ce3253c34e5ff0c1cc0da4fab28d837c..7d9ea25e9d2663c52e02e7e6ae93efc1b8e6541c 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { version = "1.0.18"; src = fetchurl { - url = "http://www.libsrs2.org/srs/libsrs2-${version}.tar.gz"; + url = "https://www.libsrs2.org/srs/libsrs2-${version}.tar.gz"; sha256 = "9d1191b705d7587a5886736899001d04168392bbb6ed6345a057ade50943a492"; }; meta = { description = "The next generation SRS library from the original designer of SRS"; license = with lib.licenses; [ gpl2 bsd3 ]; - homepage = http://www.libsrs2.org/; + homepage = https://www.libsrs2.org/; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 036bb806f68798afdb0f7868b2e4b321915a3c98..72d73e358485e88f41f1fb902171b0b94ead3249 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; meta = with stdenv.lib; { - homepage = http://www.i-scream.org/libstatgrab/; + homepage = https://www.i-scream.org/libstatgrab/; description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libstdc++5/default.nix b/pkgs/development/libraries/libstdc++5/default.nix index baea981ca4a18419e5afd7a63e3b6347d0277428..f8397052b7709f22b4fdd7a3f016c46fd65c176e 100644 --- a/pkgs/development/libraries/libstdc++5/default.nix +++ b/pkgs/development/libraries/libstdc++5/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { name = "siginfo.patch"; url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/siginfo.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa"; sha256 = "15zldbm33yba293dgrgsbv3j332hkc3iqpyc8fa7zl42mh9qk22j"; - addPrefixes = true; + extraPrefix = ""; }) (fetchpatch { name = "gcc-3.4.3-no_multilib_amd64.patch"; url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/gcc-3.4.3-no_multilib_amd64.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa"; sha256 = "11m5lc51b0addhc4yq4rz0dwpv6k73rrj73wya3lqdk8rly6cjpm"; - addPrefixes = true; + extraPrefix = ""; }) # Required because of glibc 2.26 ./struct-ucontext.patch @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { # being generated to make sure that they use our glibc. EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before)" for i in $extraLDFlags; do EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i" done diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..67d6d8d42ead4c771812d03d5ffe57c34122a7b7 --- /dev/null +++ b/pkgs/development/libraries/libstemmer/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "libstemmer-2017-03-02"; + + src = fetchFromGitHub { + owner = "zvelo"; + repo = "libstemmer"; + rev = "78c149a3a6f262a35c7f7351d3f77b725fc646cf"; + sha256 = "06md6n6h1f2zvnjrpfrq7ng46l1x12c14cacbrzmh5n0j98crpq7"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Snowball Stemming Algorithms"; + homepage = "http://snowball.tartarus.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index 29fa8fc339f92c1c7e84ce0c3c9eafada50d6b4c..bd54b3aa343a2edbcfacb6abb39d1208d74e11a9 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "libstroke-0.5.1"; src = fetchurl { - url = http://etla.net/libstroke/libstroke-0.5.1.tar.gz; - sha256 = "0da9f5fde66feaf6697ba069baced8fb3772c3ddc609f39861f92788f5c7772d"; + url = https://web.archive.org/web/20161204100704/http://etla.net/libstroke/libstroke-0.5.1.tar.gz; + sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; buildInputs = [ automake autoconf x11 ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Libstroke, a library for simple gesture recognition"; - homepage = http://etla.net/libstroke/; + homepage = https://web.archive.org/web/20161204100704/http://etla.net/libstroke/; license = stdenv.lib.licenses.gpl2; longDescription = diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index 0d014cb22a82628bc6c16c7d430d121821e2c467..c1e6a1f7fb89ba5ae85bf254f4850ea2f83f3c8d 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libstrophe-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "strophe"; repo = "libstrophe"; rev = version; - sha256 = "099iv13c03y1dsn2ngdhfx2cnax0aj2gfh00w55hlzpvmjm8dsml"; + sha256 = "1milna92h8wzxax8ll362zvb70091nmfks5lmd105vk0478zraca"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index a366baf27e336c79a0cd5af3f0409c3a5e3650dc..aab0da90d394e8489bd8bd2fff6ad37cc022871d 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsvm-${version}"; - version = "3.20"; + version = "3.22"; src = fetchurl { - url = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; - sha256 = "1gj5v5zp1qnsnv0iwxq0ikhf8262d3s5dq6syr6yqkglps0284hg"; + url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; + sha256 = "0zd7s19y5vb7agczl6456bn45cj1y64739sslaskw1qk7dywd0bd"; }; buildPhase = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for support vector machines"; - homepage = http://www.csie.ntu.edu.tw/~cjlin/libsvm/; + homepage = https://www.csie.ntu.edu.tw/~cjlin/libsvm/; license = licenses.bsd3; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index 992bad020ea695cbe96b61c2eac3cd4556d69746..8123bf7ba84ed2feb1c9ee59f5bf71ce562394ae 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "C library for manipulating POSIX tar files"; homepage = http://www.feep.net/libtar/; license = licenses.bsd3; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 7fa53fe162b2d57bb29700156950f613dba3246f..cc5b19f7a595ac8664fc54249eb389e28fabf53b 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,25 +1,18 @@ { stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-4.12"; + name = "libtasn1-4.13"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "0ls7jdq3y5fnrwg0pzhq11m21r8pshac2705bczz6mqjc8pdllv7"; + sha256 = "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky"; }; - patches = [ - (fetchurl { - name = "CVE-2017-10790.patch"; - url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39"; - sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i"; - }) - ]; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - buildInputs = [ perl texinfo ]; + nativeBuildInputs = [ texinfo ]; + buildInputs = [ perl ]; doCheck = true; diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 0374c7f89b7a351fc1f713544af54be0d1c1cdf8..4e859c282276c948a3e67957bc6eac987ede8d65 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, cmake, SDL, mesa, upx, zlib }: +{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags="-DLIBTCOD_SAMPLES=OFF"; - buildInputs = [ cmake SDL mesa upx zlib ]; + buildInputs = [ cmake SDL libGLU_combined upx zlib ]; meta = { description = "API for roguelike games"; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 429cc5d9f1801a8bd9167f7da80d28d264c2e75e..7261fb7b6b745a4f56415c40910b9f16c7707c89 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libtermkey-${version}"; - version = "0.19"; + version = "0.20"; src = fetchzip { url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz"; - sha256 = "0v85h0zacd5lqwkykl2ms4009x8mfidzb6jr4dsq4gh7kwm54w56"; + sha256 = "1i5a2zangq61ba1vdkag34ig5g4gzccldccdbcmqmk93saa6lkbx"; }; makeFlags = [ "PREFIX=$(out)" ] diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 375c59f7763174e5ab22603602ace65200ed618e..fd58f4f44e78d8d296e3dd01f04dbb8b4227d9f1 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.theora.org/; + homepage = https://www.theora.org/; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; maintainers = with maintainers; [ spwhitt wkennington ]; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index ee21f3df7ac9219ea9b6bdab3c832a40e653272d..ab1bda9ed299245633d4080438aa97a5dae54c02 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }: let - version = "4.0.8"; + version = "4.0.9"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr"; + sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"; }; - prePatch =let + prePatch = let debian = fetchurl { - url = http://snapshot.debian.org/archive/debian-debug/20170928T093547Z/pool/main/t/tiff/tiff_4.0.8-5.debian.tar.xz; - sha256 = "11qkiliw04dmdvdd5z2lv5hh2fiwa29qbhkxvlvmb4yslnmyywha"; + url = http://snapshot.debian.org/archive/debian-debug/20180128T155203Z//pool/main/t/tiff/tiff_4.0.9-3.debian.tar.xz; + sha256 = "0wya42y7kcq093g3h7ca10cm5sns1mgnkjmdd2qdi59v8arga4y4"; }; in '' tar xf '${debian}' @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; # not cross; meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..efd63148fb10b5bca06cbc8011909832f673e18c --- /dev/null +++ b/pkgs/development/libraries/libtins/default.nix @@ -0,0 +1,43 @@ +{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, stdenv }: + +stdenv.mkDerivation rec { + name = "libtins-${version}"; + version = "3.5"; + + src = fetchFromGitHub { + owner = "mfontanini"; + repo = "libtins"; + rev = "v${version}"; + sha256 = "00d1fxyg8q6djljm79ms69gcrsqxxksny3b16v99bzf3aivfss5x"; + }; + + postPatch = '' + rm -rf googletest + cp -r ${gtest.src}/googletest googletest + chmod -R a+w googletest + ''; + + nativeBuildInputs = [ cmake gtest ]; + buildInputs = [ + openssl + libpcap + boost + ]; + + configureFlags = [ + "--with-boost-libdir=${boost.out}/lib" + "--with-boost=${boost.dev}" + ]; + + enableParallelBuilding = true; + doCheck = true; + checkPhase = "make tests && LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib make test"; + + meta = with stdenv.lib; { + description = "High-level, multiplatform C++ network packet sniffing and crafting library"; + homepage = https://libtins.github.io/; + license = stdenv.lib.licenses.bsd2; + maintainers = with maintainers; [ fdns ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 46f3a982b0c7c8b797c02e8cbb7c56d7007f5a0c..e30f699f103dddc9eb4afce63e092222bed9ead7 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libtomcrypt-${version}"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "https://github.com/libtom/libtomcrypt/releases/download/v${version}/crypt-${version}.tar.xz"; - sha256 = "0ymqi0zf5gzn8pq4mnylwgg6pskml2v1p9rsjrqspyja65mgb7fs"; + sha256 = "053z0jzyvf6c9929phlh2p0ybx289s34g7nii5hnjigxzcs3mhap"; }; nativeBuildInputs = [ libtool ]; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix deleted file mode 100644 index fbd30ac04f761c63ed59ac103fbf531df1e65f23..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix +++ /dev/null @@ -1,13 +0,0 @@ -args@{ callPackage, fetchpatch, ... }: - -callPackage (import ./generic.nix { - version = "1.0.11"; - sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i"; - patches = [ - # Compatibility with new Boost - (fetchpatch { - url = "https://github.com/arvidn/libtorrent/commit/7eb3cf6bc6dbada3fa7bb7ff4d5981182813a0e2.patch"; - sha256 = "07agbrii6i8q4wmgpqbln7ldhhadaf5npcinvi6hnyipsr48jbj5"; - }) - ]; -}) args diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index ff5027fd472ea3dc5ee6c2318d9e0f078ee84119..00ec229861790f79f24a95695b200a2dc2497e13 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ args@{ callPackage, ... }: callPackage (import ./generic.nix { - version = "1.1.5"; - sha256 = "1ifpcqw5mj2dwk23lhc2vpb47mg3j573v5z4zp8dkczpz7wg5jxq"; + version = "1.1.6"; + sha256 = "1xlh0sqypjbx0imw3bkbjwgwb4bm6zl7c0y01p0xsw8ncfmwjll7"; }) args diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index af9c38a9634681771ffe50599ab8c2370d4f2764..16fca9ce3d39561b5f95bcd39244ce783ed9ee05 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.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "TokTok"; repo = "c-toxcore"; rev = "v${version}"; - sha256 = "1d3f7lnlxra2lhih838bvlahxqv50j35g9kfyzspq971sb5z30mv"; + sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij"; }; cmakeFlags = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libsodium libmsgpack ncurses + libsodium libmsgpack ncurses libconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus libvpx @@ -37,7 +37,8 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; + description = "P2P FOSS instant messaging application aimed to replace Skype"; + homepage = https://tox.chat; license = licenses.gpl3Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libtoxcore/old-api.nix b/pkgs/development/libraries/libtoxcore/old-api.nix deleted file mode 100644 index 5757e94559a831d0e76972c64f767fa15f2c68e6..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libtoxcore/old-api.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus -, libvpx, check, libconfig, pkgconfig }: - -let - version = "4c220e336330213b151a0c20307d0a1fce04ac9e"; - date = "20150126"; - -in stdenv.mkDerivation rec { - name = "tox-core-old-${date}-${builtins.substring 0 7 version}"; - - src = fetchFromGitHub { - owner = "irungentoo"; - repo = "toxcore"; - rev = version; - sha256 = "152yamak9ykl8dgkx1qzyrpa3f4xr1s8lgcb5k58r9lb1iwnhvqc"; - }; - - NIX_LDFLAGS = "-lgcc_s"; - - postPatch = '' - # within Nix chroot builds, localhost is unresolvable - sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \ - auto_tests/network_test.c - # takes WAAAY too long (~10 minutes) and would timeout - sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \ - auto_tests/tox_test.c - ''; - - configureFlags = [ - "--with-libsodium-headers=${libsodium.dev}/include" - "--with-libsodium-libs=${libsodium.out}/lib" - "--enable-ntox" - "--enable-daemon" - ]; - - buildInputs = [ - autoreconfHook libsodium ncurses - check libconfig pkgconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ - libopus - ]; - - propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; - - # Some tests fail randomly due to timeout. This kind of problem is well known - # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} - # They don't recommend running tests on 50core machines with other cpu-bound - # tests running in parallel. - # - # NOTE: run the tests locally on your machine before upgrading this package! - doCheck = false; - - meta = with stdenv.lib; { - description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric jgeerds ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 82aba6b89f5a01492996e01ae1a9f715caaaf63b..9775700501584b5a3d79f1e1d9eaffb4b197df8f 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, mesa }: +{ stdenv, fetchurl, autoreconfHook, libGLU_combined }: let version = "1.0.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mesa ]; + buildInputs = [ libGLU_combined ]; meta = { homepage = http://dri.freedesktop.org/wiki/S3TC; diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index 387dbb22a81639781d29edbc653017d16437d999..aad8ae00c11485e435d505a31012790cfbdb33ed 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, mesa }: +{ stdenv, fetchurl, autoreconfHook, libGLU_combined }: let version = "1.0"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mesa ]; + buildInputs = [ libGLU_combined ]; meta = { description = "A patent-free S3TC compatible implementation"; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 48d55f17c5794d3dbe7f01af37f98a307440b6c1..2def14b1c10e86d94501c3e57689366a73e78f75 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, json_c, hidapi }: stdenv.mkDerivation rec { - name = "libu2f-host-1.1.1"; + name = "libu2f-host-1.1.5"; src = fetchurl { url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; - sha256 = "0g0f012w0c00cvj5g319x2b8prbh0d3fcac9960cy7xsd8chckg1"; + sha256 = "159slvjfq4bqslx5amjkk90xnkiv3x0yzvbi54pl2vnzbr1p2azk"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/libu2f-host; - description = "A C library and command-line tool thati mplements the host-side of the U2F protocol"; + description = "A C library and command-line tool that implements the host-side of the U2F protocol"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 2f8963db0cd8de1c4a7f9c63ba1ae81b2e3cd9a6..b1e6938a149428027967be2878787393845ad692 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -15,7 +15,9 @@ in nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ] ++ - (if stdenv.isDarwin then [darwin.apple_sdk.frameworks.Cocoa] else [gtk3]); + (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa] + else if backend == "unix" then [gtk3] + else null); preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index b0066fa75f225738e715a49cddc31eb8494b0e91..1a4f16046fc16fb54fe08ab2b8a98be90c4ccf1c 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, dbus, dbus_glib, gtk3, gobjectIntrospection +, dbus, dbus-glib, gtk3, gobjectIntrospection , gtkdoc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus dbus_glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; + buildInputs = [ dbus dbus-glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { homepage = https://wiki.gnome.org/Attic/LibUnique; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index a5adaa9ac17947b0ab9382cd3554b45a7abdbbdc..2bb53dd2b97f718f39515913606da04983a1528f 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }: stdenv.mkDerivation rec { name = "libunique-1.1.6"; @@ -13,10 +13,11 @@ stdenv.mkDerivation rec { ./1.1.6-fix-test.patch ./1.1.6-G_CONST_RETURN.patch ./1.1.6-include-terminator.patch - ]; + ] + ++ [ ./gcc7-bug.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk2 dbus_glib ]; + buildInputs = [ glib gtk2 dbus-glib ]; # don't make deprecated usages hard errors preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://live.gnome.org/LibUnique; + homepage = https://wiki.gnome.org/Attic/LibUnique; description = "A library for writing single instance applications"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libunique/gcc7-bug.patch b/pkgs/development/libraries/libunique/gcc7-bug.patch new file mode 100644 index 0000000000000000000000000000000000000000..2b0587510bc0d994fbbef03c5976abfc6a5c29f1 --- /dev/null +++ b/pkgs/development/libraries/libunique/gcc7-bug.patch @@ -0,0 +1,18 @@ +gcc-7 newly detects this class of bugs. +In this particular case it's clear that the inention was +to detect if the string is non-NULL *and* non-empty. + + +diff --git a/unique/uniqueapp.c b/unique/uniqueapp.c +index b40a86c..66a7226 100644 +--- a/unique/uniqueapp.c ++++ b/unique/uniqueapp.c +@@ -176,7 +176,7 @@ set_startup_id (UniqueBackend *backend, + { + gchar *id; + +- if (startup_id && startup_id != '\0') ++ if (startup_id && *startup_id != '\0') + id = g_strdup (startup_id); + else + { diff --git a/pkgs/development/libraries/libunistring/clang.patch b/pkgs/development/libraries/libunistring/clang.patch deleted file mode 100644 index fdcbc0d528d06c16e214cb71eea04661143238c8..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libunistring/clang.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/lib/stdint.in.h b/lib/stdint.in.h -index 997e406..e0827f5 100644 ---- a/lib/stdint.in.h -+++ b/lib/stdint.in.h -@@ -53,7 +53,8 @@ - in would reinclude us, skipping our contents because - _GL_STDINT_H is defined. - The include_next requires a split double-inclusion guard. */ --# @INCLUDE_NEXT@ @NEXT_STDINT_H@ -+# include -+// # @INCLUDE_NEXT@ @NEXT_STDINT_H@ - #endif - - #if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 42376b61f423d8938b0da94940bf76074009ade5..e3be66e8b1ca2a737a1d5a22e0c9c6aab9656a4d 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,28 +1,25 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libunistring-0.9.7"; + name = "libunistring-${version}"; + version = "0.9.9"; src = fetchurl { url = "mirror://gnu/libunistring/${name}.tar.gz"; - sha256 = "1ra1baz2187kbw9im47g6kqb5mx9plq703mkjxaval8rxv5q3q4w"; + sha256 = "0jm8pr469y7ybb90ll8k1585rciqm8ckzif0laipqhp5z440rsgm"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch stdenv.secure-format-patch ]; - outputs = [ "out" "dev" "info" "doc" ]; propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - enableParallelBuilding = false; - configureFlags = [ "--with-libiconv-prefix=${libiconv}" ]; - # XXX: There are test failures on non-GNU systems, see - # http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html . - doCheck = (stdenv ? glibc) && (stdenv.hostPlatform == stdenv.buildPlatform); + doCheck = !stdenv.hostPlatform.isMusl; + + enableParallelBuilding = true; meta = { homepage = http://www.gnu.org/software/libunistring/; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix deleted file mode 100644 index 66890f08ff3e3b2cba403d068077f678966611c9..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libunity/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, vala_0_23, python, intltool, pkgconfig -, glib, libgee_0_6, gtk3, dee, libdbusmenu-glib -}: - -stdenv.mkDerivation rec { - name = "libunity-${version}"; - version = "6.12.0"; - - src = fetchurl { - url = "https://launchpad.net/libunity/6.0/${version}/+download/${name}.tar.gz"; - sha256 = "1nadapl3390x98q1wv2yarh60hzi7ck0d1s8zz9xsiq3zz6msbjd"; - }; - - buildInputs = [ glib libgee_0_6 gtk3 ]; - propagatedBuildInputs = [ dee libdbusmenu-glib ]; - nativeBuildInputs = [ vala_0_23 python intltool pkgconfig ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "A library for instrumenting- and integrating with all aspects of the Unity shell"; - homepage = https://launchpad.net/libunity; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch b/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch new file mode 100644 index 0000000000000000000000000000000000000000..5fcaa72c0c01374e9ab7d2fcc989da62f49b5244 --- /dev/null +++ b/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch @@ -0,0 +1,45 @@ +From 04437142399662b576bd55a85485c6dcc14d0812 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Dec 2015 06:44:07 +0000 +Subject: [PATCH] backtrace: Use only with glibc and uclibc + +backtrace API is glibc specific not linux specific +so make it behave so. + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + tests/test-coredump-unwind.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c +index 5254708..8767b42 100644 +--- a/tests/test-coredump-unwind.c ++++ b/tests/test-coredump-unwind.c +@@ -57,7 +57,9 @@ + #include + + /* For SIGSEGV handler code */ ++#ifdef __GLIBC__ + #include ++#endif + #include + + #include +@@ -238,11 +240,11 @@ void handle_sigsegv(int sig, siginfo_t *info, void *ucontext) + ip); + + { ++#ifdef __GLIBC__ + /* glibc extension */ + void *array[50]; + int size; + size = backtrace(array, 50); +-#ifdef __linux__ + backtrace_symbols_fd(array, size, 2); + #endif + } +-- +2.6.4 + diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 8565bc75ff9fb1aa384e98498dd1a94de25790f0..b901d352808e994263001016b17add0e4dfc3cae 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./version-1.2.1.patch + ./backtrace-only-with-glibc.patch ]; nativeBuildInputs = [ autoreconfHook ]; @@ -32,4 +33,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.mit; }; + + passthru.supportsHost = !stdenv.hostPlatform.isRiscV; } diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 3b92aff72a5687c32dfb39d88abb33a46228f2c8..85f8b6df2959d22b49d3d7e0516a7c0d7d562ae1 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.9.3"; + version = "0.10.1"; name = "liburcu-${version}"; src = fetchurl { - url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "01j0xp3f0w147yfyzybkjvb7i67i7prsvnkssgvgwry9lvk35khv"; + url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; + sha256 = "01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw"; }; nativeBuildInputs = stdenv.lib.optional doCheck perl; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Userspace RCU (read-copy-update) library"; - homepage = http://lttng.org/urcu; + homepage = https://lttng.org/urcu; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 1fd3cb39bbff8c93a2c88a4c26c06c81e3ae8893..4704a1e5c331f5b7fdccd2da9f4f29b964bc56ef 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0"; }; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; + meta = { platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libusb/fix-headers.patch b/pkgs/development/libraries/libusb/fix-headers.patch new file mode 100644 index 0000000000000000000000000000000000000000..ea9cbc34978ed2ed9bd4bf51df0a891450d6e047 --- /dev/null +++ b/pkgs/development/libraries/libusb/fix-headers.patch @@ -0,0 +1,10 @@ +--- libusb-compat-0.1.5.orig/libusb/usb.h ++++ libusb-compat-0.1.5/libusb/usb.h +@@ -25,6 +25,7 @@ + #ifndef __USB_H__ + #define __USB_H__ + ++#include + #include + #include + #include diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index dd2f1edc5f2ae7c8456946570569a5ad5e537241..69afd9d4c691ca86643034a1e63fc5d203abafcd 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit }: stdenv.mkDerivation rec { - name = "libusb-1.0.20"; + name = "libusb-1.0.22"; src = fetchurl { url = "mirror://sourceforge/libusb/${name}.tar.bz2"; - sha256 = "1zzp6hc7r7m3gl6zjbmzn92zkih4664cckaf49l1g5hapa8721fb"; + sha256 = "0mw1a5ss4alg37m6bd4k44v35xwrcwp5qm4s686q1nsgkbavkbkm"; }; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 8dea502a4ff4c0593c219f0605c9fdf9e5dbb9d9..e8877c7f54b6ce530711501662368833ac057e05 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.15.0"; + version = "1.19.2"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "092hxqjvbb6d03h3msc38359w2kixba1ansyrsbyqq8iqiqwnkw0"; + sha256 = "118r8wigm65107fm7kzfz7gc4awy8xxg0knvwnshx1j40ks08x9z"; }; postPatch = let diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..95d4be08548ac48f819045e7789921262cf44d02 --- /dev/null +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +, libdrm, libva +}: + +stdenv.mkDerivation rec { + name = "libva-utils-${version}"; + inherit (libva) version; + + src = fetchFromGitHub { + owner = "01org"; + repo = "libva-utils"; + rev = version; + sha256 = "113wdmi4r0qligizj9zmd4a8ml1996x9g2zp2i4pmhb8frv9m8j2"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libdrm libva ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "VAAPI tools: Video Acceleration API"; + homepage = http://www.freedesktop.org/wiki/Software/vaapi; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix new file mode 100644 index 0000000000000000000000000000000000000000..04d621e29c84292fb92200ef424cc7fcc3ef1e14 --- /dev/null +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi +, libGL, libGL_driver +, minimal ? false, libva1-minimal +}: + +stdenv.mkDerivation rec { + name = "libva-${version}"; + version = "1.7.3"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; + }; + + outputs = [ "bin" "dev" "out" ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libdrm ] + ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; + # TODO: share libs between minimal and !minimal - perhaps just symlink them + + configureFlags = + # Add FHS paths for non-NixOS applications. + [ "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ + lib.optionals (!minimal) [ "--enable-glx" ]; + + installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; + + meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/wiki/Software/vaapi; + license = licenses.mit; + description = "VAAPI library: Video Acceleration API"; + platforms = platforms.unix; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 031ac781651c0b8474411a607ff5f4a29981c216..0ba49da06cfed655e459c1cf561a89963fc8f89e 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,36 +1,45 @@ -{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi -, mesa_noglu -, minimal ? true, libva +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +, libXext, libdrm, libXfixes, wayland, libffi, libX11 +, libGL, libGL_driver +, minimal ? false, libva-minimal }: stdenv.mkDerivation rec { - name = "libva-${version}"; - version = "1.7.3"; - - src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; + name = "libva-${lib.optionalString minimal "minimal-"}${version}"; + version = "2.1.0"; + + # update libva-utils and vaapiIntel as well + src = fetchFromGitHub { + owner = "01org"; + repo = "libva"; + rev = version; + sha256 = "1a60lrgr65hx9b2qp0gjky1298c4d4zp3ap6vnmmz850sxx5rm8w"; }; - outputs = [ "bin" "dev" "out" ]; + outputs = [ "dev" "out" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; + ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them - configureFlags = - [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++ - lib.optionals (!minimal) [ "--enable-glx" ]; + enableParallelBuilding = true; + + configureFlags = [ + # Add FHS paths for non-NixOS applications. + "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" + ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; - installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; + installFlags = [ + "dummy_drv_video_ladir=$(out)/lib/dri" + ]; meta = with stdenv.lib; { + description = "VAAPI library: Video Acceleration API"; homepage = http://www.freedesktop.org/wiki/Software/vaapi; license = licenses.mit; - description = "VAAPI library: Video Acceleration API"; - platforms = platforms.unix; maintainers = with maintainers; [ garbas ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 4285b05a6250900be36a91ead85d82ac933b150c..3ea0155b4f42aaf56f30b0a0ed467edfddc1fa4d 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp -, libXext, libvdpau, glib, libva, ffmpeg, mesa_glu }: +, libXext, libvdpau, glib, libva, ffmpeg, libGLU }: stdenv.mkDerivation rec { name = "libvdpau-va-gl-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ]; + buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg libGLU ]; meta = with stdenv.lib; { homepage = https://github.com/i-rinat/libvdpau-va-gl; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index ceb42fe2bfc3627fb9d46f50d04571c8a524ae07..35c339b45d09fc5ea9c11c6805be8ef6bcc34679 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, xorg, mesa_noglu }: +{ stdenv, fetchurl, pkgconfig, xorg, libGL_driver }: stdenv.mkDerivation rec { - name = "libvdpau-1.1.1"; + name = "libvdpau-${version}"; + version = "1.1.1"; src = fetchurl { - url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736"; }; @@ -16,12 +17,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; configureFlags = stdenv.lib.optional stdenv.isLinux - "--with-module-dir=${mesa_noglu.driverLink}/lib/vdpau"; + "--with-module-dir=${libGL_driver.driverLink}/lib/vdpau"; installFlags = [ "moduledir=$(out)/lib/vdpau" ]; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~aplattner/vdpau/; + homepage = https://people.freedesktop.org/~aplattner/vdpau/; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index e41ab5fe5a33b678af331786bcc1068acdb55454..0dbe30251bdd6a20aaefe082325c1b47db9cf7ed 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, libapparmor +, xen, libapparmor, vala }: let @@ -8,15 +8,19 @@ let in stdenv.mkDerivation rec { name = "libvirt-glib-1.0.0"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "http://libvirt.org/sources/glib/${name}.tar.gz"; sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig vala ]; buildInputs = [ libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject2 gobjectIntrospection libcap_ng numactl xen libapparmor + python pygobject2 gobjectIntrospection libcap_ng numactl libapparmor + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ + xen ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libvirt/build-on-bsd.patch b/pkgs/development/libraries/libvirt/build-on-bsd.patch deleted file mode 100644 index 830f0f30ff9b81cb5053ad233d037f89065819e3..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libvirt/build-on-bsd.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naur libvirt-1.3.0.orig/src/admin/admin_protocol.c libvirt-1.3.0/src/admin/admin_protocol.c ---- libvirt-1.3.0.orig/src/admin/admin_protocol.c 2015-12-02 16:17:07.000000000 +0100 -+++ libvirt-1.3.0/src/admin/admin_protocol.c 2016-01-04 17:57:10.043412857 +0100 -@@ -6,6 +6,25 @@ - - #include "admin_protocol.h" - -+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t -+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 -+ */ -+#ifdef HAVE_XDR_U_INT64_T -+# define xdr_uint64_t xdr_u_int64_t -+#endif -+#ifndef IXDR_PUT_INT32 -+# define IXDR_PUT_INT32 IXDR_PUT_LONG -+#endif -+#ifndef IXDR_GET_INT32 -+# define IXDR_GET_INT32 IXDR_GET_LONG -+#endif -+#ifndef IXDR_PUT_U_INT32 -+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG -+#endif -+#ifndef IXDR_GET_U_INT32 -+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG -+#endif -+ - bool_t - xdr_admin_nonnull_string (XDR *xdrs, admin_nonnull_string *objp) - { -diff -Naur libvirt-1.3.0.orig/src/logging/log_protocol.c libvirt-1.3.0/src/logging/log_protocol.c ---- libvirt-1.3.0.orig/src/logging/log_protocol.c 2015-12-08 13:07:35.000000000 +0100 -+++ libvirt-1.3.0/src/logging/log_protocol.c 2016-01-04 17:56:50.673463563 +0100 -@@ -7,6 +7,25 @@ - #include "log_protocol.h" - #include "internal.h" - -+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t -+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 -+ */ -+#ifdef HAVE_XDR_U_INT64_T -+# define xdr_uint64_t xdr_u_int64_t -+#endif -+#ifndef IXDR_PUT_INT32 -+# define IXDR_PUT_INT32 IXDR_PUT_LONG -+#endif -+#ifndef IXDR_GET_INT32 -+# define IXDR_GET_INT32 IXDR_GET_LONG -+#endif -+#ifndef IXDR_PUT_U_INT32 -+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG -+#endif -+#ifndef IXDR_GET_U_INT32 -+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG -+#endif -+ - bool_t - xdr_virLogManagerProtocolUUID (XDR *xdrs, virLogManagerProtocolUUID objp) - { diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index ff72cc84d26571edcea4f96d13bab40dae366d43..7262ca541f017d59ea89947b1d073dec8dad92ee 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,50 +1,60 @@ -{ stdenv, fetchurl, fetchpatch -, pkgconfig, makeWrapper +{ stdenv, fetchurl, fetchgit +, pkgconfig, makeWrapper, libtool, autoconf, automake , coreutils, libxml2, gnutls, devicemapper, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, xen, zfs, parted, qemu +, curl, libiconv, gmp, xen, zfs, parted, bridge-utils, dmidecode }: with stdenv.lib; -# if you update, also bump pythonPackages.libvirt or it will break -stdenv.mkDerivation rec { +# if you update, also bump and SysVirt in +let + buildFromTarball = stdenv.isDarwin; +in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.8.0"; + version = "4.1.0"; - src = fetchurl { - url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1y83z4jb2by6ara0nw4sivh7svqcrw97yfhqwdscxl4y10saisvk"; - }; - - patches = [ ./build-on-bsd.patch ]; + src = + if buildFromTarball then + fetchurl { + url = "http://libvirt.org/sources/${name}.tar.xz"; + sha256 = "0fb466mcma21hsxx3cckllbr9hhncpbwim5px1mr66iidy1a8bwa"; + } + else + fetchgit { + url = git://libvirt.org/libvirt.git; + rev = "v${version}"; + sha256 = "01021r7i71dw9w7ffp6ia8h70ns6bc0ps5np0hq9nipxs68finm6"; + fetchSubmodules = true; + }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap + ] ++ optionals (!buildFromTarball) [ + libtool autoconf automake ] ++ optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs - libapparmor libcap_ng numactl xen attr parted + libapparmor libcap_ng numactl attr parted + ] ++ optionals (stdenv.isLinux && stdenv.isx86_64) [ + xen ] ++ optionals stdenv.isDarwin [ - libiconv gmp + libiconv gmp ]; - 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"' + preConfigure = '' + ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } + + PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations - substituteInPlace src/qemu/qemu_capabilities.c \ - --replace '"/usr/libexec/qemu-kvm"' '"/run/libvirt/nix-emulators/${if stdenv.isAarch64 then "qemu-system-aarch64" else "qemu-kvm"}"' substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' - '' + '' - PATH=${dnsmasq}/bin:$PATH + patchShebangs . # fixes /usr/bin/python references ''; @@ -78,18 +88,19 @@ 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" \ - --replace "lock/subsys" "lock" - sed -e "/gettext\.sh/a \\\n# Added in nixpkgs:\ngettext() { \"${gettext}/bin/gettext\" \"\$@\"; }" \ - -i "$out/libexec/libvirt-guests.sh" - + --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' '' + optionalString stdenv.isLinux '' substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ - --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl qemu ]} + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ]} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index bda14d7294762b80131ea30424e68994de1a971a..a09e2cf2f72a3343b6e23ed1f1deba442b5c08bf 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -1,32 +1,31 @@ { stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib, gperf -, librevenge, libxml2, icu, perl +, librevenge, libxml2, icu, perl, cppunit, doxygen }: stdenv.mkDerivation rec { - name = "libvisio-0.1.3"; + name = "libvisio-${version}"; + version = "0.1.6"; + + outputs = [ "out" "bin" "dev" "doc" ]; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2"; - sha256 = "1blgdwxprqkasm2175imcvy647sqv6xyf3k09p0b1i7hlq889wvy"; + url = "https://dev-www.libreoffice.org/src/libvisio/${name}.tar.xz"; + sha256 = "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig cppunit doxygen ]; buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ]; - # Boost 1.59 compatability fix - # Attempt removing when updating - postPatch = '' - sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in - ''; - configureFlags = [ "--disable-werror" - "--disable-tests" ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { description = "A library providing ability to interpret and import visio diagrams into various applications"; - homepage = http://www.freedesktop.org/wiki/Software/libvisio; - platforms = stdenv.lib.platforms.unix; + homepage = https://wiki.documentfoundation.org/DLP/Libraries/libvisio; + license = licenses.mpl20; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index f7e477ff34a103ed7922bed27722148105c7382a..b325c9b246c21e03927dd4f5c940acfa30a16540 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,12 +1,8 @@ {stdenv, fetchurl, - libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, - xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, - libXrandr, randrproto, libXtst, zlib, libgcrypt, autoreconfHook - , systemd, pkgconfig, libpng + libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng, + systemd }: -assert stdenv.isLinux; - let s = # Generated upstream information rec { @@ -16,27 +12,25 @@ let url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r"; }; - buildInputs = [ - libtool libjpeg openssl libX11 libXdamage xproto damageproto - xextproto libXext fixesproto libXfixes xineramaproto libXinerama - libXrandr randrproto libXtst zlib libgcrypt autoreconfHook systemd - pkgconfig libpng - ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; src = fetchurl { inherit (s) url sha256; }; preConfigure = '' sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure ''; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ + libtool libjpeg openssl libgcrypt libpng + ] ++ stdenv.lib.optional stdenv.isLinux systemd; + propagatedBuildInputs = [ zlib ]; meta = { inherit (s) version; description = "VNC server library"; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 682fcca98a36523165789a38df46b31f8259f101..2f9bca5ed95fc327945f041045a7f5a927275c7a 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,15 +1,22 @@ -{ stdenv, fetchurl, libogg, pkgconfig }: +{ stdenv, fetchurl, libogg, pkgconfig, fetchpatch }: stdenv.mkDerivation rec { - name = "libvorbis-1.3.5"; + name = "libvorbis-1.3.6"; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; - sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal"; + sha256 = "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g"; }; outputs = [ "out" "dev" "doc" ]; + patches = [ + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch"; + sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x"; + name = "CVE-2017-14160"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libogg ]; @@ -17,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://xiph.org/vorbis/; + homepage = https://xiph.org/vorbis/; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 4b50fe090e3867bd79f5244642df10ae15ef50fc..1e96ff9bb1aded1717397fae27511725e4258b20 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; - homepage = http://www.webmproject.org/; + homepage = https://www.webmproject.org/; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 824449a347afaf86e62e6b3ebc4c6016acab68b2..ef499f238d63a30d3e2620fe52f8f6a08c1b8b1a 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; - homepage = http://www.webmproject.org/; + homepage = https://www.webmproject.org/; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 6674f303739ff7bf5028bd6ae0e0e1637bfd041a..8e36edff7edda3f2c24379d19484c7be191ff5a3 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwacom-${version}"; - version = "0.26"; + version = "0.28"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; - sha256 = "0xpvkjvzaj9blcmw8ha46616bzfivj99kwzvr91clxd6iaf11r63"; + sha256 = "1vv768870597rvwxdb59v6pjn1pxaxg4r6znbb5j3cl828q35mp7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 673cd7abe7dd7a2ea8d7ffbf8eb1e6b3b3d66132..f7d4fc3b3675aa0378923df3b3deb5b22724b948 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , threadingSupport ? true # multi-threading -, openglSupport ? false, freeglut ? null, mesa ? null # OpenGL (required for vwebp) +, openglSupport ? false, freeglut ? null, libGLU_combined ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format , jpegSupport ? true, libjpeg ? null # JPEG image format , tiffSupport ? true, libtiff ? null # TIFF image format @@ -14,7 +14,7 @@ , libwebpdecoderSupport ? true # Build libwebpdecoder }: -assert openglSupport -> ((freeglut != null) && (mesa != null)); +assert openglSupport -> ((freeglut != null) && (libGLU_combined != null)); assert pngSupport -> (libpng != null); assert jpegSupport -> (libjpeg != null); assert tiffSupport -> (libtiff != null); @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; - sha256 = "0h1brwkyxc7lb8lc53aacdks5vc1y9hzngqi41gg7y6l56912a69"; + sha256 = "1ayq2zq0zbgf5yizbm32zh7p1vb8kibw74am6am1n5cz5mw3ql06"; }; configureFlags = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ ] - ++ optionals openglSupport [ freeglut mesa ] + ++ optionals openglSupport [ freeglut libGLU_combined ] ++ optional pngSupport libpng ++ optional jpegSupport libjpeg ++ optional tiffSupport libtiff diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 98f3ea1679cb20c9bbc7fef64c0cec58c74b667c..3bc04f9ae3db1653f67ae9002c6a92c33e56a3ad 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libwebsockets-${version}"; - version = "2.3.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; - sha256 = "1hv2b5r6sg42xnqhm4ysjvyiz3cqpfmwaqm33vpbx0k7arj4ixvy"; + sha256 = "0gbprzsi054f9gr31ihcf0cq7zfkybrmdp6894pmzb5hcv4wnh9i"; }; buildInputs = [ cmake openssl zlib libuv ]; diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 35e904989c419c93e94039a2ceb7eb69b27cd479..880ebcc1e468fd6df8cbc99a7514af0046c7fcc9 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { name = "libwhereami-${version}"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { - sha256 = "0nhbmxm626cgawprszw6c03a3hasxjn1i9ldhhj5xyvxp8r5l9q4"; + sha256 = "10phq4a11m8ly6b4dc2yg3dnjzg8ad5wnjv0ilvwylnw32800pxr"; rev = version; repo = "libwhereami"; owner = "puppetlabs"; }; + # post gcc7, upstream bug: https://tickets.puppetlabs.com/browse/FACT-1828 + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated"; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl leatherman ]; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 6a835157d96cb8fe62bb57e934f84427a5fb9660..8efd908584e1b11667aa48406b0867bbcfb4aa63 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -1,28 +1,38 @@ -{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool}: +{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobjectIntrospection, gnome3}: -stdenv.mkDerivation rec{ - name = "libwnck-${version}"; - version = "${majorVer}.${minorVer}.${patchVer}"; - - majorVer = "3"; - minorVer = "24"; - patchVer = "1"; +let + pname = "libwnck"; + version = "3.24.1"; +in stdenv.mkDerivation rec{ + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libwnck/${majorVer}.${minorVer}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg"; }; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - patches = [ ./install_introspection_to_prefix.patch ]; + configureFlags = [ "--enable-introspection" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; propagatedBuildInputs = [ libX11 gtk3 ]; - meta = { - platforms = stdenv.lib.platforms.linux; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = []; }; } diff --git a/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch b/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch deleted file mode 100644 index 1bcf4a12ea31a88d8454a1831edbcae44c086cee..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libwnck-3.4.7/configure 2013-08-20 14:46:14.000000000 +0000 -+++ libwnck-3.4.7-fix/configure 2014-01-05 17:18:56.665427787 +0000 -@@ -16150,7 +16150,7 @@ $as_echo "$found_introspection" >&6; } - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 57dfe34132f51bf2a197e0688cc25384b1eb22f9..9d262910e14f878ddd167b7360419cd9cf550d1f 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { - name = "libwpg-0.3.0"; + name = "libwpg-0.3.2"; src = fetchurl { url = "mirror://sourceforge/libwpg/${name}.tar.xz"; - sha256 = "097jx8a638fwwfrzf6v29r1yhc34rq9526py7wf0ck2z4fcr2w3g"; + sha256 = "0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp"; }; buildInputs = [ libwpd zlib librevenge ]; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 73fe5b55ab454b14baf52eea2ba83d670a050b9a..84748d601a64e5922d209d91603f6167d6c23b69 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.3"; + version = "0.4.8"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.bz2"; - sha256 = "0v1a0hj96i4jhb5833336s4zcslzb6md5cnmnrvgywx8cmw40c0c"; + sha256 = "163gdqaanqfs767aj6zdzagqldngn8i7f0hbmhhxlxr0wmvx6c9q"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost librevenge zlib ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; # newly detected by gcc-7 + meta = with stdenv.lib; { homepage = http://libwps.sourceforge.net/; description = "Microsoft Works document format import filter library"; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..67ec3b57fa7707e3141c8a2f50f0c4bc152cbac2 --- /dev/null +++ b/pkgs/development/libraries/libxc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, gfortran, perl }: + +let + version = "3.0.1"; + +in stdenv.mkDerivation { + name = "libxc-${version}"; + src = fetchurl { + url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; + sha256 = "1xyac89yx03vm86rvk07ps1d39xss3amw46a1k53mv30mgr94rl3"; + }; + + buildInputs = [ gfortran ]; + nativeBuildInputs = [ perl ]; + + preConfigure = '' + patchShebangs ./ + ''; + + configureFlags = [ "--enable-shared" ]; + + doCheck = true; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Library of exchange-correlation functionals for density-functional theory"; + homepage = http://octopus-code.org/wiki/Libxc; + license = licenses.lgpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index f38c7a90032997b26b28addb23c2dd96810a46b0..d225831f7024029b39fe4c641c3bd4d02a91902a 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng, libX11, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }: stdenv.mkDerivation rec { name = "libxcomp-${version}"; - version = "3.5.0.32"; + version = "3.5.99.16"; src = fetchurl { - sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm"; + sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libjpeg libpng libX11 zlib ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; preAutoreconf = '' cd nxcomp/ + sed -i 's|/src/.libs/libXcomp.a|/src/.libs/libXcomp.la|' test/Makefile.am ''; enableParallelBuilding = true; @@ -23,6 +24,5 @@ stdenv.mkDerivation rec { homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index e730cc6eaabfc3e9c7f9e11e1d5f9f5102fc2913..faeed680f3d615088faed2471c49e8c28d4b27ef 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,30 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: +{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.7.2"; + name = "libxkbcommon-0.8.0"; src = fetchurl { - url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918"; + url = "https://xkbcommon.org/download/${name}.tar.xz"; + sha256 = "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ yacc flex xkeyboard_config libxcb ]; + nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ]; + buildInputs = [ xkeyboard_config libxcb ]; - configureFlags = [ - "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" - "--with-x-locale-root=${libX11.out}/share/X11/locale" + patches = [ + # darwin compatibility + (fetchpatch { + url = https://github.com/xkbcommon/libxkbcommon/commit/edb1c662394578a54b7bbed231d918925e5d8150.patch; + sha256 = "0ydjlir32r3xfsbqhnsx1bz6ags2m908yhf9i09i1s7sgcimbcx5"; + }) ]; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/,--version-script=.*$//' Makefile - ''; + mesonFlags = [ + "-Denable-wayland=false" + "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" + "-Dx-locale-root=${libX11.out}/share/X11/locale" + ]; meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; - homepage = http://xkbcommon.org; + homepage = https://xkbcommon.org; license = licenses.mit; 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 bf38a954d60dcc3be3d3aa3f8c693e5aef006c64..c4f3ff1efdd53e4c943488b8e24c5d571c5fb8a5 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "libxml2-${version}"; - version = "2.9.5"; + version = "2.9.7"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "0f6d5nkvcfx8yqis2dwrnv6qaj0nhiifz49y657vmrwwxvnc2ca0"; + sha256 = "034hylzspvkm0p4bczqbf8q05a7r2disr8dz725x4bin61ymwg7n"; }; outputs = [ "bin" "dev" "out" "man" "doc" ] @@ -36,7 +36,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin; + doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin && + hostPlatform.libc != "musl"; crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") { # creating the DLL is broken ATM diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 23b36db8fe104e947a7823d0a8641b4ecca1a7a1..226fe5be536a7d73bb4df5d307a18ca2d880106e 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a"; }; + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig perl ]; propagatedBuildInputs = [ libxml2 glibmm ]; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 646fdfbac4f37eaf93829b23b56874bd339eb9f3..5e1e947b8f7c700047f2ddcfe7af4c2369880118 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r"; }; + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ glibmm ]; diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 28584d14a8773ea31b7332c3050774475cf63b48..ca4d7edbf32d2916c511f4672f59828e25624264 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libxmp-4.3.12"; + name = "libxmp-4.4.1"; meta = with stdenv.lib; { description = "Extended module player library"; @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz"; - sha256 = "1536dfxgxl6dyvkdby8lxzi9f7y2qlwl8ylrkybips3ampcqgkhm"; + sha256 = "1kycz4jsyvmf7ny9227b497wc7y5ligydi6fvvldmkf8hk63ad9m"; }; } diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 1c27b6e3233b9ea23d5bf069a358e812f5cdd996..1bb90ee195dad070ec4ac1dcda892975b61a5e7e 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -10,21 +10,16 @@ assert pythonSupport -> libxml2.pythonSupport; with stdenv.lib; stdenv.mkDerivation rec { - name = "libxslt-1.1.29"; + pname = "libxslt"; + version = "1.1.32"; + name = pname + "-" + version; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm"; + sha256 = "0q2l6m56iv3ysxgm2walhg4c9wp7q183jb328687i9zlp85csvjj"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-5029"; - url = "https://git.gnome.org/browse/libxslt/" - + "patch/?id=08ab2774b870de1c7b5a48693df75e8154addae5"; - sha256 = "10azfmyffjf9d7b5js4ipxw9f20qi0kw3zq34bpqmbcpq3l338ky"; - }) - ] ++ stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; + 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 '' @@ -38,12 +33,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ findXMLCatalogs ]; - # TODO move cryptoSupport as last flag, when upgrading libxslt - configureFlags = optional (!cryptoSupport) "--without-crypto" ++ [ + configureFlags = [ + "--with-libxml-prefix=${libxml2.dev}" "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ optional pythonSupport "--with-python=${python2}"; + ] ++ optional pythonSupport "--with-python=${python2}" + ++ optional (!cryptoSupport) "--without-crypto"; postFixup = '' moveToOutput bin/xslt-config "$dev" @@ -51,7 +47,7 @@ stdenv.mkDerivation rec { moveToOutput share/man/man1 "$bin" '' + optionalString pythonSupport '' mkdir -p $py/nix-support - echo ${libxml2.py} >> $py/nix-support/propagated-native-build-inputs + echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs moveToOutput lib/python2.7 "$py" ''; diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index f0284370726599fe7f0281ece5520332aa0e962a..ff09aeab2c6fb7362924e8a3cc6dece9e6e63d46 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -2,28 +2,26 @@ stdenv.mkDerivation rec { name = "libyaml-cpp-${version}"; - version = "0.5.3"; + version = "0.6.2"; src = fetchFromGitHub { owner = "jbeder"; repo = "yaml-cpp"; - rev = "release-${version}"; - sha256 = "0qr286q8mwbr4cxz0y0rf045zc071qh3cb804by6w1ydlqciih8a"; + rev = "yaml-cpp-${version}"; + sha256 = "16lclpa487yghf9019wymj419wkyx4795wv9q7539hhimajw9kpb"; }; outputs = [ "out" "dev" ]; - buildInputs = [ cmake boost ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; - enableParallelBuilding = true; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A YAML parser and emitter for C++"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ andir ]; }; } diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index aa2c81313922416ad34360df1510bf6d885862a5..5b10e62deee78c8e92526105f2488a411f3b6702 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = http://opensource.yubico.com/yubico-c/; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; license = licenses.bsd2; - maintainers = with maintainers; [ calrama wkennington ]; + maintainers = with maintainers; [ wkennington ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index a5799f79b56b6ae9d684d36f5fdb08ae2648a644..4a5aa057a5cf841cf48da5330c5b6aa926bdefb2 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "3.0"; + version = "3.1"; name = "libzdb-${version}"; src = fetchurl { url = "http://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; - sha256 = "e334bcb9ca1410e863634a164e3b1b5784018eb6e90b6c2b527780fc29a123c8"; + sha256 = "1596njvy518x7vsvsykmnk1ky82x8jxd6nmmp551y6hxn2qsn08g"; }; buildInputs = [ sqlite ]; @@ -19,6 +19,6 @@ stdenv.mkDerivation rec description = "A small, easy to use Open Source Database Connection Pool Library"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.calrama ]; + maintainers = [ ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 850bb27e364185f9af598cb9c76ac131cc873c6a..131b64c1c7f2d7eddf099e7d7f1346d70bdea620 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; src = fetchurl { - url = "http://www.nih.at/libzip/${name}.tar.gz"; + url = "https://www.nih.at/libzip/${name}.tar.gz"; sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.nih.at/libzip; + homepage = https://www.nih.at/libzip; description = "A C library for reading, creating and modifying zip archives"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index e20aa514aa2a0f02af4a6d480d7307a3ba0e2ea5..6050a7080df9bbe1ae5f0611dd1ab001e1d7e353 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libzmf"; - version = "0.0.1"; + version = "0.0.2"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz"; - sha256 = "0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga"; + sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; }; buildInputs = [boost icu libpng librevenge zlib cppunit]; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 5868fdf8b63ab2b39710233b373bf81e45d356f3..b4a33bbe7df2e7bdaa145714a8f140567511949e 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, binutils }: +{ stdenv, fetchurl, libopcodes }: with stdenv.lib; stdenv.mkDerivation rec { @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz"; }; - # Needs libopcodes.so from binutils for 'make check' - buildInputs = [ binutils ]; + buildInputs = stdenv.lib.optional doCheck libopcodes; doCheck = true; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 9aea42082c518bddab96805b780883c02f11b824..f2a8d75a9cbbfe14c74506c2e3bc08415ba310eb 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Distributed tracing system built on top of the OpenTracing standard"; - homepage = "http://lightstep.com/"; + homepage = "https://lightstep.com/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; + broken = true; # 2018-02-16 }; } diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index a4dc7b5e93d19eda121523cf626f3cefc677c7b4..9c1815f840b4ef25b6ff500d76c34e0f5e4badba 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, cmake, mesa, libX11, libXi }: +{ stdenv, requireFile, cmake, libGLU_combined, libX11, libXi }: let sourceInfo = rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; inherit (sourceInfo) name version; - buildInputs = [ cmake mesa libX11 libXi ]; + buildInputs = [ cmake libGLU_combined libX11 libXi ]; sourceRoot = "liquidfun/Box2D/"; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 960c8cc24949be77b27ee6c52ac2c1837559b03e..7f4d8cc19c8e437a88299b278fc71e9806e0e698 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,31 +1,45 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3 +, libxslt, systemd, libusb, libftdi1 }: stdenv.mkDerivation rec { - name = "lirc-0.9.4"; + name = "lirc-0.10.1"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; - sha256 = "19c6ldjsdnk1md66q3nb035ja1xj217k8iabhxpsb8rs10a6kwi6"; + sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb"; }; - preBuild = "patchShebangs ."; + postPatch = '' + patchShebangs . + + # fix overriding PYTHONPATH + sed -i 's,^PYTHONPATH *= *,PYTHONPATH := $(PYTHONPATH):,' \ + Makefile.in + sed -i 's,PYTHONPATH=,PYTHONPATH=$(PYTHONPATH):,' \ + doc/Makefile.in + ''; + + preConfigure = '' + # use empty inc file instead of a from linux kernel generated one + touch lib/lirc/input_map.inc + ''; nativeBuildInputs = [ pkgconfig help2man ]; - buildInputs = [ alsaLib xlibsWrapper python3 libxslt ]; + buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ] + ++ (with python3.pkgs; [ python pyyaml setuptools ]); configureFlags = [ - "--with-driver=devinput" "--sysconfdir=/etc" "--localstatedir=/var" - "--enable-sandboxed" + "--with-systemdsystemunitdir=$(out)/lib/systemd/system" + "--enable-uinput" # explicite activation because build env has no uinput + "--enable-devinput" # explicite activation because build env has not /dev/input ]; - makeFlags = [ "m4dir=$(out)/m4" ]; - installFlags = [ - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" + "sysconfdir=$out/etc" + "localstatedir=$TMPDIR" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index e0f84f5080df47693ed4204a514f0eb66318c8f3..1479f7b6153b25ae0964b5ec640ca52a925fafba 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -2,14 +2,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD let - version = "2016.02.09"; + version = "2018.02.28"; in stdenv.mkDerivation { name = "live555-${version}"; src = fetchurl { # the upstream doesn't provide a stable URL url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"; - sha256 = "02z2f8z5cy0ajnh9pgar40lsxdknfw5cbyw52138hxnpr6adrvak"; + sha256 = "0zi47asv1qmb09g321m02q684i3c90vci0mgkdh1mlmx2rbg1d1d"; }; postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles" diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index d96b5ed6d520f4ae05b9cd8b257741ffb7bfa90e..0bb3a67d9502a3bcf1b7c0b6926cdd66e74af41a 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,17 +2,20 @@ stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.21"; + version = "0.9.22"; src = fetchFromGitHub { owner = "LMDB"; repo = "lmdb"; rev = "LMDB_${version}"; - sha256 = "026a6himvg3y4ssnccdbgr3c2pq3w2d47nayn05v512875z4f2w3"; + sha256 = "0lng4ra2qrbqcf8klvqp68qarha0z4bkqhhv8lhh45agsxyrhfkj"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; + patches = [ ./hardcoded-compiler.patch ]; + patchFlags = "-p3"; + outputs = [ "bin" "out" "dev" ]; makeFlags = [ "prefix=$(out)" "CC=cc" ] diff --git a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch new file mode 100644 index 0000000000000000000000000000000000000000..ddb247b7f113a8404f7d485b38fab63c412c5dac --- /dev/null +++ b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch @@ -0,0 +1,26 @@ +commit 029031a68873bc3784a8561bd8e049efbd34f9d0 (HEAD) +Author: Vladimír Čunát +Date: Sun Apr 1 11:05:31 2018 +0200 + + make: gcc -> $(CC) + +diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile +index f254511..612484e 100644 +--- a/libraries/liblmdb/Makefile ++++ b/libraries/liblmdb/Makefile +@@ -102,13 +102,13 @@ COV_OBJS=xmdb.o xmidl.o + + coverage: xmtest + for i in mtest*.c [0-9]*.c; do j=`basename \$$i .c`; $(MAKE) $$j.o; \ +- gcc -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ ++ $(CC) -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ + rm -rf testdb; mkdir testdb; ./x$$j; done + gcov xmdb.c + gcov xmidl.c + + xmtest: mtest.o xmdb.o xmidl.o +- gcc -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) ++ $(CC) -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) + + xmdb.o: mdb.c lmdb.h midl.h + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c mdb.c -o $@ diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 96cbbb770b4cc79b8913453cbb1f054ac45650f8..d2918c87f3351adf57c370b584aca1db0f993686 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "log4cpp-1.1.1"; + name = "log4cpp-1.1.3"; src = fetchurl { url = "mirror://sourceforge/log4cpp/${name}.tar.gz"; - sha256 = "1l5yz5rfzzv6g3ynrj14mxfsk08cp5h1ssr7d74hjs0accrg7arm"; + sha256 = "07gmr3jyaf2239n9sp6h7hwdz1pv7b7aka8n06gmr2fnlmaymfrc"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index ac0b7bf683411718ccd6661c8af1859f70809294..8e8541564245b3b42e12ed2ad7902ca9e2ca747a 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool ]; meta = { - homepage = http://logging.apache.org/log4cxx/index.html; + homepage = https://logging.apache.org/log4cxx/index.html; description = "A logging framework for C++ patterned after Apache log4j"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/luaffi/darwin.patch b/pkgs/development/libraries/luaffi/darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..50db81b776d74d790370e74b4b9726e308736741 --- /dev/null +++ b/pkgs/development/libraries/luaffi/darwin.patch @@ -0,0 +1,17 @@ +diff --git a/Makefile b/Makefile +index b2b5f2c..b690a5d 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,10 +18,10 @@ test: + if [ `uname` = "Darwin" ]; then $(MAKE) test_macosx; else $(MAKE) test_posix; fi + + macosx: +- $(MAKE) posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)" ++ $(MAKE) posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)" + + test_macosx: +- $(MAKE) test_posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)" ++ $(MAKE) test_posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)" + + posix: $(MODSO) test_cdecl.so + diff --git a/pkgs/development/libraries/luaffi/default.nix b/pkgs/development/libraries/luaffi/default.nix index 1e4cf11d1fa0572482b7c6b8c6fd4f93952b7863..065562ac82ec2f495a0a8f53697f8a629c9839c8 100644 --- a/pkgs/development/libraries/luaffi/default.nix +++ b/pkgs/development/libraries/luaffi/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lua ]; - patches = [ - ./makefile-errors.patch - ]; + patches = [ ./darwin.patch ./makefile-errors.patch ]; + + makeFlags = [ "PREFIX=$(out)" ]; installPhase = '' mkdir -p $out/lib diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index e8f8a6ab9bbad64d8c43ec34055748aacc63ebfe..c7667b554f4ee60eb83eee5e97d5be7f61b54398 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = true; # not cross; meta = with stdenv.lib; { description = "Real-time data (de)compression library"; @@ -30,6 +30,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 0a64c7c0429a24b2d501b2d3d2cfc4ba1ac2b4d2..3828ebcb7a707ddc5225a0b161efc89c8c799a35 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "mailcore2-${version}"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "MailCore"; repo = "mailcore2"; rev = version; - sha256 = "1k0l59cdk8np4pff1my07dp7ivf3nchlhcpvm9xizp0my9rqgbxb"; + sha256 = "1d0wmnkk9vnjqc28i79z3fwaaycdbprfspagik4mzdkgval5r5pm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 83ddcbf52e140d3ec90e1c263ea48ae158d46265..573215227369b9f8789b308d93d619994d7d2603 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.10"; + name = "matio-1.5.12"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "00dmg2f5k2xgakp7l0lganz122b1agazw5d899xci35xrqc9j821"; + sha256 = "1afqjhc1wbm7g1vry3w30c7dbrxg6n4i482ybgx6l1b5wj0f75c6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mbedtls/darwin_dylib.patch b/pkgs/development/libraries/mbedtls/darwin_dylib.patch new file mode 100644 index 0000000000000000000000000000000000000000..bc6992d6e779f951da64783f1cad84bcf17730ab --- /dev/null +++ b/pkgs/development/libraries/mbedtls/darwin_dylib.patch @@ -0,0 +1,28 @@ +diff --git a/library/Makefile b/library/Makefile +index 28f9231..ad9cc32 100644 +--- a/library/Makefile ++++ b/library/Makefile +@@ -103,9 +103,9 @@ libmbedtls.so: libmbedtls.$(SOEXT_TLS) + echo " LN $@ -> $<" + ln -sf $< $@ + +-libmbedtls.dylib: $(OBJS_TLS) ++libmbedtls.dylib: $(OBJS_TLS) libmbedx509.dylib + echo " LD $@" +- $(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS) ++ $(CC) -dynamiclib -L. -lmbedcrypto -lmbedx509 $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS) + + libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll + echo " LD $@" +@@ -126,9 +126,9 @@ libmbedx509.so: libmbedx509.$(SOEXT_X509) + echo " LN $@ -> $<" + ln -sf $< $@ + +-libmbedx509.dylib: $(OBJS_X509) ++libmbedx509.dylib: $(OBJS_X509) libmbedcrypto.dylib + echo " LD $@" +- $(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509) ++ $(CC) -dynamiclib -L. -lmbedcrypto $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509) + + libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll + echo " LD $@" diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 8195ba2d4d66c57c802e72168df58ba20b201ca9..8c2a2a694b0357bfacff80a9bd8c707a0411f93e 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,28 +1,32 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.6.0"; + name = "mbedtls-2.8.0"; - src = fetchurl { - url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "042q1l4708zjn5v72sa9qdvgx173kmy4hbcd23wj5vqd6vbmk6d9"; + src = fetchFromGitHub { + owner = "ARMmbed"; + repo = "mbedtls"; + rev = name; + sha256 = "1pnwmy0qg8g9lz26fpr5fzpvrdjm59winxpwdjfp6d62qxdjbgmn"; }; nativeBuildInputs = [ perl ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_dylib.patch ]; + + postPatch = '' + patchShebangs . + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace library/Makefile --replace "-soname" "-install_name" substituteInPlace tests/scripts/run-test-suites.pl --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" # Necessary for install_name_tool below echo "LOCAL_LDFLAGS += -headerpad_max_install_names" >> programs/Makefile ''; - postPatch = '' - patchShebangs . - ''; - makeFlags = [ "SHARED=1" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "DLEXT=dylib" ]; installFlags = [ @@ -30,14 +34,14 @@ stdenv.mkDerivation rec { ]; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $out/lib/libmbedtls.so.10 - install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $out/lib/libmbedx509.so.0 - install_name_tool -change libmbedx509.so.0 $out/lib/libmbedx509.so.0 $out/lib/libmbedtls.so.10 + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib + install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib for exe in $out/bin/*; do - install_name_tool -change libmbedtls.so.10 $out/lib/libmbedtls.so.10 $exe - install_name_tool -change libmbedx509.so.0 $out/lib/libmbedx509.so.0 $exe - install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $exe + install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe + install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe done ''; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 7b7c77659bdc98c6d15db9a98190d0bce328b168..592b6d7a67796e487c5fbfa9bac4b2454008bc7f 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.2.2"; + version = "1.3.1"; name = "mdds-${version}"; src = fetchurl { url = "http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; - sha256 = "17fcjhsq3bzqm7ba9sgp6my3y4226jnwai6q5jq3810i745p67hl"; + sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w"; }; postInstall = '' diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 06cc53abb564f1e0a356afc5b690c751b3f3f53c..8b756e338e483747484e66a66bd04080bb5b65cf 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,28 +1,35 @@ { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm -, libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp +, libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen -, python, libXext, libmatroska, openssl +, python, libXext, libmatroska, openssl, fetchpatch }: stdenv.mkDerivation rec { baseName = "mediastreamer2"; - version = "2.14.0"; + version = "2.16.1"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "1b59rzsaw54mhy4pz9hndmim4rgidkn7s6c4iyl34mz58lwxpmqp"; + sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j"; }; - patches = [ ./plugins_dir.patch ]; + patches = [ + (fetchpatch { + name = "allow-build-without-git.patch"; + url = "https://github.com/BelledonneCommunications/mediastreamer2/commit/de3a24b795d7a78e78eab6b974e7ec5abf2259ac.patch"; + sha256 = "1zqkrab42n4dha0knfsyj4q0wc229ma125gk9grj67ps7r7ipscy"; + }) + ./plugins_dir.patch + ]; nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ]; propagatedBuildInputs = [ alsaLib libpulseaudio speex gsm libopus - ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp + ffmpeg libX11 libXv libGLU_combined glew libtheora libvpx SDL libupnp ortp libv4l libpcap srtp bctoolbox libXext libmatroska openssl ]; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index a490aa1e4451e0169e2b85412e2f67c42a4a3aac..c92b6a4e7287d9335c042494f7c99c2a8d8d84fc 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glib, pkgconfig, libfm-extra }: -let name = "menu-cache-1.0.2"; +let name = "menu-cache-1.1.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "1m8j40npykfcfqs43kc0fmksal2jfmfi8lnb3mq3xy1lvvrfv0vg"; + sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 9a6441956db3705f20ada1bdbda821f31d5c4409..4e35d6ed24d157214e48d9b93e3aa982ae226f67 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu }: +{ stdenv, fetchurl, pkgconfig, libGL }: stdenv.mkDerivation rec { - name = "glu-9.0.0"; + name = "glu-${version}"; + version = "9.0.0"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ mesa_noglu ]; + propagatedBuildInputs = [ libGL ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 728ef96666f62aa62073e3b63874cabb06340387..e77a4e1414e911dd9ee10ace83f9edfb7c5a9445 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, intltool, autoreconfHook, substituteAll , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages, libffi, libomxil-bellagio, libva +, llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 +, libglvnd , grsecEnabled ? false , enableRadv ? true # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. @@ -14,7 +15,7 @@ }: /** Packaging design: - - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). + - The basic mesa ($out) contains headers and libraries (GLU is in libGLU now). This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers) and are designed to be the buildInput of other packages. - DRI drivers are compiled into $drivers output, which is much bigger and @@ -54,7 +55,7 @@ let (if gallium_ == null then defaultGalliumDrivers else gallium_) - ++ ["swrast"]; + ++ ["swrast" "virgl"]; driDrivers = (if dri_ == null then defaultDriDrivers @@ -66,12 +67,11 @@ let in let - version = "17.2.4"; + version = "17.3.8"; branch = head (splitString "." version); - driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in -stdenv.mkDerivation { +let self = stdenv.mkDerivation { name = "mesa-noglu-${version}"; src = fetchurl { @@ -81,7 +81,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0l75q9l4g15y66rqk2swqvj18qj60hpimv0f97jk44bfrpz0i92v"; + sha256 = "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg"; }; prePatch = "patchShebangs ."; @@ -92,16 +92,17 @@ stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch + ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl ]; outputs = [ "out" "dev" "drivers" "osmesa" ]; # TODO: Figure out how to enable opencl without having a runtime dependency on clang configureFlags = [ - "--sysconfdir=/etc" + "--sysconfdir=${libglvnd.driverLink}/etc" "--localstatedir=/var" "--with-dri-driverdir=$(drivers)/lib/dri" - "--with-dri-searchpath=${driverLink}/lib/dri" + "--with-dri-searchpath=${libglvnd.driverLink}/lib/dri" "--with-platforms=x11,wayland,drm" ] ++ (optional (galliumDrivers != []) @@ -118,6 +119,7 @@ stdenv.mkDerivation { (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine + "--enable-libglvnd" "--enable-dri" "--enable-driglx-direct" "--enable-gles1" @@ -134,7 +136,7 @@ stdenv.mkDerivation { "--enable-shared-glapi" "--enable-sysfs" "--enable-llvm-shared-libs" - "--enable-omx" + "--enable-omx-bellagio" "--enable-va" "--disable-opencl" ]; @@ -146,21 +148,21 @@ stdenv.mkDerivation { ++ optional stdenv.isLinux libdrm; buildInputs = with xorg; [ - expat llvmPackages.llvm + expat llvmPackages.llvm libglvnd glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland wayland-protocols libvdpau libelf libXvMC - libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ + libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/ valgrind-light python2 ]; - enableParallelBuilding = true; doCheck = false; installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" + "vendorjsondir=\${out}/share/glvnd/egl_vendor.d" ]; # TODO: probably not all .la files are completely fixed, but it shouldn't matter; @@ -174,8 +176,10 @@ stdenv.mkDerivation { $out/lib/libxatracker* \ $out/lib/libvulkan_* + # Move other drivers to a separate output mv $out/lib/dri/* $drivers/lib/dri # */ rmdir "$out/lib/dri" + mv $out/lib/lib*_mesa* $drivers/lib # move libOSMesa to $osmesa, as it's relatively big mkdir -p {$osmesa,$drivers}/lib/ @@ -185,10 +189,22 @@ stdenv.mkDerivation { sed "/^libdir=/s,$out,$osmesa," -i $osmesa/lib/libOSMesa*.la # set the default search path for DRI drivers; used e.g. by X server - substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" - '' + optionalString (vulkanDrivers != []) '' - # move share/vulkan/icd.d/ + substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${libglvnd.driverLink}" + + # remove GLES libraries; they are provided by libglvnd + rm $out/lib/lib{GLESv1_CM,GLESv2}.* + + # remove pkgconfig files for GL/GLES/EGL; they are provided by libGL. + rm $dev/lib/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc + + # move vendor files mv $out/share/ $drivers/ + + # Update search path used by glvnd + for js in $drivers/share/glvnd/egl_vendor.d/*.json; do + substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" + done + '' + optionalString (vulkanDrivers != []) '' # Update search path used by Vulkan (it's pointing to $out but # drivers are in $drivers) for js in $drivers/share/vulkan/icd.d/*.json; do @@ -197,7 +213,6 @@ stdenv.mkDerivation { ''; # TODO: - # @vcunat isn't sure if drirc will be found when in $out/etc/; # check $out doesn't depend on llvm: builder failures are ignored # for some reason grep -qv '${llvmPackages.llvm}' -R "$out"; postFixup = '' @@ -210,13 +225,48 @@ stdenv.mkDerivation { done ''; - passthru = { inherit libdrm version driverLink; }; + passthru = { + inherit libdrm version; + inherit (libglvnd) driverLink; + + stubs = stdenv.mkDerivation { + name = "libGL-${libglvnd.version}"; + outputs = [ "out" "dev" ]; + + # Use stub libraries from libglvnd and headers from Mesa. + buildCommand = '' + ln -s ${libglvnd.out} $out + mkdir -p $dev/{,lib/pkgconfig,nix-support} + echo "$out" > $dev/nix-support/propagated-build-inputs + ln -s ${self.dev}/include $dev/include + + genPkgConfig() { + local name="$1" + local lib="$2" + + cat <$dev/lib/pkgconfig/$name.pc + Name: $name + Description: $lib library + Version: ${self.version} + Libs: -L${libglvnd.out}/lib -l$lib + Cflags: -I${self.dev}/include + EOF + } + + genPkgConfig gl GL + genPkgConfig egl EGL + genPkgConfig glesv1_cm GLESv1_CM + genPkgConfig glesv2 GLESv2 + ''; + }; + }; meta = with stdenv.lib; { description = "An open source implementation of OpenGL"; - homepage = http://www.mesa3d.org/; + homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files - platforms = platforms.mesaPlatforms; + platforms = platforms.linux; maintainers = with maintainers; [ eduarrrd vcunat ]; }; -} +}; +in self diff --git a/pkgs/development/libraries/mesa/missing-include.patch b/pkgs/development/libraries/mesa/missing-include.patch new file mode 100644 index 0000000000000000000000000000000000000000..dd3e6bb64af827a237fe80c6fe07b495e78909ff --- /dev/null +++ b/pkgs/development/libraries/mesa/missing-include.patch @@ -0,0 +1,11 @@ +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index b419eccfe7947ef4f43854aa4e101e711900a942..1c10bd6f8fcda78676460fdb3bed72f8192c1091 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -1,5 +1,10 @@ -{ stdenv, fetchgit, cmake }: +{ stdenv, fetchgit, cmake +, hostPlatform, buildPlatform +}: +let + nativeBuild = hostPlatform == buildPlatform; +in stdenv.mkDerivation rec { name = "microsoft_gsl-${version}"; version = "2017-02-13"; @@ -10,8 +15,11 @@ stdenv.mkDerivation rec { sha256 = "03d17mnx6n175aakin313308q14wzvaa9pd0m1yfk6ckhha4qf35"; }; - # build phase just runs the unit tests - buildInputs = [ cmake ]; + + # build phase just runs the unit tests, so skip it if + # we're doing a cross build + nativeBuildInputs = [ cmake ]; + buildPhase = if nativeBuild then "make" else "true"; installPhase = '' mkdir -p $out/include @@ -20,9 +28,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Functions and types that are suggested for use by the C++ Core Guidelines"; - homepage = https://github.com/Microsoft/GSL; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ xwvvvvwx ]; + homepage = https://github.com/Microsoft/GSL; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice xwvvvvwx ]; }; } diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index fc48c85f23c7c1ff4d729cb8cc586ea207f14d18..7a06f9277c957f0ca45ed7d9ad3c8cdcbe31d36a 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MIME handling library"; - homepage = http://codesink.org/mimetic_mime_library.html; + homepage = http://www.codesink.org/mimetic_mime_library.html; license = licenses.mit; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 6eee8df5a23eb9f99a688dc72d1450ac86946d74..59700669ba7cdb4a28f86e5587ed0b404b0ef2d5 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,28 +6,15 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.4.1"; + version = "6.6.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w"; + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; }; - patches = [ - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; - }) - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; - }) - ]; - buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 makeWrapper movit pkgconfig sox diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f3bdc005247c4fc7078bd37c2c5213f9f68a2cb9..27f7cf31cbf2a3db444ce0ea3b8f31aa280b8580 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate +{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg , fftw, vid-stab, opencv3, ladspa-sdk }: @@ -7,24 +7,14 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.4.1"; + version = "6.6.0"; - src = fetchurl { - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47"; + src = fetchFromGitHub { + owner = "mltframework"; + repo = "mlt"; + rev = "v${version}"; + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; }; - patches = [ - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; - }) - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; - }) - ]; buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 @@ -69,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - homepage = http://www.mltframework.org/; + homepage = https://www.mltframework.org/; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 4cba89d9206febe2514307a09cbc5d5713d246b8..2a933ef784013d89309c9dbf48afeb325a9d53f8 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig which perl ]; - buildInputs = [ openssl zlib snappy ]; - propagatedBuildInputs = [ libbson ]; + buildInputs = [ openssl zlib ]; + propagatedBuildInputs = [ libbson snappy ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "The official C client library for MongoDB"; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index d85d4f444077f111c2b2b1797c810fbb6dee81de..3766140eea1eed6b73aa0b54397a17a03f1325ac 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; src = fetchurl { - url = "http://movit.sesse.net/${name}.tar.gz"; + url = "https://movit.sesse.net/${name}.tar.gz"; sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44"; }; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index de8e5f786466e17e8c5e9a906960c0c5d418ef77..a5542ebb659ab7693af7d7c7b0517f72baca96a2 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "mp4v2-2.0.0"; @@ -8,20 +8,30 @@ stdenv.mkDerivation rec { sha256 = "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683"; }; - # From Handbrake - # mp4v2 doesn't seem to be actively maintained any more :-/ patches = [ + # From Handbrake + # mp4v2 doesn't seem to be actively maintained any more :-/ ./A02-meaningful-4gb-warning.patch + + (fetchurl { + name = "gcc-7.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/" + + "0004-Fix-GCC7-build.patch?id=d7aeedabb"; + sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w"; + }) ]; + # `faac' expects `mp4.h'. postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; hardeningDisable = [ "format" ]; + enableParallelBuilding = true; + meta = { homepage = https://code.google.com/archive/p/mp4v2/; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mpl11; + platforms = lib.platforms.unix; + license = lib.licenses.mpl11; }; } diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 6be199af19308d3c4e4227d315d96682aa51bfa2..4aac5a92709224e13f228171ddab2cd57971cdbc 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, gmp -, buildPlatform, hostPlatform +, hostPlatform }: stdenv.mkDerivation rec { - name = "mpfr-3.1.3"; + name = "mpfr-3.1.6"; src = fetchurl { - url = "mirror://gnu/mpfr/${name}.tar.bz2"; - sha256 = "1z8akfw9wbmq91vrx04bw86mmnxw2sw5qm5cr8ix5b3w2mcv8fzn"; + url = "mirror://gnu/mpfr/${name}.tar.xz"; + sha256 = "0l598h9klpgkz2bp0rxiqb90mkqh9f2f81n5rpy191j00hdaqqks"; }; - patches = [ ./upstream.patch ]; - outputs = [ "out" "dev" "doc" "info" ]; # mpfr.h requires gmp.h @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional hostPlatform.isSunOS "--disable-thread-safe" ++ stdenv.lib.optional hostPlatform.is64bit "--with-pic"; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mpfr/upstream.patch b/pkgs/development/libraries/mpfr/upstream.patch deleted file mode 100644 index 779331605245842dba3b0acb4ba6535d88a2c3a9..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/mpfr/upstream.patch +++ /dev/null @@ -1,1699 +0,0 @@ -diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES ---- mpfr-3.1.3-a/PATCHES 2015-07-02 10:49:23.950112879 +0000 -+++ mpfr-3.1.3-b/PATCHES 2015-07-02 10:49:24.042113845 +0000 -@@ -0,0 +1 @@ -+lngamma-and-doc -diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION ---- mpfr-3.1.3-a/VERSION 2015-06-19 19:55:09.000000000 +0000 -+++ mpfr-3.1.3-b/VERSION 2015-07-02 10:49:24.042113845 +0000 -@@ -1 +1 @@ --3.1.3 -+3.1.3-p1 -diff -Naurd mpfr-3.1.3-a/doc/mpfr.texi mpfr-3.1.3-b/doc/mpfr.texi ---- mpfr-3.1.3-a/doc/mpfr.texi 2015-06-19 19:55:11.000000000 +0000 -+++ mpfr-3.1.3-b/doc/mpfr.texi 2015-07-02 10:49:24.018113593 +0000 -@@ -810,13 +810,17 @@ - When the input point is in the closure of the domain of the mathematical - function and an input argument is +0 (resp.@: @minus{}0), one considers - the limit when the corresponding argument approaches 0 from above --(resp.@: below). If the limit is not defined (e.g., @code{mpfr_log} on --@minus{}0), the behavior is specified in the description of the MPFR function. -+(resp.@: below), if possible. If the limit is not defined (e.g., -+@code{mpfr_sqrt} and @code{mpfr_log} on @minus{}0), the behavior is -+specified in the description of the MPFR function, but must be consistent -+with the rule from the above paragraph (e.g., @code{mpfr_log} on @pom{}0 -+gives @minus{}Inf). - - When the result is equal to 0, its sign is determined by considering the - limit as if the input point were not in the domain: If one approaches 0 - from above (resp.@: below), the result is +0 (resp.@: @minus{}0); --for example, @code{mpfr_sin} on +0 gives +0. -+for example, @code{mpfr_sin} on @minus{}0 gives @minus{}0 and -+@code{mpfr_acos} on 1 gives +0 (in all rounding modes). - In the other cases, the sign is specified in the description of the MPFR - function; for example @code{mpfr_max} on @minus{}0 and +0 gives +0. - -@@ -832,8 +836,8 @@ - @c that advantages in practice), like for any bug fix. - Example: @code{mpfr_hypot} on (NaN,0) gives NaN, but @code{mpfr_hypot} - on (NaN,+Inf) gives +Inf (as specified in @ref{Special Functions}), --since for any finite input @var{x}, @code{mpfr_hypot} on (@var{x},+Inf) --gives +Inf. -+since for any finite or infinite input @var{x}, @code{mpfr_hypot} on -+(@var{x},+Inf) gives +Inf. - - @node Exceptions, Memory Handling, Floating-Point Values on Special Numbers, MPFR Basics - @comment node-name, next, previous, up -@@ -1581,7 +1585,8 @@ - @deftypefunx int mpfr_add_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd}) - @deftypefunx int mpfr_add_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @math{@var{op1} + @var{op2}} rounded in the direction --@var{rnd}. For types having no signed zero, it is considered unsigned -+@var{rnd}. The IEEE-754 rules are used, in particular for signed zeros. -+But for types having no signed zeros, 0 is considered unsigned - (i.e., (+0) + 0 = (+0) and (@minus{}0) + 0 = (@minus{}0)). - The @code{mpfr_add_d} function assumes that the radix of the @code{double} type - is a power of 2, with a precision at most that declared by the C implementation -@@ -1599,7 +1604,8 @@ - @deftypefunx int mpfr_sub_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd}) - @deftypefunx int mpfr_sub_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @math{@var{op1} - @var{op2}} rounded in the direction --@var{rnd}. For types having no signed zero, it is considered unsigned -+@var{rnd}. The IEEE-754 rules are used, in particular for signed zeros. -+But for types having no signed zeros, 0 is considered unsigned - (i.e., (+0) @minus{} 0 = (+0), (@minus{}0) @minus{} 0 = (@minus{}0), - 0 @minus{} (+0) = (@minus{}0) and 0 @minus{} (@minus{}0) = (+0)). - The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_sub} -@@ -1615,7 +1621,7 @@ - Set @var{rop} to @math{@var{op1} @GMPtimes{} @var{op2}} rounded in the - direction @var{rnd}. - When a result is zero, its sign is the product of the signs of the operands --(for types having no signed zero, it is considered positive). -+(for types having no signed zeros, 0 is considered positive). - The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_mul_d}. - @end deftypefun - -@@ -1635,7 +1641,7 @@ - @deftypefunx int mpfr_div_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @math{@var{op1}/@var{op2}} rounded in the direction @var{rnd}. - When a result is zero, its sign is the product of the signs of the operands --(for types having no signed zero, it is considered positive). -+(for types having no signed zeros, 0 is considered positive). - The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_div} - and @code{mpfr_div_d}. - @end deftypefun -@@ -1643,15 +1649,18 @@ - @deftypefun int mpfr_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd}) - @deftypefunx int mpfr_sqrt_ui (mpfr_t @var{rop}, unsigned long int @var{op}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @m{\sqrt{@var{op}}, the square root of @var{op}} --rounded in the direction @var{rnd} (set @var{rop} to @minus{}0 if @var{op} is --@minus{}0, to be consistent with the IEEE 754 standard). -+rounded in the direction @var{rnd}. Set @var{rop} to @minus{}0 if -+@var{op} is @minus{}0, to be consistent with the IEEE 754 standard. - Set @var{rop} to NaN if @var{op} is negative. - @end deftypefun - - @deftypefun int mpfr_rec_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @m{1/\sqrt{@var{op}}, the reciprocal square root of @var{op}} --rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is --@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative. -+rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is -+@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative. Warning! -+Therefore the result on @minus{}0 is different from the one of the rSqrt -+function recommended by the IEEE 754-2008 standard (Section 9.2.1), which -+is @minus{}Inf instead of +Inf. - @end deftypefun - - @deftypefun int mpfr_cbrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd}) -@@ -1832,7 +1841,9 @@ - @m{\log_2 @var{op}, log2(@var{op})} or - @m{\log_{10} @var{op}, log10(@var{op})}, respectively, - rounded in the direction @var{rnd}. --Set @var{rop} to @minus{}Inf if @var{op} is @minus{}0 -+Set @var{rop} to +0 if @var{op} is 1 (in all rounding modes), -+for consistency with the ISO C99 and IEEE 754-2008 standards. -+Set @var{rop} to @minus{}Inf if @var{op} is @pom{}0 - (i.e., the sign of the zero has no influence on the result). - @end deftypefun - -@@ -2003,8 +2014,11 @@ - @deftypefun int mpfr_lngamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to the value of the logarithm of the Gamma function on @var{op}, - rounded in the direction @var{rnd}. --When @math{@minus{}2@var{k}@minus{}1 @le{} @var{op} @le{} @minus{}2@var{k}}, --@var{k} being a non-negative integer, @var{rop} is set to NaN. -+When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes). -+When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf, -+following the general rules on special values. -+When @math{@minus{}2@var{k}@minus{}1 < @var{op} < @minus{}2@var{k}}, -+@var{k} being a nonnegative integer, set @var{rop} to NaN@. - See also @code{mpfr_lgamma}. - @end deftypefun - -@@ -2012,10 +2026,11 @@ - Set @var{rop} to the value of the logarithm of the absolute value of the - Gamma function on @var{op}, rounded in the direction @var{rnd}. The sign - (1 or @minus{}1) of Gamma(@var{op}) is returned in the object pointed to --by @var{signp}. When @var{op} is an infinity or a non-positive integer, set --@var{rop} to +Inf. When @var{op} is NaN, @minus{}Inf or a negative integer, --*@var{signp} is undefined, and when @var{op} is @pom{}0, *@var{signp} is --the sign of the zero. -+by @var{signp}. -+When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes). -+When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf. -+When @var{op} is NaN, @minus{}Inf or a negative integer, *@var{signp} is -+undefined, and when @var{op} is @pom{}0, *@var{signp} is the sign of the zero. - @end deftypefun - - @deftypefun int mpfr_digamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd}) -@@ -2064,7 +2079,10 @@ - @deftypefunx int mpfr_fms (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_t @var{op3}, mpfr_rnd_t @var{rnd}) - Set @var{rop} to @math{(@var{op1} @GMPtimes{} @var{op2}) + @var{op3}} - (resp.@: @math{(@var{op1} @GMPtimes{} @var{op2}) - @var{op3}}) --rounded in the direction @var{rnd}. -+rounded in the direction @var{rnd}. Concerning special values (signed zeros, -+infinities, NaN), these functions behave like a multiplication followed by a -+separate addition or subtraction. That is, the fused operation matters only -+for rounding. - @end deftypefun - - @deftypefun int mpfr_agm (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_rnd_t @var{rnd}) -@@ -2089,8 +2107,8 @@ - i.e., $\sqrt{x^2+y^2}$, - @end tex - rounded in the direction @var{rnd}. --Special values are handled as described in Section F.9.4.3 of --the ISO C99 and IEEE 754-2008 standards: -+Special values are handled as described in the ISO C99 (Section F.9.4.3) -+and IEEE 754-2008 (Section 9.2.1) standards: - If @var{x} or @var{y} is an infinity, then +Inf is returned in @var{rop}, - even if the other number is NaN. - @end deftypefun -diff -Naurd mpfr-3.1.3-a/doc/mpfr.info mpfr-3.1.3-b/doc/mpfr.info ---- mpfr-3.1.3-a/doc/mpfr.info 2015-06-19 19:55:53.000000000 +0000 -+++ mpfr-3.1.3-b/doc/mpfr.info 2015-07-02 10:49:38.718267817 +0000 -@@ -1,4 +1,4 @@ --This is mpfr.info, produced by makeinfo version 5.2 from mpfr.texi. -+This is mpfr.info, produced by makeinfo version 6.0 from mpfr.texi. - - This manual documents how to install and use the Multiple Precision - Floating-Point Reliable Library, version 3.1.3. -@@ -55,7 +55,7 @@ - MPFR Copying Conditions - *********************** - --The GNU MPFR library (or MPFR for short) is "free"; this means that -+The GNU MPFR library (or MPFR for short) is “free”; this means that - everyone is free to use it and free to redistribute it on a free basis. - The library is not in the public domain; it is copyrighted and there are - restrictions on its distribution, but these restrictions are designed to -@@ -418,7 +418,7 @@ - 4.2 Nomenclature and Types - ========================== - --A "floating-point number", or "float" for short, is an arbitrary -+A “floating-point number”, or “float” for short, is an arbitrary - precision significand (also called mantissa) with a limited precision - exponent. The C data type for such objects is ‘mpfr_t’ (internally - defined as a one-element array of a structure, and ‘mpfr_ptr’ is the C -@@ -432,7 +432,7 @@ - to the other functions supported by MPFR. Unless documented otherwise, - the sign bit of a NaN is unspecified. - --The "precision" is the number of bits used to represent the significand -+The “precision” is the number of bits used to represent the significand - of a floating-point number; the corresponding C data type is - ‘mpfr_prec_t’. The precision can be any integer between ‘MPFR_PREC_MIN’ - and ‘MPFR_PREC_MAX’. In the current implementation, ‘MPFR_PREC_MIN’ is -@@ -446,7 +446,7 @@ - may abort, crash or have undefined behavior (depending on your C - implementation). - --The "rounding mode" specifies the way to round the result of a -+The “rounding mode” specifies the way to round the result of a - floating-point operation, in case the exact result can not be - represented exactly in the destination significand; the corresponding C - data type is ‘mpfr_rnd_t’. -@@ -499,14 +499,14 @@ - representable numbers, it is rounded to the one with the least - significant bit set to zero. For example, the number 2.5, which is - represented by (10.1) in binary, is rounded to (10.0)=2 with a precision --of two bits, and not to (11.0)=3. This rule avoids the "drift" -+of two bits, and not to (11.0)=3. This rule avoids the “drift” - phenomenon mentioned by Knuth in volume 2 of The Art of Computer - Programming (Section 4.2.2). - - Most MPFR functions take as first argument the destination variable, - as second and following arguments the input variables, as last argument - a rounding mode, and have a return value of type ‘int’, called the --"ternary value". The value stored in the destination variable is -+“ternary value”. The value stored in the destination variable is - correctly rounded, i.e., MPFR behaves as if it computed the result with - an infinite precision, then rounded it to the precision of this - variable. The input variables are regarded as exact (in particular, -@@ -572,15 +572,18 @@ - When the input point is in the closure of the domain of the - mathematical function and an input argument is +0 (resp. −0), one - considers the limit when the corresponding argument approaches 0 from --above (resp. below). If the limit is not defined (e.g., ‘mpfr_log’ on --−0), the behavior is specified in the description of the MPFR function. -+above (resp. below), if possible. If the limit is not defined (e.g., -+‘mpfr_sqrt’ and ‘mpfr_log’ on −0), the behavior is specified in the -+description of the MPFR function, but must be consistent with the rule -+from the above paragraph (e.g., ‘mpfr_log’ on ±0 gives −Inf). - - When the result is equal to 0, its sign is determined by considering - the limit as if the input point were not in the domain: If one - approaches 0 from above (resp. below), the result is +0 (resp. −0); for --example, ‘mpfr_sin’ on +0 gives +0. In the other cases, the sign is --specified in the description of the MPFR function; for example --‘mpfr_max’ on −0 and +0 gives +0. -+example, ‘mpfr_sin’ on −0 gives −0 and ‘mpfr_acos’ on 1 gives +0 (in all -+rounding modes). In the other cases, the sign is specified in the -+description of the MPFR function; for example ‘mpfr_max’ on −0 and +0 -+gives +0. - - When the input point is not in the closure of the domain of the - function, the result is NaN. Example: ‘mpfr_sqrt’ on −17 gives NaN. -@@ -590,8 +593,8 @@ - numbers; such a case is always explicitly specified in *note MPFR - Interface::. Example: ‘mpfr_hypot’ on (NaN,0) gives NaN, but - ‘mpfr_hypot’ on (NaN,+Inf) gives +Inf (as specified in *note Special --Functions::), since for any finite input X, ‘mpfr_hypot’ on (X,+Inf) --gives +Inf. -+Functions::), since for any finite or infinite input X, ‘mpfr_hypot’ on -+(X,+Inf) gives +Inf. - -  - File: mpfr.info, Node: Exceptions, Next: Memory Handling, Prev: Floating-Point Values on Special Numbers, Up: MPFR Basics -@@ -1253,8 +1256,9 @@ - mpfr_rnd_t RND) - -- Function: int mpfr_add_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2, - mpfr_rnd_t RND) -- Set ROP to OP1 + OP2 rounded in the direction RND. For types -- having no signed zero, it is considered unsigned (i.e., (+0) + 0 = -+ Set ROP to OP1 + OP2 rounded in the direction RND. The IEEE-754 -+ rules are used, in particular for signed zeros. But for types -+ having no signed zeros, 0 is considered unsigned (i.e., (+0) + 0 = - (+0) and (−0) + 0 = (−0)). The ‘mpfr_add_d’ function assumes that - the radix of the ‘double’ type is a power of 2, with a precision at - most that declared by the C implementation (macro -@@ -1280,8 +1284,9 @@ - mpfr_rnd_t RND) - -- Function: int mpfr_sub_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2, - mpfr_rnd_t RND) -- Set ROP to OP1 - OP2 rounded in the direction RND. For types -- having no signed zero, it is considered unsigned (i.e., (+0) − 0 = -+ Set ROP to OP1 - OP2 rounded in the direction RND. The IEEE-754 -+ rules are used, in particular for signed zeros. But for types -+ having no signed zeros, 0 is considered unsigned (i.e., (+0) − 0 = - (+0), (−0) − 0 = (−0), 0 − (+0) = (−0) and 0 − (−0) = (+0)). The - same restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_sub’ and - ‘mpfr_sub_d’. -@@ -1300,7 +1305,7 @@ - mpfr_rnd_t RND) - Set ROP to OP1 times OP2 rounded in the direction RND. When a - result is zero, its sign is the product of the signs of the -- operands (for types having no signed zero, it is considered -+ operands (for types having no signed zeros, 0 is considered - positive). The same restrictions than for ‘mpfr_add_d’ apply to - ‘mpfr_mul_d’. - -@@ -1327,21 +1332,24 @@ - mpfr_rnd_t RND) - Set ROP to OP1/OP2 rounded in the direction RND. When a result is - zero, its sign is the product of the signs of the operands (for -- types having no signed zero, it is considered positive). The same -+ types having no signed zeros, 0 is considered positive). The same - restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_div’ and - ‘mpfr_div_d’. - - -- Function: int mpfr_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - -- Function: int mpfr_sqrt_ui (mpfr_t ROP, unsigned long int OP, - mpfr_rnd_t RND) -- Set ROP to the square root of OP rounded in the direction RND (set -- ROP to −0 if OP is −0, to be consistent with the IEEE 754 -- standard). Set ROP to NaN if OP is negative. -+ Set ROP to the square root of OP rounded in the direction RND. Set -+ ROP to −0 if OP is −0, to be consistent with the IEEE 754 standard. -+ Set ROP to NaN if OP is negative. - - -- Function: int mpfr_rec_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - Set ROP to the reciprocal square root of OP rounded in the - direction RND. Set ROP to +Inf if OP is ±0, +0 if OP is +Inf, and -- NaN if OP is negative. -+ NaN if OP is negative. Warning! Therefore the result on −0 is -+ different from the one of the rSqrt function recommended by the -+ IEEE 754-2008 standard (Section 9.2.1), which is −Inf instead of -+ +Inf. - - -- Function: int mpfr_cbrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - -- Function: int mpfr_root (mpfr_t ROP, mpfr_t OP, unsigned long int K, -@@ -1515,8 +1523,10 @@ - -- Function: int mpfr_log2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - -- Function: int mpfr_log10 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - Set ROP to the natural logarithm of OP, log2(OP) or log10(OP), -- respectively, rounded in the direction RND. Set ROP to −Inf if OP -- is −0 (i.e., the sign of the zero has no influence on the result). -+ respectively, rounded in the direction RND. Set ROP to +0 if OP is -+ 1 (in all rounding modes), for consistency with the ISO C99 and -+ IEEE 754-2008 standards. Set ROP to −Inf if OP is ±0 (i.e., the -+ sign of the zero has no influence on the result). - - -- Function: int mpfr_exp (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - -- Function: int mpfr_exp2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) -@@ -1649,17 +1659,21 @@ - - -- Function: int mpfr_lngamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - Set ROP to the value of the logarithm of the Gamma function on OP, -- rounded in the direction RND. When −2K−1 <= OP <= −2K, K being a -- non-negative integer, ROP is set to NaN. See also ‘mpfr_lgamma’. -+ rounded in the direction RND. When OP is 1 or 2, set ROP to +0 (in -+ all rounding modes). When OP is an infinity or a nonpositive -+ integer, set ROP to +Inf, following the general rules on special -+ values. When −2K−1 < OP < −2K, K being a nonnegative integer, set -+ ROP to NaN. See also ‘mpfr_lgamma’. - - -- Function: int mpfr_lgamma (mpfr_t ROP, int *SIGNP, mpfr_t OP, - mpfr_rnd_t RND) - Set ROP to the value of the logarithm of the absolute value of the - Gamma function on OP, rounded in the direction RND. The sign (1 or - −1) of Gamma(OP) is returned in the object pointed to by SIGNP. -- When OP is an infinity or a non-positive integer, set ROP to +Inf. -- When OP is NaN, −Inf or a negative integer, *SIGNP is undefined, -- and when OP is ±0, *SIGNP is the sign of the zero. -+ When OP is 1 or 2, set ROP to +0 (in all rounding modes). When OP -+ is an infinity or a nonpositive integer, set ROP to +Inf. When OP -+ is NaN, −Inf or a negative integer, *SIGNP is undefined, and when -+ OP is ±0, *SIGNP is the sign of the zero. - - -- Function: int mpfr_digamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND) - Set ROP to the value of the Digamma (sometimes also called Psi) -@@ -1703,7 +1717,10 @@ - -- Function: int mpfr_fms (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2, mpfr_t - OP3, mpfr_rnd_t RND) - Set ROP to (OP1 times OP2) + OP3 (resp. (OP1 times OP2) - OP3) -- rounded in the direction RND. -+ rounded in the direction RND. Concerning special values (signed -+ zeros, infinities, NaN), these functions behave like a -+ multiplication followed by a separate addition or subtraction. -+ That is, the fused operation matters only for rounding. - - -- Function: int mpfr_agm (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2, - mpfr_rnd_t RND) -@@ -1717,9 +1734,10 @@ - RND) - Set ROP to the Euclidean norm of X and Y, i.e., the square root of - the sum of the squares of X and Y, rounded in the direction RND. -- Special values are handled as described in Section F.9.4.3 of the -- ISO C99 and IEEE 754-2008 standards: If X or Y is an infinity, then -- +Inf is returned in ROP, even if the other number is NaN. -+ Special values are handled as described in the ISO C99 (Section -+ F.9.4.3) and IEEE 754-2008 (Section 9.2.1) standards: If X or Y is -+ an infinity, then +Inf is returned in ROP, even if the other number -+ is NaN. - - -- Function: int mpfr_ai (mpfr_t ROP, mpfr_t X, mpfr_rnd_t RND) - Set ROP to the value of the Airy function Ai on X, rounded in the -@@ -2670,7 +2688,7 @@ - 5.16 Internals - ============== - --A "limb" means the part of a multi-precision number that fits in a -+A “limb” means the part of a multi-precision number that fits in a - single word. Usually a limb contains 32 or 64 bits. The C data type - for a limb is ‘mp_limb_t’. - -@@ -3140,7 +3158,7 @@ - 0. PREAMBLE - - The purpose of this License is to make a manual, textbook, or other -- functional and useful document "free" in the sense of freedom: to -+ functional and useful document “free” in the sense of freedom: to - assure everyone the effective freedom to copy and redistribute it, - with or without modifying it, either commercially or - noncommercially. Secondarily, this License preserves for the -@@ -3655,9 +3673,9 @@ - * Menu: - - * mpfr_abs: Basic Arithmetic Functions. -- (line 160) --* mpfr_acos: Special Functions. (line 51) --* mpfr_acosh: Special Functions. (line 115) -+ (line 165) -+* mpfr_acos: Special Functions. (line 53) -+* mpfr_acosh: Special Functions. (line 117) - * mpfr_add: Basic Arithmetic Functions. - (line 6) - * mpfr_add_d: Basic Arithmetic Functions. -@@ -3670,15 +3688,15 @@ - (line 8) - * mpfr_add_z: Basic Arithmetic Functions. - (line 14) --* mpfr_agm: Special Functions. (line 210) --* mpfr_ai: Special Functions. (line 226) --* mpfr_asin: Special Functions. (line 52) --* mpfr_asinh: Special Functions. (line 116) -+* mpfr_agm: Special Functions. (line 219) -+* mpfr_ai: Special Functions. (line 236) -+* mpfr_asin: Special Functions. (line 54) -+* mpfr_asinh: Special Functions. (line 118) - * mpfr_asprintf: Formatted Output Functions. - (line 193) --* mpfr_atan: Special Functions. (line 53) --* mpfr_atan2: Special Functions. (line 63) --* mpfr_atanh: Special Functions. (line 117) -+* mpfr_atan: Special Functions. (line 55) -+* mpfr_atan2: Special Functions. (line 65) -+* mpfr_atanh: Special Functions. (line 119) - * mpfr_buildopt_decimal_p: Miscellaneous Functions. - (line 162) - * mpfr_buildopt_gmpinternals_p: Miscellaneous Functions. -@@ -3690,7 +3708,7 @@ - * mpfr_can_round: Rounding Related Functions. - (line 39) - * mpfr_cbrt: Basic Arithmetic Functions. -- (line 108) -+ (line 113) - * mpfr_ceil: Integer Related Functions. - (line 7) - * mpfr_check_range: Exception Related Functions. -@@ -3735,18 +3753,18 @@ - (line 27) - * mpfr_cmp_z: Comparison Functions. - (line 11) --* mpfr_const_catalan: Special Functions. (line 237) --* mpfr_const_euler: Special Functions. (line 236) --* mpfr_const_log2: Special Functions. (line 234) --* mpfr_const_pi: Special Functions. (line 235) -+* mpfr_const_catalan: Special Functions. (line 247) -+* mpfr_const_euler: Special Functions. (line 246) -+* mpfr_const_log2: Special Functions. (line 244) -+* mpfr_const_pi: Special Functions. (line 245) - * mpfr_copysign: Miscellaneous Functions. - (line 109) --* mpfr_cos: Special Functions. (line 29) --* mpfr_cosh: Special Functions. (line 95) --* mpfr_cot: Special Functions. (line 47) --* mpfr_coth: Special Functions. (line 111) --* mpfr_csc: Special Functions. (line 46) --* mpfr_csch: Special Functions. (line 110) -+* mpfr_cos: Special Functions. (line 31) -+* mpfr_cosh: Special Functions. (line 97) -+* mpfr_cot: Special Functions. (line 49) -+* mpfr_coth: Special Functions. (line 113) -+* mpfr_csc: Special Functions. (line 48) -+* mpfr_csch: Special Functions. (line 112) - * mpfr_custom_get_exp: Custom Interface. (line 75) - * mpfr_custom_get_kind: Custom Interface. (line 65) - * mpfr_custom_get_significand: Custom Interface. (line 70) -@@ -3756,47 +3774,47 @@ - * mpfr_custom_move: Custom Interface. (line 82) - * MPFR_DECL_INIT: Initialization Functions. - (line 74) --* mpfr_digamma: Special Functions. (line 166) -+* mpfr_digamma: Special Functions. (line 172) - * mpfr_dim: Basic Arithmetic Functions. -- (line 166) -+ (line 171) - * mpfr_div: Basic Arithmetic Functions. -- (line 72) -+ (line 74) - * mpfr_divby0_p: Exception Related Functions. - (line 134) - * mpfr_div_2exp: Compatibility with MPF. - (line 49) - * mpfr_div_2si: Basic Arithmetic Functions. -- (line 181) -+ (line 186) - * mpfr_div_2ui: Basic Arithmetic Functions. -- (line 179) -+ (line 184) - * mpfr_div_d: Basic Arithmetic Functions. -- (line 84) -+ (line 86) - * mpfr_div_q: Basic Arithmetic Functions. -- (line 88) -+ (line 90) - * mpfr_div_si: Basic Arithmetic Functions. -- (line 80) -+ (line 82) - * mpfr_div_ui: Basic Arithmetic Functions. -- (line 76) -+ (line 78) - * mpfr_div_z: Basic Arithmetic Functions. -- (line 86) -+ (line 88) - * mpfr_d_div: Basic Arithmetic Functions. -- (line 82) -+ (line 84) - * mpfr_d_sub: Basic Arithmetic Functions. -- (line 35) --* mpfr_eint: Special Functions. (line 133) -+ (line 36) -+* mpfr_eint: Special Functions. (line 135) - * mpfr_eq: Compatibility with MPF. - (line 28) - * mpfr_equal_p: Comparison Functions. - (line 59) - * mpfr_erangeflag_p: Exception Related Functions. - (line 137) --* mpfr_erf: Special Functions. (line 177) --* mpfr_erfc: Special Functions. (line 178) --* mpfr_exp: Special Functions. (line 23) --* mpfr_exp10: Special Functions. (line 25) --* mpfr_exp2: Special Functions. (line 24) --* mpfr_expm1: Special Functions. (line 129) --* mpfr_fac_ui: Special Functions. (line 121) -+* mpfr_erf: Special Functions. (line 183) -+* mpfr_erfc: Special Functions. (line 184) -+* mpfr_exp: Special Functions. (line 25) -+* mpfr_exp10: Special Functions. (line 27) -+* mpfr_exp2: Special Functions. (line 26) -+* mpfr_expm1: Special Functions. (line 131) -+* mpfr_fac_ui: Special Functions. (line 123) - * mpfr_fits_intmax_p: Conversion Functions. - (line 150) - * mpfr_fits_sint_p: Conversion Functions. -@@ -3815,20 +3833,20 @@ - (line 147) - * mpfr_floor: Integer Related Functions. - (line 8) --* mpfr_fma: Special Functions. (line 203) -+* mpfr_fma: Special Functions. (line 209) - * mpfr_fmod: Integer Related Functions. - (line 92) --* mpfr_fms: Special Functions. (line 205) -+* mpfr_fms: Special Functions. (line 211) - * mpfr_fprintf: Formatted Output Functions. - (line 157) - * mpfr_frac: Integer Related Functions. - (line 76) --* mpfr_free_cache: Special Functions. (line 244) -+* mpfr_free_cache: Special Functions. (line 254) - * mpfr_free_str: Conversion Functions. - (line 137) - * mpfr_frexp: Conversion Functions. - (line 45) --* mpfr_gamma: Special Functions. (line 148) -+* mpfr_gamma: Special Functions. (line 150) - * mpfr_get_d: Conversion Functions. - (line 7) - * mpfr_get_decimal64: Conversion Functions. -@@ -3887,7 +3905,7 @@ - (line 56) - * mpfr_greater_p: Comparison Functions. - (line 55) --* mpfr_hypot: Special Functions. (line 218) -+* mpfr_hypot: Special Functions. (line 227) - * mpfr_inexflag_p: Exception Related Functions. - (line 136) - * mpfr_inf_p: Comparison Functions. -@@ -3922,21 +3940,21 @@ - (line 31) - * mpfr_integer_p: Integer Related Functions. - (line 119) --* mpfr_j0: Special Functions. (line 182) --* mpfr_j1: Special Functions. (line 183) --* mpfr_jn: Special Functions. (line 184) -+* mpfr_j0: Special Functions. (line 188) -+* mpfr_j1: Special Functions. (line 189) -+* mpfr_jn: Special Functions. (line 190) - * mpfr_lessequal_p: Comparison Functions. - (line 58) - * mpfr_lessgreater_p: Comparison Functions. - (line 64) - * mpfr_less_p: Comparison Functions. - (line 57) --* mpfr_lgamma: Special Functions. (line 157) --* mpfr_li2: Special Functions. (line 143) --* mpfr_lngamma: Special Functions. (line 152) -+* mpfr_lgamma: Special Functions. (line 162) -+* mpfr_li2: Special Functions. (line 145) -+* mpfr_lngamma: Special Functions. (line 154) - * mpfr_log: Special Functions. (line 16) - * mpfr_log10: Special Functions. (line 18) --* mpfr_log1p: Special Functions. (line 125) -+* mpfr_log1p: Special Functions. (line 127) - * mpfr_log2: Special Functions. (line 17) - * mpfr_max: Miscellaneous Functions. - (line 22) -@@ -3947,29 +3965,29 @@ - * mpfr_modf: Integer Related Functions. - (line 82) - * mpfr_mul: Basic Arithmetic Functions. -- (line 51) -+ (line 53) - * mpfr_mul_2exp: Compatibility with MPF. - (line 47) - * mpfr_mul_2si: Basic Arithmetic Functions. -- (line 174) -+ (line 179) - * mpfr_mul_2ui: Basic Arithmetic Functions. -- (line 172) -+ (line 177) - * mpfr_mul_d: Basic Arithmetic Functions. -- (line 57) -+ (line 59) - * mpfr_mul_q: Basic Arithmetic Functions. -- (line 61) -+ (line 63) - * mpfr_mul_si: Basic Arithmetic Functions. -- (line 55) -+ (line 57) - * mpfr_mul_ui: Basic Arithmetic Functions. -- (line 53) -+ (line 55) - * mpfr_mul_z: Basic Arithmetic Functions. -- (line 59) -+ (line 61) - * mpfr_nanflag_p: Exception Related Functions. - (line 135) - * mpfr_nan_p: Comparison Functions. - (line 39) - * mpfr_neg: Basic Arithmetic Functions. -- (line 159) -+ (line 164) - * mpfr_nextabove: Miscellaneous Functions. - (line 15) - * mpfr_nextbelow: Miscellaneous Functions. -@@ -3983,13 +4001,13 @@ - * mpfr_overflow_p: Exception Related Functions. - (line 133) - * mpfr_pow: Basic Arithmetic Functions. -- (line 116) -+ (line 121) - * mpfr_pow_si: Basic Arithmetic Functions. -- (line 120) -+ (line 125) - * mpfr_pow_ui: Basic Arithmetic Functions. -- (line 118) -+ (line 123) - * mpfr_pow_z: Basic Arithmetic Functions. -- (line 122) -+ (line 127) - * mpfr_prec_round: Rounding Related Functions. - (line 13) - * ‘mpfr_prec_t’: Nomenclature and Types. -@@ -3999,7 +4017,7 @@ - * mpfr_print_rnd_mode: Rounding Related Functions. - (line 71) - * mpfr_rec_sqrt: Basic Arithmetic Functions. -- (line 103) -+ (line 105) - * mpfr_regular_p: Comparison Functions. - (line 43) - * mpfr_reldiff: Compatibility with MPF. -@@ -4021,11 +4039,11 @@ - * ‘mpfr_rnd_t’: Nomenclature and Types. - (line 34) - * mpfr_root: Basic Arithmetic Functions. -- (line 109) -+ (line 114) - * mpfr_round: Integer Related Functions. - (line 9) --* mpfr_sec: Special Functions. (line 45) --* mpfr_sech: Special Functions. (line 109) -+* mpfr_sec: Special Functions. (line 47) -+* mpfr_sech: Special Functions. (line 111) - * mpfr_set: Assignment Functions. - (line 9) - * mpfr_setsign: Miscellaneous Functions. -@@ -4100,57 +4118,57 @@ - (line 49) - * mpfr_signbit: Miscellaneous Functions. - (line 99) --* mpfr_sin: Special Functions. (line 30) --* mpfr_sinh: Special Functions. (line 96) --* mpfr_sinh_cosh: Special Functions. (line 101) --* mpfr_sin_cos: Special Functions. (line 35) -+* mpfr_sin: Special Functions. (line 32) -+* mpfr_sinh: Special Functions. (line 98) -+* mpfr_sinh_cosh: Special Functions. (line 103) -+* mpfr_sin_cos: Special Functions. (line 37) - * mpfr_si_div: Basic Arithmetic Functions. -- (line 78) -+ (line 80) - * mpfr_si_sub: Basic Arithmetic Functions. -- (line 31) -+ (line 32) - * mpfr_snprintf: Formatted Output Functions. - (line 180) - * mpfr_sprintf: Formatted Output Functions. - (line 170) - * mpfr_sqr: Basic Arithmetic Functions. -- (line 69) -+ (line 71) - * mpfr_sqrt: Basic Arithmetic Functions. -- (line 96) -+ (line 98) - * mpfr_sqrt_ui: Basic Arithmetic Functions. -- (line 97) -+ (line 99) - * mpfr_strtofr: Assignment Functions. - (line 80) - * mpfr_sub: Basic Arithmetic Functions. -- (line 25) -+ (line 26) - * mpfr_subnormalize: Exception Related Functions. - (line 60) - * mpfr_sub_d: Basic Arithmetic Functions. -- (line 37) -+ (line 38) - * mpfr_sub_q: Basic Arithmetic Functions. -- (line 43) -+ (line 44) - * mpfr_sub_si: Basic Arithmetic Functions. -- (line 33) -+ (line 34) - * mpfr_sub_ui: Basic Arithmetic Functions. -- (line 29) -+ (line 30) - * mpfr_sub_z: Basic Arithmetic Functions. -- (line 41) --* mpfr_sum: Special Functions. (line 252) -+ (line 42) -+* mpfr_sum: Special Functions. (line 262) - * mpfr_swap: Assignment Functions. - (line 150) - * ‘mpfr_t’: Nomenclature and Types. - (line 6) --* mpfr_tan: Special Functions. (line 31) --* mpfr_tanh: Special Functions. (line 97) -+* mpfr_tan: Special Functions. (line 33) -+* mpfr_tanh: Special Functions. (line 99) - * mpfr_trunc: Integer Related Functions. - (line 10) - * mpfr_ui_div: Basic Arithmetic Functions. -- (line 74) -+ (line 76) - * mpfr_ui_pow: Basic Arithmetic Functions. -- (line 126) -+ (line 131) - * mpfr_ui_pow_ui: Basic Arithmetic Functions. -- (line 124) -+ (line 129) - * mpfr_ui_sub: Basic Arithmetic Functions. -- (line 27) -+ (line 28) - * mpfr_underflow_p: Exception Related Functions. - (line 132) - * mpfr_unordered_p: Comparison Functions. -@@ -4181,61 +4199,61 @@ - (line 182) - * mpfr_vsprintf: Formatted Output Functions. - (line 171) --* mpfr_y0: Special Functions. (line 193) --* mpfr_y1: Special Functions. (line 194) --* mpfr_yn: Special Functions. (line 195) -+* mpfr_y0: Special Functions. (line 199) -+* mpfr_y1: Special Functions. (line 200) -+* mpfr_yn: Special Functions. (line 201) - * mpfr_zero_p: Comparison Functions. - (line 42) --* mpfr_zeta: Special Functions. (line 171) --* mpfr_zeta_ui: Special Functions. (line 172) -+* mpfr_zeta: Special Functions. (line 177) -+* mpfr_zeta_ui: Special Functions. (line 178) - * mpfr_z_sub: Basic Arithmetic Functions. -- (line 39) -+ (line 40) - - -  - Tag Table: - Node: Top775 - Node: Copying2007 --Node: Introduction to MPFR3766 --Node: Installing MPFR5880 --Node: Reporting Bugs11323 --Node: MPFR Basics13353 --Node: Headers and Libraries13669 --Node: Nomenclature and Types16828 --Node: MPFR Variable Conventions18874 --Node: Rounding Modes20418 --Ref: ternary value21544 --Node: Floating-Point Values on Special Numbers23526 --Node: Exceptions26572 --Node: Memory Handling29749 --Node: MPFR Interface30894 --Node: Initialization Functions33008 --Node: Assignment Functions40318 --Node: Combined Initialization and Assignment Functions49673 --Node: Conversion Functions50974 --Node: Basic Arithmetic Functions60035 --Node: Comparison Functions69200 --Node: Special Functions72687 --Node: Input and Output Functions86672 --Node: Formatted Output Functions88644 --Node: Integer Related Functions98431 --Node: Rounding Related Functions105051 --Node: Miscellaneous Functions108888 --Node: Exception Related Functions117568 --Node: Compatibility with MPF124386 --Node: Custom Interface127127 --Node: Internals131526 --Node: API Compatibility133066 --Node: Type and Macro Changes134995 --Node: Added Functions137844 --Node: Changed Functions141132 --Node: Removed Functions145545 --Node: Other Changes145973 --Node: Contributors147576 --Node: References150219 --Node: GNU Free Documentation License151973 --Node: Concept Index174562 --Node: Function and Type Index180659 -+Node: Introduction to MPFR3770 -+Node: Installing MPFR5884 -+Node: Reporting Bugs11327 -+Node: MPFR Basics13357 -+Node: Headers and Libraries13673 -+Node: Nomenclature and Types16832 -+Node: MPFR Variable Conventions18894 -+Node: Rounding Modes20438 -+Ref: ternary value21568 -+Node: Floating-Point Values on Special Numbers23554 -+Node: Exceptions26813 -+Node: Memory Handling29990 -+Node: MPFR Interface31135 -+Node: Initialization Functions33249 -+Node: Assignment Functions40559 -+Node: Combined Initialization and Assignment Functions49914 -+Node: Conversion Functions51215 -+Node: Basic Arithmetic Functions60276 -+Node: Comparison Functions69777 -+Node: Special Functions73264 -+Node: Input and Output Functions87862 -+Node: Formatted Output Functions89834 -+Node: Integer Related Functions99621 -+Node: Rounding Related Functions106241 -+Node: Miscellaneous Functions110078 -+Node: Exception Related Functions118758 -+Node: Compatibility with MPF125576 -+Node: Custom Interface128317 -+Node: Internals132716 -+Node: API Compatibility134260 -+Node: Type and Macro Changes136189 -+Node: Added Functions139038 -+Node: Changed Functions142326 -+Node: Removed Functions146739 -+Node: Other Changes147167 -+Node: Contributors148770 -+Node: References151413 -+Node: GNU Free Documentation License153167 -+Node: Concept Index175760 -+Node: Function and Type Index181857 -  - End Tag Table - -diff -Naurd mpfr-3.1.3-a/src/lngamma.c mpfr-3.1.3-b/src/lngamma.c ---- mpfr-3.1.3-a/src/lngamma.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/lngamma.c 2015-07-02 10:49:24.018113593 +0000 -@@ -603,16 +603,17 @@ - mpfr_get_prec (y), mpfr_log_prec, y, inex)); - - /* special cases */ -- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x))) -+ if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x) || -+ (MPFR_IS_NEG (x) && mpfr_integer_p (x)))) - { -- if (MPFR_IS_NAN (x) || MPFR_IS_NEG (x)) -+ if (MPFR_IS_NAN (x)) - { - MPFR_SET_NAN (y); - MPFR_RET_NAN; - } -- else /* lngamma(+Inf) = lngamma(+0) = +Inf */ -+ else /* lngamma(+/-Inf) = lngamma(nonpositive integer) = +Inf */ - { -- if (MPFR_IS_ZERO (x)) -+ if (!MPFR_IS_INF (x)) - mpfr_set_divby0 (); - MPFR_SET_INF (y); - MPFR_SET_POS (y); -@@ -620,8 +621,8 @@ - } - } - -- /* if x < 0 and -2k-1 <= x <= -2k, then lngamma(x) = NaN */ -- if (MPFR_IS_NEG (x) && (unit_bit (x) == 0 || mpfr_integer_p (x))) -+ /* if -2k-1 < x < -2k <= 0, then lngamma(x) = NaN */ -+ if (MPFR_IS_NEG (x) && unit_bit (x) == 0) - { - MPFR_SET_NAN (y); - MPFR_RET_NAN; -diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h ---- mpfr-3.1.3-a/src/mpfr.h 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/mpfr.h 2015-07-02 10:49:24.038113803 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 3 --#define MPFR_VERSION_STRING "3.1.3" -+#define MPFR_VERSION_STRING "3.1.3-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c ---- mpfr-3.1.3-a/src/version.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/version.c 2015-07-02 10:49:24.042113845 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.3"; -+ return "3.1.3-p1"; - } -diff -Naurd mpfr-3.1.3-a/tests/tlngamma.c mpfr-3.1.3-b/tests/tlngamma.c ---- mpfr-3.1.3-a/tests/tlngamma.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/tests/tlngamma.c 2015-07-02 10:49:24.018113593 +0000 -@@ -33,7 +33,7 @@ - special (void) - { - mpfr_t x, y; -- int inex; -+ int i, inex; - - mpfr_init (x); - mpfr_init (y); -@@ -46,25 +46,29 @@ - exit (1); - } - -- mpfr_set_inf (x, -1); -+ mpfr_set_inf (x, 1); -+ mpfr_clear_flags (); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (!mpfr_nan_p (y)) -+ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0) - { -- printf ("Error for lngamma(-Inf)\n"); -+ printf ("Error for lngamma(+Inf)\n"); - exit (1); - } - -- mpfr_set_inf (x, 1); -+ mpfr_set_inf (x, -1); -+ mpfr_clear_flags (); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0) -+ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0) - { -- printf ("Error for lngamma(+Inf)\n"); -+ printf ("Error for lngamma(-Inf)\n"); - exit (1); - } - - mpfr_set_ui (x, 0, MPFR_RNDN); -+ mpfr_clear_flags (); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0) -+ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || -+ __gmpfr_flags != MPFR_FLAGS_DIVBY0) - { - printf ("Error for lngamma(+0)\n"); - exit (1); -@@ -72,32 +76,58 @@ - - mpfr_set_ui (x, 0, MPFR_RNDN); - mpfr_neg (x, x, MPFR_RNDN); -+ mpfr_clear_flags (); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (!mpfr_nan_p (y)) -+ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || -+ __gmpfr_flags != MPFR_FLAGS_DIVBY0) - { - printf ("Error for lngamma(-0)\n"); - exit (1); - } - - mpfr_set_ui (x, 1, MPFR_RNDN); -+ mpfr_clear_flags (); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y)) -+ if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y)) - { - printf ("Error for lngamma(1)\n"); - exit (1); - } - -- mpfr_set_si (x, -1, MPFR_RNDN); -- mpfr_lngamma (y, x, MPFR_RNDN); -- if (!mpfr_nan_p (y)) -+ for (i = 1; i <= 5; i++) - { -- printf ("Error for lngamma(-1)\n"); -- exit (1); -+ int c; -+ -+ mpfr_set_si (x, -i, MPFR_RNDN); -+ mpfr_clear_flags (); -+ mpfr_lngamma (y, x, MPFR_RNDN); -+ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || -+ __gmpfr_flags != MPFR_FLAGS_DIVBY0) -+ { -+ printf ("Error for lngamma(-%d)\n", i); -+ exit (1); -+ } -+ if (i & 1) -+ { -+ mpfr_nextabove (x); -+ c = '+'; -+ } -+ else -+ { -+ mpfr_nextbelow (x); -+ c = '-'; -+ } -+ mpfr_lngamma (y, x, MPFR_RNDN); -+ if (!mpfr_nan_p (y)) -+ { -+ printf ("Error for lngamma(-%d%cepsilon)\n", i, c); -+ exit (1); -+ } - } - - mpfr_set_ui (x, 2, MPFR_RNDN); - mpfr_lngamma (y, x, MPFR_RNDN); -- if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y)) -+ if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y)) - { - printf ("Error for lngamma(2)\n"); - exit (1); -@@ -127,7 +157,7 @@ - mpfr_set_str (x, CHECK_X2, 10, MPFR_RNDN); - mpfr_lngamma (y, x, MPFR_RNDN); - mpfr_set_str (x, CHECK_Y2, 10, MPFR_RNDN); -- if (MPFR_IS_NAN (y) || mpfr_cmp (y, x)) -+ if (mpfr_cmp0 (y, x)) - { - printf ("mpfr_lngamma("CHECK_X2") is wrong:\n" - "expected "); -@@ -143,7 +173,7 @@ - mpfr_lngamma (y, x, MPFR_RNDU); - mpfr_set_prec (x, 175); - mpfr_set_str_binary (x, "0.1010001100011101101011001101110010100001000001000001110011000001101100001111001001000101011011100100010101011110100111110101010100010011010010000101010111001100011000101111E7"); -- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y)) -+ if (mpfr_cmp0 (x, y)) - { - printf ("Error in mpfr_lngamma (1)\n"); - exit (1); -@@ -155,7 +185,7 @@ - mpfr_lngamma (x, y, MPFR_RNDZ); - mpfr_set_prec (y, 21); - mpfr_set_str_binary (y, "0.111000101000001100101E9"); -- if (MPFR_IS_NAN (x) || mpfr_cmp (x, y)) -+ if (mpfr_cmp0 (x, y)) - { - printf ("Error in mpfr_lngamma (120)\n"); - printf ("Expected "); mpfr_print_binary (y); puts (""); -@@ -169,7 +199,7 @@ - inex = mpfr_lngamma (y, x, MPFR_RNDN); - mpfr_set_prec (x, 206); - mpfr_set_str_binary (x, "0.10000111011000000011100010101001100110001110000111100011000100100110110010001011011110101001111011110110000001010100111011010000000011100110110101100111000111010011110010000100010111101010001101000110101001E13"); -- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y)) -+ if (mpfr_cmp0 (x, y)) - { - printf ("Error in mpfr_lngamma (768)\n"); - exit (1); -@@ -185,7 +215,7 @@ - mpfr_set_str_binary (x, "0.1100E-66"); - mpfr_lngamma (y, x, MPFR_RNDN); - mpfr_set_str_binary (x, "0.1100E6"); -- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y)) -+ if (mpfr_cmp0 (x, y)) - { - printf ("Error for lngamma(0.1100E-66)\n"); - exit (1); -@@ -199,7 +229,7 @@ - mpfr_lngamma (y, x, MPFR_RNDN); - mpfr_set_prec (x, 32); - mpfr_set_str_binary (x, "-0.10001000111011111011000010100010E207"); -- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y)) -+ if (mpfr_cmp0 (x, y)) - { - printf ("Error for lngamma(-2^199+0.5)\n"); - printf ("Got "); -diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES ---- mpfr-3.1.3-a/PATCHES 2015-07-02 10:50:08.046573308 +0000 -+++ mpfr-3.1.3-b/PATCHES 2015-07-02 10:50:08.126574142 +0000 -@@ -0,0 +1 @@ -+muldiv-2exp-overflow -diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION ---- mpfr-3.1.3-a/VERSION 2015-07-02 10:49:24.042113845 +0000 -+++ mpfr-3.1.3-b/VERSION 2015-07-02 10:50:08.126574142 +0000 -@@ -1 +1 @@ --3.1.3-p1 -+3.1.3-p2 -diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c ---- mpfr-3.1.3-a/src/div_2si.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/div_2si.c 2015-07-02 10:50:08.106573933 +0000 -@@ -49,7 +49,7 @@ - rnd_mode = MPFR_RNDZ; - return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y)); - } -- else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n || -+ else if (MPFR_UNLIKELY(n <= 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n || - exp > __gmpfr_emax + n)) ) - return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y)); - -diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c ---- mpfr-3.1.3-a/src/div_2ui.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/div_2ui.c 2015-07-02 10:50:08.106573933 +0000 -@@ -32,7 +32,7 @@ - rnd_mode), - ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inexact)); - -- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x))) -+ if (MPFR_UNLIKELY (n == 0 || MPFR_IS_SINGULAR (x))) - return mpfr_set (y, x, rnd_mode); - else - { -diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h ---- mpfr-3.1.3-a/src/mpfr.h 2015-07-02 10:49:24.038113803 +0000 -+++ mpfr-3.1.3-b/src/mpfr.h 2015-07-02 10:50:08.126574142 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 3 --#define MPFR_VERSION_STRING "3.1.3-p1" -+#define MPFR_VERSION_STRING "3.1.3-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c ---- mpfr-3.1.3-a/src/mul_2si.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/src/mul_2si.c 2015-07-02 10:50:08.106573933 +0000 -@@ -39,7 +39,7 @@ - { - mpfr_exp_t exp = MPFR_GET_EXP (x); - MPFR_SETRAW (inexact, y, x, exp, rnd_mode); -- if (MPFR_UNLIKELY( n > 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n || -+ if (MPFR_UNLIKELY(n >= 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n || - exp > __gmpfr_emax - n))) - return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y)); - else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emin > MPFR_EMAX_MAX + n || -diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c ---- mpfr-3.1.3-a/src/version.c 2015-07-02 10:49:24.042113845 +0000 -+++ mpfr-3.1.3-b/src/version.c 2015-07-02 10:50:08.126574142 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.3-p1"; -+ return "3.1.3-p2"; - } -diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c ---- mpfr-3.1.3-a/tests/tmul_2exp.c 2015-06-19 19:55:10.000000000 +0000 -+++ mpfr-3.1.3-b/tests/tmul_2exp.c 2015-07-02 10:50:08.106573933 +0000 -@@ -242,6 +242,76 @@ - large (MPFR_EMAX_MAX); - } - -+/* Cases where the function overflows on n = 0 when rounding is like -+ away from zero. */ -+static void -+overflow0 (mpfr_exp_t emax) -+{ -+ mpfr_exp_t old_emax; -+ mpfr_t x, y1, y2; -+ int neg, r, op; -+ static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" }; -+ -+ old_emax = mpfr_get_emax (); -+ set_emax (emax); -+ -+ mpfr_init2 (x, 8); -+ mpfr_inits2 (6, y1, y2, (mpfr_ptr) 0); -+ -+ mpfr_set_inf (x, 1); -+ mpfr_nextbelow (x); -+ -+ for (neg = 0; neg <= 1; neg++) -+ { -+ RND_LOOP (r) -+ { -+ int inex1, inex2; -+ unsigned int flags1, flags2; -+ -+ /* Even if there isn't an overflow (rounding ~ toward zero), -+ the result is the same as the one of an overflow. */ -+ inex1 = mpfr_overflow (y1, (mpfr_rnd_t) r, neg ? -1 : 1); -+ flags1 = MPFR_FLAGS_INEXACT; -+ if (mpfr_inf_p (y1)) -+ flags1 |= MPFR_FLAGS_OVERFLOW; -+ for (op = 0; op < 4; op++) -+ { -+ mpfr_clear_flags (); -+ inex2 = -+ op == 0 ? mpfr_mul_2ui (y2, x, 0, (mpfr_rnd_t) r) : -+ op == 1 ? mpfr_mul_2si (y2, x, 0, (mpfr_rnd_t) r) : -+ op == 2 ? mpfr_div_2ui (y2, x, 0, (mpfr_rnd_t) r) : -+ op == 3 ? mpfr_div_2si (y2, x, 0, (mpfr_rnd_t) r) : -+ (MPFR_ASSERTN (0), 0); -+ flags2 = __gmpfr_flags; -+ if (!(mpfr_equal_p (y1, y2) && -+ SAME_SIGN (inex1, inex2) && -+ flags1 == flags2)) -+ { -+ printf ("Error in overflow0 for %s, mpfr_%s, emax = %" -+ MPFR_EXP_FSPEC "d,\nx = ", -+ mpfr_print_rnd_mode ((mpfr_rnd_t) r), sop[op], -+ (mpfr_eexp_t) emax); -+ mpfr_dump (x); -+ printf ("Expected "); -+ mpfr_dump (y1); -+ printf (" with inex = %d, flags =", inex1); -+ flags_out (flags1); -+ printf ("Got "); -+ mpfr_dump (y2); -+ printf (" with inex = %d, flags =", inex2); -+ flags_out (flags2); -+ exit (1); -+ } -+ } -+ } -+ mpfr_neg (x, x, MPFR_RNDN); -+ } -+ -+ mpfr_clears (x, y1, y2, (mpfr_ptr) 0); -+ set_emax (old_emax); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -334,6 +404,11 @@ - underflow0 (); - large0 (); - -+ if (mpfr_get_emax () != MPFR_EMAX_MAX) -+ overflow0 (mpfr_get_emax ()); -+ overflow0 (MPFR_EMAX_MAX); -+ overflow0 (-1); -+ - tests_end_mpfr (); - return 0; - } -diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES ---- mpfr-3.1.3-a/PATCHES 2015-07-17 08:54:48.592799981 +0000 -+++ mpfr-3.1.3-b/PATCHES 2015-07-17 08:54:48.616811495 +0000 -@@ -0,0 +1 @@ -+muldiv-2exp-underflow -diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION ---- mpfr-3.1.3-a/VERSION 2015-07-02 10:50:08.126574142 +0000 -+++ mpfr-3.1.3-b/VERSION 2015-07-17 08:54:48.616811495 +0000 -@@ -1 +1 @@ --3.1.3-p2 -+3.1.3-p3 -diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c ---- mpfr-3.1.3-a/src/div_2si.c 2015-07-02 10:50:08.106573933 +0000 -+++ mpfr-3.1.3-b/src/div_2si.c 2015-07-17 08:54:48.608807656 +0000 -@@ -45,7 +45,8 @@ - if (rnd_mode == MPFR_RNDN && - (__gmpfr_emin > MPFR_EMAX_MAX - (n - 1) || - exp < __gmpfr_emin + (n - 1) || -- (inexact >= 0 && mpfr_powerof2_raw (y)))) -+ ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) && -+ mpfr_powerof2_raw (y)))) - rnd_mode = MPFR_RNDZ; - return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y)); - } -diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c ---- mpfr-3.1.3-a/src/div_2ui.c 2015-07-02 10:50:08.106573933 +0000 -+++ mpfr-3.1.3-b/src/div_2ui.c 2015-07-17 08:54:48.608807656 +0000 -@@ -44,7 +44,9 @@ - if (MPFR_UNLIKELY (n >= diffexp)) /* exp - n <= emin - 1 */ - { - if (rnd_mode == MPFR_RNDN && -- (n > diffexp || (inexact >= 0 && mpfr_powerof2_raw (y)))) -+ (n > diffexp || -+ ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) && -+ mpfr_powerof2_raw (y)))) - rnd_mode = MPFR_RNDZ; - return mpfr_underflow (y, rnd_mode, MPFR_SIGN (y)); - } -diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h ---- mpfr-3.1.3-a/src/mpfr.h 2015-07-02 10:50:08.126574142 +0000 -+++ mpfr-3.1.3-b/src/mpfr.h 2015-07-17 08:54:48.616811495 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 3 --#define MPFR_VERSION_STRING "3.1.3-p2" -+#define MPFR_VERSION_STRING "3.1.3-p3" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c ---- mpfr-3.1.3-a/src/mul_2si.c 2015-07-02 10:50:08.106573933 +0000 -+++ mpfr-3.1.3-b/src/mul_2si.c 2015-07-17 08:54:48.608807656 +0000 -@@ -48,7 +48,8 @@ - if (rnd_mode == MPFR_RNDN && - (__gmpfr_emin > MPFR_EMAX_MAX + (n + 1) || - exp < __gmpfr_emin - (n + 1) || -- (inexact >= 0 && mpfr_powerof2_raw (y)))) -+ ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) && -+ mpfr_powerof2_raw (y)))) - rnd_mode = MPFR_RNDZ; - return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y)); - } -diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c ---- mpfr-3.1.3-a/src/version.c 2015-07-02 10:50:08.126574142 +0000 -+++ mpfr-3.1.3-b/src/version.c 2015-07-17 08:54:48.616811495 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.3-p2"; -+ return "3.1.3-p3"; - } -diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c ---- mpfr-3.1.3-a/tests/tmul_2exp.c 2015-07-02 10:50:08.106573933 +0000 -+++ mpfr-3.1.3-b/tests/tmul_2exp.c 2015-07-17 08:54:48.608807656 +0000 -@@ -50,77 +50,82 @@ - { - mpfr_t x, y, z1, z2; - mpfr_exp_t emin; -- int i, k; -+ int i, k, s; - int prec; - int rnd; - int div; - int inex1, inex2; - unsigned int flags1, flags2; - -- /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e) -- * with emin = e, x = 1 + i/16, i in { -1, 0, 1 }, and k = 1 to 4, -- * by comparing the result with the one of a simple division. -+ /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e) with -+ * emin = e, x = s * (1 + i/16), i in { -1, 0, 1 }, s in { -1, 1 }, and -+ * k = 1 to 4, by comparing the result with the one of a simple division. - */ - emin = mpfr_get_emin (); - set_emin (e); - mpfr_inits2 (8, x, y, (mpfr_ptr) 0); - for (i = 15; i <= 17; i++) -- { -- inex1 = mpfr_set_ui_2exp (x, i, -4, MPFR_RNDN); -- MPFR_ASSERTN (inex1 == 0); -- for (prec = 6; prec >= 3; prec -= 3) -- { -- mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0); -- RND_LOOP (rnd) -- for (k = 1; k <= 4; k++) -- { -- /* The following one is assumed to be correct. */ -- inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN); -- MPFR_ASSERTN (inex1 == 0); -- inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN); -- MPFR_ASSERTN (inex1 == 0); -- mpfr_clear_flags (); -- /* Do not use mpfr_div_ui to avoid the optimization -- by mpfr_div_2si. */ -- inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd); -- flags1 = __gmpfr_flags; -- -- for (div = 0; div <= 2; div++) -+ for (s = 1; s >= -1; s -= 2) -+ { -+ inex1 = mpfr_set_si_2exp (x, s * i, -4, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); -+ for (prec = 6; prec >= 3; prec -= 3) -+ { -+ mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0); -+ RND_LOOP (rnd) -+ for (k = 1; k <= 4; k++) - { -+ /* The following one is assumed to be correct. */ -+ inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); -+ inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); - mpfr_clear_flags (); -- inex2 = div == 0 ? -- mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) : div == 1 ? -- mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) : -- mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd); -- flags2 = __gmpfr_flags; -- if (flags1 == flags2 && SAME_SIGN (inex1, inex2) && -- mpfr_equal_p (z1, z2)) -- continue; -- printf ("Error in underflow("); -- if (e == MPFR_EMIN_MIN) -- printf ("MPFR_EMIN_MIN"); -- else if (e == emin) -- printf ("default emin"); -- else if (e >= LONG_MIN) -- printf ("%ld", (long) e); -- else -- printf ("= LONG_MIN) -+ printf ("%ld", (long) e); -+ else -+ printf (" -Date: Sun, 7 Dec 2014 03:10:09 +0000 -Subject: [PATCH] ncurses 5.9 - patch 20141206 - -+ modify MKlib_gen.sh to work around change in development version of - gcc introduced here: - https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html - https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html - (reports by Marcus Shawcroft, Maohui Lei). - -diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh -index d8cc3c9..b91398c 100755 ---- a/ncurses/base/MKlib_gen.sh -+++ b/ncurses/base/MKlib_gen.sh -@@ -474,11 +474,22 @@ sed -n -f $ED1 \ - -e 's/gen_$//' \ - -e 's/ / /g' >>$TMP - -+cat >$ED1 < $ED2 -+cat $ED2 >$TMP -+ - $preprocessor $TMP 2>/dev/null \ --| sed \ -- -e 's/ / /g' \ -- -e 's/^ //' \ -- -e 's/_Bool/NCURSES_BOOL/g' \ -+| sed -f $ED1 \ - | $AWK -f $AW2 \ - | sed -f $ED3 \ - | sed \ diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index ee7d4765fb221f7fe0f190a352e47dd2b8799ee9..1040cb9a9343b355e83027e9ecbb96b65bbad658 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation { license = licenses.lgpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ maintainers.sjmackenzie ]; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index f1232d7d253ae3120ca4de05a4ef06d20881572f..c84cddc897c1caefb369edad14a4b6dbe78f46ef 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { longDescription = '' nDPI is a library for deep-packet inspection based on OpenDPI. ''; - homepage = http://www.ntop.org/products/deep-packet-inspection/ndpi/; + homepage = https://www.ntop.org/products/deep-packet-inspection/ndpi/; license = with licenses; lgpl3; maintainers = with maintainers; [ takikawa ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index de9023a57106fdecf34ccf31bfc2201079975c40..a57884912baea8120b647c03b3a73d1207f17589 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, netcdf, hdf5, curl }: stdenv.mkDerivation rec { name = "netcdf-cxx4-${version}"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz"; - sha256 = "1g0fsmz59dnjib4a7r899lm99j3z6yxsw10c0wlihclzr6znmmds"; + sha256 = "13zi8cbk18gggx1c12a580wdsbl714lw68a1wg7c86x0sybirni5"; }; buildInputs = [ netcdf hdf5 curl ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ API to manipulate netcdf files"; - homepage = http://www.unidata.ucar.edu/software/netcdf/; + homepage = https://www.unidata.ucar.edu/software/netcdf/; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 35f675a305aff00fe8930846adbf6c5b1cf62be1..8af2a7aa36823886233c7493c2a301d033d86a69 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { name = "netcdf-fortran-${version}"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz"; - sha256 = "4170fc018c9ee8222e317215c6a273542623185f5f6ee00d37bbb4e024e4e998"; + sha256 = "0rwybszj1jjb25cx8vfyrd77x5qsdjzwspcjz56n12br89n9ica4"; }; buildInputs = [ netcdf hdf5 curl gfortran ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fortran API to manipulate netcdf files"; - homepage = http://www.unidata.ucar.edu/software/netcdf/; + homepage = https://www.unidata.ucar.edu/software/netcdf/; license = licenses.free; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index e7c64b9a76d0faa09417374fed16ce24c1085dc6..8446a91cceca4d4231b6ee38025fffc0273c8006 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -9,27 +9,30 @@ let mpiSupport = hdf5.mpiSupport; mpi = hdf5.mpi; in stdenv.mkDerivation rec { - name = "netcdf-4.4.1.1"; - src = fetchurl { - url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; - sha256 = "1blc7ik5yin7i0ls2kag0a9xjk12m0dzx6v1x88az3ras3scci2d"; - }; + name = "netcdf-4.6.1"; - buildInputs = [ hdf5 m4 curl mpi]; + src = fetchurl { + url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; + sha256 = "0hi61cdihwwvz5jz1l7yq712j7ca1cj4bhr8x0x7c2vlb1s9biw9"; + }; - passthru = { - mpiSupport = mpiSupport; - inherit mpi; - }; + nativeBuildInputs = [ m4 ]; + buildInputs = [ hdf5 curl mpi ]; - configureFlags = [ - "--enable-netcdf-4" - "--enable-dap" - "--enable-shared" - ] - ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); + passthru = { + mpiSupport = mpiSupport; + inherit mpi; + }; - meta = { - platforms = stdenv.lib.platforms.unix; - }; + configureFlags = [ + "--enable-netcdf-4" + "--enable-dap" + "--enable-shared" + ] + ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); + + meta = { + platforms = stdenv.lib.platforms.unix; + homepage = https://www.unidata.ucar.edu/software/netcdf/; + }; } diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 3923daad6f4b330492b200a4546284710be526d5..5b998926f0a5f950af548a53a0fbd5790eff7b08 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.3"; + version = "3.4"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526"; + sha256 = "150y8655h629wn946dvzasq16qxsc1m9nf58mifvhl350bgl4ymf"; }; }) diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 9633dacd68f240ac87939a83a03ae8d413472e16..3af93469cf16c4fe7b6e1aa5e18e73d63955d3a8 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, gmp, gnum4 +{ stdenv, buildPackages, gmp, gnum4 # Version specific args , version, src @@ -12,7 +12,8 @@ stdenv.mkDerivation (rec { outputs = [ "out" "dev" ]; outputBin = "dev"; - buildInputs = [ gnum4 ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ gnum4 ]; propagatedBuildInputs = [ gmp ]; doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin); diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index e00decca2ffde9b239f96183ba84a26d128ee7de..cd1e51bd19c166005b11a8b38c565bdd0fc5cab5 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, slang, popt }: stdenv.mkDerivation rec { - name = "newt-0.52.15"; + name = "newt-0.52.20"; src = fetchurl { url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz"; - sha256 = "0hg2l0siriq6qrz6mmzr6l7rpl40ay56c8cak87rb2ks7s952qbs"; + sha256 = "1g3dpfnvaw7vljbr7nzq1rl88d6r8cmrvvng9inphgzwxxmvlrld"; }; patchPhase = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = { - makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}"; + makeFlags = "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 2dcc7e9a53dd1b55a002aef1f846c313926adc51..c4a30f52b050d6cdda1ec8060d248bf0b8ee71c4 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, nix, boehmgc }: -let version = "2.0.7"; in +{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: +let version = "4.0.4"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,12 +7,12 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs"; + sha256 = "02lz62n55pvqin4x44qlxb5knrapyckmj9k8ggk4qxgb36368ifn"; }; - buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ]; + nativeBuildInputs = [ cmake pkgconfig ]; - installFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ nix boost ]; meta = { description = "Collection of miscellaneous plugins for the nix expression language"; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 9fb614cd071ac1cbc2665596c9c40886e8f060f4..59cc9438a9f170466ca2de635a6277a2e4e4fe25 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "2.1.0"; + version = "3.1.2"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "116309lx77m31x4krln0g7mra900g0knk9lbkxbpxnmamkagjyl9"; + sha256 = "1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 8ebf62cfdf0e80f54d56552556c2e2f052718e2a..a600938cdbb247f6e9bf7d67669e107f8484981d 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npth-1.3"; + name = "npth-1.5"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2"; - sha256 = "0am86vblapwz84254qpmhz0chk70g6qzh3wdxcs0gvba8d01ka5w"; + sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9"; }; + doCheck = true; + meta = with stdenv.lib; { description = "The New GNU Portable Threads Library"; longDescription = '' diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 2930de508e99c5616fab21a57dc398b7289f84de..17805f32afb11370cd6031fc774aedb30c1a1b33 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.17"; in +let version = "4.18"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "158hdn285dsb5rys8wl1wi32dd1axwhqq0r8fwny4aj157m0l2jr"; + sha256 = "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq"; }; outputs = [ "out" "dev" ]; @@ -16,6 +16,9 @@ stdenv.mkDerivation { preConfigure = '' cd nspr + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace '@executable_path/' "$out/lib/" + substituteInPlace configure.in --replace '@executable_path/' "$out/lib/" ''; configureFlags = [ diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch index 7687ea9bedb019b0a4be7f8c80921ba13506b537..132d5a96b29f2f1c59792345469c4ef5e1f356ed 100644 --- a/pkgs/development/libraries/nss/85_security_load.patch +++ b/pkgs/development/libraries/nss/85_security_load.patch @@ -13,10 +13,10 @@ diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/sh diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk --- nss/coreconf/config.mk 2017-01-04 15:24:24.000000000 +0100 +++ nss/coreconf/config.mk 2017-01-24 14:43:47.989432372 +0100 -@@ -208,3 +208,6 @@ - # exported symbols, which causes problem when NSS is built as part of Mozilla. - # So we add a NSS_SSL_ENABLE_ZLIB variable to allow Mozilla to turn this off. - NSS_SSL_ENABLE_ZLIB = 1 +@@ -202,3 +202,6 @@ + + # Hide old, deprecated, TLS cipher suite names when building NSS + DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES + +# Nix specific stuff. +DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\" diff --git a/pkgs/development/libraries/nss/ckpem.patch b/pkgs/development/libraries/nss/ckpem.patch new file mode 100644 index 0000000000000000000000000000000000000000..c1a65a6c0b289a9368ac01f47a999e16a9e02590 --- /dev/null +++ b/pkgs/development/libraries/nss/ckpem.patch @@ -0,0 +1,11 @@ +--- nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:12.000000000 -0800 ++++ nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:20.000000000 -0800 +@@ -156,8 +156,6 @@ + NSS_EXTERN_DATA pemInternalObject nss_pem_data[]; + NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects; + +- PRBool logged_in; +- + /* our raw object data array */ + NSS_EXTERN_DATA pemInternalObject nss_pem_data[]; + NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3e8ed856bfa8eebea89da1c574848abc531bfa34..8662b956ce22292e0f7151d5b60cdc4734830149 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,7 +1,13 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite }: +{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }: let + # Fix aarch64 build, shouldn't be needed after 3.35 + aarch64Patch = fetchurl { + url = https://hg.mozilla.org/projects/nss/raw-rev/74e679158d1b; + sha256 = "1lhs4h32mb2al3z461yylk227nid769di1pdjr7p0kqm2z1qm3jq"; + }; + nssPEM = fetchurl { url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; @@ -9,29 +15,37 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.33"; + version = "3.35"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_33_RTM/src/${name}.tar.gz"; - sha256 = "1r44qa4j7sri50mxxbnrpm6fxprwrhv76whi7bfq73j06syxmw4q"; + url = "mirror://mozilla/security/nss/releases/NSS_3_35_RTM/src/${name}.tar.gz"; + sha256 = "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl"; }; - buildInputs = [ perl zlib sqlite ]; + buildInputs = [ perl zlib sqlite ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ nspr ]; prePatch = '' xz -d < ${nssPEM} | patch -p1 + '' + stdenv.lib.optionalString stdenv.isAarch64 '' + (cd nss && patch -p1 < ${aarch64Patch}) ''; patches = [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch + ./ckpem.patch ]; patchFlags = "-p0"; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" + ''; + outputs = [ "out" "dev" "tools" ]; preConfigure = "cd nss"; @@ -45,7 +59,8 @@ in stdenv.mkDerivation rec { "NSS_ENABLE_ECC=1" "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" - ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; + ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1" + ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++"; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -84,15 +99,22 @@ in stdenv.mkDerivation rec { postFixup = '' for libname in freebl3 nssdbm3 softokn3 - do - libfile="$out/lib/lib$libname.so" - LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" + do '' + + (if stdenv.isDarwin + then '' + libfile="$out/lib/lib$libname.dylib" + DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '' else '' + libfile="$out/lib/lib$libname.so" + LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '') + '' + $out/bin/shlibsign -v -i "$libfile" done moveToOutput bin "$tools" moveToOutput bin/nss-config "$dev" moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example - rm "$out"/lib/*.a + rm -f "$out"/lib/*.a ''; meta = { diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 9051d96eff79b1c2f98091028dcd45d02221bd73..969e7534eac43d33e86b74fff01755971e3b43a2 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "nss_wrapper-1.0.3"; + name = "nss_wrapper-1.1.3"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0bysdijvi9n0jk74iklbfhbp0kvv81a727lcfd5q03q2hkzjfm18"; + sha256 = "18rsaw8r8xwn5003arc7xw8iliwbmzxfxgacmp6lhsdwqla4rf69"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index b095c0366adc2f20f12aa1b55a1fbed06891083b..dac65e1c2f9a2932ffa7aa18723ad271bc00344b 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, libgpgerror, libgcrypt, libksba, zlib }: +{ stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }: with stdenv.lib; stdenv.mkDerivation rec { name = "ntbtls-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2"; - sha256 = "0d322kgih43vr0gvy7kdj4baql1d6fa71vgpv0z63ira9pk4q9rd"; + sha256 = "1rywgdyj7prmwdi5r1rpglakqpnjskgln1mqksqm28qcwn2dnh42"; }; outputs = [ "dev" "out" ]; - buildInputs = [ libgcrypt libgpgerror libksba zlib ]; + buildInputs = [ libgcrypt libgpgerror libksba zlib ] + ++ stdenv.lib.optional stdenv.isDarwin gettext; postInstall = '' moveToOutput "bin/ntbtls-config" $dev @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A tiny TLS 1.2 only implementation"; - homepage = https://www.gnupg.org/software/ntbtls/index.html; + homepage = "https://www.gnupg.org/software/ntbtls/"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ joachifm ]; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 6c3a77cfaf5ecf1d99b5869fd23695154a6701d9..ec6dc5f90528079efe5e61a22856a273047bb02f 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ruby, opencl-headers, mesa_noglu }: +{stdenv, fetchurl, ruby, opencl-headers, libGL_driver }: stdenv.mkDerivation rec { name = "ocl-icd-${version}"; @@ -9,14 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; - buildInputs = [ ruby opencl-headers ]; + nativeBuildInputs = [ ruby ]; + + buildInputs = [ opencl-headers ]; postPatch = '' - sed -i 's,"/etc/OpenCL/vendors","${mesa_noglu.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c + sed -i 's,"/etc/OpenCL/vendors","${libGL_driver.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; meta = with stdenv.lib; { - description = "OpenCL ICD Loader"; + description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = https://forge.imag.fr/projects/ocl-icd/; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..0f6495f0c9c153ca9f894b7f92b4bc7e4ef19390 --- /dev/null +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -0,0 +1,46 @@ +{ fetchFromGitHub, stdenv, lib +, cmake, libGLU_combined +, freetype, freeimage, zziplib, randrproto, libXrandr +, libXaw, freeglut, libXt, libpng, boost, ois +, xproto, libX11, libXmu, libSM, pkgconfig +, libXxf86vm, xf86vidmodeproto, libICE +, renderproto, libXrender +, withNvidiaCg ? false, nvidia_cg_toolkit +, withSamples ? false }: + +stdenv.mkDerivation rec { + pname = "ogre"; + version = "1.9.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "OGRECave"; + repo = "ogre"; + rev = "v${version}"; + sha256 = "11lfgzqaps3728dswrq3cbwk7aicigyz08q4hfyy6ikc6m35r4wg"; + }; + + cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] + ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") + ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") + ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; + + enableParallelBuilding = true; + + buildInputs = + [ cmake libGLU_combined + freetype freeimage zziplib randrproto libXrandr + libXaw freeglut libXt libpng boost ois + xproto libX11 libXmu libSM pkgconfig + libXxf86vm xf86vidmodeproto libICE + renderproto libXrender + ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + + meta = { + description = "A 3D engine"; + homepage = https://www.ogre3d.org/; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index aba02827665b67e948571770522ec2a930c14bd1..0b7202459f9ee49e56f2b57bbeb0d3c19e514814 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib -, cmake, mesa +, cmake, libGLU_combined , freetype, freeimage, zziplib, randrproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , xproto, libX11, libXmu, libSM, pkgconfig @@ -9,11 +9,11 @@ , withSamples ? false }: stdenv.mkDerivation { - name = "ogre-1.9-hg-20160322"; + name = "ogre-1.10.11"; src = fetchurl { - url = "https://bitbucket.org/sinbad/ogre/get/v1-9.tar.gz"; - sha256 = "0w3argjy1biaxwa3c80zxxgll67wjp8czd83p87awlcvwzdk5mz9"; + url = "https://bitbucket.org/sinbad/ogre/get/v1-10-11.tar.gz"; + sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; }; cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] @@ -24,7 +24,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = - [ cmake mesa + [ cmake libGLU_combined freetype freeimage zziplib randrproto libXrandr libXaw freeglut libXt libpng boost ois xproto libX11 libXmu libSM pkgconfig @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "A 3D engine"; - homepage = http://www.ogre3d.org/; + homepage = https://www.ogre3d.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 2408c3e49041d364acbb17e675a57846f21fedcc..e4045bcd5dc494846487405af179f879052d9cfd 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }: +{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { name = "ogre-paged-${version}"; @@ -9,6 +9,23 @@ stdenv.mkDerivation rec { sha256 = "17j7rw9wbkynxbhm2lay3qgjnnagb2vd5jn9iijnn2lf8qzbgy82"; }; + patches = [ + # These patches come from https://github.com/RigsOfRods/ogre-pagedgeometry/pull/6 + # and make ogre-paged build with ogre-1.10. + (fetchpatch { + url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/2d4df577decba37ec3cdafc965deae0f6d31fe45.patch"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }) + (fetchpatch { + url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/4d81789ec6f55e294a5ad040ea7abe2b415cbc92.patch"; + sha256 = "17q8djdz2y3g46azxc3idhyvi6vf0sqkxld4bbyp3l9zn7dq76rp"; + }) + (fetchpatch { + url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/10f7c5ce5b422e9cbac59d466f3567a24c8831a4.patch"; + sha256 = "1kk0dbadzg73ai99l3w04q51sil36vzbkaqc79mdwy0vjrn4ardb"; + }) + ]; + buildInputs = [ ois ogre libX11 boost ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index b82f137ec6d78acd977fe3b7a1dd879afd7bbd2e..3989ab42468d3caa6e4a5a1e31197d5b87e13962 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "onig-${version}"; - version = "6.6.1"; + version = "6.8.2"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "062g5443dyxsraq346panfqvbd6wal6nmb336n4dw1rszx576sxz"; + sha256 = "00ly5i26n7wajhyhq3xadsc7dxrf7qllhwilk8dza2qj5dhld4nd"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a6e62cea9d7e722bf6c10e6c14dde983a2e2f7d1 --- /dev/null +++ b/pkgs/development/libraries/openbsm/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + pname = "openbsm"; + name = "${pname}-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] name)}"; + sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; + }; + + meta = { + homepage = http://www.openbsm.org/; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index c2fba26ba686d72ea52901967ce32061a379dba2..6af15d90cefda6e3a39bbb25c41cb1ec86c94a6d 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, libtool, qt4, +{stdenv, fetchurl, libGLU_combined, tcl, tk, file, libXmu, cmake, libtool, qt4, ftgl, freetype}: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd"; }; - buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; + buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; # Fix for glibc 2.26 postPatch = '' diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 717bb5ad0eed816705800f2a6d09f8e65736b374..9ce8bb618bf99d4d48743cf5cc666b8b2f0b8e9b 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub +, version # "12" for "1.2", "22" for "2.2" and so on +}: stdenv.mkDerivation rec { - name = "opencl-headers-2.1-2016-11-29"; + name = "opencl-headers-${version}-2017-07-18"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; - rev = "abb29588550c77f8340a6c3683531407013bf26b"; - sha256 = "0zjznq65i4b2h4k36qfbbzq1acf2jdd9vygjv5az1yk7qgsp4jj7"; + rev = "f039db6764d52388658ef15c30b2237bbda49803"; + sha256 = "0z04i330zr8czak2624q71aajdcq7ly8mb5bgala5m235qjpsrh7"; }; installPhase = '' mkdir -p $out/include/CL - cp * $out/include/CL + cp opencl${version}/CL/* $out/include/CL ''; meta = with stdenv.lib; { - description = "Khronos OpenCL headers"; + description = "Khronos OpenCL headers version ${version}"; homepage = https://www.khronos.org/registry/cl/; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 5ce30b039696684a3049a48125cfe57280b3b968..fb1199367037e713c3a38c2e5d98256e32149719 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -1,28 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre +, darwin}: stdenv.mkDerivation rec { name = "opencollada-${version}"; - version = "1.6.59"; + version = "1.6.62"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCOLLADA"; rev = "v${version}"; - sha256 = "0gpjvzcfyilb96x5ywajxgkw42ipwp4my36z9cq686bd9vpp3q0g"; + sha256 = "0bqki6sdvxsp9drzj87ma6n7m98az9pr0vyxhgw8b8b9knk8c48r"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ]; + buildInputs = [ cmake ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); propagatedBuildInputs = [ libxml2 pcre ]; enableParallelBuilding = true; + patchPhase = lib.optionalString stdenv.isDarwin '' + substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \ + --replace math.h cmath + ''; + meta = { description = "A library for handling the COLLADA file format"; homepage = https://github.com/KhronosGroup/OpenCOLLADA/; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index db9a5aeed21ebecd9e2a2b46a5b698f3164dd8c9..3b0e60fca3955f263e0c999912f120b7d781f831 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, unzip }: +{ stdenv, lib, fetchurl, cmake, unzip, boost }: stdenv.mkDerivation rec { name = "opencolorio-${version}"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - buildInputs = [ cmake unzip ]; + buildInputs = [ cmake unzip ] ++ lib.optional stdenv.isDarwin boost; + + cmakeFlags = lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON"; postInstall = '' rm $out/lib/*.a @@ -23,6 +25,6 @@ stdenv.mkDerivation rec { description = "A color management framework for visual effects and animation"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index c5f79b8613ecd01a013a3bdff0a5bb8fd07335c2..2724976c5ae8c276485484b886f22b6416ce9f8d 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, mesa, freeglut, glew, libXmu, libXext, libX11 +{stdenv, fetchurl, libGLU_combined, freeglut, glew, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.2"; name = "opencsg-${version}"; src = fetchurl { url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz"; - sha256 = "13c73jxadm27h7spdh3qj1v6rnn81v4xwqlv5a6k72pv9kjnpd7c"; + sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr"; }; - buildInputs = [mesa freeglut glew libXmu libXext libX11]; + buildInputs = [libGLU_combined freeglut glew libXmu libXext libX11]; doCheck = false; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index e6cb75d3b3d9a6acd6335b678549b0ab1f687f9a..efb9a7cdbe433b834e3b8afc7fa9d336ed2b70a0 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,6 +1,7 @@ { lib, stdenv -, fetchurl, fetchFromGitHub -, cmake, pkgconfig, unzip, zlib, pcre, hdf5, protobuf +, fetchurl, fetchFromGitHub, fetchpatch +, cmake, pkgconfig, unzip, zlib, pcre, hdf5 +, glog, boost, google-gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -11,37 +12,43 @@ , enableJPEG2K ? true, jasper , enableEigen ? true, eigen , enableOpenblas ? true, openblas +, enableContrib ? true , enableCuda ? (config.cudaSupport or false), cudatoolkit +, enableUnfree ? false , enableIpp ? false -, enableContrib ? false #, caffe, glog, boost, google-gflags , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 +, enableVtk ? false, vtk , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica +, enableTbb ? false, tbb +, enableOvis ? false, ogre +, enableGPhoto2 ? false, libgphoto2 +, enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, AVFoundation, Cocoa, QTKit +, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 }: let - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "0266kg337wij9rz602z5088jn2fq56aqpxxflf0fbh28kygchvk4"; + sha256 = "08yahgf427d2qbs2mw02xww6bv5yjkfc1hihihh7fhqgfz0jnj1h"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "0qxdvzdszzlpsya1pn4d2r9z4j98isxrgk15a2wwa3dqjmgv880d"; + sha256 = "00x1x53qv2pnc7i56244b5nf44wm2mp77hj486i5697r6hikk8n3"; }; # Contrib must be built in order to enable Tesseract support: @@ -52,16 +59,16 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "a62e20676a60ee0ad6581e217fe7e4bada3b95db"; - sha256 = "04idycc479l7fidj6r107sv65iszndswm287ms3nh896jbpbaxbv"; + rev = "dfe3162c237af211e98b8960018b564bc209261d"; + sha256 = "1k5xiwdi5r2y3fs5g70lpknxqi4pj32w6l311gfwng3q1cb2crif"; } + "/ippicv"; - files = let name = platform : "ippicv_2017u2_${platform}_20170418.tgz"; in + files = let name = platform : "ippicv_2017u3_${platform}_general_20170822.tgz"; in if stdenv.system == "x86_64-linux" then - { ${name "lnx_intel64"} = "87cbdeb627415d8e4bc811156289fa3a"; } + { ${name "lnx_intel64"} = "4e0352ce96473837b1d671ce87f17359"; } else if stdenv.system == "i686-linux" then - { ${name "lnx_ia32"} = "f2cece00d802d4dea86df52ed095257e"; } + { ${name "lnx_ia32"} = "dcdb0ba4b123f240596db1840cd59a76"; } else if stdenv.system == "x86_64-darwin" then - { ${name "mac_intel64"} = "0c25953c99dbb499ff502485a9356d8d"; } + { ${name "mac_intel64"} = "c1ebb5dfa5b7f54b0c44e1917805a463"; } else throw "ICV is not available for this platform (or not yet supported by this package)"; dst = ".cache/ippicv"; @@ -104,6 +111,21 @@ let dst = ".cache/xfeatures2d/boostdesc"; }; + # See opencv_contrib/modules/face/CMakeLists.txt + face = { + src = fetchFromGitHub { + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"; + sha256 = "061lsvqdidq9xa2hwrcvwi9ixflr2c2lfpc8drr159g68zi8bp4v"; + }; + files = { + "face_landmark_model.dat" = "7505c44ca4eb54b4ab1e4777cb96ac05"; + }; + dst = ".cache/data"; + }; + + # See opencv/cmake/OpenCVDownload.cmake installExtraFiles = extra : with lib; '' mkdir -p "${extra.dst}" '' + concatStrings (mapAttrsToList (name : md5 : '' @@ -121,8 +143,9 @@ let dst = ".cache/tiny_dnn"; }; - opencvFlag = name: enabled: "-DWITH_${name}=${if enabled then "ON" else "OFF"}"; + opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; + printEnabled = enabled : if enabled then "ON" else "OFF"; in stdenv.mkDerivation rec { @@ -144,22 +167,24 @@ stdenv.mkDerivation rec { ''; preConfigure = - installExtraFiles ippicv + ( + lib.optionalString enableIpp (installExtraFiles ippicv) + ( lib.optionalString buildContrib '' cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib") ${installExtraFiles vgg} ${installExtraFiles boostdesc} + ${installExtraFiles face} mkdir -p "${tinyDnn.dst}" ln -s "${tinyDnn.src}" "${tinyDnn.dst}/${tinyDnn.md5}-${tinyDnn.name}" ''); buildInputs = - [ zlib pcre hdf5 protobuf ] + [ zlib pcre hdf5 glog boost google-gflags protobuf ] ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 + ++ lib.optional enableVtk vtk ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff @@ -167,20 +192,21 @@ stdenv.mkDerivation rec { ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg + ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) + [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) + ++ lib.optional enableOvis ogre + ++ lib.optional enableGPhoto2 libgphoto2 + ++ lib.optional enableDC1394 libdc1394 ++ lib.optional enableEigen eigen ++ lib.optional enableOpenblas openblas # There is seemingly no compile-time flag for Tesseract. It's # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] + ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit - - # These are only needed for the currently disabled - # cnn_3dobj and dnn_modern modules - # ++ lib.optionals buildContrib [ caffe glog boost google-gflags ] - - ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ] + ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -189,10 +215,17 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + # Configure can't find the library without this. + OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; + cmakeFlags = [ + "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" "-DPROTOBUF_UPDATE_FILES=ON" - "-DWITH_OPENMP=ON" + "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" + "-DBUILD_TESTS=OFF" + "-DBUILD_PERF_TESTS=OFF" + "-DBUILD_DOCS=${printEnabled enableDocs}" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) (opencvFlag "JASPER" enableJPEG2K) @@ -202,20 +235,18 @@ stdenv.mkDerivation rec { (opencvFlag "OPENEXR" enableEXR) (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) + (opencvFlag "TBB" enableTbb) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" - ] ++ lib.optionals buildContrib [ - # the cnn_3dobj module fails to build - "-DBUILD_opencv_cnn_3dobj=OFF" - - # the dnn_modern module causes: - # https://github.com/opencv/opencv_contrib/issues/823 - # - # On OS X its dependency tiny-dnn-1.0.0a3 also fails to build. - "-DBUILD_opencv_dnn_modern=OFF" - ] - ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"]; + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + ] ++ lib.optionals stdenv.isDarwin [ + "-DWITH_OPENCL=OFF" + "-DWITH_LAPACK=OFF" + + # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. + "-DBUILD_opencv_dnn_modern=OFF" + ]; enableParallelBuilding = true; @@ -229,8 +260,8 @@ stdenv.mkDerivation rec { meta = { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = http://opencv.org/; - license = stdenv.lib.licenses.bsd3; + homepage = https://opencv.org/; + license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3; maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index aadd108620aa23cc66655e1e3d176230816e4bc1..cbac7210a10ed513bbc498634f6faadf1c4ec6b8 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = http://opencv.org/; + homepage = https://opencv.org/; license = licenses.bsd3; maintainers = with maintainers; [ viric ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 37afa3fd5070405960cae6e2c53a5b163f548d11..48ec5141e34fce8bf463607b5ba71365bae5572b 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export CPPFLAGS="-I${getDev mysql.client}/include/mysql" - export LDFLAGS="-L${getLib mysql.client}/lib/mysql -L${getLib postgresql}/lib" + export CPPFLAGS="-I${mysql.connector-c}/include/mysql" + export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; - buildInputs = [ readline mysql.client postgresql sqlite ]; + buildInputs = [ readline mysql.connector-c postgresql sqlite ]; } diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 75d2b090e7118e429832ea5f6b1750379829d78f..fc2068ca02ca3b8bcb47aa587a033b86dc3c9081 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.3.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "0karj37f0zq39w0ip8ahrjr6lcrrn9jd6bpzylp1m92jzs8pfki8"; + sha256 = "14pdih09h3bmgimmj9sa917x7kld49m91gvh0lcncink8rmbxvf1"; }; buildInputs = [ diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 27a9860c868375c3fd0e9930d906e7b05d59b69e..8d5a6bb65a91a6b6f7aa93a24376aa62a2bb93c9 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,13 +1,17 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: +{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: stdenv.mkDerivation rec { name = "openexr-${lib.getVersion ilmbase}"; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n"; + sha256 = "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg"; }; + patches = [ + ./bootstrap.patch + ]; + outputs = [ "bin" "dev" "out" "doc" ]; preConfigure = '' @@ -20,8 +24,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./bootstrap.patch ]; - meta = with stdenv.lib; { homepage = http://www.openexr.com/; license = licenses.bsd3; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index fcf4c2c2468f3ddd85c9dfa929c8afc5679efbed..099bd8d1e973b43145c663c17d954c740b77deac 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, mesa, openexr }: +{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }: stdenv.mkDerivation rec { @@ -16,12 +16,17 @@ stdenv.mkDerivation rec patches = [ ./openexrid.patch ]; + postPatch = '' + substituteInPlace openexrid/makefile \ + --replace g++ c++ + ''; + NIX_CFLAGS_COMPILE=''-I${ilmbase.dev}/include/OpenEXR -I${openexr.dev}/include/OpenEXR -I${openfx.dev}/include/OpenFX ''; - buildInputs = [ unzip re2 openfx zlib ilmbase mesa openexr ]; + buildInputs = [ unzip re2 openfx zlib ilmbase libGLU_combined openexr ]; enableParallelBuilding = true; @@ -38,7 +43,7 @@ stdenv.mkDerivation rec find $out mv $out/include $dev/ mv $out/lib $lib/ - ''; + ''; meta = with stdenv.lib; { description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing"; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 690261438ab9e347e2df3050662f267912b94a90..1ab6661db5bb8769d262fab277965e35f6ead7ce 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.6.3"; + version = "1.6.7"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "5c28b6ccd017fc6ff94ebd0c73ed8ab37d48f563dab1c603856fb05bc9333d99"; + sha256 = "1xqpc1qlvghprwih99immsjh3ba08lg754cf5icnmpkwh9nlh6p2"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix index ae8710e58a2803e4a96a98ab92c3196f250276dd..d18c971dc11295d906cbb8947f2f5dc8288a5472 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.1.nix @@ -1,37 +1,8 @@ { callPackage, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.1.2"; - branch = "2.1"; - revision = "v2.1.2"; - sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h"; - - patches = [ - # Fetched from https://github.com/szukw000/openjpeg/commit/cadff5fb6e73398de26a92e96d3d7cac893af255 - # Referenced from https://bugzilla.redhat.com/show_bug.cgi?id=1405135 - # Put in our source code to make sure we don't lose it, since that - # referenced commit is someone else's fork, and not actually up-stream. - ./CVE-2016-9580-and-CVE-2016-9581.patch - - (fetchpatch { - url = "https://bugzilla.suse.com/attachment.cgi?id=707359&action=diff&context=patch&collapsed=&headers=1&format=raw"; - name = "CVE-2016-9112.patch"; - sha256 = "18hqx73wdzfybr5n5k6pzhbhdlmawiqbjci8n82zykxiyfgp18pd"; - }) - (fetchpatch { - url = "https://bugzilla.suse.com/attachment.cgi?id=707354&action=diff&context=patch&collapsed=&headers=1&format=raw"; - name = "CVE-2016-9114.patch"; - sha256 = "0qam3arw9kdbh4501xim2pyldl708dnpyjwvjmwc9gc7hcq4gfi3"; - }) - (fetchpatch { - url = "https://bugzilla.suse.com/attachment.cgi?id=707356&action=diff&context=patch&collapsed=&headers=1&format=raw"; - name = "CVE-2016-9116.patch"; - sha256 = "0yyb3pxqi5sr44a48bacngzp206j4z49lzkg6hbkz1nra9na61a3"; - }) - (fetchpatch { - url = "https://bugzilla.suse.com/attachment.cgi?id=707358&action=diff&context=patch&collapsed=&headers=1&format=raw"; - name = "CVE-2016-9118.patch"; - sha256 = "125n8bmh07y7697s0y82ypb39rxgj0bdn8rcywbvamscagwg2wy9"; - }) - ]; + version = "2.3.0"; + branch = "2.3"; + revision = "v${version}"; + sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz"; }) diff --git a/pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch b/pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch deleted file mode 100644 index 064e7419c3412a62dd4cbef88d0bee3f6fc9e2ae..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch +++ /dev/null @@ -1,242 +0,0 @@ -From cadff5fb6e73398de26a92e96d3d7cac893af255 Mon Sep 17 00:00:00 2001 -From: szukw000 -Date: Fri, 9 Dec 2016 08:29:55 +0100 -Subject: [PATCH] These changes repair bugs of #871 and #872 - ---- - src/bin/jp2/converttif.c | 107 +++++++++++++++++++++++++++++++---------------- - 1 file changed, 70 insertions(+), 37 deletions(-) - -diff --git a/src/bin/jp2/converttif.c b/src/bin/jp2/converttif.c -index 143d3be..c690f8b 100644 ---- a/src/bin/jp2/converttif.c -+++ b/src/bin/jp2/converttif.c -@@ -553,20 +553,18 @@ static void tif_32sto16u(const OPJ_INT32* pSrc, OPJ_UINT16* pDst, OPJ_SIZE_T len - - int imagetotif(opj_image_t * image, const char *outfile) - { -- int width, height; -- int bps,adjust, sgnd; -- int tiPhoto; -+ uint32 width, height, bps, tiPhoto; -+ int adjust, sgnd; - TIFF *tif; - tdata_t buf; -- tsize_t strip_size; -+ tmsize_t strip_size, rowStride; - OPJ_UINT32 i, numcomps; -- OPJ_SIZE_T rowStride; - OPJ_INT32* buffer32s = NULL; - OPJ_INT32 const* planes[4]; - convert_32s_PXCX cvtPxToCx = NULL; - convert_32sXXx_C1R cvt32sToTif = NULL; - -- bps = (int)image->comps[0].prec; -+ bps = (uint32)image->comps[0].prec; - planes[0] = image->comps[0].data; - - numcomps = image->numcomps; -@@ -674,13 +672,13 @@ int imagetotif(opj_image_t * image, const char *outfile) - break; - } - sgnd = (int)image->comps[0].sgnd; -- adjust = sgnd ? 1 << (image->comps[0].prec - 1) : 0; -- width = (int)image->comps[0].w; -- height = (int)image->comps[0].h; -+ adjust = sgnd ? (int)(1 << (image->comps[0].prec - 1)) : 0; -+ width = (uint32)image->comps[0].w; -+ height = (uint32)image->comps[0].h; - - TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width); - TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height); -- TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, numcomps); -+ TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, (uint32)numcomps); - TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps); - TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); - TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); -@@ -688,8 +686,8 @@ int imagetotif(opj_image_t * image, const char *outfile) - TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1); - - strip_size = TIFFStripSize(tif); -- rowStride = ((OPJ_SIZE_T)width * numcomps * (OPJ_SIZE_T)bps + 7U) / 8U; -- if (rowStride != (OPJ_SIZE_T)strip_size) { -+ rowStride = (width * numcomps * bps + 7U) / 8U; -+ if (rowStride != strip_size) { - fprintf(stderr, "Invalid TIFF strip size\n"); - TIFFClose(tif); - return 1; -@@ -699,7 +697,7 @@ int imagetotif(opj_image_t * image, const char *outfile) - TIFFClose(tif); - return 1; - } -- buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)width * numcomps * sizeof(OPJ_INT32)); -+ buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)(width * numcomps * sizeof(OPJ_INT32))); - if (buffer32s == NULL) { - _TIFFfree(buf); - TIFFClose(tif); -@@ -1211,20 +1209,19 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) - TIFF *tif; - tdata_t buf; - tstrip_t strip; -- tsize_t strip_size; -+ tmsize_t strip_size; - int j, currentPlane, numcomps = 0, w, h; - OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_UNKNOWN; - opj_image_cmptparm_t cmptparm[4]; /* RGBA */ - opj_image_t *image = NULL; - int has_alpha = 0; -- unsigned short tiBps, tiPhoto, tiSf, tiSpp, tiPC; -- unsigned int tiWidth, tiHeight; -+ uint32 tiBps, tiPhoto, tiSf, tiSpp, tiPC, tiWidth, tiHeight; - OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz); - convert_XXx32s_C1R cvtTifTo32s = NULL; - convert_32s_CXPX cvtCxToPx = NULL; - OPJ_INT32* buffer32s = NULL; - OPJ_INT32* planes[4]; -- OPJ_SIZE_T rowStride; -+ tmsize_t rowStride; - - tif = TIFFOpen(filename, "r"); - -@@ -1243,22 +1240,35 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) - TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &tiSpp); - TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &tiPhoto); - TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &tiPC); -- w= (int)tiWidth; -- h= (int)tiHeight; -- -- if(tiBps > 16U) { -- fprintf(stderr,"tiftoimage: Bits=%d, Only 1 to 16 bits implemented\n",tiBps); -- fprintf(stderr,"\tAborting\n"); -+ -+ if(tiSpp == 0 || tiSpp > 4) { /* should be 1 ... 4 */ -+ fprintf(stderr,"tiftoimage: Bad value for samples per pixel == %hu.\n" -+ "\tAborting.\n", tiSpp); -+ TIFFClose(tif); -+ return NULL; -+ } -+ if(tiBps > 16U || tiBps == 0) { -+ fprintf(stderr,"tiftoimage: Bad values for Bits == %d.\n" -+ "\tMax. 16 Bits are allowed here.\n\tAborting.\n",tiBps); - TIFFClose(tif); - return NULL; - } - if(tiPhoto != PHOTOMETRIC_MINISBLACK && tiPhoto != PHOTOMETRIC_RGB) { -- fprintf(stderr,"tiftoimage: Bad color format %d.\n\tOnly RGB(A) and GRAY(A) has been implemented\n",(int) tiPhoto); -+ fprintf(stderr,"tiftoimage: Bad color format %d.\n" -+ "\tOnly RGB(A) and GRAY(A) has been implemented\n",(int) tiPhoto); - fprintf(stderr,"\tAborting\n"); - TIFFClose(tif); - return NULL; - } -- -+ if(tiWidth == 0 || tiHeight == 0) { -+ fprintf(stderr,"tiftoimage: Bad values for width(%u) " -+ "and/or height(%u)\n\tAborting.\n",tiWidth,tiHeight); -+ TIFFClose(tif); -+ return NULL; -+ } -+ w= (int)tiWidth; -+ h= (int)tiHeight; -+ - switch (tiBps) { - case 1: - case 2: -@@ -1312,7 +1322,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) - - TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES, - &extrasamples, &sampleinfo); -- -+ - if(extrasamples >= 1) - { - switch(sampleinfo[0]) -@@ -1333,7 +1343,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) - else /* extrasamples == 0 */ - if(tiSpp == 4 || tiSpp == 2) has_alpha = 1; - } -- -+ - /* initialize image components */ - memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t)); - -@@ -1346,7 +1356,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) - } else { - is_cinema = 0U; - } -- -+ - if(tiPhoto == PHOTOMETRIC_RGB) /* RGB(A) */ - { - numcomps = 3 + has_alpha; -@@ -1384,10 +1394,24 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) - image->x0 = (OPJ_UINT32)parameters->image_offset_x0; - image->y0 = (OPJ_UINT32)parameters->image_offset_y0; - image->x1 = !image->x0 ? (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1 : -- image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1; -+ image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1; -+ if(image->x1 <= image->x0) { -+ fprintf(stderr,"tiftoimage: Bad value for image->x1(%d) vs. " -+ "image->x0(%d)\n\tAborting.\n",image->x1,image->x0); -+ TIFFClose(tif); -+ opj_image_destroy(image); -+ return NULL; -+ } - image->y1 = !image->y0 ? (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1 : -- image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1; -- -+ image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1; -+ if(image->y1 <= image->y0) { -+ fprintf(stderr,"tiftoimage: Bad value for image->y1(%d) vs. " -+ "image->y0(%d)\n\tAborting.\n",image->y1,image->y0); -+ TIFFClose(tif); -+ opj_image_destroy(image); -+ return NULL; -+ } -+ - for(j = 0; j < numcomps; j++) - { - planes[j] = image->comps[j].data; -@@ -1395,15 +1419,15 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) - image->comps[numcomps - 1].alpha = (OPJ_UINT16)(1 - (numcomps & 1)); - - strip_size = TIFFStripSize(tif); -- -+ - buf = _TIFFmalloc(strip_size); - if (buf == NULL) { - TIFFClose(tif); - opj_image_destroy(image); - return NULL; - } -- rowStride = ((OPJ_SIZE_T)w * tiSpp * tiBps + 7U) / 8U; -- buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)w * tiSpp * sizeof(OPJ_INT32)); -+ rowStride = (w * tiSpp * tiBps + 7U) / 8U; -+ buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)(w * tiSpp * sizeof(OPJ_INT32))); - if (buffer32s == NULL) { - _TIFFfree(buf); - TIFFClose(tif); -@@ -1421,11 +1445,20 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) - for(; (h > 0) && (strip < TIFFNumberOfStrips(tif)); strip++) - { - const OPJ_UINT8 *dat8; -- OPJ_SIZE_T ssize; -+ tmsize_t ssize; - -- ssize = (OPJ_SIZE_T)TIFFReadEncodedStrip(tif, strip, buf, strip_size); -+ ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size); -+ if(ssize < 1 || ssize > strip_size) { -+ fprintf(stderr,"tiftoimage: Bad value for ssize(%ld) " -+ "vs. strip_size(%ld).\n\tAborting.\n",ssize,strip_size); -+ _TIFFfree(buf); -+ _TIFFfree(buffer32s); -+ TIFFClose(tif); -+ opj_image_destroy(image); -+ return NULL; -+ } - dat8 = (const OPJ_UINT8*)buf; -- -+ - while (ssize >= rowStride) { - cvtTifTo32s(dat8, buffer32s, (OPJ_SIZE_T)w * tiSpp); - cvtCxToPx(buffer32s, planes, (OPJ_SIZE_T)w); diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 475ac496e7e8e397f5f61dae6d29aedf7143a062..56118c9bbb2c886dcb416a839a061f1fd01fedf1 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.openldap.org/; description = "An open source implementation of the Lightweight Directory Access Protocol"; - maintainers = with maintainers; [ lovek323 mornfall ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 2d08f37c8c2394caf125f28c5fae357c8cb92ec3..9aca076c5dcb91876fb874fd197ba0aa34c4d74c 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, perl, libibverbs +{ stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -7,44 +7,48 @@ , enablePrefix ? false }: -with stdenv.lib; - let - majorVersion = "1.10"; + majorVersion = "3.0"; + minorVersion = "0"; in stdenv.mkDerivation rec { - name = "openmpi-${majorVersion}.7"; + name = "openmpi-${majorVersion}.${minorVersion}"; src = fetchurl { url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; - sha256 = "142s1vny9gllkq336yafxayjgcirj2jv0ddabj879jgya7hyr2d0"; + sha256 = "1mw2d94k6mp4scg1wnkj50vdh734fy5m2ygyrj65s4mh3prbz6gn"; }; - buildInputs = [ gfortran ] - ++ optional (stdenv.isLinux || stdenv.isFreeBSD) libibverbs; + postPatch = '' + patchShebangs ./ + ''; + + buildInputs = with stdenv; [ gfortran zlib ] + ++ lib.optional isLinux libnl + ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; - configureFlags = [] - ++ optional enableSGE "--with-sge" - ++ optional enablePrefix "--enable-mpirun-prefix-by-default" + configureFlags = with stdenv; [ "--disable-mca-dso" ] + ++ lib.optional isLinux "--with-libnl=${libnl.dev}" + ++ lib.optional enableSGE "--with-sge" + ++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default" ; enableParallelBuilding = true; - preBuild = '' - patchShebangs ompi/mpi/fortran/base/gen-mpi-sizeof.pl - ''; - postInstall = '' - rm -f $out/lib/*.la + rm -f $out/lib/*.la ''; - meta = { + doCheck = true; + + meta = with stdenv.lib; { homepage = http://www.open-mpi.org/; - description = "Open source MPI-2 implementation"; - longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + description = "Open source MPI-3 implementation"; + longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; + maintainers = with maintainers; [ markuskowa ]; + license = licenses.bsd3; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..187f861337568ad56da3f5199f0f36dc4ed12f38 --- /dev/null +++ b/pkgs/development/libraries/openpam/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, lib }: + +stdenv.mkDerivation rec { + name = "openpam-${version}"; + version = "20170430"; + + src = fetchurl { + url = "mirror://sourceforge/openpam/openpam/Resedacea/${name}.tar.gz"; + sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; + }; + + meta = { + homepage = https://www.openpam.org; + description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index c2c102ccf9bd7afcaa84354a70491937367cd1ed..659c4fb7cff6103d469d987edf63c4965c8a5266 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "opensaml-cpp-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-opensaml.git"; - rev = "61193de29e4c9f1ccff7ed7e1f42c2748c62be77"; - sha256 = "1jlxa1f2qn0kd15fzjqp80apxn42v47wg3mx1vk424m31rhi00xr"; + rev = version; + sha256 = "0wjb6jyvh4hwpy1pvhh63i821746nqijysrd4vasbirkf4h6z7nx"; }; buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ]; diff --git a/pkgs/development/libraries/openslp/CVE-2016-4912.patch b/pkgs/development/libraries/openslp/CVE-2016-4912.patch new file mode 100644 index 0000000000000000000000000000000000000000..06223deda89b09225e0b34fef0852bd733dd0255 --- /dev/null +++ b/pkgs/development/libraries/openslp/CVE-2016-4912.patch @@ -0,0 +1,11 @@ +--- a/common/slp_xmalloc.c ++++ b/common/slp_xmalloc.c +@@ -206,7 +206,7 @@ void * _xrealloc(const char * file, int line, void * ptr, size_t size) + if (newptr == 0) + return 0; + memcpy(newptr, ptr, x->size); +- _xfree(file, line, x); ++ _xfree(file, line, ptr); + } + return newptr; + } diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 3ab3f68cde5e24ef92b5b172422d4090257fefe8..3e178d92013eff5b050e8c375aa69f7a6ff7e3d0 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { url = "https://src.fedoraproject.org/cgit/rpms/openslp.git/plain/openslp-2.0.0-cve-2016-7567.patch"; sha256 = "0zp61axx93b7nrbsyhn2x4dnw7n9y6g4rys21hyqxk4khrnc2yr9"; }) + ./CVE-2016-4912.patch ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 68e88cc57d06a550fd923e220c6490839feca3f5..5a9052222cb88f1e1cc83df85b2b62a2e33044e2 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, buildPackages, perl -, hostPlatform +, buildPlatform, hostPlatform +, fetchpatch , withCryptodev ? false, cryptodevHeaders , enableSSL2 ? false }: @@ -7,10 +8,6 @@ with stdenv.lib; let - - opensslCrossSystem = hostPlatform.openssl.system or - (throw "openssl needs its platform name cross building"); - common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec { name = "openssl-${version}"; @@ -23,23 +20,44 @@ let (args.patches or []) ++ [ ./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) + (if hostPlatform.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; + postPatch = if (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) then '' + substituteInPlace crypto/async/arch/async_posix.h \ + --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ + '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' + '' else null; + outputs = [ "bin" "dev" "out" "man" ]; setOutputFlags = false; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = hostPlatform.isLinux; nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; - # On x86_64-darwin, "./config" misdetects the system as - # "darwin-i386-cc". So specify the system type explicitly. - configureScript = - if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" - else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc" - else "./config"; + # TODO(@Ericson2314): Improve with mass rebuild + configureScript = { + "x86_64-darwin" = "./Configure darwin64-x86_64-cc"; + "x86_64-solaris" = "./Configure solaris64-x86_64-gcc"; + }.${hostPlatform.system} or ( + if hostPlatform == buildPlatform + then "./config" + else if hostPlatform.isMinGW + then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}" + else if hostPlatform.isLinux + then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}" + else + throw "Not sure what configuration to use for ${hostPlatform.config}" + ); + + # TODO(@Ericson2314): Make unconditional on mass rebuild + ${if buildPlatform != hostPlatform then "configurePlatforms" else null} = []; + + preConfigure = '' + patchShebangs Configure + ''; configureFlags = [ "shared" @@ -49,7 +67,7 @@ let "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" - ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.isAarch64) "no-afalgeng"; + ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && hostPlatform.isAarch64) "no-afalgeng"; makeFlags = [ "MANDIR=$(man)/share/man" ]; @@ -83,18 +101,6 @@ let fi ''; - crossAttrs = { - # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558 - postPatch = '' - sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared - ''; - preConfigure='' - # It's configure does not like --build or --host - export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}" - ''; - configureScript = "./Configure"; - }; - meta = { homepage = https://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; @@ -107,13 +113,13 @@ let in { openssl_1_0_2 = common { - version = "1.0.2m"; - sha256 = "03vvlfnxx4lhxc83ikfdl6jqph4h52y7lb7li03va6dkqrgg2vwc"; + version = "1.0.2o"; + sha256 = "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc"; }; openssl_1_1_0 = common { - version = "1.1.0g"; - sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy"; + version = "1.1.0h"; + sha256 = "05x509lccqjscgyi935z809pwfm708islypwhmjnb6cyvrn64daq"; }; } diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 91899ad8da43bb23ad5ff20b8f1fa3b2e964df05..62c093f310fb11264966ba76844f594e97fd2000 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,36 +1,44 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu -, mesa_noglu, glew, ocl-icd, python3 +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU +, libGL, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit +, darwin }: stdenv.mkDerivation rec { name = "opensubdiv-${version}"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "0wpjwfik4q9s4r30hndhzmfyzv968mmg5lgng0123l07mn47d2yl"; + sha256 = "1s96038yvf8wch5gv537iigqflxx7rh9wwn3wlrk8f9yfdwv1mk1"; }; outputs = [ "out" "dev" ]; buildInputs = - [ cmake pkgconfig mesa_glu mesa_noglu ocl-icd python3 + [ cmake pkgconfig libGLU libGL python3 # FIXME: these are not actually needed, but the configure script wants them. glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi ] + ++ lib.optional (!stdenv.isDarwin) ocl-icd + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ]) ++ lib.optional cudaSupport cudatoolkit; cmakeFlags = [ "-DNO_TUTORIALS=1" "-DNO_REGRESSION=1" "-DNO_EXAMPLES=1" + "-DNO_METAL=1" # don’t have metal in apple sdk + ] ++ lib.optionals (!stdenv.isDarwin) [ "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" - ] ++ lib.optional cudaSupport "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30"; + ] ++ lib.optionals cudaSupport [ + "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ]; enableParallelBuilding = true; @@ -39,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "An Open-Source subdivision surface library"; homepage = http://graphics.pixar.com/opensubdiv; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; license = lib.licenses.asl20; }; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 2940ab45eaaf603ce9f762d70180e4bf12a8431a..be28c84e3e426a0ce017c4c9d87ec84bfbde7163 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "4.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "0kqlsfa9rdpxpw7v61vfknvs11axh196ilqk6bnyyfkslmmcak45"; + sha256 = "1als53dnbnwa66k16vy95h1rhpdzz6i80c0gc2g3i17qbasl6ni5"; }; outputs = [ "out" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec LOG4CPLUS_LIB= BLOSC_INCLUDE_DIR=${c-blosc}/include/ BLOSC_LIB_DIR=${c-blosc}/lib/ - ''; + ''; installFlags = ''DESTDIR=$(out)''; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec description = "An open framework for voxel"; homepage = "http://www.openvdb.org"; maintainers = [ maintainers.guibou ]; - platforms = platforms.all; + platforms = platforms.linux; license = licenses.mpl20; }; } diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index b179ca8803c129fc0668a79b0ea81907c457d32f..1aa0f26845710bd6cfa4131da4de6caa656eaa82 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -1,16 +1,20 @@ -{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, libxml2, curl, cmake, pam, sblim-sfcc }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, curl, libxml2, pam, sblim-sfcc }: stdenv.mkDerivation rec { - version = "2.6.0"; name = "openwsman-${version}"; + version = "2.6.5"; - src = fetchurl { - url = "https://github.com/Openwsman/openwsman/archive/v${version}.tar.gz"; - sha256 = "0gw2dsjxzpchg3s85kplwgp9xhd9l7q4fh37iy7r203pvir4k6s4"; + src = fetchFromGitHub { + owner = "Openwsman"; + repo = "openwsman"; + rev = "v${version}"; + sha256 = "1r0zslgpcr4m20car4s3hsccy10xcb39qhpw3dhpjv42xsvvs5xv"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool libxml2 curl cmake pam sblim-sfcc ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ curl libxml2 pam sblim-sfcc ]; cmakeFlags = [ "-DCMAKE_BUILD_RUBY_GEM=no" @@ -22,18 +26,13 @@ stdenv.mkDerivation rec { configureFlags = "--disable-more-warnings"; - meta = { - description = "Openwsman server implementation and client api with bindings"; - - homepage = https://github.com/Openwsman/openwsman; - downloadPage = "https://github.com/Openwsman/openwsman/releases"; - - maintainers = [ stdenv.lib.maintainers.deepfire ]; - - license = stdenv.lib.licenses.bsd3; - - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - + meta = with stdenv.lib; { + description = "Openwsman server implementation and client API with bindings"; + downloadPage = https://github.com/Openwsman/openwsman/releases; + homepage = https://openwsman.github.io; + license = licenses.bsd3; + maintainers = with maintainers; [ deepfire ]; + platforms = platforms.linux; # PAM is not available on Darwin inherit version; }; } diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..63c51996b227119d7f797d0c3d617e6a08779a78 --- /dev/null +++ b/pkgs/development/libraries/openzwave/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub +, doxygen, fontconfig, graphviz-nox, libxml2, pkgconfig, which +, systemd }: + +let + version = "2018-04-04"; + +in stdenv.mkDerivation rec { + name = "openzwave-${version}"; + + src = fetchFromGitHub { + owner = "OpenZWave"; + repo = "open-zwave"; + rev = "ab5fe966fee882bb9e8d78a91db892a60a1863d9"; + sha256 = "0yby8ygzjn5zp5vhysxaadbzysqanwd2zakz379299qs454pr2h9"; + }; + + nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ]; + + buildInputs = [ systemd ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + DESTDIR=$out PREFIX= pkgconfigdir=lib/pkgconfig make install $installFlags + + runHook postInstall + ''; + + FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf"; + FONTCONFIG_PATH="${fontconfig.out}/etc/fonts/"; + + postPatch = '' + substituteInPlace cpp/src/Options.cpp \ + --replace /etc/openzwave $out/etc/openzwave + ''; + + fixupPhase = '' + substituteInPlace $out/lib/pkgconfig/libopenzwave.pc \ + --replace prefix= prefix=$out \ + --replace dir= dir=$out + + substituteInPlace $out/bin/ozw_config \ + --replace pcfile=${pkgconfig} pcfile=$out + ''; + + meta = with stdenv.lib; { + description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; + homepage = http://www.openzwave.net/; + license = licenses.gpl3; + maintainers = with maintainers; [ etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index d0085752623de1a12c557e5f845a90008a65b71f..1c629c137796c7946a48b2b78d392358f0bdc873 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -4,10 +4,12 @@ assert odbcSupport -> unixODBC != null; -let optional = stdenv.lib.optional; - optionalString = stdenv.lib.optionalString; - requireSource = version: part: hash: (requireFile rec { - name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm"; +with stdenv.lib; + +let + baseVersion = "12.2"; + requireSource = version: rel: part: hash: (requireFile rec { + name = "oracle-instantclient${baseVersion}-${part}-${version}-${rel}.x86_64.rpm"; message = '' This Nix expression requires that ${name} already be part of the store. Download the file @@ -24,13 +26,13 @@ let optional = stdenv.lib.optional; sha256 = hash; }); in stdenv.mkDerivation rec { - version = "12.1.0.2.0-1"; + version = "${baseVersion}.0.1.0"; 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"); + srcBase = (requireSource version "1" "basic" "43c4bfa938af741ae0f9964a656f36a0700849f5780a2887c8e9f1be14fe8b66"); + srcDevel = (requireSource version "1" "devel" "4c7ad8d977f9f908e47c5e71ce56c2a40c7dc83cec8a5c106b9ff06d45bb3442"); + srcSqlplus = (requireSource version "1" "sqlplus" "303e82820a10f78e401e2b07d4eebf98b25029454d79f06c46e5f9a302ce5552"); + srcOdbc = optionalString odbcSupport (requireSource version "2" "odbc" "e870c84d2d4be6f77c0760083b82b7ffbb15a4bf5c93c4e6c84f36d6ed4dfdf1"); buildInputs = [ glibc patchelf rpmextract ] ++ optional odbcSupport unixODBC; @@ -41,15 +43,13 @@ in stdenv.mkDerivation rec { ${rpmextract}/bin/rpmextract "${srcBase}" ${rpmextract}/bin/rpmextract "${srcDevel}" ${rpmextract}/bin/rpmextract "${srcSqlplus}" - ${optionalString odbcSupport '' - ${rpmextract}/bin/rpmextract "${srcOdbc}" - ''} - + '' + 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/" - mv "usr/include/oracle/12.1/client64/"* "$out/include/" - mv "usr/lib/oracle/12.1/client64/lib/"* "$out/lib/" - mv "usr/lib/oracle/12.1/client64/bin/"* "$out/bin/" + mv "usr/share/oracle/${baseVersion}/client64/demo/"* "$out/share/${name}/demo/" + mv "usr/include/oracle/${baseVersion}/client64/"* "$out/include/" + mv "usr/lib/oracle/${baseVersion}/client64/lib/"* "$out/lib/" + mv "usr/lib/oracle/${baseVersion}/client64/bin/"* "$out/bin/" ln -s "$out/bin/sqlplus" "$out/bin/sqlplus64" for lib in $out/lib/lib*.so; do @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { command line SQL client. ''; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ pesterhazy ]; }; } diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index f05811f348132792fec5d47c68da31759d982f15..5dc5df8e95b95acae0f56020e5cd1ecea7459d35 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { baseName = "ortp"; - version = "0.27.0"; + version = "1.0.2"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "0gjaaph4pamay9gn1yn7ky5wyzhj93r53rwak7h8s48vf08fqyv7"; + sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv"; }; buildInputs = [ bctoolbox ]; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 63c882076b9d72c7c63c38d6dabfa30cec97cbff..febba5d5703f8e3fa54ae9a1f6b625cb45fd01cf 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobjectIntrospection ] ++ (with gnome3; [ - gnome_common gtk libsoup + gnome-common gtk libsoup ]); meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 34182cd5a8472ff5de76f0065fb7d763c527995a..a3d4857d57a96eac9a5cf324c7127a688fda3b1b 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "p11-kit-${version}"; - version = "0.23.7"; + version = "0.23.10"; src = fetchFromGitHub { owner = "p11-glue"; repo = "p11-kit"; rev = version; - sha256 = "1l8sg0g74k2mk0y6vz19hc103dzizxa0h579gdhvxifckglb01hy"; + sha256 = "0n0wqv028flzvnxllqv8i6x9nv705csl7ddzi0fzvppc9fp2yinp"; }; outputs = [ "out" "dev"]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 85032677aae307f6d0bba2d8adc7be9014495cd3..d880d41c708477af0229291655c762f23dd84870 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz -, libintlOrEmpty, gobjectIntrospection, darwin +, libintl, gobjectIntrospection, darwin }: with stdenv.lib; let ver_maj = "1.40"; - ver_min = "12"; + ver_min = "14"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc"; + sha256 = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3"; }; outputs = [ "bin" "dev" "out" "devdoc" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo harfbuzz libXft ] ++ libintlOrEmpty; + propagatedBuildInputs = [ cairo harfbuzz libXft libintl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 09cbd86eb92b2922955587b7c828895abc2e8aeb..6fb123f509499773cea103bfcd761423d1ac43e0 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew , xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig doxygen ]; buildInputs = [ - mesa_noglu + libGL glew xorg.libX11 ffmpeg diff --git a/pkgs/development/libraries/parquet-cpp/default.nix b/pkgs/development/libraries/parquet-cpp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e281e604380bfe0a1e823ac94a4a9b65f2389193 --- /dev/null +++ b/pkgs/development/libraries/parquet-cpp/default.nix @@ -0,0 +1,37 @@ +{ stdenv, symlinkJoin, fetchurl, arrow-cpp, boost, cmake, gtest, snappy, thrift, zlib }: + +stdenv.mkDerivation rec { + name = "parquet-cpp-${version}"; + version = "1.4.0"; + + src = fetchurl { + url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz"; + sha256 = "1kn7pjzi5san5f05qbl8l8znqsa3f9cq9bflfr4s2jfwr7k9p2aj"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + + preConfigure = '' + substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + ''; + + ARROW_HOME = arrow-cpp; + THRIFT_HOME = thrift; + GTEST_HOME = gtest; + SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; + ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; + + cmakeFlags = [ + "-DPARQUET_BUILD_BENCHMARKS=OFF" + ]; + + meta = { + description = "A C++ library to read and write the Apache Parquet columnar data format"; + homepage = http://parquet.apache.org; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 4f93ed5621151605abdc371adb27d8d046246ce8..b45ed296691621c5a939cbab020775307abfdf06 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,30 +1,28 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, mesa, zlib, swig, python, doxygen, xorg }: +{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }: stdenv.mkDerivation rec { name = "partio-${version}"; - version = "1.1.0"; + version = "2018-03-01"; src = fetchFromGitHub { owner = "wdas"; repo = "partio"; - rev = "v${version}"; - sha256 = "0z7n5ay21ca7g7xb80v6jmr96x9k7vm7zawawvmx71yj32rg1n34"; + rev = "8b6ea0d20f1ab77cd7f18390999251e60932de4a"; + sha256 = "16sdj103v02l2dgq9y9cna9jakafabz9jxzdxsd737ir6wn10ksb"; }; outputs = [ "dev" "out" "lib" ]; - buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; + nativeBuildInputs = [ unzip cmake doxygen ]; + buildInputs = [ freeglut libGLU_combined zlib swig python xorg.libXi xorg.libXmu ]; enableParallelBuilding = true; buildPhase = '' - sed 's/ADD_LIBRARY (partio /ADD_LIBRARY (partio SHARED /' -i ../src/lib/CMakeLists.txt - CXXFLAGS="-std=c++11" cmake . make partio mkdir $dev - mkdir -p $lib/lib mkdir $out ''; @@ -32,19 +30,16 @@ stdenv.mkDerivation rec # Sexpr support installPhase = '' - mkdir $dev/lib - mkdir -p $dev/include/partio - - mv lib/libpartio.so $lib/lib - - mv ../src/lib/* $dev/include/partio + make install prefix=$out + mkdir $dev/include/partio + mv $dev/include/*.h $dev/include/partio ''; meta = with stdenv.lib; { description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; homepage = "https://www.disneyanimation.com/technology/partio.html"; license = licenses.bsd3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.guibou ]; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index e6055151301c771299342f1990198ae2f58c85a9..973798b849bc58c82aa06697f1f6ba9b74054a81 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -24,8 +24,7 @@ in stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" "man" ]; - configureFlags = [ - "--enable-jit" + configureFlags = optional (!hostPlatform.isRiscV) "--enable-jit" ++ [ "--enable-unicode-properties" "--disable-cpp" ] @@ -33,6 +32,13 @@ in stdenv.mkDerivation rec { buildInputs = optional (hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads; + # https://bugs.exim.org/show_bug.cgi?id=2173 + patches = [ ./stacksize-detection.patch ]; + + preCheck = '' + patchShebangs RunGrepTest + ''; + doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform; # XXX: test failure on Cygwin # we are running out of stack on both freeBSDs on Hydra diff --git a/pkgs/development/libraries/pcre/stacksize-detection.patch b/pkgs/development/libraries/pcre/stacksize-detection.patch new file mode 100644 index 0000000000000000000000000000000000000000..4bc97069b1e2c7c66fe9552289df5a9001b756cc --- /dev/null +++ b/pkgs/development/libraries/pcre/stacksize-detection.patch @@ -0,0 +1,16 @@ +diff --git a/pcre_exec.c b/pcre_exec.c +--- a/pcre_exec.c ++++ b/pcre_exec.c +@@ -509,6 +509,12 @@ + (e.g. stopped by repeated call or recursion limit) + */ + ++#ifdef __GNUC__ ++static int ++match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, ++ PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb, ++ unsigned int rdepth) __attribute__((noinline,noclone)); ++#endif + static int + match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, + PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb, diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 3b698ff74cfae0628d960d90c67cffc3cd1ced21..9603e45a8b447c1fa59b40c8d0fc8dee699a0ad5 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -20,14 +20,21 @@ stdenv.mkDerivation rec { 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; + extraPrefix = ""; }) (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; + extraPrefix = ""; + }) + (fetchpatch { + name = "CVE-2017-8786.patch"; + url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2test.c?r1=692&r2=697&view=patch"; + sha256 = "1c629nzrk4il2rfclwyc1a373q58m4q9ys9wr91zhl4skfk7x19b"; + stripLen = 2; + extraPrefix = ""; }) ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 2cb2dde33f7e3e6691d8e44fb55da5f35d2a8a57..8e1ee8196c30e8328c920125c7f5c9b9f9d4307e 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio +{ stdenv, lib, fetchurl, cmake, libGLU_combined, pkgconfig, libpulseaudio , qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null , withQt5 ? false , debug ? false }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ mesa libpulseaudio ] + [ libGLU_combined libpulseaudio ] ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]); nativeBuildInputs = diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 43bcef0f2d3ca4cd98a0d443522eb751e9424c92..e29af17f35df266de71d3332f79607c4142e7042 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -1,23 +1,41 @@ -{stdenv, fetchurl, cmake}: +{ stdenv, fetchurl, cmake, doxygen +, zlib }: -stdenv.mkDerivation rec { - name = "physfs-2.0.3"; +let + generic = version: sha256: + stdenv.mkDerivation rec { + name = "physfs-${version}"; - src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; - sha256 = "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na"; - }; + src = fetchurl { + url = "${meta.homepage}/downloads/${name}.tar.bz2"; + inherit sha256; + }; + + nativeBuildInputs = [ cmake doxygen ]; + + buildInputs = [ zlib ]; - nativeBuildInputs = [ cmake ]; + enableParallelBuilding = true; - patchPhase = '' - sed s,-Werror,, -i CMakeLists.txt - ''; + patchPhase = '' + sed s,-Werror,, -i CMakeLists.txt + ''; - meta = { - homepage = http://icculus.org/physfs/; - description = "Library to provide abstract access to various archives"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + doInstallCheck = true; + + installCheckPhase = '' + ./test_physfs --version + ''; + + meta = with stdenv.lib; { + homepage = http://icculus.org/physfs/; + description = "Library to provide abstract access to various archives"; + license = licenses.free; + platforms = platforms.linux; + }; }; + +in { + physfs_2 = generic "2.0.3" "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na"; + physfs = generic "3.0.1" "1wgj2zqpnfbnyyi1i7bq5pshcc9n5cvwlpzp8im67nb8662ryyxp"; } diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 780dcc3770f0da10917dc208737ad84238536ee7..0ee68415b89cb4d770e6696219305a2d659b4eec 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ python2 ]; + postPatch = '' + substituteInPlace plugins/SISCone/SISConeBasePlugin.cc \ + --replace 'structure_of()' \ + 'structure_of()' + ''; + configureFlags = [ "--enable-allcxxplugins" "--enable-pyext" diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 2c07c1e085801faa2904550636cb0d71768745d0..794d0b24c778374d3fdff14333cc43fbdcf6a8da 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -25,7 +25,7 @@ , motif ? null # motif or lesstif # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. -, mesa ? null +, libGLU_combined ? null , xlibsWrapper ? null , libXmu ? null }: @@ -40,7 +40,7 @@ assert enableQT -> qt != null; assert enableXM -> motif != null; # OpenGL/X11 User Interface and Visualisation drivers. -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa != null; +assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; @@ -81,8 +81,8 @@ let }; enableParallelBuilding = true; - buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; - propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; + buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ]; + propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 407be5c5e4a4dc702b0e1f0cfcfdbe53dfdbe9da..f3ba8a4a6ff66d2cf459e56a8459ab614b82b25f 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j"; + sha256 = "0wr2mmmf5rlvcc6xgdagafm6vb5g6ifvrjc7kd86gs9jip32p29i"; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 1a203172d2c8866d492c97b919c50a2e0e64984d..93e0fa99c347ba2358f222e16ba9a10f29c3d83e 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lhapdf-${version}"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "0gfjps7v93n0rrdndkhp22d93y892bf76pnzdhqbish0cigkkxph"; + sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 94074f6dcb4503b180f746cd0b9c23a26666adfd..eca2807ce15315bcb642bbe7b4538597d32b848e 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pythia-${version}"; - version = "8.219"; + version = "8.226"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "13fhphddl0jir8jyjvj6a9qz14wiv02q9lby8mcdyv8gsw0ir8hy"; + sha256 = "1jfjkq78d1llrrm2k5pgsl92a5z8af9rx3n83rzv28lxrqdjix4g"; }; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 454c868dfcd2af28b6158c6c81e30027f075c480..c13b659f792e1369c31c8919eb2b8c28af3df039 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,17 +2,13 @@ stdenv.mkDerivation rec { name = "rivet-${version}"; - version = "2.5.4"; + version = "2.6.0"; src = fetchurl { url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1qi7am60f2l4krd3sbj95mbzfk82lir0wy8z27yr9ncq6qcm48kp"; + sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv"; }; - postPatch = "patchShebangs ./src/Analyses/cat_with_lines"; - - pythonPath = []; # python wrapper support - patches = [ ./darwin.patch # configure relies on impure sw_vers to -Dunix ]; @@ -31,6 +27,13 @@ stdenv.mkDerivation rec { buildInputs = [ hepmc imagemagick python2 latex makeWrapper ]; propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; + preConfigure = '' + substituteInPlace bin/rivet-buildplugin.in \ + --replace '"which"' '"${which}/bin/which"' \ + --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ + --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " + ''; + preInstall = '' substituteInPlace bin/make-plots \ --replace '"which"' '"${which}/bin/which"' \ @@ -42,10 +45,6 @@ stdenv.mkDerivation rec { --replace '"convert"' '"${imagemagick.out}/bin/convert"' substituteInPlace bin/rivet \ --replace '"less"' '"${less}/bin/less"' - substituteInPlace bin/rivet-buildplugin \ - --replace '"which"' '"${which}/bin/which"' \ - --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ - --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " substituteInPlace bin/rivet-mkhtml \ --replace '"make-plots"' \"$out/bin/make-plots\" \ --replace '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\" diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 7989eb518c7846ebceb292519bae55f666f83350..63db874d8480af48392859fd2870f5b9a143cded 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thepeg-${version}"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "1082n4q036sah5r4asyl3hpcyc05cymg40dnk3jsdjgv2v0vvc71"; + sha256 = "0jbz70ax05w3lpjvz71fnfz35rcjp0jry1nyjpa662714xd6f3va"; }; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index dd1b330564682548bbe0c3421f4ed6b0fb51ed57..7519d0da03fc1853126e0bba39ff53a1f5b256b3 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, withRootSupport ? false }: +{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { name = "yoda-${version}"; - version = "1.6.7"; + version = "1.7.0"; src = fetchurl { url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "05jyv5dypa6d4q1m8wm2qycgq1i0bgzwzzm9qqdj0b43ff2kggra"; + sha256 = "0fyf6ld1klzlfmr5sl1jxzck4a0h14zfkrff8397rn1fqnqbzmmk"; }; pythonPath = []; # python wrapper support buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ] ++ stdenv.lib.optional withRootSupport root; + propagatedBuildInputs = [ zlib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7e7314c936dd367335234e5ed109e383371d204c --- /dev/null +++ b/pkgs/development/libraries/pipewire/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind +, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xorg +, sbc, SDL2, makeFontsConf, freefont_ttf +}: + +let + version = "0.1.9"; + + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; +in stdenv.mkDerivation rec { + name = "pipewire-${version}"; + + src = fetchFromGitHub { + owner = "PipeWire"; + repo = "pipewire"; + rev = version; + sha256 = "0r9mgwbggnnijhdz49fnv0qdka364xn1h8yml2jakyqpfrm3i2nm"; + }; + + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ + meson ninja pkgconfig doxygen graphviz valgrind + ]; + buildInputs = [ + glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils + alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2 + ]; + + mesonFlags = [ + "-Denable_docs=true" + "-Denable_gstreamer=true" + ]; + + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; + + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + + doCheck = true; + + meta = with stdenv.lib; { + description = "Server and user space API to deal with multimedia pipelines"; + homepage = https://pipewire.org/; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index dc378711d36ba9826979aa6e6168a17b94b0613e..e70ffc3eb2f1483d56df59b5e14d002281062ea5 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,16 +1,25 @@ -{ fetchurl, stdenv, pkgconfig, libpng, glib /*just passthru*/ }: +{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, autoreconfHook, pkgconfig, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { - name = "pixman-0.34.0"; + name = "pixman-${version}"; + version = "0.34.0"; src = fetchurl { url = "mirror://xorg/individual/lib/${name}.tar.bz2"; sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir"; }; - patches = []; + patches = stdenv.lib.optionals stdenv.cc.isClang [ + (fetchpatch { + name = "builtin-shuffle.patch"; + url = https://patchwork.freedesktop.org/patch/177506/raw; + sha256 = "0rvraq93769dy2im2m022rz99fcdxprgc2fbmasnddcwrqy1x3xr"; + }) + ]; + + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool autoreconfHook ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = stdenv.lib.optional doCheck libpng; configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt"; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 9d7d7552cfc71fbc75de96df3b30f85ffe72091d..1a1bb1800cf24f84510ddb5434e257ffa36a36d4 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,20 +2,22 @@ stdenv.mkDerivation rec { name = "pkcs11-helper-${version}"; - version = "1.21"; + version = "1.22"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${name}"; - sha256 = "17a2cssycl7fh44xikmhszigx57vvn0h2sjsnmsy3772kfj796b1"; + sha256 = "01v3zv6sr5phqhr2f21fl2rmcnmkp9518dkq82g1v2y9ysjksg7q"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ openssl ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { - homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; + homepage = https://github.com/OpenSC/pkcs11-helper; license = with licenses; [ bsd3 gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 4030be2996cc166fce82396bcf387270e42e2d92..c9e8c632c7f189a2aa536bde46f03c4a786cab7e 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, mesa, freeglut, SDL +{ fetchurl, fetchpatch, stdenv, libGLU_combined, freeglut, SDL , libXi, libSM, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - mesa freeglut SDL + libGLU_combined freeglut SDL # The following libs ought to be propagated build inputs of Mesa. libXi libSM libXmu libXext libX11 diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 6ca4734a4f7d96455ab31445ba1c695eb08c860f..ef4b3ea7e010af305530e55960bb612c01f09265 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -21,13 +21,17 @@ stdenv.mkDerivation rec { postCheck = "cat test/test.log"; - buildInputs = [ ] - ++ stdenv.lib.optional docSupport doxygen; + buildInputs = stdenv.lib.optional docSupport doxygen; propagatedBuildInputs = [ libpng ]; - makeFlags = [ "PREFIX=\${out}" ] - ++ stdenv.lib.optional docSupport "docs"; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" + '' + '' + sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile + ''; + + makeFlags = stdenv.lib.optional docSupport "docs"; enableParallelBuilding = true; @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/pngpp/; description = "C++ wrapper for libpng library"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.ramkromberg ]; }; } diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 0f971cff64d4e71495646735b88d5c4e019685d5..d44bc78a533db42497828fab3a366653f0110201 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysql }: +{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }: stdenv.mkDerivation rec { name = "poco-${version}"; - version = "1.7.8"; + version = "1.9.0"; src = fetchurl { url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz"; - sha256 = "17y6kvj4qdpb3p1im8n9qfylfh4bd2xsvbpn24jv97x7f146nhjf"; + sha256 = "11z1i0drbacs7c7d5virc3kz7wh79svd06iffh8j6giikl7vz1q3"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysql ]; + buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ]; cmakeFlags = [ - "-DMYSQL_INCLUDE_DIR=${libmysql.dev}/include/mysql" "-DPOCO_UNBUNDLED=ON" ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index aef627f8f1fea3e37171ee7c58bbef3250f3f927..ef865529805f9e86f06e6b33223849d1496ed6f2 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam , intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl -, docbook_xml_dtd_412, gtk_doc +, docbook_xml_dtd_412, gtk-doc , useSystemd ? stdenv.isLinux, systemd }: @@ -26,23 +26,31 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; sha256 = "1cxnhj0y30g7ldqq1y6zwsbdwcx7h97d3mpd3h5jy7dhg3h9ym91"; }) (fetchpatch { - url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; sha256 = "1h1rkd4avqyyr8q6836zzr3w10jf521gcqnvhrhzwdpgp1ay4si7"; }) (fetchpatch { - url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh"; }) - ]; + ] + # Could be applied uncondtionally but don't want to trigger rebuild + # https://bugs.freedesktop.org/show_bug.cgi?id=50145 + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "netgroup-optional.patch"; + url = "https://bugs.freedesktop.org/attachment.cgi?id=118753"; + sha256 = "1zq51dhmqi9zi86bj9dq4i4pxlxm41k3k4a091j07bd78cjba038"; + }); + outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ gtk_doc pkgconfig autoreconfHook intltool gobjectIntrospection ] + [ gtk-doc pkgconfig autoreconfHook intltool gobjectIntrospection ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = [ glib expat pam spidermonkey_17 gobjectIntrospection ] diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix new file mode 100644 index 0000000000000000000000000000000000000000..072de0f9fa068d875edeeaa6374b35a5cc98876d --- /dev/null +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty +, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg +, withData ? true, poppler_data +, qt5Support ? false, qtbase ? null +, introspectionSupport ? false, gobjectIntrospection ? null +, utils ? false +, minimal ? false, suffix ? "glib" +}: + +let + version = "0.61.0"; + mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; +in +stdenv.mkDerivation rec { + name = "poppler-${suffix}-${version}"; + + src = fetchurl { + url = "${meta.homepage}/poppler-${version}.tar.xz"; + sha256 = "0zrbb1b77k6bm2qdnra08jnbyllv6vj29790igmp6fzs59xf3kak"; + }; + + outputs = [ "out" "dev" ]; + + buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data; + + # TODO: reduce propagation to necessary libs + propagatedBuildInputs = with lib; + [ zlib freetype fontconfig libjpeg openjpeg ] + ++ optionals (!minimal) [ cairo lcms curl ] + ++ optional qt5Support qtbase + ++ optional introspectionSupport gobjectIntrospection; + + nativeBuildInputs = [ cmake ninja pkgconfig ]; + + cmakeFlags = [ + (mkFlag true "XPDF_HEADERS") + (mkFlag (!minimal) "GLIB") + (mkFlag (!minimal) "CPP") + (mkFlag (!minimal) "LIBCURL") + (mkFlag utils "UTILS") + (mkFlag qt5Support "QT5") + ]; + + meta = with lib; { + homepage = https://poppler.freedesktop.org/; + description = "A PDF rendering library"; + + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. + ''; + + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 5fcb7d386faf36e5cf152a0eb32e16bc48307635..11dd8ec32910bb9667eff7089d15e158abe67468 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,64 +1,48 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty +{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data -, qt4Support ? false, qt4 ? null , qt5Support ? false, qtbase ? null , introspectionSupport ? false, gobjectIntrospection ? null , utils ? false , minimal ? false, suffix ? "glib" -, hostPlatform }: let # beware: updates often break cups-filters build - version = "0.56.0"; - sha256 = "0wviayidfv2ix2ql0d4nl9r1ia6qi5kc1nybd9vjx27dk7gvm7c6"; + version = "0.63.0"; + mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - inherit sha256; + sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17"; }; outputs = [ "out" "dev" ]; - buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data; + buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib; [ zlib freetype fontconfig libjpeg openjpeg ] ++ optionals (!minimal) [ cairo lcms curl ] - ++ optional qt4Support qt4 ++ optional qt5Support qtbase ++ optional introspectionSupport gobjectIntrospection; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkgconfig ]; - NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + # Not sure when and how to pass it. It seems an upstream bug anyway. + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; - CXXFLAGS = lib.optional qt5Support "-std=c++11"; - - configureFlags = with lib; - [ - "--enable-xpdf-headers" - "--enable-libcurl" - "--enable-zlib" - "--enable-build-type=release" - ] - ++ optionals minimal [ - "--disable-poppler-glib" "--disable-poppler-cpp" - "--disable-libcurl" - ] - ++ optional (!utils) "--disable-utils" - ++ optional introspectionSupport "--enable-introspection"; - - enableParallelBuilding = true; - - crossAttrs.postPatch = - # there are tests using `strXXX_s` functions that are missing apparently - stdenv.lib.optionalString (hostPlatform.libc or null == "msvcrt") - "sed '/^SUBDIRS =/s/ test / /' -i Makefile.in"; + cmakeFlags = [ + (mkFlag true "XPDF_HEADERS") + (mkFlag (!minimal) "GLIB") + (mkFlag (!minimal) "CPP") + (mkFlag (!minimal) "LIBCURL") + (mkFlag utils "UTILS") + (mkFlag qt5Support "QT5") + ]; meta = with lib; { homepage = https://poppler.freedesktop.org/; diff --git a/pkgs/development/libraries/poppler/qt4.nix b/pkgs/development/libraries/poppler/qt4.nix new file mode 100644 index 0000000000000000000000000000000000000000..c82a543413e2c12a4c7b9bb3b134bbd34375079f --- /dev/null +++ b/pkgs/development/libraries/poppler/qt4.nix @@ -0,0 +1,44 @@ +# TODO: get rid of this (https://github.com/NixOS/nixpkgs/issues/32883) +{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty +, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg +, poppler_data, qt4 +}: + +let + # Last version supporting QT4 + version = "0.61.1"; +in +stdenv.mkDerivation rec { + name = "poppler-qt4-${version}"; + + src = fetchurl { + url = "${meta.homepage}/poppler-${version}.tar.xz"; + sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; + }; + + outputs = [ "out" "dev" ]; + + buildInputs = [ libiconv poppler_data ] ++ libintlOrEmpty; + + propagatedBuildInputs = [ zlib freetype fontconfig libjpeg openjpeg cairo lcms2 curl qt4 ]; + + nativeBuildInputs = [ cmake ninja pkgconfig ]; + + cmakeFlags = [ + "-DENABLE_XPDF_HEADERS=on" + "-DENABLE_UTILS=off" + ]; + + meta = with lib; { + homepage = https://poppler.freedesktop.org/; + description = "A PDF rendering library"; + + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. + ''; + + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index bdf537f4375e020494d6b5748146451d9e327014..d201654fbb4cb11f49f6f94bb7bb668d053a9764 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -1,11 +1,24 @@ -args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, proj, flex, gdal, json_c, pkgconfig, file, ...}: +{ fetchurl +, fetchpatch +, stdenv +, perl +, libxml2 +, postgresql +, geos +, proj +, flex +, gdal +, json_c +, pkgconfig +, file +}: /* ### NixOS - usage: ================== - services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_3_1 ]; + services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ]; ### important Postgis implementation details: @@ -31,108 +44,75 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p let - pgDerivationBase = composableDerivation.composableDerivation {} ( fix : - - let version = fix.fixed.version; in { - - name = "postgis-${version}"; - - src = fetchurl { - url = "http://postgis.refractions.net/download/postgis-${fix.fixed.version}.tar.gz"; - inherit (fix.fixed) sha256; - }; - - # don't pass these vars to the builder - removeAttrs = ["hash" "sql_comments" "sql_srcs"]; - - preConfigure = '' - configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin" - makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" - ''; - - # create aliases for all commands adding version information - postInstall = '' - - sql_srcs=$(for sql in ${builtins.toString fix.fixed.sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) - - for prog in $out/bin/*; do # */ - ln -s $prog $prog-${version} - done - - cp -r doc $out - ''; - - buildInputs = [libxml2 postgresql geos proj perl]; - - sql_comments = "postgis_comments.sql"; - - meta = { - description = "Geographic Objects for PostgreSQL"; - homepage = http://postgis.refractions.net; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; - }; - }); - - pgDerivationBaseNewer = pgDerivationBase.merge (fix: { - src = fetchurl { - url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString fix.fixed.version}.tar.gz"; - inherit (fix.fixed) sha256; - }; - }); - -in rec { - - v_2_3_1 = pgDerivationBaseNewer.merge ( fix : { - version = "2.3.1"; - sha256 = "0xd21h2k6x3i1b3z6pgm3pmkfpxm6irxd5wbx68acjndjgd6p3ac"; - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - builtInputs = [gdal json_c pkgconfig]; - - # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; - - dontDisableStatic = true; - preConfigure = '' - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" - ''; - postConfigure = '' - sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/scripts/python/Makefile"; - ''; - }); - - v_2_4_0 = pgDerivationBaseNewer.merge ( fix : { - version = "2.4.0"; - sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29"; - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - builtInputs = [gdal json_c pkgconfig]; - - # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; - - dontDisableStatic = true; - preConfigure = '' - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" - ''; - postConfigure = '' - sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/scripts/python/Makefile"; - ''; - }); - - + version = "2.4.3"; + sha256 = "1fg4pmla5m903m76ndjd8q5dkcykf67v1p4dcajmnr3bvg2p8lza"; +in stdenv.mkDerivation rec { + name = "postgis-${version}"; + + src = fetchurl { + url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; + inherit sha256; + }; + + patches = [ + (fetchpatch { + url = "https://trac.osgeo.org/postgis/changeset/16417?format=diff&new=16417"; + name = "json-c-0.13.patch"; + sha256 = "1hk2fh4nsvq76ksi7z4shlgj7fik6ac3sjsb0khsypsjfhz7ic8z"; + stripLen = 3; + extraPrefix = ""; + excludes = [ "NEWS" ]; + }) + ]; + + # don't pass these vars to the builder + removeAttrs = ["sql_comments" "sql_srcs"]; + + preInstall = '' + mkdir -p $out/bin + ''; + + # create aliases for all commands adding version information + postInstall = '' + sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) + + for prog in $out/bin/*; do # */ + ln -s $prog $prog-${version} + done + + cp -r doc $out + ''; + + buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; + + sql_comments = "postgis_comments.sql"; + + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + + # postgis config directory assumes /include /lib from the same root for json-c library + NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + + dontDisableStatic = true; + preConfigure = '' + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" + ''; + postConfigure = '' + sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; + s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/loader/Makefile"; + sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/scripts/python/Makefile"; + ''; + + meta = with stdenv.lib; { + description = "Geographic Objects for PostgreSQL"; + homepage = http://postgis.refractions.net; + license = licenses.gpl2; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/libraries/postgis/pg_db_postgis_enable.sh b/pkgs/development/libraries/postgis/pg_db_postgis_enable.sh deleted file mode 100644 index c7652e20d9f36c204fe8f0291c6a0019a7458a18..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/postgis/pg_db_postgis_enable.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -sql_files=(@sql_srcs@) -sql_comments=@sql_comments@ - -do_help(){ echo "$0 [--comments] db_name1 [db_name2 ..]"; } - -for arg in "$@"; do - case "$arg" in - -h|--help) - do_help; exit 0 - ;; - --comments) - LOAD_COMMENTS=1 - ;; - *) - dbs=(${dbs[@]} "$arg") - ;; - esac -done - -PSQL(){ - echo ">> loading $1" - psql -d "$db" -f $1 -} - -for db in ${dbs[@]}; do - createlang plpgsql "$db" - - # mandatory - for sql in $sql_files; do - PSQL $sql - done - - # optionally load some comments - if [ -n "$LOAD_COMMENTS" ]; then - PSQL $sql_comments - fi -done diff --git a/pkgs/development/libraries/postgis/pg_db_postgis_fix_or_load_sql_dump.sh b/pkgs/development/libraries/postgis/pg_db_postgis_fix_or_load_sql_dump.sh deleted file mode 100644 index 6a98c5d24ca8d64354f3ccfed90c9b42c8dc79da..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/postgis/pg_db_postgis_fix_or_load_sql_dump.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -libName=@libName@ - -# this is a quick and dirty implementation - -do_help(){ - echo "$0 --str str in-file|- [out|-|psql:db]"; - echo "in: - = STDIN or filename"; - echo "out: - = STDIN or filename or psql:database_name" - echo " psql:database_name will load the dump into the database" - echo " if out is omitted in is used for out (same file)" - echo "--str: different replacement string. Eg for Ubuntu use: '/usr/lib/postgresql/8.3/lib/liblwgeom'"; - echo "WARNING: A postgis dump is not meant to be distributed - it still may be useful :)" -} - -if [ -z "$1" -o "$1" = --help -o "$1" = -h ]; then - do_help; exit 1 -fi - -tostr='$libdir/'"$libName" -if [ "$1" == "--str" ]; then - to="$2"; shift 2 -fi - -i=$1 -o="${2:-$1}" - -cmd_in(){ - case "$i" in - -) cat;; - *) cat "$i";; - esac -} - -cmd_out(){ - case "$o" in - -) cat;; # stdout - psql:*) psql "${o:5}";; # pipe into psql - *) - t=`mktemp`; cat > "$t"; mv "$t" "$o" - ;; - esac -} - -cmd_replace(){ - contents=`cat` - # get wrong library path: - fromstr=$(echo "$contents" | head -n 50 | sed -n "s/.*AS '\([^']*\)'.*/\1/p" | head -n 1) - echo "$contents" | sed "s@AS '$fromstr@AS '$tostr@g" -} - -cmd_in | cmd_replace | cmd_out diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 73eda630e449e4787c5116b28d73d7c5a41289fa..566d88dcdb560766eaf32655936292eb2801145d 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gmpxx, perl, gnum4 }: +{ fetchurl, fetchpatch, stdenv, gmpxx, perl, gnum4 }: let version = "1.2"; in @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1wgxcbgmijgk11df43aiqfzv31r3bkxmgb4yl68g21194q60nird"; }; + patches = [(fetchpatch { + name = "ppl.patch"; + url = "http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=patch;h=c39f6a07b51f89e365b05ba4147aa2aa448febd7"; + sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87"; + })]; + nativeBuildInputs = [ perl gnum4 ]; propagatedBuildInputs = [ gmpxx ]; diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/pkgs/development/libraries/protobuf/2.5.nix new file mode 100644 index 0000000000000000000000000000000000000000..550d0b1bace2285f0481c4c5c73353f9cf23cbe8 --- /dev/null +++ b/pkgs/development/libraries/protobuf/2.5.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "2.5.0"; + # make sure you test also -A pythonPackages.protobuf + src = fetchurl { + url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; + sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; + }; +}) \ No newline at end of file diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix index 75f1bb22c24894d682fffdcc79fddc460b8efa19..5a9034a56a80139ab62ebfdb3784f6679ca42190 100644 --- a/pkgs/development/libraries/protobuf/3.4.nix +++ b/pkgs/development/libraries/protobuf/3.4.nix @@ -1,6 +1,6 @@ { callPackage, lib, ... }: lib.overrideDerivation (callPackage ./generic-v3.nix { - version = "3.4.0"; - sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx"; + version = "3.4.1"; + sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix new file mode 100644 index 0000000000000000000000000000000000000000..db9cb6f0371b4fe3ecd23a56cc50aa776b2b1f88 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.5.nix @@ -0,0 +1,6 @@ +{ callPackage, lib, ... }: + +lib.overrideDerivation (callPackage ./generic-v3.nix { + version = "3.5.1.1"; + sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; +}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix index 5c78c1a288f636510d3c43a09f5be2728b3c23a3..270c24dc01f4e86773b8a6c724b4ffc38f5655f0 100644 --- a/pkgs/development/libraries/psol/default.nix +++ b/pkgs/development/libraries/psol/default.nix @@ -1,5 +1,5 @@ { callPackage }: callPackage ./generic.nix {} { - version = "1.11.33.4"; - sha256 = "1jq2llp0i4666rwqnx1hs4pjlpblxivvs1jkkjzlmdbsv28jzjq8"; + version = "1.13.35.2"; # Latest stable, 2018-02-05 + sha256 = "0xi2srf9gx0x2sz9r45zb35k2n0iv457if1lqzvbanls3f935cmr"; } diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix index 3e82bb4975dcba09171037fea1edf64e0ebbf8e2..c61926fe13faaad7a39bf549fd4e07f1e04bdffb 100644 --- a/pkgs/development/libraries/psol/generic.nix +++ b/pkgs/development/libraries/psol/generic.nix @@ -3,7 +3,7 @@ { inherit version; } // fetchzip { inherit sha256; name = "psol-${version}"; - url = "https://dl.google.com/dl/page-speed/psol/${version}.tar.gz"; + url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz"; meta = { description = "PageSpeed Optimization Libraries"; diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index d40ae8564951b2508b8766b24ffad0294b56c524..f300a571b0cc34b777935f67ade690a55defe2c7 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ptex-${version}"; - version = "2.1.28"; + version = "2.1.33"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; rev = "v${version}"; - sha256 = "1h6gb3mpis4m6ph7h9q764w50f9jrar3jz2ja76rn5czy6wn318x"; + sha256 = "15ijjq3w7hwgm4mqah0x4jzjy3v2nnmmv28lbqzmxzcxjgh4sjkn"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index f980a14aa41df6279408d3de621b8efc7b6af6f0..ae60a6f69d63ffd9a602ef1ab6968c5645ad519d 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -24,12 +24,16 @@ stdenv.mkDerivation rec { (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3; sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0"; }) - (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/gcc-5_support; - sha256 = "0pf2yj0150r4cnc6nv65mclrm3dillqh1xjk7m6gsjnk9b96i5d4"; - }) ./ptlib-2.10.11-glibc-2.26.patch ]; + # fix typedef clashes with unixODBC>=2.3.5 + postPatch = '' + substituteInPlace include/ptlib/unix/ptlib/contain.h \ + --replace "typedef uintptr_t UINT" "typedef unsigned int UINT" \ + --replace "typedef wchar_t WCHAR" "typedef unsigned short WCHAR" + ''; + meta = with stdenv.lib; { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index dd33f63c913c9e559db76dcfd22b047fa4a552c5..1730f9b733caa045712657a01e7a4abc121619b8 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pugixml-${version}"; - version = "1.8.1"; + version = "1.9"; src = fetchurl { url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0fcgggry5x5bn0zhb09ij9hb0p45nb0sv0d9fw3cm1cf62hp9n80"; + sha256 = "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index fd738faf5074a7b68b52a24894463bd47ec9d49d..018a57ad0571b88446d5dc492dd66d4784c561af 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libupnp-${version}"; - version = "1.6.21"; + version = "1.8.3"; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "07ksfhadinaa20542gblrxi9pqz0v6y70a836hp3qr4037id4nm9"; + sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 9433eb87109fc3b62caaa4622f31125509fc00a3..6e190a656f63c3b69499204b793fb83214f4f2b4 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,21 +1,31 @@ { stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }: stdenv.mkDerivation rec { - name = "qca-qt5-2.1.1"; + name = "qca-qt5-2.1.3"; src = fetchurl { - url = "http://download.kde.org/stable/qca/2.1.1/src/qca-2.1.1.tar.xz"; - sha256 = "10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm"; + url = "http://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz"; + sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"; }; buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; + # Without this patch cmake fails with a "No known features for CXX compiler" + # error on darwin + patches = stdenv.lib.optional stdenv.isDarwin ./move-project.patch ; + + # tells CMake to use this CA bundle file if it is accessible + preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; + + # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) + cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; + meta = with stdenv.lib; { description = "Qt 5 Cryptographic Architecture"; homepage = http://delta.affinix.com/qca; maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch new file mode 100644 index 0000000000000000000000000000000000000000..2a109a3aa3c73ec334c46de1d8e79de1a8c36e09 --- /dev/null +++ b/pkgs/development/libraries/qca-qt5/move-project.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 453fd8a..5f6ee11 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX) + unset(CMAKE_INSTALL_PREFIX CACHE) + endif(NOT CMAKE_INSTALL_PREFIX) + +-project(qca) + + if(NOT APPLE) + cmake_minimum_required(VERSION 2.8.12) + else() + cmake_minimum_required(VERSION 3.0) + endif() ++project(qca) + + set(QCA_LIB_MAJOR_VERSION "2") + set(QCA_LIB_MINOR_VERSION "1") diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 2265d0df3949625bc879c0abe37b4c4df997a968..568e7ce07b3b90549261e45c4ddf22308a8ccf35 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt }: +{ stdenv, fetchurl, cmake, pkgconfig, qt, darwin }: stdenv.mkDerivation rec { name = "qca-${version}"; @@ -10,15 +10,21 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt ]; + buildInputs = [ (stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security) qt ]; enableParallelBuilding = true; + # tells CMake to use this CA bundle file if it is accessible + preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; + + # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) + cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; + meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; homepage = http://delta.affinix.com/qca; maintainers = [ maintainers.sander ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..630f606c2e542eeddfeefa995ba55717f9ab294d --- /dev/null +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -0,0 +1,31 @@ +{stdenv, qtdeclarative, fetchFromGitHub, qmake }: +stdenv.mkDerivation rec { + name = "qml-box2d-2018-03-16"; + src = fetchFromGitHub { + owner = "qml-box2d"; + repo = "qml-box2d"; + sha256 = "1fbsvv28b4r0szcv8bk5gxpf8v534jp2axyfp438384sy757wsq2"; + rev = "21e57f1"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtdeclarative ]; + + patchPhase = '' + substituteInPlace box2d.pro \ + --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" + qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out" + ''; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + meta = with stdenv.lib; { + description = "A QML plugin for Box2D engine"; + homepage = "https://github.com/qml-box2d/qml-box2d"; + maintainers = [ maintainers.guibou ]; + platforms = platforms.linux; + license = licenses.zlib; + }; +} diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 2057aee3e9951b1dd6b799029a6714d51e98429f..79ed37dd2a9a0aeb5ccc59850be587b4f9d14a06 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, qtbase, qtquick1, qmake, qtmultimedia }: +{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia }: stdenv.mkDerivation rec { version = "0.1.0"; name = "qmltermwidget-${version}"; - src = fetchgit { - url = "https://github.com/Swordfish90/qmltermwidget.git"; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + repo = "qmltermwidget"; + owner = "Swordfish90"; + rev = "v${version}"; sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; }; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index e2c80e445e761e4479de6435b006f1ec5aed57b5..00ce51330487502536fefad2b3e26215c939d900 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libjpeg, zlib, perl }: -let version = "7.0.0"; +let version = "8.0.2"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "0py6p27fx4qrwq9mvcybna42b0bdi359x38lzmggxl5a9khqvl7y"; + sha256 = "1hf8jfjar8p7v288d7ccmr8w171mv9kb86b6hq1nk58mnlq1g7mh"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index f5c5a667418c0c7a43e22995ebc611581610d8a8..281dbe0a5eda4c45c0a19a3a48bd5220e6da3418 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,42 +1,46 @@ -{ stdenv, fetchurl, unzip +{ stdenv, lib, fetchurl, unzip , qt4 ? null, qmake4Hook ? null -, withQt5 ? false, qtbase ? null, qmake ? null +, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null }: +# Fix Xcode 8 compilation problem +let xcodePatch = + fetchurl { url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch"; + sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9"; }; +in stdenv.mkDerivation rec { pname = "qscintilla"; - version = "2.9.4"; + version = "2.10.3"; name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}"; src = fetchurl { url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip"; - sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi"; + sha256 = "0rsx0b0iz5yf3x594kzhi0c2wpbmknv9b0a3rmx5w37bvmpd6qav"; }; - buildInputs = if withQt5 then [ qtbase ] else [ qt4 ]; - nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); + buildInputs = [ (if withQt5 then qtbase else qt4) ] + ++ lib.optional (withQt5 && stdenv.isDarwin) qtmacextras; + nativeBuildInputs = [ unzip ] + ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); + + + patches = [] ++ lib.optional withQt5 [ xcodePatch ]; enableParallelBuilding = true; preConfigure = '' cd Qt4Qt5 - ${if withQt5 - then '' - sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \ - -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \ - -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/translations," \ - -e "s,\$\$\\[QT_HOST_DATA\\]/mkspecs,$out/mkspecs," \ - -e "s,\$\$\\[QT_INSTALL_DATA\\]/mkspecs,$out/mkspecs," \ - -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share," \ - qscintilla.pro - '' - else '' - sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \ - -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \ - -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \ - -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \ - qscintilla.pro + sed -i qscintilla.pro \ + -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \ + -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \ + -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/translations," \ + ${if withQt5 then '' + -e "s,\$\$\\[QT_HOST_DATA\\]/mkspecs,$out/mkspecs," \ + -e "s,\$\$\\[QT_INSTALL_DATA\\]/mkspecs,$out/mkspecs," \ + -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share," + '' else '' + -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," ''} ''; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 6d92de001cb7d0f75fb770c178447f4572f2ca0a..32841c9b93316e291ad416977a88056b8e29c2db 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -6,7 +6,7 @@ , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, mysql ? null -, openglSupport ? false, mesa ? null, libXmu ? null +, openglSupport ? false, libGLU_combined ? null, libXmu ? null , xlibsWrapper, xextproto, zlib, libjpeg, libpng, which }: @@ -15,7 +15,7 @@ assert xrenderSupport -> xftSupport && libXrender != null; assert xrandrSupport -> libXrandr != null && randrproto != null; assert cursorSupport -> libXcursor != null; assert mysqlSupport -> mysql != null; -assert openglSupport -> mesa != null && libXmu != null; +assert openglSupport -> libGLU_combined != null && libXmu != null; stdenv.mkDerivation { name = "qt-3.3.8"; @@ -40,7 +40,7 @@ stdenv.mkDerivation { -qt-gif -I${xextproto}/include ${if openglSupport then "-dlopen-opengl - -L${mesa}/lib -I${mesa}/include + -L${libGLU_combined}/lib -I${libGLU_combined}/include -L${libXmu.out}/lib -I${libXmu.dev}/include" else ""} ${if threadSupport then "-thread" else "-no-thread"} ${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"} @@ -49,7 +49,7 @@ stdenv.mkDerivation { -I${randrproto}/include" else "-no-xrandr"} ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"} ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""} - ${if mysqlSupport then "-qt-sql-mysql -L${stdenv.lib.getLib mysql.client}/lib/mysql -I${mysql.client}/include/mysql" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql" else ""} ${if xftSupport then "-xft -L${libXft.out}/lib -I${libXft.dev}/include -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include diff --git a/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch b/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..7b181f3ad896d5406437e664e49169f9662b657d --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm +index 204d685..e05179e 100644 +--- a/src/gui/text/qfontengine_coretext.mm ++++ b/src/gui/text/qfontengine_coretext.mm +@@ -886,7 +886,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl + + QFixed QCoreTextFontEngine::emSquareSize() const + { +- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); ++ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); + } + + QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index c9679d227d889a09e3b92b1ecb66390f19404169..10f892bc4d00876cf378245952bb55f6841f0b50 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -2,7 +2,7 @@ , hostPlatform , libXrender, libXinerama, libXcursor, libXmu, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig +, libmng, which, libGLSupported, libGL, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) @@ -67,15 +67,29 @@ stdenv.mkDerivation rec { patches = [ ./glib-2.32.patch ./libressl.patch + ./parallel-configure.patch + ./clang-5-darwin.patch + ./qt-4.8.7-unixmake-darwin.patch (substituteAll { src = ./dlopen-absolute-paths.diff; 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 ({ + (fetchpatch { + name = "fix-medium-font.patch"; + url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/" + + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4"; + sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; + }) + (fetchpatch { + name = "qt4-gcc6.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; + sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; + }) + ] + ++ stdenv.lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; # substituteAll ignores env vars starting with capital letter gtk = gtk2.out; @@ -93,19 +107,12 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl"; }) - ++ [ - (fetchpatch { - name = "fix-medium-font.patch"; - url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/" - + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4"; - sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; - }) - (fetchpatch { - name = "qt4-gcc6.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; - sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; - }) - ]; + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ./qt-musl.patch + ./qt-musl-iconv-no-bom.patch + ./patch-qthread-stacksize.diff + ./qsettings-recursive-global-mutex.patch + ]; preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" @@ -117,6 +124,7 @@ stdenv.mkDerivation rec { -demosdir $TMPDIR/share/doc/${name}/demos -datadir $out/share/${name} -translationdir $out/share/${name}/translations + --jobs=$NIX_BUILD_CORES " unset LD # Makefile uses gcc for linking; setting LD interferes '' + optionalString stdenv.cc.isClang '' @@ -128,7 +136,7 @@ stdenv.mkDerivation rec { configureFlags = '' - -v -no-separate-debug-info -release -no-fast -confirm-license -opensource + -v -no-separate-debug-info -release -fast -confirm-license -opensource -${if stdenv.isFreeBSD then "no-" else ""}opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked @@ -150,7 +158,7 @@ stdenv.mkDerivation rec { [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM zlib libpng openssl dbus freetype fontconfig glib ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used - ++ optional mesaSupported mesa_glu + ++ optional libGLSupported libGLU ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ]; @@ -158,22 +166,23 @@ stdenv.mkDerivation rec { buildInputs = [ cups # Qt dlopen's libcups instead of linking to it postgresql sqlite libjpeg libmng libtiff icu ] - ++ optionals (mysql != null) [ mysql.lib ] + ++ optionals (mysql != null) [ mysql.connector-c ] ++ optionals gtkStyle [ gtk2 gdk_pixbuf ] ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; nativeBuildInputs = [ perl pkgconfig which ]; - enableParallelBuilding = false; + enableParallelBuilding = true; NIX_CFLAGS_COMPILE = - optionalString stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin - + optionalString (stdenv.isFreeBSD || stdenv.isDarwin) - " -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include" - + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1"; + # with gcc7 the warnings blow the log over Hydra's limit + [ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ] + ++ optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin + ++ optionals (stdenv.isFreeBSD || stdenv.isDarwin) + [ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ] + ++ optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) - "-lglib-2.0"; + NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; preBuild = optionalString stdenv.isDarwin '' # resolve "extra qualification on member" error @@ -183,37 +192,8 @@ stdenv.mkDerivation rec { sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release ''; - installPhase = optionalString stdenv.isDarwin '' - runHook preInstall - cp -r lib $out - - mkdir -p $out/Applications - mv bin/*.app $out/Applications - rm -rf bin/*.app - - cp -r bin $out - - mkdir -p $out/share/doc/${name} - mkdir -p $out/lib - mkdir -p $out/lib/qt4/plugins - mkdir -p $out/lib/qt4/imports - mkdir -p $out/bin - mkdir -p $out/include - mkdir -p $out/share/${name} - - cp -r mkspecs $out/share/${name} - cp -r translations $out/share/${name} - cp -r tools/linguist/phrasebooks $out/share/${name} - cp tools/porting/src/q3porting.xml $out/share/${name} - - cp -r plugins $out/lib/qt4 - cp -r imports $out/lib/qt4 - cp -r doc/* $out/share/doc/${name} - runHook postInstall - ''; - - postInstall = optionalString (!stdenv.isDarwin) '' - rm -rf $out/tests + postInstall = '' + rm -rf $out/tests ''; crossAttrs = { @@ -229,11 +209,11 @@ stdenv.mkDerivation rec { '' + optionalString hostPlatform.isMinGW " -xplatform win32-g++-4.6"; patches = []; preConfigure = '' - 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/' \ + sed -i -e 's/ g++/ ${stdenv.cc.targetPrefix}g++/' \ + -e 's/ gcc/ ${stdenv.cc.targetPrefix}gcc/' \ + -e 's/ ar/ ${stdenv.cc.targetPrefix}ar/' \ + -e 's/ strip/ ${stdenv.cc.targetPrefix}strip/' \ + -e 's/ windres/ ${stdenv.cc.targetPrefix}windres/' \ mkspecs/win32-g++/qmake.conf ''; @@ -251,7 +231,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 ]; + maintainers = with maintainers; [ orivej lovek323 phreedom sander ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff index 0f5cf2b79c965b5dab5fdb16fc8e2e5453150458..4c64e9e26e30a4e1fd933bd69c217c69ce0ee1df 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff @@ -59,32 +59,6 @@ index 6b42d1e..f88b628 100644 lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); if (!lib.load()) return; -diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp -index 229d6f9..c122bf3 100644 ---- a/src/plugins/platforms/xcb/qglxintegration.cpp -+++ b/src/plugins/platforms/xcb/qglxintegration.cpp -@@ -136,7 +136,7 @@ void* QGLXContext::getProcAddress(const QString& procName) - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } -diff --git a/src/plugins/platforms/xlib/qglxintegration.cpp b/src/plugins/platforms/xlib/qglxintegration.cpp -index 2467247..a2441d4 100644 ---- a/src/plugins/platforms/xlib/qglxintegration.cpp -+++ b/src/plugins/platforms/xlib/qglxintegration.cpp -@@ -137,7 +137,7 @@ void* QGLXContext::getProcAddress(const QString& procName) - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp index f8f3d69..d63c5bc 100644 --- a/src/plugins/platforms/xlib/qxlibstatic.cpp diff --git a/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch b/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch new file mode 100644 index 0000000000000000000000000000000000000000..b9b9d6d0a683d29f00ddf142cf021461f345a134 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch @@ -0,0 +1,22 @@ +--- a/configure ++++ b/configure +@@ -1087,2 +1087,3 @@ fi + #------------------------------------------------------------------------------- ++JOBS= + +@@ -2528,2 +2529,5 @@ while [ "$#" -gt 0 ]; do + ;; ++ jobs) ++ JOBS=-j$VAL ++ ;; + *) +@@ -5072,3 +5076,3 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then +- (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1 ++ (cd "$outpath/qmake" && "$MAKE" $JOBS -f "$mkfile" depend) >/dev/null 2>&1 + sed "s,^.*/\([^/]*.o\):,\1:,g" "$mkfile" >"$mkfile.tmp" +@@ -5080,3 +5084,3 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + QMAKE_BUILD_ERROR=no +- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes ++ (cd "$outpath/qmake"; "$MAKE" $JOBS) || QMAKE_BUILD_ERROR=yes + [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake diff --git a/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff b/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff new file mode 100644 index 0000000000000000000000000000000000000000..53a4c70ac3ae6bb1ac6b3efaff1613ff56c328b2 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff @@ -0,0 +1,54 @@ +--- a/src/corelib/thread/qthread_unix.cpp.orig 2015-11-23 19:05:40.000000000 +0100 ++++ b/src/corelib/thread/qthread_unix.cpp 2015-11-24 11:22:31.000000000 +0100 +@@ -79,6 +79,7 @@ + #endif + ++#include // getrlimit/setrlimit + #if defined(Q_OS_MAC) + # ifdef qDebug + # define old_qDebug qDebug + # undef qDebug +@@ -649,6 +650,43 @@ + #endif // QT_HAS_THREAD_PRIORITY_SCHEDULING + + ++ if (d->stackSize == 0) { ++ // Fix the default (too small) stack size for threads on OS X, ++ // which also affects the thread pool. ++ // See also: ++ // https://bugreports.qt.io/browse/QTBUG-2568 ++ // This fix can also be found in Chromium: ++ // https://chromium.googlesource.com/chromium/src.git/+/master/base/threading/platform_thread_mac.mm#186 ++ ++ // The Mac OS X default for a pthread stack size is 512kB. ++ // Libc-594.1.4/pthreads/pthread.c's pthread_attr_init uses ++ // DEFAULT_STACK_SIZE for this purpose. ++ // ++ // 512kB isn't quite generous enough for some deeply recursive threads that ++ // otherwise request the default stack size by specifying 0. Here, adopt ++ // glibc's behavior as on Linux, which is to use the current stack size ++ // limit (ulimit -s) as the default stack size. See ++ // glibc-2.11.1/nptl/nptl-init.c's __pthread_initialize_minimal_internal. To ++ // avoid setting the limit below the Mac OS X default or the minimum usable ++ // stack size, these values are also considered. If any of these values ++ // can't be determined, or if stack size is unlimited (ulimit -s unlimited), ++ // stack_size is left at 0 to get the system default. ++ // ++ // Mac OS X normally only applies ulimit -s to the main thread stack. On ++ // contemporary OS X and Linux systems alike, this value is generally 8MB ++ // or in that neighborhood. ++ size_t default_stack_size = 0; ++ struct rlimit stack_rlimit; ++ if (pthread_attr_getstacksize(&attr, &default_stack_size) == 0 && ++ getrlimit(RLIMIT_STACK, &stack_rlimit) == 0 && ++ stack_rlimit.rlim_cur != RLIM_INFINITY) { ++ default_stack_size = ++ std::max(std::max(default_stack_size, ++ static_cast(PTHREAD_STACK_MIN)), ++ static_cast(stack_rlimit.rlim_cur)); ++ } ++ d->stackSize = default_stack_size; ++ } + if (d->stackSize > 0) { + #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0 > 0) + int code = pthread_attr_setstacksize(&attr, d->stackSize); diff --git a/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh b/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh index bf716a72d0fc8ed830628e23a35157f0b27d35a1..f288e99dd12ad1a632c47f82fad2adc32b532766 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh +++ b/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh @@ -3,6 +3,11 @@ qmakeConfigurePhase() { $QMAKE PREFIX=$out $qmakeFlags + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "qmake4Hook: enabled parallel building" + fi + runHook postConfigure } diff --git a/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch b/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch new file mode 100644 index 0000000000000000000000000000000000000000..229123c54f763f4ca9eafc23689f60e8f57612b2 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch @@ -0,0 +1,17 @@ +Calling qsettings before constructing qapplications causes a dead-lock. + +http://sourceforge.net/tracker/?func=detail&aid=3168620&group_id=4932&atid=104932 +http://developer.qt.nokia.com/forums/viewthread/10365 + + +--- ./src/corelib/io/qsettings.cpp.orig ++++ ./src/corelib/io/qsettings.cpp +@@ -122,7 +122,7 @@ + Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc) + Q_GLOBAL_STATIC(PathHash, pathHashFunc) + Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc) +-Q_GLOBAL_STATIC(QMutex, globalMutex) ++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive)) + static QSettings::Format globalDefaultFormat = QSettings::NativeFormat; + + #ifndef Q_OS_WIN diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch b/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..99a36a24fe4307e6bf601efa96455d1a405940f6 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch @@ -0,0 +1,11 @@ +--- a/qmake/generators/unix/unixmake.cpp ++++ b/qmake/generators/unix/unixmake.cpp +@@ -831,7 +831,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t) + else if(project->first("TEMPLATE") == "app" && !project->isEmpty("QMAKE_STRIPFLAGS_APP")) + ret += " " + var("QMAKE_STRIPFLAGS_APP"); + if(bundle) +- ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\""; ++ ret += " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\""; + else + ret += " \"" + dst_targ + "\""; + } diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch b/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch new file mode 100644 index 0000000000000000000000000000000000000000..35380ad6714d6e24fcb4fd4b3702044f4329fb02 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch @@ -0,0 +1,11 @@ +--- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig ++++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp +@@ -62,7 +62,7 @@ + #elif defined(Q_OS_AIX) + # define NO_BOM + # define UTF16 "UCS-2" +-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) ++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__)) + # define NO_BOM + # if Q_BYTE_ORDER == Q_BIG_ENDIAN + # define UTF16 "UTF-16BE" diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch b/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch new file mode 100644 index 0000000000000000000000000000000000000000..90b9ccda08c924e662a0c5b8c74f411690aecabe --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch @@ -0,0 +1,14 @@ +--- qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h.orig ++++ qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h +@@ -86,11 +86,7 @@ + + #undef QT_SOCKLEN_T + +-#if defined(__GLIBC__) && (__GLIBC__ >= 2) + #define QT_SOCKLEN_T socklen_t +-#else +-#define QT_SOCKLEN_T int +-#endif + + #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) + #define QT_SNPRINTF ::snprintf diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a45e055e60b2ba08919aa4f0116633c8cda42862 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/default.nix @@ -0,0 +1,128 @@ +/* + +# Updates + +Before a major version update, make a copy of this directory. (We like to +keep the old version around for a short time after major updates.) Add a +top-level attribute to `top-level/all-packages.nix`. + +1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. +2. From the top of the Nixpkgs tree, run + `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. +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. + +*/ + +{ + newScope, + stdenv, fetchurl, makeSetupHook, makeWrapper, + bison, cups ? null, harfbuzz, libGL, perl, + gstreamer, gst-plugins-base, gtk3, dconf, + + # options + developerBuild ? false, + decryptSslTraffic ? false, + debug ? false, +}: + +with stdenv.lib; + +let + + qtCompatVersion = "5.10"; + + mirror = "http://download.qt.io"; + srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; + + patches = { + qtbase = [ ./qtbase.patch ] ++ + optionals stdenv.isDarwin [ ./qtbase-darwin.patch + ./restore-pc-files.patch ]; + qtdeclarative = [ ./qtdeclarative.patch ]; + qtscript = [ ./qtscript.patch ]; + qtserialport = [ ./qtserialport.patch ]; + qttools = [ ./qttools.patch ]; + qtwebengine = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + qtwebkit = [ ./qtwebkit.patch ]; + }; + + mkDerivation = + import ../mkDerivation.nix + { inherit stdenv; inherit (stdenv) lib; } + { inherit debug; }; + + qtModule = + import ../qtModule.nix + { inherit mkDerivation perl; inherit (stdenv) lib; } + { inherit self srcs patches; }; + + addPackages = self: with self; + let + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + in { + + inherit mkDerivation; + + qtbase = callPackage ../modules/qtbase.nix { + inherit (srcs.qtbase) src version; + patches = patches.qtbase; + inherit bison cups harfbuzz libGL; + withGtk3 = true; inherit dconf gtk3; + inherit developerBuild decryptSslTraffic; + }; + + qtcharts = callPackage ../modules/qtcharts.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; + qtdoc = callPackage ../modules/qtdoc.nix {}; + qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; + qtimageformats = callPackage ../modules/qtimageformats.nix {}; + qtlocation = callPackage ../modules/qtlocation.nix {}; + qtmacextras = callPackage ../modules/qtmacextras.nix {}; + qtmultimedia = callPackage ../modules/qtmultimedia.nix { + inherit gstreamer gst-plugins-base; + }; + qtquick1 = null; + qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; + qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; + qtscript = callPackage ../modules/qtscript.nix {}; + qtsensors = callPackage ../modules/qtsensors.nix {}; + qtserialport = callPackage ../modules/qtserialport.nix {}; + qtspeech = callPackage ../modules/qtspeech.nix {}; + qtsvg = callPackage ../modules/qtsvg.nix {}; + qttools = callPackage ../modules/qttools.nix {}; + qttranslations = callPackage ../modules/qttranslations.nix {}; + qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; + qtwayland = callPackage ../modules/qtwayland.nix {}; + qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; + qtwebengine = callPackage ../modules/qtwebengine.nix {}; + qtwebkit = callPackage ../modules/qtwebkit.nix {}; + qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; + qtx11extras = callPackage ../modules/qtx11extras.nix {}; + qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; + + env = callPackage ../qt-env.nix {}; + full = env "qt-full-${qtbase.version}" ([ + qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 + qtscript qtsensors qtserialport qtsvg qttools qttranslations + qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets + qtx11extras qtxmlpatterns + ] ++ optional (!stdenv.isDarwin) qtwayland + ++ optional (stdenv.isDarwin) qtmacextras); + + qmake = makeSetupHook { + deps = [ self.qtbase.dev ]; + substitutions = { + inherit (stdenv) isDarwin; + qtbase_dev = self.qtbase.dev; + fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; + }; + } ../hooks/qmake-hook.sh; + }; + + self = makeScope newScope addPackages; + +in self diff --git a/pkgs/development/libraries/qt-5/5.10/fetch.sh b/pkgs/development/libraries/qt-5/5.10/fetch.sh new file mode 100644 index 0000000000000000000000000000000000000000..4770644ae4e90c0d0c86b7bb9c8323e7517d3ddd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/fetch.sh @@ -0,0 +1,2 @@ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/ \ + -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..fa389fe55c2f9ef02831e15958c3cc927ac65673 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch @@ -0,0 +1,70 @@ +diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +index 66baf16..89794ef 100644 +--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm ++++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl + + QFixed QCoreTextFontEngine::emSquareSize() const + { +- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); ++ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); + } + + QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const +diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm +index 341d3bccf2..3368234c26 100644 +--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm ++++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm +@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() + QMacAutoReleasePool pool; + userProfiles.clear(); + +- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + + CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; +@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() + + QMacAutoReleasePool pool; + +- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + scanThread->interfaceName = QString::fromNSString(ifName); + scanThread->start(); +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index d1f19f2..1ac2cf1 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -1699,7 +1699,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) + + if (!m_drawContentBorderGradient) { + window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask; +- [window.contentView.superview setNeedsDisplay:YES]; ++ [[window.contentView superview] setNeedsDisplay:YES]; + window.titlebarAppearsTransparent = NO; + return; + } +diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm +index e846fa0..4171cd4 100644 +--- a/src/plugins/platforms/cocoa/qnswindow.mm ++++ b/src/plugins/platforms/cocoa/qnswindow.mm +@@ -224,7 +224,7 @@ static bool isMouseEvent(NSEvent *ev) + if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) { + NSPoint loc = [theEvent locationInWindow]; + NSRect windowFrame = [self convertRectFromScreen:self.frame]; +- NSRect contentFrame = self.contentView.frame; ++ NSRect contentFrame = [self.contentView frame]; + if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO)) + [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent]; + } +@@ -253,7 +253,7 @@ static bool isMouseEvent(NSEvent *ev) + + (void)applicationActivationChanged:(NSNotification*)notification + { + const id sender = self; +- NSEnumerator *windowEnumerator = nullptr; ++ NSEnumerator *windowEnumerator = nullptr; + NSApplication *application = [NSApplication sharedApplication]; + + #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase.patch b/pkgs/development/libraries/qt-5/5.10/qtbase.patch new file mode 100644 index 0000000000000000000000000000000000000000..286dea2178b115b989960d18a30799ffce568a76 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtbase.patch @@ -0,0 +1,1152 @@ +diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf +index 5208379f9a..92fe29a0ac 100644 +--- a/mkspecs/common/mac.conf ++++ b/mkspecs/common/mac.conf +@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ + + QMAKE_FIX_RPATH = install_name_tool -id + +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip + + QMAKE_LFLAGS_REL_RPATH = +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index bb5083c925..77034f9bb6 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -21,7 +21,7 @@ load(cmake_functions) + # at cmake time whether package has been found via a symlink, and correct + # that to an absolute path. This is only done for installations to + # the /usr or / prefix. +-CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) ++CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) + contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR + + CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake +@@ -47,47 +47,22 @@ split_incpath { + $$cmake_extra_source_includes.output + } + +-CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { +- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ +- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True +-} ++CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ ++CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True + + !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true + +-CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_LIB_DIR,"^\\.\\./.*") { +- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ +- CMAKE_LIB_DIR_IS_ABSOLUTE = True +-} else { +- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) +- # We need to go up another two levels because the CMake files are +- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} +- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" +-} ++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ ++CMAKE_LIB_DIR_IS_ABSOLUTE = True + +-CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_BIN_DIR, "^\\.\\./.*") { +- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ +- CMAKE_BIN_DIR_IS_ABSOLUTE = True +-} ++CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ ++CMAKE_BIN_DIR_IS_ABSOLUTE = True + +-CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { +- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ +- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True +-} ++CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ ++CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True + +-win32:!static:!staticlib { +- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) +- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { +- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ +- CMAKE_DLL_DIR_IS_ABSOLUTE = True +- } +-} else { +- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR +- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE +-} ++CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ ++CMAKE_DLL_DIR_IS_ABSOLUTE = True + + static|staticlib:CMAKE_STATIC_TYPE = true + +@@ -167,7 +142,7 @@ contains(CONFIG, plugin) { + cmake_target_file + + cmake_qt5_plugin_file.files = $$cmake_target_file.output +- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + INSTALLS += cmake_qt5_plugin_file + + return() +@@ -314,7 +289,7 @@ exists($$cmake_macros_file.input) { + cmake_qt5_module_files.files += $$cmake_macros_file.output + } + +-cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + + # We are generating cmake files. Most developers of Qt are not aware of cmake, + # so we require automatic tests to be available. The only module which should +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 55c74aad66..0bbc8718eb 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/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}.VERSION)") +@@ -58,11 +34,7 @@ endmacro() + macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) + 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}\") +-!!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" +@@ -75,11 +47,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + ) + + !!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 +@@ -95,24 +63,13 @@ 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\" ++ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" ++ \"$${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}\") +-!!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}\" ++ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" ++ \"$${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 \"\") +@@ -128,7 +85,6 @@ 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 +@@ -280,25 +236,13 @@ 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}\" +-!!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}\" ) +-!!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() +@@ -317,25 +261,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!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}\" +-!!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}\" ) +-!!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() +@@ -354,11 +286,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}) + +-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::${Plugin} PROPERTIES + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf +index 50a1ec6764..d6368b769e 100644 +--- a/mkspecs/features/mac/default_post.prf ++++ b/mkspecs/features/mac/default_post.prf +@@ -25,188 +25,3 @@ qt { + } + } + +-# Add the same default rpaths as Xcode does for new projects. +-# This is especially important for iOS/tvOS/watchOS where no other option is possible. +-!no_default_rpath { +- QMAKE_RPATHDIR += @executable_path/Frameworks +- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks +-} +- +-# Don't pass -headerpad_max_install_names when using Bitcode. +-# In that case the linker emits a warning stating that the flag is ignored when +-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). +-# Using this flag is also unnecessary in practice on UIKit platforms since they +-# are sandboxed, and only UIKit platforms support bitcode to begin with. +-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD +- +-app_extension_api_only { +- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +-} +- +-macx-xcode { +- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO +- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ +- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO +- else: \ +- qmake_pkginfo_typeinfo.value = "????" +- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo +- +- !isEmpty(VERSION) { +- l = $$split(VERSION, '.') 0 0 # make sure there are at least three +- VER_MAJ = $$member(l, 0, 0) +- VER_MIN = $$member(l, 1, 1) +- VER_PAT = $$member(l, 2, 2) +- unset(l) +- +- qmake_full_version.name = QMAKE_FULL_VERSION +- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} +- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version +- +- qmake_short_version.name = QMAKE_SHORT_VERSION +- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} +- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version +- } +- +- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { +- debug_information_format.name = DEBUG_INFORMATION_FORMAT +- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT +- debug_information_format.build = debug +- QMAKE_MAC_XCODE_SETTINGS += debug_information_format +- } +- +- QMAKE_XCODE_ARCHS = +- +- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" +- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_device +- +- simulator { +- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" +- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_simulator +- } +- +- only_active_arch.name = ONLY_ACTIVE_ARCH +- only_active_arch.value = YES +- only_active_arch.build = debug +- QMAKE_MAC_XCODE_SETTINGS += only_active_arch +-} else { +- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS +- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS +- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS +- +- isEmpty(VALID_ARCHS): \ +- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") +- +- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) +- +- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- +- arch_flags = $(EXPORT_ARCH_ARGS) +- +- QMAKE_CFLAGS += $$arch_flags +- QMAKE_CXXFLAGS += $$arch_flags +- QMAKE_LFLAGS += $$arch_flags +- +- QMAKE_PCH_ARCHS = $$VALID_ARCHS +- +- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET +- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET +- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET +- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET +- +- # If we're doing a simulator and device build, device and simulator +- # architectures use different paths and flags for the sysroot and +- # deployment target switch, so we must multiplex them across multiple +- # architectures using -Xarch. Otherwise we fall back to the simple path. +- # This is not strictly necessary, but results in cleaner command lines +- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit +- # individual rules to a different set of architecture(s) from the overall +- # build (such as machtest in QtCore). +- simulator:device { +- QMAKE_XARCH_CFLAGS = +- QMAKE_XARCH_LFLAGS = +- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS +- +- for (arch, VALID_ARCHS) { +- contains(VALID_SIMULATOR_ARCHS, $$arch) { +- sdk = $$simulator.sdk +- version_identifier = $$simulator.deployment_identifier +- } else { +- sdk = $$device.sdk +- version_identifier = $$device.deployment_identifier +- } +- +- version_min_flags = \ +- -Xarch_$${arch} \ +- -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -isysroot$$xcodeSDKInfo(Path, $$sdk) +- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) +- +- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) +- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) +- +- QMAKE_EXTRA_VARIABLES += \ +- QMAKE_XARCH_CFLAGS_$${arch} \ +- QMAKE_XARCH_LFLAGS_$${arch} +- } +- +- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) +- } else { +- simulator: \ +- version_identifier = $$simulator.deployment_identifier +- else: \ +- version_identifier = $$device.deployment_identifier +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag +- } +- +- # Enable precompiled headers for multiple architectures +- QMAKE_CFLAGS_USE_PRECOMPILE = +- for (arch, VALID_ARCHS) { +- icc_pch_style: \ +- use_flag = "-pch-use " +- else: \ +- use_flag = -include +- +- # Only use Xarch with multi-arch, as the option confuses ccache +- count(VALID_ARCHS, 1, greaterThan): \ +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- -Xarch_$${arch} +- +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} +- } +- icc_pch_style { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} +- QMAKE_CFLAGS_USE_PRECOMPILE = +- } else { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- } +- +- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} +-} +- +-cache(QMAKE_XCODE_DEVELOPER_PATH, stash) +-!isEmpty(QMAKE_XCODE_VERSION): \ +- cache(QMAKE_XCODE_VERSION, stash) +- +-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() +diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf +index f1a4ca77b2..3b01424e67 100644 +--- a/mkspecs/features/mac/default_pre.prf ++++ b/mkspecs/features/mac/default_pre.prf +@@ -1,67 +1,2 @@ + CONFIG = asset_catalogs rez $$CONFIG + load(default_pre) +- +-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { +- # Get path of Xcode's Developer directory +- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") +- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode path is valid +- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") +-} +- +-isEmpty(QMAKE_XCODEBUILD_PATH): \ +- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") +- +-!isEmpty(QMAKE_XCODEBUILD_PATH) { +- # Make sure Xcode is set up properly +- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ +- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") +- +- isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +- } +-} +- +-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { +- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist +- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ +- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") +- +- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ +- cache(QMAKE_TARGET_BUNDLE_PREFIX) +-} +- +-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon +- +-# Make the default debug info format for static debug builds +-# DWARF instead of DWARF with dSYM. This cuts down build times +-# for application debug builds significantly, as Xcode doesn't +-# have to pull out all the DWARF info from the Qt static libs +-# and put it into a dSYM file. We don't need that dSYM file in +-# the first place, since the information is available in the +-# object files inside the archives (static libraries). +-macx-xcode:qtConfig(static): \ +- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf +- +-# This variable is used by the xcode_dynamic_library_suffix +-# feature, which allows Xcode to choose the Qt libraries to link to +-# at build time, depending on the current Xcode SDK and configuration. +-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +- +-xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP +-xcode_copy_phase_strip_setting.value = NO +-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting +- +-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER +-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX +-isEmpty(xcode_product_bundle_identifier_setting.value): \ +- xcode_product_bundle_identifier_setting.value = "com.yourcompany" +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" +-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting +diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf +index 3f6dc076ca..e69de29bb2 100644 +--- a/mkspecs/features/mac/sdk.prf ++++ b/mkspecs/features/mac/sdk.prf +@@ -1,58 +0,0 @@ +- +-isEmpty(QMAKE_MAC_SDK): \ +- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") +- +-contains(QMAKE_MAC_SDK, .*/.*): \ +- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") +- +-defineReplace(xcodeSDKInfo) { +- info = $$1 +- equals(info, "Path"): \ +- info = --show-sdk-path +- equals(info, "PlatformPath"): \ +- info = --show-sdk-platform-path +- equals(info, "SDKVersion"): \ +- info = --show-sdk-version +- sdk = $$2 +- isEmpty(sdk): \ +- sdk = $$QMAKE_MAC_SDK +- +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") +- # --show-sdk-platform-path won't work for Command Line Tools; this is fine +- # only used by the XCTest backend to testlib +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ +- error("Could not resolve SDK $$info for \'$$sdk\'") +- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) +- } +- +- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) +-} +- +-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) +-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- +-sysrootified = +-for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val +-QMAKE_INCDIR_OPENGL = $$sysrootified +- +-QMAKESPEC_NAME = $$basename(QMAKESPEC) +- +-# Resolve SDK version of various tools +-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) { +- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} +- !isEmpty($$tool_variable) { +- $$tool = $$eval($$tool_variable) +- next() +- } +- +- value = $$eval($$tool) +- isEmpty(value): next() +- +- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") +- isEmpty(sysrooted): next() +- +- $$tool = $$sysrooted $$member(value, 1, -1) +- cache($$tool_variable, set stash, $$tool) +-} +diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf +index 4db0040dc5..65d6da1f4d 100644 +--- a/mkspecs/features/qml_module.prf ++++ b/mkspecs/features/qml_module.prf +@@ -23,13 +23,8 @@ for(qmlf, AUX_QML_FILES): fq_aux_qml_files += $$absolute_path($$qmlf, $$_PRO_FIL + + load(qt_build_paths) + +-qml1_target { +- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH +- instbase = $$[QT_INSTALL_IMPORTS] +-} else { +- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH +- instbase = $$[QT_INSTALL_QML] +-} ++DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH ++instbase = $$NIX_OUTPUT_QML + + !qml1_target:static: CONFIG += builtin_resources + +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index d49f4c49c1..097dcd7d39 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -48,13 +48,8 @@ exists($$QMLTYPEFILE): AUX_QML_FILES += $$QMLTYPEFILE + + load(qt_build_paths) + +-qml1_target { +- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH +- instbase = $$[QT_INSTALL_IMPORTS] +-} else { +- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH +- instbase = $$[QT_INSTALL_QML] +-} ++DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH ++instbase = $$NIX_OUTPUT_QML + + target.path = $$instbase/$$TARGETPATH + INSTALLS += target +diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf +index 883f8ca215..81db8eb2d4 100644 +--- a/mkspecs/features/qt_app.prf ++++ b/mkspecs/features/qt_app.prf +@@ -33,7 +33,7 @@ host_build:force_bootstrap { + target.path = $$[QT_HOST_BINS] + } else { + !build_pass:qtConfig(debug_and_release): CONFIG += release +- target.path = $$[QT_INSTALL_BINS] ++ target.path = $$NIX_OUTPUT_BIN/bin + CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable + } + INSTALLS += target +diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf +index 1848f00e90..2af93675c5 100644 +--- a/mkspecs/features/qt_build_paths.prf ++++ b/mkspecs/features/qt_build_paths.prf +@@ -23,6 +23,6 @@ exists($$MODULE_BASE_INDIR/.git): \ + !force_independent { + # If the module is not built independently, everything ends up in qtbase. + # This is the case in non-prefix builds, except for selected modules. +- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] +- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] ++ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT ++ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT + } +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index f4ae5bde80..6d4c6d223f 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { + qqt_libdir = \$\$\$\$[QT_HOST_LIBS] + qt_libdir = $$[QT_HOST_LIBS] + } else { +- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] +- qt_libdir = $$[QT_INSTALL_LIBS] ++ qqt_libdir = \$\$\$\$NIX_OUTPUT_OUT/lib ++ qt_libdir = $$NIX_OUTPUT_OUT/lib + } + contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { + lib_replace.match = "[^ ']*$$rplbase/lib" +diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf +index 72dde61a40..f891a2baed 100644 +--- a/mkspecs/features/qt_docs.prf ++++ b/mkspecs/features/qt_docs.prf +@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR + + QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) + !build_online_docs: \ +- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) ++ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) + PREP_DOC_INDEXES = + DOC_INDEXES = + !isEmpty(QTREPOS) { +@@ -64,8 +64,8 @@ DOC_INDEXES = + DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) + } else { + prepare_docs: \ +- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) +- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) ++ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) ++ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) + } + + qtattributionsscanner.target = qtattributionsscanner +@@ -88,12 +88,12 @@ prepare_docs { + qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) + + inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR +- inst_html_docs.path = $$[QT_INSTALL_DOCS] ++ inst_html_docs.path = $$NIX_OUTPUT_DOC + inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build + INSTALLS += inst_html_docs + + inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch +- inst_qch_docs.path = $$[QT_INSTALL_DOCS] ++ inst_qch_docs.path = $$NIX_OUTPUT_DOC + inst_qch_docs.CONFIG += no_check_exist no_default_install no_build + INSTALLS += inst_qch_docs + +diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf +index c9ce926b1a..f00868a031 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -88,7 +88,7 @@ sourcefiles += \ + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + addInstallFiles(sources.files, $$sourcefiles) +-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase ++sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase + INSTALLS += sources + + check_examples { +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 1903e509c8..ae7b585989 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { + defineTest(qtPrepareTool) { + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd) { +- cmd = $$[QT_HOST_BINS]/$$2 ++ cmd = $$system("command -v $$2") + exists($${cmd}.pl) { + $${1}_EXE = $${cmd}.pl + cmd = perl -w $$system_path($${cmd}.pl) +diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf +index 90d84cc535..387481bfc6 100644 +--- a/mkspecs/features/qt_installs.prf ++++ b/mkspecs/features/qt_installs.prf +@@ -12,16 +12,10 @@ + #library + !qt_no_install_library { + win32 { +- host_build: \ +- dlltarget.path = $$[QT_HOST_BINS] +- else: \ +- dlltarget.path = $$[QT_INSTALL_BINS] ++ dlltarget.path = $$NIX_OUTPUT_BIN/bin + INSTALLS += dlltarget + } +- host_build: \ +- target.path = $$[QT_HOST_LIBS] +- else: \ +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + !static: target.CONFIG = no_dll + INSTALLS += target + } +@@ -29,33 +23,33 @@ + #headers + qt_install_headers { + class_headers.files = $$SYNCQT.HEADER_CLASSES +- class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME ++ class_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += class_headers + + targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES +- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME ++ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += targ_headers + + private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES +- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private ++ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + INSTALLS += private_headers + + qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES +- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa ++ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa + INSTALLS += qpa_headers + } + + #module + qt_install_module { + !isEmpty(MODULE_PRI) { +- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + pritarget.files = $$MODULE_PRI + INSTALLS += pritarget + } else: isEmpty(MODULE_PRIVATE_PRI) { + warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") + } + !isEmpty(MODULE_PRIVATE_PRI) { +- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + privpritarget.files = $$MODULE_PRIVATE_PRI + INSTALLS += privpritarget + } +diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf +index 14fc5f9a94..2a0f2cd27f 100644 +--- a/mkspecs/features/qt_plugin.prf ++++ b/mkspecs/features/qt_plugin.prf +@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { + } + } + +-target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE ++target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE + INSTALLS += target + + TARGET = $$qt5LibraryTarget($$TARGET) +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 545b9a3d1e..6ac0cdefe4 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/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_OUTPUT_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_OUTPUT_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_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -133,7 +133,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_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -147,7 +147,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_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +index c357237d0e..6f0c75de3c 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ b/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_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +index 706304cf34..546420f6ad 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ b/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_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp +index 3814894630..3c6468277c 100644 +--- a/src/corelib/kernel/qcoreapplication.cpp ++++ b/src/corelib/kernel/qcoreapplication.cpp +@@ -2601,6 +2601,15 @@ QStringList QCoreApplication::libraryPaths() + 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/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp +index 6a5df6272a..a6136ca4cd 100644 +--- a/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ b/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; + // 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"); ++ // 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"); + +@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) + 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, 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)) +- 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/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index 1d947159e2..b36865fc48 100644 +--- a/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -2,11 +2,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\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbuscpp2xml PROPERTIES +@@ -17,11 +13,7 @@ endif() + 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\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbusxml2cpp PROPERTIES +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 07869efd7d..fb4183bada 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/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_OUTPUT_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_properties TargetName Configuration LIB_LOCATIO + 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_OUTPUT_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_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp +index ce1ec6442a..4f75655abe 100644 +--- a/src/network/kernel/qdnslookup_unix.cpp ++++ b/src/network/kernel/qdnslookup_unix.cpp +@@ -95,7 +95,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/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp +index 8d2cffc304..9730fb33f2 100644 +--- a/src/network/kernel/qhostinfo_unix.cpp ++++ b/src/network/kernel/qhostinfo_unix.cpp +@@ -98,7 +98,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/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +index b5a0a5bbeb..6c20305f4d 100644 +--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() + 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(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/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +index a59dc15b0e..a13ee89b5a 100644 +--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp ++++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +@@ -584,7 +584,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) + #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(NIXPKGS_MESA_GL)); ++ } ++#endif // NIXPKGS_MESA_GL + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + #endif + } +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index da63360333..95e34e2e50 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) + #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 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(NIXPKGS_LIBXCURSOR)); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { +diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp +index c4cd66c33b..b6f2691587 100644 +--- a/src/plugins/platformthemes/gtk3/main.cpp ++++ b/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/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index 6498ea84ef..d821ced7fc 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h +@@ -44,10 +44,13 @@ + + QT_BEGIN_NAMESPACE + +- ++#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) ++#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) ++#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) ++#else + #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) +- + #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) ++#endif + + QT_END_NAMESPACE + +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 99d87e2e46..a4eab2aa72 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/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_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF diff --git a/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch new file mode 100644 index 0000000000000000000000000000000000000000..01a975c14ec7d99b324fc37cdd778ee56aa18723 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch @@ -0,0 +1,33 @@ +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index a7cafa1a9..e17ffd35b 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1737,6 +1737,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + 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 QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); +diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf +index 330da358b..cdf570205 100644 +--- a/tools/qmlcachegen/qmlcache.prf ++++ b/tools/qmlcachegen/qmlcache.prf +@@ -44,7 +44,7 @@ defineReplace(qmlCacheOutputFileName) { + } + + qmlcacheinst.base = $$QMLCACHE_DESTDIR +-qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH + qmlcacheinst.CONFIG = no_check_exist + + qmlcachegen.input = CACHEGEN_FILES diff --git a/pkgs/development/libraries/qt-5/5.10/qtscript.patch b/pkgs/development/libraries/qt-5/5.10/qtscript.patch new file mode 100644 index 0000000000000000000000000000000000000000..5508dec1280e3a3f07761a942b7f9aa6ec2112d3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtscript.patch @@ -0,0 +1,13 @@ +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 + diff --git a/pkgs/development/libraries/qt-5/5.10/qtserialport.patch b/pkgs/development/libraries/qt-5/5.10/qtserialport.patch new file mode 100644 index 0000000000000000000000000000000000000000..f25524e80bcfe8ca3ba93bd3562149043ab1aa97 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtserialport.patch @@ -0,0 +1,22 @@ +diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h +index af2dab2..8e17f64 100644 +--- a/src/serialport/qtudev_p.h ++++ b/src/serialport/qtudev_p.h +@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN + 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.10/qttools.patch b/pkgs/development/libraries/qt-5/5.10/qttools.patch new file mode 100644 index 0000000000000000000000000000000000000000..fbba439ef7a5d12896c5f8063af9da1d4a725be0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qttools.patch @@ -0,0 +1,71 @@ +diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in +index 3b97923a..63336bd5 100644 +--- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in ++++ b/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 ++ if(NOT EXISTS \"${imported_location}\") ++ set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") ++ endif() + _qt5_Help_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qcollectiongenerator PROPERTIES +@@ -17,11 +16,7 @@ endif() + if (NOT TARGET Qt5::qhelpgenerator) + add_executable(Qt5::qhelpgenerator IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") +-!!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") +-!!ENDIF + _qt5_Help_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qhelpgenerator PROPERTIES +diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in +index 4318b16f..d60db4ff 100644 +--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in ++++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in +@@ -44,11 +44,7 @@ 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 + _qt5_LinguistTools_check_file_exists(${imported_location}) + + set_target_properties(Qt5::lrelease PROPERTIES +@@ -59,11 +55,7 @@ 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 + _qt5_LinguistTools_check_file_exists(${imported_location}) + + set_target_properties(Qt5::lupdate PROPERTIES +@@ -74,11 +66,7 @@ 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 + _qt5_LinguistTools_check_file_exists(${imported_location}) + + set_target_properties(Qt5::lconvert PROPERTIES diff --git a/pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch new file mode 100644 index 0000000000000000000000000000000000000000..e1621b005c618d93673f5ba88d626c8d4cf28229 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch @@ -0,0 +1,48 @@ +diff --git a/src/3rdparty/chromium/v8/src/v8.gyp b/chromium/v8/src/v8.gyp +index e7e19f5059..934448c7d8 100644 +--- a/src/3rdparty/chromium/v8/src/v8.gyp ++++ b/src/3rdparty/chromium/v8/src/v8.gyp +@@ -35,6 +35,7 @@ + 'v8_extra_library_files%': [], + 'v8_experimental_extra_library_files%': [], + 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', ++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', + 'v8_os_page_size%': 0, + }, + 'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi', 'inspector/inspector.gypi'], +@@ -2576,7 +2577,7 @@ + ] + }, + { +- 'target_name': 'mksnapshot', ++ 'target_name': 'mksnapshot_u', + 'type': 'executable', + 'dependencies': [ + 'v8_base', +@@ -2606,5 +2607,26 @@ + }], + ], + }, ++ { ++ 'target_name': 'mksnapshot', ++ 'type': 'executable', ++ 'dependencies': ['mksnapshot_u'], ++ 'actions': [ ++ { ++ 'action_name': 'paxmark_m_mksnapshot', ++ 'inputs': [ ++ '<(mksnapshot_u_exec)', ++ ], ++ 'outputs': [ ++ '<(mksnapshot_exec)', ++ ], ++ 'action': [ ++ 'sh', ++ '-c', ++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxctl -czexm <(mksnapshot_exec)', ++ ], ++ }, ++ ], ++ }, + ], + } diff --git a/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch new file mode 100644 index 0000000000000000000000000000000000000000..c78cb58f564b8bad48ba82c412554c7ded58fcbe --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch @@ -0,0 +1,77 @@ +diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri +index 69e4cd1f3..3f729a75e 100644 +--- a/Source/WTF/WTF.pri ++++ b/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/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index a923d49aa..46772a4bb 100644 +--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* module = 0) + } + } + ++#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"); +diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp +index de06a2fea..86fe39ef1 100644 +--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/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; + +diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +index 8de65216b..38f5c05e5 100644 +--- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp ++++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr + + 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/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +index d734ff684..0f6ff63d1 100644 +--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/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; + diff --git a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch new file mode 100644 index 0000000000000000000000000000000000000000..a012c3f583e306804b062cee9f8b89eef29e2530 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch @@ -0,0 +1,27 @@ +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index e6a0d97f1a..b50ce77d51 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -266,7 +266,7 @@ load(qt_installs) + load(qt_targets) + + # this builds on top of qt_common +-!internal_module:!lib_bundle:if(unix|mingw) { ++!internal_module:if(unix|mingw) { + CONFIG += create_pc + QMAKE_PKGCONFIG_DESTDIR = pkgconfig + host_build: \ +diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf +index 62b88c6fe2..f302f1e202 100644 +--- a/mkspecs/features/qt_module_headers.prf ++++ b/mkspecs/features/qt_module_headers.prf +@@ -102,8 +102,7 @@ git_build: \ + else: \ + INC_PATH = $$MODULE_BASE_INDIR + include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true) +-!lib_bundle: \ # Headers are embedded into the bundle, so don't install them separately. +- CONFIG += qt_install_headers ++CONFIG += qt_install_headers + + alien_syncqt: return() + diff --git a/pkgs/development/libraries/qt-5/5.10/srcs.nix b/pkgs/development/libraries/qt-5/5.10/srcs.nix new file mode 100644 index 0000000000000000000000000000000000000000..025c7aa44e1390505fab27c374a363815da9c037 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/srcs.nix @@ -0,0 +1,341 @@ +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh +{ fetchurl, mirror }: + +{ + qt3d = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qt3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "0fvb346xhiyc0csxcvs5ifwkzs9wnza54vvsw6dvyax76qjv87q4"; + name = "qt3d-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtactiveqt-everywhere-src-5.10.1.tar.xz"; + sha256 = "1r4i72i1pl9xnmcx8rr8g48fmym8mxs28pkg1nl302xi6izan8ch"; + name = "qtactiveqt-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtandroidextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "03jmf7gw4abn5gj92b1ns0k75bbi4wycbc4bbb7c9mngzkv3nzkn"; + name = "qtandroidextras-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtbase = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz"; + sha256 = "0sd9cn3ywkjfswddcxhbfplkwk8snqld752q5laaapdakhc0wrnq"; + name = "qtbase-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtcanvas3d = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcanvas3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "1h5hpjwdyp824r2ajmaqjcshra06yfzz7dp991h4kf54da79m0ny"; + name = "qtcanvas3d-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtcharts = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz"; + sha256 = "1j8y683ainri9ma44ky6q87pjs1d794znb2wfsrbplixyxxmf3ag"; + name = "qtcharts-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtconnectivity-everywhere-src-5.10.1.tar.xz"; + sha256 = "1j9ydlkwz3039yslaizz923h0qbszm4z2sqspk28wr8rd3f22a35"; + name = "qtconnectivity-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtdatavis3d = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdatavis3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "0ny8j689jm2fghklzw894yc5hjqa23yf395yv17yvwi72kpiz0b3"; + name = "qtdatavis3d-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdeclarative-everywhere-src-5.10.1.tar.xz"; + sha256 = "0lwmg1qan886czzkzi4px36mqxlqiw0acrsa9kqcddg5pi8yvy9s"; + name = "qtdeclarative-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtdoc = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdoc-everywhere-src-5.10.1.tar.xz"; + sha256 = "1gl62acr346jrcfxla8vxlczf706a3md52zc0zaqbjw9rf2bgnqq"; + name = "qtdoc-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtgamepad = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgamepad-everywhere-src-5.10.1.tar.xz"; + sha256 = "1xs6adpnv5ymdmb7kcbvcc0vx2lp6wqz53pzr9amyzbgyl0jiiw5"; + name = "qtgamepad-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgraphicaleffects-everywhere-src-5.10.1.tar.xz"; + sha256 = "0zw4n6s42w70r45gjg66ad0s9dpxil6wmwwrivshnqvrnlqhcfrz"; + name = "qtgraphicaleffects-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtimageformats = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtimageformats-everywhere-src-5.10.1.tar.xz"; + sha256 = "10x248s4a6ij18awkdskk3g7zfw6gwyj63l2jr803blyfyibl118"; + name = "qtimageformats-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtlocation = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtlocation-everywhere-src-5.10.1.tar.xz"; + sha256 = "1jbjzl6gwxy4n43x6m55b86vkdpjvwyvw7xsxg4a40f72xaw0p2y"; + name = "qtlocation-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtmacextras = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmacextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "1jkzizsa8nr1dp5n9p81s6ylnqfh0vqwz8l72632fg68x229jfn7"; + name = "qtmacextras-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmultimedia-everywhere-src-5.10.1.tar.xz"; + sha256 = "0j9nq8s2kzfc7zqs253pixqwd5xjv2cbqyik5lgvi9p5bq0riym1"; + name = "qtmultimedia-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtnetworkauth = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtnetworkauth-everywhere-src-5.10.1.tar.xz"; + sha256 = "1p6wnma2nygqbjhrbiijjgkc8jq6lkdmq6xaxcgdh8ynkcqiq8wp"; + name = "qtnetworkauth-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtpurchasing = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtpurchasing-everywhere-src-5.10.1.tar.xz"; + sha256 = "090gmxy5bp44rirl5yrb1ryn97z37ri4fmmclh9z7c4dvnmr2d3j"; + name = "qtpurchasing-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols-everywhere-src-5.10.1.tar.xz"; + sha256 = "1dw22sk2x5bk2mix06w8dv1b05dyq0gx088aqvdz18y67ncs2cfj"; + name = "qtquickcontrols-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols2-everywhere-src-5.10.1.tar.xz"; + sha256 = "0jk01vgzc78w45q8kys1hwri3jx0hzx5vxivzmv8nh8yj0dlmijx"; + name = "qtquickcontrols2-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtremoteobjects = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtremoteobjects-everywhere-src-5.10.1.tar.xz"; + sha256 = "052fa27rv4b9h6qbldrq013zxb69ysgmqnxbyv9c48s2ra50pnp9"; + name = "qtremoteobjects-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtscript = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscript-everywhere-src-5.10.1.tar.xz"; + sha256 = "0bakr5xcxc6j6l78fyazh7sgcz2hwf2g8k60jb9307qzrgvqlqg0"; + name = "qtscript-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtscxml = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscxml-everywhere-src-5.10.1.tar.xz"; + sha256 = "00v1n86pyw9cm320qa2fpazvkfi6czd027x60k2g2sprwh0x4hhb"; + name = "qtscxml-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtsensors = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsensors-everywhere-src-5.10.1.tar.xz"; + sha256 = "15jw2r6snhwi26b4ajp7m89l89kaf1j0kgqds4wjpksk1rngf3dv"; + name = "qtsensors-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtserialbus = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialbus-everywhere-src-5.10.1.tar.xz"; + sha256 = "0mr2j86mk1fm9z5iba3kav651231j9jv0805q8716h7ia1ws2l06"; + name = "qtserialbus-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtserialport = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialport-everywhere-src-5.10.1.tar.xz"; + sha256 = "17ja368ggl9aak64r8sqzx34j2i8zv7z60bkhncynrgipc9wpr08"; + name = "qtserialport-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtspeech = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtspeech-everywhere-src-5.10.1.tar.xz"; + sha256 = "07clcy3bslq4fk7xb6cqlfsz5frhmy41hzpajdqjwj9h6dvmqxw5"; + name = "qtspeech-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtsvg = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz"; + sha256 = "0nkz3kxclk7s95fnh8xgljahk131mwb8pjllgp7n70ycmc20rq00"; + name = "qtsvg-everywhere-src-5.10.1.tar.xz"; + }; + }; + qttools = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz"; + sha256 = "0lwa0i6zspcrii0ak1dyxacif1fkv2vhmdp3dmp7af71bwg49spi"; + name = "qttools-everywhere-src-5.10.1.tar.xz"; + }; + }; + qttranslations = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz"; + sha256 = "1za34rvn3bhzi4mxqm9lghdhaqcxpsi6xa61dfbhpc047l788v8z"; + name = "qttranslations-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz"; + sha256 = "0bnmhy0kibvyra0i15qzwc9195s8wpfhg5gk0d6rfwd5d07gj6a3"; + name = "qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtwayland = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwayland-everywhere-src-5.10.1.tar.xz"; + sha256 = "0mk3p8pkfia3z7v7phk0qdyzd1zkfpk92c995g851p5wbqx699zm"; + name = "qtwayland-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebchannel-everywhere-src-5.10.1.tar.xz"; + sha256 = "0r1p1ar4xh7g7lzi564hgw1ng5xkim4mkpgq29ymjlmhxjgl8b62"; + name = "qtwebchannel-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtwebengine = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebengine-everywhere-src-5.10.1.tar.xz"; + sha256 = "1ph1pinxn0dp44zall9gihbgziira4zpynixacm4ldd85f6lyr0j"; + name = "qtwebengine-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtwebglplugin = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebglplugin-everywhere-src-5.10.1.tar.xz"; + sha256 = "1hdzymwai5f6agkn4hz32aq5fjv2lqdac285fwrlk5gsff0j0yal"; + name = "qtwebglplugin-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebsockets-everywhere-src-5.10.1.tar.xz"; + sha256 = "1sjkml5kqigvyxrkv5b7x1cy69d69dzma40yfg72vr7zal4pkkvf"; + name = "qtwebsockets-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtwebview = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebview-everywhere-src-5.10.1.tar.xz"; + sha256 = "110mwc423cq1bwdz0vv78cjprzy03xawxnxhfcs4138gssfj0n0b"; + name = "qtwebview-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtwinextras = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "05w9n8kry1mg3i14i4m98gm5hf20mlwxbagbk9xk11xykbm1wh0j"; + name = "qtwinextras-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtx11extras = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtx11extras-everywhere-src-5.10.1.tar.xz"; + sha256 = "1d4pvisxbcyb7ljl1lh2zg72kw44h9kk14l0xmvajb8bslgkg2n3"; + name = "qtx11extras-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.10.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtxmlpatterns-everywhere-src-5.10.1.tar.xz"; + sha256 = "1zp9smsfdqyfiarxs7r8kfr7yq68cdn7biddwl36cybax6fgbpiw"; + name = "qtxmlpatterns-everywhere-src-5.10.1.tar.xz"; + }; + }; + qtwebkit = { + version = "5.9.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz"; + sha256 = "1ksjn1vjbfhdm4y4rg08ag4krk87ahp7qcdcpwll42l0rnz61998"; + name = "qtwebkit-opensource-src-5.9.1.tar.xz"; + }; + }; + qtwebkit-examples = { + version = "5.9.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz"; + sha256 = "1l2l7ycgqql6rf4gx6sjhsqjapdhvy6vxaxssax3l938nkk4vkp4"; + name = "qtwebkit-examples-opensource-src-5.9.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 7930bd909aa52e2ef81e04bbc7e3819e82c07a3f..b9ed5eddd5cf6531bd42f023019540d975b41857 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -27,13 +27,13 @@ existing packages here and modify it as necessary. { newScope, stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, + bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, # options developerBuild ? false, decryptSslTraffic ? false, - debug ? null, + debug ? false, }: with stdenv.lib; @@ -51,8 +51,8 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = - optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + qtwebengine = [ ./qtwebengine-seccomp.patch ] + ++ optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; qtwebkit = [ ./qtwebkit.patch ]; }; @@ -74,7 +74,7 @@ let inherit mkDerivation; qtbase = callPackage ../modules/qtbase.nix { - inherit bison cups harfbuzz mesa; + inherit bison cups harfbuzz libGL; inherit (srcs.qtbase) src version; patches = patches.qtbase; inherit developerBuild decryptSslTraffic; @@ -113,7 +113,7 @@ let qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; env = callPackage ../qt-env.nix {}; - full = env "qt-${qtbase.version}" [ + full = env "qt-full-${qtbase.version}" [ qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase.patch b/pkgs/development/libraries/qt-5/5.6/qtbase.patch index 6bdf774e15d60184899738e4df1e643ed2aedb38..d8322cbc1997c10508cd60ab583b0e7b7d940211 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase.patch @@ -1,5 +1,5 @@ diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 11fb52a0b1..a4cca1fdcb 100644 +index 11fb52a0b1..614fdbb046 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -21,7 +21,7 @@ load(cmake_functions) @@ -35,7 +35,7 @@ index 11fb52a0b1..a4cca1fdcb 100644 - # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} - CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" -} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ +CMAKE_LIB_DIR_IS_ABSOLUTE = True -CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) @@ -64,7 +64,7 @@ index 11fb52a0b1..a4cca1fdcb 100644 - CMAKE_DLL_DIR = $$CMAKE_LIB_DIR - CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE -} -+CMAKE_DLL_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ +CMAKE_DLL_DIR_IS_ABSOLUTE = True static|staticlib:CMAKE_STATIC_TYPE = true @@ -628,7 +628,7 @@ index 1d947159e2..b36865fc48 100644 set_target_properties(Qt5::qdbusxml2cpp PROPERTIES diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..37b95d1b6b 100644 +index 07869efd7d..fb4183bada 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -2,7 +2,7 @@ @@ -652,7 +652,7 @@ index 07869efd7d..37b95d1b6b 100644 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF @@ -758,6 +758,28 @@ index 4646ced954..ff3111f393 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { +diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index ca3e02ca06..28dd73d772 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h +@@ -38,10 +38,13 @@ + + QT_BEGIN_NAMESPACE + +- +-#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (0) +- +-#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (0) ++#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) ++#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) ++#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) ++#else ++#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) ++#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) ++#endif + + QT_END_NAMESPACE + diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in index 99d87e2e46..a4eab2aa72 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch b/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch new file mode 100644 index 0000000000000000000000000000000000000000..bf6af80598232aba67a899412b225b833bd72d29 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch @@ -0,0 +1,24 @@ +Backported to Qt 5.6 for epoll_pwait fix on newer glibc +Part of upstream Chromium's 4e8083b4ab953ba298aedfc4e79d464be15e4012 +Review URL: https://codereview.chromium.org/1613883002 +--- +diff --git a/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +index 10278dc5fc9b..b30b3e6acef6 100644 +--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +@@ -414,6 +414,7 @@ bool SyscallSets::IsAllowedEpoll(int sysno) { + case __NR_epoll_create: + case __NR_epoll_wait: + #endif ++ case __NR_epoll_pwait: + case __NR_epoll_create1: + case __NR_epoll_ctl: + return true; +@@ -421,7 +422,6 @@ bool SyscallSets::IsAllowedEpoll(int sysno) { + #if defined(__x86_64__) + case __NR_epoll_ctl_old: + #endif +- case __NR_epoll_pwait: + #if defined(__x86_64__) + case __NR_epoll_wait_old: + #endif diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 879f7f198c927be18f493b6cd2d8d4c646da8ec2..e109fe447aa235f5600a8e45dafda6c9564b99f9 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -6,9 +6,9 @@ Before a major version update, make a copy of this directory. (We like to keep the old version around for a short time after major updates.) Add a top-level attribute to `top-level/all-packages.nix`. -1. Update the URL in `maintainers/scripts/generate-qt.sh`. +1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run - `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. + `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. 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,13 +18,13 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, + bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, # options developerBuild ? false, decryptSslTraffic ? false, - debug ? null, + debug ? false, }: with stdenv.lib; @@ -37,7 +37,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ]; + qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; @@ -66,7 +66,7 @@ let qtbase = callPackage ../modules/qtbase.nix { inherit (srcs.qtbase) src version; patches = patches.qtbase; - inherit bison cups harfbuzz mesa; + inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; }; @@ -91,6 +91,7 @@ let qtsvg = callPackage ../modules/qtsvg.nix {}; qttools = callPackage ../modules/qttools.nix {}; qttranslations = callPackage ../modules/qttranslations.nix {}; + qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix {}; @@ -100,10 +101,11 @@ let qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; env = callPackage ../qt-env.nix {}; - full = env "qt-${qtbase.version}" ([ + full = env "qt-full-${qtbase.version}" ([ qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript - qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets + qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 + qtscript qtsensors qtserialport qtsvg qttools qttranslations + qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras qtxmlpatterns ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index 2ae85bba391d9d5f9bc8c89a383bba704e2c0e49..103fa4e09abc7d4d3d4134cbade1122d3371f43b 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..1c3a9b05cb2457a543ab2173b81b4b162e5d5dad --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch @@ -0,0 +1,48 @@ +diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +index 66baf16..89794ef 100644 +--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm ++++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl + + QFixed QCoreTextFontEngine::emSquareSize() const + { +- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); ++ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); + } + + QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const +diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm +index 341d3bc..3368234 100644 +--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm ++++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm +@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() + QMacAutoReleasePool pool; + userProfiles.clear(); + +- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + + CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; +@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() + + QMacAutoReleasePool pool; + +- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + scanThread->interfaceName = QString::fromNSString(ifName); + scanThread->start(); +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index 5cd4beb..84919e6 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -320,7 +320,7 @@ static void qt_closePopups() + + (void)applicationActivationChanged:(NSNotification*)notification + { + const id sender = self; +- NSEnumerator *windowEnumerator = nullptr; ++ NSEnumerator *windowEnumerator = nullptr; + NSApplication *application = [NSApplication sharedApplication]; + + #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase.patch b/pkgs/development/libraries/qt-5/5.9/qtbase.patch index 96c9b029312a35ca46993de91e494dee7fff5673..086ddf4fe3e7569d43b6eb942eb28f18164f6bb7 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase.patch @@ -12,7 +12,7 @@ index 5208379f9a..92fe29a0ac 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index bb5083c925..da8e2cb386 100644 +index bb5083c925..77034f9bb6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -21,7 +21,7 @@ load(cmake_functions) @@ -48,7 +48,7 @@ index bb5083c925..da8e2cb386 100644 - # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} - CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" -} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ +CMAKE_LIB_DIR_IS_ABSOLUTE = True -CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) @@ -77,7 +77,7 @@ index bb5083c925..da8e2cb386 100644 - CMAKE_DLL_DIR = $$CMAKE_LIB_DIR - CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE -} -+CMAKE_DLL_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ +CMAKE_DLL_DIR_IS_ABSOLUTE = True static|staticlib:CMAKE_STATIC_TYPE = true @@ -101,7 +101,7 @@ index bb5083c925..da8e2cb386 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 17da8b979e..d648ab4058 100644 +index 55c74aad66..0bbc8718eb 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) @@ -261,10 +261,10 @@ index 17da8b979e..d648ab4058 100644 set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 395ac34001..a0e5c68b7e 100644 +index e645ba5803..a0e5c68b7e 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -24,165 +24,3 @@ qt { +@@ -24,166 +24,3 @@ qt { } } } @@ -427,14 +427,15 @@ index 395ac34001..a0e5c68b7e 100644 -} - -cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --cache(QMAKE_XCODE_VERSION, stash) +-!isEmpty(QMAKE_XCODE_VERSION): \ +- cache(QMAKE_XCODE_VERSION, stash) - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e21e749ee9..3b01424e67 100644 +index 44636f2288..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,51 +1,2 @@ +@@ -1,56 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) - @@ -447,18 +448,23 @@ index e21e749ee9..3b01424e67 100644 - # Make sure Xcode path is valid - !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") +-} +- +-isEmpty(QMAKE_XCODEBUILD_PATH): \ +- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") - +-!isEmpty(QMAKE_XCODEBUILD_PATH) { - # Make sure Xcode is set up properly -- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ -- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") --} +- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ +- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") - --isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) +- isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +- } -} - -isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { @@ -487,10 +493,10 @@ index e21e749ee9..3b01424e67 100644 -# at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 68ab7e4053..e69de29bb2 100644 +index 3f6dc076ca..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf -@@ -1,49 +0,0 @@ +@@ -1,58 +0,0 @@ - -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") @@ -500,13 +506,22 @@ index 68ab7e4053..e69de29bb2 100644 - -defineReplace(xcodeSDKInfo) { - info = $$1 +- equals(info, "Path"): \ +- info = --show-sdk-path +- equals(info, "PlatformPath"): \ +- info = --show-sdk-platform-path +- equals(info, "SDKVersion"): \ +- info = --show-sdk-version - sdk = $$2 - isEmpty(sdk): \ - sdk = $$QMAKE_MAC_SDK - - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null") -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'") +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") +- # --show-sdk-platform-path won't work for Command Line Tools; this is fine +- # only used by the XCTest backend to testlib +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ +- error("Could not resolve SDK $$info for \'$$sdk\'") - cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) - } - @@ -581,10 +596,10 @@ index d49f4c49c1..097dcd7d39 100644 target.path = $$instbase/$$TARGETPATH INSTALLS += target diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index cb84ae0da8..45e16f4302 100644 +index 883f8ca215..81db8eb2d4 100644 --- a/mkspecs/features/qt_app.prf +++ b/mkspecs/features/qt_app.prf -@@ -29,7 +29,7 @@ host_build:force_bootstrap { +@@ -33,7 +33,7 @@ host_build:force_bootstrap { target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -607,7 +622,7 @@ index 1848f00e90..2af93675c5 100644 + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 1e138730b3..b7ba74dc3f 100644 +index fb96d1b6a0..508ed17d30 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { @@ -661,20 +676,20 @@ index 72dde61a40..f891a2baed 100644 INSTALLS += inst_qch_docs diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 0a008374e5..5e7cd92f6f 100644 +index 668669e4cd..eb4840a0aa 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -73,7 +73,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ - $$DBUS_ADAPTORS $$DBUS_INTERFACES - addInstallFiles(sources.files, $$sourcefiles) -- sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase -+ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase - INSTALLS += sources - - check_examples { +@@ -82,7 +82,7 @@ sourcefiles += \ + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + addInstallFiles(sources.files, $$sourcefiles) +-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase ++sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase + INSTALLS += sources + + check_examples { diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index c00fdb73f8..5789cd0c06 100644 +index 1903e509c8..ae7b585989 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -836,7 +851,7 @@ index 706304cf34..546420f6ad 100644 set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 39e7c71a9c..dced1f2811 100644 +index cba279c184..5ae3fd62e5 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPaths() @@ -856,7 +871,7 @@ index 39e7c71a9c..dced1f2811 100644 if (!libPathEnv.isEmpty()) { QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index 1714c9802f..fd2ebb1336 100644 +index 4fdc2e36ac..d3ec222543 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; @@ -872,7 +887,7 @@ index 1714c9802f..fd2ebb1336 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -643,12 +647,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -645,12 +649,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -925,7 +940,7 @@ index 1d947159e2..b36865fc48 100644 set_target_properties(Qt5::qdbusxml2cpp PROPERTIES diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..37b95d1b6b 100644 +index 07869efd7d..fb4183bada 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -2,7 +2,7 @@ @@ -949,7 +964,7 @@ index 07869efd7d..37b95d1b6b 100644 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF @@ -967,7 +982,7 @@ index 1da00813ce..0bf877afcb 100644 return false; } diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index cf08a15f96..2310488298 100644 +index 9a24938284..74962b4ae2 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -102,7 +102,7 @@ static bool resolveLibraryInternal() @@ -1001,30 +1016,8 @@ index c92d8fc3f8..6008063bcf 100644 { // specific curves requested, but not possible to set -> error sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); -diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm -index 341d3bccf2..3368234c26 100644 ---- a/src/plugins/bearer/corewlan/qcorewlanengine.mm -+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm -@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() - QMacAutoReleasePool pool; - userProfiles.clear(); - -- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; -+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; - for (NSString *ifName in wifiInterfaces) { - - CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; -@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() - - QMacAutoReleasePool pool; - -- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; -+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; - for (NSString *ifName in wifiInterfaces) { - scanThread->interfaceName = QString::fromNSString(ifName); - scanThread->start(); diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index ca9f7af127..a337ad73bf 100644 +index b5a0a5bbeb..6c20305f4d 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() @@ -1041,21 +1034,8 @@ index ca9f7af127..a337ad73bf 100644 } QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm -index 59b76370ae..b91139ded9 100644 ---- a/src/plugins/platforms/cocoa/qcocoawindow.mm -+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm -@@ -320,7 +320,7 @@ static void qt_closePopups() - + (void)applicationActivationChanged:(NSNotification*)notification - { - const id sender = self; -- NSEnumerator *windowEnumerator = nullptr; -+ NSEnumerator *windowEnumerator = nullptr; - NSApplication *application = [NSApplication sharedApplication]; - - #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index 7640a711a9..ef9a14d38b 100644 +index e2e573f0e1..1c8289f81e 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) @@ -1074,11 +1054,11 @@ index 7640a711a9..ef9a14d38b 100644 #endif } diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index d257ab1242..75853af4e4 100644 +index 7c62c2e2b3..fefa40e0f6 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp @@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #if defined(XCB_USE_XLIB) && QT_CONFIG(library) + #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { - QLibrary xcursorLib(QLatin1String("Xcursor"), 1); @@ -1126,6 +1106,26 @@ index c4cd66c33b..b6f2691587 100644 return 0; } +diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index 6498ea84ef..d821ced7fc 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h +@@ -44,10 +44,13 @@ + + QT_BEGIN_NAMESPACE + +- ++#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) ++#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) ++#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) ++#else + #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) +- + #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) ++#endif + + QT_END_NAMESPACE + diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in index 99d87e2e46..a4eab2aa72 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix index 247800b7578004d1859e69f9949c7d7593cd350a..df7846ca3866476c03cabe96f501472b8764ef50 100644 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix @@ -3,275 +3,275 @@ { qt3d = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz"; - sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg"; - name = "qt3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz"; + sha256 = "0gr7wvd3p8i2frj9nkfxffxapwqx6i4wh171ymvcsg2qy0r534lp"; + name = "qt3d-opensource-src-5.9.3.tar.xz"; }; }; qtactiveqt = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz"; - sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg"; - name = "qtactiveqt-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtactiveqt-opensource-src-5.9.3.tar.xz"; + sha256 = "16aka3y7a6mhs0yfm7vbq8v5gbh2ifmk4v2hl04iacindq9f5v2r"; + name = "qtactiveqt-opensource-src-5.9.3.tar.xz"; }; }; qtandroidextras = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz"; - sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj"; - name = "qtandroidextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtandroidextras-opensource-src-5.9.3.tar.xz"; + sha256 = "0f653qmzvr3rjjgipjbcxvp5wq9fbaz1b4bvj7g868s2d9gpqp9n"; + name = "qtandroidextras-opensource-src-5.9.3.tar.xz"; }; }; qtbase = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz"; - sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw"; - name = "qtbase-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz"; + sha256 = "10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y"; + name = "qtbase-opensource-src-5.9.3.tar.xz"; }; }; qtcanvas3d = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz"; - sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb"; - name = "qtcanvas3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcanvas3d-opensource-src-5.9.3.tar.xz"; + sha256 = "1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y"; + name = "qtcanvas3d-opensource-src-5.9.3.tar.xz"; }; }; qtcharts = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz"; - sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k"; - name = "qtcharts-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz"; + sha256 = "1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc"; + name = "qtcharts-opensource-src-5.9.3.tar.xz"; }; }; qtconnectivity = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz"; - sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0"; - name = "qtconnectivity-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz"; + sha256 = "0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2"; + name = "qtconnectivity-opensource-src-5.9.3.tar.xz"; }; }; qtdatavis3d = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz"; - sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13"; - name = "qtdatavis3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz"; + sha256 = "0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh"; + name = "qtdatavis3d-opensource-src-5.9.3.tar.xz"; }; }; qtdeclarative = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz"; - sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj"; - name = "qtdeclarative-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz"; + sha256 = "01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh"; + name = "qtdeclarative-opensource-src-5.9.3.tar.xz"; }; }; qtdoc = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz"; - sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x"; - name = "qtdoc-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdoc-opensource-src-5.9.3.tar.xz"; + sha256 = "0aki592arm3r08y9cq8863jp9zzkvgx7sc48426n30m6q9valsg5"; + name = "qtdoc-opensource-src-5.9.3.tar.xz"; }; }; qtgamepad = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz"; - sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi"; - name = "qtgamepad-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgamepad-opensource-src-5.9.3.tar.xz"; + sha256 = "14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6"; + name = "qtgamepad-opensource-src-5.9.3.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; - sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz"; - name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz"; + sha256 = "1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr"; + name = "qtgraphicaleffects-opensource-src-5.9.3.tar.xz"; }; }; qtimageformats = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz"; - sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr"; - name = "qtimageformats-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz"; + sha256 = "1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl"; + name = "qtimageformats-opensource-src-5.9.3.tar.xz"; }; }; qtlocation = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz"; - sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b"; - name = "qtlocation-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz"; + sha256 = "1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0"; + name = "qtlocation-opensource-src-5.9.3.tar.xz"; }; }; qtmacextras = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz"; - sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11"; - name = "qtmacextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmacextras-opensource-src-5.9.3.tar.xz"; + sha256 = "0piv3q49vhpjxafdicizcw13am49h0ybfhb37vai0x1wbrlvhdiy"; + name = "qtmacextras-opensource-src-5.9.3.tar.xz"; }; }; qtmultimedia = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz"; - sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4"; - name = "qtmultimedia-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz"; + sha256 = "19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7"; + name = "qtmultimedia-opensource-src-5.9.3.tar.xz"; }; }; qtnetworkauth = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz"; - sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra"; - name = "qtnetworkauth-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz"; + sha256 = "0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz"; + name = "qtnetworkauth-opensource-src-5.9.3.tar.xz"; }; }; qtpurchasing = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz"; - sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss"; - name = "qtpurchasing-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtpurchasing-opensource-src-5.9.3.tar.xz"; + sha256 = "00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j"; + name = "qtpurchasing-opensource-src-5.9.3.tar.xz"; }; }; qtquickcontrols = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz"; - sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj"; - name = "qtquickcontrols-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz"; + sha256 = "09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih"; + name = "qtquickcontrols-opensource-src-5.9.3.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz"; - sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0"; - name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz"; + sha256 = "0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1"; + name = "qtquickcontrols2-opensource-src-5.9.3.tar.xz"; }; }; qtremoteobjects = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz"; - sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0"; - name = "qtremoteobjects-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtremoteobjects-opensource-src-5.9.3.tar.xz"; + sha256 = "0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk"; + name = "qtremoteobjects-opensource-src-5.9.3.tar.xz"; }; }; qtscript = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz"; - sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp"; - name = "qtscript-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz"; + sha256 = "0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq"; + name = "qtscript-opensource-src-5.9.3.tar.xz"; }; }; qtscxml = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz"; - sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0"; - name = "qtscxml-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz"; + sha256 = "06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq"; + name = "qtscxml-opensource-src-5.9.3.tar.xz"; }; }; qtsensors = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz"; - sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was"; - name = "qtsensors-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz"; + sha256 = "1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr"; + name = "qtsensors-opensource-src-5.9.3.tar.xz"; }; }; qtserialbus = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz"; - sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa"; - name = "qtserialbus-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz"; + sha256 = "0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg"; + name = "qtserialbus-opensource-src-5.9.3.tar.xz"; }; }; qtserialport = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz"; - sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1"; - name = "qtserialport-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz"; + sha256 = "1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac"; + name = "qtserialport-opensource-src-5.9.3.tar.xz"; }; }; qtspeech = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz"; - sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c"; - name = "qtspeech-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz"; + sha256 = "1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1"; + name = "qtspeech-opensource-src-5.9.3.tar.xz"; }; }; qtsvg = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz"; - sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr"; - name = "qtsvg-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz"; + sha256 = "1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz"; + name = "qtsvg-opensource-src-5.9.3.tar.xz"; }; }; qttools = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz"; - sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4"; - name = "qttools-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz"; + sha256 = "1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24"; + name = "qttools-opensource-src-5.9.3.tar.xz"; }; }; qttranslations = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz"; - sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja"; - name = "qttranslations-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz"; + sha256 = "1ncvj1qlcgrm0zqdlq2bkb0hc8dyisz8m7bszxyx4kyxg7n5gb20"; + name = "qttranslations-opensource-src-5.9.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; - sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b"; - name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz"; + sha256 = "1zrj4pjy98dskzycjswbkm4m2j6k1j4150h0w7vdrw1681s3ycdr"; + name = "qtvirtualkeyboard-opensource-src-5.9.3.tar.xz"; }; }; qtwayland = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz"; - sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g"; - name = "qtwayland-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz"; + sha256 = "0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih"; + name = "qtwayland-opensource-src-5.9.3.tar.xz"; }; }; qtwebchannel = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz"; - sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0"; - name = "qtwebchannel-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz"; + sha256 = "0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3"; + name = "qtwebchannel-opensource-src-5.9.3.tar.xz"; }; }; qtwebengine = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz"; - sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn"; - name = "qtwebengine-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz"; + sha256 = "0dqxawc9vfffz6ygdn5mdpl79rrqfx18jy2d1w81q9w7zm113bj5"; + name = "qtwebengine-opensource-src-5.9.3.tar.xz"; }; }; qtwebkit = { @@ -291,43 +291,43 @@ }; }; qtwebsockets = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz"; - sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1"; - name = "qtwebsockets-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz"; + sha256 = "1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf"; + name = "qtwebsockets-opensource-src-5.9.3.tar.xz"; }; }; qtwebview = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz"; - sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn"; - name = "qtwebview-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz"; + sha256 = "1i99fy86gydpfsfc4my5d9vxjywfrzbqxk66cb3yf2ac57j66mpf"; + name = "qtwebview-opensource-src-5.9.3.tar.xz"; }; }; qtwinextras = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz"; - sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s"; - name = "qtwinextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwinextras-opensource-src-5.9.3.tar.xz"; + sha256 = "1lj4qa51ymhpvk0bdp6xf6b3n1k39kihns5lvp6xq1w2mljn6phl"; + name = "qtwinextras-opensource-src-5.9.3.tar.xz"; }; }; qtx11extras = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz"; - sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6"; - name = "qtx11extras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz"; + sha256 = "1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74"; + name = "qtx11extras-opensource-src-5.9.3.tar.xz"; }; }; qtxmlpatterns = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz"; - sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m"; - name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz"; + sha256 = "1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g"; + name = "qtxmlpatterns-opensource-src-5.9.3.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh b/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh index 916981b5299f69644824a7c273d2ea03ef6e6ef5..33682f6f3c6957791b92bae2a3139bdb9600d153 100644 --- a/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh +++ b/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh @@ -15,8 +15,8 @@ fixQtModulePaths () { if grep -q '\$\$QT_MODULE_' "${pr:?}"; then echo "fixQtModulePaths: Fixing module paths in \`${pr:?}'..." sed -i "${pr:?}" \ - -e "s|\\\$\\\$QT_MODULE_LIB_BASE|$dev/lib|g" \ - -e "s|\\\$\\\$QT_MODULE_HOST_LIB_BASE|$dev/lib|g" \ + -e "s|\\\$\\\$QT_MODULE_LIB_BASE|$lib/lib|g" \ + -e "s|\\\$\\\$QT_MODULE_HOST_LIB_BASE|$lib/lib|g" \ -e "s|\\\$\\\$QT_MODULE_INCLUDE_BASE|$dev/include|g" \ -e "s|\\\$\\\$QT_MODULE_BIN_BASE|$dev/bin|g" fi @@ -27,13 +27,6 @@ fixQtModulePaths () { echo "fixQtModulePaths: Warning: \`$dir' does not exist" fi - if [ "z$dev" != "z$lib" ]; then - if [ -d "$lib/lib" ]; then - mkdir -p "$dev/lib" - lndir -silent "$lib/lib" "$dev/lib" - fi - fi - if [ "z$bin" != "z$dev" ]; then if [ -d "$bin/bin" ]; then mkdir -p "$dev/bin" diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qt-static-libs.sh b/pkgs/development/libraries/qt-5/hooks/fix-qt-static-libs.sh deleted file mode 100644 index 2a20e77e7ba776e35f40384eaa15b9f55a3374c1..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/qt-5/hooks/fix-qt-static-libs.sh +++ /dev/null @@ -1,32 +0,0 @@ -# fixQtStaticLibs -# -# Usage: fixQtStaticLibs _lib_ _dev_ -# -# Find static Qt libraries in output _lib_ and move them to the corresponding -# path in output _dev_. Any QMake library definitions (*.prl files) are also -# moved and library paths are patched. -# -fixQtStaticLibs() { - local lib="$1" - local dev="$2" - - pushd "$lib" - if [ -d "lib" ]; then - find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \ - while read -r -d $'\0' file; do - mkdir -p "$dev/$(dirname "$file")" - mv "$lib/$file" "$dev/$file" - done - fi - popd - - if [ -d "$dev" ]; then - find "$dev" -name '*.prl' | while read prl; do - echo "fixQtStaticLibs: Fixing built-in paths in \`$prl'..." - sed -i "$prl" \ - -e '/^QMAKE_PRL_BUILD_DIR =/d' \ - -e '/^QMAKE_PRO_INPUT =/d' \ - -e "s|-L\\\$\\\$NIX_OUTPUT_OUT/lib|-L$lib/lib -L$dev/lib|g" - done - fi -} diff --git a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index 17d3db65849e11bedf20d0f7a80b3ce7e757b361..eef2c7d24dfcf44b47cb579359a00095ca87ef91 100644 --- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -10,6 +10,11 @@ qmakeConfigurePhase() { NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?} \ $qmakeFlags + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "qmake: enabled parallel building" + fi + runHook postConfigure } diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 258b2d09f20b5dc774431627b19930c1eaad7c17..3a558153988c31b9927c989d0c03c71a84cc8c96 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -4,7 +4,6 @@ qtDocPrefix=@qtDocPrefix@ . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ -. @fix_qt_static_libs@ providesQtRuntime() { [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ] @@ -33,29 +32,16 @@ addToQMAKEPATH() { # 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() { - addToQMAKEPATH "$1" - if providesQtRuntime "$1"; then - if [ "z${!outputBin}" != "z${!outputDev}" ]; then - propagatedBuildInputs+=" $1" - fi - propagatedUserEnvPkgs+=" $1" - fi -} -crossEnvHooks+=(qtCrossEnvHook) - qtEnvHook() { addToQMAKEPATH "$1" if providesQtRuntime "$1"; then if [ "z${!outputBin}" != "z${!outputDev}" ]; then - propagatedNativeBuildInputs+=" $1" + propagatedBuildInputs+=" $1" fi - if [ -z "$crossConfig" ]; then propagatedUserEnvPkgs+=" $1" - fi fi } -envHooks+=(qtEnvHook) +envHostTargetHooks+=(qtEnvHook) postPatchMkspecs() { local bin="${!outputBin}" @@ -76,12 +62,3 @@ postPatchMkspecs() { if [ -z "$dontPatchMkspecs" ]; then postPhases="${postPhases}${postPhases:+ }postPatchMkspecs" fi - -postMoveQtStaticLibs() { - if [ "z${!outputLib}" != "z${!outputDev}" ]; then - fixQtStaticLibs "${!outputLib}" "${!outputDev}" - fi -} -if [ -z "$dontMoveQtStaticLibs" ]; then - postPhases="${postPhases}${postPhases:+ }postMoveQtStaticLibs" -fi diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 385ebeacd8f8414b0e3690070eb4775b4af86b28..739c9b4a1608ed3c91bc1197b62968f0dcb91288 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -11,15 +11,18 @@ let qmakeFlags = (args.qmakeFlags or []) - ++ optional (debug != null) - (if debug then "CONFIG+=debug" else "CONFIG+=release"); + ++ [ ("CONFIG+=" + (if debug then "debug" else "release")) ]; + + NIX_CFLAGS_COMPILE = + optional (!debug) "-DQT_NO_DEBUG" + ++ lib.toList (args.NIX_CFLAGS_COMPILE or []); cmakeFlags = (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ optional (debug != null) - (if debug then "-DCMAKE_BUILD_TYPE=Debug" - else "-DCMAKE_BUILD_TYPE=Release"); + ++ [ + "-DBUILD_TESTING=OFF" + ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release")) + ]; enableParallelBuilding = args.enableParallelBuilding or true; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 36238b5faddfe52e218f4f6c7bd1ac6e8d4dafc3..8887e05704d293456812b5b6a04e2475ecfe6ff1 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -3,14 +3,14 @@ src, patches, version, qtCompatVersion, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, + ruby, which, # darwin support darwin, libiconv, libcxx, dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, - xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs, + xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xorg, zlib, # optional dependencies @@ -18,8 +18,8 @@ withGtk3 ? false, dconf ? null, gtk3 ? null, # options - mesaSupported ? (!stdenv.isDarwin), - mesa, + libGLSupported ? (!stdenv.isDarwin), + libGL, buildExamples ? false, buildTests ? false, developerBuild ? false, @@ -30,7 +30,6 @@ assert withGtk3 -> dconf != null; assert withGtk3 -> gtk3 != null; let - system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; compareVersion = v: builtins.compareVersions version v; in @@ -69,7 +68,7 @@ stdenv.mkDerivation { libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm ] - ++ lib.optional mesaSupported mesa + ++ lib.optional libGLSupported libGL ); buildInputs = @@ -80,11 +79,11 @@ stdenv.mkDerivation { ) ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.lib + ++ lib.optional (mysql != null) mysql.connector-c ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig python2 ] + [ bison flex gperf lndir perl pkgconfig python2 which ] ++ lib.optional (!stdenv.isDarwin) patchelf; propagatedNativeBuildInputs = [ lndir ]; @@ -93,11 +92,9 @@ stdenv.mkDerivation { inherit patches; - fix_qt_static_libs = ../hooks/fix-qt-static-libs.sh; fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; fix_qt_module_paths = ../hooks/fix-qt-module-paths.sh; preHook = '' - . "$fix_qt_static_libs" . "$fix_qt_builtin_paths" . "$fix_qt_module_paths" . ${../hooks/move-qt-dev-tools.sh} @@ -144,11 +141,11 @@ stdenv.mkDerivation { # Note on the above: \x27 is a way if including a single-quote # character in the sed string arguments. else - lib.optionalString mesaSupported + lib.optionalString libGLSupported '' sed -i mkspecs/common/linux.conf \ - -e "/^QMAKE_INCDIR_OPENGL/ s|$|${mesa.dev or mesa}/include|" \ - -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${mesa.out}/lib|" + -e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \ + -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|" '' ); @@ -210,7 +207,7 @@ stdenv.mkDerivation { # 10.10 ] else - lib.optional mesaSupported ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"'' + lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' @@ -260,7 +257,7 @@ stdenv.mkDerivation { "-no-warnings-are-errors" ] ++ ( - if (!system-x86_64) + if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" ] else lib.optional (compareVersion "5.9.0" >= 0) [ "-sse2" ] ) @@ -363,11 +360,6 @@ stdenv.mkDerivation { fixQtBuiltinPaths "''${!outputDev}" '*.pr?' '' - # Move static libraries and QMake library definitions into $dev. - + '' - fixQtStaticLibs "''${!outputLib}" "''${!outputDev}" - '' - # Move development tools to $dev + '' moveQtDevTools diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index 008583ebaf9362e0d4d0e4c5e2eaa4c4b3d6fd12..e8952e29cbaf0156008cce73ab6cb435ec05e8a3 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -1,4 +1,4 @@ -{ qtModule, qtbase, qtmultimedia }: +{ stdenv, qtModule, qtbase, qtmultimedia }: qtModule { name = "qtlocation"; @@ -6,4 +6,11 @@ qtModule { outputs = [ "bin" "out" "dev" ]; # Linking with -lclipper fails with parallel build enabled enableParallelBuilding = false; + qmakeFlags = stdenv.lib.optional stdenv.isDarwin [ + # boost uses std::auto_ptr which has been disabled in clang with libcxx + # This flag re-enables this feature + # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros + "QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" + ]; + } diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/pkgs/development/libraries/qt-5/modules/qtspeech.nix new file mode 100644 index 0000000000000000000000000000000000000000..7b4b19ccab5ace596cf0ab82092faeebe437ccc7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -0,0 +1,7 @@ +{ qtModule }: + +qtModule { + name = "qtspeech"; + qtInputs = [ ]; + outputs = [ "out" "dev" "bin" ]; +} diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index ae6bd18cb148e1557227e6a991c6bf3a49f5aa4d..622d841b4051a4968e91e0cfcfdeff2cb480fdba 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -1,4 +1,4 @@ -{ qtModule, lib, qtbase }: +{ qtModule, stdenv, lib, qtbase }: with lib; @@ -28,6 +28,8 @@ qtModule { "bin/qhelpgenerator" "bin/qtplugininfo" "bin/qthelpconverter" + ] ++ optionals stdenv.isDarwin [ + "bin/macdeployqt" ]; setupHook = ../hooks/qttools-setup-hook.sh; diff --git a/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix new file mode 100644 index 0000000000000000000000000000000000000000..2ba720c8eedc78bf2ff9654737964d26f2e30358 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix @@ -0,0 +1,6 @@ +{ qtModule, qtbase, qtdeclarative, qtsvg, hunspell }: + +qtModule { + name = "qtvirtualkeyboard"; + qtInputs = [ qtbase qtdeclarative qtsvg hunspell ]; +} diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 4be72b087842ee2ffea4c39900ff4347eea30a1b..08345510d787c44b5feeeaadaff0e6b74a359ec4 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -3,8 +3,8 @@ , bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which -, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst -, fontconfig, freetype, harfbuzz, icu, dbus +, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst +, fontconfig, freetype, harfbuzz, icu, dbus, libdrm , zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus , jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent , alsaLib @@ -63,8 +63,9 @@ qtModule { src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc ''; + preConfigure = '' - export MAKEFLAGS=-j$NIX_BUILD_CORES + export NINJAFLAGS=-j$NIX_BUILD_CORES if [ -d "$PWD/tools/qmake" ]; then QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" @@ -103,8 +104,8 @@ qtModule { pciutils # X11 libs - xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst - xlibs.libXcomposite + xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst + xorg.libXcomposite xorg.libXdamage libdrm ]; dontUseNinjaBuild = true; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 4dce9c4e22e5e085c3636ac2412cd046c8bb0901..6834b7ce87b6355c52045642ccc6002a74815311 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -31,7 +31,8 @@ qtModule { ''; NIX_CFLAGS_COMPILE = - optionals flashplayerFix + [ "-Wno-expansion-to-defined" ] # with gcc7 this warning blows the log over Hydra's limit + ++ optionals flashplayerFix [ ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' ''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"'' diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index 728761689b4240288226357f65ea7dc854eabe19..49585f601d146d6859531d0192e0c8daf445e0f0 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -13,9 +13,9 @@ buildEnv { cat >"$out/bin/qt.conf" < qtbase != null; assert withQt5 -> qttools != null; +assert stdenv.isDarwin -> darwin != null; stdenv.mkDerivation rec { name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; - version = "0.7.0"; + version = "0.8.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = "v${version}"; - sha256 = "04v6ymkw7qd1pf9lwijgqrl89w2hhsnqgz7dm4cdrh8i8dffpn52"; + sha256 = "1r6qp9l2lp5jpc6ciklbg1swvvzcpc37rg9py46hk0wxy6klnm0b"; # v0.8.0 }; - cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; + cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ] + ++ stdenv.lib.optional stdenv.isDarwin [ + # correctly detect the compiler + # for details see cmake --help-policy CMP0025 + "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" + ] + ; nativeBuildInputs = [ cmake ]; - buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ]; + buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ] + ++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation Security + ]) + ; meta = { description = "Platform-independent Qt API for storing passwords securely"; homepage = https://github.com/frankosterfeld/qtkeychain; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch index 0b02b00972526deea961e5dbde9b936eaf2a7464..8fe643e2c98f86a800b68cff475d8c6c11118fb9 100644 --- a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch +++ b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch @@ -1,4 +1,4 @@ -Origin: http://pkgs.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD +Origin: http://src.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml --- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 +++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2f0e39eb5c90c094ec331fe644d954c8b3b5df48 --- /dev/null +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }: + +stdenv.mkDerivation rec { + name = "qtstyleplugin-kvantum-qt4-${version}"; + version = "0.10.4"; + + src = fetchFromGitHub { + owner = "tsujan"; + repo = "Kvantum"; + rev = "0527bb03f2252269fd382e11181a34ca72c96b4b"; + sha256 = "0ky44s1fgqxraywagx1mv07yz76ppgiz3prq447db78wkwqg2d8p"; + }; + + nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt4 libX11 libXext ]; + + postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; + + buildPhase = '' + qmake kvantum.pro + make + ''; + + installPhase = '' + mkdir $TMP/kvantum + make INSTALL_ROOT="$TMP/kvantum" install + mv $TMP/kvantum/usr/ $out + mv $TMP/kvantum/${qt4}/lib $out + ''; + + meta = with stdenv.lib; { + description = "SVG-based Qt4 theme engine"; + homepage = "https://github.com/tsujan/Kvantum"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bugworm ]; + }; +} diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8667f272cf7d6b58b48de5d6748434e8defbdc9f --- /dev/null +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, libX11, libXext, qttools }: + +stdenv.mkDerivation rec { + name = "qtstyleplugin-kvantum-${version}"; + version = "0.10.6"; + + src = fetchFromGitHub { + owner = "tsujan"; + repo = "Kvantum"; + rev = "a6daa1a6df3c5d4abc7ea39ef7028ddea2addbf6"; + sha256 = "1zns4x95h0ydiwx8yw0bmyg4lc2sy7annmdrg66sx753x3177zxp"; + }; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase qtsvg qtx11extras libX11 libXext ]; + + postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; + + postPatch = '' + # Fix plugin dir + substituteInPlace style/style.pro \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + ''; + + meta = with stdenv.lib; { + description = "SVG-based Qt5 theme engine plus a config tool and extra themes"; + homepage = "https://github.com/tsujan/Kvantum"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bugworm ]; + }; +} diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 4379f5cf667b902d09c2fdc652885bd615826a2f..8d096e18f08fc364b863b9ecfa9bc87abd434b97 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, zip, zlib, qtbase, qmake }: stdenv.mkDerivation rec { - name = "quazip-0.7.1"; + name = "quazip-0.7.3"; src = fetchurl { url = "mirror://sourceforge/quazip/${name}.tar.gz"; - sha256 = "1pijy6zn8kdx9m6wrckid24vkgp250hklbpmgrpixiam6l889jbq"; + sha256 = "1db9w8ax1ki0p67a47h4cnbwfgi2di4y3k9nc3a610kffiag7m1a"; }; preConfigure = "cd quazip"; diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 33e8d49454c1ea94e84d22dfcb051bea4624d52f..84be9876c1cb5be691498a133379c570eba99a90 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, glew, freetype, fontconfig, fribidi, libX11 }: +{ stdenv, fetchurl, libGLU_combined, glew, freetype, fontconfig, fribidi, libX11 }: stdenv.mkDerivation rec { pname = "quesoglc"; version = "0.7.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl"; }; - buildInputs = [ mesa glew freetype fontconfig fribidi libX11 ]; + buildInputs = [ libGLU_combined glew freetype fontconfig fribidi libX11 ]; # FIXME: Configure fails to use system glew. meta = with stdenv.lib; { description = "A free implementation of the OpenGL Character Renderer"; diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 73bd9e863cde556635b839e9fd3b34367de2200f..77e76ad638abf981d794b87b70241179b706d5c8 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -1,32 +1,53 @@ -{ stdenv, fetchFromGitHub, fetchurl, hexio, python, which, asn2quickder, bash }: +{ stdenv, fetchFromGitHub, fetchurl, python2Packages, hexio +, which, cmake, bash, arpa2cm, git, asn2quickder, pkgconfig }: stdenv.mkDerivation rec { pname = "quickder"; name = "${pname}-${version}"; - version = "1.0-RC2"; + version = "1.2-6"; src = fetchFromGitHub { - sha256 = "1nzk8x6qzpvli8bf74dc2qya63nlppqjrnkaxvjxr2dbqb8qcrqd"; + sha256 = "00wifjydgmqw2i5vmr049visc3shjqccgzqynkmmhkjhs86ghzr6"; rev = "version-${version}"; owner = "vanrein"; repo = "quick-der"; }; - buildInputs = [ which asn2quickder bash ]; + buildInputs = with python2Packages; [ + arpa2cm + asn1ate + bash + cmake + git + hexio + pyparsing + python + six + which + asn1ate + asn2quickder + pkgconfig + ]; - patchPhase = '' - substituteInPlace Makefile \ - --replace 'lib tool test rfc' 'lib test rfc' - substituteInPlace ./rfc/Makefile \ - --replace 'ASN2QUICKDER_CMD = ' 'ASN2QUICKDER_CMD = ${asn2quickder}/bin/asn2quickder #' - ''; + postPatch = '' + substituteInPlace ./CMakeLists.txt \ + --replace "get_version_from_git" "set (Quick-DER_VERSION 1.2) #" + substituteInPlace ./CMakeLists.txt \ + --replace \$\{ARPA2CM_TOOLCHAIN_DIR} "$out/share/ARPA2CM/toolchain/" + patchShebangs python/scripts/ + ''; - installFlags = "ASN2QUICKDER_DIR=${asn2quickder}/bin ASN2QUICKDER_CMD=${asn2quickder}/bin/asn2quickder"; - installPhase = '' - mkdir -p $out/lib $out/man - make DESTDIR=$out PREFIX=/ all - make DESTDIR=$out PREFIX=/ install - ''; + cmakeFlags = [ + "-DNO_TESTING=ON" + "-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/" + "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" + "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" + "-DPACKAGE_NO_PACKAGE_REGISTRY=ON" + ]; + + preConfigure = '' + export PREFIX=$out + ''; meta = with stdenv.lib; { description = "Quick (and Easy) DER, a Library for parsing ASN.1"; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 314ab0f9e611624ef70858edfa12e22ad257a687..6e0fa53aa828b5b43852dfc27adb6484b80620bf 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.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.unix; maintainers = [ maintainers.bjornfor ]; branch = "6"; }; diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix index 0315ae72709ee6a5180380d4e643ffbbb3eb4f88..79b182b33b224d74aef6d215707cce368c453670 100644 --- a/pkgs/development/libraries/qwt/6_qt4.nix +++ b/pkgs/development/libraries/qwt/6_qt4.nix @@ -1,20 +1,32 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { - name = "qwt-6.1.2"; + name = "qwt-6.1.3"; src = fetchurl { url = "mirror://sourceforge/qwt/${name}.tar.bz2"; - sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b"; + sha256 = "0cwp63s03dw351xavb3pzbjlqvx7kj88wv7v4a2b18m9f97d7v7k"; }; - buildInputs = [ qt4 ]; + buildInputs = [ + qt4 + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AGL ]; + nativeBuildInputs = [ qmake4Hook ]; + enableParallelBuilding = true; + postPatch = '' sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri ''; + # qwt.framework output includes a relative reference to itself, which breaks dependents + preFixup = + stdenv.lib.optionalString stdenv.isDarwin '' + echo "Attempting to repair qwt" + install_name_tool -id "$out/lib/qwt.framework/Versions/6/qwt" "$out/lib/qwt.framework/Versions/6/qwt" + ''; + qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index da5769e92cd198e21b90933678ca02745ae71739..f900de5e578b42834ea439dea810069accc92d66 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -25,7 +25,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.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 0ab9cd1df0413999afdfea42a6fd8c03fd4debab..c841d82ccce086a88c6b5aefa0ca650812608e80 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rabbitmq-c-${version}"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "alanxz"; repo = "rabbitmq-c"; rev = "v${version}"; - sha256 = "084zlir59zc505nxd4m2g9d355m9a8y94gbjaqmjz9kym8lpayd1"; + sha256 = "0vjh1q3hyzrq1iiddy28vvwpwwn4px00mjc2hqp4zgfpis2xlqbj"; }; buildInputs = [ cmake openssl popt xmlto ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "RabbitMQ C AMQP client library"; homepage = https://github.com/alanxz/rabbitmq-c; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index f1d9026b5f9227ff91d2ca504bdc2f49122791d4..bddda1dff552a4db5385ef894de40d6796f1576f 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "range-v3-${version}"; - version = "2017-01-30"; + version = "0.3.5"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; - rev = "bab29767cce120e11872d79a2537bc6f0be76963"; - sha256 = "0kncpxms3f0nmn6jppp484244xq15d9298g3h3nlm1wvq8ib1jhi"; + rev = version; + sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp"; }; - dontBuild = true; - installPhase = '' - mkdir -p $out/include - mv include/ $out/ - ''; + nativeBuildInputs = [ cmake ]; + + doCheck = true; + checkTarget = "test"; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Experimental range library for C++11/14/17"; diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 5e9a11d42512c7034e43511b245517bac418a4dd..a1671aa3e0f929cf82df0131bfc2a0672548e406 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -13,11 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "-Werror" "" + substituteInPlace example/CMakeLists.txt --replace "-Werror" "" + ''; + meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; homepage = "http://rapidjson.org/"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index ff017279dc64a25dd50f6fb1182adaa1f804d9b5..a1af43748430eb6ea121e1500fa24a024b3fab08 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python }: +{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }: stdenv.mkDerivation rec { name = "rdkafka-${version}"; - version = "0.9.5"; + version = "0.11.4"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "0yp8vmj3yc564hcmhx46ssyn8qayywnsrg4wg67qk6jw967qgwsn"; + sha256 = "11ps8sy4v8yvj4sha7d1q3rmhfw7l1rd52rnl01xam9862yasahs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib perl python ]; + buildInputs = [ zlib perl python openssl ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--disable-ssl" ]; - postPatch = '' patchShebangs . ''; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 1183f46b8db7540964514a3d3150fdb7b813c473..75c25e12d667bebfaa0ec8fce24b5d57c6594288 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; + configureFlags = + stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + [ # This test requires running host code + "bash_cv_wcwidth_broken=no" + ]; + patches = [ ./link-against-ncurses.patch ./no-arch_only-6.3.patch diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index cabd89dc935050e9337647fa7a21db2cd7d12d7a..7faee7e69a2ebf30bda262f0cbbb8ee314d84eea 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, geos, libspatialite }: stdenv.mkDerivation rec { - name = "readosm-1.0.0b"; + name = "readosm-1.1.0"; src = fetchurl { url = "http://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; - sha256 = "042pv31smc7l6y111rvp0hza5sw86wa8ldg2jyq78xgwzcbhszpd"; + sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; }; buildInputs = [ expat zlib geos libspatialite ]; diff --git a/pkgs/development/libraries/rep-gtk/setup-hook.sh b/pkgs/development/libraries/rep-gtk/setup-hook.sh index 420d63d6c5132977e2bb459f0c5718a79774fd03..4d875b6933040468701076842681740110099152 100644 --- a/pkgs/development/libraries/rep-gtk/setup-hook.sh +++ b/pkgs/development/libraries/rep-gtk/setup-hook.sh @@ -2,4 +2,4 @@ addRepDLLoadPath () { addToSearchPath REP_DL_LOAD_PATH $1/lib/rep } -envHooks+=(addRepDLLoadPath) +addEnvHooks "$hostOffset" addRepDLLoadPath diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 4ec06d68a329ffd68152e0e94c04e03a72d1ee66..fff1d6498361dd1bf8789ca52775bcaac8f36079 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "resolv_wrapper-1.1.3"; + name = "resolv_wrapper-1.1.5"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1h76155pnmd3pqxfyi00q0fg6v45ad9dhnjsqcsbzg18s626wyad"; + sha256 = "0v5hw5ipq2rrpraf4ck4r9w9xihmgwzkpf5wgppz7gc52fmgv2g9"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index a791c8994856b47cad5016662f9a382130c11047..bb0faf76be69fa1109e8fcdaaf77e3ae4b84fb78 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames +{ stdenv +, fetchFromGitHub +, fixDarwinDylibNames +, which, perl # Optional Arguments , snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null @@ -12,18 +15,22 @@ let malloc = if jemalloc != null then jemalloc else gperftools; + tools = [ "sst_dump" "ldb" "rocksdb_dump" "rocksdb_undump" "blob_dump" ]; in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "5.1.2"; + version = "5.10.3"; + + outputs = [ "dev" "out" "static" "bin" ]; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${version}"; - sha256 = "1smahz67gcd86nkdqaml78lci89dza131mlj5472r4sxjdxsx277"; + sha256 = "19d8i8map8qz639mhflmxc0w9gp78fvkq1l46y5s6b5imwh0w7xq"; }; + nativeBuildInputs = [ which perl ]; buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ]; postPatch = '' @@ -37,18 +44,22 @@ 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"; + LIBNAME = "librocksdb${stdenv.lib.optionalString enableLite "_lite"}"; ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1"; - buildFlags = [ + buildAndInstallFlags = [ + "USE_RTTI=1" "DEBUG_LEVEL=0" + "DISABLE_WARNING_AS_ERROR=1" + ]; + + buildFlags = buildAndInstallFlags ++ [ "shared_lib" "static_lib" - ]; + ] ++ tools ; - installFlags = [ + installFlags = buildAndInstallFlags ++ [ "INSTALL_PATH=\${out}" - "DEBUG_LEVEL=0" "install-shared" "install-static" ]; @@ -57,6 +68,11 @@ stdenv.mkDerivation rec { # Might eventually remove this when we are confident in the build process echo "BUILD CONFIGURATION FOR SANITY CHECKING" cat make_config.mk + mkdir -pv $static/lib/ + mv -vi $out/lib/${LIBNAME}.a $static/lib/ + + install -d ''${!outputBin}/bin + install -D ${stdenv.lib.concatStringsSep " " tools} ''${!outputBin}/bin ''; enableParallelBuilding = true; @@ -65,7 +81,7 @@ stdenv.mkDerivation rec { homepage = http://rocksdb.org; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; - platforms = platforms.allBut [ "i686-linux" ]; - maintainers = with maintainers; [ wkennington ]; + platforms = platforms.x86_64; + maintainers = with maintainers; [ adev wkennington ]; }; } diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix index 524afd7cf4d24c2ec5cad432f161731e9f716257..195db9a168585f2ec4cffef72b1921c833384b75 100644 --- a/pkgs/development/libraries/rote/default.nix +++ b/pkgs/development/libraries/rote/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { homepage = http://rote.sourceforge.net/; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index 5cef2576b711dc6af7b49149420c76185dff43bd..159bad4c68ea327418c1d96de6ff8b5835afc638 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, path }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "safefile"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = '' cd ${toString ./.} - ${toString } default.nix + ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix ''; }; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index 016cc6f0472fc735a0b0704d18d37fe517ac1571..ba0b8f4e996fafac6660af9b5021a8f5db3a2427 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -1,30 +1,28 @@ -{ fetchgit, stdenv, autoconf, automake, libtool, curl }: +{ stdenv, fetchFromGitHub, autoreconfHook, curl }: stdenv.mkDerivation rec { - version = "2.2.9"; name = "sblim-sfcc-${version}"; + version = "2.2.9"; # this is technically 2.2.9-preview - src = fetchgit { - url = "https://github.com/kkaempf/sblim-sfcc.git"; - rev = "f70fecb410a53531e4fe99d39cf81b581819cac9"; - sha256 = "1hsxim284qzldh599gf6khxj80g8q5263xl3lj3hdndxbhbs843v"; + src = fetchFromGitHub { + owner = "kkaempf"; + repo = "sblim-sfcc"; + rev = "514a76af2020fd6dc6fc380df76cbe27786a76a2"; + sha256 = "06c1mskl9ixbf26v88w0lvn6v2xd6n5f0jd5mckqrn9j4vmh70hs"; }; - preConfigure = "./autoconfiscate.sh"; + buildInputs = [ curl ]; - buildInputs = [ autoconf automake libtool curl ]; + nativeBuildInputs = [ autoreconfHook ]; - meta = { - description = "Small Footprint CIM Client Library"; - - homepage = https://sourceforge.net/projects/sblim/; - - maintainers = [ stdenv.lib.maintainers.deepfire ]; - - license = stdenv.lib.licenses.cpl10; - - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + enableParallelBuilding = true; + meta = with stdenv.lib; { + description = "Small Footprint CIM Client Library"; + homepage = https://sourceforge.net/projects/sblim/; + license = licenses.cpl10; + maintainers = with maintainers; [ deepfire ]; + platforms = platforms.unix; inherit version; }; } diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index d8e67baa13df335210165d8c9f9a8bed0fc358f6..2309719c2bdca09b07f6617f87890041b7b0f864 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = http://diracvideo.org/; maintainers = [ maintainers.spwhitt ]; license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..67f868a91a7bd3bff1e43388814e2c974d530588 --- /dev/null +++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, libminc }: + +stdenv.mkDerivation rec { + pname = "EBTKS"; + name = "${pname}-2017-09-23"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c"; + sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libminc ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; + + checkPhase = "ctest --output-on-failure"; # but cmake doesn't run the tests ... + + meta = with stdenv.lib; { + homepage = "https://github.com/BIC-MNI/${pname}"; + description = "Library for working with MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d00a74f61e20dfd25b11d9e062c1b417c93ac65e --- /dev/null +++ b/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, libminc, netpbm }: + +stdenv.mkDerivation rec { + pname = "bicpl"; + name = "${pname}-2017-09-10"; + + owner = "BIC-MNI"; + + # current master is significantly ahead of most recent release, so use Git version: + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = "612a63e740fadb162fcf27ee00da6a18dec4d5a9"; + sha256 = "1vv9gi184bkvp3f99v9xmmw1ly63ip5b09y7zdjn39g7kmwzrga7"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libminc netpbm ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBUILD_TESTING=FALSE" ]; + + checkPhase = "ctest --output-on-failure"; + doCheck = false; + # internal_volume_io.h: No such file or directory + + meta = with stdenv.lib; { + homepage = "https://github.com/${owner}/${pname}"; + description = "Brain Imaging Centre programming library"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 06550372ba8a79349f972fab9092721ac947cbc1..7b9e6b24d4186a4d7c4e04c77cc042204c1dd191 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, itk, python }: +{ stdenv, fetchurl, cmake, itk, python }: stdenv.mkDerivation rec { - _name = "elastix"; - _version = "4.8"; - name = "${_name}-${_version}"; + pname = "elastix"; + pversion = "4.9.0"; + name = "${pname}-${pversion}"; - src = fetchFromGitHub { - owner = "SuperElastix"; - repo = "elastix"; - rev = "ef057ff89233822b26b04b31c3c043af57d5deff"; - sha256 = "0gm3a8dgqww50h6zld9ighjk92wlpybpimjwfz4s5h82vdjsvxrm"; + src = fetchurl { + url = "https://github.com/SuperElastix/${pname}/archive/${pversion}.tar.gz"; + sha256 = "02pbln36nq98xxfyqwlxg7b6gmigdq4fgfqr9mym1qn58aj04shg"; }; nativeBuildInputs = [ cmake python ]; buildInputs = [ itk ]; - cmakeFlags = [ "-DUSE_KNNGraphAlphaMutualInformationMetric=OFF" ]; - checkPhase = "ctest"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index b3c6d9f26d477aca68b30b67535dd9c9f9f8759b..2144a7f789356326559bbafb5116cebb0682705c 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "htslib"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2"; - sha256 = "1jsca3hg4rbr6iqq6imkj4lsvgl8g9768bcmny3hlff2w25vx24m"; + sha256 = "be3d4e25c256acdd41bebb8a7ad55e89bb18e2fc7fc336124b1e2c82ae8886c6"; }; # perl is only used during the check phase. diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/pkgs/development/libraries/science/biology/oobicpl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8755b7fd2eba5922b51ea030832ee9aca58904e7 --- /dev/null +++ b/pkgs/development/libraries/science/biology/oobicpl/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }: + +stdenv.mkDerivation rec { + pname = "oobicpl"; + name = "${pname}-2016-03-02"; + + owner = "BIC-MNI"; + + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = "bc062a65dead2e58461f5afb37abedfa6173f10c"; + sha256 = "05l4ml9djw17bgdnrldhcxydrzkr2f2scqlyak52ph5azj5n4zsx"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libminc bicpl arguments pcre-cpp ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" + "-DBICPL_DIR=${bicpl}/lib" + "-DARGUMENTS_DIR=${arguments}/lib" + "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/${owner}/${pname}"; + description = "Brain Imaging Centre object-oriented programming library (and tools)"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index fe90d41ccb297c631b8db94d099450dbadfc5e33..77cb7cf1f2b6f875056e78627fa3e8bb6814a7bb 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -4,22 +4,24 @@ with stdenv.lib; let - version = "3.3.0"; + version = "3.5.0"; in stdenv.mkDerivation { name = "arpack-${version}"; src = fetchurl { url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz"; - sha256 = "1cz53wqzcf6czmcpfb3vb61xi0rn5bwhinczl65hpmbrglg82ndd"; + sha256 = "0f8jx3fifmj9qdp289zr7r651y1q48k1jya859rqxq62mvis7xsh"; }; nativeBuildInputs = [ autoconf automake gettext libtool ]; buildInputs = [ gfortran openblas ]; + doCheck = true; + BLAS_LIBS = "-L${openblas}/lib -lopenblas"; - FFLAGS = optional openblas.blas64 "-fdefault-integer-8"; + INTERFACE64 = optional openblas.blas64 "1"; preConfigure = '' ./bootstrap diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index c6797ef05ac3819eaa1c178f17ed1210a3d984e9..8cca5565bf6fdb7b11fbd2e39ec2c20e96e8024d 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -45,6 +45,8 @@ let inherit (stdenv.lib) optional optionalString; + # Don't upgrade until https://github.com/math-atlas/math-atlas/issues/44 + # is resolved. version = "3.10.2"; in @@ -100,6 +102,10 @@ stdenv.mkDerivation { fi ''; + # 1. /buildATLAS/build/bin/ATLrun.sh: multiple segfaults. + # 2. "atlas does its own parallel builds" + enableParallelBuilding = false; + meta = { homepage = http://math-atlas.sourceforge.net/; description = "Automatically Tuned Linear Algebra Software (ATLAS)"; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 4455a9488c00f14f435070c4a6fca98d657ff5d2..9955af0465970c376e7360a3fd71800abbbed051 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "blas-${version}"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { url = "http://www.netlib.org/blas/${name}.tgz"; - sha256 = "1hvmwp488hd6sdxdbmhjhmyrrd4s1ds1cjzh5d86l10b3wsm99n5"; + sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm"; }; buildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..916bf122b3c244f87c30920db6e9bfcc46301bb5 --- /dev/null +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -0,0 +1,144 @@ +{ stdenv, lib, config, fetchFromGitHub, fetchpatch +, cmake +, glog, google-gflags, gtest +, protobuf, snappy +, python, future, six, python-protobuf, numpy, pydot +, eigen3 +, doxygen +, useCuda ? (config.cudaSupport or false), cudatoolkit ? null +, useCudnn ? (config.cudnnSupport or false), cudnn ? null +, useOpenmp ? false, openmp ? null +, useOpencv3 ? true, opencv3 ? null +, useLeveldb ? false, leveldb ? null +, useLmdb ? true, lmdb ? null +, useRocksdb ? false, rocksdb ? null +, useZeromq ? false, zeromq ? null +, useMpi ? false, mpi ? null +# TODO: distributed computations +#, useGloo ? false +#, useNccl ? false +#, useNnpack ? false +}: + +assert useCuda -> cudatoolkit != null; +assert useCudnn -> (useCuda && cudnn != null); +assert useOpencv3 -> opencv3 != null; +assert useLeveldb -> leveldb != null; +assert useLmdb -> lmdb != null; +assert useRocksdb -> rocksdb != null; +assert useZeromq -> zeromq != null; +assert useMpi -> mpi != null; + +let + # Third party modules that caffe2 holds as git submodules. + # Download them and create symlinks from caffe2/third_party. + installExtraSrc = extra: '' + rmdir "third_party/${extra.dst}" + ln -s "${extra.src}" "third_party/${extra.dst}" + ''; + + cub = { + src = fetchFromGitHub rec { + owner = "NVlabs"; + repo = "cub"; + rev = "v1.7.4"; + sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66"; + }; + dst = "cub"; + }; + + pybind11 = { + src = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11"; + rev = "86e2ad4f77442c3350f9a2476650da6bee253c52"; + sha256 = "05gi58dirvc8fgm0avpydvidzsbh2zrzgfaq671ym09f6dz0bcgz"; + }; + dst = "pybind11"; + }; + + ccVersion = (builtins.parseDrvName stdenv.cc.name).version; +in + +stdenv.mkDerivation rec { + name = "caffe2-${version}"; + version = "0.8.1"; + src = fetchFromGitHub { + owner = "caffe2"; + repo = "caffe2"; + rev = "v${version}"; + sha256 = "18y7zjc69j6n5642l9caddl641b0djf3pjn4wacdsc1wk1jiyqk8"; + }; + + nativeBuildInputs = [ cmake doxygen gtest ]; + outputs = [ "bin" "out" ]; + propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle + + buildInputs = [ glog google-gflags protobuf snappy eigen3 ] + ++ lib.optional useCuda cudatoolkit + ++ lib.optional useCudnn cudnn + ++ lib.optional useOpenmp openmp + ++ lib.optional useOpencv3 opencv3 + ++ lib.optional useLeveldb leveldb + ++ lib.optional useLmdb lmdb + ++ lib.optional useRocksdb rocksdb + ++ lib.optional useZeromq zeromq + ; + propagatedBuildInputs = [ numpy future six python-protobuf pydot ]; + + patches = lib.optional (stdenv.cc.isGNU && lib.versionAtLeast ccVersion "7.0.0") [ + ./fix_compilation_on_gcc7.patch + ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ]; + + cmakeFlags = [ ''-DBUILD_TEST=OFF'' + ''-DBUILD_PYTHON=ON'' + ''-DUSE_CUDA=${if useCuda then ''ON''else ''OFF''}'' + ''-DUSE_OPENMP=${if useOpenmp then ''ON''else ''OFF''}'' + ''-DUSE_OPENCV=${if useOpencv3 then ''ON''else ''OFF''}'' + ''-DUSE_MPI=${if useMpi then ''ON''else ''OFF''}'' + ''-DUSE_LEVELDB=${if useLeveldb then ''ON''else ''OFF''}'' + ''-DUSE_LMDB=${if useLmdb then ''ON''else ''OFF''}'' + ''-DUSE_ROCKSDB=${if useRocksdb then ''ON''else ''OFF''}'' + ''-DUSE_ZMQ=${if useZeromq then ''ON''else ''OFF''}'' + ''-DUSE_GLOO=OFF'' + ''-DUSE_NNPACK=OFF'' + ''-DUSE_NCCL=OFF'' + ''-DUSE_REDIS=OFF'' + ''-DUSE_FFMPEG=OFF'' + ] + ++ lib.optional useCuda [ + ''-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}'' + ''-DCUDA_FAST_MATH=ON'' + ''-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc'' + ]; + + preConfigure = '' + ${installExtraSrc cub} + ${installExtraSrc pybind11} + # XXX hack + export NIX_CFLAGS_COMPILE="-I ${eigen3}/include/eigen3/ $NIX_CFLAGS_COMPILE" + ''; + + postInstall = '' + moveToOutput "bin" "$bin" + mkdir -p $out/lib/${python.libPrefix} + ln -s $out/ $out/${python.sitePackages} + ''; + + doCheck = false; + enableParallelBuilding = true; + + meta = { + homepage = https://caffe2.ai/; + description = "A new lightweight, modular, and scalable deep learning framework"; + longDescription = '' + Caffe2 aims to provide an easy and straightforward way for you to experiment + with deep learning and leverage community contributions of new models and + algorithms. You can bring your creations to scale using the power of GPUs in the + cloud or to the masses on mobile with Caffe2's cross-platform libraries. + ''; + platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; + }; +} diff --git a/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch b/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch new file mode 100644 index 0000000000000000000000000000000000000000..f319f20233a21bbc132640737e285db23ff70eaf --- /dev/null +++ b/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch @@ -0,0 +1,46 @@ +diff --git a/caffe2/operators/recurrent_network_op.cc b/caffe2/operators/recurrent_network_op.cc +index dd4fded..5995e8a 100644 +--- a/caffe2/operators/recurrent_network_op.cc ++++ b/caffe2/operators/recurrent_network_op.cc +@@ -1,4 +1,4 @@ +-#include "recurrent_network_op.h" ++#include "caffe2/operators/recurrent_network_op.h" + #include "caffe2/core/workspace.h" + + namespace caffe2 { +diff --git a/caffe2/operators/recurrent_network_op.h b/caffe2/operators/recurrent_network_op.h +index 55328e5..ea898bc 100644 +--- a/caffe2/operators/recurrent_network_op.h ++++ b/caffe2/operators/recurrent_network_op.h +@@ -762,8 +762,8 @@ class AccumulateInputGradientOp : public Operator { + USE_OPERATOR_CONTEXT_FUNCTIONS; + + bool RunOnDevice() override { +- const auto t = +- OperatorBase::Input>(0).template data()[0]; ++ const auto& t0 = OperatorBase::Input>(0); ++ const auto t = t0.template data()[0]; + auto& og = Input(1); + auto* g = Output(0); + +diff --git a/caffe2/queue/queue_ops.h b/caffe2/queue/queue_ops.h +index f2c0a33..642343f 100644 +--- a/caffe2/queue/queue_ops.h ++++ b/caffe2/queue/queue_ops.h +@@ -17,13 +17,10 @@ class CreateBlobsQueueOp final : public Operator { + name(operator_def.output().Get(0)) {} + + bool RunOnDevice() override { +- const auto capacity = +- OperatorBase::template GetSingleArgument("capacity", 1); +- const auto numBlobs = +- OperatorBase::template GetSingleArgument("num_blobs", 1); ++ const auto capacity = GetSingleArgument("capacity", 1); ++ const auto numBlobs = GetSingleArgument("num_blobs", 1); + const auto enforceUniqueName = +- OperatorBase::template GetSingleArgument( +- "enforce_unique_name", false); ++ GetSingleArgument("enforce_unique_name", false); + const auto fieldNames = + OperatorBase::template GetRepeatedArgument("field_names"); + CAFFE_ENFORCE_EQ(this->OutputSize(), 1); diff --git a/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch b/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch new file mode 100644 index 0000000000000000000000000000000000000000..d908cb6ba80b213d008a7904fc5fa1d7a7f3e474 --- /dev/null +++ b/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch @@ -0,0 +1,55 @@ +diff --git a/caffe2/perfkernels/cvtsh_ss_bugfix.h b/caffe2/perfkernels/cvtsh_ss_bugfix.h +index bd06681..00172b7 100644 +--- a/caffe2/perfkernels/cvtsh_ss_bugfix.h ++++ b/caffe2/perfkernels/cvtsh_ss_bugfix.h +@@ -1,10 +1,36 @@ ++/** ++ * Copyright (c) 2016-present, Facebook, Inc. ++ * ++ * 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. ++ */ ++ + #pragma once + +-#if defined(__APPLE__) && (__clang_major__ < 8) ++// Apple clang was fixed in 8.1 ++#if defined(__apple_build_version__) && ((__clang_major__ < 8) || ((__clang_major__ == 8) && (__clang_minor__ < 1))) ++#define __APPLE_NEED_FIX 1 ++#endif ++ ++// Regular clang was fixed in 3.9 ++#if defined(__clang__) && (__clang_major__ < 4) && (__clang_minor__ < 9) ++#define __CLANG_NEED_FIX 1 ++#endif ++ ++#if __APPLE_NEED_FIX || __CLANG_NEED_FIX + + #include + +-// This version of apple clang has a bug that _cvtsh_ss is not defined, see ++// This version of clang has a bug that _cvtsh_ss is not defined, see + // https://reviews.llvm.org/D16177 + static __inline float + __attribute__((__always_inline__, __nodebug__, __target__("f16c"))) +@@ -15,7 +41,10 @@ _cvtsh_ss(unsigned short a) + return r[0]; + } + +-#endif // defined(__APPLE__) && (__clang_major__ < 8) ++#endif // __APPLE_NEED_FIX || __CLANG_NEED_FIX ++ ++#undef __APPLE_NEED_FIX ++#undef __CLANG_NEED_FIX + + #ifdef _MSC_VER + diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 40b02d3034176390855b0754e057d01710deff8d..7a653a58eb2a5ce3aad6aca006fd6877cb807c10 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -7,6 +7,7 @@ , python , ocl-icd , opencl-headers +, Accelerate, CoreGraphics, CoreVideo, OpenCL , gtest }: @@ -40,11 +41,19 @@ stdenv.mkDerivation rec { gfortran blas python - ocl-icd - opencl-headers boost gtest - ]; + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ocl-icd + opencl-headers + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + Accelerate + CoreGraphics + CoreVideo + ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ + OpenCL + ]; enableParallelBuilding = true; @@ -56,7 +65,7 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2441aff9fa307e9e3891c7aad604f779019aa694 --- /dev/null +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "1.21"; + name = "cliquer-${version}"; + + # autotoolized version of the original cliquer + src = fetchFromGitHub { + owner = "dimpase"; + repo = "autocliquer"; + rev = "v${version}"; + sha256 = "180i4qj1a25qfp75ig2d3144xfpb1dgcgpha0iqqghd7di4awg7z"; + }; + + doCheck = true; + + buildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://users.aalto.fi/~pat/cliquer.html; + downloadPage = src.meta.homepage; # autocliquer + description = "Routines for clique searching"; + longDescription = '' + Cliquer is a set of C routines for finding cliques in an arbitrary weighted graph. + It uses an exact branch-and-bound algorithm developed by Patric Östergård. + It is designed with the aim of being efficient while still being flexible and + easy to use. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 574899d3a89c8db66e21f06f65aec98592b90a29..f5715157531e165c00404274781718fe8d45e306 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -30,16 +30,16 @@ in }; cudnn_cudatoolkit8 = generic rec { - version = "7.0.3"; + version = "7.0.5"; cudatoolkit = cudatoolkit8; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "0gzwadxcyirr2zgiikdapnm860x3gcfwfxh5xn3s47zaa03x4kg4"; + sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e"; }; cudnn_cudatoolkit9 = generic rec { - version = "7.0.3"; + version = "7.0.5"; cudatoolkit = cudatoolkit9; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "1ycy413cq9y9yxj20djqv05aarn3qzcy2md3dvvjpvhc269kwn09"; + sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y"; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 663b741e4748e05adaa892dd321d9a164200a6be..51bda19cf13914d08b69aa15357d79cce8d377cf 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { This nix expression requires that ${name} is already part of the store. Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library at https://developer.nvidia.com/cudnn, and run the following command in the download directory: - nix-prefetch-url file://${name} + nix-prefetch-url file://\$PWD/${name} ''; }; diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 9d40baafe65a2d64110742c8a5bfaf448e1ccf60..1825a6f1bb25dcc54506fde2f23068427f1dd645 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation { meta = { description = "The FEniCS Problem Solving Environment in Python and C++"; homepage = http://fenicsproject.org/; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 567ee7853f88f75ed765cd007026f7d367bd5c9d..f694f72f22b6fd2560cdd68a47521196ea994500 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ipopt-${version}"; - version = "3.12.8"; + version = "3.12.9"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "1lyhgashyk2wswv0z2qnkxng32pim80kzf9jfgxi07wl09x753w1"; + sha256 = "1fqdjgxh6l1xjvw1ffma7lg92xqg0l8sj02y0zqvbfnx8i47qs9a"; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b9ee1e2a10d788d59f35ac7bdd211da7d5cc1817 --- /dev/null +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromBitbucket +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "20140914"; + name = "m4ri-${version}"; + + src = fetchFromBitbucket { + owner = "malb"; + repo = "m4ri"; + rev = "release-${version}"; + sha256 = "0xfg6pffbn8r1s0y7bn9b8i55l00d41dkmhrpf7pwk53qa3achd3"; + }; + + doCheck = true; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://malb.bitbucket.io/m4ri/; + description = "Library to do fast arithmetic with dense matrices over F_2"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..23fc03655cf37507128f5877bce8dfda00e0fccd --- /dev/null +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromBitbucket +, autoreconfHook +, m4ri +}: + +stdenv.mkDerivation rec { + version = "20150908"; + name = "m4rie-${version}"; + + src = fetchFromBitbucket { + owner = "malb"; + repo = "m4rie"; + rev = "release-${version}"; + sha256 = "0r8lv46qx5mkz5kp3ay2jnsp0mbhlqr5z2z220wdk73wdshcznss"; + }; + + doCheck = true; + + buildInputs = [ + m4ri + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://malb.bitbucket.io/m4rie/; + description = "Library for matrix multiplication, reduction and inversion over GF(2^k) for 2 <= k <= 10"; + longDescription = '' + M4RIE is a library for fast arithmetic with dense matrices over small finite fields of even characteristic. + It uses the M4RI library, implementing the same operations over the finite field F2. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1d692f6316ffb7051c4eb26437d140be78f56992 --- /dev/null +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -0,0 +1,24 @@ +{ callPackage, cudatoolkit8, cudatoolkit9 }: + +let + generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { + inherit (args) cudatoolkit; + }; + +in + +{ + nccl_cudatoolkit8 = generic rec { + version = "2.1.4"; + cudatoolkit = cudatoolkit8; + srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; + sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi"; + }; + + nccl_cudatoolkit9 = generic rec { + version = "2.1.4"; + cudatoolkit = cudatoolkit9; + srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; + sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p"; + }; +} diff --git a/pkgs/development/libraries/science/math/nccl/generic.nix b/pkgs/development/libraries/science/math/nccl/generic.nix new file mode 100644 index 0000000000000000000000000000000000000000..609a7df51e58a028c2611a1b40bc8bf404660a1a --- /dev/null +++ b/pkgs/development/libraries/science/math/nccl/generic.nix @@ -0,0 +1,57 @@ +{ version +, srcName +, sha256 +}: + +{ stdenv +, lib +, requireFile +, cudatoolkit +}: + +stdenv.mkDerivation rec { + name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; + + inherit version; + + src = requireFile rec { + name = srcName; + inherit sha256; + message = '' + This nix expression requires that ${name} is already part of the store. + Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the NCCL library + at https://developer.nvidia.com/nccl, and run the following command in the download directory: + nix-prefetch-url file://\$PWD/${name} + ''; + }; + + unpackCmd = "tar xJf $src"; + + installPhase = '' + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + } + fixRunPath lib/libnccl.so + + mkdir -p $out + cp -a include $out/include + cp -a lib $out/lib + ''; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + passthru = { + inherit cudatoolkit; + }; + + meta = with stdenv.lib; { + description = "Multi-GPU and multi-node collective communication primitives that are performance optimized for NVIDIA GPUs"; + homepage = https://developer.nvidia.com/nccl; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 7edc39c11f5c5df6b21233fc4638eaf5e8458484..5ac0bcd1d7d7596a7079a57b65c34f0df22c7f30 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl, which, config, coreutils +{ stdenv, fetchurl, fetchpatch, gfortran, perl, which, config, coreutils # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -12,6 +12,14 @@ let blas64_ = blas64; in let # To add support for a new platform, add an element to this set. configs = { + armv6l-linux = { + BINARY = "32"; + TARGET = "ARMV6"; + DYNAMIC_ARCH = "0"; + CC = "gcc"; + USE_OPENMP = "1"; + }; + armv7l-linux = { BINARY = "32"; TARGET = "ARMV7"; @@ -20,6 +28,14 @@ let USE_OPENMP = "1"; }; + aarch64-linux = { + BINARY = "64"; + TARGET = "ARMV8"; + DYNAMIC_ARCH = "1"; + CC = "gcc"; + USE_OPENMP = "1"; + }; + i686-linux = { BINARY = "32"; TARGET = "P2"; @@ -44,7 +60,7 @@ let TARGET = "ATHLON"; DYNAMIC_ARCH = "1"; CC = "gcc"; - USE_OPENMP = "1"; + USE_OPENMP = if stdenv.hostPlatform.isMusl then "0" else "1"; }; }; in @@ -99,9 +115,16 @@ stdenv.mkDerivation { "NUM_THREADS=64" "INTERFACE64=${if blas64 then "1" else "0"}" "NO_STATIC=1" - ] + ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1" ++ mapAttrsToList (var: val: var + "=" + val) config; + patches = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") + # https://github.com/xianyi/OpenBLAS/pull/1247 + (fetchpatch { + url = "https://github.com/xianyi/OpenBLAS/commit/88a35ff457f55e527e0e8a503a0dc61976c1846d.patch"; + sha256 = "1a3qrhvl5hp06c53fjqghq4zgf6ls7narm06l0shcvs57hznh09n"; + }); + doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 6b229f31f161be7dbcedf52cdc8bdba22054398e..195b90c86e1a2adcad50e39a458abee9a2d5f259 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "openlibm-${version}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "0cwqqqlblj3kzp9aq1wnpfs1fl0qd1wp1xzm5shb09w06i4rh9nn"; + sha256 = "1z8cj5q8ca8kmrakwkpjxf8svi81waw0c568cx8v8pv9kvswbp07"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index 989ad27055fa162d96be3853b487f24285f6636f..3a4c5a78438575f1481a785db871b3d6b6e25914 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gfortran }: stdenv.mkDerivation { - name = "openspecfun-0.4"; + name = "openspecfun-0.5.3"; src = fetchurl { - url = "https://github.com/JuliaLang/openspecfun/archive/v0.4.tar.gz"; - sha256 = "0nsa3jjmlhcqkw5ba5ypbn3n0c8b6lc22zzlxnmxkxi9shhdx65z"; + url = "https://github.com/JuliaLang/openspecfun/archive/v0.5.3.tar.gz"; + sha256 = "1rs1bv8jq751fv9vq79890wqf9xlbjc7lvz3ighzyfczbyjcf18m"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index bc5527a8e9705c0635a07117d61c19c7f52c1beb..ac8129c9032f9c5c37d1d21860f19ccfa2f37bca 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -7,15 +7,20 @@ stdenv.mkDerivation rec { name = "petsc-${version}"; - version = "3.7.6"; + version = "3.8.4"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "0jfl35lrhzvv982z6h1v5rcp39g0x16ca43rm9dx91wm6i8y13iw"; + sha256 = "1iy49gagxncx09d88kxnwkj876p35683mpfk33x37165si6xqy4z"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace config/install.py \ + --replace /usr/bin/install_name_tool install_name_tool + ''; + preConfigure = '' patchShebangs . configureFlagsArray=( diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7394fb9e1b411ae5537c0f59fc9f7e7817f247b3 --- /dev/null +++ b/pkgs/development/libraries/science/math/planarity/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "planarity"; + version = "3.0.0.5"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "graph-algorithms"; + repo = "edge-addition-planarity-suite"; + rev = "Version_${version}"; + sha256 = "01cm7ay1njkfsdnmnvh5zwc7wg7x189hq1vbfhh9p3ihrbnmqzh8"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + doCheck = true; + + patches = [ + # declare variables declared in headers as extern, not yet merged upstream + (fetchpatch { + url = "https://github.com/graph-algorithms/edge-addition-planarity-suite/pull/3.patch"; + sha256 = "1nqjc4clr326imz4jxqxcxv2hgh1sjgzll27k5cwkdin8lnmmil8"; + }) + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/graph-algorithms/edge-addition-planarity-suite; + description = "A library for implementing graph algorithms"; + license = licenses.bsd3; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fd677f5c0b7bcf44f68d2958ada82a2f1f193793 --- /dev/null +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchurl +, fetchpatch +, makeWrapper +}: + +stdenv.mkDerivation rec { + version = "1.018.1"; + name = "sympow-${version}"; + + src = fetchurl { + # Original website no longer reachable + url = "http://mirrors.mit.edu/sage/spkg/upstream/sympow/sympow-${version}.tar.bz2"; + sha256 = "0hphs7ia1wr5mydf288zvwj4svrymfpadcg3pi6w80km2yg5bm3c"; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + configurePhase = '' + runHook preConfigure + ./Configure # doesn't take any options + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + install -d datafiles "$out/share/sympow/datafiles" + install *.gp "$out/share/sympow/" + install -Dm755 sympow "$out/share/sympow/sympow" + install -D new_data "$out/bin/new_data" + + makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \ + --run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \ + --run 'if [ ! -d "$SYMPOW_LOCAL" ]; then + mkdir -p "$SYMPOW_LOCAL" + cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL" + chmod -R +xw "$SYMPOW_LOCAL" + fi' \ + --run 'cd "$SYMPOW_LOCAL"' + runHook postInstall + ''; + + patches = [ + # don't hardcode paths + (fetchpatch { + name = "do_not_hardcode_paths.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/Configure.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "1611p8ra8zkxvmxn3gm2l64bd4ma4m6r4vd6vwswcic91k1fci04"; + }) + + # bug on some platforms in combination with a newer gcc: + # https://trac.sagemath.org/ticket/11920 + (fetchpatch { + name = "fix_newer_gcc1.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/fpu.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "14gfa56w3ddfmd4d5ir9a40y2zi43cj1i4d2l2ij9l0qlqdy9jyx"; + }) + (fetchpatch { + name = "fix_newer_gcc2.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/execlp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "190gqhgz9wgw4lqwz0nwb1izc9zffx34bazsiw2a2sz94bmgb54v"; + }) + + # fix pointer initialization bug (https://trac.sagemath.org/ticket/22862) + (fetchpatch { + name = "fix_pointer_initialization1.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/initialize-tacks.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "02341vdbbidfs39s26vi4n5wigz619sw8fdbl0h9qsmwwhscgf85"; + }) + (fetchpatch { + name = "fix_pointer_initialization2.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sympow-datafiles.patch?h=packages/sympow"; + sha256 = "1m0vz048layb47r1jjf7fplw650ccc9x0w3l322iqmppzmv3022a"; + }) + ]; + + meta = with stdenv.lib; { + description = "A package to compute special values of symmetric power elliptic curve L-functions"; + license = { + shortName = "sympow"; + fullName = "Custom, BSD-like. See COPYING file."; + free = true; + }; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9fc72f18e5d75d2f44338a7564dc7f006c685740 --- /dev/null +++ b/pkgs/development/libraries/science/networking/ns3/default.nix @@ -0,0 +1,98 @@ +{ stdenv +, fetchFromGitHub, fetchurl +, python + +# for binding generation +, castxml ? null + +# can take a long time, generates > 30000 images/graphs +, enableDoxygen ? false + +# e.g. "optimized" or "debug". If not set, use default one +, build_profile ? null + +# --enable-examples +, withExamples ? false + +# very long +, withManual ? false, doxygen ? null, graphviz ? null, imagemagick ? null +# for manual, tetex is used to get the eps2pdf binary +# texlive to get latexmk. building manual still fails though +, dia, tetex ? null, ghostscript ? null, texlive ? null + +# generates python bindings +, generateBindings ? false, ncurses ? null + +# All modules can be enabled by choosing 'all_modules'. +# we include here the DCE mandatory ones +, modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"] +, gcc6 +, lib +}: + +let + pythonEnv = python.withPackages(ps: + stdenv.lib.optional withManual ps.sphinx + ++ stdenv.lib.optionals generateBindings (with ps;[ pybindgen pygccxml ]) + ); +in +stdenv.mkDerivation rec { + + name = "ns-3.${version}"; + version = "28"; + + # the all in one https://www.nsnam.org/release/ns-allinone-3.27.tar.bz2; + # fetches everything (netanim, etc), this package focuses on ns3-core + src = fetchFromGitHub { + owner = "nsnam"; + repo = "ns-3-dev-git"; + rev = name; + sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng"; + }; + + # ncurses is a hidden dependency of waf when checking python + buildInputs = lib.optionals generateBindings [ castxml ncurses ] + ++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ] + ++ stdenv.lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ]; + + propagatedBuildInputs = [ gcc6 pythonEnv ]; + + postPatch = '' + patchShebangs ./waf + patchShebangs doc/ns3_html_theme/get_version.sh + ''; + + configureScript = "${python.interpreter} ./waf configure"; + + configureFlags = with stdenv.lib; [ + "--enable-modules=${stdenv.lib.concatStringsSep "," modules}" + "--with-python=${pythonEnv.interpreter}" + ] + ++ optional (build_profile != null) "--build-profile=${build_profile}" + ++ optional generateBindings [ ] + ++ optional withExamples " --enable-examples " + ++ optional doCheck " --enable-tests " + ; + + postBuild = with stdenv.lib; let flags = concatStringsSep ";" ( + optional enableDoxygen "./waf doxygen" + ++ optional withManual "./waf sphinx" + ); + in "${flags}" + ; + + doCheck = true; + + # we need to specify the proper interpreter else ns3 can check against a + # different version even though we + checkPhase = '' + ${pythonEnv.interpreter} ./test.py + ''; + + meta = { + homepage = http://www.nsnam.org; + license = stdenv.lib.licenses.gpl3; + description = "A discrete time event network simulator"; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 968550675235ea9dd3786b14d92c4320ccde52da..96449a8ed9625312f217ce5fd934b5501d8d036c 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, pcre, pkgconfig, python }: +{ stdenv, fetchurl, pkgconfig, python }: stdenv.mkDerivation rec { name = "serd-${version}"; - version = "0.26.0"; + version = "0.28.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "164j43am4hka2vbzw4n52zy7rafgp6kmkgbcbvap368az644mr73"; + sha256 = "1v4ai4zyj1q3255nghicns9817jkwb3bh60ssprsjmnjfj41mwhx"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcre python ]; + nativeBuildInputs = [ pkgconfig python ]; - configurePhase = "${python.interpreter} waf configure --prefix=$out"; + configurePhase = "python waf configure --prefix=$out"; - buildPhase = "${python.interpreter} waf"; + buildPhase = "python waf"; - installPhase = "${python.interpreter} waf install"; + installPhase = "python waf install"; meta = with stdenv.lib; { homepage = http://drobilla.net/software/serd; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 001199cd82124b6d12502bdb3258f197f17fc1c4..81dff49571dab50fa1a977af3051ae269d6f00a5 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${ if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc" }" ${ - if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\"" + if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos.dev}\"" } ''; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index b481bd0cf6512087182f3b88ecefe60d66d50ac6..3234d1bb89bfe163589759e77879c864cc5fda20 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, proj }: stdenv.mkDerivation rec { - name = "shapelib-1.4.0"; + name = "shapelib-1.4.1"; src = fetchurl { url = "http://download.osgeo.org/shapelib/${name}.tar.gz"; - sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y"; + sha256 = "1cr3b5jfglwisbyzj7fnxp9xysqad0fcmcqvqaja6qap6qblijd4"; }; buildInputs = [ proj ]; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 219cda38bc28b6d0e057415aebf1d907c769fff9..74f861297d1a301c38092f03ebe1634e73d34e57 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "shibboleth-sp-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-sp.git"; - rev = "9ebba5c3a16d03769f436e383e4c4cdaa33f5509"; - sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj"; + rev = version; + sha256 = "01q13p7gc0janjfml6zs46na8qnval8hc833fk2wrnmi4w9xw4fd"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index d724ebbf373885d333a270fea1997885bbe86a82..28b96d17aa602e1d8e4bd7c89e48b5a959fb580f 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi -, inputproto, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg, freealut +, inputproto, libICE, libSM, libXt, libXmu, libGLU_combined, boost, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr , curl }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto - libICE libSM libXt libXmu mesa boost zlib libjpeg freealut + libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut openscenegraph openal expat cmake apr curl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/slib/setup-hook.sh b/pkgs/development/libraries/slib/setup-hook.sh index 62b72d6dc0abf0bf74a93fe963f6ce8251d82471..3c7e91e81886bcc4810a25b2ac371c9b8ad0125b 100644 --- a/pkgs/development/libraries/slib/setup-hook.sh +++ b/pkgs/development/libraries/slib/setup-hook.sh @@ -10,4 +10,4 @@ addSlibPath () { fi } -envHooks+=(addSlibPath) +addEnvHooks "$hostOffset" addSlibPath diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index f248d65e2ed6079911b56b4b1cbde13588c0003d..7119f76c55fdad55150d1cee40074bcb1968d74f 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, mesa, makeWrapper }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU_combined, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ SDL gtk2 mesa ]; + buildInputs = [ SDL gtk2 libGLU_combined ]; nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 10386a7b33e495117c3090c4fbf4aaf7ae8a57ca..3207bdb3a7f2775608edbf80b024186c07779bf7 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }: +{ stdenv, darwin, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }: stdenv.mkDerivation rec { name = "smpeg2-svn${version}"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; - buildInputs = [ SDL2 ]; + buildInputs = [ SDL2 ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; preConfigure = '' sh autogen.sh @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { homepage = http://icculus.org/smpeg/; description = "SDL2 MPEG Player Library"; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index c5e52124ceed0e54d422106d4990b10de47cbacd..8f37302cec50d0946a4902c8e983316e66879f56 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "snappy-${version}"; - version = "1.1.4"; + version = "1.1.7"; - src = fetchurl { - url = "http://github.com/google/snappy/releases/download/${version}/" - + "snappy-${version}.tar.gz"; - sha256 = "0mq0nz8gbi1sp3y6xcg0a6wbvnd6gc717f3vh2xrjmfj5w9gwjqk"; + src = fetchFromGitHub { + owner = "google"; + repo = "snappy"; + rev = "${version}"; + sha256 = "1x7r8sjmdqlqjz0xfiwdyrqpgaj5yrvrgb28ivgpvnxgar5qv6m2"; }; - outputs = [ "out" "dev" "doc" ]; + patches = [ ./disable-benchmark.patch ]; - nativeBuildInputs = [ pkgconfig ]; + outputs = [ "out" "dev" ]; - # -DNDEBUG for speed - configureFlags = [ "CXXFLAGS=-DNDEBUG" ]; + nativeBuildInputs = [ cmake ]; - # SIGILL on darwin - doCheck = !stdenv.isDarwin; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + + checkTarget = "test"; + + doCheck = true; meta = with stdenv.lib; { homepage = https://google.github.io/snappy/; diff --git a/pkgs/development/libraries/snappy/disable-benchmark.patch b/pkgs/development/libraries/snappy/disable-benchmark.patch new file mode 100644 index 0000000000000000000000000000000000000000..c891c13fe74c92db57037db604bd9ffe8a5ad2d3 --- /dev/null +++ b/pkgs/development/libraries/snappy/disable-benchmark.patch @@ -0,0 +1,5 @@ +--- a/snappy-test.cc ++++ b/snappy-test.cc +@@ -46 +46 @@ +-DEFINE_bool(run_microbenchmarks, true, ++DEFINE_bool(run_microbenchmarks, false, diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 4db4a07b4e56e0048e5aa7e421e89f189f0283dd..6d0ca4c1d67569f0a9aec7706650ec17b686adee 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.1.5"; + name = "socket_wrapper-1.1.9"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "01gn21kbicwfn3vlnnir8c11z2g54b532bj3qrpdrhgrcm3ifi45"; + sha256 = "1d7bbr4j1ybq2dm6q3f6ncv36qqxyjygq4z1q0hvadlcaw7pj79c"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 57f81aa4613e348c4ab0332dc4abe34f77e562d5..995ac631580d392cce35c3cabc9fe8f2560b7a57 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, serd }: +{ stdenv, fetchurl, pkgconfig, python, serd, pcre }: stdenv.mkDerivation rec { name = "sord-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python serd ]; + buildInputs = [ python serd pcre ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 729967ea1b7f6ad18cd81432e6053556811a1208..c338d6762a4d39499eed045f88af2709c435ed04 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pName = "soundtouch"; - name = "${pName}-1.9.2"; + name = "${pName}-2.0.0"; src = fetchurl { url = "http://www.surina.net/soundtouch/${name}.tar.gz"; - sha256 = "04y5l56yn4jvwpv9mn1p3m2vi5kdym9xpdac8pmhwhl13r8qdsya"; + sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j"; }; buildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index fba354213556b9190b385713a10f401ae6dbcf8b..22d66b7e71d1f7d323973ef3f95ba2ff825dda65 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gawk, alsaLib, ncurses }: stdenv.mkDerivation rec { - name = "speech_tools-${version}"; - version = "2.1"; + name = "speech_tools-${version}.0"; + version = "2.5"; src = fetchurl { url = "http://www.festvox.org/packed/festival/${version}/${name}-release.tar.gz"; - sha256 = "1s9bkfgdgyas8v2cr7x3dg0ck1xf9mn1q6a73gwy524sjb6nfqgz"; + sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; }; buildInputs = [ alsaLib ncurses ]; @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . ) + + # c99 makes isnan valid for float and double + substituteInPlace include/EST_math.h \ + --replace '__isnanf(X)' 'isnan(X)' ''; installPhase = '' @@ -26,16 +30,17 @@ stdenv.mkDerivation rec { done ''; + doCheck = true; + + checkTarget = "test"; + meta = with stdenv.lib; { - broken = true; description = "Text-to-speech engine"; - maintainers = with maintainers; - [ - raskin - ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.free; }; + passthru = { updateInfo = { downloadPage = "http://www.festvox.org/packed/festival/"; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index ee45c0d1c65a0faf1a93d994b7933083bc04f34d..b27fd0843bc0cc5ea406039fda057fd05f9278e1 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -1,29 +1,70 @@ -{ fetchurl, lib, stdenv, intltool, libtool, pkgconfig, glib, dotconf, libsndfile -, libao, python3Packages -, withEspeak ? false, espeak +{ stdenv, pkgconfig, fetchurl, python3Packages +, intltool, itstool, libtool, texinfo, autoreconfHook +, glib, dotconf, libsndfile +, withLibao ? true, libao +, withPulse ? false, libpulseaudio +, withAlsa ? false, alsaLib +, withOss ? false +, withFlite ? true, flite +# , withFestival ? false, festival-freebsoft-utils +, withEspeak ? true, espeak, sonic, pcaudiolib , withPico ? true, svox +# , withIvona ? false, libdumbtts }: -stdenv.mkDerivation rec { +let + inherit (stdenv.lib) optional optionals; + inherit (python3Packages) python pyxdg wrapPython; + + # speechd hard-codes espeak, even when built without support for it. + selectedDefaultModule = + if withEspeak then + "espeak-ng" + else if withPico then + "pico" + else if withFlite then + "flite" + else + throw "You need to enable at least one output module."; +in stdenv.mkDerivation rec { name = "speech-dispatcher-${version}"; - version = "0.8.5"; + version = "0.8.8"; src = fetchurl { url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz"; - sha256 = "18jlxnhlahyi6njc6l6576hfvmzivjjgfjyd2n7vvrvx9inphjrb"; + sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw"; }; - buildInputs = [ intltool libtool glib dotconf libsndfile libao python3Packages.python ] - ++ lib.optional withEspeak espeak - ++ lib.optional withPico svox; - nativeBuildInputs = [ pkgconfig python3Packages.wrapPython ]; + nativeBuildInputs = [ pkgconfig autoreconfHook intltool libtool itstool texinfo wrapPython ]; + + buildInputs = [ glib dotconf libsndfile libao libpulseaudio alsaLib python ] + ++ optionals withEspeak [ espeak sonic pcaudiolib ] + ++ optional withFlite flite + ++ optional withPico svox + # TODO: add flint/festival support with festival-freebsoft-utils package + # ++ optional withFestival festival-freebsoft-utils + # TODO: add Ivona support with libdumbtts package + # ++ optional withIvona libdumbtts + ; - hardeningDisable = [ "format" ]; + pythonPath = [ pyxdg ]; - pythonPath = with python3Packages; [ pyxdg ]; + configureFlags = [ + # Audio method falls back from left to right. + "--with-default-audio-method=\"libao,pulse,alsa,oss\"" + ] ++ optional withPulse "--with-pulse" + ++ optional withAlsa "--with-alsa" + ++ optional withLibao "--with-libao" + ++ optional withOss "--with-oss" + ++ optional withEspeak "--with-espeak-ng" + ++ optional withPico "--with-pico" + # ++ optional withFestival "--with-flint" + # ++ optional withIvona "--with-ivona" + ; - postPatch = lib.optionalString withPico '' - sed -i 's,/usr/share/pico/lang/,${svox}/share/pico/lang/,g' src/modules/pico.c + postPatch = '' + substituteInPlace config/speechd.conf --replace "DefaultModule espeak" "DefaultModule ${selectedDefaultModule}" + substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang" ''; postInstall = '' @@ -32,8 +73,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Common interface to speech synthesis"; - homepage = http://www.freebsoft.org/speechd; + homepage = https://devel.freebsoft.org/speechd; license = licenses.gpl2Plus; + maintainers = with maintainers; [ berce ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 602359965f125f27acdfb53de7ffb2c7b4c27322..173b460a0ab25b310212d475df4219ce80c5a422 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; { - homepage = http://www.speex.org/; + homepage = https://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 080dbc4510dd9013a0e2f1c3ebdee7a537ded959..0564459b24c007fb09959f52a02eae5db4711cc0 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,7 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1 +{ stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup -, gtk3, epoxy }: +, withPolkit ? true, polkit, acl, usbutils +, vala, gtk3, epoxy, libdrm }: + +# If this package is built with polkit support (withPolkit=true), +# usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. +# The helper confirms via polkit that the user has an active session, +# then adds a device acl entry for that user. +# Example NixOS config to create a setuid wrapper for the helper: +# security.wrappers.spice-client-glib-usb-acl-helper.source = +# "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; +# On non-NixOS installations, make a setuid copy of the helper +# outside the store and adjust PATH to find the setuid version. + +# If this package is built without polkit support (withPolkit=false), +# usb redirection requires read-write access to usb devices. +# This can be granted by adding users to a custom group like "usb" +# and using a udev rule to put all usb devices in that group. +# Example NixOS config: +# users.groups.usb = {}; +# users.users.dummy.extraGroups = [ "usb" ]; +# services.udev.extraRules = '' +# KERNEL=="*", SUBSYSTEMS=="usb", MODE="0664", GROUP="usb" +# ''; with stdenv.lib; @@ -10,28 +32,32 @@ let in stdenv.mkDerivation rec { name = "spice-gtk-0.34"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; }; - buildInputs = [ - spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection - libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy - ]; + postPatch = '' + # get rid of absolute path to helper in store so we can use a setuid wrapper + substituteInPlace src/usb-acl-helper.c \ + --replace 'ACL_HELPER_PATH"/' '"' + ''; - nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook ]; + buildInputs = [ + spice-protocol celt_0_5_1 openssl libpulseaudio pixman + libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm + ] ++ optionals withPolkit [ polkit acl usbutils ] ; - NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ]; - preAutoreconf = '' - substituteInPlace src/Makefile.am \ - --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' - ''; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "share/polkit-1/actions"; configureFlags = [ - "--disable-maintainer-mode" "--with-gtk3" + "--enable-introspection" + "--enable-vala" ]; dontDisableStatic = true; # Needed by the coroutine test @@ -49,7 +75,7 @@ in stdenv.mkDerivation rec { homepage = http://www.spice-space.org/; license = licenses.lgpl21; - + maintainers = [ maintainers.xeji ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 808bfd4f811d295ba0db9899dce1db300ff564e6..1ab76340cc7c5516fa2fa6ffc48351892f301839 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama -, libjpeg, zlib, spice_protocol, python, pyparsing, glib, cyrus_sasl +, libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl , lz4 }: with stdenv.lib; @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { # 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"; + url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; sha256 = "11x5566lx5zyl7f39glwsgpzkxb7hpcshx8va5ab3imrns07130q"; }) (fetchpatch { name = "0002-Prevent-integer-overflows-in-capability-checks.patch"; - url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; + url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5"; }) (fetchpatch { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libXrandr libXfixes libXrender libXext libXinerama python pyparsing glib cyrus_sasl lz4 ]; - nativeBuildInputs = [ pkgconfig spice_protocol ]; + nativeBuildInputs = [ pkgconfig spice-protocol ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index c1f624f8744d8bef7d39ae5ff3ec745128b999df..ed19814be34afc4c77ebebea94047e160faca42a 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { name = "sqlcipher-${version}"; - version = "3.4.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "1lwc2m21sax3pnjfqddldbpbwr3b51s91fxz7dd7hf6ly8swnsvp"; + sha256 = "168wb6fvyap7y8j86fb3xl5rd4wmhiq0dxvx9wxwi5kwm1j4vn1a"; }; buildInputs = [ readline ncurses openssl tcl ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 0625183fb7de2d7525d09f5d33a752d56b49d863..b8b7d0c701dda5fa70bdcc9f0c20bc133d68654e 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.21.0"; + name = "sqlite-3.22.0"; src = fetchurl { - url = "http://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz"; - sha256 = "1qxvzdjwzw6k0kqjfabj86rnq87xdbwbca7laxxdhnh0fmkm3pfp"; + url = "http://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz"; + sha256 = "04n6hnw2g818d7r92cp2608kd5mhzyysy83k29kbq1mp709an918"; }; outputs = [ "bin" "dev" "out" ]; @@ -31,6 +31,8 @@ stdenv.mkDerivation { "-DSQLITE_ENABLE_UNLOCK_NOTIFY" "-DSQLITE_SOUNDEX" "-DSQLITE_SECURE_DELETE" + "-DSQLITE_MAX_VARIABLE_NUMBER=250000" + "-DSQLITE_MAX_EXPR_DEPTH=10000" ]; # Test for features which may not be available at compile time diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix index d971587ee6ee9c9a78b7e007ce6ba07340abd158..1feedb94c15832a249f58677213067d212c4d833 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.20.1"; + name = "sqlite3_analyzer-3.22.0"; src = fetchurl { - url = "https://www.sqlite.org/2017/sqlite-src-3200100.zip"; - sha256 = "0aicmapa99141hjncyxwg66ndhr16nwpbqy27x79fg1ikzhwlnv6"; + url = "https://www.sqlite.org/2018/sqlite-src-3220000.zip"; + sha256 = "04w97jj1659vl84rr73wg1mhj6by8r5075rzpn2xp42n537a7ibv"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index d4ea531f886e922ad31f395883dc293b9b1e59a1..29ad55eb9d92f960ab6683394f222d41eb6b2f45 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libsrtp-${version}"; - version = "1.5.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "0s029m4iw0nsvnsm2hlz8yajrasdvf315iv2dw8mfm7nhbshwsqa"; + sha256 = "1q2rf1d2bsypdnw9k8ag6hrh9vbinfa504d1f42fdgdqw31d6lib"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 1430c3aa9c2959c90cb73bf9ae728af8709dc15e..89261b665f5090cd0ea655581cdccd1fd81a0460 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, libiconv }: stdenv.mkDerivation rec { - name = "stfl-0.22"; + name = "stfl-0.24"; src = fetchurl { url = "http://www.clifford.at/stfl/${name}.tar.gz"; - sha256 = "062lqlf3qhp8bcapbpc0k3wym7x6ngncql8jmx5x06p6679szp9d"; + sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl"; }; buildInputs = [ ncurses libiconv ]; @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h '' + ( stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile sed -i s/-soname/-install_name/ Makefile '' ) + '' make @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { DESTDIR=$out prefix=\"\" make install # some programs rely on libstfl.so.0 to be present, so link it - ln -s $out/lib/libstfl.so.0.22 $out/lib/libstfl.so.0 + ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0 ''; meta = { @@ -35,4 +34,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; }; } - diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..41f7267fdca958cbf7e36ae3996e313bc5f18d83 --- /dev/null +++ b/pkgs/development/libraries/sundials/default.nix @@ -0,0 +1,28 @@ +{ cmake, fetchurl, python, stdenv }: + +stdenv.mkDerivation rec { + + pname = "sundials"; + version = "3.1.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; + sha256 = "0fnlrpj6qjamxahd70r4vsgv85kxbgh93gxqk5xzf9ln6a7jzm8q"; + }; + + preConfigure = '' + export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out -DEXAMPLES_INSTALL_PATH=$out/share/examples $cmakeFlags" + ''; + + buildInputs = [ cmake python ]; + + meta = with stdenv.lib; { + description = "Suite of nonlinear differential/algebraic equation solvers"; + homepage = https://computation.llnl.gov/casc/sundials/main.html; + platforms = platforms.all; + maintainers = [ maintainers.idontgetoutmuch ]; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/development/libraries/swc/default.nix b/pkgs/development/libraries/swc/default.nix deleted file mode 100644 index bbc3aa20dd60eb9de22665153ecd9cdd8ec596c2..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/swc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig -, wld, wayland, xwayland, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm -}: - -stdenv.mkDerivation rec { - name = "swc-${version}"; - version = "git-2016-02-09"; - repo = "https://github.com/michaelforney/swc"; - rev = "1da0ef13fddc572accea12439a4471b4d2f64ddd"; - - src = fetchurl { - url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "d1894612d8aa1ce828efb78f1570290f84bba6563e21eb777e08c3c3859b7bbe"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ wld wayland xwayland fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ]; - - prePatch = '' - substituteInPlace launch/local.mk --replace 4755 755 - ''; - - makeFlags = "PREFIX=$(out)"; - installPhase = "PREFIX=$out make install"; - - meta = { - description = "A library for making a simple Wayland compositor"; - homepage = repo; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index e6fb5a2b685305325b31a438fe3049b75c263bdc..272967fcb9969a162dcfcba8ea46f45819ab7646 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,14 +1,14 @@ { stdenv, python, fetchurl, openssl, boost }: stdenv.mkDerivation rec { name = "swiften-${version}"; - version = "3.0beta2"; + version = "4.0"; buildInputs = [ python ]; propagatedBuildInputs = [ openssl boost ]; src = fetchurl { url = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; - sha256 = "0i6ks122rry9wvg6qahk3yiggi7nlkpgws1z0r41vi4i1siq0ls0"; + sha256 = "06bk45hxqmny8z7x78ycrfrazq6xdzv5c28i8x0lgc85j03b5dsh"; }; buildPhase = '' diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index b1649da6459fd0c4478426aea7c56727a48a87eb..53e48eb893179f1a229d41591af60f143ca32d12 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -1,17 +1,57 @@ -{stdenv, fetchurl}: +{ stdenv +, fetchurl +, fetchpatch +, Carbon ? null +, libjpeg ? null +, libpng ? null +, withJpegSupport ? true # support jpeg output +, withPngSupport ? true # support png output +}: + +assert withJpegSupport -> libjpeg != null; +assert withPngSupport -> libpng != null; +assert stdenv.isDarwin -> Carbon != null; + stdenv.mkDerivation rec { name = "tachyon-${version}"; - version = "0.98.9"; + version = "0.99b2"; src = fetchurl { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz"; - sha256 = "1ms0xr4ibrzz291ibm265lyjrdjrmhfrx0a70hwykhsdxn6jk8y6"; + sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v"; }; - buildInputs = []; - preBuild = "cd unix"; - arch = if stdenv.system == "x86_64-linux" then "linux-64-thr" else - if stdenv.system == "i686-linux" then "linux-thr" else + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + Carbon + ] ++ stdenv.lib.optionals withJpegSupport [ + libjpeg + ] ++ stdenv.lib.optionals withPngSupport [ + libpng + ]; + preBuild = '' + cd unix + '' + stdenv.lib.optionalString withJpegSupport '' + export USEJPEG=" -DUSEJPEG" + export JPEGLIB=" -ljpeg" + '' + stdenv.lib.optionalString withPngSupport '' + export USEPNG=" -DUSEPNG" + export PNGLIB=" -lpng -lz" + ''; + arch = if stdenv.system == "x86_64-linux" then "linux-64-thr" else + if stdenv.system == "i686-linux" then "linux-thr" else + if stdenv.system == "aarch64-linux" then "linux-arm-thr" else + if stdenv.system == "x86_64-darwin" then "macosx-thr" else + if stdenv.system == "i686-darwin" then "macosx-64-thr" else + if stdenv.system == "i686-cygwin" then "win32" else + if stdenv.system == "x86_64-freebsd" then "bsd" else + if stdenv.system == "x686-freebsd" then "bsd" else throw "Don't know what arch to select for tachyon build"; makeFlags = "${arch}"; + patches = [ + # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) + ./no-absolute-paths.patch + # Include new targets (like arm) + ./make-archs.patch + ]; + installPhase = '' cd ../compile/${arch} mkdir -p "$out"/{bin,lib,include,share/doc/tachyon,share/tachyon} @@ -26,7 +66,8 @@ stdenv.mkDerivation rec { description = ''A Parallel / Multiprocessor Ray Tracing System''; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + # darwin fails due to missing Carbon.h, even though Carbon is a build input + platforms = with stdenv.lib.platforms; linux ++ cygwin; homepage = http://jedi.ks.uiuc.edu/~johns/tachyon/; }; } diff --git a/pkgs/development/libraries/tachyon/make-archs.patch b/pkgs/development/libraries/tachyon/make-archs.patch new file mode 100644 index 0000000000000000000000000000000000000000..cf83f8c8c31c27790da41b69acf73d8ded3a7afd --- /dev/null +++ b/pkgs/development/libraries/tachyon/make-archs.patch @@ -0,0 +1,37 @@ +diff --git a/unix/Make-arch b/unix/Make-arch +index 08afb85..dbeb691 100644 +--- a/unix/Make-arch ++++ b/unix/Make-arch +@@ -920,6 +920,15 @@ macosx: + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB)" + ++macosx-64: ++ $(MAKE) all \ ++ "ARCH = macosx" \ ++ "CFLAGS = -Os -m64 -ffast-math -DBsd $(MISCFLAGS)" \ ++ "ARFLAGS = r" \ ++ "STRIP = strip" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -ltachyon $(MISCLIB)" ++ + macosx-thr: + $(MAKE) all \ + "ARCH = macosx-thr" \ +@@ -1209,6 +1218,16 @@ linux-thr: + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" + ++# Linux Arm using gcc, with threads ++linux-arm-thr: ++ $(MAKE) all \ ++ "ARCH = linux-arm-thr" \ ++ "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ ++ "ARFLAGS = r" \ ++ "STRIP = strip" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" ++ + # Linux x86 using gcc, threads, and OpenGL + linux-thr-ogl: + $(MAKE) all \ diff --git a/pkgs/development/libraries/tachyon/no-absolute-paths.patch b/pkgs/development/libraries/tachyon/no-absolute-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..faa3810fb5c6bc45216fe977baef4a5ffd46a970 --- /dev/null +++ b/pkgs/development/libraries/tachyon/no-absolute-paths.patch @@ -0,0 +1,57 @@ +diff --git a/unix/Make-config b/unix/Make-config +index ee4f388..c1d51d4 100644 +--- a/unix/Make-config ++++ b/unix/Make-config +@@ -18,7 +18,7 @@ + # Bourne Shell Configuration: + # set SHELL=/bin/sh or wherever your bourne shell is + ########################################################################## +-SHELL=/bin/sh ++# SHELL=/bin/sh + + + +@@ -30,7 +30,7 @@ SHELL=/bin/sh + + # The following line should be set to -Ixxx where xxx is your X11 include path + # Sun puts X11 in /usr/openwin/xxx +-X11INC= -I/usr/openwin/include ++# X11INC= -I/usr/openwin/include + + # Others typically use /usr/X11 or /usr/X11R6 + #X11INC= -I/usr/X11 +@@ -57,7 +57,7 @@ X11LIB= -lX11 + ########################################################################## + + # Standard MPICH installation location +-MPIDIR=/usr/local/mpi ++# MPIDIR=/usr/local/mpi + + # UMR CS Dept + #MPIDIR=/software/all/mpi +@@ -108,9 +108,9 @@ MBOX= + # http://www.ijg.org/files/ + ########################################################################## + # Uncomment the following lines to disable JPEG support +-USEJPEG= +-JPEGINC= +-JPEGLIB= ++# USEJPEG= ++# JPEGINC= ++# JPEGLIB= + + # Uncomment the following lines to enable JPEG support + #USEJPEG= -DUSEJPEG +@@ -128,9 +128,9 @@ JPEGLIB= + # http://www.libpng.org/ + ########################################################################## + # Uncomment the following lines to disable PNG support +-USEPNG= +-PNGINC= +-PNGLIB= ++# USEPNG= ++# PNGINC= ++# PNGLIB= + + # Uncomment the following lines to enable PNG support + #USEPNG= -DUSEPNG diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 71b8a764eed18c03aac87a4c3f2538dc72f31dcb..1caa8a376fb1bc286bbf04c50f58c594f0d235d0 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -8,10 +8,9 @@ stdenv.mkDerivation rec { sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj"; }; - cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - nativeBuildInputs = [ cmake ]; meta = { homepage = http://developer.kde.org/~wheeler/taglib.html; diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 602aab852cccbed48a6363a5f23480e74600577a..67db6e5097d05c89e6828d1ed152573987f13c94 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -1,24 +1,40 @@ -{stdenv, fetchurl, zlib, cmake}: +{stdenv, fetchurl, zlib, cmake, fetchpatch}: stdenv.mkDerivation rec { - name = "taglib-1.10"; + name = "taglib-1.11.1"; src = fetchurl { - url = "http://taglib.github.io/releases/${name}.tar.gz"; - sha256 = "1alv6vp72p0x9i9yscmz2a71anjwqy53y9pbcbqxvc1c0i82vhr4"; + url = "http://taglib.org/releases/${name}.tar.gz"; + sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn"; }; - cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; + patches = [ + (fetchpatch { + # https://github.com/taglib/taglib/issues/829 + name = "CVE-2017-12678.patch"; + url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch"; + sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90"; + }) + ]; - buildInputs = [ zlib ]; nativeBuildInputs = [ cmake ]; - meta = { - homepage = http://developer.kde.org/~wheeler/taglib.html; - repositories.git = git://github.com/taglib/taglib.git; + buildInputs = [ zlib ]; - description = "A library for reading and editing the meta-data of several popular audio formats"; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + + meta = with stdenv.lib; { + homepage = http://taglib.org/; + repositories.git = git://github.com/taglib/taglib.git; + description = "A library for reading and editing audio file metadata."; + longDescription = '' + TagLib is a library for reading and editing the meta-data of several + popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 + files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, + Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. + ''; + license = with licenses; [ lgpl3 mpl11 ]; inherit (cmake.meta) platforms; - maintainers = [ ]; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 1e7448b66050e4ead0286742793252cf54f77faf..1d6818276eb88ed3c39947bc1474378af5e7d1b0 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.8"; + name = "talloc-2.1.12"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "0c3ihyb0jd8mhvi7gg2mr5w1zl2habx6jlkbyxzyckad2q8lkl92"; + sha256 = "0jv0ri9vj93fczzgl7rn7xvnfgl2kfx4x85cr8h8v52yh7v0qz4q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 13b1970866e753769f71618f074a8f7970cd5a2c..182fbb35d499ef9f4fdfd97b3407b2301c580108 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -16,6 +16,8 @@ with stdenv.lib; stdenv.mkDerivation rec { optional (stdver != null) "stdver=${stdver}" ); + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; + installPhase = '' mkdir -p $out/{lib,share/doc} cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ diff --git a/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch b/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch new file mode 100644 index 0000000000000000000000000000000000000000..64056ecb14624eb76cfbdece1b598404b9819e06 --- /dev/null +++ b/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch @@ -0,0 +1,43 @@ +From b577153a10c98f4e13405dc93ea2ab1a7b990e07 Mon Sep 17 00:00:00 2001 +From: David Huffman +Date: Wed, 6 Jan 2016 07:09:30 -0500 +Subject: [PATCH] hard-code glibc's definition of struct mallinfo + +--- + src/tbbmalloc/proxy.h | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h +index 781cadc..e1ea1ae 100644 +--- a/src/tbbmalloc/proxy.h ++++ b/src/tbbmalloc/proxy.h +@@ -32,6 +32,26 @@ + + #include + ++// The following definition was taken from /usr/include/malloc.h as provided by ++// the glibc-devel-2.19-17.4.x86_64 package on openSUSE Leap 42.1; it is ++// made available under the GNU Lesser General Public License v2.1 or later. ++// See . ++// ++// Copyright (C) 1996-2014 Free Software Foundation, Inc. ++struct mallinfo ++{ ++ int arena; /* non-mmapped space allocated from system */ ++ int ordblks; /* number of free chunks */ ++ int smblks; /* number of fastbin blocks */ ++ int hblks; /* number of mmapped regions */ ++ int hblkhd; /* space in mmapped regions */ ++ int usmblks; /* maximum total allocated space */ ++ int fsmblks; /* space available in freed fastbin blocks */ ++ int uordblks; /* total allocated space */ ++ int fordblks; /* total free space */ ++ int keepcost; /* top-most, releasable (via malloc_trim) space */ ++}; ++ + extern "C" { + void * scalable_malloc(size_t size); + void * scalable_calloc(size_t nobj, size_t size); +-- +2.6.2 + diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index 276b279fc09e4d2442d57d2e80bdb2c5fbbb9efc..a92c7b74ebf78a128bbcf71cd9a0f8db8c33c69f 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tclap-1.2.1"; + name = "tclap-1.2.2"; src = fetchurl { url = "mirror://sourceforge/tclap/${name}.tar.gz"; - sha256 = "1fzf7l1wvlhxnpwi15jvvfizn836s7r0r8vckgbqk2lyf7ihz7wz"; + sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; }; meta = { diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 75b811df30c38389cd4d6a6cd42a2edde65883d2..6ffbe5dc60c5ca5b18facc0d9644ad628eb16715 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tcllib-${version}"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; - sha256 = "05dmrk9qsryah2n17z6z85dj9l9lfyvnsd7faw0p9bs1pp5pwrkj"; + sha256 = "173abxaazdmf210v651708ab6h7xhskvd52krxk6ifam337qgzh1"; }; passthru = { diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 7ccd98856f628a5609e588a85f479f185b565f76..d372c61dbe28f9ca5ceb909a9fa59c99e7fc8519 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tdb-1.3.11"; + name = "tdb-1.3.15"; src = fetchurl { url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "0i1l38h0vyck6zkcj4fn2l03spadlmyr1qa1xpdp9dy2ccbm3s1r"; + sha256 = "0a37jhpij8wr4f4pjqdlwnffy2l6a2vkqdpz1bqxj6v06cwbz8dl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index aed08435a149a954561bfa003260711177a1bd20..41308a7ef4ecb6c01c46607ad1e302818808a2e4 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, telepathy_glib, farstream, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, telepathy-glib, farstream, dbus-glib }: stdenv.mkDerivation rec { name = "${pname}-0.6.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g"; }; - propagatedBuildInputs = [ dbus_glib telepathy_glib farstream ]; + propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; nativeBuildInputs = [ pkgconfig ]; meta = { diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index fffe677f6a71f5c7283b454cb6c90ada9d598eb2..df5c76abd7cdb2c6dcd1f311620c007394b0455a 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt +{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt , gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings"; LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [dbus_glib glib gobjectIntrospection]; + propagatedBuildInputs = [dbus-glib glib gobjectIntrospection]; nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38; buildInputs = [ glibcLocales python2 ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 93d69d5a8d99e492b25f479f10d328eb4009b2e2..90dd47c11e2f66c314d051a91c8e8288a2edb9b2 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,54 +1,40 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus_glib, dbus_daemon -, telepathy_farstream, telepathy_glib, fetchpatch }: +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon +, telepathy-farstream, telepathy-glib, fetchpatch }: let inherit (python2Packages) python dbus-python; in stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.6.1"; + name = "telepathy-qt-0.9.7"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "1y51c6rxk5qvmab98c8rnmrlyk27hnl248casvbq3cd93sav8vj9"; + sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1"; }; - patches = let - mkUrl = hash: "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=" + hash; - in [ - (fetchpatch { - name = "gst-1.6.patch"; - url = mkUrl "ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb"; - sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2"; - }) - (fetchpatch { - name = "parallel-make-1.patch"; - url = mkUrl "1e1f53e9d91684918c34ec50392f86287e001a1e"; - sha256 = "1f9nk0bi90armb9zay53c7cz70zcwqqwli7sb9wgw76rmwqhl8qw"; - }) - (fetchpatch { - name = "parallel-make-2.patch"; - url = mkUrl "7389dc990c67d4269f3a79c924c054e87f2e4ac5"; - sha256 = "0mvdvyy76kpaxacljidf06wd43fr2qripr4mwsakjs3hxb1pkk57"; - }) - ]; - nativeBuildInputs = [ cmake pkgconfig python ]; - propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib dbus-python ]; - - buildInputs = stdenv.lib.optional doCheck dbus_daemon; - - cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}"; - - # should be removable after the next update - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; - - preBuild = '' - NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" - ''; + propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; + buildInputs = [ dbus-glib ]; + checkInputs = [ dbus_daemon dbus-python ]; + + patches = [ + # https://github.com/TelepathyIM/telepathy-qt/issues/25 + (fetchpatch { + url = https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch; + sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh"; + }) + ]; + + # No point in building tests if they are not run + # On 0.9.7, they do not even build with QT4 + cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; enableParallelBuilding = true; doCheck = false; # giving up for now - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Telepathy Qt bindings"; + homepage = https://telepathy.freedesktop.org/components/telepathy-qt/; + license = licenses.lgpl21; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 2982d33e996264e7f0129b6a866c5db5916cd802..154db61894fa507700082ac3beb8122c54fdaa39 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.30"; + name = "tevent-0.9.36"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "1gccqiibf6ia129xhqrg18anax3sxwfbwm8h4pvsga3ndxg931ap"; + sha256 = "0k1v4vnlzpf7h3p4khaw8a7damrc68g136bf2xzys08nzpinnaxx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index a0110c5f22b25b0be36f2101916ea06532de8e90..2a1180533cea809f169c38c72a290fbcae14c9e1 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C library for property-based testing"; platforms = stdenv.lib.platforms.linux; - homepage = "http://github.com/silentbicycle/theft/"; + homepage = "https://github.com/silentbicycle/theft/"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.kquick ]; }; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 55855d05d16ed8669b5ae1135071a0b811f720b7..45e5174ed573465cafc32ad1d4f37ddc52aaafa1 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "thrift-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; - sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292"; + sha256 = "1hk0zb9289gf920rdl0clmwqx6kvygz92nj01lqrhd2arfv3ibf4"; }; #enableParallelBuilding = true; problems on hydra diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 0156c64306c7dca9c18fccd7e7e0be51f3fcd140..99f0bb65441c2e71296e83fee867b6cc2e3846ce 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,15 +1,19 @@ -{ fetchurl, stdenv, autoreconfHook, libkrb5 }: +{ fetchurl, fetchpatch, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-1.0.2"; + name = "libtirpc-1.0.3"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j"; + sha256 = "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6"; }; postPatch = '' sed '1i#include ' -i src/xdr_sizeof.c + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace tirpc/rpc/types.h \ + --replace '#if defined __APPLE_CC__ || defined __FreeBSD__' \ + '#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined __GLIBC__' ''; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 9011d33e9222d7481b1a1e6903bab08b158860bb..7f1b3ebcbf5b24c7eb27b33dce81f206ac943ef5 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tinyxml-2-${version}"; - version = "4.0.1"; + version = "6.0.0"; src = fetchFromGitHub { repo = "tinyxml2"; owner = "leethomason"; rev = version; - sha256 = "1a0skfi8rzk53qcxbv88qlvhlqzvsvg4hm20dnx4zw7vrn6anr9y"; + sha256 = "031fmhpah449h3rkyamzzdpzccrrfrvjb4qn6vx2vjm47jwc54qv"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 5e3d160000048b3073c9ab8d08ad43b0be6ff57b..23ef997e5ce1568211c6a7fdebb1d7879734df04 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0.12"; src = fetchurl { - url = http://math.nist.gov/tnt/tnt_3_0_12.zip; + url = https://math.nist.gov/tnt/tnt_3_0_12.zip; sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://math.nist.gov/tnt/; + homepage = https://math.nist.gov/tnt/; description = "Template Numerical Toolkit: C++ headers for array and matrices"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index d11a5c344c9d2c7314c30fd7ff681385fff18bb2..75a494cfbdedeaccf2c0e1bd1bcdce22fbfc7cfb 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; }; - buildInputs = [ cxxtools postgresql mysql sqlite zlib openssl ]; + buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index fec256e703fe8672142a8c1eba7f145e9a486f2f..5609f1d67d17ff4f0a74f60a450b403326f4a3ad 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchsvn, autoreconfHook, pkgconfig, libogg }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }: stdenv.mkDerivation rec { - name = "tremor-svn-${src.rev}"; + name = "tremor-unstable-2018-03-16"; - src = fetchsvn { - url = http://svn.xiph.org/trunk/Tremor; - rev = "17866"; - sha256 = "161411cbefa1527da7a8fc087e78d8e21d19143d3a6eb42fb281e5026aad7568"; + src = fetchgit { + url = https://git.xiph.org/tremor.git; + rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f"; + sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://xiph.org/tremor/; + homepage = https://xiph.org/tremor/; description = "Fixed-point version of the Ogg Vorbis decoder"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 8fa974a95e24a5eaaa3ad2fe910065d69dd920cd..b02ac8852371ae780c04eb3404b599b0b461d056 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -3,17 +3,17 @@ }: stdenv.mkDerivation rec { - name = "udunits-2.2.24"; + name = "udunits-2.2.26"; src = fetchurl { url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; - sha256 = "15bz2wv46wiwdzai8770gzy05prgj120x6j2hmihavv5y89cbfi0"; + sha256 = "0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn"; }; nativeBuildInputs = [ bison flex file ]; buildInputs = [ expat ]; meta = with stdenv.lib; { - homepage = http://www.unidata.ucar.edu/software/udunits/; + homepage = https://www.unidata.ucar.edu/software/udunits/; description = "A C-based package for the programatic handling of units of physical quantities"; license = licenses.bsdOriginal; platforms = platforms.linux; diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 26c040721bdff1ac826705b72ae4bccdabf4f118..377ceba59e70da1c1947fe64fba78f2d2913d176 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, autoconf, gtk_doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }: +{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }: stdenv.mkDerivation rec { version="0.5.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf gtk_doc automake libtool glib libsoup gobjectIntrospection ]; + buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobjectIntrospection ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 9a2f6eb203a16ad650a22f69582c31b458213c3c..ccd876dfefbd4a8f5cec2e06877f7b8f686fe676 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "uid_wrapper-1.2.0"; + name = "uid_wrapper-1.2.4"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0sfznk53kmz9m3rxwbv4pwwqs4bw3kr917y4n53h5jaxjym0m4c0"; + sha256 = "1yjhrm3rcyiykkrgpifmig117mzjxrms75kp8gpp8022f59zcq1w"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index fdf882ce817e212ecfee0fe727c3ba3501defd30..fb43af3624338f848461196ed522b65d2aba49f3 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,29 +1,26 @@ -{ stdenv, fetchFromGitHub, autoreconfHook -, pkgconfig, glib, systemd, libgudev, vala }: +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk-doc +, pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { - name = "umockdev"; - version = "0.8.13"; + name = "umockdev-${version}"; + version = "0.11.2"; src = fetchFromGitHub { owner = "martinpitt"; repo = "umockdev"; rev = version; - sha256 ="0bw2dpshlgbdwg5mhq4j22z474llpqix8pxii63r2bk5nhjc537k"; + sha256 ="1dvhs9nkznlnagzjny61fh574g42c47b9s5hxsqdgqb51njawdg1"; }; - buildInputs = [ glib systemd libgudev vala ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib systemd libgudev ]; + nativeBuildInputs = [ automake autoconf libtool gtk-doc pkgconfig vala ]; - ### 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 - ''; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; meta = with stdenv.lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl2; maintainers = [ maintainers.ndowens ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 53207f85541871f1861fe4c84f9296367df6636c..7c92e7224f9ef9c4908b5e5bc248e2a767c57991 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl }: stdenv.mkDerivation rec { name = "unibilium-${version}"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mauke"; repo = "unibilium"; rev = "v${version}"; - sha256 = "11mbfijdrvbmdlmxs8j4vij78ki0vna89yg3r9n9g1i6j45hiq2r"; + sha256 = "1wa9a32wzqnxqh1jh554afj13dzjr6mw2wzqzw8d08nza9pg2ra2"; }; makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ libtool ]; meta = with lib; { diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9f9d8e62de5061b4850fd29e87929d81f5f97075 --- /dev/null +++ b/pkgs/development/libraries/unicorn-emu/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, bash, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "unicorn-emulator-${version}"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/unicorn-engine/unicorn/archive/${version}.tar.gz"; + sha256 = "0z01apwmvhvdldm372ww9pjfn45awkw3m90c0h4v0nj0ihmlysis"; + }; + + configurePhase = '' patchShebangs make.sh ''; + buildPhase = '' ./make.sh ''; + installPhase = '' env PREFIX=$out ./make.sh install ''; + + nativeBuildInputs = [ pkgconfig python ]; + enableParallelBuilding = true; + + meta = { + description = "Lightweight multi-platform CPU emulator library"; + homepage = "http://www.unicorn-engine.org"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 97cffbf0f75bd89f5bccd4c355bca3706b66fd82..90a28df6a15a58485840ac1e0fc35f33e726b153 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "unittest-cpp-${version}"; - version = "1.6.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "unittest-cpp"; repo = "unittest-cpp"; rev = "v${version}"; - sha256 = "1sva2bm90z4vmwwvp0af82f7p4sdq5j2jjqzhs2ppihdkggn62d1"; + sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"; }; buildInputs = [cmake]; diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 99ab8a0561628849b2336918a3329a8bd5b1fa15..ccd243e1f735b1bb4025bec80fcfd5129025db76 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unixODBC-${version}"; - version = "2.3.4"; + version = "2.3.6"; src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; - sha256 = "0f8y88rcc2akjvjv5y66yx7k0ms9h1s0vbcfy25j93didflhj59f"; + sha256 = "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8"; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 233fdd902541ec765a4480d370900f6d680cd46c..e7a2dee541d0697539deca5b393083cc11e5a83c 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -5,11 +5,11 @@ { psql = stdenv.mkDerivation rec { name = "psqlodbc-${version}"; - version = "09.05.0210"; + version = "10.01.0000"; src = fetchurl { url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; - sha256 = "0317zrxaiy209xzcc6b5sz6hsyiv4zm74iikp91rgz7z3ll4n4dc"; + sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7"; }; buildInputs = [ unixODBC postgresql ]; @@ -37,19 +37,12 @@ }; nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC mariadb.lib ]; + buildInputs = [ unixODBC mariadb.connector-c ]; cmakeFlags = [ - "-DMARIADB_INCLUDE_DIR=${mariadb.lib}/include/mysql" + "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb" ]; - preConfigure = '' - sed -i \ - -e 's,mariadb_config,mysql_config,g' \ - -e 's,libmariadbclient,libmysqlclient,g' \ - cmake/FindMariaDB.cmake - ''; - passthru = { fancyName = "MariaDB"; driver = "lib/libmyodbc3-3.51.12.so"; @@ -60,7 +53,6 @@ homepage = https://downloads.mariadb.org/connector-odbc/; license = licenses.gpl2; platforms = platforms.linux; - broken = true; }; }; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 6b5c48a6105da4afe544db95169da509423db9ee..9b4e3a74afe17a0c7421ec28ca9f12f27f681f87 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uriparser-${version}"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "mirror://sourceforge/project/uriparser/Sources/${version}/${name}.tar.bz2"; - sha256 = "08vvcmg4mcpi2gyrq043c9mfcy3mbrw6lhp86698hx392fjcsz6f"; + sha256 = "1p9c6lr39rjl4bbzi7wl2nsg72gcz8qhicxh9v043qyr0dfcvsjq"; }; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index e4e053805af7432f6137143839c3dee5f36e1b35..515c3b2ca3b987c465d51e9709cf47bc89e4ad3b 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"; }; - # Works around bunch of "format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'" warnings - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index c2cd5a01516854b0f4c7ecee481fa8669e4d3d8d..f14ec4fc6084b365c7b8b9a22b63991ad7740348 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -7,13 +7,11 @@ assert readline != null; let - arch = if stdenv.isArm - then if stdenv.is64bit - then"arm64" - else "arm" - else if stdenv.is64bit - then"x64" - else "ia32"; + arch = if stdenv.isx86_64 then "x64" + else if stdenv.isi686 then "ia32" + else if stdenv.isAarch64 then "arm64" + else if stdenv.isArm then "arm" + else throw "Unknown architecture for v8"; git_url = "https://chromium.googlesource.com"; clangFlag = if stdenv.isDarwin then "1" else "0"; sharedFlag = if static then "static_library" else "shared_library"; @@ -158,10 +156,12 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu patchelf ] - ++ stdenv.lib.optionals stdenv.isDarwin [ cctools ]; + buildInputs = [ readline python icu ] + ++ stdenv.lib.optional stdenv.isDarwin cctools + ++ stdenv.lib.optional stdenv.isLinux patchelf; - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes"; + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes" + + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; buildFlags = [ "LINK=c++" @@ -172,6 +172,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + # the `libv8_libplatform` target is _only_ built as a static library, # and is expected to be statically linked in when needed. # see the following link for further commentary: diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index dcb44a408a829c79d20263155dd94ca6ac10cb7c..4e729db4671e10a7dabcde3d8600b5fcdf7952cc 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, gnum4, pkgconfig, python2 -, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland +{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 +, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext }: stdenv.mkDerivation rec { name = "intel-vaapi-driver-${version}"; - version = "1.8.2"; + inherit (libva) version; - src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "00mpcvininwr5c4wyhp16s4bddg7vclxxjm2sfq5h7lifjcxyv46"; + src = fetchFromGitHub { + owner = "01org"; + repo = "libva-intel-driver"; + rev = version; + sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763"; }; patchPhase = '' @@ -25,12 +27,14 @@ stdenv.mkDerivation rec { "--enable-wayland" ]; - nativeBuildInputs = [ gnum4 pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; - buildInputs = [ intel-gpu-tools libdrm libva libX11 mesa_noglu wayland ]; + buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; + homepage = https://cgit.freedesktop.org/vaapi/intel-driver/; license = licenses.mit; description = "Intel driver for the VAAPI library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 4522ecc1bb6397d9c00d7521d164cbf535ddfe4a..013af68cb6c476682512e14b83c9a4fce01338f4 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }: +{ stdenv, fetchurl, libvdpau, libGLU_combined, libva, pkgconfig }: let libvdpau08patch = (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch?revision=1.1"; name = "libva-vdpau-driver-0.7.4-libvdpau-0.8.patch"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libvdpau mesa libva ]; + buildInputs = [ libvdpau libGLU_combined libva ]; preConfigure = '' patch -p0 < ${libvdpau08patch} # use -p0 instead of -p1 @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { - homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; + homepage = https://cgit.freedesktop.org/vaapi/vdpau-driver/; license = stdenv.lib.licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 6864db12f18db5190f855aab3da47bfb237051a1..e45337c8cf5de7fcfc9b7364aa5d430bb44ed8ca 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , zimg, libass, python3, libiconv , ApplicationServices, nasm -, ocrSupport ? false, tesseract -, imwriSupport? true, imagemagick7 +, ocrSupport ? false, tesseract ? null +, imwriSupport? true, imagemagick7 ? null }: assert ocrSupport -> tesseract != null; @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R39"; + version = "R43"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "0cw7w8xiwhxhwykydy13m44wm9vn9hrsi30z6017ngga9d84fhqy"; + sha256 = "01yzxggjxr6fz3wj81z6vgp9m4jqddyk73i22kz2x620cpdgb9j9"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "A video processing framework with the future in mind"; homepage = http://www.vapoursynth.com/; license = licenses.lgpl21; - platforms = platforms.unix; + platforms = platforms.x86_64; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 1dbbcf798c9fc839bb732acbb52e71fb58b457f8..e2a2af615b88706eac158d995402026ee88b6bfd 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "Vc-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "119sm0kldr5j163ff04fra35420cvpj040hs7n0mnfbcgyx4nxq9"; + sha256 = "0y4riz2kiw6a9w2zydj6x0vhy2qc9v17wspq3n2q88nbas72yd2m"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index e93f071aefacf4a4d1e6acb8eb8ef357b299b676..48ad33424f60984b3e1ad21cb5f3b84b3aba9d56 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libcdio, libxml2, popt }: +{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt }: -stdenv.mkDerivation { - name = "vcdimager-0.7.24"; +stdenv.mkDerivation rec { + name = "vcdimager-2.0.1"; src = fetchurl { - url = mirror://gnu/vcdimager/vcdimager-0.7.24.tar.gz; - sha256 = "1526jxynslg07i50v3c3afhc8swbd4si8y6s8m3h1wrz6mkplp87"; + url = "mirror://gnu/vcdimager/${name}.tar.gz"; + sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7"; }; nativeBuildInputs = [ pkgconfig ]; @@ -14,9 +14,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ libcdio ]; - meta = { + meta = with lib; { homepage = http://www.gnu.org/software/vcdimager/; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = stdenv.lib.platforms.gnu; # random choice + platforms = platforms.gnu; # random choice + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 324d977c72e50104675a4471d0e6fa93e11e91ad..438b4eda454bf92b7b9039e63239dc0feca4cafc 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; - homepage = http://hci.iwr.uni-heidelberg.de/vigra; + homepage = https://hci.iwr.uni-heidelberg.de/vigra; license = licenses.mit; maintainers = [ maintainers.viric ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2cd3b5a20c0c90b01e988759f205cea88f107338 --- /dev/null +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa_noglu }: + + +stdenv.mkDerivation rec { + + name = "virglrenderer-${version}"; + version = "0.6.0"; + + src = fetchurl { + url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2"; + sha256 = "a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a"; + }; + + buildInputs = [ libGLU epoxy libX11 libdrm mesa_noglu ]; + + nativeBuildInputs = [ pkgconfig ]; + + # Fix use of fd_set without proper include + prePatch = '' + sed -e '1i#include ' -i vtest/util.c + ''; + + meta = with stdenv.lib; { + description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; + homepage = https://virgil3d.github.io/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.xeji ]; + }; + +} diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index 9bef1b27e9cd7224169f5c405756d56c15d88077..e0398487abc3f92132fe3c123f3194063d87e647 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.vmime.org/; + homepage = https://www.vmime.org/; description = "Free mail library for C++"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index ccdf2b05e7e33a2bce06144122830b07cb27e699..18b9278539fc841770579ef30fc5748881da0e4c 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { computations and frustum culling classes, and spatial data structures''; license = licenses.bsd2; - homepage = http://github.com/VMML/vmmlib/; + homepage = https://github.com/VMML/vmmlib/; maintainers = [ maintainers.adev ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ba6e437ca3c38f34a69274b462aafe841fdb3cad --- /dev/null +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, autoreconfHook }: + +let + version = "0.1.3"; +in +stdenv.mkDerivation { + name = "vo-amrwbenc-${version}"; + version = "0.1.3"; + buildInputs = [ autoreconfHook ]; + src = fetchurl { + url = "https://github.com/mstorsjo/vo-amrwbenc/archive/v${version}.tar.gz"; + sha256 = "85c79997ba7ddb9c95b5ddbe9ea032e27595390f3cbd686ed46a69e485cc053c"; + }; + + meta = { + homepage = "http://sourceforge.net/projects/opencore-amr/"; + description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; + license = "stdenv.lib.licenses.apache"; + maintainers = [ stdenv.lib.maintainers.Esteth ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index 5250b781590687491cebab51e161942cf677ec92..ddeecce21c6147253d6363e8b625302de0ae1ba4 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, mesa }: +{ stdenv, fetchFromGitHub, unzip, cmake, libGLU_combined }: stdenv.mkDerivation rec { name = "${pname}-${date}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "032q295d68w34rk5q8nfqdd29s55n00bfik84y7xzkjrpspaprlh"; }; - buildInputs = [ unzip cmake mesa ]; + buildInputs = [ unzip cmake libGLU_combined ]; doCheck = false; # FIXME: test failure checkTarget = "test"; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 5b0bdb4ee7414563377861582d021e3a832b0c91..984a106236ce07b135ec3c22ddce79fef5e67e2b 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt +{ stdenv, fetchurl, fetchpatch, cmake, libGLU_combined, libX11, xproto, libXt , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = if !stdenv.isDarwin - then [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib + then [ cmake libGLU_combined libX11 xproto libXt ] ++ optional (qtLib != null) qtLib else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 8330f7f44f33a77da1baf0b63eac4daf412e9bba..cc6e7211b1d26bf40c5a0e48196ebc515212d51e 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, makeWrapper }: + libXext, wayland, libGL_driver, makeWrapper }: let - version = "1.0.42.2"; + version = "1.1.70.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-LoaderAndValidationLayers"; rev = "sdk-${version}"; - sha256 = "0na1ax2cgv6w29213mby56mndfsj3iizj3n5pbpy4s4p7ij9kdgn"; + sha256 = "1a7xwl65bi03l4zbjq54qkxjb8kb4m78qvw8bas5alhf9v6i6yqp"; }; in @@ -18,23 +18,28 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ cmake git python3 python3Packages.lxml - glslang spirv-tools x11 libxcb libXrandr libXext wayland + glslang x11 libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_WSI_MIR_SUPPORT=OFF" - "-DFALLBACK_DATA_DIRS=${mesa_noglu.driverLink}/share:/usr/local/share:/usr/share" + "-DFALLBACK_DATA_DIRS=${libGL_driver.driverLink}/share:/usr/local/share:/usr/share" ]; outputs = [ "out" "dev" "demos" ]; + patches = [ ./rev-file.patch ]; + + postUnpack = '' + # Hack so a version header can be generated. Relies on ./rev-file.patch to work. + mkdir -p "$sourceRoot/external/glslang/External" + echo "${spirv-tools.src.rev}" > "$sourceRoot/external/glslang/External/spirv-tools" + ''; preConfigure = '' checkRev() { [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1) } - checkRev spirv-tools "${spirv-tools.src.rev}" - checkRev spirv-headers "${spirv-tools.headers.rev}" checkRev glslang "${glslang.src.rev}" ''; @@ -48,11 +53,12 @@ stdenv.mkDerivation rec { sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json mkdir -p $dev/include cp -rv ../include $dev/ + mkdir -p $demos/share/vulkan-demos + cp demos/*.spv demos/*.ppm $demos/share/vulkan-demos mkdir -p $demos/bin - cp demos/*.spv demos/*.ppm $demos/bin - find demos -type f -executable -not -name vulkaninfo -exec cp {} $demos/bin \; + find demos -type f -executable -not -name vulkaninfo -exec cp -v {} $demos/bin \; for p in cube cubepp; do - wrapProgram $demos/bin/$p --run "cd $demos/bin" + wrapProgram $demos/bin/$p --run "cd $demos/share/vulkan-demos" done ''; diff --git a/pkgs/development/libraries/vulkan-loader/rev-file.patch b/pkgs/development/libraries/vulkan-loader/rev-file.patch new file mode 100644 index 0000000000000000000000000000000000000000..e8f9f92c8ead63a5a8aab17404d050d643ff26ca --- /dev/null +++ b/pkgs/development/libraries/vulkan-loader/rev-file.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c9f73ce96..d14ffeed9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -339,13 +339,13 @@ macro(run_vk_xml_generate dependency output) + endmacro() + + # Define macro used for generating header files containing commit IDs for external dependencies +-macro(run_external_revision_generate source_dir symbol_name output) ++macro(run_external_revision_generate rev_file symbol_name output) + add_custom_command(OUTPUT ${output} + # NOTE: If you modify this call to use --rev_file instead of --git_dir (to read the commit ID from a file instead of + # parsing from a Git repository), you probably also want to add the revision file to the list of DEPENDS on the + # subsequent line (to ensure that the script is re-run when the revision file is modified). +- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --git_dir ${source_dir} -s ${symbol_name} -o ${output} +- DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${rev_file} -s ${symbol_name} -o ${output} ++ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${rev_file} + ) + endmacro() + diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 836a4527b5081b44dbb110fce850cd25f397612e..a5b7a6a99ce480475a137f5c962a8d9e62156e79 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -8,11 +8,11 @@ assert expat != null; stdenv.mkDerivation rec { name = "wayland-${version}"; - version = "1.12.0"; + version = "1.14.0"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d"; }; configureFlags = [ "--with-scanner" "--disable-documentation" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of the wayland protocol"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ codyopel wkennington ]; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 436de5609e5a1a0c14c462d43ca99969697f9971..ed9866048191c95f12806e4d0d7e2e10ace248ba 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "wayland-protocols-${version}"; - version = "1.10"; + version = "1.13"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a"; + sha256 = "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 64c5293fac7dadca76e7636e7f384fcb14688ae4..5dd79980680f0dc1ca74f5de3903b72933b6c0c6 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "5.15"; + version = "5.18"; name = "wcslib-${version}"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; - sha256 ="1s2nig327g4bimd9xshlk11ww09a7mrjmsbpdcd8smsmn2kl1glb"; + sha256 ="16jh568k99c9p0y3qzcgps2rii933x9wlay7q1xm0lr59zqzp4xn"; }; prePatch = '' diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.18.nix deleted file mode 100644 index bc9bdb223abb35c4f37e772b712a0da0f9232a8d..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ /dev/null @@ -1,103 +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, libedit, readline, mesa, libintlOrEmpty -, enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base, gst-plugins-bad -}: - -assert enableGeoLocation -> geoclue2 != null; - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; - version = "2.18.3"; - - 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 = "17lgn7qwrwqxl1lgmq5icvzmna6aymx4c7al47rp0vvac7hj0m71"; - }; - - # 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" - ]; - - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - - nativeBuildInputs = [ - cmake perl python2 ruby bison gperf - pkgconfig gettext gobjectIntrospection - ]; - - buildInputs = libintlOrEmpty ++ [ - gtk2 libwebp enchant libnotify gnutls pcre nettle libidn - libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - sqlite gst-plugins-base gst-plugins-bad 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; - - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix new file mode 100644 index 0000000000000000000000000000000000000000..3cc26b512c8958cd924f11fe7f9b69e3f04193ad --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -0,0 +1,89 @@ +{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja +, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt +, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit +, libidn, libedit, readline, libGLU_combined, libintl +, enableGeoLocation ? true, geoclue2, sqlite +, enableGtk2Plugins ? false, gtk2 ? null +, gst-plugins-base, gst-plugins-bad, woff2 +}: + +assert enableGeoLocation -> geoclue2 != null; +assert enableGtk2Plugins -> gtk2 != null; +assert stdenv.isDarwin -> !enableGtk2Plugins; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.20.1"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = https://webkitgtk.org/; + license = licenses.bsd2; + platforms = with platforms; linux ++ darwin; + hydraPlatforms = []; + maintainers = with maintainers; [ ]; + }; + + src = fetchurl { + url = "http://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "0nc9dj05dbk31ciip08b3rdsfja7ckc5mgagrj030fafza2k5r23"; + }; + + patches = optionals stdenv.isDarwin [ + ## TODO add necessary patches for Darwin + ]; + + postPatch = '' + patchShebangs . + ''; + + postConfigure = '' + # A stopgap for a non-deterministic build failure when using only one core + # Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=183788#c4 + ninja JavaScriptCoreForwardingHeaders WTFForwardingHeaders + ''; + + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=0" + "-DENABLE_INTROSPECTION=ON" + ] + ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" + ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" + ++ optionals stdenv.isDarwin [ + "-DUSE_SYSTEM_MALLOC=ON" + "-DUSE_ACCELERATE=0" + "-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" + ]; + + nativeBuildInputs = [ + cmake ninja perl python2 ruby bison gperf + pkgconfig gettext gobjectIntrospection + ]; + + buildInputs = [ + libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core + ] ++ optional enableGeoLocation geoclue2 + ++ optional enableGtk2Plugins gtk2 + ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ]) + ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] + ++ optional stdenv.isLinux wayland; + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 6669b562400f0dc35da2754fcbcd778f314313fc..18d20bf9c780c16edf09a8af4116f28f534b2ef5 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { ./quartz-webcore.patch ./libc++.patch ./plugin-none.patch + ] ++ optionals stdenv.hostPlatform.isMusl [ + ./fix-execinfo.patch ]; configureFlags = with stdenv.lib; [ diff --git a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch deleted file mode 100644 index f87b8ee73e230acc4eec530f507d0e7930c1ba16..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 deleted file mode 100644 index 833921f68061826b53012cb56fde52e41c32d007..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/webkitgtk/PR-153138.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 615e805c92ce0e25e0683973bcffcaa4a78bfc43..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/webkitgtk/PR-157554.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index d9b0795afa5bdf9654d43da8e7641df53a3162aa..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/webkitgtk/PR-157574.patch +++ /dev/null @@ -1,62 +0,0 @@ -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/finding-harfbuzz-icu.patch b/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch deleted file mode 100644 index 14d58ef04f68fe759adbaaa38b849a5f7006917b..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- webkitgtk-2.6.1.orig/Source/cmake/FindHarfBuzz.cmake 2014-10-09 01:54:38.000000000 +0800 -+++ webkitgtk-2.6.1/Source/cmake/FindHarfBuzz.cmake 2014-10-15 13:41:29.832290412 +0800 -@@ -34,21 +34,39 @@ - - pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7) - --find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h -- HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} --) -- --find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz -- HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} --) -- - # HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library. - if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17") - pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 REQUIRED) -- find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu -+ -+ find_path(HARFBUZZ_ICU_INCLUDEDIR NAMES hb-icu.h -+ HINTS ${PC_HARFBUZZ_ICU_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} -+ ) -+ -+ find_library(HARFBUZZ_ICU_LIBRARY NAMES harfbuzz-icu - HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR} - ) -- list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}") -+ -+ find_library(HARFBUZZ_LIBRARY NAMES harfbuzz -+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} -+ ) -+ -+ set(HARFBUZZ_INCLUDE_DIRS -+ ${PC_HARFBUZZ_INCLUDE_DIRS} ${HARFBUZZ_ICU_INCLUDEDIR} -+ CACHE INTERNAL "" -+ ) -+ -+ set(HARFBUZZ_LIBRARIES -+ ${HARFBUZZ_LIBRARY} ${HARFBUZZ_ICU_LIBRARY} -+ CACHE INTERNAL "" -+ ) -+else () -+ find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h -+ HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} -+ ) -+ -+ find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz -+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} -+ ) - endif () - - include(FindPackageHandleStandardArgs) diff --git a/pkgs/development/libraries/webkitgtk/fix-execinfo.patch b/pkgs/development/libraries/webkitgtk/fix-execinfo.patch new file mode 100644 index 0000000000000000000000000000000000000000..eb825312f3be6c452a2953d2bfad8f6330794b50 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/fix-execinfo.patch @@ -0,0 +1,20 @@ +--- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp ++++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp +@@ -64,7 +64,7 @@ + #include + #endif + +-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) + #include + #include + #include +@@ -242,7 +242,7 @@ + + void WTFGetBacktrace(void** stack, int* size) + { +-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) + *size = backtrace(stack, *size); + #elif OS(WINDOWS) && !OS(WINCE) + // The CaptureStackBackTrace function is available in XP, but it is not defined diff --git a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch b/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch deleted file mode 100644 index 7c47db52abaa53580baf8be78da4b902d16191e3..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/Source/cmake/OptionsGTK.cmake w/Source/cmake/OptionsGTK.cmake -index d3577a8..9620dc0 100644 ---- i/Source/cmake/OptionsGTK.cmake -+++ w/Source/cmake/OptionsGTK.cmake -@@ -94,7 +94,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential - - # Private options specific to the GTK+ port. Changing these options is - # completely unsupported. They are intended for use only by WebKit developers. --WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE ON) -+WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF) - WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF) - WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON) - diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index f5d49290484f7890cb08580851dd15369fae681d..b5a3aed91d900d9095b9966961eb01d6896e13cf 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode patchPhase = stdenv.lib.optionalString stdenv.isArm '' substituteInPlace configure --replace 'armv7*|armv8*' 'disabled' + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index fbfc460db96df02b927ef21742a416083e5483fa..8a0ec2523b94a896ecaa89f15826f4b7faed70db 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://www.zaphoyd.com/websocketpp/; + homepage = https://www.zaphoyd.com/websocketpp/; description = "C++/Boost Asio based websocket client/server library"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 9d22833e1c045cd089a427a8d280242926cb54a8..06a4e48827edc32bdc2794893dee46e476889660 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, alsaLib, freepats }: stdenv.mkDerivation rec { - name = "wildmidi-0.3.9"; + name = "wildmidi-0.4.2"; src = fetchurl { url = "https://github.com/Mindwerks/wildmidi/archive/${name}.tar.gz"; - sha256 = "1fbcsvzn8akvvy7vg6vmnikcc8gh405b4gp1r016bq7yginljwwp"; + sha256 = "178hm2wh5h7apkcb1a0dyla2ia8569php8ikz62rh0g6dp5l67am"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index e4b95fc1cb9ff4dd6453575d4a76f26ce23815e9..c905c40cf96035accb875f95e3ae00f2c3fd6e1e 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -15,7 +15,7 @@ let mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; optLz4 = shouldUsePkg lz4; optSnappy = shouldUsePkg snappy; @@ -71,5 +71,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = intersectLists platforms.unix platforms.x86_64; maintainers = with maintainers; [ wkennington ]; + broken = true; # Broken by f689a6d1c6796c4a4f116ffec6c4624379e04bc9. }; } diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 02066253d0f9a33783e9113b794d89ea46814c81..a672bbf52a90af1d9beed129ece36224a207fff1 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig -, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, mesa_noglu -, libX11, dbus_libs, wayland-protocols -, libpthreadstubs, libXdmcp, libXext +, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL +, libX11, dbus_libs, wayland-protocols, libdrm, mesa_noglu +, libpthreadstubs, libXdmcp, libXext, libXfixes , withOptionalPackages ? true, zlib, valgrind, doxygen }: @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage mesa_noglu - libX11 dbus_libs wayland-protocols - libpthreadstubs libXdmcp libXext ] + wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL + libX11 libXfixes dbus_libs wayland-protocols + libpthreadstubs libXdmcp libXext libdrm mesa_noglu ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; doCheck = true; diff --git a/pkgs/development/libraries/wld/default.nix b/pkgs/development/libraries/wld/default.nix deleted file mode 100644 index 1dd5858ec72016653fbf130efce05783e99d1e39..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/wld/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig -, wayland, fontconfig, pixman, freetype, libdrm -}: - -stdenv.mkDerivation rec { - name = "wld-${version}"; - version = "git-2015-09-01"; - repo = "https://github.com/michaelforney/wld"; - rev = "efe0a1ed1856a2e4a1893ed0f2d7dde43b5627f0"; - - src = fetchurl { - url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "09388f7828e18c75e7b8d41454903886a725d7a868f60e66c128bd7d2e953ee1"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ wayland fontconfig pixman freetype libdrm ]; - - makeFlags = "PREFIX=$(out)"; - installPhase = "PREFIX=$out make install"; - - meta = { - description = "A primitive drawing library targeted at Wayland"; - homepage = repo; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 79bd8bb9665949a580f5b0235dd01d4003b76dfb..a4c2b32971457ecb1ab18049e2f8c6f0b85f66a0 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,35 +1,49 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig -, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap +, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman +, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu }: let pname = "wlroots"; - version = "unstable-2017-10-31"; + version = "unstable-2018-03-16"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; - rev = "7200d643363e988edf6777c38e7f8fcd451a2c50"; - sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac"; + rev = "9cc875429b40e2567b219f8e9ffd23316d136204"; + sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq"; }; - # TODO: Temporary workaround for compilation errors - patches = [ ./libdrm.patch ./no-werror.patch ]; + # $out for the library and $bin for rootston + outputs = [ "out" "bin" ]; nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap + wayland libGL wayland-protocols libinput libxkbcommon pixman + xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu ]; + # Install rootston (the reference compositor) to $bin + postInstall = '' + mkdir -p $bin/bin + cp rootston/rootston $bin/bin/ + mkdir $bin/lib + cp libwlroots* $bin/lib/ + patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston + mkdir $bin/etc + cp ../rootston/rootston.ini.example $bin/etc/rootston.ini + ''; + meta = with stdenv.lib; { description = "A modular Wayland compositor library"; inherit (src.meta) homepage; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; + # Marked as broken until the first official/stable release (upstream + # request). See #38344 for the public discussion. + broken = true; }; } diff --git a/pkgs/development/libraries/wlroots/libdrm.patch b/pkgs/development/libraries/wlroots/libdrm.patch deleted file mode 100644 index 2b9d85382764e09a398c8af9b1c47054de946005..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/wlroots/libdrm.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/backend/meson.build 2017-10-31 22:08:01.112927610 +0100 -+++ b/backend/meson.build 2017-10-31 22:09:28.155264343 +0100 -@@ -43,5 +43,5 @@ - 'wlr_backend', - backend_files, - include_directories: wlr_inc, -- dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos], -+ dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos, drm], - ) diff --git a/pkgs/development/libraries/wlroots/no-werror.patch b/pkgs/development/libraries/wlroots/no-werror.patch deleted file mode 100644 index 78c374d9dbb8f4e7f77785c4c2af7aa54533ca4f..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/wlroots/no-werror.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/meson.build 2017-10-31 22:08:01.132927689 +0100 -+++ b/meson.build 2017-10-31 22:20:58.215784350 +0100 -@@ -5,7 +5,6 @@ - default_options: [ - 'c_std=c11', - 'warning_level=2', -- 'werror=true', - ], - ) - diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index fdbef27705e8ee85579ac6f4e37911bd9827fca7..fa65a14121fc3a826247b19eed2bd2939311a805 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.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "0bjfzpgj50cd27lfz6vry9bdz0f0kvgq8plqdbhlk7kjp32nm2bv"; + sha256 = "0mvq7ifcpckfrg0zzcxqfbrv08pnz4a8g2z2j3s9h3cwns9ipn6h"; }; outputs = [ "out" "dev" "doc" "lib" ]; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 3adf4f1497f889ca048700161eef227fd41acb89..99f73add795a19aefb8c9de011daf51cef6cf295 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,42 +1,54 @@ { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu -, pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl +, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl , pcre }: -stdenv.mkDerivation rec { - name = "wt-${version}"; - version = "4.0.0"; +let + generic = + { version, sha256 }: + stdenv.mkDerivation rec { + name = "wt-${version}"; - src = fetchFromGitHub { - owner = "kdeforche"; - repo = "wt"; - rev = version; - sha256 = "1451xxvnx6mlvxg0jxlr1mfv5v18h2214kijk5kacilqashfc43i"; - }; + src = fetchFromGitHub { + owner = "emweb"; + repo = "wt"; + rev = version; + inherit sha256; + }; - enableParallelBuilding = true; + enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost doxygen qt48Full libharu - pango fcgi firebird libmysql postgresql graphicsmagick glew - openssl pcre - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost doxygen qt48Full libharu + pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew + openssl pcre + ]; - cmakeFlags = [ - "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" - "-DWT_CPP_11_MODE=-std=c++11" - "-DGM_PREFIX=${graphicsmagick}" - "-DMYSQL_PREFIX=${libmysql.dev}" - "--no-warn-unused-cli" - ]; + cmakeFlags = [ + "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" + "-DWT_CPP_11_MODE=-std=c++11" + "-DGM_PREFIX=${graphicsmagick}" + "-DMYSQL_PREFIX=${mysql.connector-c}" + "--no-warn-unused-cli" + ]; - meta = with stdenv.lib; { - homepage = https://www.webtoolkit.eu/wt; - description = "C++ library for developing web applications"; - platforms = platforms.linux; - license = licenses.gpl2; - maintainers = [ maintainers.juliendehos ]; + meta = with stdenv.lib; { + homepage = https://www.webtoolkit.eu/wt; + description = "C++ library for developing web applications"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ juliendehos willibutz ]; + }; + }; +in { + wt3 = generic { + version = "3.3.10"; + sha256 = "1y25mhghgbgjgycpny0x4z95xn98q0wraab1c5gkwnay097bgwdy"; }; -} + wt4 = generic { + version = "4.0.3"; + sha256 = "01xch5dkpcanwhr515236wa9mdmnq2a2j13dn7smyhwzqgbpknsg"; + }; +} diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index b991590924db31f4ad88ff49e19e6c3aaca1c59e..82b72a0fc7b3440ef03620ef740258c798d9f21b 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.11"; + version = "1.5.13"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "0m3ff8mjiq4hvy8rmxyc9fkpf24xwxhvr3a6jmvr2q5zc41xhz7x"; + sha256 = "029a1rayp4c480x8ayng13rcjk1j98ar0z6ggijrznkn8kgx8j2j"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index a06003997845534e31c89f716ff624c1baf570e9..49f12842533b3d05c2844c927e9448b2269b14e4 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ 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/ ; + homepage = https://utelle.github.io/wxsqlite3/ ; description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 9ce8e95d9e94cea400ebf850289dc61a987de14e..bbb3b0faf3479f4923582ede9e55c59ab3712a35 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, libX11, cairo -, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, }: -assert withMesa -> mesa_glu != null && mesa_noglu != null; +assert withMesa -> libGLU != null && libGL != null; with stdenv.lib; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ] - ++ optional withMesa mesa_glu; + ++ optional withMesa libGLU; nativeBuildInputs = [ pkgconfig ]; @@ -39,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_glu.out}/lib ${mesa_noglu.out}/lib "; + + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 6230536b33ab9ab120cade15458e83793ff1df0e..19c3ca307c5ee8fa67de55e3b3688bf7b77442ea 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: -assert withMesa -> mesa_glu != null && mesa_noglu != null; +assert withMesa -> libGLU != null && libGL != null; with stdenv.lib; @@ -31,7 +31,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa_glu + ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; nativeBuildInputs = [ pkgconfig ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation { # allow building on 64-bit [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; - SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 951f27f7d54735075e7a749bb9a5a986d627305d..309d9be274d1a0fe57aa07a25f37c8305cd715b8 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? 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 webkitgtk218x) != null; +assert withMesa -> libGLU != null && libGL != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null; with stdenv.lib; @@ -30,8 +30,8 @@ stdenv.mkDerivation { 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 webkitgtk218x) + ++ optional withMesa libGLU + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation { ++ optionals withWebKit ["--enable-webview" "--enable-webview-webkit"]; - SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4b410a307bb4315b6a8f06e6a1bf17fdfd566bfb --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchFromGitHub +, wxGTK30 +}: + +with stdenv.lib; + +wxGTK30.overrideAttrs (oldAttrs : rec { + name = "wxwidgets-${version}"; + version = "3.1.0"; + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + sha256 = "14kl1rsngm70v3mbyv1mal15iz2b18k97avjx8jn7s81znha1c7f"; + }; +}) \ No newline at end of file diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 29d7ddf1fdc94ebabaca3c78fa0bcdca2a061058..418829e7af8af699f74a2dbba487eeb6880c38de 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { urls = [ "http://get.videolan.org/x265/x265_${version}.tar.gz" "https://github.com/videolan/x265/archive/${version}.tar.gz" ]; - sha256 = "05rxbnfcc8yl05q3xqkl1kk90k7zn5ih305r46dxnzjaa2djalrf"; + sha256 = "1gyd94jkwdii9308m07nymsbxrmrcl81c0j8i10zhslr2mj07w0v"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 28575f4c5d5e1984111c83be74dc954927b806ef..aeb741dbae7ba3e2eabc314edc7727aeb8bb4aaa 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -13,12 +13,11 @@ in 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 ${platform} -c cc -x c++ -P$out/usr + mkdir -p $out + ./runConfigure -p ${platform} -c cc -x c++ -P$out ''; buildInputs = [ xercesc getopt ]; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 23fee81e0a52681927b3459ea02b9fc8cba59c83..482c765dcda931264ad4a3ad3c7b9dc5bee65a7b 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -27,7 +27,7 @@ let meta = with stdenv.lib; { description = "Search engine library"; - homepage = http://xapian.org/; + homepage = https://xapian.org/; license = licenses.gpl2Plus; maintainers = with maintainers; [ chaoflow ]; platforms = platforms.unix; @@ -36,5 +36,5 @@ let in { # xapian-ruby needs 1.2.22 as of 2017-05-06 xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; - xapian_1_4_4 = generic "1.4.4" "1n9j2w2as0flih3hgim7gprfxsx6gimijs91rxsjsi8shjlqbad6"; + xapian_1_4 = generic "1.4.5" "0axhqrj202hbll9mcx1qdm8gsqj19216w3z02gyjbycxvr9gkdc5"; } diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 2923bfc1fc68027440e27cf3459b39a6a44205d3..09c2171945e448b76e69be957497056100a74264 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - sha256 = "0pl9gs0sbavxykfgrkm8syswqnfynmmqhf8429bv8a5qjh5pkp8l"; + sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr"; }; buildInputs = [ xapian perl pcre zlib libmagic ]; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 81ac75489bafbf155473dff21e8d5222a8cb4f63..17f8646b51770357501906f582ebf24d5911267f 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XCB cursor library (libxcursor port)"; - homepage = http://cgit.freedesktop.org/xcb/util-cursor; + homepage = https://cgit.freedesktop.org/xcb/util-cursor; license = licenses.mit; - maintainer = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index b6bb4e63df34e0422b185ffc6290031b7d6c39a0..9fa1768f4dce255adf17d7b275086eb258245b1b 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xerces-c-${version}"; - version = "3.1.4"; + version = "3.2.1"; src = fetchurl { url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz"; - sha256 = "1xpccqzykpd3806kd788lgkl01pk7v5lklva6q4kp9zq9jnfv3n9"; + sha256 = "18045nyjkr2hygkjc43pi2fmz6qcbn9p00kf42my3aa4i0mn1m3d"; }; meta = { diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index e37991367e6f17b3059a92360700ef6797735e4b..7865724efa4073d54c05c38d24df6c200720bce3 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,30 +1,47 @@ -{ stdenv, fetchgit }: +{ stdenv, lib, fetchgit, cmake +, avxSupport ? false +, cudaSupport ? false, cudatoolkit +, ncclSupport ? false, nccl +, llvmPackages +}: + +assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { name = "xgboost-${version}"; - version = "0.60"; + version = "0.7"; # needs submodules src = fetchgit { url = "https://github.com/dmlc/xgboost"; rev = "refs/tags/v${version}"; - sha256 = "0536vfl59n9vlagl1cpdl06c9y19dscwhwdzvi27zk5nc5qb6rdq"; + sha256 = "1wxh020l4q037hc5z7vgxflb70l41a97anl8g6y4wxb74l5zv61l"; }; enableParallelBuilding = true; - installPhase = '' + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + + buildInputs = lib.optional cudaSupport cudatoolkit + ++ lib.optional ncclSupport nccl; + + cmakeFlags = lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] + ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; + + installPhase = let + libname = if stdenv.isDarwin then "libxgboost.dylib" else "libxgboost.so"; + in '' mkdir -p $out - cp -r include $out - install -Dm755 lib/libxgboost.so $out/lib/libxgboost.so - install -Dm755 xgboost $out/bin/xgboost + cp -r ../include $out + install -Dm755 ../lib/${libname} $out/lib/${libname} + install -Dm755 ../xgboost $out/bin/xgboost ''; meta = with stdenv.lib; { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = https://github.com/dmlc/xgboost; license = licenses.asl20; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 83c75dcfa8a1608e49487d7c4f4f934b6c131f10..274a70057bdd708f90ce770c049484b31e5a1cf0 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib +{ stdenv, fetchurl, pkgconfig, xorg, alsaLib, libGLU_combined, aalib , libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec }: stdenv.mkDerivation rec { - name = "xine-lib-1.2.6"; + name = "xine-lib-1.2.9"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "01d0nv4zhr4k8id5n4rmw13llrjsv9dhwg1a773c1iqpi1ris15x"; + sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj"; }; nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext - alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac + alsaLib libGLU_combined aalib libvorbis libtheora speex perl ffmpeg flac libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ]; diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index f2d7711c9f00b43a4fca1c5d00bf98226ebc0b90..8e1d71fab3fadf1e9684573fb4fbc5ac53a8aa8f 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "xml-tooling-c-${version}"; - version = "1.6.0"; + version = "1.6.3"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-xmltooling.git"; - rev = "db08101c3854518a59096be95ed6564838381744"; - sha256 = "0rhzvxm4z3pm28kpk34hayhm12bjjms2kygv1z68vnz8ijzgcinq"; + rev = version; + sha256 = "09z2pp3yy3kqx22vwgxyi3s0vlpdv9camw8dpi3q8piff6zxak3q"; }; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 0b5f08bdf9b343f984da80794467d62ddfcc7409..8a0017109bbfa17bbe5950347a221020521e96a9 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.33.17"; + name = "xmlrpc-c-1.39.12"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; - sha256 = "0makq1zpfqnrj6xx1xc7wi4mh115ri9p4yz2rbvjhj0il4y8l4ah"; + sha256 = "026fh7w7y3q9pvxd09i5d4hq3l6gd81n9k19yq4zwbc398kg6c6q"; }; buildInputs = [ curl libxml2 ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # /doc/COPYING also lists "Expat license", # "ABYSS Web Server License" and "Python 1.5.2 License" license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 057be97ce96bffa81551de3c844496b841a9389b..17d7320cb6486f04dc9a7c5e52f443e4e34283bc 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "xvidcore-${version}"; - version = "1.3.4"; - + version = "1.3.5"; + src = fetchurl { url = "http://downloads.xvid.org/downloads/${name}.tar.bz2"; - sha256 = "1xwbmp9wqshc0ckm970zdpi0yvgqxlqg0s8bkz98mnr8p2067bsz"; + sha256 = "1d0hy1w9sn6491a3vhyf3vmhq4xkn6yd4ralx1191s6qz5wz483w"; }; preConfigure = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { postInstall = optionalString (!stdenv.isDarwin) '' rm $out/lib/*.a ''; - + meta = { description = "MPEG-4 video codec for PC"; homepage = https://www.xvid.com/; diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index c6ab03df10a125a6b8175f90325877575314c425..02e1e96cabd1b3320564a1ad6bee6df17c84907b 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ruby }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "yajl-2.1.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0f6yrjc05aa26wfi7lqn2gslm19m6rm81b30ksllpkappvh162ji"; }; - buildInputs = [ cmake ruby ]; + nativeBuildInputs = [ cmake ]; meta = { description = "Yet Another JSON Library"; diff --git a/pkgs/development/libraries/zeitgeist/dbus_glib.patch b/pkgs/development/libraries/zeitgeist/dbus_glib.patch deleted file mode 100644 index 872ea0db31b8ed172cd10b3286a0875c152e2139..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/zeitgeist/dbus_glib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac 2014-01-27 22:45:42.000000000 +0100 -+++ configure.ac.new 2014-05-02 17:25:45.813491239 +0200 -@@ -151,6 +151,7 @@ - gio-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED -+ dbus-glib-1 - json-glib-1.0 >= $JSON_GLIB_REQUIRED" - - AC_ARG_ENABLE([datahub], diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index ed84dec365e118d763060a861bd0bc24c42e6254..33cf5dd4af84ae2c592071d452a6e148b51b9aa0 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,39 +1,34 @@ -{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38 -, intltool, libtool, dbus_libs, telepathy_glib -, gtk3, json_glib, librdf_raptor2, dbus_glib +{ stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38 +, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib +, gtk3, json-glib, librdf_raptor2, dbus-glib , pythonSupport ? true, python2Packages }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.0.1"; name = "zeitgeist-${version}"; src = fetchgit { url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist"; rev = "v${version}"; - sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8"; + sha256 = "1lgqcqr5h9ba751b7ajp7h2w1bb5qza2w3k1f95j3ab15p7q0q44"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - configureScript = "./autogen.sh"; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; - nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ]; - buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib - gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ]; + buildInputs = [ + glib sqlite dbus_libs telepathy-glib dbus-glib + gtk3 json-glib librdf_raptor2 python2Packages.rdflib + ]; prePatch = "patchShebangs ."; - patches = [ ./dbus_glib.patch ]; - - patchFlags = [ "-p0" ]; - enableParallelBuilding = true; - postFixup = '' - '' + stdenv.lib.optionalString pythonSupport '' + postFixup = stdenv.lib.optionalString pythonSupport '' moveToOutput lib/${python2Packages.python.libPrefix} "$py" ''; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 030246db3185c3a9f95611fd8fecd93995347ad3..eea0fb727b01d96e6808e4515b3970a7b9a74fcf 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zeromq-${version}"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "09317g4zkalp3k11x6vbidcm4qf02ciml1wxgp3742lrlgcblgxy"; + sha256 = "1yadf4vz4m49lpwwwscxs6wf4v9dgqgxkwgwpby9lvb4pv8qbmaf"; }; nativeBuildInputs = [ cmake asciidoc ]; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index b5bb73e3e33be00aeceea1481cac96c95ba728af..f67964748dca18054cc229bbefc3f94077b6df3d 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.6.1"; + version = "2.7.4"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "08hynzcxz95a4i67k5cn6isafdb6xjgd0x0miyhlnp2xc220zfqj"; + sha256 = "1gpmf6algpl1g1z891jfnsici84scg2cq1kj4v90glgik9z99mci"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index ceb4bb9f370bded9da2124c2b81c63a297e8f4f4..de2e0b62f9e247f619c17880a1cde17588acffe2 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=${stdenv.cc.prefix}" + "PREFIX=${stdenv.cc.targetPrefix}" ] ++ stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [ "-f" "win32/Makefile.gcc" ] ++ stdenv.lib.optionals (!static) [ diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index d3dc41371de3794ae63e7be9ee140195a385b668..21d8a7babb3cafdceef4a241ff0c1b535adc3fc4 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://hardysimpson.github.com/zlog; license = licenses.lgpl21; platforms = platforms.linux; # cannot test on something else - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1ba073943483129a942a11ca7bb1eaecc0645e46 --- /dev/null +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "zxcvbn-c-${version}"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "tsyrogit"; + repo = "zxcvbn-c"; + rev = "v${version}"; + sha256 = "1m097b4qq1r3kk4b236pc3mpaj22il9fh43ifagad5wy54x8zf7b"; + }; + + installPhase = '' + install -D -t $out/lib libzxcvbn.so* + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/tsyrogit/zxcvbn-c; + description = "A C/C++ implementation of the zxcvbn password strength estimation"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ xurei ]; + }; +} diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 07a6f7ef088984ef406ae76bcf1a1cd68b7064fb..b59cb47eae57a0e361293bab70ece8ba57ef3246 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,21 +1,26 @@ -{ fetchurl, stdenv, perl, python2, zip, xmlto, zlib }: +{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib }: stdenv.mkDerivation rec { name = "zziplib-${version}"; - version = "0.13.67"; + version = "0.13.69"; src = fetchurl { url = "https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz"; - sha256 = "0802kdxwxx9zanpwb4w4wfi3blwhv0ri05mzdgd35j5sva5ify0j"; + sha256 = "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4"; }; - patchPhase = '' + postPatch = '' sed -i -e s,--export-dynamic,, configure ''; - buildInputs = [ perl python2 zip xmlto zlib ]; + # TODO: still an issue: https://github.com/gdraheim/zziplib/issues/27 - doCheck = true; + buildInputs = [ docbook_xml_dtd_412 perl python2 zip xmlto zlib ]; + + # tests are broken (https://github.com/gdraheim/zziplib/issues/20), + # and test/zziptests.py requires network access + # (https://github.com/gdraheim/zziplib/issues/24) + doCheck = false; meta = with stdenv.lib; { description = "Library to extract data from files archived in a zip file"; diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index be8b5c7b7a93b43072b51d7b2debee8b1acd2862..27089ee3e52d0ff3da6dab575f2defc9a34e01e3 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.3.0"; + version="3.3.1"; name="${baseName}-${version}"; - hash="16qphj2ilds4plzr36jbnrxxl5s21q53m9vasv3208gb5wjwcnv8"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.3.0.tar.gz"; - sha256="16qphj2ilds4plzr36jbnrxxl5s21q53m9vasv3208gb5wjwcnv8"; + hash="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.3.1.tar.gz"; + sha256="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g"; }; buildInputs = [ texinfo texLive perl diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 41d40064294fcb97d584b545635b2e8da313f46b..65fb6e615f5f3645b6a1bf10d56d4172d5814e13 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -1,4 +1,4 @@ -#!@stdenv_shell@ +#!@bash@/bin/bash # Part of NixPkgs package collection # This script can be used at your option under the same license as NixPkgs or # under MIT/X11 license @@ -13,7 +13,7 @@ shift export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS test -n "$NIX_LISP_LD_LIBRARY_PATH" && - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$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; @@ -70,8 +70,12 @@ esac NIX_LISP_ASDF_REGISTRY_CODE=" (progn - #+asdf3 (setf asdf:*default-source-registries* - '(asdf/source-registry:environment-source-registry)) + (setf asdf:*source-registry-parameter* + '(:source-registry + $(for p in $NIX_LISP_ASDF_PATHS; do + echo "(:tree \"$p\")" + done) + :inherit-configuration)) (asdf:initialize-source-registry) ) " @@ -83,6 +87,33 @@ nix_lisp_run_single_form(){ "$NIX_LISP_EXEC_CODE" "$NIX_LISP_QUIT" $NIX_LISP_NODEBUG) } +nix_lisp_build_system(){ + NIX_LISP_FINAL_PARAMETERS=( + "$NIX_LISP_EXEC_CODE" "(progn + (asdf:make :$1) + (loop for s in (list $(for i in $3; do echo ":$i"; done)) do (asdf:make s)))" + "$NIX_LISP_EXEC_CODE" "(progn + (setf (asdf/system:component-entry-point (asdf:find-system :$1)) ${2:-nil}) + #+cffi(setf cffi:*foreign-library-directories* + (cffi::explode-path-environment-variable \"NIX_LISP_LD_LIBRARY_PATH\")) + #+sbcl(loop + with libpath := (uiop:split-string (uiop:getenv \"NIX_LISP_LD_LIBRARY_PATH\") + :separator \":\") + for l in sb-alien::*shared-objects* + for ns := (sb-alien::shared-object-namestring l) + do (and (> (length ns) 0) (not (equal (elt ns 0) \"/\")) + (let* + ((prefix (find-if (lambda (s) (probe-file (format nil \"~a/~a\" s ns))) libpath)) + (fullpath (and prefix (format nil \"~a/~a\" prefix ns)))) + (when fullpath + (setf + (sb-alien::shared-object-namestring l) fullpath + (sb-alien::shared-object-pathname l) (probe-file fullpath))))) + ) + (asdf:perform (quote asdf:program-op) :$1) + )") +} + eval "$NIX_LISP_PRELAUNCH_HOOK" [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ diff --git a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh index 9f5a2b806891e4d1b1d47c34c1ef10e042ace2e1..88948e3253dffb46b678855537db747dc48d32db 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 +#!@bash@/bin/bash 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 fb4a090c702aaa4a7343a766cbaa233c5f5fb05f..c834ab7a305b16b52ca1ac54a1558020bee72cc4 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, asdf, which, lisp ? null}: +{stdenv, fetchurl, asdf, which, bash, lisp ? null}: stdenv.mkDerivation { name = "cl-wrapper-script"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { buildInputs = [which]; - inherit asdf lisp; + inherit asdf lisp bash; stdenv_shell = stdenv.shell; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh index 7ac8c70d59f8ec1b3942110e13e5ec6a3c13f6f3..8975ada53206f7ed1be2d886803fecae09562b5c 100644 --- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh +++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh @@ -15,6 +15,8 @@ setLisp () { sbcl) NIX_LISP_COMMAND="$j" ;; ecl) NIX_LISP_COMMAND="$j" ;; clisp) NIX_LISP_COMMAND="$j" ;; + lx86cl) NIX_LISP_COMMAND="$j" ;; + lx86cl64) NIX_LISP_COMMAND="$j" ;; esac done fi @@ -31,7 +33,7 @@ collectNixLispLDLP () { export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF -envHooks+=(addASDFPaths setLisp collectNixLispLDLP) +addEnvHooks "$targetOffset" addASDFPaths setLisp collectNixLispLDLP mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-$USER-home" mkdir -p "$HOME"/.cache/common-lisp diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 1a155b3e9339b5d39ea04ab797c38ce483434991..390e0e06112842081b2a9303f316676e49695e0d 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -29,11 +29,11 @@ let 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" + echo "export NIX_LISP_ASDF_PATHS=\"$( ( echo "\$NIX_LISP_ASDF_PATHS"; echo "$NIX_LISP_ASDF_PATHS"; echo "$out/lib/common-lisp/${args.baseName}" ) | grep . | sort | uniq)\"" >> "$path_config_script" test -n "$LD_LIBRARY_PATH" && 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'" >> "$path_config_script" + echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':' | sed -e 's/:$//')'" >> "$path_config_script" echo "fi" >> "$path_config_script" ''; deployLaunchScript = '' @@ -43,7 +43,7 @@ let chmod a+x "$launch_script" 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 "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" ''; moveAsdFiles = '' diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index a5d19ab0c16082f9ac042c31a0f8240afb72e371..c63a9b3a054d49f2ce00d86005aeacf2b7902b41 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "http://beta.quicklisp.org/dist/quicklisp/2017-07-25/distinfo.txt"; - sha256 = "165fd4a10zc3mxyy7wr4i2r3n6fzd1wd2hgzfyp32xlc41qj2ajf"; + url = "http://beta.quicklisp.org/dist/quicklisp/2018-01-31/distinfo.txt"; + sha256 = "0z28yz205cl8pa8lbflw9072mywg69jx0gf091rhx2wjjf9h14qy"; }; buildPhase = '' true; ''; postInstall = '' @@ -69,7 +69,7 @@ let lispPackages = rec { deps = []; system-info = quicklisp-to-nix-system-info; buildPhase = '' - ${sbcl}/bin/sbcl --eval '(load #P"${asdf}/lib/common-lisp/asdf/build/asdf.lisp")' --load $src/ql-to-nix.lisp --eval '(ql-to-nix::dump-image)' + ${clwrapper}/bin/cl-wrapper.sh "${sbcl}/bin/sbcl" --eval '(load #P"${asdf}/lib/common-lisp/asdf/build/asdf.lisp")' --load $src/ql-to-nix.lisp --eval '(ql-to-nix::dump-image)' ''; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index 6a40dda0c1cd936462a55e036385837f3ed30ab1..a5fddd417fa1fc000670fe100f3febaa3a1796c5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''_3bmd''; - version = ''20161204-git''; + version = ''20171019-git''; description = ''markdown processor in CL using esrap parser.''; deps = [ args."alexandria" args."esrap" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz''; - sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx''; + url = ''http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz''; + sha256 = ''1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz''; }; packageName = "3bmd"; @@ -18,12 +18,12 @@ rec { overrides = x: x; } /* (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 FILENAME _3bmd DEPS + 1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz URL + http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz MD5 + d691962a511f2edc15f4fc228ecdf546 NAME 3bmd FILENAME _3bmd DEPS ((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap) (NAME split-sequence FILENAME split-sequence)) - DEPENDENCIES (alexandria esrap split-sequence) VERSION 20161204-git + DEPENDENCIES (alexandria esrap split-sequence) VERSION 20171019-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/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 334ff7e82d65c3fbad925cf5ed1354d4c66851d9..9b9486e9758c71dbce225bae1ab6873dbf014ce3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''alexandria''; - version = ''20170630-git''; + version = ''20170830-git''; description = ''Alexandria is a collection of portable public domain utilities.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz''; - sha256 = ''1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis''; + url = ''http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz''; + sha256 = ''0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9''; }; packageName = "alexandria"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 - 1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis URL - http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz - MD5 ce5427881c909981192f870cb52ff59f NAME alexandria FILENAME alexandria - DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (alexandria-tests) + 0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9 URL + http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz + MD5 13ea5af7055094a87dec1e45090f894a NAME alexandria FILENAME alexandria + DEPS NIL DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (alexandria-tests) PARASITES 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 index f7adf3b3494e24173c2b0caf86f6a498a606f766..7c618a9fffb25d635ef803f40afb833a03290233 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''array-utils''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A few utilities for working with arrays.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz''; - sha256 = ''1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb''; + url = ''http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz''; + sha256 = ''01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0''; }; packageName = "array-utils"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. - SHA256 1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb URL - http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz - MD5 550b37bc0eccfafa889de00b59c422dc NAME array-utils FILENAME array-utils - DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (array-utils-test) + SHA256 01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0 URL + http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz + MD5 339670a03dd7d865cd045a6556d705c6 NAME array-utils FILENAME array-utils + DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS (array-utils-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix index e96c18a81209adfda6a52d9c38956d3c538b51a4..4f438eb734a8fcec6692d7914a11576e64501e85 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''babel-streams''; - version = ''babel-20170630-git''; + version = ''babel-20171227-git''; description = ''Some useful streams based on Babel's encoding code''; deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz''; - sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx''; + url = ''http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz''; + sha256 = ''166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf''; }; packageName = "babel-streams"; @@ -19,12 +19,12 @@ rec { } /* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 - 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL - http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz - MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel-streams FILENAME + 166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf URL + http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz + MD5 8ea39f73873847907a8bb67f99f16ecd NAME babel-streams FILENAME babel-streams DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams) - VERSION babel-20170630-git SIBLINGS (babel-tests babel) PARASITES NIL) */ + VERSION babel-20171227-git SIBLINGS (babel-tests babel) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index d5b31daa33ab5ee85f274da3e006a9313e6553df..4cba3e86e06853ed2b91b9f7d6c656bc5234c223 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''babel''; - version = ''20170630-git''; + version = ''20171227-git''; description = ''Babel, a charset conversion library.''; deps = [ args."alexandria" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz''; - sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx''; + url = ''http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz''; + sha256 = ''166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf''; }; packageName = "babel"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 - 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL - http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz - MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel FILENAME babel DEPS + 166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf URL + http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz + MD5 8ea39f73873847907a8bb67f99f16ecd NAME babel FILENAME babel DEPS ((NAME alexandria FILENAME alexandria) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria trivial-features) VERSION 20170630-git SIBLINGS + DEPENDENCIES (alexandria trivial-features) VERSION 20171227-git SIBLINGS (babel-streams babel-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix new file mode 100644 index 0000000000000000000000000000000000000000..6dbff1d6e56c83607efdf63390c602e50b9dfbd9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -0,0 +1,49 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''buildnode-xhtml''; + version = ''buildnode-20170403-git''; + + description = ''Tool for building up an xml dom of an excel spreadsheet nicely.''; + + deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; + sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + }; + + packageName = "buildnode-xhtml"; + + asdFilesToKeep = ["buildnode-xhtml.asd"]; + overrides = x: x; +} +/* (SYSTEM buildnode-xhtml DESCRIPTION + Tool for building up an xml dom of an excel spreadsheet nicely. SHA256 + 1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6 URL + http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz + MD5 b917f0d6c20489febbef0d5b954c350d NAME buildnode-xhtml FILENAME + buildnode-xhtml DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode FILENAME buildnode) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME puri FILENAME puri) + (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank) + (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop + closure-common closure-html collectors cxml cxml-dom cxml-klacks cxml-test + cxml-xml flexi-streams iterate puri split-sequence swank symbol-munger + trivial-features trivial-gray-streams) + VERSION buildnode-20170403-git SIBLINGS + (buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix new file mode 100644 index 0000000000000000000000000000000000000000..ecc1634bfce049b751a5aaa6bfa8c0f788336d56 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -0,0 +1,50 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''buildnode''; + version = ''20170403-git''; + + parasites = [ "buildnode-test" ]; + + description = ''Tool for building up an xml dom nicely.''; + + deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; + sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + }; + + packageName = "buildnode"; + + asdFilesToKeep = ["buildnode.asd"]; + overrides = x: x; +} +/* (SYSTEM buildnode DESCRIPTION Tool for building up an xml dom nicely. SHA256 + 1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6 URL + http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz + MD5 b917f0d6c20489febbef0d5b954c350d NAME buildnode FILENAME buildnode DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode-xhtml FILENAME buildnode-xhtml) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) + (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode + closer-mop closure-common closure-html collectors cxml cxml-dom + cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri + split-sequence swank symbol-munger trivial-features trivial-gray-streams) + VERSION 20170403-git SIBLINGS + (buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml + buildnode-xul) + PARASITES (buildnode-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index 1c6dadb8fb4141273ca091dc5048338e45050dc1..e60f60a303bf6326f46e60a47872431a4faf466b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''caveman''; - version = ''20170630-git''; + version = ''20171019-git''; description = ''Web Application Framework for Common Lisp''; - deps = [ args."anaphora" args."cl-emb" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."clack-v1-compat" args."do-urlencode" args."local-time" args."myway" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."circular-streams" args."cl-annot" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack-v1-compat" args."dexador" args."do-urlencode" args."http-body" args."lack" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."prove" args."quri" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz''; - sha256 = ''0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2''; + url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz''; + sha256 = ''0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra''; }; packageName = "caveman"; @@ -18,20 +18,42 @@ rec { overrides = x: x; } /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 - 0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2 URL - http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz - MD5 774f85fa78792bde012bad78efff4b53 NAME caveman FILENAME caveman DEPS - ((NAME anaphora FILENAME anaphora) (NAME cl-emb FILENAME cl-emb) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-project FILENAME cl-project) - (NAME cl-syntax FILENAME cl-syntax) + 0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra URL + http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz + MD5 41318d26a0825e504042fa693959feaf NAME caveman FILENAME caveman DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME circular-streams FILENAME circular-streams) + (NAME cl-annot FILENAME cl-annot) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-colors FILENAME cl-colors) (NAME cl-emb FILENAME cl-emb) + (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-project FILENAME cl-project) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-syntax-annot FILENAME cl-syntax-annot) + (NAME cl-utilities FILENAME cl-utilities) (NAME clack-v1-compat FILENAME clack-v1-compat) - (NAME do-urlencode FILENAME do-urlencode) - (NAME local-time FILENAME local-time) (NAME myway FILENAME myway)) + (NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode) + (NAME http-body FILENAME http-body) (NAME lack FILENAME lack) + (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) + (NAME map-set FILENAME map-set) (NAME marshal FILENAME marshal) + (NAME myway FILENAME myway) + (NAME named-readtables FILENAME named-readtables) + (NAME prove FILENAME prove) (NAME quri FILENAME quri) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-backtrace FILENAME trivial-backtrace) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME trivial-types FILENAME trivial-types) + (NAME usocket FILENAME usocket)) DEPENDENCIES - (anaphora cl-emb cl-ppcre cl-project cl-syntax cl-syntax-annot - clack-v1-compat do-urlencode local-time myway) - VERSION 20170630-git SIBLINGS + (alexandria anaphora babel babel-streams bordeaux-threads circular-streams + cl-annot cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre cl-project + cl-syntax cl-syntax-annot cl-utilities clack-v1-compat dexador + do-urlencode http-body lack let-plus local-time map-set marshal myway + named-readtables prove quri split-sequence trivial-backtrace + trivial-features trivial-gray-streams trivial-types usocket) + VERSION 20171019-git SIBLINGS (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2) PARASITES 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 index 6a4fd0defb99a0c09b1145fbe83ce78b271e088f..4a533220caf570053350f622b9e8f59ecd846ca0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''chunga''; - version = ''1.1.6''; + version = ''20180131-git''; 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''; + url = ''http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz''; + sha256 = ''0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq''; }; packageName = "chunga"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (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 FILENAME chunga DEPS + 0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL + http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz + MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL PARASITES NIL) */ + (trivial-gray-streams) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index b25e131be5593afbb1114da8d2fd63a8c7e5a6eb..8d2254e4bdcb6ace0a8a7ce707e0b84124a7992c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -5,7 +5,7 @@ rec { description = ''Circularly readable streams for Common Lisp''; - deps = [ args."alexandria" args."fast-io" args."static-vectors" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz''; @@ -23,8 +23,13 @@ rec { http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams FILENAME circular-streams DEPS - ((NAME alexandria FILENAME alexandria) (NAME fast-io FILENAME fast-io) + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME fast-io FILENAME fast-io) (NAME static-vectors FILENAME static-vectors) + (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria fast-io static-vectors trivial-gray-streams) + DEPENDENCIES + (alexandria babel cffi cffi-grovel fast-io static-vectors trivial-features + trivial-gray-streams) VERSION 20161204-git SIBLINGS (circular-streams-test) PARASITES NIL) */ 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 deleted file mode 100644 index 8a8a26a2e9bc766ddc66bc9c1c1254d5c7dc8a14..0000000000000000000000000000000000000000 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix +++ /dev/null @@ -1,37 +0,0 @@ -args @ { fetchurl, ... }: -rec { - baseName = ''cl+ssl''; - version = ''cl+ssl-20170725-git''; - - parasites = [ "openssl-1.1.0" ]; - - description = ''Common Lisp interface to OpenSSL.''; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz''; - sha256 = ''1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69''; - }; - - packageName = "cl+ssl"; - - asdFilesToKeep = ["cl+ssl.asd"]; - overrides = x: x; -} -/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69 URL - http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz - MD5 3458c83f442395e0492c7e9b9720a1f2 NAME cl+ssl FILENAME cl+ssl DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME uiop FILENAME uiop)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi flexi-streams trivial-features - trivial-garbage trivial-gray-streams uiop) - VERSION cl+ssl-20170725-git SIBLINGS (cl+ssl.test) PARASITES - (openssl-1.1.0)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index 8a323e3dcc96b651868ae701123a8dee52cc3be7..9291be14e33adc112dd57edabc55967b72f5308a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-repl''; - version = ''cl-async-20160825-git''; + version = ''cl-async-20171130-git''; description = ''REPL integration for CL-ASYNC.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; - sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; + sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; }; packageName = "cl-async-repl"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (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 FILENAME + 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL + http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz + MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-repl FILENAME cl-async-repl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -38,5 +38,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20160825-git SIBLINGS + VERSION cl-async-20171130-git SIBLINGS (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 7c040c7a4616ffe0f4ad0f2bd2605088be6b8ac5..4417d25be9f7e56e0d078558a658d0fc2064bed6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-ssl''; - version = ''cl-async-20160825-git''; + version = ''cl-async-20171130-git''; description = ''SSL Wrapper around cl-async socket implementation.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; - sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; + sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; }; packageName = "cl-async-ssl"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 - 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL - http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz - MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl FILENAME + 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL + http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz + MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-ssl FILENAME cl-async-ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -39,5 +39,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20160825-git SIBLINGS + VERSION cl-async-20171130-git SIBLINGS (cl-async-repl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index cc31b7a186f8c2efca839e55fe1bc19ea821fc41..6f62c9ff6b9048ecb165e372258c3c0b3ba5a47b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async''; - version = ''20160825-git''; + version = ''20171130-git''; parasites = [ "cl-async-base" "cl-async-util" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; - sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; + sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; }; packageName = "cl-async"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (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 FILENAME cl-async DEPS + 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL + http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz + MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async FILENAME cl-async DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -35,5 +35,5 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi cffi-grovel cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop vom) - VERSION 20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) + VERSION 20171130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) PARASITES (cl-async-base cl-async-util)) */ 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 index 3e1ef10ef99328a1051b5279e8a29b2471b10653..82571660280adcc56bffeb94a17feef65641f1aa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-csv''; - version = ''20170403-git''; + version = ''20180131-git''; - parasites = [ "cl-csv-test" ]; + parasites = [ "cl-csv/test" ]; description = ''Facilities for reading and writing CSV format files''; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz''; - sha256 = ''1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h''; + url = ''http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz''; + sha256 = ''0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh''; }; packageName = "cl-csv"; @@ -21,9 +21,9 @@ rec { } /* (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 FILENAME cl-csv DEPS + 0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh URL + http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz + MD5 0be8956ee31e03436f8a2190387bad46 NAME cl-csv FILENAME cl-csv DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate lisp-unit2) - VERSION 20170403-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES - (cl-csv-test)) */ + VERSION 20180131-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES + (cl-csv/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index 4273869e62a4a9cb153e146bd990f9e451745d01..d485d276bab728a1445bec0e7fbda80c4aed80d9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-dbi''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "cl-dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME cl-dbi FILENAME cl-dbi DEPS + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME cl-dbi FILENAME cl-dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-types) - VERSION 20170725-git SIBLINGS + VERSION 20180131-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES 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 index 25ad098f267f062b8072a2bdcc8b2c5c8ca5fa90..0bc8488b2a8cb2d12012a942298e2b41d70bf2ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-fad''; - version = ''0.7.4''; + version = ''20171227-git''; parasites = [ "cl-fad-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz''; - sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x''; + url = ''http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz''; + sha256 = ''0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8''; }; packageName = "cl-fad"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (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 FILENAME cl-fad DEPS + 0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8 URL + http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz + MD5 f6b34f61ebba1c68e8fe122bb7de3f77 NAME cl-fad FILENAME cl-fad DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-ppcre FILENAME cl-ppcre) (NAME unit-test FILENAME unit-test)) - DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION 0.7.4 - SIBLINGS NIL PARASITES (cl-fad-test)) */ + DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION + 20171227-git SIBLINGS NIL PARASITES (cl-fad-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix new file mode 100644 index 0000000000000000000000000000000000000000..61a35f2b58c63ef5c653fd613e63fe9bc8d2d56e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-html-parse''; + version = ''20161031-git''; + + description = ''HTML Parser''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-html-parse/2016-10-31/cl-html-parse-20161031-git.tgz''; + sha256 = ''0i0nl630p9l6rqylydhfqrlqhl5sfq94a9wglx0dajk8gkkqjbnb''; + }; + + packageName = "cl-html-parse"; + + asdFilesToKeep = ["cl-html-parse.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-html-parse DESCRIPTION HTML Parser SHA256 + 0i0nl630p9l6rqylydhfqrlqhl5sfq94a9wglx0dajk8gkkqjbnb URL + http://beta.quicklisp.org/archive/cl-html-parse/2016-10-31/cl-html-parse-20161031-git.tgz + MD5 7fe933c461eaf2dd442da189d6827a72 NAME cl-html-parse FILENAME + cl-html-parse DEPS NIL DEPENDENCIES NIL VERSION 20161031-git SIBLINGS NIL + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix new file mode 100644 index 0000000000000000000000000000000000000000..d1ce782e7f8496ba9f5c234871b1f4c4a22a88ee --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-html5-parser''; + version = ''20171019-git''; + + description = ''A HTML5 parser for Common Lisp''; + + deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz''; + sha256 = ''0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98''; + }; + + packageName = "cl-html5-parser"; + + asdFilesToKeep = ["cl-html5-parser.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-html5-parser DESCRIPTION A HTML5 parser for Common Lisp SHA256 + 0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98 URL + http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz + MD5 c4a18ac20668c9aef723954fb901c16b NAME cl-html5-parser FILENAME + cl-html5-parser DEPS + ((NAME cl-ppcre FILENAME cl-ppcre) + (NAME flexi-streams FILENAME flexi-streams) + (NAME string-case FILENAME string-case) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES (cl-ppcre flexi-streams string-case trivial-gray-streams) + VERSION 20171019-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests) + PARASITES 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 index 97c948507c49884b1c9d97e25ecafa9113a36a60..d4ce8531291efe21e9130a948b500870e28bce98 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-interpol''; - version = ''0.2.6''; + version = ''20171227-git''; parasites = [ "cl-interpol-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz''; - sha256 = ''172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b''; + url = ''http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz''; + sha256 = ''1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy''; }; packageName = "cl-interpol"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (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 FILENAME cl-interpol + 1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy URL + http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz + MD5 e9d2f0238bb8f7a0c5b1ef1e6ef390ae NAME cl-interpol FILENAME cl-interpol DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 0.2.6 SIBLINGS NIL - PARASITES (cl-interpol-test)) */ + DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 20171227-git + SIBLINGS NIL PARASITES (cl-interpol-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 index fa4e18cdbfe9d432711f0cf8768071875911ed97..1590f2536e341fbfbd56323ed98baa9d15661b8f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-mysql''; - version = ''20160628-git''; + version = ''20171019-git''; description = ''Common Lisp MySQL library bindings''; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz''; - sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319''; + url = ''http://beta.quicklisp.org/archive/cl-mysql/2017-10-19/cl-mysql-20171019-git.tgz''; + sha256 = ''1ga44gkwg6lm225gqpacpqpr6bpswszmw1ba9jhvjpjm09zinyc5''; }; packageName = "cl-mysql"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (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 FILENAME cl-mysql DEPS + 1ga44gkwg6lm225gqpacpqpr6bpswszmw1ba9jhvjpjm09zinyc5 URL + http://beta.quicklisp.org/archive/cl-mysql/2017-10-19/cl-mysql-20171019-git.tgz + MD5 e1021da4d35cbb584d4df4f0d7e2bbb9 NAME cl-mysql FILENAME cl-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20160628-git + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20171019-git SIBLINGS (cl-mysql-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 485a2c3de22f7391714718e8edcbee1865c4834e..721dbf61aa922af8084af6e501d14be9aa4b212f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-postgres''; - version = ''postmodern-20170403-git''; + version = ''postmodern-20180131-git''; - parasites = [ "cl-postgres-tests" ]; + parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; description = ''Low-level client library for PostgreSQL''; - deps = [ args."fiveam" args."md5" ]; + deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "cl-postgres"; @@ -20,9 +20,14 @@ rec { overrides = x: x; } /* (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 FILENAME cl-postgres - DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)) DEPENDENCIES - (fiveam md5) VERSION postmodern-20170403-git SIBLINGS - (postmodern s-sql simple-date) PARASITES (cl-postgres-tests)) */ + SHA256 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME cl-postgres FILENAME cl-postgres + DEPS + ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) + (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket)) + DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket) + VERSION postmodern-20180131-git SIBLINGS (postmodern s-sql simple-date) + PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 92ede6007ef9434d72b5bfd6502121be312b51f4..d2b3de9cae181c6d90a17ec5298db43edded0656 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-template''; - version = ''cl-unification-20170630-git''; + version = ''cl-unification-20171227-git''; description = ''A system used to conditionally load the CL-PPCRE Template. @@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.''; deps = [ args."cl-ppcre" args."cl-unification" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz''; - sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz''; + sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p''; }; packageName = "cl-ppcre-template"; @@ -27,12 +27,12 @@ REGULAR-EXPRESSION-TEMPLATE.''; This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the REGULAR-EXPRESSION-TEMPLATE. - SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL - http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz - MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-ppcre-template FILENAME + SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL + http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz + MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-ppcre-template FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unification FILENAME cl-unification)) - DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20170630-git + DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20171227-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 5f2b2e37e30d27f1fd9208aab140f69f257ed2d2..7853d5a279a2c35fe36b2606b31b358f88d10b1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-unicode''; - version = ''cl-ppcre-2.0.11''; + version = ''cl-ppcre-20171227-git''; parasites = [ "cl-ppcre-unicode-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz''; - sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz''; + sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4''; }; packageName = "cl-ppcre-unicode"; @@ -21,13 +21,13 @@ rec { } /* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 - 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL - http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz - MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode FILENAME + 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL + http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz + MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-test FILENAME cl-ppcre-test) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION - cl-ppcre-2.0.11 SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ + cl-ppcre-20171227-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 74d74a9b114c453fb20f07aa3609d0f7a3550018..cbdf3a471461b21ee8bdbdd125928db21d8f3598 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre''; - version = ''2.0.11''; + version = ''20171227-git''; parasites = [ "cl-ppcre-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz''; - sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz''; + sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4''; }; packageName = "cl-ppcre"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (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 FILENAME cl-ppcre DEPS + SHA256 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL + http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz + MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre FILENAME cl-ppcre DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 2.0.11 SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ + VERSION 20171227-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index bfaaabfbc2d7b7c09c3a2a0c9fa1d5250f5b5f77..658ffdb51b82c7a6e1ae7afca5712bf39d7bcffa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-project''; - version = ''20160531-git''; + version = ''20171019-git''; description = ''Generate a skeleton for modern project''; deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz''; - sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81''; + url = ''http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz''; + sha256 = ''1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q''; }; packageName = "cl-project"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (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 FILENAME cl-project + 1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q URL + http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz + MD5 9dbfd7f9b0a83ca608031ebf32185a0f NAME cl-project FILENAME cl-project DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -32,4 +32,4 @@ rec { DEPENDENCIES (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre let-plus local-time prove uiop) - VERSION 20160531-git SIBLINGS (cl-project-test) PARASITES NIL) */ + VERSION 20171019-git SIBLINGS (cl-project-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 9cb69caaafd52b305d28bb74cd00b90dfd0cac1d..3ca67723925e33966d24201e6f4d1a8860d8349a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-smtp''; - version = ''20160825-git''; + version = ''20180131-git''; description = ''Common Lisp smtp client.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl+ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" 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''; + url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz''; + sha256 = ''0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61''; }; packageName = "cl-smtp"; @@ -18,12 +18,12 @@ rec { overrides = x: x; } /* (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 FILENAME cl-smtp DEPS + 0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61 URL + http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz + MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl+ssl) + (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME flexi-streams FILENAME flexi-streams) (NAME split-sequence FILENAME split-sequence) @@ -35,4 +35,4 @@ rec { (alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams split-sequence trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION 20160825-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 7425b7ce0a8163f2c3f6c8029abbf1f41179b04a..968f2972abfcbddd4331468d91114aaddbaec850 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-test-more''; - version = ''prove-20170403-git''; + version = ''prove-20171130-git''; description = ''''; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; - sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; + url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz''; + sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar''; }; packageName = "cl-test-more"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (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 FILENAME + 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL + http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz + MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME cl-test-more DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME cl-ansi-text FILENAME cl-ansi-text) @@ -28,5 +28,5 @@ rec { (NAME let-plus FILENAME let-plus) (NAME prove FILENAME prove)) DEPENDENCIES (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus prove) - VERSION prove-20170403-git SIBLINGS (prove-asdf prove-test prove) PARASITES + VERSION prove-20171130-git SIBLINGS (prove-asdf prove-test prove) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index e35645f6e98e86a4e03e5ecf364b20b41ce2d5cd..25dfbbcae5f78d8c046528e73eef4cbadd4da779 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unicode''; - version = ''0.1.5''; + version = ''20180131-git''; parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz''; - sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n''; + url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz''; + sha256 = ''113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa''; }; packageName = "cl-unicode"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (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 FILENAME cl-unicode + 113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa URL + http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz + MD5 653ba12d595599b32aa2a8c7c8b65c28 NAME cl-unicode FILENAME cl-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre flexi-streams) VERSION 0.1.5 SIBLINGS NIL PARASITES - (cl-unicode/base cl-unicode/build cl-unicode/test)) */ + DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180131-git SIBLINGS NIL + PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 39f3fccb7a7e31e937c980dcea00d5a1169fb8da..6d284b7b012089613580432c0c4a8e01bd819428 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unification''; - version = ''20170630-git''; + version = ''20171227-git''; description = ''The CL-UNIFICATION system. @@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz''; - sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz''; + sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p''; }; packageName = "cl-unification"; @@ -22,8 +22,8 @@ The system contains the definitions for the 'unification' machinery.''; /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system. The system contains the definitions for the 'unification' machinery. - SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL - http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz - MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-unification FILENAME - cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS + SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL + http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz + MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-unification FILENAME + cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20171227-git SIBLINGS (cl-unification-lib cl-unification-test cl-ppcre-template) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 32304139c5150757c7ba70a6ea1de4e0ba54e68c..575e05aa074d29193f240728cad626930af85563 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-who''; - version = ''1.1.4''; + version = ''20171130-git''; parasites = [ "cl-who-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz''; - sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq''; + url = ''http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz''; + sha256 = ''1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw''; }; packageName = "cl-who"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (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 FILENAME cl-who DEPS + 1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw URL + http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz + MD5 257a670166ff9d24d1570f44be0c7171 NAME cl-who FILENAME cl-who DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 1.1.4 SIBLINGS NIL PARASITES (cl-who-test)) */ + VERSION 20171130-git SIBLINGS NIL PARASITES (cl-who-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix new file mode 100644 index 0000000000000000000000000000000000000000..99aa768c8dfcce7a67b02ab4023763627554dfd7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl_plus_ssl''; + version = ''cl+ssl-20171227-git''; + + parasites = [ "openssl-1.1.0" ]; + + description = ''Common Lisp interface to OpenSSL.''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz''; + sha256 = ''1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4''; + }; + + packageName = "cl+ssl"; + + asdFilesToKeep = ["cl+ssl.asd"]; + overrides = x: x; +} +/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 + 1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4 URL + http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz + MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl_plus_ssl DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME uiop FILENAME uiop)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi flexi-streams trivial-features + trivial-garbage trivial-gray-streams uiop) + VERSION cl+ssl-20171227-git SIBLINGS (cl+ssl.test) PARASITES + (openssl-1.1.0)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index 3c15d7cf7539286ebfddc59e300b9558db7f195b..3ecc0e1014987a04b9c938ae0df2f7f134a8e0c1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20170725-git''; + version = ''20180131-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-07-25/closer-mop-20170725-git.tgz''; - sha256 = ''0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz''; + sha256 = ''0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s''; }; packageName = "closer-mop"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc URL - http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz - MD5 308f9e8e4ea4573c7b6820055b6f171d NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS NIL PARASITES NIL) */ + SHA256 0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s URL + http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz + MD5 d572109e102869d89f206a46619c2ed0 NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix new file mode 100644 index 0000000000000000000000000000000000000000..29c90369244a19cbaba479b8aee5349fa7a60106 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''closure-html''; + version = ''20140826-git''; + + description = ''''; + + deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz''; + sha256 = ''1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb''; + }; + + packageName = "closure-html"; + + asdFilesToKeep = ["closure-html.asd"]; + overrides = x: x; +} +/* (SYSTEM closure-html DESCRIPTION NIL SHA256 + 1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb URL + http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz + MD5 3f8d8a4fd54f915ca6cc5fdf29239d98 NAME closure-html FILENAME + closure-html DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME closure-common FILENAME closure-common) + (NAME flexi-streams FILENAME flexi-streams) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel closure-common flexi-streams trivial-features + trivial-gray-streams) + VERSION 20140826-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 11e723e0029c99469bbd050cf5ee6b3ebd64a74b..76f50463a6ae49d5f74df7a55dcdf6a3d77fbbfd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clss''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A DOM tree searching engine based on CSS selectors.''; - deps = [ args."array-utils" args."plump" ]; + deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz''; - sha256 = ''0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0''; + url = ''http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz''; + sha256 = ''0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r''; }; packageName = "clss"; @@ -18,9 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. - SHA256 0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0 URL - http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz MD5 - 61bbadf22391940813bfc66dfd59d304 NAME clss FILENAME clss DEPS - ((NAME array-utils FILENAME array-utils) (NAME plump FILENAME plump)) - DEPENDENCIES (array-utils plump) VERSION 20170630-git SIBLINGS NIL - PARASITES NIL) */ + SHA256 0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r URL + http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz MD5 + 138244b7871d8ea832832aa9cc5867e6 NAME clss FILENAME clss DEPS + ((NAME array-utils FILENAME array-utils) + (NAME documentation-utils FILENAME documentation-utils) + (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION + 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 2d802d3e488090dd9c51867508b9361ef157e462..2a7ec984e7fbd894c282e1dff20254e6366ef297 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20170630-git''; + version = ''20171227-git''; + + parasites = [ "clx/test" ]; description = ''An implementation of the X Window System protocol in Lisp.''; - deps = [ ]; + deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz''; - sha256 = ''0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7''; + url = ''http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz''; + sha256 = ''159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri''; }; packageName = "clx"; @@ -19,7 +21,8 @@ rec { } /* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 - 0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7 URL - http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz MD5 - ccfec3f35979df3bead0b73adc1d798a NAME clx FILENAME clx DEPS NIL - DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */ + 159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri URL + http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz MD5 + 40642f49e26b88859376efe2e5330a24 NAME clx FILENAME clx DEPS + ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20171227-git + SIBLINGS NIL PARASITES (clx/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix new file mode 100644 index 0000000000000000000000000000000000000000..7375b8dd70948223f0cd474ea1f85c862e67638b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''collectors''; + version = ''20161204-git''; + + parasites = [ "collectors-test" ]; + + description = ''A library providing various collector type macros + pulled from arnesi into its own library and stripped of dependencies''; + + deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz''; + sha256 = ''0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf''; + }; + + packageName = "collectors"; + + asdFilesToKeep = ["collectors.asd"]; + overrides = x: x; +} +/* (SYSTEM collectors DESCRIPTION + A library providing various collector type macros + pulled from arnesi into its own library and stripped of dependencies + SHA256 0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf URL + http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz + MD5 59c8c885a8e512d4f09e73d3e0c97b1f NAME collectors FILENAME collectors + DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME symbol-munger FILENAME symbol-munger)) + DEPENDENCIES (alexandria closer-mop iterate lisp-unit2 symbol-munger) + VERSION 20161204-git SIBLINGS NIL PARASITES (collectors-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix new file mode 100644 index 0000000000000000000000000000000000000000..2ad018e5549c1d28dff9237b6b0770ed7c6f3e4f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -0,0 +1,52 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''css-selectors''; + version = ''20160628-git''; + + parasites = [ "css-selectors-test" ]; + + description = ''An implementation of css selectors''; + + deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; + sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + }; + + packageName = "css-selectors"; + + asdFilesToKeep = ["css-selectors.asd"]; + overrides = x: x; +} +/* (SYSTEM css-selectors DESCRIPTION An implementation of css selectors SHA256 + 0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL + http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz + MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors FILENAME + css-selectors DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode FILENAME buildnode) + (NAME buildnode-xhtml FILENAME buildnode-xhtml) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) + (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME yacc FILENAME yacc)) + DEPENDENCIES + (alexandria babel buildnode buildnode-xhtml cl-interpol cl-ppcre cl-unicode + closer-mop closure-common closure-html collectors cxml cxml-dom + cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri + split-sequence swank symbol-munger trivial-features trivial-gray-streams + yacc) + VERSION 20160628-git SIBLINGS (css-selectors-simple-tree css-selectors-stp) + PARASITES (css-selectors-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 80a936560d15bcccb73cec84178795172f0ad3bf..52444db0e7988c60cddaae21c4e32886937120dd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-mysql''; - version = ''cl-dbi-20170725-git''; + version = ''cl-dbi-20180131-git''; description = ''Database driver for MySQL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbd-mysql"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-mysql FILENAME dbd-mysql DEPS + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-mysql FILENAME dbd-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot) @@ -35,5 +35,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-features trivial-types) - VERSION cl-dbi-20170725-git SIBLINGS + VERSION cl-dbi-20180131-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 1f7a784a5e6f7d599ba1ec528b019388297dcea2..4dc4683ff9a07809ea08245d09c154d71cfcf7f2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-postgres''; - version = ''cl-dbi-20170725-git''; + version = ''cl-dbi-20180131-git''; description = ''Database driver for PostgreSQL.''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbd-postgres"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-postgres FILENAME + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-postgres FILENAME dbd-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -31,10 +31,11 @@ rec { (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables) (NAME split-sequence FILENAME split-sequence) (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-types FILENAME trivial-types)) + (NAME trivial-types FILENAME trivial-types) + (NAME usocket FILENAME usocket)) DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot closer-mop dbi md5 named-readtables split-sequence trivial-garbage - trivial-types) - VERSION cl-dbi-20170725-git SIBLINGS + trivial-types usocket) + VERSION cl-dbi-20180131-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 1300aa476341da5f1136cb8f3900850f7e1513b3..cce90acfdf9c66bda695246de7478d6044b474c2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20170725-git''; + version = ''cl-dbi-20180131-git''; description = ''Database driver for SQLite3.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbd-sqlite3"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-sqlite3 FILENAME dbd-sqlite3 + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-sqlite3 FILENAME dbd-sqlite3 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -38,5 +38,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot closer-mop dbi iterate named-readtables split-sequence sqlite trivial-features trivial-types uiop) - VERSION cl-dbi-20170725-git SIBLINGS + VERSION cl-dbi-20180131-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 6e7611fd974821045522d8caf9ad01a03d07515d..31a48ea807b42d6e36b3fdf18a438a95b6ecad34 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbi''; - version = ''cl-20170725-git''; + version = ''cl-20180131-git''; description = ''Database independent interface for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbi FILENAME dbi DEPS + SHA256 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbi FILENAME dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop named-readtables split-sequence trivial-types) - VERSION cl-20170725-git SIBLINGS + VERSION cl-20180131-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 047cd3c0ffa01bb4ed47e8235aff58a1c280e93e..f03a95d27b1f026c9a0072953ca29c6e87fbe5c5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20170725-git''; + version = ''20171130-git''; description = ''Yet another HTTP client for Common Lisp''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz''; - sha256 = ''1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl''; + url = ''http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz''; + sha256 = ''0qg8jxij1s5j7jm2hxick9bvgc5nvq7fjalaah0rarynq70z61bd''; }; packageName = "dexador"; @@ -18,16 +18,16 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl URL - http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz - MD5 1ab5cda1ba8d5c81859349e6a5b99b29 NAME dexador FILENAME dexador DEPS + 0qg8jxij1s5j7jm2hxick9bvgc5nvq7fjalaah0rarynq70z61bd URL + http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz + MD5 e1b5154f2169708e2f351707a2bc135f NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) - (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-reexport FILENAME cl-reexport) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) + (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) (NAME cl-utilities FILENAME cl-utilities) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) @@ -42,9 +42,9 @@ rec { (NAME trivial-mimes FILENAME trivial-mimes) (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64 - cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities fast-http fast-io - flexi-streams local-time proc-parse quri smart-buffer split-sequence - static-vectors trivial-features trivial-garbage trivial-gray-streams - trivial-mimes usocket xsubseq) - VERSION 20170725-git SIBLINGS (dexador-test) PARASITES NIL) */ + (alexandria babel bordeaux-threads cffi cffi-grovel chipz chunga cl+ssl + cl-base64 cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities fast-http + fast-io flexi-streams local-time proc-parse quri smart-buffer + split-sequence static-vectors trivial-features trivial-garbage + trivial-gray-streams trivial-mimes usocket xsubseq) + VERSION 20171130-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 08521a07d740bad94a8edcb0358a3dc291486fe8..95d335493b7d3957b3d37772f14e4e977fb6ba2e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''do-urlencode''; - version = ''20130720-git''; + version = ''20170830-git''; description = ''Percent Encoding (aka URL Encoding) library''; deps = [ args."alexandria" args."babel" args."babel-streams" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz''; - sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa''; + url = ''http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz''; + sha256 = ''1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n''; }; packageName = "do-urlencode"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (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 FILENAME + SHA256 1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n URL + http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz + MD5 071a18bb58ed5c7d5184b34e672b5d91 NAME do-urlencode FILENAME do-urlencode DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) @@ -28,4 +28,4 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel babel-streams trivial-features trivial-gray-streams) - VERSION 20130720-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20170830-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 52c95b260e64487026513618efdf3b22776ce1de..0c3470d755cfea30508f1ed4b59be53bc91d7d10 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''documentation-utils''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A few simple tools to help you with documenting your library.''; deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz''; - sha256 = ''0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks''; + url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-01-31/documentation-utils-20180131-git.tgz''; + sha256 = ''0kyxjcl7dvylymzvmrn90kdwaxgrzyzpi1mqpirsr3yyb8h71avm''; }; packageName = "documentation-utils"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 - 0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks URL - http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz - MD5 7c0541d4207ba221a251c8c3ec7a8cac NAME documentation-utils FILENAME + 0kyxjcl7dvylymzvmrn90kdwaxgrzyzpi1mqpirsr3yyb8h71avm URL + http://beta.quicklisp.org/archive/documentation-utils/2018-01-31/documentation-utils-20180131-git.tgz + MD5 375dbb8ce48543fce1526eeea8d2a976 NAME documentation-utils FILENAME documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (trivial-indent) VERSION 20170630-git SIBLINGS NIL PARASITES + DEPENDENCIES (trivial-indent) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index aac0560e6772f04064cbc80adba4566c88e8a82a..95162ffc99a3cf949e62f46b64e6bb178a85844e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''drakma''; - version = ''v2.0.3''; + version = ''v2.0.4''; description = ''Full-featured http/https client based on usocket''; - deps = [ args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."usocket" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz''; - sha256 = ''1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd''; + url = ''http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz''; + sha256 = ''0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga''; }; packageName = "drakma"; @@ -18,14 +18,22 @@ rec { overrides = x: x; } /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket - SHA256 1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd URL - http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz MD5 - 3578c67b445cf982414ff78b2fb8d295 NAME drakma FILENAME drakma DEPS - ((NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) - (NAME cl-ppcre FILENAME cl-ppcre) + SHA256 0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga URL + http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz MD5 + 1c668721156beadeca4f6536677e143e NAME drakma FILENAME drakma DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) + (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME puri FILENAME puri) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket)) DEPENDENCIES - (chipz chunga cl+ssl cl-base64 cl-ppcre flexi-streams puri usocket) VERSION - v2.0.3 SIBLINGS (drakma-test) PARASITES NIL) */ + (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64 + cl-ppcre flexi-streams puri split-sequence trivial-features + trivial-garbage trivial-gray-streams usocket) + VERSION v2.0.4 SIBLINGS (drakma-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 2ef373aed8afe830cb441f9cdcb6ae1c40b9655b..b9f17a5d241fc9ea2bcc8c9d939461804b0b09f4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20170630-git''; + version = ''20180131-git''; parasites = [ "esrap/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz''; - sha256 = ''172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh''; + url = ''http://beta.quicklisp.org/archive/esrap/2018-01-31/esrap-20180131-git.tgz''; + sha256 = ''1kgr77w1ya125c04h6szxhzkxnq578rdf8f399wadqkav6x9dpkc''; }; packageName = "esrap"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 - 172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh URL - http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz - MD5 bfabfebc5f5d49106df318ae2798ac45 NAME esrap FILENAME esrap DEPS + 1kgr77w1ya125c04h6szxhzkxnq578rdf8f399wadqkav6x9dpkc URL + http://beta.quicklisp.org/archive/esrap/2018-01-31/esrap-20180131-git.tgz + MD5 89b22e10575198b9f680e0c4e90bec2c NAME esrap FILENAME esrap DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20170630-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20180131-git SIBLINGS NIL PARASITES (esrap/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index e890f4e81ffedd30fe94f9718cca0e64cfd4d866..99792023bdd00060e7a1aceb32ba7e03a74f8b19 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-http''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A fast HTTP protocol parser in Common Lisp''; - deps = [ args."alexandria" args."babel" args."cl-utilities" args."proc-parse" args."smart-buffer" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz''; - sha256 = ''0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29''; + url = ''http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz''; + sha256 = ''057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg''; }; packageName = "fast-http"; @@ -18,13 +18,18 @@ rec { overrides = x: x; } /* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp - SHA256 0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29 URL - http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz - MD5 d117d59c1f71965e0c32b19e6790cf9a NAME fast-http FILENAME fast-http DEPS + SHA256 057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg URL + http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz + MD5 0722e935fb644d57d44e8604e41e689e NAME fast-http FILENAME fast-http DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) + (NAME flexi-streams FILENAME flexi-streams) (NAME proc-parse FILENAME proc-parse) - (NAME smart-buffer FILENAME smart-buffer) (NAME xsubseq FILENAME xsubseq)) + (NAME smart-buffer FILENAME smart-buffer) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel cl-utilities proc-parse smart-buffer xsubseq) VERSION - 20170630-git SIBLINGS (fast-http-test) PARASITES NIL) */ + (alexandria babel cl-utilities flexi-streams proc-parse smart-buffer + trivial-features trivial-gray-streams xsubseq) + VERSION 20180131-git SIBLINGS (fast-http-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 8b9d5e5408b83f9f9b0dde56a97a13c0a1c08003..f78b7ae0cb6902bd728bd1bdd462700f762a7a6c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-io''; - version = ''20170630-git''; + version = ''20171023-git''; description = ''Alternative I/O mechanism to a stream or vector''; - deps = [ args."alexandria" args."static-vectors" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz''; - sha256 = ''0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg''; + url = ''http://beta.quicklisp.org/archive/fast-io/2017-10-23/fast-io-20171023-git.tgz''; + sha256 = ''09w4awnvw772s24ivgzx2irhy701nrsxbim6ip5rc70rfzbff8sl''; }; packageName = "fast-io"; @@ -18,11 +18,15 @@ rec { overrides = x: x; } /* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector - SHA256 0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg URL - http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz - MD5 34bfe5f306f2e0f6da128fe024ee242d NAME fast-io FILENAME fast-io DEPS - ((NAME alexandria FILENAME alexandria) + SHA256 09w4awnvw772s24ivgzx2irhy701nrsxbim6ip5rc70rfzbff8sl URL + http://beta.quicklisp.org/archive/fast-io/2017-10-23/fast-io-20171023-git.tgz + MD5 89105f8277f3bf3709fae1b789e3d5ad NAME fast-io FILENAME fast-io DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME static-vectors FILENAME static-vectors) + (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria static-vectors trivial-gray-streams) VERSION - 20170630-git SIBLINGS (fast-io-test) PARASITES NIL) */ + DEPENDENCIES + (alexandria babel cffi cffi-grovel static-vectors trivial-features + trivial-gray-streams) + VERSION 20171023-git SIBLINGS (fast-io-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix new file mode 100644 index 0000000000000000000000000000000000000000..245ee8b394af26c523f912c77c94627d4bf18764 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -0,0 +1,28 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fiasco''; + version = ''20171227-git''; + + parasites = [ "fiasco-self-tests" ]; + + description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fiasco/2017-12-27/fiasco-20171227-git.tgz''; + sha256 = ''1kv88yp4vjglahvknaxcdsp2kiwbs1nm94f857mkr2pmy87qbqx2''; + }; + + packageName = "fiasco"; + + asdFilesToKeep = ["fiasco.asd"]; + overrides = x: x; +} +/* (SYSTEM fiasco DESCRIPTION + A Common Lisp test framework that treasures your failures, logical continuation of Stefil. + SHA256 1kv88yp4vjglahvknaxcdsp2kiwbs1nm94f857mkr2pmy87qbqx2 URL + http://beta.quicklisp.org/archive/fiasco/2017-12-27/fiasco-20171227-git.tgz + MD5 3cc915e91f18617eb3d436b6fea9dd49 NAME fiasco FILENAME fiasco DEPS + ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION + 20171227-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index 69aeecd8aa2792f4d2839e496997fc73d78b21ef..6e652e8b312ee8cd4aad68272872fb59b33e2901 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''flexi-streams''; - version = ''1.0.15''; + version = ''20171227-git''; parasites = [ "flexi-streams-test" ]; @@ -10,8 +10,8 @@ rec { 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''; + url = ''http://beta.quicklisp.org/archive/flexi-streams/2017-12-27/flexi-streams-20171227-git.tgz''; + sha256 = ''1hw3w8syz7pyggxz1fwskrvjjwz5518vz5clkkjxfshlzqhwxfyc''; }; packageName = "flexi-streams"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (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 FILENAME + SHA256 1hw3w8syz7pyggxz1fwskrvjjwz5518vz5clkkjxfshlzqhwxfyc URL + http://beta.quicklisp.org/archive/flexi-streams/2017-12-27/flexi-streams-20171227-git.tgz + MD5 583aa697051062a0d6a6a73923f865d3 NAME flexi-streams FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL PARASITES + (trivial-gray-streams) VERSION 20171227-git SIBLINGS NIL PARASITES (flexi-streams-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 4847ee328d0e62ba31a71022a642e225fd5b801a..2aa5c07492508b85b430ff225964860efa3304c5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''form-fiddle''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A collection of utilities to destructure lambda forms.''; - deps = [ args."documentation-utils" ]; + deps = [ args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz''; - sha256 = ''0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf''; + url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz''; + sha256 = ''1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff''; }; packageName = "form-fiddle"; @@ -19,8 +19,11 @@ rec { } /* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 - 0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf URL - http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz - MD5 9c8eb18dfedebcf43718cc259c910aa1 NAME form-fiddle FILENAME form-fiddle - DEPS ((NAME documentation-utils FILENAME documentation-utils)) DEPENDENCIES - (documentation-utils) VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */ + 1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff URL + http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz + MD5 a0cc2ea1af29889e4991f7fefac366dd NAME form-fiddle FILENAME form-fiddle + DEPS + ((NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180131-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index 7b0ea1ff2ada45f5a7150aa0d596884612456ac7..d901df215a6850032e8c2ac5334877dae0897a6e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''fset''; - version = ''20150113-git''; + version = ''20171019-git''; description = ''A functional set-theoretic collections library. See: http://www.ergy.com/FSet.html @@ -10,8 +10,8 @@ See: http://www.ergy.com/FSet.html deps = [ args."misc-extensions" args."mt19937" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz''; - sha256 = ''1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0''; + url = ''http://beta.quicklisp.org/archive/fset/2017-10-19/fset-20171019-git.tgz''; + sha256 = ''07qxbj40kmjknmvvb47prj81mpi6j39150iw57hlrzdhlndvilwg''; }; packageName = "fset"; @@ -22,10 +22,10 @@ See: http://www.ergy.com/FSet.html /* (SYSTEM fset DESCRIPTION A functional set-theoretic collections library. See: http://www.ergy.com/FSet.html - SHA256 1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0 URL - http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz MD5 - 89f958cc900e712aed0750b336efbe15 NAME fset FILENAME fset DEPS + SHA256 07qxbj40kmjknmvvb47prj81mpi6j39150iw57hlrzdhlndvilwg URL + http://beta.quicklisp.org/archive/fset/2017-10-19/fset-20171019-git.tgz MD5 + dc8de5917c513302dd0e135e6c133978 NAME fset FILENAME fset DEPS ((NAME misc-extensions FILENAME misc-extensions) (NAME mt19937 FILENAME mt19937)) - DEPENDENCIES (misc-extensions mt19937) VERSION 20150113-git SIBLINGS NIL + DEPENDENCIES (misc-extensions mt19937) VERSION 20171019-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 04e53bd3fc19ce11b58b9445aadad4fb1098a6d6..604ccf0bdc7307ddfceda680355126c1d09fa3cb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -5,7 +5,7 @@ rec { description = ''HTTP POST data parser for Common Lisp''; - deps = [ args."alexandria" args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."trivial-gray-streams" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz''; @@ -30,10 +30,11 @@ rec { (NAME jonathan FILENAME jonathan) (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES (alexandria babel cl-annot cl-ppcre cl-syntax cl-utilities fast-http fast-io flexi-streams jonathan proc-parse quri smart-buffer split-sequence - trivial-gray-streams xsubseq) + trivial-features trivial-gray-streams xsubseq) VERSION 20161204-git SIBLINGS (http-body-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 5ce8459d9e2c0fa053ef0a5c093b50837cd26d16..611ef77256fad68bd83e29b1285172ac35f88dea 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''hunchentoot''; - version = ''v1.2.37''; + version = ''v1.2.38''; parasites = [ "hunchentoot-dev" "hunchentoot-test" ]; @@ -10,11 +10,11 @@ rec { simple framework for user-defined handlers and can be extended through subclassing.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz''; - sha256 = ''1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc''; + url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz''; + sha256 = ''1d3gnqbk2s3g9q51sx8mcsp2rmbvcfanbnljsf19npgfmz1ypsgd''; }; packageName = "hunchentoot"; @@ -27,14 +27,14 @@ rec { 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 1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc URL - http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz - MD5 3fd6a6c4dd0d32db7b71828b52494325 NAME hunchentoot FILENAME hunchentoot + SHA256 1d3gnqbk2s3g9q51sx8mcsp2rmbvcfanbnljsf19npgfmz1ypsgd URL + http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz + MD5 878a7833eb34a53231011b78e998e2fa NAME hunchentoot FILENAME hunchentoot DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-who FILENAME cl-who) (NAME cxml-stp FILENAME cxml-stp) (NAME drakma FILENAME drakma) (NAME flexi-streams FILENAME flexi-streams) @@ -50,4 +50,4 @@ rec { cl-ppcre cl-who cxml-stp drakma flexi-streams md5 rfc2388 split-sequence swank trivial-backtrace trivial-features trivial-garbage trivial-gray-streams usocket xpath) - VERSION v1.2.37 SIBLINGS NIL PARASITES (hunchentoot-dev hunchentoot-test)) */ + VERSION v1.2.38 SIBLINGS NIL PARASITES (hunchentoot-dev hunchentoot-test)) */ 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 index 3bb44ea2fc6ad065e997b266853b2e3051693a9b..4211dfbc9194d593fa0f814cd168da5ad406c36e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''ieee-floats''; - version = ''20160318-git''; + version = ''20170830-git''; parasites = [ "ieee-floats-tests" ]; - description = ''''; + description = ''Convert floating point values to IEEE 754 binary representation''; - deps = [ args."eos" ]; + deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz''; - sha256 = ''0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4''; + url = ''http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz''; + sha256 = ''15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk''; }; packageName = "ieee-floats"; @@ -19,9 +19,10 @@ rec { asdFilesToKeep = ["ieee-floats.asd"]; overrides = x: x; } -/* (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 FILENAME ieee-floats - DEPS ((NAME eos FILENAME eos)) DEPENDENCIES (eos) VERSION 20160318-git - SIBLINGS NIL PARASITES (ieee-floats-tests)) */ +/* (SYSTEM ieee-floats DESCRIPTION + Convert floating point values to IEEE 754 binary representation SHA256 + 15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk URL + http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz + MD5 3434b4d91224ca6a817ced9d83f14bb6 NAME ieee-floats FILENAME ieee-floats + DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION + 20170830-git SIBLINGS NIL PARASITES (ieee-floats-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 89301f90866fa59c39e1184d63d1625302142c79..578b251ecec2dc649ee152d842fdcfa47dc297bb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''ironclad''; - version = ''v0.34''; + version = ''v0.37''; - parasites = [ "ironclad-tests" ]; + parasites = [ "ironclad/tests" ]; description = ''A cryptographic toolkit written in pure Common Lisp''; deps = [ args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz''; - sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0''; + url = ''http://beta.quicklisp.org/archive/ironclad/2017-11-30/ironclad-v0.37.tgz''; + sha256 = ''061ln65yj9psch84nmsjrrlq41bkfv6iyg8sd9kpdc75lfc0vpi2''; }; packageName = "ironclad"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL - http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz - MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad FILENAME ironclad DEPS - ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.34 - SIBLINGS (ironclad-text) PARASITES (ironclad-tests)) */ + 061ln65yj9psch84nmsjrrlq41bkfv6iyg8sd9kpdc75lfc0vpi2 URL + http://beta.quicklisp.org/archive/ironclad/2017-11-30/ironclad-v0.37.tgz + MD5 9d8734764eead79f3a5d230b8e800d8f NAME ironclad FILENAME ironclad DEPS + ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.37 + SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index 42980e0c913531acf9a2974fa3964e20f59de912..645048c7190936a92ee552584c9e7e1cd60d40de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''iterate''; - version = ''20160825-darcs''; + version = ''20180131-darcs''; parasites = [ "iterate/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz''; - sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm''; + url = ''http://beta.quicklisp.org/archive/iterate/2018-01-31/iterate-20180131-darcs.tgz''; + sha256 = ''05jlwd59w13k4n9x7a0mszdv7i78cbmx93w2p1yzsi30593rh9hj''; }; packageName = "iterate"; @@ -21,8 +21,8 @@ rec { } /* (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 FILENAME iterate DEPS NIL - DEPENDENCIES NIL VERSION 20160825-darcs SIBLINGS NIL PARASITES + 05jlwd59w13k4n9x7a0mszdv7i78cbmx93w2p1yzsi30593rh9hj URL + http://beta.quicklisp.org/archive/iterate/2018-01-31/iterate-20180131-darcs.tgz + MD5 40a1776b445e42463c2c6f754468fb83 NAME iterate FILENAME iterate DEPS NIL + DEPENDENCIES NIL VERSION 20180131-darcs SIBLINGS NIL PARASITES (iterate/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 9f99f99d4ce324e110ed917b2b76f6cfc569ed26..408ef5dfabc9db6b4a284741a3fca3beeb2eae96 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-component''; - version = ''lack-20170725-git''; + version = ''lack-20180131-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack-component"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM lack-component DESCRIPTION NIL SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack-component FILENAME - lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20170725-git SIBLINGS + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack-component FILENAME + lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180131-git SIBLINGS (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 diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 2bbe5dcd33b4a95f7386e15bc7d6b28444b4bddf..a6816fa75c5c9ec3f4f023637500343bb32f4b72 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-middleware-backtrace''; - version = ''lack-20170725-git''; + version = ''lack-20180131-git''; description = ''''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack-middleware-backtrace"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack-middleware-backtrace FILENAME + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20170725-git SIBLINGS + (uiop) VERSION lack-20180131-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 38f834cd52b460a0dfc3636a28286f1829b887cd..a056d9d0d146d6d312b499e2e9e19c67744e55b3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-util''; - version = ''lack-20170725-git''; + version = ''lack-20180131-git''; description = ''''; deps = [ args."ironclad" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack-util"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-util DESCRIPTION NIL SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack-util FILENAME lack-util DEPS + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack-util FILENAME lack-util DEPS ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad nibbles) VERSION lack-20170725-git SIBLINGS + DEPENDENCIES (ironclad nibbles) VERSION lack-20180131-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 diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 0d65d48cf0a524a71bb3fe11985fdfc674f02e95..1c3998a3025c0e3e5ae5d2af4fc83fbbecae23da 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''A minimal Clack''; deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack FILENAME lack DEPS + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack FILENAME lack DEPS ((NAME ironclad FILENAME ironclad) (NAME lack-component FILENAME lack-component) (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles)) DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION - 20170725-git SIBLINGS + 20180131-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 diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index a94c8439cf2a4f37829d74ad27e1eba1fd937687..1f6a0709b0f43727b681c1a3292de354059af8a7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''let-plus''; - version = ''20170124-git''; + version = ''20171130-git''; - parasites = [ "let-plus-tests" ]; + parasites = [ "let-plus/tests" ]; description = ''Destructuring extension of LET*.''; deps = [ args."alexandria" args."anaphora" args."lift" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz''; - sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8''; + url = ''http://beta.quicklisp.org/archive/let-plus/2017-11-30/let-plus-20171130-git.tgz''; + sha256 = ''1v8rp3ab6kp6v5kl58gi700wjs4qgmkxxkmhx2a1i6b2z934xkx7''; }; packageName = "let-plus"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (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 FILENAME let-plus DEPS + 1v8rp3ab6kp6v5kl58gi700wjs4qgmkxxkmhx2a1i6b2z934xkx7 URL + http://beta.quicklisp.org/archive/let-plus/2017-11-30/let-plus-20171130-git.tgz + MD5 cd92097d436a513e7d0eac535617ca08 NAME let-plus FILENAME let-plus DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME lift FILENAME lift)) - DEPENDENCIES (alexandria anaphora lift) VERSION 20170124-git SIBLINGS NIL - PARASITES (let-plus-tests)) */ + DEPENDENCIES (alexandria anaphora lift) VERSION 20171130-git SIBLINGS NIL + PARASITES (let-plus/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix index 50bc9946ccaeab71b57e8c8dac23cf7349e9b66d..7f88beb974b05e38f1bc0ecf72337ea1f20c0b3a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lisp-namespace''; - version = ''20170630-git''; + version = ''20171130-git''; description = ''Provides LISP-N --- extensible namespaces in Common Lisp.''; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz''; - sha256 = ''06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n''; + url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz''; + sha256 = ''0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j''; }; packageName = "lisp-namespace"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM lisp-namespace DESCRIPTION Provides LISP-N --- extensible namespaces in Common Lisp. SHA256 - 06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n URL - http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz - MD5 f3379a60f7cc896a7cff384ff25a1de5 NAME lisp-namespace FILENAME + 0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j URL + http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz + MD5 d3052a13db167c6a53487f31753b7467 NAME lisp-namespace FILENAME lisp-namespace DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES - (alexandria) VERSION 20170630-git SIBLINGS (lisp-namespace.test) PARASITES + (alexandria) VERSION 20171130-git SIBLINGS (lisp-namespace.test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index 47e57ba1285a3a75633017e6f4ab924b224521ac..62197234305a11a45d37979c9184128f304703f7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''lisp-unit2''; - version = ''20160531-git''; + version = ''20180131-git''; parasites = [ "lisp-unit2-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-unit2/2016-05-31/lisp-unit2-20160531-git.tgz''; - sha256 = ''17frcygs515l611cwggm90xapl8xng9cylsrdh11ygmdxwwy59sv''; + url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz''; + sha256 = ''04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7''; }; packageName = "lisp-unit2"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM lisp-unit2 DESCRIPTION Common Lisp library that supports unit testing. SHA256 - 17frcygs515l611cwggm90xapl8xng9cylsrdh11ygmdxwwy59sv URL - http://beta.quicklisp.org/archive/lisp-unit2/2016-05-31/lisp-unit2-20160531-git.tgz - MD5 913675bff1f86453887681e72ae5914d NAME lisp-unit2 FILENAME lisp-unit2 + 04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7 URL + http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz + MD5 d061fa640837441a5d2eecbefd8b2e69 NAME lisp-unit2 FILENAME lisp-unit2 DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) @@ -34,4 +34,4 @@ rec { DEPENDENCIES (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate symbol-munger) - VERSION 20160531-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */ + VERSION 20180131-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index f5137a5e927d39203fd6cadb4d50d9747fdb8787..0b2556b2572dedf41e4327d513085a5be9997d1c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20170725-git''; + version = ''20180131-git''; + + parasites = [ "local-time/test" ]; description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz''; - sha256 = ''05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9''; + url = ''http://beta.quicklisp.org/archive/local-time/2018-01-31/local-time-20180131-git.tgz''; + sha256 = ''1i8km0ndqk1kx914n0chi4c3kkk6m0zk0kplh87fgzwn4lh79rpr''; }; packageName = "local-time"; @@ -19,12 +21,12 @@ rec { } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum - SHA256 05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9 URL - http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz - MD5 77a79ed1036bc3547f5174f2256c8e93 NAME local-time FILENAME local-time + SHA256 1i8km0ndqk1kx914n0chi4c3kkk6m0zk0kplh87fgzwn4lh79rpr URL + http://beta.quicklisp.org/archive/local-time/2018-01-31/local-time-20180131-git.tgz + MD5 61982a1f2b29793e00369d9c2b6d1b12 NAME local-time FILENAME local-time DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-fad FILENAME cl-fad)) - DEPENDENCIES (alexandria bordeaux-threads cl-fad) VERSION 20170725-git - SIBLINGS (cl-postgres+local-time local-time.test) PARASITES NIL) */ + (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil)) + DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION + 20180131-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index b8592e12490b383326b95806c93a7df3e2b49168..1ca094d139db487761eafddb0369f40c7a4e9d69 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lquery''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A library to allow jQuery-like HTML/DOM manipulation.''; - deps = [ args."array-utils" args."clss" args."form-fiddle" args."plump" ]; + deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz''; - sha256 = ''19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm''; + url = ''http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz''; + sha256 = ''1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9''; }; packageName = "lquery"; @@ -19,10 +19,13 @@ rec { } /* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 - 19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm URL - http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz - MD5 aeb03cb5174d682092683da488531a9c NAME lquery FILENAME lquery DEPS + 1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9 URL + http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz + MD5 07e92aad32c4d12c4699956b57dbc9b8 NAME lquery FILENAME lquery DEPS ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss) - (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump)) - DEPENDENCIES (array-utils clss form-fiddle plump) VERSION 20170630-git - SIBLINGS (lquery-test) PARASITES NIL) */ + (NAME documentation-utils FILENAME documentation-utils) + (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES + (array-utils clss documentation-utils form-fiddle plump trivial-indent) + VERSION 20180131-git SIBLINGS (lquery-test) PARASITES 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 index b45b0a5da70cb00492c2578efe7f68ba1dfe5fdd..4d17bd6341f285191042147b5597ca4fcaf98409 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''marshal''; - version = ''cl-20170124-git''; + version = ''cl-20170830-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''; + url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-08-30/cl-marshal-20170830-git.tgz''; + sha256 = ''1yirhxyizfxsvsrmbh2dipzzlq09afahzmi2zlsbbv6cvijxnisp''; }; packageName = "marshal"; @@ -19,7 +19,8 @@ rec { } /* (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 FILENAME marshal DEPS NIL - DEPENDENCIES NIL VERSION cl-20170124-git SIBLINGS NIL PARASITES NIL) */ + 1yirhxyizfxsvsrmbh2dipzzlq09afahzmi2zlsbbv6cvijxnisp URL + http://beta.quicklisp.org/archive/cl-marshal/2017-08-30/cl-marshal-20170830-git.tgz + MD5 54bce031cdb215cd7624fdf3265b9bec NAME marshal FILENAME marshal DEPS NIL + DEPENDENCIES NIL VERSION cl-20170830-git SIBLINGS (marshal-tests) PARASITES + NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index ac12468c880465b8f38c20fff158598d64e5eb42..d72e0839d1e8baf04e318f25208bd6e91e0c8a97 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''metabang-bind''; - version = ''20170124-git''; + version = ''20171130-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''; + url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-11-30/metabang-bind-20171130-git.tgz''; + sha256 = ''0mjcg4281qljjwzq80r9j7nhvccf5k1069kzk2vljvvm2ai21j1a''; }; packageName = "metabang-bind"; @@ -19,8 +19,8 @@ rec { } /* (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 FILENAME - metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS + SHA256 0mjcg4281qljjwzq80r9j7nhvccf5k1069kzk2vljvvm2ai21j1a URL + http://beta.quicklisp.org/archive/metabang-bind/2017-11-30/metabang-bind-20171130-git.tgz + MD5 dfd06d3929c2f48ccbe1d00cdf9995a7 NAME metabang-bind FILENAME + metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20171130-git SIBLINGS (metabang-bind-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index a239fe7e32b5760148591266f873401d258cc9e2..82d06b1c93b2f8fe6727aea2a52776d1f4cf4e93 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,7 +1,9 @@ args @ { fetchurl, ... }: rec { baseName = ''named-readtables''; - version = ''20170124-git''; + version = ''20180131-git''; + + parasites = [ "named-readtables/test" ]; description = ''Library that creates a namespace for named readtable akin to the namespace of packages.''; @@ -9,8 +11,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz''; - sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45''; + url = ''http://beta.quicklisp.org/archive/named-readtables/2018-01-31/named-readtables-20180131-git.tgz''; + sha256 = ''1fhygm2q75m6my6appxmx097l7zlr3qxbgzbpa2mf9pr1qzwrgg5''; }; packageName = "named-readtables"; @@ -21,8 +23,8 @@ rec { /* (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 FILENAME - named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS - NIL PARASITES NIL) */ + SHA256 1fhygm2q75m6my6appxmx097l7zlr3qxbgzbpa2mf9pr1qzwrgg5 URL + http://beta.quicklisp.org/archive/named-readtables/2018-01-31/named-readtables-20180131-git.tgz + MD5 46db18ba947dc0aba14c76471604448d NAME named-readtables FILENAME + named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS + NIL PARASITES (named-readtables/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index fbcfbe29164d5415d0eb9ede2d47c7f4bb7f84ee..9275e5583f56b956f90b45efca4873d773287954 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''nibbles''; - version = ''20170403-git''; + version = ''20171130-git''; - parasites = [ "nibbles-tests" ]; + parasites = [ "nibbles/tests" ]; 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''; + url = ''http://beta.quicklisp.org/archive/nibbles/2017-11-30/nibbles-20171130-git.tgz''; + sha256 = ''05ykyniak1m0whr7pnbhg53yblr5mny0crmh72bmgnvpmkm345zn''; }; packageName = "nibbles"; @@ -21,8 +21,8 @@ rec { } /* (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 FILENAME nibbles DEPS NIL - DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL PARASITES - (nibbles-tests)) */ + SHA256 05ykyniak1m0whr7pnbhg53yblr5mny0crmh72bmgnvpmkm345zn URL + http://beta.quicklisp.org/archive/nibbles/2017-11-30/nibbles-20171130-git.tgz + MD5 edce3702da9979fca3e40a4594fe36e6 NAME nibbles FILENAME nibbles DEPS NIL + DEPENDENCIES NIL VERSION 20171130-git SIBLINGS NIL PARASITES + (nibbles/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix index 07baf1539bc9b417b2dcb182bebe5a033874c05a..a913cdbe521c13f270877e03d2de64da99badf0a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -5,10 +5,10 @@ rec { description = ''Load data into PostgreSQL''; - deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; + deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-finalizers" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."salza2" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz''; + url = ''http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz''; sha256 = ''1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v''; }; @@ -19,15 +19,16 @@ rec { } /* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v URL - http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz + http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz MD5 6741f8e7d2d416942d5c4a1971576d33 NAME pgloader FILENAME pgloader DEPS ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME asdf-finalizers FILENAME asdf-finalizers) (NAME asdf-system-connections FILENAME asdf-system-connections) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-containers FILENAME cl-containers) (NAME cl-csv FILENAME cl-csv) (NAME cl-fad FILENAME cl-fad) (NAME cl-interpol FILENAME cl-interpol) @@ -52,22 +53,24 @@ rec { (NAME postmodern FILENAME postmodern) (NAME puri FILENAME puri) (NAME py-configparser FILENAME py-configparser) (NAME qmynd FILENAME qmynd) (NAME quri FILENAME quri) - (NAME s-sql FILENAME s-sql) (NAME simple-date FILENAME simple-date) + (NAME s-sql FILENAME s-sql) (NAME salza2 FILENAME salza2) + (NAME simple-date FILENAME simple-date) (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop) (NAME usocket FILENAME usocket) (NAME uuid FILENAME uuid)) DEPENDENCIES - (abnf alexandria anaphora asdf-system-connections babel bordeaux-threads - cffi chipz chunga cl+ssl cl-base64 cl-containers cl-csv cl-fad cl-interpol - cl-log cl-markdown cl-postgres cl-ppcre cl-unicode cl-utilities closer-mop - command-line-arguments db3 drakma dynamic-classes esrap flexi-streams - garbage-pools ieee-floats ironclad iterate ixf list-of local-time - lparallel md5 metabang-bind metatilities-base mssql nibbles parse-number - postmodern puri py-configparser qmynd quri s-sql simple-date - split-sequence sqlite trivial-backtrace trivial-features - trivial-gray-streams trivial-utf-8 uiop usocket uuid) + (abnf alexandria anaphora asdf-finalizers asdf-system-connections babel + bordeaux-threads cffi chipz chunga cl+ssl cl-base64 cl-containers cl-csv + cl-fad cl-interpol cl-log cl-markdown cl-postgres cl-ppcre cl-unicode + cl-utilities closer-mop command-line-arguments db3 drakma dynamic-classes + esrap flexi-streams garbage-pools ieee-floats ironclad iterate ixf list-of + local-time lparallel md5 metabang-bind metatilities-base mssql nibbles + parse-number postmodern puri py-configparser qmynd quri s-sql salza2 + simple-date split-sequence sqlite trivial-backtrace trivial-features + trivial-garbage trivial-gray-streams trivial-utf-8 uiop usocket uuid) VERSION v3.4.1 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 763677c677c2dc3cd23d9c7c2c644385844b2b2a..02bb16e0b78d1e7ac172dfbc5fedfb0b88cc5514 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; - deps = [ args."array-utils" args."plump-dom" args."plump-lexer" args."plump-parser" args."trivial-indent" ]; + deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz''; - sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72''; + url = ''http://beta.quicklisp.org/archive/plump/2018-01-31/plump-20180131-git.tgz''; + sha256 = ''12kawjp88kh7cl2f3s2rg3fp3m09pr477nl9nxcfhmfkbrprslis''; }; packageName = "plump"; @@ -19,14 +19,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 URL - http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz - MD5 e5e92dd177711a14753ee86961710458 NAME plump FILENAME plump DEPS + 12kawjp88kh7cl2f3s2rg3fp3m09pr477nl9nxcfhmfkbrprslis URL + http://beta.quicklisp.org/archive/plump/2018-01-31/plump-20180131-git.tgz + MD5 b9e7e174b2322b6547bca7beddda6f3b NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) - (NAME plump-dom FILENAME plump-dom) - (NAME plump-lexer FILENAME plump-lexer) - (NAME plump-parser FILENAME plump-parser) + (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES - (array-utils plump-dom plump-lexer plump-parser trivial-indent) VERSION - 20170725-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION + 20180131-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index bbc0ad6b15bd1c311f41ed0dd59dbe5fd7e60f03..441f78171098522e88ffdf481fdae88ab6361ba9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''postmodern''; - version = ''20170403-git''; + version = ''20180131-git''; - parasites = [ "postmodern-tests" ]; + parasites = [ "postmodern/tests" ]; description = ''PostgreSQL programming API''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres-tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."simple-date" args."simple-date-postgres-glue" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "postmodern"; @@ -20,20 +20,23 @@ rec { overrides = x: x; } /* (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 FILENAME postmodern + 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME postmodern FILENAME postmodern DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-postgres FILENAME cl-postgres) - (NAME cl-postgres-tests FILENAME cl-postgres-tests) + (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests) (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) (NAME s-sql FILENAME s-sql) (NAME simple-date FILENAME simple-date) - (NAME simple-date-postgres-glue FILENAME simple-date-postgres-glue)) + (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket)) DEPENDENCIES - (alexandria bordeaux-threads cl-postgres cl-postgres-tests closer-mop - fiveam md5 s-sql simple-date simple-date-postgres-glue) - VERSION 20170403-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES - (postmodern-tests)) */ + (alexandria bordeaux-threads cl-postgres cl-postgres/tests closer-mop + fiveam md5 s-sql simple-date simple-date/postgres-glue split-sequence + usocket) + VERSION 20180131-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES + (postmodern/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index 7815efa4ecd33f1d7a829afa1f5bc204c243c377..a1542dc13cf655bb6623f00c216876d89fd44931 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''prove''; - version = ''20170403-git''; + version = ''20171130-git''; description = ''''; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; - sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; + url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz''; + sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar''; }; packageName = "prove"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM prove DESCRIPTION NIL SHA256 - 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL - http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz - MD5 063b615692c8711d2392204ecf1b37b7 NAME prove FILENAME prove DEPS + 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL + http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz + MD5 630df4367537f799570be40242f8ed52 NAME prove FILENAME prove DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME cl-ansi-text FILENAME cl-ansi-text) (NAME cl-colors FILENAME cl-colors) (NAME cl-ppcre FILENAME cl-ppcre) (NAME let-plus FILENAME let-plus) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus uiop) VERSION - 20170403-git SIBLINGS (cl-test-more prove-asdf prove-test) PARASITES NIL) */ + 20171130-git SIBLINGS (cl-test-more prove-asdf prove-test) PARASITES 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 index 3b3d90d1a1e4925d088d5139edceb6a6cfb06065..0eb4c0f5b9e6b733af6636ec22a47195d338ba19 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''py-configparser''; - version = ''20170725-svn''; + version = ''20170830-svn''; description = ''Common Lisp implementation of the Python ConfigParser module''; deps = [ args."parse-number" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz''; - sha256 = ''08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr''; + url = ''http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz''; + sha256 = ''0lf062m6nrq61cxafi7jyfh3ianml1qqqzdfd5pm1wzakl2jqp9j''; }; packageName = "py-configparser"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 - 08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr URL - http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz - MD5 3486092bb1d56be05dab16036f288a74 NAME py-configparser FILENAME + 0lf062m6nrq61cxafi7jyfh3ianml1qqqzdfd5pm1wzakl2jqp9j URL + http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz + MD5 b6a9fc2a9c70760d6683cafe656f9e90 NAME py-configparser FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) - DEPENDENCIES (parse-number) VERSION 20170725-svn SIBLINGS NIL PARASITES NIL) */ + DEPENDENCIES (parse-number) VERSION 20170830-svn SIBLINGS NIL PARASITES 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 index d6d853413c25cecb6b0d2823ccc9be6772893bd7..de24a598496052cf02cf1aaebf9e0104fdb0eb56 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''qmynd''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''MySQL Native Driver''; - deps = [ args."babel" args."flexi-streams" args."ironclad" args."list-of" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."asdf-finalizers" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."cl_plus_ssl" args."flexi-streams" args."ironclad" args."list-of" args."nibbles" args."salza2" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz''; - sha256 = ''01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi''; + url = ''http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz''; + sha256 = ''1ripapyrpzp36wsb2xf8w63nf0cjc13xh6xx296p8wgi01jwm61c''; }; packageName = "qmynd"; @@ -18,13 +18,25 @@ rec { overrides = x: x; } /* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 - 01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi URL - http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz - MD5 64776472d1e0c4c0e41a1b4a2a24167e NAME qmynd FILENAME qmynd DEPS - ((NAME babel FILENAME babel) (NAME flexi-streams FILENAME flexi-streams) + 1ripapyrpzp36wsb2xf8w63nf0cjc13xh6xx296p8wgi01jwm61c URL + http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz + MD5 60177d28b1945234fd72760007194b3e NAME qmynd FILENAME qmynd DEPS + ((NAME alexandria FILENAME alexandria) + (NAME asdf-finalizers FILENAME asdf-finalizers) + (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) + (NAME cl+ssl FILENAME cl_plus_ssl) + (NAME flexi-streams FILENAME flexi-streams) (NAME ironclad FILENAME ironclad) (NAME list-of FILENAME list-of) + (NAME nibbles FILENAME nibbles) (NAME salza2 FILENAME salza2) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket)) DEPENDENCIES - (babel flexi-streams ironclad list-of trivial-gray-streams usocket) VERSION - 20170630-git SIBLINGS (qmynd-test) PARASITES NIL) */ + (alexandria asdf-finalizers babel bordeaux-threads cffi chipz cl+ssl + flexi-streams ironclad list-of nibbles salza2 split-sequence + trivial-features trivial-garbage trivial-gray-streams usocket) + VERSION 20180131-git SIBLINGS (qmynd-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index f75e890760e883a492be71d9ee51bbb1e8b0c43c..83d835fe2dd8cb57b6a700e28fb8107857db5d61 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''s-sql''; - version = ''postmodern-20170403-git''; + version = ''postmodern-20180131-git''; description = ''''; - deps = [ args."cl-postgres" args."md5" ]; + deps = [ args."cl-postgres" args."md5" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "s-sql"; @@ -18,9 +18,12 @@ rec { overrides = x: x; } /* (SYSTEM s-sql DESCRIPTION NIL SHA256 - 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL - http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz - MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME s-sql FILENAME s-sql DEPS - ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5)) - DEPENDENCIES (cl-postgres md5) VERSION postmodern-20170403-git SIBLINGS - (cl-postgres postmodern simple-date) PARASITES NIL) */ + 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME s-sql FILENAME s-sql DEPS + ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket)) + DEPENDENCIES (cl-postgres md5 split-sequence usocket) VERSION + postmodern-20180131-git SIBLINGS (cl-postgres postmodern simple-date) + PARASITES 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 index 31e70992a4cfc3b84b8da8b4f1d578586d99eca4..d718b1293106976842fa529765d072b650867e92 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''simple-date''; - version = ''postmodern-20170403-git''; + version = ''postmodern-20180131-git''; - parasites = [ "simple-date-postgres-glue" "simple-date-tests" ]; + parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; description = ''''; - deps = [ args."cl-postgres" args."fiveam" args."md5" ]; + deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "simple-date"; @@ -20,12 +20,12 @@ rec { overrides = x: x; } /* (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 FILENAME simple-date + 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME simple-date FILENAME simple-date DEPS ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam) - (NAME md5 FILENAME md5)) - DEPENDENCIES (cl-postgres fiveam md5) VERSION postmodern-20170403-git - SIBLINGS (cl-postgres postmodern s-sql) PARASITES - (simple-date-postgres-glue simple-date-tests)) */ + (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket)) + DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION + postmodern-20180131-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + (simple-date/postgres-glue simple-date/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index e18c0c325f1cf93757d9e1f0155191219680eef6..b07feca16b004f4c071457e6dd8f7d2cc5cdc312 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''static-vectors''; - version = ''v1.8.2''; + version = ''v1.8.3''; parasites = [ "static-vectors/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz''; - sha256 = ''0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g''; + url = ''http://beta.quicklisp.org/archive/static-vectors/2017-10-19/static-vectors-v1.8.3.tgz''; + sha256 = ''084690v6xldb9xysgc4hg284j0j9ppxldz4gxwmfin1dzxq0g6xk''; }; packageName = "static-vectors"; @@ -21,13 +21,13 @@ rec { } /* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 - 0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL - http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz - MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors FILENAME + 084690v6xldb9xysgc4hg284j0j9ppxldz4gxwmfin1dzxq0g6xk URL + http://beta.quicklisp.org/archive/static-vectors/2017-10-19/static-vectors-v1.8.3.tgz + MD5 cbad9e34904eedde61cd4cddcca6de29 NAME static-vectors FILENAME static-vectors DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME fiveam FILENAME fiveam) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-grovel fiveam trivial-features) - VERSION v1.8.2 SIBLINGS NIL PARASITES (static-vectors/test)) */ + VERSION v1.8.3 SIBLINGS NIL PARASITES (static-vectors/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix new file mode 100644 index 0000000000000000000000000000000000000000..0dca605c1fdfde3c4529e2fa7c9640bd6e24090e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -0,0 +1,29 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''stefil''; + version = ''20101107-darcs''; + + parasites = [ "stefil-test" ]; + + description = ''Stefil - Simple Test Framework In Lisp''; + + deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz''; + sha256 = ''0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3''; + }; + + packageName = "stefil"; + + asdFilesToKeep = ["stefil.asd"]; + overrides = x: x; +} +/* (SYSTEM stefil DESCRIPTION Stefil - Simple Test Framework In Lisp SHA256 + 0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3 URL + http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz + MD5 8c56bc03e7679e4d42bb3bb3b101de80 NAME stefil FILENAME stefil DEPS + ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate) + (NAME metabang-bind FILENAME metabang-bind) (NAME swank FILENAME swank)) + DEPENDENCIES (alexandria iterate metabang-bind swank) VERSION + 20101107-darcs SIBLINGS NIL PARASITES (stefil-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix new file mode 100644 index 0000000000000000000000000000000000000000..7f5cc1e048de8bd7d9fa32edf8f0579ec7875db7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''string-case''; + version = ''20151218-git''; + + description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz''; + sha256 = ''0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw''; + }; + + packageName = "string-case"; + + asdFilesToKeep = ["string-case.asd"]; + overrides = x: x; +} +/* (SYSTEM string-case DESCRIPTION + string-case is a macro that generates specialised decision trees to dispatch on string equality + SHA256 0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw URL + http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz + MD5 fb747ba1276f0173f875876425b1acc3 NAME string-case FILENAME string-case + DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index c7f845a4cf46f65286f8f95600698c9661529cd7..5191e2f336d8c1a2e126edee7ddfce303d896d6f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''A tiling, keyboard driven window manager''; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz''; - sha256 = ''1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2018-01-31/stumpwm-20180131-git.tgz''; + sha256 = ''1mlwgs0b8hd64wqk9qcv2x08zzfvbnn81fsdza7v5rcb8mx5abg0''; }; packageName = "stumpwm"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5 URL - http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz - MD5 a7fb260c6572273c05b828299c0610ce NAME stumpwm FILENAME stumpwm DEPS + 1mlwgs0b8hd64wqk9qcv2x08zzfvbnn81fsdza7v5rcb8mx5abg0 URL + http://beta.quicklisp.org/archive/stumpwm/2018-01-31/stumpwm-20180131-git.tgz + MD5 252427acf3f2dbc2a5522598c4e37be1 NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20170725-git SIBLINGS NIL + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 21fcaddf5359798bdb4fca10402bee39cc17fdb6..1359e13b949ef703bee065955512fbf00176770a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''swank''; - version = ''slime-v2.19''; + version = ''slime-v2.20''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2017-02-27/slime-v2.19.tgz''; - sha256 = ''1w3xq4kiy06wbmk2sf30saqgy1qa9v2llbi6bqy7hrm956yh6dza''; + url = ''http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz''; + sha256 = ''0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26''; }; packageName = "swank"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM swank DESCRIPTION NIL SHA256 - 1w3xq4kiy06wbmk2sf30saqgy1qa9v2llbi6bqy7hrm956yh6dza URL - http://beta.quicklisp.org/archive/slime/2017-02-27/slime-v2.19.tgz MD5 - 7e1540ebb970db0f77b6e6cabb36ba41 NAME swank FILENAME swank DEPS NIL - DEPENDENCIES NIL VERSION slime-v2.19 SIBLINGS NIL PARASITES NIL) */ + 0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26 URL + http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz MD5 + 115188047b753ce1864586e114ecb46c NAME swank FILENAME swank DEPS NIL + DEPENDENCIES NIL VERSION slime-v2.20 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index c0964c9731d0019918a929a941ab52fdc4a28adc..4f4e1f812233db168e3c5862853d24af300aead2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-indent''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A very simple library to allow indentation hints for SWANK.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz''; - sha256 = ''18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7''; + url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz''; + sha256 = ''1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w''; }; packageName = "trivial-indent"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 - 18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7 URL - http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz - MD5 9f11cc1014be3e3ae588a3cd07315be6 NAME trivial-indent FILENAME - trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL + 1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w URL + http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz + MD5 a915258466d07465da1f71476bf59d12 NAME trivial-indent FILENAME + trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index 080f854db43a1ce639a5a5e4a5d521280eb55262..56bbb583837750625b1c5739dc80625840782d87 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-mimes''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''Tiny library to detect mime types in files.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz''; - sha256 = ''0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx''; + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz''; + sha256 = ''0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b''; }; packageName = "trivial-mimes"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 - 0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx URL - http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz - MD5 5aecea17e102bd2dab7e71fecd1f8e44 NAME trivial-mimes FILENAME - trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL + 0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b URL + http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz + MD5 9c91e72a8ee2455f9c5cbba1f7d2fcef NAME trivial-mimes FILENAME + trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 998681d02ab3bb228c861b56d267f44f162d9c4a..39c2060af02753b6733e59517919c698df378a62 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''uiop''; - version = ''3.2.1''; + version = ''3.3.1''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz''; - sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v''; + url = ''http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz''; + sha256 = ''0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc''; }; packageName = "uiop"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM uiop DESCRIPTION NIL SHA256 - 1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL - http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz MD5 - 3e9ef02ecf9005240b66552d85719700 NAME uiop FILENAME uiop DEPS NIL - DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver) PARASITES NIL) */ + 0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc URL + http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz MD5 + 7a90377c4fc96676d5fa5197d9e9ec11 NAME uiop FILENAME uiop DEPS NIL + DEPENDENCIES NIL VERSION 3.3.1 SIBLINGS (asdf-driver) PARASITES 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 index 7e7e9b6acadc9883df19ad95bc0fbe3cc35ae4d7..fb483662df53c7541ca8a502c3592787896bcff8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''woo''; - version = ''20170725-git''; + version = ''20170830-git''; description = ''An asynchronous HTTP server written in Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz''; - sha256 = ''11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg''; + url = ''http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz''; + sha256 = ''130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv''; }; packageName = "woo"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp - SHA256 11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg URL - http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz MD5 - bd901d8dfa7df3d19c6da73ea101f65b NAME woo FILENAME woo DEPS + SHA256 130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv URL + http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz MD5 + 3f506a771b3d8f2c7fc97b049dcfdedf NAME woo FILENAME woo DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -42,4 +42,4 @@ rec { clack-socket fast-http fast-io flexi-streams lev proc-parse quri smart-buffer split-sequence static-vectors swap-bytes trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq) - VERSION 20170725-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ + VERSION 20170830-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix new file mode 100644 index 0000000000000000000000000000000000000000..4c88e839bdab0cbbe64da7c44d1788e8ecbcc46a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''xembed''; + version = ''clx-20120909-git''; + + description = ''''; + + deps = [ args."clx" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz''; + sha256 = ''06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb''; + }; + + packageName = "xembed"; + + asdFilesToKeep = ["xembed.asd"]; + overrides = x: x; +} +/* (SYSTEM xembed DESCRIPTION NIL SHA256 + 06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb URL + http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz + MD5 4270362697093017ac0243b71e3576f9 NAME xembed FILENAME xembed DEPS + ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20120909-git + SIBLINGS NIL PARASITES 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 index 91598bf66626a0a3f57c9b7cd9e03dd09fe7dec5..b9ab71744c3a1f2e42e1e177f91cf1bdee914cdb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''xsubseq''; - version = ''20150113-git''; + version = ''20170830-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''; + url = ''http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz''; + sha256 = ''1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml''; }; packageName = "xsubseq"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (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 FILENAME xsubseq DEPS NIL - DEPENDENCIES NIL VERSION 20150113-git SIBLINGS (xsubseq-test) PARASITES NIL) */ + SHA256 1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml URL + http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz + MD5 960bb8f329649b6e4b820e065e6b38e8 NAME xsubseq FILENAME xsubseq DEPS NIL + DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (xsubseq-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index a20b19643d302ebd9c729cdd15b2fe6aef163bfe..111d995274983d0ac08e37ea4d39a28f45465875 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -15,9 +15,8 @@ in export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; ''; postInstall = '' - "$out/bin/stumpwm-lisp-launcher.sh" --eval '(asdf:make :stumpwm)' \ - --eval '(setf (asdf/system:component-entry-point (asdf:find-system :stumpwm)) (function stumpwm:stumpwm))' \ - --eval '(asdf:perform (quote asdf:program-op) :stumpwm)' + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm '(function stumpwm:stumpwm)'" + "$out/bin/stumpwm-lisp-launcher.sh" cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin" ''; @@ -28,12 +27,13 @@ in 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" + type gcc + mkdir -p "$out/lib/common-lisp/" + cp -r . "$out/lib/common-lisp/cl-fuse/" + "gcc" "-x" "c" "$out/lib/common-lisp/cl-fuse/fuse-launcher.c-minus" "-fPIC" "--shared" "-lfuse" "-o" "$out/lib/common-lisp/cl-fuse/libfuse-launcher.so" ''; }; }; @@ -46,17 +46,17 @@ in cxml = skipBuildPhase; wookie = addNativeLibs (with pkgs; [libuv openssl]); lev = addNativeLibs [pkgs.libev]; - "cl+ssl" = addNativeLibs [pkgs.openssl]; + cl_plus_ssl = addNativeLibs [pkgs.openssl]; cl-colors = skipBuildPhase; cl-libuv = addNativeLibs [pkgs.libuv]; cl-async-ssl = addNativeLibs [pkgs.openssl]; cl-async-test = addNativeLibs [pkgs.openssl]; clsql = x: { - propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib]; + propagatedBuildInputs = with pkgs; [mysql.connector-c 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" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql" ''; }; }; @@ -65,14 +65,13 @@ in 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 NIX_LISP_ASDF_PATHS="$NIX_LISP_ASDF_PATHS +$out/lib/common-lisp/query-fs" export HOME=$PWD - "$out/bin/query-fs-lisp-launcher.sh" --eval '(asdf:make :query-fs)' \ - --eval "(progn $(for i in $linkedSystems; do echo "(asdf:make :$i)"; done) )" \ - --eval '(setf (asdf/system:component-entry-point (asdf:find-system :query-fs)) - (function query-fs:run-fs-with-cmdline-args))' \ - --eval '(asdf:perform (quote asdf:program-op) :query-fs)' - cp "$out/lib/common-lisp/query-fs/query-fs" "$out/bin/" + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system query-fs \ + '(function query-fs:run-fs-with-cmdline-args)' '$linkedSystems'" + "$out/bin/query-fs-lisp-launcher.sh" + cp "$out/lib/common-lisp/query-fs/query-fs" "$out/bin/" ''; }; }; @@ -140,4 +139,28 @@ in "cl-unification-lib.asd" ]; }; + simple-date = x: { + deps = with quicklisp-to-nix-packages; [ + fiveam md5 usocket + ]; + parasites = [ + "simple-date/tests" + ]; + }; + cl-postgres = x: { + deps = pkgs.lib.filter (x: x.outPath != quicklisp-to-nix-packages.simple-date.outPath) x.deps; + parasites = (x.parasites or []) ++ [ + "simple-date" "simple-date/postgres-glue" + ]; + asdFilesToKeep = x.asdFilesToKeep ++ ["simple-date.asd"]; + }; + buildnode = x: { + deps = pkgs.lib.filter (x: x.name != quicklisp-to-nix-packages.buildnode-xhtml.name) x.deps; + parasites = pkgs.lib.filter (x: x!= "buildnode-test") x.parasites; + }; + postmodern = x: { + overrides = y : (x.overrides y) // { + meta.broken = true; # 2018-04-10 + }; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 49aa941094bde894a985dd5d33d654859a28b0b3..b133c3009ae6fa727b6a3a6247d3956eff7a9317 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -21,15 +21,19 @@ cl-base64 cl-cli cl-colors cl-cookie +cl-csv cl-dbi cl-emb cl-fuse cl-fuse-meta-fs +cl-html-parse +cl-html5-parser cl-json cl-l10n cl-libuv cl-mysql closer-mop +closure-html cl-ppcre cl-ppcre-template cl-ppcre-unicode @@ -53,8 +57,10 @@ cl-vectors cl-who clx clx-truetype +xembed command-line-arguments css-lite +css-selectors cxml dbd-mysql dbd-postgres diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 86817e14f55321714bb88c96ab9736a60b26a265..8ea7d4700bd6c304322827696c52283f72b738da 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,43 +6,7 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; - "symbol-munger" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."symbol-munger" or (x: {})) - (import ./quicklisp-to-nix-output/symbol-munger.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "iterate" = quicklisp-to-nix-packages."iterate"; - })); - - - "simple-date-postgres-glue" = quicklisp-to-nix-packages."simple-date"; - - - "cl-postgres-tests" = quicklisp-to-nix-packages."cl-postgres"; - - - "asdf-finalizers" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."asdf-finalizers" or (x: {})) - (import ./quicklisp-to-nix-output/asdf-finalizers.nix { - inherit fetchurl; - })); - - - "lisp-unit2" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lisp-unit2" or (x: {})) - (import ./quicklisp-to-nix-output/lisp-unit2.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; - })); + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres"; "moptilities" = buildLispPackage @@ -65,12 +29,7 @@ let quicklisp-to-nix-packages = rec { })); - "yacc" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."yacc" or (x: {})) - (import ./quicklisp-to-nix-output/yacc.nix { - inherit fetchurl; - })); + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; "unit-test" = buildLispPackage @@ -81,26 +40,6 @@ let quicklisp-to-nix-packages = rec { })); - "map-set" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."map-set" or (x: {})) - (import ./quicklisp-to-nix-output/map-set.nix { - inherit fetchurl; - })); - - - "babel-streams" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."babel-streams" or (x: {})) - (import ./quicklisp-to-nix-output/babel-streams.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - "rt" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rt" or (x: {})) @@ -117,35 +56,6 @@ let quicklisp-to-nix-packages = rec { })); - "plump-parser" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."plump-parser" or (x: {})) - (import ./quicklisp-to-nix-output/plump-parser.nix { - inherit fetchurl; - "array-utils" = quicklisp-to-nix-packages."array-utils"; - "plump-dom" = quicklisp-to-nix-packages."plump-dom"; - "plump-lexer" = quicklisp-to-nix-packages."plump-lexer"; - "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; - })); - - - "plump-lexer" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."plump-lexer" or (x: {})) - (import ./quicklisp-to-nix-output/plump-lexer.nix { - inherit fetchurl; - })); - - - "plump-dom" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."plump-dom" or (x: {})) - (import ./quicklisp-to-nix-output/plump-dom.nix { - inherit fetchurl; - "array-utils" = quicklisp-to-nix-packages."array-utils"; - })); - - "uuid" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."uuid" or (x: {})) @@ -165,6 +75,7 @@ let quicklisp-to-nix-packages = rec { "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -175,6 +86,8 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; "md5" = quicklisp-to-nix-packages."md5"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -183,10 +96,21 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."qmynd" or (x: {})) (import ./quicklisp-to-nix-output/qmynd.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers"; "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "list-of" = quicklisp-to-nix-packages."list-of"; + "nibbles" = quicklisp-to-nix-packages."nibbles"; + "salza2" = quicklisp-to-nix-packages."salza2"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -209,13 +133,15 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; - "cl-postgres-tests" = quicklisp-to-nix-packages."cl-postgres-tests"; + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; "s-sql" = quicklisp-to-nix-packages."s-sql"; "simple-date" = quicklisp-to-nix-packages."simple-date"; - "simple-date-postgres-glue" = quicklisp-to-nix-packages."simple-date-postgres-glue"; + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -321,32 +247,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-interpol" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-interpol" or (x: {})) - (import ./quicklisp-to-nix-output/cl-interpol.nix { - inherit fetchurl; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - })); - - - "cl-csv" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-csv" or (x: {})) - (import ./quicklisp-to-nix-output/cl-csv.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; - })); - - "cl-containers" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-containers" or (x: {})) @@ -358,6 +258,14 @@ let quicklisp-to-nix-packages = rec { })); + "asdf-finalizers" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."asdf-finalizers" or (x: {})) + (import ./quicklisp-to-nix-output/asdf-finalizers.nix { + inherit fetchurl; + })); + + "abnf" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."abnf" or (x: {})) @@ -369,6 +277,18 @@ let quicklisp-to-nix-packages = rec { })); + "stefil" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."stefil" or (x: {})) + (import ./quicklisp-to-nix-output/stefil.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; + "swank" = quicklisp-to-nix-packages."swank"; + })); + + "lack-component" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lack-component" or (x: {})) @@ -424,14 +344,6 @@ let quicklisp-to-nix-packages = rec { })); - "eos" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."eos" or (x: {})) - (import ./quicklisp-to-nix-output/eos.nix { - inherit fetchurl; - })); - - "xpath" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."xpath" or (x: {})) @@ -454,14 +366,6 @@ let quicklisp-to-nix-packages = rec { })); - "swank" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."swank" or (x: {})) - (import ./quicklisp-to-nix-output/swank.nix { - inherit fetchurl; - })); - - "rfc2388" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rfc2388" or (x: {})) @@ -547,6 +451,111 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + + "yacc" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."yacc" or (x: {})) + (import ./quicklisp-to-nix-output/yacc.nix { + inherit fetchurl; + })); + + + "symbol-munger" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."symbol-munger" or (x: {})) + (import ./quicklisp-to-nix-output/symbol-munger.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + + "swank" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."swank" or (x: {})) + (import ./quicklisp-to-nix-output/swank.nix { + inherit fetchurl; + })); + + + "collectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."collectors" or (x: {})) + (import ./quicklisp-to-nix-output/collectors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + })); + + + "buildnode-xhtml" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."buildnode-xhtml" or (x: {})) + (import ./quicklisp-to-nix-output/buildnode-xhtml.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode" = quicklisp-to-nix-packages."buildnode"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "buildnode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."buildnode" or (x: {})) + (import ./quicklisp-to-nix-output/buildnode.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode-xhtml" = quicklisp-to-nix-packages."buildnode-xhtml"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -577,6 +586,15 @@ let quicklisp-to-nix-packages = rec { })); + "fiasco" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fiasco" or (x: {})) + (import ./quicklisp-to-nix-output/fiasco.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + "cl-paths" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-paths" or (x: {})) @@ -706,21 +724,21 @@ let quicklisp-to-nix-packages = rec { })); - "pcall-queue" = buildLispPackage + "string-case" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."pcall-queue" or (x: {})) - (import ./quicklisp-to-nix-output/pcall-queue.nix { + (qlOverrides."string-case" or (x: {})) + (import ./quicklisp-to-nix-output/string-case.nix { inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; })); - "named-readtables" = buildLispPackage + "pcall-queue" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."named-readtables" or (x: {})) - (import ./quicklisp-to-nix-output/named-readtables.nix { + (qlOverrides."pcall-queue" or (x: {})) + (import ./quicklisp-to-nix-output/pcall-queue.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; })); @@ -741,24 +759,29 @@ let quicklisp-to-nix-packages = rec { })); - "cl-annot" = buildLispPackage + "lisp-unit2" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl-annot" or (x: {})) - (import ./quicklisp-to-nix-output/cl-annot.nix { + (qlOverrides."lisp-unit2" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-unit2.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; })); - "cl-fad" = buildLispPackage + "cl-interpol" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl-fad" or (x: {})) - (import ./quicklisp-to-nix-output/cl-fad.nix { + (qlOverrides."cl-interpol" or (x: {})) + (import ./quicklisp-to-nix-output/cl-interpol.nix { inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "unit-test" = quicklisp-to-nix-packages."unit-test"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; })); @@ -824,14 +847,6 @@ let quicklisp-to-nix-packages = rec { })); - "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; - })); - - "cffi-toolchain" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cffi-toolchain" or (x: {})) @@ -852,6 +867,22 @@ let quicklisp-to-nix-packages = rec { })); + "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; + })); + + + "named-readtables" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."named-readtables" or (x: {})) + (import ./quicklisp-to-nix-output/named-readtables.nix { + inherit fetchurl; + })); + + "myway" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."myway" or (x: {})) @@ -868,6 +899,14 @@ let quicklisp-to-nix-packages = rec { })); + "map-set" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."map-set" or (x: {})) + (import ./quicklisp-to-nix-output/map-set.nix { + inherit fetchurl; + })); + + "do-urlencode" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."do-urlencode" or (x: {})) @@ -911,6 +950,39 @@ let quicklisp-to-nix-packages = rec { })); + "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"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "unit-test" = quicklisp-to-nix-packages."unit-test"; + })); + + + "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"; + })); + + + "babel-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."babel-streams" or (x: {})) + (import ./quicklisp-to-nix-output/babel-streams.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "anaphora" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."anaphora" or (x: {})) @@ -1213,9 +1285,7 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/plump.nix { inherit fetchurl; "array-utils" = quicklisp-to-nix-packages."array-utils"; - "plump-dom" = quicklisp-to-nix-packages."plump-dom"; - "plump-lexer" = quicklisp-to-nix-packages."plump-lexer"; - "plump-parser" = quicklisp-to-nix-packages."plump-parser"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1228,13 +1298,14 @@ let quicklisp-to-nix-packages = rec { "abnf" = quicklisp-to-nix-packages."abnf"; "alexandria" = quicklisp-to-nix-packages."alexandria"; "anaphora" = quicklisp-to-nix-packages."anaphora"; + "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers"; "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections"; "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-containers" = quicklisp-to-nix-packages."cl-containers"; "cl-csv" = quicklisp-to-nix-packages."cl-csv"; @@ -1273,11 +1344,13 @@ let quicklisp-to-nix-packages = rec { "qmynd" = quicklisp-to-nix-packages."qmynd"; "quri" = quicklisp-to-nix-packages."quri"; "s-sql" = quicklisp-to-nix-packages."s-sql"; + "salza2" = quicklisp-to-nix-packages."salza2"; "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"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; "uiop" = quicklisp-to-nix-packages."uiop"; @@ -1358,8 +1431,10 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "array-utils" = quicklisp-to-nix-packages."array-utils"; "clss" = quicklisp-to-nix-packages."clss"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; "form-fiddle" = quicklisp-to-nix-packages."form-fiddle"; "plump" = quicklisp-to-nix-packages."plump"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1371,6 +1446,7 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "stefil" = quicklisp-to-nix-packages."stefil"; })); @@ -1460,7 +1536,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."ieee-floats" or (x: {})) (import ./quicklisp-to-nix-output/ieee-floats.nix { inherit fetchurl; - "eos" = quicklisp-to-nix-packages."eos"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; })); @@ -1483,7 +1559,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_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"; @@ -1532,6 +1608,7 @@ let quicklisp-to-nix-packages = rec { "quri" = quicklisp-to-nix-packages."quri"; "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -1553,6 +1630,7 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/form-fiddle.nix { inherit fetchurl; "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1582,7 +1660,11 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/fast-io.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -1595,8 +1677,11 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -1638,13 +1723,21 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."drakma" or (x: {})) (import ./quicklisp-to-nix-output/drakma.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -1667,9 +1760,10 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; @@ -1736,6 +1830,7 @@ let quicklisp-to-nix-packages = rec { "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -1775,6 +1870,40 @@ let quicklisp-to-nix-packages = rec { })); + "css-selectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."css-selectors" or (x: {})) + (import ./quicklisp-to-nix-output/css-selectors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode" = quicklisp-to-nix-packages."buildnode"; + "buildnode-xhtml" = quicklisp-to-nix-packages."buildnode-xhtml"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + "css-lite" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."css-lite" or (x: {})) @@ -1791,6 +1920,15 @@ let quicklisp-to-nix-packages = rec { })); + "xembed" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."xembed" or (x: {})) + (import ./quicklisp-to-nix-output/xembed.nix { + inherit fetchurl; + "clx" = quicklisp-to-nix-packages."clx"; + })); + + "clx-truetype" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clx-truetype" or (x: {})) @@ -1814,6 +1952,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."clx" or (x: {})) (import ./quicklisp-to-nix-output/clx.nix { inherit fetchurl; + "fiasco" = quicklisp-to-nix-packages."fiasco"; })); @@ -1914,10 +2053,10 @@ let quicklisp-to-nix-packages = rec { })); - "cl+ssl" = buildLispPackage + "cl_plus_ssl" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl+ssl" or (x: {})) - (import ./quicklisp-to-nix-output/cl+ssl.nix { + (qlOverrides."cl_plus_ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; @@ -1937,7 +2076,9 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/clss.nix { inherit fetchurl; "array-utils" = quicklisp-to-nix-packages."array-utils"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; "plump" = quicklisp-to-nix-packages."plump"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1992,7 +2133,7 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; @@ -2056,6 +2197,20 @@ let quicklisp-to-nix-packages = rec { })); + "closure-html" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-html" or (x: {})) + (import ./quicklisp-to-nix-output/closure-html.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "closer-mop" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."closer-mop" or (x: {})) @@ -2128,6 +2283,26 @@ let quicklisp-to-nix-packages = rec { })); + "cl-html5-parser" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-html5-parser" or (x: {})) + (import ./quicklisp-to-nix-output/cl-html5-parser.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "string-case" = quicklisp-to-nix-packages."string-case"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "cl-html-parse" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-html-parse" or (x: {})) + (import ./quicklisp-to-nix-output/cl-html-parse.nix { + inherit fetchurl; + })); + + "cl-fuse-meta-fs" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-fuse-meta-fs" or (x: {})) @@ -2194,6 +2369,21 @@ let quicklisp-to-nix-packages = rec { })); + "cl-csv" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-csv" or (x: {})) + (import ./quicklisp-to-nix-output/cl-csv.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + })); + + "cl-cookie" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-cookie" or (x: {})) @@ -2378,8 +2568,12 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/circular-streams.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "fast-io" = quicklisp-to-nix-packages."fast-io"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -2424,16 +2618,41 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."caveman" or (x: {})) (import ./quicklisp-to-nix-output/caveman.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; "anaphora" = quicklisp-to-nix-packages."anaphora"; + "babel" = quicklisp-to-nix-packages."babel"; + "babel-streams" = quicklisp-to-nix-packages."babel-streams"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; "cl-emb" = quicklisp-to-nix-packages."cl-emb"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "cl-project" = quicklisp-to-nix-packages."cl-project"; "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat"; + "dexador" = quicklisp-to-nix-packages."dexador"; "do-urlencode" = quicklisp-to-nix-packages."do-urlencode"; + "http-body" = quicklisp-to-nix-packages."http-body"; + "lack" = quicklisp-to-nix-packages."lack"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; "local-time" = quicklisp-to-nix-packages."local-time"; + "map-set" = quicklisp-to-nix-packages."map-set"; + "marshal" = quicklisp-to-nix-packages."marshal"; "myway" = quicklisp-to-nix-packages."myway"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "prove" = quicklisp-to-nix-packages."prove"; + "quri" = quicklisp-to-nix-packages."quri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp index 2623990856e39d08490fe2a1b7ed923b4fb84266..3824a04826f17900b22eb950d3c2b190f5ec03c3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -55,6 +55,7 @@ (#\\ "_backslash_") (#\_ "__") (#\. "_dot_") + (#\+ "_plus_") (t x))))) (defvar *system-info-bin* @@ -98,7 +99,10 @@ will use it instead of re-computing the system data.") "Return the path to the file that (if it exists) contains pre-computed system data." (when *system-data-memoization-path* - (merge-pathnames (make-pathname :name system :type "txt") *system-data-memoization-path*))) + (merge-pathnames + (make-pathname + :name (escape-filename (string system)) + :type "txt") *system-data-memoization-path*))) (defun memoized-system-data (system) "Attempts to locate memoized system data in the path specified by diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index b29ba53159e6c875349b1c41bd2242bd4f98d19d..9eba1e15b7996760c653a26f1f64880690529dee 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -5,11 +5,11 @@ self = rec { env = buildEnv { name = name; paths = buildInputs; }; buildInputs = [ gcc stdenv - openssl fuse libuv mariadb libfixposix libev sqlite + openssl fuse libuv mysql.connector-c libfixposix libev sqlite freetds lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mariadb}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; }; in stdenv.mkDerivation self diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 7152d0b9e3602cd3464b72eceb6fcd5cb87b75d8..091ae06ab910338f6d4495fe9a18ece09423b2be 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -1,4 +1,4 @@ -lua: +{ lua, writeText }: { buildInputs ? [], disabled ? false, ... } @ attrs: @@ -19,5 +19,36 @@ else { name = "lua${lua.luaversion}-" + attrs.name; buildInputs = buildInputs ++ [ lua ]; + + setupHook = writeText "setup-hook.sh" '' + # check for lua/clua modules and don't add duplicates + + addLuaLibPath() { + local package_path="$1/share/lua/${lua.luaversion}" + if [[ ! -d $package_path ]]; then return; fi + if [[ $LUA_PATH = *"$package_path"* ]]; then return; fi + + if [[ -z $LUA_PATH ]]; then + export LUA_PATH="$package_path/?.lua" + else + export LUA_PATH="$LUA_PATH;$package_path/?.lua" + fi + } + + addLuaLibCPath() { + local package_cpath="$1/lib/lua/${lua.luaversion}" + if [[ ! -d $package_cpath ]]; then return; fi + if [[ $LUA_CPATH = *"$package_cpath"* ]]; then return; fi + + if [[ -z $LUA_CPATH ]]; then + export LUA_CPATH="$package_cpath/?.so" + else + export LUA_CPATH="$LUA_CPATH;$package_cpath/?.so" + fi + } + + addEnvHooks "$hostOffset" addLuaLibPath + addEnvHooks "$hostOffset" addLuaLibCPath + ''; } ) diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 7775716a7122c567a1b617640b0b2d01b7af18ba..84020a5ac2d5555c07adb446dcd0c9d7f129493e 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, mesa, xorg, +{ stdenv, fetchurl, makeWrapper, perl, libGLU_combined, xorg, version? "2.8", # What version samples? false # Should samples be installed }: @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { patches = stdenv.lib.attrByPath [version "patches"] [] src_info; patchFlags = "-p0"; - buildInputs = [ makeWrapper perl mesa xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; + buildInputs = [ makeWrapper perl libGLU_combined xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; propagatedBuildInputs = [ stdenv.cc ]; NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; doCheck = false; @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support"; - homepage = http://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/; + homepage = https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/; license = licenses.amd; maintainers = [ maintainers.offline ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix index 2fd8c2d39c4e5ae828a47d4f3bc2e049f6a7a3dd..0826b83ed1992bcb5bf509b1352816b14e41978e 100644 --- a/pkgs/development/misc/avr/binutils/default.nix +++ b/pkgs/development/misc/avr/binutils/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - version = "2.26"; + version = "2.30"; in stdenv.mkDerivation { name = "avr-binutils-${version}"; src = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "1ngc2h3knhiw8s22l8y6afycfaxr5grviqy7mwvm4bsl14cf9b62"; + sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; }; configureFlags = "--target=avr --enable-languages=c,c++"; diff --git a/pkgs/development/misc/avr/gcc/avrbinutils-path.patch b/pkgs/development/misc/avr/gcc/avrbinutils-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..f0ec21b7589ff780bf8b1633c163ac700d55bb8b --- /dev/null +++ b/pkgs/development/misc/avr/gcc/avrbinutils-path.patch @@ -0,0 +1,15 @@ +diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c +index 838ebc2..3ac4ee7 100644 +--- a/gcc/gcc-ar.c ++++ b/gcc/gcc-ar.c +@@ -118,8 +118,8 @@ setup_prefixes (const char *exec_path) + dir_separator, NULL); + prefix_from_string (self_libexec_prefix, &target_path); + +- /* Add path as a last resort. */ +- prefix_from_env ("PATH", &path); ++ /* Add path to avrbinutils. */ ++ prefix_from_string ("@avrbinutils@/bin", &path); + } + + int diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix index f456214f9442ad384ca57fcc0beeceac28d6e2fd..824979291833ff51aaed4f26bafe274686ef3e6c 100644 --- a/pkgs/development/misc/avr/gcc/default.nix +++ b/pkgs/development/misc/avr/gcc/default.nix @@ -1,16 +1,26 @@ { stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }: let - version = "5.4.0"; + version = "7.3.0"; in stdenv.mkDerivation { name = "avr-gcc-${version}"; src = fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0"; + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; }; + patches = [ + ./avrbinutils-path.patch + ]; + + # avrbinutils-path.patch introduces a reference to @avrbinutils@, substitute + # it now. + postPatch = '' + substituteInPlace gcc/gcc-ar.c --subst-var-by avrbinutils ${avrbinutils} + ''; + buildInputs = [ gmp mpfr libmpc zlib avrbinutils ]; nativeBuildInputs = [ texinfo ]; @@ -44,7 +54,7 @@ stdenv.mkDerivation { description = "GNU Compiler Collection, version ${version} for AVR microcontrollers"; homepage = http://gcc.gnu.org; license = licenses.gpl3Plus; - platforms = platforms.unix; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ mguentner ]; }; } diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index e074a4c46468a92bdda29eab05b53ee4dc26a2d0..692f61cec7470e73d99b2c090ddccd1b0e99e9be 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip; - sha256 = "1sik243xqx7kbdddcq3va8h8q2wijf9ffhgp752hx725x3pjh9ss"; + sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index eef10f3323fe076b5563d333ae4ee1aec2ceb2f2..efa76ea00a0e2691d6c2c6f5426156528e8d5f5e 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { homepage = https://github.com/cgag/loc; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix new file mode 100644 index 0000000000000000000000000000000000000000..c89d2f11e95416e8c675419e655707f74b55b3ba --- /dev/null +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, libusb1 }: + +let + version = "2018-03-27"; + name = "rpiboot-unstable-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = "usbboot"; + rev = "fb86716935f2e820333b037a2ff93a338ad9b695"; + sha256 = "163g7iw7kf6ra71adx6lf1xzf3kv20bppva15ljwn54jlah5mv98"; + }; + + nativeBuildInputs = [ libusb1 ]; + + patchPhase = '' + sed -i "s@/usr/@$out/@g" main.c + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/rpiboot + cp rpiboot $out/bin + cp -r msd $out/share/rpiboot + ''; + + meta = { + homepage = https://github.com/raspberrypi/usbboot; + description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB"; + maintainers = [ stdenv.lib.maintainers.cartr ]; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8d4d0d7f4a2b2e87e9d21917b38a30894ae1931b --- /dev/null +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchFromGitHub +, gcc-arm-embedded, python2 +, skipTargets ? [ + # These targets do not build for various unexplored reasons + # TODO ... fix them + "AFROMINI" + "ALIENWHOOP" + "BEEBRAIN" + "CJMCU" + "FRSKYF3" +]}: + +let + + version = "3.2.3"; + +in stdenv.mkDerivation rec { + + name = "betaflight-${version}"; + + src = fetchFromGitHub { + owner = "betaflight"; + repo = "betaflight"; + rev = "v${version}"; + sha256 = "0vbjyxfjxgpaiiwvj5bscrlfikzp3wnxpmc4sxcz5yw5mwb9g428"; + }; + + buildInputs = [ + gcc-arm-embedded + python2 + ]; + + postPatch = '' + sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 9 src.rev}/" Makefile # Let's not require git in shell + sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + ''; + + enableParallelBuilding = true; + + preBuild = '' + buildFlagsArray=( + "SKIP_TARGETS=${toString skipTargets}" + "GCC_REQUIRED_VERSION=$(arm-none-eabi-gcc -dumpversion)" + all + ) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp obj/*.hex $out + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft"; + homepage = https://github.com/betaflight/betaflight; + license = licenses.gpl3; + maintainers = with maintainers; [ elitak ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index 091d1adfefbc4fc52a2b62232f5d570037f4dbca..18ad3048d832bb743dcc450c856dfebeeedb12ce 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Mount Android phones on Linux with adb, no root required"; inherit (src.meta) homepage; license = licenses.bsd3; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix new file mode 100644 index 0000000000000000000000000000000000000000..19fc0dc812d855e1ba7beb1280fb1bbafd853ff1 --- /dev/null +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -0,0 +1,82 @@ +{ lib, hostPlatform, targetPlatform +, makeWrapper +, runCommand, wrapBintoolsWith, wrapCCWith +, buildAndroidndk, androidndk, targetAndroidndkPkgs +}: + +let + # Mapping from a platform to information needed to unpack NDK stuff for that + # platform. + # + # N.B. The Android NDK uses slightly different LLVM-style platform triples + # than we do. We don't just use theirs because ours are less ambiguous and + # some builds need that clarity. + ndkInfoFun = { config, ... }: { + "x86_64-unknown-linux-gnu" = { + double = "linux-x86_64"; + }; + "arm-unknown-linux-androideabi" = { + arch = "arm"; + triple = "arm-linux-androideabi"; + gccVer = "4.8"; + }; + "aarch64-unknown-linux-android" = { + arch = "arm64"; + triple = "aarch64-linux-android"; + gccVer = "4.9"; + }; + }.${config} or + (throw "Android NDK doesn't support ${config}, as far as we know"); + + hostInfo = ndkInfoFun hostPlatform; + targetInfo = ndkInfoFun targetPlatform; + +in + +rec { + # Misc tools + binaries = let + ndkBinDir = + "${androidndk}/libexec/${androidndk.name}/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin"; + in runCommand "ndk-gcc-binutils" { + isGNU = true; # for cc-wrapper + nativeBuildInputs = [ makeWrapper ]; + propgatedBuildInputs = [ androidndk ]; + } '' + mkdir -p $out/bin + for prog in ${ndkBinDir}/${targetInfo.triple}-*; do + prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//') + ln -s $prog $out/bin/${targetPlatform.config}-$prog_suffix + done + ''; + + binutils = wrapBintoolsWith { + bintools = binaries; + libc = targetAndroidndkPkgs.libraries; + }; + + gcc = wrapCCWith { + cc = binaries; + bintools = binutils; + libc = targetAndroidndkPkgs.libraries; + extraBuildCommands = + # GCC 4.9 is the first relase with "-fstack-protector" + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") '' + sed -E \ + -i $out/nix-support/add-hardening.sh \ + -e 's|(-fstack-protector)-strong|\1|g' + ''; + }; + + # Bionic lib C and other libraries. + # + # We use androidndk from the previous stage, else we waste time or get cycles + # cross-compiling packages to wrap incorrectly wrap binaries we don't include + # anyways. + libraries = { + name = "bionic-prebuilt"; + type = "derivation"; + outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-21/arch-${hostInfo.arch}/usr/"; + drvPath = throw "fake derivation, build ${buildAndroidndk} to use"; + }; +} diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 8ef58471d6a04572f5e83883e02b3b8002978cfa..81ec5732b9a2a709c4e4d18b0fafc5133a2e2a0d 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { phases = "buildPhase"; - buildInputs = [ p7zip makeWrapper ]; + nativeBuildInputs = [ p7zip makeWrapper ]; buildCommand = let bin_path = "$out/bin"; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index ccf22d6b95364f3ef89eaa9584d138f6d0234c5e..271a18e4ee06ec20640f3da7a53422b717d6c9c6 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { phases = "buildPhase"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = let bin_path = "$out/bin"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index b766d9d9c31a5b899a833585d2383b0328dc651e..699af16cf0411176375b4029c02e0c6940229cb7 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,6 +1,6 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper , platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, libGLU_combined, alsaLib , freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus , zlib, glxinfo, xkeyboardconfig , includeSources @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { do wrapProgram `pwd`/$i \ --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \ - --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio dbus.lib ]} \ + --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb done ''} diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index c09fd6142703ab794d5c7c048a8b9e6d687606de..457a9b6720aff70539cd369047c6b5d95e44d25b 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "26.0.1"; + version = "26.0.2"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha256 = "1sp0ir1d88ffw0gz78zlbvnxalz02fsaxwdcvjfynanylwjpyqf8"; + sha256 = "1kii880bwhjkc343zwx1ysxyisxhczrwhphnxbwsgi45mjgq8lm7"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha256 = "1ns6c8361l18s3a5x0jc2m3qr06glsb6ak7csrrw6dkzlv8cj5dk"; + sha256 = "1x0ycprl6hgsm23kck5ind7x00hzydc5k3h3ch4a13407xbpvzvx"; } else throw "System ${stdenv.system} not supported!"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd $out/build-tools unzip $src mv android-* ${version} - + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' cd ${version} @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { fi done ''} - + patchShebangs . ''; - + buildInputs = [ unzip file ]; } diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 470fb31b03b031d920fc35cd18305ecac5096ffb..b77cc68fa0e835c1b1b1cfea599100cb9e3d35dd 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,10 +1,12 @@ -{pkgs, pkgs_i686, includeSources ? true}: +{ buildPackages, pkgs, pkgs_i686, targetPackages +, includeSources ? true +}: rec { platformTools = import ./platform-tools.nix { - inherit (pkgs) stdenv fetchurl unzip zlib; + inherit buildPackages pkgs; }; - + buildTools = import ./build-tools.nix { inherit (pkgs) stdenv fetchurl unzip zlib file; stdenv_32bit = pkgs_i686.stdenv; @@ -12,11 +14,11 @@ rec { ncurses_32bit = pkgs_i686.ncurses5; ncurses = pkgs.ncurses5; }; - + support = import ./support.nix { inherit (pkgs) stdenv fetchurl unzip; }; - + supportRepository = import ./support-repository.nix { inherit (pkgs) stdenv fetchurl unzip; }; @@ -45,20 +47,20 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus; + inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk libGLU_combined file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; - + inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources; - + stdenv_32bit = pkgs_i686.stdenv; }; - + androidsdk_2_1 = androidsdk { platformVersions = [ "7" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_2_2 = androidsdk { platformVersions = [ "8" ]; abiVersions = [ "armeabi-v7a" ]; @@ -70,49 +72,49 @@ rec { abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_3_0 = androidsdk { platformVersions = [ "11" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_3_1 = androidsdk { platformVersions = [ "12" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_3_2 = androidsdk { platformVersions = [ "13" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_0 = androidsdk { platformVersions = [ "14" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_0_3 = androidsdk { platformVersions = [ "15" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_1 = androidsdk { platformVersions = [ "16" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_2 = androidsdk { platformVersions = [ "17" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_3 = androidsdk { platformVersions = [ "18" ]; abiVersions = [ "armeabi-v7a" "x86" ]; @@ -152,7 +154,7 @@ rec { useExtraSupportLibs = true; useGooglePlayServices = true; }; - + androidsdk_6_0 = androidsdk { platformVersions = [ "23" ]; abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; @@ -214,24 +216,45 @@ rec { }; androidndk = import ./androidndk.nix { - inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; - inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit (buildPackages) + p7zip makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses lib + coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; androidndk_r8e = import ./androidndk_r8e.nix { - inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper; - inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses lib + coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; - + buildApp = import ./build-app.nix { inherit (pkgs) stdenv jdk ant gnumake gawk file which; inherit androidsdk androidndk; }; - + emulateApp = import ./emulate-app.nix { inherit (pkgs) stdenv; inherit androidsdk; }; + + androidndkPkgs = import ./androidndk-pkgs.nix { + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + lib hostPlatform targetPlatform + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk; + inherit androidndk; + targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs; + }; } diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index bc99837d27afeb9129d550c09a903617fdd66880..f5e5799428469ebdcc06e974cbefe9374306bf9d 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,16 +1,21 @@ -{stdenv, zlib, fetchurl, unzip}: +{ buildPackages, pkgs }: + +let + inherit (buildPackages) fetchurl unzip; + inherit (pkgs) stdenv zlib; +in stdenv.mkDerivation rec { - version = "26.0.0"; + version = "26.0.2"; name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "02z5fxxdwd6359wmqdag9vvszdq49sm78cvfskqap18xa83q484h"; + sha256 = "0695npvxljbbh8xwfm65k34fcpyfkzvfkssgnp46wkmnq8w5mcb3"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip"; - sha256 = "13mcyi9l0mmmjr056z1i3rhpb4641iv0a5ky7ij0v8hwsb5r5lwq"; + sha256 = "0gy7apw9pmnnm41z6ywglw5va4ghmny4j57778may4q7ar751l56"; } else throw "System ${stdenv.system} not supported!"; @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { cd $out unzip $src cd platform-tools - + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' for i in adb dmtracedump fastboot hprof-conv sqlite3 @@ -27,7 +32,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:`pwd`/lib64 $i done - + for i in etc1tool do patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i @@ -41,6 +46,6 @@ stdenv.mkDerivation rec { ln -sf $out/platform-tools/$i $out/bin/$i done ''; - - buildInputs = [ unzip ]; + + nativeBuildInputs = [ unzip ]; } diff --git a/pkgs/development/mobile/cocoapods/Gemfile b/pkgs/development/mobile/cocoapods/Gemfile new file mode 100644 index 0000000000000000000000000000000000000000..8308684860e63721f5e112805e9574d1f32ed109 --- /dev/null +++ b/pkgs/development/mobile/cocoapods/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cocoapods' diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock new file mode 100644 index 0000000000000000000000000000000000000000..0ab15f1efd2f5c42191da369221ad02d7463a017 --- /dev/null +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -0,0 +1,74 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.6) + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + claide (1.0.2) + cocoapods (1.3.1) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.3.1) + cocoapods-deintegrate (>= 1.0.1, < 2.0) + cocoapods-downloader (>= 1.1.3, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.2.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (~> 2.0.1) + gh_inspector (~> 1.0) + molinillo (~> 0.5.7) + nap (~> 1.0) + ruby-macho (~> 1.1) + xcodeproj (>= 1.5.1, < 2.0) + cocoapods-core (1.3.1) + activesupport (>= 4.0.2, < 6) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.1) + cocoapods-downloader (1.1.3) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.0.0) + cocoapods-trunk (1.3.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.1.0) + colored2 (3.1.2) + concurrent-ruby (1.0.5) + escape (0.0.4) + fourflusher (2.0.1) + fuzzy_match (2.0.4) + gh_inspector (1.0.3) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + minitest (5.10.3) + molinillo (0.5.7) + nanaimo (0.2.3) + nap (1.1.0) + netrc (0.11.0) + ruby-macho (1.1.0) + thread_safe (0.3.6) + tzinfo (1.2.4) + thread_safe (~> 0.1) + xcodeproj (1.5.3) + CFPropertyList (~> 2.3.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.3) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..56624370b14a6f4d4aff8c08a7ba8a4e82d0590d --- /dev/null +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + inherit ruby; + pname = "cocoapods"; + gemdir = ./.; + + meta = with lib; { + description = "CocoaPods manages dependencies for your Xcode projects."; + homepage = https://github.com/CocoaPods/CocoaPods; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ + peterromfeldhk + ]; + }; +} diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix new file mode 100644 index 0000000000000000000000000000000000000000..ff7b14e6dd8a39576213f4922c247a4ae9b962e3 --- /dev/null +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -0,0 +1,234 @@ +{ + activesupport = { + dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + type = "gem"; + }; + version = "4.2.10"; + }; + CFPropertyList = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hadm41xr1fq3qp74jd9l5q8l0j9083rgklgzsilllwaav7qrrid"; + type = "gem"; + }; + version = "2.3.6"; + }; + claide = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + type = "gem"; + }; + version = "1.0.2"; + }; + cocoapods = { + dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050b7795jc6802wcpcgi702qkgy8vjidgq6c6mbx2alrq7l0n8q7"; + type = "gem"; + }; + version = "1.3.1"; + }; + cocoapods-core = { + dependencies = ["activesupport" "fuzzy_match" "nap"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pr42lpqs6q51gnnfxmgmbx7sw0dwyawylssj588izj8av18rhpy"; + type = "gem"; + }; + version = "1.3.1"; + }; + cocoapods-deintegrate = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x4hxlip6zkrs1vcmw7sh45ayn5pxvsg782iifnmgjwn2pyskj7l"; + type = "gem"; + }; + version = "1.0.1"; + }; + cocoapods-downloader = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1664qg1wml70slcfklpnyq5ixp145f6iyn3c6pcqkqc64i1bsg87"; + type = "gem"; + }; + version = "1.1.3"; + }; + cocoapods-plugins = { + dependencies = ["nap"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16na82sfyc8801qs1n22nwq486s4j7yj6rj7fcp8cbxmj371fpbj"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-search = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-stats = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfcwq2vq6cadj1811jdjys3d28pmk2r2a83px6w94rz6i19axid"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-trunk = { + dependencies = ["nap" "netrc"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0shxr64j7f50yglp5l90vr1ba5p9pkk0a3b8apkbci2lmq5kq60b"; + type = "gem"; + }; + version = "1.3.0"; + }; + cocoapods-try = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + type = "gem"; + }; + version = "1.1.0"; + }; + colored2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + type = "gem"; + }; + version = "1.0.5"; + }; + escape = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sa1xkfc9jvkwyw1jbz3jhkq0ms1zrvswi6mmfiwcisg5fp497z4"; + type = "gem"; + }; + version = "0.0.4"; + }; + fourflusher = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5"; + type = "gem"; + }; + version = "2.0.1"; + }; + fuzzy_match = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19gw1ifsgfrv7xdi6n61658vffgm1867f4xdqfswb2b5h6alzpmm"; + type = "gem"; + }; + version = "2.0.4"; + }; + gh_inspector = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x"; + type = "gem"; + }; + version = "1.0.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s"; + type = "gem"; + }; + version = "0.9.1"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05521clw19lrksqgvg2kmm025pvdhdaniix52vmbychrn2jm7kz2"; + type = "gem"; + }; + version = "5.10.3"; + }; + molinillo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758"; + type = "gem"; + }; + version = "0.5.7"; + }; + nanaimo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd"; + type = "gem"; + }; + version = "0.2.3"; + }; + nap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll"; + type = "gem"; + }; + version = "1.1.0"; + }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + ruby-macho = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i9vkz3ki3yvps4z1hca2q2axniq95x4yypnc22p9pcfjdfrbrq6"; + type = "gem"; + }; + version = "1.1.0"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp"; + type = "gem"; + }; + version = "1.2.4"; + }; + xcodeproj = { + dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7"; + type = "gem"; + }; + version = "1.5.3"; + }; +} \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update new file mode 100755 index 0000000000000000000000000000000000000000..58a7bd4a4539540f9d76cea9438946a43f13954a --- /dev/null +++ b/pkgs/development/mobile/cocoapods/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -rf ~/.gem +fi diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 0c1bb5d4d42de724fb5357a4bbf1e73edebcbf89..be4fc0f7f54530f91ce4617b9cd97c26ff2c57fd 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfreeRedistributableFirmware; platforms = stdenv.lib.platforms.linux; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }; } diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 745111171bb629cf337a1aa6e65a4cb3541da504..37834eff9473c0e3114b4adcb7f1f243a58e3465 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -1,13 +1,13 @@ -{ stdenv, requireFile, makeWrapper, which, zlib, mesa_noglu, glib, xorg, libxkbcommon +{ stdenv, requireFile, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon , xdg_utils # For glewinfo , libXmu, libXi, libXext }: let packages = [ - stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext + stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext libGL ]; - libPath = "${stdenv.lib.makeLibraryPath packages}:${mesa_noglu.driverLink}/lib"; + libPath = "${stdenv.lib.makeLibraryPath packages}"; in stdenv.mkDerivation rec { name = "genymotion-${version}"; diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9cee1c9e5dee86456fc675c2a0078a3ac178e64a --- /dev/null +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip, bzip2, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "imgpatchtools-${version}"; + version = "0.3"; + + src = fetchzip { + url = "https://github.com/erfanoabdi/imgpatchtools/archive/${version}.tar.gz"; + sha256 = "1cwp1hfhip252dz0mbkhrsrkws6m15k359n4amw2vfnglnls8czd"; + }; + + buildInputs = [ bzip2 openssl zlib ]; + + installPhase = "install -Dt $out/bin bin/*"; + + meta = with stdenv.lib; { + description = "Tools to manipulate Android OTA archives"; + longDescription = '' + This package is useful for Android development. In particular, it can be + used to extract ext4 /system image from Android distribution ZIP archives + such as those distributed by LineageOS and Replicant, via BlockImageUpdate + utility. It also includes other, related, but arguably more advanced tools + for OTA manipulation. + ''; + homepage = https://github.com/erfanoabdi/imgpatchtools; + license = licenses.gpl3; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0c9c3e3f42caf0b10c6d21e9d60c50c12249bc21..83bd941e5ffa5c026bee3b270eaa60aa8e3195eb 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,8 +1,8 @@ -{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, xcodeBaseDir}: -{ name, src, target, androidPlatformVersions ? [ "23" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null +{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, file, xcodeBaseDir}: +{ name, src, preBuild ? "", target, androidPlatformVersions ? [ "25" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "10.2" -, enableWirelessDistribution ? false, installURL ? null +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.2" +, enableWirelessDistribution ? false, iosBuildStore ? false, installURL ? null }: assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; @@ -15,41 +15,22 @@ let abiVersions = androidAbiVersions; useGoogleAPIs = true; }; - + deleteKeychain = '' security default-keychain -s login.keychain security delete-keychain $keychainName + rm -f $HOME/lock-keychain ''; - - # On macOS, the java executable shows an -unoffical postfix in the version - # number. This confuses the build script's version detector. - # We fix this by creating a wrapper that strips it out of the output. - - javaVersionFixWrapper = stdenv.mkDerivation { - name = "javaVersionFixWrapper"; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/javac <&1 | sed "s|-unofficial||" | sed "s|-u60|_60|" >&2 - else - exec ${jdk}/bin/javac "\$@" - fi - EOF - chmod +x $out/bin/javac - ''; - }; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; inherit src; - - buildInputs = [ nodejs titanium alloy jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; + + buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildPhase = '' + ${preBuild} + export HOME=$TMPDIR ${stdenv.lib.optionalString (tiVersion != null) '' @@ -71,19 +52,19 @@ stdenv.mkDerivation { ${if target == "android" then '' - ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' - # Hack to make version detection work with OpenJDK on macOS - export PATH=${javaVersionFixWrapper}/bin:$PATH - export JAVA_HOME=${javaVersionFixWrapper} - javac -version - ''} - - titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec - + titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec + export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH - + export GRADLE_USER_HOME=$TMPDIR/gradle + ${if release then - ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out'' + '' + ${stdenv.lib.optionalString stdenv.isDarwin '' + # Signing the app does not work with OpenJDK on macOS, use host SDK instead + export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" + ''} + titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out + '' else ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''} '' @@ -129,9 +110,20 @@ stdenv.mkDerivation { then ln -s ${titaniumsdk}/modules modules fi - + + # Take precautions to prevent concurrent builds blocking the keychain + while [ -f $HOME/lock-keychain ] + do + echo "Keychain locked, waiting for a couple of seconds, or remove $HOME/lock-keychain to unblock..." + sleep 3 + done + + touch $HOME/lock-keychain + + security default-keychain -s $keychainName + # Do the actual build - titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out + titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target ${if iosBuildStore then "dist-appstore" else "dist-adhoc"} --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out # Remove our generated keychain ${deleteKeychain} @@ -184,10 +176,10 @@ stdenv.mkDerivation { '' cp -av build/iphone/build/* $out mkdir -p $out/nix-support - echo "file binary-dist \"$(echo $out/Products/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products + echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products ${stdenv.lib.optionalString enableWirelessDistribution '' - appname=$(basename $out/Products/Release-iphoneos/*.ipa .ipa) + appname=$(basename $out/*.ipa .ipa) bundleId=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') version=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6ca4c441e6405b87398ea1e2108997186c7b76a7..6765a9cc5c30ad93aaf5854e0a702eca8ecbefba 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.0.2.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}: rec { androidenv = pkgs.androidenv; @@ -9,9 +9,8 @@ rec { } else null; titaniumsdk = let - titaniumSdkFile = if tiVersion == "5.1.2.GA" then ./titaniumsdk-5.1.nix - else if tiVersion == "5.2.3.GA" then ./titaniumsdk-5.2.nix - else if tiVersion == "6.0.2.GA" then ./titaniumsdk-6.0.nix + titaniumSdkFile = if tiVersion == "6.3.1.GA" then ./titaniumsdk-6.3.nix + else if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { @@ -19,8 +18,8 @@ rec { }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv python which jdk nodejs; - inherit (pkgs.nodePackages_4_x) titanium alloy; + inherit (pkgs) stdenv python which file jdk nodejs; + inherit (pkgs.nodePackages_6_x) alloy titanium; inherit (androidenv) androidsdk; inherit (xcodeenv) xcodewrapper; inherit titaniumsdk xcodeBaseDir; diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 3c5d3a018ec8e44b5ce84a4c1ff923d12ee88fbb..78f91dd39fb845abb30dd580157088eb480d04b1 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,10 +1,10 @@ { nixpkgs ? , systems ? [ "x86_64-linux" "x86_64-darwin" ] -, xcodeVersion ? "8.2.1" +, xcodeVersion ? "9.2" , xcodeBaseDir ? "/Applications/Xcode.app" -, tiVersion ? "6.0.2.GA" +, tiVersion ? "7.1.0.GA" , rename ? false -, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "10.2" +, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 4abf650ebee1ff9c64d15683fbe0e94f0b24a204..70ab1b168c4226cdb593223f85ea67dafb9307e5 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,5 +1,5 @@ -{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "23" ], tiVersion ? "5.1.2.GA", release ? false -, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.1" +{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "7.1.0.GA", release ? false +, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: @@ -7,18 +7,17 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning let src = fetchgit { - url = https://github.com/appcelerator/KitchenSink.git; - rev = "ec9edebf35030f61368000a8a9071dd7a0773884"; - sha256 = "1j41w4nhcbl40x550pjgabqrach80f9dybv7ya32771wnw2000iy"; + url = https://github.com/appcelerator/kitchensink-v2.git; + rev = "94364df2ef60a80bd354a4273e3cb5f4c5185537"; + sha256 = "0q4gzidpsq401frkngy4yk5kqvm8dz00ls74bw3fnpvg4714d6gf"; }; - + # Rename the bundle id to something else renamedSrc = stdenv.mkDerivation { name = "KitchenSink-renamedsrc"; inherit src; buildPhase = '' sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" tiapp.xml - sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" manifest ''; installPhase = '' mkdir -p $out @@ -29,14 +28,17 @@ in titaniumenv.buildApp { name = "KitchenSink-${target}-${if release then "release" else "debug"}"; src = if rename then renamedSrc else src; + preBuild = '' + sed -i -e "s|23|25|" tiapp.xml + ''; # Raise minimum android SDK from 23 to 25 inherit tiVersion; - + inherit target androidPlatformVersions release; - + androidKeyStore = ./keystore; androidKeyAlias = "myfirstapp"; androidKeyStorePassword = "mykeystore"; - + inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion; inherit enableWirelessDistribution installURL; } diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix deleted file mode 100644 index 670e55e0f3047271aae659ff6719286997a0f26e..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: - -stdenv.mkDerivation { - name = "mobilesdk-5.1.2.GA"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/5_1_X/mobilesdk-5.1.2.v20151216190036-linux.zip; - sha256 = "013ipqwkfqj60mn09jbbf6a9mc4pjrn0kr0ix906whzb888zz6bv"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/5_1_X/mobilesdk-5.1.2.v20151216190036-osx.zip; - sha256 = "1ylwh7zxa5yfyckzn3a9zc4cmh8gdndgb3jyr61s3j7zb1whn9ww"; - } - else throw "Platform: ${stdenv.system} not supported!"; - - buildInputs = [ unzip makeWrapper ]; - - buildCommand = '' - mkdir -p $out - cd $out - (yes y | unzip $src) || true - - # Rename ugly version number - cd mobilesdk/* - mv * 5.1.2.GA - cd * - - # Hack to make dx.jar work with new build-tools - sed -i -e "s|path.join(dir, 'platform-tools', 'lib', 'dx.jar')|path.join(dir, 'build-tools', 'android-6.0', 'lib', 'dx.jar')|" $out/mobilesdk/*/*/node_modules/titanium-sdk/lib/android.js - - # Patch some executables - - ${if stdenv.system == "i686-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 - '' - else if stdenv.system == "x86_64-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 - '' - else ""} - ''; -} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix deleted file mode 100644 index 511e8f0301b2dfe23e99c93fad0c37056e6d9302..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: - -stdenv.mkDerivation { - name = "mobilesdk-5.2.3.GA"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/5_2_X/mobilesdk-5.2.3.v20160404160237-linux.zip; - sha256 = "1acvkj3nrkgf9ch4js0pnjnwq5x6ddc15pkcanshp1zlc41z16gj"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/5_2_X/mobilesdk-5.2.3.v20160404160237-osx.zip; - sha256 = "04l7mrwiy3il2kzxz6sbfmczkqlkcrnwwndfzi8h5dzgh1672b7d"; - } - else throw "Platform: ${stdenv.system} not supported!"; - - buildInputs = [ unzip makeWrapper ]; - - buildCommand = '' - mkdir -p $out - cd $out - (yes y | unzip $src) || true - - # Rename ugly version number - cd mobilesdk/* - mv * 5.2.3.GA - cd * - - # Hack to make dx.jar work with new build-tools - #sed -i -e "s|path.join(dir, 'platform-tools', 'lib', 'dx.jar')|path.join(dir, 'build-tools', 'android-6.0', 'lib', 'dx.jar')|" $out/mobilesdk/*/*/node_modules/titanium-sdk/lib/android.js - - # Patch some executables - - ${if stdenv.system == "i686-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 - '' - else if stdenv.system == "x86_64-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 - '' - else ""} - ''; -} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix deleted file mode 100644 index fdaaff3945340f6f563b8dc86b050dff0b3e6406..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: - -stdenv.mkDerivation { - name = "mobilesdk-6.0.2.GA"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/6_0_X/mobilesdk-6.0.2.v20170123140026-linux.zip; - sha256 = "1yjhr4fgjnxfxzwmgw71yynrfzhsjqj2cirjr5rd14zlp4q9751q"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/6_0_X/mobilesdk-6.0.2.v20170123140026-osx.zip; - sha256 = "1ijd1wp56ygy238xpcffy112akim208wbv5zm901dvych83ibw1c"; - } - else throw "Platform: ${stdenv.system} not supported!"; - - buildInputs = [ unzip makeWrapper ]; - - buildCommand = '' - mkdir -p $out - cd $out - (yes y | unzip $src) || true - - # Rename ugly version number - cd mobilesdk/* - mv * 6.0.2.GA - cd * - - # Patch some executables - - ${if stdenv.system == "i686-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 - '' - else if stdenv.system == "x86_64-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 - '' - else ""} - ''; -} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix new file mode 100644 index 0000000000000000000000000000000000000000..53963c100c74eb79757705423d67b8ea09432b8c --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "mobilesdk-6.3.1.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-linux.zip; + sha256 = "0g8dqqf5ffa7ll3rqm5naywipnv2vvfxcj9fmqg1wnvvxf0rflqj"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-osx.zip; + sha256 = "00bm8vv70mg4kd7jvmxd1bfqafv6zdpdx816i0hvf801zwnak4nj"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + (yes y | unzip $src) || true + + # Rename ugly version number + cd mobilesdk/* + mv * 6.3.1.GA + cd * + ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # Fixes a bad archive copying error when generating an IPA file + sed -i -e "s|cp -rf|/bin/cp -rf|" iphone/cli/commands/_build.js + ''} + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 + '' + else ""} + ''; +} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix new file mode 100644 index 0000000000000000000000000000000000000000..61c23a6d0b375dc3d8e88e843c58624922e04f29 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix @@ -0,0 +1,102 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +let + # Gradle is a build system that bootstraps itself. This is what it actually + # downloads in the bootstrap phase. + gradleAllZip = fetchurl { + url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; + }; + + # A Titanium-Android build requires proguard plugins. We create a fake + # repository so that Gradle does not attempt to download them in the builder. + # Since there are only 3 plugins required, this is still (sort of) manageable + # without a generator. + proguardVersion = "5.3.3"; + + proguardGradlePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom"; + sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj"; + }; + proguardGradleJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar"; + sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk"; + }; + proguardParentPOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom"; + sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202"; + }; + proguardBasePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom"; + sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5"; + }; + proguardBaseJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar"; + sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx"; + }; + + # Put the download plugins in a fake Maven repository + fakeMavenRepo = stdenv.mkDerivation { + name = "fake-maven-repo"; + buildCommand = '' + mkdir -p $out + cd $out + mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion} + cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom + cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar + mkdir -p net/sf/proguard/proguard-parent/${proguardVersion} + cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom + mkdir -p net/sf/proguard/proguard-base/${proguardVersion} + cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom + cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar + ''; + }; +in +stdenv.mkDerivation { + name = "mobilesdk-7.1.0.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip; + sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip; + sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + (yes y | unzip $src) || true + + # Rename ugly version number + cd mobilesdk/* + mv * 7.1.0.GA + cd * + + # Patch bundled gradle build infrastructure to make shebangs work + patchShebangs android/templates/gradle + + # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app + sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip + echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + + # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts + sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 + '' + else ""} + ''; +} diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix new file mode 100644 index 0000000000000000000000000000000000000000..f149cb622e1326b3429d04733325109878aa8d48 --- /dev/null +++ b/pkgs/development/mobile/webos/cmake-modules.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "cmake-modules-webos-${version}"; + version = "19"; + + src = fetchFromGitHub { + owner = "openwebos"; + repo = "cmake-modules-webos"; + rev = "submissions/${version}"; + sha256 = "1l4hpcmgc98kp9g1642sy111ki5qyk3q7j10xzkgmnvz8lqffnxp"; + }; + + nativeBuildInputs = [ cmake ]; + + prePatch = '' + substituteInPlace CMakeLists.txt --replace "CMAKE_ROOT}/Modules" "CMAKE_INSTALL_PREFIX}/lib/cmake" + substituteInPlace webOS/webOS.cmake \ + --replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake" \ + --replace 'INSTALL_ROOT}/usr' 'INSTALL_ROOT}' + + sed -i '/CMAKE_INSTALL_PREFIX/d' webOS/webOS.cmake + ''; + + setupHook = ./cmake-setup-hook.sh; + + meta = with stdenv.lib; { + description = "CMake modules needed to build Open WebOS components"; + license = licenses.asl20; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/mobile/webos/cmake-setup-hook.sh b/pkgs/development/mobile/webos/cmake-setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..7e52681e9a91367eae2bf0b7fcb649f3f60e26ec --- /dev/null +++ b/pkgs/development/mobile/webos/cmake-setup-hook.sh @@ -0,0 +1,9 @@ +_addWebOSCMakeFlags() { + # Help find the webOS cmake module + cmakeFlagsArray+=(-DCMAKE_MODULE_PATH=@out@/lib/cmake) + + # fix installation path (doesn't use CMAKE_INSTALL_PREFIX) + cmakeFlagsArray+=(-DWEBOS_INSTALL_ROOT=${!outputBin}) +} + +preConfigureHooks+=(_addWebOSCMakeFlags) diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix new file mode 100644 index 0000000000000000000000000000000000000000..52b50635e33659454de8667a3081222ff4fe7fe3 --- /dev/null +++ b/pkgs/development/mobile/webos/novacom.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, webos, cmake, pkgconfig }: + +stdenv.mkDerivation rec { + name = "novacom-${version}"; + version = "18"; + + src = fetchFromGitHub { + owner = "openwebos"; + repo = "novacom"; + rev = "submissions/${version}"; + sha256 = "12s6g7l20kakyjlhqpli496miv2kfsdp17lcwhdrzdxvxl6hnf4n"; + }; + + nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; + + postInstall = '' + install -Dm755 -t $out/bin ../scripts/novaterm + substituteInPlace $out/bin/novaterm --replace "exec novacom" "exec $out/bin/novacom" + ''; + + meta = with stdenv.lib; { + description = "Utility for communicating with WebOS devices"; + license = licenses.asl20; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix new file mode 100644 index 0000000000000000000000000000000000000000..f82009b0c39c500aa354f55c83afa95d4c90dee5 --- /dev/null +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -0,0 +1,40 @@ +{ stdenv, +fetchFromGitHub, fetchpatch, +webos, cmake, pkgconfig, +libusb }: + +stdenv.mkDerivation rec { + name = "novacomd-${version}"; + version = "127"; + + src = fetchFromGitHub { + owner = "openwebos"; + repo = "novacomd"; + rev = "submissions/${version}"; + sha256 = "1gahc8bvvvs4d6svrsw24iw5r0mhy4a2ars3j2gz6mp6sh42bznl"; + }; + + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-Use-usb_bulk_-read-write-instead-of-homemade-handler.patch?h=palm-novacom-git"; + sha256 = "116r6p4l767fqxfvq03sy6v7vxja8pkxlrc5hqby351a40b5dkiv"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/feniksa/webos-overlay/40e2c113fc9426d50bdf37779da57ce4ff06ee6e/net-misc/novacomd/files/0011-Remove-verbose-output.patch"; + sha256 = "09lmv06ziwkfg19b1h3jsmkm6g1f0nxxq1717dircjx8m45ypjq9"; + }) + ]; + + nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; + + buildInputs = [ libusb ]; + + cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ]; + + meta = with stdenv.lib; { + description = "Daemon for communicating with WebOS devices"; + license = licenses.asl20; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index bbbe1728ee5dd73288651df1dacd2cfc49353102..a94f2745894ba11743d62ebd5da2a88709e5e0b7 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -1,7 +1,7 @@ {stdenv, xcodewrapper}: { name , src -, sdkVersion ? "10.2" +, sdkVersion ? "11.2" , target ? null , configuration ? null , scheme ? null @@ -12,6 +12,7 @@ , certificateFile ? null , certificatePassword ? null , provisioningProfile ? null +, signMethod ? null , generateIPA ? false , generateXCArchive ? false , enableWirelessDistribution ? false @@ -21,7 +22,7 @@ , title ? null }: -assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null; +assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null; assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null; let @@ -80,13 +81,36 @@ stdenv.mkDerivation { ''} # Do the building - xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} - + export LD=clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works + + xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then ''PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} + ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' + # Create export plist file + cat > "${name}.plist" < + + + + provisioningProfiles + + ${bundleId} + $PROVISIONING_PROFILE + + method + ${signMethod} + ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") '' + compileBitcode + + ''} + + + EOF + # Produce an IPA file - xcrun -sdk iphoneos PackageApplication -v $out/*.app -o "$out/${name}.ipa" - + xcodebuild -exportArchive -archivePath "${name}.xcarchive" -exportOptionsPlist "${name}.plist" -exportPath $out + # Add IPA to Hydra build products mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products @@ -97,6 +121,10 @@ stdenv.mkDerivation { echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products ''} ''} + ${stdenv.lib.optionalString generateXCArchive '' + mkdir -p $out + mv "${name}.xcarchive" $out + ''} # Delete our temp keychain ${deleteKeychain} diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index afe430df383a656e7f1a5631a46603b68f5578b1..b3b9dbdf07ac0130f9d80ac06503c3a279905ae0 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,4 +1,4 @@ -{stdenv, version ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app"}: +{stdenv, version ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app"}: rec { xcodewrapper = import ./xcodewrapper.nix { diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index e1b2b0cb2fafa754c92ca0f1998f9fd6791ba73b..d5ffb7f6c017e484b8877a19baabd3efc40bd847 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, zlib, libpng, bzip2, libusb1, openssl }: +{ stdenv, fetchgit, cmake, zlib, libpng, bzip2, libusb, openssl }: stdenv.mkDerivation { name = "xpwn-0.5.8git"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { sed -i -e '/install/d' CMakeLists.txt ''; - buildInputs = [ cmake zlib libpng bzip2 libusb1 openssl ]; + buildInputs = [ cmake zlib libpng bzip2 libusb openssl ]; cmakeFlags = [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=" diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index 79f180759b0940bf8fccaac8304c0576d2535637..9760285a915ed413850b29e68db9d87f93e0382b 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -1,34 +1 @@ -Node.js packages -================ -The `pkgs/development/node-packages` folder contains a generated collection of -[NPM packages](https://npmjs.com/) that can be installed with the Nix package -manager. - -As a rule of thumb, the package set should only provide *end user* software -packages, such as command-line utilities. Libraries should only be added to the -package set if there is a non-NPM package that requires it. - -When it is desired to use NPM libraries in a development project, use the -`node2nix` generator directly on the `package.json` configuration file of the -project. - -The package set also provides support for multiple Node.js versions. The policy -is that a new package should be added to the collection for the latest stable LTS -release (which is currently 6.x), unless there is an explicit reason to support -a different release. - -To add a package from NPM to nixpkgs: - - 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update - or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` - for packages depending on Node.js 4.x) - 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`. - 3. Build your new package to test your changes: - `cd /path/to/nixpkgs && nix-build -A nodePackages.`. - To build against a specific Node.js version (e.g. 4.x): - `nix-build -A nodePackages_4_x.` - 4. Add and commit all modified and generated files. - -For more information about the generation process, consult the -[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` -tool. +Moved to [/doc/languages-frameworks/node.section.md](/doc/languages-frameworks/node.section.md) diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix deleted file mode 100644 index f63ae1ef75032b86c06666a9da10902998da7574..0000000000000000000000000000000000000000 --- a/pkgs/development/node-packages/composition-v4.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file has been generated by node2nix 1.4.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; - }; -in -import ./node-packages-v4.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} \ No newline at end of file diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 4d4f68cf50cab6bd3847fa4830ba0b8eb727bfa4..2252bab3a793e0ac3f22e59d42c6b8c7d8394dbf 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.4.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; @@ -8,6 +8,7 @@ let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages-v6.nix { diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix new file mode 100644 index 0000000000000000000000000000000000000000..96266105942d3f49c7b65b5c947a527b78e94561 --- /dev/null +++ b/pkgs/development/node-packages/composition-v8.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.5.3. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-v8.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix deleted file mode 100644 index 7546b2e34ce957092dc002284f76e56a0a3e7b8a..0000000000000000000000000000000000000000 --- a/pkgs/development/node-packages/default-v4.nix +++ /dev/null @@ -1,12 +0,0 @@ -{pkgs, system, nodejs, stdenv}: - -let - nodePackages = import ./composition-v4.nix { - inherit pkgs system nodejs; - }; -in -nodePackages // { - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); -} diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 179629ddfa69db8a61d11064aca3e7faf3a00e87..2be09eb1632497245283d7320aaca43a1564b0e8 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -6,6 +6,10 @@ let }; in nodePackages // { + dat = nodePackages.dat.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; + }); + dnschain = nodePackages.dnschain.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; postInstall = '' @@ -16,17 +20,17 @@ nodePackages // { node-inspector = nodePackages.node-inspector.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; }); - + phantomjs = nodePackages.phantomjs.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); - + webdrvr = nodePackages.webdrvr.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - + preRebuild = '' mkdir $TMPDIR/webdrvr - + ln -s ${pkgs.fetchurl { url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; @@ -68,4 +72,11 @@ nodePackages // { ''; buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); + + node2nix = nodePackages.node2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + ''; + }); } diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix new file mode 100644 index 0000000000000000000000000000000000000000..ed0477a639a7746c41533217499b7e618ae163d2 --- /dev/null +++ b/pkgs/development/node-packages/default-v8.nix @@ -0,0 +1,75 @@ +{pkgs, system, nodejs, stdenv}: + +let + nodePackages = import ./composition-v8.nix { + inherit pkgs system nodejs; + }; +in +nodePackages // { + dat = nodePackages.dat.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; + }); + + dnschain = nodePackages.dnschain.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + postInstall = '' + wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin + ''; + }); + + node-inspector = nodePackages.node-inspector.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; + }); + + phantomjs = nodePackages.phantomjs.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; + }); + + webdrvr = nodePackages.webdrvr.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + + preRebuild = '' + mkdir $TMPDIR/webdrvr + + ln -s ${pkgs.fetchurl { + url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; + sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; + }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar + ln -s ${pkgs.fetchurl { + url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; + sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; + }} $TMPDIR/webdrvr/chromedriver_linux64.zip + ''; + + dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. + }); + + npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { + postInstall = "npm run-script prepublish"; + }; + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} + done + ''; + }); + + ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { + preRebuild = '' + tmp=$(mktemp -d) + ln -s /usr/bin/xcodebuild $tmp + export PATH="$PATH:$tmp" + ''; + }); + + fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { + preRebuild = '' + # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore + sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js + ''; + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; + }); +} diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 9fa7929df686b11a9255030e656b94a30facf0b6..c3aa741ef806461b6096817a50616a6ba9693e8e 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -2,5 +2,5 @@ #! nix-shell -i bash -p nodePackages.node2nix rm -f node-env.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 +node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 33073e55ce56496b7cd5f42992df66de1164b7ed..fc118a788ea7f38051cf97de89bb212036d91420 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, utillinux, runCommand, writeTextFile}: +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -194,12 +194,132 @@ let mv node-* $out ''; + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(packageLock.lockfileVersion !== 1) { + process.stderr.write("Sorry, I only understand lock file version 1!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + # Builds and composes an NPM package including all its dependencies - buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, preRebuild ? "", ... }@args: + buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, preRebuild ? "", ... }@args: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { name = "node-${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ args.buildInputs or []; dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments inherit dontNpmInstall preRebuild; @@ -242,14 +362,25 @@ let export HOME=$TMPDIR cd "${packageName}" runHook preRebuild - npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + ${stdenv.lib.optionalString bypassCache '' + if [ ! -f package-lock.json ] + then + echo "No package-lock.json file found, reconstructing..." + node ${reconstructPackageLock} + fi + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild if [ "$dontNpmInstall" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install fi # Create symlink to the deployed executable folder, if applicable @@ -278,12 +409,17 @@ let }); # Builds a development shell - buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, ... }@args: + buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, ... }@args: let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + nodeDependencies = stdenv.mkDerivation { name = "node-dependencies-${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ args.buildInputs or []; includeScript = includeDependencies { inherit dependencies; }; pinpointDependenciesScript = pinpointDependenciesOfPackage args; @@ -299,6 +435,12 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json + ${stdenv.lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} # Pinpoint the versions of all dependencies to the ones that are actually being used echo "pinpointing versions of dependencies..." @@ -312,13 +454,23 @@ let export HOME=$PWD - npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + ${stdenv.lib.optionalString bypassCache '' + if [ ! -f package-lock.json ] + then + echo "No package-lock.json file found, reconstructing..." + node ${reconstructPackageLock} + fi + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild ${stdenv.lib.optionalString (!dontNpmInstall) '' # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install ''} cd .. diff --git a/pkgs/development/node-packages/node-packages-v4.json b/pkgs/development/node-packages/node-packages-v4.json deleted file mode 100644 index c178f0fde820f5344f0bd0f273a776235c7fc1dd..0000000000000000000000000000000000000000 --- a/pkgs/development/node-packages/node-packages-v4.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - "coffee-script" -, "grunt-cli" -, "gulp" -, "node-gyp" -, "node-inspector" -, "node-pre-gyp" -, "npm" -, "titanium" -] diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix deleted file mode 100644 index a632f848663ec61c9e9bf3236e4b1d28bc2b276c..0000000000000000000000000000000000000000 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ /dev/null @@ -1,6362 +0,0 @@ -# This file has been generated by node2nix 1.4.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = { - "findup-sync-0.3.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"; - sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; - }; - }; - "grunt-known-options-1.1.0" = { - name = "grunt-known-options"; - packageName = "grunt-known-options"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; - sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; - }; - }; - "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"; - }; - }; - "resolve-1.1.7" = { - name = "resolve"; - packageName = "resolve"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; - }; - }; - "glob-5.0.15" = { - name = "glob"; - packageName = "glob"; - version = "5.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; - sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "brace-expansion-1.1.8" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; - }; - }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; - }; - }; - "archy-1.0.0" = { - name = "archy"; - packageName = "archy"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; - sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; - }; - }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "deprecated-0.0.1" = { - name = "deprecated"; - packageName = "deprecated"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"; - sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; - }; - }; - "gulp-util-3.0.8" = { - name = "gulp-util"; - packageName = "gulp-util"; - version = "3.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"; - sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; - }; - }; - "interpret-1.0.4" = { - name = "interpret"; - packageName = "interpret"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz"; - sha1 = "820cdd588b868ffb191a809506d6c9c8f212b1b0"; - }; - }; - "liftoff-2.3.0" = { - name = "liftoff"; - packageName = "liftoff"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz"; - sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "orchestrator-0.3.8" = { - name = "orchestrator"; - packageName = "orchestrator"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; - sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; - }; - }; - "pretty-hrtime-1.0.3" = { - name = "pretty-hrtime"; - packageName = "pretty-hrtime"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; - 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"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz"; - sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; - }; - }; - "v8flags-2.1.1" = { - name = "v8flags"; - packageName = "v8flags"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz"; - sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; - }; - }; - "vinyl-fs-0.3.14" = { - name = "vinyl-fs"; - packageName = "vinyl-fs"; - version = "0.3.14"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz"; - sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "array-differ-1.0.0" = { - name = "array-differ"; - packageName = "array-differ"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; - sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; - }; - }; - "array-uniq-1.0.3" = { - name = "array-uniq"; - packageName = "array-uniq"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; - sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; - }; - }; - "beeper-1.1.1" = { - name = "beeper"; - packageName = "beeper"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; - sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; - }; - }; - "dateformat-2.2.0" = { - name = "dateformat"; - packageName = "dateformat"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"; - sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; - }; - }; - "fancy-log-1.3.0" = { - name = "fancy-log"; - packageName = "fancy-log"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz"; - sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948"; - }; - }; - "gulplog-1.0.0" = { - name = "gulplog"; - packageName = "gulplog"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"; - sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; - }; - }; - "has-gulplog-0.1.0" = { - name = "has-gulplog"; - packageName = "has-gulplog"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"; - sha1 = "6414c82913697da51590397dafb12f22967811ce"; - }; - }; - "lodash._reescape-3.0.0" = { - name = "lodash._reescape"; - packageName = "lodash._reescape"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; - sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"; - }; - }; - "lodash._reevaluate-3.0.0" = { - name = "lodash._reevaluate"; - packageName = "lodash._reevaluate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; - sha1 = "58bc74c40664953ae0b124d806996daca431e2ed"; - }; - }; - "lodash._reinterpolate-3.0.0" = { - name = "lodash._reinterpolate"; - packageName = "lodash._reinterpolate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; - sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; - }; - }; - "lodash.template-3.6.2" = { - name = "lodash.template"; - packageName = "lodash.template"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"; - sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f"; - }; - }; - "multipipe-0.1.2" = { - name = "multipipe"; - packageName = "multipipe"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"; - sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; - }; - }; - "object-assign-3.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; - sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; - }; - }; - "replace-ext-0.0.1" = { - name = "replace-ext"; - packageName = "replace-ext"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; - sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; - }; - }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; - }; - }; - "vinyl-0.5.3" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"; - sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; - }; - }; - "time-stamp-1.1.0" = { - name = "time-stamp"; - packageName = "time-stamp"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"; - sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; - }; - }; - "glogg-1.0.0" = { - name = "glogg"; - packageName = "glogg"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz"; - sha1 = "7fe0f199f57ac906cf512feead8f90ee4a284fc5"; - }; - }; - "sparkles-1.0.0" = { - name = "sparkles"; - packageName = "sparkles"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"; - sha1 = "1acbbfb592436d10bbe8f785b7cc6f82815012c3"; - }; - }; - "lodash._basecopy-3.0.1" = { - name = "lodash._basecopy"; - packageName = "lodash._basecopy"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; - sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; - }; - }; - "lodash._basetostring-3.0.1" = { - name = "lodash._basetostring"; - packageName = "lodash._basetostring"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"; - sha1 = "d1861d877f824a52f669832dcaf3ee15566a07d5"; - }; - }; - "lodash._basevalues-3.0.0" = { - name = "lodash._basevalues"; - packageName = "lodash._basevalues"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; - sha1 = "5b775762802bde3d3297503e26300820fdf661b7"; - }; - }; - "lodash._isiterateecall-3.0.9" = { - name = "lodash._isiterateecall"; - packageName = "lodash._isiterateecall"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; - sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; - }; - }; - "lodash.escape-3.2.0" = { - name = "lodash.escape"; - packageName = "lodash.escape"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"; - sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; - }; - }; - "lodash.keys-3.1.2" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"; - sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; - }; - }; - "lodash.restparam-3.6.1" = { - name = "lodash.restparam"; - packageName = "lodash.restparam"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"; - sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; - }; - }; - "lodash.templatesettings-3.1.1" = { - name = "lodash.templatesettings"; - packageName = "lodash.templatesettings"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"; - sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5"; - }; - }; - "lodash._root-3.0.1" = { - name = "lodash._root"; - packageName = "lodash._root"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; - sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; - }; - }; - "lodash._getnative-3.9.1" = { - name = "lodash._getnative"; - packageName = "lodash._getnative"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; - }; - }; - "lodash.isarguments-3.1.0" = { - name = "lodash.isarguments"; - packageName = "lodash.isarguments"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; - }; - }; - "lodash.isarray-3.0.4" = { - name = "lodash.isarray"; - packageName = "lodash.isarray"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; - sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; - }; - }; - "duplexer2-0.0.2" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; - sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; - "readable-stream-2.3.3" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; - sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; - }; - }; - "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"; - }; - }; - "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"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "safe-buffer-5.1.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; - }; - }; - "string_decoder-1.0.3" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; - "clone-1.0.3" = { - name = "clone"; - packageName = "clone"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz"; - sha1 = "298d7e2231660f40c003c2ed3140decf3f53085f"; - }; - }; - "clone-stats-0.0.1" = { - name = "clone-stats"; - packageName = "clone-stats"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"; - sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; - }; - }; - "extend-3.0.1" = { - name = "extend"; - packageName = "extend"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; - }; - }; - "findup-sync-0.4.3" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz"; - sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12"; - }; - }; - "fined-1.1.0" = { - name = "fined"; - packageName = "fined"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; - sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; - }; - }; - "flagged-respawn-0.3.2" = { - name = "flagged-respawn"; - packageName = "flagged-respawn"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz"; - sha1 = "ff191eddcd7088a675b2610fffc976be9b8074b5"; - }; - }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; - }; - }; - "lodash.isstring-4.0.1" = { - name = "lodash.isstring"; - packageName = "lodash.isstring"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; - }; - }; - "lodash.mapvalues-4.6.0" = { - name = "lodash.mapvalues"; - packageName = "lodash.mapvalues"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; - sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; - }; - }; - "rechoir-0.6.2" = { - name = "rechoir"; - packageName = "rechoir"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; - sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; - }; - }; - "resolve-1.5.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; - sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; - }; - }; - "detect-file-0.1.0" = { - name = "detect-file"; - packageName = "detect-file"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz"; - sha1 = "4935dedfd9488648e006b0129566e9386711ea63"; - }; - }; - "is-glob-2.0.1" = { - name = "is-glob"; - packageName = "is-glob"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; - sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; - }; - }; - "micromatch-2.3.11" = { - name = "micromatch"; - packageName = "micromatch"; - version = "2.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; - sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; - }; - }; - "resolve-dir-0.1.1" = { - name = "resolve-dir"; - packageName = "resolve-dir"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz"; - sha1 = "b219259a5602fac5c5c496ad894a6e8cc430261e"; - }; - }; - "fs-exists-sync-0.1.0" = { - name = "fs-exists-sync"; - packageName = "fs-exists-sync"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz"; - sha1 = "982d6893af918e72d08dec9e8673ff2b5a8d6add"; - }; - }; - "is-extglob-1.0.0" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; - sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; - }; - }; - "arr-diff-2.0.0" = { - name = "arr-diff"; - packageName = "arr-diff"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; - sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; - }; - }; - "array-unique-0.2.1" = { - name = "array-unique"; - packageName = "array-unique"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"; - sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; - }; - }; - "braces-1.8.5" = { - name = "braces"; - packageName = "braces"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; - sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; - }; - }; - "expand-brackets-0.1.5" = { - name = "expand-brackets"; - packageName = "expand-brackets"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; - sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; - }; - }; - "extglob-0.3.2" = { - name = "extglob"; - packageName = "extglob"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; - sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; - }; - }; - "filename-regex-2.0.1" = { - name = "filename-regex"; - packageName = "filename-regex"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; - sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; - }; - }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - }; - "normalize-path-2.1.1" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; - }; - }; - "object.omit-2.0.1" = { - name = "object.omit"; - packageName = "object.omit"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; - sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; - }; - }; - "parse-glob-3.0.4" = { - name = "parse-glob"; - packageName = "parse-glob"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; - sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; - }; - }; - "regex-cache-0.4.4" = { - name = "regex-cache"; - packageName = "regex-cache"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; - sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; - }; - }; - "arr-flatten-1.1.0" = { - name = "arr-flatten"; - packageName = "arr-flatten"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; - }; - }; - "expand-range-1.8.2" = { - name = "expand-range"; - packageName = "expand-range"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; - sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; - }; - }; - "preserve-0.2.0" = { - name = "preserve"; - packageName = "preserve"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; - sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; - }; - }; - "repeat-element-1.1.2" = { - name = "repeat-element"; - packageName = "repeat-element"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; - sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; - }; - }; - "fill-range-2.2.3" = { - name = "fill-range"; - packageName = "fill-range"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"; - sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; - }; - }; - "is-number-2.1.0" = { - name = "is-number"; - packageName = "is-number"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; - sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; - }; - }; - "isobject-2.1.0" = { - name = "isobject"; - packageName = "isobject"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; - }; - }; - "randomatic-1.1.7" = { - name = "randomatic"; - packageName = "randomatic"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; - sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; - "is-number-3.0.0" = { - name = "is-number"; - packageName = "is-number"; - 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-buffer-1.1.6" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; - }; - }; - "is-posix-bracket-0.1.1" = { - name = "is-posix-bracket"; - packageName = "is-posix-bracket"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; - sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; - }; - }; - "remove-trailing-separator-1.1.0" = { - name = "remove-trailing-separator"; - packageName = "remove-trailing-separator"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; - }; - }; - "for-own-0.1.5" = { - name = "for-own"; - packageName = "for-own"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; - sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; - }; - }; - "is-extendable-0.1.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; - }; - }; - "for-in-1.0.2" = { - name = "for-in"; - packageName = "for-in"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; - }; - }; - "glob-base-0.3.0" = { - name = "glob-base"; - packageName = "glob-base"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; - sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; - }; - }; - "is-dotfile-1.0.3" = { - name = "is-dotfile"; - packageName = "is-dotfile"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; - sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; - }; - }; - "glob-parent-2.0.0" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; - sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; - }; - }; - "is-equal-shallow-0.1.3" = { - name = "is-equal-shallow"; - packageName = "is-equal-shallow"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; - sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; - }; - }; - "is-primitive-2.0.0" = { - name = "is-primitive"; - packageName = "is-primitive"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; - sha1 = "207bab91638499c07b2adf240a41a87210034575"; - }; - }; - "expand-tilde-1.2.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz"; - sha1 = "0b81eba897e5a3d31d1c3d102f8f01441e559449"; - }; - }; - "global-modules-0.2.3" = { - name = "global-modules"; - packageName = "global-modules"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz"; - sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"; - }; - }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "global-prefix-0.1.5" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz"; - sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"; - }; - }; - "is-windows-0.2.0" = { - name = "is-windows"; - packageName = "is-windows"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz"; - sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; - }; - }; - "homedir-polyfill-1.0.1" = { - name = "homedir-polyfill"; - packageName = "homedir-polyfill"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; - }; - }; - "ini-1.3.4" = { - name = "ini"; - packageName = "ini"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; - sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; - }; - }; - "which-1.3.0" = { - name = "which"; - packageName = "which"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; - sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; - }; - }; - "parse-passwd-1.0.0" = { - name = "parse-passwd"; - packageName = "parse-passwd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; - }; - }; - "expand-tilde-2.0.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; - }; - }; - "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/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; - }; - }; - "object.defaults-1.1.0" = { - name = "object.defaults"; - packageName = "object.defaults"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; - sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; - }; - }; - "object.pick-1.3.0" = { - name = "object.pick"; - packageName = "object.pick"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; - }; - }; - "parse-filepath-1.0.1" = { - name = "parse-filepath"; - packageName = "parse-filepath"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz"; - 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"; - version = "0.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz"; - sha1 = "20de69f3db942ef2d87b9c2da36f172235b1b5eb"; - }; - }; - "map-cache-0.2.2" = { - name = "map-cache"; - packageName = "map-cache"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; - }; - }; - "path-root-0.1.1" = { - name = "path-root"; - packageName = "path-root"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"; - sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; - }; - }; - "is-relative-0.2.1" = { - name = "is-relative"; - packageName = "is-relative"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz"; - sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5"; - }; - }; - "is-unc-path-0.1.2" = { - name = "is-unc-path"; - packageName = "is-unc-path"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz"; - sha1 = "6ab053a72573c10250ff416a3814c35178af39b9"; - }; - }; - "unc-path-regex-0.1.2" = { - name = "unc-path-regex"; - packageName = "unc-path-regex"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; - }; - }; - "path-root-regex-0.1.2" = { - name = "path-root-regex"; - packageName = "path-root-regex"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"; - sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; - }; - }; - "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"; - }; - }; - "end-of-stream-0.1.5" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz"; - sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; - }; - }; - "sequencify-0.0.7" = { - name = "sequencify"; - packageName = "sequencify"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"; - sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; - }; - }; - "stream-consume-0.1.0" = { - name = "stream-consume"; - packageName = "stream-consume"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"; - sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"; - }; - }; - "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"; - }; - }; - "user-home-1.1.1" = { - name = "user-home"; - packageName = "user-home"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; - sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; - }; - }; - "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"; - }; - }; - "glob-stream-3.1.18" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "3.1.18"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; - sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; - }; - }; - "glob-watcher-0.0.6" = { - name = "glob-watcher"; - packageName = "glob-watcher"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"; - sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; - }; - }; - "graceful-fs-3.0.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "3.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz"; - sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "strip-bom-1.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"; - sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794"; - }; - }; - "through2-0.6.5" = { - name = "through2"; - packageName = "through2"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"; - sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; - }; - }; - "vinyl-0.4.6" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; - sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; - }; - }; - "glob-4.5.3" = { - name = "glob"; - packageName = "glob"; - version = "4.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; - sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; - }; - }; - "minimatch-2.0.10" = { - name = "minimatch"; - packageName = "minimatch"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; - sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; - }; - }; - "ordered-read-streams-0.1.0" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; - sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; - }; - }; - "glob2base-0.0.12" = { - name = "glob2base"; - packageName = "glob2base"; - version = "0.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; - sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; - }; - }; - "unique-stream-1.0.0" = { - name = "unique-stream"; - packageName = "unique-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"; - sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; - }; - }; - "find-index-0.1.1" = { - name = "find-index"; - packageName = "find-index"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"; - sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; - }; - }; - "gaze-0.5.2" = { - name = "gaze"; - packageName = "gaze"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"; - sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; - }; - }; - "globule-0.1.0" = { - name = "globule"; - packageName = "globule"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz"; - sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; - }; - }; - "lodash-1.0.2" = { - name = "lodash"; - packageName = "lodash"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; - sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; - }; - }; - "glob-3.1.21" = { - name = "glob"; - packageName = "glob"; - version = "3.1.21"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; - sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; - }; - }; - "minimatch-0.2.14" = { - name = "minimatch"; - packageName = "minimatch"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }; - }; - "graceful-fs-1.2.3" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }; - }; - "inherits-1.0.2" = { - name = "inherits"; - packageName = "inherits"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; - sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; - }; - }; - "lru-cache-2.7.3" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; - sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; - }; - }; - "sigmund-1.0.1" = { - name = "sigmund"; - packageName = "sigmund"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; - }; - }; - "natives-1.1.0" = { - name = "natives"; - packageName = "natives"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz"; - sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "first-chunk-stream-1.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; - sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; - }; - }; - "is-utf8-0.2.1" = { - name = "is-utf8"; - packageName = "is-utf8"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; - sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; - }; - }; - "readable-stream-1.0.34" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.0.34"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; - sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; - }; - }; - "clone-0.2.0" = { - name = "clone"; - packageName = "clone"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; - sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; - }; - }; - "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"; - }; - }; - "glob-7.1.2" = { - name = "glob"; - packageName = "glob"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; - }; - }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; - }; - }; - "npmlog-4.1.2" = { - name = "npmlog"; - packageName = "npmlog"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; - }; - }; - "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"; - }; - }; - "request-2.83.0" = { - name = "request"; - packageName = "request"; - version = "2.83.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; - }; - }; - "rimraf-2.6.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; - }; - }; - "semver-5.3.0" = { - name = "semver"; - packageName = "semver"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; - }; - }; - "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"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "are-we-there-yet-1.1.4" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; - sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; - }; - }; - "console-control-strings-1.1.0" = { - name = "console-control-strings"; - packageName = "console-control-strings"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; - }; - }; - "gauge-2.7.4" = { - name = "gauge"; - packageName = "gauge"; - version = "2.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; - }; - }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; - }; - }; - "delegates-1.0.0" = { - name = "delegates"; - packageName = "delegates"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; - }; - }; - "aproba-1.2.0" = { - name = "aproba"; - packageName = "aproba"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; - }; - }; - "has-unicode-2.0.1" = { - name = "has-unicode"; - packageName = "has-unicode"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; - }; - }; - "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.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"; - sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; - }; - }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; - }; - }; - "aws4-1.6.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; - }; - }; - "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"; - }; - }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-2.3.1" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; - sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; - }; - }; - "har-validator-5.0.3" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; - }; - }; - "hawk-6.0.2" = { - name = "hawk"; - packageName = "hawk"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; - sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; - }; - }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "mime-types-2.1.17" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.17"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; - sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; - }; - }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; - }; - }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; - }; - }; - "qs-6.5.1" = { - name = "qs"; - packageName = "qs"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; - }; - }; - "tough-cookie-2.3.3" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; - }; - }; - "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"; - }; - }; - "uuid-3.1.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; - sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; - "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"; - }; - }; - "ajv-5.3.0" = { - name = "ajv"; - packageName = "ajv"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz"; - sha1 = "4414ff74a50879c208ee5fdc826e32c303549eda"; - }; - }; - "har-schema-2.0.0" = { - name = "har-schema"; - packageName = "har-schema"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "fast-json-stable-stringify-2.0.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; - }; - }; - "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"; - }; - }; - "hoek-4.2.0" = { - name = "hoek"; - packageName = "hoek"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; - sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; - }; - }; - "boom-4.3.1" = { - name = "boom"; - packageName = "boom"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; - sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; - }; - }; - "cryptiles-3.1.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; - sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; - }; - }; - "sntp-2.1.0" = { - name = "sntp"; - packageName = "sntp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; - sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; - }; - }; - "boom-5.2.0" = { - name = "boom"; - packageName = "boom"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; - sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; - }; - }; - "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"; - }; - }; - "jsprim-1.4.1" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - }; - "sshpk-1.13.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; - sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; - }; - }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - }; - "ecc-jsbn-0.1.1" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; - }; - }; - "bcrypt-pbkdf-1.0.1" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; - }; - }; - "mime-db-1.30.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; - sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; - "block-stream-0.0.9" = { - name = "block-stream"; - packageName = "block-stream"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; - sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; - }; - }; - "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"; - }; - }; - "biased-opener-0.2.8" = { - name = "biased-opener"; - packageName = "biased-opener"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/biased-opener/-/biased-opener-0.2.8.tgz"; - sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; - }; - }; - "express-4.16.2" = { - name = "express"; - packageName = "express"; - version = "4.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.2.tgz"; - sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"; - }; - }; - "rc-1.2.2" = { - name = "rc"; - packageName = "rc"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz"; - sha1 = "d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"; - }; - }; - "serve-favicon-2.4.5" = { - name = "serve-favicon"; - packageName = "serve-favicon"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz"; - sha512 = "2gn8a5l0hh655cxq2cvvar6k1hl8cpmagplavx6svjiz9kmi968nwbzhpc2fvpcpmsfqb8s5jjq0gvn8vwwc2lx3cj57ckbcf3prcdk"; - }; - }; - "strong-data-uri-1.0.4" = { - name = "strong-data-uri"; - packageName = "strong-data-uri"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.4.tgz"; - sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0"; - }; - }; - "v8-debug-1.0.1" = { - name = "v8-debug"; - packageName = "v8-debug"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz"; - sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe"; - }; - }; - "v8-profiler-5.7.0" = { - name = "v8-profiler"; - packageName = "v8-profiler"; - version = "5.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz"; - sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d"; - }; - }; - "ws-1.1.5" = { - name = "ws"; - packageName = "ws"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; - sha512 = "3iv2yz706h7wyg563jsfjdykkkxs8j49vz60r6qx5by0npfhs98rgc114kdqs15sc52mldscc22bkfpkrs08cwlqaxx8lfdjn5alwm3"; - }; - }; - "yargs-3.32.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.32.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; - sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; - }; - }; - "browser-launcher2-0.4.6" = { - name = "browser-launcher2"; - packageName = "browser-launcher2"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz"; - sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; - }; - }; - "x-default-browser-0.3.1" = { - name = "x-default-browser"; - packageName = "x-default-browser"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.1.tgz"; - sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; - }; - }; - "headless-0.1.7" = { - name = "headless"; - packageName = "headless"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/headless/-/headless-0.1.7.tgz"; - sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8"; - }; - }; - "lodash-2.4.2" = { - name = "lodash"; - packageName = "lodash"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; - }; - }; - "plist-1.2.0" = { - name = "plist"; - packageName = "plist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz"; - sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; - }; - }; - "win-detect-browsers-1.0.2" = { - name = "win-detect-browsers"; - packageName = "win-detect-browsers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz"; - sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0"; - }; - }; - "uid-0.0.2" = { - name = "uid"; - packageName = "uid"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz"; - sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; - }; - }; - "rimraf-2.2.8" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }; - }; - "base64-js-0.0.8" = { - name = "base64-js"; - packageName = "base64-js"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; - sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; - }; - }; - "xmlbuilder-4.0.0" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz"; - sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; - }; - }; - "xmldom-0.1.27" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.27"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"; - sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; - }; - }; - "lodash-3.10.1" = { - name = "lodash"; - packageName = "lodash"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; - sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; - }; - }; - "after-0.8.2" = { - name = "after"; - packageName = "after"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; - sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; - }; - }; - "yargs-1.3.3" = { - name = "yargs"; - packageName = "yargs"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; - sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; - }; - }; - "default-browser-id-1.0.4" = { - name = "default-browser-id"; - packageName = "default-browser-id"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.4.tgz"; - sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a"; - }; - }; - "bplist-parser-0.1.1" = { - name = "bplist-parser"; - packageName = "bplist-parser"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz"; - sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; - }; - }; - "meow-3.7.0" = { - name = "meow"; - packageName = "meow"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; - sha1 = "72cb668b425228290abbfa856892587308a801fb"; - }; - }; - "untildify-2.1.0" = { - name = "untildify"; - packageName = "untildify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz"; - sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; - }; - }; - "big-integer-1.6.25" = { - name = "big-integer"; - packageName = "big-integer"; - version = "1.6.25"; - src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.25.tgz"; - sha1 = "1de45a9f57542ac20121c682f8d642220a34e823"; - }; - }; - "camelcase-keys-2.1.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; - sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - }; - "normalize-package-data-2.4.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; - }; - }; - "read-pkg-up-1.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; - }; - }; - "redent-1.0.0" = { - name = "redent"; - packageName = "redent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; - }; - }; - "trim-newlines-1.0.0" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; - }; - }; - "camelcase-2.1.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; - sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; - }; - }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; - }; - }; - "array-find-index-1.0.2" = { - name = "array-find-index"; - packageName = "array-find-index"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; - sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; - }; - }; - "hosted-git-info-2.5.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; - }; - }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; - "validate-npm-package-license-3.0.1" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; - }; - }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; - }; - }; - "spdx-expression-parse-1.0.4" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; - }; - }; - "spdx-license-ids-1.2.2" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; - }; - }; - "find-up-1.1.2" = { - name = "find-up"; - packageName = "find-up"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; - }; - }; - "read-pkg-1.1.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; - }; - }; - "path-exists-2.1.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "load-json-file-1.1.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; - }; - }; - "path-type-1.1.0" = { - name = "path-type"; - packageName = "path-type"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; - }; - }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - }; - "strip-bom-2.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; - }; - }; - "error-ex-1.3.1" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; - sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - }; - "indent-string-2.1.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; - }; - }; - "strip-indent-1.0.1" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; - }; - }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; - "accepts-1.3.4" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; - sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; - }; - }; - "body-parser-1.18.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; - sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; - }; - }; - "content-disposition-0.5.2" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; - }; - }; - "content-type-1.0.4" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; - }; - }; - "cookie-0.3.1" = { - name = "cookie"; - packageName = "cookie"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; - sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; - }; - }; - "depd-1.1.1" = { - name = "depd"; - packageName = "depd"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; - sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; - }; - }; - "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"; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; - }; - }; - "finalhandler-1.1.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; - sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; - }; - }; - "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"; - }; - }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; - }; - }; - "parseurl-1.3.2" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; - sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; - }; - }; - "proxy-addr-2.0.2" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz"; - sha1 = "6571504f47bb988ec8180253f85dd7e14952bdec"; - }; - }; - "range-parser-1.2.0" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; - sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; - }; - }; - "send-0.16.1" = { - name = "send"; - packageName = "send"; - version = "0.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.16.1.tgz"; - sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j"; - }; - }; - "serve-static-1.13.1" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz"; - sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5"; - }; - }; - "setprototypeof-1.1.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; - }; - }; - "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.15"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; - sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; - }; - }; - "negotiator-0.6.1" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; - }; - }; - "http-errors-1.6.2" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; - sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; - }; - }; - "iconv-lite-0.4.19" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; - }; - }; - "raw-body-2.3.2" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; - sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; - }; - }; - "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"; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; - }; - }; - "forwarded-0.1.2" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; - }; - }; - "ipaddr.js-1.5.2" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz"; - sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0"; - }; - }; - "destroy-1.0.4" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; - }; - }; - "mime-1.4.1" = { - name = "mime"; - packageName = "mime"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - }; - "deep-extend-0.4.2" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; - sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; - }; - }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; - }; - }; - "truncate-1.0.5" = { - name = "truncate"; - packageName = "truncate"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz"; - sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28"; - }; - }; - "nan-2.7.0" = { - name = "nan"; - packageName = "nan"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz"; - sha1 = "d95bf721ec877e08db276ed3fc6eb78f9083ad46"; - }; - }; - "node-pre-gyp-0.6.39" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.39"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; - }; - }; - "semver-5.4.1" = { - name = "semver"; - packageName = "semver"; - version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; - }; - }; - "detect-libc-1.0.2" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz"; - sha1 = "71ad5d204bf17a6a6ca8f450c61454066ef461e1"; - }; - }; - "tar-pack-3.4.1" = { - name = "tar-pack"; - packageName = "tar-pack"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; - sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; - }; - }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; - }; - }; - "form-data-2.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; - sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; - }; - }; - "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"; - }; - }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; - }; - }; - "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.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; - }; - }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; - }; - }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - }; - "fstream-ignore-1.0.5" = { - name = "fstream-ignore"; - packageName = "fstream-ignore"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; - sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; - }; - }; - "uid-number-0.0.6" = { - name = "uid-number"; - packageName = "uid-number"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; - sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; - }; - }; - "options-0.0.6" = { - name = "options"; - packageName = "options"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; - }; - }; - "ultron-1.0.2" = { - name = "ultron"; - packageName = "ultron"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; - }; - }; - "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"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; - 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"; - }; - }; - "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"; - }; - }; - "async-2.1.2" = { - name = "async"; - packageName = "async"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; - sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; - }; - }; - "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"; - }; - }; - "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.41" = { - name = "node-appc"; - packageName = "node-appc"; - version = "0.2.41"; - src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz"; - sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "temp-0.8.3" = { - name = "temp"; - packageName = "temp"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz"; - sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; - }; - }; - "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"; - }; - }; - "fs-extra-2.1.2" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; - sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; - }; - }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; - }; - }; - "colors-0.6.2" = { - name = "colors"; - packageName = "colors"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }; - }; - "keypress-0.2.1" = { - name = "keypress"; - packageName = "keypress"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; - sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "async-2.1.4" = { - name = "async"; - packageName = "async"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz"; - sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "optimist-0.6.1" = { - name = "optimist"; - packageName = "optimist"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - }; - "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"; - }; - }; - "uglify-js-2.7.5" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; - sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; - }; - }; - "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"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }; - }; - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - }; - "source-map-0.5.7" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; - }; - }; - "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"; - }; - }; - "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"; - 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"; - }; - }; - "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"; - }; - }; - "caseless-0.11.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; - }; - }; - "har-validator-2.0.6" = { - name = "har-validator"; - packageName = "har-validator"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; - }; - }; - "qs-6.3.2" = { - name = "qs"; - packageName = "qs"; - version = "6.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; - sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; - }; - }; - "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"; - }; - }; - "commander-2.11.0" = { - name = "commander"; - packageName = "commander"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; - sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; - }; - }; - "is-my-json-valid-2.16.1" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz"; - sha512 = "2wmvqb2vfzjbnd2znxkg4sqpksxb9mi1lbr4r5zv535ykxzfv8dbnafra1lhk415wrbg9r1lfhyimcw5xfj3k4ry7inbmcjlnr4zj51"; - }; - }; - "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"; - }; - }; - "async-1.0.0" = { - name = "async"; - packageName = "async"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; - sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; - }; - }; - "colors-1.0.3" = { - name = "colors"; - packageName = "colors"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; - }; - }; - "cycle-1.0.3" = { - name = "cycle"; - packageName = "cycle"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - }; - "eyes-0.1.8" = { - name = "eyes"; - packageName = "eyes"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - }; - "pkginfo-0.3.1" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; - }; - }; - "stack-trace-0.0.10" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; - }; - }; - "jsonfile-2.4.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; - }; - }; - }; -in -{ - coffee-script = nodeEnv.buildNodePackage { - name = "coffee-script"; - packageName = "coffee-script"; - version = "1.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; - license = "MIT"; - }; - production = true; - }; - grunt-cli = nodeEnv.buildNodePackage { - name = "grunt-cli"; - packageName = "grunt-cli"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz"; - sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; - }; - dependencies = [ - (sources."findup-sync-0.3.0" // { - dependencies = [ - (sources."glob-5.0.15" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - 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."grunt-known-options-1.1.0" - (sources."nopt-3.0.6" // { - dependencies = [ - sources."abbrev-1.1.1" - ]; - }) - sources."resolve-1.1.7" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The grunt command line interface"; - homepage = "https://github.com/gruntjs/grunt-cli#readme"; - license = "MIT"; - }; - production = true; - }; - gulp = nodeEnv.buildNodePackage { - name = "gulp"; - packageName = "gulp"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; - sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; - }; - dependencies = [ - sources."archy-1.0.0" - (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."deprecated-0.0.1" - (sources."gulp-util-3.0.8" // { - dependencies = [ - sources."array-differ-1.0.0" - sources."array-uniq-1.0.3" - sources."beeper-1.1.1" - sources."dateformat-2.2.0" - (sources."fancy-log-1.3.0" // { - dependencies = [ - sources."time-stamp-1.1.0" - ]; - }) - (sources."gulplog-1.0.0" // { - dependencies = [ - (sources."glogg-1.0.0" // { - dependencies = [ - sources."sparkles-1.0.0" - ]; - }) - ]; - }) - (sources."has-gulplog-0.1.0" // { - dependencies = [ - sources."sparkles-1.0.0" - ]; - }) - sources."lodash._reescape-3.0.0" - sources."lodash._reevaluate-3.0.0" - sources."lodash._reinterpolate-3.0.0" - (sources."lodash.template-3.6.2" // { - dependencies = [ - sources."lodash._basecopy-3.0.1" - sources."lodash._basetostring-3.0.1" - sources."lodash._basevalues-3.0.0" - sources."lodash._isiterateecall-3.0.9" - (sources."lodash.escape-3.2.0" // { - dependencies = [ - sources."lodash._root-3.0.1" - ]; - }) - (sources."lodash.keys-3.1.2" // { - dependencies = [ - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - ]; - }) - sources."lodash.restparam-3.6.1" - sources."lodash.templatesettings-3.1.1" - ]; - }) - (sources."multipipe-0.1.2" // { - dependencies = [ - (sources."duplexer2-0.0.2" // { - dependencies = [ - (sources."readable-stream-1.1.14" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."inherits-2.0.3" - ]; - }) - ]; - }) - ]; - }) - sources."object-assign-3.0.0" - sources."replace-ext-0.0.1" - (sources."through2-2.0.3" // { - dependencies = [ - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."xtend-4.0.1" - ]; - }) - (sources."vinyl-0.5.3" // { - dependencies = [ - sources."clone-1.0.3" - sources."clone-stats-0.0.1" - ]; - }) - ]; - }) - sources."interpret-1.0.4" - (sources."liftoff-2.3.0" // { - dependencies = [ - sources."extend-3.0.1" - (sources."findup-sync-0.4.3" // { - dependencies = [ - (sources."detect-file-0.1.0" // { - dependencies = [ - sources."fs-exists-sync-0.1.0" - ]; - }) - (sources."is-glob-2.0.1" // { - dependencies = [ - sources."is-extglob-1.0.0" - ]; - }) - (sources."micromatch-2.3.11" // { - dependencies = [ - (sources."arr-diff-2.0.0" // { - dependencies = [ - sources."arr-flatten-1.1.0" - ]; - }) - sources."array-unique-0.2.1" - (sources."braces-1.8.5" // { - dependencies = [ - (sources."expand-range-1.8.2" // { - dependencies = [ - (sources."fill-range-2.2.3" // { - dependencies = [ - sources."is-number-2.1.0" - (sources."isobject-2.1.0" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) - (sources."randomatic-1.1.7" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."kind-of-4.0.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."repeat-string-1.6.1" - ]; - }) - ]; - }) - sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - ]; - }) - (sources."expand-brackets-0.1.5" // { - dependencies = [ - sources."is-posix-bracket-0.1.1" - ]; - }) - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - (sources."normalize-path-2.1.1" // { - dependencies = [ - sources."remove-trailing-separator-1.1.0" - ]; - }) - (sources."object.omit-2.0.1" // { - dependencies = [ - (sources."for-own-0.1.5" // { - dependencies = [ - sources."for-in-1.0.2" - ]; - }) - sources."is-extendable-0.1.1" - ]; - }) - (sources."parse-glob-3.0.4" // { - dependencies = [ - (sources."glob-base-0.3.0" // { - dependencies = [ - sources."glob-parent-2.0.0" - ]; - }) - sources."is-dotfile-1.0.3" - ]; - }) - (sources."regex-cache-0.4.4" // { - dependencies = [ - (sources."is-equal-shallow-0.1.3" // { - dependencies = [ - sources."is-primitive-2.0.0" - ]; - }) - ]; - }) - ]; - }) - (sources."resolve-dir-0.1.1" // { - dependencies = [ - (sources."expand-tilde-1.2.2" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - (sources."global-modules-0.2.3" // { - dependencies = [ - (sources."global-prefix-0.1.5" // { - dependencies = [ - (sources."homedir-polyfill-1.0.1" // { - dependencies = [ - sources."parse-passwd-1.0.0" - ]; - }) - sources."ini-1.3.4" - (sources."which-1.3.0" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - ]; - }) - sources."is-windows-0.2.0" - ]; - }) - ]; - }) - ]; - }) - (sources."fined-1.1.0" // { - dependencies = [ - (sources."expand-tilde-2.0.2" // { - dependencies = [ - (sources."homedir-polyfill-1.0.1" // { - dependencies = [ - sources."parse-passwd-1.0.0" - ]; - }) - ]; - }) - (sources."is-plain-object-2.0.4" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."object.defaults-1.1.0" // { - dependencies = [ - sources."array-each-1.0.1" - sources."array-slice-1.0.0" - (sources."for-own-1.0.0" // { - dependencies = [ - sources."for-in-1.0.2" - ]; - }) - sources."isobject-3.0.1" - ]; - }) - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."parse-filepath-1.0.1" // { - dependencies = [ - (sources."is-absolute-0.2.6" // { - dependencies = [ - (sources."is-relative-0.2.1" // { - dependencies = [ - (sources."is-unc-path-0.1.2" // { - dependencies = [ - sources."unc-path-regex-0.1.2" - ]; - }) - ]; - }) - sources."is-windows-0.2.0" - ]; - }) - sources."map-cache-0.2.2" - (sources."path-root-0.1.1" // { - dependencies = [ - sources."path-root-regex-0.1.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.5.0" // { - dependencies = [ - sources."path-parse-1.0.5" - ]; - }) - ]; - }) - sources."minimist-1.2.0" - (sources."orchestrator-0.3.8" // { - dependencies = [ - (sources."end-of-stream-0.1.5" // { - dependencies = [ - (sources."once-1.3.3" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - sources."sequencify-0.0.7" - sources."stream-consume-0.1.0" - ]; - }) - sources."pretty-hrtime-1.0.3" - sources."semver-4.3.6" - (sources."tildify-1.2.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - (sources."v8flags-2.1.1" // { - dependencies = [ - sources."user-home-1.1.1" - ]; - }) - (sources."vinyl-fs-0.3.14" // { - dependencies = [ - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.3" - ]; - }) - (sources."glob-stream-3.1.18" // { - dependencies = [ - (sources."glob-4.5.3" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - (sources."minimatch-2.0.10" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - sources."ordered-read-streams-0.1.0" - (sources."glob2base-0.0.12" // { - dependencies = [ - sources."find-index-0.1.1" - ]; - }) - sources."unique-stream-1.0.0" - ]; - }) - (sources."glob-watcher-0.0.6" // { - dependencies = [ - (sources."gaze-0.5.2" // { - dependencies = [ - (sources."globule-0.1.0" // { - dependencies = [ - sources."lodash-1.0.2" - (sources."glob-3.1.21" // { - dependencies = [ - sources."graceful-fs-1.2.3" - sources."inherits-1.0.2" - ]; - }) - (sources."minimatch-0.2.14" // { - dependencies = [ - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."graceful-fs-3.0.11" // { - dependencies = [ - sources."natives-1.1.0" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."strip-bom-1.0.0" // { - dependencies = [ - sources."first-chunk-stream-1.0.0" - sources."is-utf8-0.2.1" - ]; - }) - (sources."through2-0.6.5" // { - dependencies = [ - (sources."readable-stream-1.0.34" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."inherits-2.0.3" - ]; - }) - sources."xtend-4.0.1" - ]; - }) - (sources."vinyl-0.4.6" // { - dependencies = [ - sources."clone-0.2.0" - sources."clone-stats-0.0.1" - ]; - }) - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The streaming build system"; - homepage = http://gulpjs.com/; - license = "MIT"; - }; - production = true; - }; - node-gyp = nodeEnv.buildNodePackage { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; - sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; - }; - dependencies = [ - (sources."fstream-1.0.11" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - sources."graceful-fs-4.1.11" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-3.0.6" // { - dependencies = [ - sources."abbrev-1.1.1" - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.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" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - (sources."request-2.83.0" // { - dependencies = [ - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.3.1" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-5.0.3" // { - dependencies = [ - (sources."ajv-5.3.0" // { - dependencies = [ - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - ]; - }) - sources."har-schema-2.0.0" - ]; - }) - (sources."hawk-6.0.2" // { - dependencies = [ - sources."hoek-4.2.0" - sources."boom-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."sntp-2.1.0" - ]; - }) - (sources."http-signature-1.2.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - 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.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."qs-6.5.1" - sources."safe-buffer-5.1.1" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - ]; - }) - sources."rimraf-2.6.2" - sources."semver-5.3.0" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - sources."inherits-2.0.3" - ]; - }) - (sources."which-1.3.0" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js native addon build tool"; - homepage = "https://github.com/nodejs/node-gyp#readme"; - license = "MIT"; - }; - production = true; - }; - node-inspector = nodeEnv.buildNodePackage { - name = "node-inspector"; - packageName = "node-inspector"; - version = "1.1.1"; - src = fetchurl { - 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" // { - dependencies = [ - (sources."browser-launcher2-0.4.6" // { - dependencies = [ - sources."headless-0.1.7" - sources."lodash-2.4.2" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - (sources."plist-1.2.0" // { - dependencies = [ - sources."base64-js-0.0.8" - (sources."xmlbuilder-4.0.0" // { - dependencies = [ - sources."lodash-3.10.1" - ]; - }) - sources."xmldom-0.1.27" - sources."util-deprecate-1.0.2" - ]; - }) - (sources."win-detect-browsers-1.0.2" // { - dependencies = [ - sources."after-0.8.2" - sources."xtend-4.0.1" - sources."yargs-1.3.3" - ]; - }) - sources."uid-0.0.2" - sources."rimraf-2.2.8" - ]; - }) - sources."minimist-1.2.0" - (sources."x-default-browser-0.3.1" // { - dependencies = [ - (sources."default-browser-id-1.0.4" // { - dependencies = [ - (sources."bplist-parser-0.1.1" // { - dependencies = [ - sources."big-integer-1.6.25" - ]; - }) - (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."normalize-package-data-2.4.0" // { - dependencies = [ - sources."hosted-git-info-2.5.0" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - (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."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.1" // { - 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."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."redent-1.0.0" // { - dependencies = [ - (sources."indent-string-2.1.0" // { - dependencies = [ - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."strip-indent-1.0.1" // { - dependencies = [ - sources."get-stdin-4.0.1" - ]; - }) - ]; - }) - sources."trim-newlines-1.0.0" - ]; - }) - (sources."untildify-2.1.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - (sources."express-4.16.2" // { - dependencies = [ - (sources."accepts-1.3.4" // { - dependencies = [ - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."negotiator-0.6.1" - ]; - }) - sources."array-flatten-1.1.1" - (sources."body-parser-1.18.2" // { - dependencies = [ - sources."bytes-3.0.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."unpipe-1.0.0" - ]; - }) - ]; - }) - sources."content-disposition-0.5.2" - sources."content-type-1.0.4" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."depd-1.1.1" - sources."encodeurl-1.0.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - (sources."finalhandler-1.1.0" // { - dependencies = [ - sources."unpipe-1.0.0" - ]; - }) - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - (sources."proxy-addr-2.0.2" // { - dependencies = [ - sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" - ]; - }) - sources."qs-6.5.1" - sources."range-parser-1.2.0" - sources."safe-buffer-5.1.1" - (sources."send-0.16.1" // { - dependencies = [ - sources."destroy-1.0.4" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" - ]; - }) - sources."mime-1.4.1" - sources."ms-2.0.0" - ]; - }) - sources."serve-static-1.13.1" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" - (sources."type-is-1.6.15" // { - dependencies = [ - sources."media-typer-0.3.0" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - ]; - }) - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - ]; - }) - (sources."glob-5.0.15" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - 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."rc-1.2.2" // { - dependencies = [ - sources."deep-extend-0.4.2" - sources."ini-1.3.4" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."semver-4.3.6" - (sources."serve-favicon-2.4.5" // { - dependencies = [ - sources."etag-1.8.1" - sources."fresh-0.5.2" - sources."ms-2.0.0" - sources."parseurl-1.3.2" - sources."safe-buffer-5.1.1" - ]; - }) - (sources."strong-data-uri-1.0.4" // { - dependencies = [ - sources."truncate-1.0.5" - ]; - }) - (sources."v8-debug-1.0.1" // { - dependencies = [ - sources."nan-2.7.0" - (sources."node-pre-gyp-0.6.39" // { - dependencies = [ - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-4.0.1" // { - dependencies = [ - sources."abbrev-1.1.1" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.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" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.8" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - 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.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - 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.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - ]; - }) - (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."rimraf-2.6.2" // { - dependencies = [ - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - ]; - }) - sources."semver-5.4.1" - sources."detect-libc-1.0.2" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - sources."inherits-2.0.3" - ]; - }) - (sources."tar-pack-3.4.1" // { - dependencies = [ - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."uid-number-0.0.6" - ]; - }) - ]; - }) - ]; - }) - (sources."v8-profiler-5.7.0" // { - dependencies = [ - sources."nan-2.7.0" - (sources."node-pre-gyp-0.6.39" // { - dependencies = [ - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-4.0.1" // { - dependencies = [ - sources."abbrev-1.1.1" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.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" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.8" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - 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.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - 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.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - ]; - }) - (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."rimraf-2.6.2" // { - dependencies = [ - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - ]; - }) - sources."semver-5.4.1" - sources."detect-libc-1.0.2" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - sources."inherits-2.0.3" - ]; - }) - (sources."tar-pack-3.4.1" // { - dependencies = [ - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."uid-number-0.0.6" - ]; - }) - ]; - }) - ]; - }) - (sources."which-1.3.0" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - (sources."ws-1.1.5" // { - dependencies = [ - sources."options-0.0.6" - sources."ultron-1.0.2" - ]; - }) - (sources."yargs-3.32.0" // { - dependencies = [ - sources."camelcase-2.1.1" - (sources."cliui-3.2.0" // { - dependencies = [ - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wrap-ansi-2.1.0" - ]; - }) - sources."decamelize-1.2.0" - (sources."os-locale-1.4.0" // { - dependencies = [ - (sources."lcid-1.0.0" // { - dependencies = [ - sources."invert-kv-1.0.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."window-size-0.1.4" - sources."y18n-3.2.1" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; - }; - production = true; - }; - node-pre-gyp = nodeEnv.buildNodePackage { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.39"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; - }; - dependencies = [ - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-4.0.1" // { - dependencies = [ - sources."abbrev-1.1.1" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - (sources."npmlog-4.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.4" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.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" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wide-align-1.1.2" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."rc-1.2.2" // { - dependencies = [ - sources."deep-extend-0.4.2" - sources."ini-1.3.4" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.8" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - 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.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - 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.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - ]; - }) - (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."rimraf-2.6.2" // { - dependencies = [ - (sources."glob-7.1.2" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - 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."semver-5.4.1" - sources."detect-libc-1.0.2" - (sources."tar-2.2.1" // { - dependencies = [ - sources."block-stream-0.0.9" - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - sources."inherits-2.0.3" - ]; - }) - (sources."tar-pack-3.4.1" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - (sources."fstream-1.0.11" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."inherits-2.0.3" - (sources."minimatch-3.0.4" // { - dependencies = [ - (sources."brace-expansion-1.1.8" // { - dependencies = [ - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."uid-number-0.0.6" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js native addon binary install tool"; - homepage = "https://github.com/mapbox/node-pre-gyp#readme"; - license = "BSD-3-Clause"; - }; - production = true; - }; - npm = nodeEnv.buildNodePackage { - name = "npm"; - packageName = "npm"; - version = "5.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz"; - sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "a package manager for JavaScript"; - homepage = https://docs.npmjs.com/; - license = "Artistic-2.0"; - }; - production = true; - }; - titanium = nodeEnv.buildNodePackage { - name = "titanium"; - packageName = "titanium"; - version = "5.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.14.tgz"; - sha1 = "140bd332624acae65113a3ffec10b8cbb940ad0b"; - }; - dependencies = [ - sources."adm-zip-0.4.7" - (sources."async-2.1.2" // { - dependencies = [ - sources."lodash-4.17.4" - ]; - }) - sources."colors-1.1.2" - (sources."fields-0.1.24" // { - dependencies = [ - sources."colors-0.6.2" - sources."keypress-0.2.1" - ]; - }) - sources."humanize-0.0.9" - (sources."longjohn-0.2.11" // { - dependencies = [ - (sources."source-map-support-0.3.2" // { - dependencies = [ - (sources."source-map-0.1.32" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."moment-2.16.0" - (sources."node-appc-0.2.41" // { - dependencies = [ - (sources."async-2.1.4" // { - dependencies = [ - sources."lodash-4.17.4" - ]; - }) - sources."diff-3.2.0" - sources."node-uuid-1.4.7" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - ]; - }) - sources."wrench-1.5.9" - (sources."uglify-js-2.7.5" // { - dependencies = [ - sources."async-0.2.10" - sources."source-map-0.5.7" - sources."uglify-to-browserify-1.0.2" - (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.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - 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.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - 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."xmldom-0.1.27" - ]; - }) - (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.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - (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."commander-2.11.0" - (sources."is-my-json-valid-2.16.1" // { - 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.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - 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.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."qs-6.3.2" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.4.3" - sources."uuid-3.1.0" - ]; - }) - sources."semver-5.3.0" - sources."sprintf-0.1.5" - (sources."temp-0.8.3" // { - dependencies = [ - sources."os-tmpdir-1.0.2" - sources."rimraf-2.2.8" - ]; - }) - (sources."winston-1.1.2" // { - dependencies = [ - sources."async-1.0.0" - sources."colors-1.0.3" - sources."cycle-1.0.3" - sources."eyes-0.1.8" - sources."isstream-0.1.2" - sources."pkginfo-0.3.1" - sources."stack-trace-0.0.10" - ]; - }) - (sources."fs-extra-2.1.2" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."jsonfile-2.4.0" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Appcelerator Titanium Command line"; - homepage = "https://github.com/appcelerator/titanium#readme"; - license = "Apache-2.0"; - }; - production = true; - }; -} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 0c9fbdbeb8151863eb73316e76877219ccd65303..9b19a4f5a628d3670d0b16d7ef2ce167f50d1df7 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -1,13 +1,20 @@ [ "alloy" +, "asar" , "azure-cli" , "bower" , "bower2nix" , "browserify" , "castnow" +, "clean-css" , "coffee-script" +, "coinmon" +, "configurable-http-proxy" , "cordova" +, "create-react-app" +, "create-react-native-app" , "csslint" +, "dat" , "dhcp" , "dnschain" , "docker-registry-server" @@ -27,22 +34,27 @@ , "gulp" , "hipache" , "htmlhint" +, "html-minifier" , "ionic" , "ios-deploy" , "istanbul" , "javascript-typescript-langserver" , "jayschema" +, "jsdoc" , "jshint" , "json" , "js-beautify" , "jsonlint" , "jsontool" +, "json-diff" , "json-refs" , "json-server" , "js-yaml" , "karma" , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" } , "lerna" +, "less" +, "less-plugin-clean-css" , "lcov-result-merger" , "livedown" , "live-server" @@ -52,6 +64,7 @@ , "nijs" , "node2nix" , "node-gyp" +, "node-gyp-build" , "node-inspector" , "node-pre-gyp" , "nodemon" @@ -60,8 +73,9 @@ , "npm" , { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" } , "npm-check-updates" +, "nsp" , "ocaml-language-server" -, "parsoid" +, { "parsoid": "git://github.com/abbradar/parsoid#stable" } , "peerflix" , "peerflix-server" , "phantomjs" @@ -69,6 +83,7 @@ , "pulp" , "quassel-webserver" , "react-tools" +, "react-native-cli" , "s3http" , "semver" , "serve" @@ -77,16 +92,22 @@ , "sloc" , "smartdc" , "socket.io" +, "stackdriver-statsd-backend" , "statsd" +, "statsd-influxdb-backend" +, "statsd-librato-backend" , "stylus" , "svgo" , "tern" +, "titanium" , "typescript" , "typings" , "uglify-js" , "ungit" +, "vue-cli" , "webdrvr" , "webpack" +, "webtorrent-cli" , "web-ext" , "wring" , "yarn" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 1038ef78b73d594cead3ef92cec9e61c28f8a49f..e5d9ff18eb0dcd1e1feb649f38d80a4c9a3b3be9 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1,799 +1,790 @@ -# This file has been generated by node2nix 1.4.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "async-2.6.0" = { - name = "async"; - packageName = "async"; - version = "2.6.0"; + "@cliqz-oss/firefox-client-0.3.1" = { + name = "_at_cliqz-oss_slash_firefox-client"; + packageName = "@cliqz-oss/firefox-client"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; - sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; + url = "https://registry.npmjs.org/@cliqz-oss/firefox-client/-/firefox-client-0.3.1.tgz"; + sha512 = "0mzrszrx3b26v168dxy14mafp9dnczzl10yrdg203q46xcasi6a668yg2zf3nlzmf4klylfkbca3b3amd0646barp0nkh1zkfi97vs4"; }; }; - "babel-core-6.26.0" = { - name = "babel-core"; - packageName = "babel-core"; - version = "6.26.0"; + "@cliqz-oss/node-firefox-connect-1.2.1" = { + name = "_at_cliqz-oss_slash_node-firefox-connect"; + packageName = "@cliqz-oss/node-firefox-connect"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz"; - sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; + url = "https://registry.npmjs.org/@cliqz-oss/node-firefox-connect/-/node-firefox-connect-1.2.1.tgz"; + sha512 = "2f8l9alm034f4mrp2shf3pgcvm1m9lvbw2n5jpjnnmk6mn36qmwz4hjnrky279z4wnphgr2wv1vksn57w6ncl3cfr13nzv93s435wiv"; }; }; - "babel-generator-6.26.0" = { - name = "babel-generator"; - packageName = "babel-generator"; - version = "6.26.0"; + "@ionic/cli-framework-0.1.3" = { + name = "_at_ionic_slash_cli-framework"; + packageName = "@ionic/cli-framework"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz"; - sha1 = "ac1ae20070b79f6e3ca1d3269613053774f20dc5"; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.1.3.tgz"; + sha512 = "0l4lpl9477wf6i2xzqqqv5lmrmnyf82n0rbww6ynaszyb6cl38m2dpbz4xv0ksy5mayjyfkq6nj7mjzh4cvak12zfwp4cgrrai6ybkg"; }; }; - "babel-traverse-6.26.0" = { - name = "babel-traverse"; - packageName = "babel-traverse"; - version = "6.26.0"; + "@ionic/cli-utils-1.19.2" = { + name = "_at_ionic_slash_cli-utils"; + packageName = "@ionic/cli-utils"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"; - sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.2.tgz"; + sha512 = "10fl86bf0p911b7w0dnz2q3b8092c50h6x8kf79lwg8bg3jnmnmvz0i868xhf7qnawyaikhqdf5nifpb42f9jr3x0mxgmp4ppdwadlx"; }; }; - "babel-types-6.26.0" = { - name = "babel-types"; - packageName = "babel-types"; - version = "6.26.0"; + "@ionic/discover-0.4.0" = { + name = "_at_ionic_slash_discover"; + packageName = "@ionic/discover"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz"; - sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497"; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.4.0.tgz"; + sha512 = "0x6yxaj489n9lbq0kfvdnpj1pacgv3r0vk5cnlla7w1jkvxzwaf0vbcnwd9gdaj6zkq69wm1g4zjvj37pyn1lajjkzl1f50l7cnr2ad"; }; }; - "babylon-6.18.0" = { - name = "babylon"; - packageName = "babylon"; - version = "6.18.0"; + "@sindresorhus/is-0.7.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; - sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb"; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; + sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q"; }; }; - "chmodr-1.0.2" = { - name = "chmodr"; - packageName = "chmodr"; - version = "1.0.2"; + "@types/babel-types-7.0.1" = { + name = "_at_types_slash_babel-types"; + packageName = "@types/babel-types"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"; - sha1 = "04662b932d0f02ec66deaa2b0ea42811968e3eb9"; + url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.1.tgz"; + sha512 = "3bsk1lhqbj6zdrzkmzf9yjr2v77nlaqq1rzsjq8n56k8n0fl3fyxpcanxm3h5yqm6zzfi8qdmdxf5hrvrmg3kwbdspii3kb9y9hwiqj"; }; }; - "colors-0.6.0-1" = { - name = "colors"; - packageName = "colors"; - version = "0.6.0-1"; + "@types/babylon-6.16.2" = { + name = "_at_types_slash_babylon"; + packageName = "@types/babylon"; + version = "6.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz"; - sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"; + url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz"; + sha512 = "3nps6llkag9z58iv9mkg13c2b35ba57z1dmis7900x1dkd09svfn0haxwcgsp4v9xmnqb95v40h3ki4w3xnv68cajsnfscgm7ip56zq"; }; }; - "commander-0.6.1" = { - name = "commander"; - packageName = "commander"; - version = "0.6.1"; + "@types/caseless-0.12.1" = { + name = "_at_types_slash_caseless"; + packageName = "@types/caseless"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; - sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz"; + sha512 = "3ygc8335my77k11wjf0wihzqfsv4fxyfrvb730sx8ab3phx3wc8g4pg3g84h497ipvzk7i9gnwnzrkg68zm6df6wi59y7hdgrmlq68n"; }; }; - "deasync-0.1.10" = { - name = "deasync"; - packageName = "deasync"; - version = "0.1.10"; + "@types/form-data-2.2.1" = { + name = "_at_types_slash_form-data"; + packageName = "@types/form-data"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.10.tgz"; - sha1 = "4e4a6836fbe0477bd5f908308bd2a96557d5d7fe"; + url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz"; + sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "ejs-2.3.4" = { - name = "ejs"; - packageName = "ejs"; - version = "2.3.4"; + "@types/node-8.10.4" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-2.3.4.tgz"; - sha1 = "3c76caa09664b3583b0037af9dc136e79ec68b98"; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.4.tgz"; + sha512 = "345l7fbkr415rdf3p0akk11k8shxibfl77crpj3wd3a8d4lbsdpylfzm8ihkg6wnj88gjpcwy4nw6vb2x58kwx15fbl09bz96dlrahn"; }; }; - "fs-extra-3.0.1" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "3.0.1"; + "@types/node-9.6.2" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "9.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; - sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz"; + sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai"; }; }; - "global-paths-0.1.2" = { - name = "global-paths"; - packageName = "global-paths"; - version = "0.1.2"; + "@types/request-2.47.0" = { + name = "_at_types_slash_request"; + packageName = "@types/request"; + version = "2.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz"; - sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299"; + url = "https://registry.npmjs.org/@types/request/-/request-2.47.0.tgz"; + sha512 = "3jk7nawc1yb26ykdlv3mk1bmdpq2an6krskfj4x46kc9ka9r11ixrivg5zwcm451wlarry8dk36mick3d68w0c85i177ymghzkcr9gw"; }; }; - "jsonlint-1.5.1" = { - name = "jsonlint"; - packageName = "jsonlint"; - version = "1.5.1"; + "@types/tough-cookie-2.3.2" = { + name = "_at_types_slash_tough-cookie"; + packageName = "@types/tough-cookie"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.5.1.tgz"; - sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.2.tgz"; + sha512 = "1nbw2qb74417hfamhd2a4yxf6ls3rjy92lv847mnhj7dxfla54kiwwdi64bnvcn7ysn5spkfakq4ssknb78qgz5nhd926whpdm6drdw"; }; }; - "moment-2.17.1" = { - name = "moment"; - packageName = "moment"; - version = "2.17.1"; + "@types/uuid-3.4.3" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; - sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz"; + sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; }; }; - "node.extend-1.0.10" = { - name = "node.extend"; - packageName = "node.extend"; - version = "1.0.10"; + "CSSselect-0.4.1" = { + name = "CSSselect"; + packageName = "CSSselect"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.10.tgz"; - sha1 = "3269bddf81c54535f408abc784c32b0d2bd55f6f"; + url = "https://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; + sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; }; }; - "pkginfo-0.2.2" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.2.2"; + "CSSwhat-0.4.7" = { + name = "CSSwhat"; + packageName = "CSSwhat"; + version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz"; - sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; + url = "https://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; + sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; }; }; - "resolve-1.5.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.5.0"; + "JSONSelect-0.2.1" = { + name = "JSONSelect"; + packageName = "JSONSelect"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; - sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; + url = "https://registry.npmjs.org/JSONSelect/-/JSONSelect-0.2.1.tgz"; + sha1 = "415418a526d33fe31d74b4defa3c836d485ec203"; }; }; - "source-map-0.1.9" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.9"; + "JSONStream-0.10.0" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz"; - sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz"; + sha1 = "74349d0d89522b71f30f0a03ff9bd20ca6f12ac0"; }; }; - "walk-sync-0.3.2" = { - name = "walk-sync"; - packageName = "walk-sync"; - version = "0.3.2"; + "JSONStream-0.8.4" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz"; - sha512 = "2cycfx3lc52h2684s54pd81wz42f9lbggff4yva194nzr5x8nxp4fl437scd2dayyvxk68v8jmk1k8m364zdh5wmaff1a2bm9b7kh0l"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz"; + sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; }; }; - "xml2tss-0.0.5" = { - name = "xml2tss"; - packageName = "xml2tss"; - version = "0.0.5"; + "JSONStream-1.3.2" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz"; - sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; + sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; }; }; - "xmldom-0.1.19" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.19"; + "JSV-4.0.2" = { + name = "JSV"; + packageName = "JSV"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; - sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; + url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz"; + sha1 = "d077f6825571f82132f9dffaed587b4029feff57"; }; }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; + "abbrev-1.0.9" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"; + sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135"; }; }; - "babel-code-frame-6.26.0" = { - name = "babel-code-frame"; - packageName = "babel-code-frame"; - version = "6.26.0"; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; - sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; - "babel-helpers-6.24.1" = { - name = "babel-helpers"; - packageName = "babel-helpers"; - version = "6.24.1"; + "absolute-0.0.1" = { + name = "absolute"; + packageName = "absolute"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; - sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; + url = "https://registry.npmjs.org/absolute/-/absolute-0.0.1.tgz"; + sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; }; }; - "babel-messages-6.23.0" = { - name = "babel-messages"; - packageName = "babel-messages"; - version = "6.23.0"; + "abstract-leveldown-0.12.4" = { + name = "abstract-leveldown"; + packageName = "abstract-leveldown"; + version = "0.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; - sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz"; + sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; }; }; - "babel-register-6.26.0" = { - name = "babel-register"; - packageName = "babel-register"; - version = "6.26.0"; + "abstract-random-access-1.1.2" = { + name = "abstract-random-access"; + packageName = "abstract-random-access"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"; - sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; + url = "https://registry.npmjs.org/abstract-random-access/-/abstract-random-access-1.1.2.tgz"; + sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "babel-runtime-6.26.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.26.0"; + "accepts-1.2.13" = { + name = "accepts"; + packageName = "accepts"; + version = "1.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; + sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; }; - "babel-template-6.26.0" = { - name = "babel-template"; - packageName = "babel-template"; - version = "6.26.0"; + "accepts-1.3.3" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"; - sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; + sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; }; }; - "convert-source-map-1.5.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.5.0"; + "accepts-1.3.5" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; - sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz"; + sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; }; }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; + "acorn-1.2.2" = { + name = "acorn"; + packageName = "acorn"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; + sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; }; }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; + "acorn-2.7.0" = { + name = "acorn"; + packageName = "acorn"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; + sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; }; }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; + "acorn-3.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; }; }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; + "acorn-4.0.13" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"; + sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; - "private-0.1.8" = { - name = "private"; - packageName = "private"; - version = "0.1.8"; + "acorn-5.5.3" = { + name = "acorn"; + packageName = "acorn"; + version = "5.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; - sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz"; + sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld"; }; }; - "slash-1.0.0" = { - name = "slash"; - packageName = "slash"; - version = "1.0.0"; + "acorn-dynamic-import-3.0.0" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; - sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz"; + sha512 = "1d15axgran5kql29v8hk39yifs5zcg7rkffakv4nd3k49jpbzxh030nbsh9q31gnw8n3rfmwpmsq7rq9k9sk2p2l14wk2i5kzqramfd"; }; }; - "source-map-0.5.7" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.7"; + "acorn-globals-1.0.9" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz"; + sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; }; }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; + "acorn-globals-3.1.0" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz"; + sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf"; }; }; - "esutils-2.0.2" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.2"; + "acorn-jsx-3.0.1" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; - sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; + sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; - "js-tokens-3.0.2" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "3.0.2"; + "acorn-node-1.3.0" = { + name = "acorn-node"; + packageName = "acorn-node"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; - sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz"; + sha512 = "0pxd0cjsh0kdh8nxcpm000fcsgwmr8b13gyxkac8yxzz9a5wblqka5crksicnx8mqwy499k1jryr83bjzb3355xikgs5mfxgpigkwvr"; }; }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; + "active-x-obfuscator-0.0.1" = { + name = "active-x-obfuscator"; + packageName = "active-x-obfuscator"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + url = "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"; + sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a"; }; }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; + "adal-node-0.1.21" = { + name = "adal-node"; + packageName = "adal-node"; + version = "0.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.21.tgz"; + sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8"; }; }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; + "adal-node-0.1.28" = { + name = "adal-node"; + packageName = "adal-node"; + version = "0.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.28.tgz"; + sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485"; }; }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; + "adbkit-2.11.0" = { + name = "adbkit"; + packageName = "adbkit"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + url = "https://registry.npmjs.org/adbkit/-/adbkit-2.11.0.tgz"; + sha512 = "1yf29dq993f047nmbm3yv9qsla7z3s9xn61jh43lzlgbpcxw36p2jn1ahv53i8ik69fkb5l7mqi6r1xm6qfzagz0jm2i64r8y2d8swg"; }; }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; + "adbkit-logcat-1.1.0" = { + name = "adbkit-logcat"; + packageName = "adbkit-logcat"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + url = "https://registry.npmjs.org/adbkit-logcat/-/adbkit-logcat-1.1.0.tgz"; + sha1 = "01d7f9b0cef9093a30bcb3b007efff301508962f"; }; }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; + "adbkit-monkey-1.0.1" = { + name = "adbkit-monkey"; + packageName = "adbkit-monkey"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + url = "https://registry.npmjs.org/adbkit-monkey/-/adbkit-monkey-1.0.1.tgz"; + sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "core-js-2.5.1" = { - name = "core-js"; - packageName = "core-js"; - version = "2.5.1"; + "add-stream-1.0.0" = { + name = "add-stream"; + packageName = "add-stream"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz"; - sha1 = "ae6874dc66937789b80754ff5428df66819ca50b"; + url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"; + sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "home-or-tmp-2.0.0" = { - name = "home-or-tmp"; - packageName = "home-or-tmp"; - version = "2.0.0"; + "addons-linter-0.41.0" = { + name = "addons-linter"; + packageName = "addons-linter"; + version = "0.41.0"; src = fetchurl { - url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; - sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.41.0.tgz"; + sha512 = "1cdq1s3zaz5547yn12h23434f3g6jjchrjdwv7x0qbg38zilaix5x04ajy87pw94rs1mk6kkawa517whzjn0jd7kpx6nac75qw7rcwf"; }; }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; + "addr-to-ip-port-1.4.3" = { + name = "addr-to-ip-port"; + packageName = "addr-to-ip-port"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.3.tgz"; + sha512 = "0cjsq4lq001pd9nr0j7lc41vxyrf0x9qpaq8d8989n1grjzzbv8vjdq9l607ab8pgfh1qkx0vhgva4wsnfndkb2c955f04jq8dx78gq"; }; }; - "source-map-support-0.4.18" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.4.18"; + "address-1.0.3" = { + name = "address"; + packageName = "address"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"; - sha512 = "1n37icn5xpsxs2x8szv6ifajjf066fskm04xn6agr79sid57n0yws4n0cis7m9q5hr0hxzr8dv2fnmmpgb4mvz8kiyv2g5ikbyb9g5n"; + url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz"; + sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng"; }; }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; + "addressparser-0.3.2" = { + name = "addressparser"; + packageName = "addressparser"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; + sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; }; }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; + "addressparser-1.0.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; + sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; }; }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; + "adm-zip-0.4.7" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; + sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; }; }; - "regenerator-runtime-0.11.0" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.11.0"; + "after-0.8.1" = { + name = "after"; + packageName = "after"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"; - sha512 = "3a1pn2aankj443h5v8png8dbgrlyb7fcdn66vjglxwqvdpivpq959qsl2n44i6zwf1k5y6y23xwhim0x077yy275dyr6vwiny83987x"; + url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz"; + sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; }; }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; + "after-0.8.2" = { + name = "after"; + packageName = "after"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; + sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; }; }; - "brace-expansion-1.1.8" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.8"; + "agent-base-2.1.1" = { + name = "agent-base"; + packageName = "agent-base"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; + sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; }; }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; + "agent-base-4.2.0" = { + name = "agent-base"; + packageName = "agent-base"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz"; + sha512 = "0i6q0c347f7z5c56gi1cggjiwvdhl3p9zfsysq66gqggk3prlqildnpva900rz8f8gfc8rav8jk7m51z9dhias0z7v3rnzyjm9pzr3k"; }; }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "detect-indent-4.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "4.0.0"; + "aggregate-error-1.0.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz"; + sha1 = "888344dad0220a72e3af50906117f48771925fac"; }; }; - "jsesc-1.3.0" = { - name = "jsesc"; - packageName = "jsesc"; - version = "1.3.0"; + "airplay-js-0.2.16" = { + name = "airplay-js"; + packageName = "airplay-js"; + version = "0.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; - sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; + url = "https://registry.npmjs.org/airplay-js/-/airplay-js-0.2.16.tgz"; + sha1 = "48566d5fa55a921d80187ad946f7e8f7555902a1"; }; }; - "trim-right-1.0.1" = { - name = "trim-right"; - packageName = "trim-right"; - version = "1.0.1"; + "airplay-js-0.3.0" = { + name = "airplay-js"; + packageName = "airplay-js"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + url = "https://registry.npmjs.org/airplay-js/-/airplay-js-0.3.0.tgz"; + sha1 = "16bac2ef91b31249382924bfdeeabaddc9db7398"; }; }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; + "airplay-protocol-2.0.2" = { + name = "airplay-protocol"; + packageName = "airplay-protocol"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + url = "https://registry.npmjs.org/airplay-protocol/-/airplay-protocol-2.0.2.tgz"; + sha1 = "b5b2a7137331f5545acbe196ba5693c13238fc5e"; }; }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; + "airplayer-2.0.0" = { + name = "airplayer"; + packageName = "airplayer"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + url = "https://registry.npmjs.org/airplayer/-/airplayer-2.0.0.tgz"; + sha1 = "7ab62d23b96d44234138aec1281d2e67ef190259"; }; }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; + "ajv-4.11.8" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; }; }; - "globals-9.18.0" = { - name = "globals"; - packageName = "globals"; - version = "9.18.0"; + "ajv-5.5.2" = { + name = "ajv"; + packageName = "ajv"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; + sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "invariant-2.2.2" = { - name = "invariant"; - packageName = "invariant"; - version = "2.2.2"; + "ajv-6.3.0" = { + name = "ajv"; + packageName = "ajv"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; - sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.3.0.tgz"; + sha1 = "1650a41114ef00574cac10b8032d8f4c14812da7"; }; }; - "loose-envify-1.3.1" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.3.1"; + "ajv-6.4.0" = { + name = "ajv"; + packageName = "ajv"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; - sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz"; + sha1 = "d3aff78e9277549771daf0164cff48482b754fc6"; }; }; - "to-fast-properties-1.0.3" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "1.0.3"; + "ajv-keywords-1.5.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; - sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; + sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; }; }; - "bindings-1.2.1" = { - name = "bindings"; - packageName = "bindings"; - version = "1.2.1"; + "ajv-keywords-2.1.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz"; + sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; - "nan-2.7.0" = { - name = "nan"; - packageName = "nan"; - version = "2.7.0"; + "ajv-keywords-3.1.0" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz"; - sha1 = "d95bf721ec877e08db276ed3fc6eb78f9083ad46"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz"; + sha1 = "ac2b27939c543e95d2c06e7f7f5c27be4aa543be"; }; }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; + "ajv-merge-patch-3.0.0" = { + name = "ajv-merge-patch"; + packageName = "ajv-merge-patch"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/ajv-merge-patch/-/ajv-merge-patch-3.0.0.tgz"; + sha1 = "76f071e391f419fe9fe3fea7e920a1ad824b2b61"; }; }; - "jsonfile-3.0.1" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "3.0.1"; + "aliasify-2.1.0" = { + name = "aliasify"; + packageName = "aliasify"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; - sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + url = "https://registry.npmjs.org/aliasify/-/aliasify-2.1.0.tgz"; + sha1 = "7c30825b9450b9e6185ba27533eaf6e2067d4b42"; }; }; - "universalify-0.1.1" = { - name = "universalify"; - packageName = "universalify"; - version = "0.1.1"; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz"; - sha1 = "fa71badd4437af4c148841e3b3b165f9e9e590b7"; + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; }; }; - "array-unique-0.2.1" = { - name = "array-unique"; - packageName = "array-unique"; - version = "0.2.1"; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"; - sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; - "global-modules-0.2.3" = { - name = "global-modules"; - packageName = "global-modules"; - version = "0.2.3"; + "amqplib-0.5.2" = { + name = "amqplib"; + packageName = "amqplib"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz"; - sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"; + url = "https://registry.npmjs.org/amqplib/-/amqplib-0.5.2.tgz"; + sha512 = "0h54i1d01av3cd2z1hv2nkc5r8za54nmmi2j0678ly7m4w9rr6619b915lgpqapqgakscwpmrav3ni94h34gqhrm53xpjfvlarq5ncp"; }; }; - "is-windows-0.1.1" = { - name = "is-windows"; - packageName = "is-windows"; - version = "0.1.1"; + "anchor-markdown-header-0.5.7" = { + name = "anchor-markdown-header"; + packageName = "anchor-markdown-header"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-0.1.1.tgz"; - sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe"; + url = "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz"; + sha1 = "045063d76e6a1f9cd327a57a0126aa0fdec371a7"; }; }; - "global-prefix-0.1.5" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "0.1.5"; + "ansi-0.3.1" = { + name = "ansi"; + packageName = "ansi"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz"; - sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"; + url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"; + sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; }; }; - "is-windows-0.2.0" = { - name = "is-windows"; - packageName = "is-windows"; - version = "0.2.0"; + "ansi-align-2.0.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz"; - sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"; + sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; }; }; - "homedir-polyfill-1.0.1" = { - name = "homedir-polyfill"; - packageName = "homedir-polyfill"; - version = "1.0.1"; + "ansi-color-0.2.1" = { + name = "ansi-color"; + packageName = "ansi-color"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz"; + sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a"; }; }; - "ini-1.3.4" = { - name = "ini"; - packageName = "ini"; - version = "1.3.4"; + "ansi-diff-stream-1.2.1" = { + name = "ansi-diff-stream"; + packageName = "ansi-diff-stream"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; - sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; + sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix"; }; }; - "which-1.3.0" = { - name = "which"; - packageName = "which"; - version = "1.3.0"; + "ansi-escapes-1.4.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; - sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; }; }; - "parse-passwd-1.0.0" = { - name = "parse-passwd"; - packageName = "parse-passwd"; - version = "1.0.0"; + "ansi-escapes-3.1.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; + sha512 = "1bm72rs09dwjhfif8kqjxnpb5fgmcdgkn5483f11j6791s5161f2kvxy69pkgcq0jdws6kqfmr1bx5189lnvkzgkq851qs3gzq1n02j"; }; }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; + "ansi-gray-0.1.1" = { + name = "ansi-gray"; + packageName = "ansi-gray"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"; + sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; }; }; - "nomnom-1.8.1" = { - name = "nomnom"; - packageName = "nomnom"; - version = "1.8.1"; + "ansi-red-0.1.1" = { + name = "ansi-red"; + packageName = "ansi-red"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz"; - sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; + url = "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz"; + sha1 = "8c638f9d1080800a353c9c28c8a81ca4705d946c"; }; }; - "JSV-4.0.2" = { - name = "JSV"; - packageName = "JSV"; - version = "4.0.2"; + "ansi-regex-0.2.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz"; - sha1 = "d077f6825571f82132f9dffaed587b4029feff57"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; + sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9"; }; }; - "underscore-1.6.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.6.0"; + "ansi-regex-1.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; + sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; }; }; - "chalk-0.4.0" = { - name = "chalk"; - packageName = "chalk"; - version = "0.4.0"; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; - sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; - "has-color-0.1.7" = { - name = "has-color"; - packageName = "has-color"; - version = "0.1.7"; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; - sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; "ansi-styles-1.0.0" = { @@ -805,2101 +796,2218 @@ let sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; }; }; - "strip-ansi-0.1.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "0.1.1"; + "ansi-styles-1.1.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; - sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; + sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de"; }; }; - "is-0.3.0" = { - name = "is"; - packageName = "is"; - version = "0.3.0"; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz"; - sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; - "path-parse-1.0.5" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.5"; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; }; }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; + "ansi-wrap-0.1.0" = { + name = "ansi-wrap"; + packageName = "ansi-wrap"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; + sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; }; }; - "ensure-posix-path-1.0.2" = { - name = "ensure-posix-path"; - packageName = "ensure-posix-path"; - version = "1.0.2"; + "ansicolors-0.3.2" = { + name = "ansicolors"; + packageName = "ansicolors"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz"; - sha1 = "a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2"; + url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; }; }; - "matcher-collection-1.0.5" = { - name = "matcher-collection"; - packageName = "matcher-collection"; - version = "1.0.5"; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz"; - sha512 = "1hfvbsx85xqrw6g0k7rkqwngl8b2nwj92ax10ilx3b4lma2mcp8q6zpvam1sffgqsssa9d13cj7prrzg5c00mf0c8q92w59m36ach4x"; + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; }; }; - "xml2js-0.2.8" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.2.8"; + "anymatch-1.3.2" = { + name = "anymatch"; + packageName = "anymatch"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; - sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; + url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; + sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; }; }; - "sax-0.5.8" = { - name = "sax"; - packageName = "sax"; - version = "0.5.8"; + "anymatch-2.0.0" = { + name = "anymatch"; + packageName = "anymatch"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; - sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; + url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; + sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6"; }; }; - "adal-node-0.1.21" = { - name = "adal-node"; - packageName = "adal-node"; - version = "0.1.21"; + "ap-0.1.0" = { + name = "ap"; + packageName = "ap"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.21.tgz"; - sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8"; + url = "https://registry.npmjs.org/ap/-/ap-0.1.0.tgz"; + sha1 = "d8a3f26615379398a1b53ca6cc1a666a0fbfe150"; }; }; - "async-1.4.2" = { - name = "async"; - packageName = "async"; - version = "1.4.2"; + "apache-crypt-1.2.1" = { + name = "apache-crypt"; + packageName = "apache-crypt"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz"; - sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; + url = "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.1.tgz"; + sha1 = "d6fc72aa6d27d99c95a94fd188d731eefffa663c"; }; }; - "azure-common-0.9.18" = { - name = "azure-common"; - packageName = "azure-common"; - version = "0.9.18"; + "apache-md5-1.1.2" = { + name = "apache-md5"; + packageName = "apache-md5"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz"; - sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd"; + url = "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.2.tgz"; + sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; }; }; - "azure-arm-authorization-2.0.0" = { - name = "azure-arm-authorization"; - packageName = "azure-arm-authorization"; - version = "2.0.0"; + "append-0.1.1" = { + name = "append"; + packageName = "append"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz"; - sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; + url = "https://registry.npmjs.org/append/-/append-0.1.1.tgz"; + sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; }; }; - "azure-arm-cdn-1.0.3" = { - name = "azure-arm-cdn"; - packageName = "azure-arm-cdn"; - version = "1.0.3"; + "append-field-0.1.0" = { + name = "append-field"; + packageName = "append-field"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.3.tgz"; - sha1 = "39db281679dcdd33cb6ce032383b192430476412"; + url = "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz"; + sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; }; }; - "azure-arm-commerce-0.2.0" = { - name = "azure-arm-commerce"; - packageName = "azure-arm-commerce"; - version = "0.2.0"; + "append-tree-2.4.1" = { + name = "append-tree"; + packageName = "append-tree"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz"; - sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; + url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.1.tgz"; + sha512 = "2zb14nlfxs726ng8jhfpf6n9b9kw32smg2krcl0vj90dfrkcc20fm36j2zgdd49b2ln1z4jz2wvvy4qgss14zzfr3rps719h6vlyjg7"; }; }; - "azure-arm-compute-3.0.0-preview" = { - name = "azure-arm-compute"; - packageName = "azure-arm-compute"; - version = "3.0.0-preview"; + "appendable-cli-menu-2.0.0" = { + name = "appendable-cli-menu"; + packageName = "appendable-cli-menu"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-3.0.0-preview.tgz"; - sha1 = "f5f07792afcdff29ce0b7e16705342b6986f571b"; + url = "https://registry.npmjs.org/appendable-cli-menu/-/appendable-cli-menu-2.0.0.tgz"; + sha1 = "dcfca9e509300e4c3b2d467965fe50c56fc75e66"; }; }; - "azure-arm-datalake-analytics-1.0.2-preview" = { - name = "azure-arm-datalake-analytics"; - packageName = "azure-arm-datalake-analytics"; - version = "1.0.2-preview"; + "applicationinsights-0.16.0" = { + name = "applicationinsights"; + packageName = "applicationinsights"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.2-preview.tgz"; - sha1 = "b34f868e98a972ec80e4408d209dc06c000dfb63"; + url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz"; + sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3"; }; }; - "azure-arm-datalake-store-1.0.2-preview" = { - name = "azure-arm-datalake-store"; - packageName = "azure-arm-datalake-store"; - version = "1.0.2-preview"; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.2-preview.tgz"; - sha1 = "c8b7c113016c92703a84dc28d29ba518e8c64763"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; }; }; - "azure-arm-hdinsight-0.2.2" = { - name = "azure-arm-hdinsight"; - packageName = "azure-arm-hdinsight"; - version = "0.2.2"; + "arch-2.1.0" = { + name = "arch"; + packageName = "arch"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz"; - sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d"; + url = "https://registry.npmjs.org/arch/-/arch-2.1.0.tgz"; + sha1 = "3613aa46149064b3c1f0607919bf1d4786e82889"; }; }; - "azure-arm-hdinsight-jobs-0.1.0" = { - name = "azure-arm-hdinsight-jobs"; - packageName = "azure-arm-hdinsight-jobs"; - version = "0.1.0"; + "archiver-2.1.1" = { + name = "archiver"; + packageName = "archiver"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-hdinsight-jobs/-/azure-arm-hdinsight-jobs-0.1.0.tgz"; - sha1 = "252938f18d4341adf9942261656e791490c3c220"; + url = "https://registry.npmjs.org/archiver/-/archiver-2.1.1.tgz"; + sha1 = "ff662b4a78201494a3ee544d3a33fe7496509ebc"; }; }; - "azure-arm-insights-0.11.3" = { - name = "azure-arm-insights"; - packageName = "azure-arm-insights"; - version = "0.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-insights/-/azure-arm-insights-0.11.3.tgz"; - sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; - }; - }; - "azure-arm-iothub-1.0.1-preview" = { - name = "azure-arm-iothub"; - packageName = "azure-arm-iothub"; - version = "1.0.1-preview"; + "archiver-utils-1.3.0" = { + name = "archiver-utils"; + packageName = "archiver-utils"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-1.0.1-preview.tgz"; - sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91"; + url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz"; + sha1 = "e50b4c09c70bf3d680e32ff1b7994e9f9d895174"; }; }; - "azure-arm-servermanagement-0.1.2" = { - name = "azure-arm-servermanagement"; - packageName = "azure-arm-servermanagement"; - version = "0.1.2"; + "archy-1.0.0" = { + name = "archy"; + packageName = "archy"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-0.1.2.tgz"; - sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; + url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; }; }; - "azure-arm-network-3.0.0" = { - name = "azure-arm-network"; - packageName = "azure-arm-network"; - version = "3.0.0"; + "are-we-there-yet-1.1.4" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-3.0.0.tgz"; - sha1 = "66ec5b195a1af805a5b1727f65feac2bb7cd7951"; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; + sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; }; }; - "azure-arm-powerbiembedded-0.1.0" = { - name = "azure-arm-powerbiembedded"; - packageName = "azure-arm-powerbiembedded"; - version = "0.1.0"; + "argparse-0.1.15" = { + name = "argparse"; + packageName = "argparse"; + version = "0.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.0.tgz"; - sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; + url = "https://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; + sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; }; }; - "azure-arm-trafficmanager-1.1.0-preview" = { - name = "azure-arm-trafficmanager"; - packageName = "azure-arm-trafficmanager"; - version = "1.1.0-preview"; + "argparse-0.1.16" = { + name = "argparse"; + packageName = "argparse"; + version = "0.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-1.1.0-preview.tgz"; - sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50"; + url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; + sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; }; }; - "azure-arm-dns-0.11.1" = { - name = "azure-arm-dns"; - packageName = "azure-arm-dns"; - version = "0.11.1"; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.11.1.tgz"; - sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2"; + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; }; }; - "azure-arm-website-0.11.4" = { - name = "azure-arm-website"; - packageName = "azure-arm-website"; - version = "0.11.4"; + "argparse-1.0.4" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.4.tgz"; - sha1 = "6972dd9844a0d12376d74014b541c49247caa37d"; + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz"; + sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; - "azure-arm-rediscache-0.2.3" = { - name = "azure-arm-rediscache"; - packageName = "azure-arm-rediscache"; - version = "0.2.3"; + "args-3.0.8" = { + name = "args"; + packageName = "args"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz"; - sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06"; + url = "https://registry.npmjs.org/args/-/args-3.0.8.tgz"; + sha512 = "26h2nssgwzgc9y1mywgjcx2rbbkxlpx23zj9gh81bayjr8522zi78rwrhpkkqwh7dwqx6mv8gphcx8zyv3vm8hxw5s89kjlzm66k7y9"; }; }; - "azure-arm-devtestlabs-0.1.0" = { - name = "azure-arm-devtestlabs"; - packageName = "azure-arm-devtestlabs"; - version = "0.1.0"; + "arr-diff-2.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-0.1.0.tgz"; - sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; + sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; }; }; - "azure-graph-2.1.0-preview" = { - name = "azure-graph"; - packageName = "azure-graph"; - version = "2.1.0-preview"; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.1.0-preview.tgz"; - sha1 = "2005abb76d9193cbfb90f25ee92823cde87d4f5f"; + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; }; }; - "azure-gallery-2.0.0-pre.18" = { - name = "azure-gallery"; - packageName = "azure-gallery"; - version = "2.0.0-pre.18"; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz"; - sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; }; }; - "azure-keyvault-0.11.0" = { - name = "azure-keyvault"; - packageName = "azure-keyvault"; - version = "0.11.0"; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.11.0.tgz"; - sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; }; - "azure-asm-compute-0.18.0" = { - name = "azure-asm-compute"; - packageName = "azure-asm-compute"; - version = "0.18.0"; + "array-differ-1.0.0" = { + name = "array-differ"; + packageName = "array-differ"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz"; - sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685"; + url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; + sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; }; }; - "azure-asm-hdinsight-0.10.2" = { - name = "azure-asm-hdinsight"; - packageName = "azure-asm-hdinsight"; - version = "0.10.2"; + "array-each-1.0.1" = { + name = "array-each"; + packageName = "array-each"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-hdinsight/-/azure-asm-hdinsight-0.10.2.tgz"; - sha1 = "2d11cdaaa073fc38f31c718991d5923fb7259fa0"; + url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; + sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; }; }; - "azure-asm-trafficmanager-0.10.3" = { - name = "azure-asm-trafficmanager"; - packageName = "azure-asm-trafficmanager"; - version = "0.10.3"; + "array-filter-0.0.1" = { + name = "array-filter"; + packageName = "array-filter"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz"; - sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447"; + url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; + sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; }; }; - "azure-asm-mgmt-0.10.1" = { - name = "azure-asm-mgmt"; - packageName = "azure-asm-mgmt"; - version = "0.10.1"; + "array-find-0.1.1" = { + name = "array-find"; + packageName = "array-find"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-mgmt/-/azure-asm-mgmt-0.10.1.tgz"; - sha1 = "d0a44b47ccabf338b19d53271675733cfa2d1751"; + url = "https://registry.npmjs.org/array-find/-/array-find-0.1.1.tgz"; + sha1 = "dc813845ad5a9afc35cb92b786c878d81b5b82ce"; }; }; - "azure-monitoring-0.10.2" = { - name = "azure-monitoring"; - packageName = "azure-monitoring"; - version = "0.10.2"; + "array-find-index-1.0.2" = { + name = "array-find-index"; + packageName = "array-find-index"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz"; - sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "azure-asm-network-0.13.0" = { - name = "azure-asm-network"; - packageName = "azure-asm-network"; - version = "0.13.0"; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz"; - sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; - "azure-arm-resource-1.6.1-preview" = { - name = "azure-arm-resource"; - packageName = "azure-arm-resource"; - version = "1.6.1-preview"; + "array-flatten-2.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz"; - sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz"; + sha1 = "426bb9da84090c1838d812c8150af20a8331e296"; }; }; - "azure-arm-storage-0.15.0-preview" = { - name = "azure-arm-storage"; - packageName = "azure-arm-storage"; - version = "0.15.0-preview"; + "array-from-2.1.1" = { + name = "array-from"; + packageName = "array-from"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz"; - sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e"; + url = "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"; + sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"; }; }; - "azure-asm-sb-0.10.1" = { - name = "azure-asm-sb"; - packageName = "azure-asm-sb"; - version = "0.10.1"; + "array-ify-1.0.0" = { + name = "array-ify"; + packageName = "array-ify"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-sb/-/azure-asm-sb-0.10.1.tgz"; - sha1 = "92487b24166041119714f66760ec1f36e8dc7222"; + url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; + sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; }; }; - "azure-asm-sql-0.10.1" = { - name = "azure-asm-sql"; - packageName = "azure-asm-sql"; - version = "0.10.1"; + "array-indexofobject-0.0.1" = { + name = "array-indexofobject"; + packageName = "array-indexofobject"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-sql/-/azure-asm-sql-0.10.1.tgz"; - sha1 = "47728df19a6d4f1cc935235c69fa9cf048cc8f42"; + url = "https://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz"; + sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a"; }; }; - "azure-asm-storage-0.12.0" = { - name = "azure-asm-storage"; - packageName = "azure-asm-storage"; - version = "0.12.0"; + "array-loop-1.0.0" = { + name = "array-loop"; + packageName = "array-loop"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-storage/-/azure-asm-storage-0.12.0.tgz"; - sha1 = "f5edf48d41d18a80eb14af6a72c1d6924214fdd3"; + url = "https://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz"; + sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; }; }; - "azure-asm-subscription-0.10.1" = { - name = "azure-asm-subscription"; - packageName = "azure-asm-subscription"; - version = "0.10.1"; + "array-lru-1.1.1" = { + name = "array-lru"; + packageName = "array-lru"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz"; - sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c"; + url = "https://registry.npmjs.org/array-lru/-/array-lru-1.1.1.tgz"; + sha1 = "0c7e1b4e022ae166ff1e8448c595f3181fcd3337"; }; }; - "azure-asm-website-0.10.4" = { - name = "azure-asm-website"; - packageName = "azure-asm-website"; - version = "0.10.4"; + "array-map-0.0.0" = { + name = "array-map"; + packageName = "array-map"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.4.tgz"; - sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; + url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; + sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; }; }; - "azure-storage-2.1.0" = { - name = "azure-storage"; - packageName = "azure-storage"; - version = "2.1.0"; + "array-reduce-0.0.0" = { + name = "array-reduce"; + packageName = "array-reduce"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz"; - sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01"; + url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; + sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; }; }; - "azure-arm-batch-0.3.0" = { - name = "azure-arm-batch"; - packageName = "azure-arm-batch"; - version = "0.3.0"; + "array-shuffle-1.0.1" = { + name = "array-shuffle"; + packageName = "array-shuffle"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz"; - sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7"; + url = "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz"; + sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a"; }; }; - "azure-batch-0.5.2" = { - name = "azure-batch"; - packageName = "azure-batch"; - version = "0.5.2"; + "array-slice-0.2.3" = { + name = "array-slice"; + packageName = "array-slice"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz"; - sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; + url = "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"; + sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5"; }; }; - "azure-servicefabric-0.1.5" = { - name = "azure-servicefabric"; - packageName = "azure-servicefabric"; - version = "0.1.5"; + "array-slice-1.1.0" = { + name = "array-slice"; + packageName = "array-slice"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz"; - sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6"; + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; + sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7"; }; }; - "applicationinsights-0.16.0" = { - name = "applicationinsights"; - packageName = "applicationinsights"; - version = "0.16.0"; + "array-union-1.0.2" = { + name = "array-union"; + packageName = "array-union"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz"; - sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3"; + url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; }; }; - "caller-id-0.1.0" = { - name = "caller-id"; - packageName = "caller-id"; - version = "0.1.0"; + "array-uniq-1.0.3" = { + name = "array-uniq"; + packageName = "array-uniq"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz"; - sha1 = "59bdac0893d12c3871408279231f97458364f07b"; + url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; }; }; - "colors-1.1.2" = { - name = "colors"; - packageName = "colors"; - version = "1.1.2"; + "array-unique-0.2.1" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"; + sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; }; }; - "commander-1.0.4" = { - name = "commander"; - packageName = "commander"; - version = "1.0.4"; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz"; - sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3"; + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; }; - "date-utils-1.2.21" = { - name = "date-utils"; - packageName = "date-utils"; - version = "1.2.21"; + "arraybuffer.slice-0.0.6" = { + name = "arraybuffer.slice"; + packageName = "arraybuffer.slice"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; - sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; + sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; }; }; - "easy-table-1.1.0" = { - name = "easy-table"; - packageName = "easy-table"; - version = "1.1.0"; + "arraybuffer.slice-0.0.7" = { + name = "arraybuffer.slice"; + packageName = "arraybuffer.slice"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz"; - sha1 = "86f9ab4c102f0371b7297b92a651d5824bc8cb73"; + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"; + sha512 = "2ifpj39fza01g4z9jhgl0shmh5f79czgfh7bf40n66v5p93nrf43kiqhsgic9az2jrwmj8n60dn7kav1rzvm41a9kwi4ypf0mahhrf0"; }; }; - "event-stream-3.1.5" = { - name = "event-stream"; - packageName = "event-stream"; - version = "3.1.5"; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz"; - sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c"; + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; }; }; - "eyes-0.1.8" = { - name = "eyes"; - packageName = "eyes"; - version = "0.1.8"; + "asap-1.0.0" = { + name = "asap"; + packageName = "asap"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"; + sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"; }; }; - "github-0.1.6" = { - name = "github"; - packageName = "github"; - version = "0.1.6"; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/github/-/github-0.1.6.tgz"; - sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; - "fast-json-patch-0.5.6" = { - name = "fast-json-patch"; - packageName = "fast-json-patch"; - version = "0.5.6"; + "ascli-0.3.0" = { + name = "ascli"; + packageName = "ascli"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz"; - sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; + url = "https://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; + sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a"; }; }; - "js2xmlparser-1.0.0" = { - name = "js2xmlparser"; - packageName = "js2xmlparser"; - version = "1.0.0"; + "asn1-0.1.11" = { + name = "asn1"; + packageName = "asn1"; + version = "0.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz"; - sha1 = "5a170f2e8d6476ce45405e04823242513782fe30"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; - "jsonlint-1.6.2" = { - name = "jsonlint"; - packageName = "jsonlint"; - version = "1.6.2"; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; - sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "jsonminify-0.4.1" = { - name = "jsonminify"; - packageName = "jsonminify"; - version = "0.4.1"; + "asn1.js-4.10.1" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz"; - sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; }; }; - "jsrsasign-4.8.2" = { - name = "jsrsasign"; - packageName = "jsrsasign"; - version = "4.8.2"; + "assert-1.4.1" = { + name = "assert"; + packageName = "assert"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsrsasign/-/jsrsasign-4.8.2.tgz"; - sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; + url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; }; }; - "jwt-decode-2.2.0" = { - name = "jwt-decode"; - packageName = "jwt-decode"; - version = "2.2.0"; + "assert-plus-0.1.2" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz"; - sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79"; + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; + sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; }; }; - "kuduscript-1.0.15" = { - name = "kuduscript"; - packageName = "kuduscript"; - version = "1.0.15"; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.15.tgz"; - sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21"; + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; }; }; - "moment-2.19.2" = { - name = "moment"; - packageName = "moment"; - version = "2.19.2"; + "assert-plus-0.2.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.19.2.tgz"; - sha512 = "2s41fkwslr6lp0v2yz37fmsbfiy98x8s1fjc6smx82sf8r6fiq9wyx61javlkn8agzn51zcanhfyxj4wvsc8wyrz5yilzy4ff4a7zj5"; + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "ms-rest-2.2.5" = { - name = "ms-rest"; - packageName = "ms-rest"; - version = "2.2.5"; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.5.tgz"; - sha512 = "36zs0fdmla07dilmiimvvr37yymsa6xb518gmrc8qb94bkd5fhf16xas4krm145cbrrr6nszphz0dljljwa4xif0x3xcyzwldj0063a"; + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "ms-rest-azure-2.4.4" = { - name = "ms-rest-azure"; - packageName = "ms-rest-azure"; - version = "2.4.4"; + "assertion-error-1.1.0" = { + name = "assertion-error"; + packageName = "assertion-error"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.4.4.tgz"; - sha512 = "3b2qx0kki9qi012nsx0psn8plvgzq9cmjgpz9gjnizkf0lwha54mk9262ixkjgz5mzjxpn0jcy67h5zf10l2xvi27zs98jq869w46rs"; + url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz"; + sha512 = "07swiwljqy13fyil4y9lp319zcqsgdkchaic1y4dlfi3flh5l4qlwv497g40bnspsl9h857a3ig5assmvjdwv913dppgymkvcsil2wf"; }; }; - "node-forge-0.6.23" = { - name = "node-forge"; - packageName = "node-forge"; - version = "0.6.23"; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz"; - sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "omelette-0.3.2" = { - name = "omelette"; - packageName = "omelette"; - version = "0.3.2"; + "ast-types-0.11.3" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz"; - sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.3.tgz"; + sha512 = "2lga5vgh6bz1vii6kfdy2k1g99arw9cikxx8705p9v92rqn7ksdvbzjvhgfdf4s21nbfafrxjh3hrr5jz2yq43dr4hw7hqdvgjnh3jw"; }; }; - "openssl-wrapper-0.2.1" = { - name = "openssl-wrapper"; - packageName = "openssl-wrapper"; - version = "0.2.1"; + "ast-types-0.9.6" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz"; - sha1 = "ff2d6552c83bb14437edc0371784704c75289473"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz"; + sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"; }; }; - "progress-1.1.8" = { - name = "progress"; - packageName = "progress"; - version = "1.1.8"; + "astw-2.2.0" = { + name = "astw"; + packageName = "astw"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; - sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; + sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; }; }; - "prompt-0.2.14" = { - name = "prompt"; - packageName = "prompt"; - version = "0.2.14"; + "async-0.1.22" = { + name = "async"; + packageName = "async"; + version = "0.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz"; - sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc"; + url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz"; + sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; }; }; - "readable-stream-1.0.34" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.0.34"; + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; - sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; - "request-2.74.0" = { - name = "request"; - packageName = "request"; - version = "2.74.0"; + "async-0.2.7" = { + name = "async"; + packageName = "async"; + version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; - sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; + url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; + sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; }; }; - "ssh-key-to-pem-0.11.0" = { - name = "ssh-key-to-pem"; - packageName = "ssh-key-to-pem"; - version = "0.11.0"; + "async-0.2.9" = { + name = "async"; + packageName = "async"; + version = "0.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz"; - sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; + url = "https://registry.npmjs.org/async/-/async-0.2.9.tgz"; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; }; }; - "streamline-0.10.17" = { - name = "streamline"; - packageName = "streamline"; - version = "0.10.17"; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/streamline/-/streamline-0.10.17.tgz"; - sha1 = "fa2170da74194dbd0b54f756523f0d0d370426af"; + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; }; }; - "streamline-streams-0.1.5" = { - name = "streamline-streams"; - packageName = "streamline-streams"; - version = "0.1.5"; + "async-1.0.0" = { + name = "async"; + packageName = "async"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/streamline-streams/-/streamline-streams-0.1.5.tgz"; - sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54"; + url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; + sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; }; }; - "sync-request-3.0.0" = { - name = "sync-request"; - packageName = "sync-request"; - version = "3.0.0"; + "async-1.4.2" = { + name = "async"; + packageName = "async"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/sync-request/-/sync-request-3.0.0.tgz"; - sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c"; + url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz"; + sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; }; }; - "through-2.3.4" = { - name = "through"; - packageName = "through"; - version = "2.3.4"; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.4.tgz"; - sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455"; + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; }; }; - "tunnel-0.0.2" = { - name = "tunnel"; - packageName = "tunnel"; - version = "0.0.2"; + "async-2.1.2" = { + name = "async"; + packageName = "async"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz"; - sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334"; + url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; + sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; }; }; - "underscore-1.4.4" = { - name = "underscore"; - packageName = "underscore"; - version = "1.4.4"; + "async-2.1.5" = { + name = "async"; + packageName = "async"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; + sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; }; }; - "user-home-2.0.0" = { - name = "user-home"; - packageName = "user-home"; - version = "2.0.0"; + "async-2.3.0" = { + name = "async"; + packageName = "async"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; - sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + url = "https://registry.npmjs.org/async/-/async-2.3.0.tgz"; + sha1 = "1013d1051047dd320fe24e494d5c66ecaf6147d9"; }; }; - "uuid-3.1.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.1.0"; + "async-2.5.0" = { + name = "async"; + packageName = "async"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; - sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; + url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz"; + sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv"; }; }; - "validator-5.2.0" = { - name = "validator"; - packageName = "validator"; - version = "5.2.0"; + "async-2.6.0" = { + name = "async"; + packageName = "async"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz"; - sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689"; + url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; + sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; }; }; - "winston-2.1.1" = { - name = "winston"; - packageName = "winston"; - version = "2.1.1"; + "async-each-1.0.1" = { + name = "async-each"; + packageName = "async-each"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz"; - sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"; + sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; }; }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf"; }; }; - "xml2js-0.1.14" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.1.14"; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; - sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "xmlbuilder-0.4.3" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "0.4.3"; + "atob-2.1.0" = { + name = "atob"; + packageName = "atob"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; - sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; + url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz"; + sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a"; }; }; - "read-1.0.7" = { - name = "read"; - packageName = "read"; - version = "1.0.7"; + "atomic-batcher-1.0.2" = { + name = "atomic-batcher"; + packageName = "atomic-batcher"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz"; - sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + url = "https://registry.npmjs.org/atomic-batcher/-/atomic-batcher-1.0.2.tgz"; + sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4"; }; }; - "jws-3.1.4" = { - name = "jws"; - packageName = "jws"; - version = "3.1.4"; + "auto-bind-1.2.0" = { + name = "auto-bind"; + packageName = "auto-bind"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz"; - sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2"; + url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.0.tgz"; + sha512 = "0wamaj1k757h28fyrvfam4fz8ymz84pvfcyvm3k88bs8vxq36jn9kbiqqa3s0axwi6pcmwgmpjqfsh2721a1bb5kp5dpkpdkrkfj3k7"; }; }; - "node-uuid-1.4.7" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.7"; + "aws-sdk-1.18.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; + sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "xmldom-0.1.27" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.27"; + "aws-sdk-2.223.1" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.223.1"; src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"; - sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.223.1.tgz"; + sha1 = "b264bf6407d7c74152f08b4a8fda8aad3a84baa4"; }; }; - "xpath.js-1.0.7" = { - name = "xpath.js"; - packageName = "xpath.js"; - version = "1.0.7"; + "aws-sign-0.2.0" = { + name = "aws-sign"; + packageName = "aws-sign"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz"; - sha1 = "7e94627f541276cbc6a6b02b5d35e9418565b3e4"; + url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; + sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; }; }; - "base64url-2.0.0" = { - name = "base64url"; - packageName = "base64url"; - version = "2.0.0"; + "aws-sign2-0.6.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz"; - sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb"; + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "jwa-1.1.5" = { - name = "jwa"; - packageName = "jwa"; - version = "1.1.5"; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz"; - sha1 = "a0552ce0220742cd52e153774a32905c30e756e5"; + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "safe-buffer-5.1.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.1"; + "aws4-1.7.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; + sha512 = "3rkdcpm3myysvq9nj6plgvpngzsbv7qk1wvb9f4m3gcsl23pf5x0hyph02svyl2v1lgjji8kl75ii7q04lhhhgjyw1irbinmxsl6qyz"; }; }; - "buffer-equal-constant-time-1.0.1" = { - name = "buffer-equal-constant-time"; - packageName = "buffer-equal-constant-time"; - version = "1.0.1"; + "axios-0.15.3" = { + name = "axios"; + packageName = "axios"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; - sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; + url = "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz"; + sha1 = "2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"; }; }; - "ecdsa-sig-formatter-1.0.9" = { - name = "ecdsa-sig-formatter"; - packageName = "ecdsa-sig-formatter"; - version = "1.0.9"; + "axios-0.17.1" = { + name = "axios"; + packageName = "axios"; + version = "0.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz"; - sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1"; + url = "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz"; + sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"; }; }; - "xml2js-0.2.7" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.2.7"; + "azure-arm-authorization-2.0.0" = { + name = "azure-arm-authorization"; + packageName = "azure-arm-authorization"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz"; - sha1 = "1838518bb01741cae0878bab4915e494c32306af"; + url = "https://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz"; + sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "dateformat-1.0.2-1.2.3" = { - name = "dateformat"; - packageName = "dateformat"; - version = "1.0.2-1.2.3"; + "azure-arm-batch-0.3.0" = { + name = "azure-arm-batch"; + packageName = "azure-arm-batch"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; - sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; + url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz"; + sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7"; }; }; - "validator-3.22.2" = { - name = "validator"; - packageName = "validator"; - version = "3.22.2"; + "azure-arm-cdn-1.0.3" = { + name = "azure-arm-cdn"; + packageName = "azure-arm-cdn"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-3.22.2.tgz"; - sha1 = "6f297ae67f7f82acc76d0afdb49f18d9a09c18c0"; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.3.tgz"; + sha1 = "39db281679dcdd33cb6ce032383b192430476412"; }; }; - "envconf-0.0.4" = { - name = "envconf"; - packageName = "envconf"; - version = "0.0.4"; + "azure-arm-commerce-0.2.0" = { + name = "azure-arm-commerce"; + packageName = "azure-arm-commerce"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz"; - sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; + url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz"; + sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; - "duplexer-0.1.1" = { - name = "duplexer"; - packageName = "duplexer"; - version = "0.1.1"; + "azure-arm-compute-3.0.0-preview" = { + name = "azure-arm-compute"; + packageName = "azure-arm-compute"; + version = "3.0.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-3.0.0-preview.tgz"; + sha1 = "f5f07792afcdff29ce0b7e16705342b6986f571b"; }; }; - "sax-0.5.2" = { - name = "sax"; - packageName = "sax"; - version = "0.5.2"; + "azure-arm-datalake-analytics-1.0.2-preview" = { + name = "azure-arm-datalake-analytics"; + packageName = "azure-arm-datalake-analytics"; + version = "1.0.2-preview"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz"; - sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; + url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.2-preview.tgz"; + sha1 = "b34f868e98a972ec80e4408d209dc06c000dfb63"; }; }; - "ms-rest-1.15.7" = { - name = "ms-rest"; - packageName = "ms-rest"; - version = "1.15.7"; + "azure-arm-datalake-store-1.0.2-preview" = { + name = "azure-arm-datalake-store"; + packageName = "azure-arm-datalake-store"; + version = "1.0.2-preview"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz"; - sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; + url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.2-preview.tgz"; + sha1 = "c8b7c113016c92703a84dc28d29ba518e8c64763"; }; }; - "ms-rest-azure-1.15.7" = { - name = "ms-rest-azure"; - packageName = "ms-rest-azure"; - version = "1.15.7"; + "azure-arm-devtestlabs-0.1.0" = { + name = "azure-arm-devtestlabs"; + packageName = "azure-arm-devtestlabs"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz"; - sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; + url = "https://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-0.1.0.tgz"; + sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; }; }; - "async-0.2.7" = { - name = "async"; - packageName = "async"; - version = "0.2.7"; + "azure-arm-dns-2.0.0-preview" = { + name = "azure-arm-dns"; + packageName = "azure-arm-dns"; + version = "2.0.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; - sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; + url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.0.0-preview.tgz"; + sha1 = "3dd0645c7f1767fe150e00a8ac33b4b55bce9b8c"; }; }; - "moment-2.6.0" = { - name = "moment"; - packageName = "moment"; - version = "2.6.0"; + "azure-arm-hdinsight-0.2.2" = { + name = "azure-arm-hdinsight"; + packageName = "azure-arm-hdinsight"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; - sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; + url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz"; + sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d"; }; }; - "moment-2.14.1" = { - name = "moment"; - packageName = "moment"; - version = "2.14.1"; + "azure-arm-hdinsight-jobs-0.1.0" = { + name = "azure-arm-hdinsight-jobs"; + packageName = "azure-arm-hdinsight-jobs"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; - sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + url = "https://registry.npmjs.org/azure-arm-hdinsight-jobs/-/azure-arm-hdinsight-jobs-0.1.0.tgz"; + sha1 = "252938f18d4341adf9942261656e791490c3c220"; }; }; - "browserify-mime-1.2.9" = { - name = "browserify-mime"; - packageName = "browserify-mime"; - version = "1.2.9"; + "azure-arm-insights-0.11.3" = { + name = "azure-arm-insights"; + packageName = "azure-arm-insights"; + version = "0.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz"; - sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; + url = "https://registry.npmjs.org/azure-arm-insights/-/azure-arm-insights-0.11.3.tgz"; + sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; - "extend-1.2.1" = { - name = "extend"; - packageName = "extend"; - version = "1.2.1"; + "azure-arm-iothub-1.0.1-preview" = { + name = "azure-arm-iothub"; + packageName = "azure-arm-iothub"; + version = "1.0.1-preview"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-1.0.1-preview.tgz"; + sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91"; }; }; - "json-edm-parser-0.1.2" = { - name = "json-edm-parser"; - packageName = "json-edm-parser"; - version = "0.1.2"; + "azure-arm-network-5.1.0" = { + name = "azure-arm-network"; + packageName = "azure-arm-network"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz"; - sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.1.0.tgz"; + sha1 = "b2be4bfc27173b1cb7fc54425cbee27824f65b52"; }; }; - "md5.js-1.3.4" = { - name = "md5.js"; - packageName = "md5.js"; - version = "1.3.4"; + "azure-arm-powerbiembedded-0.1.0" = { + name = "azure-arm-powerbiembedded"; + packageName = "azure-arm-powerbiembedded"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; - sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; + url = "https://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.0.tgz"; + sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; }; }; - "readable-stream-2.0.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.0.6"; + "azure-arm-rediscache-0.2.3" = { + name = "azure-arm-rediscache"; + packageName = "azure-arm-rediscache"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz"; + sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06"; }; }; - "jsonparse-1.2.0" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "1.2.0"; + "azure-arm-resource-1.6.1-preview" = { + name = "azure-arm-resource"; + packageName = "azure-arm-resource"; + version = "1.6.1-preview"; src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; - sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; + url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz"; + sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; }; }; - "hash-base-3.0.4" = { - name = "hash-base"; - packageName = "hash-base"; - version = "3.0.4"; + "azure-arm-servermanagement-0.1.2" = { + name = "azure-arm-servermanagement"; + packageName = "azure-arm-servermanagement"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-0.1.2.tgz"; + sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; + "azure-arm-storage-0.15.0-preview" = { + name = "azure-arm-storage"; + packageName = "azure-arm-storage"; + version = "0.15.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz"; + sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e"; }; }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; + "azure-arm-trafficmanager-1.1.0-preview" = { + name = "azure-arm-trafficmanager"; + packageName = "azure-arm-trafficmanager"; + version = "1.1.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-1.1.0-preview.tgz"; + sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50"; }; }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; + "azure-arm-website-0.11.4" = { + name = "azure-arm-website"; + packageName = "azure-arm-website"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.4.tgz"; + sha1 = "6972dd9844a0d12376d74014b541c49247caa37d"; }; }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; + "azure-asm-compute-0.18.0" = { + name = "azure-asm-compute"; + packageName = "azure-asm-compute"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz"; + sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685"; }; }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; + "azure-asm-hdinsight-0.10.2" = { + name = "azure-asm-hdinsight"; + packageName = "azure-asm-hdinsight"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + url = "https://registry.npmjs.org/azure-asm-hdinsight/-/azure-asm-hdinsight-0.10.2.tgz"; + sha1 = "2d11cdaaa073fc38f31c718991d5923fb7259fa0"; }; }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; + "azure-asm-mgmt-0.10.1" = { + name = "azure-asm-mgmt"; + packageName = "azure-asm-mgmt"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + url = "https://registry.npmjs.org/azure-asm-mgmt/-/azure-asm-mgmt-0.10.1.tgz"; + sha1 = "d0a44b47ccabf338b19d53271675733cfa2d1751"; }; }; - "stack-trace-0.0.10" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.10"; + "azure-asm-network-0.13.0" = { + name = "azure-asm-network"; + packageName = "azure-asm-network"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz"; + sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; }; }; - "keypress-0.1.0" = { - name = "keypress"; - packageName = "keypress"; - version = "0.1.0"; + "azure-asm-sb-0.10.1" = { + name = "azure-asm-sb"; + packageName = "azure-asm-sb"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + url = "https://registry.npmjs.org/azure-asm-sb/-/azure-asm-sb-0.10.1.tgz"; + sha1 = "92487b24166041119714f66760ec1f36e8dc7222"; }; }; - "wcwidth-1.0.1" = { - name = "wcwidth"; - packageName = "wcwidth"; - version = "1.0.1"; + "azure-asm-sql-0.10.1" = { + name = "azure-asm-sql"; + packageName = "azure-asm-sql"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; - sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + url = "https://registry.npmjs.org/azure-asm-sql/-/azure-asm-sql-0.10.1.tgz"; + sha1 = "47728df19a6d4f1cc935235c69fa9cf048cc8f42"; }; }; - "defaults-1.0.3" = { - name = "defaults"; - packageName = "defaults"; - version = "1.0.3"; + "azure-asm-storage-0.12.0" = { + name = "azure-asm-storage"; + packageName = "azure-asm-storage"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + url = "https://registry.npmjs.org/azure-asm-storage/-/azure-asm-storage-0.12.0.tgz"; + sha1 = "f5edf48d41d18a80eb14af6a72c1d6924214fdd3"; }; }; - "clone-1.0.3" = { - name = "clone"; - packageName = "clone"; - version = "1.0.3"; + "azure-asm-subscription-0.10.1" = { + name = "azure-asm-subscription"; + packageName = "azure-asm-subscription"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz"; - sha1 = "298d7e2231660f40c003c2ed3140decf3f53085f"; + url = "https://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz"; + sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c"; }; }; - "from-0.1.7" = { - name = "from"; - packageName = "from"; - version = "0.1.7"; + "azure-asm-trafficmanager-0.10.3" = { + name = "azure-asm-trafficmanager"; + packageName = "azure-asm-trafficmanager"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; - sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; + url = "https://registry.npmjs.org/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz"; + sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447"; }; }; - "map-stream-0.1.0" = { - name = "map-stream"; - packageName = "map-stream"; - version = "0.1.0"; + "azure-asm-website-0.10.4" = { + name = "azure-asm-website"; + packageName = "azure-asm-website"; + version = "0.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.4.tgz"; + sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "pause-stream-0.0.11" = { - name = "pause-stream"; - packageName = "pause-stream"; - version = "0.0.11"; + "azure-batch-0.5.2" = { + name = "azure-batch"; + packageName = "azure-batch"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz"; + sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; }; }; - "split-0.2.10" = { - name = "split"; - packageName = "split"; - version = "0.2.10"; + "azure-common-0.9.18" = { + name = "azure-common"; + packageName = "azure-common"; + version = "0.9.18"; src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz"; - sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; + url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz"; + sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd"; }; }; - "stream-combiner-0.0.4" = { - name = "stream-combiner"; - packageName = "stream-combiner"; - version = "0.0.4"; + "azure-gallery-2.0.0-pre.18" = { + name = "azure-gallery"; + packageName = "azure-gallery"; + version = "2.0.0-pre.18"; src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + url = "https://registry.npmjs.org/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz"; + sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; }; }; - "commander-1.1.1" = { - name = "commander"; - packageName = "commander"; - version = "1.1.1"; + "azure-graph-2.1.0-preview" = { + name = "azure-graph"; + packageName = "azure-graph"; + version = "2.1.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; - sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; + url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.1.0-preview.tgz"; + sha1 = "2005abb76d9193cbfb90f25ee92823cde87d4f5f"; }; }; - "streamline-0.4.11" = { - name = "streamline"; - packageName = "streamline"; - version = "0.4.11"; + "azure-keyvault-0.11.0" = { + name = "azure-keyvault"; + packageName = "azure-keyvault"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz"; - sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.11.0.tgz"; + sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; }; }; - "@types/node-8.0.51" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "8.0.51"; + "azure-monitoring-0.10.2" = { + name = "azure-monitoring"; + packageName = "azure-monitoring"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.0.51.tgz"; - sha512 = "2yh8vsbldk5709rd96vpr4hs6l9s3c3qslff28jhn8qa2l8wklkdqmkcl39v90pqb55xh049vd6bzl8b975yxnpb1lzl3rnk5cgwp8j"; + url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz"; + sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; }; }; - "@types/request-2.0.8" = { - name = "_at_types_slash_request"; - packageName = "@types/request"; - version = "2.0.8"; + "azure-servicefabric-0.1.5" = { + name = "azure-servicefabric"; + packageName = "azure-servicefabric"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.0.8.tgz"; - sha512 = "0x0whs0ls74h1hja129z6vxkbf7zzk5b4kqbp7iwxbilnbq9i53bfff95riw6n3k8pc4mahdg6p283bycw50f5b8mqax5hhknr217vy"; + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz"; + sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6"; }; }; - "@types/uuid-3.4.3" = { - name = "_at_types_slash_uuid"; - packageName = "@types/uuid"; - version = "3.4.3"; + "azure-storage-2.1.0" = { + name = "azure-storage"; + packageName = "azure-storage"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz"; - sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz"; + sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01"; }; }; - "is-buffer-1.1.6" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.6"; + "babel-code-frame-6.26.0" = { + name = "babel-code-frame"; + packageName = "babel-code-frame"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; + sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; }; }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; + "babel-core-6.26.0" = { + name = "babel-core"; + packageName = "babel-core"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz"; + sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; }; }; - "moment-2.18.1" = { - name = "moment"; - packageName = "moment"; - version = "2.18.1"; + "babel-generator-6.26.1" = { + name = "babel-generator"; + packageName = "babel-generator"; + version = "6.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; - sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; + url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz"; + sha512 = "2jfjq7ggb0ygyzxg3vw248iq0iw2v00janjva1bf3l322k4zjcx9hvq9qqy67gxxyl2igw1asxfgp769hd5229pc70kwri9l1iz09qz"; }; }; - "@types/form-data-2.2.1" = { - name = "_at_types_slash_form-data"; - packageName = "@types/form-data"; - version = "2.2.1"; + "babel-helper-builder-react-jsx-6.26.0" = { + name = "babel-helper-builder-react-jsx"; + packageName = "babel-helper-builder-react-jsx"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz"; - sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; + url = "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz"; + sha1 = "39ff8313b75c8b65dceff1f31d383e0ff2a408a0"; }; }; - "async-2.5.0" = { - name = "async"; - packageName = "async"; - version = "2.5.0"; + "babel-helpers-6.24.1" = { + name = "babel-helpers"; + packageName = "babel-helpers"; + version = "6.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz"; - sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv"; + url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; + sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; }; }; - "adal-node-0.1.25" = { - name = "adal-node"; - packageName = "adal-node"; - version = "0.1.25"; + "babel-messages-6.23.0" = { + name = "babel-messages"; + packageName = "babel-messages"; + version = "6.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.25.tgz"; - sha1 = "6554350ab42914870004c45c0d64448f3dbfcd03"; + url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; + sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; }; }; - "debug-0.7.4" = { - name = "debug"; - packageName = "debug"; - version = "0.7.4"; + "babel-plugin-syntax-jsx-6.18.0" = { + name = "babel-plugin-syntax-jsx"; + packageName = "babel-plugin-syntax-jsx"; + version = "6.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; - sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; }; }; - "q-0.9.7" = { - name = "q"; - packageName = "q"; - version = "0.9.7"; + "babel-plugin-syntax-object-rest-spread-6.13.0" = { + name = "babel-plugin-syntax-object-rest-spread"; + packageName = "babel-plugin-syntax-object-rest-spread"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; - sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; + url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; + sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; }; }; - "pkginfo-0.4.1" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.4.1"; + "babel-plugin-transform-es2015-destructuring-6.23.0" = { + name = "babel-plugin-transform-es2015-destructuring"; + packageName = "babel-plugin-transform-es2015-destructuring"; + version = "6.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz"; - sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz"; + sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d"; }; }; - "revalidator-0.1.8" = { - name = "revalidator"; - packageName = "revalidator"; - version = "0.1.8"; + "babel-plugin-transform-object-rest-spread-6.26.0" = { + name = "babel-plugin-transform-object-rest-spread"; + packageName = "babel-plugin-transform-object-rest-spread"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; - sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; + url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"; + sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06"; }; }; - "utile-0.2.1" = { - name = "utile"; - packageName = "utile"; - version = "0.2.1"; + "babel-plugin-transform-react-jsx-6.24.1" = { + name = "babel-plugin-transform-react-jsx"; + packageName = "babel-plugin-transform-react-jsx"; + version = "6.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; - sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; + url = "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz"; + sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3"; }; }; - "winston-0.8.3" = { - name = "winston"; - packageName = "winston"; - version = "0.8.3"; + "babel-polyfill-6.16.0" = { + name = "babel-polyfill"; + packageName = "babel-polyfill"; + version = "6.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; - sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; + url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz"; + sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; }; }; - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; + "babel-polyfill-6.26.0" = { + name = "babel-polyfill"; + packageName = "babel-polyfill"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz"; + sha1 = "379937abc67d7895970adc621f284cd966cf2153"; }; }; - "deep-equal-1.0.1" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "1.0.1"; + "babel-register-6.26.0" = { + name = "babel-register"; + packageName = "babel-register"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; - sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"; + sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; }; }; - "i-0.3.6" = { - name = "i"; - packageName = "i"; - version = "0.3.6"; + "babel-runtime-6.26.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz"; - sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; }; }; - "ncp-0.4.2" = { - name = "ncp"; - packageName = "ncp"; - version = "0.4.2"; + "babel-template-6.26.0" = { + name = "babel-template"; + packageName = "babel-template"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; - sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; + url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"; + sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; }; }; - "rimraf-2.6.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.2"; + "babel-traverse-6.26.0" = { + name = "babel-traverse"; + packageName = "babel-traverse"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; + url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"; + sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; }; }; - "glob-7.1.2" = { - name = "glob"; - packageName = "glob"; - version = "7.1.2"; + "babel-types-6.26.0" = { + name = "babel-types"; + packageName = "babel-types"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; + url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz"; + sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497"; }; }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; + "babybird-0.0.1" = { + name = "babybird"; + packageName = "babybird"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz"; + sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2"; }; }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; + "babylon-6.18.0" = { + name = "babylon"; + packageName = "babylon"; + version = "6.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; + sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb"; }; }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; + "babylon-7.0.0-beta.19" = { + name = "babylon"; + packageName = "babylon"; + version = "7.0.0-beta.19"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz"; + sha512 = "3y91819zra4jxfjqqdvbi44fr34m68vk7j76rkqkxvayhxmcmrvmxpk7rz16r2s3riql0xs322mkzm61asxzkc5b2zpw4firzv043an"; }; }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; + "backo2-1.0.2" = { + name = "backo2"; + packageName = "backo2"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; + sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; }; }; - "colors-0.6.2" = { - name = "colors"; - packageName = "colors"; - version = "0.6.2"; + "backoff-2.5.0" = { + name = "backoff"; + packageName = "backoff"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + url = "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz"; + sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; }; }; - "cycle-1.0.3" = { - name = "cycle"; - packageName = "cycle"; - version = "1.0.3"; + "bail-1.0.2" = { + name = "bail"; + packageName = "bail"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + url = "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz"; + sha1 = "f7d6c1731630a9f9f0d4d35ed1f962e2074a1764"; }; }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "pkginfo-0.3.1" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.3.1"; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; }; }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; + "base62-0.1.1" = { + name = "base62"; + packageName = "base62"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz"; + sha1 = "7b4174c2f94449753b11c2651c083da841a7b084"; }; }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; + "base64-arraybuffer-0.1.2" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; + sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; }; }; - "aws4-1.6.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.6.0"; + "base64-arraybuffer-0.1.5" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; + sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; }; }; - "bl-1.1.2" = { - name = "bl"; - packageName = "bl"; - version = "1.1.2"; + "base64-js-0.0.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; - sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz"; + sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"; }; }; - "caseless-0.11.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.11.0"; + "base64-js-0.0.8" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; + sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; + "base64-js-1.1.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; + sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; }; }; - "extend-3.0.1" = { - name = "extend"; - packageName = "extend"; - version = "3.0.1"; + "base64-js-1.2.3" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz"; + sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j"; }; }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; + "base64-url-1.2.1" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; + sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; }; }; - "form-data-1.0.1" = { - name = "form-data"; - packageName = "form-data"; - version = "1.0.1"; + "base64id-0.1.0" = { + name = "base64id"; + packageName = "base64id"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; - sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; + url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; }; }; - "har-validator-2.0.6" = { - name = "har-validator"; - packageName = "har-validator"; - version = "2.0.6"; + "base64id-1.0.0" = { + name = "base64id"; + packageName = "base64id"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz"; + sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; }; }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; + "base64url-2.0.0" = { + name = "base64url"; + packageName = "base64url"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz"; + sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb"; }; }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; + "basic-auth-1.0.4" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; + sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; }; }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; + "basic-auth-1.1.0" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; + sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; + "basic-auth-2.0.0" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz"; + sha1 = "015db3f353e02e56377755f962742e8981e7bbba"; }; }; - "mime-types-2.1.17" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.17"; + "basic-auth-connect-1.0.0" = { + name = "basic-auth-connect"; + packageName = "basic-auth-connect"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; - sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; + url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; + sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; }; }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; + "batch-0.5.3" = { + name = "batch"; + packageName = "batch"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"; + sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464"; }; }; - "qs-6.2.3" = { - name = "qs"; - packageName = "qs"; - version = "6.2.3"; + "batch-0.6.1" = { + name = "batch"; + packageName = "batch"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"; - sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"; + url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; + sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; }; }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; + "bcrypt-1.0.3" = { + name = "bcrypt"; + packageName = "bcrypt"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz"; + sha512 = "1zfn87155w6q9fsv5ls3gxwih7yvarrh16kzpfrpppblzpmp1cy9gjkknsf9lkixacza39h51jd7varqfg19w3qkdic62zpirv86755"; }; }; - "tough-cookie-2.3.3" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.3"; + "bcrypt-nodejs-0.0.3" = { + name = "bcrypt-nodejs"; + packageName = "bcrypt-nodejs"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; + url = "https://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz"; + sha1 = "c60917f26dc235661566c681061c303c2b28842b"; }; }; - "tunnel-agent-0.4.3" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.4.3"; + "bcrypt-pbkdf-1.0.1" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; + "bcryptjs-2.4.3" = { + name = "bcryptjs"; + packageName = "bcryptjs"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; + sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; }; }; - "commander-2.11.0" = { - name = "commander"; - packageName = "commander"; - version = "2.11.0"; + "beeper-1.1.1" = { + name = "beeper"; + packageName = "beeper"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; - sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; + url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; + sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "is-my-json-valid-2.16.1" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.16.1"; + "bencode-0.7.0" = { + name = "bencode"; + packageName = "bencode"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz"; - sha512 = "2wmvqb2vfzjbnd2znxkg4sqpksxb9mi1lbr4r5zv535ykxzfv8dbnafra1lhk415wrbg9r1lfhyimcw5xfj3k4ry7inbmcjlnr4zj51"; + url = "https://registry.npmjs.org/bencode/-/bencode-0.7.0.tgz"; + sha1 = "811ed647c0118945e41bb4bbbdea9a2c78a17083"; }; }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; + "bencode-0.8.0" = { + name = "bencode"; + packageName = "bencode"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + url = "https://registry.npmjs.org/bencode/-/bencode-0.8.0.tgz"; + sha1 = "3143448e82b0fadc745633ecc2a5f8fa87932f19"; }; }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.0.0"; + "bencode-1.0.0" = { + name = "bencode"; + packageName = "bencode"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz"; + sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p"; }; }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; + "bencode-2.0.0" = { + name = "bencode"; + packageName = "bencode"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz"; + sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2"; }; }; - "jsonpointer-4.0.1" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "4.0.1"; + "better-assert-1.0.2" = { + name = "better-assert"; + packageName = "better-assert"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; - sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; + url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; + sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; }; }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; + "better-curry-1.6.0" = { + name = "better-curry"; + packageName = "better-curry"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; + sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; }; }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; + "biased-opener-0.2.8" = { + name = "biased-opener"; + packageName = "biased-opener"; + version = "0.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + url = "https://registry.npmjs.org/biased-opener/-/biased-opener-0.2.8.tgz"; + sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; + "big-integer-1.6.27" = { + name = "big-integer"; + packageName = "big-integer"; + version = "1.6.27"; src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.27.tgz"; + sha512 = "2v5f59yjsa3hzwhk333s84nfl1x24w52h9hqpwbav0p5v5d5prkna0flw25ywccrrjziq3lylbl874qqikzljkyz2g6jjdqhlqhld9p"; }; }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; + "big.js-3.2.0" = { + name = "big.js"; + packageName = "big.js"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; + sha512 = "3qicqys1bg16slzbzjn3f0fir82r4d1h6lvy5y0cqqwzbs2iaxf93xgi6x47m7l87i102ifjn4qvjbf764gyncsxcqw7lw33mk7y4zs"; }; }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; + "bin-version-1.0.4" = { + name = "bin-version"; + packageName = "bin-version"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz"; + sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e"; }; }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; + "bin-version-check-2.1.0" = { + name = "bin-version-check"; + packageName = "bin-version-check"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz"; + sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0"; }; }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; + "binary-0.3.0" = { + name = "binary"; + packageName = "binary"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + url = "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; }; }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; + "binary-extensions-1.11.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz"; + sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"; }; }; - "jsprim-1.4.1" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.1"; + "binary-search-1.3.3" = { + name = "binary-search"; + packageName = "binary-search"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.3.tgz"; + sha512 = "38zf62278y5pi773rqfsjrn9iknwhx25v4jhjc2gv8yi8hs2k8bjqg52yc07az2ipl53iid2d39r827z4jb6854x0z95m7hgfkwmy2g"; }; }; - "sshpk-1.13.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.13.1"; + "binaryheap-0.0.3" = { + name = "binaryheap"; + packageName = "binaryheap"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; - sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; + url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; + sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; + "bindings-1.3.0" = { + name = "bindings"; + packageName = "bindings"; version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz"; + sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf"; }; }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; + "binstall-1.2.0" = { + name = "binstall"; + packageName = "binstall"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + url = "https://registry.npmjs.org/binstall/-/binstall-1.2.0.tgz"; + sha1 = "6b2c0f580b9e3c607f50ef7a22a54ce9fdc8d933"; }; }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; + "bitfield-0.1.0" = { + name = "bitfield"; + packageName = "bitfield"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + url = "https://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz"; + sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457"; }; }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; + "bitfield-2.0.0" = { + name = "bitfield"; + packageName = "bitfield"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/bitfield/-/bitfield-2.0.0.tgz"; + sha512 = "27y12y6a0jj5yrb5m8k7fp5czr6cj2x15rmd3d10q4s22i2fw23v5c731ciy9sndjic7hcgblkjc3ilayh7lpv0m4zp8f53hw6kh4z3"; }; }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; + "bitfield-rle-2.1.0" = { + name = "bitfield-rle"; + packageName = "bitfield-rle"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + url = "https://registry.npmjs.org/bitfield-rle/-/bitfield-rle-2.1.0.tgz"; + sha1 = "ae29e9382a7ba4898de9f48bb23fd338c4fbdcf8"; }; }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; + "bitsyntax-0.0.4" = { + name = "bitsyntax"; + packageName = "bitsyntax"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + url = "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.0.4.tgz"; + sha1 = "eb10cc6f82b8c490e3e85698f07e83d46e0cba82"; }; }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; + "bittorrent-dht-6.4.2" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz"; + sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6"; }; }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; + "bittorrent-dht-7.10.0" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.10.0.tgz"; + sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; - "ecc-jsbn-0.1.1" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.1"; + "bittorrent-dht-8.2.0" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.2.0.tgz"; + sha512 = "291qfv5f3w3d7zcq9xyjplpnaaahy7mzj664w5g9w1zgiwv3dikl38r8wx0rdb3afsv5ih0ghrzc2r1k19c52axsagnpsc10hihlkii"; }; }; - "bcrypt-pbkdf-1.0.1" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + "bittorrent-peerid-1.2.0" = { + name = "bittorrent-peerid"; + packageName = "bittorrent-peerid"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.2.0.tgz"; + sha1 = "9f675612f0e6afc6ef3450dfba51ff7238abf371"; }; }; - "mime-db-1.30.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.30.0"; + "bittorrent-protocol-2.4.0" = { + name = "bittorrent-protocol"; + packageName = "bittorrent-protocol"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; - sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.0.tgz"; + sha512 = "3xggi5fxwkzkkgy3z7v5b9w7fk2bjan077b4s9rvqfp7cmnw6l96p36qlkqgp38rd57lzdlkay42dkqhcb8r7gzszp5598nviy0p4mb"; }; }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; + "bittorrent-tracker-7.7.0" = { + name = "bittorrent-tracker"; + packageName = "bittorrent-tracker"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-7.7.0.tgz"; + sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "asn1-0.1.11" = { - name = "asn1"; - packageName = "asn1"; - version = "0.1.11"; + "bittorrent-tracker-9.7.0" = { + name = "bittorrent-tracker"; + packageName = "bittorrent-tracker"; + version = "9.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.7.0.tgz"; + sha512 = "06jp495xv047v5n3wclbga8laqmgjis5wjwhc7ggq2qx4xszp395mg2v0147p7v0ybpw5bpvdfhr1zp12barvn2lgj9f0c9iji4jr5r"; }; }; - "ctype-0.5.2" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.2"; + "bl-0.8.2" = { + name = "bl"; + packageName = "bl"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; + sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; }; }; - "source-map-0.1.43" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.43"; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; }; }; - "fibers-1.0.15" = { - name = "fibers"; - packageName = "fibers"; - version = "1.0.15"; + "bl-1.1.2" = { + name = "bl"; + packageName = "bl"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz"; - sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c"; + url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; + sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; }; }; - "galaxy-0.1.12" = { - name = "galaxy"; - packageName = "galaxy"; - version = "0.1.12"; + "bl-1.2.2" = { + name = "bl"; + packageName = "bl"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/galaxy/-/galaxy-0.1.12.tgz"; - sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; + url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; + sha512 = "0810nalazir8szyxvbg53d7416j4a7xy94sdri37mwmnax9s9hx88mzky882sr9dv0is7w9fqlp7ys6ijr1z1imc2dnfxk8fri51jvv"; }; }; - "concat-stream-1.6.0" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.6.0"; + "blake2b-2.1.2" = { + name = "blake2b"; + packageName = "blake2b"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; - sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; + url = "https://registry.npmjs.org/blake2b/-/blake2b-2.1.2.tgz"; + sha1 = "6880eddca35cfede92c4fb2724221334f989145a"; }; }; - "http-response-object-1.1.0" = { - name = "http-response-object"; - packageName = "http-response-object"; + "blake2b-wasm-1.1.7" = { + name = "blake2b-wasm"; + packageName = "blake2b-wasm"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.7.tgz"; + sha512 = "1q4aaql83818qzgh01c6x9jvcchmd6bq7r0kfs3f364vhwxnp7qc25y3h2ij5751mi1zhh96874ib0afn8an92xh3ag1kv5g2yhflm0"; + }; + }; + "blob-0.0.2" = { + name = "blob"; + packageName = "blob"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/blob/-/blob-0.0.2.tgz"; + sha1 = "b89562bd6994af95ba1e812155536333aa23cf24"; + }; + }; + "blob-0.0.4" = { + name = "blob"; + packageName = "blob"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz"; + sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; + }; + }; + "blob-to-buffer-1.2.7" = { + name = "blob-to-buffer"; + packageName = "blob-to-buffer"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.7.tgz"; + sha512 = "3vjm0x8c1iv48p266p8s61kwfyvi089npgmwb8zf69yyqrwfixxis0rsgsfrzizl22wzmf0azbxsxqb132nx2q8fjjcgqf7bi2kl593"; + }; + }; + "block-stream-0.0.9" = { + name = "block-stream"; + packageName = "block-stream"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + }; + }; + "block-stream2-1.1.0" = { + name = "block-stream2"; + packageName = "block-stream2"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz"; - sha1 = "a7c4e75aae82f3bb4904e4f43f615673b4d518c3"; + url = "https://registry.npmjs.org/block-stream2/-/block-stream2-1.1.0.tgz"; + sha1 = "c738e3a91ba977ebb5e1fef431e13ca11d8639e2"; }; }; - "then-request-2.2.0" = { - name = "then-request"; - packageName = "then-request"; - version = "2.2.0"; + "bluebird-2.9.34" = { + name = "bluebird"; + packageName = "bluebird"; + version = "2.9.34"; src = fetchurl { - url = "https://registry.npmjs.org/then-request/-/then-request-2.2.0.tgz"; - sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"; + sha1 = "2f7b4ec80216328a9fddebdf69c8d4942feff7d8"; }; }; - "typedarray-0.0.6" = { - name = "typedarray"; - packageName = "typedarray"; - version = "0.0.6"; + "bluebird-2.9.9" = { + name = "bluebird"; + packageName = "bluebird"; + version = "2.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; + sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; }; }; - "readable-stream-2.3.3" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.3"; + "bluebird-3.5.1" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; - sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; + sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; }; }; - "string_decoder-1.0.3" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.0.3"; + "blueimp-md5-2.10.0" = { + name = "blueimp-md5"; + packageName = "blueimp-md5"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz"; + sha512 = "18r5wdrfrrjip7xipgxyg673njbfkj46hkswp4bmb5n7zx6gmajrashp6w32rkvhanymnx6rd7mrlqgzm68ksd89sy5x9gd5qx58hqj"; }; }; - "http-basic-2.5.1" = { - name = "http-basic"; - packageName = "http-basic"; - version = "2.5.1"; + "bn.js-4.11.8" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/http-basic/-/http-basic-2.5.1.tgz"; - sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; + sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; }; }; - "promise-7.3.1" = { - name = "promise"; - packageName = "promise"; - version = "7.3.1"; + "bncode-0.2.3" = { + name = "bncode"; + packageName = "bncode"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; - sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy"; + url = "https://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz"; + sha1 = "37f851dc8e47188a83fbc0f6fa4775cacc9a3296"; }; }; - "asap-2.0.6" = { - name = "asap"; - packageName = "asap"; - version = "2.0.6"; + "bncode-0.5.3" = { + name = "bncode"; + packageName = "bncode"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; - sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + url = "https://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz"; + sha1 = "e16661697452d436bf9886238cc791b08d66a61a"; }; }; - "async-1.0.0" = { - name = "async"; - packageName = "async"; + "body-0.1.0" = { + name = "body"; + packageName = "body"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body/-/body-0.1.0.tgz"; + sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8"; + }; + }; + "body-5.1.0" = { + name = "body"; + packageName = "body"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body/-/body-5.1.0.tgz"; + sha1 = "e4ba0ce410a46936323367609ecb4e6553125069"; + }; + }; + "body-parser-1.13.3" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz"; + sha1 = "c08cf330c3358e151016a05746f13f029c97fa97"; + }; + }; + "body-parser-1.18.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; + sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; + }; + }; + "bonjour-3.5.0" = { + name = "bonjour"; + packageName = "bonjour"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz"; + sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + }; + }; + "boolbase-1.0.0" = { + name = "boolbase"; + packageName = "boolbase"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; - sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; + url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "colors-1.0.3" = { - name = "colors"; - packageName = "colors"; - version = "1.0.3"; + "boom-0.3.8" = { + name = "boom"; + packageName = "boom"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + url = "https://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; + sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; }; }; - "mute-stream-0.0.7" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.7"; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; - "argparse-1.0.4" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.4"; + "boom-4.3.1" = { + name = "boom"; + packageName = "boom"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz"; - sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; + url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; + sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; + }; + }; + "boom-5.2.0" = { + name = "boom"; + packageName = "boom"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; + sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; + }; + }; + "bops-0.1.1" = { + name = "bops"; + packageName = "bops"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bops/-/bops-0.1.1.tgz"; + sha1 = "062e02a8daa801fa10f2e5dbe6740cff801fe17e"; + }; + }; + "bottleneck-1.5.3" = { + name = "bottleneck"; + packageName = "bottleneck"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; + sha1 = "55fa64920d9670087d44150404525d59f9511c20"; + }; + }; + "boundary-1.0.1" = { + name = "boundary"; + packageName = "boundary"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boundary/-/boundary-1.0.1.tgz"; + sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; }; }; - "bower-1.8.2" = { + "bower-1.8.4" = { name = "bower"; packageName = "bower"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; - sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; + sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; }; }; "bower-endpoint-parser-0.2.1" = { @@ -2929,2875 +3037,2822 @@ let sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; }; }; - "fs-extra-0.26.7" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "0.26.7"; + "boxen-0.3.1" = { + name = "boxen"; + packageName = "boxen"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; - sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; + url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; + sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; }; }; - "lodash-4.2.1" = { - name = "lodash"; - packageName = "lodash"; - version = "4.2.1"; + "boxen-1.3.0" = { + name = "boxen"; + packageName = "boxen"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"; - sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; + sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc"; }; }; - "promised-temp-0.1.0" = { - name = "promised-temp"; - packageName = "promised-temp"; - version = "0.1.0"; + "bplist-creator-0.0.6" = { + name = "bplist-creator"; + packageName = "bplist-creator"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/promised-temp/-/promised-temp-0.1.0.tgz"; - sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.6.tgz"; + sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e"; }; }; - "semver-5.4.1" = { - name = "semver"; - packageName = "semver"; - version = "5.4.1"; + "bplist-creator-0.0.7" = { + name = "bplist-creator"; + packageName = "bplist-creator"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; + sha1 = "37df1536092824b87c42f957b01344117372ae45"; }; }; - "temp-0.8.3" = { - name = "temp"; - packageName = "temp"; - version = "0.8.3"; + "bplist-parser-0.1.1" = { + name = "bplist-parser"; + packageName = "bplist-parser"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz"; - sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; + url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz"; + sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; }; }; - "glob-6.0.4" = { - name = "glob"; - packageName = "glob"; - version = "6.0.4"; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; - sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; + "braces-0.1.5" = { + name = "braces"; + packageName = "braces"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + url = "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz"; + sha1 = "c085711085291d8b75fdd74eab0f8597280711e6"; }; }; - "deep-extend-0.4.2" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.4.2"; + "braces-1.8.5" = { + name = "braces"; + packageName = "braces"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; - sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; + sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; }; }; - "ext-name-3.0.0" = { - name = "ext-name"; - packageName = "ext-name"; - version = "3.0.0"; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ext-name/-/ext-name-3.0.0.tgz"; - sha1 = "07e4418737cb1f513c32c6ea48d8b8c8e0471abb"; + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8"; }; }; - "graceful-fs-3.0.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "3.0.11"; + "broadway-0.3.6" = { + name = "broadway"; + packageName = "broadway"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz"; - sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; + url = "https://registry.npmjs.org/broadway/-/broadway-0.3.6.tgz"; + sha1 = "7dbef068b954b7907925fd544963b578a902ba7a"; }; }; - "intersect-1.0.1" = { - name = "intersect"; - packageName = "intersect"; - version = "1.0.1"; + "brorand-1.1.0" = { + name = "brorand"; + packageName = "brorand"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz"; - sha1 = "332650e10854d8c0ac58c192bdc27a8bf7e7a30c"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; - "ends-with-0.2.0" = { - name = "ends-with"; - packageName = "ends-with"; - version = "0.2.0"; + "browser-launcher2-0.4.6" = { + name = "browser-launcher2"; + packageName = "browser-launcher2"; + version = "0.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/ends-with/-/ends-with-0.2.0.tgz"; - sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a"; + url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz"; + sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; }; }; - "ext-list-2.2.2" = { - name = "ext-list"; - packageName = "ext-list"; - version = "2.2.2"; + "browser-pack-6.1.0" = { + name = "browser-pack"; + packageName = "browser-pack"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz"; - sha512 = "0a77zmipy5silq8yx7adj0hw82ccvshbs5alv3h8l0vk83lkm5m7pw6y2781wnbks8h98ixyn2q3q065l6m8pwbrhxa3bcvrf191r5v"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz"; + sha512 = "1cav0iv5irfvilx6x14zbxil5m012hxan16cgyp9yjs6fqfg6fny2cdjimfwgil9ma8n4w8g8wv4yn843sz257p44vkbaz8qn1jxdks"; }; }; - "meow-3.7.0" = { - name = "meow"; - packageName = "meow"; - version = "3.7.0"; + "browser-resolve-1.11.2" = { + name = "browser-resolve"; + packageName = "browser-resolve"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; - sha1 = "72cb668b425228290abbfa856892587308a801fb"; + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; + sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; }; }; - "sort-keys-length-1.0.1" = { - name = "sort-keys-length"; - packageName = "sort-keys-length"; - version = "1.0.1"; + "browser-stdout-1.3.1" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz"; - sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; + sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; }; }; - "mime-db-1.31.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.31.0"; + "browserify-13.3.0" = { + name = "browserify"; + packageName = "browserify"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz"; - sha512 = "1yvkd7sias7i24nvvbv8kj6sagzn758wclfky650vs38mhz0aq28bwcyg3y8nx13pa2fck3kdn5855cg62rxs3px8fj7l3rbkvg07d0"; + url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; }; - "camelcase-keys-2.1.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "2.1.0"; + "browserify-14.4.0" = { + name = "browserify"; + packageName = "browserify"; + version = "14.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; - sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz"; + sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9"; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; + "browserify-14.5.0" = { + name = "browserify"; + packageName = "browserify"; + version = "14.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz"; + sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; + }; + }; + "browserify-aes-1.2.0" = { + name = "browserify-aes"; + packageName = "browserify-aes"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v"; }; }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; + "browserify-cache-api-3.0.1" = { + name = "browserify-cache-api"; + packageName = "browserify-cache-api"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + url = "https://registry.npmjs.org/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz"; + sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02"; }; }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; + "browserify-cipher-1.0.0" = { + name = "browserify-cipher"; + packageName = "browserify-cipher"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; + sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; }; }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; + "browserify-des-1.0.0" = { + name = "browserify-des"; + packageName = "browserify-des"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; + sha1 = "daa277717470922ed2fe18594118a175439721dd"; }; }; - "normalize-package-data-2.4.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.4.0"; + "browserify-incremental-3.1.1" = { + name = "browserify-incremental"; + packageName = "browserify-incremental"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; + url = "https://registry.npmjs.org/browserify-incremental/-/browserify-incremental-3.1.1.tgz"; + sha1 = "0713cb7587247a632a9f08cf1bd169b878b62a8a"; }; }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; + "browserify-mime-1.2.9" = { + name = "browserify-mime"; + packageName = "browserify-mime"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz"; + sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; }; }; - "read-pkg-up-1.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; + "browserify-package-json-1.0.1" = { + name = "browserify-package-json"; + packageName = "browserify-package-json"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + url = "https://registry.npmjs.org/browserify-package-json/-/browserify-package-json-1.0.1.tgz"; + sha1 = "98dde8aa5c561fd6d3fe49bbaa102b74b396fdea"; }; }; - "redent-1.0.0" = { - name = "redent"; - packageName = "redent"; - version = "1.0.0"; + "browserify-rsa-4.0.1" = { + name = "browserify-rsa"; + packageName = "browserify-rsa"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "trim-newlines-1.0.0" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "1.0.0"; + "browserify-sign-4.0.4" = { + name = "browserify-sign"; + packageName = "browserify-sign"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; }; }; - "camelcase-2.1.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "2.1.1"; + "browserify-transform-tools-1.7.0" = { + name = "browserify-transform-tools"; + packageName = "browserify-transform-tools"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; - sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + url = "https://registry.npmjs.org/browserify-transform-tools/-/browserify-transform-tools-1.7.0.tgz"; + sha1 = "83e277221f63259bed2e7eb2a283a970a501f4c4"; }; }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; + "browserify-zlib-0.1.4" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; + sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; + "browserify-zlib-0.2.0" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; }; }; - "array-find-index-1.0.2" = { - name = "array-find-index"; - packageName = "array-find-index"; - version = "1.0.2"; + "bson-0.1.8" = { + name = "bson"; + packageName = "bson"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; - sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; + url = "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; + sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; }; }; - "hosted-git-info-2.5.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.5.0"; + "buffer-3.6.0" = { + name = "buffer"; + packageName = "buffer"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; + url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; + sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; }; }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; - "validate-npm-package-license-3.0.1" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.1"; + "buffer-5.1.0" = { + name = "buffer"; + packageName = "buffer"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; + sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2"; }; }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; + "buffer-alloc-1.1.0" = { + name = "buffer-alloc"; + packageName = "buffer-alloc"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz"; + sha1 = "05514d33bf1656d3540c684f65b1202e90eca303"; }; }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; + "buffer-alloc-unsafe-0.1.1" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz"; + sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a"; }; }; - "spdx-expression-parse-1.0.4" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "1.0.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/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; + sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; }; }; - "spdx-license-ids-1.2.2" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "1.2.2"; + "buffer-crc32-0.1.1" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz"; + sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526"; }; }; - "find-up-1.1.2" = { - name = "find-up"; - packageName = "find-up"; - version = "1.1.2"; + "buffer-crc32-0.2.1" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; + sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; }; }; - "read-pkg-1.1.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "1.1.0"; + "buffer-crc32-0.2.13" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; }; - "path-exists-2.1.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "2.1.0"; + "buffer-equal-0.0.1" = { + name = "buffer-equal"; + packageName = "buffer-equal"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; + sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; }; }; - "load-json-file-1.1.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "1.1.0"; + "buffer-equal-constant-time-1.0.1" = { + name = "buffer-equal-constant-time"; + packageName = "buffer-equal-constant-time"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; + sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; }; }; - "path-type-1.1.0" = { - name = "path-type"; - packageName = "path-type"; - version = "1.1.0"; + "buffer-equals-1.0.4" = { + name = "buffer-equals"; + packageName = "buffer-equals"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; + sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; + "buffer-fill-0.1.1" = { + name = "buffer-fill"; + packageName = "buffer-fill"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz"; + sha512 = "3nny0zbpnaxp1544gp7lc53jvs1jgzpmp92cy939dik36bi8lvhrsh4g082lxdplwsma22cgg9q93dw5dnbn1ljqkh4fb2i6w3lq032"; }; }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; + "buffer-from-0.1.2" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz"; + sha512 = "2z3dp7smyppzg5yc63hvyfxgrw5d14splmxbknz4v8g6bnncca1acr4xd6l3z13lpp4vj4120pyvk87040ajbx7v24cj9mcgdx8h9a6"; }; }; - "strip-bom-2.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "2.0.0"; + "buffer-from-1.0.0" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz"; + sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk"; }; }; - "error-ex-1.3.1" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.1"; + "buffer-indexof-1.1.1" = { + name = "buffer-indexof"; + packageName = "buffer-indexof"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; - sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; }; }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; + "buffer-more-ints-0.0.2" = { + name = "buffer-more-ints"; + packageName = "buffer-more-ints"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + url = "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz"; + sha1 = "26b3885d10fa13db7fc01aae3aab870199e0124c"; }; }; - "is-utf8-0.2.1" = { - name = "is-utf8"; - packageName = "is-utf8"; - version = "0.2.1"; + "buffer-xor-1.0.3" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; - sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "indent-string-2.1.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "2.1.0"; + "buffercursor-0.0.12" = { + name = "buffercursor"; + packageName = "buffercursor"; + version = "0.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; + sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; }; }; - "strip-indent-1.0.1" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "1.0.1"; + "buffers-0.1.1" = { + name = "buffers"; + packageName = "buffers"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + url = "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; + sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; }; }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; + "bufferutil-2.0.1" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-2.0.1.tgz"; + sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288"; }; }; - "sort-keys-1.1.2" = { - name = "sort-keys"; - packageName = "sort-keys"; - version = "1.1.2"; + "bufferutil-3.0.4" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"; - sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.4.tgz"; + sha512 = "1q344kiig9b8ssskrp7r77kf3xk516bfcjlilgz0a8q5zflz35rnp8im2kx1y9smcp23hw2q1aqsi39i6cb7svzf40a7dk6h4ds54pf"; }; }; - "is-plain-obj-1.1.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "1.1.0"; + "bufferview-1.0.1" = { + name = "bufferview"; + packageName = "bufferview"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + url = "https://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz"; + sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d"; }; }; - "natives-1.1.0" = { - name = "natives"; - packageName = "natives"; - version = "1.1.0"; + "bufrw-1.2.1" = { + name = "bufrw"; + packageName = "bufrw"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz"; - sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; + url = "https://registry.npmjs.org/bufrw/-/bufrw-1.2.1.tgz"; + sha1 = "93f222229b4f5f5e2cd559236891407f9853663b"; }; }; - "jsonfile-2.4.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "2.4.0"; + "buildmail-2.0.0" = { + name = "buildmail"; + packageName = "buildmail"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz"; + sha1 = "f0b7b0a59e9a4a1b5066bbfa051d248f3832eece"; }; }; - "klaw-1.3.1" = { - name = "klaw"; - packageName = "klaw"; - version = "1.3.1"; + "buildmail-4.0.1" = { + name = "buildmail"; + packageName = "buildmail"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"; - sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz"; + sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72"; }; }; - "q-1.5.1" = { - name = "q"; - packageName = "q"; - version = "1.5.1"; + "builtin-modules-1.1.1" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; - sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "rimraf-2.2.8" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.2.8"; + "builtin-status-codes-3.0.0" = { + name = "builtin-status-codes"; + packageName = "builtin-status-codes"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; - "JSONStream-1.3.1" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.3.1"; + "builtins-1.0.3" = { + name = "builtins"; + packageName = "builtins"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz"; - sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a"; + url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; - "assert-1.4.1" = { - name = "assert"; - packageName = "assert"; - version = "1.4.1"; + "bulk-write-stream-1.1.4" = { + name = "bulk-write-stream"; + packageName = "bulk-write-stream"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz"; + sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs"; }; }; - "browser-pack-6.0.2" = { - name = "browser-pack"; - packageName = "browser-pack"; - version = "6.0.2"; + "bunyan-1.5.1" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz"; - sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz"; + sha1 = "5f6e7d44c43b952f56b0f41309e3ab12391b4e2d"; }; }; - "browser-resolve-1.11.2" = { - name = "browser-resolve"; - packageName = "browser-resolve"; - version = "1.11.2"; + "bunyan-1.8.12" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; - sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz"; + sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797"; }; }; - "browserify-zlib-0.2.0" = { - name = "browserify-zlib"; - packageName = "browserify-zlib"; - version = "0.2.0"; + "bunyan-syslog-udp-0.1.0" = { + name = "bunyan-syslog-udp"; + packageName = "bunyan-syslog-udp"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; + url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz"; + sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c"; }; }; - "buffer-5.0.8" = { - name = "buffer"; - packageName = "buffer"; - version = "5.0.8"; + "busboy-0.2.14" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.8.tgz"; - sha512 = "0capij8lgps5fzc5hikkkdsn58lmzfdpni7v2m0ham5r67q24kln1spwz4dnk3nh6zkiqmgz0cqnq591pms1pkkv8prvksd2m1f6yy5"; + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; + sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; }; }; - "cached-path-relative-1.0.1" = { - name = "cached-path-relative"; - packageName = "cached-path-relative"; - version = "1.0.1"; + "byline-5.0.0" = { + name = "byline"; + packageName = "byline"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; - sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; + url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; }; }; - "concat-stream-1.5.2" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.5.2"; + "bytebuffer-3.5.5" = { + name = "bytebuffer"; + packageName = "bytebuffer"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; + url = "https://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.5.tgz"; + sha1 = "7a6faf1a13514b083f1fcf9541c4c9bfbe7e7fd3"; }; }; - "console-browserify-1.1.0" = { - name = "console-browserify"; - packageName = "console-browserify"; - version = "1.1.0"; + "bytes-0.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; - sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz"; + sha1 = "c574812228126d6369d1576925a8579db3f8e5a2"; }; }; - "constants-browserify-1.0.0" = { - name = "constants-browserify"; - packageName = "constants-browserify"; - version = "1.0.0"; + "bytes-0.2.0" = { + name = "bytes"; + packageName = "bytes"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; - sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; + sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; }; }; - "crypto-browserify-3.12.0" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "3.12.0"; + "bytes-0.2.1" = { + name = "bytes"; + packageName = "bytes"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; + url = "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; + sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31"; }; }; - "defined-1.0.0" = { - name = "defined"; - packageName = "defined"; + "bytes-1.0.0" = { + name = "bytes"; + packageName = "bytes"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; - sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; + url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; }; }; - "deps-sort-2.0.0" = { - name = "deps-sort"; - packageName = "deps-sort"; - version = "2.0.0"; + "bytes-2.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz"; - sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; + url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; + sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; }; }; - "domain-browser-1.1.7" = { - name = "domain-browser"; - packageName = "domain-browser"; - version = "1.1.7"; + "bytes-2.4.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz"; - sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc"; + url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; + sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; }; }; - "duplexer2-0.1.4" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.1.4"; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; - sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "events-1.1.1" = { - name = "events"; - packageName = "events"; - version = "1.1.1"; + "bytewise-1.1.0" = { + name = "bytewise"; + packageName = "bytewise"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; - sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; + url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz"; + sha1 = "1d13cbff717ae7158094aa881b35d081b387253e"; }; }; - "has-1.0.1" = { - name = "has"; - packageName = "has"; - version = "1.0.1"; + "bytewise-core-1.2.3" = { + name = "bytewise-core"; + packageName = "bytewise-core"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; - sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; + url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz"; + sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; }; }; - "htmlescape-1.1.1" = { - name = "htmlescape"; - packageName = "htmlescape"; - version = "1.1.1"; + "cacache-10.0.4" = { + name = "cacache"; + packageName = "cacache"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; - sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; + url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz"; + sha512 = "0f1zwi8bbiia995410m24xljd0ra0vk579q7rk48p7mrq9nbilx3qa2rnp7hjdwnvx28zfad0rfdcwyq3blzkb3rk8b9yl77crp960f"; }; }; - "https-browserify-1.0.0" = { - name = "https-browserify"; - packageName = "https-browserify"; - version = "1.0.0"; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; - sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; }; }; - "insert-module-globals-7.0.1" = { - name = "insert-module-globals"; - packageName = "insert-module-globals"; - version = "7.0.1"; + "cacheable-request-2.1.4" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz"; - sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; + sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; }; }; - "labeled-stream-splicer-2.0.0" = { - name = "labeled-stream-splicer"; - packageName = "labeled-stream-splicer"; - version = "2.0.0"; + "cached-path-relative-1.0.1" = { + name = "cached-path-relative"; + packageName = "cached-path-relative"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; - sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; + sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; }; }; - "module-deps-4.1.1" = { - name = "module-deps"; - packageName = "module-deps"; - version = "4.1.1"; + "call-me-maybe-1.0.1" = { + name = "call-me-maybe"; + packageName = "call-me-maybe"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; - sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; - "os-browserify-0.3.0" = { - name = "os-browserify"; - packageName = "os-browserify"; - version = "0.3.0"; + "callback-stream-1.1.0" = { + name = "callback-stream"; + packageName = "callback-stream"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; - sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"; + sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; }; }; - "parents-1.0.1" = { - name = "parents"; - packageName = "parents"; - version = "1.0.1"; + "caller-0.0.1" = { + name = "caller"; + packageName = "caller"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; - sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; + url = "https://registry.npmjs.org/caller/-/caller-0.0.1.tgz"; + sha1 = "f37a1d6ea10e829d94721ae29a90bb4fb52ab767"; }; }; - "path-browserify-0.0.0" = { - name = "path-browserify"; - packageName = "path-browserify"; - version = "0.0.0"; + "caller-callsite-2.0.0" = { + name = "caller-callsite"; + packageName = "caller-callsite"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; - sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; }; }; - "process-0.11.10" = { - name = "process"; - packageName = "process"; - version = "0.11.10"; + "caller-id-0.1.0" = { + name = "caller-id"; + packageName = "caller-id"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; - sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + url = "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz"; + sha1 = "59bdac0893d12c3871408279231f97458364f07b"; }; }; - "querystring-es3-0.2.1" = { - name = "querystring-es3"; - packageName = "querystring-es3"; - version = "0.2.1"; + "caller-path-0.1.0" = { + name = "caller-path"; + packageName = "caller-path"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; - sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + url = "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz"; + sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; }; }; - "read-only-stream-2.0.0" = { - name = "read-only-stream"; - packageName = "read-only-stream"; + "caller-path-2.0.0" = { + name = "caller-path"; + packageName = "caller-path"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz"; - sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; + url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; }; }; - "shasum-1.0.2" = { - name = "shasum"; - packageName = "shasum"; - version = "1.0.2"; + "callsite-1.0.0" = { + name = "callsite"; + packageName = "callsite"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; - sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; + url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; + sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; }; }; - "shell-quote-1.6.1" = { - name = "shell-quote"; - packageName = "shell-quote"; - version = "1.6.1"; + "callsites-0.2.0" = { + name = "callsites"; + packageName = "callsites"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz"; + sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "stream-browserify-2.0.1" = { - name = "stream-browserify"; - packageName = "stream-browserify"; - version = "2.0.1"; + "callsites-2.0.0" = { + name = "callsites"; + packageName = "callsites"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; - sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; }; }; - "stream-http-2.7.2" = { - name = "stream-http"; - packageName = "stream-http"; - version = "2.7.2"; + "camel-case-3.0.0" = { + name = "camel-case"; + packageName = "camel-case"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz"; - sha512 = "09n1hj53jy075fnbsaaiknry7in0l4yarh912abwgvk4hwl33lvn8wrfw891zg5bkfa7sxlmd5yz3xxd4dmcln19bnkahyvd87r6k3k"; + url = "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz"; + sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; }; }; - "subarg-1.0.0" = { - name = "subarg"; - packageName = "subarg"; - version = "1.0.0"; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; - sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; }; }; - "syntax-error-1.3.0" = { - name = "syntax-error"; - packageName = "syntax-error"; - version = "1.3.0"; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; - sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; }; }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; }; }; - "timers-browserify-1.4.2" = { - name = "timers-browserify"; - packageName = "timers-browserify"; - version = "1.4.2"; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"; - sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; }; }; - "tty-browserify-0.0.0" = { - name = "tty-browserify"; - packageName = "tty-browserify"; - version = "0.0.0"; + "camelcase-keys-2.1.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; - sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "url-0.11.0" = { - name = "url"; - packageName = "url"; - version = "0.11.0"; + "camelcase-keys-4.2.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; - sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz"; + sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; - "util-0.10.3" = { - name = "util"; - packageName = "util"; - version = "0.10.3"; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; - sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; }; }; - "vm-browserify-0.0.4" = { - name = "vm-browserify"; - packageName = "vm-browserify"; - version = "0.0.4"; + "caseless-0.11.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; - sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; + sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; }; }; - "jsonparse-1.3.1" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "1.3.1"; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; - sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; + "castv2-0.1.9" = { + name = "castv2"; + packageName = "castv2"; + version = "0.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + url = "https://registry.npmjs.org/castv2/-/castv2-0.1.9.tgz"; + sha1 = "d0b0fab1fd06b0d9cca636886716ec1293a5905a"; }; }; - "combine-source-map-0.7.2" = { - name = "combine-source-map"; - packageName = "combine-source-map"; - version = "0.7.2"; + "castv2-client-1.2.0" = { + name = "castv2-client"; + packageName = "castv2-client"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz"; - sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; + url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz"; + sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544"; }; }; - "umd-3.0.1" = { - name = "umd"; - packageName = "umd"; - version = "3.0.1"; + "catharsis-0.8.9" = { + name = "catharsis"; + packageName = "catharsis"; + version = "0.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"; - sha1 = "8ae556e11011f63c2596708a8837259f01b3d60e"; + url = "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz"; + sha1 = "98cc890ca652dd2ef0e70b37925310ff9e90fc8b"; }; }; - "convert-source-map-1.1.3" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.1.3"; + "caw-2.0.1" = { + name = "caw"; + packageName = "caw"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; - sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; + url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; + sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; }; }; - "inline-source-map-0.6.2" = { - name = "inline-source-map"; - packageName = "inline-source-map"; - version = "0.6.2"; + "ccount-1.0.2" = { + name = "ccount"; + packageName = "ccount"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz"; - sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; + url = "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz"; + sha1 = "53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89"; }; }; - "lodash.memoize-3.0.4" = { - name = "lodash.memoize"; - packageName = "lodash.memoize"; - version = "3.0.4"; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; - sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; }; }; - "resolve-1.1.7" = { - name = "resolve"; - packageName = "resolve"; - version = "1.1.7"; + "chai-4.1.2" = { + name = "chai"; + packageName = "chai"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + url = "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz"; + sha1 = "0f64584ba642f0f2ace2806279f4f06ca23ad73c"; }; }; - "pako-1.0.6" = { - name = "pako"; - packageName = "pako"; - version = "1.0.6"; + "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/pako/-/pako-1.0.6.tgz"; - sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; + url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz"; + sha512 = "1lf4xj5gc7gxbqjx1pmshsddaqah4zlvzm1r4rbrf4rsgjgf2zj9lx8rccgy0y7ps7wv2i1wf259dwd6mj8aaryxdpfryi2rb2glckb"; }; }; - "base64-js-1.2.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.2.1"; + "chainsaw-0.1.0" = { + name = "chainsaw"; + packageName = "chainsaw"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz"; - sha512 = "0dhi66vsajfcm04s11xqklh5lj3abs4ncnl8h3689964aqam3ps9spmc454hz94rz3x1x5l1ad03jrba67mq9zc9vq9a1gchma581bp"; + url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; }; }; - "ieee754-1.1.8" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.1.8"; + "chalk-0.4.0" = { + name = "chalk"; + packageName = "chalk"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; - sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; + url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; }; }; - "date-now-0.1.4" = { - name = "date-now"; - packageName = "date-now"; - version = "0.1.4"; + "chalk-0.5.1" = { + name = "chalk"; + packageName = "chalk"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; - sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; + url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; + sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; }; }; - "browserify-cipher-1.0.0" = { - name = "browserify-cipher"; - packageName = "browserify-cipher"; + "chalk-1.0.0" = { + name = "chalk"; + packageName = "chalk"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; - sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; + url = "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; + sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; }; }; - "browserify-sign-4.0.4" = { - name = "browserify-sign"; - packageName = "browserify-sign"; - version = "4.0.4"; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; - sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; - }; - }; - "create-ecdh-4.0.0" = { - name = "create-ecdh"; - packageName = "create-ecdh"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz"; - sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "create-hash-1.1.3" = { - name = "create-hash"; - packageName = "create-hash"; - version = "1.1.3"; + "chalk-2.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz"; - sha1 = "606042ac8b9262750f483caddab0f5819172d8fd"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; + sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; }; }; - "create-hmac-1.1.6" = { - name = "create-hmac"; - packageName = "create-hmac"; - version = "1.1.6"; + "chalk-2.3.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz"; - sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz"; + sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4"; }; }; - "diffie-hellman-5.0.2" = { - name = "diffie-hellman"; - packageName = "diffie-hellman"; - version = "5.0.2"; + "character-entities-1.2.1" = { + name = "character-entities"; + packageName = "character-entities"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; - sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; + url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz"; + sha1 = "f76871be5ef66ddb7f8f8e3478ecc374c27d6dca"; }; }; - "pbkdf2-3.0.14" = { - name = "pbkdf2"; - packageName = "pbkdf2"; - version = "3.0.14"; + "character-entities-html4-1.1.1" = { + name = "character-entities-html4"; + packageName = "character-entities-html4"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"; - sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; + url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz"; + sha1 = "359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50"; }; }; - "public-encrypt-4.0.0" = { - name = "public-encrypt"; - packageName = "public-encrypt"; - version = "4.0.0"; + "character-entities-legacy-1.1.1" = { + name = "character-entities-legacy"; + packageName = "character-entities-legacy"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; - sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz"; + sha1 = "f40779df1a101872bb510a3d295e1fccf147202f"; }; }; - "randombytes-2.0.5" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.0.5"; + "character-parser-1.2.1" = { + name = "character-parser"; + packageName = "character-parser"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz"; - sha512 = "293m4ffiafbjg0b99a2k78wiffmlwc2v7cigrn5l3n7555x7qxyr34sp0s4p713vwlaf0ny5n57iysgkz08slld3hzw8ci1a2gxjgpi"; + url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"; + sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "randomfill-1.0.3" = { - name = "randomfill"; - packageName = "randomfill"; - version = "1.0.3"; + "character-parser-2.2.0" = { + name = "character-parser"; + packageName = "character-parser"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz"; - sha512 = "08l7hdx65kfxli7g9pcnlv84bdrccj7d267d1kfi93db6a4mihwyhvsipmx2n0yk9z45cs21isgpld6rib5saxg28s2g8nn3ap8dgk0"; + url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz"; + sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; }; }; - "browserify-aes-1.1.1" = { - name = "browserify-aes"; - packageName = "browserify-aes"; + "character-reference-invalid-1.1.1" = { + name = "character-reference-invalid"; + packageName = "character-reference-invalid"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz"; - sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah"; + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz"; + sha1 = "942835f750e4ec61a308e60c2ef8cc1011202efc"; }; }; - "browserify-des-1.0.0" = { - name = "browserify-des"; - packageName = "browserify-des"; - version = "1.0.0"; + "chardet-0.4.2" = { + name = "chardet"; + packageName = "chardet"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; - sha1 = "daa277717470922ed2fe18594118a175439721dd"; + url = "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz"; + sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; }; }; - "evp_bytestokey-1.0.3" = { - name = "evp_bytestokey"; - packageName = "evp_bytestokey"; - version = "1.0.3"; + "charenc-0.0.2" = { + name = "charenc"; + packageName = "charenc"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; + url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; }; }; - "buffer-xor-1.0.3" = { - name = "buffer-xor"; - packageName = "buffer-xor"; - version = "1.0.3"; + "check-error-1.0.2" = { + name = "check-error"; + packageName = "check-error"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; - sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + url = "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"; + sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; - "cipher-base-1.0.4" = { - name = "cipher-base"; - packageName = "cipher-base"; - version = "1.0.4"; + "cheerio-0.17.0" = { + name = "cheerio"; + packageName = "cheerio"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; - sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; + url = "https://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz"; + sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea"; }; }; - "des.js-1.0.0" = { - name = "des.js"; - packageName = "des.js"; - version = "1.0.0"; + "cheerio-0.22.0" = { + name = "cheerio"; + packageName = "cheerio"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; - sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz"; + sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; }; }; - "minimalistic-assert-1.0.0" = { - name = "minimalistic-assert"; - packageName = "minimalistic-assert"; - version = "1.0.0"; + "cheerio-1.0.0-rc.2" = { + name = "cheerio"; + packageName = "cheerio"; + version = "1.0.0-rc.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; - sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz"; + sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"; }; }; - "bn.js-4.11.8" = { - name = "bn.js"; - packageName = "bn.js"; - version = "4.11.8"; + "chmodr-1.0.2" = { + name = "chmodr"; + packageName = "chmodr"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; - sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; + url = "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"; + sha1 = "04662b932d0f02ec66deaa2b0ea42811968e3eb9"; }; }; - "browserify-rsa-4.0.1" = { - name = "browserify-rsa"; - packageName = "browserify-rsa"; - version = "4.0.1"; + "chokidar-1.6.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz"; + sha1 = "90c32ad4802901d7713de532dc284e96a63ad058"; }; }; - "elliptic-6.4.0" = { - name = "elliptic"; - packageName = "elliptic"; - version = "6.4.0"; + "chokidar-1.7.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; - sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; + url = "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz"; + sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; - "parse-asn1-5.1.0" = { - name = "parse-asn1"; - packageName = "parse-asn1"; - version = "5.1.0"; + "chokidar-2.0.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; - sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz"; + sha512 = "0r9sfr7gz91aphg4vk476c4z07gqq6wdyhlhk3brazjwfvqz9jqccl19qyrwiwijx0aw85jw0zhnfayapk9wzzcj9wcqp3dhrfj4vyd"; }; }; - "brorand-1.1.0" = { - name = "brorand"; - packageName = "brorand"; - version = "1.1.0"; + "chownr-0.0.2" = { + name = "chownr"; + packageName = "chownr"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; - sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + url = "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz"; + sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485"; }; }; - "hash.js-1.1.3" = { - name = "hash.js"; - packageName = "hash.js"; - version = "1.1.3"; + "chownr-1.0.1" = { + name = "chownr"; + packageName = "chownr"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz"; - sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx"; + url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; + sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; }; }; - "hmac-drbg-1.0.1" = { - name = "hmac-drbg"; - packageName = "hmac-drbg"; - version = "1.0.1"; + "chrome-trace-event-0.1.2" = { + name = "chrome-trace-event"; + packageName = "chrome-trace-event"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz"; + sha1 = "90f36885d5345a50621332f0717b595883d5d982"; }; }; - "minimalistic-crypto-utils-1.0.1" = { - name = "minimalistic-crypto-utils"; - packageName = "minimalistic-crypto-utils"; - version = "1.0.1"; + "chromecast-player-0.2.3" = { + name = "chromecast-player"; + packageName = "chromecast-player"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + url = "https://registry.npmjs.org/chromecast-player/-/chromecast-player-0.2.3.tgz"; + sha1 = "fe9ce69911c88096d681e4242c1902ad30787216"; }; }; - "asn1.js-4.9.2" = { - name = "asn1.js"; - packageName = "asn1.js"; - version = "4.9.2"; + "chromecast-scanner-0.5.0" = { + name = "chromecast-scanner"; + packageName = "chromecast-scanner"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz"; - sha512 = "071d32h5646ddyfxvmm0yd0xc320zh2cdsjal4hs8cs0hgn9dpq7k9c9ndlhjq3y93nlawkinm99znqvp0cxx61ic7qy4nn7d5arwvg"; + url = "https://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.5.0.tgz"; + sha1 = "01296a3e5d130cce34974eb509cbbc7d6f78dd3d"; }; }; - "ripemd160-2.0.1" = { - name = "ripemd160"; - packageName = "ripemd160"; - version = "2.0.1"; + "chromecasts-1.9.1" = { + name = "chromecasts"; + packageName = "chromecasts"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"; - sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; + url = "https://registry.npmjs.org/chromecasts/-/chromecasts-1.9.1.tgz"; + sha512 = "38g6qhcppxzh5fsrnvvfjnvzjiwdxsz0nsshi55prij4ifj6har7dqs6fzflqimdmkd24vgclkrgb8i96hrpm4hnfy91bp0wzpfzicy"; }; }; - "sha.js-2.4.9" = { - name = "sha.js"; - packageName = "sha.js"; - version = "2.4.9"; + "chromium-pickle-js-0.2.0" = { + name = "chromium-pickle-js"; + packageName = "chromium-pickle-js"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz"; - sha512 = "3l96mlw71zgkmfm9madd3jcndrpm2fm4jz2q5gz9mbm27mdg89hsbrg22pfl32ha76xa3pza83m2mc3b47pnq19mz3j6vkasn9dxk0v"; + url = "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; + sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; }; }; - "hash-base-2.0.2" = { - name = "hash-base"; - packageName = "hash-base"; - version = "2.0.2"; + "chunk-store-stream-2.1.0" = { + name = "chunk-store-stream"; + packageName = "chunk-store-stream"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz"; - sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; + url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-2.1.0.tgz"; + sha512 = "1c9rhwy0ac18jk67fwhgdavc4ax76i7q8qmidj2b3qqdvq9i6ir8w53ylnw7invy7msxzs0538smkvsp47hf30jh0q4xp6n6a95ymcr"; }; }; - "miller-rabin-4.0.1" = { - name = "miller-rabin"; - packageName = "miller-rabin"; - version = "4.0.1"; + "ci-info-1.1.3" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz"; + sha512 = "0p634fyx3kkll2blj5f5bjmz273d7ba201yi3jlrvy7p7lnmmi479d6s3khwmp9lnfrb314l4kw5dq40q60hzfnmfycqibzm3izrbs8"; }; }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; + "cint-8.2.1" = { + name = "cint"; + packageName = "cint"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + url = "https://registry.npmjs.org/cint/-/cint-8.2.1.tgz"; + sha1 = "70386b1b48e2773d0d63166a55aff94ef4456a12"; }; }; - "lexical-scope-1.2.0" = { - name = "lexical-scope"; - packageName = "lexical-scope"; - version = "1.2.0"; + "cipher-base-1.0.4" = { + name = "cipher-base"; + packageName = "cipher-base"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; - sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; + sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; }; }; - "astw-2.2.0" = { - name = "astw"; - packageName = "astw"; - version = "2.2.0"; + "circular-append-file-1.0.1" = { + name = "circular-append-file"; + packageName = "circular-append-file"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; - sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; + url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz"; + sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05"; }; }; - "acorn-4.0.13" = { - name = "acorn"; - packageName = "acorn"; - version = "4.0.13"; + "circular-json-0.3.3" = { + name = "circular-json"; + packageName = "circular-json"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"; - sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz"; + sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji"; }; }; - "stream-splicer-2.0.0" = { - name = "stream-splicer"; - packageName = "stream-splicer"; - version = "2.0.0"; + "circular-json-0.5.1" = { + name = "circular-json"; + packageName = "circular-json"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"; - sha1 = "1b63be438a133e4b671cc1935197600175910d83"; + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.1.tgz"; + sha512 = "1myzlq58v42dc2b1i17rcmvj7529spwcqgzc7j2q663a7xkk4nhzqk6hpw20lvp99iaq0k0zg5p0jzf19n7p0vrg45hk160ai31qf2j"; }; }; - "detective-4.5.0" = { - name = "detective"; - packageName = "detective"; - version = "4.5.0"; + "clarinet-0.11.0" = { + name = "clarinet"; + packageName = "clarinet"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz"; - sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"; + url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz"; + sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719"; }; }; - "stream-combiner2-1.1.1" = { - name = "stream-combiner2"; - packageName = "stream-combiner2"; - version = "1.1.1"; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; - sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; }; }; - "path-platform-0.11.15" = { - name = "path-platform"; - packageName = "path-platform"; - version = "0.11.15"; + "clean-css-3.4.28" = { + name = "clean-css"; + packageName = "clean-css"; + version = "3.4.28"; src = fetchurl { - url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; - sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz"; + sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; - "json-stable-stringify-0.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "0.0.1"; + "clean-css-4.1.11" = { + name = "clean-css"; + packageName = "clean-css"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; - sha1 = "611c23e814db375527df851193db59dd2af27f45"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz"; + sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a"; }; }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; + "clean-stack-1.3.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; + sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; }; }; - "array-filter-0.0.1" = { - name = "array-filter"; - packageName = "array-filter"; - version = "0.0.1"; + "cli-0.6.6" = { + name = "cli"; + packageName = "cli"; + version = "0.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; - sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; + url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; + sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; }; }; - "array-reduce-0.0.0" = { - name = "array-reduce"; - packageName = "array-reduce"; - version = "0.0.0"; + "cli-1.0.1" = { + name = "cli"; + packageName = "cli"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; - sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz"; + sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; - "array-map-0.0.0" = { - name = "array-map"; - packageName = "array-map"; - version = "0.0.0"; + "cli-boxes-1.0.0" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; - sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; }; }; - "builtin-status-codes-3.0.0" = { - name = "builtin-status-codes"; - packageName = "builtin-status-codes"; - version = "3.0.0"; + "cli-color-0.1.7" = { + name = "cli-color"; + packageName = "cli-color"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; - sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + url = "https://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz"; + sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347"; }; }; - "to-arraybuffer-1.0.1" = { - name = "to-arraybuffer"; - packageName = "to-arraybuffer"; - version = "1.0.1"; + "cli-cursor-1.0.2" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; - sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; }; }; - "punycode-1.3.2" = { - name = "punycode"; - packageName = "punycode"; - version = "1.3.2"; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; }; }; - "querystring-0.2.0" = { - name = "querystring"; - packageName = "querystring"; + "cli-list-0.2.0" = { + name = "cli-list"; + packageName = "cli-list"; version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; + url = "https://registry.npmjs.org/cli-list/-/cli-list-0.2.0.tgz"; + sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "inherits-2.0.1" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.1"; + "cli-spinners-1.3.1" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz"; + sha512 = "1vad3gya61nh9npwcrcrq0d7sq9v0a2zaqvvnhbzpqxfp24qkh3xb8372fk9yx7l1nm9gz2gvzjysksh9ggwlvzah1lp816ivkzh0nm"; }; }; - "indexof-0.0.1" = { - name = "indexof"; - packageName = "indexof"; - version = "0.0.1"; + "cli-table-0.3.1" = { + name = "cli-table"; + packageName = "cli-table"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; + sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; }; }; - "array-loop-1.0.0" = { - name = "array-loop"; - packageName = "array-loop"; - version = "1.0.0"; + "cli-table2-0.2.0" = { + name = "cli-table2"; + packageName = "cli-table2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz"; - sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; + url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz"; + sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; }; }; - "array-shuffle-1.0.1" = { - name = "array-shuffle"; - packageName = "array-shuffle"; - version = "1.0.1"; + "cli-truncate-1.1.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz"; - sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a"; + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz"; + sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; }; }; - "castv2-client-1.2.0" = { - name = "castv2-client"; - packageName = "castv2-client"; - version = "1.2.0"; + "cli-width-1.1.1" = { + name = "cli-width"; + packageName = "cli-width"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz"; - sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544"; + url = "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"; + sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"; }; }; - "chalk-1.0.0" = { - name = "chalk"; - packageName = "chalk"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; - sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; - }; - }; - "chromecast-player-0.2.3" = { - name = "chromecast-player"; - packageName = "chromecast-player"; - version = "0.2.3"; + "cli-width-2.2.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/chromecast-player/-/chromecast-player-0.2.3.tgz"; - sha1 = "fe9ce69911c88096d681e4242c1902ad30787216"; + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; }; }; - "debounced-seeker-1.0.0" = { - name = "debounced-seeker"; - packageName = "debounced-seeker"; - version = "1.0.0"; + "cliclopts-1.1.1" = { + name = "cliclopts"; + packageName = "cliclopts"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/debounced-seeker/-/debounced-seeker-1.0.0.tgz"; - sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd"; + url = "https://registry.npmjs.org/cliclopts/-/cliclopts-1.1.1.tgz"; + sha1 = "69431c7cb5af723774b0d3911b4c37512431910f"; }; }; - "diveSync-0.3.0" = { - name = "diveSync"; - packageName = "diveSync"; - version = "0.3.0"; + "cliff-0.1.10" = { + name = "cliff"; + packageName = "cliff"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/diveSync/-/diveSync-0.3.0.tgz"; - sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; + url = "https://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; + sha1 = "53be33ea9f59bec85609ee300ac4207603e52013"; }; }; - "got-1.2.2" = { - name = "got"; - packageName = "got"; - version = "1.2.2"; + "cliff-0.1.9" = { + name = "cliff"; + packageName = "cliff"; + version = "0.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-1.2.2.tgz"; - sha1 = "d9430ba32f6a30218243884418767340aafc0400"; + url = "https://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz"; + sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; - "internal-ip-1.2.0" = { - name = "internal-ip"; - packageName = "internal-ip"; - version = "1.2.0"; + "clipboardy-1.2.3" = { + name = "clipboardy"; + packageName = "clipboardy"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz"; - sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c"; + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz"; + sha512 = "0j60cwp5vpc7v13m0d5rgh6h5jf6yxnywfb1wgbdn7lalklrr5ncvfkkqk6xj7b046bl2jabfqifk3yl6agd93ixfmywif2xfc4hqyr"; }; }; - "keypress-0.2.1" = { - name = "keypress"; - packageName = "keypress"; - version = "0.2.1"; + "clite-0.3.0" = { + name = "clite"; + packageName = "clite"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; - sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; + url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz"; + sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441"; }; }; - "mime-1.4.1" = { - name = "mime"; - packageName = "mime"; - version = "1.4.1"; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; }; }; - "peerflix-0.34.0" = { - name = "peerflix"; - packageName = "peerflix"; - version = "0.34.0"; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.34.0.tgz"; - sha1 = "748f7e401284bf8f2c620264d229223304199dbe"; + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; }; }; - "playerui-1.2.0" = { - name = "playerui"; - packageName = "playerui"; - version = "1.2.0"; + "cliui-4.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz"; - sha1 = "2d59c8cb736e189cb2398cd809469ca47077f812"; + url = "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz"; + sha512 = "0mh539939k4z2nhj5h1m8kdr3bfy2f1kmdkss02cdbyabmpdkc6m22llyykymriahf54gpx6qg9v3vrs51gqgrrfhpsgbdndgjdd3cx"; }; }; - "query-string-1.0.1" = { - name = "query-string"; - packageName = "query-string"; - version = "1.0.1"; + "clivas-0.1.4" = { + name = "clivas"; + packageName = "clivas"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz"; - sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; + url = "https://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz"; + sha1 = "e1c1e481d1273d57f1752132b0e4410a0d88235a"; }; }; - "range-parser-1.2.0" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.0"; + "clivas-0.2.0" = { + name = "clivas"; + packageName = "clivas"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; - sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; + url = "https://registry.npmjs.org/clivas/-/clivas-0.2.0.tgz"; + sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; }; }; - "read-torrent-1.3.0" = { - name = "read-torrent"; - packageName = "read-torrent"; - version = "1.3.0"; + "clone-0.1.5" = { + name = "clone"; + packageName = "clone"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.0.tgz"; - sha1 = "4e0ef5bea6cb24d31843eb6fa8543ad0232ab9f4"; + url = "https://registry.npmjs.org/clone/-/clone-0.1.5.tgz"; + sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042"; }; }; - "router-0.6.2" = { - name = "router"; - packageName = "router"; - version = "0.6.2"; + "clone-0.1.6" = { + name = "clone"; + packageName = "clone"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-0.6.2.tgz"; - sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; + url = "https://registry.npmjs.org/clone/-/clone-0.1.6.tgz"; + sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000"; }; }; - "srt2vtt-1.3.1" = { - name = "srt2vtt"; - packageName = "srt2vtt"; - version = "1.3.1"; + "clone-0.2.0" = { + name = "clone"; + packageName = "clone"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/srt2vtt/-/srt2vtt-1.3.1.tgz"; - sha1 = "c2b5047c2c297b693d3bab518765e4b7c24d8173"; + url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; + sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; }; }; - "stream-transcoder-0.0.5" = { - name = "stream-transcoder"; - packageName = "stream-transcoder"; - version = "0.0.5"; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/stream-transcoder/-/stream-transcoder-0.0.5.tgz"; - sha1 = "68261be4efb48840239b5791af23ee3b8bd79808"; + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; }; }; - "xml2js-0.4.19" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.4.19"; + "clone-2.1.1" = { + name = "clone"; + packageName = "clone"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz"; - sha512 = "3skianymbfq4rg2v5c1vwsz2kmxfik60qa892wh6a3rydd1wrv3l4vgyr8v4wd8krdf42jbmq7blp0ksbmwm332q5yr922fj8jngiks"; + url = "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz"; + sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb"; }; }; - "xspfr-0.3.1" = { - name = "xspfr"; - packageName = "xspfr"; - version = "0.3.1"; + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/xspfr/-/xspfr-0.3.1.tgz"; - sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; }; }; - "castv2-0.1.9" = { - name = "castv2"; - packageName = "castv2"; - version = "0.1.9"; + "clone-buffer-1.0.0" = { + name = "clone-buffer"; + packageName = "clone-buffer"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/castv2/-/castv2-0.1.9.tgz"; - sha1 = "d0b0fab1fd06b0d9cca636886716ec1293a5905a"; + url = "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz"; + sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58"; }; }; - "protobufjs-3.8.2" = { - name = "protobufjs"; - packageName = "protobufjs"; - version = "3.8.2"; + "clone-deep-0.3.0" = { + name = "clone-deep"; + packageName = "clone-deep"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz"; - sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; + url = "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz"; + sha1 = "348c61ae9cdbe0edfe053d91ff4cc521d790ede8"; }; }; - "bytebuffer-3.5.5" = { - name = "bytebuffer"; - packageName = "bytebuffer"; - version = "3.5.5"; + "clone-regexp-1.0.1" = { + name = "clone-regexp"; + packageName = "clone-regexp"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.5.tgz"; - sha1 = "7a6faf1a13514b083f1fcf9541c4c9bfbe7e7fd3"; + url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.1.tgz"; + sha512 = "2dkam277bx7ajypbx3z8jrpigy0lqfflbj3ic5crhprjilxlfm8nh6xzpjm1p3n4ndx6pjw2pnm5shjirs2cj6lg7bnwnqiiksa7j0m"; }; }; - "ascli-0.3.0" = { - name = "ascli"; - packageName = "ascli"; - version = "0.3.0"; + "clone-response-1.0.2" = { + name = "clone-response"; + packageName = "clone-response"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; - sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a"; + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; }; }; - "long-2.4.0" = { - name = "long"; - packageName = "long"; - version = "2.4.0"; + "clone-stats-0.0.1" = { + name = "clone-stats"; + packageName = "clone-stats"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-2.4.0.tgz"; - sha1 = "9fa180bb1d9500cdc29c4156766a1995e1f4524f"; + url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"; + sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; }; }; - "bufferview-1.0.1" = { - name = "bufferview"; - packageName = "bufferview"; - version = "1.0.1"; + "clone-stats-1.0.0" = { + name = "clone-stats"; + packageName = "clone-stats"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz"; - sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d"; + url = "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz"; + sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; }; }; - "colour-0.7.1" = { - name = "colour"; - packageName = "colour"; - version = "0.7.1"; + "cloneable-readable-1.1.2" = { + name = "cloneable-readable"; + packageName = "cloneable-readable"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; - sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778"; + url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz"; + sha512 = "2kg2ysl15s9cxgj62p43gzagfqf3kk2zqj4i6g3ckxs2b0fvx71blw7qy7v7gmy2pi9z9jsrc81v43kz7khagrvhlpwyv55vzibxbh6"; }; }; - "optjs-3.2.2" = { - name = "optjs"; - packageName = "optjs"; - version = "3.2.2"; + "closest-to-2.0.0" = { + name = "closest-to"; + packageName = "closest-to"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz"; - sha1 = "69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"; + url = "https://registry.npmjs.org/closest-to/-/closest-to-2.0.0.tgz"; + sha1 = "bb2a860edb7769b62d04821748ae50da24dbefaa"; }; }; - "has-ansi-1.0.3" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "1.0.3"; + "cmd-shim-2.0.2" = { + name = "cmd-shim"; + packageName = "cmd-shim"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz"; - sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538"; + url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz"; + sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb"; }; }; - "strip-ansi-2.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "2.0.1"; + "cmdln-3.2.1" = { + name = "cmdln"; + packageName = "cmdln"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; - sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"; + url = "https://registry.npmjs.org/cmdln/-/cmdln-3.2.1.tgz"; + sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45"; }; }; - "supports-color-1.3.1" = { - name = "supports-color"; - packageName = "supports-color"; - version = "1.3.1"; + "co-3.0.6" = { + name = "co"; + packageName = "co"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"; - sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d"; + url = "https://registry.npmjs.org/co/-/co-3.0.6.tgz"; + sha1 = "1445f226c5eb956138e68c9ac30167ea7d2e6bda"; }; }; - "ansi-regex-1.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "1.1.1"; + "co-3.1.0" = { + name = "co"; + packageName = "co"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; - sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; + url = "https://registry.npmjs.org/co/-/co-3.1.0.tgz"; + sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; }; }; - "chromecast-scanner-0.5.0" = { - name = "chromecast-scanner"; - packageName = "chromecast-scanner"; - version = "0.5.0"; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.5.0.tgz"; - sha1 = "01296a3e5d130cce34974eb509cbbc7d6f78dd3d"; + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; - "mutate.js-0.2.0" = { - name = "mutate.js"; - packageName = "mutate.js"; - version = "0.2.0"; + "co-from-stream-0.0.0" = { + name = "co-from-stream"; + packageName = "co-from-stream"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz"; - sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef"; + url = "https://registry.npmjs.org/co-from-stream/-/co-from-stream-0.0.0.tgz"; + sha1 = "1a5cd8ced77263946094fa39f2499a63297bcaf9"; }; }; - "promiscuous-0.6.0" = { - name = "promiscuous"; - packageName = "promiscuous"; - version = "0.6.0"; + "co-fs-extra-1.2.1" = { + name = "co-fs-extra"; + packageName = "co-fs-extra"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz"; - sha1 = "54014cd3d62cafe831e3354990c05ff5b78c8892"; + url = "https://registry.npmjs.org/co-fs-extra/-/co-fs-extra-1.2.1.tgz"; + sha1 = "3b6ad77cf2614530f677b1cf62664f5ba756b722"; }; }; - "time-line-1.0.1" = { - name = "time-line"; - packageName = "time-line"; - version = "1.0.1"; + "co-read-0.0.1" = { + name = "co-read"; + packageName = "co-read"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/time-line/-/time-line-1.0.1.tgz"; - sha1 = "afb89542301c3b5010d118c66b5d63920f5e9a7a"; + url = "https://registry.npmjs.org/co-read/-/co-read-0.0.1.tgz"; + sha1 = "f81b3eb8a86675fec51e3d883a7f564e873c9389"; }; }; - "ware-1.3.0" = { - name = "ware"; - packageName = "ware"; - version = "1.3.0"; + "coa-2.0.1" = { + name = "coa"; + packageName = "coa"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz"; - sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"; + url = "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz"; + sha512 = "2nxlq1p7l0446g1hnmpgv37c0m2jqnzfddgsa4ys4p5sapd43mx6p7yas925hjimzzx41jvxr36fvllsziwaliiwbdginq4xx6d61z7"; }; }; - "array-find-0.1.1" = { - name = "array-find"; - packageName = "array-find"; - version = "0.1.1"; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-find/-/array-find-0.1.1.tgz"; - sha1 = "dc813845ad5a9afc35cb92b786c878d81b5b82ce"; + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; - "multicast-dns-4.0.1" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "4.0.1"; + "codecs-1.2.1" = { + name = "codecs"; + packageName = "codecs"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-4.0.1.tgz"; - sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2"; + url = "https://registry.npmjs.org/codecs/-/codecs-1.2.1.tgz"; + sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8"; }; }; - "thunky-0.1.0" = { - name = "thunky"; - packageName = "thunky"; - version = "0.1.0"; + "codepage-1.4.0" = { + name = "codepage"; + packageName = "codepage"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz"; - sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e"; + url = "https://registry.npmjs.org/codepage/-/codepage-1.4.0.tgz"; + sha1 = "ffd5b603ae6a8ebb63559d5fb89a57d12b943837"; }; }; - "wrap-fn-0.1.5" = { - name = "wrap-fn"; - packageName = "wrap-fn"; - version = "0.1.5"; + "coffee-script-1.12.7" = { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz"; - sha1 = "f21b6e41016ff4a7e31720dbc63a09016bdf9845"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; }; }; - "co-3.1.0" = { - name = "co"; - packageName = "co"; - version = "3.1.0"; + "coffee-script-1.6.3" = { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-3.1.0.tgz"; - sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; + sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; }; }; - "append-0.1.1" = { - name = "append"; - packageName = "append"; - version = "0.1.1"; + "collapse-white-space-1.0.3" = { + name = "collapse-white-space"; + packageName = "collapse-white-space"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/append/-/append-0.1.1.tgz"; - sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz"; + sha1 = "4b906f670e5a963a87b76b0e1689643341b6023c"; }; }; - "object-assign-1.0.0" = { - name = "object-assign"; - packageName = "object-assign"; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; - sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; - "airplay-js-0.2.16" = { - name = "airplay-js"; - packageName = "airplay-js"; - version = "0.2.16"; + "color-3.0.0" = { + name = "color"; + packageName = "color"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/airplay-js/-/airplay-js-0.2.16.tgz"; - sha1 = "48566d5fa55a921d80187ad946f7e8f7555902a1"; + url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz"; + sha512 = "3xh3l9zhh6dav7pp5hy88kbb6c52j0pf331ywpp6w2jaf94w25fjn4am930775mskxy75cxl90fji17cym40ivslxxlpcrlxgkmsalc"; }; }; - "clivas-0.1.4" = { - name = "clivas"; - packageName = "clivas"; - version = "0.1.4"; + "color-convert-1.9.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz"; - sha1 = "e1c1e481d1273d57f1752132b0e4410a0d88235a"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz"; + sha512 = "32rj1090g95xcvm0d2ya6jbqdhiy9w2wv3picdy33fzrm455v0gi7g4n8lw0n31g37wwbdnz7lxjsisgbsaqz1d10j9nh5hi2f9lccs"; }; }; - "inquirer-0.8.5" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.8.5"; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz"; - sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df"; + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; }; - "network-address-0.0.5" = { - name = "network-address"; - packageName = "network-address"; - version = "0.0.5"; + "color-string-1.5.2" = { + name = "color-string"; + packageName = "color-string"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz"; - sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc"; + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz"; + sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; }; }; - "numeral-1.5.6" = { - name = "numeral"; - packageName = "numeral"; - version = "1.5.6"; + "color-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz"; - sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a"; }; }; - "open-0.0.5" = { - name = "open"; - packageName = "open"; - version = "0.0.5"; + "colors-0.5.1" = { + name = "colors"; + packageName = "colors"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; - sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; + url = "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; + sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; }; }; - "optimist-0.6.1" = { - name = "optimist"; - packageName = "optimist"; - version = "0.6.1"; + "colors-0.6.2" = { + name = "colors"; + packageName = "colors"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; }; }; - "parse-torrent-5.8.3" = { - name = "parse-torrent"; - packageName = "parse-torrent"; - version = "5.8.3"; + "colors-1.0.3" = { + name = "colors"; + packageName = "colors"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; - sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; + url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; - "pump-0.3.5" = { - name = "pump"; - packageName = "pump"; - version = "0.3.5"; + "colors-1.1.2" = { + name = "colors"; + packageName = "colors"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz"; - sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b"; + url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; - "rc-0.4.0" = { - name = "rc"; - packageName = "rc"; - version = "0.4.0"; + "colors-1.2.1" = { + name = "colors"; + packageName = "colors"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz"; - sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; + url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz"; + sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk"; }; }; - "torrent-stream-1.0.3" = { - name = "torrent-stream"; - packageName = "torrent-stream"; - version = "1.0.3"; + "colour-0.7.1" = { + name = "colour"; + packageName = "colour"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.3.tgz"; - sha1 = "d8c043b44c3c448c9397a3aec42d2df55887037b"; + url = "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; + sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778"; }; }; - "windows-no-runnable-0.0.6" = { - name = "windows-no-runnable"; - packageName = "windows-no-runnable"; - version = "0.0.6"; + "columnify-1.5.4" = { + name = "columnify"; + packageName = "columnify"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz"; - sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; + url = "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz"; + sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; }; }; - "mdns-js-0.5.3" = { - name = "mdns-js"; - packageName = "mdns-js"; - version = "0.5.3"; + "combine-lists-1.0.1" = { + name = "combine-lists"; + packageName = "combine-lists"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.3.tgz"; - sha1 = "add2958d399319b6d8f2dde29bebac5e845e8b6d"; + url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; + sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "plist-2.1.0" = { - name = "plist"; - packageName = "plist"; - version = "2.1.0"; + "combine-source-map-0.8.0" = { + name = "combine-source-map"; + packageName = "combine-source-map"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz"; - sha1 = "57ccdb7a0821df21831217a3cad54e3e146a1025"; + url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz"; + sha1 = "a58d0df042c186fcf822a8e8015f5450d2d79a8b"; }; }; - "dns-js-0.2.1" = { - name = "dns-js"; - packageName = "dns-js"; - version = "0.2.1"; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz"; - sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "semver-5.1.1" = { - name = "semver"; - packageName = "semver"; - version = "5.1.1"; + "combined-stream-1.0.6" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.1.1.tgz"; - sha1 = "a3292a373e6f3e0798da0b20641b9a9c5bc47e19"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; - "qap-3.2.2" = { - name = "qap"; - packageName = "qap"; - version = "3.2.2"; + "command-join-2.0.0" = { + name = "command-join"; + packageName = "command-join"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/qap/-/qap-3.2.2.tgz"; - sha1 = "52a03f43adbb2fd45b6d2461e8121e650db43338"; + url = "https://registry.npmjs.org/command-join/-/command-join-2.0.0.tgz"; + sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf"; }; }; - "base64-js-1.2.0" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.2.0"; + "commander-0.6.1" = { + name = "commander"; + packageName = "commander"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; - sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; + url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; }; }; - "xmlbuilder-8.2.2" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "8.2.2"; + "commander-1.0.4" = { + name = "commander"; + packageName = "commander"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"; - sha1 = "69248673410b4ba42e1a6136551d2922335aa773"; + url = "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz"; + sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3"; }; }; - "cli-width-1.1.1" = { - name = "cli-width"; - packageName = "cli-width"; + "commander-1.1.1" = { + name = "commander"; + packageName = "commander"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"; - sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"; + url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; + sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; }; }; - "figures-1.7.0" = { - name = "figures"; - packageName = "figures"; - version = "1.7.0"; + "commander-1.3.1" = { + name = "commander"; + packageName = "commander"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"; - sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; + sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; }; }; - "lodash-3.10.1" = { - name = "lodash"; - packageName = "lodash"; - version = "3.10.1"; + "commander-1.3.2" = { + name = "commander"; + packageName = "commander"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; - sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; + url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; }; }; - "readline2-0.1.1" = { - name = "readline2"; - packageName = "readline2"; - version = "0.1.1"; + "commander-2.0.0" = { + name = "commander"; + packageName = "commander"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz"; - sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568"; + url = "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; + sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; }; }; - "rx-2.5.3" = { - name = "rx"; - packageName = "rx"; - version = "2.5.3"; + "commander-2.1.0" = { + name = "commander"; + packageName = "commander"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz"; - sha1 = "21adc7d80f02002af50dae97fd9dbf248755f566"; + url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; }; }; - "mute-stream-0.0.4" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.4"; + "commander-2.11.0" = { + name = "commander"; + packageName = "commander"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; - sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; }; }; - "wordwrap-0.0.3" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.3"; + "commander-2.13.0" = { + name = "commander"; + packageName = "commander"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + url = "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz"; + sha512 = "1h27ar13gbld2jk6wk84irqmyz6ya6b4dzmxb6nq8azyi48iq8pqqyq90jwzxqb3i7j167y5fpiys6v7vvjzhm8bbd8rya1kzgr4nri"; }; }; - "minimist-0.0.10" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.10"; + "commander-2.14.1" = { + name = "commander"; + packageName = "commander"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; + sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; }; }; - "blob-to-buffer-1.2.6" = { - name = "blob-to-buffer"; - packageName = "blob-to-buffer"; - version = "1.2.6"; + "commander-2.15.1" = { + name = "commander"; + packageName = "commander"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.6.tgz"; - sha1 = "089ac264c686b73ead6c539a484a8003bfbb2033"; + url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; + sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn"; }; }; - "get-stdin-5.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "5.0.1"; + "commander-2.6.0" = { + name = "commander"; + packageName = "commander"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz"; - sha1 = "122e161591e21ff4c52530305693f20e6393a398"; + url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; + sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; }; }; - "magnet-uri-5.1.7" = { - name = "magnet-uri"; - packageName = "magnet-uri"; - version = "5.1.7"; + "commander-2.8.1" = { + name = "commander"; + packageName = "commander"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.7.tgz"; - sha1 = "8f8016ab74c415f274f4fb1943faaf7e92030eff"; + url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; + sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; }; }; - "parse-torrent-file-4.0.3" = { - name = "parse-torrent-file"; - packageName = "parse-torrent-file"; - version = "4.0.3"; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz"; - sha512 = "2shaz6cv4fgbmy1hq6hc59spkja51qg0vvx514r1nqsspdnsq6xzxabk0gs17x3n8s03y9mj8hx1xn5c0bkq9fvx59sxms2a4mlig9r"; + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "simple-get-2.7.0" = { - name = "simple-get"; - packageName = "simple-get"; - version = "2.7.0"; + "commist-1.0.0" = { + name = "commist"; + packageName = "commist"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz"; - sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6"; + url = "https://registry.npmjs.org/commist/-/commist-1.0.0.tgz"; + sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; }; }; - "thirty-two-1.0.2" = { - name = "thirty-two"; - packageName = "thirty-two"; - version = "1.0.2"; + "common-tags-1.7.2" = { + name = "common-tags"; + packageName = "common-tags"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz"; - sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.7.2.tgz"; + sha512 = "0jx2cncv7x5ms1gg2vks5bhxi9c5jbwymfk42dzmp9vrxrmhrl9vaw4wsh4lvf65shxmq1v8f8s0i3rkyk2x8mrfpq2m30famkgv24f"; }; }; - "uniq-1.0.1" = { - name = "uniq"; - packageName = "uniq"; + "commondir-1.0.1" = { + name = "commondir"; + packageName = "commondir"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; - sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; }; }; - "bencode-1.0.0" = { - name = "bencode"; - packageName = "bencode"; - version = "1.0.0"; + "commoner-0.10.8" = { + name = "commoner"; + packageName = "commoner"; + version = "0.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz"; - sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p"; + url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz"; + sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5"; }; }; - "simple-sha1-2.1.0" = { - name = "simple-sha1"; - packageName = "simple-sha1"; - version = "2.1.0"; + "compact2string-1.4.0" = { + name = "compact2string"; + packageName = "compact2string"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz"; - sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3"; + url = "https://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz"; + sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; }; }; - "rusha-0.8.7" = { - name = "rusha"; - packageName = "rusha"; - version = "0.8.7"; + "compare-func-1.3.2" = { + name = "compare-func"; + packageName = "compare-func"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.7.tgz"; - sha1 = "30673b7e95fafe0ebe1fe24dd6d95fd605f94ede"; + url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz"; + sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648"; }; }; - "decompress-response-3.3.0" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "3.3.0"; + "component-bind-1.0.0" = { + name = "component-bind"; + packageName = "component-bind"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; + sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; }; }; - "simple-concat-1.0.0" = { - name = "simple-concat"; - packageName = "simple-concat"; - version = "1.0.0"; + "component-emitter-1.1.2" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz"; - sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; }; }; - "mimic-response-1.0.0" = { - name = "mimic-response"; - packageName = "mimic-response"; - version = "1.0.0"; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; - sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; }; }; - "once-1.2.0" = { - name = "once"; - packageName = "once"; - version = "1.2.0"; + "component-inherit-0.0.3" = { + name = "component-inherit"; + packageName = "component-inherit"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.2.0.tgz"; - sha1 = "de1905c636af874a8fba862d9aabddd1f920461c"; + url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; + sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; }; }; - "end-of-stream-1.0.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.0.0"; + "compress-commons-1.2.2" = { + name = "compress-commons"; + packageName = "compress-commons"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; - sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz"; + sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "once-1.3.3" = { - name = "once"; - packageName = "once"; - version = "1.3.3"; + "compressible-2.0.13" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz"; + sha1 = "0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"; }; }; - "deep-extend-0.2.11" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.2.11"; + "compression-1.5.2" = { + name = "compression"; + packageName = "compression"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"; - sha1 = "7a16ba69729132340506170494bc83f7076fe08f"; + url = "http://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; + sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; }; }; - "strip-json-comments-0.1.3" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "0.1.3"; + "compression-1.7.2" = { + name = "compression"; + packageName = "compression"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"; - sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54"; + url = "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz"; + sha1 = "aaffbcd6aaf854b44ebb280353d5ad1651f59a69"; }; }; - "ini-1.1.0" = { - name = "ini"; - packageName = "ini"; - version = "1.1.0"; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; - sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "bitfield-0.1.0" = { - name = "bitfield"; - packageName = "bitfield"; - version = "0.1.0"; + "concat-stream-1.5.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz"; - sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"; + sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611"; }; }; - "bncode-0.5.3" = { - name = "bncode"; - packageName = "bncode"; - version = "0.5.3"; + "concat-stream-1.5.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz"; - sha1 = "e16661697452d436bf9886238cc791b08d66a61a"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; }; }; - "end-of-stream-0.1.5" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "0.1.5"; + "concat-stream-1.6.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz"; - sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; + sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; }; }; - "fs-chunk-store-1.6.5" = { - name = "fs-chunk-store"; - packageName = "fs-chunk-store"; - version = "1.6.5"; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz"; - sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; }; }; - "hat-0.0.3" = { - name = "hat"; - packageName = "hat"; - version = "0.0.3"; + "conf-1.4.0" = { + name = "conf"; + packageName = "conf"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz"; - sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a"; + url = "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz"; + sha512 = "07g80zfanxf96as7ikxbv6csskj2033zw2hj8jpii0s3wqxjyq1x73fk1bqnj833clsmmiz6khcvid668gji5vsnhgb67ck5mcmafbg"; }; }; - "immediate-chunk-store-1.0.8" = { - name = "immediate-chunk-store"; - packageName = "immediate-chunk-store"; - version = "1.0.8"; + "config-0.4.15" = { + name = "config"; + packageName = "config"; + version = "0.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-1.0.8.tgz"; - sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f"; + url = "https://registry.npmjs.org/config/-/config-0.4.15.tgz"; + sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18"; }; }; - "ip-set-1.0.1" = { - name = "ip-set"; - packageName = "ip-set"; - version = "1.0.1"; + "config-chain-1.1.11" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/ip-set/-/ip-set-1.0.1.tgz"; - sha1 = "633b66d0bd6c8d0de968d053263c9120d3b6727e"; + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; + sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; }; }; - "mkdirp-0.3.5" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.5"; + "configstore-1.4.0" = { + name = "configstore"; + packageName = "configstore"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + url = "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz"; + sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021"; }; }; - "parse-torrent-4.1.0" = { - name = "parse-torrent"; - packageName = "parse-torrent"; - version = "4.1.0"; + "configstore-2.1.0" = { + name = "configstore"; + packageName = "configstore"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-4.1.0.tgz"; - sha1 = "a814bd8505e8b58e88eb8ff3e2daff5d19a711b7"; + url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; + sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; }; }; - "peer-wire-swarm-0.12.1" = { - name = "peer-wire-swarm"; - packageName = "peer-wire-swarm"; - version = "0.12.1"; + "configstore-3.1.2" = { + name = "configstore"; + packageName = "configstore"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.1.tgz"; - sha1 = "51b75da99c335c64c9ba9ef99fe27a4a5951ff42"; + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; + sha512 = "2difdg3f56d584kfxl1zvm4ik5m3ln949m0q9sxq6ranzx2iwqa9zxqxy2l5i2lsm8jwmaiqkf7rc73gfnfip5m2qh8awd3s4ggknxy"; }; }; - "torrent-discovery-5.4.0" = { - name = "torrent-discovery"; - packageName = "torrent-discovery"; - version = "5.4.0"; + "connect-1.9.2" = { + name = "connect"; + packageName = "connect"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz"; - sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; + url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; + sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; }; }; - "torrent-piece-1.1.1" = { - name = "torrent-piece"; - packageName = "torrent-piece"; - version = "1.1.1"; + "connect-2.11.0" = { + name = "connect"; + packageName = "connect"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.1.tgz"; - sha1 = "50346e42a43b35daf2a86f414afb153629a854be"; + url = "https://registry.npmjs.org/connect/-/connect-2.11.0.tgz"; + sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284"; }; }; - "random-access-file-1.8.1" = { - name = "random-access-file"; - packageName = "random-access-file"; - version = "1.8.1"; + "connect-2.3.9" = { + name = "connect"; + packageName = "connect"; + version = "2.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; - sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; + url = "https://registry.npmjs.org/connect/-/connect-2.3.9.tgz"; + sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; - "run-parallel-1.1.6" = { - name = "run-parallel"; - packageName = "run-parallel"; - version = "1.1.6"; + "connect-2.30.2" = { + name = "connect"; + packageName = "connect"; + version = "2.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.6.tgz"; - sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039"; + url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz"; + sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; }; }; - "thunky-1.0.2" = { - name = "thunky"; - packageName = "thunky"; - version = "1.0.2"; + "connect-2.7.6" = { + name = "connect"; + packageName = "connect"; + version = "2.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz"; - sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; + url = "https://registry.npmjs.org/connect/-/connect-2.7.6.tgz"; + sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738"; }; }; - "buffer-alloc-unsafe-1.0.0" = { - name = "buffer-alloc-unsafe"; - packageName = "buffer-alloc-unsafe"; - version = "1.0.0"; + "connect-3.5.1" = { + name = "connect"; + packageName = "connect"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; - sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + url = "https://registry.npmjs.org/connect/-/connect-3.5.1.tgz"; + sha1 = "6d30d7a63c7f170857a6b3aa6b363d973dca588e"; }; }; - "ip-1.1.5" = { - name = "ip"; - packageName = "ip"; - version = "1.1.5"; + "connect-3.6.6" = { + name = "connect"; + packageName = "connect"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; - sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"; + sha1 = "09eff6c55af7236e137135a72574858b6786f524"; }; }; - "magnet-uri-4.2.3" = { - name = "magnet-uri"; - packageName = "magnet-uri"; - version = "4.2.3"; + "connect-busboy-0.0.2" = { + name = "connect-busboy"; + packageName = "connect-busboy"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz"; - sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8"; + url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz"; + sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097"; }; }; - "parse-torrent-file-2.1.4" = { - name = "parse-torrent-file"; - packageName = "parse-torrent-file"; - version = "2.1.4"; + "connect-flash-0.1.0" = { + name = "connect-flash"; + packageName = "connect-flash"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-2.1.4.tgz"; - sha1 = "32d4b6afde631420e5f415919a222b774b575707"; + url = "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz"; + sha1 = "82b381d61a12b651437df1c259c1f1c841239b88"; }; }; - "flatten-0.0.1" = { - name = "flatten"; - packageName = "flatten"; - version = "0.0.1"; + "connect-multiparty-2.1.0" = { + name = "connect-multiparty"; + packageName = "connect-multiparty"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz"; - sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; + url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.1.0.tgz"; + sha512 = "2im4bqk3xwxwilkg8gli3pblmalbhsd4wl5w10p63bvl0jd3m0qp5by840k5s7dr8wi0krixp2297bn76v38dwgznja4h4wp6my3g0c"; }; }; - "thirty-two-0.0.2" = { - name = "thirty-two"; - packageName = "thirty-two"; - version = "0.0.2"; + "connect-pause-0.1.1" = { + name = "connect-pause"; + packageName = "connect-pause"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz"; - sha1 = "4253e29d8cb058f0480267c5698c0e4927e54b6a"; + url = "https://registry.npmjs.org/connect-pause/-/connect-pause-0.1.1.tgz"; + sha1 = "b269b2bb82ddb1ac3db5099c0fb582aba99fb37a"; }; }; - "bencode-0.7.0" = { - name = "bencode"; - packageName = "bencode"; - version = "0.7.0"; + "connect-restreamer-1.0.3" = { + name = "connect-restreamer"; + packageName = "connect-restreamer"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-0.7.0.tgz"; - sha1 = "811ed647c0118945e41bb4bbbdea9a2c78a17083"; + url = "https://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.3.tgz"; + sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9"; }; }; - "fifo-0.1.4" = { - name = "fifo"; - packageName = "fifo"; - version = "0.1.4"; + "connect-timeout-1.6.2" = { + name = "connect-timeout"; + packageName = "connect-timeout"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz"; - sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34"; + url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz"; + sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e"; }; }; - "peer-wire-protocol-0.7.0" = { - name = "peer-wire-protocol"; - packageName = "peer-wire-protocol"; - version = "0.7.0"; + "connection-parse-0.0.7" = { + name = "connection-parse"; + packageName = "connection-parse"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz"; - sha1 = "6c015abf24b4877ed9eca3822b22d996078011da"; + url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; + sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; }; }; - "speedometer-0.1.4" = { - name = "speedometer"; - packageName = "speedometer"; - version = "0.1.4"; + "connections-1.4.2" = { + name = "connections"; + packageName = "connections"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz"; - sha1 = "9876dbd2a169d3115402d48e6ea6329c8816a50d"; + url = "https://registry.npmjs.org/connections/-/connections-1.4.2.tgz"; + sha1 = "7890482bf5c71af6c5ca192be3136aed74428aad"; }; }; - "utp-0.0.7" = { - name = "utp"; - packageName = "utp"; - version = "0.0.7"; + "console-browserify-1.1.0" = { + name = "console-browserify"; + packageName = "console-browserify"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/utp/-/utp-0.0.7.tgz"; - sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; }; }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "bncode-0.2.3" = { - name = "bncode"; - packageName = "bncode"; - version = "0.2.3"; + "consolidate-0.14.5" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz"; - sha1 = "37f851dc8e47188a83fbc0f6fa4775cacc9a3296"; + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz"; + sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; - "cyclist-0.1.1" = { - name = "cyclist"; - packageName = "cyclist"; - version = "0.1.1"; + "constantinople-3.0.2" = { + name = "constantinople"; + packageName = "constantinople"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cyclist/-/cyclist-0.1.1.tgz"; - sha1 = "1bcfa56b081448cdb5e12bfc1bfad34b47fba8f3"; + url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz"; + sha1 = "4b945d9937907bcd98ee575122c3817516544141"; }; }; - "bittorrent-dht-6.4.2" = { - name = "bittorrent-dht"; - packageName = "bittorrent-dht"; - version = "6.4.2"; + "constantinople-3.1.2" = { + name = "constantinople"; + packageName = "constantinople"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz"; - sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6"; + url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz"; + sha512 = "2xnhrmlbkfpcvckxxrl0hjp6qhhqv1p7c6pwxgqp1g0sa5q5cc514xn48g9x8kqj7g1imzciwgb2msbhvhn0w0v92mb7105l43drqy9"; }; }; - "bittorrent-tracker-7.7.0" = { - name = "bittorrent-tracker"; - packageName = "bittorrent-tracker"; - version = "7.7.0"; + "constants-browserify-1.0.0" = { + name = "constants-browserify"; + packageName = "constants-browserify"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-7.7.0.tgz"; - sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "re-emitter-1.1.3" = { - name = "re-emitter"; - packageName = "re-emitter"; - version = "1.1.3"; + "consume-http-header-1.0.0" = { + name = "consume-http-header"; + packageName = "consume-http-header"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/re-emitter/-/re-emitter-1.1.3.tgz"; - sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; + url = "https://registry.npmjs.org/consume-http-header/-/consume-http-header-1.0.0.tgz"; + sha1 = "95976d74f7f1b38dfb13fd9b3b68b91a0240556f"; }; }; - "buffer-equals-1.0.4" = { - name = "buffer-equals"; - packageName = "buffer-equals"; - version = "1.0.4"; + "consume-until-1.0.0" = { + name = "consume-until"; + packageName = "consume-until"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; - sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; + url = "https://registry.npmjs.org/consume-until/-/consume-until-1.0.0.tgz"; + sha1 = "75b91fa9f16663e51f98e863af995b9164068c1a"; }; }; - "k-bucket-0.6.0" = { - name = "k-bucket"; - packageName = "k-bucket"; - version = "0.6.0"; + "content-disposition-0.5.0" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz"; - sha1 = "afc532545f69d466293e887b00d5fc73377c3abb"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; }; }; - "k-rpc-3.7.0" = { - name = "k-rpc"; - packageName = "k-rpc"; - version = "3.7.0"; + "content-disposition-0.5.2" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc/-/k-rpc-3.7.0.tgz"; - sha1 = "641f99b2825be34b6e7984f22b7962dc1a906c23"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; + sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; }; }; - "lru-2.0.1" = { - name = "lru"; - packageName = "lru"; - version = "2.0.1"; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lru/-/lru-2.0.1.tgz"; - sha1 = "f979871e162e3f5ca254be46844c53d4c5364544"; + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; }; }; - "buffer-equal-0.0.1" = { - name = "buffer-equal"; - packageName = "buffer-equal"; - version = "0.0.1"; + "content-type-git+https://github.com/wikimedia/content-type#master" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.1"; + src = fetchgit { + url = "https://github.com/wikimedia/content-type"; + rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; + sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; + }; + }; + "content-types-0.1.0" = { + name = "content-types"; + packageName = "content-types"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; - sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; + url = "https://registry.npmjs.org/content-types/-/content-types-0.1.0.tgz"; + sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "k-bucket-2.0.1" = { - name = "k-bucket"; - packageName = "k-bucket"; - version = "2.0.1"; + "continuable-cache-0.3.1" = { + name = "continuable-cache"; + packageName = "continuable-cache"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz"; - sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; + url = "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz"; + sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; }; }; - "k-rpc-socket-1.7.1" = { - name = "k-rpc-socket"; - packageName = "k-rpc-socket"; - version = "1.7.1"; + "conventional-changelog-1.1.23" = { + name = "conventional-changelog"; + packageName = "conventional-changelog"; + version = "1.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.1.tgz"; - sha512 = "1xigw4j1na5gxiff1dad35vn0h91i77a9jzwsczl47rypanm2vfwyx2zchzdgny7mrxrn14bk9xss16nj2k3vng60v8pc7snjdc6q8n"; + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.23.tgz"; + sha512 = "2775l94nr8rbnvhihkrwyszncc2g7z1kvbsqpbvni86h8072xvxngbba6yxzzw4dfs57ghklkh9l0ibjy17rl7ldrh6q9lpyd9xf8y8"; }; }; - "bencode-0.8.0" = { - name = "bencode"; - packageName = "bencode"; - version = "0.8.0"; + "conventional-changelog-angular-1.6.6" = { + name = "conventional-changelog-angular"; + packageName = "conventional-changelog-angular"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-0.8.0.tgz"; - sha1 = "3143448e82b0fadc745633ecc2a5f8fa87932f19"; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz"; + sha512 = "0v02kj8l2ji18jmcgjqa0nqsfn4h9jklgy4g9brf1ppm0n8344in3xpmyc5y06i5k3jjxl8sv90cndh2fbg4fhn0wr1ric258ajgr5j"; }; }; - "compact2string-1.4.0" = { - name = "compact2string"; - packageName = "compact2string"; - version = "1.4.0"; + "conventional-changelog-atom-0.2.8" = { + name = "conventional-changelog-atom"; + packageName = "conventional-changelog-atom"; + version = "0.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz"; - sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; + url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz"; + sha512 = "3m1yhgjwbz0x993dfdw3g2n4svz4ym4k1snhg57iraw1418glgdwpz52j01300v8d1p6ldjjbrv7x3gqa08xcqq6inpkbhv2fmdk4zj"; }; }; - "random-iterate-1.0.1" = { - name = "random-iterate"; - packageName = "random-iterate"; - version = "1.0.1"; + "conventional-changelog-cli-1.3.21" = { + name = "conventional-changelog-cli"; + packageName = "conventional-changelog-cli"; + version = "1.3.21"; src = fetchurl { - url = "https://registry.npmjs.org/random-iterate/-/random-iterate-1.0.1.tgz"; - sha1 = "f7d97d92dee6665ec5f6da08c7f963cad4b2ac99"; + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.21.tgz"; + sha512 = "1n93839r75vwj9fl4i3x3l06zc84kin92cp8nrlxksga9lqdpxc8b8i72wvi9jvwk0z6i29wisxdpiw6y7rrmdl13ch9f3k7jb43m9b"; }; }; - "run-series-1.1.4" = { - name = "run-series"; - packageName = "run-series"; - version = "1.1.4"; + "conventional-changelog-codemirror-0.3.8" = { + name = "conventional-changelog-codemirror"; + packageName = "conventional-changelog-codemirror"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz"; - sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; + url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz"; + sha512 = "24l71rg9rqfl9aa8fi3c1dc2iqxmdsh6ba8b9rwrrj7dg1gzfc5afw03rns5b1h6zld15942aqsjvwklwp6myzw3q1aakaps0m5jwfw"; }; }; - "simple-peer-6.4.4" = { - name = "simple-peer"; - packageName = "simple-peer"; - version = "6.4.4"; + "conventional-changelog-core-2.0.10" = { + name = "conventional-changelog-core"; + packageName = "conventional-changelog-core"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.4.tgz"; - sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.10.tgz"; + sha512 = "19pvarpv78qfmlnsz11c8anrwfg1v04qmwrsrcnai8p3xmbzdyvp1znz9j23l0i6l26yabkd4b631wybnkgxr4qgwzgb9hvf8fhvz8l"; }; }; - "simple-websocket-4.3.1" = { - name = "simple-websocket"; - packageName = "simple-websocket"; - version = "4.3.1"; + "conventional-changelog-ember-0.3.11" = { + name = "conventional-changelog-ember"; + packageName = "conventional-changelog-ember"; + version = "0.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.1.tgz"; - sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.11.tgz"; + sha512 = "1pm9wncjsfizvxzf84fp9ywdfm0znj0af0h2012ylazva8iis7zp4vph9ymrnd87kfmdv5gk2s0nsq8gqm6vxh87vbdykg640zczf0j"; }; }; - "string2compact-1.2.2" = { - name = "string2compact"; - packageName = "string2compact"; - version = "1.2.2"; + "conventional-changelog-eslint-1.0.9" = { + name = "conventional-changelog-eslint"; + packageName = "conventional-changelog-eslint"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.2.tgz"; - sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b"; + url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz"; + sha512 = "3nl1q7m2f7yf8fr40dpns2x6n9z3n8m4kd74fxn2z4d0v0dp2si3h2xbg339984wyfa1ina5w61n6q8n1pcybwjghyxjzbnb1yygkl7"; }; }; - "ws-1.1.5" = { - name = "ws"; - packageName = "ws"; - version = "1.1.5"; + "conventional-changelog-express-0.3.6" = { + name = "conventional-changelog-express"; + packageName = "conventional-changelog-express"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; - sha512 = "3iv2yz706h7wyg563jsfjdykkkxs8j49vz60r6qx5by0npfhs98rgc114kdqs15sc52mldscc22bkfpkrs08cwlqaxx8lfdjn5alwm3"; + url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz"; + sha512 = "3qvnznizyjsb4nxznraiw24wydli7ky95905792az7mgm4dpc0hhxg6l9n5jlx5saglig9sm2gi3i0grqy39plvkp8ikxar2as9a9fy"; }; }; - "ipaddr.js-1.5.4" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.5.4"; + "conventional-changelog-jquery-0.1.0" = { + name = "conventional-changelog-jquery"; + packageName = "conventional-changelog-jquery"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.4.tgz"; - sha1 = "962263d9d26132956fc5c630b638a30d3cdffc14"; + url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz"; + sha1 = "0208397162e3846986e71273b6c79c5b5f80f510"; }; }; - "get-browser-rtc-1.0.2" = { - name = "get-browser-rtc"; - packageName = "get-browser-rtc"; - version = "1.0.2"; + "conventional-changelog-jscs-0.1.0" = { + name = "conventional-changelog-jscs"; + packageName = "conventional-changelog-jscs"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz"; - sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; + url = "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz"; + sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"; }; }; - "ws-2.3.1" = { - name = "ws"; - packageName = "ws"; - version = "2.3.1"; + "conventional-changelog-jshint-0.3.8" = { + name = "conventional-changelog-jshint"; + packageName = "conventional-changelog-jshint"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz"; - sha1 = "6b94b3e447cb6a363f785eaf94af6359e8e81c80"; + url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz"; + sha512 = "25274wd4xzrjinpfglybkna5wm74wnfqhyll32ixz8fnq43gg50b99ip2sj17nqd5x9a5l111d0922gqv9j93q2sdwrbzs8hr9m0zw6"; }; }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; + "conventional-changelog-preset-loader-1.1.8" = { + name = "conventional-changelog-preset-loader"; + packageName = "conventional-changelog-preset-loader"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz"; + sha512 = "1rl5rdcffc9nr30wxf718hl5qkcnb5hi5d85rchw48v2gyjbw371910qcd9v7pwfc9isrg1xxg8npnq2lxnv31xjp6dlqdqh4rjqj9j"; }; }; - "ultron-1.1.0" = { - name = "ultron"; - packageName = "ultron"; - version = "1.1.0"; + "conventional-changelog-writer-3.0.9" = { + name = "conventional-changelog-writer"; + packageName = "conventional-changelog-writer"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz"; - sha1 = "b07a2e6a541a815fc6a34ccd4533baec307ca864"; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz"; + sha512 = "3ypk00r7ddkzx8ayyzdss65167c8h4qgn7f0m2p7zif0sw55ljpbx07zr0hmw8rkyzq0dv7ydr5l14wa60c1fkja8n19ia936rrpllz"; }; }; - "addr-to-ip-port-1.4.2" = { - name = "addr-to-ip-port"; - packageName = "addr-to-ip-port"; - version = "1.4.2"; + "conventional-commits-filter-1.1.6" = { + name = "conventional-commits-filter"; + packageName = "conventional-commits-filter"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.2.tgz"; - sha1 = "7e46ff1f26b7a9f5e33fd839d57aef6303b4c692"; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz"; + sha512 = "38pzjvxmmjg6y92qyskzpxngphp9s5lxy89ldq9mwx4dcy4n8am2d57j1w4gb7h2fkggbfy5744xrj7ycz2v5afr8hj892a4jsf1h19"; }; }; - "options-0.0.6" = { - name = "options"; - packageName = "options"; - version = "0.0.6"; + "conventional-commits-parser-2.1.7" = { + name = "conventional-commits-parser"; + packageName = "conventional-commits-parser"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz"; + sha512 = "0ahfqxbkswm1pnbj477wz7kl2588dbg8skjz7xzyykv4w2bw9aal3idvs8kjchlv140s64jcfa2clli93phw4jk85wa09q4s9sim0q6"; }; }; - "ultron-1.0.2" = { - name = "ultron"; - packageName = "ultron"; - version = "1.0.2"; + "conventional-recommended-bump-1.2.1" = { + name = "conventional-recommended-bump"; + packageName = "conventional-recommended-bump"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz"; + sha512 = "3irsgzxrhc2s4y4mlq7vmrvrhn74kpda34sn2ladm98q4gy88l7dpqxs8xf6lxm4sai5qqwzxk1gzlrfgvsrmfzzvmxk0hi77lcd650"; }; }; - "chalk-0.5.1" = { - name = "chalk"; - packageName = "chalk"; - version = "0.5.1"; + "convert-source-map-1.1.3" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; - sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; + sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; }; }; - "pad-0.0.5" = { - name = "pad"; - packageName = "pad"; - version = "0.0.5"; + "convert-source-map-1.5.1" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pad/-/pad-0.0.5.tgz"; - sha1 = "2219ab4db2ac74549a676164bc475d68cb87de05"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz"; + sha1 = "b8278097b9bc229365de5c62cf5fcaed8b5599e5"; }; }; - "single-line-log-0.4.1" = { - name = "single-line-log"; - packageName = "single-line-log"; - version = "0.4.1"; + "cookie-0.0.4" = { + name = "cookie"; + packageName = "cookie"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/single-line-log/-/single-line-log-0.4.1.tgz"; - sha1 = "87a55649f749d783ec0dcd804e8140d9873c7cee"; + url = "https://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz"; + sha1 = "5456bd47aee2666eac976ea80a6105940483fe98"; }; }; - "ansi-styles-1.1.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "1.1.0"; + "cookie-0.0.5" = { + name = "cookie"; + packageName = "cookie"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; - sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de"; + url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; + sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; }; }; - "has-ansi-0.1.0" = { - name = "has-ansi"; - packageName = "has-ansi"; + "cookie-0.1.0" = { + name = "cookie"; + packageName = "cookie"; version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; - sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e"; + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; + sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; }; }; - "strip-ansi-0.3.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "0.3.0"; + "cookie-0.1.2" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; - sha1 = "25f48ea22ca79187f3174a4db8759347bb126220"; + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; }; }; - "supports-color-0.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "0.2.0"; + "cookie-0.1.3" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"; - sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a"; + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz"; + sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435"; }; }; - "ansi-regex-0.2.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; - sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9"; - }; - }; - "magnet-uri-2.0.1" = { - name = "magnet-uri"; - packageName = "magnet-uri"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; - sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209"; - }; - }; - "request-2.16.6" = { - name = "request"; - packageName = "request"; - version = "2.16.6"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.16.6.tgz"; - sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; - }; - }; - "form-data-0.0.10" = { - name = "form-data"; - packageName = "form-data"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; - sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; - }; - }; - "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"; - }; - }; - "hawk-0.10.2" = { - name = "hawk"; - packageName = "hawk"; - version = "0.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; - sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; - }; - }; - "node-uuid-1.4.8" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.8"; + "cookie-0.3.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; - sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; + url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; + sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; "cookie-jar-0.2.0" = { @@ -5809,5093 +5864,5027 @@ let sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa"; }; }; - "aws-sign-0.2.0" = { - name = "aws-sign"; - packageName = "aws-sign"; - version = "0.2.0"; + "cookie-parser-1.3.5" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; - sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz"; + sha1 = "9d755570fb5d17890771227a02314d9be7cf8356"; }; }; - "oauth-sign-0.2.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.2.0"; + "cookie-parser-1.4.3" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; - sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz"; + sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; }; }; - "forever-agent-0.2.0" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.2.0"; + "cookie-signature-1.0.1" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; - sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; + sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; }; }; - "tunnel-agent-0.2.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.2.0"; + "cookie-signature-1.0.5" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; - sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8"; + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; + sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; }; }; - "json-stringify-safe-3.0.0" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "3.0.0"; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; - sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "qs-0.5.6" = { - name = "qs"; - packageName = "qs"; - version = "0.5.6"; + "cookie-signature-1.1.0" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; - sha1 = "31b1ad058567651c526921506b9a8793911a0384"; + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.1.0.tgz"; + sha512 = "3h44zl7m31c7zzyyc3lxzckqyz6rmg5xydp2clpnf2vm3928garan768x7pmh1n52xnpgwdlkz78cfsy9spg93wpbg4xav0spbyqnq2"; }; }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; + "cookiejar-2.0.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; + sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; }; }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; + "cookiejar-2.1.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; + sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; }; }; - "hoek-0.7.6" = { - name = "hoek"; - packageName = "hoek"; - version = "0.7.6"; + "cookies-0.7.1" = { + name = "cookies"; + packageName = "cookies"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; - sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; + url = "https://registry.npmjs.org/cookies/-/cookies-0.7.1.tgz"; + sha1 = "7c8a615f5481c61ab9f16c833731bcb8f663b99b"; }; }; - "boom-0.3.8" = { - name = "boom"; - packageName = "boom"; - version = "0.3.8"; + "copy-concurrently-1.0.5" = { + name = "copy-concurrently"; + packageName = "copy-concurrently"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; - sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz"; }; }; - "cryptiles-0.1.3" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.1.3"; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; - sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "sntp-0.1.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.1.4"; + "cordova-app-hello-world-3.12.0" = { + name = "cordova-app-hello-world"; + packageName = "cordova-app-hello-world"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; - sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; + url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.12.0.tgz"; + sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; }; }; - "codepage-1.4.0" = { - name = "codepage"; - packageName = "codepage"; - version = "1.4.0"; + "cordova-common-2.2.1" = { + name = "cordova-common"; + packageName = "cordova-common"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/codepage/-/codepage-1.4.0.tgz"; - sha1 = "ffd5b603ae6a8ebb63559d5fb89a57d12b943837"; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.1.tgz"; + sha1 = "7009bc591729caa7285a588cfd6a7b54cd834f0c"; }; }; - "utfx-1.0.1" = { - name = "utfx"; - packageName = "utfx"; - version = "1.0.1"; + "cordova-create-1.1.2" = { + name = "cordova-create"; + packageName = "cordova-create"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/utfx/-/utfx-1.0.1.tgz"; - sha1 = "d52b2fd632a99eca8d9d4a39eece014a6a2b0048"; + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.2.tgz"; + sha1 = "83b09271b378d1c03bc7d9a786fedd60485c3ccf"; }; }; - "voc-1.0.0" = { - name = "voc"; - packageName = "voc"; - version = "1.0.0"; + "cordova-fetch-1.3.0" = { + name = "cordova-fetch"; + packageName = "cordova-fetch"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz"; - sha512 = "1zss1rcd373slj9qjmy4zp7ann95isbkvjlrgp2dirpazvn1sy23hgnw6p72w0mj8hcgqpxvs0ls035zmb8isilqhqqpkmya9d3234r"; + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.0.tgz"; + sha1 = "4986d0779b36eb239822c2ab413a47ff9f097fea"; }; }; - "exit-on-epipe-1.0.1" = { - name = "exit-on-epipe"; - packageName = "exit-on-epipe"; - version = "1.0.1"; + "cordova-js-4.2.2" = { + name = "cordova-js"; + packageName = "cordova-js"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; - sha512 = "2kxcf7dq1q9z2wqwwfjagn77kpzg2zpjqf2kd3vj5drx576gwglbsfly2b1imabj3svgcz5xsx79kspq1xsdgm4wwg1fksfnjdgjv47"; + url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.2.tgz"; + sha1 = "a7eb20911e6a59f15ac64e7db6ec543df31c2f92"; }; }; - "sax-1.2.4" = { - name = "sax"; - packageName = "sax"; - version = "1.2.4"; + "cordova-lib-8.0.0" = { + name = "cordova-lib"; + packageName = "cordova-lib"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.0.0.tgz"; + sha1 = "864bd5de6b79fc4944361460aa3214e59da936f2"; }; }; - "xmlbuilder-9.0.4" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "9.0.4"; + "cordova-registry-mapper-1.1.15" = { + name = "cordova-registry-mapper"; + packageName = "cordova-registry-mapper"; + version = "1.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz"; - sha1 = "519cb4ca686d005a8420d3496f3f0caeecca580f"; + url = "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz"; + sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; }; }; - "configstore-2.1.0" = { - name = "configstore"; - packageName = "configstore"; - version = "2.1.0"; + "cordova-serve-2.0.0" = { + name = "cordova-serve"; + packageName = "cordova-serve"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; - sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.0.tgz"; + sha1 = "d7834b83b186607e2b8f1943e073c0633360ea43"; }; }; - "cordova-common-2.1.1" = { - name = "cordova-common"; - packageName = "cordova-common"; - version = "2.1.1"; + "core-js-1.2.7" = { + name = "core-js"; + packageName = "core-js"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.1.1.tgz"; - sha1 = "e3a16a4f3d29a8e2b523128ac65478aca9ea1749"; + url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz"; + sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; }; }; - "cordova-lib-7.1.0" = { - name = "cordova-lib"; - packageName = "cordova-lib"; - version = "7.1.0"; + "core-js-2.5.5" = { + name = "core-js"; + packageName = "core-js"; + version = "2.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-7.1.0.tgz"; - sha1 = "f15aa0eda0e06e8c7e423a218404d59ec50f8594"; + url = "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz"; + sha1 = "b14dde936c640c0579a6b50cabcc132dd6127e3b"; }; }; - "editor-1.0.0" = { - name = "editor"; - packageName = "editor"; - version = "1.0.0"; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"; - sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "insight-0.8.2" = { - name = "insight"; - packageName = "insight"; - version = "0.8.2"; + "cors-2.8.4" = { + name = "cors"; + packageName = "cors"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.8.2.tgz"; - sha1 = "18c2acf1b6055491278fc7529f1f21d32e1f0eda"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz"; + sha1 = "2bd381f2eb201020105cd50ea59da63090694686"; }; }; - "nopt-3.0.1" = { - name = "nopt"; - packageName = "nopt"; - version = "3.0.1"; + "corsify-2.1.0" = { + name = "corsify"; + packageName = "corsify"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz"; - sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd"; + url = "https://registry.npmjs.org/corsify/-/corsify-2.1.0.tgz"; + sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; }; }; - "q-1.0.1" = { - name = "q"; - packageName = "q"; - version = "1.0.1"; + "couch-login-0.1.20" = { + name = "couch-login"; + packageName = "couch-login"; + version = "0.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz"; - sha1 = "11872aeedee89268110b10a718448ffb10112a14"; + url = "https://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz"; + sha1 = "007c70ef80089dbae6f59eeeec37480799b39595"; }; }; - "update-notifier-0.5.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.5.0"; + "crc-0.2.0" = { + name = "crc"; + packageName = "crc"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz"; - sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc"; + url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz"; + sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; }; }; - "dot-prop-3.0.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "3.0.0"; + "crc-3.2.1" = { + name = "crc"; + packageName = "crc"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; - sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; }; }; - "osenv-0.1.4" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.4"; + "crc-3.3.0" = { + name = "crc"; + packageName = "crc"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; + url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz"; + sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba"; }; }; - "uuid-2.0.3" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.3"; + "crc-3.4.4" = { + name = "crc"; + packageName = "crc"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; - sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; - "write-file-atomic-1.3.4" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.3.4"; + "crc-3.5.0" = { + name = "crc"; + packageName = "crc"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; - sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; + url = "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz"; + sha1 = "98b8ba7d489665ba3979f59b21381374101a1964"; }; }; - "xdg-basedir-2.0.0" = { - name = "xdg-basedir"; - packageName = "xdg-basedir"; + "crc32-stream-2.0.0" = { + name = "crc32-stream"; + packageName = "crc32-stream"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; - sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz"; + sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"; }; }; - "is-obj-1.0.1" = { - name = "is-obj"; - packageName = "is-obj"; - version = "1.0.1"; + "create-ecdh-4.0.0" = { + name = "create-ecdh"; + packageName = "create-ecdh"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz"; + sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; }; }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "slide-1.1.6" = { - name = "slide"; - packageName = "slide"; - version = "1.1.6"; + "create-hash-1.1.3" = { + name = "create-hash"; + packageName = "create-hash"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz"; + sha1 = "606042ac8b9262750f483caddab0f5819172d8fd"; }; }; - "ansi-0.3.1" = { - name = "ansi"; - packageName = "ansi"; - version = "0.3.1"; + "create-hmac-1.1.6" = { + name = "create-hmac"; + packageName = "create-hmac"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"; - sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz"; + sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; }; }; - "bplist-parser-0.1.1" = { - name = "bplist-parser"; - packageName = "bplist-parser"; - version = "0.1.1"; + "create-torrent-3.30.0" = { + name = "create-torrent"; + packageName = "create-torrent"; + version = "3.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz"; - sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.30.0.tgz"; + sha512 = "15hphpabh12fwvjbaihwjr1sqzj6c4lzcms4jbyy0s2jk1rirrg3cb9743g2a8jw2ihz15yfw0dxqwnc6n5nixiazdg7hwaj8d5nfmi"; }; }; - "cordova-registry-mapper-1.1.15" = { - name = "cordova-registry-mapper"; - packageName = "cordova-registry-mapper"; - version = "1.1.15"; + "cron-1.3.0" = { + name = "cron"; + packageName = "cron"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz"; - sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; + url = "https://registry.npmjs.org/cron/-/cron-1.3.0.tgz"; + sha512 = "3iq9zg5plipbybssrb38lhlqdp1p4mbrmvp92zc477z9ck9k90dnxwgssjzb2a572g801q3c75mwy5hmx1ccmiqf5in6ck0k7n8bx1b"; }; }; - "elementtree-0.1.6" = { - name = "elementtree"; - packageName = "elementtree"; - version = "0.1.6"; + "cross-spawn-4.0.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; - sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.0.tgz"; + sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252"; }; }; - "glob-5.0.15" = { - name = "glob"; - packageName = "glob"; - version = "5.0.15"; + "cross-spawn-4.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; - sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; }; }; - "plist-1.2.0" = { - name = "plist"; - packageName = "plist"; - version = "1.2.0"; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz"; - sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; }; - "shelljs-0.5.3" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.5.3"; + "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/shelljs/-/shelljs-0.5.3.tgz"; - sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113"; + url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; + sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; }; }; - "underscore-1.8.3" = { - name = "underscore"; - packageName = "underscore"; - version = "1.8.3"; + "crossroads-0.12.2" = { + name = "crossroads"; + packageName = "crossroads"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + url = "https://registry.npmjs.org/crossroads/-/crossroads-0.12.2.tgz"; + sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2"; }; }; - "unorm-1.4.1" = { - name = "unorm"; - packageName = "unorm"; - version = "1.4.1"; + "crx-parser-0.1.2" = { + name = "crx-parser"; + packageName = "crx-parser"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz"; - sha1 = "364200d5f13646ca8bcd44490271335614792300"; + url = "https://registry.npmjs.org/crx-parser/-/crx-parser-0.1.2.tgz"; + sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d"; }; }; - "big-integer-1.6.25" = { - name = "big-integer"; - packageName = "big-integer"; - version = "1.6.25"; + "crypt-0.0.2" = { + name = "crypt"; + packageName = "crypt"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.25.tgz"; - sha1 = "1de45a9f57542ac20121c682f8d642220a34e823"; + url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; - "sax-0.3.5" = { - name = "sax"; - packageName = "sax"; - version = "0.3.5"; + "crypt3-0.2.0" = { + name = "crypt3"; + packageName = "crypt3"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; - sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + url = "https://registry.npmjs.org/crypt3/-/crypt3-0.2.0.tgz"; + sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; }; }; - "base64-js-0.0.8" = { - name = "base64-js"; - packageName = "base64-js"; - version = "0.0.8"; + "cryptiles-0.1.3" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; - sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; + sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; }; }; - "xmlbuilder-4.0.0" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "4.0.0"; + "cryptiles-2.0.5" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz"; - sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; }; }; - "aliasify-2.1.0" = { - name = "aliasify"; - packageName = "aliasify"; - version = "2.1.0"; + "cryptiles-3.1.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/aliasify/-/aliasify-2.1.0.tgz"; - sha1 = "7c30825b9450b9e6185ba27533eaf6e2067d4b42"; + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; + sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; }; }; - "cordova-create-1.1.1" = { - name = "cordova-create"; - packageName = "cordova-create"; - version = "1.1.1"; + "crypto-0.0.3" = { + name = "crypto"; + packageName = "crypto"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.1.tgz"; - sha1 = "55282493ab396d9303f72febbaf2f978fa764cd2"; + url = "https://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz"; + sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0"; }; }; - "cordova-fetch-1.2.0" = { - name = "cordova-fetch"; - packageName = "cordova-fetch"; - version = "1.2.0"; + "crypto-browserify-3.12.0" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.2.0.tgz"; - sha1 = "e32ea33f5834d68585a3f4946295c3ffe71f8060"; + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; }; }; - "cordova-js-4.2.2" = { - name = "cordova-js"; - packageName = "cordova-js"; - version = "4.2.2"; + "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/cordova-js/-/cordova-js-4.2.2.tgz"; - sha1 = "a7eb20911e6a59f15ac64e7db6ec543df31c2f92"; + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; }; }; - "cordova-serve-2.0.0" = { - name = "cordova-serve"; - packageName = "cordova-serve"; - version = "2.0.0"; + "csrf-3.0.6" = { + name = "csrf"; + packageName = "csrf"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.0.tgz"; - sha1 = "d7834b83b186607e2b8f1943e073c0633360ea43"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz"; + sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a"; }; }; - "dep-graph-1.1.0" = { - name = "dep-graph"; - packageName = "dep-graph"; - version = "1.1.0"; + "css-1.0.8" = { + name = "css"; + packageName = "css"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz"; - sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; + url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz"; + sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; }; }; - "glob-7.1.1" = { - name = "glob"; - packageName = "glob"; - version = "7.1.1"; + "css-parse-1.0.4" = { + name = "css-parse"; + packageName = "css-parse"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; - sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; + url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; + sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd"; }; }; - "init-package-json-1.10.1" = { - name = "init-package-json"; - packageName = "init-package-json"; - version = "1.10.1"; + "css-parse-1.7.0" = { + name = "css-parse"; + packageName = "css-parse"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz"; - sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a"; + url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; + sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; }; }; - "nopt-4.0.1" = { - name = "nopt"; - packageName = "nopt"; - version = "4.0.1"; + "css-select-1.2.0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; + sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; }; }; - "npm-2.15.12" = { - name = "npm"; - packageName = "npm"; - version = "2.15.12"; + "css-select-1.3.0-rc0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.3.0-rc0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-2.15.12.tgz"; - sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; + url = "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz"; + sha1 = "6f93196aaae737666ea1036a8cb14a8fcb7a9231"; }; }; - "opener-1.4.2" = { - name = "opener"; - packageName = "opener"; - version = "1.4.2"; + "css-select-base-adapter-0.1.0" = { + name = "css-select-base-adapter"; + packageName = "css-select-base-adapter"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; - sha1 = "b32582080042af8680c389a499175b4c54fff523"; + url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz"; + sha1 = "0102b3d14630df86c3eb9fa9f5456270106cf990"; }; }; - "plist-2.0.1" = { - name = "plist"; - packageName = "plist"; - version = "2.0.1"; + "css-stringify-1.0.5" = { + name = "css-stringify"; + packageName = "css-stringify"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz"; - sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; + url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; + sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; }; }; - "properties-parser-0.3.1" = { - name = "properties-parser"; - packageName = "properties-parser"; - version = "0.3.1"; + "css-tree-1.0.0-alpha.27" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha.27"; src = fetchurl { - url = "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz"; - sha1 = "1316e9539ffbfd93845e369b211022abd478771a"; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.27.tgz"; + sha512 = "08x63k8gxl9wgq7lljw7q5mlhwbcifkg7f6yakqcj8wfwv3xq5vj2glhrq826pbxi4az53akc76a6c4vhqablgvipbk5qldbks2j1h4"; }; }; - "request-2.79.0" = { - name = "request"; - packageName = "request"; - version = "2.79.0"; + "css-tree-1.0.0-alpha25" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha25"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; - sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz"; + sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw"; }; }; - "shelljs-0.3.0" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.3.0"; + "css-url-regex-1.1.0" = { + name = "css-url-regex"; + packageName = "css-url-regex"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; - sha1 = "3596e6307a781544f591f37da618360f31db57b1"; + url = "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz"; + sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec"; }; }; - "tar-2.2.1" = { - name = "tar"; - packageName = "tar"; - version = "2.2.1"; + "css-what-2.1.0" = { + name = "css-what"; + packageName = "css-what"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; - sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; + url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz"; + sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd"; }; }; - "valid-identifier-0.0.1" = { - name = "valid-identifier"; - packageName = "valid-identifier"; - version = "0.0.1"; + "csslint-0.10.0" = { + name = "csslint"; + packageName = "csslint"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"; - sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; + url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; + sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; }; }; - "xcode-0.9.3" = { - name = "xcode"; - packageName = "xcode"; - version = "0.9.3"; + "csso-3.5.0" = { + name = "csso"; + packageName = "csso"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz"; - sha1 = "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3"; + url = "https://registry.npmjs.org/csso/-/csso-3.5.0.tgz"; + sha512 = "0rxlhy2ha4xjnw27ha5q8crvpqwydnhb4xnnsj2ba8i1r09n864ygl76lcjgnpnqp1qj5930qz8gnq76pwy6sr6hrb2gcfrzla67ljs"; }; }; - "browserify-transform-tools-1.7.0" = { - name = "browserify-transform-tools"; - packageName = "browserify-transform-tools"; - version = "1.7.0"; + "csurf-1.8.3" = { + name = "csurf"; + packageName = "csurf"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-transform-tools/-/browserify-transform-tools-1.7.0.tgz"; - sha1 = "83e277221f63259bed2e7eb2a283a970a501f4c4"; + url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz"; + sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a"; }; }; - "falafel-2.1.0" = { - name = "falafel"; - packageName = "falafel"; - version = "2.1.0"; + "csv-0.4.6" = { + name = "csv"; + packageName = "csv"; + version = "0.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz"; - sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; + url = "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz"; + sha1 = "8dbae7ddfdbaae62c1ea987c3e0f8a9ac737b73d"; }; }; - "acorn-5.2.1" = { - name = "acorn"; - packageName = "acorn"; - version = "5.2.1"; + "csv-generate-0.0.6" = { + name = "csv-generate"; + packageName = "csv-generate"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz"; - sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc"; + url = "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz"; + sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "foreach-2.0.5" = { - name = "foreach"; - packageName = "foreach"; - version = "2.0.5"; + "csv-parse-1.3.3" = { + name = "csv-parse"; + packageName = "csv-parse"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; - sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.3.3.tgz"; + sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; }; }; - "object-keys-1.0.11" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.0.11"; + "csv-stringify-0.0.8" = { + name = "csv-stringify"; + packageName = "csv-stringify"; + version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; - sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; + url = "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz"; + sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b"; }; }; - "cordova-app-hello-world-3.12.0" = { - name = "cordova-app-hello-world"; - packageName = "cordova-app-hello-world"; - version = "3.12.0"; + "ctype-0.5.2" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.12.0.tgz"; - sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; + sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; }; }; - "cordova-common-2.0.3" = { - name = "cordova-common"; - packageName = "cordova-common"; - version = "2.0.3"; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.3.tgz"; - sha1 = "2214ee04ae1c2ec012a52c7c185313e341a6fb38"; + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }; }; - "cordova-fetch-1.1.0" = { - name = "cordova-fetch"; - packageName = "cordova-fetch"; - version = "1.1.0"; + "cuint-0.2.2" = { + name = "cuint"; + packageName = "cuint"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.1.0.tgz"; - sha1 = "1549f9ff4e6345f3c6fb6bd6523e8b19311a7b54"; + url = "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz"; + sha1 = "408086d409550c2631155619e9fa7bcadc3b991b"; }; }; - "dependency-ls-1.1.1" = { - name = "dependency-ls"; - packageName = "dependency-ls"; - version = "1.1.1"; + "currently-unhandled-0.4.1" = { + name = "currently-unhandled"; + packageName = "currently-unhandled"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz"; - sha1 = "0481b07f023d74ce311192e5c690d13e18600054"; + url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "is-url-1.2.2" = { - name = "is-url"; - packageName = "is-url"; - version = "1.2.2"; + "custom-event-1.0.1" = { + name = "custom-event"; + packageName = "custom-event"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz"; - sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; + url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"; + sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425"; }; }; - "shelljs-0.7.8" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.7.8"; + "cvss-1.0.2" = { + name = "cvss"; + packageName = "cvss"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz"; - sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; + url = "https://registry.npmjs.org/cvss/-/cvss-1.0.2.tgz"; + sha1 = "df67e92bf12a796f49e928799c8db3ba74b9fcd6"; }; }; - "q-1.4.1" = { - name = "q"; - packageName = "q"; - version = "1.4.1"; + "cycle-1.0.3" = { + name = "cycle"; + packageName = "cycle"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; - sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; + url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }; }; - "interpret-1.0.4" = { - name = "interpret"; - packageName = "interpret"; - version = "1.0.4"; + "cyclist-0.1.1" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz"; - sha1 = "820cdd588b868ffb191a809506d6c9c8f212b1b0"; + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.1.1.tgz"; + sha1 = "1bcfa56b081448cdb5e12bfc1bfad34b47fba8f3"; }; }; - "rechoir-0.6.2" = { - name = "rechoir"; - packageName = "rechoir"; - version = "0.6.2"; + "cyclist-0.2.2" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; - sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; + sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; }; }; - "browserify-14.4.0" = { - name = "browserify"; - packageName = "browserify"; - version = "14.4.0"; + "d-1.0.0" = { + name = "d"; + packageName = "d"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz"; - sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9"; + url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; + sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; }; }; - "browserify-zlib-0.1.4" = { - name = "browserify-zlib"; - packageName = "browserify-zlib"; - version = "0.1.4"; + "dargs-4.1.0" = { + name = "dargs"; + packageName = "dargs"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; - sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + url = "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz"; + sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"; }; }; - "os-browserify-0.1.2" = { - name = "os-browserify"; - packageName = "os-browserify"; - version = "0.1.2"; + "dargs-5.1.0" = { + name = "dargs"; + packageName = "dargs"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; - sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; + url = "https://registry.npmjs.org/dargs/-/dargs-5.1.0.tgz"; + sha1 = "ec7ea50c78564cd36c9d5ec18f66329fade27829"; }; }; - "pako-0.2.9" = { - name = "pako"; - packageName = "pako"; - version = "0.2.9"; + "dashdash-1.10.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; - sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz"; + sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60"; }; }; - "compression-1.7.1" = { - name = "compression"; - packageName = "compression"; - version = "1.7.1"; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz"; - sha1 = "eff2603efc2e22cf86f35d2eb93589f9875373db"; + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; - "express-4.16.2" = { - name = "express"; - packageName = "express"; - version = "4.16.2"; + "dashdash-1.7.3" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.2.tgz"; - sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"; + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.7.3.tgz"; + sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf"; }; }; - "accepts-1.3.4" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.4"; + "dat-dns-1.3.2" = { + name = "dat-dns"; + packageName = "dat-dns"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; - sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; + url = "https://registry.npmjs.org/dat-dns/-/dat-dns-1.3.2.tgz"; + sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad"; }; }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; + "dat-doctor-1.3.1" = { + name = "dat-doctor"; + packageName = "dat-doctor"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz"; + sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk"; }; }; - "compressible-2.0.12" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.12"; + "dat-encoding-4.0.2" = { + name = "dat-encoding"; + packageName = "dat-encoding"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz"; - sha1 = "c59a5c99db76767e9876500e271ef63b3493bd66"; + url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-4.0.2.tgz"; + sha1 = "b01068fe0d080f3d3e4985a0c4ad21b7c14675f6"; }; }; - "on-headers-1.0.1" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.1"; + "dat-encoding-5.0.1" = { + name = "dat-encoding"; + packageName = "dat-encoding"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"; - sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; + url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-5.0.1.tgz"; + sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w"; }; }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; + "dat-ignore-2.1.1" = { + name = "dat-ignore"; + packageName = "dat-ignore"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; + sha512 = "3ars15n4l3fgvnzah15zpfzirg66clg2a72d2qawg340ad1f0xbahxgzfj52q3ib48s6k7m4a8zcpv5n3pq2blkm1dhpyz1s9d9y44d"; }; }; - "negotiator-0.6.1" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.1"; + "dat-json-1.0.2" = { + name = "dat-json"; + packageName = "dat-json"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; + url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz"; + sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi"; }; }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; + "dat-link-resolve-2.1.0" = { + name = "dat-link-resolve"; + packageName = "dat-link-resolve"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.0.tgz"; + sha512 = "0dzpf71lpzr1z3g6m3v29xvcs9r12sgjpzzmg2viy3azkgpscl7p2v8im2ibsa22q64abifkibb4nc3nshs19wvai67m3gdqx15qzvn"; + }; + }; + "dat-log-1.1.1" = { + name = "dat-log"; + packageName = "dat-log"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + url = "https://registry.npmjs.org/dat-log/-/dat-log-1.1.1.tgz"; + sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; }; }; - "body-parser-1.18.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.18.2"; + "dat-node-3.5.8" = { + name = "dat-node"; + packageName = "dat-node"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; - sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.8.tgz"; + sha512 = "3j28p80dwmic3g00asmcpgiv3sh3s8023x1023g7bm534h1ai8i2zryivx95gc22is64k9mynmqr2g0ny25xp1f7h1cbc25klizg8dc"; }; }; - "content-disposition-0.5.2" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.2"; + "dat-registry-4.0.0" = { + name = "dat-registry"; + packageName = "dat-registry"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; + url = "https://registry.npmjs.org/dat-registry/-/dat-registry-4.0.0.tgz"; + sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; }; }; - "content-type-1.0.4" = { - name = "content-type"; - packageName = "content-type"; + "dat-secret-storage-4.0.1" = { + name = "dat-secret-storage"; + packageName = "dat-secret-storage"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.1.tgz"; + sha512 = "3ad9x7n3qxivrj03fsa8ll3i511ivclnyrv1421zklnmskkxxi2d2fykb1kx1sbwdyx35167a7k4mbw63jhxxaz6r54hpd9fad5wj05"; + }; + }; + "dat-storage-1.0.4" = { + name = "dat-storage"; + packageName = "dat-storage"; version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz"; + sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; - "cookie-0.3.1" = { - name = "cookie"; - packageName = "cookie"; - version = "0.3.1"; + "dat-swarm-defaults-1.0.0" = { + name = "dat-swarm-defaults"; + packageName = "dat-swarm-defaults"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; - sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; + url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz"; + sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; }; }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; + "data-uri-to-buffer-1.2.0" = { + name = "data-uri-to-buffer"; + packageName = "data-uri-to-buffer"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz"; + sha512 = "18vh45y1sdi44vwca9js1hpy9mjwb641dwnc0fm9y2x3pgivzjndjksrlpk65kp5g99lsy2z2m8a4907bj11118c95m2dqg6h6kv95w"; }; }; - "depd-1.1.1" = { - name = "depd"; - packageName = "depd"; - version = "1.1.1"; + "date-format-1.2.0" = { + name = "date-format"; + packageName = "date-format"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; - sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; + url = "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz"; + sha1 = "615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"; }; }; - "encodeurl-1.0.1" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.1"; + "date-now-0.1.4" = { + name = "date-now"; + packageName = "date-now"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz"; - sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20"; + url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; + sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; + "date-utils-1.2.21" = { + name = "date-utils"; + packageName = "date-utils"; + version = "1.2.21"; src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; + sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; }; }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; + "dateformat-1.0.2-1.2.3" = { + name = "dateformat"; + packageName = "dateformat"; + version = "1.0.2-1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; + sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; }; }; - "finalhandler-1.1.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.1.0"; + "dateformat-2.2.0" = { + name = "dateformat"; + packageName = "dateformat"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; - sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; + url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"; + sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; }; }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; + "dateformat-3.0.3" = { + name = "dateformat"; + packageName = "dateformat"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + url = "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"; + sha512 = "3fxpn11cnyqcz25h9krfrpnra9zi1zri0l4f42a89acybqgj6dyr6p0lskcjffahiwxxmmc0zvgalnlk2wa74b764cm7pd5si78884g"; }; }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; + "datland-swarm-defaults-1.0.2" = { + name = "datland-swarm-defaults"; + packageName = "datland-swarm-defaults"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz"; + sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; }; }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; + "debounce-1.1.0" = { + name = "debounce"; + packageName = "debounce"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + url = "https://registry.npmjs.org/debounce/-/debounce-1.1.0.tgz"; + sha512 = "10r1pg8azrc8k3sfc6kslhcnpjl0acgv0fvpmd6q01vxbi496hnxnjx1i7fs66f598g4qzy2h079kzh18qpf9wxsz1ighb52myll1b5"; }; }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; + "debounced-seeker-1.0.0" = { + name = "debounced-seeker"; + packageName = "debounced-seeker"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + url = "https://registry.npmjs.org/debounced-seeker/-/debounced-seeker-1.0.0.tgz"; + sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd"; }; }; - "parseurl-1.3.2" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.2"; + "debug-0.5.0" = { + name = "debug"; + packageName = "debug"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; - sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; + url = "https://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; + sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e"; }; }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; + "debug-0.6.0" = { + name = "debug"; + packageName = "debug"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + url = "https://registry.npmjs.org/debug/-/debug-0.6.0.tgz"; + sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f"; }; }; - "proxy-addr-2.0.2" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.2"; + "debug-0.7.4" = { + name = "debug"; + packageName = "debug"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz"; - sha1 = "6571504f47bb988ec8180253f85dd7e14952bdec"; + url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }; }; - "qs-6.5.1" = { - name = "qs"; - packageName = "qs"; - version = "6.5.1"; + "debug-1.0.5" = { + name = "debug"; + packageName = "debug"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + url = "https://registry.npmjs.org/debug/-/debug-1.0.5.tgz"; + sha1 = "f7241217430f99dec4c2b473eab92228e874c2ac"; }; }; - "send-0.16.1" = { - name = "send"; - packageName = "send"; - version = "0.16.1"; + "debug-2.1.3" = { + name = "debug"; + packageName = "debug"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.16.1.tgz"; - sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j"; + url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; + sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; }; }; - "serve-static-1.13.1" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.13.1"; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz"; - sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5"; + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; }; }; - "setprototypeof-1.1.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.0"; + "debug-2.3.3" = { + name = "debug"; + packageName = "debug"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; - "statuses-1.3.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.3.1"; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; - sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; }; }; - "type-is-1.6.15" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.15"; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; - sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; }; }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; }; - "http-errors-1.6.2" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.2"; + "decamelize-2.0.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; - sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; + url = "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz"; + sha512 = "0zc3slyk7cc9xjfcnw3nk2d1vkq4kxrjalavqgp3zykbgnp5v12xcs47kr436k0izbzyxhkrdww94p5g1lcmzcdqncc9p0mqzk6jji2"; }; }; - "iconv-lite-0.4.19" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.19"; + "decamelize-keys-1.1.0" = { + name = "decamelize-keys"; + packageName = "decamelize-keys"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; + url = "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; }; }; - "raw-body-2.3.2" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.3.2"; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; - sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; }; - "setprototypeof-1.0.3" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.3"; + "decompress-4.2.0" = { + name = "decompress"; + packageName = "decompress"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; - sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + url = "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz"; + sha1 = "7aedd85427e5a92dacfe55674a7c505e96d01f9d"; }; }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; + "decompress-response-3.3.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; }; }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; + "decompress-tar-4.1.1" = { + name = "decompress-tar"; + packageName = "decompress-tar"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; + sha512 = "18rwwdac0961cs2xpagx8sfqysxzcvvna1bfhjd8aamgm5k6mbcr88k0qp46z1fvypvk00sc27mv0n7885cfwi525gix96659l4rli5"; }; }; - "forwarded-0.1.2" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.1.2"; + "decompress-tarbz2-4.1.1" = { + name = "decompress-tarbz2"; + packageName = "decompress-tarbz2"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; + sha512 = "3s2l466xc70zvxrwsr1xr7x5sg9g9wh2wsvk81pxmhc0m73hwhfhhn63c53n6vkv8rlxs80gscrkpk8fc2mbh3j154cvbzm6wpk3kxk"; }; }; - "ipaddr.js-1.5.2" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.5.2"; + "decompress-targz-4.1.1" = { + name = "decompress-targz"; + packageName = "decompress-targz"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz"; - sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0"; + url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; + sha512 = "3gig705jrzdsihjnfij52kj17mgsclfn5vbzswqqdjd0ac4f0dy0afds02m4zm5jacnppavhydyy0rgd99prk8hkmbcisgbfxk3agz3"; }; }; - "destroy-1.0.4" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.4"; + "decompress-unzip-4.0.1" = { + name = "decompress-unzip"; + packageName = "decompress-unzip"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; + url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; + sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69"; }; }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; + "decompress-zip-0.3.0" = { + name = "decompress-zip"; + packageName = "decompress-zip"; version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - }; - "underscore-1.2.1" = { - name = "underscore"; - packageName = "underscore"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"; - sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; + url = "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz"; + sha1 = "ae3bcb7e34c65879adfe77e19c30f86602b4bdb0"; }; }; - "npm-package-arg-5.1.2" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "5.1.2"; + "dedent-0.7.0" = { + name = "dedent"; + packageName = "dedent"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; - sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460"; + url = "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"; + sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; }; }; - "promzard-0.3.0" = { - name = "promzard"; - packageName = "promzard"; - version = "0.3.0"; + "deep-eql-3.0.1" = { + name = "deep-eql"; + packageName = "deep-eql"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"; - sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; + url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"; + sha512 = "1rrbk0h0a836gj1x6lalzgqfs0v34d4fswq23c8lxzmb6k7pna45zd509h1r1fr312n4qml94xqlmzzga40sfa9vnzf6rkr4d1qh1zr"; }; }; - "read-package-json-2.0.12" = { - name = "read-package-json"; - packageName = "read-package-json"; - version = "2.0.12"; + "deep-equal-0.1.2" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz"; - sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv"; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; + sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; }; }; - "validate-npm-package-name-3.0.0" = { - name = "validate-npm-package-name"; - packageName = "validate-npm-package-name"; - version = "3.0.0"; + "deep-equal-0.2.2" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; - sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"; + sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; }; }; - "json-parse-better-errors-1.0.1" = { - name = "json-parse-better-errors"; - packageName = "json-parse-better-errors"; + "deep-equal-1.0.1" = { + name = "deep-equal"; + packageName = "deep-equal"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz"; - sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967"; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; }; }; - "builtins-1.0.3" = { - name = "builtins"; - packageName = "builtins"; - version = "1.0.3"; + "deep-extend-0.2.11" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; - sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"; + sha1 = "7a16ba69729132340506170494bc83f7076fe08f"; }; }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; + "deep-extend-0.4.2" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; + sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; - "base64-js-1.1.2" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.1.2"; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; - sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; - "string.prototype.codepointat-0.2.0" = { - name = "string.prototype.codepointat"; - packageName = "string.prototype.codepointat"; - version = "0.2.0"; + "deepcopy-0.6.3" = { + name = "deepcopy"; + packageName = "deepcopy"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz"; - sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; + url = "https://registry.npmjs.org/deepcopy/-/deepcopy-0.6.3.tgz"; + sha1 = "634780f2f8656ab771af8fa8431ed1ccee55c7b0"; }; }; - "form-data-2.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.4"; + "deepmerge-2.1.0" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; - sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz"; + sha512 = "2zs0sn06vr11mwi2xg2vns26s07gajx2s94hnpfab8g6fl7wmnwbg14fvi2ificasppcmy8g2dh1xiijxg6r8gilkjhsz40lbdmkks3"; }; }; - "qs-6.3.2" = { - name = "qs"; - packageName = "qs"; - version = "6.3.2"; + "default-browser-id-1.0.4" = { + name = "default-browser-id"; + packageName = "default-browser-id"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; - sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; + url = "https://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.4.tgz"; + sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a"; }; }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; + "default-uid-1.0.0" = { + name = "default-uid"; + packageName = "default-uid"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + url = "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz"; + sha1 = "fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e"; }; }; - "block-stream-0.0.9" = { - name = "block-stream"; - packageName = "block-stream"; - version = "0.0.9"; + "defaults-1.0.3" = { + name = "defaults"; + packageName = "defaults"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; - sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; }; }; - "fstream-1.0.11" = { - name = "fstream"; - packageName = "fstream"; - version = "1.0.11"; + "deferred-leveldown-0.2.0" = { + name = "deferred-leveldown"; + packageName = "deferred-leveldown"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; - sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; + url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz"; + sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; }; }; - "pegjs-0.10.0" = { - name = "pegjs"; - packageName = "pegjs"; - version = "0.10.0"; + "define-properties-1.1.2" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; - sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; + sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; }; }; - "simple-plist-0.2.1" = { - name = "simple-plist"; - packageName = "simple-plist"; - version = "0.2.1"; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; - sha1 = "71766db352326928cf3a807242ba762322636723"; + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; }; }; - "uuid-3.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.1"; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; - sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; }; }; - "bplist-creator-0.0.7" = { - name = "bplist-creator"; - packageName = "bplist-creator"; - version = "0.0.7"; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; - sha1 = "37df1536092824b87c42f957b01344117372ae45"; + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; }; }; - "stream-buffers-2.2.0" = { - name = "stream-buffers"; - packageName = "stream-buffers"; - version = "2.2.0"; + "defined-0.0.0" = { + name = "defined"; + packageName = "defined"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; - sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; + url = "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; + sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; }; }; - "async-1.5.2" = { - name = "async"; - packageName = "async"; - version = "1.5.2"; + "defined-1.0.0" = { + name = "defined"; + packageName = "defined"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; + sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; }; }; - "configstore-1.4.0" = { - name = "configstore"; - packageName = "configstore"; - version = "1.4.0"; + "degenerator-1.0.4" = { + name = "degenerator"; + packageName = "degenerator"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz"; - sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021"; + url = "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz"; + sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; }; }; - "inquirer-0.10.1" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.10.1"; + "del-2.2.2" = { + name = "del"; + packageName = "del"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz"; - sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a"; + url = "https://registry.npmjs.org/del/-/del-2.2.2.tgz"; + sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8"; }; }; - "lodash.debounce-3.1.1" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "3.1.1"; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz"; - sha1 = "812211c378a94cc29d5aa4e3346cf0bfce3a7df5"; + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; }; }; - "os-name-1.0.3" = { - name = "os-name"; - packageName = "os-name"; - version = "1.0.3"; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz"; - sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "ansi-escapes-1.4.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "1.4.0"; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; - sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "cli-cursor-1.0.2" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "1.0.2"; + "dep-graph-1.1.0" = { + name = "dep-graph"; + packageName = "dep-graph"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; - sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + url = "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz"; + sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; }; }; - "readline2-1.0.1" = { - name = "readline2"; - packageName = "readline2"; + "depd-1.0.1" = { + name = "depd"; + packageName = "depd"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz"; - sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; - }; - }; - "run-async-0.1.0" = { - name = "run-async"; - packageName = "run-async"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz"; - sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; + url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; }; }; - "rx-lite-3.1.2" = { - name = "rx-lite"; - packageName = "rx-lite"; - version = "3.1.2"; + "depd-1.1.1" = { + name = "depd"; + packageName = "depd"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"; - sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; + url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; + sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; }; }; - "restore-cursor-1.0.1" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "1.0.1"; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; - sha1 = "34661f46886327fed2991479152252df92daa541"; + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; - "exit-hook-1.1.1" = { - name = "exit-hook"; - packageName = "exit-hook"; + "dependency-ls-1.1.1" = { + name = "dependency-ls"; + packageName = "dependency-ls"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"; - sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; + url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz"; + sha1 = "0481b07f023d74ce311192e5c690d13e18600054"; }; }; - "onetime-1.1.0" = { - name = "onetime"; - packageName = "onetime"; - version = "1.1.0"; + "deprecated-0.0.1" = { + name = "deprecated"; + packageName = "deprecated"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; - sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"; + sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; }; }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; + "deps-sort-2.0.0" = { + name = "deps-sort"; + packageName = "deps-sort"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz"; + sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; }; }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; + "des.js-1.0.0" = { + name = "des.js"; + packageName = "des.js"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; + sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; }; }; - "mute-stream-0.0.5" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.5"; + "destroy-1.0.3" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"; - sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; }; }; - "lodash._getnative-3.9.1" = { - name = "lodash._getnative"; - packageName = "lodash._getnative"; - version = "3.9.1"; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "osx-release-1.1.0" = { - name = "osx-release"; - packageName = "osx-release"; - version = "1.1.0"; + "detect-file-1.0.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz"; - sha1 = "f217911a28136949af1bf9308b241e2737d3cd6c"; + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; }; }; - "win-release-1.1.1" = { - name = "win-release"; - packageName = "win-release"; - version = "1.1.1"; + "detect-indent-4.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz"; - sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209"; + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; + sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; }; }; - "is-npm-1.0.0" = { - name = "is-npm"; - packageName = "is-npm"; - version = "1.0.0"; + "detect-indent-5.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; - sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; }; }; - "latest-version-1.0.1" = { - name = "latest-version"; - packageName = "latest-version"; - version = "1.0.1"; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz"; - sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; - "repeating-1.1.3" = { - name = "repeating"; - packageName = "repeating"; - version = "1.1.3"; + "detect-port-1.2.2" = { + name = "detect-port"; + packageName = "detect-port"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; + url = "https://registry.npmjs.org/detect-port/-/detect-port-1.2.2.tgz"; + sha512 = "2q44vf4c9rqz21wc7a1pj1xz6pa2s7sp2fz9zxksmz679xh8sbfzyzhgkkbyznsgbnif013n0a6387dppcs370gdkc0dhh2jgsgv8fk"; }; }; - "semver-diff-2.1.0" = { - name = "semver-diff"; - packageName = "semver-diff"; - version = "2.1.0"; + "detective-4.7.1" = { + name = "detective"; + packageName = "detective"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; - sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + url = "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz"; + sha512 = "259c687nsmq5ni5q79081s6lpd2srwn7xlwipxwbrqkq9bq0zsvwb0n1d99jc7c6kvpm95bhvvlncfb0l4hqy6vnlb5lrhwwmwyd8qz"; }; }; - "string-length-1.0.1" = { - name = "string-length"; - packageName = "string-length"; - version = "1.0.1"; + "detective-5.1.0" = { + name = "detective"; + packageName = "detective"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz"; - sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac"; + url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz"; + sha512 = "1cm9sp1rl54d3y7v9nvw12kad47g5pcmbzf96s7kpm85j1cc79yc8qb8q0xjj71w32pgz2p4fym47sa851i5lswglmmiimgyflwqlac"; }; }; - "package-json-1.2.0" = { - name = "package-json"; - packageName = "package-json"; - version = "1.2.0"; + "di-0.0.1" = { + name = "di"; + packageName = "di"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz"; - sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; + url = "https://registry.npmjs.org/di/-/di-0.0.1.tgz"; + sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; }; }; - "got-3.3.1" = { - name = "got"; - packageName = "got"; - version = "3.3.1"; + "dicer-0.2.5" = { + name = "dicer"; + packageName = "dicer"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz"; - sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; + url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; + sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; }; }; - "registry-url-3.1.0" = { - name = "registry-url"; - packageName = "registry-url"; - version = "3.1.0"; + "diff-1.0.8" = { + name = "diff"; + packageName = "diff"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; }; }; - "duplexify-3.5.1" = { - name = "duplexify"; - packageName = "duplexify"; - version = "3.5.1"; + "diff-1.4.0" = { + name = "diff"; + packageName = "diff"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz"; - sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g"; + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; - "infinity-agent-2.0.3" = { - name = "infinity-agent"; - packageName = "infinity-agent"; - version = "2.0.3"; + "diff-3.2.0" = { + name = "diff"; + packageName = "diff"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; - sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; + url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; + sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; }; }; - "is-redirect-1.0.0" = { - name = "is-redirect"; - packageName = "is-redirect"; - version = "1.0.0"; + "diff-3.5.0" = { + name = "diff"; + packageName = "diff"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; - sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; + sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; }; }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; + "diff2html-2.3.3" = { + name = "diff2html"; + packageName = "diff2html"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.3.tgz"; + sha1 = "31bb815881c975634c7f3907a5e789341e1560bc"; }; }; - "nested-error-stacks-1.0.2" = { - name = "nested-error-stacks"; - packageName = "nested-error-stacks"; - version = "1.0.2"; + "diffie-hellman-5.0.2" = { + name = "diffie-hellman"; + packageName = "diffie-hellman"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; - sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; + sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "object-assign-3.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "3.0.0"; + "difflib-0.2.4" = { + name = "difflib"; + packageName = "difflib"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; - sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; + url = "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz"; + sha1 = "b5e30361a6db023176d562892db85940a718f47e"; }; }; - "prepend-http-1.0.4" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "1.0.4"; + "director-1.2.7" = { + name = "director"; + packageName = "director"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + url = "https://registry.npmjs.org/director/-/director-1.2.7.tgz"; + sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3"; }; }; - "read-all-stream-3.1.0" = { - name = "read-all-stream"; - packageName = "read-all-stream"; - version = "3.1.0"; + "directory-index-html-2.1.0" = { + name = "directory-index-html"; + packageName = "directory-index-html"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; - sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; + url = "https://registry.npmjs.org/directory-index-html/-/directory-index-html-2.1.0.tgz"; + sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338"; }; }; - "timed-out-2.0.0" = { - name = "timed-out"; - packageName = "timed-out"; - version = "2.0.0"; + "discovery-channel-5.5.1" = { + name = "discovery-channel"; + packageName = "discovery-channel"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz"; - sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz"; + sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h"; }; }; - "end-of-stream-1.4.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.0"; + "discovery-swarm-4.4.2" = { + name = "discovery-swarm"; + packageName = "discovery-swarm"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz"; - sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206"; + url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-4.4.2.tgz"; + sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; }; }; - "stream-shift-1.0.0" = { - name = "stream-shift"; - packageName = "stream-shift"; - version = "1.0.0"; + "dispensary-0.16.0" = { + name = "dispensary"; + packageName = "dispensary"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"; - sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.16.0.tgz"; + sha1 = "7173f2828380135e3c8eb9f61719fa038c0cd133"; }; }; - "rc-1.2.2" = { - name = "rc"; - packageName = "rc"; - version = "1.2.2"; + "diveSync-0.3.0" = { + name = "diveSync"; + packageName = "diveSync"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz"; - sha1 = "d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"; + url = "https://registry.npmjs.org/diveSync/-/diveSync-0.3.0.tgz"; + sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; }; }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "2.0.1"; + "dlnacasts-0.1.0" = { + name = "dlnacasts"; + packageName = "dlnacasts"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + url = "https://registry.npmjs.org/dlnacasts/-/dlnacasts-0.1.0.tgz"; + sha1 = "f805211dcac74f6bb3a4d5d5541ad783b1b67d22"; }; }; - "clone-2.1.1" = { - name = "clone"; - packageName = "clone"; - version = "2.1.1"; + "dns-discovery-5.6.1" = { + name = "dns-discovery"; + packageName = "dns-discovery"; + version = "5.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz"; - sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb"; + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz"; + sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; }; }; - "parserlib-1.1.1" = { - name = "parserlib"; - packageName = "parserlib"; - version = "1.1.1"; + "dns-discovery-6.1.0" = { + name = "dns-discovery"; + packageName = "dns-discovery"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz"; - sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4"; + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz"; + sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a"; }; }; - "bluebird-2.9.9" = { - name = "bluebird"; - packageName = "bluebird"; - version = "2.9.9"; + "dns-equal-1.0.0" = { + name = "dns-equal"; + packageName = "dns-equal"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; - sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; + url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; }; }; - "bottleneck-1.5.3" = { - name = "bottleneck"; - packageName = "bottleneck"; - version = "1.5.3"; + "dns-js-0.2.1" = { + name = "dns-js"; + packageName = "dns-js"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; - sha1 = "55fa64920d9670087d44150404525d59f9511c20"; + url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz"; + sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; }; }; - "event-stream-3.2.2" = { - name = "event-stream"; - packageName = "event-stream"; - version = "3.2.2"; + "dns-packet-1.3.1" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; - sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; + sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; - "express-4.11.2" = { - name = "express"; - packageName = "express"; - version = "4.11.2"; + "dns-packet-4.2.0" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; - sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz"; + sha512 = "05pqsdg5q8r1i9z4dnii6sr7i3b6ir4gay5h3xk18jraa2w3201wfw6mz53dn494dqd19djdfbp78p6v70kia4862sbj5g4jwm40zbf"; }; }; - "hiredis-0.4.1" = { - name = "hiredis"; - packageName = "hiredis"; - version = "0.4.1"; + "dns-socket-1.6.3" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; - sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f"; + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz"; + sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy"; }; }; - "json-rpc2-0.8.1" = { - name = "json-rpc2"; - packageName = "json-rpc2"; - version = "0.8.1"; + "dns-socket-3.0.0" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; - sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz"; + sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k"; }; }; - "lodash-3.1.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.1.0"; + "dns-txt-2.0.2" = { + name = "dns-txt"; + packageName = "dns-txt"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; - sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; - }; - }; - "native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" = { - name = "native-dns"; - packageName = "native-dns"; - version = "0.6.1"; - src = fetchgit { - url = "https://github.com/okTurtles/node-dns.git"; - rev = "08433ec98f517eed3c6d5e47bdf62603539cd402"; - sha256 = "a7342bfd4e952490a8a25a68efcb1d16ecc2391f1044109ebeace89ad284f7a2"; + url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "native-dns-packet-0.1.1" = { - name = "native-dns-packet"; - packageName = "native-dns-packet"; - version = "0.1.1"; + "dnscache-1.0.1" = { + name = "dnscache"; + packageName = "dnscache"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; - sha1 = "97da90570b8438a00194701ce24d011fd3cc109a"; + url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.1.tgz"; + sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; }; }; - "nconf-0.7.1" = { - name = "nconf"; - packageName = "nconf"; - version = "0.7.1"; + "docker-parse-image-3.0.1" = { + name = "docker-parse-image"; + packageName = "docker-parse-image"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; - sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; + url = "https://registry.npmjs.org/docker-parse-image/-/docker-parse-image-3.0.1.tgz"; + sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; }; }; - "properties-1.2.1" = { - name = "properties"; - packageName = "properties"; - version = "1.2.1"; + "doctoc-1.3.1" = { + name = "doctoc"; + packageName = "doctoc"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; - sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; + url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.1.tgz"; + sha1 = "f012e3603e3156254c2ef22ac88c7190f55426ba"; }; }; - "redis-0.12.1" = { - name = "redis"; - packageName = "redis"; - version = "0.12.1"; + "doctrine-2.1.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; - sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; + sha512 = "0iz6zh5d0kqs0ndd1ydsj4vaf2x3k3p0k5a7b75gsbhkqaqqq93dgsa2bpifvw7svck2sndd21mv7mp60q111rbghpssp0rxs9956fz"; }; }; - "string-2.0.1" = { - name = "string"; - packageName = "string"; - version = "2.0.1"; + "doctypes-1.1.0" = { + name = "doctypes"; + packageName = "doctypes"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string/-/string-2.0.1.tgz"; - sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759"; + url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"; + sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9"; }; }; - "winston-0.8.0" = { - name = "winston"; - packageName = "winston"; - version = "0.8.0"; + "dom-serialize-2.2.1" = { + name = "dom-serialize"; + packageName = "dom-serialize"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; - sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; + url = "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz"; + sha1 = "562ae8999f44be5ea3076f5419dcd59eb43ac95b"; }; }; - "superagent-0.21.0" = { - name = "superagent"; - packageName = "superagent"; - version = "0.21.0"; + "dom-serializer-0.0.1" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; - sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz"; + sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf"; }; }; - "split-0.3.3" = { - name = "split"; - packageName = "split"; - version = "0.3.3"; + "dom-serializer-0.1.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; - sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; + sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; }; }; - "accepts-1.2.13" = { - name = "accepts"; - packageName = "accepts"; - version = "1.2.13"; + "dom-storage-2.1.0" = { + name = "dom-storage"; + packageName = "dom-storage"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; - sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; + url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz"; + sha512 = "3ckwbdpfa94f4kv5vav65l1qm56bg54bs2wgz9x5nx64avazbg3p07w05mjbfw066clq69vmyfg1fcph5r99i74x18l95zkcp4nk943"; }; }; - "content-disposition-0.5.0" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.0"; + "dom-walk-0.1.1" = { + name = "dom-walk"; + packageName = "dom-walk"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; - sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + url = "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz"; + sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; }; - "cookie-signature-1.0.5" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.5"; + "domain-browser-1.1.7" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; - sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz"; + sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc"; }; }; - "debug-2.1.3" = { - name = "debug"; - packageName = "debug"; - version = "2.1.3"; + "domain-browser-1.2.0" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; - sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; + sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f"; }; }; - "depd-1.0.1" = { - name = "depd"; - packageName = "depd"; - version = "1.0.1"; + "domelementtype-1.1.3" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; - sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; + sha1 = "bd28773e2642881aec51544924299c5cd822185b"; }; }; - "escape-html-1.0.1" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.1"; + "domelementtype-1.3.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; - sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; }; }; - "etag-1.5.1" = { - name = "etag"; - packageName = "etag"; - version = "1.5.1"; + "domhandler-2.2.1" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; - sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz"; + sha1 = "59df9dcd227e808b365ae73e1f6684ac3d946fc2"; }; }; - "finalhandler-0.3.3" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.3.3"; + "domhandler-2.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; - sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; + sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; }; }; - "fresh-0.2.4" = { - name = "fresh"; - packageName = "fresh"; - version = "0.2.4"; + "domhandler-2.4.1" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; - sha1 = "3582499206c9723714190edd74b4604feb4a614c"; + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz"; + sha1 = "892e47000a99be55bbf3774ffea0561d8879c259"; }; }; - "on-finished-2.2.1" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.2.1"; + "domino-1.0.30" = { + name = "domino"; + packageName = "domino"; + version = "1.0.30"; src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; - sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; + url = "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz"; + sha512 = "1g3pbkg3gg3kjffah03vil47662ra58gckz5z8qymfgb9xq97k7vsd83410fmncbbll1p40rs0s4r0pgdypfvj9j2fq146j41dbqjla"; }; }; - "path-to-regexp-0.1.3" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.3"; + "domutils-1.4.3" = { + name = "domutils"; + packageName = "domutils"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; - sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; + url = "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; + sha1 = "0865513796c6b306031850e175516baf80b72a6f"; }; }; - "proxy-addr-1.0.10" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "1.0.10"; + "domutils-1.5.1" = { + name = "domutils"; + packageName = "domutils"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; - sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; + url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; }; }; - "qs-2.3.3" = { - name = "qs"; - packageName = "qs"; - version = "2.3.3"; + "domutils-1.7.0" = { + name = "domutils"; + packageName = "domutils"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; - sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; + url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; + sha512 = "076s2v293f9jixaddq6qmjc76y3z0kqddmjb4nclydp23y0jzpg6f7h32j6adilfdjxwwhxkclrhc1vn7rbsidvzcq32dkzq9fpc1rf"; }; }; - "range-parser-1.0.3" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.0.3"; + "dot-prop-3.0.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; - sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; + sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; }; }; - "send-0.11.1" = { - name = "send"; - packageName = "send"; - version = "0.11.1"; + "dot-prop-4.2.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz"; - sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; + sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm"; }; }; - "serve-static-1.8.1" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.8.1"; + "double-ended-queue-2.1.0-0" = { + name = "double-ended-queue"; + packageName = "double-ended-queue"; + version = "2.1.0-0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; - sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; + url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; + sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; }; }; - "type-is-1.5.7" = { - name = "type-is"; - packageName = "type-is"; - version = "1.5.7"; + "downgrade-root-1.2.2" = { + name = "downgrade-root"; + packageName = "downgrade-root"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; - sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; + url = "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz"; + sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c"; }; }; - "vary-1.0.1" = { - name = "vary"; - packageName = "vary"; - version = "1.0.1"; + "download-5.0.3" = { + name = "download"; + packageName = "download"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; - sha1 = "99e4981566a286118dfb2b817357df7993376d10"; + url = "https://registry.npmjs.org/download/-/download-5.0.3.tgz"; + sha1 = "63537f977f99266a30eb8a2a2fbd1f20b8000f7a"; }; }; - "cookie-0.1.2" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.2"; + "download-git-repo-1.0.2" = { + name = "download-git-repo"; + packageName = "download-git-repo"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; - sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; + url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.2.tgz"; + sha512 = "21sjxnakbaz6gkw8lrk0dizw893hwawsrhaypkxph8cdf6v7gyxl8b4n82qh99v4zvzcbbxbc7ff8jzkkn91vmn0w381vzh9ypi801z"; }; }; - "merge-descriptors-0.0.2" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "0.0.2"; + "dreamopt-0.6.0" = { + name = "dreamopt"; + packageName = "dreamopt"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; - sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + url = "https://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz"; + sha1 = "d813ccdac8d39d8ad526775514a13dda664d6b4b"; }; }; - "utils-merge-1.0.0" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.0"; + "dtrace-provider-0.6.0" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz"; + sha1 = "0b078d5517937d873101452d9146737557b75e51"; }; }; - "negotiator-0.5.3" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.5.3"; + "dtrace-provider-0.8.6" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; - sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.6.tgz"; + sha1 = "428a223afe03425d2cd6d6347fdf40c66903563d"; }; }; - "ms-0.7.0" = { - name = "ms"; - packageName = "ms"; - version = "0.7.0"; + "duplexer-0.1.1" = { + name = "duplexer"; + packageName = "duplexer"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; - sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; }; }; - "crc-3.2.1" = { - name = "crc"; - packageName = "crc"; - version = "3.2.1"; + "duplexer2-0.0.2" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; - sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; + sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; }; }; - "ee-first-1.1.0" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.0"; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; - sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; }; }; - "ipaddr.js-1.0.5" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.0.5"; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; - sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "destroy-1.0.3" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.3"; + "duplexify-3.5.4" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz"; + sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7"; }; }; - "mime-types-2.0.14" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.0.14"; + "each-async-1.1.1" = { + name = "each-async"; + packageName = "each-async"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; + url = "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz"; + sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473"; }; }; - "mime-db-1.12.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.12.0"; + "eachr-3.2.0" = { + name = "eachr"; + packageName = "eachr"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; + url = "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz"; + sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484"; }; }; - "bindings-1.3.0" = { - name = "bindings"; - packageName = "bindings"; - version = "1.3.0"; + "easy-table-1.1.0" = { + name = "easy-table"; + packageName = "easy-table"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz"; - sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf"; + url = "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz"; + sha1 = "86f9ab4c102f0371b7297b92a651d5824bc8cb73"; }; }; - "jsonparse-0.0.6" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "0.0.6"; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; - sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; - "debug-1.0.5" = { - name = "debug"; - packageName = "debug"; - version = "1.0.5"; + "ecdsa-sig-formatter-1.0.9" = { + name = "ecdsa-sig-formatter"; + packageName = "ecdsa-sig-formatter"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-1.0.5.tgz"; - sha1 = "f7241217430f99dec4c2b473eab92228e874c2ac"; + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz"; + sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1"; }; }; - "lodash-2.4.2" = { - name = "lodash"; - packageName = "lodash"; - version = "2.4.2"; + "ecstatic-3.2.0" = { + name = "ecstatic"; + packageName = "ecstatic"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; + url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.0.tgz"; + sha512 = "2sjxkrzsvswqsxb6jrq3p75g53szmx1hwwd5yhpkkx4857avz4yr0dvfqkshhxnx88an2gw00j6crbkc39q48zlpmplyzcwzp3sb20s"; }; }; - "es5class-2.3.1" = { - name = "es5class"; - packageName = "es5class"; - version = "2.3.1"; + "editions-1.3.4" = { + name = "editions"; + packageName = "editions"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; - sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; + url = "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz"; + sha512 = "196fp42k8j9d8cmi0sqjj6wfqcr7y0c9zcrfv1bcs38ipkn78ivg3xl2f33x3hfiqnyp3gb5y7ndkgqpw433jn5rb43qq37dkxahdl3"; }; }; - "faye-websocket-0.11.1" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.11.1"; + "editor-1.0.0" = { + name = "editor"; + packageName = "editor"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz"; - sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; + url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"; + sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; }; }; - "eventemitter3-0.1.6" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "0.1.6"; + "editorconfig-0.13.3" = { + name = "editorconfig"; + packageName = "editorconfig"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; - sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz"; + sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s"; }; }; - "better-curry-1.6.0" = { - name = "better-curry"; - packageName = "better-curry"; - version = "1.6.0"; + "ee-first-1.1.0" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; - sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; }; }; - "websocket-driver-0.7.0" = { - name = "websocket-driver"; - packageName = "websocket-driver"; - version = "0.7.0"; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz"; - sha1 = "0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"; + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "http-parser-js-0.4.9" = { - name = "http-parser-js"; - packageName = "http-parser-js"; - version = "0.4.9"; + "ejs-0.8.3" = { + name = "ejs"; + packageName = "ejs"; + version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz"; - sha1 = "ea1a04fb64adff0242e9974f297dd4c3cad271e1"; + url = "https://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz"; + sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f"; }; }; - "websocket-extensions-0.1.3" = { - name = "websocket-extensions"; - packageName = "websocket-extensions"; - version = "0.1.3"; + "ejs-2.5.7" = { + name = "ejs"; + packageName = "ejs"; + version = "2.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; - sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy"; + url = "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz"; + sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; }; }; - "native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = { - name = "native-dns-cache"; - packageName = "native-dns-cache"; - version = "0.0.2"; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-cache.git"; - rev = "8714196bb9223cc9a4064a4fddf9e82ec50b7d4d"; - sha256 = "3f06b2577afc3c1e428533baae3c51bad44a2e1e02fca147a1303943c214f841"; + "elegant-spinner-1.0.1" = { + name = "elegant-spinner"; + packageName = "elegant-spinner"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz"; + sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; }; }; - "native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" = { - name = "native-dns-packet"; - packageName = "native-dns-packet"; - version = "0.0.4"; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-packet.git"; - rev = "8bf2714c318cfe7d31bca2006385882ccbf503e4"; - sha256 = "1f39a4bd88978a0b51d45c32c777fb7f75b12e220cf7d206aa5a12d1e4e80f9d"; + "elementtree-0.1.6" = { + name = "elementtree"; + packageName = "elementtree"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; + sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; }; }; - "binaryheap-0.0.3" = { - name = "binaryheap"; - packageName = "binaryheap"; - version = "0.0.3"; + "elementtree-0.1.7" = { + name = "elementtree"; + packageName = "elementtree"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; - sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz"; + sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; - "native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" = { - name = "native-dns-packet"; - packageName = "native-dns-packet"; - version = "0.0.3"; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-packet.git"; - rev = "307e77a47ebba57a5ae9118a284e916e5ebb305a"; - sha256 = "f8aaa7bb3b2a652e52bfe5c13a6531c71d690f621ef4d86d0787838708a50358"; + "elliptic-6.4.0" = { + name = "elliptic"; + packageName = "elliptic"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; + sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; - "buffercursor-0.0.12" = { - name = "buffercursor"; - packageName = "buffercursor"; - version = "0.0.12"; + "email-validator-1.1.1" = { + name = "email-validator"; + packageName = "email-validator"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; - sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; + url = "https://registry.npmjs.org/email-validator/-/email-validator-1.1.1.tgz"; + sha512 = "3ydmy134p48c4zswbvjllak53h545dmzsz77bwpfxjf7aw510yyg4w58pazc2yz9agm93rphfgglrlj9cfkfdygcg1rbv0vj4jhjixy"; }; }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; + "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { + name = "emitter"; + packageName = "emitter"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + name = "emitter-1.0.1.tar.gz"; + url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; + sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; - "qs-1.2.0" = { - name = "qs"; - packageName = "qs"; - version = "1.2.0"; + "emoji-regex-6.1.1" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; - sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz"; + sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; }; }; - "formidable-1.0.14" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.14"; + "emoji-regex-6.1.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; - sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz"; + sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932"; }; }; - "component-emitter-1.1.2" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.1.2"; + "emojis-list-2.1.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; - sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; + sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "methods-1.0.1" = { - name = "methods"; - packageName = "methods"; - version = "1.0.1"; + "enable-1.3.2" = { + name = "enable"; + packageName = "enable"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; - sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; + url = "https://registry.npmjs.org/enable/-/enable-1.3.2.tgz"; + sha1 = "9eba6837d16d0982b59f87d889bf754443d52931"; }; }; - "cookiejar-2.0.1" = { - name = "cookiejar"; - packageName = "cookiejar"; - version = "2.0.1"; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; - sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "reduce-component-1.0.1" = { - name = "reduce-component"; - packageName = "reduce-component"; - version = "1.0.1"; + "encoding-0.1.12" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; - sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; + sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "form-data-0.1.3" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.3"; + "end-of-stream-0.1.5" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; - sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz"; + sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; }; }; - "readable-stream-1.0.27-1" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.0.27-1"; + "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/readable-stream/-/readable-stream-1.0.27-1.tgz"; - sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; + sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "JSONStream-0.8.4" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "0.8.4"; + "end-of-stream-1.1.0" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz"; - sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; + sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; }; }; - "basic-auth-1.1.0" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "1.1.0"; + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; - sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl"; }; }; - "cors-2.8.4" = { - name = "cors"; - packageName = "cors"; - version = "2.8.4"; + "ends-with-0.2.0" = { + name = "ends-with"; + packageName = "ends-with"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz"; - sha1 = "2bd381f2eb201020105cd50ea59da63090694686"; + url = "https://registry.npmjs.org/ends-with/-/ends-with-0.2.0.tgz"; + sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a"; }; }; - "docker-parse-image-3.0.1" = { - name = "docker-parse-image"; - packageName = "docker-parse-image"; - version = "3.0.1"; + "engine.io-1.3.1" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/docker-parse-image/-/docker-parse-image-3.0.1.tgz"; - sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz"; + sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e"; }; }; - "from2-1.3.0" = { - name = "from2"; - packageName = "from2"; - version = "1.3.0"; + "engine.io-1.8.5" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/from2/-/from2-1.3.0.tgz"; - sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.5.tgz"; + sha512 = "3ff3a0anvy48mmpay3jkzlrjvxmlclq823j8jmjfdhy48xpz1syz44bwr13zdh161x1vqzsclgwb6gvgrn9vymvq98qihrdr4hxcl4g"; }; }; - "fs-blob-store-5.2.1" = { - name = "fs-blob-store"; - packageName = "fs-blob-store"; - version = "5.2.1"; + "engine.io-3.1.5" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/fs-blob-store/-/fs-blob-store-5.2.1.tgz"; - sha1 = "2a7db7ef59a5ec548cce8564066508224c9b0457"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz"; + sha512 = "1qcg5b143cxb4gxa9jpj51c8q9ihwb0sscwqicgwrghmfg8y2phqjzhlaxjsrd6z8h1mpsxzy00s54w9lx6vd27f1mj9iqqk6ya4khg"; }; }; - "level-0.18.0" = { - name = "level"; - packageName = "level"; - version = "0.18.0"; + "engine.io-3.2.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/level/-/level-0.18.0.tgz"; - sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz"; + sha512 = "0mizbh339hvwkla9vy96m7jg92120wqm9af12ks998hrp2a0fzr3w0gxssjwhp0s0f3kyii24z1sz2x5xq9x3qb5cjn1q2h1fcf05lr"; }; }; - "level-sublevel-6.6.1" = { - name = "level-sublevel"; - packageName = "level-sublevel"; - version = "6.6.1"; + "engine.io-client-1.3.1" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.1.tgz"; - sha1 = "f9a77f7521ab70a8f8e92ed56f21a3c7886a4485"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz"; + sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989"; }; }; - "leveldown-0.10.6" = { - name = "leveldown"; - packageName = "leveldown"; - version = "0.10.6"; + "engine.io-client-1.8.5" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/leveldown/-/leveldown-0.10.6.tgz"; - sha1 = "a1bb751c95263ff60f41bde0f973ff8c1e98bbe9"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.5.tgz"; + sha512 = "1kfc2cmjw891x0i9cm9alm93db5s40h3n4a3zcpjha7nrvz0s7ggzpp2x2v8zmnhp9278amjdm0j5lfkn3qxan7nanzhl4m4wgy1101"; }; }; - "levelup-0.18.6" = { - name = "levelup"; - packageName = "levelup"; - version = "0.18.6"; + "engine.io-client-3.1.6" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz"; - sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz"; + sha512 = "1zfr0lycsgvwkxc8i4qhg5rjr59ss7p66nz3j1y1awmvzgy9myn0rqrpv2hrnm76qv9kmiiss0jpxaaz9xy0lkp7857npkfb6q8fyw6"; }; }; - "lexicographic-integer-1.1.0" = { - name = "lexicographic-integer"; - packageName = "lexicographic-integer"; - version = "1.1.0"; + "engine.io-client-3.2.1" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lexicographic-integer/-/lexicographic-integer-1.1.0.tgz"; - sha1 = "52ca6d998a572e6322b515f5b80e396c6043e9b8"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz"; + sha512 = "37x70wgsxmbz24ypn1nprgrmqrbjf5ln7xjivpw5q6rw91kj2mhjq81ai8v7zs6am25h2sajk341kid215gxrmy88iwwy2n5f9ip46b"; }; }; - "memdown-0.10.2" = { - name = "memdown"; - packageName = "memdown"; - version = "0.10.2"; + "engine.io-parser-1.0.6" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/memdown/-/memdown-0.10.2.tgz"; - sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608"; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.0.6.tgz"; + sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e"; }; }; - "minimist-0.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "0.2.0"; + "engine.io-parser-1.3.2" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"; - sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce"; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; + sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; }; }; - "ndjson-1.5.0" = { - name = "ndjson"; - packageName = "ndjson"; - version = "1.5.0"; + "engine.io-parser-2.1.2" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz"; - sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz"; + sha512 = "0rjbixsn5qvjwklnvvjdfz4wy85dk82zkvh6lk3znbd3p3isgr57a5kikgndr3xhhkv5zzvh4bfxbz7gqfsgijscyiiilgw78bwp2bl"; }; }; - "pump-1.0.2" = { - name = "pump"; - packageName = "pump"; - version = "1.0.2"; + "enhanced-resolve-2.3.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz"; - sha1 = "3b3ee6512f94f0e575538c17995f9f16990a5d51"; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz"; + sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; }; }; - "pumpify-1.3.5" = { - name = "pumpify"; - packageName = "pumpify"; - version = "1.3.5"; + "enhanced-resolve-4.0.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz"; - sha1 = "1b671c619940abcaeac0ad0e3a3c164be760993b"; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz"; + sha512 = "3r1f41kk9dzckpghscy0q2j6qzmzckbv4mc83y5d4kxg2r458wgsimljpr0ycx6pvg8sjwwdhh8750h1wrl3m54svaqf6pncvmpz34f"; }; }; - "relative-date-1.1.3" = { - name = "relative-date"; - packageName = "relative-date"; - version = "1.1.3"; + "ensure-posix-path-1.0.2" = { + name = "ensure-posix-path"; + packageName = "ensure-posix-path"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/relative-date/-/relative-date-1.1.3.tgz"; - sha1 = "120903040588ec7a4a399c6547fd01d0e3d2dc63"; + url = "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz"; + sha1 = "a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2"; }; }; - "root-2.0.0" = { - name = "root"; - packageName = "root"; - version = "2.0.0"; + "ent-2.2.0" = { + name = "ent"; + packageName = "ent"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/root/-/root-2.0.0.tgz"; - sha1 = "5cde3bc4ee9eb314c9dc64f97d9b9787df22e2f7"; + url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"; + sha1 = "e964219325a21d05f44466a2f686ed6ce5f5dd1d"; }; }; - "sorted-union-stream-1.0.2" = { - name = "sorted-union-stream"; - packageName = "sorted-union-stream"; - version = "1.0.2"; + "entities-1.0.0" = { + name = "entities"; + packageName = "entities"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-1.0.2.tgz"; - sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006"; + url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; + sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; }; }; - "split2-0.2.1" = { - name = "split2"; - packageName = "split2"; - version = "0.2.1"; + "entities-1.1.1" = { + name = "entities"; + packageName = "entities"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz"; - sha1 = "02ddac9adc03ec0bb78c1282ec079ca6e85ae900"; + url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; + sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "stream-collector-1.0.1" = { - name = "stream-collector"; - packageName = "stream-collector"; - version = "1.0.1"; + "env-paths-1.0.0" = { + name = "env-paths"; + packageName = "env-paths"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-collector/-/stream-collector-1.0.1.tgz"; - sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15"; + url = "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz"; + sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; }; }; - "tar-stream-1.5.5" = { - name = "tar-stream"; - packageName = "tar-stream"; - version = "1.5.5"; + "envconf-0.0.4" = { + name = "envconf"; + packageName = "envconf"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; - sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; + url = "https://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz"; + sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; }; }; - "through2-0.6.5" = { - name = "through2"; - packageName = "through2"; - version = "0.6.5"; + "envinfo-3.4.2" = { + name = "envinfo"; + packageName = "envinfo"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"; - sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; + url = "https://registry.npmjs.org/envinfo/-/envinfo-3.4.2.tgz"; + sha512 = "3m2wjc7aa1y0in84b3gg6c2r5cyzhbbcil9i09l2yh1vaw7mw8piziw9fpri3x2bzfrpjksm0sz715ki08nkgz65rrqzwyhlzxab8na"; }; }; - "jsonparse-0.0.5" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "0.0.5"; + "errno-0.1.7" = { + name = "errno"; + packageName = "errno"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"; - sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64"; + url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; + sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; }; }; - "lru-cache-2.7.3" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.7.3"; + "error-7.0.2" = { + name = "error"; + packageName = "error"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; - sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; + url = "https://registry.npmjs.org/error/-/error-7.0.2.tgz"; + sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; }; }; - "level-packager-0.18.0" = { - name = "level-packager"; - packageName = "level-packager"; - version = "0.18.0"; + "error-ex-1.3.1" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/level-packager/-/level-packager-0.18.0.tgz"; - sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5"; + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; + sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; }; }; - "bytewise-1.1.0" = { - name = "bytewise"; - packageName = "bytewise"; - version = "1.1.0"; + "errorhandler-1.4.3" = { + name = "errorhandler"; + packageName = "errorhandler"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz"; - sha1 = "1d13cbff717ae7158094aa881b35d081b387253e"; + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz"; + sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f"; }; }; - "levelup-0.19.1" = { - name = "levelup"; - packageName = "levelup"; - version = "0.19.1"; + "errorhandler-1.5.0" = { + name = "errorhandler"; + packageName = "errorhandler"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-0.19.1.tgz"; - sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz"; + sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4"; }; }; - "ltgt-2.1.3" = { - name = "ltgt"; - packageName = "ltgt"; - version = "2.1.3"; + "es-abstract-1.11.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz"; - sha1 = "10851a06d9964b971178441c23c9e52698eece34"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz"; + sha512 = "2aaq6ivy5raj1a99db6gvw7qn2vs27h0pqvgpf2fqfm9avwqsirr8gs86yx7n36qysjw1vabz6mlc8dfpi6fmz9yqvk8kapz49jnx36"; }; }; - "pull-level-2.0.3" = { - name = "pull-level"; - packageName = "pull-level"; - version = "2.0.3"; + "es-to-primitive-1.1.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.3.tgz"; - sha1 = "9500635e257945d6feede185f5d7a24773455b17"; + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; + sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; }; }; - "pull-stream-3.6.1" = { - name = "pull-stream"; - packageName = "pull-stream"; - version = "3.6.1"; + "es5-ext-0.10.42" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.42"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.1.tgz"; - sha1 = "c5c2ae4a51246efeebcc65c0412a3d725a92ce00"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz"; + sha512 = "1412ssfrx1kvraz8kp4x9lc1jzcdh2952vbmlimrfalmbjv44rh504ihb4fg5mjwx8ix1f1wii0a0qngwrfk4gl271mcywgp7b4x700"; }; }; - "typewiselite-1.0.0" = { - name = "typewiselite"; - packageName = "typewiselite"; - version = "1.0.0"; + "es5-ext-0.8.2" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/typewiselite/-/typewiselite-1.0.0.tgz"; - sha1 = "c8882fa1bb1092c06005a97f34ef5c8508e3664e"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.8.2.tgz"; + sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; }; }; - "bytewise-core-1.2.3" = { - name = "bytewise-core"; - packageName = "bytewise-core"; - version = "1.2.3"; + "es5class-2.3.1" = { + name = "es5class"; + packageName = "es5class"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz"; - sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; + url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; + sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; }; }; - "typewise-1.0.3" = { - name = "typewise"; - packageName = "typewise"; - version = "1.0.3"; + "es6-error-4.0.0" = { + name = "es6-error"; + packageName = "es6-error"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz"; - sha1 = "1067936540af97937cc5dcf9922486e9fa284651"; + url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.0.tgz"; + sha1 = "f094c7041f662599bb12720da059d6b9c7ff0f40"; }; }; - "typewise-core-1.2.0" = { - name = "typewise-core"; - packageName = "typewise-core"; - version = "1.2.0"; + "es6-error-4.1.1" = { + name = "es6-error"; + packageName = "es6-error"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz"; - sha1 = "97eb91805c7f55d2f941748fa50d315d991ef195"; + url = "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz"; + sha512 = "1b98y4j9fy6c2wm7ys3csnyfg8cn40sy2g958i45fdh5bnx1lkl19d4508aldabga5rm1q5hzxq68yjdyb8n6qxb8925x1b2cbzwvsj"; }; }; - "bl-0.8.2" = { - name = "bl"; - packageName = "bl"; - version = "0.8.2"; + "es6-iterator-2.0.3" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; - sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; }; }; - "deferred-leveldown-0.2.0" = { - name = "deferred-leveldown"; - packageName = "deferred-leveldown"; - version = "0.2.0"; + "es6-map-0.1.5" = { + name = "es6-map"; + packageName = "es6-map"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz"; - sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; + url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; + sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; }; }; - "errno-0.1.4" = { - name = "errno"; - packageName = "errno"; - version = "0.1.4"; + "es6-promise-2.3.0" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz"; - sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"; + sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; }; }; - "prr-0.0.0" = { - name = "prr"; - packageName = "prr"; - version = "0.0.0"; + "es6-promise-3.3.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; - sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; }; - "xtend-3.0.0" = { - name = "xtend"; - packageName = "xtend"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"; - sha1 = "5cce7407baf642cba7becda568111c493f59665a"; - }; - }; - "abstract-leveldown-0.12.4" = { - name = "abstract-leveldown"; - packageName = "abstract-leveldown"; - version = "0.12.4"; + "es6-promise-4.2.4" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz"; - sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz"; + sha512 = "10hlgvxhshjxlbwvm1gnf1b01sv1fmh191a97l0h5gmcs9am1b6x937wnhkvvj5fkin10qscii8pcwnp9rlnpkgnrhfdyk0a9jlvmzw"; }; }; - "level-post-1.0.5" = { - name = "level-post"; - packageName = "level-post"; - version = "1.0.5"; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/level-post/-/level-post-1.0.5.tgz"; - sha1 = "2a66390409bf6a1621a444bab6f016444cc9802c"; + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; }; }; - "pull-cat-1.1.11" = { - name = "pull-cat"; - packageName = "pull-cat"; - version = "1.1.11"; + "es6-set-0.1.5" = { + name = "es6-set"; + packageName = "es6-set"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/pull-cat/-/pull-cat-1.1.11.tgz"; - sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b"; + url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; }; }; - "pull-live-1.0.1" = { - name = "pull-live"; - packageName = "pull-live"; - version = "1.0.1"; + "es6-shim-0.21.1" = { + name = "es6-shim"; + packageName = "es6-shim"; + version = "0.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/pull-live/-/pull-live-1.0.1.tgz"; - sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; + url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.21.1.tgz"; + sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2"; }; }; - "pull-pushable-2.1.1" = { - name = "pull-pushable"; - packageName = "pull-pushable"; - version = "2.1.1"; + "es6-symbol-3.1.1" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.1.1.tgz"; - sha1 = "86666abbe3f5402f1f7ead03eefd69b785eca5b8"; + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; }; }; - "pull-window-2.1.4" = { - name = "pull-window"; - packageName = "pull-window"; - version = "2.1.4"; + "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/pull-window/-/pull-window-2.1.4.tgz"; - sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0"; + url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; + sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; }; }; - "stream-to-pull-stream-1.7.2" = { - name = "stream-to-pull-stream"; - packageName = "stream-to-pull-stream"; - version = "1.7.2"; + "escape-html-1.0.1" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.2.tgz"; - sha1 = "757609ae1cebd33c7432d4afbe31ff78650b9dde"; + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; }; }; - "looper-2.0.0" = { - name = "looper"; - packageName = "looper"; - version = "2.0.0"; + "escape-html-1.0.2" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/looper/-/looper-2.0.0.tgz"; - sha1 = "66cd0c774af3d4fedac53794f742db56da8f09ec"; + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz"; + sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; }; }; - "looper-3.0.0" = { - name = "looper"; - packageName = "looper"; - version = "3.0.0"; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz"; - sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; }; }; - "nan-2.1.0" = { - name = "nan"; - packageName = "nan"; - version = "2.1.0"; + "escape-regexp-component-1.0.2" = { + name = "escape-regexp-component"; + packageName = "escape-regexp-component"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"; - sha1 = "020a7ccedc63fdee85f85967d5607849e74abbe8"; + url = "https://registry.npmjs.org/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz"; + sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"; }; }; - "semver-2.3.2" = { - name = "semver"; - packageName = "semver"; - version = "2.3.2"; + "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/semver/-/semver-2.3.2.tgz"; - sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "ltgt-1.0.2" = { - name = "ltgt"; - packageName = "ltgt"; - version = "1.0.2"; + "escodegen-1.8.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/ltgt/-/ltgt-1.0.2.tgz"; - sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3"; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; + sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; - "split2-2.2.0" = { - name = "split2"; - packageName = "split2"; - version = "2.2.0"; + "escodegen-1.9.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz"; - sha512 = "1plzy1n554n2gwfpavi4azb4y45dm2mwj7dq8ma99yg1z55xcdxmkibsfhsh1h19qgsrcamm0ha5qi2c3has6skvx4bix5p67czc1j4"; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz"; + sha512 = "3nl4jbvigqc5ax1f35b601vlca4fa4ghr27wfglgrmv7h5pssnkh7px0vjh8wzrkjvx8bw7c71b0axc307akkjd1vkl2nj0acxy657a"; }; }; - "murl-0.4.1" = { - name = "murl"; - packageName = "murl"; - version = "0.4.1"; + "escope-3.6.0" = { + name = "escope"; + packageName = "escope"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/murl/-/murl-0.4.1.tgz"; - sha1 = "489fbcc7f1b2b77e689c84120a51339c3849c939"; + url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; + sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "protein-0.5.0" = { - name = "protein"; - packageName = "protein"; - version = "0.5.0"; + "eslint-3.19.0" = { + name = "eslint"; + packageName = "eslint"; + version = "3.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/protein/-/protein-0.5.0.tgz"; - sha1 = "80ab4e919749351263ef14500d684e57c4202840"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; + sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; }; - "bl-1.2.1" = { - name = "bl"; - packageName = "bl"; - version = "1.2.1"; + "eslint-4.19.0" = { + name = "eslint"; + packageName = "eslint"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz"; - sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.19.0.tgz"; + sha512 = "29dc1z24n3c60hfac5afy7rk3mqdch8hnn07fnb9314dbyk5ih2l1284vl3nsgsm5ja5w144nsgmipbycva47gwpl1qfsma5gjcpkdg"; }; }; - "aws-sdk-2.149.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.149.0"; + "eslint-4.19.1" = { + name = "eslint"; + packageName = "eslint"; + version = "4.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.149.0.tgz"; - sha1 = "76f53722a7780bdb3191e83f27c10108c6fe9813"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz"; + sha512 = "0hw70vjlg6z0y9kf6vjr7g0w9hbm426fwvyzr88l62c5hd9mxrbw5v34b6zb31vbbyda3mkvcwgfnxgqaxvpn0wlrxr0va43pbzygbd"; }; }; - "request-2.83.0" = { - name = "request"; - packageName = "request"; - version = "2.83.0"; + "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { + name = "eslint-plugin-no-unsafe-innerhtml"; + packageName = "eslint-plugin-no-unsafe-innerhtml"; + version = "1.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + url = "https://registry.npmjs.org/eslint-plugin-no-unsafe-innerhtml/-/eslint-plugin-no-unsafe-innerhtml-1.0.16.tgz"; + sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; }; }; - "buffer-4.9.1" = { - name = "buffer"; - packageName = "buffer"; - version = "4.9.1"; + "eslint-scope-3.7.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; + sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; }; }; - "crypto-browserify-1.0.9" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "1.0.9"; + "eslint-visitor-keys-1.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz"; - sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0"; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; + sha512 = "02hr99x8cnc80p9hn5si7mngqpzvvjkxmdv8sch68z0qpqwjdlx3j1w6d9rhr6wgcnqf1mrxyji8wvfddbf7xr13z2nzihv29gvyfdb"; }; }; - "jmespath-0.15.0" = { - name = "jmespath"; - packageName = "jmespath"; - version = "0.15.0"; + "espree-3.5.4" = { + name = "espree"; + packageName = "espree"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"; - sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; + url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz"; + sha512 = "3a07jjjp8g8mdayw3n9l0p0llw7cfipjifan2ccyn2vm1zyafrmv5cj11rc6qmk7ibbq1vc4xxc3sfr54qpgxmxiizj0ck63d1hh1y8"; }; }; - "sax-1.2.1" = { - name = "sax"; - packageName = "sax"; - version = "1.2.1"; + "esprima-1.0.4" = { + name = "esprima"; + packageName = "esprima"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; + sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; }; }; - "url-0.10.3" = { - name = "url"; - packageName = "url"; - version = "0.10.3"; + "esprima-2.7.3" = { + name = "esprima"; + packageName = "esprima"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; - sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; + url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; + sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; }; }; - "xml2js-0.4.17" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.4.17"; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz"; - sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; }; }; - "xmlbuilder-4.2.1" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "4.2.1"; + "esprima-4.0.0" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz"; - sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; + sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; }; }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; + "esprima-fb-13001.1001.0-dev-harmony-fb" = { + name = "esprima-fb"; + packageName = "esprima-fb"; + version = "13001.1001.0-dev-harmony-fb"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz"; + sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; + "esquery-1.0.1" = { + name = "esquery"; + packageName = "esquery"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; + url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz"; + sha512 = "0s9lxfan3qbvpprj71ldy70x9sz4xkpakhr3pymkm13bx40px4kp4xcgipscn8m21qigddin5mkr52bicbm34g46dapyn68kikv4s2a"; }; }; - "form-data-2.3.1" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.1"; + "esrecurse-4.2.1" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"; - sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"; + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; + sha512 = "06zyknk70y80n428x20wvjqy5822wgz2yaxzw387njnz3ar6ixzjcxzr2jsl8wrm0m9jpa4ysbcr9znpk6gbkqd7wby084zxw3l317b"; }; }; - "har-validator-5.0.3" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.0.3"; + "estraverse-1.9.3" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; + sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; }; }; - "hawk-6.0.2" = { - name = "hawk"; - packageName = "hawk"; - version = "6.0.2"; + "estraverse-4.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; - sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; + sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; }; }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; }; }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; + "etag-1.5.1" = { + name = "etag"; + packageName = "etag"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; + sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; }; }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; + "etag-1.7.0" = { + name = "etag"; + packageName = "etag"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; + sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; }; }; - "ajv-5.3.0" = { - name = "ajv"; - packageName = "ajv"; - version = "5.3.0"; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz"; - sha1 = "4414ff74a50879c208ee5fdc826e32c303549eda"; + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "har-schema-2.0.0" = { - name = "har-schema"; - packageName = "har-schema"; - version = "2.0.0"; + "eve-0.5.4" = { + name = "eve"; + packageName = "eve"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + url = "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz"; + sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; - "fast-deep-equal-1.0.0" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "1.0.0"; + "event-stream-0.5.3" = { + name = "event-stream"; + packageName = "event-stream"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; - sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; + sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; }; }; - "fast-json-stable-stringify-2.0.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.0.0"; + "event-stream-3.1.5" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz"; + sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c"; }; }; - "json-schema-traverse-0.3.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.3.1"; + "event-stream-3.2.2" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; + sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; }; }; - "hoek-4.2.0" = { - name = "hoek"; - packageName = "hoek"; - version = "4.2.0"; + "event-stream-3.3.4" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"; - sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; + sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; }; }; - "boom-4.3.1" = { - name = "boom"; - packageName = "boom"; - version = "4.3.1"; + "event-to-promise-0.8.0" = { + name = "event-to-promise"; + packageName = "event-to-promise"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; - sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; + url = "https://registry.npmjs.org/event-to-promise/-/event-to-promise-0.8.0.tgz"; + sha1 = "4b84f11772b6f25f7752fc74d971531ac6f5b626"; }; }; - "cryptiles-3.1.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "3.1.2"; + "eventemitter2-0.4.14" = { + name = "eventemitter2"; + packageName = "eventemitter2"; + version = "0.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; - sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; + sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; }; }; - "sntp-2.1.0" = { - name = "sntp"; - packageName = "sntp"; - version = "2.1.0"; + "eventemitter2-3.0.2" = { + name = "eventemitter2"; + packageName = "eventemitter2"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; - sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-3.0.2.tgz"; + sha1 = "81c0edb739ffa64fb9f21bbcb1d2b419a5133512"; }; }; - "boom-5.2.0" = { - name = "boom"; - packageName = "boom"; - version = "5.2.0"; + "eventemitter3-0.1.6" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; - sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; + sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; }; }; - "binstall-1.2.0" = { - name = "binstall"; - packageName = "binstall"; + "eventemitter3-1.2.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/binstall/-/binstall-1.2.0.tgz"; - sha1 = "6b2c0f580b9e3c607f50ef7a22a54ce9fdc8d933"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; }; }; - "chalk-2.1.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.1.0"; + "eventemitter3-3.0.1" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; - sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.1.tgz"; + sha512 = "0c5685grn5npm90n22lw5hjz93ga3ffc3j6jk5rs4sz0w7ymwj942v3w94ikkgxpvxj7mfawsdrczwad0b7srbkynbwac7xvsxqzq20"; }; }; - "chokidar-1.6.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "1.6.0"; + "events-1.1.1" = { + name = "events"; + packageName = "events"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz"; - sha1 = "90c32ad4802901d7713de532dc284e96a63ad058"; + url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; + sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; }; }; - "cross-spawn-4.0.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "4.0.0"; + "events-2.0.0" = { + name = "events"; + packageName = "events"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.0.tgz"; - sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252"; + url = "https://registry.npmjs.org/events/-/events-2.0.0.tgz"; + sha512 = "1r878as79mx3xg56nvjxxbryqa8lqn8xmiqi1xqfx2vjygnfaf15h5l658a9ikfr1bhc6ygxny8jr8ddjxpzlh6y443rxv08di3kwxg"; }; }; - "find-parent-dir-0.3.0" = { - name = "find-parent-dir"; - packageName = "find-parent-dir"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz"; - sha1 = "33c44b429ab2b2f0646299c5f9f718f376ff8d54"; - }; - }; - "firstline-1.2.1" = { - name = "firstline"; - packageName = "firstline"; - version = "1.2.1"; + "events.node-0.4.9" = { + name = "events.node"; + packageName = "events.node"; + version = "0.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/firstline/-/firstline-1.2.1.tgz"; - sha1 = "b88673c42009f8821fac2926e99720acee924fae"; + url = "https://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz"; + sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; - "fs-extra-0.30.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "0.30.0"; + "everyauth-0.4.5" = { + name = "everyauth"; + packageName = "everyauth"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; - sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0"; + url = "https://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; + sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189"; }; }; - "fsevents-1.1.2" = { - name = "fsevents"; - packageName = "fsevents"; - version = "1.1.2"; + "evp_bytestokey-1.0.3" = { + name = "evp_bytestokey"; + packageName = "evp_bytestokey"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz"; - sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja"; + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; }; }; - "lodash-4.13.1" = { - name = "lodash"; - packageName = "lodash"; - version = "4.13.1"; + "execa-0.4.0" = { + name = "execa"; + packageName = "execa"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"; - sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68"; + url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; + sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; }; }; - "murmur-hash-js-1.0.0" = { - name = "murmur-hash-js"; - packageName = "murmur-hash-js"; - version = "1.0.0"; + "execa-0.6.3" = { + name = "execa"; + packageName = "execa"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/murmur-hash-js/-/murmur-hash-js-1.0.0.tgz"; - sha1 = "5041049269c96633c866386960b2f4289e75e5b0"; + url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; + sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; }; }; - "node-elm-compiler-4.3.3" = { - name = "node-elm-compiler"; - packageName = "node-elm-compiler"; - version = "4.3.3"; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-4.3.3.tgz"; - sha512 = "2xwfrbx7s959y63gdiy54y86mp770vkxfgszp5xhwnxr29d3xavf8dnp0ab238732wh1121qwlx6k68wa4wkk4rm4qiswq5h5m9fjhd"; + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; }; }; - "supports-color-4.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.2.0"; + "execa-0.8.0" = { + name = "execa"; + packageName = "execa"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz"; - sha512 = "158ng0v99ac7csif7v6153bp63nxmlz2a613z8y09sk8jsj2rpalscgg0lfzdlpfdd5612jqsnkvrz0137inka2qjcmcjrmy2xhrkaf"; + url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; + sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; }; }; - "ansi-styles-3.2.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.0"; + "execall-1.0.0" = { + name = "execall"; + packageName = "execall"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; - sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; + url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz"; + sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73"; }; }; - "color-convert-1.9.1" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.1"; + "executable-4.1.1" = { + name = "executable"; + packageName = "executable"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz"; - sha512 = "32rj1090g95xcvm0d2ya6jbqdhiy9w2wv3picdy33fzrm455v0gi7g4n8lw0n31g37wwbdnz7lxjsisgbsaqz1d10j9nh5hi2f9lccs"; + url = "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz"; + sha512 = "0p56mwdi80mzj4q8yb6s1abff3dwpl1s887jarp0fx3x3gz92qahnn28yqn0r351wflqsw4cqa4383965pm0pbgxwhhgf7p23vkn87j"; }; }; - "color-name-1.1.3" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.3"; + "exit-0.1.2" = { + name = "exit"; + packageName = "exit"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }; }; - "anymatch-1.3.2" = { - name = "anymatch"; - packageName = "anymatch"; - version = "1.3.2"; + "exit-hook-1.1.1" = { + name = "exit-hook"; + packageName = "exit-hook"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; - sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; + url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"; + sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; }; }; - "async-each-1.0.1" = { - name = "async-each"; - packageName = "async-each"; + "exit-on-epipe-1.0.1" = { + name = "exit-on-epipe"; + packageName = "exit-on-epipe"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"; - sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha512 = "2kxcf7dq1q9z2wqwwfjagn77kpzg2zpjqf2kd3vj5drx576gwglbsfly2b1imabj3svgcz5xsx79kspq1xsdgm4wwg1fksfnjdgjv47"; }; }; - "glob-parent-2.0.0" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "2.0.0"; + "expand-braces-0.1.2" = { + name = "expand-braces"; + packageName = "expand-braces"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; - sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + url = "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz"; + sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; }; }; - "is-binary-path-1.0.1" = { - name = "is-binary-path"; - packageName = "is-binary-path"; - version = "1.0.1"; + "expand-brackets-0.1.5" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; - sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; + sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; }; }; - "is-glob-2.0.1" = { - name = "is-glob"; - packageName = "is-glob"; - version = "2.0.1"; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; - sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; }; }; - "readdirp-2.1.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "2.1.0"; + "expand-range-0.1.1" = { + name = "expand-range"; + packageName = "expand-range"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"; - sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; + url = "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz"; + sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"; }; }; - "micromatch-2.3.11" = { - name = "micromatch"; - packageName = "micromatch"; - version = "2.3.11"; + "expand-range-1.8.2" = { + name = "expand-range"; + packageName = "expand-range"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; - sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; + sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; }; }; - "normalize-path-2.1.1" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "2.1.1"; + "expand-template-1.1.0" = { + name = "expand-template"; + packageName = "expand-template"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz"; + sha512 = "34i2f4clwy5bpzgl137zwplybp5hn6ncxq0p794cx9m0crhgk31nfy0s8wp1v6hvw90h20c268r040g892dixy6zqq1xlm3ra8g0j4j"; }; }; - "arr-diff-2.0.0" = { - name = "arr-diff"; - packageName = "arr-diff"; - version = "2.0.0"; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; - sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "braces-1.8.5" = { - name = "braces"; - packageName = "braces"; - version = "1.8.5"; + "express-2.5.11" = { + name = "express"; + packageName = "express"; + version = "2.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; - sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz"; + sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; }; }; - "expand-brackets-0.1.5" = { - name = "expand-brackets"; - packageName = "expand-brackets"; - version = "0.1.5"; + "express-3.2.0" = { + name = "express"; + packageName = "express"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; - sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + url = "https://registry.npmjs.org/express/-/express-3.2.0.tgz"; + sha1 = "7b66d6c66b038038eedf452804222b3077374ae0"; }; }; - "extglob-0.3.2" = { - name = "extglob"; - packageName = "extglob"; - version = "0.3.2"; + "express-3.21.2" = { + name = "express"; + packageName = "express"; + version = "3.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; - sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz"; + sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; }; }; - "filename-regex-2.0.1" = { - name = "filename-regex"; - packageName = "filename-regex"; - version = "2.0.1"; + "express-3.4.4" = { + name = "express"; + packageName = "express"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; - sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + url = "https://registry.npmjs.org/express/-/express-3.4.4.tgz"; + sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; }; }; - "is-extglob-1.0.0" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "1.0.0"; + "express-4.11.2" = { + name = "express"; + packageName = "express"; + version = "4.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; - sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; + sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; }; }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; + "express-4.16.2" = { + name = "express"; + packageName = "express"; + version = "4.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + url = "https://registry.npmjs.org/express/-/express-4.16.2.tgz"; + sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"; }; }; - "object.omit-2.0.1" = { - name = "object.omit"; - packageName = "object.omit"; - version = "2.0.1"; + "express-4.16.3" = { + name = "express"; + packageName = "express"; + version = "4.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; - sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz"; + sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; }; }; - "parse-glob-3.0.4" = { - name = "parse-glob"; - packageName = "parse-glob"; - version = "3.0.4"; + "express-5.0.0-alpha.6" = { + name = "express"; + packageName = "express"; + version = "5.0.0-alpha.6"; src = fetchurl { - url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; - sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.6.tgz"; + sha1 = "85dc44d7e90d4809041407f388f239b5bd2f681e"; }; }; - "regex-cache-0.4.4" = { - name = "regex-cache"; - packageName = "regex-cache"; - version = "0.4.4"; + "express-handlebars-3.0.0" = { + name = "express-handlebars"; + packageName = "express-handlebars"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; - sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; + url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz"; + sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; - "arr-flatten-1.1.0" = { - name = "arr-flatten"; - packageName = "arr-flatten"; - version = "1.1.0"; + "express-json5-0.1.0" = { + name = "express-json5"; + packageName = "express-json5"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; + url = "https://registry.npmjs.org/express-json5/-/express-json5-0.1.0.tgz"; + sha1 = "114a514bd734b319e018a1bde337923cc455b836"; }; }; - "expand-range-1.8.2" = { - name = "expand-range"; - packageName = "expand-range"; - version = "1.8.2"; + "express-partials-0.0.6" = { + name = "express-partials"; + packageName = "express-partials"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; - sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + url = "https://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz"; + sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda"; }; }; - "preserve-0.2.0" = { - name = "preserve"; - packageName = "preserve"; - version = "0.2.0"; + "express-session-1.11.3" = { + name = "express-session"; + packageName = "express-session"; + version = "1.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; - sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz"; + sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; }; }; - "repeat-element-1.1.2" = { - name = "repeat-element"; - packageName = "repeat-element"; - version = "1.1.2"; + "express-session-1.15.6" = { + name = "express-session"; + packageName = "express-session"; + version = "1.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; - sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz"; + sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg"; }; }; - "fill-range-2.2.3" = { - name = "fill-range"; - packageName = "fill-range"; - version = "2.2.3"; + "express-urlrewrite-1.2.0" = { + name = "express-urlrewrite"; + packageName = "express-urlrewrite"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"; - sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; + url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.2.0.tgz"; + sha1 = "8e667b7761ff1c7ffdb0efa05d64035387c823eb"; }; }; - "is-number-2.1.0" = { - name = "is-number"; - packageName = "is-number"; - version = "2.1.0"; + "ext-list-2.2.2" = { + name = "ext-list"; + packageName = "ext-list"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; - sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz"; + sha512 = "0a77zmipy5silq8yx7adj0hw82ccvshbs5alv3h8l0vk83lkm5m7pw6y2781wnbks8h98ixyn2q3q065l6m8pwbrhxa3bcvrf191r5v"; }; }; - "isobject-2.1.0" = { - name = "isobject"; - packageName = "isobject"; - version = "2.1.0"; + "ext-name-3.0.0" = { + name = "ext-name"; + packageName = "ext-name"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + url = "https://registry.npmjs.org/ext-name/-/ext-name-3.0.0.tgz"; + sha1 = "07e4418737cb1f513c32c6ea48d8b8c8e0471abb"; }; }; - "randomatic-1.1.7" = { - name = "randomatic"; - packageName = "randomatic"; - version = "1.1.7"; + "extend-1.2.1" = { + name = "extend"; + packageName = "extend"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; - sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; + url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; }; }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; + "extend-3.0.1" = { + name = "extend"; + packageName = "extend"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; + sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; }; }; - "is-number-3.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "3.0.0"; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; - "kind-of-4.0.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "4.0.0"; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; }; }; - "is-posix-bracket-0.1.1" = { - name = "is-posix-bracket"; - packageName = "is-posix-bracket"; - version = "0.1.1"; + "external-editor-1.1.1" = { + name = "external-editor"; + packageName = "external-editor"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; - sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + url = "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz"; + sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; }; }; - "for-own-0.1.5" = { - name = "for-own"; - packageName = "for-own"; - version = "0.1.5"; + "external-editor-2.2.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; - sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; + sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd"; }; }; - "is-extendable-0.1.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "0.1.1"; + "extglob-0.3.2" = { + name = "extglob"; + packageName = "extglob"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; + sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; }; }; - "for-in-1.0.2" = { - name = "for-in"; - packageName = "for-in"; - version = "1.0.2"; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; }; }; - "glob-base-0.3.0" = { - name = "glob-base"; - packageName = "glob-base"; - version = "0.3.0"; + "extract-opts-3.3.1" = { + name = "extract-opts"; + packageName = "extract-opts"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; - sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + url = "https://registry.npmjs.org/extract-opts/-/extract-opts-3.3.1.tgz"; + sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1"; }; }; - "is-dotfile-1.0.3" = { - name = "is-dotfile"; - packageName = "is-dotfile"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; - sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; - }; - }; - "is-equal-shallow-0.1.3" = { - name = "is-equal-shallow"; - packageName = "is-equal-shallow"; - version = "0.1.3"; + "extract-zip-1.5.0" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; - sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz"; + sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; }; }; - "is-primitive-2.0.0" = { - name = "is-primitive"; - packageName = "is-primitive"; - version = "2.0.0"; + "extract-zip-1.6.6" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; - sha1 = "207bab91638499c07b2adf240a41a87210034575"; + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz"; + sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c"; }; }; - "remove-trailing-separator-1.1.0" = { - name = "remove-trailing-separator"; - packageName = "remove-trailing-separator"; - version = "1.1.0"; + "extsprintf-1.0.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz"; + sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }; }; - "binary-extensions-1.10.0" = { - name = "binary-extensions"; - packageName = "binary-extensions"; - version = "1.10.0"; + "extsprintf-1.2.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz"; - sha1 = "9aeb9a6c5e88638aad171e167f5900abe24835d0"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz"; + sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529"; }; }; - "set-immediate-shim-1.0.1" = { - name = "set-immediate-shim"; - packageName = "set-immediate-shim"; - version = "1.0.1"; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; - sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "lru-cache-4.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.1"; + "extsprintf-1.4.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; - sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; }; }; - "pseudomap-1.0.2" = { - name = "pseudomap"; - packageName = "pseudomap"; - version = "1.0.2"; + "eyes-0.1.8" = { + name = "eyes"; + packageName = "eyes"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; }; - "yallist-2.1.2" = { - name = "yallist"; - packageName = "yallist"; - version = "2.1.2"; + "falafel-2.1.0" = { + name = "falafel"; + packageName = "falafel"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + url = "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz"; + sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; }; }; - "find-elm-dependencies-1.0.2" = { - name = "find-elm-dependencies"; - packageName = "find-elm-dependencies"; - version = "1.0.2"; + "fancy-log-1.3.2" = { + name = "fancy-log"; + packageName = "fancy-log"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-1.0.2.tgz"; - sha512 = "2hpc7v115prqkr487hxh0gllwvf0xa90lsb3i1azmrpfclp37vahxvdsqkr9pwvbcr7znccvhfgp1xy26czrmdcxzfl250a63dywyw2"; + url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz"; + sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; }; }; - "lodash-4.14.2" = { - name = "lodash"; - packageName = "lodash"; - version = "4.14.2"; + "fast-deep-equal-1.1.0" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz"; - sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; + sha1 = "c053477817c86b51daa853c81e059b733d023614"; }; }; - "firstline-1.2.0" = { - name = "firstline"; - packageName = "firstline"; - version = "1.2.0"; + "fast-diff-1.1.2" = { + name = "fast-diff"; + packageName = "fast-diff"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/firstline/-/firstline-1.2.0.tgz"; - sha1 = "c9f4886e7f7fbf0afc12d71941dce06b192aea05"; + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz"; + sha512 = "2550z1qvyfv9js9vg2aaj57ji5d9hhg4f6zl4rf483d6xswv23ac6ipj8gbapv4sjx14dpcslqmnx1z78vvx4np4ad5mdrxwfvm98i9"; }; }; - "has-flag-2.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "2.0.0"; + "fast-json-parse-1.0.3" = { + name = "fast-json-parse"; + packageName = "fast-json-parse"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; - sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + url = "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz"; + sha512 = "01vq6bwp36yjvywlw5jniq4ainn8jrwxsab76bv02j77ky26qm99097g7x6j8dqrjrhfgd0vs9q6nh2milhsnsk9529s42njilsq58m"; }; }; - "auto-bind-1.1.0" = { - name = "auto-bind"; - packageName = "auto-bind"; - version = "1.1.0"; + "fast-json-patch-0.5.6" = { + name = "fast-json-patch"; + packageName = "fast-json-patch"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.1.0.tgz"; - sha1 = "93b864dc7ee01a326281775d5c75ca0a751e5961"; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz"; + sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; }; }; - "clipboardy-1.2.1" = { - name = "clipboardy"; - packageName = "clipboardy"; - version = "1.2.1"; + "fast-json-patch-1.2.2" = { + name = "fast-json-patch"; + packageName = "fast-json-patch"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.1.tgz"; - sha512 = "3vl17aazp0zg59v7p7jmgm4zhrkxb6kmpddqam0r2cpviy51qmykr9kc52lyxywshbi3y52dqs5m17plpm0anscyh6cr2r2g07bxg0r"; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-1.2.2.tgz"; + sha1 = "d377d97c6911dbdd2a1c80bfacda048a4f83bbf9"; }; }; - "conf-1.3.1" = { - name = "conf"; - packageName = "conf"; - version = "1.3.1"; + "fast-json-patch-2.0.6" = { + name = "fast-json-patch"; + packageName = "fast-json-patch"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-1.3.1.tgz"; - sha512 = "0s33rz07rq4r5kf3bgza6gz4157ph97cm2dh8ws0mj7b924prjaqwbsnljx61pvzkl3db82z51i2k41dpg0hqw6srhkx9qx4nb1yrs8"; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.6.tgz"; + sha1 = "86fff8f8662391aa819722864d632e603e6ee605"; }; }; - "got-7.1.0" = { - name = "got"; - packageName = "got"; - version = "7.1.0"; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz"; - sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3"; + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; - "has-ansi-3.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "3.0.0"; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-3.0.0.tgz"; - sha1 = "36077ef1d15f333484aa7fa77a28606f1c655b37"; + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "import-jsx-1.3.0" = { - name = "import-jsx"; - packageName = "import-jsx"; - version = "1.3.0"; + "fast-safe-stringify-1.2.3" = { + name = "fast-safe-stringify"; + packageName = "fast-safe-stringify"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz"; - sha512 = "26xxz57vqm8p6mg0syr21risma4h5h9n8kn4zv4pcxqap4zxicc210w5m7vz6a4zldhd102sbi7giwzmw0wjlpr6rb1hycr8iv703b1"; + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.3.tgz"; + sha512 = "2bhxs6r2hxpjfxj7ycbs3blbwbmq9nmwar4swzvhbiwcbmn721l8wk0ndyw9n3i1508rlhhm70a8fn9bpy8mx8f0ncqhqhh5pz175j0"; }; }; - "ink-0.3.1" = { - name = "ink"; - packageName = "ink"; - version = "0.3.1"; + "faye-websocket-0.10.0" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz"; - sha512 = "0km0z5smnzrh4c5386h3vbmvps6m45m6hbbf62as9wl4vw370q411gpxxhqz3i83n0qjds7py2ylgjx2y3915m5v77c1sf428w4wwkv"; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; }; }; - "ink-text-input-1.1.1" = { - name = "ink-text-input"; - packageName = "ink-text-input"; - version = "1.1.1"; + "faye-websocket-0.11.1" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.1.tgz"; - sha512 = "3zdg79viy9vippnaj942c8scyk2nay9fqv3zbd681hfcvn082pxbhc7vszppd7k0fy74rd20s2ias98mi2qzhc6a6zm0p4vv6yybrkc"; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz"; + sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; }; }; - "lodash.debounce-4.0.8" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "4.0.8"; + "fbjs-0.8.16" = { + name = "fbjs"; + packageName = "fbjs"; + version = "0.8.16"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz"; + sha1 = "5e67432f550dc41b572bf55847b8aca64e5337db"; }; }; - "mem-1.1.0" = { - name = "mem"; - packageName = "mem"; + "fd-read-stream-1.1.0" = { + name = "fd-read-stream"; + packageName = "fd-read-stream"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; - sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + url = "https://registry.npmjs.org/fd-read-stream/-/fd-read-stream-1.1.0.tgz"; + sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; }; }; - "skin-tone-1.0.0" = { - name = "skin-tone"; - packageName = "skin-tone"; - version = "1.0.0"; + "fd-slicer-1.0.1" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/skin-tone/-/skin-tone-1.0.0.tgz"; - sha1 = "d4ba3e8e5e92760e4d1d3b603d772805c6cb256f"; + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; + sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; }; }; - "execa-0.8.0" = { - name = "execa"; - packageName = "execa"; - version = "0.8.0"; + "feedparser-2.2.9" = { + name = "feedparser"; + packageName = "feedparser"; + version = "2.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; - sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; + url = "https://registry.npmjs.org/feedparser/-/feedparser-2.2.9.tgz"; + sha1 = "9138197dafdae05fcadde0036beeaf6066c2c5e9"; }; }; - "cross-spawn-5.1.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "5.1.0"; + "fibers-1.0.15" = { + name = "fibers"; + packageName = "fibers"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + url = "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz"; + sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c"; }; }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; + "fields-0.1.24" = { + name = "fields"; + packageName = "fields"; + version = "0.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + url = "https://registry.npmjs.org/fields/-/fields-0.1.24.tgz"; + sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3"; }; }; - "npm-run-path-2.0.2" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "2.0.2"; + "fifo-0.1.4" = { + name = "fifo"; + packageName = "fifo"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + url = "https://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz"; + sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34"; }; }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; + "figures-1.7.0" = { + name = "figures"; + packageName = "figures"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; }; }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; + "file-entry-cache-2.0.0" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz"; + sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; + "file-type-3.9.0" = { + name = "file-type"; + packageName = "file-type"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; + sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; }; }; - "path-key-2.0.1" = { - name = "path-key"; - packageName = "path-key"; - version = "2.0.1"; + "file-type-5.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; + sha1 = "2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"; }; }; - "dot-prop-4.2.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "4.2.0"; + "file-type-6.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; - sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm"; + url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; + sha512 = "0xf8ry7jj1c5mvvp5qxidq3qcqxzdngx1q9r981ddq3wfcidwqd4h52hplv462hvm9frdl086advhfqfxbnvwm8ass3knby6l217xv0"; }; }; - "env-paths-1.0.0" = { - name = "env-paths"; - packageName = "env-paths"; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz"; - sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi"; }; }; - "make-dir-1.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "1.1.0"; + "filename-regex-2.0.1" = { + name = "filename-regex"; + packageName = "filename-regex"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz"; - sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh"; + url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; + sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; }; }; - "pkg-up-2.0.0" = { - name = "pkg-up"; - packageName = "pkg-up"; + "filename-reserved-regex-2.0.0" = { + name = "filename-reserved-regex"; + packageName = "filename-reserved-regex"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + url = "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; + sha1 = "abf73dfab735d045440abfea2d91f389ebbfa229"; }; }; - "write-file-atomic-2.3.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "2.3.0"; + "filenamify-2.0.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; - sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; + url = "https://registry.npmjs.org/filenamify/-/filenamify-2.0.0.tgz"; + sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695"; }; }; - "pify-3.0.0" = { - name = "pify"; - packageName = "pify"; - version = "3.0.0"; + "filesize-3.6.0" = { + name = "filesize"; + packageName = "filesize"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + url = "https://registry.npmjs.org/filesize/-/filesize-3.6.0.tgz"; + sha512 = "1vldkz70kikg8b3ac8l686hm1aplkwqmllm9lg32cvy50hqzcqhari8pl2c41zsvl3bpzzfv7v8db0j91c0qd9vx8wz4w2nhsv9d4w3"; }; }; - "find-up-2.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "2.1.0"; + "filestream-4.1.3" = { + name = "filestream"; + packageName = "filestream"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + url = "https://registry.npmjs.org/filestream/-/filestream-4.1.3.tgz"; + sha1 = "948fcaade8221f715f5ecaddc54862faaacc9325"; }; }; - "locate-path-2.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "2.0.0"; + "fill-range-2.2.3" = { + name = "fill-range"; + packageName = "fill-range"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"; + sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; }; }; - "p-locate-2.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "2.0.0"; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; + "filled-array-1.1.0" = { + name = "filled-array"; + packageName = "filled-array"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; + sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; }; }; - "p-limit-1.1.0" = { - name = "p-limit"; - packageName = "p-limit"; + "filter-obj-1.1.0" = { + name = "filter-obj"; + packageName = "filter-obj"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz"; - sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc"; + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; + sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b"; }; }; - "duplexer3-0.1.4" = { - name = "duplexer3"; - packageName = "duplexer3"; - version = "0.1.4"; + "finalhandler-0.3.3" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; + sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; }; }; - "is-retry-allowed-1.1.0" = { - name = "is-retry-allowed"; - packageName = "is-retry-allowed"; - version = "1.1.0"; + "finalhandler-0.4.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; - sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; + sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; }; }; - "isurl-1.0.0" = { - name = "isurl"; - packageName = "isurl"; - version = "1.0.0"; + "finalhandler-0.5.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; - "p-cancelable-0.3.0" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "0.3.0"; + "finalhandler-1.0.6" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; - sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz"; + sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f"; }; }; - "p-timeout-1.2.0" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "1.2.0"; + "finalhandler-1.1.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.0.tgz"; - sha1 = "9820f99434c5817868b4f34809ee5291660d5b6c"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; + sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; }; }; - "timed-out-4.0.1" = { - name = "timed-out"; - packageName = "timed-out"; - version = "4.0.1"; + "finalhandler-1.1.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; - sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; + sha512 = "2v4ymv7dvpxpnrid4cn8qni5k5l024zc2qzg8ipkbxwmqjbaiygbx0hvbnr0ywfy0is4ngyhp6ljgjh4wmk6fqc3hd3wyzxil798lb3"; }; }; - "url-parse-lax-1.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; + "find-cache-dir-1.0.0" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz"; + sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f"; }; }; - "url-to-options-1.0.1" = { - name = "url-to-options"; - packageName = "url-to-options"; - version = "1.0.1"; + "find-elm-dependencies-1.0.2" = { + name = "find-elm-dependencies"; + packageName = "find-elm-dependencies"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; - sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-1.0.2.tgz"; + sha512 = "2hpc7v115prqkr487hxh0gllwvf0xa90lsb3i1azmrpfclp37vahxvdsqkr9pwvbcr7znccvhfgp1xy26czrmdcxzfl250a63dywyw2"; }; }; - "has-to-string-tag-x-1.4.1" = { - name = "has-to-string-tag-x"; - packageName = "has-to-string-tag-x"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; - }; - }; - "is-object-1.0.1" = { - name = "is-object"; - packageName = "is-object"; - version = "1.0.1"; + "find-index-0.1.1" = { + name = "find-index"; + packageName = "find-index"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; - sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; + url = "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"; + sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; }; }; - "has-symbol-support-x-1.4.1" = { - name = "has-symbol-support-x"; - packageName = "has-symbol-support-x"; - version = "1.4.1"; + "find-parent-dir-0.3.0" = { + name = "find-parent-dir"; + packageName = "find-parent-dir"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz"; - sha512 = "0qgqbqmrlx51w4ixcln9ljr5hs2jj8fvryq7i8cg9a739p7y2c5z8wpplp9jhnfn4a3xn6li2b2npmhfm2x80khm9di3vllyyv9wii6"; + url = "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz"; + sha1 = "33c44b429ab2b2f0646299c5f9f718f376ff8d54"; }; }; - "ansi-regex-3.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "3.0.0"; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; }; }; - "babel-plugin-transform-es2015-destructuring-6.23.0" = { - name = "babel-plugin-transform-es2015-destructuring"; - packageName = "babel-plugin-transform-es2015-destructuring"; - version = "6.23.0"; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz"; - sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d"; + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; }; }; - "babel-plugin-transform-object-rest-spread-6.26.0" = { - name = "babel-plugin-transform-object-rest-spread"; - packageName = "babel-plugin-transform-object-rest-spread"; - version = "6.26.0"; + "find-versions-1.2.1" = { + name = "find-versions"; + packageName = "find-versions"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"; - sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06"; + url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz"; + sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"; }; }; - "babel-plugin-transform-react-jsx-6.24.1" = { - name = "babel-plugin-transform-react-jsx"; - packageName = "babel-plugin-transform-react-jsx"; - version = "6.24.1"; + "findit-1.2.0" = { + name = "findit"; + packageName = "findit"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz"; - sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3"; + url = "https://registry.npmjs.org/findit/-/findit-1.2.0.tgz"; + sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8"; }; }; - "caller-path-2.0.0" = { - name = "caller-path"; - packageName = "caller-path"; + "findit-2.0.0" = { + name = "findit"; + packageName = "findit"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; - sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz"; + sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e"; }; }; - "require-from-string-1.2.1" = { - name = "require-from-string"; - packageName = "require-from-string"; - version = "1.2.1"; + "findup-sync-0.3.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz"; - sha1 = "529c9ccef27380adfec9a2f965b649bbee636418"; + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"; + sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; }; }; - "resolve-from-3.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "3.0.0"; + "findup-sync-2.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; }; }; - "babel-plugin-syntax-object-rest-spread-6.13.0" = { - name = "babel-plugin-syntax-object-rest-spread"; - packageName = "babel-plugin-syntax-object-rest-spread"; - version = "6.13.0"; + "fined-1.1.0" = { + name = "fined"; + packageName = "fined"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; - sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; + url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; + sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; - "babel-helper-builder-react-jsx-6.26.0" = { - name = "babel-helper-builder-react-jsx"; - packageName = "babel-helper-builder-react-jsx"; - version = "6.26.0"; + "firefox-profile-1.1.0" = { + name = "firefox-profile"; + packageName = "firefox-profile"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz"; - sha1 = "39ff8313b75c8b65dceff1f31d383e0ff2a408a0"; + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.1.0.tgz"; + sha512 = "2l8ynyw9d8c738q8m19qia09kaflqri5k8dx7z3rp3xv4aa338byrhqdmycxf4if11rr89zbssrib40jxlrks2nph3hm3w00zhh8hn1"; }; }; - "babel-plugin-syntax-jsx-6.18.0" = { - name = "babel-plugin-syntax-jsx"; - packageName = "babel-plugin-syntax-jsx"; - version = "6.18.0"; + "first-chunk-stream-1.0.0" = { + name = "first-chunk-stream"; + packageName = "first-chunk-stream"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; - sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; + url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; + sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; }; }; - "caller-callsite-2.0.0" = { - name = "caller-callsite"; - packageName = "caller-callsite"; + "first-chunk-stream-2.0.0" = { + name = "first-chunk-stream"; + packageName = "first-chunk-stream"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; - sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; + sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; }; }; - "callsites-2.0.0" = { - name = "callsites"; - packageName = "callsites"; - version = "2.0.0"; + "firstline-1.2.0" = { + name = "firstline"; + packageName = "firstline"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + url = "https://registry.npmjs.org/firstline/-/firstline-1.2.0.tgz"; + sha1 = "c9f4886e7f7fbf0afc12d71941dce06b192aea05"; }; }; - "arrify-1.0.1" = { - name = "arrify"; - packageName = "arrify"; - version = "1.0.1"; + "firstline-1.2.1" = { + name = "firstline"; + packageName = "firstline"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; - sha1 = "898508da2226f380df904728456849c1501a4b0d"; + url = "https://registry.npmjs.org/firstline/-/firstline-1.2.1.tgz"; + sha1 = "b88673c42009f8821fac2926e99720acee924fae"; }; }; - "chalk-2.3.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.3.0"; + "flagged-respawn-1.0.0" = { + name = "flagged-respawn"; + packageName = "flagged-respawn"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; - sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; + url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; + sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; }; }; - "indent-string-3.2.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "3.2.0"; + "flat-cache-1.3.0" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; - sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz"; + sha1 = "d3030b32b38154f4e3b7e9c709f490f7ef97c481"; }; }; - "lodash.flattendeep-4.4.0" = { - name = "lodash.flattendeep"; - packageName = "lodash.flattendeep"; - version = "4.4.0"; + "flat-tree-1.6.0" = { + name = "flat-tree"; + packageName = "flat-tree"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; - sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; + url = "https://registry.npmjs.org/flat-tree/-/flat-tree-1.6.0.tgz"; + sha1 = "fca30cddb9006fb656eb5ebc79aeb274e7fde9ed"; }; }; - "lodash.isequal-4.5.0" = { - name = "lodash.isequal"; - packageName = "lodash.isequal"; - version = "4.5.0"; + "flatiron-0.4.3" = { + name = "flatiron"; + packageName = "flatiron"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; - sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + url = "https://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz"; + sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }; }; - "log-update-2.3.0" = { - name = "log-update"; - packageName = "log-update"; - version = "2.3.0"; + "flatstr-1.0.5" = { + name = "flatstr"; + packageName = "flatstr"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; - sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; + url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.5.tgz"; + sha1 = "5b451b08cbd48e2eac54a2bbe0bf46165aa14be3"; }; }; - "prop-types-15.6.0" = { - name = "prop-types"; - packageName = "prop-types"; - version = "15.6.0"; + "flatten-0.0.1" = { + name = "flatten"; + packageName = "flatten"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz"; - sha1 = "ceaf083022fc46b4a35f69e13ef75aed0d639856"; + url = "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz"; + sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; - "supports-color-4.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.5.0"; + "flatten-1.0.2" = { + name = "flatten"; + packageName = "flatten"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; - sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; + url = "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz"; + sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782"; }; }; - "ansi-escapes-3.0.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "3.0.0"; + "fluent-ffmpeg-2.1.2" = { + name = "fluent-ffmpeg"; + packageName = "fluent-ffmpeg"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; - sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; + url = "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.2.tgz"; + sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; }; }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; + "fluent-syntax-0.6.6" = { + name = "fluent-syntax"; + packageName = "fluent-syntax"; + version = "0.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.6.6.tgz"; + sha512 = "18dv619kjzc3fdahfc242r7lb27a3pjxx5xd8shascb9xb8c1zncsrbnj0an8qjsg1pwf0az7h7gv5v0g50b3pixznr7wk7d8yqfazj"; }; }; - "wrap-ansi-3.0.1" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "3.0.1"; + "flush-write-stream-1.0.3" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz"; + sha512 = "0dycj5bh8djmx4lj5llrbg3cg0ynq32qn8pzk8zl9j8pm6nv5n1qzk4m7dq81q96ygzh8jl9chqh8826rrbl8maa9643fvl5lq5kabi"; }; }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; + "follow-redirects-0.0.3" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; + sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; + "follow-redirects-1.0.0" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz"; + sha1 = "8e34298cbd2e176f254effec75a1c78cc849fd37"; }; }; - "mimic-fn-1.1.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.1.0"; + "follow-redirects-1.3.0" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; - sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.3.0.tgz"; + sha1 = "f684871fc116d2e329fda55ef67687f4fabc905c"; }; }; - "string-width-2.1.1" = { - name = "string-width"; - packageName = "string-width"; - version = "2.1.1"; + "follow-redirects-1.4.1" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz"; + sha512 = "2z7ai3f3g9j48z90kds4070nb8v2q02n7131c2zjplb0zfjxjrd1m2fm8ykg7psj8fiwc4iidn2g9rr2w09qijbssddr0p8acyiw5mv"; }; }; - "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; + "for-each-0.3.2" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz"; + sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4"; }; }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; + "for-in-0.1.8" = { + name = "for-in"; + packageName = "for-in"; + version = "0.1.8"; 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/for-in/-/for-in-0.1.8.tgz"; + sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1"; }; }; - "fbjs-0.8.16" = { - name = "fbjs"; - packageName = "fbjs"; - version = "0.8.16"; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz"; - sha1 = "5e67432f550dc41b572bf55847b8aca64e5337db"; + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; }; }; - "core-js-1.2.7" = { - name = "core-js"; - packageName = "core-js"; - version = "1.2.7"; + "for-own-0.1.5" = { + name = "for-own"; + packageName = "for-own"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz"; - sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; + url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; }; }; - "isomorphic-fetch-2.2.1" = { - name = "isomorphic-fetch"; - packageName = "isomorphic-fetch"; - version = "2.2.1"; + "for-own-1.0.0" = { + name = "for-own"; + packageName = "for-own"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; - sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; + url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"; + sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; }; }; - "setimmediate-1.0.5" = { - name = "setimmediate"; - packageName = "setimmediate"; - version = "1.0.5"; + "foreach-2.0.5" = { + name = "foreach"; + packageName = "foreach"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; + sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; }; }; - "ua-parser-js-0.7.17" = { - name = "ua-parser-js"; - packageName = "ua-parser-js"; - version = "0.7.17"; + "foreachasync-3.0.0" = { + name = "foreachasync"; + packageName = "foreachasync"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz"; - sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr"; + url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; + sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; }; }; - "node-fetch-1.7.3" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "1.7.3"; + "forever-agent-0.2.0" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz"; - sha512 = "0lz5m15w7qaks0a0s3dm0crsjrsd123dy00pn6qwcp50zfjykxkp22i5ymh6smlc0ags38nmdxlxw9yyq509azlv8kcdvdiq857h5in"; + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; + sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; }; }; - "whatwg-fetch-2.0.3" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "2.0.3"; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; - sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "encoding-0.1.12" = { - name = "encoding"; - packageName = "encoding"; - version = "0.1.12"; + "forever-monitor-1.7.1" = { + name = "forever-monitor"; + packageName = "forever-monitor"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.7.1.tgz"; + sha1 = "5d820f4a3a78db2d81ae2671f158b9e86a091bb8"; }; }; - "unicode-emoji-modifier-base-1.0.0" = { - name = "unicode-emoji-modifier-base"; - packageName = "unicode-emoji-modifier-base"; - version = "1.0.0"; + "form-data-0.0.10" = { + name = "form-data"; + packageName = "form-data"; + version = "0.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz"; - sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; + url = "https://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; + sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; }; }; - "debug-3.1.0" = { - name = "debug"; - packageName = "debug"; - version = "3.1.0"; + "form-data-0.1.3" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; + sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; }; }; - "doctrine-2.0.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "2.0.0"; + "form-data-1.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz"; - sha1 = "c73d8d2909d22291e1a007a395804da8b665fe63"; + url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; + sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; }; }; - "eslint-scope-3.7.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "3.7.1"; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; }; }; - "espree-3.5.2" = { - name = "espree"; - packageName = "espree"; - version = "3.5.2"; + "form-data-2.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz"; - sha512 = "04mnrkdqs32w98h9sfkn9i9zkyqj69sz2q1kxpnmsryjnfd9jrpqqlwrik73a80mdz86xckbr7vayw1dwkxhhnbvs4zciqsiiwlm9xi"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; - "esquery-1.0.0" = { - name = "esquery"; - packageName = "esquery"; - version = "1.0.0"; + "form-data-2.3.2" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz"; - sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; + sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; - "estraverse-4.2.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.2.0"; + "formidable-1.0.11" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; - sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz"; + sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30"; }; }; - "file-entry-cache-2.0.0" = { - name = "file-entry-cache"; - packageName = "file-entry-cache"; - version = "2.0.0"; + "formidable-1.0.14" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz"; - sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; }; }; - "functional-red-black-tree-1.0.1" = { - name = "functional-red-black-tree"; - packageName = "functional-red-black-tree"; - version = "1.0.1"; + "formidable-1.0.17" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; + sha1 = "ef5491490f9433b705faa77249c99029ae348559"; }; }; - "ignore-3.3.7" = { - name = "ignore"; - packageName = "ignore"; - version = "3.3.7"; + "formidable-1.2.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; - sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; + sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn"; }; }; - "inquirer-3.3.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz"; - sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; + "forwarded-0.1.2" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "is-resolvable-1.0.0" = { - name = "is-resolvable"; - packageName = "is-resolvable"; - version = "1.0.0"; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz"; - sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; }; }; - "js-yaml-3.10.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.10.0"; + "fresh-0.1.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; - sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; + sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; }; }; - "json-stable-stringify-without-jsonify-1.0.1" = { - name = "json-stable-stringify-without-jsonify"; - packageName = "json-stable-stringify-without-jsonify"; - version = "1.0.1"; + "fresh-0.2.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz"; + sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"; }; }; - "levn-0.3.0" = { - name = "levn"; - packageName = "levn"; - version = "0.3.0"; + "fresh-0.2.4" = { + name = "fresh"; + packageName = "fresh"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; + sha1 = "3582499206c9723714190edd74b4604feb4a614c"; }; }; - "natural-compare-1.4.0" = { - name = "natural-compare"; - packageName = "natural-compare"; - version = "1.4.0"; + "fresh-0.3.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; + sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; }; }; - "optionator-0.8.2" = { - name = "optionator"; - packageName = "optionator"; - version = "0.8.2"; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; - "path-is-inside-1.0.2" = { - name = "path-is-inside"; - packageName = "path-is-inside"; - version = "1.0.2"; + "from-0.1.7" = { + name = "from"; + packageName = "from"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; - sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; + sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; }; }; - "pluralize-7.0.0" = { - name = "pluralize"; - packageName = "pluralize"; - version = "7.0.0"; + "from2-1.3.0" = { + name = "from2"; + packageName = "from2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz"; - sha512 = "2ihaln20qjx82jx73wgzirbyp8mfmhxr75am1h0w8n5hy2gsbgvw9dricv7h57ycxzax84bma96wjscmdszs5mr2lsyxpfjvhwl2601"; + url = "https://registry.npmjs.org/from2/-/from2-1.3.0.tgz"; + sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; }; }; - "progress-2.0.0" = { - name = "progress"; - packageName = "progress"; - version = "2.0.0"; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz"; - sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"; + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; - "require-uncached-1.0.3" = { - name = "require-uncached"; - packageName = "require-uncached"; - version = "1.0.3"; + "fs-blob-store-5.2.1" = { + name = "fs-blob-store"; + packageName = "fs-blob-store"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; - sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; + url = "https://registry.npmjs.org/fs-blob-store/-/fs-blob-store-5.2.1.tgz"; + sha1 = "2a7db7ef59a5ec548cce8564066508224c9b0457"; }; }; - "table-4.0.2" = { - name = "table"; - packageName = "table"; - version = "4.0.2"; + "fs-chunk-store-1.7.0" = { + name = "fs-chunk-store"; + packageName = "fs-chunk-store"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz"; - sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai"; + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.7.0.tgz"; + sha512 = "13w7dc43h1mv5a43zps5rwsgvlgpd1pj8rwlhmp1fsbyddysv2zy6d8xyaf9hllnqx3ykw62yv1j5z1y79kvyi6hjgymn9cj2cwj61a"; }; }; - "text-table-0.2.0" = { - name = "text-table"; - packageName = "text-table"; - version = "0.2.0"; + "fs-ext-0.6.0" = { + name = "fs-ext"; + packageName = "fs-ext"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.6.0.tgz"; + sha1 = "27d32a72e2e7c3c8001712a0f307f5f8d91dfc66"; }; }; - "esrecurse-4.2.0" = { - name = "esrecurse"; - packageName = "esrecurse"; - version = "4.2.0"; + "fs-extra-0.26.7" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.26.7"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz"; - sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; + sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; }; }; - "acorn-jsx-3.0.1" = { - name = "acorn-jsx"; - packageName = "acorn-jsx"; - version = "3.0.1"; + "fs-extra-0.30.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; - sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; + sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0"; }; }; - "acorn-3.3.0" = { - name = "acorn"; - packageName = "acorn"; - version = "3.3.0"; + "fs-extra-0.6.4" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; + sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; }; }; - "flat-cache-1.3.0" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "1.3.0"; + "fs-extra-1.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz"; - sha1 = "d3030b32b38154f4e3b7e9c709f490f7ef97c481"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; + sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; }; }; - "circular-json-0.3.3" = { - name = "circular-json"; - packageName = "circular-json"; - version = "0.3.3"; + "fs-extra-2.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz"; - sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz"; + sha1 = "337352bded4a0b714f3eb84de8cea765e9d37600"; }; }; - "del-2.2.2" = { - name = "del"; - packageName = "del"; - version = "2.2.2"; + "fs-extra-2.1.2" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-2.2.2.tgz"; - sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; + sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; }; }; - "write-0.2.1" = { - name = "write"; - packageName = "write"; - version = "0.2.1"; + "fs-extra-4.0.3" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/write/-/write-0.2.1.tgz"; - sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; + sha512 = "05bphjab1lk12dz3qf87dywgpsjsx0f59kpligxqph53yicigij2gsmvkppgyhpi70h3q3id3ymz30c02v3pphakn06k8vm6xsdpamb"; }; }; - "globby-5.0.0" = { - name = "globby"; - packageName = "globby"; + "fs-extra-5.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz"; - sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz"; + sha512 = "1ssfaw678600iy330a73gqk65ns22sz4ng7jwndj1fxahj8qddrsy2w4mr4ikx28qhdj8rf49n428qnl657bbpag9r3g3qv2vhyd8zb"; }; }; - "is-path-cwd-1.0.0" = { - name = "is-path-cwd"; - packageName = "is-path-cwd"; - version = "1.0.0"; + "fs-minipass-1.2.5" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; + sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416"; }; }; - "is-path-in-cwd-1.0.0" = { - name = "is-path-in-cwd"; - packageName = "is-path-in-cwd"; - version = "1.0.0"; + "fs-write-stream-atomic-1.0.10" = { + name = "fs-write-stream-atomic"; + packageName = "fs-write-stream-atomic"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz"; - sha1 = "6477582b8214d602346094567003be8a9eac04dc"; + url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; }; }; - "array-union-1.0.2" = { - name = "array-union"; - packageName = "array-union"; - version = "1.0.2"; + "fs.extra-1.3.2" = { + name = "fs.extra"; + packageName = "fs.extra"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; - sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz"; + sha1 = "dd023f93013bee24531f1b33514c37b20fd93349"; }; }; - "array-uniq-1.0.3" = { - name = "array-uniq"; - packageName = "array-uniq"; - version = "1.0.3"; + "fs.notify-0.0.4" = { + name = "fs.notify"; + packageName = "fs.notify"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; - sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + url = "https://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz"; + sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d"; }; }; - "is-path-inside-1.0.0" = { - name = "is-path-inside"; - packageName = "is-path-inside"; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz"; - sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "cli-width-2.2.0" = { - name = "cli-width"; - packageName = "cli-width"; - version = "2.2.0"; + "fsevents-1.1.2" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz"; + sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja"; }; }; - "external-editor-2.0.5" = { - name = "external-editor"; - packageName = "external-editor"; - version = "2.0.5"; + "fsevents-1.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz"; - sha512 = "3znpqavb7rxmw74p6hnq963agimzsm5r524jrpy9v6sbbhbbk77qhklgkr65jirq0a58lsz8jgvwy9q4wfmwl7ahj6nzrckhpmyij1j"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz"; + sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq"; }; }; - "figures-2.0.0" = { - name = "figures"; - packageName = "figures"; - version = "2.0.0"; + "fstream-0.1.31" = { + name = "fstream"; + packageName = "fstream"; + version = "0.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; + sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; }; }; - "run-async-2.3.0" = { - name = "run-async"; - packageName = "run-async"; - version = "2.3.0"; + "fstream-1.0.11" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; + sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; }; }; - "rx-lite-4.0.8" = { - name = "rx-lite"; - packageName = "rx-lite"; - version = "4.0.8"; + "fstream-ignore-1.0.5" = { + name = "fstream-ignore"; + packageName = "fstream-ignore"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"; - sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; + url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; + sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; }; }; - "rx-lite-aggregates-4.0.8" = { - name = "rx-lite-aggregates"; - packageName = "rx-lite-aggregates"; - version = "4.0.8"; + "ftp-0.3.10" = { + name = "ftp"; + packageName = "ftp"; + version = "0.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; - sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; + url = "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz"; + sha1 = "9197d861ad8142f3e63d5a83bfe4c59f7330885d"; }; }; - "jschardet-1.6.0" = { - name = "jschardet"; - packageName = "jschardet"; - version = "1.6.0"; + "fullname-3.3.0" = { + name = "fullname"; + packageName = "fullname"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz"; - sha512 = "2crjzdrqdgc38g7nmam84m472pkagwnh3dj64d7pc87g5dgbw04p56ma6qqvmbb0b0r1pcx4wqr4kwvf7zplmk0434z1x681sys32y5"; + url = "https://registry.npmjs.org/fullname/-/fullname-3.3.0.tgz"; + sha1 = "a08747d6921229610b8178b7614fce10cb185f5a"; }; }; - "tmp-0.0.33" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.33"; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; }; }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + 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/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "tryit-1.0.3" = { - name = "tryit"; - packageName = "tryit"; - version = "1.0.3"; + "fx-runner-1.0.8" = { + name = "fx-runner"; + packageName = "fx-runner"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz"; - sha1 = "393be730a9446fd1ead6da59a014308f36c289cb"; + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.8.tgz"; + sha1 = "5ced3b04a8d51d634de20d1480f0dc5dd8325dec"; }; }; - "argparse-1.0.9" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.9"; + "galaxy-0.1.12" = { + name = "galaxy"; + packageName = "galaxy"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; - sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; + url = "https://registry.npmjs.org/galaxy/-/galaxy-0.1.12.tgz"; + sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; }; }; - "esprima-4.0.0" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.0"; + "gauge-1.2.7" = { + name = "gauge"; + packageName = "gauge"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; + url = "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"; + sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"; }; }; - "prelude-ls-1.1.2" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.1.2"; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; - "type-check-0.3.2" = { - name = "type-check"; - packageName = "type-check"; - version = "0.3.2"; + "gaze-0.5.2" = { + name = "gaze"; + packageName = "gaze"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"; + sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; }; }; - "deep-is-0.1.3" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.3"; + "gelf-stream-1.1.1" = { + name = "gelf-stream"; + packageName = "gelf-stream"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz"; + sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; }; }; - "wordwrap-1.0.0" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "1.0.0"; + "gelfling-0.3.1" = { + name = "gelfling"; + packageName = "gelfling"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz"; + sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; }; }; - "fast-levenshtein-2.0.6" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "2.0.6"; + "generate-function-2.0.0" = { + name = "generate-function"; + packageName = "generate-function"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; + sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; }; }; - "caller-path-0.1.0" = { - name = "caller-path"; - packageName = "caller-path"; - version = "0.1.0"; + "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/caller-path/-/caller-path-0.1.0.tgz"; - sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; + url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; }; }; - "resolve-from-1.0.1" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "1.0.1"; + "generic-pool-2.2.0" = { + name = "generic-pool"; + packageName = "generic-pool"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz"; - sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; + url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz"; + sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e"; }; }; - "callsites-0.2.0" = { - name = "callsites"; - packageName = "callsites"; - version = "0.2.0"; + "get-browser-rtc-1.0.2" = { + name = "get-browser-rtc"; + packageName = "get-browser-rtc"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz"; - sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; + url = "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz"; + sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "ajv-keywords-2.1.1" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "2.1.1"; + "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/ajv-keywords/-/ajv-keywords-2.1.1.tgz"; - sha1 = "617997fc5f60576894c435f940d819e135b80762"; + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; + sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; }; }; - "slice-ansi-1.0.0" = { - name = "slice-ansi"; - packageName = "slice-ansi"; - version = "1.0.0"; + "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/slice-ansi/-/slice-ansi-1.0.0.tgz"; - sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; + url = "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz"; + sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; - "eslint-4.11.0" = { - name = "eslint"; - packageName = "eslint"; - version = "4.11.0"; + "get-pkg-repo-1.4.0" = { + name = "get-pkg-repo"; + packageName = "get-pkg-repo"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.11.0.tgz"; - sha512 = "3p35ybksp5c5qbdwb9fpd0dhspjbpnlqhfh3jj7zl6zfcpvljm3fnhfzwx35h8rqb7wi3y3r9w22nabnh4jzm8zwwhnz5lajr1f2rji"; - }; - }; - "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"; - }; - }; - "has-flag-1.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + url = "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz"; + sha1 = "c73b489c06d80cc5536c2c853f9e05232056972d"; }; }; - "log-update-1.0.2" = { - name = "log-update"; - packageName = "log-update"; - version = "1.0.2"; + "get-port-3.2.0" = { + name = "get-port"; + packageName = "get-port"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; - sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + url = "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz"; + sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; }; }; - "ora-1.3.0" = { - name = "ora"; - packageName = "ora"; - version = "1.3.0"; + "get-proxy-2.1.0" = { + name = "get-proxy"; + packageName = "get-proxy"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz"; - sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a"; + url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; + sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf"; }; }; - "phantomjs-prebuilt-2.1.16" = { - name = "phantomjs-prebuilt"; - packageName = "phantomjs-prebuilt"; - version = "2.1.16"; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz"; - sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; }; }; - "promise-phantom-3.1.6" = { - name = "promise-phantom"; - packageName = "promise-phantom"; - version = "3.1.6"; + "get-stdin-5.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz"; - sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz"; + sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; - "zen-observable-0.5.2" = { - name = "zen-observable"; - packageName = "zen-observable"; - version = "0.5.2"; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz"; - sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf"; + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; }; }; - "cli-spinners-1.1.0" = { - name = "cli-spinners"; - packageName = "cli-spinners"; - version = "1.1.0"; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz"; - sha1 = "f1847b168844d917a671eb9d147e3df497c90d06"; + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; }; }; - "log-symbols-1.0.2" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "1.0.2"; + "get-uri-2.0.1" = { + name = "get-uri"; + packageName = "get-uri"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; - sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + url = "https://registry.npmjs.org/get-uri/-/get-uri-2.0.1.tgz"; + sha512 = "10bm7v59d4pv7pk0smv9qwl8rp1iq60d20jdybycdpjqv85gdirf00kci8m5fz16gja9i5l60yxgiqzafj1195disavn21anrbab9zd"; }; }; - "es6-promise-4.1.1" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.1.1"; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; - sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r"; + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "extract-zip-1.6.6" = { - name = "extract-zip"; - packageName = "extract-zip"; - version = "1.6.6"; + "getmac-1.4.1" = { + name = "getmac"; + packageName = "getmac"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz"; - sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c"; + url = "https://registry.npmjs.org/getmac/-/getmac-1.4.1.tgz"; + sha512 = "0r7zqgvfiv3r6zy8fms9gdcf3a1r46kpf8pm5x7vwrc27vgv69ra244s89k73hb9rna6r3s9v20yzbwjmz2c13gh3s0bbd07zq7w2lr"; }; }; - "fs-extra-1.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "1.0.0"; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; - sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "hasha-2.2.0" = { - name = "hasha"; - packageName = "hasha"; - version = "2.2.0"; + "gettext-parser-1.1.0" = { + name = "gettext-parser"; + packageName = "gettext-parser"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; - sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; + url = "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.1.0.tgz"; + sha1 = "2c5a6638d893934b9b55037d0ad82cb7004b2679"; }; }; - "kew-0.7.0" = { - name = "kew"; - packageName = "kew"; - version = "0.7.0"; + "git-clone-0.1.0" = { + name = "git-clone"; + packageName = "git-clone"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; - sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; + url = "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz"; + sha1 = "0d76163778093aef7f1c30238f2a9ef3f07a2eb9"; }; }; - "request-progress-2.0.1" = { - name = "request-progress"; - packageName = "request-progress"; - version = "2.0.1"; + "git-raw-commits-1.3.6" = { + name = "git-raw-commits"; + packageName = "git-raw-commits"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; - sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; + url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.6.tgz"; + sha512 = "111718czypc8jr47xq3n5xvfwx6nib7y36bpb882id57sdhv49bfpdmkgxbrb524942rw3k6wq15128mlv4q8fbkh5g3wjhmgdhmyxj"; }; }; - "mkdirp-0.5.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.0"; + "git-remote-origin-url-2.0.0" = { + name = "git-remote-origin-url"; + packageName = "git-remote-origin-url"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + url = "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz"; + sha1 = "5282659dae2107145a11126112ad3216ec5fa65f"; }; }; - "yauzl-2.4.1" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.4.1"; + "git-rev-sync-1.9.1" = { + name = "git-rev-sync"; + packageName = "git-rev-sync"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"; - sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; + url = "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-1.9.1.tgz"; + sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; }; }; - "fd-slicer-1.0.1" = { - name = "fd-slicer"; - packageName = "fd-slicer"; - version = "1.0.1"; + "git-semver-tags-1.3.6" = { + name = "git-semver-tags"; + packageName = "git-semver-tags"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.6.tgz"; + sha512 = "25114wyd4p8qn681l730d9s1wgh4kmvizin5361hx5qvpd82adi2fkjkvv289nk1vb6hx8q13ikhyc705hw8iag1b23zq37g4kfacfs"; }; }; - "pend-1.2.0" = { - name = "pend"; - packageName = "pend"; - version = "1.2.0"; + "gitconfiglocal-1.0.0" = { + name = "gitconfiglocal"; + packageName = "gitconfiglocal"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + url = "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz"; + sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b"; }; }; - "throttleit-1.0.0" = { - name = "throttleit"; - packageName = "throttleit"; - version = "1.0.0"; + "github-0.1.6" = { + name = "github"; + packageName = "github"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; + url = "https://registry.npmjs.org/github/-/github-0.1.6.tgz"; + sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922"; }; }; - "mkpath-1.0.0" = { - name = "mkpath"; - packageName = "mkpath"; - version = "1.0.0"; + "github-from-package-0.0.0" = { + name = "github-from-package"; + packageName = "github-from-package"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz"; - sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; + url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; }; }; - "node-phantom-simple-2.2.4" = { - name = "node-phantom-simple"; - packageName = "node-phantom-simple"; - version = "2.2.4"; + "github-slugger-1.2.0" = { + name = "github-slugger"; + packageName = "github-slugger"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz"; - sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; + url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.0.tgz"; + sha512 = "3nya50972xq88vz4p5gqz63014dkwlp5f40cz1fgad4ifnhprpr4qlqvvi44qxs3arikyfm3ygmf3phyjq5lwkg7rr9ig9mk7prm1n0"; }; }; - "tmp-0.0.31" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.31"; + "glob-3.1.21" = { + name = "glob"; + packageName = "glob"; + version = "3.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; + url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; + sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; }; }; "glob-3.2.11" = { @@ -10907,6863 +10896,6878 @@ let sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; }; }; - "minimatch-0.3.0" = { - name = "minimatch"; - packageName = "minimatch"; - version = "0.3.0"; + "glob-4.0.6" = { + name = "glob"; + packageName = "glob"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; - sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + url = "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; + sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7"; }; }; - "sigmund-1.0.1" = { - name = "sigmund"; - packageName = "sigmund"; - version = "1.0.1"; + "glob-4.5.3" = { + name = "glob"; + packageName = "glob"; + version = "4.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; + sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; }; }; - "cliff-0.1.10" = { - name = "cliff"; - packageName = "cliff"; - version = "0.1.10"; + "glob-5.0.15" = { + name = "glob"; + packageName = "glob"; + version = "5.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; - sha1 = "53be33ea9f59bec85609ee300ac4207603e52013"; + url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; }; }; - "flatiron-0.4.3" = { - name = "flatiron"; - packageName = "flatiron"; - version = "0.4.3"; + "glob-6.0.4" = { + name = "glob"; + packageName = "glob"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz"; - sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; + url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; + sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; }; }; - "forever-monitor-1.7.1" = { - name = "forever-monitor"; - packageName = "forever-monitor"; - version = "1.7.1"; + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.7.1.tgz"; - sha1 = "5d820f4a3a78db2d81ae2671f158b9e86a091bb8"; + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; }; }; - "nconf-0.6.9" = { - name = "nconf"; - packageName = "nconf"; - version = "0.6.9"; + "glob-7.1.1" = { + name = "glob"; + packageName = "glob"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; - sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; + sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; }; }; - "nssocket-0.5.3" = { - name = "nssocket"; - packageName = "nssocket"; - version = "0.5.3"; + "glob-7.1.2" = { + name = "glob"; + packageName = "glob"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz"; - sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; + sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; }; }; - "prettyjson-1.2.1" = { - name = "prettyjson"; - packageName = "prettyjson"; - version = "1.2.1"; + "glob-base-0.3.0" = { + name = "glob-base"; + packageName = "glob-base"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz"; - sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289"; + url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; }; }; - "shush-1.0.0" = { - name = "shush"; - packageName = "shush"; - version = "1.0.0"; + "glob-parent-2.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/shush/-/shush-1.0.0.tgz"; - sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; }; }; - "timespan-2.3.0" = { - name = "timespan"; - packageName = "timespan"; - version = "2.3.0"; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz"; - sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929"; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; - "broadway-0.3.6" = { - name = "broadway"; - packageName = "broadway"; - version = "0.3.6"; + "glob-stream-3.1.18" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "3.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/broadway/-/broadway-0.3.6.tgz"; - sha1 = "7dbef068b954b7907925fd544963b578a902ba7a"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; + sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; }; }; - "optimist-0.6.0" = { - name = "optimist"; - packageName = "optimist"; - version = "0.6.0"; + "glob-stream-5.3.5" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; - sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; + sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; }; }; - "director-1.2.7" = { - name = "director"; - packageName = "director"; - version = "1.2.7"; + "glob-stream-6.1.0" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/director/-/director-1.2.7.tgz"; - sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; }; }; - "cliff-0.1.9" = { - name = "cliff"; - packageName = "cliff"; - version = "0.1.9"; + "glob-watcher-0.0.6" = { + name = "glob-watcher"; + packageName = "glob-watcher"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz"; - sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; + url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"; + sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; }; }; - "eventemitter2-0.4.14" = { - name = "eventemitter2"; - packageName = "eventemitter2"; - version = "0.4.14"; + "glob2base-0.0.12" = { + name = "glob2base"; + packageName = "glob2base"; + version = "0.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; - sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; + url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; + sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; }; }; - "chokidar-1.7.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "1.7.0"; + "global-4.3.2" = { + name = "global"; + packageName = "global"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz"; - sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; + url = "https://registry.npmjs.org/global/-/global-4.3.2.tgz"; + sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; - "ps-tree-0.0.3" = { - name = "ps-tree"; - packageName = "ps-tree"; - version = "0.0.3"; + "global-dirs-0.1.1" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; - sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz"; + sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; }; }; - "fsevents-1.1.3" = { - name = "fsevents"; - packageName = "fsevents"; - version = "1.1.3"; + "global-https://github.com/component/global/archive/v2.0.1.tar.gz" = { + name = "global"; + packageName = "global"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz"; - sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq"; + name = "global-2.0.1.tar.gz"; + url = https://codeload.github.com/component/global/tar.gz/v2.0.1; + sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; }; }; - "event-stream-0.5.3" = { - name = "event-stream"; - packageName = "event-stream"; - version = "0.5.3"; + "global-modules-0.2.3" = { + name = "global-modules"; + packageName = "global-modules"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; - sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; + url = "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz"; + sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"; }; }; - "optimist-0.2.8" = { - name = "optimist"; - packageName = "optimist"; - version = "0.2.8"; + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; - sha1 = "e981ab7e268b457948593b55674c099a815cac31"; + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; }; }; - "async-0.2.9" = { - name = "async"; - packageName = "async"; - version = "0.2.9"; + "global-paths-1.0.0" = { + name = "global-paths"; + packageName = "global-paths"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.9.tgz"; - sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + url = "https://registry.npmjs.org/global-paths/-/global-paths-1.0.0.tgz"; + sha1 = "3ffc84341594e47b32bfade5785355d4df7feac7"; }; }; - "lazy-1.0.11" = { - name = "lazy"; - packageName = "lazy"; - version = "1.0.11"; + "global-prefix-0.1.5" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz"; - sha1 = "daa068206282542c088288e975c297c1ae77b690"; + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz"; + sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"; }; }; - "caller-0.0.1" = { - name = "caller"; - packageName = "caller"; - version = "0.0.1"; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/caller/-/caller-0.0.1.tgz"; - sha1 = "f37a1d6ea10e829d94721ae29a90bb4fb52ab767"; + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "tape-2.3.3" = { - name = "tape"; - packageName = "tape"; - version = "2.3.3"; + "globals-11.4.0" = { + name = "globals"; + packageName = "globals"; + version = "11.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz"; - sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; + url = "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz"; + sha512 = "0fgjya5jfxjd8gzgpnpig973bbplfq2i5fkfpi5lxyjsi3988wq3by19ka2ql2j4a80l9bk5g5brq4vvd2hr61ak79pzwm5z24ycb0g"; }; }; - "deep-equal-0.1.2" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "0.1.2"; + "globals-9.18.0" = { + name = "globals"; + packageName = "globals"; + version = "9.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; - sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; + url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; + sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab"; }; }; - "defined-0.0.0" = { - name = "defined"; - packageName = "defined"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; - sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; - }; - }; - "resumer-0.0.0" = { - name = "resumer"; - packageName = "resumer"; - version = "0.0.0"; + "globby-5.0.0" = { + name = "globby"; + packageName = "globby"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; - sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; + url = "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz"; + sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; }; }; - "lodash.groupby-4.6.0" = { - name = "lodash.groupby"; - packageName = "lodash.groupby"; - version = "4.6.0"; + "globby-6.1.0" = { + name = "globby"; + packageName = "globby"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz"; - sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; - "minilog-3.1.0" = { - name = "minilog"; - packageName = "minilog"; - version = "3.1.0"; + "globule-0.1.0" = { + name = "globule"; + packageName = "globule"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz"; - sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675"; + url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz"; + sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; }; }; - "simple-git-1.82.0" = { - name = "simple-git"; - packageName = "simple-git"; - version = "1.82.0"; + "glogg-1.0.1" = { + name = "glogg"; + packageName = "glogg"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.82.0.tgz"; - sha1 = "5fd0efe9c4ee78e5d942f276ac492b32e041a01a"; + url = "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz"; + sha512 = "0vr9sdx0f84b9s5vy72ralm494844c0p9kqqgcvy25gcn9abv57y7hwwafdsswc3z283v8bqa50j8gp740dd4biyngi5f15p9f2lxna"; }; }; - "tabtab-git+https://github.com/mixu/node-tabtab.git" = { - name = "tabtab"; - packageName = "tabtab"; - version = "0.0.2"; - src = fetchgit { - url = "https://github.com/mixu/node-tabtab.git"; - rev = "94af2b878b174527b6636aec88acd46979247755"; - sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; + "got-1.2.2" = { + name = "got"; + packageName = "got"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-1.2.2.tgz"; + sha1 = "d9430ba32f6a30218243884418767340aafc0400"; }; }; - "microee-0.0.6" = { - name = "microee"; - packageName = "microee"; - version = "0.0.6"; + "got-3.3.1" = { + name = "got"; + packageName = "got"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz"; - sha1 = "a12bdb0103681e8b126a9b071eba4c467c78fffe"; + url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz"; + sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; }; }; - "findup-sync-0.3.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "0.3.0"; + "got-5.7.1" = { + name = "got"; + packageName = "got"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"; - sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; + url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; + sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; }; }; - "grunt-known-options-1.1.0" = { - name = "grunt-known-options"; - packageName = "grunt-known-options"; - version = "1.1.0"; + "got-6.7.1" = { + name = "got"; + packageName = "got"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; - sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; + url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; }; }; - "nopt-3.0.6" = { - name = "nopt"; - packageName = "nopt"; - version = "3.0.6"; + "got-7.1.0" = { + name = "got"; + packageName = "got"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; - sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz"; + sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3"; }; }; - "coffee-script-1.12.7" = { - name = "coffee-script"; - packageName = "coffee-script"; - version = "1.12.7"; + "got-8.3.0" = { + name = "got"; + packageName = "got"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; + url = "https://registry.npmjs.org/got/-/got-8.3.0.tgz"; + sha512 = "2yzcsaq1ajn6bxgq2c4cmzbvysgdd88zypwa96yw57x2rb9gkbww5djfr8m8b1j0bal94khxaz98qjqjf9777ilh3c0l6w25pyp44wh"; }; }; - "jade-1.11.0" = { - name = "jade"; - packageName = "jade"; - version = "1.11.0"; + "graceful-fs-1.2.3" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz"; - sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; }; }; - "q-2.0.3" = { - name = "q"; - packageName = "q"; + "graceful-fs-2.0.3" = { + name = "graceful-fs"; + packageName = "graceful-fs"; version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz"; - sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; + sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; }; }; - "msgpack-1.0.2" = { - name = "msgpack"; - packageName = "msgpack"; - version = "1.0.2"; + "graceful-fs-3.0.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/msgpack/-/msgpack-1.0.2.tgz"; - sha1 = "923e2c5cffa65c8418e9b228d1124793969c429c"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz"; + sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; }; }; - "character-parser-1.2.1" = { - name = "character-parser"; - packageName = "character-parser"; - version = "1.2.1"; + "graceful-fs-4.1.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"; - sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; - "clean-css-3.4.28" = { - name = "clean-css"; - packageName = "clean-css"; - version = "3.4.28"; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz"; - sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; }; - "commander-2.6.0" = { - name = "commander"; - packageName = "commander"; - version = "2.6.0"; + "graphlib-2.1.5" = { + name = "graphlib"; + packageName = "graphlib"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; - sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz"; + sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy"; }; }; - "constantinople-3.0.2" = { - name = "constantinople"; - packageName = "constantinople"; - version = "3.0.2"; + "gray-matter-2.1.1" = { + name = "gray-matter"; + packageName = "gray-matter"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz"; - sha1 = "4b945d9937907bcd98ee575122c3817516544141"; + url = "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz"; + sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; }; }; - "jstransformer-0.0.2" = { - name = "jstransformer"; - packageName = "jstransformer"; - version = "0.0.2"; + "grouped-queue-0.3.3" = { + name = "grouped-queue"; + packageName = "grouped-queue"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz"; - sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab"; + url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz"; + sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; }; }; - "transformers-2.1.0" = { - name = "transformers"; - packageName = "transformers"; - version = "2.1.0"; + "growl-1.10.3" = { + name = "growl"; + packageName = "growl"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; - sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; + url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; + sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; }; }; - "uglify-js-2.8.29" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.8.29"; + "growly-1.3.0" = { + name = "growly"; + packageName = "growly"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; - sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"; + sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; }; }; - "void-elements-2.0.1" = { - name = "void-elements"; - packageName = "void-elements"; - version = "2.0.1"; + "grunt-known-options-1.1.0" = { + name = "grunt-known-options"; + packageName = "grunt-known-options"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"; - sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; + url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; + sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "with-4.0.3" = { - name = "with"; - packageName = "with"; - version = "4.0.3"; + "gulp-sourcemaps-1.6.0" = { + name = "gulp-sourcemaps"; + packageName = "gulp-sourcemaps"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/with/-/with-4.0.3.tgz"; - sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e"; + url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz"; + sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"; }; }; - "commander-2.8.1" = { - name = "commander"; - packageName = "commander"; - version = "2.8.1"; + "gulp-util-3.0.8" = { + name = "gulp-util"; + packageName = "gulp-util"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; - sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; + url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"; + sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; - "source-map-0.4.4" = { - name = "source-map"; - packageName = "source-map"; - version = "0.4.4"; + "gulplog-1.0.0" = { + name = "gulplog"; + packageName = "gulplog"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"; - sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; + url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"; + sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; + "handlebars-2.0.0" = { + name = "handlebars"; + packageName = "handlebars"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; + sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f"; }; }; - "acorn-2.7.0" = { - name = "acorn"; - packageName = "acorn"; - version = "2.7.0"; + "handlebars-4.0.11" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; - sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; + sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; }; }; - "promise-6.1.0" = { - name = "promise"; - packageName = "promise"; - version = "6.1.0"; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz"; - sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; }; }; - "asap-1.0.0" = { - name = "asap"; - packageName = "asap"; - version = "1.0.0"; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"; - sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "promise-2.0.0" = { - name = "promise"; - packageName = "promise"; - version = "2.0.0"; + "har-validator-2.0.6" = { + name = "har-validator"; + packageName = "har-validator"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; - sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; }; }; - "css-1.0.8" = { - name = "css"; - packageName = "css"; - version = "1.0.8"; + "har-validator-4.2.1" = { + name = "har-validator"; + packageName = "har-validator"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz"; - sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; - "uglify-js-2.2.5" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.2.5"; + "har-validator-5.0.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; - sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; + sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "is-promise-1.0.1" = { - name = "is-promise"; - packageName = "is-promise"; + "has-1.0.1" = { + name = "has"; + packageName = "has"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; - sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; + url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; + sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; }; }; - "css-parse-1.0.4" = { - name = "css-parse"; - packageName = "css-parse"; - version = "1.0.4"; + "has-ansi-0.1.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; - sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd"; + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; + sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e"; }; }; - "css-stringify-1.0.5" = { - name = "css-stringify"; - packageName = "css-stringify"; - version = "1.0.5"; + "has-ansi-1.0.3" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; - sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz"; + sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538"; }; }; - "optimist-0.3.7" = { - name = "optimist"; - packageName = "optimist"; - version = "0.3.7"; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; + "has-ansi-3.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-3.0.0.tgz"; + sha1 = "36077ef1d15f333484aa7fa77a28606f1c655b37"; }; }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; + "has-binary-0.1.7" = { + name = "has-binary"; + packageName = "has-binary"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; + sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; }; }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; + "has-binary-data-0.1.1" = { + name = "has-binary-data"; + packageName = "has-binary-data"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + url = "https://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.1.tgz"; + sha1 = "e10749fb87828a52df96f4086587eb4a03966439"; }; }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; + "has-binary2-1.0.2" = { + name = "has-binary2"; + packageName = "has-binary2"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz"; + sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98"; }; }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; + "has-color-0.1.7" = { + name = "has-color"; + packageName = "has-color"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; + sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; }; }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; + "has-cors-1.0.3" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz"; + sha1 = "502acb9b3104dac33dd2630eaf2f888b0baf4cb3"; }; }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; + "has-cors-1.1.0" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; + sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; }; }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; + "has-flag-1.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; }; }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; - "acorn-1.2.2" = { - name = "acorn"; - packageName = "acorn"; - version = "1.2.2"; + "has-generators-1.0.1" = { + name = "has-generators"; + packageName = "has-generators"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; - sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + url = "https://registry.npmjs.org/has-generators/-/has-generators-1.0.1.tgz"; + sha1 = "a6a2e55486011940482e13e2c93791c449acf449"; }; }; - "acorn-globals-1.0.9" = { - name = "acorn-globals"; - packageName = "acorn-globals"; - version = "1.0.9"; + "has-gulplog-0.1.0" = { + name = "has-gulplog"; + packageName = "has-gulplog"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz"; - sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; + url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"; + sha1 = "6414c82913697da51590397dafb12f22967811ce"; }; }; - "pop-iterate-1.0.1" = { - name = "pop-iterate"; - packageName = "pop-iterate"; - version = "1.0.1"; + "has-symbol-support-x-1.4.2" = { + name = "has-symbol-support-x"; + packageName = "has-symbol-support-x"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz"; - sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"; + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; + sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; }; }; - "weak-map-1.0.5" = { - name = "weak-map"; - packageName = "weak-map"; - version = "1.0.5"; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; - sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; }; }; - "archy-1.0.0" = { - name = "archy"; - packageName = "archy"; - version = "1.0.0"; + "has-to-string-tag-x-1.4.1" = { + name = "has-to-string-tag-x"; + packageName = "has-to-string-tag-x"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; - sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; + sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; }; }; - "deprecated-0.0.1" = { - name = "deprecated"; - packageName = "deprecated"; - version = "0.0.1"; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"; - sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; }; }; - "gulp-util-3.0.8" = { - name = "gulp-util"; - packageName = "gulp-util"; - version = "3.0.8"; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"; - sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; }; }; - "liftoff-2.3.0" = { - name = "liftoff"; - packageName = "liftoff"; - version = "2.3.0"; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz"; - sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385"; + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; }; }; - "orchestrator-0.3.8" = { - name = "orchestrator"; - packageName = "orchestrator"; - version = "0.3.8"; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; - sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; }; }; - "pretty-hrtime-1.0.3" = { - name = "pretty-hrtime"; - packageName = "pretty-hrtime"; - version = "1.0.3"; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; - sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "semver-4.3.6" = { - name = "semver"; - packageName = "semver"; - version = "4.3.6"; + "hasbin-1.2.3" = { + name = "hasbin"; + packageName = "hasbin"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; - sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; + url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz"; + sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; }; }; - "tildify-1.2.0" = { - name = "tildify"; - packageName = "tildify"; - version = "1.2.0"; + "hash-base-2.0.2" = { + name = "hash-base"; + packageName = "hash-base"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz"; - sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz"; + sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; }; }; - "v8flags-2.1.1" = { - name = "v8flags"; - packageName = "v8flags"; - version = "2.1.1"; + "hash-base-3.0.4" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz"; - sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; }; }; - "vinyl-fs-0.3.14" = { - name = "vinyl-fs"; - packageName = "vinyl-fs"; - version = "0.3.14"; + "hash-sum-1.0.2" = { + name = "hash-sum"; + packageName = "hash-sum"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz"; - sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; + url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; + sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; }; }; - "array-differ-1.0.0" = { - name = "array-differ"; - packageName = "array-differ"; - version = "1.0.0"; + "hash.js-1.1.3" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; - sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz"; + sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx"; }; }; - "beeper-1.1.1" = { - name = "beeper"; - packageName = "beeper"; - version = "1.1.1"; + "hasha-2.2.0" = { + name = "hasha"; + packageName = "hasha"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; - sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; + url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; + sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; }; }; - "dateformat-2.2.0" = { - name = "dateformat"; - packageName = "dateformat"; - version = "2.2.0"; + "hasher-1.2.0" = { + name = "hasher"; + packageName = "hasher"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"; - sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; + url = "https://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz"; + sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; }; }; - "fancy-log-1.3.0" = { - name = "fancy-log"; - packageName = "fancy-log"; - version = "1.3.0"; + "hashring-3.2.0" = { + name = "hashring"; + packageName = "hashring"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz"; - sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948"; + url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz"; + sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce"; }; }; - "gulplog-1.0.0" = { - name = "gulplog"; - packageName = "gulplog"; - version = "1.0.0"; + "hat-0.0.3" = { + name = "hat"; + packageName = "hat"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"; - sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; + url = "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz"; + sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a"; }; }; - "has-gulplog-0.1.0" = { - name = "has-gulplog"; - packageName = "has-gulplog"; - version = "0.1.0"; + "hawk-0.10.2" = { + name = "hawk"; + packageName = "hawk"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"; - sha1 = "6414c82913697da51590397dafb12f22967811ce"; + url = "https://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; + sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; }; }; - "lodash._reescape-3.0.0" = { - name = "lodash._reescape"; - packageName = "lodash._reescape"; - version = "3.0.0"; + "hawk-3.1.3" = { + name = "hawk"; + packageName = "hawk"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; - sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"; + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; }; }; - "lodash._reevaluate-3.0.0" = { - name = "lodash._reevaluate"; - packageName = "lodash._reevaluate"; - version = "3.0.0"; + "hawk-6.0.2" = { + name = "hawk"; + packageName = "hawk"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; - sha1 = "58bc74c40664953ae0b124d806996daca431e2ed"; + url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; + sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; }; }; - "lodash._reinterpolate-3.0.0" = { - name = "lodash._reinterpolate"; - packageName = "lodash._reinterpolate"; - version = "3.0.0"; + "he-1.1.1" = { + name = "he"; + packageName = "he"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; - sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; + url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; + sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; - "lodash.template-3.6.2" = { - name = "lodash.template"; - packageName = "lodash.template"; - version = "3.6.2"; + "headless-0.1.7" = { + name = "headless"; + packageName = "headless"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"; - sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f"; + url = "https://registry.npmjs.org/headless/-/headless-0.1.7.tgz"; + sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8"; }; }; - "multipipe-0.1.2" = { - name = "multipipe"; - packageName = "multipipe"; - version = "0.1.2"; + "heap-0.2.6" = { + name = "heap"; + packageName = "heap"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"; - sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; + url = "https://registry.npmjs.org/heap/-/heap-0.2.6.tgz"; + sha1 = "087e1f10b046932fc8594dd9e6d378afc9d1e5ac"; }; }; - "replace-ext-0.0.1" = { - name = "replace-ext"; - packageName = "replace-ext"; - version = "0.0.1"; + "help-me-1.1.0" = { + name = "help-me"; + packageName = "help-me"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; - sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; + url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; + sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "vinyl-0.5.3" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.5.3"; + "highlight.js-8.9.1" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "8.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"; - sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz"; + sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88"; }; }; - "time-stamp-1.1.0" = { - name = "time-stamp"; - packageName = "time-stamp"; + "hipchat-notifier-1.1.0" = { + name = "hipchat-notifier"; + packageName = "hipchat-notifier"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"; - sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; + url = "https://registry.npmjs.org/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz"; + sha1 = "b6d249755437c191082367799d3ba9a0f23b231e"; }; }; - "glogg-1.0.0" = { - name = "glogg"; - packageName = "glogg"; - version = "1.0.0"; + "hiredis-0.4.1" = { + name = "hiredis"; + packageName = "hiredis"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz"; - sha1 = "7fe0f199f57ac906cf512feead8f90ee4a284fc5"; + url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; + sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f"; }; }; - "sparkles-1.0.0" = { - name = "sparkles"; - packageName = "sparkles"; - version = "1.0.0"; + "hmac-drbg-1.0.1" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"; - sha1 = "1acbbfb592436d10bbe8f785b7cc6f82815012c3"; + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; }; }; - "lodash._basecopy-3.0.1" = { - name = "lodash._basecopy"; - packageName = "lodash._basecopy"; - version = "3.0.1"; + "hoek-0.7.6" = { + name = "hoek"; + packageName = "hoek"; + version = "0.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; - sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; + url = "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; + sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; }; }; - "lodash._basetostring-3.0.1" = { - name = "lodash._basetostring"; - packageName = "lodash._basetostring"; - version = "3.0.1"; + "hoek-2.16.3" = { + name = "hoek"; + packageName = "hoek"; + version = "2.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"; - sha1 = "d1861d877f824a52f669832dcaf3ee15566a07d5"; + url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "lodash._basevalues-3.0.0" = { - name = "lodash._basevalues"; - packageName = "lodash._basevalues"; - version = "3.0.0"; + "hoek-4.2.1" = { + name = "hoek"; + packageName = "hoek"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; - sha1 = "5b775762802bde3d3297503e26300820fdf661b7"; + url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; + sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; }; }; - "lodash._isiterateecall-3.0.9" = { - name = "lodash._isiterateecall"; - packageName = "lodash._isiterateecall"; - version = "3.0.9"; + "hogan.js-3.0.2" = { + name = "hogan.js"; + packageName = "hogan.js"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; - sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; + url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz"; + sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; }; }; - "lodash.escape-3.2.0" = { - name = "lodash.escape"; - packageName = "lodash.escape"; - version = "3.2.0"; + "home-or-tmp-2.0.0" = { + name = "home-or-tmp"; + packageName = "home-or-tmp"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"; - sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; + url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; + sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; }; }; - "lodash.keys-3.1.2" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "3.1.2"; + "homedir-polyfill-1.0.1" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"; - sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; + sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; }; }; - "lodash.restparam-3.6.1" = { - name = "lodash.restparam"; - packageName = "lodash.restparam"; - version = "3.6.1"; + "hooks-0.2.1" = { + name = "hooks"; + packageName = "hooks"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"; - sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; + url = "https://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz"; + sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; }; }; - "lodash.templatesettings-3.1.1" = { - name = "lodash.templatesettings"; - packageName = "lodash.templatesettings"; - version = "3.1.1"; + "hosted-git-info-2.6.0" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"; - sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz"; + sha512 = "1vi4baj130s7mladvb4rad9ka8nqzcwws9i1zaaplp0fdrmnfwjfbpq01cghha2c2frd2f900f07awglhbbyym0bpwmrph0hhhf11ll"; }; }; - "lodash._root-3.0.1" = { - name = "lodash._root"; - packageName = "lodash._root"; - version = "3.0.1"; + "hot-shots-4.8.0" = { + name = "hot-shots"; + packageName = "hot-shots"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; - sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.8.0.tgz"; + sha1 = "052be48430efc7d117ba7cc4d41f1833ba38c79f"; }; }; - "lodash.isarguments-3.1.0" = { - name = "lodash.isarguments"; - packageName = "lodash.isarguments"; - version = "3.1.0"; + "html-entities-1.2.1" = { + name = "html-entities"; + packageName = "html-entities"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; + sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; }; }; - "lodash.isarray-3.0.4" = { - name = "lodash.isarray"; - packageName = "lodash.isarray"; - version = "3.0.4"; + "htmlescape-1.1.1" = { + name = "htmlescape"; + packageName = "htmlescape"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; - sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; + url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; + sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "duplexer2-0.0.2" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.0.2"; + "htmlparser2-3.7.3" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; - sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz"; + sha1 = "6a64c77637c08c6f30ec2a8157a53333be7cb05e"; }; }; - "clone-stats-0.0.1" = { - name = "clone-stats"; - packageName = "clone-stats"; - version = "0.0.1"; + "htmlparser2-3.8.3" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"; - sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; + sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; }; }; - "findup-sync-0.4.3" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "0.4.3"; + "htmlparser2-3.9.2" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz"; - sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12"; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz"; + sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; }; }; - "fined-1.1.0" = { - name = "fined"; - packageName = "fined"; - version = "1.1.0"; + "http-auth-2.0.7" = { + name = "http-auth"; + packageName = "http-auth"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; - sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; + url = "https://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz"; + sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3"; }; }; - "flagged-respawn-0.3.2" = { - name = "flagged-respawn"; - packageName = "flagged-respawn"; - version = "0.3.2"; + "http-auth-3.1.3" = { + name = "http-auth"; + packageName = "http-auth"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz"; - sha1 = "ff191eddcd7088a675b2610fffc976be9b8074b5"; + url = "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz"; + sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31"; }; }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; + "http-basic-2.5.1" = { + name = "http-basic"; + packageName = "http-basic"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + url = "https://registry.npmjs.org/http-basic/-/http-basic-2.5.1.tgz"; + sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb"; }; }; - "lodash.isstring-4.0.1" = { - name = "lodash.isstring"; - packageName = "lodash.isstring"; - version = "4.0.1"; + "http-cache-semantics-3.8.1" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; + sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75"; }; }; - "lodash.mapvalues-4.6.0" = { - name = "lodash.mapvalues"; - packageName = "lodash.mapvalues"; - version = "4.6.0"; + "http-errors-1.3.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; - sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; + sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "detect-file-0.1.0" = { - name = "detect-file"; - packageName = "detect-file"; - version = "0.1.0"; + "http-errors-1.6.2" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz"; - sha1 = "4935dedfd9488648e006b0129566e9386711ea63"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; + sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; }; }; - "resolve-dir-0.1.1" = { - name = "resolve-dir"; - packageName = "resolve-dir"; - version = "0.1.1"; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz"; - sha1 = "b219259a5602fac5c5c496ad894a6e8cc430261e"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; }; }; - "fs-exists-sync-0.1.0" = { - name = "fs-exists-sync"; - packageName = "fs-exists-sync"; - version = "0.1.0"; + "http-headers-3.0.2" = { + name = "http-headers"; + packageName = "http-headers"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz"; - sha1 = "982d6893af918e72d08dec9e8673ff2b5a8d6add"; + url = "https://registry.npmjs.org/http-headers/-/http-headers-3.0.2.tgz"; + sha512 = "0xv0kpsablrjag5ci3qqwjf0hwvcp6yk0hgabv4im6ssanimgbr8yhzmyz4jd10sw5xhrimzhxp2xx34l8p6aryqxqqg0wnxlikbcgk"; }; }; - "expand-tilde-1.2.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "1.2.2"; + "http-methods-0.1.0" = { + name = "http-methods"; + packageName = "http-methods"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz"; - sha1 = "0b81eba897e5a3d31d1c3d102f8f01441e559449"; + url = "https://registry.npmjs.org/http-methods/-/http-methods-0.1.0.tgz"; + sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "expand-tilde-2.0.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "2.0.2"; + "http-parser-js-0.4.11" = { + name = "http-parser-js"; + packageName = "http-parser-js"; + version = "0.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz"; + sha512 = "1y4az74zgv7jy1cav126lbrbvfqv30p7v3ijmj91ychbg0337k71cwy2n5dvmdfvwhgv3vxxzw2ymxlbj6wh1wf6aycb313c0xpj920"; }; }; - "is-plain-object-2.0.4" = { - name = "is-plain-object"; - packageName = "is-plain-object"; - version = "2.0.4"; + "http-proxy-1.0.2" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz"; + sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254"; }; }; - "object.defaults-1.1.0" = { - name = "object.defaults"; - packageName = "object.defaults"; - version = "1.1.0"; + "http-proxy-1.16.2" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; - sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz"; + sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; }; }; - "object.pick-1.3.0" = { - name = "object.pick"; - packageName = "object.pick"; - version = "1.3.0"; + "http-proxy-agent-1.0.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; + sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; }; }; - "parse-filepath-1.0.1" = { - name = "parse-filepath"; - packageName = "parse-filepath"; - version = "1.0.1"; + "http-proxy-middleware-0.17.4" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "0.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz"; - sha1 = "159d6155d43904d16c10ef698911da1e91969b73"; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz"; + sha1 = "642e8848851d66f09d4f124912846dbaeb41b833"; }; }; - "isobject-3.0.1" = { - name = "isobject"; - packageName = "isobject"; - version = "3.0.1"; + "http-response-object-1.1.0" = { + name = "http-response-object"; + packageName = "http-response-object"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + url = "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz"; + sha1 = "a7c4e75aae82f3bb4904e4f43f615673b4d518c3"; }; }; - "array-each-1.0.1" = { - name = "array-each"; - packageName = "array-each"; - version = "1.0.1"; + "http-signature-0.11.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; - sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"; + sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6"; }; }; - "array-slice-1.0.0" = { - name = "array-slice"; - packageName = "array-slice"; - version = "1.0.0"; + "http-signature-1.1.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz"; - sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f"; + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; }; }; - "for-own-1.0.0" = { - name = "for-own"; - packageName = "for-own"; - version = "1.0.0"; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"; - sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "is-absolute-0.2.6" = { - name = "is-absolute"; - packageName = "is-absolute"; - version = "0.2.6"; + "httpntlm-1.6.1" = { + name = "httpntlm"; + packageName = "httpntlm"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz"; - sha1 = "20de69f3db942ef2d87b9c2da36f172235b1b5eb"; + url = "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz"; + sha1 = "ad01527143a2e8773cfae6a96f58656bb52a34b2"; }; }; - "map-cache-0.2.2" = { - name = "map-cache"; - packageName = "map-cache"; - version = "0.2.2"; + "httpolyglot-0.1.2" = { + name = "httpolyglot"; + packageName = "httpolyglot"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + url = "https://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.2.tgz"; + sha1 = "e4d347fe8984a62f467d4060df527f1851f6997b"; }; }; - "path-root-0.1.1" = { - name = "path-root"; - packageName = "path-root"; - version = "0.1.1"; + "httpreq-0.4.24" = { + name = "httpreq"; + packageName = "httpreq"; + version = "0.4.24"; src = fetchurl { - url = "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"; - sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; + url = "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz"; + sha1 = "4335ffd82cd969668a39465c929ac61d6393627f"; }; }; - "is-relative-0.2.1" = { - name = "is-relative"; - packageName = "is-relative"; - version = "0.2.1"; + "https-browserify-0.0.1" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz"; - sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5"; + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; + sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; }; }; - "is-unc-path-0.1.2" = { - name = "is-unc-path"; - packageName = "is-unc-path"; - version = "0.1.2"; + "https-browserify-1.0.0" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz"; - sha1 = "6ab053a72573c10250ff416a3814c35178af39b9"; + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; - "unc-path-regex-0.1.2" = { - name = "unc-path-regex"; - packageName = "unc-path-regex"; - version = "0.1.2"; + "https-proxy-agent-1.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; + sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; }; }; - "path-root-regex-0.1.2" = { - name = "path-root-regex"; - packageName = "path-root-regex"; - version = "0.1.2"; + "https-proxy-agent-2.2.1" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"; - sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz"; + sha512 = "2arj581rpjpgky9cr5hh3asan2mh7825rwxy63mp02amw9w6vsi59bay0dwp72md28mmzrmahxc909v1r1ca6y6r3f5dryna95r7w0w"; }; }; - "sequencify-0.0.7" = { - name = "sequencify"; - packageName = "sequencify"; - version = "0.0.7"; + "humanize-0.0.9" = { + name = "humanize"; + packageName = "humanize"; + version = "0.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"; - sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; + url = "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; + sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; }; }; - "stream-consume-0.1.0" = { - name = "stream-consume"; - packageName = "stream-consume"; - version = "0.1.0"; + "humanize-plus-1.8.2" = { + name = "humanize-plus"; + packageName = "humanize-plus"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"; - sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"; + url = "https://registry.npmjs.org/humanize-plus/-/humanize-plus-1.8.2.tgz"; + sha1 = "a65b34459ad6367adbb3707a82a3c9f916167030"; }; }; - "user-home-1.1.1" = { - name = "user-home"; - packageName = "user-home"; - version = "1.1.1"; + "humanize-string-1.0.2" = { + name = "humanize-string"; + packageName = "humanize-string"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; - sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; + url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.2.tgz"; + sha512 = "3bml62y8rmpga8wbcxfqm6izvc9xxlblx0vc08r778qa42jgw6fjif4i7f9bj2y98bz4xyimg5vfgch92j6i2l7zcwiq5za8l34cziw"; }; }; - "glob-stream-3.1.18" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "3.1.18"; + "hypercore-6.13.0" = { + name = "hypercore"; + packageName = "hypercore"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; - sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz"; + sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw"; }; }; - "glob-watcher-0.0.6" = { - name = "glob-watcher"; - packageName = "glob-watcher"; - version = "0.0.6"; + "hypercore-protocol-6.6.4" = { + name = "hypercore-protocol"; + packageName = "hypercore-protocol"; + version = "6.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"; - sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz"; + sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm"; }; }; - "strip-bom-1.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "1.0.0"; + "hyperdrive-9.12.3" = { + name = "hyperdrive"; + packageName = "hyperdrive"; + version = "9.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"; - sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794"; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.3.tgz"; + sha512 = "3w0ia766bacphqzgyjhiwbppgdja61vlz2xp6x710dk4pn6570gag3w5xa8rfivh2lvig8v2ics3bkdlm9cmq9kpzjgwzm19a089fb3"; }; }; - "vinyl-0.4.6" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.4.6"; + "hyperdrive-http-4.2.2" = { + name = "hyperdrive-http"; + packageName = "hyperdrive-http"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; - sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; + url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz"; + sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn"; }; }; - "glob-4.5.3" = { - name = "glob"; - packageName = "glob"; - version = "4.5.3"; + "hyperdrive-network-speed-2.1.0" = { + name = "hyperdrive-network-speed"; + packageName = "hyperdrive-network-speed"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; - sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; + url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.1.0.tgz"; + sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296"; }; }; - "minimatch-2.0.10" = { - name = "minimatch"; - packageName = "minimatch"; - version = "2.0.10"; + "hyperquest-2.1.3" = { + name = "hyperquest"; + packageName = "hyperquest"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; - sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; + url = "https://registry.npmjs.org/hyperquest/-/hyperquest-2.1.3.tgz"; + sha512 = "2ppxy7nv5yzpc9bvycyd4k2znp9grxldqrpvjzkzssn62f6xx7rzcqgrq30iykm5j91l8xahr93bznynpj30h7h5f6zmv3qn0x86jvx"; }; }; - "ordered-read-streams-0.1.0" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "0.1.0"; + "i-0.3.6" = { + name = "i"; + packageName = "i"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; - sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; + url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz"; + sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; - "glob2base-0.0.12" = { - name = "glob2base"; - packageName = "glob2base"; - version = "0.0.12"; + "i18next-1.10.6" = { + name = "i18next"; + packageName = "i18next"; + version = "1.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; - sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; + url = "https://registry.npmjs.org/i18next/-/i18next-1.10.6.tgz"; + sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; }; }; - "unique-stream-1.0.0" = { - name = "unique-stream"; - packageName = "unique-stream"; - version = "1.0.0"; + "i18next-client-1.10.3" = { + name = "i18next-client"; + packageName = "i18next-client"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"; - sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; + url = "https://registry.npmjs.org/i18next-client/-/i18next-client-1.10.3.tgz"; + sha1 = "76d0353557ed90d1e7a87754d5004d3f7801fde9"; }; }; - "find-index-0.1.1" = { - name = "find-index"; - packageName = "find-index"; - version = "0.1.1"; + "iconv-lite-0.4.11" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"; - sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; + sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; }; }; - "gaze-0.5.2" = { - name = "gaze"; - packageName = "gaze"; - version = "0.5.2"; + "iconv-lite-0.4.13" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"; - sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; + sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; }; }; - "globule-0.1.0" = { - name = "globule"; - packageName = "globule"; - version = "0.1.0"; + "iconv-lite-0.4.15" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz"; - sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; }; }; - "lodash-1.0.2" = { - name = "lodash"; - packageName = "lodash"; - version = "1.0.2"; + "iconv-lite-0.4.19" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; - sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; + sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; }; }; - "glob-3.1.21" = { - name = "glob"; - packageName = "glob"; - version = "3.1.21"; + "iconv-lite-0.4.21" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; - sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz"; + sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj"; }; }; - "minimatch-0.2.14" = { - name = "minimatch"; - packageName = "minimatch"; - version = "0.2.14"; + "iconv-lite-0.4.8" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; - "graceful-fs-1.2.3" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "1.2.3"; + "ieee754-1.1.11" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz"; + sha512 = "0g5x1ijy37vzfz46pnh03mxkmdb9d2qd9f8ncy49xj4j9xkks9p0x8s5hnyc7grwh6sryk118rd7w7wz6w0hzyw9agwnavvlc4g642n"; }; }; - "inherits-1.0.2" = { - name = "inherits"; - packageName = "inherits"; - version = "1.0.2"; + "ieee754-1.1.8" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; - sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; + sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; }; }; - "first-chunk-stream-1.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; - version = "1.0.0"; + "iferr-0.1.5" = { + name = "iferr"; + packageName = "iferr"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; - sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; + url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; }; }; - "clone-0.2.0" = { - name = "clone"; - packageName = "clone"; - version = "0.2.0"; + "ignore-3.3.7" = { + name = "ignore"; + packageName = "ignore"; + version = "3.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; - sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; + sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; }; }; - "http-proxy-1.0.2" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.0.2"; + "ignore-by-default-1.0.1" = { + name = "ignore-by-default"; + packageName = "ignore-by-default"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz"; - sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254"; + url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"; + sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; }; }; - "redis-0.10.3" = { - name = "redis"; - packageName = "redis"; - version = "0.10.3"; + "ignore-walk-3.0.1" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; - sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; + sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; }; }; - "lru-cache-2.5.2" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.5.2"; + "image-size-0.5.5" = { + name = "image-size"; + packageName = "image-size"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz"; - sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; + url = "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"; + sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"; }; }; - "eventemitter3-2.0.3" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "2.0.3"; + "imap-0.8.19" = { + name = "imap"; + packageName = "imap"; + version = "0.8.19"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz"; - sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; + url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz"; + sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5"; }; }; - "csslint-0.10.0" = { - name = "csslint"; - packageName = "csslint"; - version = "0.10.0"; + "immediate-chunk-store-1.0.8" = { + name = "immediate-chunk-store"; + packageName = "immediate-chunk-store"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; - sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; + url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-1.0.8.tgz"; + sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f"; }; }; - "jshint-2.8.0" = { - name = "jshint"; - packageName = "jshint"; - version = "2.8.0"; + "import-jsx-1.3.0" = { + name = "import-jsx"; + packageName = "import-jsx"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; - sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; + url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz"; + sha512 = "26xxz57vqm8p6mg0syr21risma4h5h9n8kn4zv4pcxqap4zxicc210w5m7vz6a4zldhd102sbi7giwzmw0wjlpr6rb1hycr8iv703b1"; }; }; - "strip-json-comments-1.0.4" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "1.0.4"; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; - sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; }; }; - "xml-1.0.0" = { - name = "xml"; - packageName = "xml"; - version = "1.0.0"; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz"; - sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; }; - "parserlib-0.2.5" = { - name = "parserlib"; - packageName = "parserlib"; - version = "0.2.5"; + "indent-string-2.1.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; - sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; + url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; }; }; - "cli-0.6.6" = { - name = "cli"; - packageName = "cli"; - version = "0.6.6"; + "indent-string-3.2.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; - sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; + url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; + sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; }; }; - "exit-0.1.2" = { - name = "exit"; - packageName = "exit"; - version = "0.1.2"; + "indexof-0.0.1" = { + name = "indexof"; + packageName = "indexof"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; - sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; }; }; - "htmlparser2-3.8.3" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.8.3"; + "infinity-agent-2.0.3" = { + name = "infinity-agent"; + packageName = "infinity-agent"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; - sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; + url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; + sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; }; }; - "lodash-3.7.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.7.0"; + "inflection-1.10.0" = { + name = "inflection"; + packageName = "inflection"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; - sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; + url = "https://registry.npmjs.org/inflection/-/inflection-1.10.0.tgz"; + sha1 = "5bffcb1197ad3e81050f8e17e21668087ee9eb2f"; }; }; - "domhandler-2.3.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.3.0"; + "inflection-1.3.8" = { + name = "inflection"; + packageName = "inflection"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; - sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; + url = "https://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz"; + sha1 = "cbd160da9f75b14c3cc63578d4f396784bf3014e"; }; }; - "domutils-1.5.1" = { - name = "domutils"; - packageName = "domutils"; - version = "1.5.1"; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; - "domelementtype-1.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.0"; + "inherits-1.0.2" = { + name = "inherits"; + packageName = "inherits"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; + sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; }; }; - "entities-1.0.0" = { - name = "entities"; - packageName = "entities"; - version = "1.0.0"; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; - sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; }; }; - "dom-serializer-0.1.0" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "0.1.0"; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; - "domelementtype-1.1.3" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.1.3"; + "ini-1.1.0" = { + name = "ini"; + packageName = "ini"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; + url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; }; }; - "entities-1.1.1" = { - name = "entities"; - packageName = "entities"; - version = "1.1.1"; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; - "@ionic/cli-framework-0.1.1" = { - name = "_at_ionic_slash_cli-framework"; - packageName = "@ionic/cli-framework"; - version = "0.1.1"; + "init-package-json-1.10.3" = { + name = "init-package-json"; + packageName = "init-package-json"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.1.1.tgz"; - sha512 = "1x9p7bbnmxy6xj42n0qsmyv2bxha404r3snlxjxhiaw20p8bg243k2lgxdqqj0r29sp5rd8cnkx631zsk18hi6bmdr50mdp5hjw89n5"; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz"; + sha512 = "0kkcy07hj1ck8xmwspn6x32k4j1c6j88wr7wq2kxb6cx9rml0b8ncglglkhcz0r7k417fshknm2vzrqm188yp18gdny7gahm1fa596c"; }; }; - "@ionic/cli-utils-1.18.0" = { - name = "_at_ionic_slash_cli-utils"; - packageName = "@ionic/cli-utils"; - version = "1.18.0"; + "ink-0.3.1" = { + name = "ink"; + packageName = "ink"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.18.0.tgz"; - sha512 = "2biqawzp7wwh6rb38w7gnnymxhg1k4r60hvm530hmvgpsdgbi0wq8ys9p1i969qij187nz3vr5cb5wivqwimldysqv6n1d2b95rrkbv"; + url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz"; + sha512 = "0km0z5smnzrh4c5386h3vbmvps6m45m6hbbf62as9wl4vw370q411gpxxhqz3i83n0qjds7py2ylgjx2y3915m5v77c1sf428w4wwkv"; }; }; - "opn-5.1.0" = { - name = "opn"; - packageName = "opn"; - version = "5.1.0"; + "ink-text-input-1.1.1" = { + name = "ink-text-input"; + packageName = "ink-text-input"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz"; - sha512 = "2k8g3x11xbm64r7bbyad08cjv27vaparkigq11w2v8kg8h73k2rzdr3q6f5i2klidgpaq9rbhfv45rf9dkqqv3d8vsbvw4c5knnbww8"; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.1.tgz"; + sha512 = "3zdg79viy9vippnaj942c8scyk2nay9fqv3zbd681hfcvn082pxbhc7vszppd7k0fy74rd20s2ias98mi2qzhc6a6zm0p4vv6yybrkc"; }; }; - "os-name-2.0.1" = { - name = "os-name"; - packageName = "os-name"; - version = "2.0.1"; + "inline-source-map-0.6.2" = { + name = "inline-source-map"; + packageName = "inline-source-map"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz"; - sha1 = "b9a386361c17ae3a21736ef0599405c9a8c5dc5e"; + url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz"; + sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; }; }; - "tslib-1.8.0" = { - name = "tslib"; - packageName = "tslib"; - version = "1.8.0"; + "innertext-1.0.3" = { + name = "innertext"; + packageName = "innertext"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz"; - sha512 = "0k910mhnraax4m75hvgb3f2mhfj6yrsqn7fmyqm2sx137f1kqpz8icww9zhlmqka5pfi8hvprd0wcyflim0nvh7jb14yksjj9crcqna"; + url = "https://registry.npmjs.org/innertext/-/innertext-1.0.3.tgz"; + sha512 = "1ig0sy92zxyzynzi9d4g3wq1286sjs9xx6dpn10lmis6hpjh5266b0v8nzp2ry5x35ybfq9g60qjhy5pfyl26yzkbmv8vn8pv8kabk4"; }; }; - "ncp-2.0.0" = { - name = "ncp"; - packageName = "ncp"; - version = "2.0.0"; + "inquirer-0.10.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; - sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz"; + sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a"; }; }; - "superagent-3.8.1" = { - name = "superagent"; - packageName = "superagent"; - version = "3.8.1"; + "inquirer-0.12.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-3.8.1.tgz"; - sha512 = "3lp63wkl3d6zz6lfrv6kzi29lcvhjxvjhq66sqjj5di7z5d2w653wvbb66sfng07f7czigzfacxy8hry6v304nlg1gigf85i0nlbh2l"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; + sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; }; }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; + "inquirer-0.8.5" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz"; + sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df"; }; }; - "cookiejar-2.1.1" = { - name = "cookiejar"; - packageName = "cookiejar"; - version = "2.1.1"; + "inquirer-1.0.3" = { + name = "inquirer"; + packageName = "inquirer"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; - sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz"; + sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"; }; }; - "formidable-1.1.1" = { - name = "formidable"; - packageName = "formidable"; - version = "1.1.1"; + "inquirer-1.2.3" = { + name = "inquirer"; + packageName = "inquirer"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; - sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz"; + sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; - "@ionic/discover-0.4.0" = { - name = "_at_ionic_slash_discover"; - packageName = "@ionic/discover"; - version = "0.4.0"; + "inquirer-3.3.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.4.0.tgz"; - sha512 = "0x6yxaj489n9lbq0kfvdnpj1pacgv3r0vk5cnlla7w1jkvxzwaf0vbcnwd9gdaj6zkq69wm1g4zjvj37pyn1lajjkzl1f50l7cnr2ad"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz"; + sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; }; }; - "archiver-2.1.0" = { - name = "archiver"; - packageName = "archiver"; - version = "2.1.0"; + "insert-module-globals-7.0.6" = { + name = "insert-module-globals"; + packageName = "insert-module-globals"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-2.1.0.tgz"; - sha1 = "d2df2e8d5773a82c1dcce925ccc41450ea999afd"; + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.6.tgz"; + sha512 = "3vjhls34i9vc0mm5cxlw6zbp1an494z9kbrrmj4hbv32fw0hx22nfpaj7j8i7lwkqa1sdqidxcfkga1630ya454h8h2ppbbl9s24ys7"; }; }; - "ci-info-1.1.1" = { - name = "ci-info"; - packageName = "ci-info"; - version = "1.1.1"; + "insight-0.8.4" = { + name = "insight"; + packageName = "insight"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.1.tgz"; - sha512 = "1jvhr6dw386c1s25m0hg2xmdvi79rwm8imw1p63s329lp2cblcwsjld5xl6v0xv26pkb23pzaz5s8c4a698cm3b9llidxfgyqbw6w5w"; + url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; + sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; }; }; - "dargs-5.1.0" = { - name = "dargs"; - packageName = "dargs"; - version = "5.1.0"; + "int64-buffer-0.1.10" = { + name = "int64-buffer"; + packageName = "int64-buffer"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/dargs/-/dargs-5.1.0.tgz"; - sha1 = "ec7ea50c78564cd36c9d5ec18f66329fade27829"; + url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz"; + sha1 = "277b228a87d95ad777d07c13832022406a473423"; }; }; - "diff-3.4.0" = { - name = "diff"; - packageName = "diff"; - version = "3.4.0"; + "internal-ip-1.2.0" = { + name = "internal-ip"; + packageName = "internal-ip"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz"; - sha512 = "1qawya1qhgy4q0bgx0s9ryfz70ddrgyj33rdnnppzszi7x31iir66y7v89kc82lr7prkafrax9sa6w5ssxykqmcf1xw291864qnx5a2"; + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz"; + sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c"; }; }; - "elementtree-0.1.7" = { - name = "elementtree"; - packageName = "elementtree"; - version = "0.1.7"; + "interpret-1.1.0" = { + name = "interpret"; + packageName = "interpret"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz"; - sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; + sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; }; }; - "leek-0.0.24" = { - name = "leek"; - packageName = "leek"; - version = "0.0.24"; + "intersect-1.0.1" = { + name = "intersect"; + packageName = "intersect"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz"; - sha1 = "e400e57f0e60d8ef2bd4d068dc428a54345dbcda"; + url = "https://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz"; + sha1 = "332650e10854d8c0ac58c192bdc27a8bf7e7a30c"; }; }; - "proxy-middleware-0.15.0" = { - name = "proxy-middleware"; - packageName = "proxy-middleware"; - version = "0.15.0"; + "into-stream-3.1.0" = { + name = "into-stream"; + packageName = "into-stream"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz"; - sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56"; + url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; + sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; }; }; - "ssh-config-1.1.3" = { - name = "ssh-config"; - packageName = "ssh-config"; - version = "1.1.3"; + "invariant-2.2.4" = { + name = "invariant"; + packageName = "invariant"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.3.tgz"; - sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c"; + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; + sha512 = "0sa0bflh46zr7zqdifqk3a48bmqlmpikrnmwvgz8nx6979piw2m92qrn1g5xnpjzxn864y2jq3gl84jkws2dad3mlwr6s3fa10my4m6"; }; }; - "tar-4.0.2" = { - name = "tar"; - packageName = "tar"; - version = "4.0.2"; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz"; - sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2"; + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "tiny-lr-1.0.5" = { - name = "tiny-lr"; - packageName = "tiny-lr"; - version = "1.0.5"; + "ip-1.0.1" = { + name = "ip"; + packageName = "ip"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.0.5.tgz"; - sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32"; + url = "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz"; + sha1 = "c7e356cdea225ae71b36d70f2e71a92ba4e42590"; }; }; - "ws-3.3.1" = { - name = "ws"; - packageName = "ws"; - version = "3.3.1"; + "ip-1.1.5" = { + name = "ip"; + packageName = "ip"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-3.3.1.tgz"; - sha512 = "3y6jiddhkfn0qgl1bq8whpn8s7l4vh981nnjih1k81wa7mxgbj6c9nnayxk1hz4qdxy34f8wbzv6kq6pdcsg7n98a1c5jyhr52fw3zh"; + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; - "netmask-1.0.6" = { - name = "netmask"; - packageName = "netmask"; - version = "1.0.6"; + "ip-set-1.0.1" = { + name = "ip-set"; + packageName = "ip-set"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz"; - sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35"; + url = "https://registry.npmjs.org/ip-set/-/ip-set-1.0.1.tgz"; + sha1 = "633b66d0bd6c8d0de968d053263c9120d3b6727e"; }; }; - "archiver-utils-1.3.0" = { - name = "archiver-utils"; - packageName = "archiver-utils"; - version = "1.3.0"; + "ipaddr.js-1.0.5" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz"; - sha1 = "e50b4c09c70bf3d680e32ff1b7994e9f9d895174"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; + sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; }; }; - "buffer-crc32-0.2.13" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.2.13"; + "ipaddr.js-1.4.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; + sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; }; }; - "zip-stream-1.2.0" = { - name = "zip-stream"; - packageName = "zip-stream"; - version = "1.2.0"; + "ipaddr.js-1.6.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz"; - sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz"; + sha1 = "e3fa357b773da619f26e95f049d055c72796f86b"; }; }; - "lazystream-1.0.0" = { - name = "lazystream"; - packageName = "lazystream"; - version = "1.0.0"; + "ipaddr.js-1.7.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz"; - sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.7.0.tgz"; + sha1 = "2206ed334afc32e01fed3ee838b6b2521068b9d2"; }; }; - "compress-commons-1.2.2" = { - name = "compress-commons"; - packageName = "compress-commons"; - version = "1.2.2"; + "irc-replies-2.0.1" = { + name = "irc-replies"; + packageName = "irc-replies"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz"; - sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; + url = "https://registry.npmjs.org/irc-replies/-/irc-replies-2.0.1.tgz"; + sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79"; }; }; - "crc32-stream-2.0.0" = { - name = "crc32-stream"; - packageName = "crc32-stream"; - version = "2.0.0"; + "is-3.2.1" = { + name = "is"; + packageName = "is"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz"; - sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"; + url = "https://registry.npmjs.org/is/-/is-3.2.1.tgz"; + sha1 = "d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"; }; }; - "crc-3.5.0" = { - name = "crc"; - packageName = "crc"; - version = "3.5.0"; + "is-absolute-0.1.7" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz"; - sha1 = "98b8ba7d489665ba3979f59b21381374101a1964"; + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"; + sha1 = "847491119fccb5fb436217cc737f7faad50f603f"; }; }; - "statuses-1.4.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.4.0"; + "is-absolute-0.2.6" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz"; + sha1 = "20de69f3db942ef2d87b9c2da36f172235b1b5eb"; }; }; - "sax-1.1.4" = { - name = "sax"; - packageName = "sax"; - version = "1.1.4"; + "is-absolute-1.0.0" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; - sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; + sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl"; }; }; - "lodash.assign-3.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "3.2.0"; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"; - sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"; + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; }; }; - "rsvp-3.6.2" = { - name = "rsvp"; - packageName = "rsvp"; - version = "3.6.2"; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz"; - sha512 = "2bjwzsigk7685syp50amryj0sx08l155azg1z4ldx95gadlwfm07y0iyv0vfwgfchbripn2a5r04qhv546djh0biw8prgpx6r0qdx9r"; + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; }; }; - "lodash._baseassign-3.2.0" = { - name = "lodash._baseassign"; - packageName = "lodash._baseassign"; - version = "3.2.0"; + "is-alphabetical-1.0.1" = { + name = "is-alphabetical"; + packageName = "is-alphabetical"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; - sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz"; + sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08"; }; }; - "lodash._createassigner-3.1.1" = { - name = "lodash._createassigner"; - packageName = "lodash._createassigner"; - version = "3.1.1"; + "is-alphanumerical-1.0.1" = { + name = "is-alphanumerical"; + packageName = "is-alphanumerical"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz"; - sha1 = "838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"; + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz"; + sha1 = "dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b"; }; }; - "lodash._bindcallback-3.0.1" = { - name = "lodash._bindcallback"; - packageName = "lodash._bindcallback"; - version = "3.0.1"; + "is-arguments-1.0.2" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"; - sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e"; + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.2.tgz"; + sha1 = "07e30ad79531844179b642d2d8399435182c8727"; }; }; - "chownr-1.0.1" = { - name = "chownr"; - packageName = "chownr"; - version = "1.0.1"; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; - sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; }; }; - "minipass-2.2.1" = { - name = "minipass"; - packageName = "minipass"; - version = "2.2.1"; + "is-arrayish-0.3.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz"; - sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz"; + sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; }; }; - "minizlib-1.0.4" = { - name = "minizlib"; - packageName = "minizlib"; - version = "1.0.4"; + "is-ascii-1.0.0" = { + name = "is-ascii"; + packageName = "is-ascii"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz"; - sha512 = "1lxpa3mkdc94i0d7b2ivilcky0gnmnxv5csmigzacb5gl2cz7rz4ciikq1r5an1simk86f61whwzyi5d8gic85w55q19d09sbv19pmh"; + url = "https://registry.npmjs.org/is-ascii/-/is-ascii-1.0.0.tgz"; + sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; }; }; - "yallist-3.0.2" = { - name = "yallist"; - packageName = "yallist"; - version = "3.0.2"; + "is-binary-path-1.0.1" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; - sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; }; }; - "body-5.1.0" = { - name = "body"; - packageName = "body"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/body/-/body-5.1.0.tgz"; - sha1 = "e4ba0ce410a46936323367609ecb4e6553125069"; - }; - }; - "faye-websocket-0.10.0" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.10.0"; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; - "livereload-js-2.2.2" = { - name = "livereload-js"; - packageName = "livereload-js"; - version = "2.2.2"; + "is-builtin-module-1.0.0" = { + name = "is-builtin-module"; + packageName = "is-builtin-module"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/livereload-js/-/livereload-js-2.2.2.tgz"; - sha1 = "6c87257e648ab475bc24ea257457edcc1f8d0bc2"; + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; }; }; - "continuable-cache-0.3.1" = { - name = "continuable-cache"; - packageName = "continuable-cache"; - version = "0.3.1"; + "is-callable-1.1.3" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz"; - sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; + sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; }; }; - "error-7.0.2" = { - name = "error"; - packageName = "error"; - version = "7.0.2"; + "is-ci-1.1.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/error/-/error-7.0.2.tgz"; - sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; + sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; }; }; - "raw-body-1.1.7" = { - name = "raw-body"; - packageName = "raw-body"; - version = "1.1.7"; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz"; - sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425"; + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; }; }; - "safe-json-parse-1.0.1" = { - name = "safe-json-parse"; - packageName = "safe-json-parse"; - version = "1.0.1"; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz"; - sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; }; }; - "string-template-0.2.1" = { - name = "string-template"; - packageName = "string-template"; - version = "0.2.1"; + "is-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"; - sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; - "bytes-1.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "1.0.0"; + "is-decimal-1.0.1" = { + name = "is-decimal"; + packageName = "is-decimal"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; - sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz"; + sha1 = "f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82"; }; }; - "async-limiter-1.0.0" = { - name = "async-limiter"; - packageName = "async-limiter"; - version = "1.0.0"; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; - sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf"; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; }; }; - "is-wsl-1.1.0" = { - name = "is-wsl"; - packageName = "is-wsl"; - version = "1.1.0"; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; - sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; }; }; - "macos-release-1.1.0" = { - name = "macos-release"; - packageName = "macos-release"; + "is-docker-1.1.0" = { + name = "is-docker"; + packageName = "is-docker"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz"; - sha512 = "260gwv2k1svhzfxs50g921jbhrqlbfr94mcs9ak0dip7i2331nqc7ip0fgdkfl3r1b30w1s87qh2ssq6wxzd08pbmkjwchqc6xdnqls"; + url = "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz"; + sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; }; }; - "abbrev-1.0.9" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.0.9"; + "is-dotfile-1.0.3" = { + name = "is-dotfile"; + packageName = "is-dotfile"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"; - sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135"; + url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; + sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; }; }; - "escodegen-1.8.1" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.8.1"; + "is-equal-shallow-0.1.3" = { + name = "is-equal-shallow"; + packageName = "is-equal-shallow"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; - sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; + sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; }; }; - "esprima-2.7.3" = { - name = "esprima"; - packageName = "esprima"; - version = "2.7.3"; + "is-expression-3.0.0" = { + name = "is-expression"; + packageName = "is-expression"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; - sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + url = "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz"; + sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f"; }; }; - "handlebars-4.0.11" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.0.11"; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; - sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "estraverse-1.9.3" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.9.3"; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; - sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; }; }; - "source-map-0.2.0" = { - name = "source-map"; - packageName = "source-map"; - version = "0.2.0"; + "is-extglob-1.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; - sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; + sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; - "chai-4.1.2" = { - name = "chai"; - packageName = "chai"; - version = "4.1.2"; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz"; - sha1 = "0f64584ba642f0f2ace2806279f4f06ca23ad73c"; + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; - "chai-as-promised-7.1.1" = { - name = "chai-as-promised"; - packageName = "chai-as-promised"; - version = "7.1.1"; + "is-file-1.0.0" = { + name = "is-file"; + packageName = "is-file"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz"; - sha512 = "1lf4xj5gc7gxbqjx1pmshsddaqah4zlvzm1r4rbrf4rsgjgf2zj9lx8rccgy0y7ps7wv2i1wf259dwd6mj8aaryxdpfryi2rb2glckb"; + url = "https://registry.npmjs.org/is-file/-/is-file-1.0.0.tgz"; + sha1 = "28a44cfbd9d3db193045f22b65fce8edf9620596"; }; }; - "fast-json-patch-2.0.6" = { - name = "fast-json-patch"; - packageName = "fast-json-patch"; - version = "2.0.6"; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.6.tgz"; - sha1 = "86fff8f8662391aa819722864d632e603e6ee605"; + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; }; }; - "iterare-0.0.8" = { - name = "iterare"; - packageName = "iterare"; - version = "0.0.8"; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/iterare/-/iterare-0.0.8.tgz"; - sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad"; + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; }; }; - "jaeger-client-3.6.0" = { - name = "jaeger-client"; - packageName = "jaeger-client"; - version = "3.6.0"; + "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/jaeger-client/-/jaeger-client-3.6.0.tgz"; - sha1 = "5659f522776298eea8ed768741dc71978ba69a98"; + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; - "mz-2.7.0" = { - name = "mz"; - packageName = "mz"; - version = "2.7.0"; + "is-function-1.0.1" = { + name = "is-function"; + packageName = "is-function"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; + url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz"; + sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; }; }; - "object-hash-1.2.0" = { - name = "object-hash"; - packageName = "object-hash"; - version = "1.2.0"; + "is-glob-2.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-1.2.0.tgz"; - sha512 = "19310wpjhfybr8gslg93qybbsrf3fjlmdgsgvn7d9yim1nmpcgjn5az280w4p8spvhq1djly7naa9434166gcmbavv0xirg75gmcr5j"; + url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; + sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; }; }; - "opentracing-0.14.1" = { - name = "opentracing"; - packageName = "opentracing"; - version = "0.14.1"; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.1.tgz"; - sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd"; + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; }; }; - "rxjs-5.5.2" = { - name = "rxjs"; - packageName = "rxjs"; - version = "5.5.2"; + "is-glob-4.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz"; - sha512 = "208dclsk809q1ra99l8j8xzrl9kcm4wpzwjb89rwdqrz78x3i0861kkgqi1sp3v8sdnnvdq0flmazdv96ah7jxpvwf74lw1llh2h5m1"; + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz"; + sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; }; }; - "semaphore-async-await-1.5.1" = { - name = "semaphore-async-await"; - packageName = "semaphore-async-await"; - version = "1.5.1"; + "is-hexadecimal-1.0.1" = { + name = "is-hexadecimal"; + packageName = "is-hexadecimal"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz"; - sha1 = "857bef5e3644601ca4b9570b87e9df5ca12974fa"; + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz"; + sha1 = "6e084bbc92061fbb0971ec58b6ce6d404e24da69"; }; }; - "string-similarity-1.2.0" = { - name = "string-similarity"; - packageName = "string-similarity"; - version = "1.2.0"; + "is-installed-globally-0.1.0" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-similarity/-/string-similarity-1.2.0.tgz"; - sha1 = "d75153cb383846318b7a39a8d9292bb4db4e9c30"; + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; + sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; }; }; - "typescript-2.4.2" = { - name = "typescript"; - packageName = "typescript"; - version = "2.4.2"; + "is-mergeable-object-1.1.0" = { + name = "is-mergeable-object"; + packageName = "is-mergeable-object"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz"; - sha1 = "f8395f85d459276067c988aa41837a8f82870844"; + url = "https://registry.npmjs.org/is-mergeable-object/-/is-mergeable-object-1.1.0.tgz"; + sha512 = "03srgd19nl1p2b2ny8gamq5qvv4k124inq5fzkb1kqxdw9y45fr46g8awmpnx0hgwpfg0blysfms7r8n89sf5183hr2xd8x0l7q7z15"; }; }; - "vscode-jsonrpc-3.5.0" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "3.5.0"; + "is-my-ip-valid-1.0.0" = { + name = "is-my-ip-valid"; + packageName = "is-my-ip-valid"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz"; - sha1 = "87239d9e166b2d7352245b8a813597804c1d63aa"; + url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; + sha512 = "1lnwwykigbkg3yqmr61cyiplxfdvpchcsi1fz67jwn55gvdrl597jpsd6jds205gjkn8c3zxbqmppmf3danpj0rrla7ffnicmwpys42"; }; }; - "vscode-languageserver-3.5.0" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "3.5.0"; + "is-my-json-valid-2.17.2" = { + name = "is-my-json-valid"; + packageName = "is-my-json-valid"; + version = "2.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.0.tgz"; - sha1 = "d28099bc6ddda8c1dd16b707e454e1b1ddae0dba"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz"; + sha512 = "29bla4943cs5dks8f307ykpgk5gihgjy158h8nspcxia85gb1lwaxpqywisr7621spdp8j5p4vd3zhfl2csdlihy06w9017b2r42610"; }; }; - "vscode-languageserver-types-3.5.0" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.5.0"; + "is-natural-number-4.0.1" = { + name = "is-natural-number"; + packageName = "is-natural-number"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz"; - sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374"; + url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz"; + sha1 = "ab9d76e1db4ced51e35de0c72ebecf09f734cde8"; }; }; - "assertion-error-1.0.2" = { - name = "assertion-error"; - packageName = "assertion-error"; - version = "1.0.2"; + "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/assertion-error/-/assertion-error-1.0.2.tgz"; - sha1 = "13ca515d86206da0bac66e834dd397d87581094c"; + url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; }; }; - "check-error-1.0.2" = { - name = "check-error"; - packageName = "check-error"; - version = "1.0.2"; + "is-npm-1.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"; - sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; + url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; }; }; - "deep-eql-3.0.1" = { - name = "deep-eql"; - packageName = "deep-eql"; - version = "3.0.1"; + "is-number-0.1.1" = { + name = "is-number"; + packageName = "is-number"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"; - sha512 = "1rrbk0h0a836gj1x6lalzgqfs0v34d4fswq23c8lxzmb6k7pna45zd509h1r1fr312n4qml94xqlmzzga40sfa9vnzf6rkr4d1qh1zr"; + url = "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz"; + sha1 = "69a7af116963d47206ec9bd9b48a14216f1e3806"; }; }; - "get-func-name-2.0.0" = { - name = "get-func-name"; - packageName = "get-func-name"; - version = "2.0.0"; + "is-number-2.1.0" = { + name = "is-number"; + packageName = "is-number"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz"; - sha1 = "ead774abee72e20409433a066366023dd6887a41"; + url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; + sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; }; }; - "pathval-1.1.0" = { - name = "pathval"; - packageName = "pathval"; - version = "1.1.0"; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; - sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; }; }; - "type-detect-4.0.5" = { - name = "type-detect"; - packageName = "type-detect"; - version = "4.0.5"; + "is-number-4.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.5.tgz"; - sha512 = "08z0fl5f7kx0fhjbj75cvshf4j5j3zzk04766g04rlwcjqr2i3z84qla0ci1h2iv014qkmsh9z7vbvd6ncr04bf1c36cl151f8jzlip"; + url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"; + sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd"; }; }; - "node-int64-0.4.0" = { - name = "node-int64"; - packageName = "node-int64"; - version = "0.4.0"; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"; - sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; }; - "thriftrw-3.11.1" = { - name = "thriftrw"; - packageName = "thriftrw"; - version = "3.11.1"; + "is-object-1.0.1" = { + name = "is-object"; + packageName = "is-object"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.1.tgz"; - sha1 = "5a2f5165d665bb195e665e5b5b9f8897dac23acc"; + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; + sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; }; }; - "xorshift-0.2.1" = { - name = "xorshift"; - packageName = "xorshift"; - version = "0.2.1"; + "is-odd-2.0.0" = { + name = "is-odd"; + packageName = "is-odd"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/xorshift/-/xorshift-0.2.1.tgz"; - sha1 = "fcd82267e9351c13f0fb9c73307f25331d29c63a"; + url = "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz"; + sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r"; }; }; - "opentracing-0.13.0" = { - name = "opentracing"; - packageName = "opentracing"; - version = "0.13.0"; + "is-path-cwd-1.0.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.13.0.tgz"; - sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; + sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; }; }; - "bufrw-1.2.1" = { - name = "bufrw"; - packageName = "bufrw"; - version = "1.2.1"; + "is-path-in-cwd-1.0.1" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bufrw/-/bufrw-1.2.1.tgz"; - sha1 = "93f222229b4f5f5e2cd559236891407f9853663b"; + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; + sha512 = "1lrmbdvciajn2smq4j80qvp3gpkkzqddiyay3xgbzni3gi4vljkawyyw68i6h8m1jfdg4jy8l8c16rlfvr17pnfb314xw5q6m2pad8n"; }; }; - "ansi-color-0.2.1" = { - name = "ansi-color"; - packageName = "ansi-color"; - version = "0.2.1"; + "is-path-inside-1.0.1" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz"; - sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a"; + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz"; + sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; }; }; - "any-promise-1.3.0" = { - name = "any-promise"; - packageName = "any-promise"; - version = "1.3.0"; + "is-plain-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; }; }; - "thenify-all-1.6.0" = { - name = "thenify-all"; - packageName = "thenify-all"; - version = "1.6.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/thenify-all/-/thenify-all-1.6.0.tgz"; - sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; }; }; - "thenify-3.3.0" = { - name = "thenify"; - packageName = "thenify"; - version = "3.3.0"; + "is-posix-bracket-0.1.1" = { + name = "is-posix-bracket"; + packageName = "is-posix-bracket"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz"; - sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; + url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; }; }; - "symbol-observable-1.0.4" = { - name = "symbol-observable"; - packageName = "symbol-observable"; - version = "1.0.4"; + "is-primitive-2.0.0" = { + name = "is-primitive"; + packageName = "is-primitive"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz"; - sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"; + url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; + sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "vscode-uri-1.0.1" = { - name = "vscode-uri"; - packageName = "vscode-uri"; + "is-promise-1.0.1" = { + name = "is-promise"; + packageName = "is-promise"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.1.tgz"; - sha1 = "11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"; + url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; + sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; }; }; - "vscode-languageserver-protocol-3.5.0" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.5.0"; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz"; - sha1 = "067c5cbe27709795398d119692c97ebba1452209"; + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; }; }; - "when-3.4.6" = { - name = "when"; - packageName = "when"; - version = "3.4.6"; + "is-property-1.0.2" = { + name = "is-property"; + packageName = "is-property"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; - sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; }; }; - "cli-1.0.1" = { - name = "cli"; - packageName = "cli"; - version = "1.0.1"; + "is-redirect-1.0.0" = { + name = "is-redirect"; + packageName = "is-redirect"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz"; - sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; + url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; - "config-chain-1.1.11" = { - name = "config-chain"; - packageName = "config-chain"; - version = "1.1.11"; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; - sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; }; }; - "editorconfig-0.13.3" = { - name = "editorconfig"; - packageName = "editorconfig"; - version = "0.13.3"; + "is-regexp-1.0.0" = { + name = "is-regexp"; + packageName = "is-regexp"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz"; - sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s"; + url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; + sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; }; }; - "proto-list-1.2.4" = { - name = "proto-list"; - packageName = "proto-list"; - version = "1.2.4"; + "is-relative-0.1.3" = { + name = "is-relative"; + packageName = "is-relative"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + url = "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"; + sha1 = "905fee8ae86f45b3ec614bc3c15c869df0876e82"; }; }; - "bluebird-3.5.1" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.5.1"; + "is-relative-0.2.1" = { + name = "is-relative"; + packageName = "is-relative"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; - sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; + url = "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz"; + sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5"; }; }; - "lru-cache-3.2.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "3.2.0"; + "is-relative-1.0.0" = { + name = "is-relative"; + packageName = "is-relative"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz"; - sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; + url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; + sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb"; }; }; - "graphlib-2.1.1" = { - name = "graphlib"; - packageName = "graphlib"; - version = "2.1.1"; + "is-resolvable-1.1.0" = { + name = "is-resolvable"; + packageName = "is-resolvable"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.1.tgz"; - sha1 = "42352c52ba2f4d035cb566eb91f7395f76ebc951"; + url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"; + sha512 = "0r8v3dkj5qbfh2wlj4w1msyqsw6j5myvxi88wkw36isscb97yyc2yc1pwm64djrmh1css6jp9p08cx1zb479fg4gv26prciaifdh05a"; }; }; - "native-promise-only-0.8.1" = { - name = "native-promise-only"; - packageName = "native-promise-only"; - version = "0.8.1"; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; - sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; }; }; - "path-loader-1.0.4" = { - name = "path-loader"; - packageName = "path-loader"; - version = "1.0.4"; + "is-root-1.0.0" = { + name = "is-root"; + packageName = "is-root"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz"; - sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk"; + url = "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz"; + sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5"; }; }; - "uri-js-3.0.2" = { - name = "uri-js"; - packageName = "uri-js"; - version = "3.0.2"; + "is-scoped-1.0.0" = { + name = "is-scoped"; + packageName = "is-scoped"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz"; - sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; + url = "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz"; + sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; }; }; - "punycode-2.1.0" = { - name = "punycode"; - packageName = "punycode"; - version = "2.1.0"; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz"; - sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "connect-pause-0.1.1" = { - name = "connect-pause"; - packageName = "connect-pause"; + "is-string-1.0.4" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz"; + sha1 = "cc3a9b69857d621e963725a24caeec873b826e64"; + }; + }; + "is-subset-0.1.1" = { + name = "is-subset"; + packageName = "is-subset"; version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/connect-pause/-/connect-pause-0.1.1.tgz"; - sha1 = "b269b2bb82ddb1ac3db5099c0fb582aba99fb37a"; + url = "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz"; + sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; }; }; - "errorhandler-1.5.0" = { - name = "errorhandler"; - packageName = "errorhandler"; - version = "1.5.0"; + "is-supported-regexp-flag-1.0.1" = { + name = "is-supported-regexp-flag"; + packageName = "is-supported-regexp-flag"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz"; - sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4"; + url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz"; + sha512 = "0lrp2yp3bjcq9v1sxn5451bmmnj129aws8g0ym3a2s4wkc2y6ym591pym51dgs2xg7cpid087hvmnvqjr36pp6gm419ibhlqmwhkxyy"; }; }; - "express-urlrewrite-1.2.0" = { - name = "express-urlrewrite"; - packageName = "express-urlrewrite"; - version = "1.2.0"; + "is-symbol-1.0.1" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.2.0.tgz"; - sha1 = "8e667b7761ff1c7ffdb0efa05d64035387c823eb"; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; + sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; }; }; - "json-parse-helpfulerror-1.0.3" = { - name = "json-parse-helpfulerror"; - packageName = "json-parse-helpfulerror"; - version = "1.0.3"; + "is-text-path-1.0.1" = { + name = "is-text-path"; + packageName = "is-text-path"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"; - sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; + url = "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz"; + sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; }; }; - "lodash-id-0.14.0" = { - name = "lodash-id"; - packageName = "lodash-id"; - version = "0.14.0"; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.14.0.tgz"; - sha1 = "baf48934e543a1b5d6346f8c84698b1a8c803896"; + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; - "lowdb-0.15.5" = { - name = "lowdb"; - packageName = "lowdb"; - version = "0.15.5"; + "is-unc-path-0.1.2" = { + name = "is-unc-path"; + packageName = "is-unc-path"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/lowdb/-/lowdb-0.15.5.tgz"; - sha1 = "9ade105df8aa573692d1221622b85414fbf4fa96"; + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz"; + sha1 = "6ab053a72573c10250ff416a3814c35178af39b9"; }; }; - "method-override-2.3.10" = { - name = "method-override"; - packageName = "method-override"; - version = "2.3.10"; + "is-unc-path-1.0.0" = { + name = "is-unc-path"; + packageName = "is-unc-path"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz"; - sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"; + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; }; }; - "morgan-1.9.0" = { - name = "morgan"; - packageName = "morgan"; - version = "1.9.0"; + "is-url-1.2.4" = { + name = "is-url"; + packageName = "is-url"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz"; - sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051"; + url = "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz"; + sha512 = "31qfylxnpb1y8vczgi2nh57ayl7s5ppn8iskp21607l6ka7jxq409pf2mvspwnx6pj29b63ldayjgljsbhyc442gfc1i185dy5ccfr1"; }; }; - "nanoid-1.0.1" = { - name = "nanoid"; - packageName = "nanoid"; - version = "1.0.1"; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.1.tgz"; - sha512 = "3dh8fdgynnii8rgdpyk69z99y49bnl60244wsaw8mk2lzhfhczgf7nxgmm0qakmgzbvqqqfngq03z3j8hp70smh7ka0il806w7ajxh5"; + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "please-upgrade-node-3.0.1" = { - name = "please-upgrade-node"; - packageName = "please-upgrade-node"; - version = "3.0.1"; + "is-valid-glob-0.3.0" = { + name = "is-valid-glob"; + packageName = "is-valid-glob"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz"; - sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db"; + url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz"; + sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe"; }; }; - "server-destroy-1.0.1" = { - name = "server-destroy"; - packageName = "server-destroy"; - version = "1.0.1"; + "is-windows-0.2.0" = { + name = "is-windows"; + packageName = "is-windows"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"; - sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; + url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz"; + sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; }; }; - "update-notifier-2.3.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "2.3.0"; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz"; - sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; }; }; - "yargs-10.0.3" = { - name = "yargs"; - packageName = "yargs"; - version = "10.0.3"; + "is-wsl-1.1.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz"; - sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f"; + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; - "path-to-regexp-1.7.0" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "1.7.0"; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; - sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; }; }; - "jju-1.3.0" = { - name = "jju"; - packageName = "jju"; - version = "1.3.0"; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz"; - sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "steno-0.4.4" = { - name = "steno"; - packageName = "steno"; - version = "0.4.4"; + "isarray-2.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz"; - sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; + sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; }; }; - "basic-auth-2.0.0" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "2.0.0"; + "isarray-2.0.4" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz"; - sha1 = "015db3f353e02e56377755f962742e8981e7bbba"; + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz"; + sha512 = "1l996rw6ql1ypf4jvy0yhl3d08zislzsxc0lgbc4hh3kb4qzlxqv29d9nblq9ai6lkiwvxfgynknk8j6j9qm49jqlsnib924lx5gk0q"; }; }; - "boxen-1.2.2" = { - name = "boxen"; - packageName = "boxen"; - version = "1.2.2"; + "isbinaryfile-3.0.2" = { + name = "isbinaryfile"; + packageName = "isbinaryfile"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz"; - sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5"; + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz"; + sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; }; }; - "configstore-3.1.1" = { - name = "configstore"; - packageName = "configstore"; - version = "3.1.1"; + "isemail-1.2.0" = { + name = "isemail"; + packageName = "isemail"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; - sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6"; + url = "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz"; + sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a"; }; }; - "import-lazy-2.1.0" = { - name = "import-lazy"; - packageName = "import-lazy"; - version = "2.1.0"; + "isexe-1.1.2" = { + name = "isexe"; + packageName = "isexe"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; + sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; }; }; - "is-installed-globally-0.1.0" = { - name = "is-installed-globally"; - packageName = "is-installed-globally"; - version = "0.1.0"; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; - sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "latest-version-3.1.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "3.1.0"; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz"; - sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; }; }; - "xdg-basedir-3.0.0" = { - name = "xdg-basedir"; - packageName = "xdg-basedir"; - version = "3.0.0"; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; - sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; }; - "ansi-align-2.0.0" = { - name = "ansi-align"; - packageName = "ansi-align"; - version = "2.0.0"; + "isomorphic-fetch-2.2.1" = { + name = "isomorphic-fetch"; + packageName = "isomorphic-fetch"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"; - sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; + sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; }; }; - "camelcase-4.1.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "4.1.0"; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "cli-boxes-1.0.0" = { - name = "cli-boxes"; - packageName = "cli-boxes"; + "isurl-1.0.0" = { + name = "isurl"; + packageName = "isurl"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; - sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; + sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; }; }; - "term-size-1.2.0" = { - name = "term-size"; - packageName = "term-size"; - version = "1.2.0"; + "iterare-0.0.8" = { + name = "iterare"; + packageName = "iterare"; + version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; - sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; + url = "https://registry.npmjs.org/iterare/-/iterare-0.0.8.tgz"; + sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad"; }; }; - "widest-line-1.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "1.0.0"; + "iterators-0.1.0" = { + name = "iterators"; + packageName = "iterators"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; - sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + url = "https://registry.npmjs.org/iterators/-/iterators-0.1.0.tgz"; + sha1 = "d03f666ca4e6130138565997cacea54164203156"; }; }; - "execa-0.7.0" = { - name = "execa"; - packageName = "execa"; - version = "0.7.0"; + "jade-0.27.0" = { + name = "jade"; + packageName = "jade"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + url = "https://registry.npmjs.org/jade/-/jade-0.27.0.tgz"; + sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; + "jade-1.11.0" = { + name = "jade"; + packageName = "jade"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz"; + sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; }; }; - "unique-string-1.0.0" = { - name = "unique-string"; - packageName = "unique-string"; - version = "1.0.0"; + "jaeger-client-3.10.0" = { + name = "jaeger-client"; + packageName = "jaeger-client"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; - sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.10.0.tgz"; + sha1 = "ad0e830ead7aabad2601a52a7e463f0d942b0091"; }; }; - "crypto-random-string-1.0.0" = { - name = "crypto-random-string"; - packageName = "crypto-random-string"; - version = "1.0.0"; + "jed-1.1.1" = { + name = "jed"; + packageName = "jed"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; - sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + url = "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz"; + sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; - "global-dirs-0.1.0" = { - name = "global-dirs"; - packageName = "global-dirs"; - version = "0.1.0"; + "jetpack-id-1.0.0" = { + name = "jetpack-id"; + packageName = "jetpack-id"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.0.tgz"; - sha1 = "10d34039e0df04272e262cf24224f7209434df4f"; + url = "https://registry.npmjs.org/jetpack-id/-/jetpack-id-1.0.0.tgz"; + sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6"; }; }; - "package-json-4.0.1" = { - name = "package-json"; - packageName = "package-json"; - version = "4.0.1"; + "jju-1.3.0" = { + name = "jju"; + packageName = "jju"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz"; - sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz"; + sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; }; }; - "got-6.7.1" = { - name = "got"; - packageName = "got"; - version = "6.7.1"; + "jmespath-0.15.0" = { + name = "jmespath"; + packageName = "jmespath"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; - sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"; + sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; }; }; - "registry-auth-token-3.3.1" = { - name = "registry-auth-token"; - packageName = "registry-auth-token"; - version = "3.3.1"; + "jodid25519-1.0.2" = { + name = "jodid25519"; + packageName = "jodid25519"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; - sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; + url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; + sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "create-error-class-3.0.2" = { - name = "create-error-class"; - packageName = "create-error-class"; - version = "3.0.2"; + "joi-6.10.1" = { + name = "joi"; + packageName = "joi"; + version = "6.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; - sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + url = "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz"; + sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06"; }; }; - "unzip-response-2.0.1" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "2.0.1"; + "js-select-0.6.0" = { + name = "js-select"; + packageName = "js-select"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; - sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + url = "https://registry.npmjs.org/js-select/-/js-select-0.6.0.tgz"; + sha1 = "c284e22824d5927aec962dcdf247174aefb0d190"; }; }; - "capture-stack-trace-1.0.0" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.0"; + "js-stringify-1.0.2" = { + name = "js-stringify"; + packageName = "js-stringify"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"; + sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db"; }; }; - "cliui-3.2.0" = { - name = "cliui"; - packageName = "cliui"; - version = "3.2.0"; + "js-tokens-3.0.2" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; }; }; - "get-caller-file-1.0.2" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "1.0.2"; + "js-yaml-0.3.7" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; - sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz"; + sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"; }; }; - "os-locale-2.1.0" = { - name = "os-locale"; - packageName = "os-locale"; + "js-yaml-2.1.0" = { + name = "js-yaml"; + packageName = "js-yaml"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; - sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; + sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; }; }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; + "js-yaml-3.10.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; + sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; }; - "require-main-filename-1.0.1" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "1.0.1"; + "js-yaml-3.11.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz"; + sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; }; }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; + "js2xmlparser-1.0.0" = { + name = "js2xmlparser"; + packageName = "js2xmlparser"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz"; + sha1 = "5a170f2e8d6476ce45405e04823242513782fe30"; }; }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; + "js2xmlparser-3.0.0" = { + name = "js2xmlparser"; + packageName = "js2xmlparser"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz"; + sha1 = "3fb60eaa089c5440f9319f51760ccd07e2499733"; }; }; - "y18n-3.2.1" = { - name = "y18n"; - packageName = "y18n"; - version = "3.2.1"; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "yargs-parser-8.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "8.0.0"; + "jsesc-1.3.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz"; - sha1 = "21d476330e5a82279a4b881345bf066102e219c6"; + url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; + sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; }; }; - "wrap-ansi-2.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "2.1.0"; + "jshint-2.8.0" = { + name = "jshint"; + packageName = "jshint"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; + sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; }; }; - "lcid-1.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "1.0.0"; + "json-buffer-3.0.0" = { + name = "json-buffer"; + packageName = "json-buffer"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; }; }; - "invert-kv-1.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "1.0.0"; + "json-edm-parser-0.1.2" = { + name = "json-edm-parser"; + packageName = "json-edm-parser"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + url = "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz"; + sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; - "combine-lists-1.0.1" = { - name = "combine-lists"; - packageName = "combine-lists"; - version = "1.0.1"; + "json-merge-patch-0.2.3" = { + name = "json-merge-patch"; + packageName = "json-merge-patch"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; - sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; + url = "https://registry.npmjs.org/json-merge-patch/-/json-merge-patch-0.2.3.tgz"; + sha1 = "fa2c6b5af87da77bae2966a589d52e23ed81fe40"; }; }; - "connect-3.6.5" = { - name = "connect"; - packageName = "connect"; - version = "3.6.5"; + "json-parse-better-errors-1.0.2" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz"; - sha1 = "fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da"; + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "2pv1kaf7gjr0bhr2djaf1i88li7q3v5daz4zm4hz57i4h21jgryihxb5c2h0p0q1vrq1ffyg279hp0vjrg73shvxr5lir6plxjb5fls"; }; }; - "di-0.0.1" = { - name = "di"; - packageName = "di"; - version = "0.0.1"; + "json-parse-helpfulerror-1.0.3" = { + name = "json-parse-helpfulerror"; + packageName = "json-parse-helpfulerror"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/di/-/di-0.0.1.tgz"; - sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; + url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"; + sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; }; }; - "dom-serialize-2.2.1" = { - name = "dom-serialize"; - packageName = "dom-serialize"; - version = "2.2.1"; + "json-refs-2.1.7" = { + name = "json-refs"; + packageName = "json-refs"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz"; - sha1 = "562ae8999f44be5ea3076f5419dcd59eb43ac95b"; + url = "https://registry.npmjs.org/json-refs/-/json-refs-2.1.7.tgz"; + sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89"; }; }; - "expand-braces-0.1.2" = { - name = "expand-braces"; - packageName = "expand-braces"; - version = "0.1.2"; + "json-rpc2-0.8.1" = { + name = "json-rpc2"; + packageName = "json-rpc2"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz"; - sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; + url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; + sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; }; }; - "http-proxy-1.16.2" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.16.2"; + "json-schema-0.2.2" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz"; - sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; }; }; - "isbinaryfile-3.0.2" = { - name = "isbinaryfile"; - packageName = "isbinaryfile"; - version = "3.0.2"; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz"; - sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "log4js-0.6.38" = { - name = "log4js"; - packageName = "log4js"; - version = "0.6.38"; + "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/log4js/-/log4js-0.6.38.tgz"; - sha1 = "2c494116695d6fb25480943d3fc872e662a522fd"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; + sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; }; }; - "qjobs-1.1.5" = { - name = "qjobs"; - packageName = "qjobs"; - version = "1.1.5"; + "json-stable-stringify-0.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz"; - sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; + sha1 = "611c23e814db375527df851193db59dd2af27f45"; }; }; - "socket.io-1.7.3" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.7.3"; + "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/socket.io/-/socket.io-1.7.3.tgz"; - sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; }; }; - "useragent-2.2.1" = { - name = "useragent"; - packageName = "useragent"; - version = "2.2.1"; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz"; - sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; }; }; - "finalhandler-1.0.6" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.0.6"; + "json-stringify-safe-3.0.0" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz"; - sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f"; + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; + sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; }; }; - "custom-event-1.0.1" = { - name = "custom-event"; - packageName = "custom-event"; - version = "1.0.1"; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"; - sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425"; + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "ent-2.2.0" = { - name = "ent"; - packageName = "ent"; - version = "2.2.0"; + "json3-3.2.6" = { + name = "json3"; + packageName = "json3"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"; - sha1 = "e964219325a21d05f44466a2f686ed6ce5f5dd1d"; + url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; + sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; }; }; - "array-slice-0.2.3" = { - name = "array-slice"; - packageName = "array-slice"; - version = "0.2.3"; + "json3-3.3.2" = { + name = "json3"; + packageName = "json3"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"; - sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5"; + url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; + sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; }; }; - "braces-0.1.5" = { - name = "braces"; - packageName = "braces"; - version = "0.1.5"; + "json5-0.2.0" = { + name = "json5"; + packageName = "json5"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz"; - sha1 = "c085711085291d8b75fdd74eab0f8597280711e6"; + url = "https://registry.npmjs.org/json5/-/json5-0.2.0.tgz"; + sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343"; }; }; - "expand-range-0.1.1" = { - name = "expand-range"; - packageName = "expand-range"; - version = "0.1.1"; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz"; - sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"; + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; - "is-number-0.1.1" = { - name = "is-number"; - packageName = "is-number"; - version = "0.1.1"; + "jsonata-1.5.0" = { + name = "jsonata"; + packageName = "jsonata"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz"; - sha1 = "69a7af116963d47206ec9bd9b48a14216f1e3806"; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.0.tgz"; + sha512 = "3qb6rsslbqqrl7gna4xl2gsjqf8z5q4imysdp2plnqyr2q43hplwga22di8qv2q9dr1jgd4pgcbsdn23qcg9adsj0ml0b99dg8r7kq5"; }; }; - "repeat-string-0.2.2" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "0.2.2"; + "jsonfile-1.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz"; - sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; + sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; }; }; - "eventemitter3-1.2.0" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "1.2.0"; + "jsonfile-2.4.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; - "requires-port-1.0.0" = { - name = "requires-port"; - packageName = "requires-port"; - version = "1.0.0"; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; - "debug-2.3.3" = { - name = "debug"; - packageName = "debug"; - version = "2.3.3"; + "jsonify-0.0.0" = { + name = "jsonify"; + packageName = "jsonify"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; }; }; - "engine.io-1.8.3" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.8.3"; + "jsonlint-1.6.2" = { + name = "jsonlint"; + packageName = "jsonlint"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz"; - sha1 = "8de7f97895d20d39b85f88eeee777b2bd42b13d4"; + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; + sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; }; }; - "has-binary-0.1.7" = { - name = "has-binary"; - packageName = "has-binary"; - version = "0.1.7"; + "jsonminify-0.4.1" = { + name = "jsonminify"; + packageName = "jsonminify"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; - sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; + url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz"; + sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c"; }; }; - "object-assign-4.1.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.0"; + "jsonparse-0.0.5" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; - sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"; + sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64"; }; }; - "socket.io-adapter-0.5.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "0.5.0"; + "jsonparse-0.0.6" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; - sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; + sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; }; }; - "socket.io-client-1.7.3" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.7.3"; + "jsonparse-1.2.0" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz"; - sha1 = "b30e86aa10d5ef3546601c09cde4765e381da377"; + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; + sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; - "socket.io-parser-2.3.1" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.3.1"; + "jsonparse-1.3.1" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; - sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; }; }; - "ms-0.7.2" = { - name = "ms"; - packageName = "ms"; - version = "0.7.2"; + "jsonpointer-4.0.1" = { + name = "jsonpointer"; + packageName = "jsonpointer"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; + sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; }; }; - "accepts-1.3.3" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.3"; + "jsonwebtoken-7.1.9" = { + name = "jsonwebtoken"; + packageName = "jsonwebtoken"; + version = "7.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; - sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz"; + sha1 = "847804e5258bec5a9499a8dc4a5e7a3bae08d58a"; }; }; - "base64id-1.0.0" = { - name = "base64id"; - packageName = "base64id"; - version = "1.0.0"; + "jspm-config-0.3.4" = { + name = "jspm-config"; + packageName = "jspm-config"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz"; - sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; + url = "https://registry.npmjs.org/jspm-config/-/jspm-config-0.3.4.tgz"; + sha1 = "44c26902e4ae8ece2366cedc9ff16b10a5f391c6"; }; }; - "engine.io-parser-1.3.2" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "1.3.2"; + "jsprim-0.3.0" = { + name = "jsprim"; + packageName = "jsprim"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; - sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz"; + sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; }; }; - "ws-1.1.2" = { - name = "ws"; - packageName = "ws"; - version = "1.1.2"; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"; - sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "after-0.8.2" = { - name = "after"; - packageName = "after"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; - sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; + "jsrsasign-4.8.2" = { + name = "jsrsasign"; + packageName = "jsrsasign"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsrsasign/-/jsrsasign-4.8.2.tgz"; + sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; - "arraybuffer.slice-0.0.6" = { - name = "arraybuffer.slice"; - packageName = "arraybuffer.slice"; - version = "0.0.6"; + "jstransform-10.1.0" = { + name = "jstransform"; + packageName = "jstransform"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; - sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; + url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz"; + sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; }; }; - "base64-arraybuffer-0.1.5" = { - name = "base64-arraybuffer"; - packageName = "base64-arraybuffer"; - version = "0.1.5"; + "jstransformer-0.0.2" = { + name = "jstransformer"; + packageName = "jstransformer"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; - sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; + url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz"; + sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab"; }; }; - "blob-0.0.4" = { - name = "blob"; - packageName = "blob"; - version = "0.0.4"; + "jstransformer-1.0.0" = { + name = "jstransformer"; + packageName = "jstransformer"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz"; - sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; + url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"; + sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"; }; }; - "wtf-8-1.0.0" = { - name = "wtf-8"; - packageName = "wtf-8"; - version = "1.0.0"; + "jszip-2.6.1" = { + name = "jszip"; + packageName = "jszip"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; - sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + url = "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz"; + sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "backo2-1.0.2" = { - name = "backo2"; - packageName = "backo2"; - version = "1.0.2"; + "junk-2.1.0" = { + name = "junk"; + packageName = "junk"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; - sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; + url = "https://registry.npmjs.org/junk/-/junk-2.1.0.tgz"; + sha1 = "f431b4b7f072dc500a5f10ce7f4ec71930e70134"; }; }; - "component-bind-1.0.0" = { - name = "component-bind"; - packageName = "component-bind"; + "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/component-bind/-/component-bind-1.0.0.tgz"; - sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; + url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.0.0.tgz"; + sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; }; }; - "engine.io-client-1.8.3" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.8.3"; + "jwa-1.1.5" = { + name = "jwa"; + packageName = "jwa"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz"; - sha1 = "1798ed93451246453d4c6f635d7a201fe940d5ab"; + url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz"; + sha1 = "a0552ce0220742cd52e153774a32905c30e756e5"; }; }; - "object-component-0.0.3" = { - name = "object-component"; - packageName = "object-component"; - version = "0.0.3"; + "jws-3.1.4" = { + name = "jws"; + packageName = "jws"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; - sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; + url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz"; + sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2"; }; }; - "parseuri-0.0.5" = { - name = "parseuri"; - packageName = "parseuri"; - version = "0.0.5"; + "jwt-decode-2.2.0" = { + name = "jwt-decode"; + packageName = "jwt-decode"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; - sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; + url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz"; + sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79"; }; }; - "to-array-0.1.4" = { - name = "to-array"; - packageName = "to-array"; - version = "0.1.4"; + "k-bucket-0.6.0" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; - sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz"; + sha1 = "afc532545f69d466293e887b00d5fc73377c3abb"; }; }; - "component-inherit-0.0.3" = { - name = "component-inherit"; - packageName = "component-inherit"; - version = "0.0.3"; + "k-bucket-2.0.1" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; - sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz"; + sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; - "has-cors-1.1.0" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.1.0"; + "k-bucket-3.3.1" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-3.3.1.tgz"; + sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j"; }; }; - "parsejson-0.0.3" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.3"; + "k-bucket-4.0.0" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; - sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.0.tgz"; + sha512 = "04i173zw3l2aagsnywafmgs87wzhhkakvnhcfvxbnbmn7rz37rkqkryc8d6x8dccqlmvgawb2vhd49ms8s2wkbg3dh3qlffamzcpshk"; }; }; - "parseqs-0.0.5" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.5"; + "k-rpc-3.7.0" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; - sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-3.7.0.tgz"; + sha1 = "641f99b2825be34b6e7984f22b7962dc1a906c23"; }; }; - "xmlhttprequest-ssl-1.5.3" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.3"; + "k-rpc-4.3.1" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; - sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.3.1.tgz"; + sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s"; }; }; - "yeast-0.1.2" = { - name = "yeast"; - packageName = "yeast"; - version = "0.1.2"; + "k-rpc-socket-1.8.0" = { + name = "k-rpc-socket"; + packageName = "k-rpc-socket"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"; - sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz"; + sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz"; }; }; - "better-assert-1.0.2" = { - name = "better-assert"; - packageName = "better-assert"; - version = "1.0.2"; + "kad-fs-0.0.4" = { + name = "kad-fs"; + packageName = "kad-fs"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; - sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; + url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz"; + sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a"; }; }; - "callsite-1.0.0" = { - name = "callsite"; - packageName = "callsite"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; - sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; + "kad-git+https://github.com/gwicke/kad.git#master" = { + name = "kad"; + packageName = "kad"; + version = "1.3.6"; + src = fetchgit { + url = "https://github.com/gwicke/kad.git"; + rev = "936c91652d757ea6f9dd30e44698afb0daaa1d17"; + sha256 = "69b2ef001b9f4161dad34f5305a5895cfa9f98f124689277293fd544d06f9251"; }; }; - "debug-2.2.0" = { - name = "debug"; - packageName = "debug"; - version = "2.2.0"; + "kad-localstorage-0.0.7" = { + name = "kad-localstorage"; + packageName = "kad-localstorage"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz"; + sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17"; }; }; - "json3-3.3.2" = { - name = "json3"; - packageName = "json3"; - version = "3.3.2"; + "kad-memstore-0.0.1" = { + name = "kad-memstore"; + packageName = "kad-memstore"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; + url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz"; + sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; }; }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; + "keen.io-0.1.3" = { + name = "keen.io"; + packageName = "keen.io"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz"; + sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; }; }; - "lru-cache-2.2.4" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.2.4"; + "keep-alive-agent-0.0.1" = { + name = "keep-alive-agent"; + packageName = "keep-alive-agent"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; - sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d"; + url = "https://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz"; + sha1 = "44847ca394ce8d6b521ae85816bd64509942b385"; }; }; - "express-3.21.2" = { - name = "express"; - packageName = "express"; - version = "3.21.2"; + "kew-0.1.7" = { + name = "kew"; + packageName = "kew"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz"; - sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; + url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; + sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; }; }; - "passport-0.4.0" = { - name = "passport"; - packageName = "passport"; - version = "0.4.0"; + "kew-0.7.0" = { + name = "kew"; + packageName = "kew"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz"; - sha1 = "c5095691347bd5ad3b5e180238c3914d16f05811"; + url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; + sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; }; }; - "passport-google-oauth-1.0.0" = { - name = "passport-google-oauth"; - packageName = "passport-google-oauth"; - version = "1.0.0"; + "keygrip-1.0.2" = { + name = "keygrip"; + packageName = "keygrip"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-1.0.0.tgz"; - sha1 = "65f50633192ad0627a18b08960077109d84eb76d"; + url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.2.tgz"; + sha1 = "ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"; }; }; - "connect-restreamer-1.0.3" = { - name = "connect-restreamer"; - packageName = "connect-restreamer"; - version = "1.0.3"; + "keypress-0.1.0" = { + name = "keypress"; + packageName = "keypress"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.3.tgz"; - sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9"; + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; }; }; - "basic-auth-1.0.4" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "1.0.4"; + "keypress-0.2.1" = { + name = "keypress"; + packageName = "keypress"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; - sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; + sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; }; }; - "connect-2.30.2" = { - name = "connect"; - packageName = "connect"; - version = "2.30.2"; + "keyv-3.0.0" = { + name = "keyv"; + packageName = "keyv"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz"; - sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; + url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; + sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs"; }; }; - "cookie-0.1.3" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.3"; + "kind-of-2.0.1" = { + name = "kind-of"; + packageName = "kind-of"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz"; - sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz"; + sha1 = "018ec7a4ce7e3a86cb9141be519d24c8faa981b5"; }; }; - "escape-html-1.0.2" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.2"; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz"; - sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; }; }; - "etag-1.7.0" = { - name = "etag"; - packageName = "etag"; - version = "1.7.0"; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; - sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; }; }; - "fresh-0.3.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.3.0"; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; - sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; }; }; - "merge-descriptors-1.0.0" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.0"; + "kind-of-6.0.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; - sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk"; }; }; - "send-0.13.0" = { - name = "send"; - packageName = "send"; - version = "0.13.0"; + "klaw-1.3.1" = { + name = "klaw"; + packageName = "klaw"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz"; - sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de"; + url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"; + sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; }; }; - "basic-auth-connect-1.0.0" = { - name = "basic-auth-connect"; - packageName = "basic-auth-connect"; - version = "1.0.0"; + "klaw-2.0.0" = { + name = "klaw"; + packageName = "klaw"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; - sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + url = "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz"; + sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; - "body-parser-1.13.3" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.13.3"; + "knockout-3.5.0-beta" = { + name = "knockout"; + packageName = "knockout"; + version = "3.5.0-beta"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz"; - sha1 = "c08cf330c3358e151016a05746f13f029c97fa97"; + url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-beta.tgz"; + sha512 = "2qh1bqb9lj7l92pwcrwmpcanbyn65rmni3swyv6hrphn7xbaw8mkir3w67sf4ardk1iqvz9waalq2wf2rgpvvblhva2n2hssq6as6yr"; }; }; - "bytes-2.1.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.1.0"; + "kuduscript-1.0.16" = { + name = "kuduscript"; + packageName = "kuduscript"; + version = "1.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; - sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; + url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.16.tgz"; + sha512 = "2pws4jvqqdysxbqb5bw1m67wklk7lrxl293q5w9cd58drz6jzs4qzgiy6gg7dzx9m2pgn9kqxns8pw445d68ncqk2nxpdcimnnsbszv"; }; }; - "cookie-parser-1.3.5" = { - name = "cookie-parser"; - packageName = "cookie-parser"; - version = "1.3.5"; + "labeled-stream-splicer-2.0.1" = { + name = "labeled-stream-splicer"; + packageName = "labeled-stream-splicer"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz"; - sha1 = "9d755570fb5d17890771227a02314d9be7cf8356"; + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz"; + sha512 = "0z3ssjaq1bx4j1dcysbbmsnq24zglv2gdsm3by6dr34w10jrlg06rrh3l7qa8a3ch7ag9gmkjfrw6m448sra299gz5rvg2ifsc7hbrh"; }; }; - "compression-1.5.2" = { - name = "compression"; - packageName = "compression"; - version = "1.5.2"; + "last-one-wins-1.0.4" = { + name = "last-one-wins"; + packageName = "last-one-wins"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; - sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; + url = "https://registry.npmjs.org/last-one-wins/-/last-one-wins-1.0.4.tgz"; + sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a"; }; }; - "connect-timeout-1.6.2" = { - name = "connect-timeout"; - packageName = "connect-timeout"; - version = "1.6.2"; + "latest-version-1.0.1" = { + name = "latest-version"; + packageName = "latest-version"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz"; - sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e"; + url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz"; + sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; }; }; - "csurf-1.8.3" = { - name = "csurf"; - packageName = "csurf"; - version = "1.8.3"; + "latest-version-2.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz"; - sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a"; + url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; + sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; }; }; - "errorhandler-1.4.3" = { - name = "errorhandler"; - packageName = "errorhandler"; - version = "1.4.3"; + "latest-version-3.1.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz"; - sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f"; + url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz"; + sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; }; }; - "express-session-1.11.3" = { - name = "express-session"; - packageName = "express-session"; - version = "1.11.3"; + "lazy-1.0.11" = { + name = "lazy"; + packageName = "lazy"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz"; - sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; + url = "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz"; + sha1 = "daa068206282542c088288e975c297c1ae77b690"; }; }; - "finalhandler-0.4.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.4.0"; + "lazy-cache-0.2.7" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; - sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"; + sha1 = "7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"; }; }; - "http-errors-1.3.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.3.1"; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; - sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; - "morgan-1.6.1" = { - name = "morgan"; - packageName = "morgan"; - version = "1.6.1"; + "lazystream-1.0.0" = { + name = "lazystream"; + packageName = "lazystream"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; - sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; + url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz"; + sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; }; }; - "multiparty-3.3.2" = { - name = "multiparty"; - packageName = "multiparty"; - version = "3.3.2"; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; - sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; }; - "pause-0.1.0" = { - name = "pause"; - packageName = "pause"; - version = "0.1.0"; + "leek-0.0.24" = { + name = "leek"; + packageName = "leek"; + version = "0.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz"; - sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74"; + url = "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz"; + sha1 = "e400e57f0e60d8ef2bd4d068dc428a54345dbcda"; }; }; - "qs-4.0.0" = { - name = "qs"; - packageName = "qs"; - version = "4.0.0"; + "length-prefixed-message-3.0.3" = { + name = "length-prefixed-message"; + packageName = "length-prefixed-message"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; - sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; + url = "https://registry.npmjs.org/length-prefixed-message/-/length-prefixed-message-3.0.3.tgz"; + sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; }; }; - "response-time-2.3.2" = { - name = "response-time"; - packageName = "response-time"; - version = "2.3.2"; + "less-2.7.3" = { + name = "less"; + packageName = "less"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; - sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; + url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; + sha512 = "04jbm6adzhknlcwjjdd94n8dhqwgsg0fyampis9854jf23z9g9lxs8593908ymwldl88bjipf9b9rw6xfibb29vv7s0c44wllj4ixr8"; }; }; - "serve-favicon-2.3.2" = { - name = "serve-favicon"; - packageName = "serve-favicon"; - version = "2.3.2"; + "less-middleware-2.2.1" = { + name = "less-middleware"; + packageName = "less-middleware"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; - sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; + url = "https://registry.npmjs.org/less-middleware/-/less-middleware-2.2.1.tgz"; + sha512 = "059c8rz6wkzc3fwd62a6f3lfw3h9sxj2fr0jjyr1i9kwfvk3737xyzndyshklllx5gnfri9z2g9a28c2ccnd6ka6adn6i7h4z5frw6m"; }; }; - "serve-index-1.7.3" = { - name = "serve-index"; - packageName = "serve-index"; - version = "1.7.3"; + "level-0.18.0" = { + name = "level"; + packageName = "level"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz"; - sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2"; + url = "https://registry.npmjs.org/level/-/level-0.18.0.tgz"; + sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; }; }; - "serve-static-1.10.3" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.10.3"; + "level-packager-0.18.0" = { + name = "level-packager"; + packageName = "level-packager"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz"; - sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; + url = "https://registry.npmjs.org/level-packager/-/level-packager-0.18.0.tgz"; + sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5"; }; }; - "vhost-3.0.2" = { - name = "vhost"; - packageName = "vhost"; - version = "3.0.2"; + "level-post-1.0.7" = { + name = "level-post"; + packageName = "level-post"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz"; - sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; + url = "https://registry.npmjs.org/level-post/-/level-post-1.0.7.tgz"; + sha512 = "1xwlwdkqryzw8bd0ywmjnlrcd85c88hrcf8r245377p52cwvgcrjsajg5w8zpx1d236v6043v4c3a29lcbyqmxqmh7apl9lhhdjlrix"; }; }; - "iconv-lite-0.4.11" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.11"; + "level-sublevel-6.6.1" = { + name = "level-sublevel"; + packageName = "level-sublevel"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; - sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; + url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.1.tgz"; + sha1 = "f9a77f7521ab70a8f8e92ed56f21a3c7886a4485"; }; }; - "raw-body-2.1.7" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.1.7"; + "leveldown-0.10.6" = { + name = "leveldown"; + packageName = "leveldown"; + version = "0.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; - sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; + url = "https://registry.npmjs.org/leveldown/-/leveldown-0.10.6.tgz"; + sha1 = "a1bb751c95263ff60f41bde0f973ff8c1e98bbe9"; }; }; - "bytes-2.4.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.4.0"; + "levelup-0.18.6" = { + name = "levelup"; + packageName = "levelup"; + version = "0.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; - sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; + url = "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz"; + sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb"; }; }; - "iconv-lite-0.4.13" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.13"; + "levelup-0.19.1" = { + name = "levelup"; + packageName = "levelup"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; - sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; + url = "https://registry.npmjs.org/levelup/-/levelup-0.19.1.tgz"; + sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; - "csrf-3.0.6" = { - name = "csrf"; - packageName = "csrf"; - version = "3.0.6"; + "leven-1.0.2" = { + name = "leven"; + packageName = "leven"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz"; - sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a"; + url = "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz"; + sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3"; }; }; - "rndm-1.2.0" = { - name = "rndm"; - packageName = "rndm"; - version = "1.2.0"; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; - sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; }; }; - "tsscmp-1.0.5" = { - name = "tsscmp"; - packageName = "tsscmp"; - version = "1.0.5"; + "lexical-scope-1.2.0" = { + name = "lexical-scope"; + packageName = "lexical-scope"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; - sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; + url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; + sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; }; }; - "uid-safe-2.1.4" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.1.4"; + "lexicographic-integer-1.1.0" = { + name = "lexicographic-integer"; + packageName = "lexicographic-integer"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz"; - sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"; + url = "https://registry.npmjs.org/lexicographic-integer/-/lexicographic-integer-1.1.0.tgz"; + sha1 = "52ca6d998a572e6322b515f5b80e396c6043e9b8"; }; }; - "random-bytes-1.0.0" = { - name = "random-bytes"; - packageName = "random-bytes"; - version = "1.0.0"; + "libbase64-0.1.0" = { + name = "libbase64"; + packageName = "libbase64"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; - sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; + url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"; + sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6"; }; }; - "crc-3.3.0" = { - name = "crc"; - packageName = "crc"; - version = "3.3.0"; + "libmime-1.2.0" = { + name = "libmime"; + packageName = "libmime"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz"; - sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba"; + url = "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz"; + sha1 = "8d84b4f3b225b3704410236ef494906436ba742b"; }; }; - "uid-safe-2.0.0" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.0.0"; + "libmime-3.0.0" = { + name = "libmime"; + packageName = "libmime"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz"; - sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137"; + url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz"; + sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; }; }; - "base64-url-1.2.1" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.2.1"; + "libqp-1.1.0" = { + name = "libqp"; + packageName = "libqp"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; - sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; + url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; + sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; }; }; - "stream-counter-0.2.0" = { - name = "stream-counter"; - packageName = "stream-counter"; - version = "0.2.0"; + "libquassel-2.1.9" = { + name = "libquassel"; + packageName = "libquassel"; + version = "2.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; - sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; + url = "https://registry.npmjs.org/libquassel/-/libquassel-2.1.9.tgz"; + sha1 = "e80ad2ef5c081ac677f66515d107537fdc0f5c64"; }; }; - "batch-0.5.3" = { - name = "batch"; - packageName = "batch"; - version = "0.5.3"; + "liftoff-2.5.0" = { + name = "liftoff"; + packageName = "liftoff"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"; - sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464"; + url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz"; + sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; }; }; - "send-0.13.2" = { - name = "send"; - packageName = "send"; - version = "0.13.2"; + "limitation-0.2.0" = { + name = "limitation"; + packageName = "limitation"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz"; - sha1 = "765e7607c8055452bba6f0b052595350986036de"; + url = "https://registry.npmjs.org/limitation/-/limitation-0.2.0.tgz"; + sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62"; }; }; - "mime-1.3.4" = { - name = "mime"; - packageName = "mime"; - version = "1.3.4"; + "linewise-0.0.3" = { + name = "linewise"; + packageName = "linewise"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + url = "https://registry.npmjs.org/linewise/-/linewise-0.0.3.tgz"; + sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; - "statuses-1.2.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.2.1"; + "linkify-it-1.2.4" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; - sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz"; + sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a"; }; }; - "passport-strategy-1.0.0" = { - name = "passport-strategy"; - packageName = "passport-strategy"; - version = "1.0.0"; + "linkify-it-2.0.3" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; - sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz"; + sha1 = "d94a4648f9b1c179d64fa97291268bdb6ce9434f"; }; }; - "pause-0.0.1" = { - name = "pause"; - packageName = "pause"; - version = "0.0.1"; + "listify-1.0.0" = { + name = "listify"; + packageName = "listify"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; - sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + url = "https://registry.npmjs.org/listify/-/listify-1.0.0.tgz"; + sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3"; }; }; - "passport-google-oauth1-1.0.0" = { - name = "passport-google-oauth1"; - packageName = "passport-google-oauth1"; - version = "1.0.0"; + "livereload-js-2.3.0" = { + name = "livereload-js"; + packageName = "livereload-js"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz"; - sha1 = "af74a803df51ec646f66a44d82282be6f108e0cc"; + url = "https://registry.npmjs.org/livereload-js/-/livereload-js-2.3.0.tgz"; + sha512 = "0r82qh90jnyg6hlqn2yni36q942y4qn6rc0rydmbsy7x1lr00a0pddw2lg8xixcjh6wnrsfb5q76m51fac7vanrz0cawsw6azy78m4g"; }; }; - "passport-google-oauth20-1.0.0" = { - name = "passport-google-oauth20"; - packageName = "passport-google-oauth20"; - version = "1.0.0"; + "load-ip-set-1.3.1" = { + name = "load-ip-set"; + packageName = "load-ip-set"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-1.0.0.tgz"; - sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0"; + url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-1.3.1.tgz"; + sha1 = "cfd050c6916e7ba0ca85d0b566e7854713eb495e"; }; }; - "passport-oauth1-1.1.0" = { - name = "passport-oauth1"; - packageName = "passport-oauth1"; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.1.0.tgz"; - sha1 = "a7de988a211f9cf4687377130ea74df32730c918"; + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; }; }; - "oauth-0.9.15" = { - name = "oauth"; - packageName = "oauth"; - version = "0.9.15"; + "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/oauth/-/oauth-0.9.15.tgz"; - sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1"; + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; }; }; - "passport-oauth2-1.4.0" = { - name = "passport-oauth2"; - packageName = "passport-oauth2"; - version = "1.4.0"; + "load-json-file-4.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz"; - sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad"; + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; }; }; - "uid2-0.0.3" = { - name = "uid2"; - packageName = "uid2"; - version = "0.0.3"; + "loader-runner-2.3.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"; - sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz"; + sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; }; }; - "cmd-shim-2.0.2" = { - name = "cmd-shim"; - packageName = "cmd-shim"; - version = "2.0.2"; + "loader-utils-1.1.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz"; - sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; + sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; }; }; - "columnify-1.5.4" = { - name = "columnify"; - packageName = "columnify"; - version = "1.5.4"; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz"; - sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; }; }; - "command-join-2.0.0" = { - name = "command-join"; - packageName = "command-join"; - version = "2.0.0"; + "lockfile-1.0.3" = { + name = "lockfile"; + packageName = "lockfile"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/command-join/-/command-join-2.0.0.tgz"; - sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf"; + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; + sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; }; }; - "conventional-changelog-cli-1.3.5" = { - name = "conventional-changelog-cli"; - packageName = "conventional-changelog-cli"; - version = "1.3.5"; + "lodash-1.0.2" = { + name = "lodash"; + packageName = "lodash"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.5.tgz"; - sha1 = "46c51496216b7406588883defa6fac589e9bb31e"; + url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; + sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; }; }; - "conventional-recommended-bump-1.0.3" = { - name = "conventional-recommended-bump"; - packageName = "conventional-recommended-bump"; - version = "1.0.3"; + "lodash-2.4.2" = { + name = "lodash"; + packageName = "lodash"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.3.tgz"; - sha1 = "472b69b1b8f09c5c4ed40fe28a41e63cc04bd736"; + url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; + sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; }; }; - "dedent-0.7.0" = { - name = "dedent"; - packageName = "dedent"; - version = "0.7.0"; + "lodash-3.1.0" = { + name = "lodash"; + packageName = "lodash"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"; - sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; + url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; + sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; }; }; - "fs-extra-4.0.2" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "4.0.2"; + "lodash-3.10.1" = { + name = "lodash"; + packageName = "lodash"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz"; - sha1 = "f91704c53d1b461f893452b0c307d9997647ab6b"; + url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; + sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; }; }; - "get-port-3.2.0" = { - name = "get-port"; - packageName = "get-port"; - version = "3.2.0"; + "lodash-3.7.0" = { + name = "lodash"; + packageName = "lodash"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz"; - sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; + url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; + sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; }; }; - "glob-parent-3.1.0" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "3.1.0"; + "lodash-4.13.1" = { + name = "lodash"; + packageName = "lodash"; + version = "4.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; - sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"; + sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68"; }; }; - "globby-6.1.0" = { - name = "globby"; - packageName = "globby"; - version = "6.1.0"; + "lodash-4.14.2" = { + name = "lodash"; + packageName = "lodash"; + version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz"; + sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432"; }; }; - "is-ci-1.0.10" = { - name = "is-ci"; - packageName = "is-ci"; - version = "1.0.10"; + "lodash-4.17.5" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; - sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; + sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; - "load-json-file-3.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "3.0.0"; + "lodash-4.2.1" = { + name = "lodash"; + packageName = "lodash"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-3.0.0.tgz"; - sha1 = "7eb3735d983a7ed2262ade4ff769af5369c5c440"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"; + sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9"; }; }; - "npmlog-4.1.2" = { - name = "npmlog"; - packageName = "npmlog"; - version = "4.1.2"; + "lodash-id-0.14.0" = { + name = "lodash-id"; + packageName = "lodash-id"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; + url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.14.0.tgz"; + sha1 = "baf48934e543a1b5d6346f8c84698b1a8c803896"; }; }; - "read-cmd-shim-1.0.1" = { - name = "read-cmd-shim"; - packageName = "read-cmd-shim"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; - sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; + "lodash._baseassign-3.2.0" = { + name = "lodash._baseassign"; + packageName = "lodash._baseassign"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; + sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; }; }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "2.0.0"; + "lodash._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; }; }; - "strong-log-transformer-1.0.6" = { - name = "strong-log-transformer"; - packageName = "strong-log-transformer"; - version = "1.0.6"; + "lodash._basecopy-3.0.1" = { + name = "lodash._basecopy"; + packageName = "lodash._basecopy"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz"; - sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; + url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; + sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; }; }; - "temp-write-3.3.0" = { - name = "temp-write"; - packageName = "temp-write"; - version = "3.3.0"; + "lodash._basetostring-3.0.1" = { + name = "lodash._basetostring"; + packageName = "lodash._basetostring"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/temp-write/-/temp-write-3.3.0.tgz"; - sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9"; + url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"; + sha1 = "d1861d877f824a52f669832dcaf3ee15566a07d5"; }; }; - "write-json-file-2.3.0" = { - name = "write-json-file"; - packageName = "write-json-file"; - version = "2.3.0"; + "lodash._basevalues-3.0.0" = { + name = "lodash._basevalues"; + packageName = "lodash._basevalues"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz"; - sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f"; + url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; + sha1 = "5b775762802bde3d3297503e26300820fdf661b7"; }; }; - "write-pkg-3.1.0" = { - name = "write-pkg"; - packageName = "write-pkg"; - version = "3.1.0"; + "lodash._bindcallback-3.0.1" = { + name = "lodash._bindcallback"; + packageName = "lodash._bindcallback"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz"; - sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9"; + url = "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"; + sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e"; }; }; - "yargs-8.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "8.0.2"; + "lodash._createassigner-3.1.1" = { + name = "lodash._createassigner"; + packageName = "lodash._createassigner"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + url = "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz"; + sha1 = "838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"; }; }; - "add-stream-1.0.0" = { - name = "add-stream"; - packageName = "add-stream"; - version = "1.0.0"; + "lodash._getnative-3.9.1" = { + name = "lodash._getnative"; + packageName = "lodash._getnative"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"; - sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; + url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; + sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; }; }; - "conventional-changelog-1.1.7" = { - name = "conventional-changelog"; - packageName = "conventional-changelog"; - version = "1.1.7"; + "lodash._isiterateecall-3.0.9" = { + name = "lodash._isiterateecall"; + packageName = "lodash._isiterateecall"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.7.tgz"; - sha1 = "9151a62b1d8edb2d82711dabf5b7cf71041f82b1"; + url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; + sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; }; }; - "tempfile-1.1.1" = { - name = "tempfile"; - packageName = "tempfile"; - version = "1.1.1"; + "lodash._reescape-3.0.0" = { + name = "lodash._reescape"; + packageName = "lodash._reescape"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"; - sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; + url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; + sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"; }; }; - "conventional-changelog-angular-1.5.2" = { - name = "conventional-changelog-angular"; - packageName = "conventional-changelog-angular"; - version = "1.5.2"; + "lodash._reevaluate-3.0.0" = { + name = "lodash._reevaluate"; + packageName = "lodash._reevaluate"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.2.tgz"; - sha1 = "2b38f665fe9c5920af1a2f82f547f4babe6de57c"; + url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; + sha1 = "58bc74c40664953ae0b124d806996daca431e2ed"; }; }; - "conventional-changelog-atom-0.1.2" = { - name = "conventional-changelog-atom"; - packageName = "conventional-changelog-atom"; - version = "0.1.2"; + "lodash._reinterpolate-3.0.0" = { + name = "lodash._reinterpolate"; + packageName = "lodash._reinterpolate"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.2.tgz"; - sha1 = "12595ad5267a6937c34cf900281b1c65198a4c63"; + url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; + sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; }; }; - "conventional-changelog-codemirror-0.2.1" = { - name = "conventional-changelog-codemirror"; - packageName = "conventional-changelog-codemirror"; - version = "0.2.1"; + "lodash._root-3.0.1" = { + name = "lodash._root"; + packageName = "lodash._root"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.1.tgz"; - sha1 = "299a4f7147baf350e6c8158fc54954a291c5cc09"; + url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; + sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; }; }; - "conventional-changelog-core-1.9.3" = { - name = "conventional-changelog-core"; - packageName = "conventional-changelog-core"; - version = "1.9.3"; + "lodash.assign-3.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.3.tgz"; - sha1 = "2899fe779389a329f0ec4b2746c36ddefb98da2d"; + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"; + sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"; }; }; - "conventional-changelog-ember-0.2.9" = { - name = "conventional-changelog-ember"; - packageName = "conventional-changelog-ember"; - version = "0.2.9"; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.9.tgz"; - sha1 = "8ec73cc054e3ab064667fb1feb52fe8ef1b16438"; + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; }; }; - "conventional-changelog-eslint-0.2.1" = { - name = "conventional-changelog-eslint"; - packageName = "conventional-changelog-eslint"; - version = "0.2.1"; + "lodash.assignin-4.2.0" = { + name = "lodash.assignin"; + packageName = "lodash.assignin"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.1.tgz"; - sha1 = "2c2a11beb216f80649ba72834180293b687c0662"; + url = "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz"; + sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"; }; }; - "conventional-changelog-express-0.2.1" = { - name = "conventional-changelog-express"; - packageName = "conventional-changelog-express"; - version = "0.2.1"; + "lodash.bind-4.2.1" = { + name = "lodash.bind"; + packageName = "lodash.bind"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.1.tgz"; - sha1 = "838d9e1e6c9099703b150b9c19aa2d781742bd6c"; + url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz"; + sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; }; }; - "conventional-changelog-jquery-0.1.0" = { - name = "conventional-changelog-jquery"; - packageName = "conventional-changelog-jquery"; - version = "0.1.0"; + "lodash.clone-4.3.2" = { + name = "lodash.clone"; + packageName = "lodash.clone"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz"; - sha1 = "0208397162e3846986e71273b6c79c5b5f80f510"; + url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz"; + sha1 = "e56b176b6823a7dde38f7f2bf58de7d5971200e9"; }; }; - "conventional-changelog-jscs-0.1.0" = { - name = "conventional-changelog-jscs"; - packageName = "conventional-changelog-jscs"; - version = "0.1.0"; + "lodash.clonedeep-4.5.0" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz"; - sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "conventional-changelog-jshint-0.2.1" = { - name = "conventional-changelog-jshint"; - packageName = "conventional-changelog-jshint"; - version = "0.2.1"; + "lodash.debounce-3.1.1" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.1.tgz"; - sha1 = "86139bb3ac99899f2b177e9617e09b37d99bcf3a"; + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz"; + sha1 = "812211c378a94cc29d5aa4e3346cf0bfce3a7df5"; }; }; - "compare-func-1.3.2" = { - name = "compare-func"; - packageName = "compare-func"; - version = "1.3.2"; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz"; - sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648"; + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; }; }; - "array-ify-1.0.0" = { - name = "array-ify"; - packageName = "array-ify"; - version = "1.0.0"; + "lodash.defaults-4.2.0" = { + name = "lodash.defaults"; + packageName = "lodash.defaults"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; - sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; + url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; }; }; - "conventional-changelog-writer-2.0.2" = { - name = "conventional-changelog-writer"; - packageName = "conventional-changelog-writer"; - version = "2.0.2"; + "lodash.defaultsdeep-4.6.0" = { + name = "lodash.defaultsdeep"; + packageName = "lodash.defaultsdeep"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.2.tgz"; - sha1 = "b5857ded1b001daf9a78b9cd40926f45c134949b"; + url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz"; + sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81"; }; }; - "conventional-commits-parser-2.0.1" = { - name = "conventional-commits-parser"; - packageName = "conventional-commits-parser"; - version = "2.0.1"; + "lodash.escape-3.2.0" = { + name = "lodash.escape"; + packageName = "lodash.escape"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.1.tgz"; - sha1 = "1f15ce6b844f7ca41495c8190c0833c30b8b1693"; + url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"; + sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; }; }; - "dateformat-1.0.12" = { - name = "dateformat"; - packageName = "dateformat"; - version = "1.0.12"; + "lodash.escaperegexp-4.1.2" = { + name = "lodash.escaperegexp"; + packageName = "lodash.escaperegexp"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; - sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; + sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; }; }; - "get-pkg-repo-1.4.0" = { - name = "get-pkg-repo"; - packageName = "get-pkg-repo"; - version = "1.4.0"; + "lodash.filter-4.6.0" = { + name = "lodash.filter"; + packageName = "lodash.filter"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz"; - sha1 = "c73b489c06d80cc5536c2c853f9e05232056972d"; + url = "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz"; + sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; - "git-raw-commits-1.3.0" = { - name = "git-raw-commits"; - packageName = "git-raw-commits"; - version = "1.3.0"; + "lodash.flatten-4.4.0" = { + name = "lodash.flatten"; + packageName = "lodash.flatten"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.0.tgz"; - sha1 = "0bc8596e90d5ffe736f7f5546bd2d12f73abaac6"; + url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; }; }; - "git-remote-origin-url-2.0.0" = { - name = "git-remote-origin-url"; - packageName = "git-remote-origin-url"; - version = "2.0.0"; + "lodash.flattendeep-4.4.0" = { + name = "lodash.flattendeep"; + packageName = "lodash.flattendeep"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz"; - sha1 = "5282659dae2107145a11126112ad3216ec5fa65f"; + url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; }; }; - "git-semver-tags-1.2.3" = { - name = "git-semver-tags"; - packageName = "git-semver-tags"; - version = "1.2.3"; + "lodash.foreach-4.5.0" = { + name = "lodash.foreach"; + packageName = "lodash.foreach"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.3.tgz"; - sha1 = "188b453882bf9d7a23afd31baba537dab7388d5d"; + url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz"; + sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53"; }; }; - "conventional-commits-filter-1.1.0" = { - name = "conventional-commits-filter"; - packageName = "conventional-commits-filter"; - version = "1.1.0"; + "lodash.get-4.4.2" = { + name = "lodash.get"; + packageName = "lodash.get"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.0.tgz"; - sha1 = "1fc29af30b5edab76f54e229c411b0c663d0f9eb"; + url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; }; }; - "split-1.0.1" = { - name = "split"; - packageName = "split"; - version = "1.0.1"; + "lodash.groupby-4.6.0" = { + name = "lodash.groupby"; + packageName = "lodash.groupby"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; - sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r"; + url = "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz"; + sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; }; }; - "is-subset-0.1.1" = { - name = "is-subset"; - packageName = "is-subset"; - version = "0.1.1"; + "lodash.has-4.5.2" = { + name = "lodash.has"; + packageName = "lodash.has"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz"; - sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; + url = "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz"; + sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; }; }; - "modify-values-1.0.0" = { - name = "modify-values"; - packageName = "modify-values"; - version = "1.0.0"; + "lodash.isarguments-3.1.0" = { + name = "lodash.isarguments"; + packageName = "lodash.isarguments"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz"; - sha1 = "e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"; + url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; + sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; }; }; - "is-text-path-1.0.1" = { - name = "is-text-path"; - packageName = "is-text-path"; - version = "1.0.1"; + "lodash.isarray-3.0.4" = { + name = "lodash.isarray"; + packageName = "lodash.isarray"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz"; - sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; + url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; + sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; }; }; - "trim-off-newlines-1.0.1" = { - name = "trim-off-newlines"; - packageName = "trim-off-newlines"; - version = "1.0.1"; + "lodash.isequal-4.5.0" = { + name = "lodash.isequal"; + packageName = "lodash.isequal"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz"; - sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; - "text-extensions-1.7.0" = { - name = "text-extensions"; - packageName = "text-extensions"; - version = "1.7.0"; + "lodash.isplainobject-4.0.6" = { + name = "lodash.isplainobject"; + packageName = "lodash.isplainobject"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz"; - sha512 = "015f82dnl58mcjf4c86lxlf2j66nhvnif56475x720bl73pkx3pvds7g2njz19ksbmbqag25rl4wij1xb6yd3in9cd4bpxn79wdk980"; + url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; }; }; - "parse-github-repo-url-1.4.1" = { - name = "parse-github-repo-url"; - packageName = "parse-github-repo-url"; - version = "1.4.1"; + "lodash.isstring-4.0.1" = { + name = "lodash.isstring"; + packageName = "lodash.isstring"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz"; - sha1 = "9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"; + url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; + sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; - "dargs-4.1.0" = { - name = "dargs"; - packageName = "dargs"; - version = "4.1.0"; + "lodash.keys-3.1.2" = { + name = "lodash.keys"; + packageName = "lodash.keys"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz"; - sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"; + url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"; + sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; }; }; - "lodash.template-4.4.0" = { - name = "lodash.template"; - packageName = "lodash.template"; - version = "4.4.0"; + "lodash.map-4.6.0" = { + name = "lodash.map"; + packageName = "lodash.map"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz"; - sha1 = "e73a0385c8355591746e020b99679c690e68fba0"; + url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz"; + sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; - "lodash.templatesettings-4.1.0" = { - name = "lodash.templatesettings"; - packageName = "lodash.templatesettings"; - version = "4.1.0"; + "lodash.memoize-3.0.4" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz"; - sha1 = "2b4d4e95ba440d915ff08bc899e4553666713316"; + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; + sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "gitconfiglocal-1.0.0" = { - name = "gitconfiglocal"; - packageName = "gitconfiglocal"; - version = "1.0.0"; + "lodash.merge-4.6.1" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz"; - sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b"; + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz"; + sha512 = "0lv358i7xyg1hn90fk3xzih5kmj1zlmr759g0hh9fa7npbik629q8h5jd2lvjnrm76ciz92k0yn5z6vcqdbgws1zzsrqzw7ixmk7rh0"; }; }; - "jsonfile-4.0.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "4.0.0"; + "lodash.mergewith-4.6.1" = { + name = "lodash.mergewith"; + packageName = "lodash.mergewith"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz"; + sha512 = "1swsfrcjr7yv5bkxi47mfjyrl5c8d2c8s4m01qpnffgnjnl9mbri6i9ys9gvwq0drsqszzrmq0rlglmc6c17h8a0r22n86qwfpkjv3r"; }; }; - "is-glob-3.1.0" = { - name = "is-glob"; - packageName = "is-glob"; - version = "3.1.0"; + "lodash.once-4.1.1" = { + name = "lodash.once"; + packageName = "lodash.once"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; + sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; }; }; - "path-dirname-1.0.2" = { - name = "path-dirname"; - packageName = "path-dirname"; - version = "1.0.2"; + "lodash.pad-4.5.1" = { + name = "lodash.pad"; + packageName = "lodash.pad"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; - sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz"; + sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70"; }; }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; + "lodash.padend-4.6.1" = { + name = "lodash.padend"; + packageName = "lodash.padend"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz"; + sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e"; }; }; - "parse-json-3.0.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "3.0.0"; + "lodash.padstart-4.6.1" = { + name = "lodash.padstart"; + packageName = "lodash.padstart"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz"; - sha1 = "fa6f47b18e23826ead32f263e744d0e1e847fb13"; + url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz"; + sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; }; }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; + "lodash.pick-4.4.0" = { + name = "lodash.pick"; + packageName = "lodash.pick"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; }; }; - "are-we-there-yet-1.1.4" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "1.1.4"; + "lodash.reduce-4.6.0" = { + name = "lodash.reduce"; + packageName = "lodash.reduce"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; - sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; + url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; + sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; }; }; - "console-control-strings-1.1.0" = { - name = "console-control-strings"; - packageName = "console-control-strings"; - version = "1.1.0"; + "lodash.reject-4.6.0" = { + name = "lodash.reject"; + packageName = "lodash.reject"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz"; + sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; }; }; - "gauge-2.7.4" = { - name = "gauge"; - packageName = "gauge"; - version = "2.7.4"; + "lodash.restparam-3.6.1" = { + name = "lodash.restparam"; + packageName = "lodash.restparam"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"; + sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; }; }; - "delegates-1.0.0" = { - name = "delegates"; - packageName = "delegates"; - version = "1.0.0"; + "lodash.some-4.6.0" = { + name = "lodash.some"; + packageName = "lodash.some"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz"; + sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d"; }; }; - "aproba-1.2.0" = { - name = "aproba"; - packageName = "aproba"; - version = "1.2.0"; + "lodash.sortby-4.7.0" = { + name = "lodash.sortby"; + packageName = "lodash.sortby"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; + url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; }; }; - "has-unicode-2.0.1" = { - name = "has-unicode"; - packageName = "has-unicode"; - version = "2.0.1"; + "lodash.template-3.6.2" = { + name = "lodash.template"; + packageName = "lodash.template"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"; + sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f"; }; }; - "wide-align-1.1.2" = { - name = "wide-align"; - packageName = "wide-align"; - version = "1.1.2"; + "lodash.template-4.4.0" = { + name = "lodash.template"; + packageName = "lodash.template"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"; - sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz"; + sha1 = "e73a0385c8355591746e020b99679c690e68fba0"; }; }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; + "lodash.templatesettings-3.1.1" = { + name = "lodash.templatesettings"; + packageName = "lodash.templatesettings"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"; + sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5"; }; }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; + "lodash.templatesettings-4.1.0" = { + name = "lodash.templatesettings"; + packageName = "lodash.templatesettings"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz"; + sha1 = "2b4d4e95ba440d915ff08bc899e4553666713316"; }; }; - "byline-5.0.0" = { - name = "byline"; - packageName = "byline"; - version = "5.0.0"; + "lodash.throttle-4.1.1" = { + name = "lodash.throttle"; + packageName = "lodash.throttle"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; - sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; + sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; }; }; - "minimist-0.1.0" = { - name = "minimist"; - packageName = "minimist"; - version = "0.1.0"; + "lodash.uniq-4.5.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; - sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "temp-dir-1.0.0" = { - name = "temp-dir"; - packageName = "temp-dir"; - version = "1.0.0"; + "log-symbols-1.0.2" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"; - sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; + sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; }; }; - "detect-indent-5.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "5.0.0"; + "log-symbols-2.2.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; - sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; + sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm"; }; }; - "sort-keys-2.0.0" = { - name = "sort-keys"; - packageName = "sort-keys"; - version = "2.0.0"; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; }; }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; + "log-update-2.3.0" = { + name = "log-update"; + packageName = "log-update"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; + sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "yargs-parser-7.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "7.0.0"; + "log4js-2.5.3" = { + name = "log4js"; + packageName = "log4js"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; - sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + url = "https://registry.npmjs.org/log4js/-/log4js-2.5.3.tgz"; + sha512 = "29zsw029b55hq8a7c5hrqwf4ka97sai18wn4vpxhzgg61jisclhcxlfm4m219iz3j3kqfkyb3k76dmwvqm2ivk6b4iavd2q7jjymgv0"; }; }; - "vinyl-1.2.0" = { - name = "vinyl"; - packageName = "vinyl"; - version = "1.2.0"; + "loggly-1.1.1" = { + name = "loggly"; + packageName = "loggly"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz"; - sha1 = "5c88036cf565e5df05558bfc911f8656df218884"; + url = "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz"; + sha1 = "0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"; }; }; - "vinyl-fs-2.4.4" = { - name = "vinyl-fs"; - packageName = "vinyl-fs"; - version = "2.4.4"; + "lokijs-1.5.3" = { + name = "lokijs"; + packageName = "lokijs"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz"; - sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239"; + url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.3.tgz"; + sha1 = "6952722ffa3049a55a5e1c10ee4a0947a3e5e19b"; }; }; - "glob-stream-5.3.5" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "5.3.5"; + "long-2.4.0" = { + name = "long"; + packageName = "long"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; - sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; + url = "https://registry.npmjs.org/long/-/long-2.4.0.tgz"; + sha1 = "9fa180bb1d9500cdc29c4156766a1995e1f4524f"; }; }; - "gulp-sourcemaps-1.6.0" = { - name = "gulp-sourcemaps"; - packageName = "gulp-sourcemaps"; - version = "1.6.0"; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz"; - sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"; + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; }; }; - "is-valid-glob-0.3.0" = { - name = "is-valid-glob"; - packageName = "is-valid-glob"; - version = "0.3.0"; + "longest-streak-1.0.0" = { + name = "longest-streak"; + packageName = "longest-streak"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz"; - sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe"; + url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz"; + sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965"; }; }; - "merge-stream-1.0.1" = { - name = "merge-stream"; - packageName = "merge-stream"; - version = "1.0.1"; + "longjohn-0.2.11" = { + name = "longjohn"; + packageName = "longjohn"; + version = "0.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"; - sha1 = "4041202d508a342ba00174008df0c251b8c135e1"; + url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; + sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; }; }; - "strip-bom-stream-1.0.0" = { - name = "strip-bom-stream"; - packageName = "strip-bom-stream"; - version = "1.0.0"; + "looper-2.0.0" = { + name = "looper"; + packageName = "looper"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz"; - sha1 = "e7144398577d51a6bed0fa1994fa05f43fd988ee"; + url = "https://registry.npmjs.org/looper/-/looper-2.0.0.tgz"; + sha1 = "66cd0c774af3d4fedac53794f742db56da8f09ec"; }; }; - "through2-filter-2.0.0" = { - name = "through2-filter"; - packageName = "through2-filter"; - version = "2.0.0"; + "looper-3.0.0" = { + name = "looper"; + packageName = "looper"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz"; - sha1 = "60bc55a0dacb76085db1f9dae99ab43f83d622ec"; + url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz"; + sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; }; }; - "vali-date-1.0.0" = { - name = "vali-date"; - packageName = "vali-date"; - version = "1.0.0"; + "loose-envify-1.3.1" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz"; - sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; + sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; }; }; - "ordered-read-streams-0.3.0" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "0.3.0"; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz"; - sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b"; + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; }; }; - "to-absolute-glob-0.1.1" = { - name = "to-absolute-glob"; - packageName = "to-absolute-glob"; - version = "0.1.1"; + "lowdb-0.15.5" = { + name = "lowdb"; + packageName = "lowdb"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz"; - sha1 = "1cdfa472a9ef50c239ee66999b662ca0eb39937f"; + url = "https://registry.npmjs.org/lowdb/-/lowdb-0.15.5.tgz"; + sha1 = "9ade105df8aa573692d1221622b85414fbf4fa96"; }; }; - "unique-stream-2.2.1" = { - name = "unique-stream"; - packageName = "unique-stream"; - version = "2.2.1"; + "lower-case-1.1.4" = { + name = "lower-case"; + packageName = "lower-case"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz"; - sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"; + url = "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz"; + sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; }; }; - "extend-shallow-2.0.1" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "2.0.1"; + "lowercase-keys-1.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; }; }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; 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/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; }; }; - "markdown-it-8.4.0" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "8.4.0"; + "lru-2.0.1" = { + name = "lru"; + packageName = "lru"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz"; - sha512 = "0c0jpdfbi4fmqyjc2ilwvinxyc8rn4p9j7fwshh2c00nkc0q2lh6yw2dgragvnpy8bjhcwa1hlfy2ih2ih3np78wrpqx7gf4w48xnxl"; + url = "https://registry.npmjs.org/lru/-/lru-2.0.1.tgz"; + sha1 = "f979871e162e3f5ca254be46844c53d4c5364544"; }; }; - "markdown-it-emoji-1.4.0" = { - name = "markdown-it-emoji"; - packageName = "markdown-it-emoji"; - version = "1.4.0"; + "lru-3.1.0" = { + name = "lru"; + packageName = "lru"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz"; - sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"; + url = "https://registry.npmjs.org/lru/-/lru-3.1.0.tgz"; + sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5"; }; }; - "markdown-it-github-headings-1.0.1" = { - name = "markdown-it-github-headings"; - packageName = "markdown-it-github-headings"; - version = "1.0.1"; + "lru-cache-2.2.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.0.1.tgz"; - sha1 = "ac3e694de3fa3f0296961f4057f5160143fc2710"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz"; + sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; }; }; - "markdown-it-task-checkbox-1.0.4" = { - name = "markdown-it-task-checkbox"; - packageName = "markdown-it-task-checkbox"; - version = "1.0.4"; + "lru-cache-2.5.2" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.4.tgz"; - sha1 = "183d2d81cf2b8e4de1b91bab73a13ef5c6c16581"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz"; + sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "socket.io-2.0.4" = { - name = "socket.io"; - packageName = "socket.io"; - version = "2.0.4"; + "lru-cache-2.6.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; - sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"; + sha1 = "e56d6354148ede8d7707b58d143220fd08df0fd5"; }; }; - "linkify-it-2.0.3" = { - name = "linkify-it"; - packageName = "linkify-it"; - version = "2.0.3"; + "lru-cache-2.7.3" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz"; - sha1 = "d94a4648f9b1c179d64fa97291268bdb6ce9434f"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; + sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; }; }; - "mdurl-1.0.1" = { - name = "mdurl"; - packageName = "mdurl"; - version = "1.0.1"; + "lru-cache-3.2.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; - sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz"; + sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; }; }; - "uc.micro-1.0.3" = { - name = "uc.micro"; - packageName = "uc.micro"; - version = "1.0.3"; + "lru-cache-4.1.2" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; - sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz"; + sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2"; }; }; - "github-slugger-1.2.0" = { - name = "github-slugger"; - packageName = "github-slugger"; - version = "1.2.0"; + "ltgt-1.0.2" = { + name = "ltgt"; + packageName = "ltgt"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.0.tgz"; - sha512 = "3nya50972xq88vz4p5gqz63014dkwlp5f40cz1fgad4ifnhprpr4qlqvvi44qxs3arikyfm3ygmf3phyjq5lwkg7rr9ig9mk7prm1n0"; + url = "https://registry.npmjs.org/ltgt/-/ltgt-1.0.2.tgz"; + sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3"; }; }; - "innertext-1.0.2" = { - name = "innertext"; - packageName = "innertext"; - version = "1.0.2"; + "ltgt-2.1.3" = { + name = "ltgt"; + packageName = "ltgt"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/innertext/-/innertext-1.0.2.tgz"; - sha1 = "11a197b3143a593636fba5d59213835e6954580a"; + url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz"; + sha1 = "10851a06d9964b971178441c23c9e52698eece34"; }; }; - "emoji-regex-6.1.1" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "6.1.1"; + "lunr-0.7.2" = { + name = "lunr"; + packageName = "lunr"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz"; - sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; + url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz"; + sha1 = "79a30e932e216cba163541ee37a3607c12cd7281"; }; }; - "html-entities-1.2.1" = { - name = "html-entities"; - packageName = "html-entities"; - version = "1.2.1"; + "lynx-0.2.0" = { + name = "lynx"; + packageName = "lynx"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; - sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + url = "https://registry.npmjs.org/lynx/-/lynx-0.2.0.tgz"; + sha1 = "79e6674530da4183e87953bd686171e070da50b9"; }; }; - "engine.io-3.1.4" = { - name = "engine.io"; - packageName = "engine.io"; - version = "3.1.4"; + "macos-release-1.1.0" = { + name = "macos-release"; + packageName = "macos-release"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.4.tgz"; - sha1 = "3d0211b70a552ce841ffc7da8627b301a9a4162e"; + url = "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz"; + sha512 = "260gwv2k1svhzfxs50g921jbhrqlbfr94mcs9ak0dip7i2331nqc7ip0fgdkfl3r1b30w1s87qh2ssq6wxzd08pbmkjwchqc6xdnqls"; }; }; - "socket.io-adapter-1.1.1" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "1.1.1"; + "magnet-uri-2.0.1" = { + name = "magnet-uri"; + packageName = "magnet-uri"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; - sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; + sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209"; }; }; - "socket.io-client-2.0.4" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "2.0.4"; + "magnet-uri-4.2.3" = { + name = "magnet-uri"; + packageName = "magnet-uri"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz"; - sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz"; + sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8"; }; }; - "socket.io-parser-3.1.2" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "3.1.2"; + "magnet-uri-5.1.7" = { + name = "magnet-uri"; + packageName = "magnet-uri"; + version = "5.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz"; - sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.7.tgz"; + sha1 = "8f8016ab74c415f274f4fb1943faaf7e92030eff"; }; }; - "engine.io-parser-2.1.1" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "2.1.1"; + "mailcomposer-2.1.0" = { + name = "mailcomposer"; + packageName = "mailcomposer"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz"; - sha1 = "e0fb3f0e0462f7f58bb77c1a52e9f5a7e26e4668"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-2.1.0.tgz"; + sha1 = "a6531822899614fee899c92226d81e2b9cbb183d"; }; }; - "uws-0.14.5" = { - name = "uws"; - packageName = "uws"; - version = "0.14.5"; + "mailcomposer-4.0.1" = { + name = "mailcomposer"; + packageName = "mailcomposer"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz"; - sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; + sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; }; }; - "has-binary2-1.0.2" = { - name = "has-binary2"; - packageName = "has-binary2"; - version = "1.0.2"; + "mailcomposer-4.0.2" = { + name = "mailcomposer"; + packageName = "mailcomposer"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz"; - sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz"; + sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101"; }; }; - "isarray-2.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.1"; + "mailgun-js-0.7.15" = { + name = "mailgun-js"; + packageName = "mailgun-js"; + version = "0.7.15"; src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; - sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; + url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.7.15.tgz"; + sha1 = "ee366a20dac64c3c15c03d6c1b3e0ed795252abb"; }; }; - "engine.io-client-3.1.4" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "3.1.4"; + "mailparser-0.6.2" = { + name = "mailparser"; + packageName = "mailparser"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz"; - sha1 = "4fcf1370b47163bd2ce9be2733972430350d4ea1"; + url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz"; + sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; }; }; - "xmlhttprequest-ssl-1.5.4" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.4"; + "make-dir-1.2.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz"; - sha1 = "04f560915724b389088715cc0ed7813e9677bf57"; + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz"; + sha512 = "0ivb7kryzyklvicp8a0lsq56pzjmvycb6bs4d0239q9ygcrs8ylx94q57fgxq3vqvzzs9v3ldl5m1jkxfvfaxh5p8lgb0qchmmh1mb8"; }; }; - "connect-3.5.1" = { - name = "connect"; - packageName = "connect"; - version = "3.5.1"; + "make-error-1.3.4" = { + name = "make-error"; + packageName = "make-error"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.5.1.tgz"; - sha1 = "6d30d7a63c7f170857a6b3aa6b363d973dca588e"; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz"; + sha512 = "3m1bilfa38sjf09x439iz2050vhi5790qcxx11nwr51wygfiazbghxbaqznmhamij5vh6zv83s7kgjx0va77996dmighm2apgjrndnh"; }; }; - "event-stream-3.3.4" = { - name = "event-stream"; - packageName = "event-stream"; - version = "3.3.4"; + "make-error-cause-1.2.2" = { + name = "make-error-cause"; + packageName = "make-error-cause"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; - sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + url = "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz"; + sha1 = "df0388fcd0b37816dff0a5fb8108939777dcbc9d"; }; }; - "http-auth-3.1.3" = { - name = "http-auth"; - packageName = "http-auth"; - version = "3.1.3"; + "make-iterator-1.0.1" = { + name = "make-iterator"; + packageName = "make-iterator"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz"; - sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31"; + url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz"; + sha512 = "2dhd467iqwi8rmdzm8m0921z2mmixbdbpp9hvk02f5z6k1k2324k5l971x6j46mlq8nbixf21znq376dj431jnfajxllm123mgaw657"; }; }; - "serve-index-1.9.1" = { - name = "serve-index"; - packageName = "serve-index"; - version = "1.9.1"; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; - sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; }; }; - "finalhandler-0.5.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.5.1"; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; - sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; }; }; - "apache-crypt-1.2.1" = { - name = "apache-crypt"; - packageName = "apache-crypt"; - version = "1.2.1"; + "map-obj-2.0.0" = { + name = "map-obj"; + packageName = "map-obj"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.1.tgz"; - sha1 = "d6fc72aa6d27d99c95a94fd188d731eefffa663c"; + url = "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz"; + sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; }; }; - "apache-md5-1.1.2" = { - name = "apache-md5"; - packageName = "apache-md5"; - version = "1.1.2"; + "map-stream-0.1.0" = { + name = "map-stream"; + packageName = "map-stream"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.2.tgz"; - sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; }; }; - "bcryptjs-2.4.3" = { - name = "bcryptjs"; - packageName = "bcryptjs"; - version = "2.4.3"; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; - sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "unix-crypt-td-js-1.0.0" = { - name = "unix-crypt-td-js"; - packageName = "unix-crypt-td-js"; - version = "1.0.0"; + "markdown-it-4.4.0" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz"; - sha1 = "1c0824150481bc7a01d49e98f1ec668d82412f3b"; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz"; + sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; }; }; - "batch-0.6.1" = { - name = "batch"; - packageName = "batch"; - version = "0.6.1"; + "markdown-it-8.4.1" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; - sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.1.tgz"; + sha512 = "3w1l75fip7divhr6q8n1sf0af49ssf9kc4vh8gha0svw5q84c8s8csr0f50qz7n0smx1a8iwfnlj2kbnl9bwmpryqgia5b44d4ylg0b"; }; }; - "express-2.5.11" = { - name = "express"; - packageName = "express"; - version = "2.5.11"; + "markdown-it-emoji-1.4.0" = { + name = "markdown-it-emoji"; + packageName = "markdown-it-emoji"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz"; - sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; + url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz"; + sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"; }; }; - "jade-0.27.0" = { - name = "jade"; - packageName = "jade"; - version = "0.27.0"; + "markdown-it-github-headings-1.1.1" = { + name = "markdown-it-github-headings"; + packageName = "markdown-it-github-headings"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jade/-/jade-0.27.0.tgz"; - sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; + url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.1.1.tgz"; + sha512 = "3cs9xbmjc64jh19ashy00z2hig9q9mvcvnqdm8hkysiidr3fl17zkhypvb5z7dqvklwyycah9s325vwj4gbwr214xc7hrddb2cn2jwc"; }; }; - "open-0.0.2" = { - name = "open"; - packageName = "open"; - version = "0.0.2"; + "markdown-it-task-checkbox-1.0.6" = { + name = "markdown-it-task-checkbox"; + packageName = "markdown-it-task-checkbox"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-0.0.2.tgz"; - sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc"; + url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.6.tgz"; + sha512 = "0knj35b20bkc34hpfv73p4m855ysgdshml07fhj18j62p09y2066l7nl28g9kr2rwqm9x8j0bw20d32vqrrhih5ifvynk7axcg6977f"; }; }; - "winston-0.6.2" = { - name = "winston"; - packageName = "winston"; - version = "0.6.2"; + "markdown-table-0.4.0" = { + name = "markdown-table"; + packageName = "markdown-table"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; - sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2"; + url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz"; + sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; }; }; - "mkdirp-0.3.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.0"; + "markdown-to-ast-3.4.0" = { + name = "markdown-to-ast"; + packageName = "markdown-to-ast"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + url = "https://registry.npmjs.org/markdown-to-ast/-/markdown-to-ast-3.4.0.tgz"; + sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; }; }; - "node.extend-1.0.0" = { - name = "node.extend"; - packageName = "node.extend"; - version = "1.0.0"; + "marked-0.3.19" = { + name = "marked"; + packageName = "marked"; + version = "0.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz"; - sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e"; + url = "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz"; + sha512 = "2940np3jq9midbdw8mhfry1msy3572i2gj0y3z9c8z1dyrdhxg1rivcxhgihpqs6gihqnzgdhbgmgsabm2ch7gzbvf16dxacccrxbbr"; }; }; - "connect-1.9.2" = { - name = "connect"; - packageName = "connect"; - version = "1.9.2"; + "matcher-collection-1.0.5" = { + name = "matcher-collection"; + packageName = "matcher-collection"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; - sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + url = "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz"; + sha512 = "1hfvbsx85xqrw6g0k7rkqwngl8b2nwj92ax10ilx3b4lma2mcp8q6zpvam1sffgqsssa9d13cj7prrzg5c00mf0c8q92w59m36ach4x"; }; }; - "mime-1.2.4" = { - name = "mime"; - packageName = "mime"; - version = "1.2.4"; + "md5-2.2.1" = { + name = "md5"; + packageName = "md5"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; - sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; + sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; }; }; - "qs-0.4.2" = { - name = "qs"; - packageName = "qs"; - version = "0.4.2"; + "md5.js-1.3.4" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; - sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; + sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; }; }; - "formidable-1.0.17" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.17"; + "mdn-data-1.1.0" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; - sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.0.tgz"; + sha512 = "3av1cblh8aix05jyfib9mhm57qx8fnkxgxs2g493mdm4815pisrn8rzgf9yxjiww6psa619aa8l62xigrbwfcag741bgls227f82blc"; }; }; - "async-0.1.22" = { - name = "async"; - packageName = "async"; - version = "0.1.22"; + "mdns-js-0.5.0" = { + name = "mdns-js"; + packageName = "mdns-js"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz"; - sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz"; + sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87"; }; }; - "pkginfo-0.2.3" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.2.3"; + "mdns-js-1.0.1" = { + name = "mdns-js"; + packageName = "mdns-js"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; - sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8"; + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-1.0.1.tgz"; + sha512 = "0z9rixsyb1m6w2qjqimn0ga0qdcpnxnm0ci7zd0svzd9kivqds0zczf7r32064r8c32m94cs3lrcvwvg21d7x2s38f28r5874rjs0bp"; }; }; - "request-2.9.203" = { - name = "request"; - packageName = "request"; - version = "2.9.203"; + "mdns-js-packet-0.2.0" = { + name = "mdns-js-packet"; + packageName = "mdns-js-packet"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz"; - sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; + url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz"; + sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616"; }; }; - "browser-stdout-1.3.0" = { - name = "browser-stdout"; - packageName = "browser-stdout"; - version = "1.3.0"; + "mdurl-1.0.1" = { + name = "mdurl"; + packageName = "mdurl"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; - sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; + sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; }; }; - "diff-3.3.1" = { - name = "diff"; - packageName = "diff"; - version = "3.3.1"; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz"; - sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "growl-1.10.3" = { - name = "growl"; - packageName = "growl"; - version = "1.10.3"; + "mediasource-2.1.3" = { + name = "mediasource"; + packageName = "mediasource"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; - sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; + url = "https://registry.npmjs.org/mediasource/-/mediasource-2.1.3.tgz"; + sha1 = "27a9c1aac51bfb6eba96af2d13a84d0b2a8eac68"; }; }; - "he-1.1.1" = { - name = "he"; - packageName = "he"; - version = "1.1.1"; + "mediawiki-title-0.6.5" = { + name = "mediawiki-title"; + packageName = "mediawiki-title"; + version = "0.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; - sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz"; + sha512 = "3r94k4jgdj5ir5y2p0hvb860976fz2fnzjafjzmsf0pivsqgy0hgxsxg315zmzq69rv0lli8rfjwcjp097xya03aaa4s7xjppi0ixvw"; }; }; - "supports-color-4.4.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.4.0"; + "mem-1.1.0" = { + name = "mem"; + packageName = "mem"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; - sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; }; - "json-refs-2.1.7" = { - name = "json-refs"; - packageName = "json-refs"; - version = "2.1.7"; + "mem-fs-1.1.3" = { + name = "mem-fs"; + packageName = "mem-fs"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-2.1.7.tgz"; - sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89"; + url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz"; + sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"; }; }; - "optparse-1.0.5" = { - name = "optparse"; - packageName = "optparse"; - version = "1.0.5"; + "memdown-0.10.2" = { + name = "memdown"; + packageName = "memdown"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; - sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; + url = "https://registry.npmjs.org/memdown/-/memdown-0.10.2.tgz"; + sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608"; }; }; - "slasp-0.0.4" = { - name = "slasp"; - packageName = "slasp"; - version = "0.0.4"; + "memory-chunk-store-1.3.0" = { + name = "memory-chunk-store"; + packageName = "memory-chunk-store"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz"; - sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; + url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.0.tgz"; + sha512 = "0sgs9s743559yps61abf9vnw58jgcig5rj15y47q4dsv7bjfj4i138ycgwd384nsqnbbri9p8xm4jq986bkirhi5qmid1wafaj0xfz8"; }; }; - "npm-registry-client-8.4.0" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "8.4.0"; + "memory-fs-0.3.0" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz"; - sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx"; + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; + sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; }; }; - "npmconf-2.1.2" = { - name = "npmconf"; - packageName = "npmconf"; - version = "2.1.2"; + "memory-fs-0.4.1" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"; - sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a"; + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; }; }; - "tar-3.1.15" = { - name = "tar"; - packageName = "tar"; - version = "3.1.15"; + "memory-pager-1.1.0" = { + name = "memory-pager"; + packageName = "memory-pager"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz"; - sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; + url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.1.0.tgz"; + sha512 = "376gyi0kksnf6f43vhm339sa39j8nrf9dqvhgmz8y7if7w4r1jssqx2ivqb87dz83jpcjad3yi7i5p1vdzwslrwb2c1xvnqbwflxzri"; }; }; - "fs.extra-1.3.2" = { - name = "fs.extra"; - packageName = "fs.extra"; - version = "1.3.2"; + "memorystore-1.6.0" = { + name = "memorystore"; + packageName = "memorystore"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz"; - sha1 = "dd023f93013bee24531f1b33514c37b20fd93349"; + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.0.tgz"; + sha1 = "1fb5fb5f0b2edf1add184917e918f094a9ff3465"; }; }; - "findit-2.0.0" = { - name = "findit"; - packageName = "findit"; - version = "2.0.0"; + "meow-3.7.0" = { + name = "meow"; + packageName = "meow"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz"; - sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e"; + url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; + sha1 = "72cb668b425228290abbfa856892587308a801fb"; }; }; - "nijs-0.0.25" = { - name = "nijs"; - packageName = "nijs"; - version = "0.0.25"; + "meow-4.0.0" = { + name = "meow"; + packageName = "meow"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; - sha1 = "04b035cb530d46859d1018839a518c029133f676"; + url = "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz"; + sha512 = "2rvzq4615rj5x6za96as8f2xx6zs8m8lzraql20fiv5kr03dm9cy3zqq93ccryl42j9mp2n846pmdpkkh79i15962pnxrppbmxf9vri"; }; }; - "retry-0.10.1" = { - name = "retry"; - packageName = "retry"; - version = "0.10.1"; + "merge-1.2.0" = { + name = "merge"; + packageName = "merge"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; - sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; + url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz"; + sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da"; }; }; - "ssri-4.1.6" = { - name = "ssri"; - packageName = "ssri"; - version = "4.1.6"; + "merge-descriptors-0.0.2" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; - sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr"; + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; }; }; - "uid-number-0.0.5" = { - name = "uid-number"; - packageName = "uid-number"; - version = "0.0.5"; + "merge-descriptors-1.0.0" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"; - sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e"; + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; + sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; }; }; - "fs-extra-0.6.4" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "0.6.4"; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; - sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; }; }; - "walk-2.3.9" = { - name = "walk"; - packageName = "walk"; - version = "2.3.9"; + "merge-stream-1.0.1" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; - sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b"; + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"; + sha1 = "4041202d508a342ba00174008df0c251b8c135e1"; }; }; - "jsonfile-1.0.1" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "1.0.1"; + "merkle-tree-stream-3.0.3" = { + name = "merkle-tree-stream"; + packageName = "merkle-tree-stream"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; - sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; + url = "https://registry.npmjs.org/merkle-tree-stream/-/merkle-tree-stream-3.0.3.tgz"; + sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; - "foreachasync-3.0.0" = { - name = "foreachasync"; - packageName = "foreachasync"; - version = "3.0.0"; + "mersenne-0.0.4" = { + name = "mersenne"; + packageName = "mersenne"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; - sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; + url = "https://registry.npmjs.org/mersenne/-/mersenne-0.0.4.tgz"; + sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "semver-5.3.0" = { - name = "semver"; - packageName = "semver"; - version = "5.3.0"; + "metalsmith-2.3.0" = { + name = "metalsmith"; + packageName = "metalsmith"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.3.0.tgz"; + sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231"; }; }; - "biased-opener-0.2.8" = { - name = "biased-opener"; - packageName = "biased-opener"; - version = "0.2.8"; + "method-override-2.3.10" = { + name = "method-override"; + packageName = "method-override"; + version = "2.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/biased-opener/-/biased-opener-0.2.8.tgz"; - sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz"; + sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"; }; }; - "serve-favicon-2.4.5" = { - name = "serve-favicon"; - packageName = "serve-favicon"; - version = "2.4.5"; + "methods-0.0.1" = { + name = "methods"; + packageName = "methods"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz"; - sha512 = "2gn8a5l0hh655cxq2cvvar6k1hl8cpmagplavx6svjiz9kmi968nwbzhpc2fvpcpmsfqb8s5jjq0gvn8vwwc2lx3cj57ckbcf3prcdk"; + url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; + sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; }; }; - "strong-data-uri-1.0.4" = { - name = "strong-data-uri"; - packageName = "strong-data-uri"; - version = "1.0.4"; + "methods-0.1.0" = { + name = "methods"; + packageName = "methods"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.4.tgz"; - sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0"; + url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; + sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; }; }; - "v8-debug-1.0.1" = { - name = "v8-debug"; - packageName = "v8-debug"; + "methods-1.0.1" = { + name = "methods"; + packageName = "methods"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz"; - sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe"; + url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; + sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; }; }; - "v8-profiler-5.7.0" = { - name = "v8-profiler"; - packageName = "v8-profiler"; - version = "5.7.0"; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz"; - sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d"; + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "yargs-3.32.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.32.0"; + "micro-9.1.0" = { + name = "micro"; + packageName = "micro"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; - sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; + url = "https://registry.npmjs.org/micro/-/micro-9.1.0.tgz"; + sha512 = "232sjz2wv3xlfz5wf20jihj8avic507avydzwcf4d8zgy07ha9x3pqc6xkw0y8bjk8f8w30fmih38gsdvz7ph92c4kj4cxxfinph2nh"; }; }; - "browser-launcher2-0.4.6" = { - name = "browser-launcher2"; - packageName = "browser-launcher2"; - version = "0.4.6"; + "micro-compress-1.0.0" = { + name = "micro-compress"; + packageName = "micro-compress"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz"; - sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; + url = "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz"; + sha1 = "53f5a80b4ad0320ca165a559b6e3df145d4f704f"; }; }; - "x-default-browser-0.3.1" = { - name = "x-default-browser"; - packageName = "x-default-browser"; - version = "0.3.1"; + "microee-0.0.6" = { + name = "microee"; + packageName = "microee"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.1.tgz"; - sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; + url = "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz"; + sha1 = "a12bdb0103681e8b126a9b071eba4c467c78fffe"; }; }; - "headless-0.1.7" = { - name = "headless"; - packageName = "headless"; - version = "0.1.7"; + "micromatch-2.3.11" = { + name = "micromatch"; + packageName = "micromatch"; + version = "2.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/headless/-/headless-0.1.7.tgz"; - sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8"; + url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; }; }; - "win-detect-browsers-1.0.2" = { - name = "win-detect-browsers"; - packageName = "win-detect-browsers"; - version = "1.0.2"; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz"; - sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0"; + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; }; }; - "uid-0.0.2" = { - name = "uid"; - packageName = "uid"; - version = "0.0.2"; + "miller-rabin-4.0.1" = { + name = "miller-rabin"; + packageName = "miller-rabin"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz"; - sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; }; }; - "yargs-1.3.3" = { - name = "yargs"; - packageName = "yargs"; - version = "1.3.3"; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; - sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; }; }; - "default-browser-id-1.0.4" = { - name = "default-browser-id"; - packageName = "default-browser-id"; - version = "1.0.4"; + "mime-1.2.4" = { + name = "mime"; + packageName = "mime"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.4.tgz"; - sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a"; + url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; + sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; }; }; - "untildify-2.1.0" = { - name = "untildify"; - packageName = "untildify"; - version = "2.1.0"; + "mime-1.2.6" = { + name = "mime"; + packageName = "mime"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz"; - sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; + url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz"; + sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; }; }; - "truncate-1.0.5" = { - name = "truncate"; - packageName = "truncate"; - version = "1.0.5"; + "mime-1.3.4" = { + name = "mime"; + packageName = "mime"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz"; - sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28"; + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; }; }; - "node-pre-gyp-0.6.39" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.39"; + "mime-1.4.1" = { + name = "mime"; + packageName = "mime"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; + url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; + sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; }; }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; - "detect-libc-1.0.2" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "1.0.2"; + "mime-2.2.2" = { + name = "mime"; + packageName = "mime"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz"; - sha1 = "71ad5d204bf17a6a6ca8f450c61454066ef461e1"; + url = "https://registry.npmjs.org/mime/-/mime-2.2.2.tgz"; + sha512 = "2ahs0dpq95sf8rrpc024h6jqrvknjnj5v046k755kz6br3pr371y9j9df0srgfszdqviaw4fc6vgngbyik866272hmckw1qif1w7cq3"; }; }; - "tar-pack-3.4.1" = { - name = "tar-pack"; - packageName = "tar-pack"; - version = "3.4.1"; + "mime-db-1.12.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; - sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; + sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; }; }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; + "mime-db-1.33.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; + sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; }; }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; + "mime-types-2.0.14" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; + sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; }; }; - "qs-6.4.0" = { - name = "qs"; - packageName = "qs"; - version = "6.4.0"; + "mime-types-2.1.18" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; + sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; }; }; - "ajv-4.11.8" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.8"; + "mimelib-0.3.1" = { + name = "mimelib"; + packageName = "mimelib"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.1.tgz"; + sha1 = "787add2415d827acb3af6ec4bca1ea9596418853"; }; }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; + "mimic-fn-1.2.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; }; }; - "fstream-ignore-1.0.5" = { - name = "fstream-ignore"; - packageName = "fstream-ignore"; - version = "1.0.5"; + "mimic-response-1.0.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; - sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; + sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; }; }; - "uid-number-0.0.6" = { - name = "uid-number"; - packageName = "uid-number"; - version = "0.0.6"; + "min-document-2.19.0" = { + name = "min-document"; + packageName = "min-document"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; - sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + url = "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"; + sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; }; }; - "os-locale-1.4.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "1.4.0"; + "minilog-3.1.0" = { + name = "minilog"; + packageName = "minilog"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; - sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + url = "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz"; + sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675"; }; }; - "window-size-0.1.4" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.4"; + "minimalistic-assert-1.0.0" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; - sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; + sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; }; }; - "es6-promise-3.3.1" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "3.3.1"; + "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/es6-promise/-/es6-promise-3.3.1.tgz"; - sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; }; }; - "ignore-by-default-1.0.1" = { - name = "ignore-by-default"; - packageName = "ignore-by-default"; - version = "1.0.1"; + "minimatch-0.2.14" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"; - sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; }; }; - "lodash.defaults-3.1.2" = { - name = "lodash.defaults"; - packageName = "lodash.defaults"; - version = "3.1.2"; + "minimatch-0.3.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz"; - sha1 = "c7308b18dbf8bc9372d701a73493c61192bd2e2c"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; }; }; - "ps-tree-1.1.0" = { - name = "ps-tree"; - packageName = "ps-tree"; - version = "1.1.0"; + "minimatch-1.0.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz"; - sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; + sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; }; }; - "touch-3.1.0" = { - name = "touch"; - packageName = "touch"; - version = "3.1.0"; + "minimatch-2.0.10" = { + name = "minimatch"; + packageName = "minimatch"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; - sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; + sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; }; }; - "undefsafe-0.0.3" = { - name = "undefsafe"; - packageName = "undefsafe"; - version = "0.0.3"; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz"; - sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; }; }; - "nopt-1.0.10" = { - name = "nopt"; - packageName = "nopt"; - version = "1.0.10"; + "minimist-0.0.10" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; }; }; - "body-parser-1.17.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.17.2"; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz"; - sha1 = "f8892abc8f9e627d42aedafbca66bf5ab99104ee"; + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "cheerio-0.22.0" = { - name = "cheerio"; - packageName = "cheerio"; - version = "0.22.0"; + "minimist-0.1.0" = { + name = "minimist"; + packageName = "minimist"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz"; - sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; + url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; + sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; }; }; - "cookie-parser-1.4.3" = { - name = "cookie-parser"; - packageName = "cookie-parser"; - version = "1.4.3"; + "minimist-0.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz"; - sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; + url = "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"; + sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce"; }; }; - "cors-2.8.3" = { - name = "cors"; - packageName = "cors"; - version = "2.8.3"; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; - sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "cron-1.2.1" = { - name = "cron"; - packageName = "cron"; - version = "1.2.1"; + "minimist-options-3.0.2" = { + name = "minimist-options"; + packageName = "minimist-options"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz"; - sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz"; + sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p"; }; }; - "express-4.15.3" = { - name = "express"; - packageName = "express"; - version = "4.15.3"; + "minipass-2.2.4" = { + name = "minipass"; + packageName = "minipass"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; - sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz"; + sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7"; }; }; - "express-session-1.15.2" = { - name = "express-session"; - packageName = "express-session"; - version = "1.15.2"; + "minizlib-1.1.0" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; - sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; + sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; }; }; - "follow-redirects-1.2.4" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.2.4"; + "mirror-folder-2.1.1" = { + name = "mirror-folder"; + packageName = "mirror-folder"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz"; - sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a"; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz"; + sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; }; }; - "fs.notify-0.0.4" = { - name = "fs.notify"; - packageName = "fs.notify"; - version = "0.0.4"; + "mississippi-2.0.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz"; - sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d"; + url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz"; + sha512 = "2gnigixsj38hrqchkf6k8wqywihq6l14pg0qb23x3qpjn56vybljv3nz1z7cbzhl952h1xfw28vsqm09pjhpv9zs9sm43rdxazkqync"; }; }; - "hash-sum-1.0.2" = { - name = "hash-sum"; - packageName = "hash-sum"; - version = "1.0.2"; + "mixin-deep-1.3.1" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; - sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; + sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi"; }; }; - "i18next-1.10.6" = { - name = "i18next"; - packageName = "i18next"; - version = "1.10.6"; + "mixin-object-2.0.1" = { + name = "mixin-object"; + packageName = "mixin-object"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/i18next/-/i18next-1.10.6.tgz"; - sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; + url = "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz"; + sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e"; }; }; - "js-yaml-3.8.4" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.8.4"; + "mkdirp-0.3.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; - sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; }; }; - "jsonata-1.2.6" = { - name = "jsonata"; - packageName = "jsonata"; - version = "1.2.6"; + "mkdirp-0.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz"; - sha512 = "3bpyhs9imacbmpq0r7l65qvkx0dfnx92qz5vm59i983h2xvw2yrr1934i979accigkr33b65n51m5zx73glbi3pwl8n6zm5b3y74a8a"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; - "mqtt-2.9.0" = { - name = "mqtt"; - packageName = "mqtt"; - version = "2.9.0"; + "mkdirp-0.5.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz"; - sha512 = "181qi8xb0lxxqvwq2xcslv35dbhphyr67w02bad6n4rlibcm6z0j055dyfpdh12mrrvgjzfj11cjylsj26y7vr17cvk1kbgkiqgzpb9"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; }; }; - "multer-1.3.0" = { - name = "multer"; - packageName = "multer"; - version = "1.3.0"; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz"; - sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "mustache-2.3.0" = { - name = "mustache"; - packageName = "mustache"; - version = "2.3.0"; + "mkpath-0.1.0" = { + name = "mkpath"; + packageName = "mkpath"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz"; - sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0"; + url = "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; + sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; }; }; - "oauth2orize-1.8.0" = { - name = "oauth2orize"; - packageName = "oauth2orize"; - version = "1.8.0"; + "mkpath-1.0.0" = { + name = "mkpath"; + packageName = "mkpath"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.8.0.tgz"; - sha1 = "f2ddc0115d635d0480746249c00f0ea1a9c51ba8"; + url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz"; + sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "passport-0.3.2" = { - name = "passport"; - packageName = "passport"; - version = "0.3.2"; + "mksnapshot-0.3.1" = { + name = "mksnapshot"; + packageName = "mksnapshot"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz"; - sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; + url = "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz"; + sha1 = "2501c05657436d742ce958a4ff92c77e40dd37e6"; }; }; - "passport-http-bearer-1.0.1" = { - name = "passport-http-bearer"; - packageName = "passport-http-bearer"; + "modern-syslog-1.1.2" = { + name = "modern-syslog"; + packageName = "modern-syslog"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz"; + sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; + }; + }; + "modify-values-1.0.1" = { + name = "modify-values"; + packageName = "modify-values"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz"; - sha1 = "147469ea3669e2a84c6167ef99dbb77e1f0098a8"; + url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz"; + sha512 = "15hcc3355684n37j7979fs72xj57d71cpl1vbqf3n0nkj3mdairyl91q80xhrhrzlpbxc1yccvqqbh31zv7p4wmilcbl5vswg2rnpf5"; }; }; - "passport-oauth2-client-password-0.1.2" = { - name = "passport-oauth2-client-password"; - packageName = "passport-oauth2-client-password"; - version = "0.1.2"; + "module-deps-4.1.1" = { + name = "module-deps"; + packageName = "module-deps"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz"; - sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; + sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; }; }; - "raw-body-2.2.0" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.2.0"; + "module-deps-6.0.2" = { + name = "module-deps"; + packageName = "module-deps"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; - sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.2.tgz"; + sha512 = "2zf8ycbhqnh9hc6zd3h5s1ii6bjg41z721ffg760j8i045vjjzpzzg542c02ylkic68p0skw1ss97lwphblcw8rip3ik29x9pglhq19"; }; }; - "sentiment-2.1.0" = { - name = "sentiment"; - packageName = "sentiment"; + "moment-2.1.0" = { + name = "moment"; + packageName = "moment"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz"; - sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; + url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; + sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; }; }; - "uglify-js-3.0.20" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.0.20"; + "moment-2.14.1" = { + name = "moment"; + packageName = "moment"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz"; - sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv"; + url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; + sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; }; }; - "when-3.7.8" = { - name = "when"; - packageName = "when"; - version = "3.7.8"; + "moment-2.16.0" = { + name = "moment"; + packageName = "moment"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; - sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; + url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; + sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; }; }; - "ws-1.1.1" = { - name = "ws"; - packageName = "ws"; - version = "1.1.1"; + "moment-2.20.1" = { + name = "moment"; + packageName = "moment"; + version = "2.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"; - sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; + url = "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz"; + sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; }; }; - "node-red-node-feedparser-0.1.8" = { - name = "node-red-node-feedparser"; - packageName = "node-red-node-feedparser"; - version = "0.1.8"; + "moment-2.22.0" = { + name = "moment"; + packageName = "moment"; + version = "2.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.8.tgz"; - sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b"; + url = "https://registry.npmjs.org/moment/-/moment-2.22.0.tgz"; + sha512 = "1v5hxqrwy3yd5023aflf2r1nlkayx1sh9cjjyk3415lba199gkimbq72ba26j3rf2azc0zwhqcz86jh8garynvlh1zm6vr33w59fsyn"; }; }; - "node-red-node-email-0.1.24" = { - name = "node-red-node-email"; - packageName = "node-red-node-email"; - version = "0.1.24"; + "moment-2.6.0" = { + name = "moment"; + packageName = "moment"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.24.tgz"; - sha1 = "ba12c72b01b39e33f375ccbf4321b163425e8fb2"; + url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; + sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; }; }; - "node-red-node-twitter-0.1.12" = { - name = "node-red-node-twitter"; - packageName = "node-red-node-twitter"; - version = "0.1.12"; + "moment-2.7.0" = { + name = "moment"; + packageName = "moment"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.12.tgz"; - sha512 = "3h9isciksl33ajjzn4s0dp8s8m3zkijqc7rbw4v8glrhz5y3npbv8501sffak943jyd4k3dqalizv9giwaxqfd1760pkhbzh816y6j4"; + url = "https://registry.npmjs.org/moment/-/moment-2.7.0.tgz"; + sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; }; }; - "node-red-node-rbe-0.1.13" = { - name = "node-red-node-rbe"; - packageName = "node-red-node-rbe"; - version = "0.1.13"; + "moment-timezone-0.5.14" = { + name = "moment-timezone"; + packageName = "moment-timezone"; + version = "0.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.13.tgz"; - sha1 = "734ff1264cdbe0a8aaade20696dd4bfc6bbcdd49"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz"; + sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1"; }; }; - "bcrypt-1.0.3" = { - name = "bcrypt"; - packageName = "bcrypt"; - version = "1.0.3"; + "mongodb-1.2.14" = { + name = "mongodb"; + packageName = "mongodb"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz"; - sha512 = "1zfn87155w6q9fsv5ls3gxwih7yvarrh16kzpfrpppblzpmp1cy9gjkknsf9lkixacza39h51jd7varqfg19w3qkdic62zpirv86755"; + url = "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; + sha1 = "269665552066437308d0942036646e6795c3a9a3"; }; }; - "debug-2.6.7" = { - name = "debug"; - packageName = "debug"; - version = "2.6.7"; + "mongoose-3.6.7" = { + name = "mongoose"; + packageName = "mongoose"; + version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; - sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; + url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; + sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc"; }; }; - "iconv-lite-0.4.15" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.15"; + "mongoose-lifecycle-1.0.0" = { + name = "mongoose-lifecycle"; + packageName = "mongoose-lifecycle"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; - sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; + url = "https://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz"; + sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; }; }; - "css-select-1.2.0" = { - name = "css-select"; - packageName = "css-select"; - version = "1.2.0"; + "morgan-1.6.1" = { + name = "morgan"; + packageName = "morgan"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; - sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; + sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; }; }; - "htmlparser2-3.9.2" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.9.2"; + "morgan-1.9.0" = { + name = "morgan"; + packageName = "morgan"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz"; - sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; + url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz"; + sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051"; }; }; - "lodash.assignin-4.2.0" = { - name = "lodash.assignin"; - packageName = "lodash.assignin"; - version = "4.2.0"; + "move-concurrently-1.0.1" = { + name = "move-concurrently"; + packageName = "move-concurrently"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz"; - sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"; + url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "lodash.bind-4.2.1" = { - name = "lodash.bind"; - packageName = "lodash.bind"; - version = "4.2.1"; + "mp4-box-encoding-1.1.3" = { + name = "mp4-box-encoding"; + packageName = "mp4-box-encoding"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz"; - sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; + url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.3.tgz"; + sha512 = "0ma1r4wxwlnxb4xjmq6gga6m4ilsarrcvgj4yrjhngbh5l6gng87i4nakbkm4iqxbnchw75ybivhlfhx8bn4qm525qxirs7gh77i8c9"; }; }; - "lodash.defaults-4.2.0" = { - name = "lodash.defaults"; - packageName = "lodash.defaults"; - version = "4.2.0"; + "mp4-stream-2.0.3" = { + name = "mp4-stream"; + packageName = "mp4-stream"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; - sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-2.0.3.tgz"; + sha512 = "3d7vh2ks36h25fkh19jfzvw8flk9f0lz8brnpj57wlwfcwx8hsw5fdr2dxr2brpxvcdv4mhfyd7g82y1n1229scchlaj6cv9wiy1p74"; }; }; - "lodash.filter-4.6.0" = { - name = "lodash.filter"; - packageName = "lodash.filter"; - version = "4.6.0"; + "mpath-0.1.1" = { + name = "mpath"; + packageName = "mpath"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz"; - sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; + url = "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; + sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46"; }; }; - "lodash.flatten-4.4.0" = { - name = "lodash.flatten"; - packageName = "lodash.flatten"; - version = "4.4.0"; + "mpromise-0.2.1" = { + name = "mpromise"; + packageName = "mpromise"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; - sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + url = "https://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; + sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; }; }; - "lodash.foreach-4.5.0" = { - name = "lodash.foreach"; - packageName = "lodash.foreach"; - version = "4.5.0"; + "mqtt-2.15.1" = { + name = "mqtt"; + packageName = "mqtt"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz"; - sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53"; + url = "https://registry.npmjs.org/mqtt/-/mqtt-2.15.1.tgz"; + sha512 = "13ycishr81p39yimwf97c4p9pwhg8a0k2hfmfhkcrpy4yshilfb9rr197fr0r27kniqnbzcfsa19pyvgnkrq24zb4kdiafgrw8kbif1"; }; }; - "lodash.map-4.6.0" = { - name = "lodash.map"; - packageName = "lodash.map"; - version = "4.6.0"; + "mqtt-packet-5.5.0" = { + name = "mqtt-packet"; + packageName = "mqtt-packet"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz"; - sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.5.0.tgz"; + sha512 = "3wbymw2jfhqw0z4zcasxy5njy5ynwrbfq1vkrb2pwwx28mkrywlj2mq4bykrgjgq09v6a5carizhcl6h1kbcvmn902kbbpxxb1r87wi"; }; }; - "lodash.merge-4.6.0" = { - name = "lodash.merge"; - packageName = "lodash.merge"; - version = "4.6.0"; + "mri-1.1.0" = { + name = "mri"; + packageName = "mri"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz"; - sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5"; + url = "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz"; + sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a"; }; }; - "lodash.pick-4.4.0" = { - name = "lodash.pick"; - packageName = "lodash.pick"; - version = "4.4.0"; + "ms-0.1.0" = { + name = "ms"; + packageName = "ms"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; - sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; + sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2"; }; }; - "lodash.reduce-4.6.0" = { - name = "lodash.reduce"; - packageName = "lodash.reduce"; - version = "4.6.0"; + "ms-0.7.0" = { + name = "ms"; + packageName = "ms"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; - sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; }; }; - "lodash.reject-4.6.0" = { - name = "lodash.reject"; - packageName = "lodash.reject"; - version = "4.6.0"; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz"; - sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; - "lodash.some-4.6.0" = { - name = "lodash.some"; - packageName = "lodash.some"; - version = "4.6.0"; + "ms-0.7.2" = { + name = "ms"; + packageName = "ms"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz"; - sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; - "css-what-2.1.0" = { - name = "css-what"; - packageName = "css-what"; - version = "2.1.0"; + "ms-0.7.3" = { + name = "ms"; + packageName = "ms"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz"; - sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz"; + sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff"; }; }; - "boolbase-1.0.0" = { - name = "boolbase"; - packageName = "boolbase"; - version = "1.0.0"; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; - sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "nth-check-1.0.1" = { - name = "nth-check"; - packageName = "nth-check"; - version = "1.0.1"; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"; - sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; }; }; - "domhandler-2.4.1" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.4.1"; + "ms-rest-1.15.7" = { + name = "ms-rest"; + packageName = "ms-rest"; + version = "1.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz"; - sha1 = "892e47000a99be55bbf3774ffea0561d8879c259"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz"; + sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "moment-timezone-0.5.14" = { - name = "moment-timezone"; - packageName = "moment-timezone"; - version = "0.5.14"; + "ms-rest-2.3.3" = { + name = "ms-rest"; + packageName = "ms-rest"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz"; - sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.3.tgz"; + sha512 = "2qrwz9q47d6988i8kf97zl0974msgia3qzcah3rl6gld0n99pzdnlbz2cnqbhcj7yql2jbfm682qalzfazphxl90liyl82mzvz7z3jb"; }; }; - "fresh-0.5.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.0"; + "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/fresh/-/fresh-0.5.0.tgz"; - sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz"; + sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; }; }; - "proxy-addr-1.1.5" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "1.1.5"; + "ms-rest-azure-2.5.5" = { + name = "ms-rest-azure"; + packageName = "ms-rest-azure"; + version = "2.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; - sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.5.tgz"; + sha512 = "37sgjm2jqs7fnlzbxihq6sdxxd4w7m5nnkmvp5rrnq9ghsfbbk9pr1z4lm6my3yg06hhqgdyg7rnnzvds26yxjwic7d1g1ab1igjwrf"; }; }; - "send-0.15.3" = { - name = "send"; - packageName = "send"; - version = "0.15.3"; + "msgpack-1.0.2" = { + name = "msgpack"; + packageName = "msgpack"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; - sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; + url = "https://registry.npmjs.org/msgpack/-/msgpack-1.0.2.tgz"; + sha1 = "923e2c5cffa65c8418e9b228d1124793969c429c"; }; }; - "serve-static-1.12.3" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.12.3"; + "msgpack5-3.6.0" = { + name = "msgpack5"; + packageName = "msgpack5"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; - sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; + url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz"; + sha512 = "3nr151ygx2w2pydaamcjrcn5ksl2rx09sdad8gh0rp1l07igigvfsw0xjjcnxrdws1rwy7g1j533qzhr7w25jisad6npv9rf1j84yz8"; }; }; - "ipaddr.js-1.4.0" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.4.0"; + "multer-1.3.0" = { + name = "multer"; + packageName = "multer"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; - sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; + url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz"; + sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2"; }; }; - "crc-3.4.4" = { - name = "crc"; - packageName = "crc"; - version = "3.4.4"; + "multi-random-access-2.1.1" = { + name = "multi-random-access"; + packageName = "multi-random-access"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; - sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; + url = "https://registry.npmjs.org/multi-random-access/-/multi-random-access-2.1.1.tgz"; + sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "debug-2.6.3" = { - name = "debug"; - packageName = "debug"; - version = "2.6.3"; + "multicast-dns-4.0.1" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; - sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-4.0.1.tgz"; + sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2"; }; }; - "uid-safe-2.1.5" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.1.5"; + "multicast-dns-6.2.3" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"; - sha512 = "2h6492mk9v9dzy26i5wfajinhi2pg729ksbcsmm0sp8s32hlr432q19g97qghfp5x98hsm77hmzwdzhgi3vhm2drz53ax7rabhydw98"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; - "retry-0.6.1" = { - name = "retry"; - packageName = "retry"; - version = "0.6.1"; + "multicast-dns-7.0.0" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz"; - sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz"; + sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806"; }; }; - "cookies-0.7.1" = { - name = "cookies"; - packageName = "cookies"; - version = "0.7.1"; + "multicast-dns-service-types-1.1.0" = { + name = "multicast-dns-service-types"; + packageName = "multicast-dns-service-types"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.7.1.tgz"; - sha1 = "7c8a615f5481c61ab9f16c833731bcb8f663b99b"; + url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; }; }; - "i18next-client-1.10.3" = { - name = "i18next-client"; - packageName = "i18next-client"; - version = "1.10.3"; + "multicb-1.2.2" = { + name = "multicb"; + packageName = "multicb"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/i18next-client/-/i18next-client-1.10.3.tgz"; - sha1 = "76d0353557ed90d1e7a87754d5004d3f7801fde9"; + url = "https://registry.npmjs.org/multicb/-/multicb-1.2.2.tgz"; + sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; }; }; - "json5-0.2.0" = { - name = "json5"; - packageName = "json5"; - version = "0.2.0"; + "multimatch-2.1.0" = { + name = "multimatch"; + packageName = "multimatch"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.2.0.tgz"; - sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343"; + url = "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz"; + sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"; }; }; - "keygrip-1.0.2" = { - name = "keygrip"; - packageName = "keygrip"; - version = "1.0.2"; + "multiparty-2.2.0" = { + name = "multiparty"; + packageName = "multiparty"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.2.tgz"; - sha1 = "ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"; + url = "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; + sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; }; }; - "esprima-3.1.3" = { - name = "esprima"; - packageName = "esprima"; - version = "3.1.3"; + "multiparty-3.3.2" = { + name = "multiparty"; + packageName = "multiparty"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; + sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; }; }; - "commist-1.0.0" = { - name = "commist"; - packageName = "commist"; - version = "1.0.0"; + "multiparty-4.1.3" = { + name = "multiparty"; + packageName = "multiparty"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/commist/-/commist-1.0.0.tgz"; - sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; + url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz"; + sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; }; }; - "help-me-1.1.0" = { - name = "help-me"; - packageName = "help-me"; - version = "1.1.0"; + "multipipe-0.1.2" = { + name = "multipipe"; + packageName = "multipipe"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; - sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; + url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"; + sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "mqtt-packet-5.4.0" = { - name = "mqtt-packet"; - packageName = "mqtt-packet"; - version = "5.4.0"; + "multistream-2.1.0" = { + name = "multistream"; + packageName = "multistream"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz"; - sha512 = "2d1hvibps8d4xlw8wm937ykc76yb02rp2065hd6186vygjx3wixjjzrn3fia4wfj7d38ic8gh5ij5rsi9389kl6gpxxjbdcbjwpn8yf"; + url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz"; + sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d"; }; }; - "reinterval-1.1.0" = { - name = "reinterval"; - packageName = "reinterval"; - version = "1.1.0"; + "muri-0.3.1" = { + name = "muri"; + packageName = "muri"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; - sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; + url = "https://registry.npmjs.org/muri/-/muri-0.3.1.tgz"; + sha1 = "861889c5c857f1a43700bee85d50731f61727c9a"; }; }; - "websocket-stream-5.1.1" = { - name = "websocket-stream"; - packageName = "websocket-stream"; - version = "5.1.1"; + "murl-0.4.1" = { + name = "murl"; + packageName = "murl"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.1.tgz"; - sha512 = "18iw90ncl6cpip9j7rxdf6mag5klhhn7fklhb5lz41dy3wk9vxp3lxxkmwsnldjk5zfx3fjww55xg47k5k1a4cpph92k7j26p9kk56a"; + url = "https://registry.npmjs.org/murl/-/murl-0.4.1.tgz"; + sha1 = "489fbcc7f1b2b77e689c84120a51339c3849c939"; }; }; - "leven-1.0.2" = { - name = "leven"; - packageName = "leven"; - version = "1.0.2"; + "murmur-hash-js-1.0.0" = { + name = "murmur-hash-js"; + packageName = "murmur-hash-js"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz"; - sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3"; + url = "https://registry.npmjs.org/murmur-hash-js/-/murmur-hash-js-1.0.0.tgz"; + sha1 = "5041049269c96633c866386960b2f4289e75e5b0"; }; }; - "callback-stream-1.1.0" = { - name = "callback-stream"; - packageName = "callback-stream"; - version = "1.1.0"; + "mustache-2.3.0" = { + name = "mustache"; + packageName = "mustache"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"; - sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; + url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz"; + sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0"; }; }; - "glob-stream-6.1.0" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "6.1.0"; + "mutate.js-0.2.0" = { + name = "mutate.js"; + packageName = "mutate.js"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; - sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; + url = "https://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz"; + sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef"; }; }; - "is-negated-glob-1.0.0" = { - name = "is-negated-glob"; - packageName = "is-negated-glob"; - version = "1.0.0"; + "mute-stream-0.0.4" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; - sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; + sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; }; }; - "ordered-read-streams-1.0.1" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "1.0.1"; + "mute-stream-0.0.5" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; - sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"; + sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; }; }; - "to-absolute-glob-2.0.1" = { - name = "to-absolute-glob"; - packageName = "to-absolute-glob"; - version = "2.0.1"; + "mute-stream-0.0.6" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz"; - sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b"; + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; + sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; }; }; - "append-field-0.1.0" = { - name = "append-field"; - packageName = "append-field"; - version = "0.1.0"; + "mute-stream-0.0.7" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz"; - sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; }; }; - "busboy-0.2.14" = { - name = "busboy"; - packageName = "busboy"; - version = "0.2.14"; + "mutexify-1.2.0" = { + name = "mutexify"; + packageName = "mutexify"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; - sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz"; + sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2"; }; }; - "dicer-0.2.5" = { - name = "dicer"; - packageName = "dicer"; - version = "0.2.5"; + "mv-2.1.1" = { + name = "mv"; + packageName = "mv"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; - sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; + sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; }; }; - "streamsearch-0.1.2" = { - name = "streamsearch"; - packageName = "streamsearch"; - version = "0.1.2"; + "mz-2.5.0" = { + name = "mz"; + packageName = "mz"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; - sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + url = "https://registry.npmjs.org/mz/-/mz-2.5.0.tgz"; + sha1 = "2859025df03d46b57bb317174b196477ce64cec1"; }; }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; + "mz-2.7.0" = { + name = "mz"; + packageName = "mz"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; + sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; }; }; - "feedparser-1.1.3" = { - name = "feedparser"; - packageName = "feedparser"; - version = "1.1.3"; + "nan-0.3.2" = { + name = "nan"; + packageName = "nan"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/feedparser/-/feedparser-1.1.3.tgz"; - sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b"; + url = "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; + sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; }; }; - "sax-0.6.1" = { - name = "sax"; - packageName = "sax"; - version = "0.6.1"; + "nan-1.0.0" = { + name = "nan"; + packageName = "nan"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"; - sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"; + url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; + sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; }; }; - "addressparser-0.1.3" = { - name = "addressparser"; - packageName = "addressparser"; - version = "0.1.3"; + "nan-2.1.0" = { + name = "nan"; + packageName = "nan"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz"; - sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874"; + url = "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"; + sha1 = "020a7ccedc63fdee85f85967d5607849e74abbe8"; }; }; - "array-indexofobject-0.0.1" = { - name = "array-indexofobject"; - packageName = "array-indexofobject"; - version = "0.0.1"; + "nan-2.10.0" = { + name = "nan"; + packageName = "nan"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz"; - sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a"; + url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; + sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc"; }; }; - "nodemailer-1.11.0" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "1.11.0"; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz"; - sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79"; + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; }; }; - "poplib-0.1.7" = { - name = "poplib"; - packageName = "poplib"; - version = "0.1.7"; + "nan-2.5.1" = { + name = "nan"; + packageName = "nan"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz"; - sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; + sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; }; }; - "mailparser-0.6.2" = { - name = "mailparser"; - packageName = "mailparser"; - version = "0.6.2"; + "nan-2.6.2" = { + name = "nan"; + packageName = "nan"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz"; - sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; + url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; + sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; - "imap-0.8.19" = { - name = "imap"; - packageName = "imap"; - version = "0.8.19"; + "nanoassert-1.1.0" = { + name = "nanoassert"; + packageName = "nanoassert"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz"; - sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5"; + url = "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz"; + sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; }; }; - "libmime-1.2.0" = { - name = "libmime"; - packageName = "libmime"; - version = "1.2.0"; + "nanobus-3.3.0" = { + name = "nanobus"; + packageName = "nanobus"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz"; - sha1 = "8d84b4f3b225b3704410236ef494906436ba742b"; + url = "https://registry.npmjs.org/nanobus/-/nanobus-3.3.0.tgz"; + sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; }; }; - "mailcomposer-2.1.0" = { - name = "mailcomposer"; - packageName = "mailcomposer"; - version = "2.1.0"; + "nanoid-1.0.2" = { + name = "nanoid"; + packageName = "nanoid"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-2.1.0.tgz"; - sha1 = "a6531822899614fee899c92226d81e2b9cbb183d"; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.2.tgz"; + sha512 = "2bzl500sgpk3i3ird4iviglsj0gj9a0qhmj4hnky3xmxbl4ahamjhi96rslr8k65j77glmw771m3jm7r5sr5akw6ip5glmxvqkg095h"; }; }; - "needle-0.11.0" = { - name = "needle"; - packageName = "needle"; - version = "0.11.0"; + "nanolru-1.0.0" = { + name = "nanolru"; + packageName = "nanolru"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz"; - sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; + url = "https://registry.npmjs.org/nanolru/-/nanolru-1.0.0.tgz"; + sha512 = "1d2d6k4vxnxgs5621zpccl6hk5nk0knsmjmhfmfv30sfgzca6qc59xb3xz05gi141s4y0m5yrn0iamd7554lfq9hl5rbnipqc9j890v"; }; }; - "nodemailer-direct-transport-1.1.0" = { - name = "nodemailer-direct-transport"; - packageName = "nodemailer-direct-transport"; - version = "1.1.0"; + "nanomatch-1.2.9" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz"; - sha1 = "a2f78708ee6f16ea0573fc82949d138ff172f624"; + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz"; + sha512 = "1f2indb6hj1h79gxklk6ac2lhfjfydw5ak3v2nwilwir5hqvz9l9kxf63l8k1blsjq4v7r2pf0gqc1b55sqqym5bn9afhrj5xnpvi4z"; }; }; - "nodemailer-smtp-transport-1.1.0" = { - name = "nodemailer-smtp-transport"; - packageName = "nodemailer-smtp-transport"; - version = "1.1.0"; + "nanotiming-1.0.1" = { + name = "nanotiming"; + packageName = "nanotiming"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz"; - sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398"; + url = "https://registry.npmjs.org/nanotiming/-/nanotiming-1.0.1.tgz"; + sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3"; }; }; - "libbase64-0.1.0" = { - name = "libbase64"; - packageName = "libbase64"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"; - sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6"; + "native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = { + name = "native-dns-cache"; + packageName = "native-dns-cache"; + version = "0.0.2"; + src = fetchgit { + url = "https://github.com/okTurtles/native-dns-cache.git"; + rev = "8714196bb9223cc9a4064a4fddf9e82ec50b7d4d"; + sha256 = "3f06b2577afc3c1e428533baae3c51bad44a2e1e02fca147a1303943c214f841"; }; }; - "libqp-1.1.0" = { - name = "libqp"; - packageName = "libqp"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; - sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; + "native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" = { + name = "native-dns"; + packageName = "native-dns"; + version = "0.6.1"; + src = fetchgit { + url = "https://github.com/okTurtles/node-dns.git"; + rev = "08433ec98f517eed3c6d5e47bdf62603539cd402"; + sha256 = "a7342bfd4e952490a8a25a68efcb1d16ecc2391f1044109ebeace89ad284f7a2"; }; }; - "buildmail-2.0.0" = { - name = "buildmail"; - packageName = "buildmail"; - version = "2.0.0"; + "native-dns-packet-0.1.1" = { + name = "native-dns-packet"; + packageName = "native-dns-packet"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz"; - sha1 = "f0b7b0a59e9a4a1b5066bbfa051d248f3832eece"; + url = "https://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; + sha1 = "97da90570b8438a00194701ce24d011fd3cc109a"; }; }; - "addressparser-0.3.2" = { - name = "addressparser"; - packageName = "addressparser"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; - sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; + "native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" = { + name = "native-dns-packet"; + packageName = "native-dns-packet"; + version = "0.0.3"; + src = fetchgit { + url = "https://github.com/okTurtles/native-dns-packet.git"; + rev = "307e77a47ebba57a5ae9118a284e916e5ebb305a"; + sha256 = "f8aaa7bb3b2a652e52bfe5c13a6531c71d690f621ef4d86d0787838708a50358"; }; }; - "needle-0.10.0" = { - name = "needle"; - packageName = "needle"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz"; - sha1 = "16a24d63f2a61152eb74cce1d12af85c507577d4"; + "native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" = { + name = "native-dns-packet"; + packageName = "native-dns-packet"; + version = "0.0.4"; + src = fetchgit { + url = "https://github.com/okTurtles/native-dns-packet.git"; + rev = "8bf2714c318cfe7d31bca2006385882ccbf503e4"; + sha256 = "1f39a4bd88978a0b51d45c32c777fb7f75b12e220cf7d206aa5a12d1e4e80f9d"; }; }; - "smtp-connection-1.3.8" = { - name = "smtp-connection"; - packageName = "smtp-connection"; - version = "1.3.8"; + "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/smtp-connection/-/smtp-connection-1.3.8.tgz"; - sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536"; + url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; + sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "nodemailer-wellknown-0.1.10" = { - name = "nodemailer-wellknown"; - packageName = "nodemailer-wellknown"; - version = "0.1.10"; + "natives-1.1.3" = { + name = "natives"; + packageName = "natives"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"; - sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; + url = "https://registry.npmjs.org/natives/-/natives-1.1.3.tgz"; + sha512 = "3pbpfnk3183j5mwxprr19bzahf7lxarcka2bad0mhcywnjlj63i55phbxyk0pn4l4v7nj3wv4gjrzdk7xfxxfrjl5rvqf0qbrhr5485"; }; }; - "mimelib-0.3.1" = { - name = "mimelib"; - packageName = "mimelib"; - version = "0.3.1"; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.1.tgz"; - sha1 = "787add2415d827acb3af6ec4bca1ea9596418853"; + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; }; }; - "uue-3.1.0" = { - name = "uue"; - packageName = "uue"; - version = "3.1.0"; + "natural-compare-lite-1.4.0" = { + name = "natural-compare-lite"; + packageName = "natural-compare-lite"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz"; - sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; + url = "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"; + sha1 = "17b09581988979fddafe0201e931ba933c96cbb4"; }; }; - "addressparser-1.0.1" = { - name = "addressparser"; - packageName = "addressparser"; - version = "1.0.1"; + "nconf-0.6.9" = { + name = "nconf"; + packageName = "nconf"; + version = "0.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; - sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; + url = "https://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; + sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; }; }; - "utf7-1.0.2" = { - name = "utf7"; - packageName = "utf7"; - version = "1.0.2"; + "nconf-0.7.1" = { + name = "nconf"; + packageName = "nconf"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; - sha1 = "955f490aae653ba220b9456a0a8776c199360991"; + url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; + sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; }; }; - "twitter-ng-0.6.2" = { - name = "twitter-ng"; - packageName = "twitter-ng"; - version = "0.6.2"; + "nconf-0.7.2" = { + name = "nconf"; + packageName = "nconf"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/twitter-ng/-/twitter-ng-0.6.2.tgz"; - sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; + url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz"; + sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00"; }; }; - "oauth-0.9.14" = { - name = "oauth"; - packageName = "oauth"; - version = "0.9.14"; + "ncp-0.4.2" = { + name = "ncp"; + packageName = "ncp"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz"; - sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; + url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "nan-2.6.2" = { - name = "nan"; - packageName = "nan"; - version = "2.6.2"; + "ncp-1.0.1" = { + name = "ncp"; + packageName = "ncp"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; - sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; + url = "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"; + sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; }; }; - "node-pre-gyp-0.6.36" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.36"; + "ncp-2.0.0" = { + name = "ncp"; + packageName = "ncp"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; - sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; + url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; + sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; }; }; - "mongoose-3.6.7" = { - name = "mongoose"; - packageName = "mongoose"; - version = "3.6.7"; + "ndjson-1.5.0" = { + name = "ndjson"; + packageName = "ndjson"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; - sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc"; + url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz"; + sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "mongoose-lifecycle-1.0.0" = { - name = "mongoose-lifecycle"; - packageName = "mongoose-lifecycle"; - version = "1.0.0"; + "neat-log-1.1.2" = { + name = "neat-log"; + packageName = "neat-log"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz"; - sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; + url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz"; + sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; }; }; - "express-3.2.0" = { - name = "express"; - packageName = "express"; - version = "3.2.0"; + "needle-0.10.0" = { + name = "needle"; + packageName = "needle"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.2.0.tgz"; - sha1 = "7b66d6c66b038038eedf452804222b3077374ae0"; + url = "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz"; + sha1 = "16a24d63f2a61152eb74cce1d12af85c507577d4"; }; }; - "express-partials-0.0.6" = { - name = "express-partials"; - packageName = "express-partials"; - version = "0.0.6"; + "needle-0.11.0" = { + name = "needle"; + packageName = "needle"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz"; - sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda"; + url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz"; + sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; }; }; - "connect-flash-0.1.0" = { - name = "connect-flash"; - packageName = "connect-flash"; - version = "0.1.0"; + "needle-2.2.0" = { + name = "needle"; + packageName = "needle"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz"; - sha1 = "82b381d61a12b651437df1c259c1f1c841239b88"; + url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz"; + sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq"; }; }; - "ejs-0.8.3" = { - name = "ejs"; - packageName = "ejs"; - version = "0.8.3"; + "negotiator-0.3.0" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz"; - sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f"; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; + sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"; }; }; - "config-0.4.15" = { - name = "config"; - packageName = "config"; - version = "0.4.15"; + "negotiator-0.5.3" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/config/-/config-0.4.15.tgz"; - sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18"; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; }; - "socket.io-0.9.14" = { - name = "socket.io"; - packageName = "socket.io"; - version = "0.9.14"; + "negotiator-0.6.1" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz"; - sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667"; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; + sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; - "semver-1.1.0" = { - name = "semver"; - packageName = "semver"; - version = "1.1.0"; + "negotiator-git+https://github.com/arlolra/negotiator#full-parse-access" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.1"; + src = fetchgit { + url = "https://github.com/arlolra/negotiator"; + rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; + sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; + }; + }; + "neo-async-2.5.0" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; - sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e"; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz"; + sha512 = "3mgwi8gsgy9lazh0qbpaz8f2l8gvvpn3jp0ghc6xnn0xq0ajdmzp7lfklby1n4s67fy1w5g5gzizyqzds8l3fqsj76cy0mq06rr56cw"; }; }; - "moment-2.1.0" = { - name = "moment"; - packageName = "moment"; - version = "2.1.0"; + "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/moment/-/moment-2.1.0.tgz"; - sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; + url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; + sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; }; }; - "nodemailer-0.3.35" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "0.3.35"; + "net-browserify-alt-1.1.0" = { + name = "net-browserify-alt"; + packageName = "net-browserify-alt"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz"; - sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19"; + url = "https://registry.npmjs.org/net-browserify-alt/-/net-browserify-alt-1.1.0.tgz"; + sha1 = "02c9ecac88437be23f5948b208a1e65d8d138a73"; }; }; "net-ping-1.1.7" = { @@ -17775,391 +17779,409 @@ let sha1 = "49f5bca55a30a3726d69253557f231135a637075"; }; }; - "js-yaml-2.1.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "2.1.0"; + "netmask-1.0.6" = { + name = "netmask"; + packageName = "netmask"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; - sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; + url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz"; + sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35"; }; }; - "hooks-0.2.1" = { - name = "hooks"; - packageName = "hooks"; - version = "0.2.1"; + "nets-3.2.0" = { + name = "nets"; + packageName = "nets"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz"; - sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; + url = "https://registry.npmjs.org/nets/-/nets-3.2.0.tgz"; + sha1 = "d511fbab7af11da013f21b97ee91747d33852d38"; }; }; - "mongodb-1.2.14" = { - name = "mongodb"; - packageName = "mongodb"; - version = "1.2.14"; + "network-address-0.0.5" = { + name = "network-address"; + packageName = "network-address"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; - sha1 = "269665552066437308d0942036646e6795c3a9a3"; + url = "https://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz"; + sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc"; }; }; - "ms-0.1.0" = { - name = "ms"; - packageName = "ms"; - version = "0.1.0"; + "network-address-1.1.2" = { + name = "network-address"; + packageName = "network-address"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; - sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2"; + url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz"; + sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; - "sliced-0.0.3" = { - name = "sliced"; - packageName = "sliced"; - version = "0.0.3"; + "next-event-1.0.0" = { + name = "next-event"; + packageName = "next-event"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz"; - sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50"; + url = "https://registry.npmjs.org/next-event/-/next-event-1.0.0.tgz"; + sha1 = "e7778acde2e55802e0ad1879c39cf6f75eda61d8"; }; }; - "muri-0.3.1" = { - name = "muri"; - packageName = "muri"; - version = "0.3.1"; + "next-line-1.1.0" = { + name = "next-line"; + packageName = "next-line"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/muri/-/muri-0.3.1.tgz"; - sha1 = "861889c5c857f1a43700bee85d50731f61727c9a"; + url = "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz"; + sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "mpromise-0.2.1" = { - name = "mpromise"; - packageName = "mpromise"; - version = "0.2.1"; + "next-tick-1.0.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; - sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; }; }; - "mpath-0.1.1" = { - name = "mpath"; - packageName = "mpath"; - version = "0.1.1"; + "nijs-0.0.25" = { + name = "nijs"; + packageName = "nijs"; + version = "0.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; - sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46"; + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; + sha1 = "04b035cb530d46859d1018839a518c029133f676"; }; }; - "bson-0.1.8" = { - name = "bson"; - packageName = "bson"; - version = "0.1.8"; + "no-case-2.3.2" = { + name = "no-case"; + packageName = "no-case"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; - sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; + url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"; + sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f"; }; }; - "sliced-0.0.4" = { - name = "sliced"; - packageName = "sliced"; - version = "0.0.4"; + "node-abi-2.3.0" = { + name = "node-abi"; + packageName = "node-abi"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; - sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee"; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.3.0.tgz"; + sha512 = "2ijjyzh7bcyyhjaa5m0kdfg6hvxkq6czwxfg6y5d2nl6v7m9qab2ixwgvzbaaivn0r0ig48j4443905167vnpzgvlq5icfj9nyvl2fg"; }; }; - "connect-2.7.6" = { - name = "connect"; - packageName = "connect"; - version = "2.7.6"; + "node-alias-1.0.4" = { + name = "node-alias"; + packageName = "node-alias"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.7.6.tgz"; - sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738"; + url = "https://registry.npmjs.org/node-alias/-/node-alias-1.0.4.tgz"; + sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "range-parser-0.0.4" = { - name = "range-parser"; - packageName = "range-parser"; - version = "0.0.4"; + "node-appc-0.2.44" = { + name = "node-appc"; + packageName = "node-appc"; + version = "0.2.44"; src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; - sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.44.tgz"; + sha512 = "01a44qwlfiqbz8hlpp7yywzw9xj04h937jnzmb94dany3bsh8z3shcn1579m0702h8ah3nayb17z63ahldj9rb6k75waf7qkamawgzh"; }; }; - "cookie-0.0.5" = { - name = "cookie"; - packageName = "cookie"; - version = "0.0.5"; + "node-cache-4.2.0" = { + name = "node-cache"; + packageName = "node-cache"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; - sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; + url = "https://registry.npmjs.org/node-cache/-/node-cache-4.2.0.tgz"; + sha512 = "0xw45nif5bibga7jbx0n2fv7h0jz3l4lp6ra8gfri1f7kzq0kc31q9i5zpvhi6j63785gynl2m02h8l30x04pn8raw4sjzvyzmnxd51"; }; }; - "fresh-0.1.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.1.0"; + "node-elm-compiler-4.3.3" = { + name = "node-elm-compiler"; + packageName = "node-elm-compiler"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; - sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; + url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-4.3.3.tgz"; + sha512 = "2xwfrbx7s959y63gdiy54y86mp770vkxfgszp5xhwnxr29d3xavf8dnp0ab238732wh1121qwlx6k68wa4wkk4rm4qiswq5h5m9fjhd"; }; }; - "methods-0.0.1" = { - name = "methods"; - packageName = "methods"; - version = "0.0.1"; + "node-fetch-1.7.3" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; - sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz"; + sha512 = "0lz5m15w7qaks0a0s3dm0crsjrsd123dy00pn6qwcp50zfjykxkp22i5ymh6smlc0ags38nmdxlxw9yyq509azlv8kcdvdiq857h5in"; }; }; - "send-0.1.0" = { - name = "send"; - packageName = "send"; - version = "0.1.0"; + "node-forge-0.6.23" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.6.23"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz"; - sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz"; + sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; }; }; - "cookie-signature-1.0.1" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.1"; + "node-forge-0.7.5" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; - sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz"; + sha512 = "0aq9ajngp210n97kmgnqyhil492amwhcn3b8bwxgsli9hq5qy4lh7qmncwbb1j0llrc4zalr0haj0fphrygz8kinzij848kcckx0rij"; }; }; - "qs-0.5.1" = { - name = "qs"; - packageName = "qs"; - version = "0.5.1"; + "node-gyp-build-3.3.0" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz"; - sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz"; + sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; }; }; - "formidable-1.0.11" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.11"; + "node-int64-0.4.0" = { + name = "node-int64"; + packageName = "node-int64"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz"; - sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30"; + url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"; + sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; }; }; - "buffer-crc32-0.1.1" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.1.1"; + "node-libs-browser-2.1.0" = { + name = "node-libs-browser"; + packageName = "node-libs-browser"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz"; - sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526"; + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz"; + sha512 = "05d8rzfa0aihb9s1i3fm0dmdvlspfrxf4pxnsd3nms75mviv86llgg2r30l7b38a9l93yb00k7dy1vs8h4nd30ihhyvyc88vb6wa374"; }; }; - "bytes-0.2.0" = { - name = "bytes"; - packageName = "bytes"; - version = "0.2.0"; + "node-notifier-5.2.1" = { + name = "node-notifier"; + packageName = "node-notifier"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; - sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz"; + sha512 = "179bqs5pz252zanr7mca970h5748xj0fa6inw23x5g5fb0nk64wyh8d34jzah0x5s6wdw2lb0hnad2h257nqns999vd5s8x03w6r01h"; }; }; - "mime-1.2.6" = { - name = "mime"; - packageName = "mime"; - version = "1.2.6"; + "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/mime/-/mime-1.2.6.tgz"; - sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; + url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz"; + sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; }; }; - "js-yaml-0.3.7" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "0.3.7"; + "node-pre-gyp-0.6.36" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.6.36"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz"; - sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; + sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; }; }; - "vows-0.8.1" = { - name = "vows"; - packageName = "vows"; - version = "0.8.1"; + "node-pre-gyp-0.6.39" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.6.39"; src = fetchurl { - url = "https://registry.npmjs.org/vows/-/vows-0.8.1.tgz"; - sha1 = "e09e988ce594ca05a08d72abcca34e88db559131"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; + sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; }; }; - "diff-1.0.8" = { - name = "diff"; - packageName = "diff"; - version = "1.0.8"; + "node-red-node-email-0.1.27" = { + name = "node-red-node-email"; + packageName = "node-red-node-email"; + version = "0.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; - sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.27.tgz"; + sha512 = "0r799aswbfv6f9rjdrh6bddfzwj1mpinlani8cwc7zbmipcf4dsyffmf3xghb3hpb15k26jvpb46f2ia8cff1vyn4i9h3jn5dnzflnc"; }; }; - "glob-4.0.6" = { - name = "glob"; - packageName = "glob"; - version = "4.0.6"; + "node-red-node-feedparser-0.1.12" = { + name = "node-red-node-feedparser"; + packageName = "node-red-node-feedparser"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; - sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7"; + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.12.tgz"; + sha512 = "2ymvmw9wh0rq14fbxg44p3wm1r34lmr7wvh8z40g4cssrpcmb43cc3wr94z9blxpnjmf9795b3slmd3s4283snm01q5z1jppa9kn2lk"; }; }; - "minimatch-1.0.0" = { - name = "minimatch"; - packageName = "minimatch"; - version = "1.0.0"; + "node-red-node-rbe-0.2.3" = { + name = "node-red-node-rbe"; + packageName = "node-red-node-rbe"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; - sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.3.tgz"; + sha512 = "06is8ig0mlp85dl5hjp86gp7hwahssfls65gbwcql3awygilv9zlgxngm4yrl54vmkyjk2dk5gbf78r6bm4jgm3qf07xdbwvcgjvqz7"; }; }; - "socket.io-client-0.9.11" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "0.9.11"; + "node-red-node-twitter-0.1.13" = { + name = "node-red-node-twitter"; + packageName = "node-red-node-twitter"; + version = "0.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz"; - sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7"; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.13.tgz"; + sha512 = "0wfkdalwxzyyivqxiwiba5j8pyis83lhipiwck2xrbks3w0x1ldf12fgnzx61kq64sdmzpczqwb7588ggh5drj64ymj88vwdbca0bd9"; }; }; - "policyfile-0.0.4" = { - name = "policyfile"; - packageName = "policyfile"; - version = "0.0.4"; + "node-ssdp-2.9.1" = { + name = "node-ssdp"; + packageName = "node-ssdp"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"; - sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d"; + url = "https://registry.npmjs.org/node-ssdp/-/node-ssdp-2.9.1.tgz"; + sha1 = "2d6ba8e7eff9bf5b338564f91f7ac5d5cdddc55b"; }; }; - "base64id-0.1.0" = { - name = "base64id"; - packageName = "base64id"; - version = "0.1.0"; + "node-static-0.7.10" = { + name = "node-static"; + packageName = "node-static"; + version = "0.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; - sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; + url = "https://registry.npmjs.org/node-static/-/node-static-0.7.10.tgz"; + sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd"; }; }; - "redis-0.7.3" = { - name = "redis"; - packageName = "redis"; - version = "0.7.3"; + "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/redis/-/redis-0.7.3.tgz"; - sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a"; + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; + sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; }; }; - "uglify-js-1.2.5" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "1.2.5"; + "node-swt-0.1.1" = { + name = "node-swt"; + packageName = "node-swt"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; - sha1 = "b542c2c76f78efb34b200b20177634330ff702b6"; + url = "https://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz"; + sha1 = "af0903825784be553b93dbae57d99d59060585dd"; }; }; - "ws-0.4.32" = { - name = "ws"; - packageName = "ws"; - version = "0.4.32"; + "node-uuid-1.4.1" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; - sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; }; }; - "xmlhttprequest-1.4.2" = { - name = "xmlhttprequest"; - packageName = "xmlhttprequest"; - version = "1.4.2"; + "node-uuid-1.4.7" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz"; - sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500"; + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; + sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; }; }; - "active-x-obfuscator-0.0.1" = { - name = "active-x-obfuscator"; - packageName = "active-x-obfuscator"; - version = "0.0.1"; + "node-uuid-1.4.8" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"; - sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a"; + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; - "commander-2.1.0" = { - name = "commander"; - packageName = "commander"; - version = "2.1.0"; + "node-version-1.1.0" = { + name = "node-version"; + packageName = "node-version"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; - sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; + url = "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz"; + sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp"; }; }; - "nan-1.0.0" = { - name = "nan"; - packageName = "nan"; - version = "1.0.0"; + "node-wsfederation-0.1.1" = { + name = "node-wsfederation"; + packageName = "node-wsfederation"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; - sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; + url = "https://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz"; + sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b"; }; }; - "tinycolor-0.0.1" = { - name = "tinycolor"; - packageName = "tinycolor"; - version = "0.0.1"; + "node.extend-1.0.0" = { + name = "node.extend"; + packageName = "node.extend"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; - sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz"; + sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e"; }; }; - "zeparser-0.0.5" = { - name = "zeparser"; - packageName = "zeparser"; - version = "0.0.5"; + "node.extend-2.0.0" = { + name = "node.extend"; + packageName = "node.extend"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"; - sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; + url = "https://registry.npmjs.org/node.extend/-/node.extend-2.0.0.tgz"; + sha1 = "7525a2875677ea534784a5e10ac78956139614df"; }; }; - "mailcomposer-4.0.2" = { - name = "mailcomposer"; - packageName = "mailcomposer"; - version = "4.0.2"; + "nodebmc-0.0.7" = { + name = "nodebmc"; + packageName = "nodebmc"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz"; - sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101"; + url = "https://registry.npmjs.org/nodebmc/-/nodebmc-0.0.7.tgz"; + sha1 = "fae179165265509302cefbebeabd29bd4035184d"; }; }; - "simplesmtp-0.3.35" = { - name = "simplesmtp"; - packageName = "simplesmtp"; + "nodemailer-0.3.35" = { + name = "nodemailer"; + packageName = "nodemailer"; version = "0.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz"; - sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz"; + sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19"; }; }; - "buildmail-4.0.1" = { - name = "buildmail"; - packageName = "buildmail"; - version = "4.0.1"; + "nodemailer-1.11.0" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz"; - sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72"; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz"; + sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79"; }; }; - "libmime-3.0.0" = { - name = "libmime"; - packageName = "libmime"; - version = "3.0.0"; + "nodemailer-2.7.2" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz"; - sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-2.7.2.tgz"; + sha1 = "f242e649aeeae39b6c7ed740ef7b061c404d30f9"; + }; + }; + "nodemailer-direct-transport-1.1.0" = { + name = "nodemailer-direct-transport"; + packageName = "nodemailer-direct-transport"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz"; + sha1 = "a2f78708ee6f16ea0573fc82949d138ff172f624"; + }; + }; + "nodemailer-direct-transport-3.3.2" = { + name = "nodemailer-direct-transport"; + packageName = "nodemailer-direct-transport"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz"; + sha1 = "e96fafb90358560947e569017d97e60738a50a86"; }; }; "nodemailer-fetch-1.6.0" = { @@ -18180,274 +18202,274 @@ let sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; }; }; - "rai-0.1.12" = { - name = "rai"; - packageName = "rai"; - version = "0.1.12"; + "nodemailer-smtp-pool-2.8.2" = { + name = "nodemailer-smtp-pool"; + packageName = "nodemailer-smtp-pool"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/rai/-/rai-0.1.12.tgz"; - sha1 = "8ccfd014d0f9608630dd73c19b8e4b057754a6a6"; + url = "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz"; + sha1 = "2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"; }; }; - "xoauth2-0.1.8" = { - name = "xoauth2"; - packageName = "xoauth2"; - version = "0.1.8"; + "nodemailer-smtp-transport-1.1.0" = { + name = "nodemailer-smtp-transport"; + packageName = "nodemailer-smtp-transport"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz"; - sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; + url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz"; + sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398"; }; }; - "raw-socket-1.5.1" = { - name = "raw-socket"; - packageName = "raw-socket"; - version = "1.5.1"; + "nodemailer-smtp-transport-2.7.2" = { + name = "nodemailer-smtp-transport"; + packageName = "nodemailer-smtp-transport"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz"; - sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528"; + url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz"; + sha1 = "03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"; }; }; - "nan-2.3.5" = { - name = "nan"; - packageName = "nan"; - version = "2.3.5"; + "nodemailer-wellknown-0.1.10" = { + name = "nodemailer-wellknown"; + packageName = "nodemailer-wellknown"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; - sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"; + sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; - "argparse-0.1.16" = { - name = "argparse"; - packageName = "argparse"; - version = "0.1.16"; + "nodesecurity-npm-utils-6.0.0" = { + name = "nodesecurity-npm-utils"; + packageName = "nodesecurity-npm-utils"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; - sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; + url = "https://registry.npmjs.org/nodesecurity-npm-utils/-/nodesecurity-npm-utils-6.0.0.tgz"; + sha512 = "0v36pqap4xw0z9h00v73nhxv2llz5gi0y6vww0yjyqb2qyfkgb7cjpjgzscc6bviw4xi4nk223s9nlcnvkpwymllbva8d98bixnbd1l"; }; }; - "esprima-1.0.4" = { - name = "esprima"; - packageName = "esprima"; - version = "1.0.4"; + "nomnom-1.8.1" = { + name = "nomnom"; + packageName = "nomnom"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; - sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; + url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz"; + sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; }; }; - "underscore-1.7.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.7.0"; + "noop-logger-0.1.1" = { + name = "noop-logger"; + packageName = "noop-logger"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; - sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + url = "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"; + sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; }; }; - "underscore.string-2.4.0" = { - name = "underscore.string"; - packageName = "underscore.string"; - version = "2.4.0"; + "nopt-1.0.10" = { + name = "nopt"; + packageName = "nopt"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; - sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; + url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; }; - "argparse-0.1.15" = { - name = "argparse"; - packageName = "argparse"; - version = "0.1.15"; + "nopt-2.0.0" = { + name = "nopt"; + packageName = "nopt"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; - sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; + url = "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; + sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; }; }; - "npm-registry-client-0.2.27" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "0.2.27"; + "nopt-2.2.1" = { + name = "nopt"; + packageName = "nopt"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; - sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; + url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; + sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; }; }; - "npmconf-0.1.1" = { - name = "npmconf"; - packageName = "npmconf"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz"; - sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1"; + "nopt-3.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz"; + sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd"; }; }; - "tar-0.1.17" = { - name = "tar"; - packageName = "tar"; - version = "0.1.17"; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; - sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "temp-0.6.0" = { - name = "temp"; - packageName = "temp"; - version = "0.6.0"; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; - sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "findit-1.2.0" = { - name = "findit"; - packageName = "findit"; - version = "1.2.0"; + "normalize-package-data-2.4.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/findit/-/findit-1.2.0.tgz"; - sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; }; }; - "underscore.string-2.3.3" = { - name = "underscore.string"; - packageName = "underscore.string"; - version = "2.3.3"; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; - sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; }; }; - "graceful-fs-2.0.3" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "2.0.3"; + "normalize-url-2.0.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; - sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; + sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg"; }; }; - "semver-2.0.11" = { - name = "semver"; - packageName = "semver"; - version = "2.0.11"; + "npm-3.10.10" = { + name = "npm"; + packageName = "npm"; + version = "3.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; + sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; - "chownr-0.0.2" = { - name = "chownr"; - packageName = "chownr"; - version = "0.0.2"; + "npm-6.0.0-next.0" = { + name = "npm"; + packageName = "npm"; + version = "6.0.0-next.0"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz"; - sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485"; + url = "https://registry.npmjs.org/npm/-/npm-6.0.0-next.0.tgz"; + sha512 = "06yn34ji94fcadvnj3mafxlv8hnin0mgrdpdjplk33nkjc8niq5kr1kfwikqxj36kyzwdcz8a27599sakryvgvb14mqjabc525ik35x"; }; }; - "retry-0.6.0" = { - name = "retry"; - packageName = "retry"; - version = "0.6.0"; + "npm-bundled-1.0.3" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; - sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; + sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; }; }; - "couch-login-0.1.20" = { - name = "couch-login"; - packageName = "couch-login"; - version = "0.1.20"; + "npm-conf-1.1.3" = { + name = "npm-conf"; + packageName = "npm-conf"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz"; - sha1 = "007c70ef80089dbae6f59eeeec37480799b39595"; + url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; + sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2"; }; }; - "once-1.1.1" = { - name = "once"; - packageName = "once"; - version = "1.1.1"; + "npm-keyword-5.0.0" = { + name = "npm-keyword"; + packageName = "npm-keyword"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz"; - sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-5.0.0.tgz"; + sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "osenv-0.0.3" = { - name = "osenv"; - packageName = "osenv"; - version = "0.0.3"; + "npm-package-arg-6.0.0" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; - sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz"; + sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047"; }; }; - "nopt-2.2.1" = { - name = "nopt"; - packageName = "nopt"; - version = "2.2.1"; + "npm-packlist-1.1.10" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; - sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; + sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; }; }; - "fstream-0.1.31" = { - name = "fstream"; - packageName = "fstream"; - version = "0.1.31"; + "npm-registry-client-0.2.27" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "0.2.27"; src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; - sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; + sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; }; }; - "rimraf-2.1.4" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.1.4"; + "npm-registry-client-8.5.1" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; - sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz"; + sha512 = "0g7abpykfqb1x17pajm1ndsh61n3ydyimv5npsjrn9hd1s72csxh7fzdn28gldz30n00wgb8rg9y8jfhxli3cnii61i5vl0cwbwdf7f"; }; }; - "cint-8.2.1" = { - name = "cint"; - packageName = "cint"; - version = "8.2.1"; + "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/cint/-/cint-8.2.1.tgz"; - sha1 = "70386b1b48e2773d0d63166a55aff94ef4456a12"; + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; + sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; }; }; - "cli-table-0.3.1" = { - name = "cli-table"; - packageName = "cli-table"; - version = "0.3.1"; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; - sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; }; - "fast-diff-1.1.2" = { - name = "fast-diff"; - packageName = "fast-diff"; - version = "1.1.2"; + "npmconf-0.1.1" = { + name = "npmconf"; + packageName = "npmconf"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz"; - sha512 = "2550z1qvyfv9js9vg2aaj57ji5d9hhg4f6zl4rf483d6xswv23ac6ipj8gbapv4sjx14dpcslqmnx1z78vvx4np4ad5mdrxwfvm98i9"; + url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz"; + sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1"; }; }; - "node-alias-1.0.4" = { - name = "node-alias"; - packageName = "node-alias"; - version = "1.0.4"; + "npmconf-0.1.16" = { + name = "npmconf"; + packageName = "npmconf"; + version = "0.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/node-alias/-/node-alias-1.0.4.tgz"; - sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; + url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz"; + sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a"; }; }; - "npm-3.10.10" = { - name = "npm"; - packageName = "npm"; - version = "3.10.10"; + "npmconf-2.1.2" = { + name = "npmconf"; + packageName = "npmconf"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; - sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; + url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"; + sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a"; }; }; "npmi-2.0.1" = { @@ -18459,16834 +18481,26728 @@ let sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea"; }; }; - "semver-utils-1.1.1" = { - name = "semver-utils"; - packageName = "semver-utils"; - version = "1.1.1"; + "npmlog-2.0.4" = { + name = "npmlog"; + packageName = "npmlog"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.1.tgz"; - sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz"; + sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; }; }; - "snyk-1.49.2" = { - name = "snyk"; - packageName = "snyk"; - version = "1.49.2"; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.49.2.tgz"; - sha1 = "331bbf072599cb9ececf8d061e3177c9118158a6"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; }; }; - "spawn-please-0.3.0" = { - name = "spawn-please"; - packageName = "spawn-please"; - version = "0.3.0"; + "nprogress-0.2.0" = { + name = "nprogress"; + packageName = "nprogress"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz"; - sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; + url = "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz"; + sha1 = "cb8f34c53213d895723fcbab907e9422adbcafb1"; }; }; - "hasbin-1.2.3" = { - name = "hasbin"; - packageName = "hasbin"; - version = "1.2.3"; + "nssocket-0.5.3" = { + name = "nssocket"; + packageName = "nssocket"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz"; - sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; + url = "https://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz"; + sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; }; }; - "inquirer-1.0.3" = { - name = "inquirer"; - packageName = "inquirer"; - version = "1.0.3"; + "nth-check-1.0.1" = { + name = "nth-check"; + packageName = "nth-check"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz"; - sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"; + url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"; + sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "needle-2.0.1" = { - name = "needle"; - packageName = "needle"; - version = "2.0.1"; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.0.1.tgz"; - sha1 = "c21fc961ce3c340fb082250da6a08a32f38631f1"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; - "snyk-config-1.0.1" = { - name = "snyk-config"; - packageName = "snyk-config"; - version = "1.0.1"; + "numeral-1.5.6" = { + name = "numeral"; + packageName = "numeral"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz"; - sha1 = "f27aec2498b24027ac719214026521591111508f"; + url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz"; + sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; }; }; - "snyk-go-plugin-1.3.8" = { - name = "snyk-go-plugin"; - packageName = "snyk-go-plugin"; - version = "1.3.8"; + "oauth-0.9.14" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.3.8.tgz"; - sha512 = "0q7vax6wyzrd2d3rzymrvhqcb1mnhpya12f26v05ly4ydivj1x67mbw0bpcdccagzijy8lbsvn9pp7zy59mikyfvfaj1084xkml4xwc"; + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz"; + sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; }; }; - "snyk-gradle-plugin-1.2.0" = { - name = "snyk-gradle-plugin"; - packageName = "snyk-gradle-plugin"; - version = "1.2.0"; + "oauth-0.9.15" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.15"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz"; - sha512 = "1b2bxvwl2v4prlj942i4jkz4mahgp39j7lvy91jzv00nsk59l76b1icn48zj4zk84s00jil3pnxnfzsclhcc612d70s4wwi3x2hrrqn"; + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz"; + sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1"; }; }; - "snyk-module-1.8.1" = { - name = "snyk-module"; - packageName = "snyk-module"; - version = "1.8.1"; + "oauth-https://github.com/ciaranj/node-oauth/tarball/master" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.15"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; - sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; + name = "oauth-0.9.15.tar.gz"; + url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; + sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; - "snyk-mvn-plugin-1.1.0" = { - name = "snyk-mvn-plugin"; - packageName = "snyk-mvn-plugin"; - version = "1.1.0"; + "oauth-sign-0.2.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.0.tgz"; - sha512 = "3ar9rk77y39sydnriw6k9p5s15qpv1in81365l0yjbvn6qis7v4na98xfibsmfnnkjyblnd5qs2q1j6fabdfx4g2x5yi7ld6hdm6r3r"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; + sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; }; }; - "snyk-nuget-plugin-1.2.0" = { - name = "snyk-nuget-plugin"; - packageName = "snyk-nuget-plugin"; - version = "1.2.0"; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.2.0.tgz"; - sha512 = "1n2w2izk863wslmjkbyj90cgrksxiz9ggxz6m664xz77f7bz265jzs3bzy54a5r3f0p84hk0lykbkaaydvkhqawijpdwhww6jmzp2d6"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "snyk-policy-1.7.1" = { - name = "snyk-policy"; - packageName = "snyk-policy"; - version = "1.7.1"; + "oauth2orize-1.11.0" = { + name = "oauth2orize"; + packageName = "oauth2orize"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz"; - sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; + url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.11.0.tgz"; + sha1 = "793cef251d45ebdeac32ae40a8b6814faab1d483"; }; }; - "snyk-python-plugin-1.4.0" = { - name = "snyk-python-plugin"; - packageName = "snyk-python-plugin"; - version = "1.4.0"; + "object-assign-1.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.4.0.tgz"; - sha512 = "3ayb4vqwvz9srv07xfrzwwni6aabbxmmxq8gx55qkzbc7x912k7cvd4r8v96ij8ck45r89xhm2j60knmjhv6xj1gm2x9vhz20s325vk"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; + sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; }; }; - "snyk-recursive-readdir-2.0.0" = { - name = "snyk-recursive-readdir"; - packageName = "snyk-recursive-readdir"; - version = "2.0.0"; + "object-assign-3.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz"; - sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; + sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; }; }; - "snyk-resolve-1.0.0" = { - name = "snyk-resolve"; - packageName = "snyk-resolve"; - version = "1.0.0"; + "object-assign-4.1.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz"; - sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; }; }; - "snyk-resolve-deps-1.7.0" = { - name = "snyk-resolve-deps"; - packageName = "snyk-resolve-deps"; - version = "1.7.0"; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz"; - sha1 = "13743a058437dff890baaf437c333c966a743cb6"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "snyk-sbt-plugin-1.2.0" = { - name = "snyk-sbt-plugin"; - packageName = "snyk-sbt-plugin"; - version = "1.2.0"; + "object-component-0.0.3" = { + name = "object-component"; + packageName = "object-component"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.0.tgz"; - sha512 = "002ibp199wy3pk8dldcfr83njcrgx7hk1c802hwa9skky7jw5c4infnaj9aignghi2l1w44p3cjk3xwbcrryldj3hh63vbyzpryg3qz"; + url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; + sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; }; }; - "snyk-tree-1.0.0" = { - name = "snyk-tree"; - packageName = "snyk-tree"; - version = "1.0.0"; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz"; - sha1 = "0fb73176dbf32e782f19100294160448f9111cc8"; + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "snyk-try-require-1.2.0" = { - name = "snyk-try-require"; - packageName = "snyk-try-require"; - version = "1.2.0"; + "object-hash-1.3.0" = { + name = "object-hash"; + packageName = "object-hash"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz"; - sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; + url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.0.tgz"; + sha512 = "2qnadlb3xqg732666500m9gssayfvlzrhipcl3hyw3qm1yhmvnz72slbmzlbfi8kgzl95a32a896f1lf175ql4jmn9f2j95pm1v74nk"; }; }; - "then-fs-2.0.0" = { - name = "then-fs"; - packageName = "then-fs"; - version = "2.0.0"; + "object-keys-1.0.11" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz"; - sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2"; + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; + sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; }; }; - "mute-stream-0.0.6" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.6"; + "object-values-1.0.0" = { + name = "object-values"; + packageName = "object-values"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; - sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + url = "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz"; + sha1 = "72af839630119e5b98c3b02bb8c27e3237158105"; }; }; - "rx-4.1.0" = { - name = "rx"; - packageName = "rx"; - version = "4.1.0"; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; - sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "nconf-0.7.2" = { - name = "nconf"; - packageName = "nconf"; - version = "0.7.2"; + "object.assign-4.1.0" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz"; - sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00"; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; }; }; - "yargs-3.15.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.15.0"; + "object.defaults-1.1.0" = { + name = "object.defaults"; + packageName = "object.defaults"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz"; - sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181"; + url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; + sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; }; }; - "toml-2.3.3" = { - name = "toml"; - packageName = "toml"; - version = "2.3.3"; + "object.getownpropertydescriptors-2.0.3" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz"; - sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv"; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; }; }; - "clone-deep-0.3.0" = { - name = "clone-deep"; - packageName = "clone-deep"; - version = "0.3.0"; + "object.map-1.0.1" = { + name = "object.map"; + packageName = "object.map"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz"; - sha1 = "348c61ae9cdbe0edfe053d91ff4cc521d790ede8"; + url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; }; }; - "shallow-clone-0.1.2" = { - name = "shallow-clone"; - packageName = "shallow-clone"; - version = "0.1.2"; + "object.omit-2.0.1" = { + name = "object.omit"; + packageName = "object.omit"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz"; - sha1 = "5909e874ba77106d73ac414cfec1ffca87d97060"; + url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; }; }; - "kind-of-2.0.1" = { - name = "kind-of"; - packageName = "kind-of"; - version = "2.0.1"; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz"; - sha1 = "018ec7a4ce7e3a86cb9141be519d24c8faa981b5"; + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; }; - "lazy-cache-0.2.7" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "0.2.7"; + "object.values-1.0.4" = { + name = "object.values"; + packageName = "object.values"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"; - sha1 = "7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"; + url = "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz"; + sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a"; }; }; - "mixin-object-2.0.1" = { - name = "mixin-object"; - packageName = "mixin-object"; - version = "2.0.1"; + "octicons-3.5.0" = { + name = "octicons"; + packageName = "octicons"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz"; - sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e"; + url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz"; + sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30"; }; }; - "for-in-0.1.8" = { - name = "for-in"; - packageName = "for-in"; - version = "0.1.8"; + "omelette-0.3.2" = { + name = "omelette"; + packageName = "omelette"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz"; - sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1"; + url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz"; + sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26"; }; }; - "zip-1.2.0" = { - name = "zip"; - packageName = "zip"; - version = "1.2.0"; + "on-finished-2.2.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/zip/-/zip-1.2.0.tgz"; - sha1 = "ad0ad42265309be42eb56fc86194e17c24e66a9c"; + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; }; }; - "bops-0.1.1" = { - name = "bops"; - packageName = "bops"; - version = "0.1.1"; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/bops/-/bops-0.1.1.tgz"; - sha1 = "062e02a8daa801fa10f2e5dbe6740cff801fe17e"; + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; - "base64-js-0.0.2" = { - name = "base64-js"; - packageName = "base64-js"; - version = "0.0.2"; + "on-headers-1.0.1" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz"; - sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"; + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"; + sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; }; }; - "to-utf8-0.0.1" = { - name = "to-utf8"; - packageName = "to-utf8"; - version = "0.0.1"; + "once-1.1.1" = { + name = "once"; + packageName = "once"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz"; - sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852"; + url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz"; + sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; }; }; - "lodash.clonedeep-4.5.0" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.5.0"; + "once-1.2.0" = { + name = "once"; + packageName = "once"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + url = "https://registry.npmjs.org/once/-/once-1.2.0.tgz"; + sha1 = "de1905c636af874a8fba862d9aabddd1f920461c"; }; }; - "minimatch-3.0.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.2"; + "once-1.3.0" = { + name = "once"; + packageName = "once"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"; - sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a"; + url = "https://registry.npmjs.org/once/-/once-1.3.0.tgz"; + sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; }; }; - "ansicolors-0.3.2" = { - name = "ansicolors"; - packageName = "ansicolors"; - version = "0.3.2"; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; - sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; }; }; - "clite-0.3.0" = { - name = "clite"; - packageName = "clite"; - version = "0.3.0"; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz"; - sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441"; + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "lodash.defaultsdeep-4.6.0" = { - name = "lodash.defaultsdeep"; - packageName = "lodash.defaultsdeep"; - version = "4.6.0"; + "onetime-1.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz"; - sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81"; + url = "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; + sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; }; - "lodash.mergewith-4.6.0" = { - name = "lodash.mergewith"; - packageName = "lodash.mergewith"; - version = "4.6.0"; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz"; - sha1 = "150cf0a16791f5903b8891eab154609274bdea55"; + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "update-notifier-0.6.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.6.3"; + "open-0.0.2" = { + name = "open"; + packageName = "open"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; - sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + url = "https://registry.npmjs.org/open/-/open-0.0.2.tgz"; + sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc"; }; }; - "yargs-4.8.1" = { - name = "yargs"; - packageName = "yargs"; - version = "4.8.1"; + "open-0.0.5" = { + name = "open"; + packageName = "open"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; - sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; + url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; + sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; }; }; - "boxen-0.3.1" = { - name = "boxen"; - packageName = "boxen"; - version = "0.3.1"; + "opener-1.4.2" = { + name = "opener"; + packageName = "opener"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; - sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; + url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; + sha1 = "b32582080042af8680c389a499175b4c54fff523"; }; }; - "latest-version-2.0.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "2.0.0"; + "openid-2.0.6" = { + name = "openid"; + packageName = "openid"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; - sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz"; + sha1 = "707375e59ab9f73025899727679b20328171c9aa"; }; }; - "filled-array-1.1.0" = { - name = "filled-array"; - packageName = "filled-array"; - version = "1.1.0"; + "openssl-self-signed-certificate-1.1.6" = { + name = "openssl-self-signed-certificate"; + packageName = "openssl-self-signed-certificate"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; - sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; + url = "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz"; + sha1 = "9d3a4776b1a57e9847350392114ad2f915a83dd4"; }; }; - "package-json-2.4.0" = { - name = "package-json"; - packageName = "package-json"; - version = "2.4.0"; + "openssl-wrapper-0.2.1" = { + name = "openssl-wrapper"; + packageName = "openssl-wrapper"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; - sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; + url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz"; + sha1 = "ff2d6552c83bb14437edc0371784704c75289473"; }; }; - "got-5.7.1" = { - name = "got"; - packageName = "got"; - version = "5.7.1"; + "opentracing-0.13.0" = { + name = "opentracing"; + packageName = "opentracing"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; - sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.13.0.tgz"; + sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; }; }; - "node-status-codes-1.0.0" = { - name = "node-status-codes"; - packageName = "node-status-codes"; - version = "1.0.0"; + "opentracing-0.14.3" = { + name = "opentracing"; + packageName = "opentracing"; + version = "0.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; - sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.3.tgz"; + sha1 = "23e3ad029fa66a653926adbe57e834469f8550aa"; }; }; - "timed-out-3.1.3" = { - name = "timed-out"; - packageName = "timed-out"; - version = "3.1.3"; + "opn-4.0.2" = { + name = "opn"; + packageName = "opn"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; - sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; + url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"; + sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; }; }; - "unzip-response-1.0.2" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "1.0.2"; + "opn-5.2.0" = { + name = "opn"; + packageName = "opn"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; - sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; + url = "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz"; + sha512 = "12iyalgghs3dj0pfb7rxa013x946169yfsjfd15fsfrx5kv80z2qh082x7v7d91hh7bf9vxcm4wqmyyj9ckk3gnvc7mw77j6fkwdpr5"; }; }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; + "opn-5.3.0" = { + name = "opn"; + packageName = "opn"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; + sha512 = "3d5s5y22sx4wfswzs8fmhr7sarmjigs8qhmmyrkiplfda6kkfk3kv67fs8npdklf8zbc9hmx76zsxqfv4bn5qlpzbfq96nfyailg0kd"; }; }; - "which-module-1.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "1.0.0"; + "optimist-0.2.8" = { + name = "optimist"; + packageName = "optimist"; + version = "0.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; - sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + url = "https://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; + sha1 = "e981ab7e268b457948593b55674c099a815cac31"; }; }; - "window-size-0.2.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.2.0"; + "optimist-0.3.7" = { + name = "optimist"; + packageName = "optimist"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; - sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; + url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; }; }; - "yargs-parser-2.4.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "2.4.1"; + "optimist-0.6.0" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; - sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; + sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; }; }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "lokijs-1.5.1" = { - name = "lokijs"; - packageName = "lokijs"; - version = "1.5.1"; + "optionator-0.8.2" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.1.tgz"; - sha512 = "1pi08ry0a4zvg7mqj14gl0vacka95k77bbvljmcf25whxxbkh2rprsxpd8pv6frqh4ix6vslk44silx83sk65xhaw7ia2zssf0vngiy"; + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; - "vscode-languageclient-3.5.0" = { - name = "vscode-languageclient"; - packageName = "vscode-languageclient"; - version = "3.5.0"; + "options-0.0.6" = { + name = "options"; + packageName = "options"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.5.0.tgz"; - sha1 = "36d02cc186a8365a4467719a290fb200a9ae490a"; + url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }; }; - "babybird-0.0.1" = { - name = "babybird"; - packageName = "babybird"; - version = "0.0.1"; + "optjs-3.2.2" = { + name = "optjs"; + packageName = "optjs"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz"; - sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2"; + url = "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz"; + sha1 = "69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"; }; }; - "connect-busboy-0.0.2" = { - name = "connect-busboy"; - packageName = "connect-busboy"; - version = "0.0.2"; + "optparse-1.0.5" = { + name = "optparse"; + packageName = "optparse"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz"; - sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097"; - }; - }; - "content-type-git+https://github.com/wikimedia/content-type.git#master" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.1"; - src = fetchgit { - url = "https://github.com/wikimedia/content-type.git"; - rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; - sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; + url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; + sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }; }; - "diff-1.4.0" = { - name = "diff"; - packageName = "diff"; + "ora-1.4.0" = { + name = "ora"; + packageName = "ora"; version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; - sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + url = "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz"; + sha512 = "2kz616isg6vqp95rsja7fc47k22qipv9b44dhsyxsl7x95ly9j17dwn8dxq8adyhw6ap1nlpfg2dk8v6r7b2m8r61v3ikriwh6bbhl8"; }; }; - "domino-1.0.30" = { - name = "domino"; - packageName = "domino"; - version = "1.0.30"; + "orchestrator-0.3.8" = { + name = "orchestrator"; + packageName = "orchestrator"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz"; - sha512 = "1g3pbkg3gg3kjffah03vil47662ra58gckz5z8qymfgb9xq97k7vsd83410fmncbbll1p40rs0s4r0pgdypfvj9j2fq146j41dbqjla"; + url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; + sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; }; }; - "express-handlebars-3.0.0" = { - name = "express-handlebars"; - packageName = "express-handlebars"; - version = "3.0.0"; + "ordered-read-streams-0.1.0" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz"; - sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; + sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; }; }; - "mediawiki-title-0.6.5" = { - name = "mediawiki-title"; - packageName = "mediawiki-title"; - version = "0.6.5"; + "ordered-read-streams-0.3.0" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz"; - sha512 = "3r94k4jgdj5ir5y2p0hvb860976fz2fnzjafjzmsf0pivsqgy0hgxsxg315zmzq69rv0lli8rfjwcjp097xya03aaa4s7xjppi0ixvw"; - }; - }; - "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.1"; - src = fetchgit { - url = "https://github.com/arlolra/negotiator.git"; - rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; - sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz"; + sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b"; }; }; - "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = { - name = "pegjs"; - packageName = "pegjs"; - version = "0.8.0"; - src = fetchgit { - url = "https://github.com/tstarling/pegjs.git"; - rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584"; - sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905"; + "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"; }; }; - "prfun-2.1.4" = { - name = "prfun"; - packageName = "prfun"; - version = "2.1.4"; + "os-browserify-0.1.2" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/prfun/-/prfun-2.1.4.tgz"; - sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; + sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; }; }; - "service-runner-2.4.2" = { - name = "service-runner"; - packageName = "service-runner"; - version = "2.4.2"; + "os-browserify-0.3.0" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.4.2.tgz"; - sha1 = "dc2ca5dd29061296ed79139eba08c80918e00d94"; + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; }; - "simplediff-0.1.1" = { - name = "simplediff"; - packageName = "simplediff"; - version = "0.1.1"; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz"; - sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; - "yargs-7.1.0" = { - name = "yargs"; - packageName = "yargs"; - version = "7.1.0"; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; - sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; }; }; - "is-arguments-1.0.2" = { - name = "is-arguments"; - packageName = "is-arguments"; - version = "1.0.2"; + "os-locale-2.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.2.tgz"; - sha1 = "07e30ad79531844179b642d2d8399435182c8727"; + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; + sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy"; }; }; - "object.assign-4.0.4" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.0.4"; + "os-name-1.0.3" = { + name = "os-name"; + packageName = "os-name"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz"; - sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc"; + url = "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz"; + sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; }; }; - "define-properties-1.1.2" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.2"; + "os-name-2.0.1" = { + name = "os-name"; + packageName = "os-name"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; - sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; + url = "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz"; + sha1 = "b9a386361c17ae3a21736ef0599405c9a8c5dc5e"; }; }; - "bunyan-1.8.12" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.8.12"; + "os-shim-0.1.3" = { + name = "os-shim"; + packageName = "os-shim"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz"; - sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797"; + url = "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"; + sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917"; }; }; - "bunyan-syslog-udp-0.1.0" = { - name = "bunyan-syslog-udp"; - packageName = "bunyan-syslog-udp"; - version = "0.1.0"; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz"; - sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c"; + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "gelf-stream-1.1.1" = { - name = "gelf-stream"; - packageName = "gelf-stream"; - version = "1.1.1"; + "osenv-0.0.3" = { + name = "osenv"; + packageName = "osenv"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz"; - sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; + url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; }; }; - "hot-shots-4.8.0" = { - name = "hot-shots"; - packageName = "hot-shots"; - version = "4.8.0"; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.8.0.tgz"; - sha1 = "052be48430efc7d117ba7cc4d41f1833ba38c79f"; + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; - "limitation-0.2.0" = { - name = "limitation"; - packageName = "limitation"; - version = "0.2.0"; + "osx-release-1.1.0" = { + name = "osx-release"; + packageName = "osx-release"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/limitation/-/limitation-0.2.0.tgz"; - sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62"; + url = "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz"; + sha1 = "f217911a28136949af1bf9308b241e2737d3cd6c"; }; }; - "dnscache-1.0.1" = { - name = "dnscache"; - packageName = "dnscache"; - version = "1.0.1"; + "p-any-1.1.0" = { + name = "p-any"; + packageName = "p-any"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.1.tgz"; - sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; + url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz"; + sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i"; }; }; - "dtrace-provider-0.8.5" = { - name = "dtrace-provider"; - packageName = "dtrace-provider"; - version = "0.8.5"; + "p-cancelable-0.3.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz"; - sha1 = "98ebba221afac46e1c39fd36858d8f9367524b92"; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; + sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5"; }; }; - "mv-2.1.1" = { - name = "mv"; - packageName = "mv"; - version = "2.1.1"; + "p-cancelable-0.4.1" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; - sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; + sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw"; }; }; - "safe-json-stringify-1.0.4" = { - name = "safe-json-stringify"; - packageName = "safe-json-stringify"; - version = "1.0.4"; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz"; - sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "rimraf-2.4.5" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.4.5"; + "p-is-promise-1.1.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; - sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; + sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; }; }; - "gelfling-0.3.1" = { - name = "gelfling"; - packageName = "gelfling"; - version = "0.3.1"; + "p-limit-1.2.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz"; - sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz"; + sha512 = "2g0r6r6bbcdp6lrxbj2zbcihr1byd55kycm1ijz80l2zvmcvhqsbd7rhmfqylp004d61fibvmwzk4ig89dbyk4azpwgll7dllhsvwv3"; }; }; - "kad-git+https://github.com/gwicke/kad.git#master" = { - name = "kad"; - packageName = "kad"; - version = "1.3.6"; - src = fetchgit { - url = "https://github.com/gwicke/kad.git"; - rev = "936c91652d757ea6f9dd30e44698afb0daaa1d17"; - sha256 = "69b2ef001b9f4161dad34f5305a5895cfa9f98f124689277293fd544d06f9251"; + "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"; }; }; - "clarinet-0.11.0" = { - name = "clarinet"; - packageName = "clarinet"; - version = "0.11.0"; + "p-some-2.0.1" = { + name = "p-some"; + packageName = "p-some"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz"; - sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719"; + url = "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz"; + sha1 = "65d87c8b154edbcf5221d167778b6d2e150f6f06"; }; }; - "kad-fs-0.0.4" = { - name = "kad-fs"; - packageName = "kad-fs"; - version = "0.0.4"; + "p-timeout-1.2.1" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz"; - sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a"; + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz"; + sha1 = "5eb3b353b7fce99f101a1038880bb054ebbea386"; }; }; - "kad-localstorage-0.0.7" = { - name = "kad-localstorage"; - packageName = "kad-localstorage"; - version = "0.0.7"; + "p-timeout-2.0.1" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz"; - sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17"; + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; + sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk"; }; }; - "kad-memstore-0.0.1" = { - name = "kad-memstore"; - packageName = "kad-memstore"; - version = "0.0.1"; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz"; - sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; }; - "merge-1.2.0" = { - name = "merge"; - packageName = "merge"; - version = "1.2.0"; + "pac-proxy-agent-1.1.0" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz"; - sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da"; + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz"; + sha512 = "30jd44ckpmfj9prfhzc8bjvn5b5adxk93g9saif813id8mrvl3g1asrhz9l0bc2rp0i779wnhg1rjw80h2y7zk8v02ghq4bdh4hn4a0"; }; }; - "ms-0.7.3" = { - name = "ms"; - packageName = "ms"; - version = "0.7.3"; + "pac-resolver-2.0.0" = { + name = "pac-resolver"; + packageName = "pac-resolver"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz"; - sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff"; + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-2.0.0.tgz"; + sha1 = "99b88d2f193fbdeefc1c9a529c1f3260ab5277cd"; }; }; - "msgpack5-3.6.0" = { - name = "msgpack5"; - packageName = "msgpack5"; - version = "3.6.0"; + "package-json-1.2.0" = { + name = "package-json"; + packageName = "package-json"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz"; - sha512 = "3nr151ygx2w2pydaamcjrcn5ksl2rx09sdad8gh0rp1l07igigvfsw0xjjcnxrdws1rwy7g1j533qzhr7w25jisad6npv9rf1j84yz8"; + url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz"; + sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; }; }; - "dom-storage-2.0.2" = { - name = "dom-storage"; - packageName = "dom-storage"; - version = "2.0.2"; + "package-json-2.4.0" = { + name = "package-json"; + packageName = "package-json"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz"; - sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; + url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; + sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; }; }; - "lodash.clone-4.3.2" = { - name = "lodash.clone"; - packageName = "lodash.clone"; - version = "4.3.2"; + "package-json-4.0.1" = { + name = "package-json"; + packageName = "package-json"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz"; - sha1 = "e56b176b6823a7dde38f7f2bf58de7d5971200e9"; + url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz"; + sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; }; }; - "lodash._baseclone-4.5.7" = { - name = "lodash._baseclone"; - packageName = "lodash._baseclone"; - version = "4.5.7"; + "package-json-versionify-1.0.4" = { + name = "package-json-versionify"; + packageName = "package-json-versionify"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; - sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + url = "https://registry.npmjs.org/package-json-versionify/-/package-json-versionify-1.0.4.tgz"; + sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; }; }; - "yargs-parser-5.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "5.0.0"; + "pad-0.0.5" = { + name = "pad"; + packageName = "pad"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; - sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; + url = "https://registry.npmjs.org/pad/-/pad-0.0.5.tgz"; + sha1 = "2219ab4db2ac74549a676164bc475d68cb87de05"; }; }; - "airplayer-2.0.0" = { - name = "airplayer"; - packageName = "airplayer"; - version = "2.0.0"; + "pad-component-0.0.1" = { + name = "pad-component"; + packageName = "pad-component"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/airplayer/-/airplayer-2.0.0.tgz"; - sha1 = "7ab62d23b96d44234138aec1281d2e67ef190259"; + url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz"; + sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "clivas-0.2.0" = { - name = "clivas"; - packageName = "clivas"; - version = "0.2.0"; + "pako-0.2.9" = { + name = "pako"; + packageName = "pako"; + version = "0.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/clivas/-/clivas-0.2.0.tgz"; - sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; + url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; + sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; - "inquirer-1.2.3" = { - name = "inquirer"; - packageName = "inquirer"; - version = "1.2.3"; + "pako-1.0.6" = { + name = "pako"; + packageName = "pako"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz"; - sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; + url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; + sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; }; }; - "network-address-1.1.2" = { - name = "network-address"; - packageName = "network-address"; - version = "1.1.2"; + "parallel-transform-1.1.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz"; - sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; + sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; }; }; - "winreg-1.2.3" = { - name = "winreg"; - packageName = "winreg"; - version = "1.2.3"; + "param-case-2.1.1" = { + name = "param-case"; + packageName = "param-case"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz"; - sha1 = "93ad116b2696da87d58f7265a8fcea5254a965d5"; + url = "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz"; + sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; }; }; - "airplay-protocol-2.0.2" = { - name = "airplay-protocol"; - packageName = "airplay-protocol"; - version = "2.0.2"; + "parents-1.0.1" = { + name = "parents"; + packageName = "parents"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/airplay-protocol/-/airplay-protocol-2.0.2.tgz"; - sha1 = "b5b2a7137331f5545acbe196ba5693c13238fc5e"; + url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; + sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "appendable-cli-menu-2.0.0" = { - name = "appendable-cli-menu"; - packageName = "appendable-cli-menu"; - version = "2.0.0"; + "parse-asn1-5.1.0" = { + name = "parse-asn1"; + packageName = "parse-asn1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/appendable-cli-menu/-/appendable-cli-menu-2.0.0.tgz"; - sha1 = "dcfca9e509300e4c3b2d467965fe50c56fc75e66"; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; + sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; }; }; - "bonjour-3.5.0" = { - name = "bonjour"; - packageName = "bonjour"; - version = "3.5.0"; + "parse-entities-1.1.1" = { + name = "parse-entities"; + packageName = "parse-entities"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz"; - sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz"; + sha1 = "8112d88471319f27abae4d64964b122fe4e1b890"; }; }; - "bplist-creator-0.0.6" = { - name = "bplist-creator"; - packageName = "bplist-creator"; - version = "0.0.6"; + "parse-filepath-1.0.2" = { + name = "parse-filepath"; + packageName = "parse-filepath"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.6.tgz"; - sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e"; + url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; + sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; }; }; - "reverse-http-1.3.0" = { - name = "reverse-http"; - packageName = "reverse-http"; - version = "1.3.0"; + "parse-github-repo-url-1.4.1" = { + name = "parse-github-repo-url"; + packageName = "parse-github-repo-url"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.3.0.tgz"; - sha1 = "61a9644bdea483aa281ffb62706e642f1a73a239"; + url = "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz"; + sha1 = "9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"; }; }; - "consume-http-header-1.0.0" = { - name = "consume-http-header"; - packageName = "consume-http-header"; - version = "1.0.0"; + "parse-glob-3.0.4" = { + name = "parse-glob"; + packageName = "parse-glob"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/consume-http-header/-/consume-http-header-1.0.0.tgz"; - sha1 = "95976d74f7f1b38dfb13fd9b3b68b91a0240556f"; + url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; + sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; }; }; - "consume-until-1.0.0" = { - name = "consume-until"; - packageName = "consume-until"; - version = "1.0.0"; + "parse-headers-2.0.1" = { + name = "parse-headers"; + packageName = "parse-headers"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/consume-until/-/consume-until-1.0.0.tgz"; - sha1 = "75b91fa9f16663e51f98e863af995b9164068c1a"; + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz"; + sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; }; }; - "http-headers-3.0.1" = { - name = "http-headers"; - packageName = "http-headers"; - version = "3.0.1"; + "parse-help-0.1.1" = { + name = "parse-help"; + packageName = "parse-help"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-headers/-/http-headers-3.0.1.tgz"; - sha1 = "1cbc691c45cdf6d6c1dc63bf368b2505f56ef839"; + url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz"; + sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda"; }; }; - "buffer-indexof-1.1.1" = { - name = "buffer-indexof"; - packageName = "buffer-indexof"; - version = "1.1.1"; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; }; }; - "next-line-1.1.0" = { - name = "next-line"; - packageName = "next-line"; - version = "1.1.0"; + "parse-json-4.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz"; - sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; + url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; }; - "single-line-log-1.1.2" = { - name = "single-line-log"; - packageName = "single-line-log"; - version = "1.1.2"; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz"; - sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; - "array-flatten-2.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.1.1"; + "parse-torrent-4.1.0" = { + name = "parse-torrent"; + packageName = "parse-torrent"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz"; - sha1 = "426bb9da84090c1838d812c8150af20a8331e296"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-4.1.0.tgz"; + sha1 = "a814bd8505e8b58e88eb8ff3e2daff5d19a711b7"; }; }; - "dns-equal-1.0.0" = { - name = "dns-equal"; - packageName = "dns-equal"; - version = "1.0.0"; + "parse-torrent-5.8.3" = { + name = "parse-torrent"; + packageName = "parse-torrent"; + version = "5.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; - sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; + sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; }; }; - "dns-txt-2.0.2" = { - name = "dns-txt"; - packageName = "dns-txt"; - version = "2.0.2"; + "parse-torrent-file-2.1.4" = { + name = "parse-torrent-file"; + packageName = "parse-torrent-file"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; - sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-2.1.4.tgz"; + sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "multicast-dns-6.1.1" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "6.1.1"; + "parse-torrent-file-4.1.0" = { + name = "parse-torrent-file"; + packageName = "parse-torrent-file"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz"; - sha1 = "6e7de86a570872ab17058adea7160bbeca814dde"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.1.0.tgz"; + sha512 = "2cxnv563f946k2ng808an4gcj7yi23drqv8agns3h69drrbv0rq47wdi0xjs0lsvi1i36i7l1wzaci4c4gzzfy8ghfmv4k06hpb5ph5"; }; }; - "multicast-dns-service-types-1.1.0" = { - name = "multicast-dns-service-types"; - packageName = "multicast-dns-service-types"; - version = "1.1.0"; + "parse5-3.0.3" = { + name = "parse5"; + packageName = "parse5"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; - sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz"; + sha512 = "005xscj5zlz7pkxa5ngys7i7pdb2f4pirj1zw7hr1145zhxxgg04nhykjh1csy2ncr5lyjw8phq8m2ylqhfhi2z4hgvjb2b1rkbs0xf"; }; }; - "dns-packet-1.2.2" = { - name = "dns-packet"; - packageName = "dns-packet"; - version = "1.2.2"; + "parsejson-0.0.1" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz"; - sha512 = "0770ymyc0rv6a11mj3990d0z1jl1b2qxp4bapqa819y269sszfd96wn2y7pb6aw8bdgsn3bvpr7bmig5lcmkrxya13d5vc5y66q7pwh"; + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; + sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; }; }; - "external-editor-1.1.1" = { - name = "external-editor"; - packageName = "external-editor"; - version = "1.1.1"; + "parsejson-0.0.3" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz"; - sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; + sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; }; }; - "spawn-sync-1.0.15" = { - name = "spawn-sync"; - packageName = "spawn-sync"; - version = "1.0.15"; + "parseqs-0.0.2" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz"; - sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; + sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; }; }; - "tmp-0.0.29" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.29"; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz"; - sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; }; }; - "os-shim-0.1.3" = { - name = "os-shim"; - packageName = "os-shim"; - version = "0.1.3"; + "parserlib-0.2.5" = { + name = "parserlib"; + packageName = "parserlib"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"; - sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917"; + url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; + sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; }; }; - "connect-multiparty-2.1.0" = { - name = "connect-multiparty"; - packageName = "connect-multiparty"; - version = "2.1.0"; + "parserlib-1.1.1" = { + name = "parserlib"; + packageName = "parserlib"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.1.0.tgz"; - sha512 = "2im4bqk3xwxwilkg8gli3pblmalbhsd4wl5w10p63bvl0jd3m0qp5by840k5s7dr8wi0krixp2297bn76v38dwgznja4h4wp6my3g0c"; + url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz"; + sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4"; }; }; - "socket.io-1.7.4" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.7.4"; + "parseuri-0.0.2" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.4.tgz"; - sha1 = "2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00"; + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz"; + sha1 = "db41878f2d6964718be870b3140973d8093be156"; }; }; - "fluent-ffmpeg-2.1.2" = { - name = "fluent-ffmpeg"; - packageName = "fluent-ffmpeg"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.2.tgz"; - sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; + "parseuri-0.0.5" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; + sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; }; }; - "multiparty-4.1.3" = { - name = "multiparty"; - packageName = "multiparty"; - version = "4.1.3"; + "parseurl-1.3.2" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz"; - sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; + sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; }; }; - "engine.io-1.8.4" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.8.4"; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.4.tgz"; - sha1 = "77bce12b80e5d60429337fec3b0daf691ebc9003"; + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; - "socket.io-client-1.7.4" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.7.4"; + "passport-0.4.0" = { + name = "passport"; + packageName = "passport"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.4.tgz"; - sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281"; + url = "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz"; + sha1 = "c5095691347bd5ad3b5e180238c3914d16f05811"; }; }; - "ws-1.1.4" = { - name = "ws"; - packageName = "ws"; - version = "1.1.4"; + "passport-google-oauth-1.0.0" = { + name = "passport-google-oauth"; + packageName = "passport-google-oauth"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.4.tgz"; - sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61"; + url = "https://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-1.0.0.tgz"; + sha1 = "65f50633192ad0627a18b08960077109d84eb76d"; }; }; - "engine.io-client-1.8.4" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.8.4"; + "passport-google-oauth1-1.0.0" = { + name = "passport-google-oauth1"; + packageName = "passport-google-oauth1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.4.tgz"; - sha1 = "9fe85dee25853ca6babe25bd2ad68710863e91c2"; + url = "https://registry.npmjs.org/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz"; + sha1 = "af74a803df51ec646f66a44d82282be6f108e0cc"; }; }; - "extract-zip-1.5.0" = { - name = "extract-zip"; - packageName = "extract-zip"; - version = "1.5.0"; + "passport-google-oauth20-1.0.0" = { + name = "passport-google-oauth20"; + packageName = "passport-google-oauth20"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz"; - sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; + url = "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-1.0.0.tgz"; + sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0"; }; }; - "request-2.67.0" = { - name = "request"; - packageName = "request"; - version = "2.67.0"; + "passport-http-bearer-1.0.1" = { + name = "passport-http-bearer"; + packageName = "passport-http-bearer"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; - sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; + url = "https://registry.npmjs.org/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz"; + sha1 = "147469ea3669e2a84c6167ef99dbb77e1f0098a8"; }; }; - "which-1.2.14" = { - name = "which"; - packageName = "which"; - version = "1.2.14"; + "passport-local-1.0.0" = { + name = "passport-local"; + packageName = "passport-local"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; - sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; + url = "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz"; + sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "concat-stream-1.5.0" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.5.0"; + "passport-oauth1-1.1.0" = { + name = "passport-oauth1"; + packageName = "passport-oauth1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"; - sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611"; + url = "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.1.0.tgz"; + sha1 = "a7de988a211f9cf4687377130ea74df32730c918"; }; }; - "bl-1.0.3" = { - name = "bl"; - packageName = "bl"; - version = "1.0.3"; + "passport-oauth2-1.4.0" = { + name = "passport-oauth2"; + packageName = "passport-oauth2"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz"; + sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad"; }; }; - "qs-5.2.1" = { - name = "qs"; - packageName = "qs"; - version = "5.2.1"; + "passport-oauth2-client-password-0.1.2" = { + name = "passport-oauth2-client-password"; + packageName = "passport-oauth2-client-password"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz"; - sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc"; + url = "https://registry.npmjs.org/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz"; + sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba"; }; }; - "tough-cookie-2.2.2" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.2.2"; + "passport-strategy-1.0.0" = { + name = "passport-strategy"; + packageName = "passport-strategy"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; - sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; + sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; }; }; - "browserify-13.3.0" = { - name = "browserify"; - packageName = "browserify"; - version = "13.3.0"; + "passwd-user-2.1.0" = { + name = "passwd-user"; + packageName = "passwd-user"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; - sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; + url = "https://registry.npmjs.org/passwd-user/-/passwd-user-2.1.0.tgz"; + sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; }; }; - "browserify-incremental-3.1.1" = { - name = "browserify-incremental"; - packageName = "browserify-incremental"; - version = "3.1.1"; + "path-browserify-0.0.0" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-incremental/-/browserify-incremental-3.1.1.tgz"; - sha1 = "0713cb7587247a632a9f08cf1bd169b878b62a8a"; + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; }; }; - "node-static-0.7.10" = { - name = "node-static"; - packageName = "node-static"; - version = "0.7.10"; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-static/-/node-static-0.7.10.tgz"; - sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd"; + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; }; }; - "string-stream-0.0.7" = { - name = "string-stream"; - packageName = "string-stream"; - version = "0.0.7"; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-stream/-/string-stream-0.0.7.tgz"; - sha1 = "cfcde82799fa62f303429aaa79336ee8834332fe"; + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; }; }; - "tree-kill-1.2.0" = { - name = "tree-kill"; - packageName = "tree-kill"; - version = "1.2.0"; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz"; - sha512 = "1r0mixygpdqrm2fn92z4cyxzbnvimm16k5gdm2m2jxx8wrj3w0mql9s748hcqp2nzcnybnw74wkm211zlr9ld0j2x1q8f153mszlm8f"; + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; }; - "watchpack-1.4.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.4.0"; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz"; - sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac"; + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "https-browserify-0.0.1" = { - name = "https-browserify"; - packageName = "https-browserify"; - version = "0.0.1"; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; - sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; }; }; - "JSONStream-0.10.0" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "0.10.0"; + "path-key-1.0.0" = { + name = "path-key"; + packageName = "path-key"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz"; - sha1 = "74349d0d89522b71f30f0a03ff9bd20ca6f12ac0"; + url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; + sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; }; }; - "browserify-cache-api-3.0.1" = { - name = "browserify-cache-api"; - packageName = "browserify-cache-api"; - version = "3.0.1"; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz"; - sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02"; + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "less-2.7.3" = { - name = "less"; - packageName = "less"; - version = "2.7.3"; + "path-loader-1.0.4" = { + name = "path-loader"; + packageName = "path-loader"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; - sha512 = "04jbm6adzhknlcwjjdd94n8dhqwgsg0fyampis9854jf23z9g9lxs8593908ymwldl88bjipf9b9rw6xfibb29vv7s0c44wllj4ixr8"; + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz"; + sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk"; }; }; - "less-middleware-2.2.1" = { - name = "less-middleware"; - packageName = "less-middleware"; - version = "2.2.1"; + "path-parse-1.0.5" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/less-middleware/-/less-middleware-2.2.1.tgz"; - sha512 = "059c8rz6wkzc3fwd62a6f3lfw3h9sxj2fr0jjyr1i9kwfvk3737xyzndyshklllx5gnfri9z2g9a28c2ccnd6ka6adn6i7h4z5frw6m"; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; + sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; }; }; - "libquassel-2.1.9" = { - name = "libquassel"; - packageName = "libquassel"; - version = "2.1.9"; + "path-platform-0.11.15" = { + name = "path-platform"; + packageName = "path-platform"; + version = "0.11.15"; src = fetchurl { - url = "https://registry.npmjs.org/libquassel/-/libquassel-2.1.9.tgz"; - sha1 = "e80ad2ef5c081ac677f66515d107537fdc0f5c64"; + url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; + sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; }; }; - "net-browserify-alt-1.1.0" = { - name = "net-browserify-alt"; - packageName = "net-browserify-alt"; - version = "1.1.0"; + "path-proxy-1.0.0" = { + name = "path-proxy"; + packageName = "path-proxy"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/net-browserify-alt/-/net-browserify-alt-1.1.0.tgz"; - sha1 = "02c9ecac88437be23f5948b208a1e65d8d138a73"; + url = "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz"; + sha1 = "18e8a36859fc9d2f1a53b48dee138543c020de5e"; }; }; - "pug-2.0.0-rc.4" = { - name = "pug"; - packageName = "pug"; - version = "2.0.0-rc.4"; + "path-root-0.1.1" = { + name = "path-root"; + packageName = "path-root"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.4.tgz"; - sha512 = "1fbygi6jg8awam3agrc63yjlgxk8vfpnym1ql4dikclikp3kdrxfpfgdywadidzzic33b9fdqnwqy6ag82m4x6kmgl644zsz2ig3gj8"; + url = "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"; + sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; }; }; - "httpolyglot-0.1.2" = { - name = "httpolyglot"; - packageName = "httpolyglot"; + "path-root-regex-0.1.2" = { + name = "path-root-regex"; + packageName = "path-root-regex"; version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.2.tgz"; - sha1 = "e4d347fe8984a62f467d4060df527f1851f6997b"; + url = "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"; + sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; }; }; - "image-size-0.5.5" = { - name = "image-size"; - packageName = "image-size"; - version = "0.5.5"; + "path-to-regexp-0.1.3" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"; - sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"; + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; + sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; }; }; - "node.extend-2.0.0" = { - name = "node.extend"; - packageName = "node.extend"; - version = "2.0.0"; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/node.extend/-/node.extend-2.0.0.tgz"; - sha1 = "7525a2875677ea534784a5e10ac78956139614df"; + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "is-3.2.1" = { - name = "is"; - packageName = "is"; - version = "3.2.1"; + "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/is/-/is-3.2.1.tgz"; - sha1 = "d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"; + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; }; }; - "eventemitter2-3.0.2" = { - name = "eventemitter2"; - packageName = "eventemitter2"; - version = "3.0.2"; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-3.0.2.tgz"; - sha1 = "81c0edb739ffa64fb9f21bbcb1d2b419a5133512"; + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "qtdatastream-0.7.1" = { - name = "qtdatastream"; - packageName = "qtdatastream"; - version = "0.7.1"; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/qtdatastream/-/qtdatastream-0.7.1.tgz"; - sha1 = "8085d390b4c19f7b02dee8a7cd873e2af58667b5"; + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; }; }; - "int64-buffer-0.1.9" = { - name = "int64-buffer"; - packageName = "int64-buffer"; - version = "0.1.9"; + "path-type-3.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.9.tgz"; - sha1 = "9e039da043b24f78b196b283e04653ef5e990f61"; + url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; + sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; }; }; - "bufferutil-2.0.1" = { - name = "bufferutil"; - packageName = "bufferutil"; - version = "2.0.1"; + "pathval-1.1.0" = { + name = "pathval"; + packageName = "pathval"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-2.0.1.tgz"; - sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288"; + url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; + sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; }; }; - "nan-2.5.1" = { - name = "nan"; - packageName = "nan"; - version = "2.5.1"; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; - sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; }; }; - "prebuild-install-2.1.2" = { - name = "prebuild-install"; - packageName = "prebuild-install"; - version = "2.1.2"; + "pause-0.1.0" = { + name = "pause"; + packageName = "pause"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.1.2.tgz"; - sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; + url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz"; + sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74"; }; }; - "expand-template-1.1.0" = { - name = "expand-template"; - packageName = "expand-template"; - version = "1.1.0"; + "pause-stream-0.0.11" = { + name = "pause-stream"; + packageName = "pause-stream"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz"; - sha512 = "34i2f4clwy5bpzgl137zwplybp5hn6ncxq0p794cx9m0crhgk31nfy0s8wp1v6hvw90h20c268r040g892dixy6zqq1xlm3ra8g0j4j"; + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; }; }; - "github-from-package-0.0.0" = { - name = "github-from-package"; - packageName = "github-from-package"; - version = "0.0.0"; + "pbkdf2-3.0.14" = { + name = "pbkdf2"; + packageName = "pbkdf2"; + version = "3.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; - sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"; + sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; }; }; - "node-abi-2.1.2" = { - name = "node-abi"; - packageName = "node-abi"; - version = "2.1.2"; + "peer-wire-protocol-0.7.1" = { + name = "peer-wire-protocol"; + packageName = "peer-wire-protocol"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz"; - sha512 = "1sd6l8zqa18mlzackwy8vns51zjp8xyrd97nc514b0yvndd0y0wsyx2q9h8zr0k9kra5ys1yq75ggkv5av69cyzxji19rdvr5pjsrc6"; + url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.1.tgz"; + sha512 = "2dzhv7b379pzls7q7kd168h4ckh3gnfxcizknb8bvqrpxrm847vjc8c0vpn1b490k94sgl5yxndfiw30rply4phymrx6z2wyrmi7njp"; }; }; - "noop-logger-0.1.1" = { - name = "noop-logger"; - packageName = "noop-logger"; - version = "0.1.1"; + "peer-wire-swarm-0.12.2" = { + name = "peer-wire-swarm"; + packageName = "peer-wire-swarm"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"; - sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; + url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.2.tgz"; + sha512 = "3bchr23xpdvjf588f8qx52ylri5kcqnqi4lf4mgh3i0j8sk1cljvsikd47l09jk4v3drg500q3p5q01nm2z4xfj4fk5xxnbfkb9k1dh"; }; }; - "simple-get-1.4.3" = { - name = "simple-get"; - packageName = "simple-get"; - version = "1.4.3"; + "peerflix-0.34.0" = { + name = "peerflix"; + packageName = "peerflix"; + version = "0.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz"; - sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.34.0.tgz"; + sha1 = "748f7e401284bf8f2c620264d229223304199dbe"; }; }; - "tar-fs-1.16.0" = { - name = "tar-fs"; - packageName = "tar-fs"; - version = "1.16.0"; + "pegjs-0.10.0" = { + name = "pegjs"; + packageName = "pegjs"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz"; - sha512 = "1i39d75rgrl2a3v3x65w7bz6az06sg7xdvp7j9zk5bqilj5znclmr7r5n9l6la6nkqikn4lkhnfrgp4hzbvp6ph77nn53g6zvmdpni3"; + url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; + sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; - "pug-code-gen-2.0.0" = { - name = "pug-code-gen"; - packageName = "pug-code-gen"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.0.tgz"; - sha512 = "1b9phnpcwd902482wvyql8a4h9wr1fw5idsjvg14bjvkmvxharb8m2ca25rj2f0s4i9sdldp2fj02i5933qys4921r9p7w97wjj52hk"; + "pegjs-git+https://github.com/tstarling/pegjs#fork" = { + name = "pegjs"; + packageName = "pegjs"; + version = "0.8.0"; + src = fetchgit { + url = "https://github.com/tstarling/pegjs"; + rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584"; + sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905"; }; }; - "pug-filters-2.1.5" = { - name = "pug-filters"; - packageName = "pug-filters"; - version = "2.1.5"; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.5.tgz"; - sha512 = "0nihpmd2irqm58nrnc382aqyb787sw551g74fc4500j4kda6qxhvahknqahl918pizcx97wp64fq34m2kksp8p2jlqqn2vbmga3nk66"; + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; - "pug-lexer-3.1.0" = { - name = "pug-lexer"; - packageName = "pug-lexer"; - version = "3.1.0"; + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz"; - sha1 = "fd087376d4a675b4f59f8fef422883434e9581a2"; + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; }; }; - "pug-linker-3.0.3" = { - name = "pug-linker"; - packageName = "pug-linker"; - version = "3.0.3"; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.3.tgz"; - sha512 = "3j4v4ah7h6m44m7z40iqkmsdyyjb0azz5ajifi5v4byld75vrl715r2xnc8vhm4z1v686m55yyxhlcmzx4cby2ssv4yqp221779q8hc"; + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pug-load-2.0.9" = { - name = "pug-load"; - packageName = "pug-load"; - version = "2.0.9"; + "phantomjs-1.9.20" = { + name = "phantomjs"; + packageName = "phantomjs"; + version = "1.9.20"; src = fetchurl { - url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.9.tgz"; - sha512 = "3liz20386ljxz81ia1jz31fljanr88zp0br2b45lrjdzr40slg2nkyz3xi7bsqam2zixzb86hspwvl734ac36f8shz6iqpf58w5jdq4"; + url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.20.tgz"; + sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; - "pug-parser-4.0.0" = { - name = "pug-parser"; - packageName = "pug-parser"; - version = "4.0.0"; + "phantomjs-prebuilt-2.1.16" = { + name = "phantomjs-prebuilt"; + packageName = "phantomjs-prebuilt"; + version = "2.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/pug-parser/-/pug-parser-4.0.0.tgz"; - sha512 = "11a3hd10qhnpzmdrgqwndjjzmgqz090q2l89jmaqvjm0lnlrxcqig1fi0d92wxna26d18g8ywv4n9msnnlb5x2qq2qdc6sbywa19hd1"; + url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz"; + sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; }; }; - "pug-runtime-2.0.3" = { - name = "pug-runtime"; - packageName = "pug-runtime"; - version = "2.0.3"; + "piece-length-1.0.0" = { + name = "piece-length"; + packageName = "piece-length"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.3.tgz"; - sha1 = "98162607b0fce9e254d427f33987a5aee7168bda"; + url = "https://registry.npmjs.org/piece-length/-/piece-length-1.0.0.tgz"; + sha1 = "4db7167157fd69fef14caf7262cd39f189b24508"; }; }; - "pug-strip-comments-1.0.2" = { - name = "pug-strip-comments"; - packageName = "pug-strip-comments"; - version = "1.0.2"; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz"; - sha1 = "d313afa01bcc374980e1399e23ebf2eb9bdc8513"; + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; }; }; - "constantinople-3.1.0" = { - name = "constantinople"; - packageName = "constantinople"; - version = "3.1.0"; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz"; - sha1 = "7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"; + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; - "doctypes-1.1.0" = { - name = "doctypes"; - packageName = "doctypes"; - version = "1.1.0"; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"; - sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9"; + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; }; }; - "js-stringify-1.0.2" = { - name = "js-stringify"; - packageName = "js-stringify"; - version = "1.0.2"; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"; - sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db"; + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pug-attrs-2.0.2" = { - name = "pug-attrs"; - packageName = "pug-attrs"; - version = "2.0.2"; + "pino-4.14.0" = { + name = "pino"; + packageName = "pino"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz"; - sha1 = "8be2b2225568ffa75d1b866982bff9f4111affcb"; + url = "https://registry.npmjs.org/pino/-/pino-4.14.0.tgz"; + sha512 = "1x3dsg8pg321khfaf3dd91ykkwhdn60wk169l3b2kp8wkbw242ld99qiv7cmbn76ccba75wdydv8mb2v4fg58lrfnn7jf5pvk2x7qwy"; }; }; - "pug-error-1.3.2" = { - name = "pug-error"; - packageName = "pug-error"; - version = "1.3.2"; + "pino-std-serializers-1.2.0" = { + name = "pino-std-serializers"; + packageName = "pino-std-serializers"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz"; - sha1 = "53ae7d9d29bb03cf564493a026109f54c47f5f26"; + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-1.2.0.tgz"; + sha512 = "0h8xndhy3qwgkycbmypfp7a2dvk875prgnfg46zj9vz14i24xqqdw1xp748hkv2xl2phwhyaa82yr1ym6jn6r61527kz5f7f8qird78"; }; }; - "with-5.1.1" = { - name = "with"; - packageName = "with"; - version = "5.1.1"; + "pkg-dir-2.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/with/-/with-5.1.1.tgz"; - sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe"; + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; }; }; - "is-expression-2.1.0" = { - name = "is-expression"; - packageName = "is-expression"; - version = "2.1.0"; + "pkg-up-2.0.0" = { + name = "pkg-up"; + packageName = "pkg-up"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-expression/-/is-expression-2.1.0.tgz"; - sha1 = "91be9d47debcfef077977e9722be6dcfb4465ef0"; + url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; }; }; - "acorn-globals-3.1.0" = { - name = "acorn-globals"; - packageName = "acorn-globals"; - version = "3.1.0"; + "pkginfo-0.2.3" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz"; - sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf"; + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; + sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8"; }; }; - "pug-walk-1.1.5" = { - name = "pug-walk"; - packageName = "pug-walk"; - version = "1.1.5"; + "pkginfo-0.3.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.5.tgz"; - sha512 = "1418rf52jpq3k5l26drb11156l945688pjpia6njqrxzgffjb2rric213vrqigglhmhwc0r57zsmlknnwvhg5w9nh025b6yapb4g6dc"; + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; + sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; - "jstransformer-1.0.0" = { - name = "jstransformer"; - packageName = "jstransformer"; - version = "1.0.0"; + "pkginfo-0.4.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"; - sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"; + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz"; + sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; - "character-parser-2.2.0" = { - name = "character-parser"; - packageName = "character-parser"; - version = "2.2.0"; + "playerui-1.3.0" = { + name = "playerui"; + packageName = "playerui"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz"; - sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; + url = "https://registry.npmjs.org/playerui/-/playerui-1.3.0.tgz"; + sha1 = "a32b907f28d17f61b74d45d46fd89dea3c4e88b5"; }; }; - "is-expression-3.0.0" = { - name = "is-expression"; - packageName = "is-expression"; - version = "3.0.0"; + "please-upgrade-node-3.0.1" = { + name = "please-upgrade-node"; + packageName = "please-upgrade-node"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz"; - sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f"; + url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz"; + sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db"; }; }; - "is-regex-1.0.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.0.4"; + "plist-1.2.0" = { + name = "plist"; + packageName = "plist"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz"; + sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; }; }; - "token-stream-0.0.1" = { - name = "token-stream"; - packageName = "token-stream"; - version = "0.0.1"; + "plist-2.0.1" = { + name = "plist"; + packageName = "plist"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz"; - sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"; + url = "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz"; + sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; }; }; - "commoner-0.10.8" = { - name = "commoner"; - packageName = "commoner"; - version = "0.10.8"; + "plist-3.0.1" = { + name = "plist"; + packageName = "plist"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz"; - sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5"; + url = "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz"; + sha512 = "12n868myk28as4ivyihfw9ai50y0vc1jrr77r55drlidyi7qpwlm23aj9n05qqlzhs544yah6p535b5hiayh6xykf81q68wg8f2z60s"; }; }; - "jstransform-10.1.0" = { - name = "jstransform"; - packageName = "jstransform"; - version = "10.1.0"; + "plist-with-patches-0.5.1" = { + name = "plist-with-patches"; + packageName = "plist-with-patches"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz"; - sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; + url = "https://registry.npmjs.org/plist-with-patches/-/plist-with-patches-0.5.1.tgz"; + sha1 = "868aae2e0df8989b026562b35cbc19cfd8bb780d"; }; }; - "recast-0.11.23" = { - name = "recast"; - packageName = "recast"; - version = "0.11.23"; + "pluralize-1.2.1" = { + name = "pluralize"; + packageName = "pluralize"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz"; - sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; + url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; + sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; }; }; - "ast-types-0.9.6" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.9.6"; + "pluralize-7.0.0" = { + name = "pluralize"; + packageName = "pluralize"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz"; - sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"; + url = "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz"; + sha512 = "2ihaln20qjx82jx73wgzirbyp8mfmhxr75am1h0w8n5hy2gsbgvw9dricv7h57ycxzax84bma96wjscmdszs5mr2lsyxpfjvhwl2601"; }; }; - "base62-0.1.1" = { - name = "base62"; - packageName = "base62"; - version = "0.1.1"; + "po2json-0.4.5" = { + name = "po2json"; + packageName = "po2json"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz"; - sha1 = "7b4174c2f94449753b11c2651c083da841a7b084"; + url = "https://registry.npmjs.org/po2json/-/po2json-0.4.5.tgz"; + sha1 = "47bb2952da32d58a1be2f256a598eebc0b745118"; }; }; - "esprima-fb-13001.1001.0-dev-harmony-fb" = { - name = "esprima-fb"; - packageName = "esprima-fb"; - version = "13001.1001.0-dev-harmony-fb"; + "policyfile-0.0.4" = { + name = "policyfile"; + packageName = "policyfile"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz"; - sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; + url = "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"; + sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d"; }; }; - "source-map-0.1.31" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.31"; + "pop-iterate-1.0.1" = { + name = "pop-iterate"; + packageName = "pop-iterate"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; - sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; + url = "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz"; + sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"; }; }; - "aws-sdk-1.18.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "1.18.0"; + "poplib-0.1.7" = { + name = "poplib"; + packageName = "poplib"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; - sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; + url = "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz"; + sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; }; }; - "commander-2.0.0" = { - name = "commander"; - packageName = "commander"; - version = "2.0.0"; + "popsicle-9.2.0" = { + name = "popsicle"; + packageName = "popsicle"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; - sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; + url = "https://registry.npmjs.org/popsicle/-/popsicle-9.2.0.tgz"; + sha512 = "23p3a888k27q99lj4904nbcs8r51nlm4qdzs3m0xp9y4ci1rxzymzzckrblrmlmbzrlxx4i9zx7s56gcrhvi2jm3ypr3lvhgy7m3sx5"; }; }; - "http-auth-2.0.7" = { - name = "http-auth"; - packageName = "http-auth"; - version = "2.0.7"; + "popsicle-proxy-agent-3.0.0" = { + name = "popsicle-proxy-agent"; + packageName = "popsicle-proxy-agent"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz"; - sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3"; + url = "https://registry.npmjs.org/popsicle-proxy-agent/-/popsicle-proxy-agent-3.0.0.tgz"; + sha1 = "b9133c55d945759ab7ee61b7711364620d3aeadc"; }; }; - "express-3.4.4" = { - name = "express"; - packageName = "express"; - version = "3.4.4"; + "popsicle-retry-3.2.1" = { + name = "popsicle-retry"; + packageName = "popsicle-retry"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.4.4.tgz"; - sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; + url = "https://registry.npmjs.org/popsicle-retry/-/popsicle-retry-3.2.1.tgz"; + sha1 = "e06e866533b42a7a123eb330cbe63a7cebcba10c"; }; }; - "everyauth-0.4.5" = { - name = "everyauth"; - packageName = "everyauth"; - version = "0.4.5"; + "popsicle-rewrite-1.0.0" = { + name = "popsicle-rewrite"; + packageName = "popsicle-rewrite"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; - sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189"; + url = "https://registry.npmjs.org/popsicle-rewrite/-/popsicle-rewrite-1.0.0.tgz"; + sha1 = "1dd4e8ea9c3182351fb820f87934d992f7fb9007"; }; }; - "string-1.6.1" = { - name = "string"; - packageName = "string"; - version = "1.6.1"; + "popsicle-status-2.0.1" = { + name = "popsicle-status"; + packageName = "popsicle-status"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/string/-/string-1.6.1.tgz"; - sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55"; + url = "https://registry.npmjs.org/popsicle-status/-/popsicle-status-2.0.1.tgz"; + sha1 = "8dd70c4fe7c694109add784ffe80eacac1e7b28d"; }; }; - "util-0.4.9" = { - name = "util"; - packageName = "util"; - version = "0.4.9"; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.4.9.tgz"; - sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3"; + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; - "crypto-0.0.3" = { - name = "crypto"; - packageName = "crypto"; - version = "0.0.3"; + "postcss-6.0.19" = { + name = "postcss"; + packageName = "postcss"; + version = "6.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz"; - sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0"; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz"; + sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz"; }; }; - "xml2js-0.2.4" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.2.4"; + "postcss-6.0.21" = { + name = "postcss"; + packageName = "postcss"; + version = "6.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz"; - sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d"; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz"; + sha512 = "1vvp2mzw4gq6zm875fi7hgyypy0a44mbdpv0i4aqxsq8xajdxfyaz4ap4idh29v74ag4z26wla48k315yyg3d0h83zxkn1kniywmxnb"; }; }; - "xmlbuilder-0.4.2" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "0.4.2"; + "prebuild-install-2.1.2" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; - sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.1.2.tgz"; + sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; }; }; - "coffee-script-1.6.3" = { - name = "coffee-script"; - packageName = "coffee-script"; - version = "1.6.3"; + "prebuild-install-2.5.1" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; - sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.1.tgz"; + sha512 = "013s09xwdppxw3n9h0vz22br6q1dc5rkh8pk9nk3xl0pqsv495qj1y8k5srgmgm7692q1hlyj08nrfbr9nr232bsrkcvhbkm8pzsdfw"; }; }; - "node-uuid-1.4.1" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.1"; + "precond-0.2.3" = { + name = "precond"; + packageName = "precond"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + url = "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz"; + sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac"; }; }; - "connect-2.11.0" = { - name = "connect"; - packageName = "connect"; - version = "2.11.0"; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.11.0.tgz"; - sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284"; + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; }; }; - "commander-1.3.2" = { - name = "commander"; - packageName = "commander"; - version = "1.3.2"; + "prepend-http-1.0.4" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; - sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; }; }; - "cookie-0.1.0" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.0"; + "prepend-http-2.0.0" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; - sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; }; }; - "buffer-crc32-0.2.1" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.2.1"; + "preserve-0.2.0" = { + name = "preserve"; + packageName = "preserve"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; - sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; + url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; + sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; }; }; - "fresh-0.2.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.2.0"; + "prettier-bytes-1.0.4" = { + name = "prettier-bytes"; + packageName = "prettier-bytes"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz"; - sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"; + url = "https://registry.npmjs.org/prettier-bytes/-/prettier-bytes-1.0.4.tgz"; + sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6"; }; }; - "methods-0.1.0" = { - name = "methods"; - packageName = "methods"; - version = "0.1.0"; + "pretty-hash-1.0.1" = { + name = "pretty-hash"; + packageName = "pretty-hash"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; - sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; + url = "https://registry.npmjs.org/pretty-hash/-/pretty-hash-1.0.1.tgz"; + sha1 = "16e0579188def56bdb565892bcd05a5d65324807"; }; }; - "send-0.1.4" = { - name = "send"; - packageName = "send"; - version = "0.1.4"; + "pretty-hrtime-1.0.3" = { + name = "pretty-hrtime"; + packageName = "pretty-hrtime"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.1.4.tgz"; - sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; + url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; + sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; - "qs-0.6.5" = { - name = "qs"; - packageName = "qs"; - version = "0.6.5"; + "prettyjson-1.2.1" = { + name = "prettyjson"; + packageName = "prettyjson"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; - sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; + url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz"; + sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289"; }; }; - "bytes-0.2.1" = { - name = "bytes"; - packageName = "bytes"; - version = "0.2.1"; + "prfun-2.1.5" = { + name = "prfun"; + packageName = "prfun"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; - sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31"; + url = "https://registry.npmjs.org/prfun/-/prfun-2.1.5.tgz"; + sha512 = "2x2535hml3hmhh6qbsl9r97mpa264mbpvmv0lbsqsfkv3sfd8wv7zw1b68555qsj5c6ma4b66qkgdsrr6355lhbmz052hqzq2qx082h"; }; }; - "raw-body-0.0.3" = { - name = "raw-body"; - packageName = "raw-body"; - version = "0.0.3"; + "private-0.1.8" = { + name = "private"; + packageName = "private"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz"; - sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a"; + url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; + sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; }; }; - "negotiator-0.3.0" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.3.0"; + "probe-image-size-4.0.0" = { + name = "probe-image-size"; + packageName = "probe-image-size"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; - sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"; + url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-4.0.0.tgz"; + sha512 = "1qwy2hmhw201igjdk90dpky6b1qpc9b2jm7nxrsshcagf0ln73s62mwfd2j0mkfx29bhsndjmm8v2fk3nwk8jinzavcz9iicnyx2vly"; }; }; - "multiparty-2.2.0" = { - name = "multiparty"; - packageName = "multiparty"; - version = "2.2.0"; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; - sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; }; }; - "oauth-https://github.com/ciaranj/node-oauth/tarball/master" = { - name = "oauth"; - packageName = "oauth"; - version = "0.9.15"; + "process-0.5.2" = { + name = "process"; + packageName = "process"; + version = "0.5.2"; src = fetchurl { - name = "oauth-0.9.15.tar.gz"; - url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; - sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; + url = "https://registry.npmjs.org/process/-/process-0.5.2.tgz"; + sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; }; }; - "connect-2.3.9" = { - name = "connect"; - packageName = "connect"; - version = "2.3.9"; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.3.9.tgz"; - sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; - "openid-2.0.6" = { - name = "openid"; - packageName = "openid"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz"; - sha1 = "707375e59ab9f73025899727679b20328171c9aa"; - }; - }; - "node-swt-0.1.1" = { - name = "node-swt"; - packageName = "node-swt"; - version = "0.1.1"; + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz"; - sha1 = "af0903825784be553b93dbae57d99d59060585dd"; + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; }; }; - "node-wsfederation-0.1.1" = { - name = "node-wsfederation"; - packageName = "node-wsfederation"; - version = "0.1.1"; + "progress-1.1.8" = { + name = "progress"; + packageName = "progress"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz"; - sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b"; + url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; + sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; - "debug-0.5.0" = { - name = "debug"; - packageName = "debug"; - version = "0.5.0"; + "progress-2.0.0" = { + name = "progress"; + packageName = "progress"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; - sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e"; + url = "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz"; + sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"; }; }; - "crc-0.2.0" = { - name = "crc"; - packageName = "crc"; - version = "0.2.0"; + "progress-string-1.2.2" = { + name = "progress-string"; + packageName = "progress-string"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz"; - sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; + url = "https://registry.npmjs.org/progress-string/-/progress-string-1.2.2.tgz"; + sha512 = "07n7s98b5fqdx9jspg14zkw0dndfdpbrd12f5nj5c7m6aifvl4nn27qdbrgy6gzb837cs86cakldqh5kwbi7fv6ra9ll9q83qhsya97"; }; }; - "cookie-0.0.4" = { - name = "cookie"; - packageName = "cookie"; - version = "0.0.4"; + "promiscuous-0.6.0" = { + name = "promiscuous"; + packageName = "promiscuous"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz"; - sha1 = "5456bd47aee2666eac976ea80a6105940483fe98"; + url = "https://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz"; + sha1 = "54014cd3d62cafe831e3354990c05ff5b78c8892"; }; }; - "bytes-0.1.0" = { - name = "bytes"; - packageName = "bytes"; - version = "0.1.0"; + "promise-2.0.0" = { + name = "promise"; + packageName = "promise"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz"; - sha1 = "c574812228126d6369d1576925a8579db3f8e5a2"; + url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; + sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; }; }; - "send-0.0.3" = { - name = "send"; - packageName = "send"; - version = "0.0.3"; + "promise-6.1.0" = { + name = "promise"; + packageName = "promise"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.0.3.tgz"; - sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184"; + url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz"; + sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6"; }; }; - "events.node-0.4.9" = { - name = "events.node"; - packageName = "events.node"; - version = "0.4.9"; + "promise-7.3.1" = { + name = "promise"; + packageName = "promise"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz"; - sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; + url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; + sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy"; }; }; - "args-3.0.7" = { - name = "args"; - packageName = "args"; - version = "3.0.7"; + "promise-finally-3.0.0" = { + name = "promise-finally"; + packageName = "promise-finally"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/args/-/args-3.0.7.tgz"; - sha512 = "1qi9fsw42grlhv4aj7v42xikvicr5657809syvp4dca33fjzzr1h7x1q9zwhclpyb879g6bgb2yd4i2iasnpmxn8ng1dcnq85yg001r"; + url = "https://registry.npmjs.org/promise-finally/-/promise-finally-3.0.0.tgz"; + sha1 = "ddd5d0f895432b1206ceb8da1275064d18e7aa23"; }; }; - "clipboardy-1.1.4" = { - name = "clipboardy"; - packageName = "clipboardy"; - version = "1.1.4"; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.1.4.tgz"; - sha1 = "51b17574fc682588e2dd295cfa6e6aa109eab5ee"; + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; - "detect-port-1.2.1" = { - name = "detect-port"; - packageName = "detect-port"; - version = "1.2.1"; + "promise-phantom-3.1.6" = { + name = "promise-phantom"; + packageName = "promise-phantom"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/detect-port/-/detect-port-1.2.1.tgz"; - sha512 = "0r0mpkpa1r78cmagyv47v38fc8ik7pr3zvlnqg57v8nkh4ipd83rla5s1j2c8gymfbwzzlna6pp7h9xw94h93gic3l2z9hzpd68p9fq"; + url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz"; + sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; }; }; - "filesize-3.5.11" = { - name = "filesize"; - packageName = "filesize"; - version = "3.5.11"; + "promised-temp-0.1.0" = { + name = "promised-temp"; + packageName = "promised-temp"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz"; - sha512 = "3bg35im21jf6dhyrcajczdjl3rjm5mphdhansyfbpzm067vv3jp91n43nrzxf8q6nx3b5vkn2my1rskyp4pmg91xzdq01lawyifazk4"; + url = "https://registry.npmjs.org/promised-temp/-/promised-temp-0.1.0.tgz"; + sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; }; }; - "micro-9.0.0" = { - name = "micro"; - packageName = "micro"; - version = "9.0.0"; + "prompt-0.2.14" = { + name = "prompt"; + packageName = "prompt"; + version = "0.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/micro/-/micro-9.0.0.tgz"; - sha512 = "1ga72y60zj44dy1y3md37x86klv6nxs7ii0aap37p4qwhq5rb5mcl5yn0kmkrgy6wbvgcnw761rjq7ripiqn1w8q2nl23g2rdj64x69"; + url = "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz"; + sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc"; }; }; - "micro-compress-1.0.0" = { - name = "micro-compress"; - packageName = "micro-compress"; + "prompt-1.0.0" = { + name = "prompt"; + packageName = "prompt"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz"; - sha1 = "53f5a80b4ad0320ca165a559b6e3df145d4f704f"; + url = "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz"; + sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "node-version-1.1.0" = { - name = "node-version"; - packageName = "node-version"; - version = "1.1.0"; + "promzard-0.3.0" = { + name = "promzard"; + packageName = "promzard"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz"; - sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp"; + url = "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"; + sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; - "openssl-self-signed-certificate-1.1.6" = { - name = "openssl-self-signed-certificate"; - packageName = "openssl-self-signed-certificate"; - version = "1.1.6"; + "prop-types-15.6.1" = { + name = "prop-types"; + packageName = "prop-types"; + version = "15.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz"; - sha1 = "9d3a4776b1a57e9847350392114ad2f915a83dd4"; + url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz"; + sha512 = "28vp2j7wpa97ygi4clflilfs8wj8qsz1x3fismsqx293a9cvpyc20k4pbrppyn7y6hks0dp3mn0wmj5q3y1y3i5k7ra5ssqimnkprz1"; }; }; - "path-type-3.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "3.0.0"; + "properties-1.2.1" = { + name = "properties"; + packageName = "properties"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; - sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; + url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; + sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; }; }; - "mri-1.1.0" = { - name = "mri"; - packageName = "mri"; - version = "1.1.0"; + "properties-parser-0.3.1" = { + name = "properties-parser"; + packageName = "properties-parser"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz"; - sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a"; + url = "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz"; + sha1 = "1316e9539ffbfd93845e369b211022abd478771a"; }; }; - "execa-0.6.3" = { - name = "execa"; - packageName = "execa"; - version = "0.6.3"; + "protein-0.5.0" = { + name = "protein"; + packageName = "protein"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; - sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; + url = "https://registry.npmjs.org/protein/-/protein-0.5.0.tgz"; + sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; - "address-1.0.3" = { - name = "address"; - packageName = "address"; - version = "1.0.3"; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz"; - sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng"; + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "bcrypt-nodejs-0.0.3" = { - name = "bcrypt-nodejs"; - packageName = "bcrypt-nodejs"; - version = "0.0.3"; + "protobufjs-3.8.2" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz"; - sha1 = "c60917f26dc235661566c681061c303c2b28842b"; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz"; + sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; }; }; - "cheerio-0.17.0" = { - name = "cheerio"; - packageName = "cheerio"; - version = "0.17.0"; + "protocol-buffers-encodings-1.1.0" = { + name = "protocol-buffers-encodings"; + packageName = "protocol-buffers-encodings"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz"; - sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea"; + url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.0.tgz"; + sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; }; }; - "moment-2.7.0" = { - name = "moment"; - packageName = "moment"; - version = "2.7.0"; + "proxy-addr-1.0.10" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.7.0.tgz"; - sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; + sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; }; }; - "slate-irc-0.7.3" = { - name = "slate-irc"; - packageName = "slate-irc"; - version = "0.7.3"; + "proxy-addr-1.1.5" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/slate-irc/-/slate-irc-0.7.3.tgz"; - sha1 = "8d01f2bc809e00a5b2faca7d8d3130d155422a77"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; + sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; }; }; - "socket.io-1.0.6" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.0.6"; + "proxy-addr-2.0.3" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz"; - sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz"; + sha512 = "1fjf093wrxz3nm9njw491r9rvqwrcv8d8h0mnmyakpijnbff7lllysr7aq9h9w7jdvxjvaf9r055ywd7sghcqxwa2nfpdc9423c414d"; }; }; - "CSSselect-0.4.1" = { - name = "CSSselect"; - packageName = "CSSselect"; - version = "0.4.1"; + "proxy-agent-2.0.0" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; - sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.0.0.tgz"; + sha1 = "57eb5347aa805d74ec681cb25649dba39c933499"; }; }; - "htmlparser2-3.7.3" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.7.3"; + "proxy-from-env-1.0.0" = { + name = "proxy-from-env"; + packageName = "proxy-from-env"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz"; - sha1 = "6a64c77637c08c6f30ec2a8157a53333be7cb05e"; + url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; + sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; }; }; - "dom-serializer-0.0.1" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "0.0.1"; + "proxy-middleware-0.15.0" = { + name = "proxy-middleware"; + packageName = "proxy-middleware"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz"; - sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf"; + url = "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz"; + sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56"; }; }; - "CSSwhat-0.4.7" = { - name = "CSSwhat"; - packageName = "CSSwhat"; - version = "0.4.7"; + "prr-0.0.0" = { + name = "prr"; + packageName = "prr"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; - sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; + url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; + sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; }; }; - "domutils-1.4.3" = { - name = "domutils"; - packageName = "domutils"; - version = "1.4.3"; + "prr-1.0.1" = { + name = "prr"; + packageName = "prr"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; - sha1 = "0865513796c6b306031850e175516baf80b72a6f"; + url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; }; }; - "domhandler-2.2.1" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.2.1"; + "ps-tree-0.0.3" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz"; - sha1 = "59df9dcd227e808b365ae73e1f6684ac3d946fc2"; + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; + sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; }; }; - "irc-replies-2.0.1" = { - name = "irc-replies"; - packageName = "irc-replies"; - version = "2.0.1"; + "ps-tree-1.1.0" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/irc-replies/-/irc-replies-2.0.1.tgz"; - sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79"; + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz"; + sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014"; }; }; - "slate-irc-parser-0.0.2" = { - name = "slate-irc-parser"; - packageName = "slate-irc-parser"; - version = "0.0.2"; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/slate-irc-parser/-/slate-irc-parser-0.0.2.tgz"; - sha1 = "0c5f8f20d817bb85329da9fca135c66b05947d80"; + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "linewise-0.0.3" = { - name = "linewise"; - packageName = "linewise"; - version = "0.0.3"; + "pstree.remy-1.1.0" = { + name = "pstree.remy"; + packageName = "pstree.remy"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/linewise/-/linewise-0.0.3.tgz"; - sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; + url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz"; + sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb"; }; }; - "engine.io-1.3.1" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.3.1"; + "public-encrypt-4.0.0" = { + name = "public-encrypt"; + packageName = "public-encrypt"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz"; - sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e"; + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; + sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; }; }; - "socket.io-parser-2.2.0" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.2.0"; + "pug-2.0.3" = { + name = "pug"; + packageName = "pug"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz"; - sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; + url = "https://registry.npmjs.org/pug/-/pug-2.0.3.tgz"; + sha1 = "71cba82537c95a5eab7ed04696e4221f53aa878e"; }; }; - "socket.io-client-1.0.6" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.0.6"; + "pug-attrs-2.0.3" = { + name = "pug-attrs"; + packageName = "pug-attrs"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz"; - sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e"; + url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.3.tgz"; + sha1 = "a3095f970e64151f7bdad957eef55fb5d7905d15"; }; }; - "socket.io-adapter-0.2.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "0.2.0"; + "pug-code-gen-2.0.1" = { + name = "pug-code-gen"; + packageName = "pug-code-gen"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz"; - sha1 = "bd39329b8961371787e24f345b074ec9cf000e33"; + url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.1.tgz"; + sha1 = "0951ec83225d74d8cfc476a7f99a259b5f7d050c"; }; }; - "has-binary-data-0.1.1" = { - name = "has-binary-data"; - packageName = "has-binary-data"; - version = "0.1.1"; + "pug-error-1.3.2" = { + name = "pug-error"; + packageName = "pug-error"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.1.tgz"; - sha1 = "e10749fb87828a52df96f4086587eb4a03966439"; + url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz"; + sha1 = "53ae7d9d29bb03cf564493a026109f54c47f5f26"; }; }; - "debug-0.6.0" = { - name = "debug"; - packageName = "debug"; - version = "0.6.0"; + "pug-filters-3.1.0" = { + name = "pug-filters"; + packageName = "pug-filters"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.6.0.tgz"; - sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f"; + url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.0.tgz"; + sha1 = "27165555bc04c236e4aa2b0366246dfa021b626e"; }; }; - "ws-0.4.31" = { - name = "ws"; - packageName = "ws"; - version = "0.4.31"; + "pug-lexer-4.0.0" = { + name = "pug-lexer"; + packageName = "pug-lexer"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; - sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927"; + url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.0.0.tgz"; + sha1 = "210c18457ef2e1760242740c5e647bd794cec278"; }; }; - "engine.io-parser-1.0.6" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "1.0.6"; + "pug-linker-3.0.5" = { + name = "pug-linker"; + packageName = "pug-linker"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.0.6.tgz"; - sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e"; + url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.5.tgz"; + sha1 = "9e9a7ae4005682d027deeb96b000f88eeb83a02f"; }; }; - "nan-0.3.2" = { - name = "nan"; - packageName = "nan"; - version = "0.3.2"; + "pug-load-2.0.11" = { + name = "pug-load"; + packageName = "pug-load"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; - sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; + url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.11.tgz"; + sha1 = "e648e57ed113fe2c1f45d57858ea2bad6bc01527"; }; }; - "base64-arraybuffer-0.1.2" = { - name = "base64-arraybuffer"; - packageName = "base64-arraybuffer"; - version = "0.1.2"; + "pug-parser-5.0.0" = { + name = "pug-parser"; + packageName = "pug-parser"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; - sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; + url = "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.0.tgz"; + sha1 = "e394ad9b3fca93123940aff885c06e44ab7e68e4"; }; }; - "after-0.8.1" = { - name = "after"; - packageName = "after"; - version = "0.8.1"; + "pug-runtime-2.0.4" = { + name = "pug-runtime"; + packageName = "pug-runtime"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz"; - sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; + url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.4.tgz"; + sha1 = "e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58"; }; }; - "blob-0.0.2" = { - name = "blob"; - packageName = "blob"; - version = "0.0.2"; + "pug-strip-comments-1.0.3" = { + name = "pug-strip-comments"; + packageName = "pug-strip-comments"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/blob/-/blob-0.0.2.tgz"; - sha1 = "b89562bd6994af95ba1e812155536333aa23cf24"; + url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz"; + sha1 = "f1559592206edc6f85310dacf4afb48a025af59f"; }; }; - "utf8-2.0.0" = { - name = "utf8"; - packageName = "utf8"; - version = "2.0.0"; + "pug-walk-1.1.7" = { + name = "pug-walk"; + packageName = "pug-walk"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz"; - sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d"; + url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.7.tgz"; + sha1 = "c00d5c5128bac5806bec15d2b7e7cdabe42531f3"; }; }; - "json3-3.2.6" = { - name = "json3"; - packageName = "json3"; - version = "3.2.6"; + "pull-cat-1.1.11" = { + name = "pull-cat"; + packageName = "pull-cat"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; - sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; + url = "https://registry.npmjs.org/pull-cat/-/pull-cat-1.1.11.tgz"; + sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b"; }; }; - "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { - name = "emitter"; - packageName = "emitter"; - version = "1.0.1"; + "pull-level-2.0.4" = { + name = "pull-level"; + packageName = "pull-level"; + version = "2.0.4"; src = fetchurl { - name = "emitter-1.0.1.tar.gz"; - url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; - sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; + url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.4.tgz"; + sha512 = "1k9a17my3m2zkz7g8hynxswrqks679vih7vd97qz5ky16x4kkms4ysxxzs5744kfzwwxg9p14xgnx8vs6kc15wjmdlkhlfy62bajvkx"; }; }; - "engine.io-client-1.3.1" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.3.1"; + "pull-live-1.0.1" = { + name = "pull-live"; + packageName = "pull-live"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz"; - sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989"; + url = "https://registry.npmjs.org/pull-live/-/pull-live-1.0.1.tgz"; + sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; }; }; - "parseuri-0.0.2" = { - name = "parseuri"; - packageName = "parseuri"; - version = "0.0.2"; + "pull-pushable-2.2.0" = { + name = "pull-pushable"; + packageName = "pull-pushable"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz"; - sha1 = "db41878f2d6964718be870b3140973d8093be156"; + url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.2.0.tgz"; + sha1 = "5f2f3aed47ad86919f01b12a2e99d6f1bd776581"; }; }; - "to-array-0.1.3" = { - name = "to-array"; - packageName = "to-array"; - version = "0.1.3"; + "pull-stream-3.6.7" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz"; - sha1 = "d45dadc6363417f60f28474fea50ecddbb4f4991"; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.7.tgz"; + sha512 = "0cq5h32fsfnhxa9wbgk55jhr0z4mx6zmm42nx9r6n3j4bpl6sw2a6vh41raicq2q11bxh1vg7jxv2cdqw7nq6zb0fxm5nj8ipz3dlax"; }; }; - "has-cors-1.0.3" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.0.3"; + "pull-window-2.1.4" = { + name = "pull-window"; + packageName = "pull-window"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz"; - sha1 = "502acb9b3104dac33dd2630eaf2f888b0baf4cb3"; + url = "https://registry.npmjs.org/pull-window/-/pull-window-2.1.4.tgz"; + sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0"; }; }; - "xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" = { - name = "xmlhttprequest"; - packageName = "xmlhttprequest"; - version = "1.5.0"; + "pump-0.3.5" = { + name = "pump"; + packageName = "pump"; + version = "0.3.5"; src = fetchurl { - name = "xmlhttprequest-1.5.0.tar.gz"; - url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433; - sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; + url = "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz"; + sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b"; }; }; - "parsejson-0.0.1" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.1"; + "pump-1.0.3" = { + name = "pump"; + packageName = "pump"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; - sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; + url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"; + sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj"; }; }; - "parseqs-0.0.2" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.2"; + "pump-2.0.1" = { + name = "pump"; + packageName = "pump"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; - sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; + url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; + sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; }; }; - "global-https://github.com/component/global/archive/v2.0.1.tar.gz" = { - name = "global"; - packageName = "global"; - version = "2.0.1"; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; src = fetchurl { - name = "global-2.0.1.tar.gz"; - url = https://codeload.github.com/component/global/tar.gz/v2.0.1; - sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; }; }; - "socket.io-parser-2.1.2" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.1.2"; + "pumpify-1.4.0" = { + name = "pumpify"; + packageName = "pumpify"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz"; - sha1 = "876655b9edd555c5bdf7301cedf30a436c67b8b0"; + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz"; + sha512 = "1h37biy199n445y10vpyiswwcxv8zigfqp0b1xwgbyjq51f2dhjn1pcggjc4j5ccbd64l1ivfi0bqinx4m5clcawvwggy7jv93qsjfs"; }; }; - "express-5.0.0-alpha.6" = { - name = "express"; - packageName = "express"; - version = "5.0.0-alpha.6"; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.6.tgz"; - sha1 = "85dc44d7e90d4809041407f388f239b5bd2f681e"; + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; }; }; - "express-json5-0.1.0" = { - name = "express-json5"; - packageName = "express-json5"; - version = "0.1.0"; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/express-json5/-/express-json5-0.1.0.tgz"; - sha1 = "114a514bd734b319e018a1bde337923cc455b836"; + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; - "es6-shim-0.21.1" = { - name = "es6-shim"; - packageName = "es6-shim"; - version = "0.21.1"; + "punycode-2.1.0" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.21.1.tgz"; - sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2"; + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz"; + sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; }; }; - "handlebars-2.0.0" = { - name = "handlebars"; - packageName = "handlebars"; - version = "2.0.0"; + "q-0.9.7" = { + name = "q"; + packageName = "q"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; - sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f"; + url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }; }; - "highlight.js-8.9.1" = { - name = "highlight.js"; - packageName = "highlight.js"; - version = "8.9.1"; + "q-1.0.1" = { + name = "q"; + packageName = "q"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz"; - sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88"; + url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz"; + sha1 = "11872aeedee89268110b10a718448ffb10112a14"; }; }; - "lunr-0.7.2" = { - name = "lunr"; - packageName = "lunr"; - version = "0.7.2"; + "q-1.4.1" = { + name = "q"; + packageName = "q"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz"; - sha1 = "79a30e932e216cba163541ee37a3607c12cd7281"; + url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; + sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "render-readme-1.3.1" = { - name = "render-readme"; - packageName = "render-readme"; - version = "1.3.1"; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/render-readme/-/render-readme-1.3.1.tgz"; - sha1 = "d2a98f9a87dd64fa73c6877ac5c45b0f6341a797"; + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; }; }; - "sinopia-htpasswd-0.4.5" = { - name = "sinopia-htpasswd"; - packageName = "sinopia-htpasswd"; - version = "0.4.5"; + "q-2.0.3" = { + name = "q"; + packageName = "q"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/sinopia-htpasswd/-/sinopia-htpasswd-0.4.5.tgz"; - sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9"; + url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz"; + sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"; }; }; - "fs-ext-0.6.0" = { - name = "fs-ext"; - packageName = "fs-ext"; - version = "0.6.0"; + "qap-3.3.1" = { + name = "qap"; + packageName = "qap"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.6.0.tgz"; - sha1 = "27d32a72e2e7c3c8001712a0f307f5f8d91dfc66"; + url = "https://registry.npmjs.org/qap/-/qap-3.3.1.tgz"; + sha1 = "11f9e8fa8890fe7cb99210c0f44d0613b7372cac"; }; }; - "crypt3-0.2.0" = { - name = "crypt3"; - packageName = "crypt3"; - version = "0.2.0"; + "qjobs-1.2.0" = { + name = "qjobs"; + packageName = "qjobs"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/crypt3/-/crypt3-0.2.0.tgz"; - sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; + url = "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"; + sha512 = "0g8mmxjq1gn92mf9gzpf2469xwrisbg2vdlxg3bnq18gqlviy2s7l7wi99wmbz5kvbb9yn0wxbi9r83f4jchhzivn0299vigc88k0zi"; }; }; - "qs-6.5.0" = { + "qs-0.4.2" = { name = "qs"; packageName = "qs"; - version = "6.5.0"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; - sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby"; + url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; + sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; }; }; - "router-1.3.2" = { - name = "router"; - packageName = "router"; - version = "1.3.2"; + "qs-0.5.1" = { + name = "qs"; + packageName = "qs"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.3.2.tgz"; - sha1 = "bfaa16888a5283d5ee40d999da7a9fa15296a60c"; + url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz"; + sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; }; }; - "send-0.15.6" = { - name = "send"; - packageName = "send"; - version = "0.15.6"; + "qs-0.5.6" = { + name = "qs"; + packageName = "qs"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.6.tgz"; - sha1 = "20f23a9c925b762ab82705fe2f9db252ace47e34"; + url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; + sha1 = "31b1ad058567651c526921506b9a8793911a0384"; }; }; - "serve-static-1.12.6" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.12.6"; + "qs-0.6.5" = { + name = "qs"; + packageName = "qs"; + version = "0.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz"; - sha1 = "b973773f63449934da54e5beba5e31d9f4211577"; + url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; + sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; }; }; - "raw-body-1.3.4" = { - name = "raw-body"; - packageName = "raw-body"; - version = "1.3.4"; + "qs-1.2.0" = { + name = "qs"; + packageName = "qs"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz"; - sha1 = "ccc7ddfc46b72861cdd5bb433c840b70b6f27f54"; + url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; + sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; }; }; - "iconv-lite-0.4.8" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.8"; + "qs-2.3.3" = { + name = "qs"; + packageName = "qs"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; - sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; + url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; + sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; }; }; - "uglify-js-2.3.6" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.3.6"; + "qs-3.1.0" = { + name = "qs"; + packageName = "qs"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; - sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + url = "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz"; + sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c"; }; }; - "markdown-it-4.4.0" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "4.4.0"; + "qs-4.0.0" = { + name = "qs"; + packageName = "qs"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz"; - sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; + url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; + sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "sanitize-html-1.15.0" = { - name = "sanitize-html"; - packageName = "sanitize-html"; - version = "1.15.0"; + "qs-5.2.1" = { + name = "qs"; + packageName = "qs"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.15.0.tgz"; - sha512 = "26swjh5wivmim7l7g64f40vnr1dr7kyl5hr9csv84s2apa43rs19qypyf7y5r3a19v0pg9ibcs1spqykznq6jcxvmwrbwdihm78ndfn"; + url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz"; + sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc"; }; }; - "linkify-it-1.2.4" = { - name = "linkify-it"; - packageName = "linkify-it"; - version = "1.2.4"; + "qs-6.2.3" = { + name = "qs"; + packageName = "qs"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz"; - sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"; + sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"; }; }; - "lodash.escaperegexp-4.1.2" = { - name = "lodash.escaperegexp"; - packageName = "lodash.escaperegexp"; - version = "4.1.2"; + "qs-6.3.2" = { + name = "qs"; + packageName = "qs"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; - sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; + sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; }; }; - "srcset-1.0.0" = { - name = "srcset"; - packageName = "srcset"; - version = "1.0.0"; + "qs-6.4.0" = { + name = "qs"; + packageName = "qs"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz"; - sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; }; }; - "domutils-1.6.2" = { - name = "domutils"; - packageName = "domutils"; - version = "1.6.2"; + "qs-6.5.0" = { + name = "qs"; + packageName = "qs"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz"; - sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; + sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby"; }; }; - "async-2.1.5" = { - name = "async"; - packageName = "async"; - version = "2.1.5"; + "qs-6.5.1" = { + name = "qs"; + packageName = "qs"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; - sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; + sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; + "qtdatastream-0.7.1" = { + name = "qtdatastream"; + packageName = "qtdatastream"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + url = "https://registry.npmjs.org/qtdatastream/-/qtdatastream-0.7.1.tgz"; + sha1 = "8085d390b4c19f7b02dee8a7cd873e2af58667b5"; }; }; - "lru-cache-2.2.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.2.0"; + "query-string-1.0.1" = { + name = "query-string"; + packageName = "query-string"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz"; - sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; + url = "https://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz"; + sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; }; }; - "nopt-2.0.0" = { - name = "nopt"; - packageName = "nopt"; - version = "2.0.0"; + "query-string-5.1.1" = { + name = "query-string"; + packageName = "query-string"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; - sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; + url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; + sha512 = "0kkwn38nmjd6n6byiz52gngvyiw46fbibx9c9p1vzn9g7l11f2jpbs39d4aqajk7kk2a6k69wx5bjgavbg1lh275ih6k84jdnr8wdc2"; }; }; - "restify-4.0.3" = { - name = "restify"; - packageName = "restify"; - version = "4.0.3"; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/restify/-/restify-4.0.3.tgz"; - sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc"; + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; }; }; - "bunyan-1.5.1" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.5.1"; + "querystring-es3-0.2.1" = { + name = "querystring-es3"; + packageName = "querystring-es3"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz"; - sha1 = "5f6e7d44c43b952f56b0f41309e3ab12391b4e2d"; + url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "clone-0.1.6" = { - name = "clone"; - packageName = "clone"; - version = "0.1.6"; + "quick-format-unescaped-1.1.2" = { + name = "quick-format-unescaped"; + packageName = "quick-format-unescaped"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.1.6.tgz"; - sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000"; + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz"; + sha1 = "0ca581de3174becef25ac3c2e8956342381db698"; }; }; - "smartdc-auth-2.3.1" = { - name = "smartdc-auth"; - packageName = "smartdc-auth"; - version = "2.3.1"; + "quick-lru-1.1.0" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.3.1.tgz"; - sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44"; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz"; + sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8"; }; }; - "cmdln-3.2.1" = { - name = "cmdln"; - packageName = "cmdln"; - version = "3.2.1"; + "rai-0.1.12" = { + name = "rai"; + packageName = "rai"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/cmdln/-/cmdln-3.2.1.tgz"; - sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45"; + url = "https://registry.npmjs.org/rai/-/rai-0.1.12.tgz"; + sha1 = "8ccfd014d0f9608630dd73c19b8e4b057754a6a6"; }; }; - "dashdash-1.7.3" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.7.3"; + "random-access-file-2.0.1" = { + name = "random-access-file"; + packageName = "random-access-file"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.7.3.tgz"; - sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz"; + sha512 = "2zbpqbs4dvnpc3dpr2yz8phz6r49j4a57jjlx7nqk6rzy2q0437g537czdxyk7cfdmhsc0yvlvs8b7p7sxax1slpwz4d8bkb851zglx"; }; }; - "vasync-1.6.2" = { - name = "vasync"; - packageName = "vasync"; - version = "1.6.2"; + "random-access-memory-2.4.0" = { + name = "random-access-memory"; + packageName = "random-access-memory"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/vasync/-/vasync-1.6.2.tgz"; - sha1 = "568edcf40b2b5c35b1cc048cad085de4739703fb"; + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz"; + sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; - "backoff-2.5.0" = { - name = "backoff"; - packageName = "backoff"; - version = "2.5.0"; + "random-access-storage-1.1.1" = { + name = "random-access-storage"; + packageName = "random-access-storage"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz"; - sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz"; + sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1"; }; }; - "csv-0.4.6" = { - name = "csv"; - packageName = "csv"; - version = "0.4.6"; + "random-bytes-1.0.0" = { + name = "random-bytes"; + packageName = "random-bytes"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz"; - sha1 = "8dbae7ddfdbaae62c1ea987c3e0f8a9ac737b73d"; + url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; + sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; - "escape-regexp-component-1.0.2" = { - name = "escape-regexp-component"; - packageName = "escape-regexp-component"; - version = "1.0.2"; + "random-iterate-1.0.1" = { + name = "random-iterate"; + packageName = "random-iterate"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz"; - sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"; + url = "https://registry.npmjs.org/random-iterate/-/random-iterate-1.0.1.tgz"; + sha1 = "f7d97d92dee6665ec5f6da08c7f963cad4b2ac99"; }; }; - "http-signature-0.11.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.11.0"; + "randomatic-1.1.7" = { + name = "randomatic"; + packageName = "randomatic"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"; - sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6"; + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; + sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; }; }; - "keep-alive-agent-0.0.1" = { - name = "keep-alive-agent"; - packageName = "keep-alive-agent"; - version = "0.0.1"; + "randombytes-2.0.6" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz"; - sha1 = "44847ca394ce8d6b521ae85816bd64509942b385"; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; + sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; }; }; - "qs-3.1.0" = { - name = "qs"; - packageName = "qs"; - version = "3.1.0"; + "randomfill-1.0.4" = { + name = "randomfill"; + packageName = "randomfill"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz"; - sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c"; + url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; + sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; }; }; - "spdy-1.32.5" = { - name = "spdy"; - packageName = "spdy"; - version = "1.32.5"; + "range-parser-0.0.4" = { + name = "range-parser"; + packageName = "range-parser"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/spdy/-/spdy-1.32.5.tgz"; - sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb"; + url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; + sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; }; }; - "vasync-1.6.3" = { - name = "vasync"; - packageName = "vasync"; - version = "1.6.3"; + "range-parser-1.0.3" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz"; - sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94"; + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; + sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; }; }; - "dtrace-provider-0.6.0" = { - name = "dtrace-provider"; - packageName = "dtrace-provider"; - version = "0.6.0"; + "range-parser-1.2.0" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz"; - sha1 = "0b078d5517937d873101452d9146737557b75e51"; + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; + sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "precond-0.2.3" = { - name = "precond"; - packageName = "precond"; - version = "0.2.3"; + "range-slice-stream-1.2.0" = { + name = "range-slice-stream"; + packageName = "range-slice-stream"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz"; - sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac"; + url = "https://registry.npmjs.org/range-slice-stream/-/range-slice-stream-1.2.0.tgz"; + sha1 = "01ba954276052b783900e63d6118d8fcf3875d7f"; }; }; - "csv-generate-0.0.6" = { - name = "csv-generate"; - packageName = "csv-generate"; - version = "0.0.6"; + "raven-2.4.2" = { + name = "raven"; + packageName = "raven"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz"; - sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; + url = "https://registry.npmjs.org/raven/-/raven-2.4.2.tgz"; + sha1 = "0129e2adc30788646fd530b67d08a8ce25d4f6dc"; }; }; - "csv-parse-1.3.3" = { - name = "csv-parse"; - packageName = "csv-parse"; - version = "1.3.3"; + "raw-body-0.0.3" = { + name = "raw-body"; + packageName = "raw-body"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.3.3.tgz"; - sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; + url = "https://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz"; + sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a"; }; }; - "stream-transform-0.1.2" = { - name = "stream-transform"; - packageName = "stream-transform"; - version = "0.1.2"; + "raw-body-1.1.7" = { + name = "raw-body"; + packageName = "raw-body"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz"; - sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f"; + url = "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz"; + sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425"; }; }; - "csv-stringify-0.0.8" = { - name = "csv-stringify"; - packageName = "csv-stringify"; - version = "0.0.8"; + "raw-body-1.3.4" = { + name = "raw-body"; + packageName = "raw-body"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz"; - sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b"; + url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz"; + sha1 = "ccc7ddfc46b72861cdd5bb433c840b70b6f27f54"; }; }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; + "raw-body-2.1.7" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; + sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; }; }; - "verror-1.6.0" = { - name = "verror"; - packageName = "verror"; - version = "1.6.0"; + "raw-body-2.3.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz"; - sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; + sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; }; }; - "extsprintf-1.2.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.2.0"; + "raw-socket-1.5.2" = { + name = "raw-socket"; + packageName = "raw-socket"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz"; - sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529"; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.2.tgz"; + sha512 = "0afwhc6rx359xqdsjiyxdlj46kb8mq4lkwy9fhmgszkp8cai9pk8927vxvg4gpg522clwx3dv1xsbnx745pip7crbjdb7kn2i8p2iqy"; }; }; - "assert-plus-0.1.2" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.2"; + "rc-0.4.0" = { + name = "rc"; + packageName = "rc"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; - sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + url = "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz"; + sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; - "clone-0.1.5" = { - name = "clone"; - packageName = "clone"; - version = "0.1.5"; + "rc-1.2.6" = { + name = "rc"; + packageName = "rc"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.1.5.tgz"; - sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz"; + sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092"; }; }; - "dashdash-1.10.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.10.1"; + "rc-config-loader-2.0.1" = { + name = "rc-config-loader"; + packageName = "rc-config-loader"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz"; - sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60"; + url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.1.tgz"; + sha512 = "2sp3cd5mzpc91g5c8k7xwdm9gnax4pf6wvg09scksc81bs5p0qpzjf6s7xi36b0lxfhs76jmm48jv23biy4b4q3d6ldx77vjvhgcyiq"; }; }; - "once-1.3.0" = { - name = "once"; - packageName = "once"; - version = "1.3.0"; + "re-emitter-1.1.3" = { + name = "re-emitter"; + packageName = "re-emitter"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.0.tgz"; - sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; + url = "https://registry.npmjs.org/re-emitter/-/re-emitter-1.1.3.tgz"; + sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; - "sshpk-agent-1.2.1" = { - name = "sshpk-agent"; - packageName = "sshpk-agent"; - version = "1.2.1"; + "read-1.0.7" = { + name = "read"; + packageName = "read"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.2.1.tgz"; - sha1 = "62e143c18530fda103320b3403e8ad42786d9718"; + url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz"; + sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; - "sshpk-1.7.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.7.1"; + "read-all-stream-3.1.0" = { + name = "read-all-stream"; + packageName = "read-all-stream"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz"; - sha1 = "565e386c42a77e6062fbd14c0472ff21cd53398c"; + url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; + sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "vasync-1.4.3" = { - name = "vasync"; - packageName = "vasync"; - version = "1.4.3"; + "read-cmd-shim-1.0.1" = { + name = "read-cmd-shim"; + packageName = "read-cmd-shim"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz"; - sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37"; + url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; + sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; }; }; - "jodid25519-1.0.2" = { - name = "jodid25519"; - packageName = "jodid25519"; - version = "1.0.2"; + "read-metadata-1.0.0" = { + name = "read-metadata"; + packageName = "read-metadata"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; + url = "https://registry.npmjs.org/read-metadata/-/read-metadata-1.0.0.tgz"; + sha1 = "6df9cbe51184e8ceb7d0668b40ee5191e6f3dac6"; }; }; - "jsprim-0.3.0" = { - name = "jsprim"; - packageName = "jsprim"; - version = "0.3.0"; + "read-only-stream-2.0.0" = { + name = "read-only-stream"; + packageName = "read-only-stream"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz"; - sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; + url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz"; + sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; }; }; - "verror-1.1.0" = { - name = "verror"; - packageName = "verror"; - version = "1.1.0"; + "read-package-json-2.0.13" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.1.0.tgz"; - sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0"; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz"; + sha512 = "2d6gl0kam8r9s4akgqi1pjbfqa6iszwsi1v87kw354b68s7dck4w8flnjp38b9dsj9cldbch0czj1m9gbrh252dm3c6mg2r6knmjmzz"; }; }; - "extsprintf-1.0.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.0.0"; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz"; - sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; }; }; - "json-schema-0.2.2" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.2"; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; - sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; }; }; - "verror-1.3.3" = { - name = "verror"; - packageName = "verror"; - version = "1.3.3"; + "read-pkg-3.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.3.3.tgz"; - sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd"; + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; }; }; - "generic-pool-2.2.0" = { - name = "generic-pool"; - packageName = "generic-pool"; - version = "2.2.0"; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz"; - sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e"; + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; }; }; - "modern-syslog-1.1.2" = { - name = "modern-syslog"; - packageName = "modern-syslog"; - version = "1.1.2"; + "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/modern-syslog/-/modern-syslog-1.1.2.tgz"; - sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; }; }; - "hashring-3.2.0" = { - name = "hashring"; - packageName = "hashring"; - version = "3.2.0"; + "read-pkg-up-3.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz"; - sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce"; + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; + sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; }; }; - "winser-0.1.6" = { - name = "winser"; - packageName = "winser"; - version = "0.1.6"; + "read-torrent-1.3.0" = { + name = "read-torrent"; + packageName = "read-torrent"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; - sha1 = "08663dc32878a12bbce162d840da5097b48466c9"; + url = "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.0.tgz"; + sha1 = "4e0ef5bea6cb24d31843eb6fa8543ad0232ab9f4"; }; }; - "connection-parse-0.0.7" = { - name = "connection-parse"; - packageName = "connection-parse"; - version = "0.0.7"; + "readable-stream-1.0.27-1" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.27-1"; src = fetchurl { - url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; - sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; }; }; - "simple-lru-cache-0.0.2" = { - name = "simple-lru-cache"; - packageName = "simple-lru-cache"; - version = "0.0.2"; + "readable-stream-1.0.34" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; + sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; }; }; - "sequence-2.2.1" = { - name = "sequence"; - packageName = "sequence"; - version = "2.2.1"; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; - sha1 = "7f5617895d44351c0a047e764467690490a16b03"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; }; }; - "commander-1.3.1" = { - name = "commander"; - packageName = "commander"; - version = "1.3.1"; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; - sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; - "css-parse-1.7.0" = { - name = "css-parse"; - packageName = "css-parse"; - version = "1.7.0"; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; - sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "0mj9b6190amln9rg89x5pq2n195s3v0gzicpdamv1kbabg69aw5m71l34jsjn7bqil7405l6l35x9ijnb3h4jz5vx2i00l8sl1ll2xm"; }; }; - "glob-7.0.6" = { - name = "glob"; - packageName = "glob"; - version = "7.0.6"; + "readdirp-2.1.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"; + sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "coa-2.0.0" = { - name = "coa"; - packageName = "coa"; - version = "2.0.0"; + "readline2-0.1.1" = { + name = "readline2"; + packageName = "readline2"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-2.0.0.tgz"; - sha1 = "af881ebe214fc29bee4e9e76b4956b6132295546"; + url = "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz"; + sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568"; }; }; - "css-url-regex-1.1.0" = { - name = "css-url-regex"; - packageName = "css-url-regex"; - version = "1.1.0"; + "readline2-1.0.1" = { + name = "readline2"; + packageName = "readline2"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz"; - sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec"; + url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz"; + sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; }; }; - "unquote-1.1.0" = { - name = "unquote"; - packageName = "unquote"; - version = "1.1.0"; + "recast-0.11.23" = { + name = "recast"; + packageName = "recast"; + version = "0.11.23"; src = fetchurl { - url = "https://registry.npmjs.org/unquote/-/unquote-1.1.0.tgz"; - sha1 = "98e1fc608b6b854c75afb1b95afc099ba69d942f"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz"; + sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "css-select-1.3.0-rc0" = { - name = "css-select"; - packageName = "css-select"; - version = "1.3.0-rc0"; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz"; - sha1 = "6f93196aaae737666ea1036a8cb14a8fcb7a9231"; + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "css-select-base-adapter-0.1.0" = { - name = "css-select-base-adapter"; - packageName = "css-select-base-adapter"; - version = "0.1.0"; + "record-cache-1.0.1" = { + name = "record-cache"; + packageName = "record-cache"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz"; - sha1 = "0102b3d14630df86c3eb9fa9f5456270106cf990"; + url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.1.tgz"; + sha512 = "3a25qmwmlljwlcc1zpn80lrq3hmwwaykiac95q2gcm1im4wchk9mdhbgak2lidqijaf6mil2rp5sbm0zfzvvh39nz1lmlz72sll39iy"; }; }; - "css-tree-1.0.0-alpha25" = { - name = "css-tree"; - packageName = "css-tree"; - version = "1.0.0-alpha25"; + "recursive-readdir-2.2.2" = { + name = "recursive-readdir"; + packageName = "recursive-readdir"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz"; - sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw"; + url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; + sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; }; }; - "csso-3.4.0" = { - name = "csso"; - packageName = "csso"; - version = "3.4.0"; + "recursive-watch-1.1.4" = { + name = "recursive-watch"; + packageName = "recursive-watch"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-3.4.0.tgz"; - sha1 = "57b27ef553cccbf5aa964c641748641e9af113f3"; + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.4.tgz"; + sha512 = "0yks7j98w5d3y375fb99kfbb8rz5qz72v6ld5i15h7fds1i02fq027w82ipanv3dkgvvrxyybw1v8lyrcs54h9airzv12sbcw1a6rvx"; }; }; - "object.values-1.0.4" = { - name = "object.values"; - packageName = "object.values"; - version = "1.0.4"; + "redent-1.0.0" = { + name = "redent"; + packageName = "redent"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz"; - sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a"; + url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; }; }; - "stable-0.1.6" = { - name = "stable"; - packageName = "stable"; - version = "0.1.6"; + "redent-2.0.0" = { + name = "redent"; + packageName = "redent"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz"; - sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10"; + url = "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz"; + sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; }; }; - "util.promisify-1.0.0" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.0.0"; + "redis-0.10.3" = { + name = "redis"; + packageName = "redis"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb"; + url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; + sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; }; }; - "mdn-data-1.0.0" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "1.0.0"; + "redis-0.12.1" = { + name = "redis"; + packageName = "redis"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.0.0.tgz"; - sha1 = "a69d9da76847b4d5834c1465ea25c0653a1fbf66"; + url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; + sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; }; }; - "es-abstract-1.9.0" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.9.0"; + "redis-0.7.3" = { + name = "redis"; + packageName = "redis"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz"; - sha512 = "3frzxsmb5c319c73k3r0zn7djgqbzvnjch99hni35lram09a0q8jlh666m8mjaag9gjnlqjd9gl9xb769gkjd4pb3lhvv58h8kchkcj"; + url = "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz"; + sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a"; }; }; - "es-to-primitive-1.1.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.1.1"; + "redis-2.8.0" = { + name = "redis"; + packageName = "redis"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; - sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; + url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; + sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; }; }; - "is-callable-1.1.3" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.1.3"; + "redis-commands-1.3.5" = { + name = "redis-commands"; + packageName = "redis-commands"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; - sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz"; + sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by"; }; }; - "is-date-object-1.0.1" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.1"; + "redis-parser-2.6.0" = { + name = "redis-parser"; + packageName = "redis-parser"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; + sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; }; }; - "is-symbol-1.0.1" = { - name = "is-symbol"; - packageName = "is-symbol"; + "reduce-component-1.0.1" = { + name = "reduce-component"; + packageName = "reduce-component"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; - sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; + url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; }; }; - "object.getownpropertydescriptors-2.0.3" = { - name = "object.getownpropertydescriptors"; - packageName = "object.getownpropertydescriptors"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + "regenerator-runtime-0.10.5" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; + sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; }; }; - "enhanced-resolve-2.3.0" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "2.3.0"; + "regenerator-runtime-0.11.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz"; - sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; }; }; - "resolve-from-2.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "2.0.0"; + "regenerator-runtime-0.9.6" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; - sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"; + sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; - "tapable-0.2.8" = { - name = "tapable"; - packageName = "tapable"; - version = "0.2.8"; + "regex-cache-0.4.4" = { + name = "regex-cache"; + packageName = "regex-cache"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz"; - sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22"; + url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; + sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; - "memory-fs-0.3.0" = { - name = "memory-fs"; - packageName = "memory-fs"; - version = "0.3.0"; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; - sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; }; }; - "cli-truncate-1.1.0" = { - name = "cli-truncate"; - packageName = "cli-truncate"; + "regexpp-1.1.0" = { + name = "regexpp"; + packageName = "regexpp"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz"; - sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; + url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; + sha512 = "21xg69jgy5r7mffh5gjaqsv6izqvqh466q3fanmnzsgk33xhxp68nnszw4jcxk2w8lnc92phy26sr7xqq3ni36mg9yh2xb0bbqg1qrc"; }; }; - "elegant-spinner-1.0.1" = { - name = "elegant-spinner"; - packageName = "elegant-spinner"; - version = "1.0.1"; + "registry-auth-token-3.3.2" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz"; - sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; + sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94"; }; }; - "listify-1.0.0" = { - name = "listify"; - packageName = "listify"; - version = "1.0.0"; + "registry-url-3.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/listify/-/listify-1.0.0.tgz"; - sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3"; + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; - "promise-finally-3.0.0" = { - name = "promise-finally"; - packageName = "promise-finally"; - version = "3.0.0"; + "reinterval-1.1.0" = { + name = "reinterval"; + packageName = "reinterval"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/promise-finally/-/promise-finally-3.0.0.tgz"; - sha1 = "ddd5d0f895432b1206ceb8da1275064d18e7aa23"; + url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; + sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; - "typings-core-2.3.3" = { - name = "typings-core"; - packageName = "typings-core"; - version = "2.3.3"; + "relateurl-0.2.7" = { + name = "relateurl"; + packageName = "relateurl"; + version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/typings-core/-/typings-core-2.3.3.tgz"; - sha1 = "09ec54cd5b11dd5f1ef2fc0ab31d37002ca2b5ad"; + url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; }; }; - "jspm-config-0.3.4" = { - name = "jspm-config"; - packageName = "jspm-config"; - version = "0.3.4"; + "relative-date-1.1.3" = { + name = "relative-date"; + packageName = "relative-date"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jspm-config/-/jspm-config-0.3.4.tgz"; - sha1 = "44c26902e4ae8ece2366cedc9ff16b10a5f391c6"; + url = "https://registry.npmjs.org/relative-date/-/relative-date-1.1.3.tgz"; + sha1 = "120903040588ec7a4a399c6547fd01d0e3d2dc63"; }; }; - "lockfile-1.0.3" = { - name = "lockfile"; - packageName = "lockfile"; - version = "1.0.3"; + "relaxed-json-1.0.1" = { + name = "relaxed-json"; + packageName = "relaxed-json"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; - sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; + url = "https://registry.npmjs.org/relaxed-json/-/relaxed-json-1.0.1.tgz"; + sha1 = "7c8d4aa2f095704cd020e32e8099bcae103f0bd4"; }; }; - "make-error-cause-1.2.2" = { - name = "make-error-cause"; - packageName = "make-error-cause"; - version = "1.2.2"; + "remark-5.1.0" = { + name = "remark"; + packageName = "remark"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz"; - sha1 = "df0388fcd0b37816dff0a5fb8108939777dcbc9d"; + url = "https://registry.npmjs.org/remark/-/remark-5.1.0.tgz"; + sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c"; }; }; - "popsicle-9.1.0" = { - name = "popsicle"; - packageName = "popsicle"; - version = "9.1.0"; + "remark-parse-1.1.0" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle/-/popsicle-9.1.0.tgz"; - sha1 = "4f900f38d57a574ec170eda40496e364082bff66"; + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz"; + sha1 = "c3ca10f9a8da04615c28f09aa4e304510526ec21"; }; }; - "popsicle-proxy-agent-3.0.0" = { - name = "popsicle-proxy-agent"; - packageName = "popsicle-proxy-agent"; - version = "3.0.0"; + "remark-stringify-1.1.0" = { + name = "remark-stringify"; + packageName = "remark-stringify"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle-proxy-agent/-/popsicle-proxy-agent-3.0.0.tgz"; - sha1 = "b9133c55d945759ab7ee61b7711364620d3aeadc"; + url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz"; + sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"; }; }; - "popsicle-retry-3.2.1" = { - name = "popsicle-retry"; - packageName = "popsicle-retry"; - version = "3.2.1"; + "remove-trailing-separator-1.1.0" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle-retry/-/popsicle-retry-3.2.1.tgz"; - sha1 = "e06e866533b42a7a123eb330cbe63a7cebcba10c"; + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "popsicle-rewrite-1.0.0" = { - name = "popsicle-rewrite"; - packageName = "popsicle-rewrite"; - version = "1.0.0"; + "render-media-2.12.0" = { + name = "render-media"; + packageName = "render-media"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle-rewrite/-/popsicle-rewrite-1.0.0.tgz"; - sha1 = "1dd4e8ea9c3182351fb820f87934d992f7fb9007"; + url = "https://registry.npmjs.org/render-media/-/render-media-2.12.0.tgz"; + sha512 = "1y1njral1kn6s6g797ji5pl475zcmvcmrgdnv1vliq8q33vw3b4i4i5fsx9yj2ap7jdpb461507wpijixf56rc5q4r97542zvzxq0by"; }; }; - "popsicle-status-2.0.1" = { - name = "popsicle-status"; - packageName = "popsicle-status"; - version = "2.0.1"; + "render-readme-1.3.1" = { + name = "render-readme"; + packageName = "render-readme"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle-status/-/popsicle-status-2.0.1.tgz"; - sha1 = "8dd70c4fe7c694109add784ffe80eacac1e7b28d"; + url = "https://registry.npmjs.org/render-readme/-/render-readme-1.3.1.tgz"; + sha1 = "d2a98f9a87dd64fa73c6877ac5c45b0f6341a797"; }; }; - "string-template-1.0.0" = { - name = "string-template"; - packageName = "string-template"; - version = "1.0.0"; + "repeat-element-1.1.2" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string-template/-/string-template-1.0.0.tgz"; - sha1 = "9e9f2233dc00f218718ec379a28a5673ecca8b96"; + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; + sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; }; }; - "throat-3.2.0" = { - name = "throat"; - packageName = "throat"; - version = "3.2.0"; + "repeat-string-0.2.2" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/throat/-/throat-3.2.0.tgz"; - sha512 = "3rnpjw8qfw0qbydd9s4pbp0qzahz1f4phbj4cc9mvz6851nrq9h1whwslsjjfrzl0qgsnjf0n8ppygh3kl7ikyj2sn9za75kdb3qipw"; + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz"; + sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; }; }; - "touch-1.0.0" = { - name = "touch"; - packageName = "touch"; - version = "1.0.0"; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz"; - sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de"; + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "typescript-2.6.1" = { - name = "typescript"; - packageName = "typescript"; - version = "2.6.1"; + "repeating-1.1.3" = { + name = "repeating"; + packageName = "repeating"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz"; - sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631"; + url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; + sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; }; }; - "zip-object-0.1.0" = { - name = "zip-object"; - packageName = "zip-object"; - version = "0.1.0"; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/zip-object/-/zip-object-0.1.0.tgz"; - sha1 = "c1a0da04c88c837756e248680a03ff902ec3f53a"; + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; - "make-error-1.3.0" = { - name = "make-error"; - packageName = "make-error"; - version = "1.3.0"; + "replace-ext-0.0.1" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz"; - sha1 = "52ad3a339ccf10ce62b4040b708fe707244b8b96"; + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; + sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; }; }; - "http-proxy-agent-1.0.0" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; + "replace-ext-1.0.0" = { + name = "replace-ext"; + packageName = "replace-ext"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; - sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz"; + sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; }; }; - "https-proxy-agent-1.0.0" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "1.0.0"; + "request-2.16.6" = { + name = "request"; + packageName = "request"; + version = "2.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; - sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; + url = "https://registry.npmjs.org/request/-/request-2.16.6.tgz"; + sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; }; }; - "agent-base-2.1.1" = { - name = "agent-base"; - packageName = "agent-base"; - version = "2.1.1"; + "request-2.67.0" = { + name = "request"; + packageName = "request"; + version = "2.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; - sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; + sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; }; }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; + "request-2.74.0" = { + name = "request"; + packageName = "request"; + version = "2.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; }; }; - "blueimp-md5-2.10.0" = { - name = "blueimp-md5"; - packageName = "blueimp-md5"; - version = "2.10.0"; + "request-2.79.0" = { + name = "request"; + packageName = "request"; + version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz"; - sha512 = "18r5wdrfrrjip7xipgxyg673njbfkj46hkswp4bmb5n7zx6gmajrashp6w32rkvhanymnx6rd7mrlqgzm68ksd89sy5x9gd5qx58hqj"; + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; - "color-2.0.1" = { - name = "color"; - packageName = "color"; - version = "2.0.1"; + "request-2.81.0" = { + name = "request"; + packageName = "request"; + version = "2.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-2.0.1.tgz"; - sha512 = "1gir7mfj6033amg78p7jvpj0nk2hw61hqd81r6x3a2qmgizbw3d89k0qk62680zhm9ypcx6c9p2cgwjvb8smxv0qgvblkwza9ah5ddr"; + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; - "crossroads-0.12.2" = { - name = "crossroads"; - packageName = "crossroads"; - version = "0.12.2"; + "request-2.85.0" = { + name = "request"; + packageName = "request"; + version = "2.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/crossroads/-/crossroads-0.12.2.tgz"; - sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2"; + url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; + sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; }; }; - "diff2html-2.3.2" = { - name = "diff2html"; - packageName = "diff2html"; - version = "2.3.2"; + "request-2.9.203" = { + name = "request"; + packageName = "request"; + version = "2.9.203"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.2.tgz"; - sha1 = "1c5864266d437148bc66fdd66d4ad750102d7fed"; + url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz"; + sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }; }; - "express-4.15.5" = { - name = "express"; - packageName = "express"; - version = "4.15.5"; + "request-progress-2.0.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.5.tgz"; - sha1 = "670235ca9598890a5ae8170b83db722b842ed927"; + url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; + sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; }; }; - "express-session-1.15.6" = { - name = "express-session"; - packageName = "express-session"; - version = "1.15.6"; + "requestretry-1.13.0" = { + name = "requestretry"; + packageName = "requestretry"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz"; - sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg"; + url = "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz"; + sha512 = "2d6rk1gry4jlbd4i3ghm6vn9vjcjwsyb02w9f4jc5ximih9niq4javazp9hbm658zp2fz2zm8xy1dp2rxqv2c84301p0hg7rfl7ss1f"; }; }; - "getmac-1.2.1" = { - name = "getmac"; - packageName = "getmac"; - version = "1.2.1"; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-1.2.1.tgz"; - sha1 = "0d095fd0627850043eac1dcfa0b120bbdc1426d1"; + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; - "hasher-1.2.0" = { - name = "hasher"; - packageName = "hasher"; - version = "1.2.0"; + "require-from-string-1.2.1" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz"; - sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz"; + sha1 = "529c9ccef27380adfec9a2f965b649bbee636418"; }; }; - "just-detect-adblock-1.0.0" = { - name = "just-detect-adblock"; - packageName = "just-detect-adblock"; - version = "1.0.0"; + "require-from-string-2.0.2" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.0.0.tgz"; - sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; + sha512 = "09yzgr8s5p0rb2ic71zylyy7dcxk9xskcmkgh7bddq4h383nn34g47wry2yvw7flxzjzsbak6d1n9cabfgh5gnb2kifrccixrcjgzax"; }; }; - "keen.io-0.1.3" = { - name = "keen.io"; - packageName = "keen.io"; - version = "0.1.3"; + "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/keen.io/-/keen.io-0.1.3.tgz"; - sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; }; }; - "knockout-3.4.2" = { - name = "knockout"; - packageName = "knockout"; - version = "3.4.2"; + "require-uncached-1.0.3" = { + name = "require-uncached"; + packageName = "require-uncached"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.4.2.tgz"; - sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937"; + url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; + sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "memorystore-1.6.0" = { - name = "memorystore"; - packageName = "memorystore"; - version = "1.6.0"; + "requires-port-1.0.0" = { + name = "requires-port"; + packageName = "requires-port"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.0.tgz"; - sha1 = "1fb5fb5f0b2edf1add184917e918f094a9ff3465"; + url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "node-cache-4.1.1" = { - name = "node-cache"; - packageName = "node-cache"; - version = "4.1.1"; + "requizzle-0.2.1" = { + name = "requizzle"; + packageName = "requizzle"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz"; - sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; + url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz"; + sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde"; }; }; - "npm-5.4.2" = { - name = "npm"; - packageName = "npm"; - version = "5.4.2"; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.4.2.tgz"; - sha512 = "28m9zjiynb24b8bxikdaya27j87am88x1y8l70pvmh9fk3pfq0y6xvqjmpy72ld4csnz9s1hik1ff8a19sx6pyi8f5ar27b044cp8hp"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "octicons-3.5.0" = { - name = "octicons"; - packageName = "octicons"; - version = "3.5.0"; + "resolve-1.7.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz"; - sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.7.0.tgz"; + sha512 = "2f21aw16zyl0cnz3cr5pvskv4f4lxhp2c14ak8p80kam37nayxdsi9j9n9bcdpilnqbw2pbipxc4nx4vqhyg3mnlhjn1mfip3jikn21"; }; }; - "passport-local-1.0.0" = { - name = "passport-local"; - packageName = "passport-local"; - version = "1.0.0"; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz"; - sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; }; }; - "raven-2.1.2" = { - name = "raven"; - packageName = "raven"; - version = "2.1.2"; + "resolve-from-1.0.1" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-2.1.2.tgz"; - sha512 = "136ylazswrblh2b1kc29xsmzk3i3bhm6vcirl1zb60fv9h0nf3hipz7qm91vs6my1lry00xrzpy1x96y51siciwwq7k3fs0ynl2j6m4"; + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz"; + sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; }; }; - "signals-1.0.0" = { - name = "signals"; - packageName = "signals"; - version = "1.0.0"; + "resolve-from-2.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; - sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; + sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; }; }; - "snapsvg-0.5.1" = { - name = "snapsvg"; - packageName = "snapsvg"; - version = "0.5.1"; + "resolve-from-3.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz"; - sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; }; }; - "superagent-3.5.2" = { - name = "superagent"; - packageName = "superagent"; - version = "3.5.2"; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz"; - sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8"; + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; }; }; - "winston-2.3.1" = { - name = "winston"; - packageName = "winston"; - version = "2.3.1"; + "response-time-2.3.2" = { + name = "response-time"; + packageName = "response-time"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz"; - sha1 = "0b48420d978c01804cf0230b648861598225a119"; + url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; + sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; }; }; - "yargs-9.0.1" = { - name = "yargs"; - packageName = "yargs"; - version = "9.0.1"; + "responselike-1.0.2" = { + name = "responselike"; + packageName = "responselike"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz"; - sha1 = "52acc23feecac34042078ee78c0c007f5085db4c"; + url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; }; }; - "color-string-1.5.2" = { - name = "color-string"; - packageName = "color-string"; - version = "1.5.2"; + "restify-4.0.3" = { + name = "restify"; + packageName = "restify"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz"; - sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; + url = "https://registry.npmjs.org/restify/-/restify-4.0.3.tgz"; + sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc"; }; }; - "simple-swizzle-0.2.2" = { - name = "simple-swizzle"; - packageName = "simple-swizzle"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; - }; - }; - "is-arrayish-0.3.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.3.1"; + "restore-cursor-1.0.1" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz"; - sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; + sha1 = "34661f46886327fed2991479152252df92daa541"; }; }; - "hogan.js-3.0.2" = { - name = "hogan.js"; - packageName = "hogan.js"; - version = "3.0.2"; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz"; - sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; }; }; - "extract-opts-3.3.1" = { - name = "extract-opts"; - packageName = "extract-opts"; - version = "3.3.1"; + "resumer-0.0.0" = { + name = "resumer"; + packageName = "resumer"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/extract-opts/-/extract-opts-3.3.1.tgz"; - sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1"; + url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; + sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; }; }; - "eachr-3.2.0" = { - name = "eachr"; - packageName = "eachr"; - version = "3.2.0"; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz"; - sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484"; + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; }; }; - "editions-1.3.3" = { - name = "editions"; - packageName = "editions"; - version = "1.3.3"; + "retry-0.10.1" = { + name = "retry"; + packageName = "retry"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz"; - sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; + url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; + sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; }; }; - "typechecker-4.4.1" = { - name = "typechecker"; - packageName = "typechecker"; - version = "4.4.1"; + "retry-0.6.0" = { + name = "retry"; + packageName = "retry"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz"; - sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6"; + url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; }; }; - "underscore-1.5.2" = { - name = "underscore"; - packageName = "underscore"; - version = "1.5.2"; + "retry-0.6.1" = { + name = "retry"; + packageName = "retry"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; - sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz"; + sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; }; }; - "lsmod-1.0.0" = { - name = "lsmod"; - packageName = "lsmod"; - version = "1.0.0"; + "revalidator-0.1.8" = { + name = "revalidator"; + packageName = "revalidator"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz"; - sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; + url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; + sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; }; }; - "stack-trace-0.0.9" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.9"; + "reverse-http-1.3.0" = { + name = "reverse-http"; + packageName = "reverse-http"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.3.0.tgz"; + sha1 = "61a9644bdea483aa281ffb62706e642f1a73a239"; }; }; - "uuid-3.0.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.0"; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; - sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; }; }; - "eve-0.5.4" = { - name = "eve"; - packageName = "eve"; - version = "0.5.4"; + "rimraf-2.1.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz"; - sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; + sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; }; }; - "adm-zip-0.4.7" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.4.7"; + "rimraf-2.2.8" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; - sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "kew-0.1.7" = { - name = "kew"; - packageName = "kew"; - version = "0.1.7"; + "rimraf-2.4.5" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; - sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; + sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; }; }; - "npmconf-0.1.16" = { - name = "npmconf"; - packageName = "npmconf"; - version = "0.1.16"; + "rimraf-2.6.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz"; - sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; + sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; - "phantomjs-1.9.20" = { - name = "phantomjs"; - packageName = "phantomjs"; - version = "1.9.20"; + "ripemd160-2.0.1" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.20.tgz"; - sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"; + sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; }; }; - "follow-redirects-0.0.3" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "0.0.3"; + "rndm-1.2.0" = { + name = "rndm"; + packageName = "rndm"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; - sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; + url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; + sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; }; }; - "acorn-dynamic-import-2.0.2" = { - name = "acorn-dynamic-import"; - packageName = "acorn-dynamic-import"; - version = "2.0.2"; + "root-2.0.0" = { + name = "root"; + packageName = "root"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz"; - sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; + url = "https://registry.npmjs.org/root/-/root-2.0.0.tgz"; + sha1 = "5cde3bc4ee9eb314c9dc64f97d9b9787df22e2f7"; }; }; - "enhanced-resolve-3.4.1" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "3.4.1"; + "root-check-1.0.0" = { + name = "root-check"; + packageName = "root-check"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz"; - sha1 = "0421e339fd71419b3da13d129b3979040230476e"; + url = "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz"; + sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697"; }; }; - "escope-3.6.0" = { - name = "escope"; - packageName = "escope"; - version = "3.6.0"; + "router-0.6.2" = { + name = "router"; + packageName = "router"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; - sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; + url = "https://registry.npmjs.org/router/-/router-0.6.2.tgz"; + sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; - "json-loader-0.5.7" = { - name = "json-loader"; - packageName = "json-loader"; - version = "0.5.7"; + "router-1.3.2" = { + name = "router"; + packageName = "router"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz"; - sha512 = "3iwy9jwca9hg6h1k7cmcdlsygn2qzjv7w72fsrfjfpdrcyd4xc5fb11sf664rvnzrfmz24f19kvi3qawif4n63lggvpg5pv73qfrcs0"; + url = "https://registry.npmjs.org/router/-/router-1.3.2.tgz"; + sha1 = "bfaa16888a5283d5ee40d999da7a9fa15296a60c"; }; }; - "loader-runner-2.3.0" = { - name = "loader-runner"; - packageName = "loader-runner"; - version = "2.3.0"; + "rsvp-3.6.2" = { + name = "rsvp"; + packageName = "rsvp"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz"; - sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; + url = "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz"; + sha512 = "2bjwzsigk7685syp50amryj0sx08l155azg1z4ldx95gadlwfm07y0iyv0vfwgfchbripn2a5r04qhv546djh0biw8prgpx6r0qdx9r"; }; }; - "loader-utils-1.1.0" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "1.1.0"; + "run-async-0.1.0" = { + name = "run-async"; + packageName = "run-async"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; - sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; + url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz"; + sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; }; }; - "memory-fs-0.4.1" = { - name = "memory-fs"; - packageName = "memory-fs"; - version = "0.4.1"; + "run-async-2.3.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; - sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; - "node-libs-browser-2.0.0" = { - name = "node-libs-browser"; - packageName = "node-libs-browser"; - version = "2.0.0"; + "run-parallel-1.1.8" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz"; - sha1 = "a3a59ec97024985b46e958379646f96c4b616646"; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz"; + sha512 = "1jzs29b3g9xx5408i8gzyflx0wajfa1ai9sgm63pbvkaas0351j9y92kxq06x8dhg7w829skizs88cdlf156zfm1yk5brbbb0spb6vv"; }; }; - "uglifyjs-webpack-plugin-0.4.6" = { - name = "uglifyjs-webpack-plugin"; - packageName = "uglifyjs-webpack-plugin"; - version = "0.4.6"; + "run-parallel-limit-1.0.4" = { + name = "run-parallel-limit"; + packageName = "run-parallel-limit"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz"; - sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; + url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.4.tgz"; + sha512 = "2y7d7x3kwlwgyqvhlklxl08rkc63c2ww0jf8pcwlnw4nl2k3wcbkid5fwg130cbkwzslv8c4xrrxccng4yqib8dbcgivyq0h855k4yf"; }; }; - "webpack-sources-1.0.2" = { - name = "webpack-sources"; - packageName = "webpack-sources"; - version = "1.0.2"; + "run-queue-1.0.3" = { + name = "run-queue"; + packageName = "run-queue"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.2.tgz"; - sha512 = "1mk1l1f1bv2cnxbyr13i5rbiwm9cgv91d28rk3mmy8z2m6f0xksgkjv5k00xcmvkd3sjsbrica8a1xrlzz0crydrfix3sdgq1s1vdb3"; + url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "es6-map-0.1.5" = { - name = "es6-map"; - packageName = "es6-map"; - version = "0.1.5"; + "run-series-1.1.6" = { + name = "run-series"; + packageName = "run-series"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; - sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + url = "https://registry.npmjs.org/run-series/-/run-series-1.1.6.tgz"; + sha512 = "2rpksrvsfrz5kv3cwr448d60521dlky61p5hp3ci7g8140yfm58g7xak4gkqysfc9cm6hknxyizfs832939fxg01qslxrzlx7l805a1"; }; }; - "es6-weak-map-2.0.2" = { - name = "es6-weak-map"; - packageName = "es6-weak-map"; - version = "2.0.2"; + "rusha-0.8.13" = { + name = "rusha"; + packageName = "rusha"; + version = "0.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; - sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.13.tgz"; + sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; - "d-1.0.0" = { - name = "d"; - packageName = "d"; - version = "1.0.0"; + "rx-2.5.3" = { + name = "rx"; + packageName = "rx"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; - sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; + url = "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz"; + sha1 = "21adc7d80f02002af50dae97fd9dbf248755f566"; }; }; - "es5-ext-0.10.35" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.35"; + "rx-4.1.0" = { + name = "rx"; + packageName = "rx"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz"; - sha1 = "18ee858ce6a3c45c7d79e91c15fcca9ec568494f"; + url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; + sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; }; }; - "es6-iterator-2.0.3" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.3"; + "rx-lite-3.1.2" = { + name = "rx-lite"; + packageName = "rx-lite"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"; + sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; }; }; - "es6-set-0.1.5" = { - name = "es6-set"; - packageName = "es6-set"; - version = "0.1.5"; + "rx-lite-4.0.8" = { + name = "rx-lite"; + packageName = "rx-lite"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; - sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"; + sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; }; }; - "es6-symbol-3.1.1" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.1"; + "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/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; + sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; + "rxjs-5.5.8" = { + name = "rxjs"; + packageName = "rxjs"; + version = "5.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz"; + sha512 = "32whnkvnay58zbcwimj3lpagg52k7swjdcys6i14a0im2hj1svh602bpvpb3zrqv36k96a1gsjjzbjxvfy6aj89i838l06mxsiflgh7"; }; }; - "big.js-3.2.0" = { - name = "big.js"; - packageName = "big.js"; - version = "3.2.0"; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; - sha512 = "3qicqys1bg16slzbzjn3f0fir82r4d1h6lvy5y0cqqwzbs2iaxf93xgi6x47m7l87i102ifjn4qvjbf764gyncsxcqw7lw33mk7y4zs"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; }; }; - "emojis-list-2.1.0" = { - name = "emojis-list"; - packageName = "emojis-list"; - version = "2.1.0"; + "safe-buffer-5.1.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; - sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; }; }; - "os-browserify-0.2.1" = { - name = "os-browserify"; - packageName = "os-browserify"; - version = "0.2.1"; + "safe-json-parse-1.0.1" = { + name = "safe-json-parse"; + packageName = "safe-json-parse"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz"; - sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"; + url = "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz"; + sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; }; }; - "timers-browserify-2.0.4" = { - name = "timers-browserify"; - packageName = "timers-browserify"; - version = "2.0.4"; + "safe-json-stringify-1.1.0" = { + name = "safe-json-stringify"; + packageName = "safe-json-stringify"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz"; - sha512 = "2pddj1k7206wrs3q5z7dzwc657rbdd2m00llzz0h1241fp0y5i32qi2slmfys217hqszbqmvnmjr32msgbjgzh33nxw6py49p4j35mr"; + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz"; + sha512 = "30fqwpa7qn9rsk4va9ih61jqhm0x59s3wa2n5kff1ygdwpi9hxmpig24y1vhdv1di2pfd6gy0iwkryix6lc5gff7pcb3xa7l58nsc0k"; }; }; - "source-list-map-2.0.0" = { - name = "source-list-map"; - packageName = "source-list-map"; - version = "2.0.0"; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz"; - sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93"; + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; }; }; - "addons-linter-0.27.0" = { - name = "addons-linter"; - packageName = "addons-linter"; - version = "0.27.0"; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.27.0.tgz"; - sha512 = "1pj51znvw4qfcji454ykz9iwh33jkws8dq78aavxzjjyibsssamdlsw01j81v4xy93w33d4ckq72r3nn8v9q34vh19izb7s05hqhw4y"; + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; }; }; - "babel-polyfill-6.20.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.20.0"; + "sanitize-html-1.18.2" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.20.0.tgz"; - sha1 = "de4a371006139e20990aac0be367d398331204e7"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.2.tgz"; + sha512 = "2kbz3x78dradp1xaddz60iakax4cj1rqgdxhjj5ljfgwm17kjc5pvr1kh2lyqrbxxmcx9kbfv8pa68af126v5clprks11vvwq1y2r77"; }; }; - "babel-runtime-6.25.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.25.0"; + "sax-0.3.5" = { + name = "sax"; + packageName = "sax"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz"; - sha1 = "33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"; + url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; + sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; }; }; - "bunyan-1.8.10" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.8.10"; + "sax-0.5.2" = { + name = "sax"; + packageName = "sax"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz"; - sha1 = "201fedd26c7080b632f416072f53a90b9a52981c"; + url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz"; + sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; }; }; - "debounce-1.0.2" = { - name = "debounce"; - packageName = "debounce"; - version = "1.0.2"; + "sax-0.5.8" = { + name = "sax"; + packageName = "sax"; + version = "0.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/debounce/-/debounce-1.0.2.tgz"; - sha1 = "503cc674d8d7f737099664fb75ddbd36b9626dc6"; + url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; + sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }; }; - "es6-error-4.0.2" = { - name = "es6-error"; - packageName = "es6-error"; - version = "4.0.2"; + "sax-1.1.4" = { + name = "sax"; + packageName = "sax"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.2.tgz"; - sha1 = "eec5c726eacef51b7f6b73c20db6e1b13b069c98"; + url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; + sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; }; }; - "es6-promisify-5.0.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "5.0.0"; + "sax-1.2.1" = { + name = "sax"; + packageName = "sax"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; + sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; }; }; - "event-to-promise-0.8.0" = { - name = "event-to-promise"; - packageName = "event-to-promise"; - version = "0.8.0"; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/event-to-promise/-/event-to-promise-0.8.0.tgz"; - sha1 = "4b84f11772b6f25f7752fc74d971531ac6f5b626"; + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; }; }; - "firefox-profile-0.5.0" = { - name = "firefox-profile"; - packageName = "firefox-profile"; - version = "0.5.0"; + "schema-utils-0.4.5" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-0.5.0.tgz"; - sha1 = "036de91fe3ff218d9ed8252d924f49bca0b672bd"; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz"; + sha512 = "1y97jl7qm7xvd867cghrgfzrlyf5z05rvwpigvi4ijzy4c8ckqr0bl76ym5nh6akiyc2qb19kbnmmk1r8nkfm4fsp4lznnpsipy72n9"; }; }; - "fx-runner-1.0.8" = { - name = "fx-runner"; - packageName = "fx-runner"; - version = "1.0.8"; + "scoped-regex-1.0.0" = { + name = "scoped-regex"; + packageName = "scoped-regex"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.8.tgz"; - sha1 = "5ced3b04a8d51d634de20d1480f0dc5dd8325dec"; + url = "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz"; + sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; }; }; - "git-rev-sync-1.9.1" = { - name = "git-rev-sync"; - packageName = "git-rev-sync"; - version = "1.9.1"; + "seek-bzip-1.0.5" = { + name = "seek-bzip"; + packageName = "seek-bzip"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-1.9.1.tgz"; - sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; + url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz"; + sha1 = "cfe917cb3d274bcffac792758af53173eb1fabdc"; }; }; - "mz-2.6.0" = { - name = "mz"; - packageName = "mz"; - version = "2.6.0"; + "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/mz/-/mz-2.6.0.tgz"; - sha1 = "c8b8521d958df0a4f2768025db69c719ee4ef1ce"; + url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz"; + sha1 = "857bef5e3644601ca4b9570b87e9df5ca12974fa"; }; }; - "node-firefox-connect-1.2.0" = { - name = "node-firefox-connect"; - packageName = "node-firefox-connect"; - version = "1.2.0"; + "semver-1.1.0" = { + name = "semver"; + packageName = "semver"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-firefox-connect/-/node-firefox-connect-1.2.0.tgz"; - sha1 = "42403848313240c98514ef14b3302816fe3b84e1"; + url = "https://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; + sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e"; }; }; - "node-notifier-5.1.2" = { - name = "node-notifier"; - packageName = "node-notifier"; - version = "5.1.2"; + "semver-2.0.11" = { + name = "semver"; + packageName = "semver"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.1.2.tgz"; - sha1 = "2fa9e12605fa10009d44549d6fcd8a63dde0e4ff"; + url = "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; + "semver-2.3.2" = { + name = "semver"; + packageName = "semver"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; + url = "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; + sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; }; }; - "sign-addon-0.2.1" = { - name = "sign-addon"; - packageName = "sign-addon"; - version = "0.2.1"; + "semver-4.3.6" = { + name = "semver"; + packageName = "semver"; + version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.2.1.tgz"; - sha1 = "0172bdd9fdee7bdc636f3833b6977a556c75388e"; + url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; + sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; }; }; - "source-map-support-0.5.0" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.0"; + "semver-5.0.3" = { + name = "semver"; + packageName = "semver"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz"; - sha512 = "3nwgpximc17yn0lfg8658fxkm2hwbpvnbx5x1g0qgqvjm3vzld96rh1gf6iw1srbkicp0m825sq92r9bnj2r2gl8ys0f7fzivf0sjmx"; + url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; + sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; - "stream-to-promise-2.2.0" = { - name = "stream-to-promise"; - packageName = "stream-to-promise"; - version = "2.2.0"; + "semver-5.1.1" = { + name = "semver"; + packageName = "semver"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-2.2.0.tgz"; - sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f"; + url = "https://registry.npmjs.org/semver/-/semver-5.1.1.tgz"; + sha1 = "a3292a373e6f3e0798da0b20641b9a9c5bc47e19"; }; }; - "tmp-0.0.30" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.30"; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz"; - sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed"; + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; }; - "watchpack-1.3.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.3.0"; + "semver-5.4.1" = { + name = "semver"; + packageName = "semver"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.0.tgz"; - sha1 = "5164d4faabb88dcf277f17c8a3b16bfd3da8bee3"; + url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; + sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; }; }; - "update-notifier-2.2.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "2.2.0"; + "semver-5.5.0" = { + name = "semver"; + packageName = "semver"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; - sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; - "yargs-6.6.0" = { - name = "yargs"; - packageName = "yargs"; - version = "6.6.0"; + "semver-diff-2.1.0" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; - sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; }; }; - "zip-dir-1.0.2" = { - name = "zip-dir"; - packageName = "zip-dir"; - version = "1.0.2"; + "semver-regex-1.0.0" = { + name = "semver-regex"; + packageName = "semver-regex"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/zip-dir/-/zip-dir-1.0.2.tgz"; - sha1 = "253f907aead62a21acd8721d8b88032b2411c051"; + url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; + sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; }; }; - "ajv-5.2.3" = { - name = "ajv"; - packageName = "ajv"; - version = "5.2.3"; + "semver-truncate-1.1.2" = { + name = "semver-truncate"; + packageName = "semver-truncate"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz"; - sha1 = "c06f598778c44c6b161abafe3466b81ad1814ed2"; + url = "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz"; + sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8"; }; }; - "cheerio-1.0.0-rc.2" = { - name = "cheerio"; - packageName = "cheerio"; - version = "1.0.0-rc.2"; + "semver-utils-1.1.2" = { + name = "semver-utils"; + packageName = "semver-utils"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz"; - sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"; + url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.2.tgz"; + sha512 = "09ryf3nvrfjqr93b8fj691lh48pvqhrpah5a5fm87szs42xcnl33sss49piv1grb9h2i7icdvz0i0m5yak5ccxa6xbv4x294rsfs6zr"; }; }; - "common-tags-1.4.0" = { - name = "common-tags"; - packageName = "common-tags"; - version = "1.4.0"; + "send-0.0.3" = { + name = "send"; + packageName = "send"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz"; - sha1 = "1187be4f3d4cf0c0427d43f74eef1f73501614c0"; + url = "https://registry.npmjs.org/send/-/send-0.0.3.tgz"; + sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184"; }; }; - "crx-parser-0.1.2" = { - name = "crx-parser"; - packageName = "crx-parser"; - version = "0.1.2"; + "send-0.1.0" = { + name = "send"; + packageName = "send"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/crx-parser/-/crx-parser-0.1.2.tgz"; - sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d"; + url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz"; + sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; }; }; - "doctoc-1.3.0" = { - name = "doctoc"; - packageName = "doctoc"; - version = "1.3.0"; + "send-0.1.4" = { + name = "send"; + packageName = "send"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.0.tgz"; - sha1 = "7f0839851dd58c808a2cae55d9504e012d08ee30"; + url = "https://registry.npmjs.org/send/-/send-0.1.4.tgz"; + sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; }; }; - "dispensary-0.10.19" = { - name = "dispensary"; - packageName = "dispensary"; - version = "0.10.19"; + "send-0.11.1" = { + name = "send"; + packageName = "send"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.10.19.tgz"; - sha1 = "457993df5f4a7e03f6fa00ec8ac4f8b21bebab69"; + url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz"; + sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; }; }; - "eslint-4.8.0" = { - name = "eslint"; - packageName = "eslint"; - version = "4.8.0"; + "send-0.13.0" = { + name = "send"; + packageName = "send"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.8.0.tgz"; - sha1 = "229ef0e354e0e61d837c7a80fdfba825e199815e"; + url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz"; + sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de"; }; }; - "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { - name = "eslint-plugin-no-unsafe-innerhtml"; - packageName = "eslint-plugin-no-unsafe-innerhtml"; - version = "1.0.16"; + "send-0.13.2" = { + name = "send"; + packageName = "send"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-no-unsafe-innerhtml/-/eslint-plugin-no-unsafe-innerhtml-1.0.16.tgz"; - sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; + url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz"; + sha1 = "765e7607c8055452bba6f0b052595350986036de"; }; }; - "first-chunk-stream-2.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; - version = "2.0.0"; + "send-0.15.6" = { + name = "send"; + packageName = "send"; + version = "0.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; - sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; + url = "https://registry.npmjs.org/send/-/send-0.15.6.tgz"; + sha1 = "20f23a9c925b762ab82705fe2f9db252ace47e34"; }; }; - "jed-1.1.1" = { - name = "jed"; - packageName = "jed"; - version = "1.1.1"; + "send-0.16.1" = { + name = "send"; + packageName = "send"; + version = "0.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz"; - sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; + url = "https://registry.npmjs.org/send/-/send-0.16.1.tgz"; + sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j"; }; }; - "pino-4.10.1" = { - name = "pino"; - packageName = "pino"; - version = "4.10.1"; + "send-0.16.2" = { + name = "send"; + packageName = "send"; + version = "0.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.10.1.tgz"; - sha512 = "3rpmn1qi3nr971gz5r7r3m2z0zw5qm0grj2xrihhf8mllkwl9i4klkav8gg0js5kgd2y39jf7z9qc0ihja2nzlzl61c31jvph091w6p"; + url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; + sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; }; }; - "postcss-6.0.11" = { - name = "postcss"; - packageName = "postcss"; - version = "6.0.11"; + "sentiment-2.1.0" = { + name = "sentiment"; + packageName = "sentiment"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz"; - sha512 = "1raf6rg2rp67ql9bgihz0b0laxjakl84aqf428a7d370fcq5hzfnb4gj7gkyqx5zafw6h9y1b5c666k0acjxh34n1mhlifd777wij8f"; + url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz"; + sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; }; }; - "relaxed-json-1.0.1" = { - name = "relaxed-json"; - packageName = "relaxed-json"; - version = "1.0.1"; + "sequence-2.2.1" = { + name = "sequence"; + packageName = "sequence"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/relaxed-json/-/relaxed-json-1.0.1.tgz"; - sha1 = "7c8d4aa2f095704cd020e32e8099bcae103f0bd4"; + url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; + sha1 = "7f5617895d44351c0a047e764467690490a16b03"; }; }; - "strip-bom-stream-3.0.0" = { - name = "strip-bom-stream"; - packageName = "strip-bom-stream"; - version = "3.0.0"; + "sequencify-0.0.7" = { + name = "sequencify"; + packageName = "sequencify"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz"; - sha1 = "956bcc5d84430f69256a90ed823765cd858e159c"; + url = "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"; + sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; }; }; - "whatwg-url-6.3.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "6.3.0"; + "serialize-javascript-1.4.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.3.0.tgz"; - sha512 = "01m395qx0wag7d63id97v2d86ifpw677f42lys2k6bipw4n9kmwngghsb7la19impgkrg3n4ihyk3j7963rhfgd7b066a4qk09s3kxc"; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz"; + sha1 = "7c958514db6ac2443a8abc062dc9f7886a7f6005"; }; }; - "yauzl-2.8.0" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.8.0"; + "serve-favicon-2.3.2" = { + name = "serve-favicon"; + packageName = "serve-favicon"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz"; - sha1 = "79450aff22b2a9c5a41ef54e02db907ccfbf9ee2"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; + sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; }; }; - "parse5-3.0.3" = { - name = "parse5"; - packageName = "parse5"; - version = "3.0.3"; + "serve-favicon-2.5.0" = { + name = "serve-favicon"; + packageName = "serve-favicon"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz"; - sha512 = "005xscj5zlz7pkxa5ngys7i7pdb2f4pirj1zw7hr1145zhxxgg04nhykjh1csy2ncr5lyjw8phq8m2ylqhfhi2z4hgvjb2b1rkbs0xf"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz"; + sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; - "anchor-markdown-header-0.5.7" = { - name = "anchor-markdown-header"; - packageName = "anchor-markdown-header"; - version = "0.5.7"; + "serve-index-1.7.3" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz"; - sha1 = "045063d76e6a1f9cd327a57a0126aa0fdec371a7"; + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz"; + sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2"; }; }; - "markdown-to-ast-3.4.0" = { - name = "markdown-to-ast"; - packageName = "markdown-to-ast"; - version = "3.4.0"; + "serve-index-1.9.1" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-to-ast/-/markdown-to-ast-3.4.0.tgz"; - sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; }; }; - "update-section-0.3.3" = { - name = "update-section"; - packageName = "update-section"; - version = "0.3.3"; + "serve-static-1.10.3" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz"; - sha1 = "458f17820d37820dc60e20b86d94391b00123158"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz"; + sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; }; }; - "emoji-regex-6.1.3" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "6.1.3"; + "serve-static-1.12.6" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz"; - sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz"; + sha1 = "b973773f63449934da54e5beba5e31d9f4211577"; }; }; - "remark-5.1.0" = { - name = "remark"; - packageName = "remark"; - version = "5.1.0"; + "serve-static-1.13.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/remark/-/remark-5.1.0.tgz"; - sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz"; + sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5"; }; }; - "structured-source-3.0.2" = { - name = "structured-source"; - packageName = "structured-source"; - version = "3.0.2"; + "serve-static-1.13.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/structured-source/-/structured-source-3.0.2.tgz"; - sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; + sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; }; }; - "traverse-0.6.6" = { - name = "traverse"; - packageName = "traverse"; - version = "0.6.6"; + "serve-static-1.8.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; - sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; + sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; }; }; - "remark-parse-1.1.0" = { - name = "remark-parse"; - packageName = "remark-parse"; - version = "1.1.0"; + "server-destroy-1.0.1" = { + name = "server-destroy"; + packageName = "server-destroy"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz"; - sha1 = "c3ca10f9a8da04615c28f09aa4e304510526ec21"; + url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"; + sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "remark-stringify-1.1.0" = { - name = "remark-stringify"; - packageName = "remark-stringify"; - version = "1.1.0"; + "service-runner-2.3.0" = { + name = "service-runner"; + packageName = "service-runner"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz"; - sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.3.0.tgz"; + sha1 = "09039dfdcc40cdbd0259dd3f982916675838cb59"; }; }; - "unified-4.2.1" = { - name = "unified"; - packageName = "unified"; - version = "4.2.1"; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-4.2.1.tgz"; - sha1 = "76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e"; + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "collapse-white-space-1.0.3" = { - name = "collapse-white-space"; - packageName = "collapse-white-space"; - version = "1.0.3"; + "set-immediate-shim-1.0.1" = { + name = "set-immediate-shim"; + packageName = "set-immediate-shim"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz"; - sha1 = "4b906f670e5a963a87b76b0e1689643341b6023c"; + url = "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; + sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "parse-entities-1.1.1" = { - name = "parse-entities"; - packageName = "parse-entities"; - version = "1.1.1"; + "set-value-0.4.3" = { + name = "set-value"; + packageName = "set-value"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz"; - sha1 = "8112d88471319f27abae4d64964b122fe4e1b890"; + url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; }; }; - "trim-0.0.1" = { - name = "trim"; - packageName = "trim"; - version = "0.0.1"; + "set-value-2.0.0" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; - sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; + sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7"; }; }; - "trim-trailing-lines-1.1.0" = { - name = "trim-trailing-lines"; - packageName = "trim-trailing-lines"; - version = "1.1.0"; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz"; - sha1 = "7aefbb7808df9d669f6da2e438cac8c46ada7684"; + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; }; }; - "unherit-1.1.0" = { - name = "unherit"; - packageName = "unherit"; - version = "1.1.0"; + "setprototypeof-1.0.3" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz"; - sha1 = "6b9aaedfbf73df1756ad9e316dd981885840cd7d"; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; + sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; }; }; - "unist-util-remove-position-1.1.1" = { - name = "unist-util-remove-position"; - packageName = "unist-util-remove-position"; - version = "1.1.1"; + "setprototypeof-1.1.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz"; - sha1 = "5a85c1555fc1ba0c101b86707d15e50fa4c871bb"; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; }; }; - "vfile-location-2.0.2" = { - name = "vfile-location"; - packageName = "vfile-location"; - version = "2.0.2"; + "sha.js-2.4.11" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz"; - sha1 = "d3675c59c877498e492b4756ff65e4af1a752255"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; + sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0"; }; }; - "character-entities-1.2.1" = { - name = "character-entities"; - packageName = "character-entities"; - version = "1.2.1"; + "shallow-clone-0.1.2" = { + name = "shallow-clone"; + packageName = "shallow-clone"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz"; - sha1 = "f76871be5ef66ddb7f8f8e3478ecc374c27d6dca"; + url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz"; + sha1 = "5909e874ba77106d73ac414cfec1ffca87d97060"; }; }; - "character-entities-legacy-1.1.1" = { - name = "character-entities-legacy"; - packageName = "character-entities-legacy"; - version = "1.1.1"; + "shasum-1.0.2" = { + name = "shasum"; + packageName = "shasum"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz"; - sha1 = "f40779df1a101872bb510a3d295e1fccf147202f"; + url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; + sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; }; }; - "character-reference-invalid-1.1.1" = { - name = "character-reference-invalid"; - packageName = "character-reference-invalid"; - version = "1.1.1"; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz"; - sha1 = "942835f750e4ec61a308e60c2ef8cc1011202efc"; + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; }; }; - "is-alphanumerical-1.0.1" = { - name = "is-alphanumerical"; - packageName = "is-alphanumerical"; - version = "1.0.1"; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz"; - sha1 = "dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b"; + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; }; }; - "is-decimal-1.0.1" = { - name = "is-decimal"; - packageName = "is-decimal"; - version = "1.0.1"; + "shell-quote-1.6.1" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz"; - sha1 = "f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82"; + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; + sha1 = "f4781949cce402697127430ea3b3c5476f481767"; }; }; - "is-hexadecimal-1.0.1" = { - name = "is-hexadecimal"; - packageName = "is-hexadecimal"; - version = "1.0.1"; + "shelljs-0.3.0" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz"; - sha1 = "6e084bbc92061fbb0971ec58b6ce6d404e24da69"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; + sha1 = "3596e6307a781544f591f37da618360f31db57b1"; }; }; - "is-alphabetical-1.0.1" = { - name = "is-alphabetical"; - packageName = "is-alphabetical"; - version = "1.0.1"; + "shelljs-0.5.3" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz"; - sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"; + sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113"; }; }; - "unist-util-visit-1.1.3" = { - name = "unist-util-visit"; - packageName = "unist-util-visit"; - version = "1.1.3"; + "shelljs-0.7.7" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.1.3.tgz"; - sha1 = "ec268e731b9d277a79a5b5aa0643990e405d600b"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; + sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; }; }; - "ccount-1.0.2" = { - name = "ccount"; - packageName = "ccount"; - version = "1.0.2"; + "shelljs-0.7.8" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz"; - sha1 = "53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz"; + sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "longest-streak-1.0.0" = { - name = "longest-streak"; - packageName = "longest-streak"; - version = "1.0.0"; + "shelljs-0.8.1" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz"; - sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz"; + sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0"; }; }; - "markdown-table-0.4.0" = { - name = "markdown-table"; - packageName = "markdown-table"; - version = "0.4.0"; + "shellwords-0.1.1" = { + name = "shellwords"; + packageName = "shellwords"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz"; - sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; + url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"; + sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w"; }; }; - "stringify-entities-1.3.1" = { - name = "stringify-entities"; - packageName = "stringify-entities"; - version = "1.3.1"; + "shush-1.0.0" = { + name = "shush"; + packageName = "shush"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz"; - sha1 = "b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c"; + url = "https://registry.npmjs.org/shush/-/shush-1.0.0.tgz"; + sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; }; }; - "character-entities-html4-1.1.1" = { - name = "character-entities-html4"; - packageName = "character-entities-html4"; - version = "1.1.1"; + "sigmund-1.0.1" = { + name = "sigmund"; + packageName = "sigmund"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz"; - sha1 = "359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50"; + url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "bail-1.0.2" = { - name = "bail"; - packageName = "bail"; - version = "1.0.2"; + "sign-addon-0.3.0" = { + name = "sign-addon"; + packageName = "sign-addon"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz"; - sha1 = "f7d6c1731630a9f9f0d4d35ed1f962e2074a1764"; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.3.0.tgz"; + sha512 = "2czjlarf0pa0svlhbdb9i6hrk429za0gsialmxbmgwgbhyjx7mxkgf5mww4rkmsbncdi2va8p64rxjxf7gv8b0jd2a87cvm7rw5pky5"; }; }; - "trough-1.0.1" = { - name = "trough"; - packageName = "trough"; - version = "1.0.1"; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz"; - sha1 = "a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; - "vfile-1.4.0" = { - name = "vfile"; - packageName = "vfile"; - version = "1.4.0"; + "signals-1.0.0" = { + name = "signals"; + packageName = "signals"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz"; - sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7"; + url = "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; }; }; - "boundary-1.0.1" = { - name = "boundary"; - packageName = "boundary"; - version = "1.0.1"; + "signed-varint-2.0.1" = { + name = "signed-varint"; + packageName = "signed-varint"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/boundary/-/boundary-1.0.1.tgz"; - sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; + url = "https://registry.npmjs.org/signed-varint/-/signed-varint-2.0.1.tgz"; + sha1 = "50a9989da7c98c2c61dad119bc97470ef8528129"; }; }; - "array-from-2.1.1" = { - name = "array-from"; - packageName = "array-from"; - version = "2.1.1"; + "simple-concat-1.0.0" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"; - sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"; + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz"; + sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; }; }; - "natural-compare-lite-1.4.0" = { - name = "natural-compare-lite"; - packageName = "natural-compare-lite"; - version = "1.4.0"; + "simple-get-1.4.3" = { + name = "simple-get"; + packageName = "simple-get"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"; - sha1 = "17b09581988979fddafe0201e931ba933c96cbb4"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz"; + sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; }; }; - "eslint-3.19.0" = { - name = "eslint"; - packageName = "eslint"; - version = "3.19.0"; + "simple-get-2.7.0" = { + name = "simple-get"; + packageName = "simple-get"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; - sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz"; + sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6"; }; }; - "inquirer-0.12.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.12.0"; + "simple-git-1.92.0" = { + name = "simple-git"; + packageName = "simple-git"; + version = "1.92.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; - sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.92.0.tgz"; + sha1 = "6061468eb7d19f0141078fc742e62457e910f547"; }; }; - "pluralize-1.2.1" = { - name = "pluralize"; - packageName = "pluralize"; - version = "1.2.1"; + "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/pluralize/-/pluralize-1.2.1.tgz"; - sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; + url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; }; }; - "table-3.8.3" = { - name = "table"; - packageName = "table"; - version = "3.8.3"; + "simple-peer-6.4.4" = { + name = "simple-peer"; + packageName = "simple-peer"; + version = "6.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; - sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.4.tgz"; + sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "ajv-keywords-1.5.1" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "1.5.1"; + "simple-peer-9.0.0" = { + name = "simple-peer"; + packageName = "simple-peer"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; - sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.0.0.tgz"; + sha512 = "1fwihnw60ayp1hyj2rp40cshqhi32rj1gjhr060awg35rk762z9a4d15zapvxi76bmdhgs3vs8lv7xmdqxbabg8d3z1xlkq5vnhq0d1"; }; }; - "slice-ansi-0.0.4" = { - name = "slice-ansi"; - packageName = "slice-ansi"; - version = "0.0.4"; + "simple-plist-0.2.1" = { + name = "simple-plist"; + packageName = "simple-plist"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; - sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; + sha1 = "71766db352326928cf3a807242ba762322636723"; }; }; - "fast-json-parse-1.0.3" = { - name = "fast-json-parse"; - packageName = "fast-json-parse"; - version = "1.0.3"; + "simple-sha1-2.1.0" = { + name = "simple-sha1"; + packageName = "simple-sha1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz"; - sha512 = "01vq6bwp36yjvywlw5jniq4ainn8jrwxsab76bv02j77ky26qm99097g7x6j8dqrjrhfgd0vs9q6nh2milhsnsk9529s42njilsq58m"; + url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz"; + sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3"; }; }; - "fast-safe-stringify-1.2.1" = { - name = "fast-safe-stringify"; - packageName = "fast-safe-stringify"; - version = "1.2.1"; + "simple-swizzle-0.2.2" = { + name = "simple-swizzle"; + packageName = "simple-swizzle"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.1.tgz"; - sha512 = "2in2h3qxnsgr2kvm4pk5hlgxgx9n4hnh83rzirgscbql55k3jwgvs9hksclxzi7il0i0qbj3iqk5qlka0rf71wq9b9qij9jxmw2lrc3"; + url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; }; }; - "flatstr-1.0.5" = { - name = "flatstr"; - packageName = "flatstr"; - version = "1.0.5"; + "simple-websocket-4.3.1" = { + name = "simple-websocket"; + packageName = "simple-websocket"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.5.tgz"; - sha1 = "5b451b08cbd48e2eac54a2bbe0bf46165aa14be3"; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.1.tgz"; + sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; - "quick-format-unescaped-1.1.1" = { - name = "quick-format-unescaped"; - packageName = "quick-format-unescaped"; - version = "1.1.1"; + "simple-websocket-7.0.2" = { + name = "simple-websocket"; + packageName = "simple-websocket"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.1.tgz"; - sha1 = "e77555ef3e66e105d4039e13ef79201284fee916"; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-7.0.2.tgz"; + sha512 = "2x42bhq5w7k053k2jdhvhd2p7lmr407fkb7fwi0k7glaggf6hb452704yh1zvx83mrhdvyscmpyp971p2slmisiffmfvd6cl5md423h"; }; }; - "strip-bom-buf-1.0.0" = { - name = "strip-bom-buf"; - packageName = "strip-bom-buf"; - version = "1.0.0"; + "simplediff-0.1.1" = { + name = "simplediff"; + packageName = "simplediff"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz"; - sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572"; + url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz"; + sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; - "lodash.sortby-4.7.0" = { - name = "lodash.sortby"; - packageName = "lodash.sortby"; - version = "4.7.0"; + "simplesmtp-0.3.35" = { + name = "simplesmtp"; + packageName = "simplesmtp"; + version = "0.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + url = "https://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz"; + sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "tr46-1.0.1" = { - name = "tr46"; - packageName = "tr46"; - version = "1.0.1"; + "single-line-log-0.4.1" = { + name = "single-line-log"; + packageName = "single-line-log"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; - sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; + url = "https://registry.npmjs.org/single-line-log/-/single-line-log-0.4.1.tgz"; + sha1 = "87a55649f749d783ec0dcd804e8140d9873c7cee"; }; }; - "webidl-conversions-4.0.2" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "4.0.2"; + "single-line-log-1.1.2" = { + name = "single-line-log"; + packageName = "single-line-log"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1"; + url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz"; + sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; }; }; - "archiver-1.3.0" = { - name = "archiver"; - packageName = "archiver"; - version = "1.3.0"; + "sinopia-htpasswd-0.4.5" = { + name = "sinopia-htpasswd"; + packageName = "sinopia-htpasswd"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz"; - sha1 = "4f2194d6d8f99df3f531e6881f14f15d55faaf22"; + url = "https://registry.npmjs.org/sinopia-htpasswd/-/sinopia-htpasswd-0.4.5.tgz"; + sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9"; }; }; - "fs-extra-2.1.2" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "2.1.2"; + "siphash24-1.1.0" = { + name = "siphash24"; + packageName = "siphash24"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; - sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; + url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.0.tgz"; + sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w"; }; }; - "jetpack-id-1.0.0" = { - name = "jetpack-id"; - packageName = "jetpack-id"; + "skin-tone-1.0.0" = { + name = "skin-tone"; + packageName = "skin-tone"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jetpack-id/-/jetpack-id-1.0.0.tgz"; - sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6"; + url = "https://registry.npmjs.org/skin-tone/-/skin-tone-1.0.0.tgz"; + sha1 = "d4ba3e8e5e92760e4d1d3b603d772805c6cb256f"; }; }; - "walkdir-0.0.11" = { - name = "walkdir"; - packageName = "walkdir"; - version = "0.0.11"; + "slack-node-0.2.0" = { + name = "slack-node"; + packageName = "slack-node"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz"; - sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532"; + url = "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz"; + sha1 = "de4b8dddaa8b793f61dbd2938104fdabf37dfa30"; }; }; - "when-3.7.7" = { - name = "when"; - packageName = "when"; - version = "3.7.7"; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz"; - sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; }; }; - "which-1.2.4" = { - name = "which"; - packageName = "which"; - version = "1.2.4"; + "slasp-0.0.4" = { + name = "slasp"; + packageName = "slasp"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.4.tgz"; - sha1 = "1557f96080604e5b11b3599eb9f45b50a9efd722"; + url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz"; + sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; }; }; - "winreg-0.0.12" = { - name = "winreg"; - packageName = "winreg"; - version = "0.0.12"; + "slate-irc-0.7.3" = { + name = "slate-irc"; + packageName = "slate-irc"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/winreg/-/winreg-0.0.12.tgz"; - sha1 = "07105554ba1a9d08979251d129475bffae3006b7"; + url = "https://registry.npmjs.org/slate-irc/-/slate-irc-0.7.3.tgz"; + sha1 = "8d01f2bc809e00a5b2faca7d8d3130d155422a77"; }; }; - "is-absolute-0.1.7" = { - name = "is-absolute"; - packageName = "is-absolute"; - version = "0.1.7"; + "slate-irc-parser-0.0.2" = { + name = "slate-irc-parser"; + packageName = "slate-irc-parser"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"; - sha1 = "847491119fccb5fb436217cc737f7faad50f603f"; + url = "https://registry.npmjs.org/slate-irc-parser/-/slate-irc-parser-0.0.2.tgz"; + sha1 = "0c5f8f20d817bb85329da9fca135c66b05947d80"; }; }; - "isexe-1.1.2" = { - name = "isexe"; - packageName = "isexe"; - version = "1.1.2"; + "slice-ansi-0.0.4" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; - sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; + sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "is-relative-0.1.3" = { - name = "is-relative"; - packageName = "is-relative"; - version = "0.1.3"; + "slice-ansi-1.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"; - sha1 = "905fee8ae86f45b3ec614bc3c15c869df0876e82"; + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz"; + sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; - "shelljs-0.7.7" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.7.7"; + "sliced-0.0.3" = { + name = "sliced"; + packageName = "sliced"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; - sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; + url = "https://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz"; + sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50"; }; }; - "es6-promise-2.3.0" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "2.3.0"; + "sliced-0.0.4" = { + name = "sliced"; + packageName = "sliced"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"; - sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; + url = "https://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; + sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee"; }; }; - "firefox-client-0.3.0" = { - name = "firefox-client"; - packageName = "firefox-client"; - version = "0.3.0"; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-client/-/firefox-client-0.3.0.tgz"; - sha1 = "3794460f6eb6afcf41376addcbc7462e24a4cd8b"; + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "colors-0.5.1" = { - name = "colors"; - packageName = "colors"; - version = "0.5.1"; + "smart-buffer-1.1.15" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "1.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; - sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; + sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; }; }; - "js-select-0.6.0" = { - name = "js-select"; - packageName = "js-select"; - version = "0.6.0"; + "smartdc-auth-2.3.1" = { + name = "smartdc-auth"; + packageName = "smartdc-auth"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-select/-/js-select-0.6.0.tgz"; - sha1 = "c284e22824d5927aec962dcdf247174aefb0d190"; + url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.3.1.tgz"; + sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44"; }; }; - "traverse-0.4.6" = { - name = "traverse"; - packageName = "traverse"; - version = "0.4.6"; + "smtp-connection-1.3.8" = { + name = "smtp-connection"; + packageName = "smtp-connection"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/traverse/-/traverse-0.4.6.tgz"; - sha1 = "d04b2280e4c792a5815429ef7b8b60c64c9ccc34"; + url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.8.tgz"; + sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536"; }; }; - "JSONSelect-0.2.1" = { - name = "JSONSelect"; - packageName = "JSONSelect"; - version = "0.2.1"; + "smtp-connection-2.12.0" = { + name = "smtp-connection"; + packageName = "smtp-connection"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/JSONSelect/-/JSONSelect-0.2.1.tgz"; - sha1 = "415418a526d33fe31d74b4defa3c836d485ec203"; + url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz"; + sha1 = "d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"; }; }; - "growly-1.3.0" = { - name = "growly"; - packageName = "growly"; - version = "1.3.0"; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"; - sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n"; }; }; - "shellwords-0.1.1" = { - name = "shellwords"; - packageName = "shellwords"; - version = "0.1.1"; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"; - sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w"; + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; }; }; - "babel-polyfill-6.16.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.16.0"; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz"; - sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; }; }; - "deepcopy-0.6.3" = { - name = "deepcopy"; - packageName = "deepcopy"; - version = "0.6.3"; + "snapsvg-0.5.1" = { + name = "snapsvg"; + packageName = "snapsvg"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/deepcopy/-/deepcopy-0.6.3.tgz"; - sha1 = "634780f2f8656ab771af8fa8431ed1ccee55c7b0"; + url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz"; + sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; }; - "es6-error-4.0.0" = { - name = "es6-error"; - packageName = "es6-error"; - version = "4.0.0"; + "sntp-0.1.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.0.tgz"; - sha1 = "f094c7041f662599bb12720da059d6b9c7ff0f40"; + url = "https://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; + sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; }; }; - "jsonwebtoken-7.1.9" = { - name = "jsonwebtoken"; - packageName = "jsonwebtoken"; - version = "7.1.9"; + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz"; - sha1 = "847804e5258bec5a9499a8dc4a5e7a3bae08d58a"; + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "mz-2.5.0" = { - name = "mz"; - packageName = "mz"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.5.0.tgz"; - sha1 = "2859025df03d46b57bb317174b196477ce64cec1"; - }; - }; - "source-map-support-0.4.6" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.4.6"; + "sntp-2.1.0" = { + name = "sntp"; + packageName = "sntp"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.6.tgz"; - sha1 = "32552aa64b458392a85eab3b0b5ee61527167aeb"; + url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; + sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "regenerator-runtime-0.9.6" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.9.6"; + "snyk-1.71.0" = { + name = "snyk"; + packageName = "snyk"; + version = "1.71.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"; - sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.71.0.tgz"; + sha1 = "842cfed35ffac591ac34824ce0f1467655c5f8f1"; }; }; - "joi-6.10.1" = { - name = "joi"; - packageName = "joi"; - version = "6.10.1"; + "snyk-config-1.0.1" = { + name = "snyk-config"; + packageName = "snyk-config"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz"; - sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06"; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz"; + sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "lodash.once-4.1.1" = { - name = "lodash.once"; - packageName = "lodash.once"; - version = "4.1.1"; + "snyk-go-plugin-1.4.6" = { + name = "snyk-go-plugin"; + packageName = "snyk-go-plugin"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; - sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.6.tgz"; + sha512 = "3002f73liv15dpg1ls92j4m50374z69p9ic74zpqmr8mjlxcdv09gcxkdmg0bdkzlj3s02bpmdj7vrkw5jb2k2f6zbrr5g4d18pjy8n"; }; }; - "topo-1.1.0" = { - name = "topo"; - packageName = "topo"; - version = "1.1.0"; + "snyk-gradle-plugin-1.2.0" = { + name = "snyk-gradle-plugin"; + packageName = "snyk-gradle-plugin"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz"; - sha1 = "e9d751615d1bb87dc865db182fa1ca0a5ef536d5"; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz"; + sha512 = "1b2bxvwl2v4prlj942i4jkz4mahgp39j7lvy91jzv00nsk59l76b1icn48zj4zk84s00jil3pnxnfzsclhcc612d70s4wwi3x2hrrqn"; }; }; - "isemail-1.2.0" = { - name = "isemail"; - packageName = "isemail"; - version = "1.2.0"; + "snyk-module-1.8.1" = { + name = "snyk-module"; + packageName = "snyk-module"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz"; - sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a"; + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; + sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; }; }; - "end-of-stream-1.1.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.1.0"; + "snyk-mvn-plugin-1.1.1" = { + name = "snyk-mvn-plugin"; + packageName = "snyk-mvn-plugin"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; - sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.1.tgz"; + sha512 = "3h9drys1g2wh3w072rn00zw57g5xy42ap38k05gvdryiphx8p9iksb4azg4dyf2vd616jzslqid45hjd6iphafdzpk4b90mws880hqa"; }; }; - "stream-to-array-2.3.0" = { - name = "stream-to-array"; - packageName = "stream-to-array"; - version = "2.3.0"; + "snyk-nuget-plugin-1.3.9" = { + name = "snyk-nuget-plugin"; + packageName = "snyk-nuget-plugin"; + version = "1.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz"; - sha1 = "bbf6b39f5f43ec30bc71babcb37557acecf34353"; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.9.tgz"; + sha512 = "017qpf5cy1f0x8apjc1a3qp3aa9w7v7zlyy8jb8r7q4ilsnpdzvywrxhd6s1yy3b9fiylmgmldgdcz77srqq9pm2njvdi80pyd00zqp"; }; }; - "yargs-parser-4.2.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "4.2.1"; + "snyk-php-plugin-1.3.2" = { + name = "snyk-php-plugin"; + packageName = "snyk-php-plugin"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; - sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.3.2.tgz"; + sha512 = "2fihlcs2qxdbdfy1pjnf7110l6h4r16vkp0q51wqsfd8fw5s1qgb34plii6yhbfbs8a1il93i6hfn93yclbv50m2129wg7naf57jlqi"; }; }; - "jszip-2.6.1" = { - name = "jszip"; - packageName = "jszip"; - version = "2.6.1"; + "snyk-policy-1.10.2" = { + name = "snyk-policy"; + packageName = "snyk-policy"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz"; - sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.2.tgz"; + sha1 = "2a7bf0f07c7b811b9dda93cf9bbb10dc992dd7bc"; }; }; - "cli-list-0.2.0" = { - name = "cli-list"; - packageName = "cli-list"; - version = "0.2.0"; + "snyk-python-plugin-1.5.7" = { + name = "snyk-python-plugin"; + packageName = "snyk-python-plugin"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/cli-list/-/cli-list-0.2.0.tgz"; - sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.7.tgz"; + sha512 = "3fqq6dbx31yysvd835ng60linxmbkzixiqqf28yxq9pdx3x8dq55syhv1g6as3s85wd04q5vc5qlfgdl91jlhwcgjvdwjjr2wwp84pq"; }; }; - "fullname-3.3.0" = { - name = "fullname"; - packageName = "fullname"; - version = "3.3.0"; + "snyk-resolve-1.0.0" = { + name = "snyk-resolve"; + packageName = "snyk-resolve"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fullname/-/fullname-3.3.0.tgz"; - sha1 = "a08747d6921229610b8178b7614fce10cb185f5a"; + url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz"; + sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2"; }; }; - "humanize-string-1.0.1" = { - name = "humanize-string"; - packageName = "humanize-string"; - version = "1.0.1"; + "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/humanize-string/-/humanize-string-1.0.1.tgz"; - sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz"; + sha1 = "13743a058437dff890baaf437c333c966a743cb6"; }; }; - "insight-0.8.4" = { - name = "insight"; - packageName = "insight"; - version = "0.8.4"; + "snyk-sbt-plugin-1.2.5" = { + name = "snyk-sbt-plugin"; + packageName = "snyk-sbt-plugin"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; - sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.5.tgz"; + sha512 = "183dfn89vslcl63y76jxyndz67f5c8ii4wh0pvbxgzqb3161rz5j5p4k7dv69shiw55q1lyb1j70pjng6rafw5k0jnqc58x63bpqgz8"; }; }; - "npm-keyword-4.2.0" = { - name = "npm-keyword"; - packageName = "npm-keyword"; - version = "4.2.0"; + "snyk-tree-1.0.0" = { + name = "snyk-tree"; + packageName = "snyk-tree"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-4.2.0.tgz"; - sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0"; + url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz"; + sha1 = "0fb73176dbf32e782f19100294160448f9111cc8"; }; }; - "opn-4.0.2" = { - name = "opn"; - packageName = "opn"; - version = "4.0.2"; + "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/opn/-/opn-4.0.2.tgz"; - sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; + url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz"; + sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; }; }; - "parse-help-0.1.1" = { - name = "parse-help"; - packageName = "parse-help"; - version = "0.1.1"; + "socket.io-0.9.14" = { + name = "socket.io"; + packageName = "socket.io"; + version = "0.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz"; - sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz"; + sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667"; }; }; - "root-check-1.0.0" = { - name = "root-check"; - packageName = "root-check"; - version = "1.0.0"; + "socket.io-1.0.6" = { + name = "socket.io"; + packageName = "socket.io"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz"; - sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz"; + sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a"; }; }; - "sort-on-2.0.0" = { - name = "sort-on"; - packageName = "sort-on"; - version = "2.0.0"; + "socket.io-1.7.4" = { + name = "socket.io"; + packageName = "socket.io"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/sort-on/-/sort-on-2.0.0.tgz"; - sha1 = "0df42a679d7ae4aed9c30ba2f55807d979910fcc"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.4.tgz"; + sha1 = "2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00"; }; }; - "tabtab-1.3.2" = { - name = "tabtab"; - packageName = "tabtab"; - version = "1.3.2"; + "socket.io-2.0.4" = { + name = "socket.io"; + packageName = "socket.io"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz"; - sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; + sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; }; - "titleize-1.0.0" = { - name = "titleize"; - packageName = "titleize"; - version = "1.0.0"; + "socket.io-2.1.0" = { + name = "socket.io"; + packageName = "socket.io"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/titleize/-/titleize-1.0.0.tgz"; - sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.0.tgz"; + sha512 = "2wkm6yqxvn8wk51rbakza3zxg3rknzfgmwqrbzvnlacf1yylplsr61i67m01sg8x7589ymj6x3z266ngvqd6qyyakdx4dlnsl4bfbr9"; }; }; - "yeoman-character-1.1.0" = { - name = "yeoman-character"; - packageName = "yeoman-character"; - version = "1.1.0"; + "socket.io-adapter-0.2.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-character/-/yeoman-character-1.1.0.tgz"; - sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7"; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz"; + sha1 = "bd39329b8961371787e24f345b074ec9cf000e33"; }; }; - "yeoman-doctor-2.1.0" = { - name = "yeoman-doctor"; - packageName = "yeoman-doctor"; - version = "2.1.0"; + "socket.io-adapter-0.5.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-2.1.0.tgz"; - sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; + sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; }; }; - "yeoman-environment-2.0.5" = { - name = "yeoman-environment"; - packageName = "yeoman-environment"; - version = "2.0.5"; + "socket.io-adapter-1.1.1" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.5.tgz"; - sha512 = "3kfwj39dplgp9w79zmk9p5hm4dfw21304srx68f0hzxhak45iql4j8gzxj4l3q9p4jcmwf25ar0ak4sm57rzx46bv4z2f3q3vybpxgb"; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; + sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; }; }; - "yosay-2.0.1" = { - name = "yosay"; - packageName = "yosay"; - version = "2.0.1"; + "socket.io-client-0.9.11" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "0.9.11"; src = fetchurl { - url = "https://registry.npmjs.org/yosay/-/yosay-2.0.1.tgz"; - sha512 = "1n6z65vkm1r31a1ms8wn32m9q61vrlz9isn43lm00qka1zvnich78zbnp29xwy72z361is2yimrpglmc55w97hbi9pas5pqlnvqbpw4"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz"; + sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7"; }; }; - "filter-obj-1.1.0" = { - name = "filter-obj"; - packageName = "filter-obj"; - version = "1.1.0"; + "socket.io-client-1.0.6" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; - sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz"; + sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e"; }; }; - "p-any-1.1.0" = { - name = "p-any"; - packageName = "p-any"; - version = "1.1.0"; + "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/p-any/-/p-any-1.1.0.tgz"; - sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.4.tgz"; + sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281"; }; }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; + "socket.io-client-2.0.4" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz"; + sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; }; }; - "passwd-user-2.1.0" = { - name = "passwd-user"; - packageName = "passwd-user"; + "socket.io-client-2.1.0" = { + name = "socket.io-client"; + packageName = "socket.io-client"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/passwd-user/-/passwd-user-2.1.0.tgz"; - sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.0.tgz"; + sha512 = "1xkd66603gshd7s080j107ms405z18mljc7gbmnkllph1zfg82sz5mgvsyhi1zs3bbv5lgvv29gxfn624gpv46v5mwy610wpnj8zwjf"; }; }; - "p-some-2.0.0" = { - name = "p-some"; - packageName = "p-some"; - version = "2.0.0"; + "socket.io-parser-2.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/p-some/-/p-some-2.0.0.tgz"; - sha512 = "23lpz1jyj01f06bndx53w1k931l6ki6m94mgf9lqpxka3366q0w1ql0igm7bj5nc0imzdjv3x5825c05mjnhkgahw99hd0h1kk5ri0a"; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz"; + sha1 = "876655b9edd555c5bdf7301cedf30a436c67b8b0"; }; }; - "aggregate-error-1.0.0" = { - name = "aggregate-error"; - packageName = "aggregate-error"; - version = "1.0.0"; + "socket.io-parser-2.2.0" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz"; - sha1 = "888344dad0220a72e3af50906117f48771925fac"; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz"; + sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; }; }; - "clean-stack-1.3.0" = { - name = "clean-stack"; - packageName = "clean-stack"; - version = "1.3.0"; + "socket.io-parser-2.3.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; - sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; }; }; - "execa-0.4.0" = { - name = "execa"; - packageName = "execa"; - version = "0.4.0"; + "socket.io-parser-3.1.3" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; - sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz"; + sha512 = "3pd3lbxawkd1zs739v0vv81vhf6pyax989j96hrc7vhql0xv7kn13sr893hrnn6m71jngw5h61523dq0b0p8drvff0fm0lbz8fbcil3"; }; }; - "cross-spawn-async-2.2.5" = { - name = "cross-spawn-async"; - packageName = "cross-spawn-async"; - version = "2.2.5"; + "socket.io-parser-3.2.0" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; - sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz"; + sha512 = "10calkdapaxrn8pjqghqxl9h2s6bm76wdd7rp3fd468zz43xcyx6qvywfdivrb2r1dsddig2byv2mbymiyb2q4r628s7z6wpb3q320m"; }; }; - "npm-run-path-1.0.0" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "1.0.0"; + "socks-1.1.10" = { + name = "socks"; + packageName = "socks"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; - sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; + url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; + sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; }; }; - "path-key-1.0.0" = { - name = "path-key"; - packageName = "path-key"; - version = "1.0.0"; + "socks-1.1.9" = { + name = "socks"; + packageName = "socks"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; - sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; + url = "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz"; + sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691"; }; }; - "execall-1.0.0" = { - name = "execall"; - packageName = "execall"; - version = "1.0.0"; + "socks-proxy-agent-2.1.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz"; - sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73"; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz"; + sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh"; }; }; - "clone-regexp-1.0.0" = { - name = "clone-regexp"; - packageName = "clone-regexp"; - version = "1.0.0"; + "sodium-javascript-0.5.5" = { + name = "sodium-javascript"; + packageName = "sodium-javascript"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz"; - sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c"; + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz"; + sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; - "is-regexp-1.0.0" = { - name = "is-regexp"; - packageName = "is-regexp"; - version = "1.0.0"; + "sodium-native-2.1.5" = { + name = "sodium-native"; + packageName = "sodium-native"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; - sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz"; + sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var"; }; }; - "is-supported-regexp-flag-1.0.0" = { - name = "is-supported-regexp-flag"; - packageName = "is-supported-regexp-flag"; - version = "1.0.0"; + "sodium-universal-2.0.0" = { + name = "sodium-universal"; + packageName = "sodium-universal"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz"; - sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8"; + url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-2.0.0.tgz"; + sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; }; }; - "downgrade-root-1.2.2" = { - name = "downgrade-root"; - packageName = "downgrade-root"; - version = "1.2.2"; + "sort-keys-1.1.2" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz"; - sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c"; + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; }; }; - "sudo-block-1.2.0" = { - name = "sudo-block"; - packageName = "sudo-block"; - version = "1.2.0"; + "sort-keys-2.0.0" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sudo-block/-/sudo-block-1.2.0.tgz"; - sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463"; + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; + sha1 = "658535584861ec97d730d6cf41822e1f56684128"; }; }; - "default-uid-1.0.0" = { - name = "default-uid"; - packageName = "default-uid"; - version = "1.0.0"; + "sort-keys-length-1.0.1" = { + name = "sort-keys-length"; + packageName = "sort-keys-length"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz"; - sha1 = "fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e"; + url = "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz"; + sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; }; }; - "is-root-1.0.0" = { - name = "is-root"; - packageName = "is-root"; - version = "1.0.0"; + "sort-on-2.0.0" = { + name = "sort-on"; + packageName = "sort-on"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz"; - sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5"; + url = "https://registry.npmjs.org/sort-on/-/sort-on-2.0.0.tgz"; + sha1 = "0df42a679d7ae4aed9c30ba2f55807d979910fcc"; }; }; - "is-docker-1.1.0" = { - name = "is-docker"; - packageName = "is-docker"; + "sorted-array-functions-1.1.0" = { + name = "sorted-array-functions"; + packageName = "sorted-array-functions"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz"; - sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; + url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.1.0.tgz"; + sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf"; }; }; - "npmlog-2.0.4" = { - name = "npmlog"; - packageName = "npmlog"; - version = "2.0.4"; + "sorted-indexof-1.0.0" = { + name = "sorted-indexof"; + packageName = "sorted-indexof"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz"; - sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; + url = "https://registry.npmjs.org/sorted-indexof/-/sorted-indexof-1.0.0.tgz"; + sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899"; }; }; - "gauge-1.2.7" = { - name = "gauge"; - packageName = "gauge"; - version = "1.2.7"; + "sorted-union-stream-1.0.2" = { + name = "sorted-union-stream"; + packageName = "sorted-union-stream"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"; - sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"; + url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-1.0.2.tgz"; + sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006"; }; }; - "lodash.pad-4.5.1" = { - name = "lodash.pad"; - packageName = "lodash.pad"; - version = "4.5.1"; + "source-list-map-2.0.0" = { + name = "source-list-map"; + packageName = "source-list-map"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz"; - sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70"; + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz"; + sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93"; }; }; - "lodash.padend-4.6.1" = { - name = "lodash.padend"; - packageName = "lodash.padend"; - version = "4.6.1"; + "source-map-0.1.31" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz"; - sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; + sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; }; }; - "lodash.padstart-4.6.1" = { - name = "lodash.padstart"; - packageName = "lodash.padstart"; - version = "4.6.1"; + "source-map-0.1.32" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz"; - sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; + sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; }; }; - "bin-version-check-2.1.0" = { - name = "bin-version-check"; - packageName = "bin-version-check"; - version = "2.1.0"; + "source-map-0.1.43" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.43"; src = fetchurl { - url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz"; - sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; }; }; - "each-async-1.1.1" = { - name = "each-async"; - packageName = "each-async"; - version = "1.1.1"; + "source-map-0.2.0" = { + name = "source-map"; + packageName = "source-map"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz"; - sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; + sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; }; }; - "object-values-1.0.0" = { - name = "object-values"; - packageName = "object-values"; + "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"; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + }; + }; + "source-map-resolve-0.5.1" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz"; + sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh"; + }; + }; + "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-support-0.4.18" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.4.18"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"; + sha512 = "1n37icn5xpsxs2x8szv6ifajjf066fskm04xn6agr79sid57n0yws4n0cis7m9q5hr0hxzr8dv2fnmmpgb4mvz8kiyv2g5ikbyb9g5n"; + }; + }; + "source-map-support-0.4.6" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.6.tgz"; + sha1 = "32552aa64b458392a85eab3b0b5ee61527167aeb"; + }; + }; + "source-map-support-0.5.3" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz"; + sha512 = "3xy2ylp2qm8jwglcsf2fjwvn5w56im64w7yjghyv9ilw2fc5qj65w8h38lpls27m3b5prv8x9cnfmrhkfk7rlb52hmf810ycs0i7abq"; + }; + }; + "source-map-support-0.5.4" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz"; + sha512 = "1vfdnbvldylljhm89hfxwsr3pd108my5z1l9gx8ld1j2v2bfpranqc7kc8i9mj24lbq6c4xxs181anrsa5ypbfd3r08v3c1dqyd4i1w"; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "sparkles-1.0.0" = { + name = "sparkles"; + packageName = "sparkles"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz"; - sha1 = "72af839630119e5b98c3b02bb8c27e3237158105"; + url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"; + sha1 = "1acbbfb592436d10bbe8f785b7cc6f82815012c3"; }; }; - "twig-0.8.9" = { - name = "twig"; - packageName = "twig"; - version = "0.8.9"; + "sparse-bitfield-3.0.3" = { + name = "sparse-bitfield"; + packageName = "sparse-bitfield"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-0.8.9.tgz"; - sha1 = "b1594f002b684e5f029de3e54e87bec4f084b6c2"; + url = "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"; + sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; }; }; - "bin-version-1.0.4" = { - name = "bin-version"; - packageName = "bin-version"; - version = "1.0.4"; + "spawn-please-0.3.0" = { + name = "spawn-please"; + packageName = "spawn-please"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz"; - sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e"; + url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz"; + sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; }; }; - "semver-truncate-1.1.2" = { - name = "semver-truncate"; - packageName = "semver-truncate"; - version = "1.1.2"; + "spawn-sync-1.0.15" = { + name = "spawn-sync"; + packageName = "spawn-sync"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz"; - sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8"; + url = "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz"; + sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; }; }; - "find-versions-1.2.1" = { - name = "find-versions"; - packageName = "find-versions"; - version = "1.2.1"; + "spdx-correct-3.0.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz"; - sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz"; + sha512 = "3xgkqk4hsm4nzvy68icv1rlv4s0qgb7mwpi9s4z2mp1a5fwny6kc6m4nqa7zzx2k7mrjlh7psci9lb7892bl3q4r4y2f4sw7vvnhprp"; }; }; - "semver-regex-1.0.0" = { - name = "semver-regex"; - packageName = "semver-regex"; + "spdx-exceptions-2.1.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; + sha512 = "057m2ab3y8j38xb89w7d191hfaa693vbf7wnwkf302zicsgi2v5ayvcc4f03vyj4yyycqasqp3ryp2d3q0vcaq54r4ls2g5dar4vbg0"; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2"; + }; + }; + "spdx-license-ids-3.0.0" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz"; + sha512 = "066gb8vcffv2mf3lbmxvxp5b60jviw32x52n50l3zgl9z4cgwg74ca4kr4y5c3mss736bmg9nxl1lvprishbikqy0jy56770v10zqfv"; + }; + }; + "spdy-1.32.5" = { + name = "spdy"; + packageName = "spdy"; + version = "1.32.5"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy/-/spdy-1.32.5.tgz"; + sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb"; + }; + }; + "speedometer-0.1.4" = { + name = "speedometer"; + packageName = "speedometer"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz"; + sha1 = "9876dbd2a169d3115402d48e6ea6329c8816a50d"; + }; + }; + "speedometer-1.0.0" = { + name = "speedometer"; + packageName = "speedometer"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; - sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; + url = "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz"; + sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2"; }; }; - "grouped-queue-0.3.3" = { - name = "grouped-queue"; - packageName = "grouped-queue"; + "split-0.2.10" = { + name = "split"; + packageName = "split"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz"; + sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; + }; + }; + "split-0.3.3" = { + name = "split"; + packageName = "split"; version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz"; - sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; + url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; }; }; - "is-scoped-1.0.0" = { - name = "is-scoped"; - packageName = "is-scoped"; + "split-1.0.1" = { + name = "split"; + packageName = "split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; + sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r"; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; + }; + }; + "split2-0.2.1" = { + name = "split2"; + packageName = "split2"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz"; + sha1 = "02ddac9adc03ec0bb78c1282ec079ca6e85ae900"; + }; + }; + "split2-2.2.0" = { + name = "split2"; + packageName = "split2"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz"; + sha512 = "1plzy1n554n2gwfpavi4azb4y45dm2mwj7dq8ma99yg1z55xcdxmkibsfhsh1h19qgsrcamm0ha5qi2c3has6skvx4bix5p67czc1j4"; + }; + }; + "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"; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "srcset-1.0.0" = { + name = "srcset"; + packageName = "srcset"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz"; - sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; + url = "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz"; + sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; }; }; - "log-symbols-2.1.0" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "2.1.0"; + "srt2vtt-1.3.1" = { + name = "srt2vtt"; + packageName = "srt2vtt"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz"; - sha512 = "36h090zjf2rfivlbhl50iymid2wggwncngy539cylicpdwrc3jvyqpxs2mmmybqjir313xs70vliczq511zypjx8jphvm006fpqpdyc"; + url = "https://registry.npmjs.org/srt2vtt/-/srt2vtt-1.3.1.tgz"; + sha1 = "c2b5047c2c297b693d3bab518765e4b7c24d8173"; }; }; - "mem-fs-1.1.3" = { - name = "mem-fs"; - packageName = "mem-fs"; + "ssh-config-1.1.3" = { + name = "ssh-config"; + packageName = "ssh-config"; version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz"; - sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"; + url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.3.tgz"; + sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c"; }; }; - "untildify-3.0.2" = { - name = "untildify"; - packageName = "untildify"; - version = "3.0.2"; + "ssh-key-to-pem-0.11.0" = { + name = "ssh-key-to-pem"; + packageName = "ssh-key-to-pem"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz"; - sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; + url = "https://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz"; + sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; }; }; - "scoped-regex-1.0.0" = { - name = "scoped-regex"; - packageName = "scoped-regex"; - version = "1.0.0"; + "sshpk-1.14.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz"; - sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; }; }; - "vinyl-file-2.0.0" = { - name = "vinyl-file"; - packageName = "vinyl-file"; - version = "2.0.0"; + "sshpk-1.7.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz"; - sha1 = "a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz"; + sha1 = "565e386c42a77e6062fbd14c0472ff21cd53398c"; }; }; - "strip-bom-stream-2.0.0" = { - name = "strip-bom-stream"; - packageName = "strip-bom-stream"; - version = "2.0.0"; + "sshpk-agent-1.2.1" = { + name = "sshpk-agent"; + packageName = "sshpk-agent"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz"; - sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca"; + url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.2.1.tgz"; + sha1 = "62e143c18530fda103320b3403e8ad42786d9718"; }; }; - "pad-component-0.0.1" = { - name = "pad-component"; - packageName = "pad-component"; - version = "0.0.1"; + "ssri-5.3.0" = { + name = "ssri"; + packageName = "ssri"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz"; - sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; + url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz"; + sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x"; }; }; - "taketalk-1.0.0" = { - name = "taketalk"; - packageName = "taketalk"; - version = "1.0.0"; + "stable-0.1.6" = { + name = "stable"; + packageName = "stable"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/taketalk/-/taketalk-1.0.0.tgz"; - sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd"; + url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz"; + sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10"; }; }; - }; -in -{ - alloy = nodeEnv.buildNodePackage { - name = "alloy"; - packageName = "alloy"; - version = "1.10.9"; - src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.10.9.tgz"; - sha512 = "173lfbg90gljigg1hpfc6cw3qi4lg8k7nhlm0b0zhpclsnhz2za0v31y1v19j7w0f2yc4v10h0sqigfnvb8xhfb4sck2dn7rmsknvhq"; + "stack-trace-0.0.10" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + }; }; - dependencies = [ - sources."async-2.6.0" - (sources."babel-core-6.26.0" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."babel-generator-6.26.0" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."babel-traverse-6.26.0" - sources."babel-types-6.26.0" - sources."babylon-6.18.0" - sources."chmodr-1.0.2" - sources."colors-0.6.0-1" - sources."commander-0.6.1" - sources."deasync-0.1.10" - sources."ejs-2.3.4" - sources."fs-extra-3.0.1" - sources."global-paths-0.1.2" - sources."jsonlint-1.5.1" - sources."moment-2.17.1" - sources."node.extend-1.0.10" - sources."pkginfo-0.2.2" - sources."resolve-1.5.0" - sources."source-map-0.1.9" - sources."walk-sync-0.3.2" - sources."xml2tss-0.0.5" - sources."xmldom-0.1.19" - sources."lodash-4.17.4" - sources."babel-code-frame-6.26.0" - sources."babel-helpers-6.24.1" - sources."babel-messages-6.23.0" - sources."babel-register-6.26.0" - sources."babel-runtime-6.26.0" - sources."babel-template-6.26.0" - sources."convert-source-map-1.5.0" - sources."debug-2.6.9" - sources."json5-0.5.1" - sources."minimatch-3.0.4" - sources."path-is-absolute-1.0.1" - sources."private-0.1.8" - sources."slash-1.0.0" - sources."chalk-0.4.0" - sources."esutils-2.0.2" - sources."js-tokens-3.0.2" - sources."ansi-styles-1.0.0" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-0.1.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."core-js-2.5.1" - sources."home-or-tmp-2.0.0" - sources."mkdirp-0.5.1" - sources."source-map-support-0.4.18" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."minimist-0.0.8" - sources."regenerator-runtime-0.11.0" - sources."ms-2.0.0" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."detect-indent-4.0.0" - sources."jsesc-1.3.0" - sources."trim-right-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" - sources."globals-9.18.0" - sources."invariant-2.2.2" - sources."loose-envify-1.3.1" - sources."to-fast-properties-1.0.3" - sources."bindings-1.2.1" - sources."nan-2.7.0" - sources."graceful-fs-4.1.11" - sources."jsonfile-3.0.1" - sources."universalify-0.1.1" - sources."array-unique-0.2.1" - sources."global-modules-0.2.3" - sources."is-windows-0.2.0" - sources."global-prefix-0.1.5" - sources."homedir-polyfill-1.0.1" - sources."ini-1.3.4" - sources."which-1.3.0" - sources."parse-passwd-1.0.0" - sources."isexe-2.0.0" - sources."nomnom-1.8.1" - sources."JSV-4.0.2" - sources."underscore-1.6.0" - sources."has-color-0.1.7" - sources."is-0.3.0" - sources."path-parse-1.0.5" - sources."amdefine-1.0.1" - sources."ensure-posix-path-1.0.2" - sources."matcher-collection-1.0.5" - sources."xml2js-0.2.8" - sources."sax-0.5.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Appcelerator Titanium MVC Framework"; - homepage = "https://github.com/appcelerator/alloy#readme"; - license = "Apache-2.0"; + "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"; + }; }; - production = true; - }; - azure-cli = nodeEnv.buildNodePackage { - name = "azure-cli"; - packageName = "azure-cli"; - version = "0.10.16"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.16.tgz"; - sha512 = "0l8acam1ykyb31ww0xspzvv9na18l1w7r9hjg7vz3nbb9zhbs2615gyjjj7va0r8czr221nwyrggdx65vhxdpwvzi7mzjmbmgr85a36"; + "stat-mode-0.2.2" = { + name = "stat-mode"; + packageName = "stat-mode"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz"; + sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; + }; }; - dependencies = [ - sources."adal-node-0.1.21" - sources."async-1.4.2" - (sources."azure-common-0.9.18" // { - dependencies = [ - sources."xml2js-0.2.7" - sources."validator-3.22.2" - ]; - }) - sources."azure-arm-authorization-2.0.0" - (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-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-3.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 = [ + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "statsd-parser-0.0.4" = { + name = "statsd-parser"; + packageName = "statsd-parser"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/statsd-parser/-/statsd-parser-0.0.4.tgz"; + sha1 = "cbd243953cc42effd548b5d22388ed689ec639bd"; + }; + }; + "status-logger-3.1.1" = { + name = "status-logger"; + packageName = "status-logger"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz"; + sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "statuses-1.4.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; + sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; + }; + }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "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"; + }; + }; + "stream-browserify-2.0.1" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; + sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + }; + }; + "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"; + }; + }; + "stream-collector-1.0.1" = { + name = "stream-collector"; + packageName = "stream-collector"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-collector/-/stream-collector-1.0.1.tgz"; + sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15"; + }; + }; + "stream-combiner-0.0.4" = { + name = "stream-combiner"; + packageName = "stream-combiner"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + }; + "stream-combiner2-1.1.1" = { + name = "stream-combiner2"; + packageName = "stream-combiner2"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + }; + }; + "stream-consume-0.1.1" = { + name = "stream-consume"; + packageName = "stream-consume"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz"; + sha512 = "3553srgw60szs493rx8nyy09lcjkw3bh16c2b5z30jcf9h95r4hdiqjk31r9190w47av8dg4zx60fnnvqanv95hbpxl7314723vgmml"; + }; + }; + "stream-counter-0.2.0" = { + name = "stream-counter"; + packageName = "stream-counter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; + sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; + }; + }; + "stream-each-1.2.2" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz"; + sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; + }; + }; + "stream-http-2.8.1" = { + name = "stream-http"; + packageName = "stream-http"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz"; + sha512 = "3fbvnv92iyjjnbpggg15blfwzyk4q0f5rsdz2wyyd20j05vw8qgmr185r1r36i3m6qqb82il99qn0b09bb4b7s1myvccbf1bsij63bi"; + }; + }; + "stream-parser-0.3.1" = { + name = "stream-parser"; + packageName = "stream-parser"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz"; + sha1 = "1618548694420021a1182ff0af1911c129761773"; + }; + }; + "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"; + }; + }; + "stream-splicer-2.0.0" = { + name = "stream-splicer"; + packageName = "stream-splicer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"; + sha1 = "1b63be438a133e4b671cc1935197600175910d83"; + }; + }; + "stream-to-array-2.3.0" = { + name = "stream-to-array"; + packageName = "stream-to-array"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz"; + sha1 = "bbf6b39f5f43ec30bc71babcb37557acecf34353"; + }; + }; + "stream-to-blob-1.0.0" = { + name = "stream-to-blob"; + packageName = "stream-to-blob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-1.0.0.tgz"; + sha1 = "9f7a1ada39e16ea282ebb7e4cda307edabde658d"; + }; + }; + "stream-to-blob-url-2.1.0" = { + name = "stream-to-blob-url"; + packageName = "stream-to-blob-url"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-2.1.0.tgz"; + sha1 = "c341d10502ec51250607327258ec2f586b07d626"; + }; + }; + "stream-to-promise-2.2.0" = { + name = "stream-to-promise"; + packageName = "stream-to-promise"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-2.2.0.tgz"; + sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f"; + }; + }; + "stream-to-pull-stream-1.7.2" = { + name = "stream-to-pull-stream"; + packageName = "stream-to-pull-stream"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.2.tgz"; + sha1 = "757609ae1cebd33c7432d4afbe31ff78650b9dde"; + }; + }; + "stream-transcoder-0.0.5" = { + name = "stream-transcoder"; + packageName = "stream-transcoder"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-transcoder/-/stream-transcoder-0.0.5.tgz"; + sha1 = "68261be4efb48840239b5791af23ee3b8bd79808"; + }; + }; + "stream-transform-0.1.2" = { + name = "stream-transform"; + packageName = "stream-transform"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz"; + sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f"; + }; + }; + "stream-with-known-length-to-buffer-1.0.1" = { + name = "stream-with-known-length-to-buffer"; + packageName = "stream-with-known-length-to-buffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-with-known-length-to-buffer/-/stream-with-known-length-to-buffer-1.0.1.tgz"; + sha512 = "07gzjgqphsbkfbc3f594kfja4kwr0sa8ss7arj47znz5wy5m2sw3qkfzgfxpaaijiliwbr3wny331q83kj55j72jsgm0jbsad5m8mdf"; + }; + }; + "streamline-0.10.17" = { + name = "streamline"; + packageName = "streamline"; + version = "0.10.17"; + src = fetchurl { + url = "https://registry.npmjs.org/streamline/-/streamline-0.10.17.tgz"; + sha1 = "fa2170da74194dbd0b54f756523f0d0d370426af"; + }; + }; + "streamline-0.4.11" = { + name = "streamline"; + packageName = "streamline"; + version = "0.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz"; + sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; + }; + }; + "streamline-streams-0.1.5" = { + name = "streamline-streams"; + packageName = "streamline-streams"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/streamline-streams/-/streamline-streams-0.1.5.tgz"; + sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54"; + }; + }; + "streamroller-0.7.0" = { + name = "streamroller"; + packageName = "streamroller"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz"; + sha512 = "26pp7m15rrddwfr1w83nhrws5k82ld1l8njiqvhm43vckr0zszhhb8jwps2bhzylfp7xmb8p2kr86y1g97knikrlwm3blrb5mzk64ar"; + }; + }; + "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"; + }; + }; + "strftime-0.10.0" = { + name = "strftime"; + packageName = "strftime"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strftime/-/strftime-0.10.0.tgz"; + sha1 = "b3f0fa419295202a5a289f6d6be9f4909a617193"; + }; + }; + "strict-uri-encode-1.1.0" = { + name = "strict-uri-encode"; + packageName = "strict-uri-encode"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + }; + }; + "string-1.6.1" = { + name = "string"; + packageName = "string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string/-/string-1.6.1.tgz"; + sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55"; + }; + }; + "string-2.0.1" = { + name = "string"; + packageName = "string"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string/-/string-2.0.1.tgz"; + sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759"; + }; + }; + "string-length-1.0.1" = { + name = "string-length"; + packageName = "string-length"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz"; + sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac"; + }; + }; + "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"; + }; + }; + "string-stream-0.0.7" = { + name = "string-stream"; + packageName = "string-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/string-stream/-/string-stream-0.0.7.tgz"; + sha1 = "cfcde82799fa62f303429aaa79336ee8834332fe"; + }; + }; + "string-template-0.2.1" = { + name = "string-template"; + packageName = "string-template"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"; + sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; + }; + }; + "string-template-1.0.0" = { + name = "string-template"; + packageName = "string-template"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-template/-/string-template-1.0.0.tgz"; + sha1 = "9e9f2233dc00f218718ec379a28a5673ecca8b96"; + }; + }; + "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"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + }; + }; + "string.prototype.codepointat-0.2.1" = { + name = "string.prototype.codepointat"; + packageName = "string.prototype.codepointat"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz"; + sha512 = "1r18lbap331hx5hfic2irpd3rai1ymp5s93p5xfzfr0khw9krkx51glwhmdjxbrk07kryqqdc2fly59avw3pq3q2apq7q487q55bh6r"; + }; + }; + "string2compact-1.2.2" = { + name = "string2compact"; + packageName = "string2compact"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.2.tgz"; + sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "string_decoder-1.0.3" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + }; + }; + "stringify-entities-1.3.1" = { + name = "stringify-entities"; + packageName = "stringify-entities"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz"; + sha1 = "b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c"; + }; + }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; + "strip-ansi-0.1.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; + sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; + }; + }; + "strip-ansi-0.3.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; + sha1 = "25f48ea22ca79187f3174a4db8759347bb126220"; + }; + }; + "strip-ansi-2.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; + sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "strip-bom-1.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"; + sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794"; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "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"; + }; + }; + "strip-bom-buf-1.0.0" = { + name = "strip-bom-buf"; + packageName = "strip-bom-buf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz"; + sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572"; + }; + }; + "strip-bom-stream-1.0.0" = { + name = "strip-bom-stream"; + packageName = "strip-bom-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz"; + sha1 = "e7144398577d51a6bed0fa1994fa05f43fd988ee"; + }; + }; + "strip-bom-stream-2.0.0" = { + name = "strip-bom-stream"; + packageName = "strip-bom-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz"; + sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca"; + }; + }; + "strip-bom-stream-3.0.0" = { + name = "strip-bom-stream"; + packageName = "strip-bom-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz"; + sha1 = "956bcc5d84430f69256a90ed823765cd858e159c"; + }; + }; + "strip-dirs-2.1.0" = { + name = "strip-dirs"; + packageName = "strip-dirs"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; + sha512 = "3gd7bh1h7xjvl8y6lj1mmsv4qpgbxd620fbp2cjlnc3b9gn7wnzbs1170gs7i6y5arm0dd09y8d74vr357gvwmx9f0616wbw8wv3q14"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "strip-indent-1.0.1" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + }; + }; + "strip-indent-2.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz"; + sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68"; + }; + }; + "strip-json-comments-0.1.3" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"; + sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54"; + }; + }; + "strip-json-comments-1.0.4" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; + sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; + "strip-outer-1.0.1" = { + name = "strip-outer"; + packageName = "strip-outer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; + sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk"; + }; + }; + "strong-data-uri-1.0.5" = { + name = "strong-data-uri"; + packageName = "strong-data-uri"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.5.tgz"; + sha512 = "2mwdm0k873sdi2bramixwg6fafqyi2313scq32fsnq2qa5hqbpdln34rc9a67wd15mi05v3c6bfiw6r4h7dy4aac1q3ac8b2ig6j96n"; + }; + }; + "strong-log-transformer-1.0.6" = { + name = "strong-log-transformer"; + packageName = "strong-log-transformer"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz"; + sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; + }; + }; + "structured-source-3.0.2" = { + name = "structured-source"; + packageName = "structured-source"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/structured-source/-/structured-source-3.0.2.tgz"; + sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5"; + }; + }; + "subarg-1.0.0" = { + name = "subarg"; + packageName = "subarg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; + sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; + }; + }; + "subcommand-2.1.0" = { + name = "subcommand"; + packageName = "subcommand"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subcommand/-/subcommand-2.1.0.tgz"; + sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760"; + }; + }; + "sudo-block-1.2.0" = { + name = "sudo-block"; + packageName = "sudo-block"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sudo-block/-/sudo-block-1.2.0.tgz"; + sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463"; + }; + }; + "superagent-0.21.0" = { + name = "superagent"; + packageName = "superagent"; + version = "0.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; + sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; + }; + }; + "superagent-3.8.2" = { + name = "superagent"; + packageName = "superagent"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz"; + sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1"; + }; + }; + "supports-color-0.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"; + sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a"; + }; + }; + "supports-color-1.3.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"; + sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + sha512 = "158ng0v99ac7csif7v6153bp63nxmlz2a613z8y09sk8jsj2rpalscgg0lfzdlpfdd5612jqsnkvrz0137inka2qjcmcjrmy2xhrkaf"; + }; + }; + "supports-color-4.4.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; + sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + }; + }; + "supports-color-4.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; + sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; + }; + }; + "supports-color-5.3.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; + sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; + }; + }; + "symbol-observable-1.0.1" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz"; + sha1 = "8340fc4702c3122df5d22288f88283f513d3fdd4"; + }; + }; + "sync-request-3.0.0" = { + name = "sync-request"; + packageName = "sync-request"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sync-request/-/sync-request-3.0.0.tgz"; + sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c"; + }; + }; + "syntax-error-1.4.0" = { + name = "syntax-error"; + packageName = "syntax-error"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz"; + sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0"; + }; + }; + "table-3.8.3" = { + name = "table"; + packageName = "table"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; + sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; + }; + }; + "table-4.0.2" = { + name = "table"; + packageName = "table"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz"; + sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai"; + }; + }; + "tabtab-1.3.2" = { + name = "tabtab"; + packageName = "tabtab"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz"; + sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7"; + }; + }; + "tabtab-git+https://github.com/mixu/node-tabtab.git" = { + name = "tabtab"; + packageName = "tabtab"; + version = "0.0.2"; + src = fetchgit { + url = "https://github.com/mixu/node-tabtab.git"; + rev = "94af2b878b174527b6636aec88acd46979247755"; + sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; + }; + }; + "taffydb-2.6.2" = { + name = "taffydb"; + packageName = "taffydb"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz"; + sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; + }; + }; + "taketalk-1.0.0" = { + name = "taketalk"; + packageName = "taketalk"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/taketalk/-/taketalk-1.0.0.tgz"; + sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd"; + }; + }; + "tapable-0.2.8" = { + name = "tapable"; + packageName = "tapable"; + version = "0.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz"; + sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22"; + }; + }; + "tapable-1.0.0" = { + name = "tapable"; + packageName = "tapable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz"; + sha512 = "2r08r7ymr8jvw7f1vamajcm9na9fscx6qiby1l3c99ndk1x50v0k3x6lhqmysk9bwczdl8kr2908lfvi6j5mfz0dam7cii4sin6213m"; + }; + }; + "tape-2.3.3" = { + name = "tape"; + packageName = "tape"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz"; + sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; + }; + }; + "tar-0.1.17" = { + name = "tar"; + packageName = "tar"; + version = "0.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; + }; + }; + "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"; + }; + }; + "tar-3.1.15" = { + name = "tar"; + packageName = "tar"; + version = "3.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz"; + sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; + }; + }; + "tar-4.4.1" = { + name = "tar"; + packageName = "tar"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz"; + sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv"; + }; + }; + "tar-fs-1.16.0" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz"; + sha512 = "1i39d75rgrl2a3v3x65w7bz6az06sg7xdvp7j9zk5bqilj5znclmr7r5n9l6la6nkqikn4lkhnfrgp4hzbvp6ph77nn53g6zvmdpni3"; + }; + }; + "tar-pack-3.4.1" = { + name = "tar-pack"; + packageName = "tar-pack"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; + sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; + }; + }; + "tar-stream-1.5.5" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; + sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; + }; + }; + "temp-0.6.0" = { + name = "temp"; + packageName = "temp"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; + sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; + }; + }; + "temp-0.8.3" = { + name = "temp"; + packageName = "temp"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz"; + sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; + }; + }; + "temp-dir-1.0.0" = { + name = "temp-dir"; + packageName = "temp-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"; + sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; + }; + }; + "temp-write-3.4.0" = { + name = "temp-write"; + packageName = "temp-write"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-write/-/temp-write-3.4.0.tgz"; + sha1 = "8cff630fb7e9da05f047c74ce4ce4d685457d492"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "text-extensions-1.7.0" = { + name = "text-extensions"; + packageName = "text-extensions"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz"; + sha512 = "015f82dnl58mcjf4c86lxlf2j66nhvnif56475x720bl73pkx3pvds7g2njz19ksbmbqag25rl4wij1xb6yd3in9cd4bpxn79wdk980"; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; + "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"; + }; + }; + "then-request-2.2.0" = { + name = "then-request"; + packageName = "then-request"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/then-request/-/then-request-2.2.0.tgz"; + sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "thirty-two-0.0.2" = { + name = "thirty-two"; + packageName = "thirty-two"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz"; + sha1 = "4253e29d8cb058f0480267c5698c0e4927e54b6a"; + }; + }; + "thirty-two-1.0.2" = { + name = "thirty-two"; + packageName = "thirty-two"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz"; + sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; + }; + }; + "thriftrw-3.11.2" = { + name = "thriftrw"; + packageName = "thriftrw"; + version = "3.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.2.tgz"; + sha512 = "2cll36ns03xrjz6y3116ca9hgnqsi384k6mcyk8xpl81znx0lkwkz7iwyhprc0rm1ry6mrlwpdrnh38sfqvm95hd7ila270a71ah86y"; + }; + }; + "throat-3.2.0" = { + name = "throat"; + packageName = "throat"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throat/-/throat-3.2.0.tgz"; + sha512 = "3rnpjw8qfw0qbydd9s4pbp0qzahz1f4phbj4cc9mvz6851nrq9h1whwslsjjfrzl0qgsnjf0n8ppygh3kl7ikyj2sn9za75kdb3qipw"; + }; + }; + "throttle-1.0.3" = { + name = "throttle"; + packageName = "throttle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/throttle/-/throttle-1.0.3.tgz"; + sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7"; + }; + }; + "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"; + }; + }; + "through-2.3.4" = { + name = "through"; + packageName = "through"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.4.tgz"; + sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455"; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "through2-0.6.5" = { + name = "through2"; + packageName = "through2"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"; + sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; + }; + }; + "through2-2.0.3" = { + name = "through2"; + packageName = "through2"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; + sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + }; + }; + "through2-filter-2.0.0" = { + name = "through2-filter"; + packageName = "through2-filter"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz"; + sha1 = "60bc55a0dacb76085db1f9dae99ab43f83d622ec"; + }; + }; + "thunkify-2.1.2" = { + name = "thunkify"; + packageName = "thunkify"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz"; + sha1 = "faa0e9d230c51acc95ca13a361ac05ca7e04553d"; + }; + }; + "thunkify-wrap-1.0.4" = { + name = "thunkify-wrap"; + packageName = "thunkify-wrap"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify-wrap/-/thunkify-wrap-1.0.4.tgz"; + sha1 = "b52be548ddfefda20e00b58c6096762b43dd6880"; + }; + }; + "thunky-0.1.0" = { + name = "thunky"; + packageName = "thunky"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz"; + sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e"; + }; + }; + "thunky-1.0.2" = { + name = "thunky"; + packageName = "thunky"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz"; + sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; + }; + }; + "tildify-1.2.0" = { + name = "tildify"; + packageName = "tildify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz"; + sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; + }; + }; + "time-line-1.0.1" = { + name = "time-line"; + packageName = "time-line"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/time-line/-/time-line-1.0.1.tgz"; + sha1 = "afb89542301c3b5010d118c66b5d63920f5e9a7a"; + }; + }; + "time-stamp-1.1.0" = { + name = "time-stamp"; + packageName = "time-stamp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"; + sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "timed-out-4.0.1" = { + name = "timed-out"; + packageName = "timed-out"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + }; + }; + "timers-browserify-1.4.2" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"; + sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; + }; + }; + "timers-browserify-2.0.6" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz"; + sha512 = "0zvmxvcvmv91k667dy2hzd9a2knvhizxvbx73gcnbi5na3ypc3mldfljw062d7n6y2mf7n2gwwc5wr4wrdih927fxahg8s0hinyf38x"; + }; + }; + "timespan-2.3.0" = { + name = "timespan"; + packageName = "timespan"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz"; + sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929"; + }; + }; + "tiny-lr-1.1.1" = { + name = "tiny-lr"; + packageName = "tiny-lr"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz"; + sha512 = "2w2806fq55jn2vd74qn5ryir4j6nbfycd8c2w030fckrwvlif6iiy5ranmsdlyqgcrs87x4zxwnlmwrz6dzn41l7861lsbcgc1s3373"; + }; + }; + "tinycolor-0.0.1" = { + name = "tinycolor"; + packageName = "tinycolor"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + }; + }; + "titleize-1.0.1" = { + name = "titleize"; + packageName = "titleize"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/titleize/-/titleize-1.0.1.tgz"; + sha512 = "1xp43r14ynva5c21rihxm625x47109zj7k3j0cpdmm74lc4fwml3vags077221gz2gf7vafwnskncmag4wnsisiz0bmiawapc70ck5d"; + }; + }; + "tmp-0.0.28" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.28"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz"; + sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; + }; + }; + "tmp-0.0.29" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz"; + sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; + }; + }; + "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"; + }; + }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; + }; + }; + "to-absolute-glob-0.1.1" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz"; + sha1 = "1cdfa472a9ef50c239ee66999b662ca0eb39937f"; + }; + }; + "to-absolute-glob-2.0.2" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; + sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b"; + }; + }; + "to-array-0.1.3" = { + name = "to-array"; + packageName = "to-array"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz"; + sha1 = "d45dadc6363417f60f28474fea50ecddbb4f4991"; + }; + }; + "to-array-0.1.4" = { + name = "to-array"; + packageName = "to-array"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; + sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; + }; + }; + "to-arraybuffer-1.0.1" = { + name = "to-arraybuffer"; + packageName = "to-arraybuffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + }; + "to-buffer-1.1.0" = { + name = "to-buffer"; + packageName = "to-buffer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz"; + sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa"; + }; + }; + "to-fast-properties-1.0.3" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; + sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; + "to-utf8-0.0.1" = { + name = "to-utf8"; + packageName = "to-utf8"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz"; + sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852"; + }; + }; + "toiletdb-1.4.1" = { + name = "toiletdb"; + packageName = "toiletdb"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/toiletdb/-/toiletdb-1.4.1.tgz"; + sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l"; + }; + }; + "token-stream-0.0.1" = { + name = "token-stream"; + packageName = "token-stream"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz"; + sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"; + }; + }; + "toml-2.3.3" = { + name = "toml"; + packageName = "toml"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz"; + sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv"; + }; + }; + "topo-1.1.0" = { + name = "topo"; + packageName = "topo"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz"; + sha1 = "e9d751615d1bb87dc865db182fa1ca0a5ef536d5"; + }; + }; + "torrent-discovery-5.4.0" = { + name = "torrent-discovery"; + packageName = "torrent-discovery"; + version = "5.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz"; + sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; + }; + }; + "torrent-discovery-8.4.0" = { + name = "torrent-discovery"; + packageName = "torrent-discovery"; + version = "8.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.0.tgz"; + sha512 = "39hhpi3mzygr52pgdah0fvll7mdgmchilxshqjykypiz9167p476sjph4w1qbv98254ij6kdwn9b0j4bwqkcbnr3mspmjh1sm5n8fak"; + }; + }; + "torrent-piece-1.1.1" = { + name = "torrent-piece"; + packageName = "torrent-piece"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.1.tgz"; + sha1 = "50346e42a43b35daf2a86f414afb153629a854be"; + }; + }; + "torrent-stream-1.0.4" = { + name = "torrent-stream"; + packageName = "torrent-stream"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.4.tgz"; + sha512 = "3ka40l845bfjydjk9jbiz27x4cqd8birv5zfzvdm7ciij7r53ydz6y7pwmk0628qwdnkchgh10z4kdc3408zi8a8pimq7506qrji010"; + }; + }; + "tosource-1.0.0" = { + name = "tosource"; + packageName = "tosource"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tosource/-/tosource-1.0.0.tgz"; + sha1 = "42d88dd116618bcf00d6106dd5446f3427902ff1"; + }; + }; + "touch-0.0.3" = { + name = "touch"; + packageName = "touch"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz"; + sha1 = "51aef3d449571d4f287a5d87c9c8b49181a0db1d"; + }; + }; + "touch-1.0.0" = { + name = "touch"; + packageName = "touch"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz"; + sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de"; + }; + }; + "touch-3.1.0" = { + name = "touch"; + packageName = "touch"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; + sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q"; + }; + }; + "tough-cookie-2.2.2" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; + sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + }; + }; + "tough-cookie-2.3.4" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; + }; + }; + "township-client-1.3.2" = { + name = "township-client"; + packageName = "township-client"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/township-client/-/township-client-1.3.2.tgz"; + sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; + }; + }; + "tr46-1.0.1" = { + name = "tr46"; + packageName = "tr46"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; + sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; + }; + }; + "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"; + }; + }; + "traverse-0.3.9" = { + name = "traverse"; + packageName = "traverse"; + version = "0.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; + sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; + }; + }; + "traverse-0.4.6" = { + name = "traverse"; + packageName = "traverse"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.4.6.tgz"; + sha1 = "d04b2280e4c792a5815429ef7b8b60c64c9ccc34"; + }; + }; + "traverse-0.6.6" = { + name = "traverse"; + packageName = "traverse"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; + sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + }; + }; + "tree-kill-1.2.0" = { + name = "tree-kill"; + packageName = "tree-kill"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz"; + sha512 = "1r0mixygpdqrm2fn92z4cyxzbnvimm16k5gdm2m2jxx8wrj3w0mql9s748hcqp2nzcnybnw74wkm211zlr9ld0j2x1q8f153mszlm8f"; + }; + }; + "trim-0.0.1" = { + name = "trim"; + packageName = "trim"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; + sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; + }; + }; + "trim-newlines-1.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + }; + "trim-newlines-2.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz"; + sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; + }; + }; + "trim-off-newlines-1.0.1" = { + name = "trim-off-newlines"; + packageName = "trim-off-newlines"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz"; + sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; + }; + }; + "trim-repeated-1.0.0" = { + name = "trim-repeated"; + packageName = "trim-repeated"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"; + sha1 = "e3646a2ea4e891312bf7eace6cfb05380bc01c21"; + }; + }; + "trim-right-1.0.1" = { + name = "trim-right"; + packageName = "trim-right"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"; + sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + }; + }; + "trim-trailing-lines-1.1.0" = { + name = "trim-trailing-lines"; + packageName = "trim-trailing-lines"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz"; + sha1 = "7aefbb7808df9d669f6da2e438cac8c46ada7684"; + }; + }; + "trough-1.0.1" = { + name = "trough"; + packageName = "trough"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz"; + sha1 = "a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"; + }; + }; + "truncate-2.0.1" = { + name = "truncate"; + packageName = "truncate"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/truncate/-/truncate-2.0.1.tgz"; + sha1 = "dd1a6d15630515663d8475f6f24edf2f800ebb1b"; + }; + }; + "tslib-1.9.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz"; + sha512 = "2nlmx4clxs0pqc810crp8j98gpvlvbbc5bw8mx4sjx9ywh89s5kq87n5zhc5xc1scgk49p9x7dw37d158qi46al0q9b54jldcdqdykz"; + }; + }; + "tsscmp-1.0.5" = { + name = "tsscmp"; + packageName = "tsscmp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; + sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; + }; + }; + "ttl-1.3.1" = { + name = "ttl"; + packageName = "ttl"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ttl/-/ttl-1.3.1.tgz"; + sha512 = "36d1ph5z6c3p2qqyjq8ckksxs7m0anipm6lzf51dgv59iymac2zwaxj6fablw7zabpjxav32qk8z12fdfx6cdpp97b0van043vb5cgr"; + }; + }; + "tty-browserify-0.0.0" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }; + }; + "tty-browserify-0.0.1" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz"; + sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b"; + }; + }; + "tunnel-0.0.2" = { + name = "tunnel"; + packageName = "tunnel"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz"; + sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334"; + }; + }; + "tunnel-0.0.5" = { + name = "tunnel"; + packageName = "tunnel"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.5.tgz"; + sha512 = "1n2p6ca2m26hbf9gxlww91fp653cyqdbfnvxjc8jn91ybvbwbhsqg3cm4da8rrxzgfr9nsa6zpi20bv5w708753chaixbsym1v6qgl2"; + }; + }; + "tunnel-agent-0.2.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; + sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "twig-0.8.9" = { + name = "twig"; + packageName = "twig"; + version = "0.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/twig/-/twig-0.8.9.tgz"; + sha1 = "b1594f002b684e5f029de3e54e87bec4f084b6c2"; + }; + }; + "twitter-ng-0.6.2" = { + name = "twitter-ng"; + packageName = "twitter-ng"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/twitter-ng/-/twitter-ng-0.6.2.tgz"; + sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "type-detect-4.0.8" = { + name = "type-detect"; + packageName = "type-detect"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; + sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni"; + }; + }; + "type-is-1.5.7" = { + name = "type-is"; + packageName = "type-is"; + version = "1.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; + sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; + }; + }; + "type-is-1.6.16" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.16"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; + sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x"; + }; + }; + "typechecker-4.5.0" = { + name = "typechecker"; + packageName = "typechecker"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.5.0.tgz"; + sha512 = "3izx27ms2gldkwjyllsg41zpgd7x57v7zrkgrxlrfhs3gc6csg91m6dk23kvcralq9rd5pn7njz4yj8raj31q7ybhd54v9pr7yw98vf"; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "typedarray-to-buffer-3.1.5" = { + name = "typedarray-to-buffer"; + packageName = "typedarray-to-buffer"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "3cvrfgjsyvnh9fdyixjzx9mwkfcjfyhgsjizzxzmrsvb1pwch0y58crjh7p6b0ml9nl7jr55nx5dyslq3jn15qz555fl3a4qdfbrnyd"; + }; + }; + "typescript-2.7.2" = { + name = "typescript"; + packageName = "typescript"; + version = "2.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; + sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; + }; + }; + "typescript-2.8.1" = { + name = "typescript"; + packageName = "typescript"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz"; + sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2"; + }; + }; + "typewise-1.0.3" = { + name = "typewise"; + packageName = "typewise"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz"; + sha1 = "1067936540af97937cc5dcf9922486e9fa284651"; + }; + }; + "typewise-core-1.2.0" = { + name = "typewise-core"; + packageName = "typewise-core"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz"; + sha1 = "97eb91805c7f55d2f941748fa50d315d991ef195"; + }; + }; + "typewiselite-1.0.0" = { + name = "typewiselite"; + packageName = "typewiselite"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typewiselite/-/typewiselite-1.0.0.tgz"; + sha1 = "c8882fa1bb1092c06005a97f34ef5c8508e3664e"; + }; + }; + "typings-core-2.3.3" = { + name = "typings-core"; + packageName = "typings-core"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typings-core/-/typings-core-2.3.3.tgz"; + sha1 = "09ec54cd5b11dd5f1ef2fc0ab31d37002ca2b5ad"; + }; + }; + "ua-parser-js-0.7.17" = { + name = "ua-parser-js"; + packageName = "ua-parser-js"; + version = "0.7.17"; + src = fetchurl { + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz"; + sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr"; + }; + }; + "uc.micro-1.0.5" = { + name = "uc.micro"; + packageName = "uc.micro"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz"; + sha512 = "0pb6n8f5qpdf3x1bgxlcvimha0n4xx3mgr1mj6nx6yksgg9ij62ai3nzhyy8806gfkklfk8blhlhimw0237yg9xr66rmgvk1vici0i6"; + }; + }; + "uglify-es-3.3.10" = { + name = "uglify-es"; + packageName = "uglify-es"; + version = "3.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz"; + sha512 = "31s7k004qjdb42cavkpgszzvz9zm3aw2iv80k1hrykx202x9wb03451l58fhlba1spjgpdq96w7vm6rvavkcwrxj87aynxkq25czz5c"; + }; + }; + "uglify-js-1.2.5" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; + sha1 = "b542c2c76f78efb34b200b20177634330ff702b6"; + }; + }; + "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"; + }; + }; + "uglify-js-2.3.6" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + }; + }; + "uglify-js-2.8.21" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.21"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.21.tgz"; + sha1 = "1733f669ae6f82fc90c7b25ec0f5c783ee375314"; + }; + }; + "uglify-js-2.8.29" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.29"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + }; + }; + "uglify-js-3.3.20" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.3.20"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz"; + sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js"; + }; + }; + "uglify-js-3.3.6" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.6.tgz"; + sha512 = "0q2bfk5m49af6f84q1iyrmw0p6ra1gnaf1npffadjqxd9qsz324r144bwgrnchngvlcdj1zqbmyh1r6gva65zxbrxm89ibdgcs7nykl"; + }; + }; + "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"; + }; + }; + "uglifyjs-webpack-plugin-1.2.4" = { + name = "uglifyjs-webpack-plugin"; + packageName = "uglifyjs-webpack-plugin"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz"; + sha512 = "14jcr2nd1d4l940llkm93b2rm9886qi9vz16ab85nji84bmsr99rvzvv4vwzj3j0m2lpkkm2gskd4p29lv4vzjr76zp6vxwjn71nhng"; + }; + }; + "uid-0.0.2" = { + name = "uid"; + packageName = "uid"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz"; + sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; + }; + }; + "uid-number-0.0.5" = { + name = "uid-number"; + packageName = "uid-number"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"; + sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e"; + }; + }; + "uid-number-0.0.6" = { + name = "uid-number"; + packageName = "uid-number"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; + sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + }; + }; + "uid-safe-2.0.0" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz"; + sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137"; + }; + }; + "uid-safe-2.1.4" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz"; + sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"; + }; + }; + "uid-safe-2.1.5" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"; + sha512 = "2h6492mk9v9dzy26i5wfajinhi2pg729ksbcsmm0sp8s32hlr432q19g97qghfp5x98hsm77hmzwdzhgi3vhm2drz53ax7rabhydw98"; + }; + }; + "uid2-0.0.3" = { + name = "uid2"; + packageName = "uid2"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"; + sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + }; + }; + "uint64be-1.0.1" = { + name = "uint64be"; + packageName = "uint64be"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-1.0.1.tgz"; + sha1 = "1f7154202f2a1b8af353871dda651bf34ce93e95"; + }; + }; + "uint64be-2.0.2" = { + name = "uint64be"; + packageName = "uint64be"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz"; + sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm"; + }; + }; + "ultron-1.0.2" = { + name = "ultron"; + packageName = "ultron"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; + sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + }; + }; + "ultron-1.1.1" = { + name = "ultron"; + packageName = "ultron"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; + sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah"; + }; + }; + "umd-3.0.3" = { + name = "umd"; + packageName = "umd"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz"; + sha512 = "2iz3bypw716y5lgdg89d7jwnkqnla4sid3l5hr2259ypf8h6sbkw3n0xa51ckzkkayf0c39ksaiax2j6ighj36p5ipwh5p1wx50d1z0"; + }; + }; + "unbzip2-stream-1.2.5" = { + name = "unbzip2-stream"; + packageName = "unbzip2-stream"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; + sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b"; + }; + }; + "unc-path-regex-0.1.2" = { + name = "unc-path-regex"; + packageName = "unc-path-regex"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; + sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; + }; + }; + "undefsafe-0.0.3" = { + name = "undefsafe"; + packageName = "undefsafe"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz"; + sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; + }; + }; + "undefsafe-2.0.2" = { + name = "undefsafe"; + packageName = "undefsafe"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz"; + sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76"; + }; + }; + "underscore-1.2.1" = { + name = "underscore"; + packageName = "underscore"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"; + sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; + }; + }; + "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"; + }; + }; + "underscore-1.5.2" = { + name = "underscore"; + packageName = "underscore"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + }; + }; + "underscore-1.6.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + }; + }; + "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-1.8.3" = { + name = "underscore"; + packageName = "underscore"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + }; + }; + "underscore-contrib-0.3.0" = { + name = "underscore-contrib"; + packageName = "underscore-contrib"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz"; + sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7"; + }; + }; + "underscore.string-2.3.3" = { + name = "underscore.string"; + packageName = "underscore.string"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; + }; + }; + "underscore.string-2.4.0" = { + name = "underscore.string"; + packageName = "underscore.string"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; + sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; + }; + }; + "unherit-1.1.0" = { + name = "unherit"; + packageName = "unherit"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz"; + sha1 = "6b9aaedfbf73df1756ad9e316dd981885840cd7d"; + }; + }; + "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"; + }; + }; + "unified-4.2.1" = { + name = "unified"; + packageName = "unified"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-4.2.1.tgz"; + sha1 = "76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e"; + }; + }; + "union-value-1.0.0" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + }; + "uniq-1.0.1" = { + name = "uniq"; + packageName = "uniq"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + }; + "unique-filename-1.1.0" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz"; + sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; + }; + }; + "unique-slug-2.0.0" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz"; + sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; + }; + }; + "unique-stream-1.0.0" = { + name = "unique-stream"; + packageName = "unique-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"; + sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; + }; + }; + "unique-stream-2.2.1" = { + name = "unique-stream"; + packageName = "unique-stream"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz"; + sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"; + }; + }; + "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"; + }; + }; + "unist-util-is-2.1.1" = { + name = "unist-util-is"; + packageName = "unist-util-is"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.1.tgz"; + sha1 = "0c312629e3f960c66e931e812d3d80e77010947b"; + }; + }; + "unist-util-remove-position-1.1.1" = { + name = "unist-util-remove-position"; + packageName = "unist-util-remove-position"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz"; + sha1 = "5a85c1555fc1ba0c101b86707d15e50fa4c871bb"; + }; + }; + "unist-util-visit-1.3.0" = { + name = "unist-util-visit"; + packageName = "unist-util-visit"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.0.tgz"; + sha512 = "24s5gpqr3vip7zfd3c81k1mhcj1qzlmjhxpn80n3ay8kkg3zycjdkvi6d78j1d3lva7qr1lqrf2mcz5k41as5vwh8w5xdn52drmhyzn"; + }; + }; + "universalify-0.1.1" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz"; + sha1 = "fa71badd4437af4c148841e3b3b165f9e9e590b7"; + }; + }; + "unix-crypt-td-js-1.0.0" = { + name = "unix-crypt-td-js"; + packageName = "unix-crypt-td-js"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz"; + sha1 = "1c0824150481bc7a01d49e98f1ec668d82412f3b"; + }; + }; + "unixify-1.0.0" = { + name = "unixify"; + packageName = "unixify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz"; + sha1 = "3a641c8c2ffbce4da683a5c70f03a462940c2090"; + }; + }; + "unordered-array-remove-1.0.2" = { + name = "unordered-array-remove"; + packageName = "unordered-array-remove"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-array-remove/-/unordered-array-remove-1.0.2.tgz"; + sha1 = "c546e8f88e317a0cf2644c97ecb57dba66d250ef"; + }; + }; + "unordered-set-1.1.0" = { + name = "unordered-set"; + packageName = "unordered-set"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-set/-/unordered-set-1.1.0.tgz"; + sha1 = "2ba7ef316edd0b9590cc547c74f76a2f164fecca"; + }; + }; + "unordered-set-2.0.0" = { + name = "unordered-set"; + packageName = "unordered-set"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.0.tgz"; + sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec"; + }; + }; + "unorm-1.4.1" = { + name = "unorm"; + packageName = "unorm"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz"; + sha1 = "364200d5f13646ca8bcd44490271335614792300"; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "unquote-1.1.1" = { + name = "unquote"; + packageName = "unquote"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz"; + sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "untildify-2.1.0" = { + name = "untildify"; + packageName = "untildify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz"; + sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; + }; + }; + "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"; + }; + }; + "unyield-0.0.1" = { + name = "unyield"; + packageName = "unyield"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unyield/-/unyield-0.0.1.tgz"; + sha1 = "150e65da42bf7742445b958a64eb9b85d1d2b180"; + }; + }; + "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"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "upath-1.0.4" = { + name = "upath"; + packageName = "upath"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz"; + sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; + }; + }; + "update-check-1.2.0" = { + name = "update-check"; + packageName = "update-check"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-check/-/update-check-1.2.0.tgz"; + sha512 = "1w28g23994qxxlkbmahrqsakjmr6hhknxyg6y109y5ghgph52w51wzyxz2y2z22417298cmyinbc8fjkv64840g61cqv0iziy7bsy14"; + }; + }; + "update-notifier-0.5.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz"; + sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc"; + }; + }; + "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"; + }; + }; + "update-notifier-2.3.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz"; + sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; + }; + }; + "update-notifier-2.4.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz"; + sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866"; + }; + }; + "update-section-0.3.3" = { + name = "update-section"; + packageName = "update-section"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz"; + sha1 = "458f17820d37820dc60e20b86d94391b00123158"; + }; + }; + "upnp-device-client-1.0.2" = { + name = "upnp-device-client"; + packageName = "upnp-device-client"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/upnp-device-client/-/upnp-device-client-1.0.2.tgz"; + sha1 = "91f84705f2349bf89082855fff4e3006ac435337"; + }; + }; + "upnp-mediarenderer-client-1.2.4" = { + name = "upnp-mediarenderer-client"; + packageName = "upnp-mediarenderer-client"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/upnp-mediarenderer-client/-/upnp-mediarenderer-client-1.2.4.tgz"; + sha1 = "0c63a51802082b6b03b596c475cc64fc1e0877c8"; + }; + }; + "upper-case-1.1.3" = { + name = "upper-case"; + packageName = "upper-case"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz"; + sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; + }; + }; + "uri-js-3.0.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz"; + sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "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"; + }; + }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + }; + "url-join-2.0.5" = { + name = "url-join"; + packageName = "url-join"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz"; + sha1 = "5af22f18c052a000a48d7b82c5e9c2e2feeda728"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "url-parse-lax-3.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + }; + }; + "url-to-options-1.0.1" = { + name = "url-to-options"; + packageName = "url-to-options"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; + sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + }; + }; + "use-3.1.0" = { + name = "use"; + packageName = "use"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; + sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9"; + }; + }; + "user-home-1.1.1" = { + name = "user-home"; + packageName = "user-home"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; + sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; + }; + }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; + "useragent-2.3.0" = { + name = "useragent"; + packageName = "useragent"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz"; + sha512 = "1vqmf9ng5navlr0kvklslvzbqym47sbqblc3i74ln0hswdyd0yx86fj3cnhb2pjjyy3cqs1mq9ywkz92j5x7km2iv1g2jkfkki0f2p0"; + }; + }; + "ut_metadata-3.2.0" = { + name = "ut_metadata"; + packageName = "ut_metadata"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.0.tgz"; + sha512 = "3c8a0bnic4symhd8m0gy22adlj8pkmiclsxbr6j979fwabrj0z74xp2bknfqp57vndr4f79d4mnhygrbvp69xdn911j0q6ljgd1bw8i"; + }; + }; + "ut_pex-1.2.0" = { + name = "ut_pex"; + packageName = "ut_pex"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ut_pex/-/ut_pex-1.2.0.tgz"; + sha512 = "3b2f0jrvzj2rij8wi7jwy4r7ijqsfv8a9qjqf67gxmlfmyglz8hr51d8f10hdyx1di88a0f3kba1jp583a643mxjfxlaq1dsxy96a10"; + }; + }; + "utf7-1.0.2" = { + name = "utf7"; + packageName = "utf7"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; + sha1 = "955f490aae653ba220b9456a0a8776c199360991"; + }; + }; + "utf8-2.0.0" = { + name = "utf8"; + packageName = "utf8"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz"; + sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d"; + }; + }; + "utfx-1.0.1" = { + name = "utfx"; + packageName = "utfx"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utfx/-/utfx-1.0.1.tgz"; + sha1 = "d52b2fd632a99eca8d9d4a39eece014a6a2b0048"; + }; + }; + "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"; + }; + }; + "util-0.4.9" = { + name = "util"; + packageName = "util"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.4.9.tgz"; + sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "util.promisify-1.0.0" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; + sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb"; + }; + }; + "utile-0.2.1" = { + name = "utile"; + packageName = "utile"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; + sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; + }; + }; + "utile-0.3.0" = { + name = "utile"; + packageName = "utile"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz"; + sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; + }; + }; + "utils-merge-1.0.0" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "utp-0.0.7" = { + name = "utp"; + packageName = "utp"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/utp/-/utp-0.0.7.tgz"; + sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; + }; + }; + "utp-native-1.7.0" = { + name = "utp-native"; + packageName = "utp-native"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz"; + sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz"; + }; + }; + "uue-3.1.2" = { + name = "uue"; + packageName = "uue"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uue/-/uue-3.1.2.tgz"; + sha512 = "0pcj6km8jmr85nr0xvnq9nmicnz9a2ysy8bj7s9qxin8c0hzd992bwx8bsnxlmbw02iynqyp0l7a9c7zi2ipqrsfczx5ddhb9fqn4kb"; + }; + }; + "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"; + }; + }; + "uuid-3.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; + sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; + }; + }; + "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"; + }; + }; + "uuid-3.1.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; + sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; + }; + }; + "uuid-3.2.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; + sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; + }; + }; + "uws-9.14.0" = { + name = "uws"; + packageName = "uws"; + version = "9.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz"; + sha512 = "2m9vgbpgm39qsl9dk1zzqglr29qwy1hxn3cgj0rwrr05c4hyfij3sib08i1ck21y1136ljvvr0l2nixh6g7arjip455n0zryfs37lqw"; + }; + }; + "v8-debug-1.0.1" = { + name = "v8-debug"; + packageName = "v8-debug"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz"; + sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe"; + }; + }; + "v8-profiler-5.7.0" = { + name = "v8-profiler"; + packageName = "v8-profiler"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz"; + sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d"; + }; + }; + "v8flags-2.1.1" = { + name = "v8flags"; + packageName = "v8flags"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz"; + sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; + }; + }; + "vali-date-1.0.0" = { + name = "vali-date"; + packageName = "vali-date"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz"; + sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; + }; + }; + "valid-identifier-0.0.1" = { + name = "valid-identifier"; + packageName = "valid-identifier"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"; + sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; + }; + }; + "validate-npm-package-license-3.0.3" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; + sha512 = "39caf21ga6s2gvpka90wdngdijarwmkix5fpgh9r94bw14fx1zfnf7j5mprgsdlh8dv0wpwxn65qn9gfwa8n3dxw3iqaj7qf994wxpb"; + }; + }; + "validate-npm-package-name-3.0.0" = { + name = "validate-npm-package-name"; + packageName = "validate-npm-package-name"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; + }; + }; + "validator-3.22.2" = { + name = "validator"; + packageName = "validator"; + version = "3.22.2"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-3.22.2.tgz"; + sha1 = "6f297ae67f7f82acc76d0afdb49f18d9a09c18c0"; + }; + }; + "validator-5.2.0" = { + name = "validator"; + packageName = "validator"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz"; + sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689"; + }; + }; + "varint-3.0.1" = { + name = "varint"; + packageName = "varint"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-3.0.1.tgz"; + sha1 = "9d3f53e036c0ab12000a74bc2d24cbf093a581d9"; + }; + }; + "varint-4.0.1" = { + name = "varint"; + packageName = "varint"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-4.0.1.tgz"; + sha1 = "490829b942d248463b2b35097995c3bf737198e9"; + }; + }; + "varint-5.0.0" = { + name = "varint"; + packageName = "varint"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz"; + sha1 = "d826b89f7490732fabc0c0ed693ed475dcb29ebf"; + }; + }; + "vary-1.0.1" = { + name = "vary"; + packageName = "vary"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; + sha1 = "99e4981566a286118dfb2b817357df7993376d10"; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "vasync-1.4.3" = { + name = "vasync"; + packageName = "vasync"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz"; + sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37"; + }; + }; + "vasync-1.6.2" = { + name = "vasync"; + packageName = "vasync"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vasync/-/vasync-1.6.2.tgz"; + sha1 = "568edcf40b2b5c35b1cc048cad085de4739703fb"; + }; + }; + "vasync-1.6.3" = { + name = "vasync"; + packageName = "vasync"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz"; + sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94"; + }; + }; + "verror-1.1.0" = { + name = "verror"; + packageName = "verror"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.1.0.tgz"; + sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0"; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "verror-1.3.3" = { + name = "verror"; + packageName = "verror"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.3.tgz"; + sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd"; + }; + }; + "verror-1.6.0" = { + name = "verror"; + packageName = "verror"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz"; + sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; + }; + }; + "vfile-1.4.0" = { + name = "vfile"; + packageName = "vfile"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz"; + sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7"; + }; + }; + "vfile-location-2.0.2" = { + name = "vfile-location"; + packageName = "vfile-location"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz"; + sha1 = "d3675c59c877498e492b4756ff65e4af1a752255"; + }; + }; + "vhost-3.0.2" = { + name = "vhost"; + packageName = "vhost"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz"; + sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; + }; + }; + "videostream-2.4.2" = { + name = "videostream"; + packageName = "videostream"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/videostream/-/videostream-2.4.2.tgz"; + sha1 = "9560254d00fabdc40955c1a3c282057d8db1d115"; + }; + }; + "vinyl-0.4.6" = { + name = "vinyl"; + packageName = "vinyl"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; + sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; + }; + }; + "vinyl-0.5.3" = { + name = "vinyl"; + packageName = "vinyl"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"; + sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; + }; + }; + "vinyl-1.2.0" = { + name = "vinyl"; + packageName = "vinyl"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz"; + sha1 = "5c88036cf565e5df05558bfc911f8656df218884"; + }; + }; + "vinyl-2.1.0" = { + name = "vinyl"; + packageName = "vinyl"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz"; + sha1 = "021f9c2cf951d6b939943c89eb5ee5add4fd924c"; + }; + }; + "vinyl-file-2.0.0" = { + name = "vinyl-file"; + packageName = "vinyl-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz"; + sha1 = "a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"; + }; + }; + "vinyl-fs-0.3.14" = { + name = "vinyl-fs"; + packageName = "vinyl-fs"; + version = "0.3.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz"; + sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; + }; + }; + "vinyl-fs-2.4.4" = { + name = "vinyl-fs"; + packageName = "vinyl-fs"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz"; + sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239"; + }; + }; + "vlc-command-1.1.1" = { + name = "vlc-command"; + packageName = "vlc-command"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.1.tgz"; + sha1 = "349b85def831f980cd6eec560b1990fd989eaf92"; + }; + }; + "vm-browserify-0.0.4" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; + sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + }; + }; + "voc-1.1.0" = { + name = "voc"; + packageName = "voc"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/voc/-/voc-1.1.0.tgz"; + sha512 = "185v1xryljbds9hw4mc8r5grclrassdi8nq30ckz4sshn4lkivjlx0jm9k25bknf6j9ggxpcybmr94kad4qq2zppjyalbl9qdvn1n3y"; + }; + }; + "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"; + }; + }; + "vows-0.8.1" = { + name = "vows"; + packageName = "vows"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vows/-/vows-0.8.1.tgz"; + sha1 = "e09e988ce594ca05a08d72abcca34e88db559131"; + }; + }; + "vscode-jsonrpc-3.5.0" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz"; + sha1 = "87239d9e166b2d7352245b8a813597804c1d63aa"; + }; + }; + "vscode-jsonrpc-3.6.0" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz"; + sha512 = "1ikdzcmqhhk38d5kz8izbydm4bwh0hik4n6nwnklb0ygyynqasajzaycxg4cwzy72xag5izw12qknvm4irbz6gws8n7kkz5wj7cg89y"; + }; + }; + "vscode-jsonrpc-3.6.1" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.1.tgz"; + sha512 = "1npkazmy51c215nfgg2jiidabqh8kxd87my3xw19jq413h8lbchxc40wacl5g6gxyijvlc40b2fail6nlgb6rmzsfhjv47n2w7zwipq"; + }; + }; + "vscode-languageclient-4.0.1" = { + name = "vscode-languageclient"; + packageName = "vscode-languageclient"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.1.tgz"; + sha512 = "28c35r5m72hcg1g7lbrilwj29403sl9mq13w5zkl97cqx8hg2p1pw6gxjnysqjwg2rdy9hs2mb925krhvs24cp3y24lfck97xk83yyi"; + }; + }; + "vscode-languageserver-3.5.1" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.1.tgz"; + sha512 = "20rg3b1dymhvnkkxjg481ygy13zg0lg35n5bs4fhwl8f8g3lwy53vnfsxcarjnn6zfjbanq0mllqcqaimbf24n99df327g082ghm1a5"; + }; + }; + "vscode-languageserver-4.0.0" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz"; + sha512 = "1g2q6pp97pn1vw1qsxw22487iv64qc8vpr3pjjdmb6j6h6r08l2jb8mv1x8zrv42zsy62c9cvjq1qkb74q7xgsigpc4adlx2sfzs63g"; + }; + }; + "vscode-languageserver-protocol-3.5.1" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz"; + sha512 = "1hajzildw9njhvj7psprgaw4kipjfsi0dw6fw1r1a8nk04plns64f5f2rvzxsj1knm9ad55f2x0d4dcivbg2zi5gii5ggq01ciw7wym"; + }; + }; + "vscode-languageserver-protocol-3.6.0" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz"; + sha512 = "0qcx36adi340y26hb4smwifvand4xkysgxm7mr5m4ycxbfnx8vd0g2sin9j4p9v2lnrgx47zpshiam95lmm0z4l953vpihh0ian3piw"; + }; + }; + "vscode-languageserver-types-3.5.0" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz"; + sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374"; + }; + }; + "vscode-languageserver-types-3.7.1" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.7.1.tgz"; + sha512 = "3msj9sf465hb8j4x9diw4qadgf4h8vks2avw2p42pp5d70v9m1f515mblbwmxh17h1321ivsa63pph8q96fx1kh70vp57j0px9rzlby"; + }; + }; + "vscode-uri-1.0.3" = { + name = "vscode-uri"; + packageName = "vscode-uri"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.3.tgz"; + sha1 = "631bdbf716dccab0e65291a8dc25c23232085a52"; + }; + }; + "walk-2.3.13" = { + name = "walk"; + packageName = "walk"; + version = "2.3.13"; + src = fetchurl { + url = "https://registry.npmjs.org/walk/-/walk-2.3.13.tgz"; + sha512 = "2g4ayyccqgq4fx68dhds9pwhvj2344n9p0lhb4z1hnsi882apm64s434lqz57rx4b0r1x9w1njfqrywd1la0ljqm7j4xxg8nixqri7g"; + }; + }; + "walk-sync-0.3.2" = { + name = "walk-sync"; + packageName = "walk-sync"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz"; + sha512 = "2cycfx3lc52h2684s54pd81wz42f9lbggff4yva194nzr5x8nxp4fl437scd2dayyvxk68v8jmk1k8m364zdh5wmaff1a2bm9b7kh0l"; + }; + }; + "ware-1.3.0" = { + name = "ware"; + packageName = "ware"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz"; + sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"; + }; + }; + "watchpack-1.5.0" = { + name = "watchpack"; + packageName = "watchpack"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.5.0.tgz"; + sha512 = "003dzsqf9q7awjnkv00gwrqw7s8n29y8nmfcmpsl845j2m7rgxxvvd3gld643c92jfwq9yw7ysbaavw9pq1yc5df8yfxmh1sjj64aa5"; + }; + }; + "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"; + }; + }; + "weak-map-1.0.5" = { + name = "weak-map"; + packageName = "weak-map"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; + sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; + }; + }; + "webidl-conversions-4.0.2" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; + sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1"; + }; + }; + "webpack-sources-1.1.0" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz"; + sha512 = "19rska638yxsrpxavydnjckcljiy6ylh63b802hylac396p3mm6j9bj85rhyvi81jk48c33sq580ixwjkbghgwp7cl1i9hgr7bjk9ka"; + }; + }; + "websocket-driver-0.7.0" = { + name = "websocket-driver"; + packageName = "websocket-driver"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz"; + sha1 = "0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"; + }; + }; + "websocket-extensions-0.1.3" = { + name = "websocket-extensions"; + packageName = "websocket-extensions"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; + sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy"; + }; + }; + "websocket-stream-5.1.2" = { + name = "websocket-stream"; + packageName = "websocket-stream"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.2.tgz"; + sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m"; + }; + }; + "webtorrent-0.98.24" = { + name = "webtorrent"; + packageName = "webtorrent"; + version = "0.98.24"; + src = fetchurl { + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.98.24.tgz"; + sha512 = "1jf65qy9fq5ngb1sv296r6wbahjwac8vkdddpfhwmyvmbxabfyn8vz09d5di8sy69d4w0kyi74kjx09v7rd954cg135kr9smyy615yk"; + }; + }; + "whatwg-fetch-2.0.4" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz"; + sha512 = "2g4p2ymmww4wm7cf86xwpb0dndwlxk1gg3brsrj892a4z593h25hyhqv0rmv4hzz4zxv3smmaflsnhilakfpr6y8f2gf3sfd8ckbi3m"; + }; + }; + "whatwg-url-6.3.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.3.0.tgz"; + sha512 = "01m395qx0wag7d63id97v2d86ifpw677f42lys2k6bipw4n9kmwngghsb7la19impgkrg3n4ihyk3j7963rhfgd7b066a4qk09s3kxc"; + }; + }; + "when-3.4.6" = { + name = "when"; + packageName = "when"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; + sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + }; + }; + "when-3.7.7" = { + name = "when"; + packageName = "when"; + version = "3.7.7"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz"; + sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; + }; + }; + "when-3.7.8" = { + name = "when"; + packageName = "when"; + version = "3.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; + sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; + }; + }; + "which-1.2.14" = { + name = "which"; + packageName = "which"; + version = "1.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; + sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; + }; + }; + "which-1.2.4" = { + name = "which"; + packageName = "which"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.2.4.tgz"; + sha1 = "1557f96080604e5b11b3599eb9f45b50a9efd722"; + }; + }; + "which-1.3.0" = { + name = "which"; + packageName = "which"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; + sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "which-pm-runs-1.0.0" = { + name = "which-pm-runs"; + packageName = "which-pm-runs"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; + sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; + }; + }; + "wide-align-1.1.2" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"; + sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; + }; + }; + "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"; + }; + }; + "widest-line-2.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz"; + sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273"; + }; + }; + "win-detect-browsers-1.0.2" = { + name = "win-detect-browsers"; + packageName = "win-detect-browsers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz"; + sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0"; + }; + }; + "win-fork-1.1.1" = { + name = "win-fork"; + packageName = "win-fork"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-fork/-/win-fork-1.1.1.tgz"; + sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e"; + }; + }; + "win-release-1.1.1" = { + name = "win-release"; + packageName = "win-release"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz"; + sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209"; + }; + }; + "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"; + }; + }; + "window-size-0.1.4" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; + sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + }; + }; + "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"; + }; + }; + "windows-no-runnable-0.0.6" = { + name = "windows-no-runnable"; + packageName = "windows-no-runnable"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz"; + sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; + }; + }; + "winreg-0.0.12" = { + name = "winreg"; + packageName = "winreg"; + version = "0.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/winreg/-/winreg-0.0.12.tgz"; + sha1 = "07105554ba1a9d08979251d129475bffae3006b7"; + }; + }; + "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"; + }; + }; + "winreg-1.2.4" = { + name = "winreg"; + packageName = "winreg"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/winreg/-/winreg-1.2.4.tgz"; + sha1 = "ba065629b7a925130e15779108cf540990e98d1b"; + }; + }; + "winser-0.1.6" = { + name = "winser"; + packageName = "winser"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; + sha1 = "08663dc32878a12bbce162d840da5097b48466c9"; + }; + }; + "winston-0.6.2" = { + name = "winston"; + packageName = "winston"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; + sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2"; + }; + }; + "winston-0.8.0" = { + name = "winston"; + packageName = "winston"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; + sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; + }; + }; + "winston-0.8.3" = { + name = "winston"; + packageName = "winston"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; + sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; + }; + }; + "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"; + }; + }; + "winston-2.1.1" = { + name = "winston"; + packageName = "winston"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz"; + sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; + }; + }; + "winston-2.4.1" = { + name = "winston"; + packageName = "winston"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.4.1.tgz"; + sha512 = "2m8ya9y2s295czzzd8yffyny528vfnbjlzz4xpix3c5y51yfmczzbh3v1hkj0kmxwr25c7yp3xxz1vz4skbj93n4ir9gxbp6y9q7zwk"; + }; + }; + "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"; + }; + }; + "with-5.1.1" = { + name = "with"; + packageName = "with"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/with/-/with-5.1.1.tgz"; + sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "worker-farm-1.6.0" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz"; + sha512 = "1yxyar4li6hnvj884kxg0agx61wsrmqnbqc06r7wy8is6iyhf2czrdgnxx4055c5hwlhhg1y8j72sh35wak9i3996kvbwycfssbf3zb"; + }; + }; + "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"; + }; + }; + "wrap-ansi-3.0.1" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; + sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + }; + }; + "wrap-fn-0.1.5" = { + name = "wrap-fn"; + packageName = "wrap-fn"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz"; + sha1 = "f21b6e41016ff4a7e31720dbc63a09016bdf9845"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "wreck-12.5.1" = { + name = "wreck"; + packageName = "wreck"; + version = "12.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wreck/-/wreck-12.5.1.tgz"; + sha512 = "3s89p8x1i16wg1prbm40z7l00611hzk2s7kkvph6fw4cx049p3gpviqmhbgqxxi9pfjz32mx3aj7qsygmfcnvasgs43rj1ynwdd944p"; + }; + }; + "write-0.2.1" = { + name = "write"; + packageName = "write"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/write/-/write-0.2.1.tgz"; + sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; + }; + }; + "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"; + }; + }; + "write-file-atomic-2.3.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; + sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; + }; + }; + "write-json-file-2.3.0" = { + name = "write-json-file"; + packageName = "write-json-file"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz"; + sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f"; + }; + }; + "write-pkg-3.1.0" = { + name = "write-pkg"; + packageName = "write-pkg"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz"; + sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9"; + }; + }; + "ws-0.4.31" = { + name = "ws"; + packageName = "ws"; + version = "0.4.31"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; + sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927"; + }; + }; + "ws-0.4.32" = { + name = "ws"; + packageName = "ws"; + version = "0.4.32"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; + sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; + }; + }; + "ws-1.1.5" = { + name = "ws"; + packageName = "ws"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; + sha512 = "3iv2yz706h7wyg563jsfjdykkkxs8j49vz60r6qx5by0npfhs98rgc114kdqs15sc52mldscc22bkfpkrs08cwlqaxx8lfdjn5alwm3"; + }; + }; + "ws-2.3.1" = { + name = "ws"; + packageName = "ws"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz"; + sha1 = "6b94b3e447cb6a363f785eaf94af6359e8e81c80"; + }; + }; + "ws-3.3.3" = { + name = "ws"; + packageName = "ws"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz"; + sha512 = "2887c18dlvnvc62pqgwhihzxnnj9mzbnjqa0gqg3n94k5b6fx6nm1wggisy2bg3mi7dl81vk11i49wl319yfvh255w2nrbhydmqnxcy"; + }; + }; + "ws-4.1.0" = { + name = "ws"; + packageName = "ws"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz"; + sha512 = "1ldy8hddsvy7lb045cx4jrnx09962j98zp7y16f64gkw8z99ww61w91mjhrm85bqpsf3b158yhfh6yf01g1a2zrgm6v9bkx87r7ys34"; + }; + }; + "ws-5.1.1" = { + name = "ws"; + packageName = "ws"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-5.1.1.tgz"; + sha512 = "01whkym8fx8qjmx8s548zzw3ba05x8canb59v5yzidbwxdm7w1kfcfqhzzrxni1r9idqgla5ll5d3kp6fmk1sdn0k7d9lwvj2zarsvc"; + }; + }; + "wtf-8-1.0.0" = { + name = "wtf-8"; + packageName = "wtf-8"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; + sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + }; + }; + "x-default-browser-0.3.1" = { + name = "x-default-browser"; + packageName = "x-default-browser"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.1.tgz"; + sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; + }; + }; + "xcode-1.0.0" = { + name = "xcode"; + packageName = "xcode"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xcode/-/xcode-1.0.0.tgz"; + sha1 = "e1f5b1443245ded38c180796df1a10fdeda084ec"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "xhr-2.4.1" = { + name = "xhr"; + packageName = "xhr"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz"; + sha512 = "38f6fgl0n5syagym161b29l5vhyan3azv5zs3vmyd4s80svy9xl7ppczk3rdawjn70s1ws5qvbh5zf1wyrj2ifawnr7ix3by3k180m4"; + }; + }; + "xml-1.0.0" = { + name = "xml"; + packageName = "xml"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz"; + sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; + }; + }; + "xml2js-0.1.14" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; + sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; + }; + }; + "xml2js-0.2.4" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz"; + sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d"; + }; + }; + "xml2js-0.2.7" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz"; + sha1 = "1838518bb01741cae0878bab4915e494c32306af"; + }; + }; + "xml2js-0.2.8" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; + sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; + }; + }; + "xml2js-0.4.17" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.4.17"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz"; + sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; + }; + }; + "xml2js-0.4.19" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.4.19"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz"; + sha512 = "3skianymbfq4rg2v5c1vwsz2kmxfik60qa892wh6a3rydd1wrv3l4vgyr8v4wd8krdf42jbmq7blp0ksbmwm332q5yr922fj8jngiks"; + }; + }; + "xml2tss-0.0.5" = { + name = "xml2tss"; + packageName = "xml2tss"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz"; + sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; + }; + }; + "xmlbuilder-0.4.2" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; + sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; + }; + }; + "xmlbuilder-0.4.3" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; + sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; + }; + }; + "xmlbuilder-4.0.0" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz"; + sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; + }; + }; + "xmlbuilder-4.2.1" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz"; + sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; + }; + }; + "xmlbuilder-8.2.2" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "8.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"; + sha1 = "69248673410b4ba42e1a6136551d2922335aa773"; + }; + }; + "xmlbuilder-9.0.7" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "9.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + }; + }; + "xmlcreate-1.0.2" = { + name = "xmlcreate"; + packageName = "xmlcreate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz"; + sha1 = "fa6bf762a60a413fb3dd8f4b03c5b269238d308f"; + }; + }; + "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"; + }; + }; + "xmldom-0.1.27" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.27"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"; + sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; + }; + }; + "xmlhttprequest-1.4.2" = { + name = "xmlhttprequest"; + packageName = "xmlhttprequest"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz"; + sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500"; + }; + }; + "xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" = { + name = "xmlhttprequest"; + packageName = "xmlhttprequest"; + version = "1.5.0"; + src = fetchurl { + name = "xmlhttprequest-1.5.0.tar.gz"; + url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433; + sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; + }; + }; + "xmlhttprequest-ssl-1.5.3" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; + sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; + }; + }; + "xmlhttprequest-ssl-1.5.5" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz"; + sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e"; + }; + }; + "xoauth2-0.1.8" = { + name = "xoauth2"; + packageName = "xoauth2"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz"; + sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; + }; + }; + "xorshift-0.2.1" = { + name = "xorshift"; + packageName = "xorshift"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xorshift/-/xorshift-0.2.1.tgz"; + sha1 = "fcd82267e9351c13f0fb9c73307f25331d29c63a"; + }; + }; + "xpath.js-1.0.7" = { + name = "xpath.js"; + packageName = "xpath.js"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz"; + sha1 = "7e94627f541276cbc6a6b02b5d35e9418565b3e4"; + }; + }; + "xpath.js-1.1.0" = { + name = "xpath.js"; + packageName = "xpath.js"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz"; + sha512 = "1ymd8ry54702m8plqvqq4450hhsn7z4p7af48z13dx2bf928hakggd6gi6q13gk36cpavwag20nfr7j4njsjv5fywxw2axqyj8sl3wf"; + }; + }; + "xregexp-2.0.0" = { + name = "xregexp"; + packageName = "xregexp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz"; + sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; + }; + }; + "xregexp-4.0.0" = { + name = "xregexp"; + packageName = "xregexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz"; + sha512 = "0b2p3pxs6fa0knpdw3qhcpqh47ci9w9r4lfhav4nsg7p7l73izpig0b3knkrsl72nq5ll4pk79is30vwm1c044lnbqyxfi8qkx8qz1w"; + }; + }; + "xsalsa20-1.0.2" = { + name = "xsalsa20"; + packageName = "xsalsa20"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.0.2.tgz"; + sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43"; + }; + }; + "xspfr-0.3.1" = { + name = "xspfr"; + packageName = "xspfr"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xspfr/-/xspfr-0.3.1.tgz"; + sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; + }; + }; + "xtend-3.0.0" = { + name = "xtend"; + packageName = "xtend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"; + sha1 = "5cce7407baf642cba7becda568111c493f59665a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g"; + }; + }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; + "yallist-3.0.2" = { + name = "yallist"; + packageName = "yallist"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; + sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; + }; + }; + "yaml-js-0.0.8" = { + name = "yaml-js"; + packageName = "yaml-js"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.0.8.tgz"; + sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; + }; + }; + "yargs-1.3.3" = { + name = "yargs"; + packageName = "yargs"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; + sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; + }; + }; + "yargs-10.1.2" = { + name = "yargs"; + packageName = "yargs"; + version = "10.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz"; + sha512 = "25gvc8vjalpbv69v0frmh10x203dsnl0jrnx8c2mww3qrxl69kms5ppzry3lp51lgaby524hc6qa80kgrz0zcdvas8flq26l33aix4a"; + }; + }; + "yargs-11.0.0" = { + name = "yargs"; + packageName = "yargs"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz"; + sha512 = "03n9lfnyx1dfj5sm811f3d96djsr6fixd5qi6cl6wj8xf0y01sgn7w3ynv5gn2vl30dwq5mz2hw5f522v8xbwc8m9h6nf8hqsa7wfj6"; + }; + }; + "yargs-11.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz"; + sha512 = "3j5awbfcbh8ik0kz01mycydpi1bz9fg70xc66lk1r1qvrs5x41i2w8nvgj0aip7z9vypcsxks76z75sz4lr6z3ida9c04inkvsbl19p"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "yargs-3.32.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.32.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; + sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "yargs-7.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; + sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; + }; + }; + "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"; + }; + }; + "yargs-9.0.1" = { + name = "yargs"; + packageName = "yargs"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz"; + sha1 = "52acc23feecac34042078ee78c0c007f5085db4c"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "yargs-parser-5.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; + sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; + }; + }; + "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"; + }; + }; + "yargs-parser-8.1.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz"; + sha512 = "0jyff04yy5xlrgvccky4f7phgp99lk2r1n7dk67hkb0picdjpa2ap27g4jrm94cw1d31vw8sh2b5cvnvga2w838bgh6l1kwld1bmzy8"; + }; + }; + "yargs-parser-9.0.2" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz"; + sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; + }; + }; + "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"; + }; + }; + "yauzl-2.9.1" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz"; + sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; + }; + }; + "yeast-0.1.2" = { + name = "yeast"; + packageName = "yeast"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"; + sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419"; + }; + }; + "yeoman-character-1.1.0" = { + name = "yeoman-character"; + packageName = "yeoman-character"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-character/-/yeoman-character-1.1.0.tgz"; + sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7"; + }; + }; + "yeoman-doctor-2.1.0" = { + name = "yeoman-doctor"; + packageName = "yeoman-doctor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-2.1.0.tgz"; + sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; + }; + }; + "yeoman-environment-2.0.6" = { + name = "yeoman-environment"; + packageName = "yeoman-environment"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.6.tgz"; + sha512 = "0z4544lfc7gzyp98fihqwi42p0j2dqwgrcl99i1d0b04qkslfv3im5r0xvp8rvapiqlwjg48b63kr5p1japcz3548wg445w7i6w2ccg"; + }; + }; + "yosay-2.0.2" = { + name = "yosay"; + packageName = "yosay"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yosay/-/yosay-2.0.2.tgz"; + sha512 = "1n24pfz9fc1pd1p1cc2bl3jy6nb9xxbqadmzx3grims5xmk9r64xy98ybnim6wwz4kj3z91qc391v785s4876ki6749xcly7ngzmxba"; + }; + }; + "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"; + sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf"; + }; + }; + "zeparser-0.0.5" = { + name = "zeparser"; + packageName = "zeparser"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"; + sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; + }; + }; + "zero-fill-2.2.3" = { + name = "zero-fill"; + packageName = "zero-fill"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/zero-fill/-/zero-fill-2.2.3.tgz"; + sha1 = "a3def06ba5e39ae644850bb4ca2ad4112b4855e9"; + }; + }; + "zip-1.2.0" = { + name = "zip"; + packageName = "zip"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/zip/-/zip-1.2.0.tgz"; + sha1 = "ad0ad42265309be42eb56fc86194e17c24e66a9c"; + }; + }; + "zip-dir-1.0.2" = { + name = "zip-dir"; + packageName = "zip-dir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/zip-dir/-/zip-dir-1.0.2.tgz"; + sha1 = "253f907aead62a21acd8721d8b88032b2411c051"; + }; + }; + "zip-object-0.1.0" = { + name = "zip-object"; + packageName = "zip-object"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/zip-object/-/zip-object-0.1.0.tgz"; + sha1 = "c1a0da04c88c837756e248680a03ff902ec3f53a"; + }; + }; + "zip-stream-1.2.0" = { + name = "zip-stream"; + packageName = "zip-stream"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz"; + sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"; + }; + }; + }; +in +{ + alloy = nodeEnv.buildNodePackage { + name = "alloy"; + packageName = "alloy"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/alloy/-/alloy-1.12.0.tgz"; + sha512 = "1sk9p5lng0hwngvzbz28nwaamf73hyz4pa14fxzmwq11syjfiw8b3p95vig8sabn2zfwi8ddginhg5rvf10a5rgpq3cy608yy7qk21z"; + }; + dependencies = [ + sources."JSV-4.0.2" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."array-unique-0.3.2" + sources."async-2.6.0" + sources."babel-code-frame-6.26.0" + (sources."babel-core-6.26.0" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + (sources."babel-generator-6.26.1" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."babel-helpers-6.24.1" + sources."babel-messages-6.23.0" + sources."babel-register-6.26.0" + sources."babel-runtime-6.26.0" + sources."babel-template-6.26.0" + sources."babel-traverse-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chalk-1.1.3" + sources."chmodr-1.0.2" + sources."colors-1.2.1" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."convert-source-map-1.5.1" + sources."core-js-2.5.5" + sources."debug-2.6.9" + sources."detect-indent-4.0.0" + sources."ejs-2.5.7" + sources."ensure-posix-path-1.0.2" + sources."escape-string-regexp-1.0.5" + sources."esutils-2.0.2" + sources."fs-extra-5.0.0" + (sources."global-modules-0.2.3" // { + dependencies = [ + sources."is-windows-0.2.0" + ]; + }) + sources."global-paths-1.0.0" + sources."global-prefix-0.1.5" + sources."globals-9.18.0" + sources."graceful-fs-4.1.11" + sources."has-ansi-2.0.0" + sources."has-color-0.1.7" + sources."home-or-tmp-2.0.0" + sources."homedir-polyfill-1.0.1" + sources."ini-1.3.5" + sources."invariant-2.2.4" + sources."is-3.2.1" + sources."is-finite-1.0.2" + sources."is-windows-1.0.2" + sources."isexe-2.0.0" + sources."js-tokens-3.0.2" + sources."jsesc-1.3.0" + sources."json5-0.5.1" + sources."jsonfile-4.0.0" + (sources."jsonlint-1.6.2" // { + dependencies = [ + sources."ansi-styles-1.0.0" + sources."chalk-0.4.0" + sources."strip-ansi-0.1.1" + ]; + }) + sources."lodash-4.17.5" + sources."loose-envify-1.3.1" + sources."matcher-collection-1.0.5" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."moment-2.20.1" + sources."ms-2.0.0" + sources."node.extend-2.0.0" + sources."nomnom-1.8.1" + sources."number-is-nan-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."parse-passwd-1.0.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.5" + sources."pkginfo-0.4.1" + sources."private-0.1.8" + sources."regenerator-runtime-0.11.1" + sources."repeating-2.0.1" + sources."resolve-1.7.0" + sources."sax-0.5.8" + sources."slash-1.0.0" + sources."source-map-0.6.1" + sources."source-map-support-0.4.18" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."to-fast-properties-1.0.3" + sources."trim-right-1.0.1" + sources."underscore-1.6.0" + sources."universalify-0.1.1" + sources."walk-sync-0.3.2" + sources."which-1.3.0" + sources."xml2js-0.2.8" + sources."xml2tss-0.0.5" + sources."xmldom-0.1.27" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Appcelerator Titanium MVC Framework"; + homepage = "https://github.com/appcelerator/alloy#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = false; + }; + asar = nodeEnv.buildNodePackage { + name = "asar"; + packageName = "asar"; + version = "0.14.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz"; + sha512 = "1p102lrikvbx1rrp8b1d47fif3qwz2487q4djgnf6288hjk8gf2nxcinwzixkfh0dw0zy7mbv1przwg4zcnpgv7wpsbnqg6a1anf4zs"; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ajv-5.5.2" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."binary-0.3.0" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."buffers-0.1.1" + sources."caseless-0.12.0" + sources."chainsaw-0.1.0" + sources."chromium-pickle-js-0.2.0" + sources."co-4.6.0" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."cuint-0.2.2" + sources."dashdash-1.14.1" + sources."decompress-zip-0.3.0" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-0.26.7" + sources."fs.realpath-1.0.0" + sources."getpass-0.1.7" + sources."glob-6.0.4" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-typedarray-1.0.0" + sources."isarray-0.0.1" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."klaw-1.3.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."mkpath-0.1.0" + (sources."mksnapshot-0.3.1" // { + dependencies = [ + sources."glob-7.1.2" + ]; + }) + sources."nopt-3.0.6" + sources."oauth-sign-0.8.2" + sources."once-1.4.0" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."punycode-1.4.1" + sources."q-1.5.1" + sources."qs-6.5.1" + sources."readable-stream-1.1.14" + sources."request-2.85.0" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."sntp-2.1.0" + sources."sshpk-1.14.1" + sources."string_decoder-0.10.31" + sources."stringstream-0.0.5" + sources."tmp-0.0.28" + (sources."touch-0.0.3" // { + dependencies = [ + sources."nopt-1.0.10" + ]; + }) + sources."tough-cookie-2.3.4" + sources."traverse-0.3.9" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uuid-3.2.1" + sources."verror-1.10.0" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Creating Electron app packages"; + homepage = https://github.com/electron/asar; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + azure-cli = nodeEnv.buildNodePackage { + name = "azure-cli"; + packageName = "azure-cli"; + version = "0.10.18"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.18.tgz"; + sha512 = "05k876g0s9ac53vrqqcn5h2l6s9ccawihr29gxvj8fib49qg2mhf1v52277r2wgcjxibj7vq2b3zp2jkp0vwd6d1pkv8alwf84ri6wc"; + }; + dependencies = [ + sources."@types/caseless-0.12.1" + sources."@types/form-data-2.2.1" + sources."@types/node-8.10.4" + sources."@types/request-2.47.0" + sources."@types/tough-cookie-2.3.2" + sources."@types/uuid-3.4.3" + sources."JSV-4.0.2" + sources."adal-node-0.1.21" + sources."ajv-5.5.2" + sources."amdefine-1.0.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-1.0.0" + sources."applicationinsights-0.16.0" + sources."asap-2.0.6" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-1.4.2" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."azure-arm-authorization-2.0.0" + (sources."azure-arm-batch-0.3.0" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-arm-cdn-1.0.3" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-arm-commerce-0.2.0" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + sources."azure-arm-compute-3.0.0-preview" + (sources."azure-arm-datalake-analytics-1.0.2-preview" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-arm-datalake-store-1.0.2-preview" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-arm-devtestlabs-0.1.0" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + sources."azure-arm-dns-2.0.0-preview" + sources."azure-arm-hdinsight-0.2.2" + sources."azure-arm-hdinsight-jobs-0.1.0" + sources."azure-arm-insights-0.11.3" + sources."azure-arm-iothub-1.0.1-preview" + sources."azure-arm-network-5.1.0" + (sources."azure-arm-powerbiembedded-0.1.0" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-arm-rediscache-0.2.3" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-arm-resource-1.6.1-preview" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-arm-servermanagement-0.1.2" // { + dependencies = [ + sources."async-0.2.7" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-arm-storage-0.15.0-preview" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + sources."azure-arm-trafficmanager-1.1.0-preview" + (sources."azure-arm-website-0.11.4" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + sources."azure-asm-compute-0.18.0" + sources."azure-asm-hdinsight-0.10.2" + sources."azure-asm-mgmt-0.10.1" + sources."azure-asm-network-0.13.0" + sources."azure-asm-sb-0.10.1" + sources."azure-asm-sql-0.10.1" + sources."azure-asm-storage-0.12.0" + sources."azure-asm-subscription-0.10.1" + sources."azure-asm-trafficmanager-0.10.3" + (sources."azure-asm-website-0.10.4" // { + dependencies = [ + sources."moment-2.14.1" + ]; + }) + (sources."azure-batch-0.5.2" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-common-0.9.18" // { + dependencies = [ + sources."validator-3.22.2" + sources."xml2js-0.2.7" + ]; + }) + sources."azure-gallery-2.0.0-pre.18" + sources."azure-graph-2.1.0-preview" + (sources."azure-keyvault-0.11.0" // { + dependencies = [ sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-monitoring-0.10.2" // { + dependencies = [ + sources."moment-2.6.0" + ]; + }) + (sources."azure-servicefabric-0.1.5" // { + dependencies = [ + sources."async-0.2.7" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + ]; + }) + (sources."azure-storage-2.1.0" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."validator-3.22.2" + sources."xml2js-0.2.7" + ]; + }) + sources."balanced-match-1.0.0" + sources."base64url-2.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."bl-1.1.2" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."browserify-mime-1.2.9" + sources."buffer-equal-constant-time-1.0.1" + sources."buffer-from-1.0.0" + sources."caller-id-0.1.0" + sources."caseless-0.12.0" + sources."chalk-0.4.0" + sources."clone-1.0.4" + sources."co-4.6.0" + sources."colors-1.1.2" + sources."combined-stream-1.0.6" + sources."commander-1.0.4" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."core-util-is-1.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."ctype-0.5.2" + sources."cycle-1.0.3" + sources."dashdash-1.14.1" + sources."date-utils-1.2.21" + sources."dateformat-1.0.2-1.2.3" + sources."debug-0.7.4" + sources."deep-equal-1.0.1" + sources."defaults-1.0.3" + sources."delayed-stream-1.0.0" + sources."duplexer-0.1.1" + sources."easy-table-1.1.0" + sources."ecc-jsbn-0.1.1" + sources."ecdsa-sig-formatter-1.0.9" + sources."envconf-0.0.4" + sources."escape-string-regexp-1.0.5" + sources."event-stream-3.1.5" + sources."extend-1.2.1" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-deep-equal-1.1.0" + sources."fast-json-patch-0.5.6" + sources."fast-json-stable-stringify-2.0.0" + sources."fibers-1.0.15" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."from-0.1.7" + sources."fs.realpath-1.0.0" + sources."galaxy-0.1.12" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."getpass-0.1.7" + sources."github-0.1.6" + sources."glob-7.1.2" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-ansi-2.0.0" + sources."has-color-0.1.7" + sources."hash-base-3.0.4" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-basic-2.5.1" + sources."http-response-object-1.1.0" + sources."http-signature-1.2.0" + sources."i-0.3.6" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-buffer-1.1.6" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" + sources."is-property-1.0.2" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."js2xmlparser-1.0.0" + sources."jsbn-0.1.1" + sources."json-edm-parser-0.1.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + (sources."jsonlint-1.6.2" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) + sources."jsonminify-0.4.1" + sources."jsonparse-1.2.0" + sources."jsonpointer-4.0.1" + sources."jsprim-1.4.1" + sources."jsrsasign-4.8.2" + sources."jwa-1.1.5" + sources."jws-3.1.4" + sources."jwt-decode-2.2.0" + sources."keypress-0.1.0" + (sources."kuduscript-1.0.16" // { + dependencies = [ + sources."commander-1.1.1" + sources."streamline-0.4.11" + ]; + }) + sources."lodash-4.17.5" + sources."map-stream-0.1.0" + sources."md5.js-1.3.4" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."moment-2.22.0" + (sources."ms-rest-2.3.3" // { + dependencies = [ + sources."extend-3.0.1" + sources."request-2.85.0" + sources."through-2.3.8" + sources."tunnel-0.0.5" + ]; + }) + (sources."ms-rest-azure-2.5.5" // { + dependencies = [ + sources."@types/node-9.6.2" + (sources."adal-node-0.1.28" // { + dependencies = [ + sources."@types/node-8.10.4" + ]; + }) + sources."async-2.6.0" + sources."xpath.js-1.1.0" + ]; + }) + sources."mute-stream-0.0.7" + sources."ncp-0.4.2" + sources."node-forge-0.6.23" + sources."node-uuid-1.4.7" + sources."nomnom-1.8.1" + sources."oauth-sign-0.8.2" + sources."omelette-0.3.2" + sources."once-1.4.0" + sources."openssl-wrapper-0.2.1" + sources."os-homedir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pause-stream-0.0.11" + sources."performance-now-2.1.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkginfo-0.4.1" + sources."process-nextick-args-1.0.7" + sources."progress-1.1.8" + sources."promise-7.3.1" + (sources."prompt-0.2.14" // { + dependencies = [ + sources."async-0.2.10" + sources."colors-0.6.2" + (sources."winston-0.8.3" // { + dependencies = [ + sources."pkginfo-0.3.1" + ]; + }) + ]; + }) + sources."punycode-1.4.1" + sources."q-0.9.7" + sources."qs-6.5.1" + sources."read-1.0.7" + (sources."readable-stream-1.0.34" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + (sources."request-2.74.0" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."assert-plus-0.2.0" + sources."async-2.6.0" + sources."aws-sign2-0.6.0" + sources."boom-2.10.1" + sources."caseless-0.11.0" + sources."chalk-1.1.3" + sources."commander-2.15.1" + sources."cryptiles-2.0.5" + sources."extend-3.0.1" + sources."form-data-1.0.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" + sources."qs-6.2.3" + sources."readable-stream-2.0.6" + sources."sntp-1.0.9" + sources."strip-ansi-3.0.1" + sources."tunnel-agent-0.4.3" + ]; + }) + sources."revalidator-0.1.8" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."sax-0.5.2" + sources."sntp-2.1.0" + sources."source-map-0.1.43" + sources."split-0.2.10" + (sources."ssh-key-to-pem-0.11.0" // { + dependencies = [ + sources."asn1-0.1.11" + ]; + }) + sources."sshpk-1.14.1" + sources."stack-trace-0.0.10" + sources."stream-combiner-0.0.4" + sources."streamline-0.10.17" + sources."streamline-streams-0.1.5" + sources."string_decoder-0.10.31" + sources."stringstream-0.0.5" + sources."strip-ansi-0.1.1" + sources."supports-color-2.0.0" + (sources."sync-request-3.0.0" // { + dependencies = [ + sources."caseless-0.11.0" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."then-request-2.2.0" + sources."through-2.3.4" + sources."tough-cookie-2.3.4" + sources."tunnel-0.0.2" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."underscore-1.4.4" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."utile-0.2.1" + sources."uuid-3.2.1" + sources."validator-5.2.0" + sources."verror-1.10.0" + sources."wcwidth-1.0.1" + (sources."winston-2.1.1" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + sources."pkginfo-0.3.1" + ]; + }) + sources."wordwrap-0.0.2" + sources."wrappy-1.0.2" + sources."xml2js-0.1.14" + sources."xmlbuilder-0.4.3" + sources."xmldom-0.1.27" + sources."xpath.js-1.0.7" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Microsoft Azure Cross Platform Command Line tool"; + homepage = https://github.com/Azure/azure-xplat-cli; + license = "Apache-2.0"; + }; + production = true; + bypassCache = false; + }; + bower = nodeEnv.buildNodePackage { + name = "bower"; + packageName = "bower"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; + sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The browser package manager"; + homepage = http://bower.io/; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + bower2nix = nodeEnv.buildNodePackage { + name = "bower2nix"; + packageName = "bower2nix"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz"; + sha1 = "5a0cabad7d5d5e6c35dbc068719c6c919e903fb5"; + }; + dependencies = [ + sources."argparse-1.0.4" + sources."array-find-index-1.0.2" + sources."balanced-match-1.0.0" + sources."bower-1.8.4" + sources."bower-endpoint-parser-0.2.1" + sources."bower-json-0.6.0" + sources."bower-logger-0.2.1" + sources."brace-expansion-1.1.11" + sources."builtin-modules-1.1.1" + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."concat-map-0.0.1" + sources."currently-unhandled-0.4.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."deep-extend-0.4.2" + sources."ends-with-0.2.0" + sources."error-ex-1.3.1" + sources."ext-list-2.2.2" + (sources."ext-name-3.0.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + ]; + }) + sources."find-up-1.1.2" + (sources."fs-extra-0.26.7" // { + dependencies = [ + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + ]; + }) + sources."fs.realpath-1.0.0" + sources."get-stdin-4.0.1" + sources."glob-6.0.4" + sources."graceful-fs-3.0.11" + sources."hosted-git-info-2.6.0" + sources."indent-string-2.1.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."intersect-1.0.1" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-finite-1.0.2" + sources."is-plain-obj-1.1.0" + sources."is-utf8-0.2.1" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."load-json-file-1.1.0" + sources."lodash-4.2.1" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."meow-3.7.0" + sources."mime-db-1.33.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."natives-1.1.3" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-tmpdir-1.0.2" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + (sources."promised-temp-0.1.0" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."q-1.5.1" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."repeating-2.0.1" + sources."rimraf-2.6.2" + sources."semver-5.5.0" + sources."signal-exit-3.0.2" + sources."sort-keys-1.1.2" + sources."sort-keys-length-1.0.1" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."sprintf-js-1.0.3" + sources."strip-bom-2.0.0" + sources."strip-indent-1.0.1" + (sources."temp-0.8.3" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) + sources."trim-newlines-1.0.0" + sources."validate-npm-package-license-3.0.3" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Generate nix expressions to fetch bower dependencies"; + homepage = https://github.com/rvl/bower2nix; + license = "GPL-3.0"; + }; + production = true; + bypassCache = false; + }; + browserify = nodeEnv.buildNodePackage { + name = "browserify"; + packageName = "browserify"; + version = "16.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz"; + sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9"; + }; + dependencies = [ + sources."JSONStream-1.3.2" + sources."acorn-4.0.13" + sources."acorn-node-1.3.0" + sources."array-filter-0.0.1" + sources."array-map-0.0.0" + sources."array-reduce-0.0.0" + sources."asn1.js-4.10.1" + sources."assert-1.4.1" + sources."astw-2.2.0" + sources."balanced-match-1.0.0" + sources."base64-js-1.2.3" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.11" + sources."brorand-1.1.0" + sources."browser-pack-6.1.0" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.0" + sources."browserify-des-1.0.0" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."buffer-5.1.0" + sources."buffer-from-1.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" + sources."cached-path-relative-1.0.1" + sources."cipher-base-1.0.4" + sources."combine-source-map-0.8.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."convert-source-map-1.1.3" + sources."core-util-is-1.0.2" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" + (sources."crypto-browserify-3.12.0" // { + dependencies = [ + sources."hash-base-2.0.2" + ]; + }) + sources."date-now-0.1.4" + sources."defined-1.0.0" + sources."deps-sort-2.0.0" + sources."des.js-1.0.0" + sources."detective-5.1.0" + sources."diffie-hellman-5.0.2" + sources."domain-browser-1.2.0" + sources."duplexer2-0.1.4" + sources."elliptic-6.4.0" + sources."events-2.0.0" + sources."evp_bytestokey-1.0.3" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."glob-7.1.2" + sources."has-1.0.1" + sources."hash-base-3.0.4" + sources."hash.js-1.1.3" + sources."hmac-drbg-1.0.1" + sources."htmlescape-1.1.1" + sources."https-browserify-1.0.0" + sources."ieee754-1.1.11" + sources."indexof-0.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."inline-source-map-0.6.2" + sources."insert-module-globals-7.0.6" + sources."is-buffer-1.1.6" + sources."isarray-2.0.4" + sources."json-stable-stringify-0.0.1" + sources."jsonify-0.0.0" + sources."jsonparse-1.3.1" + sources."labeled-stream-splicer-2.0.1" + sources."lexical-scope-1.2.0" + sources."lodash.memoize-3.0.4" + sources."md5.js-1.3.4" + sources."miller-rabin-4.0.1" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + (sources."module-deps-6.0.2" // { + dependencies = [ + sources."acorn-5.5.3" + sources."minimist-1.2.0" + ]; + }) + sources."once-1.4.0" + sources."os-browserify-0.3.0" + sources."pako-1.0.6" + sources."parents-1.0.1" + sources."parse-asn1-5.1.0" + sources."path-browserify-0.0.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.5" + sources."path-platform-0.11.15" + sources."pbkdf2-3.0.14" + sources."process-0.11.10" + sources."process-nextick-args-2.0.0" + sources."public-encrypt-4.0.0" + sources."punycode-1.4.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.0.6" + sources."randomfill-1.0.4" + sources."read-only-stream-2.0.0" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."isarray-1.0.0" + sources."string_decoder-1.1.1" + ]; + }) + sources."resolve-1.7.0" + sources."ripemd160-2.0.1" + sources."safe-buffer-5.1.1" + sources."sha.js-2.4.11" + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + sources."source-map-0.5.7" + sources."stream-browserify-2.0.1" + sources."stream-combiner2-1.1.1" + sources."stream-http-2.8.1" + sources."stream-splicer-2.0.0" + sources."string_decoder-1.0.3" + (sources."subarg-1.0.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."syntax-error-1.4.0" + sources."through-2.3.8" + sources."through2-2.0.3" + sources."timers-browserify-1.4.2" + sources."to-arraybuffer-1.0.1" + sources."tty-browserify-0.0.1" + sources."typedarray-0.0.6" + sources."umd-3.0.3" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."util-deprecate-1.0.2" + sources."vm-browserify-0.0.4" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "browser-side require() the node way"; + homepage = "https://github.com/browserify/browserify#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + castnow = nodeEnv.buildNodePackage { + name = "castnow"; + packageName = "castnow"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/castnow/-/castnow-0.6.0.tgz"; + sha512 = "01z326dk78dypwf9wyjrcr81bimbkh77cgzp54qv9230j7r7jxvd4xbsd36prrssl66ggixzwxhh6wzfqnj44ygnx3j49rf0vqxj9jp"; + }; + dependencies = [ + sources."addr-to-ip-port-1.4.3" + sources."airplay-js-0.2.16" + sources."ansi-regex-1.1.1" + sources."ansi-styles-2.2.1" + sources."append-0.1.1" + sources."array-find-0.1.1" + sources."array-find-index-1.0.2" + sources."array-loop-1.0.0" + sources."array-shuffle-1.0.1" + sources."ascli-0.3.0" + sources."async-0.2.10" + sources."aws-sign-0.2.0" + sources."balanced-match-1.0.0" + sources."base64-js-1.2.3" + sources."bencode-2.0.0" + sources."bitfield-0.1.0" + sources."bittorrent-dht-6.4.2" + sources."bittorrent-tracker-7.7.0" + sources."blob-to-buffer-1.2.7" + sources."bn.js-4.11.8" + sources."bncode-0.5.3" + sources."boom-0.3.8" + sources."brace-expansion-1.1.11" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-equal-0.0.1" + sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" + sources."bufferview-1.0.1" + sources."builtin-modules-1.1.1" + sources."bytebuffer-3.5.5" + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."castv2-0.1.9" + sources."castv2-client-1.2.0" + sources."chalk-1.0.0" + sources."chromecast-player-0.2.3" + sources."chromecast-scanner-0.5.0" + sources."cli-width-1.1.1" + sources."clivas-0.1.4" + sources."co-3.1.0" + sources."codepage-1.4.0" + sources."colour-0.7.1" + sources."combined-stream-0.0.7" + sources."commander-2.15.1" + sources."compact2string-1.4.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."cookie-jar-0.2.0" + sources."core-util-is-1.0.2" + sources."cryptiles-0.1.3" + sources."currently-unhandled-0.4.1" + sources."cyclist-0.1.1" + sources."debounced-seeker-1.0.0" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decompress-response-3.3.0" + sources."deep-extend-0.2.11" + sources."delayed-stream-0.0.5" + sources."diveSync-0.3.0" + (sources."dns-js-0.2.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."error-ex-1.3.1" + sources."escape-string-regexp-1.0.5" + sources."exit-on-epipe-1.0.1" + sources."fifo-0.1.4" + sources."figures-1.7.0" + sources."find-up-1.1.2" + sources."flatten-0.0.1" + sources."forever-agent-0.2.0" + sources."form-data-0.0.10" + (sources."fs-chunk-store-1.7.0" // { + dependencies = [ + sources."mkdirp-0.5.1" + ]; + }) + sources."fs.realpath-1.0.0" + sources."get-browser-rtc-1.0.2" + sources."get-stdin-4.0.1" + sources."glob-7.1.2" + sources."got-1.2.2" + sources."graceful-fs-4.1.11" + sources."has-ansi-1.0.3" + sources."hat-0.0.3" + sources."hawk-0.10.2" + sources."hoek-0.7.6" + sources."hosted-git-info-2.6.0" + sources."immediate-chunk-store-1.0.8" + sources."indent-string-2.1.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.1.0" + sources."inquirer-0.8.5" + (sources."internal-ip-1.2.0" // { + dependencies = [ + sources."object-assign-4.1.1" + ]; + }) + sources."ip-1.1.5" + sources."ip-set-1.0.1" + sources."ipaddr.js-1.7.0" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-finite-1.0.2" + sources."is-utf8-0.2.1" + sources."isarray-0.0.1" + sources."json-stringify-safe-3.0.0" + sources."k-bucket-0.6.0" + (sources."k-rpc-3.7.0" // { + dependencies = [ + sources."bencode-2.0.0" + sources."k-bucket-2.0.1" + ]; + }) + sources."k-rpc-socket-1.8.0" + sources."keypress-0.2.1" + sources."load-json-file-1.1.0" + sources."lodash-3.10.1" + sources."long-2.4.0" + sources."loud-rejection-1.6.0" + sources."lru-2.0.1" + sources."magnet-uri-5.1.7" + sources."map-obj-1.0.1" + sources."mdns-js-1.0.1" + sources."meow-3.7.0" + sources."mime-1.6.0" + sources."mimic-response-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.3.5" + sources."ms-2.0.0" + sources."multicast-dns-4.0.1" + sources."mutate.js-0.2.0" + sources."mute-stream-0.0.4" + sources."network-address-0.0.5" + sources."node-uuid-1.4.8" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" + sources."numeral-1.5.6" + sources."oauth-sign-0.2.0" + sources."object-assign-1.0.0" + sources."once-1.4.0" + sources."open-0.0.5" + sources."optimist-0.6.1" + sources."options-0.0.6" + sources."optjs-3.2.2" + sources."pad-0.0.5" + sources."parse-json-2.2.0" + sources."parse-torrent-5.8.3" + sources."parse-torrent-file-4.1.0" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-type-1.1.0" + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { + dependencies = [ + sources."bncode-0.2.3" + ]; + }) + (sources."peerflix-0.34.0" // { + dependencies = [ + sources."bencode-0.7.0" + sources."debug-3.1.0" + sources."end-of-stream-0.1.5" + sources."get-stdin-5.0.1" + sources."isarray-1.0.0" + sources."magnet-uri-4.2.3" + sources."minimist-0.0.10" + sources."object-assign-4.1.1" + sources."once-1.2.0" + sources."parse-torrent-file-2.1.4" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.1.1" + sources."thirty-two-0.0.2" + sources."thunky-1.0.2" + sources."ultron-1.0.2" + ]; + }) + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + (sources."playerui-1.3.0" // { + dependencies = [ + sources."ansi-regex-0.2.1" + sources."ansi-styles-1.1.0" + sources."chalk-0.5.1" + sources."has-ansi-0.1.0" + sources."strip-ansi-0.3.0" + sources."supports-color-0.2.0" + ]; + }) + sources."plist-3.0.1" + sources."process-nextick-args-2.0.0" + sources."promiscuous-0.6.0" + sources."protobufjs-3.8.2" + sources."pump-0.3.5" + sources."qap-3.3.1" + sources."qs-0.5.6" + sources."query-string-1.0.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" + sources."random-iterate-1.0.1" + sources."randombytes-2.0.6" + sources."range-parser-1.2.0" + sources."rc-0.4.0" + sources."re-emitter-1.1.3" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + (sources."read-torrent-1.3.0" // { + dependencies = [ + sources."bencode-0.7.0" + sources."magnet-uri-2.0.1" + sources."mime-1.2.11" + (sources."parse-torrent-4.1.0" // { + dependencies = [ + sources."magnet-uri-4.2.3" + ]; + }) + sources."parse-torrent-file-2.1.4" + sources."thirty-two-0.0.2" + ]; + }) + sources."readable-stream-1.1.14" + sources."readline2-0.1.1" + sources."redent-1.0.0" + sources."repeating-2.0.1" + sources."request-2.16.6" + sources."rimraf-2.6.2" + sources."router-0.6.2" + sources."run-parallel-1.1.8" + sources."run-series-1.1.6" + sources."rusha-0.8.13" + sources."rx-2.5.3" + sources."safe-buffer-5.1.1" + sources."sax-1.2.4" + sources."semver-5.5.0" + sources."signal-exit-3.0.2" + sources."simple-concat-1.0.0" + sources."simple-get-2.7.0" + sources."simple-peer-6.4.4" + sources."simple-sha1-2.1.0" + (sources."simple-websocket-4.3.1" // { + dependencies = [ + sources."ws-2.3.1" + ]; + }) + sources."single-line-log-0.4.1" + sources."sntp-0.1.4" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."speedometer-0.1.4" + (sources."srt2vtt-1.3.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."stream-transcoder-0.0.5" + sources."string2compact-1.2.2" + sources."string_decoder-0.10.31" + sources."strip-ansi-2.0.1" + sources."strip-bom-2.0.0" + sources."strip-indent-1.0.1" + sources."strip-json-comments-0.1.3" + sources."supports-color-1.3.1" + sources."thirty-two-1.0.2" + sources."through-2.3.8" + sources."thunky-0.1.0" + sources."time-line-1.0.1" + (sources."torrent-discovery-5.4.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."torrent-piece-1.1.1" + (sources."torrent-stream-1.0.4" // { + dependencies = [ + sources."bencode-0.8.0" + sources."debug-2.6.9" + sources."minimist-0.0.8" + sources."once-1.3.3" + sources."parse-torrent-4.1.0" + ]; + }) + sources."trim-newlines-1.0.0" + sources."tunnel-agent-0.2.0" + sources."typedarray-0.0.6" + sources."ultron-1.1.1" + sources."underscore-1.6.0" + sources."uniq-1.0.1" + sources."utfx-1.0.1" + sources."util-deprecate-1.0.2" + sources."utp-0.0.7" + sources."validate-npm-package-license-3.0.3" + sources."voc-1.1.0" + sources."ware-1.3.0" + sources."windows-no-runnable-0.0.6" + sources."wordwrap-0.0.3" + sources."wrap-fn-0.1.5" + sources."wrappy-1.0.2" + sources."ws-1.1.5" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xmldom-0.1.27" + sources."xspfr-0.3.1" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "commandline chromecast player"; + homepage = "https://github.com/xat/castnow#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + clean-css = nodeEnv.buildNodePackage { + name = "clean-css"; + packageName = "clean-css"; + version = "4.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz"; + sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a"; + }; + dependencies = [ + sources."source-map-0.5.7" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A well-tested CSS minifier"; + homepage = https://github.com/jakubpawlowicz/clean-css; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + coffee-script = nodeEnv.buildNodePackage { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Unfancy JavaScript"; + homepage = http://coffeescript.org/; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + coinmon = nodeEnv.buildNodePackage { + name = "coinmon"; + packageName = "coinmon"; + version = "0.0.22"; + src = fetchurl { + url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.22.tgz"; + sha512 = "3m2wqxac3lyi8f7hyfq4cp402194lv8mx6izc2qjvabi7s2yxhiwsj8dnam628hpbbgrjixfi37biv7g5wrykc5vha9x7dcp1nzj8i2"; + }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" + sources."axios-0.17.1" + sources."chalk-2.3.2" + sources."cli-cursor-2.1.0" + sources."cli-spinners-1.3.1" + sources."cli-table2-0.2.0" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."colors-1.2.1" + sources."commander-2.15.1" + sources."debug-3.1.0" + sources."escape-string-regexp-1.0.5" + sources."follow-redirects-1.4.1" + sources."has-flag-3.0.0" + sources."humanize-plus-1.8.2" + sources."is-buffer-1.1.6" + sources."is-fullwidth-code-point-1.0.0" + sources."lodash-3.10.1" + sources."log-symbols-2.2.0" + sources."mimic-fn-1.2.0" + sources."ms-2.0.0" + sources."number-is-nan-1.0.1" + sources."onetime-2.0.1" + sources."ora-1.4.0" + sources."restore-cursor-2.0.0" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-5.3.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A cryptocurrency price monitoring tool"; + homepage = "https://github.com/bichenkk/coinmon#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + configurable-http-proxy = nodeEnv.buildNodePackage { + name = "configurable-http-proxy"; + packageName = "configurable-http-proxy"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-3.1.1.tgz"; + sha512 = "13wdwd1dgc2laqsv0mjz91pz1mmfy0c0ihbgvmd4lqi6v5gas17cp85885nkdz2y5w87yizqlb2w4l04bbxwvcw6spaq2aw5q3z3rvv"; + }; + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + sources."commander-2.13.0" + sources."cycle-1.0.3" + sources."eventemitter3-1.2.0" + sources."eyes-0.1.8" + sources."http-proxy-1.16.2" + sources."isstream-0.1.2" + sources."lynx-0.2.0" + sources."mersenne-0.0.4" + sources."requires-port-1.0.0" + sources."stack-trace-0.0.10" + sources."statsd-parser-0.0.4" + sources."strftime-0.10.0" + sources."winston-2.4.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A configurable-on-the-fly HTTP Proxy"; + homepage = "https://github.com/jupyterhub/configurable-http-proxy#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; + cordova = nodeEnv.buildNodePackage { + name = "cordova"; + packageName = "cordova"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova/-/cordova-8.0.0.tgz"; + sha1 = "2e8446d9493caafd870b1090785e7f03e2ae6a43"; + }; + dependencies = [ + sources."JSONStream-1.3.2" + sources."abbrev-1.1.1" + sources."accepts-1.3.5" + sources."acorn-5.5.3" + sources."acorn-node-1.3.0" + sources."aliasify-2.1.0" + sources."ansi-0.3.1" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."array-filter-0.0.1" + sources."array-flatten-1.1.1" + sources."array-map-0.0.0" + sources."array-reduce-0.0.0" + sources."asn1-0.2.3" + sources."asn1.js-4.10.1" + sources."assert-1.4.1" + sources."assert-plus-0.2.0" + sources."astw-2.2.0" + sources."async-1.5.2" + sources."asynckit-0.4.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bcrypt-pbkdf-1.0.1" + sources."big-integer-1.6.27" + sources."block-stream-0.0.9" + sources."bn.js-4.11.8" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) + sources."boom-2.10.1" + sources."bplist-creator-0.0.7" + sources."bplist-parser-0.1.1" + sources."brace-expansion-1.1.11" + sources."brorand-1.1.0" + sources."browser-pack-6.1.0" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + (sources."browserify-14.4.0" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.0" + sources."browserify-des-1.0.0" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-transform-tools-1.7.0" + sources."browserify-zlib-0.1.4" + sources."buffer-5.1.0" + sources."buffer-from-1.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" + sources."builtins-1.0.3" + sources."bytes-3.0.0" + sources."cached-path-relative-1.0.1" + sources."caseless-0.11.0" + sources."chalk-1.1.3" + sources."cipher-base-1.0.4" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" + sources."code-point-at-1.1.0" + sources."combine-source-map-0.8.0" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."compressible-2.0.13" + sources."compression-1.7.2" + sources."concat-map-0.0.1" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" + ]; + }) + sources."configstore-2.1.0" + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."convert-source-map-1.1.3" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."cordova-app-hello-world-3.12.0" + sources."cordova-common-2.2.1" + sources."cordova-create-1.1.2" + (sources."cordova-fetch-1.3.0" // { + dependencies = [ + sources."q-1.5.1" + sources."shelljs-0.7.8" + ]; + }) + (sources."cordova-js-4.2.2" // { + dependencies = [ + sources."acorn-5.5.3" + sources."isarray-2.0.4" + ]; + }) + (sources."cordova-lib-8.0.0" // { + dependencies = [ + sources."acorn-4.0.13" + sources."base64-js-1.2.3" + sources."glob-7.1.1" + sources."hash-base-2.0.2" + sources."isarray-1.0.0" + sources."minimist-1.2.0" + sources."nopt-4.0.1" + (sources."plist-2.0.1" // { + dependencies = [ + sources."base64-js-1.1.2" + ]; + }) + sources."process-nextick-args-2.0.0" + sources."q-1.0.1" + sources."qs-6.3.2" + sources."shelljs-0.3.0" + sources."uuid-3.2.1" + sources."xmlbuilder-8.2.2" + ]; + }) + sources."cordova-registry-mapper-1.1.15" + (sources."cordova-serve-2.0.0" // { + dependencies = [ + sources."shelljs-0.5.3" + ]; + }) + sources."core-util-is-1.0.2" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" + sources."cryptiles-2.0.5" + sources."crypto-browserify-3.12.0" + sources."dashdash-1.14.1" + sources."date-now-0.1.4" + sources."debug-2.6.9" + sources."deep-extend-0.4.2" + sources."defined-1.0.0" + sources."delayed-stream-1.0.0" + (sources."dep-graph-1.1.0" // { + dependencies = [ + sources."underscore-1.2.1" + ]; + }) + sources."depd-1.1.2" + (sources."dependency-ls-1.1.1" // { + dependencies = [ + sources."q-1.4.1" + ]; + }) + sources."deps-sort-2.0.0" + sources."des.js-1.0.0" + sources."destroy-1.0.4" + sources."detect-indent-5.0.0" + sources."detective-4.7.1" + sources."diffie-hellman-5.0.2" + sources."domain-browser-1.1.7" + sources."dot-prop-3.0.0" + sources."duplexer2-0.1.4" + sources."duplexify-3.5.4" + sources."ecc-jsbn-0.1.1" + sources."editor-1.0.0" + sources."ee-first-1.1.1" + sources."elementtree-0.1.6" + sources."elliptic-6.4.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."events-1.1.1" + sources."evp_bytestokey-1.0.3" + sources."exit-hook-1.1.1" + sources."express-4.16.3" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."falafel-2.1.0" + sources."figures-1.7.0" + sources."finalhandler-1.1.1" + sources."foreach-2.0.5" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" + sources."function-bind-1.1.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."getpass-0.1.7" + sources."glob-5.0.15" + sources."got-3.3.1" + sources."graceful-fs-4.1.11" + sources."har-validator-2.0.6" + sources."has-1.0.1" + sources."has-ansi-2.0.0" + sources."hash-base-3.0.4" + sources."hash.js-1.1.3" + sources."hawk-3.1.3" + sources."hmac-drbg-1.0.1" + sources."hoek-2.16.3" + sources."hosted-git-info-2.6.0" + sources."htmlescape-1.1.1" + sources."http-errors-1.6.3" + sources."http-signature-1.1.1" + sources."https-browserify-1.0.0" + sources."iconv-lite-0.4.19" + sources."ieee754-1.1.11" + sources."imurmurhash-0.1.4" + sources."indexof-0.0.1" + sources."infinity-agent-2.0.3" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."init-package-json-1.10.3" + sources."inline-source-map-0.6.2" + sources."inquirer-0.10.1" + (sources."insert-module-globals-7.0.6" // { + dependencies = [ + sources."concat-stream-1.6.2" + ]; + }) + (sources."insight-0.8.4" // { + dependencies = [ + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."minimist-1.2.0" + sources."mute-stream-0.0.5" + sources."uuid-3.2.1" + ]; + }) + sources."interpret-1.1.0" + sources."ipaddr.js-1.6.0" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" + sources."is-npm-1.0.0" + sources."is-obj-1.0.1" + sources."is-property-1.0.2" + sources."is-redirect-1.0.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-url-1.2.4" + sources."isarray-0.0.1" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" + sources."json-stable-stringify-0.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonify-0.0.0" + sources."jsonparse-1.3.1" + sources."jsonpointer-4.0.1" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."labeled-stream-splicer-2.0.1" + sources."latest-version-1.0.1" + sources."lexical-scope-1.2.0" + sources."lodash-3.10.1" + sources."lodash._getnative-3.9.1" + sources."lodash.debounce-3.1.1" + sources."lodash.memoize-3.0.4" + sources."lowercase-keys-1.0.1" + sources."md5.js-1.3.4" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."miller-rabin-4.0.1" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."module-deps-4.1.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."negotiator-0.6.1" + sources."nested-error-stacks-1.0.2" + sources."nopt-3.0.1" + sources."normalize-package-data-2.4.0" + sources."npm-package-arg-6.0.0" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."object-keys-1.0.11" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."open-0.0.5" + sources."opener-1.4.2" + sources."os-browserify-0.1.2" + sources."os-homedir-1.0.2" + sources."os-name-1.0.3" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."osx-release-1.1.0" + sources."package-json-1.2.0" + sources."pako-0.2.9" + sources."parents-1.0.1" + sources."parse-asn1-5.1.0" + sources."parseurl-1.3.2" + sources."path-browserify-0.0.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.5" + sources."path-platform-0.11.15" + sources."path-to-regexp-0.1.7" + sources."pbkdf2-3.0.14" + sources."pegjs-0.10.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."plist-1.2.0" + sources."prepend-http-1.0.4" + sources."process-0.11.10" + sources."process-nextick-args-1.0.7" + sources."promzard-0.3.0" + sources."properties-parser-0.3.1" + sources."proxy-addr-2.0.3" + sources."public-encrypt-4.0.0" + sources."punycode-1.4.1" + sources."q-1.5.1" + sources."qs-6.5.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.0.6" + sources."randomfill-1.0.4" + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" + sources."read-1.0.7" + sources."read-all-stream-3.1.0" + sources."read-only-stream-2.0.0" + sources."read-package-json-2.0.13" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."string_decoder-1.1.1" + ]; + }) + sources."readline2-1.0.1" + sources."rechoir-0.6.2" + sources."registry-url-3.1.0" + sources."repeating-1.1.3" + sources."request-2.79.0" + sources."resolve-1.7.0" + sources."restore-cursor-1.0.1" + sources."rimraf-2.6.2" + sources."ripemd160-2.0.1" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."safe-buffer-5.1.1" + sources."sax-0.3.5" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."setprototypeof-1.1.0" + sources."sha.js-2.4.11" + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + sources."shelljs-0.5.3" + sources."simple-plist-0.2.1" + sources."slash-1.0.0" + sources."slide-1.1.6" + sources."sntp-1.0.9" + sources."source-map-0.5.7" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + (sources."sshpk-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."statuses-1.4.0" + sources."stream-browserify-2.0.1" + sources."stream-buffers-2.2.0" + sources."stream-combiner2-1.1.1" + sources."stream-http-2.8.1" + sources."stream-shift-1.0.0" + sources."stream-splicer-2.0.0" + sources."string-length-1.0.1" + sources."string.prototype.codepointat-0.2.1" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."subarg-1.0.0" + sources."supports-color-2.0.0" + sources."syntax-error-1.4.0" + sources."tar-2.2.1" + sources."through-2.3.8" + sources."through2-2.0.3" + sources."timed-out-2.0.0" + sources."timers-browserify-1.4.2" + sources."to-arraybuffer-1.0.1" + sources."tough-cookie-2.3.4" + sources."tty-browserify-0.0.1" + sources."tunnel-agent-0.4.3" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.16" + sources."typedarray-0.0.6" + sources."umd-3.0.3" + sources."underscore-1.8.3" + sources."unorm-1.4.1" + sources."unpipe-1.0.0" + (sources."update-notifier-0.5.0" // { + dependencies = [ + sources."configstore-1.4.0" + sources."minimist-1.2.0" + sources."object-assign-3.0.0" + ]; + }) + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-2.0.3" + sources."valid-identifier-0.0.1" + sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-name-3.0.0" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."vm-browserify-0.0.4" + sources."win-release-1.1.1" + sources."wrappy-1.0.2" + sources."write-file-atomic-1.3.4" + (sources."xcode-1.0.0" // { + dependencies = [ + sources."uuid-3.0.1" + ]; + }) + sources."xdg-basedir-2.0.0" + sources."xmlbuilder-4.0.0" + sources."xmldom-0.1.27" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Cordova command line interface tool"; + homepage = "https://github.com/apache/cordova-cli#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = false; + }; + create-react-app = nodeEnv.buildNodePackage { + name = "create-react-app"; + packageName = "create-react-app"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz"; + sha512 = "20yr02pv4sg07navr76mzp7fkna2n0ja4k08glrka1x021xm9fykay2gbyrjjkclavb12pkfs01j6y6mpd3yfsxvaiacsnkqz70hxmy"; + }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."balanced-match-1.0.0" + sources."block-stream-0.0.9" + sources."brace-expansion-1.1.11" + sources."buffer-from-0.1.2" + sources."builtins-1.0.3" + sources."chalk-1.1.3" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."cross-spawn-4.0.2" + sources."debug-2.6.9" + sources."duplexer2-0.0.2" + sources."envinfo-3.4.2" + sources."escape-string-regexp-1.0.5" + sources."fs-extra-1.0.0" + sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" + sources."fstream-ignore-1.0.5" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."has-ansi-2.0.0" + (sources."hyperquest-2.1.3" // { + dependencies = [ + sources."readable-stream-1.0.34" + ]; + }) + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."lru-cache-4.1.2" + sources."macos-release-1.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."once-1.4.0" + sources."os-name-2.0.1" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."readable-stream-1.1.14" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."string_decoder-0.10.31" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."tar-2.2.1" + (sources."tar-pack-3.4.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."minimist-0.0.8" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."through2-0.6.5" + sources."tmp-0.0.31" + sources."uid-number-0.0.6" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-name-3.0.0" + sources."which-1.3.0" + sources."win-release-1.1.1" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Create React apps with no build configuration."; + homepage = "https://github.com/facebookincubator/create-react-app#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + create-react-native-app = nodeEnv.buildNodePackage { + name = "create-react-native-app"; + packageName = "create-react-native-app"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-1.0.0.tgz"; + sha1 = "fc6046f4407bde2727ce0c4eb1354bb1a8c0f9e6"; + }; + dependencies = [ + sources."ansi-styles-3.2.1" + sources."babel-runtime-6.26.0" + sources."chalk-2.3.2" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."core-js-2.5.5" + sources."cross-spawn-5.1.0" + sources."escape-string-regexp-1.0.5" + sources."fs-extra-4.0.3" + sources."graceful-fs-4.1.11" + sources."has-flag-3.0.0" + sources."isexe-2.0.0" + sources."jsonfile-4.0.0" + sources."lru-cache-4.1.2" + sources."minimist-1.2.0" + sources."path-exists-3.0.0" + sources."pseudomap-1.0.2" + sources."regenerator-runtime-0.11.1" + sources."semver-5.5.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."source-map-0.5.7" + sources."source-map-support-0.4.18" + sources."supports-color-5.3.0" + sources."universalify-0.1.1" + sources."which-1.3.0" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Create React Native apps with no build configuration."; + homepage = https://github.com/react-community/create-react-native-app; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; + csslint = nodeEnv.buildNodePackage { + name = "csslint"; + packageName = "csslint"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz"; + sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; + }; + dependencies = [ + sources."clone-2.1.2" + sources."parserlib-1.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CSSLint"; + homepage = http://csslint.net/; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + dat = nodeEnv.buildNodePackage { + name = "dat"; + packageName = "dat"; + version = "13.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz"; + sha512 = "05s22v6dv8mgh50m49cadbiw6ykzjl9q81j3zd4zw5zvpj9zl8xbpazw7kbyvzh58rhr6ydl44llghkl24vpn564gqbig3gnxxgmh8z"; + }; + dependencies = [ + sources."abstract-random-access-1.1.2" + sources."ajv-5.5.2" + sources."ansi-diff-stream-1.2.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-1.3.2" + sources."ap-0.1.0" + sources."append-tree-2.4.1" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-lru-1.1.1" + sources."array-unique-0.2.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-0.9.2" + sources."asynckit-0.4.0" + sources."atomic-batcher-1.0.2" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."bencode-1.0.0" + sources."bitfield-rle-2.1.0" + (sources."bittorrent-dht-7.10.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."blake2b-2.1.2" + sources."blake2b-wasm-1.1.7" + sources."body-0.1.0" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" + sources."buffer-indexof-1.1.1" + sources."bulk-write-stream-1.1.4" + sources."bytes-3.0.0" + sources."call-me-maybe-1.0.1" + sources."caseless-0.12.0" + sources."chalk-2.3.2" + sources."circular-append-file-1.0.1" + sources."cli-truncate-1.1.0" + sources."cliclopts-1.1.1" + sources."co-4.6.0" + sources."codecs-1.2.1" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."colors-1.2.1" + sources."combined-stream-1.0.6" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."connections-1.4.2" + sources."content-types-0.1.0" + sources."core-util-is-1.0.2" + sources."corsify-2.1.0" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."cycle-1.0.3" + sources."dashdash-1.14.1" + sources."dat-dns-1.3.2" + (sources."dat-doctor-1.3.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" + sources."lru-2.0.1" + sources."multicast-dns-6.2.3" + sources."pump-1.0.3" + ]; + }) + sources."dat-encoding-5.0.1" + sources."dat-ignore-2.1.1" + (sources."dat-json-1.0.2" // { + dependencies = [ + sources."dat-encoding-4.0.2" + sources."debug-2.6.9" + ]; + }) + (sources."dat-link-resolve-2.1.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."dat-log-1.1.1" // { + dependencies = [ + sources."process-nextick-args-1.0.7" + ]; + }) + (sources."dat-node-3.5.8" // { + dependencies = [ + sources."buffer-alloc-unsafe-0.1.1" + sources."minimist-0.0.8" + sources."process-nextick-args-1.0.7" + sources."pump-1.0.3" + sources."unordered-set-2.0.0" + sources."varint-5.0.0" + ]; + }) + sources."dat-registry-4.0.0" + sources."dat-secret-storage-4.0.1" + sources."dat-storage-1.0.4" + sources."dat-swarm-defaults-1.0.0" + sources."datland-swarm-defaults-1.0.2" + sources."debug-3.1.0" + sources."deep-equal-0.2.2" + sources."delayed-stream-1.0.0" + sources."directory-index-html-2.1.0" + (sources."discovery-channel-5.5.1" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) + (sources."discovery-swarm-4.4.2" // { + dependencies = [ + (sources."dns-discovery-6.1.0" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) + sources."thunky-0.1.0" + ]; + }) + sources."dns-discovery-5.6.1" + sources."dns-packet-4.2.0" + sources."dns-socket-3.0.0" + sources."dns-txt-2.0.2" + sources."dom-walk-0.1.1" + sources."duplexify-3.5.4" + sources."ecc-jsbn-0.1.1" + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."extend-3.0.1" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-read-stream-1.1.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + sources."flat-tree-1.6.0" + sources."for-each-0.3.2" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."from2-2.3.0" + sources."fs.realpath-1.0.0" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."global-4.3.2" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-flag-3.0.0" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-methods-0.1.0" + sources."http-signature-1.2.0" + (sources."hypercore-6.13.0" // { + dependencies = [ + sources."varint-5.0.0" + ]; + }) + sources."hypercore-protocol-6.6.4" + (sources."hyperdrive-9.12.3" // { + dependencies = [ + sources."varint-4.0.1" + ]; + }) + sources."hyperdrive-http-4.2.2" + sources."hyperdrive-network-speed-2.1.0" + sources."i-0.3.6" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ip-1.1.5" + sources."is-buffer-1.1.6" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-function-1.0.1" + sources."is-glob-2.0.1" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-string-1.0.4" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isobject-2.1.0" + sources."isstream-0.1.2" + sources."iterators-0.1.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."k-bucket-3.3.1" + (sources."k-rpc-4.3.1" // { + dependencies = [ + sources."bencode-2.0.0" + sources."k-bucket-4.0.0" + ]; + }) + sources."k-rpc-socket-1.8.0" + sources."kind-of-3.2.2" + sources."last-one-wins-1.0.4" + sources."length-prefixed-message-3.0.3" + sources."lodash.flattendeep-4.4.0" + sources."lodash.throttle-4.1.1" + sources."lru-3.1.0" + sources."memory-pager-1.1.0" + sources."merkle-tree-stream-3.0.3" + sources."micromatch-2.3.11" + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."min-document-2.19.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mirror-folder-2.1.1" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."multi-random-access-2.1.1" + sources."multicast-dns-7.0.0" + sources."multicb-1.2.2" + sources."multistream-2.1.0" + sources."mute-stream-0.0.7" + sources."mutexify-1.2.0" + sources."nan-2.10.0" + sources."nanoassert-1.1.0" + sources."nanobus-3.3.0" + sources."nanotiming-1.0.1" + sources."ncp-1.0.1" + (sources."neat-log-1.1.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."nets-3.2.0" + sources."network-address-1.1.2" + sources."node-gyp-build-3.3.0" + sources."normalize-path-2.1.1" + sources."oauth-sign-0.8.2" + sources."object.omit-2.0.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."parse-glob-3.0.4" + sources."parse-headers-2.0.1" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."pkginfo-0.4.1" + sources."preserve-0.2.0" + sources."prettier-bytes-1.0.4" + sources."pretty-hash-1.0.1" + sources."process-0.5.2" + sources."process-nextick-args-2.0.0" + sources."progress-string-1.2.2" + (sources."prompt-1.0.0" // { + dependencies = [ + sources."async-1.0.0" + ]; + }) + sources."protocol-buffers-encodings-1.1.0" + sources."pump-2.0.1" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."random-access-file-2.0.1" + sources."random-access-memory-2.4.0" + sources."random-access-storage-1.1.1" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."randombytes-2.0.6" + sources."range-parser-1.2.0" + sources."read-1.0.7" + sources."readable-stream-2.3.6" + sources."recursive-watch-1.1.4" + sources."regex-cache-0.4.4" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."request-2.85.0" + sources."revalidator-0.1.8" + sources."rimraf-2.6.2" + sources."rusha-0.8.13" + sources."safe-buffer-5.1.1" + sources."signed-varint-2.0.1" + sources."simple-sha1-2.1.0" + sources."siphash24-1.1.0" + sources."slice-ansi-1.0.0" + sources."sntp-2.1.0" + sources."sodium-javascript-0.5.5" + sources."sodium-native-2.1.5" + sources."sodium-universal-2.0.0" + sources."sorted-array-functions-1.1.0" + sources."sorted-indexof-1.0.0" + sources."sparse-bitfield-3.0.3" + sources."speedometer-1.0.0" + sources."sshpk-1.14.1" + sources."stack-trace-0.0.10" + sources."status-logger-3.1.1" + sources."stream-collector-1.0.1" + sources."stream-each-1.2.2" + sources."stream-parser-0.3.1" + sources."stream-shift-1.0.0" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-4.0.0" + (sources."subcommand-2.1.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."supports-color-5.3.0" + (sources."throttle-1.0.3" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."through2-2.0.3" + sources."thunky-1.0.2" + sources."to-buffer-1.1.0" + sources."toiletdb-1.4.1" + sources."tough-cookie-2.3.4" + sources."township-client-1.3.2" + sources."trim-0.0.1" + sources."ttl-1.3.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."uint64be-2.0.2" + sources."unixify-1.0.0" + sources."unordered-array-remove-1.0.2" + sources."unordered-set-1.1.0" + sources."untildify-3.0.2" + sources."util-deprecate-1.0.2" + sources."utile-0.3.0" + sources."utp-native-1.7.0" + sources."uuid-3.2.1" + sources."varint-3.0.1" + sources."verror-1.10.0" + (sources."winston-2.1.1" // { + dependencies = [ + sources."colors-1.0.3" + sources."pkginfo-0.3.1" + ]; + }) + sources."wrap-ansi-3.0.1" + sources."wrappy-1.0.2" + sources."xhr-2.4.1" + sources."xsalsa20-1.0.2" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Dat is the package manager for data. Easily share and version control data."; + homepage = https://datproject.org/; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; + dhcp = nodeEnv.buildNodePackage { + name = "dhcp"; + packageName = "dhcp"; + version = "0.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.11.tgz"; + sha512 = "287rcz01q13rn3b83ds5kh05l176wag4p9vxxzrx3q63nhjmy6pvkxf1c1d7k0bd8r8nhqdldn5f1p50r4a1y1ybgy9zz0gqfbwb0d7"; + }; + dependencies = [ + sources."minimist-1.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A DHCP server written in JavaScript"; + homepage = https://github.com/infusion/node-dhcp; + license = "MIT OR GPL-2.0"; + }; + production = true; + bypassCache = false; + }; + dnschain = nodeEnv.buildNodePackage { + name = "dnschain"; + packageName = "dnschain"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dnschain/-/dnschain-0.5.3.tgz"; + sha1 = "9b21d9ac5e203295f372ac37df470e9f0854c470"; + }; + dependencies = [ + sources."accepts-1.2.13" + sources."assert-plus-1.0.0" + sources."async-0.9.2" + sources."better-curry-1.6.0" + sources."binaryheap-0.0.3" + sources."bindings-1.3.0" + sources."bluebird-2.9.9" + sources."bottleneck-1.5.3" + sources."buffercursor-0.0.12" + sources."colors-0.6.2" + sources."combined-stream-0.0.7" + sources."component-emitter-1.1.2" + sources."content-disposition-0.5.0" + sources."cookie-0.1.2" + sources."cookie-signature-1.0.5" + sources."cookiejar-2.0.1" + sources."core-util-is-1.0.2" + sources."crc-3.2.1" + sources."cycle-1.0.3" + sources."debug-2.1.3" + sources."delayed-stream-0.0.5" + sources."depd-1.0.1" + sources."destroy-1.0.3" + sources."duplexer-0.1.1" + sources."ee-first-1.1.0" + sources."es5class-2.3.1" + sources."escape-html-1.0.1" + sources."etag-1.5.1" + sources."event-stream-3.2.2" + sources."eventemitter3-0.1.6" + (sources."express-4.11.2" // { + dependencies = [ + sources."mime-db-1.12.0" + sources."mime-types-2.0.14" + ]; + }) + sources."extend-1.2.1" + sources."extsprintf-1.4.0" + sources."eyes-0.1.8" + sources."faye-websocket-0.11.1" + sources."finalhandler-0.3.3" + sources."form-data-0.1.3" + sources."formidable-1.0.14" + sources."forwarded-0.1.2" + sources."fresh-0.2.4" + sources."from-0.1.7" + sources."hiredis-0.4.1" + sources."http-parser-js-0.4.11" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ipaddr.js-1.0.5" + sources."isarray-0.0.1" + (sources."json-rpc2-0.8.1" // { + dependencies = [ + sources."debug-1.0.5" + sources."lodash-2.4.2" + sources."ms-2.0.0" + ]; + }) + sources."jsonparse-0.0.6" + sources."lodash-3.1.0" + sources."map-stream-0.1.0" + sources."media-typer-0.3.0" + sources."merge-descriptors-0.0.2" + sources."methods-1.1.2" + sources."mime-1.2.11" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimist-0.0.10" + sources."ms-0.7.0" + sources."nan-2.10.0" + (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { + dependencies = [ + sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" + ]; + }) + (sources."native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" // { + dependencies = [ + sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" + ]; + }) + sources."native-dns-packet-0.1.1" + sources."nconf-0.7.1" + sources."negotiator-0.5.3" + sources."on-finished-2.2.1" + sources."optimist-0.6.1" + sources."parseurl-1.3.2" + sources."path-to-regexp-0.1.3" + sources."pause-stream-0.0.11" + sources."pkginfo-0.3.1" + sources."properties-1.2.1" + sources."proxy-addr-1.0.10" + sources."qs-2.3.3" + sources."range-parser-1.0.3" + sources."readable-stream-1.0.27-1" + sources."redis-0.12.1" + sources."reduce-component-1.0.1" + sources."send-0.11.1" + sources."serve-static-1.8.1" + sources."split-0.3.3" + sources."stack-trace-0.0.10" + sources."stream-combiner-0.0.4" + sources."string-2.0.1" + sources."string_decoder-0.10.31" + (sources."superagent-0.21.0" // { + dependencies = [ + sources."methods-1.0.1" + sources."qs-1.2.0" + ]; + }) + sources."through-2.3.8" + sources."type-is-1.5.7" + sources."utils-merge-1.0.0" + sources."vary-1.0.1" + sources."verror-1.10.0" + sources."websocket-driver-0.7.0" + sources."websocket-extensions-0.1.3" + (sources."winston-0.8.0" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."wordwrap-0.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; + homepage = https://github.com/okTurtles/dnschain; + license = "MPL-2.0"; + }; + production = true; + bypassCache = false; + }; + docker-registry-server = nodeEnv.buildNodePackage { + name = "docker-registry-server"; + packageName = "docker-registry-server"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/docker-registry-server/-/docker-registry-server-2.2.0.tgz"; + sha1 = "5b98836cd7f0348f7f472f7f5a42dd3cab231731"; + }; + dependencies = [ + sources."JSONStream-0.8.4" + sources."abstract-leveldown-0.12.4" + sources."basic-auth-1.1.0" + sources."bindings-1.2.1" + sources."bl-0.8.2" + sources."bytewise-1.1.0" + sources."bytewise-core-1.2.3" + sources."cookie-signature-1.1.0" + sources."core-util-is-1.0.2" + sources."cors-2.8.4" + sources."deferred-leveldown-0.2.0" + sources."docker-parse-image-3.0.1" + sources."duplexify-3.5.4" + sources."end-of-stream-1.4.1" + (sources."errno-0.1.7" // { + dependencies = [ + sources."prr-1.0.1" + ]; + }) + sources."from2-1.3.0" + (sources."fs-blob-store-5.2.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."inherits-2.0.3" + sources."isarray-0.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonparse-0.0.5" + sources."level-0.18.0" + sources."level-packager-0.18.0" + sources."level-post-1.0.7" + (sources."level-sublevel-6.6.1" // { + dependencies = [ + (sources."levelup-0.19.1" // { + dependencies = [ + sources."xtend-3.0.0" + ]; + }) + sources."looper-3.0.0" + sources."readable-stream-1.0.34" + ]; + }) + sources."leveldown-0.10.6" + (sources."levelup-0.18.6" // { + dependencies = [ + sources."readable-stream-1.0.34" + sources."semver-2.3.2" + sources."xtend-3.0.0" + ]; + }) + sources."lexicographic-integer-1.1.0" + sources."looper-2.0.0" + sources."lru-cache-2.7.3" + sources."ltgt-2.1.3" + (sources."memdown-0.10.2" // { + dependencies = [ + sources."ltgt-1.0.2" + ]; + }) + sources."minimist-0.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."murl-0.4.1" + sources."nan-2.1.0" + (sources."ndjson-1.5.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."minimist-1.2.0" + sources."readable-stream-2.3.6" + sources."split2-2.2.0" + sources."string_decoder-1.1.1" + sources."through2-2.0.3" + ]; + }) + sources."network-address-0.0.5" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."process-nextick-args-2.0.0" + sources."protein-0.5.0" + sources."prr-0.0.0" + sources."pull-cat-1.1.11" + sources."pull-level-2.0.4" + sources."pull-live-1.0.1" + sources."pull-pushable-2.2.0" + sources."pull-stream-3.6.7" + sources."pull-window-2.1.4" + sources."pump-1.0.3" + (sources."pumpify-1.4.0" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."readable-stream-1.1.14" + sources."relative-date-1.1.3" + sources."root-2.0.0" + sources."safe-buffer-5.1.1" + sources."semver-5.1.1" + sources."sorted-union-stream-1.0.2" + sources."split2-0.2.1" + sources."stream-collector-1.0.1" + sources."stream-shift-1.0.0" + sources."stream-to-pull-stream-1.7.2" + sources."string_decoder-0.10.31" + (sources."tar-stream-1.5.5" // { + dependencies = [ + sources."bl-1.2.2" + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."through-2.3.8" + (sources."through2-0.6.5" // { + dependencies = [ + sources."readable-stream-1.0.34" + ]; + }) + sources."thunky-0.1.0" + sources."typewise-1.0.3" + sources."typewise-core-1.2.0" + sources."typewiselite-1.0.0" + sources."util-deprecate-1.0.2" + sources."vary-1.1.2" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "docker registry server implemented in node"; + homepage = https://github.com/mafintosh/docker-registry-server; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + elasticdump = nodeEnv.buildNodePackage { + name = "elasticdump"; + packageName = "elasticdump"; + version = "3.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.8.tgz"; + sha512 = "3bahinp16ajfxy06ihrl022906h6zdxhsgmwh28k1p04blzqzgddbryx4l1a8ncg5fdjlj7ka9k3f6lam68fanjw4093hgyns7iclf4"; + }; + dependencies = [ + sources."JSONStream-1.3.2" + sources."ajv-5.5.2" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-2.6.0" + sources."asynckit-0.4.0" + sources."aws-sdk-2.223.1" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."base64-js-1.2.3" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-4.3.1" + sources."buffer-4.9.1" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."combined-stream-1.0.6" + sources."core-util-is-1.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."events-1.1.1" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."getpass-0.1.7" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" + sources."ieee754-1.1.8" + sources."ini-1.3.5" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."jmespath-0.15.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" + sources."lodash-4.17.5" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimist-0.0.10" + sources."oauth-sign-0.8.2" + sources."optimist-0.6.1" + sources."performance-now-2.1.0" + sources."punycode-1.3.2" + sources."qs-6.5.1" + sources."querystring-0.2.0" + (sources."request-2.85.0" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."safe-buffer-5.1.1" + sources."sax-1.2.1" + sources."sntp-2.1.0" + sources."sshpk-1.14.1" + sources."stringstream-0.0.5" + sources."through-2.3.8" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."url-0.10.3" + sources."uuid-3.1.0" + sources."verror-1.10.0" + sources."wordwrap-0.0.3" + sources."xml2js-0.4.17" + sources."xmlbuilder-4.2.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "import and export tools for elasticsearch"; + homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = false; + }; + elm-test = nodeEnv.buildNodePackage { + name = "elm-test"; + packageName = "elm-test"; + version = "0.18.12"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.12.tgz"; + sha512 = "1rcghwzkjcs25iz7dvfjxkwkn35jd7vyfs9idwncz2zvasyy1nkkpg6rcgilciwppccd29j2yrdzp95nddnh8lpqz41aiw2z0v6wzg6"; + }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-1.3.2" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-unique-0.2.1" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."async-each-1.0.1" + sources."asynckit-0.4.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."binary-extensions-1.11.0" + (sources."binstall-1.2.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."minimist-0.0.8" + sources."supports-color-2.0.0" + ]; + }) + sources."block-stream-0.0.9" + sources."boom-2.10.1" + sources."brace-expansion-1.1.11" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."caseless-0.11.0" + (sources."chalk-2.1.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + ]; + }) + sources."chokidar-1.6.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."cross-spawn-4.0.0" + sources."cryptiles-2.0.5" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."escape-string-regexp-1.0.5" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."extend-3.0.1" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + sources."find-elm-dependencies-1.0.2" + sources."find-parent-dir-0.3.0" + sources."firstline-1.2.1" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."fs-extra-0.30.0" + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.2" + sources."fstream-1.0.11" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."graceful-fs-4.1.11" + sources."har-validator-2.0.6" + sources."has-ansi-2.0.0" + sources."has-flag-2.0.0" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-property-1.0.2" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-2.1.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsonpointer-4.0.1" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" ]; }) - (sources."azure-arm-devtestlabs-0.1.0" // { + sources."kind-of-3.2.2" + sources."klaw-1.3.1" + sources."lodash-4.13.1" + sources."lru-cache-4.1.2" + sources."micromatch-2.3.11" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."murmur-hash-js-1.0.0" + sources."nan-2.10.0" + (sources."node-elm-compiler-4.3.3" // { dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" + sources."firstline-1.2.0" + sources."lodash-4.14.2" + sources."rimraf-2.2.8" ]; }) - sources."azure-graph-2.1.0-preview" - sources."azure-gallery-2.0.0-pre.18" - (sources."azure-keyvault-0.11.0" // { + sources."normalize-path-2.1.1" + sources."oauth-sign-0.8.2" + sources."object.omit-2.0.1" + sources."once-1.4.0" + sources."os-tmpdir-1.0.2" + sources."parse-glob-3.0.4" + sources."path-is-absolute-1.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."preserve-0.2.0" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."punycode-1.4.1" + sources."qs-6.3.2" + (sources."randomatic-1.1.7" // { dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) ]; }) - 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" - (sources."azure-monitoring-0.10.2" // { + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."regex-cache-0.4.4" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."request-2.79.0" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."set-immediate-shim-1.0.1" + sources."sntp-1.0.9" + sources."split-1.0.1" + (sources."sshpk-1.14.1" // { dependencies = [ - sources."moment-2.6.0" + sources."assert-plus-1.0.0" ]; }) - sources."azure-asm-network-0.13.0" - (sources."azure-arm-resource-1.6.1-preview" // { + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."supports-color-4.2.0" + sources."tar-2.2.1" + sources."temp-0.8.3" + sources."through-2.3.8" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.4.3" + sources."tweetnacl-0.14.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."verror-1.10.0" + sources."which-1.3.0" + sources."wrappy-1.0.2" + sources."xmlbuilder-8.2.2" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Run elm-test suites."; + homepage = "https://github.com/rtfeldman/node-test-runner#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; + emoj = nodeEnv.buildNodePackage { + name = "emoj"; + packageName = "emoj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz"; + sha512 = "06w3hpcnxg63wg262ldhw4s2shyr1f1bvilqshy88i4svamgxk0qzdhhma2rwcwq7qpjwjlr8m1z2qbmqw9faff5f8hl45yj3jxrs3z"; + }; + dependencies = [ + sources."ansi-escapes-3.1.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-2.2.1" + sources."arch-2.1.0" + sources."array-find-index-1.0.2" + sources."arrify-1.0.1" + sources."asap-2.0.6" + sources."auto-bind-1.2.0" + sources."babel-code-frame-6.26.0" + sources."babel-core-6.26.0" + sources."babel-generator-6.26.1" + sources."babel-helper-builder-react-jsx-6.26.0" + sources."babel-helpers-6.24.1" + sources."babel-messages-6.23.0" + sources."babel-plugin-syntax-jsx-6.18.0" + sources."babel-plugin-syntax-object-rest-spread-6.13.0" + sources."babel-plugin-transform-es2015-destructuring-6.23.0" + sources."babel-plugin-transform-object-rest-spread-6.26.0" + sources."babel-plugin-transform-react-jsx-6.24.1" + sources."babel-register-6.26.0" + sources."babel-runtime-6.26.0" + sources."babel-template-6.26.0" + sources."babel-traverse-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."builtin-modules-1.1.1" + sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" + sources."callsites-2.0.0" + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."chalk-1.1.3" + sources."cli-cursor-2.1.0" + sources."clipboardy-1.2.3" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."concat-map-0.0.1" + sources."conf-1.4.0" + sources."convert-source-map-1.5.1" + sources."core-js-2.5.5" + sources."cross-spawn-5.1.0" + sources."currently-unhandled-0.4.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decompress-response-3.3.0" + sources."detect-indent-4.0.0" + sources."dot-prop-4.2.0" + sources."duplexer3-0.1.4" + sources."encoding-0.1.12" + sources."env-paths-1.0.0" + sources."error-ex-1.3.1" + sources."escape-string-regexp-1.0.5" + sources."esutils-2.0.2" + sources."execa-0.8.0" + sources."fbjs-0.8.16" + sources."find-up-2.1.0" + sources."get-stdin-4.0.1" + sources."get-stream-3.0.0" + sources."globals-9.18.0" + sources."got-7.1.0" + sources."graceful-fs-4.1.11" + sources."has-ansi-3.0.0" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."home-or-tmp-2.0.0" + sources."hosted-git-info-2.6.0" + sources."iconv-lite-0.4.21" + (sources."import-jsx-1.3.0" // { dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" + sources."ansi-regex-2.1.1" + sources."has-ansi-2.0.0" ]; }) - (sources."azure-arm-storage-0.15.0-preview" // { + sources."imurmurhash-0.1.4" + sources."indent-string-3.2.0" + (sources."ink-0.3.1" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" + sources."core-js-1.2.7" + sources."strip-ansi-4.0.0" + sources."supports-color-5.3.0" + ]; + }) + sources."ink-text-input-1.1.1" + sources."invariant-2.2.4" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-2.0.0" + sources."is-obj-1.0.1" + sources."is-object-1.0.1" + sources."is-plain-obj-1.1.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-utf8-0.2.1" + sources."isexe-2.0.0" + sources."isomorphic-fetch-2.2.1" + sources."isurl-1.0.0" + sources."js-tokens-3.0.2" + sources."jsesc-1.3.0" + sources."json5-0.5.1" + sources."load-json-file-1.1.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.5" + sources."lodash.debounce-4.0.8" + sources."lodash.flattendeep-4.4.0" + sources."lodash.isequal-4.5.0" + sources."log-update-2.3.0" + sources."loose-envify-1.3.1" + sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" + sources."make-dir-1.2.0" + sources."map-obj-1.0.1" + sources."mem-1.1.0" + (sources."meow-3.7.0" // { + dependencies = [ + sources."find-up-1.1.2" + sources."indent-string-2.1.0" + sources."minimist-1.2.0" + sources."path-exists-2.1.0" + sources."pify-2.3.0" + ]; + }) + sources."mimic-fn-1.2.0" + sources."mimic-response-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."node-fetch-1.7.3" + sources."normalize-package-data-2.4.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."onetime-2.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."p-cancelable-0.3.0" + sources."p-finally-1.0.0" + sources."p-limit-1.2.0" + sources."p-locate-2.0.0" + sources."p-timeout-1.2.1" + sources."p-try-1.0.0" + sources."parse-json-2.2.0" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-type-1.1.0" + sources."pify-3.0.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkg-up-2.0.0" + sources."prepend-http-1.0.4" + sources."private-0.1.8" + sources."promise-7.3.1" + sources."prop-types-15.6.1" + sources."pseudomap-1.0.2" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."regenerator-runtime-0.11.1" + sources."repeating-2.0.1" + sources."require-from-string-1.2.1" + sources."resolve-from-3.0.0" + sources."restore-cursor-2.0.0" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."semver-5.5.0" + sources."setimmediate-1.0.5" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."skin-tone-1.0.0" + sources."slash-1.0.0" + sources."source-map-0.5.7" + sources."source-map-support-0.4.18" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-eof-1.0.0" + sources."strip-indent-1.0.1" + sources."supports-color-2.0.0" + sources."timed-out-4.0.1" + sources."to-fast-properties-1.0.3" + sources."trim-newlines-1.0.0" + sources."trim-right-1.0.1" + sources."ua-parser-js-0.7.17" + sources."unicode-emoji-modifier-base-1.0.0" + sources."url-parse-lax-1.0.0" + sources."url-to-options-1.0.1" + sources."validate-npm-package-license-3.0.3" + sources."whatwg-fetch-2.0.4" + sources."which-1.3.0" + sources."wrap-ansi-3.0.1" + sources."write-file-atomic-2.3.0" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Find relevant emoji from text on the command-line"; + homepage = "https://github.com/sindresorhus/emoj#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + eslint = nodeEnv.buildNodePackage { + name = "eslint"; + packageName = "eslint"; + version = "4.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz"; + sha512 = "0hw70vjlg6z0y9kf6vjr7g0w9hbm426fwvyzr88l62c5hd9mxrbw5v34b6zb31vbbyda3mkvcwgfnxgqaxvpn0wlrxr0va43pbzygbd"; + }; + dependencies = [ + sources."acorn-5.5.3" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) + sources."ajv-5.5.2" + sources."ajv-keywords-2.1.1" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."argparse-1.0.10" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + ]; + }) + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" + sources."caller-path-0.1.0" + sources."callsites-0.2.0" + (sources."chalk-2.3.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."supports-color-5.3.0" + ]; + }) + sources."chardet-0.4.2" + sources."circular-json-0.3.3" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."co-4.6.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."core-util-is-1.0.2" + sources."cross-spawn-5.1.0" + sources."debug-3.1.0" + sources."deep-is-0.1.3" + sources."del-2.2.2" + sources."doctrine-2.1.0" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-3.7.1" + sources."eslint-visitor-keys-1.0.0" + sources."espree-3.5.4" + sources."esprima-4.0.0" + sources."esquery-1.0.1" + sources."esrecurse-4.2.1" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."external-editor-2.2.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."figures-2.0.0" + sources."file-entry-cache-2.0.0" + sources."flat-cache-1.3.0" + sources."fs.realpath-1.0.0" + sources."functional-red-black-tree-1.0.1" + sources."glob-7.1.2" + sources."globals-11.4.0" + sources."globby-5.0.0" + sources."graceful-fs-4.1.11" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."iconv-lite-0.4.21" + sources."ignore-3.3.7" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."inquirer-3.3.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-path-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-promise-2.1.0" + sources."is-resolvable-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."js-tokens-3.0.2" + sources."js-yaml-3.11.0" + sources."json-schema-traverse-0.3.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."levn-0.3.0" + sources."lodash-4.17.5" + sources."lru-cache-4.1.2" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."natural-compare-1.4.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optionator-0.8.2" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pluralize-7.0.0" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.0" + sources."progress-2.0.0" + sources."pseudomap-1.0.2" + sources."readable-stream-2.3.6" + sources."regexpp-1.1.0" + sources."require-uncached-1.0.3" + sources."resolve-from-1.0.1" + sources."restore-cursor-2.0.0" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."semver-5.5.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slice-ansi-1.0.0" + sources."sprintf-js-1.0.3" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + (sources."strip-ansi-4.0.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + ]; + }) + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + sources."table-4.0.2" + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."type-check-0.3.2" + sources."typedarray-0.0.6" + sources."util-deprecate-1.0.2" + sources."which-1.3.0" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."write-0.2.1" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "An AST-based pattern checker for JavaScript."; + homepage = https://eslint.org/; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + eslint_d = nodeEnv.buildNodePackage { + name = "eslint_d"; + packageName = "eslint_d"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.3.0.tgz"; + sha512 = "3ljw58bs13867i67mmw78w0a2ckn0cp5kffd878czkkpg7ahbgpxxq2jcqgjvqrrm2pava47a8fli1srxgzghwfqjq400shkakpqa71"; + }; + dependencies = [ + sources."acorn-5.5.3" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) + sources."ajv-5.5.2" + sources."ajv-keywords-2.1.1" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."argparse-1.0.10" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + ]; + }) + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" + sources."caller-path-0.1.0" + sources."callsites-0.2.0" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) + sources."chardet-0.4.2" + sources."circular-json-0.3.3" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."co-4.6.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."core-util-is-1.0.2" + sources."cross-spawn-5.1.0" + sources."debug-3.1.0" + sources."deep-is-0.1.3" + sources."del-2.2.2" + sources."doctrine-2.1.0" + sources."escape-string-regexp-1.0.5" + (sources."eslint-4.19.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + (sources."chalk-2.3.2" // { + dependencies = [ + sources."supports-color-5.3.0" + ]; + }) + sources."strip-ansi-4.0.0" + sources."supports-color-2.0.0" + ]; + }) + sources."eslint-scope-3.7.1" + sources."eslint-visitor-keys-1.0.0" + sources."espree-3.5.4" + sources."esprima-4.0.0" + sources."esquery-1.0.1" + sources."esrecurse-4.2.1" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."external-editor-2.2.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."figures-2.0.0" + sources."file-entry-cache-2.0.0" + sources."flat-cache-1.3.0" + sources."fs.realpath-1.0.0" + sources."functional-red-black-tree-1.0.1" + sources."glob-7.1.2" + sources."globals-11.4.0" + sources."globby-5.0.0" + sources."graceful-fs-4.1.11" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."iconv-lite-0.4.21" + sources."ignore-3.3.7" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."inquirer-3.3.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-path-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-promise-2.1.0" + sources."is-resolvable-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."js-tokens-3.0.2" + sources."js-yaml-3.11.0" + sources."json-schema-traverse-0.3.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."levn-0.3.0" + sources."lodash-4.17.5" + sources."lru-cache-4.1.2" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."nanolru-1.0.0" + sources."natural-compare-1.4.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optionator-0.8.2" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-parse-1.0.5" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pluralize-7.0.0" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.0" + sources."progress-2.0.0" + sources."pseudomap-1.0.2" + sources."readable-stream-2.3.6" + sources."regexpp-1.1.0" + sources."require-uncached-1.0.3" + sources."resolve-1.7.0" + sources."resolve-from-1.0.1" + sources."restore-cursor-2.0.0" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."semver-5.5.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slice-ansi-1.0.0" + sources."sprintf-js-1.0.3" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + (sources."supports-color-3.2.3" // { dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" + sources."has-flag-1.0.0" ]; }) - sources."azure-asm-sb-0.10.1" - sources."azure-asm-sql-0.10.1" - sources."azure-asm-storage-0.12.0" - sources."azure-asm-subscription-0.10.1" - (sources."azure-asm-website-0.10.4" // { + sources."table-4.0.2" + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."type-check-0.3.2" + sources."typedarray-0.0.6" + sources."util-deprecate-1.0.2" + sources."which-1.3.0" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."write-0.2.1" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Makes eslint the fastest linter on the planet"; + homepage = https://github.com/mantoni/eslint_d.js; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + emojione = nodeEnv.buildNodePackage { + name = "emojione"; + packageName = "emojione"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/emojione/-/emojione-3.1.2.tgz"; + sha1 = "991e30c80db4b1cf15eacb257620a7edce9c6ef4"; + }; + buildInputs = globalBuildInputs; + meta = { + 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; + bypassCache = false; + }; + "fast-cli-1.x" = 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."ajv-5.5.2" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."array-find-index-1.0.2" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-4.3.1" + sources."builtin-modules-1.1.1" + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."caseless-0.12.0" + sources."chalk-1.1.3" + sources."cli-cursor-1.0.2" + sources."cli-spinners-1.3.1" + sources."co-4.6.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."concat-stream-1.6.0" + sources."core-util-is-1.0.2" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."moment-2.14.1" + sources."boom-5.2.0" ]; }) - (sources."azure-storage-2.1.0" // { + sources."currently-unhandled-0.4.1" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."error-ex-1.3.1" + sources."es6-promise-4.2.4" + sources."escape-string-regexp-1.0.5" + sources."exit-hook-1.1.1" + sources."extend-3.0.1" + sources."extract-zip-1.6.6" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.0.1" + sources."find-up-1.1.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-1.0.0" + sources."get-stdin-4.0.1" + sources."getpass-0.1.7" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."hasha-2.2.0" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."hosted-git-info-2.6.0" + sources."http-signature-1.2.0" + sources."indent-string-2.1.0" + sources."inherits-2.0.3" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-finite-1.0.2" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."kew-0.7.0" + sources."klaw-1.3.1" + sources."load-json-file-1.1.0" + sources."log-symbols-2.2.0" + sources."log-update-1.0.2" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."meow-3.7.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimist-1.2.0" + sources."mkdirp-0.5.0" + sources."mkpath-1.0.0" + sources."ms-2.0.0" + sources."node-phantom-simple-2.2.4" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."onetime-1.1.0" + (sources."ora-1.4.0" // { dependencies = [ - sources."readable-stream-2.0.6" - sources."validator-3.22.2" - sources."xml2js-0.2.7" + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" + sources."cli-cursor-2.1.0" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" + sources."supports-color-5.3.0" ]; }) - (sources."azure-arm-batch-0.3.0" // { + sources."os-tmpdir-1.0.2" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + (sources."phantomjs-prebuilt-2.1.16" // { dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" + sources."minimist-0.0.8" ]; }) - (sources."azure-batch-0.5.2" // { + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."process-nextick-args-2.0.0" + sources."progress-1.1.8" + sources."promise-phantom-3.1.6" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" + sources."redent-1.0.0" + sources."repeating-2.0.1" + sources."request-2.85.0" + sources."request-progress-2.0.1" + sources."restore-cursor-1.0.1" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."signal-exit-3.0.2" + sources."sntp-2.1.0" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."sshpk-1.14.1" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-indent-1.0.1" + sources."supports-color-2.0.0" + sources."throttleit-1.0.0" + sources."tmp-0.0.31" + sources."tough-cookie-2.3.4" + sources."trim-newlines-1.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-license-3.0.3" + sources."verror-1.10.0" + sources."which-1.3.0" + sources."yauzl-2.4.1" + sources."zen-observable-0.5.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Test your download speed using fast.com"; + homepage = "https://github.com/sindresorhus/fast-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + fetch-bower = nodeEnv.buildNodePackage { + name = "fetch-bower"; + packageName = "fetch-bower"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fetch-bower/-/fetch-bower-2.0.0.tgz"; + sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f"; + }; + dependencies = [ + sources."bower-1.8.4" + sources."bower-endpoint-parser-0.2.1" + sources."bower-logger-0.2.1" + sources."glob-3.2.11" + sources."inherits-2.0.3" + sources."lru-cache-2.7.3" + sources."minimatch-0.3.0" + sources."sigmund-1.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Companion to bower2nix to be used in the fetchBower fixed-output derivation"; + homepage = https://bitbucket.org/shlevy/fetch-bower; + }; + production = true; + bypassCache = false; + }; + forever = nodeEnv.buildNodePackage { + name = "forever"; + packageName = "forever"; + version = "0.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/forever/-/forever-0.15.3.tgz"; + sha1 = "77d9d7e15fd2f511ad9d84a110c7dd8fc8ecebc2"; + }; + dependencies = [ + sources."anymatch-1.3.2" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-unique-0.2.1" + sources."async-0.2.10" + sources."async-each-1.0.1" + sources."balanced-match-1.0.0" + sources."binary-extensions-1.11.0" + sources."brace-expansion-1.1.11" + (sources."braces-1.8.5" // { dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" + sources."kind-of-4.0.0" ]; }) - (sources."azure-servicefabric-0.1.5" // { + sources."broadway-0.3.6" + sources."caller-0.0.1" + sources."chokidar-1.7.0" + (sources."cliff-0.1.10" // { dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" + sources."colors-1.0.3" ]; }) - sources."applicationinsights-0.16.0" - sources."caller-id-0.1.0" - sources."colors-1.1.2" - sources."commander-1.0.4" - sources."date-utils-1.2.21" - sources."easy-table-1.1.0" - sources."event-stream-3.1.5" + sources."clone-1.0.4" + sources."colors-0.6.2" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."cycle-1.0.3" + sources."deep-equal-0.1.2" + sources."defined-0.0.0" + sources."director-1.2.7" + sources."event-stream-0.5.3" + sources."eventemitter2-0.4.14" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."extglob-0.3.2" sources."eyes-0.1.8" - sources."github-0.1.6" - sources."fast-json-patch-0.5.6" - sources."js2xmlparser-1.0.0" - (sources."jsonlint-1.6.2" // { - dependencies = [ - sources."underscore-1.6.0" - ]; - }) - sources."jsonminify-0.4.1" - sources."jsrsasign-4.8.2" - 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.19.2" - (sources."ms-rest-2.2.5" // { - dependencies = [ - sources."moment-2.18.1" - ]; - }) - (sources."ms-rest-azure-2.4.4" // { + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + (sources."flatiron-0.4.3" // { dependencies = [ - sources."async-2.5.0" - sources."adal-node-0.1.25" - sources."moment-2.18.1" + sources."cliff-0.1.9" + sources."optimist-0.6.0" + sources."winston-0.8.0" ]; }) - sources."node-forge-0.6.23" - sources."omelette-0.3.2" - sources."openssl-wrapper-0.2.1" - sources."progress-1.1.8" - (sources."prompt-0.2.14" // { + sources."for-in-1.0.2" + sources."for-own-0.1.5" + (sources."forever-monitor-1.7.1" // { dependencies = [ - sources."winston-0.8.3" - sources."async-0.2.10" - sources."colors-0.6.2" + sources."optimist-0.2.8" ]; }) - sources."readable-stream-1.0.34" - (sources."request-2.74.0" // { + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.3" + sources."glob-7.1.2" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."graceful-fs-4.1.11" + sources."i-0.3.6" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."isarray-1.0.0" + sources."isobject-2.1.0" + sources."isstream-0.1.2" + sources."jsonify-0.0.0" + sources."kind-of-3.2.2" + sources."lazy-1.0.11" + sources."micromatch-2.3.11" + sources."minimatch-3.0.4" + sources."minimist-0.0.10" + sources."mkdirp-0.5.1" + sources."mute-stream-0.0.7" + sources."nan-2.10.0" + (sources."nconf-0.6.9" // { dependencies = [ - sources."readable-stream-2.0.6" - sources."async-2.6.0" - sources."commander-2.11.0" + sources."async-0.2.9" + sources."optimist-0.6.0" ]; }) - sources."ssh-key-to-pem-0.11.0" - sources."streamline-0.10.17" - sources."streamline-streams-0.1.5" - (sources."sync-request-3.0.0" // { + sources."ncp-0.4.2" + sources."normalize-path-2.1.1" + sources."nssocket-0.5.3" + sources."object-assign-3.0.0" + sources."object.omit-2.0.1" + sources."once-1.4.0" + sources."optimist-0.6.1" + sources."parse-glob-3.0.4" + sources."path-is-absolute-1.0.1" + sources."pkginfo-0.3.1" + sources."preserve-0.2.0" + (sources."prettyjson-1.2.1" // { dependencies = [ - sources."readable-stream-2.3.3" + sources."colors-1.2.1" + sources."minimist-1.2.0" ]; }) - sources."through-2.3.4" - sources."tunnel-0.0.2" - sources."underscore-1.4.4" - sources."user-home-2.0.0" - sources."uuid-3.1.0" - sources."validator-5.2.0" - (sources."winston-2.1.1" // { + sources."process-nextick-args-2.0.0" + sources."prompt-0.2.14" + sources."ps-tree-0.0.3" + (sources."randomatic-1.1.7" // { dependencies = [ - sources."async-1.0.0" - sources."colors-1.0.3" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) ]; }) - sources."wordwrap-0.0.2" - sources."xml2js-0.1.14" - sources."xmlbuilder-0.4.3" sources."read-1.0.7" - 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.1.1" - sources."buffer-equal-constant-time-1.0.1" - sources."ecdsa-sig-formatter-1.0.9" - sources."dateformat-1.0.2-1.2.3" - sources."envconf-0.0.4" - sources."duplexer-0.1.1" - sources."sax-0.5.2" - sources."browserify-mime-1.2.9" - sources."extend-3.0.1" - sources."json-edm-parser-0.1.2" - sources."md5.js-1.3.4" - sources."jsonparse-1.2.0" - 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-1.0.3" - sources."util-deprecate-1.0.2" - sources."stack-trace-0.0.10" - sources."keypress-0.1.0" - sources."wcwidth-1.0.1" - sources."defaults-1.0.3" - sources."clone-1.0.3" - sources."from-0.1.7" - sources."map-stream-0.1.0" - sources."pause-stream-0.0.11" - sources."split-0.2.10" - sources."stream-combiner-0.0.4" - sources."nomnom-1.8.1" - sources."JSV-4.0.2" - sources."chalk-1.1.3" - sources."has-color-0.1.7" - sources."ansi-styles-2.2.1" - sources."strip-ansi-3.0.1" - sources."@types/node-8.0.51" - sources."@types/request-2.0.8" - sources."@types/uuid-3.4.3" - sources."is-buffer-1.1.6" - sources."is-stream-1.1.0" - sources."@types/form-data-2.2.1" - sources."lodash-4.17.4" - sources."debug-0.7.4" - sources."q-0.9.7" - sources."pkginfo-0.3.1" + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."regex-cache-0.4.4" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."resumer-0.0.0" sources."revalidator-0.1.8" - sources."utile-0.2.1" - sources."deep-equal-1.0.1" - sources."i-0.3.6" - sources."mkdirp-0.5.1" - sources."ncp-0.4.2" sources."rimraf-2.6.2" - sources."minimist-0.0.8" - sources."glob-7.1.2" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" + sources."safe-buffer-5.1.1" + sources."set-immediate-shim-1.0.1" + sources."shush-1.0.0" + sources."stack-trace-0.0.10" + sources."string_decoder-1.1.1" + sources."strip-json-comments-0.1.3" + sources."tape-2.3.3" + sources."through-2.3.8" + sources."timespan-2.3.0" + sources."util-deprecate-1.0.2" + (sources."utile-0.2.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."winston-0.8.3" + sources."wordwrap-0.0.3" sources."wrappy-1.0.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" - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."bl-1.1.2" - sources."caseless-0.11.0" - sources."combined-stream-1.0.5" - 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."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" - sources."oauth-sign-0.8.2" - sources."qs-6.2.3" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.4.3" - sources."delayed-stream-1.0.0" - sources."is-my-json-valid-2.16.1" - sources."pinkie-promise-2.0.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - 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."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.1.11" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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.30.0" - sources."punycode-1.4.1" - sources."ctype-0.5.2" - sources."source-map-0.1.43" - sources."fibers-1.0.15" - sources."galaxy-0.1.12" - sources."amdefine-1.0.1" - sources."concat-stream-1.6.0" - sources."http-response-object-1.1.0" - sources."then-request-2.2.0" - sources."typedarray-0.0.6" - sources."http-basic-2.5.1" - sources."promise-7.3.1" - sources."asap-2.0.6" - sources."os-homedir-1.0.2" - sources."mute-stream-0.0.7" ]; buildInputs = globalBuildInputs; meta = { - description = "Microsoft Azure Cross Platform Command Line tool"; - homepage = https://github.com/Azure/azure-xplat-cli; - license = "Apache-2.0"; + description = "A simple CLI tool for ensuring that a given node script runs continuously (i.e. forever)"; + homepage = "https://github.com/foreverjs/forever#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + git-run = nodeEnv.buildNodePackage { + name = "git-run"; + packageName = "git-run"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/git-run/-/git-run-0.5.5.tgz"; + sha512 = "0j00v2mkrqla05ynq3cziyh4vslsshbkxdyqbzzg2vkg3if0ln0klsf5hck457pxksqky9gcsybc73c2sf6hgf910wzz5yljlxc5b7g"; + }; + dependencies = [ + sources."async-2.6.0" + sources."debug-3.1.0" + sources."lodash-4.17.5" + sources."lodash.groupby-4.6.0" + sources."microee-0.0.6" + sources."minilog-3.1.0" + sources."ms-2.0.0" + sources."simple-git-1.92.0" + sources."tabtab-git+https://github.com/mixu/node-tabtab.git" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A tool for managing multiple git repositories"; + homepage = "https://github.com/mixu/gr#readme"; + license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; - bower = nodeEnv.buildNodePackage { - name = "bower"; - packageName = "bower"; - version = "1.8.2"; + git-standup = nodeEnv.buildNodePackage { + name = "git-standup"; + packageName = "git-standup"; + version = "2.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; - sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; + url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.9.tgz"; + sha512 = "3w5bg88z2wm9b01s7s1yy16dd1qhm44n7dg7anh0w6rigl6r81xmb9vl95imf6lnakwkrsnlw7rqr98c079m6kgribjvzfv9kbzax7r"; }; buildInputs = globalBuildInputs; meta = { - description = "The browser package manager"; - homepage = http://bower.io/; + 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; + bypassCache = false; }; - bower2nix = nodeEnv.buildNodePackage { - name = "bower2nix"; - packageName = "bower2nix"; - version = "3.2.0"; + grunt-cli = nodeEnv.buildNodePackage { + name = "grunt-cli"; + packageName = "grunt-cli"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz"; - sha1 = "5a0cabad7d5d5e6c35dbc068719c6c919e903fb5"; + url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz"; + sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; }; dependencies = [ - sources."argparse-1.0.4" - sources."bower-1.8.2" - sources."bower-endpoint-parser-0.2.1" - sources."bower-json-0.6.0" - sources."bower-logger-0.2.1" - (sources."fs-extra-0.26.7" // { - dependencies = [ - sources."glob-7.1.2" - ]; - }) - sources."lodash-4.2.1" - sources."promised-temp-0.1.0" - sources."semver-5.4.1" - sources."temp-0.8.3" - sources."glob-6.0.4" - sources."sprintf-js-1.0.3" - sources."deep-extend-0.4.2" - sources."ext-name-3.0.0" - sources."graceful-fs-4.1.11" - sources."intersect-1.0.1" - sources."ends-with-0.2.0" - sources."ext-list-2.2.2" - sources."meow-3.7.0" - sources."sort-keys-length-1.0.1" - sources."mime-db-1.31.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-0.0.8" - sources."normalize-package-data-2.4.0" - sources."object-assign-4.1.1" - sources."read-pkg-up-1.0.1" - sources."redent-1.0.0" - 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."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."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."sort-keys-1.1.2" - sources."is-plain-obj-1.1.0" - sources."natives-1.1.0" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" - sources."path-is-absolute-1.0.1" - sources."rimraf-2.2.8" - sources."fs.realpath-1.0.0" + sources."abbrev-1.1.1" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + sources."findup-sync-0.3.0" + sources."glob-5.0.15" + sources."grunt-known-options-1.1.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."minimatch-3.0.4" + sources."nopt-3.0.6" sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."resolve-1.1.7" 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.5.1" - sources."debug-2.6.9" - sources."mkdirp-0.5.1" - sources."ms-2.0.0" - sources."os-tmpdir-1.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Generate nix expressions to fetch bower dependencies"; - homepage = https://github.com/rvl/bower2nix; - license = "GPL-3.0"; + description = "The grunt command line interface"; + homepage = "https://github.com/gruntjs/grunt-cli#readme"; + license = "MIT"; }; production = true; + bypassCache = false; }; - browserify = nodeEnv.buildNodePackage { - name = "browserify"; - packageName = "browserify"; - version = "14.5.0"; + "guifi-earth-https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = nodeEnv.buildNodePackage { + name = "guifi-earth"; + packageName = "guifi-earth"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz"; - sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; + name = "guifi-earth-0.2.1.tar.gz"; + url = https://codeload.github.com/jmendeth/guifi-earth/legacy.tar.gz/f3ee96835fd4fb0e3e12fadbd2cb782770d64854; + sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."JSONStream-1.3.1" - sources."assert-1.4.1" - sources."browser-pack-6.0.2" - (sources."browser-resolve-1.11.2" // { + sources."acorn-2.7.0" + (sources."acorn-globals-1.0.9" // { dependencies = [ - sources."resolve-1.1.7" + sources."acorn-2.7.0" ]; }) - sources."browserify-zlib-0.2.0" - sources."buffer-5.0.8" - sources."cached-path-relative-1.0.1" - (sources."concat-stream-1.5.2" // { + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."asap-1.0.0" + sources."camelcase-1.2.1" + sources."center-align-0.1.3" + sources."character-parser-1.2.1" + (sources."clean-css-3.4.28" // { dependencies = [ - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" + sources."commander-2.8.1" ]; }) - sources."console-browserify-1.1.0" - sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.12.0" - 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.2" - sources."has-1.0.1" - sources."htmlescape-1.1.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" - sources."module-deps-4.1.1" - sources."os-browserify-0.3.0" - sources."parents-1.0.1" - sources."path-browserify-0.0.0" - 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.3.3" - sources."resolve-1.5.0" - sources."shasum-1.0.2" - sources."shell-quote-1.6.1" - sources."stream-browserify-2.0.1" - sources."stream-http-2.7.2" - sources."string_decoder-1.0.3" - sources."subarg-1.0.0" - sources."syntax-error-1.3.0" - sources."through2-2.0.3" - sources."timers-browserify-1.4.2" - sources."tty-browserify-0.0.0" - (sources."url-0.11.0" // { + sources."cliui-2.1.0" + sources."coffee-script-1.12.7" + sources."commander-2.6.0" + sources."constantinople-3.0.2" + sources."css-1.0.8" + sources."css-parse-1.0.4" + sources."css-stringify-1.0.5" + sources."decamelize-1.2.0" + sources."graceful-readlink-1.0.1" + sources."is-buffer-1.1.6" + sources."is-promise-2.1.0" + (sources."jade-1.11.0" // { dependencies = [ - sources."punycode-1.3.2" + sources."acorn-1.2.2" + sources."is-promise-1.0.1" + sources."promise-2.0.0" + sources."source-map-0.1.43" + sources."wordwrap-0.0.2" ]; }) - (sources."util-0.10.3" // { + sources."jstransformer-0.0.2" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."longest-1.0.1" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."msgpack-1.0.2" + sources."nan-2.10.0" + sources."optimist-0.3.7" + sources."pop-iterate-1.0.1" + sources."promise-6.1.0" + (sources."q-2.0.3" // { dependencies = [ - sources."inherits-2.0.1" + sources."asap-2.0.6" ]; }) - sources."vm-browserify-0.0.4" - sources."xtend-4.0.1" - sources."jsonparse-1.3.1" - sources."through-2.3.8" - sources."combine-source-map-0.7.2" - sources."umd-3.0.1" - sources."convert-source-map-1.1.3" - sources."inline-source-map-0.6.2" - sources."lodash.memoize-3.0.4" - sources."source-map-0.5.7" - sources."pako-1.0.6" - sources."base64-js-1.2.1" - sources."ieee754-1.1.8" - sources."typedarray-0.0.6" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - sources."date-now-0.1.4" - sources."browserify-cipher-1.0.0" - sources."browserify-sign-4.0.4" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" - sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.14" - sources."public-encrypt-4.0.0" - sources."randombytes-2.0.5" - sources."randomfill-1.0.3" - sources."browserify-aes-1.1.1" - sources."browserify-des-1.0.0" - sources."evp_bytestokey-1.0.3" - sources."buffer-xor-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."md5.js-1.3.4" - sources."hash-base-2.0.2" - sources."bn.js-4.11.8" - sources."browserify-rsa-4.0.1" - sources."elliptic-6.4.0" - sources."parse-asn1-5.1.0" - sources."brorand-1.1.0" - sources."hash.js-1.1.3" - sources."hmac-drbg-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.2" - sources."ripemd160-2.0.1" - sources."sha.js-2.4.9" - sources."miller-rabin-4.0.1" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."function-bind-1.1.1" - sources."is-buffer-1.1.6" - sources."lexical-scope-1.2.0" - sources."astw-2.2.0" - sources."acorn-4.0.13" - sources."stream-splicer-2.0.0" - sources."detective-4.5.0" - sources."stream-combiner2-1.1.1" - sources."path-platform-0.11.15" - sources."path-parse-1.0.5" - sources."json-stable-stringify-0.0.1" - sources."jsonify-0.0.0" - sources."array-filter-0.0.1" - sources."array-reduce-0.0.0" - 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."repeat-string-1.6.1" + sources."right-align-0.1.3" + sources."sax-1.2.4" + sources."source-map-0.4.4" + (sources."transformers-2.1.0" // { + dependencies = [ + sources."uglify-js-2.2.5" + ]; + }) + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."void-elements-2.0.1" + sources."weak-map-1.0.5" + sources."window-size-0.1.0" + sources."with-4.0.3" + sources."wordwrap-0.0.3" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { - description = "browser-side require() the node way"; - homepage = "https://github.com/substack/node-browserify#readme"; - license = "MIT"; + description = "See a representation of the Guifi.net network in Google Earth."; + homepage = https://github.com/jmendeth/guifi-earth; }; production = true; + bypassCache = false; }; - castnow = nodeEnv.buildNodePackage { - name = "castnow"; - packageName = "castnow"; - version = "0.4.18"; + gulp = nodeEnv.buildNodePackage { + name = "gulp"; + packageName = "gulp"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/castnow/-/castnow-0.4.18.tgz"; - sha1 = "4ffd81c55f381a5aa10c637607683a196830bdd8"; + url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; + sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; }; dependencies = [ - sources."array-loop-1.0.0" - sources."array-shuffle-1.0.1" - sources."castv2-client-1.2.0" - sources."chalk-1.0.0" - sources."chromecast-player-0.2.3" - sources."debounced-seeker-1.0.0" - sources."debug-2.6.9" - sources."diveSync-0.3.0" - sources."got-1.2.2" - sources."internal-ip-1.2.0" - sources."keypress-0.2.1" - sources."mime-1.4.1" - sources."minimist-1.2.0" - (sources."peerflix-0.34.0" // { + sources."ansi-gray-0.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."ansi-wrap-0.1.0" + sources."archy-1.0.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-differ-1.0.0" + sources."array-each-1.0.1" + sources."array-slice-1.1.0" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { dependencies = [ - sources."minimist-1.2.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" ]; }) - (sources."playerui-1.2.0" // { + sources."beeper-1.1.1" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { dependencies = [ - sources."chalk-0.5.1" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-3.2.2" ]; }) - sources."query-string-1.0.1" - sources."range-parser-1.2.0" - (sources."read-torrent-1.3.0" // { + sources."cache-base-1.0.1" + sources."chalk-1.1.3" + (sources."class-utils-0.3.6" // { dependencies = [ - sources."mime-1.2.11" + sources."define-property-0.2.5" ]; }) - sources."router-0.6.2" - sources."srt2vtt-1.3.1" - sources."stream-transcoder-0.0.5" - sources."xml2js-0.4.19" - sources."xspfr-0.3.1" - sources."xtend-4.0.1" - sources."castv2-0.1.9" - sources."protobufjs-3.8.2" - sources."bytebuffer-3.5.5" - sources."ascli-0.3.0" - sources."long-2.4.0" - sources."bufferview-1.0.1" - sources."colour-0.7.1" - sources."optjs-3.2.2" - sources."ansi-styles-1.1.0" + sources."clone-1.0.4" + sources."clone-stats-0.0.1" + sources."collection-visit-1.0.0" + sources."color-support-1.1.3" + sources."component-emitter-1.2.1" + sources."concat-map-0.0.1" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."dateformat-2.2.0" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."defaults-1.0.3" + sources."define-property-2.0.2" + sources."deprecated-0.0.1" + sources."detect-file-1.0.0" + sources."duplexer2-0.0.2" + sources."end-of-stream-0.1.5" sources."escape-string-regexp-1.0.5" - sources."has-ansi-0.1.0" - sources."strip-ansi-0.3.0" - sources."supports-color-0.2.0" - sources."ansi-regex-0.2.1" - sources."get-stdin-5.0.1" - sources."chromecast-scanner-0.5.0" - sources."mutate.js-0.2.0" - sources."promiscuous-0.6.0" - sources."time-line-1.0.1" - sources."ware-1.3.0" - sources."array-find-0.1.1" - sources."multicast-dns-4.0.1" - sources."thunky-1.0.2" - sources."wrap-fn-0.1.5" - sources."co-3.1.0" - sources."ms-2.0.0" - sources."append-0.1.1" - sources."object-assign-4.1.1" - 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.4.0" - 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.1.1" - 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."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."expand-tilde-2.0.2" + sources."extend-3.0.1" + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."fancy-log-1.3.2" + sources."fill-range-4.0.0" + sources."find-index-0.1.1" + (sources."findup-sync-2.0.0" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."fined-1.1.0" + sources."first-chunk-stream-1.0.0" + sources."flagged-respawn-1.0.0" + sources."for-in-1.0.2" + sources."for-own-1.0.0" + sources."fragment-cache-0.2.1" + sources."gaze-0.5.2" + sources."get-value-2.0.6" + sources."glob-4.5.3" + sources."glob-stream-3.1.18" + (sources."glob-watcher-0.0.6" // { + dependencies = [ + sources."graceful-fs-1.2.3" + ]; + }) + sources."glob2base-0.0.12" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" + sources."globule-0.1.0" + sources."glogg-1.0.1" + sources."graceful-fs-3.0.11" + (sources."gulp-util-3.0.8" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."gulplog-1.0.0" + sources."has-ansi-2.0.0" + sources."has-gulplog-0.1.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" + sources."homedir-polyfill-1.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."interpret-1.1.0" + sources."is-absolute-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."is-odd-2.0.0" + sources."is-plain-object-2.0.4" + sources."is-relative-1.0.0" + sources."is-unc-path-1.0.0" 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."airplay-js-0.2.16" - sources."clivas-0.1.4" - sources."inquirer-0.8.5" - sources."network-address-0.0.5" - sources."numeral-1.5.6" - sources."open-0.0.5" - sources."optimist-0.6.1" - sources."parse-torrent-4.1.0" - sources."pump-0.3.5" - sources."rc-0.4.0" - sources."torrent-stream-1.0.3" - sources."windows-no-runnable-0.0.6" - sources."mdns-js-0.5.3" - sources."plist-2.1.0" - sources."dns-js-0.2.1" - sources."qap-3.2.2" - sources."base64-js-1.2.0" - sources."xmlbuilder-9.0.4" - sources."xmldom-0.1.27" - sources."cli-width-1.1.1" - sources."figures-1.7.0" - sources."lodash-3.10.1" - sources."readline2-0.1.1" - sources."rx-2.5.3" - sources."through-2.3.8" - sources."mute-stream-0.0.4" - sources."wordwrap-0.0.3" - sources."blob-to-buffer-1.2.6" - sources."magnet-uri-2.0.1" - sources."parse-torrent-file-2.1.4" - sources."simple-get-2.7.0" - sources."safe-buffer-5.0.1" - sources."thirty-two-0.0.2" - sources."uniq-1.0.1" - sources."bencode-0.8.0" - sources."simple-sha1-2.1.0" - sources."rusha-0.8.7" - sources."decompress-response-3.3.0" - sources."once-1.3.3" - sources."simple-concat-1.0.0" - sources."mimic-response-1.0.0" - sources."wrappy-1.0.2" - sources."end-of-stream-0.1.5" - sources."deep-extend-0.2.11" - sources."strip-json-comments-0.1.3" - sources."ini-1.1.0" - sources."bitfield-0.1.0" - sources."bncode-0.2.3" - sources."fs-chunk-store-1.6.5" - sources."hat-0.0.3" - sources."immediate-chunk-store-1.0.8" - sources."ip-set-1.0.1" + sources."is-windows-1.0.2" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + (sources."liftoff-2.5.0" // { + dependencies = [ + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + sources."is-number-4.0.0" + sources."isarray-1.0.0" + ]; + }) + sources."lodash-1.0.2" + sources."lodash._basecopy-3.0.1" + sources."lodash._basetostring-3.0.1" + sources."lodash._basevalues-3.0.0" + sources."lodash._getnative-3.9.1" + sources."lodash._isiterateecall-3.0.9" + sources."lodash._reescape-3.0.0" + sources."lodash._reevaluate-3.0.0" + sources."lodash._reinterpolate-3.0.0" + sources."lodash._root-3.0.1" + sources."lodash.escape-3.2.0" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + sources."lodash.keys-3.1.2" + sources."lodash.restparam-3.6.1" + sources."lodash.template-3.6.2" + sources."lodash.templatesettings-3.1.1" + sources."lru-cache-2.7.3" + sources."make-iterator-1.0.1" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + (sources."micromatch-3.1.10" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + ]; + }) + sources."minimatch-2.0.10" + sources."minimist-1.2.0" + sources."mixin-deep-1.3.1" sources."mkdirp-0.5.1" - sources."peer-wire-swarm-0.12.1" - sources."rimraf-2.6.2" - sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.1" - sources."random-access-file-1.8.1" - 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.5" - sources."flatten-0.0.1" - sources."fifo-0.1.4" - sources."peer-wire-protocol-0.7.0" - sources."speedometer-0.1.4" - sources."utp-0.0.7" - sources."readable-stream-2.3.3" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" - 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.4" - sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."bittorrent-dht-6.4.2" - sources."bittorrent-tracker-7.7.0" - sources."re-emitter-1.1.3" - sources."buffer-equals-1.0.4" - sources."k-bucket-2.0.1" - sources."k-rpc-3.7.0" - sources."lru-2.0.1" - sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.7.1" - sources."bn.js-4.11.8" - sources."compact2string-1.4.0" - sources."random-iterate-1.0.1" - sources."run-series-1.1.4" - sources."simple-peer-6.4.4" - sources."simple-websocket-4.3.1" - sources."string2compact-1.2.2" - sources."ws-2.3.1" - sources."ipaddr.js-1.5.4" - sources."get-browser-rtc-1.0.2" - sources."process-nextick-args-1.0.7" + sources."ms-2.0.0" + sources."multipipe-0.1.2" + sources."nanomatch-1.2.9" + sources."natives-1.1.3" + sources."object-assign-3.0.0" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.defaults-1.1.0" + sources."object.map-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.3.3" + sources."orchestrator-0.3.8" + sources."ordered-read-streams-0.1.0" + sources."os-homedir-1.0.2" + sources."parse-filepath-1.0.2" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + sources."path-parse-1.0.5" + sources."path-root-0.1.1" + sources."path-root-regex-0.1.2" + sources."posix-character-classes-0.1.1" + sources."pretty-hrtime-1.0.3" + sources."process-nextick-args-2.0.0" + sources."readable-stream-1.1.14" + sources."rechoir-0.6.2" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."replace-ext-0.0.1" + sources."resolve-1.7.0" + sources."resolve-dir-1.0.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" + sources."semver-4.3.6" + sources."sequencify-0.0.7" + sources."set-value-2.0.0" + sources."sigmund-1.0.1" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + sources."kind-of-4.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" + sources."sparkles-1.0.0" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + ]; + }) + sources."static-extend-0.1.2" + sources."stream-consume-0.1.1" + sources."string_decoder-0.10.31" + sources."strip-ansi-3.0.1" + sources."strip-bom-1.0.0" + sources."supports-color-2.0.0" + sources."through2-2.0.3" + sources."tildify-1.2.0" + sources."time-stamp-1.1.0" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."unc-path-regex-0.1.2" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + sources."unique-stream-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."urix-0.1.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."user-home-1.1.1" sources."util-deprecate-1.0.2" - sources."ultron-1.0.2" - sources."addr-to-ip-port-1.4.2" - sources."options-0.0.6" - sources."pad-0.0.5" - sources."single-line-log-0.4.1" - sources."request-2.16.6" - sources."form-data-0.0.10" - sources."hawk-0.10.2" - sources."node-uuid-1.4.8" - sources."cookie-jar-0.2.0" - sources."aws-sign-0.2.0" - sources."oauth-sign-0.2.0" - sources."forever-agent-0.2.0" - sources."tunnel-agent-0.2.0" - sources."json-stringify-safe-3.0.0" - sources."qs-0.5.6" - sources."combined-stream-0.0.7" - sources."async-0.2.10" - sources."delayed-stream-0.0.5" - sources."hoek-0.7.6" - sources."boom-0.3.8" - sources."cryptiles-0.1.3" - sources."sntp-0.1.4" - sources."codepage-1.4.0" - sources."utfx-1.0.1" - sources."voc-1.0.0" - sources."concat-stream-1.6.0" - sources."exit-on-epipe-1.0.1" - sources."commander-2.11.0" - sources."typedarray-0.0.6" - sources."sax-1.2.4" - sources."underscore-1.6.0" + sources."v8flags-2.1.1" + sources."vinyl-0.5.3" + (sources."vinyl-fs-0.3.14" // { + dependencies = [ + sources."clone-0.2.0" + sources."glob-3.1.21" + sources."inherits-1.0.2" + sources."minimatch-0.2.14" + sources."minimist-0.0.8" + sources."readable-stream-1.0.34" + (sources."through2-0.6.5" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."vinyl-0.4.6" + ]; + }) + sources."which-1.3.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { - description = "commandline chromecast player"; - homepage = "https://github.com/xat/castnow#readme"; + description = "The streaming build system"; + homepage = http://gulpjs.com/; license = "MIT"; }; production = true; + bypassCache = false; }; - coffee-script = nodeEnv.buildNodePackage { - name = "coffee-script"; - packageName = "coffee-script"; - version = "1.12.7"; + hipache = nodeEnv.buildNodePackage { + name = "hipache"; + packageName = "hipache"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; + url = "https://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz"; + sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5"; }; + dependencies = [ + sources."eventemitter3-3.0.1" + sources."http-proxy-1.0.2" + sources."lru-cache-2.5.2" + sources."minimist-0.0.8" + sources."redis-0.10.3" + ]; buildInputs = globalBuildInputs; meta = { - description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; + description = "Complete high-scaled reverse-proxy solution"; + homepage = https://github.com/dotcloud/hipache; license = "MIT"; }; production = true; + bypassCache = false; }; - cordova = nodeEnv.buildNodePackage { - name = "cordova"; - packageName = "cordova"; - version = "7.1.0"; + htmlhint = nodeEnv.buildNodePackage { + name = "htmlhint"; + packageName = "htmlhint"; + version = "0.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-7.1.0.tgz"; - sha1 = "559f5394e64145c9b6dd81800feb658d5087b096"; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz"; + sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88"; }; dependencies = [ - sources."configstore-2.1.0" - (sources."cordova-common-2.1.1" // { - dependencies = [ - sources."q-1.5.1" - ]; - }) - (sources."cordova-lib-7.1.0" // { + sources."async-1.4.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + (sources."cli-0.6.6" // { dependencies = [ - sources."nopt-4.0.1" - sources."cordova-common-2.0.3" - sources."q-1.5.1" + sources."minimatch-0.3.0" ]; }) - sources."editor-1.0.0" - (sources."insight-0.8.2" // { + sources."colors-1.0.3" + sources."commander-2.6.0" + sources."concat-map-0.0.1" + sources."console-browserify-1.1.0" + sources."core-util-is-1.0.2" + sources."csslint-0.10.0" + sources."date-now-0.1.4" + (sources."dom-serializer-0.1.0" // { dependencies = [ - sources."configstore-1.4.0" + sources."domelementtype-1.1.3" ]; }) - sources."nopt-3.0.1" - sources."q-1.0.1" - (sources."update-notifier-0.5.0" // { + sources."domelementtype-1.3.0" + sources."domhandler-2.3.0" + (sources."domutils-1.5.1" // { dependencies = [ - sources."configstore-1.4.0" + sources."entities-1.1.1" ]; }) - sources."dot-prop-3.0.0" - sources."graceful-fs-4.1.11" - sources."mkdirp-0.5.1" - sources."object-assign-3.0.0" - 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-1.2.0" - 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.6" - sources."glob-7.1.2" - sources."minimatch-3.0.4" - sources."plist-2.0.1" - sources."semver-5.4.1" - sources."shelljs-0.5.3" - sources."underscore-1.2.1" - sources."unorm-1.4.1" - sources."big-integer-1.6.25" - sources."sax-0.3.5" + sources."entities-1.0.0" + sources."exit-0.1.2" + sources."glob-5.0.15" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."htmlparser2-3.8.3" 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.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."base64-js-1.1.2" - sources."xmlbuilder-8.2.2" - sources."xmldom-0.1.27" - sources."util-deprecate-1.0.2" - sources."lodash-3.10.1" - sources."aliasify-2.1.0" - (sources."cordova-create-1.1.1" // { + sources."is-dotfile-1.0.3" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."isarray-0.0.1" + (sources."jshint-2.8.0" // { dependencies = [ - sources."q-1.4.1" + sources."glob-3.2.11" + sources."minimatch-2.0.10" ]; }) - sources."cordova-fetch-1.1.0" - sources."cordova-js-4.2.2" - sources."cordova-serve-2.0.0" - sources."dep-graph-1.1.0" - sources."init-package-json-1.10.1" - sources."npm-2.15.12" - sources."opener-1.4.2" - sources."properties-parser-0.3.1" - sources."request-2.79.0" - sources."tar-2.2.1" - sources."valid-identifier-0.0.1" - sources."xcode-0.9.3" - sources."browserify-transform-tools-1.7.0" - sources."falafel-2.1.0" - sources."through-2.3.8" - sources."acorn-4.0.13" - sources."foreach-2.0.5" - sources."isarray-1.0.0" - sources."object-keys-1.0.11" - sources."cordova-app-hello-world-3.12.0" - sources."dependency-ls-1.1.1" - sources."is-url-1.2.2" - sources."interpret-1.0.4" - sources."rechoir-0.6.2" - sources."fs.realpath-1.0.0" - sources."resolve-1.1.7" - sources."path-parse-1.0.5" - sources."browserify-14.4.0" - sources."JSONStream-1.3.1" - sources."assert-1.4.1" - sources."browser-pack-6.0.2" - sources."browser-resolve-1.11.2" - sources."browserify-zlib-0.1.4" - sources."buffer-5.0.8" - sources."cached-path-relative-1.0.1" - sources."concat-stream-1.5.2" - sources."console-browserify-1.1.0" - sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.12.0" - 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."has-1.0.1" - sources."htmlescape-1.1.1" - sources."https-browserify-1.0.0" - sources."insert-module-globals-7.0.1" - sources."labeled-stream-splicer-2.0.0" - sources."module-deps-4.1.1" - sources."os-browserify-0.1.2" - sources."parents-1.0.1" - sources."path-browserify-0.0.0" - 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.3.3" - sources."shasum-1.0.2" - sources."shell-quote-1.6.1" - sources."stream-browserify-2.0.1" - sources."stream-http-2.7.2" - sources."string_decoder-1.0.3" - sources."subarg-1.0.0" - sources."syntax-error-1.3.0" - sources."through2-2.0.3" - sources."timers-browserify-1.4.2" - sources."tty-browserify-0.0.0" - sources."url-0.11.0" - sources."util-0.10.3" - sources."vm-browserify-0.0.4" - sources."xtend-4.0.1" - sources."jsonparse-1.3.1" - sources."combine-source-map-0.7.2" - sources."umd-3.0.1" - sources."convert-source-map-1.1.3" - sources."inline-source-map-0.6.2" - sources."lodash.memoize-3.0.4" - sources."source-map-0.5.7" - sources."pako-0.2.9" - sources."ieee754-1.1.8" - sources."typedarray-0.0.6" - sources."core-util-is-1.0.2" - sources."process-nextick-args-1.0.7" - sources."date-now-0.1.4" - sources."browserify-cipher-1.0.0" - sources."browserify-sign-4.0.4" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" - sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.14" - sources."public-encrypt-4.0.0" - sources."randombytes-2.0.5" - sources."randomfill-1.0.3" - sources."browserify-aes-1.1.1" - sources."browserify-des-1.0.0" - sources."evp_bytestokey-1.0.3" - sources."buffer-xor-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."md5.js-1.3.4" - sources."hash-base-2.0.2" - sources."bn.js-4.11.8" - sources."browserify-rsa-4.0.1" - sources."elliptic-6.4.0" - sources."parse-asn1-5.1.0" - sources."brorand-1.1.0" - sources."hash.js-1.1.3" - sources."hmac-drbg-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.2" - sources."ripemd160-2.0.1" - sources."sha.js-2.4.9" - sources."miller-rabin-4.0.1" - sources."function-bind-1.1.1" - sources."is-buffer-1.1.6" - sources."lexical-scope-1.2.0" - sources."astw-2.2.0" - sources."stream-splicer-2.0.0" - sources."detective-4.5.0" - sources."stream-combiner2-1.1.1" - sources."path-platform-0.11.15" - sources."json-stable-stringify-0.0.1" - sources."jsonify-0.0.0" - sources."array-filter-0.0.1" - sources."array-reduce-0.0.0" - sources."array-map-0.0.0" - sources."builtin-status-codes-3.0.0" - sources."to-arraybuffer-1.0.1" - sources."querystring-0.2.0" - sources."indexof-0.0.1" - sources."chalk-1.1.3" - sources."compression-1.7.1" - sources."express-4.16.2" - sources."open-0.0.5" - 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."accepts-1.3.4" - sources."bytes-3.0.0" - sources."compressible-2.0.12" - sources."debug-2.6.9" - sources."on-headers-1.0.1" - sources."vary-1.1.2" - sources."mime-types-2.1.17" - sources."negotiator-0.6.1" - sources."mime-db-1.30.0" - sources."ms-2.0.0" - sources."array-flatten-1.1.1" - sources."body-parser-1.18.2" - sources."content-disposition-0.5.2" - sources."content-type-1.0.4" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."depd-1.1.1" - sources."encodeurl-1.0.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."finalhandler-1.1.0" - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."on-finished-2.3.0" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.2" - sources."qs-6.3.2" - sources."range-parser-1.2.0" - sources."send-0.16.1" - sources."serve-static-1.13.1" - sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" - sources."type-is-1.6.15" - sources."utils-merge-1.0.1" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."raw-body-2.3.2" - sources."unpipe-1.0.0" - sources."ee-first-1.1.1" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" - sources."destroy-1.0.4" - sources."mime-1.4.1" - sources."media-typer-0.3.0" - sources."npm-package-arg-5.1.2" - sources."promzard-0.3.0" - sources."read-1.0.7" - sources."read-package-json-2.0.12" - sources."validate-npm-package-license-3.0.1" - sources."validate-npm-package-name-3.0.0" - sources."hosted-git-info-2.5.0" - sources."mute-stream-0.0.5" - sources."json-parse-better-errors-1.0.1" - sources."normalize-package-data-2.4.0" - sources."slash-1.0.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-1.0.3" - sources."abbrev-1.1.1" - sources."string.prototype.codepointat-0.2.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."oauth-sign-0.8.2" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.4.3" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."commander-2.11.0" - sources."is-my-json-valid-2.16.1" - 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."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-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - sources."block-stream-0.0.9" - sources."fstream-1.0.11" - sources."rimraf-2.6.2" - sources."pegjs-0.10.0" - sources."simple-plist-0.2.1" - sources."bplist-creator-0.0.7" - sources."stream-buffers-2.2.0" - sources."async-1.5.2" - sources."inquirer-0.10.1" - sources."lodash.debounce-3.1.1" - sources."node-uuid-1.4.8" - sources."os-name-1.0.3" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."cli-width-1.1.1" - sources."figures-1.7.0" - sources."readline2-1.0.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - 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."number-is-nan-1.0.1" - sources."lodash._getnative-3.9.1" - sources."osx-release-1.1.0" - sources."win-release-1.1.1" - sources."is-npm-1.0.0" - sources."latest-version-1.0.1" - sources."repeating-1.1.3" - sources."semver-diff-2.1.0" - sources."string-length-1.0.1" - sources."package-json-1.2.0" - sources."got-3.3.1" - sources."registry-url-3.1.0" - sources."duplexify-3.5.1" - sources."infinity-agent-2.0.3" - sources."is-redirect-1.0.0" - sources."is-stream-1.1.0" - sources."lowercase-keys-1.0.0" - sources."nested-error-stacks-1.0.2" - sources."prepend-http-1.0.4" - sources."read-all-stream-3.1.0" - sources."timed-out-2.0.0" - sources."end-of-stream-1.4.0" - sources."stream-shift-1.0.0" - sources."rc-1.2.2" - sources."deep-extend-0.4.2" - sources."ini-1.3.4" - sources."strip-json-comments-2.0.1" - sources."is-finite-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Cordova command line interface tool"; - homepage = "https://github.com/apache/cordova-cli#readme"; - license = "Apache-2.0"; - }; - production = true; - }; - csslint = nodeEnv.buildNodePackage { - name = "csslint"; - packageName = "csslint"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz"; - sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; - }; - dependencies = [ - sources."clone-2.1.1" - sources."parserlib-1.1.1" + sources."lodash-3.7.0" + sources."lru-cache-2.7.3" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."parse-glob-3.0.4" + sources."parserlib-0.2.5" + sources."path-is-absolute-1.0.1" + sources."readable-stream-1.1.14" + sources."shelljs-0.3.0" + sources."sigmund-1.0.1" + sources."string_decoder-0.10.31" + sources."strip-json-comments-1.0.4" + sources."wrappy-1.0.2" + sources."xml-1.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "CSSLint"; - homepage = http://csslint.net/; + description = "A Static Code Analysis Tool for HTML"; + homepage = "https://github.com/yaniswang/HTMLHint#readme"; license = "MIT"; }; production = true; + bypassCache = false; }; - dhcp = nodeEnv.buildNodePackage { - name = "dhcp"; - packageName = "dhcp"; - version = "0.2.9"; + html-minifier = nodeEnv.buildNodePackage { + name = "html-minifier"; + packageName = "html-minifier"; + version = "3.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.9.tgz"; - sha512 = "0xvz5ppq82s4yhrp4alp1ni696v960p9a8hycwns0bj33qjdsd2nn9h2xzpgssn9c27jbr91h9fr851rnc7sz7nd2ycblcsfy193sj0"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.14.tgz"; + sha512 = "0ai1rga42v2z8mbnn2kv238fzi9p2nxzj7l2b4csgcg4wddmh697h1s4kmwipqqfd6ppi6xd26m2ynipkjm63sj48kjb0sh73mz165i"; }; dependencies = [ - sources."minimist-1.2.0" + sources."camel-case-3.0.0" + sources."clean-css-4.1.11" + sources."commander-2.15.1" + sources."he-1.1.1" + sources."lower-case-1.1.4" + sources."no-case-2.3.2" + sources."param-case-2.1.1" + sources."relateurl-0.2.7" + sources."source-map-0.5.7" + (sources."uglify-js-3.3.20" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; meta = { - description = "A DHCP server written in JavaScript"; - homepage = https://github.com/infusion/node-dhcp; - license = "MIT OR GPL-2.0"; + description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; + homepage = http://kangax.github.io/html-minifier/; + license = "MIT"; }; production = true; + bypassCache = false; }; - dnschain = nodeEnv.buildNodePackage { - name = "dnschain"; - packageName = "dnschain"; - version = "0.5.3"; + ionic = nodeEnv.buildNodePackage { + name = "ionic"; + packageName = "ionic"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/dnschain/-/dnschain-0.5.3.tgz"; - sha1 = "9b21d9ac5e203295f372ac37df470e9f0854c470"; + url = "https://registry.npmjs.org/ionic/-/ionic-3.20.0.tgz"; + sha512 = "2a051r5s0p9ihcahqysmbjklhivms8rlv5zxxi7bqrxa3x8sqqpyhbjpl7z5k4263vmfkqj3qmzciz6kbyivgk3arz22jqfqsxczqn9"; }; dependencies = [ - sources."bluebird-2.9.9" - sources."bottleneck-1.5.3" - sources."event-stream-3.2.2" - sources."express-4.11.2" - sources."hiredis-0.4.1" - (sources."json-rpc2-0.8.1" // { + sources."@ionic/cli-framework-0.1.3" + (sources."@ionic/cli-utils-1.19.2" // { dependencies = [ - sources."lodash-2.4.2" + sources."bytes-1.0.0" + sources."debug-2.6.9" + sources."is-extglob-2.1.1" + sources."is-glob-3.1.0" + sources."mime-1.4.1" + sources."raw-body-1.1.7" + sources."setprototypeof-1.0.3" + sources."statuses-1.4.0" + sources."string_decoder-0.10.31" + sources."yallist-3.0.2" ]; }) - sources."lodash-3.1.0" - (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { + sources."@ionic/discover-0.4.0" + sources."accepts-1.3.5" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-1.3.2" + sources."archiver-2.1.1" + sources."archiver-utils-1.3.0" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-flatten-1.1.1" + sources."array-unique-0.2.1" + sources."async-2.6.0" + sources."async-each-1.0.1" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."balanced-match-1.0.0" + sources."basic-auth-1.1.0" + sources."binary-extensions-1.11.0" + sources."bl-1.2.2" + sources."body-5.1.0" + sources."body-parser-1.18.2" + sources."brace-expansion-1.1.11" + (sources."braces-1.8.5" // { dependencies = [ - sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" + sources."kind-of-4.0.0" ]; }) - sources."native-dns-packet-0.1.1" - sources."nconf-0.7.1" - sources."properties-1.2.1" - sources."redis-0.12.1" - sources."string-2.0.1" - sources."winston-0.8.0" - sources."superagent-0.21.0" - sources."through-2.3.8" - sources."duplexer-0.1.1" - 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."accepts-1.2.13" - sources."content-disposition-0.5.0" - sources."cookie-signature-1.0.5" - sources."debug-2.6.9" - sources."depd-1.0.1" - sources."escape-html-1.0.1" - sources."etag-1.5.1" - sources."finalhandler-0.3.3" - sources."fresh-0.2.4" + sources."buffer-crc32-0.2.13" + sources."bytes-3.0.0" + sources."chalk-2.3.2" + sources."chardet-0.4.2" + sources."chokidar-1.7.0" + sources."chownr-1.0.1" + sources."ci-info-1.1.3" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."component-emitter-1.2.1" + sources."compress-commons-1.2.2" + sources."concat-map-0.0.1" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."continuable-cache-0.3.1" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."cookiejar-2.1.1" + sources."core-util-is-1.0.2" + sources."crc-3.5.0" + sources."crc32-stream-2.0.0" + sources."cross-spawn-5.1.0" + sources."dargs-5.1.0" + sources."debug-3.1.0" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."diff-3.5.0" + sources."ee-first-1.1.1" + sources."elementtree-0.1.7" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.1" + sources."error-7.0.2" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."eventemitter3-1.2.0" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + (sources."express-4.16.3" // { + dependencies = [ + sources."setprototypeof-1.1.0" + ]; + }) + sources."extend-3.0.1" + sources."external-editor-2.2.0" + sources."extglob-0.3.2" + sources."faye-websocket-0.10.0" + sources."figures-2.0.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + sources."finalhandler-1.1.1" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."form-data-2.3.2" + sources."formidable-1.2.1" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-minipass-1.2.5" + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.3" + sources."glob-7.1.2" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."graceful-fs-4.1.11" + sources."has-flag-3.0.0" + sources."http-errors-1.6.3" + sources."http-parser-js-0.4.11" + sources."http-proxy-1.16.2" + sources."http-proxy-middleware-0.17.4" + sources."iconv-lite-0.4.19" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."inquirer-3.3.0" + sources."ipaddr.js-1.6.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-2.0.1" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-promise-2.1.0" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-2.1.0" + sources."kind-of-3.2.2" + sources."lazystream-1.0.0" + sources."leek-0.0.24" + sources."livereload-js-2.3.0" + sources."lodash-4.17.5" + sources."lodash._baseassign-3.2.0" + sources."lodash._basecopy-3.0.1" + sources."lodash._bindcallback-3.0.1" + sources."lodash._createassigner-3.1.1" + sources."lodash._getnative-3.9.1" + sources."lodash._isiterateecall-3.0.9" + sources."lodash.assign-3.2.0" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + sources."lodash.keys-3.1.2" + sources."lodash.restparam-3.6.1" + sources."lru-cache-4.1.2" + sources."macos-release-1.1.0" sources."media-typer-0.3.0" - sources."methods-1.0.1" - sources."on-finished-2.2.1" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.3" - sources."proxy-addr-1.0.10" - sources."qs-1.2.0" - sources."range-parser-1.0.3" - sources."send-0.11.1" - sources."serve-static-1.8.1" - sources."type-is-1.5.7" - sources."vary-1.0.1" - sources."cookie-0.1.2" - sources."merge-descriptors-0.0.2" - sources."utils-merge-1.0.0" - sources."mime-types-2.0.14" - sources."negotiator-0.5.3" - sources."mime-db-1.12.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."micromatch-2.3.11" + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."minipass-2.2.4" + sources."minizlib-1.1.0" + sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."crc-3.2.1" - sources."ee-first-1.1.0" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.0.5" - sources."destroy-1.0.3" - sources."mime-1.2.11" - sources."bindings-1.3.0" - sources."nan-2.7.0" - sources."jsonparse-0.0.6" - sources."es5class-2.3.1" - sources."faye-websocket-0.11.1" - sources."eventemitter3-0.1.6" - sources."better-curry-1.6.0" - sources."websocket-driver-0.7.0" - sources."http-parser-js-0.4.9" - sources."websocket-extensions-0.1.3" - (sources."native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" // { + sources."mute-stream-0.0.7" + sources."nan-2.10.0" + sources."ncp-2.0.0" + sources."negotiator-0.6.1" + sources."netmask-1.0.6" + sources."normalize-path-2.1.1" + sources."object-assign-4.1.1" + sources."object.omit-2.0.1" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."opn-5.3.0" + sources."os-name-2.0.1" + sources."os-tmpdir-1.0.2" + sources."parse-glob-3.0.4" + sources."parseurl-1.3.2" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."preserve-0.2.0" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" + sources."pseudomap-1.0.2" + sources."qs-6.5.1" + (sources."randomatic-1.1.7" // { dependencies = [ - sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) ]; }) - sources."binaryheap-0.0.3" - sources."buffercursor-0.0.12" - sources."verror-1.10.0" - sources."assert-plus-1.0.0" - sources."core-util-is-1.0.2" - sources."extsprintf-1.3.0" - sources."async-0.9.2" - sources."ini-1.3.4" - sources."optimist-0.6.1" - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - sources."colors-0.6.2" - sources."cycle-1.0.3" - sources."eyes-0.1.8" - sources."pkginfo-0.3.1" - sources."stack-trace-0.0.10" - 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."form-data-0.1.3" - sources."readable-stream-1.0.27-1" - sources."combined-stream-0.0.7" - sources."delayed-stream-0.0.5" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."inherits-2.0.3" + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."regex-cache-0.4.4" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."requires-port-1.0.0" + sources."restore-cursor-2.0.0" + sources."rimraf-2.6.2" + sources."rsvp-3.6.2" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safe-json-parse-1.0.1" + sources."sax-1.1.4" + sources."semver-5.5.0" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."set-immediate-shim-1.0.1" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slice-ansi-1.0.0" + sources."ssh-config-1.1.3" + sources."statuses-1.5.0" + sources."string-template-0.2.1" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."strip-ansi-4.0.0" + sources."superagent-3.8.2" + sources."supports-color-5.3.0" + (sources."tar-4.4.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."tar-stream-1.5.5" + sources."through-2.3.8" + (sources."tiny-lr-1.1.1" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."tmp-0.0.33" + sources."tslib-1.9.0" + sources."type-is-1.6.16" + sources."ultron-1.1.1" + sources."unpipe-1.0.0" + sources."untildify-3.0.2" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."websocket-driver-0.7.0" + sources."websocket-extensions-0.1.3" + sources."which-1.3.0" + sources."win-release-1.1.1" + sources."wrap-ansi-3.0.1" + sources."wrappy-1.0.2" + sources."ws-3.3.3" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + sources."zip-stream-1.2.0" ]; buildInputs = globalBuildInputs; meta = { - description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; - homepage = https://github.com/okTurtles/dnschain; - license = "MPL-2.0"; + description = "A tool for creating and developing Ionic Framework mobile apps."; + homepage = https://ionicframework.com/; + license = "MIT"; }; production = true; + bypassCache = false; }; - docker-registry-server = nodeEnv.buildNodePackage { - name = "docker-registry-server"; - packageName = "docker-registry-server"; - version = "2.2.0"; + ios-deploy = nodeEnv.buildNodePackage { + name = "ios-deploy"; + packageName = "ios-deploy"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/docker-registry-server/-/docker-registry-server-2.2.0.tgz"; - sha1 = "5b98836cd7f0348f7f472f7f5a42dd3cab231731"; + url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.2.tgz"; + sha1 = "c2f4c46b06db4771939b29f980c7c1a8906b47a2"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "launch iOS apps iOS devices from the command line (Xcode 7)"; + homepage = "https://github.com/phonegap/ios-deploy#readme"; + license = "GPLv3"; + }; + production = true; + bypassCache = false; + }; + istanbul = nodeEnv.buildNodePackage { + name = "istanbul"; + packageName = "istanbul"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz"; + sha1 = "65c7d73d4c4da84d4f3ac310b918fb0b8033733b"; }; dependencies = [ - sources."JSONStream-0.8.4" - sources."basic-auth-1.1.0" - sources."cookie-signature-1.0.6" - sources."cors-2.8.4" - sources."docker-parse-image-3.0.1" - sources."end-of-stream-1.4.0" - sources."from2-1.3.0" - sources."fs-blob-store-5.2.1" - sources."level-0.18.0" - (sources."level-sublevel-6.6.1" // { + sources."abbrev-1.0.9" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."argparse-1.0.10" + sources."async-1.5.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."camelcase-1.2.1" + sources."center-align-0.1.3" + sources."cliui-2.1.0" + sources."concat-map-0.0.1" + sources."decamelize-1.2.0" + sources."deep-is-0.1.3" + sources."escodegen-1.8.1" + sources."esprima-2.7.3" + sources."estraverse-1.9.3" + sources."esutils-2.0.2" + sources."fast-levenshtein-2.0.6" + sources."glob-5.0.15" + (sources."handlebars-4.0.11" // { dependencies = [ - sources."levelup-0.19.1" - sources."xtend-3.0.0" + sources."source-map-0.4.4" + sources."wordwrap-0.0.3" ]; }) - sources."leveldown-0.10.6" - (sources."levelup-0.18.6" // { + sources."has-flag-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-buffer-1.1.6" + sources."isexe-2.0.0" + (sources."js-yaml-3.11.0" // { dependencies = [ - sources."xtend-3.0.0" + sources."esprima-4.0.0" ]; }) - sources."lexicographic-integer-1.1.0" - sources."memdown-0.10.2" - sources."minimist-0.2.0" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."levn-0.3.0" + sources."longest-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.10" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - (sources."ndjson-1.5.0" // { + sources."nopt-3.0.6" + sources."once-1.4.0" + sources."optimist-0.6.1" + sources."optionator-0.8.2" + sources."path-is-absolute-1.0.1" + sources."prelude-ls-1.1.2" + sources."repeat-string-1.6.1" + sources."resolve-1.1.7" + sources."right-align-0.1.3" + sources."source-map-0.2.0" + sources."sprintf-js-1.0.3" + sources."supports-color-3.2.3" + sources."type-check-0.3.2" + (sources."uglify-js-2.8.29" // { dependencies = [ - sources."minimist-1.2.0" - sources."split2-2.2.0" - sources."through2-2.0.3" + sources."source-map-0.5.7" + sources."wordwrap-0.0.2" ]; }) - sources."pump-1.0.2" - sources."pumpify-1.3.5" - sources."relative-date-1.1.3" - sources."root-2.0.0" - sources."sorted-union-stream-1.0.2" - sources."split2-0.2.1" - sources."stream-collector-1.0.1" - sources."tar-stream-1.5.5" - sources."through2-0.6.5" - sources."thunky-0.1.0" - sources."xtend-4.0.1" - sources."jsonparse-0.0.5" - sources."through-2.3.8" + sources."uglify-to-browserify-1.0.2" + sources."which-1.3.0" + sources."window-size-0.1.0" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."yargs-3.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests "; + homepage = "https://github.com/gotwarlost/istanbul#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; + javascript-typescript-langserver = nodeEnv.buildNodePackage { + name = "javascript-typescript-langserver"; + packageName = "javascript-typescript-langserver"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.8.0.tgz"; + sha512 = "23rbqwsks302r65kckp12dy9pid4lpl9cn51bz9xg54j90ig3cxxd9ygs7vq5b72k2x75w960hfd4ww2zgqpypdqmb510vqfhx442s1"; + }; + dependencies = [ + sources."ansi-color-0.2.1" + sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" + sources."assertion-error-1.1.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."bufrw-1.2.1" + sources."chai-4.1.2" + sources."chai-as-promised-7.1.1" + sources."chalk-2.3.2" + sources."check-error-1.0.2" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."deep-eql-3.0.1" + sources."deep-equal-1.0.1" + sources."error-7.0.2" + sources."escape-string-regexp-1.0.5" + sources."fast-json-patch-2.0.6" + sources."fs.realpath-1.0.0" + sources."get-func-name-2.0.0" + sources."glob-7.1.2" + sources."has-flag-3.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."iterare-0.0.8" + (sources."jaeger-client-3.10.0" // { + dependencies = [ + sources."opentracing-0.13.0" + ]; + }) + sources."lodash-4.17.5" + sources."long-2.4.0" + sources."minimatch-3.0.4" + sources."mz-2.7.0" + sources."node-int64-0.4.0" sources."object-assign-4.1.1" - sources."vary-1.1.2" + sources."object-hash-1.3.0" sources."once-1.4.0" + sources."opentracing-0.14.3" + sources."path-is-absolute-1.0.1" + sources."pathval-1.1.0" + sources."rxjs-5.5.8" + sources."semaphore-async-await-1.5.1" + sources."string-similarity-1.2.0" + sources."string-template-0.2.1" + sources."supports-color-5.3.0" + sources."symbol-observable-1.0.1" + sources."thenify-3.3.0" + sources."thenify-all-1.6.0" + sources."thriftrw-3.11.2" + sources."type-detect-4.0.8" + sources."typescript-2.7.2" + sources."vscode-jsonrpc-3.6.1" + (sources."vscode-languageserver-3.5.1" // { + dependencies = [ + sources."vscode-jsonrpc-3.5.0" + sources."vscode-languageserver-types-3.5.0" + ]; + }) + sources."vscode-languageserver-protocol-3.5.1" + sources."vscode-languageserver-types-3.7.1" + sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" - sources."inherits-2.0.3" - sources."readable-stream-1.0.34" - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."duplexify-3.5.1" - sources."lru-cache-2.7.3" - sources."stream-shift-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-1.0.2" - sources."pull-level-2.0.3" - sources."pull-stream-3.6.1" - sources."typewiselite-1.0.0" - sources."bytewise-core-1.2.3" - sources."typewise-1.0.3" - sources."typewise-core-1.2.0" - sources."bl-1.2.1" - sources."deferred-leveldown-0.2.0" - sources."errno-0.1.4" - sources."prr-0.0.0" - sources."semver-2.3.2" - sources."abstract-leveldown-0.12.4" - sources."level-post-1.0.5" - sources."pull-cat-1.1.11" - sources."pull-live-1.0.1" - sources."pull-pushable-2.1.1" - sources."pull-window-2.1.4" - sources."stream-to-pull-stream-1.7.2" - sources."looper-3.0.0" - sources."bindings-1.2.1" - sources."nan-2.1.0" - sources."json-stringify-safe-5.0.1" - sources."murl-0.4.1" - sources."protein-0.5.0" - sources."network-address-0.0.5" + sources."xorshift-0.2.1" + sources."xtend-4.0.1" + ]; + 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; + bypassCache = false; + }; + jayschema = nodeEnv.buildNodePackage { + name = "jayschema"; + packageName = "jayschema"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz"; + sha512 = "0v4070gii05w3qhq7bnl5jp358f3dibvjml3vnmphqhgdn2g9i94a2mrvmcyrhpa7k9f3gp63p6vgpmhihja5b3is5xc8mv4vdy8wjh"; + }; + dependencies = [ + sources."when-3.4.6" ]; buildInputs = globalBuildInputs; meta = { - description = "docker registry server implemented in node"; - homepage = https://github.com/mafintosh/docker-registry-server; - license = "MIT"; + description = "A comprehensive JSON Schema validator for Node.js"; + homepage = https://github.com/natesilva/jayschema; + license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; - elasticdump = nodeEnv.buildNodePackage { - name = "elasticdump"; - packageName = "elasticdump"; - version = "3.3.1"; + jsdoc = nodeEnv.buildNodePackage { + name = "jsdoc"; + packageName = "jsdoc"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.1.tgz"; - sha512 = "21mmlyi12vnfg5s88vh8i7jk43m69bp4qhgkch8i2qbzf9fv4hqn7b6wcxkbbdxzdvnkkpklb2xxpxi5nflwl513w08d6ykvac2ambh"; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz"; + sha512 = "29bn095czjx533yyfcdg0ah2wfm3iyz4sckld2yzqfimzzq2h3jlgaax0mab6wjgrc4bl75yni4c6b27zzazwkcs678aly0jkml3z78"; }; dependencies = [ - sources."JSONStream-1.3.1" - sources."async-2.6.0" - sources."aws4-1.6.0" - sources."aws-sdk-2.149.0" - sources."ini-1.3.4" - sources."optimist-0.6.1" - sources."request-2.83.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.1.0" - 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.4.1" - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - sources."aws-sign2-0.7.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.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."qs-6.5.1" - sources."safe-buffer-5.1.1" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."core-util-is-1.0.2" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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.30.0" + sources."babylon-7.0.0-beta.19" + sources."bluebird-3.5.1" + (sources."catharsis-0.8.9" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) + sources."escape-string-regexp-1.0.5" + sources."graceful-fs-4.1.11" + sources."js2xmlparser-3.0.0" + sources."klaw-2.0.0" + sources."marked-0.3.19" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + (sources."requizzle-0.2.1" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) + sources."strip-json-comments-2.0.1" + sources."taffydb-2.6.2" + sources."underscore-1.8.3" + sources."underscore-contrib-0.3.0" + sources."xmlcreate-1.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "import and export tools for elasticsearch"; - homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; + description = "An API documentation generator for JavaScript."; + homepage = "https://github.com/jsdoc3/jsdoc#readme"; license = "Apache-2.0"; }; production = true; + bypassCache = false; }; - elm-test = nodeEnv.buildNodePackage { - name = "elm-test"; - packageName = "elm-test"; - version = "0.18.9"; + jshint = nodeEnv.buildNodePackage { + name = "jshint"; + packageName = "jshint"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.9.tgz"; - sha512 = "0lkwqwzgjfg8d0cm1mz3l0s5hy81y19j8lmwkkcrkz5injj4n3zj3f4bwdpspspwpjv6wb8skgn7i3c7dn0hl8xwh168kjqys2ris3w"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz"; + sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c"; }; dependencies = [ - (sources."binstall-1.2.0" // { + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."cli-1.0.1" + sources."concat-map-0.0.1" + sources."console-browserify-1.1.0" + sources."core-util-is-1.0.2" + sources."date-now-0.1.4" + (sources."dom-serializer-0.1.0" // { dependencies = [ - sources."chalk-1.1.3" - sources."supports-color-2.0.0" - sources."minimist-0.0.8" + sources."domelementtype-1.1.3" ]; }) - sources."chalk-2.1.0" - sources."chokidar-1.6.0" - sources."cross-spawn-4.0.0" - sources."find-parent-dir-0.3.0" - sources."firstline-1.2.1" - sources."fs-extra-0.30.0" - sources."fsevents-1.1.2" - sources."glob-7.1.2" - sources."lodash-4.13.1" - sources."minimist-1.2.0" - sources."murmur-hash-js-1.0.0" - (sources."node-elm-compiler-4.3.3" // { + sources."domelementtype-1.3.0" + sources."domhandler-2.3.0" + (sources."domutils-1.5.1" // { dependencies = [ - sources."lodash-4.14.2" - sources."firstline-1.2.0" + sources."entities-1.1.1" ]; }) - sources."supports-color-4.2.0" - sources."xmlbuilder-8.2.2" - sources."request-2.79.0" - sources."tar-2.2.1" - 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.17" - sources."oauth-sign-0.8.2" - sources."qs-6.3.2" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - 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.1" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-3.2.0" - 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."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-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."core-util-is-1.0.2" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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.30.0" - sources."punycode-1.4.1" - sources."block-stream-0.0.9" - sources."fstream-1.0.11" - sources."inherits-2.0.3" - sources."graceful-fs-4.1.11" - sources."mkdirp-0.5.1" - sources."rimraf-2.2.8" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."anymatch-1.3.2" - 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."micromatch-2.3.11" - sources."normalize-path-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" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."kind-of-3.2.2" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - 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-3.0.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."repeat-string-1.6.1" - sources."isarray-1.0.0" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - 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."remove-trailing-separator-1.1.0" - sources."binary-extensions-1.10.0" - sources."minimatch-3.0.4" - sources."readable-stream-2.3.3" - sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - 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."lru-cache-4.1.1" - sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."isexe-2.0.0" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" - sources."nan-2.7.0" + sources."entities-1.0.0" + sources."exit-0.1.2" sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."htmlparser2-3.8.3" sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."isarray-0.0.1" + sources."lodash-3.7.0" + sources."minimatch-3.0.4" sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."readable-stream-1.1.14" + sources."shelljs-0.3.0" + sources."string_decoder-0.10.31" + sources."strip-json-comments-1.0.4" sources."wrappy-1.0.2" - sources."find-elm-dependencies-1.0.2" - sources."temp-0.8.3" - sources."os-tmpdir-1.0.2" - sources."has-flag-2.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Run elm-test suites."; - homepage = "https://github.com/rtfeldman/node-test-runner#readme"; - license = "BSD-3-Clause"; + description = "Static analysis tool for JavaScript"; + homepage = http://jshint.com/; + license = "(MIT AND JSON)"; }; production = true; + bypassCache = false; }; - emoj = nodeEnv.buildNodePackage { - name = "emoj"; - packageName = "emoj"; - version = "2.0.0"; + json = nodeEnv.buildNodePackage { + name = "json"; + packageName = "json"; + version = "9.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz"; - sha512 = "06w3hpcnxg63wg262ldhw4s2shyr1f1bvilqshy88i4svamgxk0qzdhhma2rwcwq7qpjwjlr8m1z2qbmqw9faff5f8hl45yj3jxrs3z"; + 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#readme"; + }; + production = true; + bypassCache = false; + }; + js-beautify = nodeEnv.buildNodePackage { + name = "js-beautify"; + packageName = "js-beautify"; + version = "1.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz"; + sha512 = "0x3s0bbw8f5d2i5jb08bd2dsxnf7w38fp7fj652cvp558b45mxyvy42zmghrmlyrmbk5d84d8maw4pqq3228jq0l7hkxb4fl415zs7l"; }; dependencies = [ - sources."auto-bind-1.1.0" - sources."clipboardy-1.2.1" - sources."conf-1.3.1" - sources."got-7.1.0" - sources."has-ansi-3.0.0" - (sources."import-jsx-1.3.0" // { - dependencies = [ - sources."has-ansi-2.0.0" - ]; - }) - sources."ink-0.3.1" - sources."ink-text-input-1.1.1" - sources."lodash.debounce-4.0.8" - sources."mem-1.1.0" - sources."meow-3.7.0" - sources."skin-tone-1.0.0" - sources."execa-0.8.0" - sources."cross-spawn-5.1.0" - 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."lru-cache-4.1.1" - sources."shebang-command-1.2.0" - sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - sources."path-key-2.0.1" - sources."dot-prop-4.2.0" - sources."env-paths-1.0.0" - sources."make-dir-1.1.0" - sources."pkg-up-2.0.0" - sources."write-file-atomic-2.3.0" - sources."is-obj-1.0.1" - sources."pify-2.3.0" - sources."find-up-1.1.2" - sources."locate-path-2.0.0" - sources."p-locate-2.0.0" - sources."path-exists-2.1.0" - sources."p-limit-1.1.0" - sources."graceful-fs-4.1.11" - sources."imurmurhash-0.1.4" - sources."decompress-response-3.3.0" - sources."duplexer3-0.1.4" - sources."is-plain-obj-1.1.0" - sources."is-retry-allowed-1.1.0" - sources."isurl-1.0.0" - sources."lowercase-keys-1.0.0" - sources."p-cancelable-0.3.0" - sources."p-timeout-1.2.0" - sources."safe-buffer-5.1.1" - sources."timed-out-4.0.1" - sources."url-parse-lax-1.0.0" - sources."url-to-options-1.0.1" - sources."mimic-response-1.0.0" - sources."has-to-string-tag-x-1.4.1" - sources."is-object-1.0.1" - sources."has-symbol-support-x-1.4.1" - sources."prepend-http-1.0.4" - sources."ansi-regex-3.0.0" - sources."babel-core-6.26.0" - sources."babel-plugin-transform-es2015-destructuring-6.23.0" - sources."babel-plugin-transform-object-rest-spread-6.26.0" - sources."babel-plugin-transform-react-jsx-6.24.1" - sources."caller-path-2.0.0" - sources."require-from-string-1.2.1" - sources."resolve-from-3.0.0" - sources."babel-code-frame-6.26.0" - sources."babel-generator-6.26.0" - sources."babel-helpers-6.24.1" - sources."babel-messages-6.23.0" - sources."babel-register-6.26.0" - sources."babel-runtime-6.26.0" - sources."babel-template-6.26.0" - sources."babel-traverse-6.26.0" - sources."babel-types-6.26.0" - sources."babylon-6.18.0" - sources."convert-source-map-1.5.0" - sources."debug-2.6.9" - sources."json5-0.5.1" - sources."lodash-4.17.4" - sources."minimatch-3.0.4" - sources."path-is-absolute-1.0.1" - sources."private-0.1.8" - sources."slash-1.0.0" - sources."source-map-0.5.7" - sources."chalk-2.3.0" - sources."esutils-2.0.2" - sources."js-tokens-3.0.2" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" - sources."detect-indent-4.0.0" - sources."jsesc-1.3.0" - sources."trim-right-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" - sources."core-js-1.2.7" - sources."home-or-tmp-2.0.0" + sources."abbrev-1.1.1" + sources."bluebird-3.5.1" + sources."commander-2.15.1" + sources."config-chain-1.1.11" + sources."editorconfig-0.13.3" + sources."ini-1.3.5" + sources."lru-cache-3.2.0" + sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."source-map-support-0.4.18" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."minimist-1.2.0" - sources."regenerator-runtime-0.11.0" - sources."globals-9.18.0" - sources."invariant-2.2.2" - sources."loose-envify-1.3.1" - sources."to-fast-properties-1.0.3" - sources."ms-2.0.0" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."babel-plugin-syntax-object-rest-spread-6.13.0" - sources."babel-helper-builder-react-jsx-6.26.0" - sources."babel-plugin-syntax-jsx-6.18.0" - sources."caller-callsite-2.0.0" - sources."callsites-2.0.0" - sources."arrify-1.0.1" - sources."indent-string-2.1.0" - sources."lodash.flattendeep-4.4.0" - sources."lodash.isequal-4.5.0" - sources."log-update-2.3.0" - sources."prop-types-15.6.0" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."ansi-escapes-3.0.0" - sources."cli-cursor-2.1.0" - sources."wrap-ansi-3.0.1" - sources."restore-cursor-2.0.0" - sources."onetime-2.0.1" - sources."mimic-fn-1.1.0" - sources."string-width-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."fbjs-0.8.16" - sources."object-assign-4.1.1" - sources."isomorphic-fetch-2.2.1" - sources."promise-7.3.1" - sources."setimmediate-1.0.5" - sources."ua-parser-js-0.7.17" - sources."node-fetch-1.7.3" - sources."whatwg-fetch-2.0.3" - sources."encoding-0.1.12" - sources."iconv-lite-0.4.19" - sources."asap-2.0.6" - 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.4.0" - 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."array-find-index-1.0.2" - sources."hosted-git-info-2.5.0" - sources."is-builtin-module-1.0.0" - sources."semver-5.4.1" - 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."read-pkg-1.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."get-stdin-4.0.1" - sources."unicode-emoji-modifier-base-1.0.0" + sources."nopt-3.0.6" + sources."proto-list-1.2.4" + sources."pseudomap-1.0.2" + sources."semver-5.5.0" + sources."sigmund-1.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "jsbeautifier.org for node"; + homepage = http://jsbeautifier.org/; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + jsonlint = nodeEnv.buildNodePackage { + name = "jsonlint"; + packageName = "jsonlint"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz"; + sha512 = "3f6z8yv4rp9mhcdbmvrmlvk8gdf05qbvn5fk60yq1cvjn00wsvs5i2k7p1bik8kvidsx44kv7r195asnbr8dfi04czhbvpy6crm7icc"; + }; + dependencies = [ + sources."JSV-4.0.2" + sources."ansi-styles-1.0.0" + sources."chalk-0.4.0" + sources."has-color-0.1.7" + sources."nomnom-1.8.1" + sources."strip-ansi-0.1.1" + sources."underscore-1.6.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Validate JSON"; + homepage = http://zaach.github.com/jsonlint/; + }; + production = true; + bypassCache = false; + }; + jsontool = nodeEnv.buildNodePackage { + name = "jsontool"; + packageName = "jsontool"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; + sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "a 'json' command for massaging JSON on the command line"; + homepage = https://github.com/trentm/json; + }; + production = true; + bypassCache = false; + }; + json-diff = nodeEnv.buildNodePackage { + name = "json-diff"; + packageName = "json-diff"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.2.tgz"; + sha512 = "03nqzpjpb0422fm5k7prlfcyb7wbs7dq7arwzq0za8zq3jy4wvbjjsbm25vr8ar5y6y87k9y1iqyc018zfysh2b675ql3qx6jjimfip"; + }; + dependencies = [ + sources."cli-color-0.1.7" + sources."difflib-0.2.4" + sources."dreamopt-0.6.0" + sources."es5-ext-0.8.2" + sources."heap-0.2.6" + sources."wordwrap-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "JSON diff"; + homepage = https://github.com/andreyvit/json-diff; + }; + production = true; + bypassCache = false; + }; + json-refs = nodeEnv.buildNodePackage { + name = "json-refs"; + packageName = "json-refs"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.4.tgz"; + sha512 = "1mbi99gcdrhmkr4nfhfdhwbk2ag55gajxdvzb6m1bddwdwnwn167xx12nypvbs6l0r90k9qrnwmbcbswdm18982b7a7mva27pkc2nah"; + }; + dependencies = [ + sources."argparse-1.0.10" + sources."asynckit-0.4.0" + sources."combined-stream-1.0.6" + sources."commander-2.11.0" + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."core-util-is-1.0.2" + sources."debug-3.1.0" + sources."delayed-stream-1.0.0" + sources."esprima-4.0.0" + sources."extend-3.0.1" + sources."form-data-2.3.2" + sources."formidable-1.2.1" + sources."graphlib-2.1.5" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."js-yaml-3.11.0" + sources."lodash-4.17.5" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."ms-2.0.0" + sources."native-promise-only-0.8.1" + sources."path-loader-1.0.4" + sources."process-nextick-args-2.0.0" + sources."punycode-2.1.0" + sources."qs-6.5.1" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.1" + sources."slash-1.0.0" + sources."sprintf-js-1.0.3" + sources."string_decoder-1.1.1" + sources."superagent-3.8.2" + sources."uri-js-3.0.2" + sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Find relevant emoji from text on the command-line"; - homepage = "https://github.com/sindresorhus/emoj#readme"; + description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; + homepage = https://github.com/whitlockjc/json-refs; license = "MIT"; }; production = true; + bypassCache = false; }; - eslint = nodeEnv.buildNodePackage { - name = "eslint"; - packageName = "eslint"; - version = "4.11.0"; + json-server = nodeEnv.buildNodePackage { + name = "json-server"; + packageName = "json-server"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.11.0.tgz"; - sha512 = "3p35ybksp5c5qbdwb9fpd0dhspjbpnlqhfh3jj7zl6zfcpvljm3fnhfzwx35h8rqb7wi3y3r9w22nabnh4jzm8zwwhnz5lajr1f2rji"; + url = "https://registry.npmjs.org/json-server/-/json-server-0.12.1.tgz"; + sha512 = "3isg3ph43vqfq6m6pg0d1iy7gj2gc6jgym0gp3ng7p9fv7bf1q43isf3wbc7bc9w5swsxqjc3v304ic8iinilwrkwxgks1alaxjs3si"; }; dependencies = [ - sources."ajv-5.3.0" - (sources."babel-code-frame-6.26.0" // { + sources."accepts-1.3.5" + sources."ajv-5.5.2" + sources."ansi-align-2.0.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."array-flatten-1.1.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."basic-auth-2.0.0" + sources."bcrypt-pbkdf-1.0.1" + (sources."body-parser-1.18.2" // { dependencies = [ - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" + sources."setprototypeof-1.0.3" ]; }) - sources."chalk-2.3.0" - sources."concat-stream-1.6.0" - sources."cross-spawn-5.1.0" - sources."debug-3.1.0" - sources."doctrine-2.0.0" - sources."eslint-scope-3.7.1" - sources."espree-3.5.2" - sources."esquery-1.0.0" - sources."estraverse-4.2.0" - sources."esutils-2.0.2" - sources."file-entry-cache-2.0.0" - sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.2" - sources."globals-9.18.0" - sources."ignore-3.3.7" - sources."imurmurhash-0.1.4" - sources."inquirer-3.3.0" - sources."is-resolvable-1.0.0" - sources."js-yaml-3.10.0" - sources."json-stable-stringify-without-jsonify-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-7.0.0" - sources."progress-2.0.0" - sources."require-uncached-1.0.3" - sources."semver-5.4.1" - sources."strip-ansi-4.0.0" - sources."strip-json-comments-2.0.1" - sources."table-4.0.2" - sources."text-table-0.2.0" + sources."boom-4.3.1" + sources."boxen-1.3.0" + sources."bytes-3.0.0" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" + sources."chalk-2.3.2" + sources."ci-info-1.1.3" + sources."cli-boxes-1.0.0" + sources."cliui-4.0.0" sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."js-tokens-3.0.2" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-4.5.0" - sources."ansi-regex-3.0.0" + sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - sources."readable-stream-2.3.3" + sources."combined-stream-1.0.6" + sources."compressible-2.0.13" + sources."compression-1.7.2" + sources."configstore-3.1.2" + sources."connect-pause-0.1.1" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."lru-cache-4.1.1" - sources."shebang-command-1.2.0" - sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."shebang-regex-1.0.0" + sources."cors-2.8.4" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."crypto-random-string-1.0.0" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."deep-extend-0.4.2" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dot-prop-4.2.0" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.1" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."errorhandler-1.5.0" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."execa-0.7.0" + (sources."express-4.16.3" // { + dependencies = [ + sources."statuses-1.4.0" + ]; + }) + (sources."express-urlrewrite-1.2.0" // { + dependencies = [ + sources."path-to-regexp-1.7.0" + ]; + }) + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."finalhandler-1.1.1" + sources."find-up-2.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."get-caller-file-1.0.2" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-flag-3.0.0" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-errors-1.6.3" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."invert-kv-1.0.0" + sources."ipaddr.js-1.6.0" + sources."is-ci-1.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" + sources."is-obj-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."isarray-0.0.1" sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jju-1.3.0" + sources."jsbn-0.1.1" + sources."json-parse-helpfulerror-1.0.3" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."latest-version-3.1.0" + sources."lcid-1.0.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.5" + sources."lodash-id-0.14.0" + sources."lowdb-0.15.5" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" + sources."make-dir-1.2.0" + sources."media-typer-0.3.0" + sources."mem-1.1.0" + sources."merge-descriptors-1.0.1" + sources."method-override-2.3.10" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimist-1.2.0" + sources."morgan-1.9.0" sources."ms-2.0.0" - sources."esrecurse-4.2.0" + sources."nanoid-1.0.2" + sources."negotiator-0.6.1" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" - sources."flat-cache-1.3.0" - sources."circular-json-0.3.3" - 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.2" - 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-3.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."external-editor-2.0.5" - 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.1" - sources."through-2.3.8" - sources."restore-cursor-2.0.0" - sources."onetime-2.0.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."os-locale-2.1.0" + sources."p-finally-1.0.0" + sources."p-limit-1.2.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."package-json-4.0.1" + sources."parseurl-1.3.2" + sources."path-exists-3.0.0" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."pify-3.0.0" + sources."please-upgrade-node-3.0.1" + sources."pluralize-7.0.0" + sources."prepend-http-1.0.4" + sources."proxy-addr-2.0.3" + sources."pseudomap-1.0.2" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."request-2.85.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."server-destroy-1.0.1" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."mimic-fn-1.1.0" - sources."iconv-lite-0.4.19" - sources."jschardet-1.6.0" - sources."tmp-0.0.33" - 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."sntp-2.1.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" + sources."steno-0.4.4" + sources."string-width-2.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.3.0" + sources."term-size-1.2.0" + sources."timed-out-4.0.1" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.16" + sources."unique-string-1.0.0" + sources."unpipe-1.0.0" + sources."unzip-response-2.0.1" + sources."update-notifier-2.4.0" + sources."url-parse-lax-1.0.0" + sources."utils-merge-1.0.1" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."which-1.3.0" + sources."which-module-2.0.0" + sources."widest-line-2.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + (sources."yargs-10.1.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."yargs-parser-8.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Serves JSON files through REST routes."; + homepage = https://github.com/typicode/json-server; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + js-yaml = nodeEnv.buildNodePackage { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz"; + sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; + }; + dependencies = [ + sources."argparse-1.0.10" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" - 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" - sources."fast-levenshtein-2.0.6" - sources."caller-path-0.1.0" - sources."resolve-from-1.0.1" - sources."callsites-0.2.0" - sources."ajv-keywords-2.1.1" - sources."slice-ansi-1.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "An AST-based pattern checker for JavaScript."; - homepage = https://eslint.org/; + description = "YAML 1.2 parser and serializer"; + homepage = https://github.com/nodeca/js-yaml; license = "MIT"; }; production = true; + bypassCache = false; }; - eslint_d = nodeEnv.buildNodePackage { - name = "eslint_d"; - packageName = "eslint_d"; - version = "5.1.0"; + karma = nodeEnv.buildNodePackage { + name = "karma"; + packageName = "karma"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.1.0.tgz"; - sha512 = "3a69fni3gypbhmr458lzxnz7qpik5v7zsxhv4sfb85a7ygngibaxazv5z4i39zvcyivab5z8mnayn496z7v6m0r8j0zkfm39d6i5gwq"; + url = "https://registry.npmjs.org/karma/-/karma-2.0.0.tgz"; + sha512 = "0iyj9ic6sj94x4xdd6wy8zgabqbl2ydrsp8h76lwrcx27ns8pzd7bg8yibsjgddzkisb9p1gp6bn46b8g5m2lh3yj5vqx55q2ks7lib"; }; dependencies = [ - (sources."chalk-1.1.3" // { + sources."JSONStream-1.3.2" + sources."accepts-1.3.5" + sources."acorn-4.0.13" + sources."acorn-node-1.3.0" + sources."addressparser-1.0.1" + sources."after-0.8.2" + sources."agent-base-2.1.1" + sources."ajv-5.5.2" + (sources."amqplib-0.5.2" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-1.3.2" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-filter-0.0.1" + sources."array-map-0.0.0" + sources."array-reduce-0.0.0" + sources."array-slice-0.2.3" + sources."array-unique-0.2.1" + sources."arraybuffer.slice-0.0.7" + sources."asn1-0.2.3" + sources."asn1.js-4.10.1" + sources."assert-1.4.1" + sources."assert-plus-1.0.0" + sources."ast-types-0.11.3" + sources."astw-2.2.0" + sources."async-2.1.5" + sources."async-each-1.0.1" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + (sources."axios-0.15.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."backo2-1.0.2" + sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.5" + sources."base64-js-1.2.3" + sources."base64id-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."better-assert-1.0.2" + sources."binary-extensions-1.11.0" + sources."bitsyntax-0.0.4" + sources."bl-1.1.2" + sources."blob-0.0.4" + sources."bluebird-3.5.1" + sources."bn.js-4.11.8" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."brorand-1.1.0" + sources."browser-pack-6.1.0" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + (sources."browserify-14.5.0" // { + dependencies = [ + sources."acorn-5.5.3" + sources."hash-base-2.0.2" + sources."isarray-2.0.4" + sources."process-nextick-args-2.0.0" + sources."source-map-0.5.7" + ]; + }) + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.0" + sources."browserify-des-1.0.0" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."buffer-5.1.0" + sources."buffer-from-1.0.0" + sources."buffer-more-ints-0.0.2" + sources."buffer-xor-1.0.3" + sources."buildmail-4.0.1" + sources."builtin-status-codes-3.0.0" + sources."bytes-3.0.0" + sources."cached-path-relative-1.0.1" + sources."callsite-1.0.0" + sources."caseless-0.12.0" + sources."chalk-1.1.3" + sources."chokidar-1.7.0" + sources."cipher-base-1.0.4" + sources."circular-json-0.5.1" + sources."co-4.6.0" + sources."colors-1.2.1" + sources."combine-lists-1.0.1" + sources."combine-source-map-0.8.0" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."component-inherit-0.0.3" + sources."concat-map-0.0.1" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" + ]; + }) + (sources."connect-3.6.6" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."content-type-1.0.4" + sources."convert-source-map-1.1.3" + sources."cookie-0.3.1" + sources."core-js-2.5.5" + sources."core-util-is-1.0.2" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."crypto-browserify-3.12.0" + sources."custom-event-1.0.1" + sources."dashdash-1.14.1" + sources."data-uri-to-buffer-1.2.0" + sources."date-format-1.2.0" + sources."date-now-0.1.4" + sources."debug-2.6.9" + sources."deep-is-0.1.3" + sources."defined-1.0.0" + sources."degenerator-1.0.4" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."deps-sort-2.0.0" + sources."des.js-1.0.0" + sources."detective-4.7.1" + sources."di-0.0.1" + sources."diffie-hellman-5.0.2" + sources."dom-serialize-2.2.1" + sources."domain-browser-1.1.7" + sources."double-ended-queue-2.1.0-0" + sources."duplexer2-0.1.4" + sources."ecc-jsbn-0.1.1" + sources."ee-first-1.1.1" + sources."elliptic-6.4.0" + sources."encodeurl-1.0.2" + (sources."engine.io-3.1.5" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.1.6" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."engine.io-parser-2.1.2" + sources."ent-2.2.0" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."escodegen-1.9.1" + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."eventemitter3-1.2.0" + sources."events-1.1.1" + sources."evp_bytestokey-1.0.3" + (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."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."extend-3.0.1" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."file-uri-to-path-1.0.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + sources."finalhandler-1.1.0" + sources."follow-redirects-1.0.0" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.3" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) + sources."function-bind-1.1.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."get-uri-2.0.1" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-1.0.1" + sources."has-ansi-2.0.0" + sources."has-binary2-1.0.2" + sources."has-cors-1.1.0" + sources."hash-base-3.0.4" + sources."hash.js-1.1.3" + sources."hawk-6.0.2" + sources."hipchat-notifier-1.1.0" + sources."hmac-drbg-1.0.1" + sources."hoek-4.2.1" + sources."htmlescape-1.1.1" + sources."http-errors-1.6.3" + sources."http-proxy-1.16.2" + sources."http-proxy-agent-1.0.0" + sources."http-signature-1.2.0" + sources."httpntlm-1.6.1" + sources."httpreq-0.4.24" + sources."https-browserify-1.0.0" + sources."https-proxy-agent-1.0.0" + sources."iconv-lite-0.4.19" + sources."ieee754-1.1.11" + sources."indexof-0.0.1" + sources."inflection-1.10.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."inline-source-map-0.6.2" + (sources."insert-module-globals-7.0.6" // { dependencies = [ - sources."supports-color-2.0.0" + sources."concat-stream-1.6.2" ]; }) - (sources."eslint-4.11.0" // { + sources."ip-1.0.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-property-1.0.2" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isbinaryfile-3.0.2" + sources."isobject-2.1.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stable-stringify-0.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonify-0.0.0" + sources."jsonparse-1.3.1" + sources."jsonpointer-4.0.1" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."labeled-stream-splicer-2.0.1" + sources."levn-0.3.0" + sources."lexical-scope-1.2.0" + sources."libbase64-0.1.0" + sources."libmime-3.0.0" + sources."libqp-1.1.0" + sources."lodash-4.17.5" + sources."lodash.memoize-3.0.4" + (sources."log4js-2.5.3" // { dependencies = [ - sources."chalk-2.3.0" - sources."supports-color-4.5.0" + sources."assert-plus-0.2.0" + sources."aws-sign2-0.6.0" + sources."boom-2.10.1" + sources."caseless-0.11.0" + sources."co-3.0.6" + sources."cryptiles-2.0.5" + sources."debug-3.1.0" + sources."form-data-2.0.0" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" + sources."iconv-lite-0.4.15" + sources."ip-1.1.5" + sources."isarray-0.0.1" + sources."minimist-0.0.8" + sources."ms-0.7.1" + sources."qs-6.2.3" + sources."readable-stream-2.0.6" + sources."request-2.75.0" + sources."sntp-1.0.9" + sources."socks-1.1.9" + sources."string_decoder-0.10.31" + sources."tunnel-agent-0.4.3" ]; }) - sources."optionator-0.8.2" - sources."resolve-1.5.0" - sources."supports-color-3.2.3" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" - sources."ajv-5.3.0" - (sources."babel-code-frame-6.26.0" // { + sources."loggly-1.1.1" + sources."lru-cache-2.6.5" + sources."mailcomposer-4.0.1" + (sources."mailgun-js-0.7.15" // { dependencies = [ - sources."chalk-1.1.3" + sources."debug-2.2.0" + sources."form-data-2.1.4" + sources."semver-5.0.3" ]; }) - sources."concat-stream-1.6.0" - sources."cross-spawn-5.1.0" - sources."debug-3.1.0" - sources."doctrine-2.0.0" - sources."eslint-scope-3.7.1" - sources."espree-3.5.2" - sources."esquery-1.0.0" - sources."estraverse-4.2.0" - sources."esutils-2.0.2" - sources."file-entry-cache-2.0.0" - sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.2" - sources."globals-9.18.0" - sources."ignore-3.3.7" - sources."imurmurhash-0.1.4" - sources."inquirer-3.3.0" - sources."is-resolvable-1.0.0" - sources."js-yaml-3.10.0" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."levn-0.3.0" - sources."lodash-4.17.4" + sources."md5.js-1.3.4" + sources."media-typer-0.3.0" + sources."micromatch-2.3.11" + sources."miller-rabin-4.0.1" + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" + sources."minimist-1.2.0" sources."mkdirp-0.5.1" - sources."natural-compare-1.4.0" - sources."path-is-inside-1.0.2" - sources."pluralize-7.0.0" - sources."progress-2.0.0" - sources."require-uncached-1.0.3" - sources."semver-5.4.1" - sources."strip-json-comments-2.0.1" - sources."table-4.0.2" - sources."text-table-0.2.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."js-tokens-3.0.2" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-1.0.0" - 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."lru-cache-4.1.1" - sources."shebang-command-1.2.0" - sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" + sources."module-deps-4.1.1" sources."ms-2.0.0" - sources."esrecurse-4.2.0" - sources."object-assign-4.1.1" - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" - sources."flat-cache-1.3.0" - sources."circular-json-0.3.3" - 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.2" - 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."nan-2.10.0" + sources."negotiator-0.6.1" + sources."netmask-1.0.6" + sources."node-uuid-1.4.8" + sources."nodemailer-2.7.2" + sources."nodemailer-direct-transport-3.3.2" + sources."nodemailer-fetch-1.6.0" + sources."nodemailer-shared-1.1.0" + sources."nodemailer-smtp-pool-2.8.2" + sources."nodemailer-smtp-transport-2.7.2" + sources."nodemailer-wellknown-0.1.10" + sources."normalize-path-2.1.1" + sources."oauth-sign-0.8.2" + sources."object-component-0.0.3" + sources."object.omit-2.0.1" + sources."on-finished-2.3.0" sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."ansi-escapes-3.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."external-editor-2.0.5" - 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.1" - sources."through-2.3.8" - 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.19" - sources."jschardet-1.6.0" - sources."tmp-0.0.33" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + sources."wordwrap-0.0.3" + ]; + }) + sources."optionator-0.8.2" + sources."os-browserify-0.3.0" 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."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-2.1.1" - sources."slice-ansi-1.0.0" - sources."deep-is-0.1.3" - sources."wordwrap-1.0.0" - sources."fast-levenshtein-2.0.6" + sources."pac-proxy-agent-1.1.0" + sources."pac-resolver-2.0.0" + sources."pako-1.0.6" + sources."parents-1.0.1" + sources."parse-asn1-5.1.0" + sources."parse-glob-3.0.4" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."parseurl-1.3.2" + sources."path-browserify-0.0.0" + sources."path-is-absolute-1.0.1" 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 = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-3.1.2.tgz"; - sha1 = "991e30c80db4b1cf15eacb257620a7edce9c6ef4"; - }; - buildInputs = globalBuildInputs; - meta = { - 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-1.x" = 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" - sources."phantomjs-prebuilt-2.1.16" - 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-2.1.0" - sources."restore-cursor-2.0.0" - sources."exit-hook-1.1.1" - sources."onetime-2.0.1" - 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-0.0.8" - sources."normalize-package-data-2.4.0" - sources."object-assign-4.1.1" - sources."read-pkg-up-1.0.1" - sources."redent-1.0.0" - 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.4.1" - 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."path-platform-0.11.15" + (sources."path-proxy-1.0.0" // { + dependencies = [ + sources."inflection-1.3.8" + ]; + }) + sources."pbkdf2-3.0.14" + sources."performance-now-2.1.0" 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.1.0" - sources."log-symbols-1.0.2" - sources."mimic-fn-1.1.0" - sources."es6-promise-4.1.1" - sources."extract-zip-1.6.6" - sources."fs-extra-1.0.0" - sources."hasha-2.2.0" - sources."kew-0.7.0" - sources."progress-1.1.8" - sources."request-2.83.0" - sources."request-progress-2.0.1" - sources."which-1.3.0" - sources."concat-stream-1.6.0" - sources."debug-2.6.9" - sources."mkdirp-0.5.0" - sources."yauzl-2.4.1" - 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."pinkie-promise-2.0.1" + sources."prelude-ls-1.1.2" + sources."preserve-0.2.0" + sources."process-0.11.10" sources."process-nextick-args-1.0.7" + sources."proxy-agent-2.0.0" + sources."pseudomap-1.0.2" + sources."public-encrypt-4.0.0" + sources."punycode-1.4.1" + sources."q-1.4.1" + sources."qjobs-1.2.0" + sources."qs-6.5.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."randombytes-2.0.6" + sources."randomfill-1.0.4" + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."read-only-stream-2.0.0" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."isarray-1.0.0" + sources."string_decoder-1.1.1" + ]; + }) + sources."readdirp-2.1.0" + sources."redis-2.8.0" + sources."redis-commands-1.3.5" + sources."redis-parser-2.6.0" + sources."regex-cache-0.4.4" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."request-2.85.0" + sources."requestretry-1.13.0" + sources."requires-port-1.0.0" + sources."resolve-1.7.0" + sources."rimraf-2.6.2" + sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."set-immediate-shim-1.0.1" + sources."setprototypeof-1.1.0" + sources."sha.js-2.4.11" + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + sources."slack-node-0.2.0" + sources."smart-buffer-1.1.15" + sources."smtp-connection-2.12.0" + sources."sntp-2.1.0" + (sources."socket.io-2.0.4" // { + dependencies = [ + sources."isarray-2.0.1" + ]; + }) + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.0.4" + (sources."socket.io-parser-3.1.3" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."socks-1.1.10" + sources."socks-proxy-agent-2.1.1" + sources."source-map-0.6.1" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" + sources."stream-browserify-2.0.1" + sources."stream-combiner2-1.1.1" + sources."stream-http-2.8.1" + sources."stream-splicer-2.0.0" + sources."streamroller-0.7.0" sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."ms-2.0.0" - 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.7.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.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."qs-6.5.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" + sources."strip-ansi-3.0.1" + sources."subarg-1.0.0" + sources."supports-color-2.0.0" + sources."syntax-error-1.4.0" + sources."through-2.3.8" + sources."through2-2.0.3" + sources."thunkify-2.1.2" + sources."timers-browserify-1.4.2" + sources."timespan-2.3.0" + sources."tmp-0.0.33" + sources."to-array-0.1.4" + sources."to-arraybuffer-1.0.1" + sources."tough-cookie-2.3.4" + sources."tsscmp-1.0.5" + sources."tty-browserify-0.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."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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.30.0" - sources."punycode-1.4.1" - sources."throttleit-1.0.0" - sources."isexe-2.0.0" - sources."mkpath-1.0.0" - sources."node-phantom-simple-2.2.4" - sources."tmp-0.0.31" - sources."os-tmpdir-1.0.2" + sources."type-check-0.3.2" + sources."type-is-1.6.16" + sources."typedarray-0.0.6" + sources."ultron-1.1.1" + sources."umd-3.0.3" + sources."underscore-1.7.0" + sources."unpipe-1.0.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."useragent-2.3.0" // { + dependencies = [ + sources."lru-cache-4.1.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.2.1" + sources."uws-9.14.0" + sources."verror-1.10.0" + sources."vm-browserify-0.0.4" + sources."void-elements-2.0.1" + sources."when-3.7.8" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."ws-3.3.3" + sources."xmlhttprequest-ssl-1.5.5" + sources."xregexp-2.0.0" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Test your download speed using fast.com"; - homepage = "https://github.com/sindresorhus/fast-cli#readme"; + description = "Spectacular Test Runner for JavaScript."; + homepage = http://karma-runner.github.io/; license = "MIT"; }; production = true; + bypassCache = false; }; - fetch-bower = nodeEnv.buildNodePackage { - name = "fetch-bower"; - packageName = "fetch-bower"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fetch-bower/-/fetch-bower-2.0.0.tgz"; - sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f"; + "kibana-authentication-proxy-git://github.com/fangli/kibana-authentication-proxy.git" = nodeEnv.buildNodePackage { + name = "kibana-authentication-proxy"; + packageName = "kibana-authentication-proxy"; + version = "1.1.0"; + src = fetchgit { + url = "git://github.com/fangli/kibana-authentication-proxy.git"; + rev = "0c0173b0cb51b392b7fc04d0cc728ffb64671ef3"; + sha256 = "a282e834ff67715017f299468ff0d7e496d2bc0f1f7b075b557568b7feb3dba7"; }; dependencies = [ - sources."bower-endpoint-parser-0.2.1" - sources."bower-logger-0.2.1" - sources."bower-1.8.2" - sources."glob-3.2.11" + sources."accepts-1.2.13" + sources."base64-url-1.2.1" + sources."basic-auth-1.0.4" + sources."basic-auth-connect-1.0.0" + sources."batch-0.5.3" + sources."body-parser-1.13.3" + sources."bytes-2.1.0" + sources."commander-2.6.0" + sources."compressible-2.0.13" + sources."compression-1.5.2" + (sources."connect-2.30.2" // { + dependencies = [ + sources."accepts-1.2.13" + sources."escape-html-1.0.3" + sources."ms-0.7.2" + sources."negotiator-0.5.3" + sources."send-0.13.2" + sources."vary-1.1.2" + ]; + }) + sources."connect-restreamer-1.0.3" + sources."connect-timeout-1.6.2" + sources."content-disposition-0.5.0" + sources."content-type-1.0.4" + sources."cookie-0.1.3" + sources."cookie-parser-1.3.5" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + sources."crc-3.3.0" + sources."csrf-3.0.6" + sources."csurf-1.8.3" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."depd-1.0.1" + sources."destroy-1.0.4" + sources."ee-first-1.1.1" + sources."errorhandler-1.4.3" + sources."escape-html-1.0.2" + sources."etag-1.7.0" + (sources."express-3.21.2" // { + dependencies = [ + sources."accepts-1.3.5" + sources."destroy-1.0.3" + sources."ms-2.0.0" + sources."negotiator-0.6.1" + sources."statuses-1.2.1" + sources."uid-safe-2.0.0" + ]; + }) + sources."express-session-1.11.3" + (sources."finalhandler-0.4.0" // { + dependencies = [ + sources."escape-html-1.0.2" + ]; + }) + sources."forwarded-0.1.2" + sources."fresh-0.3.0" + sources."http-errors-1.3.1" + sources."iconv-lite-0.4.11" sources."inherits-2.0.3" - sources."minimatch-0.3.0" - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Companion to bower2nix to be used in the fetchBower fixed-output derivation"; - homepage = https://bitbucket.org/shlevy/fetch-bower; - }; - production = true; - }; - forever = nodeEnv.buildNodePackage { - name = "forever"; - packageName = "forever"; - version = "0.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-0.15.3.tgz"; - sha1 = "77d9d7e15fd2f511ad9d84a110c7dd8fc8ecebc2"; - }; - dependencies = [ - (sources."cliff-0.1.10" // { + sources."ipaddr.js-1.0.5" + sources."isarray-0.0.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.0" + (sources."method-override-2.3.10" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."methods-1.1.2" + sources."mime-1.3.4" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."morgan-1.6.1" + sources."ms-0.7.1" + sources."multiparty-3.3.2" + sources."negotiator-0.5.3" + sources."oauth-0.9.15" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."parseurl-1.3.2" + (sources."passport-0.4.0" // { dependencies = [ - sources."colors-1.0.3" + sources."pause-0.0.1" ]; }) - sources."clone-1.0.3" - sources."colors-0.6.2" - (sources."flatiron-0.4.3" // { + sources."passport-google-oauth-1.0.0" + sources."passport-google-oauth1-1.0.0" + sources."passport-google-oauth20-1.0.0" + sources."passport-oauth1-1.1.0" + sources."passport-oauth2-1.4.0" + sources."passport-strategy-1.0.0" + sources."pause-0.1.0" + sources."proxy-addr-1.0.10" + sources."qs-4.0.0" + sources."random-bytes-1.0.0" + sources."range-parser-1.0.3" + (sources."raw-body-2.1.7" // { dependencies = [ - sources."optimist-0.6.0" - sources."cliff-0.1.9" - sources."winston-0.8.0" + sources."bytes-2.4.0" + sources."iconv-lite-0.4.13" ]; }) - (sources."forever-monitor-1.7.1" // { + sources."readable-stream-1.1.14" + (sources."response-time-2.3.2" // { dependencies = [ - sources."optimist-0.2.8" + sources."depd-1.1.2" ]; }) - (sources."nconf-0.6.9" // { + sources."rndm-1.2.0" + sources."sax-1.2.4" + (sources."send-0.13.0" // { dependencies = [ - sources."optimist-0.6.0" + sources."ms-0.7.1" ]; }) - sources."nssocket-0.5.3" - sources."object-assign-3.0.0" - sources."optimist-0.6.1" - sources."path-is-absolute-1.0.1" - (sources."prettyjson-1.2.1" // { + sources."serve-favicon-2.3.2" + sources."serve-index-1.7.3" + (sources."serve-static-1.10.3" // { dependencies = [ - sources."colors-1.1.2" + sources."depd-1.1.2" + sources."ms-0.7.1" ]; }) - sources."shush-1.0.0" - sources."timespan-2.3.0" - sources."utile-0.2.1" - sources."winston-0.8.3" - sources."eyes-0.1.8" - sources."broadway-0.3.6" - sources."prompt-0.2.14" - sources."director-1.2.7" - sources."eventemitter2-0.4.14" - sources."async-0.2.9" - sources."cycle-1.0.3" - sources."pkginfo-0.3.1" - sources."stack-trace-0.0.10" - sources."wordwrap-0.0.3" - sources."minimist-0.0.8" - sources."read-1.0.7" - sources."revalidator-0.1.8" - sources."mute-stream-0.0.7" - sources."chokidar-1.7.0" - sources."minimatch-3.0.4" - sources."ps-tree-0.0.3" - sources."anymatch-1.3.2" - sources."async-each-1.0.1" - sources."glob-parent-2.0.0" - sources."inherits-2.0.3" - sources."is-binary-path-1.0.1" - sources."is-glob-2.0.1" - sources."readdirp-2.1.0" - sources."fsevents-1.1.3" - sources."micromatch-2.3.11" - sources."normalize-path-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" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."kind-of-3.2.2" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - 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-3.0.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."repeat-string-1.6.1" - sources."isarray-1.0.0" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - 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."remove-trailing-separator-1.1.0" - sources."binary-extensions-1.10.0" - sources."graceful-fs-4.1.11" - sources."readable-stream-2.3.3" - sources."set-immediate-shim-1.0.1" - sources."core-util-is-1.0.2" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."nan-2.7.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" - sources."ini-1.3.4" - sources."lazy-1.0.11" - sources."strip-json-comments-0.1.3" - 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" - sources."resumer-0.0.0" - sources."i-0.3.6" - sources."mkdirp-0.5.1" - sources."ncp-0.4.2" - sources."rimraf-2.6.2" - 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."isstream-0.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A simple CLI tool for ensuring that a given node script runs continuously (i.e. forever)"; - homepage = "https://github.com/foreverjs/forever#readme"; - license = "MIT"; - }; - production = true; - }; - git-run = nodeEnv.buildNodePackage { - name = "git-run"; - packageName = "git-run"; - version = "0.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/git-run/-/git-run-0.5.5.tgz"; - sha512 = "0j00v2mkrqla05ynq3cziyh4vslsshbkxdyqbzzg2vkg3if0ln0klsf5hck457pxksqky9gcsybc73c2sf6hgf910wzz5yljlxc5b7g"; - }; - dependencies = [ - sources."async-2.6.0" - sources."lodash.groupby-4.6.0" - sources."minilog-3.1.0" - sources."simple-git-1.82.0" - sources."tabtab-git+https://github.com/mixu/node-tabtab.git" - sources."lodash-4.17.4" - sources."microee-0.0.6" - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A tool for managing multiple git repositories"; - homepage = "https://github.com/mixu/gr#readme"; - license = "BSD-3-Clause"; - }; - 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"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz"; - sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; - }; - dependencies = [ - sources."findup-sync-0.3.0" - sources."grunt-known-options-1.1.0" - sources."nopt-3.0.6" - sources."resolve-1.1.7" - sources."glob-5.0.15" - 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."abbrev-1.1.1" + sources."statuses-1.5.0" + sources."stream-counter-0.2.0" + sources."string_decoder-0.10.31" + sources."tsscmp-1.0.5" + sources."type-is-1.6.16" + sources."uid-safe-2.1.4" + sources."uid2-0.0.3" + sources."unpipe-1.0.0" + sources."utils-merge-1.0.0" + sources."vary-1.0.1" + sources."vhost-3.0.2" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" ]; buildInputs = globalBuildInputs; meta = { - description = "The grunt command line interface"; - homepage = "https://github.com/gruntjs/grunt-cli#readme"; + description = "Hosts the latest kibana3 and elasticsearch behind Google OAuth2, Basic Auth or CAS Authentication"; license = "MIT"; }; production = true; + bypassCache = false; }; - "guifi-earth-https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = nodeEnv.buildNodePackage { - name = "guifi-earth"; - packageName = "guifi-earth"; - version = "0.2.1"; + lerna = nodeEnv.buildNodePackage { + name = "lerna"; + packageName = "lerna"; + version = "2.10.1"; src = fetchurl { - name = "guifi-earth-0.2.1.tar.gz"; - url = https://codeload.github.com/jmendeth/guifi-earth/legacy.tar.gz/f3ee96835fd4fb0e3e12fadbd2cb782770d64854; - sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.10.1.tgz"; + sha512 = "1y2pnipc1wsra1gdj77c4217xcycdwycda28drnh7sf43hcw4ang1x859i95m084v9ahcjysdb7ap2c3zk6ivm0q3way48k1xxnci57"; }; dependencies = [ - sources."coffee-script-1.12.7" - sources."jade-1.11.0" - sources."q-2.0.3" - sources."xml2js-0.4.19" - sources."msgpack-1.0.2" - sources."character-parser-1.2.1" - sources."clean-css-3.4.28" - sources."commander-2.8.1" - sources."constantinople-3.0.2" - sources."jstransformer-0.0.2" - sources."mkdirp-0.5.1" - sources."transformers-2.1.0" - sources."uglify-js-2.2.5" - sources."void-elements-2.0.1" - sources."with-4.0.3" - sources."source-map-0.5.7" - sources."graceful-readlink-1.0.1" + sources."JSONStream-1.3.2" + sources."add-stream-1.0.0" + sources."align-text-0.1.4" sources."amdefine-1.0.1" - sources."acorn-2.7.0" - sources."is-promise-1.0.1" - sources."promise-2.0.0" - sources."asap-2.0.6" - sources."minimist-0.0.8" - sources."css-1.0.8" - sources."css-parse-1.0.4" - sources."css-stringify-1.0.5" - sources."optimist-0.3.7" - sources."wordwrap-0.0.2" - sources."yargs-3.10.0" - sources."uglify-to-browserify-1.0.2" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."array-find-index-1.0.2" + sources."array-ify-1.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + sources."async-1.5.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" + sources."builtin-modules-1.1.1" + sources."byline-5.0.0" sources."camelcase-1.2.1" - sources."cliui-2.1.0" - sources."decamelize-1.2.0" - sources."window-size-0.1.0" + sources."camelcase-keys-2.1.0" + sources."capture-stack-trace-1.0.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.2.2" - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.6" - sources."acorn-globals-1.0.9" - sources."pop-iterate-1.0.1" - sources."weak-map-1.0.5" - sources."sax-1.2.4" - sources."xmlbuilder-9.0.4" - sources."nan-2.7.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "See a representation of the Guifi.net network in Google Earth."; - homepage = https://github.com/jmendeth/guifi-earth; - }; - production = true; - }; - gulp = nodeEnv.buildNodePackage { - name = "gulp"; - packageName = "gulp"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; - sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; - }; - dependencies = [ - sources."archy-1.0.0" - sources."chalk-1.1.3" - sources."deprecated-0.0.1" - sources."gulp-util-3.0.8" - sources."interpret-1.0.4" - 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.1.1" - (sources."vinyl-fs-0.3.14" // { + sources."chalk-2.3.2" + sources."chardet-0.4.2" + sources."ci-info-1.1.3" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."cliui-2.1.0" + sources."clone-1.0.4" + sources."cmd-shim-2.0.2" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."columnify-1.5.4" + sources."command-join-2.0.0" + sources."compare-func-1.3.2" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-control-strings-1.1.0" + (sources."conventional-changelog-1.1.23" // { dependencies = [ - sources."minimist-0.0.8" + sources."camelcase-4.1.0" + sources."map-obj-1.0.1" + sources."meow-3.7.0" + ]; + }) + sources."conventional-changelog-angular-1.6.6" + sources."conventional-changelog-atom-0.2.8" + (sources."conventional-changelog-cli-1.3.21" // { + dependencies = [ + sources."camelcase-2.1.1" + sources."camelcase-keys-4.2.0" + sources."find-up-1.1.2" + sources."indent-string-3.2.0" + sources."load-json-file-1.1.0" + sources."map-obj-2.0.0" + sources."minimist-1.2.0" + sources."parse-json-4.0.0" + sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-3.0.0" + sources."redent-2.0.0" + sources."strip-bom-3.0.0" + sources."strip-indent-2.0.0" + sources."trim-newlines-2.0.0" + sources."wordwrap-0.0.2" + sources."yargs-3.10.0" + ]; + }) + sources."conventional-changelog-codemirror-0.3.8" + (sources."conventional-changelog-core-2.0.10" // { + dependencies = [ + sources."meow-4.0.0" + ]; + }) + sources."conventional-changelog-ember-0.3.11" + sources."conventional-changelog-eslint-1.0.9" + sources."conventional-changelog-express-0.3.6" + sources."conventional-changelog-jquery-0.1.0" + sources."conventional-changelog-jscs-0.1.0" + sources."conventional-changelog-jshint-0.3.8" + sources."conventional-changelog-preset-loader-1.1.8" + sources."conventional-changelog-writer-3.0.9" + sources."conventional-commits-filter-1.1.6" + sources."conventional-commits-parser-2.1.7" + (sources."conventional-recommended-bump-1.2.1" // { + dependencies = [ + sources."meow-3.7.0" + sources."minimist-1.2.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."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."array-differ-1.0.0" - sources."array-uniq-1.0.3" - sources."beeper-1.1.1" - sources."dateformat-2.2.0" - sources."fancy-log-1.3.0" - sources."gulplog-1.0.0" - sources."has-gulplog-0.1.0" - sources."lodash._reescape-3.0.0" - sources."lodash._reevaluate-3.0.0" - sources."lodash._reinterpolate-3.0.0" - sources."lodash.template-3.6.2" - sources."multipipe-0.1.2" - sources."object-assign-3.0.0" - sources."replace-ext-0.0.1" - sources."through2-0.6.5" - sources."vinyl-0.4.6" - sources."time-stamp-1.1.0" - sources."glogg-1.0.0" - sources."sparkles-1.0.0" - sources."lodash._basecopy-3.0.1" - sources."lodash._basetostring-3.0.1" - sources."lodash._basevalues-3.0.0" - sources."lodash._isiterateecall-3.0.9" - sources."lodash.escape-3.2.0" - sources."lodash.keys-3.1.2" - sources."lodash.restparam-3.6.1" - sources."lodash.templatesettings-3.1.1" - sources."lodash._root-3.0.1" - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - sources."duplexer2-0.0.2" - sources."readable-stream-1.0.34" sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."currently-unhandled-0.4.1" + sources."dargs-4.1.0" + sources."dateformat-3.0.3" + sources."decamelize-1.2.0" + sources."decamelize-keys-1.1.0" + sources."dedent-0.7.0" + sources."deep-extend-0.4.2" + sources."defaults-1.0.3" + sources."delegates-1.0.0" + sources."detect-indent-5.0.0" + sources."dot-prop-3.0.0" + sources."duplexer-0.1.1" + sources."duplexer3-0.1.4" + sources."error-ex-1.3.1" + sources."escape-string-regexp-1.0.5" + sources."execa-0.8.0" + sources."external-editor-2.2.0" + sources."figures-2.0.0" + sources."find-up-2.1.0" + sources."fs-extra-4.0.3" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-caller-file-1.0.2" + sources."get-pkg-repo-1.4.0" + sources."get-port-3.2.0" + sources."get-stdin-4.0.1" + sources."get-stream-3.0.0" + (sources."git-raw-commits-1.3.6" // { + dependencies = [ + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + ]; + }) + sources."git-remote-origin-url-2.0.0" + sources."git-semver-tags-1.3.6" + sources."gitconfiglocal-1.0.0" + sources."glob-7.1.2" + sources."glob-parent-3.1.0" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."handlebars-4.0.11" + sources."has-flag-3.0.0" + sources."has-unicode-2.0.1" + sources."hosted-git-info-2.6.0" + sources."iconv-lite-0.4.21" + sources."imurmurhash-0.1.4" + sources."indent-string-2.1.0" + sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."xtend-4.0.1" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."util-deprecate-1.0.2" - sources."clone-0.2.0" - sources."clone-stats-0.0.1" - sources."extend-3.0.1" - sources."findup-sync-0.4.3" - sources."fined-1.1.0" - 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.5.0" - sources."detect-file-0.1.0" - sources."is-glob-2.0.1" - sources."micromatch-2.3.11" - sources."resolve-dir-0.1.1" - sources."fs-exists-sync-0.1.0" - sources."is-extglob-1.0.0" - 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."ini-1.3.5" + (sources."inquirer-3.3.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."invert-kv-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + sources."is-ci-1.1.0" + sources."is-extglob-2.1.1" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + sources."is-obj-1.0.1" + sources."is-plain-obj-1.1.0" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-subset-0.1.1" + sources."is-text-path-1.0.1" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."json-parse-better-errors-1.0.2" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-4.0.0" + sources."jsonparse-1.3.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.4" - 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-3.0.0" - sources."isobject-3.0.1" - sources."randomatic-1.1.7" + sources."lazy-cache-1.0.4" + sources."lcid-1.0.0" + (sources."load-json-file-4.0.0" // { + dependencies = [ + sources."parse-json-4.0.0" + sources."strip-bom-3.0.0" + ]; + }) + sources."locate-path-2.0.0" + sources."lodash-4.17.5" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.template-4.4.0" + sources."lodash.templatesettings-4.1.0" + sources."longest-1.0.1" + sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" + sources."make-dir-1.2.0" + sources."map-obj-1.0.1" + sources."mem-1.1.0" + (sources."meow-4.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."load-json-file-4.0.0" + sources."path-exists-3.0.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."read-pkg-3.0.0" + ]; + }) + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minimist-options-3.0.2" + sources."mkdirp-0.5.1" + sources."modify-values-1.0.1" + sources."moment-2.22.0" + sources."mute-stream-0.0.7" + sources."normalize-package-data-2.4.0" + sources."npm-run-path-2.0.2" + (sources."npmlog-4.1.2" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + ]; + }) + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optimist-0.6.1" + sources."os-locale-2.1.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-1.2.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + (sources."package-json-4.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."parse-github-repo-url-1.4.1" + sources."parse-json-2.2.0" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."q-1.5.1" + sources."quick-lru-1.1.0" + sources."rc-1.2.6" + sources."read-cmd-shim-1.0.1" + sources."read-pkg-3.0.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" + sources."redent-1.0.0" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.1.0" - sources."for-own-1.0.0" - 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."expand-tilde-2.0.2" - sources."global-modules-0.2.3" - sources."os-homedir-1.0.2" - sources."global-prefix-0.1.5" - sources."is-windows-0.2.0" - sources."homedir-polyfill-1.0.1" - sources."ini-1.3.4" + sources."repeating-2.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."restore-cursor-2.0.0" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."semver-5.5.0" + sources."set-blocking-2.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slash-1.0.0" + sources."sort-keys-2.0.0" + sources."source-map-0.4.4" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."split-1.0.1" + sources."split2-2.2.0" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-eof-1.0.0" + sources."strip-indent-1.0.1" + sources."strip-json-comments-2.0.1" + (sources."strong-log-transformer-1.0.6" // { + dependencies = [ + sources."minimist-0.1.0" + ]; + }) + sources."supports-color-5.3.0" + sources."temp-dir-1.0.0" + (sources."temp-write-3.4.0" // { + dependencies = [ + sources."uuid-3.2.1" + ]; + }) + sources."tempfile-1.1.1" + sources."text-extensions-1.7.0" + sources."through-2.3.8" + sources."through2-2.0.3" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."trim-newlines-1.0.0" + sources."trim-off-newlines-1.0.1" + sources."typedarray-0.0.6" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."universalify-0.1.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-2.0.3" + sources."validate-npm-package-license-3.0.3" + sources."wcwidth-1.0.1" sources."which-1.3.0" - sources."parse-passwd-1.0.0" - sources."isexe-2.0.0" - sources."is-plain-object-2.0.4" - sources."object.defaults-1.1.0" - sources."object.pick-1.3.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" - sources."is-relative-0.2.1" - sources."is-unc-path-0.1.2" - sources."unc-path-regex-0.1.2" - sources."path-root-regex-0.1.2" - sources."path-parse-1.0.5" - sources."end-of-stream-0.1.5" - sources."sequencify-0.0.7" - sources."stream-consume-0.1.0" - sources."once-1.3.3" + sources."which-module-2.0.0" + sources."wide-align-1.1.2" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" - sources."user-home-1.1.1" - sources."defaults-1.0.3" - sources."glob-stream-3.1.18" - sources."glob-watcher-0.0.6" - sources."graceful-fs-1.2.3" - sources."mkdirp-0.5.1" - sources."strip-bom-1.0.0" - sources."glob-3.1.21" - sources."minimatch-0.2.14" - sources."ordered-read-streams-0.1.0" - sources."glob2base-0.0.12" - sources."unique-stream-1.0.0" - sources."inflight-1.0.6" - 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" - sources."globule-0.1.0" - sources."lodash-1.0.2" - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" - sources."natives-1.1.0" - sources."first-chunk-stream-1.0.0" - sources."is-utf8-0.2.1" + sources."write-file-atomic-2.3.0" + sources."write-json-file-2.3.0" + sources."write-pkg-3.1.0" + sources."xtend-4.0.1" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + (sources."yargs-8.0.2" // { + dependencies = [ + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."execa-0.7.0" + sources."is-fullwidth-code-point-1.0.0" + sources."load-json-file-2.0.0" + sources."path-type-2.0.0" + sources."pify-2.3.0" + sources."read-pkg-2.0.0" + sources."read-pkg-up-2.0.0" + sources."strip-bom-3.0.0" + ]; + }) + sources."yargs-parser-7.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "The streaming build system"; - homepage = http://gulpjs.com/; + description = "Tool for managing JavaScript projects with multiple packages"; + homepage = https://lernajs.io/; license = "MIT"; }; production = true; + bypassCache = false; }; - hipache = nodeEnv.buildNodePackage { - name = "hipache"; - packageName = "hipache"; - version = "0.3.1"; + less = nodeEnv.buildNodePackage { + name = "less"; + packageName = "less"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz"; - sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5"; + url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz"; + sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59"; }; dependencies = [ - sources."http-proxy-1.0.2" - sources."redis-0.10.3" - sources."lru-cache-2.5.2" + sources."ajv-4.11.8" + sources."asap-2.0.6" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.7.0" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-2.10.1" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."combined-stream-1.0.6" + sources."core-util-is-1.0.2" + sources."cryptiles-2.0.5" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."errno-0.1.7" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."getpass-0.1.7" + sources."graceful-fs-4.1.11" + sources."har-schema-1.0.5" + sources."har-validator-4.2.1" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" + sources."image-size-0.5.5" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonify-0.0.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimist-0.0.8" - sources."eventemitter3-2.0.3" + sources."mkdirp-0.5.1" + sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."promise-7.3.1" + sources."prr-1.0.1" + sources."punycode-1.4.1" + sources."qs-6.4.0" + sources."request-2.81.0" + sources."safe-buffer-5.1.1" + sources."sntp-1.0.9" + sources."source-map-0.5.7" + (sources."sshpk-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uuid-3.2.1" + sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Complete high-scaled reverse-proxy solution"; - homepage = https://github.com/dotcloud/hipache; - license = "MIT"; + description = "Leaner CSS"; + homepage = http://lesscss.org/; + license = "Apache-2.0"; }; production = true; + bypassCache = false; }; - htmlhint = nodeEnv.buildNodePackage { - name = "htmlhint"; - packageName = "htmlhint"; - version = "0.9.13"; + less-plugin-clean-css = nodeEnv.buildNodePackage { + name = "less-plugin-clean-css"; + packageName = "less-plugin-clean-css"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz"; - sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88"; + url = "https://registry.npmjs.org/less-plugin-clean-css/-/less-plugin-clean-css-1.5.1.tgz"; + sha1 = "cc57af7aa3398957e56decebe63cb60c23429703"; }; dependencies = [ - sources."async-1.4.2" - sources."colors-1.0.3" - sources."commander-2.6.0" - sources."csslint-0.10.0" - sources."glob-5.0.15" - (sources."jshint-2.8.0" // { - dependencies = [ - sources."glob-3.2.11" - ]; - }) - sources."parse-glob-3.0.4" - sources."strip-json-comments-1.0.4" - sources."xml-1.0.0" - sources."parserlib-0.2.5" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."minimatch-0.3.0" - 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."cli-0.6.6" - sources."console-browserify-1.1.0" - sources."exit-0.1.2" - sources."htmlparser2-3.8.3" - sources."shelljs-0.3.0" - sources."lodash-3.7.0" - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" - sources."date-now-0.1.4" - sources."domhandler-2.3.0" - sources."domutils-1.5.1" - sources."domelementtype-1.1.3" - sources."readable-stream-1.1.14" - sources."entities-1.1.1" - sources."dom-serializer-0.1.0" - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."glob-base-0.3.0" - sources."is-dotfile-1.0.3" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."glob-parent-2.0.0" + sources."amdefine-1.0.1" + sources."clean-css-3.4.28" + sources."commander-2.8.1" + sources."graceful-readlink-1.0.1" + sources."source-map-0.4.4" ]; buildInputs = globalBuildInputs; meta = { - description = "A Static Code Analysis Tool for HTML"; - homepage = "https://github.com/yaniswang/HTMLHint#readme"; - license = "MIT"; + description = "clean-css plugin for less.js"; + homepage = http://lesscss.org/; }; production = true; + bypassCache = false; }; - ionic = nodeEnv.buildNodePackage { - name = "ionic"; - packageName = "ionic"; - version = "3.18.0"; + lcov-result-merger = nodeEnv.buildNodePackage { + name = "lcov-result-merger"; + packageName = "lcov-result-merger"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-3.18.0.tgz"; - sha512 = "26m3rzj32n72b812d8v0wjxw9dkmhi6qanjv85k0w847nrb9fqh12j2mgspadgnrv80j3whj7mbblc1q6kdf68mm8zsdhgzq6d5xbkx"; + url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-2.0.0.tgz"; + sha512 = "1y38jkc5m8kb1ll4wcc12yikqdb2l19acc3rdjl0bhs4vjh834mz53hhgyc4jm4gya1gnmzrj3g5337xn05kkxs92vl35zdqcwxij08"; }; dependencies = [ - sources."@ionic/cli-framework-0.1.1" - sources."@ionic/cli-utils-1.18.0" - sources."chalk-2.3.0" - sources."opn-5.1.0" - sources."os-name-2.0.1" - sources."semver-5.4.1" - sources."tslib-1.8.0" - sources."ncp-2.0.0" - sources."rimraf-2.6.2" - sources."strip-ansi-4.0.0" - sources."superagent-3.8.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.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."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-unique-0.2.1" sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."clone-2.1.2" + sources."clone-buffer-1.0.0" + sources."clone-stats-1.0.0" + sources."cloneable-readable-1.1.2" sources."concat-map-0.0.1" - sources."ansi-regex-3.0.0" - sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" - sources."debug-2.6.9" - sources."extend-3.0.1" - sources."form-data-2.3.1" - sources."formidable-1.1.1" - sources."methods-1.1.2" - sources."mime-1.4.1" - sources."qs-6.5.1" - sources."readable-stream-2.3.3" - sources."ms-2.0.0" - sources."asynckit-0.4.0" - sources."combined-stream-1.0.5" - sources."mime-types-2.1.17" - sources."delayed-stream-1.0.0" - sources."mime-db-1.30.0" + sources."convert-source-map-1.5.1" 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-0.10.31" - sources."util-deprecate-1.0.2" - sources."@ionic/discover-0.4.0" - sources."archiver-2.1.0" - sources."basic-auth-1.1.0" - sources."body-parser-1.18.2" - sources."chokidar-1.7.0" - sources."ci-info-1.1.1" - sources."cross-spawn-5.1.0" - sources."dargs-5.1.0" - sources."diff-3.4.0" - sources."elementtree-0.1.7" - sources."express-4.16.2" - sources."inquirer-3.3.0" - sources."leek-0.0.24" - sources."lodash-4.17.4" - sources."minimist-0.0.8" - sources."proxy-middleware-0.15.0" - sources."slice-ansi-1.0.0" - sources."ssh-config-1.1.3" - sources."string-width-2.1.1" - sources."tar-4.0.2" - sources."tiny-lr-1.0.5" - sources."uuid-3.1.0" - sources."wrap-ansi-3.0.1" - sources."ws-3.3.1" - sources."netmask-1.0.6" - sources."archiver-utils-1.3.0" - sources."async-2.6.0" - sources."buffer-crc32-0.2.13" - sources."tar-stream-1.5.5" - sources."zip-stream-1.2.0" - sources."graceful-fs-4.1.11" - sources."lazystream-1.0.0" - sources."normalize-path-2.1.1" - sources."remove-trailing-separator-1.1.0" - sources."bl-1.2.1" - sources."end-of-stream-1.4.0" - sources."xtend-4.0.1" - sources."compress-commons-1.2.2" - sources."crc32-stream-2.0.0" - sources."crc-3.5.0" - sources."bytes-1.0.0" - sources."content-type-1.0.4" - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."on-finished-2.3.0" - sources."raw-body-1.1.7" - sources."type-is-1.6.15" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" - sources."ee-first-1.1.1" - sources."unpipe-1.0.0" - sources."media-typer-0.3.0" - sources."anymatch-1.3.2" - 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."readdirp-2.1.0" - sources."fsevents-1.1.3" - sources."micromatch-2.3.11" - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - sources."braces-1.8.5" + sources."duplexify-3.5.4" + sources."end-of-stream-1.4.1" sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."extend-3.0.1" + sources."extend-shallow-2.0.1" sources."extglob-0.3.2" sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."kind-of-3.2.2" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - 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-3.0.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - sources."for-own-0.1.5" - sources."is-extendable-0.1.1" + sources."first-chunk-stream-1.0.0" sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."glob-5.0.15" sources."glob-base-0.3.0" + sources."glob-parent-3.1.0" + (sources."glob-stream-5.3.5" // { + dependencies = [ + sources."readable-stream-1.0.34" + sources."through2-0.6.5" + ]; + }) + sources."graceful-fs-4.1.11" + sources."gulp-sourcemaps-1.6.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-buffer-1.1.6" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-glob-3.1.0" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."binary-extensions-1.10.0" - sources."set-immediate-shim-1.0.1" - sources."nan-2.7.0" - sources."lru-cache-4.1.1" - sources."shebang-command-1.2.0" - sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-3.0.2" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - sources."sax-1.1.4" - sources."accepts-1.3.4" - 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."escape-html-1.0.3" - sources."etag-1.8.1" - sources."finalhandler-1.1.0" - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.2" - sources."range-parser-1.2.0" - sources."send-0.16.1" - sources."serve-static-1.13.1" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."negotiator-0.6.1" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" - sources."destroy-1.0.4" - sources."ansi-escapes-3.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."external-editor-2.0.5" - 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."through-2.3.8" - sources."restore-cursor-2.0.0" - sources."onetime-2.0.1" - sources."signal-exit-3.0.2" - sources."mimic-fn-1.1.0" - sources."jschardet-1.6.0" - sources."tmp-0.0.33" - sources."os-tmpdir-1.0.2" - sources."escape-string-regexp-1.0.5" - sources."is-promise-2.1.0" - sources."lodash.assign-3.2.0" - sources."rsvp-3.6.2" - sources."lodash._baseassign-3.2.0" - sources."lodash._createassigner-3.1.1" - sources."lodash.keys-3.1.2" - sources."lodash._basecopy-3.0.1" - sources."lodash._bindcallback-3.0.1" - sources."lodash._isiterateecall-3.0.9" - sources."lodash.restparam-3.6.1" - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - sources."is-fullwidth-code-point-2.0.0" - sources."chownr-1.0.1" - sources."minipass-2.2.1" - sources."minizlib-1.0.4" + sources."is-stream-1.1.0" + sources."is-utf8-0.2.1" + sources."is-valid-glob-0.3.0" + sources."isarray-1.0.0" + sources."isobject-2.1.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" + sources."kind-of-3.2.2" + sources."lazystream-1.0.0" + sources."lodash.isequal-4.5.0" + sources."merge-stream-1.0.1" + (sources."micromatch-2.3.11" // { + dependencies = [ + sources."glob-parent-2.0.0" + ]; + }) + sources."minimatch-3.0.4" + sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."body-5.1.0" - sources."faye-websocket-0.10.0" - sources."livereload-js-2.2.2" + sources."normalize-path-2.1.1" sources."object-assign-4.1.1" - sources."continuable-cache-0.3.1" - sources."error-7.0.2" - sources."safe-json-parse-1.0.1" - sources."string-template-0.2.1" - sources."websocket-driver-0.7.0" - sources."http-parser-js-0.4.9" - sources."websocket-extensions-0.1.3" - sources."async-limiter-1.0.0" - sources."ultron-1.1.0" - sources."ansi-styles-3.2.0" - sources."supports-color-4.5.0" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."is-wsl-1.1.0" - sources."macos-release-1.1.0" - sources."win-release-1.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A tool for creating and developing Ionic Framework mobile apps."; - homepage = http://ionicframework.com/; - license = "MIT"; - }; - production = true; - }; - ios-deploy = nodeEnv.buildNodePackage { - name = "ios-deploy"; - packageName = "ios-deploy"; - version = "1.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.2.tgz"; - sha1 = "c2f4c46b06db4771939b29f980c7c1a8906b47a2"; - }; + sources."object.omit-2.0.1" + sources."once-1.4.0" + sources."ordered-read-streams-0.3.0" + sources."parse-glob-3.0.4" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."preserve-0.2.0" + sources."process-nextick-args-2.0.0" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."readable-stream-2.3.6" + sources."regex-cache-0.4.4" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."replace-ext-1.0.0" + sources."safe-buffer-5.1.1" + sources."stream-shift-1.0.0" + sources."string_decoder-1.1.1" + sources."strip-bom-2.0.0" + sources."strip-bom-stream-1.0.0" + sources."through2-2.0.3" + sources."through2-filter-2.0.0" + sources."to-absolute-glob-0.1.1" + sources."unique-stream-2.2.1" + sources."util-deprecate-1.0.2" + sources."vali-date-1.0.0" + sources."vinyl-2.1.0" + (sources."vinyl-fs-2.4.4" // { + dependencies = [ + sources."clone-1.0.4" + sources."clone-stats-0.0.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."isarray-0.0.1" + sources."replace-ext-0.0.1" + sources."string_decoder-0.10.31" + sources."vinyl-1.2.0" + ]; + }) + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + ]; buildInputs = globalBuildInputs; meta = { - description = "launch iOS apps iOS devices from the command line (Xcode 7)"; - homepage = "https://github.com/phonegap/ios-deploy#readme"; - license = "GPLv3"; + description = "Merges multiple lcov results into one"; + homepage = https://github.com/mweibel/lcov-result-merger; + license = "MIT"; }; production = true; + bypassCache = false; }; - istanbul = nodeEnv.buildNodePackage { - name = "istanbul"; - packageName = "istanbul"; - version = "0.4.5"; + livedown = nodeEnv.buildNodePackage { + name = "livedown"; + packageName = "livedown"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz"; - sha1 = "65c7d73d4c4da84d4f3ac310b918fb0b8033733b"; + url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz"; + sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b"; }; dependencies = [ - sources."abbrev-1.0.9" - sources."async-1.5.2" - sources."escodegen-1.8.1" - sources."esprima-2.7.3" - sources."glob-5.0.15" - (sources."handlebars-4.0.11" // { + sources."accepts-1.3.5" + sources."after-0.8.2" + sources."ajv-5.5.2" + sources."anymatch-1.3.2" + sources."argparse-1.0.10" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-flatten-1.1.1" + sources."array-unique-0.2.1" + sources."arraybuffer.slice-0.0.7" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-each-1.0.1" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."backo2-1.0.2" + sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.5" + sources."base64id-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."better-assert-1.0.2" + sources."binary-extensions-1.11.0" + sources."blob-0.0.4" + (sources."body-parser-1.18.2" // { dependencies = [ - sources."wordwrap-0.0.2" + sources."setprototypeof-1.0.3" ]; }) - (sources."js-yaml-3.10.0" // { + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + (sources."braces-1.8.5" // { dependencies = [ - sources."esprima-4.0.0" + sources."kind-of-4.0.0" ]; }) - sources."mkdirp-0.5.1" - sources."nopt-3.0.6" - sources."once-1.4.0" - sources."resolve-1.1.7" - sources."supports-color-3.2.3" - sources."which-1.3.0" - sources."wordwrap-1.0.0" - sources."estraverse-1.9.3" - sources."esutils-2.0.2" - sources."optionator-0.8.2" - sources."source-map-0.5.7" - sources."prelude-ls-1.1.2" - sources."deep-is-0.1.3" - sources."type-check-0.3.2" - sources."levn-0.3.0" - sources."fast-levenshtein-2.0.6" - sources."amdefine-1.0.1" - sources."inflight-1.0.6" + sources."bytes-3.0.0" + sources."callsite-1.0.0" + sources."caseless-0.12.0" + sources."chokidar-1.7.0" + sources."co-4.6.0" + sources."combined-stream-1.0.6" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."component-inherit-0.0.3" + sources."concat-map-0.0.1" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."ecc-jsbn-0.1.1" + sources."ee-first-1.1.1" + sources."emoji-regex-6.1.1" + sources."encodeurl-1.0.2" + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" + sources."engine.io-parser-2.1.2" + sources."entities-1.1.1" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + (sources."express-4.16.3" // { + dependencies = [ + sources."statuses-1.4.0" + ]; + }) + sources."extend-3.0.1" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + sources."finalhandler-1.1.1" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fsevents-1.1.3" + sources."getpass-0.1.7" + sources."github-slugger-1.2.0" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-binary2-1.0.2" + sources."has-cors-1.1.0" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."html-entities-1.2.1" + sources."http-errors-1.6.3" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."indexof-0.0.1" sources."inherits-2.0.3" + sources."innertext-1.0.3" + sources."ipaddr.js-1.6.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-typedarray-1.0.0" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isobject-2.1.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."linkify-it-2.0.3" + sources."markdown-it-8.4.1" + sources."markdown-it-emoji-1.4.0" + sources."markdown-it-github-headings-1.1.1" + sources."markdown-it-task-checkbox-1.0.6" + sources."mdurl-1.0.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."micromatch-2.3.11" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."nan-2.10.0" + sources."negotiator-0.6.1" + sources."normalize-path-2.1.1" + sources."oauth-sign-0.8.2" + sources."object-component-0.0.3" + sources."object.omit-2.0.1" + sources."on-finished-2.3.0" + sources."opn-5.3.0" + sources."parse-glob-3.0.4" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."parseurl-1.3.2" 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."optimist-0.6.1" - sources."uglify-js-2.8.29" - sources."minimist-0.0.8" - sources."yargs-3.10.0" - sources."uglify-to-browserify-1.0.2" - 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."align-text-0.1.4" - sources."lazy-cache-1.0.4" - sources."kind-of-3.2.2" - sources."longest-1.0.1" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."preserve-0.2.0" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" + sources."punycode-1.4.1" + sources."qs-6.5.1" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."regex-cache-0.4.4" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.6" - sources."argparse-1.0.9" + sources."request-2.85.0" + sources."safe-buffer-5.1.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."set-immediate-shim-1.0.1" + sources."setprototypeof-1.1.0" + sources."sntp-2.1.0" + (sources."socket.io-2.1.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."isarray-2.0.1" + ]; + }) + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.1.0" + sources."socket.io-parser-3.2.0" sources."sprintf-js-1.0.3" - sources."has-flag-1.0.0" - sources."isexe-2.0.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."to-array-0.1.4" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.16" + sources."uc.micro-1.0.5" + sources."ultron-1.1.1" + sources."unpipe-1.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."ws-3.3.3" + sources."xmlhttprequest-ssl-1.5.5" + sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests "; - homepage = "https://github.com/gotwarlost/istanbul#readme"; - license = "BSD-3-Clause"; + description = "Live Markdown previews for your favourite editor."; + homepage = https://github.com/shime/livedown; + license = "MIT"; }; production = true; + bypassCache = false; }; - javascript-typescript-langserver = nodeEnv.buildNodePackage { - name = "javascript-typescript-langserver"; - packageName = "javascript-typescript-langserver"; - version = "2.5.4"; + live-server = nodeEnv.buildNodePackage { + name = "live-server"; + packageName = "live-server"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.4.tgz"; - sha512 = "08pa61nhkvmac5kwr61iqbw0251r6kwhix9l41rgxjinpi8p9s5anvy8a2zzfjrlkr93aqbbniy4qa095li7xn84vl8dv6aqxkpaba4"; + url = "https://registry.npmjs.org/live-server/-/live-server-1.2.0.tgz"; + sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3"; }; dependencies = [ - sources."chai-4.1.2" - sources."chai-as-promised-7.1.1" - sources."chalk-2.3.0" - sources."commander-2.11.0" - sources."fast-json-patch-2.0.6" - sources."glob-7.1.2" - sources."iterare-0.0.8" - (sources."jaeger-client-3.6.0" // { + sources."accepts-1.3.5" + sources."anymatch-1.3.2" + sources."apache-crypt-1.2.1" + sources."apache-md5-1.1.2" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-unique-0.2.1" + sources."async-each-1.0.1" + sources."balanced-match-1.0.0" + sources."basic-auth-2.0.0" + sources."batch-0.6.1" + sources."bcryptjs-2.4.3" + sources."binary-extensions-1.11.0" + sources."brace-expansion-1.1.11" + (sources."braces-1.8.5" // { dependencies = [ - sources."opentracing-0.13.0" + sources."kind-of-4.0.0" ]; }) - sources."lodash-4.17.4" - sources."mz-2.7.0" - sources."object-hash-1.2.0" - sources."opentracing-0.14.1" - sources."rxjs-5.5.2" - sources."semaphore-async-await-1.5.1" - sources."string-similarity-1.2.0" - sources."typescript-2.4.2" - sources."vscode-jsonrpc-3.5.0" - sources."vscode-languageserver-3.5.0" - sources."vscode-languageserver-types-3.5.0" - sources."assertion-error-1.0.2" - sources."check-error-1.0.2" - sources."deep-eql-3.0.1" - sources."get-func-name-2.0.0" - sources."pathval-1.1.0" - sources."type-detect-4.0.5" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.5.0" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."deep-equal-1.0.1" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" + sources."chokidar-1.7.0" + sources."colors-1.2.1" + sources."concat-map-0.0.1" + sources."connect-3.5.1" + sources."core-util-is-1.0.2" + sources."cors-2.8.4" + sources."debug-2.2.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."duplexer-0.1.1" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."event-stream-3.3.4" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."extglob-0.3.2" + sources."faye-websocket-0.11.1" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + sources."finalhandler-0.5.1" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."fresh-0.5.2" + sources."from-0.1.7" + sources."fsevents-1.1.3" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."graceful-fs-4.1.11" + sources."http-auth-3.1.3" + sources."http-errors-1.6.3" + sources."http-parser-js-0.4.11" sources."inherits-2.0.3" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isobject-2.1.0" + sources."kind-of-3.2.2" + sources."map-stream-0.1.0" + sources."micromatch-2.3.11" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" 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."node-int64-0.4.0" - sources."thriftrw-3.11.1" - sources."xorshift-0.2.1" - sources."bufrw-1.2.1" - sources."error-7.0.2" - sources."long-2.4.0" - sources."ansi-color-0.2.1" - sources."xtend-4.0.1" - sources."string-template-0.2.1" - sources."any-promise-1.3.0" + (sources."morgan-1.9.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."ms-0.7.1" + sources."nan-2.10.0" + sources."negotiator-0.6.1" + sources."normalize-path-2.1.1" sources."object-assign-4.1.1" - sources."thenify-all-1.6.0" - sources."thenify-3.3.0" - sources."symbol-observable-1.0.4" - sources."vscode-uri-1.0.1" - sources."vscode-languageserver-protocol-3.5.0" + sources."object.omit-2.0.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."opn-5.3.0" + sources."parse-glob-3.0.4" + sources."parseurl-1.3.2" + sources."path-is-absolute-1.0.1" + sources."pause-stream-0.0.11" + sources."preserve-0.2.0" + sources."process-nextick-args-2.0.0" + sources."proxy-middleware-0.15.0" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."range-parser-1.2.0" + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."regex-cache-0.4.4" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."safe-buffer-5.1.1" + (sources."send-0.16.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."statuses-1.4.0" + ]; + }) + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."set-immediate-shim-1.0.1" + sources."setprototypeof-1.1.0" + sources."split-0.3.3" + sources."statuses-1.3.1" + sources."stream-combiner-0.0.4" + sources."string_decoder-1.1.1" + sources."through-2.3.8" + sources."unix-crypt-td-js-1.0.0" + sources."unpipe-1.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.0" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."websocket-driver-0.7.0" + sources."websocket-extensions-0.1.3" ]; 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"; + description = "simple development http server with live reload capability"; + homepage = "https://github.com/tapio/live-server#readme"; + license = "MIT"; }; production = true; + bypassCache = false; }; - jayschema = nodeEnv.buildNodePackage { - name = "jayschema"; - packageName = "jayschema"; - version = "0.3.2"; + meat = nodeEnv.buildNodePackage { + name = "meat"; + packageName = "meat"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz"; - sha512 = "0v4070gii05w3qhq7bnl5jp358f3dibvjml3vnmphqhgdn2g9i94a2mrvmcyrhpa7k9f3gp63p6vgpmhihja5b3is5xc8mv4vdy8wjh"; + url = "https://registry.npmjs.org/meat/-/meat-0.3.4.tgz"; + sha1 = "e2b6b721014096e30de9c97114e1dd6696135d13"; }; dependencies = [ - sources."when-3.4.6" + sources."async-0.1.22" + sources."colors-0.6.2" + sources."commander-0.6.1" + sources."connect-1.9.2" + sources."cycle-1.0.3" + sources."express-2.5.11" + sources."eyes-0.1.8" + sources."formidable-1.0.17" + sources."jade-0.27.0" + sources."mime-1.2.4" + sources."mkdirp-0.3.0" + sources."node.extend-1.0.0" + sources."open-0.0.2" + sources."pkginfo-0.2.3" + sources."qs-0.4.2" + sources."request-2.9.203" + sources."stack-trace-0.0.10" + sources."winston-0.6.2" ]; buildInputs = globalBuildInputs; meta = { - description = "A comprehensive JSON Schema validator for Node.js"; - homepage = https://github.com/natesilva/jayschema; - license = "BSD-3-Clause"; + description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; + homepage = https://bitbucket.org/aahmed/meat; }; production = true; + bypassCache = false; }; - jshint = nodeEnv.buildNodePackage { - name = "jshint"; - packageName = "jshint"; - version = "2.9.5"; + mocha = nodeEnv.buildNodePackage { + name = "mocha"; + packageName = "mocha"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz"; - sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz"; + sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw"; }; 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.4" - sources."shelljs-0.3.0" - sources."strip-json-comments-1.0.4" - sources."lodash-3.7.0" - sources."glob-7.1.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."browser-stdout-1.3.1" + sources."commander-2.11.0" + sources."concat-map-0.0.1" + sources."debug-3.1.0" + sources."diff-3.5.0" + sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."growl-1.10.3" + sources."has-flag-2.0.0" + sources."he-1.1.1" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" + sources."supports-color-4.4.0" sources."wrappy-1.0.2" - sources."date-now-0.1.4" - sources."domhandler-2.3.0" - sources."domutils-1.5.1" - sources."domelementtype-1.1.3" - sources."readable-stream-1.1.14" - sources."entities-1.1.1" - sources."dom-serializer-0.1.0" - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" ]; buildInputs = globalBuildInputs; meta = { - description = "Static analysis tool for JavaScript"; - homepage = http://jshint.com/; - license = "(MIT AND JSON)"; - }; - production = true; - }; - json = nodeEnv.buildNodePackage { - name = "json"; - packageName = "json"; - version = "9.0.6"; - src = fetchurl { - 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#readme"; + description = "simple, flexible, fun test framework"; + homepage = https://mochajs.org/; + license = "MIT"; }; production = true; + bypassCache = false; }; - js-beautify = nodeEnv.buildNodePackage { - name = "js-beautify"; - packageName = "js-beautify"; - version = "1.7.4"; + multi-file-swagger = nodeEnv.buildNodePackage { + name = "multi-file-swagger"; + packageName = "multi-file-swagger"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.4.tgz"; - sha512 = "0m3jydg8rd5is3021z595lfrm9qc6398r2nppar8xvx5m0y4q9dlac7hmm7rkyffn3ss5fn8s5zmz7d4fw1bi8q1z4lz5s8x61zb1g9"; + url = "https://registry.npmjs.org/multi-file-swagger/-/multi-file-swagger-2.2.0.tgz"; + sha1 = "0161a13e2b3378759e36b9e05be34b46a06decd5"; }; dependencies = [ - sources."config-chain-1.1.11" - sources."editorconfig-0.13.3" - 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.1" - sources."commander-2.11.0" - sources."lru-cache-3.2.0" - sources."semver-5.4.1" - sources."sigmund-1.0.1" - sources."pseudomap-1.0.2" - sources."minimist-0.0.8" - sources."abbrev-1.1.1" + sources."argparse-1.0.10" + sources."asynckit-0.4.0" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."core-util-is-1.0.2" + sources."debug-3.1.0" + sources."delayed-stream-1.0.0" + sources."esprima-4.0.0" + sources."extend-3.0.1" + sources."form-data-2.3.2" + sources."formidable-1.2.1" + sources."graphlib-2.1.5" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."js-yaml-3.11.0" + sources."json-refs-2.1.7" + sources."lodash-4.17.5" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."ms-2.0.0" + sources."native-promise-only-0.8.1" + sources."path-loader-1.0.4" + sources."process-nextick-args-2.0.0" + sources."punycode-2.1.0" + sources."qs-6.5.1" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.1" + sources."slash-1.0.0" + sources."sprintf-js-1.0.3" + sources."string_decoder-1.1.1" + sources."superagent-3.8.2" + sources."uri-js-3.0.2" + sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "jsbeautifier.org for node"; - homepage = http://jsbeautifier.org/; + description = "Multi-file Swagger example"; license = "MIT"; }; production = true; + bypassCache = false; }; - jsonlint = nodeEnv.buildNodePackage { - name = "jsonlint"; - packageName = "jsonlint"; - version = "1.6.2"; + nijs = nodeEnv.buildNodePackage { + name = "nijs"; + packageName = "nijs"; + version = "0.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; - sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; + sha1 = "04b035cb530d46859d1018839a518c029133f676"; }; dependencies = [ - sources."nomnom-1.8.1" - sources."JSV-4.0.2" - sources."underscore-1.6.0" - sources."chalk-0.4.0" - sources."has-color-0.1.7" - sources."ansi-styles-1.0.0" - sources."strip-ansi-0.1.1" + sources."optparse-1.0.5" + sources."slasp-0.0.4" ]; buildInputs = globalBuildInputs; meta = { - description = "Validate JSON"; - homepage = http://zaach.github.com/jsonlint/; + description = "An internal DSL for the Nix package manager in JavaScript"; + homepage = "https://github.com/svanderburg/nijs#readme"; + license = "MIT"; }; production = true; + bypassCache = false; }; - jsontool = nodeEnv.buildNodePackage { - name = "jsontool"; - packageName = "jsontool"; - version = "7.0.2"; + node2nix = nodeEnv.buildNodePackage { + name = "node2nix"; + packageName = "node2nix"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; - sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.3.tgz"; + sha512 = "1nwm3hvx3ybg10mzn5sysdgxii42975v6gyrzjb79s46lhk67ndf1fcrlrxcfaiyj9a997hz2zk9ysm0qclxsd5nziwm01myv95z262"; }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ajv-5.5.2" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."base64-js-1.2.3" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-4.3.1" + sources."buffer-from-1.0.0" + sources."builtin-modules-1.1.1" + sources."builtins-1.0.3" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.6" + sources."concat-stream-1.6.2" + sources."config-chain-1.1.11" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."findit-2.0.0" + sources."foreachasync-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-0.6.4" + (sources."fs.extra-1.3.2" // { + dependencies = [ + sources."mkdirp-0.3.5" + ]; + }) + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-unicode-2.0.1" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."hosted-git-info-2.6.0" + sources."http-signature-1.2.0" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-builtin-module-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-1.0.1" + sources."jsprim-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimist-0.0.8" + sources."minipass-2.2.4" + sources."minizlib-1.1.0" + sources."mkdirp-0.5.1" + sources."ncp-0.4.2" + sources."nijs-0.0.25" + sources."nopt-3.0.6" + sources."normalize-package-data-2.4.0" + sources."npm-package-arg-6.0.0" + sources."npm-registry-client-8.5.1" + (sources."npmconf-2.1.2" // { + dependencies = [ + sources."once-1.3.3" + sources."semver-4.3.6" + ]; + }) + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."optparse-1.0.5" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.0" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."readable-stream-2.3.6" + sources."request-2.85.0" + sources."retry-0.10.1" + sources."rimraf-2.2.8" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."slasp-0.0.4" + sources."slide-1.1.6" + sources."sntp-2.1.0" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."sshpk-1.14.1" + sources."ssri-5.3.0" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."tar-3.1.15" + sources."temp-0.8.3" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."uid-number-0.0.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" + sources."walk-2.3.13" + sources."wide-align-1.1.2" + sources."wrappy-1.0.2" + sources."yallist-3.0.2" + ]; buildInputs = globalBuildInputs; meta = { - description = "a 'json' command for massaging JSON on the command line"; - homepage = https://github.com/trentm/json; + description = "Generate Nix expressions to build NPM packages"; + homepage = https://github.com/svanderburg/node2nix; + license = "MIT"; }; production = true; + bypassCache = false; }; - json-refs = nodeEnv.buildNodePackage { - name = "json-refs"; - packageName = "json-refs"; - version = "3.0.2"; + node-gyp = nodeEnv.buildNodePackage { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.2.tgz"; - sha512 = "0m7az6dvfn65fbak1y42663yxkachpj1fyyxxpdhkpny3bbsmgn0hpp8fb5sllmzbfyqspkqh1icpqb14pbsfnbsj7w665xmnj4a9g5"; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; + sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; }; dependencies = [ - sources."commander-2.11.0" - sources."graphlib-2.1.1" - sources."js-yaml-3.10.0" - sources."lodash-4.17.4" - sources."native-promise-only-0.8.1" - sources."path-loader-1.0.4" - sources."slash-1.0.0" - sources."uri-js-3.0.2" - sources."argparse-1.0.9" - sources."esprima-4.0.0" - sources."sprintf-js-1.0.3" - sources."superagent-3.8.1" - sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" - sources."debug-3.1.0" - sources."extend-3.0.1" - sources."form-data-2.3.1" - sources."formidable-1.1.1" - sources."methods-1.1.2" - sources."mime-1.4.1" - sources."qs-6.5.1" - sources."readable-stream-2.3.3" - sources."ms-2.0.0" + sources."abbrev-1.1.1" + sources."ajv-5.5.2" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" sources."asynckit-0.4.0" - sources."combined-stream-1.0.5" - sources."mime-types-2.1.17" - sources."delayed-stream-1.0.0" - sources."mime-db-1.30.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."block-stream-0.0.9" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.6" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-unicode-2.0.1" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" + sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."nopt-3.0.6" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.0" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."readable-stream-2.3.6" + sources."request-2.85.0" + sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" + sources."semver-5.3.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."sntp-2.1.0" + sources."sshpk-1.14.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."tar-2.2.1" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."punycode-2.1.0" + sources."uuid-3.2.1" + sources."verror-1.10.0" + sources."which-1.3.0" + sources."wide-align-1.1.2" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; - homepage = https://github.com/whitlockjc/json-refs; + description = "Node.js native addon build tool"; + homepage = "https://github.com/nodejs/node-gyp#readme"; license = "MIT"; }; production = true; + bypassCache = false; }; - json-server = nodeEnv.buildNodePackage { - name = "json-server"; - packageName = "json-server"; - version = "0.12.1"; + node-gyp-build = nodeEnv.buildNodePackage { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.12.1.tgz"; - sha512 = "3isg3ph43vqfq6m6pg0d1iy7gj2gc6jgym0gp3ng7p9fv7bf1q43isf3wbc7bc9w5swsxqjc3v304ic8iinilwrkwxgks1alaxjs3si"; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz"; + sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Build tool and bindings loader for node-gyp that supports prebuilds"; + homepage = https://github.com/mafintosh/node-gyp-build; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + node-inspector = nodeEnv.buildNodePackage { + name = "node-inspector"; + packageName = "node-inspector"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.2.tgz"; + sha1 = "690c9ef7e5813da50b7a2746f334e3ff319bccd7"; }; dependencies = [ - sources."body-parser-1.18.2" - sources."chalk-2.3.0" - sources."compression-1.7.1" - sources."connect-pause-0.1.1" - sources."cors-2.8.4" - sources."errorhandler-1.5.0" - sources."express-4.16.2" - sources."express-urlrewrite-1.2.0" - sources."json-parse-helpfulerror-1.0.3" - sources."lodash-4.17.4" - sources."lodash-id-0.14.0" - sources."lowdb-0.15.5" - sources."method-override-2.3.10" - sources."morgan-1.9.0" - sources."nanoid-1.0.1" - sources."object-assign-4.1.1" - sources."please-upgrade-node-3.0.1" - sources."pluralize-7.0.0" - sources."request-2.83.0" - sources."server-destroy-1.0.1" - sources."update-notifier-2.3.0" - sources."yargs-10.0.3" + sources."abbrev-1.1.1" + sources."accepts-1.3.5" + sources."after-0.8.2" + sources."ajv-4.11.8" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."array-find-index-1.0.2" + sources."array-flatten-1.1.1" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."async-0.9.2" + sources."asynckit-0.4.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bcrypt-pbkdf-1.0.1" + (sources."biased-opener-0.2.8" // { + dependencies = [ + sources."yargs-1.3.3" + ]; + }) + sources."big-integer-1.6.27" + sources."block-stream-0.0.9" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) + sources."boom-2.10.1" + sources."bplist-parser-0.1.1" + sources."brace-expansion-1.1.11" + (sources."browser-launcher2-0.4.6" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."builtin-modules-1.1.1" sources."bytes-3.0.0" + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."caseless-0.12.0" + sources."cliui-3.2.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.6" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."content-disposition-0.5.2" sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + sources."cryptiles-2.0.5" + sources."currently-unhandled-0.4.1" + sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."on-finished-2.3.0" - sources."qs-6.5.1" - sources."raw-body-2.3.2" - sources."type-is-1.6.15" - sources."ms-2.0.0" - sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."decamelize-1.2.0" + sources."deep-extend-0.4.2" + sources."default-browser-id-1.0.4" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."detect-libc-1.0.3" + sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" - sources."unpipe-1.0.0" - sources."media-typer-0.3.0" - sources."mime-types-2.1.17" - sources."mime-db-1.30.0" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.5.0" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."accepts-1.3.4" - sources."compressible-2.0.12" - sources."on-headers-1.0.1" - sources."safe-buffer-5.1.1" - sources."vary-1.1.2" - sources."negotiator-0.6.1" + sources."encodeurl-1.0.2" + sources."error-ex-1.3.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.1" - sources."finalhandler-1.1.0" - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."parseurl-1.3.2" - sources."path-to-regexp-1.7.0" - sources."proxy-addr-2.0.2" - sources."range-parser-1.2.0" - sources."send-0.16.1" - sources."serve-static-1.13.1" - sources."utils-merge-1.0.1" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" - sources."destroy-1.0.4" - sources."mime-1.4.1" - 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-2.0.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" + sources."express-4.16.3" sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."finalhandler-1.1.1" + sources."find-up-1.1.2" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" + sources."form-data-2.1.4" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" + sources."fstream-ignore-1.0.5" + sources."gauge-2.7.4" + sources."get-stdin-4.0.1" + sources."getpass-0.1.7" + sources."glob-5.0.15" + sources."graceful-fs-4.1.11" + sources."har-schema-1.0.5" + sources."har-validator-4.2.1" + sources."has-unicode-2.0.1" + sources."hawk-3.1.3" + sources."headless-0.1.7" + sources."hoek-2.16.3" + sources."hosted-git-info-2.6.0" + sources."http-errors-1.6.3" + sources."http-signature-1.1.1" + sources."iconv-lite-0.4.19" + sources."indent-string-2.1.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."invert-kv-1.0.0" + sources."ipaddr.js-1.6.0" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isexe-2.0.0" sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" + sources."jsonify-0.0.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."lcid-1.0.0" + sources."load-json-file-1.1.0" + sources."lodash-2.4.2" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."media-typer-0.3.0" + sources."meow-3.7.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."nan-2.10.0" + sources."negotiator-0.6.1" + sources."node-pre-gyp-0.6.39" + sources."nopt-4.0.1" + sources."normalize-package-data-2.4.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" + sources."object-assign-4.1.1" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."options-0.0.6" + sources."os-homedir-1.0.2" + sources."os-locale-1.4.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."parse-json-2.2.0" + sources."parseurl-1.3.2" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."path-type-1.1.0" + sources."performance-now-0.2.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + (sources."plist-1.2.0" // { + dependencies = [ + sources."lodash-3.10.1" + ]; + }) + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" + sources."redent-1.0.0" + sources."repeating-2.0.1" + sources."request-2.81.0" + sources."rimraf-2.2.8" + sources."safe-buffer-5.1.1" + sources."semver-4.3.6" + sources."send-0.16.2" + (sources."serve-favicon-2.5.0" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.13.2" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.0" + sources."signal-exit-3.0.2" + sources."sntp-1.0.9" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + (sources."sshpk-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."statuses-1.4.0" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-indent-1.0.1" + sources."strip-json-comments-2.0.1" + sources."strong-data-uri-1.0.5" + sources."tar-2.2.1" + sources."tar-pack-3.4.1" + sources."tough-cookie-2.3.4" + sources."trim-newlines-1.0.0" + sources."truncate-2.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."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."core-util-is-1.0.2" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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-1.2.2" - sources."configstore-3.1.1" - sources."import-lazy-2.1.0" - sources."is-installed-globally-0.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."camelcase-4.1.0" - sources."cli-boxes-1.0.0" - sources."string-width-1.0.2" - sources."term-size-1.2.0" - sources."widest-line-1.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" - sources."execa-0.7.0" - sources."cross-spawn-5.1.0" - 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."lru-cache-4.1.1" - sources."shebang-command-1.2.0" + sources."type-is-1.6.16" + sources."uid-0.0.2" + sources."uid-number-0.0.6" + sources."ultron-1.0.2" + sources."unpipe-1.0.0" + sources."untildify-2.1.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.2.1" + (sources."v8-debug-1.0.1" // { + dependencies = [ + sources."glob-7.1.2" + sources."qs-6.4.0" + sources."rimraf-2.6.2" + sources."semver-5.5.0" + ]; + }) + sources."v8-profiler-5.7.0" + sources."validate-npm-package-license-3.0.3" + sources."vary-1.1.2" + sources."verror-1.10.0" sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - sources."path-key-2.0.1" - sources."code-point-at-1.1.0" - sources."number-is-nan-1.0.1" - sources."dot-prop-4.2.0" - sources."make-dir-1.1.0" - sources."unique-string-1.0.0" - sources."write-file-atomic-2.3.0" - sources."is-obj-1.0.1" - sources."pify-3.0.0" - sources."crypto-random-string-1.0.0" - sources."imurmurhash-0.1.4" - sources."global-dirs-0.1.0" - sources."is-path-inside-1.0.0" - sources."ini-1.3.4" - sources."path-is-inside-1.0.2" - 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."semver-5.4.1" - 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.2" - sources."deep-extend-0.4.2" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - sources."cliui-3.2.0" - sources."decamelize-1.2.0" - sources."find-up-2.1.0" - sources."get-caller-file-1.0.2" - sources."os-locale-2.1.0" - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."set-blocking-2.0.0" - sources."which-module-2.0.0" - sources."y18n-3.2.1" - sources."yargs-parser-8.0.0" + sources."wide-align-1.1.2" + sources."win-detect-browsers-1.0.2" + sources."window-size-0.1.4" sources."wrap-ansi-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."lcid-1.0.0" - sources."mem-1.1.0" - sources."invert-kv-1.0.0" - sources."mimic-fn-1.1.0" + sources."wrappy-1.0.2" + sources."ws-1.1.5" + sources."x-default-browser-0.3.1" + sources."xmlbuilder-4.0.0" + sources."xmldom-0.1.27" + sources."xtend-4.0.1" + sources."y18n-3.2.1" + sources."yargs-3.32.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Serves JSON files through REST routes."; - homepage = https://github.com/typicode/json-server; - license = "MIT"; + description = "Web Inspector based nodeJS debugger"; + homepage = http://github.com/node-inspector/node-inspector; }; production = true; + bypassCache = false; }; - js-yaml = nodeEnv.buildNodePackage { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.10.0"; + node-pre-gyp = nodeEnv.buildNodePackage { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; - sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz"; + sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8"; }; dependencies = [ - sources."argparse-1.0.9" - sources."esprima-4.0.0" - sources."sprintf-js-1.0.3" + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chownr-1.0.1" + sources."code-point-at-1.1.0" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-2.6.9" + sources."deep-extend-0.4.2" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."fs-minipass-1.2.5" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."glob-7.1.2" + sources."has-unicode-2.0.1" + sources."iconv-lite-0.4.21" + sources."ignore-walk-3.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.2.4" + sources."minizlib-1.1.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."needle-2.2.0" + sources."nopt-4.0.1" + sources."npm-bundled-1.0.3" + sources."npm-packlist-1.1.10" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.0" + (sources."rc-1.2.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-2.3.6" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.5.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.1" + sources."util-deprecate-1.0.2" + sources."wide-align-1.1.2" + sources."wrappy-1.0.2" + sources."yallist-3.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "YAML 1.2 parser and serializer"; - homepage = https://github.com/nodeca/js-yaml; - license = "MIT"; + description = "Node.js native addon binary install tool"; + homepage = "https://github.com/mapbox/node-pre-gyp#readme"; + license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; - karma = nodeEnv.buildNodePackage { - name = "karma"; - packageName = "karma"; - version = "1.7.1"; + nodemon = nodeEnv.buildNodePackage { + name = "nodemon"; + packageName = "nodemon"; + version = "1.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz"; - sha512 = "0g4s1b3k1485yxia2b8703zyw8dxjz9npijnkapv7q9jfw1piyaa2p4hsyqiajnc4n1djri6xk76q6y0jw0n9y7a5d4g6p1f26436lk"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz"; + sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh"; }; dependencies = [ - sources."bluebird-3.5.1" - sources."body-parser-1.18.2" - sources."chokidar-1.7.0" - sources."colors-1.1.2" - (sources."combine-lists-1.0.1" // { + sources."abbrev-1.1.1" + sources."ansi-align-2.0.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + (sources."anymatch-2.0.0" // { dependencies = [ - sources."lodash-4.17.4" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" ]; }) - sources."connect-3.6.5" - sources."core-js-2.5.1" - sources."di-0.0.1" - sources."dom-serialize-2.2.1" - sources."expand-braces-0.1.2" - sources."glob-7.1.2" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-each-1.0.1" + sources."atob-2.1.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."binary-extensions-1.11.0" + sources."boxen-1.3.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) + sources."cache-base-1.0.1" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" + sources."chalk-2.3.2" + (sources."chokidar-2.0.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."ci-info-1.1.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."cli-boxes-1.0.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."component-emitter-1.2.1" + sources."concat-map-0.0.1" + sources."configstore-3.1.2" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" + sources."debug-3.1.0" + sources."decode-uri-component-0.2.0" + sources."deep-extend-0.4.2" + sources."define-property-2.0.2" + sources."dot-prop-4.2.0" + sources."duplexer-0.1.1" + sources."duplexer3-0.1.4" + sources."escape-string-regexp-1.0.5" + sources."event-stream-3.3.4" + sources."execa-0.7.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."fill-range-4.0.0" + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + sources."from-0.1.7" + sources."fsevents-1.1.3" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."global-dirs-0.1.1" + sources."got-6.7.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."mime-1.4.1" - 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.2" - sources."safe-buffer-5.1.1" - sources."socket.io-1.7.3" - sources."source-map-0.5.7" - sources."tmp-0.0.31" - sources."useragent-2.2.1" - sources."bytes-3.0.0" - sources."content-type-1.0.4" - sources."debug-2.2.0" - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."on-finished-2.3.0" - sources."qs-6.5.1" - sources."raw-body-2.3.2" - sources."type-is-1.6.15" - sources."ms-0.7.1" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" + sources."ignore-by-default-1.0.1" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" 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.17" - sources."mime-db-1.30.0" - sources."anymatch-1.3.2" - sources."async-each-1.0.1" - sources."glob-parent-2.0.0" + sources."ini-1.3.5" + sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" - sources."is-glob-2.0.1" + sources."is-buffer-1.1.6" + sources."is-ci-1.1.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.0" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" + sources."is-number-4.0.0" + sources."is-obj-1.0.1" + sources."is-odd-2.0.0" + sources."is-path-inside-1.0.1" + sources."is-plain-object-2.0.4" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."latest-version-3.1.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" + sources."make-dir-1.2.0" + sources."map-cache-0.2.2" + sources."map-stream-0.1.0" + sources."map-visit-1.0.0" + (sources."micromatch-3.1.10" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + ]; + }) + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mixin-deep-1.3.1" + sources."ms-2.0.0" + sources."nan-2.10.0" + sources."nanomatch-1.2.9" + sources."nopt-1.0.10" + sources."normalize-path-2.1.1" + sources."npm-run-path-2.0.2" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."pause-stream-0.0.11" + sources."pify-3.0.0" + sources."posix-character-classes-0.1.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."ps-tree-1.1.0" + sources."pseudomap-1.0.2" + sources."pstree.remy-1.1.0" + sources."rc-1.2.6" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" - sources."fsevents-1.1.3" - sources."micromatch-2.3.11" - sources."normalize-path-2.1.1" - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - sources."braces-0.1.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."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - sources."arr-flatten-1.1.0" - sources."expand-range-0.1.1" - sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - sources."fill-range-2.2.3" - sources."is-number-0.1.1" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."repeat-string-0.2.2" - sources."isarray-0.0.1" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - 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."regex-not-1.0.2" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" - sources."binary-extensions-1.10.0" - sources."readable-stream-1.0.34" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" sources."set-immediate-shim-1.0.1" - 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.7.0" - sources."finalhandler-1.0.6" - sources."parseurl-1.3.2" - sources."utils-merge-1.0.1" - sources."encodeurl-1.0.1" - sources."escape-html-1.0.3" - sources."custom-event-1.0.1" - sources."ent-2.2.0" - sources."extend-3.0.1" - sources."void-elements-2.0.1" - sources."array-slice-0.2.3" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."eventemitter3-1.2.0" - sources."requires-port-1.0.0" - sources."semver-4.3.6" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - sources."engine.io-1.8.3" - sources."has-binary-0.1.7" - sources."object-assign-4.1.0" - sources."socket.io-adapter-0.5.0" - sources."socket.io-client-1.7.3" - sources."socket.io-parser-2.3.1" - sources."accepts-1.3.3" - sources."base64id-1.0.0" - sources."engine.io-parser-1.3.2" - sources."ws-1.1.2" - sources."cookie-0.3.1" - sources."negotiator-0.6.1" - sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" - sources."base64-arraybuffer-0.1.5" - sources."blob-0.0.4" - sources."wtf-8-1.0.0" - sources."options-0.0.6" - sources."ultron-1.0.2" - sources."backo2-1.0.2" - sources."component-bind-1.0.0" - sources."component-emitter-1.1.2" - sources."engine.io-client-1.8.3" - sources."indexof-0.0.1" - sources."object-component-0.0.3" - sources."parseuri-0.0.5" - sources."to-array-0.1.4" - sources."component-inherit-0.0.3" - sources."has-cors-1.1.0" - sources."parsejson-0.0.3" - sources."parseqs-0.0.5" - sources."xmlhttprequest-ssl-1.5.3" - sources."yeast-0.1.2" - 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; - meta = { - description = "Spectacular Test Runner for JavaScript."; - homepage = http://karma-runner.github.io/; - license = "MIT"; - }; - production = true; - }; - "kibana-authentication-proxy-git://github.com/fangli/kibana-authentication-proxy.git" = nodeEnv.buildNodePackage { - name = "kibana-authentication-proxy"; - packageName = "kibana-authentication-proxy"; - version = "1.1.0"; - src = fetchgit { - url = "git://github.com/fangli/kibana-authentication-proxy.git"; - rev = "0c0173b0cb51b392b7fc04d0cc728ffb64671ef3"; - sha256 = "a282e834ff67715017f299468ff0d7e496d2bc0f1f7b075b557568b7feb3dba7"; - }; - dependencies = [ - sources."express-3.21.2" - sources."passport-0.4.0" - sources."passport-google-oauth-1.0.0" - sources."connect-restreamer-1.0.3" - sources."xml2js-0.4.19" - sources."basic-auth-1.0.4" - sources."connect-2.30.2" - sources."content-disposition-0.5.0" - sources."content-type-1.0.4" - 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."mkdirp-0.5.1" - sources."parseurl-1.3.2" - sources."proxy-addr-1.0.10" - sources."range-parser-1.0.3" - sources."send-0.13.2" - sources."utils-merge-1.0.0" - sources."vary-1.1.2" - 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" - sources."express-session-1.11.3" - sources."finalhandler-0.4.0" - sources."http-errors-1.3.1" - sources."method-override-2.3.10" - sources."morgan-1.6.1" - sources."multiparty-3.3.2" - sources."on-headers-1.0.1" - sources."pause-0.0.1" - sources."qs-4.0.0" - sources."response-time-2.3.2" - sources."serve-favicon-2.3.2" - sources."serve-index-1.7.3" - sources."serve-static-1.10.3" - sources."type-is-1.6.15" - sources."vhost-3.0.2" - sources."iconv-lite-0.4.13" - sources."on-finished-2.3.0" - sources."raw-body-2.1.7" - sources."ee-first-1.1.1" - sources."unpipe-1.0.0" - sources."accepts-1.2.13" - sources."compressible-2.0.12" - sources."mime-types-2.1.17" - sources."negotiator-0.5.3" - sources."mime-db-1.30.0" - sources."ms-0.7.1" - sources."csrf-3.0.6" - sources."rndm-1.2.0" - sources."tsscmp-1.0.5" - sources."uid-safe-2.0.0" - 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.2.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."batch-0.5.3" - sources."destroy-1.0.3" - sources."mime-1.3.4" - sources."media-typer-0.3.0" - sources."minimist-0.0.8" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.0.5" - sources."passport-strategy-1.0.0" - sources."passport-google-oauth1-1.0.0" - sources."passport-google-oauth20-1.0.0" - sources."passport-oauth1-1.1.0" - sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" - sources."uid2-0.0.3" - sources."sax-1.2.4" - sources."xmlbuilder-9.0.4" + sources."set-value-2.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."kind-of-4.0.0" + ]; + }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" + sources."split-0.3.3" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."static-extend-0.1.2" + sources."stream-combiner-0.0.4" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.3.0" + sources."term-size-1.2.0" + sources."through-2.3.8" + sources."timed-out-4.0.1" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."touch-3.1.0" + (sources."undefsafe-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + sources."unique-string-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."unzip-response-2.0.1" + sources."upath-1.0.4" + sources."update-notifier-2.4.0" + sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."util-deprecate-1.0.2" + sources."which-1.3.0" + sources."widest-line-2.0.0" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Hosts the latest kibana3 and elasticsearch behind Google OAuth2, Basic Auth or CAS Authentication"; + description = "Simple monitor script for use during development of a node.js app."; + homepage = http://nodemon.io/; license = "MIT"; }; production = true; + bypassCache = false; }; - lerna = nodeEnv.buildNodePackage { - name = "lerna"; - packageName = "lerna"; - version = "2.5.1"; + node-red = nodeEnv.buildNodePackage { + name = "node-red"; + packageName = "node-red"; + version = "0.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.5.1.tgz"; - sha512 = "0bh7a9asvl8vb6szbr8h4h55xzyqmqap0yjqbvyqc9n8yygv5p1s81i1kqgxcbq41p37gf63gyjbws76sa44l11w5gxcgl279m9yga3"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.18.4.tgz"; + sha512 = "0d25q2hxpf5snrg8f3gplrjd73hqzyzxna0g2q6l0bm04fm8xgby8ydixaf8mgyz9dly2k5mw79jvs653m6vk9cl0r61fv8qr75khjz"; }; dependencies = [ - sources."async-1.5.2" - sources."chalk-2.3.0" - sources."cmd-shim-2.0.2" - sources."columnify-1.5.4" - sources."command-join-2.0.0" - (sources."conventional-changelog-cli-1.3.5" // { + sources."abbrev-1.1.1" + sources."accepts-1.3.5" + sources."addressparser-0.3.2" + sources."ajv-5.5.2" + sources."ansi-regex-2.1.1" + sources."append-field-0.1.0" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."argparse-1.0.10" + sources."array-flatten-1.1.1" + sources."array-indexofobject-0.0.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-0.1.22" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."basic-auth-2.0.0" + sources."bcrypt-1.0.3" + sources."bcrypt-pbkdf-1.0.1" + sources."bcryptjs-2.4.3" + sources."bl-1.2.2" + sources."block-stream-0.0.9" + sources."body-parser-1.18.2" + sources."boolbase-1.0.0" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" + sources."buildmail-2.0.0" + sources."busboy-0.2.14" + sources."bytes-3.0.0" + sources."callback-stream-1.1.0" + sources."caseless-0.12.0" + (sources."cheerio-0.22.0" // { dependencies = [ - sources."read-pkg-1.1.0" - sources."yargs-3.10.0" - sources."load-json-file-1.1.0" - sources."find-up-1.1.2" - sources."path-exists-2.1.0" + sources."domelementtype-1.1.3" ]; }) - sources."conventional-recommended-bump-1.0.3" - sources."dedent-0.7.0" - sources."execa-0.8.0" - sources."find-up-2.1.0" - sources."fs-extra-4.0.2" - sources."get-port-3.2.0" + sources."clone-2.1.1" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.6" + sources."commander-2.13.0" + sources."commist-1.0.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-control-strings-1.1.0" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-parser-1.4.3" + sources."cookie-signature-1.0.6" + sources."cookies-0.7.1" + sources."core-util-is-1.0.2" + sources."cors-2.8.4" + sources."crc-3.4.4" + sources."cron-1.3.0" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."css-select-1.2.0" + sources."css-what-2.1.0" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."deep-extend-0.4.2" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dicer-0.2.5" + sources."dom-serializer-0.1.0" + sources."domelementtype-1.3.0" + sources."domhandler-2.4.1" + sources."domutils-1.5.1" + sources."duplexify-3.5.4" + sources."ecc-jsbn-0.1.1" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."encoding-0.1.12" + sources."end-of-stream-1.4.1" + sources."entities-1.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."etag-1.8.1" + (sources."express-4.16.2" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) + sources."express-session-1.15.6" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."feedparser-2.2.9" + sources."finalhandler-1.1.0" + (sources."follow-redirects-1.3.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-extra-5.0.0" + sources."fs.notify-0.0.4" + sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" + sources."fstream-ignore-1.0.5" + sources."gauge-2.7.4" + sources."getpass-0.1.7" sources."glob-7.1.2" sources."glob-parent-3.1.0" - sources."globby-6.1.0" + sources."glob-stream-6.1.0" sources."graceful-fs-4.1.11" - sources."hosted-git-info-2.5.0" - sources."inquirer-3.3.0" - sources."is-ci-1.0.10" - sources."load-json-file-3.0.0" - sources."lodash-4.17.4" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-unicode-2.0.1" + sources."hash-sum-1.0.2" + sources."hawk-6.0.2" + sources."help-me-1.1.0" + sources."hoek-4.2.1" + (sources."htmlparser2-3.9.2" // { + dependencies = [ + sources."domelementtype-1.3.0" + ]; + }) + sources."http-errors-1.6.3" + sources."http-signature-1.2.0" + sources."i18next-1.10.6" + sources."i18next-client-1.10.3" + sources."iconv-lite-0.4.19" + sources."imap-0.8.19" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ipaddr.js-1.6.0" + sources."is-absolute-1.0.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-3.1.0" + sources."is-negated-glob-1.0.0" + sources."is-relative-1.0.0" + sources."is-typedarray-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."js-yaml-3.10.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json5-0.2.0" + sources."jsonata-1.5.0" + sources."jsonfile-4.0.0" + sources."jsonify-0.0.0" + sources."jsprim-1.4.1" + sources."keygrip-1.0.2" + sources."leven-1.0.2" + sources."libbase64-0.1.0" + sources."libmime-1.2.0" + sources."libqp-1.1.0" + sources."lodash.assign-4.2.0" + sources."lodash.assignin-4.2.0" + sources."lodash.bind-4.2.1" + sources."lodash.defaults-4.2.0" + sources."lodash.filter-4.6.0" + sources."lodash.flatten-4.4.0" + sources."lodash.foreach-4.5.0" + sources."lodash.get-4.4.2" + sources."lodash.has-4.5.2" + sources."lodash.map-4.6.0" + sources."lodash.merge-4.6.1" + sources."lodash.pick-4.4.0" + sources."lodash.reduce-4.6.0" + sources."lodash.reject-4.6.0" + sources."lodash.some-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lru-cache-4.1.2" + (sources."mailcomposer-2.1.0" // { + dependencies = [ + sources."needle-0.10.0" + ]; + }) + sources."mailparser-0.6.2" + sources."media-typer-0.3.0" + (sources."memorystore-1.6.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimelib-0.3.1" sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."moment-2.22.0" + sources."moment-timezone-0.5.14" + (sources."mqtt-2.15.1" // { + dependencies = [ + sources."ws-3.3.3" + ]; + }) + sources."mqtt-packet-5.5.0" + sources."mri-1.1.0" + sources."ms-2.0.0" + (sources."multer-1.3.0" // { + dependencies = [ + sources."isarray-0.0.1" + sources."minimist-0.0.8" + sources."object-assign-3.0.0" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."mustache-2.3.0" + sources."nan-2.6.2" + sources."needle-0.11.0" + sources."negotiator-0.6.1" + sources."node-pre-gyp-0.6.36" + (sources."node-red-node-email-0.1.27" // { + dependencies = [ + sources."addressparser-1.0.1" + sources."clone-1.0.4" + sources."isarray-0.0.1" + sources."minimist-0.0.10" + sources."readable-stream-1.1.14" + sources."semver-5.3.0" + sources."string_decoder-0.10.31" + ]; + }) + (sources."node-red-node-feedparser-0.1.12" // { + dependencies = [ + sources."addressparser-1.0.1" + ]; + }) + sources."node-red-node-rbe-0.2.3" + sources."node-red-node-twitter-0.1.13" + sources."nodemailer-1.11.0" + sources."nodemailer-direct-transport-1.1.0" + sources."nodemailer-smtp-transport-1.1.0" + sources."nodemailer-wellknown-0.1.10" + sources."nopt-4.0.1" sources."npmlog-4.1.2" - sources."p-finally-1.0.0" - sources."package-json-4.0.1" - sources."path-exists-3.0.0" - sources."read-cmd-shim-1.0.1" - (sources."read-pkg-2.0.0" // { + sources."nth-check-1.0.1" + sources."number-is-nan-1.0.1" + sources."oauth-0.9.14" + sources."oauth-sign-0.8.2" + sources."oauth2orize-1.11.0" + sources."object-assign-4.1.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."once-1.4.0" + sources."optimist-0.6.1" + sources."options-0.0.6" + sources."ordered-read-streams-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."parseurl-1.3.2" + sources."passport-0.4.0" + sources."passport-http-bearer-1.0.1" + sources."passport-oauth2-client-password-0.1.2" + sources."passport-strategy-1.0.0" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."pause-0.0.1" + sources."performance-now-2.1.0" + sources."poplib-0.1.7" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" + sources."pseudomap-1.0.2" + sources."pump-2.0.1" + sources."pumpify-1.4.0" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."random-bytes-1.0.0" + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { dependencies = [ - sources."load-json-file-2.0.0" + sources."depd-1.1.1" + sources."http-errors-1.6.2" + sources."setprototypeof-1.0.3" ]; }) + sources."rc-1.2.6" + sources."readable-stream-2.3.6" + sources."reinterval-1.1.0" + sources."remove-trailing-separator-1.1.0" + sources."request-2.85.0" + sources."retry-0.6.1" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" + sources."sax-1.2.4" sources."semver-5.4.1" + sources."send-0.16.1" + sources."sentiment-2.1.0" + sources."serve-static-1.13.1" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" - sources."strong-log-transformer-1.0.6" - sources."temp-write-3.3.0" - sources."write-file-atomic-2.3.0" - sources."write-json-file-2.3.0" - sources."write-pkg-3.1.0" - (sources."yargs-8.0.2" // { + sources."smtp-connection-1.3.8" + sources."sntp-2.1.0" + sources."source-map-0.6.1" + sources."split2-2.2.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" + sources."stream-shift-1.0.0" + sources."streamsearch-0.1.2" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-2.2.1" + sources."tar-pack-3.4.1" + sources."through2-2.0.3" + sources."through2-filter-2.0.0" + sources."to-absolute-glob-2.0.2" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."twitter-ng-0.6.2" + sources."type-is-1.6.16" + sources."typedarray-0.0.6" + sources."uglify-js-3.3.6" + sources."uid-number-0.0.6" + sources."uid-safe-2.1.5" + sources."uid2-0.0.3" + sources."ultron-1.1.1" + sources."unc-path-regex-0.1.2" + sources."unique-stream-2.2.1" + sources."universalify-0.1.1" + sources."unpipe-1.0.0" + sources."utf7-1.0.2" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uue-3.1.2" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."websocket-stream-5.1.2" + sources."when-3.7.8" + sources."wide-align-1.1.2" + sources."wordwrap-0.0.3" + sources."wrappy-1.0.2" + (sources."ws-1.1.5" // { dependencies = [ - sources."execa-0.7.0" + sources."ultron-1.0.2" ]; }) - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.5.0" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."mkdirp-0.5.1" - sources."minimist-0.1.0" - sources."strip-ansi-4.0.0" - sources."wcwidth-1.0.1" - sources."ansi-regex-3.0.0" - sources."defaults-1.0.3" - sources."clone-1.0.3" - sources."add-stream-1.0.0" - sources."conventional-changelog-1.1.7" - sources."meow-3.7.0" - sources."tempfile-1.1.1" - sources."conventional-changelog-angular-1.5.2" - sources."conventional-changelog-atom-0.1.2" - sources."conventional-changelog-codemirror-0.2.1" - sources."conventional-changelog-core-1.9.3" - sources."conventional-changelog-ember-0.2.9" - sources."conventional-changelog-eslint-0.2.1" - sources."conventional-changelog-express-0.2.1" - sources."conventional-changelog-jquery-0.1.0" - sources."conventional-changelog-jscs-0.1.0" - sources."conventional-changelog-jshint-0.2.1" - sources."compare-func-1.3.2" - sources."q-1.5.1" - sources."array-ify-1.0.0" - sources."dot-prop-3.0.0" - sources."is-obj-1.0.1" - sources."conventional-changelog-writer-2.0.2" - sources."conventional-commits-parser-2.0.1" - sources."dateformat-1.0.12" - sources."get-pkg-repo-1.4.0" - sources."git-raw-commits-1.3.0" - sources."git-remote-origin-url-2.0.0" - sources."git-semver-tags-1.2.3" - sources."normalize-package-data-2.4.0" - sources."read-pkg-up-2.0.0" - sources."through2-2.0.3" - sources."conventional-commits-filter-1.1.0" - sources."handlebars-4.0.11" - sources."json-stringify-safe-5.0.1" - sources."split-1.0.1" - sources."is-subset-0.1.1" - sources."modify-values-1.0.0" - sources."optimist-0.6.1" - sources."source-map-0.5.7" - sources."uglify-js-2.8.29" - sources."wordwrap-0.0.2" - sources."amdefine-1.0.1" - sources."uglify-to-browserify-1.0.2" - sources."camelcase-4.1.0" - sources."cliui-3.2.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."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.6" - sources."through-2.3.8" - sources."JSONStream-1.3.1" - sources."is-text-path-1.0.1" - sources."split2-2.2.0" - sources."trim-off-newlines-1.0.1" - sources."jsonparse-1.3.1" - sources."text-extensions-1.7.0" - sources."get-stdin-4.0.1" - sources."parse-github-repo-url-1.4.1" - sources."dargs-4.1.0" - sources."lodash.template-4.4.0" - sources."number-is-nan-1.0.1" - sources."lodash._reinterpolate-3.0.0" - sources."lodash.templatesettings-4.1.0" - sources."gitconfiglocal-1.0.0" - sources."pify-3.0.0" - sources."ini-1.3.4" - 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."path-type-2.0.0" - sources."parse-json-2.2.0" - sources."pinkie-promise-2.0.1" - sources."strip-bom-3.0.0" - sources."error-ex-1.3.1" - sources."is-arrayish-0.2.1" - sources."pinkie-2.0.4" - sources."is-utf8-0.2.1" - sources."readable-stream-2.3.3" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" sources."xtend-4.0.1" - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."camelcase-keys-2.1.0" - sources."loud-rejection-1.6.0" - sources."map-obj-1.0.1" - sources."object-assign-4.1.1" - sources."redent-1.0.0" - sources."trim-newlines-1.0.0" - sources."currently-unhandled-0.4.1" - sources."array-find-index-1.0.2" - sources."indent-string-2.1.0" - sources."strip-indent-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."os-tmpdir-1.0.2" - sources."uuid-3.1.0" - sources."concat-stream-1.6.0" - sources."typedarray-0.0.6" - sources."cross-spawn-5.1.0" - sources."get-stream-3.0.0" - sources."is-stream-1.1.0" - sources."npm-run-path-2.0.2" - sources."strip-eof-1.0.0" - sources."lru-cache-4.1.1" - sources."shebang-command-1.2.0" - sources."which-1.3.0" - sources."pseudomap-1.0.2" sources."yallist-2.1.2" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - sources."path-key-2.0.1" - sources."locate-path-2.0.0" - sources."p-locate-2.0.0" - sources."p-limit-1.1.0" - sources."jsonfile-4.0.0" - sources."universalify-0.1.1" - 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."is-glob-3.1.0" - sources."path-dirname-1.0.2" - sources."is-extglob-2.1.1" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."ansi-escapes-3.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."external-editor-2.0.5" - 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-1.0.2" - sources."restore-cursor-2.0.0" - sources."onetime-2.0.1" - sources."mimic-fn-1.1.0" - sources."iconv-lite-0.4.19" - sources."jschardet-1.6.0" - sources."tmp-0.0.33" - sources."is-promise-2.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."ci-info-1.1.1" - 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.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.2.0" - sources."has-unicode-2.0.1" - sources."wide-align-1.1.2" - sources."code-point-at-1.1.0" - 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."rc-1.2.2" - sources."deep-extend-0.4.2" - sources."strip-json-comments-2.0.1" - sources."byline-5.0.0" - sources."duplexer-0.1.1" - sources."moment-2.19.2" - sources."make-dir-1.1.0" - sources."temp-dir-1.0.0" - sources."imurmurhash-0.1.4" - sources."detect-indent-5.0.0" - sources."sort-keys-2.0.0" - sources."is-plain-obj-1.1.0" - sources."get-caller-file-1.0.2" - sources."os-locale-2.1.0" - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."which-module-2.0.0" - sources."y18n-3.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."invert-kv-1.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Tool for managing JavaScript projects with multiple packages"; - homepage = https://lernajs.io/; - license = "MIT"; + description = "A visual tool for wiring the Internet of Things"; + homepage = http://nodered.org/; + license = "Apache-2.0"; }; - production = true; - }; - lcov-result-merger = nodeEnv.buildNodePackage { - name = "lcov-result-merger"; - packageName = "lcov-result-merger"; - version = "1.2.0"; + production = true; + bypassCache = false; + }; + "node-uptime-https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" = nodeEnv.buildNodePackage { + name = "node-uptime"; + packageName = "node-uptime"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.2.0.tgz"; - sha1 = "5de1e6426f885929b77357f014de5fee1dad0553"; + name = "node-uptime-3.2.0.tar.gz"; + url = https://codeload.github.com/fzaninotto/uptime/legacy.tar.gz/1c65756575f90f563a752e2a22892ba2981c79b7; + sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746"; }; dependencies = [ - sources."through2-2.0.3" - sources."vinyl-1.2.0" - (sources."vinyl-fs-2.4.4" // { + sources."active-x-obfuscator-0.0.1" + sources."addressparser-1.0.1" + sources."argparse-0.1.16" + sources."async-0.1.22" + sources."base64id-0.1.0" + sources."bson-0.1.8" + sources."buffer-crc32-0.2.13" + sources."buildmail-4.0.1" + sources."bytes-0.2.0" + sources."coffee-script-1.12.7" + sources."commander-0.6.1" + (sources."config-0.4.15" // { dependencies = [ - sources."through2-0.6.5" + sources."js-yaml-0.3.7" ]; }) - sources."readable-stream-2.3.3" - sources."xtend-4.0.1" - sources."core-util-is-1.0.2" + (sources."connect-2.7.6" // { + dependencies = [ + sources."buffer-crc32-0.1.1" + ]; + }) + sources."connect-flash-0.1.0" + sources."cookie-0.0.5" + sources."cookie-signature-1.0.1" + sources."debug-3.1.0" + sources."diff-1.0.8" + sources."ejs-0.8.3" + sources."esprima-1.0.4" + (sources."express-3.2.0" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."express-partials-0.0.6" + sources."eyes-0.1.8" + sources."formidable-1.0.11" + sources."fresh-0.1.0" + sources."glob-4.0.6" + sources."graceful-fs-3.0.11" + sources."hooks-0.2.1" + sources."iconv-lite-0.4.15" sources."inherits-2.0.3" - 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."clone-1.0.3" - sources."clone-stats-0.0.1" - sources."replace-ext-0.0.1" - sources."duplexify-3.5.1" - sources."glob-stream-5.3.5" - sources."graceful-fs-4.1.11" - (sources."gulp-sourcemaps-1.6.0" // { + sources."js-yaml-2.1.0" + sources."libbase64-0.1.0" + sources."libmime-3.0.0" + sources."libqp-1.1.0" + sources."lru-cache-2.7.3" + sources."mailcomposer-4.0.2" + sources."methods-0.0.1" + sources."mime-1.2.6" + sources."minimatch-1.0.0" + sources."minimist-0.0.10" + sources."mkdirp-0.3.5" + sources."moment-2.1.0" + sources."mongodb-1.2.14" + sources."mongoose-3.6.7" + sources."mongoose-lifecycle-1.0.0" + sources."mpath-0.1.1" + (sources."mpromise-0.2.1" // { dependencies = [ - sources."through2-2.0.3" + sources."sliced-0.0.4" ]; }) - sources."is-valid-glob-0.3.0" - sources."lazystream-1.0.0" - sources."lodash.isequal-4.5.0" - sources."merge-stream-1.0.1" - sources."mkdirp-0.5.1" - sources."object-assign-4.1.1" - sources."strip-bom-2.0.0" - sources."strip-bom-stream-1.0.0" - (sources."through2-filter-2.0.0" // { + sources."ms-0.1.0" + sources."muri-0.3.1" + sources."nan-1.0.0" + sources."natives-1.1.3" + (sources."net-ping-1.1.7" // { dependencies = [ - sources."through2-2.0.3" + sources."nan-2.3.5" ]; }) - sources."vali-date-1.0.0" - sources."end-of-stream-1.4.0" - sources."stream-shift-1.0.0" + sources."nodemailer-0.3.35" + sources."nodemailer-fetch-1.6.0" + sources."nodemailer-shared-1.1.0" sources."once-1.4.0" + sources."optimist-0.6.1" + sources."options-0.0.6" + sources."pause-0.0.1" + sources."policyfile-0.0.4" + sources."punycode-1.4.1" + sources."qs-0.5.1" + sources."rai-0.1.12" + sources."range-parser-0.0.4" + sources."raw-socket-1.5.2" + sources."redis-0.7.3" + sources."semver-1.1.0" + sources."send-0.1.0" + sources."sigmund-1.0.1" + sources."simplesmtp-0.3.35" + sources."sliced-0.0.3" + (sources."socket.io-0.9.14" // { + dependencies = [ + sources."commander-2.1.0" + ]; + }) + sources."socket.io-client-0.9.11" + sources."tinycolor-0.0.1" + sources."uglify-js-1.2.5" + sources."underscore-1.7.0" + sources."underscore.string-2.4.0" + sources."vows-0.8.1" + sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - sources."extend-3.0.1" - sources."glob-5.0.15" - sources."glob-parent-2.0.0" - sources."micromatch-2.3.11" - sources."ordered-read-streams-0.3.0" - sources."to-absolute-glob-0.1.1" - sources."unique-stream-2.2.1" - sources."inflight-1.0.6" - sources."minimatch-3.0.4" - sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."is-glob-2.0.1" - sources."path-dirname-1.0.2" - sources."is-extglob-1.0.0" - 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."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.4" - 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-3.0.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.1.0" - 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."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.5.0" - sources."minimist-0.0.8" - sources."is-utf8-0.2.1" - sources."first-chunk-stream-1.0.0" + sources."ws-0.4.32" + sources."xmlhttprequest-1.4.2" + sources."xoauth2-0.1.8" + sources."zeparser-0.0.5" ]; buildInputs = globalBuildInputs; meta = { - description = "Merges multiple lcov results into one"; - homepage = https://github.com/mweibel/lcov-result-merger; + description = "Remote monitoring for HTTP applications"; license = "MIT"; }; production = true; + bypassCache = false; }; - livedown = nodeEnv.buildNodePackage { - name = "livedown"; - packageName = "livedown"; - version = "2.1.1"; + npm = nodeEnv.buildNodePackage { + name = "npm"; + packageName = "npm"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz"; - sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b"; + url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz"; + sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "a package manager for JavaScript"; + homepage = https://docs.npmjs.com/; + license = "Artistic-2.0"; + }; + production = true; + bypassCache = false; + }; + "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { + name = "npm2nix"; + packageName = "npm2nix"; + version = "5.12.0"; + src = fetchgit { + url = "git://github.com/NixOS/npm2nix.git"; + rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5"; + sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5"; }; dependencies = [ - sources."body-parser-1.18.2" - sources."chokidar-1.7.0" - sources."express-4.16.2" - sources."markdown-it-8.4.0" - sources."markdown-it-emoji-1.4.0" - sources."markdown-it-github-headings-1.0.1" - sources."markdown-it-task-checkbox-1.0.4" - sources."minimist-1.2.0" - sources."opn-5.1.0" - sources."request-2.83.0" - sources."socket.io-2.0.4" - sources."bytes-3.0.0" - sources."content-type-1.0.4" - sources."debug-2.6.9" - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."on-finished-2.3.0" - sources."qs-6.5.1" - sources."raw-body-2.3.2" - sources."type-is-1.6.15" - sources."ms-2.0.0" - sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - 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.17" - sources."mime-db-1.30.0" - sources."anymatch-1.3.2" - 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.3" - sources."micromatch-2.3.11" - sources."normalize-path-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" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."kind-of-3.2.2" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - 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-3.0.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."repeat-string-1.6.1" - sources."isarray-2.0.1" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - 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."remove-trailing-separator-1.1.0" - sources."binary-extensions-1.10.0" - sources."graceful-fs-4.1.11" - sources."minimatch-3.0.4" - sources."readable-stream-2.3.3" - sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.8" + sources."abbrev-1.1.1" + sources."ajv-5.5.2" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."argparse-0.1.15" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + (sources."block-stream-0.0.9" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."caseless-0.12.0" + sources."chownr-0.0.2" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."coffee-script-1.12.7" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" + (sources."config-chain-1.1.11" // { + dependencies = [ + sources."ini-1.3.5" + ]; + }) + sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - 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."nan-2.7.0" - sources."accepts-1.3.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."escape-html-1.0.3" - sources."etag-1.8.1" - sources."finalhandler-1.1.0" - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.2" - sources."range-parser-1.2.0" - sources."send-0.16.1" - sources."serve-static-1.13.1" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."negotiator-0.6.1" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" - sources."destroy-1.0.4" - sources."mime-1.4.1" - sources."argparse-1.0.9" - sources."entities-1.1.1" - sources."linkify-it-2.0.3" - sources."mdurl-1.0.1" - sources."uc.micro-1.0.3" - sources."sprintf-js-1.0.3" - sources."github-slugger-1.2.0" - sources."innertext-1.0.2" - sources."emoji-regex-6.1.1" - sources."html-entities-1.2.1" - sources."is-wsl-1.1.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" + sources."couch-login-0.1.20" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."findit-1.2.0" + sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" + sources."fs-extra-0.6.4" + (sources."fs.extra-1.3.2" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) + sources."fs.realpath-1.0.0" + (sources."fstream-0.1.31" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."graceful-fs-2.0.3" + sources."har-schema-2.0.0" sources."har-validator-5.0.3" + sources."has-unicode-2.0.1" sources."hawk-6.0.2" + sources."hoek-4.2.1" sources."http-signature-1.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.1.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" + sources."jsonfile-1.0.1" + sources."jsprim-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.3.5" + sources."natives-1.1.3" + sources."ncp-0.4.2" + sources."nopt-2.2.1" + (sources."npm-registry-client-0.2.27" // { + dependencies = [ + sources."semver-2.0.11" + ]; + }) + (sources."npmconf-0.1.1" // { + dependencies = [ + sources."inherits-1.0.2" + sources."once-1.1.1" + sources."semver-2.3.2" + ]; + }) + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."osenv-0.0.3" + sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.0" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."readable-stream-2.3.6" + sources."request-2.85.0" + sources."retry-0.6.0" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."semver-4.3.6" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."slide-1.1.6" + sources."sntp-2.1.0" + sources."sshpk-1.14.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" + sources."strip-ansi-3.0.1" + (sources."tar-0.1.17" // { + dependencies = [ + sources."graceful-fs-3.0.11" + sources."inherits-1.0.2" + sources."mkdirp-0.5.1" + ]; + }) + (sources."temp-0.6.0" // { + dependencies = [ + sources."graceful-fs-1.2.3" + sources."rimraf-2.1.4" + ]; + }) + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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."engine.io-3.1.4" - sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.4" - sources."socket.io-parser-3.1.2" - sources."base64id-1.0.0" - sources."engine.io-parser-2.1.1" - sources."ws-3.3.1" - sources."uws-0.14.5" - sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" - sources."base64-arraybuffer-0.1.5" - sources."blob-0.0.4" - sources."has-binary2-1.0.2" - sources."async-limiter-1.0.0" - sources."ultron-1.1.0" - sources."backo2-1.0.2" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."engine.io-client-3.1.4" - sources."has-cors-1.1.0" - sources."indexof-0.0.1" - sources."object-component-0.0.3" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" - sources."to-array-0.1.4" - sources."component-inherit-0.0.3" - sources."xmlhttprequest-ssl-1.5.4" - sources."yeast-0.1.2" - sources."better-assert-1.0.2" - sources."callsite-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Live Markdown previews for your favourite editor."; - homepage = https://github.com/shime/livedown; - license = "MIT"; - }; - production = true; - }; - live-server = nodeEnv.buildNodePackage { - name = "live-server"; - packageName = "live-server"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/live-server/-/live-server-1.2.0.tgz"; - sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3"; - }; - dependencies = [ - sources."chokidar-1.7.0" - sources."colors-1.1.2" - sources."connect-3.5.1" - sources."cors-2.8.4" - sources."event-stream-3.3.4" - sources."faye-websocket-0.11.1" - sources."http-auth-3.1.3" - sources."morgan-1.9.0" - sources."object-assign-4.1.1" - sources."opn-5.1.0" - sources."proxy-middleware-0.15.0" - sources."send-0.16.1" - sources."serve-index-1.9.1" - sources."anymatch-1.3.2" - sources."async-each-1.0.1" - sources."glob-parent-2.0.0" - sources."inherits-2.0.3" - 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.3" - sources."micromatch-2.3.11" - sources."normalize-path-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" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."kind-of-3.2.2" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - 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-3.0.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."repeat-string-1.6.1" - sources."isarray-1.0.0" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - 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."remove-trailing-separator-1.1.0" - sources."binary-extensions-1.10.0" - sources."graceful-fs-4.1.11" - sources."minimatch-3.0.4" - sources."readable-stream-2.3.3" - sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" + sources."underscore-1.4.4" + sources."underscore.string-2.3.3" sources."util-deprecate-1.0.2" - sources."nan-2.7.0" - sources."debug-2.6.9" - sources."finalhandler-0.5.1" - sources."parseurl-1.3.2" - sources."utils-merge-1.0.0" - sources."ms-2.0.0" - sources."escape-html-1.0.3" - sources."on-finished-2.3.0" - sources."statuses-1.3.1" - sources."unpipe-1.0.0" - sources."ee-first-1.1.1" - sources."vary-1.1.2" - sources."through-2.3.8" - sources."duplexer-0.1.1" - 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."websocket-driver-0.7.0" - sources."http-parser-js-0.4.9" - sources."websocket-extensions-0.1.3" - sources."apache-crypt-1.2.1" - sources."apache-md5-1.1.2" - sources."bcryptjs-2.4.3" - sources."uuid-3.1.0" - sources."unix-crypt-td-js-1.0.0" - sources."basic-auth-2.0.0" - sources."depd-1.1.1" - sources."on-headers-1.0.1" - sources."is-wsl-1.1.0" - sources."destroy-1.0.4" - sources."encodeurl-1.0.1" - sources."etag-1.8.1" - sources."fresh-0.5.2" - sources."http-errors-1.6.2" - sources."mime-1.4.1" - sources."range-parser-1.2.0" - sources."setprototypeof-1.0.3" - sources."accepts-1.3.4" - sources."batch-0.6.1" - sources."mime-types-2.1.17" - sources."negotiator-0.6.1" - sources."mime-db-1.30.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "simple development http server with live reload capability"; - homepage = "https://github.com/tapio/live-server#readme"; - license = "MIT"; - }; - production = true; - }; - meat = nodeEnv.buildNodePackage { - name = "meat"; - packageName = "meat"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/meat/-/meat-0.3.4.tgz"; - sha1 = "e2b6b721014096e30de9c97114e1dd6696135d13"; - }; - dependencies = [ - sources."express-2.5.11" - sources."jade-0.27.0" - sources."open-0.0.2" - sources."winston-0.6.2" - sources."mkdirp-0.3.0" - sources."node.extend-1.0.0" - sources."connect-1.9.2" - sources."mime-1.2.4" - sources."qs-0.4.2" - sources."formidable-1.0.17" - sources."commander-0.6.1" - sources."async-0.1.22" - sources."colors-0.6.2" - sources."cycle-1.0.3" - sources."eyes-0.1.8" - sources."pkginfo-0.2.3" - sources."request-2.9.203" - sources."stack-trace-0.0.10" + sources."uuid-3.2.1" + sources."verror-1.10.0" + sources."walk-2.3.13" + sources."wide-align-1.1.2" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; - homepage = https://bitbucket.org/aahmed/meat; + description = "Generate nix expressions to build npm packages"; + homepage = https://github.com/NixOS/npm2nix; }; production = true; + bypassCache = false; }; - mocha = nodeEnv.buildNodePackage { - name = "mocha"; - packageName = "mocha"; - version = "4.0.1"; + npm-check-updates = nodeEnv.buildNodePackage { + name = "npm-check-updates"; + packageName = "npm-check-updates"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz"; - sha512 = "07hbr2w894az0s1hi6lglls00nwb941ymwm580q4917kwcmsg3ngagqf9cfxyjdwwivm956dpwzsrkbk4i7a404i56w1y809a3fdw3s"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.1.tgz"; + sha512 = "1ciz9n8wmwq3lpi3g6xmjr4plqf3ydpqznrcci5bbrq7d9clkmkcg3gzbaqwkgrjgmvahby0akylk66zq8n8zm5mqn0vj0jsrxhryf4"; }; dependencies = [ - sources."browser-stdout-1.3.0" - sources."commander-2.11.0" - sources."debug-3.1.0" - sources."diff-3.3.1" + sources."abbrev-1.1.1" + sources."align-text-0.1.4" + sources."ansi-align-2.0.0" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."ansicolors-0.3.2" + sources."archy-1.0.0" + sources."argparse-1.0.10" + sources."asap-2.0.6" + sources."async-1.5.2" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.2" + sources."bluebird-3.5.1" + sources."bops-0.1.1" + sources."boxen-0.3.1" + sources."brace-expansion-1.1.11" + sources."builtin-modules-1.1.1" + sources."camelcase-1.2.1" + sources."capture-stack-trace-1.0.0" + sources."center-align-0.1.3" + sources."chalk-1.1.3" + sources."ci-info-1.1.3" + sources."cint-8.2.1" + sources."cli-boxes-1.0.0" + sources."cli-cursor-1.0.2" + sources."cli-table-0.3.1" + sources."cli-width-2.2.0" + sources."clite-0.3.0" + sources."cliui-2.1.0" + sources."clone-deep-0.3.0" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."colors-1.0.3" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."deep-extend-0.4.2" + sources."dot-prop-3.0.0" + sources."duplexer2-0.1.4" + sources."duplexer3-0.1.4" + sources."duplexify-3.5.4" + sources."email-validator-1.1.1" + sources."end-of-stream-1.4.1" + sources."error-ex-1.3.1" + sources."es6-promise-3.3.1" sources."escape-string-regexp-1.0.5" - sources."glob-7.1.2" - sources."growl-1.10.3" - sources."he-1.1.1" - sources."mkdirp-0.5.1" - sources."supports-color-4.4.0" - sources."ms-2.0.0" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" + sources."esprima-4.0.0" + sources."execa-0.7.0" + sources."exit-hook-1.1.1" + sources."fast-diff-1.1.2" + sources."figures-1.7.0" + sources."filled-array-1.1.0" + sources."find-up-1.1.2" + sources."for-in-1.0.2" + sources."for-own-1.0.0" + sources."get-caller-file-1.0.2" + sources."get-stdin-5.0.1" + sources."get-stream-3.0.0" + sources."global-dirs-0.1.1" + sources."got-5.7.1" + sources."graceful-fs-4.1.11" + sources."graphlib-2.1.5" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."hasbin-1.2.3" + sources."hosted-git-info-2.6.0" + sources."iconv-lite-0.4.21" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."infinity-agent-2.0.3" sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-1.0.3" + sources."invert-kv-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + sources."is-ci-1.1.0" + sources."is-extendable-0.1.1" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" + sources."is-obj-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."jju-1.3.0" + sources."js-yaml-3.11.0" + sources."json-parse-helpfulerror-1.0.3" + sources."json5-0.5.1" + sources."kind-of-3.2.2" + sources."latest-version-2.0.0" + sources."lazy-cache-1.0.4" + sources."lcid-1.0.0" + sources."load-json-file-1.1.0" + sources."lodash-4.17.5" + sources."lodash.assign-4.2.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.defaults-4.2.0" + sources."lodash.defaultsdeep-4.6.0" + sources."lodash.mergewith-4.6.1" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" + sources."make-dir-1.2.0" sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mixin-object-2.0.1" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.6" + sources."nconf-0.7.2" + (sources."needle-2.2.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."nested-error-stacks-1.0.2" + sources."node-alias-1.0.4" + sources."node-status-codes-1.0.0" + sources."normalize-package-data-2.4.0" + sources."npm-3.10.10" + sources."npm-run-path-2.0.2" + (sources."npmi-2.0.1" // { + dependencies = [ + sources."semver-4.3.6" + ]; + }) + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."object-keys-1.0.11" sources."once-1.4.0" + sources."onetime-1.1.0" + sources."open-0.0.5" + sources."os-homedir-1.0.2" + sources."os-locale-1.4.0" + sources."os-name-1.0.3" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."osx-release-1.1.0" + sources."p-finally-1.0.0" + sources."package-json-2.4.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."promise-7.3.1" + sources."proxy-from-env-1.0.0" + sources."pseudomap-1.0.2" + sources."punycode-1.3.2" + sources."querystring-0.2.0" + sources."rc-1.2.6" + sources."rc-config-loader-2.0.1" + sources."read-all-stream-3.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" + sources."recursive-readdir-2.2.2" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."repeat-string-1.6.1" + sources."repeating-2.0.1" + sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" + sources."require-main-filename-1.0.1" + sources."restore-cursor-1.0.1" + sources."right-align-0.1.3" + sources."run-async-2.3.0" + sources."rx-4.1.0" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."semver-utils-1.1.2" + sources."set-blocking-2.0.0" + (sources."shallow-clone-0.1.2" // { + dependencies = [ + sources."kind-of-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slide-1.1.6" + (sources."snyk-1.71.0" // { + dependencies = [ + sources."async-0.9.2" + sources."camelcase-3.0.0" + sources."cliui-3.2.0" + sources."debug-3.1.0" + sources."for-in-0.1.8" + sources."got-3.3.1" + sources."latest-version-1.0.1" + sources."lazy-cache-0.2.7" + sources."minimist-1.2.0" + sources."object-assign-3.0.0" + sources."package-json-1.2.0" + sources."repeating-1.1.3" + sources."timed-out-2.0.0" + sources."update-notifier-0.5.0" + sources."window-size-0.2.0" + sources."yargs-4.8.1" + ]; + }) + (sources."snyk-config-1.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-go-plugin-1.4.6" + sources."snyk-gradle-plugin-1.2.0" + (sources."snyk-module-1.8.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-mvn-plugin-1.1.1" + (sources."snyk-nuget-plugin-1.3.9" // { + dependencies = [ + sources."es6-promise-4.2.4" + ]; + }) + sources."snyk-php-plugin-1.3.2" + (sources."snyk-policy-1.10.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-python-plugin-1.5.7" + (sources."snyk-resolve-1.0.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."snyk-resolve-deps-1.7.0" // { + dependencies = [ + sources."configstore-2.1.0" + sources."debug-2.6.9" + sources."update-notifier-0.6.3" + sources."uuid-2.0.3" + ]; + }) + (sources."snyk-sbt-plugin-1.2.5" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-tree-1.0.0" + (sources."snyk-try-require-1.2.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."spawn-please-0.3.0" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."sprintf-js-1.0.3" + sources."stream-shift-1.0.0" + sources."string-length-1.0.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + (sources."tempfile-1.1.1" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."term-size-1.2.0" + sources."then-fs-2.0.0" + sources."through-2.3.8" + sources."timed-out-3.1.3" + sources."to-utf8-0.0.1" + sources."toml-2.3.3" + sources."undefsafe-0.0.3" + sources."unique-string-1.0.0" + sources."unzip-response-1.0.2" + (sources."update-notifier-2.4.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."boxen-1.3.0" + sources."camelcase-4.1.0" + sources."chalk-2.3.2" + sources."configstore-3.1.2" + sources."dot-prop-4.2.0" + sources."got-6.7.1" + sources."is-fullwidth-code-point-2.0.0" + sources."latest-version-3.1.0" + sources."package-json-4.0.1" + sources."pify-3.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."supports-color-5.3.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + sources."widest-line-2.0.0" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + ]; + }) + sources."url-0.11.0" + sources."url-parse-lax-1.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-license-3.0.3" + sources."which-1.3.0" + sources."which-module-1.0.0" + sources."widest-line-1.0.0" + sources."win-release-1.1.1" + sources."window-size-0.1.4" + sources."wordwrap-0.0.2" + sources."wrap-ansi-2.1.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."minimist-0.0.8" - sources."has-flag-2.0.0" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + sources."yargs-3.15.0" + sources."yargs-parser-2.4.1" + sources."zip-1.2.0" ]; buildInputs = globalBuildInputs; meta = { - description = "simple, flexible, fun test framework"; - homepage = https://mochajs.org/; - license = "MIT"; + description = "Find newer versions of dependencies than what your package.json or bower.json allows"; + homepage = https://github.com/tjunnone/npm-check-updates; + license = "Apache-2.0"; }; production = true; + bypassCache = false; }; - multi-file-swagger = nodeEnv.buildNodePackage { - name = "multi-file-swagger"; - packageName = "multi-file-swagger"; - version = "2.2.0"; + nsp = nodeEnv.buildNodePackage { + name = "nsp"; + packageName = "nsp"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/multi-file-swagger/-/multi-file-swagger-2.2.0.tgz"; - sha1 = "0161a13e2b3378759e36b9e05be34b46a06decd5"; + url = "https://registry.npmjs.org/nsp/-/nsp-3.2.1.tgz"; + sha512 = "06qrykgjpr3m7sl9g2axaraxh3mndmffgjxf45nqw5jblqa9zsnkvgmds8s29avp4qhmk084ri0rbg30yr15bd73i2152q6na5qdfbl"; }; dependencies = [ - sources."commander-2.11.0" - sources."js-yaml-3.10.0" - sources."json-refs-2.1.7" - sources."argparse-1.0.9" - sources."esprima-4.0.0" - sources."sprintf-js-1.0.3" - sources."graphlib-2.1.1" - sources."native-promise-only-0.8.1" - sources."path-loader-1.0.4" - sources."slash-1.0.0" - sources."uri-js-3.0.2" - sources."lodash-4.17.4" - sources."superagent-3.8.1" - sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" + sources."agent-base-4.2.0" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" + sources."boom-5.2.0" + sources."builtin-modules-1.1.1" + sources."camelcase-4.1.0" + sources."chalk-2.3.2" + sources."chardet-0.4.2" + sources."cli-cursor-2.1.0" + sources."cli-table2-0.2.0" + sources."cli-width-2.2.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."code-point-at-1.1.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."colors-1.2.1" + sources."cross-spawn-5.1.0" + sources."cvss-1.0.2" sources."debug-3.1.0" - sources."extend-3.0.1" - sources."form-data-2.3.1" - sources."formidable-1.1.1" - sources."methods-1.1.2" - sources."mime-1.4.1" - sources."qs-6.5.1" - sources."readable-stream-2.3.3" + sources."decamelize-1.2.0" + sources."error-ex-1.3.1" + sources."es6-promise-4.2.4" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."execa-0.7.0" + sources."external-editor-2.2.0" + sources."figures-2.0.0" + sources."find-up-2.1.0" + sources."get-caller-file-1.0.2" + sources."get-stream-3.0.0" + sources."graceful-fs-4.1.11" + sources."has-flag-3.0.0" + sources."hoek-4.2.1" + sources."hosted-git-info-2.6.0" + sources."https-proxy-agent-2.2.1" + sources."iconv-lite-0.4.21" + (sources."inquirer-3.3.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."lodash-4.17.5" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."invert-kv-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-promise-2.1.0" + sources."is-stream-1.1.0" + sources."isexe-2.0.0" + sources."lcid-1.0.0" + sources."load-json-file-2.0.0" + sources."locate-path-2.0.0" + sources."lodash-3.10.1" + sources."lru-cache-4.1.2" + sources."mem-1.1.0" + sources."mimic-fn-1.2.0" sources."ms-2.0.0" - sources."asynckit-0.4.0" - sources."combined-stream-1.0.5" - sources."mime-types-2.1.17" - sources."delayed-stream-1.0.0" - sources."mime-db-1.30.0" - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."punycode-2.1.0" + sources."mute-stream-0.0.7" + sources."nodesecurity-npm-utils-6.0.0" + sources."normalize-package-data-2.4.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."onetime-2.0.1" + sources."os-locale-2.1.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-1.2.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parse-json-2.2.0" + sources."path-exists-3.0.0" + sources."path-key-2.0.1" + sources."path-type-2.0.0" + sources."pify-2.3.0" + sources."pseudomap-1.0.2" + sources."read-pkg-2.0.0" + sources."read-pkg-up-2.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."restore-cursor-2.0.0" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safer-buffer-2.1.2" + sources."semver-5.5.0" + sources."set-blocking-2.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."supports-color-5.3.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."validate-npm-package-license-3.0.3" + sources."which-1.3.0" + sources."which-module-2.0.0" + sources."wrap-ansi-2.1.0" + sources."wreck-12.5.1" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + (sources."yargs-9.0.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."yargs-parser-7.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Multi-file Swagger example"; - license = "MIT"; + description = "The Node Security (nodesecurity.io) command line interface"; + homepage = "https://github.com/nodesecurity/nsp#readme"; + license = "Apache-2.0"; }; production = true; + bypassCache = false; }; - nijs = nodeEnv.buildNodePackage { - name = "nijs"; - packageName = "nijs"; - version = "0.0.25"; + ocaml-language-server = nodeEnv.buildNodePackage { + name = "ocaml-language-server"; + packageName = "ocaml-language-server"; + version = "1.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; - sha1 = "04b035cb530d46859d1018839a518c029133f676"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.34.tgz"; + sha512 = "216lq2hh4mmk0lzkn381p0l4lgr84xmv6jdjc42yry1yb695zy7bs36n40dmvc81afgsnc51b1rcbn51438ysk59w0drrxd8x43zykr"; }; dependencies = [ - sources."optparse-1.0.5" - sources."slasp-0.0.4" + sources."async-2.6.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + sources."deepmerge-2.1.0" + sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."lodash-4.17.5" + sources."lokijs-1.5.3" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."pegjs-0.10.0" + sources."vscode-jsonrpc-3.6.0" + sources."vscode-languageclient-4.0.1" + sources."vscode-languageserver-4.0.0" + sources."vscode-languageserver-protocol-3.6.0" + sources."vscode-languageserver-types-3.7.1" + sources."vscode-uri-1.0.3" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "An internal DSL for the Nix package manager in JavaScript"; - homepage = "https://github.com/svanderburg/nijs#readme"; - license = "MIT"; + description = "OCaml language server"; + homepage = https://github.com/freebroccolo/ocaml-language-server; + license = "Apache-2.0"; }; production = true; + bypassCache = false; }; - node2nix = nodeEnv.buildNodePackage { - name = "node2nix"; - packageName = "node2nix"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.4.0.tgz"; - sha1 = "f5fc42590aedb8934e8e7fb6641a91c05fcd9337"; + "parsoid-git://github.com/abbradar/parsoid#stable" = nodeEnv.buildNodePackage { + name = "parsoid"; + packageName = "parsoid"; + version = "0.8.0"; + src = fetchgit { + url = "git://github.com/abbradar/parsoid"; + rev = "89958e4f9e5583e0fdc5447103392e3d749d500b"; + sha256 = "1af850ced5bd8db64e20ad30bf59d99c14624efba3127759ca1c34088a0aadd7"; }; dependencies = [ - sources."optparse-1.0.5" - sources."semver-5.4.1" - sources."npm-registry-client-8.4.0" - (sources."npmconf-2.1.2" // { + sources."accepts-1.3.5" + sources."ajv-5.5.2" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-regex-2.1.1" + sources."argparse-1.0.10" + sources."array-flatten-1.1.1" + sources."asap-2.0.6" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-0.9.2" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."babybird-0.0.1" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."bl-1.2.2" + sources."bluebird-3.5.1" + (sources."body-parser-1.18.2" // { dependencies = [ - sources."semver-4.3.6" + sources."content-type-1.0.4" + sources."setprototypeof-1.0.3" ]; }) - sources."tar-3.1.15" - sources."temp-0.8.3" - sources."fs.extra-1.3.2" - sources."findit-2.0.0" - sources."base64-js-1.2.1" - sources."slasp-0.0.4" - sources."nijs-0.0.25" - sources."concat-stream-1.6.0" - sources."graceful-fs-4.1.11" - sources."normalize-package-data-2.4.0" - sources."npm-package-arg-5.1.2" - sources."once-1.3.3" - sources."request-2.83.0" - sources."retry-0.10.1" - sources."slide-1.1.6" - sources."ssri-4.1.6" - sources."npmlog-4.1.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."hosted-git-info-2.5.0" - sources."is-builtin-module-1.0.0" - sources."validate-npm-package-license-3.0.1" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" 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."osenv-0.1.4" - sources."validate-npm-package-name-3.0.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."builtins-1.0.3" - sources."wrappy-1.0.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."bunyan-1.8.12" + sources."bunyan-syslog-udp-0.1.0" + sources."busboy-0.2.14" + sources."bytes-3.0.0" + sources."camelcase-1.2.1" sources."caseless-0.12.0" - sources."combined-stream-1.0.5" + sources."center-align-0.1.3" + sources."clarinet-0.11.0" + sources."cliui-2.1.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."colors-1.2.1" + sources."combined-stream-1.0.6" + sources."compressible-2.0.13" + sources."compression-1.7.2" + sources."concat-map-0.0.1" + sources."connect-busboy-0.0.2" + sources."content-disposition-0.5.2" + sources."content-type-git+https://github.com/wikimedia/content-type#master" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."core-js-2.5.5" + sources."core-util-is-1.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."define-properties-1.1.2" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dicer-0.2.5" + sources."diff-1.4.0" + sources."dnscache-1.0.1" + sources."dom-storage-2.1.0" + sources."domino-1.0.30" + sources."dtrace-provider-0.8.6" + sources."ecc-jsbn-0.1.1" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."entities-1.1.1" + sources."error-ex-1.3.1" + sources."escape-html-1.0.3" + sources."esprima-4.0.0" + sources."etag-1.8.1" + (sources."express-4.16.3" // { + dependencies = [ + sources."content-type-1.0.4" + sources."statuses-1.4.0" + ]; + }) + (sources."express-handlebars-3.0.0" // { + dependencies = [ + sources."async-1.5.2" + sources."wordwrap-0.0.2" + sources."yargs-3.10.0" + ]; + }) sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + (sources."finalhandler-1.1.1" // { + dependencies = [ + sources."statuses-1.4.0" + ]; + }) + sources."find-up-1.1.2" + sources."foreach-2.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."function-bind-1.1.1" + sources."gelf-stream-1.1.1" + sources."gelfling-0.3.1" + sources."get-caller-file-1.0.2" + sources."getpass-0.1.7" + sources."glob-6.0.4" + sources."graceful-fs-4.1.11" + sources."handlebars-4.0.11" + sources."har-schema-2.0.0" sources."har-validator-5.0.3" + sources."has-symbols-1.0.0" + sources."hat-0.0.3" sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."hosted-git-info-2.6.0" + sources."hot-shots-4.8.0" + sources."http-errors-1.6.3" sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."invert-kv-1.0.0" + sources."ipaddr.js-1.6.0" + sources."is-arguments-1.0.2" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-0.0.1" sources."isstream-0.1.2" + sources."js-yaml-3.11.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" + sources."jsprim-1.4.1" + sources."kad-git+https://github.com/gwicke/kad.git#master" + sources."kad-fs-0.0.4" + sources."kad-localstorage-0.0.7" + sources."kad-memstore-0.0.1" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."lcid-1.0.0" + sources."limitation-0.2.0" + sources."load-json-file-1.1.0" + sources."lodash-3.10.1" + sources."lodash._baseclone-4.5.7" + sources."lodash.clone-4.3.2" + sources."longest-1.0.1" + sources."media-typer-0.3.0" + sources."mediawiki-title-0.6.5" + sources."merge-1.2.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-0.0.10" + sources."mkdirp-0.5.1" + sources."moment-2.22.0" + sources."ms-2.0.0" + sources."msgpack5-3.6.0" + sources."mv-2.1.1" + sources."nan-2.10.0" + sources."ncp-2.0.0" + sources."negotiator-git+https://github.com/arlolra/negotiator#full-parse-access" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" + sources."object-keys-1.0.11" + sources."object.assign-4.1.0" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."once-1.4.0" + sources."optimist-0.6.1" + sources."os-locale-1.4.0" + sources."parse-json-2.2.0" + sources."parseurl-1.3.2" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."path-type-1.1.0" + sources."pegjs-git+https://github.com/tstarling/pegjs#fork" sources."performance-now-2.1.0" - sources."qs-6.5.1" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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.30.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prfun-2.1.5" + sources."process-nextick-args-2.0.0" + sources."promise-7.3.1" + sources."proxy-addr-2.0.3" sources."punycode-1.4.1" - sources."are-we-there-yet-1.1.4" - sources."console-control-strings-1.1.0" - sources."gauge-2.7.4" + sources."qs-6.5.1" + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-1.1.14" + sources."repeat-string-1.6.1" + sources."request-2.85.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."right-align-0.1.3" + sources."rimraf-2.4.5" + sources."safe-buffer-5.1.1" + sources."safe-json-stringify-1.1.0" + sources."semver-5.5.0" + sources."send-0.16.2" + (sources."serve-favicon-2.5.0" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.13.2" + (sources."service-runner-2.3.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."minimist-0.0.8" + sources."ms-0.7.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) sources."set-blocking-2.0.0" - sources."delegates-1.0.0" - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" + sources."setprototypeof-1.1.0" + sources."simplediff-0.1.1" + sources."sntp-2.1.0" + sources."source-map-0.4.4" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" + sources."streamsearch-0.1.2" sources."string-width-1.0.2" + sources."string_decoder-0.10.31" + sources."stringstream-0.0.5" 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."mkdirp-0.3.5" - sources."nopt-3.0.6" - sources."uid-number-0.0.5" - sources."proto-list-1.2.4" - sources."minimist-0.0.8" - sources."abbrev-1.1.1" - sources."minipass-2.2.1" - sources."minizlib-1.0.4" - sources."yallist-3.0.2" - sources."rimraf-2.2.8" - sources."fs-extra-0.6.4" - sources."walk-2.3.9" - sources."ncp-0.4.2" - sources."jsonfile-1.0.1" - sources."foreachasync-3.0.0" + sources."strip-bom-2.0.0" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.16" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."unpipe-1.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.2.1" + sources."validate-npm-package-license-3.0.3" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."which-module-1.0.0" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."wrap-ansi-2.1.0" + sources."wrappy-1.0.2" + sources."y18n-3.2.1" + (sources."yargs-7.1.0" // { + dependencies = [ + sources."camelcase-3.0.0" + sources."cliui-3.2.0" + ]; + }) + sources."yargs-parser-5.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; - license = "MIT"; + description = "Mediawiki parser for the VisualEditor."; + license = "GPL-2.0+"; }; production = true; + bypassCache = false; }; - node-gyp = nodeEnv.buildNodePackage { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.6.2"; + peerflix = nodeEnv.buildNodePackage { + name = "peerflix"; + packageName = "peerflix"; + version = "0.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; - sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz"; + sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf"; }; dependencies = [ - sources."fstream-1.0.11" + sources."addr-to-ip-port-1.4.3" + sources."airplay-protocol-2.0.2" + sources."airplayer-2.0.0" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."appendable-cli-menu-2.0.0" + sources."array-find-index-1.0.2" + sources."array-flatten-2.1.1" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bencode-2.0.0" + sources."big-integer-1.6.27" + sources."bitfield-0.1.0" + sources."bittorrent-dht-6.4.2" + sources."bittorrent-tracker-7.7.0" + sources."blob-to-buffer-1.2.7" + sources."bn.js-4.11.8" + sources."bncode-0.5.3" + sources."bonjour-3.5.0" + sources."bplist-creator-0.0.6" + sources."bplist-parser-0.1.1" + sources."brace-expansion-1.1.11" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-equal-0.0.1" + sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" + sources."buffer-indexof-1.1.1" + sources."builtin-modules-1.1.1" + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."chalk-1.1.3" + sources."cli-cursor-1.0.2" + sources."cli-width-2.2.0" + sources."clivas-0.2.0" + sources."code-point-at-1.1.0" + sources."compact2string-1.4.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."consume-http-header-1.0.0" + sources."consume-until-1.0.0" + sources."core-util-is-1.0.2" + sources."currently-unhandled-0.4.1" + sources."cyclist-0.1.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decompress-response-3.3.0" + sources."deep-equal-1.0.1" + sources."deep-extend-0.4.2" + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.1" + sources."dns-txt-2.0.2" + sources."end-of-stream-1.4.1" + sources."error-ex-1.3.1" + sources."escape-string-regexp-1.0.5" + sources."exit-hook-1.1.1" + sources."extend-3.0.1" + sources."external-editor-1.1.1" + sources."fifo-0.1.4" + sources."figures-1.7.0" + sources."find-up-1.1.2" + sources."flatten-0.0.1" + (sources."fs-chunk-store-1.7.0" // { + dependencies = [ + sources."mkdirp-0.5.1" + ]; + }) + sources."fs.realpath-1.0.0" + sources."get-browser-rtc-1.0.2" + sources."get-stdin-4.0.1" sources."glob-7.1.2" sources."graceful-fs-4.1.11" - sources."minimatch-3.0.4" - sources."mkdirp-0.5.1" - sources."nopt-3.0.6" - sources."npmlog-4.1.2" - sources."osenv-0.1.4" - sources."request-2.83.0" - sources."rimraf-2.6.2" - sources."semver-5.3.0" - sources."tar-2.2.1" - sources."which-1.3.0" - sources."inherits-2.0.3" - sources."fs.realpath-1.0.0" + sources."has-ansi-2.0.0" + sources."hat-0.0.3" + sources."hosted-git-info-2.6.0" + sources."http-headers-3.0.2" + sources."immediate-chunk-store-1.0.8" + sources."indent-string-2.1.0" sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + (sources."inquirer-1.2.3" // { + dependencies = [ + sources."lodash-4.17.5" + ]; + }) + sources."internal-ip-1.2.0" + sources."ip-1.1.5" + sources."ip-set-1.0.1" + sources."ipaddr.js-1.7.0" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + sources."is-promise-2.1.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."k-bucket-0.6.0" + (sources."k-rpc-3.7.0" // { + dependencies = [ + sources."bencode-2.0.0" + sources."k-bucket-2.0.1" + ]; + }) + sources."k-rpc-socket-1.8.0" + sources."keypress-0.2.1" + sources."load-json-file-1.1.0" + sources."lodash-3.10.1" + sources."loud-rejection-1.6.0" + sources."lru-2.0.1" + sources."magnet-uri-5.1.7" + sources."map-obj-1.0.1" + sources."meow-3.7.0" + sources."mime-1.6.0" + sources."mimic-response-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.3.5" + sources."ms-2.0.0" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."mute-stream-0.0.6" + sources."network-address-1.1.2" + sources."next-line-1.1.0" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" + sources."numeral-1.5.6" + sources."object-assign-4.1.1" sources."once-1.4.0" + sources."onetime-1.1.0" + sources."open-0.0.5" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + sources."options-0.0.6" + sources."os-shim-0.1.3" + sources."os-tmpdir-1.0.2" + sources."parse-json-2.2.0" + (sources."parse-torrent-5.8.3" // { + dependencies = [ + sources."get-stdin-5.0.1" + ]; + }) + sources."parse-torrent-file-4.1.0" + sources."path-exists-2.1.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."minimist-0.0.8" - sources."abbrev-1.1.1" - sources."are-we-there-yet-1.1.4" - sources."console-control-strings-1.1.0" - sources."gauge-2.7.4" - sources."set-blocking-2.0.0" - sources."delegates-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."path-type-1.1.0" + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { + dependencies = [ + sources."bncode-0.2.3" + ]; + }) + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."plist-1.2.0" + sources."process-nextick-args-2.0.0" + sources."pump-1.0.3" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" + sources."random-iterate-1.0.1" + sources."randombytes-2.0.6" + sources."range-parser-1.2.0" + sources."rc-1.2.6" + sources."re-emitter-1.1.3" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" + sources."redent-1.0.0" + sources."repeating-2.0.1" + sources."restore-cursor-1.0.1" + sources."reverse-http-1.3.0" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."run-parallel-1.1.8" + sources."run-series-1.1.6" + sources."rusha-0.8.13" + sources."rx-4.1.0" sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" + sources."semver-5.5.0" + sources."server-destroy-1.0.1" sources."signal-exit-3.0.2" + sources."simple-concat-1.0.0" + sources."simple-get-2.7.0" + sources."simple-peer-6.4.4" + sources."simple-sha1-2.1.0" + (sources."simple-websocket-4.3.1" // { + dependencies = [ + sources."ws-2.3.1" + ]; + }) + sources."single-line-log-1.1.2" + sources."spawn-sync-1.0.15" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."speedometer-0.1.4" + sources."stream-buffers-2.2.0" sources."string-width-1.0.2" + sources."string2compact-1.2.2" + sources."string_decoder-1.1.1" 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."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."aws-sign2-0.7.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.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."qs-6.5.1" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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.30.0" - sources."punycode-1.4.1" - sources."block-stream-0.0.9" - sources."isexe-2.0.0" + sources."strip-bom-2.0.0" + sources."strip-indent-1.0.1" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + sources."thirty-two-1.0.2" + sources."through-2.3.8" + sources."thunky-1.0.2" + sources."tmp-0.0.29" + (sources."torrent-discovery-5.4.0" // { + dependencies = [ + sources."bencode-0.8.0" + sources."isarray-1.0.0" + sources."minimist-1.2.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."torrent-piece-1.1.1" + (sources."torrent-stream-1.0.4" // { + dependencies = [ + sources."bencode-0.7.0" + sources."end-of-stream-0.1.5" + sources."isarray-0.0.1" + sources."magnet-uri-4.2.3" + sources."minimist-0.0.8" + sources."once-1.3.3" + sources."parse-torrent-4.1.0" + sources."parse-torrent-file-2.1.4" + sources."readable-stream-1.1.14" + sources."safe-buffer-5.0.1" + sources."string_decoder-0.10.31" + sources."thirty-two-0.0.2" + sources."ultron-1.0.2" + ]; + }) + sources."trim-newlines-1.0.0" + sources."typedarray-0.0.6" + sources."ultron-1.1.1" + sources."uniq-1.0.1" + sources."util-deprecate-1.0.2" + sources."utp-0.0.7" + sources."validate-npm-package-license-3.0.3" + sources."winreg-1.2.3" + sources."wordwrap-0.0.3" + sources."wrappy-1.0.2" + sources."ws-1.1.5" + sources."xmlbuilder-4.0.0" + sources."xmldom-0.1.27" + sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { - description = "Node.js native addon build tool"; - homepage = "https://github.com/nodejs/node-gyp#readme"; + description = "Streaming torrent client for Node.js"; + homepage = https://github.com/mafintosh/peerflix; license = "MIT"; }; production = true; + bypassCache = false; }; - node-inspector = nodeEnv.buildNodePackage { - name = "node-inspector"; - packageName = "node-inspector"; - version = "1.1.1"; + peerflix-server = nodeEnv.buildNodePackage { + name = "peerflix-server"; + packageName = "peerflix-server"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.1.tgz"; - sha1 = "e7851eb973f380543c058db564a9812055eac640"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.2.0.tgz"; + sha1 = "1848fdc14036f013af7489a39e8a5f0f9da48b87"; }; dependencies = [ - sources."async-0.9.2" - (sources."biased-opener-0.2.8" // { + sources."accepts-1.2.13" + sources."addr-to-ip-port-1.4.3" + sources."after-0.8.2" + sources."arraybuffer.slice-0.0.6" + sources."async-0.2.10" + sources."aws-sign-0.2.0" + sources."backo2-1.0.2" + sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.5" + sources."base64-url-1.2.1" + sources."base64id-1.0.0" + sources."basic-auth-1.0.4" + sources."basic-auth-connect-1.0.0" + sources."batch-0.5.3" + sources."bencode-0.7.0" + sources."better-assert-1.0.2" + sources."bitfield-0.1.0" + sources."bittorrent-dht-6.4.2" + sources."bittorrent-tracker-7.7.0" + sources."blob-0.0.4" + sources."bn.js-4.11.8" + sources."bncode-0.5.3" + sources."body-parser-1.13.3" + sources."boom-0.3.8" + sources."brace-expansion-1.1.11" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-equal-0.0.1" + sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" + sources."bytes-2.1.0" + sources."callsite-1.0.0" + sources."combined-stream-0.0.7" + sources."commander-2.6.0" + sources."compact2string-1.4.0" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."component-inherit-0.0.3" + sources."compressible-2.0.13" + sources."compression-1.5.2" + sources."concat-map-0.0.1" + (sources."connect-2.30.2" // { dependencies = [ - sources."yargs-1.3.3" + sources."accepts-1.2.13" + sources."escape-html-1.0.3" + sources."ms-0.7.2" + sources."negotiator-0.5.3" + sources."send-0.13.2" + sources."vary-1.1.2" ]; }) - sources."debug-2.6.9" - sources."express-4.16.2" - sources."glob-5.0.15" - sources."path-is-absolute-1.0.1" - sources."rc-1.2.2" - sources."semver-4.3.6" - sources."serve-favicon-2.4.5" - sources."strong-data-uri-1.0.4" - (sources."v8-debug-1.0.1" // { + sources."connect-multiparty-2.1.0" + sources."connect-timeout-1.6.2" + sources."content-disposition-0.5.0" + sources."content-type-1.0.4" + sources."cookie-0.1.3" + sources."cookie-jar-0.2.0" + sources."cookie-parser-1.3.5" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + sources."crc-3.3.0" + sources."cryptiles-0.1.3" + sources."csrf-3.0.6" + sources."csurf-1.8.3" + sources."cyclist-0.1.1" + (sources."debug-2.2.0" // { dependencies = [ - sources."semver-5.4.1" - sources."glob-7.1.2" + sources."ms-0.7.1" ]; }) - sources."v8-profiler-5.7.0" - sources."which-1.3.0" - sources."ws-1.1.5" - sources."yargs-3.32.0" - sources."browser-launcher2-0.4.6" - sources."minimist-1.2.0" - sources."x-default-browser-0.3.1" - sources."headless-0.1.7" - sources."lodash-3.10.1" - sources."mkdirp-0.5.1" - sources."osenv-0.1.4" - sources."plist-1.2.0" - sources."win-detect-browsers-1.0.2" - sources."uid-0.0.2" - sources."rimraf-2.6.2" - 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."after-0.8.2" - sources."xtend-4.0.1" - sources."default-browser-id-1.0.4" - sources."bplist-parser-0.1.1" - sources."meow-3.7.0" - sources."untildify-2.1.0" - sources."big-integer-1.6.25" - 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.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."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."ms-2.0.0" - sources."accepts-1.3.4" - sources."array-flatten-1.1.1" - sources."body-parser-1.18.2" - sources."content-disposition-0.5.2" - sources."content-type-1.0.4" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."depd-1.1.1" - sources."encodeurl-1.0.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."finalhandler-1.1.0" - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."on-finished-2.3.0" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.2" - sources."qs-6.4.0" - sources."range-parser-1.2.0" - sources."safe-buffer-5.1.1" - sources."send-0.16.1" - sources."serve-static-1.13.1" - sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" - sources."type-is-1.6.15" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."mime-types-2.1.17" - sources."negotiator-0.6.1" - sources."mime-db-1.30.0" - sources."bytes-3.0.0" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."raw-body-2.3.2" - sources."inherits-2.0.3" - sources."unpipe-1.0.0" + sources."decompress-response-3.3.0" + sources."delayed-stream-0.0.5" + sources."depd-1.0.1" + sources."destroy-1.0.4" sources."ee-first-1.1.1" + sources."end-of-stream-1.4.1" + sources."engine.io-1.8.5" + sources."engine.io-client-1.8.5" + sources."engine.io-parser-1.3.2" + sources."errorhandler-1.4.3" + sources."escape-html-1.0.2" + sources."etag-1.7.0" + (sources."express-3.21.2" // { + dependencies = [ + sources."accepts-1.3.5" + sources."destroy-1.0.3" + sources."ms-2.0.0" + sources."multiparty-3.3.2" + sources."negotiator-0.6.1" + sources."qs-4.0.0" + sources."range-parser-1.0.3" + sources."statuses-1.2.1" + sources."uid-safe-2.0.0" + ]; + }) + sources."express-session-1.11.3" + sources."fd-slicer-1.0.1" + sources."fifo-0.1.4" + (sources."finalhandler-0.4.0" // { + dependencies = [ + sources."escape-html-1.0.2" + ]; + }) + sources."flatten-0.0.1" + sources."fluent-ffmpeg-2.1.2" + sources."forever-agent-0.2.0" + sources."form-data-0.0.10" sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" - sources."destroy-1.0.4" - sources."mime-1.4.1" - sources."media-typer-0.3.0" + sources."fresh-0.3.0" + (sources."fs-chunk-store-1.7.0" // { + dependencies = [ + sources."mkdirp-0.5.1" + ]; + }) + sources."fs.realpath-1.0.0" + sources."get-browser-rtc-1.0.2" + sources."glob-7.1.2" + sources."has-binary-0.1.7" + sources."has-cors-1.1.0" + sources."hat-0.0.3" + sources."hawk-0.10.2" + sources."hoek-0.7.6" + sources."http-errors-1.3.1" + sources."iconv-lite-0.4.11" + sources."immediate-chunk-store-1.0.8" + sources."indexof-0.0.1" sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ip-1.1.5" + sources."ip-set-1.0.1" + sources."ipaddr.js-1.0.5" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."json-stringify-safe-3.0.0" + sources."json3-3.3.2" + sources."k-bucket-0.6.0" + (sources."k-rpc-3.7.0" // { + dependencies = [ + sources."bencode-2.0.0" + sources."k-bucket-2.0.1" + ]; + }) + sources."k-rpc-socket-1.8.0" + sources."lodash-2.4.2" + sources."lru-2.0.1" + sources."magnet-uri-2.0.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.0" + (sources."method-override-2.3.10" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."methods-1.1.2" + sources."mime-1.3.4" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-response-1.0.0" sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."morgan-1.6.1" + sources."ms-0.7.1" + sources."multiparty-4.1.3" + sources."negotiator-0.5.3" + sources."node-uuid-1.4.8" + sources."oauth-sign-0.2.0" + sources."object-assign-4.1.0" + sources."object-component-0.0.3" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" 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."deep-extend-0.4.2" - sources."ini-1.3.4" - sources."strip-json-comments-2.0.1" - sources."truncate-1.0.5" - sources."nan-2.7.0" - sources."node-pre-gyp-0.6.39" - sources."nopt-4.0.1" - sources."npmlog-4.1.2" - sources."request-2.81.0" - sources."hawk-3.1.3" - sources."detect-libc-1.0.2" - sources."tar-2.2.1" - sources."tar-pack-3.4.1" - sources."abbrev-1.1.1" - sources."are-we-there-yet-1.1.4" - sources."console-control-strings-1.1.0" - sources."gauge-2.7.4" - sources."set-blocking-2.0.0" - sources."delegates-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-1.0.3" - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" - 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."ansi-regex-2.1.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."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.3" - 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."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."fs.realpath-1.0.0" - sources."block-stream-0.0.9" - sources."fstream-1.0.11" - sources."fstream-ignore-1.0.5" - sources."uid-number-0.0.6" - sources."isexe-2.0.0" sources."options-0.0.6" + (sources."parse-torrent-4.1.0" // { + dependencies = [ + sources."magnet-uri-4.2.3" + ]; + }) + sources."parse-torrent-file-2.1.4" + sources."parsejson-0.0.3" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."parseurl-1.3.2" + sources."path-is-absolute-1.0.1" + sources."pause-0.1.0" + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { + dependencies = [ + sources."bncode-0.2.3" + ]; + }) + sources."pend-1.2.0" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-1.0.10" + sources."pump-1.0.3" + sources."qs-6.5.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" + sources."random-bytes-1.0.0" + sources."random-iterate-1.0.1" + sources."randombytes-2.0.6" + sources."range-parser-1.2.0" + (sources."raw-body-2.1.7" // { + dependencies = [ + sources."bytes-2.4.0" + sources."iconv-lite-0.4.13" + ]; + }) + sources."re-emitter-1.1.3" + (sources."read-torrent-1.3.0" // { + dependencies = [ + sources."mime-1.2.11" + sources."qs-0.5.6" + ]; + }) + sources."readable-stream-1.1.14" + sources."request-2.16.6" + (sources."response-time-2.3.2" // { + dependencies = [ + sources."depd-1.1.2" + ]; + }) + sources."rimraf-2.6.2" + sources."rndm-1.2.0" + sources."run-parallel-1.1.8" + sources."run-series-1.1.6" + sources."rusha-0.8.13" + sources."safe-buffer-5.1.1" + (sources."send-0.13.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."serve-favicon-2.3.2" + sources."serve-index-1.7.3" + (sources."serve-static-1.10.3" // { + dependencies = [ + sources."depd-1.1.2" + sources."ms-0.7.1" + ]; + }) + sources."simple-concat-1.0.0" + sources."simple-get-2.7.0" + sources."simple-peer-6.4.4" + sources."simple-sha1-2.1.0" + (sources."simple-websocket-4.3.1" // { + dependencies = [ + sources."ws-2.3.1" + ]; + }) + sources."sntp-0.1.4" + (sources."socket.io-1.7.4" // { + dependencies = [ + sources."accepts-1.3.3" + sources."component-emitter-1.1.2" + sources."cookie-0.3.1" + sources."debug-2.3.3" + sources."ms-0.7.2" + sources."negotiator-0.6.1" + ]; + }) + sources."socket.io-adapter-0.5.0" + sources."socket.io-client-1.7.4" + (sources."socket.io-parser-2.3.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) + sources."speedometer-0.1.4" + sources."statuses-1.5.0" + sources."stream-counter-0.2.0" + sources."string2compact-1.2.2" + sources."string_decoder-0.10.31" + sources."thirty-two-0.0.2" + sources."thunky-1.0.2" + sources."to-array-0.1.4" + sources."torrent-discovery-5.4.0" + sources."torrent-piece-1.1.1" + (sources."torrent-stream-1.0.4" // { + dependencies = [ + sources."bencode-0.8.0" + sources."end-of-stream-0.1.5" + sources."isarray-1.0.0" + sources."minimist-1.2.0" + sources."mkdirp-0.3.5" + sources."once-1.3.3" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.1.1" + sources."ultron-1.1.1" + ]; + }) + sources."tsscmp-1.0.5" + sources."tunnel-agent-0.2.0" + sources."type-is-1.6.16" + sources."uid-safe-2.1.4" sources."ultron-1.0.2" - sources."cliui-3.2.0" - sources."os-locale-1.4.0" - sources."window-size-0.1.4" - sources."y18n-3.2.1" - sources."wrap-ansi-2.1.0" - sources."lcid-1.0.0" - sources."invert-kv-1.0.0" + sources."uniq-1.0.1" + sources."unpipe-1.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.0" + sources."utp-0.0.7" + sources."vary-1.0.1" + sources."vhost-3.0.2" + sources."which-1.3.0" + sources."wrappy-1.0.2" + sources."ws-1.1.5" + sources."wtf-8-1.0.0" + sources."xmlhttprequest-ssl-1.5.3" + sources."xtend-4.0.1" + sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; - }; - production = true; - }; - node-pre-gyp = nodeEnv.buildNodePackage { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.39"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; - }; - dependencies = [ - sources."mkdirp-0.5.1" - sources."nopt-4.0.1" - sources."npmlog-4.1.2" - sources."rc-1.2.2" - sources."request-2.81.0" - sources."hawk-3.1.3" - sources."rimraf-2.6.2" - sources."semver-5.4.1" - sources."detect-libc-1.0.2" - sources."tar-2.2.1" - sources."tar-pack-3.4.1" - sources."minimist-1.2.0" - sources."abbrev-1.1.1" - 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."readable-stream-2.3.3" - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."aproba-1.2.0" - 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."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.17" - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - 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."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" + description = "Streaming torrent client for node.js with web ui."; + homepage = "https://github.com/asapach/peerflix-server#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + phantomjs = nodeEnv.buildNodePackage { + name = "phantomjs"; + packageName = "phantomjs"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.7.tgz"; + sha1 = "c6910f67935c37285b6114329fc2f27d5f3e3134"; + }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."ecc-jsbn-0.1.1" + sources."assert-plus-0.2.0" + sources."async-2.6.0" + sources."aws-sign2-0.6.0" + sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.30.0" - sources."punycode-1.4.1" - sources."hoek-2.16.3" + sources."bl-1.0.3" sources."boom-2.10.1" + sources."brace-expansion-1.1.11" + sources."caseless-0.11.0" + sources."chalk-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.5.0" + sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."glob-7.1.2" + sources."dashdash-1.14.1" + sources."debug-0.7.4" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."escape-string-regexp-1.0.5" + sources."extend-3.0.1" + sources."extract-zip-1.5.0" + sources."extsprintf-1.3.0" + sources."fd-slicer-1.0.1" + sources."forever-agent-0.6.1" + sources."form-data-1.0.1" + sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."har-validator-2.0.6" + sources."has-ansi-2.0.0" + sources."hasha-2.2.0" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" + sources."is-property-1.0.2" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsonpointer-4.0.1" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."kew-0.7.0" + sources."klaw-1.3.1" + sources."lodash-4.17.5" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.0" + sources."node-uuid-1.4.8" + sources."oauth-sign-0.8.2" sources."once-1.4.0" sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."process-nextick-args-1.0.7" + sources."progress-1.1.8" + sources."qs-5.2.1" + sources."readable-stream-2.0.6" + sources."request-2.67.0" + sources."request-progress-2.0.1" + sources."rimraf-2.6.2" + sources."sntp-1.0.9" + (sources."sshpk-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."string_decoder-0.10.31" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."throttleit-1.0.0" + sources."tough-cookie-2.2.2" + sources."tunnel-agent-0.4.3" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."util-deprecate-1.0.2" + sources."verror-1.10.0" + sources."which-1.2.14" sources."wrappy-1.0.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.11" - sources."graceful-fs-4.1.11" - sources."debug-2.6.9" - sources."fstream-ignore-1.0.5" - sources."uid-number-0.0.6" - sources."ms-2.0.0" + sources."xtend-4.0.1" + sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; meta = { - description = "Node.js native addon binary install tool"; - homepage = "https://github.com/mapbox/node-pre-gyp#readme"; - license = "BSD-3-Clause"; + description = "Headless WebKit with JS API"; + homepage = https://github.com/Medium/phantomjs; + license = "Apache-2.0"; }; production = true; + bypassCache = false; }; - nodemon = nodeEnv.buildNodePackage { - name = "nodemon"; - packageName = "nodemon"; - version = "1.12.1"; + prettier = nodeEnv.buildNodePackage { + name = "prettier"; + packageName = "prettier"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.12.1.tgz"; - sha1 = "996a56dc49d9f16bbf1b78a4de08f13634b3878d"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz"; + sha512 = "33s27xnirdx15j0dkp0i79bawmn7pysqxjiksh1jd5gcl4fdzvhd1sr9n7lh4k1ik37g1lmi3gb33j3kz31psqlxxyz1l5djgmq7wjg"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Prettier is an opinionated code formatter"; + homepage = https://prettier.io/; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + pulp = nodeEnv.buildNodePackage { + name = "pulp"; + packageName = "pulp"; + version = "12.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pulp/-/pulp-12.0.1.tgz"; + sha512 = "3n09lgnyd4p3h3jlhgcvbh6n6m9h89hwvbhli5ic32fkl5y4g7yi61m1vw483479jxkif2zyqs89l6j6hq4iy15jdknx1lcp9qbyvwy"; }; dependencies = [ - sources."chokidar-1.7.0" - sources."debug-2.6.9" - sources."es6-promise-3.3.1" - sources."ignore-by-default-1.0.1" - sources."lodash.defaults-3.1.2" - sources."minimatch-3.0.4" - sources."ps-tree-1.1.0" - sources."touch-3.1.0" - sources."undefsafe-0.0.3" - sources."update-notifier-2.3.0" - sources."anymatch-1.3.2" + sources."JSONStream-1.3.2" + sources."acorn-4.0.13" + sources."acorn-node-1.3.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + ]; + }) + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-filter-0.0.1" + sources."array-map-0.0.0" + sources."array-reduce-0.0.0" + sources."array-unique-0.3.2" + sources."asn1.js-4.10.1" + sources."assert-1.4.1" + sources."assign-symbols-1.0.0" + sources."astw-2.2.0" + sources."async-1.5.2" sources."async-each-1.0.1" - sources."glob-parent-2.0.0" + sources."atob-2.1.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."base64-js-1.2.3" + sources."binary-extensions-1.11.0" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) + sources."brorand-1.1.0" + sources."browser-pack-6.1.0" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + (sources."browserify-13.3.0" // { + dependencies = [ + sources."acorn-5.5.3" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."hash-base-2.0.2" + sources."isarray-2.0.4" + sources."process-nextick-args-2.0.0" + ]; + }) + sources."browserify-aes-1.2.0" + sources."browserify-cache-api-3.0.1" + sources."browserify-cipher-1.0.0" + sources."browserify-des-1.0.0" + (sources."browserify-incremental-3.1.1" // { + dependencies = [ + sources."JSONStream-0.10.0" + sources."jsonparse-0.0.5" + ]; + }) + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.1.4" + sources."buffer-4.9.1" + sources."buffer-from-1.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" + sources."cache-base-1.0.1" + sources."cached-path-relative-1.0.1" + (sources."chokidar-2.0.3" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."collection-visit-1.0.0" + sources."colors-1.2.1" + sources."combine-source-map-0.8.0" + sources."component-emitter-1.2.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."convert-source-map-1.1.3" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" + sources."crypto-browserify-3.12.0" + sources."date-now-0.1.4" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" + sources."defined-1.0.0" + sources."deps-sort-2.0.0" + sources."des.js-1.0.0" + sources."detective-4.7.1" + sources."diffie-hellman-5.0.2" + sources."domain-browser-1.1.7" + sources."duplexer2-0.1.4" + sources."elliptic-6.4.0" + sources."events-1.1.1" + sources."evp_bytestokey-1.0.3" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."fill-range-4.0.0" + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.3" + sources."function-bind-1.1.1" + sources."get-value-2.0.6" + sources."glob-7.1.2" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."graceful-fs-4.1.11" + sources."has-1.0.1" + sources."has-value-1.0.0" + sources."has-values-1.0.0" + sources."hash-base-3.0.4" + sources."hash.js-1.1.3" + sources."hmac-drbg-1.0.1" + sources."htmlescape-1.1.1" + sources."https-browserify-0.0.1" + sources."ieee754-1.1.11" + sources."indexof-0.0.1" + sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."inline-source-map-0.6.2" + (sources."insert-module-globals-7.0.6" // { + dependencies = [ + sources."concat-stream-1.6.2" + ]; + }) + sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" - sources."is-glob-2.0.1" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.0" + sources."is-number-4.0.0" + sources."is-odd-2.0.0" + sources."is-plain-object-2.0.4" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."json-stable-stringify-0.0.1" + sources."jsonify-0.0.0" + sources."jsonparse-1.3.1" + sources."kind-of-6.0.2" + sources."labeled-stream-splicer-2.0.1" + sources."lexical-scope-1.2.0" + sources."lodash.memoize-3.0.4" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."md5.js-1.3.4" + sources."micromatch-3.1.10" + sources."miller-rabin-4.0.1" + sources."mime-1.6.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mixin-deep-1.3.1" + sources."module-deps-4.1.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."nan-2.10.0" + sources."nanomatch-1.2.9" + sources."neo-async-2.5.0" + (sources."node-static-0.7.10" // { + dependencies = [ + sources."minimist-0.0.10" + sources."wordwrap-0.0.3" + ]; + }) + sources."normalize-path-2.1.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."optimist-0.6.1" + sources."os-browserify-0.1.2" + sources."os-tmpdir-1.0.2" + sources."pako-0.2.9" + sources."parents-1.0.1" + sources."parse-asn1-5.1.0" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.0" + sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.5" + sources."path-platform-0.11.15" + sources."pbkdf2-3.0.14" + sources."posix-character-classes-0.1.1" + sources."process-0.11.10" + sources."process-nextick-args-1.0.7" + sources."public-encrypt-4.0.0" + sources."punycode-1.4.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.0.6" + sources."randomfill-1.0.4" + sources."read-1.0.7" + sources."read-only-stream-2.0.0" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."isarray-1.0.0" + sources."string_decoder-1.1.1" + ]; + }) sources."readdirp-2.1.0" - sources."fsevents-1.1.3" - sources."micromatch-2.3.11" - sources."normalize-path-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" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."kind-of-3.2.2" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - sources."arr-flatten-1.1.0" - sources."expand-range-1.8.2" - sources."preserve-0.2.0" + sources."regex-not-1.0.2" + sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" - sources."fill-range-2.2.3" - sources."is-number-3.0.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" sources."repeat-string-1.6.1" - sources."isarray-1.0.0" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - 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."remove-trailing-separator-1.1.0" - sources."binary-extensions-1.10.0" - sources."graceful-fs-4.1.11" - sources."readable-stream-2.3.3" - sources."set-immediate-shim-1.0.1" - sources."core-util-is-1.0.2" - sources."process-nextick-args-1.0.7" + sources."resolve-1.7.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."rimraf-2.2.8" + sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."nan-2.7.0" - sources."ms-2.0.0" - sources."lodash.assign-3.2.0" - sources."lodash.restparam-3.6.1" - sources."lodash._baseassign-3.2.0" - sources."lodash._createassigner-3.1.1" - sources."lodash.keys-3.1.2" - sources."lodash._basecopy-3.0.1" - sources."lodash._bindcallback-3.0.1" - sources."lodash._isiterateecall-3.0.9" - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - 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."safe-regex-1.1.0" + sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.0" + sources."sha.js-2.4.11" + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."kind-of-4.0.0" + ]; + }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."static-extend-0.1.2" + sources."stream-browserify-2.0.1" + sources."stream-combiner2-1.1.1" + sources."stream-http-2.8.1" + sources."stream-splicer-2.0.0" + sources."string-stream-0.0.7" + sources."string_decoder-0.10.31" + sources."subarg-1.0.0" + sources."syntax-error-1.4.0" + sources."temp-0.8.3" sources."through-2.3.8" - sources."duplexer-0.1.1" - 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."nopt-1.0.10" - sources."abbrev-1.1.1" - sources."boxen-1.2.2" - sources."chalk-2.3.0" - sources."configstore-3.1.1" - sources."import-lazy-2.1.0" - sources."is-installed-globally-0.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."camelcase-4.1.0" - sources."cli-boxes-1.0.0" - sources."string-width-1.0.2" - sources."term-size-1.2.0" - sources."widest-line-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."strip-ansi-3.0.1" - sources."ansi-regex-2.1.1" - sources."execa-0.7.0" - sources."cross-spawn-5.1.0" - 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."lru-cache-4.1.1" - sources."shebang-command-1.2.0" + sources."through2-2.0.3" + sources."timers-browserify-1.4.2" + sources."to-arraybuffer-1.0.1" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."tree-kill-1.2.0" + sources."tty-browserify-0.0.1" + sources."typedarray-0.0.6" + sources."umd-3.0.3" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."upath-1.0.4" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."util-deprecate-1.0.2" + sources."vm-browserify-0.0.4" + (sources."watchpack-1.5.0" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - sources."path-key-2.0.1" - sources."code-point-at-1.1.0" - sources."number-is-nan-1.0.1" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.5.0" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."dot-prop-4.2.0" - sources."make-dir-1.1.0" - sources."unique-string-1.0.0" - sources."write-file-atomic-2.3.0" - sources."is-obj-1.0.1" - sources."pify-3.0.0" - sources."crypto-random-string-1.0.0" - sources."imurmurhash-0.1.4" - sources."global-dirs-0.1.0" - sources."is-path-inside-1.0.0" - sources."ini-1.3.4" - sources."path-is-inside-1.0.2" - 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."semver-5.4.1" - 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.2" - sources."deep-extend-0.4.2" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { - description = "Simple monitor script for use during development of a node.js app."; - homepage = http://nodemon.io/; - license = "MIT"; + description = "A build system for PureScript projects"; + homepage = https://github.com/bodil/pulp; + license = "LGPL-3.0+"; }; production = true; + bypassCache = false; }; - node-red = nodeEnv.buildNodePackage { - name = "node-red"; - packageName = "node-red"; - version = "0.17.5"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.17.5.tgz"; - sha1 = "1dcf3ead7902ce2df615cdfbe19f3cd9a50e28e2"; - }; - dependencies = [ - sources."basic-auth-1.1.0" - sources."bcryptjs-2.4.3" - sources."body-parser-1.17.2" - sources."cheerio-0.22.0" - sources."clone-2.1.1" - sources."cookie-0.3.1" - sources."cookie-parser-1.4.3" - sources."cors-2.8.3" - sources."cron-1.2.1" - sources."express-4.15.3" - sources."express-session-1.15.2" - 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.8.4" - sources."json-stringify-safe-5.0.1" - sources."jsonata-1.2.6" - sources."media-typer-0.3.0" - (sources."mqtt-2.9.0" // { - dependencies = [ - sources."ws-3.3.1" - ]; - }) - sources."multer-1.3.0" - sources."mustache-2.3.0" - sources."nopt-3.0.6" - 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" - sources."semver-5.3.0" - sources."sentiment-2.1.0" - sources."uglify-js-3.0.20" - sources."when-3.7.8" - sources."ws-1.1.1" - sources."xml2js-0.4.17" - sources."node-red-node-feedparser-0.1.8" - (sources."node-red-node-email-0.1.24" // { + quassel-webserver = nodeEnv.buildNodePackage { + name = "quassel-webserver"; + packageName = "quassel-webserver"; + version = "2.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/quassel-webserver/-/quassel-webserver-2.2.8.tgz"; + sha1 = "195a2a5b6dd76e4a244a807002678b037d70eeaa"; + }; + dependencies = [ + sources."@types/babel-types-7.0.1" + sources."@types/babylon-6.16.2" + sources."accepts-1.3.5" + sources."acorn-3.3.0" + (sources."acorn-globals-3.1.0" // { dependencies = [ - sources."clone-1.0.3" + sources."acorn-4.0.13" ]; }) - sources."node-red-node-twitter-0.1.12" - sources."node-red-node-rbe-0.1.13" - (sources."bcrypt-1.0.3" // { + sources."ajv-4.11.8" + sources."align-text-0.1.4" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."array-flatten-1.1.1" + sources."asap-2.0.6" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.7.0" + sources."babel-runtime-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" + sources."basic-auth-2.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."bindings-1.2.1" + sources."bl-1.2.2" + (sources."body-parser-1.18.2" // { dependencies = [ - sources."nopt-4.0.1" + sources."setprototypeof-1.0.3" ]; }) - sources."bytes-2.4.0" + sources."boom-2.10.1" + sources."bufferutil-2.0.1" + sources."bytes-3.0.0" + sources."camelcase-1.2.1" + sources."caseless-0.12.0" + sources."center-align-0.1.3" + sources."character-parser-2.2.0" + sources."chownr-1.0.1" + sources."clean-css-4.1.11" + sources."cliui-2.1.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."console-control-strings-1.1.0" + sources."constantinople-3.1.2" + sources."content-disposition-0.5.2" sources."content-type-1.0.4" - sources."debug-2.6.3" - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.15" - sources."on-finished-2.3.0" - sources."qs-6.5.1" - sources."type-is-1.6.15" - sources."ms-0.7.2" - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" - sources."ee-first-1.1.1" - sources."mime-types-2.1.17" - sources."mime-db-1.30.0" - sources."css-select-1.2.0" - sources."dom-serializer-0.1.0" - sources."entities-1.1.1" - sources."htmlparser2-3.9.2" - sources."lodash.assignin-4.2.0" - sources."lodash.bind-4.2.1" - sources."lodash.defaults-4.2.0" - sources."lodash.filter-4.6.0" - sources."lodash.flatten-4.4.0" - sources."lodash.foreach-4.5.0" - sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.0" - sources."lodash.pick-4.4.0" - sources."lodash.reduce-4.6.0" - sources."lodash.reject-4.6.0" - sources."lodash.some-4.6.0" - sources."css-what-2.1.0" - sources."domutils-1.5.1" - sources."boolbase-1.0.0" - sources."nth-check-1.0.1" - sources."domelementtype-1.3.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."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" + sources."cookie-0.3.1" + sources."cookie-parser-1.4.3" sources."cookie-signature-1.0.6" - sources."object-assign-4.1.1" - sources."vary-1.1.2" - sources."moment-timezone-0.5.14" - sources."moment-2.19.2" - sources."accepts-1.3.4" - sources."array-flatten-1.1.1" - sources."content-disposition-0.5.2" - sources."encodeurl-1.0.1" + sources."core-js-2.5.5" + sources."core-util-is-1.0.2" + sources."cryptiles-2.0.5" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."deep-extend-0.4.2" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."doctypes-1.1.0" + sources."ecc-jsbn-0.1.1" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.1" + sources."errno-0.1.7" sources."escape-html-1.0.3" + sources."esutils-2.0.2" sources."etag-1.8.1" - sources."finalhandler-1.0.6" - sources."fresh-0.5.0" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.5" - sources."range-parser-1.2.0" - 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.2" - sources."ipaddr.js-1.4.0" - sources."destroy-1.0.4" - sources."mime-1.3.4" - sources."crc-3.4.4" - sources."uid-safe-2.1.5" - sources."random-bytes-1.0.0" - sources."graceful-fs-4.1.11" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" - sources."async-2.6.0" - sources."retry-0.6.1" - sources."cookies-0.7.1" - sources."i18next-client-1.10.3" - sources."json5-0.2.0" - sources."keygrip-1.0.2" - sources."argparse-1.0.9" - sources."esprima-3.1.3" - sources."sprintf-js-1.0.3" - sources."commist-1.0.0" - sources."concat-stream-1.6.0" - sources."end-of-stream-1.4.0" - sources."help-me-1.1.0" - sources."minimist-1.2.0" - sources."mqtt-packet-5.4.0" - sources."pump-1.0.2" - sources."reinterval-1.1.0" - sources."split2-2.2.0" - sources."websocket-stream-5.1.1" - sources."xtend-4.0.1" - sources."leven-1.0.2" - sources."typedarray-0.0.6" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."callback-stream-1.1.0" - sources."glob-stream-6.1.0" - sources."through2-2.0.3" + sources."eventemitter2-3.0.2" + sources."expand-template-1.1.0" + (sources."express-4.16.3" // { + dependencies = [ + sources."statuses-1.4.0" + ]; + }) sources."extend-3.0.1" - sources."glob-7.1.2" - sources."glob-parent-3.1.0" - sources."is-negated-glob-1.0.0" - sources."ordered-read-streams-1.0.1" - sources."pumpify-1.3.5" - sources."remove-trailing-separator-1.1.0" - 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.4" - sources."path-is-absolute-1.0.1" - 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."duplexify-3.5.1" - 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.1.2" - sources."async-limiter-1.0.0" - sources."ultron-1.0.2" - sources."append-field-0.1.0" - sources."busboy-0.2.14" - sources."mkdirp-0.5.1" - sources."dicer-0.2.5" - sources."streamsearch-0.1.2" - sources."abbrev-1.1.1" - 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.7" - sources."graceful-readlink-1.0.1" - sources."options-0.0.6" - sources."sax-0.6.1" - sources."xmlbuilder-4.2.1" - sources."lodash-4.17.4" - sources."feedparser-1.1.3" - sources."request-2.83.0" - sources."addressparser-1.0.1" - sources."array-indexofobject-0.0.1" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" + sources."extsprintf-1.3.0" + sources."finalhandler-1.1.1" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" + sources."form-data-2.1.4" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."function-bind-1.1.1" + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."github-from-package-0.0.0" + sources."graceful-fs-4.1.11" + sources."har-schema-1.0.5" + sources."har-validator-4.2.1" + sources."has-1.0.1" + sources."has-unicode-2.0.1" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-errors-1.6.3" + sources."http-signature-1.1.1" + sources."httpolyglot-0.1.2" + sources."iconv-lite-0.4.19" + sources."image-size-0.5.5" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."int64-buffer-0.1.10" + sources."ipaddr.js-1.6.0" + sources."is-3.2.1" + sources."is-buffer-1.1.6" + sources."is-expression-3.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-promise-2.1.0" + sources."is-regex-1.0.4" sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."node-uuid-1.4.8" - sources."oauth-sign-0.8.2" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."chalk-1.1.3" - sources."is-my-json-valid-2.16.1" - 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."is-property-1.0.2" - sources."pinkie-2.0.4" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" + sources."js-stringify-1.0.2" 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."nodemailer-1.11.0" - sources."poplib-0.1.7" - sources."mailparser-0.6.2" - sources."imap-0.8.19" - sources."libmime-1.2.0" - sources."mailcomposer-2.1.0" - sources."needle-0.10.0" - sources."nodemailer-direct-transport-1.1.0" - sources."nodemailer-smtp-transport-1.1.0" - sources."libbase64-0.1.0" - sources."libqp-1.1.0" - sources."buildmail-2.0.0" - sources."smtp-connection-1.3.8" - sources."nodemailer-wellknown-0.1.10" - sources."optimist-0.6.1" - sources."wordwrap-0.0.3" - sources."mimelib-0.3.1" - sources."encoding-0.1.12" - sources."uue-3.1.0" - sources."utf7-1.0.2" - sources."twitter-ng-0.6.2" - sources."oauth-0.9.14" - sources."performance-now-2.1.0" - sources."uuid-3.1.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."nan-2.6.2" - sources."node-pre-gyp-0.6.36" + sources."json-schema-0.2.3" + sources."json-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonify-0.0.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jstransformer-1.0.0" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + (sources."less-2.7.3" // { + dependencies = [ + sources."qs-6.4.0" + ]; + }) + sources."less-middleware-2.2.1" + sources."libquassel-2.1.9" + sources."lodash-4.17.5" + sources."longest-1.0.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."morgan-1.9.0" + sources."ms-2.0.0" + sources."nan-2.5.1" + sources."negotiator-0.6.1" + (sources."net-browserify-alt-1.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + sources."safe-buffer-5.0.1" + sources."tunnel-agent-0.4.3" + ]; + }) + sources."node-abi-2.3.0" + sources."node.extend-2.0.0" + sources."noop-logger-0.1.1" sources."npmlog-4.1.2" - sources."rc-1.2.2" - sources."rimraf-2.6.2" - sources."tar-2.2.1" - sources."tar-pack-3.4.1" - sources."osenv-0.1.4" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."once-1.4.0" 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."parseurl-1.3.2" + sources."path-parse-1.0.5" + sources."path-to-regexp-0.1.7" + sources."performance-now-0.2.0" + sources."prebuild-install-2.1.2" + sources."process-nextick-args-2.0.0" + sources."promise-7.3.1" + sources."proxy-addr-2.0.3" + sources."prr-1.0.1" + (sources."pug-2.0.3" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + sources."pug-attrs-2.0.3" + sources."pug-code-gen-2.0.1" + sources."pug-error-1.3.2" + sources."pug-filters-3.1.0" + sources."pug-lexer-4.0.0" + sources."pug-linker-3.0.5" + sources."pug-load-2.0.11" + sources."pug-parser-5.0.0" + sources."pug-runtime-2.0.4" + sources."pug-strip-comments-1.0.3" + sources."pug-walk-1.1.7" + sources."pump-1.0.3" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."qtdatastream-0.7.1" + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" + sources."readable-stream-2.3.6" + sources."regenerator-runtime-0.11.1" + sources."repeat-string-1.6.1" + sources."request-2.81.0" + sources."resolve-1.7.0" + sources."right-align-0.1.3" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."send-0.16.2" + (sources."serve-favicon-2.3.2" // { + dependencies = [ + sources."etag-1.7.0" + sources."fresh-0.3.0" + sources."ms-0.7.2" + ]; + }) + sources."serve-static-1.13.2" sources."set-blocking-2.0.0" - sources."delegates-1.0.0" - sources."aproba-1.2.0" - sources."has-unicode-2.0.1" + sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" + sources."simple-get-1.4.3" + sources."sntp-1.0.9" + sources."source-map-0.5.7" + (sources."sshpk-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."statuses-1.5.0" sources."string-width-1.0.2" - sources."wide-align-1.1.2" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.1" - sources."deep-extend-0.4.2" - sources."ini-1.3.4" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."block-stream-0.0.9" - sources."fstream-1.0.11" - sources."fstream-ignore-1.0.5" - sources."uid-number-0.0.6" + sources."tar-fs-1.16.0" + sources."tar-stream-1.5.5" + sources."to-fast-properties-1.0.3" + sources."token-stream-0.0.1" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.16" + sources."uglify-js-2.8.29" + sources."uglify-to-browserify-1.0.2" + sources."ultron-1.1.1" + sources."unpipe-1.0.0" + sources."unzip-response-1.0.2" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."void-elements-2.0.1" + sources."wide-align-1.1.2" + sources."window-size-0.1.0" + sources."with-5.1.1" + sources."wordwrap-0.0.2" + sources."wrappy-1.0.2" + sources."ws-2.3.1" + sources."xtend-4.0.1" + sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { - description = "A visual tool for wiring the Internet of Things"; - homepage = http://nodered.org/; - license = "Apache-2.0"; + description = "Quassel web interface"; + homepage = https://github.com/magne4000/quassel-webserver; + license = "MIT"; }; production = true; + bypassCache = false; }; - "node-uptime-https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" = nodeEnv.buildNodePackage { - name = "node-uptime"; - packageName = "node-uptime"; - version = "3.2.0"; + react-tools = nodeEnv.buildNodePackage { + name = "react-tools"; + packageName = "react-tools"; + version = "0.13.3"; src = fetchurl { - name = "node-uptime-3.2.0.tar.gz"; - url = https://codeload.github.com/fzaninotto/uptime/legacy.tar.gz/1c65756575f90f563a752e2a22892ba2981c79b7; - sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746"; + url = "https://registry.npmjs.org/react-tools/-/react-tools-0.13.3.tgz"; + sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; }; dependencies = [ - sources."mongoose-3.6.7" - sources."mongoose-lifecycle-1.0.0" - sources."express-3.2.0" - sources."express-partials-0.0.6" - sources."connect-flash-0.1.0" - sources."ejs-0.8.3" - (sources."config-0.4.15" // { + sources."acorn-5.5.3" + sources."amdefine-1.0.1" + sources."ast-types-0.9.6" + sources."balanced-match-1.0.0" + sources."base62-0.1.1" + sources."brace-expansion-1.1.11" + sources."commander-2.15.1" + sources."commoner-0.10.8" + sources."concat-map-0.0.1" + sources."defined-1.0.0" + sources."detective-4.7.1" + sources."esprima-3.1.3" + sources."esprima-fb-13001.1001.0-dev-harmony-fb" + sources."glob-5.0.15" + sources."graceful-fs-4.1.11" + sources."iconv-lite-0.4.21" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + (sources."jstransform-10.1.0" // { dependencies = [ - sources."js-yaml-0.3.7" + sources."source-map-0.1.31" ]; }) - sources."async-0.1.22" - sources."socket.io-0.9.14" - sources."semver-1.1.0" - sources."moment-2.1.0" - sources."nodemailer-0.3.35" - sources."net-ping-1.1.7" - sources."js-yaml-2.1.0" - sources."hooks-0.2.1" - sources."mongodb-1.2.14" - sources."ms-2.0.0" - sources."sliced-0.0.4" - sources."muri-0.3.1" - sources."mpromise-0.2.1" - sources."mpath-0.1.1" - sources."bson-0.1.8" - sources."connect-2.7.6" - sources."commander-2.1.0" - sources."range-parser-0.0.4" - sources."mkdirp-0.3.5" - sources."cookie-0.0.5" - sources."buffer-crc32-0.1.1" - sources."fresh-0.1.0" - sources."methods-0.0.1" - sources."send-0.1.0" - sources."cookie-signature-1.0.1" - sources."debug-3.1.0" - sources."qs-0.5.1" - sources."formidable-1.0.11" - sources."bytes-0.2.0" - sources."pause-0.0.1" - sources."mime-1.2.6" - sources."coffee-script-1.12.7" - sources."vows-0.8.1" - sources."eyes-0.1.8" - sources."diff-1.0.8" - sources."glob-4.0.6" - sources."graceful-fs-3.0.11" - sources."inherits-2.0.3" - sources."minimatch-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" sources."once-1.4.0" - sources."natives-1.1.0" - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" + sources."path-is-absolute-1.0.1" + sources."private-0.1.8" + sources."q-1.5.1" + sources."recast-0.11.23" + sources."safer-buffer-2.1.2" + sources."source-map-0.5.7" sources."wrappy-1.0.2" - sources."socket.io-client-0.9.11" - sources."policyfile-0.0.4" - sources."base64id-0.1.0" - sources."redis-0.7.3" - sources."uglify-js-1.2.5" - sources."ws-0.4.32" - sources."xmlhttprequest-1.4.2" - sources."active-x-obfuscator-0.0.1" - sources."nan-2.3.5" - sources."tinycolor-0.0.1" - sources."options-0.0.6" - sources."zeparser-0.0.5" - sources."mailcomposer-4.0.2" - sources."simplesmtp-0.3.35" - sources."optimist-0.6.1" - sources."buildmail-4.0.1" - sources."libmime-3.0.0" - sources."addressparser-1.0.1" - sources."libbase64-0.1.0" - sources."libqp-1.1.0" - sources."nodemailer-fetch-1.6.0" - sources."nodemailer-shared-1.1.0" - sources."punycode-1.4.1" - sources."iconv-lite-0.4.15" - sources."rai-0.1.12" - sources."xoauth2-0.1.8" - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - sources."raw-socket-1.5.1" - sources."argparse-0.1.16" - sources."esprima-1.0.4" - sources."underscore-1.7.0" - sources."underscore.string-2.4.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Remote monitoring for HTTP applications"; - license = "MIT"; + description = "A set of complementary tools to React, including the JSX transformer."; + homepage = https://facebook.github.io/react; + license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; - npm = nodeEnv.buildNodePackage { - name = "npm"; - packageName = "npm"; - version = "5.5.1"; + react-native-cli = nodeEnv.buildNodePackage { + name = "react-native-cli"; + packageName = "react-native-cli"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz"; - sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik"; + url = "https://registry.npmjs.org/react-native-cli/-/react-native-cli-2.0.1.tgz"; + sha1 = "f2cd3c7aa1b83828cdfba630e2dfd817df766d54"; }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."async-0.2.10" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chalk-1.1.3" + sources."colors-0.6.2" + sources."concat-map-0.0.1" + sources."cycle-1.0.3" + sources."deep-equal-1.0.1" + sources."escape-string-regexp-1.0.5" + sources."eyes-0.1.8" + sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."has-ansi-2.0.0" + sources."i-0.3.6" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."isstream-0.1.2" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."mute-stream-0.0.7" + sources."ncp-0.4.2" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."pkginfo-0.4.1" + (sources."prompt-0.2.14" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."read-1.0.7" + sources."revalidator-0.1.8" + sources."rimraf-2.6.2" + sources."semver-5.5.0" + sources."stack-trace-0.0.10" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."utile-0.2.1" + (sources."winston-0.8.3" // { + dependencies = [ + sources."pkginfo-0.3.1" + ]; + }) + sources."wrappy-1.0.2" + ]; buildInputs = globalBuildInputs; meta = { - description = "a package manager for JavaScript"; - homepage = https://docs.npmjs.com/; - license = "Artistic-2.0"; + description = "The React Native CLI tools"; + homepage = "https://github.com/facebook/react-native#readme"; + license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; - "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { - name = "npm2nix"; - packageName = "npm2nix"; - version = "5.12.0"; - src = fetchgit { - url = "git://github.com/NixOS/npm2nix.git"; - rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5"; - sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5"; + s3http = nodeEnv.buildNodePackage { + name = "s3http"; + packageName = "s3http"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz"; + sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."semver-4.3.6" - sources."argparse-0.1.15" - (sources."npm-registry-client-0.2.27" // { + sources."ajv-5.5.2" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sdk-1.18.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-4.3.1" + sources."buffer-crc32-0.2.1" + sources."bytes-0.2.1" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."coffee-script-1.6.3" + sources."combined-stream-1.0.6" + sources."commander-2.0.0" + (sources."connect-2.11.0" // { dependencies = [ - sources."semver-2.0.11" + sources."methods-0.0.1" ]; }) - (sources."npmconf-0.1.1" // { + sources."cookie-0.1.0" + sources."cookie-signature-1.0.1" + sources."core-util-is-1.0.2" + sources."crc-0.2.0" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."semver-2.3.2" + sources."boom-5.2.0" + ]; + }) + sources."crypto-0.0.3" + sources."dashdash-1.14.1" + sources."debug-3.1.0" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."events.node-0.4.9" + (sources."everyauth-0.4.5" // { + dependencies = [ + sources."bytes-0.1.0" + sources."connect-2.3.9" + sources."cookie-0.0.4" + sources."debug-0.5.0" + sources."fresh-0.1.0" + sources."mime-1.2.6" + sources."qs-0.4.2" + sources."send-0.0.3" + ]; + }) + (sources."express-3.4.4" // { + dependencies = [ + sources."commander-1.3.2" ]; }) - sources."tar-0.1.17" - sources."temp-0.6.0" - sources."fs.extra-1.3.2" - sources."findit-1.2.0" - sources."coffee-script-1.12.7" - sources."underscore-1.4.4" - sources."underscore.string-2.3.3" - sources."request-2.83.0" - sources."graceful-fs-1.2.3" - sources."slide-1.1.6" - sources."chownr-0.0.2" - sources."mkdirp-0.3.5" - sources."rimraf-2.2.8" - sources."retry-0.6.0" - sources."couch-login-0.1.20" - sources."npmlog-4.1.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" + sources."formidable-1.0.11" + sources."fresh-0.2.0" + sources."getpass-0.1.7" + sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-auth-2.0.7" sources."http-signature-1.2.0" + sources."inherits-2.0.3" sources."is-typedarray-1.0.0" + sources."isarray-0.0.1" sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" + sources."jsprim-1.4.1" + sources."keypress-0.1.0" + sources."methods-0.1.0" + sources."mime-1.2.11" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mkdirp-0.3.5" + sources."ms-2.0.0" + sources."multiparty-2.2.0" + sources."negotiator-0.3.0" + sources."node-swt-0.1.1" + sources."node-uuid-1.4.1" + sources."node-wsfederation-0.1.1" + sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" sources."oauth-sign-0.8.2" + (sources."openid-2.0.6" // { + dependencies = [ + sources."qs-6.5.1" + sources."request-2.85.0" + ]; + }) + sources."pause-0.0.1" sources."performance-now-2.1.0" - sources."qs-6.5.1" + sources."punycode-1.4.1" + sources."qs-0.6.5" + sources."range-parser-0.0.4" + sources."raw-body-0.0.3" + sources."readable-stream-1.1.14" + sources."request-2.9.203" sources."safe-buffer-5.1.1" + sources."sax-1.2.4" + sources."send-0.1.4" + sources."sntp-2.1.0" + sources."sshpk-1.14.1" + sources."stream-counter-0.2.0" + sources."string-1.6.1" + sources."string_decoder-0.10.31" sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."core-util-is-1.0.2" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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.30.0" - sources."punycode-1.4.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.4" - sources."once-1.1.1" - 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."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."readable-stream-2.3.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."aproba-1.2.0" - 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."config-chain-1.1.11" - sources."osenv-0.0.3" - sources."nopt-2.2.1" - sources."ini-1.3.4" - sources."proto-list-1.2.4" - sources."abbrev-1.1.1" - sources."block-stream-0.0.9" - sources."fstream-0.1.31" - sources."natives-1.1.0" - sources."minimist-0.0.8" - sources."fs-extra-0.6.4" - sources."walk-2.3.9" - sources."ncp-0.4.2" - sources."jsonfile-1.0.1" - sources."foreachasync-3.0.0" + sources."uid2-0.0.3" + sources."util-0.4.9" + sources."uuid-3.2.1" + sources."verror-1.10.0" + sources."xml2js-0.2.4" + sources."xmlbuilder-0.4.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Generate nix expressions to build npm packages"; - homepage = https://github.com/NixOS/npm2nix; }; production = true; + bypassCache = false; }; - npm-check-updates = nodeEnv.buildNodePackage { - name = "npm-check-updates"; - packageName = "npm-check-updates"; - version = "2.13.0"; + semver = nodeEnv.buildNodePackage { + name = "semver"; + packageName = "semver"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The semantic version parser used by npm."; + homepage = "https://github.com/npm/node-semver#readme"; + license = "ISC"; + }; + production = true; + bypassCache = false; + }; + serve = nodeEnv.buildNodePackage { + name = "serve"; + packageName = "serve"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.13.0.tgz"; - sha512 = "3gqr04g6asacfpr7bmz0mqn3mga6vyq106wmjiyz7p4z1m58ia6zk3541s35hpf5g6wmkv52pmal8wnzxair9286jsr722lxrnn78f2"; + url = "https://registry.npmjs.org/serve/-/serve-6.5.4.tgz"; + sha512 = "3dhp8p2c9i86bwaxlxxlhml4p7ps2ph09pap35g5ivy0ndxv6av87axckmm4g7dwvz6c8y6mvc8c0v93m9hlk2rqm07y211621b1hhh"; }; dependencies = [ - sources."bluebird-3.5.1" - sources."chalk-1.1.3" - sources."cint-8.2.1" - sources."cli-table-0.3.1" - sources."commander-2.11.0" - sources."fast-diff-1.1.2" - sources."find-up-1.1.2" - sources."get-stdin-5.0.1" - sources."json-parse-helpfulerror-1.0.3" - sources."lodash-4.17.4" - sources."node-alias-1.0.4" - sources."npm-3.10.10" - (sources."npmi-2.0.1" // { + sources."accepts-1.3.5" + sources."address-1.0.3" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-align-2.0.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."arch-2.1.0" + (sources."args-3.0.8" // { dependencies = [ - sources."semver-4.3.6" + sources."chalk-2.1.0" ]; }) - sources."semver-5.4.1" - sources."semver-utils-1.1.1" - (sources."snyk-1.49.2" // { + sources."async-1.5.2" + sources."basic-auth-2.0.0" + sources."bluebird-3.5.1" + sources."boxen-1.3.0" + sources."bytes-3.0.0" + sources."camelcase-4.1.0" + sources."center-align-0.1.3" + (sources."chalk-2.3.2" // { dependencies = [ - sources."update-notifier-0.5.0" + sources."has-flag-3.0.0" + sources."supports-color-5.3.0" ]; }) - sources."spawn-please-0.3.0" - (sources."update-notifier-2.3.0" // { + sources."cli-boxes-1.0.0" + (sources."clipboardy-1.2.3" // { dependencies = [ - sources."chalk-2.3.0" + sources."execa-0.8.0" ]; }) - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" - sources."ansi-regex-3.0.0" - sources."colors-1.0.3" - sources."path-exists-2.1.0" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" - sources."jju-1.3.0" - sources."abbrev-1.1.1" - sources."ansi-escapes-1.4.0" - sources."configstore-3.1.1" + sources."cliui-2.1.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."compressible-2.0.13" + sources."compression-1.7.2" + sources."content-type-1.0.4" + sources."cross-spawn-5.1.0" + sources."dargs-5.1.0" sources."debug-2.6.9" - sources."es6-promise-3.3.1" - sources."hasbin-1.2.3" - sources."inquirer-1.0.3" - sources."needle-2.0.1" - sources."open-0.0.5" - sources."os-name-1.0.3" - sources."snyk-config-1.0.1" - sources."snyk-go-plugin-1.3.8" - sources."snyk-gradle-plugin-1.2.0" - sources."snyk-module-1.8.1" - sources."snyk-mvn-plugin-1.1.0" - sources."snyk-nuget-plugin-1.2.0" - sources."snyk-policy-1.7.1" - sources."snyk-python-plugin-1.4.0" - sources."snyk-recursive-readdir-2.0.0" - sources."snyk-resolve-1.0.0" - (sources."snyk-resolve-deps-1.7.0" // { + sources."decamelize-1.2.0" + sources."deep-extend-0.4.2" + sources."depd-1.1.1" + sources."destroy-1.0.4" + sources."detect-port-1.2.2" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."execa-0.7.0" + sources."filesize-3.6.0" + sources."fresh-0.5.2" + sources."fs-extra-5.0.0" + sources."get-stream-3.0.0" + sources."graceful-fs-4.1.11" + (sources."handlebars-4.0.11" // { dependencies = [ - sources."update-notifier-0.6.3" + sources."camelcase-1.2.1" + sources."wordwrap-0.0.2" ]; }) - sources."snyk-sbt-plugin-1.2.0" - sources."snyk-tree-1.0.0" - sources."snyk-try-require-1.2.0" - sources."tempfile-1.1.1" - sources."then-fs-2.0.0" - sources."undefsafe-0.0.3" - sources."url-0.11.0" - sources."uuid-2.0.3" - sources."graceful-fs-4.1.11" - sources."mkdirp-0.5.1" - sources."object-assign-3.0.0" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" - sources."write-file-atomic-2.3.0" - sources."xdg-basedir-3.0.0" - sources."minimist-1.2.0" - sources."os-homedir-1.0.2" - sources."imurmurhash-0.1.4" - sources."slide-1.1.6" - sources."ms-2.0.0" - sources."async-0.9.2" - sources."cli-cursor-1.0.2" - sources."cli-width-2.2.0" - sources."figures-1.7.0" - sources."mute-stream-0.0.6" - sources."run-async-2.3.0" - sources."rx-4.1.0" - sources."string-width-2.1.1" - 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."code-point-at-1.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."number-is-nan-1.0.1" + sources."has-flag-2.0.0" + sources."http-errors-1.6.2" sources."iconv-lite-0.4.19" - sources."osx-release-1.1.0" - sources."win-release-1.1.1" - sources."nconf-0.7.2" - sources."path-is-absolute-1.0.1" - sources."ini-1.3.4" - sources."yargs-4.8.1" - sources."camelcase-4.1.0" - sources."cliui-3.2.0" - sources."decamelize-1.2.0" - sources."window-size-0.2.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-0.2.7" - sources."kind-of-2.0.1" - sources."longest-1.0.1" - sources."repeat-string-1.6.1" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ip-1.1.5" sources."is-buffer-1.1.6" - sources."graphlib-2.1.1" - sources."toml-2.3.3" - 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" - sources."for-in-0.1.8" - sources."isobject-3.0.1" - sources."is-extendable-0.1.1" - sources."mixin-object-2.0.1" - sources."hosted-git-info-2.5.0" - sources."xml2js-0.4.19" - sources."zip-1.2.0" - sources."sax-1.2.4" - sources."xmlbuilder-9.0.4" - sources."bops-0.1.1" - sources."base64-js-0.0.2" - sources."to-utf8-0.0.1" - sources."js-yaml-3.10.0" - sources."lodash.clonedeep-4.5.0" - sources."argparse-1.0.9" - sources."esprima-4.0.0" - sources."sprintf-js-1.0.3" - sources."minimatch-3.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."ansicolors-0.3.2" - sources."clite-0.3.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-1.2.2" - sources."is-npm-1.0.0" - sources."latest-version-3.1.0" - sources."semver-diff-2.1.0" - sources."filled-array-1.1.0" - sources."repeating-1.1.3" - sources."widest-line-1.0.0" - sources."is-finite-1.0.2" - sources."dot-prop-4.2.0" - sources."is-obj-1.0.1" - 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."duplexer2-0.1.4" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-fullwidth-code-point-2.0.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.3.3" - 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.1" - sources."is-arrayish-0.2.1" - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."prepend-http-1.0.4" - sources."rc-1.2.2" - 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."set-blocking-2.0.0" - sources."which-module-1.0.0" - sources."y18n-3.2.1" - sources."yargs-parser-2.4.1" - 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."normalize-package-data-2.4.0" - sources."path-type-1.1.0" - sources."pify-3.0.0" - sources."strip-bom-2.0.0" - sources."is-utf8-0.2.1" - 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."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."archy-1.0.0" - sources."promise-7.3.1" - sources."asap-2.0.6" - sources."string-length-1.0.1" - sources."duplexify-3.5.1" - sources."infinity-agent-2.0.3" - sources."nested-error-stacks-1.0.2" - sources."end-of-stream-1.4.0" - sources."stream-shift-1.0.0" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."punycode-1.3.2" - sources."querystring-0.2.0" - sources."import-lazy-2.1.0" - sources."is-installed-globally-0.1.0" - sources."ansi-align-2.0.0" - sources."cli-boxes-1.0.0" - sources."term-size-1.2.0" - sources."execa-0.7.0" - sources."cross-spawn-5.1.0" - sources."get-stream-3.0.0" + sources."is-wsl-1.1.0" + sources."isexe-2.0.0" + sources."jsonfile-4.0.0" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."lodash-4.17.5" + sources."longest-1.0.1" + sources."lru-cache-4.1.2" + sources."micro-9.1.0" + sources."micro-compress-1.0.0" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimist-0.0.10" + sources."mri-1.1.0" + sources."ms-2.0.0" + sources."negotiator-0.6.1" + sources."node-version-1.1.0" sources."npm-run-path-2.0.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."openssl-self-signed-certificate-1.1.6" + sources."opn-5.2.0" + sources."optimist-0.6.1" sources."p-finally-1.0.0" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."pkginfo-0.4.1" + sources."pseudomap-1.0.2" + sources."range-parser-1.2.0" + sources."raw-body-2.3.2" + sources."rc-1.2.6" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."repeat-string-1.6.1" + sources."right-align-0.1.3" + sources."safe-buffer-5.1.1" + (sources."send-0.16.2" // { + dependencies = [ + sources."depd-1.1.2" + sources."statuses-1.4.0" + ]; + }) + sources."setprototypeof-1.0.3" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" + sources."source-map-0.4.4" + sources."statuses-1.5.0" + sources."string-similarity-1.2.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" - sources."shebang-command-1.2.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-4.5.0" + sources."term-size-1.2.0" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."universalify-0.1.1" + sources."unpipe-1.0.0" + (sources."update-check-1.2.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."vary-1.1.2" sources."which-1.3.0" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - sources."path-key-2.0.1" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."make-dir-1.1.0" - sources."unique-string-1.0.0" - sources."crypto-random-string-1.0.0" - sources."global-dirs-0.1.0" - sources."is-path-inside-1.0.0" - sources."path-is-inside-1.0.2" - sources."duplexer3-0.1.4" + sources."widest-line-2.0.0" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."yallist-2.1.2" + sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Find newer versions of dependencies than what your package.json or bower.json allows"; - homepage = https://github.com/tjunnone/npm-check-updates; - license = "Apache-2.0"; + description = "Static file serving and directory listing"; + homepage = "https://github.com/zeit/serve#readme"; + license = "MIT"; }; production = true; + bypassCache = false; }; - ocaml-language-server = nodeEnv.buildNodePackage { - name = "ocaml-language-server"; - packageName = "ocaml-language-server"; - version = "1.0.13"; + shout = nodeEnv.buildNodePackage { + name = "shout"; + packageName = "shout"; + version = "0.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.13.tgz"; - sha512 = "3bda8wvq4084v0ascps3604yz7p798gfps452i2gc05ghwpmn8xf1j5sqhvcjyb281hwsmwq39l97g839w8l6rrnz91s8n47i34sxvc"; + url = "https://registry.npmjs.org/shout/-/shout-0.53.0.tgz"; + sha1 = "13ebfcb3b741759d2475db96107776c81d308ae8"; }; dependencies = [ - sources."async-2.6.0" - sources."glob-7.1.2" - sources."lodash-4.17.4" - sources."lokijs-1.5.1" - sources."pegjs-0.10.0" - sources."vscode-jsonrpc-3.5.0" - sources."vscode-languageclient-3.5.0" - sources."vscode-languageserver-3.5.0" - sources."vscode-languageserver-types-3.5.0" - sources."vscode-uri-1.0.1" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" + sources."CSSselect-0.4.1" + sources."CSSwhat-0.4.7" + sources."accepts-1.3.5" + sources."after-0.8.1" + sources."ajv-5.5.2" + sources."array-flatten-1.1.1" + sources."arraybuffer.slice-0.0.6" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."base64-arraybuffer-0.1.2" + sources."base64id-0.1.0" + sources."bcrypt-nodejs-0.0.3" + sources."bcrypt-pbkdf-1.0.1" + sources."better-assert-1.0.2" + sources."blob-0.0.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) + sources."boom-4.3.1" + sources."bytes-3.0.0" + sources."callsite-1.0.0" + sources."caseless-0.12.0" + (sources."cheerio-0.17.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + sources."domutils-1.5.1" + ]; + }) + sources."co-4.6.0" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."component-bind-1.0.0" + sources."component-emitter-1.1.2" + sources."component-inherit-0.0.3" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dom-serializer-0.0.1" + sources."domelementtype-1.3.0" + sources."domhandler-2.2.1" + sources."domutils-1.4.3" + sources."duplexer-0.1.1" + sources."ecc-jsbn-0.1.1" + sources."ee-first-1.1.1" + sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" + sources."encodeurl-1.0.2" + (sources."engine.io-1.3.1" // { + dependencies = [ + sources."debug-0.6.0" + ]; + }) + sources."engine.io-client-1.3.1" + sources."engine.io-parser-1.0.6" + sources."entities-1.1.1" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."event-stream-3.3.4" + sources."express-4.16.3" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."finalhandler-1.1.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."from-0.1.7" + sources."getpass-0.1.7" + sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-binary-data-0.1.1" + sources."has-cors-1.0.3" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + (sources."htmlparser2-3.7.3" // { + dependencies = [ + sources."entities-1.0.0" + ]; + }) + sources."http-errors-1.6.3" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."indexof-0.0.1" 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."vscode-languageserver-protocol-3.5.0" + sources."ipaddr.js-1.6.0" + sources."irc-replies-2.0.1" + sources."is-typedarray-1.0.0" + sources."isarray-0.0.1" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."json3-3.2.6" + sources."jsprim-1.4.1" + sources."linewise-0.0.3" + sources."lodash-2.4.2" + sources."map-stream-0.1.0" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."moment-2.7.0" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."nan-0.3.2" + sources."negotiator-0.6.1" + sources."oauth-sign-0.8.2" + sources."object-component-0.0.3" + sources."on-finished-2.3.0" + sources."options-0.0.6" + sources."parsejson-0.0.1" + sources."parseqs-0.0.2" + sources."parseuri-0.0.2" + sources."parseurl-1.3.2" + sources."path-to-regexp-0.1.7" + sources."pause-stream-0.0.11" + sources."performance-now-2.1.0" + sources."proxy-addr-2.0.3" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."read-1.0.7" + sources."readable-stream-1.1.14" + sources."request-2.85.0" + sources."safe-buffer-5.1.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."setprototypeof-1.1.0" + sources."slate-irc-0.7.3" + (sources."slate-irc-parser-0.0.2" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + sources."sntp-2.1.0" + (sources."socket.io-1.0.6" // { + dependencies = [ + sources."commander-0.6.1" + sources."debug-0.7.4" + sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" + ]; + }) + (sources."socket.io-adapter-0.2.0" // { + dependencies = [ + sources."socket.io-parser-2.1.2" + ]; + }) + sources."socket.io-client-1.0.6" + sources."socket.io-parser-2.2.0" + sources."split-0.3.3" + sources."sshpk-1.14.1" + sources."statuses-1.4.0" + sources."stream-combiner-0.0.4" + sources."string_decoder-0.10.31" + sources."stringstream-0.0.5" + sources."through-2.3.8" + sources."tinycolor-0.0.1" + sources."to-array-0.1.3" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.16" + sources."unpipe-1.0.0" + sources."utf8-2.0.0" + sources."utils-merge-1.0.1" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."ws-0.4.31" + sources."xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" ]; buildInputs = globalBuildInputs; meta = { - description = "OCaml language server"; - homepage = https://github.com/freebroccolo/ocaml-language-server; - license = "Apache-2.0"; + description = "The self-hosted Web IRC client"; + homepage = "https://github.com/erming/shout#readme"; + license = "MIT"; }; production = true; + bypassCache = false; }; - parsoid = nodeEnv.buildNodePackage { - name = "parsoid"; - packageName = "parsoid"; - version = "0.8.0"; + sinopia = nodeEnv.buildNodePackage { + name = "sinopia"; + packageName = "sinopia"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.8.0.tgz"; - sha1 = "fbedac4c5c0b721f4c241287b81bdc3e4c7987c9"; + url = "https://registry.npmjs.org/sinopia/-/sinopia-1.4.0.tgz"; + sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ + sources."JSONStream-1.3.2" + sources."accepts-1.3.5" + sources."ajv-5.5.2" + sources."amdefine-1.0.1" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."array-flatten-2.1.1" + sources."array-uniq-1.0.3" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" sources."async-0.9.2" - sources."babybird-0.0.1" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" (sources."body-parser-1.18.2" // { dependencies = [ - sources."content-type-1.0.4" + sources."bytes-3.0.0" + sources."iconv-lite-0.4.19" + sources."qs-6.5.1" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) ]; }) - sources."compression-1.7.1" - sources."connect-busboy-0.0.2" - sources."content-type-git+https://github.com/wikimedia/content-type.git#master" - sources."core-js-2.5.1" - sources."diff-1.4.0" - sources."domino-1.0.30" - sources."entities-1.1.1" - (sources."express-4.16.2" // { + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + (sources."bunyan-1.8.12" // { dependencies = [ - sources."content-type-1.0.4" + sources."minimatch-3.0.4" ]; }) - (sources."express-handlebars-3.0.0" // { + sources."bytes-1.0.0" + sources."caseless-0.12.0" + sources."chalk-2.3.2" + sources."co-4.6.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."compressible-2.0.13" + (sources."compression-1.7.2" // { dependencies = [ - sources."async-1.5.2" - sources."yargs-3.10.0" + sources."bytes-3.0.0" ]; }) - sources."finalhandler-1.1.0" - sources."js-yaml-3.10.0" - sources."mediawiki-title-0.6.5" - sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" - sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" - sources."prfun-2.1.4" - sources."request-2.83.0" - sources."semver-5.4.1" - sources."serve-favicon-2.4.5" - sources."service-runner-2.4.2" - sources."simplediff-0.1.1" - sources."uuid-3.1.0" - sources."yargs-7.1.0" - sources."asap-2.0.6" - sources."is-arguments-1.0.2" - sources."bytes-3.0.0" - sources."debug-2.6.9" - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."on-finished-2.3.0" - sources."qs-6.5.1" - sources."raw-body-2.3.2" - sources."type-is-1.6.15" - sources."ms-0.7.3" - sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - 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.17" - sources."mime-db-1.30.0" - sources."accepts-1.3.4" - sources."compressible-2.0.12" - sources."on-headers-1.0.1" - sources."safe-buffer-5.1.1" - sources."vary-1.1.2" - sources."busboy-0.2.14" - sources."dicer-0.2.5" - sources."readable-stream-2.3.3" - sources."streamsearch-0.1.2" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" - sources."array-flatten-1.1.1" + sources."concat-map-0.0.1" sources."content-disposition-0.5.2" + sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."encodeurl-1.0.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.2" - sources."range-parser-1.2.0" - sources."send-0.16.1" - sources."serve-static-1.13.1" - sources."utils-merge-1.0.1" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" + sources."cookies-0.7.1" + sources."core-util-is-1.0.2" + sources."crypt3-0.2.0" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" sources."destroy-1.0.4" - sources."mime-1.4.1" - sources."glob-6.0.4" - sources."graceful-fs-4.1.11" - sources."handlebars-4.0.11" - sources."object.assign-4.0.4" - sources."promise-7.3.1" - sources."inflight-1.0.6" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."optimist-0.6.1" - sources."source-map-0.5.7" - sources."uglify-js-2.8.29" - sources."wordwrap-0.0.2" - sources."minimist-0.0.8" - sources."amdefine-1.0.1" - sources."uglify-to-browserify-1.0.2" - sources."camelcase-3.0.0" - sources."cliui-3.2.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."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.6" - sources."function-bind-1.1.1" - sources."object-keys-1.0.11" - sources."define-properties-1.1.2" - sources."foreach-2.0.5" - sources."argparse-1.0.9" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."domelementtype-1.3.0" + sources."domhandler-2.4.1" + sources."domutils-1.7.0" + sources."dtrace-provider-0.8.6" + sources."ecc-jsbn-0.1.1" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."entities-1.1.1" + sources."es6-shim-0.21.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" sources."esprima-4.0.0" - sources."sprintf-js-1.0.3" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" + sources."etag-1.8.1" + sources."express-5.0.0-alpha.6" + sources."express-json5-0.1.0" sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."finalhandler-1.0.6" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-ext-0.6.0" + sources."getpass-0.1.7" + sources."glob-6.0.4" + (sources."handlebars-2.0.0" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."har-schema-2.0.0" sources."har-validator-5.0.3" + sources."has-flag-3.0.0" sources."hawk-6.0.2" + sources."highlight.js-8.9.1" + sources."hoek-4.2.1" + sources."htmlparser2-3.9.2" + (sources."http-errors-1.6.3" // { + dependencies = [ + sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" + ]; + }) sources."http-signature-1.2.0" + sources."iconv-lite-0.4.8" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ipaddr.js-1.4.0" sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" + sources."jju-1.3.0" + sources."js-yaml-3.11.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" + sources."json-stringify-safe-5.0.1" + sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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."bluebird-3.5.1" - sources."bunyan-1.8.12" - sources."bunyan-syslog-udp-0.1.0" - sources."gelf-stream-1.1.1" - sources."hot-shots-4.8.0" - sources."limitation-0.2.0" - sources."dnscache-1.0.1" - sources."dtrace-provider-0.8.5" - sources."mv-2.1.1" - sources."safe-json-stringify-1.0.4" - sources."moment-2.19.2" - sources."nan-2.7.0" + sources."keygrip-1.0.2" + sources."linkify-it-1.2.4" + sources."lodash.clonedeep-4.5.0" + sources."lodash.escaperegexp-4.1.2" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.mergewith-4.6.1" + sources."lru-cache-2.7.3" + sources."lunr-0.7.2" + sources."markdown-it-4.4.0" + sources."mdurl-1.0.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.3.4" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-1.0.0" + sources."minimist-0.0.8" sources."mkdirp-0.5.1" + sources."moment-2.22.0" + sources."ms-2.0.0" + sources."mv-2.1.1" + sources."nan-2.10.0" sources."ncp-2.0.0" - sources."rimraf-2.4.5" - sources."gelfling-0.3.1" - sources."kad-git+https://github.com/gwicke/kad.git#master" - sources."clarinet-0.11.0" - sources."colors-1.1.2" - sources."hat-0.0.3" - sources."kad-fs-0.0.4" - sources."kad-localstorage-0.0.7" - sources."kad-memstore-0.0.1" - sources."lodash-3.10.1" - sources."merge-1.2.0" - sources."msgpack5-3.6.0" - sources."dom-storage-2.0.2" - sources."bl-1.2.1" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - sources."lodash.clone-4.3.2" - sources."lodash._baseclone-4.5.7" - 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."string-width-1.0.2" - sources."which-module-1.0.0" - sources."y18n-3.2.1" - sources."yargs-parser-5.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.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.1" - sources."is-arrayish-0.2.1" - 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" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" + sources."negotiator-0.6.1" sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."once-1.4.0" + sources."optimist-0.3.7" + sources."parseurl-1.3.2" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."postcss-6.0.21" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-1.1.5" + sources."punycode-1.4.1" + sources."qs-6.5.0" + sources."range-parser-1.2.0" + sources."raw-body-1.3.4" + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + (sources."render-readme-1.3.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."source-map-0.6.1" + ]; + }) + (sources."request-2.85.0" // { + dependencies = [ + sources."qs-6.5.1" + ]; + }) + sources."rimraf-2.4.5" + (sources."router-1.3.2" // { + dependencies = [ + sources."setprototypeof-1.1.0" + sources."utils-merge-1.0.1" + ]; + }) + sources."safe-buffer-5.1.1" + sources."safe-json-stringify-1.1.0" + sources."sanitize-html-1.18.2" + sources."semver-4.3.6" + sources."send-0.15.6" + sources."serve-static-1.12.6" + sources."setprototypeof-1.0.3" + sources."sigmund-1.0.1" + sources."sinopia-htpasswd-0.4.5" + sources."sntp-2.1.0" + sources."source-map-0.1.43" + sources."sprintf-js-1.0.3" + sources."srcset-1.0.0" + sources."sshpk-1.14.1" + sources."statuses-1.3.1" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."supports-color-5.3.0" + sources."through-2.3.8" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.16" + sources."uc.micro-1.0.5" + sources."uglify-js-2.3.6" + sources."unpipe-1.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.0" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."wordwrap-0.0.3" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { - description = "Mediawiki parser for the VisualEditor."; - homepage = "https://github.com/wikimedia/parsoid#readme"; - license = "GPL-2.0+"; + description = "Private npm repository server"; + homepage = https://github.com/rlidwka/sinopia; + license = { + type = "WTFPL"; + url = "http://www.wtfpl.net/txt/copying/"; + }; }; production = true; + bypassCache = false; }; - peerflix = nodeEnv.buildNodePackage { - name = "peerflix"; - packageName = "peerflix"; - version = "0.37.0"; + sloc = nodeEnv.buildNodePackage { + name = "sloc"; + packageName = "sloc"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz"; - sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf"; + url = "https://registry.npmjs.org/sloc/-/sloc-0.2.0.tgz"; + sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; }; dependencies = [ - sources."airplayer-2.0.0" - sources."clivas-0.2.0" - sources."inquirer-1.2.3" - sources."keypress-0.2.1" - sources."mime-1.4.1" - sources."network-address-1.1.2" - sources."numeral-1.5.6" - sources."open-0.0.5" - sources."optimist-0.6.1" - sources."parse-torrent-5.8.3" - sources."pump-1.0.2" - sources."range-parser-1.2.0" - sources."rc-1.2.2" - (sources."torrent-stream-1.0.3" // { - dependencies = [ - sources."parse-torrent-4.1.0" - ]; - }) - sources."winreg-1.2.3" - sources."xtend-4.0.1" - sources."airplay-protocol-2.0.2" - sources."appendable-cli-menu-2.0.0" - sources."bonjour-3.5.0" - sources."internal-ip-1.2.0" - sources."minimist-1.2.0" - sources."server-destroy-1.0.1" - sources."bplist-creator-0.0.6" - sources."bplist-parser-0.1.1" - sources."concat-stream-1.6.0" - sources."plist-1.2.0" - sources."reverse-http-1.3.0" - sources."stream-buffers-2.2.0" - sources."big-integer-1.6.25" - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - sources."readable-stream-2.3.3" + sources."async-2.1.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."cli-table-0.3.1" + sources."colors-1.0.3" + sources."commander-2.9.0" + sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."base64-js-0.0.8" - sources."xmlbuilder-4.0.0" - sources."xmldom-0.1.27" - sources."lodash-4.17.4" - sources."consume-http-header-1.0.0" - sources."once-1.3.3" - sources."consume-until-1.0.0" - sources."http-headers-3.0.1" - sources."buffer-indexof-1.1.1" - sources."next-line-1.1.0" - sources."wrappy-1.0.2" - sources."chalk-1.1.3" - sources."single-line-log-1.1.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."string-width-1.0.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-flatten-2.1.1" - sources."deep-equal-1.0.1" - sources."dns-equal-1.0.0" - sources."dns-txt-2.0.2" - sources."multicast-dns-6.1.1" - sources."multicast-dns-service-types-1.1.0" - sources."dns-packet-1.2.2" - sources."thunky-1.0.2" - 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.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.4.1" - 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."get-stdin-5.0.1" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."cli-width-2.2.0" - sources."external-editor-1.1.1" - sources."figures-1.7.0" - sources."mute-stream-0.0.6" - 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."extend-3.0.1" - sources."spawn-sync-1.0.15" - sources."tmp-0.0.29" - sources."os-shim-0.1.3" - sources."os-tmpdir-1.0.2" - sources."is-promise-2.1.0" - sources."wordwrap-0.0.3" - sources."blob-to-buffer-1.2.6" - sources."magnet-uri-4.2.3" - sources."parse-torrent-file-2.1.4" - sources."simple-get-2.7.0" - sources."thirty-two-0.0.2" - sources."uniq-1.0.1" - sources."bencode-0.8.0" - sources."simple-sha1-2.1.0" - sources."rusha-0.8.7" - sources."decompress-response-3.3.0" - sources."simple-concat-1.0.0" - sources."mimic-response-1.0.0" - sources."end-of-stream-0.1.5" - 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.2.3" - sources."fs-chunk-store-1.6.5" - sources."hat-0.0.3" - sources."immediate-chunk-store-1.0.8" - sources."ip-set-1.0.1" - sources."mkdirp-0.5.1" - sources."peer-wire-swarm-0.12.1" - sources."rimraf-2.6.2" - sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.1" - sources."random-access-file-1.8.1" - sources."randombytes-2.0.5" - sources."run-parallel-1.1.6" - sources."buffer-alloc-unsafe-1.0.0" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."flatten-0.0.1" - sources."fifo-0.1.4" - sources."peer-wire-protocol-0.7.0" - sources."speedometer-0.1.4" - 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."graceful-readlink-1.0.1" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."lodash-4.17.5" sources."minimatch-3.0.4" - sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."bittorrent-dht-6.4.2" - sources."bittorrent-tracker-7.7.0" - sources."re-emitter-1.1.3" - sources."buffer-equals-1.0.4" - sources."k-bucket-2.0.1" - sources."k-rpc-3.7.0" - sources."lru-2.0.1" - sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.7.1" - sources."bn.js-4.11.8" - sources."compact2string-1.4.0" - sources."random-iterate-1.0.1" - sources."run-series-1.1.4" - sources."simple-peer-6.4.4" - sources."simple-websocket-4.3.1" - sources."string2compact-1.2.2" - sources."ws-2.3.1" - sources."ipaddr.js-1.5.4" - sources."get-browser-rtc-1.0.2" - sources."ultron-1.0.2" - sources."addr-to-ip-port-1.4.2" - sources."options-0.0.6" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."safe-buffer-5.1.1" + sources."set-immediate-shim-1.0.1" + sources."string_decoder-1.1.1" + sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Streaming torrent client for Node.js"; - homepage = https://github.com/mafintosh/peerflix; + description = "sloc is a simple tool to count SLOC (source lines of code)"; + homepage = "https://github.com/flosse/sloc#readme"; license = "MIT"; }; production = true; + bypassCache = false; }; - peerflix-server = nodeEnv.buildNodePackage { - name = "peerflix-server"; - packageName = "peerflix-server"; - version = "0.2.0"; + smartdc = nodeEnv.buildNodePackage { + name = "smartdc"; + packageName = "smartdc"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.2.0.tgz"; - sha1 = "1848fdc14036f013af7489a39e8a5f0f9da48b87"; + url = "https://registry.npmjs.org/smartdc/-/smartdc-8.1.0.tgz"; + sha1 = "c8dba4694307a0070b84a67ced76da6de73f3585"; }; dependencies = [ - sources."connect-multiparty-2.1.0" - (sources."express-3.21.2" // { + sources."abbrev-1.1.1" + sources."asn1-0.1.11" + sources."assert-plus-0.1.5" + sources."backoff-2.5.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."bunyan-1.5.1" + sources."clone-0.1.6" + sources."cmdln-3.2.1" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."csv-0.4.6" + sources."csv-generate-0.0.6" + sources."csv-parse-1.3.3" + sources."csv-stringify-0.0.8" + sources."ctype-0.5.3" + sources."dashdash-1.7.3" + sources."dtrace-provider-0.6.0" + sources."ecc-jsbn-0.1.1" + sources."escape-regexp-component-1.0.2" + sources."extsprintf-1.2.0" + sources."formidable-1.2.1" + sources."glob-6.0.4" + sources."http-signature-0.11.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."jodid25519-1.0.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."jsprim-1.4.1" + sources."keep-alive-agent-0.0.1" + sources."lru-cache-2.2.0" + sources."mime-1.6.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."mv-2.1.1" + sources."nan-2.10.0" + sources."ncp-2.0.0" + sources."negotiator-0.5.3" + sources."node-uuid-1.4.8" + sources."nopt-2.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."precond-0.2.3" + sources."process-nextick-args-2.0.0" + sources."qs-3.1.0" + sources."readable-stream-2.3.6" + (sources."restify-4.0.3" // { dependencies = [ - sources."range-parser-1.0.3" + sources."lru-cache-2.7.3" + (sources."vasync-1.6.3" // { + dependencies = [ + sources."verror-1.6.0" + ]; + }) ]; }) - sources."lodash-2.4.2" - sources."mkdirp-0.5.1" - sources."pump-1.0.2" - sources."range-parser-1.2.0" - sources."read-torrent-1.3.0" - sources."socket.io-1.7.4" - (sources."torrent-stream-1.0.3" // { + sources."rimraf-2.4.5" + sources."safe-buffer-5.1.1" + sources."safe-json-stringify-1.1.0" + sources."semver-4.3.6" + (sources."smartdc-auth-2.3.1" // { dependencies = [ - sources."mkdirp-0.3.5" + sources."asn1-0.2.3" + sources."assert-plus-0.1.2" + sources."clone-0.1.5" + sources."dashdash-1.10.1" + sources."extsprintf-1.3.0" + (sources."http-signature-1.2.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."json-schema-0.2.2" + (sources."jsprim-0.3.0" // { + dependencies = [ + sources."verror-1.3.3" + ]; + }) + sources."once-1.3.0" + (sources."vasync-1.4.3" // { + dependencies = [ + sources."extsprintf-1.0.0" + ]; + }) + sources."verror-1.1.0" + ]; + }) + sources."spdy-1.32.5" + (sources."sshpk-1.7.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + ]; + }) + (sources."sshpk-agent-1.2.1" // { + dependencies = [ + sources."assert-plus-0.1.5" + ]; + }) + sources."stream-transform-0.1.2" + sources."string_decoder-1.1.1" + sources."tunnel-agent-0.4.3" + sources."tweetnacl-0.14.5" + sources."util-deprecate-1.0.2" + (sources."vasync-1.6.2" // { + dependencies = [ + sources."extsprintf-1.0.0" + sources."verror-1.1.0" + ]; + }) + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" ]; }) - sources."fluent-ffmpeg-2.1.2" - sources."multiparty-3.3.2" - sources."on-finished-2.3.0" - sources."qs-0.5.6" - 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.17" - sources."mime-db-1.30.0" - sources."basic-auth-1.0.4" - sources."connect-2.30.2" - sources."content-disposition-0.5.0" - sources."content-type-1.0.4" - sources."commander-2.6.0" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."debug-2.6.9" - 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.2" - sources."proxy-addr-1.0.10" - sources."send-0.13.2" - sources."utils-merge-1.0.0" - sources."vary-1.1.2" - 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" - sources."express-session-1.11.3" - sources."finalhandler-0.4.0" - sources."http-errors-1.3.1" - sources."method-override-2.3.10" - sources."morgan-1.6.1" - sources."on-headers-1.0.1" - sources."pause-0.1.0" - sources."response-time-2.3.2" - sources."serve-favicon-2.3.2" - sources."serve-index-1.7.3" - sources."serve-static-1.10.3" - sources."vhost-3.0.2" - sources."iconv-lite-0.4.13" - sources."raw-body-2.1.7" - sources."unpipe-1.0.0" - sources."accepts-1.3.3" - sources."compressible-2.0.12" - sources."negotiator-0.6.1" - sources."ms-2.0.0" - sources."csrf-3.0.6" - sources."rndm-1.2.0" - sources."tsscmp-1.0.5" - sources."uid-safe-2.0.0" - 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.2.1" - sources."readable-stream-2.3.3" - sources."stream-counter-0.2.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" - sources."batch-0.5.3" - sources."destroy-1.0.3" - sources."mime-1.2.11" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.0.5" - sources."minimist-1.2.0" - sources."end-of-stream-0.1.5" - sources."once-1.3.3" sources."wrappy-1.0.2" - sources."magnet-uri-4.2.3" - sources."parse-torrent-4.1.0" - sources."request-2.16.6" - sources."xtend-4.0.1" - sources."thirty-two-0.0.2" - sources."parse-torrent-file-2.1.4" - sources."flatten-0.0.1" - sources."bencode-0.8.0" - sources."simple-sha1-2.1.0" - sources."rusha-0.8.7" - sources."form-data-0.0.10" - sources."hawk-0.10.2" - sources."node-uuid-1.4.8" - sources."cookie-jar-0.2.0" - sources."aws-sign-0.2.0" - sources."oauth-sign-0.2.0" - sources."forever-agent-0.2.0" - sources."tunnel-agent-0.2.0" - sources."json-stringify-safe-3.0.0" - sources."combined-stream-0.0.7" - sources."async-0.2.10" - sources."delayed-stream-0.0.5" - sources."hoek-0.7.6" - sources."boom-0.3.8" - sources."cryptiles-0.1.3" - sources."sntp-0.1.4" - sources."engine.io-1.8.4" - sources."has-binary-0.1.7" - sources."object-assign-4.1.0" - sources."socket.io-adapter-0.5.0" - sources."socket.io-client-1.7.4" - sources."socket.io-parser-2.3.1" - sources."base64id-1.0.0" - sources."engine.io-parser-1.3.2" - sources."ws-2.3.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Client SDK and CLI for the Joyent SmartDataCenter API"; + homepage = "https://github.com/joyent/node-smartdc#readme"; + }; + production = true; + bypassCache = false; + }; + "socket.io" = nodeEnv.buildNodePackage { + name = "socket.io"; + packageName = "socket.io"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.0.tgz"; + sha512 = "2wkm6yqxvn8wk51rbakza3zxg3rknzfgmwqrbzvnlacf1yylplsr61i67m01sg8x7589ymj6x3z266ngvqd6qyyakdx4dlnsl4bfbr9"; + }; + dependencies = [ + sources."accepts-1.3.5" sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" + sources."arraybuffer.slice-0.0.7" + sources."async-limiter-1.0.0" + sources."backo2-1.0.2" sources."base64-arraybuffer-0.1.5" + sources."base64id-1.0.0" + sources."better-assert-1.0.2" sources."blob-0.0.4" - sources."wtf-8-1.0.0" - sources."options-0.0.6" - sources."ultron-1.1.0" - sources."backo2-1.0.2" + sources."callsite-1.0.0" sources."component-bind-1.0.0" - sources."component-emitter-1.1.2" - sources."engine.io-client-1.8.4" + sources."component-emitter-1.2.1" + sources."component-inherit-0.0.3" + sources."cookie-0.3.1" + sources."debug-3.1.0" + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" + sources."engine.io-parser-2.1.2" + sources."has-binary2-1.0.2" + sources."has-cors-1.1.0" sources."indexof-0.0.1" + sources."isarray-2.0.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."ms-2.0.0" + sources."negotiator-0.6.1" sources."object-component-0.0.3" + sources."parseqs-0.0.5" sources."parseuri-0.0.5" + sources."safe-buffer-5.1.1" + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.1.0" + sources."socket.io-parser-3.2.0" sources."to-array-0.1.4" - sources."component-inherit-0.0.3" - sources."has-cors-1.1.0" - sources."parsejson-0.0.3" - sources."parseqs-0.0.5" - sources."xmlhttprequest-ssl-1.5.3" + sources."ultron-1.1.1" + sources."ws-3.3.3" + sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" - sources."better-assert-1.0.2" - sources."callsite-1.0.0" - sources."json3-3.3.2" - sources."bitfield-0.1.0" - sources."bncode-0.2.3" - (sources."fs-chunk-store-1.6.5" // { - dependencies = [ - sources."mkdirp-0.5.1" - ]; - }) - sources."hat-0.0.3" - sources."immediate-chunk-store-1.0.8" - sources."ip-set-1.0.1" - sources."peer-wire-swarm-0.12.1" - sources."rimraf-2.6.2" - sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.1" - sources."random-access-file-1.8.1" - 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.0.1" - sources."ip-1.1.5" - sources."fifo-0.1.4" - sources."peer-wire-protocol-0.7.0" - sources."speedometer-0.1.4" - 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.4" - sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."bittorrent-dht-6.4.2" - sources."bittorrent-tracker-7.7.0" - sources."re-emitter-1.1.3" - sources."buffer-equals-1.0.4" - sources."k-bucket-2.0.1" - sources."k-rpc-3.7.0" - sources."lru-2.0.1" - sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.7.1" - sources."bn.js-4.11.8" - sources."compact2string-1.4.0" - sources."random-iterate-1.0.1" - sources."run-series-1.1.4" - sources."simple-get-2.7.0" - sources."simple-peer-6.4.4" - sources."simple-websocket-4.3.1" - sources."string2compact-1.2.2" - sources."uniq-1.0.1" - sources."decompress-response-3.3.0" - sources."simple-concat-1.0.0" - sources."mimic-response-1.0.0" - 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.3.0" - sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Streaming torrent client for node.js with web ui."; - homepage = "https://github.com/asapach/peerflix-server#readme"; + description = "node.js realtime framework server"; + homepage = "https://github.com/socketio/socket.io#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + stackdriver-statsd-backend = nodeEnv.buildNodePackage { + name = "stackdriver-statsd-backend"; + packageName = "stackdriver-statsd-backend"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; + sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Send metric data from statsd to Stackdriver"; + homepage = https://www.stackdriver.com/; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + statsd = nodeEnv.buildNodePackage { + name = "statsd"; + packageName = "statsd"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz"; + sha1 = "92041479e174a214df7147f2fab1348af0839052"; + }; + dependencies = [ + sources."commander-1.3.1" + sources."connection-parse-0.0.7" + sources."generic-pool-2.2.0" + sources."hashring-3.2.0" + sources."keypress-0.1.0" + sources."modern-syslog-1.1.2" + sources."nan-2.10.0" + sources."sequence-2.2.1" + sources."simple-lru-cache-0.0.2" + sources."winser-0.1.6" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Network daemon for the collection and aggregation of realtime application metrics"; + homepage = https://github.com/etsy/statsd; license = "MIT"; }; production = true; + bypassCache = false; }; - phantomjs = nodeEnv.buildNodePackage { - name = "phantomjs"; - packageName = "phantomjs"; - version = "2.1.7"; + statsd-influxdb-backend = nodeEnv.buildNodePackage { + name = "statsd-influxdb-backend"; + packageName = "statsd-influxdb-backend"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.7.tgz"; - sha1 = "c6910f67935c37285b6114329fc2f27d5f3e3134"; + url = "https://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz"; + sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78"; }; - dependencies = [ - sources."extract-zip-1.5.0" - sources."fs-extra-0.26.7" - sources."hasha-2.2.0" - sources."kew-0.7.0" - sources."progress-1.1.8" - sources."request-2.67.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" - 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."minimist-0.0.8" - sources."fd-slicer-1.0.1" - sources."pend-1.2.0" - sources."graceful-fs-4.1.11" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" - sources."path-is-absolute-1.0.1" - sources."rimraf-2.6.2" - sources."glob-7.1.2" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - 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."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.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.17" - sources."node-uuid-1.4.8" - sources."qs-5.2.1" - sources."tunnel-agent-0.4.3" - sources."tough-cookie-2.2.2" - sources."http-signature-1.1.1" - sources."oauth-sign-0.8.2" - sources."hawk-3.1.3" - sources."aws-sign2-0.6.0" - sources."stringstream-0.0.5" - sources."combined-stream-1.0.5" - sources."isstream-0.1.2" - sources."is-typedarray-1.0.0" - sources."har-validator-2.0.6" - sources."async-2.6.0" - sources."lodash-4.17.4" - sources."mime-db-1.30.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."delayed-stream-1.0.0" - sources."chalk-1.1.3" - sources."commander-2.11.0" - sources."is-my-json-valid-2.16.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."throttleit-1.0.0" - sources."isexe-2.0.0" - ]; buildInputs = globalBuildInputs; meta = { - description = "Headless WebKit with JS API"; - homepage = https://github.com/Medium/phantomjs; - license = "Apache-2.0"; + description = "InfluxDB backend for StatsD"; + homepage = https://github.com/bernd/statsd-influxdb-backend; + license = "BSD"; }; production = true; + bypassCache = false; }; - prettier = nodeEnv.buildNodePackage { - name = "prettier"; - packageName = "prettier"; - version = "1.8.2"; + statsd-librato-backend = nodeEnv.buildNodePackage { + name = "statsd-librato-backend"; + packageName = "statsd-librato-backend"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.8.2.tgz"; - sha512 = "1kfhb09w2kr32afpzpvvjk005z04jf41d7gghcvfddsryvvis2gvvj4ig55yjs1876c3mj7pjmygv58hsrkzjxvsv7hhrhi185s6xbw"; + url = "https://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-2.0.16.tgz"; + sha1 = "6c6a0d14684f0341e5ba013eed30302545532bc6"; }; + dependencies = [ + sources."extend-3.0.1" + ]; buildInputs = globalBuildInputs; meta = { - description = "Prettier is an opinionated code formatter"; - homepage = https://prettier.io/; + description = "A StatsD backend for Librato Metrics"; + homepage = https://github.com/librato/statsd-librato-backend; license = "MIT"; }; production = true; + bypassCache = false; }; - pulp = nodeEnv.buildNodePackage { - name = "pulp"; - packageName = "pulp"; - version = "12.0.1"; + stylus = nodeEnv.buildNodePackage { + name = "stylus"; + packageName = "stylus"; + version = "0.54.5"; src = fetchurl { - url = "https://registry.npmjs.org/pulp/-/pulp-12.0.1.tgz"; - sha512 = "3n09lgnyd4p3h3jlhgcvbh6n6m9h89hwvbhli5ic32fkl5y4g7yi61m1vw483479jxkif2zyqs89l6j6hq4iy15jdknx1lcp9qbyvwy"; + url = "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz"; + sha1 = "42b9560931ca7090ce8515a798ba9e6aa3d6dc79"; }; dependencies = [ - (sources."browserify-13.3.0" // { - dependencies = [ - sources."concat-stream-1.5.2" - ]; - }) - sources."browserify-incremental-3.1.1" - sources."concat-stream-1.6.0" - sources."glob-7.1.2" - sources."minimatch-3.0.4" - (sources."node-static-0.7.10" // { - dependencies = [ - sources."wordwrap-0.0.3" - ]; - }) - sources."read-1.0.7" - sources."string-stream-0.0.7" - sources."temp-0.8.3" - sources."through-2.3.8" - sources."tree-kill-1.2.0" - sources."watchpack-1.4.0" - sources."which-1.3.0" - sources."wordwrap-1.0.0" - sources."JSONStream-0.10.0" - sources."assert-1.4.1" - sources."browser-pack-6.0.2" - sources."browser-resolve-1.11.2" - sources."browserify-zlib-0.1.4" - sources."buffer-4.9.1" - sources."cached-path-relative-1.0.1" - sources."console-browserify-1.1.0" - sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.12.0" - 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."has-1.0.1" - sources."htmlescape-1.1.1" - sources."https-browserify-0.0.1" - sources."inherits-2.0.3" - sources."insert-module-globals-7.0.1" - sources."labeled-stream-splicer-2.0.0" - sources."module-deps-4.1.1" - sources."os-browserify-0.1.2" - sources."parents-1.0.1" - sources."path-browserify-0.0.0" - sources."process-0.11.10" - sources."punycode-1.3.2" - sources."querystring-es3-0.2.1" - sources."read-only-stream-2.0.0" - sources."readable-stream-2.3.3" - sources."resolve-1.1.7" - sources."shasum-1.0.2" - sources."shell-quote-1.6.1" - sources."stream-browserify-2.0.1" - sources."stream-http-2.7.2" - sources."string_decoder-1.0.3" - sources."subarg-1.0.0" - sources."syntax-error-1.3.0" - sources."through2-2.0.3" - sources."timers-browserify-1.4.2" - sources."tty-browserify-0.0.0" - sources."url-0.11.0" - sources."util-0.10.3" - sources."vm-browserify-0.0.4" - sources."xtend-4.0.1" - sources."jsonparse-0.0.5" - sources."combine-source-map-0.7.2" - sources."umd-3.0.1" - sources."convert-source-map-1.1.3" - sources."inline-source-map-0.6.2" - sources."lodash.memoize-3.0.4" - sources."source-map-0.5.7" - sources."pako-0.2.9" - sources."base64-js-1.2.1" - sources."ieee754-1.1.8" - sources."isarray-1.0.0" - sources."typedarray-0.0.6" - sources."core-util-is-1.0.2" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - sources."date-now-0.1.4" - sources."browserify-cipher-1.0.0" - sources."browserify-sign-4.0.4" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" - sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.14" - sources."public-encrypt-4.0.0" - sources."randombytes-2.0.5" - sources."randomfill-1.0.3" - sources."browserify-aes-1.1.1" - sources."browserify-des-1.0.0" - sources."evp_bytestokey-1.0.3" - sources."buffer-xor-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."md5.js-1.3.4" - sources."hash-base-2.0.2" - sources."bn.js-4.11.8" - sources."browserify-rsa-4.0.1" - sources."elliptic-6.4.0" - sources."parse-asn1-5.1.0" - sources."brorand-1.1.0" - sources."hash.js-1.1.3" - sources."hmac-drbg-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.2" - sources."ripemd160-2.0.1" - sources."sha.js-2.4.9" - sources."miller-rabin-4.0.1" - sources."function-bind-1.1.1" - sources."is-buffer-1.1.6" - sources."lexical-scope-1.2.0" - sources."astw-2.2.0" - sources."acorn-4.0.13" - sources."stream-splicer-2.0.0" - sources."detective-4.5.0" - sources."stream-combiner2-1.1.1" - sources."path-platform-0.11.15" - sources."path-parse-1.0.5" - sources."json-stable-stringify-0.0.1" - sources."jsonify-0.0.0" - sources."array-filter-0.0.1" - sources."array-reduce-0.0.0" - sources."array-map-0.0.0" - sources."builtin-status-codes-3.0.0" - sources."to-arraybuffer-1.0.1" - sources."minimist-0.0.10" - sources."querystring-0.2.0" - sources."indexof-0.0.1" - sources."browserify-cache-api-3.0.1" - sources."async-2.6.0" + sources."amdefine-1.0.1" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + sources."css-parse-1.7.0" + sources."debug-3.1.0" sources."fs.realpath-1.0.0" + sources."glob-7.0.6" sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" + sources."sax-0.5.8" + sources."source-map-0.1.43" sources."wrappy-1.0.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."colors-1.1.2" - sources."mime-1.4.1" - sources."mute-stream-0.0.7" - sources."os-tmpdir-1.0.2" - sources."rimraf-2.2.8" - sources."chokidar-1.7.0" - sources."graceful-fs-4.1.11" - sources."lodash-4.17.4" - sources."anymatch-1.3.2" - 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."readdirp-2.1.0" - sources."fsevents-1.1.3" - sources."micromatch-2.3.11" - sources."normalize-path-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" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."kind-of-3.2.2" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - 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-3.0.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."repeat-string-1.6.1" - sources."is-posix-bracket-0.1.1" - 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."remove-trailing-separator-1.1.0" - sources."binary-extensions-1.10.0" - sources."set-immediate-shim-1.0.1" - sources."nan-2.7.0" - sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "A build system for PureScript projects"; - homepage = https://github.com/bodil/pulp; - license = "LGPL-3.0+"; + description = "Robust, expressive, and feature-rich CSS superset"; + homepage = https://github.com/stylus/stylus; + license = "MIT"; }; production = true; + bypassCache = false; }; - quassel-webserver = nodeEnv.buildNodePackage { - name = "quassel-webserver"; - packageName = "quassel-webserver"; - version = "2.2.8"; + svgo = nodeEnv.buildNodePackage { + name = "svgo"; + packageName = "svgo"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/quassel-webserver/-/quassel-webserver-2.2.8.tgz"; - sha1 = "195a2a5b6dd76e4a244a807002678b037d70eeaa"; + url = "https://registry.npmjs.org/svgo/-/svgo-1.0.5.tgz"; + sha512 = "0z83qdi781ax865bpw8ywmp5dyljjwnan5f9lgja0zcyr8niycd0x35yqw7chwmh3wpps4ai1lkswybk8mjnjik526vdvw1z1zf52lx"; }; dependencies = [ - sources."body-parser-1.18.2" - sources."commander-2.11.0" - sources."cookie-parser-1.4.3" - sources."express-4.16.2" - sources."less-2.7.3" - sources."less-middleware-2.2.1" - sources."libquassel-2.1.9" - sources."morgan-1.9.0" - sources."net-browserify-alt-1.1.0" - (sources."pug-2.0.0-rc.4" // { - dependencies = [ - sources."commander-2.8.1" - ]; - }) - sources."serve-favicon-2.3.2" - sources."httpolyglot-0.1.2" - sources."bytes-3.0.0" - sources."content-type-1.0.4" - sources."debug-2.6.9" - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."on-finished-2.3.0" - sources."qs-6.4.0" - sources."raw-body-2.3.2" - sources."type-is-1.6.15" - sources."ms-0.7.2" - sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - 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.17" - sources."mime-db-1.30.0" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."accepts-1.3.4" - sources."array-flatten-1.1.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-1.1.0" - sources."fresh-0.3.0" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.2" - sources."range-parser-1.2.0" - sources."safe-buffer-5.0.1" - sources."send-0.16.1" - sources."serve-static-1.13.1" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."negotiator-0.6.1" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" - sources."destroy-1.0.4" - sources."mime-1.4.1" - sources."errno-0.1.4" - sources."graceful-fs-4.1.11" - sources."image-size-0.5.5" - sources."mkdirp-0.5.1" - sources."promise-7.3.1" - sources."source-map-0.5.7" - sources."request-2.81.0" - sources."prr-0.0.0" - sources."minimist-1.2.0" - sources."asap-2.0.6" - 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.3" - sources."tunnel-agent-0.4.3" - 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-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."core-util-is-1.0.2" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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."node.extend-2.0.0" - sources."is-3.2.1" - sources."eventemitter2-3.0.2" - sources."qtdatastream-0.7.1" - sources."int64-buffer-0.1.9" - sources."basic-auth-2.0.0" - sources."on-headers-1.0.1" - sources."bufferutil-2.0.1" - sources."ws-2.3.1" - sources."bindings-1.2.1" - sources."nan-2.5.1" - sources."prebuild-install-2.1.2" - sources."expand-template-1.1.0" - sources."github-from-package-0.0.0" - sources."node-abi-2.1.2" - sources."noop-logger-0.1.1" - sources."npmlog-4.1.2" - sources."os-homedir-1.0.2" - sources."pump-1.0.2" - sources."rc-1.2.2" - sources."simple-get-1.4.3" - sources."tar-fs-1.16.0" - sources."xtend-4.0.1" - sources."semver-5.4.1" - sources."are-we-there-yet-1.1.4" - sources."console-control-strings-1.1.0" - sources."gauge-2.7.4" - sources."set-blocking-2.0.0" - sources."delegates-1.0.0" - sources."readable-stream-2.3.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."aproba-1.2.0" - 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."end-of-stream-1.4.0" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."deep-extend-0.4.2" - sources."ini-1.3.4" - sources."strip-json-comments-2.0.1" - sources."unzip-response-1.0.2" - sources."chownr-1.0.1" - sources."tar-stream-1.5.5" - sources."bl-1.2.1" - sources."ultron-1.1.0" - sources."pug-code-gen-2.0.0" - sources."pug-filters-2.1.5" - sources."pug-lexer-3.1.0" - sources."pug-linker-3.0.3" - sources."pug-load-2.0.9" - sources."pug-parser-4.0.0" - sources."pug-runtime-2.0.3" - sources."pug-strip-comments-1.0.2" - sources."constantinople-3.1.0" - sources."doctypes-1.1.0" - sources."js-stringify-1.0.2" - sources."pug-attrs-2.0.2" - sources."pug-error-1.3.2" - sources."void-elements-2.0.1" - sources."with-5.1.1" - sources."acorn-4.0.13" - sources."is-expression-3.0.0" - sources."acorn-globals-3.1.0" - sources."clean-css-3.4.28" - sources."pug-walk-1.1.5" - sources."jstransformer-1.0.0" - sources."resolve-1.5.0" - sources."uglify-js-2.8.29" - sources."graceful-readlink-1.0.1" - sources."amdefine-1.0.1" - sources."is-promise-2.1.0" - sources."path-parse-1.0.5" - sources."yargs-3.10.0" - sources."uglify-to-browserify-1.0.2" - sources."camelcase-1.2.1" - sources."cliui-2.1.0" - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - sources."center-align-0.1.3" - sources."right-align-0.1.3" - sources."wordwrap-0.0.2" - sources."align-text-0.1.4" - sources."lazy-cache-1.0.4" - sources."kind-of-3.2.2" - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.6" - sources."character-parser-2.2.0" - sources."is-regex-1.0.4" - sources."has-1.0.1" + sources."argparse-1.0.10" + sources."boolbase-1.0.0" + sources."coa-2.0.1" + sources."colors-1.1.2" + sources."css-select-1.3.0-rc0" + sources."css-select-base-adapter-0.1.0" + sources."css-tree-1.0.0-alpha25" + sources."css-url-regex-1.1.0" + sources."css-what-2.1.0" + (sources."csso-3.5.0" // { + dependencies = [ + sources."css-tree-1.0.0-alpha.27" + ]; + }) + sources."define-properties-1.1.2" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."domelementtype-1.3.0" + sources."domutils-1.5.1" + sources."entities-1.1.1" + sources."es-abstract-1.11.0" + sources."es-to-primitive-1.1.1" + sources."esprima-4.0.0" + sources."foreach-2.0.5" sources."function-bind-1.1.1" - sources."token-stream-0.0.1" + sources."has-1.0.1" + sources."is-callable-1.1.3" + sources."is-date-object-1.0.1" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.1" + sources."js-yaml-3.10.0" + sources."mdn-data-1.1.0" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."nth-check-1.0.1" + sources."object-keys-1.0.11" + sources."object.getownpropertydescriptors-2.0.3" + sources."object.values-1.0.4" + sources."q-1.5.1" + sources."sax-1.2.4" + sources."source-map-0.5.7" + sources."sprintf-js-1.0.3" + sources."stable-0.1.6" + sources."unquote-1.1.1" + sources."util.promisify-1.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Quassel web interface"; - homepage = https://github.com/magne4000/quassel-webserver; + description = "Nodejs-based tool for optimizing SVG vector graphics files"; + homepage = https://github.com/svg/svgo; license = "MIT"; }; production = true; + bypassCache = false; }; - react-tools = nodeEnv.buildNodePackage { - name = "react-tools"; - packageName = "react-tools"; - version = "0.13.3"; + tern = nodeEnv.buildNodePackage { + name = "tern"; + packageName = "tern"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-tools/-/react-tools-0.13.3.tgz"; - sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; + url = "https://registry.npmjs.org/tern/-/tern-0.21.0.tgz"; + sha1 = "809c87a826e112494398cf8894f7c2d1b3464eb7"; }; dependencies = [ - sources."commoner-0.10.8" - sources."jstransform-10.1.0" - 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.19" - sources."mkdirp-0.5.1" - sources."private-0.1.8" - sources."q-1.5.1" - sources."recast-0.11.23" sources."acorn-4.0.13" - sources."defined-1.0.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."enhanced-resolve-2.3.0" + sources."errno-0.1.7" + sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."memory-fs-0.3.0" sources."minimatch-3.0.4" + sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.0" + sources."prr-1.0.1" + sources."readable-stream-2.3.6" + sources."resolve-from-2.0.0" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.1.1" + sources."tapable-0.2.8" + sources."util-deprecate-1.0.2" sources."wrappy-1.0.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.6" - sources."esprima-3.1.3" - sources."source-map-0.1.31" - sources."base62-0.1.1" - sources."esprima-fb-13001.1001.0-dev-harmony-fb" - sources."amdefine-1.0.1" ]; buildInputs = globalBuildInputs; meta = { - description = "A set of complementary tools to React, including the JSX transformer."; - homepage = https://facebook.github.io/react; - license = "BSD-3-Clause"; + description = "A JavaScript code analyzer for deep, cross-editor language support"; + homepage = "https://github.com/ternjs/tern#readme"; + license = "MIT"; }; production = true; + bypassCache = false; }; - s3http = nodeEnv.buildNodePackage { - name = "s3http"; - packageName = "s3http"; - version = "0.0.5"; + titanium = nodeEnv.buildNodePackage { + name = "titanium"; + packageName = "titanium"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz"; - sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.1.0.tgz"; + sha1 = "68597b6d324a65c7cf070c40a2a156b219ca06dd"; }; dependencies = [ - sources."aws-sdk-1.18.0" - sources."commander-2.0.0" - sources."http-auth-2.0.7" - (sources."express-3.4.4" // { + sources."adm-zip-0.4.7" + sources."ajv-4.11.8" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."async-2.1.2" + sources."asynckit-0.4.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.7.0" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-2.10.1" + sources."camelcase-1.2.1" + sources."caseless-0.12.0" + sources."center-align-0.1.3" + sources."chalk-1.1.3" + sources."cliui-2.1.0" + sources."co-4.6.0" + sources."colors-1.1.2" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."core-util-is-1.0.2" + sources."cryptiles-2.0.5" + sources."cycle-1.0.3" + sources."dashdash-1.14.1" + sources."decamelize-1.2.0" + sources."delayed-stream-1.0.0" + sources."diff-3.2.0" + sources."ecc-jsbn-0.1.1" + sources."escape-string-regexp-1.0.5" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + (sources."fields-0.1.24" // { dependencies = [ - sources."commander-1.3.2" + sources."colors-0.6.2" ]; }) - sources."everyauth-0.4.5" - sources."string-1.6.1" - sources."util-0.4.9" - sources."crypto-0.0.3" - sources."xml2js-0.2.4" - sources."xmlbuilder-0.4.2" - sources."sax-1.2.4" - sources."coffee-script-1.6.3" - sources."node-uuid-1.4.1" - sources."connect-2.3.9" - sources."range-parser-0.0.4" - sources."mkdirp-0.3.5" - sources."cookie-0.0.4" - sources."buffer-crc32-0.2.1" - sources."fresh-0.1.0" - sources."methods-0.0.1" - sources."send-0.0.3" - sources."cookie-signature-1.0.1" - sources."debug-0.5.0" - sources."qs-6.5.1" - sources."bytes-0.1.0" - sources."pause-0.0.1" - sources."uid2-0.0.3" - sources."raw-body-0.0.3" - sources."negotiator-0.3.0" - sources."multiparty-2.2.0" - 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."keypress-0.1.0" - sources."mime-1.2.6" - sources."ms-2.0.0" - sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" - sources."request-2.83.0" - sources."openid-2.0.6" - sources."node-swt-0.1.1" - sources."node-wsfederation-0.1.1" - sources."formidable-1.0.11" - sources."crc-0.2.0" - sources."aws-sign2-0.7.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.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" + sources."form-data-2.1.4" + sources."fs-extra-2.1.2" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."getpass-0.1.7" + sources."graceful-fs-4.1.11" + sources."har-schema-1.0.5" + sources."har-validator-4.2.1" + sources."has-ansi-2.0.0" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" + sources."humanize-0.0.9" + sources."is-buffer-1.1.6" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" + sources."is-property-1.0.2" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" + sources."jsonfile-2.4.0" + sources."jsonify-0.0.0" + sources."jsonpointer-4.0.1" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."keypress-0.2.1" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."lodash-4.17.5" + sources."longest-1.0.1" + sources."longjohn-0.2.11" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimist-0.0.10" + sources."moment-2.16.0" + (sources."node-appc-0.2.44" // { + dependencies = [ + sources."async-2.3.0" + sources."fs-extra-2.0.0" + sources."request-2.81.0" + sources."source-map-0.5.7" + sources."wordwrap-0.0.2" + ]; + }) sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" + sources."optimist-0.6.1" + sources."os-tmpdir-1.0.2" + sources."performance-now-0.2.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkginfo-0.3.1" + sources."punycode-1.4.1" + sources."qs-6.4.0" + sources."repeat-string-1.6.1" + (sources."request-2.79.0" // { + dependencies = [ + sources."caseless-0.11.0" + sources."har-validator-2.0.6" + sources."qs-6.3.2" + sources."tunnel-agent-0.4.3" + ]; + }) + sources."right-align-0.1.3" + sources."rimraf-2.2.8" sources."safe-buffer-5.1.1" + sources."semver-5.3.0" + sources."sntp-1.0.9" + sources."source-map-0.1.32" + sources."source-map-support-0.3.2" + sources."sprintf-0.1.5" + (sources."sshpk-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."stack-trace-0.0.10" sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."temp-0.8.3" + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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.30.0" - sources."punycode-1.4.1" - sources."events.node-0.4.9" + sources."uglify-js-2.8.21" + sources."uglify-to-browserify-1.0.2" + sources."uuid-3.0.1" + sources."verror-1.10.0" + sources."window-size-0.1.0" + (sources."winston-1.1.2" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + ]; + }) + sources."wordwrap-0.0.3" + sources."xmldom-0.1.22" + sources."xtend-4.0.1" + sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { + description = "Appcelerator Titanium Command line"; + homepage = "https://github.com/appcelerator/titanium#readme"; + license = "Apache-2.0"; }; production = true; + bypassCache = false; }; - semver = nodeEnv.buildNodePackage { - name = "semver"; - packageName = "semver"; - version = "5.4.1"; + typescript = nodeEnv.buildNodePackage { + name = "typescript"; + packageName = "typescript"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz"; + sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2"; }; buildInputs = globalBuildInputs; meta = { - description = "The semantic version parser used by npm."; - homepage = "https://github.com/npm/node-semver#readme"; - license = "ISC"; + description = "TypeScript is a language for application scale JavaScript development"; + homepage = http://typescriptlang.org/; + license = "Apache-2.0"; }; production = true; + bypassCache = false; }; - serve = nodeEnv.buildNodePackage { - name = "serve"; - packageName = "serve"; - version = "6.4.1"; + typings = nodeEnv.buildNodePackage { + name = "typings"; + packageName = "typings"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.4.1.tgz"; - sha512 = "385jwid220bqcnr46ck6vz22ic9kxmxghcpy4m15lvzcl7r3g8f6jyigwmjvdfypf8jaiv1shrfwj2fsgq7wsg6mh7q9hc3pkfk99x0"; + url = "https://registry.npmjs.org/typings/-/typings-2.1.1.tgz"; + sha1 = "bacc69d255970a478e09f76c7f689975d535a78a"; }; dependencies = [ - (sources."args-3.0.7" // { + sources."abbrev-1.1.1" + sources."agent-base-2.1.1" + sources."ansi-align-2.0.0" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."any-promise-1.3.0" + sources."archy-1.0.0" + sources."array-uniq-1.0.3" + sources."asynckit-0.4.0" + sources."balanced-match-1.0.0" + sources."bluebird-3.5.1" + sources."boxen-1.3.0" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" + sources."chalk-1.1.3" + sources."ci-info-1.1.3" + sources."cli-boxes-1.0.0" + sources."cli-cursor-1.0.2" + (sources."cli-truncate-1.1.0" // { dependencies = [ - sources."chalk-2.1.0" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) - sources."basic-auth-2.0.0" - sources."bluebird-3.5.1" - sources."boxen-1.2.2" - sources."chalk-2.3.0" - sources."clipboardy-1.1.4" - sources."dargs-5.1.0" - sources."detect-port-1.2.1" - sources."filesize-3.5.11" - sources."fs-extra-4.0.2" - sources."handlebars-4.0.11" - sources."ip-1.1.5" - sources."micro-9.0.0" - sources."micro-compress-1.0.0" - sources."mime-types-2.1.17" - sources."node-version-1.1.0" - sources."openssl-self-signed-certificate-1.1.6" - sources."opn-5.1.0" - sources."path-type-3.0.0" - sources."send-0.16.1" - sources."update-notifier-2.3.0" - sources."camelcase-1.2.1" - sources."mri-1.1.0" - sources."pkginfo-0.4.1" - sources."string-similarity-1.2.0" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.5.0" + sources."clone-1.0.4" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."lodash-4.17.4" - sources."safe-buffer-5.1.1" - sources."ansi-align-2.0.0" - sources."cli-boxes-1.0.0" - sources."string-width-1.0.2" - sources."term-size-1.2.0" - sources."widest-line-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."strip-ansi-3.0.1" - sources."ansi-regex-2.1.1" - sources."execa-0.6.3" + sources."columnify-1.5.4" + sources."combined-stream-1.0.6" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."configstore-3.1.2" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" - 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."lru-cache-4.1.1" - sources."shebang-command-1.2.0" - sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - sources."path-key-2.0.1" - sources."code-point-at-1.1.0" - sources."number-is-nan-1.0.1" - sources."address-1.0.3" + sources."crypto-random-string-1.0.0" sources."debug-2.6.9" - sources."ms-2.0.0" + sources."deep-extend-0.4.2" + sources."defaults-1.0.3" + sources."delayed-stream-1.0.0" + sources."detect-indent-5.0.0" + sources."dot-prop-4.2.0" + sources."duplexer3-0.1.4" + sources."elegant-spinner-1.0.1" + sources."error-ex-1.3.1" + sources."escape-string-regexp-1.0.5" + sources."execa-0.7.0" + sources."exit-hook-1.1.1" + sources."extend-3.0.1" + sources."form-data-2.3.2" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."get-stream-3.0.0" + sources."glob-7.1.2" + sources."global-dirs-0.1.1" + sources."got-6.7.1" sources."graceful-fs-4.1.11" - sources."jsonfile-4.0.0" - sources."universalify-0.1.1" - sources."async-1.5.2" - sources."optimist-0.6.1" - sources."source-map-0.5.7" - sources."uglify-js-2.8.29" - sources."wordwrap-0.0.2" - sources."minimist-1.2.0" - sources."amdefine-1.0.1" - sources."yargs-3.10.0" - sources."uglify-to-browserify-1.0.2" - 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."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.6" - sources."media-typer-0.3.0" - sources."raw-body-2.3.2" - sources."bytes-3.0.0" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."unpipe-1.0.0" - sources."depd-1.1.1" - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" - sources."compression-1.7.1" - sources."accepts-1.3.4" - sources."compressible-2.0.12" - sources."on-headers-1.0.1" - sources."vary-1.1.2" - sources."negotiator-0.6.1" - sources."mime-db-1.30.0" - sources."is-wsl-1.1.0" - sources."pify-3.0.0" - sources."destroy-1.0.4" - sources."encodeurl-1.0.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."fresh-0.5.2" - sources."mime-1.4.1" - sources."on-finished-2.3.0" - sources."range-parser-1.2.0" - sources."ee-first-1.1.1" - sources."configstore-3.1.1" + sources."has-1.0.1" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-unicode-2.0.1" + sources."http-proxy-agent-1.0.0" + sources."https-proxy-agent-1.0.0" sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."invariant-2.2.4" + sources."is-absolute-0.2.6" + sources."is-arrayish-0.2.1" + sources."is-ci-1.1.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.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."dot-prop-4.2.0" - sources."make-dir-1.1.0" - sources."unique-string-1.0.0" - sources."write-file-atomic-2.3.0" sources."is-obj-1.0.1" - sources."crypto-random-string-1.0.0" - sources."imurmurhash-0.1.4" - sources."global-dirs-0.1.0" - sources."is-path-inside-1.0.0" - sources."ini-1.3.4" - sources."path-is-inside-1.0.2" - 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."semver-5.4.1" - sources."create-error-class-3.0.2" - sources."duplexer3-0.1.4" + sources."is-path-inside-1.0.1" + sources."is-plain-obj-1.1.0" sources."is-redirect-1.0.0" + sources."is-relative-0.2.1" sources."is-retry-allowed-1.1.0" - sources."lowercase-keys-1.0.0" + sources."is-stream-1.1.0" + sources."is-unc-path-0.1.2" + sources."is-windows-0.2.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-tokens-3.0.2" + sources."jspm-config-0.3.4" + sources."latest-version-3.1.0" + sources."listify-1.0.0" + sources."lockfile-1.0.3" + sources."log-update-1.0.2" + sources."loose-envify-1.3.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" + sources."make-dir-1.2.0" + sources."make-error-1.3.4" + sources."make-error-cause-1.2.2" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."nopt-1.0.10" + sources."npm-run-path-2.0.2" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" + sources."parse-json-2.2.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."pify-3.0.0" + sources."popsicle-9.2.0" + sources."popsicle-proxy-agent-3.0.0" + sources."popsicle-retry-3.2.1" + sources."popsicle-rewrite-1.0.0" + sources."popsicle-status-2.0.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."promise-finally-3.0.0" + sources."pseudomap-1.0.2" + sources."punycode-1.4.1" + (sources."rc-1.2.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-2.3.6" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."restore-cursor-1.0.1" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."semver-5.0.3" + sources."semver-diff-2.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slice-ansi-1.0.0" + sources."sort-keys-1.1.2" + sources."string-template-1.0.0" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + sources."term-size-1.2.0" + sources."thenify-3.3.0" + sources."throat-3.2.0" sources."timed-out-4.0.1" + sources."touch-1.0.0" + sources."tough-cookie-2.3.4" + sources."typedarray-0.0.6" + sources."typescript-2.8.1" + (sources."typings-core-2.3.3" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."unc-path-regex-0.1.2" + sources."unique-string-1.0.0" sources."unzip-response-2.0.1" + (sources."update-notifier-2.4.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" + sources."semver-5.5.0" + sources."supports-color-5.3.0" + ]; + }) sources."url-parse-lax-1.0.0" - sources."capture-stack-trace-1.0.0" - sources."prepend-http-1.0.4" - sources."rc-1.2.2" - sources."deep-extend-0.4.2" - sources."strip-json-comments-2.0.1" + sources."util-deprecate-1.0.2" + sources."wcwidth-1.0.1" + sources."which-1.3.0" + sources."widest-line-2.0.0" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + sources."zip-object-0.1.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Static file serving and directory listing"; - homepage = "https://github.com/zeit/serve#readme"; + description = "The TypeScript Definition Manager"; + homepage = https://github.com/typings/typings; license = "MIT"; }; production = true; + bypassCache = false; }; - shout = nodeEnv.buildNodePackage { - name = "shout"; - packageName = "shout"; - version = "0.53.0"; + uglify-js = nodeEnv.buildNodePackage { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.3.20"; src = fetchurl { - url = "https://registry.npmjs.org/shout/-/shout-0.53.0.tgz"; - sha1 = "13ebfcb3b741759d2475db96107776c81d308ae8"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz"; + sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js"; }; dependencies = [ - sources."bcrypt-nodejs-0.0.3" - sources."cheerio-0.17.0" - sources."commander-2.11.0" - sources."event-stream-3.3.4" - sources."express-4.16.2" - sources."lodash-2.4.2" - sources."mkdirp-0.5.1" - sources."moment-2.7.0" - sources."read-1.0.7" - sources."request-2.83.0" - sources."slate-irc-0.7.3" - (sources."socket.io-1.0.6" // { + sources."commander-2.15.1" + sources."source-map-0.6.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "JavaScript parser, mangler/compressor and beautifier toolkit"; + homepage = "https://github.com/mishoo/UglifyJS2#readme"; + license = "BSD-2-Clause"; + }; + production = true; + bypassCache = false; + }; + ungit = nodeEnv.buildNodePackage { + name = "ungit"; + packageName = "ungit"; + version = "1.4.18"; + src = fetchurl { + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.18.tgz"; + sha512 = "3mdb4qpdmm6n3c34z8pkrn3yx2nxyvqszw3rb24lcf8mbpbx2d534bpb3mcg2lg4lxsysijp652pkwbxd492sm7z9bz296r8cgppmqm"; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."accepts-1.3.5" + sources."after-0.8.2" + sources."ajv-5.5.2" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."array-flatten-1.1.1" + sources."arraybuffer.slice-0.0.7" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-2.6.0" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."backo2-1.0.2" + sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.5" + sources."base64id-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."better-assert-1.0.2" + sources."blob-0.0.4" + sources."bluebird-3.5.1" + sources."blueimp-md5-2.10.0" + (sources."body-parser-1.18.2" // { dependencies = [ - sources."commander-0.6.1" + sources."setprototypeof-1.0.3" ]; }) - sources."CSSselect-0.4.1" - sources."entities-1.1.1" - sources."htmlparser2-3.7.3" - sources."dom-serializer-0.0.1" - sources."CSSwhat-0.4.7" - sources."domutils-1.5.1" - sources."domelementtype-1.1.3" - sources."domhandler-2.2.1" - sources."readable-stream-1.1.14" - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."inherits-2.0.3" - sources."through-2.3.8" - sources."duplexer-0.1.1" - 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."accepts-1.3.4" - sources."array-flatten-1.1.1" - sources."body-parser-1.18.2" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" + sources."builtin-modules-1.1.1" + sources."builtins-1.0.3" + sources."bytes-3.0.0" + sources."callsite-1.0.0" + sources."camelcase-4.1.0" + sources."caseless-0.12.0" + sources."charenc-0.0.2" + (sources."cliui-4.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."clone-2.1.2" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."color-3.0.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."color-string-1.5.2" + sources."colors-1.0.3" + sources."combined-stream-0.0.7" + sources."component-bind-1.0.0" + sources."component-emitter-1.1.2" + sources."component-inherit-0.0.3" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" + sources."cookie-parser-1.4.3" sources."cookie-signature-1.0.6" - sources."debug-0.7.4" - sources."depd-1.1.1" - sources."encodeurl-1.0.1" + sources."cookiejar-2.0.1" + sources."core-util-is-1.0.2" + sources."crc-3.4.4" + sources."cross-spawn-5.1.0" + sources."crossroads-0.12.2" + sources."crypt-0.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."cycle-1.0.3" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."deep-extend-0.4.2" + sources."delayed-stream-0.0.5" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."diff-3.5.0" + (sources."diff2html-2.3.3" // { + dependencies = [ + sources."mkdirp-0.3.0" + ]; + }) + sources."eachr-3.2.0" + sources."ecc-jsbn-0.1.1" + sources."editions-1.3.4" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" + sources."engine.io-parser-2.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."finalhandler-1.1.0" - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."on-finished-2.3.0" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.2" - sources."qs-6.5.1" - sources."range-parser-1.2.0" - sources."safe-buffer-5.1.1" - sources."send-0.16.1" - sources."serve-static-1.13.1" - sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" - sources."type-is-1.6.15" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."mime-types-2.1.17" - sources."negotiator-0.6.1" - sources."mime-db-1.30.0" - sources."bytes-3.0.0" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."raw-body-2.3.2" - sources."unpipe-1.0.0" - sources."ms-2.0.0" - sources."ee-first-1.1.1" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.5.2" - sources."destroy-1.0.4" - sources."mime-1.4.1" - sources."media-typer-0.3.0" - sources."minimist-0.0.8" - sources."mute-stream-0.0.7" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" - sources."extend-3.0.1" + sources."eve-0.5.4" + sources."execa-0.7.0" + (sources."express-4.16.3" // { + dependencies = [ + sources."statuses-1.4.0" + ]; + }) + sources."express-session-1.15.6" + sources."extend-1.2.1" + sources."extract-opts-3.3.1" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."finalhandler-1.1.1" + sources."find-up-2.1.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-0.1.3" + sources."formidable-1.0.14" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-caller-file-1.0.2" + sources."get-stream-3.0.0" + sources."getmac-1.4.1" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" sources."har-validator-5.0.3" + sources."has-binary2-1.0.2" + sources."has-cors-1.1.0" + sources."has-unicode-2.0.1" + sources."hasher-1.2.0" sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."hogan.js-3.0.2" + sources."hosted-git-info-2.6.0" + sources."http-errors-1.6.3" sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."ignore-3.3.7" + sources."indexof-0.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."invert-kv-1.0.0" + sources."ipaddr.js-1.6.0" + sources."is-arrayish-0.3.1" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."isarray-0.0.1" + sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" + sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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."irc-replies-2.0.1" - sources."slate-irc-parser-0.0.2" - sources."linewise-0.0.3" - sources."engine.io-1.3.1" - sources."socket.io-parser-2.1.2" - sources."socket.io-client-1.0.6" - sources."socket.io-adapter-0.2.0" - sources."has-binary-data-0.1.1" - sources."ws-0.4.31" - sources."engine.io-parser-1.0.6" - sources."base64id-0.1.0" - sources."nan-0.3.2" - sources."tinycolor-0.0.1" - sources."options-0.0.6" - sources."base64-arraybuffer-0.1.2" - sources."after-0.8.1" - sources."arraybuffer.slice-0.0.6" - sources."blob-0.0.2" - sources."utf8-2.0.0" - sources."json3-3.2.6" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" - sources."indexof-0.0.1" - sources."engine.io-client-1.3.1" - sources."component-bind-1.0.0" - sources."component-emitter-1.1.2" - sources."object-component-0.0.3" - sources."parseuri-0.0.2" - sources."to-array-0.1.3" - sources."has-cors-1.0.3" - sources."xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" - sources."parsejson-0.0.1" - sources."parseqs-0.0.2" - sources."component-inherit-0.0.3" - sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" - sources."better-assert-1.0.2" - sources."callsite-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The self-hosted Web IRC client"; - homepage = "https://github.com/erming/shout#readme"; - license = "MIT"; - }; - production = true; - }; - sinopia = nodeEnv.buildNodePackage { - name = "sinopia"; - packageName = "sinopia"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sinopia/-/sinopia-1.4.0.tgz"; - sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; - }; - dependencies = [ - sources."express-5.0.0-alpha.6" - sources."express-json5-0.1.0" - sources."body-parser-1.18.2" - sources."compression-1.7.1" - sources."commander-2.11.0" - sources."js-yaml-3.10.0" - sources."cookies-0.7.1" - sources."request-2.83.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.12" // { + sources."just-detect-adblock-1.0.0" + (sources."keen.io-0.1.3" // { dependencies = [ - sources."minimatch-3.0.4" + sources."async-0.9.2" + sources."methods-1.0.1" + sources."mime-1.2.11" + sources."qs-1.2.0" + sources."superagent-0.21.0" ]; }) - (sources."handlebars-2.0.0" // { + sources."knockout-3.5.0-beta" + sources."lcid-1.0.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.5" + sources."lru-cache-4.1.2" + sources."md5-2.2.1" + sources."media-typer-0.3.0" + sources."mem-1.1.0" + (sources."memorystore-1.6.0" // { dependencies = [ - sources."async-0.2.10" + sources."debug-3.1.0" ]; }) - sources."highlight.js-8.9.1" - sources."lunr-0.7.2" - (sources."render-readme-1.3.1" // { + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."moment-2.22.0" + sources."ms-2.0.0" + sources."negotiator-0.6.1" + sources."node-cache-4.2.0" + sources."nopt-1.0.10" + sources."normalize-package-data-2.4.0" + sources."npm-6.0.0-next.0" + sources."npm-package-arg-6.0.0" + (sources."npm-registry-client-8.5.1" // { dependencies = [ - sources."readable-stream-2.3.3" + sources."combined-stream-1.0.6" + sources."delayed-stream-1.0.0" + sources."extend-3.0.1" + sources."form-data-2.3.2" + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) - sources."jju-1.3.0" - sources."JSONStream-1.3.1" - sources."mkdirp-0.5.1" - sources."sinopia-htpasswd-0.4.5" - sources."http-errors-1.6.2" - sources."readable-stream-1.1.14" - sources."fs-ext-0.6.0" - sources."crypt3-0.2.0" - sources."accepts-1.3.4" - sources."array-flatten-2.1.1" - sources."content-disposition-0.5.2" - sources."content-type-1.0.4" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."debug-2.6.9" - sources."depd-1.1.1" - sources."encodeurl-1.0.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."finalhandler-1.0.6" - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" + sources."npm-run-path-2.0.2" + sources."npmlog-4.1.2" + sources."nprogress-0.2.0" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."object-component-0.0.3" + sources."octicons-3.5.0" sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."once-1.4.0" + sources."open-0.0.5" + sources."os-homedir-1.0.2" + sources."os-locale-2.1.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-finally-1.0.0" + sources."p-limit-1.2.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" sources."parseurl-1.3.2" + sources."passport-0.4.0" + sources."passport-local-1.0.0" + sources."passport-strategy-1.0.0" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.5" + sources."pause-0.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" + sources."pseudomap-1.0.2" + sources."punycode-1.4.1" sources."qs-6.5.1" + sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - sources."router-1.3.2" - sources."send-0.15.6" - sources."serve-static-1.12.6" - sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" - sources."type-is-1.6.15" + (sources."raven-2.4.2" // { + dependencies = [ + sources."uuid-3.0.0" + ]; + }) + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + (sources."rc-1.2.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-1.0.27-1" + sources."reduce-component-1.0.1" + sources."request-2.85.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."retry-0.10.1" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."signals-1.0.0" + sources."simple-swizzle-0.2.2" + sources."slide-1.1.6" + sources."snapsvg-0.5.1" + sources."sntp-2.1.0" + (sources."socket.io-2.1.0" // { + dependencies = [ + sources."component-emitter-1.2.1" + sources."debug-3.1.0" + sources."isarray-2.0.1" + ]; + }) + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.1.0" + sources."socket.io-parser-3.2.0" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."sshpk-1.14.1" + sources."ssri-5.3.0" + sources."stack-trace-0.0.9" + sources."statuses-1.5.0" + sources."string-width-1.0.2" + sources."string_decoder-0.10.31" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + (sources."superagent-3.8.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."debug-3.1.0" + sources."delayed-stream-1.0.0" + sources."extend-3.0.1" + sources."form-data-2.3.2" + sources."formidable-1.2.1" + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + (sources."temp-0.8.3" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) + sources."timed-out-4.0.1" + sources."to-array-0.1.4" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.16" + sources."typechecker-4.5.0" + sources."typedarray-0.0.6" + sources."uid-safe-2.1.5" + sources."ultron-1.1.1" + sources."underscore-1.5.2" + sources."unpipe-1.0.0" + sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" + sources."uuid-3.2.1" + sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" - sources."mime-types-2.1.17" - sources."negotiator-0.6.1" - sources."mime-db-1.30.0" - sources."ms-2.0.0" - sources."unpipe-1.0.0" - sources."ee-first-1.1.1" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.4.0" - sources."destroy-1.0.4" - sources."mime-1.3.4" - sources."media-typer-0.3.0" - sources."raw-body-2.3.2" - sources."bytes-3.0.0" - sources."iconv-lite-0.4.19" - sources."compressible-2.0.12" - sources."on-headers-1.0.1" - sources."safe-buffer-5.1.1" - sources."argparse-1.0.9" + sources."verror-1.10.0" + sources."whatwg-fetch-2.0.4" + sources."which-1.3.0" + sources."which-module-2.0.0" + sources."wide-align-1.1.2" + (sources."winston-2.4.1" // { + dependencies = [ + sources."async-1.0.0" + ]; + }) + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-3.3.3" + sources."xmlhttprequest-ssl-1.5.5" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + (sources."yargs-11.1.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."yargs-parser-9.0.2" + sources."yeast-0.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Git made easy"; + homepage = "https://github.com/FredrikNoren/ungit#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + vue-cli = nodeEnv.buildNodePackage { + name = "vue-cli"; + packageName = "vue-cli"; + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.3.tgz"; + sha512 = "1wljsr8srayqg7crbbczi00v31q3dxm3vz4fjcdqasdgsm1ajc9gham6sinsxlraniwg4dn5b1kmpw0nln63cy3v02vib07shyvq2ki"; + }; + dependencies = [ + sources."absolute-0.0.1" + sources."ajv-5.5.2" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-escapes-3.1.0" + sources."ansi-red-0.1.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."ansi-wrap-0.1.0" + sources."argparse-1.0.10" + sources."array-differ-1.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-2.6.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bcrypt-pbkdf-1.0.1" + sources."bl-1.2.2" + sources."bluebird-3.5.1" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."buffer-3.6.0" + sources."buffer-crc32-0.2.13" + sources."builtins-1.0.3" + sources."camelcase-1.2.1" + sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" + (sources."caw-2.0.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."center-align-0.1.3" + sources."chalk-2.3.2" + sources."chardet-0.4.2" + sources."cli-cursor-2.1.0" + sources."cli-spinners-1.3.1" + sources."cli-width-2.2.0" + sources."cliui-2.1.0" + sources."clone-1.0.4" + sources."co-3.1.0" + sources."co-from-stream-0.0.0" + sources."co-fs-extra-1.2.1" + sources."co-read-0.0.1" + sources."coffee-script-1.12.7" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."config-chain-1.1.11" + sources."consolidate-0.14.5" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."decamelize-1.2.0" + (sources."decompress-4.2.0" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + ]; + }) + sources."decompress-tar-4.1.1" + sources."decompress-tarbz2-4.1.1" + sources."decompress-targz-4.1.1" + sources."decompress-unzip-4.0.1" + sources."delayed-stream-1.0.0" + (sources."download-5.0.3" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."download-git-repo-1.0.2" // { + dependencies = [ + sources."commander-2.8.1" + sources."file-type-6.2.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.1" + sources."enable-1.3.2" + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" sources."esprima-4.0.0" - sources."sprintf-js-1.0.3" - sources."keygrip-1.0.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" sources."extend-3.0.1" + sources."extend-shallow-2.0.1" + sources."external-editor-2.2.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.0.1" + sources."figures-2.0.0" + sources."file-type-5.2.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.1" + sources."form-data-2.3.2" + sources."fs-extra-0.26.7" + sources."fs.realpath-1.0.0" + sources."get-proxy-2.1.0" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."git-clone-0.1.0" + sources."glob-7.1.2" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + sources."gray-matter-2.1.1" + (sources."handlebars-4.0.11" // { + dependencies = [ + sources."async-1.5.2" + sources."wordwrap-0.0.2" + ]; + }) + sources."har-schema-2.0.0" sources."har-validator-5.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-generators-1.0.1" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" sources."hawk-6.0.2" + sources."hoek-4.2.1" sources."http-signature-1.2.0" + sources."iconv-lite-0.4.21" + sources."ieee754-1.1.11" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-3.3.0" + sources."is-3.2.1" + sources."is-buffer-1.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-natural-number-4.0.1" + sources."is-object-1.0.1" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" sources."isstream-0.1.2" + sources."isurl-1.0.0" + sources."js-yaml-3.11.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."klaw-1.3.1" + sources."lazy-cache-1.0.4" + sources."lodash-4.17.5" + sources."log-symbols-2.2.0" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + (sources."make-dir-1.2.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + (sources."metalsmith-2.3.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."multimatch-2.1.0" + sources."mute-stream-0.0.7" + sources."npm-conf-1.1.3" sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optimist-0.6.1" + sources."ora-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."read-metadata-1.0.0" + sources."readable-stream-2.3.6" + sources."recursive-readdir-2.2.2" + sources."repeat-string-1.6.1" + (sources."request-2.85.0" // { + dependencies = [ + sources."co-4.6.0" + ]; + }) + sources."restore-cursor-2.0.0" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."seek-bzip-1.0.5" + sources."semver-5.5.0" + sources."signal-exit-3.0.2" + sources."sntp-2.1.0" + sources."source-map-0.4.4" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.1" + sources."stat-mode-0.2.2" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" + sources."strip-ansi-4.0.0" + sources."strip-dirs-2.1.0" + sources."strip-outer-1.0.1" + sources."supports-color-5.3.0" + sources."tar-stream-1.5.5" + sources."through-2.3.8" + sources."thunkify-2.1.2" + sources."thunkify-wrap-1.0.4" + sources."tildify-1.2.0" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."toml-2.3.3" + sources."tough-cookie-2.3.4" + sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."core-util-is-1.0.2" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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."lru-cache-2.7.3" - sources."sigmund-1.0.1" - sources."dtrace-provider-0.8.5" - sources."mv-2.1.1" - sources."safe-json-stringify-1.0.4" - sources."moment-2.19.2" - sources."nan-2.7.0" - sources."ncp-2.0.0" - sources."rimraf-2.4.5" - sources."glob-6.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.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."optimist-0.3.7" - sources."uglify-js-2.3.6" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uid-0.0.2" + sources."unbzip2-stream-1.2.5" + sources."unyield-0.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."url-to-options-1.0.1" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" + sources."ware-1.3.0" + sources."win-fork-1.1.1" + sources."window-size-0.1.0" sources."wordwrap-0.0.3" - sources."source-map-0.1.43" - sources."amdefine-1.0.1" - sources."markdown-it-4.4.0" - sources."sanitize-html-1.15.0" - sources."entities-1.1.1" - sources."linkify-it-1.2.4" - sources."mdurl-1.0.1" - sources."uc.micro-1.0.3" - sources."htmlparser2-3.9.2" - sources."lodash.escaperegexp-4.1.2" - sources."srcset-1.0.0" + sources."wrap-fn-0.1.5" + sources."wrappy-1.0.2" sources."xtend-4.0.1" - sources."domelementtype-1.1.3" - sources."domhandler-2.4.1" - sources."domutils-1.6.2" - sources."dom-serializer-0.1.0" - sources."isarray-0.0.1" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - sources."array-uniq-1.0.3" - sources."number-is-nan-1.0.1" - sources."jsonparse-1.3.1" - sources."through-2.3.8" - sources."minimist-0.0.8" + sources."yaml-js-0.0.8" + sources."yargs-3.10.0" + sources."yauzl-2.9.1" ]; buildInputs = globalBuildInputs; meta = { - description = "Private npm repository server"; - homepage = https://github.com/rlidwka/sinopia; - license = { - type = "WTFPL"; - url = "http://www.wtfpl.net/txt/copying/"; - }; + description = "A simple CLI for scaffolding Vue.js projects."; + homepage = "https://github.com/vuejs/vue-cli#readme"; + license = "MIT"; }; production = true; + bypassCache = false; }; - sloc = nodeEnv.buildNodePackage { - name = "sloc"; - packageName = "sloc"; - version = "0.2.0"; + webdrvr = nodeEnv.buildNodePackage { + name = "webdrvr"; + packageName = "webdrvr"; + version = "2.43.0-1"; src = fetchurl { - url = "https://registry.npmjs.org/sloc/-/sloc-0.2.0.tgz"; - sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; + url = "https://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-1.tgz"; + sha1 = "17c442b94c0a6a3a68293d6ea4deb408f8cb9225"; }; dependencies = [ - sources."async-2.1.5" - sources."cli-table-0.3.1" - sources."commander-2.9.0" - sources."readdirp-2.1.0" - sources."lodash-4.17.4" - sources."colors-1.0.3" - sources."graceful-readlink-1.0.1" - sources."graceful-fs-4.1.11" - sources."minimatch-3.0.4" - sources."readable-stream-2.3.3" - sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.8" + sources."abbrev-1.1.1" + sources."adm-zip-0.4.7" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."async-2.6.0" + sources."aws-sign2-0.6.0" sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."bl-1.0.3" + sources."boom-2.10.1" + sources."brace-expansion-1.1.11" + sources."caseless-0.11.0" + sources."chalk-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" sources."concat-map-0.0.1" + sources."concat-stream-1.5.0" + (sources."config-chain-1.1.11" // { + dependencies = [ + sources."ini-1.3.5" + ]; + }) sources."core-util-is-1.0.2" + sources."cryptiles-2.0.5" + sources."dashdash-1.14.1" + sources."debug-0.7.4" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."escape-string-regexp-1.0.5" + sources."extend-3.0.1" + sources."extract-zip-1.5.0" + sources."extsprintf-1.3.0" + sources."fd-slicer-1.0.1" + sources."follow-redirects-0.0.3" + sources."forever-agent-0.6.1" + sources."form-data-1.0.1" + sources."fs-extra-0.26.7" + sources."fs.realpath-1.0.0" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."har-validator-2.0.6" + sources."has-ansi-2.0.0" + sources."hasha-2.2.0" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" + sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.1.0" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" + sources."is-property-1.0.2" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsonpointer-4.0.1" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."kew-0.1.7" + sources."klaw-1.3.1" + sources."lodash-4.17.5" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.3.5" + sources."node-uuid-1.4.8" + sources."nopt-2.2.1" + sources."npmconf-0.1.16" + sources."oauth-sign-0.8.2" + sources."once-1.3.3" + sources."os-tmpdir-1.0.2" + sources."osenv-0.0.3" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + (sources."phantomjs-1.9.20" // { + dependencies = [ + sources."kew-0.7.0" + sources."mkdirp-0.5.0" + ]; + }) + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" + sources."progress-1.1.8" + sources."proto-list-1.2.4" + sources."qs-5.2.1" + sources."readable-stream-2.0.6" + sources."request-2.67.0" + sources."request-progress-2.0.1" + sources."rimraf-2.6.2" + sources."semver-2.3.2" + sources."sntp-1.0.9" + (sources."sshpk-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."string_decoder-0.10.31" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."throttleit-1.0.0" + sources."tmp-0.0.33" + sources."tough-cookie-2.2.2" + sources."tunnel-agent-0.4.3" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."underscore-1.8.3" sources."util-deprecate-1.0.2" + sources."verror-1.10.0" + sources."which-1.2.14" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; meta = { - description = "sloc is a simple tool to count SLOC (source lines of code)"; - homepage = "https://github.com/flosse/sloc#readme"; + description = "NPM wrapper for Selenium Webdriver including Chromedriver / IEDriver / IOSDriver / Ghostdriver"; + homepage = https://github.com/uxebu/webdrvr; license = "MIT"; }; production = true; + bypassCache = false; }; - smartdc = nodeEnv.buildNodePackage { - name = "smartdc"; - packageName = "smartdc"; - version = "8.1.0"; + webpack = nodeEnv.buildNodePackage { + name = "webpack"; + packageName = "webpack"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/smartdc/-/smartdc-8.1.0.tgz"; - sha1 = "c8dba4694307a0070b84a67ced76da6de73f3585"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.5.0.tgz"; + sha512 = "3m4zqjmw0byxpxxx35zfrpng2sawkk71mna6b7b5vx1ba534kvsrs3i6332vz7m0dskp9k8ywqv545kg8x7xnv8xvl6x709yjrdjsp8"; }; dependencies = [ - sources."assert-plus-0.1.5" - sources."lru-cache-2.2.0" - sources."nopt-2.0.0" - (sources."restify-4.0.3" // { + sources."acorn-5.5.3" + sources."acorn-dynamic-import-3.0.0" + sources."ajv-6.4.0" + sources."ajv-keywords-3.1.0" + sources."anymatch-2.0.0" + sources."aproba-1.2.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."asn1.js-4.10.1" + sources."assert-1.4.1" + sources."assign-symbols-1.0.0" + sources."async-each-1.0.1" + sources."atob-2.1.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { dependencies = [ - sources."lru-cache-2.7.3" - sources."vasync-1.6.3" - sources."assert-plus-1.0.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-extendable-1.0.1" + sources."kind-of-3.2.2" + ]; + }) + sources."base64-js-1.2.3" + sources."big.js-3.2.0" + sources."binary-extensions-1.11.0" + sources."bluebird-3.5.1" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-3.2.2" + ]; + }) + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.0" + sources."browserify-des-1.0.0" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."buffer-4.9.1" + sources."buffer-from-1.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" + sources."cacache-10.0.4" + sources."cache-base-1.0.1" + sources."chokidar-2.0.3" + sources."chownr-1.0.1" + sources."chrome-trace-event-0.1.2" + sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."collection-visit-1.0.0" + sources."commander-2.14.1" + sources."commondir-1.0.1" + sources."component-emitter-1.2.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" + sources."crypto-browserify-3.12.0" + sources."cyclist-0.2.2" + sources."date-now-0.1.4" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" + sources."des.js-1.0.0" + sources."diffie-hellman-5.0.2" + sources."domain-browser-1.2.0" + sources."duplexify-3.5.4" + sources."elliptic-6.4.0" + sources."emojis-list-2.1.0" + sources."end-of-stream-1.4.1" + sources."enhanced-resolve-4.0.0" + sources."errno-0.1.7" + sources."eslint-scope-3.7.1" + sources."esrecurse-4.2.1" + sources."estraverse-4.2.0" + sources."events-1.1.1" + sources."evp_bytestokey-1.0.3" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" + ]; + }) + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fill-range-4.0.0" + sources."find-cache-dir-1.0.0" + sources."find-up-2.1.0" + sources."flush-write-stream-1.0.3" + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + sources."from2-2.3.0" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.3" + sources."get-value-2.0.6" + sources."glob-7.1.2" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."graceful-fs-4.1.11" + sources."has-value-1.0.0" + sources."has-values-1.0.0" + sources."hash-base-3.0.4" + sources."hash.js-1.1.3" + sources."hmac-drbg-1.0.1" + sources."https-browserify-1.0.0" + sources."ieee754-1.1.11" + sources."iferr-0.1.5" + sources."imurmurhash-0.1.4" + sources."indexof-0.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.0" + sources."is-number-3.0.0" + sources."is-odd-2.0.0" + sources."is-plain-object-2.0.4" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isobject-3.0.1" + sources."json-schema-traverse-0.3.1" + sources."json5-0.5.1" + sources."kind-of-6.0.2" + sources."loader-runner-2.3.0" + sources."loader-utils-1.1.0" + sources."locate-path-2.0.0" + sources."lru-cache-4.1.2" + sources."make-dir-1.2.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."md5.js-1.3.4" + sources."memory-fs-0.4.1" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + sources."is-number-4.0.0" + ]; + }) + sources."miller-rabin-4.0.1" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mississippi-2.0.0" + sources."mixin-deep-1.3.1" + sources."mkdirp-0.5.1" + sources."move-concurrently-1.0.1" + sources."ms-2.0.0" + sources."nan-2.10.0" + sources."nanomatch-1.2.9" + sources."neo-async-2.5.0" + (sources."node-libs-browser-2.1.0" // { + dependencies = [ + sources."hash-base-2.0.2" + sources."inherits-2.0.1" + sources."punycode-1.4.1" + ]; + }) + sources."normalize-path-2.1.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."os-browserify-0.3.0" + sources."p-limit-1.2.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."pako-1.0.6" + sources."parallel-transform-1.1.0" + sources."parse-asn1-5.1.0" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.0" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."pbkdf2-3.0.14" + sources."pify-3.0.0" + sources."pkg-dir-2.0.0" + sources."posix-character-classes-0.1.1" + sources."process-0.11.10" + sources."process-nextick-args-2.0.0" + sources."promise-inflight-1.0.1" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."public-encrypt-4.0.0" + sources."pump-2.0.1" + sources."pumpify-1.4.0" + sources."punycode-2.1.0" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.0.6" + sources."randomfill-1.0.4" + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."regex-not-1.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."rimraf-2.6.2" + sources."ripemd160-2.0.1" + sources."run-queue-1.0.3" + sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" + sources."schema-utils-0.4.5" + sources."serialize-javascript-1.4.0" + sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.0" + sources."setimmediate-1.0.5" + sources."sha.js-2.4.11" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-list-map-2.0.0" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + ]; + }) + sources."ssri-5.3.0" + sources."static-extend-0.1.2" + sources."stream-browserify-2.0.1" + sources."stream-each-1.2.2" + sources."stream-http-2.8.1" + sources."stream-shift-1.0.0" + sources."string_decoder-1.1.1" + sources."tapable-1.0.0" + sources."through2-2.0.3" + sources."timers-browserify-2.0.6" + sources."to-arraybuffer-1.0.1" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."tty-browserify-0.0.0" + sources."typedarray-0.0.6" + sources."uglify-es-3.3.10" + (sources."uglifyjs-webpack-plugin-1.2.4" // { + dependencies = [ + sources."source-map-0.6.1" ]; }) - sources."bunyan-1.5.1" - sources."clone-0.1.6" - (sources."smartdc-auth-2.3.1" // { + (sources."union-value-1.0.0" // { dependencies = [ - sources."assert-plus-0.1.2" - sources."clone-0.1.5" - sources."dashdash-1.10.1" - sources."vasync-1.4.3" + sources."set-value-0.4.3" ]; }) - (sources."cmdln-3.2.1" // { + sources."unique-filename-1.1.0" + sources."unique-slug-2.0.0" + (sources."unset-value-1.0.0" // { dependencies = [ - sources."assert-plus-1.0.0" + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) ]; }) - sources."dashdash-1.7.3" - sources."vasync-1.6.2" - sources."abbrev-1.1.1" - sources."backoff-2.5.0" - sources."csv-0.4.6" - sources."escape-regexp-component-1.0.2" - sources."formidable-1.1.1" - (sources."http-signature-1.2.0" // { + sources."upath-1.0.4" + sources."uri-js-3.0.2" + sources."urix-0.1.0" + (sources."url-0.11.0" // { dependencies = [ - sources."assert-plus-1.0.0" + sources."punycode-1.3.2" ]; }) - sources."keep-alive-agent-0.0.1" - sources."mime-1.4.1" - sources."negotiator-0.5.3" - sources."node-uuid-1.4.8" - sources."once-1.3.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.1.0" - sources."dtrace-provider-0.6.0" - sources."precond-0.2.3" - sources."csv-generate-0.0.6" - sources."csv-parse-1.3.3" - sources."stream-transform-0.1.2" - sources."csv-stringify-0.0.8" - sources."asn1-0.2.3" - sources."ctype-0.5.3" - sources."wrappy-1.0.2" - sources."extsprintf-1.0.0" - sources."core-util-is-1.0.2" - sources."nan-2.7.0" - sources."mv-2.1.1" - sources."safe-json-stringify-1.0.4" - sources."mkdirp-0.5.1" - sources."ncp-2.0.0" - sources."rimraf-2.4.5" - sources."minimist-0.0.8" - sources."glob-6.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."minimatch-3.0.4" - sources."path-is-absolute-1.0.1" - 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."use-3.1.0" // { dependencies = [ - sources."assert-plus-0.1.5" + sources."kind-of-6.0.2" ]; }) - (sources."sshpk-1.7.1" // { + sources."util-0.10.3" + sources."util-deprecate-1.0.2" + sources."vm-browserify-0.0.4" + sources."watchpack-1.5.0" + (sources."webpack-sources-1.1.0" // { dependencies = [ - sources."assert-plus-0.2.0" + sources."source-map-0.6.1" ]; }) - sources."jsprim-0.3.0" - sources."json-schema-0.2.2" - sources."readable-stream-2.3.3" - 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."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Client SDK and CLI for the Joyent SmartDataCenter API"; - homepage = "https://github.com/joyent/node-smartdc#readme"; - }; - production = true; - }; - "socket.io" = nodeEnv.buildNodePackage { - name = "socket.io"; - packageName = "socket.io"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; - sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; - }; - dependencies = [ - sources."debug-2.6.9" - sources."engine.io-3.1.4" - sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.4" - sources."socket.io-parser-3.1.2" - sources."ms-2.0.0" - sources."accepts-1.3.3" - sources."base64id-1.0.0" - sources."engine.io-parser-2.1.1" - sources."ws-3.3.1" - sources."cookie-0.3.1" - sources."uws-0.14.5" - sources."mime-types-2.1.17" - sources."negotiator-0.6.1" - sources."mime-db-1.30.0" - sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" - sources."base64-arraybuffer-0.1.5" - sources."blob-0.0.4" - sources."has-binary2-1.0.2" - sources."isarray-2.0.1" - sources."async-limiter-1.0.0" - sources."safe-buffer-5.1.1" - sources."ultron-1.1.0" - sources."backo2-1.0.2" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."engine.io-client-3.1.4" - sources."has-cors-1.1.0" - sources."indexof-0.0.1" - sources."object-component-0.0.3" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" - sources."to-array-0.1.4" - sources."component-inherit-0.0.3" - sources."xmlhttprequest-ssl-1.5.4" - sources."yeast-0.1.2" - sources."better-assert-1.0.2" - sources."callsite-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "node.js realtime framework server"; - homepage = "https://github.com/socketio/socket.io#readme"; - license = "MIT"; - }; - production = true; - }; - statsd = nodeEnv.buildNodePackage { - name = "statsd"; - packageName = "statsd"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz"; - sha1 = "92041479e174a214df7147f2fab1348af0839052"; - }; - dependencies = [ - sources."generic-pool-2.2.0" - sources."modern-syslog-1.1.2" - sources."hashring-3.2.0" - sources."winser-0.1.6" - sources."nan-2.7.0" - sources."connection-parse-0.0.7" - sources."simple-lru-cache-0.0.2" - sources."sequence-2.2.1" - sources."commander-1.3.1" - sources."keypress-0.1.0" + sources."worker-farm-1.6.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."y18n-4.0.0" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Network daemon for the collection and aggregation of realtime application metrics"; - homepage = https://github.com/etsy/statsd; + description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; + homepage = https://github.com/webpack/webpack; license = "MIT"; }; production = true; + bypassCache = false; }; - stylus = nodeEnv.buildNodePackage { - name = "stylus"; - packageName = "stylus"; - version = "0.54.5"; + webtorrent-cli = nodeEnv.buildNodePackage { + name = "webtorrent-cli"; + packageName = "webtorrent-cli"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz"; - sha1 = "42b9560931ca7090ce8515a798ba9e6aa3d6dc79"; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.11.0.tgz"; + sha512 = "04agjsk7s1fdmiy195shkjqxswpkadyg08vgj4pqxpwy6d5d4kbngz3gmg9vvnm2z9hi2sdc6ryx0r59nws7xjkifi3grzfkxzz1c06"; }; dependencies = [ - sources."css-parse-1.7.0" - sources."mkdirp-0.5.1" - sources."debug-3.1.0" - sources."sax-0.5.8" - sources."glob-7.0.6" - sources."source-map-0.1.43" - sources."minimist-0.0.8" - sources."ms-2.0.0" + sources."addr-to-ip-port-1.4.3" + (sources."airplay-js-0.3.0" // { + dependencies = [ + sources."semver-5.1.1" + sources."xmlbuilder-0.4.3" + ]; + }) + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."ascli-0.3.0" + sources."async-limiter-1.0.0" + sources."balanced-match-1.0.0" + sources."bencode-2.0.0" + sources."binary-search-1.3.3" + sources."bindings-1.3.0" + sources."bitfield-2.0.0" + sources."bittorrent-dht-8.2.0" + sources."bittorrent-peerid-1.2.0" + sources."bittorrent-protocol-2.4.0" + sources."bittorrent-tracker-9.7.0" + sources."bl-1.2.2" + sources."blob-to-buffer-1.2.7" + sources."block-stream2-1.1.0" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.11" + sources."browserify-package-json-1.0.1" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" + sources."buffer-indexof-1.1.1" + sources."bufferutil-3.0.4" + sources."bufferview-1.0.1" + sources."bytebuffer-3.5.5" + sources."castv2-0.1.9" + sources."castv2-client-1.2.0" + sources."chownr-1.0.1" + sources."chromecasts-1.9.1" + sources."chunk-store-stream-2.1.0" + sources."clivas-0.2.0" + sources."closest-to-2.0.0" + sources."code-point-at-1.1.0" + sources."colour-0.7.1" + sources."compact2string-1.4.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."create-torrent-3.30.0" + sources."debug-2.6.9" + sources."decompress-response-3.3.0" + sources."deep-extend-0.4.2" + sources."defined-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."dlnacasts-0.1.0" + sources."dns-packet-1.3.1" + sources."dns-txt-2.0.2" + sources."ecstatic-3.2.0" + sources."elementtree-0.1.7" + sources."end-of-stream-1.4.1" + sources."executable-4.1.1" + sources."expand-template-1.1.0" + sources."filestream-4.1.3" + sources."flatten-1.0.2" + sources."fs-chunk-store-1.7.0" sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-browser-rtc-1.0.2" + sources."get-stdin-5.0.1" + sources."github-from-package-0.0.0" + sources."glob-7.1.2" + sources."has-unicode-2.0.1" + sources."he-1.1.1" + sources."immediate-chunk-store-1.0.8" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ip-1.1.5" + sources."ip-set-1.0.1" + sources."ipaddr.js-1.7.0" + sources."is-ascii-1.0.0" + sources."is-file-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."junk-2.1.0" + sources."k-bucket-4.0.0" + sources."k-rpc-4.3.1" + sources."k-rpc-socket-1.8.0" + sources."last-one-wins-1.0.4" + sources."load-ip-set-1.3.1" + sources."long-2.4.0" + sources."lru-3.1.0" + sources."magnet-uri-5.1.7" + sources."mdns-js-0.5.0" + sources."mdns-js-packet-0.2.0" + sources."mediasource-2.1.3" + sources."memory-chunk-store-1.3.0" + sources."mime-1.6.0" + sources."mimic-response-1.0.0" 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."amdefine-1.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Robust, expressive, and feature-rich CSS superset"; - homepage = https://github.com/stylus/stylus; - license = "MIT"; - }; - production = true; - }; - svgo = nodeEnv.buildNodePackage { - name = "svgo"; - packageName = "svgo"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.0.3.tgz"; - sha512 = "1f9s0zk5rrb842w5gibjarlc9qw8bmjcxnbxc8jjn8is4d6c9l66ajwvifw87yx3pis6dcinyjwvvkxvzpyp326nl72vjv9rw5ndxnp"; - }; - dependencies = [ - sources."coa-2.0.0" - sources."colors-1.1.2" - sources."css-url-regex-1.1.0" - sources."unquote-1.1.0" + sources."minimist-1.2.0" sources."mkdirp-0.5.1" - sources."css-select-1.3.0-rc0" - sources."css-select-base-adapter-0.1.0" - sources."css-tree-1.0.0-alpha25" - sources."csso-3.4.0" - sources."js-yaml-3.10.0" - sources."object.values-1.0.4" - sources."sax-1.2.4" - sources."stable-0.1.6" - sources."util.promisify-1.0.0" - sources."q-1.5.1" - sources."minimist-0.0.8" - sources."boolbase-1.0.0" - sources."css-what-2.1.0" - sources."domutils-1.5.1" - sources."nth-check-1.0.1" - sources."dom-serializer-0.1.0" - sources."domelementtype-1.1.3" - sources."entities-1.1.1" - sources."mdn-data-1.0.0" - sources."source-map-0.5.7" - sources."argparse-1.0.9" - sources."esprima-4.0.0" - sources."sprintf-js-1.0.3" - sources."define-properties-1.1.2" - sources."es-abstract-1.9.0" - sources."has-1.0.1" - sources."function-bind-1.1.1" - sources."foreach-2.0.5" - sources."object-keys-1.0.11" - sources."es-to-primitive-1.1.1" - sources."is-callable-1.1.3" - sources."is-regex-1.0.4" - sources."is-date-object-1.0.1" - sources."is-symbol-1.0.1" - sources."object.getownpropertydescriptors-2.0.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = https://github.com/svg/svgo; - license = "MIT"; - }; - production = true; - }; - tern = nodeEnv.buildNodePackage { - name = "tern"; - packageName = "tern"; - version = "0.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tern/-/tern-0.21.0.tgz"; - sha1 = "809c87a826e112494398cf8894f7c2d1b3464eb7"; - }; - dependencies = [ - sources."acorn-4.0.13" - sources."enhanced-resolve-2.3.0" - sources."glob-7.1.2" - sources."minimatch-3.0.4" - sources."resolve-from-2.0.0" - sources."tapable-0.2.8" - sources."memory-fs-0.3.0" - sources."graceful-fs-4.1.11" + sources."moment-2.22.0" + sources."mp4-box-encoding-1.1.3" + sources."mp4-stream-2.0.3" + sources."ms-2.0.0" + (sources."multicast-dns-6.2.3" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) + sources."multistream-2.1.0" + sources."nan-2.10.0" + sources."netmask-1.0.6" + sources."network-address-1.1.2" + sources."next-event-1.0.0" + sources."node-abi-2.3.0" + sources."node-ssdp-2.9.1" + sources."nodebmc-0.0.7" + sources."noop-logger-0.1.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" - sources."errno-0.1.4" - sources."readable-stream-2.3.3" - sources."prr-0.0.0" - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.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."open-0.0.5" + sources."optjs-3.2.2" + sources."os-homedir-1.0.2" + sources."package-json-versionify-1.0.4" + sources."parse-torrent-5.8.3" + sources."parse-torrent-file-4.1.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" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A JavaScript code analyzer for deep, cross-editor language support"; - homepage = "https://github.com/ternjs/tern#readme"; - license = "MIT"; - }; - production = true; - }; - typescript = nodeEnv.buildNodePackage { - name = "typescript"; - packageName = "typescript"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz"; - sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "TypeScript is a language for application scale JavaScript development"; - homepage = http://typescriptlang.org/; - license = "Apache-2.0"; - }; - production = true; - }; - typings = nodeEnv.buildNodePackage { - name = "typings"; - packageName = "typings"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/typings/-/typings-2.1.1.tgz"; - sha1 = "bacc69d255970a478e09f76c7f689975d535a78a"; - }; - dependencies = [ - sources."archy-1.0.0" - sources."bluebird-3.5.1" - sources."chalk-1.1.3" - sources."cli-truncate-1.1.0" - sources."columnify-1.5.4" - sources."elegant-spinner-1.0.1" - sources."has-unicode-2.0.1" - sources."listify-1.0.0" - sources."log-update-1.0.2" - sources."minimist-1.2.0" - sources."promise-finally-3.0.0" - (sources."typings-core-2.3.3" // { + sources."piece-length-1.0.0" + sources."pify-2.3.0" + sources."plist-with-patches-0.5.1" + sources."prebuild-install-2.5.1" + sources."prettier-bytes-1.0.4" + sources."process-nextick-args-2.0.0" + sources."protobufjs-3.8.2" + sources."pump-3.0.0" + sources."qap-3.3.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" + sources."random-iterate-1.0.1" + sources."randombytes-2.0.6" + sources."range-parser-1.2.0" + sources."range-slice-stream-1.2.0" + sources."rc-1.2.6" + sources."readable-stream-2.3.6" + sources."record-cache-1.0.1" + (sources."render-media-2.12.0" // { dependencies = [ - sources."minimist-1.2.0" + sources."pump-1.0.3" ]; }) - (sources."update-notifier-2.3.0" // { + sources."rimraf-2.6.2" + sources."run-parallel-1.1.8" + sources."run-parallel-limit-1.0.4" + sources."run-series-1.1.6" + sources."rusha-0.8.13" + sources."safe-buffer-5.1.1" + sources."sax-1.1.4" + sources."semver-5.5.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."simple-concat-1.0.0" + sources."simple-get-2.7.0" + sources."simple-peer-9.0.0" + sources."simple-sha1-2.1.0" + (sources."simple-websocket-7.0.2" // { dependencies = [ - sources."chalk-2.3.0" + sources."ws-4.1.0" ]; }) - sources."wordwrap-1.0.0" - sources."xtend-4.0.1" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-4.5.0" - sources."ansi-regex-2.1.1" - sources."slice-ansi-1.0.0" + sources."speedometer-1.0.0" + sources."split-1.0.1" + sources."stream-to-blob-1.0.0" + sources."stream-to-blob-url-2.1.0" + sources."stream-with-known-length-to-buffer-1.0.1" sources."string-width-1.0.2" - sources."is-fullwidth-code-point-1.0.0" - sources."wcwidth-1.0.1" - sources."defaults-1.0.3" - sources."clone-1.0.3" - 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."array-uniq-1.0.3" - sources."configstore-3.1.1" - sources."debug-2.6.9" - sources."detect-indent-5.0.0" - sources."graceful-fs-4.1.11" - sources."has-1.0.1" - sources."invariant-2.2.2" - sources."is-absolute-0.2.6" - sources."jspm-config-0.3.4" - sources."lockfile-1.0.3" - sources."make-error-cause-1.2.2" - sources."mkdirp-0.5.1" - sources."object.pick-1.3.0" - sources."parse-json-2.2.0" - sources."popsicle-9.1.0" - sources."popsicle-proxy-agent-3.0.0" - sources."popsicle-retry-3.2.1" - sources."popsicle-rewrite-1.0.0" - sources."popsicle-status-2.0.1" - sources."rc-1.2.2" - sources."rimraf-2.6.2" - sources."sort-keys-1.1.2" - sources."string-template-1.0.0" - sources."strip-bom-3.0.0" - sources."thenify-3.3.0" - sources."throat-3.2.0" - sources."touch-1.0.0" - sources."typescript-2.6.1" - sources."zip-object-0.1.0" - sources."dot-prop-4.2.0" - sources."make-dir-1.1.0" - sources."unique-string-1.0.0" - sources."write-file-atomic-2.3.0" - sources."xdg-basedir-3.0.0" - sources."is-obj-1.0.1" - sources."pify-3.0.0" - sources."crypto-random-string-1.0.0" - sources."imurmurhash-0.1.4" - sources."signal-exit-3.0.2" - sources."ms-2.0.0" - sources."function-bind-1.1.1" - sources."loose-envify-1.3.1" - sources."js-tokens-3.0.2" - 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."any-promise-1.3.0" - sources."make-error-1.3.0" - sources."isobject-3.0.1" - sources."error-ex-1.3.1" - sources."is-arrayish-0.2.1" - sources."concat-stream-1.6.0" - sources."form-data-2.3.1" - sources."tough-cookie-2.3.3" - 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."asynckit-0.4.0" - sources."combined-stream-1.0.5" - sources."mime-types-2.1.17" - sources."delayed-stream-1.0.0" - sources."mime-db-1.30.0" - sources."punycode-1.4.1" - sources."http-proxy-agent-1.0.0" - sources."https-proxy-agent-1.0.0" - sources."agent-base-2.1.1" - sources."extend-3.0.1" - sources."semver-5.4.1" - sources."deep-extend-0.4.2" - sources."ini-1.3.4" + sources."string2compact-1.2.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."glob-7.1.2" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."is-plain-obj-1.1.0" - sources."nopt-1.0.10" - sources."abbrev-1.1.1" - sources."boxen-1.2.2" - sources."import-lazy-2.1.0" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - sources."latest-version-3.1.0" - sources."semver-diff-2.1.0" - sources."ansi-align-2.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."execa-0.7.0" - sources."cross-spawn-5.1.0" - 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."lru-cache-4.1.1" - sources."shebang-command-1.2.0" - sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - sources."path-key-2.0.1" - sources."code-point-at-1.1.0" - sources."number-is-nan-1.0.1" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."global-dirs-0.1.0" - sources."is-path-inside-1.0.0" - sources."path-is-inside-1.0.2" - 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."tar-fs-1.16.0" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."tar-stream-1.5.5" + sources."thirty-two-1.0.2" + sources."through-2.3.8" + sources."thunky-0.1.0" + sources."to-arraybuffer-1.0.1" + (sources."torrent-discovery-8.4.0" // { + dependencies = [ + sources."minimist-1.2.0" + sources."pump-2.0.1" + ]; + }) + sources."torrent-piece-1.1.1" + sources."tunnel-agent-0.6.0" + sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" + sources."uint64be-1.0.1" + sources."uniq-1.0.1" + sources."unordered-array-remove-1.0.2" + sources."upnp-device-client-1.0.2" + sources."upnp-mediarenderer-client-1.2.4" + sources."url-join-2.0.5" + sources."ut_metadata-3.2.0" + sources."ut_pex-1.2.0" + sources."util-deprecate-1.0.2" + sources."videostream-2.4.2" + sources."vlc-command-1.1.1" + (sources."webtorrent-0.98.24" // { + dependencies = [ + sources."debug-3.1.0" + sources."mime-2.2.2" + sources."minimist-0.0.8" + sources."thunky-1.0.2" + ]; + }) + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.2" + sources."winreg-1.2.4" + sources."wrappy-1.0.2" + sources."ws-5.1.1" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xmldom-0.1.27" + sources."xtend-4.0.1" + sources."zero-fill-2.2.3" ]; buildInputs = globalBuildInputs; meta = { - description = "The TypeScript Definition Manager"; - homepage = https://github.com/typings/typings; + description = "WebTorrent, the streaming torrent client. For the command line."; + homepage = https://webtorrent.io/; license = "MIT"; }; production = true; + bypassCache = false; }; - uglify-js = nodeEnv.buildNodePackage { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.9.tgz"; - sha512 = "1jl5p0wkh6wq7s4k5awqzm289znmxrqdfkib99xarg6z73b8c20i7rbg6wggb70r9g8r0m1qc2qjp8pc1ryydf5gkzbf3svrw9vdf3a"; - }; - dependencies = [ - sources."commander-2.11.0" - sources."source-map-0.6.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JavaScript parser, mangler/compressor and beautifier toolkit"; - homepage = http://lisperator.net/uglifyjs; - license = "BSD-2-Clause"; - }; - production = true; - }; - ungit = nodeEnv.buildNodePackage { - name = "ungit"; - packageName = "ungit"; - version = "1.2.3"; + web-ext = nodeEnv.buildNodePackage { + name = "web-ext"; + packageName = "web-ext"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.2.3.tgz"; - sha512 = "1yzmrpf0x0hz7kval4k8j6mrbg360mbakl7m9x3x9x1yyqpvk5s0icd8c3npblm7jfhsk1qbhbik3d5324hzawcxvb34cbzrfhzcf1i"; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.6.0.tgz"; + sha1 = "52c074123e6376a4fb673e565c33dd027714e9b0"; }; dependencies = [ - sources."async-2.5.0" - sources."bluebird-3.5.1" - sources."blueimp-md5-2.10.0" - sources."body-parser-1.18.2" - sources."color-2.0.1" - sources."cookie-parser-1.4.3" - sources."crossroads-0.12.2" - (sources."diff2html-2.3.2" // { + sources."@cliqz-oss/firefox-client-0.3.1" + sources."@cliqz-oss/node-firefox-connect-1.2.1" + sources."@types/node-9.6.2" + sources."JSONSelect-0.2.1" + sources."abbrev-1.1.1" + sources."acorn-5.5.3" + (sources."acorn-jsx-3.0.1" // { dependencies = [ - sources."mkdirp-0.3.0" + sources."acorn-3.3.0" ]; }) - sources."express-4.15.5" - sources."express-session-1.15.6" - sources."getmac-1.2.1" - sources."hasher-1.2.0" - sources."ignore-3.3.7" - sources."just-detect-adblock-1.0.0" - (sources."keen.io-0.1.3" // { + sources."adbkit-2.11.0" + sources."adbkit-logcat-1.1.0" + sources."adbkit-monkey-1.0.1" + (sources."addons-linter-0.41.0" // { dependencies = [ - sources."superagent-0.21.0" - sources."async-0.9.2" + sources."ajv-keywords-1.5.1" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."async-2.6.0" + sources."camelcase-1.2.1" + sources."cli-cursor-1.0.2" + sources."cliui-3.2.0" + sources."debug-3.1.0" + sources."decamelize-1.2.0" + sources."domelementtype-1.1.3" + sources."es6-promise-3.3.1" + sources."figures-1.7.0" + sources."find-up-2.1.0" + sources."for-in-0.1.8" + sources."globals-11.4.0" + sources."got-3.3.1" + sources."inquirer-0.12.0" + sources."is-fullwidth-code-point-1.0.0" + sources."latest-version-1.0.1" + sources."lazy-cache-0.2.7" + sources."mute-stream-0.0.5" + sources."object-assign-3.0.0" + sources."onetime-1.1.0" + sources."package-json-1.2.0" + sources."parse-json-2.2.0" + sources."path-exists-3.0.0" + sources."pluralize-1.2.1" + sources."progress-1.1.8" + sources."punycode-1.3.2" + sources."repeating-1.1.3" + sources."restore-cursor-1.0.1" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."slice-ansi-0.0.4" + sources."source-map-0.6.1" + sources."source-map-support-0.5.4" + sources."string-width-1.0.2" + sources."strip-ansi-4.0.0" + sources."strip-bom-2.0.0" + sources."supports-color-5.3.0" + sources."table-3.8.3" + sources."timed-out-2.0.0" + sources."traverse-0.6.6" + sources."underscore-1.6.0" + sources."update-notifier-0.5.0" + sources."which-module-2.0.0" + sources."window-size-0.2.0" + sources."wordwrap-0.0.2" + (sources."yargs-11.0.0" // { + dependencies = [ + sources."camelcase-4.1.0" + sources."cliui-4.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + ]; + }) + sources."yargs-parser-9.0.2" ]; }) - sources."knockout-3.4.2" - sources."lodash-4.17.4" - sources."memorystore-1.6.0" - sources."mkdirp-0.5.1" - sources."moment-2.18.1" - sources."node-cache-4.1.1" - sources."npm-5.4.2" - sources."npm-registry-client-8.4.0" - sources."octicons-3.5.0" - sources."open-0.0.5" - sources."os-homedir-1.0.2" - sources."passport-0.4.0" - sources."passport-local-1.0.0" - sources."raven-2.1.2" - sources."rc-1.2.2" - sources."rimraf-2.6.2" - sources."semver-5.4.1" - sources."serve-static-1.12.6" - sources."signals-1.0.0" - sources."snapsvg-0.5.1" - sources."socket.io-2.0.4" - sources."superagent-3.5.2" - (sources."temp-0.8.3" // { + sources."adm-zip-0.4.7" + sources."ajv-6.3.0" + sources."ajv-keywords-2.1.1" + sources."ajv-merge-patch-3.0.0" + sources."align-text-0.1.4" + sources."anchor-markdown-header-0.5.7" + sources."ansi-align-2.0.0" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."ansicolors-0.3.2" + sources."any-promise-1.3.0" + (sources."anymatch-2.0.0" // { dependencies = [ - sources."rimraf-2.2.8" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" ]; }) - (sources."winston-2.3.1" // { + sources."archiver-2.1.1" + sources."archiver-utils-1.3.0" + sources."archy-1.0.0" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-filter-0.0.1" + sources."array-from-2.1.1" + sources."array-map-0.0.0" + sources."array-reduce-0.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."arrify-1.0.1" + sources."asap-2.0.6" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."async-0.2.10" + sources."async-each-1.0.1" + sources."asynckit-0.4.0" + sources."atob-2.1.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."babel-code-frame-6.26.0" + sources."babel-core-6.26.0" + sources."babel-generator-6.26.1" + sources."babel-helpers-6.24.1" + sources."babel-messages-6.23.0" + (sources."babel-polyfill-6.26.0" // { dependencies = [ - sources."async-1.0.0" + sources."regenerator-runtime-0.10.5" ]; }) - sources."yargs-9.0.1" - sources."bytes-3.0.0" - sources."content-type-1.0.4" - sources."debug-2.6.9" - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."on-finished-2.3.0" - sources."qs-6.5.1" - sources."raw-body-2.3.2" - 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.17" - sources."mime-db-1.30.0" - sources."color-convert-1.9.1" - sources."color-string-1.5.2" - sources."color-name-1.1.3" - sources."simple-swizzle-0.2.2" - sources."is-arrayish-0.2.1" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."diff-3.4.0" - sources."hogan.js-3.0.2" - sources."whatwg-fetch-2.0.3" - sources."nopt-1.0.10" - sources."abbrev-1.1.1" - sources."accepts-1.3.3" - sources."array-flatten-1.1.1" - sources."content-disposition-0.5.2" - sources."encodeurl-1.0.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."finalhandler-1.0.6" - sources."fresh-0.5.2" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."parseurl-1.3.2" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.5" - sources."range-parser-1.2.0" - sources."send-0.15.6" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."negotiator-0.6.1" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.4.0" - sources."destroy-1.0.4" - sources."mime-1.4.1" - sources."crc-3.4.4" - sources."on-headers-1.0.1" - sources."uid-safe-2.1.5" - sources."random-bytes-1.0.0" - sources."extract-opts-3.3.1" - sources."eachr-3.2.0" - sources."editions-1.3.3" - sources."typechecker-4.4.1" - sources."underscore-1.5.2" - sources."formidable-1.1.1" - sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" - sources."reduce-component-1.0.1" - sources."extend-3.0.1" - sources."form-data-2.3.1" - sources."readable-stream-2.3.3" - sources."combined-stream-1.0.5" - sources."delayed-stream-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-2.0.1" - sources."string_decoder-1.0.3" - sources."lru-cache-4.1.1" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."minimist-1.2.0" - sources."clone-2.1.1" - sources."concat-stream-1.6.0" - sources."graceful-fs-4.1.11" - sources."normalize-package-data-2.4.0" - sources."npm-package-arg-5.1.2" - sources."once-1.4.0" - sources."request-2.83.0" - sources."retry-0.10.1" - sources."slide-1.1.6" - sources."ssri-4.1.6" - sources."npmlog-4.1.2" - sources."typedarray-0.0.6" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."util-deprecate-1.0.2" - sources."hosted-git-info-2.5.0" - sources."is-builtin-module-1.0.0" - sources."validate-npm-package-license-3.0.1" + (sources."babel-register-6.26.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."source-map-support-0.4.18" + ]; + }) + sources."babel-runtime-6.26.0" + sources."babel-template-6.26.0" + sources."babel-traverse-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" + sources."bail-1.0.2" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."base64-js-0.0.2" + sources."base64url-2.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."binary-extensions-1.11.0" + sources."bl-1.2.2" + sources."bluebird-2.9.34" + sources."boolbase-1.0.0" + sources."boom-4.3.1" + sources."bops-0.1.1" + sources."boundary-1.0.1" + sources."boxen-0.3.1" + sources."brace-expansion-1.1.11" + sources."braces-2.3.2" + sources."buffer-crc32-0.2.13" + sources."buffer-equal-constant-time-1.0.1" + sources."buffer-from-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."osenv-0.1.4" - sources."validate-npm-package-name-3.0.0" - sources."os-tmpdir-1.0.2" - sources."builtins-1.0.3" - sources."wrappy-1.0.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + (sources."bunyan-1.8.12" // { + dependencies = [ + sources."glob-6.0.4" + sources."rimraf-2.4.5" + ]; + }) + sources."cache-base-1.0.1" + sources."caller-path-0.1.0" + sources."callsites-0.2.0" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."forever-agent-0.6.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" - 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-2.1.0" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.6.0" - sources."uuid-3.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" + sources."ccount-1.0.2" + sources."center-align-0.1.3" + sources."chalk-2.3.2" + sources."character-entities-1.2.1" + sources."character-entities-html4-1.1.1" + sources."character-entities-legacy-1.1.1" + sources."character-reference-invalid-1.1.1" + sources."chardet-0.4.2" + (sources."cheerio-1.0.0-rc.2" // { + dependencies = [ + sources."domelementtype-1.3.0" + ]; + }) + (sources."chokidar-2.0.3" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."kind-of-3.2.2" + ]; + }) + sources."circular-json-0.3.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."cli-boxes-1.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."clite-0.3.0" + sources."cliui-2.1.0" + sources."clone-1.0.4" + sources."clone-deep-0.3.0" sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" - sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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."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.2.0" - 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-4.0.0" - sources."wide-align-1.1.2" sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."number-is-nan-1.0.1" - sources."ansi-regex-3.0.0" - sources."passport-strategy-1.0.0" - sources."pause-0.0.1" - sources."lsmod-1.0.0" - sources."stack-trace-0.0.9" - sources."timed-out-4.0.1" - sources."deep-extend-0.4.2" - sources."ini-1.3.4" - sources."strip-json-comments-2.0.1" - sources."glob-7.1.2" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."minimatch-3.0.4" - sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" + sources."collapse-white-space-1.0.3" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."colors-0.5.1" + sources."columnify-1.5.4" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."common-tags-1.7.2" + sources."component-emitter-1.2.1" + sources."compress-commons-1.2.2" sources."concat-map-0.0.1" - sources."eve-0.5.4" - sources."engine.io-3.1.4" - sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.4" - sources."socket.io-parser-3.1.2" - sources."base64id-1.0.0" - sources."engine.io-parser-2.1.1" - sources."ws-3.3.1" - sources."uws-0.14.5" - sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" - sources."base64-arraybuffer-0.1.5" - sources."blob-0.0.4" - sources."has-binary2-1.0.2" - sources."async-limiter-1.0.0" - sources."ultron-1.1.0" - sources."backo2-1.0.2" - sources."component-bind-1.0.0" - sources."engine.io-client-3.1.4" - sources."has-cors-1.1.0" - sources."indexof-0.0.1" - sources."object-component-0.0.3" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" - sources."to-array-0.1.4" - sources."component-inherit-0.0.3" - sources."xmlhttprequest-ssl-1.5.4" - sources."yeast-0.1.2" - sources."better-assert-1.0.2" - sources."callsite-1.0.0" - sources."colors-1.0.3" - sources."cycle-1.0.3" - sources."eyes-0.1.8" - sources."camelcase-4.1.0" - sources."cliui-3.2.0" - sources."decamelize-1.2.0" - sources."get-caller-file-1.0.2" - sources."os-locale-2.1.0" - sources."read-pkg-up-2.0.0" - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."which-module-2.0.0" - sources."y18n-3.2.1" - sources."yargs-parser-7.0.0" - sources."wrap-ansi-2.1.0" - sources."execa-0.7.0" - sources."lcid-1.0.0" - sources."mem-1.1.0" + sources."concat-stream-1.6.2" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."convert-source-map-1.5.1" + sources."copy-descriptor-0.1.1" + sources."core-js-2.5.5" + sources."core-util-is-1.0.2" + sources."crc-3.5.0" + sources."crc32-stream-2.0.0" + sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" - 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."which-1.3.0" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - 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."crx-parser-0.1.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."crypto-random-string-1.0.0" + sources."css-select-1.2.0" + sources."css-what-2.1.0" + sources."d-1.0.0" + sources."dashdash-1.14.1" + sources."debounce-1.1.0" + sources."debug-2.6.9" + sources."decamelize-2.0.0" + sources."decode-uri-component-0.2.0" + sources."deep-equal-1.0.1" + sources."deep-extend-0.4.2" + sources."deep-is-0.1.3" + sources."deepcopy-0.6.3" + sources."deepmerge-2.1.0" + sources."defaults-1.0.3" + sources."define-property-2.0.2" + sources."del-2.2.2" + sources."delayed-stream-1.0.0" + sources."detect-indent-4.0.0" + (sources."dispensary-0.16.0" // { + dependencies = [ + sources."ajv-5.5.2" + ]; + }) + sources."doctoc-1.3.1" + sources."doctrine-2.1.0" + sources."dom-serializer-0.1.0" + sources."domelementtype-1.3.0" + sources."domhandler-2.4.1" + sources."domutils-1.5.1" + sources."dot-prop-3.0.0" + sources."dtrace-provider-0.8.6" + sources."duplexer2-0.1.4" + sources."duplexer3-0.1.4" + sources."duplexify-3.5.4" + sources."ecc-jsbn-0.1.1" + sources."ecdsa-sig-formatter-1.0.9" + sources."email-validator-1.1.1" + sources."emoji-regex-6.1.3" + sources."encoding-0.1.12" + sources."end-of-stream-1.4.1" + sources."entities-1.1.1" sources."error-ex-1.3.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Git made easy"; - homepage = "https://github.com/FredrikNoren/ungit#readme"; - license = "SEE LICENSE IN LICENSE.md"; - }; - production = true; - }; - webdrvr = nodeEnv.buildNodePackage { - name = "webdrvr"; - packageName = "webdrvr"; - version = "2.43.0-1"; - src = fetchurl { - url = "https://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-1.tgz"; - sha1 = "17c442b94c0a6a3a68293d6ea4deb408f8cb9225"; - }; - dependencies = [ - sources."adm-zip-0.4.7" - sources."kew-0.1.7" - sources."mkdirp-0.3.5" - sources."npmconf-0.1.16" - (sources."phantomjs-1.9.20" // { + sources."es5-ext-0.10.42" + sources."es6-error-4.1.1" + sources."es6-iterator-2.0.3" + sources."es6-map-0.1.5" + sources."es6-promise-2.3.0" + (sources."es6-promisify-5.0.0" // { dependencies = [ - sources."kew-0.7.0" - sources."mkdirp-0.5.0" + sources."es6-promise-4.2.4" ]; }) - sources."tmp-0.0.33" - sources."follow-redirects-0.0.3" - sources."config-chain-1.1.11" - sources."inherits-2.0.3" - sources."once-1.3.3" - sources."osenv-0.0.3" - sources."nopt-2.2.1" - sources."semver-2.3.2" - sources."ini-1.3.4" - sources."proto-list-1.2.4" - sources."wrappy-1.0.2" - sources."abbrev-1.1.1" - sources."extract-zip-1.5.0" - sources."fs-extra-0.26.7" - sources."hasha-2.2.0" - sources."progress-1.1.8" - sources."request-2.67.0" - sources."request-progress-2.0.1" - sources."which-1.2.14" - sources."concat-stream-1.5.0" - sources."debug-0.7.4" - sources."yauzl-2.4.1" - 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."minimist-0.0.8" + sources."es6-set-0.1.5" + sources."es6-symbol-3.1.1" + sources."es6-weak-map-2.0.2" + sources."escape-string-regexp-1.0.5" + sources."escope-3.6.0" + (sources."eslint-4.19.0" // { + dependencies = [ + sources."ajv-5.5.2" + sources."esprima-4.0.0" + ]; + }) + (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { + dependencies = [ + sources."ajv-4.11.8" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."debug-2.6.9" + (sources."eslint-3.19.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."globals-9.18.0" + sources."is-fullwidth-code-point-2.0.0" + sources."shelljs-0.7.8" + sources."string-width-2.1.1" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."eslint-scope-3.7.1" + sources."eslint-visitor-keys-1.0.0" + sources."espree-3.5.4" + sources."esprima-3.1.3" + sources."esquery-1.0.1" + sources."esrecurse-4.2.1" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."event-emitter-0.3.5" + sources."event-to-promise-0.8.0" + sources."execa-0.7.0" + sources."exit-hook-1.1.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-3.0.1" + sources."extend-shallow-3.0.2" + sources."external-editor-2.2.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-parse-1.0.3" + sources."fast-json-patch-1.2.2" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."fast-safe-stringify-1.2.3" sources."fd-slicer-1.0.1" - sources."pend-1.2.0" - sources."graceful-fs-4.1.11" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" - sources."path-is-absolute-1.0.1" - sources."rimraf-2.6.2" - sources."glob-7.1.2" + sources."figures-2.0.0" + sources."file-entry-cache-2.0.0" + sources."fill-range-4.0.0" + sources."filled-array-1.1.0" + sources."find-up-1.1.2" + (sources."firefox-profile-1.1.0" // { + dependencies = [ + sources."async-2.5.0" + ]; + }) + sources."first-chunk-stream-2.0.0" + sources."flat-cache-1.3.0" + sources."flatstr-1.0.5" + sources."fluent-syntax-0.6.6" + sources."for-in-1.0.2" + sources."for-own-1.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fragment-cache-0.2.1" + sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" + sources."fsevents-1.1.3" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + (sources."fx-runner-1.0.8" // { + dependencies = [ + sources."commander-2.9.0" + sources."isexe-1.1.2" + sources."lodash-3.10.1" + sources."which-1.2.4" + ]; + }) + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."get-caller-file-1.0.2" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."gettext-parser-1.1.0" + (sources."git-rev-sync-1.9.1" // { + dependencies = [ + sources."shelljs-0.7.7" + ]; + }) + sources."glob-7.1.2" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."global-dirs-0.1.1" + sources."globals-9.18.0" + sources."globby-5.0.0" + sources."got-5.7.1" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + sources."graphlib-2.1.5" + sources."growly-1.3.0" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-1.0.1" + sources."has-ansi-2.0.0" + sources."has-color-0.1.7" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" + sources."hasbin-1.2.3" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."home-or-tmp-2.0.0" + sources."hosted-git-info-2.6.0" + sources."htmlparser2-3.9.2" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.21" + sources."ignore-3.3.7" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."infinity-agent-2.0.3" sources."inflight-1.0.6" - sources."minimatch-3.0.4" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-3.3.0" + sources."interpret-1.1.0" + sources."invariant-2.2.4" + sources."invert-kv-1.0.0" + sources."is-absolute-0.1.7" + sources."is-accessor-descriptor-1.0.0" + sources."is-alphabetical-1.0.1" + sources."is-alphanumerical-1.0.1" + sources."is-arrayish-0.2.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-decimal-1.0.1" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.0" + sources."is-hexadecimal-1.0.1" + sources."is-installed-globally-0.1.0" + sources."is-mergeable-object-1.1.0" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.17.2" + sources."is-npm-1.0.0" + sources."is-number-4.0.0" + sources."is-obj-1.0.1" + sources."is-odd-2.0.0" + sources."is-path-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" + sources."is-property-1.0.2" + sources."is-redirect-1.0.0" + sources."is-relative-0.1.3" + sources."is-resolvable-1.1.0" + sources."is-retry-allowed-1.1.0" 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.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.17" - sources."node-uuid-1.4.8" - sources."qs-5.2.1" - sources."tunnel-agent-0.4.3" - sources."tough-cookie-2.2.2" - sources."http-signature-1.1.1" - sources."oauth-sign-0.8.2" - sources."hawk-3.1.3" - sources."aws-sign2-0.6.0" - sources."stringstream-0.0.5" - sources."combined-stream-1.0.5" - sources."isstream-0.1.2" sources."is-typedarray-1.0.0" - sources."har-validator-2.0.6" - sources."async-2.6.0" - sources."lodash-4.17.4" - sources."mime-db-1.30.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" + sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isemail-1.2.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."jed-1.1.1" + sources."jetpack-id-1.0.0" + sources."joi-6.10.1" + sources."js-select-0.6.0" + sources."js-tokens-3.0.2" + sources."js-yaml-3.11.0" sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."delayed-stream-1.0.0" - sources."chalk-1.1.3" - sources."commander-2.11.0" - sources."is-my-json-valid-2.16.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."jsesc-1.3.0" + sources."json-merge-patch-0.2.3" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stable-stringify-1.0.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json5-0.5.1" + sources."jsonfile-4.0.0" + sources."jsonify-0.0.0" sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."throttleit-1.0.0" - sources."isexe-2.0.0" - sources."os-tmpdir-1.0.2" - sources."underscore-1.8.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "NPM wrapper for Selenium Webdriver including Chromedriver / IEDriver / IOSDriver / Ghostdriver"; - homepage = https://github.com/uxebu/webdrvr; - license = "MIT"; - }; - production = true; - }; - webpack = nodeEnv.buildNodePackage { - name = "webpack"; - packageName = "webpack"; - version = "3.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz"; - sha512 = "1pjbfhy4mpjb68hg0k70iz51c13yq6biln5wyb3jg8ddbgc3qwhnqgxvd19if6sihd10yc42yrj50p451qkgd4wmy2p5a0cddcwp5g5"; - }; - dependencies = [ - sources."acorn-5.2.1" - (sources."acorn-dynamic-import-2.0.2" // { + sources."jsonwebtoken-7.1.9" + sources."jsprim-1.4.1" + sources."jszip-2.6.1" + sources."jwa-1.1.5" + sources."jws-3.1.4" + sources."kind-of-3.2.2" + sources."latest-version-2.0.0" + sources."lazy-cache-1.0.4" + sources."lazystream-1.0.0" + sources."lcid-1.0.0" + sources."levn-0.3.0" + sources."load-json-file-1.1.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.5" + sources."lodash.assign-4.2.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.defaults-4.2.0" + sources."lodash.defaultsdeep-4.6.0" + sources."lodash.mergewith-4.6.1" + sources."lodash.once-4.1.1" + sources."lodash.sortby-4.7.0" + sources."longest-1.0.1" + sources."longest-streak-1.0.0" + sources."loose-envify-1.3.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" + sources."make-dir-1.2.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."markdown-table-0.4.0" + sources."markdown-to-ast-3.4.0" + sources."mem-1.1.0" + (sources."micromatch-3.1.10" // { dependencies = [ - sources."acorn-4.0.13" + sources."is-extendable-0.1.1" ]; }) - sources."ajv-5.3.0" - sources."ajv-keywords-2.1.1" - sources."async-2.6.0" - sources."enhanced-resolve-3.4.1" - sources."escope-3.6.0" - sources."interpret-1.0.4" - sources."json-loader-0.5.7" - sources."json5-0.5.1" - sources."loader-runner-2.3.0" - 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."source-map-0.5.7" - sources."supports-color-4.5.0" - sources."tapable-0.2.8" - (sources."uglifyjs-webpack-plugin-0.4.6" // { + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mixin-deep-1.3.1" + sources."mixin-object-2.0.1" + (sources."mkdirp-0.5.1" // { dependencies = [ - sources."yargs-3.10.0" + sources."minimist-0.0.8" ]; }) - sources."watchpack-1.4.0" - (sources."webpack-sources-1.0.2" // { + sources."moment-2.22.0" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."mv-2.1.1" + sources."mz-2.7.0" + sources."nan-2.10.0" + sources."nanomatch-1.2.9" + sources."natural-compare-1.4.0" + sources."natural-compare-lite-1.4.0" + sources."nconf-0.7.2" + sources."ncp-2.0.0" + (sources."needle-2.2.0" // { dependencies = [ - sources."source-map-0.6.1" + sources."debug-2.6.9" ]; }) - sources."yargs-8.0.2" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."lodash-4.17.4" - sources."graceful-fs-4.1.11" + sources."neo-async-2.5.0" + sources."nested-error-stacks-1.0.2" + sources."next-tick-1.0.0" + sources."node-forge-0.7.5" + sources."node-notifier-5.2.1" + sources."node-status-codes-1.0.0" + sources."nomnom-1.8.1" + sources."normalize-package-data-2.4.0" + sources."normalize-path-2.1.1" + sources."npm-run-path-2.0.2" + sources."nth-check-1.0.1" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" 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.35" - sources."es6-iterator-2.0.3" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" - sources."event-emitter-0.3.5" - sources."big.js-3.2.0" - sources."emojis-list-2.1.0" - sources."errno-0.1.4" - sources."readable-stream-2.3.3" - sources."prr-0.0.0" - sources."core-util-is-1.0.2" - sources."inherits-2.0.1" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - sources."minimist-0.0.8" - sources."assert-1.4.1" - sources."browserify-zlib-0.1.4" - sources."buffer-4.9.1" - sources."console-browserify-1.1.0" - sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.12.0" - 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.10" - sources."punycode-1.3.2" - sources."querystring-es3-0.2.1" - sources."stream-browserify-2.0.1" - sources."stream-http-2.7.2" - sources."timers-browserify-2.0.4" - sources."tty-browserify-0.0.0" - sources."url-0.11.0" - sources."util-0.10.3" - sources."vm-browserify-0.0.4" - sources."pako-0.2.9" - 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.4" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" - sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.14" - sources."public-encrypt-4.0.0" - sources."randombytes-2.0.5" - sources."randomfill-1.0.3" - sources."browserify-aes-1.1.1" - sources."browserify-des-1.0.0" - sources."evp_bytestokey-1.0.3" - sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.4" - sources."des.js-1.0.0" - sources."minimalistic-assert-1.0.0" - sources."md5.js-1.3.4" - sources."hash-base-2.0.2" - sources."bn.js-4.11.8" - sources."browserify-rsa-4.0.1" - sources."elliptic-6.4.0" - sources."parse-asn1-5.1.0" - sources."brorand-1.1.0" - sources."hash.js-1.1.3" - sources."hmac-drbg-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.2" - sources."ripemd160-2.0.1" - sources."sha.js-2.4.9" - sources."miller-rabin-4.0.1" - sources."builtin-status-codes-3.0.0" - sources."to-arraybuffer-1.0.1" - sources."xtend-4.0.1" - sources."setimmediate-1.0.5" - sources."querystring-0.2.0" - sources."indexof-0.0.1" - sources."has-flag-2.0.0" - sources."uglify-js-2.8.29" - sources."uglify-to-browserify-1.0.2" - sources."camelcase-4.1.0" - sources."cliui-3.2.0" - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - sources."center-align-0.1.3" - sources."right-align-0.1.3" - sources."wordwrap-0.0.2" - sources."align-text-0.1.4" - sources."lazy-cache-1.0.4" - sources."kind-of-3.2.2" - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.6" - sources."chokidar-1.7.0" - sources."anymatch-1.3.2" - 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."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."open-0.0.5" + sources."optionator-0.8.2" + sources."os-homedir-1.0.2" + sources."os-locale-2.1.0" + sources."os-name-1.0.3" + sources."os-shim-0.1.3" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."osx-release-1.1.0" + sources."p-finally-1.0.0" + sources."p-limit-1.2.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."package-json-2.4.0" + sources."pako-1.0.6" + sources."parse-entities-1.1.1" + sources."parse-json-4.0.0" + sources."parse5-3.0.3" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.5" + sources."path-type-1.1.0" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pino-4.14.0" + sources."pino-std-serializers-1.2.0" + sources."pluralize-7.0.0" + (sources."po2json-0.4.5" // { + dependencies = [ + sources."ansi-styles-1.0.0" + sources."chalk-0.4.0" + sources."strip-ansi-0.1.1" + ]; + }) + sources."posix-character-classes-0.1.1" + sources."postcss-6.0.19" + sources."prelude-ls-1.1.2" + sources."prepend-http-1.0.4" + sources."private-0.1.8" + (sources."probe-image-size-4.0.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."process-nextick-args-2.0.0" + sources."progress-2.0.0" + sources."promise-7.3.1" + sources."proxy-from-env-1.0.0" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."querystring-0.2.0" + sources."quick-format-unescaped-1.1.2" + sources."rc-1.2.6" + sources."read-all-stream-3.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" - sources."fsevents-1.1.3" - sources."micromatch-2.3.11" - sources."normalize-path-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" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - 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-3.0.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."is-posix-bracket-0.1.1" - 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."readline2-1.0.1" + sources."rechoir-0.6.2" + sources."recursive-readdir-2.2.2" + sources."regenerator-runtime-0.11.1" + sources."regex-not-1.0.2" + sources."regexpp-1.1.0" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + (sources."relaxed-json-1.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."remark-5.1.0" + sources."remark-parse-1.1.0" + sources."remark-stringify-1.1.0" sources."remove-trailing-separator-1.1.0" - sources."binary-extensions-1.10.0" - sources."minimatch-3.0.4" - sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."nan-2.7.0" - sources."source-list-map-2.0.0" - sources."get-caller-file-1.0.2" - sources."os-locale-2.1.0" - sources."read-pkg-up-2.0.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."repeating-2.0.1" + sources."request-2.85.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" + sources."require-uncached-1.0.3" + sources."resolve-1.7.0" + sources."resolve-from-1.0.1" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rx-4.1.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safe-json-stringify-1.1.0" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" - sources."string-width-1.0.2" - sources."which-module-2.0.0" - sources."y18n-3.2.1" - sources."yargs-parser-7.0.0" - sources."strip-ansi-4.0.0" - sources."wrap-ansi-2.1.0" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."number-is-nan-1.0.1" - sources."ansi-regex-3.0.0" - sources."execa-0.7.0" - sources."lcid-1.0.0" - sources."mem-1.1.0" - sources."cross-spawn-5.1.0" - 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."lru-cache-4.1.1" + sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.0" + sources."sha.js-2.4.11" + (sources."shallow-clone-0.1.2" // { + dependencies = [ + sources."kind-of-2.0.1" + ]; + }) sources."shebang-command-1.2.0" - sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - 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."normalize-package-data-2.4.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."hosted-git-info-2.5.0" - sources."is-builtin-module-1.0.0" - sources."semver-5.4.1" - 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 = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; - homepage = https://github.com/webpack/webpack; - license = "MIT"; - }; - production = true; - }; - web-ext = nodeEnv.buildNodePackage { - name = "web-ext"; - packageName = "web-ext"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.2.2.tgz"; - sha1 = "5c54be1d5b2e9da3092f5f03ef55d6db372c37e1"; - }; - dependencies = [ - (sources."addons-linter-0.27.0" // { + sources."shell-quote-1.6.1" + sources."shelljs-0.8.1" + sources."shellwords-0.1.1" + (sources."sign-addon-0.3.0" // { + dependencies = [ + sources."assert-plus-0.2.0" + sources."aws-sign2-0.6.0" + sources."babel-polyfill-6.16.0" + sources."boom-2.10.1" + sources."caseless-0.11.0" + sources."chalk-1.1.3" + sources."cryptiles-2.0.5" + sources."es6-error-4.0.0" + sources."form-data-2.1.4" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" + sources."ms-0.7.3" + sources."mz-2.5.0" + sources."qs-6.3.2" + sources."regenerator-runtime-0.9.6" + sources."request-2.79.0" + sources."sntp-1.0.9" + sources."source-map-support-0.4.6" + sources."tunnel-agent-0.4.3" + ]; + }) + sources."signal-exit-3.0.2" + sources."slash-1.0.0" + sources."slice-ansi-1.0.0" + sources."slide-1.1.6" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."kind-of-4.0.0" + ]; + }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" + sources."sntp-2.1.0" + (sources."snyk-1.71.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."async-1.5.2" + sources."camelcase-3.0.0" + sources."chalk-1.1.3" + sources."inquirer-1.0.3" + sources."mute-stream-0.0.6" + sources."os-locale-1.4.0" + sources."run-async-2.3.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."yargs-3.15.0" + ]; + }) + (sources."snyk-config-1.0.1" // { dependencies = [ - sources."yargs-8.0.2" - sources."babel-runtime-6.26.0" - sources."source-map-support-0.4.18" - sources."regenerator-runtime-0.11.0" - sources."tmp-0.0.33" + sources."async-0.9.2" + sources."debug-2.6.9" ]; }) - sources."babel-polyfill-6.20.0" - sources."babel-runtime-6.25.0" - sources."bunyan-1.8.10" - sources."camelcase-4.1.0" - sources."debounce-1.0.2" - sources."decamelize-1.2.0" - sources."es6-error-4.0.2" - sources."es6-promisify-5.0.0" - sources."event-to-promise-0.8.0" - sources."firefox-profile-0.5.0" - sources."fx-runner-1.0.8" - sources."git-rev-sync-1.9.1" - sources."minimatch-3.0.4" - sources."mkdirp-0.5.1" - sources."mz-2.6.0" - sources."node-firefox-connect-1.2.0" - sources."open-0.0.5" - sources."node-notifier-5.1.2" - sources."parse-json-2.2.0" - sources."regenerator-runtime-0.10.5" - sources."require-uncached-1.0.3" - (sources."sign-addon-0.2.1" // { + sources."snyk-go-plugin-1.4.6" + sources."snyk-gradle-plugin-1.2.0" + (sources."snyk-module-1.8.1" // { dependencies = [ - sources."babel-polyfill-6.16.0" - sources."es6-error-4.0.0" - sources."mz-2.5.0" - sources."source-map-support-0.4.6" - sources."regenerator-runtime-0.9.6" + sources."debug-2.6.9" ]; }) - sources."source-map-support-0.5.0" - sources."stream-to-promise-2.2.0" - sources."tmp-0.0.30" - sources."watchpack-1.3.0" - sources."update-notifier-2.2.0" - (sources."yargs-6.6.0" // { + sources."snyk-mvn-plugin-1.1.1" + (sources."snyk-nuget-plugin-1.3.9" // { dependencies = [ - sources."camelcase-3.0.0" + sources."es6-promise-4.2.4" ]; }) - sources."zip-dir-1.0.2" - sources."ajv-4.11.8" - sources."babel-register-6.26.0" - sources."chalk-2.3.0" - sources."cheerio-1.0.0-rc.2" - sources."columnify-1.5.4" - sources."common-tags-1.4.0" - sources."crx-parser-0.1.2" - sources."doctoc-1.3.0" - (sources."dispensary-0.10.19" // { + sources."snyk-php-plugin-1.3.2" + (sources."snyk-policy-1.10.2" // { dependencies = [ - sources."source-map-support-0.5.0" - sources."yargs-9.0.1" + sources."debug-2.6.9" ]; }) - sources."eslint-3.19.0" - sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" - sources."esprima-4.0.0" - sources."first-chunk-stream-2.0.0" - sources."jed-1.1.1" - sources."pino-4.10.1" - sources."postcss-6.0.11" - sources."relaxed-json-1.0.1" - sources."semver-5.4.1" - sources."strip-bom-stream-3.0.0" - sources."whatwg-url-6.3.0" - sources."xmldom-0.1.27" - sources."yauzl-2.8.0" - 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."babel-core-6.26.0" - sources."core-js-2.5.1" - sources."home-or-tmp-2.0.0" - sources."lodash-3.10.1" - sources."babel-code-frame-6.26.0" - sources."babel-generator-6.26.0" - sources."babel-helpers-6.24.1" - sources."babel-messages-6.23.0" - sources."babel-template-6.26.0" - sources."babel-traverse-6.26.0" - sources."babel-types-6.26.0" - sources."babylon-6.18.0" - sources."convert-source-map-1.5.0" - sources."debug-2.6.9" - sources."json5-0.5.1" - sources."path-is-absolute-1.0.1" - sources."private-0.1.8" - sources."slash-1.0.0" - sources."source-map-0.6.1" - sources."esutils-2.0.2" - sources."js-tokens-3.0.2" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" + sources."snyk-python-plugin-1.5.7" + (sources."snyk-resolve-1.0.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."snyk-resolve-deps-1.7.0" // { + dependencies = [ + sources."configstore-2.1.0" + sources."debug-2.6.9" + sources."update-notifier-0.6.3" + sources."uuid-2.0.3" + sources."yargs-4.8.1" + ]; + }) + (sources."snyk-sbt-plugin-1.2.5" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-tree-1.0.0" + (sources."snyk-try-require-1.2.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + (sources."source-map-support-0.5.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.0" + sources."spawn-sync-1.0.15" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."split-0.3.3" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."split2-2.2.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.1" + sources."static-extend-0.1.2" + sources."stream-parser-0.3.1" + sources."stream-shift-1.0.0" + sources."stream-to-array-2.3.0" + (sources."stream-to-promise-2.2.0" // { + dependencies = [ + sources."end-of-stream-1.1.0" + sources."once-1.3.3" + ]; + }) + sources."string-length-1.0.1" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."stringify-entities-1.3.1" + sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" - sources."supports-color-4.5.0" - sources."ansi-regex-2.1.1" - sources."detect-indent-4.0.0" - sources."jsesc-1.3.0" - sources."trim-right-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" - sources."globals-9.18.0" - sources."invariant-2.2.2" - sources."loose-envify-1.3.1" - sources."to-fast-properties-1.0.3" - sources."ms-0.7.3" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."css-select-1.2.0" - sources."dom-serializer-0.1.0" - sources."entities-1.1.1" - sources."htmlparser2-3.9.2" - sources."parse5-3.0.3" - sources."css-what-2.1.0" - sources."domutils-1.5.1" - sources."boolbase-1.0.0" - sources."nth-check-1.0.1" - sources."domelementtype-1.3.0" - sources."domhandler-2.4.1" - sources."inherits-2.0.3" - 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."@types/node-8.0.51" - sources."wcwidth-1.0.1" - sources."defaults-1.0.3" - sources."clone-1.0.3" - sources."anchor-markdown-header-0.5.7" - sources."markdown-to-ast-3.4.0" - sources."minimist-1.2.0" - sources."underscore-1.8.3" - sources."update-section-0.3.3" - sources."emoji-regex-6.1.3" - sources."remark-5.1.0" + sources."strip-bom-3.0.0" + sources."strip-bom-buf-1.0.0" + sources."strip-bom-stream-3.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" + sources."supports-color-2.0.0" + sources."table-4.0.2" + sources."tar-stream-1.5.5" + (sources."tempfile-1.1.1" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."term-size-1.2.0" + sources."text-table-0.2.0" + sources."then-fs-2.0.0" + sources."thenify-3.3.0" + sources."thenify-all-1.6.0" + sources."through-2.3.8" + sources."through2-2.0.3" + sources."timed-out-3.1.3" + sources."tmp-0.0.33" + sources."to-fast-properties-1.0.3" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."to-utf8-0.0.1" + sources."toml-2.3.3" + sources."topo-1.1.0" + sources."tosource-1.0.0" + sources."tough-cookie-2.3.4" + sources."tr46-1.0.1" sources."traverse-0.4.6" - sources."remark-parse-1.1.0" - sources."remark-stringify-1.1.0" - sources."unified-4.2.1" - sources."collapse-white-space-1.0.3" - sources."extend-3.0.1" - sources."parse-entities-1.1.1" - sources."repeat-string-1.6.1" sources."trim-0.0.1" + sources."trim-right-1.0.1" sources."trim-trailing-lines-1.1.0" - sources."unherit-1.1.0" - sources."unist-util-remove-position-1.1.1" - sources."vfile-location-2.0.2" - sources."character-entities-1.2.1" - sources."character-entities-legacy-1.1.1" - sources."character-reference-invalid-1.1.1" - sources."is-alphanumerical-1.0.1" - sources."is-decimal-1.0.1" - sources."is-hexadecimal-1.0.1" - sources."is-alphabetical-1.0.1" - sources."xtend-4.0.1" - sources."unist-util-visit-1.1.3" - sources."ccount-1.0.2" - sources."longest-streak-1.0.0" - sources."markdown-table-0.4.0" - sources."stringify-entities-1.3.1" - sources."character-entities-html4-1.1.1" - sources."bail-1.0.2" - sources."has-1.0.1" - sources."once-1.3.3" sources."trough-1.0.1" - sources."vfile-1.4.0" - sources."function-bind-1.1.1" - sources."wrappy-1.0.2" - sources."boundary-1.0.1" - sources."array-from-2.1.1" - sources."async-1.5.2" - sources."natural-compare-lite-1.4.0" - sources."request-2.79.0" - sources."sha.js-2.4.9" - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.11.0" - sources."combined-stream-1.0.5" - 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.17" - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."qs-6.3.2" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.4.3" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."har-schema-2.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.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" + sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.30.0" - sources."punycode-2.1.0" - sources."cliui-3.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."string-width-1.0.2" - sources."which-module-1.0.0" - sources."y18n-3.2.1" - sources."yargs-parser-4.2.1" - sources."wrap-ansi-2.1.0" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."execa-0.7.0" - sources."lcid-1.0.0" - sources."mem-1.1.0" - sources."cross-spawn-5.1.0" - 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."lru-cache-4.1.1" - sources."shebang-command-1.2.0" - sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - sources."path-key-2.0.1" - sources."invert-kv-1.0.0" - sources."mimic-fn-1.1.0" - sources."find-up-1.1.2" - sources."read-pkg-1.1.0" - sources."locate-path-2.0.0" - sources."p-locate-2.0.0" - sources."path-exists-2.1.0" - sources."p-limit-1.1.0" - sources."load-json-file-1.1.0" - sources."normalize-package-data-2.4.0" - sources."path-type-1.1.0" - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - sources."strip-bom-2.0.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."concat-stream-1.6.0" - sources."doctrine-2.0.0" - sources."eslint-scope-3.7.1" - sources."espree-3.5.2" - sources."esquery-1.0.0" - sources."estraverse-4.2.0" - sources."file-entry-cache-2.0.0" - sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.2" - sources."ignore-3.3.7" - sources."imurmurhash-0.1.4" - sources."inquirer-0.12.0" - sources."is-resolvable-1.0.0" - sources."js-yaml-3.10.0" - sources."levn-0.3.0" - 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."strip-json-comments-2.0.1" - sources."table-3.8.3" - sources."text-table-0.2.0" - sources."typedarray-0.0.6" - sources."esrecurse-4.2.0" - sources."object-assign-4.1.1" - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" - sources."flat-cache-1.3.0" - sources."circular-json-0.3.3" - sources."del-2.2.2" - 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."pinkie-promise-2.0.1" - sources."rimraf-2.4.5" - 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."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."cli-width-2.2.0" - sources."external-editor-2.0.5" - sources."figures-1.7.0" - sources."mute-stream-0.0.5" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."rx-lite-aggregates-4.0.8" - sources."through-2.3.8" - sources."restore-cursor-1.0.1" - sources."onetime-1.1.0" - sources."iconv-lite-0.4.19" - sources."jschardet-1.6.0" - sources."is-promise-2.1.0" - sources."tryit-1.0.3" - sources."argparse-1.0.9" - sources."sprintf-js-1.0.3" - sources."prelude-ls-1.1.2" sources."type-check-0.3.2" - sources."deep-is-0.1.3" - sources."wordwrap-1.0.0" - sources."fast-levenshtein-2.0.6" - sources."ajv-keywords-1.5.1" - sources."slice-ansi-0.0.4" - sources."escope-3.6.0" - sources."is-my-json-valid-2.16.1" - sources."shelljs-0.7.7" + sources."typedarray-0.0.6" + sources."undefsafe-0.0.3" + sources."underscore-1.8.3" + sources."unherit-1.1.0" + sources."unified-4.2.1" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + sources."unique-string-1.0.0" + sources."unist-util-is-2.1.1" + sources."unist-util-remove-position-1.1.1" + sources."unist-util-visit-1.3.0" + sources."universalify-0.1.1" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."unzip-response-1.0.2" + sources."upath-1.0.4" + (sources."update-notifier-2.3.0" // { + dependencies = [ + sources."boxen-1.3.0" + sources."configstore-3.1.2" + sources."dot-prop-4.2.0" + sources."got-6.7.1" + sources."latest-version-3.1.0" + sources."package-json-4.0.1" + sources."pify-3.0.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + sources."widest-line-2.0.0" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + ]; + }) + sources."update-section-0.3.3" + sources."urix-0.1.0" + sources."url-0.11.0" + sources."url-parse-lax-1.0.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."user-home-2.0.0" - sources."es6-map-0.1.5" - sources."es6-weak-map-2.0.2" - sources."d-1.0.0" - sources."es5-ext-0.10.35" - sources."es6-iterator-2.0.3" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" - sources."event-emitter-0.3.5" - sources."readline2-1.0.1" - sources."exit-hook-1.1.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."interpret-1.0.4" - sources."rechoir-0.6.2" - sources."resolve-1.5.0" - sources."path-parse-1.0.5" - sources."fast-json-parse-1.0.3" - sources."fast-safe-stringify-1.2.1" - sources."flatstr-1.0.5" - sources."pump-1.0.2" - sources."quick-format-unescaped-1.1.1" - sources."split2-2.2.0" - sources."end-of-stream-1.1.0" - sources."through2-2.0.3" - sources."commander-2.9.0" - sources."strip-bom-buf-1.0.0" - sources."is-utf8-0.2.1" - sources."lodash.sortby-4.7.0" - sources."tr46-1.0.1" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-license-3.0.3" + sources."verror-1.10.0" + sources."vfile-1.4.0" + sources."vfile-location-2.0.2" + (sources."watchpack-1.5.0" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-6.0.2" + ]; + }) + sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - sources."fd-slicer-1.0.1" - sources."buffer-crc32-0.2.13" - sources."pend-1.2.0" - sources."dtrace-provider-0.8.5" - sources."mv-2.1.1" - sources."safe-json-stringify-1.0.4" - sources."moment-2.19.2" - sources."nan-2.7.0" - sources."ncp-2.0.0" - sources."es6-promise-2.3.0" - sources."adm-zip-0.4.7" - sources."archiver-1.3.0" - sources."fs-extra-2.1.2" - sources."ini-1.3.4" - sources."jetpack-id-1.0.0" - sources."lazystream-1.0.0" - sources."xml2js-0.4.19" - sources."archiver-utils-1.3.0" - sources."tar-stream-1.5.5" - sources."zip-stream-1.2.0" - sources."walkdir-0.0.11" - sources."normalize-path-2.1.1" - sources."remove-trailing-separator-1.1.0" - sources."bl-1.2.1" - sources."compress-commons-1.2.2" - sources."crc32-stream-2.0.0" - sources."crc-3.5.0" - sources."jsonfile-2.4.0" - sources."sax-1.2.4" - sources."xmlbuilder-9.0.4" - sources."shell-quote-1.6.1" - sources."spawn-sync-1.0.15" + (sources."whatwg-url-6.3.0" // { + dependencies = [ + sources."punycode-2.1.0" + ]; + }) sources."when-3.7.7" - sources."winreg-0.0.12" - sources."graceful-readlink-1.0.1" - sources."array-filter-0.0.1" - sources."array-reduce-0.0.0" - sources."array-map-0.0.0" - sources."os-shim-0.1.3" - sources."is-absolute-0.1.7" - sources."is-relative-0.1.3" - 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."thenify-all-1.6.0" - sources."thenify-3.3.0" - sources."firefox-client-0.3.0" - sources."colors-0.5.1" - sources."js-select-0.6.0" - sources."JSONSelect-0.2.1" - sources."growly-1.3.0" - sources."shellwords-0.1.1" - sources."error-ex-1.3.1" - sources."is-arrayish-0.2.1" - sources."caller-path-0.1.0" - sources."resolve-from-1.0.1" - sources."callsites-0.2.0" - sources."deepcopy-0.6.3" - sources."jsonwebtoken-7.1.9" - sources."joi-6.10.1" - sources."jws-3.1.4" - sources."lodash.once-4.1.1" - sources."topo-1.1.0" - sources."isemail-1.2.0" - sources."base64url-2.0.0" - sources."jwa-1.1.5" - sources."buffer-equal-constant-time-1.0.1" - sources."ecdsa-sig-formatter-1.0.9" - sources."stream-to-array-2.3.0" - sources."chokidar-1.7.0" - sources."anymatch-1.3.2" - 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."readdirp-2.1.0" - sources."fsevents-1.1.3" - 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."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.4" - 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-3.0.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.7" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" - 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.10.0" - sources."set-immediate-shim-1.0.1" - sources."boxen-1.2.2" - sources."configstore-3.1.1" - 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" + sources."which-1.3.0" + sources."which-module-1.0.0" sources."widest-line-1.0.0" - sources."dot-prop-4.2.0" - sources."make-dir-1.1.0" - sources."unique-string-1.0.0" - sources."write-file-atomic-2.3.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" - 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.2" - sources."deep-extend-0.4.2" - sources."jszip-2.6.1" - sources."pako-1.0.6" + sources."win-release-1.1.1" + sources."window-size-0.1.4" + sources."winreg-0.0.12" + sources."wordwrap-1.0.0" + sources."wrap-ansi-2.1.0" + sources."wrappy-1.0.2" + sources."write-0.2.1" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xmldom-0.1.27" + sources."xregexp-4.0.0" + sources."xtend-4.0.1" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + (sources."yargs-6.6.0" // { + dependencies = [ + sources."camelcase-3.0.0" + sources."cliui-3.2.0" + sources."decamelize-1.2.0" + sources."is-fullwidth-code-point-1.0.0" + sources."os-locale-1.4.0" + sources."string-width-1.0.2" + sources."yargs-parser-4.2.1" + ]; + }) + sources."yargs-parser-2.4.1" + sources."yauzl-2.9.1" + sources."zip-1.2.0" + (sources."zip-dir-1.0.2" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) + sources."zip-stream-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -35295,6 +45211,7 @@ in license = "MPL-2.0"; }; production = true; + bypassCache = false; }; wring = nodeEnv.buildNodePackage { name = "wring"; @@ -35311,14 +45228,15 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.3.2"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.3.2.tgz"; - sha1 = "5939762581b5b4ddcd3418c0f6be42df3aee195f"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.5.1.tgz"; + sha1 = "e8680360e832ac89521eb80dad3a7bc27a40bab4"; }; buildInputs = globalBuildInputs; meta = { @@ -35327,357 +45245,488 @@ in license = "BSD-2-Clause"; }; production = true; + bypassCache = false; }; yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-2.0.0.tgz"; - sha512 = "3maxk0a2p7xyz9bkfyx3jd0inm9y7a3wc8b7rqx8p5fsmx8qkqnbvhxwn4210l689vd5p3xphn147dyclqsqmmgp7cqyswyyfsmm1lr"; + url = "https://registry.npmjs.org/yo/-/yo-2.0.1.tgz"; + sha512 = "390n0gdbxr25mr804mrwfqw6r6srk4q9spnsnnlfvlsfvr6dwd93nrgh0l2sr76a9jdw2jiycwc0241h6zch6hi0jlhg3w8hk6i4hyy"; }; dependencies = [ + sources."@sindresorhus/is-0.7.0" + sources."aggregate-error-1.0.0" + sources."ajv-5.5.2" + sources."ansi-0.3.1" + sources."ansi-align-2.0.0" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."are-we-there-yet-1.1.4" + sources."array-find-index-1.0.2" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" sources."async-2.6.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."bin-version-1.0.4" + (sources."bin-version-check-2.1.0" // { + dependencies = [ + sources."semver-4.3.6" + ]; + }) + sources."boom-4.3.1" + sources."boxen-1.3.0" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" + sources."builtin-modules-1.1.1" + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."lowercase-keys-1.0.0" + ]; + }) + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" sources."chalk-1.1.3" + sources."chardet-0.4.2" + sources."ci-info-1.1.3" + sources."clean-stack-1.3.0" + sources."cli-boxes-1.0.0" + sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" - sources."configstore-3.1.1" + sources."cli-width-2.2.0" + sources."clone-1.0.4" + sources."clone-regexp-1.0.1" + sources."clone-response-1.0.2" + sources."clone-stats-0.0.1" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."configstore-3.1.2" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" + sources."cross-spawn-async-2.2.5" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."crypto-random-string-1.0.0" + sources."currently-unhandled-0.4.1" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" + sources."deep-extend-0.4.2" + sources."default-uid-1.0.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."diff-3.5.0" + sources."dot-prop-4.2.0" + sources."downgrade-root-1.2.2" + sources."duplexer3-0.1.4" + sources."each-async-1.1.1" + sources."ecc-jsbn-0.1.1" + sources."error-ex-1.3.1" + sources."escape-string-regexp-1.0.5" + sources."execa-0.6.3" + sources."execall-1.0.0" + sources."exit-hook-1.1.1" + sources."extend-3.0.1" + sources."external-editor-2.2.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" - sources."fullname-3.3.0" - sources."got-6.7.1" - sources."humanize-string-1.0.1" + sources."filter-obj-1.1.0" + sources."find-up-1.1.2" + sources."find-versions-1.2.1" + sources."first-chunk-stream-2.0.0" + sources."foreachasync-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."from2-2.3.0" + sources."fs.realpath-1.0.0" + (sources."fullname-3.3.0" // { + dependencies = [ + sources."npm-run-path-1.0.0" + sources."path-key-1.0.0" + sources."pify-2.3.0" + ]; + }) + sources."gauge-1.2.7" + sources."get-stdin-4.0.1" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."global-dirs-0.1.1" + sources."globby-6.1.0" + sources."got-8.3.0" + sources."graceful-fs-4.1.11" + sources."grouped-queue-0.3.3" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."has-unicode-2.0.1" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."hosted-git-info-2.6.0" + sources."http-cache-semantics-3.8.1" + sources."http-signature-1.2.0" + sources."humanize-string-1.0.2" + sources."iconv-lite-0.4.21" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."indent-string-3.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" (sources."inquirer-3.3.0" // { dependencies = [ - sources."chalk-2.3.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" + sources."strip-ansi-4.0.0" + sources."supports-color-5.3.0" ]; }) (sources."insight-0.8.4" // { dependencies = [ + sources."ansi-escapes-1.4.0" sources."async-1.5.2" - sources."configstore-1.4.0" - sources."inquirer-0.10.1" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."figures-1.7.0" + sources."inquirer-0.10.1" + sources."is-fullwidth-code-point-1.0.0" sources."lodash-3.10.1" + sources."minimist-0.0.8" + sources."mute-stream-0.0.5" + sources."onetime-1.1.0" + sources."restore-cursor-1.0.1" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" ]; }) - sources."lodash-4.17.4" + sources."into-stream-3.1.0" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-ci-1.1.0" + sources."is-docker-1.1.0" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-2.0.0" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" + sources."is-obj-1.0.1" + sources."is-object-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-plain-obj-1.1.0" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-regexp-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-root-1.0.0" + sources."is-scoped-1.0.0" + sources."is-stream-1.1.0" + sources."is-supported-regexp-flag-1.0.1" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."isurl-1.0.0" + sources."jsbn-0.1.1" + sources."json-buffer-3.0.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."keyv-3.0.0" + sources."latest-version-3.1.0" + sources."load-json-file-1.1.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.5" + sources."lodash._getnative-3.9.1" + sources."lodash.debounce-3.1.1" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + sources."log-symbols-1.0.2" + sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" + sources."make-dir-1.2.0" + sources."map-obj-1.0.1" + sources."mem-1.1.0" + sources."mem-fs-1.1.3" (sources."meow-3.7.0" // { dependencies = [ + sources."indent-string-2.1.0" + sources."pify-2.3.0" sources."read-pkg-up-1.0.1" ]; }) - (sources."npm-keyword-4.2.0" // { + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."mimic-response-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."normalize-package-data-2.4.0" + sources."normalize-url-2.0.1" + (sources."npm-keyword-5.0.0" // { dependencies = [ - sources."got-5.7.1" + sources."got-7.1.0" + sources."p-cancelable-0.3.0" + sources."p-timeout-1.2.1" + sources."prepend-http-1.0.4" + sources."url-parse-lax-1.0.0" ]; }) + sources."npm-run-path-2.0.2" + sources."npmlog-2.0.4" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."object-values-1.0.0" + sources."once-1.4.0" + sources."onetime-2.0.1" sources."opn-4.0.2" - (sources."package-json-2.4.0" // { + sources."os-homedir-1.0.2" + (sources."os-name-1.0.3" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."os-shim-0.1.3" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."osx-release-1.1.0" + sources."p-any-1.1.0" + sources."p-cancelable-0.4.1" + sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" + sources."p-limit-1.2.0" + sources."p-locate-2.0.0" + sources."p-some-2.0.1" + sources."p-timeout-2.0.1" + sources."p-try-1.0.0" + (sources."package-json-4.0.1" // { dependencies = [ - sources."got-5.7.1" + sources."got-6.7.1" + sources."prepend-http-1.0.4" + sources."url-parse-lax-1.0.0" ]; }) + sources."pad-component-0.0.1" sources."parse-help-0.1.1" - sources."read-pkg-up-2.0.0" - sources."root-check-1.0.0" - sources."sort-on-2.0.0" - sources."string-length-1.0.1" - (sources."tabtab-1.3.2" // { + sources."parse-json-2.2.0" + (sources."passwd-user-2.1.0" // { dependencies = [ - sources."inquirer-1.2.3" - sources."figures-1.7.0" + sources."execa-0.4.0" ]; }) - sources."titleize-1.0.0" - (sources."update-notifier-2.3.0" // { + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-type-1.1.0" + sources."performance-now-2.1.0" + sources."pify-3.0.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."query-string-5.1.1" + sources."rc-1.2.6" + sources."read-pkg-1.1.0" + (sources."read-pkg-up-2.0.0" // { dependencies = [ - sources."chalk-2.3.0" - sources."package-json-4.0.1" + sources."find-up-2.1.0" + sources."load-json-file-2.0.0" + sources."path-exists-3.0.0" + sources."path-type-2.0.0" + sources."pify-2.3.0" + sources."read-pkg-2.0.0" + sources."strip-bom-3.0.0" ]; }) - sources."user-home-2.0.0" - sources."yeoman-character-1.1.0" - sources."yeoman-doctor-2.1.0" - (sources."yeoman-environment-2.0.5" // { + sources."readable-stream-2.3.6" + sources."readline2-1.0.1" + sources."redent-1.0.0" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."repeating-2.0.1" + sources."replace-ext-0.0.1" + sources."request-2.85.0" + sources."responselike-1.0.2" + sources."restore-cursor-2.0.0" + sources."root-check-1.0.0" + sources."run-async-2.3.0" + sources."rx-4.1.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."scoped-regex-1.0.0" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."semver-regex-1.0.0" + (sources."semver-truncate-1.1.2" // { dependencies = [ - sources."chalk-2.3.0" + sources."semver-5.5.0" ]; }) - sources."yosay-2.0.1" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-4.5.0" - sources."ansi-regex-2.1.1" - sources."dot-prop-4.2.0" - sources."graceful-fs-4.1.11" - sources."make-dir-1.1.0" - sources."unique-string-1.0.0" - sources."write-file-atomic-1.3.4" - 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."signal-exit-3.0.2" - sources."lru-cache-4.1.1" + sources."set-immediate-shim-1.0.1" sources."shebang-command-1.2.0" - sources."which-1.3.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" sources."shebang-regex-1.0.0" - sources."isexe-2.0.0" - sources."execa-0.7.0" - 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" - sources."rc-1.2.2" - 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."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-2.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."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - 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.1.1" - 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."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-2.2.0" - sources."external-editor-1.1.1" - sources."mute-stream-0.0.6" - sources."run-async-2.3.0" - sources."rx-lite-3.1.2" - sources."rx-lite-aggregates-4.0.8" - sources."string-width-1.0.2" - sources."through-2.3.8" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."restore-cursor-1.0.1" - sources."onetime-1.1.0" - sources."iconv-lite-0.4.19" - sources."jschardet-1.6.0" - sources."tmp-0.0.29" - sources."os-tmpdir-1.0.2" - sources."is-promise-2.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."lodash.debounce-3.1.1" - sources."os-name-1.0.3" - sources."request-2.83.0" - sources."tough-cookie-2.3.3" - sources."uuid-3.1.0" - sources."mkdirp-0.5.1" - sources."osenv-0.1.4" - sources."os-homedir-1.0.2" + sources."signal-exit-3.0.2" sources."slide-1.1.6" - sources."readline2-1.0.1" - 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" - sources."win-release-1.1.1" - sources."semver-5.4.1" - sources."aws-sign2-0.7.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.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."qs-6.5.1" - sources."stringstream-0.0.5" - sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.3.0" - sources."har-schema-2.0.0" - sources."co-4.6.0" - sources."fast-deep-equal-1.0.0" - sources."fast-json-stable-stringify-2.0.0" - sources."json-schema-traverse-0.3.1" - sources."hoek-4.2.0" - sources."boom-5.2.0" - sources."cryptiles-3.1.2" sources."sntp-2.1.0" - sources."assert-plus-1.0.0" - sources."jsprim-1.4.1" - sources."sshpk-1.13.1" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - sources."verror-1.10.0" - sources."core-util-is-1.0.2" - sources."asn1-0.2.3" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - 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.30.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.4.0" - sources."redent-1.0.0" - sources."trim-newlines-1.0.0" - sources."camelcase-4.1.0" - sources."currently-unhandled-0.4.1" - sources."array-find-index-1.0.2" - sources."hosted-git-info-2.5.0" - sources."is-builtin-module-1.0.0" - sources."validate-npm-package-license-3.0.1" - sources."builtin-modules-1.1.1" - sources."spdx-correct-1.0.2" - sources."spdx-expression-parse-1.0.4" - sources."spdx-license-ids-1.2.2" - sources."find-up-2.1.0" - sources."read-pkg-2.0.0" - sources."path-exists-3.0.0" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" - sources."load-json-file-2.0.0" - sources."path-type-2.0.0" - sources."parse-json-2.2.0" + sources."sort-keys-2.0.0" + sources."sort-on-2.0.0" + sources."spawn-sync-1.0.15" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."sshpk-1.14.1" + sources."strict-uri-encode-1.1.0" + sources."string-length-1.0.1" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" 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-bom-stream-2.0.0" + sources."strip-eof-1.0.0" 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."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."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."locate-path-2.0.0" - sources."p-locate-2.0.0" - sources."p-limit-1.1.0" - sources."downgrade-root-1.2.2" + sources."strip-json-comments-2.0.1" 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."debug-3.1.0" - sources."npmlog-2.0.4" - sources."ms-2.0.0" - sources."rx-4.1.0" - sources."spawn-sync-1.0.15" - sources."concat-stream-1.6.0" - sources."os-shim-0.1.3" - sources."typedarray-0.0.6" - sources."ansi-0.3.1" - 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-1.2.2" - sources."import-lazy-2.1.0" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - sources."latest-version-3.1.0" - sources."semver-diff-2.1.0" - sources."ansi-align-2.0.0" - sources."cli-boxes-1.0.0" + sources."supports-color-2.0.0" + (sources."tabtab-1.3.2" // { + dependencies = [ + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."external-editor-1.1.1" + sources."figures-1.7.0" + sources."inquirer-1.2.3" + sources."is-fullwidth-code-point-1.0.0" + sources."mute-stream-0.0.6" + sources."onetime-1.1.0" + sources."restore-cursor-1.0.1" + sources."string-width-1.0.2" + sources."tmp-0.0.29" + ]; + }) + sources."taketalk-1.0.0" sources."term-size-1.2.0" - sources."widest-line-1.0.0" - sources."global-dirs-0.1.0" - sources."is-path-inside-1.0.0" - sources."path-is-inside-1.0.2" - sources."bin-version-check-2.1.0" - sources."each-async-1.1.1" - sources."log-symbols-2.1.0" - sources."object-values-1.0.0" - sources."twig-0.8.9" - sources."bin-version-1.0.4" - 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.4" - sources."foreachasync-3.0.0" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."diff-3.4.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-3.0.2" - sources."array-union-1.0.2" - 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."through-2.3.8" sources."through2-2.0.3" + sources."timed-out-4.0.1" + sources."titleize-1.0.1" + sources."tmp-0.0.33" + sources."tough-cookie-2.3.4" + sources."trim-newlines-1.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."twig-0.8.9" + sources."typedarray-0.0.6" + sources."unique-string-1.0.0" + sources."untildify-3.0.2" + sources."unzip-response-2.0.1" + (sources."update-notifier-2.4.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."camelcase-4.1.0" + sources."chalk-2.3.2" + sources."execa-0.7.0" + sources."supports-color-5.3.0" + ]; + }) + sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-license-3.0.3" + sources."verror-1.10.0" sources."vinyl-1.2.0" sources."vinyl-file-2.0.0" + sources."walk-2.3.13" + sources."which-1.3.0" + sources."widest-line-2.0.0" + sources."win-release-1.1.1" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."xtend-4.0.1" - sources."clone-1.0.3" - 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."pad-component-0.0.1" - sources."taketalk-1.0.0" - sources."wrap-ansi-2.1.0" + sources."yallist-2.1.2" + (sources."yeoman-character-1.1.0" // { + dependencies = [ + sources."has-flag-1.0.0" + sources."supports-color-3.2.3" + ]; + }) + (sources."yeoman-doctor-2.1.0" // { + dependencies = [ + sources."onetime-1.1.0" + ]; + }) + (sources."yeoman-environment-2.0.6" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" + sources."debug-3.1.0" + sources."log-symbols-2.2.0" + sources."pify-2.3.0" + sources."supports-color-5.3.0" + ]; + }) + (sources."yosay-2.0.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -35686,5 +45735,6 @@ in license = "BSD-2-Clause"; }; production = true; + bypassCache = false; }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json new file mode 100644 index 0000000000000000000000000000000000000000..2d987cbfb1bd99ec960c97c514ea7aa0db750453 --- /dev/null +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -0,0 +1,18 @@ +[ + "bower" +, "coffee-script" +, "create-cycle-app" +, "dat" +, "grunt-cli" +, "mocha" +, "nijs" +, "node-gyp" +, "node-gyp-build" +, "node-pre-gyp" +, "pnpm" +, "semver" +, "sloc" +, "vue-cli" +, "swagger" +, "npm" +] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix new file mode 100644 index 0000000000000000000000000000000000000000..4b2e714c42dbaf3235ea1aaa740d4a41b1458deb --- /dev/null +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -0,0 +1,9393 @@ +# This file has been generated by node2nix 1.5.3. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "@cycle/dom-18.3.0" = { + name = "_at_cycle_slash_dom"; + packageName = "@cycle/dom"; + version = "18.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/dom/-/dom-18.3.0.tgz"; + sha1 = "37b9f55c6b0f629d1b689ece57637768fbeed2b0"; + }; + }; + "@cycle/http-14.9.0" = { + name = "_at_cycle_slash_http"; + packageName = "@cycle/http"; + version = "14.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/http/-/http-14.9.0.tgz"; + sha512 = "0ahsk9basb6qimsb40yr40vxxkmmfiqlig23brc5dymic61gfhzg2mzqz5cvkiz2y8g2rwnlwb619fkd3f4hw1yg8bkbczcaxzcrqn0"; + }; + }; + "@cycle/isolate-3.2.0" = { + name = "_at_cycle_slash_isolate"; + packageName = "@cycle/isolate"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.2.0.tgz"; + sha512 = "1g3jcq2dmxpqn3nyvclbf9hnp18h4c41vsqywp2yf2mda92bzdjwidq8f231yxb6rs6r39zpvn741kjify4h5zl4d8ix1xigilbcyj7"; + }; + }; + "@cycle/run-3.4.0" = { + name = "_at_cycle_slash_run"; + packageName = "@cycle/run"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/run/-/run-3.4.0.tgz"; + sha512 = "2ir1dz9dh2ajf6yaks8nznfm89m0jh09hgadzwfml7xw3d49hks008sz3fq5rp9ax2d7r87y6hcq5hv9xz2qrkx1c1qc2r7xlz74ik1"; + }; + }; + "@cycle/time-0.10.1" = { + name = "_at_cycle_slash_time"; + packageName = "@cycle/time"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/time/-/time-0.10.1.tgz"; + sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; + }; + }; + "@types/node-9.6.2" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "9.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz"; + sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai"; + }; + }; + "@types/superagent-3.5.6" = { + name = "_at_types_slash_superagent"; + packageName = "@types/superagent"; + version = "3.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/superagent/-/superagent-3.5.6.tgz"; + sha512 = "31mxn8niw3v1nam9lh29lrq867gjkbv2q6fs0w07miff4mz73066cn5n24f1vmnqpvyv6hbh83b6xll66911a8hj54apmn12s8ras68"; + }; + }; + "URIjs-1.16.1" = { + name = "URIjs"; + packageName = "URIjs"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/URIjs/-/URIjs-1.16.1.tgz"; + sha1 = "edebc678b8b74b26b05d2b481e12383f5ae04b8b"; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + }; + }; + "absolute-0.0.1" = { + name = "absolute"; + packageName = "absolute"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/absolute/-/absolute-0.0.1.tgz"; + sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; + }; + }; + "abstract-random-access-1.1.2" = { + name = "abstract-random-access"; + packageName = "abstract-random-access"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-random-access/-/abstract-random-access-1.1.2.tgz"; + sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; + }; + }; + "ajv-5.5.2" = { + name = "ajv"; + packageName = "ajv"; + version = "5.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; + sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "ansi-diff-stream-1.2.1" = { + name = "ansi-diff-stream"; + packageName = "ansi-diff-stream"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; + sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix"; + }; + }; + "ansi-escapes-1.4.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + }; + }; + "ansi-escapes-3.1.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; + sha512 = "1bm72rs09dwjhfif8kqjxnpb5fgmcdgkn5483f11j6791s5161f2kvxy69pkgcq0jdws6kqfmr1bx5189lnvkzgkq851qs3gzq1n02j"; + }; + }; + "ansi-red-0.1.1" = { + name = "ansi-red"; + packageName = "ansi-red"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz"; + sha1 = "8c638f9d1080800a353c9c28c8a81ca4705d946c"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; + }; + }; + "ansi-wrap-0.1.0" = { + name = "ansi-wrap"; + packageName = "ansi-wrap"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; + sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; + }; + }; + "anymatch-1.3.2" = { + name = "anymatch"; + packageName = "anymatch"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; + sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; + }; + }; + "anymatch-2.0.0" = { + name = "anymatch"; + packageName = "anymatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; + sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6"; + }; + }; + "ap-0.1.0" = { + name = "ap"; + packageName = "ap"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ap/-/ap-0.1.0.tgz"; + sha1 = "d8a3f26615379398a1b53ca6cc1a666a0fbfe150"; + }; + }; + "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"; + }; + }; + "append-tree-2.4.1" = { + name = "append-tree"; + packageName = "append-tree"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.1.tgz"; + sha512 = "2zb14nlfxs726ng8jhfpf6n9b9kw32smg2krcl0vj90dfrkcc20fm36j2zgdd49b2ln1z4jz2wvvy4qgss14zzfr3rps719h6vlyjg7"; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; + }; + }; + "are-we-there-yet-1.1.4" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; + sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + }; + }; + "arr-diff-2.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; + sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + }; + }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "array-differ-1.0.0" = { + name = "array-differ"; + packageName = "array-differ"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; + sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; + }; + }; + "array-lru-1.1.1" = { + name = "array-lru"; + packageName = "array-lru"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-lru/-/array-lru-1.1.1.tgz"; + sha1 = "0c7e1b4e022ae166ff1e8448c595f3181fcd3337"; + }; + }; + "array-union-1.0.2" = { + name = "array-union"; + packageName = "array-union"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + }; + "array-uniq-1.0.3" = { + name = "array-uniq"; + packageName = "array-uniq"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + }; + "array-unique-0.2.1" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"; + sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + }; + }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + 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"; + }; + }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; + "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"; + }; + }; + "async-1.0.0" = { + name = "async"; + packageName = "async"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; + sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; + }; + }; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + }; + "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"; + }; + }; + "async-2.6.0" = { + name = "async"; + packageName = "async"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; + sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; + }; + }; + "async-each-1.0.1" = { + name = "async-each"; + packageName = "async-each"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"; + sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; + }; + }; + "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"; + }; + }; + "atob-2.1.0" = { + name = "atob"; + packageName = "atob"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz"; + sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a"; + }; + }; + "atomic-batcher-1.0.2" = { + name = "atomic-batcher"; + packageName = "atomic-batcher"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atomic-batcher/-/atomic-batcher-1.0.2.tgz"; + sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4"; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.7.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; + sha512 = "3rkdcpm3myysvq9nj6plgvpngzsbv7qk1wvb9f4m3gcsl23pf5x0hyph02svyl2v1lgjji8kl75ii7q04lhhhgjyw1irbinmxsl6qyz"; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; + }; + }; + "base64-js-0.0.8" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; + sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; + }; + }; + "bcrypt-pbkdf-1.0.1" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + }; + }; + "bencode-1.0.0" = { + name = "bencode"; + packageName = "bencode"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz"; + sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p"; + }; + }; + "bencode-2.0.0" = { + name = "bencode"; + packageName = "bencode"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz"; + sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2"; + }; + }; + "binary-extensions-1.11.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz"; + sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"; + }; + }; + "bitfield-rle-2.1.0" = { + name = "bitfield-rle"; + packageName = "bitfield-rle"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitfield-rle/-/bitfield-rle-2.1.0.tgz"; + sha1 = "ae29e9382a7ba4898de9f48bb23fd338c4fbdcf8"; + }; + }; + "bittorrent-dht-7.10.0" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "7.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.10.0.tgz"; + sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; + }; + }; + "bl-1.2.2" = { + name = "bl"; + packageName = "bl"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; + sha512 = "0810nalazir8szyxvbg53d7416j4a7xy94sdri37mwmnax9s9hx88mzky882sr9dv0is7w9fqlp7ys6ijr1z1imc2dnfxk8fri51jvv"; + }; + }; + "blake2b-2.1.2" = { + name = "blake2b"; + packageName = "blake2b"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2b/-/blake2b-2.1.2.tgz"; + sha1 = "6880eddca35cfede92c4fb2724221334f989145a"; + }; + }; + "blake2b-wasm-1.1.7" = { + name = "blake2b-wasm"; + packageName = "blake2b-wasm"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.7.tgz"; + sha512 = "1q4aaql83818qzgh01c6x9jvcchmd6bq7r0kfs3f364vhwxnp7qc25y3h2ij5751mi1zhh96874ib0afn8an92xh3ag1kv5g2yhflm0"; + }; + }; + "block-stream-0.0.9" = { + name = "block-stream"; + packageName = "block-stream"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + }; + }; + "bluebird-3.5.1" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; + sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; + }; + }; + "body-0.1.0" = { + name = "body"; + packageName = "body"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body/-/body-0.1.0.tgz"; + sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8"; + }; + }; + "body-parser-1.12.4" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.12.4"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz"; + sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; + }; + }; + "boom-4.3.1" = { + name = "boom"; + packageName = "boom"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; + sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; + }; + }; + "boom-5.2.0" = { + name = "boom"; + packageName = "boom"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; + sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; + }; + }; + "boxen-1.3.0" = { + name = "boxen"; + packageName = "boxen"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; + sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc"; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + }; + }; + "braces-1.8.5" = { + name = "braces"; + packageName = "braces"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; + sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + }; + }; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8"; + }; + }; + "browser-stdout-1.3.1" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; + sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; + }; + }; + "buffer-3.6.0" = { + name = "buffer"; + packageName = "buffer"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; + sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; + }; + }; + "buffer-alloc-1.1.0" = { + name = "buffer-alloc"; + packageName = "buffer-alloc"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz"; + sha1 = "05514d33bf1656d3540c684f65b1202e90eca303"; + }; + }; + "buffer-alloc-unsafe-0.1.1" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz"; + sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a"; + }; + }; + "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"; + }; + }; + "buffer-crc32-0.2.13" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + }; + "buffer-equals-1.0.4" = { + name = "buffer-equals"; + packageName = "buffer-equals"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; + sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; + }; + }; + "buffer-fill-0.1.1" = { + name = "buffer-fill"; + packageName = "buffer-fill"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz"; + sha512 = "3nny0zbpnaxp1544gp7lc53jvs1jgzpmp92cy939dik36bi8lvhrsh4g082lxdplwsma22cgg9q93dw5dnbn1ljqkh4fb2i6w3lq032"; + }; + }; + "buffer-from-1.0.0" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz"; + sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk"; + }; + }; + "buffer-indexof-1.1.1" = { + name = "buffer-indexof"; + packageName = "buffer-indexof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; + }; + }; + "builtins-1.0.3" = { + name = "builtins"; + packageName = "builtins"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + }; + }; + "bulk-write-stream-1.1.4" = { + name = "bulk-write-stream"; + packageName = "bulk-write-stream"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz"; + sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs"; + }; + }; + "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"; + }; + }; + "bytes-1.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + }; + "bytes-2.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; + sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; + }; + }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; + }; + }; + "call-me-maybe-1.0.1" = { + name = "call-me-maybe"; + packageName = "call-me-maybe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; + "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"; + }; + }; + "caw-2.0.1" = { + name = "caw"; + packageName = "caw"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; + sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; + }; + }; + "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"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "chalk-2.3.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz"; + sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4"; + }; + }; + "chardet-0.4.2" = { + name = "chardet"; + packageName = "chardet"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz"; + sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; + }; + }; + "charenc-0.0.2" = { + name = "charenc"; + packageName = "charenc"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + }; + }; + "chokidar-2.0.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz"; + sha512 = "0r9sfr7gz91aphg4vk476c4z07gqq6wdyhlhk3brazjwfvqz9jqccl19qyrwiwijx0aw85jw0zhnfayapk9wzzcj9wcqp3dhrfj4vyd"; + }; + }; + "chownr-1.0.1" = { + name = "chownr"; + packageName = "chownr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; + sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + }; + }; + "ci-info-1.1.3" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz"; + sha512 = "0p634fyx3kkll2blj5f5bjmz273d7ba201yi3jlrvy7p7lnmmi479d6s3khwmp9lnfrb314l4kw5dq40q60hzfnmfycqibzm3izrbs8"; + }; + }; + "circular-append-file-1.0.1" = { + name = "circular-append-file"; + packageName = "circular-append-file"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz"; + sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05"; + }; + }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; + }; + }; + "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"; + }; + }; + "cli-cursor-1.0.2" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + }; + }; + "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-spinners-1.3.1" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz"; + sha512 = "1vad3gya61nh9npwcrcrq0d7sq9v0a2zaqvvnhbzpqxfp24qkh3xb8372fk9yx7l1nm9gz2gvzjysksh9ggwlvzah1lp816ivkzh0nm"; + }; + }; + "cli-table-0.3.1" = { + name = "cli-table"; + packageName = "cli-table"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; + sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + }; + }; + "cli-truncate-1.1.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz"; + sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; + }; + }; + "cli-width-1.1.1" = { + name = "cli-width"; + packageName = "cli-width"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"; + sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"; + }; + }; + "cli-width-2.2.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + }; + "cliclopts-1.1.1" = { + name = "cliclopts"; + packageName = "cliclopts"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cliclopts/-/cliclopts-1.1.1.tgz"; + sha1 = "69431c7cb5af723774b0d3911b4c37512431910f"; + }; + }; + "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"; + }; + }; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + }; + "clone-2.0.0" = { + name = "clone"; + packageName = "clone"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.0.0.tgz"; + sha1 = "df65d3ca142e4a4a47db33da3468d088a16fc76e"; + }; + }; + "co-3.1.0" = { + name = "co"; + packageName = "co"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-3.1.0.tgz"; + sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; + }; + }; + "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"; + }; + }; + "co-from-stream-0.0.0" = { + name = "co-from-stream"; + packageName = "co-from-stream"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co-from-stream/-/co-from-stream-0.0.0.tgz"; + sha1 = "1a5cd8ced77263946094fa39f2499a63297bcaf9"; + }; + }; + "co-fs-extra-1.2.1" = { + name = "co-fs-extra"; + packageName = "co-fs-extra"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/co-fs-extra/-/co-fs-extra-1.2.1.tgz"; + sha1 = "3b6ad77cf2614530f677b1cf62664f5ba756b722"; + }; + }; + "co-read-0.0.1" = { + name = "co-read"; + packageName = "co-read"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/co-read/-/co-read-0.0.1.tgz"; + sha1 = "f81b3eb8a86675fec51e3d883a7f564e873c9389"; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "codecs-1.2.1" = { + name = "codecs"; + packageName = "codecs"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/codecs/-/codecs-1.2.1.tgz"; + sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8"; + }; + }; + "coffee-script-1.12.7" = { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "color-convert-1.9.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz"; + sha512 = "32rj1090g95xcvm0d2ya6jbqdhiy9w2wv3picdy33fzrm455v0gi7g4n8lw0n31g37wwbdnz7lxjsisgbsaqz1d10j9nh5hi2f9lccs"; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "colors-1.0.3" = { + name = "colors"; + packageName = "colors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + }; + "colors-1.2.1" = { + name = "colors"; + packageName = "colors"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz"; + sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk"; + }; + }; + "combine-errors-3.0.3" = { + name = "combine-errors"; + packageName = "combine-errors"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/combine-errors/-/combine-errors-3.0.3.tgz"; + sha1 = "f4df6740083e5703a3181110c2b10551f003da86"; + }; + }; + "combined-stream-1.0.6" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + }; + }; + "commander-0.6.1" = { + name = "commander"; + packageName = "commander"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + }; + "commander-2.11.0" = { + name = "commander"; + packageName = "commander"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; + }; + }; + "commander-2.15.1" = { + name = "commander"; + packageName = "commander"; + version = "2.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; + sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn"; + }; + }; + "commander-2.3.0" = { + name = "commander"; + packageName = "commander"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; + sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; + }; + }; + "config-chain-1.1.11" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; + sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + }; + }; + "configstore-3.1.2" = { + name = "configstore"; + packageName = "configstore"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; + sha512 = "2difdg3f56d584kfxl1zvm4ik5m3ln949m0q9sxq6ranzx2iwqa9zxqxy2l5i2lsm8jwmaiqkf7rc73gfnfip5m2qh8awd3s4ggknxy"; + }; + }; + "connect-3.6.6" = { + name = "connect"; + packageName = "connect"; + version = "3.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"; + sha1 = "09eff6c55af7236e137135a72574858b6786f524"; + }; + }; + "connections-1.4.2" = { + name = "connections"; + packageName = "connections"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connections/-/connections-1.4.2.tgz"; + sha1 = "7890482bf5c71af6c5ca192be3136aed74428aad"; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "consolidate-0.14.5" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz"; + sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + }; + }; + "content-types-0.1.0" = { + name = "content-types"; + packageName = "content-types"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/content-types/-/content-types-0.1.0.tgz"; + sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; + }; + }; + "cookiejar-2.0.6" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz"; + sha1 = "0abf356ad00d1c5a219d88d44518046dd026acfe"; + }; + }; + "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"; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "corsify-2.1.0" = { + name = "corsify"; + packageName = "corsify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/corsify/-/corsify-2.1.0.tgz"; + sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; + }; + }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "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"; + }; + }; + "crypt-0.0.2" = { + name = "crypt"; + packageName = "crypt"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + }; + }; + "cryptiles-3.1.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; + sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; + }; + }; + "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"; + }; + }; + "cssauron-1.4.0" = { + name = "cssauron"; + packageName = "cssauron"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz"; + sha1 = "a6602dff7e04a8306dc0db9a551e92e8b5662ad8"; + }; + }; + "custom-error-instance-2.1.1" = { + name = "custom-error-instance"; + packageName = "custom-error-instance"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz"; + sha1 = "3cf6391487a6629a6247eb0ca0ce00081b7e361a"; + }; + }; + "cycle-1.0.3" = { + name = "cycle"; + packageName = "cycle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + }; + "cycle-onionify-4.0.0" = { + name = "cycle-onionify"; + packageName = "cycle-onionify"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cycle-onionify/-/cycle-onionify-4.0.0.tgz"; + sha1 = "9aeddd88dedf6fda9fbb98b1e79ab38810b7ddda"; + }; + }; + "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"; + }; + }; + "dag-map-1.0.2" = { + name = "dag-map"; + packageName = "dag-map"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dag-map/-/dag-map-1.0.2.tgz"; + sha1 = "e8379f041000ed561fc515475c1ed2c85eece8d7"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "dat-dns-1.3.2" = { + name = "dat-dns"; + packageName = "dat-dns"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-dns/-/dat-dns-1.3.2.tgz"; + sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad"; + }; + }; + "dat-doctor-1.3.1" = { + name = "dat-doctor"; + packageName = "dat-doctor"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz"; + sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk"; + }; + }; + "dat-encoding-4.0.2" = { + name = "dat-encoding"; + packageName = "dat-encoding"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-4.0.2.tgz"; + sha1 = "b01068fe0d080f3d3e4985a0c4ad21b7c14675f6"; + }; + }; + "dat-encoding-5.0.1" = { + name = "dat-encoding"; + packageName = "dat-encoding"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-5.0.1.tgz"; + sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w"; + }; + }; + "dat-ignore-2.1.1" = { + name = "dat-ignore"; + packageName = "dat-ignore"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; + sha512 = "3ars15n4l3fgvnzah15zpfzirg66clg2a72d2qawg340ad1f0xbahxgzfj52q3ib48s6k7m4a8zcpv5n3pq2blkm1dhpyz1s9d9y44d"; + }; + }; + "dat-json-1.0.2" = { + name = "dat-json"; + packageName = "dat-json"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz"; + sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi"; + }; + }; + "dat-link-resolve-2.1.0" = { + name = "dat-link-resolve"; + packageName = "dat-link-resolve"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.0.tgz"; + sha512 = "0dzpf71lpzr1z3g6m3v29xvcs9r12sgjpzzmg2viy3azkgpscl7p2v8im2ibsa22q64abifkibb4nc3nshs19wvai67m3gdqx15qzvn"; + }; + }; + "dat-log-1.1.1" = { + name = "dat-log"; + packageName = "dat-log"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-log/-/dat-log-1.1.1.tgz"; + sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; + }; + }; + "dat-node-3.5.8" = { + name = "dat-node"; + packageName = "dat-node"; + version = "3.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.8.tgz"; + sha512 = "3j28p80dwmic3g00asmcpgiv3sh3s8023x1023g7bm534h1ai8i2zryivx95gc22is64k9mynmqr2g0ny25xp1f7h1cbc25klizg8dc"; + }; + }; + "dat-registry-4.0.0" = { + name = "dat-registry"; + packageName = "dat-registry"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-registry/-/dat-registry-4.0.0.tgz"; + sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; + }; + }; + "dat-secret-storage-4.0.1" = { + name = "dat-secret-storage"; + packageName = "dat-secret-storage"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.1.tgz"; + sha512 = "3ad9x7n3qxivrj03fsa8ll3i511ivclnyrv1421zklnmskkxxi2d2fykb1kx1sbwdyx35167a7k4mbw63jhxxaz6r54hpd9fad5wj05"; + }; + }; + "dat-storage-1.0.4" = { + name = "dat-storage"; + packageName = "dat-storage"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz"; + sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; + }; + }; + "dat-swarm-defaults-1.0.0" = { + name = "dat-swarm-defaults"; + packageName = "dat-swarm-defaults"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz"; + sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; + }; + }; + "datland-swarm-defaults-1.0.2" = { + name = "datland-swarm-defaults"; + packageName = "datland-swarm-defaults"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz"; + sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; + }; + }; + "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"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + }; + }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "decompress-4.2.0" = { + name = "decompress"; + packageName = "decompress"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz"; + sha1 = "7aedd85427e5a92dacfe55674a7c505e96d01f9d"; + }; + }; + "decompress-tar-4.1.1" = { + name = "decompress-tar"; + packageName = "decompress-tar"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; + sha512 = "18rwwdac0961cs2xpagx8sfqysxzcvvna1bfhjd8aamgm5k6mbcr88k0qp46z1fvypvk00sc27mv0n7885cfwi525gix96659l4rli5"; + }; + }; + "decompress-tarbz2-4.1.1" = { + name = "decompress-tarbz2"; + packageName = "decompress-tarbz2"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; + sha512 = "3s2l466xc70zvxrwsr1xr7x5sg9g9wh2wsvk81pxmhc0m73hwhfhhn63c53n6vkv8rlxs80gscrkpk8fc2mbh3j154cvbzm6wpk3kxk"; + }; + }; + "decompress-targz-4.1.1" = { + name = "decompress-targz"; + packageName = "decompress-targz"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; + sha512 = "3gig705jrzdsihjnfij52kj17mgsclfn5vbzswqqdjd0ac4f0dy0afds02m4zm5jacnppavhydyy0rgd99prk8hkmbcisgbfxk3agz3"; + }; + }; + "decompress-unzip-4.0.1" = { + name = "decompress-unzip"; + packageName = "decompress-unzip"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; + sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69"; + }; + }; + "deep-equal-0.2.2" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"; + sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; + }; + }; + "deep-extend-0.4.2" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; + sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "depd-1.0.1" = { + name = "depd"; + packageName = "depd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "diff-3.5.0" = { + name = "diff"; + packageName = "diff"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; + sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; + }; + }; + "directory-index-html-2.1.0" = { + name = "directory-index-html"; + packageName = "directory-index-html"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/directory-index-html/-/directory-index-html-2.1.0.tgz"; + sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338"; + }; + }; + "discovery-channel-5.5.1" = { + name = "discovery-channel"; + packageName = "discovery-channel"; + version = "5.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz"; + sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h"; + }; + }; + "discovery-swarm-4.4.2" = { + name = "discovery-swarm"; + packageName = "discovery-swarm"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-4.4.2.tgz"; + sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; + }; + }; + "dns-discovery-5.6.1" = { + name = "dns-discovery"; + packageName = "dns-discovery"; + version = "5.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz"; + sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; + }; + }; + "dns-discovery-6.1.0" = { + name = "dns-discovery"; + packageName = "dns-discovery"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz"; + sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a"; + }; + }; + "dns-packet-1.3.1" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; + sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; + }; + }; + "dns-packet-4.2.0" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz"; + sha512 = "05pqsdg5q8r1i9z4dnii6sr7i3b6ir4gay5h3xk18jraa2w3201wfw6mz53dn494dqd19djdfbp78p6v70kia4862sbj5g4jwm40zbf"; + }; + }; + "dns-socket-1.6.3" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz"; + sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy"; + }; + }; + "dns-socket-3.0.0" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz"; + sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k"; + }; + }; + "dns-txt-2.0.2" = { + name = "dns-txt"; + packageName = "dns-txt"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + }; + "dom-walk-0.1.1" = { + name = "dom-walk"; + packageName = "dom-walk"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz"; + sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; + }; + }; + "dot-prop-4.2.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; + sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm"; + }; + }; + "download-5.0.3" = { + name = "download"; + packageName = "download"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/download/-/download-5.0.3.tgz"; + sha1 = "63537f977f99266a30eb8a2a2fbd1f20b8000f7a"; + }; + }; + "download-git-repo-1.0.2" = { + name = "download-git-repo"; + packageName = "download-git-repo"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.2.tgz"; + sha512 = "21sjxnakbaz6gkw8lrk0dizw893hwawsrhaypkxph8cdf6v7gyxl8b4n82qh99v4zvzcbbxbc7ff8jzkkn91vmn0w381vzh9ypi801z"; + }; + }; + "duplexer-0.1.1" = { + name = "duplexer"; + packageName = "duplexer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "duplexify-3.5.4" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz"; + sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7"; + }; + }; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + }; + "ee-first-1.1.0" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "enable-1.3.2" = { + name = "enable"; + packageName = "enable"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/enable/-/enable-1.3.2.tgz"; + sha1 = "9eba6837d16d0982b59f87d889bf754443d52931"; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl"; + }; + }; + "es5-ext-0.10.42" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.42"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz"; + sha512 = "1412ssfrx1kvraz8kp4x9lc1jzcdh2952vbmlimrfalmbjv44rh504ihb4fg5mjwx8ix1f1wii0a0qngwrfk4gl271mcywgp7b4x700"; + }; + }; + "es6-iterator-2.0.3" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + }; + "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-set-0.1.5" = { + name = "es6-set"; + packageName = "es6-set"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + }; + }; + "es6-symbol-3.1.1" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "escape-string-regexp-1.0.2" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"; + sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"; + }; + }; + "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"; + }; + }; + "esprima-4.0.0" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; + sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "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"; + }; + }; + "event-stream-3.3.4" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.3.4"; + src = fetchurl { + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; + sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + }; + }; + "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"; + }; + }; + "exit-hook-1.1.1" = { + name = "exit-hook"; + packageName = "exit-hook"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"; + sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; + }; + }; + "expand-brackets-0.1.5" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; + sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + }; + }; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "expand-range-1.8.2" = { + name = "expand-range"; + packageName = "expand-range"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; + sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + }; + }; + "extend-3.0.0" = { + name = "extend"; + packageName = "extend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + }; + }; + "extend-3.0.1" = { + name = "extend"; + packageName = "extend"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; + sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "external-editor-2.2.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; + sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd"; + }; + }; + "extglob-0.3.2" = { + name = "extglob"; + packageName = "extglob"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; + sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + }; + }; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "eyes-0.1.8" = { + name = "eyes"; + packageName = "eyes"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + }; + "fast-deep-equal-1.1.0" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; + sha1 = "c053477817c86b51daa853c81e059b733d023614"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "fd-read-stream-1.1.0" = { + name = "fd-read-stream"; + packageName = "fd-read-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-read-stream/-/fd-read-stream-1.1.0.tgz"; + sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; + }; + }; + "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"; + }; + }; + "figures-1.7.0" = { + name = "figures"; + packageName = "figures"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + }; + }; + "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"; + }; + }; + "file-type-3.9.0" = { + name = "file-type"; + packageName = "file-type"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; + sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + }; + }; + "file-type-5.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; + sha1 = "2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"; + }; + }; + "file-type-6.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; + sha512 = "0xf8ry7jj1c5mvvp5qxidq3qcqxzdngx1q9r981ddq3wfcidwqd4h52hplv462hvm9frdl086advhfqfxbnvwm8ass3knby6l217xv0"; + }; + }; + "filename-regex-2.0.1" = { + name = "filename-regex"; + packageName = "filename-regex"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; + sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + }; + }; + "filename-reserved-regex-2.0.0" = { + name = "filename-reserved-regex"; + packageName = "filename-reserved-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; + sha1 = "abf73dfab735d045440abfea2d91f389ebbfa229"; + }; + }; + "filenamify-2.0.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-2.0.0.tgz"; + sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695"; + }; + }; + "fill-range-2.2.3" = { + name = "fill-range"; + packageName = "fill-range"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"; + sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; + }; + }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "finalhandler-1.1.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; + sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; + }; + }; + "findup-sync-0.3.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"; + sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; + }; + }; + "flat-tree-1.6.0" = { + name = "flat-tree"; + packageName = "flat-tree"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-tree/-/flat-tree-1.6.0.tgz"; + sha1 = "fca30cddb9006fb656eb5ebc79aeb274e7fde9ed"; + }; + }; + "for-each-0.3.2" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz"; + sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4"; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; + "for-own-0.1.5" = { + name = "for-own"; + packageName = "for-own"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-1.0.0-rc3" = { + name = "form-data"; + packageName = "form-data"; + version = "1.0.0-rc3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"; + sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577"; + }; + }; + "form-data-2.3.2" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; + sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + }; + }; + "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"; + }; + }; + "formidable-1.2.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; + sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn"; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "from-0.1.7" = { + name = "from"; + packageName = "from"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; + sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "fs-extra-0.24.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.24.0.tgz"; + sha1 = "d4e4342a96675cb7846633a6099249332b539952"; + }; + }; + "fs-extra-0.26.7" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.26.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; + sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; + }; + }; + "fs-minipass-1.2.5" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; + sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "fsevents-1.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz"; + sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq"; + }; + }; + "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"; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "get-proxy-2.1.0" = { + name = "get-proxy"; + packageName = "get-proxy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; + sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "git-clone-0.1.0" = { + name = "git-clone"; + packageName = "git-clone"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz"; + sha1 = "0d76163778093aef7f1c30238f2a9ef3f07a2eb9"; + }; + }; + "glob-3.2.11" = { + name = "glob"; + packageName = "glob"; + version = "3.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + }; + }; + "glob-5.0.15" = { + name = "glob"; + packageName = "glob"; + version = "5.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + }; + }; + "glob-7.1.2" = { + name = "glob"; + packageName = "glob"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; + sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; + }; + }; + "glob-base-0.3.0" = { + name = "glob-base"; + packageName = "glob-base"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + }; + }; + "glob-parent-2.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + }; + }; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + }; + "global-4.3.2" = { + name = "global"; + packageName = "global"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global/-/global-4.3.2.tgz"; + sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; + }; + }; + "global-dirs-0.1.1" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz"; + sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; + }; + }; + "got-6.7.1" = { + name = "got"; + packageName = "got"; + version = "6.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + }; + }; + "graceful-fs-4.1.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + }; + }; + "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"; + }; + }; + "graphlib-2.1.5" = { + name = "graphlib"; + packageName = "graphlib"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz"; + sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy"; + }; + }; + "gray-matter-2.1.1" = { + name = "gray-matter"; + packageName = "gray-matter"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz"; + sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; + }; + }; + "growl-1.10.3" = { + name = "growl"; + packageName = "growl"; + version = "1.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; + sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; + }; + }; + "growl-1.9.2" = { + name = "growl"; + packageName = "growl"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; + sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; + }; + }; + "grunt-known-options-1.1.0" = { + name = "grunt-known-options"; + packageName = "grunt-known-options"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; + sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; + }; + }; + "handlebars-4.0.11" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; + sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.0.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; + sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "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"; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-generators-1.0.1" = { + name = "has-generators"; + packageName = "has-generators"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-generators/-/has-generators-1.0.1.tgz"; + sha1 = "a6a2e55486011940482e13e2c93791c449acf449"; + }; + }; + "has-symbol-support-x-1.4.2" = { + name = "has-symbol-support-x"; + packageName = "has-symbol-support-x"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; + sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; + }; + }; + "has-to-string-tag-x-1.4.1" = { + name = "has-to-string-tag-x"; + packageName = "has-to-string-tag-x"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; + sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; + "hawk-6.0.2" = { + name = "hawk"; + packageName = "hawk"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; + sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; + }; + }; + "he-1.1.1" = { + name = "he"; + packageName = "he"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; + sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + }; + }; + "hoek-4.2.1" = { + name = "hoek"; + packageName = "hoek"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; + sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; + }; + }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; + "http-methods-0.1.0" = { + name = "http-methods"; + packageName = "http-methods"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-methods/-/http-methods-0.1.0.tgz"; + sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "hypercore-6.13.0" = { + name = "hypercore"; + packageName = "hypercore"; + version = "6.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz"; + sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw"; + }; + }; + "hypercore-protocol-6.6.4" = { + name = "hypercore-protocol"; + packageName = "hypercore-protocol"; + version = "6.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz"; + sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm"; + }; + }; + "hyperdrive-9.12.3" = { + name = "hyperdrive"; + packageName = "hyperdrive"; + version = "9.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.3.tgz"; + sha512 = "3w0ia766bacphqzgyjhiwbppgdja61vlz2xp6x710dk4pn6570gag3w5xa8rfivh2lvig8v2ics3bkdlm9cmq9kpzjgwzm19a089fb3"; + }; + }; + "hyperdrive-http-4.2.2" = { + name = "hyperdrive-http"; + packageName = "hyperdrive-http"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz"; + sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn"; + }; + }; + "hyperdrive-network-speed-2.1.0" = { + name = "hyperdrive-network-speed"; + packageName = "hyperdrive-network-speed"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.1.0.tgz"; + sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296"; + }; + }; + "i-0.3.6" = { + name = "i"; + packageName = "i"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz"; + sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; + }; + }; + "iconv-lite-0.4.21" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.21"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz"; + sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj"; + }; + }; + "iconv-lite-0.4.8" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; + }; + }; + "ieee754-1.1.11" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz"; + sha512 = "0g5x1ijy37vzfz46pnh03mxkmdb9d2qd9f8ncy49xj4j9xkks9p0x8s5hnyc7grwh6sryk118rd7w7wz6w0hzyw9agwnavvlc4g642n"; + }; + }; + "ignore-by-default-1.0.1" = { + name = "ignore-by-default"; + packageName = "ignore-by-default"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"; + sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; + }; + }; + "ignore-walk-3.0.1" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; + sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + }; + }; + "inquirer-0.10.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz"; + sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a"; + }; + }; + "inquirer-3.3.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz"; + sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; + }; + }; + "ip-1.1.5" = { + name = "ip"; + packageName = "ip"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + }; + "is-3.2.1" = { + name = "is"; + packageName = "is"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is/-/is-3.2.1.tgz"; + sha1 = "d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; + }; + }; + "is-binary-path-1.0.1" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; + }; + }; + "is-ci-1.1.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; + sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; + }; + }; + "is-dotfile-1.0.3" = { + name = "is-dotfile"; + packageName = "is-dotfile"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; + sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; + }; + }; + "is-equal-shallow-0.1.3" = { + name = "is-equal-shallow"; + packageName = "is-equal-shallow"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; + sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; + }; + }; + "is-extglob-1.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; + sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "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"; + }; + }; + "is-function-1.0.1" = { + name = "is-function"; + packageName = "is-function"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz"; + sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + }; + }; + "is-glob-2.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; + sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-glob-4.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz"; + sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; + }; + }; + "is-installed-globally-0.1.0" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; + sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; + }; + }; + "is-invalid-path-0.1.0" = { + name = "is-invalid-path"; + packageName = "is-invalid-path"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz"; + sha1 = "307a855b3cf1a938b44ea70d2c61106053714f34"; + }; + }; + "is-natural-number-4.0.1" = { + name = "is-natural-number"; + packageName = "is-natural-number"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz"; + sha1 = "ab9d76e1db4ced51e35de0c72ebecf09f734cde8"; + }; + }; + "is-npm-1.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + }; + "is-number-2.1.0" = { + name = "is-number"; + packageName = "is-number"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; + sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + }; + }; + "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"; + }; + }; + "is-number-4.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"; + sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd"; + }; + }; + "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"; + }; + }; + "is-object-1.0.1" = { + name = "is-object"; + packageName = "is-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; + sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; + }; + }; + "is-odd-2.0.0" = { + name = "is-odd"; + packageName = "is-odd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz"; + sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r"; + }; + }; + "is-path-inside-1.0.1" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz"; + sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + }; + }; + "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/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; + }; + }; + "is-posix-bracket-0.1.1" = { + name = "is-posix-bracket"; + packageName = "is-posix-bracket"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + }; + }; + "is-primitive-2.0.0" = { + name = "is-primitive"; + packageName = "is-primitive"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; + sha1 = "207bab91638499c07b2adf240a41a87210034575"; + }; + }; + "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-redirect-1.0.0" = { + name = "is-redirect"; + packageName = "is-redirect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "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"; + }; + }; + "is-string-1.0.4" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz"; + sha1 = "cc3a9b69857d621e963725a24caeec873b826e64"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "is-valid-path-0.1.1" = { + name = "is-valid-path"; + packageName = "is-valid-path"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz"; + sha1 = "110f9ff74c37f663e1ec7915eb451f2db93ac9df"; + }; + }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "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"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "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"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "isurl-1.0.0" = { + name = "isurl"; + packageName = "isurl"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; + sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; + }; + }; + "iterators-0.1.0" = { + name = "iterators"; + packageName = "iterators"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/iterators/-/iterators-0.1.0.tgz"; + sha1 = "d03f666ca4e6130138565997cacea54164203156"; + }; + }; + "jade-0.26.3" = { + name = "jade"; + packageName = "jade"; + version = "0.26.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; + sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; + }; + }; + "js-yaml-3.11.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz"; + sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "json-refs-2.1.7" = { + name = "json-refs"; + packageName = "json-refs"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/json-refs/-/json-refs-2.1.7.tgz"; + sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-deref-sync-0.3.4" = { + name = "json-schema-deref-sync"; + packageName = "json-schema-deref-sync"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.3.4.tgz"; + sha512 = "1q3093cgk00pbsrzpb8h1j8cxl21gmnw5xb7wd5i3f47yawm6qmbg5ls94d1h1nhay2vh5fcz0wgfzy2ra2ylw77hrr0306apxj6az1"; + }; + }; + "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"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsonfile-2.4.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "k-bucket-3.3.1" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-3.3.1.tgz"; + sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j"; + }; + }; + "k-bucket-4.0.0" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.0.tgz"; + sha512 = "04i173zw3l2aagsnywafmgs87wzhhkakvnhcfvxbnbmn7rz37rkqkryc8d6x8dccqlmvgawb2vhd49ms8s2wkbg3dh3qlffamzcpshk"; + }; + }; + "k-rpc-4.3.1" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.3.1.tgz"; + sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s"; + }; + }; + "k-rpc-socket-1.8.0" = { + name = "k-rpc-socket"; + packageName = "k-rpc-socket"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz"; + sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz"; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "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"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + }; + }; + "kind-of-6.0.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk"; + }; + }; + "klaw-1.3.1" = { + name = "klaw"; + packageName = "klaw"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"; + sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; + }; + }; + "last-one-wins-1.0.4" = { + name = "last-one-wins"; + packageName = "last-one-wins"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/last-one-wins/-/last-one-wins-1.0.4.tgz"; + sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "length-prefixed-message-3.0.3" = { + name = "length-prefixed-message"; + packageName = "length-prefixed-message"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/length-prefixed-message/-/length-prefixed-message-3.0.3.tgz"; + sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; + }; + }; + "lodash-3.10.1" = { + name = "lodash"; + packageName = "lodash"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; + sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; + }; + }; + "lodash-4.17.5" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; + sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; + }; + }; + "lodash-compat-3.10.2" = { + name = "lodash-compat"; + packageName = "lodash-compat"; + version = "3.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash-compat/-/lodash-compat-3.10.2.tgz"; + sha1 = "c6940128a9d30f8e902cd2cf99fd0cba4ecfc183"; + }; + }; + "lodash._arraypool-2.4.1" = { + name = "lodash._arraypool"; + packageName = "lodash._arraypool"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz"; + sha1 = "e88eecb92e2bb84c9065612fd958a0719cd47f94"; + }; + }; + "lodash._basebind-2.4.1" = { + name = "lodash._basebind"; + packageName = "lodash._basebind"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz"; + sha1 = "e940b9ebdd27c327e0a8dab1b55916c5341e9575"; + }; + }; + "lodash._baseclone-2.4.1" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-2.4.1.tgz"; + sha1 = "30f823e57e17e3735d383bd62b60b387543b4186"; + }; + }; + "lodash._basecreate-2.4.1" = { + name = "lodash._basecreate"; + packageName = "lodash._basecreate"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz"; + sha1 = "f8e6f5b578a9e34e541179b56b8eeebf4a287e08"; + }; + }; + "lodash._basecreatecallback-2.4.1" = { + name = "lodash._basecreatecallback"; + packageName = "lodash._basecreatecallback"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz"; + sha1 = "7d0b267649cb29e7a139d0103b7c11fae84e4851"; + }; + }; + "lodash._basecreatewrapper-2.4.1" = { + name = "lodash._basecreatewrapper"; + packageName = "lodash._basecreatewrapper"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz"; + sha1 = "4d31f2e7de7e134fbf2803762b8150b32519666f"; + }; + }; + "lodash._baseiteratee-4.7.0" = { + name = "lodash._baseiteratee"; + packageName = "lodash._baseiteratee"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz"; + sha1 = "34a9b5543572727c3db2e78edae3c0e9e66bd102"; + }; + }; + "lodash._basetostring-4.12.0" = { + name = "lodash._basetostring"; + packageName = "lodash._basetostring"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"; + sha1 = "9327c9dc5158866b7fa4b9d42f4638e5766dd9df"; + }; + }; + "lodash._baseuniq-4.6.0" = { + name = "lodash._baseuniq"; + packageName = "lodash._baseuniq"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"; + sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; + }; + }; + "lodash._createset-4.0.3" = { + name = "lodash._createset"; + packageName = "lodash._createset"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz"; + sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; + }; + }; + "lodash._createwrapper-2.4.1" = { + name = "lodash._createwrapper"; + packageName = "lodash._createwrapper"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz"; + sha1 = "51d6957973da4ed556e37290d8c1a18c53de1607"; + }; + }; + "lodash._getarray-2.4.1" = { + name = "lodash._getarray"; + packageName = "lodash._getarray"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz"; + sha1 = "faf1f7f810fa985a251c2187404481094839e5ee"; + }; + }; + "lodash._isnative-2.4.1" = { + name = "lodash._isnative"; + packageName = "lodash._isnative"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"; + sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c"; + }; + }; + "lodash._maxpoolsize-2.4.1" = { + name = "lodash._maxpoolsize"; + packageName = "lodash._maxpoolsize"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.4.1.tgz"; + sha1 = "9d482f463b8e66afbe59c2c14edb117060172334"; + }; + }; + "lodash._objecttypes-2.4.1" = { + name = "lodash._objecttypes"; + packageName = "lodash._objecttypes"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"; + sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"; + }; + }; + "lodash._releasearray-2.4.1" = { + name = "lodash._releasearray"; + packageName = "lodash._releasearray"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz"; + sha1 = "a6139630d76d1536b07ddc80962889b082f6a641"; + }; + }; + "lodash._root-3.0.1" = { + name = "lodash._root"; + packageName = "lodash._root"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; + sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; + }; + }; + "lodash._setbinddata-2.4.1" = { + name = "lodash._setbinddata"; + packageName = "lodash._setbinddata"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz"; + sha1 = "f7c200cd1b92ef236b399eecf73c648d17aa94d2"; + }; + }; + "lodash._shimkeys-2.4.1" = { + name = "lodash._shimkeys"; + packageName = "lodash._shimkeys"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"; + sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203"; + }; + }; + "lodash._slice-2.4.1" = { + name = "lodash._slice"; + packageName = "lodash._slice"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz"; + sha1 = "745cf41a53597b18f688898544405efa2b06d90f"; + }; + }; + "lodash._stringtopath-4.8.0" = { + name = "lodash._stringtopath"; + packageName = "lodash._stringtopath"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz"; + sha1 = "941bcf0e64266e5fc1d66fed0a6959544c576824"; + }; + }; + "lodash.assign-2.4.1" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz"; + sha1 = "84c39596dd71181a97b0652913a7c9675e49b1aa"; + }; + }; + "lodash.bind-2.4.1" = { + name = "lodash.bind"; + packageName = "lodash.bind"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz"; + sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267"; + }; + }; + "lodash.clonedeep-2.4.1" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-2.4.1.tgz"; + sha1 = "f29203b40b12fee0a45d3631648259bebabc7868"; + }; + }; + "lodash.flattendeep-4.4.0" = { + name = "lodash.flattendeep"; + packageName = "lodash.flattendeep"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; + }; + }; + "lodash.foreach-2.4.1" = { + name = "lodash.foreach"; + packageName = "lodash.foreach"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-2.4.1.tgz"; + sha1 = "fe3fc3a34c86c94cab6f9522560282741e016309"; + }; + }; + "lodash.forown-2.4.1" = { + name = "lodash.forown"; + packageName = "lodash.forown"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz"; + sha1 = "78b41eafe1405fa966459ea4193fd502d084524b"; + }; + }; + "lodash.get-4.4.2" = { + name = "lodash.get"; + packageName = "lodash.get"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + }; + "lodash.identity-2.4.1" = { + name = "lodash.identity"; + packageName = "lodash.identity"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz"; + sha1 = "6694cffa65fef931f7c31ce86c74597cf560f4f1"; + }; + }; + "lodash.isarray-2.4.1" = { + name = "lodash.isarray"; + packageName = "lodash.isarray"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz"; + sha1 = "b52a326c1f62f6d7da73a31d5401df6ef44f0fa1"; + }; + }; + "lodash.isequal-4.5.0" = { + name = "lodash.isequal"; + packageName = "lodash.isequal"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + }; + "lodash.isfunction-2.4.1" = { + name = "lodash.isfunction"; + packageName = "lodash.isfunction"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz"; + sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1"; + }; + }; + "lodash.isobject-2.4.1" = { + name = "lodash.isobject"; + packageName = "lodash.isobject"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"; + sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"; + }; + }; + "lodash.keys-2.4.1" = { + name = "lodash.keys"; + packageName = "lodash.keys"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz"; + sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727"; + }; + }; + "lodash.noop-2.4.1" = { + name = "lodash.noop"; + packageName = "lodash.noop"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"; + sha1 = "4fb54f816652e5ae10e8f72f717a388c7326538a"; + }; + }; + "lodash.support-2.4.1" = { + name = "lodash.support"; + packageName = "lodash.support"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz"; + sha1 = "320e0b67031673c28d7a2bb5d9e0331a45240515"; + }; + }; + "lodash.throttle-4.1.1" = { + name = "lodash.throttle"; + packageName = "lodash.throttle"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; + sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; + }; + }; + "lodash.uniqby-4.5.0" = { + name = "lodash.uniqby"; + packageName = "lodash.uniqby"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz"; + sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; + }; + }; + "log-symbols-2.2.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; + sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm"; + }; + }; + "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"; + }; + }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; + }; + }; + "lru-2.0.1" = { + name = "lru"; + packageName = "lru"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru/-/lru-2.0.1.tgz"; + sha1 = "f979871e162e3f5ca254be46844c53d4c5364544"; + }; + }; + "lru-3.1.0" = { + name = "lru"; + packageName = "lru"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru/-/lru-3.1.0.tgz"; + sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5"; + }; + }; + "lru-cache-2.7.3" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; + sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; + }; + }; + "lru-cache-4.1.2" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz"; + sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2"; + }; + }; + "make-dir-1.2.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz"; + sha512 = "0ivb7kryzyklvicp8a0lsq56pzjmvycb6bs4d0239q9ygcrs8ylx94q57fgxq3vqvzzs9v3ldl5m1jkxfvfaxh5p8lgb0qchmmh1mb8"; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-stream-0.1.0" = { + name = "map-stream"; + packageName = "map-stream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "md5-2.2.1" = { + name = "md5"; + packageName = "md5"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; + sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "memory-cache-0.1.6" = { + name = "memory-cache"; + packageName = "memory-cache"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-cache/-/memory-cache-0.1.6.tgz"; + sha1 = "2ed9933ed7a8c718249be7366f7ca8749acf8a24"; + }; + }; + "memory-pager-1.1.0" = { + name = "memory-pager"; + packageName = "memory-pager"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.1.0.tgz"; + sha512 = "376gyi0kksnf6f43vhm339sa39j8nrf9dqvhgmz8y7if7w4r1jssqx2ivqb87dz83jpcjad3yi7i5p1vdzwslrwb2c1xvnqbwflxzri"; + }; + }; + "merkle-tree-stream-3.0.3" = { + name = "merkle-tree-stream"; + packageName = "merkle-tree-stream"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/merkle-tree-stream/-/merkle-tree-stream-3.0.3.tgz"; + sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; + }; + }; + "metalsmith-2.3.0" = { + name = "metalsmith"; + packageName = "metalsmith"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.3.0.tgz"; + sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231"; + }; + }; + "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"; + }; + }; + "micromatch-2.3.11" = { + name = "micromatch"; + packageName = "micromatch"; + version = "2.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + }; + }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; + }; + }; + "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"; + }; + }; + "mime-1.4.1" = { + name = "mime"; + packageName = "mime"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; + sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; + }; + }; + "mime-db-1.33.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.33.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; + sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; + }; + }; + "mime-types-2.1.18" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.18"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; + sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; + }; + }; + "mimic-fn-1.2.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; + }; + }; + "min-document-2.19.0" = { + name = "min-document"; + packageName = "min-document"; + version = "2.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"; + sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; + }; + }; + "minimatch-0.3.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "minipass-2.2.4" = { + name = "minipass"; + packageName = "minipass"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz"; + sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7"; + }; + }; + "minizlib-1.1.0" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; + sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; + }; + }; + "mirror-folder-2.1.1" = { + name = "mirror-folder"; + packageName = "mirror-folder"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz"; + sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; + }; + }; + "mixin-deep-1.3.1" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; + sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi"; + }; + }; + "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"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "mocha-2.5.3" = { + name = "mocha"; + packageName = "mocha"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz"; + sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; + }; + }; + "mpath-0.2.1" = { + name = "mpath"; + packageName = "mpath"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz"; + sha1 = "3a4e829359801de96309c27a6b2e102e89f9e96e"; + }; + }; + "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"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "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"; + }; + }; + "multi-random-access-2.1.1" = { + name = "multi-random-access"; + packageName = "multi-random-access"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multi-random-access/-/multi-random-access-2.1.1.tgz"; + sha1 = "6462f1b204109ccc644601650110a828443d66e2"; + }; + }; + "multicast-dns-6.2.3" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; + }; + }; + "multicast-dns-7.0.0" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz"; + sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806"; + }; + }; + "multicb-1.2.2" = { + name = "multicb"; + packageName = "multicb"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multicb/-/multicb-1.2.2.tgz"; + sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; + }; + }; + "multimatch-2.1.0" = { + name = "multimatch"; + packageName = "multimatch"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz"; + sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"; + }; + }; + "multistream-2.1.0" = { + name = "multistream"; + packageName = "multistream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz"; + sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d"; + }; + }; + "mute-stream-0.0.5" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"; + sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; + }; + }; + "mute-stream-0.0.7" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + }; + "mutexify-1.2.0" = { + name = "mutexify"; + packageName = "mutexify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz"; + sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2"; + }; + }; + "nan-2.10.0" = { + name = "nan"; + packageName = "nan"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; + sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc"; + }; + }; + "nanoassert-1.1.0" = { + name = "nanoassert"; + packageName = "nanoassert"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz"; + sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; + }; + }; + "nanobus-3.3.0" = { + name = "nanobus"; + packageName = "nanobus"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanobus/-/nanobus-3.3.0.tgz"; + sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; + }; + }; + "nanomatch-1.2.9" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz"; + sha512 = "1f2indb6hj1h79gxklk6ac2lhfjfydw5ak3v2nwilwir5hqvz9l9kxf63l8k1blsjq4v7r2pf0gqc1b55sqqym5bn9afhrj5xnpvi4z"; + }; + }; + "nanotiming-1.0.1" = { + name = "nanotiming"; + packageName = "nanotiming"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nanotiming/-/nanotiming-1.0.1.tgz"; + sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3"; + }; + }; + "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"; + }; + }; + "ncp-1.0.1" = { + name = "ncp"; + packageName = "ncp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"; + sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; + }; + }; + "neat-log-1.1.2" = { + name = "neat-log"; + packageName = "neat-log"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz"; + sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; + }; + }; + "needle-2.2.0" = { + name = "needle"; + packageName = "needle"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz"; + sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq"; + }; + }; + "nets-3.2.0" = { + name = "nets"; + packageName = "nets"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nets/-/nets-3.2.0.tgz"; + sha1 = "d511fbab7af11da013f21b97ee91747d33852d38"; + }; + }; + "network-address-1.1.2" = { + name = "network-address"; + packageName = "network-address"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz"; + sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; + }; + }; + "next-tick-1.0.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + }; + "node-gyp-build-3.3.0" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz"; + sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; + }; + }; + "nodemon-1.17.3" = { + name = "nodemon"; + packageName = "nodemon"; + version = "1.17.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz"; + sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh"; + }; + }; + "nopt-1.0.10" = { + name = "nopt"; + packageName = "nopt"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + }; + "npm-bundled-1.0.3" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; + sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; + }; + }; + "npm-conf-1.1.3" = { + name = "npm-conf"; + packageName = "npm-conf"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; + sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2"; + }; + }; + "npm-packlist-1.1.10" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; + sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + }; + }; + "object-assign-3.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; + sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "object.omit-2.0.1" = { + name = "object.omit"; + packageName = "object.omit"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + }; + }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; + "on-finished-2.2.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-1.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "1.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; + sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + }; + }; + "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"; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; + "optparse-1.0.5" = { + name = "optparse"; + packageName = "optparse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; + sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; + }; + }; + "ora-1.4.0" = { + name = "ora"; + packageName = "ora"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz"; + sha512 = "2kz616isg6vqp95rsja7fc47k22qipv9b44dhsyxsl7x95ly9j17dwn8dxq8adyhw6ap1nlpfg2dk8v6r7b2m8r61v3ikriwh6bbhl8"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "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"; + }; + }; + "parse-glob-3.0.4" = { + name = "parse-glob"; + packageName = "parse-glob"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; + sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + }; + }; + "parse-headers-2.0.1" = { + name = "parse-headers"; + packageName = "parse-headers"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz"; + sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; + }; + }; + "parseurl-1.3.2" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; + sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-loader-1.0.4" = { + name = "path-loader"; + packageName = "path-loader"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz"; + sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk"; + }; + }; + "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"; + }; + }; + "pause-stream-0.0.11" = { + name = "pause-stream"; + packageName = "pause-stream"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + }; + "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"; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "pkginfo-0.3.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; + sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + }; + }; + "pkginfo-0.4.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz"; + sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; + }; + }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "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"; + }; + }; + "preserve-0.2.0" = { + name = "preserve"; + packageName = "preserve"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; + sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + }; + }; + "prettier-bytes-1.0.4" = { + name = "prettier-bytes"; + packageName = "prettier-bytes"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-bytes/-/prettier-bytes-1.0.4.tgz"; + sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6"; + }; + }; + "pretty-hash-1.0.1" = { + name = "pretty-hash"; + packageName = "pretty-hash"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-hash/-/pretty-hash-1.0.1.tgz"; + sha1 = "16e0579188def56bdb565892bcd05a5d65324807"; + }; + }; + "process-0.5.2" = { + name = "process"; + packageName = "process"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.5.2.tgz"; + sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; + }; + }; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; + }; + }; + "progress-string-1.2.2" = { + name = "progress-string"; + packageName = "progress-string"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/progress-string/-/progress-string-1.2.2.tgz"; + sha512 = "07n7s98b5fqdx9jspg14zkw0dndfdpbrd12f5nj5c7m6aifvl4nn27qdbrgy6gzb837cs86cakldqh5kwbi7fv6ra9ll9q83qhsya97"; + }; + }; + "prompt-1.0.0" = { + name = "prompt"; + packageName = "prompt"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz"; + sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; + }; + }; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + }; + "protocol-buffers-encodings-1.1.0" = { + name = "protocol-buffers-encodings"; + packageName = "protocol-buffers-encodings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.0.tgz"; + sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; + }; + }; + "ps-tree-1.1.0" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz"; + sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014"; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "pstree.remy-1.1.0" = { + name = "pstree.remy"; + packageName = "pstree.remy"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz"; + sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb"; + }; + }; + "pump-1.0.3" = { + name = "pump"; + packageName = "pump"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"; + sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj"; + }; + }; + "pump-2.0.1" = { + name = "pump"; + packageName = "pump"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; + sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "punycode-2.1.0" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz"; + sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; + }; + }; + "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"; + }; + }; + "qs-2.4.2" = { + name = "qs"; + packageName = "qs"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; + sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; + }; + }; + "qs-4.0.0" = { + name = "qs"; + packageName = "qs"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; + sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; + }; + }; + "qs-6.5.1" = { + name = "qs"; + packageName = "qs"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; + sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + }; + }; + "raf-3.3.2" = { + name = "raf"; + packageName = "raf"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raf/-/raf-3.3.2.tgz"; + sha1 = "0c13be0b5b49b46f76d6669248d527cf2b02fe27"; + }; + }; + "random-access-file-2.0.1" = { + name = "random-access-file"; + packageName = "random-access-file"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz"; + sha512 = "2zbpqbs4dvnpc3dpr2yz8phz6r49j4a57jjlx7nqk6rzy2q0437g537czdxyk7cfdmhsc0yvlvs8b7p7sxax1slpwz4d8bkb851zglx"; + }; + }; + "random-access-memory-2.4.0" = { + name = "random-access-memory"; + packageName = "random-access-memory"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz"; + sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; + }; + }; + "random-access-storage-1.1.1" = { + name = "random-access-storage"; + packageName = "random-access-storage"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz"; + sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1"; + }; + }; + "randomatic-1.1.7" = { + name = "randomatic"; + packageName = "randomatic"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; + sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; + }; + }; + "randombytes-2.0.6" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; + sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; + }; + }; + "range-parser-1.2.0" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; + sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; + }; + }; + "raw-body-2.0.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.0.2.tgz"; + sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca"; + }; + }; + "rc-1.2.6" = { + name = "rc"; + packageName = "rc"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz"; + sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092"; + }; + }; + "read-1.0.7" = { + name = "read"; + packageName = "read"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz"; + sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + }; + }; + "read-metadata-1.0.0" = { + name = "read-metadata"; + packageName = "read-metadata"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-metadata/-/read-metadata-1.0.0.tgz"; + sha1 = "6df9cbe51184e8ceb7d0668b40ee5191e6f3dac6"; + }; + }; + "readable-stream-1.0.27-1" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.27-1"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "0mj9b6190amln9rg89x5pq2n195s3v0gzicpdamv1kbabg69aw5m71l34jsjn7bqil7405l6l35x9ijnb3h4jz5vx2i00l8sl1ll2xm"; + }; + }; + "readdirp-2.1.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"; + sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; + }; + }; + "readline2-1.0.1" = { + name = "readline2"; + packageName = "readline2"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz"; + sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; + }; + }; + "recursive-readdir-2.2.2" = { + name = "recursive-readdir"; + packageName = "recursive-readdir"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; + sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; + }; + }; + "recursive-watch-1.1.4" = { + name = "recursive-watch"; + packageName = "recursive-watch"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.4.tgz"; + sha512 = "0yks7j98w5d3y375fb99kfbb8rz5qz72v6ld5i15h7fds1i02fq027w82ipanv3dkgvvrxyybw1v8lyrcs54h9airzv12sbcw1a6rvx"; + }; + }; + "reduce-component-1.0.1" = { + name = "reduce-component"; + packageName = "reduce-component"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; + }; + }; + "regex-cache-0.4.4" = { + name = "regex-cache"; + packageName = "regex-cache"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; + sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; + }; + }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; + }; + }; + "registry-auth-token-3.3.2" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; + sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94"; + }; + }; + "registry-url-3.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + }; + "remove-trailing-separator-1.1.0" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + }; + "repeat-element-1.1.2" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; + sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; + }; + }; + "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"; + }; + }; + "request-2.85.0" = { + name = "request"; + packageName = "request"; + version = "2.85.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; + sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; + }; + }; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "restore-cursor-1.0.1" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; + sha1 = "34661f46886327fed2991479152252df92daa541"; + }; + }; + "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"; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; + }; + }; + "revalidator-0.1.8" = { + name = "revalidator"; + packageName = "revalidator"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; + sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; + }; + }; + "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"; + }; + }; + "rimraf-2.6.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; + sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; + }; + }; + "run-async-0.1.0" = { + name = "run-async"; + packageName = "run-async"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz"; + sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; + }; + }; + "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"; + }; + }; + "rusha-0.8.13" = { + name = "rusha"; + packageName = "rusha"; + version = "0.8.13"; + src = fetchurl { + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.13.tgz"; + sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; + }; + }; + "rx-lite-3.1.2" = { + name = "rx-lite"; + packageName = "rx-lite"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"; + sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; + }; + }; + "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"; + }; + }; + "safe-buffer-5.1.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + }; + }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + }; + }; + "sanitize-filename-1.6.1" = { + name = "sanitize-filename"; + packageName = "sanitize-filename"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz"; + sha1 = "612da1c96473fa02dccda92dcd5b4ab164a6772a"; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; + }; + }; + "seek-bzip-1.0.5" = { + name = "seek-bzip"; + packageName = "seek-bzip"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz"; + sha1 = "cfe917cb3d274bcffac792758af53173eb1fabdc"; + }; + }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; + "semver-5.5.0" = { + name = "semver"; + packageName = "semver"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; + }; + }; + "semver-diff-2.1.0" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + }; + "send-0.16.2" = { + name = "send"; + packageName = "send"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; + sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; + }; + }; + "serve-static-1.13.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; + sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "set-immediate-shim-1.0.1" = { + name = "set-immediate-shim"; + packageName = "set-immediate-shim"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; + sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; + }; + }; + "set-value-0.4.3" = { + name = "set-value"; + packageName = "set-value"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; + }; + }; + "set-value-2.0.0" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; + sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7"; + }; + }; + "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"; + }; + }; + "setprototypeof-1.1.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; + }; + }; + "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"; + }; + }; + "sigmund-1.0.1" = { + name = "sigmund"; + packageName = "sigmund"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "signed-varint-2.0.1" = { + name = "signed-varint"; + packageName = "signed-varint"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/signed-varint/-/signed-varint-2.0.1.tgz"; + sha1 = "50a9989da7c98c2c61dad119bc97470ef8528129"; + }; + }; + "simple-sha1-2.1.0" = { + name = "simple-sha1"; + packageName = "simple-sha1"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz"; + sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3"; + }; + }; + "siphash24-1.1.0" = { + name = "siphash24"; + packageName = "siphash24"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.0.tgz"; + sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w"; + }; + }; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + }; + "slasp-0.0.4" = { + name = "slasp"; + packageName = "slasp"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz"; + sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; + }; + }; + "slice-ansi-1.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz"; + sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; + }; + }; + "snabbdom-0.7.0" = { + name = "snabbdom"; + packageName = "snabbdom"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snabbdom/-/snabbdom-0.7.0.tgz"; + sha512 = "3bh1m1ymhqqcm0mlxy5ja4xhcrryczvjda6jf8k6km9fx655x1wn7gx85i9rqds6wr1nwzccrdq72d5wn1274lxkzwy1n39gya3la1c"; + }; + }; + "snabbdom-selector-1.2.1" = { + name = "snabbdom-selector"; + packageName = "snabbdom-selector"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snabbdom-selector/-/snabbdom-selector-1.2.1.tgz"; + sha512 = "3d51vgryfsxmpva2m93ca6z130m6vh4aiii2r9w7wkibrqy6z5zjyr2p26lmghn8msdfi1yvg9hfjq573q45vazzy2my9hivqb3ck43"; + }; + }; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n"; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; + }; + }; + "sntp-2.1.0" = { + name = "sntp"; + packageName = "sntp"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; + sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; + }; + }; + "sodium-javascript-0.5.5" = { + name = "sodium-javascript"; + packageName = "sodium-javascript"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz"; + sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; + }; + }; + "sodium-native-2.1.5" = { + name = "sodium-native"; + packageName = "sodium-native"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz"; + sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var"; + }; + }; + "sodium-universal-2.0.0" = { + name = "sodium-universal"; + packageName = "sodium-universal"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-2.0.0.tgz"; + sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; + }; + }; + "sorted-array-functions-1.1.0" = { + name = "sorted-array-functions"; + packageName = "sorted-array-functions"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.1.0.tgz"; + sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf"; + }; + }; + "sorted-immutable-list-1.1.0" = { + name = "sorted-immutable-list"; + packageName = "sorted-immutable-list"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-immutable-list/-/sorted-immutable-list-1.1.0.tgz"; + sha1 = "41a62c024bd755c4c57306e20eec92620dae5d97"; + }; + }; + "sorted-indexof-1.0.0" = { + name = "sorted-indexof"; + packageName = "sorted-indexof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-indexof/-/sorted-indexof-1.0.0.tgz"; + sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899"; + }; + }; + "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"; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-resolve-0.5.1" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz"; + sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh"; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "spark-md5-1.0.1" = { + name = "spark-md5"; + packageName = "spark-md5"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spark-md5/-/spark-md5-1.0.1.tgz"; + sha1 = "c4b9a8d41cf7b0845423a821824f8dffa0f51b7c"; + }; + }; + "sparse-bitfield-3.0.3" = { + name = "sparse-bitfield"; + packageName = "sparse-bitfield"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"; + sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; + }; + }; + "speedometer-1.0.0" = { + name = "speedometer"; + packageName = "speedometer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz"; + sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2"; + }; + }; + "split-0.3.3" = { + name = "split"; + packageName = "split"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.14.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; + }; + }; + "stack-trace-0.0.10" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + }; + }; + "stat-mode-0.2.2" = { + name = "stat-mode"; + packageName = "stat-mode"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz"; + sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "status-logger-3.1.1" = { + name = "status-logger"; + packageName = "status-logger"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz"; + sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl"; + }; + }; + "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"; + }; + }; + "statuses-1.4.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; + sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; + }; + }; + "stream-collector-1.0.1" = { + name = "stream-collector"; + packageName = "stream-collector"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-collector/-/stream-collector-1.0.1.tgz"; + sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15"; + }; + }; + "stream-combiner-0.0.4" = { + name = "stream-combiner"; + packageName = "stream-combiner"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + }; + "stream-each-1.2.2" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz"; + sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; + }; + }; + "stream-parser-0.3.1" = { + name = "stream-parser"; + packageName = "stream-parser"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz"; + sha1 = "1618548694420021a1182ff0af1911c129761773"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "string-3.3.3" = { + name = "string"; + packageName = "string"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string/-/string-3.3.3.tgz"; + sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; + }; + }; + "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"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + }; + }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "strip-dirs-2.1.0" = { + name = "strip-dirs"; + packageName = "strip-dirs"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; + sha512 = "3gd7bh1h7xjvl8y6lj1mmsv4qpgbxd620fbp2cjlnc3b9gn7wnzbs1170gs7i6y5arm0dd09y8d74vr357gvwmx9f0616wbw8wv3q14"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; + "strip-outer-1.0.1" = { + name = "strip-outer"; + packageName = "strip-outer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; + sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk"; + }; + }; + "subcommand-2.1.0" = { + name = "subcommand"; + packageName = "subcommand"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subcommand/-/subcommand-2.1.0.tgz"; + sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760"; + }; + }; + "superagent-1.8.5" = { + name = "superagent"; + packageName = "superagent"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz"; + sha1 = "1c0ddc3af30e80eb84ebc05cb2122da8fe940b55"; + }; + }; + "superagent-3.8.2" = { + name = "superagent"; + packageName = "superagent"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz"; + sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1"; + }; + }; + "supports-color-1.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz"; + sha1 = "ff1ed1e61169d06b3cf2d588e188b18d8847e17e"; + }; + }; + "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"; + }; + }; + "supports-color-4.4.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; + sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + }; + }; + "supports-color-5.3.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; + sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; + }; + }; + "swagger-converter-0.1.7" = { + name = "swagger-converter"; + packageName = "swagger-converter"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.1.7.tgz"; + sha1 = "a097519c6f1ee4dd67e308d9b53ddc9c2b257f97"; + }; + }; + "swagger-converter-0.2.0" = { + name = "swagger-converter"; + packageName = "swagger-converter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.2.0.tgz"; + sha1 = "354023cfc5ed3d4ef6895c310189067bbe66d616"; + }; + }; + "swagger-editor-2.10.5" = { + name = "swagger-editor"; + packageName = "swagger-editor"; + version = "2.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-editor/-/swagger-editor-2.10.5.tgz"; + sha1 = "a4316ccb0d40a77d30dadf91f0f4db7e475f948a"; + }; + }; + "swagger-test-templates-1.4.3" = { + name = "swagger-test-templates"; + packageName = "swagger-test-templates"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.4.3.tgz"; + sha1 = "e047473aec06b938992e427665cafdbb6a01cfc0"; + }; + }; + "swagger-tools-0.9.16" = { + name = "swagger-tools"; + packageName = "swagger-tools"; + version = "0.9.16"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-tools/-/swagger-tools-0.9.16.tgz"; + sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; + }; + }; + "symbol-observable-1.2.0" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"; + sha512 = "1fxqjwdn747lxzkxrwhbw8arc9czdig47izx5hnzk22z8k7rnw00q8vcpy8v7a3xyamavwgg4mvjkpn2ihjiyjxjnhx2ihiryf39pbv"; + }; + }; + "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"; + }; + }; + "tar-4.4.1" = { + name = "tar"; + packageName = "tar"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz"; + sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv"; + }; + }; + "tar-stream-1.5.5" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; + sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; + }; + }; + "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"; + }; + }; + "throttle-1.0.3" = { + name = "throttle"; + packageName = "throttle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/throttle/-/throttle-1.0.3.tgz"; + sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7"; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "through2-2.0.3" = { + name = "through2"; + packageName = "through2"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; + sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + }; + }; + "thunkify-2.1.2" = { + name = "thunkify"; + packageName = "thunkify"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz"; + sha1 = "faa0e9d230c51acc95ca13a361ac05ca7e04553d"; + }; + }; + "thunkify-wrap-1.0.4" = { + name = "thunkify-wrap"; + packageName = "thunkify-wrap"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify-wrap/-/thunkify-wrap-1.0.4.tgz"; + sha1 = "b52be548ddfefda20e00b58c6096762b43dd6880"; + }; + }; + "thunky-0.1.0" = { + name = "thunky"; + packageName = "thunky"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz"; + sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e"; + }; + }; + "thunky-1.0.2" = { + name = "thunky"; + packageName = "thunky"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz"; + sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; + }; + }; + "tildify-1.2.0" = { + name = "tildify"; + packageName = "tildify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz"; + sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; + }; + }; + "timed-out-4.0.1" = { + name = "timed-out"; + packageName = "timed-out"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + }; + }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; + }; + }; + "to-buffer-1.1.0" = { + name = "to-buffer"; + packageName = "to-buffer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz"; + sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa"; + }; + }; + "to-iso-string-0.0.2" = { + name = "to-iso-string"; + packageName = "to-iso-string"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz"; + sha1 = "4dc19e664dfccbe25bd8db508b00c6da158255d1"; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; + "toiletdb-1.4.1" = { + name = "toiletdb"; + packageName = "toiletdb"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/toiletdb/-/toiletdb-1.4.1.tgz"; + sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l"; + }; + }; + "toml-2.3.3" = { + name = "toml"; + packageName = "toml"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz"; + sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv"; + }; + }; + "touch-3.1.0" = { + name = "touch"; + packageName = "touch"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; + sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q"; + }; + }; + "tough-cookie-2.3.4" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; + }; + }; + "township-client-1.3.2" = { + name = "township-client"; + packageName = "township-client"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/township-client/-/township-client-1.3.2.tgz"; + sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; + }; + }; + "traverse-0.6.6" = { + name = "traverse"; + packageName = "traverse"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; + sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + }; + }; + "trim-0.0.1" = { + name = "trim"; + packageName = "trim"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; + sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; + }; + }; + "trim-repeated-1.0.0" = { + name = "trim-repeated"; + packageName = "trim-repeated"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"; + sha1 = "e3646a2ea4e891312bf7eace6cfb05380bc01c21"; + }; + }; + "truncate-utf8-bytes-1.0.2" = { + name = "truncate-utf8-bytes"; + packageName = "truncate-utf8-bytes"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; + sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + }; + }; + "ttl-1.3.1" = { + name = "ttl"; + packageName = "ttl"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ttl/-/ttl-1.3.1.tgz"; + sha512 = "36d1ph5z6c3p2qqyjq8ckksxs7m0anipm6lzf51dgv59iymac2zwaxj6fablw7zabpjxav32qk8z12fdfx6cdpp97b0van043vb5cgr"; + }; + }; + "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"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-is-1.6.16" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.16"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; + sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x"; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "uglify-js-2.8.29" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.29"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + }; + }; + "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"; + }; + }; + "uid-0.0.2" = { + name = "uid"; + packageName = "uid"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz"; + sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; + }; + }; + "uint64be-2.0.2" = { + name = "uint64be"; + packageName = "uint64be"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz"; + sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm"; + }; + }; + "unbzip2-stream-1.2.5" = { + name = "unbzip2-stream"; + packageName = "unbzip2-stream"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; + sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b"; + }; + }; + "undefsafe-2.0.2" = { + name = "undefsafe"; + packageName = "undefsafe"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz"; + sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76"; + }; + }; + "union-value-1.0.0" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + }; + "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"; + }; + }; + "unixify-1.0.0" = { + name = "unixify"; + packageName = "unixify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz"; + sha1 = "3a641c8c2ffbce4da683a5c70f03a462940c2090"; + }; + }; + "unordered-array-remove-1.0.2" = { + name = "unordered-array-remove"; + packageName = "unordered-array-remove"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-array-remove/-/unordered-array-remove-1.0.2.tgz"; + sha1 = "c546e8f88e317a0cf2644c97ecb57dba66d250ef"; + }; + }; + "unordered-set-1.1.0" = { + name = "unordered-set"; + packageName = "unordered-set"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-set/-/unordered-set-1.1.0.tgz"; + sha1 = "2ba7ef316edd0b9590cc547c74f76a2f164fecca"; + }; + }; + "unordered-set-2.0.0" = { + name = "unordered-set"; + packageName = "unordered-set"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.0.tgz"; + sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec"; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "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"; + }; + }; + "unyield-0.0.1" = { + name = "unyield"; + packageName = "unyield"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unyield/-/unyield-0.0.1.tgz"; + sha1 = "150e65da42bf7742445b958a64eb9b85d1d2b180"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "upath-1.0.4" = { + name = "upath"; + packageName = "upath"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz"; + sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; + }; + }; + "update-notifier-2.4.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz"; + sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866"; + }; + }; + "uri-js-3.0.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz"; + sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "url-to-options-1.0.1" = { + name = "url-to-options"; + packageName = "url-to-options"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; + sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + }; + }; + "use-3.1.0" = { + name = "use"; + packageName = "use"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; + sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9"; + }; + }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; + "utf8-byte-length-1.0.4" = { + name = "utf8-byte-length"; + packageName = "utf8-byte-length"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; + sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "utile-0.3.0" = { + name = "utile"; + packageName = "utile"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz"; + sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; + }; + }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "utp-native-1.7.0" = { + name = "utp-native"; + packageName = "utp-native"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz"; + sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz"; + }; + }; + "uuid-3.2.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; + sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; + }; + }; + "valid-url-1.0.9" = { + name = "valid-url"; + packageName = "valid-url"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz"; + sha1 = "1c14479b40f1397a75782f115e4086447433a200"; + }; + }; + "validate-npm-package-name-3.0.0" = { + name = "validate-npm-package-name"; + packageName = "validate-npm-package-name"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; + }; + }; + "validator-9.4.1" = { + name = "validator"; + packageName = "validator"; + version = "9.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz"; + sha512 = "2f2x8zxh7czpkf33h5x8fvj48rfszyhkar554x5c2hw7qlsbdqjqvv6nczzsfkw6z5rj6gqabxhcg8haip0xgz7sn4jr6fi7f7llpk1"; + }; + }; + "variable-diff-1.1.0" = { + name = "variable-diff"; + packageName = "variable-diff"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/variable-diff/-/variable-diff-1.1.0.tgz"; + sha1 = "d2bd5c66db76c13879d96e6a306edc989df978da"; + }; + }; + "varint-3.0.1" = { + name = "varint"; + packageName = "varint"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-3.0.1.tgz"; + sha1 = "9d3f53e036c0ab12000a74bc2d24cbf093a581d9"; + }; + }; + "varint-4.0.1" = { + name = "varint"; + packageName = "varint"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-4.0.1.tgz"; + sha1 = "490829b942d248463b2b35097995c3bf737198e9"; + }; + }; + "varint-5.0.0" = { + name = "varint"; + packageName = "varint"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz"; + sha1 = "d826b89f7490732fabc0c0ed693ed475dcb29ebf"; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "ware-1.3.0" = { + name = "ware"; + packageName = "ware"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz"; + sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"; + }; + }; + "which-1.3.0" = { + name = "which"; + packageName = "which"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; + sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; + }; + }; + "wide-align-1.1.2" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"; + sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; + }; + }; + "widest-line-2.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz"; + sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273"; + }; + }; + "win-fork-1.1.1" = { + name = "win-fork"; + packageName = "win-fork"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-fork/-/win-fork-1.1.1.tgz"; + sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e"; + }; + }; + "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"; + }; + }; + "winston-2.1.1" = { + name = "winston"; + packageName = "winston"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz"; + sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; + }; + }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "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"; + }; + }; + "wrap-ansi-3.0.1" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; + sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + }; + }; + "wrap-fn-0.1.5" = { + name = "wrap-fn"; + packageName = "wrap-fn"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz"; + sha1 = "f21b6e41016ff4a7e31720dbc63a09016bdf9845"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-file-atomic-2.3.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; + sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; + }; + }; + "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"; + }; + }; + "xhr-2.4.1" = { + name = "xhr"; + packageName = "xhr"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz"; + sha512 = "38f6fgl0n5syagym161b29l5vhyan3azv5zs3vmyd4s80svy9xl7ppczk3rdawjn70s1ws5qvbh5zf1wyrj2ifawnr7ix3by3k180m4"; + }; + }; + "xsalsa20-1.0.2" = { + name = "xsalsa20"; + packageName = "xsalsa20"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.0.2.tgz"; + sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43"; + }; + }; + "xstream-11.2.0" = { + name = "xstream"; + packageName = "xstream"; + version = "11.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xstream/-/xstream-11.2.0.tgz"; + sha512 = "2jnrf16561zx9hsvlb8d48ca9qwdh9wxcbkwhkjvp5r88b8pcfjlx2g58k9w5kjs0kw660rw6hj2zhvdsznyf0ic9mj682xz6hf7kfh"; + }; + }; + "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"; + }; + }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; + "yallist-3.0.2" = { + name = "yallist"; + packageName = "yallist"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; + sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; + }; + }; + "yaml-js-0.0.8" = { + name = "yaml-js"; + packageName = "yaml-js"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.0.8.tgz"; + sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; + }; + }; + "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"; + }; + }; + "yauzl-2.9.1" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz"; + sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; + }; + }; + "z-schema-3.19.1" = { + name = "z-schema"; + packageName = "z-schema"; + version = "3.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/z-schema/-/z-schema-3.19.1.tgz"; + sha512 = "29crh8y7kjqp652n8wpbh4ljd4j579jg9kwaw9anmd8nhkdz5ljg9arxm8wpcpir5rka60l7h3i13mahcrsq95ydl3f1pxfcfm77wwc"; + }; + }; + }; +in +{ + bower = nodeEnv.buildNodePackage { + name = "bower"; + packageName = "bower"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; + sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The browser package manager"; + homepage = http://bower.io/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + coffee-script = nodeEnv.buildNodePackage { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Unfancy JavaScript"; + homepage = http://coffeescript.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + create-cycle-app = nodeEnv.buildNodePackage { + name = "create-cycle-app"; + packageName = "create-cycle-app"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-4.0.0.tgz"; + sha512 = "28v46s87z1qgi46mn0kdhw77dnra3pkhr7nlf4d6dxl46l9aba1hm1wqz2dxhr0g3pwqav8pg5c1qdxkr18ybvlkmhbkyyz0pp13y51"; + }; + dependencies = [ + sources."@cycle/dom-18.3.0" + sources."@cycle/http-14.9.0" + sources."@cycle/isolate-3.2.0" + sources."@cycle/run-3.4.0" + (sources."@cycle/time-0.10.1" // { + dependencies = [ + sources."chalk-1.1.3" + ]; + }) + sources."@types/node-9.6.2" + sources."@types/superagent-3.5.6" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."asynckit-0.4.0" + (sources."chalk-2.3.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."supports-color-5.3.0" + ]; + }) + sources."chardet-0.4.2" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combine-errors-3.0.3" + sources."combined-stream-1.0.6" + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."core-util-is-1.0.2" + sources."cross-spawn-5.1.0" + sources."cssauron-1.4.0" + sources."custom-error-instance-2.1.1" + sources."cycle-onionify-4.0.0" + sources."d-1.0.0" + sources."debug-3.1.0" + sources."delayed-stream-1.0.0" + sources."es5-ext-0.10.42" + sources."es6-iterator-2.0.3" + sources."es6-map-0.1.5" + sources."es6-set-0.1.5" + sources."es6-symbol-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."event-emitter-0.3.5" + sources."extend-3.0.1" + sources."external-editor-2.2.0" + sources."figures-2.0.0" + sources."form-data-2.3.2" + sources."formidable-1.2.1" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."iconv-lite-0.4.21" + sources."inherits-2.0.3" + (sources."inquirer-3.3.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."is-fullwidth-code-point-2.0.0" + sources."is-promise-2.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."lodash-4.17.5" + sources."lodash._baseiteratee-4.7.0" + sources."lodash._basetostring-4.12.0" + sources."lodash._baseuniq-4.6.0" + sources."lodash._createset-4.0.3" + sources."lodash._root-3.0.1" + sources."lodash._stringtopath-4.8.0" + sources."lodash.uniqby-4.5.0" + sources."lru-cache-4.1.2" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."next-tick-1.0.0" + sources."object-assign-4.1.1" + sources."onetime-2.0.1" + sources."os-tmpdir-1.0.2" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."qs-6.5.1" + sources."raf-3.3.2" + sources."readable-stream-2.3.6" + sources."restore-cursor-2.0.0" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."setimmediate-1.0.5" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."snabbdom-0.7.0" + sources."snabbdom-selector-1.2.1" + sources."sorted-immutable-list-1.1.0" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."superagent-3.8.2" + sources."supports-color-2.0.0" + sources."symbol-observable-1.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."util-deprecate-1.0.2" + sources."variable-diff-1.1.0" + sources."which-1.3.0" + sources."xstream-11.2.0" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Create Cycle.js with no build configuration."; + homepage = "https://github.com/cyclejs-community/create-cycle-app#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + }; + dat = nodeEnv.buildNodePackage { + name = "dat"; + packageName = "dat"; + version = "13.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz"; + sha512 = "05s22v6dv8mgh50m49cadbiw6ykzjl9q81j3zd4zw5zvpj9zl8xbpazw7kbyvzh58rhr6ydl44llghkl24vpn564gqbig3gnxxgmh8z"; + }; + dependencies = [ + sources."abstract-random-access-1.1.2" + sources."ajv-5.5.2" + sources."ansi-diff-stream-1.2.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-1.3.2" + sources."ap-0.1.0" + sources."append-tree-2.4.1" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-lru-1.1.1" + sources."array-unique-0.2.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-0.9.2" + sources."asynckit-0.4.0" + sources."atomic-batcher-1.0.2" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."bencode-1.0.0" + sources."bitfield-rle-2.1.0" + (sources."bittorrent-dht-7.10.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."blake2b-2.1.2" + sources."blake2b-wasm-1.1.7" + sources."body-0.1.0" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" + sources."buffer-indexof-1.1.1" + sources."bulk-write-stream-1.1.4" + sources."bytes-3.0.0" + sources."call-me-maybe-1.0.1" + sources."caseless-0.12.0" + sources."chalk-2.3.2" + sources."circular-append-file-1.0.1" + sources."cli-truncate-1.1.0" + sources."cliclopts-1.1.1" + sources."co-4.6.0" + sources."codecs-1.2.1" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."colors-1.2.1" + sources."combined-stream-1.0.6" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."connections-1.4.2" + sources."content-types-0.1.0" + sources."core-util-is-1.0.2" + sources."corsify-2.1.0" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."cycle-1.0.3" + sources."dashdash-1.14.1" + sources."dat-dns-1.3.2" + (sources."dat-doctor-1.3.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" + sources."lru-2.0.1" + sources."multicast-dns-6.2.3" + sources."pump-1.0.3" + ]; + }) + sources."dat-encoding-5.0.1" + sources."dat-ignore-2.1.1" + (sources."dat-json-1.0.2" // { + dependencies = [ + sources."dat-encoding-4.0.2" + sources."debug-2.6.9" + ]; + }) + (sources."dat-link-resolve-2.1.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."dat-log-1.1.1" // { + dependencies = [ + sources."process-nextick-args-1.0.7" + ]; + }) + (sources."dat-node-3.5.8" // { + dependencies = [ + sources."buffer-alloc-unsafe-0.1.1" + sources."minimist-0.0.8" + sources."process-nextick-args-1.0.7" + sources."pump-1.0.3" + sources."unordered-set-2.0.0" + sources."varint-5.0.0" + ]; + }) + sources."dat-registry-4.0.0" + sources."dat-secret-storage-4.0.1" + sources."dat-storage-1.0.4" + sources."dat-swarm-defaults-1.0.0" + sources."datland-swarm-defaults-1.0.2" + sources."debug-3.1.0" + sources."deep-equal-0.2.2" + sources."delayed-stream-1.0.0" + sources."directory-index-html-2.1.0" + (sources."discovery-channel-5.5.1" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) + (sources."discovery-swarm-4.4.2" // { + dependencies = [ + (sources."dns-discovery-6.1.0" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) + sources."thunky-0.1.0" + ]; + }) + sources."dns-discovery-5.6.1" + sources."dns-packet-4.2.0" + sources."dns-socket-3.0.0" + sources."dns-txt-2.0.2" + sources."dom-walk-0.1.1" + sources."duplexify-3.5.4" + sources."ecc-jsbn-0.1.1" + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."extend-3.0.1" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-read-stream-1.1.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + sources."flat-tree-1.6.0" + sources."for-each-0.3.2" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."from2-2.3.0" + sources."fs.realpath-1.0.0" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."global-4.3.2" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-flag-3.0.0" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-methods-0.1.0" + sources."http-signature-1.2.0" + (sources."hypercore-6.13.0" // { + dependencies = [ + sources."varint-5.0.0" + ]; + }) + sources."hypercore-protocol-6.6.4" + (sources."hyperdrive-9.12.3" // { + dependencies = [ + sources."varint-4.0.1" + ]; + }) + sources."hyperdrive-http-4.2.2" + sources."hyperdrive-network-speed-2.1.0" + sources."i-0.3.6" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ip-1.1.5" + sources."is-buffer-1.1.6" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-function-1.0.1" + sources."is-glob-2.0.1" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-string-1.0.4" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isobject-2.1.0" + sources."isstream-0.1.2" + sources."iterators-0.1.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."k-bucket-3.3.1" + (sources."k-rpc-4.3.1" // { + dependencies = [ + sources."bencode-2.0.0" + sources."k-bucket-4.0.0" + ]; + }) + sources."k-rpc-socket-1.8.0" + sources."kind-of-3.2.2" + sources."last-one-wins-1.0.4" + sources."length-prefixed-message-3.0.3" + sources."lodash.flattendeep-4.4.0" + sources."lodash.throttle-4.1.1" + sources."lru-3.1.0" + sources."memory-pager-1.1.0" + sources."merkle-tree-stream-3.0.3" + sources."micromatch-2.3.11" + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."min-document-2.19.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mirror-folder-2.1.1" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."multi-random-access-2.1.1" + sources."multicast-dns-7.0.0" + sources."multicb-1.2.2" + sources."multistream-2.1.0" + sources."mute-stream-0.0.7" + sources."mutexify-1.2.0" + sources."nan-2.10.0" + sources."nanoassert-1.1.0" + sources."nanobus-3.3.0" + sources."nanotiming-1.0.1" + sources."ncp-1.0.1" + (sources."neat-log-1.1.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."nets-3.2.0" + sources."network-address-1.1.2" + sources."node-gyp-build-3.3.0" + sources."normalize-path-2.1.1" + sources."oauth-sign-0.8.2" + sources."object.omit-2.0.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."parse-glob-3.0.4" + sources."parse-headers-2.0.1" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."pkginfo-0.4.1" + sources."preserve-0.2.0" + sources."prettier-bytes-1.0.4" + sources."pretty-hash-1.0.1" + sources."process-0.5.2" + sources."process-nextick-args-2.0.0" + sources."progress-string-1.2.2" + (sources."prompt-1.0.0" // { + dependencies = [ + sources."async-1.0.0" + ]; + }) + sources."protocol-buffers-encodings-1.1.0" + sources."pump-2.0.1" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."random-access-file-2.0.1" + sources."random-access-memory-2.4.0" + sources."random-access-storage-1.1.1" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + ]; + }) + sources."randombytes-2.0.6" + sources."range-parser-1.2.0" + sources."read-1.0.7" + sources."readable-stream-2.3.6" + sources."recursive-watch-1.1.4" + sources."regex-cache-0.4.4" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."request-2.85.0" + sources."revalidator-0.1.8" + sources."rimraf-2.6.2" + sources."rusha-0.8.13" + sources."safe-buffer-5.1.1" + sources."signed-varint-2.0.1" + sources."simple-sha1-2.1.0" + sources."siphash24-1.1.0" + sources."slice-ansi-1.0.0" + sources."sntp-2.1.0" + sources."sodium-javascript-0.5.5" + sources."sodium-native-2.1.5" + sources."sodium-universal-2.0.0" + sources."sorted-array-functions-1.1.0" + sources."sorted-indexof-1.0.0" + sources."sparse-bitfield-3.0.3" + sources."speedometer-1.0.0" + sources."sshpk-1.14.1" + sources."stack-trace-0.0.10" + sources."status-logger-3.1.1" + sources."stream-collector-1.0.1" + sources."stream-each-1.2.2" + sources."stream-parser-0.3.1" + sources."stream-shift-1.0.0" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-4.0.0" + (sources."subcommand-2.1.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."supports-color-5.3.0" + (sources."throttle-1.0.3" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."through2-2.0.3" + sources."thunky-1.0.2" + sources."to-buffer-1.1.0" + sources."toiletdb-1.4.1" + sources."tough-cookie-2.3.4" + sources."township-client-1.3.2" + sources."trim-0.0.1" + sources."ttl-1.3.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."uint64be-2.0.2" + sources."unixify-1.0.0" + sources."unordered-array-remove-1.0.2" + sources."unordered-set-1.1.0" + sources."untildify-3.0.2" + sources."util-deprecate-1.0.2" + sources."utile-0.3.0" + sources."utp-native-1.7.0" + sources."uuid-3.2.1" + sources."varint-3.0.1" + sources."verror-1.10.0" + (sources."winston-2.1.1" // { + dependencies = [ + sources."colors-1.0.3" + sources."pkginfo-0.3.1" + ]; + }) + sources."wrap-ansi-3.0.1" + sources."wrappy-1.0.2" + sources."xhr-2.4.1" + sources."xsalsa20-1.0.2" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Dat is the package manager for data. Easily share and version control data."; + homepage = https://datproject.org/; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + }; + grunt-cli = nodeEnv.buildNodePackage { + name = "grunt-cli"; + packageName = "grunt-cli"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz"; + sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + sources."findup-sync-0.3.0" + sources."glob-5.0.15" + sources."grunt-known-options-1.1.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."nopt-3.0.6" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."resolve-1.1.7" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The grunt command line interface"; + homepage = "https://github.com/gruntjs/grunt-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + mocha = nodeEnv.buildNodePackage { + name = "mocha"; + packageName = "mocha"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz"; + sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw"; + }; + dependencies = [ + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."browser-stdout-1.3.1" + sources."commander-2.11.0" + sources."concat-map-0.0.1" + sources."debug-3.1.0" + sources."diff-3.5.0" + sources."escape-string-regexp-1.0.5" + sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."growl-1.10.3" + sources."has-flag-2.0.0" + sources."he-1.1.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."supports-color-4.4.0" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "simple, flexible, fun test framework"; + homepage = https://mochajs.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + nijs = nodeEnv.buildNodePackage { + name = "nijs"; + packageName = "nijs"; + version = "0.0.25"; + src = fetchurl { + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; + sha1 = "04b035cb530d46859d1018839a518c029133f676"; + }; + dependencies = [ + sources."optparse-1.0.5" + sources."slasp-0.0.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "An internal DSL for the Nix package manager in JavaScript"; + homepage = "https://github.com/svanderburg/nijs#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + node-gyp = nodeEnv.buildNodePackage { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; + sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ajv-5.5.2" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."block-stream-0.0.9" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.6" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-unicode-2.0.1" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."nopt-3.0.6" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.0" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."readable-stream-2.3.6" + sources."request-2.85.0" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."semver-5.3.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."sntp-2.1.0" + sources."sshpk-1.14.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."tar-2.2.1" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."verror-1.10.0" + sources."which-1.3.0" + sources."wide-align-1.1.2" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon build tool"; + homepage = "https://github.com/nodejs/node-gyp#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + node-gyp-build = nodeEnv.buildNodePackage { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz"; + sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Build tool and bindings loader for node-gyp that supports prebuilds"; + homepage = https://github.com/mafintosh/node-gyp-build; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + node-pre-gyp = nodeEnv.buildNodePackage { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz"; + sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8"; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chownr-1.0.1" + sources."code-point-at-1.1.0" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-2.6.9" + sources."deep-extend-0.4.2" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."fs-minipass-1.2.5" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."glob-7.1.2" + sources."has-unicode-2.0.1" + sources."iconv-lite-0.4.21" + sources."ignore-walk-3.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.2.4" + sources."minizlib-1.1.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."needle-2.2.0" + sources."nopt-4.0.1" + sources."npm-bundled-1.0.3" + sources."npm-packlist-1.1.10" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.0" + (sources."rc-1.2.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-2.3.6" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.5.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.1" + sources."util-deprecate-1.0.2" + sources."wide-align-1.1.2" + sources."wrappy-1.0.2" + sources."yallist-3.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon binary install tool"; + homepage = "https://github.com/mapbox/node-pre-gyp#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + }; + pnpm = nodeEnv.buildNodePackage { + name = "pnpm"; + packageName = "pnpm"; + version = "1.38.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm/-/pnpm-1.38.3.tgz"; + sha1 = "84b7ce1eee5d893c51995752e8afc2ee726539e3"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Fast, disk space efficient package manager"; + homepage = https://pnpm.js.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + semver = nodeEnv.buildNodePackage { + name = "semver"; + packageName = "semver"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The semantic version parser used by npm."; + homepage = "https://github.com/npm/node-semver#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + }; + sloc = nodeEnv.buildNodePackage { + name = "sloc"; + packageName = "sloc"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sloc/-/sloc-0.2.0.tgz"; + sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; + }; + dependencies = [ + sources."async-2.1.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."cli-table-0.3.1" + sources."colors-1.0.3" + sources."commander-2.9.0" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."lodash-4.17.5" + sources."minimatch-3.0.4" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."safe-buffer-5.1.1" + sources."set-immediate-shim-1.0.1" + sources."string_decoder-1.1.1" + sources."util-deprecate-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "sloc is a simple tool to count SLOC (source lines of code)"; + homepage = "https://github.com/flosse/sloc#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + vue-cli = nodeEnv.buildNodePackage { + name = "vue-cli"; + packageName = "vue-cli"; + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.3.tgz"; + sha512 = "1wljsr8srayqg7crbbczi00v31q3dxm3vz4fjcdqasdgsm1ajc9gham6sinsxlraniwg4dn5b1kmpw0nln63cy3v02vib07shyvq2ki"; + }; + dependencies = [ + sources."absolute-0.0.1" + sources."ajv-5.5.2" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-escapes-3.1.0" + sources."ansi-red-0.1.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."ansi-wrap-0.1.0" + sources."argparse-1.0.10" + sources."array-differ-1.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-2.6.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bcrypt-pbkdf-1.0.1" + sources."bl-1.2.2" + sources."bluebird-3.5.1" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."buffer-3.6.0" + sources."buffer-crc32-0.2.13" + sources."builtins-1.0.3" + sources."camelcase-1.2.1" + sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" + (sources."caw-2.0.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."center-align-0.1.3" + sources."chalk-2.3.2" + sources."chardet-0.4.2" + sources."cli-cursor-2.1.0" + sources."cli-spinners-1.3.1" + sources."cli-width-2.2.0" + sources."cliui-2.1.0" + sources."clone-1.0.4" + sources."co-3.1.0" + sources."co-from-stream-0.0.0" + sources."co-fs-extra-1.2.1" + sources."co-read-0.0.1" + sources."coffee-script-1.12.7" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."config-chain-1.1.11" + sources."consolidate-0.14.5" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."decamelize-1.2.0" + (sources."decompress-4.2.0" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + ]; + }) + sources."decompress-tar-4.1.1" + sources."decompress-tarbz2-4.1.1" + sources."decompress-targz-4.1.1" + sources."decompress-unzip-4.0.1" + sources."delayed-stream-1.0.0" + (sources."download-5.0.3" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."download-git-repo-1.0.2" // { + dependencies = [ + sources."commander-2.8.1" + sources."file-type-6.2.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.1" + sources."enable-1.3.2" + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."extend-3.0.1" + sources."extend-shallow-2.0.1" + sources."external-editor-2.2.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.0.1" + sources."figures-2.0.0" + sources."file-type-5.2.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-0.26.7" + sources."fs.realpath-1.0.0" + sources."get-proxy-2.1.0" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."git-clone-0.1.0" + sources."glob-7.1.2" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + sources."gray-matter-2.1.1" + (sources."handlebars-4.0.11" // { + dependencies = [ + sources."async-1.5.2" + sources."wordwrap-0.0.2" + ]; + }) + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-generators-1.0.1" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.21" + sources."ieee754-1.1.11" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-3.3.0" + sources."is-3.2.1" + sources."is-buffer-1.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-natural-number-4.0.1" + sources."is-object-1.0.1" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."isurl-1.0.0" + sources."js-yaml-3.11.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."klaw-1.3.1" + sources."lazy-cache-1.0.4" + sources."lodash-4.17.5" + sources."log-symbols-2.2.0" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + (sources."make-dir-1.2.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + (sources."metalsmith-2.3.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."multimatch-2.1.0" + sources."mute-stream-0.0.7" + sources."npm-conf-1.1.3" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optimist-0.6.1" + sources."ora-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."read-metadata-1.0.0" + sources."readable-stream-2.3.6" + sources."recursive-readdir-2.2.2" + sources."repeat-string-1.6.1" + (sources."request-2.85.0" // { + dependencies = [ + sources."co-4.6.0" + ]; + }) + sources."restore-cursor-2.0.0" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."seek-bzip-1.0.5" + sources."semver-5.5.0" + sources."signal-exit-3.0.2" + sources."sntp-2.1.0" + sources."source-map-0.4.4" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.1" + sources."stat-mode-0.2.2" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."stringstream-0.0.5" + sources."strip-ansi-4.0.0" + sources."strip-dirs-2.1.0" + sources."strip-outer-1.0.1" + sources."supports-color-5.3.0" + sources."tar-stream-1.5.5" + sources."through-2.3.8" + sources."thunkify-2.1.2" + sources."thunkify-wrap-1.0.4" + sources."tildify-1.2.0" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."toml-2.3.3" + sources."tough-cookie-2.3.4" + sources."trim-repeated-1.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uid-0.0.2" + sources."unbzip2-stream-1.2.5" + sources."unyield-0.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."url-to-options-1.0.1" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" + sources."ware-1.3.0" + sources."win-fork-1.1.1" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."wrap-fn-0.1.5" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."yaml-js-0.0.8" + sources."yargs-3.10.0" + sources."yauzl-2.9.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A simple CLI for scaffolding Vue.js projects."; + homepage = "https://github.com/vuejs/vue-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + swagger = nodeEnv.buildNodePackage { + name = "swagger"; + packageName = "swagger"; + version = "0.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger/-/swagger-0.7.5.tgz"; + sha1 = "3be6ee3d392c3b006fc7a9b5b2d60c7e834860fd"; + }; + dependencies = [ + sources."URIjs-1.16.1" + sources."abbrev-1.1.1" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-align-2.0.0" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + ]; + }) + sources."append-field-0.1.0" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-1.5.2" + sources."async-each-1.0.1" + sources."asynckit-0.4.0" + sources."atob-2.1.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."binary-extensions-1.11.0" + (sources."body-parser-1.12.4" // { + dependencies = [ + sources."debug-2.2.0" + sources."qs-2.4.2" + ]; + }) + sources."boxen-1.3.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) + sources."buffer-from-1.0.0" + sources."busboy-0.2.14" + sources."bytes-1.0.0" + sources."cache-base-1.0.1" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" + sources."center-align-0.1.3" + sources."chalk-1.1.3" + sources."charenc-0.0.2" + (sources."chokidar-2.0.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."ci-info-1.1.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."cli-boxes-1.0.0" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" + sources."cliui-2.1.0" + sources."clone-2.0.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."component-emitter-1.2.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."configstore-3.1.2" + sources."connect-3.6.6" + sources."content-type-1.0.4" + sources."cookiejar-2.1.1" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypt-0.0.2" + sources."crypto-random-string-1.0.0" + sources."dag-map-1.0.2" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-extend-0.4.2" + sources."define-property-2.0.2" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dicer-0.2.5" + sources."diff-1.4.0" + sources."dot-prop-4.2.0" + sources."duplexer-0.1.1" + sources."duplexer3-0.1.4" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."etag-1.8.1" + sources."event-stream-3.3.4" + sources."execa-0.7.0" + sources."exit-hook-1.1.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-3.0.1" + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."figures-1.7.0" + sources."fill-range-4.0.0" + sources."finalhandler-1.1.0" + sources."for-in-1.0.2" + sources."form-data-2.3.2" + sources."formidable-1.2.1" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from-0.1.7" + sources."fs-extra-0.24.0" + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.3" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."glob-7.1.2" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graphlib-2.1.5" + sources."growl-1.9.2" + sources."handlebars-4.0.11" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.8" + sources."ignore-by-default-1.0.1" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-0.10.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-ci-1.1.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.0" + sources."is-installed-globally-0.1.0" + sources."is-invalid-path-0.1.0" + sources."is-npm-1.0.0" + sources."is-number-4.0.0" + sources."is-obj-1.0.1" + sources."is-odd-2.0.0" + sources."is-path-inside-1.0.1" + sources."is-plain-object-2.0.4" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-valid-path-0.1.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + (sources."jade-0.26.3" // { + dependencies = [ + sources."commander-0.6.1" + sources."mkdirp-0.3.0" + ]; + }) + sources."js-yaml-3.11.0" + (sources."json-refs-2.1.7" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + sources."qs-6.5.1" + sources."superagent-3.8.2" + ]; + }) + (sources."json-schema-deref-sync-0.3.4" // { + dependencies = [ + sources."lodash-4.17.5" + ]; + }) + sources."jsonfile-2.4.0" + sources."kind-of-6.0.2" + sources."latest-version-3.1.0" + sources."lazy-cache-1.0.4" + sources."lodash-3.10.1" + sources."lodash-compat-3.10.2" + sources."lodash._arraypool-2.4.1" + sources."lodash._basebind-2.4.1" + sources."lodash._baseclone-2.4.1" + sources."lodash._basecreate-2.4.1" + sources."lodash._basecreatecallback-2.4.1" + sources."lodash._basecreatewrapper-2.4.1" + sources."lodash._createwrapper-2.4.1" + sources."lodash._getarray-2.4.1" + sources."lodash._isnative-2.4.1" + sources."lodash._maxpoolsize-2.4.1" + sources."lodash._objecttypes-2.4.1" + sources."lodash._releasearray-2.4.1" + sources."lodash._setbinddata-2.4.1" + sources."lodash._shimkeys-2.4.1" + sources."lodash._slice-2.4.1" + sources."lodash.assign-2.4.1" + sources."lodash.bind-2.4.1" + sources."lodash.clonedeep-2.4.1" + sources."lodash.foreach-2.4.1" + sources."lodash.forown-2.4.1" + sources."lodash.get-4.4.2" + sources."lodash.identity-2.4.1" + sources."lodash.isarray-2.4.1" + sources."lodash.isequal-4.5.0" + sources."lodash.isfunction-2.4.1" + sources."lodash.isobject-2.4.1" + sources."lodash.keys-2.4.1" + sources."lodash.noop-2.4.1" + sources."lodash.support-2.4.1" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-2.7.3" + sources."make-dir-1.2.0" + sources."map-cache-0.2.2" + sources."map-stream-0.1.0" + sources."map-visit-1.0.0" + sources."md5-2.2.1" + sources."media-typer-0.3.0" + sources."memory-cache-0.1.6" + sources."methods-1.1.2" + sources."micromatch-3.1.10" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mixin-deep-1.3.1" + sources."mkdirp-0.5.1" + (sources."mocha-2.5.3" // { + dependencies = [ + sources."commander-2.3.0" + sources."debug-2.2.0" + sources."escape-string-regexp-1.0.2" + sources."glob-3.2.11" + sources."minimatch-0.3.0" + sources."ms-0.7.1" + sources."supports-color-1.2.0" + ]; + }) + sources."mpath-0.2.1" + sources."ms-2.0.0" + (sources."multer-1.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + sources."isarray-1.0.0" + sources."on-finished-2.3.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."mute-stream-0.0.5" + sources."nan-2.10.0" + sources."nanomatch-1.2.9" + sources."native-promise-only-0.8.1" + (sources."nodemon-1.17.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" + sources."debug-3.1.0" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-3.2.2" + sources."lru-cache-4.1.2" + sources."minimist-1.2.0" + sources."strip-ansi-4.0.0" + sources."supports-color-5.3.0" + ]; + }) + sources."nopt-1.0.10" + sources."normalize-path-2.1.1" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."optimist-0.6.1" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" + sources."parseurl-1.3.2" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-loader-1.0.4" + sources."path-to-regexp-1.7.0" + sources."pause-stream-0.0.11" + sources."pify-3.0.0" + sources."posix-character-classes-0.1.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."ps-tree-1.1.0" + sources."pseudomap-1.0.2" + sources."pstree.remy-1.1.0" + sources."punycode-2.1.0" + sources."qs-4.0.0" + sources."range-parser-1.2.0" + (sources."raw-body-2.0.2" // { + dependencies = [ + sources."bytes-2.1.0" + ]; + }) + sources."rc-1.2.6" + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."readline2-1.0.1" + sources."reduce-component-1.0.1" + sources."regex-not-1.0.2" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."restore-cursor-1.0.1" + sources."ret-0.1.15" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" + sources."sanitize-filename-1.6.1" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."send-0.16.2" + (sources."serve-static-1.13.2" // { + dependencies = [ + sources."statuses-1.4.0" + ]; + }) + sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.0" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."sigmund-1.0.1" + sources."signal-exit-3.0.2" + sources."slash-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."kind-of-4.0.0" + ]; + }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" + sources."spark-md5-1.0.1" + sources."split-0.3.3" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."sprintf-js-1.0.3" + sources."static-extend-0.1.2" + sources."statuses-1.3.1" + sources."stream-combiner-0.0.4" + sources."streamsearch-0.1.2" + sources."string-3.3.3" + sources."string-width-2.1.1" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + (sources."superagent-1.8.5" // { + dependencies = [ + sources."qs-2.3.3" + sources."readable-stream-1.0.27-1" + ]; + }) + sources."supports-color-2.0.0" + sources."swagger-converter-0.2.0" + sources."swagger-editor-2.10.5" + (sources."swagger-test-templates-1.4.3" // { + dependencies = [ + sources."camelcase-1.2.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."kind-of-3.2.2" + sources."source-map-0.4.4" + sources."wordwrap-0.0.2" + ]; + }) + (sources."swagger-tools-0.9.16" // { + dependencies = [ + sources."cookiejar-2.0.6" + sources."depd-1.0.1" + sources."ee-first-1.1.0" + sources."extend-3.0.0" + sources."form-data-1.0.0-rc3" + sources."formidable-1.0.17" + sources."isarray-0.0.1" + sources."lodash-4.17.5" + sources."mime-1.3.4" + sources."ms-0.7.1" + sources."object-assign-3.0.0" + sources."on-finished-2.2.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + sources."swagger-converter-0.1.7" + ]; + }) + sources."term-size-1.2.0" + sources."through-2.3.8" + sources."timed-out-4.0.1" + sources."to-iso-string-0.0.2" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."touch-3.1.0" + sources."traverse-0.6.6" + sources."truncate-utf8-bytes-1.0.2" + sources."type-is-1.6.16" + sources."typedarray-0.0.6" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + (sources."undefsafe-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + sources."unique-string-1.0.0" + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."unzip-response-2.0.1" + sources."upath-1.0.4" + sources."update-notifier-2.4.0" + sources."uri-js-3.0.2" + sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."utf8-byte-length-1.0.4" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."valid-url-1.0.9" + sources."validator-9.4.1" + sources."which-1.3.0" + sources."widest-line-2.0.0" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + sources."yargs-3.10.0" + sources."z-schema-3.19.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The Swagger command-line. Provides Swagger utilities and project lifecycle support."; + homepage = "https://github.com/swagger-api/swagger-node#readme"; + license = "Apache 2.0"; + }; + production = true; + bypassCache = true; + }; + npm = nodeEnv.buildNodePackage { + name = "npm"; + packageName = "npm"; + version = "5.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz"; + sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "a package manager for JavaScript"; + homepage = https://docs.npmjs.com/; + license = "Artistic-2.0"; + }; + production = true; + bypassCache = true; + }; +} \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 90ee8d905a6e8c159add5f3cb0622239a7bb9977..000ff8285c5368c2b7ca086793a6c07ca1e87741 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, jbuilder +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, jbuilder , cmdliner, astring, fmt, result }: let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "0.8.1"; - sha256 = "1bjhgwmshlaz9xncrrkknys7prigf8vlg1kqvfx9l8kn92mlf10b"; + version = "0.8.2"; + sha256 = "1zpg079v89mz2dpnh59f9hk5r03wl26skfn43llrv3kg24abjfpf"; buildInputs = [ jbuilder ]; buildPhase = "jbuilder build -p alcotest"; inherit (jbuilder) installPhase; } else { version = "0.7.2"; sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; - buildInputs = [ ocamlbuild opam topkg ]; + buildInputs = [ ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; }; in diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index c4ed5acbe1b6d11d9d9a210bec6b903345c22945..154b4890e4fc5dd6afe229fb835be234ba67997b 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib }: - -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, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "angstrom is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - inherit (param) version; - name = "ocaml-angstrom-${version}"; + version = "0.8.1"; + name = "ocaml${ocaml.version}-angstrom-${version}"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = "angstrom"; rev = "${version}"; - inherit (param) sha256; + sha256 = "067r3vy5lac1bfx947gy722amna3dbcak54nlh24vx87pmcq31qc"; }; - createFindlibDestdir = true; + buildInputs = [ ocaml findlib jbuilder alcotest ]; + propagatedBuildInputs = [ result ]; + + buildPhase = "jbuilder build -p angstrom"; + + doCheck = true; + checkPhase = "jbuilder runtest -p angstrom"; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ result cstruct ]; + inherit (jbuilder) installPhase; meta = { homepage = https://github.com/inhabitedtype/angstrom; diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index feeb94a5c4625e2ad2f7bb364fa35fb17fe811a3..78102b9c673b512a5834cce00108733fb12b1280 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,10 +1,22 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg, opam }: - -let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib +, cstruct, zarith, ounit, result, topkg, ptime +}: + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "0.2.0"; + sha256 = "0yfq4hnyzx6hy05m60007cfpq88wxwa8wqzib19lnk2qrgy772mx"; + propagatedBuildInputs = [ ptime ]; + } else { + version = "0.1.3"; + sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; + propagatedBuildInputs = [ ]; + }; +in buildOcaml rec { name = "asn1-combinators"; - version = "0.1.3"; + inherit (param) version; minimumSupportedOcamlVersion = "4.01"; @@ -12,23 +24,18 @@ buildOcaml rec { owner = "mirleft"; repo = "ocaml-asn1-combinators"; rev = "v${version}"; - sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ounit topkg opam ]; - propagatedBuildInputs = [ result cstruct zarith ]; - - createFindlibDestdir = true; + buildInputs = [ ocaml findlib ounit topkg ]; + propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs; - buildPhase = "ocaml ${ocamlFlags} pkg/pkg.ml build --tests true"; + buildPhase = "${topkg.run} build --tests true"; - installPhase = '' - opam-installer --script --prefix=$out | sh - ln -s $out/lib/asn1-combinators $out/lib/ocaml/${ocaml.version}/site-lib - ''; + inherit (topkg) installPhase; doCheck = true; - checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test"; + checkPhase = "${topkg.run} test"; meta = { homepage = https://github.com/mirleft/ocaml-asn1-combinators; diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index d172b0f74639077c857c9a2c59c20f86fade83a2..97c59d8581fb11ccbec05629a88b251bddd73e76 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, opam}: +{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg }: buildOcaml rec { version = "0.8.3"; @@ -11,16 +11,9 @@ buildOcaml rec { unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build - ''; - - installPhase = '' - opam-installer --script --prefix=$out astring.install | sh - ln -s $out/lib/astring $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) buildPhase installPhase; meta = { homepage = http://erratique.ch/software/astring; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index ea151d1e0e5c9409a92bc76f9542656f8c7bde3f..8c42783c97804b9d04adc5ce5c35ecaa98e9d7d0 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,18 +1,21 @@ -{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}: +{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, ppx_jane, parsexp, + utop, + which, makeWrapper, writeText, ocaml}: buildOcaml rec { name = "bap"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap"; rev = "v${version}"; - sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw"; + sha256 = "0329m65x8q5q8vgvsqgyz2vz7q6qkh2rh11j7x29hckk3fzxsf8g"; }; sigs = fetchurl { url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; - sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn"; + sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; }; createFindlibDestdir = true; @@ -28,7 +31,7 @@ buildOcaml rec { llvm_38 utop ]; - propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi + propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp piqi-ocaml uuidm frontc ounit ]; installPhase = '' @@ -45,11 +48,7 @@ buildOcaml rec { 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"; + configureFlags = "--enable-everything ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; @@ -58,6 +57,6 @@ buildOcaml rec { homepage = https://github.com/BinaryAnalysisPlatform/bap/; maintainers = [ maintainers.maurer ]; license = licenses.mit; - broken = versionAtLeast ocaml.version "4.03"; + broken = versionOlder ocaml.version "4.03"; }; } diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 7047edf24b3e6a2f3cd9da5ab6ad2aa118ddf525..97c4750002e6c3dded2d839f6f1014626e984d2c 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,26 +1,30 @@ { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }: stdenv.mkDerivation rec { - version = "1.2.0"; - name = "ocaml${ocaml.version}-biniou-${version}"; - src = fetchFromGitHub { - owner = "mjambon"; - repo = "biniou"; - rev = "v${version}"; - sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; - }; + version = "1.2.0"; + name = "ocaml${ocaml.version}-biniou-${version}"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "biniou"; + rev = "v${version}"; + sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; + }; - buildInputs = [ ocaml findlib jbuilder ]; + buildInputs = [ ocaml findlib jbuilder ]; - propagatedBuildInputs = [ easy-format ]; + propagatedBuildInputs = [ easy-format ]; - inherit (jbuilder) installPhase; + postPatch = '' + patchShebangs . + ''; - meta = { - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; - }; + inherit (jbuilder) installPhase; + + meta = { + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.bsd3; + }; } diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 7e9ba518251c1ec5d748d0398b45155d00967e99..b13eda071f62640a703b547c6f038165fc22eeb4 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -2,10 +2,10 @@ buildOcaml rec { name = "bitstring"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = http://github.com/xguerin/bitstring/archive/v2.1.0.tar.gz; - sha256 = "0miw4banfpmx4kxrckpqr57b1fcmsqdmspyjx6gqjd4kghm4l7xj"; + url = http://github.com/xguerin/bitstring/archive/v2.1.1.tar.gz; + sha256 = "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8"; }; patches = [ ./camlp4-git.patch ./srcdir.patch ]; diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..359d83b4762a8efce99771e7a2992361430764e7 --- /dev/null +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip, autoreconfHook, which, ocaml, findlib }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "bitv is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-bitv-${version}"; + version = "1.3"; + + src = fetchzip { + url = "https://github.com/backtracking/bitv/archive/${version}.tar.gz"; + sha256 = "0vkh1w9fpi5m1sgiqg6r38j3fqglhdajmbyiyr91113lrpljm75i"; + }; + + buildInputs = [ autoreconfHook which ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + description = "A bit vector library for OCaml"; + license = stdenv.lib.licenses.lgpl21; + homepage = "https://github.com/backtracking/bitv"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index f8590de2b15529121eb5151f94e1bd140dc364f5..3cb9b405d5a2ada4a73b3b593559ced0ce7b8a8b 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg , astring, fmt, fpath, logs, rresult }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ astring fmt fpath logs rresult ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b37dd413f69324d1f1fcdf4b96160a9208462129 --- /dev/null +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2, + enableGtkSupport ? true # Whether to compile with support for Gtk + # integration (library file cairo2_gtk). Depends + # on lablgtk and gtk2. +}: + +let + inherit (stdenv.lib) optionals; + version = "0.5"; +in + +stdenv.mkDerivation { + + name = "ocaml${ocaml.version}-cairo2-${version}"; + + src = fetchurl { + url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz"; + sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib ocamlbuild cairo ] + ++ optionals enableGtkSupport [ gtk2 ]; + + # lablgtk2 is marked as a propagated build input since loading the + # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as + # well. + propagatedBuildInputs = optionals enableGtkSupport [ lablgtk ]; + + createFindlibDestdir = true; + + configurePhase = "ocaml setup.ml -configure --prefix $out" + + (if enableGtkSupport then " --enable-lablgtk2" + else " --disable-lablgtk2"); + + buildPhase = "ocaml setup.ml -build"; + + installPhase = "ocaml setup.ml -install"; + + meta = with stdenv.lib; { + homepage = "https://github.com/Chris00/ocaml-cairo"; + description = "Binding to Cairo, a 2D Vector Graphics Library"; + longDescription = '' + This is a binding to Cairo, a 2D graphics library with support for + multiple output devices. Currently supported output targets include + the X Window System, Quartz, Win32, image buffers, PostScript, PDF, + and SVG file output. + ''; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..def710f3f1b06e67d4f62bf9e490fcf375531c04 --- /dev/null +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchzip, findlib, jbuilder, ocaml, configurator, cppo, lablgtk }: +stdenv.mkDerivation rec { + name = "camlimages-${version}"; + version = "5.0.0"; + src = fetchzip { + url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.gz"; + sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998"; + }; + buildInputs = [ findlib jbuilder ocaml configurator cppo lablgtk ]; + buildPhase = "jbuilder build -p camlimages"; + inherit (jbuilder) installPhase; + + meta = with stdenv.lib; { + branch = "5.0"; + homepage = https://bitbucket.org/camlspotter/camlimages; + description = "OCaml image processing library"; + license = licenses.gpl2; + maintainers = [ maintainers.vbgl maintainers.mt-caret ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 99b5f92b3405c13da0334897309a2a1811d7b510..0394266353ce774983d0838fe24cbde921f84f0d 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; preConfigure = '' + substituteInPlace Makefile.in --replace 'MACHDEPCC=gcc' 'MACHDEPCC=$(CC)' export FORCE_PERL_PREFIX=1 ''; prefixKey = "-prefix="; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 2e2abe897e0f1336daea62f9e5470985c5337503..4b055a130fd2fc0f345ca8a504adc26447ebad66 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: let pname = "cmdliner"; @@ -17,20 +17,11 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; - nativeBuildInputs = [ ocamlbuild opam topkg ]; + nativeBuildInputs = [ ocamlbuild topkg ]; buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ result ]; - createFindlibDestdir = true; - - buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build - ''; - - installPhase = '' - opam-installer --script --prefix=$out | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { homepage = http://erratique.ch/software/cmdliner; diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 3e571dd791ad439bc0e72d2788f7546a5fbd03b2..24f0e9bfd7a5a57d70be1e78078eaf7e78764b2d 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.99.0"; + version = "1.0.2"; name = "ocaml${ocaml.version}-cohttp-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-cohttp"; rev = "v${version}"; - sha256 = "0y8qhzfwrc6486apmp2rsj822cnfhnz4w8rsb52w5wqmsgjxx1bj"; + sha256 = "0zgn32axmjvkmbvyfkbjcqximzc4zcfxs118b98xyrqnvwb0k7ka"; }; buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix index 950012158142fdc429a135f9593a6ed70d78ba04..8192fced97be76e865ba7f12ff2ba5a34831041d 100644 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "comparelib"; - version = "109.60.00"; + version = "113.00.00"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/comparelib/archive/${version}.tar.gz"; - sha256 = "1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e"; + sha256 = "02l343drgi4200flfx73nzdk61zajwidsqjk9n80b2d37lvhazlf"; }; propagatedBuildInputs = [ type_conv ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index ef930007aff46d040af3d43806683ca8b32b366c..214721fa0906f60875270ae4c0b91a2d2615fc29 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 = "1.3"; + version = "1.4"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "c-cube"; repo = "ocaml-containers"; rev = "${version}"; - sha256 = "1gjs9d6759zpgp68djv296zwmvhdc6dqfb27aip7dhj6ic2bwgil"; + sha256 = "1wbarxphdrxvy7qsdp4p837h1zrv0z83pgs5lbz2h3kdnyvz2f1i"; }; buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit qcheck ]; diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix index eaf07818aeb9afc76f5f75cd0b640877ce1d9798..4832f5c39af3bb93021dc48f24ddd11a6903a980 100644 --- a/pkgs/development/ocaml-modules/cow/default.nix +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, findlib -, ocamlbuild, topkg, opam +, ocamlbuild, topkg , uri, xmlm, omd, ezjsonm }: stdenv.mkDerivation rec { @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2"; }; - createFindlibDestdir = true; - - buildInputs = [ ocaml opam ocamlbuild findlib topkg ]; + buildInputs = [ ocaml ocamlbuild findlib topkg ]; propagatedBuildInputs = [ xmlm uri ezjsonm omd ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 07909d1a465a0bbd0c68f836766c9e3143200d04..dc6cf491eb448487d9195125e603996a08155d98 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.coherentpdf.com/; + homepage = https://www.coherentpdf.com/; platforms = ocaml.meta.platforms or []; description = "PDF Command Line Tools"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/pkgs/development/ocaml-modules/cpuid/default.nix index 1bdf70e86c5a9af1348935f433053d0f12f6919c..37400856f1ae861fe05d01dd494aca7149c7abeb 100644 --- a/pkgs/development/ocaml-modules/cpuid/default.nix +++ b/pkgs/development/ocaml-modules/cpuid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ocb-stubblr }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-cpuid-0.1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix new file mode 100644 index 0000000000000000000000000000000000000000..25f84826ec18dc5b316898ee0b933f958634d448 --- /dev/null +++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix @@ -0,0 +1,36 @@ +{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools +, async ? null, lwt ? null +}: + +assert stdenv.lib.versionAtLeast ocaml.version "4.01"; + +let version = "1.9.0"; in + +let opt = b: "--${if b != null then "en" else "dis"}able"; in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-cstruct-${version}"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-cstruct"; + rev = "v${version}"; + sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; + }; + + configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ]; + + buildInputs = [ ocaml findlib ocamlbuild ppx_tools lwt async ]; + propagatedBuildInputs = [ ocplib-endian sexplib ]; + + createFindlibDestdir = true; + dontStrip = true; + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-cstruct; + description = "Map OCaml arrays onto C-like structs"; + license = stdenv.lib.licenses.isc; + maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; + platforms = ocaml.meta.platforms or []; + }; +} diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 0278b0f26558b3bbcec25811bd2bcd83b4d4e480..0f5380f9a41fee9f3d43975557a9b1d96ae69a1a 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,40 +1,28 @@ -{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools -, async ? null, lwt ? null -}: - -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; - -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" - then { version = "2.3.2"; sha256 = "1fykack86hvvqhwngddyxxqlwm3xjljfaszsjbdrvjlrd1nlg079"; } - else { version = "1.9.0"; sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; }; -in - -let opt = b: "--${if b != null then "en" else "dis"}able"; in +{ stdenv, fetchurl, ocaml, jbuilder, findlib, sexplib, ocplib-endian }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-cstruct-${version}"; + version = "3.1.1"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; + sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2"; + }; -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-cstruct-${param.version}"; + unpackCmd = "tar -xjf $curSrc"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-cstruct"; - rev = "v${param.version}"; - inherit (param) sha256; - }; + buildInputs = [ ocaml jbuilder findlib ]; - configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ]; + propagatedBuildInputs = [ sexplib ocplib-endian ]; - buildInputs = [ ocaml findlib ocamlbuild ppx_tools lwt async ]; - propagatedBuildInputs = [ ocplib-endian sexplib ]; + buildPhase = "jbuilder build -p cstruct"; - createFindlibDestdir = true; - dontStrip = true; + inherit (jbuilder) installPhase; - meta = with stdenv.lib; { - homepage = https://github.com/mirage/ocaml-cstruct; - description = "Map OCaml arrays onto C-like structs"; + meta = { + description = "Access C-like structures directly from OCaml"; license = stdenv.lib.licenses.isc; - maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms or []; + homepage = "https://github.com/mirage/ocaml-cstruct"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix new file mode 100644 index 0000000000000000000000000000000000000000..065716e68529f6c28616b50920afb4afb7080c41 --- /dev/null +++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -0,0 +1,12 @@ +{ stdenv, ocaml, cstruct, lwt }: + +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-cstruct-lwt-${version}"; + inherit (cstruct) version src unpackCmd buildInputs installPhase meta; + + propagatedBuildInputs = [ cstruct lwt ]; + + buildPhase = "${cstruct.buildPhase}-lwt"; +} diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix new file mode 100644 index 0000000000000000000000000000000000000000..9d19e1751e2317260d793492c829a5099c7a8bbb --- /dev/null +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -0,0 +1,13 @@ +{ stdenv, ocaml, cstruct, ppx_tools_versioned }: + +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_cstruct-${version}"; + inherit (cstruct) version src unpackCmd installPhase meta; + + buildInputs = cstruct.buildInputs ++ [ ppx_tools_versioned ]; + propagatedBuildInputs = [ cstruct ]; + + buildPhase = "jbuilder build -p ppx_cstruct"; +} diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix new file mode 100644 index 0000000000000000000000000000000000000000..2a614579fccc1d3d2b086e519252e8612ce84434 --- /dev/null +++ b/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -0,0 +1,12 @@ +{ stdenv, ocaml, cstruct }: + +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-cstruct-unix-${version}"; + inherit (cstruct) version src unpackCmd buildInputs installPhase meta; + + propagatedBuildInputs = [ cstruct ]; + + buildPhase = "${cstruct.buildPhase}-unix"; +} diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index b419971921ba97e61ebf9d2f9e92faa8f1d0608e..0ddf3cb5995c6df1836234ecbf77f57ee0a50fc2 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,19 +1,19 @@ -{stdenv, buildOcaml, fetchurl, libffi, pkgconfig, ncurses}: +{ stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }: buildOcaml rec { name = "ctypes"; - version = "0.11.5"; + version = "0.13.1"; minimumSupportedOcamlVersion = "4"; - src = fetchurl { - url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "164gyrs6zxr5pyljwpjgd4knwlrkcmamsq3gvkkkvgf9rmhrl3zf"; + src = fetchzip { + url = "https://github.com/ocamllabs/ocaml-ctypes/archive/67e711ec891e087fbe1e0b4665aa525af4eaa409.tar.gz"; + sha256 = "1z84s5znr3lj84rzv6m37xxj9h7fwx4qiiykx3djf52qgk1rb2xb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; - propagatedBuildInputs = [ libffi ]; + propagatedBuildInputs = [ integers libffi ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 834b810183ba7f84e12c6dd74c50a5c236aa0a37..eebb2f68f3dd84ab0ad98bd1c59beb26cb1f44f6 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; + # Fix build for recent ncurses versions + NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + createFindlibDestdir = true; postPatch = '' @@ -27,6 +30,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = ocaml.meta.platforms or []; - broken = true; }; } diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 389a136aae6b416024eba75307201b53dd8deb91..70ec7fd34ae190d31cf7f032811b474e82e216d0 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, opam +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg }: if !stdenv.lib.versionAtLeast ocaml.version "4.03" @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0hfs5zrvimzvjwdg57vrxx9bb7irvlm07dk2yv3s5qhj30zimd08"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cf8b5335d594f061ad9385e36017ce208c481bb3 --- /dev/null +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.3" +then throw "digestif is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-digestif-${version}"; + version = "0.5"; + + src = fetchurl { + url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-${version}.tbz"; + sha256 = "0fsyfi5ps17j3wjav5176gf6z3a5xcw9aqhcr1gml9n9ayfbkhrd"; + }; + + unpackCmd = "tar -xjf $curSrc"; + + buildInputs = [ ocaml findlib ocamlbuild topkg ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Simple hash algorithms in OCaml"; + homepage = "https://github.com/mirage/digestif"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9b6e56266143665cfe39da377b1142662cf7ff04 --- /dev/null +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, ocaml, findlib, jbuilder }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; + +stdenv.mkDerivation rec { + pname = "dtoa"; + name = "ocaml-${pname}-${version}"; + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "0rzysj07z2q6gk0yhjxnjnba01vmdb9x32wwna10qk3rrb8r2pnn"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib jbuilder ]; + + buildPhase = "jbuilder build -p dtoa"; + + inherit (jbuilder) installPhase; + + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + + meta = with stdenv.lib; { + homepage = https://github.com/flowtype/ocaml-dtoa; + description = "Converts OCaml floats into strings (doubles to ascii, \"d to a\"), using the efficient Grisu3 algorithm."; + license = licenses.mit; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.eqyiel ]; + }; +} diff --git a/pkgs/development/ocaml-modules/eliom/setup-hook.sh b/pkgs/development/ocaml-modules/eliom/setup-hook.sh index 096d8f8bf6354242fdc21cc8bfa36455fbf164fc..9868ab93f79194c15068b637340fcd0fdc7464d3 100644 --- a/pkgs/development/ocaml-modules/eliom/setup-hook.sh +++ b/pkgs/development/ocaml-modules/eliom/setup-hook.sh @@ -2,4 +2,4 @@ addOcsigenDistilleryTemplate() { addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates } -envHooks+=(addOcsigenDistilleryTemplate) +addEnvHooks "$hostOffset" addOcsigenDistilleryTemplate diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 575ca45624f3eb034561b354f20a5f72a9667f07..6058c87e7bd5621088ad4be3db725dd0d5b1cd1d 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-expat-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-expat"; rev = "v${version}"; - sha256 = "0rb47v08ra2hhh73p3d8sl4sizqwiwc37gnkl22b23sbwbjrpbz0"; + sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q"; }; prePatch = '' diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 6c2cb894b542183cbab89c2abe8bbd6e142c1d69..e1c56bf7ebe57268a34bfa01606f2bc74f4847ed 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -3,11 +3,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml-extlib-1.7.2"; + name = "ocaml-extlib-1.7.4"; src = fetchurl { - url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.2.tar.gz; - sha256 = "0r7mhfgh6n5chj9r12s2x1fxrzvh6nm8h80ykl1mr75j86za41bm"; + url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.4.tar.gz; + sha256 = "18jb4rvkk6p3mqnkamwb41x8q49shgn43h020bs4cp4vac7nrhnr"; }; buildInputs = [ ocaml findlib cppo ]; diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e8553ebf812e6206c43929e3f21aa59e1128365c --- /dev/null +++ b/pkgs/development/ocaml-modules/facile/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, ocaml, findlib }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-facile-${version}"; + + version = "1.1.3"; + + src = fetchurl { + url = "http://opti.recherche.enac.fr/facile/distrib/facile-${version}.tar.gz"; + sha256 = "1v4apqcw4gm36ph5xwf1wxaaza0ggvihvgsdslnf33fa1pdkvdjw"; + }; + + dontAddPrefix = 1; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + installFlags = [ "FACILEDIR=$(OCAMLFIND_DESTDIR)/facile" ]; + + postInstall = '' + cat > $OCAMLFIND_DESTDIR/facile/META < Makefile.config + cat Makefile.config.model >> Makefile.config sed -i Makefile.config \ -e 's|^MLGMPIDL_PREFIX.*$|MLGMPIDL_PREFIX = $out|' \ -e 's|^GMP_PREFIX.*$|GMP_PREFIX = ${gmp.dev}|' \ diff --git a/pkgs/development/ocaml-modules/mstruct/default.nix b/pkgs/development/ocaml-modules/mstruct/default.nix index 958cbdc554e8d2ae7340ed85cb30c5f0cacf8878..5aa57ba8fbb82e3c7264bc6b6f90897e2f037645 100644 --- a/pkgs/development/ocaml-modules/mstruct/default.nix +++ b/pkgs/development/ocaml-modules/mstruct/default.nix @@ -7,14 +7,14 @@ then throw "mstruct is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "1.3.3"; + version = "1.4.0"; name = "ocaml${ocaml.version}-mstruct-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-mstruct"; rev = "v${version}"; - sha256 = "1rxjzkg6156vl6yazbk1h0ndqj80wym5aliaapijf60apqqmsp4s"; + sha256 = "1p4ygwzs3n1fj4apfib0z0sabpph21bkq1dgjk4bsa59pq4prncm"; }; buildInputs = [ ocaml findlib jbuilder opam ]; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 534bb4de48ca3a52dc2f2f007bf974a29ca9f507..69921537f5b586de151279b6edf6bfa35110c23a 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, js_of_ocaml +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml , jsooSupport ? true }: @@ -25,7 +25,7 @@ stdenv.mkDerivation { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ] + buildInputs = [ ocaml findlib ocamlbuild topkg ] ++ stdenv.lib.optional jsooSupport js_of_ocaml; buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 3fa8e9d46b40849f92c6989d5be52b72c7fecd6e..5482d7ac87cd6dbbf6ee054bb031472be57c2714 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 }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql, openssl }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h @@ -26,7 +26,14 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - propagatedBuildInputs = [ mysql.client ]; + propagatedBuildInputs = [ mysql.connector-c ]; + + patches = [ + (fetchpatch { + url = "https://github.com/ygrek/ocaml-mysql/compare/v1.2.1...d6d1b3b262ae2cf493ef56f1dd7afcf663a70a26.patch"; + sha256 = "0018s2wcrvbsw9yaqmwq500qmikwffrgdp5xg9b8v7ixhd4gi6hn"; + }) + ]; meta = { homepage = http://ocaml-mysql.forge.ocamlcore.org; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index c68584957c662e10bdf93b0fa3b6bf5ea3d8c894..cfe3f37800de7d2da251d4cf7dbe9b8b4bd1659f 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg , cpuid, ocb-stubblr , cstruct, zarith, ppx_sexp_conv, sexplib -, lwt ? null +, cstruct-lwt ? null }: with stdenv.lib; -let withLwt = lwt != null; in +let withLwt = cstruct-lwt != null; in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-nocrypto-${version}"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0nhnlpbqh3mf9y2cxivlvfb70yfbdpvg6jslzq64xblpgjyg443p"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg opam cpuid ocb-stubblr + buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ppx_sexp_conv ]; - propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt; + propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt cstruct-lwt; buildPhase = '' LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \ @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { ''; inherit (topkg) installPhase; - createFindlibDestdir = true; - meta = { homepage = https://github.com/mirleft/ocaml-nocrypto; description = "Simplest possible crypto to support TLS"; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index 950395bd7eaa1d3605f8bf9c6af7e19d28824808..2dffb472f3e8c14ef0ca3dba7644443039e34bee 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -1,30 +1,27 @@ -{ stdenv, buildOcaml, fetchpatch, fetchFromGitHub, findlib, topkg, opam, ocb-stubblr +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr , result, uucp, uuseg, uutf , lwt ? null }: with stdenv.lib; -let withLwt = lwt != null; in +if !versionAtLeast ocaml.version "4.03" +then throw "notty is not available for OCaml ${ocaml.version}" +else -buildOcaml rec { - version = "0.1.1a"; - name = "notty"; +let withLwt = lwt != null; in - minimumSupportedOcamlVersion = "4.02"; +stdenv.mkDerivation rec { + version = "0.2.1"; + name = "ocaml${ocaml.version}-notty-${version}"; - src = fetchFromGitHub { - owner = "pqwy"; - repo = "notty"; - rev = "53f5946653490fce980dc5d8cadf8b122cff4f19"; - sha256 = "0qmwb1hrp04py2i5spy0yd6c5jqxyss3wzvlkgxyl9r07kvsx6xf"; + src = fetchurl { + url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz"; + sha256 = "0wdfmgx1mz77s7m451vy8r9i4iqwn7s7b39kpbpckf3w9417riq0"; }; - patches = [ (fetchpatch { - url = https://github.com/dbuenzli/notty/commit/b0e12930acc26d030a74d6d63d622ae220b12c92.patch; - sha256 = "0pklplbnjbsjriqj73pc8fsadg404px534w7zknz2617zb44m6x6"; - })]; + unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ findlib opam topkg ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; propagatedBuildInputs = [ result uucp uuseg uutf ] ++ optional withLwt lwt; @@ -34,7 +31,8 @@ buildOcaml rec { inherit (topkg) installPhase; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/pqwy/notty"; + inherit (ocaml.meta) platforms; description = "Declarative terminal graphics for OCaml"; license = licenses.isc; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix deleted file mode 100644 index d9cab2a759da0802fa9dc5dc179f293224004218..0000000000000000000000000000000000000000 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2, - enableGtkSupport ? true # Whether to compile with support for Gtk - # integration (library file cairo2_gtk). Depends - # on lablgtk and gtk2. -}: - -let - inherit (stdenv.lib) optionals; - pname = "ocaml-cairo2"; - version = "0.4.6"; -in - -stdenv.mkDerivation { - - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1279/cairo2-0.4.6.tar.gz"; - sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib ocamlbuild cairo ] - ++ optionals enableGtkSupport [ gtk2 ]; - - # lablgtk2 is marked as a propagated build input since loading the - # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as - # well. - propagatedBuildInputs = optionals enableGtkSupport [ lablgtk ]; - - createFindlibDestdir = true; - - configurePhase = "ocaml setup.ml -configure --prefix $out" - + (if enableGtkSupport then " --enable-lablgtk2" - else " --disable-lablgtk2"); - - buildPhase = "ocaml setup.ml -build"; - - installPhase = "ocaml setup.ml -install"; - - meta = with stdenv.lib; { - homepage = http://forge.ocamlcore.org/projects/cairo; - description = "Binding to Cairo, a 2D Vector Graphics Library"; - longDescription = '' - This is a binding to Cairo, a 2D graphics library with support for - multiple output devices. Currently supported output targets include - the X Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. - ''; - license = licenses.lgpl3; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.jirkamarsik ]; - }; -} diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index a2bbe6960cf713146960ccc3454596e9a749fe62..014525ef2b4e4c43f022d129c574d4b7dd66a59c 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-gettext-${version}"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1678/ocaml-gettext-${version}.tar.gz"; - sha256 = "1zhvzc9x3j57xf2mzg5rshgp14cb4dsqbnj52jjv1qnja97plyjp"; + url = "https://forge.ocamlcore.org/frs/download.php/1731/ocaml-gettext-${version}.tar.gz"; + sha256 = "05wnpxwzzpn2qinah2wb5wzfh5iz8gyf8jyihdbjxc8mk4hf70qv"; }; propagatedBuildInputs = [ gettext fileutils camomile ]; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 0ad5d09d687c93c5ec1ede9a520c011bc13af58c..b789b133aaf3f3d7a91c2357889f0e981c66290b 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ocaml-libvirt-${version}"; - rev = "3169af3"; - version = "0.6.1.4-rev.${rev}"; # libguestfs-1.34 needs ocaml-libvirt newer than the latest release 0.6.1.4 + rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897"; + version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4 src = fetchgit { url = "git://git.annexia.org/git/ocaml-libvirt.git"; rev = rev; - sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg"; + sha256 = "0vxgx1n58fp4qmly6i5zxiacr7303127d6j78a295xin1p3a8xcw"; }; propagatedBuildInputs = [ libvirt ]; diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh index a93a7250bebb713a81cfb3d4d32c958d5cd6bbf1..6d950437016588cee44194784b35b8f242ce0b38 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh +++ b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh @@ -2,4 +2,4 @@ addOcamlMakefile () { export OCAMLMAKEFILE="@out@/include/OCamlMakefile" } -envHooks+=(addOcamlMakefile) +addEnvHooks "$targetOffset" addOcamlMakefile diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 9944cf821c505a871de2cfad3c3c9267b30e9284..492bb9c67cdf2a8fa89c95d2e44b6b9dac3cf2e1 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,16 +1,23 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip -, gnutls, nettle }: +, gnutls, nettle, fetchpatch +}: -let version = "4.1.4"; in +let version = "4.1.5"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocamlnet-${version}"; src = fetchurl { url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; - sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6"; + sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm"; }; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocamlnet/ocamlnet.4.1.5/files/netgzip.patch"; + sha256 = "1say7zzgk24qcy9m91gcfgvz4fv7nksx4j5qnbxyq8wqw0g88ba0"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index bb4b24cec67d9d1e9e6e0f54e80b3e2ef9b1c21d..4071cb8a639d8c7fa031bf28a0388d1f4b17744e 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, opam, topkg, astring }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, astring }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocb-stubblr-0.1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./pkg-config.patch ]; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ astring ]; diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index bf0e98ec1952dc0c06d6503875aa1588feb14900..6410eb296283bffaa94cc7a3cf6ba760f7c92e27 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, pprint }: +{ stdenv, fetchFromGitHub, ocaml, findlib, astring, pprint }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocp-ocamlres-${version}"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-ocamlres"; rev = "v${version}"; - sha256 = "0pm1g38f6pmch1x4pcc09ky587x5g7p7n9dfbbif8zkjqr603ixg"; + sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn"; }; - buildInputs = [ ocaml findlib pprint ]; + buildInputs = [ ocaml findlib astring pprint ]; createFindlibDestdir = true; installFlags = [ "BINDIR=$(out)/bin" ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 6534456179583f8480b2895777833867bd53c0ea..569f5081355c64fe84f53d5d0fbb8e723fcbb05e 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -1,15 +1,30 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 +, num +}: -let version = "0.7.1"; in +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" + then { + version = "0.8.1"; + sha256 = "03vzrybdpjydbpil97zmir71kpsn2yxkjnzysma7fvybk8ll4zh9"; + buildInputs = [ num ]; + } else { + version = "0.7.1"; + sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms"; + }; +in + +let inherit (param) version; in stdenv.mkDerivation { name = "ocsigen-deriving-${version}"; src = fetchzip { url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz"; - sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms"; - }; + inherit (param) sha256; + }; - buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ] + ++ (param.buildInputs or []); createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index f1668160df193efa9d2e51ddab363a4f5013a1ec..57e3c9bfa745114dc6042abd8d16fad34ae17eaf 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "octavius is not available for OCaml ${ocaml.version}" else @@ -12,7 +12,7 @@ stdenv.mkDerivation { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 94c2e12088399005dac18f1d3d96c33373186ced..73ffd7f41ea97e6edd0a651710b46e98d0fb8f9b 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,19 +1,19 @@ -{ stdenv, ocaml, findlib, fetchurl, curl, ncurses }: +{ stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }: stdenv.mkDerivation rec { - name = "ocurl-0.7.8"; + name = "ocurl-0.8.0"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.bz2"; - sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr"; + url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz"; + sha256 = "0292knvm9g038br0dc03lcsnbjqycyiqha256dp4bxkz3vmmz4wr"; }; - buildInputs = [ ocaml findlib ncurses ]; + buildInputs = [ pkgconfig ocaml findlib ncurses ]; propagatedBuildInputs = [ curl ]; createFindlibDestdir = true; meta = { description = "OCaml bindings to libcurl"; - license = stdenv.lib.licenses.bsd3; - homepage = http://ocurl.forge.ocamlcore.org/; + license = stdenv.lib.licenses.mit; + homepage = "http://ygrek.org.ua/p/ocurl/"; maintainers = with stdenv.lib.maintainers; [ bennofs ]; platforms = ocaml.meta.platforms or []; }; diff --git a/pkgs/development/ocaml-modules/optcomp/META b/pkgs/development/ocaml-modules/optcomp/META new file mode 100644 index 0000000000000000000000000000000000000000..8a942288f752c107b914fcf7fdb3a57cfa469a04 --- /dev/null +++ b/pkgs/development/ocaml-modules/optcomp/META @@ -0,0 +1,12 @@ +# OASIS_START +# DO NOT EDIT (digest: ec844fa3189acb2a866b89a69d111ba4) +version = "1.6" +description = "Optional compilation with cpp-like directives" +requires = "camlp4" +archive(syntax, preprocessor) = "optcomp.cma" +archive(syntax, toploop) = "optcomp.cma" +archive(syntax, preprocessor, native) = "optcomp.cmxa" +archive(syntax, preprocessor, native, plugin) = "optcomp.cmxs" +exists_if = "optcomp.cma" +# OASIS_STOP + diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 8953373954a57508f347e4409cd22e842e34e1fb..5b566137747134d629391e1a787ce3006410847f 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }: stdenv.mkDerivation { name = "ocaml-optcomp-1.6"; @@ -6,11 +6,33 @@ stdenv.mkDerivation { url = https://github.com/diml/optcomp/archive/1.6.tar.gz; sha256 = "0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh"; }; + + patches = + let inherit (stdenv.lib) optional versionAtLeast; in + optional (versionAtLeast ocaml.version "4.02") (fetchpatch { + url = "https://github.com/diml/optcomp/commit/b7f809360c9794b383a4bc0492f6df381276b429.patch"; + sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y"; + }) + ; createFindlibDestdir = true; buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + configurePhase = '' + cp ${./META} META + ''; + + buildPhase = '' + ocamlbuild src/optcomp.cmxs src/optcomp.cma src/optcomp_o.native src/optcomp_r.native + ''; + + installPhase = '' + mkdir -p $out/bin + cp _build/src/optcomp_o.native $out/bin/optcomp-o + cp _build/src/optcomp_r.native $out/bin/optcomp-r + ocamlfind install optcomp META _build/src/optcomp.{a,cma,cmxa,cmxs} _build/src/pa_optcomp.{cmi,cmx,mli} + ''; meta = { homepage = https://github.com/diml/optcomp; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 5deef60520bd3bfd3d0776bcb4ff3350a0e35ac2..05c25c81d5a0488c4213d9f86ae808d1ebb41fbc 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uutf, result }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }: let pname = "otfm"; @@ -17,12 +17,10 @@ stdenv.mkDerivation rec { sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ uutf result ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index dfee365cd750b7abe292b1063f461b2023533873..ac853c94094b88640db8e51b229d35314a491570 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -1,40 +1,35 @@ -{stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml, opam, - ppx_tools, ppx_sexp_conv, cstruct, sexplib, result, nocrypto, astring}: +{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, findlib, topkg +, ppx_tools, ppx_sexp_conv, cstruct, ppx_cstruct, sexplib, rresult, nocrypto +, astring +}: -let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "otr is not available for OCaml ${ocaml.version}" +else -buildOcaml rec { - name = "otr"; - version = "0.3.3"; - - minimumSupportedOcamlVersion = "4.02"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-otr-${version}"; + version = "0.3.4"; src = fetchFromGitHub { owner = "hannesm"; repo = "ocaml-otr"; rev = "${version}"; - sha256 = "07zzix5mfsasqpqdx811m0x04gp8mq1ayf4b64998k98027v01rr"; + sha256 = "0ixf0jvccmcbhk5mhzqakfzimvz200wkdkq3z2d0bdzyggslbdl4"; }; - buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ]; - propagatedBuildInputs = [ cstruct sexplib result nocrypto astring ]; + buildInputs = [ ocaml ocamlbuild findlib topkg ppx_tools ppx_sexp_conv ppx_cstruct ]; + propagatedBuildInputs = [ cstruct sexplib rresult nocrypto astring ]; - buildPhase = '' - ocaml ${ocamlFlags} pkg/pkg.ml build \ - --tests true - ''; + buildPhase = "${topkg.run} build --tests true"; - installPhase = '' - opam-installer --prefix=$out --script | sh - ln -s $out/lib/otr $out/lib/ocaml/${ocaml.version}/site-lib - ''; + inherit (topkg) installPhase; doCheck = true; - checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test"; - - createFindlibDestdir = true; + checkPhase = "${topkg.run} test"; meta = with stdenv.lib; { + inherit (ocaml.meta) platforms; homepage = https://github.com/hannesm/ocaml-otr; description = "Off-the-record messaging protocol, purely in OCaml"; license = licenses.bsd2; diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix index d8ce0dbc7eacaa4c85f50190eb2aa3e167f30bfc..2b821cd6dd6f9a3075c03472f8ad435ed19ec586 100644 --- a/pkgs/development/ocaml-modules/pa_bench/default.nix +++ b/pkgs/development/ocaml-modules/pa_bench/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "pa_bench"; - version = "112.06.00"; + version = "113.00.00"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/pa_bench/archive/${version}.tar.gz"; - sha256 = "e3401e37f1d3d4acb957fd46a192d0ffcefeb0bedee63bbeb26969af1d540870"; + sha256 = "1cd6291gdnk6h8ziclg6x3if8z5xy67nfz9gx8sx4k2cwv0j29k5"; }; buildInputs = [ pa_ounit ]; diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix index 5970aba1e5028665322380e22f9706b23047093a..fa4ecfcc28b2e331b4f73a8d71bab2764172f5bc 100644 --- a/pkgs/development/ocaml-modules/pa_ounit/default.nix +++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix @@ -2,11 +2,11 @@ buildOcaml rec { name = "pa_ounit"; - version = "112.24.00"; + version = "113.00.00"; src = fetchurl { url = "https://github.com/janestreet/pa_ounit/archive/${version}.tar.gz"; - sha256 = "fa04e72fe1db41e6dc64f9707cf5705cb9b957aa93265120c875c808eb9b9b96"; + sha256 = "0vi0p2hxcrdsl0319c9s8mh9hmk2i4ir6c6vrj8axkc37zkgc437"; }; propagatedBuildInputs = [ ounit ]; diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix index fa9a9f8f86a62a00866d9dbf4cd6c6c6f50a81ac..1ab1c5fa7bc51f007a9b4c41cc527b98c3a9b73e 100644 --- a/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "pipebang"; - version = "110.01.00"; + version = "113.00.00"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/pipebang/archive/${version}.tar.gz"; - sha256 = "a8858d9607c15cdf0a775196be060c8d91de724fc80a347d7a76ef1d38329096"; + sha256 = "0acm2y8wxvnapa248lkgm0vcc44hlwhrjxqkx1awjxzcmarnxhfk"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix index 52c28efcb49ab37edd0d8b2397ef3c2f8ab0c8b0..2dc7ef2b13e50bb244114f68e0bea3ba7f8ec3a8 100644 --- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ppx_derivers-${version}"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "diml"; repo = "ppx_derivers"; rev = version; - sha256 = "049yy9706lv1li6a1bibkz1qq2ixxbdyhf4f5w9pv71jc3dlpfy8"; + sha256 = "0bnhihl1w31as5w2czly1v3d6pbir9inmgsjg2cj6aaj9v1dzd85"; }; buildInputs = [ ocaml findlib jbuilder ]; diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 1b209e523699a859423eb8125a6ec23d05c25ff9..3afe4149fa34318380f0e7e2cc959db5b28f12b2 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -9,8 +9,8 @@ let param = sha256 = "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9"; extraPropagatedBuildInputs = []; } else { - version = "4.2"; - sha256 = "0scsg45wp6xdqj648fz155r4yngyl2xcd3hdszfzqwdpbax33914"; + version = "4.2.1"; + sha256 = "1yhhjnncbbb7fsif7qplndh01s1xd72dqm8f3jkgx9y4ariqqvf9"; extraPropagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ]; }; in diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 5874f5eb884c671c7c0e7f2707431616c16bc96e..fb06fd7f935fb4a6c78ed2aebee1c3dd2a1731a6 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg, cppo +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, cppo , ppx_import, ppx_deriving, yojson, ounit }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { - owner = "whitequark"; + owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; rev = "v${version}"; - sha256 = "1id1a29qq0ax9qp98b5hv6p2q2r0vp4fbkkwzm1bxdhnasw97msk"; + sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw"; }; - buildInputs = [ ocaml findlib ocamlbuild opam cppo ounit ppx_import ]; + buildInputs = [ ocaml findlib ocamlbuild cppo ounit ppx_import ]; propagatedBuildInputs = [ ppx_deriving yojson ]; @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; - broken = stdenv.lib.versionAtLeast ocaml.version "4.05"; }; } diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index 245fe3f76f66c5be571f77387babe71e0d06f829..991af1e41de1bb682a5abcca8a187a4bfd123094 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -4,15 +4,15 @@ buildOcaml rec { name = "ppx_import"; - version = "1.1"; + version = "1.4"; minimumSupportedOcamlVersion = "4.02"; src = fetchFromGitHub { - owner = "whitequark"; + owner = "ocaml-ppx"; repo = "ppx_import"; rev = "v${version}"; - sha256 = "1hfvbc81dg58q7kkpn808b3j0xazrqfrr4v71sd1yvmnk71wak6k"; + sha256 = "14c2lp7r9080c4hsb1y1drbxxx3v44b7ib5wfh3kkh3f1jfsjwbk"; }; buildInputs = [ cppo ounit ppx_deriving opam ]; @@ -29,4 +29,4 @@ buildOcaml rec { description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index b680bcdd48c8898a6c99659634f40b7831bdc005..5d27dc35396c236152743c0c724d0c41b0a3b4c4 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -2,7 +2,7 @@ buildOcaml rec { name = "ppx_tools_versioned"; - version = "5.0.1"; + version = "5.1"; minimumSupportedOcamlVersion = "4.02"; @@ -10,7 +10,7 @@ buildOcaml rec { owner = "let-def"; repo = "ppx_tools_versioned"; rev = version; - sha256 = "1rpbxbhk3k7f61h7lr4qkllkc12gjpq0rg52q7i6hcrg2dxkhwh6"; + sha256 = "1c7kvca67qpyr4hiy492yik5x31lmkhyhy5wpl0l0fbx7fr7l624"; }; propagatedBuildInputs = [ ocaml-migrate-parsetree ]; diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fc3fa81a02a9cc400d325ac8f7ed3133bbba6c92 --- /dev/null +++ b/pkgs/development/ocaml-modules/psq/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "psq is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-psq-${version}"; + version = "0.1.0"; + + src = fetchurl { + url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-${version}.tbz"; + sha256 = "08ghgdivbjrxnaqc3hsb69mr9s2ql5ds0fb97b7z6zimzqibz6lp"; + }; + + unpackCmd = "tar -xjf $curSrc"; + + buildInputs = [ ocaml findlib ocamlbuild topkg ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Functional Priority Search Queues for OCaml"; + homepage = "https://github.com/pqwy/psq"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.isc; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index bb4bbef516c853fb32f8c2120c200def3a57df79..2e3a627a3d1cb2ce199d184a1638c174f6b4b372 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam, js_of_ocaml }: +{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: buildOcaml rec { version = "0.8.3"; @@ -11,13 +11,11 @@ buildOcaml rec { unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam js_of_ocaml ]; + buildInputs = [ ocaml findlib ocamlbuild topkg js_of_ocaml ]; propagatedBuildInputs = [ result ]; - buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml true - ''; + buildPhase = "${topkg.run} build --with-js_of_ocaml true"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index 7dda3862030975625d34347eb66767d30802a9c3..91b0d22a85287a0ecb50739f97ea16f4cc9dc988 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, obuild }: -let version = "2.0.2"; in +let version = "2.0.3"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-ptmap-${version}"; src = fetchzip { url = "https://github.com/backtracking/ptmap/archive/v${version}.tar.gz"; - sha256 = "093qax4lhpv1vcgwqh5b3pmy769hv5d8pqj1kjynh1z1xibv2qxc"; + sha256 = "19xykhqk7q25r1pj8rpfj53j2r9ls8mxi1w5m2wqshrf20gf078h"; }; buildInputs = [ ocaml findlib obuild ]; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 3be49072eb376a03cb6e9506a9dde58a8b536fdf..861ac8b3bc81da6e4c92e200c05ca8783bb99f9d 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild ounit ]; - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; + configurePhase = "ocaml setup.ml -configure --prefix $out" + + stdenv.lib.optionalString doCheck " --enable-tests"; buildPhase = "ocaml setup.ml -build"; - doCheck = true; + doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06"; checkPhase = "ocaml setup.ml -test"; installPhase = "ocaml setup.ml -install"; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 5a720aead806b648c66e88e5ebbea606a53dd7c8..920ee05244a149cefa715c736a212eb3fe5ea41b 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }: stdenv.mkDerivation { name = "ocaml-react-1.2.1"; @@ -9,9 +9,7 @@ stdenv.mkDerivation { }; unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib topkg ocamlbuild opam ]; - - createFindlibDestdir = true; + buildInputs = [ ocaml findlib topkg ocamlbuild ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index a62c321a4e83ec915b52bd81a70e01e82bce4b19..dfb8c56c23e83c1de1fbc1ce1b36e4b7f34f5fc1 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -1,18 +1,34 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, benchmark }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder, benchmark }: -let version = "0.5"; in +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" + then { + version = "0.6"; + url = " https://github.com/Chris00/ocaml-rope/releases/download/0.6/rope-0.6.tbz"; + sha256 = "06pkbnkad2ck50jn59ggwv154yd9vb01abblihvam6p27m4za1pc"; + buildInputs = [ jbuilder ]; + extra = { + unpackCmd = "tar -xjf $curSrc"; + buildPhase = "jbuilder build -p rope"; + inherit (jbuilder) installPhase; + }; + } else { + version = "0.5"; + url = "https://forge.ocamlcore.org/frs/download.php/1156/rope-0.5.tar.gz"; + sha256 = "05fr2f5ch2rqhyaj06rv5218sbg99p1m9pq5sklk04hpslxig21f"; + buildInputs = [ ocamlbuild ]; + extra = { createFindlibDestdir = true; }; + }; +in -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-rope-${version}"; +stdenv.mkDerivation ({ + name = "ocaml${ocaml.version}-rope-${param.version}"; - src = fetchzip { - url = "https://forge.ocamlcore.org/frs/download.php/1156/rope-${version}.tar.gz"; - sha256 = "1i8kzg19jrapl30mq8m91vy09z0r0dl4bnpw24ga96w8pxqf9qhd"; + src = fetchurl { + inherit (param) url sha256; }; - buildInputs = [ ocaml findlib ocamlbuild benchmark ]; - - createFindlibDestdir = true; + buildInputs = [ ocaml findlib benchmark ] ++ param.buildInputs; meta = { homepage = http://rope.forge.ocamlcore.org/; @@ -21,4 +37,4 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ volth ]; }; -} +} // param.extra) diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index f9951b56da2dbf238d387d543117adbbcd7196e4..d1a796a58e51f060ac1eb59efdb0933515569790 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-rresult-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index b6c66c82811d9a9fc893decb3f475f1a32eec8ef..92d9cef351bf41ff106aae483cad2f065980af7d 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; let pname = "sawja"; - version = "1.5.2"; + version = "1.5.3"; webpage = "http://sawja.inria.fr/"; in stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36093/sawja-1.5.2.tar.bz2; - sha256 = "12046arkxiy4gf1s17hyc0yzydjzpzwqxn13sbkbxl8xzvmankx4"; + url = https://gforge.inria.fr/frs/download.php/file/37403/sawja-1.5.3.tar.bz2; + sha256 = "17vfknr126vfhpmr14j75sg8r47xz7pw7fba4nsdw3k7rq43vcn2"; }; buildInputs = [ which perl ocaml findlib camlp4 ]; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 3886af37512f6c7a4d3263ed07d781f92958562f..b24d799cf28eec1268b4faa1699e2117d87bb56c 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ssl-${version}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchzip { url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz"; - sha256 = "01sy3f94b463ff7dmkfsv67jh8g8h20wh7npjwqilniif7lgf4l3"; + sha256 = "0j5zvsx51dg5r7sli7bakv7gfd29z890h0xzi876pg9vywwz9w7l"; }; buildInputs = [which ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix index 42771d1e35f15ed8246214fed5ec8397c3de257c..129f9dd7289f888b992282aec0c2498048057f90 100644 --- a/pkgs/development/ocaml-modules/stdint/default.nix +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-stdint-${version}"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "andrenth"; repo = "ocaml-stdint"; rev = version; - sha256 = "18nh23yx4ghgq7mjf4mdyq8kj1fdw5d0abw919s8n4mv21cmpwia"; + sha256 = "1xjzqq13m7cqrfwa6vcwxirm17w8bx025dgnjqjgd3k2lxfgd1j7"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index b38138c55731af6f30e751fa19e76f479286bcb2..39f82772ffce13a063b12c99cf6cee62be25cea9 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,36 +1,32 @@ -{ stdenv, buildOcaml, fetchFromGitHub, findlib, ocamlbuild, ocaml_oasis -, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ounit +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg +, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit , lwt ? null}: with stdenv.lib; let withLwt = lwt != null; in -buildOcaml rec { - version = "0.7.1"; - name = "tls"; - - minimunSupportedOcamlVersion = "4.02"; +stdenv.mkDerivation rec { + version = "0.9.0"; + name = "ocaml${ocaml.version}-tls-${version}"; src = fetchFromGitHub { owner = "mirleft"; repo = "ocaml-tls"; rev = "${version}"; - sha256 = "19q2hzxiasz9pzczgb63kikg0mc9mw98dfvch5falf2rincycj24"; + sha256 = "0qgw8lq8pk9hss7b5i6fr08pi711i0zqx7yyjgcil47ipjig6c31"; }; - buildInputs = [ ocamlbuild findlib ocaml_oasis ppx_sexp_conv ounit ]; + buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ounit ppx_cstruct cstruct-unix ]; propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++ optional withLwt lwt; - configureFlags = [ "--disable-mirage" "--enable-tests" ] ++ - optional withLwt ["--enable-lwt"]; - - configurePhase = "./configure --prefix $out $configureFlags"; + buildPhase = "${topkg.run} build --tests true --with-mirage false --with-lwt ${if withLwt then "true" else "false"}"; doCheck = true; - checkTarget = "test"; - createFindlibDestdir = true; + checkPhase = "${topkg.run} test"; + + inherit (topkg) installPhase; meta = with stdenv.lib; { homepage = https://github.com/mirleft/ocaml-tls; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index ecd806ecadc9d5d63c55f8615f4a98fdeb2cc326..9a655e055131d9a223f4b05190a4719bdfc6e915 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -1,9 +1,25 @@ +/* Topkg is a packager for distributing OCaml software. This derivation +provides facilities to describe derivations for OCaml libraries +using topkg. +The `buildPhase` and `installPhase` attributes can be reused directly +in many cases. When more fine-grained control on how to run the “topkg” +build system is required, the attribute `run` can be used. +*/ { 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 +let +/* This command allows to run the “topkg” build system. + * It is usually called with `build` or `test` as argument. + * Packages that use `topkg` may call this command as part of + * their `buildPhase` or `checkPhase`. +*/ + run = "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml"; +in + stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-topkg-${version}"; version = "0.9.1"; @@ -13,14 +29,15 @@ stdenv.mkDerivation rec { sha256 = "1slrzbmyp81xhgsfwwqs2d6gxzvqx0gcp34rq00h5iblhcq7myx6"; }; - nativeBuildInputs = [ opam ]; buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ result ]; unpackCmd = "tar xjf ${src}"; - buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build"; + buildPhase = "${run} build"; createFindlibDestdir = true; - installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; + installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; + + passthru = { inherit run; }; meta = { homepage = http://erratique.ch/software/topkg; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 1b90a539ac8ca51442008faa5b2c840f7a56011c..4230d098e0da46c73c8fe4e929d9c73175c684eb 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, opam, ocb-stubblr }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "tsdl is not available for OCaml ${ocaml.version}" @@ -19,11 +19,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib ocamlbuild topkg result opam ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ]; propagatedBuildInputs = [ SDL2 ctypes ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; preConfigure = '' diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index f10884d72035149a7a78feab8f044f1ddea234cd..c50d08dd14482f613841ec13505c12b45f326dee 100644 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -4,11 +4,11 @@ buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; name = "type_conv"; - version = "112.01.01"; + version = "113.00.02"; src = fetchurl { url = "https://github.com/janestreet/type_conv/archive/${version}.tar.gz"; - sha256 = "dbbc33b7ab420e8442d79ba4308ea6c0c16903b310d33525be18841159aa8855"; + sha256 = "1718yl2q8zandrs4xqffkfmssfld1iz62dzcqdm925735c1x01fk"; }; meta = { diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 49cc56a1db6a7633c32c0fbe94ad471bec921206..a965d6ed11630fa4b0eb6db30bbe8f6148cbda71 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,26 +1,21 @@ -{ stdenv, fetchzip, fetchpatch, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camlp4, uutf, markup, ppx_tools_versioned, re }: assert stdenv.lib.versionAtLeast ocaml.version "4.02"; stdenv.mkDerivation rec { pname = "tyxml"; - version = "4.0.1"; + version = "4.2.0"; name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchzip { url = "http://github.com/ocsigen/tyxml/archive/${version}.tar.gz"; - sha256 = "1mwkjvl78gvw7pvql5qp64cfjjca6aqsb04999qkllifyicaaq8y"; + sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8"; }; - patches = [ (fetchpatch { - url = https://github.com/dbuenzli/tyxml/commit/a2bf5ccc0b6e684e7b81274ff19df8d72e2def8d.diff; - sha256 = "11sidgiwz3zqw815vlslbfzb456z0lndkh425mlmvnmck4d2v2i3"; - })]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned markup ]; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; - - propagatedBuildInputs = [uutf re ppx_tools markup]; + propagatedBuildInputs = [ uutf re ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index c2e5a1fc929873c599fdb76d64975624276bc20b..6b27f00fb15097cdae3670d9e2f10b0daa14e202 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, ocamlbuild, opam }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-uchar-0.0.1"; + name = "ocaml${ocaml.version}-uchar-0.0.2"; src = fetchurl { - url = https://github.com/ocaml/uchar/releases/download/v0.0.1/uchar-0.0.1.tbz; - sha256 = "0ficw1x7ymbd6m8hqw3w1aycwm1hbwd6bad3c5pspwnzh3qlikhi"; + url = https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz; + sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index fa26b305da2d9a90db4eb75bda721fee17804727..ed868c30a44245ae5b92ab08a37bcd7f6456cded 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4 }: let pname = "ulex"; + param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "1.2"; + sha256 = "08yf2x9a52l2y4savjqfjd2xy4pjd1rpla2ylrr9qrz1drpfw4ic"; + } else { + version = "1.1"; + sha256 = "0cmscxcmcxhlshh4jd0lzw5ffzns12x3bj7h27smbc8waxkwffhl"; + }; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "1.1"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + inherit (param) version; - src = fetchurl { - url = "http://www.cduce.org/download/${pname}-${version}.tar.gz"; - sha256 = "0fjlkwps14adfgxdrbb4yg65fhyimplvjjs1xqj5np197cig67x0"; + src = fetchFromGitHub { + owner = "whitequark"; + repo = pname; + rev = "v${version}"; + inherit (param) sha256; }; createFindlibDestdir = true; @@ -21,7 +31,7 @@ stdenv.mkDerivation rec { buildFlags = "all all.opt"; meta = { - homepage = http://www.cduce.org/download.html; + inherit (src.meta) homepage; description = "A lexer generator for Unicode and OCaml"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index f08ee7fc2fc1aba88985643164256204229c4668..5059ef24aa325a1caabef72b786dad7f500f952b 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,51 +1,33 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, re, stringext, ounit -, sexplib, ppx_sexp_conv -, legacyVersion ? false -, sexplib_p4 +{ stdenv, fetchurl, ocaml, findlib, jbuilder, ppx_sexp_conv, ounit +, ppx_deriving, re, sexplib, stringext }: -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 - then { - version = "1.9.1"; - sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; - } else { - version = "1.9.2"; - sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"; - }; - -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "1.9.6"; name = "ocaml${ocaml.version}-uri-${version}"; - src = fetchzip { - url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz"; - inherit sha256; + src = fetchurl { + url = "https://github.com/mirage/ocaml-uri/releases/download/v${version}/uri-${version}.tbz"; + sha256 = "1m845rwd70wi4iijkrigyz939m1x84ba70hvv0d9sgk6971w4kz0"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ] - ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv; - propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ]; + unpackCmd = "tar -xjf $curSrc"; + + buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ounit ]; + propagatedBuildInputs = [ ppx_deriving re sexplib stringext ]; + + buildPhase = "jbuilder build"; - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; - buildPhase = '' - ocaml setup.ml -build - ocaml setup.ml -doc - ''; doCheck = true; - checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; + checkPhase = "jbuilder runtest"; - createFindlibDestdir = true; + inherit (jbuilder) installPhase; meta = { - homepage = https://github.com/mirage/ocaml-uri; - platforms = ocaml.meta.platforms or []; + homepage = "https://github.com/mirage/ocaml-uri"; description = "RFC3986 URI parsing library for OCaml"; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/uri/legacy.nix b/pkgs/development/ocaml-modules/uri/legacy.nix new file mode 100644 index 0000000000000000000000000000000000000000..f08ee7fc2fc1aba88985643164256204229c4668 --- /dev/null +++ b/pkgs/development/ocaml-modules/uri/legacy.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, re, stringext, ounit +, sexplib, ppx_sexp_conv +, legacyVersion ? false +, sexplib_p4 +}: + +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 + then { + version = "1.9.1"; + sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; + } else { + version = "1.9.2"; + sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"; + }; + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-uri-${version}"; + + src = fetchzip { + url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz"; + inherit sha256; + }; + + buildInputs = [ ocaml findlib ocamlbuild ounit ] + ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv; + propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ]; + + configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; + buildPhase = '' + ocaml setup.ml -build + ocaml setup.ml -doc + ''; + doCheck = true; + checkPhase = "ocaml setup.ml -test"; + installPhase = "ocaml setup.ml -install"; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirage/ocaml-uri; + platforms = ocaml.meta.platforms or []; + description = "RFC3986 URI parsing library for OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 89d9d545e57df8789bf51d4f06b01c43075a5f61..60429ca4b401793f479f58592a15b2878a50e353 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, xmlm, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, xmlm, topkg }: let pname = "uucd"; @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0cdyg6vaic4n58w80qriwvaq1c40ng3fh74ilxrwajbq163k055q"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; - - createFindlibDestdir = true; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index cf5b05492330773105bc28959ee0c94eba7642cb..66f1ebeba949ef005c5d3560145aa62dc01dfb93 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, uunf }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf }: let pname = "uucp"; @@ -17,12 +17,10 @@ stdenv.mkDerivation { sha256 = "0qgbrx3lnrzii8a9f0hv4kp73y57q6fr79hskxxxs70q68j2xpfm"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf uunf ]; + buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ]; propagatedBuildInputs = [ uchar ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; buildPhase = "${topkg.buildPhase} --with-cmdliner false"; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 5a1689eaeebdab09c6a9dc00f02e0d7f09863388..b295143c0bc396cf68f5e78a73cccce8444e8860 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }: stdenv.mkDerivation rec { version = "0.9.6"; @@ -10,12 +10,10 @@ stdenv.mkDerivation rec { unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; inherit (topkg) buildPhase installPhase; - createFindlibDestdir = true; - meta = with stdenv.lib; { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; homepage = http://erratique.ch/software/uuidm; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index d65f002ebef3f93f1b3564c96e615edd5ac482ae..e70a539302f07b237a881519fd30ef11fd85965a 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }: let pname = "uunf"; webpage = "http://erratique.ch/software/${pname}"; @@ -15,12 +15,10 @@ stdenv.mkDerivation rec { sha256 = "0c5lwica5668ybsffllk6x4p921nw4pljimgqikhf17k5hvyjsbr"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ]; propagatedBuildInputs = [ uchar ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index f55b757eb268e29cf810342725d5080c3837a25b..f27612510c38ea71c26fc53710fddbac2cc9f268 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uucp, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uucp, uutf, cmdliner }: let pname = "uuseg"; @@ -15,11 +15,9 @@ stdenv.mkDerivation rec { sha256 = "01q8ljjgi7d73x7ms489b5my83xds4jax1vbjhwwjdai01friscc"; }; - buildInputs = [ ocaml findlib ocamlbuild opam cmdliner topkg uutf ]; + buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ]; propagatedBuildInputs = [ uucp uchar ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 93e3fd9c9d2e787b16573eec88a34c9fd2bbadd6..95ec93d8584b0d6f4a10256316842366205fa290 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner , topkg, uchar }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, cmdliner , topkg, uchar }: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; @@ -13,11 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1gp96dcggq7s84934vimxh89caaxa77lqiff1yywbwkilkkjcfqj"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; propagatedBuildInputs = [ uchar ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 0ef3ef4939b9ca093326a9134e0066c111938f22..8a8668df74ee1e41506221b376b887e9f79c6472 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , uchar, result, gg, uutf, otfm , js_of_ocaml, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, pdfBackend ? true, # depends on uutf and otfm @@ -26,14 +26,12 @@ stdenv.mkDerivation rec { sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ]; - createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; buildPhase = topkg.buildPhase diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4cde95c0c4cc7f049e447492744abd4218c77ee6 --- /dev/null +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, ocaml, findlib, jbuilder }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; + +stdenv.mkDerivation rec { + pname = "wtf8"; + name = "ocaml-${pname}-${version}"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib jbuilder ]; + + buildPhase = "jbuilder build -p wtf8"; + + inherit (jbuilder) installPhase; + + createFindLibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://github.com/flowtype/ocaml-wtf8; + description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; + license = licenses.mit; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.eqyiel ]; + }; +} diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index ab82f6abdcbb53502883888f1d39b18fc894260b..44a25865c1a798878c4e541173da2eee30557267 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,27 +1,28 @@ -{stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto, ounit, ocaml_oasis, ppx_sexp_conv}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +, asn1-combinators, astring, nocrypto, ppx_sexp_conv +, ounit, cstruct-unix +}: -buildOcaml rec { - name = "x509"; - version = "0.5.3"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-x509-${version}"; + version = "0.6.1"; - mininimumSupportedOcamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "mirleft"; - repo = "ocaml-x509"; - rev = "${version}"; - sha256 = "07cc3z6h87460z3f4vz8nlczw5jkc4vjhix413z9x6nral876rn7"; + src = fetchurl { + url = "https://github.com/mirleft/ocaml-x509/releases/download/${version}/x509-${version}.tbz"; + sha256 = "1c62mw9rnzq0rs3ihbhfs18nv4mdzwag7893hlqgji3wmaai70pk"; }; - buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; - propagatedBuildInputs = [ asn1-combinators nocrypto ]; + unpackCmd = "tar -xjf $curSrc"; + + buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ]; + propagatedBuildInputs = [ asn1-combinators astring nocrypto ]; - configureFlags = "--enable-tests"; - configurePhase = "./configure --prefix $out $configureFlags"; + buildPhase = "${topkg.run} build --tests true"; doCheck = true; - checkTarget = "test"; - createFindlibDestdir = true; + checkPhase = "${topkg.run} test"; + + inherit (topkg) installPhase; meta = with stdenv.lib; { homepage = https://github.com/mirleft/ocaml-x509; diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 7f5bcb03ad6c25cdb65ed3a3223e3c24b168ed04..9d3a0b1bb4d02b7d61971458f7b21883cd5b96f4 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: let pname = "xmlm"; webpage = "http://erratique.ch/software/${pname}"; @@ -30,19 +30,12 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild opam ] ++ param.buildInputs; - - createFindlibDestdir = true; + buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs; unpackCmd = "tar xjf $src"; inherit (param) buildPhase; - - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) installPhase; meta = with stdenv.lib; { description = "An OCaml streaming codec to decode and encode the XML data format"; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 2ce2faa7e8d6d51e2b862981f524a2d57064ae6e..f494a8cf17ccd014e700c490ea2bd8d9c6fb5cf6 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchzip, ocaml, findlib, cppo, easy-format, biniou }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, cppo, easy-format, biniou }: let pname = "yojson"; param = - if stdenv.lib.versionAtLeast ocaml.version "4.01" then { - version = "1.3.3"; - sha256 = "02l11facbr6bxrxq95vrcp1dxapp02kv7g4gq8rm62pb3dj5c6g7"; + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "1.4.1"; + sha256 = "0nwsfkmqpyfab4rxq76q8ff7giyanghw08094jyrp275v99zdjr9"; + buildInputs = [ jbuilder ]; + extra = { inherit (jbuilder) installPhase; }; } else { version = "1.2.3"; sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; + buildInputs = []; + extra = { + createFindlibDestdir = true; + + makeFlags = "PREFIX=$(out)"; + + preBuild = "mkdir $out/bin"; + }; }; in -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "ocaml${ocaml.version}-${pname}-${param.version}"; @@ -19,18 +29,10 @@ stdenv.mkDerivation { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ] ++ param.buildInputs; propagatedBuildInputs = [ cppo easy-format biniou ]; - createFindlibDestdir = true; - - makeFlags = "PREFIX=$(out)"; - - preBuild = '' - mkdir $out/bin - ''; - meta = with stdenv.lib; { description = "An optimized parsing and printing library for the JSON format"; homepage = "http://mjambon.com/${pname}.html"; @@ -38,4 +40,4 @@ stdenv.mkDerivation { maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; }; -} +} // param.extra) diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index a2a439b295b014a8f92a9ebcf58f5526b6581d54..2737ad95d4b72f0a2135e99b0e90c0889a20d8cb 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -2,11 +2,11 @@ buildPerlPackage rec { name = "DBD-SQLite-${version}"; - version = "1.54"; + version = "1.55_07"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; - sha256 = "3929a6dbd8d71630f0cb57f85dcef9588cd7ac4c9fa12db79df77b9d3a4d7269"; + url = "https://github.com/DBD-SQLite/DBD-SQLite/archive/${version}.tar.gz"; + sha256 = "0213a31eb7b5afc2d7b3775ca2d1717d07fc7e9ed21ae73b2513a8d54ca222d8"; }; propagatedBuildInputs = [ DBI ]; @@ -17,8 +17,7 @@ buildPerlPackage rec { ./external-sqlite.patch ]; - SQLITE_INC = sqlite.dev + "/include"; - SQLITE_LIB = sqlite.out + "/lib"; + makeMakerFlags = "SQLITE_INC=${sqlite.dev}/include SQLITE_LIB=${sqlite.out}/lib"; preBuild = '' diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 7302516d5429d92c51fec1a0605d627c5eab916b..12ddcf166e259638c8327416c596546dd6b5a1b1 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -8,7 +8,7 @@ buildPerlPackage rec { sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7"; }; - buildInputs = [ mysql.lib ] ; + buildInputs = [ mysql.connector-c ] ; propagatedBuildInputs = [ DBI ]; doCheck = false; diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..176cd06a9cc35303a52763050788f8b75c407a22 --- /dev/null +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -0,0 +1,21 @@ +{ fetchFromGitHub, buildPerlPackage, stdenv, perl }: + +buildPerlPackage rec { + name = "MNI-Perllib-2012-04-13"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = "mni-perllib"; + rev = "b908472b4390180ea5d19a121ac5edad6ed88d83"; + sha256 = "0vk99pwgbard62k63386r7dpnm3h435jdqywr4xqfq7p04dz6kyb"; + }; + + patches = [ ./no-stdin.patch ]; + + doCheck = false; # TODO: almost all tests fail ... is this a real problem? + + meta = with stdenv.lib; { + license = with licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/perl-modules/MNI/no-stdin.patch b/pkgs/development/perl-modules/MNI/no-stdin.patch new file mode 100644 index 0000000000000000000000000000000000000000..1e9e791257e7f55313a2854f72c88313a58cb2e0 --- /dev/null +++ b/pkgs/development/perl-modules/MNI/no-stdin.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.PL b/Makefile.PL +index 9f2039a..12d699c 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -213,7 +213,7 @@ TEXT + } # &MY::postamble + + +-query_subs; ++#query_subs; + + my $f; + WriteMakefile diff --git a/pkgs/development/perl-modules/Socket6-sv_undef.patch b/pkgs/development/perl-modules/Socket6-sv_undef.patch new file mode 100644 index 0000000000000000000000000000000000000000..3ed4b61b6d3e5a5ac634a3bd682c16c614c4c9b4 --- /dev/null +++ b/pkgs/development/perl-modules/Socket6-sv_undef.patch @@ -0,0 +1,18 @@ +diff --git a/Socket6.xs b/Socket6.xs +index 05c791c..058e9d9 100644 +--- a/Socket6.xs ++++ b/Socket6.xs +@@ -105,10 +105,6 @@ const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; + #define HAVE_INET_PTON 1 + #endif + +-#ifndef HAVE_PL_SV_UNDEF +-#define PL_sv_undef sv_undef +-#endif +- + static int + not_here(char *s) + { +-- +2.16.3 + diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 9ee8be87c028ded41fecdea85241d723cefd00d0..b833ceb3cab046018e4f8e9f4af01c3520050e3b 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -17,15 +17,12 @@ preConfigure() { first=$(dd if="$fn" count=2 bs=1 2> /dev/null) if test "$first" = "#!"; then echo "patching $fn..." - sed < "$fn" > "$fn".tmp \ - -e "s|^#\!\(.*/perl.*\)$|#\! \1$perlFlags|" - if test -x "$fn"; then chmod +x "$fn".tmp; fi - mv "$fn".tmp "$fn" + sed -i "$fn" -e "s|^#\!\(.*[ /]perl.*\)$|#\!\1$perlFlags|" fi fi done - perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags + perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$perl/bin/perl\" } @@ -34,8 +31,8 @@ postFixup() { # dependencies in the user environment (since Perl modules don't # have something like an RPATH, so the only way to find the # dependencies is to have them in the PERL5LIB variable). - if test -e $out/nix-support/propagated-native-build-inputs; then - ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages + if test -e $out/nix-support/propagated-build-inputs; then + ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages fi } diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 9e21a141c728d83256fe1ca8e855b0114a832dee..b33861d83eed17ff0d0e279f72b43bad9dcca027 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -1,6 +1,6 @@ perl: -{ buildInputs ? [], name, ... } @ attrs: +{ nativeBuildInputs ? [], name, ... } @ attrs: perl.stdenv.mkDerivation ( { @@ -27,6 +27,7 @@ perl.stdenv.mkDerivation ( { name = "perl-" + name; builder = ./builder.sh; - buildInputs = buildInputs ++ [ perl ]; + nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ]; + inherit perl; } ) diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch b/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch new file mode 100644 index 0000000000000000000000000000000000000000..e2f604985bebe96db786c6357cb9ffdb5131cf6c --- /dev/null +++ b/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch @@ -0,0 +1,40 @@ +commit 6d985026 +Author: Michael Brantley +Date: Tue Feb 20 07:12:06 2018 -0500 + + Update broken Pod links in lib/POE/Filter/HTTPD.pm + + Update Pod links to refer only to the utf8 module and not its methods, + fix a mis-capitalized internal reference, and convert the dangling + "MaxContent" link into a code reference. + + Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124496 + +diff --git a/lib/POE/Filter/HTTPD.pm b/lib/POE/Filter/HTTPD.pm +index 9d4898e3..517be691 100644 +--- a/lib/POE/Filter/HTTPD.pm ++++ b/lib/POE/Filter/HTTPD.pm +@@ -621,10 +621,10 @@ how to use these objects. + + HTTP headers are not allowed to have UTF-8 characters; they must be + ISO-8859-1. POE::Filter::HTTPD will convert all UTF-8 into the MIME encoded +-equivalent. It uses L for detection-8 and ++equivalent. It uses C for detection-8 and + L for convertion. If L is not + installed, no conversion happens. If L is +-not installed, L is used instead. In this last case, you will ++not installed, C is used instead. In this last case, you will + see a warning if you try to send UTF-8 headers. + + +@@ -651,8 +651,8 @@ streaming mode this filter will return either an HTTP::Request object or a + block of content. The HTTP::Request object's content will return empty. + The blocks of content will be parts of the request's body, up to + Content-Length in size. You distinguish between request objects and content +-blocks using C (See L below). This +-option supersedes L. ++blocks using C (See L below). This ++option supersedes C. + + =head1 CAVEATS + diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch b/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch new file mode 100644 index 0000000000000000000000000000000000000000..097a7677e517910177d1b3b77a6fa7d7e72c9ee6 --- /dev/null +++ b/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch @@ -0,0 +1,46 @@ +commit 32571a21 +Author: Michael Brantley +Date: Tue Feb 20 07:07:22 2018 -0500 + + Update old URLs referenced in Pod + + Remove mention of old URLs, replace mention of canonical SVN repo with + the new git-based one at github.com. + + Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124495 + +diff --git a/lib/POE.pm b/lib/POE.pm +index 80e7feac..0554ff70 100644 +--- a/lib/POE.pm ++++ b/lib/POE.pm +@@ -465,7 +465,7 @@ code snippets there as well. + The following command will fetch the most current version of POE into + the "poe" subdirectory: + +- svn co https://poe.svn.sourceforge.net/svnroot/poe poe ++ git clone https://github.com/rcaputo/poe.git + + =head2 SourceForge + +@@ -535,18 +535,9 @@ https://rt.cpan.org/Dist/Display.html?Status=Active&Queue=POE + + =head2 Repositories and Changes + +-Thanks to the magic of distributed version control, POE is hosted at +-three locations for redundancy. You can browse the source at any one +-of: +- +-https://github.com/rcaputo/poe +- +-https://gitorious.org/poe +- +-http://poe.git.sourceforge.net/git/gitweb-index.cgi +- +-Complete change logs can also be browsed at those sites. They all +-provide RSS news feeds for those who want to follow development in ++You can browse the POE source and complete change logs at ++https://github.com/rcaputo/poe. It also provides an RSS ++news feed for those who want to follow development in + near-realtime. + + =head2 Other Resources diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index b2e37344afc3302ff84fa48fd681ee00fd3b56bb..f2fd6eebd56ebbb54ff7d36d0779b2c9e02831bd 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: { name, src, ... }: @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name ''; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo mesa freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU_combined freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; - buildInputs = [ bash glibc openssl mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + buildInputs = [ bash glibc openssl libGLU_combined freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.lukego ]; # Pharo VM sources are packaged separately for darwin (OS X) - platforms = with stdenv.lib; - intersectLists - platforms.mesaPlatforms - (subtractLists platforms.darwin platforms.unix); + platforms = stdenv.lib.filter + (system: with stdenv.lib.systems.elaborate { inherit system; }; + isUnix && !isDarwin) + stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 74fa75e7aa569478eaef562038ea6aaf5201c6af..82b3da7a37c4682efe7ca83189fb96915d8a3fa8 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: +{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: { name, src, version, source-date, source-url, ... }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { else if stdenv.isLinux && stdenv.isx86_64 then "linux64x64" else if stdenv.isDarwin && stdenv.isi686 then "macos32x86" else if stdenv.isDarwin && stdenv.isx86_64 then "macos64x64" - else abort "Unsupported platform: only Linux/Darwin x86/x64 are supported."; + else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported."; # Shared data (for the sources file) pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc. - libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${mesa}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib + libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${libGLU_combined}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib # Create the script cat > "$out/bin/${cmd}" <>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ - tests/run/cpdef_enums.pyx - ''; - nativeBuildInputs = [ pkgconfig - # For testing + ]; + checkInputs = [ numpy ncurses ]; buildInputs = [ glibcLocales gdb ]; @@ -46,10 +37,6 @@ buildPythonPackage rec { ${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"; homepage = http://cython.org; diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index 2f72f7c16a7a4cd7a71f74eb3d7627348257301d..cd9d8ee46d8af81b4c7c46409e5f0a2fe4e42cf0 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, dns, pycountry, nose }: +{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose }: buildPythonPackage rec { pname = "FormEncode"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1xm77h2mds2prlaz0z4nzkx13g61rx5c2v3vpgjq9d5ij8bzb8md"; }; - buildInputs = [ dns pycountry nose ]; + buildInputs = [ dnspython pycountry nose ]; patchPhase = '' # dnspython3 has been superseded, see its PyPI page diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix index 6c4453774ceda4763d18be71879fc12b83ddfba2..0bacd8edb312a4da7decf3b2a61afd515fa7c19c 100644 --- a/pkgs/development/python-modules/GeoIP/default.nix +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "MaxMind GeoIP Legacy Database - Python API"; - homepage = http://www.maxmind.com/; + homepage = https://www.maxmind.com/; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..eacfe8dda5bcf1e838dd326513ba722fe753e4b4 --- /dev/null +++ b/pkgs/development/python-modules/IPy/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "IPy"; + version = "0.83"; + + src = fetchPypi { + inherit pname version; + sha256 = "61da5a532b159b387176f6eabf11946e7458b6df8fb8b91ff1d345ca7a6edab8"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests -e fuzz + ''; + + meta = with stdenv.lib; { + description = "Class and tools for handling of IPv4 and IPv6 addresses and networks"; + homepage = "https://github.com/autocracy/python-ipy"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ y0no ]; + }; +} diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..13bddd3ffb8f6b244013800569e864eb9e056c6d --- /dev/null +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "JPype1"; + version = "0.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "6841523631874a731e1f94e1b1f130686ad3772030eaa3b6946256eeb1d10dd1"; + }; + + patches = [ ./set-compiler-language.patch ]; + + # Test loader complains about non-test module on python3. + doCheck = !isPy3k; + + meta = { + homepage = "https://github.com/originell/jpype/"; + license = "License :: OSI Approved :: Apache Software License"; + description = "A Python to Java bridge."; + }; +} diff --git a/pkgs/development/python-modules/JPype1/set-compiler-language.patch b/pkgs/development/python-modules/JPype1/set-compiler-language.patch new file mode 100644 index 0000000000000000000000000000000000000000..1d5921a6ffabb1763f626520816d728c28af56d5 --- /dev/null +++ b/pkgs/development/python-modules/JPype1/set-compiler-language.patch @@ -0,0 +1,12 @@ +diff -Naur a/setup.py b/setup.py +--- a/setup.py 2017-01-12 19:08:44.000000000 -0500 ++++ b/setup.py 2018-02-15 12:28:16.000000000 -0500 +@@ -123,7 +123,7 @@ + + # extra compile args + copt = {'msvc': ['/EHsc'], +- 'unix' : ['-ggdb'], ++ 'unix' : ['-ggdb', '-x', 'c++'], + 'mingw32' : [], + } + # extra link args diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/pkgs/development/python-modules/JayDeBeApi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a423945b0ce8edfa9e271313e805377f21fea392 --- /dev/null +++ b/pkgs/development/python-modules/JayDeBeApi/default.nix @@ -0,0 +1,16 @@ +{ lib, buildPythonPackage, fetchPypi, JPype1 }: + +buildPythonPackage rec { + pname = "JayDeBeApi"; + version = "1.1.1"; + src = fetchPypi { + inherit pname version; + sha256 = "0a189xs9zw81jvwwglvf2qyqnk6ra0biljssx9n4ffayqn9glbds"; + }; + propagatedBuildInputs = [ JPype1 ]; + meta = { + homepage = "https://github.com/baztian/jaydebeapi"; + license = lib.licenses.lgpl2; + description = "Use JDBC database drivers from Python 2/3 or Jython with a DB-API."; + }; +} diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f3f1eed265d0129c8385979458dce5cf30502a80 --- /dev/null +++ b/pkgs/development/python-modules/Mako/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, markupsafe +, nose +, mock +, pytest +, isPyPy +}: + +buildPythonPackage rec { + pname = "Mako"; + version = "1.0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"; + }; + + checkInputs = [ markupsafe nose mock pytest ]; + propagatedBuildInputs = [ markupsafe ]; + + doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 + + meta = { + description = "Super-fast templating language"; + homepage = http://www.makotemplates.org; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ domenkozar ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index 56e2cf501edaa7a4fe9a58db86c61a752023c526..63eb93a207cd7868a4d3fc949e9efe5a681a630c 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -1,29 +1,27 @@ { fetchPypi, buildPythonPackage, lib -, requests, beautifulsoup4, six +, requests, beautifulsoup4, six, lxml , pytestrunner, requests-mock, pytestcov, pytest }: - buildPythonPackage rec { - name = "${pname}-${version}"; pname = "MechanicalSoup"; - version = "0.8.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "38a6ca35428196be94f87f8f036ee4a88b1418d1f77e5634ad92acfaa22c28da"; + sha256 = "22423efd025c3eedb06f41d3ff1127174a59f40dc560e82dce143956976195bf"; }; checkInputs = [ pytest pytestrunner requests-mock pytestcov ]; - propagatedBuildInputs = [ requests beautifulsoup4 six ]; + propagatedBuildInputs = [ lxml requests beautifulsoup4 six ]; # Requires network doCheck = false; postPatch = '' # Is in setup_requires but not used in setup.py... - substituteInPlace setup.py --replace "'pytest-runner'," "" + substituteInPlace setup.py --replace "'pytest-runner'" "" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index f281a02d49b6a12505ea95ea5dce95c7f480206f..bb6eddb46d1ee7ee23d7e431dc86ce1d71c645c2 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -6,7 +6,7 @@ , glibcLocales , pytest , pytestcov -, pytest-mock +, mock , pygments , pillow , dateutil @@ -28,16 +28,15 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Nikola"; - version = "7.8.10"; + version = "7.8.14"; # 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 ]; + checkInputs = [ pytest pytestcov mock glibcLocales ]; propagatedBuildInputs = [ pygments pillow dateutil docutils Mako unidecode lxml Yapsy PyRSS2Gen @@ -47,7 +46,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e242c3d0dd175d95a0baf5268b108081ba160b83ceafec8c9bc2ec0a24a56537"; + sha256 = "0d838817ac30ac6d4b8139a2adc8b49bed22dbb8fbc6261958d2775e10447d92"; }; meta = { diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 11a6fc96eb2fbd53a1f7754fe85aae44a5746b3d..8ab846986f06f7b4e84dbd5422e4077233e002bb 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { homepage = http://pygments.org/; description = "A generic syntax highlighter"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ nckx garbas ]; + maintainers = with lib.maintainers; [ garbas ]; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7953829465b91c2f58c7360a7c7399d9ba2313b4 --- /dev/null +++ b/pkgs/development/python-modules/Rtree/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, libspatialindex, numpy }: + +buildPythonPackage rec { + pname = "Rtree"; + version = "0.8.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jc62jbcqqpjcwcly7l9zk25bg72mrxmjykpvfiscgln00qczfbc"; + }; + + propagatedBuildInputs = [ libspatialindex ]; + + patchPhase = '' + substituteInPlace rtree/core.py --replace \ + "find_library('spatialindex_c')" "'${libspatialindex}/lib/libspatialindex_c${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + # Tests appear to be broken due to mysterious memory unsafe issues. See #36760 + doCheck = false; + checkInputs = [ numpy ]; + + meta = with stdenv.lib; { + description = "R-Tree spatial index for Python GIS"; + homepage = https://toblerity.org/rtree/; + license = licenses.lgpl21; + maintainers = with maintainers; [ bgamari ]; + }; +} diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index e0ff839ce1b7d1e4297ac3e4f3a67950a826a437..03dc825218e2590d0f88b6c71482d5633939cdcd 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -35,13 +35,13 @@ let in buildPythonPackage rec { name = "${pname}-${version}"; pname = "Theano"; - version = "0.9.0"; + version = "1.0.1"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); src = fetchPypi { inherit pname version; - sha256 = "05xwg00da8smkvkh6ywbywqzj8dw7x840jr74wqhdy9icmqncpbl"; + sha256 = "88d8aba1fe2b6b75eacf455d01bc7e31e838c5a0fb8c13dde2d9472495ff4662"; }; postPatch = '' diff --git a/pkgs/development/python-modules/TurboCheetah/default.nix b/pkgs/development/python-modules/TurboCheetah/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..45c42a7b43f94129bc8513dcf89e5a44107f17ae --- /dev/null +++ b/pkgs/development/python-modules/TurboCheetah/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cheetah +, nose +}: + +buildPythonPackage rec { + pname = "TurboCheetah"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9e4c7ecb0d061bfb58281363ee1b09337083f013a8b4d0355326a5d8668f450c"; + }; + + propagatedBuildInputs = [ cheetah ]; + + checkInputs = [ nose ]; + + meta = { + description = "TurboGears plugin to support use of Cheetah templates"; + homepage = http://docs.turbogears.org/TurboCheetah; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8cbbd2c767fbf68927dfd1063d7a1139a61ac9c6 --- /dev/null +++ b/pkgs/development/python-modules/WSME/default.nix @@ -0,0 +1,49 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k +, pbr, six, simplegeneric, netaddr, pytz, webob +, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx +, flask, flask-restful, suds-jurko, glibcLocales }: + +buildPythonPackage rec { + pname = "WSME"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "e790ac755a7e36eaa796d3966d3878677896dbc7d1c2685cb85c06b744c21976"; + }; + + postPatch = '' + # remove turbogears tests as we don't have it packaged + rm tests/test_tg* + # WSME seems incompatible with recent SQLAlchemy version + rm wsmeext/tests/test_sqlalchemy* + # https://bugs.launchpad.net/wsme/+bug/1510823 + ${if isPy3k then "rm tests/test_cornice.py" else ""} + ''; + + checkPhae = '' + nosetests --exclude test_buildhtml \ + --exlcude test_custom_clientside_error \ + --exclude test_custom_non_http_clientside_error + ''; + + # UnicodeEncodeError, ImportError, ... + doCheck = !isPy3k; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + six simplegeneric netaddr pytz webob + ]; + + checkInputs = [ + cornice nose webtest pecan transaction cherrypy sphinx + flask flask-restful suds-jurko glibcLocales + ]; + + meta = with lib; { + description = "Simplify the writing of REST APIs, and extend them with additional protocols"; + homepage = http://git.openstack.org/cgit/openstack/wsme; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c512b17332fc7ca418e92018510bd6e7cab1abcd --- /dev/null +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -0,0 +1,19 @@ +{lib, buildPythonPackage, fetchPypi}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "XlsxWriter"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mpq4l1jfghdqx2vzbzl9v28vw69lkx5vz9gb77gzaw8zypvnsx2"; + }; + + meta = { + description = "A Python module for creating Excel XLSX files"; + homepage = https://xlsxwriter.readthedocs.io/; + maintainers = with lib.maintainers; [ jluttine ]; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 3f37820fd35fa5f07c694a9b9a7ec0157dc4e970..8e3f3939b363c4a6c72011720e595cc7cdbc00cd 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -6,12 +6,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.1.3"; - name = "${pname}-${version}"; + version = "0.1.13"; src = fetchPypi { inherit pname version; - sha256 = "017wc85i7l3vpjzw3shgb7k7n0jfid88g09dlf1kgdy4ll0sjfax"; + sha256 = "d160f7dc39f2f05ddc0bbf3a7bea4cc659fedc45fd9042e87346b24fe1cd00bb"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index 71357e5bef233534dcacf909cfdff0801d763f4e..ccf56c208f23842f99e8345cd5209f1628b8c09f 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -1,6 +1,18 @@ { stdenv, buildPythonPackage, fetchPypi -, certbot, nose, cryptography, pyasn1, pyopenssl, pyRFC3339 -, pytz, requests, six, werkzeug, mock, ndg-httpsclient }: +, certbot +, nose +, cryptography +, pyasn1 +, pyopenssl +, pyRFC3339 +, josepy +, pytz +, requests +, six +, werkzeug +, mock +, ndg-httpsclient +}: buildPythonPackage rec { inherit (certbot) src version; @@ -10,10 +22,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock - ndg-httpsclient + ndg-httpsclient josepy ]; - buildInputs = [ nose ]; + checkInputs = [ nose ]; postUnpack = "sourceRoot=\${sourceRoot}/acme"; } diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index d1cb1180358fdeba4fd4e5ed1595a234d75658be..9d7b1148146cf3d6f0796b3d069c6ee717edaa67 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A package for acousticians"; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; license = with licenses; [ bsd3 ]; homepage = https://github.com/python-acoustics/python-acoustics; }; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index a1fb96673957f5c876c442b1779c08cfc5272a58..0ba846bb0f6e69882802ca23243d9e40d87b37e9 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "adal"; - version = "0.4.7"; + version = "0.5.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "114046ac85d0054791c21b00922f26286822bc6f2ba3716db42e7e57f762ef20"; + sha256 = "dd3ecb2dfb2de9393320d0ed4e6115ed07a6984a28e18adf46499b91d3c3a494"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 3aa03aaa599361e686385610df812de8191c1d86..facf86c589887d1b840b8a194a9893ca8a572d85 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }: buildPythonPackage rec { pname = "aenum"; - version = "2.0.8"; + version = "2.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3209fa41b8c41345442e8d9b5158a57d3e96d84c3d5ebbe8e521e1e2eff1598d"; + sha256 = "9eb1c8f48ae13c56d22a7227db0e4b1717131b284c6c0db6e4ccca6f5894df95"; }; - 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) + # For Python 3, locale has to be set to en_US.UTF-8 for + # tests to pass + checkInputs = if isPy3k then [ glibcLocales ] else []; + + checkPhase = '' + runHook preCheck + ${if isPy3k then "export LC_ALL=en_US.UTF-8" else ""} + PYTHONPATH=`pwd` ${python.interpreter} aenum/test.py + runHook postCheck + ''; + meta = { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; diff --git a/pkgs/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix deleted file mode 100644 index 05280738e5bab5c94975288ab87a1f014a124c48..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/afew/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, isPy3k , setuptools_scm, notmuch, chardet, subprocess32 }: - -buildPythonPackage rec { - pname = "afew"; - version = "1.2.0"; - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "afewmail"; - repo = "afew"; - rev = "3405475276a2433e1238be330e538ebf2a976e5e"; - sha256 = "1h974avnfc6636az130yjqwm28z3aaqm49bjhpy3razx6zvyhzlf"; - }; - - buildInputs = [ setuptools_scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = "${version}"; - - propagatedBuildInputs = [ - notmuch - chardet - ] ++ stdenv.lib.optional (!isPy3k) subprocess32; - - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/afew \ - --prefix LD_LIBRARY_PATH : ${notmuch}/lib - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/afewmail/afew; - description = "An initial tagging script for notmuch mail"; - maintainers = with maintainers; [ garbas ]; - }; -} diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix index f2cb2ef6445e83f382edd9357e3301df06a342c0..4eaaf56b441f5915bf9d3a15557feb705308a736 100644 --- a/pkgs/development/python-modules/affinity/default.nix +++ b/pkgs/development/python-modules/affinity/default.nix @@ -1,13 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "affinity"; version = "0.1.0"; + + # syntax error + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6"; }; + meta = { description = "control processor affinity on windows and linux"; homepage = http://cheeseshop.python.org/pypi/affinity; diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index cb0113c22b3d14800cd70fdb0c291037ef3d8981..b39df3959fae90a0f789e99bf9670a9ad35dc5b8 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "agate-excel"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7"; + sha256 = "8923f71ee2b5b7b21e52fb314a769b28fb902f647534f5cbbb41991d8710f4c7"; }; propagatedBuildInputs = [ agate openpyxl xlrd ]; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 0167b40ea43f10ab64afe2524eef97f71ea6214f..34de9ea06e9c6674d01b6a9f7e7ae34489e815c3 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "agate-sql"; - version = "0.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14"; + sha256 = "877b7b85adb5f0325455bba8d50a1623fa32af33680b554feca7c756a15ad9b4"; }; propagatedBuildInputs = [ agate sqlalchemy ]; diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 3ff097a78cf32b2ee85f3c2be5a160ec16d43fa1..8e480d4a3dfdc234b28eeabfd074d3d935552534 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "agate"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm"; + sha256 = "c93aaa500b439d71e4a5cf088d0006d2ce2c76f1950960c8843114e5f361dfd3"; }; propagatedBuildInputs = [ discid six parsedatetime diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b865b5654964ac07ace996e3beb425c3a6c12757 --- /dev/null +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi }: + +# This package provides a binary "apython" which sometimes invokes +# [sys.executable, '-m', 'aioconsole'] as a subprocess. If apython is +# run directly out of this derivation, it won't work, because +# sys.executable will point to a Python binary that is not wrapped to +# be able to find aioconsole. +# However, apython will work fine when using python##.withPackages, +# because with python##.withPackages the sys.executable is already +# wrapped to be able to find aioconsole and any other packages. +buildPythonPackage rec { + pname = "aioconsole"; + version = "0.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "17bnfcp0gacnmpdam6byb7rwhqibw57f736bbgk45w4cy2lglj3y"; + }; + + # hardcodes a test dependency on an old version of pytest-asyncio + doCheck = false; + + meta = { + description = "Asynchronous console and interfaces for asyncio"; + homepage = https://github.com/vxgmichel/aioconsole; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.catern ]; + }; +} diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 9139c62618a6e29d8e4d13972e6df3561c2a42de..d0808a1cc3105bd21b7e0920cfab9b9f4c906bf5 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "File support for asyncio"; homepage = https://github.com/Tinche/aiofiles; license = with lib.licenses; [ asl20 ]; - maintainer = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4865901713a3225519f8b427cd0795a118a0c06c --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }: + +buildPythonPackage rec { + pname = "aiohttp-jinja2"; + version = "0.17.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "8139c63fe989e140dceae378440680258dfb72f3301c79173945245299d795e6"; + }; + + propagatedBuildInputs = [ aiohttp jinja2 ]; + + checkInputs = [ pytest pytest-aiohttp ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Jinja2 support for aiohttp"; + homepage = https://github.com/aio-libs/aiohttp_jinja2; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix index 78ed435504cf0f2a3054703c66453f74c68ce01f..3065bb17c05d33ddd354ca2b73894515943cafa8 100644 --- a/pkgs/development/python-modules/aiohttp/cors.nix +++ b/pkgs/development/python-modules/aiohttp/cors.nix @@ -1,20 +1,24 @@ -{lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, typing, aiohttp }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +, typing, aiohttp +}: buildPythonPackage rec { pname = "aiohttp-cors"; - version = "0.5.3"; - name = "${pname}-${version}"; + version = "0.7.0"; + src = fetchPypi { inherit pname version; - sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in"; + sha256 = "0pczn54bqd32v8zhfbjfybiza6xh1szwxy6as577dn8g23bwcfad"; }; - # Requires network access - doCheck = false; + disabled = pythonOlder "3.5"; propagatedBuildInputs = [ aiohttp ] ++ lib.optional (pythonOlder "3.5") typing; + # Requires network access + doCheck = false; + meta = with lib; { description = "CORS support for aiohttp"; homepage = "https://github.com/aio-libs/aiohttp-cors"; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 5f87580643f69649104174638b57809e1d15acdc..ab5c4b6257808d82731353f67c06605a2b25d401 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -2,35 +2,38 @@ , buildPythonPackage , fetchPypi , pythonOlder +, attrs , chardet , multidict , async-timeout , yarl +, idna-ssl , pytest , gunicorn -, pytest-raisesregexp +, pytest-mock +, async_generator }: buildPythonPackage rec { pname = "aiohttp"; - version = "2.3.2"; - name = "${pname}-${version}"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "42373fbdbe8f09233c17e74f53cee877bc7d5b495b4fc14c32a119255e85e736"; + sha256 = "df49fe4452a942e0031174c78917f9926d122d4603bf56bae4591639f2a3dc6a"; }; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.5"; - doCheck = false; # Too many tests fail. + checkInputs = [ pytest gunicorn pytest-mock async_generator ]; - checkInputs = [ pytest gunicorn pytest-raisesregexp ]; - propagatedBuildInputs = [ async-timeout chardet multidict yarl ]; + propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] + ++ lib.optional (pythonOlder "3.7") idna-ssl; - meta = { - description = "Http client/server for asyncio"; - license = with lib.licenses; [ asl20 ]; - homepage = https://github.com/KeepSafe/aiohttp/; + meta = with lib; { + description = "Asynchronous HTTP Client/Server for Python and asyncio"; + license = licenses.asl20; + homepage = https://github.com/aio-libs/aiohttp; + maintainers = with maintainers; [ dotlambda ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d335cbc556cb86cc84df8d0060e574313f114348 --- /dev/null +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils }: + +buildPythonPackage rec { + pname = "aioimaplib"; + version = "0.7.13"; + + # PyPI tarball doesn't ship tests + src = fetchFromGitHub { + owner = "bamthomas"; + repo = pname; + rev = version; + sha256 = "19yhk4ixfw46d0bvx6a40r23nvia5a83dzn5rzwaq1wdjr186bbn"; + }; + + disbaled = pythonOlder "3.4"; + + checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils ]; + + meta = with lib; { + description = "Python asyncio IMAP4rev1 client library"; + homepage = https://github.com/bamthomas/aioimaplib; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..373c35440620d37b39bd0f09595216868d7864a9 --- /dev/null +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ajpy"; + version = "0.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a5f62b765f59ffc37e759d3f343de16cd782cc4e9e8be09c73b71dfbe383d9b"; + }; + + # ajpy doesn't have tests + doCheck = false; + + meta = with stdenv.lib; { + description = "AJP package crafting library"; + homepage = "https://github.com/hypn0s/AJPy/"; + license = licenses.lgpl2; + maintainers = with maintainers; [ y0no ]; + }; +} diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 364f4cf9a3ab1cfa8982332a3b3805e7684d21aa..503ce5da4b5229d87ef3853bd6eeaf77c3884b1a 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "alembic"; - version = "0.9.6"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "042851ebe9efa07be6dc1395b1793b6c1d8964a39b73a0ce1649e2bcd41ea732"; + sha256 = "85bd3ea7633024e4930900bc64fb58f9742dedbc6ebb6ecf25be2ea9a3c1b32e"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e21b43c60e0db4d366e42e48560c156869381bfd --- /dev/null +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, six, pytest }: + +buildPythonPackage rec { + pname = "allpairspy"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9fb7962ee523bd96c5098cd3c97ac1b8eb73021d3df9314657ee9de00f52e034"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Pairwise test combinations generator"; + homepage = https://github.com/thombashi/allpairspy; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..dd06d4dde7a6e58efd9e8966caa479a719a19ca5 --- /dev/null +++ b/pkgs/development/python-modules/alot/default.nix @@ -0,0 +1,60 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy3k +, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme +, service-identity +, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null +, withManpage ? false }: + + +buildPythonPackage rec { + pname = "alot"; + version = "0.7"; + outputs = [ "out" ] ++ lib.optional withManpage "man"; + + disabled = isPy3k; + + src = fetchFromGitHub { + owner = "pazz"; + repo = "alot"; + rev = "${version}"; + sha256 = "1y932smng7qx7ybmqw4qh75b0lv9imfs5ak9fd0qhysij8kpmdhi"; + }; + + nativeBuildInputs = lib.optional withManpage sphinx; + + propagatedBuildInputs = [ + notmuch + urwid + urwidtrees + twisted + python_magic + configobj + service-identity + file + gpgme + ]; + + # some twisted tests need the network (test_env_set... ) + doCheck = false; + postBuild = lib.optionalString withManpage "make -C docs man"; + + checkInputs = [ awk future mock gnupg procps ]; + + postInstall = lib.optionalString withManpage '' + mkdir -p $out/man + cp -r docs/build/man $out/man + '' + + '' + mkdir -p $out/share/{applications,alot} + cp -r extra/themes $out/share/alot + + sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pazz/alot; + description = "Terminal MUA using notmuch mail"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index d3cdc0f43f23b3cb61705a636f0cde0ea68434c2..d98eba693d23a7daf27f08a62ff8459083926d3e 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,17 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, vega, pandas, ipython, traitlets }: +, pytest, glibcLocales, vega, pandas, ipython, traitlets }: buildPythonPackage rec { pname = "altair"; version = "1.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "c1303f77f1ba4d632f2958c83c0f457b2b969860b1ac9adfb872aefa1780baa7"; }; - buildInputs = [ pytest ]; + postPatch = '' + sed -i "s/vega==/vega>=/g" setup.py + ''; + + checkInputs = [ pytest glibcLocales ]; checkPhase = '' export LANG=en_US.UTF-8 @@ -19,8 +22,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ vega pandas ipython traitlets ]; - # Disabling checks, MockRequest object has no method send() - doCheck = false; meta = with stdenv.lib; { description = "A declarative statistical visualization library for Python."; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fa5b27a4ced89c1ebdde2b966c9b5a6ccbf73a33 --- /dev/null +++ b/pkgs/development/python-modules/amqp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, case, vine }: + +buildPythonPackage rec { + pname = "amqp"; + version = "2.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "cba1ace9d4ff6049b190d8b7991f9c1006b443a5238021aca96dd6ad2ac9da22"; + }; + + buildInputs = [ pytest case ]; + propagatedBuildInputs = [ vine ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/py-amqp; + description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 6e61e84a5d53b00f51c224e64dec4aa3a510f625..6e596172d9e783a79a1726d78f4a9166a35a8b27 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "1.3.0"; + version = "3.0.0"; name = "${pname}-${version}"; meta = with stdenv.lib; { @@ -16,6 +16,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c3b5246f5601b6ae5671911bc4ee5b3e3fe94752e8afab5ce074d8b1232952f1"; + sha256 = "7cf068e7aec00edeb21879c2bbda048656c34d281e133a77425be03b352122d8"; }; } diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a79de55d2eb0103e7ac6fbd90d7d7b0f8cfb5e1d --- /dev/null +++ b/pkgs/development/python-modules/ansi/default.nix @@ -0,0 +1,15 @@ +{ buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ansi"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "06y6470bzvlqys3zi2vc68rmk9n05v1ibral14gbfpgfa8fzy7pg"; + }; + + checkPhase = '' + python -c "import ansi.color" + ''; +} diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index ca29b631f471299addcce57990f560acd6ddae77..26b182dfc08a05594565fb51c5cb0d5713da3892 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "ansicolor"; - version = "0.2.4"; + version = "0.2.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h"; + sha256 = "d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix index 9192186cd7179c2a5be11cd3cf2b3d1b694681ab..a737cb06ea22671cdf9244c46ea964eb6e7906f9 100644 --- a/pkgs/development/python-modules/ansicolors/default.nix +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -1,15 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "ansicolors"; - version = "1.0.2"; - name = "${pname}-${version}"; + version = "1.1.8"; src = fetchPypi { inherit pname version; - sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n"; + extension = "zip"; + sha256 = "99f94f5e3348a0bcd43c82e5fc4414013ccc19d70bd939ad71e0133ce9c372e0"; }; + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { homepage = https://github.com/verigak/colors/; description = "ANSI colors for Python"; diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..84f2859d50c032cec37f513cbf37bcec3c64c014 --- /dev/null +++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: + +buildPythonPackage rec { + version = "4.7.1"; + name = "antlr4-python3-runtime-${version}"; + disabled = !isPy3k; + + src = fetchurl { + url = "mirror://pypi/a/antlr4-python3-runtime/${name}.tar.gz"; + sha256 = "1lrzmagawmavyw1n1z0qarvs2jmbnbv0p89dah8g7klj8hnbf9hv"; + }; + + meta = { + description = "Runtime for ANTLR"; + homepage = "http://www.antlr.org/"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ba32cf7ea695d1580633bd893095862682188cc3 --- /dev/null +++ b/pkgs/development/python-modules/anyjson/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, nose }: + +buildPythonPackage rec { + pname = "anyjson"; + version = "0.3.3"; + + # The tests are written in a python2 syntax but anyjson is python3 valid + doCheck = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba"; + }; + + buildInputs = [ nose ]; + + meta = { + homepage = https://pypi.python.org/pypi/anyjson/; + description = "Wrapper that selects the best available JSON implementation"; + }; +} diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..32314b81edca51cbe824f69d6c24099f231debad --- /dev/null +++ b/pkgs/development/python-modules/application/default.nix @@ -0,0 +1,15 @@ +{ stdenv, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: + +buildPythonPackage rec { + pname = "python-application"; + version = "2.0.2"; + disabled = isPy3k; + + src = fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; + }; + + buildInputs = [ zope_interface ]; +} diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 3e7e970da6c0ce0f67f0c2825864b41746d06751..fb22128b9288817d59fc230b2189b7f0f7476c61 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,25 +1,24 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchFromGitHub , sqlite, isPyPy }: buildPythonPackage rec { pname = "apsw"; - version = "3.7.6.2-r1"; - name = "${pname}-${version}"; + version = "3.22.0-r1"; disabled = isPyPy; - src = fetchurl { - url = "http://apsw.googlecode.com/files/${name}.zip"; - sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb"; + src = fetchFromGitHub { + owner = "rogerbinns"; + repo = "apsw"; + rev = version; + sha256 = "02ldvshcgr4c7c8anp4flfnw8g8ys5bflkb8b51rb618qxhhwyak"; }; buildInputs = [ sqlite ]; - # python: double free or corruption (fasttop): 0x0000000002fd4660 *** - doCheck = false; - meta = with stdenv.lib; { description = "A Python wrapper for the SQLite embedded relational database engine"; - homepage = http://code.google.com/p/apsw/; + homepage = https://github.com/rogerbinns/apsw; + license = licenses.zlib; }; } diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 3c4d802718e8adba97ef41bfc4da126c20e0dab9..862564dbcd156550d8a147ea372b731508fb97c6 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -5,8 +5,9 @@ ... }: buildPythonPackage rec { - name = "arelle-${version}${lib.optionalString (!gui) "-headless"}"; + pname = "arelle-${version}${lib.optionalString (!gui) "-headless"}"; version = "2017-08-24"; + name = pname + "-" + version; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index a4318fe5fa45ffeb60890225c9f505a254f6efea..b13470b4c45b88514f4bcefd91f4470c0c2e0b61 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "argcomplete"; - version = "1.9.2"; + version = "1.9.4"; src = fetchPypi { inherit pname version; - sha256 = "d6ea272a93bb0387f758def836e73c36fff0c54170258c212de3e84f7db8d5ed"; + sha256 = "06c8a54ffaa6bfc9006314498742ec8843601206a3b94212f82657673662ecf1"; }; doCheck = false; # bash-completion test fails with "compgen: command not found". diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f46efd9f496ec5516f220164cd4f6a16a4242779 --- /dev/null +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -0,0 +1,31 @@ +{ lib +, cffi +, six +, hypothesis +, pytest +, wheel +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "argon2_cffi"; + version = "18.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "7e4b75611b73f53012117ad21cdde7a17b32d1e99ff6799f22d827eb83a2a59b"; + }; + + propagatedBuildInputs = [ cffi six ]; + checkInputs = [ hypothesis pytest wheel ]; + checkPhase = '' + pytest tests + ''; + + meta = { + description = "Secure Password Hashes for Python"; + homepage = https://argon2-cffi.readthedocs.io/; + }; +} diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index a85987a95b1654257b369c68df4c168c21e1c6ec..65f4ae79f4b337a9e93f014b6811787b1bad7b9d 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,23 +1,26 @@ { stdenv, buildPythonPackage, fetchPypi -, nose, chai, simplejson +, nose, chai, simplejson, backports_functools_lru_cache , dateutil }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "arrow"; - version = "0.10.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0"; + sha256 = "a558d3b7b6ce7ffc74206a86c147052de23d3d4ef0e17c210dd478c53575c4cd"; }; checkPhase = '' nosetests --cover-package=arrow ''; - buildInputs = [ nose chai simplejson ]; - propagatedBuildInputs = [ dateutil ]; + checkInputs = [ nose chai simplejson ]; + propagatedBuildInputs = [ dateutil backports_functools_lru_cache ]; + + postPatch = '' + substituteInPlace setup.py --replace "==1.2.1" "" + ''; meta = with stdenv.lib; { description = "Python library for date manipulation"; diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1182c36fc0caeccdb18fedc090fd64b6264e17ce --- /dev/null +++ b/pkgs/development/python-modules/arxiv2bib/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, python, lib, fetchFromGitHub +, mock +}: + +buildPythonPackage rec { + pname = "arxiv2bib"; + version = "1.0.8"; + + # Missing tests on Pypi + src = fetchFromGitHub { + owner = "nathangrigg"; + repo = "arxiv2bib"; + rev = version; + sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg"; + }; + + # Required for tests only + checkInputs = [ mock ]; + + checkPhase = "${python.interpreter} -m unittest discover -s tests"; + + meta = with lib; { + description = "Get a BibTeX entry from an arXiv id number, using the arxiv.org API"; + homepage = http://nathangrigg.github.io/arxiv2bib/; + license = licenses.bsd3; + maintainers = [ maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 41a111c3167af8af71991bf60f7961669f61628c..62b176fb59c6810826dcc5f1943182a898afeb16 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,24 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, - pytest, requests, requests_oauthlib, six +{ lib, buildPythonPackage, pytest, requests, requests_oauthlib, six +, fetchFromGitHub, responses, stdenv }: buildPythonPackage rec { pname = "asana"; - version = "0.6.5"; + version = "0.7.0"; name = "${pname}-${version}"; - meta = { - description = "Python client library for Asana"; - homepage = https://github.com/asana/python-asana; - license = lib.licenses.mit; - }; - - src = fetchPypi { - inherit pname version; - sha256 = "eab8d24c2a4670b541b75da2f4bf5b995fe71559c1338da53ce9039f7b19c9a0"; + src = fetchFromGitHub { + owner = "asana"; + repo = "python-asana"; + rev = "v${version}"; + sha256 = "0786y3wxqxxhsb0kkpx4bfzif3dhvv3dmm6vnq58iyj94862kpxf"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest responses ]; propagatedBuildInputs = [ requests requests_oauthlib six ]; patchPhase = '' @@ -27,11 +23,13 @@ buildPythonPackage rec { sed -i "s/requests_oauthlib~=0.6.1/requests_oauthlib >=0.6.1/" setup.py ''; - # ERROR: file not found: tests - doCheck = false; - checkPhase = '' py.test tests ''; + meta = with stdenv.lib; { + description = "Python client library for Asana"; + homepage = https://github.com/asana/python-asana; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix deleted file mode 100644 index bdb12203de679c0f3e28b2ee17328332fc926421..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/asgi_ipc/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl, - asgiref, msgpack, posix_ipc -}: -buildPythonPackage rec { - version = "1.4.2"; - pname = "asgi_ipc"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; - sha256 = "2403f41184405791b05e7aee570bd6ccd47e2d91845d78fe17adcf58ef48c037"; - }; - - propagatedBuildInputs = [ asgiref msgpack posix_ipc ]; - - meta = with stdenv.lib; { - description = "Posix IPC-backed ASGI channel layer implementation"; - license = licenses.bsd3; - homepage = https://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 deleted file mode 100644 index d4c9388f1a7d3341e46cf32e13c6e76c3358dcc8..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/asgi_redis/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, - asgiref, asgi_ipc, msgpack, six, redis, cryptography -}: -buildPythonPackage rec { - version = "1.4.3"; - pname = "asgi_redis"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "10xk7k7mcd28nb3v93mc8xa7sa6p02jnbl8idk6scr6p75jaixzi"; - }; - - # 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 = https://github.com/django/asgi_redis/; - }; -} diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 1b5112fb3358464f1e9f73473a904bb6252b81fb..a556cd3c87f24c66f3657eee0dd79953490d7565 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,15 +1,23 @@ -{ stdenv, buildPythonPackage, fetchurl, six }: +{ stdenv, buildPythonPackage, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: buildPythonPackage rec { - version = "1.1.2"; + version = "2.2.0"; pname = "asgiref"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "8b46c3d6e2ad354d9da3cfb9873f9bd46fe1b768fbc11065275ba5430a46700c"; + # PyPI tarball doesn't include tests directory + src = fetchFromGitHub { + owner = "django"; + repo = pname; + rev = version; + sha256 = "0jsdkgwzswm1jbfm6d100yfvfzpic8v6ysydcnn798bbpwclj8ip"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ async-timeout ]; + + checkInputs = [ pytest pytest-asyncio ]; + + checkPhase = '' + py.test + ''; meta = with stdenv.lib; { description = "Reference ASGI adapters and channel layers"; diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index ce07c237624560496b36d88c50fe75833609dfa1..29dae1fd663aacad902bceab195fe26b93609247 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -1,14 +1,12 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, pyparsing }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing }: buildPythonPackage rec { pname = "asn1ate"; - date = "20160810"; - name = "${pname}-unstable-${date}"; + version= "0.6"; src = fetchFromGitHub { - sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w"; - rev = "c56104e8912400135509b584d84423ee05a5af6b"; + sha256 = "1p8hv4gsyqsdr0gafcq497n52pybiqmc22di8ai4nsj60fv0km45"; + rev = "v${version}"; owner = "kimgr"; repo = pname; }; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index eedaac50fac932defe9b9e15f54e81bfa8c008ab..5f512fcd6f8bbe766dae29a0c58025c0d32c48d4 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asn1crypto"; - version = "0.23.0"; + version = "0.24.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0874981329cfebb366d6584c3d16e913f2a0eb026c9463efcc4aaf42a9d94d70"; + sha256 = "9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49"; }; # No tests included diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 965bf37d5200b85b70a3ed628ba3989e99f12329..9fb92b860a1589757064d524442db83dcf2fd879 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -1,15 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "astor"; - version = "0.5"; + version = "0.6.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa"; + sha256 = "ff6d2e2962d834acb125cc4dcc80c54a8c17c253f4cc9d9c43b5102a560bb75d"; }; + # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 + checkInputs = [ pytest ]; + checkPhase = '' + py.test -k 'not check_expressions and not check_astunparse and not test_convert_stdlib and not test_codegen_as_submodule and not test_codegen_from_root' + ''; + meta = with stdenv.lib; { description = "Library for reading, writing and rewriting python AST"; homepage = https://github.com/berkerpeksag/astor; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..488c5ed66512da4fd7137451def09f4995ca7b40 --- /dev/null +++ b/pkgs/development/python-modules/astral/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytz, requests, pytest }: + +buildPythonPackage rec { + pname = "astral"; + version = "1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083"; + }; + + propagatedBuildInputs = [ pytz requests ]; + + checkInputs = [ pytest ]; + checkPhase = '' + # https://github.com/sffjunkie/astral/pull/13 + touch src/test/.api_key + py.test -m "not webtest" + ''; + + meta = with stdenv.lib; { + description = "Calculations for the position of the sun and the moon"; + homepage = https://github.com/sffjunkie/astral/; + license = licenses.asl20; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 86a0daa0456020e6956ee540f4331893db6185df..91b98d8b6ac062fce286f44c3607286f572def74 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "astroid"; - version = "1.5.3"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35"; + sha256 = "35cfae47aac19c7b407b7095410e895e836f2285ccf1220336afba744cc4c5f2"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 12f00be0cb7498f234887031d7efbc60ac534c62..d4c038a1afdcb85a6d05c80efc9879dd3be29eb0 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,24 +1,25 @@ { lib , fetchPypi , buildPythonPackage +, isPy3k , numpy , pytest }: buildPythonPackage rec { - pname = "astropy"; - version = "2.0.2"; + version = "3.0.1"; + + disabled = !isPy3k; # according to setup.py - 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 = "4544a422b1173d79b2d65ba74c627f04a5fd8530d97fb604752d657d754e103d"; + sha256 = "c35f4433c14ddfcaf2407cc815385f3d85396727e9a1e660cf66a7c4f5dd1067"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires - meta = { description = "Astronomy/Astrophysics library for Python"; homepage = http://www.astropy.org; diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4f46376b62def0b82b7b0767af34ee24500404be --- /dev/null +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, pytest-asyncio }: + +buildPythonPackage rec { + pname = "async_generator"; + version = "1.9"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "b7d5465c6174fe86dba498ececb175f93a6097ffb7cc91946405e1f05b848371"; + }; + + checkInputs = [ pytest pytest-asyncio ]; + + checkPhase = '' + pytest -W error -ra -v --pyargs async_generator + ''; + + meta = with lib; { + description = "Async generators and context managers for Python 3.5+"; + homepage = https://github.com/python-trio/async_generator; + license = with licenses; [ mit asl20 ]; + }; +} diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index 650517d44d92a34acf4e3f18550a947316296282..5f9318aa5c21395c2eb4e2fe5098875b712f200d 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -1,22 +1,19 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , pytestrunner , pythonOlder }: -let +buildPythonPackage rec { pname = "async-timeout"; - version = "2.0.0"; -in buildPythonPackage rec { - name = "${pname}-${version}"; + version = "2.0.1"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566"; + src = fetchPypi { + inherit pname version; + sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0"; }; - buildInputs = [ pytestrunner ]; # Circular dependency on aiohttp doCheck = false; @@ -27,4 +24,4 @@ in buildPythonPackage rec { homepage = https://github.com/aio-libs/async_timeout/; license = lib.licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c3ed7bed7426f35b96e95f4607a90978704a6d81 --- /dev/null +++ b/pkgs/development/python-modules/asyncio/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy33, pythonOlder }: + +buildPythonPackage rec { + pname = "asyncio"; + version = "3.4.3"; + disabled = pythonOlder "3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3"; + }; + + meta = with stdenv.lib; { + description = "Reference implementation of PEP 3156"; + homepage = http://www.python.org/dev/peps/pep-3156; + license = licenses.free; + }; +} diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a0f408764a0d8fad61a4ed10a0f0f8f75daefa0f --- /dev/null +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, pythonOlder, python }: + +buildPythonPackage rec { + pname = "asynctest"; + version = "0.12.0"; + + disabled = pythonOlder "3.4"; + + # PyPI tarball doesn't ship test/__init__.py + src = fetchFromGitHub { + owner = "Martiusweb"; + repo = pname; + rev = "v${version}"; + sha256 = "0rcb3kz2m0iwvgxpx2avfz9cqsd9xbaq93zykr2fki3ikmnp3vyg"; + }; + + postPatch = '' + # Skip failing test, probably caused by file system access + substituteInPlace test/test_selector.py \ + --replace "test_events_watched_outside_test_are_ignored" "xtest_events_watched_outside_test_are_ignored" + ''; + + checkPhase = '' + ${python.interpreter} -m unittest test + ''; + + meta = with lib; { + description = "Enhance the standard unittest package with features for testing asyncio libraries"; + homepage = https://github.com/Martiusweb/asynctest; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8f3aae7b19dd6d3429c3d04c0c4b5a3a209dfd67 --- /dev/null +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, cffi }: + +buildPythonPackage rec { + pname = "atomiclong"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gjbc9lvpkgg8vj7dspif1gz9aq4flkhxia16qj6yvb7rp27h4yb"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ cffi ]; + + meta = with stdenv.lib; { + description = "Long data type with atomic operations using CFFI"; + homepage = https://github.com/dreid/atomiclong; + license = licenses.mit; + maintainers = with maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b93ff7825fcd7c1d4d2f79c7759e7b1595046140 --- /dev/null +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "atomicwrites"; + version = "1.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585"; + }; + + meta = with stdenv.lib; { + description = "Atomic file writes on POSIX"; + homepage = https://pypi.python.org/pypi/atomicwrites; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c6a9151d911138082f0a6dba18f611dae909f061 --- /dev/null +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }: + +buildPythonPackage rec { + pname = "attrdict"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lrailzxy40dx6sn1hbpnpqfbg7ar75dfj41kx0480wyh39vdbl6"; + }; + + propagatedBuildInputs = [ coverage nose six ]; + + meta = with stdenv.lib; { + description = "A dict with attribute-style access"; + homepage = https://github.com/bcj/AttrDict; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index e58bf3846dc92ee86291350788ee3f0d3033f0f5..8ef2b5989f450591d712853b73f8c761f1dfa42b 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -2,17 +2,16 @@ , pympler, coverage, six, clang }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "attrs"; - version = "17.2.0"; + version = "17.4.0"; src = fetchPypi { inherit pname version; - sha256 = "04gx08ikpk26wnq22f7l42gapcvk8iz1512r927k6sadz6cinkax"; + sha256 = "1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9"; }; # macOS needs clang for testing - buildInputs = [ + checkInputs = [ pytest hypothesis zope_interface pympler coverage six ] ++ lib.optionals (stdenv.isDarwin) [ clang ]; @@ -20,6 +19,9 @@ buildPythonPackage rec { py.test ''; + # To prevent infinite recursion with pytest + doCheck = false; + meta = with lib; { description = "Python attributes without boilerplate"; homepage = https://github.com/hynek/attrs; diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index 8934e1b81a81bf90cf4c10c7a13b9bb25ac503e0..def46c7fccc11a9308e24376f7d938482719d54e 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }: buildPythonPackage rec { - name = "augeas-${version}"; + pname = "augeas"; version = "1.0.2"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "hercules-team"; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 5a6121aaf7f43693078624b835ff8eef43e926dc..a48ab10474ed438eff54818786295469b77b0437 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "autobahn"; - version = "17.9.3"; + version = "18.3.1"; src = fetchurl { url = "mirror://pypi/a/${pname}/${name}.tar.gz"; - sha256 = "206a3a579a580ca3ce2532ac12ec52d447135c9ace7c4bf6065b832a7cff25ba"; + sha256 = "fc1d38227bb44a453b54cffa48de8b2e6ce48ddc5e97fb5950b0faa27576f385"; }; # Upstream claim python2 support, but tests require pytest-asyncio which @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "WebSocket and WAMP in Python for Twisted and asyncio."; - homepage = "http://crossbar.io/autobahn"; + homepage = "https://crossbar.io/autobahn"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 06ad939cfa8b487a2328977d96a049a72da6380b..90d57b6c89d77bf4ca05e128fa6f97922cce7956 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.3.3"; + version = "1.3.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0c1gl648g2xnz3j0rsp71ld4i32zlglmqjvqf4q8r08jp3zpny7z"; + sha256 = "192bvhzi4d0claqxgzymvv7k3qnj627742bc8sgxpzjj42pd9112"; }; propagatedBuildInputs = [ pycodestyle ]; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..045790b9bc2d93d823c9e05af01bc6de1e2dc5bc --- /dev/null +++ b/pkgs/development/python-modules/avro/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "avro"; + version = "1.8.2"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "8f9ee40830b70b5fb52a419711c9c4ad0336443a6fba7335060805f961b04b59"; + }; + + meta = with stdenv.lib; { + description = "A serialization and RPC framework"; + homepage = https://pypi.python.org/pypi/avro/; + }; +} diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3a5b34ebb85d5513fa87163b7359148f2765021d --- /dev/null +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "avro3k"; + version = "1.7.7-SNAPSHOT"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky"; + }; + + doCheck = false; # No such file or directory: './run_tests.py + + meta = with stdenv.lib; { + description = "A serialization and RPC framework"; + homepage = https://pypi.python.org/pypi/avro3k/; + }; +} diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix index 105c70c28b34dc040bb83fb817da26686a8183ab..945c941dec4ea71f0fd121cfa9779b8121171aae 100644 --- a/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/pkgs/development/python-modules/awesome-slugify/default.nix @@ -3,13 +3,17 @@ buildPythonPackage rec { pname = "awesome-slugify"; version = "1.6.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "0wgxrhr8s5vk2xmcz9s1z1aml4ppawmhkbggl9rp94c747xc7pmv"; }; + prePatch = '' + substituteInPlace setup.py \ + --replace 'Unidecode>=0.04.14,<0.05' 'Unidecode>=0.04.14' + ''; + patches = [ ./slugify_filename_test.patch # fixes broken test by new unidecode ]; diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..972b8f847bf27562b55a830a52f70c12ef0f13ac --- /dev/null +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonpickle +, wrapt +, requests +, future +}: + +buildPythonPackage rec { + pname = "aws-xray-sdk"; + version = "0.97"; + + src = fetchPypi { + inherit pname version; + sha256 = "43eca57bb48b718ea58968608cfd22f4b9c62c2d904bb08aa2f8afe56eeb9de4"; + }; + + propagatedBuildInputs = [ + jsonpickle wrapt requests future + ]; + + meta = { + description = "AWS X-Ray SDK for the Python programming language"; + license = lib.licenses.asl20; + homepage = https://github.com/aws/aws-xray-sdk-python; + }; + + doCheck = false; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..003f996d29a251202bd8ee5c5a9d8c11bcb5d43d --- /dev/null +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "babelfish"; + version = "0.5.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; + }; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/babelfish; + description = "A module to work with countries and languages"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/backcall/default.nix b/pkgs/development/python-modules/backcall/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2eb44cb36245b531ac7adb4778a7e44f66c8f6bb --- /dev/null +++ b/pkgs/development/python-modules/backcall/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "backcall"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Specifications for callback functions passed in to an API"; + homepage = https://github.com/takluyver/backcall; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/backports_abc/default.nix b/pkgs/development/python-modules/backports_abc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ab34d376de08124191a24cad8b068bbdd5ce5865 --- /dev/null +++ b/pkgs/development/python-modules/backports_abc/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "backports_abc"; + version = "0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = { + homepage = https://github.com/cython/backports_abc; + license = lib.licenses.psfl; + description = "A backport of recent additions to the 'collections.abc' module"; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix index 5f2e90e50b8da85f826bd73602931ae7229e6d59..479792a7ca59362590772dab93756bf8028e3872 100644 --- a/pkgs/development/python-modules/backports_csv/default.nix +++ b/pkgs/development/python-modules/backports_csv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1imzbrradkfn8s2m1qcimyn74dn1mz2p3j381jljn166rf2i6hlc"; }; - propogatedBuildInputs = [ future ]; + propagatedBuildInputs = [ future ]; meta = with stdenv.lib; { description = "Backport of Python 3 csv module"; diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bcaa844720bd37e695774be298deb64da412e1e5 --- /dev/null +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pythonOlder +}: + +if !(pythonOlder "3.3") then null else buildPythonPackage rec { + pname = "backports.functools_lru_cache"; + version = "1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a"; + }; + + buildInputs = [ setuptools_scm ]; + doCheck = false; # No proper test + + meta = { + description = "Backport of functools.lru_cache"; + homepage = https://github.com/jaraco/backports.functools_lru_cache; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a0643e82ae0321ba798c83ab273ff0594dc3a95d --- /dev/null +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, lzma +, python +, pythonOlder +}: + +if !(pythonOlder "3.3") then null else buildPythonPackage rec { + pname = "backports.lzma"; + version = "0.0.9"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "9ba5d94214a79900ee297a594b8e154cd8e4a54d26eb06243c0e2f3ad5286539"; + }; + + buildInputs = [ lzma ]; + + # Needs the compiled module in $out + checkPhase = '' + PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -m unittest discover -s test + ''; + + meta = { + description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; + homepage = https://github.com/peterjc/backports.lzma; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7f4faa8a8b471c702b91f1ec42c91d044523a3d4 --- /dev/null +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pythonOlder +}: + +if !(pythonOlder "3.3") then null else buildPythonPackage rec { + pname = "backports.shutil_get_terminal_size"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80"; + }; + + checkInputs = [ + pytest + ]; + + meta = { + description = "A backport of the get_terminal_size function from Python 3.3’s shutil."; + homepage = https://github.com/chrippa/backports.shutil_get_terminal_size; + license = with lib.licenses; [ mit ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index 6a8e33dc2ee6c427d88ad2f9c7eb8f506541e51f..2e85a1017b6e6dc8fbf80c981dac3574266a4a08 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "bap"; - version = "1.1.0"; + version = "1.3.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-python"; - rev = "v${version}"; - sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3"; + rev = "${version}"; + sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp"; }; propagatedBuildInputs = [bap requests]; diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..99c3346a4fbe97fa074c022c67685b4aa537910a --- /dev/null +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, ipykernel +, isPy27 +, python +, pexpect +}: + +buildPythonPackage rec { + pname = "bash_kernel"; + version = "0.7.1"; + name = "${pname}-${version}"; + format = "flit"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1s2kc7m52kq28b4j1q3456g5ani6nmq4n0rpbqi3yvh7ks0rby19"; + }; + + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/takluyver/bash_kernel/pull/69.diff"; + sha256 = "1qd7qjjmcph4dk6j0bl31h2fdmfiyyazvrc9xqqj8y21ki2sl33j"; + }) + ]; + + propagatedBuildInputs = [ ipykernel pexpect ]; + + # no tests + doCheck = false; + + preBuild = '' + export HOME=$TMPDIR + ''; + + postInstall = '' + ${python.interpreter} -m bash_kernel.install --prefix $out + ''; + + meta = { + description = "Bash Kernel for Jupyter"; + homepage = "https://github.com/takluyver/bash_kernel"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3e21fae1de66a101d76eafe664d1c5610b5f8957 --- /dev/null +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "batinfo"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "497e29efc9353ec52e71d43bd040bdfb6d685137ddc2b9143cded4583af572f5"; + }; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/nicolargo/batinfo; + description = "A simple Python lib to retrieve battery information"; + license = licenses.lgpl3; + platforms = platforms.all; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index a1b49da34a4a815df364162192ec4dda1e59ac18..dcc1a45b1cf0484a02ef639828f5c6d7bc600e69 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.12"; + version = "0.5.14"; name = "${pname}-${version}"; # Python 2 not supported and not some old Python 3 because MPL doesn't support @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9609a3e85f88434a47c8263f40567cd24363d0e10d236354630b670fca313c00"; + sha256 = "129bac6a1c494eedabdd04abf14aac35db176d25db44e27f755c758a18adf03c"; }; checkInputs = [ pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/pkgs/development/python-modules/bcdoc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b4db16476d1279121a23f084fedc375e70809ec7 --- /dev/null +++ b/pkgs/development/python-modules/bcdoc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, docutils, six }: + +buildPythonPackage rec { + pname = "bcdoc"; + version = "0.16.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "f568c182e06883becf7196f227052435cffd45604700c82362ca77d3427b6202"; + }; + + buildInputs = [ docutils six ]; + + # Tests fail due to nix file timestamp normalization. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/botocore/bcdoc; + license = licenses.asl20; + description = "ReST document generation tools for botocore"; + }; +} diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2991ae9be82f404c86d563e2536e73fb36e55465 --- /dev/null +++ b/pkgs/development/python-modules/beancount/default.nix @@ -0,0 +1,48 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, beautifulsoup4, bottle, chardet, dateutil +, google_api_python_client, lxml, ply, python_magic +, nose }: + +buildPythonPackage rec { + version = "2.0.0"; + pname = "beancount"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0wxwf02d3raglwqsxdsgf89fniakv1m19q825w76k5z004g18y42"; + }; + + checkInputs = [ nose ]; + + # Automatic tests cannot be run because it needs to import some local modules for tests. + doCheck = false; + checkPhase = '' + nosetests + ''; + + propagatedBuildInputs = [ + beautifulsoup4 + bottle + chardet + dateutil + google_api_python_client + lxml + ply + python_magic + ]; + + meta = { + homepage = http://furius.ca/beancount/; + description = "Double-entry bookkeeping computer language"; + longDescription = '' + A double-entry bookkeeping computer language that lets you define + financial transaction records in a text file, read them in memory, + generate a variety of reports from them, and provides a web interface. + ''; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ ]; + }; +} + diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 80acc58f65441ac8558aaef14e5beab8ee6bb4dd..722117ba6e835cc017d10237bd6cbb9c0cd30cf7 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,23 +1,22 @@ { stdenv, fetchPypi -, buildPythonApplication, python, pythonAtLeast -, mock, nose, pyhamcrest +, buildPythonApplication, isPy27, python, pythonOlder +, mock, nose, pathpy, pyhamcrest, pytest , glibcLocales, parse, parse-type, six +, traceback2 }: buildPythonApplication rec { pname = "behave"; - version = "1.2.5"; + version = "1.2.6"; name = "${pname}-${version}"; - disabled = pythonAtLeast "3.6"; - src = fetchPypi { inherit pname version; - sha256 = "81b731ac5187e31e4aad2594944fa914943683a9818320846d037c5ebd6d5d0b"; + sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr"; }; - checkInputs = [ mock nose pyhamcrest ]; + checkInputs = [ mock nose pathpy pyhamcrest pytest ]; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ parse parse-type six ]; + propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2; postPatch = '' patchShebangs bin @@ -29,7 +28,7 @@ buildPythonApplication rec { export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" - nosetests -x + pytest test tests ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/ diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8051ed0beff5e6654eb205a96cba41dfeb4e4eeb --- /dev/null +++ b/pkgs/development/python-modules/betamax/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "betamax"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hki1c2vs7adq7zr56wi6i5bhrkia4s2ywpv2c98ibnczz709w2v"; + }; + + propagatedBuildInputs = [ requests ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://betamax.readthedocs.org/en/latest/; + description = "A VCR imitation for requests"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 0f624a145e0185bdb625a8b21627978afe9ce5bb..05ee0ea9553bafb8630a9ac6db3678c5a3b2cb8c 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -1,25 +1,33 @@ { lib -, buildPythonPackage -, fetchPypi +, buildPythonPackage, fetchFromGitHub +, future, pyparsing +, glibcLocales, nose }: buildPythonPackage rec { pname = "bibtexparser"; - version = "0.6.2"; - name = "${pname}-${version}"; + version = "1.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "5888219ac5db1c63ae0ad4db52ec7ad87fe7a32bd60e62ee87bceedb8ebf73b8"; + # PyPI tarball does not ship tests + src = fetchFromGitHub { + owner = "sciunto-org"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "0lmlarkfbq2hp1wa04a62245jr2mqizqsdlgilj5aq6vy92gr6ai"; }; - # No tests in archive - doCheck = false; + propagatedBuildInputs = [ future pyparsing ]; + + checkInputs = [ nose glibcLocales ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests + ''; 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 ]; + maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6b21a1492bd1b034f676f83a303c30881234f3f7 --- /dev/null +++ b/pkgs/development/python-modules/billiard/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case }: + +buildPythonPackage rec { + pname = "billiard"; + version = "3.5.0.3"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1d7b22bdc47aa52841120fcd22a74ae4fc8c13e9d3935643098184f5788c3ce6"; + }; + + buildInputs = [ pytest case ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/billiard; + description = "Python multiprocessing fork with improvements and bugfixes"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2f0b01a5c23d06b570c569a99e8bebab29674566 --- /dev/null +++ b/pkgs/development/python-modules/binaryornot/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, chardet, hypothesis }: + +buildPythonPackage rec { + pname = "binaryornot"; + version = "0.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"; + }; + + prePatch = '' + # See https://github.com/audreyr/binaryornot/issues/40 + substituteInPlace tests/test_check.py \ + --replace "average_size=512" "average_size=128" + ''; + + propagatedBuildInputs = [ chardet ]; + + checkInputs = [ hypothesis ]; + + meta = with lib; { + homepage = https://github.com/audreyr/binaryornot; + description = "Ultra-lightweight pure Python package to check if a file is binary or text"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8f99c0d75d34c18183e09962f1571651c2e31a25 --- /dev/null +++ b/pkgs/development/python-modules/biopython/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + pname = "biopython"; + version = "1.71"; + + src = fetchPypi { + inherit pname version; + sha256 = "4f1770a29a5b18fcaca759bbc888083cdde2b301f073439ff640570d4a93e033"; + }; + + propagatedBuildInputs = [ numpy ]; + # Checks try to write to $HOME, which does not work with nix + doCheck = false; + meta = { + description = "Python library for bioinformatics"; + longDescription = '' + Biopython is a set of freely available tools for biological computation + written in Python by an international team of developers. It is a + distributed collaborative effort to develop Python libraries and + applications which address the needs of current and future work in + bioinformatics. + ''; + homepage = http://biopython.org/wiki/Documentation; + maintainers = with lib.maintainers; [ luispedro ]; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0d1ac109179b3527560850d1bffcbb50ce00cef6 --- /dev/null +++ b/pkgs/development/python-modules/bitbucket-api/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, requests_oauthlib, nose, sh }: + +buildPythonPackage rec { + pname = "bitbucket-api"; + version = "0.5.0"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "b541d9d7f234074a74214505aff1846eb21e5dd6d3915139e817d4675d34f4e3"; + }; + + propagatedBuildInputs = [ requests_oauthlib nose sh ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/Sheeprider/BitBucket-api; + description = "Python library to interact with BitBucket REST API"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b5d115f4d0bb82767866fa4dda86b1c1518b52f9 --- /dev/null +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }: + +buildPythonPackage rec { + pname = "bitbucket-cli"; + version = "0.5.1"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1xmn73x6jirnwfwcdy380ncmkai9f9dhmld6zin01ypbqwgf50fq"; + }; + + propagatedBuildInputs = [ requests ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Bitbucket command line interface"; + homepage = https://bitbucket.org/zhemao/bitbucket-cli; + maintainers = with maintainers; [ refnil ]; + }; +} diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b012fd24aa01228b116ff4b5401a0dcdc9469e85 --- /dev/null +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, openssl }: + +let ext = if stdenv.isDarwin then "dylib" else "so"; +in buildPythonPackage rec { + pname = "bitcoinlib"; + version = "0.9.0"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "petertodd"; + rev = "7a8a47ec6b722339de1d0a8144e55b400216f90f"; + repo = "python-bitcoinlib"; + sha256 = "1s1jm2nid7ab7yiwlp1n2v3was9i4q76xmm07wvzpd2zvn5zb91z"; + }; + + postPatch = '' + substituteInPlace bitcoin/core/key.py --replace \ + "ctypes.util.find_library('ssl') or 'libeay32'" \ + "'${openssl.out}/lib/libssl.${ext}'" + ''; + + meta = { + homepage = src.meta.homepage; + description = "Easy interface to the Bitcoin data structures and protocol"; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ jb55 ]; + }; +} diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bb2e60468861c6d3ac759ae70f5e007f37d5d6d0 --- /dev/null +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: + +buildPythonPackage rec { + pname = "bitmath"; + version = "1.3.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k8d1wmxqjc8cqzaixpxf45k6dl1kqhblr0g4wyjl0qa18q8wasd"; + }; + + checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ]; + + meta = with stdenv.lib; { + description = "Module for representing and manipulating file sizes with different prefix"; + homepage = https://github.com/tbielawa/bitmath; + license = licenses.mit; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f48310ceebc650a82a5dfa7eaaf7cbd8a29600c2 --- /dev/null +++ b/pkgs/development/python-modules/black/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, attrs, click }: + +buildPythonPackage rec { + pname = "black"; + version = "18.4a0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "04dffr4wmzs4vf2xj0cxp03hv04x0kk06qyzx6jjrp1mq0z3n2rr"; + }; + + propagatedBuildInputs = [ attrs click ]; + + meta = with stdenv.lib; { + description = "The uncompromising Python code formatter"; + homepage = https://github.com/ambv/black; + license = licenses.mit; + maintainers = with maintainers; [ sveitser ]; + }; + +} diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix index 017b85cacc7c05284a79e948919b66059c418e0c..b3c56a618e8e0626b783fdb4bcb6a80a4b9686e1 100644 --- a/pkgs/development/python-modules/blaze/default.nix +++ b/pkgs/development/python-modules/blaze/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchurl +, fetchFromGitHub , pytest , contextlib2 , cytoolz @@ -25,12 +25,13 @@ buildPythonPackage rec { pname = "blaze"; - version = "0.11.0"; - name = "${pname}-${version}"; + version = "0.11.3"; - src = fetchurl { - url = "https://github.com/blaze/blaze/archive/${version}.tar.gz"; - sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0w916k125058p40cf7i090f75pgv3cqdb8vwjzqhb9r482fa6717"; }; checkInputs = [ pytest ]; @@ -56,13 +57,8 @@ buildPythonPackage rec { toolz ]; - # Failing test - # ERROR collecting blaze/tests/test_interactive.py - # E networkx.exception.NetworkXNoPath: node not - # reachable from - doCheck = false; - checkPhase = '' + rm pytest.ini # Not interested in coverage py.test blaze/tests ''; diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..786564b92e0163da0b5f666b819cc9ba55db3a5b --- /dev/null +++ b/pkgs/development/python-modules/bleach/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pytestrunner +, six +, html5lib +}: + +buildPythonPackage rec { + pname = "bleach"; + version = "2.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "eb7386f632349d10d9ce9d4a838b134d4731571851149f9cc2c05a9a837a9a44"; + }; + + checkInputs = [ pytest pytestrunner ]; + propagatedBuildInputs = [ six html5lib ]; + + postPatch = '' + substituteInPlace setup.py --replace ",<3dev" "" + ''; + + meta = { + description = "An easy, HTML5, whitelisting HTML sanitizer"; + longDescription = '' + Bleach is an HTML sanitizing library that escapes or strips markup and + attributes based on a white list. Bleach can also linkify text safely, + applying filters that Django's urlize filter cannot, and optionally + setting rel attributes, even on links already in the text. + + Bleach is intended for sanitizing text from untrusted sources. If you + find yourself jumping through hoops to allow your site administrators + to do lots of things, you're probably outside the use cases. Either + trust those users, or don't. + ''; + homepage = https://github.com/mozilla/bleach; + downloadPage = https://github.com/mozilla/bleach/releases; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ prikhi ]; + }; +} diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 2d1ac11f3b5417c9ef45e6aac08164b42b8a12af..d3ea1f151d34f8c7fcd3894d2898f66e1ce4b2a8 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -1,4 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, wcwidth }: +{ stdenv, buildPythonPackage, fetchPypi, six, wcwidth, pytest, mock +, glibcLocales }: buildPythonPackage rec { name = "${pname}-${version}"; @@ -10,6 +11,12 @@ buildPythonPackage rec { sha256 = "0fv9f0074kxy1849h0kwwxw12sifpq3bv63pcz900zzjsigi4hi3"; }; + checkInputs = [ pytest mock glibcLocales ]; + + checkPhase = '' + LANG=en_US.utf-8 py.test blessed/tests + ''; + propagatedBuildInputs = [ wcwidth six ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5dd9d10961bb04569c1c29817a11e61e410c7408 --- /dev/null +++ b/pkgs/development/python-modules/blinker/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "blinker"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7"; + }; + + meta = with stdenv.lib; { + homepage = http://pythonhosted.org/blinker/; + description = "Fast, simple object-to-object and broadcast signaling"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..96f7bfebdeb83bfb40674fbaba33300f083c49d6 --- /dev/null +++ b/pkgs/development/python-modules/blinkstick/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pyusb }: + +buildPythonPackage rec { + pname = "BlinkStick"; + version = "1.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408"; + }; + + patches = [ + (fetchpatch { + url = https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch; + sha256 = "1mcmxlnkbfxwp84qz32l5rlc7r9anh9yhnqaj1y8rny5s13jb01f"; + }) + (fetchpatch { + url = https://github.com/arvydas/blinkstick-python/pull/54.patch; + sha256 = "1gjq6xbai794bbdyrv82i96l1a7qkwvlhzd6sa937dy5ivv6s6hl"; + }) + ]; + + propagatedBuildInputs = [ pyusb ]; + + meta = with lib; { + description = "Python package to control BlinkStick USB devices"; + homepage = https://pypi.python.org/pypi/BlinkStick/; + license = licenses.bsd3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index fed6f6e9219e769f951e76e31abd79cb642e4dd5..fde330d706f7bc753edb9112337794eec821bafc 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -3,8 +3,9 @@ }: buildPythonPackage rec { - name = "blockdiag-${version}"; + pname = "blockdiag"; version = "1.5.3"; + name = pname + "-" + version; src = fetchurl { url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 61bfe7121cb930cd7e388e7719d78fd84ff67daa..1d2ccc2d5106137a9a3dae6699673d7613b8139c 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.10"; + version = "0.12.15"; src = fetchPypi { inherit pname version; - sha256 = "6465fae82e94223f16584645b38d34a73d95712870f29c0244649c2cbf2c8393"; + sha256 = "2891b883b30107dc610a7e963a21222f1fd096844d157c09db115179cfab6513"; }; disabled = isPyPy; @@ -78,5 +78,6 @@ buildPythonPackage rec { description = "Statistical and novel interactive HTML plots for Python"; homepage = "http://github.com/bokeh/bokeh"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ orivej ]; }; } diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 0cb817844c774c1536ea742463e817fbe2134b30..4ff4c687e5c0635a7641aec44d12193bcb08e9f4 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,12 +9,12 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "36.4.0"; + version = "39.0.1"; format = "wheel"; - sha256 = "4d54c0bfee283e78609169213f9c075827d5837086f58b588b417b093c23464b"; + sha256 = "8010754433e3211b9cdbbf784b50f30e80bf40fc6b05eb5f865fab83300599b8"; }; - # TODO: Shouldn't be necessary anymore for pip > 9.0.1! + # TODO: Shouldn't be necessary anymore for pip >= 10! # https://github.com/NixOS/nixpkgs/issues/26392 # https://github.com/pypa/setuptools/issues/885 pkg_resources = fetchurl { @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "pip"; - version = "9.0.1"; + version = "9.0.3"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "690b762c0a8460c303c089d5d0be034fb15a5ea2b75bdf565f40421f542fefb0"; + sha256 = "c3ede34530e0e0b2381e7363aded78e0c33291654937e7373032fda04e8803e5"; }; unpackPhase = '' @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { unzip -d $out/${python.sitePackages} $src unzip -d $out/${python.sitePackages} ${setuptools_source} unzip -d $out/${python.sitePackages} ${wheel_source} - # TODO: Shouldn't be necessary anymore for pip > 9.0.1! + # TODO: Shouldn't be necessary anymore for pip >= 10! cp ${pkg_resources} $out/${python.sitePackages}/pip/_vendor/pkg_resources/__init__.py ''; @@ -46,7 +46,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin ''; - buildInputs = [ python makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ python ]; installPhase = '' diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ccada6dd1404821a139978732c3607b54cde1ec1 --- /dev/null +++ b/pkgs/development/python-modules/boto3/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, botocore +, jmespath +, s3transfer +, futures +, docutils +, nose +, mock +, isPy3k +}: + +buildPythonPackage rec { + pname = "boto3"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "boto"; + repo = "boto3"; + rev = version; + sha256 = "14d60wc5kff2gjkrm0yfz0179s0qg3f1qqldv8hnf37ny6yvfwn3"; + }; + + propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; + checkInputs = [ docutils nose mock ]; + + checkPhase = '' + runHook preCheck + # This method is not in mock. It might have appeared in some versions. + sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ + tests/unit/resources/test_factory.py + nosetests -d tests/unit --verbose + runHook postCheck + ''; + + # Network access + doCheck = false; + + meta = { + homepage = https://github.com/boto/boto3; + license = lib.licenses.asl20; + description = "AWS SDK for Python"; + longDescription = '' + Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for + Python, which allows Python developers to write software that makes use of + services like Amazon S3 and Amazon EC2. + ''; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index a7fe8620a8a84b842d1dc3161f81351f03a9506d..5276fdb9329dfdf976ef065869bc1d4ec8d3bd8f 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.7.43"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "0wyyj7sk7dh9v7i1g5jc5maqdadvbs4khi7srz0095cywkjqpysc"; + sha256 = "d5b892ab86cd3e8d6cb570dd5275bf1c600cbbf9f07a40a22bcdd9023c0e844f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..50df0d5842cfe30c15ee7f899dd7cf1953192438 --- /dev/null +++ b/pkgs/development/python-modules/bottle/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools }: + +buildPythonPackage rec { + pname = "bottle"; + version = "0.12.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355"; + }; + + propagatedBuildInputs = [ setuptools ]; + + meta = with stdenv.lib; { + homepage = http://bottlepy.org; + description = "A fast and simple micro-framework for small web-applications"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 4eb5bcb6edc95e8f4be97c8915c26983b141189b..791b05e81cad26f573bad4148c05191fdc65658c 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -8,8 +8,9 @@ buildPythonPackage rec { pname = "Bottleneck"; - name = "Bottleneck-${version}"; version = "1.2.1"; + name = pname + "-" + version; + src = fetchPypi { inherit pname version; sha256 = "6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36"; @@ -23,4 +24,4 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" ''; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 515494b5f9312c30b39cb82599283dc305b8a058..ad80e5647a48de3122795685581450f054fba9ab 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -1,14 +1,12 @@ -{ stdenv, buildPythonPackage, fetchurl, pygments, greenlet, curtsies, urwid, requests, mock }: +{ stdenv, buildPythonPackage, fetchPypi, pygments, greenlet, curtsies, urwid, requests, mock }: buildPythonPackage rec { pname = "bpython"; - version = "0.17"; - name = "${pname}-${version}"; + version = "0.17.1"; - # 0.17 is still missing on PyPI, https://github.com/bpython/bpython/issues/706 - src = fetchurl { - url = "https://bpython-interpreter.org/releases/${pname}-${version}.tar.gz"; - sha256 = "13fyyx06645ikvmj9zmkixr12kzk1c3a3f9s9i2rvaczjycn82lz"; + src = fetchPypi { + inherit pname version; + sha256 = "8907c510bca3c4d9bc0a157279bdc5e3b739cc68c0f247167279b6fe4becb02f"; }; propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/pkgs/development/python-modules/brotlipy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1dd2a070480fc077b0e00c14defd23eb92b7163b --- /dev/null +++ b/pkgs/development/python-modules/brotlipy/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cffi +, enum34 +, construct +, pytest +, hypothesis +}: + +buildPythonPackage rec { + pname = "brotlipy"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df"; + }; + + propagatedBuildInputs = [ cffi enum34 construct ]; + + checkInputs = [ pytest hypothesis ]; + + checkPhase = '' + py.test + ''; + + # Missing test files + doCheck = false; + + meta = { + description = "Python bindings for the reference Brotli encoder/decoder"; + homepage = "https://github.com/python-hyper/brotlipy/"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ada8397f97541406a11e0a03b3e9f4163409fe4f --- /dev/null +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, mock, unittest2, nose +, twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six +, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future15 }: + +buildPythonPackage rec { + pname = "bugwarrior"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kxknjbw5kchd88i577vlzibg8j60r7zzdhbnragj9wg5s3w60xb"; + }; + + buildInputs = [ mock unittest2 nose /* jira megaplan */ ]; + propagatedBuildInputs = [ + twiggy requests offtrac bugzilla taskw dateutil pytz keyring six + jinja2 pycurl dogpile_cache lockfile click pyxdg future15 + ]; + + # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ralphbean/bugwarrior; + description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pierron ]; + }; +} diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b57fdd5625bee3df2a8fa96932acec2e208aa2e2 --- /dev/null +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pep8, coverage, logilab_common, requests }: + +buildPythonPackage rec { + pname = "bugzilla"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ikx21nm7cch4lz9agv5h1hx6zvg2alkpfdrl01khqgilhsicdhi"; + }; + + patches = [ ./checkPhase-fix-cookie-compare.patch ]; + + buildInputs = [ pep8 coverage logilab_common ]; + propagatedBuildInputs = [ requests ]; + + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + meta = with stdenv.lib; { + homepage = https://fedorahosted.org/python-bugzilla/; + description = "Bugzilla XMLRPC access module"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ pierron ]; + }; +} diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 70c6f3baaf1ac665ff23885f3bfde9fde0bc3fee..cb54f588f9d2507949940aaa231f30fd55b770f7 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.9.5"; + version = "2.11.2"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "dce840ea379e2ff10bae27465778708704e0a4287cde92eb6c7961f5b0277cfa"; + sha256 = "e304f3604a4235e896e94ea79230cfb9c0bc54569f04d5c6c4b49cc9dc4fdbf6"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..080fd2f2a7907d1e9c9ceda76480c38c88f720ac --- /dev/null +++ b/pkgs/development/python-modules/buildout/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "zc.buildout"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xafi6ndlm964qj7pnmzmvhp719c8pgs7r7wkr508v3cq2jjw4m6"; + }; + + meta = with stdenv.lib; { + homepage = http://www.buildout.org; + description = "A software build and configuration system"; + license = licenses.zpl21; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..51d3d9e6833e6dab85274da489d99a2c4824f6ea --- /dev/null +++ b/pkgs/development/python-modules/bumps/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, six}: + +buildPythonPackage rec { + pname = "bumps"; + version = "0.7.6"; + + propagatedBuildInputs = [six]; + + # Bumps does not provide its own tests.py, so the test + # always fails + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "1ahzw8ls9wsz2ks668s15zskyykib52fhi07mg50hp7lw9avqb5k"; + }; + + meta = with stdenv.lib; { + homepage = http://www.reflectometry.org/danse/software.html; + description = "Data fitting with bayesian uncertainty analysis"; + maintainers = with maintainers; [ rprospero ]; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..42918f02339841a1b6d1684d2e09bbdf08a3d2d7 --- /dev/null +++ b/pkgs/development/python-modules/bunch/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "bunch"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/buttersink/default.nix b/pkgs/development/python-modules/buttersink/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..29f5ff5dccd22cac3806a2a6f33ff063790cf17a --- /dev/null +++ b/pkgs/development/python-modules/buttersink/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, boto, crcmod, psutil }: + +buildPythonPackage rec { + pname = "buttersink"; + version = "0.6.8"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "04gc63kfcqkw4qba5rijqk01xiphf04yk7hky9180ii64v2ip0j3"; + }; + + propagatedBuildInputs = [ boto crcmod psutil ]; + + meta = with stdenv.lib; { + description = "Synchronise btrfs snapshots"; + longDescription = '' + ButterSink is like rsync, but for btrfs subvolumes instead of files, + which makes it much more efficient for things like archiving backup + snapshots. It is built on top of btrfs send and receive capabilities. + Sources and destinations can be local btrfs file systems, remote btrfs + file systems over SSH, or S3 buckets. + ''; + homepage = https://github.com/AmesCornish/buttersink/wiki; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..924ce07c8e78db4b0a2c27ef213ffbf77523a837 --- /dev/null +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, freezegun +}: + +buildPythonPackage rec { + pname = "cached-property"; + version = "1.4.2"; + + # conftest.py is missing in PyPI tarball + src = fetchFromGitHub { + owner = "pydanny"; + repo = pname; + rev = version; + sha256 = "0gjmgfilhljkx2b60cjikwh55jg2jwxhwi8hgkrzdnzk465ywhrw"; + }; + + checkInputs = [ pytest freezegun ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "A decorator for caching properties in classes"; + homepage = https://github.com/pydanny/cached-property; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ericsagnes ]; + }; +} diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix index edfe965fa8003f549612bfe3fa33829fd02f4acb..6daa735cfaed26ac6b139049f42ecfb4e5b79416 100644 --- a/pkgs/development/python-modules/cachetools/1.nix +++ b/pkgs/development/python-modules/cachetools/1.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "cachetools"; - version = "1.1.3"; + version = "2.0.1"; disabled = isPyPy; # a test fails src = fetchPypi { inherit pname version; - sha256 = "0js7qx5pa8ibr8487lcf0x3a7w0xml0wa17snd6hjs0857kqhn20"; + sha256 = "ede01f2d3cbd6ddc9e35e16c2b0ce011d8bb70ce0dbaf282f5b4df24b213bc5d"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a8a8ac110f108cca7d64f8e7feae21cb9547d694 --- /dev/null +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -0,0 +1,58 @@ +# FIXME: make gdk_pixbuf dependency optional +{ buildPythonPackage +, fetchPypi +, lib +, substituteAll +, makeFontsConf +, freefont_ttf +, pytest +, glibcLocales +, cairo +, cffi +, withXcffib ? false, xcffib +, python +, glib +, gdk_pixbuf }: + +buildPythonPackage rec { + pname = "cairocffi"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i9m3p39g9wrkpjvpawch2qmnmm3cnim7niz3nmmbcp2hrkixwk5"; + }; + + LC_ALL = "en_US.UTF-8"; + + # checkPhase require at least one 'normal' font and one 'monospace', + # otherwise glyph tests fails + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + checkInputs = [ pytest glibcLocales ]; + propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + patches = [ + # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0 + (substituteAll { + src = ./dlopen-paths.patch; + cairo = cairo.out; + glib = glib.out; + gdk_pixbuf = gdk_pixbuf.out; + }) + ./fix_test_scaled_font.patch + ]; + + meta = with lib; { + homepage = https://github.com/SimonSapin/cairocffi; + license = licenses.bsd3; + maintainers = with maintainers; []; + description = "cffi-based cairo bindings for Python"; + }; +} diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..68b1924e5a86396c51dcbb1698c91946f7dbd47b --- /dev/null +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, cairocffi, cssselect2, defusedxml, pillow, tinycss2 +, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: + +buildPythonPackage rec { + pname = "CairoSVG"; + version = "2.1.3"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9"; + }; + + propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; + + checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ]; + + meta = with stdenv.lib; { + homepage = https://cairosvg.org; + license = licenses.lgpl3; + description = "SVG converter based on Cairo"; + }; +} diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..395122b4da9e1de350f3ad176506a5691a6e57b2 --- /dev/null +++ b/pkgs/development/python-modules/can/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pyserial +, nose +, mock }: + +buildPythonPackage rec { + pname = "python-can"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc"; + }; + + propagatedBuildInputs = [ pyserial ]; + checkInputs = [ nose mock ]; + + meta = with lib; { + homepage = https://github.com/hardbyte/python-can; + description = "CAN support for Python"; + license = licenses.lgpl3; + maintainers = with maintainers; [ sorki ]; + }; +} diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..99ac6c3ec45baf86fee1964979d6a94e3c8e265e --- /dev/null +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, python +, lxml +, xlwt +, xlrd +, XlsxWriter +, pyyaml +, future }: + +buildPythonPackage rec { + pname = "canmatrix"; + version = "0.6"; + + # uses fetchFromGitHub as PyPi release misses test/ dir + src = fetchFromGitHub { + owner = "ebroecker"; + repo = pname; + rev = version; + sha256 = "1lb0krhchja2jqfsh5lsfgmqcchs1pd38akvc407jfmll96f4yqz"; + }; + + checkPhase = '' + cd test + ${python.interpreter} ./test.py + ''; + + propagatedBuildInputs = + [ lxml + xlwt + xlrd + XlsxWriter + pyyaml + future + ]; + + meta = with lib; { + homepage = https://github.com/ebroecker/canmatrix; + description = "Support and convert several CAN (Controller Area Network) database formats .arxml .dbc .dbf .kcd .sym fibex xls(x)"; + license = licenses.bsd2; + maintainers = with maintainers; [ sorki ]; + }; +} + diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..08ae54e0b73bb72484052a765918cc9eb877831c --- /dev/null +++ b/pkgs/development/python-modules/canopen/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, nose +, can +, canmatrix }: + +buildPythonPackage rec { + pname = "canopen"; + version = "0.5.1"; + + # use fetchFromGitHub until version containing test/sample.eds + # is available on PyPi + # https://github.com/christiansandberg/canopen/pull/57 + + src = fetchFromGitHub { + owner = "christiansandberg"; + repo = "canopen"; + rev = "b20575d84c3aef790fe7c38c5fc77601bade0ea4"; + sha256 = "1qg47qrkyvyxiwi13sickrkk89jp9s91sly2y90bz0jhws2bxh64"; + }; + + #src = fetchPypi { + # inherit pname version; + # sha256 = "0806cykarpjb9ili3mf82hsd9gdydbks8532nxgz93qzg4zdbv2g"; + #}; + + # test_pdo failure https://github.com/christiansandberg/canopen/issues/58 + doCheck = false; + + propagatedBuildInputs = + [ can + canmatrix + ]; + + checkInputs = [ nose ]; + + meta = with lib; { + homepage = https://github.com/christiansandberg/canopen/; + description = "CANopen stack implementation"; + license = licenses.lgpl3; + maintainers = with maintainers; [ sorki ]; + }; +} diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3b976fb7ad9a27dee0a92f4744f892bee2f8cdcb --- /dev/null +++ b/pkgs/development/python-modules/carrot/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, amqplib, anyjson }: + +buildPythonPackage rec { + pname = "carrot"; + version = "0.10.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s14rs2fgp1s2qa0avn8gj33lwc3k1hd4y9a2h6mhg487i7kfinb"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ amqplib anyjson ]; + + doCheck = false; # depends on the network + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/carrot; + description = "AMQP Messaging Framework for Python"; + }; +} diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0f1bba36def63495b19149cee34d1bf8b13d8628 --- /dev/null +++ b/pkgs/development/python-modules/case/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi +, six, nose, unittest2, mock }: + +buildPythonPackage rec { + pname = "case"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1"; + }; + + propagatedBuildInputs = [ six nose unittest2 mock ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/case; + description = "unittests utilities"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index edf7f0596c5f1d8f73bd33a2a2074249f2d27950..c5d643da79d54f9989c1316be198eb7417be86c9 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, krb5Full, nose, GitPython, mock, git }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: buildPythonPackage rec { pname = "CCColUtils"; @@ -9,9 +9,11 @@ buildPythonPackage rec { inherit pname version; sha256 = "1gwcq4xan9as1j3q9k2zqrywxp46qx0ljwxbck9id2fvilds6ck3"; }; + buildInputs = [ krb5Full ]; propagatedBuildInputs = [ nose GitPython mock git ]; - doCheck = false; + + doCheck = isPy3k; # needs unpackaged module to run tests on python2 meta = with stdenv.lib; { description = "Python Kerberos 5 Credential Cache Collection Utilities"; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7f3fb46d1e106730d75ca6d9ce6e9fa027de1749 --- /dev/null +++ b/pkgs/development/python-modules/celery/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect, + pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet +}: + +buildPythonPackage rec { + pname = "celery"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dcb0s6kdcd3vc9pwvazngppkdbhwpmpjmghq6rifsld34q3gzvp"; + }; + + # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox + preCheck = stdenv.lib.optionalString stdenv.isLinux '' + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ + LD_PRELOAD=${libredirect}/lib/libredirect.so + ''; + postCheck = stdenv.lib.optionalString stdenv.isLinux '' + unset NIX_REDIRECTS LD_PRELOAD + ''; + + buildInputs = [ pytest case ]; + propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/celery/; + description = "Distributed task queue"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch deleted file mode 100644 index 27caa80dd4ca9886523f49703dc39966ce76f1a3..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix endless loop in logger_isa (Python 3.6) -Author: George Psarakis -Origin: upstream, https://github.com/celery/celery/commit/9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad -Forwarded: not-needed -Reviewed-By: Nishanth Aravamudan -Last-Update: 2017-06-12 - ---- celery-4.0.2.orig/celery/utils/log.py -+++ celery-4.0.2/celery/utils/log.py -@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000): - else: - if this in seen: - raise RuntimeError( -- 'Logger {0!r} parents recursive'.format(l), -+ 'Logger {0!r} parents recursive'.format(l.name), - ) - seen.add(this) - this = this.parent diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 3fbdb500af8085129f87b95eab2fbaefe042dfc3..36cc20e027bbd223ea6ab582b828f6a54dcf102a 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "cement"; - name = "${pname}-${version}"; version = "2.10.2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..12536584f0517db0025b65a5a23194e3a2ca8743 --- /dev/null +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: + +buildPythonPackage rec { + pname = "Cerberus"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "a5b39090fde3ec3294c9d7030b8eda935b42222160a66a922e0c8aea34cabfdf"; + }; + + checkInputs = [ pytestrunner pytest ]; + + meta = with stdenv.lib; { + homepage = http://python-cerberus.org/; + description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 79eea05745468c448e932ecc99b388c2ed2181a6..d36f0f308d33124af9e9145a1988cb7095484d3f 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "certifi"; - version = "2017.7.27.1"; + version = "2018.1.18"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "40523d2efb60523e113b44602298f0960e900388cf3bb6043f645cf57ea9e3f5"; + sha256 = "edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d"; }; meta = { diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch deleted file mode 100644 index 27674edb58b43f8dbe41dcdb69c5a8707d551212..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/cffi/clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py -index a3277b0..0d6e2c3 100644 ---- a/testing/cffi1/test_recompiler.py -+++ b/testing/cffi1/test_recompiler.py -@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False): - char32_t foo_4bytes(char32_t); - """) - lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """ -- #if !defined(__cplusplus) || __cplusplus < 201103L -+ #if !defined(__cplusplus) - typedef uint_least16_t char16_t; - typedef uint_least32_t char32_t; - #endif diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index b0524b4121adf033186a5e16ef3dccf93aac6027..cd643806c3a7111aa0556cce8155e1e479813079 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,30 +2,43 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.11.2"; + version = "1.11.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; + sha256 = "e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4"; }; - patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch; - outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; + # On Darwin, the cffi tests want to hit libm a lot, and look for it in a global + # impure search path. It's obnoxious how much repetition there is, and how difficult + # it is to get it to search somewhere else (since we do actually have a libm symlink in libSystem) + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace testing/cffi0/test_parsing.py \ + --replace 'lib_m = "m"' 'lib_m = "System"' \ + --replace '"libm" in name' '"libSystem" in name' + substituteInPlace testing/cffi0/test_unicode_literals.py --replace 'lib_m = "m"' 'lib_m = "System"' + substituteInPlace testing/cffi0/test_zdistutils.py --replace 'self.lib_m = "m"' 'self.lib_m = "System"' + substituteInPlace testing/cffi1/test_recompiler.py --replace 'lib_m = "m"' 'lib_m = "System"' + substituteInPlace testing/cffi0/test_function.py --replace "lib_m = 'm'" "lib_m = 'System'" + substituteInPlace testing/cffi0/test_verify.py --replace "lib_m = ['m']" "lib_m = ['System']" + ''; + # The tests use -Werror but with python3.6 clang detects some unreachable code. NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; + doCheck = !stdenv.hostPlatform.isMusl; # TODO: Investigate checkPhase = '' py.test ''; meta = with stdenv.lib; { - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ domenkozar lnl7 ]; 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/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index e565e23458ca639ed18fffbd4d80c9130dee4e53..2c97cbd4a3349e757b8a6e6f50d9a754507e569a 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -2,7 +2,8 @@ buildPythonPackage rec { version = "0.6"; - name = "cgroup-utils-${version}"; + pname = "cgroup-utils"; + name = pname + "-" + version; buildInputs = [ pep8 nose ]; # Pep8 tests fail... diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fe1f84aa1bbab81ee15318e88e0c98a1c67a606e --- /dev/null +++ b/pkgs/development/python-modules/chainer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, python +, buildPythonPackage, fetchPypi, isPy3k +, filelock, protobuf, numpy, pytest, mock +, cupy, cudaSupport ? false +}: + +buildPythonPackage rec { + pname = "chainer"; + version = "3.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "d72c1f5ff5f4743b141900d5e50aeb8337a213e553a28012dad4a4d2335bbabb"; + }; + + checkInputs = [ + pytest + mock + ]; + + propagatedBuildInputs = [ + filelock + protobuf + numpy + ] ++ lib.optionals cudaSupport [ cupy ]; + + # In python3, test was failed... + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "A flexible framework of neural networks for deep learning"; + homepage = https://chainer.org/; + license = licenses.mit; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index e5c92ffcde266b2d656a8b515a3ecd72931790f1..46692999a4989de12ec9b76b4ade391e505c388d 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "channels"; name = "${pname}-${version}"; - version = "1.1.8"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0gsy3hwn1vd709jkw8ay44qrm6aw7qggr312z8xwzq0x4ihjda02"; + sha256 = "5d41e0f2aa40f9755f36c2c1dd83748b6793732190d577922e06294a3b37fd92"; }; # Files are missing in the distribution diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 7e50dca40660d0eba878e79ebf6009cd549fbcf7..1f452fb461a4efbb8c836bdf275d12facabc85c4 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -2,7 +2,6 @@ , pytest, pytestrunner, hypothesis }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "chardet"; version = "3.0.4"; @@ -11,7 +10,7 @@ buildPythonPackage rec { sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; }; - buildInputs = [ pytest pytestrunner hypothesis ]; + checkInputs = [ pytest pytestrunner hypothesis ]; meta = with stdenv.lib; { homepage = https://github.com/chardet/chardet; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..56c6c551ee7c9eb610328a46d78e882d99ee9a3f --- /dev/null +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "check-manifest"; + version = "0.36"; + + src = fetchPypi { + inherit pname version; + sha256 = "2bb906a736a0f026cc5fd6c0dab5a481793b3d7a7d70106cca6e238da5f52d84"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/mgedmin/check-manifest; + description = "Check MANIFEST.in in a Python source package for completeness"; + license = licenses.mit; + maintainers = with maintainers; [ lewo ]; + }; +} diff --git a/pkgs/development/python-modules/cheetah/default.nix b/pkgs/development/python-modules/cheetah/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..98af2f10a0bbf670df1fe961d13a09d7ed9808c7 --- /dev/null +++ b/pkgs/development/python-modules/cheetah/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, markdown +, isPy3k +, TurboCheetah +}: + +buildPythonPackage rec { + pname = "cheetah"; + version = "2.4.4"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550"; + }; + + propagatedBuildInputs = [ markdown ]; + + doCheck = false; # Circular dependency + + checkInputs = [ + TurboCheetah + ]; + + meta = { + homepage = http://www.cheetahtemplate.org/; + description = "A template engine and code generation tool"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 8447f7fea50c30fcd66cf46d1c6e2706c55cf514..7aa01623b085764ebe301bc14aec238895c2e43b 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchPypi, buildPythonPackage -, six -, coverage, codecov, pytest, pytestcov, pytest-sugar, portend +, more-itertools, six +, pytest, pytestcov, portend , backports_unittest-mock, setuptools_scm }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "cheroot"; - version = "5.8.3"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "5c0531fd732700b1fb3e6e7079dc3aefbdf29e9136925633d93f009cb87d70a3"; + sha256 = "10s67wxymk4xg45l7ca59n4l6m6rnj8b9l52pg1angxh958lwixs"; }; - propagatedBuildInputs = [ six ]; - buildInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock setuptools_scm ]; + propagatedBuildInputs = [ more-itertools six ]; + + buildInputs = [ setuptools_scm ]; + + checkInputs = [ pytest pytestcov portend backports_unittest-mock ]; checkPhase = '' py.test cheroot diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index cffffde8e3d1e31db1a0a49392f5523fd647db6f..bb97a3a7e678eb5208a3c77fcc9d4e4e488ebb49 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,23 +1,29 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k -, pytest, setuptools_scm, pytestrunner -, six, cheroot, portend }: +{ lib, buildPythonPackage, fetchPypi +, cheroot, portend, routes, six +, setuptools_scm +, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov +}: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "CherryPy"; - version = "11.0.0"; + version = "14.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1037pvhab4my791vfzikm649ny52fj7x2q87cnncmbnqin6ghwan"; + sha256 = "721d09bbeedaf5b3493e9e644ae9285d776ea7f16b1d4a0a5aaec7c0d22e5074"; }; - # wsgiserver.ssl_pyopenssl is broken on py3k. - doCheck = !isPy3k; - buildInputs = [ pytest setuptools_scm pytestrunner ]; - propagatedBuildInputs = [ six cheroot portend ]; + propagatedBuildInputs = [ cheroot portend routes six ]; - meta = with stdenv.lib; { + buildInputs = [ setuptools_scm ]; + + checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov ]; + + checkPhase = '' + LANG=en_US.UTF-8 pytest + ''; + + meta = with lib; { homepage = "http://www.cherrypy.org"; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b703bce2cc7a1ef80093287588c0a32b35f92a41 --- /dev/null +++ b/pkgs/development/python-modules/circus/default.nix @@ -0,0 +1,16 @@ +{ stdenv, buildPythonPackage, fetchPypi +, iowait, psutil, pyzmq, tornado, mock }: + +buildPythonPackage rec { + pname = "circus"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b8ca91d8bd87b350fda199488ac9ddff91a546b0c6214a28a2f13393713cf062"; + }; + + doCheck = false; # weird error + + propagatedBuildInputs = [ iowait psutil pyzmq tornado mock ]; +} diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2042a2d629bb675ef78e038a5395d68e1d8cba84 --- /dev/null +++ b/pkgs/development/python-modules/cjson/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: + +buildPythonPackage rec { + pname = "python-cjson"; + version = "1.2.1"; + disabled = isPy3k || isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "52db2745264624768bfd9b604acb38f631bde5c2ec9b23861677d747e4558626"; + }; + + meta = with stdenv.lib; { + description = "A very fast JSON encoder/decoder for Python"; + homepage = http://ag-projects.com/; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9303f90141daa7d1a212eb6ff6d9877514875c35 --- /dev/null +++ b/pkgs/development/python-modules/clf/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, docopt, requests, pygments }: + +buildPythonPackage rec { + pname = "clf"; + version = "0.5.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "abc919a1e99667f32fdde15dfb4bc527dbe22cf86a17acb78a449d7f2dfe937e"; + }; + + patchPhase = '' + sed -i 's/==/>=/' requirements.txt + ''; + + propagatedBuildInputs = [ docopt requests pygments ]; + + # Error when running tests: + # No local packages or download links found for requests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ncrocfer/clf; + description = "Command line tool to search snippets on Commandlinefu.com"; + license = licenses.mit; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7229488a700fca8399ff0aa2ab4cc2f33e6054a1 --- /dev/null +++ b/pkgs/development/python-modules/click-log/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, click }: + +buildPythonPackage rec { + pname = "click-log"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; + }; + + propagatedBuildInputs = [ click ]; + + meta = with stdenv.lib; { + homepage = https://github.com/click-contrib/click-log/; + description = "Logging integration for Click"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3fe2af19fef912c0c52e5fb6194ed972e9d4a2d8 --- /dev/null +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, click +, isPy3k +, futures +}: + +buildPythonPackage rec { + pname = "click-threading"; + version = "0.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ click ] ++ lib.optional (!isPy3k) futures; + + checkPhase = '' + py.test + ''; + + # Tests are broken on 3.x + doCheck = !isPy3k; + + meta = { + homepage = https://github.com/click-contrib/click-threading/; + description = "Multithreaded Click apps made easy"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d5dfba61010c44e7c98c1019384dfeacdd3543a4 --- /dev/null +++ b/pkgs/development/python-modules/click/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "click"; + version = "6.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + py.test tests + ''; + + # https://github.com/pallets/click/issues/823 + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://click.pocoo.org/; + description = "Create beautiful command line interfaces in Python"; + longDescription = '' + A Python package for creating beautiful command line interfaces in a + composable way, with as little code as necessary. + ''; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ec5f8bcba3b2c9be219104e8e84bc16c345b90da --- /dev/null +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock }: + +buildPythonPackage rec { + pname = "cloudpickle"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "b0e63dd89ed5285171a570186751bc9b84493675e99e12789e9a5dc5490ef554"; + }; + + buildInputs = [ pytest mock ]; + + # See README for tests invocation + checkPhase = '' + PYTHONPATH=$PYTHONPATH:'.:tests' py.test + ''; + + # TypeError: cannot serialize '_io.FileIO' object + doCheck = false; + + meta = with stdenv.lib; { + description = "Extended pickling support for Python objects"; + homepage = https://github.com/cloudpipe/cloudpickle; + license = with licenses; [ bsd3 ]; + }; +} diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5867c33642f5b5870c1d2723d1fadd33a5bd71e4 --- /dev/null +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, cffi, pytest }: + +buildPythonPackage rec { + pname = "cmarkgfm"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "977d7061779c7ebc5cbe7af71adb795ced96058552fe5f6b646d95b5055959be"; + }; + + propagatedBuildInputs = [ cffi ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Minimal bindings to GitHub's fork of cmark"; + homepage = https://github.com/jonparrott/cmarkgfm; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5ffa51def0d2799d7d02bd212e80634a0118b235 --- /dev/null +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchPypi, buildPythonPackage, pythonOlder +, pyperclip, six, pyparsing, vim +, contextlib2 ? null, subprocess32 ? null +, pytest, mock, which, fetchFromGitHub, glibcLocales +}: +buildPythonPackage rec { + pname = "cmd2"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "python-cmd2"; + repo = "cmd2"; + rev = version; + sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z"; + }; + + LC_ALL="en_US.UTF-8"; + + postPatch = stdenv.lib.optional stdenv.isDarwin '' + # Fake the impure dependencies pbpaste and pbcopy + mkdir bin + echo '#/bin/sh' > bin/pbpaste + echo '#/bin/sh' > bin/pbcopy + chmod +x bin/{pbcopy,pbpaste} + export PATH=$(realpath bin):$PATH + ''; + + checkInputs= [ pytest mock which vim glibcLocales ]; + checkPhase = '' + # test_path_completion_user_expansion might be fixed in the next release + py.test -k 'not test_path_completion_user_expansion' + ''; + doCheck = !stdenv.isDarwin; + + propagatedBuildInputs = [ + pyperclip + six + pyparsing + ] + ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 + ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32 + ; + + meta = with stdenv.lib; { + description = "Enhancements for standard library's cmd module"; + homepage = https://github.com/python-cmd2/cmd2; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1f8d913aa2a8d85b6f105ac18d83da7707a802be --- /dev/null +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyyaml }: + +buildPythonPackage rec { + pname = "cmdline"; + version = "0.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "324cc8fc6580f221824821c47232c297ed1f7cc737186a57305a8c08fc902dd7"; + }; + + # No tests, https://github.com/rca/cmdline/issues/1 + doCheck = false; + propagatedBuildInputs = [ pyyaml ]; + + meta = with stdenv.lib; { + description = "Utilities for consistent command line tools"; + homepage = https://github.com/rca/cmdline; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 93620098446a2a773cf7aec3647b81d2c5ceac54..6b2063f49922b8f5a32f992e78f7eeb4da518516 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -2,15 +2,14 @@ buildPythonPackage rec { pname = "codecov"; - version = "2.0.9"; - name = "${pname}-${version}"; + version = "2.0.15"; src = fetchPypi { inherit pname version; - sha256 = "037h4dcl8xshlq3rj8409p11rpgnyqrhlhfq8j34s94nm0n1h76v"; + sha256 = "8ed8b7c6791010d359baed66f84f061bba5bd41174bf324c31311e8737602788"; }; - buildInputs = [ unittest2 ]; # Tests only + checkInputs = [ unittest2 ]; # Tests only propagatedBuildInputs = [ requests coverage ]; @@ -18,6 +17,9 @@ buildPythonPackage rec { sed -i 's/, "argparse"//' setup.py ''; + # No tests in archive + doCheck = false; + meta = { description = "Python report uploader for Codecov"; homepage = https://codecov.io/; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b660ed0225772ede33151738536eeda0d8c01370 --- /dev/null +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cogapp"; + version = "2.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "f8cf2288fb5a2087eb4a00d8b347ddc86e9058d4ab26b8c868433eb401adfe1c"; + }; + + # there are no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A code generator for executing Python snippets in source files"; + homepage = http://nedbatchelder.com/code/cog; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 ]; + }; +} diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..11d39e411ce52b3d934832f511d4f36039617767 --- /dev/null +++ b/pkgs/development/python-modules/coilmq/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, stompclient, pythondaemon, redis, pid, pytest, six, click, coverage +, sqlalchemy }: + +buildPythonPackage rec { + pname = "CoilMQ"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "4cbfeb5ed2459df14902c1380157be6267702b1271682924cd316ccad8a29d1d"; + }; + + propagatedBuildInputs = [ stompclient pythondaemon redis pid ]; + buildInputs = [ pytest six click coverage sqlalchemy ]; + + # The teste data is not included in the distribution + doCheck = false; + + meta = with stdenv.lib; { + description = "Simple, lightweight, and easily extensible STOMP message broker"; + homepage = http://code.google.com/p/coilmq/; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ed27464d1fe0104610caa95ca437b41295d21c13 --- /dev/null +++ b/pkgs/development/python-modules/colander/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi +, translationstring, iso8601 }: + +buildPythonPackage rec { + pname = "colander"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "e20e9acf190e5711cf96aa65a5405dac04b6e841028fc361d953a9923dbc4e72"; + }; + + propagatedBuildInputs = [ translationstring iso8601 ]; + + meta = with lib; { + description = "A simple schema-based serialization and deserialization library"; + homepage = https://docs.pylonsproject.org/projects/colander/en/latest/; + license = licenses.free; # http://repoze.org/LICENSE.txt + maintainers = with maintainers; [ garbas domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index 99a59ae8fd4367a72f0bbcbcc7b2b575abcff9c6..bce14db7704f762024cb555afa666fa05384e779 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "colorama"; version = "0.3.9"; diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b035bb9b57c97acd44fd90f85ab4b2e23f73cccd --- /dev/null +++ b/pkgs/development/python-modules/colorclass/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "colorclass"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b"; + }; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/Robpol86/colorclass; + license = licenses.mit; + description = "Automatic support for console colors"; + }; +} diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e737b8848975f499977eee1359e6e5ff4a6e0c2b --- /dev/null +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "colorlog"; + version = "3.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i21sd6pggr2gqza41vyq2rqyb552wf5iwl4bc16i7kqislbd53z"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test -p no:logging + ''; + + meta = with stdenv.lib; { + description = "Log formatting with colors"; + homepage = https://github.com/borntyping/python-colorlog; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a162b21b083da8705ac4f8d44d9fde407dfc3f3d --- /dev/null +++ b/pkgs/development/python-modules/colour/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, d2to1 }: + +buildPythonPackage rec { + pname = "colour"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "af20120fefd2afede8b001fbef2ea9da70ad7d49fafdb6489025dae8745c3aee"; + }; + + buildInputs = [ d2to1 ]; + + meta = with stdenv.lib; { + description = "Converts and manipulates common color representation (RGB, HSV, web, ...)"; + homepage = https://github.com/vaab/colour; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d6cd69f6c8ae6d9ee16e41220d0b2d18cf132ab1 --- /dev/null +++ b/pkgs/development/python-modules/commonmark/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, future }: + +buildPythonPackage rec { + pname = "CommonMark"; + version = "0.7.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "4dfbbd1dbc669a9b71a015032b2bbe5c4b019ca8b6ca410d89cf7020de46d2c0"; + }; + + preCheck = '' + export LC_ALL="en_US.UTF-8" + ''; + + # UnicodeEncodeError on Python 2 + doCheck = isPy3k; + + checkInputs = [ glibcLocales ]; + propagatedBuildInputs = [ future ]; + + meta = with lib; { + description = "Python parser for the CommonMark Markdown spec"; + homepage = https://github.com/rolandshoemaker/CommonMark-py; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a240ea21e3e46200cf8b69a8aacb9daae26d54bd --- /dev/null +++ b/pkgs/development/python-modules/conda/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pycosat +, requests +, ruamel_yaml +, isPy3k +, enum34 +}: + +# Note: this installs conda as a library. The application cannot be used. +# This is likely therefore NOT what you're looking for. + +buildPythonPackage rec { + pname = "conda"; + version = "4.3.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "a91ef821343dea3ba9670f3d10b36c1ace4f4c36d70c175d8fc8886e94285953"; + }; + + propagatedBuildInputs = [ pycosat requests ruamel_yaml ] ++ lib.optional (!isPy3k) enum34; + + # No tests + doCheck = false; + + meta = { + description = "OS-agnostic, system-level binary package manager"; + homepage = https://github.com/conda/conda; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 9d84400667a9a1a1aa4dd0fb3831776ec13ede0f..6a52076252e86ec43576faaf45c9b4b423993e05 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ConfigArgParse"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "0fgkiqh6r3rbkdq3k8c48m85g52k96686rw3a6jg4lcncrkpvk98"; + sha256 = "e6441aa58e23d3d122055808e5e2220fd742dff6e1e51082d2a4e4ed145dd788"; }; # no tests in tarball @@ -16,6 +16,6 @@ buildPythonPackage rec { description = "A drop-in replacement for argparse"; homepage = https://github.com/zorro3/ConfigArgParse; license = licenses.mit; - maintainer = [ maintainers.willibutz ]; + maintainers = [ maintainers.willibutz ]; }; } diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..98631b6920b3720ccbd7e75829dca820a3ab3dbe --- /dev/null +++ b/pkgs/development/python-modules/configobj/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "configobj"; + version = "5.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "00h9rcmws03xvdlfni11yb60bz3kxfvsj6dg6nrpzj71f03nbxd2"; + }; + + # error: invalid command 'test' + doCheck = false; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Config file reading, writing and validation"; + homepage = https://pypi.python.org/pypi/configobj; + license = licenses.bsd3; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8e770c504c3b2009e7e6c6faf5b793e781e81563 --- /dev/null +++ b/pkgs/development/python-modules/configparser/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "configparser"; + version = "3.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k"; + }; + + # No tests available + doCheck = false; + + # Fix issue when used together with other namespace packages + # https://github.com/NixOS/nixpkgs/issues/23855 + patches = [ + ./0001-namespace-fix.patch + ]; + + meta = with stdenv.lib; { + }; +} diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 9d8e61d1f45000157b516108c8c8f4460f0095a5..afba2e17bf64b3507793f1d5f0cefc3802b4e7f5 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }: +{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest, pythonOlder }: buildPythonPackage rec { - name = "construct-${version}"; + pname = "construct"; version = "2.8.16"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "construct"; @@ -13,15 +14,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - # Tests fail with the following error on Python 3.5+ - # TypeError: not all arguments converted during string formatting - doCheck = pythonOlder "3.5"; + checkInputs = [ pytest ]; + + checkPhase = '' + py.test -k 'not test_numpy' tests + ''; meta = with stdenv.lib; { description = "Powerful declarative parser (and builder) for binary data"; homepage = http://construct.readthedocs.org/; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5722893a853772702a671479d82c521149d5c8e0 --- /dev/null +++ b/pkgs/development/python-modules/consul/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests, six, pytest }: + +buildPythonPackage rec { + pname = "python-consul"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ef0b7c8a2d8efba5f9602f45aadbe5035e22a511d245624ed732af81223a6571"; + }; + + buildInputs = [ requests six pytest ]; + + # No tests distributed. https://github.com/cablehead/python-consul/issues/133 + doCheck = false; + + meta = with stdenv.lib; { + description = "Python client for Consul (https://www.consul.io/)"; + homepage = https://github.com/cablehead/python-consul; + license = licenses.mit; + maintainers = with maintainers; [ desiderius ]; + }; +} diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0fa72dfa687dece505505cae9a9533c050a9e17b --- /dev/null +++ b/pkgs/development/python-modules/contexter/default.nix @@ -0,0 +1,14 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "contexter"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "c730890b1a915051414a6350d8ea1cddca7d01d8f756badedb30b9bf305ea0a8"; + }; + + meta = with stdenv.lib; { + }; +} diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index cadaa8914b2184941b2350bf3f9a81bcd0635a43..a056ba450a880d2058e3f77aab3055d9537bf39e 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, unittest2 }: buildPythonPackage rec { @@ -13,9 +14,11 @@ buildPythonPackage rec { sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48"; }; + checkInputs = [ unittest2 ]; + meta = { description = "Backports and enhancements for the contextlib module"; homepage = http://contextlib2.readthedocs.org/; license = lib.licenses.psfl; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..abccd1e136d86ad8900d465a2e89ecadb37568a1 --- /dev/null +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy +, pytest, pytestcov, pytest-mock, freezegun +, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests }: + +buildPythonPackage rec { + pname = "cookiecutter"; + version = "1.6.0"; + + # not sure why this is broken + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1316a52e1c1f08db0c9efbf7d876dbc01463a74b155a0d83e722be88beda9a3e"; + }; + + checkInputs = [ pytest pytestcov pytest-mock freezegun ]; + propagatedBuildInputs = [ + jinja2 future binaryornot click whichcraft poyo jinja2_time requests + ]; + + # requires network access for cloning git repos + doCheck = false; + checkPhase = '' + pytest + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/audreyr/cookiecutter; + description = "A command-line utility that creates projects from project templates"; + license = licenses.bsd3; + maintainers = with maintainers; [ kragniz ]; + }; +} diff --git a/pkgs/development/python-modules/cookies/default.nix b/pkgs/development/python-modules/cookies/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1b8e5b6061d7606c38581e9687cd2922ee508248 --- /dev/null +++ b/pkgs/development/python-modules/cookies/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cookies"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Friendlier RFC 6265-compliant cookie parser/renderer"; + homepage = https://github.com/sashahart/cookies; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/cov-core/default.nix b/pkgs/development/python-modules/cov-core/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad85218709e86dff7e557050bd9ace88401a19cc --- /dev/null +++ b/pkgs/development/python-modules/cov-core/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage }: + +buildPythonPackage rec { + pname = "cov-core"; + version = "1.15.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a"; + }; + + propagatedBuildInputs = [ coverage ]; + + meta = with stdenv.lib; { + description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; + }; +} diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 137cef06b9e20fa773ed2822919ea352db28e96c..8b85a0d94c5ab8dc883a7fc33c748b956a82fce1 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "coverage"; - version = "4.4.1"; + version = "4.5.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7a9c44400ee0f3b4546066e0710e1250fd75831adc02ab99dda176ad8726f424"; + sha256 = "56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1"; }; # No tests in archive diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 4d11354df0aad3149143d7eb7749485d86b9f3d0..f57e0fe860955d2b4b72429444bce20411bfdefe 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "coveralls"; name = "${pname}-python-${version}"; - version = "1.2.0"; + version = "1.3.0"; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "510682001517bcca1def9f6252df6ce730fcb9831c62d9fff7c7d55b6fdabdf3"; + sha256 = "664794748d2e5673e347ec476159a9d87f43e0d2d44950e98ed0e27b98da8346"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index c0fc5b177e0af26a7047fed74f1bbaf7adb6c698..232a4a19fd858ed0e65cbcb9cfa3d843f7466d29 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -1,11 +1,10 @@ -{stdenv, lib, buildPythonPackage, fetchPypi, coverage, bash, which, writeText}: +{stdenv, lib, buildPythonPackage, fetchPypi, bash, which, writeText}: buildPythonPackage rec { - name = "${pname}-${version}"; version = "0.7"; pname = "cram"; - buildInputs = [ coverage which ]; + checkInputs = [ which ]; src = fetchPypi { inherit pname version; @@ -13,20 +12,13 @@ buildPythonPackage rec { }; postPatch = '' + patchShebangs scripts/cram 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,*/__main__.py" + scripts/cram tests ''; meta = { diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..16b3998eb8566205051e9bfcf731dbb2125993b8 --- /dev/null +++ b/pkgs/development/python-modules/crayons/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchPypi, buildPythonPackage, colorama }: + +buildPythonPackage rec { + pname = "crayons"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "17c0v0dkk8sn8kyyy2w7myxq9981glrbczh6h8sdcr750lb6j5sy"; + }; + + propagatedBuildInputs = [ colorama ]; + + meta = with stdenv.lib; { + description = "TextUI colors for Python"; + homepage = https://github.com/kennethreitz/crayons; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f85e045d525e086b319fcdac8cd68b98fcb2bf91 --- /dev/null +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "crcmod"; + version = "1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w"; + }; + + meta = with stdenv.lib; { + description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; + homepage = http://crcmod.sourceforge.net/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 810a6a7bd8e31afbebc8d6cbc14a56b213ce17aa..8be1780aa9922879f96133792a5fba0d4dfd15df 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,13 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils }: buildPythonPackage rec { - pname = "credstash"; - version = "1.13.4"; - name = "${pname}-${version}"; + pname = "credstash"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "676cc03a6143dec260c78aeef09d08a64faf27c411f8a94f6d9338e985879f81"; + sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d"; + }; + + patches = fetchpatch { + url = https://github.com/fugue/credstash/pull/178.patch; + sha256 = "15ih4h5v63g7qfmqdl4zca147wkcrx8vnsh4ns33001dipcfb5sc"; + excludes = [ ".travis.yml" ]; }; propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e81426a892d6c2959923910c863f0e1de10a8ebe --- /dev/null +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, coverage, nose, pbkdf2 }: + +buildPythonPackage rec { + pname = "cryptacular"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "18fl7phl6r9xiwz8f1jpkahkv21wimmiq72gmrqncccv7z806gr7"; + }; + + buildInputs = [ coverage nose ]; + propagatedBuildInputs = [ pbkdf2 ]; + + # TODO: tests fail: TypeError: object of type 'NoneType' has no len() + doCheck = false; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8fe8ccc31a952f8459a63fa05fb84dcc7c3b2f65 --- /dev/null +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, openssl +, cryptography_vectors +, darwin +, idna +, asn1crypto +, packaging +, six +, pythonOlder +, enum34 +, ipaddress +, isPyPy +, cffi +, pytest +, pretend +, iso8601 +, pytz +, hypothesis +}: + +let + version = "2.2.2"; +in assert version == cryptography_vectors.version; buildPythonPackage rec { + # also bump cryptography_vectors + pname = "cryptography"; + inherit version; + + src = fetchPypi { + inherit pname version; + sha256 = "9fc295bf69130a342e7a19a39d7bbeb15c0bcaabc7382ec33ef3b2b7d18d2f63"; + }; + + outputs = [ "out" "dev" ]; + + buildInputs = [ openssl cryptography_vectors ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + propagatedBuildInputs = [ + idna + asn1crypto + packaging + six + ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 + ++ stdenv.lib.optional (pythonOlder "3.3") ipaddress + ++ stdenv.lib.optional (!isPyPy) cffi; + + checkInputs = [ + 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. + postPatch = '' + substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"' + ''; + + # IOKit's dependencies are inconsistent between OSX versions, so this is the best we + # can do until nix 1.11's release + __impureHostDeps = [ "/usr/lib" ]; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bcab5c4347595614dbdbd5ea5d15f540a34ce067 --- /dev/null +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage +, fetchPypi +, cryptography +}: + +buildPythonPackage rec { + # also bump cryptography + pname = "cryptography_vectors"; + version = "2.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "28b52c84bae3a564ce51bfb0753cbe360218bd648c64efa2808c886c18505688"; + }; + + # No tests included + doCheck = false; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index a9aad8d40e5fe3c49e954379803cfb7909347845..8d0e7a58e76a62027c3770eae56d57bd034c4a61 100644 --- a/pkgs/development/python-modules/csscompressor/default.nix +++ b/pkgs/development/python-modules/csscompressor/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "csscompressor"; - version = "0.9.4"; + version = "0.9.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0e12f125b88379d7b680636d94a3c8fa14bed1de2358f7f9a9e6749e222cff3b"; + sha256 = "afa22badbcf3120a4f392e4d22f9fff485c044a1feda4a950ecc5eba9dd31a05"; }; doCheck = false; # No tests diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d086360b7d7c5dfd93d12294254d9932cea3df69 --- /dev/null +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cssselect"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "066d8bc5229af09617e24b3ca4d52f1f9092d9e061931f4184cd572885c23204"; + }; + + # AttributeError: 'module' object has no attribute 'tests' + doCheck = false; + + meta = with stdenv.lib; { + }; +} diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5fe0f792856ef62ec4f679c7672023599f9ff628 --- /dev/null +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, tinycss2, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: + +buildPythonPackage rec { + pname = "cssselect2"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab"; + }; + + propagatedBuildInputs = [ tinycss2 ]; + + checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; + + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { + description = "CSS selectors for Python ElementTree"; + homepage = https://github.com/Kozea/cssselect2; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6dd680fe11f1b1c22b7fe781959879a137d5932d --- /dev/null +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, mock }: + +buildPythonPackage rec { + pname = "cssutils"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf"; + }; + + buildInputs = [ mock ]; + + # couple of failing tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python package to parse and build CSS"; + homepage = http://code.google.com/p/cssutils/; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix index bfabf4376e7ac3d2af80ee507fc07752665f6ec6..7fbdaa8909d6d30f05b521da51537dee455d5476 100644 --- a/pkgs/development/python-modules/csvkit/default.nix +++ b/pkgs/development/python-modules/csvkit/default.nix @@ -1,28 +1,38 @@ -{ stdenv, fetchPypi, buildPythonPackage, - dateutil, dbf, xlrd, sqlalchemy, openpyxl, - agate-excel, agate-dbf, agate-sql, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, isPy3k +, agate, agate-excel, agate-dbf, agate-sql, six +, argparse, ordereddict, simplejson +, glibcLocales, nose, mock, unittest2 +}: buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "csvkit"; - version = "1.0.2"; + pname = "csvkit"; + version = "1.0.3"; - src = fetchPypi { - inherit pname version; - sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "a6c859c1321d4697dc41252877249091681297f093e08d9c1e1828a6d52c260c"; + }; - propagatedBuildInputs = [ dateutil dbf xlrd sqlalchemy openpyxl - agate-excel agate-dbf agate-sql ]; + propagatedBuildInputs = [ + agate agate-excel agate-dbf agate-sql six + ] ++ lib.optionals (!isPy3k) [ + argparse ordereddict simplejson + ]; - doCheck = !isPy3k; - # (only) python 3 we had 9 failures and 57 errors out of a much larger - # number of tests. + checkInputs = [ + glibcLocales nose + ] ++ lib.optionals (!isPy3k) [ + mock unittest2 + ]; - 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; - }; + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -e test_csvsql + ''; + + meta = with 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/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 620f85e436d3fd51a58a792f6bde83d382a5d81d..6ecad9a160e2fe72b754afd0753b4dd6f14a1ea8 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "cufflinks"; - version = "0.12.0"; + version = "0.12.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "04ninvwm6277n3hqc17ririss90cd832wza3q3vf115rrrds3xyy"; + sha256 = "8f11e4b6326cc5b2a18011c09fb64f178ba21002f337fd305f64818012a6c679"; }; propagatedBuildInputs = [ pandas plotly colorlover ]; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..44d258a3de55fb373842717ae8a5e4a6e4c5dfa5 --- /dev/null +++ b/pkgs/development/python-modules/cupy/default.nix @@ -0,0 +1,46 @@ +{ stdenv, python, buildPythonPackage +, fetchPypi, isPy3k, linuxPackages, gcc5 +, fastrlock, numpy, six, wheel, pytest, mock +, cudatoolkit, cudnn, nccl +}: + +buildPythonPackage rec { + pname = "cupy"; + version = "2.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "60e36add95b0bc15f0863e7b4a425c00111dab0985075a96ede689510a9c56be"; + }; + + checkInputs = [ + pytest + mock + ]; + + nativeBuildInputs = [ + gcc5 + ]; + + propagatedBuildInputs = [ + cudatoolkit + cudnn + linuxPackages.nvidia_x11 + nccl + fastrlock + numpy + six + wheel + ]; + + # In python3, test was failed... + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "A NumPy-compatible matrix library accelerated by CUDA"; + homepage = https://cupy.chainer.org/; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index a1e5f2352356461eb429099dfb3606fc8fd5c3c1..d29ad1d6474586ec77655a6d9db155fa7d5e2c43 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,21 +1,19 @@ -{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, pytest, wcwidth }: +{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, wcwidth, typing }: buildPythonPackage rec { pname = "curtsies"; - version = "0.2.11"; - name = "${pname}-${version}"; - + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc"; + sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9"; }; - propagatedBuildInputs = [ blessings wcwidth pyte ]; + propagatedBuildInputs = [ blessings wcwidth typing ]; - checkInputs = [ nose mock pytest ]; + checkInputs = [ mock pyte nose ]; checkPhase = '' - py.test + nosetests tests ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..be6f688f50326b7cfdd79925039d63847f39d364 --- /dev/null +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, python +, openblasCompat # build segfaults with regular openblas +, suitesparse +, glpk ? null +, gsl ? null +, fftw ? null +, withGlpk ? true +, withGsl ? true +, withFftw ? true +}: + +buildPythonPackage rec { + pname = "cvxopt"; + version = "1.1.9"; + + disabled = isPyPy; # hangs at [translation:info] + + src = fetchPypi { + inherit pname version; + sha256 = "0gcqq8ymjxv8qa5ss2pdhsj5bahvdxa6h2rlpp51520mjxrpw5cg"; + }; + + # similar to Gsl, glpk, fftw there is also a dsdp interface + # but dsdp is not yet packaged in nixpkgs + preConfigure = '' + export CVXOPT_BLAS_LIB_DIR=${openblasCompat}/lib + export CVXOPT_BLAS_LIB=openblas + export CVXOPT_LAPACK_LIB=openblas + export CVXOPT_SUITESPARSE_LIB_DIR=${suitesparse}/lib + export CVXOPT_SUITESPARSE_INC_DIR=${suitesparse}/include + '' + lib.optionalString withGsl '' + export CVXOPT_BUILD_GSL=1 + export CVXOPT_GSL_LIB_DIR=${gsl}/lib + export CVXOPT_GSL_INC_DIR=${gsl}/include + '' + lib.optionalString withGlpk '' + export CVXOPT_BUILD_GLPK=1 + export CVXOPT_GLPK_LIB_DIR=${glpk}/lib + export CVXOPT_GLPK_INC_DIR=${glpk}/include + '' + lib.optionalString withFftw '' + export CVXOPT_BUILD_FFTW=1 + export CVXOPT_FFTW_LIB_DIR=${fftw}/lib + export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include + ''; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = { + homepage = http://cvxopt.org/; + description = "Python Software for Convex Optimization"; + longDescription = '' + CVXOPT is a free software package for convex optimization based on the + Python programming language. It can be used with the interactive + Python interpreter, on the command line by executing Python scripts, + or integrated in other software via Python extension modules. Its main + purpose is to make the development of software for convex optimization + applications straightforward by building on Python's extensive + standard library and on the strengths of Python as a high-level + programming language. + ''; + maintainers = with lib.maintainers; [ edwtjo ]; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 3d937debe58becfb3199adab2f9a6334749667c2..69a5e8c11d486ffc39e6437bed59890370ff6755 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "5.0.2"; + version = "5.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0zbx9j5z5l06bvwvlqvvn7h9dm7zjcjgxm7agbb625nymkq6cd15"; + sha256 = "2eadddde670f5c5f6cf88638a0ac4e5d5fe181292a31063275fa56c7bf22426b"; }; propagatedBuildInputs = [ ncurses ]; diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f2e10caad726ce6aa58c0f5594251cda9841a166 --- /dev/null +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, oracle-instantclient }: + +buildPythonPackage rec { + pname = "cx_Oracle"; + version = "6.2.1"; + + buildInputs = [ + oracle-instantclient + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "01970bc843b3c699a7fd98af19e0401fe69abfbd2acdf464e0bf2ae06ea372b9"; + }; + + # Check need an Oracle database to run + doCheck = false; + + meta = with stdenv.lib; { + description = "Python interface to Oracle"; + homepage = "https://oracle.github.io/python-cx_Oracle"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ y0no ]; + }; +} diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index f2c6c649a837dfe78da871e624fa5ddf85beb8ec..8033fa96113e8eb8869f849f3650761acb86e58f 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -5,8 +5,9 @@ , python }: buildPythonPackage rec { - name = "cymem-${version}"; + pname = "cymem"; version = "1.31.2"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "explosion"; @@ -16,14 +17,14 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - cython + cython ]; - + checkPhase = '' cd cymem/tests ${python.interpreter} -m unittest discover -p "*test*" ''; - + meta = with stdenv.lib; { description = "Cython memory pool for RAII-style memory management"; homepage = https://github.com/explosion/cymem; diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c1fedecbff3487a51eff118ab35b174b7e97b7e6 --- /dev/null +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchPypi +, buildPythonPackage +, cython +, sphinx +}: + +buildPythonPackage rec { + pname = "cysignals"; + version = "1.6.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "003invnixqy1h4lb358vwrxykxzp15csaddkgq3pqqmswnva5908"; + }; + + hardeningDisable = [ + "fortify" + ]; + + # currently fails, probably because of formatting changes in gdb 8.0 + doCheck = false; + + preCheck = '' + # Make sure cysignals-CSI is in PATH + export PATH="$out/bin:$PATH" + ''; + + propagatedBuildInputs = [ + cython + ]; + + enableParallelBuilding = true; + + meta = { + description = "Interrupt and signal handling for Cython"; + homepage = https://github.com/sagemath/cysignals/; + maintainers = with lib.maintainers; [ timokau ]; + license = lib.licenses.lgpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index dcb4e9474c3bcf9cee86bce23adc4fe7283c03ff..aefe250effeccc81d212c9827c24ee758c1a2e6e 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -9,12 +9,11 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.8.2"; - name = "${pname}-${version}"; + version = "0.9.0.1"; src = fetchPypi { inherit pname version; - sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; + sha256 = "84cc06fa40aa310f2df79dd440fc5f84c3e20f01f9f7783fc9c38d0a11ba00e5"; }; # Extension types @@ -29,7 +28,7 @@ buildPythonPackage rec { ''; meta = { - homepage = "http://github.com/pytoolz/cytoolz/"; + homepage = "https://github.com/pytoolz/cytoolz/"; description = "Cython implementation of Toolz: High performance functional utilities"; license = "licenses.bsd3"; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..195b20c27e4f55f639fdb3e7bcf09935bdfa5efc --- /dev/null +++ b/pkgs/development/python-modules/d2to1/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +, nose +}: +buildPythonPackage rec { + pname = "d2to1"; + version = "0.2.12"; + + checkInputs = [ nose ]; + + src = fetchFromGitHub { + owner = "embray"; + repo = pname; + rev = version; + sha256 = "1q04ab8vjvx7fmq9ckkl8r9hlwwbqiyjbzaa4v1mv5zicfssxwsi"; + }; + + meta = with lib;{ + description = "Support for distutils2-like setup.cfg files as package metadata"; + homepage = https://github.com/embray/d2to1; + license = licenses.bsd2; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index c90fb61ce03aa5a7cf624a59aebe44474e695f32..7ead1cacfa664b84d6f5cbd1c9c0cdcb4dcb6b93 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,19 +1,31 @@ -{ stdenv, buildPythonPackage, fetchPypi, - asgiref, autobahn, twisted, hypothesis +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub +, asgiref, autobahn, twisted, pytestrunner +, hypothesis, pytest, pytest-asyncio }: buildPythonPackage rec { pname = "daphne"; - name = "${pname}-${version}"; - version = "1.3.0"; + version = "2.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "1xmmjp21m1w88ljsgnkf6cbzw5nxamh9cfmfgzxffpn4cdmvn96i"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "django"; + repo = pname; + rev = version; + sha256 = "1lbpn0l796ar77amqy8dap30zxmsn6as8y2lbmp4lk8m9awscwi8"; }; - buildInputs = [ hypothesis ]; + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ asgiref autobahn twisted ]; + checkInputs = [ hypothesis pytest pytest-asyncio ]; + + checkPhase = '' + # Other tests fail, seems to be due to filesystem access + py.test -k "test_cli or test_utils" + ''; + meta = with stdenv.lib; { description = "Django ASGI (HTTP/WebSocket) server"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/darcsver/default.nix b/pkgs/development/python-modules/darcsver/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..753b592a4c595c122d7327d7502660fade5b6884 --- /dev/null +++ b/pkgs/development/python-modules/darcsver/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }: + +buildPythonPackage rec { + pname = "darcsver"; + version = "1.7.4"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1yb1c3jxqvy4r3qiwvnb86qi5plw6018h15r3yk5ji3nk54qdcb6"; + }; + + buildInputs = [ mock ]; + + # Note: We don't actually need to provide Darcs as a build input. + # Darcsver will DTRT when Darcs isn't available. See news.gmane.org + # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a + # discussion. + + # AttributeError: 'module' object has no attribute 'test_darcsver' + doCheck = false; + + meta = with stdenv.lib; { + description = "Darcsver, generate a version number from Darcs history"; + homepage = https://pypi.python.org/pypi/darcsver; + license = "BSD-style"; + }; +} diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 70647b6377fcada787545deac835662e58dd01c9..5527e4617e7c8c10a5f8b6ac72da49b5de815520 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.15.4"; + version = "0.17.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cb93b8260f5f854ccf26b52bdc700600a08e6b7527085c7b7d63c04238bab9ea"; + sha256 = "27e470b8cfdd0516189e641b1213fceec0ddc4f37ead1fbce733d3381134fccd"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..35d830f81b5890cc9fd99aa4509eee609d0520de --- /dev/null +++ b/pkgs/development/python-modules/datadog/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +, decorator, requests, simplejson +, nose, mock }: + +buildPythonPackage rec { + pname = "datadog"; + version = "0.20.0"; + + # no tests in PyPI tarball + # https://github.com/DataDog/datadogpy/pull/259 + src = fetchFromGitHub { + owner = "DataDog"; + repo = "datadogpy"; + rev = "v${version}"; + sha256 = "1p4p14853yrsl8py4ca7za7a12qzw0xwgz64f5kzx8a6vpv3p3md"; + }; + + propagatedBuildInputs = [ decorator requests simplejson ]; + + checkInputs = [ nose mock ]; + + meta = with lib; { + description = "The Datadog Python library"; + license = licenses.bsd3; + homepage = https://github.com/DataDog/datadogpy; + }; +} diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 81ead843169530df1e698d48eabb8a5db713af42..4fcb38e7b36bc50f1fbdf2710e6e38d6f1319b7c 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest , mock , numpy @@ -8,21 +8,33 @@ , dateutil }: -buildPythonPackage rec { +let + # Fetcher function looks similar to fetchPypi. + # Allows for easier overriding, without having to know + # how the source is actually fetched. + fetcher = {pname, version, sha256}: fetchFromGitHub { + owner = "blaze"; + repo = pname; + rev = version; + inherit sha256; + }; + +in buildPythonPackage rec { pname = "datashape"; - version = "0.5.2"; - name = "${pname}-${version}"; + version = "0.5.4"; - src = fetchPypi { + src = fetcher { inherit pname version; - sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783"; + sha256 = "0rhlj2kjj1vx5m73wnc5518rd6cs1zsbgpsvzk893n516k69shcf"; }; checkInputs = [ pytest mock ]; propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + # Disable several tests + # https://github.com/blaze/datashape/issues/232 checkPhase = '' - py.test datashape/tests + py.test -k "not test_validate and not test_nested_iteratables and not test_validate_dicts and not test_tuples_can_be_records_too" datashape/tests ''; meta = { diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fdc408e1c4c10c7600399035b0aee7fd62c8b168 --- /dev/null +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -0,0 +1,42 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k +, nose +, parameterized +, mock +, glibcLocales +, six +, jdatetime +, dateutil +, umalqurra +, pytz +, tzlocal +, regex +, ruamel_yaml }: + +buildPythonPackage rec { + pname = "dateparser"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "940828183c937bcec530753211b70f673c0a9aab831e43273489b310538dff86"; + }; + + checkInputs = [ nose mock parameterized six glibcLocales ]; + preCheck ='' + # skip because of missing convertdate module, which is an extra requirement + rm tests/test_jalali.py + ''; + + propagatedBuildInputs = [ + # install_requires + dateutil pytz regex tzlocal + # extra_requires + jdatetime ruamel_yaml umalqurra + ]; + + meta = with lib; { + description = "Date parsing library designed to parse dates from HTML pages"; + homepage = https://github.com/scrapinghub/dateparser; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/dateutil/1_5.nix b/pkgs/development/python-modules/dateutil/1_5.nix new file mode 100644 index 0000000000000000000000000000000000000000..6580b0e10070ac2df210c8802416478357566b1f --- /dev/null +++ b/pkgs/development/python-modules/dateutil/1_5.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six }: + +buildPythonPackage rec { + pname = "python-dateutil"; + version = "1.5"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Powerful extensions to the standard datetime module"; + homepage = https://pypi.python.org/pypi/python-dateutil; + license = "BSD-style"; + }; +} diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f9ac491dc81d25cdaab29f0f87ac6c18afebbc89 --- /dev/null +++ b/pkgs/development/python-modules/datrie/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestrunner, hypothesis}: + +buildPythonPackage rec { + pname = "datrie"; + version = "0.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; + }; + + buildInputs = [ pytest pytestrunner hypothesis ]; + + meta = with stdenv.lib; { + description = "Super-fast, efficiently stored Trie for Python"; + homepage = "https://github.com/kmike/datrie"; + license = licenses.lgpl2; + maintainers = with maintainers; [ lewo ]; + }; +} diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 2343ea2918b1b28f78a5a22e09fadbaaecf5cf0a..cdcc313ed82d9d0a61cd22dea30f38d0958ab97f 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: buildPythonPackage rec { pname = "dbf"; - version = "0.96.8"; - name = "${pname}-${version}"; + version = "0.97.2"; src = fetchPypi { inherit pname version; - sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1"; + sha256 = "b4c5165d29f6ca893797974aa9f228d2ad39aa864c166ce5bcb89c636489c8e6"; }; - propagatedBuildInputs = [ aenum ]; + propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; doCheck = !isPy3k; # tests are not yet ported. # https://groups.google.com/forum/#!topic/python-dbase/96rx2xmCG4w + checkPhase = '' + ${python.interpreter} dbf/test.py + ''; + 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"; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index c8f122098da88ab218fcf4904b6f76126e0a8e9a..a0724c9ada59bc84dc36142d99699a3d6f6549a4 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, 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 buildPythonPackage rec { @@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa postPatch = "patchShebangs ."; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus dbus_glib ] + buildInputs = [ dbus dbus-glib ] ++ lib.optionals doCheck [ dbus_tools pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..937b6df4229272ac285d373cc7528f6cc37b4fac --- /dev/null +++ b/pkgs/development/python-modules/debian/default.nix @@ -0,0 +1,14 @@ +{ stdenv, buildPythonPackage, fetchPypi +, chardet, six}: + +buildPythonPackage rec { + pname = "python-debian"; + version = "0.1.32"; + + src = fetchPypi { + inherit pname version; + sha256 = "143887ac647ad30819f289f5a4ca13b77e56df27b686b84c34669447f7591280"; + }; + + propagatedBuildInputs = [ chardet six ]; +} diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e852ac0385ca10604336c7535abf09d9647fff28 --- /dev/null +++ b/pkgs/development/python-modules/decorator/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "decorator"; + version = "4.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "7d46dd9f3ea1cf5f06ee0e4e1277ae618cf48dfb10ada7c8427cd46c42702a0e"; + }; + + meta = { + homepage = https://pypi.python.org/pypi/decorator; + description = "Better living through Python with decorators"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..53286b38722b40aa2e742939c8b6043bc7c7e2b8 --- /dev/null +++ b/pkgs/development/python-modules/deform/default.nix @@ -0,0 +1,41 @@ +{ lib, buildPythonPackage, fetchPypi +, chameleon, colander, iso8601, peppercorn, translationstring, zope_deprecation +, nose, coverage, beautifulsoup4, flaky }: + +buildPythonPackage rec { + pname = "deform"; + version = "2.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "874d3346a02c500432efdcc73b1a7174aa0ea69cd52a99bb9a812967f54f6f79"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "iso8601<=0.1.11" iso8601 + ''; + + propagatedBuildInputs = [ + chameleon + colander + iso8601 + peppercorn + translationstring + zope_deprecation + ]; + + checkInputs = [ + nose + coverage + beautifulsoup4 + flaky + ]; + + meta = with lib; { + description = "Form library with advanced features like nested forms"; + homepage = https://docs.pylonsproject.org/projects/deform/en/latest/; + license = licenses.free; # http://www.repoze.org/LICENSE.txt + maintainers = with maintainers; [ garbas domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6426333ed26a393c6fade1dbdff4071a132f2d4d --- /dev/null +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -0,0 +1,11 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "defusedxml"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4"; + }; +} diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0c06bc55c7a948036b2f12c851ce5f9bb2e27f96 --- /dev/null +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "deluge-client"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "27a7f4c6da8f057e03171a493f17340f39f288199a21beb3226a188ab3c02cea"; + }; + + # it will try to connect to a running instance + doCheck = false; + + meta = with stdenv.lib; { + description = "Lightweight pure-python rpc client for deluge"; + homepage = https://github.com/JohnDoee/deluge-client; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a455db96c22b93fd4f08316fe6c5fa59a754f20c --- /dev/null +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -0,0 +1,34 @@ +{ lib +, pkgs +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "DendroPy"; + version = "4.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bd5b35ce1a1c9253209b7b5f3939ac22beaa70e787f8129149b4f7ffe865d510"; + }; + + prePatch = '' + # Test removed/disabled and reported upstream: https://github.com/jeetsukumaran/DendroPy/issues/74 + rm -f dendropy/test/test_dataio_nexml_reader_tree_list.py + ''; + + preCheck = '' + # Needed for unicode python tests + export LC_ALL="en_US.UTF-8" + ''; + + checkInputs = [ pkgs.glibcLocales ]; + + meta = { + homepage = http://dendropy.org/; + description = "A Python library for phylogenetic computing"; + maintainers = with lib.maintainers; [ unode ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3a0ecffe526aafd43adcb6382041b533342a1139 --- /dev/null +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "derpconf"; + version = "0.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce4f0cd55d367a3357538a18422c916dced0617a00056b4ebabe775059eace4f"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "derpconf abstracts loading configuration files for your app"; + homepage = https://github.com/globocom/derpconf; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ea50eebb38cb4ad73aec41c22f4feb665b4b7db3 --- /dev/null +++ b/pkgs/development/python-modules/detox/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, tox, py, eventlet }: + +buildPythonPackage rec { + pname = "detox"; + version = "0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "4719ca48c4ea5ffd908b1bc3d5d1b593b41e71dee17180d58d8a3e7e8f588d45"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ tox py eventlet ]; + + checkPhase = '' + py.test + ''; + + # eventlet timeout, and broken invokation 3.5 + doCheck = false; + + meta = with stdenv.lib; { + description = "What is detox?"; + homepage = https://bitbucket.org/hpk42/detox; + }; +} diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 67f8debc43a0c8ed1fee8b99becc6c062f568c11..c43d34a9b5550c35d43f5b018d2b713a389d3a5b 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -2,20 +2,18 @@ with pythonPackages;buildPythonPackage rec { pname = "devpi-common"; - version = "3.1.0"; + version = "3.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "d89634a57981ed43cb5dcd25e00c9454ea111189c5ddc08d945b3d5187ada5fd"; + sha256 = "e9afa277a9b227d92335c49fab40be2e9bb112c0f4dda84906c14addb1ded2f7"; }; propagatedBuildInputs = [ requests py ]; checkInputs = [ pytest ]; checkPhase = '' - # Don't know why this test is failing! - substituteInPlace testing/test_request.py --replace "test_env" "noop_test_env" py.test ''; diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/pkgs/development/python-modules/dicttoxml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7d30aad69c456ca7de18cc091983359a0764d9aa --- /dev/null +++ b/pkgs/development/python-modules/dicttoxml/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "dicttoxml"; + version = "1.7.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45"; + }; + + # No tests in archive + doCheck = false; + + meta = { + description = "Converts a Python dictionary or other native data type into a valid XML string"; + homepage = https://github.com/quandyfactory/dicttoxml; + license = lib.licenses.gpl2; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..57f0a1ef2381152ff449ce73c00b586306f7b643 --- /dev/null +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -0,0 +1,36 @@ +{ stdenv, buildPythonPackage, fetchPypi, jinja2, jinja2_pluralize, pygments, + six, inflect, mock, nose, coverage, pycodestyle, flake8, pyflakes, git, + pylint, pydocstyle, fetchpatch, glibcLocales }: + +buildPythonPackage rec { + pname = "diff_cover"; + version = "1.0.2"; + + preCheck = '' + export LC_ALL=en_US.UTF-8; + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "1wbp0kfv2mjxwnq2jlqmwvb71fywwc4x4azxi7ll5dll6nhjyd61"; + }; + + patches = [ + (fetchpatch { + name = "tests-fix.patch"; + url = "https://github.com/Bachmann1234/diff-cover/commit/85c30959c8ed2aa3848f400095a2418f15bb7777.patch"; + sha256 = "0xni4syrxww9kdv8495f416vqgfdys4w2hgf5rdi35hy3ybfslh0"; + }) + ]; + + propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; + + checkInputs = [ mock nose coverage pycodestyle flake8 pyflakes pylint pydocstyle git glibcLocales ]; + + meta = with stdenv.lib; { + description = "Automatically find diff lines that need test coverage"; + homepage = https://github.com/Bachmann1234/diff-cover; + license = licenses.asl20; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e81caa66e5f3036ea2626f0687b34edb3ef8ce6b --- /dev/null +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests, jsonpickle }: + +buildPythonPackage rec { + pname = "python-digitalocean"; + version = "1.13.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h4drpdsmk0b3rlvg6q6cz11k23w0swj1iddk7xdcw4m7r7c52kw"; + }; + + propagatedBuildInputs = [ requests jsonpickle ]; + + # Package doesn't distribute tests. + doCheck = false; + + meta = with stdenv.lib; { + description = "digitalocean.com API to manage Droplets and Images"; + homepage = https://pypi.python.org/pypi/python-digitalocean; + license = licenses.lgpl3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix index d237f366fdf5574b20401d134005da9b5cbcaf33..f3d403d9f2c3a04179719d8fc2b82800d5c0c199 100644 --- a/pkgs/development/python-modules/discid/default.nix +++ b/pkgs/development/python-modules/discid/default.nix @@ -10,15 +10,17 @@ buildPythonPackage rec { sha256 = "78a3bf6c8377fdbe3d85e914a209ff97aa43e35605779639847b510ced31f7b9"; }; - patchPhase = '' - substituteInPlace discid/libdiscid.py \ - --replace '_open_library(_LIB_NAME)' "_open_library('${libdiscid}/lib/libdiscid.so.0')" - ''; + patchPhase = + let extension = stdenv.hostPlatform.extensions.sharedLibrary; in + '' + substituteInPlace discid/libdiscid.py \ + --replace "_open_library(_LIB_NAME)" \ + "_open_library('${libdiscid}/lib/libdiscid${extension}')" + ''; 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 e11ee54f1a6f447babda34891edd1bcb605c50b5..e548781fde62432c0681c7764331eff179e830c8 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , pythonOlder , withVoice ? true, libopus @@ -9,14 +9,12 @@ , pynacl }: -let +buildPythonPackage rec { pname = "discord.py"; version = "0.16.12"; -in buildPythonPackage rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108"; }; @@ -38,5 +36,9 @@ in buildPythonPackage rec { description = "A python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; license = lib.licenses.mit; + + # discord.py requires websockets<4.0 + # See https://github.com/Rapptz/discord.py/issues/973 + broken = true; }; } diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 49349839331dd471ffd47de0fe3ded48cdd7ee2a..da6984c9be9e4f8bc6fa4960d98fe83bda2ff0ca 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "distro"; - version = "1.0.4"; + version = "1.2.0"; buildInputs = [ pytest pytestcov tox]; @@ -14,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9b000b0d637bb0cbd130a7a4835681e6993e309a85564dfea9d884825fe46954"; + sha256 = "d94370e43b676ac44fbe1ab68ca903a6147eaba3a9e8eff85b2c05556a455b76"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f334b7efeac6697a2cb9d9f931d3bf486f090eb9 --- /dev/null +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "dj-database-url"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163"; + }; + + # Tests access a DB via network + doCheck = false; + + meta = with lib; { + description = "Use Database URLs in your Django Application"; + homepage = https://github.com/kennethreitz/dj-database-url; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 13f35d110c7ac3296413e457bc60a9653f4b0522..9d1161fca3b65d3ceb33a7df392112903b3a03fe 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A collection of custom extensions for the Django Framework"; homepage = https://github.com/django-extensions/django-extensions; - licenses = [ licenses.mit ]; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b2d28229d94b98268ecb3ff486d4e05dab9da00c --- /dev/null +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, python, + django_hijack, django_nose }: +buildPythonPackage rec { + pname = "django-hijack-admin"; + version = "2.1.5"; + name = "${pname}-${version}"; + + # the pypi packages don't include everything required for the tests + src = fetchFromGitHub { + owner = "arteria"; + repo = "django-hijack-admin"; + rev = "v${version}"; + sha256 = "02j75blvkjiz5mv5wc4jxl27rgmjsrl6l67a3p8342jwazzsm6jg"; + }; + + checkInputs = [ django_nose ]; + propagatedBuildInputs = [ django_hijack ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} runtests.py hijack_admin + runHook postCheck + ''; + + meta = with stdenv.lib; { + description = "Admin integration for django-hijack"; + homepage = https://github.com/arteria/django-hijack; + license = licenses.mit; + maintainers = with maintainers; [ lsix ]; + }; +} diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 8eb98924491ac8022710fa70f831c96e0353ee2d..1634e676952b7dc01ade24529e584a4576635135 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -2,15 +2,16 @@ django, django_compat, django_nose }: buildPythonPackage rec { - name = "django-hijack-${version}"; - version = "2.1.4"; + pname = "django-hijack"; + version = "2.1.5"; + name = pname + "-" + version; # the pypi packages don't include everything required for the tests src = fetchFromGitHub { owner = "arteria"; repo = "django-hijack"; rev = "v${version}"; - sha256 = "1wbm6l8mzpkj4wsj4fyfamzpzi3day2v1cva5j89v4dn4403jq21"; + sha256 = "1paiyxhc034336xcd9yzf3azpsapsv26j7w2baxiby71z2hhg0sj"; }; checkInputs = [ django_nose ]; @@ -36,4 +37,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ ris ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index c4d993ac03ba0af78ebec9fcb5026638fc7d7c2a..1f3aedab8102695710fe8e520ede7537b122b4ee 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "django-ipware"; name = "${pname}-${version}"; - version = "1.1.6"; + version = "2.0.1"; meta = { description = "A Django application to retrieve user's IP address"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "00zah4g2h93nbsijz556j97v9qkn9sxcia1a2wrwdwnav2fhzack"; + sha256 = "3fba8821298c8533ce5609debf31dc8a22f228c50e100f42d97637a9f9357d43"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index aabfecfcacc7601aaa56551ce49d47a30a8d8c06..b8b632e1a182194b1400bc87967b74d778b19ad7 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "django-jinja"; name = "${pname}-${version}"; - version = "2.2.2"; + version = "2.4.1"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "099b99iprkvlsndrjmw4v3i3i60i9gm1aq5r88z15r7vgmv6sigj"; + sha256 = "8a49d73de616a12075eee14c6d3bbab936261a463457d40348d8b8e2995cfbed"; }; buildInputs = [ django pytz tox ]; diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..58e9d746b97f41f36b03705bab1741ad9400e68f --- /dev/null +++ b/pkgs/development/python-modules/django-pipeline/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +, django, futures, mock, jinja2, jsmin, slimit }: + +buildPythonPackage rec { + pname = "django-pipeline"; + version = "1.6.14"; + + # no tests on PyPI + src = fetchFromGitHub { + owner = "jazzband"; + repo = pname; + rev = version; + sha256 = "1xf732bd17mgha75jfhlnms46ib2pffhpfa0ca7bmng9jhbvsl9j"; + }; + + postPatch = '' + substituteInPlace tests/tests/test_compiler.py \ + --replace "/usr/bin/env" "" + ''; + + propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures; + + checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock; + + checkPhase = '' + export PYTHONPATH=.:$PYTHONPATH + export DJANGO_SETTINGS_MODULE=tests.settings + ${django}/bin/django-admin.py test tests + ''; + + meta = with lib; { + description = "Pipeline is an asset packaging library for Django"; + homepage = https://github.com/cyberdelia/django-pipeline; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index e2fedfdaaf3e3b3a96c5a0b0cada5657ef2d6c73..2cd112d8150e03cef008637516875efb31c100e5 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -1,18 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, django }: +{ stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }: buildPythonPackage rec { pname = "django-polymorphic"; - version = "1.3"; - name = "${pname}-${version}"; + version = "2.0.2"; - src = fetchPypi { - inherit pname version; - sha256 = "8737b465ebf5fad772b4c52272189c352f5904f468d298584a3469187e3207ad"; + # PyPI tarball is missing some test files + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "18p84kdwpfp423vb2n38h840mj3bq0j57jx3cry7c8dznpi0vfi2"; }; - checkInputs = [ django ]; + checkInputs = [ dj-database-url ]; propagatedBuildInputs = [ django ]; + checkPhase = '' + ${python.interpreter} runtests.py + ''; + meta = { homepage = https://github.com/django-polymorphic/django-polymorphic; description = "Improved Django model inheritance with automatic downcasting"; diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 2fe45b7a1f6216332f1671638dc6fd34bd7d373c..8dead5644858ae857011e9cd23838b68b6dcb969 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,14 +6,13 @@ buildPythonPackage rec { pname = "Django"; - name = "${pname}-${version}"; - version = "1.11.7"; + version = "1.11.12"; disabled = pythonOlder "2.7"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "16ab3p6jj1da94wkz2b5fb128ycy4826bbsnbabcd3qdaf9f6649"; + url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; + sha256 = "1szjha338grhf9dq0wpbrqwvak597shsx474pm5j67kn09xqqfad"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix new file mode 100644 index 0000000000000000000000000000000000000000..89bd0407ca001f5a3124656a1fdceab220be97cd --- /dev/null +++ b/pkgs/development/python-modules/django/2_0.nix @@ -0,0 +1,44 @@ +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, + isPy3k, + geos, gdal, pytz, + withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + name = "${pname}-${version}"; + version = "2.0.4"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "d81a1652963c81488e709729a80b510394050e312f386037f26b54912a3a10d0"; + }; + + patches = stdenv.lib.optionals withGdal [ + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ]; + + # 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 = with stdenv.lib; { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + license = licenses.bsd3; + maintainers = with maintainers; [ georgewhewell ]; + }; +} diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index e83076674e8a1c077b52cf947e26792e2be0f8ae..d2f8361bc7d69019b4ee3a5bf588094eb788cccd 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ django six ]; checkPhase = '' - ${python.interpreter} nix_run_setup.py test --addopts="--ignore build" + ${python.interpreter} nix_run_setup test --addopts="--ignore build" ''; meta = with stdenv.lib; { description = "Per object permissions for Django"; homepage = https://github.com/django-guardian/django-guardian; - licenses = [ licenses.mit licenses.bsd2 ]; + license = [ licenses.mit licenses.bsd2 ]; }; } diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 5c00ef60417736f2b029eb3570cd09576750552a..3cbf6d2ce713254375b6ec19f97b8246fc20a931 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -2,12 +2,12 @@ mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; - version = "4.8.0"; + version = "4.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5229da5b07ccb8d3e3e9ee098c0b7c03e20eba48634bc456697dd73d62c68b19"; + sha256 = "15b47faef6aefaa3f47135a2aeb67372da300e4a4cf06809c66ab392686a2155"; }; doCheck = false; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 62e291306d8c4becec531e0a11130466ea063870..81f406c9ef2e8e285e47c87fdf82e77b843774d8 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, django }: buildPythonPackage rec { - version = "3.7.1"; + version = "3.8.2"; pname = "djangorestframework"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "305b2c6564ca46d3b558ba21110ed717135c467adf1a6dfd192bd85f4bb04d50"; + sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 30baed39bd6fb9bd0a52e0a2c0a40ac0425562a9..177e697aab9f73a1b77b7d0cbe52d51b43be5bbd 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, openssl, makeWrapper, buildPythonApplication -, pytest, dns }: +, pytest, dnspython }: buildPythonApplication rec { - name = "${pname}-${majorversion}.${minorversion}"; + name = "${pname}-${version}"; pname = "dkimpy"; majorversion = "0.6"; minorversion = "2"; + version = "${majorversion}.${minorversion}"; src = fetchurl { url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz"; @@ -13,7 +14,7 @@ buildPythonApplication rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ openssl dns ]; + propagatedBuildInputs = [ openssl dnspython ]; patchPhase = '' substituteInPlace dknewkey.py --replace \ diff --git a/pkgs/development/python-modules/dmenu/default.nix b/pkgs/development/python-modules/dmenu/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d7ec8161ef5e625fd6da7b419626a4e2d0b14518 --- /dev/null +++ b/pkgs/development/python-modules/dmenu/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, lib, fetchPypi, dmenu }: + +buildPythonPackage rec { + pname = "dmenu-python"; + version = "0.2.1"; + + src = fetchPypi { + inherit version; + pname = "dmenu"; + sha256 = "06v2fq0ciallbib7sbk4kncj0n3gdqp1kz8n5k2669x49wyh34wm"; + }; + + propagatedBuildInputs = [ dmenu ]; + + # No tests existing + doCheck = false; + + meta = { + description = "A Python wrapper for dmenu"; + homepage = http://dmenu.readthedocs.io; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/dns/default.nix b/pkgs/development/python-modules/dnspython/default.nix similarity index 100% rename from pkgs/development/python-modules/dns/default.nix rename to pkgs/development/python-modules/dnspython/default.nix diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9cc510bf9af3f81aaccbf24ccb12e56939cd2f6c --- /dev/null +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "docker-pycreds"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299"; + }; + + # require docker-credential-helpers binaries + doCheck = false; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Python bindings for the docker credentials store API."; + homepage = https://github.com/shin-/dockerpy-creds; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/docker-registry-core/default.nix b/pkgs/development/python-modules/docker-registry-core/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad9968af173ccdce9b24ae3a3f65b4e16ac4f516 --- /dev/null +++ b/pkgs/development/python-modules/docker-registry-core/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, boto, redis, setuptools, simplejson }: + +buildPythonPackage rec { + pname = "docker-registry-core"; + version = "2.0.3"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0q036rr0b5734szkj883hkb2kjhgcc5pm3dz4yz8vcim3x7q0zil"; + }; + + DEPS = "loose"; + + doCheck = false; + propagatedBuildInputs = [ boto redis setuptools simplejson ]; + + patchPhase = "> requirements/main.txt"; + + meta = with stdenv.lib; { + description = "Docker registry core package"; + homepage = https://github.com/docker/docker-registry; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 88d85dad91aa02865971588f50f69373fb0b7dd4..c290c6bd177b8d4cb209e7a677938afe3b229c8b 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -1,15 +1,14 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi , six, requests, websocket_client , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "2.5.1"; + version = "3.2.1"; pname = "docker"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/docker/${name}.tar.gz"; - sha256 = "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880"; + src = fetchPypi { + inherit pname version; + sha256 = "0d698c3dc4df66c988de5df21a62cdc3450de2fa8523772779e5e23799c41f43"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index 91a0c4183c9b67c475de238d2cea61c49f6ff438..a739c341b62d7e9bef54718fe613e25f263c2de3 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -3,21 +3,20 @@ , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests , six, texttable, websocket_client, cached-property -, enum34, functools32 +, enum34, functools32, }: buildPythonApplication rec { - version = "1.15.0"; + version = "1.20.1"; pname = "docker-compose"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg"; + sha256 = "34c043ebd4c23e4b864812c16b41dad25cec6b675557b180ced52d372e1a9e66"; }; # lots of networking and other fails doCheck = false; - buildInputs = [ mock pytest nose ]; + checkInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker ipaddress jsonschema requests six texttable websocket_client @@ -26,7 +25,7 @@ buildPythonApplication rec { stdenv.lib.optional (pythonOlder "3.4") enum34 ++ stdenv.lib.optional (pythonOlder "3.2") functools32; - patchPhase = '' + postPatch = '' # Remove upper bound on requires, see also # https://github.com/docker/compose/issues/4431 sed -i "s/, < .*',$/',/" setup.py @@ -41,7 +40,6 @@ buildPythonApplication rec { homepage = https://docs.docker.com/compose/; description = "Multi-container orchestration for Docker"; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f7a64481c663be15946b6e554b79511091645660 --- /dev/null +++ b/pkgs/development/python-modules/dockerpty/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "dockerpty"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; + homepage = https://github.com/d11wtq/dockerpty; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..61c71d87c5333882e70f9474ecc436ad1f5fa081 --- /dev/null +++ b/pkgs/development/python-modules/docopt/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "docopt"; + version = "0.6.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "14f4hn6d1j4b99svwbaji8n2zj58qicyz19mm0x6pmhb50jsics9"; + }; + + meta = with stdenv.lib; { + description = "Pythonic argument parser, that will make you smile"; + homepage = http://docopt.org/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f3be88987606cf88024899194553ab33f9baa226 --- /dev/null +++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "doctest-ignore-unicode"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m9aa4qnyj21lbq4sbvmv1vcz7zksss4rz37ddf2hxv4hk8b547w"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "Add flag to ignore unicode literal prefixes in doctests"; + license = with licenses; [ asl20 ]; + homepage = https://github.com/gnublade/doctest-ignore-unicode; + }; +} diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 657a4db4115971cb69e6de615f978a307d64d9a8..bb9bc62d9405235bbe6d995c09dcc53ec3be1293 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.6.4"; + version = "0.6.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a73aa3049cd88d7ec57a1c2e8946abdf4f14188d429c1023943fcc55c4568da1"; + sha256 = "631197e78b4471bb0e93d0a86264c45736bc9ae43b4205d581dcc34fbe9b5f31"; }; # Disable concurrency tests that often fail, diff --git a/pkgs/development/python-modules/dogpile.core/default.nix b/pkgs/development/python-modules/dogpile.core/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..622954f614490f051163e8b3675b2676f8dd4684 --- /dev/null +++ b/pkgs/development/python-modules/dogpile.core/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "dogpile.core"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xpdvg4kr1isfkrh1rfsh7za4q5a5s6l2kf9wpvndbwf3aqjyrdy"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; + homepage = https://bitbucket.org/zzzeek/dogpile.core; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1be9e34ec18fc04f66155fe2aa01c4e5afeb00b9 --- /dev/null +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytestrunner, requests, urllib3, mock, setuptools }: + +buildPythonPackage rec { + pname = "dropbox"; + version = "8.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "019f1529631d335f2b57ffd65a4545406bd3d139d0a9611cb6ca8c66c4ae7309"; + }; + + # Set DROPBOX_TOKEN environment variable to a valid token. + doCheck = false; + + buildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ requests urllib3 mock setuptools ]; + + meta = with stdenv.lib; { + description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; + homepage = https://www.dropbox.com/developers/core/docs; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..27b1a3e6122c399eadd016317184ff1f0da4492f --- /dev/null +++ b/pkgs/development/python-modules/dugong/default.nix @@ -0,0 +1,13 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "dugong"; + version = "3.5"; + + disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 + + src = fetchPypi { + inherit pname version; + sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24"; + }; +} diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 422674152a68953a78eda2d4c30baa252bad8c50..80a42ac30fd52aa3ae021a2cb7eadb56e357c095 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -1,21 +1,23 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi +, urllib3, certifi , gevent, geventhttpclient, mock, fastimport , git, glibcLocales }: buildPythonPackage rec { - version = "0.18.5"; + version = "0.19.2"; pname = "dulwich"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/dulwich/${name}.tar.gz"; - sha256 = "838bac318fd0ed79e0eedb6cfd53b6424dc618fec6b99dc959881b12da7bd6e0"; + src = fetchPypi { + inherit pname version; + sha256 = "c51e10c260543240e0806052af046e1a78b98cbe1ac1ef3880a78d2269e09da4"; }; LC_ALL = "en_US.UTF-8"; + propagatedBuildInputs = [ urllib3 certifi ]; + # Only test dependencies - buildInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; + checkInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 881f51b69aa0dac0f1964aefac951ab3f3657c9c..efb9cab8048d5641fab1466619ed7d6f0059f932 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "dyn"; - version = "1.8.0"; + version = "1.8.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "4ab3cd9a1478674cf2d2aa6740fb0ddf77daaa9ab3e35e5d2bc92f60301f8523"; + sha256 = "e112149d48b4500c18b3cfb6e0e6e780bb5aa0e56ff87cac412280200b9ec8bf"; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 38e201849c1902696e851796a012dd140b761c61..fbe5c02771db88f30291533a977564a638d5d191 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; name = "${pname}-${version}"; - version = "2.4.2"; + version = "2.5"; meta = { description = "Easy thumbnails for Django"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8cad7ea4fb2b800284e842d8a44f685cbc1968535be04c24a4bbf6e6dbc550c4"; + sha256 = "e244d1f26027fc32c6ca60ffb0169a39099446f614b0433e907a2588ae7d9b95"; }; propagatedBuildInputs = [ django pillow ]; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..dc5784aafb7e3e1653cff1f67324e01282061904 --- /dev/null +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "EasyProcess"; + version = "0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "07z6485bjxkmx26mp1p1ww19d10qavw0s006bidzailsvk543qll"; + }; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Easy to use python subprocess interface"; + homepage = https://github.com/ponty/EasyProcess; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; +} diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 6fd445a89f5a92981e1f618372d1710233c1d1ea..334778c93aab4d27e6b0b17fa7850ff7490d272c 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchPypi, buildPythonPackage, hidapi +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi , pycrypto, pillow, protobuf, future, ecpy }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "ECPy"; - version = "0.8.1"; + version = "0.9.0"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0ab60sx4bbsmccwmdvz1023r0cbzi4phar4ipzn5npdj5gw1ny4l"; + sha256 = "ef41346ae24789699f3bc3ddefbfac03ad6b73b7d3d19b998ba9ce47b67c7277"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ]; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index d29174209a9d78ce2ca280034403b5a197d5b8e3..b09bef9fec4e65343c63e9ad1aec5eeecdad16af 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.3.4"; + version = "1.3.5"; name = "${pname}-${version}"; disabled = !(isPy27 || pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "10d6d7886235f4b9fa4ba401daef87c27937a04d2763f507643d730e51de37b6"; + sha256 = "3818b39e77c26fc1a37767a74fdd5e7d02877d75ed901ead2f40bd03baaa109f"; }; # disabled for now due to Tensorflow trying to create files in $HOME: diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cf87bc66885dac075b3a7525c6f5f8e666589368 --- /dev/null +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, click +, certifi +, voluptuous +, pyyaml +, elasticsearch +, nosexcover +, coverage +, nose +, mock +, funcsigs +} : + +buildPythonPackage rec { + pname = "elasticsearch-curator"; + version = "5.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "2d2762fa55613855b0a04f22e1c6c2c5b53d60301b437205d0e2533e4185671a"; + }; + + # The integration tests require a running elasticsearch cluster. + postUnpackPhase = '' + rm -r test/integration + ''; + + propagatedBuildInputs = [ + click + certifi + voluptuous + pyyaml + elasticsearch + ]; + + checkInputs = [ + nosexcover + coverage + nose + mock + funcsigs + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/elastic/curator; + description = "Curate, or manage, your Elasticsearch indices and snapshots"; + license = licenses.asl20; + longDescription = '' + Elasticsearch Curator helps you curate, or manage, your Elasticsearch + indices and snapshots by: + + * Obtaining the full list of indices (or snapshots) from the cluster, as the + actionable list + + * Iterate through a list of user-defined filters to progressively remove + indices (or snapshots) from this actionable list as needed. + + * Perform various actions on the items which remain in the actionable list. + ''; + maintainers = with maintainers; [ basvandijk ]; + }; +} diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..502da4b1b604f1d726a87eeae184b741963a589c --- /dev/null +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, fetchPypi +, urllib3, requests +, nosexcover, mock +, stdenv +}: + +buildPythonPackage (rec { + pname = "elasticsearch"; + version = "6.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b106fa3e01750376a42f8a9882bd84d630fda58c7aba38b4fec797d11c0bd0a2"; + }; + + # 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 = [ urllib3 requests ]; + buildInputs = [ nosexcover mock ]; + + meta = with stdenv.lib; { + description = "Official low-level client for Elasticsearch"; + homepage = https://github.com/elasticsearch/elasticsearch-py; + license = licenses.asl20; + maintainers = with maintainers; [ desiderius ]; + }; +}) diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 4fc78d8bd1e15c9baadcb50a3663ca24fc8effb7..cf03a02129d4446b7cc1f4263329aaf614049de4 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dns, idna, ipaddress }: +{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }: buildPythonPackage rec { pname = "email_validator"; @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ - dns + dnspython idna ] ++ (if isPy3k then [ ] else [ ipaddress ]); diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 321259d993956e0762f1c8c880b73b7113c6ee91..d7cce7b906b0aabb1395a622d9f1bf0aeef67926 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "emoji"; name = "${pname}-${version}"; - version = "0.4.5"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "13i9mgkpll8m92b8mgm5yab4i78nwsl9h38nriavg105id94mg6q"; + sha256 = "001b92b9c8a157e1ca49187745fa450513bc8b31c87328dfd83d674b9d7dfa63"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index d812fd55a88710021a3e9f9cbbbf8a7557fae3b9..c4f5410bc5182f8ce7b867a3a1378a2ef53deafc 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -3,12 +3,12 @@ , fetchPypi , configparser , pytest +, isPy3k }: buildPythonPackage rec { pname = "entrypoints"; version = "0.2.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest]; - propagatedBuildInputs = [ configparser ]; + propagatedBuildInputs = [] ++ lib.optional (!isPy3k) [ configparser ]; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6b1d2af357a4cf61d3279cd380ea610572e36749 --- /dev/null +++ b/pkgs/development/python-modules/enum-compat/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, enum34 }: + +buildPythonPackage rec { + pname = "enum-compat"; + version = "0.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "14j1i963jic2vncbf9k5nq1vvv8pw2zsg7yvwhm7d9c6h7qyz74k"; + }; + + propagatedBuildInputs = [ enum34 ]; + + meta = with lib; { + homepage = https://github.com/jstasiak/enum-compat; + description = "enum/enum34 compatibility package"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7b6159d0e6169cad977ed91c4a61f51832b27315 --- /dev/null +++ b/pkgs/development/python-modules/envs/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, click, jinja2, terminaltables }: + +buildPythonPackage rec { + pname = "envs"; + version = "1.2.4"; + + # move to fetchPyPi when https://github.com/capless/envs/issues/8 is fixed + src = fetchFromGitHub { + owner = "capless"; + repo = "envs"; + rev = "e1f6cbad7f20316fc44324d2c50826d57c2817a8"; + sha256 = "0p88a79amj0jxll3ssq1dzg78y7zwgc8yqyr7cf53nv2i7kmpakv"; + }; + + checkInputs = [ click jinja2 terminaltables ]; + + meta = with lib; { + description = "Easy access to environment variables from Python"; + homepage = https://github.com/capless/envs; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..472a630549b267b5ef645143c51af6dc0321c215 --- /dev/null +++ b/pkgs/development/python-modules/evdev/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, isPy34, fetchPypi, linuxHeaders }: + +buildPythonPackage rec { + pname = "evdev"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "3f10c22f15ffedb34519e4af2201f1a088a958efedfd50da0da1aa3887283dff"; + }; + + buildInputs = [ linuxHeaders ]; + + patchPhase = '' + substituteInPlace setup.py --replace /usr/include/linux ${linuxHeaders}/include/linux + ''; + + doCheck = false; + + disabled = isPy34; # see http://bugs.python.org/issue21121 + + meta = with lib; { + description = "Provides bindings to the generic input event interface in Linux"; + homepage = http://pythonhosted.org/evdev; + license = licenses.bsd3; + maintainers = with maintainers; [ goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 1a9b684a9f343600de1ab7cbd64bd4ff99bb6cb6..664322362b25d1ed9c364e1efd676f0a62a71046 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "Eve"; - version = "0.7.4"; + version = "0.7.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0xihl5w2m4vkp0515qjibiy88pk380n5jmj8n9hh7q40b1vx1kwb"; + sha256 = "af373ab7b9611990d39b090eed372a0860d4e12a1c8a6ef49fdee29e4626053f"; }; patches = [ diff --git a/pkgs/development/python-modules/ewmh/default.nix b/pkgs/development/python-modules/ewmh/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a24d049fc229491693f4a4ff6d44de7689a210dd --- /dev/null +++ b/pkgs/development/python-modules/ewmh/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, xlib }: + +buildPythonPackage rec { + pname = "ewmh"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0g9l14my3v8zlgq1yd8wh5gpara0qcapsfmvg7lq2lapglzhjsy5"; + }; + + propagatedBuildInputs = [ xlib ]; + + # No tests included + doCheck = false; + + meta = { + homepage = https://github.com/parkouss/pyewmh; + description = "An implementation of EWMH (Extended Window Manager Hints), based on Xlib"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ bandresen ]; + }; +} diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..adcc43f265096f76ad85d018637cf503d662951c --- /dev/null +++ b/pkgs/development/python-modules/extras/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "extras"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; + homepage = https://code.google.com/p/mimeparse/; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d1d8e8535a480caf61808dc0aef454b4eaef62ba --- /dev/null +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy +, face_recognition_models, stdenv, flake8, tox, pytest, glibcLocales +}: + +buildPythonPackage rec { + pname = "face_recognition"; + version = "1.2.2"; + + src = fetchFromGitHub { + repo = pname; + owner = "ageitgey"; + rev = "v${version}"; + sha256 = "17jnyr80j1p74gyvh1jabvwd3zsxvip2y7cjhh2g6gsjv2dpvrjv"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "flake8==2.6.0" "flake8" + ''; + + propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ]; + + checkInputs = [ flake8 tox pytest glibcLocales ]; + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test + ''; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://github.com/ageitgey/face_recognition; + maintainers = with maintainers; [ ma27 ]; + description = "The world's simplest facial recognition api for Python and the command line"; + }; +} diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..960bffb903d63c7d0a87c605db98cd3b407647ab --- /dev/null +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, stdenv, fetchPypi }: + +buildPythonPackage rec { + pname = "face_recognition_models"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kwnv3qpy5bhspk780bkyg8jd9n5f6p91ja6sjlwk1wcm00d56xp"; + }; + + # no module named `tests` as no tests are available + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ageitgey/face_recognition_models; + license = licenses.cc0; + maintainers = with maintainers; [ ma27 ]; + description = "Trained models for the face_recognition python library"; + }; +} diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 02926e0fd7438d56bca7dc2ba81a54d3dec4ee59..7a7d24d070cba135a7e672a8e25408ae652e9648 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, # Build inputs - dateutil, six, ipaddress ? null, + dateutil, six, text-unidecode, ipaddress ? null, # Test inputs email_validator, nose, mock, ukpostcodeparser }: @@ -8,12 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.6"; - name = "${pname}-${version}"; + version = "0.8.12"; src = fetchPypi { inherit pname version; - sha256 = "3c98dd04bba667ecfddb77fcd0dfd19b376b258d21beeaf5b95578826e275a83"; + sha256 = "9cc12b821f32ff45f6edfdc1ab7be3893b60b1224e952d68322a57e5b26a4a15"; }; checkInputs = [ @@ -26,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dateutil six + text-unidecode ] ++ lib.optional (pythonOlder "3.3") ipaddress; meta = with lib; { diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index ee1048ec5fac1b49df34f62f62bc87c40d4f4a48..44f7bcdab068845062f8b4a7a316843e8e26f765 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, python, fetchurl }: +{ stdenv, buildPythonPackage, python, fetchPypi}: buildPythonPackage rec { - name = "fastimport-${version}"; + pname = "fastimport"; version = "0.9.6"; - src = fetchurl { - url = "mirror://pypi/f/fastimport/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43"; }; diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..848f01d6e16b711b866a9f75d278f2a3d10b6c18 --- /dev/null +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "fastrlock"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "00mr9b15d539z89ng5nf89s2ryhk90xwx95jal77ma0wslixrk5d"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/scoder/fastrlock; + description = "A fast RLock implementation for CPython"; + license = licenses.mit; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix index f8d877f0655b0f56d63a0e57f138316a5a3abb11..1fc1aea94d577680c023aaebb9315ad621846cc5 100644 --- a/pkgs/development/python-modules/faulthandler/default.nix +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -1,15 +1,25 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchPypi, buildPythonPackage, fetchpatch }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "faulthandler"; - version = "2.6"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "0zywq3jaznddvqc3hnfrlv24wmpyq4xgajk9xhv6578qw1rpfj2r"; + sha256 = "acc10e10909f0f956ba1b42b6c450ea0bdaaa27b3942899f65931396cfcdd36a"; }; + patches = [ + (fetchpatch { + url = https://github.com/vstinner/faulthandler/commit/67b661e.patch; + sha256 = "1nn8c9nq5qypja949hzz0n4yprsyr63wihf5g3gwrinm2nkjnnv7"; + }) + (fetchpatch { + url = https://github.com/vstinner/faulthandler/commit/07cbb7b.patch; + sha256 = "0fh6rjyjw7z1hsiy3sgdc8j9mncg1vlv3y0h4bplqyw18vq3srb3"; + }) + ]; + meta = { description = "Dump the Python traceback"; license = stdenv.lib.licenses.bsd2; diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/python-modules/fedpkg/default.nix index c3aeed0abbeb60de3c2cf537daf81a597330625f..0230466e6e36a51e7f68787f345f72e49e506c6d 100644 --- a/pkgs/development/python-modules/fedpkg/default.nix +++ b/pkgs/development/python-modules/fedpkg/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Subclass of the rpkg project for dealing with rpm packaging"; homepage = https://pagure.io/fedpkg; license = licenses.gpl2; - maintainers = with maintainers; [ mornfall ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..46d26e80d563e17c043ad49a779b17b028d94ff6 --- /dev/null +++ b/pkgs/development/python-modules/filelock/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "filelock"; + version = "3.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "011327d4ed939693a5b28c0fdf2fd9bda1f68614c1d6d0643a89382ce9843a71"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/benediktschmitt/py-filelock; + description = "A platform independent file lock for Python"; + license = licenses.unlicense; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 5c150844c8454c209845fc8b5a2b73c07683155a..bd249dea5d248d72c230bd86b91620e744b994ff 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.7.10.post1"; + version = "1.7.11.post1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "fc4c8996be3131f36c791d66273317d38b72b19dc24c2afc332fd734752eb7a8"; + sha256 = "35df044fa805e6b420450f5d4281fc0edf96e1da0545c31032045cd3cfad3abf"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix index 5ecbff90442d4b9030a4b6816122b7f599542755..16c1d79d767a5d61122049f912f2be52f3cfa157 100644 --- a/pkgs/development/python-modules/first/default.nix +++ b/pkgs/development/python-modules/first/default.nix @@ -1,10 +1,9 @@ { stdenv, buildPythonPackage, fetchPypi }: -let + +buildPythonPackage rec { pname = "first"; version = "2.0.1"; -in -buildPythonPackage { - name = "${pname}-${version}"; + name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fix_swiftclient_mocking.patch b/pkgs/development/python-modules/fix_swiftclient_mocking.patch deleted file mode 100644 index 027ef56b317cb49aebccf673b6c0101f6bf7b810..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/fix_swiftclient_mocking.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f37947a7e083532676a9f2ed079dff6bdc19a8e9 Mon Sep 17 00:00:00 2001 -From: Sabari Kumar Murugesan -Date: Tue, 15 Sep 2015 14:22:11 -0700 -Subject: [PATCH] Fix swift store tests for latest swiftclient - -The latest swiftclient (2.6.0) breaks some of the swift store -tests as a mock function's parameters got changed. - -Change-Id: I36512fbe642f4f12cf1382fdf0e37eccbf1acba4 ---- - glance_store/tests/unit/test_swift_store.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glance_store/tests/unit/test_swift_store.py b/glance_store/tests/unit/test_swift_store.py -index f738cf9..3fe4699 100644 ---- a/glance_store/tests/unit/test_swift_store.py -+++ b/glance_store/tests/unit/test_swift_store.py -@@ -92,7 +92,7 @@ def fake_head_container(url, token, container, **kwargs): - def fake_put_container(url, token, container, **kwargs): - fixture_containers.append(container) - -- def fake_post_container(url, token, container, headers, http_conn=None): -+ def fake_post_container(url, token, container, headers, **kwargs): - for key, value in six.iteritems(headers): - fixture_container_headers[key] = value - diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index c00bf0c8551251e5af5472899db74b07447eb418..32e9a08b74146423cd8078365eb14002656fd6c8 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -1,15 +1,24 @@ -{ lib, fetchurl, buildPythonPackage, flake8, nose }: +{ lib, fetchPypi, buildPythonPackage, flake8, pycodestyle, pytestrunner, pytest }: buildPythonPackage rec { pname = "flake8-debugger"; - name = "${pname}-${version}"; - version = "1.4.0"; - src = fetchurl { - url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz"; - sha256 = "0chjfa6wvnqjnx778qzahhwvjx1j0rc8ax0ipp5bn70gf47lj62r"; + version = "3.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "be4fb88de3ee8f6dd5053a2d347e2c0a2b54bab6733a2280bb20ebd3c4ca1d97"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ flake8 ]; + + nativeBuildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ flake8 pycodestyle ]; + + checkInputs = [ pytest ]; + + # Tests not included in PyPI tarball + # FIXME: Remove when https://github.com/JBKahn/flake8-debugger/pull/15 is merged + doCheck = false; + meta = { homepage = https://github.com/jbkahn/flake8-debugger; description = "ipdb/pdb statement checker plugin for flake8"; diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..79ad50a63ffe2860bc19f60e6cae530505cb72d4 --- /dev/null +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }: + +buildPythonPackage rec { + pname = "flake8-import-order"; + version = "0.17.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "68d430781a9ef15c85a0121500cf8462f1a4bc7672acb2a32bfdbcab044ae0b7"; + }; + + propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; + + checkInputs = [ pytest flake8 pycodestyle pylama ]; + + checkPhase = '' + pytest --strict + ''; + + meta = with lib; { + description = "Flake8 and pylama plugin that checks the ordering of import statements"; + homepage = https://github.com/PyCQA/flake8-import-order; + license = with licenses; [ lgpl3 mit ]; + }; +} diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..27d8f9c40c656503a0ca8f9fab61191b3847e980 --- /dev/null +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, flask, webassets, flask_script, nose }: + +buildPythonPackage rec { + name = "Flask-Assets-${version}"; + version = "0.12"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; + sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; + }; + + propagatedBuildInputs = [ flask webassets flask_script nose ]; + + meta = with lib; { + homepage = https://github.com/miracle2k/flask-assets; + description = "Asset management for Flask, to compress and merge CSS and Javascript files"; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..31fe2a677c39fcb13051a166fc9d57e7bad118de --- /dev/null +++ b/pkgs/development/python-modules/flask-common/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage +, crayons, flask, flask_cache, gunicorn, maya, meinheld, whitenoise }: + +buildPythonPackage rec { + pname = "Flask-Common"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f6ibvkxpxgczxs4qcbh5bj8rf9ggggbagi2dkaphx5w29xbbys4"; + }; + + propagatedBuildInputs = [ crayons flask flask_cache gunicorn maya meinheld whitenoise ]; + + meta = with stdenv.lib; { + description = "Flask extension with lots of common time-savers"; + homepage = https://github.com/kennethreitz/flask-common; + license = licenses.asl20; # XXX: setup.py lists BSD but git repo has Apache 2.0 LICENSE + }; +} diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a60c5a993ea3d6a36ced80f03a42cf3121616ee4 --- /dev/null +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchPypi, buildPythonPackage, flask, limits }: + +buildPythonPackage rec { + pname = "Flask-Limiter"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f0diannnc6rc0ngsh222lws3qf89wxm0aschaxxvwjvybf9iklc"; + }; + + propagatedBuildInputs = [ flask limits ]; + + meta = with stdenv.lib; { + description = "Rate limiting for flask applications"; + homepage = https://flask-limiter.readthedocs.org/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 3c7731c30a8bd725a95ac40978b70876cb35fea3..e2585262e58e99918a373228984c236a668783c9 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,19 +1,19 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast -, flask, nose, mock, blinker}: +, flask, blinker, nose, mock, semantic-version }: buildPythonPackage rec { pname = "Flask-Login"; name = "${pname}-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "maxcountryman"; repo = "flask-login"; rev = version; - sha256 = "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh"; + sha256 = "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9"; }; - buildInputs = [ nose mock ]; + checkInputs = [ nose mock semantic-version ]; propagatedBuildInputs = [ flask blinker ]; checkPhase = "nosetests -d"; diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1f41f79876312bff6837a5a94921cb53724f8c6a --- /dev/null +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, flask, blinker, nose }: + +buildPythonPackage rec { + name = "Flask-Principal-${version}"; + version = "0.4.0"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Principal/${name}.tar.gz"; + sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm"; + }; + + propagatedBuildInputs = [ flask blinker ]; + + checkInputs = [ nose ]; + + meta = with lib; { + homepage = http://packages.python.org/Flask-Principal/; + description = "Identity management for flask"; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..72a3fb0c6f8521ca5bac6c5707e0356b0da80100 --- /dev/null +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, flask, pytest }: + +buildPythonPackage rec { + pname = "Flask-Script"; + version = "2.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf"; + }; + + propagatedBuildInputs = [ flask ]; + checkInputs = [ pytest ]; + + # No tests in archive + doCheck = false; + + meta = with lib; { + homepage = https://github.com/smurfix/flask-script; + description = "Scripting support for Flask"; + license = licenses.bsd3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index 178e000a32edbc47fb80656d8275eff11b87d253..5f843138eae01466679d79eb2c1c811ba1a1a70b 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; buildPythonPackage rec { name = "${pname}-${version}"; pname = "Flask-Testing"; - version = "0.6.2"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1w0dpwvrcpffm8ychyxpm8s5blm7slik9kplh9jb3sgwcv9gyppj"; + sha256 = "dc076623d7d850653a018cb64f500948334c8aeb6b10a5a842bf1bcfb98122bc"; }; postPatch = '' diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 2154feeebb7c5e8916078cd07eb62c748355d6a6..17b9d018c397a168797bacee2f021d819369366a 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -11,6 +11,7 @@ , pytest , testpath , responses +, pytoml }: # Flit is actually an application to build universal wheels. @@ -20,31 +21,28 @@ buildPythonPackage rec { pname = "flit"; - version = "0.11.4"; - name = "${pname}-${version}"; - -# format = "wheel"; + version = "1.0"; src = fetchPypi { inherit pname version; -# url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; - sha256 = "8ba7603cc3bf4149d81811d40fe331abc45ff37a207c63f5f712a0fdb69297bb"; + sha256 = "95b8577b2232da39ee14ae237575b7a85afeeabc1e87f4a19485fac34f85aa89"; }; disabled = !isPy3k; - propagatedBuildInputs = [ docutils requests requests_download ] ++ lib.optional (pythonOlder "3.6") zipfile36; + propagatedBuildInputs = [ docutils requests requests_download pytoml ] ++ lib.optional (pythonOlder "3.6") zipfile36; checkInputs = [ pytest testpath responses ]; # Disable test that needs some ini file. + # Disable test that wants hg checkPhase = '' - py.test -k "not test_invalid_classifier" + py.test -k "not test_invalid_classifier and not test_build_sdist" ''; meta = { description = "A simple packaging tool for simple packages"; homepage = https://github.com/takluyver/flit; license = lib.licenses.bsd3; - maintainer = lib.maintainers.fridh; + maintainers = [ lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 1dfc22f769b454e2853166f2e5b16d2eb7c0ccac..1381fc45c2287f2b06645fc02576388603fc8e51 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -3,16 +3,16 @@ , numpy , pytest , pytestrunner +, glibcLocales }: buildPythonPackage rec { pname = "fonttools"; - version = "3.17.0"; - name = "${pname}-${version}"; + version = "3.25.0"; src = fetchPypi { inherit pname version; - sha256 = "1c4f26bf32cd58d5881bfe1f42e5f0a1637a58452a60ae1623999f3ae7da0e24"; + sha256 = "c1b7eb0469d4e684bb8995906c327109beac870a33900090d64f85d79d646360"; extension = "zip"; }; @@ -23,8 +23,13 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner + glibcLocales ]; + preCheck = '' + export LC_ALL="en_US.UTF-8" + ''; + meta = { homepage = https://github.com/fonttools/fonttools; description = "A library to manipulate font files from Python"; diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c09d54ad555537c7d30715ca73841430cc6fbe08 --- /dev/null +++ b/pkgs/development/python-modules/fpdf/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, writeText, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "fpdf"; + version = "1.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yb73c2clv581sgak5jvlvkj4wy3jav6ms5ia8jx3rw969w40n0j"; + }; + + # No tests available + doCheck = false; + + meta = { + homepage = https://github.com/reingart/pyfpdf; + description = "Simple PDF generation for Python"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6ce069b31910ae07ef3556699ec91251be176dd2 --- /dev/null +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pkgconfig +, gmp +, pari +, mpfr +, fplll +, cython +, cysignals +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "fpylll"; + version = "0.3.0dev"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bjkh02fnxsrxwjzai8ij12zl2wq319z8y25sn9pvvzla5izgnp9"; + }; + + buildInputs = [ + gmp + pari + mpfr + fplll + ]; + + propagatedBuildInputs = [ + cython + cysignals + numpy + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "A Python interface for fplll"; + homepage = https://github.com/fplll/fpylll; + maintainers = with lib.maintainers; [ timokau ]; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ced7d7bdcd4ab5f02e3575503e5916e79b5f2847 --- /dev/null +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, lxml, requests, tkinter }: + +buildPythonPackage rec { + pname = "fritzconnection"; + version = "0.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "14g3sxprq65lxbgkf3rjgb1bjqnj2jc5p1swlq9sk9gwnl6ca3ds"; + }; + + prePatch = '' + substituteInPlace fritzconnection/test.py \ + --replace "from fritzconnection import" "from .fritzconnection import" + ''; + + propagatedBuildInputs = [ lxml requests tkinter ]; + + meta = with stdenv.lib; { + description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol"; + homepage = https://bitbucket.org/kbr/fritzconnection; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index b1ba77ab868cfb4b3ef69fcea8fc5e74e708af30..ca1c9a09e4eb93a5166f19c5c6b2134e8569e894 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -7,18 +7,23 @@ , python , isPy3k }: + buildPythonPackage rec { - name = "${pname}-${version}"; pname = "ftfy"; - # latest is 5.1.1, buy spaCy requires 4.4.3 - version = "5.1.1"; + + version = "4.4.3"; + # ftfy v5 only supports python3. Since at the moment the only + # packages that use ftfy are spacy and textacy which both support + # python 2 and 3, they have pinned ftfy to the v4 branch. + # I propose to stick to v4 until another package requires v5. + # At that point we can make a ftfy_v4 package. src = fetchPypi { inherit pname version; - sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78"; + sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; }; - propagatedBuildInputs = [ html5lib wcwidth]; + propagatedBuildInputs = [ html5lib wcwidth ]; checkInputs = [ nose @@ -32,13 +37,10 @@ buildPythonPackage rec { # FileNotFoundError: [Errno 2] No such file or directory: 'ftfy' doCheck = false; - # "this version of ftfy is no longer written for Python 2" - disabled = !isPy3k; - meta = with stdenv.lib; { description = "Given Unicode text, make its representation consistent and possibly less broken."; homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; - }; + maintainers = with maintainers; [ sdll aborsu ]; + }; } diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d3d338a2c8d34aab64a416df97e5a770c24195fb --- /dev/null +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + version = "3.4"; + pname = "ftputil"; + + src = fetchPypi { + inherit pname version; + sha256 = "374b01e174079e91babe2a462fbd6f6c00dbfbfa299dec04239ca4229fbf8762"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + touch Makefile + # Disable tests that require network access or access /home + py.test test \ + -k "not test_public_servers and not test_real_ftp \ + and not test_set_parser and not test_repr" + ''; + + meta = with lib; { + description = "High-level FTP client library (virtual file system and more)"; + homepage = http://ftputil.sschwarzer.net/; + license = licenses.bsd2; # "Modified BSD license, says pypi" + }; +} diff --git a/pkgs/development/python-modules/futures/default.nix b/pkgs/development/python-modules/futures/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5a774b6fa3d5d515b63f5edd47acfddbb42cae80 --- /dev/null +++ b/pkgs/development/python-modules/futures/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, python }: + +buildPythonPackage rec { + pname = "futures"; + version = "3.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265"; + }; + + # This module is for backporting functionality to Python 2.x, it's builtin in py3k + disabled = isPy3k; + + checkPhase = '' + ${python.interpreter} test_futures.py + ''; + + meta = with lib; { + description = "Backport of the concurrent.futures package from Python 3.2"; + homepage = "https://github.com/agronholm/pythonfutures"; + license = licenses.bsd2; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index ea5fc12e4321d5a740f098b570c542d93f56776f..5186f7b25ea51faef3bc2d271177d90a90e8b58a 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { pname = "gensim"; name = "${pname}-${version}"; - version = "3.0.1"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "4827012f6f020ac4f4067c2a2a88542391917113faaa417505e1ee8a1e7e2650"; + sha256 = "05844c82c7c176449218fd3fc31e55e5d8b3fae460f261b11231f4c8ef2ed5e0"; }; propagatedBuildInputs = [ smart_open numpy six scipy diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index f8f54e0e4294f68b7cded5bbe6a02e949ea38f3c..cab25a60f3b43d05adb6bb1e09f6f1fc76fb0798 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -3,8 +3,9 @@ , pytest }: buildPythonPackage rec { - name = "geopandas-${version}"; + pname = "geopandas"; version = "0.3.0"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "geopandas"; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 8a3d3b3d09b79f9cf33272d604127edc4091ed53..6b94652402e399e8fcbe87a91b4a39bf977c8208 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,20 +1,15 @@ { stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }: buildPythonPackage rec { - name = "gevent-1.1.2"; + pname = "gevent"; + version = "1.2.2"; + name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/g/gevent/${name}.tar.gz"; - sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c"; + sha256 = "0bbbjvi423y9k9xagrcsimnayaqymg6f2dj76m9z3mjpkjpci4a7"; }; - # Why do we have this patch? - postPatch = '' - substituteInPlace libev/ev.c --replace \ - "ecb_inline void ecb_unreachable (void) ecb_noreturn" \ - "ecb_inline ecb_noreturn void ecb_unreachable (void)" - ''; - buildInputs = [ libev ]; propagatedBuildInputs = stdenv.lib.optionals (!isPyPy) [ greenlet ]; diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix index f73ff2b4686d63dbbbc10313ee46433806a633cb..9eb8e3b2d6ce54c551256be179a520a2ef4709ef 100644 --- a/pkgs/development/python-modules/gflags/default.nix +++ b/pkgs/development/python-modules/gflags/default.nix @@ -2,15 +2,14 @@ buildPythonPackage rec { version = "3.1.2"; - name = "gflags-${version}"; + pname = "python-gflags"; src = fetchPypi { - inherit version; - pname = "python-gflags"; + inherit pname version; sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..04fae0db1b7aeec3ca2a1ad5ebde68b5428520ad --- /dev/null +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -0,0 +1,48 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchurl +, utillinux, pygit2, gitMinimal, git-annex }: + +buildPythonPackage rec { + pname = "git-annex-adapter"; + version = "0.2.0"; + + disabled = !isPy3k; + + # There is only a wheel on PyPI - build from source instead + src = fetchFromGitHub { + owner = "alpernebbi"; + repo = pname; + rev = "v${version}"; + sha256 = "1sbgp4ivgw4m8nngrlb1f78xdnssh639c1khv4z98753w3sdsxdz"; + }; + + prePatch = '' + substituteInPlace git_annex_adapter/process.py \ + --replace "'git', 'annex'" "'${git-annex}/bin/git-annex'" \ + --replace "'git-annex'" "'${git-annex}/bin/git-annex'" + ''; + + # TODO: Remove for next version + patches = fetchurl { + url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch"; + sha256 = "1hbw8651amjskakvs1wv2msd1wryrq0vpryvbispg5267rs8q7hp"; + }; + + checkInputs = [ + utillinux # `rev` is needed in tests/test_process.py + ]; + + propagatedBuildInputs = [ pygit2 gitMinimal ]; + + buildInputs = [ git-annex ]; + + checkPhase = '' + python -m unittest + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/alpernebbi/git-annex-adapter; + description = "Call git-annex commands from Python"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..789cfaaea7aa6b6a444acdd33c6601f51be9b6ed --- /dev/null +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, flake8 +, nose2 +, mock +, requests +, pyjwt +, fetchPypi +}: + +buildPythonPackage rec { + pname = "globus-sdk"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "f3ee8294c11f0d1a4430ae7534236c6a6837312f1b4056adbb183a3af663d2be"; + }; + + checkPhase = '' + py.test tests + ''; + + # No tests in archive + doCheck = false; + + checkInputs = [ flake8 nose2 mock ]; + + propagatedBuildInputs = [ requests pyjwt ]; + + meta = with lib; { + description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; + homepage = https://github.com/globus/globus-sdk-python; + license = licenses.asl20; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d4de33b5a837d8099a2a4c2a8393c73dff039c8b --- /dev/null +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi +, httplib2, six, oauth2client, uritemplate }: + +buildPythonPackage rec { + pname = "google-api-python-client"; + version = "1.6.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "ec72991f95201996a4edcea44a079cae0292798086beaadb054d91921632fe1b"; + }; + + # No tests included in archive + doCheck = false; + + propagatedBuildInputs = [ httplib2 six oauth2client uritemplate ]; + + meta = with lib; { + description = "The core Python library for accessing Google APIs"; + homepage = https://github.com/google/google-api-python-client; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..baf590f9957238528d75893853535bbefd15f362 --- /dev/null +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, google_auth, protobuf, googleapis_common_protos, requests, grpcio, futures, mock, pytest }: + +buildPythonPackage rec { + pname = "google-api-core"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b4f103de6bd38ab346f7d17236f6098a51ebdff733ff69956a0f1e29cb35f10b"; + }; + + propagatedBuildInputs = [ + googleapis_common_protos protobuf + google_auth requests grpcio + ] ++ lib.optional (pythonOlder "3.2") futures; + checkInputs = [ mock pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients."; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + license = licenses.asl20; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ef101077eaabafb625d0984889af9fc5587e7ad1 --- /dev/null +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, mock, oauth2client, flask, requests, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa }: + +buildPythonPackage rec { + pname = "google-auth"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "9051802d3dae256036cca9e34633a32c0ed1427730d4ebc513dff91ec8b6dd45"; + }; + + checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; + propagatedBuildInputs = [ six pyasn1-modules cachetools rsa ]; + + # The removed test tests the working together of google_auth and google's https://pypi.python.org/pypi/oauth2client + # but the latter is deprecated. Since it is not currently part of the nixpkgs collection and deprecated it will + # probably never be. We just remove the test to make the tests work again. + postPatch = ''rm tests/test__oauth2client.py''; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "This library simplifies using Google’s various server-to-server authentication mechanisms to access Google APIs."; + homepage = "https://google-auth.readthedocs.io/en/latest/"; + license = licenses.asl20; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d9111ac89159b36e1ae7a8fef8e743f30287cc3b --- /dev/null +++ b/pkgs/development/python-modules/google_cloud_core/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, google_api_core, grpcio, pytest, mock }: + +buildPythonPackage rec { + pname = "google-cloud-core"; + version = "0.28.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "89e8140a288acec20c5e56159461d3afa4073570c9758c05d4e6cb7f2f8cc440"; + }; + + propagatedBuildInputs = [ google_api_core grpcio ]; + checkInputs = [ pytest mock ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "API Client library for Google Cloud: Core Helpers"; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + license = licenses.asl20; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..75c14ff62ebcf118cab88ee90908441d99c88d14 --- /dev/null +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, setuptools, google_api_core, google_gax, google_cloud_core, pytest, mock }: + +buildPythonPackage rec { + pname = "google-cloud-speech"; + version = "0.32.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "4f9a8ab3eb6630d0c0ca6ac15230dceba7d55d6707d162a84f255139ff780ee9"; + }; + + propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; + checkInputs = [ pytest mock ]; + + # needs credentials + doCheck = false; + + meta = with stdenv.lib; { + description = "Cloud Speech API enables integration of Google speech recognition into applications."; + homepage = "https://googlecloudplatform.github.io/google-cloud-python/latest/speech/"; + license = licenses.asl20; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..daabba6c390a10ad952b405f81155dd66dcb699b --- /dev/null +++ b/pkgs/development/python-modules/google_gax/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, google_auth, ply, protobuf, grpcio, requests +, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: + +buildPythonPackage rec { + pname = "google-gax"; + version = "0.16.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929"; + }; + + propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ]; + checkInputs = [ pytest mock unittest2 ]; + + # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where + # that file would be is unclear to me so I just remove the test. + postPatch = ''rm tests/test__grpc_google_auth.py''; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Google API Extensions for Python (gax-python) tools based on gRPC and Google API conventions."; + homepage = "http://gax-python.readthedocs.io/en/latest/"; + license = licenses.bsd3; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..28e84f4846e7aabc9dfd4fcbe47510ef8d501668 --- /dev/null +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, protobuf, pytest }: + +buildPythonPackage rec { + pname = "googleapis-common-protos"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1whfjl44gy15ha6palpwa2m0xi36dsvpaz8vw0cvb2k2lbdfsxf0"; + }; + + propagatedBuildInputs = [ protobuf ]; + checkInputs = [ pytest ]; + + doCheck = false; # there are no tests + + meta = with stdenv.lib; { + description = "Common protobufs used in Google APIs"; + homepage = "https://github.com/googleapis/googleapis"; + license = licenses.asl20; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..da3bbcf28db39af2867b37b0595dbb71897dfdea --- /dev/null +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests, protobuf, pycryptodome }: + +buildPythonPackage rec { + version = "0.4.2"; + pname = "gpapi"; + + src = fetchPypi { + inherit version pname; + sha256 = "1fv2y3xbwn512fjxrdwgq6cz0xjd7mh54nq1f18wyz8w40vcznns"; + }; + + propagatedBuildInputs = [ requests protobuf pycryptodome ]; + + meta = with stdenv.lib; { + homepage = https://github.com/NoMore201/googleplay-api; + license = licenses.gpl3; + description = "Google Play Unofficial Python API"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..01827fc87f590aa32f125a7f8835791d3dfcdfca --- /dev/null +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient +, protobuf, requests, args, gpapi, pyaxmlparser, fetchFromGitHub +}: + +buildPythonPackage rec { + version = "3.21"; + name = "gplaycli-${version}"; + + src = fetchFromGitHub { + owner = "matlink"; + repo = "gplaycli"; + rev = version; + sha256 = "1r5nzi9yzswam0866gypjcvv3f1rw13jwx9s49chp8byxy1dyrs2"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; + + meta = with stdenv.lib; { + homepage = https://github.com/matlink/gplaycli; + description = "Google Play Downloader via Command line"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index bc48a7490aa9141478da2fc48c95166482ecd8af..72415879b4124530faa6f69773c9d98be3ff0b0f 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "GPy"; - version = "1.8.4"; + version = "1.9.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "38c1202f1790952b88c298224139ee5b14d4518e3ddc6186c60db2ece016d8c1"; + sha256 = "372e43d41df5c90e0958d3073070994b351a7409c2e5fbd349cffe13bc24c10a"; }; # running tests produces "ImportError: cannot import name 'linalg_cython'" diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix index a3de4d3f7bc131f1d70a6af1c1e2a2cbab1f7461..485c5b5ef07309fc9dd2759f64d330e4bdd50549 100644 --- a/pkgs/development/python-modules/grammalecte/default.nix +++ b/pkgs/development/python-modules/grammalecte/default.nix @@ -7,23 +7,19 @@ buildPythonPackage rec { pname = "grammalecte"; - version = "0.5.18"; + version = "0.6.1"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip"; - sha256 = "0izfsqsj8w4awhmwmn4x8wwpqsmqbnfvfafzk93i6yj0l3fn3i97"; + sha256 = "0y2ck6pkd2p3cbjlxxvz3x5rnbg3ghfx97n13302rnab66cy4zkh"; }; propagatedBuildInputs = [ bottle ]; 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 + rm $out/bin/bottle.py ''; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 36181bfb3f9557bea1c01c4f9cfed52b46f1586c..57567a203ea724dc9d2e183dfa5c6715899eddd9 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,31 +1,36 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, -gobjectIntrospection, pygobject3, gtk3, matplotlib }: +gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses, +buildPythonPackage }: -stdenv.mkDerivation rec { - version = "2.16"; +buildPythonPackage rec { + format = "other"; + version = "2.26"; name = "${python.libPrefix}-graph-tool-${version}"; meta = with stdenv.lib; { description = "Python module for manipulation and statistical analysis of graphs"; - homepage = http://graph-tool.skewed.de/; + homepage = https://graph-tool.skewed.de/; license = licenses.gpl3; platforms = platforms.all; - maintainer = [ stdenv.lib.maintainers.joelmo ]; + maintainers = [ stdenv.lib.maintainers.joelmo ]; }; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p"; + sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz"; }; configureFlags = [ "--with-python-module-path=$(out)/${python.sitePackages}" + "--with-boost-libdir=${boost}/lib" + "--with-expat=${expat}" + "--with-cgal=${cgal}" "--enable-openmp" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ boost diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..81d2a7e204c2411b3a429269458f35003b705868 --- /dev/null +++ b/pkgs/development/python-modules/green/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, colorama, coverage, termstyle, unidecode, mock, backports_shutil_get_terminal_size }: + +buildPythonPackage rec { + pname = "green"; + version = "2.12.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "4c0c163bd2ce2da1f201eb69fd92fc24aaeab884f9e5c5a8c23d507a53336fa8"; + }; + + propagatedBuildInputs = [ + colorama coverage termstyle unidecode + ] ++ lib.optionals (!isPy3k) [ mock backports_shutil_get_terminal_size ]; + + meta = with lib; { + description = "Python test runner"; + homepage = https://github.com/CleanCut/green; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c11bcaa5baa50a0160e33ba0702a634068dbcdba --- /dev/null +++ b/pkgs/development/python-modules/grip/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +# Python bits: +, buildPythonPackage +, pytest +, responses +, docopt +, flask +, markdown +, path-and-address +, pygments +, requests +, tabulate +}: + +buildPythonPackage rec { + pname = "grip"; + version = "4.4.0"; + + src = fetchFromGitHub { + owner = "joeyespo"; + repo = "grip"; + rev = "v${version}"; + sha256 = "1768n3w40qg1njkzqjyl5gkva0h31k8h250821v69imj1zimymag"; + }; + + patches = [ + # Render "front matter", used in our RFC template and elsewhere + (fetchpatch { + url = https://github.com/joeyespo/grip/pull/249.patch; + sha256 = "07za5iymfv647dfrvi6hhj54a96hgjyarys51zbi08c51shqyzpg"; + }) + ]; + + checkInputs = [ pytest responses ]; + + propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ]; + + checkPhase = '' + export PATH="$PATH:$out/bin" + py.test -xm "not assumption" + ''; + + meta = with stdenv.lib; { + description = "Preview GitHub Markdown files like Readme locally before committing them"; + homepage = https://github.com/joeyespo/grip; + license = licenses.mit; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d1f0903238c7fe146c3ccb6d514e9f56bf91e3bd --- /dev/null +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, lib +, six, protobuf, enum34, futures, isPy26, isPy27, isPy34 }: + +buildPythonPackage rec { + pname = "grpcio"; + version = "1.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d"; + }; + + propagatedBuildInputs = [ six protobuf ] + ++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ] + ++ lib.optionals (isPy26 || isPy27) [ futures ]; + + meta = with stdenv.lib; { + description = "HTTP/2-based RPC framework"; + license = lib.licenses.bsd3; + homepage = "https://grpc.io/grpc/python/"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bab965b5a9c1a086482f5a41ed680e06cc650673 --- /dev/null +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -0,0 +1,34 @@ +{ stdenv, pkgs, lib, buildPythonPackage, fetchPypi, six, enum34, decorator, +nose, shouldbe, gss, krb5Full, which, darwin }: + +buildPythonPackage rec { + pname = "gssapi"; + version = "1.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "be8f37dd9da726db375b9c693e0a63b391d381d903516e79ecc2a2cc965580e4"; + }; + + # It's used to locate headers + postPatch = '' + substituteInPlace setup.py \ + --replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'" + ''; + + LD_LIBRARY_PATH = "${pkgs.krb5Full}/lib"; + + buildInputs = [ krb5Full which nose shouldbe ] + ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] ); + + propagatedBuildInputs = [ decorator enum34 six ]; + + doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local' + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/gssapi; + description = "Python GSSAPI Wrapper"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 71d77c283b84bb9508143ee13558036fecc3cb62..b1d19e9f5091b213500179fc3d388fe9fd7cbc73 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, pkgconfig, python, pygobject3 +{ fetchurl, stdenv, meson, ninja, pkgconfig, python, pygobject3 , gst-plugins-base, ncurses }: stdenv.mkDerivation rec { pname = "gst-python"; - version = "1.12.2"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchurl { @@ -12,22 +12,25 @@ stdenv.mkDerivation rec { "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l"; + sha256 = "1rlr6gl4lg97ng4jxh3gb2ldmywm15vwsa72nvggr8qa2l8q3fg0"; }; - patches = [ ./different-path-with-pygobject.patch ]; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ meson ninja pkgconfig python ]; # XXX: in the Libs.private field of python3.pc buildInputs = [ ncurses ]; - configureFlags = [ - "--with-pygi-overrides-dir=$(out)/${python.sitePackages}/gi/overrides" + mesonFlags = [ + "-Dpygi-overrides-dir=${python.sitePackages}/gi/overrides" ]; + postPatch = '' + chmod +x scripts/pythondetector # patchShebangs requires executable file + patchShebangs scripts/pythondetector + ''; + propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; # Needed for python.buildEnv diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix index 59fb650c883de214b661deef763f04adc3e72dc6..c8f30746310a8323c3f27eaa35e0d8a8ff1ce3d6 100644 --- a/pkgs/development/python-modules/guessit/2.0.nix +++ b/pkgs/development/python-modules/guessit/2.0.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "guessit"; - version = "2.0.4"; + version = "2.1.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1cfcgb0px6i9jl8nwkx8j06j4y6p5975a9pfmd8lcacwr8gy4wjg"; + sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56"; }; # Tests require more packages. diff --git a/pkgs/development/python-modules/gurobipy/darwin.nix b/pkgs/development/python-modules/gurobipy/darwin.nix new file mode 100644 index 0000000000000000000000000000000000000000..65bec7d8b12e3a7f168a05ea0fd02d10374230a5 --- /dev/null +++ b/pkgs/development/python-modules/gurobipy/darwin.nix @@ -0,0 +1,32 @@ +{ fetchurl, python, xar, cpio, cctools, insert_dylib }: +assert python.pkgs.isPy27 && python.ucsEncoding == 2; +python.pkgs.buildPythonPackage + { name = "gurobipy-7.5.2"; + src = fetchurl + { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_mac64.pkg"; + sha256 = "10zgn8741x48xjdiknj59x66mwj1azhihi1j5a1ajxi2n5fsak2h"; + }; + buildInputs = [ xar cpio cctools insert_dylib ]; + unpackPhase = + '' + xar -xf $src + zcat gurobi*mac64tar.pkg/Payload | cpio -i + tar xf gurobi*_mac64.tar.gz + sourceRoot=$(echo gurobi*/*64) + runHook postUnpack + ''; + patches = [ ./no-clever-setup.patch ]; + postInstall = "mv lib/lib*.so $out/lib"; + postFixup = + '' + install_name_tool -change \ + /System/Library/Frameworks/Python.framework/Versions/2.7/Python \ + ${python}/lib/libpython2.7.dylib \ + $out/lib/python2.7/site-packages/gurobipy/gurobipy.so + install_name_tool -change /Library/gurobi752/mac64/lib/libgurobi75.so \ + $out/lib/libgurobi75.so \ + $out/lib/python2.7/site-packages/gurobipy/gurobipy.so + insert_dylib --inplace $out/lib/libaes75.so \ + $out/lib/python2.7/site-packages/gurobipy/gurobipy.so + ''; + } diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix new file mode 100644 index 0000000000000000000000000000000000000000..d78eff0b47a01897bb3fb3f217983b6721a52eb0 --- /dev/null +++ b/pkgs/development/python-modules/gurobipy/linux.nix @@ -0,0 +1,23 @@ +{ fetchurl, python }: +assert python.pkgs.isPy27; +let utf = + if python.ucsEncoding == 2 then "16" + else if python.ucsEncoding == 4 then "32" + else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}"; +in python.pkgs.buildPythonPackage + { name = "gurobipy-7.5.2"; + src = fetchurl + { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_linux64.tar.gz"; + sha256 = "13i1dl22lnmg7z9mb48zl3hy1qnpwdpr0zl2aizda0qnb7my5rnj"; + }; + setSourceRoot = "sourceRoot=$(echo gurobi*/*64)"; + patches = [ ./no-clever-setup.patch ]; + postInstall = "mv lib/libaes*.so* lib/libgurobi*.so* $out/lib"; + postFixup = + '' + patchelf --set-rpath $out/lib \ + $out/lib/python2.7/site-packages/gurobipy/gurobipy.so + patchelf --add-needed libaes75.so \ + $out/lib/python2.7/site-packages/gurobipy/gurobipy.so + ''; + } diff --git a/pkgs/development/python-modules/gurobipy/no-clever-setup.patch b/pkgs/development/python-modules/gurobipy/no-clever-setup.patch new file mode 100644 index 0000000000000000000000000000000000000000..c71ac7d68632eb11988a55bd02dd89691be7fa1d --- /dev/null +++ b/pkgs/development/python-modules/gurobipy/no-clever-setup.patch @@ -0,0 +1,55 @@ +diff -Naur a/setup.py b/setup.py +--- a/setup.py 2017-12-22 10:52:43.730264611 -0500 ++++ b/setup.py 2017-12-22 10:53:27.660104199 -0500 +@@ -15,30 +15,6 @@ + from distutils.command.install import install + import os,sys,shutil + +-class GurobiClean(Command): +- description = "remove the build directory" +- user_options = [] +- def initialize_options(self): +- self.cwd = None +- def finalize_options(self): +- self.cwd = os.path.dirname(os.path.realpath(__file__)) +- def run(self): +- assert os.getcwd() == self.cwd, 'Must be run from setup.py directory: %s' % self.cwd +- build_dir = os.path.join(os.getcwd(), "build") +- if os.path.exists(build_dir): +- print('removing %s' % build_dir) +- shutil.rmtree(build_dir) +- +-class GurobiInstall(install): +- +- # Calls the default run command, then deletes the build area +- # (equivalent to "setup clean --all"). +- def run(self): +- install.run(self) +- c = GurobiClean(self.distribution) +- c.finalize_options() +- c.run() +- + License = """ + This software is covered by the Gurobi End User License Agreement. + By completing the Gurobi installation process and using the software, +@@ -79,20 +55,4 @@ + packages = ['gurobipy'], + package_dir={'gurobipy' : srcpath }, + package_data = {'gurobipy' : [srcfile] }, +- cmdclass={'install' : GurobiInstall, +- 'clean' : GurobiClean } + ) +- +-if os.name == 'posix' and sys.platform == 'darwin': # update Mac paths +- verstr = sys.version[:3] +- default = '/Library/Frameworks/Python.framework/Versions/%s/Python' % verstr +- default = '/System'+default if verstr == '2.7' else default +- modified = sys.prefix + '/Python' +- if default != modified: +- import subprocess +- from distutils.sysconfig import get_python_lib +- sitelib = get_python_lib() + '/gurobipy/gurobipy.so' +- if not os.path.isfile(modified): # Anaconda +- libver = verstr if verstr == '2.7' else verstr+'m' +- modified = sys.prefix + '/lib/libpython%s.dylib' % libver # For Anaconda +- subprocess.call(('install_name_tool', '-change', default, modified, sitelib)) diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix index e0b36de5672951684b77e24c9efa02bfa6019454..08b42b807999b3a99bb20bb5dd36a7c1638d6666 100644 --- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix +++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix @@ -1,11 +1,8 @@ { stdenv, buildPythonPackage, sphinx, fetchPypi }: - buildPythonPackage rec { - name = "${pname}-${version}"; pname = "guzzle_sphinx_theme"; version = "0.7.11"; - src = fetchPypi { inherit pname version; sha256 = "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v"; diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..097495128dbdaff5487f368b8374a1e9afe7318e --- /dev/null +++ b/pkgs/development/python-modules/h11/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "h11"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1n9hsm1n2qq32j3hh9wj93w738bwa5nqyzxjwvirz03gp8fbn3qw"; + }; + + buildInputs = [ pytest ]; + + meta = with lib; { + description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index e9bae3f82060bf2bfd1cd544e71f5b2b5d2c2797..54cfb5dc93ba5c35c6360da9f2eb48209cb0a7f4 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python, buildPythonPackage +{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage , numpy, hdf5, cython, six, pkgconfig -, mpi4py ? null }: +, mpi4py ? null, openssh }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -9,14 +9,12 @@ with stdenv.lib; let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; - in buildPythonPackage rec { version = "2.7.1"; pname = "h5py"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/h/h5py/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "180a688311e826ff6ae6d3bda9b5c292b90b28787525ddfcb10a29d5ddcae2cc"; }; @@ -24,17 +22,25 @@ in buildPythonPackage rec { postConfigure = '' ${python.executable} setup.py configure ${configure_flags} + + # Needed to run the tests reliably. See: + # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 + ${optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"} ''; preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ hdf5 cython ] - ++ optional mpiSupport mpi - ; + ++ optional mpiSupport mpi; propagatedBuildInputs = [ numpy six] - ++ optional mpiSupport mpi4py - ; + ++ optionals mpiSupport [ mpi4py openssh ]; + + patches = [ + # Patch is based on upstream patch. The tox.ini hunk had to be removed. + # https://github.com/h5py/h5py/commit/5009e062a6f7d4e074cab0fcb42a780ac2b1d7d4.patch + ./numpy-1.14.patch + ]; meta = { description = diff --git a/pkgs/development/python-modules/h5py/numpy-1.14.patch b/pkgs/development/python-modules/h5py/numpy-1.14.patch new file mode 100644 index 0000000000000000000000000000000000000000..e1db7e05808d95614a982491652f6271e7ea64a9 --- /dev/null +++ b/pkgs/development/python-modules/h5py/numpy-1.14.patch @@ -0,0 +1,94 @@ +From 5009e062a6f7d4e074cab0fcb42a780ac2b1d7d4 Mon Sep 17 00:00:00 2001 +From: James Tocknell +Date: Thu, 28 Dec 2017 20:55:55 +1100 +Subject: [PATCH] FIX: Don't reorder compound types, breaks on numpy 1.14 + +--- + h5py/h5t.pyx | 25 +++++++------------------ + setup.py | 2 +- + tox.ini | 4 ++-- + 3 files changed, 10 insertions(+), 21 deletions(-) + +diff --git a/h5py/h5t.pyx b/h5py/h5t.pyx +index cc2344e1..7445e9eb 100644 +--- a/h5py/h5t.pyx ++++ b/h5py/h5t.pyx +@@ -1136,12 +1136,6 @@ cdef class TypeCompoundID(TypeCompositeID): + else: + if sys.version[0] == '3': + field_names = [x.decode('utf8') for x in field_names] +- if len(field_names) > 0: +- collated_fields = zip(field_names, field_types, field_offsets) +- ordered_fields = sorted( +- collated_fields, key=operator.itemgetter(2)) +- field_names, field_types, field_offsets = \ +- map(list, zip(*ordered_fields)) + typeobj = dtype({ + 'names': field_names, + 'formats': field_types, +@@ -1458,8 +1452,7 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): + cdef dtype member_dt + cdef size_t member_offset = 0 + +- cdef dict offsets = {} +- cdef list fields = [] ++ cdef dict fields = {} + + # The challenge with correctly converting a numpy/h5py dtype to a HDF5 type + # which is composed of subtypes has three aspects we must consider +@@ -1468,19 +1461,14 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): + # 2. For correct round-tripping of aligned dtypes, we need to consider how + # much padding we need by looking at the field offsets + # 3. There is no requirement that the offsets be monotonically increasing +- # (so we start by sorting the names as a function of increasing offset) + # + # The code below tries to cover these aspects + +- # Get offsets for each compound member +- for name, field in dt.fields.items(): +- offsets[name] = field[1] +- + # Build list of names, offsets, and types, sorted by increasing offset + # (i.e. the position of the member in the struct) +- for name in sorted(dt.names, key=offsets.__getitem__): ++ for name in sorted(dt.names, key=(lambda n: dt.fields[n][1])): + field = dt.fields[name] +- name = name.encode('utf8') if isinstance(name, unicode) else name ++ h5_name = name.encode('utf8') if isinstance(name, unicode) else name + + # Get HDF5 data types and set the offset for each member + member_dt = field[0] +@@ -1489,7 +1477,7 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): + if aligned and (member_offset > field[1] + or member_dt.itemsize != member_type.get_size()): + raise TypeError("Enforced alignment not compatible with HDF5 type") +- fields.append((name, member_offset, member_type)) ++ fields[name] = (h5_name, member_offset, member_type) + + # Update member offset based on the HDF5 type size + member_offset += member_type.get_size() +@@ -1500,8 +1488,9 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): + + # Create compound with the necessary size, and insert its members + tid = H5Tcreate(H5T_COMPOUND, member_offset) +- for (name, member_offset, member_type) in fields: +- H5Tinsert(tid, name, member_offset, member_type.id) ++ for name in dt.names: ++ h5_name, member_offset, member_type = fields[name] ++ H5Tinsert(tid, h5_name, member_offset, member_type.id) + + return TypeCompoundID(tid) + +diff --git a/setup.py b/setup.py +index ec2a78a7..bbb086f6 100755 +--- a/setup.py ++++ b/setup.py +@@ -32,7 +32,7 @@ + # these are required to build h5py + # RUN_REQUIRES is included as setup.py test needs RUN_REQUIRES for testing + # RUN_REQUIRES can be removed when setup.py test is removed +-SETUP_REQUIRES = RUN_REQUIRES + [NUMPY_DEP, 'Cython>=0.19', 'pkgconfig'] ++SETUP_REQUIRES = RUN_REQUIRES + [NUMPY_DEP, 'Cython>=0.23', 'pkgconfig'] + + # Needed to avoid trying to install numpy/cython on pythons which the latest + # versions don't support diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4259b7ad05370329af98d4c05f156f59a8634de8 --- /dev/null +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, ffmpeg, async-timeout }: + +buildPythonPackage rec { + pname = "ha-ffmpeg"; + version = "1.9"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0644j5fqw8p6li6nrnm1rw7nhvsixq1c7gik3f1yx50776yg05i8"; + }; + + buildInputs = [ ffmpeg ]; + + propagatedBuildInputs = [ async-timeout ]; + + # only manual tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/pvizeli/ha-ffmpeg; + description = "Library for home-assistant to handle ffmpeg"; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..09d82d74f2b1a9abb67c755ebc6fe1b7bf7afed4 --- /dev/null +++ b/pkgs/development/python-modules/habanero/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, lib, fetchFromGitHub +, requests +, nose, vcrpy +}: + +buildPythonPackage rec { + pname = "habanero"; + version = "0.6.0"; + + # Install from Pypi is failing because of a missing file (Changelog.rst) + src = fetchFromGitHub { + owner = "sckott"; + repo = pname; + rev = "v${version}"; + sha256 = "1l2cgl6iiq8jff2w2pib6w8dwaj8344crhwsni2zzq0p44dwi13d"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ nose vcrpy ]; + checkPhase = "make test"; + + meta = { + description = "Python interface to Library Genesis"; + homepage = http://habanero.readthedocs.io/en/latest/; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ade4111c5a3b47fac18c8fb61f3c5caf635b7d2a --- /dev/null +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, transitions, websockets, passlib, docopt, pyyaml, nose }: + +buildPythonPackage rec { + pname = "hbmqtt"; + version = "0.9.2"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "6f61e05007648a4f33e300fafcf42776ca95508ba1141799f94169427ce5018c"; + }; + + propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ]; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests -e test_connect_tcp + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/beerfactory/hbmqtt; + description = "MQTT client/broker using Python asynchronous I/O"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/heapdict/default.nix b/pkgs/development/python-modules/heapdict/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..34c01091ddf25f81fd13327f9a4ab77381702b43 --- /dev/null +++ b/pkgs/development/python-modules/heapdict/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "HeapDict"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nhvxyjq6fp6zd7jzmk5x4fg6xhakqx9lhkp5yadzkqn0rlf7ja0"; + }; + + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "a heap with decrease-key and increase-key operations."; + homepage = http://stutzbachenterprises.com; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index 4e96f9389918acd7194016ef233fd7d0a25a3afb..8acaf9f063763a07a4fe1b44e13052bee1bb39a6 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "python-hglib"; - version = "2.4"; + version = "2.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0qll9cc9ndqizby00gxdcf6d0cysdhjkr8670a4ffrk55bcnwgb9"; + sha256 = "fee180bb6796e5d2d25158b2d3c9f048648e427dd28b23a58d369adb14dd67cb"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index eeb0424521558708983be655ea7bde86fdde4fb0..e0294c2afca4d6ac35b18bf2dc9307a338205da3 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -1,8 +1,9 @@ { lib, fetchurl, buildPythonPackage, numpy }: buildPythonPackage rec { - name = "hmmlearn-${version}"; + pname = "hmmlearn"; version = "0.2.0"; + name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${name}.tar.gz"; @@ -15,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hidden Markov Models in Python with scikit-learn like API"; - homepage = "https://github.com/hmmlearn/hmmlearn"; + homepage = https://github.com/hmmlearn/hmmlearn; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a72338143a14c772d6d67dbcc8f8045723e71546 --- /dev/null +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi +, six, requests-cache, pygments, pyquery }: + +buildPythonPackage rec { + pname = "howdoi"; + version = "1.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dx9ms0b3z3bx02paj78cyi788d8l6cpd3jqbn3j88w736i4jknz"; + }; + + propagatedBuildInputs = [ six requests-cache pygments pyquery ]; + + meta = with stdenv.lib; { + description = "Instant coding answers via the command line"; + homepage = https://pypi.python.org/pypi/howdoi; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..97d2854ca226b394993f749bb98ec31243943844 --- /dev/null +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flake8 +, pytest +, pytest-expect +, mock +, six +, webencodings +}: + +buildPythonPackage rec { + pname = "html5lib"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"; + }; + + checkInputs = [ flake8 pytest pytest-expect mock ]; + propagatedBuildInputs = [ + six webencodings + ]; + + checkPhase = '' + py.test + ''; + + meta = { + homepage = https://github.com/html5lib/html5lib-python; + downloadPage = https://github.com/html5lib/html5lib-python/releases; + description = "HTML parser based on WHAT-WG HTML5 specification"; + longDescription = '' + html5lib is a pure-python library for parsing HTML. It is designed to + conform to the WHATWG HTML specification, as is implemented by all + major web browsers. + ''; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ domenkozar prikhi ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index 2206b3559bae439d1e74305a6e6194de2cc50a40..8df4b3813c41b4467920fd3bb6952868688fcdb7 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "htmlmin"; - version = "0.1.11"; + version = "0.1.12"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f27fb96fdddeb1725ee077be532c7bea23288c69d0e996e7798f24fae7a14e5e"; + sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178"; }; # Tests run fine in a normal source checkout, but not when being built by nix. diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5e839e4ada9b4be65f6f21f54ef1002bda2e6058 --- /dev/null +++ b/pkgs/development/python-modules/htmltreediff/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage, fetchFromGitHub, isPy3k, lxml, html5lib, nose, stdenv }: + +buildPythonPackage rec { + version = "v0.1.2"; + pname = "htmltreediff"; + + disabled = isPy3k; + + src = fetchFromGitHub { + owner = "christian-oudard"; + repo = pname; + rev = version; + sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1"; + }; + + propagatedBuildInputs = [ lxml html5lib ]; + + checkInputs = [ nose ]; + + meta = with stdenv.lib; { + description = " Structure-aware diff for html and xml documents"; + homepage = https://github.com/christian-oudard/htmltreediff; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index d11d6b3668f6eb9d0ecfa146cc7b4baac05170c5..77dc27f1096e5d71bcc249712cbe7e5eb8958881 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,24 +1,38 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchpatch , flask +, flask-common +, flask-limiter , markupsafe , decorator , itsdangerous +, raven , six +, brotlipy }: buildPythonPackage rec { pname = "httpbin"; - version = "0.5.0"; - name = "${pname}-${version}"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054"; + sha256 = "0afa0486a76305cac441b5cc80d5d4ccd82b20875da7c5119ecfe616cefef45f"; }; - propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ]; + patches = [ + # https://github.com/kennethreitz/httpbin/issues/403 + # https://github.com/kennethreitz/flask-common/issues/7 + # https://github.com/evansd/whitenoise/issues/166 + (fetchpatch { + url = "https://github.com/javabrett/httpbin/commit/5735c888e1e51b369fcec41b91670a90535e661e.patch"; + sha256 = "167h8mscdjagml33dyqk8nziiz3dqbggnkl6agsirk5270nl5f7q"; + }) + ]; + + propagatedBuildInputs = [ brotlipy flask flask-common flask-limiter markupsafe decorator itsdangerous raven six ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 3a8426e201f8faca3196728550623ac03e0c5bad..9bcb61751de4358a096682bbb54d8b27a9857e61 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -1,20 +1,22 @@ -{ buildPythonPackage, fetchPypi, python +{ stdenv, buildPythonPackage, fetchPypi, python , pytest, pytestcov, watchdog, mock }: buildPythonPackage rec { pname = "hupper"; - version = "1.0"; + version = "1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "02lj6kgaf9xpr0binxwac3gpdhljglyj9fr78s165jc7qd7mifdg"; + sha256 = "e18037fa43fb4af7c00bd262ca6f5d7bcd22debd5d71e43b0fb1437f56e78035"; }; checkPhase = '' py.test ''; - checkInputs = [ pytest pytestcov watchdog mock ]; + # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent + # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) + checkInputs = [ pytest pytestcov mock ] ++ stdenv.lib.optional (!stdenv.isDarwin) watchdog; } diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8bc54e9226cff46d5c21cc3c5dcc6cd7485ddbe2 --- /dev/null +++ b/pkgs/development/python-modules/hvac/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "hvac"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2c9308334301daee3b5c6d56a032ca2c81eeb97d2777b73d795e201e8d037687"; + }; + + propagatedBuildInputs = [ requests ]; + + # Requires running a Vault server + doCheck = false; + + meta = with lib; { + description = "HashiCorp Vault API client"; + homepage = https://github.com/ianunruh/hvac; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index ca09c271ddace92e5a38700e1dcdf34d8c3e6b8b..53a245c45dcf064340234da5fd7e57fe10ec767f 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -1,13 +1,16 @@ -{ stdenv, buildPythonPackage, fetchurl, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, idna, pytest }: + buildPythonPackage rec { - name = "hyperlink-${version}"; - version = "17.3.0"; + pname = "hyperlink"; + version = "18.0.0"; - src = fetchurl { - url = "mirror://pypi/h/hyperlink/${name}.tar.gz"; - sha256 = "06mgnxwjzx8hv34bifc7jvgxz21ixhk5s6xy2kd84hdrlbfvpbfx"; + src = fetchPypi { + inherit pname version; + sha256 = "f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306"; }; + propagatedBuildInputs = [ idna ]; + checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index ab56cde9c131df83da275edef27b85233f6ddeb8..d5ee59ac2d925988cbc19d1403f8dcf0455c081a 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python -, pythonOlder, pythonAtLeast, enum34 -, doCheck ? true, pytest, pytest_xdist, flake8, flaky +{ lib, buildPythonPackage, fetchFromGitHub, python +, isPy3k, attrs, coverage, enum34 +, doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock }: buildPythonPackage rec { # http://hypothesis.readthedocs.org/en/latest/packaging.html @@ -9,20 +9,19 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "3.11.1"; + version = "3.45.2"; pname = "hypothesis"; - name = "${pname}-${version}"; # Upstream prefers github tarballs src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; - rev = "${version}"; - sha256 = "0damf6zbm0db2a3gfwrbbj92yal576wpmhhchc0w0np8vdnax70n"; + rev = version; + sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb"; }; - checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ]; - propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; + checkInputs = [ pytest pytest_xdist flaky mock ]; + propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ]; inherit doCheck; @@ -32,13 +31,9 @@ buildPythonPackage rec { 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; { + meta = with lib; { description = "A Python library for property based testing"; - homepage = https://github.com/DRMacIver/hypothesis; + homepage = https://github.com/HypothesisWorks/hypothesis; license = licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..492c4da6fcc9e40ab4f2d7c5ddbcb5d8cae512bb --- /dev/null +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, enum-compat +, xorgserver, pytest, i3, python +}: + +buildPythonPackage rec { + pname = "i3ipc"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "acrisci"; + repo = "i3ipc-python"; + rev = "v${version}"; + sha256 = "15drq16ncmjrgsri6gjzp0qm8abycm92nicm78q3k7vy7rqpvfnh"; + }; + + propagatedBuildInputs = [ enum-compat ]; + + checkInputs = [ xorgserver pytest i3 ]; + + checkPhase = ''${python.interpreter} run-tests.py''; + + meta = with stdenv.lib; { + description = "An improved Python library to control i3wm"; + homepage = https://github.com/acrisci/i3ipc-python; + license = licenses.bsd3; + maintainers = with maintainers; [ vanzef ]; + }; +} diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b324705a152fa5393d5c572db3774acd8446b9a9 --- /dev/null +++ b/pkgs/development/python-modules/idna-ssl/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, idna }: + +buildPythonPackage rec { + pname = "idna-ssl"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1293f030bc608e9aa9cdee72aa93c1521bbb9c7698068c61c9ada6772162b979"; + }; + + propagatedBuildInputs = [ idna ]; + + # Infinite recursion: tests require aiohttp, aiohttp requires idna-ssl + doCheck = false; + + meta = with lib; { + description = "Patch ssl.match_hostname for Unicode(idna) domains support"; + homepage = https://github.com/aio-libs/idna-ssl; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e66700d87ee0a9234f985563407ce6d55d2c7e21 --- /dev/null +++ b/pkgs/development/python-modules/idna/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "idna"; + version = "2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f"; + }; + + meta = { + homepage = "https://github.com/kjd/idna/"; + description = "Internationalized Domain Names in Applications (IDNA)"; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/imaplib2/default.nix b/pkgs/development/python-modules/imaplib2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0ceff353f9a693fd91e66eb1dd0c2308df4efeb0 --- /dev/null +++ b/pkgs/development/python-modules/imaplib2/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "imaplib2"; + version = "2.45.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "a35b6d88258696e80aabecfb784e08730b8558fcaaa3061ff2c7f8637afbd0b3"; + }; + + # No tests on PyPI and no tags on GitHub :( + doCheck = false; + + meta = with lib; { + description = "A threaded Python IMAP4 client"; + homepage = https://github.com/bcoe/imaplib2; + # See https://github.com/bcoe/imaplib2/issues/25 + license = licenses.psfl; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..65afe116510ca2c678444842e10fe98284a66e54 --- /dev/null +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: + +buildPythonPackage rec { + pname = "imbalanced-learn"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1r5js9kw6rvmfvxxkfjlcxv5xn5h19qvg7d41byilxwq9kd515g4"; + }; + + propagatedBuildInputs = [ scikitlearn ]; + checkInputs = [ nose pytest pandas ]; + checkPhase = '' + export HOME=$PWD + # skip some tests that fail because of minimal rounding errors + py.test imblearn --ignore=imblearn/metrics/classification.py + py.test doc/*.rst + ''; + + meta = with stdenv.lib; { + description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; + homepage = https://github.com/scikit-learn-contrib/imbalanced-learn; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bccf49c56adfef8d7cee7d22a9900dd11d5ea6f7 --- /dev/null +++ b/pkgs/development/python-modules/inflection/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchPypi, buildPythonPackage, pytest } : + +buildPythonPackage rec { + pname = "inflection"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jhnxgnw8y3mbzjssixh6qkc7a3afc4fygajhqrqalnilyvpzshq"; + }; + + checkInputs = [ pytest ]; + # Suppress overly verbose output if tests run successfully + checkPhase = ''pytest >/dev/null || pytest''; + + meta = { + homepage = https://github.com/jpvanhal/inflection; + description = "A port of Ruby on Rails inflector to Python"; + maintainers = with lib.maintainers; [ NikolaMandic ilya-kolpakov ]; + license = lib.licenses.mit; + }; +} + diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix index 24a9abb625fff7a02729aabcbddc0d9792fe8f49..5cf3c9e9db0691b133028985369d0534d8d6e0a3 100644 --- a/pkgs/development/python-modules/interruptingcow/default.nix +++ b/pkgs/development/python-modules/interruptingcow/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "interruptingcow"; - version = "0.7"; + version = "0.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0j6d0rbh8xjfw7bf8vcjld6q45i7vr9xsw5b9q6j87nhf4qhzx53"; + sha256 = "3e8cd5058b651e625702cba53e3b1fb76d7a5ec07ab69c52a167a9f784e3306c"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index 69b35df29738b2650c378590448f20e5511ee8be..feccdff683e7e02870cab77d14133178ce51cd33 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -17,10 +17,8 @@ buildPythonPackage rec { 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 + ${python.interpreter} nix_run_setup test runHook postCheck ''; diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ef2444c0d2f0518e023c5df41d040266059e8fbb --- /dev/null +++ b/pkgs/development/python-modules/iowait/default.nix @@ -0,0 +1,16 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "iowait"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "16djvxd9sxm7cr57clhqkyrq3xvdzgwj803sy5hwyb62hkmw46xb"; + }; + + meta = { + description = "Platform-independent module for I/O completion events"; + homepage = https://launchpad.net/python-iowait; + }; +} diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index a77f6ac9c2f1146c276eee9afd5776ec422cfc6f..3f09975d66be6f5290e47ab26206d872aa1d79aa 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "4.6.1"; + version = "4.8.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db"; + sha256 = "c091449dd0fad7710ddd9c4a06e8b9e15277da306590bc07a3a1afa6b4453c8f"; }; buildInputs = [ nose ] ++ lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 3e8ea0489207864ae134bb6288fe59a52d2ca226..e4765a29e835b27b542317794bb4e78d39b6f470 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.0.2"; + version = "6.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7eea4780266252fcc987b220a302d589fbb4d6b0569bd131115a20b31891103d"; + sha256 = "f1e03ebb8d17f67f03bafa5d85f220883462f7bd7a97fe904c7d56ffba8534a3"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index b25039cc71e892357e582144af26ae475b9431e6..083c1f3b08ddc4d3099b10c647dff4f392c8db22 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -27,12 +27,11 @@ buildPythonPackage rec { pname = "ipython"; - version = "5.3.0"; - name = "${pname}-${version}"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d"; + sha256 = "00g696r9rk1c4p3sycnv7by55cp9mm7r6zkkdqbiw9l0mk8k58wb"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 64139f5d9050a5e60978d2ff4f987a52adb9f9c0..d44a708befb225cef2d38f1dfac61d186b2fdb8a 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -18,16 +18,16 @@ , pexpect , appnope , typing +, backcall }: buildPythonPackage rec { pname = "ipython"; - version = "6.2.1"; - name = "${pname}-${version}"; + version = "6.3.1"; src = fetchPypi { inherit pname version; - sha256 = "51c158a6c8b899898d1c91c6b51a34110196815cc905f9be0fa5878e19355608"; + sha256 = "a6ac981381b3f5f604b37a293369963485200e3639fb0404fa76092383c10c41"; }; prePatch = lib.optionalString stdenv.isDarwin '' @@ -46,6 +46,7 @@ buildPythonPackage rec { traitlets prompt_toolkit pexpect + backcall ] ++ lib.optionals stdenv.isDarwin [appnope] ++ lib.optionals (pythonOlder "3.5") [ typing ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 14b03e5e282a59ec63a2c35b0cde1a868b50dfad..af7ebfb1c4329f03b5803c24f596970371723de8 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.0.3"; + version = "7.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f98b4c3719097c9d2e6489f303db520b20bd4de3e0b1d6d4f92f81bfe3c2a0c8"; + sha256 = "f23aac2447f593dbdc89a86833a2d59666ed44af42b23c267de380c324599507"; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4f9ff70556b4443f4c464e9938c3b496d1620bf0 --- /dev/null +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "iso8601"; + version = "0.1.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test iso8601 + ''; + + meta = { + homepage = https://bitbucket.org/micktwomey/pyiso8601/; + description = "Simple module to parse ISO 8601 dates"; + maintainers = with lib.maintainers; [ phreedom ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a43dbf737167bfbf9d1a657aecd476dd0dc69228 --- /dev/null +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "jdatetime"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7facd437d27365e217787e1013ecdc402aa77af7248e16128f6a753920000905"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Jalali datetime binding for python"; + homepage = https://pypi.python.org/pypi/jdatetime; + license = licenses.psfl; + }; +} diff --git a/pkgs/development/python-modules/jdcal/default.nix b/pkgs/development/python-modules/jdcal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d3ed32c0882f3f801f7f5c68c4ca3db33588d16a --- /dev/null +++ b/pkgs/development/python-modules/jdcal/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "jdcal"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "b760160f8dc8cc51d17875c6b663fafe64be699e10ce34b6a95184b5aa0fdc9e"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "A module containing functions for converting between Julian dates and calendar dates"; + homepage = "https://github.com/phn/jdcal"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ lihop ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 6cdf784dc3ba13e655375c72b30376227840df3d..df8a287ea09364a9c95898493073c6e021663a57 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,14 +2,18 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.11.0"; + version = "0.11.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f6d5973573e76b1fd2ea75f6dcd6445d02d41ff3af5fc61b275b4e323d1dd396"; + sha256 = "d6e799d04d1ade9459ed0f20de47c32f2285438956a677d083d3c98def59fa97"; }; + postPatch = '' + substituteInPlace requirements.txt --replace "parso==0.1.0" "parso" + ''; + checkInputs = [ pytest glibcLocales tox pytestcov ]; propagatedBuildInputs = [ parso ]; diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..db83e6cb2991101eb93e5906ced946bfc0de10f3 --- /dev/null +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, unicodecsv +}: + +buildPythonPackage rec { + pname = "jellyfish"; + version = "0.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "887a9a49d0caee913a883c3e7eb185f6260ebe2137562365be422d1316bd39c9"; + }; + + checkInputs = [ pytest unicodecsv ]; + + meta = { + homepage = https://github.com/sunlightlabs/jellyfish; + description = "Approximate and phonetic matching of strings"; + maintainers = with lib.maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..df21c0f418611ce52da2b047d05631513f6613e4 --- /dev/null +++ b/pkgs/development/python-modules/jieba/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchFromGitHub, glibcLocales, python, isPy3k }: + +buildPythonPackage rec { + pname = "jieba"; + version = "0.39"; + + # no tests in PyPI tarball + src = fetchFromGitHub { + owner = "fxsjy"; + repo = pname; + rev = "v${version}"; + sha256 = "0hbq0l1jbgcvm58qg4p37im4jl5a9igvq3wlhlk22pmbkbvqqgzs"; + }; + + checkInputs = [ glibcLocales ]; + + # UnicodeEncodeError + doCheck = isPy3k; + + # Citing https://github.com/fxsjy/jieba/issues/384: "testcases is in a mess" + # So just picking random ones that currently work + checkPhase = '' + export LC_ALL=en_US.UTF-8 + ${python.interpreter} test/test.py + ${python.interpreter} test/test_tokenize.py + ''; + + meta = with lib; { + description = "Chinese Words Segementation Utilities"; + homepage = https://github.com/fxsjy/jieba; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index ca286ae06aab35531e712c3fdabae2bb6e9d40ea..7432b3bb99c54112df8c63427399d3d75c0cf191 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -1,20 +1,21 @@ { stdenv, buildPythonPackage, fetchPypi -, markupsafe }: +, pytest, markupsafe }: buildPythonPackage rec { pname = "Jinja2"; - version = "2.9.6"; - name = "${pname}-${version}"; + version = "2.10"; src = fetchPypi { inherit pname version; - sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx"; + sha256 = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"; }; + checkInputs = [ pytest ]; propagatedBuildInputs = [ markupsafe ]; - # No tests included - doCheck = false; + checkPhase = '' + pytest -v + ''; meta = with stdenv.lib; { homepage = http://jinja.pocoo.org/; @@ -24,8 +25,7 @@ buildPythonPackage rec { Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. - ''; - platforms = platforms.all; + ''; maintainers = with maintainers; [ pierron garbas sjourdois ]; }; } diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/pkgs/development/python-modules/jinja2_pluralize/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5f80f4e4b2025aa1255dd53f44c0b92d30d14378 --- /dev/null +++ b/pkgs/development/python-modules/jinja2_pluralize/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, jinja2, inflect }: + +buildPythonPackage rec { + pname = "jinja2_pluralize"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "071wnzzz20wjb0iw7grxgj1lb2f0kz50qyfbcq54rddr2x82sp6z"; + }; + + propagatedBuildInputs = [ + jinja2 + inflect + ]; + + meta = with stdenv.lib; { + description = "Jinja2 pluralize filters"; + homepage = https://github.com/audreyr/jinja2_pluralize; + license = licenses.bsd3; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..541455642ef53f10b2d7bd99747622467395ee55 --- /dev/null +++ b/pkgs/development/python-modules/josepy/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchPypi, buildPythonPackage +# buildInputs +, six +, setuptools +, pyopenssl +, cryptography +}: + +buildPythonPackage rec { + pname = "josepy"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k0ahzzaq2rrjiifwbhbp7vm8z4zk0ipgiqwicil80kzlf6bhj4z"; + }; + + propagatedBuildInputs = [ + pyopenssl + cryptography + six + setuptools + ]; + + # too many unpackaged check requirements + doCheck = false; + + meta = with lib; { + description = "JOSE protocol implementation in Python"; + homepage = https://github.com/jezdez/josepy; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} + diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index a2278566c6d74a6700d0ef6e37645b4d972fa89e..19b1eeefa5340f79ddabc0c58d85a1dc50dd65f0 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.7.4"; + version = "1.7.5"; name = "${pname}-${version}"; propagatedBuildInputs = [ six ]; @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchurl { url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; - sha256 = "7fc14f279117a55a5e854602f6e8c1cb178c6d83f7cf75e2e9f50678fe11079e"; + sha256 = "78eb1e5c8535484f0d0b588aca38da3fb5e0e34de2d1ab53c077e71c55757473"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/jsondate/default.nix b/pkgs/development/python-modules/jsondate/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7888a6df23cc9483ea1afab85295e55d619d39d2 --- /dev/null +++ b/pkgs/development/python-modules/jsondate/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildPythonPackage, six }: + +buildPythonPackage rec { + version = "0.1.3"; + pname = "jsondate"; + + src = fetchFromGitHub { + owner = "ilya-kolpakov"; + repo = "jsondate"; + rev = "refs/tags/v${version}"; + sha256 = "0nhvi48nc0bmad5ncyn6c9yc338krs3xf10bvv55xgz25c5gdgwy"; + fetchSubmodules = true; # Fetching by tag does not work otherwise + }; + + propagatedBuildInputs = [ six ]; + + meta = { + homepage = "https://github.com/ilya-kolpakov/jsondate"; + description = "JSON with datetime handling"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9d4331c8ea802ccd8ae83b616bcf182a4865d57f --- /dev/null +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jsondiff"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "2d0437782de9418efa34e694aa59f43d7adb1899bd9a793f063867ddba8f7893"; + }; + + # No tests + doCheck = false; + + meta = { + description = "Diff JSON and JSON-like structures in Python"; + homepage = https://github.com/ZoomerAnalytics/jsondiff; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 39f36b1d9494514db9b6892097cf6c7494890eb4..ceb697adcaf826b74234693edab17412c9ee4f6c 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.16"; + version = "1.23"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f025c28a08ce747429ee746bb21796c3b6417ec82288f8fe6514db7398f2af8a"; + sha256 = "49f29cab70e9068db3b1dc6b656cbe2ee4edf7dfe9bf5a0055f17a4b6804a4b9"; }; # test files are missing diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3a0f723773029e4b6b540ad0990843b834c1d7d1 --- /dev/null +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jsonpickle"; + version = "0.9.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "545b3bee0d65e1abb4baa1818edcc9ec239aa9f2ffbfde8084d71c056180054f"; + }; + + doCheck = false; + + meta = { + description = "Python library for serializing any arbitrary object graph into JSON"; + homepage = http://jsonpickle.github.io/; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index ca9549b677bb591598b4bd22896264f153366712..6209c2593a7a91e6e631a911912cfc5937084db2 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An implementation of JSON Reference for Python"; - homepage = "http://github.com/gazpachoking/jsonref"; + homepage = "https://github.com/gazpachoking/jsonref"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2bdb93dfdf2dbf412dfc20a69c6c7e646111deec --- /dev/null +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp, jsonrpc-base }: + +buildPythonPackage rec { + pname = "jsonrpc-async"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f1p3qv56jn4sdyp8gzf915nya6vr0rn2pbzld9x23y9jdjmibzw"; + }; + + propagatedBuildInputs = [ aiohttp jsonrpc-base ]; + + meta = with stdenv.lib; { + description = "A JSON-RPC client library for asyncio"; + homepage = https://github.com/armills/jsonrpc-async; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8dbe07382889d087c35eb530dcbb9a6b66b79505 --- /dev/null +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "jsonrpc-base"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dl55n54ha5kf4x6hap2p1k3s4qa4w7g791wp2656rjg2zxfgywk"; + }; + + propagatedBuildInputs = [ ]; + + meta = with stdenv.lib; { + description = "A JSON-RPC client library base interface"; + homepage = https://github.com/armills/jsonrpc-base; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0914100b5aa671d1d8f095b6cd3a36bbea786643 --- /dev/null +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp, jsonrpc-base }: + +buildPythonPackage rec { + pname = "jsonrpc-websocket"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "cf349bee4ab96db2e457b6a71a45380e1a9cf3e1ceb08260ecfd9928040ebe71"; + }; + + propagatedBuildInputs = [ aiohttp jsonrpc-base ]; + + meta = with stdenv.lib; { + description = "A JSON-RPC websocket client library for asyncio"; + homepage = https://github.com/armills/jsonrpc-websocket; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b331279042c0426130862ecfcaaa7bfa6e5940d0 --- /dev/null +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "jsonrpclib-pelix"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qs95vxplxwspbrqy8bvc195s58iy43qkf75yrjfql2sim8b25sl"; + }; + + meta = with lib; { + description = "JSON RPC client library - Pelix compatible fork"; + homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/; + license = lib.licenses.asl20; + maintainers = with maintainers; [ moredread ]; + }; +} diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index b1053bbdaab1f0e14a89a50b6a14b1b149bd9f7b..d9315193d19f3e894809569e1eb441a93fe9b66c 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Jug"; - version = "1.6.4"; + version = "1.6.6"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -19,13 +19,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e739b20e7fe53ac50f5954b9e32568bdd92012dd4bd199d13e2a675ccd69d97d"; + sha256 = "897ffbbbe8061772c238b4f436512ea3696016a04473c45a716d78c0de103ec1"; }; meta = with stdenv.lib; { description = "A Task-Based Parallelization Framework"; license = licenses.mit; - url = https://jug.readthedocs.io/; + homepage = https://jug.readthedocs.io/; maintainers = with maintainers; [ luispedro ]; }; } diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..992780ef33d3e302cf4d6a78416592c0e8bf8cd1 --- /dev/null +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, scp +, pyserial +, paramiko +, netaddr +, ncclient +, lxml +, jinja2 +, pyyaml +, nose +}: + +buildPythonPackage rec { + pname = "junos-eznc"; + version = "2.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "95a037cdd05618a189517357e46a06886909a18c7923b628c6ac43d5f54b2912"; + }; + + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ + scp six pyserial paramiko netaddr ncclient lxml jinja2 pyyaml + ]; + + checkPhase = '' + nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit + ''; + + meta = with stdenv.lib; { + homepage = http://www.github.com/Juniper/py-junos-eznc; + description = "Junos 'EZ' automation for non-programmers"; + license = licenses.asl20; + maintainers = with maintainers; [ xnaveira ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 3782d313df89e0f0c792af95afb6797685cc4cc0..5ee99d5071f8adeb393b38bf08ee09ceec4f93d4 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -1,30 +1,33 @@ { lib , buildPythonPackage , fetchPypi -, nose , traitlets , jupyter_core , pyzmq , dateutil , isPyPy , py +, ipykernel +, ipython +, mock +, pytest +, tornado }: buildPythonPackage rec { pname = "jupyter_client"; - version = "5.1.0"; - name = "${pname}-${version}"; + version = "5.2.3"; src = fetchPypi { inherit pname version; - sha256 = "08756b021765c97bc5665390700a4255c2df31666ead8bff116b368d09912aba"; + sha256 = "27befcf0446b01e29853014d6a902dd101ad7d7f94e2252b1adca17c3466b761"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py; + checkInputs = [ ipykernel ipython mock pytest ]; + propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil tornado ] ++ lib.optional isPyPy py; checkPhase = '' - nosetests -v + py.test ''; # Circular dependency with ipykernel diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index 4db36cf7b3745dd5e267f40f0bf9957453781540..403f7c047d561f978093c5782a713b591f223307 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.3.0"; + version = "4.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40"; + sha256 = "ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7"; }; - buildInputs = [ pytest mock glibcLocales ]; + checkInputs = [ pytest mock glibcLocales ]; propagatedBuildInputs = [ ipython traitlets ]; patches = [ ./tests_respect_pythonpath.patch ]; diff --git a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch index 61415b756abcd14cbd3692a9d320b595b4172d6c..7e7e9ae93a0909cbb39b2d2b95229d4e135f1804 100644 --- a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch +++ b/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch @@ -1,24 +1,20 @@ ---- a/jupyter_core/tests/test_command.py 2016-09-13 15:22:49.000000000 +0200 -+++ b/jupyter_core/tests/test_command.py 2017-10-23 12:49:27.489527705 +0200 -@@ -113,7 +113,10 @@ - witness = a.join(witness_cmd) - witness.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")')) - witness.chmod(0o700) -- out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': ''}) -+ out = check_output( -+ [sys.executable, str(jupyter), 'witness'], -+ env={'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']} -+ ) - assert b'WITNESS' in out - - -@@ -136,5 +139,8 @@ - witness_b.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")')) - witness_b.chmod(0o700) - -- out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': str(b)}) -+ out = check_output( -+ [sys.executable, str(jupyter), 'witness'], -+ env={'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']} -+ ) - assert b'WITNESS A' in out +--- a/jupyter_core/tests/test_command.py ++++ b/jupyter_core/tests/test_command.py +@@ -131,7 +131,7 @@ def test_not_on_path(tmpdir): + witness_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")') + write_executable(witness, witness_src) + +- env = {'PATH': ''} ++ env = {'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']} + if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614 + env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT'] + if sys.platform == 'win32': +@@ -157,7 +157,7 @@ def test_path_priority(tmpdir): + witness_b_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")') + write_executable(witness_b, witness_b_src) + +- env = {'PATH': str(b)} ++ env = {'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']} + if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614 + env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT'] + if sys.platform == 'win32': diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..02348c68e07ae4178314771deef69d0ce65c27e0 --- /dev/null +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, jupyterhub +, ldap3 +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jupyterhub-ldapauthenticator"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "19dz3a3122wln8lkixj5jbh9x3cqlrcb3p7a53825cj72cmpcxwz"; + }; + + # No tests implemented + doCheck = false; + + propagatedBuildInputs = [ jupyterhub ldap3 ]; + + meta = with lib; { + description = "Simple LDAP Authenticator Plugin for JupyterHub"; + homepage = https://github.com/jupyterhub/ldapauthenticator; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..dbd2e36b7b8400df9b21055c80d29c0b23ace20f --- /dev/null +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -0,0 +1,122 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, fetchzip +, alembic +, ipython +, jinja2 +, python-oauth2 +, pamela +, sqlalchemy +, tornado +, traitlets +, requests +, pythonOlder +, nodejs-8_x +, nodePackages +}: + +let + # js/css assets that setup.py tries to fetch via `npm install` when building + # from source. + bootstrap = + fetchzip { + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz"; + sha256 = "0r7s54bbf68ri1na9bbabyf12mcpb6zk5ja2q6z82aw1fa4xi3yd"; + }; + font-awesome = + fetchzip { + url = "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz"; + sha256 = "1xnxbdlfdd60z5ix152m8r2kk9dkwlqwpypky1mm3dv64ajnzdbk"; + }; + jquery = + fetchzip { + url = "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz"; + sha256 = "1j6y18miwzafdj8kfpwbmbn9qvgnbnpc7l4arqrhqj33m04xrlgi"; + }; + moment = + fetchzip { + url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; + sha256 = "1b4vyvs24v6y92pf2iqjm5aa7jg7khcpspn00girc7lpi917f9vw"; + }; + requirejs = + fetchzip { + url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.4.tgz"; + sha256 = "0q6mkj0iv341kks06dya6lfs2kdw0n6vc7n4a7aa3ia530fk9vja"; + }; + +in + +buildPythonPackage rec { + pname = "jupyterhub"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "100cf18d539802807a45450d38fefbb376cf1c810f3b1b31be31638829a5c69c"; + }; + + # Most of this only applies when building from source (e.g. js/css assets are + # pre-built and bundled in the official release tarball on pypi). + # + # Stuff that's always needed: + # * At runtime, we need configurable-http-proxy, so we substitute the store + # path. + # + # Other stuff that's only needed when building from source: + # * js/css assets are fetched from npm. + # * substitute store path for `lessc` commmand. + # * set up NODE_PATH so `lessc` can find `less-plugin-clean-css`. + # * don't run `npm install`. + preBuild = '' + export NODE_PATH=${nodePackages.less-plugin-clean-css}/lib/node_modules + + substituteInPlace jupyterhub/proxy.py --replace \ + "'configurable-http-proxy'" \ + "'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'" + + substituteInPlace jupyterhub/tests/test_proxy.py --replace \ + "'configurable-http-proxy'" \ + "'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'" + + substituteInPlace setup.py --replace \ + "'npm', 'run', 'lessc', '--'" \ + "'${nodePackages.less}/bin/lessc'" + + substituteInPlace setup.py --replace \ + "'npm', 'install', '--progress=false'" \ + "'true'" + + declare -A deps + deps[bootstrap]=${bootstrap} + deps[font-awesome]=${font-awesome} + deps[jquery]=${jquery} + deps[moment]=${moment} + deps[requirejs]=${requirejs} + + mkdir -p share/jupyter/hub/static/components + for dep in "''${!deps[@]}"; do + if [ ! -e share/jupyter/hub/static/components/$dep ]; then + cp -r ''${deps[$dep]} share/jupyter/hub/static/components/$dep + fi + done + ''; + + propagatedBuildInputs = [ + alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado + traitlets + ]; + + # Disable tests because they take an excessive amount of time to complete. + doCheck = false; + + disabled = pythonOlder "3.4"; + + meta = with lib; { + description = "Serves multiple Jupyter notebook instances"; + homepage = http://jupyter.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie cstrahan ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4cf69a1114e7a2c78a9fa1170e38503ede0b409e --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }: +buildPythonPackage rec { + pname = "jupyterlab"; + version = "0.31.12"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1hp6p9bsr863glildgs2iy1a4l99m7rxj2sy9fmkxp5zhyhqvsrz"; + }; + + propagatedBuildInputs = [ + ipython_genutils + jupyterlab_launcher + notebook + ]; + + makeWrapperArgs = [ + "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab" + ]; + + # Depends on npm + doCheck = false; + + meta = with lib; { + description = "Jupyter lab environment notebook server extension."; + license = with licenses; [ bsd3 ]; + homepage = "http://jupyter.org/"; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f316fe10563dbaec280f66531de7f158ac17530c --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook }: +buildPythonPackage rec { + pname = "jupyterlab_launcher"; + version = "0.10.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v1ir182zm2dl14lqvqjhx2x40wnp0i32n6rldxnm1allfpld1n7"; + }; + + propagatedBuildInputs = [ + jsonschema + notebook + ]; + + # depends on requests and a bunch of other libraries + doCheck = false; + + meta = with lib; { + description = "This package is used to launch an application built using JupyterLab"; + license = with licenses; [ bsd3 ]; + homepage = "http://jupyter.org/"; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..eef9dc493f6003ba1a7cf0c7e2891e67fa8a92e3 --- /dev/null +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "1.4.2"; + pname = "kafka-python"; + + src = fetchPypi { + inherit pname version; + sha256 = "6a5c516f540f4b13b78c64a85dd42dc38fe29257e2fae6393fc5daff9106389b"; + }; + + checkInputs = [ pytest six mock ]; + + checkPhase = '' + py.test + ''; + + # Upstream uses tox but we don't on Nix. Running tests manually produces however + # from . import unittest + # E ImportError: cannot import name 'unittest' + doCheck = false; + + meta = with stdenv.lib; { + description = "Pure Python client for Apache Kafka"; + homepage = https://github.com/dpkp/kafka-python; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index c99619566175dfb7eceee616241cb780a30ddd35..0863cd79f46e50fa476087dd4e4f50e64fc0d449 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "kaitaistruct"; - version = "0.7"; + version = "0.8"; src = fetchPypi { inherit pname version; - sha256 = "19j3snmr0qbd48f7yd3cc21ffv13dahf8ys591dnalbhvnkar71i"; + sha256 = "d1d17c7f6839b3d28fc22b21295f787974786c2201e8788975e72e2a1d109ff5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index c2d5362b134ba3c90d0bdad4846143aac0c7a9af..860a14f7a4daa52ec0608cbccaf440ca72217072 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.0.9"; + version = "2.1.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "6b8572cf1b4a22fd0120b7c23382ba4fa04a6f0397e02af1249be9a7309d1767"; + sha256 = "907ad29add1fff27342a9f4fe3e60003d450d3af41a38f22f629c7736fc8399d"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index ca7a518665ceacfcece740ac16b6e0e6bcb05417..ce5bb315581dbb730d65eb56ace4af140296c95b 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,30 +1,28 @@ { stdenv, buildPythonPackage, fetchPypi -, secretstorage -, fs, gdata, python_keyczar, pyasn1, pycrypto, six, setuptools_scm -, mock, pytest_28, pytestrunner }: +, setuptools_scm, entrypoints, secretstorage +, pytest, pytest-flake8 }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "keyring"; - version = "10.4.0"; + version = "12.0.1"; src = fetchPypi { inherit pname version; - sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh"; + sha256 = "846c9c709ee1203bac5444abec19b5228f4601377686f33cba672aa0ba313abd"; }; - buildInputs = [ - fs gdata python_keyczar pyasn1 pycrypto six setuptools_scm - ]; + nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ mock pytest_28 pytestrunner ]; + checkInputs = [ pytest pytest-flake8 ]; - propagatedBuildInputs = [ secretstorage ]; + propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; - doCheck = !stdenv.isDarwin; + # all tests with flake8 are broken right now + # https://github.com/tholo/pytest-flake8/issues/45 + doCheck = false; checkPhase = '' - py.test $out + py.test ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix deleted file mode 100644 index 7405f7f74cd566c4b8392a0fa2732e6e2b4f07b6..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ buildPythonPackage, isPyPy, fetchPypi, python -, pbr, testtools, testresources, testrepository, mock -, pep8, fixtures, mox3, requests-mock -, iso8601, requests, six, stevedore, webob, oslo-config -, pyyaml, betamax, oauthlib -}: - -buildPythonPackage rec { - pname = "keystoneauth1"; - version = "3.2.0"; - name = "${pname}-${version}"; - disabled = isPyPy; # a test fails - - src = fetchPypi { - inherit pname version; - sha256 = "0rg3harfyvai34lrjiqnl1crmvswjvj8nsviasnz4b9pcvp3d03n"; - }; - - buildInputs = [ pbr ]; - checkInputs = [ pyyaml betamax oauthlib testtools testresources - testrepository mock pep8 fixtures mox3 requests-mock ]; - propagatedBuildInputs = [ iso8601 requests six stevedore webob ]; - - doCheck = true; - # 1. oslo-config - # 2. oslo-utils - # 3. requests-kerberos - preCheck = '' - rm keystoneauth1/tests/unit/loading/test_{session,conf,adapter}.py - rm keystoneauth1/tests/unit/access/test_v{2,3}_access.py - rm keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py - ''; - postPatch = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - substituteInPlace requirements.txt --replace "argparse" "" - ''; -} diff --git a/pkgs/development/python-modules/keystoneclient/default.nix b/pkgs/development/python-modules/keystoneclient/default.nix deleted file mode 100644 index 5b09992295f7a4848ce1b9d35e994d2140a7a27d..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/keystoneclient/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python - -, pbr, testtools, testresources, testrepository -, requests-mock, fixtures, openssl, oslotest, pep8 - -, oslo-serialization, oslo-config, oslo-i18n, oslo-utils -, Babel, prettytable, requests, six, iso8601, stevedore -, netaddr, debtcollector, bandit, webob, mock, pycrypto -}: - -buildPythonPackage rec { - name = "keystoneclient-${version}"; - version = "1.8.1"; - - src = fetchFromGitHub { - owner = "openstack"; - repo = "python-keystoneclient"; - rev = version; - sha256 = "0yayn1hb3mncqb0isy8vy6d519xya7mhf5pcbn60fzdqjrkj2prq"; - }; - - PBR_VERSION = "${version}"; - - buildInputs = [ - pbr testtools testresources testrepository requests-mock fixtures openssl - oslotest pep8 - ]; - propagatedBuildInputs = [ - oslo-serialization oslo-config oslo-i18n oslo-utils - Babel prettytable requests six iso8601 stevedore - netaddr debtcollector bandit webob mock pycrypto - ]; - - postPatch = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - sed -ie '/argparse/d' requirements.txt - ''; - - doCheck = false; # The checkPhase below is broken - - checkPhase = '' - patchShebangs run_tests.sh - ./run_tests.sh - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/openstack/python-novaclient/; - description = "Client library and command line tool for the OpenStack Nova API"; - license = licenses.asl20; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index 2746f161668279ecd7d8865308cee9b0a94d1c1d..04b9e9235750fa3b4f155fc288da7851f9f32bf8 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -1,9 +1,8 @@ { lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }: -let +buildPythonPackage rec { pname = "keyutils"; version = "0.5"; -in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index a35737e69baf1eb44b69c817fe88ece24230a7d9..b4b6c48201bdd568c01e98eb385504fee9b5fb81 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -12,6 +12,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Kitchen contains a cornucopia of useful code"; license = licenses.lgpl2; - maintainers = with maintainers; [ mornfall ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6ee732a06cb1f8655c921027e47bdada65b7d8aa --- /dev/null +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "kiwisolver"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278"; + }; + + # Does not include tests + doCheck = false; + + meta = { + description = "A fast implementation of the Cassowary constraint solver"; + homepage = https://github.com/nucleic/kiwi; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3dfbb4e17db285dde86cb9adc89838d7721102a2 --- /dev/null +++ b/pkgs/development/python-modules/klein/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi +, six, twisted, werkzeug, incremental +, mock }: + +buildPythonPackage rec { + pname = "klein"; + version = "17.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "30aaf0d78a987d5dbfe0968a07367ad0c73e02823cc8eef4c54f80ab848370d0"; + }; + + propagatedBuildInputs = [ six twisted werkzeug incremental ]; + + checkInputs = [ mock ]; + + checkPhase = '' + trial klein + ''; + + meta = with lib; { + description = "Klein Web Micro-Framework"; + homepage = "https://github.com/twisted/klein"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 56865b336be821e6d4d67c0fb88501edbc2ee20e..f2073a48c589abae8b06c8a84e17c434ca44d018 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = { - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/python-modules/konfig/default.nix b/pkgs/development/python-modules/konfig/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e7062bad5ee77509f41953a0aed4e11d5400baf0 --- /dev/null +++ b/pkgs/development/python-modules/konfig/default.nix @@ -0,0 +1,48 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, writeText, configparser, six, pytest, glibcLocales }: + +buildPythonPackage rec { + pname = "konfig"; + version = "1.1"; + + # konfig unconditionaly depend on configparser, even if it is part of + # the standard library in python 3.2 or above. + disabled = isPy3k; + + # PyPI tarball is missing utf8.ini, required for tests + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = pname; + rev = version; + sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c"; + }; + + propagatedBuildInputs = [ configparser six ]; + + patches = [ (writeText "konfig.patch" '' + diff --git a/setup.py b/setup.py + index 96fd858..bb4db06 100644 + --- a/setup.py + +++ b/setup.py + @@ -20,7 +20,7 @@ setup(name='konfig', + author_email="tarek@mozilla.com", + include_package_data=True, + install_requires = [ + - 'configparser', 'argparse', 'six' + + 'configparser', 'six' + ], + zip_safe=False, + classifiers=classifiers, + '') ]; + + checkInputs = [ pytest glibcLocales ]; + + checkPhase = '' + LC_ALL=en_US.utf8 pytest -v konfig/tests + ''; + + meta = with lib; { + description = "Yet Another Config Parser"; + homepage = "https://github.com/mozilla-services/konfig"; + license = licenses.mpl20; + }; +} diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5566eea64eb856b95a25ff99347c4f4dfc274c6d --- /dev/null +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, + ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, + isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: + +buildPythonPackage rec { + pname = "kubernetes"; + version = "5.0.0"; + + prePatch = '' + sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt + + # This is used to randomize tests, which is not reproducible. Drop it. + sed -e '/randomize/d' -i test-requirements.txt + '' + # This is a python2 and python3.2 only requiremet since it is a backport of a python-3.3 api. + + (if (pythonAtLeast "3.3") then '' + sed -e '/ipaddress/d' -i requirements.txt + '' else ""); + + checkPhase = '' + py.test + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "1z8rrlq73bzli9rg57kj8ivz09vhsydyjq1ksbcis6j7h9c187zq"; + }; + + checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; + propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth ]; + + meta = with stdenv.lib; { + description = "Kubernetes python client"; + homepage = https://github.com/kubernetes-client/python; + license = licenses.asl20; + maintainers = with maintainers; [ lsix ]; + }; +} diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d1d25f5407c2ef578f811033d47689468ed77b6b --- /dev/null +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, marisa-trie +, pythonOlder +, fetchPypi +, nose +}: + +buildPythonPackage rec { + pname = "langcodes"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1axdiva2qglsjmnx2ak7i6hm0yhp6kbc4lcsgn8ckwy0nq1z3kr2"; + }; + + propagatedBuildInputs = [ marisa-trie ]; + + disabled = pythonOlder "3.3"; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "A toolkit for working with and comparing the standardized codes for languages, such as ‘en’ for English or ‘es’ for Spanish"; + homepage = http://github.com/LuminosoInsight/langcodes; + license = licenses.mit; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a1b58a4eb05def589614934acacec99197c718a6 --- /dev/null +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "lark-parser"; # PyPI name + version = "2017-12-18"; + + src = fetchFromGitHub { + owner = "erezsh"; + repo = "lark"; + rev = "9d6cde9b1ba971f02ea8106fa3b71a934e83d6fa"; + sha256 = "0nv6nxd8wx9dwhn37m94fkc10gknckrjs1hzajxygla3dpql455j"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + doCheck = false; # Requires js2py + + meta = { + description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; + homepage = https://github.com/erezsh/lark; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3b639ee2afb9ed3c8cd3fe6a4f0909d35d6eb3ae --- /dev/null +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "latexcodec"; + version = "1.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zdd1gf24i83ykadx0y30n3001j43scqr2saql3vckk5c39dj1wn"; + }; + + propagatedBuildInputs = [ six ]; + + meta = { + homepage = "https://github.com/mcmtroffaes/latexcodec"; + description = "Lexer and codec to work with LaTeX code in Python"; + license = stdenv.lib.licenses.mit; + }; + +} diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 635308f37607850208df9c2e864acaa4a42ca318..c039bcc043a233939d4c0f125da7c240e1a502c4 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,18 +1,21 @@ -{ lib, writeText, buildPythonPackage, isPy3k, fetchPypi -, openldap, cyrus_sasl, openssl, pytest }: +{ lib, buildPythonPackage, fetchPypi +, pyasn1, pyasn1-modules, pytest +, openldap, cyrus_sasl }: buildPythonPackage rec { pname = "python-ldap"; - version = "2.4.45"; - name = "${pname}-${version}"; - disabled = isPy3k; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "824fde180a53772e23edc031c4dd64ac1af4a3eade78f00d9d510937d562f64e"; + sha256 = "86746b912a2cd37a54b06c694f021b0c8556d4caeab75ef50435ada152e2fbe1"; }; - buildInputs = [ pytest ]; + propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; + + buildInputs = [ openldap cyrus_sasl ]; + + checkInputs = [ pytest ]; checkPhase = '' # Needed by tests to setup a mockup ldap server. @@ -21,28 +24,6 @@ buildPythonPackage rec { export SLAPD="${openldap}/libexec/slapd" export SCHEMA="${openldap}/etc/schema" - # AssertionError: expected errno=107, got 57 -> nix sandbox related ? - py.test -k 'not TestLdapCExtension and \ - not Test01_SimpleLDAPObject and \ - not Test02_ReconnectLDAPObject' Tests/*.py + py.test ''; - - 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/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 895272f351de6a0d05fa16fee323613bad69a773..a58090680cd9de20850b2041172db54bccf6e821 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }: buildPythonPackage rec { - version = "2.3"; + version = "2.4.1"; pname = "ldap3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1b36lwil4iflk2ay8gi663abpnfm8id7qg4n3jkmmqbnc1sv6mn0"; + sha256 = "1a66pc00az0nx9kvhzidbg099pvk52ngycf891bp5jyfm1ahvzp8"; }; buildInputs = [ gssapi ]; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..58ca72a3dc98432b39faeae007db8be863950b1a --- /dev/null +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k +, pbr, ldap, fixtures, testresources, testtools }: + +buildPythonPackage rec { + name = "ldappool-${version}"; + version = "2.2.0"; + + src = fetchPypi { + pname = "ldappool"; + inherit version; + sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz"; + }; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ ldap ]; + + checkInputs = [ fixtures testresources testtools ]; + + meta = with lib; { + description = "A simple connector pool for python-ldap"; + homepage = https://git.openstack.org/cgit/openstack/ldappool; + license = licenses.mpl20; + }; +} diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4eab700ff14058938749739a69145f16f1c3cc2a --- /dev/null +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, twisted +, pycrypto +, pyopenssl +, pyparsing +, zope_interface +, isPy3k +}: + +buildPythonPackage rec { + pname = "ldaptor"; + version = "16.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "6b9ebe5814e9e7091703c4e3bfeae73b46508b4678e2ff403cddaedf8213815d"; + }; + + propagatedBuildInputs = [ + twisted pycrypto pyopenssl pyparsing zope_interface + ]; + + disabled = isPy3k; + + # TypeError: None is neither bytes nor unicode + doCheck = false; + + meta = { + description = "A Pure-Python Twisted library for LDAP"; + homepage = https://github.com/twisted/ldaptor; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 9b2499cd5b23a066c4e9654da65b2a94b89cb4fb..dfd5d5dfde9f1f2d977ea0dead4eb35c64e21cd6 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ledgerblue"; - version = "0.1.16"; + version = "0.1.17"; src = fetchPypi { inherit pname version; - sha256 = "eba56b887339fb5f8582771e4e398df4fa5a017183b908d4f8950588157c1504"; + sha256 = "ac403b074337b9b58cae97ea00b3d94fc8efeea1717a80c49e79dc8aad6fc58f"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ]; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index e8cecda75897e379ffc0da5b3d356c99b9e2692b..757a171d838125b075632dd3417c9b92e10f5b6e 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "libagent"; - version = "0.9.5"; + version = "0.9.8"; src = fetchPypi{ inherit pname version; - sha256 = "982b81c19dc9ee1158dc32fedbe1c36aff2b6872fa0dd42173b639b965ccfb2e"; + sha256 = "7e7d62cedef9d1291b8e77abc463d50b3d685dfd953611d55a0414c12276aa78"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 5d8c886e00bd2500c620a62c20366d261936debd..5261a7b656428b16715310b2a7fbc81d9eeeb8b0 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,20 +1,19 @@ -{ stdenv, buildPythonPackage, fetchurl, +{ stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { pname = "libais"; - name = "${pname}-${version}"; - version = "0.16"; + version = "0.17"; - src = fetchurl { - url = "mirror://pypi/l/libais/${name}.tar.bz2"; - sha256 = "14dsh5k32ryszwdn6p45wrqp4ska6cc9qpm6lk5c5d1p4rc7wnhq"; + src = fetchPypi { + inherit pname version; + sha256 = "0pyka09h8nb0vlzh14npq4nxmzg1046lr3klgn97dsf5k0iflapb"; }; # data files missing doCheck = false; - buildInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytestrunner pytestcov coverage ]; propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 789beaa2384c27e1166d03e768a50bf35d682247..d9cc5fb0d9e5c6f6efc0a83904c69a21a083f6fc 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -7,13 +7,13 @@ else stdenv.mkDerivation rec { pname = "libarcus"; name = "${pname}-${version}"; - version = "3.0.3"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "05dpd6nx32nws0ghsm365wlsb8hg2s3v9fqcmdk11biwfhnr6rjw"; + sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk"; }; propagatedBuildInputs = [ sip protobuf ]; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 3c24c2ed24cbc4e4c48d8cd298cf307285313817..26fe33995ed83e81abfb38e7916c1df4ac4a8158 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenv , lib , buildPythonPackage , fetchFromGitHub @@ -11,18 +11,19 @@ , python , cudaSupport ? false, cudatoolkit , openclSupport ? true, ocl-icd, clblas -}: +}: buildPythonPackage rec { - name = "libgpuarray-${version}"; - version = "0.6.9"; + pname = "libgpuarray"; + version = "0.7.5"; + name = pname + "-" + version; src = fetchFromGitHub { - owner = "Theano"; + owner = "Theano"; repo = "libgpuarray"; rev = "v${version}"; - sha256 = "06z47ls42a37gbv0x7f3l1qvils7q0hvy02s95l530klgibp19s0"; - }; + sha256 = "0zkdwjq3k6ciiyf8y5w663fbsnmzhgy27yvpxfhkpxazw9vg3l5v"; + }; # requires a GPU doCheck = false; @@ -32,22 +33,21 @@ buildPythonPackage rec { libraryPath = lib.makeLibraryPath ( [] ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] - ++ lib.optionals openclSupport [ ocl-icd clblas ] + ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) ); preBuild = '' make -j$NIX_BUILD_CORES make install - ls $out/lib export NIX_CFLAGS_COMPILE="-L $out/lib -I $out/include $NIX_CFLAGS_COMPILE" cd .. - ''; + ''; postFixup = '' rm $out/lib/libgpuarray-static.a - + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' function fixRunPath { p=$(patchelf --print-rpath $1) patchelf --set-rpath "$p:$libraryPath" $1 @@ -64,18 +64,18 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ - cmake - cython + buildInputs = [ + cmake + cython nose - ]; + ]; meta = with stdenv.lib; { homepage = "https://github.com/Theano/libgpuarray"; description = "Library to manipulate tensors on GPU."; license = licenses.free; maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index b9404ab5ec313593d1f1cb16c5de5d9a27302302..417baed956034ef3420c2c5a1c14935f7b8338f6 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest_29 }: +{ stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "libtmux"; - version = "0.7.5"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "12e5006e59b7d98af5d1a9294f9c8ff2829ac2c1c6ae23dc73c280100b15f485"; + sha256 = "2b969b507c26d9db08b85be4808d75774b6418ecf5a0f61956f7a1da44519585"; }; - buildInputs = [ pytest_29 ]; - patchPhase = '' + checkInputs = [ pytest ]; + postPatch = '' sed -i 's/==.*$//' requirements/test.txt ''; + # No tests in archive + doCheck = false; + meta = with stdenv.lib; { description = "Scripting library for tmux"; homepage = https://libtmux.readthedocs.io/; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f3b48eaa57606851fc90a093d029e72aab761c3e --- /dev/null +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, libusb1 }: + +buildPythonPackage rec { + pname = "libusb1"; + version = "1.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "03b7xrz8vqg8w0za5r503jhcmbd1ls5610jcja1rqz833nf0v4wc"; + }; + + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace usb1/libusb1.py --replace \ + "ctypes.util.find_library(base_name)" \ + "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + buildInputs = [ libusb1 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/vpelletier/python-libusb1; + description = "Python ctype-based wrapper around libusb1"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d120c38b02cb945b85ff167dd988ad76176ea3b1 --- /dev/null +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchgit, python, pkgconfig, lxml, libvirt, nose }: + +buildPythonPackage rec { + pname = "libvirt"; + version = "4.1.0"; + + src = assert version == libvirt.version; fetchgit { + url = git://libvirt.org/libvirt-python.git; + rev = "v${version}"; + sha256 = "0z87y6qr0ypdxfanphxl7yanisd7a0b0bwhg97kii68mig5dlw9r"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt lxml ]; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = http://www.libvirt.org/; + description = "libvirt Python bindings"; + license = licenses.lgpl2; + maintainers = [ maintainers.fpletz ]; + }; +} diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..57f47ff5fd829994da07d18f351a6e3c83e71933 --- /dev/null +++ b/pkgs/development/python-modules/limits/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, six }: + +buildPythonPackage rec { + pname = "limits"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "a017b8d9e9da6761f4574642149c337f8f540d4edfe573fb91ad2c4001a2bc76"; + }; + + propagatedBuildInputs = [ six ]; + + doCheck = false; # ifilter + + meta = with stdenv.lib; { + description = "Rate limiting utilities"; + license = licenses.mit; + homepage = https://limits.readthedocs.org/; + }; +} diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 570bba2a8c42ff6298a69b1a390e01c5477e7278..26dfda613f75d755a477c94402e9733a4b9a5e60 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "line_profiler"; - version = "2.0"; + version = "2.1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381"; + sha256 = "efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c"; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 45c33f94b28a689474b45910bd87ff36f51604cb..ad6b938c9888c33b33a5b1908007edcbcbb3035d 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, isPy3k, pythonOlder, lib, requests, future, - enum34 }: + enum34, + mock }: buildPythonPackage rec { pname = "linode-api"; - version = "4.1.2b0"; # NOTE: this is a beta, and the API may change in future versions. - name = "${pname}-${version}"; + version = "4.1.8b1"; # NOTE: this is a beta, and the API may change in future versions. disabled = (pythonOlder "2.7"); @@ -22,11 +22,15 @@ buildPythonPackage rec { sed -i -e '/"enum34",/d' setup.py ''); - doCheck = false; # This library does not have any tests at this point. + doCheck = true; + checkInputs = [ mock ]; - src = fetchPypi { - inherit pname version; - sha256 = "19yzyb4sbxib8yxmrqm6d8i0fm8cims56q7kiq2ana26nbcm0gr4"; + # Sources from Pypi exclude test fixtures + src = fetchFromGitHub { + rev = "v${version}"; + owner = "linode"; + repo = "python-linode-api"; + sha256 = "0qfqn92fr876dncwbkf2vhm90hnf7lwpg80hzwyzyzwz1hcngvjg"; }; meta = { diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 7c907d1e5ef335373967a91271c2707f17c82be4..f53ff3cbebaacdb868b11bb9299f63bc9432ad56 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -3,11 +3,13 @@ }: buildPythonPackage rec { - name = "llfuse-1.0"; + pname = "llfuse"; + version = "1.3.3"; + name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; + sha256 = "e514fa390d143530c7395f640c6b527f4f80b03f90995c7b38ff0b2f86e11ce7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 57deaf3caf361f89094ef57742e3b9fdb0862d8d..b420e7149d751fcd1633e3b12fe55194c9a7abc4 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchPypi , buildPythonPackage , python , llvm @@ -10,21 +10,20 @@ buildPythonPackage rec { pname = "llvmlite"; - name = "${pname}-${version}"; - version = "0.20.0"; + version = "0.22.0"; disabled = isPyPy; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "b2f174848df16bb9195a07fec102110a06d018da736bd9b3570a54d44c797c29"; + src = fetchPypi { + inherit pname version; + sha256 = "a0a875f3d502f41f4a24444aa98fbf076a6bf36e2a0b3b4481b22e1c4a3acdc2"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; # Disable static linking # https://github.com/numba/llvmlite/issues/93 - patchPhase = '' + postPatch = '' substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9ad9ddb433f01b1d39aba352ef4308b61184e734 --- /dev/null +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "lmtpd"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "192d1j9lj9i6f4llwg51817am4jj8pjvlqmkx03spmsay6f832bm"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/moggers87/lmtpd; + description = "LMTP counterpart to smtpd in the Python standard library"; + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/locket/default.nix b/pkgs/development/python-modules/locket/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a4d7a8ce70627426fc1b19b1a03b1ff809570239 --- /dev/null +++ b/pkgs/development/python-modules/locket/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "locket"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d4z2zngrpqkrfhnd4yhysh66kjn4mblys2l06sh5dix2p0n7vhz"; + }; + + buildInputs = [ pytest ]; + + # weird test requirements (spur.local>=0.3.7,<0.4) + doCheck = false; + + meta = with stdenv.lib; { + description = "Locket implements a lock that can be used by multiple processes provided they use the same path."; + homepage = https://github.com/mwilliamson/locket.py; + license = licenses.bsd2; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c3e27c8b36a0db355adb7ddfd5c6a6eae9d447d8 --- /dev/null +++ b/pkgs/development/python-modules/locustio/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, fetchPypi +, mock +, unittest2 +, msgpack-python +, requests +, flask +, gevent +, pyzmq +}: + +buildPythonPackage rec { + pname = "locustio"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "64583987ba1c330bb071aee3e29d2eedbfb7c8b342fa064bfb74fafcff660d61"; + }; + + patchPhase = '' + sed -i s/"pyzmq=="/"pyzmq>="/ setup.py + ''; + + propagatedBuildInputs = [ msgpack-python requests flask gevent pyzmq ]; + buildInputs = [ mock unittest2 ]; + + meta = { + homepage = https://locust.io/; + description = "A load testing tool"; + }; +} diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index 952cc03e454ea2f6a8f3fc543a8f5df67c12e4fb..8f7229a4c0f045e7d420069472f198f6bc1af58a 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "logilab-database provides some classes to make unified access to different"; - homepage = "http://www.logilab.org/project/logilab-database"; + homepage = "https://www.logilab.org/project/logilab-database"; }; } diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e4b57e4ce40cd034b30ae88b9e8279072e63882c --- /dev/null +++ b/pkgs/development/python-modules/logster/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pygtail }: + +buildPythonPackage rec { + pname = "logster"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "etsy"; + repo = pname; + rev = version; + sha256 = "06ac5hydas24h2cn8l5i69v1z0min5hwh6a1lcm1b08xnvpsi85q"; + }; + + propagatedBuildInputs = [ pygtail ]; + + meta = with lib; { + description = "Parses log files, generates metrics for Graphite and Ganglia"; + license = licenses.gpl3Plus; + homepage = https://github.com/etsy/logster; + }; +} diff --git a/pkgs/development/python-modules/ltc_scrypt/default.nix b/pkgs/development/python-modules/ltc_scrypt/default.nix deleted file mode 100644 index 273571c66e1f3e049d164d6b8b33ee841248cc5c..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/ltc_scrypt/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ 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/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..dc40101284c0bc9ae32dc55a4dbcc337689dc1d2 --- /dev/null +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, isPy3k, fetchPypi, aiohttp, async-timeout }: + +buildPythonPackage rec { + pname = "luftdaten"; + version = "0.1.4"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "d3e3af830ad2b731c36af223bbb5d47d68aa3786b2965411216917a7381e1179"; + }; + + propagatedBuildInputs = [ aiohttp async-timeout ]; + + # No tests implemented + doCheck = false; + + meta = with lib; { + description = "Python API for interacting with luftdaten.info"; + homepage = https://github.com/fabaff/python-luftdaten; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9fd050ac35ed3137b7faf296d488616c9bdf33e9 --- /dev/null +++ b/pkgs/development/python-modules/lxml/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, libxml2 +, libxslt +}: + +buildPythonPackage rec { + pname = "lxml"; + version = "4.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b"; + }; + + buildInputs = [ libxml2 libxslt ]; + + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; + + meta = { + description = "Pythonic binding for the libxml2 and libxslt libraries"; + homepage = http://lxml.de; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sjourdois ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index e493596cfa59d376b6951f1a30b39e830604aa3a..9ec291439cef96f438e08bde2bf5fa97138aacf4 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.12"; + version = "0.1.14"; src = fetchPypi { inherit pname version; - sha256 = "adfb86ebb7ff3fcd3ebb27ce8cd6f795c409a13f0c03363e265f17419ce5b9ab"; + sha256 = "a14635cdeedb125f0f85e014eb5898fd634e2da358a160c124818e9c9f851add"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a553a3bf4335750b75362923993ff54d9157c838 --- /dev/null +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, twisted, mock }: + +buildPythonPackage rec { + pname = "magic-wormhole-transit-relay"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "b13f1bfab295150b25958014d93fcd9f744d92011d186d7381575465587b8587"; + }; + + propagatedBuildInputs = [ twisted ]; + + checkInputs = [ mock ]; + + checkPhase = '' + python -m twisted.trial wormhole_transit_relay + ''; + + meta = with lib; { + description = "Transit Relay server for Magic-Wormhole"; + homepage = https://github.com/warner/magic-wormhole-transit-relay; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index b21643b4547ad7b3813da5c21cccad2c93dc3fdc..7d170345dbbe512c62c6869331b1464229173c27 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -2,41 +2,49 @@ , buildPythonPackage , fetchPypi , pythonAtLeast -, nettools -, glibcLocales +, python +, spake2 +, pynacl +, six +, attrs +, twisted , autobahn -, cffi -, click +, automat , hkdf -, pynacl -, spake2 , tqdm -, python -, mock -, ipaddress +, click , humanize -, pyopenssl -, service-identity +, ipaddress , txtorcon +, nettools +, glibc +, glibcLocales +, mock +, magic-wormhole-transit-relay }: buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.10.3"; - name = "${pname}-${version}"; + version = "0.10.5"; src = fetchPypi { inherit pname version; - sha256 = "48465d58f9c0d729dc586627cf280830e7ed59f9e7999946ae1d763c6b8db999"; + sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee"; }; - checkInputs = [ mock ]; + checkInputs = [ mock magic-wormhole-transit-relay ]; buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ]; + propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize ipaddress txtorcon ]; 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_cli.py + + # magic-wormhole will attempt to find all available locales by running + # 'locale -a'. If we're building on Linux, then this may result in us + # running the system's locale binary instead of the one from Nix, so let's + # ensure we patch this. + sed -i -e 's|getProcessOutputAndValue("locale"|getProcessOutputAndValue("${glibc}/bin/locale"|' src/wormhole/test/test_cli.py '' + lib.optionalString (pythonAtLeast "3.3") '' sed -i -e 's|"ipaddress",||' setup.py ''; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index fbdd13a7f385fb06a668c73609e0563371ea850b..f909974db6b3447ed512addd8319f7e98189c782 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "marionette-harness"; - version = "4.1.0"; + version = "4.3.0"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "20c188791e28d586c58acf86ff28cb704c4195a4da6eb10db7b8c6771e3f2983"; + sha256 = "a98bb65a0c63f60d9e3d7ef21dabc9c29676917dc2ec0d46851a3ed694c820cc"; }; propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index d3eab83eea8605c4b16263551930b2f57d97e3bd..4315b08e016f6e3e70a528bdcdfdb1cef5171a0b 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "marionette_driver"; - version = "2.3.0"; + version = "2.5.0"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0ab9xxsp0zvckf32k84n52hpibw2c62sa2pmx821d3q0d67yv2vv"; + sha256 = "0axhdin9ys3i9lnwqqqw87wap9000bk6cdgrzpd2gqricc7l3v65"; }; propagatedBuildInputs = [ mozversion mozrunner ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 00329aa1d3f024896cfc33d58a220bdc2d77e3e3..af26c8d071d690cc9cd13a60dac2b8479ca69cc1 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mozdevice"; - version = "0.50"; + version = "0.52"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0cfxzhfxdphlzj80vkd3h7m0mg5w7zhb8h6f5lmybliqdiv9vz20"; + sha256 = "5b6fcbc7179c0f09bd99f7f7c42b614bce5f39543fb18b190e408488f987d6b5"; }; propagatedBuildInputs = [ moznetwork mozprocess ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index 5960848ff63b6382c62e74e67699245ac00b5c15..dfe91309ea40072d68e2fee1a2327cc2ee42a7c0 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -4,22 +4,25 @@ , fetchPypi , isPy3k , blessings +, mozterm +, six , mozfile }: buildPythonPackage rec { pname = "mozlog"; - version = "3.4"; - name = "${pname}-${version}"; + version = "3.7"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1m4d9i1kzcmkhipfd5czv05f2s84j1byx3cv4y2irjmwq5v6cyiq"; + sha256 = "414141131c4f5e7242e69a939d2b74f4ed8dbac12bef93eee4e7125cd1a131e9"; }; - propagatedBuildInputs = [ blessings mozfile ]; + propagatedBuildInputs = [ blessings mozterm six ]; + + checkInputs = [ mozfile ]; meta = { description = "Mozilla logging library"; diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix index b6bea84aa238de81ce73342ba3c5b8159c5f117c..80b13d94a2d9659cb175670e185c2feb2385dad1 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "mozprocess"; - version = "0.25"; + version = "0.26"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0lfflwjkwvc8bqvsgdib3b78w2pms8nharh3sc3zgsrmqb1mbzks"; + sha256 = "9f471c45bee9ff14e936c6ee216a6cc4941223659c01fa626bce628001d8485c"; }; propagatedBuildInputs = [ mozinfo ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index 5e939d4f33313015f69408a8716eca58c40b46d2..a783c125af3a37c62a4ef238040d7a9c22437c81 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "mozprofile"; - version = "0.28"; + version = "0.29"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "15xsdhrpbg7hlr6nvb3k3ci33h786hrv12az8j2k7aa9gzjcf8nh"; + sha256 = "92af4b9f527a18997dccb60e846e1844b2428668dadf3ccb1a8cd30c706b25c1"; }; propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index b0c3f6d8bcfa6fc1063c55c090de4764dd287882..51344a8a95a5a463c54e248bd773488d58bf16f1 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "mozrunner"; - version = "6.13"; + version = "6.15"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1d5k3a0w1iyyk6l28l65j47grq87zd207h369x4vahq02nrx2g6l"; + sha256 = "985d4d4cf7597f09ed1b42165997d966fa35b0130a7a6bbcb2c71ecd5f4c453f"; }; propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index 62605a1d21d3a2dff75898d5dea1e4b23c230d86..729f110858c8c447ae4f0f9e8d2e0cc0eeac0fdc 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mozversion"; - version = "1.4"; + version = "1.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "15ipddn6bpqxl590cy37fj52vgpa4faw2dax1mwvdxj7b18s3pwh"; + sha256 = "e9b11e4a46bf7a4a11469ea4589c75f3ba50b34b7801e7edf1a09147af8bf70f"; }; propagatedBuildInputs = [ mozlog mozdevice ]; diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad9f6d6f2457803eec53d5d349fd5558bbbee059 --- /dev/null +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestrunner +, pytest +, hypothesis +}: + +buildPythonPackage rec { + pname = "marisa-trie"; + version = "0.7.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1n4pxnaranbh3x2fcqxwh8j1z2918vy7i4q1z4jn75m9rkm5h8ia"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "hypothesis==" "hypothesis>=" + ''; + + nativeBuildInputs = [ pytestrunner ]; + + checkInputs = [ pytest hypothesis ]; + + meta = with lib; { + description = "Static memory-efficient Trie-like structures for Python (2.x and 3.x) based on marisa-trie C++ library"; + longDescription = "There are official SWIG-based Python bindings included in C++ library distribution; this package provides alternative Cython-based pip-installable Python bindings."; + homepage = https://github.com/kmike/marisa-trie; + license = licenses.mit; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1117ba958fa4b8bfbda00661e354ad72bc38de6c --- /dev/null +++ b/pkgs/development/python-modules/marisa/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig }: + +buildPythonPackage rec { + pname = "marisa"; + version = "1.3.40"; + + src = fetchFromGitHub { + owner = "s-yata"; + repo = "marisa-trie"; + rev = "59e410597981475bae94d9d9eb252c1d9790dc2f"; + sha256 = "0z4bf55np08q3cbi6gvj3cpw3zp8kf2d0jq6k74pjk066m7rapbb"; + }; + + nativeBuildInputs = [ swig marisa ]; + buildinputs = [ marisa ]; + + sourceRoot = "${src.name}/bindings/python"; + + meta = with stdenv.lib; { + description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)"; + homepage = https://github.com/s-yata/marisa-trie; + license = with licenses; [ bsd2 lgpl2 ]; + maintainers = with maintainers; [ vanzef ]; + }; +} diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..515dee0e7662e75bc7e84af391af38de00cfe9b9 --- /dev/null +++ b/pkgs/development/python-modules/markdown/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pyyaml +}: + +buildPythonPackage rec { + pname = "Markdown"; + version = "2.6.10"; + + src = fetchPypi { + extension = "zip"; + inherit pname version; + sha256 = "cfa536d1ee8984007fcecc5a38a493ff05c174cb74cb2341dafd175e6bc30851"; + }; + + # error: invalid command 'test' +# doCheck = false; + + checkInputs = [ nose pyyaml ]; + + meta = { + description = "A Python implementation of John Gruber’s Markdown with Extension support"; + homepage = https://github.com/Python-Markdown/markdown; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index f614eb0747bba3e74569f47a54bed60782950007..2b576cd3b056a63a083fa2983b880c152e1b78a1 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "markdown2"; - version = "2.3.4"; + version = "2.3.5"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/markdown2/${name}.zip"; - sha256 = "264731e7625402227ff6fb01f2d814882da7705432659a18a419c508e8bfccb1"; + sha256 = "8bb9a24eb2aa02f1427aabe46483f0f0215ab18c8a345315ae8e2ee3c3a09c03"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index afb60801dc9436558d9bc9f1f23519d53f01ab73..a9db6ef1e84c04bc02dab47eed8a00967e69489d 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "marshmallow"; name = "${pname}-${version}"; - version = "2.14.0"; + version = "2.15.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "09943a460026b9a61c3f4cedd0e5ccfed7cfce3271debd19e3f97df561088718"; + sha256 = "d3f31fe7be2106b1d783cbd0765ef4e1c6615505514695f33082805f929dd584"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 345a21ecddfe55656eca13b3cfc088b35eb6f8dd..46f85b654c725f4907b9b5cd39f8daff50c14030 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, buildPythonPackage, pycairo, backports_functools_lru_cache -, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado +, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobjectIntrospection @@ -8,6 +8,7 @@ , enableQt ? false, pyqt4 , libcxx , Cocoa +, pythonOlder }: assert enableGhostscript -> ghostscript != null; @@ -20,13 +21,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "2.1.0"; + version = "2.2.2"; pname = "matplotlib"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387"; + sha256 = "4dc7ef528aad21f22be85e95725234c5178c0f938e2228ca76640e5e84d8cde8"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -38,9 +39,9 @@ buildPythonPackage rec { ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype - libpng pkgconfig mock pytz backports_functools_lru_cache - ] + [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver + libpng pkgconfig mock pytz ] + ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9c6cb241fea51d07884a6f162f6922838a5e95f4 --- /dev/null +++ b/pkgs/development/python-modules/maya/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchPypi, fetchpatch, buildPythonPackage +, dateparser, humanize, pendulum, ruamel_yaml, tzlocal }: + +buildPythonPackage rec { + pname = "maya"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x88k4irpckvd7jf2yvqjw1s52hjqbxym1r1d928yb3fkj7rvlxs"; + }; + + patches = [ + (fetchpatch { + # https://github.com/kennethreitz/maya/issues/112 + # Merged, so should be in next release. + url = "https://github.com/kennethreitz/maya/commit/f69a93b1103130139cdec30511777823957fb659.patch"; + sha256 = "152ba7amv9dhhx1wcklfalsdzsxggik9f7rsrikms921lq9xqc8h"; + }) + ]; + + propagatedBuildInputs = [ dateparser humanize pendulum ruamel_yaml tzlocal ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Datetimes for Humans"; + homepage = https://github.com/kennethreitz/maya; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 28f6057e56337fc6304a3e3ab777d51426cee08c..9fbaced9b657213b88737de23272d4d304f413d2 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -1,16 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest_29, future, numpy }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, future, numpy }: buildPythonPackage rec { pname = "MDP"; version = "3.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k"; }; - checkInputs = [ pytest_29 ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ future numpy ]; # Tests disabled because of missing dependencies not in nix diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..110d1a57c826db8461b9a785330b32449a2edf17 --- /dev/null +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, mecab +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mecab-python3"; + version = "0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "007dg4f5fby2yl7cc44x6xwvcrf2w2ifmn0rmk56ss33mhs8l6qy"; + }; + + propagatedBuildInputs = [ mecab ]; + + meta = with lib; { + description = "A python wrapper for mecab: Morphological Analysis engine"; + homepage = https://github.com/LuminosoInsight/wordfreq/; + license = licenses.bsd0; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..526cd3ed4eeca22d8094b86d1ef53fed6a4ec253 --- /dev/null +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, greenlet }: + +buildPythonPackage rec { + pname = "meinheld"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rg5878njn66cc0x2fwrakikz24946r0cxxl6j8vvz5phd4zygi9"; + }; + + propagatedBuildInputs = [ greenlet ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "High performance asynchronous Python WSGI Web Server"; + homepage = http://meinheld.org/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index ec6c15b250129fc2f90bbe6e0c4bb9f5800cab29..5a348e5288c4a2e6055b353a0319de79f14bf219 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Memory Usage Analyzer"; - homepage = http://launchpad.net/meliae; + homepage = https://launchpad.net/meliae; license = licenses.gpl3; maintainers = with maintainers; [ xvapx ]; }; diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5e3afe05ea79ddd57f8b0f5cdbea336b44eeb667 --- /dev/null +++ b/pkgs/development/python-modules/micawber/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, beautifulsoup4 }: + +buildPythonPackage rec { + pname = "micawber"; + version = "0.3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pnq6j8f144virhri0drgf0058x6qcxfd5yrb0ynbwr8djh326yn"; + }; + + propagatedBuildInputs = [ beautifulsoup4 ]; + + meta = with stdenv.lib; { + homepage = http://micawber.readthedocs.io/en/latest/; + description = "A small library for extracting rich content from urls"; + license = licenses.mit; + longDescription = '' + micawber supplies a few methods for retrieving rich metadata + about a variety of links, such as links to youtube videos. + micawber also provides functions for parsing blocks of text and html + and replacing links to videos with rich embedded content. + ''; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d267cb6a9762390be82f5cb0454b959eb8f8416a --- /dev/null +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "miniupnpc"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ca94zz7sr2x57j218aypxqcwkr23n8js30f3yrvvqbg929nr93y"; + }; + + meta = with stdenv.lib; { + description = "miniUPnP client"; + homepage = http://miniupnp.free.fr/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/misaka/default.nix b/pkgs/development/python-modules/misaka/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b40aead390904eee76818a9b245615fc331f7b2f --- /dev/null +++ b/pkgs/development/python-modules/misaka/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage, cffi }: +buildPythonPackage rec { + pname = "misaka"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yqrq3a5rracirmvk52n28nn6ckdaz897gnigv89a9gmyn87sqw7"; + }; + + propagatedBuildInputs = [ cffi ]; + + # The tests require write access to $out + doCheck = false; + + meta = with lib; { + description = "A CFFI binding for Hoedown, a markdown parsing library"; + homepage = "http://misaka.61924.nl/"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 14aef5b00d1217a44695b8aad0343948728a57c5..7ab4a18426342863ca9234175165211d6d6e523d 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "mistune"; - version = "0.7.4"; + version = "0.8.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0byj9jg9ly7karf5sb1aqcw7avaim9sxl8ws7yw7p1fibjgsy5w5"; + sha256 = "bc10c33bfdcaa4e749b779f62f60d6e12f8215c46a292d05e486b869ae306619"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..edb3407270f2aa929bf7d0a30c2c85046074b716 --- /dev/null +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, mock }: + +buildPythonPackage rec { + pname = "mock-open"; + version = "1.3.1"; + + # no tests in PyPI tarball + src = fetchFromGitHub { + owner = "nivbend"; + repo = pname; + rev = "v${version}"; + sha256 = "0ikhrhlkl5c7qbigpsv44jw89ws1z7j06gzyg5dh1ki533ifbjm2"; + }; + + propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; + + meta = with lib; { + homepage = https://github.com/nivbend/mock-open; + description = "A better mock for file I/O"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2097470d4e474f059bea46fdf00f45d420916318 --- /dev/null +++ b/pkgs/development/python-modules/moinmoin/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchurl, fetchpatch, isPy3k +, pytest, werkzeug, pygments +}: + +buildPythonPackage rec { + name = "moinmoin"; + version = "1.9.9"; + + # SyntaxError in setup.py + disabled = isPy3k; + + src = fetchurl { + url = "http://static.moinmo.in/files/moin-${version}.tar.gz"; + sha256 = "197ga41qghykmir80ik17f9hjpmixslv3zjgj7bj9qvs1dvdg5s3"; + }; + + patches = [ + # Recommended to install on their download page. + (fetchpatch { + url = "https://bitbucket.org/thomaswaldmann/moin-1.9/commits/561b7a9c2bd91b61d26cd8a5f39aa36bf5c6159e/raw"; + sha256 = "1nscnl9nspnrwyf3n95ig0ihzndryinq9kkghliph6h55cncfc65"; + }) + ./fix_tests.patch + ]; + + checkInputs = [ pytest werkzeug pygments ]; + + meta = with lib; { + description = "Advanced, easy to use and extensible WikiEngine"; + + homepage = "https://moinmo.in/"; + + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/development/python-modules/moinmoin/fix_tests.patch b/pkgs/development/python-modules/moinmoin/fix_tests.patch new file mode 100644 index 0000000000000000000000000000000000000000..e9856eeffca695576aed4724d65ec6d9085260aa --- /dev/null +++ b/pkgs/development/python-modules/moinmoin/fix_tests.patch @@ -0,0 +1,16 @@ +diff -ru3 moin-1.9.9-old/MoinMoin/conftest.py moin-1.9.9-new/MoinMoin/conftest.py +--- moin-1.9.9-old/MoinMoin/conftest.py 2016-10-31 23:44:02.000000000 +0300 ++++ moin-1.9.9-new/MoinMoin/conftest.py 2018-02-18 12:13:19.551929093 +0300 +@@ -22,10 +22,11 @@ + + import atexit + import sys ++import os + + import py + +-rootdir = py.magic.autopath().dirpath() ++rootdir = os.path.abspath(os.path.dirname(__file__)) + moindir = rootdir.join("..") + sys.path.insert(0, str(moindir)) + diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e618f039ebdffc00a4e7f45394e65d087d28643c --- /dev/null +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, six +}: + + +buildPythonPackage rec { + pname = "more-itertools"; + version = "4.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cadwsr97c80k18if7qy5d8j8l1zj3yhnkm6kbngk0lpl7pxq8ax"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ six ]; + + meta = { + homepage = https://more-itertools.readthedocs.org; + description = "Expansion of the itertools module"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index cf74e1dc1342b6dd8fe9761c3f063cbf4d32a373..222e54c871a087534dc8de2beda3bf6c1a53694a 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,17 +1,29 @@ -{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask, requests, pytz -, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil }: +{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask +, requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker +, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }: buildPythonPackage rec { pname = "moto"; - version = "0.4.31"; - name = "moto-${version}"; + version = "1.3.1"; + src = fetchPypi { inherit pname version; - sha256 = "19s8hfz4mzzzdksa0ddlvrga5mxdaqahk89p5l29a5id8127shr8"; + sha256 = "e6b25a32b61ba97bbc2236960ad6865ab111962a927de720c907475adff4499b"; }; + postPatch = '' + # dateutil upper bound was just to keep compatibility with Python 2.6 + # see https://github.com/spulec/moto/pull/1519 and https://github.com/boto/botocore/pull/1402 + # regarding aws-xray-sdk: https://github.com/spulec/moto/commit/31eac49e1555c5345021a252cb0c95043197ea16 + substituteInPlace setup.py \ + --replace "python-dateutil<2.7.0" "python-dateutil<3.0.0" \ + --replace "aws-xray-sdk<0.96," "aws-xray-sdk" + ''; + propagatedBuildInputs = [ + aws-xray-sdk boto + boto3 dateutil flask httpretty @@ -21,6 +33,13 @@ buildPythonPackage rec { requests six xmltodict + mock + pyaml + backports_tempfile + cookies + jsondiff + botocore + docker ]; checkInputs = [ boto3 nose sure freezegun ]; diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..98e8d5b4078cda1f548c45f1e88ae42681d4a307 --- /dev/null +++ b/pkgs/development/python-modules/mozterm/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "mozterm"; + version = "0.1.0"; + + # name 'unicode' is not defined + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "4ebf8bd772d97c0f557184173f0f96cfca0abfc07e1ae975fbcfa76be50b5561"; + }; + + meta = with lib; { + description = "Terminal abstractions built around the blessings module"; + license = licenses.mpl20; + }; +} diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index fcbca62ff9dfe3490993f825a2a2bac249e9d15b..d4750f252ad0c65758312456beeb4d7e5bb85f34 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, mpi }: +{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }: buildPythonPackage rec { pname = "mpi4py"; @@ -14,6 +14,12 @@ buildPythonPackage rec { inherit mpi; }; + postPatch = '' + substituteInPlace test/test_spawn.py --replace \ + "unittest.skipMPI('openmpi(<3.0.0)')" \ + "unittest.skipMPI('openmpi')" + ''; + configurePhase = ""; installPhase = '' @@ -28,11 +34,15 @@ buildPythonPackage rec { # sometimes packages specify where files should be installed outside the usual # python lib prefix, we override that back so all infrastructure (setup hooks) # work as expected + + # Needed to run the tests reliably. See: + # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 + export OMPI_MCA_rmaps_base_oversubscribe=yes ''; setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; - buildInputs = [ mpi ]; + buildInputs = [ mpi openssh ]; meta = { description = diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3f974872b9594aef29f30345772deb10f486bc5a --- /dev/null +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six +, fetchPypi, lib +}: + +buildPythonPackage rec { + pname = "mrbob"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121"; + }; + + disabled = isPy3k; + + checkInputs = [ nose glibcLocales mock ]; + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests + ''; + + propagatedBuildInputs = [ argparse jinja2 six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/domenkozar/mr.bob; + description = "A tool to generate code skeletons from templates"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cae571fe2f5c521fe903f3876cf6a40d81a7b4d2 --- /dev/null +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, cython +, msgpack +, numpy +, python +}: + +buildPythonPackage rec { + pname = "msgpack-numpy"; + version = "0.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "9d6da0bbb04d7cab2bf9f08f78232c954f00ac95cf2384149e779a31ce859126"; + }; + + buildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + msgpack + numpy + ]; + + checkPhase = '' + ${python.interpreter} msgpack_numpy.py + ''; + + meta = with stdenv.lib; { + description = "Practical Machine Learning for NLP in Python"; + homepage = https://github.com/lebedov/msgpack-numpy; + license = licenses.bsd3; + maintainers = with maintainers; [ aborsu ]; + }; +} diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3068a31f1e29c5cebc9f2ce3ab96f1c255eccba4 --- /dev/null +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, fetchPypi +, pytest +, lib +}: + +buildPythonPackage rec { + pname = "msgpack"; + version = "0.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3"; + }; + + checkPhase = '' + py.test + ''; + + checkInputs = [ pytest ]; + + meta = { + homepage = https://github.com/msgpack/msgpack-python; + description = "MessagePack serializer implementation for Python"; + license = lib.licenses.asl20; + # maintainers = ?? ; + }; +} diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5e2ad1d5aa2a9c857260ab349b7ccf4a67e0ddcf --- /dev/null +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage, stdenv, pytestrunner, pyyaml, pytest, enum34 +, pytestpep8, pytestflakes,fetchFromGitHub, isPy3k, lib, glibcLocales +}: + +buildPythonPackage rec { + version = "v4.10.0"; + pname = "mt940"; + + src = fetchFromGitHub { + owner = "WoLpH"; + repo = pname; + rev = version; + sha256 = "1dsf2di8rr0iw2vaz6dppalby3y7i8x2bl0qjqvaiqacjxxvwj65"; + }; + + patches = [ + ./no-coverage.patch + ]; + + propagatedBuildInputs = [ pyyaml pytestrunner ] + ++ lib.optional (!isPy3k) enum34; + + LC_ALL="en_US.UTF-8"; + + checkInputs = [ pytestpep8 pytestflakes pytest glibcLocales ]; + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; + homepage = "http://pythonhosted.org/mt-940/"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/mt-940/no-coverage.patch b/pkgs/development/python-modules/mt-940/no-coverage.patch new file mode 100644 index 0000000000000000000000000000000000000000..1617e6dd39474e3d65d7859e9f808230cb6988ad --- /dev/null +++ b/pkgs/development/python-modules/mt-940/no-coverage.patch @@ -0,0 +1,26 @@ +diff --git a/pytest.ini b/pytest.ini +index fef28f5..f366331 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -4,10 +4,6 @@ python_files = + tests/*.py + + addopts = +- --cov mt940 +- --cov-report term-missing +- --cov-report html +- --no-cov-on-fail + --doctest-modules + --pep8 + --flakes +diff --git a/tests/requirements.txt b/tests/requirements.txt +index fc55572..e52cc28 100644 +--- a/tests/requirements.txt ++++ b/tests/requirements.txt +@@ -3,6 +3,5 @@ + -r ../docs/requirements.txt + pytest + pytest-cache +-pytest-cover + pytest-flakes + pytest-pep8 diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 614157542b1680fc7f69cb0d037569d6d6792500..38facc966589163eba624d765d149b5a2bbaa766 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,30 +1,27 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage -, cython -, pytest, psutil, pytestrunner +, pytest, pytestrunner , isPy3k }: -let +buildPythonPackage rec { pname = "multidict"; - version = "3.3.2"; -in buildPythonPackage rec { - name = "${pname}-${version}"; + version = "4.1.0"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "f82e61c7408ed0dce1862100db55595481911f159d6ddec0b375d35b6449509b"; + src = fetchPypi { + inherit pname version; + sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v"; }; - buildInputs = [ cython ]; - checkInputs = [ pytest psutil pytestrunner ]; + checkInputs = [ pytest pytestrunner ]; disabled = !isPy3k; - meta = { + meta = with lib; { description = "Multidict implementation"; homepage = https://github.com/aio-libs/multidict/; - license = lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index 73d0f5a2dbe3ebbe33fd052e0302087997734704..8edd8429d0d4e61c960e090ad2c4863934f524dd 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "multipledispatch"; - version = "0.4.9"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; + sha256 = "9e92d63efad2c9b68562175d9148d8cb32d04bf5557991190e643749bf4ed954"; }; # No tests in archive diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index aa5e3358866d77e7575267cfc5091b07e4ca03c5..f689bc2ff49d8ecc01d9ff5c3ac8aeb7caed5934 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -1,34 +1,34 @@ { stdenv , buildPythonPackage -, fetchFromGitHub +, fetchPypi , cython , python }: buildPythonPackage rec { - name = "murmurhash-${version}"; - version = "0.26.4"; - - src = fetchFromGitHub { - owner = "explosion"; - repo = "murmurhash"; - rev = "0.26.4"; - sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv"; + pname = "murmurhash"; + version = "0.28.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16id8jppw8r54wisrlaaiprcszzb7d7lbpnskqn38s8i7vnkf4b5"; }; buildInputs = [ cython ]; - + + # No test + doCheck = false; + checkPhase = '' - cd murmurhash/tests - ${python.interpreter} -m unittest discover -p "*test*" + pytest murmurhash ''; - + meta = with stdenv.lib; { description = "Cython bindings for MurmurHash2"; homepage = https://github.com/explosion/murmurhash; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; - }; + maintainers = with maintainers; [ aborsu sdll ]; + }; } diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..46658520cb5869ed945f2d68865e479c846e0252 --- /dev/null +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, pycodestyle +, pyflakes +, pytest +, pkgs +}: + +buildPythonPackage rec { + pname = "mutagen"; + version = "1.40.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ppfmpf60c78p4yp7in3f8y1l1fd34a38vw9swpg2fl6hz7c58mj"; + }; + + checkInputs = [ + pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz + pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis + ]; + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { + description = "Python multimedia tagging library"; + homepage = https://mutagen.readthedocs.io/; + license = licenses.lgpl2Plus; + }; +} diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e9d43e9e2b6ab8f3904e93da3a130e3495f90f30 --- /dev/null +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, six +, pyjwt +, requests +, oauthlib +, requests_oauthlib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mwoauth"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1krqz755415z37z1znrc77vi4xyp5ys6fnq4zwcwixjjbzddpavj"; + }; + + # package has no tests + doCheck = false; + + propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ]; + + meta = with lib; { + description = "A library designed to provide a simple means to performing an OAuth handshake with a MediaWiki installation with the OAuth Extension installed."; + homepage = https://github.com/mediawiki-utilities/python-mwoauth; + license = licenses.mit; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..097898a2d84f7aad9259aff71b2c6c4f65ca4ec5 --- /dev/null +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, nose, minimock }: + +buildPythonPackage rec { + pname = "mypgoclient"; + version = "1.8"; + + src = fetchFromGitHub { + owner = "gpodder"; + repo = "mygpoclient"; + rev = version; + sha256 = "0aa28wc55x3rxa7clwfv5v5500ffyaq0vkxaa3v01y1r93dxkdvp"; + }; + + checkInputs = [ nose minimock ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + description = "A gpodder.net client library"; + longDescription = '' + The mygpoclient library allows developers to utilize a Pythonic interface + to the gpodder.net web services. + ''; + homepage = https://github.com/gpodder/mygpoclient; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ skeidel ]; + }; +} diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..78069d49246cc40840fc7830e26e2e82153e37b7 --- /dev/null +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, protobuf +}: + +buildPythonPackage rec { + pname = "mysql-connector"; + version = "8.0.11"; + + src = fetchFromGitHub { + owner = "mysql"; + repo = "mysql-connector-python"; + rev = version; + sha256 = "0w5sxy0zdkdj5cj35wwfjy9y8yn5yzk9biwwsglvhkqlkrms8fw1"; + }; + + propagatedBuildInputs = [ protobuf ]; + + # Tests are failing (TODO: unknown reason) + # TypeError: __init__() missing 1 required positional argument: 'string' + # But the library should be working as expected. + doCheck = false; + + meta = { + description = "A MySQL driver"; + longDescription = '' + A MySQL driver that does not depend on MySQL C client libraries and + implements the DB API v2.0 specification. + ''; + homepage = https://github.com/mysql/mysql-connector-python; + license = [ lib.licenses.gpl2 ]; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0be0f892d731b0d6afca93260c1a842f33c33d99 --- /dev/null +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, libmysql }: + +buildPythonPackage rec { + pname = "mysqlclient"; + version = "1.3.12"; + + buildInputs = [ + libmysql + ]; + + # Tests need a MySQL database + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5"; + }; + + meta = with stdenv.lib; { + description = "Python interface to MySQL"; + homepage = "https://github.com/PyMySQL/mysqlclient-python"; + license = licenses.gpl1; + maintainers = with maintainers; [ y0no ]; + }; +} diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 7041768c209789e0619a3821147cf40fa244e487..3e4b0d1368b7b674c1cb4174342cf4fdef2696a5 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -1,12 +1,9 @@ { lib , buildPythonPackage , pythonOlder -, isPy35 -, isPy36 , fetchPypi , hypothesis , pytestcache -, pytestcov , pytestflakes , pytestpep8 , pytest @@ -16,14 +13,12 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "natsort"; - version = "5.1.0"; + version = "5.2.0"; - buildInputs = [ + checkInputs = [ hypothesis pytestcache - pytestcov pytestflakes pytestpep8 pytest @@ -36,17 +31,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "5db0fd17c9f8ef3d54962a6e46159ce4807c630f0931169cd15ce54f2ac395b9"; + sha256 = "c960082d2145b04723041c4b85092546560538e29664dd197a1344d5b090bc91"; }; - # do not run checks on nix_run_setup.py - patches = lib.singleton ./setup.patch - ++ lib.optional (isPy35 || isPy36) ./python-3.6.3-test-failures.patch; - # testing based on project's tox.ini checkPhase = '' pytest --doctest-modules natsort - pytest --flakes --pep8 --cov natsort --cov-report term-missing + pytest --flakes --pep8 ''; meta = { diff --git a/pkgs/development/python-modules/natsort/python-3.6.3-test-failures.patch b/pkgs/development/python-modules/natsort/python-3.6.3-test-failures.patch deleted file mode 100644 index b304a1d11e524298b67b679eafbfe1fd9a65753c..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/natsort/python-3.6.3-test-failures.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/test_natsort/test_string_component_transform_factory.py b/test_natsort/test_string_component_transform_factory.py -index 6790e51..8db4efb 100644 ---- a/test_natsort/test_string_component_transform_factory.py -+++ b/test_natsort/test_string_component_transform_factory.py -@@ -24,6 +24,8 @@ from hypothesis.strategies import ( - ) - from compat.locale import bad_uni_chars - -+import pytest -+ - - # Each test has an "example" version for demonstrative purposes, - # and a test that uses the hypothesis module. -@@ -77,6 +79,7 @@ def test_string_component_transform_factory_with_LOCALE_returns_fast_int_and_gro - assert _string_component_transform_factory(ns.LOCALE)(x) == fast_int(x, key=get_strxfrm()) - - -+@pytest.mark.xfail - @given(text()) - def test_string_component_transform_factory_with_LOCALE_returns_fast_int_and_groupletters(x): - assume(x) -@@ -89,6 +92,7 @@ def test_string_component_transform_factory_with_LOCALE_and_GROUPLETTERS_returns - assert _string_component_transform_factory(ns.GROUPLETTERS | ns.LOCALE)(x) == fast_int(x, key=lambda x: get_strxfrm()(_groupletters(x))) - - -+@pytest.mark.xfail - @given(text()) - def test_string_component_transform_factory_with_LOCALE_and_GROUPLETTERS_returns_fast_int_and_groupletters_and_locale_convert(x): - assume(x) -@@ -104,6 +108,7 @@ def test_string_component_transform_factory_with_LOCALE_and_DUMB_returns_fast_in - assert _string_component_transform_factory(ns._DUMB | ns.LOCALE)(x) == fast_int(x, key=lambda x: get_strxfrm()(_groupletters(x))) - - -+@pytest.mark.xfail - @given(text()) - def test_string_component_transform_factory_with_LOCALE_and_DUMB_returns_fast_int_and_groupletters_and_locale_convert(x): - assume(x) diff --git a/pkgs/development/python-modules/natsort/setup.patch b/pkgs/development/python-modules/natsort/setup.patch deleted file mode 100644 index 4c52b740152c91c298a506dcc5f7924deca00819..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/natsort/setup.patch +++ /dev/null @@ -1,20 +0,0 @@ -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/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b6f94536e2fa04882c68972a19c380bdee9192cf --- /dev/null +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchzip, pyopenssl }: + +buildPythonPackage rec { + pname = "nbxmpp"; + version = "0.6.4"; + name = "${pname}-${version}"; + + # Tests aren't included in PyPI tarball. + src = fetchzip { + name = "${name}.tar.bz2"; + url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" + + "ref=${name}"; + sha256 = "0mikgksf01w82wnnm0phmzkijk2c93g24fzd59s71n3zy7f7dx3l"; + }; + + propagatedBuildInputs = [ pyopenssl ]; + + checkPhase = '' + # Disable tests requiring networking + echo "" > test/unit/test_xmpp_transports_nb2.py + python test/runtests.py + ''; + + meta = with stdenv.lib; { + homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; + description = "Non-blocking Jabber/XMPP module"; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4cc5769d8d836ca0ae1dd72bce92cdc81520310b --- /dev/null +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, paramiko +, lxml +, libxml2 +, libxslt +, pytest +, nose +, rednose +}: + +buildPythonPackage rec { + pname = "ncclient"; + version = "0.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "fe6b9c16ed5f1b21f5591da74bfdd91a9bdf69eb4e918f1c06b3c8db307bd32b"; + }; + + checkInputs = [ nose rednose ]; + + propagatedBuildInputs = [ + paramiko lxml libxml2 libxslt + ]; + + checkPhase = '' + nosetests test --rednose --verbosity=3 --with-coverage --cover-package ncclient + ''; + + #Unfortunately the test hangs at te end + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://ncclient.org/; + description = "Python library for NETCONF clients"; + license = licenses.asl20; + maintainers = with maintainers; [ xnaveira ]; + }; +} diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..646a8e7bb112c3c7c2fd6c69553029fba2748295 --- /dev/null +++ b/pkgs/development/python-modules/neovim/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage +, fetchPypi +, lib +, nose +, msgpack +, greenlet +, trollius +, pythonOlder +, isPyPy +}: + +buildPythonPackage rec { + pname = "neovim"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0accfgyvihs08bwapgakx6w93p4vbrq2448n2z6gw88m2hja9jm3"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + # Tests require pkgs.neovim, + # which we cannot add because of circular dependency. + doCheck = false; + + propagatedBuildInputs = [ msgpack ] + ++ lib.optional (!isPyPy) greenlet + ++ lib.optional (pythonOlder "3.4") trollius; + + meta = { + description = "Python client for Neovim"; + homepage = "https://github.com/neovim/python-client"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..412d42bafdddcb55ec5548b119b4e8b0e2207feb --- /dev/null +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, requests, zeroconf, netifaces, pytest }: + +buildPythonPackage rec { + pname = "netdisco"; + version = "1.4.0"; + + disabled = !isPy3k; + + # PyPI is missing tests/ directory + src = fetchFromGitHub { + owner = "home-assistant"; + repo = pname; + rev = version; + sha256 = "0q1cl76a0fwxm80lkk7cpd4p23r2bvf1a45nb7n61cgzrqcv43q1"; + }; + + propagatedBuildInputs = [ requests zeroconf netifaces ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Python library to scan local network for services and devices"; + homepage = https://github.com/home-assistant/netdisco; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3388aef9cef198f5784997c8eeb978211200bd91 --- /dev/null +++ b/pkgs/development/python-modules/networkx/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, decorator +}: + +buildPythonPackage rec { + pname = "networkx"; + version = "2.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ decorator ]; + + meta = { + homepage = "https://networkx.github.io/"; + description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/neurotools/default.nix b/pkgs/development/python-modules/neurotools/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b117d7a79a37fe1c51501dba43a33c482e6fcc57 --- /dev/null +++ b/pkgs/development/python-modules/neurotools/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, scipy, numpy, matplotlib, tables, pyaml, urllib3, rpy2, mpi4py }: + +buildPythonPackage rec { + pname = "NeuroTools"; + version = "0.3.1"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0ly6qa87l3afhksab06vp1iimlbm1kdnsw98mxcnpzz9q07l4nd4"; + }; + + # Tests are not automatically run + # Many tests fail (using py.test), and some need R + doCheck = false; + + propagatedBuildInputs = [ + scipy + numpy + matplotlib + tables + pyaml + urllib3 + rpy2 + mpi4py + ]; + + meta = with stdenv.lib; { + description = "Collection of tools to support analysis of neural activity"; + homepage = https://pypi.python.org/pypi/NeuroTools; + license = licenses.gpl2; + maintainers = with maintainers; [ nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ccbb59c44dc2cfbfdabfcc5eca5814d2ece27b78 --- /dev/null +++ b/pkgs/development/python-modules/nevow/default.nix @@ -0,0 +1,41 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, twisted }: + +buildPythonPackage rec { + pname = "Nevow"; + version = "0.14.3"; + disabled = isPy3k; + + src = fetchPypi { + inherit version pname; + sha256 = "0pid8dj3p8ai715n9a59cryfxrrbxidpda3f8hvgmfpcrjdmnmmb"; + }; + + propagatedBuildInputs = [ twisted ]; + + checkPhase = '' + trial formless nevow + ''; + + meta = with stdenv.lib; { + description = "Nevow, a web application construction kit for Python"; + longDescription = '' + Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow + is a web application construction kit written in Python. It is + designed to allow the programmer to express as much of the view + logic as desired in Python, and includes a pure Python XML + expression syntax named stan to facilitate this. However it + also provides rich support for designer-edited templates, using + a very small XML attribute language to provide bi-directional + template manipulation capability. + + Nevow also includes formless, a declarative syntax for + specifying the types of method parameters and exposing these + methods to the web. Forms can be rendered automatically, and + form posts will be validated and input coerced, rendering error + pages if appropriate. Once a form post has validated + successfully, the method will be called with the coerced values. + ''; + homepage = https://github.com/twisted/nevow; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7db4378a6e636818c576d0b0135ad83478aa303b --- /dev/null +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, nose +, six +}: + +buildPythonPackage rec { + pname = "nibabel"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1h6nhi1s2ab7sdyyl3qjnvlw0kggcnam7vn4b3z56ay20596kvhw"; + }; + + propagatedBuildInputs = [ + numpy + nose + six + ]; + + # Failing tests + # nibabel.tests.test_minc1.test_old_namespace + # nibabel.gifti.tests.test_parse_gifti_fast.test_parse_dataarrays + # nibabel.gifti.tests.test_giftiio.test_read_deprecated + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://nipy.org/nibabel/; + description = "Access a multitude of neuroimaging data formats"; + license = licenses.mit; + maintainers = with maintainers; [ ashgillman ]; + }; +} diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index f5dc7607e2d271ccb7b023a97de35e05ba4184e6..ef4473e4066f2db288f8146774b2f3bdb613234e 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.3.1"; - name = "nilearn-${version}"; + version = "0.4.1"; + name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "0kkarh5cdcd2czs0bf0s1g51qas84mfxfq0dzd7k5h5l0qr4zy06"; + sha256 = "c2ef16d357d24699abced07e89a50d465c8fbaa8537f1a9d4d5cb8a612926dbc"; }; checkPhase = "nosetests --exclude with_expand_user nilearn/tests"; diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..26f1ea3294bba39fe01ca0a837660e3427968d5b --- /dev/null +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, numpy +, scipy +, matplotlib +, pytest +}: + +buildPythonPackage rec { + pname = "nimfa"; + version = "1.3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "651376eba6b049fe270dc0d29d4b2abecb5e998c2013df6735a97875503e2ffe"; + }; + + propagatedBuildInputs = [ numpy scipy ]; + checkInputs = [ matplotlib pytest ]; + doCheck = !isPy3k; # https://github.com/marinkaz/nimfa/issues/42 + + meta = with stdenv.lib; { + description = "Nonnegative matrix factorization library"; + homepage = "http://nimfa.biolab.si"; + license = licenses.bsd3; + maintainers = with maintainers; [ ashgillman ]; + }; +} diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..39fc0995b43dac8201a589c611acccb76c738229 --- /dev/null +++ b/pkgs/development/python-modules/nipype/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +# python dependencies +, click +, configparser ? null +, dateutil +, funcsigs +, future +, mock +, networkx +, nibabel +, numpy +, packaging +, prov +, psutil +, pydot +, pytest +, scipy +, simplejson +, traits +, xvfbwrapper +, pytestcov +, codecov +# other dependencies +, which +, bash +, glibcLocales +}: + +assert !isPy3k -> configparser != null; + +buildPythonPackage rec { + pname = "nipype"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ed65f3e97fd0f82c418ad48af2107050e86d9e39eea4d22381ad7df932bf1ec"; + }; + + # see https://github.com/nipy/nipype/issues/2240 + patches = [ ./prov-version.patch ]; + + postPatch = '' + substituteInPlace nipype/interfaces/base/tests/test_core.py \ + --replace "/usr/bin/env bash" "${bash}/bin/bash" + ''; + + propagatedBuildInputs = [ + click + dateutil + funcsigs + future + networkx + nibabel + numpy + packaging + prov + psutil + pydot + scipy + simplejson + traits + xvfbwrapper + ] ++ stdenv.lib.optional (!isPy3k) [ + configparser + ]; + + checkInputs = [ pytest mock pytestcov codecov which glibcLocales ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype + ''; + + meta = with stdenv.lib; { + homepage = http://nipy.org/nipype/; + description = "Neuroimaging in Python: Pipelines and Interfaces"; + license = licenses.bsd3; + maintainers = with maintainers; [ ashgillman ]; + }; +} diff --git a/pkgs/development/python-modules/nipype/prov-version.patch b/pkgs/development/python-modules/nipype/prov-version.patch new file mode 100644 index 0000000000000000000000000000000000000000..133295d0560bf194fd1c8dcf6e95ac8c9f21de5d --- /dev/null +++ b/pkgs/development/python-modules/nipype/prov-version.patch @@ -0,0 +1,21 @@ +diff --git a/nipype/info.py b/nipype/info.py +index 1daa382e2..da338d0ea 100644 +--- a/nipype/info.py ++++ b/nipype/info.py +@@ -108,7 +108,6 @@ DATEUTIL_MIN_VERSION = '2.2' + PYTEST_MIN_VERSION = '3.0' + FUTURE_MIN_VERSION = '0.16.0' + SIMPLEJSON_MIN_VERSION = '3.8.0' +-PROV_VERSION = '1.5.0' + CLICK_MIN_VERSION = '6.6.0' + PYDOT_MIN_VERSION = '1.2.3' + +@@ -140,7 +139,7 @@ REQUIRES = [ + 'traits>=%s' % TRAITS_MIN_VERSION, + 'future>=%s' % FUTURE_MIN_VERSION, + 'simplejson>=%s' % SIMPLEJSON_MIN_VERSION, +- 'prov==%s' % PROV_VERSION, ++ 'prov<2', + 'click>=%s' % CLICK_MIN_VERSION, + 'funcsigs', + 'pytest>=%s' % PYTEST_MIN_VERSION, diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 8c518f9b7ff4a4c2b8725b7ed8adc4440cb4633a..9e4ba35680a12fdc2e97aedf5e2dd8d7653cc927 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, pytest, tox }: buildPythonPackage rec { - name = "${pname}-${version}"; - version = "0.2.0"; + version = "0.3.0"; pname = "node-semver"; buildInputs = [ pytest tox ]; src = fetchPypi { inherit pname version; - sha256 = "c32bfc976fd9e003c4a15665e5fe9f337366ba6b60aeb34e4479da9d7bbb0081"; + sha256 = "d8a3906e7677f8ab05aeb3fc94c7a2fa163def5507271452ce6831282f23f1cb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d136c41aa37049ac70e5acb7e50af2b6edafa32f --- /dev/null +++ b/pkgs/development/python-modules/noise/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "noise"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + 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; + }; +} diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 2a23ff4de78cee00e5c3d321259ba50ee911874c..37c5774bba25736401e6c5b8bfb28794bbb1f505 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchPypi , nose @@ -17,38 +18,42 @@ , ipykernel , terminado , requests +, send2trash , pexpect }: buildPythonPackage rec { pname = "notebook"; - version = "5.2.1"; - name = "${pname}-${version}"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "4ae5b81dd39b37cdd99dcffe83a5182c849947b92d46ac4d2b5093af2bb9f224"; + sha256 = "01l6yp78sp27vns4cxh8ybr7x0pixxn97cp0i3w6s0lv1v8l6qbx"; }; LC_ALL = "en_US.utf8"; - buildInputs = [ nose glibcLocales ] + checkInputs = [ nose glibcLocales ] ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); propagatedBuildInputs = [ - jinja2 tornado ipython_genutils traitlets jupyter_core + jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect ]; # disable warning_filters preCheck = lib.optionalString (!isPy3k) '' echo "" > setup.cfg - cat setup.cfg ''; + checkPhase = '' runHook preCheck mkdir tmp - HOME=tmp nosetests -v + HOME=tmp nosetests -v ${if (stdenv.isDarwin) then '' + --exclude test_delete \ + --exclude test_checkpoints_follow_file + '' + else ""} ''; meta = { diff --git a/pkgs/development/python-modules/notify2/default.nix b/pkgs/development/python-modules/notify2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2d5851929075dccfb4888fd479a18b6654df3c94 --- /dev/null +++ b/pkgs/development/python-modules/notify2/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, lib +, fetchPypi +, pygobject3 +, dbus-python +}: + +buildPythonPackage rec { + pname = "notify2"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z8rrv9rsg1r2qgh2dxj3dfj5xnki98kgi3w839kqby4a26i1yik"; + }; + + + # Tests require Xorg and Dbus instance + doCheck = false; + propagatedBuildInputs = [ pygobject3 + dbus-python ]; + + meta = { + description = "Pure Python interface to DBus notifications"; + homepage = https://bitbucket.org/takluyver/pynotify2; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ mog ]; + }; +} diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index b0d7ae72c95bc6130b5e7f7ef5b56dbb09819943..e62fff7bca35e6b1b1414b50b077adeba6c6a76c 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchPypi , python , buildPythonPackage , isPy27 @@ -14,13 +14,12 @@ }: buildPythonPackage rec { - version = "0.35.0"; + version = "0.37.0"; pname = "numba"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "11564937757605bee590c5758c73cfe9fd6d569726b56d970316a6228971ecc3"; + src = fetchPypi { + inherit pname version; + sha256 = "c62121b2d384d8b4d244ef26c1cf8bb5cb819278a80b893bf41918ad6d391258"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -29,7 +28,7 @@ buildPythonPackage rec { # Copy test script into $out and run the test suite. checkPhase = '' - python -m numba.runtests + ${python.interpreter} -m numba.runtests ''; # ImportError: cannot import name '_typeconv' doCheck = false; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e6fc5888feaf9a1a37ec0ec43026c719b7feb691 --- /dev/null +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, numpy +}: + +buildPythonPackage rec { + pname = "numexpr"; + version = "2.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "f0bef9a3a5407fb8d6344cf91b658bef7c13ec8a8eb13f423822d9d2ca5af6ce"; + }; + + propagatedBuildInputs = [ numpy ]; + + # Run the test suite. + # It requires the build path to be in the python search path. + checkPhase = '' + ${python}/bin/${python.executable} <=.+), <.+'/'\1'/" setup.py + ''; + propagatedBuildInputs = [ requests decorator diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index eb3fb784dc978ae73f3c5a2e5a12e48e13e3fe49..b59327cd0590ce22e4c9734c5b4afeef221bd059 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -6,15 +6,19 @@ buildPythonPackage rec { pname = "prawcore"; - version = "0.12.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "prawcore"; rev = "v${version}"; - sha256 = "1z5fz6v4bv6xw84l4q3rpw3j63bb2dldl0fd6ckz8wqlpb2l45br"; + sha256 = "0v16n6bzf483i00bn0qykrg3wvw9dbnfdl512pw8n635ld1g7cb8"; }; + postPatch = '' + sed -i "s/'testfixtures >4.13.2, <6'/'testfixtures >4.13.2'/g" setup.py + ''; + propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3572d938a0dc13a9e5f4c32094be2140b4518e61 --- /dev/null +++ b/pkgs/development/python-modules/pretend/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pretend"; + version = "1.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; + }; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/alex/pretend; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f2373e4702f9563646be682b9d7fbca587efb0d6 --- /dev/null +++ b/pkgs/development/python-modules/proboscis/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "proboscis"; + version = "1.2.6.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "b822b243a7c82030fce0de97bdc432345941306d2c24ef227ca561dd019cd238"; + }; + + propagatedBuildInputs = [ nose ]; + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG"; + homepage = https://pypi.python.org/pypi/proboscis; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..59ef547dba36b6f28e858548242a04c38665a856 --- /dev/null +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "progressbar"; + version = "2.3"; + + # https://github.com/niltonvolpato/python-progressbar/issues/54 + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254"; + }; + + # invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..212c06cc9421f146cf0dbcd6924452778416cf32 --- /dev/null +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, python +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pytest +, python-utils +, sphinx +, coverage +, execnet +, flake8 +, pytestpep8 +, pytestflakes +, pytestcov +, pytestcache +, pep8 +, pytestrunner +}: + +buildPythonPackage rec { + pname = "progressbar2"; + version = "3.12.0"; + + # Use source from GitHub, PyPI is missing tests + # https://github.com/WoLpH/python-progressbar/issues/151 + src = fetchFromGitHub { + owner = "WoLpH"; + repo = "python-progressbar"; + rev = "v${version}"; + sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f"; + }; + + propagatedBuildInputs = [ python-utils ]; + nativeBuildInputs = [ pytestrunner ]; + checkInputs = [ + pytest sphinx coverage execnet flake8 pytestpep8 pytestflakes pytestcov + pytestcache pep8 + ]; + # ignore tests on the nix wrapped setup.py and don't flake .eggs directory + checkPhase = '' + runHook preCheck + ${python.interpreter} setup.py test --addopts "--ignore=.eggs" + runHook postCheck + ''; + + meta = with stdenv.lib; { + homepage = https://progressbar-2.readthedocs.io/en/latest/; + description = "Text progressbar library for python"; + license = licenses.bsd3; + maintainers = with maintainers; [ ashgillman ]; + }; +} diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f9825961754516e3bf674e2c48a51e10e8bdde9d --- /dev/null +++ b/pkgs/development/python-modules/progressbar231/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "progressbar231"; + version = "2.3.1"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0j0ifxk87xz3wkyacxaiqygghn27wwz6y5pj9k8j2yq7n33fbdam"; + }; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar231; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f3b94436d45207bfdf7b42dcafc1670d1927fd81 --- /dev/null +++ b/pkgs/development/python-modules/progressbar33/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "progressbar33"; + version = "2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zvf6zs5hzrc03p9nfs4p16vhilqikycvv1yk0pxn8s07fdhvzji"; + }; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar33; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index 9704f1b92c96c7236a2e0ff2ff9dad0514ae2b71..59aec94ff90e1ae01f7c7f82cac9fa4aee8c5c5f 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { ''; homepage = https://github.com/jonathanslenders/python-prompt-toolkit; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nckx ]; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 4a67a3132edac7c125091805ad7a6557242df599..1a345b19ef94b3b61f351efb7e7c18754e6027b7 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; buildPythonPackage rec { - inherit (protobuf) name src; + inherit (protobuf) name src version; inherit disabled doCheck; NIX_CFLAGS_COMPILE = diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f5f5b719b0602c5d1d97b5950612c16ccdeeb0fa --- /dev/null +++ b/pkgs/development/python-modules/prov/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, lxml +, networkx +, dateutil +, six +, pydotplus +, rdflib +, pydot +, glibcLocales +}: + +buildPythonPackage rec { + pname = "prov"; + version = "1.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "640dc158d931403bc6c1a0ad80702caae71f810bac21f90ec605865c8444b7bb"; + }; + + prePatch = '' + substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0" + ''; + + propagatedBuildInputs = [ + lxml + networkx + dateutil + six + pydotplus + rdflib + ]; + + checkInputs = [ + pydot + glibcLocales + ]; + + preCheck = '' + export LC_ALL="en_US.utf-8" + ''; + + meta = with stdenv.lib; { + description = "A Python library for W3C Provenance Data Model (PROV)"; + homepage = https://github.com/trungdong/prov; + license = licenses.mit; + maintainers = with maintainers; [ ashgillman ]; + }; +} diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6221e08ae574dad4b40895e4b0cf677775dcb482 --- /dev/null +++ b/pkgs/development/python-modules/psutil/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, darwin +, mock +}: + +buildPythonPackage rec { + pname = "psutil"; + version = "5.4.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "e2467e9312c2fa191687b89ff4bc2ad8843be4af6fb4dc95a7cc5f7d7a327b18"; + }; + + # No tests in archive + doCheck = false; + + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit ]; + + meta = { + description = "Process and system utilization information interface for python"; + homepage = https://github.com/giampaolo/psutil; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c1c9ce18c560597e743fd2253d7404a0adac1fc4 --- /dev/null +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "ptyprocess"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365"; + }; + + meta = { + description = "Run a subprocess in a pseudo terminal"; + homepage = https://github.com/pexpect/ptyprocess; + license = lib.licenses.isc; + }; +} diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9c90161c6eaaf7e12a4aa69a8b7efc9653d03e6b --- /dev/null +++ b/pkgs/development/python-modules/publicsuffix/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "publicsuffix"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1adx520249z2cy7ykwjr1k190mn2888wqn9jf8qm27ly4qymjxxf"; + }; + + + # fix the ASCII-mode LICENSE file read + # disable test_fetch and the doctests (which also invoke fetch) + patchPhase = stdenv.lib.optionalString isPy3k '' + sed -i "s/)\.read(/,encoding='utf-8'\0/" setup.py + '' + '' + sed -i -e "/def test_fetch/i\\ + \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py + ''; + + meta = with stdenv.lib; { + description = "Allows to get the public suffix of a domain name"; + homepage = "https://pypi.python.org/pypi/publicsuffix/"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..aacac72d2aaac50041b3eee55cde491a11adcabb --- /dev/null +++ b/pkgs/development/python-modules/pulp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, pyparsing }: + +buildPythonPackage rec { + pname = "PuLP"; + version = "1.6.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1irzpfnnm5f0qf8y9ddxi489nwixyj0q4zlvqafm621bijkxdv6g"; + }; + + buildInputs = []; + propagatedBuildInputs = [ pyparsing ]; + + # only one test that requires an extra + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/coin-or/pulp; + description = "PuLP is an LP modeler written in python"; + maintainers = with maintainers; [ teto ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..74c0f66b91eb249cd84539d996fd3f7ee726ebfa --- /dev/null +++ b/pkgs/development/python-modules/pushbullet/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi +, requests, websocket_client, python_magic +, pytest, mock }: + +buildPythonPackage rec { + pname = "pushbullet.py"; + version = "0.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "aa9dc7bb46e083e3497d46241154f12944a8f540e29d150330ca94db0b453b8d"; + }; + + propagatedBuildInputs = [ requests websocket_client python_magic ]; + + checkInputs = [ pytest mock ]; + + checkPhase = '' + PUSHBULLET_API_KEY="" py.test -k "not test_e2e and not test_auth" + ''; + + meta = with lib; { + description = "A simple python client for pushbullet.com"; + homepage = https://github.com/randomchars/pushbullet.py; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f5d1a9568c3e60f618b48602ffeb66bf6bfea300 --- /dev/null +++ b/pkgs/development/python-modules/pushover/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests }: + +buildPythonPackage rec { + pname = "python-pushover"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xlghiqd9rsgn7jdhc8v1xh3xspssihrw1vyy85gvjzxa1ah19sk"; + }; + + propagatedBuildInputs = [ requests ]; + + # tests require network + doCheck = false; + + meta = with stdenv.lib; { + description = "Bindings and command line utility for the Pushover notification service"; + homepage = https://github.com/Thibauth/python-pushover; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 57f7c2c317dcc4fe79e94356cd6e257fc6494bcb..da7ddbc7dcb7bd1fe4f5501e19fd5bac1af6f392 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -1,22 +1,31 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k , Mako, packaging, pysocks, pygments, ROPGadget , capstone, paramiko, pip, psutil -, pyelftools, pypandoc, pyserial, dateutil -, requests, tox, pandoc, unicorn, intervaltree }: +, pyelftools, pyserial, dateutil +, requests, tox, unicorn, intervaltree, fetchpatch }: buildPythonPackage rec { - version = "3.10.0"; + version = "3.12.0"; pname = "pwntools"; - name = "pwntools-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1l8hb30mwxqd1y7r5ihd7kzmjm2mz6m5aiphd3hwzmxkmxbxj8zk"; + sha256 = "09a7yhsyqxb4xf2r6mbn3p5zx1wp89lxq7lj34y4zbin6ns5929s"; }; - propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ]; + propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pyserial dateutil requests tox unicorn intervaltree ]; disabled = isPy3k; + doCheck = false; # no setuptools tests for the package + + # Can be removed when 3.13.0 is released + patches = [ + (fetchpatch { + url = "https://github.com/Gallopsled/pwntools/commit/9859f54a21404174dd17efee02f91521a2dd09c5.patch"; + sha256 = "0p0h87npn1mwsd8ciab7lg74bk3ahlk5r0mjbvx4jhihl2gjc3z2"; + }) + ]; + meta = with stdenv.lib; { homepage = "http://pwntools.com"; diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 0dc3b6793281e5b7b8a4274d97b000dc1efb449a..efe4e9df672486d553b3586cfc1cae97c1ea069c 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "py"; - version = "1.4.34"; + version = "1.5.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1qyd5z0hv8ymxy84v5vig3vps2fvhcf4bdlksb3r03h549fmhb8g"; + sha256 = "29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881"; }; # Circular dependency on pytest diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b5ac0f7b7b1b167cb663d34086fa5e20e97173d4 --- /dev/null +++ b/pkgs/development/python-modules/py3status/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, pytz +, tzlocal + +, file +, acpi +, coreutils +, alsaUtils +, i3 +, procps +, lm_sensors +, libnotify +, xorg +}: + +buildPythonPackage rec { + pname = "py3status"; + version = "3.8"; + src = fetchPypi { + inherit pname version; + sha256 = "1izjpf9q768m3j95y328vbdh7rycglqlslyd777b12c13i6zs6cb"; + }; + doCheck = false; + propagatedBuildInputs = [ pytz requests tzlocal ]; + buildInputs = [ file ]; + prePatch = '' + sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py + sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py + sed -i -e "s|notify-send|${libnotify}/bin/notify-send|" py3status/modules/battery_level.py + sed -i -e "s|/usr/bin/whoami|${coreutils}/bin/whoami|" py3status/modules/external_script.py + sed -i -e "s|'amixer|'${alsaUtils}/bin/amixer|" py3status/modules/volume_status.py + sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py + sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py + sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py + sed -i -e "s|'setxkbmap|'${xorg.setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py + sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py + ''; + + meta = with stdenv.lib; { + description = "Extensible i3status wrapper"; + license = licenses.bsd3; + homepage = https://github.com/ultrabug/py3status; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9cf9828635fbbc78455ef80d01d6515bc7248433 --- /dev/null +++ b/pkgs/development/python-modules/py4j/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, stdenv }: + +buildPythonPackage rec { + pname = "py4j"; + + version = "0.10.6"; + + src = fetchPypi { + inherit pname version; + extension= "zip"; + sha256 = "10shayghsmcdr03w12a7sdm6vsxpjm8alw3ym3mr1hki45yarryk"; + }; + + propagatedBuildInputs = [ ]; + + meta = with stdenv.lib; { + description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects."; + homepage = https://www.py4j.org/; + license = licenses.bsd3; + maintainers = [ maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 45887bdc748df02ab142cf9673c2547b9a31d1ce..6adc1e7ec04ca0c220c38ab2722574094127da51 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,23 +1,24 @@ { stdenv, fetchFromGitHub , cacert -, buildPythonPackage, python-jose }: +, buildPythonPackage, python-jose, pyjwt }: buildPythonPackage rec { - name = "PyGithub-${version}"; - version = "1.32"; + pname = "PyGithub"; + version = "1.36"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "15dr9ja63zdxax9lg6q2kcakqa82dpffyhgpjr13wq3sfkcy5pdw"; + sha256 = "0yb74f9hg2vdsy766m850hfb1ss17lbgcdvvklm4qf72w12nxc5w"; }; postPatch = '' # requires network echo "" > github/tests/Issue142.py ''; - propagatedBuildInputs = [ python-jose ]; + propagatedBuildInputs = [ python-jose pyjwt ]; meta = with stdenv.lib; { homepage = https://github.com/PyGithub/PyGithub; description = "A Python (2 and 3) library to access the GitHub API v3"; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1b1f758d94131d49a86158031a5c6c5bbadc56a7 --- /dev/null +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, openssl +}: + +buildPythonPackage rec { + pname = "scrypt"; + version = "0.8.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d"; + }; + + buildInputs = [ openssl ]; + doCheck = false; + + meta = with stdenv.lib; { + description = "Bindings for scrypt key derivation function library"; + homepage = https://pypi.python.org/pypi/scrypt; + maintainers = with maintainers; [ asymmetric ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3931078c12edffe5a851d9c8aafec1a31e411b8a --- /dev/null +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, numpy +, six +, nose +, fetchPypi +}: + +buildPythonPackage rec { + pname = "py_stringmatching"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rjsx7iipn6svki21lmsza7b0dz9vkgmix696zryiv7gkhblqyb4"; + }; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ numpy six ]; + + meta = with lib; { + description = "A Python string matching library including string tokenizers and string similarity measures"; + homepage = https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix index 59acacd5051731ef0588e1b40f4fcfb7747ddde1..5ac6ef82964ccb6c08f839ffaa7818e5cf683a7c 100644 --- a/pkgs/development/python-modules/pyamf/default.nix +++ b/pkgs/development/python-modules/pyamf/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchPypi, buildPythonPackage, defusedxml }: +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "PyAMF"; version = "0.8.0"; + # according to setup.py + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "1r3lp9gkph48g9lijby5rs5daa3lhxs204r14zw4kvp3hf4xcm84"; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5fd1be7c15cc20593ebba78727255d4d644dd8f8 --- /dev/null +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyyaml +, unidecode +, python +}: + +buildPythonPackage rec { + pname = "pyaml"; + version = "17.12.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3"; + }; + + propagatedBuildInputs = [ pyyaml ]; + + checkInputs = [ unidecode ]; + + meta = { + description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; + homepage = https://github.com/mk-fg/pretty-yaml; + license = lib.licenses.wtfpl; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1c2cb4a7643d45ef92a0ec0f4b5ac196316b8c1b --- /dev/null +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -0,0 +1,65 @@ +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }: + +let + _arrow-cpp = arrow-cpp.override { inherit python;}; + _parquet-cpp = parquet-cpp.override { arrow-cpp = _arrow-cpp; }; +in + +buildPythonPackage rec { + pname = "pyarrow"; + version = "0.9.0"; + + src = fetchurl { + url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; + sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy"; + }; + + sourceRoot = "apache-arrow-${version}/python"; + + nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; + propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; + checkInputs = [ pandas pytest pytestrunner ]; + + PYARROW_BUILD_TYPE = "release"; + PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib"; + + preBuild = '' + substituteInPlace CMakeLists.txt --replace "\''${ARROW_ABI_VERSION}" '"0.0.0"' + substituteInPlace CMakeLists.txt --replace "\''${ARROW_SO_VERSION}" '"0"' + + # fix the hardcoded value + substituteInPlace cmake_modules/FindParquet.cmake --replace 'set(PARQUET_ABI_VERSION "1.0.0")' 'set(PARQUET_ABI_VERSION "${_parquet-cpp.version}")' + ''; + + preCheck = '' + rm pyarrow/tests/test_hdfs.py + + # fails: "ArrowNotImplementedError: Unsupported numpy type 22" + substituteInPlace pyarrow/tests/test_feather.py --replace "test_timedelta_with_nulls" "_disabled" + + # runs out of memory on @grahamcofborg linux box + substituteInPlace pyarrow/tests/test_feather.py --replace "test_large_dataframe" "_disabled" + + # probably broken on python2 + substituteInPlace pyarrow/tests/test_feather.py --replace "test_unicode_filename" "_disabled" + + # fails "error: [Errno 2] No such file or directory: 'test'" because + # nix_run_setup invocation somehow manages to import deserialize_buffer.py + # when it is not intended to be imported at all + rm pyarrow/tests/deserialize_buffer.py + substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled" + ''; + + ARROW_HOME = _arrow-cpp; + PARQUET_HOME = _parquet-cpp; + + setupPyBuildFlags = ["--with-parquet" ]; + + meta = with lib; { + description = "A cross-language development platform for in-memory data"; + homepage = https://arrow.apache.org/; + license = lib.licenses.asl20; + platforms = platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index a7ee15d6a1811aed2b015c5820f1c4a2441f9c21..b8dcae16da858fde34d9ea67a211c984c452f63e 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyasn1-modules"; - version = "0.1.5"; + version = "0.2.1"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1239h6h67vg0wazg2qgv6m3hdim2gs66pl89lbnayk55bbnkwc0x"; + sha256 = "af00ea8f2022b6287dc375b2c70f31ab5af83989fc6fe9eacd4976ce26cd7ccc"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index d0122a5b7e403d672ecac9fd21a7357bf3fe14b8..8037796713ec2db77683ece018a48ee601d162e9 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyasn1"; - version = "0.3.4"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "06hhy38jhwh95gpn8f03cr439273fsfsh4vhd5024r86nh5gyiir"; + sha256 = "d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index d96a4c8cea320d9990c2c28ae6e78b7fccdb4d7f..6192f94445f39362793a4f8e57d8c8608f765d81 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }: +{ stdenv, fetchurl, pkgconfig, at-spi2-core, pythonPackages }: stdenv.mkDerivation rec { pname = "pyatspi"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { broken = true; buildInputs = [ - at_spi2_core + at-spi2-core pkgconfig pythonPackages.python pythonPackages.pygobject3 diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..be82cc7bf026e156e84adb703cd6d7a063be013d --- /dev/null +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, stdenv, lxml, click, fetchPypi }: + +buildPythonPackage rec { + version = "0.3.7"; + pname = "pyaxmlparser"; + + src = fetchPypi { + inherit pname version; + sha256 = "1spwr28sc6fc3cqdx2j2zq38qx889hixl4ahhf1nphpmrl39ypxr"; + }; + + propagatedBuildInputs = [ lxml click ]; + + meta = with stdenv.lib; { + description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; + homepage = https://github.com/appknox/pyaxmlparser; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0547a5d3ba0468e3ba285da48a4104a7786a9cf4 --- /dev/null +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, stdenv, fetchPypi, six, pytest }: + +buildPythonPackage rec { + pname = "pybase64"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "c974bff394e16817596fab686a0c7deb4995a468b035b02a788b6dbfd1e6bdeb"; + }; + + propagatedBuildInputs = [ six ]; + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/pybase64; + description = "Fast Base64 encoding/decoding"; + license = licenses.bsd2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix index 259e0cea86d08205431a6781d9c18a67e002267b..8f074943dd322a98f33967a184c04df8e96ccfee 100644 --- a/pkgs/development/python-modules/pybfd/default.nix +++ b/pkgs/development/python-modules/pybfd/default.nix @@ -1,25 +1,28 @@ -{ lib, buildPythonPackage, isPyPy, isPy3k, fetchurl, gdb, binutils }: +{ lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }: buildPythonPackage rec { - name = "pybfd-0.1.1"; + pname = "pybfd"; + version = "-0.1.1.2017-12-31"; disabled = isPyPy || isPy3k; - src = fetchurl { - url = "mirror://pypi/p/pybfd/${name}.tar.gz"; - sha256 = "d99b32ad077e704ddddc0b488c83cae851c14919e5cbc51715d00464a1932df4"; + src = fetchFromGitHub { + owner = "orivej"; + repo = "pybfd"; + rev = "a10ada53f2a79de7f62f209567806ef1e91794c7"; + sha256 = "0sxzhlqjyvvx1zr3qrkb57z6s3g6k3ksyn65fdm9lvl0k4dv2k9w"; }; - preConfigure = '' - substituteInPlace setup.py \ - --replace '"/usr/include"' '"${gdb}/include"' \ - --replace '"/usr/lib"' '"${binutils.lib}/lib"' - ''; + LIBBFD_INCLUDE_DIR = "${libbfd.dev}/include"; + LIBBFD_LIBRARY = "${libbfd}/lib/libbfd.so"; + LIBOPCODES_INCLUDE_DIR = "${libopcodes.dev}/include"; + LIBOPCODES_LIBRARY = "${libopcodes}/lib/libopcodes.so"; meta = { homepage = https://github.com/Groundworkstech/pybfd; description = "A Python interface to the GNU Binary File Descriptor (BFD) library"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ orivej ]; }; } diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..09cb4c2cdf98e1b8520b8adf874ecb0238a1ad7c --- /dev/null +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pygccxml }: +buildPythonPackage rec { + pname = "PyBindGen"; + version = "0.18.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sl4jn8rildv6f62cab66w791cixhaaxl7gwg9labs099rl74yl6"; + }; + + buildInputs = [ setuptools_scm ]; + + checkInputs = [ pygccxml ]; + + meta = with stdenv.lib; { + homepage = https://github.com/gjcarneiro/pybindgen; + description = "Python Bindings Generator"; + license = licenses.lgpl2; + maintainers = with maintainers; [ teto ]; + }; +} + + diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix index 4e166dcb18373b92117857e463b309173c6a8704..7d70fd30a25419506842bcb2e640949498b4e795 100644 --- a/pkgs/development/python-modules/pyblake2/default.nix +++ b/pkgs/development/python-modules/pyblake2/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pyblake2"; - version = "0.9.3"; + version = "1.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "626448e1fe1cc01d2197118954bec9f158378577e12686d5b01979f7f0fa2212"; + sha256 = "8ec8e9087d13c99b354ab6d8b4cadb1758633db5946ff95a6bc7ac538b6d7b3d"; }; # requires setting up sphinx doctest diff --git a/pkgs/development/python-modules/pybtex-docutils/default.nix b/pkgs/development/python-modules/pybtex-docutils/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..45d907df2233e44e0ad00363e4a6471715c91332 --- /dev/null +++ b/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, docutils, pybtex, six }: + +buildPythonPackage rec { + version = "0.2.1"; + pname = "pybtex-docutils"; + + doCheck = false; + buildInputs = [ docutils pybtex six ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0dqk4lplij7rbqqi4dbpw3wzr4wj08ysswvdibls6s0x3ij7bc74"; + }; + + meta = { + description = "A docutils backend for pybtex"; + homepage = "https://github.com/mcmtroffaes/pybtex-docutils"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..20689255435a4c1889536a57e3f4cf0e5d857fae --- /dev/null +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, latexcodec, pyyaml }: + +buildPythonPackage rec { + version = "0.21"; + pname = "pybtex"; + + doCheck = false; + propagatedBuildInputs = [ latexcodec pyyaml ]; + + src = fetchPypi { + inherit version pname; + sha256 = "00300j8dn5pxq4ndxmfmbmycg2znawkqs49val2x6jlmfiy6r2mg"; + }; + + meta = { + homepage = "https://pybtex.org/"; + description = "A BibTeX-compatible bibliography processor written in Python"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index b4366ab791f95c1f0b25252c42948e70e0ebd657..39c06bff3bf77d43a5d062794de7f663e3f3e7ba 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,50 +1,28 @@ -{ lib, fetchurl, fetchpatch, python, buildPythonPackage, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy36, isPy3k }: +{ lib, fetchFromGitHub, python, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPyPy }: -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 { +buildPythonPackage rec { pname = "pycairo"; - version = "1.10.0"; + version = "1.15.4"; name = "${pname}-${version}"; - format = "other"; - src = if isPy3k - then fetchurl { - url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2"; - sha256 = "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s"; - } - else fetchurl { - url = "http://cairographics.org/releases/py2cairo-${version}.tar.bz2"; - sha256 = "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k"; - }; + disabled = isPyPy; - patches = [ - (fetchpatch { - url = http://www.linuxfromscratch.org/patches/blfs/8.0/pycairo-1.10.0-waf_unpack-1.patch; - sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd"; - }) - ]; + src = fetchFromGitHub { + owner = "pygobject"; + repo = "pycairo"; + rev = "v${version}"; + sha256 = "02vzmfxx8nl6dbwzc911wcj7hqspgqz6v9xmq6579vwfla0vaglv"; + }; + + postPatch = '' + # we are unable to pass --prefix to bdist_wheel + # see https://github.com/NixOS/nixpkgs/pull/32034#discussion_r153285955 + substituteInPlace setup.py --replace '"prefix": self.install_base' "'prefix': '$out'" + ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python cairo xlibsWrapper ]; - - configurePhase = '' - ( - cd $(${python.executable} waf unpack) - patch -p1 < ${patch_waf} - ${lib.optionalString (isPy35 || isPy36) "patch -p1 < ${patch_waf-py3_5}"} - ) - - ${python.executable} waf configure --prefix=$out - ''; - buildPhase = "${python.executable} waf"; - installPhase = "${python.executable} waf install"; + checkInputs = [ pytest ]; meta.platforms = lib.platforms.linux ++ lib.platforms.darwin; } diff --git a/pkgs/development/python-modules/pycairo/waf-py3_5.patch b/pkgs/development/python-modules/pycairo/waf-py3_5.patch deleted file mode 100644 index dcfdbea2fbdceb0c31baca7e8cc58151e98400b9..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/pycairo/waf-py3_5.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/waflib/Build.py -+++ b/waflib/Build.py -@@ -151,6 +151,7 @@ class BuildContext(Context.Context): - f.close() - self.init_dirs() - def store(self): -+ return - data={} - for x in SAVED_ATTRS: - data[x]=getattr(self,x) diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 4995a714693103ae99b850f915967797e02f4f88..80b17034aa03c739eee918fcad5bdefbd1cf77ee 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie -, sqlite, python, cython +, sqlite, buildPythonPackage, cython }: -stdenv.mkDerivation rec { - name = "${python.libPrefix}-pycangjie-${version}"; - version = "1.3_rev_${rev}"; +let rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3"; +in buildPythonPackage rec { + pname = "pycangjie"; + version = "1.3_rev_${rev}"; + format = "other"; src = fetchurl { - name = "${name}.tar.gz"; url = "https://github.com/Cangjians/pycangjie/archive/${rev}.tar.gz"; sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool libcangjie sqlite python cython + autoconf automake libtool libcangjie sqlite cython ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..259c87347d72e661a71d1048b77f269eb5c53673 --- /dev/null +++ b/pkgs/development/python-modules/pychart/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: + +buildPythonPackage rec { + pname = "pychart"; + version = "1.39"; + + disabled = ! isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e"; + }; + + meta = with stdenv.lib; { + description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts"; + homepage = https://pypi.python.org/pypi/PyChart; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 440a1aa7785e246f71feb1796a3de6ce68429c9c..e90fc4b263665559743b4fed4a691c192f8481b7 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -1,19 +1,20 @@ { lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }: buildPythonPackage rec { - name = "PyChromecast-${version}"; - version = "0.8.1"; + pname = "PyChromecast"; + version = "2.1.0"; + name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6"; + sha256 = "a18fee9bf32f62fcb539783c3888e811015c1f6377bcdb383b13d6537691f336"; }; propagatedBuildInputs = [ requests six zeroconf protobuf ]; meta = with lib; { description = "Library for Python 2 and 3 to communicate with the Google Chromecast"; - homepage = "https://github.com/balloob/pychromecast"; + homepage = https://github.com/balloob/pychromecast; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 948d9741bd8bc1a0772cd13d90d3bfe47cb6e03e..35b10421f2c09b2068393fe948cbd42d640634db 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -2,15 +2,14 @@ buildPythonPackage rec { pname = "pycollada"; - version = "0.5"; - name = "${pname}-${version}"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "1g96maw2c25l4i3ks51784h33zf7s18vrn6iyz4ca34iy4sl7yq9"; + sha256 = "fcd6f38fd981e350f9ec754d9671834017accd600e967d6d299a6cfdae5ba4f4"; }; - buildInputs = [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]); + propagatedBuildInputs = [ numpy dateutil ]; # Some tests fail because they refer to test data files that don't exist # (upstream packaging issue) diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..23633ce248db92a3c33447c8833ace1ace1935bc --- /dev/null +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, pyparsing, decorator, six }: + +buildPythonPackage rec { + pname = "PyContracts"; + version = "1.8.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "8e52c4ddbc015b56cc672b7c005c11f3df4fe407b832964099836fa3cccb8b9d"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ pyparsing decorator six ]; + + meta = with stdenv.lib; { + description = "Allows to declare constraints on function parameters and return values"; + homepage = https://pypi.python.org/pypi/PyContracts; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/python-modules/pycosat/default.nix b/pkgs/development/python-modules/pycosat/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad49e38d06589c7bc99fe0b41818835d51903904 --- /dev/null +++ b/pkgs/development/python-modules/pycosat/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pycosat"; + version = "0.6.3"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "4c99874946a7e939bb941bbb019dd2c20e6068e3107c91366e7779c69d70e0ed"; + }; + + meta = { + description = "Bindings to picosat SAT solver"; + homepage = https://github.com/ContinuumIO/pycosat; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4a0dbe878f667fbf5c6c94d9dcdb458bd9db6d61 --- /dev/null +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, python }: + +buildPythonPackage rec { + pname = "pycparser"; + version = "2.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = with stdenv.lib; { + description = "C parser in Python"; + homepage = https://github.com/eliben/pycparser; + license = licenses.bsd3; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index 4669c05a7d5662fe0473d9643f7bba070cad3b8d..1ecf0bf6b339bf8346b22eaec39ad4a3c715d8f9 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -3,10 +3,9 @@ # This is a dummy package providing the drop-in replacement pycryptodome. # https://github.com/NixOS/nixpkgs/issues/21671 -let +buildPythonPackage rec { version = pycryptodome.version; pname = "pycrypto"; -in buildPythonPackage rec { name = "${pname}-${version}"; # Cannot build wheel otherwise (zip 1980 issue) diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 9751eaf7ce795515add00436d03bb25807cac9ae..85024baa26e45aa5c279d124c92ed1667ed9e9de 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.7"; + version = "3.5.1"; pname = "pycryptodome"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "18d8dfe31bf0cb53d58694903e526be68f3cf48e6e3c6dfbbc1e7042b1693af7"; + sha256 = "b7957736f5e868416b06ff033f8525e64630c99a8880b531836605190b0cac96"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 35a7213306f9ec5cbcc735bd622d549752b5190e..c5af0c91317e7f8c91c0d04d1b76f1b48bba0b6f 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; name = "${pname}-${version}"; - version = "3.4.7"; + version = "3.5.1"; meta = { description = "A self-contained cryptographic library for Python"; @@ -13,6 +13,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "52aa2e540d06d63636e4b5356957c520611e28a88386bad4d18980e4b00e0b5a"; + sha256 = "bb60d38111ebc383a5a1c909545562926c66c846d03fc65ba7b8a3487cb23078"; }; } diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/pkgs/development/python-modules/pycuda/compyte.nix index 50bd81ac462cf60a01acf37dea5967ce12b70b4b..192d60cec46a37e3b16a8553191d147aa64a7d60 100644 --- a/pkgs/development/python-modules/pycuda/compyte.nix +++ b/pkgs/development/python-modules/pycuda/compyte.nix @@ -1,10 +1,11 @@ -{ mkDerivation +{ mkDerivation , fetchFromGitHub }: mkDerivation rec { - name = "compyte-${version}"; - version = "git-20150817"; + pname = "compyte"; + version = "git-20150817"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "inducer"; @@ -13,7 +14,7 @@ mkDerivation rec { sha256 = "1980h017qi52b7fqwm75m481xs2napgdd3fbrzkfc29k085cbign"; }; - installPhase = '' + installPhase = '' mkdir -p $out cp -r * $out ''; diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 0bd8800eddcb2232b10eeec276ddb2456f8b482a..eb7459b0779254e7398edf564ca101037a22b971 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -13,8 +13,7 @@ , python , mkDerivation , stdenv -, pythonOlder -, isPy35 +, isPy3k }: let compyte = import ./compyte.nix { @@ -35,7 +34,7 @@ buildPythonPackage rec { ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ - --boost-python-libname=boost_python + --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} ''; postInstall = '' diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..28dff352e389fdfefa3ca376fd7d3713d8f6f2ea --- /dev/null +++ b/pkgs/development/python-modules/pycups/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildPythonPackage, fetchurl, cups, libiconv }: + +buildPythonPackage rec { + pname = "pycups"; + version = "1.9.73"; + + src = fetchurl { + url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; + sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335"; + }; + + buildInputs = [ cups ] ++ lib.optional stdenv.isDarwin libiconv; + + # Wants to connect to CUPS + doCheck = false; + + meta = with lib; { + description = "Python bindings for libcups"; + homepage = http://cyberelk.net/tim/software/pycups/; + license = with licenses; [ gpl2Plus ]; + }; +} diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..27a9790dce0ed337d161ef1d8788299c26ce5fe9 --- /dev/null +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, isPyPy +, fetchPypi +, curl +, openssl +, bottle +, pytest +, nose +, flaky +}: + +buildPythonPackage rec { + pname = "pycurl"; + version = "7.43.0.1"; + disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208 + + src = fetchPypi { + inherit pname version; + sha256 = "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3"; + }; + + buildInputs = [ curl openssl.out ]; + + checkInputs = [ bottle pytest nose flaky ]; + + checkPhase = '' + py.test -k "not ssh_key_cb_test \ + and not test_libcurl_ssl_gnutls \ + and not test_libcurl_ssl_nss \ + and not test_libcurl_ssl_openssl \ + and not test_libcurl_ssl_unrecognized \ + and not test_request_with_verifypeer \ + and not test_ssl_in_static_libs" tests + ''; + + preConfigure = '' + substituteInPlace setup.py --replace '--static-libs' '--libs' + export PYCURL_SSL_LIBRARY=openssl + ''; + + meta = { + homepage = http://pycurl.sourceforge.net/; + description = "Python wrapper for libcurl"; + }; +} diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..058f8b6b88735e61bf009a6a0c3dfa99821dee11 --- /dev/null +++ b/pkgs/development/python-modules/pydbus/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, pygobject3 }: + +buildPythonPackage rec { + pname = "pydbus"; + version = "0.6.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b0gipvz7vcfa9ddmwq2jrx16d4apb0hdnl5q4i3h8jlzwp1c1s2"; + }; + + propagatedBuildInputs = [ pygobject3 ]; + + meta = { + homepage = https://github.com/LEW21/pydbus; + description = "Pythonic DBus library"; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a2f2daa2fe9c7fb414ef3a7037e099e25e2ca376 --- /dev/null +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder +, snowballstemmer, six, configparser +, pytest, pytestpep8, mock, pathlib }: + +buildPythonPackage rec { + pname = "pydocstyle"; + version = "2.1.1"; + + # no tests on PyPI + # https://github.com/PyCQA/pydocstyle/issues/302 + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = version; + sha256 = "1h0k8lpx14svc8dini62j0kqiam10pck5sdzvxa4xhsx7y689g5l"; + }; + + propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; + + checkInputs = [ pytest pytestpep8 mock ] ++ lib.optional (pythonOlder "3.4") pathlib; + + checkPhase = '' + # test_integration.py installs packages via pip + py.test --pep8 --cache-clear -vv src/tests -k "not test_integration" + ''; + + meta = with lib; { + description = "Python docstring style checker"; + homepage = https://github.com/PyCQA/pydocstyle/; + license = licenses.mit; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 38123acd32ec7af5afff8f44dba8ab13649c7f69..98d4b33939a2c9d07d37e4e9544a23f1d44f7e70 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pydot"; - version = "1.2.3"; + version = "1.2.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "edb5d3f249f97fbd9c4bb16959e61bc32ecf40eee1a9f6d27abe8d01c0a73502"; + sha256 = "92d2e2d15531d00710f2d6fb5540d2acabc5399d464f2f20d5d21073af241eb6"; }; checkInputs = [ chardet ]; # No tests in archive @@ -22,6 +22,6 @@ buildPythonPackage rec { 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 ]; + license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..03b594a131a0b98db003460f0b24014df1c6065e --- /dev/null +++ b/pkgs/development/python-modules/pydotplus/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyparsing +, graphviz +}: + +buildPythonPackage rec { + pname = "pydotplus"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1i05cnk3yh722fdyaq0asr7z9xf7v7ikbmnpxa8j6pdqx6g5xs4i"; + }; + + propagatedBuildInputs = [ + pyparsing + graphviz + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/erocarrera/pydot; + description = "An improved version of the old pydot project that provides a Python Interface to Graphviz’s Dot language"; + license = licenses.mit; + maintainers = with maintainers; [ ashgillman ]; + }; +} diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 819c6ffe4892c3f8545dabb3bcd4f483359db9d1..6450cb7c70eb09dad40bfb1476d57a219aa54f87 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pydub"; - version = "0.20.0"; + version = "0.21.0"; src = fetchPypi { inherit pname version; - sha256 = "0hqsvvph6ks4kxj0m2q1xvl5bllqmpk78rlqpqhh79schl344xkv"; + sha256 = "27acc5977b0f5220682175d44fda737bbf818143b0832c0c3863b5dde38e197a"; }; patches = [ diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..33e8d9c3fa9d1d95b224ddff406f12c16ba4051a --- /dev/null +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "pyechonest"; + version = "9.0.0"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1da4b3b8b457232a7eb35b59a48390b3c208759b01d596acaa71e6a172b40495"; + }; + + meta = with stdenv.lib; { + description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; + homepage = https://github.com/echonest/pyechonest; + }; +} diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index 1004d70476c9024c447982a42437860fe0a089d4..a7430c94b480e2d6a534f5f83feb38b65337cee1 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyemd"; - version = "0.4.4"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "13y06y7r1697cv4r430g45fxs40i2yk9xn0dk9nqlrpddw3a0mr4"; + sha256 = "fc81c2116f8573e559dfbb8d73e03d9f73c22d0770559f406516984302e07e70"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix index db06fedd68cc1487e734921d0f407fd66f5f21c8..e393265ae37fa970932763eaad0e61b38d340634 100644 --- a/pkgs/development/python-modules/pyev/default.nix +++ b/pkgs/development/python-modules/pyev/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, buildPythonPackage, libev }: buildPythonPackage rec { - name = "pyev-0.9.0"; + pname = "pyev"; + version = "0.9.0"; + name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pyev/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cfb575c7675ef86a7ad32fcf5ccbaae1b7708a42 --- /dev/null +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -0,0 +1,37 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, python, pytest, glibcLocales }: + +buildPythonPackage rec { + version = "3.4.1"; + pname = "pyfakefs"; + + # no tests in PyPI tarball + # https://github.com/jmcgeheeiv/pyfakefs/pull/361 + src = fetchFromGitHub { + owner = "jmcgeheeiv"; + repo = pname; + rev = "v${version}"; + sha256 = "0i8kq7sl8bczr927hllgfhsmirjqjh89c9184kcqmprc13ac4kxy"; + }; + + postPatch = '' + # test doesn't work in sandbox + substituteInPlace tests/fake_filesystem_test.py \ + --replace "test_expand_root" "notest_expand_root" + substituteInPlace tests/fake_os_test.py \ + --replace "test_append_mode" "notest_append_mode" + ''; + + checkInputs = [ pytest glibcLocales ]; + + checkPhase = '' + LC_ALL=en_US.UTF-8 ${python.interpreter} -m tests.all_tests + py.test tests/pytest_plugin_test.py + ''; + + meta = with stdenv.lib; { + description = "Fake file system that mocks the Python file system modules"; + license = licenses.asl20; + homepage = http://pyfakefs.org/; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index a02aa94576e55665387533904d527ed96b408dd8..a858374722551a6cae63182b0092c1ba393db2b2 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -1,13 +1,15 @@ { stdenv, buildPythonPackage, fetchFromGitHub, isPy3k -, boost, freetype, ftgl, mesa }: +, boost, freetype, ftgl, libGLU_combined }: buildPythonPackage rec { - name = "pyftgl-0.4b"; + pname = "pyftgl"; + version = "0.4b"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "umlaeute"; - repo = "pyftgl"; - rev = "0.4b"; + repo = name; + rev = version; sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; @@ -15,7 +17,7 @@ buildPythonPackage rec { sed -i "s,'boost_python','boost_python3',g" setup.py ''; - buildInputs = [ boost freetype ftgl mesa ]; + buildInputs = [ boost freetype ftgl libGLU_combined ]; meta = with stdenv.lib; { description = "Python bindings for FTGL (FreeType for OpenGL)"; diff --git a/pkgs/development/python-modules/pygame/git.nix b/pkgs/development/python-modules/pygame/git.nix index 97f7b8b6c993554c1da25feae6eb5783f47283df..1d8ba697f38b3d32f6552c98e40eee09deec1e57 100644 --- a/pkgs/development/python-modules/pygame/git.nix +++ b/pkgs/development/python-modules/pygame/git.nix @@ -3,8 +3,9 @@ }: buildPythonPackage rec { - name = "pygame-${version}"; + pname = "pygame"; version = "2016-05-17"; + name = pname + "-" + version; src = fetchFromBitbucket { owner = "pygame"; diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index eab56f9f7ac07afa9d4b840ee010c3ff81fa4d3c..08c266da6963afc510cf1f26a5bc80ed8e8986a6 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,18 +1,30 @@ -{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub, isPy27 +{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch , 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"; + version = "2.1.0"; + renpy_version = "6.99.14"; + name = "${pname}-${version}-${renpy_version}"; + + src = fetchurl { + url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; + sha256 = "1zsnb2bivbwysgxmfg9iv12arhpf3gqkmqinhciz955hlqv016b9"; }; + # force rebuild of headers needed for install + prePatch = '' + rm -rf gen gen3 + ''; + + patches = [ + # fix for recent sdl2 + (fetchpatch { + url = "https://github.com/apoleon/pygame_sdl2/commit/ced6051f4a4559a725804cc58c079e1efea0a573.patch"; + sha256 = "08rqjzvdlmmdf8kyd8ws5lzjy1mrwnds4fdy38inkyw7saydcxyr"; + }) + ]; + buildInputs = [ SDL2 SDL2_image SDL2_ttf SDL2_mixer cython libjpeg libpng diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5271677dc1eab7cf622dfe20fdf6f418ec3512cd --- /dev/null +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -0,0 +1,26 @@ +{ stdenv, castxml, fetchFromGitHub, buildPythonPackage, +llvmPackages, clang }: +buildPythonPackage rec { + pname = "pygccxml"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "gccxml"; + repo = "pygccxml"; + rev = "v${version}"; + sha256 = "02ip03s0vmp7czzflbvf7qnybibfrd0rzqbc5zfmq3zmpnck3hvm"; + }; + + buildInputs = [ castxml llvmPackages.libcxxStdenv]; + + # running the suite is hard, needs to generate xml_generator.cfg + # but the format doesn't accept -isystem directives + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/gccxml/pygccxml; + description = "Python package for easy C++ declarations navigation"; + license = licenses.boost; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 90bfe978391882c415b18ecff7420e75c5376ca7..d8eb05cf34857ca548eda9534a818bb02f143b8a 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pygit2"; - version = "0.26.0"; + version = "0.26.3"; src = fetchPypi { inherit pname version; - sha256 = "1cbc488ra3kg7r3qky17ms0szi3cda2d96qfkv1l9djsy9hnvw57"; + sha256 = "29baa530d6fcbf7cca6a75cf9c78fb88613ca81afb39c62fe492f226f6b61800"; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 8d5dd53f80ac84050edb58af1d8fadfda7bfb1dd..3fc7f8ddb6835a41d0b5115fc00b8bde60d38e13 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -1,23 +1,24 @@ { stdenv, buildPythonPackage, fetchPypi -, mesa, xorg, freetype, fontconfig}: +, libGLU_combined, xorg, freetype, fontconfig, future}: buildPythonPackage rec { - version = "1.2.4"; + version = "1.3.1"; pname = "pyglet"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445"; + sha256 = "0a73280fa3949ea4890fee28f625c10b1e10a7cda390a08b6bce4740948167cd"; }; - patchPhase = let - libs = [ mesa xorg.libX11 freetype fontconfig ]; + postPatch = let + libs = [ libGLU_combined xorg.libX11 freetype fontconfig ]; paths = builtins.concatStringsSep "," (map (l: "\"${l}/lib\"") libs); in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; doCheck = false; + propagatedBuildInputs = [ future ]; + meta = with stdenv.lib; { homepage = "http://www.pyglet.org/"; description = "A cross-platform windowing and multimedia library"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 6afd10596bc6954c7745bfb18389767a25286387..524fb4af61c5903027f543fcceac77bd324b995a 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: buildPythonPackage rec { - major = "3.24"; + major = "3.26"; minor = "1"; - name = "pygobject-${major}.${minor}"; + version = "${major}.${minor}"; format = "other"; + pname = "pygobject"; + name = pname + "-" + version; src = fetchurl { url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz"; - sha256 = "1zdzznrj2s1gsrv2z4r0n88fzba8zjc1n2r313xi77lhl1daja56"; + sha256 = "1afi0jdjd9sanrzjwhv7z1k7qxlb91fqa6yqc2dbpjkhkjdpnmzm"; }; outputs = [ "out" "dev" ]; @@ -19,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycairo cairo ]; meta = { - homepage = http://live.gnome.org/PyGObject; + homepage = https://pygobject.readthedocs.io/; description = "Python bindings for Glib"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 63a21cb2befd2d1301b66b57a0699a91a74ebfca..796fc992a7dc5ecafec693252ba06dde83ed9118 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib }: buildPythonPackage rec { - name = "pygobject-${version}"; + pname = "pygobject"; version = "2.28.6"; format = "other"; + name = pname + "-" + version; 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 index bed258c1673b784a90ccb40199461ea00263dbb6..e6ab3512797ddc30053926aa241187ac93dd79b7 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Python interface to Graphviz graph drawing package"; homepage = https://github.com/pygraphviz/pygraphviz; license = licenses.bsd3; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..503dad717c2be25f3b5419a05310eca1444a29db --- /dev/null +++ b/pkgs/development/python-modules/pygtail/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "pygtail"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "bgreenlee"; + repo = pname; + rev = version; + sha256 = "1f8qlijiwn10jxg1bsi6q42fznbg8rw039yaxfh6rzbaj2gaxbz1"; + }; + + # remove at next bump, tag is one commit early for 0.8.0 + postPatch = '' + substituteInPlace pygtail/core.py \ + --replace 0.7.0 0.8.0 + ''; + + meta = with lib; { + description = "A library for reading log file lines that have not been read"; + license = licenses.gpl2Plus; + homepage = https://github.com/bgreenlee/pygtail; + }; +} diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 9b9adc64b755c81deaf6cd0b6145ef22e41c16f4..42127de2f2446ae1a65350d828c91b493e8705a7 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage, libglade ? null, isPy3k }: buildPythonPackage rec { - name = "pygtk-2.24.0"; + pname = "pygtk"; + version = "2.24.0"; + name = pname + "-" + version; disabled = isPy3k; diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 7b89e6d1b28c2bb45efb791882d20ce417675500..a03be0ac04dff5a4232f829e360d104312ce055f 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }: -let version = "2.10.1"; in - -buildPythonPackage { - name = "pygtksourceview-${version}"; +buildPythonPackage rec { + pname = "pygtksourceview"; format = "other"; + version = "2.10.1"; + name = pname + "-" + version; src = fetchurl { url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2"; diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..18e477dbd814840fd7251366a7d0ffc6e9c7fac6 --- /dev/null +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "pyhomematic"; + version = "0.1.41"; + + disabled = !isPy3k; + + # PyPI tarball does not include tests/ directory + src = fetchFromGitHub { + owner = "danielperna84"; + repo = pname; + rev = version; + sha256 = "01j6y2ypi7a8ffnkqd8j8vnpszza2cxqpiqbnk1dwbg9w9pwwq53"; + }; + + # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126 + doCheck = false; + + meta = with stdenv.lib; { + description = "Python 3 Interface to interact with Homematic devices"; + homepage = https://github.com/danielperna84/pyhomematic; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyjade/default.nix b/pkgs/development/python-modules/pyjade/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad6742f5deb3a21fe4c689fae931be2b456c5cc9 --- /dev/null +++ b/pkgs/development/python-modules/pyjade/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyramid_mako, nose, django, jinja2 +, tornado, pyramid, Mako, six }: + +buildPythonPackage rec { + pname = "pyjade"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd"; + }; + + buildInputs = [ pyramid_mako nose django jinja2 tornado pyramid Mako ]; + propagatedBuildInputs = [ six ]; + postPatch = '' + sed -i 's/1.4.99/1.99/' setup.py + ''; + checkPhase = '' + nosetests pyjade + ''; + # No tests distributed. https://github.com/syrusakbary/pyjade/issues/262 + doCheck = false; + meta = with stdenv.lib; { + description = "Jade syntax template adapter for Django, Jinja2, Mako and Tornado templates"; + homepage = "https://github.com/syrusakbary/pyjade"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0770520ceee985cf3b0fcb6094adef6c562db28a --- /dev/null +++ b/pkgs/development/python-modules/pykde4/default.nix @@ -0,0 +1,43 @@ +{ pyqt4, + stdenv, callPackage, fetchurl, cmake, automoc4, sip }: + +let + kdelibs = callPackage ./kdelibs.nix {}; + sip4_19_3 = sip.overrideAttrs (oldAttrs: rec { + src = fetchurl { + url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz"; + sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl"; + }; + }); + pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: rec { + propagatedBuildInputs = [ sip4_19_3 ]; + }); +in stdenv.mkDerivation rec { + version = "4.14.3"; + name = "pykde4-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${version}/src/${name}-${version}.tar.xz"; + sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz"; + }; + + patches = [ ./dlfcn.patch ]; + + buildInputs = [ + kdelibs + ]; + + nativeBuildInputs = [ cmake automoc4 ]; + + propagatedBuildInputs = [ pyqt4_fixed ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + platforms = platforms.linux; + description = "Python bindings for KDE"; + license = with licenses; [ gpl2 lgpl2 ]; + homepage = https://api.kde.org/pykde-4.3-api/; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/development/python-modules/pykde4/dlfcn.patch b/pkgs/development/python-modules/pykde4/dlfcn.patch new file mode 100644 index 0000000000000000000000000000000000000000..63aff46eeab199753d51199de73820b5e1143407 --- /dev/null +++ b/pkgs/development/python-modules/pykde4/dlfcn.patch @@ -0,0 +1,13 @@ +--- __init__.py.orig 2017-11-02 09:06:48.998054459 +0300 ++++ ./__init__.py 2017-11-02 09:24:28.089072752 +0300 +@@ -1,4 +1,8 @@ +-import sys,DLFCN ++import sys ++try: ++ import DLFCN ++except ImportError: ++ import os as DLFCN + # This is needed to ensure that dynamic_cast and RTTI works inside kdelibs. + sys.setdlopenflags(DLFCN.RTLD_NOW|DLFCN.RTLD_GLOBAL) + +\ No newline at end of file diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix new file mode 100644 index 0000000000000000000000000000000000000000..c5e148d1500af1c6a8cb5dc2d2fa402668c1a747 --- /dev/null +++ b/pkgs/development/python-modules/pykde4/kdelibs.nix @@ -0,0 +1,38 @@ +{ + stdenv, fetchurl, + automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info, + attica, docbook_xml_dtd_42, docbook_xsl, giflib, + libdbusmenu_qt, libjpeg, phonon, qt4 +}: + +stdenv.mkDerivation rec { + version = "4.14.38"; + name = "kdelibs-${version}"; + src = fetchurl { + url = "mirror://kde/stable/applications/17.08.3/src/${name}.tar.xz"; + sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info + ]; + buildInputs = [ + attica giflib libdbusmenu_qt libjpeg + ]; + propagatedBuildInputs = [ qt4 phonon ]; + + cmakeFlags = [ + "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" + "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" + "-DKJS_FORCE_DISABLE_PCRE=true" + "-DWITH_SOLID_UDISKS2=OFF" + ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + homepage = http://www.kde.org; + license = with licenses; [ gpl2 fdl12 lgpl21 ]; + }; +} diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c4ef98b43ef614f771061dfebadce5f39c037cba --- /dev/null +++ b/pkgs/development/python-modules/pylama/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, fetchpatch +, mccabe, pycodestyle, pydocstyle, pyflakes +, pytest, ipdb }: + +buildPythonPackage rec { + pname = "pylama"; + version = "7.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "390c1dab1daebdf3d6acc923e551b035c3faa77d8b96b98530c230493f9ec712"; + }; + + patches = fetchpatch { + url = "${meta.homepage}/pull/116.patch"; + sha256 = "00jz5k2w0xahs1m3s603j6l4cwzz92qsbbk81fh17nq0f47999mv"; + }; + + propagatedBuildInputs = [ mccabe pycodestyle pydocstyle pyflakes ]; + + checkInputs = [ pytest ipdb ]; + + # tries to mess with the file system + doCheck = false; + + meta = with lib; { + description = "Code audit tool for python"; + homepage = https://github.com/klen/pylama; + # ambiguous license declarations: https://github.com/klen/pylama/issues/64 + license = licenses.lgpl3; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 99bcb9357dc8fc26550c301886d5e77e55389395..e9b4db49dbd9b8db0425935338e14ea99858defc 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pylast"; - version = "1.9.0"; + version = "2.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ae1c4105cbe704d9ac10ba57ac4c26bc576cc33978f1b578101b20c6a2360ca4"; + sha256 = "b9b51dc40a7d3ac3eee17ab5b462b8efb7f2c2ff195261ea846ae4e1168e1c5b"; }; propagatedBuildInputs = [ certifi six ]; diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8db864cc869d4f00850ae1de1d4275b350545f1e --- /dev/null +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, python, lib, fetchPypi +, isPy3k +, requests +}: + +buildPythonPackage rec { + pname = "pylibgen"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rviqi3rf62b43cabdy8c2cdznjv034mp0qrfrzvkih4jlkhyfrh"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ requests ]; + + # It's not using unittest + checkPhase = "${python.interpreter} tests/test_pylibgen.py -c 'test_api_endpoints()'"; + + meta = { + description = "Python interface to Library Genesis"; + homepage = https://pypi.org/project/pylibgen/; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index afe3bf8e503d0f4c82d9d3275b839c3b54a2fcdb..5e053891164eae24609b6cdbde46e18cd68444dc 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,16 +4,16 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.7.4"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "1f65b3815c3bf7524b845711d54c4242e4057dd93826586620239ecdfe591fb1"; + sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; - propagatedBuildInputs = [ astroid configparser isort ]; + propagatedBuildInputs = [ astroid configparser isort mccabe ]; postPatch = '' # Remove broken darwin tests diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..db8584c4f9e54f41f9eb6a46b755a602f55640a5 --- /dev/null +++ b/pkgs/development/python-modules/pylru/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "pylru-${version}"; + version = "1.0.9"; + + src = fetchurl { + url = "mirror://pypi/p/pylru/${name}.tar.gz"; + sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi"; + }; + + meta = with lib; { + homepage = https://github.com/jlhutch/pylru; + description = "A least recently used (LRU) cache implementation"; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8d61c2bf9e9896613e23898707f43169a7509e1a --- /dev/null +++ b/pkgs/development/python-modules/pylti/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httplib2 +, oauth +, oauth2 +, semantic-version +, flask +, httpretty +, oauthlib +, pyflakes +, pytest +, pytestcache +, pytestcov +, covCore +, pytestflakes +, pytestpep8 +, sphinx +, mock +, isPy27 +}: + +buildPythonPackage rec { + pname = "PyLTI"; + version = "0.5.1"; + + disabled = !isPy27; + + # There is no need to fix mock. https://github.com/mitodl/pylti/pull/48 + postPatch = '' + substituteInPlace setup.py --replace "mock==1.0.1" "mock" + ''; + + propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; + checkInputs = [ + flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore + pytestflakes pytestpep8 sphinx mock + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "32093d961bf95e508bf27667289155da1e082ed9989bb84a76c54c6974c941e1"; + }; + + meta = { + description = "Implementation of IMS LTI interface that works with edX"; + homepage = "https://github.com/mitodl/pylti"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ layus ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pymacaroons-pynacl/default.nix b/pkgs/development/python-modules/pymacaroons-pynacl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8bc644252c0f95fe4911bd1f0656ead4f38d3c9c --- /dev/null +++ b/pkgs/development/python-modules/pymacaroons-pynacl/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pynacl, six }: + +buildPythonPackage rec { + pname = "pymacaroons-pynacl"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "pymacaroons"; + rev = "v${version}"; + sha256 = "0bykjk01zdndp6gjr30x46blsn0cvxa7j0zh5g8raxwaawchjhii"; + }; + + propagatedBuildInputs = [ pynacl six ]; + + # Tests require an old version of hypothesis + doCheck = false; + + meta = with lib; { + description = "Macaroon library for Python"; + homepage = https://github.com/matrix-org/pymacaroons; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a918528bdf8740799b486e89a997f8429cd12839 --- /dev/null +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: + +buildPythonPackage rec { + pname = "pymetar"; + version = "0.21"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k"; + }; + + meta = with stdenv.lib; { + description = "A command-line tool to show the weather report by a given station ID"; + homepage = http://www.schwarzvogel.de/software/pymetar.html; + license = licenses.gpl2; + maintainers = with maintainers; [ erosennin ]; + }; +} diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 5b400e1521e0af883060aefe23e764f9e0af0680..038b12b3a9e71beea8720008a81d885406e96e69 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.5.1"; + version = "3.6.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0939bl3brrklvccicck62gs3zd7i9aysz13c8pxc3gpk2hsdj878"; + sha256 = "f7ebcb846962ee40374db2d9014a89bea9c983ae63c1877957c3a0a756974796"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bceb2b50cc5967892abd9441c2c873e6e8c9e44b --- /dev/null +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}: + +buildPythonPackage rec { + pname = "pynacl"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "pyca"; + repo = pname; + rev = version; + sha256 = "0z9i1z4hjzmp23igyhvg131gikbrr947506lwfb3fayf0agwfv8f"; + }; + + # set timeout to unlimited, remove deadline from tests, see https://github.com/pyca/pynacl/issues/370 + patches = [ ./pynacl-no-timeout-and-deadline.patch ]; + + checkInputs = [ pytest hypothesis ]; + propagatedBuildInputs = [ libsodium cffi six ]; + + SODIUM_INSTALL = "system"; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ va1entin ]; + description = "Python binding to the Networking and Cryptography (NaCl) library"; + homepage = https://github.com/pyca/pynacl/; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch b/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch new file mode 100644 index 0000000000000000000000000000000000000000..5f831df3c48db2b05eede43ae06ac70704ad4e8e --- /dev/null +++ b/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch @@ -0,0 +1,49 @@ +diff --git a/tests/test_pwhash.py b/tests/test_pwhash.py +index 9634c85..7f20316 100644 +--- a/tests/test_pwhash.py ++++ b/tests/test_pwhash.py +@@ -20,7 +20,7 @@ import os + import sys + import unicodedata as ud + +-from hypothesis import given, settings ++from hypothesis import given, settings, unlimited + from hypothesis.strategies import integers, text + + import pytest +@@ -411,7 +411,7 @@ def test_str_verify_argon2_ref_fail(password_hash, password): + integers(min_value=1024 * 1024, + max_value=16 * 1024 * 1024) + ) +-@settings(deadline=1500, max_examples=20) ++@settings(timeout=unlimited, deadline=None, max_examples=20) + def test_argon2i_str_and_verify(password, ops, mem): + _psw = password.encode('utf-8') + pw_hash = nacl.pwhash.argon2i.str(_psw, opslimit=ops, memlimit=mem) +@@ -425,7 +425,7 @@ def test_argon2i_str_and_verify(password, ops, mem): + integers(min_value=1024 * 1024, + max_value=16 * 1024 * 1024) + ) +-@settings(deadline=1500, max_examples=20) ++@settings(timeout=unlimited, deadline=None, max_examples=20) + def test_argon2id_str_and_verify(password, ops, mem): + _psw = password.encode('utf-8') + pw_hash = nacl.pwhash.argon2id.str(_psw, opslimit=ops, memlimit=mem) +@@ -439,7 +439,7 @@ def test_argon2id_str_and_verify(password, ops, mem): + integers(min_value=1024 * 1024, + max_value=16 * 1024 * 1024) + ) +-@settings(deadline=1500, max_examples=20) ++@settings(timeout=unlimited, deadline=None, max_examples=20) + def test_argon2i_str_and_verify_fail(password, ops, mem): + _psw = password.encode('utf-8') + pw_hash = nacl.pwhash.argon2i.str(_psw, opslimit=ops, memlimit=mem) +@@ -448,7 +448,7 @@ def test_argon2i_str_and_verify_fail(password, ops, mem): + + + @given(text(alphabet=PASSWD_CHARS, min_size=5, max_size=20)) +-@settings(deadline=1500, max_examples=5) ++@settings(timeout=unlimited, deadline=None, max_examples=5) + def test_pwhash_str_and_verify(password): + _psw = password.encode('utf-8') + diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 0cf083196451851ea710ca46c1ca3aec7aaef791..ea557938d20fb61b4bda4716fc2b4244198032c0 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyobjc"; - version = "4.0b1"; + version = "4.2.1"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "16bng6960c1m57nnh1l09ycnyimrqzw9mx9pnyjxn5zzm5kalr37"; + sha256 = "b156abab60da3f3c4bc65a919eabb2c98539a94163a277efba5828358396d23e"; }; meta = { diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 54caba10189e8bc2d4e012e74aa2f718d8e7ba43..c30d80a00155f2694c06d0b9c6a982f0bd4eaf12 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,10 +1,12 @@ { lib, fetchFromGitHub, buildPythonPackage, pillow, six -, tesseract, cuneiform +, tesseract, cuneiform, isPy3k }: buildPythonPackage rec { - name = "pyocr-${version}"; + pname = "pyocr"; version = "0.4.7"; + name = pname + "-" + version; + disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index b236715a5d654d6550e855e00f9de1f7661ea17a..d8d61c56c35768b4401318f84399710a4e9d039b 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.21"; + version = "4.0.23"; name = "${pname}-${version}"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "9655f84ca9e5cb2dfffff705601017420c840d55271ba62dd44f05383eff0329"; + sha256 = "bb33d032c1f25781db64e2e4fecf77047fab2ddde42a6cd9496e3c66fb8e9f66"; }; buildInputs = [ libiodbc ]; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 362cef42b783f10df62659fe97b59cfa4bdc142a..d90ff45810770a355adda507302e38a6d2446883 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -15,25 +15,30 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2017.2"; - name = "${pname}-${version}"; + version = "2018.1.1"; - buildInputs = [ pytest opencl-headers ocl-icd ]; + checkInputs = [ pytest ]; + buildInputs = [ opencl-headers ocl-icd ]; propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; src = fetchPypi { inherit pname version; - sha256 = "039b689a58eb98e27a577ac086210deae959f40d657487f3199d2d217c270ff9"; + sha256 = "29683b47ec729c77a1be4d6fae2bd3718ca4cfcbe14655261a3a14d5bf55530a"; }; + # py.test is not needed during runtime, so remove it from `install_requires` + postPatch = '' + substituteInPlace setup.py --replace "pytest>=2" "" + ''; + # gcc: error: pygpu_language_opencl.cpp: No such file or directory doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Python wrapper for OpenCL"; homepage = https://github.com/pyopencl/pyopencl; - license = stdenv.lib.licenses.mit; - maintainer = stdenv.lib.maintainers.fridh; + license = licenses.mit; + maintainers = [ maintainers.fridh ]; }; } diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f3054e3e4dd4390827e37f008887a7ea69914d80 --- /dev/null +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, openssl +, cryptography +, pyasn1 +, idna +, pytest +, pretend +, flaky +, glibcLocales +}: + +buildPythonPackage rec { + pname = "pyOpenSSL"; + version = "17.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773"; + }; + + outputs = [ "out" "dev" ]; + + preCheck = '' + sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py + # https://github.com/pyca/pyopenssl/issues/692 + sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py + ''; + + checkPhase = '' + runHook preCheck + export LANG="en_US.UTF-8" + py.test + runHook postCheck + ''; + + # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 + # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. + doCheck = !stdenv.isDarwin; + + buildInputs = [ openssl ]; + propagatedBuildInputs = [ cryptography pyasn1 idna ]; + + checkInputs = [ pytest pretend flaky glibcLocales ]; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 4c694319563e6f5a6f32ff20ff3cf368576a1bb2..3af86dabe21511245bf448139bd4ef6ff7485f59 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "pypandoc"; version = "1.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -27,6 +26,8 @@ buildPythonPackage rec { description = "Thin wrapper for pandoc"; homepage = https://github.com/bebraw/pypandoc; license = licenses.mit; - maintainers = with maintainers; [ bennofs kristoff3r ]; + maintainers = with maintainers; [ bennofs ]; + + broken = true; # incompatible with pandoc v2 }; } diff --git a/pkgs/development/python-modules/pyparser/default.nix b/pkgs/development/python-modules/pyparser/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1c00d726eadc6cdb4a3422750c211fd0fe88aebb --- /dev/null +++ b/pkgs/development/python-modules/pyparser/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, lib, fetchFromBitbucket +, parse +}: + +buildPythonPackage rec { + pname = "pyparser"; + version = "1.0"; + + # Missing tests on Pypi + src = fetchFromBitbucket { + owner = "rw_grim"; + repo = pname; + rev = "v${version}"; + sha256 = "0aplb4zdpgbpmaw9qj0vr7qip9q5w7sl1m1lp1nc9jmjfij9i0hf"; + }; + + postPatch = "sed -i 's/parse==/parse>=/' requirements.txt"; + + propagatedBuildInputs = [ parse ]; + + meta = { + description = "Simple library that makes it easier to parse files"; + homepage = https://bitbucket.org/rw_grim/pyparser; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..282f9b65cb6966c898becac607a4416d236a7830 --- /dev/null +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "1.6.0"; + pname = "pyperclip"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce829433a9af640e08ee89b20f7c62132714bcc5d77df114044d0fccb8c3b3b8"; + }; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/asweigart/pyperclip"; + license = licenses.bsdOriginal; + description = "Cross-platform clipboard module"; + }; +} diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index b4376730e62388f49ae2a16be346a3e2a2fe301e..0efb77d27b3eaa8b3a6fbf4a0856360e4b2ed523 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,10 +1,14 @@ { stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: let + pname = "PyQt-x11-gpl"; version = "4.12"; + inherit (pythonPackages) buildPythonPackage python dbus-python sip; in buildPythonPackage { - name = "PyQt-x11-gpl-${version}"; + pname = pname; + name = pname + "-" + version; + version = version; format = "other"; src = fetchurl { diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2db0c44125445e943abcc59f7ec701dd2bb411b1..50cb8ceba9139459f3a3ac852327a592f49498c5 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,13 +1,18 @@ { lib, fetchurl, pythonPackages, pkgconfig, makeWrapper, qmake , lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs , withWebSockets ? false, qtwebsockets +, withConnectivity ? false, qtconnectivity }: let - version = "5.9"; + pname = "PyQt"; + version = "5.10"; + inherit (pythonPackages) buildPythonPackage python dbus-python sip; + in buildPythonPackage { - name = "PyQt-${version}"; + pname = pname; + version = version; format = "other"; meta = with lib; { @@ -20,16 +25,18 @@ in buildPythonPackage { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "15hh4z5vd45dcswjla58q6rrfr6ic7jfz2n7c8lwfb10rycpj3mb"; + sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; }; - nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig qmake lndir ]; - buildInputs = [ - lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs - ] ++ lib.optional withWebSockets qtwebsockets; + buildInputs = [ dbus_libs ]; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ + sip qtbase qtsvg qtwebkit qtwebengine + ] ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity; configurePhase = '' runHook preConfigure @@ -38,10 +45,10 @@ in buildPythonPackage { lndir ${dbus-python} $out rm -rf "$out/nix-support" - export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages + export PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} substituteInPlace configure.py \ - --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \ + --replace 'install_dir=pydbusmoddir' "install_dir='$out/${python.sitePackages}/dbus/mainloop'" \ --replace "ModuleMetadata(qmake_QT=['webkitwidgets'])" "ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport'])" ${python.executable} configure.py -w \ diff --git a/pkgs/development/python-modules/pyrax/default.nix b/pkgs/development/python-modules/pyrax/default.nix deleted file mode 100644 index 1337b3c32ada36ea67b8f5a342e64ae8c038392c..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/pyrax/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring, - rackspace-novaclient, six, isPy3k, pytest, glibcLocales }: -buildPythonPackage rec { - pname = "pyrax"; - version = "1.9.8"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://pypi/p/pyrax/${name}.tar.gz"; - sha256 = "1x98jzyxnvha81pgx3jpfixljhs7zik89yfp8q06kwpx8ws99nz9"; - }; - - # no good reason given in commit why limited, and seems to work - patchPhase = '' - substituteInPlace "setup.py" \ - --replace "python-novaclient==2.27.0" "python-novaclient" - ''; - - disabled = isPy3k; - propagatedBuildInputs = [ requests novaclient keyring rackspace-novaclient six ]; - - LC_ALL = "en_US.UTF-8"; - buildInputs = [ pytest glibcLocales ]; - - checkPhase = '' - py.test tests/unit - ''; - - meta = { - homepage = https://github.com/rackspace/pyrax; - license = lib.licenses.asl20; - description = "Python API to interface with Rackspace"; - maintainers = with lib.maintainers; [ teh ]; - }; -} diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix index dbad83bef7e7be48da6efc940a47e62ff45b000e..3e2f90aa9d30073ce5fa9904e5bcec5253e1e1e2 100644 --- a/pkgs/development/python-modules/pyro/default.nix +++ b/pkgs/development/python-modules/pyro/default.nix @@ -1,7 +1,10 @@ { stdenv, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - name = "Pyro-3.16"; + pname = "Pyro"; + version = "3.16"; + name = pname + "-" + version; + disabled = isPy3k; src = fetchurl { diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 7a59690e5b04720dc7f6bc338156a54067a995e6..6e2d923f80c4b1c7813dfa2c878a6f20c78d9505 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.4.21"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "7afad28ee0a0f3e7c34adaa9f953d00560ed9910203e93f107833b6e8d151171"; + sha256 = "bb02fe5a02fb4e8baad4d7ccf7ba5e748044ee0a1ad7d2fa4927f68f396863c4"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index 0d50686f892426f796d1b4c1e69fa202d3521dee..a86badb3bca881c697261ce41f727525ee940e5a 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -1,22 +1,34 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , rtl-sdr -, pypandoc -, pandoc +, m2r }: buildPythonPackage rec { pname = "pyrtlsdr"; version = "0.2.7"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "7942fe2e7821d09206002ea7e820e694094b3f964885123eb6eee1167f39b8da"; }; - buildInputs = [ pypandoc pandoc ]; + # Replace pypandoc dependency by m2r + # See https://github.com/roger-/pyrtlsdr/pull/78 + patches = [ + (fetchpatch { + url = "${meta.homepage}/commit/2b7df0b.patch"; + sha256 = "04h5z80969jgdgrf98b9ps56sybms09xacvmj6rwcfrmanli8rgf"; + }) + (fetchpatch { + url = "${meta.homepage}/commit/97dc3d0.patch"; + sha256 = "1v1j0n91jwpsiam2j34yj71z4h39cvk4gi4565zgjrzsq6xr93i0"; + }) + ]; + + nativeBuildInputs = [ m2r ]; postPatch = '' sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py @@ -31,5 +43,5 @@ buildPythonPackage rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; - }; + }; } diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9d6cbacc95895520e2e749e72d1002ac5930856c --- /dev/null +++ b/pkgs/development/python-modules/pysam/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bzip2 +, bcftools +, curl +, cython +, htslib +, lzma +, pytest +, samtools +, zlib +}: + +buildPythonPackage rec { + pname = "pysam"; + version = "0.13.0"; + + # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is + # missing some files which cause test failures. + # Tracked at: https://github.com/pysam-developers/pysam/issues/616 + src = fetchFromGitHub { + owner = "pysam-developers"; + repo = "pysam"; + rev = "v${version}"; + sha256 = "1lwbcl38w1x0gciw5psjp87msmv9zzkgiqikg9b83dqaw2y5az1i"; + }; + + buildInputs = [ bzip2 curl cython lzma zlib ]; + + checkInputs = [ pytest bcftools htslib samtools ]; + + checkPhase = "py.test"; + + preInstall = '' + export HOME=$(mktemp -d) + make -C tests/pysam_data + make -C tests/cbcf_data + ''; + + meta = { + homepage = http://pysam.readthedocs.io/; + description = "A python module for reading, manipulating and writing genome data sets"; + maintainers = with lib.maintainers; [ unode ]; + license = lib.licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index a2dfd53b79512c4184fbe1c9bf0bab6c05f78719..89799988fa1f1a11c7340088fbcc08e1882ce576 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -18,8 +18,8 @@ }: buildPythonPackage rec { + pname = "PySC2"; version = "1.2"; - name = "PySC2-${version}"; src = fetchFromGitHub { owner = "deepmind"; diff --git a/pkgs/development/python-modules/pysha3/default.nix b/pkgs/development/python-modules/pysha3/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4df98623e118aea974ec9e170fcb08244b8c7459 --- /dev/null +++ b/pkgs/development/python-modules/pysha3/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "pysha3"; + version = "1.0.2"; + name = "${pname}-${version}"; + disabled = pythonOlder "2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "17kkjapv6sr906ib0r5wpldmzw7scza08kv241r98vffy9rqx67y"; + }; + + meta = { + description = "Backport of hashlib.sha3 for 2.7 to 3.5"; + homepage = https://github.com/tiran/pysha3; + license = lib.licenses.psfl; + }; +} diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..85bcf56f0628a78c24fd1605abd90c0e76245f81 --- /dev/null +++ b/pkgs/development/python-modules/pysigset/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pysigset"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ym44z3nwp8chfi7snmknkqnl2q9bghzv9p923r8w748i5hvyxx8"; + }; + + meta = with stdenv.lib; { + description = "Provides access to sigprocmask(2) and friends and convenience wrappers to python application developers wanting to SIG_BLOCK and SIG_UNBLOCK signals"; + homepage = https://github.com/ossobv/pysigset; + license = licenses.gpl3; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 3a563e5d183d1a4f883d3ebfffd22a3adadc06aa..74ff0be3833a4327614451af154d866b3b7861d3 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -1,17 +1,16 @@ { lib, fetchFromGitHub, buildPythonPackage, cython, slurm }: buildPythonPackage rec { - name = "pyslurm"; + pname = "pyslurm"; + version = "20170302"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "69e4f4fd66003b98ddb7da25613fe641d4ae160d"; - sha256 = "051kafkndbniklxyf0drb360aiblnqcf9rqjbvmqh66zrfya1m28"; + rev = "f5a756f199da404ec73cb7fcd7f04ec4d21ea3ff"; + sha256 = "1xn321nc8i8zmngh537j6lnng1rhdp460qx4skvh9daz5h9nxznx"; }; - patches = [ ./pyslurm-dlfcn.patch ]; - buildInputs = [ cython slurm ]; setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; diff --git a/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch b/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch deleted file mode 100644 index 2b3798a30706be4870ce826476fb1b5dd4a86396..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch +++ /dev/null @@ -1,18 +0,0 @@ -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/pysoundfile/default.nix b/pkgs/development/python-modules/pysoundfile/default.nix index fe24f0203f0d9869ef0e40b9356028941ff52e0e..aa7d23c5fcb556a2d5081703be88be3933b9fd0f 100644 --- a/pkgs/development/python-modules/pysoundfile/default.nix +++ b/pkgs/development/python-modules/pysoundfile/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "PySoundFile"; - name = "PySoundFile-${version}"; - version = "0.8.1"; + version = "0.9.0.post1"; + name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; + sha256 = "43dd46a2afc0484c26930a7e59eef9365cee81bce7a4aadc5699f788f60d32c3"; }; checkInputs = [ pytest ]; @@ -35,4 +35,4 @@ buildPythonPackage rec { # https://github.com/bastibe/PySoundFile/issues/157 disabled = isPyPy || stdenv.isi686; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3447c64cf6b86c7889e9de20c9053fc017ae01ed --- /dev/null +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, fetchPypi, stdenv, py4j }: + +buildPythonPackage rec { + pname = "pyspark"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vlq07yqy6c7ayg401i0qynnliqz405bmw1r8alkck0m1s8kcd8b"; + }; + + # pypandoc is broken with pandoc2, so we just lose docs. + postPatch = '' + sed -i "s/'pypandoc'//" setup.py + ''; + + propagatedBuildInputs = [ py4j ]; + + # Tests assume running spark... + doCheck = false; + + meta = with stdenv.lib; { + description = "Apache Spark"; + homepage = https://github.com/apache/spark/tree/master/python; + license = licenses.asl20; + maintainers = [ maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6903b6c7a0c048d01646872e7fdc307feb86a576 --- /dev/null +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, pydns }: + +buildPythonPackage rec { + name = "pyspf-${version}"; + version = "2.0.12"; + + src = fetchurl { + url = "mirror://sourceforge/pymilter/pyspf/${name}/${name}.tar.gz"; + sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la"; + }; + + propagatedBuildInputs = [ pydns ]; + + meta = with lib; { + homepage = http://bmsi.com/python/milter.html; + description = "Python API for Sendmail Milters (SPF)"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index 2bd7107058152874b61e0a71256d48cb7c474b7b..ed408feec811bb7e8ab15a1c6803183fb951a148 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -3,8 +3,6 @@ buildPythonPackage rec { pname = "pyte"; version = "0.7.0"; - name = "${pname}-${version}"; - src = fetchPypi { inherit pname version; sha256 = "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7"; diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7f707ebc46b6399d1401debe007431e15b45ef62 --- /dev/null +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }: + +buildPythonPackage rec { + pname = "pytest-aiohttp"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; + }; + + propagatedBuildInputs = [ pytest aiohttp ]; + + # There are no tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/aio-libs/pytest-aiohttp/; + description = "Pytest plugin for aiohttp support"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fb020ba471fc77904e4b0c7f30f6deca9adffde1 --- /dev/null +++ b/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, unzip }: + +buildPythonPackage rec { + pname = "pytest-catchlog"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab"; + extension = "zip"; + }; + + buildInputs = [ pytest unzip ]; + checkPhase = "make test"; + + # Requires pytest < 3.1 + doCheck = false; + + meta = with stdenv.lib; { + 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."; + }; +} diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..915884b5dd4a4a5fba66af4b13947773a006e4b7 --- /dev/null +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytest_xdist, virtualenv, process-tests, coverage }: + +buildPythonPackage rec { + pname = "pytest-cov"; + version = "2.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "03aa752cf11db41d281ea1d807d954c4eda35cfa1b21d6971966cc041bbf6e2d"; + }; + + buildInputs = [ pytest pytest_xdist virtualenv process-tests ]; + propagatedBuildInputs = [ 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 = with stdenv.lib; { + description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; + homepage = https://github.com/pytest-dev/pytest-cov; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index fdd2b2316e298d19426d948695fb0905a5016642..4555479af43eb67cfc5511413b8b6b823da5d9d1 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -1,8 +1,7 @@ {lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}: buildPythonPackage rec { - name = "${pname}-${version}"; - version = "0.1.1"; + version = "0.2.0"; pname = "pytest-cram"; buildInputs = [ pytest ]; @@ -10,7 +9,8 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0ad05999iqzyjay9y5lc0cnd3jv8qxqlzsvxzp76shslmhrv0c4f"; + sha256 = "006p5dr3q794sbwwmxmdls3nwq0fvnyrxxmc03pgq8n74chl71qn"; + extension = "zip"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index 6df1792f884beab90a445020eeb1bf1d8199a3df..c31cd2ab6f631fb35d42693324ce763766e8dc85 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - website = https://pypi.python.org/pypi/pytest-catchlog/; + homepage = 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/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix index 5abfd9423ac7429b578437ad782b3d10da2c3fc5..b23ae051ad8d7153baab82963ac159f3bbddd0e2 100644 --- a/pkgs/development/python-modules/pytest-expect/default.nix +++ b/pkgs/development/python-modules/pytest-expect/default.nix @@ -6,10 +6,9 @@ , six }: -let +buildPythonPackage rec { pname = "pytest-expect"; version = "1.1.0"; -in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { @@ -28,4 +27,4 @@ in buildPythonPackage rec { homepage = https://github.com/gsnedders/pytest-expect; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..df700526d1b49ad7fe0bcba574aa9540dc3877e9 --- /dev/null +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, setuptools-git, pytest, six }: + +buildPythonPackage rec { + pname = "pytest-fixture-config"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08"; + }; + + nativeBuildInputs = [ setuptools-git ]; + + buildInputs = [ pytest ]; + + checkInputs = [ six ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set."; + homepage = https://github.com/manahl/pytest-plugins; + license = licenses.mit; + maintainers = with maintainers; [ ryansydnor ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index b39737ea701977a2d63362723a2191ec75e394b6..b170f480e96ec213cb7539489d38e078601ce8ce 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,9 +1,8 @@ {lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, flake8}: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pytest-flake8"; - version = "0.8.1"; + version = "1.0.0"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version @@ -13,21 +12,11 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1za5i09gz127yraigmcl443w6149714l279rmlfxg1bl2kdsc45a"; + sha256 = "01driw4sc6nfi3m3ii7d074pxi3h1h4mbiyad9crg5i1l5jxx5ir"; }; - patches = [ - # Fix pytest strict mode (pull request #24) - # https://github.com/tholo/pytest-flake8/pull/24 - (fetchpatch { - name = "fix-compatibility-with-pytest-strict-mode.patch"; - url = "https://github.com/tholo/pytest-flake8/commit/434e1b07b4b77bfe1ddb9b2b54470c6c3815bb1a.patch"; - sha256 = "0idwgkwwysx2cibnykd81yxrgqzkpf42j99jmpnanqzi99qnc3wx"; - }) - ]; - checkPhase = '' - pytest --ignore=nix_run_setup.py . + pytest . ''; meta = { diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..83fcdaf1b77683a0c1c1048c7ef3637b01b8f3f0 --- /dev/null +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytestpep8, pytest, pyflakes, pytestcache }: + +buildPythonPackage rec { + pname = "pytest-flakes"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "3e880927fd2a77d31715eaab3876196e76d779726c9c24fe32ee5bab23281f82"; + }; + + buildInputs = [ pytestpep8 pytest ]; + propagatedBuildInputs = [ pyflakes pytestcache ]; + + checkPhase = '' + py.test test_flakes.py + ''; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-flakes; + description = "pytest plugin to check source code with pyflakes"; + }; +} diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 6f6f79109d9b061c1427831a254939835f8b07fd..cfa24fdfe528bd48bb84944f2c8ec67d94a09460 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -11,23 +11,23 @@ buildPythonPackage rec { pname = "pytest-httpbin"; - name = "${pname}-${version}"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "kevin1024"; repo = "pytest-httpbin"; rev = "v${version}"; - sha256 = "0j3n12jjy8cm0va8859wqra6abfyajrgh2qj8bhcngf3a72zl9ks"; + sha256 = "0p86ljx775gxxicscs1dydmmx92r1g9bs00vdvxrsl3qdll1ksfm"; }; - checkPhase = '' - py.test -k "not test_chunked_encoding" - ''; + checkInputs = [ pytest ]; - buildInputs = [ pytest ]; propagatedBuildInputs = [ flask decorator httpbin six requests ]; + checkPhase = '' + py.test + ''; + meta = { description = "Easily test your HTTP library against a local copy of httpbin.org"; homepage = https://github.com/kevin1024/pytest-httpbin; diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c1866f174ea254cd9dec188ea77d446a96644c73 --- /dev/null +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytestcache, pytest, isort }: + +buildPythonPackage rec { + pname = "pytest-isort"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "e92798127e21d22513c62070989f0fb3b712650e48a4db13e5b8e8034d367cfe"; + }; + + propagatedBuildInputs = [ pytestcache pytest isort ]; + + # no tests in PyPI tarball, no tags on GitHub + # https://github.com/moccu/pytest-isort/pull/8 + doCheck = false; + + meta = with lib; { + description = "Pytest plugin to perform isort checks (import ordering)"; + homepage = https://github.com/moccu/pytest-isort/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index fdd1986c04fc6e977a5c364932e3b8691689228b..c98370ed9389f4b2c81c012c225d6e05adf6b1a2 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-localserver"; name = "${pname}-${version}"; - version = "0.3.7"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1c11hn61n06ms0wmw6536vs5k4k9hlndxsb3p170nva56a9dfa6q"; + sha256 = "a72af60a1ec8f73668a7884c86baf1fbe48394573cb4fa36709887217736c021"; }; propagatedBuildInputs = [ werkzeug ]; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..88b6a662d4715b5d86653e40e746470fcebf0dba --- /dev/null +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }: + +buildPythonPackage rec { + pname = "pytest-mock"; + version = "1.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2dd545496af6a0559432b11de79f1fd4fa4a541ae2e01892d5ba6041f85f0994"; + }; + + propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; + nativeBuildInputs = [ setuptools_scm ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Thin-wrapper around the mock package for easier use with py.test."; + homepage = https://github.com/pytest-dev/pytest-mock; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-pep8/default.nix b/pkgs/development/python-modules/pytest-pep8/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1fcb99574b2a8756d7c901ff21d2bbc3e57a7bb9 --- /dev/null +++ b/pkgs/development/python-modules/pytest-pep8/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestcache, pep8 }: + +buildPythonPackage rec { + pname = "pytest-pep8"; + version = "1.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ pytestcache pep8 ]; + + checkPhase = '' + py.test + ''; + + # Fails + doCheck = false; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-pep8; + description = "pytest plugin to check PEP8 requirements"; + }; +} diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6e8742ec2b8eef52ac68d839103737b1b41fdf51 --- /dev/null +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestflakes, pytestpep8, tox }: +buildPythonPackage rec { + pname = "pytest-quickcheck"; + version = "0.8.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "17vly6fg0s95lbg620g9dp9jjf12sj4hpbi7cg579kswabl6304g"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ pytestflakes pytestpep8 tox ]; + + meta = with stdenv.lib; { + license = licenses.asl20; + homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; + description = "pytest plugin to generate random data inspired by QuickCheck"; + }; +} diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bc7d141320034d212abc3768d47ddf3333bfa618 --- /dev/null +++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, py, pytest }: + +buildPythonPackage rec { + pname = "pytest-raisesregexp"; + version = "2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "b54372494fc1f11388b1b9348aeb36b69609699eb8f46e0e010afc733d78236a"; + }; + + buildInputs = [ py pytest ]; + + # https://github.com/kissgyorgy/pytest-raisesregexp/pull/3 + prePatch = '' + sed -i '3i\import io' setup.py + substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read()," + ''; + + meta = with stdenv.lib; { + description = "Simple pytest plugin to look for regex in Exceptions"; + homepage = https://github.com/Walkman/pytest_raisesregexp; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9c906fe2fa4a37beead739fdf348b5d19413854f --- /dev/null +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock }: + +buildPythonPackage rec { + pname = "pytest-rerunfailures"; + version = "4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "18lpy6d9b4ck8j3jwh4vmxj54is0fwanpmpg70qg4y0fycdqzwks"; + }; + + checkInputs = [ pytest mock ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "pytest plugin to re-run tests to eliminate flaky failures."; + homepage = https://github.com/pytest-dev/pytest-rerunfailures; + license = licenses.mpl20; + maintainers = with maintainers; [ jgeerds ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c50795a66698921e0d1348915071e259486b27ef --- /dev/null +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, setuptools-git, pytest-shutil, pytest-fixture-config, psutil +, requests, future }: + +buildPythonPackage rec { + pname = "pytest-server-fixtures"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "21eef04612ed42f73534c45ddbaef8458c800809354a5f5a96a8fde88b2a97e7"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ setuptools-git pytest-shutil pytest-fixture-config psutil requests future ]; + + # RuntimeError: Unable to find a free server number to start Xvfb + doCheck = false; + + meta = with stdenv.lib; { + description = "Extensible server fixures for py.test"; + homepage = "https://github.com/manahl/pytest-plugins"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4fa11dbd7d136489777d087ec4c6bf9dbac63694 --- /dev/null +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, contextlib2, termcolor }: + +buildPythonPackage rec { + pname = "pytest-shutil"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2cfe4d3f5f25ad2b19e64847d62563f5494b2e0450ca1cfc5940974029b2cbd1"; + }; + + buildInputs = [ cmdline pytest ]; + propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "A goodie-bag of unix shell and environment tools for py.test"; + homepage = https://github.com/manahl/pytest-plugins; + maintainers = with maintainers; [ ryansydnor ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b639b61ad4d3c5e9355b14bcdb7a1afaea29e3f1 --- /dev/null +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "pytest-subtesthack"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x"; + }; + + buildInputs = [ pytest ]; + + # no upstream test + doCheck = false; + + meta = with stdenv.lib; { + description = "Terrible plugin to set up and tear down fixtures within the test function itself"; + homepage = https://github.com/untitaker/pytest-subtesthack; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 2965d169599a8c2ef6deb55482c00446f7fde674..16cd9aa966ad4b2433f1bff4c0b62d44a3774e53 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -1,20 +1,27 @@ { stdenv, buildPythonPackage, fetchPypi, termcolor, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pytest-sugar"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "11lni9kn0r1y896xg20qjv4yjcyr56h0hx9dprdgjnam4dqcl6lg"; + sha256 = "ab8cc42faf121344a4e9b13f39a51257f26f410e416c52ea11078cdd00d98a2c"; }; propagatedBuildInputs = [ termcolor pytest ]; + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { description = "A plugin that changes the default look and feel of py.test"; homepage = https://github.com/Frozenball/pytest-sugar; license = licenses.bsd3; + + # incompatible with pytest 3.5 + # https://github.com/Frozenball/pytest-sugar/issues/134 + broken = true; # 2018-04-20 }; } diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d3a4e375ec3a88b092194f6283e1161e0fbea549 --- /dev/null +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pexpect +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-timeout"; + version = "1.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8"; + }; + buildInputs = [ pytest ]; + checkInputs = [ pytest pexpect ]; + checkPhase = ''pytest -ra''; + + meta = with lib;{ + description = "py.test plugin to abort hanging tests"; + homepage = http://bitbucket.org/pytest-dev/pytest-timeout/; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..596bae68ed07643c3bb40da87cdd94e191c5b70e --- /dev/null +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, pytest +, tornado +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pytest-tornado"; + version = "0.4.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b1r5im7qmbpmxhfvq13a6rp78sjjrrpysfnjkd9hggavgc75dr8"; + }; + + # package has no tests + doCheck = false; + + propagatedBuildInputs = [ pytest tornado ]; + + meta = with lib; { + description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications."; + homepage = https://github.com/eugeniy/pytest-tornado; + license = licenses.asl20; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..413d090bbcc9717d47c41e2ca4159e1166122e15 --- /dev/null +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }: + +buildPythonPackage rec { + pname = "pytest-virtualenv"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "8d8a0b9b57f5efb7db6457c1f57347e35fe332979ecefe592d5324430ae3ed7f"; + }; + + buildInputs = [ pytest pytestcov mock cmdline ]; + propagatedBuildInputs = [ pytest-fixture-config pytest-shutil ]; + checkPhase = '' py.test tests/unit ''; + + meta = with stdenv.lib; { + description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; + homepage = https://github.com/manahl/pytest-plugins; + license = licenses.mit; + maintainers = with maintainers; [ ryansydnor ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index e993a67c49f1215c369e6c0f77a6ac0ed9184fd8..38d34a958545f6783aa10f2fe962bf4f7bc63d8c 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,30 +1,27 @@ { stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pytest-xdist"; - version = "1.20.1"; + version = "1.22.2"; src = fetchPypi { inherit pname version; - sha256 = "433e82f9b34986a4e4b2be38c60e82cca3ac64b7e1b38f4d8e3e118292939712"; + sha256 = "e8f5744acc270b3e7d915bdb4d5f471670f049b6fbd163d4cbd52203b075d30f"; }; - buildInputs = [ pytest setuptools_scm pytest-forked]; + nativeBuildInputs = [ setuptools_scm ]; + buildInputs = [ pytest pytest-forked ]; propagatedBuildInputs = [ execnet ]; - postPatch = '' - rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py - ''; - checkPhase = '' - py.test testing + # Excluded tests access file system + py.test testing -k "not test_distribution_rsyncdirs_example \ + and not test_rsync_popen_with_path \ + and not test_popen_rsync_subdir \ + and not test_init_rsync_roots \ + and not test_rsyncignore" ''; - # 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; diff --git a/pkgs/development/python-modules/pytest/2_7.nix b/pkgs/development/python-modules/pytest/2_7.nix deleted file mode 100644 index adaa640fdbe634a16d89085dc95144ea48bc9c4a..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/pytest/2_7.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: -buildPythonPackage rec { - name = "pytest-2.7.3"; - - src = fetchurl { - url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm"; - }; - - # Disabled temporarily because of Hydra issue with namespaces - doCheck = false; - - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - propagatedBuildInputs = [ py ] - ++ (stdenv.lib.optional isPy26 argparse) - ++ stdenv.lib.optional - pkgs.config.pythonPackages.pytest.selenium or false - selenium; - - meta = with stdenv.lib; { - maintainers = with maintainers; [ domenkozar lovek323 madjar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/pytest/2_8.nix b/pkgs/development/python-modules/pytest/2_8.nix deleted file mode 100644 index 6232ccaf7006b1478c49113ec1bc682354252b57..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/pytest/2_8.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: -buildPythonPackage rec { - name = "pytest-2.8.7"; - - src = fetchurl { - url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "1bwb06g64x2gky8x5hcrfpg6r351xwvafimnhm5qxq7wajz8ck7w"; - }; - - # Disabled temporarily because of Hydra issue with namespaces - doCheck = false; - - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - propagatedBuildInputs = [ py ] - ++ (stdenv.lib.optional isPy26 argparse) - ++ stdenv.lib.optional - pkgs.config.pythonPackages.pytest.selenium or false - selenium; - - meta = with stdenv.lib; { - maintainers = with maintainers; [ domenkozar lovek323 madjar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/pytest/2_9.nix b/pkgs/development/python-modules/pytest/2_9.nix deleted file mode 100644 index 3ca7120dd92c09f831d73f679d30954c9f437f76..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/pytest/2_9.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: -buildPythonPackage rec { - name = "pytest-2.9.2"; - - src = fetchurl { - url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j"; - }; - - # Disabled temporarily because of Hydra issue with namespaces - doCheck = false; - - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - propagatedBuildInputs = [ py ] - ++ (stdenv.lib.optional isPy26 argparse) - ++ stdenv.lib.optional - pkgs.config.pythonPackages.pytest.selenium or false - selenium; - - meta = with stdenv.lib; { - maintainers = with maintainers; [ domenkozar lovek323 madjar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/pytest/3_0.nix b/pkgs/development/python-modules/pytest/3_0.nix deleted file mode 100644 index 487fe1b73c76dc75ebfa66b52d656cfd4e78d314..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/pytest/3_0.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py -, setuptools_scm -}: -buildPythonPackage rec { - version = "3.0.7"; - pname = "pytest"; - name = "${pname}-${version}"; - - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - src = fetchPypi { - inherit pname version; - sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab"; - }; - - buildInputs = [ hypothesis setuptools_scm ]; - propagatedBuildInputs = [ py ] - ++ (stdenv.lib.optional isPy26 argparse); - - meta = with stdenv.lib; { - maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; - platforms = platforms.unix; - }; -} \ No newline at end of file diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 42a591e58b64216961303d8460dfe079a66075c2..457826f26cbc10a2d264cf1358d4a10c08587cf0 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,10 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py -, setuptools_scm +{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools }: buildPythonPackage rec { - version = "3.2.3"; + version = "3.5.0"; pname = "pytest"; - name = "${pname}-${version}"; preCheck = '' # don't test bash builtins @@ -13,15 +12,18 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "27fa6617efc2869d3e969a3e75ec060375bfb28831ade8b5cdd68da3a741dc3c"; + sha256 = "fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1"; }; - buildInputs = [ hypothesis setuptools_scm ]; - propagatedBuildInputs = [ py ] + checkInputs = [ hypothesis ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools ] + ++ (stdenv.lib.optional (!isPy3k) funcsigs) ++ (stdenv.lib.optional isPy26 argparse); meta = with stdenv.lib; { maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; platforms = platforms.unix; + description = "Framework for writing tests"; }; } diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2875bf88340fb4f0c140cd993aff853ece74ea00 --- /dev/null +++ b/pkgs/development/python-modules/pytestcache/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, execnet }: + +buildPythonPackage rec { + pname = "pytest-cache"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ execnet ]; + + checkPhase = '' + py.test + ''; + + # Too many failing tests. Are they maintained? + doCheck = false; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-cache/; + description = "pytest plugin with mechanisms for caching across test runs"; + }; +} diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..71b1260a540707d7e33ce74dc584e01b96726a4f --- /dev/null +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: + +buildPythonPackage rec { + pname = "pytest-runner"; + version = "4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "d23f117be39919f00dd91bffeb4f15e031ec797501b717a245e377aee0f577be"; + }; + + buildInputs = [ setuptools_scm pytest ]; + + meta = with stdenv.lib; { + description = "Invoke py.test as distutils command with dependency resolution"; + homepage = https://bitbucket.org/pytest-dev/pytest-runner; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d90b7fa740dc2827281b0b09ec787c5c1eabd06a --- /dev/null +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "python-axolotl-curve25519-${version}"; + version = "0.1"; + + src = fetchurl { + url = "mirror://pypi/p/python-axolotl-curve25519/${name}.tar.gz"; + sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5"; + }; + + meta = with lib; { + homepage = https://github.com/tgalal/python-axolotl-curve25519; + description = "Curve25519 with ed25519 signatures"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..71c456875bcf012ef8e1c6bfd03d034f4d63cec5 --- /dev/null +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, python-axolotl-curve25519, protobuf, pycrypto }: + +buildPythonPackage rec { + name = "python-axolotl-${version}"; + version = "0.1.39"; + + src = fetchurl { + url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; + sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; + }; + + propagatedBuildInputs = [ python-axolotl-curve25519 protobuf pycrypto ]; + # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) + doCheck = false; + + meta = with lib; { + homepage = https://github.com/tgalal/python-axolotl; + description = "Python port of libaxolotl-android"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ba29154df3adf2ff5182aceb255c2bcd45371fe4 --- /dev/null +++ b/pkgs/development/python-modules/python-ctags3/default.nix @@ -0,0 +1,17 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "python-ctags3"; + version = "1.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "62e1d48a8cd88756767f3f5e3f1b1a81bc84deeb736f0c9480a5b5d066f63c3e"; + }; + + meta = with lib; { + description = "Ctags indexing python bindings"; + homepage = https://github.com/jonashaag/python-ctags3; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c44af185a108426b35bf6cd1227d5fdfb05a2cf4 --- /dev/null +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, mock, testscenarios, docutils, lockfile }: + +buildPythonPackage rec { + pname = "python-daemon"; + version = "2.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "261c859be5c12ae7d4286dc6951e87e9e1a70a882a8b41fd926efc1ec4214f73"; + }; + + # A test fail within chroot builds. + doCheck = false; + + buildInputs = [ mock testscenarios ]; + propagatedBuildInputs = [ docutils lockfile ]; + + meta = with lib; { + description = "Library to implement a well-behaved Unix daemon process"; + homepage = https://alioth.debian.org/projects/python-daemon/; + license = [ licenses.gpl3Plus licenses.asl20 ]; + }; +} diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..11ade481df5e36e92be64d5945ca7635727cabfc --- /dev/null +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -0,0 +1,33 @@ +{ lib +, behave +, buildPythonPackage +, fetchPypi +, lxml +, pytest +, pyparsing +, mock +}: + +buildPythonPackage rec { + pname = "python-docx"; + version = "0.8.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "117i84s6fcdsrfckbvznnqgqwhnf1x0523ps16cki8sg9byydv2m"; + }; + + checkInputs = [ behave mock pyparsing pytest ]; + propagatedBuildInputs = [ lxml ]; + + checkPhase = '' + py.test tests + ''; + + meta = { + description = "Create and update Microsoft Word .docx files"; + homepage = https://python-docx.readthedocs.io/en/latest/; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.alexchapman ]; + }; +} diff --git a/pkgs/development/python-modules/python-fuse/default.nix b/pkgs/development/python-modules/python-fuse/default.nix index d9debce6aecb938439418d7dec535b35226455e2..02b86b3b33a38b70069f26560850b4128ec7d406 100644 --- a/pkgs/development/python-modules/python-fuse/default.nix +++ b/pkgs/development/python-modules/python-fuse/default.nix @@ -7,21 +7,21 @@ }: buildPythonPackage rec { - baseName = "fuse"; - version = "0.2.1"; - name = "${baseName}-${version}"; - disabled = isPy3k; + pname = "fuse"; + version = "0.2.1"; - src = fetchurl { - url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; - sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; - }; + disabled = isPy3k; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse ]; + src = fetchurl { + url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; + sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; + }; - meta = { - description = "Python bindings for FUSE"; - license = lib.licenses.lgpl21; - }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; + + meta = { + description = "Python bindings for FUSE"; + license = lib.licenses.lgpl21; + }; } diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 9d29e109db49e7b30c7462104a37e334f786ce5f..12b6bf9291874f1f34df21e259c9247596435d6f 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-gnupg"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "06hfw9cmiw5306fyisp3kzg1hww260qzip829g7y7pj1mwpb0izg"; + sha256 = "0wzvx8y4ii1y1vch28a0m6f2y4px9r7qd8fpimsx6y5z4pfscm2s"; }; propagatedBuildInputs = [ gnupg1 ]; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 8c78cfeacbd4dfb294127018afdb5a902143df69..68b46743d35f622898966dbb43f66650f1ad71a5 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,29 +1,34 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, future, six, ecdsa, pycryptodome, pytest +, future, six, ecdsa, pycryptodome, pytest, cryptography }: buildPythonPackage rec { pname = "python-jose"; - name = "${pname}-${version}"; - version = "1.3.2"; + version = "2.0.2"; + + # no tests in PyPI tarball src = fetchFromGitHub { owner = "mpdavis"; repo = "python-jose"; - rev = version; - sha256 = "0933pbflv2pvws5m0ksz8y1fqr8m123smmrbr5k9a71nssd502sv"; + # 2.0.2 not tagged on GitHub + # see https://github.com/mpdavis/python-jose/issues/86 + rev = "28cc6719eceb89129eed59c25f7bdac015665bdd"; + sha256 = "03wkq2rszy0rzy5gygsh4s7i6ls8zflgbcvxnflvmh7nis7002fp"; }; - buildInputs = [ pytest ]; - checkPhase = "py.test ."; - patches = [ - # to use pycryptodme instead of pycrypto - ./pycryptodome.patch + checkInputs = [ + pytest + cryptography # optional dependency, but needed in tests ]; + checkPhase = '' + py.test + ''; + 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 deleted file mode 100644 index 665ad5980343fb50924bda866c07ddc631a4eb30..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/python-jose/pycryptodome.patch +++ /dev/null @@ -1,37 +0,0 @@ -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-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4c1bd05f4a0fa2f920cc60ed3d27324acfb31e40 --- /dev/null +++ b/pkgs/development/python-modules/python-ly/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchPypi, stdenv }: + +buildPythonPackage rec { + pname = "python-ly"; + version = "0.9.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0x98dv7p8mg26p4816yy8hz4f34zf6hpnnfmr56msgh9jnsm2qfl"; + }; + + # tests not shipped on `pypi` and + # seem to be broken ATM: https://github.com/wbsoft/python-ly/issues/70 + doCheck = false; + + meta = with stdenv.lib; { + description = "Tool and library for manipulating LilyPond files"; + license = licenses.gpl2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d48a6288a7ddb63920174c14e10fb8f9c5213255 --- /dev/null +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, lib, fetchPypi, file, stdenv }: + +buildPythonPackage rec { + pname = "python-magic"; + version = "0.4.15"; + + src = fetchPypi { + inherit pname version; + sha256 = "f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5"; + }; + + postPatch = '' + substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + doCheck = false; + + # TODO: tests are failing + #checkPhase = '' + # ${python}/bin/${python.executable} ./test.py + #''; + + meta = { + description = "A python interface to the libmagic file type identification library"; + homepage = https://github.com/ahupp/python-magic; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f4d87dc035c1a2a3eaa1067c3ad741e567a732ed --- /dev/null +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -0,0 +1,24 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "python-oauth2"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b24da812837c19183df1924e80a22ba0a1869582dea8b04a9ecd807b04dbc525"; + }; + # attempts to run mysql + doCheck = false; + + meta = with lib; { + description = "Framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack"; + homepage = https://github.com/wndhydrnt/python-oauth2; + license = licenses.mit; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad0a17da2ac85cd3e4619e08ab5651224d9458c2 --- /dev/null +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "python-ptrace"; + version = "0.9.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "019jlpya2d2b3vbg037hnj4z0f564r7ibygayda7bm7qbpw0sa4g"; + }; + + # requires distorm, which is optionally + doCheck = false; + + meta = with stdenv.lib; { + description = "Python binding of ptrace library"; + homepage = https://github.com/vstinner/python-ptrace; + license = licenses.gpl2; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 03c37f7a6c454ff32432c893ff860ccae7b59772..c0a398a3399dcf9555a6d513b06690f89787c308 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-slugify"; - version = "1.2.4"; + version = "1.2.5"; src = fetchPypi { inherit pname version; - sha256 = "097qllxys22kghcv2a5jcc1zdlr9zzqayvk6ywavsv8wgbgqb8sp"; + sha256 = "5dbb360b882b2dabe0471a1a92f604504d83c2a73c71f2098d004ab62e695534"; }; doCheck = !isPy3k; # (only) on python3 unittest loader (loadTestsFromModule) fails diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index a78b1ffbee268757d9f9f089c682438fb5e7dc1a..44a6b522a4ee5e1e62017b73ac23f7eb9eaefa67 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - version = "1.7"; + version = "1.8.1"; 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 = "987c25e1047e8742131bcf29dac7a406987adb1463465749e2daaba8cb19d264"; + sha256 = "d7162fdb29337aebed65700cc7297016f6cd32cae4ad7aed8f7e7531f0217943"; }; meta = { homepage = http://arthurdejong.org/python-stdnum/; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d55472179101bcbb226fd541a07047bf26fdf677 --- /dev/null +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchPypi, buildPythonPackage, certifi, future, urllib3 }: + +buildPythonPackage rec { + pname = "python-telegram-bot"; + version = "9.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a5b4wfc6ms7kblynw2h3ygpww98kyz5n8iibqbdyykwx8xj7hzm"; + }; + + prePatch = '' + rm -rf telegram/vendor + substituteInPlace telegram/utils/request.py \ + --replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \ + --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ + --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ + --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" + ''; + + propagatedBuildInputs = [ certifi future urllib3 ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "This library provides a pure Python interface for the Telegram Bot API."; + homepage = https://python-telegram-bot.org; + license = licenses.lgpl3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 6acd0934f4717b82b485ae065bd572f796dd5bd8..654b851b663546b74678502d53f86e783932670e 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,8 +1,9 @@ { lib, buildPythonPackage, fetchFromGitHub, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: buildPythonPackage rec { - name = "python-utils-${version}"; + pname = "python-utils"; version = "2.2.0"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "WoLpH"; @@ -13,8 +14,15 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; + postPatch = '' + # pytest-runner is only actually required in checkPhase + substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," "" + ''; + + # Tests failing + doCheck = false; + checkPhase = '' - rm nix_run_setup.py py.test ''; diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 7ab698ecd08473728726543d81cc669ffa7ab0d8..f476d0d4d44a885a5d1b021955fc675c0d564919 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "python-fedora"; version = "0.9.0"; - name = "python-fedora-${version}"; + name = pname + "-" + version; src = fetchPypi { inherit pname version; @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "Python Fedora Module"; homepage = https://github.com/fedora-infra/python-fedora; license = licenses.lgpl2; - maintainers = with maintainers; [ mornfall ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d5cf709104fcb589fdc4b3517053ce63794151c6 --- /dev/null +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -0,0 +1,40 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, pkgconfig +, systemd, libyaml, openzwave, cython +, six, pydispatcher, urwid }: + +buildPythonPackage rec { + pname = "python_openzwave"; + version = "0.4.4"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "17wdgwg212agj1gxb2kih4cvhjb5bprir4x446s8qwx0mz03azk2"; + extension = "zip"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ systemd libyaml openzwave cython ]; + propagatedBuildInputs = [ six urwid pydispatcher ]; + + # primary location for the .xml files is in /etc/openzwave so we override the + # /usr/local/etc lookup instead as that allows us to dump new .xml files into + # /etc/openzwave if needed + postPatch = '' + substituteInPlace src-lib/libopenzwave/libopenzwave.pyx \ + --replace /usr/local/etc/openzwave ${openzwave}/etc/openzwave + ''; + + # no tests available + doCheck = false; + + meta = with stdenv.lib; { + description = "Python wrapper for the OpenZWave C++ library"; + homepage = https://github.com/OpenZWave/python-openzwave; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu ]; + inherit (openzwave.meta) platforms; + }; +} diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6248ed7bf66a656ccfd69333a4761cc74776cdab --- /dev/null +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, nixUnstable, isPy3k }: + +assert isPy3k; + +stdenv.mkDerivation rec { + name = "pythonix-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "pythonix"; + rev = "v${version}"; + sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj"; + }; + + nativeBuildInputs = [ meson pkgconfig ninja ]; + + buildInputs = [ nixUnstable ]; + + meta = with stdenv.lib; { + description = '' + Eval nix code from python. + ''; + maintainers = [ maintainers.mic92 ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..98f714c8d53830611d53b7eeebeaed8b615ff1de --- /dev/null +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -0,0 +1,84 @@ +{ lib +, fetchPypi +, fetchNuGet +, buildPythonPackage +, python +, pytest +, pycparser +, pkgconfig +, dotnetbuildhelpers +, clang +, mono +}: + +let + + UnmanagedExports127 = fetchNuGet { + baseName = "UnmanagedExports"; + version = "1.2.7"; + sha256 = "0bfrhpmq556p0swd9ssapw4f2aafmgp930jgf00sy89hzg2bfijf"; + outputFiles = [ "*" ]; + }; + + NUnit360 = fetchNuGet { + baseName = "NUnit"; + version = "3.6.0"; + sha256 = "0wz4sb0hxlajdr09r22kcy9ya79lka71w0k1jv5q2qj3d6g2frz1"; + outputFiles = [ "*" ]; + }; + +in + +buildPythonPackage rec { + pname = "pythonnet"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hxnkrfj8ark9sbamcxzd63p98vgljfvdwh79qj3ac8pqrgghq80"; + }; + + postPatch = '' + substituteInPlace setup.py --replace 'self._install_packages()' '#self._install_packages()' + ''; + + preConfigure = '' + [ -z "$dontPlacateNuget" ] && placate-nuget.sh + [ -z "$dontPlacatePaket" ] && placate-paket.sh + ''; + + nativeBuildInputs = [ + pytest + pycparser + + pkgconfig + dotnetbuildhelpers + clang + + NUnit360 + UnmanagedExports127 + ]; + + buildInputs = [ + mono + ]; + + preBuild = '' + rm -rf packages + mkdir packages + + ln -s ${NUnit360}/lib/dotnet/NUnit/ packages/NUnit.3.6.0 + ln -s ${UnmanagedExports127}/lib/dotnet/NUnit/ packages/UnmanagedExports.1.2.7 + ''; + + checkPhase = '' + ${python.interpreter} -m pytest + ''; + + meta = with lib; { + description = ".Net and Mono integration for Python"; + homepage = https://pythonnet.github.io; + license = licenses.mit; + maintainers = with maintainers; [ jraygauthier ]; + }; +} diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix index 55479e76dafd4b339b68062926f50474695d3ae0..91661a1fb5101ea259424a2ac5a94cde7c2b7c5b 100644 --- a/pkgs/development/python-modules/pytoml/default.nix +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -1,18 +1,22 @@ -{ stdenv, buildPythonPackage, fetchgit -, python }: +{ stdenv +, buildPythonPackage +, fetchgit +, python +}: buildPythonPackage rec { pname = "pytoml"; - version = "0.1.11"; - name = "${pname}-${version}"; + version = "0.1.14"; - checkPhase = "${python.interpreter} test/test.py"; + 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"; + sha256 = "1ip71yqxnyi4jhw5x1q7a0za61ndhpfh0vbx08jfv0w4ayng6rgv"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a34924374819b1a29505c53780db571e25f46bff --- /dev/null +++ b/pkgs/development/python-modules/pytools/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, decorator +, appdirs +, six +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "pytools"; + version = "2018.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "26143e4ce415919272a5a8d05727bf5e026faa6536fe0ba85302e5b88ebae9f5"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ + decorator + appdirs + six + numpy + ]; + + checkPhase = '' + py.test -k 'not test_persistent_dict' + ''; + + meta = { + homepage = https://github.com/inducer/pytools/; + description = "Miscellaneous Python lifesavers."; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ artuuge ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 64175ea6d6db871f6a8a580b1f0a7470cf1bf99c..a510eedee4fdabccc7d80d6765f7e280bb397548 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = "pytorch"; rev = "v${version}"; - sha256 = "112mp3r70d8f15dhxm6k7912b5i6c2q8hv9462s808y84grr2jdm"; + sha256 = "1s3f46ga1f4lfrcj3lpvvhgkdr1pi8i2hjd9xj9qiz3a9vh2sj4n"; }; checkPhase = '' @@ -22,7 +22,7 @@ buildPythonPackage rec { git numpy.blas ]; - + propagatedBuildInputs = [ cffi numpy @@ -32,7 +32,7 @@ buildPythonPackage rec { preConfigure = '' export NO_CUDA=1 ''; - + meta = { description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration."; homepage = http://pytorch.org/; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..65f3d80bdaa7b71d398641527349f9bd010a7fda --- /dev/null +++ b/pkgs/development/python-modules/pytz/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, python }: + +buildPythonPackage rec { + pname = "pytz"; + version = "2018.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s pytz/tests + ''; + + meta = with lib; { + description = "World timezone definitions, modern and historical"; + homepage = "http://pythonhosted.org/pytz"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a7c6b6db6b25b06acb0aaf5ac7356fb73326a437 --- /dev/null +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "pytzdata"; + version = "2018.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "4e2cceb54335cd6c28caea46b15cd592e2aec5e8b05b0241cbccfb1b23c02ae7"; + }; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Timezone database for Python"; + homepage = https://github.com/sdispater/pytzdata; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..31ec613df4c81a17e6ecbf8017f2493686ca139a --- /dev/null +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests }: + +buildPythonPackage rec { + pname = "pyunifi"; + version = "2.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dhbfzv5a29v763m0b9wsc4pvkdr979w7g4rz7ak8hsi4sx6b9dq"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + description = "API towards Ubiquity Networks UniFi controller"; + homepage = https://github.com/finish06/unifi-api; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 8e10fbb22581fe15a5dbb7c8667423e1c008c39c..d09a9bbd6d80d1613aa77f979d099f7e4aa9d759 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - name = "pywbem-${version}"; + pname = "pywbem"; version = "0.10.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index ecd46bb1ff57c127a3de241b17aa2ffeba70f87a..10150259ef5c16235a06203dd25a6b651a300d51 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pywinrm"; - version = "0.2.2"; + version = "0.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "06xc0mbqf718vmsp0fq0rb64nql66l5w2x23bmqnzl6nzc0gfc1h"; + sha256 = "799fc3e33fec8684443adf5778860388289102ea4fa1458f1bf307d167855573"; }; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a4918bf352dca68e8994ad4046e964a7d04554f4 --- /dev/null +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, libyaml }: + +buildPythonPackage rec { + pname = "PyYAML"; + version = "3.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab"; + }; + + propagatedBuildInputs = [ libyaml ]; + + meta = with lib; { + description = "The next generation YAML parser and emitter for Python"; + homepage = https://github.com/yaml/pyyaml; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..26107ea3c4af246385c1dedcf2d1c3551f65d4a4 --- /dev/null +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, tornado +, zeromq3 +, py +, python +}: + +buildPythonPackage rec { + pname = "pyzmq"; + version = "17.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0145ae59139b41f65e047a3a9ed11bbc36e37d5e96c64382fcdff911c4d8c3f0"; + }; + + checkInputs = [ pytest tornado ]; + buildInputs = [ zeromq3]; + propagatedBuildInputs = [ py ]; + + # test_socket.py seems to be hanging + # others fail + checkPhase = '' + py.test $out/${python.sitePackages}/zmq/ -k "not test_socket \ + and not test_current \ + and not test_instance \ + and not test_callable_check \ + and not test_on_recv_basic \ + and not test_on_recv_wake" + ''; +} diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 035ea32b398933942810a5ee25dbb84b7a710b28..d1aa4f096fe674da2e8f43aa3be9b7d2c03ac762 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "04skhjb2dbbhvpq0x71nnz2h68805fkxfpkdjhwvd7lzsljjbbq8"; + sha256 = "8e78e7ce28015c1041be68b90f43048c9815e8c89d3362f8073feecdc70eafba"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch b/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch new file mode 100644 index 0000000000000000000000000000000000000000..c4d14319a8b675487823ed2ec6fcb83a4248f2cd --- /dev/null +++ b/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +--- a/setup.py ++++ b/setup.py +@@ -18,7 +18,7 @@ from version import VERSION # NOQA + install_requires = [ + 'pandas >= 0.14', + 'numpy >= 1.8', +- 'requests >= 2.7.0, < 2.18', # Version 2.18 appears to break pulling data. ++ 'requests >= 2.7.0', # Works fine + 'inflection >= 0.3.1', + 'python-dateutil', + 'six', diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e85e9c4e0f8c0260f0f01d0d471dd8f172d50fdf --- /dev/null +++ b/pkgs/development/python-modules/quandl/default.nix @@ -0,0 +1,59 @@ +{ + lib, fetchFromGitHub, buildPythonPackage, isPy3k, + # runtime dependencies + pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, + # test suite dependencies + nose, unittest2, flake8, httpretty, mock, factory_boy, jsondate, + # additional runtime dependencies are required on Python 2.x + pyOpenSSL ? null, ndg-httpsclient ? null, pyasn1 ? null +}: + +buildPythonPackage rec { + pname = "quandl"; + version = "3.2.1"; + sha256 = "0vc0pzs2px9yaqkqcmd2m1b2bq1iils8fs0xbl0989hjq791a4jr"; + + patches = [ ./allow-requests-v2.18.patch ]; + + # Tests do not work with fetchPypi + src = fetchFromGitHub { + owner = pname; + repo = "quandl-python"; + rev = "refs/tags/v${version}"; + inherit sha256; + fetchSubmodules = true; # Fetching by tag does not work otherwise + }; + + doCheck = true; + + checkInputs = [ + nose + unittest2 + flake8 + httpretty + mock + factory_boy + jsondate + ]; + + propagatedBuildInputs = [ + pandas + numpy + requests + inflection + python-dateutil + six + more-itertools + ] ++ lib.optional (!isPy3k) [ + pyOpenSSL + ndg-httpsclient + pyasn1 + ]; + + meta = { + homepage = "https://github.com/quandl/quandl-python"; + description = "Quandl Python client library"; + maintainers = [ lib.maintainers.ilya-kolpakov ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e65329c1b69511779ec882179feecdb144f7e686 --- /dev/null +++ b/pkgs/development/python-modules/quantities/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, python +}: + +buildPythonPackage rec { + pname = "quantities"; + version = "0.12.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a03e8511db603c57ca80dee851c43f08d0457f4d592bcac2e154570756cb934"; + }; + + propagatedBuildInputs = [ numpy ]; + + checkPhase = '' + ${python.interpreter} setup.py test -V 1 + ''; + + meta = { + description = "Quantities is designed to handle arithmetic and"; + homepage = http://python-quantities.readthedocs.io/; + license = lib.licenses.bsd2; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/rackspace-novaclient/default.nix b/pkgs/development/python-modules/rackspace-novaclient/default.nix deleted file mode 100644 index 144b61c9b9a575c48afcb2825e757c972c4cc2d6..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/rackspace-novaclient/default.nix +++ /dev/null @@ -1,151 +0,0 @@ -{ 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"; - - src = fetchurl { - url = "mirror://pypi/o/os-virtual-interfacesv2-python-novaclient-ext/${name}.tar.gz"; - sha256 = "17a4r8psxmfikgmzh709absbn5jsh1005whibmwhysj9fi0zyfbd"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://github.com/rackerlabs/os_virtual_interfacesv2_ext; - license = lib.licenses.asl20; - description = "Adds Virtual Interfaces support to python-novaclient"; - }; -}; - -ip-associations-python-novaclient-ext = buildPythonPackage rec { - name = "ip_associations_python_novaclient_ext-0.2"; - - src = fetchurl { - url = "mirror://pypi/i/ip_associations_python_novaclient_ext/${name}.tar.gz"; - sha256 = "0dxfkfjhzskafmb01y8hzbcpvc4cd6fas1s50dzcmg29w4z6qmz4"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://github.com/rackerlabs/ip_associations_python_novaclient_ext; - license = lib.licenses.asl20; - description = "Adds Rackspace ip_associations support to python-novaclient"; - }; -}; - - -rackspace-auth-openstack = buildPythonPackage rec { - name = "rackspace-auth-openstack-1.3"; - - src = fetchurl { - url = "mirror://pypi/r/rackspace-auth-openstack/${name}.tar.gz"; - sha256 = "1kaiyvgwmavw2mh0s32yjk70xsziynjdhi01qn9a8kljn7p6kh64"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://pypi.python.org/pypi/rackspace-auth-openstack; - license = lib.licenses.asl20; - description = "Rackspace Auth Plugin for OpenStack Clients."; - }; -}; -rax-default-network-flags-python-novaclient-ext = buildPythonPackage rec { - name = "rax_default_network_flags_python_novaclient_ext-0.4.0"; - - src = fetchurl { - url = "mirror://pypi/r/rax_default_network_flags_python_novaclient_ext/${name}.tar.gz"; - sha256 = "00b0csb58k6rr1is68bkkw358mms8mmb898bm8bbr8g7j2fz8aw5"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://pypi.python.org/simple/rax-default-network-flags-python-novaclient-ext; - license = lib.licenses.asl20; - description = "Novaclient Extension for Instance Default Network Flags"; - }; -}; -os-networksv2-python-novaclient-ext = buildPythonPackage rec { - name = "os_networksv2_python_novaclient_ext-0.26"; - - src = fetchurl { - url = "mirror://pypi/o/os_networksv2_python_novaclient_ext/${name}.tar.gz"; - sha256 = "06dzqmyrwlq7hla6dk699z18c8v27qr1gxqknimwxlwqdlhpafk1"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://pypi.python.org/pypi/os_networksv2_python_novaclient_ext; - license = lib.licenses.asl20; - description = "Adds rackspace networks support to python-novaclient"; - }; -}; - -rax-scheduled-images-python-novaclient-ext = buildPythonPackage rec { - name = "rax_scheduled_images_python_novaclient_ext-0.3.1"; - - src = fetchurl { - url = "mirror://pypi/r/rax_scheduled_images_python_novaclient_ext/${name}.tar.gz"; - sha256 = "1nvwjgrkp1p1d27an393qf49pszm1nvqa2ychhbqmp0bnabwyw7i"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://pypi.python.org/pypi/rax_scheduled_images_python_novaclient_ext; - license = lib.licenses.asl20; - description = "Extends python-novaclient to use RAX-SI, the Rackspace Nova API Scheduled Images extension"; - }; -}; - -os-diskconfig-python-novaclient-ext = buildPythonPackage rec { - name = "os_diskconfig_python_novaclient_ext-0.1.3"; - - src = fetchurl { - url = "mirror://pypi/o/os_diskconfig_python_novaclient_ext/${name}.tar.gz"; - sha256 = "0xayy5nlkgl9yr0inqkwirlmar8pv1id29r59lj70g5plwrr5lg7"; - }; - - propagatedBuildInputs = [ six novaclient ]; - - meta = { - homepage = https://pypi.python.org/pypi/os_diskconfig_python_novaclient_ext; - license = lib.licenses.asl20; - description = "Disk Config extension for python-novaclient"; - }; -}; - -in -buildPythonPackage rec { - name = "rackspace-novaclient-2.1"; - - src = fetchurl { - url = "mirror://pypi/r/rackspace-novaclient/${name}.tar.gz"; - sha256 = "1rzaa328hzm8hs9q99gvjr64x47fmcq4dv4656rzxq5s4gv49z12"; - }; - - disabled = isPy3k; - propagatedBuildInputs = [ - requests - novaclient - six - # extensions - ip-associations-python-novaclient-ext - os-diskconfig-python-novaclient-ext - os-networksv2-python-novaclient-ext - os-virtual-interfacesv2-python-novaclient-ext - rackspace-auth-openstack - rax-default-network-flags-python-novaclient-ext - rax-scheduled-images-python-novaclient-ext - ]; - - meta = { - homepage = https://pypi.python.org/pypi/rackspace-novaclient/; - license = lib.licenses.asl20; - description = "Metapackage to install python-novaclient and Rackspace extensions"; - maintainers = with lib.maintainers; [ teh ]; - }; -} diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 00bc54d844b1ad32bde8c7db4b482f88120ad828..2052d4421e5e7b2b81c223910f07d55734565177 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -1,18 +1,23 @@ -{ lib, buildPythonPackage, fetchurl, isPy3k, contextlib2 }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +, contextlib2, blinker +}: buildPythonPackage rec { - name = "raven-6.3.0"; + pname = "raven"; + version = "6.7.0"; - src = fetchurl { - url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k"; + src = fetchFromGitHub { + owner = "getsentry"; + repo = "raven-python"; + rev = version; + sha256 = "0vb6zczfgrrh0qw5wlbvk703r11y091k6r53fbbhpbwh4hva30nx"; }; # way too many dependencies to run tests # see https://github.com/getsentry/raven-python/blob/master/setup.py doCheck = false; - propagatedBuildInputs = lib.optionals (!isPy3k) [ contextlib2 ]; + propagatedBuildInputs = [ blinker ] ++ lib.optionals (!isPy3k) [ contextlib2 ]; meta = { description = "A Python client for Sentry (getsentry.com)"; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cdbba1806735fbcb19e8c7fd9ef9ecbfd36f49d2 --- /dev/null +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isodate +, html5lib +, SPARQLWrapper +, networkx +, nose +, python +}: + +buildPythonPackage rec { + pname = "rdflib"; + version = "4.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0398c714znnhaa2x7v51b269hk20iz073knq2mvmqp2ma92z27fs"; + }; + + propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; + + checkInputs = [ networkx nose ]; + + # Python 2 syntax + # Failing doctest + doCheck = false; + + checkPhase = '' + ${python.interpreter} run_tests.py + ''; + + meta = { + description = "A Python library for working with RDF, a simple yet powerful language for representing information"; + homepage = http://www.rdflib.net/; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index af0b64fc3404359e2e7bec79ab6fca7919da1ee1..aa3928db891141d17f1748e5c66d0935d96df76b 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -2,26 +2,28 @@ , buildPythonPackage , fetchPypi , pytest +, mock +, cmarkgfm , bleach , docutils +, future , pygments , six }: buildPythonPackage rec { pname = "readme_renderer"; - version = "17.2"; - name = "${pname}-${version}"; + version = "18.1"; src = fetchPypi { inherit pname version; - sha256 = "9deab442963a63a71ab494bf581b1c844473995a2357f4b3228a1df1c8cba8da"; + sha256 = "e18cab7f1b07412990df1b59e1be04e1538f514a5bba53ec8777bfc5aac27563"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest mock ]; propagatedBuildInputs = [ - bleach docutils pygments six + bleach cmarkgfm docutils future pygments six ]; checkPhase = '' @@ -33,4 +35,4 @@ buildPythonPackage rec { homepage = https://github.com/pypa/readme_renderer; license = lib.licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index 9a17e722679f3143c3af669790b01fe5c9af1ace..359b482a16829d7925d94ba4d08becd92a21c883 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -1,7 +1,9 @@ { stdenv, python }: stdenv.mkDerivation rec { - name = "python-recursive-pth-loader-1.0"; + pname = "python-recursive-pth-loader"; + version = "1.0"; + name = pname + "-" + version; unpackPhase = "true"; diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d9736dcb6f3947e93c57ae4e28970caef0d54522 --- /dev/null +++ b/pkgs/development/python-modules/rednose/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, nose, six, colorama, termstyle }: + +buildPythonPackage rec { + pname = "rednose"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6da77917788be277b70259edc0bb92fc6f28fe268b765b4ea88206cc3543a3e1"; + }; + + prePatch = '' + substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0" + ''; + + checkInputs = [ six ]; + propagatedBuildInputs = [ nose colorama termstyle ]; + + meta = with lib; { + description = "A python nose plugin adding color to console results"; + homepage = https://github.com/JBKahn/rednose; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..234088d1f51965cd50c20233f606791fbb164475 --- /dev/null +++ b/pkgs/development/python-modules/regex/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + + +buildPythonPackage rec { + pname = "regex"; + version = "2018.02.21"; + + src = fetchPypi { + inherit pname version; + sha256 = "b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29"; + }; + + postCheck = '' + echo "We now run tests ourselves, since the setuptools installer doesn't." + ${python.interpreter} -c 'import test_regex; test_regex.test_main();' + ''; + + meta = { + description = "Alternative regular expression module, to replace re"; + homepage = https://bitbucket.org/mrabarnett/mrab-regex; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index fa91184f1b7a10530ce9e0ac5624aa87048c9c26..7899f86a8cb8356a2fdc44a2b6179cb16d6e5fb4 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -38,8 +38,8 @@ buildPythonPackage rec { description = "GPGPU algorithms for PyCUDA and PyOpenCL"; homepage = https://github.com/fjarri/reikna; license = stdenv.lib.licenses.mit; - maintainer = stdenv.lib.maintainers.fridh; + maintainers = [ stdenv.lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 5e1ea8b464242b0a1172247fdbceccc63755e64f..5c5f2578fbf1ab6f83c20e9251db81002a457599 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "relatorio"; name = "${pname}-${version}"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { url = "mirror://pypi/r/relatorio/${name}.tar.gz"; - sha256 = "744f1e39313f037a0ab52a154338ece151d83e5442a9278db1f8ce450ce6c2cd"; + sha256 = "bddf85d029c5c85a0f976d73907e14e4c3093065fe8527170c91abf0218546d9"; }; propagatedBuildInputs = [ genshi diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c8886b75d644ed7c44b2d4c1c4ce5c0a9371dc10 --- /dev/null +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, mock, requests, six, urllib3 }: + +buildPythonPackage rec { + pname = "requests-cache"; + version = "0.4.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "18jpyivnq5pjbkymk3i473rihpj2bgikafpha7xvr6w736hiqmpy"; + }; + + buildInputs = [ mock ]; + propagatedBuildInputs = [ requests six urllib3 ]; + + meta = with stdenv.lib; { + description = "Persistent cache for requests library"; + homepage = https://pypi.python.org/pypi/requests-cache; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ef87c4f101957a8f4d7ee818b9206199c7c0c759 --- /dev/null +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, python +, mock, testrepository, testtools +, requests, six }: + +buildPythonPackage rec { + pname = "requests-mock"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2931887853c42e1d73879983d5bf03041109472991c5b4b8dba5d11ed23b9d0b"; + }; + + patchPhase = '' + sed -i 's@python@${python.interpreter}@' .testr.conf + ''; + + checkInputs = [ mock testrepository testtools ]; + + propagatedBuildInputs = [ requests six ]; +} diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index e7834e62b82981277fc5701243be0493c2ac1246..809c8d3c96df21141d2170833e07ffdef53bc796 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { meta = { description = "A toolbelt of useful classes and functions to be used with python-requests"; homepage = http://toolbelt.rtfd.org; - maintainers = with lib.maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with lib.maintainers; [ jgeerds ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4eb3a33926ff25938f77e62d8991138cf8198368 --- /dev/null +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi +, pbr, requests +, pytest, pytestpep8, waitress }: + +buildPythonPackage rec { + pname = "requests-unixsocket"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0k19knydh0fzd7w12lfy18arl1ndwa0zln33vsb37yv1iw9w06x9"; + }; + + nativeBuildInputs = [ pbr ]; + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytest pytestpep8 waitress ]; + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Use requests to talk HTTP via a UNIX domain socket"; + homepage = https://github.com/msabramo/requests-unixsocket; + license = licenses.asl20; + maintainers = [ maintainers.catern ]; + }; +} diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index f3ff4a84f1e8e6fa5f49585f4e8bffa2b01d483f..aeca2abf17cf2ecacc853cf2766d554f92b58904 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -3,7 +3,6 @@ , pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "requests"; version = "2.18.4"; diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 4e2646eb6ab2c705a103776aece8c7034729fc37..91ab82a7a30e4c2ca857869e31e6d4bd8bbc079a 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Download files using requests and save them to a target path"; homepage = https://www.github.com/takluyver/requests_download; license = lib.licenses.mit; - maintainer = lib.maintainers.fridh; + maintainers = [ lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix index 35d723836c952429b5ef004931d045bf93747478..87af0e78b1836e14027530d1ced74da93a828305 100644 --- a/pkgs/development/python-modules/requestsexceptions/default.nix +++ b/pkgs/development/python-modules/requestsexceptions/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "requestsexceptions"; - version = "1.3.0"; + version = "1.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0gim00vi7vfq16y8b9m1vpy01grqvrdrbh88jb98qx6n6sk1n54g"; + sha256 = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065"; }; propagatedBuildInputs = [ pbr ]; @@ -22,6 +22,6 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/requestsexceptions"; license = licenses.asl20; maintainers = with maintainers; [ makefu ]; - patforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4cc74431fc8525ab142f5e9fd1ddd45c563b644d --- /dev/null +++ b/pkgs/development/python-modules/responses/default.nix @@ -0,0 +1,16 @@ +{ stdenv, buildPythonPackage, fetchPypi +, cookies, mock, requests, six }: + +buildPythonPackage rec { + pname = "responses"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c6082710f4abfb60793899ca5f21e7ceb25aabf321560cc0726f8b59006811c9"; + }; + + propagatedBuildInputs = [ cookies mock requests six ]; + + doCheck = false; +} diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 1a863c62973847af27283475e0a7d53ec20df403..af1f28d6d72db9b239c9cf334303cea6fc248f88 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.1.1"; + version = "1.1.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "167e8adaa5bdc30531ee91760d6c216b306a8a3372aad34b1f72d8adcc5e011e"; + sha256 = "c48ca9a84c312b262809f041fe47dcfaedc9ee4879b3e1f9532f745c182b4037"; }; checkInputs = [ nose flake8 pyyaml testtools ]; diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 0f2ce45c885c1842b87b250656cceab9722f1f6c..a13df64cd03e94067bd2f8eda566a1911f11425f 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "restview"; name = "${pname}-${version}"; - version = "2.7.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "e7842100f3de179c68cfe7c2cf56c61509cd6068bc6dd58ab42c0ade5d5f97ec"; + sha256 = "45320b4e52945d23b3f1aeacc7ff97a3b798204fe625f8b81ed5322326d5bcd1"; }; propagatedBuildInputs = [ docutils readme_renderer pygments ]; diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6443a4e2bbfe8713080370843b8bbbe04f6c0e9d --- /dev/null +++ b/pkgs/development/python-modules/rlp/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonPackage, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "rlp"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0d3gx4mp8q4z369s5yk1n9c55sgfw9fidbwqxq67d6s7l45rm1w7"; + }; + + buildInputs = [ pytest ]; + + meta = { + description = "A package for encoding and decoding data in and from Recursive Length Prefix notation"; + homepage = "https://github.com/ethereum/pyrlp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 1e7b020cd51398623ac6981c6524015f5ec78cd0..f29cafb7aeed77555b83a83a6c48e9db683e7677 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, buildPythonPackage, pyparsing, argparse, robotframework }: +{ stdenv, fetchPypi, buildPythonPackage, pyparsing, argparse, robotframework, allpairspy }: buildPythonPackage rec { - name = "robomachine-0.6"; + pname = "RoboMachine"; + version = "0.8.0"; - src = fetchurl { - url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; - sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54"; + src = fetchPypi { + inherit pname version; + sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45"; }; - propagatedBuildInputs = [ pyparsing argparse robotframework ]; + propagatedBuildInputs = [ pyparsing argparse robotframework allpairspy ]; # Remove Windows .bat files postInstall = '' diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix index a9b536fc76ed4d99bd7c8c8796e5f8c111edd75c..8bac32ba9112303032c2a1fe94d16d6b3af3f482 100644 --- a/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -2,8 +2,9 @@ buildPythonPackage rec { version = "1.2.3"; - name = "robotframework-ride-${version}"; + pname = "robotframework-ride"; disabled = isPy3k; + name = pname + "-" + version; src = fetchurl { url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index e0a05eb2e25855534226854597dcee1523b84c7a..be3316cf697eb8ab1e0ba4f555eed460045c5374 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - version = "3.0.2"; - name = "robotframework-${version}"; + version = "3.0.3"; + pname = "robotframework"; disabled = isPy3k; + name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/r/robotframework/${name}.tar.gz"; - sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610"; + sha256 = "a5ffe9283c9247c3a1e81228fcc009819d8f94b48768170268a3e6274a998bca"; }; meta = with stdenv.lib; { description = "Generic test automation framework"; homepage = http://robotframework.org/; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix index 008bafae9d75c96b8dc75c843786642ddb7cbb9e..1051195222870e2e9ffe1bc550f47a5fe2a23fff 100644 --- a/pkgs/development/python-modules/root_numpy/default.nix +++ b/pkgs/development/python-modules/root_numpy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root }: +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root, nose }: buildPythonPackage rec { pname = "root_numpy"; @@ -11,6 +11,11 @@ buildPythonPackage rec { }; disabled = isPy3k; # blocked by #27649 + checkInputs = [ nose ]; + checkPhase = '' + python setup.py install_lib -d . + nosetests -s -v root_numpy + ''; propagatedBuildInputs = [ numpy root ]; diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix index 0827786acfcd69e73e29adc2c439165cdeace077..e9061b0a6a33a2d872b1a5b2d972fb224697bbc4 100644 --- a/pkgs/development/python-modules/rootpy/default.nix +++ b/pkgs/development/python-modules/rootpy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables }: +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables, pytest }: buildPythonPackage rec { pname = "rootpy"; @@ -14,6 +14,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy root root_numpy tables ]; + checkInputs = [ pytest ]; + checkPhase = '' + # tests fail with /homeless-shelter + export HOME=$PWD + # skip problematic tests + py.test rootpy -k "not test_stl and not test_cpp and not test_xrootd_glob_single and not test_xrootd_glob_multiple" + ''; + meta = with lib; { homepage = http://www.rootpy.org; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index f7ef16b02bbd7d3382fe938adddfe76a34b8ee1d..82b809a1e917e3364c6bd0c73d107e2736d1628f 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -3,23 +3,25 @@ , fetchPypi , capstone , filebytes -, pytest }: +, pytest +}: buildPythonApplication rec { - name = "${pname}-${version}"; pname = "ropper"; - version = "1.10.10"; + version = "1.11.6"; src = fetchPypi { inherit pname version; - sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87"; + sha256 = "33777d0c3ddd9ca7bc48f53dbe2c4a222a567f1125c43b1c34fb1b360d0b19dc"; }; # 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]; + doCheck = false; # Tests not included in archive + + checkInputs = [pytest]; propagatedBuildInputs = [ capstone filebytes ]; meta = with stdenv.lib; { homepage = https://scoding.de/ropper/; diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix index 1e8baa553bdcd49cd0cb2ee1c1d68ecf8e1391a5..3164be5aa86dbb2b6dc19937dbe145ed8375674a 100644 --- a/pkgs/development/python-modules/rpkg/default.nix +++ b/pkgs/development/python-modules/rpkg/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { description = "Python library for dealing with rpm packaging"; homepage = https://pagure.io/fedpkg; license = licenses.gpl2Plus; - maintainers = with maintainers; [ mornfall ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8db7ae3b337255d4951cd4f4298fbe51016abeba --- /dev/null +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, readline +, R +, pcre +, lzma +, bzip2 +, zlib +, icu +, singledispatch +, six +, jinja2 +, pytest +}: + +buildPythonPackage rec { + version = "2.8.2"; + pname = "rpy2"; + disabled = isPyPy; + src = fetchPypi { + inherit version pname; + sha256 = "0k5jp6n1lfab7a6r5568aq31hg4fgf2cwy0hzvf3chp6yhyk26ic"; + }; + buildInputs = [ + readline + R + pcre + lzma + bzip2 + zlib + icu + ]; + propagatedBuildInputs = [ + singledispatch + six + jinja2 + ]; + checkInputs = [ pytest ]; + # Tests fail with `assert not _relpath.startswith('..'), "Path must be within the project"` + # in the unittest `loader.py`. I don't know what causes this. + doCheck = false; + # without this tests fail when looking for libreadline.so + LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs; + + meta = { + homepage = http://rpy.sourceforge.net/rpy2; + description = "Python interface to R"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ joelmo ]; + }; + } diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6945d7486f66347833b4512dcfa7461731a80726 --- /dev/null +++ b/pkgs/development/python-modules/rx/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildPythonPackage, nose }: + +buildPythonPackage rec { + pname = "rx"; + version = "1.6.0"; + + # There are no tests on the pypi source + src = fetchFromGitHub { + owner = "ReactiveX"; + repo = "rxpy"; + rev = version; + sha256 = "174xi2j36igxmaqcgl5p64p31a7z19v62xb5czybjw72gpyyfyri"; + }; + + checkInputs = [ nose ]; + + meta = { + homepage = https://github.com/ReactiveX/RxPY; + description = "Reactive Extensions for Python"; + maintainers = with lib.maintainers; [ thanegill ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..956a96f14046d1a5a77772b91520d8151c7db4ad --- /dev/null +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, docutils, boto3 }: + +buildPythonPackage rec { + pname = "s3fs"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "f19b2e81cfcf6f2849fa8195c366c6e81d2378400bab0611f461c4e55d4f6bed"; + }; + + buildInputs = [ docutils ]; + propagatedBuildInputs = [ boto3 ]; + + # Depends on `moto` which has a long dependency chain with exact + # version requirements that can't be made to work with current + # pythonPackages. + doCheck = false; + + meta = with stdenv.lib; { + description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; + homepage = http://github.com/dask/s3fs/; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 8e5b30c26b413470506077886f3ec78e66755254..9b74b9c8ba35f4ccdba2a49ffd8515407c4abe60 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.1.11"; + version = "0.1.13"; src = fetchPypi { inherit pname version; - sha256 = "0yfrfnf404cxzn3iswibqjxklsl0b1lwgqiml6pwiqj79a7zbwbn"; + sha256 = "90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1"; }; foo = 1; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..37c7b157ea58305f645cb32682bb888e4ff4b60a --- /dev/null +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython +, chardet, lmtpd, pythondaemon, six, jinja2, mock }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "salmon-mail"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1smggsnkwiqy8zjq604dkm5g0np27pdnj3szsbn8v4ja84nncq18"; + }; + + checkInputs = [ nose jinja2 mock ]; + propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ]; + + meta = with stdenv.lib; { + homepage = http://salmon-mail.readthedocs.org/; + description = "Pythonic mail application server"; + license = licenses.gpl3; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..340c8d002b72bca318780257b5a2475f75d1c6bb --- /dev/null +++ b/pkgs/development/python-modules/sarge/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "sarge-${version}"; + version = "0.1.4"; + + src = fetchurl { + url = "mirror://pypi/s/sarge/${name}.tar.gz"; + sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar"; + }; + + meta = with lib; { + homepage = http://sarge.readthedocs.org/; + description = "A wrapper for subprocess which provides command pipeline functionality"; + license = licenses.bsd3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d33de9c2a73a70964db7846e5290a923b5875e36 --- /dev/null +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -0,0 +1,24 @@ +{lib, fetchgit, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}: + +buildPythonPackage rec { + pname = "sasmodels"; + version = "0.96"; + + buildInputs = [pytest]; + propagatedBuildInputs = [docutils matplotlib numpy scipy]; + + preCheck = ''export HOME=$(mktemp -d)''; + + src = fetchgit { + url = "https://github.com/SasView/sasmodels.git"; + rev = "v${version}"; + sha256 = "11qaaqdc23qzb75zs48fkypksmcb332vl0pkjqr5bijxxymgm7nw"; + }; + + meta = { + description = "Library of small angle scattering models"; + homepage = http://sasview.org; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..521f68db1cc6bfc2d0c39988228b238e8467e945 --- /dev/null +++ b/pkgs/development/python-modules/scandir/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "scandir-${version}"; + version = "1.7"; + + src = fetchurl { + url = "mirror://pypi/s/scandir/${name}.tar.gz"; + sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj"; + }; + + meta = with lib; { + description = "A better directory iterator and faster os.walk()"; + homepage = https://github.com/benhoyt/scandir; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 5241b632f122d0e507deca158b55ceb7c148db7e..c24592ef9650a0537b515d7faef5a1237203656a 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -1,20 +1,37 @@ -{ stdenv, fetchurl, buildPythonPackage, isPy3k, isPyPy }: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k, pythonOlder +, matplotlib, pycrypto, ecdsa +, enum34, mock +}: buildPythonPackage rec { - name = "scapy-2.2.0"; + pname = "scapy"; + version = "2.4.0"; - disabled = isPy3k || isPyPy; + disabled = isPyPy; - src = fetchurl { - url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz"; - sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5"; + src = fetchFromGitHub { + owner = "secdev"; + repo = "scapy"; + rev = "v${version}"; + sha256 = "0dw6kl1qi9bf3rbm79gb1h40ms8y0b5dbmpip841p2905d5r2isj"; }; + # TODO: Temporary workaround + patches = [ ./fix-version-1.patch ./fix-version-2.patch ]; + + propagatedBuildInputs = + [ matplotlib pycrypto ecdsa ] + ++ lib.optional (isPy3k && pythonOlder "3.4") [ enum34 ] + ++ lib.optional doCheck [ mock ]; + + # Tests fail with Python 3.6 (seems to be an upstream bug, I'll investigate) + doCheck = if isPy3k then false else true; + meta = with stdenv.lib; { description = "Powerful interactive network packet manipulation program"; - homepage = http://www.secdev.org/projects/scapy/; + homepage = https://scapy.net/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ primeos bjornfor ]; }; } diff --git a/pkgs/development/python-modules/scapy/fix-version-1.patch b/pkgs/development/python-modules/scapy/fix-version-1.patch new file mode 100644 index 0000000000000000000000000000000000000000..33d099e7a64820c69d65ba89a33610c24b1e8780 --- /dev/null +++ b/pkgs/development/python-modules/scapy/fix-version-1.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2018-02-15 22:14:08.531591678 +0100 ++++ b/setup.py 2018-03-27 17:15:38.617315539 +0200 +@@ -47,7 +47,7 @@ + + setup( + name='scapy', +- version=__import__('scapy').VERSION, ++ version='2.4.0', + packages=[ + 'scapy', + 'scapy/arch', diff --git a/pkgs/development/python-modules/scapy/fix-version-2.patch b/pkgs/development/python-modules/scapy/fix-version-2.patch new file mode 100644 index 0000000000000000000000000000000000000000..41a195fb722f21d4b5725f88debaf0cb50730bc7 --- /dev/null +++ b/pkgs/development/python-modules/scapy/fix-version-2.patch @@ -0,0 +1,15 @@ +--- a/scapy/__init__.py 2018-03-27 17:38:52.706481269 +0200 ++++ b/scapy/__init__.py 2018-03-27 17:39:56.576688890 +0200 +@@ -82,9 +82,10 @@ + if match: + return "git-archive.dev" + match.group(1) + elif sha1: +- return "git-archive.dev" + sha1 ++ return '2.4.0' + else: +- return 'unknown.version' ++ return '2.4.0' ++ + + VERSION = _version() + diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 2c57ce2958256110f531caf25dc0d0fcd55db04a..2c8e63e5ed2f03e01614814f249df92a083eab54 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "schema"; - version = "0.6.6"; + version = "0.6.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1lw28j9w9vxyigg7vkfkvi6ic9lgjkdnfvnxdr7pklslqvzmk2vm"; + sha256 = "410f44cb025384959d20deef00b4e1595397fa30959947a4f0d92e9c84616f35"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index b2826588a28813ece3572822f5ba74a12cc6a6c8..00bdcae1b9a83ef36a462997fdca0bc5c48c7054 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -20,8 +20,10 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; + # Disable doctests on OSX: https://github.com/scikit-learn/scikit-learn/issues/10213 + # Disable doctests everywhere: https://github.com/NixOS/nixpkgs/issues/35436 checkPhase = '' - HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/ + HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests --doctest-options=+SKIP $out/${python.sitePackages}/sklearn/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index df2e569076a29043a41886a9e5fb4fd14b1ed493..9adac49bdcc8c95982c670769e4a14a92c0f4d4e 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,13 +1,12 @@ -{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: +{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: buildPythonPackage rec { pname = "scipy"; - version = "1.0.0"; - name = "${pname}-${version}"; + version = "1.0.1"; - src = fetchurl { - url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "87ea1f11a0e9ec08c264dc64551d501fa307289460705f6fccd84cbfc7926d10"; + src = fetchPypi { + inherit pname version; + sha256 = "8739c67842ed9a1c34c62d6cca6301d0ade40d50ef14ba292bd331f0d6c940ba"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a612528d47ab47a479cf777495788027777ebd56 --- /dev/null +++ b/pkgs/development/python-modules/scp/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, paramiko +, python +}: + +buildPythonPackage rec { + pname = "scp"; + version = "0.10.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "18f59e48df67fac0b069591609a0f4d50d781a101ddb8ec705f0c2e3501a8386"; + }; + + propagatedBuildInputs = [ + paramiko + ]; + + checkPhase = '' + SCPPY_PORT=10022 ${python.interpreter} test.py + ''; + + #The Pypi package doesn't include the test + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/jbardin/scp.py; + description = "SCP module for paramiko"; + license = licenses.lgpl3; + maintainers = with maintainers; [ xnaveira ]; + }; +} diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 5b40c74a181965067f7562974f0372f6804559fa..005d02e60472a496a751f94eb523e7d9d756c939 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -2,7 +2,7 @@ testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.4.0"; + version = "1.5.0"; pname = "Scrapy"; name = "${pname}-${version}"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/S/Scrapy/${name}.tar.gz"; - sha256 = "04a08f027eef5d271342a016439533c81ba46f14bfcf230fecf602e99beaf233"; + sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 1647e6cfc143d89a1034dfbfc9cbb4de23680d08..20ad32b3261300a545e0a3076fb78408b140df68 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.7.1"; + version = "0.8.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs"; + sha256 = "6702978b903d0284446e935916b980dfebae4063c18ad8eb6e8f9e76d0257eae"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6b9f00783fd26857df5bbbebb8a4b184cc85e9b5 --- /dev/null +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pkgconfig +, pytest +, pytestrunner +, cffi +, secp256k1 +}: + +buildPythonPackage rec { + pname = "secp256k1"; + version = "0.13.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c"; + }; + + nativeBuildInputs = [ pkgconfig ]; + checkInputs = [ pytest pytestrunner ]; + propagatedBuildInputs = [ cffi secp256k1 ]; + + # Tests are not included in archive + doCheck = false; + + preConfigure = '' + cp -r ${secp256k1.src} libsecp256k1 + touch libsecp256k1/autogen.sh + export INCLUDE_DIR=${secp256k1}/include + export LIB_DIR=${secp256k1}/lib + ''; + + checkPhase = '' + py.test tests + ''; + + postPatch = '' + substituteInPlace setup.py --replace ", 'pytest-runner==2.6.2'" "" + ''; + + meta = { + homepage = https://github.com/ludbb/secp256k1-py; + description = "Python FFI bindings for secp256k1"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ chris-martin ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index e6d96f7bcf21570bcb057c13a0a8000a3c7d5855..9b64ce811ef7f90cdf93a5f7b8827ee41ee928ac 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/mitya57/secretstorage"; description = "Python bindings to FreeDesktop.org Secret Service API"; license = licenses.bsdOriginal; - maintainer = with maintainers; [ teto ]; + maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index d33e86a3f079cf31faff39afde050b8cfa290aff..1661dd2cf3aaf407e6c335c822fcb0f6517351f3 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -7,8 +7,24 @@ , xorg }: + +let + # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some + # absolute paths. Replaced by relative path so it is found when used in nix. + x_ignore_nofocus = + fetchFromGitHub { + owner = "SeleniumHQ"; + repo = "selenium"; + rev = "selenium-3.6.0"; + sha256 = "13wf4hx4i7nhl4s8xkziwxl0km1j873syrj4amragj6mpip2wn8v"; + }; +in + buildPythonPackage rec { - name = "selenium-3.6.0"; + pname = "selenium"; + version = "3.6.0"; + name = pname + "-" + version; + src = fetchurl { url = "mirror://pypi/s/selenium/${name}.tar.gz"; sha256 = "15qpvz0bdwjvpcj11fm0rw6r5inr66sqw89ww50l025sbhf04qwm"; @@ -20,21 +36,11 @@ buildPythonPackage rec { geckodriver ]; - # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some - # absolute paths. Replaced by relative path so it is found when used in nix. - x_ignore_nofocus = - fetchFromGitHub { - owner = "SeleniumHQ"; - repo = "selenium"; - rev = "selenium-3.6.0"; - sha256 = "13wf4hx4i7nhl4s8xkziwxl0km1j873syrj4amragj6mpip2wn8v"; - }; - - patchPhase = '' + patchPhase = stdenv.lib.optionalString stdenv.isLinux '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6" - gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o - gcc -shared \ + cc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o + cc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ -o x_ignore_nofocus.so \ x_ignore_nofocus.o @@ -47,4 +53,4 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ jraygauthier ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index f9e04691c1cb05527ae143aa531fa858e48c630c..e3c92a0e40fc100af432b5a579964e4bd249798b 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "semantic_version"; version = "2.6.0"; - name = "${pname}${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 9a309d1e3b94bbd9ba1f86150dbab85a281f811e..21aa41d800537a7f504908a730c941c185fb93cf 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "semver"; version = "2.7.9"; - src = fetchPypi { - inherit pname version; - sha256 = "1ffb55fb86a076cf7c161e6b5931f7da59f15abe217e0f24cea96cc8eec50f42"; + src = fetchFromGitHub { + owner = "k-bx"; + repo = "python-semver"; + rev = "2001c62d1a0361c44acc7076d8ce91e1d1c66141"; # not tagged in repository + sha256 = "01c05sv97dyr672sa0nr3fnh2aqbmvkfw19d6rkaj16h2sdsyg0i"; }; - # No tests in archive - doCheck = false; + checkInputs = [ pytest ]; + checkPhase = "pytest -v tests.py"; meta = with stdenv.lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..35115a45716e141395ccc4c107b895a6b97c77f9 --- /dev/null +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, configparser +, isPy3k +}: + +buildPythonPackage rec { + pname = "Send2Trash"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "hsoft"; + repo = "send2trash"; + rev = version; + sha256 = "1w502i5h8xaqf03g6h95h4vs1wqfv6kg925dn63phrwmg1hfz2xx"; + }; + + doCheck = !stdenv.isDarwin; + checkPhase = "HOME=. py.test"; + checkInputs = [ pytest ] ++ lib.optional (!isPy3k) configparser; + + meta = with lib; { + description = "Send file to trash natively under macOS, Windows and Linux"; + homepage = https://github.com/hsoft/send2trash; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 98a81873a718cc52856cd0a24351e040244fbe6c..2ce155210484c76669136fd6ae78e788315b7c35 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -3,11 +3,13 @@ }: buildPythonPackage rec { - name = "seqdiag-0.9.4"; + pname = "seqdiag"; + version = "0.9.5"; + name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; - sha256 = "1qa7d0m1wahvmrj95rxkb6128cbwd4w3gy8gbzncls66h46bifiz"; + sha256 = "994402cb19fef77ee113d18810aa397a7290553cda5f900be2bb44e2c7742657"; }; buildInputs = [ pep8 nose unittest2 docutils ]; diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index 2414b97e94aba293f6065756afad23882df78fdc..610a75fa3176c9889ad30789072cfd3f5cebde97 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "serpy"; name = "${pname}-${version}"; - version = "0.2.0"; + version = "0.3.1"; meta = { description = "ridiculously fast object serialization"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7e62e242321b208362966d5ab32b45df93b1cb88da4ce6260277da060b4f7475"; + sha256 = "3772b2a9923fbf674000ff51abebf6ea8f0fca0a2cfcbfa0d63ff118193d1ec5"; }; buildInputs = [ flake8 py pyflakes tox ]; diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1d9274610dade0d5dc3c9d7bd8887bfca49169b1 --- /dev/null +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, isPy27 +, testfixtures +, unittest2 +, webtest +, pyramid +, sqlalchemy +, simplejson +, mozsvc +, cornice +, pyramid_hawkauth +, pymysql +, pymysqlsa +, umemcache +, WSGIProxy +, requests +, pybrowserid +}: + +buildPythonPackage rec { + name = "serversyncstorage-${version}"; + version = "1.6.11"; + disabled = !isPy27; + + src = fetchgit { + url = https://github.com/mozilla-services/server-syncstorage.git; + rev = "refs/tags/${version}"; + sha256 = "197gj2jfs2c6nzs20j37kqxwi91wabavxnfm4rqmrjwhgqjwhnm0"; + }; + + buildInputs = [ testfixtures unittest2 webtest ]; + propagatedBuildInputs = [ + pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql + pymysqlsa umemcache WSGIProxy requests pybrowserid + ]; + + meta = { + broken = true; # 2018-11-04 + }; +} diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index d27c4fe2975c3baf9724f29b978f6070c0914d35..93e172a4f606c9d0113520d233c1ad75a30c94eb 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , characteristic , pyasn1 , pyasn1-modules @@ -13,26 +13,24 @@ buildPythonPackage rec { pname = "service_identity"; version = "17.0.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab"; + src = fetchFromGitHub { + owner = "pyca"; + repo = pname; + rev = version; + sha256 = "1fn332fci776m5a7jx8c1jgbm27160ip5qvv8p01c242ag6by5g0"; }; propagatedBuildInputs = [ characteristic pyasn1 pyasn1-modules pyopenssl idna attrs ]; - checkInputs = [ - pytest - ]; - - checkPhase = '' - py.test - ''; + checkInputs = [ pytest ]; + checkPhase = "py.test"; - # Tests not included in archive - doCheck = false; -} \ No newline at end of file + meta = with lib; { + description = "Service identity verification for pyOpenSSL"; + license = licenses.mit; + homepage = https://service-identity.readthedocs.io; + }; +} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index a65b0206ee53da67605c03eef25844f65d9c151d..972d8e90bf63ba3e40080933ec945642f121cd62 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,16 +8,17 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "36.6.0"; + version = "39.0.1"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "62074589522a798da243f47348f38020d55b6c945652e2f2c09d3a96299812b7"; + sha256 = "bec7badf0f60e7fc8153fac47836edc41b74e5d541d7692e614e635720d6a7c7"; }; - buildInputs = [ python wrapPython unzip ]; + nativeBuildInputs = [ unzip wrapPython ]; + buildInputs = [ python ]; doCheck = false; # requires pytest installPhase = '' dst=$out/${python.sitePackages} diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index 260f899f56d8b73ba9f1aa78d4b2d80622459e63..3e78c9b45bf6c806c4ca6286845a37489ec6158e 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "setuptools_scm"; name = "${pname}-${version}"; - version = "1.15.6"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "0pzvfmx8s20yrgkgwfbxaspz2x1g38qv61jpm0ns91lrb22ldas9"; + sha256 = "70a4cf5584e966ae92f54a764e6437af992ba42ac4bca7eb37cc5d02b98ec40a"; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index e8e92818ecf54a583115f228c1fc6276ab853538..6f10cfdf3ba38527d4e5701d936e2873be7dd4f6 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Shapely"; - version = "1.6.2.post1"; + version = "1.6.4.post1"; src = fetchPypi { inherit pname version; - sha256 = "07fba518e76b3276558f62a5829bdfa476f790cdef752383ccdc8c66b04b0899"; + sha256 = "30df7572d311514802df8dc0e229d1660bc4cbdcf027a8281e79c5fc2fcf02f2"; }; buildInputs = [ geos glibcLocales cython ]; @@ -30,10 +30,9 @@ buildPythonPackage rec { sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${libc}']).free|" shapely/geos.py ''; - # tests/test_voctorized fails because the vectorized extension is not - # available in when running tests + # Disable the tests that improperly try to use the built extensions checkPhase = '' - py.test --ignore tests/test_vectorized.py + py.test -k 'not test_vectorized and not test_fallbacks' tests ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/simplegeneric/default.nix b/pkgs/development/python-modules/simplegeneric/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..491e218154c029b55d0f9a05600a339bde2c846f --- /dev/null +++ b/pkgs/development/python-modules/simplegeneric/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "simplegeneric"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173"; + }; + + meta = { + description = "Simple generic functions"; + homepage = http://cheeseshop.python.org/pypi/simplegeneric; + license = lib.licenses.zpl21; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 846e8dc21a16b8f976b7f3cbdd9a2263f645b718..25dbecac9497c007664baabf100bc7e086a4c316 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.11.1"; + version = "3.13.2"; name = "${pname}-${version}"; doCheck = !stdenv.isDarwin; src = fetchPypi { inherit pname version; - sha256 = "01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7"; + sha256 = "4c4ecf20e054716cc1e5a81cadc44d3f4027108d8dd0861d8b1e3bd7a32d4f0a"; }; meta = { diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index af885fcf5a2ace8acc87e19babc8f396974e0ae2..77857df0764f6578d156a1bd1d4333e4ad41d8ea 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,13 +2,13 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { pname = "sip"; - version = "4.19.3"; + version = "4.19.6"; name = "${pname}-${version}"; format = "other"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl"; + sha256 = "0nlj0zbvmzliyhhspqwf2bjvcnpq4agx4s47php7ishv32p2gnlx"; }; configurePhase = '' diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 00fbbbc01eb84578f0476d672f5eb157c8b6548a..6921b3590e4eb7a56c11bc841260a2630ec1e42a 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -19,6 +19,9 @@ buildPythonPackage rec { py.test test_six.py ''; + # To prevent infinite recursion with pytest + doCheck = false; + meta = { description = "A Python 2 and 3 compatibility library"; homepage = https://pypi.python.org/pypi/six/; diff --git a/pkgs/development/python-modules/slimit/default.nix b/pkgs/development/python-modules/slimit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ff4c63891e5539a1b68aebadd248611e09f957ec --- /dev/null +++ b/pkgs/development/python-modules/slimit/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch, python, ply }: + +buildPythonPackage rec { + pname = "slimit"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "f433dcef899f166b207b67d91d3f7344659cb33b8259818f084167244e17720b"; + }; + + # Some patches from https://github.com/rspivak/slimit/pull/65 + patches = lib.optionals isPy3k [ + (fetchpatch { + url = https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch; + sha256 = "0lbhvkgn4l8g9fwvb81rfwjx7hsaq2pid8a5gczdk1ba65wfvdq5"; + }) + (fetchpatch { + url = https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch; + sha256 = "1hv4ysn09c9bfd5bxhhrp51hsi81hdidmx0y7zcrjjiich9ayrni"; + }) + ]; + + propagatedBuildInputs = [ ply ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s src/slimit + ''; + + meta = with lib; { + description = "JavaScript minifier"; + homepage = http://slimit.readthedocs.org/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 436d85102d81de7f4f98d73103a5669222190b12..c4992eb9d9bb6971bd3c9c075b9323429dbbf748 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -3,7 +3,9 @@ , isPy3k , fetchPypi , boto +, boto3 , bz2file +, mock , moto , requests , responses @@ -12,14 +14,26 @@ buildPythonPackage rec { pname = "smart_open"; name = "${pname}-${version}"; - version = "1.5.3"; + version = "1.5.7"; src = fetchPypi { inherit pname version; - sha256 = "0m5j71f7f36s17v4mwv0bxg4azknvcy82rbjp28b4vifrjd6dm7s"; + sha256 = "0y1c29pdxxgxkymr7g2n59siqqaq351zbx9vz8433dxvzy4qgd7p"; }; - propagatedBuildInputs = [ boto bz2file requests responses moto ]; + # nixpkgs version of moto is >=1.2.0, remove version pin to fix build + postPatch = '' + substituteInPlace ./setup.py --replace "moto==0.4.31" "moto" + ''; + + # moto>=1.0.0 is backwards-incompatible and some tests fail with it, + # so disable tests for now + doCheck = false; + + checkInputs = [ mock moto responses ]; + + # upstream code requires both boto and boto3 + propagatedBuildInputs = [ boto boto3 bz2file requests ]; meta = { license = lib.licenses.mit; description = "smart_open is a Python 2 & Python 3 library for efficient streaming of very large file"; diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..eff799e0d014ace0d7982092e7a2b28d0954f12a --- /dev/null +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, tornado }: + +buildPythonPackage rec { + name = "sockjs-tornado-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; + sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; + }; + + propagatedBuildInputs = [ tornado ]; + + meta = with lib; { + homepage = http://github.com/mrjoes/sockjs-tornado/; + description = "SockJS python server implementation on top of Tornado framework"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 452f3f1d92344ab96877b97d242891d2c4a6a491..16c1841a3d625fdfeb6104f92b298ba2bcf0be2d 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -1,14 +1,13 @@ -{ stdenv +{ lib , pkgs , buildPythonPackage , python , fetchPypi -, fetchFromGitHub -, pytest -, cython -, cymem +, pythonOlder +, html5lib +, pytest , preshed -, pathlib2 +, ftfy , numpy , murmurhash , plac @@ -16,58 +15,61 @@ , ujson , dill , requests -, ftfy , thinc -, pip +, regex +, cymem +, pathlib +, msgpack-python +, msgpack-numpy }: -let - enableDebugging = true; - regexLocked = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "regex"; - version = "2017.04.05"; - src = fetchPypi { - inherit pname version; - sha256 = "0c95gf3jzz8mv52lkgq0h7sbasjwvdhghm4s0phmy5k9sr78f4fq"; - }; +buildPythonPackage rec { + pname = "spacy"; + version = "2.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ihkhflhyz67bp73kfjqfrbcgdxi2msz5asbrh0pkk590c4vmms5"; }; -in buildPythonPackage rec { - name = "spacy-${version}"; - version = "1.8.2"; - src = fetchFromGitHub { - owner = "explosion"; - repo = "spaCy"; - rev = "v${version}"; - sha256 = "0v3bmmar31a6968y4wl0lmgnc3829l2mnwd8s959m4pqw1y1w648"; - }; + prePatch = '' + substituteInPlace setup.py \ + --replace "html5lib==" "html5lib>=" \ + --replace "regex==" "regex>=" \ + --replace "ftfy==" "ftfy>=" \ + --replace "msgpack-python==" "msgpack-python>=" \ + --replace "msgpack-numpy==" "msgpack-numpy>=" \ + --replace "pathlib" "pathlib; python_version<\"3.4\"" + ''; propagatedBuildInputs = [ - cython - cymem - pathlib2 - preshed numpy murmurhash + cymem + preshed + thinc plac six + html5lib ujson dill requests - regexLocked + regex ftfy - thinc - pytest - pip + msgpack-python + msgpack-numpy + ] ++ lib.optional (pythonOlder "3.4") pathlib; + + checkInputs = [ + pytest ]; doCheck = false; # checkPhase = '' # ${python.interpreter} -m pytest spacy/tests --vectors --models --slow - # ''; - - meta = with stdenv.lib; { + # ''; + + meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = https://github.com/explosion/spaCy; license = licenses.mit; diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..08500aeb4ad1f4256a88db9998832dce09ba4cc6 --- /dev/null +++ b/pkgs/development/python-modules/spake2/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, hkdf, pytest }: + +buildPythonPackage rec { + pname = "spake2"; + version = "0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ hkdf ]; + + checkPhase = '' + py.test $out + ''; + + meta = with lib; { + description = "SPAKE2 password-authenticated key exchange library"; + homepage = "http://github.com/warner/python-spake2"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index 8c2351c981e933093a5dc52d601bf62def985ddc..8ee4ce76069f07c7991e3543d021bee0d5fd0325 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -1,8 +1,9 @@ { lib, fetchurl, buildPythonPackage, numpy }: buildPythonPackage rec { - name = "sphfile-${version}"; + pname = "sphfile"; version = "1.0.0"; + name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/s/sphfile/${name}.tar.gz"; @@ -15,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Numpy-based NIST SPH audio-file reader"; - homepage = "https://github.com/mcfletch/sphfile"; + homepage = https://github.com/mcfletch/sphfile; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/sphinx-navtree/default.nix b/pkgs/development/python-modules/sphinx-navtree/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..02e5711e888f4154919014e7306b0cc6946f5600 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-navtree/default.nix @@ -0,0 +1,18 @@ +{ lib, fetchPypi, buildPythonPackage, sphinx }: + +buildPythonPackage rec { + version = "0.3.0"; + pname = "sphinx-navtree"; + src = fetchPypi { + inherit pname version; + sha256 = "1nqcsbqwr8ihk1fv534i0naag1qw04f7ibcgl2j8csvkh8q90b4p"; + }; + + propagatedBuildInputs = [ sphinx ]; + + meta = { + description = "Navigation tree customization for Sphinx"; + homepage = "https://github.com/bintoro/sphinx-navtree"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index e83ab1c724aac50599fbf760e384d418a9807369..a87362dfc3c03c76aafce6ba465b91e1ce8db514 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.6.5"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "c6de5dbdbb7a0d7d2757f4389cc00e8f6eb3c49e1772378967a12cfcf2cfe098"; + sha256 = "5a1c9a0fec678c24b9a2f5afba240c04668edb7f45c67ce2ed008996b3f21ae2"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4911c982cd06743b646eab4a31e607823cddc8fb --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, oset, pybtex, pybtex-docutils, sphinx +}: + +buildPythonPackage rec { + version = "0.3.6"; + pname = "sphinxcontrib-bibtex"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mfl3k6axq6rzqwq62fj8y9gabim2zcvydjpqmjj27f8v1qw0kpc"; + }; + + propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; + + meta = { + description = "A Sphinx extension for BibTeX style citations"; + homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex"; + license = stdenv.lib.licenses.bsd2; + }; + +} diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..abd9bd230d40349ec625a2d92f67fa95f86b3792 --- /dev/null +++ b/pkgs/development/python-modules/splinter/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, selenium +, flask +, coverage +}: + +buildPythonPackage rec { + pname = "splinter"; + version = "0.7.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "f97119f84d339067169451d56043f37f6b0a504a17a7ac6e48c91c012be72af6"; + }; + + propagatedBuildInputs = [ selenium ]; + + checkInputs = [ flask coverage ]; + + # No tests included + doCheck = false; + + meta = { + description = "Browser abstraction for web acceptance testing"; + homepage = https://github.com/cobrateam/splinter; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index ec73485193a578dc7abb0524f07ef16d70e9d80d..c14b3cd770bbf678f38b0fcc8f3a1fe474bd4317 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -2,8 +2,8 @@ buildPythonPackage rec { pname = "spotipy"; - name = "spotipy-${version}"; version = "2.4.4"; + name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 258f84e8c72a6f11a69a1d1341a68a63a0438b45..c2e454d08cda444820d3a31d86b8599f020d1a94 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -1,20 +1,25 @@ -{ stdenv, buildPythonPackage, fetchurl, python, - unittest2, scripttest, pytz, pylint, tempest-lib, mock, testtools, - pbr, tempita, decorator, sqlalchemy, six, sqlparse +{ stdenv, buildPythonPackage, fetchPypi, python +, unittest2, scripttest, pytz, pylint, mock +, testtools, pbr, tempita, decorator, sqlalchemy +, six, sqlparse, testrepository }: buildPythonPackage rec { pname = "sqlalchemy-migrate"; - name = "${pname}-${version}"; version = "0.11.0"; - src = fetchurl { - url = "mirror://pypi/s/sqlalchemy-migrate/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6"; }; - checkInputs = [ unittest2 scripttest pytz pylint mock testtools tempest-lib ]; + checkInputs = [ unittest2 scripttest pytz pylint mock testtools testrepository ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; + prePatch = '' + sed -i -e /tempest-lib/d \ + -e /testtools/d \ + test-requirements.txt + ''; checkPhase = '' export PATH=$PATH:$out/bin echo sqlite:///__tmp__ > test_db.cfg diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 9b3a5fa20396495e84a838fb1b1a39326a3cde24..6ac6fe21e4d2a7b7ccf2dead2f50a3c2ea4b550c 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytest_30 +, pytest , mock , pytest_xdist , isPy3k @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.1.15"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "8b79a5ed91cdcb5abe97b0045664c55c140aec09e5dd5c01303e23de5fe7a95a"; + sha256 = "7cb00cc9b9f92ef8b4391c8a2051f81eeafefe32d63c6b395fd51401e9a39edb"; }; checkInputs = [ - pytest_30 + pytest mock # Disable pytest_xdist tests for now, because our version seems to be too new. # pytest_xdist diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 2c85bdbe3d1caf343c54e019419c57ad92fe3bb1..d5c89aefef7ca013ff025372770a6d442f725e75 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.1.11"; + version = "1.2.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bb5297df9cd97316b3c7ca64f8e31cae5cc6b94c015afd84c546877f1f77d6e4"; + sha256 = "cb70fdedd8dc0a30cf361d8e5401a5b07fc75c13847b13567b98966be4e3d063"; }; # No tests in archive diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9ac04e18e4f6ce6bad98c824a237e36b4d58b122 --- /dev/null +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests, six +, backports_unittest-mock, pluggy, pytest, pytestrunner }: + +buildPythonPackage rec { + pname = "sseclient"; + version = "0.0.19"; + + src = fetchPypi { + inherit pname version; + sha256 = "7a2ea3f4c8525ae9a677bc8193df5db88e23bcaafcc34938a1ee665975703a9f"; + }; + + propagatedBuildInputs = [ requests six ]; + + checkInputs = [ backports_unittest-mock pytest pytestrunner ]; + + meta = with stdenv.lib; { + description = "Client library for reading Server Sent Event streams"; + homepage = https://github.com/btubbs/sseclient; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1df139ab29ce0361f4bd063aee5aff5caa664c3e --- /dev/null +++ b/pkgs/development/python-modules/stem/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, python, mock }: + +buildPythonPackage rec { + pname = "stem"; + version = "1.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp"; + }; + + postPatch = '' + rm test/unit/installation.py + sed -i "/test.unit.installation/d" test/settings.cfg + ''; + + checkInputs = [ mock ]; + + checkPhase = '' + touch .gitignore + ${python.interpreter} run_tests.py -u + ''; + + meta = with lib; { + description = "Controller library that allows applications to interact with Tor"; + homepage = https://stem.torproject.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ phreedom ]; + }; +} diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 1955320fd266db5fba2b1c40115c02c772668e93..9639ce9619480c841a579f99275a169623ef5165 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -1,18 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, oslosphinx, pbr, six, argparse }: +{ stdenv, buildPythonPackage, fetchPypi, pbr, six, argparse }: buildPythonPackage rec { pname = "stevedore"; - version = "1.27.1"; + version = "1.28.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "236468dae36707069e8b3bdb455e9f1be090b1e6b937f4ac0c56a538d6f50be0"; + sha256 = "f1c7518e7b160336040fee272174f1f7b29a46febb3632502a8f2055f973d60b"; }; doCheck = false; - buildInputs = [ oslosphinx ]; propagatedBuildInputs = [ pbr six argparse ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 7edfb9c4f0e6e70f6a5301f4fb8abca6718c2991..95da0ec9b4f8e1351de0ae9ac066642f31f802ee 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,10 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi -, unittest2, mock, requests }: +{ lib, buildPythonPackage, fetchPypi, isPy3k +, unittest2, mock, requests, simplejson }: buildPythonPackage rec { pname = "stripe"; - version = "1.70.0"; - name = "${pname}-${version}"; + version = "1.79.1"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -12,14 +11,14 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ee77103d2d18fe6369f23c40c93067425c5ed67e08b1a7678e681217e8fa8062"; + sha256 = "2ec19bf8ad588ec04b36c35f359196fa1991f9ad911b1686ac2a12651a154947"; }; - buildInputs = [ unittest2 mock ]; + checkInputs = [ unittest2 mock ]; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests ] ++ lib.optional (!isPy3k) simplejson; - meta = with stdenv.lib; { + meta = with lib; { description = "Stripe Python bindings"; homepage = https://github.com/stripe/stripe-python; license = licenses.mit; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4dc9c3c79bc9ee31c3b9347225a5fc53f275dc61 --- /dev/null +++ b/pkgs/development/python-modules/structlog/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, pytest +, pretend +, freezegun +, simplejson +}: + +buildPythonPackage rec { + pname = "structlog"; + version = "17.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6980001045abd235fa12582222627c19b89109e58b85eb77d5a5abc778df6e20"; + }; + + patches = [ + # Fix tests for pytest 3.3 + (fetchpatch { + url = "https://github.com/hynek/structlog/commit/22f0ae50607a0cb024361599f84610ce290deb99.patch"; + sha256 = "03622i13ammkpyrdk48kimbz94gbkpcmdpy0kj2z09m1kp6q2ljv"; + }) + ]; + + checkInputs = [ pytest pretend freezegun ]; + propagatedBuildInputs = [ simplejson ]; + + checkPhase = '' + rm tests/test_twisted.py* + py.test + ''; + + meta = { + description = "Painless structural logging"; + homepage = http://www.structlog.org/; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index 5b98aa3415b2e2966e32241cc723523edf408a3d..f73aba0a5f9a7e7b28438731339b2f20297c5897 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -2,20 +2,26 @@ , buildPythonPackage , fetchPypi , supervise +, isPy3k +, whichcraft }: buildPythonPackage rec { pname = "supervise_api"; - version = "0.1.5"; + version = "0.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1pqqlw80cjdgrlpvdmydkyhsrr4s531mn6bfkshm68j9gk4kq6px"; + sha256 = "029h1mlfhkm9lw043rawh24ld8md620y94k6c1l9hs5vvyq4fs84"; }; - propagatedBuildInputs = [ supervise ]; + propagatedBuildInputs = [ + supervise + ] ++ lib.optionals ( !isPy3k ) [ + whichcraft + ]; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..04031fcbc100cf17a10c9468d622cf2d9bc0d701 --- /dev/null +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "svg.path"; + version = "2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "08kp03i4yiqdkz7a7l7d7kzszahmhigrml2502zi1ybndrh7ayxw"; + }; + + meta = with stdenv.lib; { + description = "SVG path objects and parser"; + homepage = https://github.com/regebro/svg.path; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix index df27172d8d492c4411a8ea39cee676f54d38a69b..51c80e0fa910954f100cf6a31d250ae34e636559 100644 --- a/pkgs/development/python-modules/sybase/default.nix +++ b/pkgs/development/python-modules/sybase/default.nix @@ -6,8 +6,9 @@ }: buildPythonPackage rec { - name = "python-sybase-${version}"; + pname = "python-sybase"; version = "0.40pre2"; + name = pname + "-" + version; disabled = isPy3k; src = fetchurl { diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index b1fe22df476763310b9f049cb91e944c08449c5d..6930cb2a559f071ebd16e1342bac63d0307f07b4 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.0.5"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "0x8qd5p5qliv8wmdglda2iy3f70i4jg8zqyk8yhklm5hrxm8jdl6"; + sha256 = "1e17e10bac4c56ef5b6752866a7d100f5ae856ff97d805c4d6cac73be80863d3"; }; checkInputs = [ pytest nose ]; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..67c799e554ebd818ae621f01007e3a95a45be8ec --- /dev/null +++ b/pkgs/development/python-modules/sympy/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +, mpmath +}: + +buildPythonPackage rec { + pname = "sympy"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4"; + }; + + checkInputs = [ glibcLocales ]; + + propagatedBuildInputs = [ mpmath ]; + + # Bunch of failures including transients. + doCheck = false; + + preCheck = '' + export LANG="en_US.UTF-8" + ''; + + meta = { + description = "A Python library for symbolic mathematics"; + homepage = http://www.sympy.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lovek323 ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e050bcf54043493a3e69888d1525c27d13104d7a --- /dev/null +++ b/pkgs/development/python-modules/syncserver/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, isPy27 +, unittest2 +, cornice +, gunicorn +, pyramid +, requests +, simplejson +, sqlalchemy +, mozsvc +, tokenserver +, serversyncstorage +, configparser +}: + +buildPythonPackage rec { + name = "syncserver-${version}"; + version = "1.6.0"; + disabled = ! isPy27; + + src = fetchgit { + url = https://github.com/mozilla-services/syncserver.git; + rev = "refs/tags/${version}"; + sha256 = "1fsiwihgq3z5b5kmssxxil5g2abfvsf6wfikzyvi4sy8hnym77mb"; + }; + + buildInputs = [ unittest2 ]; + propagatedBuildInputs = [ + cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver + serversyncstorage configparser + ]; + + meta = { + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index 4786e7eb7e185d23b9378f61d74a79731ba289a7..ec5b3b325dd2f42cf6c7d3f4b02b8877b48508ad 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -1,8 +1,9 @@ { stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }: buildPythonPackage rec { - name = "python-systemd-${version}"; + pname = "systemd"; version = "234"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "systemd"; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9f1bf2390b6a8c9b30940c0e4f99f23d4b013ad1 --- /dev/null +++ b/pkgs/development/python-modules/tablib/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, stdenv, fetchPypi, pytest, unicodecsv, pandas +, xlwt, openpyxl, pyyaml, xlrd, odfpy, fetchpatch +}: + +buildPythonPackage rec { + pname = "tablib"; + version = "0.12.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "11wxchj0qz77dn79yiq30k4b4gsm429f4bizk4lm4rb63nk51kxq"; + }; + + checkInputs = [ pytest unicodecsv pandas ]; + propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; + + patches = [ + (fetchpatch { + url = "https://github.com/kennethreitz/tablib/commit/0e51a2d0944022af186d2dcd34c0ab3c47141ba5.patch"; + sha256 = "0lbbl871zdn5vpgqyjkil0c2ap3b5hz19rmihhyvrx7m4mlh1aij"; + }) + ]; + + meta = with stdenv.lib; { + description = "Tablib: format-agnostic tabular dataset library"; + homepage = http://python-tablib.org; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 9ddc2a0e08b347d0893ec9a9472b1255fa8628dc..b238d58f68d31dde61d51155827de303d0d5eb48 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,13 +5,12 @@ }: buildPythonPackage rec { - version = "0.7.7"; + version = "0.8.2"; pname = "tabulate"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; + sha256 = "e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2"; }; checkInputs = [ nose ]; @@ -25,4 +24,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..37091da1b499069ec88c0c92f7188e24877f583d --- /dev/null +++ b/pkgs/development/python-modules/tblib/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "tblib"; + version = "1.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "436e4200e63d92316551179dc540906652878df4ff39b43db30fcf6400444fe7"; + }; + + meta = with stdenv.lib; { + description = "Traceback fiddling library. Allows you to pickle tracebacks."; + homepage = https://github.com/ionelmc/python-tblib; + license = licenses.bsd2; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 9f48b8fb971ab92ec8daf35e39a2449ee3bb18d8..f0b4e6f341d4a6bc639a038cbc73c44d51265228 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -1,22 +1,19 @@ -{ stdenv -, fetchPypi -, buildPythonPackage -, isPy3k +{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k , bleach_1_5_0 , numpy , werkzeug , protobuf , markdown +, futures }: -# tensorflow is built from a downloaded wheel, because the upstream -# project's build system is an arcane beast based on -# bazel. Untangling it and building the wheel from source is an open -# problem. +# tensorflow is built from a downloaded wheel, because +# https://github.com/tensorflow/tensorboard/issues/719 +# blocks buildBazelPackage. buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "0.1.5"; + version = "1.5.1"; name = "${pname}-${version}"; format = "wheel"; @@ -26,16 +23,16 @@ buildPythonPackage rec { format = "wheel"; } // (if isPy3k then { python = "py3"; - sha256 = "0sfia05y1mzgy371faj96vgzhag1rgpa3gnbz9w1fay13jryw26x"; + sha256 = "1cydgvrr0s05xqz1v9z2wdiv60gzbs8wv9wvbflw5700a2llb63l"; } else { python = "py2"; - sha256 = "0qx4f55zp54x079kxir4zz5b1ckiglsdcb9afz5wcdj6af4a6czg"; + sha256 = "0dhljddlirq6nr84zg4yrk5k69gj3x2abb6wg3crgrparb6qbya7"; })); - propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown ]; + propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown ] ++ lib.optional (!isPy3k) futures; meta = with stdenv.lib; { - description = "TensorFlow helps the tensors flow"; + description = "TensorFlow's Visualization Toolkit"; homepage = http://tensorflow.org; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix new file mode 100644 index 0000000000000000000000000000000000000000..c9b89ff7616a54081684ce73327db0571a397321 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchurl +, buildPythonPackage +, isPy3k, isPy36, pythonOlder +, numpy +, six +, protobuf +, absl-py +, mock +, backports_weakref +, enum34 +, tensorflow-tensorboard +, cudaSupport ? false +}: + +# tensorflow is built from a downloaded wheel because the source +# build doesn't yet work on Darwin. + +buildPythonPackage rec { + pname = "tensorflow"; + version = "1.5.0"; + format = "wheel"; + + src = fetchurl { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py3-none-any.whl"; + sha256 = "1mapv45n9wmgcq3i3im0pv0gmhwkxw5z69nsnxb1gfxbj1mz5h9m"; + }; + + propagatedBuildInputs = [ numpy six protobuf absl-py ] + ++ lib.optional (!isPy3k) mock + ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ] + ++ lib.optional (pythonOlder "3.6") tensorflow-tensorboard; + + # tensorflow depends on tensorflow_tensorboard, which cannot be + # built at the moment (some of its dependencies do not build + # [htlm5lib9999999 (seven nines) -> tensorboard], and it depends on an old version of + # bleach) Hence we disable dependency checking for now. + installFlags = lib.optional isPy36 "--no-dependencies"; + + meta = with stdenv.lib; { + description = "Computation using data flow graphs for scalable machine learning"; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ jyp abbradar ]; + platforms = platforms.darwin; + # Python 2.7 build uses different string encoding. + # See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253 + broken = cudaSupport || !isPy3k; + }; +} diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 2ce419fa7fb6154ff7958c1483b3e6509af73041..8d2d6fa9c14c181cab25de5a567ea5506830a585 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,10 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, symlinkJoin, buildPythonPackage, isPy3k, pythonOlder -, bazel, which, swig, binutils, glibcLocales +{ stdenv, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +, buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast +, which, swig, binutils, glibcLocales , python, jemalloc, openmpi -, numpy, six, protobuf, tensorflow-tensorboard, backports_weakref -, wheel, mock, scipy -, xlaSupport ? true +, numpy, six, protobuf, tensorflow-tensorboard, backports_weakref, mock, enum34, absl-py , cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null +# XLA without CUDA is broken +, xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] , sse42Support ? false @@ -12,7 +13,8 @@ , fmaSupport ? false }: -assert cudaSupport -> cudatoolkit != null +assert cudaSupport -> nvidia_x11 != null + && cudatoolkit != null && cudnn != null; # unsupported combination @@ -27,40 +29,49 @@ let paths = [ cudatoolkit.out cudatoolkit.lib ]; }; - cudaLibPath = lib.makeLibraryPath [ cudatoolkit.out cudatoolkit.lib nvidia_x11 cudnn ]; - tfFeature = x: if x then "1" else "0"; - common = rec { - version = "1.3.1"; + version = "1.5.0"; + + pkg = buildBazelPackage rec { + name = "tensorflow-build-${version}"; src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "0gvi32dvv4ynr05p0gg5i0a6c55pig48k5qm7zslcqnp4sifwx0i"; + sha256 = "1c4djsaip901nasm7a6dsimr02bsv70a7b1g0kysb4n39qpdh22q"; }; - nativeBuildInputs = [ swig which wheel scipy ]; + patches = [ + # Fix build with Bazel >= 0.10 + (fetchpatch { + url = "https://github.com/tensorflow/tensorflow/commit/6fcfab770c2672e2250e0f5686b9545d99eb7b2b.patch"; + sha256 = "0p61za1mx3a7gj1s5lsps16fcw18iwnvq2b46v1kyqfgq77a12vb"; + }) + (fetchpatch { + url = "https://github.com/tensorflow/tensorflow/commit/3f57956725b553d196974c9ad31badeb3eabf8bb.patch"; + sha256 = "11dja5gqy0qw27sc9b6yw9r0lfk8dznb32vrqqfcnypk2qmv26va"; + }) + ]; - buildInputs = [ python jemalloc openmpi glibcLocales ] - ++ lib.optionals cudaSupport [ cudatoolkit cudnn ]; + nativeBuildInputs = [ swig which ]; - propagatedBuildInputs = [ numpy six protobuf ] - ++ lib.optional (!isPy3k) mock - ++ lib.optional (pythonOlder "3.4") backports_weakref - ++ lib.optional withTensorboard tensorflow-tensorboard; + buildInputs = [ python jemalloc openmpi glibcLocales numpy ] + ++ lib.optionals cudaSupport [ cudatoolkit cudnn nvidia_x11 ]; preConfigure = '' patchShebangs configure - export HOME="$NIX_BUILD_TOP" export PYTHON_BIN_PATH="${python.interpreter}" + export PYTHON_LIB_PATH="$NIX_BUILD_TOP/site-packages" export TF_NEED_GCP=1 export TF_NEED_HDFS=1 - export TF_NEED_CUDA=${tfFeature cudaSupport} - export TF_NEED_MPI=1 export TF_ENABLE_XLA=${tfFeature xlaSupport} + export CC_OPT_FLAGS=" " + # https://github.com/tensorflow/tensorflow/issues/14454 + export TF_NEED_MPI=${tfFeature cudaSupport} + export TF_NEED_CUDA=${tfFeature cudaSupport} ${lib.optionalString cudaSupport '' export CUDA_TOOLKIT_PATH=${cudatoolkit_joined} export TF_CUDA_VERSION=${cudatoolkit.majorVersion} @@ -70,13 +81,11 @@ let export TF_CUDA_COMPUTE_CAPABILITIES=${lib.concatStringsSep "," cudaCapabilities} ''} - # There is _no_ non-interactive mode of configure. - sed -i \ - -e 's,read -p,echo,g' \ - -e 's,lib64,lib,g' \ - configure + mkdir -p "$PYTHON_LIB_PATH" ''; + NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcublas" "-lcudnn" "-lcuda" "-lcudart" ]; + hardeningDisable = [ "all" ]; bazelFlags = [ "--config=opt" ] @@ -87,99 +96,60 @@ let bazelTarget = "//tensorflow/tools/pip_package:build_pip_package"; - meta = with stdenv.lib; { - description = "Computation using data flow graphs for scalable machine learning"; - homepage = "http://tensorflow.org"; - license = licenses.asl20; - maintainers = with maintainers; [ jyp abbradar ]; - platforms = with platforms; if cudaSupport then linux else linux ++ darwin; - }; - }; - -in buildPythonPackage (common // { - name = "tensorflow-${common.version}"; - - deps = stdenv.mkDerivation (common // { - name = "tensorflow-external-${common.version}"; + fetchAttrs = { + preInstall = '' + rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*} + ''; - nativeBuildInputs = common.nativeBuildInputs ++ [ bazel ]; - - preConfigure = common.preConfigure + '' - export PYTHON_LIB_PATH="$(pwd)/site-packages" - ''; - - buildPhase = '' - mkdir site-packages - bazel --output_base="$(pwd)/output" fetch $bazelFlags $bazelTarget - ''; + sha256 = "1nc98aqrp14q7llypcwaa0kdn9xi7r0p1mnd3vmmn1m299py33ca"; + }; - installPhase = '' - rm -rf output/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*} - # Patching markers to make them deterministic - for i in output/external/\@*.marker; do - sed -i 's, -\?[0-9][0-9]*$, 1,' "$i" - done - # Patching symlinks to remove build directory reference - find output/external -type l | while read symlink; do - ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink" - done - - cp -r output/external $out - ''; + buildAttrs = { + preBuild = '' + patchShebangs . + find -type f -name CROSSTOOL\* -exec sed -i \ + -e 's,/usr/bin/ar,${binutils.bintools}/bin/ar,g' \ + {} \; + ''; + + installPhase = '' + sed -i 's,.*bdist_wheel.*,cp -rL . "$out"; exit 0,' bazel-bin/tensorflow/tools/pip_package/build_pip_package + bazel-bin/tensorflow/tools/pip_package/build_pip_package $PWD/dist + ''; + }; dontFixup = true; + }; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "0xs2n061gnpizfcnhs5jjpfk2av634j1l2l17zhy10bbmrwn3vrp"; - }); - - nativeBuildInputs = common.nativeBuildInputs ++ [ (bazel.override { enableNixHacks = true; }) ]; - - configurePhase = '' - runHook preConfigure - export PYTHON_LIB_PATH="$out/${python.sitePackages}" - ./configure - runHook postConfigure - ''; - - buildPhase = '' - mkdir -p output/external - cp -r $deps/* output/external - chmod -R +w output - find output -type l | while read symlink; do - ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" - done - - patchShebangs . - find -type f -name CROSSTOOL\* -exec sed -i \ - -e 's,/usr/bin/ar,${binutils}/bin/ar,g' \ - {} \; - - mkdir -p $out/${python.sitePackages} - bazel --output_base="$(pwd)/output" build $bazelFlags $bazelTarget +in buildPythonPackage rec { + pname = "tensorflow"; + inherit version; + name = "${pname}-${version}"; - bazel-bin/tensorflow/tools/pip_package/build_pip_package $PWD/dist - ''; + src = pkg; - # tensorflow depends on tensorflow_tensorboard, which cannot be - # built at the moment (some of its dependencies do not build - # [htlm5lib9999999 (seven nines) -> tensorboard], and it depends on an old version of - # bleach) Hence we disable dependency checking for now. installFlags = lib.optional (!withTensorboard) "--no-dependencies"; - # Tests are slow and impure. - doCheck = false; - - # For some reason, CUDA is not retained in RPATH. - postFixup = lib.optionalString cudaSupport '' - libPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so" - patchelf --set-rpath "$(patchelf --print-rpath "$libPath"):${cudaLibPath}" "$libPath" + postPatch = lib.optionalString (pythonAtLeast "3.4") '' + sed -i '/enum34/d' setup.py ''; - doInstallCheck = true; - installCheckPhase = '' - cd $NIX_BUILD_TOP + propagatedBuildInputs = [ numpy six protobuf absl-py ] + ++ lib.optional (!isPy3k) mock + ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ] + ++ lib.optional withTensorboard tensorflow-tensorboard; + + # Actual tests are slow and impure. + checkPhase = '' ${python.interpreter} -c "import tensorflow" ''; -}) + + meta = with stdenv.lib; { + description = "Computation using data flow graphs for scalable machine learning"; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ jyp abbradar ]; + platforms = platforms.linux; + broken = !(xlaSupport -> cudaSupport); + }; +} diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7ebd2f1c967ac3f3262973c2a20bae607bb55317 --- /dev/null +++ b/pkgs/development/python-modules/terminado/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ptyprocess +, tornado +}: + +buildPythonPackage rec { + pname = "terminado"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yh69k6579g848rmjyllb5h75pkvgcy27r1l3yzgkf33wnnzkasm"; + }; + + propagatedBuildInputs = [ ptyprocess tornado ]; + + meta = with lib; { + description = "Terminals served by Tornado websockets"; + homepage = https://github.com/jupyter/terminado; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/termstyle/default.nix b/pkgs/development/python-modules/termstyle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0a1c4e764129cbd89c43f14fe089c48be4576e1e --- /dev/null +++ b/pkgs/development/python-modules/termstyle/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "termstyle"; + version = "0.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "ef74b83698ea014112040cf32b1a093c1ab3d91c4dd18ecc03ec178fd99c9f9f"; + }; + + # Only manual tests + doCheck = false; + + meta = with lib; { + description = "Console colouring for python"; + homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10"; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 23b5a5aa9e26122926da370733f4ecc495d65cf6..55631f291c74935d96a1b9cb53cf2eef7cf46fb7 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "5.3.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1xfar653qmikwb94xj3f0xfp8dh2llxjsxipx1272d8qwl0aknnx"; + sha256 = "f6c4cf24d043f9d8e9a9337371ec1d2f6638a0032504bd67dbd724224fd64969"; }; checkInputs = [ mock manuel pytest sybil zope_component ]; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index e786cb8432962f21bd060199cbd5aedb4a68d926..1a99378a541ba6b880d6a83974581539a11f3b1b 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -4,38 +4,35 @@ , pbr , python_mimeparse , extras -, lxml , unittest2 , traceback2 -, isPy3k -, fixtures -, pyrsistent +, testscenarios }: -# testtools 2.0.0 and up has a circular run-time dependency on futures - buildPythonPackage rec { pname = "testtools"; - version = "1.9.0"; - name = "${pname}-${version}"; - - # Python 2 only judging from SyntaxError -# disabled = isPy3k; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644"; + sha256 = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559"; }; - propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ]; + propagatedBuildInputs = [ pbr python_mimeparse extras unittest2 ]; buildInputs = [ traceback2 ]; - # No tests in archive + # testscenarios has a circular dependency on testtools doCheck = false; + checkInputs = [ testscenarios ]; + + # testtools 2.0.0 and up has a circular run-time dependency on futures + postPatch = '' + substituteInPlace requirements.txt --replace "fixtures>=1.3.0" "" + ''; meta = { description = "A set of extensions to the Python standard library's unit testing framework"; homepage = https://pypi.python.org/pypi/testtools; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..94aebc59512330411f2deb03afbf62097aa2836a --- /dev/null +++ b/pkgs/development/python-modules/text-unidecode/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "text-unidecode"; + version = "1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "5a1375bb2ba7968740508ae38d92e1f889a0832913cb1c447d5e2046061a396d"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "The most basic Text::Unidecode port"; + homepage = https://github.com/kmike/text-unidecode; + license = licenses.artistic1; + }; +} diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 1647b837d97608df6a8eeb3d539232875aedd517..47b8b04c4f6adf3a66df2d470fa072ab3d7c58ca 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "textacy"; - version = "0.4.1"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "04wf3a7zgzz83nmgkh488wkl50zm9yfdpv3sl12sm2zj685plqcz"; + sha256 = "70ebd8f6536c1536132c997988a4f27731a2db5a7ca7bab29fb33746b444959f"; }; disabled = isPy27; # 2.7 requires backports.csv diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fc97297c0106bab2fcd3120efaa493b1f0d44909 --- /dev/null +++ b/pkgs/development/python-modules/texttable/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "texttable"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "c89dc0148ae29645917aab7e970a30d1af565b3ca276cef8ab1a60469f0d8100"; + }; + + meta = { + description = "A module to generate a formatted text table, using ASCII characters"; + homepage = http://foutaise.org/code/; + license = lib.licenses.lgpl2; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e4ed824d2302c4c8d126ea7150dc610f9da90ebd --- /dev/null +++ b/pkgs/development/python-modules/thespian/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, lib }: + +buildPythonPackage rec { + version = "3.9.2"; + pname = "thespian"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "aec9793fecf45bb91fe919dc61b5c48a4aadfb9f94b06cd92883df7952eacf95"; + }; + + # Do not run the test suite: it takes a long time and uses + # significant system resources, including requiring localhost + # network operations. Thespian tests are performed via its Travis + # CI configuration and do not need to be duplicated here. + doCheck = false; + + meta = with lib; { + description = "Python Actor concurrency library"; + homepage = http://thespianpy.com/; + license = licenses.mit; + maintainers = [ maintainers.kquick ]; + }; +} diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 817ea6388f953dc88c1d8b5162650f89b136ee02..62e0d28959a222c58c7df22366f65102567aa537 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -1,15 +1,19 @@ { stdenv +, lib , pkgs , buildPythonPackage , fetchPypi -, fetchFromGitHub +, pythonOlder , pytest , cython , cymem +, msgpack-numpy +, msgpack-python , preshed , numpy , python , murmurhash +, pathlib , hypothesis , tqdm , cytoolz @@ -21,35 +25,26 @@ , dill }: -let - enableDebugging = true; +buildPythonPackage rec { + pname = "thinc"; + version = "6.10.2"; - pathlibLocked = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pathlib"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; - }; - - doCheck = false; # fails to import support from test + src = fetchPypi { + inherit pname version; + sha256 = "0xia81wvfrhyriywab184s49g8rpl42vcf5fy3x6xxw50a2yn7cs"; }; -in buildPythonPackage rec { - name = "thinc-${version}"; - version = "6.5.1"; - src = fetchFromGitHub { - owner = "explosion"; - repo = "thinc"; - rev = "v${version}"; - sha256 = "008kmjsvanh6qgnpvsn3qacfcyprxirxbw4yfd8flyg7mxw793ws"; - }; + postPatch = '' + substituteInPlace setup.py \ + --replace "msgpack-python==" "msgpack-python>=" \ + --replace "msgpack-numpy==" "msgpack-numpy>=" + ''; propagatedBuildInputs = [ cython cymem + msgpack-numpy + msgpack-python preshed numpy murmurhash @@ -63,22 +58,34 @@ in buildPythonPackage rec { termcolor wrapt dill - pathlibLocked + ] ++ lib.optional (pythonOlder "3.4") pathlib; + + + checkInputs = [ + pytest ]; + prePatch = '' + substituteInPlace setup.py --replace \ + "'pathlib>=1.0.0,<2.0.0'," \ + "\"pathlib>=1.0.0,<2.0.0; python_version<'3.4'\"," + + substituteInPlace setup.py --replace \ + "'cytoolz>=0.8,<0.9'," \ + "'cytoolz>=0.8'," + ''; + + # Cannot find cython modules. doCheck = false; - - # fails to import some modules - # checkPhase = '' - # ${python.interpreter} -m pytest thinc/tests - # # cd thinc/tests - # # ${python.interpreter} -m unittest discover -p "*test*" - # ''; - + + checkPhase = '' + pytest thinc/tests + ''; + meta = with stdenv.lib; { description = "Practical Machine Learning for NLP in Python"; homepage = https://github.com/explosion/thinc; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; + maintainers = with maintainers; [ aborsu sdll ]; }; } diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..94261b10e3d05a974a1a7c3164a00c49ca697656 --- /dev/null +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -0,0 +1,56 @@ +{ buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz +, pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors +, piexif, futures, statsd, thumborPexif, fetchPypi, fetchpatch, isPy3k, lib +}: + +buildPythonPackage rec { + pname = "thumbor"; + version = "6.4.2"; + + disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004 + + src = fetchPypi { + inherit pname version; + sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch"; + sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc"; + }) + ]; + + postPatch = '' + substituteInPlace "setup.py" \ + --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''} + ''; + + propagatedBuildInputs = [ + tornado + pycrypto + pycurl + pytz + pillow + derpconf + python_magic + pexif + libthumbor + opencv + webcolors + piexif + statsd + ] ++ lib.optionals (!isPy3k) [ futures thumborPexif ]; + + # disabled due to too many impure tests and issues with native modules in + # the pure testing environment. See https://github.com/NixOS/nixpkgs/pull/37147 + # for further reference. + doCheck = false; + + meta = with stdenv.lib; { + description = "A smart imaging service"; + homepage = https://github.com/thumbor/thumbor/wiki; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6e1baf2f2e950a2dac9d11c4eabac6003507cdfc --- /dev/null +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pythonOlder +, numpy, nose, enum34, futures }: + +buildPythonPackage rec { + pname = "tifffile"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "eff44f71782dce38c604921a1b29ddad0d007ac9871d66e9c872fd6fc311334e"; + }; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests --exe -v --exclude="test_extension" + ''; + + propagatedBuildInputs = [ numpy ] + ++ lib.optional isPy27 futures + ++ lib.optional (pythonOlder "3.0") enum34; + + meta = with stdenv.lib; { + description = "Read and write image data from and to TIFF files."; + homepage = https://github.com/blink1073/tifffile; + maintainers = [ maintainers.lebastr ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6d0ee30bbb48686326508da4d846674d228d6fd2 --- /dev/null +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, webencodings, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: + +buildPythonPackage rec { + pname = "tinycss2"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "7c53c2c0e914c7711c295b3101bcc78e0b7eda23ff20228a936efe11cdcc7136"; + }; + + propagatedBuildInputs = [ webencodings ]; + + checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; + + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { + description = "Low-level CSS parser for Python"; + homepage = https://github.com/Kozea/tinycss2; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index c0056eb66b3b19dc9723afe35e83a8fab35833e2..6161b0492be68a2f7ed79a94d7a2eadf9ae7f48e 100644 --- a/pkgs/development/python-modules/tiros/default.nix +++ b/pkgs/development/python-modules/tiros/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tiros"; name = "${pname}-${version}"; - version = "1.0.39"; + version = "1.0.44"; src = fetchPypi { inherit pname version; - sha256 = "10wh84lpl7k8i69hlxwrzp2lln63w2afv9l7ij7r3lqjwd0z0skr"; + sha256 = "d6bf7410967554ec283f9d4eabc0ce6821d6e6d36001afbdb7fe0826423d4f37"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d6929caf2bd3f32e6d1d589ca62010384cbe6d2a --- /dev/null +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -0,0 +1,21 @@ +{buildPythonPackage, lib, nose, fetchPypi}: + +buildPythonPackage rec { + pname = "titlecase"; + name = "${pname}-${version}"; + version = "0.12.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0486i99wf8ssa7sgn81fn6fv6i4rhhq6n751bc740b3hzfbpmpl4"; + }; + + checkInputs = [ nose ]; + + meta = { + homepage = https://github.com/ppannuto/python-titlecase; + description = "Python Port of John Gruber's titlecase.pl"; + license = lib.licenses.mit; + }; +} + diff --git a/pkgs/development/python-modules/tmdb3/default.nix b/pkgs/development/python-modules/tmdb3/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..87b62cd78ac113b53691a71fce581ed7b23e8244 --- /dev/null +++ b/pkgs/development/python-modules/tmdb3/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "tmdb3"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "9b6e043b8a65d159e7fc8f720badc7ffee5109296e38676c107454e03a895983"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib; { + description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information"; + homepage = https://pypi.python.org/pypi/tmdb3; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..af7acbc0218e776994e08691bc73ac04dec3d38b --- /dev/null +++ b/pkgs/development/python-modules/tokenserver/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, testfixtures +, cornice +, mozsvc +, pybrowserid +, tokenlib +, pymysql +, umemcache +, hawkauthlib +, alembic +, pymysqlsa +, paste +, boto +}: + +buildPythonPackage rec { + name = "tokenserver-${version}"; + version = "1.2.27"; + + src = fetchgit { + url = https://github.com/mozilla-services/tokenserver.git; + rev = "refs/tags/${version}"; + sha256 = "0il3bgjld495g9gxvvrm56kpan5swaizzg216qz3zxmb6w9ly3fm"; + }; + + doCheck = false; + buildInputs = [ testfixtures ]; + propagatedBuildInputs = [ cornice mozsvc pybrowserid tokenlib + pymysql umemcache hawkauthlib alembic pymysqlsa paste boto ]; + + meta = { + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a80657dc4b45c63f1ee398cebabc43c1cb2f5a71 --- /dev/null +++ b/pkgs/development/python-modules/toml/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "toml"; + version = "0.9.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bdbpbip67wdm6c7xwc6mmbmskyradj4cdxn1iibj4fcx1nbv1lf"; + }; + + # This package has a test script (built for Travis) that involves a) + # looking in the home directory for a binary test runner and b) using + # git to download a test suite. + doCheck = false; + + meta = with stdenv.lib; { + description = "a Python library for parsing and creating TOML"; + homepage = "https://github.com/uiri/toml"; + license = licenses.mit; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 36b85bce3acd5838acf6e41b123d7d0252bc0a89..0fc14024903e9c4a5c8b662cf291f1156d4ef822 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec{ pname = "toolz"; - version = "0.8.2"; + version = "0.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; + sha256 = "929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index bc39745945d9e5e361c956be1d76118ff880dc89..37b1c7bcf5cb7d7f3bde19951245ad0fbc78e0ad 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -6,14 +6,18 @@ , backports_ssl_match_hostname , certifi , singledispatch +, pythonOlder +, futures }: buildPythonPackage rec { pname = "tornado"; - version = "4.5.2"; - name = "${pname}-${version}"; + version = "5.0.2"; - propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; + + propagatedBuildInputs = [ backports_abc certifi singledispatch ] + ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname + ++ lib.optional (pythonOlder "3.2") futures; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 @@ -23,6 +27,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1fb8e494cd46c674d86fac5885a3ff87b0e283937a47d74eb3c02a48c9e89ad0"; + sha256 = "1b83d5c10550f2653380b4c77331d6f8850f287c4f67d7ce1e1c639d9222fbc7"; + }; + + meta = { + description = "A web framework and asynchronous networking library"; + homepage = http://www.tornadoweb.org/; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..359f13e2a00bfdbe970621b5de29465e0f13bca0 --- /dev/null +++ b/pkgs/development/python-modules/tox/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, py +, virtualenv +, pluggy +, setuptools_scm +, six +}: + +buildPythonPackage rec { + pname = "tox"; + version = "3.0.0"; + + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ py virtualenv pluggy six ]; + + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "96efa09710a3daeeb845561ebbe1497641d9cef2ee0aea30db6969058b2bda2f"; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 95039cc591fc430c9fee1d9a7e537e595fa9c097..23ad1bc2624dd0ca0d1f0fc19829dfc69363e552 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,16 +11,22 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.19.4"; + version = "4.21.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7ca803c2ea268c6bdb541e2dac74a3af23cf4bf7b4132a6a78926d255f8c8df1"; + sha256 = "b94af236084ceaad93a6ada00bd9976900b172ec9b821828ed0d4b53f7431170"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; + postPatch = '' + # Remove performance testing. + # Too sensitive for on Hydra. + rm tqdm/tests/tests_perf.py + ''; + LC_ALL="en_US.UTF-8"; meta = { diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 34c22132428386101eb05e8efdbed398bd78e2bf..afb35b579731b9b6c49797736dbe1cd72bd5c5cf 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "transaction"; - version = "2.1.2"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1mab0r3grmgz9d97y8pynhg0r34v0am35vpxyvh7ff5sgmg3dg5r"; + sha256 = "f2242070e437e5d555ea3df809cb517860513254c828f33847df1c5e4b776c7a"; }; propagatedBuildInputs = [ zope_interface mock ]; diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..edf13782b078eb2c5a15d99e06ea31937d6f57df --- /dev/null +++ b/pkgs/development/python-modules/transitions/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, six, nose, mock, dill, pycodestyle }: + +buildPythonPackage rec { + pname = "transitions"; + version = "0.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ikxsjg7vil0yhiwhiimnjzcb1ig6g6g79sdhs9v8rnrszk1mi2n"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "dill<0.2.7" dill + ''; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ nose mock dill pycodestyle ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pytransitions/transitions; + description = "A lightweight, object-oriented finite state machine implementation in Python"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index cb4b63ade81d1c2985233b81b0420ae194b0b0d0..3a6b5f62e4f57541e14f5e4ede55daa20ab79708 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,20 +1,18 @@ -{ lib, fetchPypi, buildPythonPackage, protobuf, hidapi, ecdsa, mnemonic -, requests +{ lib, fetchPypi, buildPythonPackage, + protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "trezor"; - version = "0.7.16"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314"; + sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4"; }; - propagatedBuildInputs = [ protobuf hidapi requests mnemonic ]; - - buildInputs = [ ecdsa ]; + propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 rlp ]; # There are no actual tests: "ImportError: No module named tests" doCheck = false; diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index ef367c3525d307c35ad2427d4451fa7461b08120..7b61633a7fc7826b80c4ded2dc5416aa1c78804e 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ mock ]; - propagatedBuildInputs = lib.optional (isPy27 || isPyPy) [ futures ]; + propagatedBuildInputs = lib.optionals (isPy27 || isPyPy) [ futures ]; patches = [ ./tests.patch diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..767bb21f0fd4b07beca40007f6bde210047edfa0 --- /dev/null +++ b/pkgs/development/python-modules/tunigo/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, responses, pytest }: + +buildPythonPackage rec { + pname = "tunigo"; + version = "1.0.0"; + + propagatedBuildInputs = [ requests ]; + + src = fetchFromGitHub { + owner = "trygveaa"; + repo = "python-tunigo"; + rev = "v${version}"; + sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs"; + }; + + checkInputs = [ mock responses pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Python API for the browse feature of Spotify"; + homepage = https://github.com/trygveaa/python-tunigo; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index faca6edace5e10fba0daa40f1873f3af99259444..5a32a64c2962508f4e6721b78998e04221740b1d 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -4,8 +4,6 @@ buildPythonPackage rec { pname = "twilio"; version = "6.8.0"; - name = "${pname}-${version}"; - # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index a3f0df8ca2ce8870b4069c806a35a26b2431fd8a..63f8c3b90554b6b4bd8020f52604d6feafe336c4 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Collection of utilities for interacting with PyPI"; homepage = https://github.com/pypa/twine; license = lib.licenses.asl20; - maintainer = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index b4662c640a35317b9583fbe5c7ce6e8c0f42d19e..4abd97d24362f090282c83f2db3b6b16b9187554 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,27 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "txaio"; - version = "2.8.2"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "484cd6c4cdd3f6081b87188f3b2b9a36e02fba6816e8256917c4f6571b567571"; + sha256 = "dfc3a7d04b4b484ae5ff241affab5bb01306b1e950dd6f54fd036cfca94345d0"; }; - buildInputs = [ pytest mock ]; + checkInputs = [ 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)" + py.test -k "not test_sdist" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 60947bc769c7c373f26a2c2e985c2a1516189ec4..09004e9337a0e10a862beeff255f08f7a4814427 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -3,9 +3,8 @@ , GeoIP}: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "txtorcon"; - version = "0.19.3"; + version = "0.20.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -16,18 +15,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1za4qag4g2lbw695v4ssxqc2aspdyknnbn2diylwg8q9g5k9cczp"; + sha256 = "dc80cb76b3ddacef6d671c0a088cb1a45274c0858554c32ce55d0f41421c740e"; }; - # ipaddress isn't required for Python 3 although it's in requirements.txt. - # Because ipaddress doesn't install on Python 3, remove the requirement so the - # installation of this package doesn't fail on Python 3. - postPatch = "" + lib.optionalString isPy3k '' - substituteInPlace requirements.txt --replace "ipaddress>=1.0.16" "" - ''; - + # Skip a failing test until fixed upstream: + # https://github.com/meejah/txtorcon/issues/250 checkPhase = '' - pytest . + pytest --ignore=test/test_util.py . ''; meta = { diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index b441ad8052c084ffec972b2907e1705e56709f2f..0af8c47e35cb61af9319d5a31f35291ad5a37ce7 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "typeguard"; - version = "2.1.3"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "0l3pih5ca469v7if255h5rqymirsw46bi6s7p885jxhq1gv6cfpk"; + sha256 = "40b22d18d2215b76b3ddda2564acfbddfa6e702968637fbd969187c2a6fb99da"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d1a9185d5a1494879dcb1347bae3afc8896c9999 --- /dev/null +++ b/pkgs/development/python-modules/typing/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, python }: + +let + testDir = if isPy3k then "src" else "python2"; + +in buildPythonPackage rec { + pname = "typing"; + version = "3.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "d400a9344254803a2368533e4533a4200d21eb7b6b729c173bc38201a74db3f2"; + }; + + # Error for Python3.6: ImportError: cannot import name 'ann_module' + # See https://github.com/python/typing/pull/280 + doCheck = pythonOlder "3.6"; + + checkPhase = '' + cd ${testDir} + ${python.interpreter} -m unittest discover + ''; + + meta = with lib; { + description = "Backport of typing module to Python versions older than 3.5"; + homepage = https://docs.python.org/3/library/typing.html; + license = licenses.psfl; + }; +} diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 2277cb7c4ca48535277216f7924ae0ac3d3fb653..1c61d0afab3b8ef046ebb2a82d41963e206c7620 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "tzlocal"; - version = "1.4"; + version = "1.5.1"; propagatedBuildInputs = [ pytz ]; src = fetchPypi { inherit pname version; - sha256 = "0n9hw4kqblyc0avzwi26rqmvyk9impb608rvy11qifmigy7r18h5"; + sha256 = "4ebeb848845ac898da6519b9b31879cf13b6626f7184c496037b818e238f2c4e"; }; # test fail (timezone test fail) diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index aca4e370e4611a286a1999f7ef8f4563032e41db..cbb3f9bfa8f8857e6fe2d73b81146291e79d4635 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -5,15 +5,14 @@ , python }: -let +buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.4.1"; -in buildPythonPackage rec { + version = "2.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "2f31fc1b6dd8632c230ea7012470e40f77119f20999274dda6f1afa9c305e590"; + sha256 = "7ff18ae3721fa75571f9329c08f7c0120416a6ae36194bd8674f65b3b78d0702"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1b397f6c7379783e607dee3a1a862210f5da10e0 --- /dev/null +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyyaml }: + +buildPythonPackage rec { + pname = "ua-parser"; + version = "0.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p8siba0rnb5nsl354fd5fc4751d5ybw7hgnd56yn8dncxdb1bqa"; + }; + + buildInputs = [ pyyaml ]; + + doCheck = false; # requires files from uap-core + + meta = with stdenv.lib; { + description = "A python implementation of the UA Parser"; + homepage = https://github.com/ua-parser/uap-python; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix index 4d09fda83da45aa6951a30c7062245d3d0239886..416c857bdc68d8e4999f854d0750e87c8e8cf093 100644 --- a/pkgs/development/python-modules/umemcache/default.nix +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -1,9 +1,10 @@ { stdenv, buildPythonPackage, isPy3k, fetchurl }: buildPythonPackage rec { - name = "umemcache-${version}"; + pname = "umemcache"; version = "1.6.3"; disabled = isPy3k; + name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/u/umemcache/${name}.zip"; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 5151ee638482c984554a329b9499c0dd641ccf98..d90ada6063216b0b87caf7fe003ac87c8973b84c 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "uncertainties"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4"; + sha256 = "91db922d54dff6094b4ea0d6e058f713a992cdf42e3ebaf73278e1893bfa2942"; }; buildInputs = [ nose numpy ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { 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 ]; + maintainers = with maintainers; [ rnhmjoj ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 9b81a28f085e40bbab7c78ced4ebbe81ce78d594..3cffe380490011011e569e05c31f8cd2cdbfca25 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Unidecode"; - version = "0.04.21"; + version = "1.0.22"; src = fetchPypi { inherit pname version; - sha256 = "0lfhp9c5xrbpjvbpr12ji52g1lx04404bzzdg6pvabhzisw6l2i8"; + sha256 = "8c33dd588e0c9bc22a76eaa0c715a5434851f726131bd44a6c26471746efabf5"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..129ad0ded6c7d72f44a418270cd6a95431ae9275 --- /dev/null +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -0,0 +1,23 @@ +{lib, fetchPypi, buildPythonPackage, six}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "unittest-xml-reporting"; + version = "2.1.1"; + + propagatedBuildInputs = [six]; + + # The tarball from Pypi doesn't actually contain the unit tests + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "1jwkqx5gfphkymp3xwqvlb94ng22gpbqh36vbbnsrpk1a0mammm6"; + }; + meta = with lib; { + homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; + description = "A unittest runner that can save test results to XML files"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ rprospero ]; + }; +} diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 2e4a232f1f1eff10c41602cbb9d837dafd680772..774799f3b4d8d9bf9f911db2659d6faf531bad42 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -5,17 +5,17 @@ then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - version = "3.0.3"; + version = "3.2.1"; pname = "uranium"; name = "${pname}-${version}"; - + src = fetchFromGitHub { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1pyzpcdb6kb0basvhgpjdiws8x0bwl71k7nkf3j3s9wk1dvyw824"; + sha256 = "1p05iw1x3rvb51p6hj57yq6nsjawjba3pyyr4jx924iq96vcc3fz"; }; - + buildInputs = [ python gettext ]; propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ]; nativeBuildInputs = [ cmake doxygen ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = "https://github.com/Ultimaker/Uranium"; + homepage = https://github.com/Ultimaker/Uranium; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c469fd8dd1cca229e1f096fba77ccadbb47bd2c1 --- /dev/null +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, simplejson, pytest, glibcLocales }: + +buildPythonPackage rec { + pname = "uritemplate"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d"; + }; + + propagatedBuildInputs = [ simplejson ]; + + checkInputs = [ pytest glibcLocales ]; + + checkPhase = '' + LC_ALL=en_US.UTF-8 py.test + ''; + + meta = with lib; { + homepage = https://github.com/python-hyper/uritemplate; + description = "URI template parsing for Humans"; + license = with licenses; [ asl20 bsd3 ]; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 99b648b0ee1f8c4979aa7688e6ecf670099cc91d..108a7cf5bb0be581853ae4e35e03a64d462e20a4 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -2,8 +2,8 @@ buildPythonPackage rec { pname = "uritools"; - name = "uritools-${version}"; version = "2.1.0"; + name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index d77a212003b1142ba5f0293d03d56b4f3774ac19..b76a1475bbfb4066ae856f38bd0d0652ae9013c5 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -23,6 +23,11 @@ buildPythonPackage (rec { }) ]; + postPatch = '' + # Several tests keep failing on Hydra + rm urwid/tests/test_vterm.py + ''; + meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = http://excess.org/urwid; diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..eb001410ce5fe33c1f0793764edff2232a3419df --- /dev/null +++ b/pkgs/development/python-modules/us/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jellyfish +}: + +buildPythonPackage rec { + pname = "us"; + version = "1.0.0"; + + propagatedBuildInputs = [ jellyfish ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1niglalkp7pinibzbxjdz9mxx9qmwkrh8884dag3kr72cfkrpp09"; + }; + + meta = { + description = "A package for easily working with US and state metadata"; + longDescription = '' + all US states and territories, postal abbreviations, Associated Press style + abbreviations, FIPS codes, capitals, years of statehood, time zones, phonetic + state name lookup, is contiguous or continental, URLs to shapefiles for state, + census, congressional districts, counties, and census tracts + ''; + homepage = https://github.com/unitedstates/python-us/; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index 0c6842749073bed934b9a37d111e9f2e53a02f49..bcbaa0b728c352a1c72ebb47d28f9f4984e60985 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, buildPythonPackage, pyusb }: buildPythonPackage rec { - name = "usbtmc-${version}"; + pname = "usbtmc"; version = "0.8"; + name = pname + "-" + version; src = fetchurl { url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6b14eebb310fbfa3d777946197cb1c36d3472e7b --- /dev/null +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }: + +buildPythonPackage rec { + pname = "user-agents"; + version = "1.1.0"; + + # PyPI is missing devices.json + src = fetchFromGitHub { + owner = "selwin"; + repo = "python-user-agents"; + rev = "v${version}"; + sha256 = "14kxd780zhp8718xr1z63xffaj3bvxgr4pldh9sv943m4hvi0gw5"; + }; + + propagatedBuildInputs = [ ua-parser ]; + + meta = with stdenv.lib; { + description = "A Python library to identify devices by parsing user agent strings"; + homepage = https://github.com/selwin/python-user-agents; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index 1b9819c035dbdfb9aa91409d9d1ad51a8741ee65..4274abf3b3298e05d85fdbc25e52425e5a1a7b3b 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -13,6 +13,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "take version numbers from version control"; homepage = https://github.com/habnabit/vcversioner; - licenses = licenses.isc; + license = licenses.isc; }; } diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a33286714173b8bf3c89866434a1f7ce0348622f --- /dev/null +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + + +buildPythonPackage rec { + + pname = "versioneer"; + version = "0.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dgkzg1r7mjg91xp81sv9z4mabyxl39pkd11jlc1200md20zglga"; + }; + + # Couldn't get tests to work because, for instance, they used virtualenv and + # pip. + doCheck = false; + + meta = with stdenv.lib; { + description = "Version-string management for VCS-controlled trees"; + homepage = https://github.com/warner/python-versioneer; + license = licenses.publicDomain; + maintainers = with maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e18e9f87acd365c7b62b8947f148628109fc1dff --- /dev/null +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xextproto, xproto }: + +buildPythonPackage rec { + name = "virtkey-${version}"; + majorVersion = "0.63"; + version = "${majorVersion}.0"; + + src = fetchurl { + url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz"; + sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xextproto xproto ]; + + meta = with lib; { + description = "Extension to emulate keypresses and to get the layout information from the X server"; + homepage = https://launchpad.net/virtkey; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..262d2a5d33a0520648e501e71dc6dbbda65cea25 --- /dev/null +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, EasyProcess }: + +buildPythonPackage rec { + pname = "PyVirtualDisplay"; + version = "0.2.1"; + + propagatedBuildInputs = [ EasyProcess ]; + + src = fetchPypi { + inherit pname version; + sha256 = "012883851a992f9c53f0dc6a512765a95cf241bdb734af79e6bdfef95c6e9982"; + }; + + # requires X server + doCheck = false; + + meta = with lib; { + description = "Python wrapper for Xvfb, Xephyr and Xvnc"; + homepage = "https://github.com/ponty/pyvirtualdisplay"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; +} diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index df0c83605f751f9311d3bd3570b3e0407141ead6..ffb2bb7619002ff36daf51497515c556e870d17b 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "15.1.0"; + version = "15.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a"; + sha256 = "1d7e241b431e7afce47e77f8843a276f652699d1fa4f93b9d8ce0076fd7b0b54"; }; # Doubt this is needed - FRidh 2017-07-07 diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8d52f65d498e5692c0bcc7d4b7614cab4b832173 --- /dev/null +++ b/pkgs/development/python-modules/vobject/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: + +buildPythonPackage rec { + version = "0.9.5"; + pname = "vobject"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f56cae196303d875682b9648b4bb43ffc769d2f0f800958e0a506af867b1243"; + }; + + disabled = isPyPy; + + propagatedBuildInputs = [ dateutil ]; + + checkPhase = "${python.interpreter} tests.py"; + + meta = with lib; { + description = "Module for reading vCard and vCalendar files"; + homepage = http://eventable.github.io/vobject/; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0d4f250509f0aef76bcf8ab2f52ed54121ab5799 --- /dev/null +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "voluptuous"; + version = "0.11.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918"; + }; + + checkInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "Voluptuous is a Python data validation library"; + homepage = http://alecthomas.github.io/voluptuous/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 8c980cf2b2cf72dd52f95219d88debc491bd5333..589f8de99ee5cb7ab0b89e5c9a532d9f4932abf9 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { pname = "vowpalwabbit"; name = "${pname}-${version}"; - version = "8.3.2"; + version = "8.5.0"; src = fetchurl{ url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; - sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7"; + sha256 = "0b517371fc64f1c728a0af42a31fa93def27306e9b4d25d6e5fd01bcff1b7304"; }; # vw tries to write some explicit things to home # python installed: The directory '/homeless-shelter/.cache/pip/http' diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7bae1e9860be797400b67494ae2debd6932f2bfe --- /dev/null +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, nose }: + +buildPythonPackage rec { + pname = "python-vxi11"; + version = "0.9"; + + # no tests in PyPI tarball + src = fetchFromGitHub { + owner = "python-ivi"; + repo = pname; + rev = "v${version}"; + sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn"; + }; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + description = "VXI-11 driver for controlling instruments over Ethernet"; + homepage = https://github.com/python-ivi/python-vxi11; + license = licenses.mit; + maintainers = with maintainers; [ bgamari ]; + }; +} diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix index 6efaf800b3cd9ab4911506a4d8e7ff619cde4427..421995e3792ac56577227f130960ce163f7dd5ba 100644 --- a/pkgs/development/python-modules/waitress-django/default.nix +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -1,6 +1,10 @@ { buildPythonPackage, django_1_8, waitress }: -buildPythonPackage { - name = "waitress-django"; + +buildPythonPackage rec { + pname = "waitress-django"; + version = "0.0.0"; + name = pname; + src = ./.; pythonPath = [ django_1_8 waitress ]; doCheck = false; diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b5c9e14da355adbb190ba4b75fc8e08719f0cc21 --- /dev/null +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: + +buildPythonPackage rec { + pname = "wakeonlan"; + version = "1.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "5e6013a17004809e676c150689abd94bcc0f12a37ad3fbce1f6270968f95ffa9"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "setuptools-scm ~= 1.15.7" "setuptools-scm" + ''; + + checkInputs = [ pytest mock ]; + + nativeBuildInputs = [ setuptools_scm ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "A small python module for wake on lan"; + homepage = https://github.com/remcohaszing/pywakeonlan; + license = licenses.wtfpl; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ac83430fbae20052abbe7d20c76ddc20dcf41b3e --- /dev/null +++ b/pkgs/development/python-modules/warrant/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi +, mock +, boto3, envs, python-jose, requests }: + +buildPythonPackage rec { + pname = "warrant"; + version = "0.6.1"; + + # move to fetchPyPi when https://github.com/capless/warrant/issues/97 is fixed + src = fetchFromGitHub { + owner = "capless"; + repo = "warrant"; + rev = "ff2e4793d8479e770f2461ef7cbc0c15ee784395"; + sha256 = "0gw3crg64p1zx3k5js0wh0x5bldgs7viy4g8hld9xbka8q0374hi"; + }; + + # this needs to go when 0.6.2 or later is released + postPatch = '' + substituteInPlace requirements.txt \ + --replace "python-jose-cryptodome>=1.3.2" "python-jose>=2.0.0" + ''; + + checkInputs = [ mock ]; + + propagatedBuildInputs = [ boto3 envs python-jose requests ]; + + # all the checks are failing + doCheck = false; + + meta = with lib; { + description = "Python library for using AWS Cognito with support for SRP"; + homepage = https://github.com/capless/warrant; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a5a7957e8ec1dd16f9e2658e3b5a3d203dcb7e73 --- /dev/null +++ b/pkgs/development/python-modules/webassets/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchurl, pyyaml, nose, jinja2, mock, pytest }: + +buildPythonPackage rec { + name = "webassets-${version}"; + version = "0.12.1"; + + src = fetchurl { + url = "mirror://pypi/w/webassets/${name}.tar.gz"; + sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7"; + }; + + propagatedBuildInputs = [ pyyaml ]; + checkInputs = [ nose jinja2 mock pytest ]; + + # Needs Babel CLI tool + doCheck = false; + checkPhase = "py.test"; + + meta = with lib; { + description = "Media asset management for Python, with glue code for various web frameworks"; + homepage = http://github.com/miracle2k/webassets/; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d530eda39d9758e0902c4b4dccc8ad27ee2ea4de --- /dev/null +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "webcolors"; + version = "1.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "030562f624467a9901f0b455fef05486a88cfb5daa1e356bd4aacea043850b59"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = { + description = "Library for working with color names/values defined by the HTML and CSS specifications"; + homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix index 834a0ab07fbfe4d60df95d64e6df0b7c19b95f62..edd0a364ea147dfc6ac551172aff7645e22a82ab 100644 --- a/pkgs/development/python-modules/webencodings/default.nix +++ b/pkgs/development/python-modules/webencodings/default.nix @@ -4,10 +4,9 @@ , pytest }: -let +buildPythonPackage rec { pname = "webencodings"; version = "0.5.1"; -in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { @@ -26,4 +25,4 @@ in buildPythonPackage rec { homepage = https://github.com/SimonSapin/python-webencodings; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a4b1b9c467a4f51612465b020ef1650252b48a87 --- /dev/null +++ b/pkgs/development/python-modules/weboob/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage, fetchurl, stdenv, isPy27 +, nose, pillow, prettytable, pyyaml, dateutil, gdata +, requests, mechanize, feedparser, lxml, gnupg, pyqt5 +, libyaml, simplejson, cssselect, futures, pdfminer +, termcolor, google_api_python_client, html2text +, unidecode +}: + +buildPythonPackage rec { + pname = "weboob"; + version = "1.3"; + disabled = ! isPy27; + + src = fetchurl { + url = "https://symlink.me/attachments/download/356/${pname}-${version}.tar.gz"; + sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9"; + }; + + setupPyBuildFlags = ["--qt" "--xdg"]; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ pillow prettytable pyyaml dateutil + gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml + simplejson cssselect futures pdfminer termcolor google_api_python_client + html2text unidecode ]; + + checkPhase = '' + nosetests + ''; + + meta = { + homepage = http://weboob.org; + description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; + license = stdenv.lib.licenses.agpl3; + broken = true; # 2018-04-11 + }; +} + diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 488036552583f34a5d740a99c9fa016e6ae27571..f24f10675f80983b3e7b624a8ab4bcbdee4426bd 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.4"; + version = "4.0.1"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "43e5b9f51dd0000a4c6f646e2ade0c886bd14a784ffac08b9e079bd17a63bcc5"; + sha256 = "da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/websockets_client/default.nix b/pkgs/development/python-modules/websockets_client/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..dd6e9200db520bb9701f4ccd85a36af8396c88c4 --- /dev/null +++ b/pkgs/development/python-modules/websockets_client/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: +buildPythonPackage rec { + pname = "websocket_client"; + version = "0.47.0"; + + src = fetchPypi { + inherit version pname; + sha256 = "0jb1446053ryp5p25wsr1hjfdzwfm04a6f3pzpcb63bfz96xqlx4"; + }; + + prePatch = '' + # ssl.match_hostname exists in python2.7 version maintained in nixpkgs, + # the dependency is not necessary. + sed -e "s/\['backports.ssl_match_hostname'\]/\[\]/" -i setup.py + ''; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/liris/websocket-client; + description = "Websocket client for python"; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 5979d895a74759a11bb531c212d767d768d1a300..58be98f183b64694b5b96fea8b6bd6387d002c3c 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -1,21 +1,23 @@ { stdenv, buildPythonPackage, fetchPypi -, itsdangerous +, itsdangerous, hypothesis , pytest, requests, glibcLocales }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "Werkzeug"; - version = "0.12.2"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "09mv4cya3lywkn4mi3qrqmjgwiw99kdk03dk912j8da6ny3pnflh"; + sha256 = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c"; }; - LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ itsdangerous ]; - buildInputs = [ pytest requests glibcLocales ]; + checkInputs = [ pytest requests glibcLocales hypothesis ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"} + ''; meta = with stdenv.lib; { homepage = http://werkzeug.pocoo.org/; diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index c77d8a3859edc0ed68715c5cf359b577dcc599e1..6db21baf7509fd90993ba8ca10e74993f10e2dc5 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.30.0"; + version = "0.31.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9515fe0a94e823fd90b08d22de45d7bde57c90edce705b22f5e1ecf7e1b653c8"; + sha256 = "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce"; }; checkInputs = [ pytest pytestcov coverage ]; diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..89be87e184911cb4c2688f08009515e07cdd53ab --- /dev/null +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "whichcraft"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "9e0d51c9387cb7e9f28b7edb549e6a03da758f7784f991eb4397d7f7808c57fd"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + homepage = https://github.com/pydanny/whichcraft; + description = "Cross-platform cross-python shutil.which functionality"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d2359b2195f01623ca8892e7ef3210ade9ce7a90 --- /dev/null +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "whitenoise"; + version = "4.0b4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ra2bbsihwfhnf1ibahzzabgfjfghxqcrbfx6r5r50mlil5n8bf4"; + }; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Radically simplified static file serving for WSGI applications"; + homepage = http://whitenoise.evans.io/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 760af59918acfc155bdc7d6be9dee25b4d51b4b6..2e21ead19e098032fcb5467997ef1bdc317e7190 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; name = "${pname}-${version}"; - version = "3.0.6"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "3fbedb4ae0883f48af2397c65a8f9fbf8ed868f1808db70f8aa72f25d391fa9b"; + sha256 = "9b584b9210dadc98f1fae384fff5f4db047df0b94a81b2388c7b0b14a99c3f32"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9de1fd5b39220805c5adaa5197148bb82e4cb99f --- /dev/null +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, regex +, langcodes +, ftfy +, msgpack +, mecab-python3 +, jieba +, nose +, pythonOlder +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "wordfreq"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "LuminosoInsight"; + repo = "wordfreq"; + rev = "e3a1b470d9f8e0d82e9f179ffc41abba434b823b"; + sha256 = "1wjkhhj7nxfnrghwvmvwc672s30lp4b7yr98gxdxgqcq6wdshxwv"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + # These languages require additional dictionaries + nosetests -e test_japanese -e test_korean -e test_languages + ''; + + propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ]; + + # patch to relax version requirements for regex + # dependency to prevent break in upgrade + postPatch = '' + substituteInPlace setup.py --replace "regex ==" "regex >=" + ''; + + disabled = pythonOlder "3"; + + meta = with lib; { + description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; + homepage = https://github.com/LuminosoInsight/wordfreq/; + license = licenses.mit; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..badecc776d7594230064b1f3652a7cfc4fe20deb --- /dev/null +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "wrapt"; + version = "1.10.11"; + + # No tests in archive + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6"; + }; + + meta = { + description = "Module for decorators, wrappers and monkey patching"; + license = lib.licenses.bsd2; + homepage = https://github.com/GrahamDumpleton/wrapt; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index dff729a9c1178483b855d2fc70dac5efab5714c6..f5a83a7bc0293744d6216930c7f743a4939c35ee 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -4,18 +4,18 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ws4py"; - version = "0.4.2"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0zr3254ky6r7q15l3dhdczfa8i723055zdkqssjifsgcwvirriks"; + sha256 = "29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483"; }; checkInputs = [ pytest mock git ]; propagatedBuildInputs = [ asyncio cherrypy gevent tornado ]; checkPhase = '' - pytest test + pytest -k 'not test_timeout_when_no_registered_fds and not test_mainloop_can_be_stopped_when_no_websocket_were_registered' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e98fcf205fd595da3db569cef3bdb9d3d0c5879b --- /dev/null +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -0,0 +1,14 @@ +{ lib, buildPythonPackage, fetchPypi, h11, enum34 }: + +buildPythonPackage rec { + pname = "wsproto"; + version = "0.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "092qk4pbyaxx8b81hv9p7pc3ww54bwfqybhya4madka3pgv19wh2"; + }; + + propagatedBuildInputs = [ h11 enum34 ]; + +} diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 14f6f802ba2ac54875f8323a3970f32bfcf266ef..abce4cf44e0cd781deeb0cfccd15831b151b054d 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -19,8 +19,9 @@ assert wxGTK.unicode; buildPythonPackage rec { - name = "wxPython-${version}"; + pname = "wxPython"; version = "3.0.2.0"; + name = pname + "-" + version; disabled = isPy3k || isPyPy; doCheck = false; @@ -42,6 +43,9 @@ buildPythonPackage rec { # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch substituteInPlace config.py \ --replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" "" + # set the WXPREFIX to $out instead of the storepath of wxwidgets + substituteInPlace config.py \ + --replace "WXPREFIX = getWxConfigValue('--prefix')" "WXPREFIX = '$out'" # 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;" @@ -61,7 +65,7 @@ buildPythonPackage rec { buildPhase = ""; installPhase = '' - ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=0 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out wrapPythonPrograms ''; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 1215e613f6fac0d59629e2394204c67f9cfb2e3c..1d18b5830aaf66fb64b761924825131f0f8c4fcc 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,30 +10,23 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.9.6"; - name = "${pname}-${version}"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494"; + sha256 = "dd5af05cc9ddd5713016ec1a7f0d481daf2f0bb4d4e0bd66790503f6412bbc59"; }; - # Temporary patch until next release (later than 0.9.6) to fix - # a broken test case. - patches = [ - (fetchurl { - url = "https://github.com/pydata/xarray/commit/726c6a3638ecf95889c541d84e892a106c2f2f92.patch"; - sha256 = "1i2hsj5v5qlvqfj48vyn9931yndsf4k4wrk3qpqpywh32s7r007b"; - }) - ]; - - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [numpy pandas]; checkPhase = '' py.test $out/${python.sitePackages} ''; + # There always seem to be broken tests... + doCheck = false; + meta = { description = "N-D labeled arrays and datasets in Python"; homepage = https://github.com/pydata/xarray; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0f4c081e6260fb398982d1d87f417d135e303944 --- /dev/null +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, xorg +, cffi +, six +}: + +buildPythonPackage rec { + version = "0.6.0"; + pname = "xcffib"; + + src = fetchPypi { + inherit pname version; + sha256 = "36142cb72535933e8e1ed39ff2c45559fa7038823bd6be6961ef8ee5bb0f6912"; + }; + + patchPhase = '' + # Hardcode cairo library path + sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py + ''; + + propagatedBuildInputs = [ cffi six ]; + + meta = with stdenv.lib; { + description = "A drop in replacement for xpyb, an XCB python binding"; + homepage = "https://github.com/tych0/xcffib"; + license = licenses.asl20; + maintainers = with maintainers; [ kamilchm ]; + }; +} diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..526376a416329326ab071adefcac5ae4b5b52288 --- /dev/null +++ b/pkgs/development/python-modules/xdot/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi +, wrapGAppsHook, gobjectIntrospection, pygobject3, graphviz, gnome3 }: + +buildPythonPackage rec { + pname = "xdot"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = [ gobjectIntrospection pygobject3 graphviz gnome3.gtk ]; + + meta = with lib; { + description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot"; + homepage = https://github.com/jrfonseca/xdot.py; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..217c823afe576e025191cb84e52146df3040d9cc --- /dev/null +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, lib +, pkgs +, buildPythonPackage +, nose +, scipy +, xgboost +}: + +buildPythonPackage rec { + name = "xgboost-${version}"; + + inherit (xgboost) version src meta; + + propagatedBuildInputs = [ scipy ]; + checkInputs = [ nose ]; + + postPatch = let + libname = if stdenv.isDarwin then "libxgboost.dylib" else "libxgboost.so"; + + in '' + 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 ["${xgboost}/lib/${libname}"] + EOF + ''; + + postInstall = '' + rm -rf $out/xgboost + ''; +} diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..be1651caf8a47b1d0a27dbb71c99bb49ca7d1665 --- /dev/null +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, coverage +, nose +}: + +buildPythonPackage rec { + pname = "xmltodict"; + version = "0.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df"; + }; + + checkInputs = [ coverage nose ]; + + checkPhase = '' + nosetests + ''; + + meta = { + description = "Makes working with XML feel like you are working with JSON"; + homepage = https://github.com/martinblech/xmltodict; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..68c81157eb08aae54f9a9c833dbdb95faceae400 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Bootbox"; + version = "4.3.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0wks1lsqngn3gvlhzrvaan1zj8w4wr58xi0pfqhrzckbghvvr0gj"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://bootboxjs.com; + description = "Bootboxjs packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..757c2cc240ed478058de72c8ef04131578aa1b73 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Bootstrap"; + version = "3.3.5.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0jzjq3d4vp2shd2n20f9y53jnnk1cvphkj1v0awgrf18qsy2bmin"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://getbootstrap.com; + description = "Bootstrap packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0cf029c68a59c0dc847cc2cdb9e7e01f44820e74 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, xstatic-jquery +}: + +buildPythonPackage rec { + pname = "XStatic-jQuery-File-Upload"; + version = "9.7.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0d5za18lhzhb54baxq8z73wazq801n3qfj5vgcz7ri3ngx7nb0cg"; + }; + + # no tests implemented + doCheck = false; + + propagatedBuildInputs = [ xstatic-jquery ]; + + meta = with lib;{ + homepage = http://plugins.jquery.com/project/jQuery-File-Upload; + description = "jquery-file-upload packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1b884a97eb2236859591fb82d049715971cffb43 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, xstatic-jquery +}: + +buildPythonPackage rec { + pname = "XStatic-jquery-ui"; + version = "1.12.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0w7mabv6qflpd47g33j3ggp5rv17mqk0xz3bsdswcj97wqpga2l2"; + }; + + # no tests implemented + doCheck = false; + + propagatedBuildInputs = [ xstatic-jquery ]; + + meta = with lib;{ + homepage = http://jqueryui.com/; + description = "jquery-ui packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c414e0a070ae5cd58ee5247d24512b12d47b8021 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-jQuery"; + version = "1.10.2.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "018kx4zijflcq8081xx6kmiqf748bsjdq7adij2k91bfp1mnlhc3"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://jquery.org; + description = "jquery packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8ec9b77860c210c8cc644d84b31f4a3ca7cb2e21 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-pygments/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Pygments"; + version = "1.6.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0fjqgg433wfdnswn7fad1g6k2x6mf24wfnay2j82j0fwgkdxrr7m"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://pygments.org; + description = "pygments packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..02931215b8d35544408fa3665c012c69c7189c20 --- /dev/null +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic"; + version = "1.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = https://bitbucket.org/thomaswaldmann/xstatic; + description = "Base packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4ba9cd61d4c5bcd764055e10a2696930ee7c83a1 --- /dev/null +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, xorgserver +, mock +}: + +buildPythonPackage rec { + pname = "xvfbwrapper"; + version = "0.2.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "097wxhvp01ikqpg1z3v8rqhss6f1vwr399zpz9a05d2135bsxx5w"; + }; + propagatedBuildInputs = [ xorgserver ]; + + checkInputs = [ mock ]; + + meta = with stdenv.lib; { + description = "Run headless display inside X virtual framebuffer (Xvfb)"; + homepage = https://github.com/cgoldberg/xvfbwrapper; + license = licenses.mit; + maintainers = with maintainers; [ ashgillman ]; + }; +} diff --git a/pkgs/development/python-modules/yahooweather/default.nix b/pkgs/development/python-modules/yahooweather/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..38c060aa8e849a87ea62f34e1738f61f0def378a --- /dev/null +++ b/pkgs/development/python-modules/yahooweather/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "yahooweather"; + version = "0.10"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0bsxmngkpzvqm50i2cnxjzhpbdhb8s10ly8h5q08696cjihqdkpa"; + }; + + # Tests require network access + doCheck = false; + + meta = with lib; { + description = "Provide an interface to the Yahoo! Weather RSS feed"; + homepage = https://github.com/pvizeli/yahooweather; + license = licenses.bsd2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 2ded73d5250a049dabca5b6f5875e27d663466bb..c1914a03458671e479eb1276e2edc4a8f9d2d3e9 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.19.0"; + version = "0.21.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "701b076a4916e3cfbba345e0297dcd54a02fd0fdcae1f43346f8a043c3bbd052"; + sha256 = "7d8ae3567f3fb2d288f127d35e4decb3348c96cd091001e02e818465da618f90"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 1275178d5d0ba6a41b77ce0da54ce57e8a5a0de8..1953b1610ceb4cea82f0bb70860af8866ac23401 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,28 +1,28 @@ -{ lib -, fetchurl +{ stdenv +, fetchPypi , buildPythonPackage , multidict , pytestrunner , pytest +, idna }: -let +buildPythonPackage rec { pname = "yarl"; - version = "0.13.0"; -in buildPythonPackage rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "25fe681a982f2cec567df8abac7cbd2ac27016e4aec89193945cab0643bfdb42"; - }; + version = "1.1.1"; - buildInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ multidict ]; + src = fetchPypi { + inherit pname version; + sha256 = "a69dd7e262cdb265ac7d5e929d55f2f3d07baaadd158c8f19caebf8dde08dfe8"; + }; + checkInputs = [ pytest pytestrunner ]; + propagatedBuildInputs = [ multidict idna ]; - meta = { + meta = with stdenv.lib; { description = "Yet another URL library"; homepage = https://github.com/aio-libs/yarl/; - license = lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index 5e8c412ce520d8d177c58be557558a53461f6a82..6e05b6ced0434cef11736238a5d6042a913f1b41 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool for querying PyPI and Python packages installed on your system"; homepage = https://github.com/cakebread/yolk; - maintainer = with maintainers; [ profpatsch ]; + maintainers = with maintainers; []; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index e00d6c7e24ba857ba873b6ddf77447675278f1c3..64b2874ef627792755ce2b933ba46bfe651653f6 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -25,13 +25,13 @@ let pname = "zeep"; - version = "2.4.0"; + version = "2.5.0"; in buildPythonPackage { name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8631e2735c5f2219eb18ca4f0615ae482455628518508f69c3690dbfb8238aee"; + sha256 = "4f9db52c7d269813fc6251da4cb050869158858aeea75a055b4550f19e52ac84"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 5502a8236dae70929340e5dded392011f6467b17..f3dbf70eecfc96ee2e15f67af174c016dadaa374 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.19.1"; + version = "0.20.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3"; + sha256 = "6e3f1e7b5871e3d1410ac29b9fb85aafc1e2d661ed596b07a6f84559a475efcb"; }; propagatedBuildInputs = [ netifaces six enum-compat ]; diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bfc5caea4d0796ee08702b977ac6831b72ee0df9 --- /dev/null +++ b/pkgs/development/python-modules/zict/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, heapdict }: + +buildPythonPackage rec { + pname = "zict"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "63377f063086fc92e5c16e4d02162c571f6470b9e796cf3411ef9e815c96b799"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ heapdict ]; + + meta = with stdenv.lib; { + description = "Mutable mapping tools."; + homepage = https://github.com/dask/zict; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix index 0915eb002b791db2aa9f9db1f388bab0f572db67..2929afed1cd3d753deaf0847cf57b8d0265f029c 100644 --- a/pkgs/development/python-modules/zipfile36/default.nix +++ b/pkgs/development/python-modules/zipfile36/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; homepage = https://gitlab.com/takluyver/zipfile36; license = lib.licenses.psfl; - maintainer = lib.maintainers.fridh; + maintainers = lib.maintainers.fridh; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index f704f30527816ef265a6dd5eee3bc5d94cc430f5..25ab7dcd31adaab03dfcd77d9aafeb320a3c8555 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.3.0"; + version = "5.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3"; + sha256 = "0b306042f4f0d558a477d65c34b0dd6e7604c6e583f55dfda52befa2fa13e076"; }; patches = [ diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 53dd8680c315600b83a8346eca42fd41202df901..108f5395ece435dea75f368f26cac0463bf3116a 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "0.7.0"; + version = "1.0"; name = "${pname}-${version}"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "95a247fb17bce980af8d548af70ac5bd1bad22773f242eb8efa24428efa909a8"; + sha256 = "3af9169fb1d5901cf6693ab356b0dfda20ad2cacc5673fad59b4449ed50d5399"; }; # fails.. diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6bd7ae33fb9b24843d6fc7ead579d50bd8e6f406 --- /dev/null +++ b/pkgs/development/python-modules/zope_copy/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, zope_interface +, zope_location +, zope_schema +}: + + +buildPythonPackage rec { + pname = "zope.copy"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "702dbb52e2427a1cc2e2b4b3f5a40c64dcbf9ebed85888ae8fa67172263a6994"; + }; + + propagatedBuildInputs = [ zope_interface ]; + + checkInputs = [ zope_location zope_schema ]; + + checkPhase = '' + python -m unittest discover -s src/zope/copy + ''; + + meta = { + maintainers = with lib.maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 8358c861cba32911b9cfeeff4c3ad4d761d89964..e2bf3a569d0487980cb5caba42ce288b88cc9d6f 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k +, fetchpatch , zope_interface , zope_exceptions , zope_testing @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "4.7.0"; - name = "${pname}-${version}"; + version = "4.8.1"; src = fetchPypi { inherit pname version; - sha256 = "8ffcb4989829544a83d27e42b2eeb28f8fc134bd847d71ce8dca54f710526ef0"; - extension = "zip"; + sha256 = "039z9q5i1r6fqzlm224nmaxn896k4a9sb1237dv406ncdldd7jaz"; }; + patches = [ ./test-selection.patch ]; + propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zope_testrunner/test-selection.patch b/pkgs/development/python-modules/zope_testrunner/test-selection.patch new file mode 100644 index 0000000000000000000000000000000000000000..89dd7773885cabb0dfbd83832dc9b281aed97c8c --- /dev/null +++ b/pkgs/development/python-modules/zope_testrunner/test-selection.patch @@ -0,0 +1,5 @@ +--- a/src/zope/testrunner/tests/testrunner-test-selection.txt ++++ b/src/zope/testrunner/tests/testrunner-test-selection.txt +@@ -235 +235 @@ and by test within the module using the --test (-t) option: +- >>> sys.argv = 'test -u -vv -ssample1 -m_one -mtest1 -tx0 -ty0'.split() ++ >>> sys.argv = 'test -u -vv -ssample1 -m_one -mtest1 -t_x0 -t_y0'.split() diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 49ff6e505f414f883d5c4d865677b796617cca54..633270b9480f45cd2747c1788e472c7f6c2a2ddb 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zxcvbn-python"; - version = "4.4.16"; + version = "4.4.22"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "63cc481bfb8950c43d4a87926be22cf8c4bb281ef7f818a8ef2d30b55a97c3e0"; + sha256 = "402d4222dc9994baed66a19a1cf5cb5c3fafd065f9cabc4cf7d5a2915e980979"; }; # No tests in archive diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix deleted file mode 100644 index fdf1745f9f2c93d05f3d269edb00f0fd2c51fceb..0000000000000000000000000000000000000000 --- a/pkgs/development/qtcreator/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, makeWrapper -, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake -, withDocumentation ? false -}: - -with stdenv.lib; - -let - baseVersion = "4.4"; - revision = "1"; -in - -stdenv.mkDerivation rec { - name = "qtcreator-${version}"; - version = "${baseVersion}.${revision}"; - - src = fetchurl { - url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "0kn1k2zvc93xin4kdp2fpiz21i5j0qymyx6jjzkqp7r3x8yxwr06"; - }; - - buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; - - nativeBuildInputs = [ qmake makeWrapper ]; - - doCheck = true; - - enableParallelBuilding = true; - - buildFlags = optional withDocumentation "docs"; - - installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; - - preBuild = optional withDocumentation '' - ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share - ''; - - postInstall = '' - substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ - --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" - ''; - - meta = { - description = "Cross-platform IDE tailored to the needs of Qt developers"; - longDescription = '' - Qt Creator is a cross-platform IDE (integrated development environment) - tailored to the needs of Qt developers. It includes features such as an - advanced code editor, a visual debugger and a GUI designer. - ''; - homepage = https://wiki.qt.io/Category:Tools::QtCreator; - license = "LGPL"; - maintainers = [ maintainers.akaWolf ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md index c8f02bd1478067990b03e0a2c7fd1e2f03a0ba69..e6fd09d764714b3f981dedf79509734a211815cd 100644 --- a/pkgs/development/r-modules/README.md +++ b/pkgs/development/r-modules/README.md @@ -1,120 +1 @@ -R packages -========== - -## Installation - -Define an environment for R that contains all the libraries that you'd like to -use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file: - -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - - rEnv = super.rWrapper.override { - packages = with self.rPackages; [ - devtools - ggplot2 - reshape2 - yaml - optparse - ]; - }; - }; -} -``` - -Then you can use `nix-env -f "" -iA rEnv` to install it into your user -profile. The set of available libraries can be discovered by running the -command `nix-env -f "" -qaP -A rPackages`. The first column from that -output is the name that has to be passed to rWrapper in the code snipped above. - -However, if you'd like to add a file to your project source to make the -environment available for other contributors, you can create a `default.nix` -file like so: -```nix -let - pkgs = import {}; - stdenv = pkgs.stdenv; -in with pkgs; { - myProject = stdenv.mkDerivation { - name = "myProject"; - version = "1"; - src = if pkgs.lib.inNixShell then null else nix; - - buildInputs = with rPackages; [ - R - ggplot2 - knitr - ]; - }; -} -``` -and then run `nix-shell .` to be dropped into a shell with those packages -available. - -## RStudio - -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 - { - - rstudioEnv = super.rstudioWrapper.override { - packages = with self.rPackages; [ - dplyr - ggplot2 - reshape2 - ]; - }; - }; -} -``` - -Then like above, `nix-env -f "" -iA rstudioEnv` will install -this into your user profile. - -Alternatively, you can create a self-contained `shell.nix` without the need to -modify any configuration files: - -```nix -{ pkgs ? import {} -}: - -pkgs.rstudioWrapper.override { - packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ]; -} - -``` - -Executing `nix-shell` will then drop you into an environment equivalent to the -one above. If you need additional packages just add them to the list and -re-enter the shell. - -## Updating the package set - -```bash -nix-shell generate-shell.nix - -Rscript generate-r-packages.R cran > cran-packages.nix.new -mv cran-packages.nix.new cran-packages.nix - -Rscript generate-r-packages.R bioc > bioc-packages.nix.new -mv bioc-packages.nix.new bioc-packages.nix -``` - -`generate-r-packages.R ` reads `-packages.nix`, therefor the renaming. - - -## Testing if the Nix-expression could be evaluated - -```bash -nix-build test-evaluation.nix --dry-run -``` - -If this exits fine, the expression is ok. If not, you have to edit `default.nix` +Moved to [/doc/languages-frameworks/r.section.md](/doc/languages-frameworks/r.section.md) diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix index d623433593cdc049a273b5448b0be17ca76bcd64..c4d6897b9989e4b23d6c60dfc0e4164113b92e35 100644 --- a/pkgs/development/r-modules/bioc-annotation-packages.nix +++ b/pkgs/development/r-modules/bioc-annotation-packages.nix @@ -4,8 +4,10 @@ # Rscript generate-r-packages.R bioc-annotation >new && mv new bioc-annotation-packages.nix { self, derive }: -let derive2 = derive { rVersion = "3.4"; }; +let derive2 = derive { biocVersion = "3.6"; }; in with self; { + AHCytoBands = derive2 { name="AHCytoBands"; version="0.99.0"; sha256="0g92nz33rx14zl5can7s701bipdgz7rxqygvvc22c4a0qj52ijnq"; depends=[]; }; + AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.0.4"; sha256="0wchfmz3fl0vx7mmddh9s6sy04xvjh6nkw61yx1ddcdhzrwa45i7"; depends=[AnnotationHubData ensembldb]; }; 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]; }; BSgenome_Amellifera_UCSC_apiMel2 = derive2 { name="BSgenome.Amellifera.UCSC.apiMel2"; version="1.4.0"; sha256="1967w7aly7qydykk7rar712kvgsav3zjr4kirybkj17nwiynd74g"; depends=[BSgenome]; }; @@ -95,13 +97,13 @@ 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="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]; }; + EnsDb_Hsapiens_v75 = derive2 { name="EnsDb.Hsapiens.v75"; version="2.99.0"; sha256="0jx6rf6v0j8yr07q3c1h7s121901dc400nm6xaiv4i7kb5czjn9c"; depends=[ensembldb]; }; + EnsDb_Hsapiens_v79 = derive2 { name="EnsDb.Hsapiens.v79"; version="2.99.0"; sha256="0k94iml0417m3k086d0bzd83fndyb2kn7pimsfzcdmafgy6sxwgg"; depends=[ensembldb]; }; + EnsDb_Hsapiens_v86 = derive2 { name="EnsDb.Hsapiens.v86"; version="2.99.0"; sha256="1gp7xrzddpvmh2vrcp571wyy00skxgxfl39ksj4h0hm1qay0fb2m"; depends=[ensembldb]; }; + EnsDb_Mmusculus_v75 = derive2 { name="EnsDb.Mmusculus.v75"; version="2.99.0"; sha256="00c92l6ii2p3hila8xpblmidx8pmy11x1xh4gnwsq3f3rn1q200g"; depends=[ensembldb]; }; + EnsDb_Mmusculus_v79 = derive2 { name="EnsDb.Mmusculus.v79"; version="2.99.0"; sha256="1zpmq7v55if6q9r0h883q9k8l70ym20b01m9hxf121wb256rl9f7"; depends=[ensembldb]; }; + EnsDb_Rnorvegicus_v75 = derive2 { name="EnsDb.Rnorvegicus.v75"; version="2.99.0"; sha256="02sx9l1p67ihkn0dfzbi08cpp8x4k2mjdqn7hvzfiaibsbqp70bb"; depends=[ensembldb]; }; + EnsDb_Rnorvegicus_v79 = derive2 { name="EnsDb.Rnorvegicus.v79"; version="2.99.0"; sha256="1ki2hrn0a55f3ipxny0hpgl5ld9pjkhcwmvvqwwd99f3sqbxf3br"; 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]; }; @@ -109,7 +111,8 @@ in with self; { 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]; }; 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.4.0"; sha256="02cj8kqi5w39jwcs8gp1dgj08sah262ppxnkz4h3qd0w191y8yyl"; depends=[AnnotationDbi]; }; + GO_db = derive2 { name="GO.db"; version="3.5.0"; sha256="02d1mn1al3q7qvhx1ylrr3ar4w4iw0qyi5d89v2336rzwk9maq35"; depends=[AnnotationDbi]; }; + GenomeInfoDbData = derive2 { name="GenomeInfoDbData"; version="1.0.0"; sha256="0xp8hyc4r3lz76i0x8r9lp74h2j8p7fcrn7nqmjhx5kn9bdp7fyp"; depends=[]; }; 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]; }; @@ -121,111 +124,106 @@ in with self; { 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.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.6.0"; sha256="0sfdx0lpiw3l4passx93pjfswd0iv3hxdc7ciazh53baib3xpv2d"; depends=[minfi]; }; + IlluminaHumanMethylationEPICanno_ilm10b3_hg19 = derive2 { name="IlluminaHumanMethylationEPICanno.ilm10b3.hg19"; version="0.6.0"; sha256="1rdkvbpbz8a8bd9ipycfmgn8a3x519abhwywka21ii9ziv3s6ah6"; depends=[minfi]; }; + IlluminaHumanMethylationEPICanno_ilm10b4_hg19 = derive2 { name="IlluminaHumanMethylationEPICanno.ilm10b4.hg19"; version="0.6.0"; sha256="0687b4k8hwfc18qgdd9ypv1skp37jd204fszba0gmrv3dc92i09c"; depends=[minfi]; }; IlluminaHumanMethylationEPICmanifest = derive2 { name="IlluminaHumanMethylationEPICmanifest"; version="0.3.0"; sha256="0alhjda5g186z8b1nsmnpfswrlj7prdz8mkwx60wkkl6hkcnk6p3"; depends=[minfi]; }; + JASPAR2018 = derive2 { name="JASPAR2018"; version="1.0.0"; sha256="1j82wsayzn6zn7irihpc8jivvwfsdrckik0ypajsv3pgrb5b3naa"; depends=[]; }; 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.4.0"; sha256="180z52y03gdkf36ycr76vcs1mz9qdbwywzxrbcj6yb5vcj8i5hdx"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; - MafDb_1Kgenomes_phase3_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase3.hs37d5"; version="3.4.0"; sha256="10968v506gmhzrnjz92z2p4484dbhgs6a20lkhs6f79bl66ckdbj"; 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.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.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.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.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.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.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]; }; + MafDb_1Kgenomes_phase1_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase1.hs37d5"; version="3.6.0"; sha256="19y1w2nk3xj4xkg46vhmfk045j8cg81x9a27irmgl2ym3pmcpn92"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + MafDb_1Kgenomes_phase3_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase3.hs37d5"; version="3.6.0"; sha256="02bwgqh4mx9yfsyr6cxglncdybkxq9rc0gir3919sjs2my3pa0yq"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + MafDb_ESP6500SI_V2_SSA137_GRCh38 = derive2 { name="MafDb.ESP6500SI.V2.SSA137.GRCh38"; version="3.6.0"; sha256="07spwx7akc7i82s8il6mjkmyll07v2slkv6h6fy1rrsa0hrdrw8w"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + MafDb_ESP6500SI_V2_SSA137_hs37d5 = derive2 { name="MafDb.ESP6500SI.V2.SSA137.hs37d5"; version="3.6.0"; sha256="1gr9gh355h1n426rwsr44wk4fgy0bvjfyaai2jj0qnp9zb94kr42"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + MafDb_ExAC_r1_0_hs37d5 = derive2 { name="MafDb.ExAC.r1.0.hs37d5"; version="3.6.0"; sha256="1a2x86cdl6q3s9phb6dzblld4y43r10gh7323c5jnwiyirhs4hlc"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + MafDb_ExAC_r1_0_nonTCGA_hs37d5 = derive2 { name="MafDb.ExAC.r1.0.nonTCGA.hs37d5"; version="3.6.0"; sha256="1zyp1hsqdcspnvlnqm3wp9xly8r6kjbglbdqsc8fxllivdzxs15f"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + MafDb_TOPMed_freeze5_hg38 = derive2 { name="MafDb.TOPMed.freeze5.hg38"; version="3.6.0"; sha256="02hq5agpbqcc5cva6xa37kniwi0fi7h5d4cbpmlwfc502n0ahlx0"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + MafDb_gnomAD_r2_0_1_hs37d5 = derive2 { name="MafDb.gnomAD.r2.0.1.hs37d5"; version="3.6.0"; sha256="0fjpm1lf8qz5vfd4k2sd50a0nkxx8jlf31c1xp87a2d5v7gyx9d4"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + MafDb_gnomADex_r2_0_1_hs37d5 = derive2 { name="MafDb.gnomADex.r2.0.1.hs37d5"; version="3.6.0"; sha256="1jrzj9mw8xqxmw4qq9djs1f5slvd5l7151pcg9bqzj0162zcz8jb"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + MeSH_AOR_db = derive2 { name="MeSH.AOR.db"; version="1.9.0"; sha256="0vlvfwr9bi229xwdjymclj0z2spxx8q96hpkgvqyndfpqchapl5q"; depends=[MeSHDbi]; }; + MeSH_Aca_eg_db = derive2 { name="MeSH.Aca.eg.db"; version="1.9.0"; sha256="1cx2yzx67fgqi0kmf1mk3ykvmqmprilxrjg6l51srjhi40p9q1wg"; depends=[MeSHDbi]; }; + MeSH_Aga_PEST_eg_db = derive2 { name="MeSH.Aga.PEST.eg.db"; version="1.9.0"; sha256="1gy4l1p0980blf91f57sxnn38gfyq99lmy3sfc141nm435abdh2l"; depends=[MeSHDbi]; }; + MeSH_Ame_eg_db = derive2 { name="MeSH.Ame.eg.db"; version="1.9.0"; sha256="1z2y8mdjyjclf0lqlhi9dq9gq8cqrm8m2m0rnyqgbadsxviwg447"; depends=[MeSHDbi]; }; + MeSH_Aml_eg_db = derive2 { name="MeSH.Aml.eg.db"; version="1.9.0"; sha256="15393b8pyh8xclbi43q3iv6lvza7az7zyc2zcmj2wnqx8x9nn50p"; depends=[MeSHDbi]; }; + MeSH_Ana_eg_db = derive2 { name="MeSH.Ana.eg.db"; version="1.9.0"; sha256="0r1q383f5p92f238m7w0gxalfr8w638ij4dj8zm1b20qakwb8bk6"; depends=[MeSHDbi]; }; + MeSH_Ani_FGSC_eg_db = derive2 { name="MeSH.Ani.FGSC.eg.db"; version="1.9.0"; sha256="1fv6hfqx562qiy87h7bjym72ffygfgdfx0miwbnwd1wblbrs4m23"; depends=[MeSHDbi]; }; + MeSH_Ath_eg_db = derive2 { name="MeSH.Ath.eg.db"; version="1.9.0"; sha256="0m78hqfcpnfbq7dm28l24ckhz91sbq3mgi0qdkn6l69rg19l5xwr"; depends=[MeSHDbi]; }; + MeSH_Bfl_eg_db = derive2 { name="MeSH.Bfl.eg.db"; version="1.9.0"; sha256="1s180b36nz4g7w2c49c4dddz4362ps45fjbs8q07s8d5r826wil0"; depends=[MeSHDbi]; }; + MeSH_Bsu_168_eg_db = derive2 { name="MeSH.Bsu.168.eg.db"; version="1.9.0"; sha256="0s0bskw9y5gbf80xf7sh43csa8mwi0h4ka2dai6jm763jdal645s"; depends=[MeSHDbi]; }; + MeSH_Bta_eg_db = derive2 { name="MeSH.Bta.eg.db"; version="1.9.0"; sha256="1nfy0fa7jnlsq823jq1im6zimnanqx6hc4z9sa2mhpn8yw3hrzcy"; depends=[MeSHDbi]; }; + MeSH_Cal_SC5314_eg_db = derive2 { name="MeSH.Cal.SC5314.eg.db"; version="1.9.0"; sha256="111q80xyfnz9p8230wnm0xkam2p25drbcb2nyr68lpz3l02m9c72"; depends=[MeSHDbi]; }; + MeSH_Cbr_eg_db = derive2 { name="MeSH.Cbr.eg.db"; version="1.9.0"; sha256="0xpm52xshhjw0lazfz9zhk3wiqas88aabin58iqykbyivnaxgiw8"; depends=[MeSHDbi]; }; + MeSH_Cel_eg_db = derive2 { name="MeSH.Cel.eg.db"; version="1.9.0"; sha256="1ni1w608mr28fapxhxj5icf1yjq6wrnqfhxc8bf5q5qqpnb34k16"; depends=[MeSHDbi]; }; + MeSH_Cfa_eg_db = derive2 { name="MeSH.Cfa.eg.db"; version="1.9.0"; sha256="0c1rxpsavj4j9sndr2bigyxsdg7hm3ckbk2rai2gz125vwlfy9ll"; depends=[MeSHDbi]; }; + MeSH_Cin_eg_db = derive2 { name="MeSH.Cin.eg.db"; version="1.9.0"; sha256="10zxx8hpd72dad1ais9qr1ahkrqygmrzj2zph8n7zwvcys3mqqqg"; depends=[MeSHDbi]; }; + MeSH_Cja_eg_db = derive2 { name="MeSH.Cja.eg.db"; version="1.9.0"; sha256="0g8dafmjls4lafbg3a484iym0df173szvnzfqz272sh32a69ikgb"; depends=[MeSHDbi]; }; + MeSH_Cpo_eg_db = derive2 { name="MeSH.Cpo.eg.db"; version="1.9.0"; sha256="0r4yrxflppzf21zfiyq1hxsjjgm7a3akj18qly8576nl94py0h16"; depends=[MeSHDbi]; }; + MeSH_Cre_eg_db = derive2 { name="MeSH.Cre.eg.db"; version="1.9.0"; sha256="1aicx7f7mpawq9mbrdkpach2n8yz2isqfqxcqx355js8csdnai6y"; depends=[MeSHDbi]; }; + MeSH_Dan_eg_db = derive2 { name="MeSH.Dan.eg.db"; version="1.9.0"; sha256="1d829frcmx9h0yn4dk2ddhqjjf4kz6n0c8nag31n5viaj0jrxhz9"; depends=[MeSHDbi]; }; + MeSH_Dda_3937_eg_db = derive2 { name="MeSH.Dda.3937.eg.db"; version="1.9.0"; sha256="0zx7s0xbqxl2xs1xhv5q3ppr33zfyjs4c5cmfp904k21fp1gyxk0"; depends=[MeSHDbi]; }; + MeSH_Ddi_AX4_eg_db = derive2 { name="MeSH.Ddi.AX4.eg.db"; version="1.9.0"; sha256="1sahvwvh29m2icqi3l4ain817cmlajklmc6w32ay5ydbxdl2k2aq"; depends=[MeSHDbi]; }; + MeSH_Der_eg_db = derive2 { name="MeSH.Der.eg.db"; version="1.9.0"; sha256="0g8z6cdz5wad9fhzd0f7p7961kjv1icfwxfskgimrb0dqn0vwngz"; depends=[MeSHDbi]; }; + MeSH_Dgr_eg_db = derive2 { name="MeSH.Dgr.eg.db"; version="1.9.0"; sha256="1g68dv597h62kidkaxmyj67jpz49aklr77hf0zy0n556whb0gjw0"; depends=[MeSHDbi]; }; + MeSH_Dme_eg_db = derive2 { name="MeSH.Dme.eg.db"; version="1.9.0"; sha256="18r1mfmszsypp6iwdfcdlxzbz2ym53q160y5740d20nf18jwdkyl"; depends=[MeSHDbi]; }; + MeSH_Dmo_eg_db = derive2 { name="MeSH.Dmo.eg.db"; version="1.9.0"; sha256="09r83x7c3ascv5k10izbsybbchng578f88cqcc34a71h01ccvbgl"; depends=[MeSHDbi]; }; + MeSH_Dpe_eg_db = derive2 { name="MeSH.Dpe.eg.db"; version="1.9.0"; sha256="0c6yi84drl1kp270ifhkha6s5555pmx122r3zsh5lqip4pf36ik0"; depends=[MeSHDbi]; }; + MeSH_Dre_eg_db = derive2 { name="MeSH.Dre.eg.db"; version="1.9.0"; sha256="0za05dgsy67sl1rg827mn4iir2fcwqgnmmifppdkmg5bcqvh3sli"; depends=[MeSHDbi]; }; + MeSH_Dse_eg_db = derive2 { name="MeSH.Dse.eg.db"; version="1.9.0"; sha256="1m8vszsdql5vnbavrdazrf0d88nq8c08bz9fggr1799fmh9ivppi"; depends=[MeSHDbi]; }; + MeSH_Dsi_eg_db = derive2 { name="MeSH.Dsi.eg.db"; version="1.9.0"; sha256="1sjm22yl4a9lwv6j5hhs16zs39fv9xvaga2bgb55rv6i1zbw514v"; depends=[MeSHDbi]; }; + MeSH_Dvi_eg_db = derive2 { name="MeSH.Dvi.eg.db"; version="1.9.0"; sha256="0lll6xsxccxg04nnbchkq3rskzqj70czky27yhn99dpnb7cl2gpk"; depends=[MeSHDbi]; }; + MeSH_Dya_eg_db = derive2 { name="MeSH.Dya.eg.db"; version="1.9.0"; sha256="0fny3nxwpihh505h54b82bf22p74xhf89xns9n7wgsg6j7zr1q49"; depends=[MeSHDbi]; }; + MeSH_Eco_55989_eg_db = derive2 { name="MeSH.Eco.55989.eg.db"; version="1.9.0"; sha256="0jklkvqwajnprs951ws5fxjxkx1dqmi7nldb854wciyanya7srbz"; depends=[MeSHDbi]; }; + MeSH_Eco_ED1a_eg_db = derive2 { name="MeSH.Eco.ED1a.eg.db"; version="1.9.0"; sha256="0gmjpbqcrg700fi4qgg9cxny8rwclpg9sbrg2yqpnpiwfp3m1xp9"; depends=[MeSHDbi]; }; + MeSH_Eco_IAI39_eg_db = derive2 { name="MeSH.Eco.IAI39.eg.db"; version="1.9.0"; sha256="126xn0dgw08xdjw0sqm80v3pwqlmjzarifq1s3s81qkd814pij2y"; depends=[MeSHDbi]; }; + MeSH_Eco_K12_MG1655_eg_db = derive2 { name="MeSH.Eco.K12.MG1655.eg.db"; version="1.9.0"; sha256="1zfq3h886x9kyislnl4mj6ksfmr4slmayw2f63wp3vhlqc8xlp6m"; depends=[MeSHDbi]; }; + MeSH_Eco_O157_H7_Sakai_eg_db = derive2 { name="MeSH.Eco.O157.H7.Sakai.eg.db"; version="1.9.0"; sha256="18n2aajv2m1s3y13w88jnxiwzmmqiplmp2la1fh6f34ywsc8vcf2"; depends=[MeSHDbi]; }; + MeSH_Eco_UMN026_eg_db = derive2 { name="MeSH.Eco.UMN026.eg.db"; version="1.9.0"; sha256="1qhw2zbldsxr9mii73n5l2l3xgnnmfcdm5zlnj8q6maz0rg8npvc"; depends=[MeSHDbi]; }; + MeSH_Eqc_eg_db = derive2 { name="MeSH.Eqc.eg.db"; version="1.9.0"; sha256="0siyszvzgy61f44mk6hgg215jin92i1bpyld932f3ydkb2cg1vii"; depends=[MeSHDbi]; }; + MeSH_Gga_eg_db = derive2 { name="MeSH.Gga.eg.db"; version="1.9.0"; sha256="1r5ighzpbw3rbi9pv75xgdxz34yl7d4nimc3423fva6m25bl14f1"; depends=[MeSHDbi]; }; + MeSH_Gma_eg_db = derive2 { name="MeSH.Gma.eg.db"; version="1.9.0"; sha256="0m3f9vkl97drciv68qvb6b1zxg4376sgrxd5fn7r8v6jnk3764h6"; depends=[MeSHDbi]; }; + MeSH_Hsa_eg_db = derive2 { name="MeSH.Hsa.eg.db"; version="1.9.0"; sha256="0kbf04jgy9sdq99x7c3j6fk1d1p746sm5h0wgcc496hmj9f3d7xq"; depends=[MeSHDbi]; }; + MeSH_Laf_eg_db = derive2 { name="MeSH.Laf.eg.db"; version="1.9.0"; sha256="1s96nh30gg3q6agvd75h8wkmsna753wlhh79fb563plkhynila3j"; depends=[MeSHDbi]; }; + MeSH_Lma_eg_db = derive2 { name="MeSH.Lma.eg.db"; version="1.9.0"; sha256="0f49mvvrigq06m6wsf2bn5b2k06c5azfnzks8z8h91h7p1cdn239"; depends=[MeSHDbi]; }; + MeSH_Mdo_eg_db = derive2 { name="MeSH.Mdo.eg.db"; version="1.9.0"; sha256="1nlqqgwcaic49lr7qknm4fnr28iy5a5g8pln9ay5c94d82ihaanj"; depends=[MeSHDbi]; }; + MeSH_Mes_eg_db = derive2 { name="MeSH.Mes.eg.db"; version="1.9.0"; sha256="0s8hfixk8axy155rhv9frnvdannm7fwv8xbnn4yqrqz97s0w3l8x"; depends=[MeSHDbi]; }; + MeSH_Mga_eg_db = derive2 { name="MeSH.Mga.eg.db"; version="1.9.0"; sha256="0kc1zv1rlw6sg72z5if2ljyyb99nn9jj67z0x77zpjil15igjq0f"; depends=[MeSHDbi]; }; + MeSH_Miy_eg_db = derive2 { name="MeSH.Miy.eg.db"; version="1.9.0"; sha256="07n81wg4g7r554xs4ziv637mz22ycmn5h03v2a1bl4gfagmp2wga"; depends=[MeSHDbi]; }; + MeSH_Mml_eg_db = derive2 { name="MeSH.Mml.eg.db"; version="1.9.0"; sha256="1sss6f5c039vic2kbxf5zchxx6qqdpysbwfb04xqn7vb0h5xs9aa"; depends=[MeSHDbi]; }; + MeSH_Mmu_eg_db = derive2 { name="MeSH.Mmu.eg.db"; version="1.9.0"; sha256="1lmy5rqpsxrmcc1zshj2dygdyrw5i95bmp9d31686h2pf7rxjxa7"; depends=[MeSHDbi]; }; + MeSH_Mtr_eg_db = derive2 { name="MeSH.Mtr.eg.db"; version="1.9.0"; sha256="1j892b88xpf1lcz6lv7n0b2lmqda3j6na6lm18qrmnydvihsrglz"; depends=[MeSHDbi]; }; + MeSH_Nle_eg_db = derive2 { name="MeSH.Nle.eg.db"; version="1.9.0"; sha256="0mnyhj6cfzgar0rsfzza9vydh3kiimyix732zm80gsj7xq844hs4"; depends=[MeSHDbi]; }; + MeSH_Oan_eg_db = derive2 { name="MeSH.Oan.eg.db"; version="1.9.0"; sha256="1gmlg22jdspcv6056iax16hk6vry739s7px1c0vpgmsblj8blzjv"; depends=[MeSHDbi]; }; + MeSH_Ocu_eg_db = derive2 { name="MeSH.Ocu.eg.db"; version="1.9.0"; sha256="05qsamqm7dimvghka10z03shchx08gxaf7bv488djia9msw04l3w"; depends=[MeSHDbi]; }; + MeSH_Oni_eg_db = derive2 { name="MeSH.Oni.eg.db"; version="1.9.0"; sha256="0h0027wgxm5ngk7087hcw1n2xx04q0sgfcpgmv2wn3f88mh42r9l"; depends=[MeSHDbi]; }; + MeSH_Osa_eg_db = derive2 { name="MeSH.Osa.eg.db"; version="1.9.0"; sha256="1cgbalyamgf1aj48ndhby8x3mzdwn8aiv9nrh8mpyz9zssl0ywdm"; depends=[MeSHDbi]; }; + MeSH_PCR_db = derive2 { name="MeSH.PCR.db"; version="1.9.0"; sha256="0wwnjqc0rvymh9fzh8l9hnlmaymchp54v9fqavxl3cwr2jjyyxis"; depends=[MeSHDbi]; }; + MeSH_Pab_eg_db = derive2 { name="MeSH.Pab.eg.db"; version="1.9.0"; sha256="0s869r4pz02d9k4dcg7qxy75h44x6lli8hxm3f9fjmmvv6cv18zs"; depends=[MeSHDbi]; }; + MeSH_Pae_PAO1_eg_db = derive2 { name="MeSH.Pae.PAO1.eg.db"; version="1.9.0"; sha256="07krh3k6d1q9dadphs07sapyv3dfmlhdmgcfrrramixx7paqqd1a"; depends=[MeSHDbi]; }; + MeSH_Pfa_3D7_eg_db = derive2 { name="MeSH.Pfa.3D7.eg.db"; version="1.9.0"; sha256="03bs083cvgd5gwy0n2hqq08r8fzw426a4fjx7yg9ypp6316bp03b"; depends=[MeSHDbi]; }; + MeSH_Pto_eg_db = derive2 { name="MeSH.Pto.eg.db"; version="1.9.0"; sha256="0snydy5c7y0437qndc7ki3nswbr3jfj2fssdiqa3yfrbd4dgl8fs"; depends=[MeSHDbi]; }; + MeSH_Ptr_eg_db = derive2 { name="MeSH.Ptr.eg.db"; version="1.9.0"; sha256="1g6q20hk4v2kwjj9shrwyrf068qv8zrz4dlv58id1im0h6kzi1bq"; depends=[MeSHDbi]; }; + MeSH_Rno_eg_db = derive2 { name="MeSH.Rno.eg.db"; version="1.9.0"; sha256="0wdwy7jqy47flyk25fv51l2acg7lisf240sli9snf0hl4rg2m8sh"; depends=[MeSHDbi]; }; + MeSH_Sce_S288c_eg_db = derive2 { name="MeSH.Sce.S288c.eg.db"; version="1.9.0"; sha256="193amf74qwglzdpgc4b9f2g0jxs2s5ilfwzk5gpzzsyr6z19m8sx"; depends=[MeSHDbi]; }; + MeSH_Sco_A32_eg_db = derive2 { name="MeSH.Sco.A32.eg.db"; version="1.9.0"; sha256="1wpl49hsz2la272mp836cgqnncyddknrfbfalikwrbydcpdflmqj"; depends=[MeSHDbi]; }; + MeSH_Sil_eg_db = derive2 { name="MeSH.Sil.eg.db"; version="1.9.0"; sha256="0x1s4qs17sy7pz1bhlgfzgvixf50h4wcpa885600f5jv80piz10w"; depends=[MeSHDbi]; }; + MeSH_Spo_972h_eg_db = derive2 { name="MeSH.Spo.972h.eg.db"; version="1.9.0"; sha256="0959hmphr884az46y6zvsmi28vsz66y3jf09f2hki6cwg7gp28l2"; depends=[MeSHDbi]; }; + MeSH_Spu_eg_db = derive2 { name="MeSH.Spu.eg.db"; version="1.9.0"; sha256="1fdwj5dpfpm8cbq5i1wk3n5qq0ygw876shpxiqlj7i7a8yrnikqg"; depends=[MeSHDbi]; }; + MeSH_Ssc_eg_db = derive2 { name="MeSH.Ssc.eg.db"; version="1.9.0"; sha256="1mrmxpi4zkj77qnr5gsx7nnmhz3h7w07mji0khahd1cnkdqb455g"; depends=[MeSHDbi]; }; + MeSH_Syn_eg_db = derive2 { name="MeSH.Syn.eg.db"; version="1.9.0"; sha256="04wrimmnwhzqhk88jp059h5wpj0wh35ilgzfmn7m66igbiywsyiq"; depends=[MeSHDbi]; }; + MeSH_Tbr_9274_eg_db = derive2 { name="MeSH.Tbr.9274.eg.db"; version="1.9.0"; sha256="1wida7bmggiamd8bw7sx3sc84rjhpa6c7kgbz7ppf5z5zzabxwj8"; depends=[MeSHDbi]; }; + MeSH_Tgo_ME49_eg_db = derive2 { name="MeSH.Tgo.ME49.eg.db"; version="1.9.0"; sha256="0s7792dcgh5ilanr4nnkfcf95j4yndsncr63ybw8g5kp14qw3b6i"; depends=[MeSHDbi]; }; + MeSH_Tgu_eg_db = derive2 { name="MeSH.Tgu.eg.db"; version="1.9.0"; sha256="19g80bjw7h0f4w3mlrj56xmsdf46bjvs2bykf7hbz911qblkmd08"; depends=[MeSHDbi]; }; + MeSH_Vvi_eg_db = derive2 { name="MeSH.Vvi.eg.db"; version="1.9.0"; sha256="0x5amvf092r97zkzivsks99q4iaw9cnwpk2mjq8qjfrj2fg9mghc"; depends=[MeSHDbi]; }; + MeSH_Xla_eg_db = derive2 { name="MeSH.Xla.eg.db"; version="1.9.0"; sha256="0h2kndx4xva57hhapzkwnk4by05vpcrgqakc5cpil11in9wwm4gw"; depends=[MeSHDbi]; }; + MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.9.0"; sha256="11gssp2rm9jln3bhallxhscn1vlp62yv1dqsshswzhda230pwsk8"; depends=[MeSHDbi]; }; + MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.9.0"; sha256="1pn4v8hp2g9i6d0wn7yj28fg6nfrlxi2zw7svmqlqf0n15sj4g91"; depends=[MeSHDbi]; }; + MeSH_db = derive2 { name="MeSH.db"; version="1.9.0"; sha256="1vljxgv6x7417sash10mjmwdqs6xmqhwxdsf5n8nn3bw283k0jkv"; 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]; }; @@ -233,8 +231,8 @@ in with self; { Mus_musculus = derive2 { name="Mus.musculus"; version="1.3.1"; sha256="143zdf83gbfqhy8jm9df7gzhw5q3a64jrjrxrzjf0zd76j8s8j6y"; depends=[AnnotationDbi GenomicFeatures GO_db org_Mm_eg_db OrganismDbi TxDb_Mmusculus_UCSC_mm10_knownGene]; }; 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.4.0"; sha256="1s50z6g6azm9jbxbfq2qlciapm31pv5rsylgpy4p0wsc9dbxh723"; depends=[AnnotationDbi]; }; + PANTHER_db = derive2 { name="PANTHER.db"; version="1.0.4"; sha256="1vl8anixkhcb9axlszk479yaw48bz1hhgmff41nqk8k8w4jkyn1y"; depends=[AnnotationDbi RSQLite]; }; + PFAM_db = derive2 { name="PFAM.db"; version="3.5.0"; sha256="14c85j6ms6cqfifpsihn6ajk6b317gw2b904skv4dqclbgcg6ymx"; 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]; }; @@ -247,42 +245,41 @@ in with self; { SHDZ_db = derive2 { name="SHDZ.db"; version="3.2.3"; sha256="077xy2zx3f4c01di18ki32xmrwgsc1qjci3wj33nmgsy5925zdxs"; depends=[AnnotationDbi org_Hs_eg_db]; }; SIFT_Hsapiens_dbSNP132 = derive2 { name="SIFT.Hsapiens.dbSNP132"; version="1.0.2"; sha256="1akqhmv9hp41q2jrvz4xvpdi30c4c6v4xbz6ykn6pdf0217p7xry"; depends=[AnnotationDbi RSQLite VariantAnnotation]; }; SIFT_Hsapiens_dbSNP137 = derive2 { name="SIFT.Hsapiens.dbSNP137"; version="1.0.0"; sha256="1472abqanbwziyynr851xzhg7ck8w1n98ymmggg7s46hzix5mlj8"; depends=[AnnotationDbi RSQLite VariantAnnotation]; }; - SNPlocs_Hsapiens_dbSNP_20090506 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20090506"; version="0.99.9"; sha256="10943wbc56mz8ywcd71ndbdz7h3a9a17mzfdvj237wsgp62arfh6"; depends=[BSgenome GenomicRanges IRanges]; }; - SNPlocs_Hsapiens_dbSNP_20100427 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20100427"; version="0.99.7"; sha256="16m15sqxnczb399bcy7nll804h4955f6w8mag5jlda6h11yh732z"; depends=[GenomicRanges IRanges S4Vectors]; }; SNPlocs_Hsapiens_dbSNP_20101109 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20101109"; version="0.99.7"; sha256="1r1gvx563gv1lidi099yw7lvf8c0983yck9yf8r8iypiz1d4az73"; depends=[GenomicRanges IRanges S4Vectors]; }; - SNPlocs_Hsapiens_dbSNP_20110815 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20110815"; version="0.99.7"; sha256="0nvpa44xy7zb9q63max1q0pmfibh976blmnirryxcca20j41f8ic"; depends=[GenomicRanges IRanges S4Vectors]; }; - SNPlocs_Hsapiens_dbSNP_20111119 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20111119"; version="0.99.7"; sha256="1znblqzb1hx5yjs2g387l3az8dga51si5blpwngvs0zbbdypgww8"; depends=[GenomicRanges IRanges S4Vectors]; }; - SNPlocs_Hsapiens_dbSNP_20120608 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20120608"; version="0.99.10"; sha256="10crnx5jk2790h936j515jgdf2mirzzmlnvn6pbp81fd5imkvdpd"; depends=[BSgenome GenomicRanges IRanges]; }; - SNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.10"; sha256="1a8ic2naa6bqc1fcylxc81j51xmc249fn40nk4yrvpjz59d6h381"; depends=[BSgenome GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP_20120608 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20120608"; version="0.99.11"; sha256="0a1nyni8h3a7sq2sj5jfn3w6abkl5lwzbzhb8kg74v4359albcgm"; depends=[BSgenome GenomicRanges IRanges]; }; + SNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.11"; sha256="1dl5gs9iqdvaplvggpngp37pzgbjaavw98qppv2cp65ih9rn0wc0"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; SNPlocs_Hsapiens_dbSNP142_GRCh37 = derive2 { name="SNPlocs.Hsapiens.dbSNP142.GRCh37"; version="0.99.5"; sha256="13kmgfwzwmbrwd2g24a3cbp634jih7jigzhzq55bzzf3js48h3n3"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges]; }; - SNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="SNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.11"; sha256="069fkjplii6p63w8b3fjk87ynl5xv7d5bgnr78ia2n95yv6iqzjw"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - SNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.11"; sha256="1wzxb7d8v3yx8fvra4yy1zyvvh0l53ad87ksp3i1xj413cvph671"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="SNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.20"; sha256="1z8kx43ki1jvj7ms7pcybakcdimfwr6zpjvspkjmma97bdz093iz"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.20"; sha256="0yxmsnxncr7w30r0d7bg5i96pclm2vf40p9jdqa02rc67a6sximn"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP149_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP149.GRCh38"; version="0.99.20"; sha256="17bv25p1261hn9d7mxfp6pvivj15pxyvr92gms8a8msfqg9y0xkb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP150_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP150.GRCh38"; version="0.99.20"; sha256="0jkwwgxxpm9ry8kizq8hs70sky41pks1ag40y5aqq91yjbpqlckj"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; 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.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_Btaurus_UCSC_bosTau8_refGene = derive2 { name="TxDb.Btaurus.UCSC.bosTau8.refGene"; version="3.4.2"; sha256="1p7yhxdlmr4fbp4mxakdwp2xf609ws6pyrjl8xq3ilzhf6fyypim"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Celegans_UCSC_ce11_refGene = derive2 { name="TxDb.Celegans.UCSC.ce11.refGene"; version="3.4.2"; sha256="0g4l5r6mqvjsvq3q6kzlvi0w75hm2bxdq0p0pbdpdm8lf9d5aca3"; 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_Cfamiliaris_UCSC_canFam3_refGene = derive2 { name="TxDb.Cfamiliaris.UCSC.canFam3.refGene"; version="3.4.2"; sha256="19vr9wi2hspsij7gwq7wnlg94zlcqvn639z3jr8s3yngr89d9mnj"; 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.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_Dmelanogaster_UCSC_dm6_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm6.ensGene"; version="3.4.1"; sha256="0sdw0gbk84lfjmiyy2x4q01zh1vbjq3vfziwxkb4h0v6nab63k01"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Drerio_UCSC_danRer10_refGene = derive2 { name="TxDb.Drerio.UCSC.danRer10.refGene"; version="3.4.2"; sha256="1cqc7vlv2jrznh9s0yb70nwy0a2pa7iswr4m253zx6p197igf33l"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Ggallus_UCSC_galGal4_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal4.refGene"; version="3.4.2"; sha256="0d7wqrg69kj65rga9m473ji1s9251gvz6l071ibqmga31imrgb9l"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Ggallus_UCSC_galGal5_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal5.refGene"; version="3.4.2"; sha256="1j68yqfbnas21za7y63p1kpi85jbxb7l3m6i50ig9mp6mmvy7i26"; 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.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_Mmulatta_UCSC_rheMac3_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac3.refGene"; version="3.4.2"; sha256="1k2kaik3zvnx3giia1dps06073xkbvd4dva6npskkvzhvqpfxq41"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Mmulatta_UCSC_rheMac8_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac8.refGene"; version="3.4.2"; sha256="1wma6pm5v9qv29h76p7aj7kwq0l857as0wgya3ryj3mynhsf9j9j"; 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.4.0"; sha256="08kihk3sl1hw32rf8122y03grbg1xdbc84z1b2ldnf752xr4zn9x"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Ptroglodytes_UCSC_panTro4_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro4.refGene"; version="3.4.2"; sha256="0gqrv5n1c63p5cdl1c0l866x9qgfqf6w23p6m12zaxn8riacdnyi"; 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.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_Rnorvegicus_UCSC_rn5_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn5.refGene"; version="3.4.2"; sha256="11yxvr20dmjjxw4pyxfnxy8znlxr48xqq9hb6k95y9dyqnir0vik"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Rnorvegicus_UCSC_rn6_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn6.refGene"; version="3.4.1"; sha256="08w4279c5aq5pazbbdji344lxz113n763q8j2mlagcwfs9r5k9sk"; 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.4.0"; sha256="0jpvb3phw0967my7afk8scsjzpq1x0i2za534ndizzql3cp45yh7"; depends=[AnnotationDbi GenomicFeatures]; }; @@ -294,22 +291,22 @@ in with self; { agcdf = derive2 { name="agcdf"; version="2.18.0"; sha256="07hq41dwqs7yy2sck8p7zl3v9x4bgl35kkycpazz5ql2g5zy6b7j"; depends=[AnnotationDbi]; }; agprobe = derive2 { name="agprobe"; version="2.18.0"; sha256="1vnawamcpz16na8nmlq2czfxcr325fwdnngxl65mmnbd0f4lmy3k"; 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]; }; + anopheles_db0 = derive2 { name="anopheles.db0"; version="3.5.0"; sha256="0ycprvhry525p4hmxng2swcf92m9fsyqcj8na13q9i5p6s1sl5b2"; depends=[AnnotationDbi]; }; + arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.5.0"; sha256="0xpa7d15av8pa2l5ksx8mcabhyfdxyk1hw2sd1gdyhyfcn7mjxky"; 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.4.1"; sha256="113pi0dr4jc0vr2gfm8pkavz72s16bw3l6ml3hmvzjy89yg9r0s0"; depends=[AnnotationDbi]; }; + bovine_db0 = derive2 { name="bovine.db0"; version="3.5.0"; sha256="0h02wrj18c24rgkbdnva5qc3znn30i5357c9rzww7y4brhhww8ma"; 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.4.1"; sha256="11imzg70ffkfnb1q6i9q3mj033ncl9pmzpkv2wp3nc3l5nz8z2sg"; depends=[AnnotationDbi]; }; + canine_db0 = derive2 { name="canine.db0"; version="3.5.0"; sha256="1a7qn0jg1yw8222k72058ymbws14fs0y6m4girxzs3v8xbyxji7v"; 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]; }; @@ -319,20 +316,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.4.1"; sha256="0gfd9nrkdnjymqdssijp5r9mdj2r6bmnkf6y4xh6ri90b02d1xpf"; depends=[AnnotationDbi]; }; + chicken_db0 = derive2 { name="chicken.db0"; version="3.5.0"; sha256="134ch8bgzjdra9pycs49lmak380qgx71dbmr1s276pyf3h67fzxp"; 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.4.1"; sha256="06z4kmpnsj98mi5j0ahz57grlbdqb8ycl8rf592561lvmzzdfs8h"; depends=[AnnotationDbi]; }; + chimp_db0 = derive2 { name="chimp.db0"; version="3.5.0"; sha256="12smymvq4l7aw454lah9gd0rywgi3bcbd3vf8h6a93y2mnhdxz9q"; 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]; }; + clariomdhumanprobeset_db = derive2 { name="clariomdhumanprobeset.db"; version="8.7.0"; sha256="039bsywnim0nr8b3w6vkj4m20j0pggnm6ajjz24bnlikm9zzrs6l"; depends=[AnnotationDbi org_Hs_eg_db]; }; + clariomdhumantranscriptcluster_db = derive2 { name="clariomdhumantranscriptcluster.db"; version="8.7.0"; sha256="0lp6qb4f3qsm3krcagl5fd403i5yz5apimf57wlrj99r8zrax4s2"; depends=[AnnotationDbi org_Hs_eg_db]; }; + clariomshumanhttranscriptcluster_db = derive2 { name="clariomshumanhttranscriptcluster.db"; version="8.7.0"; sha256="1f9lqyr0slynb317vp4bys3s9y9ivxnyayy6zh8cilsdz64glzmj"; depends=[AnnotationDbi org_Hs_eg_db]; }; + clariomshumantranscriptcluster_db = derive2 { name="clariomshumantranscriptcluster.db"; version="8.7.0"; sha256="0f6g20zymxnamhspv18cz32qd842nxwyf8mwznsn5yhf3brab437"; depends=[AnnotationDbi org_Hs_eg_db]; }; + clariomsmousehttranscriptcluster_db = derive2 { name="clariomsmousehttranscriptcluster.db"; version="8.7.0"; sha256="0xzzyy8ppwgii0ymkg4agrhw84qgb6hdr8pyh8flyqyd2xbih9xa"; depends=[AnnotationDbi org_Mm_eg_db]; }; + clariomsmousetranscriptcluster_db = derive2 { name="clariomsmousetranscriptcluster.db"; version="8.7.0"; sha256="1rf06mj4s6dqi77982wjjs0ssb53j4rk7q4k9wq6iwj4xgz29npk"; depends=[AnnotationDbi org_Mm_eg_db]; }; + clariomsrathttranscriptcluster_db = derive2 { name="clariomsrathttranscriptcluster.db"; version="8.7.0"; sha256="10qh0cz0jyy88nh43p3f0i588r0d8xqkgjr6s62i1273bkrpijr4"; depends=[AnnotationDbi org_Rn_eg_db]; }; + clariomsrattranscriptcluster_db = derive2 { name="clariomsrattranscriptcluster.db"; version="8.7.0"; sha256="1gh3jimr6jjkgh3zgvw9s1gynyawz8gckm9xghwsl9rii7vzy135"; 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]; }; @@ -345,43 +342,19 @@ 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.4.1"; sha256="1v9qa6pxwwc3ykh8nasi42vld07c9il0j72vfc8lpsxi9v56l5cs"; depends=[AnnotationDbi]; }; - ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.4.1"; sha256="18shfvqbv925xi694zv8c1mfxndrnsmkxdncncld11ra17wqs6cp"; depends=[AnnotationDbi]; }; + ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.5.0"; sha256="0g11rjb0373dc3a5m4padk43p4l204yw4lmvasnvk0p6cl0c4zlw"; depends=[AnnotationDbi]; }; + ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.5.0"; sha256="1cwafxgai0lfwv7fdicrla3lj6k5lv7wz3vz6a0vqzhna3wb3ajz"; 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]; }; - 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]; }; - gahgu133b_db = derive2 { name="gahgu133b.db"; version="2.2.0"; sha256="06hyjnr387wk40jjdk8gzqpfp4afjzva9fky3l4qs249ycy4snic"; depends=[AnnotationDbi]; }; - gahgu133bcdf = derive2 { name="gahgu133bcdf"; version="2.2.1"; sha256="0qbqirflzjy0is3m9zca1660aszxf947fa7d26baw6vm2b37qg4q"; depends=[]; }; - gahgu133bprobe = derive2 { name="gahgu133bprobe"; version="2.2.1"; sha256="1i8wcnp8434f6zxib86yhpm904clwg907x1hgjfsgy4viqa4jbqv"; depends=[AnnotationDbi]; }; - gahgu133plus2_db = derive2 { name="gahgu133plus2.db"; version="2.2.0"; sha256="1p48q1zqrjdvv6qq5br9v24fpryp2zy3z079nkgrgr4d2brvhab8"; depends=[AnnotationDbi]; }; - gahgu133plus2cdf = derive2 { name="gahgu133plus2cdf"; version="2.2.1"; sha256="1fmv6rrjbii1g5grcvgl13w814mbqqyqyav0wi82d30v4ijz58g9"; depends=[]; }; - gahgu133plus2probe = derive2 { name="gahgu133plus2probe"; version="2.2.1"; sha256="0r3vizwmvy0jmsqbplagkincj5xs71dk7csgwwv4arx80kbl9l9l"; depends=[AnnotationDbi]; }; - gahgu95av2_db = derive2 { name="gahgu95av2.db"; version="2.2.0"; sha256="1c1hc79rjisx7jd7sdlr2d1lnk621y8azshriia12b5z0l5j9m4h"; depends=[AnnotationDbi]; }; - gahgu95av2cdf = derive2 { name="gahgu95av2cdf"; version="2.2.1"; sha256="1ckcjlb4v9x9zynf5w1h5fgmdr4ck22h9bjfwz3n184v48wgi39r"; depends=[]; }; - gahgu95av2probe = derive2 { name="gahgu95av2probe"; version="2.2.1"; sha256="033zk49kp4r5in6yk3za8ll5wrchiklfrzc10c8lgqhpm6y8y5k2"; depends=[AnnotationDbi]; }; - gahgu95b_db = derive2 { name="gahgu95b.db"; version="2.2.0"; sha256="0v4lpbqqhm6mvpm0biykcq0ym1rb968zcwp9rg1lv6zka5arj9fq"; depends=[AnnotationDbi]; }; - gahgu95bcdf = derive2 { name="gahgu95bcdf"; version="2.2.1"; sha256="1f8yp4g3cjbl11x0wajln7bms3jhy6cbyh0bggm38gbb18gws4wg"; depends=[]; }; - gahgu95bprobe = derive2 { name="gahgu95bprobe"; version="2.2.1"; sha256="1lr91f57ym3lxz5bi9xm3g63vskw5js991h5zk4c2i2npi0x22gm"; depends=[AnnotationDbi]; }; - gahgu95c_db = derive2 { name="gahgu95c.db"; version="2.2.0"; sha256="1psjf511agrv7nma4wa39jgd82z82df42d5g8jvwjrm2wb6l2v4l"; depends=[AnnotationDbi]; }; - gahgu95ccdf = derive2 { name="gahgu95ccdf"; version="2.2.1"; sha256="1lcal0y48vhafikkrn744l1gxrnlhkh7jmmhb7pglc9ldh7x9azh"; depends=[]; }; - gahgu95cprobe = derive2 { name="gahgu95cprobe"; version="2.2.1"; sha256="155vnch85m6ph7av8j4ylrqajm3vc2v623qpkixqh06l4fy59pck"; depends=[AnnotationDbi]; }; - gahgu95d_db = derive2 { name="gahgu95d.db"; version="2.2.0"; sha256="0k0ricb8cl3xh93nq8rr3206w18b91ca67992cc5b2fbaf8lxlba"; depends=[AnnotationDbi]; }; - gahgu95dcdf = derive2 { name="gahgu95dcdf"; version="2.2.1"; sha256="181h5i9ywpn6vwdvcd2sq5yxkx41h09plgqsdfigw5w7816524k6"; depends=[]; }; - gahgu95dprobe = derive2 { name="gahgu95dprobe"; version="2.2.1"; sha256="0znll2h3cm1sbyzjk121fxizs4qv5jd80kslr5zhdd73dkdlzlbm"; depends=[AnnotationDbi]; }; - gahgu95e_db = derive2 { name="gahgu95e.db"; version="2.2.0"; sha256="1qbsshgvzfavpjrawn3lbl0pcfwl0g7n8vr1109gvax6gj00la7n"; depends=[AnnotationDbi]; }; - gahgu95ecdf = derive2 { name="gahgu95ecdf"; version="2.2.1"; sha256="1bsh380h7ai4l6j8jjz8yzfdwgxyhpnqm5fnb6mgma76xbiwab4b"; depends=[]; }; - gahgu95eprobe = derive2 { name="gahgu95eprobe"; version="2.2.1"; sha256="0c4zx8d7qsb3xhy0prfh7l6xbklgpxbbznqhq9mmgjb8qh5g9ygz"; depends=[AnnotationDbi]; }; + fitCons_UCSC_hg19 = derive2 { name="fitCons.UCSC.hg19"; version="3.6.0"; sha256="08wfrcmbpgbgfzfr9gpg25073905fhz14s8jz2wckdmhwjlgavky"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + fly_db0 = derive2 { name="fly.db0"; version="3.5.0"; sha256="18r1m5b6v4km9cdyd0pkxvargh2bcz876y8iwqhbxkf16b9d70qj"; depends=[AnnotationDbi]; }; genomewidesnp5Crlmm = derive2 { name="genomewidesnp5Crlmm"; version="1.0.6"; sha256="06dmwnjy3gb53y6nr02dmp22qzfl5d63wppazrabcqbzwimhnvp8"; depends=[]; }; genomewidesnp6Crlmm = derive2 { name="genomewidesnp6Crlmm"; version="1.0.7"; sha256="16qcxa32fmbdcv5dck0grsnqyfcqql7wpxa1l6andv9hrvabv2jx"; depends=[]; }; gp53cdf = derive2 { name="gp53cdf"; version="2.18.0"; sha256="11p69rxia8bqajix3jg34vnhczyxgpq50k5kdh878h7bn0mpg6bj"; depends=[AnnotationDbi]; }; - grasp2db = derive2 { name="grasp2db"; version="0.1.14"; sha256="14y25k1fwh0272ws83rcpi25wc97r4z5mpmck8q9i9nshd5dmym4"; depends=[AnnotationHub digest dplyr GenomeInfoDb RSQLite]; }; - greengenes13_5MgDb = derive2 { name="greengenes13.5MgDb"; version="0.99.0"; sha256="1ssh015yspl470wq5rnkxkb7xid27gzvga3hx9a9vj08iqal3rbq"; depends=[metagenomeFeatures]; }; + grasp2db = derive2 { name="grasp2db"; version="1.1.0"; sha256="1aq19myhcl9kdmzy8f4c3ilf0s0ng99rl58jja2xlmqsm2hik7ya"; depends=[AnnotationHub dbplyr digest dplyr GenomeInfoDb RSQLite]; }; + greengenes13_5MgDb = derive2 { name="greengenes13.5MgDb"; version="1.0.0"; sha256="0y9570c7cchwv9d5rgwhfz6k5qmi11g2smqq8q23z66iv333kii1"; depends=[metagenomeFeatures]; }; h10kcod_db = derive2 { name="h10kcod.db"; version="3.4.0"; sha256="0f30n339ib8q478a7axjdh8hzrqws762m680ha0sxm3a0nxwapgg"; depends=[AnnotationDbi org_Hs_eg_db]; }; h20kcod_db = derive2 { name="h20kcod.db"; version="3.4.0"; sha256="0csh59bgpn5xyaw6bfg7nvi9vcvjd4f66f0dr3xh7c6316835mnx"; depends=[AnnotationDbi org_Hs_eg_db]; }; hapmap370k = derive2 { name="hapmap370k"; version="1.0.1"; sha256="0n6rmrqcbl665a1l6jxk1gn6518x4gxadzy5dc9k9v01cbh3qzmw"; depends=[]; }; @@ -452,8 +425,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]; }; - 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]; }; + hta20probeset_db = derive2 { name="hta20probeset.db"; version="8.7.0"; sha256="12m58w0av2b806w75df7spg72d0v7mr7vlhsgdc9h221r0g06vgx"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hta20transcriptcluster_db = derive2 { name="hta20transcriptcluster.db"; version="8.7.0"; sha256="1aipxv8c6dwhhhxp0r75j79k038qk4jkmxcdzqiph3k0ylpikmb8"; 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=[]; }; @@ -493,20 +466,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.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]; }; + huex10stprobeset_db = derive2 { name="huex10stprobeset.db"; version="8.7.0"; sha256="14m5rkn9nksn84dlcl29wpahxsxhaswkcnc75mbsfagk5fh2qybj"; depends=[AnnotationDbi org_Hs_eg_db]; }; + huex10sttranscriptcluster_db = derive2 { name="huex10sttranscriptcluster.db"; version="8.7.0"; sha256="1xdsrx34625ad6sjkq166i8xlmwdwhsisi8dbjj6zkazg4mbxhd0"; 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.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]; }; + hugene10stprobeset_db = derive2 { name="hugene10stprobeset.db"; version="8.7.0"; sha256="170fdxmhbi6k115gbmvsmmq6hphbmj7yw23ycsjr9v963pwjk0ml"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene10sttranscriptcluster_db = derive2 { name="hugene10sttranscriptcluster.db"; version="8.7.0"; sha256="11wr9d6bp7yf66hdfx3vnp88brwkxwbxvfdnwyyffdpcaa92c6s3"; 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.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]; }; + hugene11stprobeset_db = derive2 { name="hugene11stprobeset.db"; version="8.7.0"; sha256="0nnq0mm04qlzfdslmwhjdww76h2zww4bdqfvs53580qzxnsbw2nl"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene11sttranscriptcluster_db = derive2 { name="hugene11sttranscriptcluster.db"; version="8.7.0"; sha256="11m9nc1l4rm8mwsnkiak7wdh6593q5x982k7iva4id8qrafykddx"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene20stprobeset_db = derive2 { name="hugene20stprobeset.db"; version="8.7.0"; sha256="047jc40r5z13xwxi1g64xvv8jkdx4k2xn53fqc87nm0qrcz4h1rm"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene20sttranscriptcluster_db = derive2 { name="hugene20sttranscriptcluster.db"; version="8.7.0"; sha256="0ba3yvizj9ya61rr9ik2hdxhy0q67908x16n58jjjfq8wf96h7sp"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene21stprobeset_db = derive2 { name="hugene21stprobeset.db"; version="8.7.0"; sha256="0chkxxpfl696qqiai3i30ylpsihyicbs0hbcni6nmnhfz9k5800g"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene21sttranscriptcluster_db = derive2 { name="hugene21sttranscriptcluster.db"; version="8.7.0"; sha256="0wk2lg74zkgxh6frmikhk4bxndiyvc1j7mhvz65w8fxfqiwfyf5i"; depends=[AnnotationDbi org_Hs_eg_db]; }; + human_db0 = derive2 { name="human.db0"; version="3.5.0"; sha256="0n1qrah9h7n4cjpvhqrimcl42p413i2wmkw6iglqg1gcbkbrihvh"; 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=[]; }; @@ -544,7 +517,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.4.1"; sha256="041qsj8dkpavjs444v5fyhfzl7p6s2fx6ny16m36ak3g0w528bnf"; depends=[AnnotationDbi]; }; + malaria_db0 = derive2 { name="malaria.db0"; version="3.5.0"; sha256="1q6m85ck84qg3fksmfmcrqd0s2yll9n6c3rcknh5ndmy30wdn9pl"; 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]; }; @@ -585,20 +558,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.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]; }; + moex10stprobeset_db = derive2 { name="moex10stprobeset.db"; version="8.7.0"; sha256="18cgynzjvfwj65v06b0fmxk1b13jlpd7ljaif9hp74hk6hs6gha9"; depends=[AnnotationDbi org_Mm_eg_db]; }; + moex10sttranscriptcluster_db = derive2 { name="moex10sttranscriptcluster.db"; version="8.7.0"; sha256="1nmswvrbh9awp2bk2lbklasng9m74d12yqhxy502wnlc8s18h482"; 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.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]; }; + mogene10stprobeset_db = derive2 { name="mogene10stprobeset.db"; version="8.7.0"; sha256="1yxl29fpp37h2w3sq2v9lmiks4m9ip9hlmasisxmqd5cvs2wnpmj"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene10sttranscriptcluster_db = derive2 { name="mogene10sttranscriptcluster.db"; version="8.7.0"; sha256="1k96334hvb17kxfvgiwih3pp2474fdcck9yv3h9jaf2mbbzg2q6z"; 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.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]; }; + mogene11stprobeset_db = derive2 { name="mogene11stprobeset.db"; version="8.7.0"; sha256="02lfkn65r4ylmjz1gy9qm63ia3javj601vm2yw06vpn9r0mkw74v"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene11sttranscriptcluster_db = derive2 { name="mogene11sttranscriptcluster.db"; version="8.7.0"; sha256="09fw9fsk0nqmyinhfjf8aqkfix7m7kjnf27xq85x4zf1vgbw2kl9"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene20stprobeset_db = derive2 { name="mogene20stprobeset.db"; version="8.7.0"; sha256="0a56rxqrv1vyykv8nmnq6682s3sxzwyrcjr29h585zy5w0gnvygp"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene20sttranscriptcluster_db = derive2 { name="mogene20sttranscriptcluster.db"; version="8.7.0"; sha256="1s7cdjglrc9qqf3gsmhsyycfa0h5qrbk28i4z3z4mb9g6242r1r4"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene21stprobeset_db = derive2 { name="mogene21stprobeset.db"; version="8.7.0"; sha256="0l8y2zbhykzqs9hbjhj1cys1mzdjhmi4rjv4l3v0sv5969h6sl96"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene21sttranscriptcluster_db = derive2 { name="mogene21sttranscriptcluster.db"; version="8.7.0"; sha256="1mkw3997mqr7ssa60zpwhlyajda51smcrnlnxwif78g99yj0nrxb"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mouse_db0 = derive2 { name="mouse.db0"; version="3.5.0"; sha256="1plw9bjk75qyn5lb2ybvwbq2hrq67fvx0mf2m4dhr88wlncfynl3"; 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=[]; }; @@ -609,8 +582,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]; }; - 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]; }; + mta10probeset_db = derive2 { name="mta10probeset.db"; version="8.7.0"; sha256="1bszj4wx7x8x4vdy1np755nx4m94hqwx43mg3ymbjb1hwfjv2cdr"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mta10transcriptcluster_db = derive2 { name="mta10transcriptcluster.db"; version="8.7.0"; sha256="1vsv943xwn7y1ghw4bcyyywl4m4y0gsckdxkfyd8lg36b2gq08q9"; 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]; }; @@ -635,28 +608,25 @@ 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.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.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.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.4.0"; sha256="1sbzmnxi9gvq3x86w6jw49qgzd7g58ilh1xmnvr840pz50b3n8j6"; depends=[AnnotationDbi]; }; + org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.5.0"; sha256="0dzd281yi2vikzr4civf38wy8gpsdr9k2ks9j6sa2rnsnpf1hnh9"; depends=[AnnotationDbi]; }; + org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.5.0"; sha256="1vpzciar4lwq5r8faz1mh9y085i71q0gcxz5c2gn9469qbi5ymmp"; depends=[AnnotationDbi]; }; + org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.5.0"; sha256="1qcl4px85qhim5nndj4j1ajyvby8ldbr0g0pml2q54wnjs9f8a8f"; depends=[AnnotationDbi]; }; + org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.5.0"; sha256="02ggchixlmzywhsbr0h2ms4dravv7m5964cjxqcjxqs16vjwlbk9"; depends=[AnnotationDbi]; }; + org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.5.0"; sha256="0rdiffd9v6g6cwrd23jspj0bxyds9l977pv27azagw1f7bkdqgbk"; depends=[AnnotationDbi]; }; + org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.5.0"; sha256="033qak1d3wwz17va0bh8z8p8arx0aw2va6gm1qfwsvdkj9cd9d7d"; depends=[AnnotationDbi]; }; + org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.5.0"; sha256="0854rqanjzscvlq7rj6bvlxcfyhwiqwi4lnw7abzvv0zcwvf07i0"; depends=[AnnotationDbi]; }; + org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.5.0"; sha256="0cydh8rj9r2g6wzs42sh6cf77fs0nrgww4jsy3x61aa0b8lngjxj"; depends=[AnnotationDbi]; }; + org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.5.0"; sha256="00s7p7wrjd57wvwxyhb2m603kms2pm67rr3m83dp2s0pa4ffggmr"; depends=[AnnotationDbi]; }; + org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.5.0"; sha256="1q5g9ka4fxjq5jp0mg6x8j44995y2r9hvs91qaan8xcmsa900q3q"; depends=[AnnotationDbi]; }; + org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.5.0"; sha256="1v6wa5613cjq59xd7x1qz8lr9nb2abm9abl2cci1khrnrlpla927"; depends=[AnnotationDbi]; }; + org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.5.0"; sha256="11q21p3ki4bn4hb3aix0g775l45l66jmas6m94nfhqqnpjhv4d6g"; depends=[AnnotationDbi]; }; + org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.5.0"; sha256="13ia5ipyif6cxj4gmw4jl0j84iwj4289k69qgfm6qsw4xdc8amln"; depends=[AnnotationDbi]; }; + org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.5.0"; sha256="08pldh0j1z9csbyzxn89xk9ir1av1dd4jbh79l04g4s34x13m8l8"; depends=[AnnotationDbi]; }; + org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.5.0"; sha256="1sbimln1v575pxzsgx4sw5712nwfy8n188limrnhwg7brj893wrl"; depends=[AnnotationDbi]; }; + org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.5.0"; sha256="11vnia08kblh3v4jypl6sw94p1n6702zskxj0gv4ijygaq61m5x4"; depends=[AnnotationDbi]; }; + org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.5.0"; sha256="1h3wa5g65hg9fdg722w520gb6c16zgccg62vxgd37gj9bdnywg5w"; depends=[AnnotationDbi]; }; + org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.5.0"; sha256="1wizm4dx6an2pfi322aykis41a6skhgv8yjyfl2pdi0kizlvw26c"; depends=[AnnotationDbi]; }; + org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.5.0"; sha256="1rhz86d0ly7z79pbaf7s8kw1sx9ys8bawfrcgs33km2dd2cgzzi0"; 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]; }; @@ -830,10 +800,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.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]; }; + phastCons100way_UCSC_hg19 = derive2 { name="phastCons100way.UCSC.hg19"; version="3.6.0"; sha256="09gnsrv37pzpbyx98vjcsi1kavazz4hkf7r48dggdad9lqg0fqnm"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + phastCons100way_UCSC_hg38 = derive2 { name="phastCons100way.UCSC.hg38"; version="3.6.0"; sha256="1g0yd623sb73h3nf1mszchiyw5mk4dlz2h7mqix9d8xdsqmrc81l"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + phastCons7way_UCSC_hg38 = derive2 { name="phastCons7way.UCSC.hg38"; version="3.6.0"; sha256="1p2kx6zrgc9yzkvmizzrlhhc75mnxpjgslpxm3kcmvsg12qd4zmz"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; }; + pig_db0 = derive2 { name="pig.db0"; version="3.5.0"; sha256="0xga9i0bicxbbc9rypwjw376qqg401smwwqjgkdgf4i5lrds0xi7"; 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]; }; @@ -850,26 +820,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.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]; }; + raex10stprobeset_db = derive2 { name="raex10stprobeset.db"; version="8.7.0"; sha256="1i5f6ygg3jq6msqacd1npnvcb3pp5a1c95na7rdd3818h27pj4vf"; depends=[AnnotationDbi org_Rn_eg_db]; }; + raex10sttranscriptcluster_db = derive2 { name="raex10sttranscriptcluster.db"; version="8.7.0"; sha256="18y7fkpg34d18xczc5xz5hcigfkd4fxzlhd1cvfadxjhjyaj5fhk"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene10stprobeset_db = derive2 { name="ragene10stprobeset.db"; version="8.7.0"; sha256="0ignrscm098xpnrp60lhnakgh4rwypzk6a5nh7miacxbs2mcy1lr"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene10sttranscriptcluster_db = derive2 { name="ragene10sttranscriptcluster.db"; version="8.7.0"; sha256="12w77ajis8ll25knmjm8cvnxjlgpj6n7j66lmww21y7dvg33gwlr"; 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.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]; }; + ragene11stprobeset_db = derive2 { name="ragene11stprobeset.db"; version="8.7.0"; sha256="0cc6cch0r2dlk689gsphcsf5ikbgyczslmq7r20q1cvgqxbzj6kp"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene11sttranscriptcluster_db = derive2 { name="ragene11sttranscriptcluster.db"; version="8.7.0"; sha256="195dx0splkvdwqn4h6nvmm3zd0sv3vhcjz1bp1qxgi6d5iakvkry"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene20stprobeset_db = derive2 { name="ragene20stprobeset.db"; version="8.7.0"; sha256="1p8qiqwxpkq2784ixzdd9pq38nrb4x8qwfmk5alr225br4vv0k2q"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene20sttranscriptcluster_db = derive2 { name="ragene20sttranscriptcluster.db"; version="8.7.0"; sha256="135cgn92raa6f9yiw4k25rn04rpg5mdnf969l66x4s1jcc0rwscq"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene21stprobeset_db = derive2 { name="ragene21stprobeset.db"; version="8.7.0"; sha256="0lp4prymrm3cp8yq1hba9bylw22hcvlx7piqpvjx51hj79yrwdig"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene21sttranscriptcluster_db = derive2 { name="ragene21sttranscriptcluster.db"; version="8.7.0"; sha256="1b7s2r4w1yy2v3srs6n931zc64qf58nq4apmq2ag5nx50wspima1"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rat_db0 = derive2 { name="rat.db0"; version="3.5.0"; sha256="09kbsaksmas6avcdlvbg6kvdw6cf156i7qip9l0mhv6qyqhl0p36"; 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.58.0"; sha256="191bz92rr446g8w4m4wr9c51ykfqaj65vp7adb56wch7r8llawrl"; depends=[AnnotationDbi]; }; + reactome_db = derive2 { name="reactome.db"; version="1.62.0"; sha256="097na9ms80lxpc4qaagaqlxs7kjsjpkq649f2jqbav0mkph52bdh"; 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]; }; @@ -883,7 +853,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.4.1"; sha256="16p3zsx6sr466xzf0yd667an21br21n13agacsysf9g1vw4gc7cx"; depends=[AnnotationDbi]; }; + rhesus_db0 = derive2 { name="rhesus.db0"; version="3.5.0"; sha256="09i0f2ddss092awdmhshnndniyy3pzfj56nfbkgrj0y22lgfw875"; 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]; }; @@ -892,8 +862,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]; }; + rta10probeset_db = derive2 { name="rta10probeset.db"; version="8.7.0"; sha256="02hcq8zflfixiqwsjr7bsllcqh3hh910n00hzlqry07mwwxbv356"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rta10transcriptcluster_db = derive2 { name="rta10transcriptcluster.db"; version="8.7.0"; sha256="1al9npm4skccr7369gpg0hxsw3nmngsl6z06c27n3ymdavsd2dyj"; 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]; }; @@ -920,8 +890,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.4.1"; sha256="0r76ck6b2zkf38z59n9m3frc2d6v27frrbryvyk6lv4bnnwa1p2n"; depends=[AnnotationDbi]; }; - xenopus_db0 = derive2 { name="xenopus.db0"; version="3.4.1"; sha256="0953cf597hxd2h28p7bqrv5xxs96y3bxr4x1hp8bm1v0l8l37d13"; depends=[AnnotationDbi]; }; + worm_db0 = derive2 { name="worm.db0"; version="3.5.0"; sha256="05r29cqswz3ph3adymdigayv5ci19cd02y26kjbgwrh38xha5cg0"; depends=[AnnotationDbi]; }; + xenopus_db0 = derive2 { name="xenopus.db0"; version="3.5.0"; sha256="136yrk7qlbzy717xy1abpn5l42j0qzal72y0p20wwxw60xhpx1rv"; 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]; }; @@ -933,7 +903,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.4.1"; sha256="0d9p474891jshxynmwa63xg7kb01s6vb1dll3hns9ps0bpm6d8r3"; depends=[AnnotationDbi]; }; + yeast_db0 = derive2 { name="yeast.db0"; version="3.5.0"; sha256="00rp099g5302hy4g4h6j11nslc2j6p58ax80mnswhzvfr37sb99f"; 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]; }; @@ -942,7 +912,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.4.1"; sha256="12a1qk7wjjsclrj2nbf02hwk9pakzkgzgy4l2893bnwyf0c30ffb"; depends=[AnnotationDbi]; }; + zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.5.0"; sha256="1mkyhf1vz0n98zs941v5f7nl0cg0s873ny3m6vdpj5c9nyqc8hxs"; 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 fe446610c4eb2026c43807921963f43857bfeeb0..220ac60486b85478c1769694c1601567b047926f 100644 --- a/pkgs/development/r-modules/bioc-experiment-packages.nix +++ b/pkgs/development/r-modules/bioc-experiment-packages.nix @@ -4,314 +4,332 @@ # Rscript generate-r-packages.R bioc-experiment >new && mv new bioc-experiment-packages.nix { self, derive }: -let derive2 = derive { rVersion = "3.4"; }; +let derive2 = derive { biocVersion = "3.6"; }; in with self; { - 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]; }; - ChAMPdata = derive2 { name="ChAMPdata"; version="2.6.0"; sha256="1hkwwkz2k4dnsl2sshr33as16x0dh98xvsnpf0zll2vkjkjw44v4"; depends=[BiocGenerics GenomicRanges]; }; - 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=[]; }; - HD2013SGI = derive2 { name="HD2013SGI"; version="1.14.0"; sha256="0whm9irlfmjamsjcjbxb1c574g60iscx10f498l9vh857iv1q8vl"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; }; - 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_methylation = derive2 { name="RTCGA.methylation"; version="1.2.0"; sha256="1c7j35jn0076v3pv0h2yiphl2b9ga8hq0d6xb6hm7jasgq4i4w25"; 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=[]; }; - Single_mTEC_Transcriptomes = derive2 { name="Single.mTEC.Transcriptomes"; version="1.2.1"; sha256="143qp77bhrrclfvqqsk86cz7xqsnn5wfi41z9hp4klai0dhgk68g"; 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]; }; - cheung2010 = derive2 { name="cheung2010"; version="0.12.0"; sha256="15z6p2kfrbs9wbsf7rqmg53k5i6gja5hix97sl9bj7y3jkxws62b"; depends=[AnnotationDbi Biobase GenomicRanges GGtools hgfocus_db]; }; - 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]; }; - dsQTL = derive2 { name="dsQTL"; version="0.12.0"; sha256="00nry3qf9r79x65scyfghjyj2qbc6ji0l7c1rayrk5s6pxj0v0hw"; depends=[Biobase GGBase SummarizedExperiment]; }; - 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=[]; }; - yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.12.0"; sha256="1rym01mbpn0h70q1c7alhnrqa0c2hb7xmr17qbsh130gqp67c3mq"; depends=[]; }; - yri1kgv = derive2 { name="yri1kgv"; version="0.16.0"; sha256="0xqlqi665ww3w00g5wv089ydjs74iy07xqzbn19bpdqnkypm83rx"; depends=[Biobase GGBase]; }; - yriMulti = derive2 { name="yriMulti"; version="0.4.1"; sha256="1s1riipq4ck655m3cds6ffvzr7hg0aa2fhm8gax2b7hwgqr4xmiz"; depends=[dsQTL GenomicRanges geuvPack gQTLBase Homo_sapiens MultiAssayExperiment SummarizedExperiment]; }; - zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.108.0"; sha256="04pbkfqb6l8qgxl1263jhhd7gm8hz908c47q5s1f1nvc3403dlbp"; depends=[]; }; + ABAData = derive2 { name="ABAData"; version="1.8.0"; sha256="035h4yrna11d2g3iqnn52sv07ydgpa2my4bwcs4a9di0pf9rbm06"; depends=[]; }; + ALL = derive2 { name="ALL"; version="1.20.0"; sha256="1kz3k99dxam9zqpf1hg4z049f7dliyw3kg9cms1sma2yl5l7nj2y"; depends=[Biobase]; }; + ALLMLL = derive2 { name="ALLMLL"; version="1.18.0"; sha256="051hhfrz4fx28hbi7fycqqbnij9lxh6spj2xqj37nmqc8wx2qfs1"; depends=[affy]; }; + ARRmData = derive2 { name="ARRmData"; version="1.14.0"; sha256="0pxwvghyvd3c717lqixkadh79jrv0r0dl80ds688gxgw2pfcwr6y"; depends=[]; }; + Affyhgu133A2Expr = derive2 { name="Affyhgu133A2Expr"; version="1.14.0"; sha256="1ynwl9rfc0hdacvdmfdm97ya14jqf8q8w93m2vd58nh62p1jmprp"; depends=[]; }; + Affyhgu133Plus2Expr = derive2 { name="Affyhgu133Plus2Expr"; version="1.12.0"; sha256="0bbslhfipz0s5ill8p8wfr47ikx2lg1vi9h71rn0wx1v76q5sgpf"; depends=[]; }; + Affyhgu133aExpr = derive2 { name="Affyhgu133aExpr"; version="1.16.0"; sha256="06q8ixh2zwk4143ppnrdcvgaagzy33swsrlp8l3lqp943fnn2hil"; depends=[]; }; + AffymetrixDataTestFiles = derive2 { name="AffymetrixDataTestFiles"; version="0.16.0"; sha256="1nqdxp33xl2lwcf5lq1v1k2qnid5pf7wxbxldmr0rl6jxlm1r5va"; depends=[]; }; + Affymoe4302Expr = derive2 { name="Affymoe4302Expr"; version="1.16.0"; sha256="1j4czciqiaj2fqf7v5yd41ln31gl6sqs6s07i9pwyclhw66f3y56"; depends=[]; }; + AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.18.0"; sha256="0bc2cdqvqdalq5hqhnnzayh2klnzqaw6micgsk35mai0lak34rpd"; depends=[affy]; }; + AneuFinderData = derive2 { name="AneuFinderData"; version="1.6.0"; sha256="0cbgmfciy9v81jfn60mw98csxxdmm3hfqdwyaigbagj949alnbcm"; depends=[]; }; + AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.8.0"; sha256="1z7kcl25hpl7r7pshz14cm5j635qj451df1pfd9giygn7y9kpf93"; depends=[]; }; + BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.16.0"; sha256="1yslwgw504xbplq16xnf610rs994p23xm9qcyaa9f0lzhqgkksap"; depends=[beadarray GEOquery limma]; }; + CCl4 = derive2 { name="CCl4"; version="1.16.0"; sha256="0w1mxf7w1yk7kjqam7xdb11aj16pddk9wyfd1ps0nqagzvjsn1qv"; depends=[Biobase limma]; }; + CLL = derive2 { name="CLL"; version="1.18.0"; sha256="1zhkf75bhx8z0s4wpjyc0xdv9aifng25gpb8fkvncpd8lmmdg6gd"; depends=[affy Biobase]; }; + COHCAPanno = derive2 { name="COHCAPanno"; version="1.14.0"; sha256="082cwdyzq3h1sl39pn2c3ix5cp6mjczbvvdh6gii54181qkg8r2h"; depends=[]; }; + CONFESSdata = derive2 { name="CONFESSdata"; version="1.6.0"; sha256="1ln3s3zk4yi7qjjqnvxg12x7qlnz77k29nbjv5zbpdxdjyisnq4g"; depends=[]; }; + COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.14.0"; sha256="1qi0l4rf62gzqg14zalcrisklfgbzahhzahyyd5q898r57xgif7b"; depends=[]; }; + COSMIC_67 = derive2 { name="COSMIC.67"; version="1.14.0"; sha256="11ir7v1xlxwjxjj1dz3i7j1fmq9xnhd3qc7cxippr0w4867cw8pc"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; }; + CRCL18 = derive2 { name="CRCL18"; version="0.112.0"; sha256="1c6lvzjddm2sxxjz452nmaadhvaz684i3gyvmlibhqaxc9vr09mx"; depends=[Biobase]; }; + CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.10.0"; sha256="0jlikfjgmjiizm28srbws7sq1b7h45gb22m4q19il13rdpn6rfls"; depends=[Cardinal]; }; + CellMapperData = derive2 { name="CellMapperData"; version="1.4.0"; sha256="064hbkwxfl2sb4vvvmm44skd34g87vgw6nv0ml8vyhba5mmszf84"; depends=[CellMapper ExperimentHub]; }; + ChAMPdata = derive2 { name="ChAMPdata"; version="2.10.0"; sha256="0cjwyapqv4d6mncg4jy1x5qfz7sim9vqv6m007d0n05ly02qn4vd"; depends=[BiocGenerics GenomicRanges]; }; + ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.16.0"; sha256="0bj7j6qzqq6zy87r1sxdnlfqvl5r6rwjm5pd09jf9b27r6bf1r44"; depends=[bigmemory]; }; + ChIPexoQualExample = derive2 { name="ChIPexoQualExample"; version="1.2.0"; sha256="1f1dwqylch21kch88y96h41ma949y1xvfhj5ldqkn4fidb2f90kp"; depends=[]; }; + ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.16.0"; sha256="1ppybav3ag2x75i1w58prnxvrmjp754ywwgm38kfw3vs55l0ijv4"; depends=[affy hexbin limma qvalue statmod]; }; + ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.14.0"; sha256="02xffm790lchv78qwxgi0rfmk496hdc2970mm1maa7agy9wk56f8"; depends=[]; }; + CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.10.0"; sha256="1gbvk32kcax4w143ry8w376gfglqm128sas0pnim4nc1ikd7b7j7"; depends=[]; }; + DAPARdata = derive2 { name="DAPARdata"; version="1.8.0"; sha256="0rkf6gwcvccci7hal5cxb04b7g8cx46ivvzplgfn5sn4idzj187f"; depends=[knitr MSnbase]; }; + DLBCL = derive2 { name="DLBCL"; version="1.18.0"; sha256="19bxaapggfx148qvi1jp82026psiv669iga370bqva4dhawgmc8a"; depends=[Biobase]; }; + DMRcatedata = derive2 { name="DMRcatedata"; version="1.14.0"; sha256="1i1cf4avmq6rrcvskj17gmplfa647fvmml86wkr8skhsj03z5s63"; depends=[GenomicRanges]; }; + DREAM4 = derive2 { name="DREAM4"; version="1.14.0"; sha256="1z1cddkk8jspnm3h1d4fdc6v14sqflzryqzvvzd0z3fp4lr46vkb"; depends=[SummarizedExperiment]; }; + DeSousa2013 = derive2 { name="DeSousa2013"; version="1.14.0"; sha256="0jwddzfqfiimcfmz9jwari493dppyxnyf0fp2k2s1bp98d50bnfb"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; }; + DmelSGI = derive2 { name="DmelSGI"; version="1.10.0"; sha256="066davl2ga9pjl12zcgchmsprx3hz6zsb2zpnrpbijd0yqv8fjih"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; }; + DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.16.0"; sha256="1za9anbfb36c1js2qhgqgxsjmkxfhkzyfyizzvqn1v31r101hsq7"; depends=[EBImage]; }; + DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.14.0"; sha256="0315kbc8fsn95325jlr2b83094f4mnk4pc5sihw0n0637nfpy7ks"; depends=[]; }; + DvDdata = derive2 { name="DvDdata"; version="1.14.0"; sha256="0chiajirlaf8b28nhr315429hp2x7mfff7fkax9kqrfz308xbcv1"; depends=[]; }; + EGSEAdata = derive2 { name="EGSEAdata"; version="1.6.0"; sha256="1fvfs8bnf41fz2skahj4gxczqkgspnga84rlsrgd0shhrkmns9hx"; depends=[]; }; + ELMER_data = derive2 { name="ELMER.data"; version="2.2.2"; sha256="1w1zs37bsj1c6ywvdbjqilg5wndnmysb0w6sbaashd39z6w9iwpa"; depends=[GenomicRanges]; }; + EatonEtAlChIPseq = derive2 { name="EatonEtAlChIPseq"; version="0.16.0"; sha256="19id2z2mzjjnxa956ppjhjq1a4gk916cd7k9cqs39lsbxvknp7nr"; depends=[GenomicRanges rtracklayer ShortRead]; }; + FANTOM3and4CAGE = derive2 { name="FANTOM3and4CAGE"; version="1.14.0"; sha256="1bkgj1czb6ap7xx53bzwrd4azbfkpxcznmdvl4q7jgd34l1ms78a"; depends=[]; }; + FIs = derive2 { name="FIs"; version="1.6.0"; sha256="1b6cvzljgcpq9vzs92yjnnxm741ypjw13c9lnzh3qjv73nfgp5l9"; depends=[]; }; + Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.14.0"; sha256="1c0zdhk81g30v7yq6xvhanmb550xdaann6f4sskbvy5fa6kb04gz"; depends=[Biobase gplots limma VennDiagram]; }; + Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.14.0"; sha256="081ki0yjdqngsdibpjnjs8lk10wfvgr9i5i99c837hl9wgfwd9v4"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; }; + FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.16.0"; sha256="09sb67dnv97ijljayiny3p45ddd2c01pd8pjj15sjjk8717lf65v"; depends=[minfi]; }; + FlowSorted_CordBlood_450k = derive2 { name="FlowSorted.CordBlood.450k"; version="1.6.0"; sha256="16wvbfym2mz9ypmym2j3j5f36vdj100anc5hpwvpzh9ing62b00r"; depends=[minfi]; }; + FlowSorted_CordBloodNorway_450k = derive2 { name="FlowSorted.CordBloodNorway.450k"; version="1.4.0"; sha256="06f2zmkqzkrhwdx58pxzcvkqbckzg9k6qjlngbmgnnb9mi0hx8l3"; depends=[minfi]; }; + FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.14.0"; sha256="19h4xvlsl61bpkdqqfrqw4iz9v0pnfxp1q8z9nn9m9wqf9cc3rkc"; depends=[minfi]; }; + FunciSNP_data = derive2 { name="FunciSNP.data"; version="1.14.0"; sha256="0zsffyhd9nxsg3a34sd2mycbvs8dsw96pqn1jj7zw5whldjihjwh"; depends=[IRanges rtracklayer]; }; + GGdata = derive2 { name="GGdata"; version="1.16.0"; sha256="0s5wh3nxynxx4skgyxvbm4l7lk6rphcgwh71nr24a0a4jid0jisp"; depends=[AnnotationDbi Biobase GGBase illuminaHumanv1_db snpStats]; }; + GSBenchMark = derive2 { name="GSBenchMark"; version="0.112.0"; sha256="10f5g78mqlzm3ygix8h08134k41c7k9l3j39q656jpdwmf3plkh0"; depends=[]; }; + GSE62944 = derive2 { name="GSE62944"; version="1.6.0"; sha256="031x9w6xcgk30ihmgxxlxrn0xjm076s34cfyhw5pap6f3f0x8hi6"; depends=[Biobase GEOquery]; }; + GSVAdata = derive2 { name="GSVAdata"; version="1.14.0"; sha256="1zqm9g1vib9r6rsj7wim2pkv17pl1136k3k5rxmyvgx7rl1sb5li"; depends=[Biobase GSEABase hgu95a_db]; }; + GWASdata = derive2 { name="GWASdata"; version="1.16.0"; sha256="15zki8i7mv59xr6rgfmf0x33mkvf8fv6h5ya35iydx5409lyaxm8"; depends=[GWASTools]; }; + GeuvadisTranscriptExpr = derive2 { name="GeuvadisTranscriptExpr"; version="1.6.0"; sha256="02vwxdb4dsmx3iw3p8hfvigw67hrggycdxkqpkr1n03z6g50vbcv"; depends=[]; }; + HD2013SGI = derive2 { name="HD2013SGI"; version="1.18.0"; sha256="102hv9ivrmdjfrqnyg9g3qi4y2i9kdby9xswlq5l7l14vbgqxn6b"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; }; + HEEBOdata = derive2 { name="HEEBOdata"; version="1.16.0"; sha256="1spmx6lc0cpcwcna2sm5mn27n66rxpzw30biq11ca2j7ax0phh8v"; depends=[]; }; + HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.18.0"; sha256="12gi6idn1vgl13ir93ig60mmgfak5l35bgzc75paa167iqvfswff"; depends=[]; }; + HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="0.112.0"; sha256="0wz7kfj2mkrg4q53w3ddj2l4didlmckkck5a80vk51pflfvxrdhi"; depends=[]; }; + HarmanData = derive2 { name="HarmanData"; version="1.6.0"; sha256="104ws2bpy865m2hjfgj1bha4ix6kk96ml085lksz9vszkxhi7al9"; depends=[]; }; + HarmonizedTCGAData = derive2 { name="HarmonizedTCGAData"; version="1.0.0"; sha256="03czwi1ps7lpjppn5mpfa013rna0z3ywb783a31yv7g93r97gqna"; depends=[ExperimentHub]; }; + HelloRangesData = derive2 { name="HelloRangesData"; version="1.4.0"; sha256="1c7gfhwr9g6hv0p3s4yd8v9rhjp3jmrnzsqsqq4ysc2i24nf7drr"; depends=[]; }; + HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.112.0"; sha256="1qxg7650lbfbjl9p75clrybsdbzd0yzpi8pi2biv83jgqkkjrd0b"; depends=[]; }; + HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.14.0"; sha256="0708xgm495a330h70yi2qd494h6gf0n46j016mw9bc4gzbb7aq9p"; depends=[]; }; + Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.14.0"; sha256="0lah9l8gd5gs1wj68l9hqakcwha0rl88dg2p0zk92nff64jxn3pj"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; }; + HumanAffyData = derive2 { name="HumanAffyData"; version="1.4.0"; sha256="0xgb3rrvgrx6sdwbb8gb1q8mgf0s2giih8l8d3hzvnxazh80qs8b"; depends=[Biobase ExperimentHub]; }; + IHWpaper = derive2 { name="IHWpaper"; version="1.6.0"; sha256="08gkdi1lra9mn1cbsqddqn3pwj3pfy2yfgzay5igr7n1akfmgh7k"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; }; + ITALICSData = derive2 { name="ITALICSData"; version="2.16.0"; sha256="1rrfxc3hzlq2i0z5j432w3s33ln56i91a06q49piisz06vviz6yv"; depends=[]; }; + Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.14.0"; sha256="12mdy4rb8gzhgdqdwvf96lcxmi37wysyanpw1dym03vq6fxmcfrq"; depends=[]; }; + IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.16.0"; sha256="149ip8wvbiz2k94rj6n1ims4iq7zkgicrxrkn059bvxgj5gm6pvq"; depends=[]; }; + Iyer517 = derive2 { name="Iyer517"; version="1.20.0"; sha256="1s4ya32pfmz3fil7v3r8zm13f80cx5zny0ywvh6ln27a7hr10ida"; depends=[Biobase]; }; + JASPAR2014 = derive2 { name="JASPAR2014"; version="1.14.0"; sha256="03mrbgyx3jf4ccapyj04akf40aqbmky03fgicgcaff724kwda8rl"; depends=[Biostrings]; }; + JASPAR2016 = derive2 { name="JASPAR2016"; version="1.6.0"; sha256="0ki62mfjk7a6nsk0079xf3w8c8an3syy5rhlqcmyynwab344mqm6"; depends=[]; }; + JctSeqData = derive2 { name="JctSeqData"; version="1.8.0"; sha256="1zd270pxiy1d5jr9akgvf77jbllw82flrhx3q1z1m0kds7xlb398"; depends=[]; }; + KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="0.112.0"; sha256="0w1x4ab9i40y8jp3yhwcv0lyh83g926cwav77m179mg7n9l6c3lv"; depends=[Biobase BiocGenerics]; }; + KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.16.0"; sha256="034j38cd81fkay7h7fjjk56ywhvbq6pdc0ldxizrfw3z8hhacy85"; depends=[Biobase BiocGenerics]; }; + KOdata = derive2 { name="KOdata"; version="1.4.0"; sha256="1difb3nsalc5rl9bbaj0g99d5sl3sjlmcy4qq0mddaagw4b5lyrr"; depends=[]; }; + LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.16.0"; sha256="1z86ll0kpmd9jq5nq7fi2yhvp3ifqfmjk7gfpgd2mq28zw8rwn47"; depends=[IRanges KernSmooth]; }; + ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.10.0"; sha256="18k3m8k0jdry8qih7nrd7sxlvpcv1yfjj1a6y6a2ifmjq23ymcsl"; depends=[methylPipe]; }; + LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.14.0"; sha256="0x0rl6iibspl9w82kbbv7bf9mfhs60j8ly7cxm908x5xfzwmms05"; depends=[]; }; + LungCancerLines = derive2 { name="LungCancerLines"; version="0.16.0"; sha256="12k305wv38grgdkypr7bvhxd1ca1vsxmyz7487yfv1nl72sla36a"; depends=[Rsamtools]; }; + M3DExampleData = derive2 { name="M3DExampleData"; version="1.4.0"; sha256="0wq5vmk8p3ng8snljrlkwx6vl38fnwq8fn5flymfnq1snvci22h2"; depends=[]; }; + MAQCsubset = derive2 { name="MAQCsubset"; version="1.16.0"; sha256="06vmzicndnyb4banfjv2mgy77cqqbdrx0y7pxyvvpfy5xl1kk3ii"; depends=[affy Biobase lumi]; }; + MAQCsubsetAFX = derive2 { name="MAQCsubsetAFX"; version="1.16.0"; sha256="0jfq8pc2arpp5kcdhsgvz08nm7sjambh7sx1n204glqm61mv5rqw"; depends=[affy Biobase]; }; + MAQCsubsetILM = derive2 { name="MAQCsubsetILM"; version="1.16.0"; sha256="14p1ifaadmkpykgh675gk03aspc1159k8s9ksz17p6bxkwy2sb6v"; depends=[Biobase lumi]; }; + MEALData = derive2 { name="MEALData"; version="1.8.0"; sha256="0r4c7vx2cpix5ryjv7314zf30ifivad7yj1wi7a0pck6rjbny81j"; depends=[]; }; + MEDIPSData = derive2 { name="MEDIPSData"; version="1.14.0"; sha256="175bzk0yrwhkwagpkvi8y87l8zfhgr44xkpkw4jii3whpyxgaiyx"; depends=[]; }; + MEEBOdata = derive2 { name="MEEBOdata"; version="1.16.0"; sha256="1110sgklk2lmvjggvcm3wzfipij6nj8brq7bdc9dbjwhiiqdv0m1"; depends=[]; }; + MIGSAdata = derive2 { name="MIGSAdata"; version="1.2.0"; sha256="0vx8p949sxsfp9ajs4dwh2yf01l9lclngr7ync3r962knmd74yc6"; depends=[]; }; + MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.14.0"; sha256="1s0fraym521bv35q2ms1v6jv23bvfypwkhcy8ffhf6k1lcr4q7gj"; depends=[]; }; + MSBdata = derive2 { name="MSBdata"; version="0.16.0"; sha256="0lygk817f55agf4rvb85k50ns0cy8wckbqvwqb3w22z4plixyjjf"; depends=[]; }; + MSstatsBioData = derive2 { name="MSstatsBioData"; version="1.0.0"; sha256="1hgwcd4r8x489hyz747psyw4jfbia6yw5mjrm745z1yl8y445mq9"; depends=[]; }; + MUGAExampleData = derive2 { name="MUGAExampleData"; version="0.112.0"; sha256="05gjfd4vvkp4mdrimsxjwa3mgps1cwdwr03w1il77awa23fvqp52"; depends=[]; }; + MethylAidData = derive2 { name="MethylAidData"; version="1.10.0"; sha256="1rklalmjckm5ysvfjy4arqafabjp8w4495v385mgwrlv6rqa5yv7"; depends=[MethylAid]; }; + Mulder2012 = derive2 { name="Mulder2012"; version="0.18.0"; sha256="1bpc74xiyh1az8nkgqpwk3pa2313r7qcxdzdqa7sr8drwhgj7hbi"; depends=[HTSanalyzeR igraph KEGG_db MASS org_Hs_eg_db PANR pvclust RedeR]; }; + NCIgraphData = derive2 { name="NCIgraphData"; version="1.14.0"; sha256="0764l9lxc64fjflzqqxyjckxrsjxk89k73g3kpdfmkvxdn7nchh7"; depends=[]; }; + NGScopyData = derive2 { name="NGScopyData"; version="0.112.0"; sha256="073g9krsmhdh3fygqd3rfxnakxn45nvxs0zr7k6xylq06yfy3gza"; depends=[]; }; + Neve2006 = derive2 { name="Neve2006"; version="0.16.0"; sha256="0dvdq54jp5q59iwny008m1qyj9s6gb4blmzjlsnz3505ivai2mgs"; depends=[annotate Biobase hgu133a_db]; }; + OnassisJavaLibs = derive2 { name="OnassisJavaLibs"; version="1.0.0"; sha256="1wffaljwgl0r051bj5vf0wjch2vg5y8pkwgbhdg6k6c97pf9gyd7"; depends=[rJava]; }; + PCHiCdata = derive2 { name="PCHiCdata"; version="1.6.0"; sha256="1dqhwz6jqgmnvias2hjlnj10c0chsvhj904rgvk0ch9y47v0f4yx"; depends=[Chicago]; }; + PGPC = derive2 { name="PGPC"; version="1.6.0"; sha256="1nfkj3ipl52xscz8qpmaspydvfzsjacrw89alhxpgsb71d59nbkj"; depends=[ChemmineR EBImage geneplotter ggplot2 gplots imageHTS limma plyr RColorBrewer reshape2 SearchTrees splots]; }; + PREDAsampledata = derive2 { name="PREDAsampledata"; version="0.18.0"; sha256="19528l0f53nfnq1sdsbp3y6z5zx933csz5f72mh43408a6d384rk"; depends=[affy annotate Biobase PREDA]; }; + PWMEnrich_Dmelanogaster_background = derive2 { name="PWMEnrich.Dmelanogaster.background"; version="4.12.0"; sha256="0s3dqm1yiy4svkb6cj6xf6i81cc0mai0xjlbl3jvqdpy7npl0a08"; depends=[PWMEnrich]; }; + PWMEnrich_Hsapiens_background = derive2 { name="PWMEnrich.Hsapiens.background"; version="4.12.0"; sha256="14wqs4lxq1zav24znvqmkzbbqfapplg7xib9kbcxnqxkr509x4fz"; depends=[PWMEnrich]; }; + PWMEnrich_Mmusculus_background = derive2 { name="PWMEnrich.Mmusculus.background"; version="4.12.0"; sha256="1zmrv53944s7a6cm96m2wgj6j9cfg5kjwgdfalkmii3vm400f6lr"; depends=[PWMEnrich]; }; + PasillaTranscriptExpr = derive2 { name="PasillaTranscriptExpr"; version="1.6.0"; sha256="0wxf6p5r7h9zaxkzg1bf294d837klwscbd0gcxms26hgdj7pv2d1"; depends=[]; }; + PathNetData = derive2 { name="PathNetData"; version="1.14.0"; sha256="1k5npvxijzf3f7fxkmljajmjmfpkd36q8a2zpn24c4v19vglnmzx"; depends=[]; }; + ProData = derive2 { name="ProData"; version="1.16.0"; sha256="0vgs9xnwrqfn8px4c4q0y3kxfwk5zldwpykdhkjn63ycamlfmq25"; depends=[Biobase]; }; + PtH2O2lipids = derive2 { name="PtH2O2lipids"; version="1.4.0"; sha256="1qilqzfmhb4fq2rkafy200s94gaj9ln6c0j8gw3q5ql6kzclkq2i"; depends=[CAMERA LOBSTAHS xcms]; }; + QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.8.0"; sha256="13b72z76z5nqb2snga4rn0jrsd12c13x4b1q9i15j2lxnklcw11w"; depends=[QDNAseq]; }; + QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.8.0"; sha256="17azrrn9fkiq1z4xxcg2afwh25iyvi93lq9p13zcpzg75fx5ccvc"; depends=[QDNAseq]; }; + QUBICdata = derive2 { name="QUBICdata"; version="1.6.0"; sha256="01i0n2sbi3l5gmkrvnc5r1c3fv57xli1fav7yal1x6vckqgma2ba"; depends=[]; }; + RIPSeekerData = derive2 { name="RIPSeekerData"; version="1.14.0"; sha256="0znhpk57bivhn94vd1czcrhcigi8wcascx9ycvbvfnbnibpwcsac"; depends=[RIPSeeker]; }; + RITANdata = derive2 { name="RITANdata"; version="1.2.0"; sha256="0jl1grvgmrvvv5f4p0s6ypcpfbdlrc1s0pqqib7fw1qi1hmik5rj"; depends=[]; }; + RMassBankData = derive2 { name="RMassBankData"; version="1.16.0"; sha256="15i1yy7vhwbz3vjkcdgybqaiwr3x7w9fplscachb3xpw6d5g52n0"; depends=[]; }; + RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.16.0"; sha256="0z3ijyvkajpa08d6i1lb1bfkfwhqkjizwn17hrinps3k9bzymni6"; depends=[fields gdata genefilter MASS RNAinteract sparseLDA]; }; + RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.16.0"; sha256="06ja4rm3f310vj1sa473njsgaagmr3zz04pj3qp5cpq1pdcgsmfi"; depends=[]; }; + RRBSdata = derive2 { name="RRBSdata"; version="0.112.0"; sha256="1vjh1x652ll33sjahair95n1l98z847ks2907g84sbkwhvfzhkrm"; depends=[BiSeq]; }; + RTCGA_CNV = derive2 { name="RTCGA.CNV"; version="1.6.0"; sha256="0grqjfiwi9i6whgiz73xz2havcwzjf3r23rg5wvxhk1bapxidxgv"; depends=[RTCGA]; }; + RTCGA_PANCAN12 = derive2 { name="RTCGA.PANCAN12"; version="1.6.0"; sha256="02mr0kn5hf2nqi2s7lk440c6a3n34a8apb1j7rpi8nxp4lp757if"; depends=[RTCGA]; }; + RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.6.0"; sha256="1mjxpdwziv0xy00hn0n7r0bvgh1gagrw77b5jnla3pz0nzhqwwhy"; depends=[RTCGA]; }; + RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="20151101.8.0"; sha256="03m4rzzwmjzj1ijg10ir1d5nmix04l0mi2jkddiqgq8ryl231dk2"; depends=[RTCGA]; }; + RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.6.0"; sha256="0v4z9hi9n8fxlk1gph7xapz2sgrakzm32xvl4qyjvqcfzmrvsjzy"; depends=[RTCGA]; }; + RTCGA_methylation = derive2 { name="RTCGA.methylation"; version="1.6.0"; sha256="1dcqjfkjncxa32j2dp1dlhfl7cjlr5gpzsxvbals420sqn6pbh0b"; depends=[RTCGA]; }; + RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.6.0"; sha256="0iydym4bggbdwcnb916wqx9d8xxdm3aqbilknf31fvn7gyx76n5x"; depends=[RTCGA]; }; + RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="20151101.8.0"; sha256="1jyg1h1g6bkz0rvpsb0y2ksx2k8s1lm6i9jrkj5b9p9sv28fdiz9"; depends=[RTCGA]; }; + RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="20151101.8.0"; sha256="01s06w9aavgr19jf3kswxb2bg4v5r3j5md17j4qf698l82pjkigq"; depends=[RTCGA]; }; + RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="0.112.0"; sha256="1sf4fbrgcmq4jy3g4kh8xlbmvvs6ww9s8p0z8cba2ga0v440nzk4"; depends=[Biobase]; }; + RforProteomics = derive2 { name="RforProteomics"; version="1.15.0"; sha256="1jjc0hs6nmx56l5gl5rgqkrpv3shdwl4qjvn25ayv6dbvxajifw3"; depends=[Biobase BiocInstaller biocViews interactiveDisplay MSnbase R_utils rpx shiny]; }; + RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.10.0"; sha256="0ixc2vhfm8y51p7iycr1mv98dacazj6f7bn5naffy607d9ryylb2"; depends=[GenomicRanges]; }; + RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.10.0"; sha256="14h4lqx8jymla7immhiisxkcch5pki26yk9ywgh2mwwkz5b3lmlr"; depends=[GenomicRanges]; }; + RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="1.10.0"; sha256="0adds1l1hp4cv98jzf4jp6rhwfyv63dnzcp7gzb91wq9wmmhh81w"; depends=[GenomicRanges]; }; + RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.10.0"; sha256="1a4389ds0kpq8q1brf7r7f368x7077qf1x53amixi4s15z3sqxzl"; depends=[GenomicRanges]; }; + RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.10.0"; sha256="1q7gqs3n9cv6fn95n79ir6p2jxccdx133az4f3ab198kxbdkn5bc"; depends=[GenomicRanges]; }; + RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.10.0"; sha256="0mimmfhssjr1h2fb8h0m7gjaw5z80vsnzjlckx9cmirn9112z3iz"; depends=[edgeR]; }; + RnaSeqTutorial = derive2 { name="RnaSeqTutorial"; version="0.16.0"; sha256="0p11ykzr0ypxsn3y0dwpggm826dszl3jzplvpzs60xgplj178m20"; depends=[easyRNASeq]; }; + SCLCBam = derive2 { name="SCLCBam"; version="1.10.0"; sha256="1ivxp3pi9dskh2q331dfpc9vz8g3x82sickmhk86mnhr8zwbkx6w"; depends=[]; }; + SNAData = derive2 { name="SNAData"; version="1.24.0"; sha256="1384y6jj8w380qppd9n80s41vz2g7lrlmckjszga0csc1qxx8dd7"; depends=[graph]; }; + SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.14.0"; sha256="08myr18h36rczaqvrg2ckhrkivayspcr8p6p4400ynmafk8ihkkz"; depends=[]; }; + SNPhoodData = derive2 { name="SNPhoodData"; version="1.8.0"; sha256="1v4cp21h05yi6n26by8nnwajk0kl7qjlh4n9c9r81g7m35qyz7ny"; depends=[]; }; + SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.10.0"; sha256="1hf6lz6k6xvlda7pbp4k3y15a9bid5k3r1fv64slj2d7ahpcqzph"; depends=[]; }; + Single_mTEC_Transcriptomes = derive2 { name="Single.mTEC.Transcriptomes"; version="1.6.0"; sha256="01rm6rhi7izycsbf4qmpn8bnkklh6r7c19dnb3p4mrw14ykcxsf0"; depends=[]; }; + SomatiCAData = derive2 { name="SomatiCAData"; version="1.16.0"; sha256="118cdjbaydibr8vi7jgf3jys0izph8d7986gwnq9fawbswdbhpp8"; depends=[]; }; + SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.14.0"; sha256="0nzvc808lr3yp1gs60ifyq6ig52fqp1wy1pxazjcdsrxajpm8hl4"; depends=[exomeCopy GenomicRanges IRanges S4Vectors stringr]; }; + SpikeIn = derive2 { name="SpikeIn"; version="1.20.0"; sha256="1i38m224mdak52cd469nnm7q7f7llmwym9h03ldcs2i9azxp5dix"; depends=[affy]; }; + SpikeInSubset = derive2 { name="SpikeInSubset"; version="1.18.0"; sha256="0byb8gh2s7wlfdcnq9fkr92w7lxwrz48nlzprxd5b4kj91j1fdq0"; depends=[affy Biobase]; }; + TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.14.0"; sha256="1vdk2z4jljwy4kpiy0bkf5ymx0hrc16ardh5rg1xvkra58z79p2j"; depends=[Rsamtools xtable]; }; + TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.14.0"; sha256="0nw9q0gkna2qja720hf766ppilxpi8m2plz68laxhzbc8bgq4g8v"; depends=[]; }; + TCGAWorkflowData = derive2 { name="TCGAWorkflowData"; version="1.2.1"; sha256="1ipl2lxwcp5ybzxw5hpa00c2syb5l8nnmdbdwchnbwj6j8gm97ly"; depends=[SummarizedExperiment]; }; + TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="0.112.0"; sha256="1jpqpnyv3sc6pwh88gfpgc0dyypyi5fy1fim7ybggkc4zv2q69cf"; depends=[Biobase]; }; + TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="0.112.0"; sha256="19965mwk4020xhs206n3gf8v85flf5qf2lnv6hsjfdsmi9clma4j"; depends=[Biobase]; }; + TargetScoreData = derive2 { name="TargetScoreData"; version="1.14.0"; sha256="1y39vdd7h90yw3rz68cbdv55hkw6a7d73ld0l8ihpy3l6ppqa2vz"; depends=[]; }; + TargetSearchData = derive2 { name="TargetSearchData"; version="1.16.0"; sha256="1zhwnpd2n5wydv7xi9ny8zx1riff3caj3lxr40g1fr1ps35vjdww"; depends=[TargetSearch]; }; + TimerQuant = derive2 { name="TimerQuant"; version="1.8.0"; sha256="0cryfc9qm6mnp0hnznqna372qi00cgjvc1793hrmnx9qkcyiszdf"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; }; + VariantToolsData = derive2 { name="VariantToolsData"; version="1.2.0"; sha256="0gp2ij4jbwmqhi76a2cnn7wrg227vzvdkwczcsdhawxdjkys8q7h"; depends=[BiocGenerics GenomicRanges VariantAnnotation]; }; + WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.10.0"; sha256="0d3zixbpchvgzrrslsqgp784w3wswqlp50462ry8b871qaqvh16j"; depends=[]; }; + XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.16.0"; sha256="0z9rfxr3w0rgd6hqp36i24590scng6hcs9k82am7hvnp54jd3zif"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; }; + affycompData = derive2 { name="affycompData"; version="1.16.0"; sha256="1l9mp2l41y1gbpv3yszq8bk5lrnbar8ga03ga14fsj1a4a3hzng9"; depends=[affycomp Biobase]; }; + affydata = derive2 { name="affydata"; version="1.26.0"; sha256="0ridqhk63d49wnsydf0iy5krnymgrjn3nxq7rnlzb85ryvcawqrx"; depends=[affy]; }; + airway = derive2 { name="airway"; version="0.112.0"; sha256="0b155g62xy39vr58ni6snskyssll8fv0zvn9jln41xacil7f5pmq"; depends=[SummarizedExperiment]; }; + alpineData = derive2 { name="alpineData"; version="1.4.0"; sha256="02fjs7liwh8m0n5hc0x51c7s718x3pv5a15qrf195bxsrx6qva47"; depends=[AnnotationHub ExperimentHub]; }; + antiProfilesData = derive2 { name="antiProfilesData"; version="1.14.0"; sha256="1255z9f75hbkzf6sbanck9rfm65z3vzg6kdjyyablh8wxbimjy2j"; depends=[Biobase]; }; + aracne_networks = derive2 { name="aracne.networks"; version="1.4.0"; sha256="1ahdk71ys4zf426swkyzmkaraz3lsjvn5dp4sdhxkxi5fmsx70mg"; depends=[viper]; }; + bcellViper = derive2 { name="bcellViper"; version="1.14.0"; sha256="1jw4lfh9p9m9q636jxq69lvjj859b6977k3jrdpjbr0nvr6phwkw"; depends=[Biobase]; }; + beadarrayExampleData = derive2 { name="beadarrayExampleData"; version="1.16.0"; sha256="0nbfxln9g8kl18ddzjsmcda1myymyk01ljm9x78cbjcnz6f4w3f5"; depends=[beadarray Biobase]; }; + beta7 = derive2 { name="beta7"; version="1.16.0"; sha256="0isvwy72d1764fq92h4315dxirvlp2crsgif9amcq13nv4rn40q6"; depends=[marray]; }; + biotmleData = derive2 { name="biotmleData"; version="1.2.0"; sha256="09vcahw61zz1pbydfl42c28da3y7002956vdb7nbssj6qnp62pqs"; depends=[]; }; + bladderbatch = derive2 { name="bladderbatch"; version="1.16.0"; sha256="0rmvlvhih00vvcjss8z31cfq5mqv7s7f2ysra7n9jrkb1hinzpmz"; depends=[Biobase]; }; + blimaTestingData = derive2 { name="blimaTestingData"; version="0.112.0"; sha256="1qqyv21bn5nf876f9l6xjmpx0jz1vrkk5swpp8wjkgsymcvni9fl"; depends=[]; }; + breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.16.0"; sha256="0k5aqaiqzhxksfiwk2kzzwi7y0c07q8hm7fybn8i1zixvjd8iwfy"; depends=[]; }; + breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.16.0"; sha256="1iw7apcpvivrqsircvxch1kh1xwqwf797d7psyz8iyckkd9kjwy0"; depends=[]; }; + breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.16.0"; sha256="15l3x34xj07ja5xvwy9fsbsyccyfgqpxmghbcjvjl2j3lwfhfdb6"; depends=[]; }; + breastCancerUNT = derive2 { name="breastCancerUNT"; version="1.16.0"; sha256="098rjmq04ycfaj1yw116vgbll5656j5qk3xackidn4y0qkgqg9xy"; depends=[]; }; + breastCancerUPP = derive2 { name="breastCancerUPP"; version="1.16.0"; sha256="126w884byzkbafn1d1qjp7m27d6mck7d6l23daw41vlrcssxz236"; depends=[]; }; + breastCancerVDX = derive2 { name="breastCancerVDX"; version="1.16.0"; sha256="0pvn08jhfmnl530la1ldsks9681xci5ivrdawcq7ggh7bxld56q2"; depends=[]; }; + brgedata = derive2 { name="brgedata"; version="1.1.6"; sha256="0l2g7iwgm1jipz0vsik9dxsqslj7cv49y4mrxs4g9xsr2l9prm8i"; depends=[Biobase SummarizedExperiment]; }; + bronchialIL13 = derive2 { name="bronchialIL13"; version="1.16.0"; sha256="0v0k80zhjkilnj7f567zq6b994csyhqmmd1xbs3006jmnkbnf2ms"; depends=[affy]; }; + bsseqData = derive2 { name="bsseqData"; version="0.16.0"; sha256="11drh9nwk7af04nqgm4gn7lpsfxprg9z158l032jiclfv0dhkqgl"; depends=[bsseq]; }; + cMap2data = derive2 { name="cMap2data"; version="1.14.0"; sha256="002l5isc234cg6hs35rvl2iyql6azjvr7dc3rsp0z9nzh9gmzjrz"; depends=[]; }; + cancerdata = derive2 { name="cancerdata"; version="1.16.0"; sha256="15w2zy6cz4ivyw2j973x6alianqci1rqk2x3jzsjaadsij5bn6yd"; depends=[Biobase]; }; + ccTutorial = derive2 { name="ccTutorial"; version="1.16.0"; sha256="1k6f47hf18fwlmjk9k2rkym328q7kwam0yq7mlcavj3w59avydan"; depends=[affy Biobase Ringo topGO]; }; + ccdata = derive2 { name="ccdata"; version="1.4.0"; sha256="0srpibvjf89b8n8gf01njwg8gbi7a174y3fdcmxilfrfjqc9n2ib"; depends=[]; }; + ceu1kg = derive2 { name="ceu1kg"; version="0.16.0"; sha256="0dfbm2zyp140n57b9jn05li0bb3dz5cyilmdap2c28fjbyxrqdva"; depends=[Biobase GGBase GGtools]; }; + ceu1kgv = derive2 { name="ceu1kgv"; version="0.20.0"; sha256="1bl7b9ys59p9mk54vvsxravmq4xy9fxw3xadkbfdapyj79356r4p"; depends=[Biobase GGBase]; }; + ceuhm3 = derive2 { name="ceuhm3"; version="0.16.0"; sha256="0f8lcws55zixrpwi9m1cqcz0g9k2bvx67h09sxhswswaalqq83xv"; depends=[Biobase GGBase GGtools]; }; + cgdv17 = derive2 { name="cgdv17"; version="0.16.0"; sha256="1rq6dm0c1d395p7qixrnl7m3a7kzgih5bibxg65rngcs3fpjw3zh"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors VariantAnnotation]; }; + charmData = derive2 { name="charmData"; version="1.14.0"; sha256="1y3lrmc8pqdnn1kqzy7r1flqlhj8yjj74hlrj3m49bi9isbv1yip"; depends=[charm pd_charm_hg18_example]; }; + cheung2010 = derive2 { name="cheung2010"; version="0.16.1"; sha256="0xhv2zrzlhy4k828kq9rjw3slx1z30g0gwrnz2b9fgrnbd4f8fjd"; depends=[AnnotationDbi Biobase GenomicRanges GGtools hgfocus_db]; }; + chipenrich_data = derive2 { name="chipenrich.data"; version="2.2.0"; sha256="0iw4c60fpsixn6r5102s3422dlh1vxy4bdfnf8mf8l3893fgj0zc"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicRanges IRanges readr rtracklayer S4Vectors]; }; + chromstaRData = derive2 { name="chromstaRData"; version="1.4.0"; sha256="10ldrshic91rrjvrc7gi1lhqdnw9g3j00pz6vwhp6qnksr6lxdpi"; depends=[]; }; + cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.14.0"; sha256="0j9jgjcsjr5vc0k0h7bjlvrln57zbl7pibdk7sxb1p56p49pngq4"; depends=[cnvGSA]; }; + colonCA = derive2 { name="colonCA"; version="1.20.0"; sha256="1b8kfpr2m5r286ah01jha8js4bvqxw0kk64k1gll96ydi1j6nx7d"; depends=[Biobase]; }; + curatedBladderData = derive2 { name="curatedBladderData"; version="1.14.0"; sha256="1xwg0m4iijvilhzc7sxspj06pm1ysldasv89yi2vskpilm5y1gci"; depends=[affy]; }; + curatedBreastData = derive2 { name="curatedBreastData"; version="2.6.0"; sha256="1x3wqxhafhbns7bngbbqzmjxw3rrb0a4xa2z7pdnlhxxij10mycd"; depends=[Biobase BiocStyle ggplot2 impute XML]; }; + curatedCRCData = derive2 { name="curatedCRCData"; version="2.10.0"; sha256="1h0wys79wr3csq93yvz6rzy964ydjyzfciwjp8099mxrbxsw538s"; depends=[BiocGenerics nlme]; }; + curatedMetagenomicData = derive2 { name="curatedMetagenomicData"; version="1.8.1"; sha256="1ip9v0v6lr7xg1j3zww99n0d5ar8l4d3c74mfhl9jg9c27vqcq95"; depends=[AnnotationHub Biobase dplyr ExperimentHub magrittr S4Vectors tidyr]; }; + curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.16.0"; sha256="15d3g7snphvqh8cgry52lqz7v2l6icxznwcplvp73chkr8skqi38"; depends=[affy BiocGenerics]; }; + curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.0.3"; sha256="19mm3psjmd6rzr34hcz1h5di8smqppnh73jqnqk6mnhgfy1i39ga"; depends=[AnnotationHub ExperimentHub MultiAssayExperiment S4Vectors]; }; + davidTiling = derive2 { name="davidTiling"; version="1.18.0"; sha256="1n7axspfh4ph911pj4x2r2dz1xmf6yk9hlnynx7pfmqlgzzcqcvy"; depends=[Biobase GO_db tilingArray]; }; + derfinderData = derive2 { name="derfinderData"; version="0.112.0"; sha256="0nv2n5417yp8bwdrswbpvni3fg58wl40425f58rdljm4rndk51if"; depends=[]; }; + diffloopdata = derive2 { name="diffloopdata"; version="1.6.0"; sha256="1ww6raiwr7ymjr4psrgf7q3f59vx32fcc0id9d414z5n8lr4krlr"; depends=[]; }; + diggitdata = derive2 { name="diggitdata"; version="1.10.0"; sha256="1w275zk4q5hfmjagdpmfa6xls82zkk34wz795lfnccg1bhvhvpj2"; depends=[Biobase viper]; }; + dressCheck = derive2 { name="dressCheck"; version="0.16.0"; sha256="0x5h4d0hpx1cdlbs2pmylvkhjl46j2vbw8m6za48iv5ksjaxh099"; depends=[Biobase]; }; + dsQTL = derive2 { name="dsQTL"; version="0.16.0"; sha256="02ha43xn2z085cyjq57d0n7919lj15bpy40kd0j9zwijyfrldz3s"; depends=[Biobase GGBase SummarizedExperiment]; }; + dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.18.0"; sha256="07ggqj5bz8bna913ryb8wrb9jyr931nlpr5fggil35ms39xqf84f"; depends=[GEOquery marray]; }; + ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.18.0"; sha256="0pk6livrn8wan6w44kxvhx2s5yjqf5x9gv5pj0mcldirr5fwkyh6"; depends=[affy ecolicdf]; }; + estrogen = derive2 { name="estrogen"; version="1.24.0"; sha256="0rjf95skgpznzwynfzc4mm5rs518x3ilqavz4250yp6g2yk81gdn"; depends=[]; }; + etec16s = derive2 { name="etec16s"; version="1.6.0"; sha256="0ms9f8925icf7ylrjz4akf147hii44qq9x3ddj0sy971a6ra8m1v"; depends=[Biobase metagenomeSeq]; }; + faahKO = derive2 { name="faahKO"; version="1.18.0"; sha256="0a43w7v0sn8z5qyjw0bdkn1jiwzsbxjhpjn9xr5lq1gba4wc15rh"; depends=[xcms]; }; + fabiaData = derive2 { name="fabiaData"; version="1.16.0"; sha256="0hrn14nwz7xvrd7v0s4b29s22kczj24jklc2yyvij5icjlnr436j"; depends=[Biobase]; }; + facopy_annot = derive2 { name="facopy.annot"; version="0.112.0"; sha256="0zd7li5yf6bl9vhpaj0sx8ilv7pqyaavscdrr1lw8y980qiggicm"; depends=[]; }; + facsDorit = derive2 { name="facsDorit"; version="1.20.0"; sha256="1ppmfkrsdcmd47vakd4kxr5y78387wjpyanlhv9pp741x1jiyf5m"; depends=[prada]; }; + ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.16.0"; sha256="0jla2cblvkahm1qkszx14dmhsjbk5ywz7sbg14s4x5xf0rv537gk"; depends=[lumi]; }; + fibroEset = derive2 { name="fibroEset"; version="1.20.0"; sha256="1k32m49bhk30rbjryg77jhicjzga970p12wcy5bwzm0qxyj6wvqj"; depends=[Biobase]; }; + fission = derive2 { name="fission"; version="0.112.0"; sha256="0wgfb85pbs2q4wy59dqpnvvgw63kc9xr0smbjkp482nqv437vg15"; depends=[SummarizedExperiment]; }; + flowFitExampleData = derive2 { name="flowFitExampleData"; version="1.14.0"; sha256="02cziq2jskrz17s05myqj8w1dfd49crnsga9l19xi67n2gl0dl5k"; depends=[flowCore]; }; + flowPloidyData = derive2 { name="flowPloidyData"; version="1.4.0"; sha256="09gcy0qv1crz8vfk4s58x054sbhnnfv9mvh1k5vcmlckppimywwq"; depends=[]; }; + flowQBData = derive2 { name="flowQBData"; version="1.4.0"; sha256="1gvbykmmgl94vmd0g1fccdlshjycll5jvv8vg3h94kx7r3vq8ymi"; depends=[]; }; + flowWorkspaceData = derive2 { name="flowWorkspaceData"; version="2.14.0"; sha256="10q3nhcbmq75vk1z5zlqsp03d734qmkicsrc25nas2gnbzqmbhwx"; depends=[]; }; + frmaExampleData = derive2 { name="frmaExampleData"; version="1.14.0"; sha256="11h9hwif6hcc3jaipgf5dvjj3j2rcp61phhvxz45r563m494s83z"; depends=[]; }; + furrowSeg = derive2 { name="furrowSeg"; version="1.6.0"; sha256="0ds6x0a5qpp3c8776wbq1zbz17i5ymwxphf9zkxgsnrmjw3cpvvf"; depends=[abind dplyr EBImage locfit tiff]; }; + gageData = derive2 { name="gageData"; version="2.16.0"; sha256="18w5wdaq1j2mndyjfiflawf411zwh1hhjwcxaxrwqnl48p25vg5c"; depends=[]; }; + gaschYHS = derive2 { name="gaschYHS"; version="1.16.0"; sha256="1c9pq8b2mllpsvwyb7w0gwh66kkabrdfadsqd6hagszbyy9sw2v8"; depends=[Biobase]; }; + gatingMLData = derive2 { name="gatingMLData"; version="2.18.0"; sha256="1zlxzy9wzzqfm9brd70kdvki5d9r6lsqc22y0m469ybcxypzvan4"; depends=[]; }; + gcspikelite = derive2 { name="gcspikelite"; version="1.16.0"; sha256="0p0yxm9i4ynhcvshxywxf6d9lhcr32xp7677ywc6q0ikvr6733zp"; depends=[]; }; + geneLenDataBase = derive2 { name="geneLenDataBase"; version="1.14.0"; sha256="063ivzxw02j854ivv5yxdw7a637svadf9n2zwvc3783y4clkfqb6"; depends=[GenomicFeatures rtracklayer]; }; + genomationData = derive2 { name="genomationData"; version="1.10.0"; sha256="0h7g5x3kyb50qlblz5hc85lfm6n6f5nb68i146way3ggs04sqvla"; depends=[]; }; + geuvPack = derive2 { name="geuvPack"; version="1.10.0"; sha256="0lin7wz9xp7rx34wykpmsd5w7hf0jzzfbmnb4klrvlys1c5r9xr2"; depends=[SummarizedExperiment]; }; + geuvStore2 = derive2 { name="geuvStore2"; version="1.8.0"; sha256="1fhq0r3hnv6k4mfrdhjsaylfi96vwv7j74dkaad92li4pizcz04q"; depends=[BatchJobs GenomicRanges gQTLBase]; }; + golubEsets = derive2 { name="golubEsets"; version="1.20.0"; sha256="0zsylgc1ml9ddnd5r4magmhn7k3glz50aw9aqvf251zjycasncz5"; depends=[Biobase]; }; + grndata = derive2 { name="grndata"; version="1.10.0"; sha256="0gqxvngjbxjd40z855vcrc4lqhx9q3b4bgicc371dkglsls4rpgs"; depends=[]; }; + gskb = derive2 { name="gskb"; version="1.10.0"; sha256="0j36kbyxrrp5h2m7747kprdvhidpcmm14lmqkd1c97ykx5wnzhpr"; depends=[]; }; + h5vcData = derive2 { name="h5vcData"; version="1.112.0"; sha256="169sg12li7nzd2zv6rj28qc6xfh1l7l9ipybrqa8xyqlcjhpq85f"; depends=[]; }; + hapmap100khind = derive2 { name="hapmap100khind"; version="1.20.0"; sha256="02pyrd8i1agx31ww4sw6xcwmncibvhqbys072w80rlx3vbjymn3c"; depends=[]; }; + hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.20.0"; sha256="0vp1wkbz4l9cxld9iazdi59mkrpvinjz6abf34rl7qzbqnckgygf"; depends=[]; }; + hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.20.0"; sha256="1ddxp4adf5nlr96n89hqjv9f0jvm0zknmwpibp757ic6zrk262da"; depends=[]; }; + hapmap500ksty = derive2 { name="hapmap500ksty"; version="1.20.0"; sha256="07cmawlx9wdbyzjjj5wh2h1a32d3ascr9h8rpyg6z1pdriq8cahq"; depends=[]; }; + hapmapsnp5 = derive2 { name="hapmapsnp5"; version="1.20.0"; sha256="19wpwai8h0ix4cv17rgz4pz74b0qwby4jc5ry539fb8ls9rzvx1q"; depends=[]; }; + hapmapsnp6 = derive2 { name="hapmapsnp6"; version="1.20.0"; sha256="0qjfmjww0rdma3q2nh6ax64zl7adx4n9j0xhc9s19rz5drsdnifl"; depends=[]; }; + harbChIP = derive2 { name="harbChIP"; version="1.16.0"; sha256="1hzlxha4nlvqw8ml6pylcmb7y986718yg7ff8hn344yfcigpsqkb"; depends=[Biobase Biostrings IRanges]; }; + healthyFlowData = derive2 { name="healthyFlowData"; version="1.16.0"; sha256="00mjbla9cwj656s174xbfcdmi8gr1xs7vksazrx25m9yn3dw23jb"; depends=[flowCore]; }; + hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.16.0"; sha256="1ffamwyl5fax5n6x4nc01gx4kazs73jsm239w943jkx2bwy5j2zf"; depends=[]; }; + hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.16.0"; sha256="1blm93a5ll7pn1yhbrl8y6wb1yvfvfnc1zq96kr6id9wxi7bl9hl"; depends=[]; }; + hgu2beta7 = derive2 { name="hgu2beta7"; version="1.18.0"; sha256="15g6lmq6zfg2vkqliadqrmwivw2mldxlrf52myspmfl83scq973a"; depends=[]; }; + hmyriB36 = derive2 { name="hmyriB36"; version="1.14.0"; sha256="0g642694w0qsf27chdlw1g6924pm20kbgza4w57szcdnschabh52"; depends=[Biobase GGBase]; }; + humanStemCell = derive2 { name="humanStemCell"; version="0.18.0"; sha256="1nff23qa684xzy35d78sympkns7qa82c8cg21bgff3yhlw2ww2ws"; depends=[Biobase hgu133plus2_db]; }; + iontreeData = derive2 { name="iontreeData"; version="1.14.0"; sha256="1xj8psicl3yp17i7r6cg9v7rf1wvpz2kck7pbnhwppm7cshqang1"; depends=[]; }; + kidpack = derive2 { name="kidpack"; version="1.20.0"; sha256="007jlvpcwin2q09v4z79mnplz2176crgngana4mfpmx4sp4sh1lx"; depends=[Biobase]; }; + leeBamViews = derive2 { name="leeBamViews"; version="1.14.0"; sha256="1dvrfn3zwi5zl8fjp6kyqankqpzi2dhgzyj1dlp1bijy2y09lg7p"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges Rsamtools]; }; + leukemiasEset = derive2 { name="leukemiasEset"; version="1.14.0"; sha256="1pya637a8yww5cm108w5l1ij2js9mx9mpq7d1miwqdqv2mi0liz6"; depends=[Biobase]; }; + lumiBarnes = derive2 { name="lumiBarnes"; version="1.18.0"; sha256="1jxk7abi7lkv8627vn9ydnmx6i4ycgicnl91j6r5gi0q3kffmmkq"; depends=[Biobase lumi]; }; + lungExpression = derive2 { name="lungExpression"; version="0.16.0"; sha256="09v9r6rmfcqprqd1rx53sa4dhjjmg6d9649vlhfhzkyc73yknwmb"; depends=[Biobase]; }; + lydata = derive2 { name="lydata"; version="1.4.0"; sha256="0dflfp14gdjgy7qf3my0vas5zbg77l16li7xgv1924cry11w2dxx"; depends=[]; }; + mAPKLData = derive2 { name="mAPKLData"; version="1.10.0"; sha256="1bfx4imb5yg17n0g1ag436zlks4jcp8ga0xj9wyh9bhx4miwyay4"; depends=[]; }; + mammaPrintData = derive2 { name="mammaPrintData"; version="1.14.0"; sha256="0ks72wnagdvnbilqcsvl5lbhgh64fhbfys0da03336f1z16f5lv9"; depends=[]; }; + maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.22.0"; sha256="0hn20i11vl9x23mx283aki097r1a8rspagac821kmlwghyab1mxq"; depends=[]; }; + metaMSdata = derive2 { name="metaMSdata"; version="1.14.0"; sha256="1iygqxymvb98cm325bmdqb34n9b4k1vdzdyzcq8a0gh1dvs2m0iw"; depends=[]; }; + methyvimData = derive2 { name="methyvimData"; version="1.0.0"; sha256="1b2mvcawafkr15py8h9j10w5givifi99h9clbdmkgfyixbbh0m94"; depends=[minfi]; }; + miRNATarget = derive2 { name="miRNATarget"; version="1.16.0"; sha256="1ym4wg3g29z7yqmxfxq95yxwc5n048fw3m4bp7dwcq1agnjn5qa7"; depends=[Biobase]; }; + miRcompData = derive2 { name="miRcompData"; version="1.8.0"; sha256="0h4a3vwzbpzs7rnkn3qgpmfp08a8x8vyy78zb2zl0pgnni7yrdks"; depends=[]; }; + microRNAome = derive2 { name="microRNAome"; version="1.0.0"; sha256="13fwzf91hdy4vvxg47xkl78qk4jfgn9whj41gl3pqbgxkp7b3d2n"; depends=[SummarizedExperiment]; }; + minfiData = derive2 { name="minfiData"; version="0.24.0"; sha256="0j5f69k9s0mppb62cffj3kscvvmrrwhf6x3xsw3bc6qdk0f3sv67"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; }; + minfiDataEPIC = derive2 { name="minfiDataEPIC"; version="1.4.0"; sha256="12vxglizdyxk4hmj684cwfax4k1rwrz9lmm7khbqzhckzrgiqbny"; depends=[IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest minfi]; }; + minionSummaryData = derive2 { name="minionSummaryData"; version="1.8.0"; sha256="1dyr99wi3syzrr6vdxfcp7fjnx9p4gd6raj2r7x83r11g2rndpyn"; depends=[]; }; + mitoODEdata = derive2 { name="mitoODEdata"; version="1.14.0"; sha256="0vgmalrsnm616la3251p1fvcjpfg0wpv5zaxg20ikdc982zfk4sa"; depends=[]; }; + mosaicsExample = derive2 { name="mosaicsExample"; version="1.16.0"; sha256="0m2az0wv2lmdwa8c465cnfwmnmxmjz33ras984xbcvkh5a8i3gmw"; depends=[]; }; + mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.16.0"; sha256="119z7vxd4yrfgjsd286iswklg0n07gzyckib3ivmm285hxphl79d"; depends=[]; }; + msPurityData = derive2 { name="msPurityData"; version="1.6.0"; sha256="1fpxy34gyngsz7rpr2ng77xb1bylj8s5i500mpbi765cva47lk11"; depends=[]; }; + msd16s = derive2 { name="msd16s"; version="0.112.0"; sha256="0ii7c6ynif55izkysw12vjphpkxyx3lvw0akfl18ypbiash3qf6h"; depends=[Biobase metagenomeSeq]; }; + msdata = derive2 { name="msdata"; version="0.18.0"; sha256="16wygr7g7vr3jsw9l6fzajid1cxffdww9pik5m4x55chdliq4f25"; depends=[]; }; + msqc1 = derive2 { name="msqc1"; version="1.6.0"; sha256="0csm35vzk9dp3gc8yfzli1rwanrah42yxsqssjfbvw5zcijs9npm"; depends=[lattice]; }; + mtbls2 = derive2 { name="mtbls2"; version="1.8.0"; sha256="1miqc8apjm8pvb9p4man688qnxpg04fqgidy7g9vr654hfc90gja"; depends=[]; }; + mvoutData = derive2 { name="mvoutData"; version="1.14.0"; sha256="0lwzsv8pmyyadnky9m0c3xf5dvm2qs8igkvrfaglsgl1wmymw86a"; depends=[affy Biobase lumi]; }; + pRolocdata = derive2 { name="pRolocdata"; version="1.16.0"; sha256="1pmz9vyvl3r8s6mfbd7k7vrz7qk1sv9136aykykvl139rsq7vwnz"; depends=[Biobase MSnbase]; }; + parathyroidSE = derive2 { name="parathyroidSE"; version="1.16.0"; sha256="1jd3fwri705b4i1wwnzx41idc2lvwai6mr7k78666wl6a8275hcn"; depends=[SummarizedExperiment]; }; + pasilla = derive2 { name="pasilla"; version="1.6.0"; sha256="0h6ll2csja5vnmylazb1qklz7ybk5hn0nxgkvxhhsmyqk9w7gk6m"; depends=[]; }; + pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.16.0"; sha256="1rchf41zh44kzvim8iwvyfvgcfwv587p5p1yipgwf65hyc9sd0fv"; depends=[]; }; + pathprintGEOData = derive2 { name="pathprintGEOData"; version="1.4.0"; sha256="143an0hs22dbglmdc408mfch53zcskbf3a4jfgiajz3dml81flzl"; depends=[]; }; + pcaGoPromoter_Hs_hg19 = derive2 { name="pcaGoPromoter.Hs.hg19"; version="1.14.0"; sha256="137lj4j0hlz3mkwyf334xr3bpm9j2jg1cd2sw9203kx6hvk92i2z"; depends=[]; }; + pcaGoPromoter_Mm_mm9 = derive2 { name="pcaGoPromoter.Mm.mm9"; version="1.14.0"; sha256="0kb62bm1a8m88g59v6553qg69rmv0gh0wy4yfkqvn2sgz51zk4r4"; depends=[]; }; + pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.14.0"; sha256="0b3cak7nzd6qxr7gnly4246gjdhxyp8h0w5dr1xsgwd9zy1k0psw"; depends=[]; }; + pcxnData = derive2 { name="pcxnData"; version="1.0.0"; sha256="0bkzqac0b2x1f398bflv077dp6nb3ysdf75jcwxpj4nwyhcb7n4f"; depends=[]; }; + pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.16.0"; sha256="1ilwm4nx232dll01xqqvagq3qi6qa060v84y20ihxhfwdm46z0ci"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pepDat = derive2 { name="pepDat"; version="0.112.0"; sha256="15v4yk9cpnz2k16ka4iyc61ji5ck9mlkabgzxalwfnz77ri23mk0"; depends=[GenomicRanges]; }; + plasFIA = derive2 { name="plasFIA"; version="1.6.0"; sha256="0p3pbjm5ww24ax7h72m38l0rcm01w5a4h8j5rsgynczvfv9jlwjq"; depends=[proFIA]; }; + ppiData = derive2 { name="ppiData"; version="0.16.0"; sha256="00wjgaihavx99qbcrx1sai2v35pm7kmkvybwdn7ndngvkzqixph5"; depends=[AnnotationDbi graph]; }; + prebsdata = derive2 { name="prebsdata"; version="1.14.0"; sha256="0rq90wrprj8xy60597dwq8ialjfyfcs8c2fgbskcm7ypba92brmp"; depends=[]; }; + prostateCancerCamcap = derive2 { name="prostateCancerCamcap"; version="1.6.0"; sha256="0f08mbwsac1nxvf4mwyjnwxd662rdibnzgrn8a0hcl1jmlsrkmg0"; depends=[Biobase]; }; + prostateCancerGrasso = derive2 { name="prostateCancerGrasso"; version="1.6.0"; sha256="0rk822avnfg3lydq9z995ki9zh7ch8ycg6nslxp8w5c3z4p447mk"; depends=[Biobase]; }; + prostateCancerStockholm = derive2 { name="prostateCancerStockholm"; version="1.6.0"; sha256="03min0za1paivvi45fl6nyksvhahpxlnqnkisj9312pb1x1gfm54"; depends=[Biobase]; }; + prostateCancerTaylor = derive2 { name="prostateCancerTaylor"; version="1.6.0"; sha256="01c519rp5jdphc9kqsdqcxsxkg00nhv3s82xlms6s0qdpibscx8m"; depends=[Biobase]; }; + prostateCancerVarambally = derive2 { name="prostateCancerVarambally"; version="1.6.0"; sha256="10qqsijkjwsw64am50vcjykxghgw51psq608yp9qj85l5d33kkmp"; depends=[Biobase]; }; + pumadata = derive2 { name="pumadata"; version="2.14.0"; sha256="0fsg1qcvfm2s7mpmwqih4pkgwphb4d1k8fah6gwvgc13q519ir2x"; depends=[affy Biobase oligo puma]; }; + rRDPData = derive2 { name="rRDPData"; version="0.112.0"; sha256="0305x1kkm5wbxcnw7kazrlhdjp91xrbxcvyypn6n0ga09ypk071l"; depends=[rRDP]; }; + rcellminerData = derive2 { name="rcellminerData"; version="2.0.0"; sha256="03j715sdprmdn1kazcyfy33nymz8kj52hxbv85a8bj3r2r1w6fzm"; depends=[Biobase]; }; + restfulSEData = derive2 { name="restfulSEData"; version="1.0.0"; sha256="1v7fvyabb8zjhzwpi1yamp0ch8zm32s820bfr366ir69dib66sa4"; depends=[ExperimentHub SummarizedExperiment]; }; + rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.16.0"; sha256="06mfgsvzn2s30skrrqm4m76kb1bzp6aa52jfkz94gfam8ps1h1vf"; depends=[]; }; + sampleClassifierData = derive2 { name="sampleClassifierData"; version="1.2.0"; sha256="0bb4pjiljjixxvz9p59knwxmwr7g0334rs58r0j9w84v1g5prgwv"; depends=[SummarizedExperiment]; }; + scRNAseq = derive2 { name="scRNAseq"; version="1.4.0"; sha256="0jlcgna92mrcjz95r788falyhdpbfa75z2j7dy4jxdr0kd0gjrb6"; depends=[SummarizedExperiment]; }; + seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.10.0"; sha256="01h6xhap2gbwgv3jwrzzciwd697x1vy6gaxmn0jlhvryy9qw9q05"; depends=[]; }; + seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.14.0"; sha256="1g1lgzsrnf0j5yv2hlgilij1mzbz86pl3p3vd8pbkd61pdf4gxz2"; depends=[]; }; + seqc = derive2 { name="seqc"; version="1.12.0"; sha256="0dzfxx75lnrqh2ag9x7351c8xkkfrbvz8fqnigfslgrx01ydxs9y"; depends=[]; }; + serumStimulation = derive2 { name="serumStimulation"; version="1.14.0"; sha256="10pg5vp1np7n0n7maiizgx2kskm02ikfqvz6pxlz9mglhi1vss1l"; depends=[]; }; + seventyGeneData = derive2 { name="seventyGeneData"; version="1.14.0"; sha256="0643h4wlqmpsygawlh9mh1f889wp79adhlx9s1cqm2b5gggpsrli"; depends=[]; }; + shinyMethylData = derive2 { name="shinyMethylData"; version="0.112.0"; sha256="03y637yxglvy3jxydslwl9ivdc5r8ndph7anbzrmprzp6i481gj4"; depends=[]; }; + simpIntLists = derive2 { name="simpIntLists"; version="1.14.0"; sha256="1sdmcbx3yvgwhw8kilx3xa6ip0klyvia00plv1pyfwsl6ldnymvl"; depends=[]; }; + stemHypoxia = derive2 { name="stemHypoxia"; version="1.14.0"; sha256="0l6nfx1b97grxgq618zvb9ymysrl52r1ahr5ivav3znsnych0gl8"; depends=[]; }; + stjudem = derive2 { name="stjudem"; version="1.18.0"; sha256="1bxc1qzs6jcdfh87f6mzn9d1ih790i461267czzhsm9niha4q604"; depends=[]; }; + synapterdata = derive2 { name="synapterdata"; version="1.16.0"; sha256="1r1ldji1wnfsk772c00cwmx13xms90v9diqrqjilxbam9p30wr98"; depends=[synapter]; }; + systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.6.0"; sha256="1j2kwczhqz26rf0ra34am32lbwp7rk13in1saf0kxd88m8qljksa"; depends=[BiocGenerics]; }; + tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.16.0"; sha256="0a71k64y6yw4pxnbay478d27pfshnw96rslphvpkqaf48903b2fy"; depends=[]; }; + tinesath1probe = derive2 { name="tinesath1probe"; version="1.16.0"; sha256="088hrs6b65rxvw4d153fbk83w9p88mv5xfkwj4xziygibqy7lmpi"; depends=[AnnotationDbi]; }; + tofsimsData = derive2 { name="tofsimsData"; version="1.6.0"; sha256="030x882c38apa3n4vs9qj5a83sa8m183ifym60zqyms432k4xc70"; depends=[]; }; + topdownrdata = derive2 { name="topdownrdata"; version="1.0.0"; sha256="157vv89cidpcnliksfy4inds52j176724xydk0smykc6ny9wmas7"; depends=[topdownr]; }; + tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.16.0"; sha256="17v27ir0a38y1h73nr8nib18bj8s2l6rbz5y15ly7pp2wkp5w0cm"; depends=[Biobase]; }; + tximportData = derive2 { name="tximportData"; version="1.6.0"; sha256="0l86z9nryhqzdqh6vn5krlkdhanhybr86z75l7lwg07k34nm8qcb"; depends=[]; }; + vulcandata = derive2 { name="vulcandata"; version="1.0.0"; sha256="0nka5sw9gp7nv09zdi4cq10k7k400padadq80xzxfzss91nwz23l"; depends=[]; }; + waveTilingData = derive2 { name="waveTilingData"; version="1.14.0"; sha256="0ndskrk78c8596gymcffdr5mbxi1x5046w8m83baa3vrd8csn282"; depends=[]; }; + yeastCC = derive2 { name="yeastCC"; version="1.18.0"; sha256="1qm0knin24bwpjsi4g9s6vdfydrjqvv19a2kjx1k51l2j46g0rni"; depends=[Biobase]; }; + yeastExpData = derive2 { name="yeastExpData"; version="0.24.0"; sha256="19v901c67kp8kfb6i2hv8mczf9kcy0pvr8y4w5brjp4lj6djcvid"; depends=[graph]; }; + yeastGSData = derive2 { name="yeastGSData"; version="0.16.0"; sha256="19c4293lzrw8d8az1bzfw5ipxyrzgh8kxi3km82nqzfcnxlq0b89"; depends=[]; }; + yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.14.0"; sha256="0f7amg423236scpzxqi2jy2w4ppa0zqwn9m4mqjksk2klig9nx3g"; depends=[]; }; + yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.16.0"; sha256="05pi5s91wivlc1nfnsnzgx8kdibi7a3k5dgqh0a0x98wiqynin41"; depends=[]; }; + yri1kgv = derive2 { name="yri1kgv"; version="0.20.0"; sha256="0hl53rl5yhmd3yxdjd2q0wj8mlcgdckiln0dym83b1249lnhwp9z"; depends=[Biobase GGBase]; }; + yriMulti = derive2 { name="yriMulti"; version="0.8.0"; sha256="0b48phy3jndplmi9yxbd0i5bn7jqf6fpb7qlqxvzibm1q50l9yx3"; depends=[dsQTL GenomeInfoDb GenomicFiles GenomicRanges geuvPack gQTLBase Homo_sapiens MultiAssayExperiment SummarizedExperiment VariantAnnotation]; }; + zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.112.0"; sha256="1zpn3d4xmzq18hji93g5br1snw0d9wmvpjmbxnmiaqwr8mrx5zbn"; depends=[]; }; } diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index 070ff5e96adee3ccdb86acfc1949dad3b39a7449..2d98b23a8671fc0480a8eb45059f0ee4ef392d41 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -4,1300 +4,1483 @@ # Rscript generate-r-packages.R bioc >new && mv new bioc-packages.nix { self, derive }: -let derive2 = derive { rVersion = "3.4"; }; +let derive2 = derive { biocVersion = "3.6"; }; in with self; { - 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]; }; - ChAMP = derive2 { name="ChAMP"; version="2.6.4"; sha256="1f8ngnzp6yq4x746vid72ind2bi7l1wdfnipyj2wn0gsh2jpxa7c"; depends=[bumphunter ChAMPdata dendextend DMRcate DNAcopy doParallel FEM GenomicRanges goseq Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICmanifest impute isva limma marray matrixStats minfi plotly plyr preprocessCore quadprog qvalue RColorBrewer RefFreeEWAS RPMM shiny shinythemes sva wateRmelon]; }; - ChIPComp = derive2 { name="ChIPComp"; version="1.4.0"; sha256="0wr9qrw9mnjl28fw764vhjb2shif6fl3z0hbwkhrfiz1974rdw0v"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; }; - ChIPQC = derive2 { name="ChIPQC"; version="1.10.3"; sha256="1nabghyndp4bky6msb4k6gcxpgysz7rir545d5afrfi4gbk1rpfi"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; }; - ChIPXpress = derive2 { name="ChIPXpress"; version="1.16.0"; sha256="19lx482jhh4h97nic57lk198a0x1xc51cnx79l9h6r9r86ncxl0w"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; }; - 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=[]; }; + ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.8.0"; sha256="0l2zn5hqbab30lnzk856iki51jn4l9na7jdagibhvf777v5jcz51"; depends=[ABAData data_table gplots gtools Rcpp]; }; + ABSSeq = derive2 { name="ABSSeq"; version="1.32.3"; sha256="05pcn9p24nifz10a9pzrwkmsps8yhrr214yryypapshghb7kmz76"; depends=[limma locfit]; }; + ABarray = derive2 { name="ABarray"; version="1.46.0"; sha256="19m6qlcvylz8qgvcagsnir0pjhdyl4axdfj9q53q9ff1iraw6qwj"; depends=[Biobase multtest]; }; + ACME = derive2 { name="ACME"; version="2.34.0"; sha256="1n7scyw5lklzaprmy6dy0qim1ypwpvfrzzgczkby1dljk0pd4i16"; depends=[Biobase BiocGenerics]; }; + ADaCGH2 = derive2 { name="ADaCGH2"; version="2.18.0"; sha256="02imx6x2hcb3bk6qwgwmwsv22dbbl1a6iyk35paqflsk1kdbn9fx"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; }; + AGDEX = derive2 { name="AGDEX"; version="1.26.0"; sha256="0qy9zihx8bqz343h2wk3iy5j71142r11a2862lz5sj05h94kxy0i"; depends=[Biobase GSEABase]; }; + AIMS = derive2 { name="AIMS"; version="1.10.0"; sha256="1c3mq7lm91779w27c35ych1sp5rcja75zim9a267qc0pqa4xlzv2"; depends=[Biobase e1071]; }; + ALDEx2 = derive2 { name="ALDEx2"; version="1.10.0"; sha256="0q63sfnm4h6w6yhv55m87884ym60g1q1qnd82fqx6vlh4nssvz53"; depends=[BiocParallel GenomicRanges IRanges multtest S4Vectors SummarizedExperiment]; }; + AMOUNTAIN = derive2 { name="AMOUNTAIN"; version="1.4.0"; sha256="0zgl47x8bvdsngq5sp0iq4ssx4skn81l85fspfwl3qyvr4y3r91r"; depends=[]; }; + ANF = derive2 { name="ANF"; version="1.0.0"; sha256="0s39mh0xbrr3kkack6n48jfwg2b0nrqilm2q0v64rf7jpfn6gj11"; depends=[Biobase igraph MASS RColorBrewer survival]; }; + ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.18.0"; sha256="1gy2r863g21phwba59ksf9rp3azgy18f9cslka0l4kxckk701n85"; depends=[ARRmData]; }; + ASAFE = derive2 { name="ASAFE"; version="1.4.0"; sha256="13vdv961i48lhkmaxnpg33j628h5a8b6f7s5anvgxskv2b0dzzz7"; depends=[]; }; + ASEB = derive2 { name="ASEB"; version="1.22.0"; sha256="0pry207kvczv9ihs7vcq1ljhll4i3grn08wprip9n9yy1xy4w2xj"; depends=[]; }; + ASGSCA = derive2 { name="ASGSCA"; version="1.12.0"; sha256="1b7i4qwajvv5dmn1qn5k0azv3ad5kxjkwnwsgvjlh7m573shdpxk"; depends=[MASS Matrix]; }; + ASSET = derive2 { name="ASSET"; version="1.16.0"; sha256="12863h5f7ib3p26ghim2h0l7zn51y3624rihsybj5lpycnxkam9q"; depends=[MASS msm mvtnorm rmeta tmvnsim]; }; + ASSIGN = derive2 { name="ASSIGN"; version="1.14.0"; sha256="12g1dh35azv1z5bc7n7gyr0vnyyi2r2jrvi6x0gyikbdszxwfysx"; depends=[ggplot2 gplots msm Rlab sva]; }; + ASpli = derive2 { name="ASpli"; version="1.4.0"; sha256="19v9p4brgrzijin759n1q8zjrlksrzhmczi1nwhsjgbg47f35vs7"; depends=[AnnotationDbi BiocGenerics BiocStyle edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rsamtools S4Vectors]; }; + ATACseqQC = derive2 { name="ATACseqQC"; version="1.2.10"; sha256="0f1j89an2rckjrmvvmy6crmrgz2jxgmmajhx333crl8jjqi1aqm8"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges limma motifStack randomForest Rsamtools rtracklayer S4Vectors]; }; + AUCell = derive2 { name="AUCell"; version="1.0.0"; sha256="0b6az665vpdkp82xcr4xgric3nw9204g47rj4316s30l5w5l1j2v"; depends=[data_table GSEABase mixtools R_utils SummarizedExperiment]; }; + AffyCompatible = derive2 { name="AffyCompatible"; version="1.38.0"; sha256="1lxxpldgrsl0nf63cfhbqpraylfb3118y4j8q4xknr7x8pj95gns"; depends=[Biostrings RCurl XML]; }; + AffyExpress = derive2 { name="AffyExpress"; version="1.44.0"; sha256="0nwvgkh9nc9gag9dh85g3x4d5125p00c9jc55knpr11jraj2xifw"; depends=[affy limma]; }; + AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.24.0"; sha256="197rrlkxmynh8fy1xzmh68d2kygpdw7kkrysar3nsikl051yl6vb"; depends=[affy]; }; + AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.28.0"; sha256="0yx9pz9641hi9g67nkhlngz4hbykbp2g4p0xji90jjw6ajf28qwa"; depends=[affy affycoretools Biobase limma preprocessCore]; }; + AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.16.0"; sha256="0plqdj4828v9icn958f7isrdpvqwk2smxacv6qpd35dzlpmlrpgh"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridExtra Gviz IRanges lattice latticeExtra nlme Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; }; + AnalysisPageServer = derive2 { name="AnalysisPageServer"; version="1.12.0"; sha256="1spasp0r91lbrc6l0qjadv1yg1m1659dkc2pm1mf09bpplbsagf1"; depends=[Biobase graph log4r rjson]; }; + Anaquin = derive2 { name="Anaquin"; version="2.2.0"; sha256="0j9f3ck23g9s09lf2adbds5pxnf9i0ji06x30gpi1dcakrs6izf2"; depends=[DESeq2 ggplot2 knitr locfit plyr qvalue ROCR]; }; + AneuFinder = derive2 { name="AneuFinder"; version="1.6.0"; sha256="07mwfzpv9ya9ma74n993pihjhi10pjpnzbx1bfvk55h4mcyl7r7c"; 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.40.0"; sha256="1dh4qs1a757n640gs34lf6z2glc96nan86x0sqaw5csadl2rhnlc"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; }; + AnnotationFilter = derive2 { name="AnnotationFilter"; version="1.2.0"; sha256="04zf864c1fvdlaay2r5cn30fc1n5i3czh31fs62qlrvs61wjiscs"; depends=[GenomicRanges lazyeval]; }; + AnnotationForge = derive2 { name="AnnotationForge"; version="1.20.0"; sha256="01vbrf76vqfvxh6vpfxkjwccxggnha3byqzj333glqz2b6kwx5q1"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; }; + AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.28.0"; sha256="1g6y7bwk573yaays0fmlicxq2452sli0kv41bq8sh4ja2l5jh5i6"; depends=[AnnotationDbi DBI]; }; + AnnotationHub = derive2 { name="AnnotationHub"; version="2.10.1"; sha256="14v8g44a6zg9j2rwn9x9y8509k0wr2cw8yccliz24glplb40wva4"; depends=[AnnotationDbi BiocGenerics BiocInstaller curl httr interactiveDisplayBase RSQLite S4Vectors yaml]; }; + AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.8.0"; sha256="1nsai8a2vf5jwczd4k3vbdd9xbn6dfg6dydvf4byklxj6pk6vi97"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; }; + ArrayExpress = derive2 { name="ArrayExpress"; version="1.38.0"; sha256="01kb4322pfl9w6za6glb777hdyc8j36xs6flz3b11n1mjryipz7c"; depends=[Biobase limma oligo XML]; }; + ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.28.0"; sha256="04qnxgywyxww8xd6r8vgy8sglbixd25749dmbsw0wgqk6zcgysim"; 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.16.0"; sha256="1hn5dngk4civwzx1w2py1n9g1k1jv3kwrj6z6ysvfsfi4q668341"; depends=[DNAcopy foreach oligoClasses S4Vectors]; }; + ArrayTools = derive2 { name="ArrayTools"; version="1.38.0"; sha256="0dyd3qwc0x25m66wqd3az8l0mabiw13j5wx2f620psyq0y5ghlkd"; depends=[affy Biobase limma xtable]; }; + AtlasRDF = derive2 { name="AtlasRDF"; version="1.11.0"; sha256="1n52s6saydhh5j5kki9zkilhlxd8nn8463988gyr1jsb4g6fdljv"; depends=[hash SPARQL]; }; + BAC = derive2 { name="BAC"; version="1.38.0"; sha256="04s7fbb8b4is97alj64p86jnh1lgf4a0n02wg3g9rvd75jxmzbai"; depends=[]; }; + BADER = derive2 { name="BADER"; version="1.16.0"; sha256="05p006rqydnvz5a8gdbara9fsyn51b5flc05j593bvvlmkc6anl5"; depends=[]; }; + BAGS = derive2 { name="BAGS"; version="2.18.0"; sha256="1qhmrz6ffhhsbnmcc0xmb64psv50b1jd1gxkjhhv479mcfl6mk06"; depends=[Biobase breastCancerVDX]; }; + BASiCS = derive2 { name="BASiCS"; version="1.0.0"; sha256="15yby5dz0hizr76bpa5clrpfh1ycvpkk11i7y7ak164ikzxvvmd9"; depends=[BiocGenerics coda data_table KernSmooth matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; }; + BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.8.0"; sha256="0fv5gyzfv0093dlyrlci9d88fcb0ifgljxwivrxpkbbsll5vrpxh"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; }; + BCRANK = derive2 { name="BCRANK"; version="1.40.0"; sha256="0vbjskazhm5v4lmwdc456r5vl2v848ldqrzbdjrdxjlvd72wfprw"; depends=[Biostrings]; }; + BEAT = derive2 { name="BEAT"; version="1.16.0"; sha256="0x4k45qgzwv6m00zq1jhbhc2aa5slgg5p4g8g909vajc75fpp6g7"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; }; + BEclear = derive2 { name="BEclear"; version="1.10.0"; sha256="1skkqzph89lx9cwlgyd2xmn1808sn5byfa8mqdq6w60j6vwplpzn"; depends=[Matrix snowfall]; }; + BGmix = derive2 { name="BGmix"; version="1.38.0"; sha256="1778bm1hx8bw00n0l3d5jvfldc7hqmpg2w1nbsc3c017rd1l2ryk"; depends=[KernSmooth]; }; + BHC = derive2 { name="BHC"; version="1.30.0"; sha256="0j8sb6ifq2nxvlarm1zqa89yzfs3si4w43ily9nnbmlnhngr6d0m"; depends=[]; }; + BLMA = derive2 { name="BLMA"; version="1.3.3"; sha256="1qxj3izpv4pphq515kqq5qcsg1p847knpm961pcipmikbzxrvfqw"; depends=[Biobase graph GSA limma PADOG ROntoTools]; }; + BPRMeth = derive2 { name="BPRMeth"; version="1.4.0"; sha256="0b7p2z69zjxrza2qfgpg6dfk96r9gfjm3v4qzafjy0hrbcfi2d74"; depends=[assertthat data_table doParallel e1071 earth foreach GenomicRanges IRanges MASS randomForest S4Vectors]; }; + BRAIN = derive2 { name="BRAIN"; version="1.24.0"; sha256="0cxci3clyz98r8vx6cq49ypc3s3bkhx8rx0h60r54va6gbp1j2lm"; depends=[Biostrings lattice PolynomF]; }; + BSgenome = derive2 { name="BSgenome"; version="1.46.0"; sha256="1jbzq7lm2iajajn2bifxnkss0k9fdvgqr30mral17cbhp5f6w4lq"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; }; + BUMHMM = derive2 { name="BUMHMM"; version="1.2.0"; sha256="00w730jxdl83sm385a63d35b2gfxlxj0jlj85xa3li5w94cwpb07"; depends=[Biostrings devtools gtools IRanges stringi SummarizedExperiment]; }; + BUS = derive2 { name="BUS"; version="1.34.0"; sha256="07hm54q8db209xc9sfj3w0dbrd7fqdzzs1083dwabfmrgwq69ivn"; depends=[infotheo minet]; }; + BaalChIP = derive2 { name="BaalChIP"; version="1.4.0"; sha256="1zaknwb718hpvlrwxfan7xyd3mm7iim3mffsc2d7gfxd5s3fa4q3"; depends=[coda doBy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges reshape2 Rsamtools scales]; }; + BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.6.0"; sha256="04wl2s36ji1qdxm5x1nvmb9licb65hdfch319zvhinvsr04nig6i"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; }; + BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.22.0"; sha256="1pck2mnb9ik3lz88xn9g1rgaww1k4khv55fab920gk7plcj9fqvp"; depends=[RCurl RJSONIO]; }; + Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.14.0"; sha256="1xylz923wn9n9cw19hlyrgq3rrf8r172jhi9a3gqlw3bmzhxh7h0"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; }; + BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.6.0"; sha256="1qx0zfxy8xi2djmk8b6fbbipv64gdp9b85acy3z4z9dnsq80qps1"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; }; + BatchQC = derive2 { name="BatchQC"; version="1.6.1"; sha256="1fjin9j6gzxkb9zif2wk56w6axb9ld104p8kly0ld2b3l73knnid"; depends=[corpcor d3heatmap ggvis gplots knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; }; + BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.4.0"; sha256="1dkch2md8fi23i3pg90rzxy185v6953jhz4l2icgglxhp15ydmfp"; depends=[Biobase]; }; + BayesPeak = derive2 { name="BayesPeak"; version="1.30.0"; sha256="1f8r1z7mmh40nrfqj1b3drjli6zb6hm645a9xi39claid2kvfh9z"; depends=[IRanges]; }; + BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.30.0"; sha256="153ks6bbhqzdkl88wvszjg5f67hr0gnf1mnhn6crq7i3pjy1jw0m"; depends=[]; }; + BgeeDB = derive2 { name="BgeeDB"; version="2.5.0"; sha256="08q93yk0hb4sbavk7i1z2qdklhl87f70ywr7xnq26r5frxcpcxm6"; depends=[Biobase data_table digest dplyr graph RCurl tidyr topGO]; }; + BiGGR = derive2 { name="BiGGR"; version="1.14.0"; sha256="1frxzj99qh94ll1xsvvnmgnfai7wfzchsqdrk2s0cp7z40yng13b"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; }; + BiRewire = derive2 { name="BiRewire"; version="3.10.0"; sha256="08z2h5fq1nm192s2vwzv1q6sp82axkk81p05bib71wl5vg0j5fpk"; depends=[igraph Matrix slam tsne]; }; + BiSeq = derive2 { name="BiSeq"; version="1.18.0"; sha256="0277lknj60gniwx4vr3ffd46gldzgjr7lbw8xy5xzdd0wa45wanz"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; }; + BicARE = derive2 { name="BicARE"; version="1.36.0"; sha256="1ikjnpg1j7pk6y9jm0p8y28aqrq37xryhj3qnksphwvwwj533xi2"; depends=[Biobase GSEABase multtest]; }; + BioCor = derive2 { name="BioCor"; version="1.2.1"; sha256="0f6r23imyldfacxacmici1r918b700w2i8fmd69d36bvykra59xs"; depends=[BiocParallel Matrix]; }; + BioMVCClass = derive2 { name="BioMVCClass"; version="1.46.0"; sha256="08f8zcmncbmbhrm3y9i8wvjfivskhp8580rcndkcc82wd5g8fqdc"; depends=[Biobase graph MVCClass Rgraphviz]; }; + BioMedR = derive2 { name="BioMedR"; version="1.1.0"; sha256="1wdszvk1qkwpfzxghbjz0zvh5zxf1wkd2f29f4hjxh09dkza49r0"; depends=[Biostrings ChemmineOB ChemmineR doParallel fmcsR foreach GOSemSim org_Hs_eg_db pls randomForest rcdk RCurl rjson]; }; + BioNet = derive2 { name="BioNet"; version="1.38.0"; sha256="1pbi461aly08vy16sbakx249q01pyn3iwnp6xbdyi45gr1x9g3c0"; depends=[AnnotationDbi Biobase graph igraph RBGL]; }; + BioQC = derive2 { name="BioQC"; version="1.6.0"; sha256="1lrvynzh38h62ikzig6b5fq1j738d0rrpb9bgj1lm1rwf9bbdgvs"; depends=[Biobase Rcpp]; }; + BioSeqClass = derive2 { name="BioSeqClass"; version="1.36.0"; sha256="0drgj7dhx87qspqwrxhmjiycvz2vn14kh9wx5g0r7qimvkga9lgr"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; }; + Biobase = derive2 { name="Biobase"; version="2.38.0"; sha256="1cgm1ja1kp56zdlzyy9ggbkfn8r2vbsd4hncmz8g4hjd47fg18kg"; depends=[BiocGenerics]; }; + BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.40.0"; sha256="0hwmqv8nimc8gl1c5a72ckmgag5j8886ab62i1irlkfis5x2rj8m"; depends=[Biobase]; }; + BiocCheck = derive2 { name="BiocCheck"; version="1.14.0"; sha256="1nzp8kgw13z9pgf885rplj6k37jcldfhbz0adqclxr2gq0yalmyx"; depends=[BiocInstaller biocViews codetools graph httr optparse stringdist]; }; + BiocFileCache = derive2 { name="BiocFileCache"; version="1.2.2"; sha256="111rrzz366kmqs1v8jx5ck0kb0xs42f250m5i0sn65ypvg9ag504"; depends=[DBI dbplyr dplyr httr rappdirs RSQLite]; }; + BiocGenerics = derive2 { name="BiocGenerics"; version="0.24.0"; sha256="03wxvhxyrhipbgcg83lqlfn7p9gbzzrnl48y0dq7303xgp232zai"; depends=[]; }; + BiocInstaller = derive2 { name="BiocInstaller"; version="1.28.0"; sha256="19fga27bv6q9v5mpil74y76lahmnwvpg2h33rdx1r79nvljkd19d"; depends=[]; }; + BiocParallel = derive2 { name="BiocParallel"; version="1.12.0"; sha256="13ng3n2wsgl3fh0v6jnz3vg51k5c1sh44pqdvblcrcd1qyjmmqhd"; depends=[BH futile_logger snow]; }; + BiocSklearn = derive2 { name="BiocSklearn"; version="1.0.2"; sha256="1zpfb7g353c01ffldrx7251919r6giy58s19w78jf0bslagblv4y"; depends=[BBmisc knitr reticulate SummarizedExperiment]; }; + BiocStyle = derive2 { name="BiocStyle"; version="2.6.1"; sha256="03pp04pkcq99kdv2spzr995h2cxsza7l6w3d4gp4112m06prcybm"; depends=[bookdown knitr rmarkdown yaml]; }; + BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.4.1"; sha256="13xcsd4c2l9jrcbl8axrragk4g2x6sp6xrk5r4gcligdicgxpq9l"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown stringr]; }; + Biostrings = derive2 { name="Biostrings"; version="2.46.0"; sha256="0vg50qdlxqcm2d6axjnzg8wh8pr4c5gz03l8bdl0llmwzp0zclzk"; depends=[BiocGenerics IRanges S4Vectors XVector]; }; + BitSeq = derive2 { name="BitSeq"; version="1.22.0"; sha256="1xkmvzv2kdla3mrarlw21w1hz788w71443jbn36a8dc4p6wrnxhy"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; }; + BrainStars = derive2 { name="BrainStars"; version="1.22.0"; sha256="0fipnpjpsp462dsfsvcrnysca4vsq2k6z15a6mxfxvqs1gybhvvj"; depends=[Biobase RCurl RJSONIO]; }; + BridgeDbR = derive2 { name="BridgeDbR"; version="1.12.0"; sha256="1yzn8sghqiy64l9q793yp9r3f1g1zy6ixzxbwb7skg1f5n3j7iig"; depends=[RCurl rJava]; }; + BrowserViz = derive2 { name="BrowserViz"; version="1.10.0"; sha256="1v3d0sfj05f0l4zfw1bd27gjrfkgca0n3mxxc30b42ybdmiif3xc"; depends=[BiocGenerics httpuv jsonlite]; }; + BrowserVizDemo = derive2 { name="BrowserVizDemo"; version="1.10.0"; sha256="0yps8ll1d14q0b93mpmmp0pgrjaqvxn0d7iqvpy9yg888zk46g8x"; depends=[BiocGenerics BrowserViz httpuv jsonlite Rcpp]; }; + BubbleTree = derive2 { name="BubbleTree"; version="2.8.0"; sha256="1nhf7sndiakjddvgihicc1vdnzqb8wmmlkng73sim1lb5hrjr391"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr RColorBrewer WriteXLS]; }; + BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.42.0"; sha256="1vxr91xnicbmbwz5cssaviq7p0334ikrirm8jmsaxa9sb59cdy07"; depends=[]; }; + BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.42.0"; sha256="1kay46cmrlilnjmiv2wnl99a4i9nc76f9j1j5rxg8cqxfq2hhmd2"; depends=[BufferedMatrix]; }; + CAFE = derive2 { name="CAFE"; version="1.14.0"; sha256="0lv0s2d0zqj43dqdkw5m4ac9190l6bfxj73adn5k2fl4wzl3a0rq"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; }; + CAGEr = derive2 { name="CAGEr"; version="1.20.0"; sha256="0gavrpwibf8gm53f292x1f64vdr2byx97c18cvxg4x3g5m60vx3n"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; }; + CALIB = derive2 { name="CALIB"; version="1.44.0"; sha256="1n6nlw0da0cyd8ca04gmg3wwpc0sqy0fbxclbxcjhn86rlwyxmg5"; depends=[limma]; }; + CAMERA = derive2 { name="CAMERA"; version="1.34.0"; sha256="1ibs7s611kdh82hyp5fbkp1mlk0c2nksbkys0h3prsg0lkss2jvi"; depends=[Biobase graph Hmisc igraph RBGL xcms]; }; + CATALYST = derive2 { name="CATALYST"; version="1.2.0"; sha256="1q31zzi15q2z46wsk3p4fvq8imxjkyywi849h5jyrvnxhca28mbz"; depends=[drc flowCore ggplot2 gridExtra matrixStats plotly RColorBrewer reshape2]; }; + CAnD = derive2 { name="CAnD"; version="1.10.0"; sha256="17nzlplz9d8dhzm546bznwmz20p7lxnsvq35qd09a3rdcf1abz77"; depends=[ggplot2 reshape]; }; + CCPROMISE = derive2 { name="CCPROMISE"; version="1.4.0"; sha256="0r0aardhmz76zd5lj1qzwyva8la0jv9wczfmak3r0pp2axaw13yr"; depends=[Biobase CCP GSEABase PROMISE]; }; + CEMiTool = derive2 { name="CEMiTool"; version="1.0.3"; sha256="07ighg7y1rpx00xylg1yhd03fvs2yi215rfyii8ckzwf8l9829l4"; depends=[clusterProfiler data_table DT fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gRbase gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; }; + CFAssay = derive2 { name="CFAssay"; version="1.12.0"; sha256="01yakrkpbs43013936rh8qd4giiz7y7cp9jrdx9i4p6h5h8jzj28"; depends=[]; }; + CGEN = derive2 { name="CGEN"; version="3.14.0"; sha256="14s1j2h5cb2gfgn73yvb933ng63cr9i8lx8hisd0g8lcfi2b5rxw"; depends=[mvtnorm survival]; }; + CGHbase = derive2 { name="CGHbase"; version="1.38.0"; sha256="0fynvcsjdbgp69i0nxrc8ni58rhb1kx9k5r3nb91n9i8s43gjqlm"; depends=[Biobase marray]; }; + CGHcall = derive2 { name="CGHcall"; version="2.40.0"; sha256="11pi6awz3858yb4s0z3qf3kcmsdgp6d4aj41g4lfix1sv5amllch"; depends=[Biobase CGHbase DNAcopy impute snowfall]; }; + CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.32.0"; sha256="1br3yly4f32yqqnamscnbkz60bpyphj59igw4jnc8zj6ax0rfz4c"; depends=[Biobase CGHbase CGHcall]; }; + CGHregions = derive2 { name="CGHregions"; version="1.36.0"; sha256="01c4knp9i0k899h34fa7xzd2agil2pis5h2cnnx017zfcfbjf9sq"; depends=[Biobase CGHbase]; }; + CHRONOS = derive2 { name="CHRONOS"; version="1.6.0"; sha256="0az45ygm4xjkfjz1s4wyq4xqy9ymaf70rhayvavjz4fcnq03z4fz"; depends=[biomaRt circlize doParallel foreach graph openxlsx RBGL RCurl XML]; }; + CINdex = derive2 { name="CINdex"; version="1.6.0"; sha256="0lr0fqqm6fakavjx0pw3hhyxxdxgc6ncxp9qjw9macinmkgw5r96"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; }; + CMA = derive2 { name="CMA"; version="1.36.0"; sha256="0l5ikjvfdpy054xsb21z2dz3mjsr3ni639dz2205kpp5l7nwlckd"; depends=[Biobase]; }; + CNAnorm = derive2 { name="CNAnorm"; version="1.24.0"; sha256="13d34cpg5x9nyl2vb2302p8v0x8mcx81qj4v0az242zchn679rbs"; depends=[DNAcopy]; }; + CNEr = derive2 { name="CNEr"; version="1.14.0"; sha256="1yf0zpy5qp1vfrjkkld1zp4xiy1jj7rk0b65cbpmhxk6la50wlbc"; depends=[annotate BiocGenerics Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 GO_db IRanges KEGGREST poweRlaw R_utils readr reshape2 RSQLite rtracklayer S4Vectors XVector]; }; + CNORdt = derive2 { name="CNORdt"; version="1.20.0"; sha256="0jrfv8jis5sd4x5zqmk0p5vcb23b42q128b7p35yyb59gjnnm5dz"; depends=[abind CellNOptR]; }; + CNORfeeder = derive2 { name="CNORfeeder"; version="1.18.0"; sha256="09h2f9asrpw6yrzpa7cq81bl3viz9nl9s0nfdm2af7bvlrwpyf79"; depends=[CellNOptR graph]; }; + CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.20.0"; sha256="171i49bhfq8vy826m9kpg8pvpgs66al71yd5ydpmv14zkkjz3fnp"; depends=[CellNOptR nloptr]; }; + CNORode = derive2 { name="CNORode"; version="1.20.0"; sha256="1w6xwggfm0sh90n6qb4gdx4ljpav8ax20r667vk3ysq8vyd7fgqy"; depends=[CellNOptR genalg]; }; + CNPBayes = derive2 { name="CNPBayes"; version="1.8.0"; sha256="11083vhq1fgqzav5xlcada0ryyqyhgcxxr7c3ijwi6z7xrldx2fm"; depends=[BiocGenerics coda combinat dplyr GenomeInfoDb GenomicRanges ggplot2 gtools IRanges magrittr matrixStats mclust purrr RColorBrewer Rcpp reshape2 S4Vectors SummarizedExperiment tibble tidyr]; }; + CNTools = derive2 { name="CNTools"; version="1.34.0"; sha256="0nxdx3h5s0fgr4m4i1lizdcgxb7wjddzwxj28m5l67vm919734ka"; depends=[genefilter]; }; + CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.8.0"; sha256="087m2r7fcw6z7ybbsnzxycsj289c2q6lq1d7zam1ilqhw1bi4rxi"; depends=[exomeCopy foreach GenomicRanges ggplot2 IRanges NOISeq openxlsx plyr Rsamtools S4Vectors]; }; + CNVrd2 = derive2 { name="CNVrd2"; version="1.16.0"; sha256="1rqjms7k3630kabbc6ish88308lqlrlbzkjflr5apcilc6rfyrx1"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; }; + CNVtools = derive2 { name="CNVtools"; version="1.72.0"; sha256="0ihmgg5f0p7yhg0273jb785fcrhcw704vz8r6ban8c63wk0qbqb5"; depends=[survival]; }; + CODEX = derive2 { name="CODEX"; version="1.10.0"; sha256="1knfgii0n8grn4436aksk7f2xkk93ih2snvrp7p8pkr206kqadnq"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; }; + COHCAP = derive2 { name="COHCAP"; version="1.24.0"; sha256="1ggxn35hif4x4k1rbnxinf0pdqbg1n53wym9rm5zs6cnya4aimgj"; depends=[COHCAPanno gplots RColorBrewer WriteXLS]; }; + COMPASS = derive2 { name="COMPASS"; version="1.16.0"; sha256="1x1vcn37nr4mcx5q8zahyg654gbx0srxckxvz6shvprpdvgs83sn"; depends=[abind clue data_table dplyr knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang scales tidyr]; }; + CONFESS = derive2 { name="CONFESS"; version="1.6.0"; sha256="0kmvhwyzxz9ahvvzicigxal3r4ya8y5i090m7pi7d1p5arir7djl"; depends=[changepoint cluster contrast data_table 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.44.0"; sha256="10bjv02x2xzanajfbsvbxd7s2s07z0gydx1ypmbfym41jjwac9ra"; depends=[e1071]; }; + COSNet = derive2 { name="COSNet"; version="1.12.0"; sha256="0x5kg4c5ml7ndqq81k5jy07fyra4q6nhhly6v7qd98gpmvrj6gnk"; depends=[]; }; + CRISPRseek = derive2 { name="CRISPRseek"; version="1.18.0"; sha256="0qvswjday1mjfa7009kgak09crgi6y7l1irc5hys4b8zmrnxzyc0"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table hash IRanges S4Vectors seqinr]; }; + CRImage = derive2 { name="CRImage"; version="1.26.0"; sha256="1y1xs3agswi4da6mcra3pvssasd4cvhdr2sv664as0dg9m7r43a8"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; }; + CSAR = derive2 { name="CSAR"; version="1.30.0"; sha256="1915ns969hs46rh85y2krdqgrc81yxhxfv6h8narcni805rgj8n5"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + CSSP = derive2 { name="CSSP"; version="1.16.0"; sha256="0xxsck347hvml9ppl9vkvh0f40mkfskwbasz93x5jqvkf046jxda"; depends=[]; }; + CVE = derive2 { name="CVE"; version="1.4.0"; sha256="0h8xcbnaamz479rax8c8ni7xnqsi43nvkshqhmlynfg60m8yl6cp"; depends=[ape ConsensusClusterPlus ggplot2 gplots jsonlite plyr RColorBrewer shiny WGCNA]; }; + CancerInSilico = derive2 { name="CancerInSilico"; version="1.4.0"; sha256="19pp282x994ykxczyvls8x71dfwzra21myxky4w2clhgabhqrw9h"; depends=[BH Rcpp testthat]; }; + CancerMutationAnalysis = derive2 { name="CancerMutationAnalysis"; version="1.20.0"; sha256="16csf668vxrngc5him5hbkj1bbzhi378sxwlfvh2dia2zipazg0w"; depends=[AnnotationDbi limma qvalue]; }; + CancerSubtypes = derive2 { name="CancerSubtypes"; version="1.4.0"; sha256="0n3la51s0pk3nmbdpv4z0y633qydajby3fy6nxwhpdkkxmlirrgc"; depends=[cluster ConsensusClusterPlus iCluster impute limma NMF sigclust SNFtool survival]; }; + Cardinal = derive2 { name="Cardinal"; version="1.10.0"; sha256="1yda7zzrmgyz58cg2myp6diwn39w353s4jkmp4d3yhvww2m9kyim"; depends=[Biobase BiocGenerics irlba lattice matter ProtGenerics signal sp]; }; + Category = derive2 { name="Category"; version="2.44.0"; sha256="0mkav04vbla0xfa0dssxdd0rjs589sxi83xklf5iq5hj3dm8y0i8"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI genefilter graph GSEABase Matrix RBGL]; }; + CausalR = derive2 { name="CausalR"; version="1.10.0"; sha256="0fj6ndrg78r6ss7ngmpja9dg482namrxxg6vdjdn4agiznk6jn92"; depends=[igraph]; }; + CellMapper = derive2 { name="CellMapper"; version="1.4.0"; sha256="16pa802b7lg398p8r4ijbiimzhg86fpyq54k13l7pmc4qp26405b"; depends=[S4Vectors]; }; + CellNOptR = derive2 { name="CellNOptR"; version="1.24.1"; sha256="0p6gksg6h5mbja0mfkh755cvhv7bzkwbg4dy0y34aighz945vy3a"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; }; + CexoR = derive2 { name="CexoR"; version="1.16.0"; sha256="1n3j5l3dlpigd0ihls8s3kwipajj0d9cp0v592f54v75q49fbsz6"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; }; + ChAMP = derive2 { name="ChAMP"; version="2.9.10"; sha256="1c8sadqkx6cxd1hgms340m2jl3pxmkxk59yfbp69rqbrbjlx2zjy"; depends=[bumphunter ChAMPdata combinat dendextend DMRcate DNAcopy doParallel FEM GenomicRanges goseq Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest illuminaio impute isva limma marray matrixStats minfi missMethyl plotly plyr preprocessCore prettydoc quadprog qvalue RColorBrewer rmarkdown RPMM shiny shinythemes sva wateRmelon]; }; + ChIPComp = derive2 { name="ChIPComp"; version="1.8.0"; sha256="1nj3903nhii76v6jrm7bfw8kngbq525zikb3nwhvmp4905c77z40"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; }; + ChIPQC = derive2 { name="ChIPQC"; version="1.14.0"; sha256="1nnmgzad7kzydrmz374f9xvf8s13q6vhanz93v6d9jqh6jnd5di0"; 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_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; }; + ChIPXpress = derive2 { name="ChIPXpress"; version="1.22.0"; sha256="0wcs7gw0kgvbk1f4i8j9cr8kwv1lj45zv9q069cify78rdb106rb"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; }; + ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.0.0"; sha256="02w4k41wx9cqfk0zjzcv8vdfgwv9rswijmdrsbmcpbrmbwn2jlxi"; depends=[Biostrings BSgenome GenomicRanges IRanges RcppRoll S4Vectors]; }; + ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.3.2"; sha256="0hh7ppc4fsil7vczng897dkzz2a1x0s2j2qvw1v2g8hm82mv070k"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; }; + ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.12.7"; sha256="1zab489d7a6bh6ylc68x6yn47gdkmr7p3677grx9l2qafrryjr04"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI DelayedArray 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.14.2"; sha256="1db2k7j0rr9q8jlfxlji62zyhzfh7yhsacyg1dj5sgwbhhn0xliy"; 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.32.0"; sha256="0igqlfr5grhkr7dsdyg3c31d3r1wpn413vxmzlckiimfwdi35rqv"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; }; + ChIPsim = derive2 { name="ChIPsim"; version="1.32.0"; sha256="01kmhzyvnp03v9xydm9xrrkdmlf5dpsnzzcf13i9r03x3m44r4ga"; depends=[Biostrings IRanges ShortRead XVector]; }; + ChemmineOB = derive2 { name="ChemmineOB"; version="1.16.2"; sha256="0zrg6f5cg54f1bpwjhx2h97w267jr2gyncgfyjs7njkjwwrl9ads"; depends=[BH BiocGenerics Rcpp zlibbioc]; }; + ChemmineR = derive2 { name="ChemmineR"; version="2.30.2"; sha256="1n83s6bl5lcqgrs30g307vji3ras39pagwgfwcaknhdhwv5wx9d4"; depends=[BH BiocGenerics DBI digest ggplot2 gridExtra Rcpp RCurl rjson]; }; + Chicago = derive2 { name="Chicago"; version="1.6.0"; sha256="1s2qrz7qbdn3nbkjqyyrmh04kbdrknc7w5cdasg5sch8znnvq6gw"; depends=[data_table Delaporte Hmisc MASS matrixStats]; }; + ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.32.0"; sha256="0kshy9ri174ksgdnifmf57mjkyjczcx98x98idjmjcxlwrzx4xjr"; depends=[annotate AnnotationDbi Biobase BiocGenerics GenomicRanges IRanges rtracklayer]; }; + ClassifyR = derive2 { name="ClassifyR"; version="1.12.2"; sha256="1ybcsvh45i4dgx0b7z1wxxh51ydfkx5bh75343f1dpwl1igp8cjw"; depends=[Biobase BiocParallel locfit ROCR]; }; + Clomial = derive2 { name="Clomial"; version="1.14.0"; sha256="1hd135pcs5sngg1dw93b3f1qnrbl3d1ynyk0wbaal9wzys7fzmcq"; depends=[matrixStats permute]; }; + Clonality = derive2 { name="Clonality"; version="1.26.0"; sha256="1l19zpnnrx1xz5dc2mvyljlllhlk0gjld8lk675g8iqhm3i8z861"; depends=[DNAcopy]; }; + ClusterJudge = derive2 { name="ClusterJudge"; version="1.0.0"; sha256="0iff5dsvl92gfidgly0gyv4ivb97j45rmmc5rlllij1z1p0mjrhq"; depends=[httr infotheo jsonlite lattice latticeExtra]; }; + ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.6.0"; sha256="19wjjzv2f6lkkl0vyyx9jw4y6dqvl5qz7ppk85j3k3r9yhjlpnv1"; depends=[pracma princurve RColorBrewer scatterplot3d]; }; + CoCiteStats = derive2 { name="CoCiteStats"; version="1.50.0"; sha256="0k8nf7yzbwyyxxgcn4qa7f254vngkabbaxs40ijyyzhwldwdqcjn"; depends=[AnnotationDbi org_Hs_eg_db]; }; + CoGAPS = derive2 { name="CoGAPS"; version="2.12.0"; sha256="1yhxk94r9l0yz03n3d6gd78daazgbgy84f2840al04b74mr89bx8"; depends=[BH cluster doParallel foreach ggplot2 gplots RColorBrewer Rcpp RcppArmadillo reshape2 shiny]; }; + CoRegNet = derive2 { name="CoRegNet"; version="1.16.0"; sha256="1d702vgki4wqx355y5v83ajga3j477l2bgvb0lbpkxjaxi57zm80"; depends=[arules igraph shiny]; }; + CompGO = derive2 { name="CompGO"; version="1.14.0"; sha256="0acjn3w7axq4674p2jsc71hga32svd2fc3xn2mrs85i9bcckwmv5"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; }; + ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.17.1"; sha256="1x6kp55iqqsd8bhdl3qch95nfiy2y46ldbbsx1sj1v8f0b0ywwcy"; depends=[circlize colorspace GetoptLong GlobalOptions RColorBrewer]; }; + ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.42.0"; sha256="1pjw7r4x9867zjvdva58jsgask94ydqzrwzn3z6li47bin5ic0m1"; depends=[ALL Biobase cluster]; }; + CopywriteR = derive2 { name="CopywriteR"; version="2.10.0"; sha256="17fy2lc5yf3nh6v077kv87h53n263hqz2540lzrl0vjiqrl2plca"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; }; + CorMut = derive2 { name="CorMut"; version="1.20.0"; sha256="0dy02halbp57vmfbjgjhkgc6icxrvy9nxpb92arrgl6ly8bflcwx"; depends=[igraph seqinr]; }; + Cormotif = derive2 { name="Cormotif"; version="1.24.0"; sha256="1inxd86lndp2jmdzvjj222697safcppr0gzhcfrcj4bygl36ma6v"; depends=[affy limma]; }; + CountClust = derive2 { name="CountClust"; version="1.4.1"; sha256="08097iyxx2qm675bnqm8c4hq6rwyqsdfzxkf46mllpyf2mk3wwwf"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam SQUAREM]; }; + CoverageView = derive2 { name="CoverageView"; version="1.16.0"; sha256="1091mxiclb3zhr48bdj7z8gi3v69l4w25cfpfbxhhp70rffn9xfr"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; + CrispRVariants = derive2 { name="CrispRVariants"; version="1.6.0"; sha256="15za6ysnnjfwmiq2dhbpr3kww6c2jvc2y1mf8rfpqx56bd1dh3cb"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; }; + CytoML = derive2 { name="CytoML"; version="1.4.1"; sha256="1jj79adwrzwx012xvw3czv0m94jc3j2ibpijdfbz8fpjhynrzwqb"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace ggcyto graph jsonlite ncdfFlow openCyto plyr RBGL Rgraphviz XML]; }; + DAPAR = derive2 { name="DAPAR"; version="1.10.4"; sha256="15ghdx2yccsk98bmynljiwdfkjjfqafq62wc87zsgydql59c10kh"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr foreach ggplot2 gplots graph highcharter imp4p impute imputeLCMD knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes tidyr tmvtnorm vioplot]; }; + DART = derive2 { name="DART"; version="1.26.0"; sha256="15hqsdi7pa1qn5c5af2izhf609c7lmb0zsv2qwyc9xbf7dn42qmf"; depends=[igraph]; }; + DASC = derive2 { name="DASC"; version="0.99.11"; sha256="1wm43kgvq3wkwp8hmz70m9c7yxxjsanpqxvcm6x63bna02ysb90y"; depends=[Biobase cvxclustr NMF]; }; + DBChIP = derive2 { name="DBChIP"; version="1.22.0"; sha256="07psmmvcdl4r5m71kccd9rd3vk521ilhwmcll37pfrmb16s1856x"; depends=[DESeq edgeR]; }; + DChIPRep = derive2 { name="DChIPRep"; version="1.8.0"; sha256="1ii7mdppqk3gg3ly9x35d0ij2grmi7678dli4xfd2mzkzyc5b6wm"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; }; + DECIPHER = derive2 { name="DECIPHER"; version="2.6.0"; sha256="1rc9vipclkiib71684dl0qrd6yll672xxbig22x8v99hscdd3d8y"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; }; + DEDS = derive2 { name="DEDS"; version="1.52.0"; sha256="18gpj5xk5byiqv548s0vcvp8l5f0k49k8z9iq5qsn53jhh53f26s"; depends=[]; }; + DEFormats = derive2 { name="DEFormats"; version="1.6.1"; sha256="1wix5n76438896sz62cgsrzjjx4cw7mhxgvsq43w2vpsp3gdrp59"; depends=[checkmate data_table DESeq2 edgeR GenomicRanges SummarizedExperiment]; }; + DEGraph = derive2 { name="DEGraph"; version="1.30.0"; sha256="083w1vrp0s3xkiz1qm3d03fi1dm69gspq7pqadqwrc3qypjkp3hi"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; }; + DEGreport = derive2 { name="DEGreport"; version="1.14.1"; sha256="0mbqmkgp9l7ygrh6dsf77mf9fqrql7i4wpw5rg87l6p2misz6662"; depends=[Biobase BiocGenerics cluster ComplexHeatmap ConsensusClusterPlus cowplot DESeq2 dplyr edgeR ggplot2 ggrepel knitr logging magrittr Nozzle_R1 psych quantreg reshape rlang S4Vectors scales SummarizedExperiment tibble tidyr]; }; + DEGseq = derive2 { name="DEGseq"; version="1.32.0"; sha256="0dh1ig8nj3mf0f8masf48imkkadma0dywbraydcy3cw9vdnc5c7j"; depends=[qvalue samr]; }; + DEP = derive2 { name="DEP"; version="1.0.1"; sha256="0glkq6xlhcsr364zl4nkc7g3gnscv0yb3kcyvhzgm3bbfvd9q7ac"; depends=[assertthat Biobase broom circlize ComplexHeatmap dplyr DT fdrtool ggplot2 ggrepel gridExtra imputeLCMD limma MSnbase purrr RColorBrewer readr rmarkdown shiny shinydashboard SummarizedExperiment tibble tidyr vsn]; }; + DESeq = derive2 { name="DESeq"; version="1.30.0"; sha256="0mn5w3cy16iwwk8zxs7za6aa6cnrca75z0g45zd5zh1py5d7nfv9"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; }; + DESeq2 = derive2 { name="DESeq2"; version="1.18.1"; sha256="1iyimg1s0x5pdmvl8x08s8h0v019y0nhjzs50chagbpk2x91fsmv"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; }; + DEXSeq = derive2 { name="DEXSeq"; version="1.24.3"; sha256="0xip73hlbr3zry9d7ly9vvvsbb3xjcmfa09lr9fdy528dwjrf084"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; }; + DEsubs = derive2 { name="DEsubs"; version="1.4.0"; sha256="1i9blymzj18r9646vac9grrjxw6xar8m6chn1dgdila17jag1wlp"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL samr]; }; + DFP = derive2 { name="DFP"; version="1.36.0"; sha256="117gmzcgr9wr9wb7g0rm7wlrakd76ys1frhmhx1k6ps97ibxlz1k"; depends=[Biobase]; }; + DMCHMM = derive2 { name="DMCHMM"; version="1.0.0"; sha256="1y0wmxks51h0d21v8g4mryq7kzq49khhpa88fbhza9xp2bmwk358"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; }; + DMRScan = derive2 { name="DMRScan"; version="1.4.6"; sha256="10b9qlr0la3ilrw44vcq4y8pg7284adrh506wbx7f9ipgka8qx4y"; depends=[GenomicRanges IRanges MASS Matrix mvtnorm RcppRoll]; }; + DMRcaller = derive2 { name="DMRcaller"; version="1.10.0"; sha256="0z5rzzbnlw3m1yp8d5y2y4rplz73q06kh5gkf57rmpg1pzkfbvca"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; }; + DMRcate = derive2 { name="DMRcate"; version="1.14.0"; sha256="1kzb6lai3969v8sjwwzrzm9x2adngh5ij2jf0ig073aab3cfibh6"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors]; }; + DMRforPairs = derive2 { name="DMRforPairs"; version="1.14.0"; sha256="1q489w68q4mxg7f8h36f7gmwbldc2fq3a69k6b25d3wg7583v4ax"; depends=[GenomicRanges Gviz R2HTML]; }; + DNABarcodes = derive2 { name="DNABarcodes"; version="1.8.0"; sha256="0x3pwln8v57w045kxr6hq778hpy5f21gfq5m6wj41rq9awvx5s2p"; depends=[BH Matrix Rcpp]; }; + DNAcopy = derive2 { name="DNAcopy"; version="1.52.0"; sha256="127il5rlg1hzjlhwhs64x3nm18p00q1pd9ckb2b9ifl0rax95wai"; depends=[]; }; + DNAshapeR = derive2 { name="DNAshapeR"; version="1.6.0"; sha256="1p44bi5pysrc4pw63zrhxy5q4yqh81kncnp585cjlcbbbyqwz8sv"; depends=[Biostrings fields GenomicRanges Rcpp]; }; + DOQTL = derive2 { name="DOQTL"; version="1.14.0"; sha256="0hpvh84la7i9m5l9c1hrhmr62f031dyv7nq6aai58bd0lqh9izp5"; 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.4.0"; sha256="10dw82car6vi13lic2dghm1gw3a8d2s6nrdhh69fhb7gj6lhr5ds"; depends=[AnnotationDbi BiocParallel DO_db fgsea ggplot2 GOSemSim igraph qvalue reshape2 rvcheck S4Vectors scales]; }; + DRIMSeq = derive2 { name="DRIMSeq"; version="1.6.0"; sha256="17z8flsb5ngnkcd1g1fj3m0yms71w6q45abc30wwvcnxrg1m9scn"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges limma MASS reshape2 S4Vectors]; }; + DSS = derive2 { name="DSS"; version="2.26.0"; sha256="0an0nr64f46s9smli0lpj6z62b25dd6xmyk92ndx9kp38vldmv0z"; depends=[Biobase bsseq DelayedArray]; }; + DTA = derive2 { name="DTA"; version="2.24.0"; sha256="0729w0zkcnwk3rcf4ziz5xw4fsv4dq9p9ri8yizxsxiara4lnhlw"; depends=[LSD scatterplot3d]; }; + DaMiRseq = derive2 { name="DaMiRseq"; version="1.2.0"; sha256="0m16yh2cfqb5ysdir4b5c3v73204ac5fa0lyvi6x1djkm6nj04hh"; depends=[caret corrplot DESeq2 e1071 EDASeq FactoMineR FSelector ggplot2 Hmisc kknn limma lubridate MASS pheatmap plsVarSel randomForest RColorBrewer reshape2 SummarizedExperiment sva]; }; + DeMAND = derive2 { name="DeMAND"; version="1.8.0"; sha256="1gf5c3m0jwgipz1wl8viq781kfj0nmpa29cjad9qgrkpihfagh03"; depends=[KernSmooth]; }; + DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.20.0"; sha256="1877jcl6l2chfa6djv227hf2bqcb4w7frnhmrlh6rzqssq5zrx43"; depends=[ggplot2 limSolve pcaMethods]; }; + DeepBlueR = derive2 { name="DeepBlueR"; version="1.4.1"; sha256="13qg2nmmhicl1n4ry38syz6ah6mvq2vw6c53id7piyyk0xj3rhrc"; depends=[data_table diffr dplyr filehash foreach GenomeInfoDb GenomicRanges R_utils RCurl rjson rtracklayer settings stringr withr XML]; }; + DelayedArray = derive2 { name="DelayedArray"; version="0.4.1"; sha256="0s7h2giyvz04cg6248kbbzpwhxdrpnsvl2s8k5c8ricisd9aaz4b"; depends=[BiocGenerics IRanges matrixStats S4Vectors]; }; + DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.0.3"; sha256="1cxjbjdq9hg9cm95rci0al7a4pk2h73ym276ahw9q4977zbg6381"; depends=[DelayedArray IRanges Matrix matrixStats S4Vectors]; }; + DiffBind = derive2 { name="DiffBind"; version="2.6.6"; sha256="1sm5h6nq77hjfis6kr1nqyizcxgfz87dgpqc4fxlfqkmsd9n3vkp"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges ggplot2 ggrepel gplots IRanges lattice limma locfit RColorBrewer Rcpp Rsamtools S4Vectors SummarizedExperiment systemPipeR zlibbioc]; }; + DiffLogo = derive2 { name="DiffLogo"; version="2.2.0"; sha256="0nc07vn9ldhnv9wm5i9b7axkvsi7v5gcf8saa6zlkr7mf5lsinhg"; depends=[cba]; }; + Director = derive2 { name="Director"; version="1.4.0"; sha256="1yq4amwflg168fgdr91lh4c8y3azw2fdsbp2b0j6mnhcjqgmaxk8"; depends=[htmltools]; }; + DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.20.0"; sha256="1c4s6x0qm20556grcd1xys9kkpnlzpasaai474malwcg6qvgi4x1"; depends=[BiocGenerics IRanges S4Vectors]; }; + Doscheda = derive2 { name="Doscheda"; version="1.0.0"; sha256="04dzr26lvhcd9h6b5s61csygrc1357b8d6zxbn955s6crbr5p2ns"; depends=[affy calibrate corrgram d3heatmap drc DT ggplot2 gridExtra httr jsonlite limma matrixStats prodlim readxl reshape2 shiny shinydashboard stringr vsn]; }; + DriverNet = derive2 { name="DriverNet"; version="1.18.0"; sha256="068ps1ril55fhfbxlzchrjyx75xvqqh8ny7gp99k6hcmksjnbbsb"; depends=[]; }; + DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.20.1"; sha256="0bw9bwwacp9mznldl61r5znsy34yb1zkil6fd9ilxp8wmxicphjk"; 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.16.0"; sha256="1fxcs2vljp2rh9qp2xmqp8ri6v41gzdy51jhhv33rxfgh9jz70g5"; depends=[R_utils RCurl]; }; + DynDoc = derive2 { name="DynDoc"; version="1.56.0"; sha256="1zc43f2v7qh44slc0za71jb0a5fsqp55y5fbnb9fnd6139im5vxc"; depends=[]; }; + EBImage = derive2 { name="EBImage"; version="4.20.1"; sha256="0xwq9jd9sn5h3al7k03byr4diyrmk4jx344spdcaw58a830w9q7j"; depends=[abind BiocGenerics fftwtools htmltools htmlwidgets jpeg locfit png RCurl tiff]; }; + EBSEA = derive2 { name="EBSEA"; version="1.6.0"; sha256="13qgmcwv4b06zgaalqf9sq0wkkhnf38h98fw2dqql8z9w3n5sbnz"; depends=[edgeR gtools limma]; }; + EBSeq = derive2 { name="EBSeq"; version="1.18.0"; sha256="0pr7xaf64wn3ry358raqd7vpp7p3zq88qp9jkx6xf9f83bmyx7mw"; depends=[blockmodeling gplots testthat]; }; + EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.12.0"; sha256="1bg4y0jqf034p400j30yskb0fhxk9mlnbrmdcr29r2212xra4g7b"; depends=[EBSeq]; }; + EBarrays = derive2 { name="EBarrays"; version="2.42.0"; sha256="0hd297adyp3fkppmzncdcn0y7kvgixkp460816vsrzphs4v2fi1m"; depends=[Biobase cluster lattice]; }; + EBcoexpress = derive2 { name="EBcoexpress"; version="1.22.0"; sha256="1k9n95hqhd5rb811vc1idjslv6m5x3s30zv9h545h26cklqqmd76"; depends=[EBarrays mclust minqa]; }; + EDASeq = derive2 { name="EDASeq"; version="2.12.0"; sha256="07zm89zcivyn2261aq9grqmly8ji482kr9h9dyfknfdfrpv7jpwv"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; }; + EDDA = derive2 { name="EDDA"; version="1.16.0"; sha256="000kp07khndncb9d4gql8gkjwrv3r08qf118g51zcmfrpzn26a30"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; }; + EGAD = derive2 { name="EGAD"; version="1.6.0"; sha256="0dxbw39dymwxd6hvnx9c1y97z6d2br55c0md1l72wajf5qa8nvfc"; depends=[affy arrayQualityMetrics Biobase GEOquery gplots igraph impute limma MASS Matrix plyr RColorBrewer RCurl zoo]; }; + EGSEA = derive2 { name="EGSEA"; version="1.6.1"; sha256="1srjms8xa9qnnm6mzlgmdqk0zd4485k6d20ygzqqi0jj86xa6ava"; depends=[AnnotationDbi Biobase DT edgeR EGSEAdata gage ggplot2 Glimma globaltest gplots GSVA HTMLUtils htmlwidgets hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview plotly RColorBrewer safe stringi topGO]; }; + ELBOW = derive2 { name="ELBOW"; version="1.14.0"; sha256="0hw7sb20id7zxdashrsxxhcw96z0m3yp12gizq4x5gw53iipw73w"; depends=[]; }; + ELMER = derive2 { name="ELMER"; version="2.2.7"; sha256="0qdl79x7g1pd8z16s3zja2hvmf9bmr6520gh7ghavdh6qaxqji0h"; depends=[biomaRt circlize ComplexHeatmap doParallel downloader dplyr ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel gridExtra Gviz IRanges lattice magrittr Matrix MultiAssayExperiment plotly plyr readr reshape rvest S4Vectors SummarizedExperiment TCGAbiolinks xml2]; }; + EMDomics = derive2 { name="EMDomics"; version="2.8.0"; sha256="09lkg7c1sl5jmg8z1yfaqw5hy3jcpb0wyh0l9sc14hbsncvq1nmh"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; }; + ENCODExplorer = derive2 { name="ENCODExplorer"; version="2.4.0"; sha256="0mw3pgbpk1q0jgzcb3pk2kgdw9igh1zm4bywzfzg7k1k1xjzk3yy"; depends=[data_table dplyr DT jsonlite RCurl shiny shinythemes stringi stringr tidyr]; }; + ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.26.0"; sha256="0vc9d17m5bdjj4wqcl5lr99bv89yzs75m94rfckjjzvx7j6cmqcx"; depends=[rJava XML]; }; + ENmix = derive2 { name="ENmix"; version="1.14.0"; sha256="117jp47hpm276x4q25jwqfagymvay0qk3ji5l9xvrj74piwqpgwh"; depends=[doParallel foreach geneplotter impute MASS minfi preprocessCore SummarizedExperiment sva wateRmelon]; }; + EasyqpcR = derive2 { name="EasyqpcR"; version="1.20.0"; sha256="06lmq3pp0j86rv9bgs809r30qscgpxv5vjbkccf32q9wv82vd7hw"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; }; + EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.6.0"; sha256="1wv1anm4bwm2kqi9lqn06bl1w17q6wvc1v2amrifbqjbmi5k7g8y"; depends=[]; }; + EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.9.2"; sha256="0ffyb40qcvpjqval78146w8wvk3ng7v1ipdwnqkzj705gqkwbw9y"; depends=[ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; }; + EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.8.6"; sha256="1vxnl0n34ygl4fx28s8zmp71b8hidlp4sn34k1cfkw7hiaf2gg9n"; depends=[AnnotationDbi BiocFileCache biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview rappdirs ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; }; + EpiDISH = derive2 { name="EpiDISH"; version="1.0.0"; sha256="065bvrfsssf5y4j9axqdcybqb5i8y2hnl09f9jr44bpbay34ay5f"; depends=[e1071 MASS quadprog]; }; + EventPointer = derive2 { name="EventPointer"; version="1.2.0"; sha256="1yh6yhaf8c2rp8f4ipsk014552pplb28cl5z7wjwvarjb21waj05"; depends=[affxparser doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges graph igraph limma MASS Matrix matrixStats nnls prodlim RBGL S4Vectors SGSeq stringr SummarizedExperiment]; }; + ExiMiR = derive2 { name="ExiMiR"; version="2.20.0"; sha256="0saxway680972dmn6q1gbbmkxcwv08hl2bq973qbyrv5drg6g4vv"; depends=[affy affyio Biobase limma preprocessCore]; }; + ExperimentHub = derive2 { name="ExperimentHub"; version="1.4.0"; sha256="1hgg3x6r4ldlqjv8by6vv5n5f8h647y3lvxwrmi79c6dvrghp0j3"; depends=[AnnotationHub BiocGenerics BiocInstaller curl S4Vectors]; }; + ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.4.0"; sha256="07nd9n09naq8p276fbnad3wp95y11n5ws65xncf66i7356a3rkw4"; depends=[AnnotationHubData BiocCheck BiocGenerics BiocInstaller curl DBI ExperimentHub httr S4Vectors]; }; + ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.6.0"; sha256="099xkp39mbdg1xm6mydnpwrkbyn3y719xf1s4xyva0nkwx1g14b8"; depends=[Biobase httr limma S4Vectors SummarizedExperiment XML xml2]; }; + ExpressionView = derive2 { name="ExpressionView"; version="1.30.0"; sha256="1kjp8ndbx5bhk941ba6nza42h8zi97xwam2q0pf8pk168sch41kr"; depends=[AnnotationDbi bitops caTools eisa GO_db isa2 KEGG_db]; }; + FEM = derive2 { name="FEM"; version="3.6.0"; sha256="0bs7p9lqp6bi7c9j8vi4gbj8md14cqc9vxxkfb0bc35mr5641q4d"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; }; + FGNet = derive2 { name="FGNet"; version="3.12.0"; sha256="1f33k7dx7f97kzjpq1jvs614vjsyg3yd03s2y7xxwhydmx02n7vs"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; }; + FISHalyseR = derive2 { name="FISHalyseR"; version="1.12.0"; sha256="07q5paypybw8qq17wyl7qqlrdy5kfg2k24rj2ic4gjgb6qiic38b"; depends=[abind EBImage]; }; + FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.14.0"; sha256="1nyw8h4kjddn75878adhlilwjnm4wlyhksyp2ygx6cm35fbqa2v3"; depends=[fda MASS]; }; + FamAgg = derive2 { name="FamAgg"; version="1.6.1"; sha256="02fy27g8vi9byhnfav0121291jbwiypnj1r9i56hbgwwzplqbr5z"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; }; + FindMyFriends = derive2 { name="FindMyFriends"; version="1.8.0"; sha256="13f6hdjn4l5xfrdskq2abpzczxcm8sy71fqpfj6hsxzj06fz9a36"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; }; + FitHiC = derive2 { name="FitHiC"; version="1.4.0"; sha256="12ylhrppi051m7nqsgq95kzd9g9wmp34i0zzfi55cjqawlpx7c6n"; depends=[data_table fdrtool Rcpp]; }; + FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.10.0"; sha256="0mgqnmznqpy8ikzg1829bjgxnznm43wkgirhpgfskdxfzr4zqs3a"; depends=[jsonlite RCurl XML]; }; + FlowSOM = derive2 { name="FlowSOM"; version="1.10.0"; sha256="0kgzyngm36wzwgsrf40p00543w4spisph78yp5hl5i4hghh4zkij"; depends=[BiocGenerics ConsensusClusterPlus flowCore flowUtils igraph tsne XML]; }; + FourCSeq = derive2 { name="FourCSeq"; version="1.12.0"; sha256="08fq289m8g7fgmsrph1gq45q6zpfnrzpm0n4qyf2vc5hsdgnm4qh"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; }; + FunChIP = derive2 { name="FunChIP"; version="1.4.0"; sha256="0gx2yjid47p9q7f89823avqj4r367s1ifvh4p2g351gzij63p9ab"; depends=[doParallel fda foreach GenomeInfoDb GenomicAlignments GenomicRanges RColorBrewer Rcpp Rsamtools shiny]; }; + FunciSNP = derive2 { name="FunciSNP"; version="1.22.0"; sha256="1lgvca8npk1092dyl5jhx46ir46b3ab5jgshj5b19dg0bdzi0fj1"; depends=[Biobase BiocGenerics ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; + GA4GHclient = derive2 { name="GA4GHclient"; version="1.2.0"; sha256="1k9rd1q47ac75h3vw54kxi89g8w11bis6cz26xkvhdcim97bxs10"; depends=[BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges httr IRanges jsonlite S4Vectors VariantAnnotation]; }; + GA4GHshiny = derive2 { name="GA4GHshiny"; version="1.0.0"; sha256="1q461l1dy7fsl1y081iyijwizk342q7v5l0irpmx1gnp2kpmvpr2"; depends=[AnnotationDbi BiocGenerics dplyr DT GA4GHclient GenomeInfoDb GenomicFeatures openxlsx purrr S4Vectors shiny shinyjs shinythemes tidyr]; }; + GAprediction = derive2 { name="GAprediction"; version="1.4.0"; sha256="10hknskkfvpzjzcih1h6pl68p9ix9zh98ym1gzw68qjx0mhlm591"; depends=[glmnet Matrix]; }; + GEM = derive2 { name="GEM"; version="1.4.0"; sha256="0r6zgsyfwra3qx1vis7a7mr5aiqyj7rpgs3cqdir2yjlg3y01r1w"; depends=[ggplot2]; }; + GENESIS = derive2 { name="GENESIS"; version="2.8.1"; sha256="0w3xrw6a1fkcp49nyarkp4yykjk79gqq7rzwixdk4363d5pnm7gp"; depends=[Biobase BiocGenerics gdsfmt GenomicRanges graph GWASTools IRanges S4Vectors SeqArray SeqVarTools]; }; + GENIE3 = derive2 { name="GENIE3"; version="1.0.0"; sha256="1lxbkhlvb082nrmlq2b57chi0vpyaqwj56ngbzli8qdmp1gz4qd3"; depends=[reshape2]; }; + GEOmetadb = derive2 { name="GEOmetadb"; version="1.40.0"; sha256="003inwm8qkjdaihlx4009nwj3rgjn3xdk0m8k696qhniq99gcd0a"; depends=[GEOquery RSQLite]; }; + GEOquery = derive2 { name="GEOquery"; version="2.46.15"; sha256="1l5vcksida44zkrqvrp9krqd4yhn6xh24y9jfvkyjvhq4x8fl18z"; depends=[Biobase dplyr httr limma magrittr readr tidyr xml2]; }; + GEOsearch = derive2 { name="GEOsearch"; version="1.1.4"; sha256="0k0vn99rz2821gswb834nn9ib099a152y2828ka7qvhag4shzdy9"; depends=[org_Hs_eg_db org_Mm_eg_db RCurl]; }; + GEOsubmission = derive2 { name="GEOsubmission"; version="1.30.0"; sha256="0sl9m7lk7jczpcfhn50yn322v1s65d9swjidcnzk3ydv47z419p8"; depends=[affy Biobase]; }; + GEWIST = derive2 { name="GEWIST"; version="1.22.0"; sha256="0lfm19s4z5j7zhpzhfa7rqdz09ip05cf2zbnsqv9widdmkcw2wnk"; depends=[car]; }; + GGBase = derive2 { name="GGBase"; version="3.40.0"; sha256="0iavmbfvx5in8pq4c7bx63anlj4l1ra5qmr3pgx7x3cp43d6qsza"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; }; + GGtools = derive2 { name="GGtools"; version="5.14.0"; sha256="0h1lcz363z7gcy3i3ap0vrdrq71wlzr3y0f9866zmn67hlrfbp7i"; 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]; }; + GISPA = derive2 { name="GISPA"; version="1.2.0"; sha256="1kyghhfv0jabc823kxcab267snjnxba7d3swnfssshrxirwbgy3b"; depends=[Biobase changepoint data_table genefilter GSEABase HH lattice latticeExtra plyr scatterplot3d]; }; + GLAD = derive2 { name="GLAD"; version="2.42.0"; sha256="1ay8wrhgwv6jyc54pv8xywdhm3v48qavdm6rq7l0n7fy4kydxz75"; depends=[]; }; + GMRP = derive2 { name="GMRP"; version="1.5.0"; sha256="124jzpd0y8c1fdp6ndh75q0nqbcwjkmmm3w6ih2qinanbc2b5bmp"; depends=[diagram GenomicRanges plotrix]; }; + GOFunction = derive2 { name="GOFunction"; version="1.26.0"; sha256="0ykagd4klrsjbf5iqn87anlplvnvvd3fhklpn1fm4fkx1lvg6jvx"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; }; + GOSemSim = derive2 { name="GOSemSim"; version="2.4.1"; sha256="0if17mizlf1v85nzbzkc3nl8052cmf7a3a04zrphc0rv8ndyl1s7"; depends=[AnnotationDbi GO_db Rcpp]; }; + GOSim = derive2 { name="GOSim"; version="1.16.0"; sha256="1gy95bywv33if5fkhaihx8h64mcvzn7hrid91zib9asfpllbq3j7"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; }; + GOTHiC = derive2 { name="GOTHiC"; version="1.14.0"; sha256="0qn9nlr1yfd91p5wriwnvqmwndfzpy0c18zbnqkv7i2s66mcwkja"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; }; + GOexpress = derive2 { name="GOexpress"; version="1.12.0"; sha256="0yfqw3v1ywwpkvnsjz20mkg9ay35hfs4ldab6gza197jbg61qq88"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer RCurl stringr]; }; + GOpro = derive2 { name="GOpro"; version="1.4.2"; sha256="1djrws9n6znzhzs8lbpclcx227d5fv23mmw181pcnmp9kgf0f4w4"; depends=[AnnotationDbi BH dendextend doParallel foreach GO_db IRanges MultiAssayExperiment org_Hs_eg_db Rcpp S4Vectors]; }; + GOstats = derive2 { name="GOstats"; version="2.44.0"; sha256="04gqfdlx9fxf97qf0l28x4aaqvl10n6v58qiz5fiaw05sbj1pf1i"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL Rgraphviz]; }; + GOsummaries = derive2 { name="GOsummaries"; version="2.12.0"; sha256="1aqzr7llwcq2w5vn7q3yny7x6kllr62cm43qs3d2qm4iyvfb2a4s"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; }; + GRENITS = derive2 { name="GRENITS"; version="1.30.0"; sha256="0bi7vxq3wh9vy4hibpbpk5vzf0skqxs1jg3macscbvwm7ggqs801"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; + GRmetrics = derive2 { name="GRmetrics"; version="1.4.1"; sha256="11ifwb1avizipg2v5safs0i7yr1rrydyg41y76ccc45ygjdy303g"; depends=[drc ggplot2 plotly S4Vectors SummarizedExperiment]; }; + GRridge = derive2 { name="GRridge"; version="1.2.0"; sha256="1s29c9jsh34qswib39v0xp9ir005d9pa5lv92ka3s8a4y5hxfi7a"; depends=[annotate Biobase BiocGenerics graph GSEABase Iso penalized survival]; }; + GSALightning = derive2 { name="GSALightning"; version="1.6.0"; sha256="1n9dc5ahfslh9yvz81ppgjlnpmcm1c84rsmpgzy2hrzkrrnqxlsx"; depends=[data_table Matrix]; }; + GSAR = derive2 { name="GSAR"; version="1.12.0"; sha256="0v6sy4mi3zvgnk0f9diy4zz8vl5n5pdm3yyb6hm6bqy56wx0bl7r"; depends=[igraph]; }; + GSCA = derive2 { name="GSCA"; version="2.8.0"; sha256="1r9kdvrj1f91cdl8zwkhpskdg7m10qpz1xy0a3r67xfs2ciyagyi"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; }; + GSEABase = derive2 { name="GSEABase"; version="1.40.1"; sha256="10cmjxahg2plwacfan6g0k8cwyzya96ypc7m1r79gwqkyykxw5fz"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; }; + GSEAlm = derive2 { name="GSEAlm"; version="1.38.0"; sha256="1kz27bbccgi34z1i1wlsk8ikqbv2mi8f8i9is0irhl9zgvbrczxz"; depends=[Biobase]; }; + GSRI = derive2 { name="GSRI"; version="2.26.0"; sha256="12silcf67r3ni40g7vsc7iv15arzy7w12abpj2xcjfd9nr4d84js"; depends=[Biobase fdrtool genefilter GSEABase les]; }; + GSReg = derive2 { name="GSReg"; version="1.12.0"; sha256="1rdzkv6kf14shfddvrz3pssjgr6pvg6is4lzcvjzrxai4y34n0y6"; depends=[AnnotationDbi GenomicFeatures Homo_sapiens org_Hs_eg_db]; }; + GSVA = derive2 { name="GSVA"; version="1.26.0"; sha256="1zvi0w7clm5qg6fv6akqw4cx84kswcgzfzjdkhxsrid0l4hwmw09"; depends=[Biobase BiocGenerics geneplotter GSEABase shiny shinythemes]; }; + GUIDEseq = derive2 { name="GUIDEseq"; version="1.8.0"; sha256="1xsjz3mq6iawspdz1rif3fb8j2h92ykfrjj3lzlcsnvg92bnlczq"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; }; + GWASTools = derive2 { name="GWASTools"; version="1.24.1"; sha256="1x8p32f47fki2kl0pkjv4v7az8s1b6zwqjnxywfxy0drs9g6lky4"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; }; + GenRank = derive2 { name="GenRank"; version="1.6.0"; sha256="071k23qknpd46x22bj2cmp07mmxj22higw8ma4b0a8w0wmd05bwz"; depends=[matrixStats reshape2 survcomp]; }; + GenVisR = derive2 { name="GenVisR"; version="1.8.0"; sha256="03jc5qz1xfqpbll8qbs5ib7g70s21crmggc9a6xi9nvjq8ky05r6"; 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.20.0"; sha256="11bdc59ybi1kck3jkzilf0vmql6a3k97b1f9h940h28mhgn5x9w6"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; }; + GeneBreak = derive2 { name="GeneBreak"; version="1.8.0"; sha256="1157crj12c3girr6973a24ph15rfjw0vcakr42fpx7yhhirs89lb"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; }; + GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.24.0"; sha256="1l8829axy6fp29bkqlwbjcsajq99yb86yp5cc8211zprlhlxb30i"; depends=[Biobase PGSEA]; }; + GeneGA = derive2 { name="GeneGA"; version="1.28.0"; sha256="172hwxp91zj4pvamarnkx9cf1jm3zplws7scb4q00n1nxirhfzfd"; depends=[hash seqinr]; }; + GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.4.0"; sha256="14jnlc1icg7ws6gvffx3jpmhzcfaznzw6p8i0l1wpx22jyy3qam5"; depends=[data_table FactoMineR GenomicRanges GGtools igraph IRanges kernlab mvtnorm plspm rioja Rsamtools snpStats]; }; + GeneMeta = derive2 { name="GeneMeta"; version="1.50.0"; sha256="1cf8z6wy9yhs1y7f8fimjkx52brgr9fkhjaa9a62d2rvan65g9s2"; depends=[Biobase genefilter]; }; + GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.20.0"; sha256="17r2106r9fkpsj592dq6k70n8jj6gv65hrmblnsssck6h0n6n3ix"; depends=[graph htmlwidgets plyr Rcpp Rgraphviz rjson XML]; }; + GeneOverlap = derive2 { name="GeneOverlap"; version="1.14.0"; sha256="02svcyk1pa470033q2iv8148ypf6gbisxl8f09ksblvrrd0flh38"; depends=[gplots RColorBrewer]; }; + GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.34.0"; sha256="0ycxk1njlrshk6wr466r8jdj3pfl125ilifgrvcbgr526ndalmpp"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; }; + GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.22.0"; sha256="1v2ry9k8kqr95nx1z347f8hqdbawqb8f5p7iq7jb2w1smvhb26fr"; depends=[Biobase limma MASS survival]; }; + GeneSelector = derive2 { name="GeneSelector"; version="2.28.0"; sha256="0fc12sngwsw3sggmi08lb8r8lvb3hp77jqv3k1501nba4gq2wa9s"; depends=[Biobase limma multtest samr siggenes]; }; + GeneticsDesign = derive2 { name="GeneticsDesign"; version="1.46.0"; sha256="174swyvx1j9px2shn1188zgilyiclxclr317gsv5ab7f671lzl8n"; depends=[gmodels gtools mvtnorm]; }; + GeneticsPed = derive2 { name="GeneticsPed"; version="1.40.0"; sha256="0q2jrpi6ha4hsxsmprwsrls2ybs0clms6vh7smwa9j9g5lz7i93y"; depends=[gdata genetics MASS]; }; + GenoGAM = derive2 { name="GenoGAM"; version="1.6.0"; sha256="1dvaapinarpgn3i63iqhdbjh9mc5h7sgdxwlv9d55l42d1jyj6h3"; depends=[BiocParallel Biostrings data_table DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges IRanges mgcv reshape2 Rsamtools S4Vectors SummarizedExperiment]; }; + GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.38.0"; sha256="15p75cbbgwgcc3awyvawkah491yim0rp73af815pfiai11a51i4m"; depends=[biomaRt]; }; + GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.14.0"; sha256="1jhm0imkac4gvchbjxj408aakk39xdv2fyh818d3lk295bz6bnyp"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; }; + GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.14.1"; sha256="033p6fw46sn7w2yyn14nb9qcnkf30cl0nv6zh014ixflm3iifz39"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; + GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.2.0"; sha256="0ndzpzripibx38nk40xpz4xkghhr4an3skqdhfh8479jk2fnfwjd"; depends=[data_table GenomicRanges httr IRanges jsonlite lazyeval magrittr readr xml2]; }; + GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.30.3"; sha256="010vn8hlwbnw12pd1d8pv6m12yp3xwx557gba5rbjq9p4qypnn3z"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RMySQL RSQLite rtracklayer S4Vectors XVector]; }; + GenomicFiles = derive2 { name="GenomicFiles"; version="1.14.0"; sha256="0r0wmrs5jycf1kckhnc2sgjmp336srlcjdkpbb1ymm7kazdd0s9n"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; + GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.12.0"; sha256="0f0ki2zsaxg6f4qr47xgyhxm6jvms0s1zab7f0vcnw8jd7vhmnzn"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; }; + GenomicRanges = derive2 { name="GenomicRanges"; version="1.30.3"; sha256="07cszc9ri94nzk4dffwnsj247ih6pchnrzrvnb0q4dkk33gwy8n1"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; }; + GenomicScores = derive2 { name="GenomicScores"; version="1.2.2"; sha256="0g6i90vn29pasiqbq0088bgdisr356539z94scv7cila968inh7n"; depends=[AnnotationHub Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors XML]; }; + GenomicTuples = derive2 { name="GenomicTuples"; version="1.12.0"; sha256="0962l9204vm5x7vcqzlvlgblhdczwp4zbq4i262gqh79lnx4yq1y"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; + Genominator = derive2 { name="Genominator"; version="1.32.0"; sha256="1gh56xyfgx5f8rb0wbpvkg8h2q1ci2qf3ngkg3sficn65pbj9iha"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; }; + Glimma = derive2 { name="Glimma"; version="1.6.0"; sha256="19640crf4pivalivakk22llr9z505d5iq09fnlj4cj6fnga7abzq"; depends=[Biobase edgeR jsonlite S4Vectors]; }; + GlobalAncova = derive2 { name="GlobalAncova"; version="3.46.0"; sha256="16bhrkrz24hwxv0py4xiv043z1gxlak3qvdrdmc8pw7swv52hv9w"; depends=[annotate AnnotationDbi corpcor globaltest]; }; + GoogleGenomics = derive2 { name="GoogleGenomics"; version="2.0.0"; sha256="1z3p1xyj45hapvy765akxf88ll9fzsjnprc1g8cv9a9fdjg7vw36"; depends=[Biobase Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; }; + GraphAT = derive2 { name="GraphAT"; version="1.50.0"; sha256="0hrcz1d4k0g1k8izzk9znwxgr3f6ilv93vswqv3z3sfk5ib3aznr"; depends=[graph MCMCpack]; }; + GraphAlignment = derive2 { name="GraphAlignment"; version="1.42.0"; sha256="1vq6g4w75wlnq201mc93xmbp80dj9rc3ay7zqcpwr4bjnpmgh53v"; depends=[]; }; + GraphPAC = derive2 { name="GraphPAC"; version="1.20.0"; sha256="0g0r6714d0bamq5gwggqkbh9ac23wqjdlp358br7z4gkgixxz8zd"; depends=[igraph iPAC RMallow TSP]; }; + GreyListChIP = derive2 { name="GreyListChIP"; version="1.10.0"; sha256="17bn80x35nw0ys4n67m8sq3zij5ikasi4fqchx98pn72czl932r4"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; }; + Guitar = derive2 { name="Guitar"; version="1.16.0"; sha256="03pivwaw41ycpg4iwppg9dn7ina8g98kixwpxhv9nnvkzf3124xp"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; }; + Gviz = derive2 { name="Gviz"; version="1.22.3"; sha256="1grjzrjpzkw572pbvpsvdnfkfgwybl0cnjd7nnk2xdr26wnbsi9a"; 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.17.0"; sha256="109svm1nzvf0a6hi9fvg7pzfpdbh44dlp6v0dphqm246gqh2cq22"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; }; + HDF5Array = derive2 { name="HDF5Array"; version="1.6.0"; sha256="0kcdza41saqv6vlpvqd841awbiwkg84lh0plx6c7fmfgbqv7a0jh"; depends=[BiocGenerics DelayedArray IRanges rhdf5 S4Vectors]; }; + HDTD = derive2 { name="HDTD"; version="1.12.0"; sha256="0dd1z93pv141q51nvjh6dfgvxw6h9wwdllbvy7s4z5vd43w576s8"; depends=[]; }; + HELP = derive2 { name="HELP"; version="1.36.0"; sha256="0216pwpfi626g49hgz8g2gniixakcdx5yhrw03dy0pn0xp26wnhc"; depends=[Biobase]; }; + HEM = derive2 { name="HEM"; version="1.50.0"; sha256="10p66m46zqm7dj6ldx8dqrwymaplzrpvbg6yqzyx7llvzar7dil7"; depends=[Biobase]; }; + HIBAG = derive2 { name="HIBAG"; version="1.14.0"; sha256="0kk4bf6q6kk8vm18vy56p075538awfbv310c4241m5j3i7g4pxxl"; depends=[]; }; + HMMcopy = derive2 { name="HMMcopy"; version="1.20.0"; sha256="0jhfgshaj5917b24siiik72qaa19w05v5jqa6zj5vi8j02lv7i9g"; depends=[geneplotter IRanges]; }; + HTSFilter = derive2 { name="HTSFilter"; version="1.18.0"; sha256="1q1782cky7kh042wfr5h588019jwzm9sw4c9f503hq2gfgb6n3xi"; depends=[Biobase BiocParallel DESeq DESeq2 edgeR]; }; + HTSanalyzeR = derive2 { name="HTSanalyzeR"; version="2.30.0"; sha256="1h75igpbws4hdd2nrnbf8w0rpyfjmbb57m3ja5fir0l4x7lwn1rw"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; }; + HTSeqGenie = derive2 { name="HTSeqGenie"; version="4.8.0"; sha256="0b7j6fbww9336ph4xmw8gvln5b6iy3fmcsx5ggxjln8vdy8ca4yi"; 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.32.0"; sha256="0bzygl0mk35y6zwixsqxv4k3hdwjj77hia97bdj4bngm1x5qllai"; depends=[affy Biobase gplots limma RColorBrewer]; }; + Harman = derive2 { name="Harman"; version="1.6.0"; sha256="17s3kxldvfnk5j20n0csbx967xa4npb5x0wy7whhb6zdk9dw7g6q"; depends=[Rcpp]; }; + Harshlight = derive2 { name="Harshlight"; version="1.50.0"; sha256="0jcl49dgb6h3s0yh0ym7sfmsfyc2f3ykvnizp66i18by7fa5va60"; depends=[affy altcdfenvs Biobase]; }; + Heatplus = derive2 { name="Heatplus"; version="2.24.0"; sha256="0lil1yfqqga9l6qrgismngvary4495zmi4yk01izpcx29pk8zn6n"; depends=[RColorBrewer]; }; + HelloRanges = derive2 { name="HelloRanges"; version="1.4.0"; sha256="0pbikr79lh6iij044sy6fw6i2bqigmna4hb806kyihclpm0rs3y2"; depends=[BiocGenerics Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; + HiCcompare = derive2 { name="HiCcompare"; version="1.0.0"; sha256="1r25l4q7rpzjhz02ys78a4p8ga3wrd231znk84pp7xgka3xpprv0"; depends=[BiocParallel data_table dplyr GenomicRanges ggplot2 gridExtra gtools InteractionSet IRanges KernSmooth mgcv pheatmap QDNAseq S4Vectors]; }; + HiTC = derive2 { name="HiTC"; version="1.22.0"; sha256="0288xa1jy6nzvz2ha07csmp6dirjw5r7p9vy69q2wsbyzr02ymkp"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; }; + HilbertCurve = derive2 { name="HilbertCurve"; version="1.9.1"; sha256="1k3l3i8fpfhzsdwrlkyp7k8rpkyg51lx6c776vd8nm4f2nqn7z36"; depends=[circlize GenomicRanges HilbertVis IRanges png]; }; + HilbertVis = derive2 { name="HilbertVis"; version="1.36.0"; sha256="1yilvi5pcr0z5h0n0mf7hfrjc7cl44vn6svczlmw57n8pxf8p35g"; depends=[lattice]; }; + HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.36.0"; sha256="12bwk0lj2s6jgrpwigc4jd80irzxqjwc8smq1dhsm6pj62v0gvlk"; depends=[HilbertVis]; }; + HybridMTest = derive2 { name="HybridMTest"; version="1.22.0"; sha256="0lrfqalazszcywv58q1grmxp3dn6yxgi3xmwi53cq5bacizqdq3j"; depends=[Biobase fdrtool MASS survival]; }; + IHW = derive2 { name="IHW"; version="1.6.0"; sha256="14vbi9p3bi09qc0vjnwksfgv5c95ka468c1w5qjj6v99cyj548id"; depends=[BiocGenerics fdrtool lpsymphony slam]; }; + IMAS = derive2 { name="IMAS"; version="1.2.0"; sha256="0568llff8d11fykanhy3ja1wbi7hidwixyql8zbi04nfxskpsa6k"; depends=[AnnotationDbi BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfortify ggplot2 gridExtra IRanges IVAS lattice lme4 Matrix Rsamtools S4Vectors survival]; }; + IMPCdata = derive2 { name="IMPCdata"; version="1.14.0"; sha256="1aaj9fvp6f8zqwadkms23lghf65rghb729m84rdv4c7q4flb96sy"; depends=[rjson]; }; + INPower = derive2 { name="INPower"; version="1.14.0"; sha256="17d53fa96pqh7xhvhmydrvy00x3dvba6npapc5hngzzlr7pc07bv"; depends=[mvtnorm]; }; + INSPEcT = derive2 { name="INSPEcT"; version="1.8.0"; sha256="1v3zyiqc0b5rhbkx7w7r2a7m88jgafp84vsgrs9wi8fhs8mvyvd1"; depends=[Biobase BiocGenerics BiocParallel deSolve GenomicAlignments GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve Rsamtools S4Vectors]; }; + IONiseR = derive2 { name="IONiseR"; version="2.2.0"; sha256="1qrdgm94xpm075nlgv9zklm7pwfbfjj2d45lv0gs11qj4xi8rccx"; depends=[BiocGenerics BiocParallel Biostrings bit64 dplyr ggplot2 magrittr rhdf5 ShortRead stringr tibble tidyr XVector]; }; + IPO = derive2 { name="IPO"; version="1.4.1"; sha256="0bskznr2w1pfanxfnffg1gdjvwii3wkpsgmz96pjxa23yw1ykpgp"; depends=[BiocParallel CAMERA rsm xcms]; }; + IPPD = derive2 { name="IPPD"; version="1.26.0"; sha256="0s2xl5k9sr8kqqn9hbi0kbqmn4xm78fnsqg7g82w69ah3v7myl1f"; depends=[bitops digest MASS Matrix XML]; }; + IRanges = derive2 { name="IRanges"; version="2.12.0"; sha256="1vqczb9wlxsmpwpqig6j1dmiblcfpq6mgnq8qwzcrvddm4cp47m5"; depends=[BiocGenerics S4Vectors]; }; + ISoLDE = derive2 { name="ISoLDE"; version="1.6.0"; sha256="02xl3a9pdwdyjm0iyza43b26bvvpxz13z30kbwv4g3h7w5q3szvr"; depends=[]; }; + ITALICS = derive2 { name="ITALICS"; version="2.38.0"; sha256="047s6q6l2zv3d01hw0qxxshq69cvz8d6cq631n5r6i4bp2pnay32"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; }; + IVAS = derive2 { name="IVAS"; version="1.98.0"; sha256="1ngijwnx07i7i0pj72dz6c6kims0n5cjcs75yaw5dfwl00xn9p2a"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges ggfortify ggplot2 IRanges lme4 Matrix S4Vectors]; }; + IWTomics = derive2 { name="IWTomics"; version="1.2.0"; sha256="1ndpyikxf4z4p7xmmpbd4h7mv9pcdjds0ziwvzi55r486065i2z1"; depends=[fda GenomicRanges gtable IRanges KernSmooth S4Vectors]; }; + Icens = derive2 { name="Icens"; version="1.50.0"; sha256="19aidmg2f7ij1zak8cxy4y8y1dbhgb17y87zkw8829zh2diz04hm"; depends=[survival]; }; + IdMappingAnalysis = derive2 { name="IdMappingAnalysis"; version="1.22.0"; sha256="0dxrylxdyi22x7bsdv70rkwi3j6q0gyddhx48d9f84dsi51zimz4"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; }; + IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.26.0"; sha256="19y4xjj5fakyf7mdc33r9lygayq4clgm03410iw3si5vy2ib720l"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; }; + IdeoViz = derive2 { name="IdeoViz"; version="1.12.0"; sha256="1ihfxp4dngwk72nxw36w15d28cpz4y0qxagap4km76i51c9jm855"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; }; + Imetagene = derive2 { name="Imetagene"; version="1.8.0"; sha256="1xgdwp5xvl57xll1i691c0fqnj5rp53l86my3wvbxwd9jdj6rz6v"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; }; + ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.6.2"; sha256="14ad6ar2pprisahv433w20whpnrssr0hfsm59d6m3bkwaff4hb8h"; depends=[Biobase data_table ggplot2 gplots gtools heatmaply httr pheatmap plotly preprocessCore reshape2 rjson Rlabkey rmarkdown scales]; }; + ImpulseDE = derive2 { name="ImpulseDE"; version="1.4.0"; sha256="04l1rkpmk682af5yw9whj8ngq788kmzf7p76paayb6ihamhkcfq1"; depends=[amap boot]; }; + ImpulseDE2 = derive2 { name="ImpulseDE2"; version="1.2.0"; sha256="11gr6ycg46ywkrwrnarn5a582nq8x47mhlg140d7fw2wiy20b8ln"; depends=[Biobase BiocParallel circlize ComplexHeatmap cowplot DESeq2 ggplot2 knitr Matrix S4Vectors SummarizedExperiment]; }; + InPAS = derive2 { name="InPAS"; version="1.10.0"; sha256="1svpjpkqv8va2mrf3b366rqbiwy73jf5rxc32md4arjprs1kb13v"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; }; + IntEREst = derive2 { name="IntEREst"; version="1.2.2"; sha256="1ck2kmb25wf6rw97mag8l99g05mwaxs2lhpv1722inqq24q0smmq"; depends=[BiocGenerics BiocParallel Biostrings DBI DESeq2 DEXSeq edgeR GenomicAlignments GenomicFeatures GenomicRanges IRanges RMySQL Rsamtools S4Vectors seqinr seqLogo SummarizedExperiment]; }; + InterMineR = derive2 { name="InterMineR"; version="1.0.0"; sha256="0gb493spb89c4qz1s9ng9g8w136zcqdnq0rlpqqw3bxdpqck83fb"; depends=[Biostrings GenomicRanges httr igraph IRanges RCurl RJSONIO S4Vectors sqldf SummarizedExperiment XML xml2]; }; + InteractionSet = derive2 { name="InteractionSet"; version="1.6.0"; sha256="1wmp4dqxj19dbd97r6zfzv81j06vh9j7bpypcxib8f2lyx26cwm9"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix Rcpp S4Vectors SummarizedExperiment]; }; + IntramiRExploreR = derive2 { name="IntramiRExploreR"; version="1.0.0"; sha256="096503aaiznkcpxksxjq95lfb6pcbdvimns8ahc56vr6m5nqnpfx"; depends=[FGNet igraph knitr]; }; + IrisSpatialFeatures = derive2 { name="IrisSpatialFeatures"; version="1.2.0"; sha256="0glx0p5qjfs2fk48qcdi7w14iyj0chk1plv5r69c8iyyc4frd7xk"; depends=[data_table dplyr ggplot2 gplots magrittr RColorBrewer Rcpp SpatialTools spatstat tibble tiff]; }; + IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.14.0"; sha256="085clvn2wgqicvmd2c0h9ah59l6bwy0l6y8lq69ajy7il1grm4qq"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; }; + IsoformSwitchAnalyzeR = derive2 { name="IsoformSwitchAnalyzeR"; version="1.0.0"; sha256="0bb3y3r26kwgx84lhr52fyrk9i2jjwhnarr3wdxpyj4j00w2dq1f"; depends=[Biostrings BSgenome cummeRbund DBI DRIMSeq edgeR GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges plyr RColorBrewer reshape2 rtracklayer spliceR tximport VennDiagram]; }; + JASPAR2018 = derive2 { name="JASPAR2018"; version="1.0.0"; sha256="0kx6bfcmp9a0rka0pgpl7lsaw79imcd6zrpgzqg5l1031vlyplc4"; depends=[]; }; + JunctionSeq = derive2 { name="JunctionSeq"; version="1.8.0"; sha256="01db6xpmci0kldwi2x8xfmsbi4iywghcz8spd5601dd03cnmxxrk"; depends=[Biobase BiocGenerics BiocParallel DESeq2 genefilter geneplotter GenomicRanges Hmisc IRanges locfit plotrix Rcpp RcppArmadillo S4Vectors statmod stringr SummarizedExperiment]; }; + KCsmart = derive2 { name="KCsmart"; version="2.36.0"; sha256="0a1flc9bm4w0rfy3jf8fim7c0ddy9zjln0kgyyi3ps7n4rk4n75q"; depends=[BiocGenerics KernSmooth multtest siggenes]; }; + KEGGREST = derive2 { name="KEGGREST"; version="1.18.1"; sha256="02gwmm79djj55a90dzc80hlgwc6bafl7xd7fnx2q59pk945k3z9c"; depends=[Biostrings httr png]; }; + KEGGgraph = derive2 { name="KEGGgraph"; version="1.38.0"; sha256="028icymxshg4v80b5xhvpdqm87qxi9s6yycp2z5w55mhw8l22azw"; depends=[graph XML]; }; + KEGGlincs = derive2 { name="KEGGlincs"; version="1.4.0"; sha256="17l8hd072052hd8wfnxj06455qdgdx2bk456rl8ga6bjqbn0r4nq"; depends=[AnnotationDbi gtools hgu133a_db httr igraph KEGGgraph KEGGREST KOdata org_Hs_eg_db plyr RJSONIO XML]; }; + KEGGprofile = derive2 { name="KEGGprofile"; version="1.20.0"; sha256="0kd5wpnqpp9r1fy12islaj09qfnvkdf705rmapbzly47abqsziad"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png RCurl TeachingDemos XML]; }; + LBE = derive2 { name="LBE"; version="1.46.0"; sha256="0706nydzjl61ycnvck4xmpfk5x3pa2kllfivyxcjajhwlb4zr6r0"; depends=[]; }; + LEA = derive2 { name="LEA"; version="2.0.0"; sha256="1h1x2z2mamlvb4cf7541b1f7jh25i4lfhjm0nl5sfr1la1dmgsdn"; depends=[]; }; + LINC = derive2 { name="LINC"; version="1.6.0"; sha256="0jlbrcpmsk360mrqdfknkbc6zl87f7fxssd9hf2dp8fqkl3g1sfd"; depends=[ape Biobase clusterProfiler DOSE ggplot2 ggtree gridExtra org_Hs_eg_db png Rcpp ReactomePA reshape2 sva]; }; + LMGene = derive2 { name="LMGene"; version="2.34.0"; sha256="1nvv7dmpxgkwg9js3dzy09863bmm5xm068dmr1sl9jbjmx4lwwn0"; depends=[affy Biobase multtest survival]; }; + LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.4.0"; sha256="1svy7mav82rq60bw3akriinb9kfbj02ysl1kcnhvdqicdb3ms5x4"; depends=[CAMERA xcms]; }; + LOLA = derive2 { name="LOLA"; version="1.8.0"; sha256="0wkgibvrh8ddqqbms7id8yqi4ic0nf1ppdjxzg86xafglzz8m26d"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; }; + LPE = derive2 { name="LPE"; version="1.52.0"; sha256="10fm0p1khfypgghn4zp9w6bxc78mwvs39vcvhvpyrppr5xfqbn4c"; depends=[]; }; + LPEadj = derive2 { name="LPEadj"; version="1.38.0"; sha256="10h0mja8zz5cys8aa07vsp58h178bs66izwh0i6jc5b44hcdxrd2"; depends=[LPE]; }; + LVSmiRNA = derive2 { name="LVSmiRNA"; version="1.28.0"; sha256="093ndks9sx81q0hw6y5nz3dfb9w1adi0g3h6jqk5bl7h41lnrldw"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; }; + LedPred = derive2 { name="LedPred"; version="1.12.0"; sha256="1lhl6gkya72d4h0v32y3jpaz69g0l7n3v8ahgsz6dil84m4ksc8w"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; }; + Linnorm = derive2 { name="Linnorm"; version="2.2.0"; sha256="0a1zly4shxmq51zjdrmr7hsvmyaqs1xnhrisq93z4djrxq0paj0v"; depends=[amap apcluster ellipse fastcluster fpc ggdendro ggplot2 gmodels igraph limma MASS mclust Rcpp RcppArmadillo Rtsne statmod vegan zoo]; }; + LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.32.0"; sha256="0l175s1376wlkb0lva2xafq8p5n3011ldqm3dqcnhkb8mxfqkn4f"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; }; + Logolas = derive2 { name="Logolas"; version="1.2.0"; sha256="12syxp90dam9094xfgjvb820p14hgxx2xj08di9an12kb6h5s13b"; depends=[]; }; + LowMACA = derive2 { name="LowMACA"; version="1.10.0"; sha256="1qn60nrjr9aiw44wyp0q0qhsjm8hl3rzlc8wi6g9k3jaq2jq4v41"; depends=[BiocParallel Biostrings cgdsr data_table LowMACAAnnotation motifStack RColorBrewer reshape2 stringr]; }; + LymphoSeq = derive2 { name="LymphoSeq"; version="1.6.0"; sha256="1zh7wzw49nz3sf58m8rqi0dkgi9h9zff8jpdc4065pgjwg05r39s"; depends=[Biostrings circlize data_table dplyr ggplot2 ggtree ineq LymphoSeqDB msa phangorn plyr RColorBrewer reshape stringdist UpSetR VennDiagram]; }; + M3C = derive2 { name="M3C"; version="1.0.0"; sha256="0d25abzyq74g7faqyig4rpg963wbb39p9n420hdwrr7scbyij0v3"; depends=[cluster doParallel doSNOW foreach ggplot2 Matrix matrixcalc NMF RColorBrewer]; }; + M3D = derive2 { name="M3D"; version="1.12.0"; sha256="1w3bxwl19xrs3aigbzqa9n3v5yz6f7216ngyyilwhplnivq1k7zl"; depends=[BiocGenerics BiSeq GenomicRanges IRanges Rcpp S4Vectors SummarizedExperiment]; }; + M3Drop = derive2 { name="M3Drop"; version="1.4.0"; sha256="12s0nzih42gsr57532z0nmn6gccq40hfazsfqbl97w681ngfnk94"; depends=[bbmle gplots numDeriv RColorBrewer statmod]; }; + MADSEQ = derive2 { name="MADSEQ"; version="1.4.1"; sha256="0yc0ad7idb404ccw89w2lrqcfr9fdjlg876l8wsar6xgq7pa0lhd"; 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.12.0"; sha256="1l90yy6m2x83bka9222wcyim005pvpimja7ipj9f1bizymd5ivls"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; }; + MANOR = derive2 { name="MANOR"; version="1.50.0"; sha256="039msah06ga9vxk2i4qm7kv5lsxrmfr0ws9mdmh0bw6kv7l61wsr"; depends=[GLAD]; }; + MAST = derive2 { name="MAST"; version="1.4.1"; sha256="0waqz85gzyv09cjf4shz9dydazh0knczylh8854icn1i87x5sjsj"; depends=[abind Biobase BiocGenerics data_table ggplot2 plyr reshape2 S4Vectors stringr SummarizedExperiment]; }; + MBASED = derive2 { name="MBASED"; version="1.12.0"; sha256="1ys9m3g2c93wck6cj5n0vcdzca7f4qcxgc14zhabbs4pv70qc8mf"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; }; + MBAmethyl = derive2 { name="MBAmethyl"; version="1.12.0"; sha256="1h2hb4lbs1p101zd6k5xpp5ashib9iqrgkp2afdj0v4s8v9f2h09"; depends=[]; }; + MBCB = derive2 { name="MBCB"; version="1.32.0"; sha256="0amqmzi54dvkgzylavy0dbv973s2p02jppd5vzqzkrqs8amb3r4c"; depends=[preprocessCore tcltk2]; }; + MBttest = derive2 { name="MBttest"; version="1.5.0"; sha256="0gswdh61mmqn7h4d6vwvis08lxx383ynj6pk2va3z8bn25qki5lz"; depends=[gplots gtools]; }; + MCRestimate = derive2 { name="MCRestimate"; version="2.34.0"; sha256="1n4abpm6ld4ap87pgrv3mfr1aycdjb4hjg3fm699rckyl9qynjr3"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; }; + MCbiclust = derive2 { name="MCbiclust"; version="1.2.1"; sha256="1yqm6fwap4553nmh1dl3vg87hixljzm097wcv4l6sd5sd0sg63c7"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; }; + MEAL = derive2 { name="MEAL"; version="1.8.0"; sha256="0mccjr21jvmwlszhb9qixm7dr83gkhm2hjh9yrn11d22cm9r6g1q"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl MultiDataSet permute S4Vectors SmartSVA SNPassoc snpStats SummarizedExperiment vegan]; }; + MEDIPS = derive2 { name="MEDIPS"; version="1.30.0"; sha256="06mm424g3rc8j64wfyv6w40m106wifzhi91nsbpi317fg98qfd3d"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; }; + MEDME = derive2 { name="MEDME"; version="1.38.0"; sha256="137p9z1g3z4r7q3nsrpsp2gbm657nrbrrq96ph1mykvv41ylq59p"; depends=[Biostrings drc MASS]; }; + MEIGOR = derive2 { name="MEIGOR"; version="1.12.0"; sha256="05ww7an7vk67rjcf31g9aq033w6yhx9dagrhj3ki5ks7hcwig1yv"; depends=[CNORode deSolve Rsolnp snowfall]; }; + MGFM = derive2 { name="MGFM"; version="1.12.0"; sha256="0yjr14anr5rny6g1508nrw905d4b01jh34vpwi8737p1q4d9bzis"; depends=[annotate AnnotationDbi]; }; + MGFR = derive2 { name="MGFR"; version="1.4.0"; sha256="04nxg65m1s8qyq8sbs8733d541r0vcmabz27w03vs87f0dbxhg11"; depends=[annotate biomaRt]; }; + MIGSA = derive2 { name="MIGSA"; version="1.2.0"; sha256="0ih5i1acb7igbcqk7wykxhncvl5vbgx34gl5nqc65adpqb0199fl"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel data_table edgeR futile_logger ggdendro ggplot2 GO_db GOstats graph GSEABase limma matrixStats mGSZ org_Hs_eg_db RBGL reshape2 Rgraphviz RJSONIO vegan]; }; + MIMOSA = derive2 { name="MIMOSA"; version="1.16.0"; sha256="0rnxr7gxcps2raxka8c2x58liwwc75acwpahi2xc1dl8c2z4jpvx"; depends=[Biobase coda data_table Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; }; + MIRA = derive2 { name="MIRA"; version="1.0.1"; sha256="0dapp1q6vrdixz8n2g6ivav4d4si3wg1na7cg5jirb22mwi2rrpk"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; }; + MLInterfaces = derive2 { name="MLInterfaces"; version="1.58.0"; sha256="1py603bykvnzyq15rcqvq1nly3l6chh5zh6x4biwdn0smyjlnkns"; 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.26.0"; sha256="0mhaw39rbzrnrminvsiq6vrdrmf3zm2zqg3ilnsq1zw8bm2bsbh7"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; }; + MLSeq = derive2 { name="MLSeq"; version="1.18.0"; sha256="1r6b33ic2lnj3v2qzs7r904rfyibz96yr35mgpiz4zzsax4ar6v4"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; }; + MMDiff2 = derive2 { name="MMDiff2"; version="1.6.0"; sha256="13f96dw630hadqa0z83ispdni728g7zl12xj8zxrf5hvw1c1hs2h"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; }; + MODA = derive2 { name="MODA"; version="1.4.0"; sha256="1baxma9g4ir24fxwxgm3hphvv8j521wgmvy86fcl2rai6ayy8liy"; depends=[AMOUNTAIN cluster dynamicTreeCut igraph RColorBrewer WGCNA]; }; + MPFE = derive2 { name="MPFE"; version="1.14.0"; sha256="0jh1s0skaw16d94149hisjnfn2hk6z7hdd4ishzwziqbwag60z0w"; depends=[]; }; + MSGFgui = derive2 { name="MSGFgui"; version="1.12.0"; sha256="1yr1m12svmcx7y1524j8dw91rf0gn28gs9hy7gan88lnjv4hlnh9"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; }; + MSGFplus = derive2 { name="MSGFplus"; version="1.12.0"; sha256="1xpzcmvlk394sqwl2lx8ihhgsnrfifpkrbh79b7lwwjzijr37npv"; depends=[mzID ProtGenerics]; }; + MSnID = derive2 { name="MSnID"; version="1.12.1"; sha256="1zw508kk4f8brg69674wp18gqkpx2kpya5f6x9cl3qng7v4h5pxx"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; }; + MSnbase = derive2 { name="MSnbase"; version="2.4.2"; sha256="1ig64bf881p118dwqfr0ry41m7yhnyv165smv8fdwfv7sb6sagif"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp S4Vectors vsn XML]; }; + MSstats = derive2 { name="MSstats"; version="3.10.6"; sha256="03a9069zv0m8m28a9rh53m12rhgrc299frhqiwl1jj6b82myv5hp"; depends=[broom data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm MSnbase preprocessCore purrr Rcpp reshape2 snow stringr survival tidyr]; }; + MSstatsQC = derive2 { name="MSstatsQC"; version="1.0.0"; sha256="1987j8l5q6cyyg8wpyv1mgv5s3qwdxvdb2c2qhl5svaksxlni2hi"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics RecordLinkage]; }; + MVCClass = derive2 { name="MVCClass"; version="1.52.0"; sha256="03ym7qlybs99ir629h9mmm2kqpmx1lzliql7qgbfiydpynvplahy"; depends=[]; }; + MWASTools = derive2 { name="MWASTools"; version="1.2.0"; sha256="0pgb6qnqqzz6y22cbxivx04v0rak76i2kc3aasdrz324xjv5hq09"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; }; + MantelCorr = derive2 { name="MantelCorr"; version="1.48.0"; sha256="0jnj6cyvpk41pi9f021wgqjnrns3xcixa7gbnqaa83gv8zrm2d8n"; depends=[]; }; + MassArray = derive2 { name="MassArray"; version="1.30.0"; sha256="113d6hkzx4gn2n58ljm6awfzyjzvsa7q4rhybnfqv9rfh93q1iin"; depends=[]; }; + MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.44.0"; sha256="1q0m4s4f7pajkc99aijaskcd4qg50w98bllsr89154vnrcaszhz0"; depends=[waveslim]; }; + MatrixRider = derive2 { name="MatrixRider"; version="1.10.0"; sha256="07msw0h3mgn9l8kdc1zzijxy62dfawrxx8rd2xw6djammb9gl1p5"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; }; + MaxContrastProjection = derive2 { name="MaxContrastProjection"; version="1.2.0"; sha256="0a5jsm0rrxw0il17bysjy7inzf7ay9lrzi1kyxifl4k64j8ssj3r"; depends=[EBImage]; }; + MeSHDbi = derive2 { name="MeSHDbi"; version="1.14.0"; sha256="10ir9ma04cwn2kbd10anv4yqljh5p60lq53da8191psv82ni9cfx"; depends=[AnnotationDbi Biobase BiocGenerics RSQLite]; }; + MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.50.0"; sha256="0gky9yhd7k0w83ysnjjy21m8wwjg5k5y85ba19bc1k8412x5alj8"; depends=[]; }; + MergeMaid = derive2 { name="MergeMaid"; version="2.50.0"; sha256="0bsjrm6wm732saw07l2y4mmbsdgxk5b4x74zsjjv4k92dbfbwraa"; depends=[Biobase MASS survival]; }; + Mergeomics = derive2 { name="Mergeomics"; version="1.6.0"; sha256="1m2d2clg3mj8m365zcivqdn81ira83m69cxr1s4syrl1a2cymkz6"; depends=[]; }; + MetCirc = derive2 { name="MetCirc"; version="1.6.0"; sha256="106anz431236gn0himc273h9w721wk6l9gmkilydviflb0x990j3"; depends=[amap circlize scales shiny]; }; + MetaCyto = derive2 { name="MetaCyto"; version="1.4.0"; sha256="036j7mnfgvra1ryzqiw7mpsavc0akmalryswq6n9z02gmns5sij1"; depends=[cluster fastcluster flowCore FlowSOM ggplot2 metafor tidyr]; }; + Metab = derive2 { name="Metab"; version="1.12.0"; sha256="0gnpdhvzhqs3ajdj439x2wr3b3yzx5qgb6brlw9hxz63l4fpipn7"; depends=[pander svDialogs xcms]; }; + MetaboSignal = derive2 { name="MetaboSignal"; version="1.8.0"; sha256="0qydccfbyys8gfalzcadx0hiljq2ias5qphwsdxglh1xlqkh2919"; depends=[AnnotationDbi biomaRt EnsDb_Hsapiens_v75 hpar igraph KEGGgraph KEGGREST MWASTools mygene org_Hs_eg_db RCurl]; }; + MethPed = derive2 { name="MethPed"; version="1.6.0"; sha256="0m442v7akv5r274hx56r6vkcsg4ha897ira4mbkiqfsrxscmajh2"; depends=[Biobase randomForest]; }; + MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.10.0"; sha256="14xd5h6pgla2kh1l1rn7x2ddal98ypazqr120kyifqf05y5sf1ph"; depends=[Biostrings gplots seqinr stringr]; }; + MethylAid = derive2 { name="MethylAid"; version="1.12.0"; sha256="1km22cscxkgyx6blbsrnh5q8pj7fmw5caqnj72bzi76zw8mr0fli"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny SummarizedExperiment]; }; + MethylMix = derive2 { name="MethylMix"; version="2.8.0"; sha256="0dbsmkiidc83hncqkw4g1kz7dwdr631s4a3a982v7krfsgvcqwyi"; depends=[data_table digest foreach ggplot2 impute limma R_matlab RColorBrewer RCurl RPMM]; }; + MethylSeekR = derive2 { name="MethylSeekR"; version="1.18.0"; sha256="0d1ya2jbgqk9s4clpsaipm4l9585ycxg5bmhg4dmmcph0w6dcsjl"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; }; + Mfuzz = derive2 { name="Mfuzz"; version="2.38.0"; sha256="18c83g8ydbb24v1n0rcp3lv533ikhs6wwchvmdbsy2whlsy3sv1i"; depends=[Biobase e1071 tkWidgets]; }; + MiChip = derive2 { name="MiChip"; version="1.32.0"; sha256="1jbwri284jzjaxml4ddz4kcmhhz48naqiydj4ixc85hk3gpjglaa"; depends=[Biobase]; }; + MiPP = derive2 { name="MiPP"; version="1.50.0"; sha256="1kdi0m4856dsal6qx458x35ybnaj960ys83dgg5w4c8420k9mv9m"; depends=[Biobase e1071 MASS]; }; + MiRaGE = derive2 { name="MiRaGE"; version="1.20.0"; sha256="1jbs427vpld18l83s5dngijc8rgllqvrili8gv4in20nr6dyk9hi"; depends=[AnnotationDbi Biobase BiocGenerics S4Vectors]; }; + MineICA = derive2 { name="MineICA"; version="1.18.0"; sha256="1zdq5i14ksm8rirbry6j1dh56r1bhy5yvfzrxfjkm94lynqcdpdy"; 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.22.0"; sha256="1j2g0ji1ac9608b965rr9vvbhlcbvirqypngh11havh3vn54m9rf"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; }; + Mirsynergy = derive2 { name="Mirsynergy"; version="1.14.0"; sha256="1mwcv1fb3vda4ilmvwjrwb2qg65bgdxsvd2jd9ndaccxb7m3c2lk"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; }; + MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.28.0"; sha256="058nvymnnzd61a7x2vpzic1s2nm3q520cnfdhd6i09isg6kqr6c8"; depends=[Biobase lattice limma statmod vsn xtable]; }; + MoPS = derive2 { name="MoPS"; version="1.12.0"; sha256="0g4awrm90kjnk66b291y2n5vwwwzpdb3kaq96sxfc5a1af8q5q81"; depends=[Biobase]; }; + MoonlightR = derive2 { name="MoonlightR"; version="1.4.0"; sha256="0kisic6bzp2gy1yjg717izbkirlvrwb1wndckd2yvncrjzpidcq6"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; }; + MotIV = derive2 { name="MotIV"; version="1.34.0"; sha256="0lvkzbw328mxyp2pd95ymi1nbk78jx880h00jxwdf17a5rkikgh6"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM S4Vectors]; }; + MotifDb = derive2 { name="MotifDb"; version="1.20.0"; sha256="16gk7sbrk188kv3mdsnvcnfzvd2dyxm7wmmwvcqz560x0xn0l0k9"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors splitstackshape]; }; + Mulcom = derive2 { name="Mulcom"; version="1.28.0"; sha256="1dh4sn64n1db2hlbx58mb49kmfassr1r92d9lphzzqhsicq78p8c"; depends=[Biobase fields]; }; + MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.4.9"; sha256="0kbr2nfxkny9y6hgijr2xpzczs0ijv0g7nh37yrzgkh10rwjsflq"; depends=[Biobase BiocGenerics GenomicRanges IRanges reshape2 S4Vectors shiny shinydashboard SummarizedExperiment tidyr]; }; + MultiDataSet = derive2 { name="MultiDataSet"; version="1.6.0"; sha256="0h187dkqn63m6askai30x31va24hiv4ig0kxvp9xraz7n9zfr24g"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggrepel IRanges limma qqman S4Vectors SummarizedExperiment]; }; + MultiMed = derive2 { name="MultiMed"; version="1.12.0"; sha256="1b48iv34bnsbyg7j70kwi8iyikc1hxlcfmaxsc97249dfq71rfab"; depends=[]; }; + MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.4.2"; sha256="08ay9h5cqsi8ypb6r0g4rfa5l1g06jgfzl64wmhgz134yqbl7vfv"; depends=[BiocGenerics Biostrings cowplot GenomeInfoDb GenomicRanges ggdendro ggplot2 gridExtra IRanges NMF plyr pracma reshape2 S4Vectors SummarizedExperiment VariantAnnotation]; }; + NADfinder = derive2 { name="NADfinder"; version="1.2.0"; sha256="0npzbgbpwir4jv8h4giar9w8vjy3rivk55bimqd9bq7m83iwqapq"; depends=[baseline BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; }; + NCIgraph = derive2 { name="NCIgraph"; version="1.26.0"; sha256="094dnqj1gss4dh8hsc8y9k98b0g33n7yy714kjavcd16glp4w7i0"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; }; + NGScopy = derive2 { name="NGScopy"; version="1.12.0"; sha256="1aibq3rbs52vyhcx388p7szax7v8ac023pxayqmn2xq3kzj172ah"; depends=[changepoint rbamtools Xmisc]; }; + NOISeq = derive2 { name="NOISeq"; version="2.22.1"; sha256="0v04597hwvr4y96789samj6jpgipsdv15hsmkgs3pdli48cjwff3"; depends=[Biobase Matrix]; }; + NTW = derive2 { name="NTW"; version="1.28.0"; sha256="0gkj636fmr519hylb3kc70qxmx9cw3xim0vpx60qsr0kl6h5m7hq"; depends=[mvtnorm]; }; + NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.9.2"; sha256="1ss7q5zbqnkrv8fds2x3amjva5v8y8x4b5h1flh5paivdpv29frk"; depends=[Biobase matrixStats Rcpp]; }; + NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.10.0"; sha256="0r5yf2vgn0182074fa46ziclx9dbm60j4n7yck66ck81xp0jpwps"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; }; + NarrowPeaks = derive2 { name="NarrowPeaks"; version="1.22.0"; sha256="1ai2fdckd2d383bnwwpp60yz3f67gm8xnxqm74ah8gpn3ll9dxm8"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; }; + NetPathMiner = derive2 { name="NetPathMiner"; version="1.14.0"; sha256="1dcpayafvarf8brd3rh9ik6ki5z2fqqzwxpxdjm5bwfb7l3ida3w"; depends=[igraph]; }; + NetSAM = derive2 { name="NetSAM"; version="1.18.0"; sha256="05m6i3gcyvc9hzmfpj9wzim9b8p5lgv984y6805nrszr7dmhlyjv"; depends=[graph igraph seriation]; }; + NormqPCR = derive2 { name="NormqPCR"; version="1.24.0"; sha256="0js03x4gqrqs0pv9m5ih34zrxgc8vcv3dil17wzgfimrm044z0yl"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; }; + NuPoP = derive2 { name="NuPoP"; version="1.28.0"; sha256="1z5pgdi8l40yvbixsgajd2afyi2mkqvxgx0v4k3xxqw1w97kmrgv"; depends=[]; }; + OCplus = derive2 { name="OCplus"; version="1.52.0"; sha256="1fxfc66b8qmcq0yq1n1z7fj5d8hw0z59b3sdypdhhyw5ddcri0lf"; depends=[akima multtest]; }; + OGSA = derive2 { name="OGSA"; version="1.8.0"; sha256="1i6xh0y9ymxrdjywm8sayb7jgiyqgmz66wd94ja4f2na4xsw9gps"; depends=[Biobase gplots limma]; }; + OLIN = derive2 { name="OLIN"; version="1.56.0"; sha256="18b4hadkz1zp79ing1nd9z9456a9l6wk8is6gmzj6dbbs4g1pypc"; depends=[limma locfit marray]; }; + OLINgui = derive2 { name="OLINgui"; version="1.52.0"; sha256="115irlwwfzf7ywgbry2jwxl1h8hp6mlr9b36q509ah5c7kn58r1r"; depends=[marray OLIN tkWidgets widgetTools]; }; + OPWeight = derive2 { name="OPWeight"; version="1.0.0"; sha256="18crhxdlxixv1qp8vc5f711g1sxwhixpd5h0vb6jr9rkyq2v942b"; depends=[MASS qvalue tibble]; }; + OSAT = derive2 { name="OSAT"; version="1.26.0"; sha256="0nc79hh2vbqh864c9zac1pbghgx1fbq7maz4dxwl02hhpxj0187d"; depends=[]; }; + OTUbase = derive2 { name="OTUbase"; version="1.28.0"; sha256="019c8d2dfhf2q9zq0xgj0pakymyk48ssbqnags4hhfp684af61r6"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; }; + OmicCircos = derive2 { name="OmicCircos"; version="1.16.0"; sha256="13dw36n0lg5cafsrgkgr65al6y7jij2clyf1wzidn05p508i02m3"; depends=[GenomicRanges]; }; + OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.10.0"; sha256="0s7zyj3xkr74w0jw604hv3v775kqjpdgks4gkkrkfa3a1xj7xa5b"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; }; + Onassis = derive2 { name="Onassis"; version="1.0.1"; sha256="11sq6f3qcq37i4blml024kb24ifcq1xplklv2i9c55wg299ni620"; depends=[AnnotationDbi data_table GEOmetadb OnassisJavaLibs rJava RSQLite SRAdb]; }; + OncoScore = derive2 { name="OncoScore"; version="1.6.0"; sha256="02vzvvdnisx3xhr7428xdclgx90apa49h64bvp2h3nsa0vnhnj9l"; depends=[biomaRt]; }; + OncoSimulR = derive2 { name="OncoSimulR"; version="2.8.0"; sha256="1b0myymp38j6fbd4y8ppwmsj8v9w96g8wayc20bcygm16i1zjm5k"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph nem RColorBrewer Rcpp Rgraphviz smatr]; }; + OperaMate = derive2 { name="OperaMate"; version="1.9.0"; sha256="11ah55sl04gm8hq3gkcz3b4shq4dxdpwlwl0wn4j82ciai0k6wsm"; depends=[fBasics ggplot2 gProfileR gridExtra pheatmap reshape2 stabledist]; }; + OrderedList = derive2 { name="OrderedList"; version="1.50.0"; sha256="1sk9ni3vyixb3vwn86vz174lfd7n7rnc8jmm1fx94pjsp9r6sbgr"; depends=[Biobase twilight]; }; + Organism_dplyr = derive2 { name="Organism.dplyr"; version="1.6.2"; sha256="12gvdrn843334f665dqqjmlny4f6nyaql4h1181q8gfpnrc6kqwp"; depends=[AnnotationDbi AnnotationFilter BiocFileCache DBI dbplyr dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges RSQLite S4Vectors]; }; + OrganismDbi = derive2 { name="OrganismDbi"; version="1.20.0"; sha256="0yxvhwn0m53wfwp0zi81x96argdf7cf1lpymc2as51apvfcnjdl8"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller DBI GenomicFeatures GenomicRanges graph IRanges RBGL S4Vectors]; }; + Oscope = derive2 { name="Oscope"; version="1.8.0"; sha256="02j7a9yifnsl3acrwgn83f12rf9xf6lgrhl28cp9p0zhr5ljf306"; depends=[BiocParallel cluster EBSeq testthat]; }; + OutlierD = derive2 { name="OutlierD"; version="1.42.0"; sha256="1n34110czydhff8lkhfkd0hb1xcjka5a0wnvzb3wiyaiaihca26y"; depends=[Biobase quantreg]; }; + PAA = derive2 { name="PAA"; version="1.12.0"; sha256="186gfkz9pm0bdd3zr5cnb8qzj4fqkdcrch1bmny8iwsidi3kcxph"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; }; + PADOG = derive2 { name="PADOG"; version="1.20.0"; sha256="1lp8j2phh7f0vs6w7dc6w1lbfalqhb4ymfg5n4qci8lpzs52rm75"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGG_db KEGGdzPathwaysGEO limma nlme]; }; + PANR = derive2 { name="PANR"; version="1.24.0"; sha256="0qvivfnydj4abva5r0yy3p1q4db70z8yjrzzm3ryvjal8hvrdh39"; depends=[igraph MASS pvclust RedeR]; }; + PAPi = derive2 { name="PAPi"; version="1.18.0"; sha256="1flyf97qpffl9aa1sf7q4c62npk6j3jdvh3va5m0816iwq21nm9r"; depends=[KEGGREST svDialogs]; }; + PAnnBuilder = derive2 { name="PAnnBuilder"; version="1.42.0"; sha256="144s1lzb83rb7g809v582jc0xhsw0gsy2n5wdmsd2bi3j4i8kb2q"; depends=[AnnotationDbi Biobase DBI RSQLite]; }; + PCAN = derive2 { name="PCAN"; version="1.6.0"; sha256="0inm1kfi9xvd3jhqivxh4vzc6vsijh1z7fwzsqb35rlbi2cl7snd"; depends=[BiocParallel]; }; + PCpheno = derive2 { name="PCpheno"; version="1.40.0"; sha256="1sgw116qif7w52va7qg8n51a40nvmhybvgr5nxlvgvrwylkhqfai"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; }; + PECA = derive2 { name="PECA"; version="1.14.0"; sha256="1c3nbsvng951fsg9vk3yki215f3abgsxqhd025gyvs120nw4c9kv"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; }; + PGA = derive2 { name="PGA"; version="1.8.1"; sha256="14lm4ab7lib80wmkim4j72n4msmbx7nhlbv349cxrpc9k0dxmycm"; 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.52.0"; sha256="1g0kfhrvq8hv4lpwq3p3p6fkm2bmfjmkfw9312jrwnbjj0hfwd34"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; }; + PICS = derive2 { name="PICS"; version="2.22.0"; sha256="0jb4hzswiyrqpnazfpd6wd11gdlmv18za7fyr4slxv0rc9rkf8qm"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; }; + PING = derive2 { name="PING"; version="2.22.0"; sha256="1lvbl3g2m643nypc0nfmhjpfv4zl7qk457kg9i7y7l1lzqwqsk0s"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; }; + PLPE = derive2 { name="PLPE"; version="1.38.0"; sha256="1w8njdkvhs7y5j78d3y591202811sb8dsldf23yiyfihbjv61vzv"; depends=[Biobase LPE MASS]; }; + POST = derive2 { name="POST"; version="1.2.0"; sha256="1j96hqyhznq419xvvs9kkhppr6nfp0p95r5xz979pbvf8qhzypqx"; depends=[Biobase CompQuadForm GSEABase Matrix survival]; }; + PPInfer = derive2 { name="PPInfer"; version="1.5.1"; sha256="16c9ysal2v9vr54jkg0xcmrmf58l4p6qv61fmp3qxm89r833hry9"; depends=[biomaRt fgsea ggplot2 igraph kernlab STRINGdb yeastExpData]; }; + PREDA = derive2 { name="PREDA"; version="1.24.0"; sha256="09wwd4q4d2nzjwvnv0anaz3hhcykdaccnqc1azn56lqdajlgqzfz"; depends=[annotate Biobase lokern multtest]; }; + PROMISE = derive2 { name="PROMISE"; version="1.30.0"; sha256="0vc847sd638xm6f7n2b77sik9kqq9kxnmmms3qy06sbkynb0rk7h"; depends=[Biobase GSEABase]; }; + PROPER = derive2 { name="PROPER"; version="1.10.0"; sha256="0k7lpwqyflaifgs6aac55cichlf2za76gjfdijgp3f1vzvs2qn57"; depends=[edgeR]; }; + PROPS = derive2 { name="PROPS"; version="1.0.0"; sha256="1zscpjnjazw1m0bsq5x685h0pag68ddw6x0f5h99z6h06206xzki"; depends=[Biobase bnlearn reshape2 sva]; }; + PROcess = derive2 { name="PROcess"; version="1.54.0"; sha256="1x7hdbdhrbpp3qp6b604fiw13rid6dh57j9wgl0v3ligf84siv1q"; depends=[Icens]; }; + PSEA = derive2 { name="PSEA"; version="1.12.0"; sha256="16l7g49vd4j06gr9lzny663md872nhdpzpsnx3niaqmd28izm9p7"; depends=[Biobase MASS]; }; + PSICQUIC = derive2 { name="PSICQUIC"; version="1.16.4"; sha256="073lg2g1bixyiigdkixndcn29dhaznwh6v7v6ibq10h7qc5gl7k5"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; }; + PWMEnrich = derive2 { name="PWMEnrich"; version="4.14.0"; sha256="1aw0v9s5xy3gjsyhy04zm8xgsrv4a1n4j02zspyz6rf1acakishg"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; }; + PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.6.1"; sha256="1xh8p2q5znlwqcwas75kiy2fpz4va1y074z1c69p3h8h1xkivkzc"; depends=[FindMyFriends igraph jsonlite pcaMethods shiny]; }; + Path2PPI = derive2 { name="Path2PPI"; version="1.8.0"; sha256="0mzrnq3caq2nz6lckb7gbc87kq4l4nlywy2iwwjvdn6yzsxl2hb3"; depends=[igraph]; }; + PathNet = derive2 { name="PathNet"; version="1.18.0"; sha256="1rvm44y7fcf3mqy9c3hb5vx53b3xad20znbhkm4fqwgdb74dxyfv"; depends=[]; }; + PathoStat = derive2 { name="PathoStat"; version="1.4.1"; sha256="1al0h4mw5lsmn4n3d76d8p9px62l4y5c5z78md2zchnam3x9ii78"; depends=[alluvial ape BatchQC BiocStyle corpcor DESeq2 dplyr DT edgeR ggplot2 gtools knitr limma matrixStats MCMCpack pander phyloseq plyr preprocessCore rentrez reshape2 rmarkdown scales shiny tidyr XML]; }; + PathwaySplice = derive2 { name="PathwaySplice"; version="1.0.0"; sha256="1yi302xjf355xi14vx5rl6qyrm35qz9llf48fwrj7ycb41vla0fj"; depends=[AnnotationDbi AnnotationHub BiasedUrn Biobase BiocGenerics DOSE dplyr ensembldb gdata geneLenDataBase GO_db goseq gplots gridExtra htmlwidgets igraph JunctionSeq mgcv org_Hs_eg_db org_Mm_eg_db plotly RColorBrewer reshape2 S4Vectors tibble VennDiagram webshot]; }; + Pbase = derive2 { name="Pbase"; version="0.18.0"; sha256="17ya1mmz8dqrr81vcfy3ygw490bwg26xkj72mcmba17cyy0nv11x"; depends=[AnnotationFilter Biobase BiocGenerics BiocParallel biomaRt Biostrings cleaver ensembldb GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; }; + PharmacoGx = derive2 { name="PharmacoGx"; version="1.8.2"; sha256="0w77wpvi4qs8ngf5404m2cgac9zfj4jvkh88xcrz7zmmjmg2wvb9"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; }; + PhenStat = derive2 { name="PhenStat"; version="2.14.0"; sha256="1hjj1i083ihi7c1lc1rrh3k7513xcqpybn3aaivdjw66pi1bg7vp"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; }; + Pi = derive2 { name="Pi"; version="1.6.2"; sha256="0x3b5cs7r4cjvjjc2gx7xapzlkvg56784aj04zg6271hldpcd84j"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex XGR]; }; + Pigengene = derive2 { name="Pigengene"; version="1.4.2"; sha256="15wnq91k360jblns36dgx4a24jk6a7rwkj342ja0sgfc6kvwvvqb"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; }; + Polyfit = derive2 { name="Polyfit"; version="1.12.0"; sha256="1gkn6g5hwa8ss156armxam9ky5fd7dj0k3gh1b0gy5plpzzyzv1h"; depends=[DESeq]; }; + Prize = derive2 { name="Prize"; version="1.8.0"; sha256="1vaf4n69pb2sa6fd79988picz08d3c46cjmxfr5qf7hxay9lbwc6"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; }; + ProCoNA = derive2 { name="ProCoNA"; version="1.16.0"; sha256="06jlzcr9b6nfrlgb1wqxp7r2z8042ygjx4d2z7jzg07hqn3gymjz"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; }; + Prostar = derive2 { name="Prostar"; version="1.10.5"; sha256="1z9qli85if894j6s4a21yq6990hamz3ql1399m2wjjzka3w8kd29"; depends=[DAPAR DAPARdata data_table DT highcharter htmlwidgets rhandsontable shiny shinyAce shinyjs webshot]; }; + ProtGenerics = derive2 { name="ProtGenerics"; version="1.10.0"; sha256="16ijp50448wnabp43klx943rhdvh7x45hvy7cnpq1s4dckxhhyni"; depends=[]; }; + ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.8.0"; sha256="1myd5gqr3nmbp6f1n7ilp6qjcfgm401frm4ldvxbjyppxh6m1wh5"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR RCurl]; }; + PureCN = derive2 { name="PureCN"; version="1.8.1"; sha256="12wpqwz771vzz5yad67d9j1jhgi5ccxngyqcjcddqwsiws65prwc"; depends=[BiocGenerics Biostrings data_table DNAcopy edgeR futile_logger GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges limma RColorBrewer Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM]; }; + Pviz = derive2 { name="Pviz"; version="1.12.0"; sha256="1piws8xrq40qk3dkhci01wrcz4nz11rp8j2kf8rxvm9bsf2wxhk5"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; }; + QDNAseq = derive2 { name="QDNAseq"; version="1.14.0"; sha256="0lgbv4s0xqgrs7q6ynb3c273sf7pyrp51jnc8ravq1z5g0a2zshy"; depends=[Biobase BiocParallel CGHbase CGHcall DNAcopy GenomicRanges IRanges matrixStats R_utils Rsamtools]; }; + QUALIFIER = derive2 { name="QUALIFIER"; version="1.22.0"; sha256="1lp9b3g1nlfdvd8iaryrs6314fc2rpqcdfvbr92sb114yd0kj6qp"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; }; + QUBIC = derive2 { name="QUBIC"; version="1.6.4"; sha256="0sncmd1xrph5hd9y7sj53943cdf6fvhami4l8qd13qr5ikf07v0l"; depends=[biclust Matrix Rcpp RcppArmadillo]; }; + QuartPAC = derive2 { name="QuartPAC"; version="1.10.0"; sha256="1l7bljgqwsawn1naq62mcvp50fh5mhwc3qxxi7r6dy25v05ji4gr"; depends=[data_table GraphPAC iPAC SpacePAC]; }; + QuasR = derive2 { name="QuasR"; version="1.18.0"; sha256="0z87i7drfz1ssqwh27w4bhclf2k6i5bhjbfmn646pjb6qb6cvxia"; 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.6.0"; sha256="15i1lnc0k317ccvk7xdqq4hfqxip49lv0yvlkygf4xwa9g3z1vjl"; depends=[dplyr Rcpp rlist]; }; + R3CPET = derive2 { name="R3CPET"; version="1.10.0"; sha256="1cfb32rykza8h9v2h75674lhapykm3s6cym0c513mmr69vdbmqva"; depends=[BiocGenerics clues clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; }; + R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.28.1"; sha256="1vqv4gywwird0a55qw6c9pq67jml4f8pa28zrf04gim1mgalzfyl"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; }; + R4RNA = derive2 { name="R4RNA"; version="1.6.0"; sha256="0qxzqf8gjmblh9xlra8554fmr59gkpiq6pa8q9xmi5y56pgpzcqv"; depends=[Biostrings]; }; + RBGL = derive2 { name="RBGL"; version="1.54.0"; sha256="18jad23i3899ypv4bg3l47cvvs3qnj1pqis2p9x0135yv5y6wnv7"; depends=[graph]; }; + RBM = derive2 { name="RBM"; version="1.10.0"; sha256="1nqmf9yiaam767f2wkwggnw6v0rymszx7chnkis0xbdsllzqb0j4"; depends=[limma marray]; }; + RBioinf = derive2 { name="RBioinf"; version="1.38.0"; sha256="01qk9ddk8bm9sl70rlwgmrkz2y7dnqzrhi13hhh0ii62s0z0gdwh"; depends=[graph]; }; + RCAS = derive2 { name="RCAS"; version="1.4.3"; sha256="0ajnhi8i9p755lr0l2j5j52d5j6rsilrjhm3zrjr1zsgwqm2an6z"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; }; + RCASPAR = derive2 { name="RCASPAR"; version="1.24.0"; sha256="1v19pv81q0g965mks88ablznzhcdk3kfd7j2dgxx4r12bl1afawg"; depends=[]; }; + RCy3 = derive2 { name="RCy3"; version="1.8.0"; sha256="09p66zxh82j5pcjz1zn3cg43rpsp0gnkwja836m6g1i450zrialv"; depends=[graph httr RCurl RJSONIO]; }; + RCyjs = derive2 { name="RCyjs"; version="1.10.0"; sha256="0vlyh32byw49j3vfw0avknixflpjs5h599xxlbf2zc6irvncg1wg"; depends=[base64enc BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; }; + RCytoscape = derive2 { name="RCytoscape"; version="1.27.1"; sha256="1ai82y181bfckq8lqs1vsax2n1jwd5krz3x4b5ys56y3qjdqrgxy"; depends=[BiocGenerics graph]; }; + RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.16.0"; sha256="1fzv1qn7jkz0zcvj2n7ijf7z40pjp9myhxfffpafwrvbrn4qg0wg"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; }; + RDRToolbox = derive2 { name="RDRToolbox"; version="1.28.0"; sha256="0sm13v95m5b9jr451kbc4bichw6bhxlphxzaavkbvqh8qdv1l83q"; depends=[MASS rgl]; }; + REDseq = derive2 { name="REDseq"; version="1.24.0"; sha256="1k5d7s67gd4bjp6y6xjjplkjr7kv69iia11npmdwda743agkmyb7"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; }; + REMP = derive2 { name="REMP"; version="1.2.5"; sha256="1vpx4jzh8yyjpiqw4jr4chhha5dg4p2pwjza4mfbnpkzjbdy9ssr"; depends=[AnnotationHub BiocGenerics BiocParallel Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 caret doParallel foreach GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b2_hg19 impute IRanges iterators kernlab minfi org_Hs_eg_db ranger S4Vectors settings SummarizedExperiment]; }; + RGSEA = derive2 { name="RGSEA"; version="1.12.0"; sha256="1w63gc0pqgc2ran4a5pd4qxmcj9mx9hxy4has6jbar66pa6q4sfw"; depends=[BiocGenerics]; }; + RGalaxy = derive2 { name="RGalaxy"; version="1.22.0"; sha256="1cd5my1jzhlijshd4mh5zc7gsv5jic08i1ydmysjh760q97fg99v"; depends=[Biobase BiocGenerics optparse roxygen2 XML]; }; + RGraph2js = derive2 { name="RGraph2js"; version="1.6.0"; sha256="0shrvxsm452yrd7x36m31fkmwry55jagfvqpd7hzssj0imkg521w"; depends=[digest graph rjson whisker]; }; + RIPSeeker = derive2 { name="RIPSeeker"; version="1.18.0"; sha256="0bqkzwrncww7il36273chkd3gfxmii7p566ycki9qij419pwr35y"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + RITAN = derive2 { name="RITAN"; version="1.2.0"; sha256="199kddc19fwkfgqnbhx7v4sl5h6lj6f3wqs5xy9f9n9bg09f5rrf"; depends=[BgeeDB dynamicTreeCut ggplot2 gplots gridExtra gsubfn hash igraph knitr linkcomm MCL plotrix png ProNet RColorBrewer reshape2 RITANdata sqldf STRINGdb]; }; + RIVER = derive2 { name="RIVER"; version="1.2.0"; sha256="00j9i0hrn0j2i5rxgsax3ixj8pwm2ks9fyvp657yd5amm1vackxq"; depends=[Biobase ggplot2 glmnet pROC]; }; + RImmPort = derive2 { name="RImmPort"; version="1.6.0"; sha256="1fj69k1mb0gbajsiah23azp0ina3wvc43ghr6866glqcfh4xckj7"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; }; + RJMCMCNucleosomes = derive2 { name="RJMCMCNucleosomes"; version="1.2.0"; sha256="0xjscfbxrrfnd40dmzhrrly0v3pk1k33jdl4z19bslh89gmrmygr"; depends=[BiocGenerics BiocParallel consensusSeekeR GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; + RLMM = derive2 { name="RLMM"; version="1.40.0"; sha256="01mbk00fbhzldivxlr5jfy1fgfrdbd657lya3s3p7zxw7z0054a0"; depends=[MASS]; }; + RMassBank = derive2 { name="RMassBank"; version="2.6.0"; sha256="1yfnj64ybl95a7bc4980i5h6cvs2hq3nkmj9dklarcp9wfw5p59w"; depends=[Biobase digest MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; }; + RNASeqPower = derive2 { name="RNASeqPower"; version="1.18.0"; sha256="08x58sd6q5xm47ix2f1kkqpgyk10nnbf994i4m1wia8fjhx0hdkm"; depends=[]; }; + RNAinteract = derive2 { name="RNAinteract"; version="1.26.0"; sha256="1cscf2izpx924ai0vian9mm528mn1k618zqscss7mry13ik78p3c"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; }; + RNAither = derive2 { name="RNAither"; version="2.26.0"; sha256="1dyxmk0j319822qf0wwd41xw7v9qdahixkhmsbv3qp6203hp49w5"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; }; + RNAprobR = derive2 { name="RNAprobR"; version="1.10.0"; sha256="0lq0cf5g004w2gi8rs29rhdy3p49njmwnw5jhfijfj4hgkgc6caf"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr Rsamtools rtracklayer S4Vectors]; }; + ROC = derive2 { name="ROC"; version="1.54.0"; sha256="0a60k93q0zsmj2s4gy9wgzpd5yl9xdv2g62m18z4s4dmr3ykwsdv"; depends=[]; }; + ROTS = derive2 { name="ROTS"; version="1.6.0"; sha256="12dqbwqiiz21im45iqf41nm25anf0fffip86glpydwwc0km054jh"; depends=[Biobase Rcpp]; }; + ROntoTools = derive2 { name="ROntoTools"; version="2.6.0"; sha256="0lxxqa8syanb9v4nzc93arlwg65zyf4hkgxgw6q4h62mxkabdp0d"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; }; + RPA = derive2 { name="RPA"; version="1.34.0"; sha256="1s5d8wpy3n69f9lnsi8avwalbzzvi7v8np6bv3vcnxy3nfx0iqx3"; depends=[affy BiocGenerics phyloseq]; }; + RProtoBufLib = derive2 { name="RProtoBufLib"; version="1.0.1"; sha256="1a8psx12hwbzybkd92k9n3351g24fqqxrmq5x3sln62z2f0c7psw"; depends=[]; }; + RRHO = derive2 { name="RRHO"; version="1.18.0"; sha256="1nz643k6bahg1bizw5bgjkpv2hd7hpi87s4kh1z38jqfpfixw9lk"; depends=[VennDiagram]; }; + RSVSim = derive2 { name="RSVSim"; version="1.18.0"; sha256="0f2fv2cxwhsl6gvz3dpgk55faymdwxyry6lr3l6f2s8f6rqpnzgf"; depends=[Biostrings GenomicRanges IRanges ShortRead]; }; + RTCA = derive2 { name="RTCA"; version="1.30.0"; sha256="0y2vrqfr4qjgsq8f82a5xnfhm835wi5zqf1xlxrv4mpxm9f9jr38"; depends=[Biobase gtools RColorBrewer]; }; + RTCGA = derive2 { name="RTCGA"; version="1.8.0"; sha256="1x4kms2f7zskxqskzdi9q8adwxyi1w42kn5mj1skhgihdk5ai3b6"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; }; + RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.8.0"; sha256="0r3j9ky44gfpm1qz95la23j93khd00rcg6nz20dkvrfzsdqkixah"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges httr IRanges limma plyr RaggedExperiment RCircos RCurl RJSONIO S4Vectors SummarizedExperiment survival XML]; }; + RTN = derive2 { name="RTN"; version="2.2.0"; sha256="0h7dd0zn7fiy22ab65fh47vi5j312r6rc8c43zh4f7c3cx3ls53s"; depends=[car data_table igraph IRanges limma minet RedeR S4Vectors snow]; }; + RTNduals = derive2 { name="RTNduals"; version="1.2.0"; sha256="055milw62gndj13z0gpzi5f9zjxsnhdg8rvfm5msiyivay2ms7ki"; depends=[RTN]; }; + RTNsurvival = derive2 { name="RTNsurvival"; version="1.2.0"; sha256="072hv2b6s9k6s8bp23sq3frq8h5wx2kr4jz1j2kyih17psa5kpkb"; depends=[png RColorBrewer RTN RTNduals survival]; }; + RTopper = derive2 { name="RTopper"; version="1.24.0"; sha256="18ncjfwm1rsxrxz32n5z1a88rn0z8hlrksxlm9ninhl4igas0661"; depends=[Biobase limma multtest]; }; + RUVSeq = derive2 { name="RUVSeq"; version="1.12.0"; sha256="0hkvj1gb11ci2ywqbqdfydx9pm0wchja2lbwkqjvw2svqmc9clww"; depends=[Biobase EDASeq edgeR MASS]; }; + RUVcorr = derive2 { name="RUVcorr"; version="1.10.0"; sha256="0nhpz89x4z4dgdxynrxbpdaxbhnxk86ychnmln3vk5b9fp3yj3v2"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; + RUVnormalize = derive2 { name="RUVnormalize"; version="1.12.0"; sha256="071p0wc0y38j2rvbbqzr6i5i2rvmmxdc3yj2fggvlbwbq2k4dfpx"; depends=[Biobase RUVnormalizeData]; }; + RVS = derive2 { name="RVS"; version="1.0.0"; sha256="1m0w3cp5395sh43b05kc7067wyvmqlq6kiczp0b868392bhaq8hs"; depends=[gRain kinship2 snpStats]; }; + RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.2.5"; sha256="05zl433y8bagqvf1672zjdwxlp39g2f3qmv12xycrmgz5gs43d53"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; + RamiGO = derive2 { name="RamiGO"; version="1.23.0"; sha256="0dmr58masqca38z412lh2kfi1g498ifyz8bwy7kbk6ybjhxvklmv"; depends=[graph gsubfn igraph png RCurl RCytoscape]; }; + RankProd = derive2 { name="RankProd"; version="3.4.0"; sha256="186aadri7p4fnf76cjgi2r1ic51dicks5alfw4hzx0dzi2hyy606"; depends=[gmp Rmpfr]; }; + RareVariantVis = derive2 { name="RareVariantVis"; version="2.6.0"; sha256="1c1miqsrvf89dygg8m2axdq995axylhhdyi1gvig368l17vvcgsp"; depends=[BiocGenerics BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores googleVis gtools IRanges phastCons100way_UCSC_hg19 S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; + Rariant = derive2 { name="Rariant"; version="1.14.0"; sha256="1kfw2gfvdgzi5ldarmmwnksgg256vfaripcridlsb2pgwzay52k4"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; }; + RbcBook1 = derive2 { name="RbcBook1"; version="1.46.0"; sha256="0qj8zvhq9cq3akdl6zpspvvz9jlvc0lxrn4ap7qd984406jihyg4"; depends=[Biobase graph rpart]; }; + Rbowtie = derive2 { name="Rbowtie"; version="1.18.0"; sha256="0v3x9i6wmps7x0zpvgimzfwarg4246nbk4cpa1kim46r5jkl5m4v"; depends=[]; }; + Rbowtie2 = derive2 { name="Rbowtie2"; version="1.0.2"; sha256="1cc2z55qzp3psnhii0d71dmb71d0s3wzl8dsyxyxcr95clp4irsi"; depends=[]; }; + Rcade = derive2 { name="Rcade"; version="1.20.0"; sha256="0awsdg6wfm6hykj96s8cgz2mhn2i4jl1yabg7xfj0nmd776gv5fa"; depends=[baySeq GenomeInfoDb GenomicAlignments GenomicRanges IRanges plotrix rgl Rsamtools S4Vectors]; }; + Rchemcpp = derive2 { name="Rchemcpp"; version="2.16.0"; sha256="1k5rgk944x0xy0y7l4fba1gfbiq6vnpbgmwwm520vv061v9g72nz"; depends=[ChemmineR Rcpp]; }; + RchyOptimyx = derive2 { name="RchyOptimyx"; version="2.18.0"; sha256="0lghahggrh3142rn9f2rnh517740d62bh7rc97zd2sjk3rfdb761"; depends=[flowType graph Rgraphviz sfsmisc]; }; + Rcpi = derive2 { name="Rcpi"; version="1.14.1"; sha256="1g19arw0j0h02mfvlcilhy305ksy25x8y6v4qyvfbbspj9nccn0l"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; }; + Rdisop = derive2 { name="Rdisop"; version="1.38.0"; sha256="1s77iw418g5fchpjl590cn97yhpcp9rhynwnckiqpyyyd8bg31i4"; depends=[Rcpp RcppClassic]; }; + ReQON = derive2 { name="ReQON"; version="1.24.0"; sha256="0fsg0y2kxzkcfa6yv79w4swnw3ymjw3rbzw458a39npmavxvl08l"; depends=[rJava Rsamtools seqbias]; }; + ReactomePA = derive2 { name="ReactomePA"; version="1.22.0"; sha256="0zckjs3w0pvk64g2wf5awc6npd43irv7ac38c5v3jy13lh0p4kc2"; depends=[AnnotationDbi DOSE graphite igraph reactome_db]; }; + ReadqPCR = derive2 { name="ReadqPCR"; version="1.24.0"; sha256="1aapiyx6qx8bcx6qvr9ljg0nin2dnxlpvsm3n935d2riq94ah492"; depends=[affy Biobase]; }; + RedeR = derive2 { name="RedeR"; version="1.26.0"; sha256="03gf09mawc8ps8bx32vh2xgwqhha6gb9cm9yz1g78650mj7sanxc"; depends=[igraph]; }; + RefNet = derive2 { name="RefNet"; version="1.14.0"; sha256="1ssqj0jym17pawi3vh4y38fqj1sv59sq1sb4dsvlhkcf7c8lp33d"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; }; + RefPlus = derive2 { name="RefPlus"; version="1.48.0"; sha256="0px6s5r72s1yscvy2k7fkgliy86z1wq7q8yfc0yjj8kj9qyi0wmy"; depends=[affy affyPLM Biobase preprocessCore]; }; + Repitools = derive2 { name="Repitools"; version="1.24.0"; sha256="1aynhawn0fssm0haqqm7y22q8sky7an5gdnixalr7yykrnyy9wia"; 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.17.3"; sha256="0r0dp3s87q2706rqck2120bmq9nnmbfkxf8yyrm2i4zvkpay18yd"; 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.22.0"; sha256="1y9nyjffa9644jch0p2i3w302fmnyc2kb0c3z1f3d5zp1p4qmyqv"; depends=[graph]; }; + Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.0.0"; sha256="0kkc4rprjbqn2wvbx4d49kk9l91vihccxbl4843qr1wqk6v33r1w"; depends=[]; }; + Rhtslib = derive2 { name="Rhtslib"; version="1.10.0"; sha256="1dw3p44bfr0m7w39ckc2k37sjcp1zz0b9g12mr8am15jaj6v0q2j"; depends=[zlibbioc]; }; + RiboProfiling = derive2 { name="RiboProfiling"; version="1.7.2"; sha256="0yygf098phiakaj8c74c337gbwpd0dh4haabbg2qq1k0qjw4prmp"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; }; + Ringo = derive2 { name="Ringo"; version="1.42.0"; sha256="174zcz86x43yrg9wl1wwdhammgyxhfc3aqas3yqgrdq7vdsnxzxq"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; }; + Risa = derive2 { name="Risa"; version="1.20.0"; sha256="10ypbd9qwh1rk27fwm8naf3gl05w9zlw79qyr55pk5m6x5lnn9cb"; depends=[affy Biobase biocViews Rcpp xcms]; }; + Rmagpie = derive2 { name="Rmagpie"; version="1.34.0"; sha256="1hvv8pps0q7xnsl33rammqvyj191j5gs78r2333jgscxnw4byqb7"; depends=[Biobase e1071 kernlab pamr]; }; + RmiR = derive2 { name="RmiR"; version="1.34.0"; sha256="10n8i7qirbd8xrb73ccxyj7c6bi1szx263nwjh8w2j9x4dgzx22x"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; }; + RnBeads = derive2 { name="RnBeads"; version="1.10.8"; sha256="1kawb781y7pscbmll69pzk4gnb0xz3s8llj3icy3c8y0arkg98xz"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr S4Vectors]; }; + RnaSeqGeneEdgeRQL = derive2 { name="RnaSeqGeneEdgeRQL"; version="1.1.0"; sha256="06i2fy89wck0jhpc174d81ka7jim8gjamjk0ym1j0fh3ldiw9yvm"; depends=[edgeR GO_db gplots org_Mm_eg_db]; }; + RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.10.0"; sha256="1r0bn121bf5fcp4im4hm2c6rccgf7fb1vvxj2iri8ippc2k60d2c"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; }; + Rnits = derive2 { name="Rnits"; version="1.12.0"; sha256="00ddzbjms9wpiinc021s4b50wbzdafnml96ngsmi7rd8ipr3k3vp"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; }; + Roleswitch = derive2 { name="Roleswitch"; version="1.16.0"; sha256="1jp55lkfwwx08rbdkp5324ziwn5b3pzrcidk18zpplgwn4c6jsk9"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; }; + RpsiXML = derive2 { name="RpsiXML"; version="2.20.0"; sha256="0svh7fdl957q47jqc5q8sysvghs5anhj61r3zcapikbbi19x8j4i"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; }; + Rqc = derive2 { name="Rqc"; version="1.12.0"; sha256="11l72jympxbb156llifc5qa1zx34774b0waqq3nyv351bqm2l5c8"; 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.30.0"; sha256="0pjny5fjvbnfdyhl3bwxin678sha2drvs00sivxh3l772cn6yams"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; }; + Rsubread = derive2 { name="Rsubread"; version="1.28.1"; sha256="1fvk88jmvx987hifj3j6lrvwpma66vqmvszphgsfvy6nq4j2wnr0"; depends=[]; }; + Rtreemix = derive2 { name="Rtreemix"; version="1.40.0"; sha256="1h7frl1zgkzvrfjzdc6l2xybhp68pizdi7vix012m3imfs97sj25"; depends=[Biobase graph Hmisc]; }; + S4Vectors = derive2 { name="S4Vectors"; version="0.16.0"; sha256="03s8vz33nl6mivjb7dbvj702dkypi340lji1sjban03fyyls0hw0"; depends=[BiocGenerics]; }; + SAGx = derive2 { name="SAGx"; version="1.52.0"; sha256="1fjyhs3isbzp4fk460gk4xfqs62ha9vra8blzbkng3r86axarlgd"; depends=[Biobase multtest]; }; + SANTA = derive2 { name="SANTA"; version="2.16.0"; sha256="12l03j2vh74n8lbvdr436qylaxhj3ysqg0m7crl9l30kpzg4agcv"; depends=[igraph Matrix snow]; }; + SBMLR = derive2 { name="SBMLR"; version="1.74.0"; sha256="0l2c0irfk50kiz22w8gzzsanh3dv5bpqrzfy1ba6bw5ghs066j65"; depends=[deSolve XML]; }; + SC3 = derive2 { name="SC3"; version="1.7.7"; sha256="1x9x450qnaw94px9b861zyxyyfxxbclw1bq765adfixgrlakyw1w"; depends=[BiocGenerics cluster doParallel doRNG e1071 foreach ggplot2 pheatmap Rcpp RcppArmadillo robustbase ROCR rrcov S4Vectors shiny SingleCellExperiment SummarizedExperiment WriteXLS]; }; + SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.20.0"; sha256="1fgkrr6303b0hn9rdkry3rd7yskqanmxy74akxgk4nkjwf817rra"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; }; + SCnorm = derive2 { name="SCnorm"; version="1.0.0"; sha256="0vpwca5gbhdm1g1xsb9451z2cvqr9c85z79whq011d52adz5fmr6"; depends=[BiocParallel cluster data_table forcats ggplot2 moments quantreg S4Vectors SummarizedExperiment]; }; + SELEX = derive2 { name="SELEX"; version="1.10.0"; sha256="0f81sa0azbh7n7vg39865pv923k2sza7md713g5fkn78vrx5q645"; depends=[Biostrings rJava]; }; + SEPA = derive2 { name="SEPA"; version="1.8.0"; sha256="0g0gqwgsn8bp9mz40dbqb4f785mhwcmb5y4jsgj16i5pv0ll59a7"; depends=[ggplot2 org_Hs_eg_db org_Mm_eg_db reshape2 segmented shiny topGO]; }; + SGSeq = derive2 { name="SGSeq"; version="1.12.0"; sha256="0wbwyr4nckjkafc1h80a0isz27lyg87r42ym4zs6nmpj0p3xv94q"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; }; + SICtools = derive2 { name="SICtools"; version="1.8.0"; sha256="0n3m3435wa95mld4b57hr31rfhlk41yw1qqi1jdnybkqgdndpqf8"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; }; + SIM = derive2 { name="SIM"; version="1.48.0"; sha256="1n207w5idd2v515v8ppsfx7q1wvn2zxy6if7dp2hpr0x2qvxijnf"; depends=[globaltest quantreg quantsmooth]; }; + SIMAT = derive2 { name="SIMAT"; version="1.10.0"; sha256="0gd99p8kjf1wn0xygdyppxgddp9bnp3a3grg8za2mmm8xv5r990h"; depends=[ggplot2 mzR Rcpp reshape2]; }; + SIMLR = derive2 { name="SIMLR"; version="1.4.0"; sha256="1sfd32qd39wy8a1206xkazbmvkqwhs09p7fhdn8n59xf56914pfa"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; }; + SISPA = derive2 { name="SISPA"; version="1.8.0"; sha256="18v8fw3l4pxh4fi18fhnqxbd1hlhp2w36s31vf58ffldq3bz1bpb"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; }; + SLGI = derive2 { name="SLGI"; version="1.38.0"; sha256="1p0lwzmzz820npnsw9sk6x12innc39qv0ja0di7rplkmsi60z92j"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; }; + SLqPCR = derive2 { name="SLqPCR"; version="1.44.0"; sha256="16kvssib1j4d5cn3b350ip2m9m7fcsgm1mgq13wbfnwcd6sx52kb"; depends=[]; }; + SMAP = derive2 { name="SMAP"; version="1.42.0"; sha256="0n2f1qib0k9rxdizmrazxp2wnf6ycaz90b0vzszvakawc9np36dq"; depends=[]; }; + SMITE = derive2 { name="SMITE"; version="1.6.0"; sha256="1s5gsgf878996hvd15gbjas7lyxlsw7s4xxcpcmgnlzq1dxyq0ma"; 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.18.0"; sha256="0315x8dl21i9zysp55nmjikha9fxykw8lzba4bk7gf0bc0947i26"; depends=[SNAGEEdata]; }; + SNPRelate = derive2 { name="SNPRelate"; version="1.12.2"; sha256="05x0jjybzkyvjc9sq590hg2lc6fjxqmnlvgvwc0d7pyri5pa4rki"; depends=[gdsfmt]; }; + SNPchip = derive2 { name="SNPchip"; version="2.24.0"; sha256="1z0708rqn9h9ajmdqv44y2yl0gqqg9gy1h5yj3wzjpj4dgy5d4l0"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses S4Vectors SummarizedExperiment]; }; + SNPediaR = derive2 { name="SNPediaR"; version="1.4.1"; sha256="083i242x2a133wgpbi6plw7hs426b4qsgl7792akr0fm965mnna5"; depends=[jsonlite RCurl]; }; + SNPhood = derive2 { name="SNPhood"; version="1.8.0"; sha256="082fwmzdjwgn2x33isi81a05l557367ham162li3q76g2jfcmh7r"; 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.18.0"; sha256="05gpj1fykiw8xjcbd6splqkb8jsyksnhzl6g6pzinpbczhslq55a"; depends=[Biobase Rsolnp]; }; + SPIA = derive2 { name="SPIA"; version="2.30.0"; sha256="0m2vv6zj0vgd98w2jrlbwbyn998ml2i2wr9160gmq5h77rn91xq3"; depends=[KEGGgraph]; }; + SPLINTER = derive2 { name="SPLINTER"; version="1.4.0"; sha256="06xamivcwlpwj6n8c3wzgd5ykh21q2mrdl7zz1bnicq5npha99l9"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges plyr S4Vectors seqLogo]; }; + SPONGE = derive2 { name="SPONGE"; version="1.0.2"; sha256="100gbcysmf3fhn22zmvvx2sck6hhfgc7ar782l822vbsig1vnyk9"; depends=[bigmemory Biobase data_table doRNG expm foreach glmnet gRbase igraph iterators logging MASS ppcor]; }; + SQUADD = derive2 { name="SQUADD"; version="1.28.0"; sha256="1z139p0xbaq4gvd9acxnd8dlapdsiaab1fj10pc7wx2iz4dj9zd6"; depends=[RColorBrewer]; }; + SRAdb = derive2 { name="SRAdb"; version="1.40.0"; sha256="18aayqid2fhhkjf7anlk34qw3fj3byxsxcrw2lmq4s4mqq06k5vh"; depends=[GEOquery graph RCurl RSQLite]; }; + SRGnet = derive2 { name="SRGnet"; version="1.4.0"; sha256="1a2as38svd6vp6pdllir4gs6jqicg7n7ya42ffjgiy2rpnyijbci"; depends=[DMwR EBcoexpress gbm Hmisc igraph limma MASS matrixStats pvclust]; }; + SSPA = derive2 { name="SSPA"; version="2.18.0"; sha256="0dq4j299yjg5wq40f3qdm8hi0vv6zg1d04hml1rw25s1ws2pngyj"; depends=[lattice limma qvalue]; }; + STAN = derive2 { name="STAN"; version="2.6.0"; sha256="09aal6p3sdbvcp6dkrj533x3m1qxxrkgsk35j9idz643vv133xjp"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; }; + STATegRa = derive2 { name="STATegRa"; version="1.12.0"; sha256="08k2chi5cgpj2xxi16jzc3prsp3qpwwq0f4wrqzd9rwj6f9afwk5"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; }; + STRINGdb = derive2 { name="STRINGdb"; version="1.18.0"; sha256="0hrhjx4cpl2zp2chgyw0ayadsv8g1nnarn7gyxni76ci4wayh7bf"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; }; + STROMA4 = derive2 { name="STROMA4"; version="1.2.0"; sha256="06g2p52mgc3f9hzyqcjbcfvk28fx6ynf3c9gbwvchibjaiqdy1sh"; depends=[Biobase BiocParallel cluster matrixStats]; }; + SVAPLSseq = derive2 { name="SVAPLSseq"; version="1.4.0"; sha256="190r34lir810hla9wp3pwl3w2yvw5x532988vyvjzl49wdhq535n"; depends=[edgeR ggplot2 limma lmtest pls SummarizedExperiment]; }; + SVM2CRM = derive2 { name="SVM2CRM"; version="1.10.0"; sha256="0v4qgs4bmi44i36pm5y7bdkjiwj853738j8f7rxzqnp3y8nbbwjn"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash SVM2CRMdata verification zoo]; }; + SWATH2stats = derive2 { name="SWATH2stats"; version="1.8.1"; sha256="1hd4gxb2p81v2d9x4zw0asfm7r9s0wq2flnpl9g7r9fxm2yfi339"; depends=[data_table ggplot2 reshape2]; }; + SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.32.0"; sha256="0n1pjpgdsisq4zv9dny3bfzjz3ga1cibh2gmm5irplfxgpcdlnqa"; depends=[]; }; + ScISI = derive2 { name="ScISI"; version="1.50.0"; sha256="0ssyx32bcaz40yr9iraczk9p53ymia4m8nfsmzxzr804fyz8hnvw"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; }; + Scale4C = derive2 { name="Scale4C"; version="1.0.0"; sha256="035fyjswn23s6az36j5b94b1aj31n6yb5w243bqqwvqrl2kqhkdv"; depends=[GenomicRanges IRanges smoothie SummarizedExperiment]; }; + SemDist = derive2 { name="SemDist"; version="1.12.0"; sha256="1h3ld34h61sx228ix68sg86y3w9mzh3iq1gdri0lbixvhzx9w25b"; depends=[annotate AnnotationDbi GO_db]; }; + SeqArray = derive2 { name="SeqArray"; version="1.18.2"; sha256="05w051i63af4akr6zna9w14bdyi06bpif0vab9yvf6iwq2ag72kz"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SeqGSEA = derive2 { name="SeqGSEA"; version="1.18.0"; sha256="1vaqa6jkvwxpbqnz9wz3i6p26mky6d7d704cjv5as67j04v99b2a"; depends=[Biobase biomaRt DESeq doParallel]; }; + SeqSQC = derive2 { name="SeqSQC"; version="1.0.0"; sha256="0qj1y9zsjxkh08jkw80hl62072viincq1pvcz9r3i0m28nhk7pg5"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; }; + SeqVarTools = derive2 { name="SeqVarTools"; version="1.16.0"; sha256="14n70xzj91f4rshl0kx549rqzy9rrv5mv0b0xvj891i8anxahb2n"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray tidyr]; }; + ShortRead = derive2 { name="ShortRead"; version="1.36.1"; sha256="1cyv47632m9ljkxfsvnvmd19sb607ys5kz8fwh6v39dnw16g0a6m"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; }; + SigCheck = derive2 { name="SigCheck"; version="2.10.0"; sha256="1k2xmb7jcjbdxafr8fspf9pbc0jwcll914lqc42gvhhjq6rnf8q4"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; }; + SigFuge = derive2 { name="SigFuge"; version="1.16.0"; sha256="0ddy6bayb05gsgh06p5awhjwyx57z0l8fb5x6p0dci2fgzy6gr4f"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; }; + SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.16.0"; sha256="0jkd78wl5ksm05qjmsx7s8aznh3kfpi34yvxaxv763pqjqzkxa82"; depends=[Biobase limma mclust Ringo]; }; + SingleCellExperiment = derive2 { name="SingleCellExperiment"; version="1.0.0"; sha256="1r276i97w64a5vdlg6952gkj7bls909p42zl8fn8yz87cdwyaars"; depends=[BiocGenerics S4Vectors SummarizedExperiment]; }; + SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.14.0"; sha256="107ykkkfy4xpvaflqpsbxkbw5514pxkicffpr24p3x5lj5zp6b8h"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; }; + SpacePAC = derive2 { name="SpacePAC"; version="1.16.0"; sha256="1dc8z66kzn6lxrc2xz3kyl7fjxy0i0gvjgxc9w3fqvdhkxqp7k6n"; depends=[iPAC]; }; + SpeCond = derive2 { name="SpeCond"; version="1.32.0"; sha256="1k54zxj224fshnx76hsjxkwaj9vb6387ssgpr0v3zgnf7p4zf4sx"; depends=[Biobase fields hwriter mclust RColorBrewer]; }; + SpidermiR = derive2 { name="SpidermiR"; version="1.8.2"; sha256="144rfrp55cbcqjnlv93mannfvk33wrxw2sxf5yabs75y2hvi63ri"; depends=[AnnotationDbi gdata ggplot2 gplots gridExtra httr igraph lattice latticeExtra miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; }; + SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.18.0"; sha256="1pvi2vc5jca4mpangyfllbh5h16015kmcdrwhs32a25wp0fpqhq3"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; }; + StarBioTrek = derive2 { name="StarBioTrek"; version="1.4.0"; sha256="137y50vxz2jd8lmb7zx3f25by0imzvarimrpfxg7v6marcgpd3nj"; depends=[AnnotationDbi e1071 igraph KEGGREST org_Hs_eg_db ROCR SpidermiR]; }; + Starr = derive2 { name="Starr"; version="1.34.0"; sha256="0wqcp98v2isy2bnq3qyf5v5lzy19kap2i6qbi9d5mlaxqjrq5afq"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; }; + Streamer = derive2 { name="Streamer"; version="1.24.0"; sha256="1bmjvg2lb9qmh0fffgkw4wpmjv5rg9iwqhmxz30ciiw8vw6xcklq"; depends=[BiocGenerics graph RBGL]; }; + SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.8.1"; sha256="19vlwnby83fqjrilsxvnvgz0gvby7mrxvlmx18nb3p1w591ddfjh"; depends=[Biobase BiocGenerics DelayedArray GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors]; }; + Sushi = derive2 { name="Sushi"; version="1.16.0"; sha256="0axaqm480z8d0b2ldgxwm0swava1p4irc62bpl17p2k8k78g687g"; depends=[biomaRt zoo]; }; + SwathXtend = derive2 { name="SwathXtend"; version="2.0.0"; sha256="1v8mil305503cpspwk9zln3csv2f1h72afjdddpzks9didq5i3xf"; depends=[e1071 lattice openxlsx VennDiagram]; }; + SwimR = derive2 { name="SwimR"; version="1.16.0"; sha256="033hh3bpkn6qladvn7iz0fvrbphffzy1rkvmi0j32v9n9h88lizz"; depends=[gplots heatmap_plus R2HTML signal]; }; + TCC = derive2 { name="TCC"; version="1.18.0"; sha256="10nmha786k85jr93vbnlsxkrr2wiykxa5rl2z5ry49w14fis82m5"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; }; + TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.6.12"; sha256="0pih8jpzffsjlhamfpvgcapa48dq2m86f4hxqr5m5z4vgjd7j1mv"; depends=[biomaRt circlize ComplexHeatmap ConsensusClusterPlus data_table doParallel downloader dplyr EDASeq edgeR genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel ggthemes gridExtra httr IRanges jsonlite knitr limma matlab plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr stringr SummarizedExperiment survival survminer sva tibble XML xml2]; }; + TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.4.2"; sha256="1g81w346lvws8bcm8w94b1r3jjr1zfg5ln80p0rq69gzv9hkdjyw"; depends=[clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel maftools pathview plotly readr shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks]; }; + TCseq = derive2 { name="TCseq"; version="1.2.0"; sha256="07wbp4caw18g1mf5h40i1c1y7jadfqmx3p7a8zz5rjjibsfa2bw1"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; }; + TDARACNE = derive2 { name="TDARACNE"; version="1.28.0"; sha256="0agzpgz39ya46kgnz95ff2h0hml2mb14fb3pdj218adas24zq9jf"; depends=[Biobase GenKern Rgraphviz]; }; + TEQC = derive2 { name="TEQC"; version="3.18.0"; sha256="0rnqlk677hcf2w3whc9gdqm21gjqf4rsanaw8a847jc7li8isnpj"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; }; + TFARM = derive2 { name="TFARM"; version="1.0.0"; sha256="050hpw7xaw7di6m9lgb1ac6cnp3lcv4f9l9d9r3rm1i42q51l8gs"; depends=[arules fields GenomicRanges stringr]; }; + TFBSTools = derive2 { name="TFBSTools"; version="1.16.0"; sha256="0sivvbqmw5psciyzm5dyyjq9bpcvnhxz8kxis3zgkm9mmjgx84hy"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DBI DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; }; + TFHAZ = derive2 { name="TFHAZ"; version="1.0.0"; sha256="0kxri2yv12pc9hq55i7qcjlk64p7w0i9kgbf2im2rzlbdb8xc3cm"; depends=[GenomicRanges IRanges S4Vectors]; }; + TIN = derive2 { name="TIN"; version="1.10.0"; sha256="16lv7k4js3zbak0b1m2mlimd1f56gif3vlm2hpc5vx1y315mz9gd"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; }; + TMixClust = derive2 { name="TMixClust"; version="1.0.1"; sha256="1mv9hv5hjg55mwbp824n5b74w8zcb9sv8a1wa6hxmfb00n6wcr4h"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; }; + TPP = derive2 { name="TPP"; version="3.6.0"; sha256="1gma7lfnq1ybcqnl9536wv22advjaqxmysfgamrgn38zwbcwhdi9"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown sme stringr tidyr VennDiagram VGAM]; }; + TRONCO = derive2 { name="TRONCO"; version="2.10.0"; sha256="1lvzfx75z50r8kd3yrcjwzvsg16yi5644rz90bm1l6hpkmw2wcpf"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; }; + TReNA = derive2 { name="TReNA"; version="0.99.10"; sha256="1yiq953w6830v1fba4gglnf485m6lis11qlpp9g1jw0x4s0rpg70"; depends=[DBI doParallel flare foreach GenomicRanges glmnet lassopv randomForest RPostgreSQL RSQLite vbsr]; }; + TSCAN = derive2 { name="TSCAN"; version="1.16.0"; sha256="0m88r5yg46ra8k6ymzfrk68fqbg2y47kshzgj5flblbay079hnxg"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; }; + TSRchitect = derive2 { name="TSRchitect"; version="1.4.0"; sha256="0qymyjmzpi1n5fpyzw8riz32kwsc2bi1cw3sx9sxvpvhjk45dmyx"; depends=[AnnotationHub BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + TSSi = derive2 { name="TSSi"; version="1.24.0"; sha256="03i7nnqnbhjpyx8z8gpwysrgi9ln89pgdqaisyk0cmxrsnpp9wxa"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; }; + TVTB = derive2 { name="TVTB"; version="1.4.0"; sha256="1p167jjcmsfh2y1wlc5r9j7i4cpdq3kjjnykcq4if737d3xyw15b"; depends=[AnnotationFilter BiocGenerics BiocParallel Biostrings ensembldb ensemblVEP GenomeInfoDb GenomicRanges GGally ggplot2 Gviz IRanges limma reshape2 Rsamtools S4Vectors SummarizedExperiment VariantAnnotation]; }; + TarSeqQC = derive2 { name="TarSeqQC"; version="1.8.0"; sha256="0xpsjl470sa0kvmi3yz25fx9j657d19cbspxxy9vhpr60wyfahpp"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 Hmisc IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; }; + TargetScore = derive2 { name="TargetScore"; version="1.16.0"; sha256="1davh5chqz8y94ddpzmnjh79m5678yxjk120bfl7857y888ywhc7"; depends=[Matrix pracma]; }; + TargetSearch = derive2 { name="TargetSearch"; version="1.34.0"; sha256="03ndkhwzgbr005v6m6wppylcg862nnfb69fgmjm9nfxrp70vviy6"; depends=[ncdf4]; }; + TitanCNA = derive2 { name="TitanCNA"; version="1.16.0"; sha256="00xf005mndqx79y8w6c10p02xyshjv0cmd3wxib73d2s1ns482s6"; depends=[data_table dplyr foreach GenomeInfoDb GenomicRanges IRanges Rsamtools VariantAnnotation]; }; + TnT = derive2 { name="TnT"; version="1.0.1"; sha256="110h66824anbgsbw3cp74yzlka1v8wmkz6fhgs3n51iz6qikk6f9"; depends=[Biobase data_table GenomeInfoDb GenomicRanges htmlwidgets IRanges jsonlite knitr S4Vectors]; }; + ToPASeq = derive2 { name="ToPASeq"; version="1.11.0"; sha256="1qbx2n8zlmb5gvmy8r91hxli268vbvd4a5blzl2jwa1v3fb09rim"; 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.22.0"; sha256="1306l12khnd5xnaimf4rk85nylik4im95f1m56p44rpmhgs33gq6"; depends=[BiocGenerics GenomicRanges gplots IRanges Rsamtools S4Vectors zlibbioc]; }; + TurboNorm = derive2 { name="TurboNorm"; version="1.26.0"; sha256="0ayn3my5n78y91sj8z92vxj8s7i8jlhh9nbwqf4b541p5xvbc2sd"; depends=[affy convert lattice limma marray]; }; + TypeInfo = derive2 { name="TypeInfo"; version="1.44.0"; sha256="05q3h91vhbmp9irvsc1mgwkilzqz87wc6cbk78kk979s225fsqis"; depends=[]; }; + UNDO = derive2 { name="UNDO"; version="1.20.0"; sha256="0i0xdc74mmarr57fk15c4iyq9pm2zgic8ini0ldbk1hx5ci3if6x"; depends=[Biobase BiocGenerics boot MASS nnls]; }; + UniProt_ws = derive2 { name="UniProt.ws"; version="2.18.0"; sha256="071qmc0jy58wabxwqrv6w4rlg42xj5rzb12ji56a5pdsh1j2nrfw"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; }; + Uniquorn = derive2 { name="Uniquorn"; version="1.6.0"; sha256="05cy9yfw4qb5drxjmisahcca729vdqb6l9qfmrar897bwm2kwb7h"; depends=[BiocParallel DBI R_utils RSQLite stringr WriteXLS]; }; + VanillaICE = derive2 { name="VanillaICE"; version="1.40.0"; sha256="14swl2fvi56583zmqsfwd5kxvzdn2xm9rf1b0x0r7nn62hkzdmp2"; 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.24.5"; sha256="07ywn3c4w83l3sr76d0z3b1nv9icgdh3phsjlc6cfx7i6nfmvxw2"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; }; + VariantFiltering = derive2 { name="VariantFiltering"; version="1.14.0"; sha256="1w959g9iyqiijzr8w3xf4i1pb2jjasyvzwrvyhjymn3xgj7hqiab"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores graph Gviz IRanges RBGL Rsamtools S4Vectors shiny SummarizedExperiment VariantAnnotation XVector]; }; + VariantTools = derive2 { name="VariantTools"; version="1.20.0"; sha256="1ma1qs9n606a5gjcm8l9fna8vfg5f8ixdzriwaalhys22pyjgqsy"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; + Vega = derive2 { name="Vega"; version="1.26.0"; sha256="1kya7h7xa47d7l3svkpnkwjg49izpjfird5fjja6490ynr1a55yd"; depends=[]; }; + VegaMC = derive2 { name="VegaMC"; version="3.16.0"; sha256="1lmgmaf4andfxv2z4h2pahyggnic5wj61llzkm8q4k0q7i50l63i"; depends=[Biobase biomaRt genoset]; }; + XBSeq = derive2 { name="XBSeq"; version="1.8.0"; sha256="07123c1wd3l7lj29kaa0d83dlv7zsrx8gk8aag7g0h8k9vlhcni4"; depends=[Biobase DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; }; + XDE = derive2 { name="XDE"; version="2.24.0"; sha256="11g74znfafp03q710mhmzgxap6f7j04b75jhm7x6lmd6cbwqh25p"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools MergeMaid mvtnorm RColorBrewer siggenes]; }; + XVector = derive2 { name="XVector"; version="0.18.0"; sha256="1i4i3kdxr78lr1kcxq657p11ybi7kq10c8kyaqyh6gfc8i9rhvmk"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; }; + YAPSA = derive2 { name="YAPSA"; version="1.4.0"; sha256="0jv940xdqrbb8hw13nm6cky767zn9k8wh6sh5vz5b7hgh7c75kww"; depends=[circlize ComplexHeatmap corrplot dendextend GenomeInfoDb GenomicRanges GetoptLong ggplot2 gridExtra gtrellis KEGGREST lsei PMCMR reshape2 SomaticSignatures VariantAnnotation]; }; + a4 = derive2 { name="a4"; version="1.26.0"; sha256="1fvnpk4bqvglqq04mykk7k57f52phmv8b77mn33hd0lli0ym9a90"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; }; + a4Base = derive2 { name="a4Base"; version="1.26.0"; sha256="0kj0svm9c7cbrdwm1wqj76jg9vkq34jqqq2b249ss44d17y1cr2s"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; }; + a4Classif = derive2 { name="a4Classif"; version="1.26.0"; sha256="1i14390103kzafbk5ark9n7svw78jm1pkcv4dwwz8q3ibywanyyz"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; }; + a4Core = derive2 { name="a4Core"; version="1.26.0"; sha256="1sbg7aaprmkw381y2b3mjw7fsl0p8xy3gciwfysc4f2fxmxcq51y"; depends=[Biobase glmnet]; }; + a4Preproc = derive2 { name="a4Preproc"; version="1.26.0"; sha256="058fjw1l82gmk50kjxsy98zxc22fy1k9cj7bk45dxf5ahzpklg0b"; depends=[AnnotationDbi]; }; + a4Reporting = derive2 { name="a4Reporting"; version="1.26.0"; sha256="1v21sqib2rmrgw2ij4vcb4hbiqybbn7b40x65594xygkridaw4vv"; depends=[annaffy xtable]; }; + aCGH = derive2 { name="aCGH"; version="1.56.0"; sha256="0878jpirklqlpl90qwcf6cj3jdiadcywk0ilhbiqcmdxlsf0w549"; depends=[Biobase cluster multtest survival]; }; + acde = derive2 { name="acde"; version="1.8.0"; sha256="0hfby7fdvvj0ip2r27z4c0i6ap18nh08c7gas8vrrrqbznprsqjg"; depends=[boot]; }; + adSplit = derive2 { name="adSplit"; version="1.48.0"; sha256="13bvql5kd6dz5gpwjyp1b91n8xr4kc9b3sy1m1g184452ccin5na"; depends=[AnnotationDbi Biobase cluster GO_db KEGG_db multtest]; }; + affxparser = derive2 { name="affxparser"; version="1.50.0"; sha256="1nyzr5277np3dqig4fpnhx6xqsswsrp7rmb6ll6gram47k9l2hf9"; depends=[]; }; + affy = derive2 { name="affy"; version="1.56.0"; sha256="0jmbkimma5ffsdkk3xp03g4lpz84gd95nkqakif2nqq6wmx0syrj"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; }; + affyContam = derive2 { name="affyContam"; version="1.36.0"; sha256="17sjgm12y66z22y442mg9dh1b4yivi6cz8gdm49q3szibxgjprv8"; depends=[affy affydata Biobase]; }; + affyILM = derive2 { name="affyILM"; version="1.30.0"; sha256="080z6cavmphrqh4y3cbf2cclzbljl7v2rwrcdsrz3h5pnisf064b"; depends=[affxparser affy Biobase gcrma]; }; + affyPLM = derive2 { name="affyPLM"; version="1.54.0"; sha256="04h7wvxcdqkwpywlbwycvm9l5az6z5hqw44s33vcx9xpnhbsw7q8"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; }; + affyPara = derive2 { name="affyPara"; version="1.38.0"; sha256="1jb80dlm3zmrfjq60y0gnb8530pma22b6zkd9crlczl120sfiybv"; depends=[affy affyio aplpack snow vsn]; }; + affyQCReport = derive2 { name="affyQCReport"; version="1.56.0"; sha256="0jdhswh8y7fj55k3c4lk9nfr8vqp41mvg0jla1rh7y0qjh0fkv4c"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; }; + affycomp = derive2 { name="affycomp"; version="1.54.0"; sha256="12ckmzi5z0gxccrycgprvd0hzz52ygryqszgbkxdnnrcwcgbb4x0"; depends=[Biobase]; }; + affycoretools = derive2 { name="affycoretools"; version="1.50.6"; sha256="11d5k4lnpsnm6aa5j3352l4cyfrlhigp2fnykkwkqwc7714a02mg"; depends=[affy AnnotationDbi Biobase BiocGenerics DBI edgeR gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools RSQLite S4Vectors xtable]; }; + affyio = derive2 { name="affyio"; version="1.48.0"; sha256="1pzzp3d3dbmyf34gvivfiprkpscn36rgvhrq853a1d3avcwr5ak9"; depends=[zlibbioc]; }; + affylmGUI = derive2 { name="affylmGUI"; version="1.52.0"; sha256="1k1wkiajdnkcfrvdmhjgc969hyq7gk53ni2khqcw8jqv9kqqa1r1"; depends=[affy affyio affyPLM BiocGenerics BiocInstaller gcrma limma R2HTML tkrplot xtable]; }; + affypdnn = derive2 { name="affypdnn"; version="1.52.0"; sha256="02js489yb6nni3i7jrl1zz0bm5xs6a47pb6nq72fmh1frwikx37w"; depends=[affy]; }; + agilp = derive2 { name="agilp"; version="3.10.0"; sha256="0yyvmlyxajad1f7fx91bsq3rbwm5i4vyr1vpp6y4vicaxmnlkas3"; depends=[]; }; + alpine = derive2 { name="alpine"; version="1.4.0"; sha256="16ip0pmdxm7bhnnk5z376miwqkl018m6wzdaxls7cszfv04alass"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph IRanges RBGL Rsamtools S4Vectors speedglm stringr SummarizedExperiment]; }; + alsace = derive2 { name="alsace"; version="1.14.0"; sha256="08jdjyjxc6r513zlk7nsrnydsg2fxsws77g1wq0gpcgwx8m7s697"; depends=[ALS ptw]; }; + altcdfenvs = derive2 { name="altcdfenvs"; version="2.40.0"; sha256="0fdy1yxgq9rnhgm17ml4wms56fsdmgr5hvqdjmpjslgwjn4922gk"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv S4Vectors]; }; + ampliQueso = derive2 { name="ampliQueso"; version="1.16.0"; sha256="1d3nyps5pa4s52mwnsqhlm4pddqanns003qggs2qidb5rcbvhd4m"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; }; + amplican = derive2 { name="amplican"; version="1.0.0"; sha256="1lv0xvfk2spcl23hn005w7c4iyvsbrqgpvc5rbw6nkrxzmay5g16"; depends=[BiocGenerics BiocParallel Biostrings clusterCrit data_table dplyr GenomeInfoDb GenomicRanges ggbio ggplot2 ggthemes gridExtra gtable IRanges knitr Matrix matrixStats rmarkdown S4Vectors ShortRead stringr waffle]; }; + anamiR = derive2 { name="anamiR"; version="1.6.1"; sha256="0mxpxangzbvx7rpzm4ak321pcgj6pa0nbslgvh8rplyz4sf6v0z6"; depends=[agricolae DBI DESeq2 gage gplots limma lumi RMySQL S4Vectors SummarizedExperiment]; }; + annaffy = derive2 { name="annaffy"; version="1.50.0"; sha256="0qprkcvq56h6dwcylqsa0dq0nmv5bk280j89cwa3brm4jfncs4hm"; depends=[AnnotationDbi Biobase DBI GO_db KEGG_db]; }; + annmap = derive2 { name="annmap"; version="1.20.0"; sha256="0q4lcx1j5av5jpn2wmarn7z32clzzdaprvpcagnvv453i11vp5bi"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; }; + annotate = derive2 { name="annotate"; version="1.56.1"; sha256="14c5xd9kasvcwg5gbjys2c1vizxhlqlzxakqc2kml0kw97hmx0rq"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; }; + annotationTools = derive2 { name="annotationTools"; version="1.52.0"; sha256="1kmhgasb26dbq10d4r8wig5pjlbiqcqsa12zpgcsasj8kvpr2gpd"; depends=[Biobase]; }; + annotatr = derive2 { name="annotatr"; version="1.4.1"; sha256="10izqb0x92fjpsycsyppvz6yidg8ssix452jfni692na7ih564y9"; 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.26.0"; sha256="1fvr9yvyf0m7m5dnfbzbm29kd1yqq78carv9v7xx60szi30w4lvq"; depends=[multtest qvalue]; }; + anota2seq = derive2 { name="anota2seq"; version="1.0.0"; sha256="1pcmjlnvx3g2209l54jcbw044k6iz9zch3l01d1vr1cxiqag8smh"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; }; + antiProfiles = derive2 { name="antiProfiles"; version="1.18.0"; sha256="03y6j3y0qvfzwbwzjgjsl5zlqayqj1400gj278m28l70l43ifnyg"; depends=[locfit matrixStats]; }; + apComplex = derive2 { name="apComplex"; version="2.44.0"; sha256="132j6gm70h8sma82jd566hrih7npa217h5r6kqx4lq5yw3dlqcs1"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; }; + apeglm = derive2 { name="apeglm"; version="1.0.3"; sha256="06j68szmxdr9c8qmmlcx85rv1hjl2rk52lagack83cr3q1gd10bj"; depends=[emdbook GenomicRanges SummarizedExperiment]; }; + aroma_light = derive2 { name="aroma.light"; version="3.8.0"; sha256="0crnk6851jwypqr5l5jcbbay0vi5vvdjyisaf6z2d69c39wmr6sc"; depends=[matrixStats R_methodsS3 R_oo R_utils]; }; + arrayMvout = derive2 { name="arrayMvout"; version="1.36.0"; sha256="0z35dyc1r4hn8bfmym5yi08s8mi9vn50pn0vvmggphzm25cwyln9"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; }; + arrayQuality = derive2 { name="arrayQuality"; version="1.56.0"; sha256="14q0a9my42ya21615l46pllcw4dlnmqi8nac0m4iimlpjm0ic7w6"; depends=[gridBase hexbin limma marray RColorBrewer]; }; + arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.34.0"; sha256="1rz3llx2ww5ngp7l2i1y4zxsjb8gsyhz1srs06s0asp49kq88qcv"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; }; + attract = derive2 { name="attract"; version="1.30.0"; sha256="0af0jiscz7s3i8k6p7ygihb6fflhk57alqmn15b42bcn9a5d31l8"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; }; + bacon = derive2 { name="bacon"; version="1.6.0"; sha256="1i6y1dfmnqv5n5nbhfmq4qvkivd88sfvlypsm4xs4jsb8ij0aq5y"; depends=[BiocParallel ellipse ggplot2]; }; + ballgown = derive2 { name="ballgown"; version="2.10.0"; sha256="10x49g1di4q134k1ialxb992lq3asg8qiib08a125la5yfwr179y"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; }; + bamsignals = derive2 { name="bamsignals"; version="1.10.0"; sha256="15id6mkj95skb4kfafvfs2j7ylydal60c3pspcl7llhwpq6vcqvl"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; }; + banocc = derive2 { name="banocc"; version="1.2.0"; sha256="0cc1kx01mpn1gg5ym6lij77zf0canricj0lchvx1vq5as6qazrbh"; depends=[coda mvtnorm rstan stringr]; }; + basecallQC = derive2 { name="basecallQC"; version="1.2.0"; sha256="1kvknsz0s35r5zfc4gn08jzl914l54pbn92cwxbnay598zfg0shz"; depends=[data_table dplyr DT ggplot2 knitr lazyeval magrittr prettydoc raster rmarkdown ShortRead stringr tidyr XML yaml]; }; + baySeq = derive2 { name="baySeq"; version="2.12.0"; sha256="1d918rmbzqncr7jw6byr3xyqybvcsgcyf96immqcl1c5xvgmqn5z"; depends=[abind edgeR GenomicRanges]; }; + beachmat = derive2 { name="beachmat"; version="1.0.2"; sha256="0b6dzja5fbx4dawb7ixj67mlhw4fy62pfp20mfp918fy96zmdwqz"; depends=[DelayedArray HDF5Array Rcpp rhdf5 Rhdf5lib]; }; + beadarray = derive2 { name="beadarray"; version="2.28.0"; sha256="0azcqszgggcllwpib8vh9zkl393hikc2qfaq9izprpdrnsb5amqi"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; }; + beadarraySNP = derive2 { name="beadarraySNP"; version="1.44.0"; sha256="15lr0mavyhnl0vzq4ndw2da6wxsvwrrrmrj9dzj1h8ml305m5r7w"; depends=[Biobase quantsmooth]; }; + bgafun = derive2 { name="bgafun"; version="1.40.0"; sha256="1s3k333y7hxxkblkivi58gpxzd58divi01xv8sqdl2grvw0zj9d4"; depends=[ade4 made4 seqinr]; }; + bgx = derive2 { name="bgx"; version="1.44.0"; sha256="0nbf0nnsv75a3zcwnl82wvg7ysbw8zsjk3zd7s5g61ma710smq07"; depends=[affy Biobase gcrma]; }; + bigmelon = derive2 { name="bigmelon"; version="1.4.0"; sha256="1q8mp765bzj9bb9b25s2qn58z2iyy8956frwa0y8qz19hgg5iyvk"; depends=[Biobase gdsfmt GEOquery methylumi minfi wateRmelon]; }; + bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.26.1"; sha256="17zic27wmdxxrfli0qmi0lggl1kspyk8nh02bbwkyv28ia6j3g9h"; depends=[bigmemory]; }; + bioCancer = derive2 { name="bioCancer"; version="1.6.0"; sha256="1k6ppqr6dpibfk0hf55zz3rd2vfprh9fzmd3wwahx87nd7qj8n6m"; depends=[AlgDesign AnnotationFuncs Biobase cgdsr clusterProfiler DiagrammeR DOSE dplyr DT geNetClassifier htmlwidgets org_Hs_eg_db plyr r_import radiant_data reactome_db ReactomePA shiny shinythemes tibble visNetwork XML]; }; + bioDist = derive2 { name="bioDist"; version="1.50.0"; sha256="02y8dlkgjjryy73d04yqyf2aifsrivf5xmcn7i06qfch2w9fbnn9"; depends=[Biobase KernSmooth]; }; + bioassayR = derive2 { name="bioassayR"; version="1.16.0"; sha256="1kzz10nzqgd3zjivnwnr6hwl2gsjvi14aslashvclcym1104vmxl"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; }; + biobroom = derive2 { name="biobroom"; version="1.10.1"; sha256="095bkbqbd42bd6gnafwnahm9a9jg0cxa1ndnlx34v9yfwaxnjxk5"; depends=[Biobase broom dplyr tidyr]; }; + biocGraph = derive2 { name="biocGraph"; version="1.40.0"; sha256="11lfiwgwlxp1b1yip4n320v6a31yvc2iy3c6jcq5h50ylc8srdyi"; depends=[BiocGenerics geneplotter graph Rgraphviz]; }; + biocViews = derive2 { name="biocViews"; version="1.46.0"; sha256="09zyqj1kqc089lmh9sliy0acanx9zimcasvp71dsrg2bqm08r1md"; depends=[Biobase graph RBGL RCurl RUnit XML]; }; + biomaRt = derive2 { name="biomaRt"; version="2.34.2"; sha256="1zlgs2zg0lmnk572p55n7m34nkxka8w10x8f2ndssjkffl2csy79"; depends=[AnnotationDbi httr progress RCurl stringr XML]; }; + biomformat = derive2 { name="biomformat"; version="1.6.0"; sha256="0ss70nca7dadhjk0assrj6kqgwxrk9w7sxwynk2cmw8rn4kqiabs"; depends=[jsonlite Matrix plyr rhdf5]; }; + biomvRCNS = derive2 { name="biomvRCNS"; version="1.18.0"; sha256="05lh0np314zhwd9imwkxfch5mn46964m4ws151x9r51siz262bmb"; depends=[GenomicRanges Gviz IRanges mvtnorm]; }; + biosigner = derive2 { name="biosigner"; version="1.6.0"; sha256="0d6801vvw4778yjq0i5izgazm86h5v6xrfks4qrm3di0yh0nald9"; depends=[Biobase e1071 randomForest ropls]; }; + biosvd = derive2 { name="biosvd"; version="2.14.0"; sha256="0xp032z4c1ws0hh52s67hxv254d6hn4kz9ggrkfwyjq0yby3s0lb"; depends=[Biobase BiocGenerics NMF]; }; + biotmle = derive2 { name="biotmle"; version="1.3.0"; sha256="18012n55swz9grkpdkapklgzbxhqkxbrcc9nika3vvhfpwxi2n8l"; depends=[BiocParallel biotmleData DBI doFuture dplyr future ggplot2 limma magrittr Matrix SummarizedExperiment superheat SuperLearner tmle wesanderson]; }; + biovizBase = derive2 { name="biovizBase"; version="1.26.0"; sha256="14l4vhj0a4ssr9m9zdzz3qpd4qw1mhgq5bmxq7jhrq3j9kmd6i2f"; depends=[AnnotationDbi AnnotationFilter BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; }; + birta = derive2 { name="birta"; version="1.22.0"; sha256="1zwdgidcn82z5nnkzjr1p1z2vjl6bsajnisw7kz4w18br11rakwh"; depends=[Biobase limma MASS]; }; + birte = derive2 { name="birte"; version="1.14.0"; sha256="1qlw1a0fd35b68kykvy1x6sr583n7qn88nixddsmkb963xvkksgv"; depends=[Biobase glmnet limma MASS nem Rcpp RcppArmadillo]; }; + blima = derive2 { name="blima"; version="1.12.0"; sha256="00c3kfs9l9qr2wxj8h3a1x6bngkkz0i8axmmsh2k12jp5b3fk0sx"; depends=[beadarray Biobase BiocGenerics Rcpp]; }; + bnbc = derive2 { name="bnbc"; version="1.0.0"; sha256="1vy2331idwwlcx243nrx61bns0f9whn21yq25nxs4mn903qy0kyw"; depends=[BiocGenerics EBImage GenomeInfoDb GenomicRanges IRanges matrixStats preprocessCore Rcpp S4Vectors SummarizedExperiment sva]; }; + branchpointer = derive2 { name="branchpointer"; version="1.4.0"; sha256="07qjlrdhj2qs65911cmvrd8q9dq077nk00m6vpnwx1fx0n0js6kf"; depends=[biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg38 caret cowplot data_table gbm GenomeInfoDb GenomicRanges ggplot2 IRanges kernlab plyr rtracklayer S4Vectors stringr]; }; + bridge = derive2 { name="bridge"; version="1.42.0"; sha256="0axck328cvwzhwlzi500l42x58k09c8zb84zq6hngpwnvlpcyyjk"; depends=[rama]; }; + bsseq = derive2 { name="bsseq"; version="1.14.0"; sha256="0j6nrb6syhdmyg9s7s8mbvfyagq7khxg7nwdi32w2hcdyp05hkr4"; depends=[Biobase BiocGenerics data_table DelayedArray GenomeInfoDb GenomicRanges gtools HDF5Array IRanges limma locfit matrixStats permute R_utils S4Vectors scales SummarizedExperiment]; }; + bumphunter = derive2 { name="bumphunter"; version="1.20.0"; sha256="0ag0h0xgja6fyind52hg5bcm482iv8rvwrnj7cfr0la1wndi2slh"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; }; + caOmicsV = derive2 { name="caOmicsV"; version="1.8.0"; sha256="158jb9665151fm8dm6xs4cxv65wa2h7bn5ixhwqaa893wrlqjnh3"; depends=[bc3net igraph]; }; + canceR = derive2 { name="canceR"; version="1.10.0"; sha256="0sgj40j9p6s14cmbp4gmlmqkjnfqigjilzbijlmfhcrg70ly3sqd"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; }; + cancerclass = derive2 { name="cancerclass"; version="1.22.0"; sha256="07pxb2fsp9b9wa39xdsd5rddw9j9v20ai4hmsmwvm7mi4yr2r5b2"; depends=[binom Biobase]; }; + casper = derive2 { name="casper"; version="2.12.0"; sha256="11xqxhjlgyk8pnlkscyc1prgvy707w5ls7n1bz1yjgqdg84nbv7m"; 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.22.0"; sha256="045xwg1h0jjbm4yd0f21c09ha91k6vzhrn3yqzzi4mhb07mpjczx"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCy3]; }; + cbaf = derive2 { name="cbaf"; version="1.0.2"; sha256="0im83489xpbfppg9l46i6fv19ch41zccrf16gks2nyx64hrhllz3"; depends=[BiocFileCache cgdsr genefilter gplots RColorBrewer xlsx]; }; + ccmap = derive2 { name="ccmap"; version="1.4.0"; sha256="185bvhmh9806lqd694dcrfl3mhn4k75kwnidsqs8ncqnb865hy01"; depends=[AnnotationDbi BiocInstaller ccdata data_table doParallel foreach lsa xgboost]; }; + ccrepe = derive2 { name="ccrepe"; version="1.14.0"; sha256="0hpm9gcmc1pdd1rzg5l0jw1xswwqbaajkdnrvrdwbhcvl9jbk5yp"; depends=[infotheo]; }; + cellGrowth = derive2 { name="cellGrowth"; version="1.22.0"; sha256="04cq203ab8yz32pjgh3b8kg7bzljqyjlyqxnfxl9ygk686jj4skm"; depends=[lattice locfit]; }; + cellHTS2 = derive2 { name="cellHTS2"; version="2.42.0"; sha256="0c004givz5a0x7vxiqb6qz9a27qm53ggy6wwaaxplh9kzqjqszkx"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; }; + cellTree = derive2 { name="cellTree"; version="1.8.0"; sha256="1c5mla2kf14c3pc02v16nlnhqmr2dh66l2liirc9myr7mgiqzaa8"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; }; + cellbaseR = derive2 { name="cellbaseR"; version="1.2.0"; sha256="002af82q6blm65w8ig1sclp42mw6q6j3ag8vfv7zrxwxwxrsg9r3"; depends=[BiocParallel data_table doParallel foreach httr jsonlite pbapply R_utils Rsamtools tidyr]; }; + cellity = derive2 { name="cellity"; version="1.6.0"; sha256="0szsa9q1znj5avyr2i83ih7m5hfq53786l9lmyxgc80mpzskj95s"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; }; + cellscape = derive2 { name="cellscape"; version="1.2.0"; sha256="066lkswc296vvy0d3fdr2sp1s4s242jmnfj431vrqryvzv7678zm"; depends=[dplyr gtools htmlwidgets jsonlite plyr reshape2 stringr]; }; + cghMCR = derive2 { name="cghMCR"; version="1.36.0"; sha256="10c6cnm2qbg0gb3klfv1xlwhbzj9x6aimxg7jnz29fgnn3xnd8cs"; depends=[BiocGenerics CNTools DNAcopy limma]; }; + charm = derive2 { name="charm"; version="2.24.0"; sha256="0zr96pwq7zd45lffl67fxvzrxhmjk8pmh8rfawhc7mmazds2ip9a"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; }; + chimera = derive2 { name="chimera"; version="1.20.0"; sha256="0z50pwynvyx2gc619b7w6chwdb7pxs2gf1ywh9vp7vzghkdv0wx4"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; }; + chimeraviz = derive2 { name="chimeraviz"; version="1.4.3"; sha256="1jwgra30lqi4zyyda2xcy7zkgnbidlxqfhh48bq8scfym0b34kjf"; depends=[AnnotationDbi AnnotationFilter ArgumentCheck BiocStyle Biostrings dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph Gviz IRanges org_Hs_eg_db plyr RCircos RColorBrewer readr Rgraphviz rmarkdown Rsamtools S4Vectors]; }; + chipenrich = derive2 { name="chipenrich"; version="2.2.0"; sha256="0q24il68grjqdxpy7qjk6lw6l5zlmw6yybrbrbb8l42gljyi6s74"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; }; + chipseq = derive2 { name="chipseq"; version="1.28.0"; sha256="1ymcq77krwjzrkzzcw7i9909cmkqa7c0675z9wzvrrk81hgdssfq"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; }; + chopsticks = derive2 { name="chopsticks"; version="1.42.0"; sha256="0awwk8k7vnsc0c1ic17m2mhmpin0s0ijd2gn7my9yysqzld9sncd"; depends=[survival]; }; + chroGPS = derive2 { name="chroGPS"; version="1.26.0"; sha256="1lx12mlrj1syl2qaibm08b4vq8h2xw609vr6vxynl1wvvf8wdarp"; depends=[Biobase changepoint cluster DPpackage GenomicRanges ICSNP MASS]; }; + chromDraw = derive2 { name="chromDraw"; version="2.8.0"; sha256="1lqrpbf322kxpx5068mw650ibzqksfmxc4j6q1fs4dv0ghpxdcsf"; depends=[GenomicRanges Rcpp]; }; + chromPlot = derive2 { name="chromPlot"; version="1.6.0"; sha256="16qy1zqwlxc2pdkdb1jf8rknvr5cz2k4vbg2jybr6ks73pzagb47"; depends=[biomaRt GenomicRanges]; }; + chromVAR = derive2 { name="chromVAR"; version="1.0.1"; sha256="0a62gp47ymspn9pbdz7j2vjpd0g7bhl333dicbs468qjjfpm8fbw"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; }; + chromstaR = derive2 { name="chromstaR"; version="1.4.0"; sha256="1ky2z9v6gwwgzvd498ng9ac5s7x8nkgm5170gywr7bgw7lqrycjz"; depends=[bamsignals chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; }; + chromswitch = derive2 { name="chromswitch"; version="1.0.0"; sha256="1ym7vdj6lfwi4nja38lixm3vsxp296dpb90zwnmabws3dhysxhfy"; depends=[Biobase BiocParallel cluster DescTools dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats mclust NMF rtracklayer S4Vectors tidyr]; }; + cisPath = derive2 { name="cisPath"; version="1.18.0"; sha256="0ya1kkvghs23c4rqydkas68a7y6z16ihjnv8ljjy9h3i7pdani4h"; depends=[]; }; + cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.16.0"; sha256="1r4iqnyrrjlx1crwy8ai7igkga3114nibqwj22kk364aqpr99jvv"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; }; + cleaver = derive2 { name="cleaver"; version="1.16.0"; sha256="1zzlmq121xix1hqa0cr7swda15jj4p9b05k8fc3531c6znhfcscp"; depends=[Biostrings IRanges S4Vectors]; }; + clippda = derive2 { name="clippda"; version="1.28.0"; sha256="0bzbws6wzvqalhcf7m29fnn01iqyavdgmfrfhhdvhi77253pggqk"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; }; + clipper = derive2 { name="clipper"; version="1.18.0"; sha256="0mwmqc274hdwsskjianbnyzjk755kqc2s0m91g7rim43hqddgw4a"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; }; + clonotypeR = derive2 { name="clonotypeR"; version="1.16.0"; sha256="079qgnprgzir8k94kxhq7xvv9hjnwlb7xgagcs71fr0rci0163pb"; depends=[]; }; + clst = derive2 { name="clst"; version="1.26.0"; sha256="1h1dyd42k7m7r5gdf7ddf3c7v27k906xf6cv7nhvdf4d6nac73nw"; depends=[lattice ROC]; }; + clstutils = derive2 { name="clstutils"; version="1.26.0"; sha256="19p0ral4xnf3gq99a0b4fc33fpngjll3pgr6ds3kkk00ynrwc3g6"; depends=[ape clst lattice rjson RSQLite]; }; + clustComp = derive2 { name="clustComp"; version="1.6.0"; sha256="0gfddardn3ib4g2b70jk55hg09vjmwd182m013vnhl476896zpb3"; depends=[sm]; }; + clusterExperiment = derive2 { name="clusterExperiment"; version="1.4.0"; sha256="07mcwjjff86d0jmj70za7j4h7kvs9j34s0z46rk5ivp71nxfnn4w"; depends=[ape cluster dendextend howmany kernlab limma locfdr matrixStats NMF phylobase RColorBrewer RSpectra stringr SummarizedExperiment]; }; + clusterProfiler = derive2 { name="clusterProfiler"; version="3.6.0"; sha256="0667k479xc1c8b6gkhnki1z56pvp2v98r3ar4x5gbdv0kg9yby6s"; depends=[AnnotationDbi DOSE ggplot2 GO_db GOSemSim magrittr plyr qvalue rvcheck tidyr]; }; + clusterSeq = derive2 { name="clusterSeq"; version="1.2.0"; sha256="1akcknsn89cllfjpb09nr8b3aalfp7bhyd57cs5i327hdjwlbgna"; depends=[baySeq BiocGenerics BiocParallel]; }; + clusterStab = derive2 { name="clusterStab"; version="1.50.0"; sha256="0rrzxq8gcxk828lx5kmicrd1qk5xfj0nlzs5233a0x9az5xhrj38"; depends=[Biobase]; }; + cn_farms = derive2 { name="cn.farms"; version="1.26.0"; sha256="001nynrmi568vv82b83jlc9wys8bj5qa6xljj777wdpc48f8swjg"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; }; + cn_mops = derive2 { name="cn.mops"; version="1.24.0"; sha256="157355f5x3wv8p1kdn527yyvgh2zs9rc733f0rldxc9fabrsk4lz"; depends=[Biobase BiocGenerics exomeCopy GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; }; + cnvGSA = derive2 { name="cnvGSA"; version="1.22.0"; sha256="0j7xhag1w64kzsmgpl5sz4grqcwffp84azhbx1gy3p83syxh8j4q"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; }; + coGPS = derive2 { name="coGPS"; version="1.22.0"; sha256="0h4x9fa3glkrdakwyvzm07zx9w4cp1zrlxz8zhkq9k4j5n2n71c5"; depends=[]; }; + coMET = derive2 { name="coMET"; version="1.10.2"; sha256="0ni5vsf1rwz52cmmh7p0kdjgyq295dyh1cyj1jj7jh8i44cghws3"; depends=[biomaRt colortools corrplot GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; }; + coRNAi = derive2 { name="coRNAi"; version="1.25.2"; sha256="0npwxyy3bh8wz8zz94fz76aiiffg4l4lxhnjkz9nsgdn6r8n1ykk"; depends=[cellHTS2 gplots lattice limma locfit MASS]; }; + cobindR = derive2 { name="cobindR"; version="1.16.0"; sha256="06r6wz7kpymdvghinimf2in0sxryyn3lmvdr6cmsnbc5pbzq4brs"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; }; + codelink = derive2 { name="codelink"; version="1.46.0"; sha256="0j4k5b1bhif0rqqwv5kmqmc9rrgsvs659accimlp1n797raw78ds"; depends=[annotate Biobase BiocGenerics limma]; }; + coexnet = derive2 { name="coexnet"; version="1.0.0"; sha256="12k0pkl4h410dhig9lpvpsbdhlsi5xbcqr981v7298dh7z4rxz4h"; depends=[acde affy Biobase GEOquery igraph limma minet rmarkdown siggenes STRINGdb SummarizedExperiment vsn]; }; + cogena = derive2 { name="cogena"; version="1.12.0"; sha256="1ngkr5qbjpxi90jfv8nnap11s2vy4wfpd1hiimcn1sf78i3kvpcg"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; }; + compEpiTools = derive2 { name="compEpiTools"; version="1.12.0"; sha256="0mg02j9z55xq0vwy87kcbv100br88m3bxsbdvrlff46k6gdzj55g"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; }; + compcodeR = derive2 { name="compcodeR"; version="1.14.0"; sha256="09q0vk6fb56vf5bnd2jh3c896pr4fihr5ib05ih8f7db052dxbf4"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; }; + consensusOV = derive2 { name="consensusOV"; version="1.0.0"; sha256="0pzb232b5jq9rzy5gk6cf114hid04jdwaqvrn5rzazr1fabrlg5y"; depends=[Biobase gdata genefu GSVA limma matrixStats randomForest]; }; + consensusSeekeR = derive2 { name="consensusSeekeR"; version="1.6.0"; sha256="1565azz566mbc1yvraingqx42830775i21vp74xn9ldaqywaqizd"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors stringr]; }; + contiBAIT = derive2 { name="contiBAIT"; version="1.6.0"; sha256="0by6qdmj4hs0mdjh4fia57m6ds50g2xaf5k8wc06w9ws47ryrqcs"; 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.12.0"; sha256="12pa1zf4v3kkpq1k34x45d1nakm3afh9rsc8byz53j3w97wdwpy4"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest IRanges minfi rtracklayer]; }; + convert = derive2 { name="convert"; version="1.54.0"; sha256="0h74byyd87kd3hr902y4n93lvrq07p8iwkzcmj9m4pbpnmlpahi4"; depends=[Biobase limma marray]; }; + copa = derive2 { name="copa"; version="1.46.0"; sha256="0aamwvm0qq4dsr14glzlnhqx90ljh820rgh5r4gppww5q040dw75"; depends=[Biobase]; }; + copynumber = derive2 { name="copynumber"; version="1.18.0"; sha256="01kcwzl485yjrkgyg8117b1il957ss0v6rq4bbxf4ksd5fzcjmyx"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; }; + coseq = derive2 { name="coseq"; version="1.2.0"; sha256="1jw6xmw32q6jdy8ypircd5q9grllh9bsgq0ga6n4a9qbv23syd9p"; depends=[BiocParallel capushe compositions corrplot DESeq2 e1071 edgeR ggplot2 gridExtra HTSCluster HTSFilter mvtnorm Rmixmod S4Vectors scales SummarizedExperiment]; }; + cosmiq = derive2 { name="cosmiq"; version="1.12.0"; sha256="1g51zbi73hmc2nacai46if123kxlc1wdax0nq9ixipmyrqby74xm"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; }; + covEB = derive2 { name="covEB"; version="1.4.0"; sha256="0wgimjzzysms0ccpaay36w5ad9pw1ip8imb2hxv4a86913agk1xv"; depends=[Biobase gsl igraph LaplacesDemon Matrix mvtnorm]; }; + covRNA = derive2 { name="covRNA"; version="1.4.0"; sha256="0813fb4yr4ya5rp1lx2av7c6svpsdp7m6aq8rddxp9qbrcqpjz7v"; depends=[ade4 Biobase genefilter]; }; + cpvSNP = derive2 { name="cpvSNP"; version="1.10.0"; sha256="1akyp9fdyi6sa9sf1c8rw43alvfx3dkdhqp1mifd6dz6q6030wd8"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; }; + cqn = derive2 { name="cqn"; version="1.24.0"; sha256="1iw4a3f3hysbhgilv424yvglq0rj9vyryd0riq0ifzmg9dhim11n"; depends=[mclust nor1mix preprocessCore quantreg]; }; + crisprseekplus = derive2 { name="crisprseekplus"; version="1.4.1"; sha256="1n9rl417pqlvcwlmbafw9gbjanxi9dynkcwb3zx8nak6mgy24y5c"; depends=[AnnotationDbi BiocInstaller BSgenome CRISPRseek DT GenomicFeatures GenomicRanges GUIDEseq hash shiny shinyjs]; }; + crlmm = derive2 { name="crlmm"; version="1.36.0"; sha256="0i9094kkvxkg3djqvyv2sqfmpvyl5hlcwscas2pmkz6vn2ld1f9s"; depends=[affyio beanplot Biobase BiocGenerics ellipse ff foreach illuminaio lattice limma matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; }; + crossmeta = derive2 { name="crossmeta"; version="1.4.0"; sha256="08pj8jnrrpmrq11ljj0szrw985qhgnj42kawah1jg1siry3l2pqb"; depends=[affxparser affy AnnotationDbi Biobase BiocGenerics BiocInstaller ccmap data_table doParallel doRNG DT fdrtool foreach GEOquery ggplot2 limma matrixStats metaMA metap miniUI oligo pander plotly RColorBrewer rdrop2 reshape shiny stringr sva]; }; + csaw = derive2 { name="csaw"; version="1.12.0"; sha256="0jw4dncqwf35fg6sf2syj9pwm9wrm0yc9wgichjwrh11ya9zfk49"; depends=[AnnotationDbi BiocGenerics BiocParallel edgeR GenomeInfoDb GenomicFeatures GenomicRanges IRanges limma Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; }; + ctc = derive2 { name="ctc"; version="1.52.0"; sha256="0brqh8m0yj7i3794mmrh3bi2mkbhzpg52j7h8qiqyjh7y2l1i3kg"; depends=[amap]; }; + ctsGE = derive2 { name="ctsGE"; version="1.4.0"; sha256="1hxgh559lqa2f80p73mcyz8k6l20hykyk7rmyhi7j9wa21y2mzwv"; depends=[ccaPP ggplot2 limma reshape2 shiny stringr]; }; + cummeRbund = derive2 { name="cummeRbund"; version="2.20.0"; sha256="01v920fps6snqpn7gaairq1y76zfjcdya6j9pb9mfw2hkm8gad40"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer S4Vectors]; }; + customProDB = derive2 { name="customProDB"; version="1.18.0"; sha256="0n7rjhvaqcg19qb40i4pwfqv62xzc8gj1y4v0qd9kyff1kh7dkxz"; depends=[AhoCorasickTrie AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer S4Vectors stringr VariantAnnotation]; }; + cycle = derive2 { name="cycle"; version="1.32.0"; sha256="03c3vr0mk5wyb77x3ypxqsaz2x16l9hasnakx3zbf6z8qrx92nss"; depends=[Biobase Mfuzz]; }; + cydar = derive2 { name="cydar"; version="1.2.1"; sha256="0pxnq8g649ki4697xzydfvqyanzfxjzlcf8lbsnyx46fzqy39zwk"; depends=[Biobase BiocParallel flowCore Rcpp S4Vectors shiny SummarizedExperiment viridis]; }; + cytofkit = derive2 { name="cytofkit"; version="1.10.0"; sha256="08lrnin6jpyjjgkmw2d71zvrsv0al10g28cqjcwwn9m6ax3nkf79"; depends=[Biobase colourpicker destiny doParallel e1071 flowCore FlowSOM ggplot2 ggrepel gplots igraph pdist plyr RANN Rcpp reshape2 Rtsne shiny shinyFiles vegan VGAM]; }; + cytolib = derive2 { name="cytolib"; version="1.0.1"; sha256="1yyrh5f67qslqsi3pqrw9ffz31sglp7jj5m83mhsjlpk4w20fv7i"; depends=[BH RProtoBufLib]; }; + dSimer = derive2 { name="dSimer"; version="1.4.0"; sha256="1rgmdc4q8vwdph1szzd3gzcdc53pr1w037yc19vgqm16ip2ryhff"; depends=[AnnotationDbi ggplot2 GO_db igraph org_Hs_eg_db Rcpp reshape2]; }; + daMA = derive2 { name="daMA"; version="1.50.0"; sha256="1hqqm4x8w65xv0kdqh14a0mh24p71k934rh8c70bi025rxn3pq76"; depends=[MASS]; }; + dada2 = derive2 { name="dada2"; version="1.6.0"; sha256="0lcfwh26cy1fpjxq2i5jb60rs4s0jnv8l9cxijqaakbs3xhmzdkr"; depends=[Biostrings data_table ggplot2 Rcpp RcppParallel reshape2 ShortRead]; }; + dagLogo = derive2 { name="dagLogo"; version="1.16.1"; sha256="1bvqpx0bxp4b0vzjf8zhbxphqpf4sggjn10d27pd462qpfg1wkaj"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; }; + dcGSA = derive2 { name="dcGSA"; version="1.6.0"; sha256="1xi3hx06bd376cfyclpk7crxa8crwkxk276vcssr681w0fhnrk06"; depends=[BiocParallel Matrix]; }; + ddCt = derive2 { name="ddCt"; version="1.34.0"; sha256="0h6s2x9xa5mnvp653pv0qsk3yq7pdvdiqz0321q08hz7ai0r7vdd"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; }; + ddgraph = derive2 { name="ddgraph"; version="1.21.0"; sha256="09m60a85cyjx4hjxqvp9qz1y2jkqwpafxy95l80xmqygal5d4jc4"; depends=[bnlearn graph gtools MASS pcalg plotrix RColorBrewer Rcpp]; }; + debrowser = derive2 { name="debrowser"; version="1.6.8"; sha256="11ra9rppy6japi10xy523g7a72cj2zkjb9c9581wy4wrw2kym2rj"; depends=[annotate AnnotationDbi baySeq clusterProfiler d3heatmap DESeq2 DOSE DT edgeR GenomicRanges ggplot2 ggvis googleAuthR gplots igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva V8]; }; + deepSNV = derive2 { name="deepSNV"; version="1.24.0"; sha256="16k8wv495fx5qq1xnv4da9bbkp90jbqklry2zynz1fmfhfxcdmvn"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; }; + deltaGseg = derive2 { name="deltaGseg"; version="1.18.0"; sha256="1bmm83n8sw16492nzhbh585crzrrwajcfbm2yr8kgbnnv370x3rj"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; }; + derfinder = derive2 { name="derfinder"; version="1.12.6"; sha256="1bp8qw3m5crncwz586b4f4w1x0kcm6r39md3w8il2d9xlvjvmml0"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; }; + derfinderHelper = derive2 { name="derfinderHelper"; version="1.12.0"; sha256="06aj2h98vm27pc1laxi7pjxhwxm756scl2r9d8f1x1gsg2aa0k1b"; depends=[IRanges Matrix S4Vectors]; }; + derfinderPlot = derive2 { name="derfinderPlot"; version="1.12.3"; sha256="1p0pqy2rdd4lmz91gyxwcm1gpnyb89qzy9j9fsm1jy84iaanan40"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 S4Vectors scales]; }; + destiny = derive2 { name="destiny"; version="2.6.2"; sha256="18id35mjlwnavqi04lzr47vj6y3j8y8g1rxb6hdc6dklajnvyyln"; depends=[Biobase BiocGenerics ggplot2 Hmisc igraph Matrix proxy Rcpp RcppEigen scales scatterplot3d smoother VIM]; }; + dexus = derive2 { name="dexus"; version="1.18.0"; sha256="1l9x51w1q58zvh53slcmw8rbb2v1sii380acap1frp4idi56wmig"; depends=[BiocGenerics]; }; + diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.60.0"; sha256="0bfs3n9crca46q0cgkpknl4xf5vc4dr5anly9kn77prb1zp9b0p3"; depends=[minpack_lm]; }; + diffHic = derive2 { name="diffHic"; version="1.10.0"; sha256="0j7vmgpxakzk3gazdy06xhpcqnb19pib0jxfz67nc7fgkyrmhzqi"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit Rcpp rhdf5 Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; }; + diffloop = derive2 { name="diffloop"; version="1.6.0"; sha256="0gv6wimcdfnbzqi0d5j8af6siqcqgaa7asmkz2nr6lvcicp3b6nc"; depends=[Biobase biomaRt data_table dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges limma locfit matrixStats pbapply plyr readr reshape2 rtracklayer S4Vectors statmod Sushi]; }; + diffuStats = derive2 { name="diffuStats"; version="0.102.0"; sha256="08dhygy58rr7zb8r2vrrxfdrdcyzdjwmafz0q0y65ay4zxn2s4w0"; depends=[expm igraph MASS Matrix plyr precrec Rcpp RcppArmadillo RcppParallel]; }; + diggit = derive2 { name="diggit"; version="1.10.0"; sha256="06swg9sz8csim6nq5cdpx9aqzsrfi1yhid4yb61ivyxf9p5hl1rn"; depends=[Biobase ks viper]; }; + discordant = derive2 { name="discordant"; version="1.2.0"; sha256="105lwz17r2vjzd9qz869p8qrjabac418nj6hxx8n8dxbykgyxihq"; depends=[Biobase biwt gtools MASS]; }; + dks = derive2 { name="dks"; version="1.24.0"; sha256="1fd4lyzfgf8iz3aqgayvvf2n166aq1hl57b6syfwazi42xfjxlhk"; depends=[cubature]; }; + domainsignatures = derive2 { name="domainsignatures"; version="1.38.0"; sha256="19c8n4xrwh9f46a5b41g7rp9h1inf9yjw0kr9ihd70gspbizx0h3"; depends=[AnnotationDbi biomaRt KEGG_db prada]; }; + doppelgangR = derive2 { name="doppelgangR"; version="1.6.0"; sha256="0hk01sayqnqidx768kgassdpqfavckbksgd40qf4jn9xaxq5a18f"; depends=[Biobase BiocParallel digest impute mnormt sva]; }; + dualKS = derive2 { name="dualKS"; version="1.38.0"; sha256="007h6bnm01h75gxzwxg8jwzzpsfa69b8wzf5ds3grnsx8c7rm9rv"; depends=[affy Biobase]; }; + dupRadar = derive2 { name="dupRadar"; version="1.8.0"; sha256="17b00ddsdnmhlba5rfylaxs3i5hfm6h959n6mmch4j02iy10bdpn"; depends=[Rsubread]; }; + dyebias = derive2 { name="dyebias"; version="1.38.0"; sha256="18mliq9ja1mdl18m0ys52fri1pjw6bj9zx3s3mc623kiki5zc4jk"; depends=[Biobase marray]; }; + easyRNASeq = derive2 { name="easyRNASeq"; version="2.14.0"; sha256="11l0bj9wcp5k0a5nq0adn4w891cllfdn7qrqg76k7klx5h0p37bx"; 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.50.0"; sha256="0xagah7nrj6dghl2ib75l8wlwj7kzdssnlbpjdwhm67nsys3hvx4"; depends=[Biobase]; }; + edge = derive2 { name="edge"; version="2.10.0"; sha256="1knr03yiw0cq0kj9hklmkaap4qiphm2ph51bjn1m5cn7nyckramz"; depends=[Biobase jackstraw MASS qvalue snm sva]; }; + edgeR = derive2 { name="edgeR"; version="3.20.9"; sha256="0y52snwbz37xzdd7gihdkqczbndlfzmmypv6hri3ymjyfmlx6qaw"; depends=[limma locfit Rcpp]; }; + eegc = derive2 { name="eegc"; version="1.4.0"; sha256="1v3586qddx1l74ha083x36m3lqdblrhmwd63k22jzfpkh30adz09"; 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.18.0"; sha256="1ypd7yq9c6mqp7nm984dm60qzvwy4qb81zrp2mvp7g87c5vdj2a3"; depends=[BiocGenerics ChemmineR DBI digest gespeR RcppAnnoy RCurl RUnit snow snowfall]; }; + eisa = derive2 { name="eisa"; version="1.30.0"; sha256="11ydmv5kddq75sknbax1aiyxq60rx146qa7pd3m09axjzvk83mq5"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; }; + ensemblVEP = derive2 { name="ensemblVEP"; version="1.20.0"; sha256="1xza76fyqp8xikc98ipamsz6175nirdv7aisfvkb9nmzba4q0r62"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; + ensembldb = derive2 { name="ensembldb"; version="2.2.2"; sha256="1yngndkf3588z91z0a2fvkg423p26ajm6xv1p27x0l9mzhhaqq3k"; depends=[AnnotationDbi AnnotationFilter AnnotationHub Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; }; + epiNEM = derive2 { name="epiNEM"; version="1.2.0"; sha256="0d3r4m0q3w2ljf4bm03z1dpiiih9cshzpbi4nnqq3jwls82f7nlq"; depends=[BoolNet e1071 graph gtools igraph lattice latticeExtra minet nem pcalg RColorBrewer]; }; + epigenomix = derive2 { name="epigenomix"; version="1.18.0"; sha256="0x567fxak38ngy5hs3x567381aigh1x1fb8ww8xvmpf2wlzrlfwp"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; }; + epivizr = derive2 { name="epivizr"; version="2.8.0"; sha256="088f28jscw2w5p06jhp2qxjfpwscrf0kbq5lnlnmmshc1ghbmdvw"; depends=[epivizrData epivizrServer GenomicRanges IRanges S4Vectors]; }; + epivizrChart = derive2 { name="epivizrChart"; version="1.0.0"; sha256="1xgqv1gqb8fksp43313fsmgb73h8z568s28zd039a7d7v4pi0n0v"; depends=[epivizrData epivizrServer htmltools rjson]; }; + epivizrData = derive2 { name="epivizrData"; version="1.6.0"; sha256="101ibx9nq17dnn5j8kjy31pm8ly4nyzs1rrlbsvk0140avjhz154"; depends=[Biobase ensembldb epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; }; + epivizrServer = derive2 { name="epivizrServer"; version="1.6.0"; sha256="0qa13yvq9ywa3m1n2vmi60087cgg18rpnqbr1m7f137ivnxyb11b"; depends=[httpuv mime R6 rjson]; }; + epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.6.0"; sha256="0rbd2kmdi0y97mx72gkg93s97slfig1k1bgcv5maknsqqqcwzz8j"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; }; + erccdashboard = derive2 { name="erccdashboard"; version="1.12.0"; sha256="07dc80l8618rlv3sywr0gp9i49kq66i9glx3md2r0k5c4l67mw37"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; }; + erma = derive2 { name="erma"; version="0.10.0"; sha256="0gcfs9g8vvdv5vmq9b21kd8sq5mizjj49nfzd4in9zvp4b9v7x1g"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; }; + esATAC = derive2 { name="esATAC"; version="1.0.23"; sha256="1g2pai0b98dfnng4h7w2xs73qp2dqacmx8x3ackqi6a515x0cyaf"; depends=[AnnotationDbi BiocGenerics BiocInstaller Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; }; + esetVis = derive2 { name="esetVis"; version="1.4.0"; sha256="1yb238lxy8sqmxim3zd25rp642cpz8p25vdffjlija2wivq8phn1"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; }; + eudysbiome = derive2 { name="eudysbiome"; version="1.8.0"; sha256="13ayrigzy55h6an3am9f77r6mzcvyfcpxpby71xilhaf6mjhyj39"; depends=[Biostrings plyr R_utils Rsamtools]; }; + exomeCopy = derive2 { name="exomeCopy"; version="1.24.0"; sha256="17rpa7mck2rrivrv5vqk4abb094v79v8dbzh6n5dj4hnw53b9wif"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; + exomePeak = derive2 { name="exomePeak"; version="2.13.2"; sha256="01fz3icmwq0zblvl070vmhr6fm0nxgzrvyl5xr68sv234by2nml7"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; }; + explorase = derive2 { name="explorase"; version="1.42.0"; sha256="1xqilix4fn603p0lqrdgl6npc5j0fcy8rcc37clzl3sm4mfklhdd"; depends=[limma rggobi RGtk2]; }; + fCCAC = derive2 { name="fCCAC"; version="1.4.0"; sha256="0fnjh0h4hn9qzz9f3hc09piwiizsf5ljz82k8f30c81d65bhx6qj"; depends=[ComplexHeatmap fda genomation GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors]; }; + fCI = derive2 { name="fCI"; version="1.8.0"; sha256="0p85pya1k37qjnvbjqg96ydip7dd1xkw9zxj35fyw3hxsbrd0d7g"; depends=[FNN gtools psych rgl VennDiagram zoo]; }; + fabia = derive2 { name="fabia"; version="2.24.0"; sha256="1c4kfn2gdwg72ypyfvsqbgk2pl4qqhr6pjnzd7xla9w1whlkag07"; depends=[Biobase]; }; + facopy = derive2 { name="facopy"; version="1.12.0"; sha256="1m3sj06p9inl3p1aslj7ybx7hrc6zm9zxb2bdvxwyn1wwlgkcx35"; 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.54.0"; sha256="1hpdf64ghfnpb2rd6qmha8yh5vy2gcnh8jk1pgj951k5vcxrx9zc"; depends=[Biobase]; }; + farms = derive2 { name="farms"; version="1.30.0"; sha256="0k5nygacdj38qw828xn417ahbsanf074r5pknl34l66f4vggpkv2"; depends=[affy Biobase MASS]; }; + fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.14.0"; sha256="05cyryfbkww757y15wg08iblm1vv3sfgkb54kfviyc5lg8r789kr"; depends=[doParallel Hmisc impute LiquidAssociation preprocessCore WGCNA]; }; + fastseg = derive2 { name="fastseg"; version="1.24.0"; sha256="0dd7nr3klwz9ailwshnbynhd62lwb8zbbpj6jf3igpb94yi6x2jp"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors]; }; + fdrame = derive2 { name="fdrame"; version="1.50.0"; sha256="1nnaibcxkfr6nzw7vm5ihhbzzcvvg2y9r65msy02k1x5gwd6ca43"; depends=[]; }; + ffpe = derive2 { name="ffpe"; version="1.22.0"; sha256="0c0l1wb4ydxz6rddvg0bv9j75dv892mm452imm3lh7s5q0gq6004"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; }; + fgsea = derive2 { name="fgsea"; version="1.4.1"; sha256="187c8xckx0s1p19i85nsiapgb3mppjqxp7zyld5hqyjvw3zcdj50"; depends=[BiocParallel data_table fastmatch ggplot2 gridExtra Rcpp]; }; + flagme = derive2 { name="flagme"; version="1.34.0"; sha256="15rbh6v22mjg9ms6kkl7z056k3bm117klw16hl69mjpd3crcs1by"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; }; + flipflop = derive2 { name="flipflop"; version="1.16.0"; sha256="1fwvffjgf45plchwkcmfi298y2nf4ynd7dxrb2xlcw4gzx6b3ghs"; depends=[GenomicRanges IRanges Matrix]; }; + flowAI = derive2 { name="flowAI"; version="1.6.3"; sha256="1xczc62ifjq4zr5xyjhf96rp8anzw2sfg0jmgplzs0na05d4601g"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 scales]; }; + flowBeads = derive2 { name="flowBeads"; version="1.16.0"; sha256="06jcflmdbm9f8zjh2vxbi093v16hqyi5q0c0fmvg59384p9z0315"; depends=[Biobase flowCore knitr rrcov xtable]; }; + flowBin = derive2 { name="flowBin"; version="1.14.0"; sha256="1svbph6drm4lb5k8l8x2sjl4bfanyrjy1f5nky7rrgqb00hhdq5h"; depends=[BiocGenerics class flowCore flowFP limma snow]; }; + flowCHIC = derive2 { name="flowCHIC"; version="1.12.0"; sha256="12yl4jwxy6mz047yqvzwkvp1yy4d323flzmpgfpv6v3pvz7x82lq"; depends=[EBImage flowCore ggplot2 hexbin vegan]; }; + flowCL = derive2 { name="flowCL"; version="1.16.2"; sha256="1zaic9cf7xw4qmdcrhi9a9zcxvxlnn9iii0a6lnwwkpsspgn1bnj"; depends=[graph Rgraphviz SPARQL]; }; + flowClean = derive2 { name="flowClean"; version="1.16.0"; sha256="1crpgaw1bilvgcyr93c2qx6jbx18ca52dzr6r8cqznlfxdnz48jj"; depends=[bit changepoint flowCore sfsmisc]; }; + flowClust = derive2 { name="flowClust"; version="3.16.0"; sha256="1c8ppgy4i42l250m71ri3gbw8mw1yw2saplx9wrhnykvwxnsx210"; depends=[Biobase BiocGenerics clue ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; }; + flowCore = derive2 { name="flowCore"; version="1.44.2"; sha256="09vp822nrhyfxibwh22g2rdl4yv6n4w1rm7hy9hkz8rsbpbdbwv4"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; }; + flowCyBar = derive2 { name="flowCyBar"; version="1.14.0"; sha256="06wzxlw02x5nzn5qc91yjawrmimsns2kmw4rm3rgbh10d4qh8r09"; depends=[gplots vegan]; }; + flowDensity = derive2 { name="flowDensity"; version="1.12.0"; sha256="1df181ilq7mnwlfvyjjvgd262f2sq09c5wg5fpf531m5jiaj6qpk"; depends=[car flowCore flowWorkspace GEOmap gplots RFOC rgeos sp]; }; + flowFP = derive2 { name="flowFP"; version="1.36.0"; sha256="0kpw90pxappz3mbidfqjv8l6cpc4qg2hgi1wqh4rzx8b2bdl5a8f"; depends=[Biobase BiocGenerics flowCore flowViz]; }; + flowFit = derive2 { name="flowFit"; version="1.16.0"; sha256="0ssyzfngfx31p7v96hgzfzc94n081fll97r6i44pycg42j9bkf6k"; depends=[flowCore flowViz gplots kza minpack_lm]; }; + flowMap = derive2 { name="flowMap"; version="1.16.0"; sha256="1gpxvnil740xnhiphgammis89819vf5s9q06nchwh92j2phj8afr"; depends=[abind ade4 doParallel Matrix reshape2 scales]; }; + flowMatch = derive2 { name="flowMatch"; version="1.14.0"; sha256="0x0719w1k42v9v3i717hyvf3wqii6ldrjmjpvak6jl7w2kn4yfn3"; depends=[Biobase flowCore Rcpp]; }; + flowMeans = derive2 { name="flowMeans"; version="1.38.0"; sha256="0mqgblmfili3nxnfz5h0hrhdl6wz4ylnslyx17kw7pyd0wskd26v"; depends=[Biobase feature flowCore rrcov]; }; + flowMerge = derive2 { name="flowMerge"; version="2.26.0"; sha256="0lpgipgrirhc5i5qzby1krg7vbd4jg566y3i5k18lxsccws12zx6"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; }; + flowPeaks = derive2 { name="flowPeaks"; version="1.22.0"; sha256="0cs0sbs9cx3syjv3dhl9b56s8ccpb00cwz9z18j31yaijl1h13vi"; depends=[]; }; + flowPloidy = derive2 { name="flowPloidy"; version="1.4.2"; sha256="15z3laz0g3agv9dhga29myhmri5w6ivj10rivq4r0kv7lql1wzlx"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; }; + flowPlots = derive2 { name="flowPlots"; version="1.26.0"; sha256="0bg523vxnk3kjwwplqykamdfqmyr7b0laxkml06rfr0rbj5lcdc5"; depends=[]; }; + flowQ = derive2 { name="flowQ"; version="1.38.0"; sha256="1vxc7fn747x7i2v0nv821nx9z1d5d4dyd6fa0vbmn7smjkbdxbzd"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; }; + flowQB = derive2 { name="flowQB"; version="2.6.0"; sha256="04hjsswngbxi40rxcb13hzvzm8y7yzpr6qzwhnishp0a5614rzka"; depends=[extremevalues flowCore]; }; + flowStats = derive2 { name="flowStats"; version="3.36.0"; sha256="0l5czm38d2vscw4hbnd79y57gjhdymqjy8kyq86s5g6h4kzir4x7"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS ncdfFlow]; }; + flowTime = derive2 { name="flowTime"; version="1.2.0"; sha256="0308bdkyc1q5s9aasmxdxqh8gzwcmxxdnsamyjl6dkm62s64cf7j"; depends=[flowCore plyr]; }; + flowTrans = derive2 { name="flowTrans"; version="1.30.0"; sha256="0sjpsv908v4gxi55acmmx5c07923adn2p1x8z3bisxv2pwx1n5fw"; depends=[flowClust flowCore flowViz]; }; + flowType = derive2 { name="flowType"; version="2.16.0"; sha256="16z3yxqsgvnwchnfd7bnkj403xxhdifiv8a0ddisy9y1rnil2qpj"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; }; + flowUtils = derive2 { name="flowUtils"; version="1.42.0"; sha256="0d4ab30xp722h9avi785wj8z1qz7dy65z5faqf3jc6j6v40bzikq"; depends=[Biobase corpcor flowCore graph RUnit XML]; }; + flowVS = derive2 { name="flowVS"; version="1.10.0"; sha256="07vcqcxzd9cw4hvc1yld2v05zcxqs5p9spka2l80pmsjr0aij043"; depends=[flowCore flowStats flowViz]; }; + flowViz = derive2 { name="flowViz"; version="1.42.0"; sha256="1fbr0snid9vgb133sb5dwkk469n465p8r490r67vsmm8wqsf6iyl"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; }; + flowWorkspace = derive2 { name="flowWorkspace"; version="3.26.6"; sha256="11r9c9h1ffp3i1p7gw0f93l5g30waawl7f2vbyh06p5mcr732dmp"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; }; + flowcatchR = derive2 { name="flowcatchR"; version="1.12.0"; sha256="0i6r86b1g98kaw8nhbnjjrw8gw6vvhfpr5r7dn4whl4hwlizc5qx"; depends=[abind BiocParallel colorRamps EBImage rgl]; }; + fmcsR = derive2 { name="fmcsR"; version="1.20.0"; sha256="0cbbil337zbb968zibkysrmpc8bwlpn7rl908zyvzvj8v11lxzcc"; depends=[BiocGenerics ChemmineR RUnit]; }; + focalCall = derive2 { name="focalCall"; version="1.12.0"; sha256="07lb0ijdsryd31dxp5fgp393p9f21b7in3rnf9j43qn8wmz48hnl"; depends=[CGHcall]; }; + frma = derive2 { name="frma"; version="1.30.1"; sha256="0319m8l7n2sfp4m6zipm7pkc57xikb735qk605m952m8ra08v8ml"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; }; + frmaTools = derive2 { name="frmaTools"; version="1.30.0"; sha256="02z7igfcvhjg9f36snmmif8d7lsca9n9izg8zc543hcy7s704aa2"; depends=[affy Biobase DBI preprocessCore]; }; + funtooNorm = derive2 { name="funtooNorm"; version="1.2.0"; sha256="09n7vq5f26px57sy35s29b8pmb9wcx6kii0h0i354sr3yg21ccpc"; depends=[GenomeInfoDb IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest matrixStats minfi pls]; }; + gCMAP = derive2 { name="gCMAP"; version="1.22.0"; sha256="1ghaidxm8wpg9jx8s9ymlkciwkxjnlr5g5yfjappj7mf4qaqxvil"; depends=[annotate AnnotationDbi bigmemory bigmemoryExtras Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; }; + gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.18.0"; sha256="152nd7vxz3cja8xmg5rq4j08lvd7cw1y09a737bfdq1zwrxc22v8"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; }; + gCrisprTools = derive2 { name="gCrisprTools"; version="1.6.0"; sha256="0x7bsnhs3qwimfkkxr8yslawdfy83x5ip8j2wlwq4m9hqwqk060g"; depends=[Biobase ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg]; }; + gQTLBase = derive2 { name="gQTLBase"; version="1.10.0"; sha256="1756vfcj2dkkgcmfkkg7qdaig36dv9gfvpypn9rbrky56wm1p035"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; }; + gQTLstats = derive2 { name="gQTLstats"; version="1.10.1"; sha256="0gvq1sf2zjbkk431x40z6wql3c1rpclnnwa2f1hvykb8mmw70kmq"; depends=[AnnotationDbi BatchJobs BBmisc beeswarm Biobase BiocGenerics doParallel dplyr erma ffbase foreach GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges ggbeeswarm ggplot2 gQTLBase HardyWeinberg IRanges ldblock limma mgcv plotly reshape2 S4Vectors shiny snpStats SummarizedExperiment VariantAnnotation]; }; + gaga = derive2 { name="gaga"; version="2.24.0"; sha256="1fzk3f4n612iwhxvzd81igl62hb674cjac959ivp8gjx8akw5jpx"; depends=[Biobase coda EBarrays mgcv]; }; + gage = derive2 { name="gage"; version="2.28.2"; sha256="0h0mlhns9j7cpfksvdlvx9jb7szm3r1dwqb3s4s8p8hmkb9byyii"; depends=[AnnotationDbi graph KEGGREST]; }; + gaggle = derive2 { name="gaggle"; version="1.46.0"; sha256="0x6xydavk1dfdqrl97xawq5difaa4v9lhy11941bvfaa9xz01jpv"; depends=[graph rJava RUnit]; }; + gaia = derive2 { name="gaia"; version="2.22.0"; sha256="160l7df4my5n29z2x9579dh0519vyk4d5m4hpmjacr9bh5r9n3va"; depends=[]; }; + garfield = derive2 { name="garfield"; version="1.6.0"; sha256="0lrlk42ic38my0gkkyakkxaxijs6rykkwhvka9zay82spcszmqv8"; depends=[]; }; + gaucho = derive2 { name="gaucho"; version="1.14.0"; sha256="0yf7y9qipdnzcll34q93dyi7q7bmq0iwg38s74d3984wjsqj3l61"; depends=[GA graph heatmap_plus png Rgraphviz]; }; + gcapc = derive2 { name="gcapc"; version="1.2.0"; sha256="0qa9yy6ljnbmb3a5wlwx75p8bwi665d24i029b9drw72zwqv4v81"; depends=[BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS matrixStats Rsamtools S4Vectors]; }; + gcatest = derive2 { name="gcatest"; version="1.8.0"; sha256="0spcxaj4finimyv812j13xp3nxj249blwwaxl308bd84kqd02pnn"; depends=[lfa]; }; + gcrma = derive2 { name="gcrma"; version="2.50.0"; sha256="1s2njjcvqm9siwga20f1z49lhk4cg13chzbk8sfdnvwi57yr6rwh"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; }; + gdsfmt = derive2 { name="gdsfmt"; version="1.14.1"; sha256="0d7yj5jm5kyw2jkbrzsyzzx1iw6lg4rbdyrvl7g62bjig6wvk0z1"; depends=[]; }; + geNetClassifier = derive2 { name="geNetClassifier"; version="1.18.0"; sha256="14qvrjbcvkqp2azfqi33y7pwg4wlf1vabddbirinw73za5b4jf48"; depends=[Biobase e1071 EBarrays minet]; }; + geecc = derive2 { name="geecc"; version="1.12.0"; sha256="1njvcwfdbpvmvvx8lcfw0baigjldr0v0rkqbk2rhb0h6wsiljfm2"; depends=[gplots hypergea MASS Rcpp]; }; + genArise = derive2 { name="genArise"; version="1.54.0"; sha256="101dammhv29w78cm2xylln4s7rzcy6sqw44navzs260xccdipxab"; depends=[locfit tkrplot xtable]; }; + genbankr = derive2 { name="genbankr"; version="1.6.1"; sha256="1f88ix4c4pfy5hhc2wlj2zrdz1jjfzzkrj4swk34ril24gf6av2z"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; }; + geneAttribution = derive2 { name="geneAttribution"; version="1.4.0"; sha256="11p8zqmmcfccl0fnyjm5kv8rbasamj6mra3bvk5jxsi4cqmbx9wx"; depends=[BiocGenerics GenomeInfoDb GenomicFeatures GenomicRanges IRanges org_Hs_eg_db rtracklayer]; }; + geneClassifiers = derive2 { name="geneClassifiers"; version="1.2.0"; sha256="1canrqw0g6v32vy2p2xd4pz6kw5k2zyzgff5ii0p86w519dzg16v"; depends=[Biobase BiocGenerics]; }; + geneRecommender = derive2 { name="geneRecommender"; version="1.50.0"; sha256="16cf2zkjffmdr2lhm7b4ckcw6p0kx40whw36m6y9510i8pmzy3y9"; depends=[Biobase]; }; + geneRxCluster = derive2 { name="geneRxCluster"; version="1.14.0"; sha256="0r0lnhf19qw1d4p87632lz0rgx0d9q3cakpd6qh43b10fil7wjgp"; depends=[GenomicRanges IRanges]; }; + geneXtendeR = derive2 { name="geneXtendeR"; version="1.4.0"; sha256="02a3aqn115l85cnvxy16ppri4hwir6mcp1av6s00nj66afxxnzmv"; depends=[AnnotationDbi data_table dplyr GO_db networkD3 org_Ag_eg_db org_Bt_eg_db org_Ce_eg_db org_Cf_eg_db org_Dm_eg_db org_Dr_eg_db org_Gg_eg_db org_Hs_eg_db org_Mm_eg_db org_Mmu_eg_db org_Pt_eg_db org_Rn_eg_db org_Sc_sgd_db org_Ss_eg_db org_Xl_eg_db RColorBrewer rtracklayer SnowballC tm wordcloud]; }; + genefilter = derive2 { name="genefilter"; version="1.60.0"; sha256="173swlg6gj4kdllbqvyiw5dggbcxiwlwpqmllsv4dxzn7h25i3g7"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; }; + genefu = derive2 { name="genefu"; version="2.10.0"; sha256="0pg9425z0inlbgvi15d050s6928xyqbxj36kk12z3dh3w2gwkycf"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; }; + geneplast = derive2 { name="geneplast"; version="1.4.0"; sha256="12ncf9rpnv1mwmdw4rbzzhggppcnzch764aiipy0jb21ix9xj61q"; depends=[ape snow]; }; + geneplotter = derive2 { name="geneplotter"; version="1.56.0"; sha256="1z3g7frc1iviwrsv2dlm4nqvkc0685h4va0388yfxn102ln8wwma"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; }; + genoCN = derive2 { name="genoCN"; version="1.30.0"; sha256="0m4sj2w0zra67d939knzriwda0nwphzspsmnl9jakl0kq8dvhjki"; depends=[]; }; + genomation = derive2 { name="genomation"; version="1.11.3"; sha256="1d2g1v6xhrf3gm86pv8ln22df5g6v6k6i4i39v4j82zn4apany6v"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr Rcpp readr reshape2 Rsamtools rtracklayer RUnit S4Vectors seqPattern]; }; + genomeIntervals = derive2 { name="genomeIntervals"; version="1.34.0"; sha256="11jlmfy8i245s3bnkcg49s8vrqfkrp5w2ibxdcixyckm7pzrv29r"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; }; + genomes = derive2 { name="genomes"; version="3.8.0"; sha256="09ib88jqncywzc1rmjbj6p1i6nrrmbqxsn6jajdgqlgw8kpb490y"; depends=[curl readr]; }; + genoset = derive2 { name="genoset"; version="1.34.0"; sha256="1cw6g8r3n33xlqmbjsfn6kkdzz19kh71ag529sjbk9wlxi69rrz0"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; + genotypeeval = derive2 { name="genotypeeval"; version="1.10.0"; sha256="1pff2n1s350j6i7klsnwqlizkdvvfpyqqrvc7kq5gj7yh508dxy9"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer Rtsne VariantAnnotation]; }; + genphen = derive2 { name="genphen"; version="1.6.0"; sha256="0m1g1hfhhbq3xjdr2fjf3wbng6d953kci965h298c168dv3864k6"; depends=[Biostrings e1071 effsize ggplot2 randomForest rjags]; }; + gespeR = derive2 { name="gespeR"; version="1.10.0"; sha256="09xd080b08bfpqqbha4rxn4vmglv7c5asd4gibfjgjkasd78g40m"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; }; + ggbio = derive2 { name="ggbio"; version="1.26.1"; sha256="1xlmlngn27iwnr21s9di4059kav1a7c1sajx08wja8yn8f7j06hp"; depends=[AnnotationDbi AnnotationFilter 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.6.1"; sha256="07rsg673hnrn1kf82nb59sxa925hjlb3qnjwlxvzlr2lzs958rcd"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; }; + ggtree = derive2 { name="ggtree"; version="1.10.5"; sha256="1gkfjgihykkvqrhvzhr5brwzsgva0mxvfpa664k08jan9brjg22f"; depends=[ape ggplot2 magrittr rvcheck scales tidyr treeio]; }; + girafe = derive2 { name="girafe"; version="1.30.0"; sha256="0k8fjn7d1hxwin0vywly7vc570048i7nckhyw9j4cind6fi6f75v"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; }; + globalSeq = derive2 { name="globalSeq"; version="1.6.0"; sha256="19aws180r5gwxrz6xmfgic0mp8piki2qmzrxyy1f75866blk3r4f"; depends=[]; }; + globaltest = derive2 { name="globaltest"; version="5.32.0"; sha256="1fk9yk6n3aqigcly5zsb0jnb6jmdbn3jgbp1wyv6sby124sr4hmr"; depends=[annotate AnnotationDbi Biobase survival]; }; + gmapR = derive2 { name="gmapR"; version="1.20.0"; sha256="158ql56mbc1fw5nyzyw4cx4p5zyavwdm9117hy3ka3cxdpqaihbs"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; + goProfiles = derive2 { name="goProfiles"; version="1.40.0"; sha256="0fdlqmyglgrpjcc24vp3mfz8yq6v79lnzvnkxj8rslnhddcf6lkq"; depends=[AnnotationDbi Biobase GO_db]; }; + goSTAG = derive2 { name="goSTAG"; version="1.2.0"; sha256="07v5yqzsagygmz8kpkjmy8f2g8p7997mvkisi5jb1kd00hggzpw9"; depends=[AnnotationDbi biomaRt GO_db memoise]; }; + goTools = derive2 { name="goTools"; version="1.52.0"; sha256="07wa206pk7wqawgs77009cjrd8xx6wvxzaakahcc1hh0hawhkk2r"; depends=[AnnotationDbi GO_db]; }; + goseq = derive2 { name="goseq"; version="1.30.0"; sha256="01nnlh40v4zs8h26bf5ksl72a8826vl1lhdlfqawk304wr7k8kkf"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; }; + gpls = derive2 { name="gpls"; version="1.50.0"; sha256="0sp3c783wxgg3g37yqq4901rdygl54ab2wqyjcgl2jrajaw44m3g"; depends=[]; }; + gprege = derive2 { name="gprege"; version="1.22.0"; sha256="1k77dxm1mf761par04pfs27qwpy2s43a5z91z9r9zpjp9sb37nnf"; depends=[gptk]; }; + graph = derive2 { name="graph"; version="1.56.0"; sha256="15aajjp8h2z14p80c8hyd4rrmr9vqsm7bvwb989jxjl4k6g52an1"; depends=[BiocGenerics]; }; + graphite = derive2 { name="graphite"; version="1.24.1"; sha256="1ddqm2dlazczr8471171gznbpmm8cykxqn9c7vg3c3ysj7qmgxzx"; depends=[AnnotationDbi checkmate graph httr rappdirs]; }; + groHMM = derive2 { name="groHMM"; version="1.12.0"; sha256="0cjkj0ypyc4dfi9s8dh88kh6q4xlpnc0wal7njg4b4gqj0l2hva7"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; }; + gtrellis = derive2 { name="gtrellis"; version="1.11.1"; sha256="0mx4xvaipd0ydlnn4rlgbc47phlqgpihc55la6hv1fz2rs3k948v"; depends=[circlize GenomicRanges GetoptLong IRanges]; }; + gwascat = derive2 { name="gwascat"; version="2.10.0"; sha256="0n5x5i5v6a8wpn5mxmlpkl34b4kyypmymiwww6g61zch7xqrgywi"; 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.12.0"; sha256="181rsqda0bs7w2vz5dg3xzffla7yvlfkk7pfc0dzsjhw1b0yf3lx"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; }; + hapFabia = derive2 { name="hapFabia"; version="1.20.0"; sha256="0mnc2mh3sqagvzhws1qr8vb57gp1r7n65wq6264vab2zcklhq7mh"; depends=[Biobase fabia]; }; + heatmaps = derive2 { name="heatmaps"; version="1.2.0"; sha256="0kkfzxx1ccacy4gyv9nj151w137ca084rja8kakcnnvp3vcwn5z8"; depends=[BiocGenerics Biostrings EBImage GenomeInfoDb GenomicRanges IRanges KernSmooth Matrix plotrix RColorBrewer]; }; + hiAnnotator = derive2 { name="hiAnnotator"; version="1.12.0"; sha256="0xa1x8xilh2x6xnnghz10j5r4q3ib5j28wkik7r79kpvzw7i55xc"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; }; + hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.14.0"; sha256="1aa12m9r7zzcf91xpn8dfagr3cqp5wcp0gmkcczknavj8wgzzjmp"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator readxl rSFFreader sonicLength]; }; + hicrep = derive2 { name="hicrep"; version="1.2.0"; sha256="0fza8zngc3cn8why5qfqscfsbj3nblbvxk4maj2ccsgpc0lrkb52"; depends=[]; }; + hierGWAS = derive2 { name="hierGWAS"; version="1.8.0"; sha256="0kyxyv5vi7q6pfjxqbxi99f3p6g9fckjafgqkv3fg98sn2nb7zyh"; depends=[fastcluster fmsb glmnet]; }; + hopach = derive2 { name="hopach"; version="2.38.0"; sha256="1v28bbz3bp7a5rpd02mxfxznhl4iwnn2bkh2kf25g64chg4jksfx"; depends=[Biobase BiocGenerics cluster]; }; + hpar = derive2 { name="hpar"; version="1.20.0"; sha256="0s5v79mgxdx862v1jrdf5pdap81nz5vjx25ni8s3sl97ldckf6j8"; depends=[]; }; + htSeqTools = derive2 { name="htSeqTools"; version="1.26.0"; sha256="1migbh30hh2bpa63iv1l0jqnz9ryvkx4apwyj0qzyd07b2p55qcz"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS S4Vectors]; }; + hyperdraw = derive2 { name="hyperdraw"; version="1.30.0"; sha256="00fi3687bnddjzx46y98i2pqm7dczn4icgsrbhhyhqkwg49v97hr"; depends=[graph hypergraph Rgraphviz]; }; + hypergraph = derive2 { name="hypergraph"; version="1.50.0"; sha256="1c0f5fp6ybn88y1k408flqnndfjzfkig7vhbfxny1a43yyr0aib5"; depends=[graph]; }; + iASeq = derive2 { name="iASeq"; version="1.22.0"; sha256="1kp787zv6h4wcp3naz0zbpw1z1m2vdg1xc9db31a9j2kbv7j9xd2"; depends=[]; }; + iBBiG = derive2 { name="iBBiG"; version="1.22.0"; sha256="0vcwv1kf0mm21bx4ab6z1fn0gcgqaygrcrln0c96kpdz3zsx37mw"; depends=[ade4 biclust xtable]; }; + iBMQ = derive2 { name="iBMQ"; version="1.18.0"; sha256="12gdj5ngagydkrb18hn8cms3bsvzdd3pkzrqdfxw16ppm1sy6mbd"; depends=[Biobase ggplot2]; }; + iCARE = derive2 { name="iCARE"; version="1.6.0"; sha256="1cdw483lmqi605s1chfwzjk7kqxbky3pya4nyvmnggv4r4nc26qk"; depends=[]; }; + iCOBRA = derive2 { name="iCOBRA"; version="1.6.0"; sha256="1y2h7d689wnvspvpkcih2z21r6yi70iicjyr3z91czqbr6vw5hsd"; depends=[dplyr DT ggplot2 limma reshape2 ROCR scales shiny shinyBS shinydashboard UpSetR]; }; + iCheck = derive2 { name="iCheck"; version="1.8.0"; sha256="0z2hz21vd8j08ivnqq1w8n9qyn8h7sr56fl42npq6a6zyi7ab4zf"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d]; }; + iChip = derive2 { name="iChip"; version="1.32.0"; sha256="02cpv5nkbyjnjxcbavdxy8m6fwkj03nqss49gp30mv1a2wnin7w0"; depends=[limma]; }; + iClusterPlus = derive2 { name="iClusterPlus"; version="1.14.0"; sha256="06a9iavp24rkj64plzw505crg02hcd06g68drs8fgfabvdlb2jiy"; depends=[]; }; + iGC = derive2 { name="iGC"; version="1.8.0"; sha256="125n780c9hx7wh5s1w21j3j71bzw1wa3gxapsnkcrn1vzh8agbmj"; depends=[data_table plyr]; }; + iPAC = derive2 { name="iPAC"; version="1.22.0"; sha256="1x5npvg3k8jmj2xbx0p871iii51gwxqwk0waczd58ylvv023j1gr"; depends=[Biostrings gdata multtest scatterplot3d]; }; + iSeq = derive2 { name="iSeq"; version="1.30.0"; sha256="0rypm4dhkkgd1j7vzbpcm2n6b6qcig483si46r16fwkn4hzwb11v"; depends=[]; }; + ibh = derive2 { name="ibh"; version="1.26.0"; sha256="08f1a3f0m8900y3rgrq7v9ww6055bwpqc3liqpm0yf8fz3n83wnm"; depends=[simpIntLists]; }; + ideal = derive2 { name="ideal"; version="1.2.0"; sha256="0fyh6y8k5ly19y2iysgvjsgagla0pfsihf3wwqzdcx0hp6f6ksz9"; depends=[AnnotationDbi BiocParallel d3heatmap DESeq2 dplyr DT GenomicRanges ggplot2 GO_db goseq GOstats gplots IHW IRanges knitr limma pcaExplorer pheatmap plyr rentrez rintrojs rmarkdown S4Vectors shiny shinyAce shinyBS shinydashboard stringr SummarizedExperiment topGO UpSetR]; }; + idiogram = derive2 { name="idiogram"; version="1.54.0"; sha256="0y3wv1bqnaa624c4425qh8sz0sd57pvd16wgxb1i88ryb2q7gc6n"; depends=[annotate Biobase plotrix]; }; + illuminaio = derive2 { name="illuminaio"; version="0.20.0"; sha256="02miyvard3y0d6qwbhq37bp4qypwph09k09630v6calr2q4jmzdh"; depends=[base64]; }; + imageHTS = derive2 { name="imageHTS"; version="1.28.1"; sha256="18y5wfxfxp4lw1cxxps662gm4wsjs30di455zhpgw65l7y76r5jh"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; }; + immunoClust = derive2 { name="immunoClust"; version="1.10.0"; sha256="1mxrg832ziys1wq3vbs6gqdbg0j85y3dnqkkffmz4srl6733z9c1"; depends=[flowCore lattice]; }; + impute = derive2 { name="impute"; version="1.52.0"; sha256="0b8r4swvyx3cjcc2ky8yn0ncpzlbi1pgfsn3wpbjmhh7sqrffm2n"; depends=[]; }; + intansv = derive2 { name="intansv"; version="1.18.0"; sha256="0y76a4bv8lyrlvcl8xz4268xw358wwxys2xqkgznk8l3hxrswbmv"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; }; + interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.16.0"; sha256="01zxpbfx3nirvgw34v1wi62p4n6h2abqzfh89rcvlcdyw7vwgsrg"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; }; + interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.16.0"; sha256="01yb945jqqimwjgriza6yy4dnp303cdirxrhl4hjyprfdlmnz5p5"; depends=[BiocGenerics shiny]; }; + inveRsion = derive2 { name="inveRsion"; version="1.26.0"; sha256="12gfn4kxw5phb0vf1lx30vdp4lh4jxsdgy5ddbdgiv87cbzz6ldi"; depends=[haplo_stats]; }; + iontree = derive2 { name="iontree"; version="1.24.0"; sha256="196b8pbnkyai4lxij17mhc8hikgdxcbdsqa04cck27fkplbiy6pq"; depends=[rJava RSQLite XML]; }; + isobar = derive2 { name="isobar"; version="1.24.0"; sha256="1n27wks04fiqw3qm1nkjh533qk3fwnxivganl9x5c29jfmglzmk9"; depends=[Biobase biomaRt distr ggplot2 plyr]; }; + isomiRs = derive2 { name="isomiRs"; version="1.6.0"; sha256="0bgcbwfx1clcq38fkvw9d60rz2zhww77nppb26mhzazmibhxyaa2"; depends=[Biobase BiocGenerics DESeq2 DiscriMiner dplyr gamlss gamlss_dist GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges lme4 RColorBrewer RcppEigen readr reshape S4Vectors SummarizedExperiment tidyr TMB]; }; + iterClust = derive2 { name="iterClust"; version="1.0.0"; sha256="05fdil91cg2z90vfyahhkjj5mj4ajsrxaddl9qfdk86lx0q7migb"; depends=[Biobase cluster]; }; + iterativeBMA = derive2 { name="iterativeBMA"; version="1.36.0"; sha256="0ck8fqici1916ardwp04grnclg6ydl731mcbd0xh1a1k7zzd0jbc"; depends=[Biobase BMA leaps]; }; + iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.36.0"; sha256="096qnp9wisc4hnpgy37a4h1xb1f01kqc9rhrhfkp25wkf1yxgwmi"; depends=[BMA leaps survival]; }; + ivygapSE = derive2 { name="ivygapSE"; version="1.0.0"; sha256="1y82cm0xmddhfz12iqqwpq9ifaml3r0yxs4c3cvp6k2c0wlhl173"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; }; + joda = derive2 { name="joda"; version="1.26.0"; sha256="0qwfkq40zl16lngrmhw8lxx1qn5lh076nl6bydrzksvh1bjs78b6"; depends=[bgmm RBGL]; }; + karyoploteR = derive2 { name="karyoploteR"; version="1.4.2"; sha256="18g6dm6bl5qyr50gydlvq948cmvg21iyb6l33cyh7p4haajf7xaa"; depends=[bezier biovizBase digest GenomeInfoDb GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors]; }; + kebabs = derive2 { name="kebabs"; version="1.12.0"; sha256="1mbymzrbwzzfd5ygf8fk89igv7x0damgskri39fj913aqifgkf42"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; }; + keggorthology = derive2 { name="keggorthology"; version="2.30.0"; sha256="117s7b32nkv95adh2j91b87r90svhfb91ag28brsq3r333m2q8cn"; depends=[AnnotationDbi DBI graph hgu95av2_db]; }; + kimod = derive2 { name="kimod"; version="1.6.0"; sha256="0mb9bv6bz7k27vs8rl26kh2zm8mvpkgzqhgc471lp4qz8f4fsbxc"; depends=[Biobase cluster]; }; + lapmix = derive2 { name="lapmix"; version="1.44.0"; sha256="1b7daaqsq3bvb1wbhf99pk8kl4pm4kac7bnx211isr7ica34pxb5"; depends=[Biobase]; }; + ldblock = derive2 { name="ldblock"; version="1.8.0"; sha256="18nfsixh6d2wfrb9laqsgly5w1frzihhak683k0p8fdf51h4aqba"; depends=[erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; }; + les = derive2 { name="les"; version="1.28.0"; sha256="0xy7ggc2b20i1c78mww84xvc0jhbinxn00nbfvnbw997vjqr7r79"; depends=[boot fdrtool gplots RColorBrewer]; }; + lfa = derive2 { name="lfa"; version="1.8.0"; sha256="06w0032wwqm2cxid7brb6iq6bkhqc5x3a08wwyjbib6lnj5n7rvh"; depends=[corpcor]; }; + limma = derive2 { name="limma"; version="3.34.9"; sha256="1y2fm61g5i0fn0j3l31xvwh9zww9bpkc4nwzb1d0yv1cag20jkdc"; depends=[]; }; + limmaGUI = derive2 { name="limmaGUI"; version="1.54.0"; sha256="1mhqxy4bfb38lp57wrm6jm57xbwhqz6z78cxjdjr8r9inysddjlp"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; }; + lmdme = derive2 { name="lmdme"; version="1.20.0"; sha256="1742ffw592cpp0bxd38g4k51h28iaax995lzmgxb3di6kj6h8an3"; depends=[limma pls stemHypoxia]; }; + logicFS = derive2 { name="logicFS"; version="1.48.0"; sha256="1qkbc6xgmppicg30613ak0dy8fn1irq6n8kf2qvwd95y210zlcfv"; depends=[LogicReg mcbiopi]; }; + logitT = derive2 { name="logitT"; version="1.36.0"; sha256="08jb55ccxbdcyrd497lgdhwkmj97r9rl21jc411l7fwckqz3pgwn"; depends=[affy]; }; + lol = derive2 { name="lol"; version="1.26.0"; sha256="00wl4zw0qvinb2cy0cbcgrg0a9xr6s7b4y30ykd4666fmdk60dg3"; depends=[Matrix penalized]; }; + lpNet = derive2 { name="lpNet"; version="2.10.0"; sha256="0r3xyhws10fq84y2rxv9v5wqbg05di4kkccv1l63idf38g33dvs1"; depends=[lpSolve nem]; }; + lpsymphony = derive2 { name="lpsymphony"; version="1.7.1"; sha256="1qm131flq00dgvkdv6qz8xbh24qqadg8hn35q6ymsv6ql390xi06"; depends=[]; }; + lumi = derive2 { name="lumi"; version="2.30.0"; sha256="1gy0137h5l2xmq3ahqsgg0lzczgbqck4qrqbgfnh8r0cb2r8vaaj"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; }; + mAPKL = derive2 { name="mAPKL"; version="1.8.0"; sha256="08f6r31zlabsa7b8k5cnnwir7scjaix6mnnkgfs5h4gvb49vrbbm"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; }; + mBPCR = derive2 { name="mBPCR"; version="1.32.0"; sha256="0wvwfq4aqnhn0943v807sij3dasf93l3rhvcj7a65jpv4csd4vx2"; depends=[Biobase oligoClasses SNPchip]; }; + mQTL_NMR = derive2 { name="mQTL.NMR"; version="1.12.0"; sha256="0iijl9afnynhh2pa9v1xj5b1cf0svjzlkvg3al8jrv0i28jibvi7"; depends=[GenABEL MASS outliers qtl]; }; + maCorrPlot = derive2 { name="maCorrPlot"; version="1.48.0"; sha256="0jy6b57pi58795v1xhshaqrvpd27qarzv06r8il0d9085asc3v1r"; depends=[lattice]; }; + maPredictDSC = derive2 { name="maPredictDSC"; version="1.16.0"; sha256="02wzz7s6cr0bligvxm37gwkbhzwfmaki27drbdaaiyssqmdb4bkq"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; }; + maSigPro = derive2 { name="maSigPro"; version="1.50.0"; sha256="1d6rwfm42spfbqsbssbrc69rv2fj8gcxm4na9k66vij7dwi8nvd0"; depends=[Biobase MASS mclust venn]; }; + maanova = derive2 { name="maanova"; version="1.48.0"; sha256="1vvjk6y8mp5h7l8yk4f1y48jx5k9fl9s12x2mgsbap306paw860q"; depends=[Biobase]; }; + macat = derive2 { name="macat"; version="1.52.0"; sha256="168jw5bi1nbj2dfhipnvja7w0avmiw6vrvdany73d41fvigmagj5"; depends=[annotate Biobase]; }; + made4 = derive2 { name="made4"; version="1.52.0"; sha256="1ns7f47l7ig2fm95l67ppym5gbkbr8lp18vx51pqwjg8r5rvj9sc"; depends=[ade4 gplots RColorBrewer scatterplot3d]; }; + maftools = derive2 { name="maftools"; version="1.4.25"; sha256="0k4ry5pnh3lxyzkab094wpjiaqjrymq9hbgpz8xv9g67fhg2g8ah"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson Rsamtools survival VariantAnnotation wordcloud]; }; + maigesPack = derive2 { name="maigesPack"; version="1.42.0"; sha256="1c92kkr2rmfydckmbvri8g0lzz1v3hx93zpmb1pwrnlfpm01j95j"; depends=[convert graph limma marray]; }; + makecdfenv = derive2 { name="makecdfenv"; version="1.54.0"; sha256="17fmzd12acdpq3vfnqrafmmg5jcmdgkf83mrqjpw92zah2w8490a"; depends=[affy affyio Biobase zlibbioc]; }; + manta = derive2 { name="manta"; version="1.24.0"; sha256="060x5rdzkx882pa8x9w7j3sgj0clar6w35yblbcggq579r9jpx06"; depends=[caroline edgeR Hmisc]; }; + mapscape = derive2 { name="mapscape"; version="1.2.0"; sha256="1nsr3n0vb0a9bzv2d9mginl5lcv8dvxpkv86ygn790bbkz35fq8x"; depends=[base64enc htmlwidgets jsonlite stringr]; }; + marray = derive2 { name="marray"; version="1.56.0"; sha256="14c93i86yc7jn4ax8p4l0z6v9xisw1bv7gzb4a0gbxhxn7mddaic"; depends=[limma]; }; + maskBAD = derive2 { name="maskBAD"; version="1.22.0"; sha256="0rg2r9yg3wviz0s5z5palmzbqb4cya4b0hd6w43fnwrfp46hqlp8"; depends=[affy gcrma]; }; + massiR = derive2 { name="massiR"; version="1.14.0"; sha256="17bb7cm6wiwygxvp37gjiagxzali2023ikwxpqwghz6dn58nkqnl"; depends=[Biobase cluster diptest gplots]; }; + matchBox = derive2 { name="matchBox"; version="1.20.0"; sha256="0m9swn284xk6y7vw2l8r5yjbq0b7x8n8ypd706fz9yc5ppg89h4j"; depends=[]; }; + matter = derive2 { name="matter"; version="1.4.1"; sha256="1l8z30pzl0jssdkfmzwa5741mbn81sraw79jm38qv7h72mjsm891"; depends=[biglm BiocGenerics irlba]; }; + mcaGUI = derive2 { name="mcaGUI"; version="1.26.0"; sha256="1ymdlc23jc0glfg15nlax71awkhqbaz5xv7pxnppf2m5sz73gfy0"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; }; + mdgsa = derive2 { name="mdgsa"; version="1.10.0"; sha256="0xivpr1w41pzvfs4hjyc0vvmrbq0pbckai7j2vf4iq5sxxc4xyv3"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; }; + mdqc = derive2 { name="mdqc"; version="1.40.0"; sha256="0khrkhl4ksvls4qb0273zn9bc9dzd6234v1ly6vb2b2dslm8z9r0"; depends=[cluster MASS]; }; + meshes = derive2 { name="meshes"; version="1.4.0"; sha256="1sz2hj16q0swz13vfaf63njg920xnx9ysdcbwfqlyik1i7s0c0h2"; depends=[AnnotationDbi DOSE GOSemSim MeSH_db rvcheck]; }; + meshr = derive2 { name="meshr"; version="1.14.0"; sha256="00k37apfbfw1qxvh8wz1hg9gg32h8lib9yw0i9y1882krz61x5b6"; 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.14.0"; sha256="0483dvnq6ns4pfq8axcqgbd2n3b8i1b9063appyi5cqfa29s2sqm"; depends=[foreach ggplot2 plyr Rcpp survival]; }; + metaArray = derive2 { name="metaArray"; version="1.56.0"; sha256="1n3hmf0gajfpg5gmjgdxnpb4x395wm03bpfvccgnkkwfv6qrzd7v"; depends=[Biobase MergeMaid]; }; + metaCCA = derive2 { name="metaCCA"; version="1.6.0"; sha256="02a6562i2gddnk0izlrsdby7sx2s36axkdwy8c1z92s4n71m05q1"; depends=[]; }; + metaMS = derive2 { name="metaMS"; version="1.14.0"; sha256="1lp0i0pf1xc0rhr61rh7qna0hbl0svqm5ysfgdl04i2ghglrrmqm"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; }; + metaSeq = derive2 { name="metaSeq"; version="1.18.0"; sha256="1d8rr4nwbqxb7amdfrphw2ndyfhh74w20qgbzwlfc0wppwfwm5rr"; depends=[NOISeq Rcpp snow]; }; + metabomxtr = derive2 { name="metabomxtr"; version="1.12.0"; sha256="0214idivldfmfym3hkj7qicmcjiymikag3ydqxp7fq8m7vb3vxdz"; depends=[Biobase BiocParallel Formula ggplot2 multtest optimx plyr]; }; + metagene = derive2 { name="metagene"; version="2.10.1"; sha256="0h7i6jgpz8zh9l1w0w82333bnw7zrdn577s5ma2lcpfpybrr17zs"; depends=[BiocParallel data_table DBChIP EnsDb_Hsapiens_v86 ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges magrittr matrixStats muStat purrr R6 Rsamtools rtracklayer stringr]; }; + metagenomeFeatures = derive2 { name="metagenomeFeatures"; version="1.10.0"; sha256="1c8l4dvw9vaw2kcc11a8six5rcayc2girzzz88lq4a2ly5f225kv"; depends=[ape Biobase Biostrings dbplyr dplyr lattice lazyeval magrittr metagenomeSeq purrr RSQLite ShortRead stringr]; }; + metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.20.1"; sha256="15ib66lir0smsk1zq41g5nf6r93wvg5a3bai44gg7f1cgc5xf4xp"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; }; + metahdep = derive2 { name="metahdep"; version="1.36.0"; sha256="10v5zx3xn9xr18qwb2hy3566xzk4a38084xvbs7cfh9aypq58zfj"; depends=[]; }; + metaseqR = derive2 { name="metaseqR"; version="1.18.0"; sha256="0g707gimklmnhmgicvslmbzam67fmh3h9h4nsqv41pc5kp74n6ql"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; }; + metavizr = derive2 { name="metavizr"; version="1.2.1"; sha256="114nr1nb8wniqb8gq0v6ah9vimbf4k1iy0k2chr0rz6jh7b4larc"; depends=[Biobase data_table digest epivizr epivizrData epivizrServer epivizrStandalone GenomeInfoDb httr metagenomeSeq phyloseq vegan]; }; + methInheritSim = derive2 { name="methInheritSim"; version="1.0.0"; sha256="0ji9yz4x8yk9d156ssfcf4mv0gkrbrfh37w1saywap4680ap47r3"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges methylKit msm S4Vectors]; }; + methVisual = derive2 { name="methVisual"; version="1.30.0"; sha256="0xdzmvhs4hjj12w6lfwa7vcikdgc08krqxdak1959zclw4mp4jq6"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; }; + methimpute = derive2 { name="methimpute"; version="1.0.0"; sha256="0fgdd7dqs2sjvm3g0ivlnb61d8ccc32zvwbjgaw2raz6g4dm4c53"; depends=[Biostrings GenomeInfoDb GenomicRanges ggplot2 IRanges minpack_lm Rcpp reshape2]; }; + methyAnalysis = derive2 { name="methyAnalysis"; version="1.20.0"; sha256="0cmgv74pc4gj1qrsk2a7hx45vssf73hcc80zpqlhwzy3yg103ql3"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer SummarizedExperiment VariantAnnotation]; }; + methylInheritance = derive2 { name="methylInheritance"; version="1.2.0"; sha256="05i7z2b0xyszfadkk0qcgvhx6fxlfv7dcqj6ix0y0349fgsd2phz"; depends=[BiocParallel GenomicRanges ggplot2 gridExtra IRanges methylKit rebus S4Vectors]; }; + methylKit = derive2 { name="methylKit"; version="1.4.1"; sha256="1k0nfn9318sgwm4z963bhnbp4c3zv85v3f9886vc5hgaisr0yvai"; 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.16.0"; sha256="0lq1kgliyy1q48csgc9bprapy9va5kpqlpm87wq4d967a5q0ja5h"; depends=[edgeR statmod]; }; + methylPipe = derive2 { name="methylPipe"; version="1.12.0"; sha256="076z90fmzkp9j4xdlr2amif8kkdmmkh0jcvs384207if09w9i4v9"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; }; + methylumi = derive2 { name="methylumi"; version="2.24.1"; sha256="05hwixscc79hbjx7g94nkrwk26zjf156dlvhgfjr890zn4mj709c"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; }; + methyvim = derive2 { name="methyvim"; version="1.0.0"; sha256="1hz6c4bdgslxrbkr0q9fx6ffrrilxcanm8f5alady5qndm4vmiw1"; depends=[BiocGenerics BiocParallel bumphunter cluster doFuture dplyr future GenomeInfoDb ggplot2 gridExtra gtools IRanges limma magrittr minfi SummarizedExperiment superheat tmle wesanderson]; }; + mfa = derive2 { name="mfa"; version="1.0.0"; sha256="17mwf4p4cr4xz1g32p4j0jaxvzfvjzilyrl9nv686nr7cplgkbgp"; depends=[Biobase coda dplyr ggmcmc ggplot2 magrittr MCMCglmm MCMCpack Rcpp tibble]; }; + mgsa = derive2 { name="mgsa"; version="1.26.0"; sha256="087hmvrrd5x1s6198g9q8nwrpd36zywg39dl4l6x8qkr7zgjzakb"; depends=[gplots]; }; + miRBaseConverter = derive2 { name="miRBaseConverter"; version="1.0.4"; sha256="1cjjikbw6anb1cgwl4718lv1k5acc2fhl6c0gmszdl16x8z2yyz1"; depends=[]; }; + miRLAB = derive2 { name="miRLAB"; version="1.8.0"; sha256="0fj96h1xan56sc71ycc4c5b2q7chncsknmdlj318lz95mydbiwdv"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; }; + miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.6.0"; sha256="1chsigqmfxajd8gll2rq7ccbrsgp9k0cddn4ds4zkiiz6a79iiww"; depends=[AnnotationDbi DBI miRBaseVersions_db]; }; + miRNApath = derive2 { name="miRNApath"; version="1.38.0"; sha256="11137kg0a1l8z2aiz6qisg1gq21rpgzhwr4z8dg0bkh9137jwnx8"; depends=[]; }; + miRNAtap = derive2 { name="miRNAtap"; version="1.12.0"; sha256="0lq3kvs6ri9pdjxwl2hyvdymcnx33avgw7mfg1h6q7dfx0icwiw2"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; }; + miRcomp = derive2 { name="miRcomp"; version="1.8.0"; sha256="1fxmkn5vp0szjjb0cl8vmaz411x7m10krs4j8dkvlnfhzlqhar96"; depends=[Biobase KernSmooth miRcompData]; }; + miRmine = derive2 { name="miRmine"; version="1.0.0"; sha256="09sxjj2pj4s03dqqphywyhvmk3q2gvdn2nph5nplqwny6q9m2i1v"; depends=[SummarizedExperiment]; }; + miRsponge = derive2 { name="miRsponge"; version="1.2.0"; sha256="0c3213hpf78ynqlaj12p0j9172gvlrhrx4rn4kmr6g1ja9xk80k7"; depends=[clusterProfiler corpcor DOSE igraph ProNet ReactomePA survival varhandle]; }; + microRNA = derive2 { name="microRNA"; version="1.36.0"; sha256="0mc81fy9y3jgc3ll074ksmw72d8yp29pyaankn3na24r96lfcxnj"; depends=[Biostrings]; }; + microbiome = derive2 { name="microbiome"; version="1.0.2"; sha256="185igm8dr5irc4bhgjflkxax0gk4lgm3zznqazv378j435194xgh"; depends=[dplyr ggplot2 phyloseq reshape2 tidyr vegan]; }; + mimager = derive2 { name="mimager"; version="1.2.0"; sha256="14r0h676nhsbg175hj7jmkp1ny5wfhykmy2jm2s9qgdsfrgacgv2"; depends=[affy affyPLM Biobase BiocGenerics DBI gtable oligo oligoClasses preprocessCore S4Vectors scales]; }; + minet = derive2 { name="minet"; version="3.36.0"; sha256="1ig9kwh7fvhpglxkda9l5nkaz3rmhl6bc006h6mrz9hl130vmnn8"; depends=[infotheo]; }; + minfi = derive2 { name="minfi"; version="1.24.0"; sha256="1pk5savz9ziarx2iajqnck4vjmh3bnrmzy5m06vx3vmcww46ddi7"; 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.8.0"; sha256="05z8yq7jl3s3i3p9b6p7b16hrshg69gmfs0f67xq0svfb3fqpm85"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; }; + missMethyl = derive2 { name="missMethyl"; version="1.12.0"; sha256="1fvpny7x56l55zhgabm6al2i2n0hix7fp7d01bzirsn7chxpwny3"; 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.16.0"; sha256="11kyihynbl3kcrngv8dhiqn3ghpkvv0xi35pf8np2p41zdhbrpyv"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; }; + mogsa = derive2 { name="mogsa"; version="1.12.2"; sha256="0a29q9jak4vr05ngh2pcsfifa9i6p086acjk2qrzwnc3lcfm00bm"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; }; + monocle = derive2 { name="monocle"; version="2.6.3"; sha256="1qag8q6wy1wf1zx16h2lwki6rn4nxkjff7yhpn8m30hp3v01fvhn"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; }; + mosaics = derive2 { name="mosaics"; version="2.16.0"; sha256="08q48zakyfydrj8vix3a5w0j4ix5h1hpqccv0jxgj55gpdc062kj"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; }; + motifRG = derive2 { name="motifRG"; version="1.22.0"; sha256="193zl2rlzwxv9p9q5i7rilj3w05ndqfyp9bdpvagp5s5cin4hf44"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; }; + motifStack = derive2 { name="motifStack"; version="1.22.4"; sha256="13wrpdgyhzrqdp7k0d7iym2pjjla46rh3i1qwm34j22n7j0pxs8x"; depends=[ade4 Biostrings grImport htmlwidgets MotIV scales XML]; }; + motifbreakR = derive2 { name="motifbreakR"; version="1.8.0"; sha256="1jfff6jgvrylhnpyc5zq1fah33xq8vf7hypv22vg7js6m8bmcx5j"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; }; + motifcounter = derive2 { name="motifcounter"; version="1.2.1"; sha256="1k47yca1w59w0k7w4cxahhq4r2jyb8vflpzmrl7wnypb4lf9mbc0"; depends=[Biostrings]; }; + motifmatchr = derive2 { name="motifmatchr"; version="1.0.1"; sha256="0a7hg307f274n8vxknl0381xpvgphsim07pk7dnh0af3a63lh2ji"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment TFBSTools]; }; + mpra = derive2 { name="mpra"; version="1.0.0"; sha256="11lb626w779hawfl06n85mfm0ld8p46ns6s67fkxcxggr4rbkh82"; depends=[BiocGenerics limma S4Vectors scales statmod SummarizedExperiment]; }; + msPurity = derive2 { name="msPurity"; version="1.4.0"; sha256="105z60rdflpz0j9ckrwc7dpywh9v3lqwbs4adwlrvziz87ah29al"; depends=[DBI doSNOW fastcluster foreach ggplot2 mzR plyr Rcpp reshape2 RSQLite stringr]; }; + msa = derive2 { name="msa"; version="1.10.0"; sha256="15czlzssrxsgjckxy6ckphfcyj2q12iq5q86238xj16wfqphax45"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; }; + msgbsR = derive2 { name="msgbsR"; version="1.2.0"; sha256="0gnv5gk9as3gn85gwgs8agrvzk5948wiwa685xjpwz359vbqnxrs"; depends=[BSgenome easyRNASeq edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr R_utils Rsamtools S4Vectors SummarizedExperiment]; }; + msmsEDA = derive2 { name="msmsEDA"; version="1.16.0"; sha256="1d7h4q8dbiv6p7sfslfmhjhrfr3fkjwl82gvb1179wb8qm3qkgwc"; depends=[gplots MASS MSnbase RColorBrewer]; }; + msmsTests = derive2 { name="msmsTests"; version="1.16.0"; sha256="0gy8y6ca57j7gqp69r008802gfpkay56k4aigy04xij1jd17abx7"; depends=[edgeR msmsEDA MSnbase qvalue]; }; + multiClust = derive2 { name="multiClust"; version="1.8.2"; sha256="01kidj4ggv26981b411vf4lsa61pghb4d56j6nr88r87rja9mn2l"; depends=[amap cluster ctc dendextend mclust survival]; }; + multiMiR = derive2 { name="multiMiR"; version="1.1.0"; sha256="0zl1m62j9gdb11n4xp2piw36ildjvs5z2gw7f3sdjbkdl6jvsgwz"; depends=[AnnotationDbi BiocGenerics dplyr purrr RCurl tibble XML]; }; + multiOmicsViz = derive2 { name="multiOmicsViz"; version="1.2.0"; sha256="1zqlgz2iprwqnib9hsxynygnvwb0mqn4zbgbqrj7nsxsd5qsad51"; depends=[doParallel foreach SummarizedExperiment]; }; + multiscan = derive2 { name="multiscan"; version="1.38.0"; sha256="07fb0a7kn8bjvq9cx4dvdjrf92830vwpz5n31mgk58aw3vg3mz66"; depends=[Biobase]; }; + multtest = derive2 { name="multtest"; version="2.34.0"; sha256="0n11rd49xl2vn3ldmfips7d3yb70l8npjcqsxyswr9ypjhgzkv9j"; depends=[Biobase BiocGenerics MASS survival]; }; + muscle = derive2 { name="muscle"; version="3.20.0"; sha256="16kawdvm08hag2kghdn438z0ysby67p989v3xlcf9r8f62isw6b7"; depends=[Biostrings]; }; + mvGST = derive2 { name="mvGST"; version="1.12.2"; sha256="132s30c116gmbimzf1jw70p0pz4fv6lbfqb90sxnzbqvb8alvs0h"; depends=[annotate AnnotationDbi GO_db GOstats gProfileR graph Rgraphviz stringr topGO]; }; + mygene = derive2 { name="mygene"; version="1.14.0"; sha256="0qqkpsqk99575rc49kj7s5yl22jb96gmk47i5lm700qi4v9fyim4"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; }; + myvariant = derive2 { name="myvariant"; version="1.8.0"; sha256="1r4hqy5jz4xqswj3pfzxmncjapjmcksbx428f7lfncj844198g1q"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; }; + mzID = derive2 { name="mzID"; version="1.16.0"; sha256="0yk70dka56zd8w62f03ggx3mandj91gfa767h9ajj0sd3mjmfqb9"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; }; + mzR = derive2 { name="mzR"; version="2.12.0"; sha256="1x3gp30sfxz2v3k3swih9kff9b2rvk7hzhnlkp6ywlnn2wgb0q8c"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; }; + ncdfFlow = derive2 { name="ncdfFlow"; version="2.24.0"; sha256="1rvqlfzdbqz7a035c2d0rfziail71pvyla6fi3mv1xzrm2vpw0b8"; depends=[BH Biobase BiocGenerics flowCore flowViz Rcpp RcppArmadillo Rhdf5lib zlibbioc]; }; + ndexr = derive2 { name="ndexr"; version="1.0.3"; sha256="05wnjya61w0mbskrfs9k5w04pr3hcf4c8w15y85z7j1vxjhpgwjq"; depends=[httr igraph jsonlite plyr tidyr]; }; + nem = derive2 { name="nem"; version="2.52.0"; sha256="0114b8nzv07gii87rdcvia6n7jn203f5whx6x6x54ijxq8m1fkk8"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; }; + netReg = derive2 { name="netReg"; version="1.2.0"; sha256="1cmh66m5zp1awrg79f8d09b48shq8hyjvkz6mfxrnvqbcj32v8ph"; depends=[Rcpp RcppArmadillo]; }; + netbenchmark = derive2 { name="netbenchmark"; version="1.10.0"; sha256="173jmvslg8vj078psnvk6s4sns8n9zv2z8hkq6iq64pavmn9cf91"; depends=[c3net corpcor fdrtool GeneNet grndata Matrix minet PCIT pracma randomForest Rcpp]; }; + netbiov = derive2 { name="netbiov"; version="1.12.0"; sha256="1xxqrpjsn6pc097d4c1389gn80404pxjxzsm5zz4bcfk30lr5w3l"; depends=[igraph]; }; + nethet = derive2 { name="nethet"; version="1.10.0"; sha256="1ssmjgxmsyzwhsnpq263q3vmspg74xzin6bny3y9icvs8x893mbp"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; }; + netprioR = derive2 { name="netprioR"; version="1.4.0"; sha256="1cppds5a3d8fs4wbfj2asc24ksxk27718gwyyy5hgigy7zx9z4h3"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; }; + netresponse = derive2 { name="netresponse"; version="1.38.0"; sha256="131xbpkaglnspa2zxq49qwn2nnphlh1ly5s5hx8p9a0da2ccspas"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; }; + networkBMA = derive2 { name="networkBMA"; version="2.18.0"; sha256="04rkhi1iiwygilzmfbwsd2acg7cvpmdrli6qb0a0wi1g0yx7k95a"; depends=[BH BMA leaps Rcpp RcppArmadillo RcppEigen]; }; + nnNorm = derive2 { name="nnNorm"; version="2.42.0"; sha256="0dm1h989vkimcf51glqjc1lqiaq28cgym82m99afcisinldnwlhr"; depends=[marray nnet]; }; + nondetects = derive2 { name="nondetects"; version="2.8.0"; sha256="0x06jz8gw97nks84y7pkgqm8p1jqdfgpxcrk48q8pdnc2flaq4a0"; depends=[Biobase HTqPCR limma mvtnorm]; }; + normalize450K = derive2 { name="normalize450K"; version="1.6.0"; sha256="0cdcl7jp9hhk2dkwhyrzxg8f768r3llfi3vy5a5ppann9016nxp6"; depends=[Biobase illuminaio quadprog]; }; + normr = derive2 { name="normr"; version="1.4.0"; sha256="0g1f623f1rzsp7ywm2434gcvws4biziav76iliir5g10zafgw6vc"; depends=[bamsignals GenomeInfoDb GenomicRanges IRanges qvalue Rcpp rtracklayer]; }; + npGSEA = derive2 { name="npGSEA"; version="1.14.0"; sha256="0v99nirx9j4dpfsb1ihyhj7iwy7hkxda6bf0l3326mi13xy2jirb"; depends=[Biobase BiocGenerics GSEABase]; }; + nucleR = derive2 { name="nucleR"; version="2.10.0"; sha256="047ny4dm6x45hsagznwibrq6i3rycvvwmxl8hgh1c2phl87njpbi"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; }; + nucleoSim = derive2 { name="nucleoSim"; version="1.6.0"; sha256="0gyxb4ydhx3igxddp4jh9qg9787bv1lk8dyahq7y96jv4qmmw65k"; depends=[IRanges S4Vectors]; }; + nudge = derive2 { name="nudge"; version="1.44.0"; sha256="1yp2x6hdn6vhvy922f4d74zyw2n5shrhlpxiig50hwd8dar2nn5f"; depends=[]; }; + occugene = derive2 { name="occugene"; version="1.38.0"; sha256="1lwf3kv171lapk4lk8v33996rjb54q3w4dbdn1b64vlcgw5586ip"; depends=[]; }; + odseq = derive2 { name="odseq"; version="1.6.0"; sha256="15qlapq5vp3s99888kmmabvkl0vx507qkkh7v9a9zd7algz5shwj"; depends=[kebabs mclust msa]; }; + oligo = derive2 { name="oligo"; version="1.42.0"; sha256="1rjnsr3h4bi3bjv580iv2rfs9c062qyilm9xxkk3rx2l0ylih05y"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; }; + oligoClasses = derive2 { name="oligoClasses"; version="1.40.0"; sha256="0xly40mz55z0lis2b1zh3nhyf5qw2d8qlrm6n51hz49y0bqjssr9"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings DBI ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; }; + omicRexposome = derive2 { name="omicRexposome"; version="1.0.1"; sha256="13bjic4msqpjh0llqa0fs4nzmskf0h97mi614n458c3109bscdjk"; depends=[Biobase ggplot2 ggrepel gridExtra isva limma MultiDataSet omicade4 PMA rexposome SmartSVA stringr SummarizedExperiment sva]; }; + omicade4 = derive2 { name="omicade4"; version="1.18.0"; sha256="0f83c907lbqw0idzrxl5a7hb4r9ginrj4798ymfkgc2m6a5x1w46"; depends=[ade4 made4]; }; + oncomix = derive2 { name="oncomix"; version="1.0.0"; sha256="015sgiagij3pzxvcqygbby1rsl8ximmwpd09lb50w95xa1ks466z"; depends=[ggplot2 ggrepel mclust RColorBrewer SummarizedExperiment]; }; + oneChannelGUI = derive2 { name="oneChannelGUI"; version="1.41.0"; sha256="0hx5s3y9zgx41p516q9w09crkihyn8hckwmf8jzxj7llrplc3dm1"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; }; + oneSENSE = derive2 { name="oneSENSE"; version="1.0.0"; sha256="0jq4affxz5jr6pn01cz0cwbl1f930v63pzswz787m7lv7bvvbnl4"; depends=[flowCore gplots plotly Rtsne scatterplot3d shiny shinyFiles webshot]; }; + ontoCAT = derive2 { name="ontoCAT"; version="1.29.0"; sha256="057sbc0s08i22gjg886ngz0k59r4v29ssh11qj0wyv4n5g3zs0hg"; depends=[rJava]; }; + ontoProc = derive2 { name="ontoProc"; version="1.0.0"; sha256="0la7lcynmdgavvzdz7b5g726pm4205r8194dnsmnhc5h3lryr36k"; depends=[AnnotationDbi Biobase ontologyIndex S4Vectors shiny]; }; + openCyto = derive2 { name="openCyto"; version="1.16.1"; sha256="1qzx0qq1d2hi5whqi0kbg8xmjbglv6j2fli3wcx932g66lxwg3sv"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; }; + openPrimeR = derive2 { name="openPrimeR"; version="1.0.0"; sha256="0x4h7lcanzclcxnbrj2hii5mpv2b7rm5izm9p51drqylr69gvns2"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; }; + openPrimeRui = derive2 { name="openPrimeRui"; version="1.0.0"; sha256="1mchbalmq6mbxp9mdrmndz3pja7j1ffx5xglnzglfdqm2004gdlf"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; }; + oposSOM = derive2 { name="oposSOM"; version="1.16.0"; sha256="1855wrszaxwc8rghhn1hgj6hrp5mxsyffbs9ccjckq5jl3z7z1mj"; depends=[ape arules Biobase biomaRt fastICA fdrtool igraph pixmap scatterplot3d som tsne]; }; + oppar = derive2 { name="oppar"; version="1.6.0"; sha256="0h4wfgjq8xm5f6bcaj5vxy686ymr42r3ig9zw93ayycpfl81p275"; depends=[Biobase GSEABase GSVA]; }; + pRoloc = derive2 { name="pRoloc"; version="1.18.0"; sha256="0syqcpfwm7bxk7jzr988zx91m7ny4aiy9rc286xakd4snl4vafc0"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class dendextend e1071 FNN ggplot2 gtools hexbin kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo Rtsne sampling scales]; }; + pRolocGUI = derive2 { name="pRolocGUI"; version="1.12.0"; sha256="0d4gv7nkwh8wbgdx37gwg4c29704q3z811cwwxdpx3gdgsa1iizw"; depends=[Biobase dplyr DT ggplot2 MSnbase pRoloc scales shiny]; }; + paircompviz = derive2 { name="paircompviz"; version="1.16.0"; sha256="1yw27k417zcbx2dji8hjw6g1qcp8762k2c9j7gddfck7k7qjf1jc"; depends=[Rgraphviz]; }; + pandaR = derive2 { name="pandaR"; version="1.10.0"; sha256="0x7mandjc2dk020pq8733wshzszrav3i29iq74pnp13dfrz4zb92"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; }; + panelcn_mops = derive2 { name="panelcn.mops"; version="1.0.0"; sha256="0wg88axsgmrsihib7yc1xgm45q5d9dgikqvqncn7fx59i81f6l6c"; depends=[cn_mops GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; }; + panp = derive2 { name="panp"; version="1.48.0"; sha256="1pfajph1wzwww2w9djpkb8rwszjcb0hink81fy27js3ppzm3cc7l"; depends=[affy Biobase]; }; + parglms = derive2 { name="parglms"; version="1.10.0"; sha256="11gxwv274g6fyz3ckl6l7wrzx229zgdparlplb7niz63cqqhggn5"; depends=[BatchJobs BiocGenerics doParallel foreach]; }; + parody = derive2 { name="parody"; version="1.36.0"; sha256="073prpjv5hf2y0864gzjj4c0hlncw81nw877f0yykskpq72df38i"; depends=[]; }; + pathRender = derive2 { name="pathRender"; version="1.46.0"; sha256="11q5nbscf1zcpw437vp12vx7n80dm3m3nymc7r79hbz3idpn16bp"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; }; + pathVar = derive2 { name="pathVar"; version="1.8.0"; sha256="1l8544smgrfqavpv1xjwxj2mv8m8jgp50basylkamg1q1098l1h6"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; }; + pathifier = derive2 { name="pathifier"; version="1.16.0"; sha256="0sr8fnp5i2f38cnxsa3lag60ibjzp169yml55jay2gc0br6bsjm7"; depends=[princurve R_oo]; }; + pathprint = derive2 { name="pathprint"; version="1.6.0"; sha256="0f2icjqxw4q3zgkr71836xhvad488w21xjwy62c2cnh9zbmm47wj"; depends=[]; }; + pathview = derive2 { name="pathview"; version="1.18.2"; sha256="1jspjwf919gifwqx29wgsjfyrdwp6a1i7ip444gcqz9i7crpfwvz"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; }; + paxtoolsr = derive2 { name="paxtoolsr"; version="1.12.0"; sha256="09djd4ix6abljqv70k89p6slghi2y6phyy679f2dsyqn8cmhlp8s"; depends=[data_table httr igraph jsonlite plyr R_utils rJava rjson XML]; }; + pbcmc = derive2 { name="pbcmc"; version="1.6.0"; sha256="123bijvnq29b9sc2wa9a887wdk8223bn26bv64pmrv97qnkvfarg"; depends=[Biobase BiocGenerics BiocParallel cowplot genefu ggplot2 gridExtra limma reshape2]; }; + pcaExplorer = derive2 { name="pcaExplorer"; version="2.4.0"; sha256="1z8nahkz13v86k1c89nypxjxwawds1b4r7inbzns20g61caxxxnc"; 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.22.0"; sha256="0371ns6702nk5s3pj59z04i2sjf24sj0wm3m4rj67q4p5v7v1ksz"; depends=[AnnotationDbi Biostrings ellipse]; }; + pcaMethods = derive2 { name="pcaMethods"; version="1.70.0"; sha256="0ii235g0x0492kh8cfrf28ni0b6vd6fh7kizkqmczzqggd6b1bk8"; depends=[Biobase BiocGenerics MASS Rcpp]; }; + pcot2 = derive2 { name="pcot2"; version="1.46.0"; sha256="1pymhr9ypp5g27bbnayrz4ks8rg5j634bf4l596m2b6c4q9d9rc5"; depends=[amap Biobase]; }; + pcxn = derive2 { name="pcxn"; version="1.0.0"; sha256="105mzgy6bcwmk1nsnlr44bik8pazyjc7zcqn56732g1dj5na5v5w"; depends=[pcxnData pheatmap]; }; + pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.42.0"; sha256="0cs47qzkpphixcwn3fl9pfrw1qans8y51y8lb9phikh4s8cdq061"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pdmclass = derive2 { name="pdmclass"; version="1.47.0"; sha256="1grc1fyn8yhwixi7638bsyb3zc6zhzzrbfh4hcpqk6gf653dls63"; depends=[Biobase fibroEset mda]; }; + pepStat = derive2 { name="pepStat"; version="1.12.0"; sha256="0bnak90zfycd5a9qkz4lhwk4h61pr0pwn3hzaksxcv6c025h0mwm"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; }; + pepXMLTab = derive2 { name="pepXMLTab"; version="1.12.0"; sha256="062bgkdqmp1hqibdar3x3lq1vdkpds9xzadq6fivj0iyx4lwpsl0"; depends=[XML]; }; + pgca = derive2 { name="pgca"; version="1.2.0"; sha256="16v1fdw3abbxh5jmrsam8mhhamhjgkwmx7i16d2kxsybxp3k4zrb"; depends=[]; }; + phenoDist = derive2 { name="phenoDist"; version="1.26.0"; sha256="0mhk918cbk6zg6acs7fzvpy2fkj9gdj0acx5mfzvvypahlfbf1za"; depends=[e1071 imageHTS]; }; + phenoTest = derive2 { name="phenoTest"; version="1.26.0"; sha256="0wl1b9g5wlqzjll1kvgl29fl1qg6dqj9qwz5wfdhkvpxh43z4pyb"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; }; + phenopath = derive2 { name="phenopath"; version="1.2.0"; sha256="150yqs7p63baxg713rh2qhbbg78d58wfmmsk3nqbspm4nk7kl458"; depends=[dplyr ggplot2 Rcpp SummarizedExperiment tibble tidyr]; }; + philr = derive2 { name="philr"; version="1.4.0"; sha256="1b6fvhpdp1wd20sdb72a3mxyrvdxvmsjp99f0hnpvnb1yfnjcm7r"; depends=[ape ggplot2 ggtree phangorn tidyr]; }; + phosphonormalizer = derive2 { name="phosphonormalizer"; version="1.2.0"; sha256="1l0zrrah3p602g61jy5gh9bnv6qi26klwzvfs6c47z3dpsp7ikzy"; depends=[matrixStats plyr]; }; + phyloseq = derive2 { name="phyloseq"; version="1.22.3"; sha256="0djy250cnzvjbb1psxwi4ffsb5yszsk54ma540nw0s7bbqy83pn0"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; }; + piano = derive2 { name="piano"; version="1.18.1"; sha256="11da6z1xsk1r89ggh299yp5d3b4xw3nmmvj0lx6wf1liai4jss06"; depends=[Biobase BiocGenerics fgsea gplots igraph marray relations]; }; + pickgene = derive2 { name="pickgene"; version="1.50.0"; sha256="14wgfjnpa1fnnvf0rrfil556ixdsicfyd3yvs7wwsri42vwixgl9"; depends=[MASS]; }; + pint = derive2 { name="pint"; version="1.28.0"; sha256="0lz5svmm5gqxqcjic4689d07wkbndbszscs25cdm690wdgkvj5bm"; depends=[dmt Matrix mvtnorm]; }; + pkgDepTools = derive2 { name="pkgDepTools"; version="1.44.0"; sha256="0s1zwh8dl8lm99avk3kd88kk5x9s1hmal7aqmc0psw57gxid91qq"; depends=[graph RBGL]; }; + plateCore = derive2 { name="plateCore"; version="1.36.0"; sha256="02h42k6aivmchapa9bl5dxpl37706p31ky4a1hr48yfgacr750sn"; depends=[Biobase flowCore flowStats flowViz lattice latticeExtra MASS robustbase]; }; + plethy = derive2 { name="plethy"; version="1.16.0"; sha256="027z64s0dcyvyzjmggz0s5jas3zcx7ckp2rs6190dp16hrldqrmc"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; }; + plgem = derive2 { name="plgem"; version="1.50.0"; sha256="0sgxppvjiqraw292d1kxwl2lwb6sd1ck1w560q299sp78zsnsaan"; depends=[Biobase MASS]; }; + plier = derive2 { name="plier"; version="1.48.0"; sha256="0n0mj5cwgpqgdlmyhifwb66yp3m3j610f8xs4bkhpk36x9b8bbvx"; depends=[affy Biobase]; }; + plrs = derive2 { name="plrs"; version="1.18.0"; sha256="0y98vknq7052vsapd7wjihczbrfhvnckhxy80sxslbryh3nsmbfs"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; }; + plw = derive2 { name="plw"; version="1.38.0"; sha256="1mys9rslhc3rb23wbvlnxwl4dcca2m395bxfg7i4217hvzai7b25"; depends=[affy MASS]; }; + pmm = derive2 { name="pmm"; version="1.10.0"; sha256="1bzmh0p0c649sqp1lhz8zdqh4k7b3n78akgn2wlhawjbx3lb5f6i"; depends=[lme4]; }; + podkat = derive2 { name="podkat"; version="1.10.0"; sha256="0c93gnrcw8rwq9r4f7kkpsdjflarwixjpadaa05w98vqa9x5ycc4"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; }; + polyester = derive2 { name="polyester"; version="1.14.1"; sha256="10dj2qy5b94qd0j0rm7a6j50zqaxdjjwy583cgci158cf8s8y915"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; }; + ppiStats = derive2 { name="ppiStats"; version="1.44.0"; sha256="14xrvcfbp177mpdlzi2kxmv0v9j93i4r1xsw06fr3gw9a7l6zg3r"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; }; + pqsfinder = derive2 { name="pqsfinder"; version="1.6.3"; sha256="0rf0sjd1gsdvn1qilckp5y9vb7j3wgs9h12gcxcjfrcaax8b3h6h"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; }; + prada = derive2 { name="prada"; version="1.54.0"; sha256="19f8h411mzbrim1wvncr7wa3ah0qc1vy9kzcbx64pcif2xfb5qin"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; }; + prebs = derive2 { name="prebs"; version="1.18.0"; sha256="0ss2rij3lv45d4va4dcpmclyaqmkjwk9hyppylkwlvcbgf0ng8xf"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; }; + predictionet = derive2 { name="predictionet"; version="1.24.0"; sha256="10ki86jp7a4dim849zf5pbvd7bgbil8299xl08akyqf7pl37j2qj"; depends=[catnet igraph MASS penalized RBGL]; }; + preprocessCore = derive2 { name="preprocessCore"; version="1.40.0"; sha256="0mrdgbkb9dcfr9gsqyxfpshnxx60mq97pl98b8yl00l2gfwz48ph"; depends=[]; }; + proBAMr = derive2 { name="proBAMr"; version="1.12.0"; sha256="1arql2f4f6zjsqrshdqmbz8vlvydb5v66q0qa7rmdlz9hj9smahk"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; }; + proFIA = derive2 { name="proFIA"; version="1.4.0"; sha256="0psn21jsrqplgwjisbfzqrfwiqcy45cwi04pmg1w1dw1bbwmjjzp"; depends=[Biobase BiocParallel minpack_lm missForest pracma ropls xcms]; }; + procoil = derive2 { name="procoil"; version="2.6.0"; sha256="0ijqarp7rgszja1yymancygqcxsxw6cg4ydxzipw1wk6a3gl71ck"; depends=[Biostrings kebabs S4Vectors]; }; + profileScoreDist = derive2 { name="profileScoreDist"; version="1.6.0"; sha256="0grw3386czykfq1yxrvqbph9l1xs4hpxb8hx0fjsd0v3mhvgkbk9"; depends=[BiocGenerics Rcpp]; }; + progeny = derive2 { name="progeny"; version="1.0.0"; sha256="1ijhqsk6k70dmkkwxl003r9rcmx7j16z4i8fxjhxnx5d8g3swib9"; depends=[Biobase]; }; + prot2D = derive2 { name="prot2D"; version="1.16.0"; sha256="1fp530fammi9xifx5g72jz8k7y3chjfg3mpybsbf5pzvva1429sj"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; }; + proteinProfiles = derive2 { name="proteinProfiles"; version="1.18.0"; sha256="069ksj5md9m7zylqwy6pyj3p9pa4j04vn4ss4d2r8n7a5z8f7d1g"; depends=[]; }; + proteoQC = derive2 { name="proteoQC"; version="1.14.0"; sha256="1kv8ah7pbfl1gbb1pnjlmdw5bskfyh0hsn0nxraz0ybvwzn3kdsl"; depends=[dplyr ggplot2 MSnbase Nozzle_R1 plotly plyr reshape2 rmarkdown rpx rTANDEM seqinr tidyr VennDiagram XML]; }; + psichomics = derive2 { name="psichomics"; version="1.4.4"; sha256="1h8vg90nlvjmpz8ific6n41xqc3fzs1133hvbyrjzqbwqy0cgqzp"; depends=[AnnotationHub cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma miscTools pairsD3 plyr R_utils Rcpp shiny shinyBS shinyjs stringr survival XML xtable]; }; + psygenet2r = derive2 { name="psygenet2r"; version="1.10.0"; sha256="0xf03vjyjiz4093cqnvi3dm532scx3f17mcf0av96h052vy10qb7"; depends=[BgeeDB Biobase BiocInstaller biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; }; + puma = derive2 { name="puma"; version="3.20.0"; sha256="0pcwppa2zlzpfl5fafl4h5xcf0pnyvz3hkykl192hzp26wcjsc1i"; depends=[affy affyio Biobase mclust oligo oligoClasses]; }; + pvac = derive2 { name="pvac"; version="1.26.0"; sha256="0lmwy5a74ikq0sl6zqw69kag6q3p092qwh1lzvv7rl2j9wm2yl46"; depends=[affy Biobase]; }; + pvca = derive2 { name="pvca"; version="1.18.0"; sha256="1bjv97fq6cpa8j11j0zjpmpxyszr5a2w7z95r47hvqysi1mm7ypv"; depends=[Biobase lme4 Matrix vsn]; }; + pwOmics = derive2 { name="pwOmics"; version="1.10.1"; sha256="02ffzf5hp6mp24pmsivsb8kfarcxqdb7a02narhysp1drccyywzr"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots graph igraph rBiopaxParser STRINGdb]; }; + qcmetrics = derive2 { name="qcmetrics"; version="1.16.0"; sha256="1agypdz696i868j7yzispmbljm5vc67zpfc3njq322bvgcfv6j78"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; }; + qpcrNorm = derive2 { name="qpcrNorm"; version="1.36.0"; sha256="1lgdlggp4g19d47lv3wr87zj7lc50w433f2j9c7sc5symslqzrp5"; depends=[affy Biobase limma]; }; + qpgraph = derive2 { name="qpgraph"; version="2.12.0"; sha256="10xmdlc2h67krc2bbcpv2sjgv8vqdxn49knzpnn22rvgc3ab5np0"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; }; + qrqc = derive2 { name="qrqc"; version="1.32.0"; sha256="0p8r78qrrrkmvbvlapwbdzd363y8qmiwmw3aiipmv959cpbsy2ci"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; }; + qsea = derive2 { name="qsea"; version="1.4.0"; sha256="00fym964mlzkydmd6mmhd2hsv87lga5zg8cc6dglzwycmbmcb7cr"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges gtools HMMcopy IRanges limma Rsamtools rtracklayer zoo]; }; + quantro = derive2 { name="quantro"; version="1.12.0"; sha256="1vw44c0vr1mx5mc89i864l8d9hjp0pyrv6fdd1kzswzdi02nf8bq"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; }; + quantsmooth = derive2 { name="quantsmooth"; version="1.44.0"; sha256="1n0q6mlmsidzw9qifplm9hhcxbx37hb6062mssw1klpmy2x9sfhg"; depends=[quantreg]; }; + qusage = derive2 { name="qusage"; version="2.12.0"; sha256="08x9v602fgdnzff0csiz5nwzmw8ld1z6yy607acncs0hnj16jvcw"; depends=[Biobase limma lsmeans nlme]; }; + qvalue = derive2 { name="qvalue"; version="2.10.0"; sha256="1rd9rnf16kh8wc076kahd9hsb9rfwsbzmz3kjmp0pj6rbiq0051i"; depends=[ggplot2 reshape2]; }; + r3Cseq = derive2 { name="r3Cseq"; version="1.24.0"; sha256="1nahiwz98w788c63d140bjq664dhjmycpkmrcdv4s27hrwpwagz3"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; }; + rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.18.0"; sha256="1n8vlnxsn1n9c1vpss0zzlr2i088gwf34gjr7kvqmpyyplym51q4"; depends=[data_table XML]; }; + rCGH = derive2 { name="rCGH"; version="1.8.1"; sha256="1dmxijdbvmjspc8p1k04as326p98gyjrkdwrhjnzm5jdxm87jjjb"; 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.4.4"; sha256="08hddkq1jpb24gp3id5w0bv48cqzx7h81mvdl0wvjsd8gz31nw2c"; depends=[httr jsonlite]; }; + rGADEM = derive2 { name="rGADEM"; version="2.26.0"; sha256="1rbw8k20ri6jhqn9mgkjzyjp7s1z58bgxd5hb35zcpyd7fb2aifw"; depends=[Biostrings BSgenome IRanges seqLogo]; }; + rGREAT = derive2 { name="rGREAT"; version="1.11.1"; sha256="040pvbnx935f49xgpj3wx64dfsf95f729sb93qmpn74ndpa1f3h6"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; }; + rHVDM = derive2 { name="rHVDM"; version="1.44.0"; sha256="1qw4k1xq4qq378dgymxw83ilw6sb2qk3zm6pk15br4v935016vgz"; depends=[affy Biobase minpack_lm R2HTML]; }; + rMAT = derive2 { name="rMAT"; version="3.28.0"; sha256="0cn7ffipgbj2b7vim6l0flw25nn0w7pdzxzz0m41n2jz18rm7203"; depends=[affxparser Biobase BiocGenerics IRanges]; }; + rRDP = derive2 { name="rRDP"; version="1.12.0"; sha256="0iw4hjhvf32ng8bqhqs0b2s882a8fcvpq4wq8ifrj27n5sxjs5gh"; depends=[Biostrings]; }; + rSFFreader = derive2 { name="rSFFreader"; version="0.26.0"; sha256="1a2m567jnb90ra8vk5wagc756h5fahss3hs4xxky1xgacpafyk5k"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; }; + rTANDEM = derive2 { name="rTANDEM"; version="1.18.0"; sha256="0a6w19kfdg3776iksvw60qyxbrjdvk7d02q5a4kcws1cn73dzpi2"; depends=[data_table Rcpp XML]; }; + rTRM = derive2 { name="rTRM"; version="1.16.0"; sha256="0bckbq0h1iy2vrv3mbzm9bq9r709hgbs240sa2dmf3bwn7329rxh"; depends=[AnnotationDbi DBI igraph RSQLite]; }; + rTRMui = derive2 { name="rTRMui"; version="1.16.0"; sha256="0qx969aivrivccr443jvpvjji3zabp31jgg0cd4ddl5w0gw2i1pm"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; }; + rain = derive2 { name="rain"; version="1.12.0"; sha256="1nlz4vri4blqk4d7hzh8wsda8viwl80f4vhpfx04sxmsz5i9w305"; depends=[gmp multtest]; }; + rama = derive2 { name="rama"; version="1.52.0"; sha256="1g67sv7hm64m0c8g9z9y2pnxhdlbhpddyg6yx364klkx3gn017hp"; depends=[]; }; + ramwas = derive2 { name="ramwas"; version="1.2.0"; sha256="013gqial7zmalh4y2a97fp6262h3038mr2j3pg71vm7r4ww5q16c"; depends=[BiocGenerics biomaRt Biostrings digest filematrix GenomicAlignments glmnet KernSmooth Rsamtools]; }; + randPack = derive2 { name="randPack"; version="1.24.0"; sha256="1qb7r4f8cjmn4wdpqydbqq75xzzxffqbh28dcfbbymcyvnc0vxma"; depends=[Biobase]; }; + rbsurv = derive2 { name="rbsurv"; version="2.36.0"; sha256="1v4fdlfl884w74w6rlap7rqckmk1kiryp2w0zciy4ghilkgikbf5"; depends=[Biobase survival]; }; + rcellminer = derive2 { name="rcellminer"; version="2.0.0"; sha256="1y5rzv9ggfxgyy4z5hm7awd8zb8n57qr2954p2j4ikhj62b6h6z2"; depends=[Biobase fingerprint ggplot2 gplots rcdk rcellminerData shiny stringr]; }; + readat = derive2 { name="readat"; version="1.4.0"; sha256="10pib536kmkpi3ij8cccxyap7zw0q1jfd1bcv4c38vn04jm3smaa"; 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.56.0"; sha256="0sh9r77r2s3fmkbkwrazl705dqwr2wh0mx34pxhjfvfic0jc1r5x"; depends=[Biobase idiogram]; }; + recount = derive2 { name="recount"; version="1.4.6"; sha256="0gqv59rm9k5kcfiq99vxz9g86p2vy7znq5cd84bc7hg6qkva1ah0"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; }; + recoup = derive2 { name="recoup"; version="1.6.0"; sha256="09i0c2wv9c6hqc4mq6kklp0maqskpfxj871j44256dxlfh81xm3b"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 plyr rtracklayer]; }; + regionReport = derive2 { name="regionReport"; version="1.12.2"; sha256="1fvkmd2yfkvkj44ldywr1z0l1cn7c64nq3920fhlarqygv92d7xx"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; }; + regioneR = derive2 { name="regioneR"; version="1.10.0"; sha256="1vprp3l929hwzmvgskbhawfgnrymwc9n2rxd16rgagnv1dxnjxfp"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; }; + regsplice = derive2 { name="regsplice"; version="1.4.0"; sha256="0gzm6xazidlkz33ialrxh47n1glx3bkz484rf7ily965fhs0vv53"; depends=[edgeR glmnet limma pbapply S4Vectors SummarizedExperiment]; }; + restfulSE = derive2 { name="restfulSE"; version="1.0.2"; sha256="14sw5k0bhw059yn8lw6rd275j3756znp7pirdyb1srva53isgdik"; depends=[AnnotationDbi AnnotationHub bigrquery DBI DelayedArray dplyr ExperimentHub GO_db magrittr reshape2 rhdf5client S4Vectors SummarizedExperiment]; }; + rexposome = derive2 { name="rexposome"; version="1.0.0"; sha256="1lg3ms0zx60nbhb7y7bhcl49cf63g0licxjpqrmx2jg9w0ikfj5g"; depends=[Biobase circlize corrplot FactoMineR ggplot2 ggrepel glmnet gplots gridExtra gtools Hmisc imputeLCMD lme4 lsr mice pryr psygenet2r reshape2 S4Vectors scales scatterplot3d stringr]; }; + rfPred = derive2 { name="rfPred"; version="1.16.0"; sha256="1m79rykh534iss41nw62j0dyx6v0vqk543m7dlgl7zm2kpyzdpc3"; depends=[data_table GenomicRanges IRanges Rsamtools]; }; + rgsepd = derive2 { name="rgsepd"; version="1.10.0"; sha256="0r1adlc7dxwnm8h6nh4w05z3bffvr10cch7i68a7dli968yza2vj"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; }; + rhdf5 = derive2 { name="rhdf5"; version="2.22.0"; sha256="145858qg1xan6imxcbprzq3yn3mdf532aahdr6cibvdjg47hs4c1"; depends=[zlibbioc]; }; + rhdf5client = derive2 { name="rhdf5client"; version="1.0.7"; sha256="0hq812larfzim4cpq26mx6ckcrpz6p1m55xl2z9dk7zwqapnd2ri"; depends=[httr rjson S4Vectors]; }; + riboSeqR = derive2 { name="riboSeqR"; version="1.12.0"; sha256="0fg2zn5az1djdjnsrli26rl53ljrrjzmspx02dmgwf1a7nm7qmfz"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools seqLogo]; }; + rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.36.0"; sha256="0y0mxzs24jz9nxcvjxymj0zxjfn1rlx3d8dzvdmfn98lbgyzm4dv"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; }; + rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.8.0"; sha256="050dc6asknh8snk6xkvpp5ivyikalslsawadh11lnw5wb4fixmhm"; depends=[RColorBrewer]; }; + roar = derive2 { name="roar"; version="1.14.0"; sha256="1q0a9l3wrlpr0s9gy93zm6lpxp6b18kg8bm2hn0759b73qpqw2bf"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; }; + rols = derive2 { name="rols"; version="2.6.1"; sha256="0xcsfgnsykdx4iiixsx7iafnzspirpkvx4bj5swfkmay6gfif27w"; depends=[Biobase BiocGenerics httr jsonlite progress]; }; + ropls = derive2 { name="ropls"; version="1.10.0"; sha256="05fr2s8ciqn20scr6b9i4bnss7ah2svyfg6jcs605w8vc1i90bmw"; depends=[Biobase]; }; + rpx = derive2 { name="rpx"; version="1.14.0"; sha256="004kq35qzk7a16vwiqxxc42k3djvwnay70hl65913z09cv8k48mk"; depends=[RCurl xml2]; }; + rqt = derive2 { name="rqt"; version="1.4.0"; sha256="1i563yifxib3lib3x734nvkx7r1nnkp2x9hh7yrkrbwr6pp5hv39"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; }; + rqubic = derive2 { name="rqubic"; version="1.24.0"; sha256="1568ipcnbgby4vwv0w8ak267dhg2ad5axxgir09xwxqdp3vm7cxm"; depends=[biclust Biobase BiocGenerics]; }; + rsbml = derive2 { name="rsbml"; version="2.36.0"; sha256="10bbvjv1ihps5r1rx4hrfmdssgvak1dy15098jk61rqdl50xrf8i"; depends=[BiocGenerics graph]; }; + rtracklayer = derive2 { name="rtracklayer"; version="1.38.3"; sha256="1khzfczm35k5lq9h0jlqrq01192spzjyh8s6is89spj006flwn4k"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; }; + runibic = derive2 { name="runibic"; version="1.0.2"; sha256="1nccwf551jpskh4adg3swfcdg2qwvq17cjigjq0aqp8ymcqani8v"; depends=[biclust Rcpp SummarizedExperiment testthat]; }; + sRAP = derive2 { name="sRAP"; version="1.18.0"; sha256="0yh1a2nlr1cy82vsp8kqghzgy84mwig1cpdys68bapj3cdzv9g5s"; depends=[gplots pls qvalue ROCR WriteXLS]; }; + sSeq = derive2 { name="sSeq"; version="1.16.0"; sha256="08japi9dybqzvhcjj6yvchy94lbv62wbcd7kz3ilcygs6ykawqlh"; depends=[caTools RColorBrewer]; }; + safe = derive2 { name="safe"; version="3.18.0"; sha256="0wpbmisvgkz1axx930nh5dx4dmhgmz2z5g17k1ifyvigpap75hh2"; depends=[AnnotationDbi Biobase SparseM]; }; + sagenhaft = derive2 { name="sagenhaft"; version="1.48.0"; sha256="0g3jd86gv8zkdjqjd617b9chrl6gmbilhzsa7afkxzbqvr7k3h4y"; depends=[SparseM]; }; + samExploreR = derive2 { name="samExploreR"; version="1.2.0"; sha256="0hbdcybv99h1wfpnlwinkwnbiizprl0zvdrnqbw9z049mvw6dls4"; depends=[edgeR ggplot2 RNAseqData_HNRNPC_bam_chr14 Rsubread]; }; + sampleClassifier = derive2 { name="sampleClassifier"; version="1.3.1"; sha256="06l1clgs3xkv86pm7k4an5nbsiwykmclshcqdyyz820hjil4jzys"; depends=[annotate e1071 ggplot2 MGFM MGFR]; }; + sangerseqR = derive2 { name="sangerseqR"; version="1.14.0"; sha256="162rmbri3il6xf4ifl46q7yryp3fhcxy5vyg3s7rnhk2c7scm2ss"; depends=[Biostrings shiny]; }; + sapFinder = derive2 { name="sapFinder"; version="1.16.0"; sha256="1xwm6ljpsfq2ps0568lk7ybab2x1zhijwgn6c1qvrwp674y3h51q"; depends=[pheatmap Rcpp rTANDEM]; }; + savR = derive2 { name="savR"; version="1.16.0"; sha256="1z50z5lf6x58phcsbrmy2pwz9zgm89yb0lpr9v4i5rd46bfi22ib"; depends=[ggplot2 gridExtra reshape2 scales XML]; }; + scDD = derive2 { name="scDD"; version="1.2.0"; sha256="04d4h29kv8k3i92jpbckcakky6f7ww4mjgv9f3ha702c8vphp5c1"; depends=[arm BiocParallel EBSeq fields ggplot2 mclust outliers S4Vectors scran SingleCellExperiment SummarizedExperiment]; }; + scPipe = derive2 { name="scPipe"; version="1.0.6"; sha256="16day8ga9qp9y4aff2z6j1y9lclpzzl7nqw1h3pawfpy465kwif8"; depends=[BiocGenerics biomaRt GGally ggplot2 MASS mclust Rcpp reshape Rhtslib robustbase S4Vectors scales SingleCellExperiment SummarizedExperiment zlibbioc]; }; + scater = derive2 { name="scater"; version="1.6.3"; sha256="0q3s96gf8saa1dq2fvmpl0jyj7bx3wrdfck3hanb8pxkcir2p7dn"; depends=[beachmat Biobase BiocGenerics biomaRt data_table dplyr edgeR ggbeeswarm ggplot2 limma Matrix matrixStats plyr Rcpp reshape2 rhdf5 Rhdf5lib rjson S4Vectors shiny shinydashboard SingleCellExperiment SummarizedExperiment tximport viridis]; }; + scde = derive2 { name="scde"; version="2.6.0"; sha256="0cxaail8sa0bn56gp88x64p0k022hixh44s32i37al4wd70nlv12"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; }; + scfind = derive2 { name="scfind"; version="1.0.0"; sha256="1rm2sgdv3z2lxrlws227z6q8h4ydpbvnd37l7f8pask1nc6zbky3"; depends=[bit dplyr hash Rcpp reshape2 SingleCellExperiment SummarizedExperiment]; }; + scmap = derive2 { name="scmap"; version="1.1.5"; sha256="0jqgk9sjb5bp5gbzq14vsif5gd5ry4213glvnpmhgqm23hmwbfhi"; depends=[Biobase BiocGenerics dplyr e1071 ggplot2 googleVis matrixStats proxy randomForest Rcpp RcppArmadillo reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; }; + scone = derive2 { name="scone"; version="1.2.0"; sha256="1xq48d3z78p54iclb1ii074i7f88qfzh5djfiyrwf3k6gsapadfi"; depends=[aroma_light BiocParallel boot class cluster compositions diptest edgeR fpc gplots hexbin limma matrixStats mixtools rARPACK RColorBrewer rhdf5 RUVSeq SummarizedExperiment]; }; + scoreInvHap = derive2 { name="scoreInvHap"; version="1.0.0"; sha256="04q2rs1gw7v97lwcialyswqzl0kd5c5298v60cm6wha25i6lwgbs"; depends=[BiocParallel Biostrings GenomicRanges snpStats SummarizedExperiment VariantAnnotation]; }; + scran = derive2 { name="scran"; version="1.6.9"; sha256="0cs64cnf0xjcgmawr210y99j3gxs6aqgh8081n9827kkqnx2y5dm"; depends=[beachmat BiocGenerics BiocParallel DT dynamicTreeCut edgeR FNN ggplot2 igraph limma Matrix Rcpp Rhdf5lib S4Vectors scater shiny SingleCellExperiment statmod SummarizedExperiment viridis zoo]; }; + scsR = derive2 { name="scsR"; version="1.14.0"; sha256="05xqrv1babqvlvr4m5k0r7yy4fbr0y46f3i4v4zcjilda1qf54pb"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; }; + segmentSeq = derive2 { name="segmentSeq"; version="2.12.0"; sha256="0jqdddzrxahf6i7cmaay5v9ig9969avhv8ddh72v6ndfphlkfb64"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; }; + semisup = derive2 { name="semisup"; version="1.2.0"; sha256="14q2p38a8r4ry8swwi88k96rchmcnplknq1a62lvm98k09k1887r"; depends=[SummarizedExperiment VGAM]; }; + seq2pathway = derive2 { name="seq2pathway"; version="1.10.0"; sha256="0wz9x4kv2zw21sppkmfp9qmclwffm5yhzx580yd3iggi1calq8bg"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; }; + seqCAT = derive2 { name="seqCAT"; version="1.0.0"; sha256="00m0w0l14y8k1viqv60n8p384lv80vnny3x9f5rmi1bba02kxkw7"; depends=[dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges lazyeval S4Vectors scales SummarizedExperiment tidyr VariantAnnotation]; }; + seqCNA = derive2 { name="seqCNA"; version="1.24.0"; sha256="1qq217mrxi0ygafyy4fvbjxhwabvific2bj0iq7871dx4dq3mcf9"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; }; + seqLogo = derive2 { name="seqLogo"; version="1.44.0"; sha256="1ql4q4vx0j61a893dqc3c8zxmgs8sqhy3j1qhyfdvbd01vw9w1kq"; depends=[]; }; + seqPattern = derive2 { name="seqPattern"; version="1.10.0"; sha256="1kcm5w83q7w0v0vs7nyp4gq5z86c6n6pqy9zmyyhxcrns7f597pm"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; }; + seqTools = derive2 { name="seqTools"; version="1.12.0"; sha256="1m69xbd9p3mzwn9wgn30b6995lydn973dfz9l65c0f5qr59ww5ns"; depends=[zlibbioc]; }; + seqbias = derive2 { name="seqbias"; version="1.26.0"; sha256="1i1zqslv0qws12x45c37h7fkgpz5wv3v87h72n4pw8gh80bgcafl"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; }; + seqcombo = derive2 { name="seqcombo"; version="1.0.0"; sha256="0bkap2c1061yg2ws2m1fafxi37pqzkg9mzim5sqiq8sgcfmk6na6"; depends=[Biostrings cowplot dplyr ggplot2 igraph magrittr rvcheck]; }; + seqplots = derive2 { name="seqplots"; version="1.16.0"; sha256="1plwmdq2hjcqs94l7s03h9amcxdimwdrmi11z03xn10dfn1xig70"; depends=[Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 Rsamtools RSQLite rtracklayer S4Vectors shiny]; }; + sevenbridges = derive2 { name="sevenbridges"; version="1.8.0"; sha256="1jlw69yxh697q3bwd54mvzfiqskg469jyyh97sqnlizjmm5hiw11"; depends=[curl docopt dplyr httr jsonlite liftr miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; }; + shinyMethyl = derive2 { name="shinyMethyl"; version="1.14.0"; sha256="17w7shgr4s5w3y1ik8zgr9brv7q87dx9l6dfqywsyvfmmkddimwa"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; }; + shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.16.0"; sha256="17x0bq1kzvmqqf30y0dmmp9777i62525mp4ysyv2m6vb9bgrbc4y"; depends=[mixtools rTANDEM shiny xtable]; }; + sigPathway = derive2 { name="sigPathway"; version="1.46.0"; sha256="18nn7rpg67dz30v1drm0lnsb1wnww7maxdg4gk960wayasp8hk2z"; depends=[]; }; + sigaR = derive2 { name="sigaR"; version="1.26.0"; sha256="196jj39frqi9vmdl592ihkji4vxfimv6xr9cbmlgnnpjpd68b05k"; depends=[Biobase CGHbase corpcor igraph limma marray MASS mvtnorm penalized quadprog snowfall]; }; + siggenes = derive2 { name="siggenes"; version="1.52.0"; sha256="1g88rga3pksmydkqd117wsqj1i5hfzi3rkadac51n8bk0sx6rfmw"; depends=[Biobase multtest]; }; + sights = derive2 { name="sights"; version="1.4.0"; sha256="1hnzvx9avgvv4jgsgilbdyri9qqbf4sbcpyy47j31sg70ilzydxs"; depends=[ggplot2 lattice MASS qvalue reshape2]; }; + signeR = derive2 { name="signeR"; version="1.4.0"; sha256="0rmdwjhp6ps9bvmhk1znarzg1kk319sb2rvxr51qwwka7idxfa0n"; depends=[BiocGenerics Biostrings BSgenome class GenomicRanges nloptr NMF PMCMR Rcpp RcppArmadillo VariantAnnotation]; }; + sigsquared = derive2 { name="sigsquared"; version="1.10.0"; sha256="0v68p83k43xx7yvxzknxzwqyvvccffi557dlz25wh8v8s3wkyk2c"; depends=[Biobase survival]; }; + similaRpeak = derive2 { name="similaRpeak"; version="1.10.0"; sha256="144mc40q2jgswk2w1ri5bh0cs8lgs0b6s1jwljrilfpvjww0r36f"; depends=[R6]; }; + simpleaffy = derive2 { name="simpleaffy"; version="2.54.0"; sha256="0b91hlsgq61rbwv08w2951dric7chvq1mfsp9716qvw7l8jqngng"; depends=[affy Biobase BiocGenerics gcrma genefilter]; }; + simulatorZ = derive2 { name="simulatorZ"; version="1.12.0"; sha256="1nzkaa6x0my1pk4h8naznckmzdd72wwdfxk6ivczbpnzxhnpz8nd"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; }; + sincell = derive2 { name="sincell"; version="1.10.0"; sha256="07p2ck9wzxw4kz9bzxq8kggmmy2yvbz939mcn43giag1chx2ndax"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; }; + sizepower = derive2 { name="sizepower"; version="1.48.0"; sha256="199rqpbjp4l5faw6z9srfg7vs7kmdbzh12vm52s02v8mayb46mbp"; depends=[]; }; + skewr = derive2 { name="skewr"; version="1.10.0"; sha256="0s78dp3lg27x4qrs9q9nvi69vfrphncf5ivm15rf9k49smhr3bh3"; depends=[IlluminaHumanMethylation450kmanifest IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; }; + slalom = derive2 { name="slalom"; version="1.0.0"; sha256="0jjr9k7fdvi4sg1ivnb65migcmyz3rg3fwm9gd50q6w80bs64g89"; depends=[BH ggplot2 GSEABase Rcpp RcppArmadillo rsvd SingleCellExperiment SummarizedExperiment]; }; + snapCGH = derive2 { name="snapCGH"; version="1.48.0"; sha256="12pdmmywr9lf44kna3wr59h1zyjck3734qw11ahhah40j5k247xd"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; }; + snm = derive2 { name="snm"; version="1.26.0"; sha256="14fpxl3h7673qffavknavjnlwcqk22qx3qh7i1p2i35gg3qw5rs0"; depends=[corpcor lme4]; }; + snpStats = derive2 { name="snpStats"; version="1.28.0"; sha256="1x9qwynh2hwl24vq02naf4mchpch7xi2pkdrlgw896k28kx0lvir"; depends=[BiocGenerics Matrix survival zlibbioc]; }; + soGGi = derive2 { name="soGGi"; version="1.10.0"; sha256="0jlpyq55byaqlnmn9n2k5scmm4iv7gzyl0ll7fn6ddhi3vxw4jxi"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + sparseDOSSA = derive2 { name="sparseDOSSA"; version="1.2.0"; sha256="0pbj09424a8f0xsr446bcxqgmha2zzmfvrcszknli1ai7isp23sq"; depends=[MASS MCMCpack optparse tmvtnorm]; }; + specL = derive2 { name="specL"; version="1.12.0"; sha256="03bkh0z3pd6jl47wq2h6zd73fvaggwnaj2b4ibijwkg1643mfiip"; depends=[DBI protViz Rcpp RSQLite seqinr]; }; + spikeLI = derive2 { name="spikeLI"; version="2.38.0"; sha256="00fixl9jpjfm0qgsg1lwi0315sa53j1j9fbrl69j8y2gbr8kgg28"; depends=[]; }; + spkTools = derive2 { name="spkTools"; version="1.34.0"; sha256="0vpyv78c6c58qrcz91mir7jh9gx2j2l48bclabvgi0k2156wpwn7"; depends=[Biobase gtools RColorBrewer]; }; + splatter = derive2 { name="splatter"; version="1.2.1"; sha256="0iap91mmfan5p8wcpkxmqrrlk4zhgcigl08js5k1kcizmqkiar5g"; depends=[akima BiocGenerics BiocParallel checkmate edgeR fitdistrplus ggplot2 locfit matrixStats scales scater SingleCellExperiment SummarizedExperiment]; }; + spliceR = derive2 { name="spliceR"; version="1.20.0"; sha256="1skwj4cqf4s14df42jgy5b9fxrb5c5np9khc0wkg732qddbdlagd"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; }; + spliceSites = derive2 { name="spliceSites"; version="1.26.0"; sha256="19av0wkdvy4x4p0nkhy9ca450d6j0s68m2lp26116ydh4lzv4p8x"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; }; + splicegear = derive2 { name="splicegear"; version="1.50.0"; sha256="0i47l91p77s4acgrx9c8ll2va7amysw1g2acs36mn99hpz86v4m4"; depends=[annotate Biobase XML]; }; + splineTimeR = derive2 { name="splineTimeR"; version="1.6.0"; sha256="12x1lzcz8xih462nbzihdn9npypzr9clwy36vvwrfwh2plcq7314"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; }; + splots = derive2 { name="splots"; version="1.44.0"; sha256="09zcf9l3mr3y650di1v5h47fp020n0cf5hp9ccjwf1480wwl7rpn"; depends=[RColorBrewer]; }; + spotSegmentation = derive2 { name="spotSegmentation"; version="1.52.0"; sha256="0jmhgk37na16fhlfqx3a6fhm7syyh25qh4nrwgc4f94d13hs70mp"; depends=[mclust]; }; + sscore = derive2 { name="sscore"; version="1.50.0"; sha256="0ivs9fb6ps0hv1ywja95x9xbsmljcv6zjkpvyb25a6l06vyjdh08"; depends=[affy affyio]; }; + sscu = derive2 { name="sscu"; version="2.8.0"; sha256="1aa48cr8xxin9vzv280k7m4z6qy59gzclhdnj9gpxrh90kghv5vs"; depends=[BiocGenerics Biostrings seqinr]; }; + ssize = derive2 { name="ssize"; version="1.52.0"; sha256="02c1gwl4c6sf95k0rgahb2vbgwi53vlfz6nydg7zmqa3hvf16mr3"; depends=[gdata xtable]; }; + ssviz = derive2 { name="ssviz"; version="1.12.0"; sha256="1q8hvqpqniyfma8k2j0xpb8jnc05xdazh74kk3b0fkriqz11n8xw"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; }; + staRank = derive2 { name="staRank"; version="1.20.0"; sha256="0f7ql6sc5dxk86ca4qmlgsbvzvw1h97y6jmzbrcvn24n9c3hkrgy"; depends=[cellHTS2]; }; + stageR = derive2 { name="stageR"; version="1.0.0"; sha256="0553av4ys27ag7v77mfb7wxw7d09g1f0vf4615jcjir9mvc6y3qj"; depends=[SummarizedExperiment]; }; + statTarget = derive2 { name="statTarget"; version="1.8.0"; sha256="0z6niv4i50f8b7g78c7rcdrniblvv5sq2phb7vd2glnh038r1rl0"; depends=[gWidgets2 gWidgets2RGtk2 impute pdist pls plyr randomForest ROC rrcov]; }; + stepNorm = derive2 { name="stepNorm"; version="1.50.0"; sha256="10fd623pqy944q9l913bv1a3dh7wk4i0r211hvvzdr39kfhjl6mf"; depends=[marray MASS]; }; + subSeq = derive2 { name="subSeq"; version="1.8.0"; sha256="1z9qwfclhnnvcp4r4zfi201rmgd0hj47rd77x958m1d6d3z65m34"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; }; + supraHex = derive2 { name="supraHex"; version="1.16.0"; sha256="10lhdhlb33p91np6ldmxc8yqgxwly7p37nlacm77q35dp05a453n"; depends=[ape hexbin MASS]; }; + survcomp = derive2 { name="survcomp"; version="1.28.4"; sha256="185k9srpfzvr51xfbgq1xy39x40cxgcvvq772y9gdk1702fxvyw0"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; }; + sva = derive2 { name="sva"; version="3.26.0"; sha256="0q5xb68wfcnchy8rkv5ma67pmz1i91lsnvmwmj8f1c3w4xan3pgw"; depends=[BiocParallel genefilter limma matrixStats mgcv]; }; + swfdr = derive2 { name="swfdr"; version="1.4.0"; sha256="0ls0w09bkxxqv1y50d5c1s0qpxb1xdyall8ypvky8awi7v6jlrcg"; depends=[dplyr ggplot2 reshape2]; }; + switchBox = derive2 { name="switchBox"; version="1.14.0"; sha256="0mhkf4wwd3v3s1148nafbd6x6ys8j933glh4gp3wj24ddmmpxvb2"; depends=[gplots pROC]; }; + switchde = derive2 { name="switchde"; version="1.4.0"; sha256="0fxdg1d0jgqqas5cwmpcm96qfja0xw62x1421ahxfsrh1q6hqay6"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; }; + synapter = derive2 { name="synapter"; version="2.2.0"; sha256="1m9s2pdm38wb5riyy0wf8g4a2ilrrkznsy9virdiqqm5kqzpkzic"; depends=[Biobase Biostrings cleaver knitr lattice MSnbase multtest qvalue RColorBrewer readr rmarkdown]; }; + synergyfinder = derive2 { name="synergyfinder"; version="1.4.2"; sha256="11zpza9ghd1dckb604c5v3rxpgf6v29qm9yp1vpdnm04gfj2q6iy"; depends=[drc ggplot2 gplots gridBase lattice nleqslv reshape2 SpatialExtremes]; }; + synlet = derive2 { name="synlet"; version="1.8.0"; sha256="1pchh66wg3cvx1kq1l521lg7w0qpnw5azig339pnpwwymh9fpa5j"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; }; + systemPipeR = derive2 { name="systemPipeR"; version="1.12.0"; sha256="11mj8pjq5vj25768vmagpzv74fvi3p3kdk5zdlznqyiaggri04cv"; 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.16.0"; sha256="1whnx5ka8jhqsis68drs7ah3dg5lj6vfw3a42l7s8mp94n0qdixj"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd samr sigPathway topGO]; }; + tenXplore = derive2 { name="tenXplore"; version="1.0.0"; sha256="0f57ak81vndff6xij2hn28xnrly1088sw7bc1jgfgzldy94mxn1m"; depends=[AnnotationDbi matrixStats ontoProc org_Mm_eg_db restfulSE shiny SummarizedExperiment]; }; + ternarynet = derive2 { name="ternarynet"; version="1.22.0"; sha256="1k8s31zjyrid1wkhg5ighphi8nr8i5nbcd0sjqpjzv1zhi35hdaa"; depends=[igraph]; }; + tigre = derive2 { name="tigre"; version="1.32.0"; sha256="007lnj4hcq8sls8vdr59h7hjjsdjwk3i6snx97i8ply683ndc3ph"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; }; + tilingArray = derive2 { name="tilingArray"; version="1.56.0"; sha256="0ahw51r1zsb47r2q90670ngakb34y49d3njwlchyk2r6vz3kzqkb"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; }; + timecourse = derive2 { name="timecourse"; version="1.50.0"; sha256="0lr4znyi82mqjm02wwr7zq6l2cfbq2gliynxim45xhahqp43cbpr"; depends=[Biobase limma marray MASS]; }; + timescape = derive2 { name="timescape"; version="1.2.0"; sha256="0v3a7gn2d852h8m0053a57w153z4nlmp5mb5g96kjw06vvwr71jd"; depends=[dplyr gtools htmlwidgets jsonlite stringr]; }; + tkWidgets = derive2 { name="tkWidgets"; version="1.56.0"; sha256="0z1vd0nymyvvrn5jc97q33y9xl6w8pd4wzb6yyfjg8jy85kswfgf"; depends=[DynDoc widgetTools]; }; + tofsims = derive2 { name="tofsims"; version="1.6.0"; sha256="1zpq0c01fqm3yl2mkvx1yl2ajj2a933wa6h7hinrh3mdyix8pzrn"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; }; + topGO = derive2 { name="topGO"; version="2.30.1"; sha256="1cgz4knxr328xfqlhl6ypxl6x86rfrlqz748kn94ainxjzz55i6x"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; }; + topdownr = derive2 { name="topdownr"; version="1.0.0"; sha256="1yshm8a6dirnmda5ydx1ksndbbcrqlp25lrj1rqxnaclqb9xn0g2"; depends=[Biobase BiocGenerics Biostrings ggplot2 Matrix MSnbase mzR S4Vectors]; }; + trackViewer = derive2 { name="trackViewer"; version="1.14.1"; sha256="029yff299x23imqyk62cmxcsvdx34a6b4l9zp4p46iq3jb841h66"; depends=[AnnotationDbi GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges grImport Gviz htmlwidgets IRanges pbapply Rsamtools rtracklayer S4Vectors scales]; }; + tracktables = derive2 { name="tracktables"; version="1.12.0"; sha256="02l5n4sbwzig5kdnjyhhqpiwskaf8f4pqkra3m511vrqfpmd39f3"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; }; + transcriptR = derive2 { name="transcriptR"; version="1.6.0"; sha256="0malha3w4vm21bmqdvn8y9q37m0ilghbyzmwgayvx9lvy3mfnk2s"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; }; + transcriptogramer = derive2 { name="transcriptogramer"; version="1.0.0"; sha256="08yab83dkwjwbbgf05k05c32yn74ls8xy7lm3yr39sb3nfqmra9n"; depends=[biomaRt data_table doSNOW foreach igraph limma progress RedeR snow topGO]; }; + traseR = derive2 { name="traseR"; version="1.8.0"; sha256="1zqcz7w8pwc2vzjr137iv1bpfddh17kvmqaz7hgs9z1962704l0y"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; }; + treeio = derive2 { name="treeio"; version="1.2.2"; sha256="1m92hrfgy3lca7x674qp41j2x4gpanfvvc7gsmxw3d1q7fwqlvwl"; depends=[ape ggplot2 jsonlite magrittr rvcheck]; }; + trena = derive2 { name="trena"; version="1.0.3"; sha256="1yk88mc3lcgm75wzqgl6xz4f1vk1i5q9qybr5m7s71m4dvwszgpb"; depends=[AnnotationDbi BiocParallel biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI flare GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RMySQL RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 stringr vbsr]; }; + triform = derive2 { name="triform"; version="1.20.0"; sha256="09hlnkrbzgk0vn1jcbja2i0hv54pfr2nzf33ik0rabrvv75zhb46"; depends=[BiocGenerics IRanges yaml]; }; + trigger = derive2 { name="trigger"; version="1.24.0"; sha256="16r7b0wy37pbylz9ch6516nygpxrb31qm42i8amh04jy60zw64rw"; depends=[corpcor qtl qvalue sva]; }; + trio = derive2 { name="trio"; version="3.16.0"; sha256="1bw0cy95qrzmg6qiy9j8n4ydi734z3q78l1pnaxagdk1ji5ab577"; depends=[]; }; + triplex = derive2 { name="triplex"; version="1.18.0"; sha256="0x74ykqkjhbbarzgkdba090lw61n3wzpy4izsnnbawix96wqy6dx"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; }; + tspair = derive2 { name="tspair"; version="1.36.0"; sha256="079wj12v6x5df2cvmhwg241042h6lgbky4hpa36b3pd7z6pjsq6w"; depends=[Biobase]; }; + tweeDEseq = derive2 { name="tweeDEseq"; version="1.24.0"; sha256="1ms9psb5xagkxam117iksb1fj815jdlymddhlf3kv6hgyj4bx793"; depends=[cqn edgeR limma MASS]; }; + twilight = derive2 { name="twilight"; version="1.54.0"; sha256="0b7k6dw23814qgzwqxrvpaj3f22fmkivd32scspf4i2rzm33dh53"; depends=[Biobase]; }; + twoddpcr = derive2 { name="twoddpcr"; version="1.2.1"; sha256="0d8i2vr3db16nndgw4sy0kmkx7517pykvp48jsrw26n38gbbmvx0"; depends=[class ggplot2 hexbin RColorBrewer S4Vectors scales shiny]; }; + tximport = derive2 { name="tximport"; version="1.6.0"; sha256="1gyqcm91hxg1kgjqcz2qw1n56yp9pymjzs50rwcpb2893dr8sp2h"; depends=[]; }; + uSORT = derive2 { name="uSORT"; version="1.4.0"; sha256="0zr6x9na95n055jk5csipvvd8dsf9pzqh7y4z4fhzfgj8bb2rwbv"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; }; + unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.14.0"; sha256="1d6khk7d6crrlhp3plwfi0d7nxvdk02ggnm4s5s6c5s3jpk64jra"; depends=[BiocGenerics HTqPCR]; }; + variancePartition = derive2 { name="variancePartition"; version="1.8.1"; sha256="08isp7j3dd9qii7ly8sf2glpc7x9r6dpc0ci4ix3l5diw2lq30xx"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 MASS pbkrtest reshape2]; }; + vbmp = derive2 { name="vbmp"; version="1.46.0"; sha256="01bzkdjpb5hv9h2pf4p4h2w19771wc5p6hvij7ywygdx560hb93p"; depends=[]; }; + viper = derive2 { name="viper"; version="1.12.0"; sha256="1k9yfz010v1g5ap900m1skaxc7ygy20y4xdc8a2c0dgfkclnw59m"; depends=[Biobase e1071 KernSmooth mixtools]; }; + vsn = derive2 { name="vsn"; version="3.46.0"; sha256="18y62phzirj75gg6v5l41jwybmk23ia6w7qhch0kxc4bl2rysw6j"; depends=[affy Biobase ggplot2 lattice limma]; }; + vtpnet = derive2 { name="vtpnet"; version="0.18.0"; sha256="02nws97nmlrpzwb5jqm3fmg38mp1qdf41hzwmmprhfhsymnmc4ch"; depends=[doParallel foreach GenomicRanges graph gwascat]; }; + vulcan = derive2 { name="vulcan"; version="1.0.0"; sha256="1yxm6yg7d65wh9rl6k5b6831y4hr5l9nnmfi0azxz1h4x1ghqbdj"; depends=[Biobase caTools ChIPpeakAnno csaw DESeq DiffBind GenomicRanges gplots locfit S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene viper wordcloud zoo]; }; + wateRmelon = derive2 { name="wateRmelon"; version="1.22.1"; sha256="08imbxhs4ikm6panz3y64b24d2ghy1s2ksgd8siff53hg2v59rqr"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; }; + wavClusteR = derive2 { name="wavClusteR"; version="2.11.0"; sha256="0f1lk45a9yqr0ysjq8kjpqys8qln2b8ix03nywcqnkl1lk2b5ymi"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; }; + waveTiling = derive2 { name="waveTiling"; version="1.20.0"; sha256="1dlz548vjnarz15mscmj56jp2hn810w0dy7xprxx22n51h7kb7jg"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; }; + weaver = derive2 { name="weaver"; version="1.44.0"; sha256="06fg8z4gp2mabiy9jrfwkrrz1r4qzzgjk3lxj6d53ii2xhq95vy6"; depends=[codetools digest]; }; + webbioc = derive2 { name="webbioc"; version="1.50.0"; sha256="1kg6apnhq97ypmpx6qm2f7wip81f910mjlg9kmd9zzmhnkrhqamd"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; }; + widgetTools = derive2 { name="widgetTools"; version="1.56.0"; sha256="0xkasd8z4sy9dsb2r7k3x2vhbqh9md39bz3qqwjsz8hgl6f0ggsr"; depends=[]; }; + wiggleplotr = derive2 { name="wiggleplotr"; version="1.2.0"; sha256="1scqvmh16y6c81qlvfa8y9z47p8wl4lccq0sm5wy4jay6zch8mn2"; depends=[assertthat cowplot dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges purrr rtracklayer S4Vectors]; }; + xcms = derive2 { name="xcms"; version="3.0.2"; sha256="0qk9mjg4qdv88vmcsdalf59za46ifikxp7snwf5a6n3jaykzx4xl"; depends=[Biobase BiocGenerics BiocParallel lattice MassSpecWavelet MSnbase multtest mzR plyr ProtGenerics RANN RColorBrewer S4Vectors]; }; + xmapbridge = derive2 { name="xmapbridge"; version="1.36.0"; sha256="0jv07kgjh3jkk61bw92kr3s10sai427f93r5j5hjzjhn6wzpahqy"; depends=[]; }; + xps = derive2 { name="xps"; version="1.38.0"; sha256="1xmsbjkcy04nz1npbr2bia1p4x4q6b55mmk0vqkphjl6x93dw6c8"; depends=[]; }; + yamss = derive2 { name="yamss"; version="1.4.0"; sha256="08mq0f27if86wacck1317fhm6gchxqzbj2vj9sxasr865jdzr1r9"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; }; + yaqcaffy = derive2 { name="yaqcaffy"; version="1.38.0"; sha256="144kz9q7ahrvv5h6r96pva039s1ms2pz5rsqkx1hv1jjb19070lg"; depends=[simpleaffy]; }; + yarn = derive2 { name="yarn"; version="1.4.0"; sha256="1gr7nwhp8gpzv6zbwh56q37bkgq1g61i1lhqsps40izwr2ib8qiv"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; }; + zFPKM = derive2 { name="zFPKM"; version="1.0.0"; sha256="1bj2a1m0ivnv604796d1x4cf9y2nwwbsql5k3vvv1gvjp7wlp81v"; depends=[checkmate dplyr ggplot2 SummarizedExperiment tidyr]; }; + zinbwave = derive2 { name="zinbwave"; version="1.0.0"; sha256="0r7drhs77brk0p47kvz8s0xcwpsrgmwrqzzshs84ip1sgci41iia"; depends=[BiocParallel copula edgeR genefilter glmnet SingleCellExperiment softImpute SummarizedExperiment]; }; + zlibbioc = derive2 { name="zlibbioc"; version="1.24.0"; sha256="1zr9hbh55hglfpy15cpxwmddxblhyb0an15953l3rbhmlh2vpy92"; depends=[]; }; } diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index b3feb98ebc3cdfeaf3c7c135d453127924289120..8e8085fdece50bb3e7756c50fcad102047c43c66 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,20 +4,21 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2017-09-27"; }; +let derive2 = derive { snapshot = "2018-03-12"; }; 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.2.1"; sha256="0wac1ksmnxa36v99ca4hv8k0rsh3igwpcllmlv9wf7i9kgqviqwi"; depends=[plotrix]; }; - ABCoptim = derive2 { name="ABCoptim"; version="0.14.0"; sha256="0nqnflidknwxj4bzql486cs4fi51iwyw73b5sdf26s705hkknhj0"; depends=[Rcpp]; }; + ABCoptim = derive2 { name="ABCoptim"; version="0.15.0"; sha256="1ih0xk88qhsmpvnxf56041wx5sk8as2f4f2gdnpnwdym9mbr9n4b"; 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]; }; + ABPS = derive2 { name="ABPS"; version="0.2"; sha256="1k3f5i34f4w2khkszb4qhwwcpiy7gsfh82vjr6rypwg6rx5rjclq"; depends=[kernlab]; }; ACA = derive2 { name="ACA"; version="1.0"; sha256="0z4wz85iv5k5vw29m6xfh2v96shv314nbxkv3v3yhl77br4bmj4q"; depends=[]; }; 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.8.0"; sha256="0626d6kg485xjya164wagrr5z223jvi93ywbwpdns7fkm03c0dlq"; depends=[BH MASS Rcpp RcppArmadillo]; }; - ACMEeqtl = derive2 { name="ACMEeqtl"; version="1.4"; sha256="02hc33g35x59jn9skcspgam1qskjvwy5djrg2djl9qmwq4aj0j9k"; depends=[filematrix]; }; + ACMEeqtl = derive2 { name="ACMEeqtl"; version="1.6"; sha256="049xjv2ym35bbn43zwi68cq27fwdh404vp0r2ca5gxgmmx8kj1cz"; 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]; }; @@ -26,6 +27,7 @@ in with self; { ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; }; ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; ADM3 = derive2 { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; }; + ADMM = derive2 { name="ADMM"; version="0.2.2"; sha256="0rwszi152nm6rrmgh23js2cv0yfrsa6vky4gmrgszxgx8sw221v9"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; }; ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; }; ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; }; @@ -39,11 +41,12 @@ in with self; { 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-1"; sha256="0y2lgvy0a78wdx4xcq85fkhl4hyvjdljrj199mibisfgkh61amb1"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; - AID = derive2 { name="AID"; version="2.2"; sha256="11ch5nl3c4fb4b0whz67apf9hq2gwj5a54ri5g1d5xv0xcacxg58"; depends=[ggplot2 MASS nortest psych tseries]; }; - AIG = derive2 { name="AIG"; version="0.1.7"; sha256="0fg2g74cg7nsgsfvglr91f0bcqnszs1c8vr1zkybq2sgy1kcpnaa"; depends=[dplyr magrittr mgcv rgl]; }; + AID = derive2 { name="AID"; version="2.3"; sha256="0p3cjbd6kxdy5igmgzkc2bd3w0p0w1jb9jkn9n0id5lv44b5gskj"; depends=[ggplot2 MASS nortest psych tseries]; }; + AIG = derive2 { name="AIG"; version="0.1.8"; sha256="19vw3gycj0i41g08jaf4jh1nff7d0dpqga1hs20gs3n02cxim6mg"; 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]; }; + ALEPlot = derive2 { name="ALEPlot"; version="1.0"; sha256="14dbn357g48la45xn4x7x5slja7rsrnin8k9s5c4is4rxvigwhwb"; depends=[yaImpute]; }; 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=[]; }; @@ -53,16 +56,21 @@ in with self; { 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]; }; + AMIAS = derive2 { name="AMIAS"; version="1.0.1"; sha256="17ay7dgi2c7ybps337ngyc1lg6fy84lxvkqfrr8nf5rjapw8mg6w"; depends=[limSolve Matrix zoo]; }; + AMModels = derive2 { name="AMModels"; version="0.1.3"; sha256="1lhd15sh550z664qqxw6jpknnh628hm585d70ipx8s4mswi6g4hj"; 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=[]; }; + AMR = derive2 { name="AMR"; version="0.1.0"; sha256="1vp2l4xfd44sy14fqir2d7kq8835np6hnrzdhqkwxh5vjw8wkfyx"; depends=[dplyr reshape2 rvest xml2]; }; ANLP = derive2 { name="ANLP"; version="1.3"; sha256="1m1jnfaqny6qprgyk4f3naan5i5cildawv322h6mc25nypwl12m4"; depends=[dplyr qdap RWeka tm]; }; + ANN2 = derive2 { name="ANN2"; version="1.5"; sha256="17b0dv1dl4kni7yvrrwk65cadk6f7qk7505r27j9v530pffyv1k3"; depends=[Rcpp RcppArmadillo robustbase]; }; ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; - ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.1"; sha256="1gx61xzcjqsrqhcxjza5j8wq20rddf7r6z3xvrwjz24svyggr6xg"; depends=[quadprog shiny]; }; - APML0 = derive2 { name="APML0"; version="0.4"; sha256="0cl2ylfwmkzjv0jjr77am5747y6vh1vv457zlp89h9miz4pcjcfl"; depends=[Matrix Rcpp RcppEigen]; }; + ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.3"; sha256="1cmps21lrmk6lh6gx0q9fz2736q7cibfcisvir6hnik3ablv70bn"; depends=[quadprog shiny]; }; + APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; }; + APML0 = derive2 { name="APML0"; version="0.7"; sha256="1ivlyljyllkd53y3ckar7mrdykmd8fz3sg8i1xgfygrcnq79qz0i"; depends=[Matrix Rcpp RcppEigen]; }; + APPEstimation = derive2 { name="APPEstimation"; version="0.1.1"; sha256="1bg9ma4i3k3xdgyk2h4f368gqnczvlhvjw4114iznmrv1wl4g25c"; depends=[densratio]; }; APSIM = derive2 { name="APSIM"; version="0.9.2"; sha256="0yyjz1kyvqpw9dh71ls2lf44gbb6r7bp9a22mr3z68k89azps5rc"; depends=[data_table lubridate plyr RSQLite sirad stringr]; }; APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; - APfun = derive2 { name="APfun"; version="0.1.1"; sha256="0vb5lmyq8wnwnxikhslaqxd65rs2pv0k3l5bghdzj6s0hp1j6kxp"; depends=[raster rgdal]; }; + APfun = derive2 { name="APfun"; version="0.1.2"; sha256="0qw769ifcc7g9jq8ba2sxghcck52cspj3rpg8pkj2i185vg0lw77"; depends=[maptools raster rgdal sp yesno]; }; 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]; }; @@ -73,21 +81,24 @@ in with self; { ARTP = derive2 { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; }; 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]; }; + ASICS = derive2 { name="ASICS"; version="1.0.1"; sha256="0axjq2a99kl6qk05w5r9ddx3954m60739miarbwadlqwnsd5lkqk"; depends=[doParallel foreach ggplot2 plyr quadprog zoo]; }; ASIP = derive2 { name="ASIP"; version="0.3.2"; sha256="0zrn3hnn46zxmvchicyzy7zz2jnv8y1249a6sdi3w9rw2d8q025g"; depends=[gdalUtils raster rgdal]; }; ASMap = derive2 { name="ASMap"; version="1.0-2"; sha256="0fhivq5i2py79jkwfms0my77p9x8lrkn5vn1lwbsawfkyar4dvkq"; depends=[fields gtools lattice qtl RColorBrewer]; }; ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; }; ASSISTant = derive2 { name="ASSISTant"; version="1.2-3"; sha256="072lmvmdi5yfyfda42vs556ciwj2rnka02isnknk6czir3947nck"; depends=[mvtnorm R6]; }; ATE = derive2 { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; }; + ATR = derive2 { name="ATR"; version="0.1-0"; sha256="0ljrpix3ksi0v38sfb25s2dlfj1yjbvwcz147dk2v2c24cn3r816"; depends=[partykit]; }; ATmet = derive2 { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; }; AUC = derive2 { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; }; 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.189"; sha256="0q9ss6cyx8vv85zif5v4s2bkv0amhyvzbs41mjjgmwb1csg53jgd"; depends=[rJava]; }; - AWR_Athena = derive2 { name="AWR.Athena"; version="1.1.0"; sha256="0vix7lx3kl0gm5jy1w4dp60qff485j5mvfvd972qs4zhcn4yv02b"; depends=[rJava RJDBC]; }; + AWR_Athena = derive2 { name="AWR.Athena"; version="1.1.0-1"; sha256="0p701jj1683npsxa3l5g0cd35yvp9823kadpw9fjvn9ixdfy1nk1"; depends=[rJava RJDBC]; }; AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; }; AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; }; - AbSim = derive2 { name="AbSim"; version="0.2.2"; sha256="0z2d3rjpr4fw0m3b1hdb5dz7mciw61jadbapgs0258j3j3r4knyp"; depends=[ape poweRlaw]; }; + AbSim = derive2 { name="AbSim"; version="0.2.4"; sha256="0n90zbm5nsb9ric92p0mp3a4nzivdh8m8dls18051v2dbn5h4z1v"; depends=[ape poweRlaw]; }; AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.5.1"; sha256="15srxkxsvn38kd5frdrwfdf0ad8gskrd0h01wmdf9hglq8fjrp7w"; depends=[Biobase DESeq limma Rcpp RcppArmadillo]; }; + Ac3net = derive2 { name="Ac3net"; version="1.2.2"; sha256="1ns4n0xxz6p34c11bj0k7nzgmyqr9mis2b0g5nfz37dbikndyqyz"; depends=[data_table]; }; 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]; }; @@ -113,40 +124,45 @@ in with self; { AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; }; AlignStat = derive2 { name="AlignStat"; version="1.3.1"; sha256="1x9nlf3z6rpfca3k3cqm673sid418mnl44df9v93nyj5dpd70ylc"; depends=[ggplot2 Rcpp reshape2 seqinr]; }; AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; }; - AlleleRetain = derive2 { name="AlleleRetain"; version="1.3.4"; sha256="1jpn497plvgv1f9nwfpp5n765n7jr43cs5kz807a3fld8sjy0x2i"; depends=[]; }; + AlleleRetain = derive2 { name="AlleleRetain"; version="2.0.2"; sha256="0b6h5giskqbjbrk8nf29i75wrhxsjw1c87laiqzrpbp9n717bl20"; depends=[]; }; AlphaVantageClient = derive2 { name="AlphaVantageClient"; version="0.0.1"; sha256="095m850v945lw7i3qd812p28srdb5hdk9h52zf6bkr166zai1ni0"; depends=[httr xts]; }; Amelia = derive2 { name="Amelia"; version="1.7.4"; sha256="0w6532s5xr7pw47zqhhymql7i68c4lralvw1gc26l9d4c7ib00fd"; depends=[foreign Rcpp RcppArmadillo]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; - AmesHousing = derive2 { name="AmesHousing"; version="0.0.2"; sha256="0grms331mndk86nsyjp9why1ikjx7ycnf9hccvwkxkf86n0519w9"; depends=[dplyr magrittr]; }; + AmesHousing = derive2 { name="AmesHousing"; version="0.0.3"; sha256="1fr01ka8x8gdnky6cbd2bjlh1lx71gzq440zsknn9kxvf01s6pxm"; depends=[dplyr magrittr]; }; AmmoniaConcentration = derive2 { name="AmmoniaConcentration"; version="0.1"; sha256="05pnwfji9l9az4jvni6jy7cayzg5pbspz82a63kmj6rgibn4ywvn"; depends=[]; }; AmostraBrasil = derive2 { name="AmostraBrasil"; version="1.2"; sha256="06y555gl9g89gygrv1rhg8j1bhb38m09mvvw67wvwhdl56j0fqbd"; depends=[foreign RCurl rgdal RJSONIO sp stringr]; }; AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1"; sha256="1vqpahavsksphxjyhd94dghg9ddskbfbs5vl5qcwl3jkjfvl7lwy"; depends=[ggplot2 xtable]; }; - AmyloGram = derive2 { name="AmyloGram"; version="1.0"; sha256="0qifcx8i29il1lih6smd38cbxqf6rnkx1nncb1yplhyjmi6vdng3"; depends=[biogram ranger seqinr shiny]; }; + AmyloGram = derive2 { name="AmyloGram"; version="1.1"; sha256="1xdi3i3nw4fzj4d040r55f0gid72gy3vbz5nbdrvapl97zk3kp8c"; depends=[biogram ranger seqinr shiny]; }; AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; }; + AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.1"; sha256="1v8jlyzqp9k084lzmaihp5nh7mybbgnnxnbbfkydq24b9wskfd4b"; depends=[Rcpp]; }; AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[fastICA R_matlab]; }; AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.2"; sha256="0ll4g8yzxhricz56vin8hhyplrmvjmkwfldya41vz6y6bwhywnmb"; depends=[MASS TSA tseries TTR urca]; }; AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; }; - AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="0.2.1"; sha256="100mbmdllk6c32j75jviz2k9kmwca3jvrqb95a555alfcpkfim8c"; depends=[]; }; + AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.0"; sha256="0vkb50v3by5z7qmaqpdb81zmbz23f315k09mpfy7qwsjfdgcpshv"; depends=[dplyr ggplot2]; }; AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; }; AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.1"; sha256="1pdwb4zmvirbn3aikd66djhzwga18w50krgn43mlw5dpa9c7fvhv"; depends=[ape seqinr]; }; + AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; }; 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="2.2.1"; sha256="0rh5s616q56kxmlbw4nazff0qvpmbdzyvygf9q4iqfzs9a9ln2wy"; depends=[shiny]; }; + AnthropMMD = derive2 { name="AnthropMMD"; version="2.3.3"; sha256="1q8pjxlrba7dna647pkzyj41scq8xghx5h7ac3jamhrkdppf5fdk"; depends=[MASS shiny]; }; Anthropometry = derive2 { name="Anthropometry"; version="1.9"; sha256="1d1grh952kfpanz4vpvdbnx4yn42kkc6z78cc601l70azar2p7zg"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; + Aoptbdtvc = derive2 { name="Aoptbdtvc"; version="0.0.2"; sha256="1bygvf8vgzz3wa4485x2xxpk784zmw1nwsjjjysm12brrldh8zzh"; depends=[lpSolve MASS]; }; 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.2"; sha256="1fxxg6080kg6n0wk8hm2qwjry88m6q6z4h9000zwpdfhf3fir1i2"; depends=[boot glmnet Matrix]; }; + ArCo = derive2 { name="ArCo"; version="0.3-1"; sha256="1afjdmcalx3m19jlvqs83fg5qlds59l5zzg3pzk13qk31r0hz7mk"; depends=[boot glmnet Matrix]; }; ArDec = derive2 { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; }; - ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.2"; sha256="13canmrg1k4crxhzmrjpnkm8fwb4cv75wp7qjq6hl7bj5nqnva55"; depends=[coda dplyr DT ggplot2 ggthemes hdrcde readr shiny shinythemes]; }; + ArchaeoChron = derive2 { name="ArchaeoChron"; version="0.1"; sha256="1qma2432mm73h72g9ah1k02wlcb6yrhc6mpai9nj7v58s126ffxn"; depends=[ArchaeoPhases Bchron coda rjags]; }; + ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.3"; sha256="0012rjbk3bxf6j7p0skp02yrgqzl903dclnmm7c038f941krjcfq"; depends=[coda DT ggalt ggplot2 ggthemes hdrcde readr shiny shinythemes toOrdinal]; }; 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]; }; AsioHeaders = derive2 { name="AsioHeaders"; version="1.11.0-1"; sha256="1g226im9aakqdv5gynsl568w0mxcbfrny9lqid7pl984pq8xr8ks"; depends=[]; }; AssayCorrector = derive2 { name="AssayCorrector"; version="2.0.0"; sha256="0d2444if5hyfbzyminnspw686r5l4pf9cdj9k48n2539vd61k452"; depends=[kSamples lattice latticeExtra RColorBrewer RVAideMemoire]; }; AssetPricing = derive2 { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[deSolve polynom]; }; - AssocTests = derive2 { name="AssocTests"; version="0.0-3"; sha256="0vin9jkyvmgwk3kjf32qd8q9cj8ibmvdggbh8ny6f413ldyd77qc"; depends=[cluster combinat fExtremes mvtnorm]; }; + AssocAFC = derive2 { name="AssocAFC"; version="1.0.1"; sha256="0fxqsj2a9wi5py4sw3mzf27zx82nbj1q294vj1n0jh9ryc68wyh3"; depends=[CompQuadForm]; }; + AssocTests = derive2 { name="AssocTests"; version="0.0-4"; sha256="1fhqzbj4aj4srkiba79w8wdyc7yy701izklxqqa7lsifnca6gn4j"; depends=[cluster combinat fExtremes mvtnorm]; }; AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; }; AsynchLong = derive2 { name="AsynchLong"; version="2.0"; sha256="1wjby75rpypzyrxnv2lgl7h2fsvyni3bpiwclp0x7cl4sxic1x5c"; depends=[]; }; AtelieR = derive2 { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[cairoDevice gWidgetsRGtk2 partitions proto]; }; @@ -157,29 +173,32 @@ in with self; { AutoSEARCH = derive2 { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[lgarch zoo]; }; Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; }; AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; }; - AzureML = derive2 { name="AzureML"; version="0.2.13"; sha256="03b2s76dbzvpy32vj5kb030k1x64lll4bfv0ci92rii9l35653gc"; depends=[base64enc codetools curl foreign jsonlite miniCRAN uuid]; }; + AzureML = derive2 { name="AzureML"; version="0.2.14"; sha256="1jhlbgfm3mr772hdkfi8jbv5lw8a08yb49sqaa14m1nz4ar9rckv"; depends=[base64enc codetools curl foreign jsonlite miniCRAN uuid]; }; B2Z = derive2 { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; }; BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; }; BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; }; BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; }; BACprior = derive2 { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[boot leaps mvtnorm]; }; BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; - BALCONY = derive2 { name="BALCONY"; version="0.1.6"; sha256="13hy0ysg3vsm6v1acqwdifl4g3z6gxv97by49pq5adkjizhvsyvz"; depends=[Rpdb scales seqinr]; }; + BALCONY = derive2 { name="BALCONY"; version="0.1.8"; sha256="0bnhwz319dy1wc9g2sxb5w2hn8ypzxgaghrg4r82yjl5xig8qmd5"; depends=[Rpdb scales seqinr]; }; BAMBI = derive2 { name="BAMBI"; version="1.1.1"; sha256="1jzvsaf9cn28ny40vg0wlvdqz6f4i7n6iyym8s0aj58aiazwsmh5"; depends=[label_switching Rcpp RcppArmadillo]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; }; + BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.1"; sha256="1xs65drkpd1zmrvyrv0kndd5z5q4y425524w6mrh96qya9qjrmsx"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2 zoo]; }; 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.9.1"; sha256="0vjpvxjkxwnwd85g4igpwf2g82i4hlvwq8x02ap7srjd2b2h6av1"; depends=[coda rjags rstan runjags]; }; - BART = derive2 { name="BART"; version="1.3"; sha256="1jlch8r9jklfjjlmjmdxsjw8lsqzc1wmgr4b94phlj4cgxxbc8ri"; depends=[Rcpp survival]; }; - BAS = derive2 { name="BAS"; version="1.4.6"; sha256="0fhldihrl94aj4kx5wlqyy7i8d9cm92zhk33ilarrymmksccinmp"; depends=[]; }; + BANOVA = derive2 { name="BANOVA"; version="1.1.1"; sha256="11cvf7wjip1vn5qn9hwxvdh98i8li9ijydfywf2ks2hls2430qbk"; depends=[coda rjags rstan runjags]; }; + BART = derive2 { name="BART"; version="1.5"; sha256="0vhyxyp0bbbkyymkwhll8jck3n4mybglshmfs9bycn4xmmm5rq8j"; depends=[Rcpp survival]; }; + BAS = derive2 { name="BAS"; version="1.4.7"; sha256="0rpgfzwc41clkdf20mh6wdd2fari84rfgfgzxw04lb3b3s7hz8y4"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; }; + BASiNET = derive2 { name="BASiNET"; version="0.0.2"; sha256="1qik3r52hygxldw3sw0sln7yw7z0bmybavf0kf9fmpkyir0z0xvn"; depends=[Biostrings igraph randomForest rgl rmcfs RWeka]; }; 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]; }; + BAwiR = derive2 { name="BAwiR"; version="1.0"; sha256="0bic9f84cnjka6vk55icjviqr206fmv7lnihvdksnbghgcya890w"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plotly plyr purrr reshape2 rvest rworldmap scales stringi stringr tidyr xml2]; }; 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]; }; + BBMV = derive2 { name="BBMV"; version="2.0"; sha256="18sikaj3l5bvbpnl03rzm0h3zrgnnwv716spb2050jz6gzvgd2dx"; depends=[ape]; }; BBRecapture = derive2 { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI lme4 locfit secr]; }; BBmisc = derive2 { name="BBmisc"; version="1.11"; sha256="1lh1n4bvxzivb5rbz69mvd8xdgr3gr2bnqd68a39sd1530l8r90y"; depends=[checkmate]; }; BCA = derive2 { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[car clv flexclust Rcmdr RcmdrMisc rpart]; }; @@ -189,50 +208,54 @@ in with self; { BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; BCEA = derive2 { name="BCEA"; version="2.2-5"; sha256="0jiizwnxycbz9x8fmkcw3rcjkgg5b9fawyddf8swvx23cnfm6z8z"; depends=[MASS]; }; BCEE = derive2 { name="BCEE"; version="1.2"; sha256="08jsnsy7l182n0gy2jy0l9a7grr62g57gz3217fzapk2im2q648b"; depends=[BMA leaps Rcpp RcppArmadillo]; }; - 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.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=[]; }; + BClustLonG = derive2 { name="BClustLonG"; version="0.1.2"; sha256="0w35pwv3y00pmi4qjnzii3q44k7lk13x0cmh1zq3cl42gpi31p7f"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; }; BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; }; - BDgraph = derive2 { name="BDgraph"; version="2.40"; sha256="0dhmqgwsb89ph6zk507rg4qqjf9srflywf7v3v26q1f0qpxam87s"; 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]; }; + BDgraph = derive2 { name="BDgraph"; version="2.44"; sha256="055pmjf8pgfqih6bxjj34gz7gj78y4z3kldy561z7mi443kwphq6"; depends=[igraph Matrix]; }; + BEACH = derive2 { name="BEACH"; version="1.2.1"; sha256="0a6xwczw3d2jnksb5lpf7j859pnyfxcab4kfv4v7lmf9iasbyyf5"; depends=[devtools DT haven plyr readxl rJava rtf sas7bdat shiny WriteXLS xtable]; }; BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; }; 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.5.0"; sha256="178vn0ps6nr7qjayavnvmbyx6gq57dni5llsncl89kkz633mb2hg"; depends=[coda HDInterval rjags]; }; - BETS = derive2 { name="BETS"; version="0.3.2"; sha256="11fzwh7r371y6aqjn568jfv3qjaxyj4ij4rg56nj3ahzrimfgdg2"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly RCurl rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; }; + BETS = derive2 { name="BETS"; version="0.3.3"; sha256="09xgf356casig06q7jys5h55y8kj0ndnr7mkymgzcvni7djc5gq3"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny stringr urca webshot xml2 zoo]; }; BGData = derive2 { name="BGData"; version="1.0.0"; sha256="0xd7xpnvhpyvv6caxyif7wa25llvrnyzmmk4z6rp7absjqbz2alc"; depends=[BEDMatrix bigmemory bit ff LinkedMatrix symDMatrix]; }; + BGGE = derive2 { name="BGGE"; version="0.6.1"; sha256="1ndn4cj9mrkx2mrlh2dgyy3lpx526fmg91zqgvdcbvn99r5sl17j"; depends=[]; }; 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.65.0-1"; sha256="0n6byzrvl1w4hjdxz479q4a7w1118f9ckqc4gqydq7lgzs5agfl2"; depends=[]; }; + BH = derive2 { name="BH"; version="1.66.0-1"; sha256="14kab6wp0c27d8x4jqyf065p4bj210s9b67c0bfsfjnp29aypn8p"; depends=[]; }; BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; }; BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.1"; sha256="1qygizn2np9amkm1f1332zp9ab9ky423plr9lahgwzdxn1c2c5c2"; depends=[AnalyzeFMRI fmri wavethresh]; }; - BHPMF = derive2 { name="BHPMF"; version="1.0"; sha256="0b7dl4wxhkk47cnj1dxdjnf094cabqb8ncyl7pdi0zx6h4py9h8w"; depends=[Matrix]; }; BIEN = derive2 { name="BIEN"; version="1.2.2"; sha256="11bqbkw6v4yvlvpv0bhmn5q7ady12hmp9ziak5jzsc7p4d8azd5r"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; }; - BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.2-22"; sha256="1m5kybi4mp7ghhv0cwdgfpqbclrp317wncns0hpbqywcqngxy3j4"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; }; - BIGDAWG = derive2 { name="BIGDAWG"; version="1.16"; sha256="04l0x8g81ij7varj0s40fsmajfkr630s70f0brv41s4zcznv25sz"; depends=[haplo_stats knitr rmarkdown XML]; }; - BIGL = derive2 { name="BIGL"; version="1.1.0"; sha256="18qsdw3nb3wjrzdr3yg8kfqxbv761c5gc6qg937k8g87wiagrplp"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; }; + BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.3-18"; sha256="0cf5nbqcfvx76v1iia2d48j6dg9sqscmjrl0r835xbssiv9xk5w4"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; }; + BIGDAWG = derive2 { name="BIGDAWG"; version="2.1"; sha256="0zvy5sl94qi20gdrnxb2lmadfy7p0wqfngjsf6jc2cgwyzk4gnrj"; depends=[haplo_stats httr knitr rmarkdown XML]; }; + BIGL = derive2 { name="BIGL"; version="1.1.1"; sha256="008f3x0hkmifra1wcv56hxjjf2rqc9qxsbpi23aq4pgk7mxdaax7"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; }; + BINCOR = derive2 { name="BINCOR"; version="0.1.0"; sha256="0fzynq85zbjybylxrpk89sq4l1ccm8k4z1bn25b6rgnz5m18r8hs"; depends=[pracma]; }; 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]; }; + BIOMASS = derive2 { name="BIOMASS"; version="1.2"; sha256="1d9rwgh0ws27yd0p2la7pn49sb71lh9bg4f42fpx448ah8dimw17"; depends=[httr jsonlite minpack_lm msm raster]; }; 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]; }; + BIS = derive2 { name="BIS"; version="0.1.0"; sha256="0m9wvz4vg9vpw6dxjdxzi3vbkflvs4041xjrpic5jngw0jv8fjz0"; depends=[dplyr readr rvest tidyr xml2]; }; 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.5"; sha256="0wnxfyl8hz1a0k33v5nc3j1ziwcv1fnw8639l0xv92p5rn7n5nc5"; depends=[mvQuad numDeriv randtoolbox Rcpp ucminf]; }; BLR = derive2 { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; }; + BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; }; 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=[]; }; + BMRBr = derive2 { name="BMRBr"; version="0.1.0"; sha256="1z54annplzydnxvwd0rkhcw5rmfx8r99k28ld5rgh22xq3zdq825"; depends=[rvest xml2]; }; BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; }; BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; }; BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; }; - BMhyb = derive2 { name="BMhyb"; version="1.5.1"; sha256="1xrf9l4bgksa0v40ywsbbbj7l2ixn6lndx3xx020c8xf7jgfpv7x"; depends=[ape corpcor DEoptim geiger lhs Matrix mvtnorm numDeriv phylobase phytools TreeSim viridis]; }; + BMhyb = derive2 { name="BMhyb"; version="1.5.2"; sha256="0sf12xibr22i3pqdb7zay1mmgfnvqxdlimsbd8y5pi4ybiqz8bl8"; depends=[ape corpcor DEoptim geiger lhs Matrix mvtnorm numDeriv phylobase phytools TreeSim viridis]; }; 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]; }; + BMisc = derive2 { name="BMisc"; version="1.2.0"; sha256="0mfwa3614xgvlwl44r9p3ic34z9q9qilnhvb8p95s40xi622wphy"; depends=[formula_tools plm]; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; + BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; }; BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; }; BNPMediation = derive2 { name="BNPMediation"; version="0.1.0"; sha256="0bfsayhhhf60qr8nvs4yhshnb7ank70529abpqdxb506ni67pny1"; depends=[condMVNorm DPpackage mnormt]; }; BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; }; @@ -240,40 +263,43 @@ in with self; { BNSL = derive2 { name="BNSL"; version="0.1.3"; sha256="1918dc73gasac45kzcf4pxvl8iaawzkqdi03ny0napbjr3z8rss2"; depends=[bnlearn igraph Rcpp]; }; BNSP = derive2 { name="BNSP"; version="2.0.2"; sha256="0vapcf8qxcdmragbmwai4yddpmwwm79mksf4zcych0d4a0ij39h6"; depends=[coda ggplot2 gridExtra plot3D threejs]; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; }; - BOIN = derive2 { name="BOIN"; version="2.4"; sha256="0vb3bkaq9vl1yqm3dhdpd27nhv2095n3lp90fr961jpwj1xhjh5l"; depends=[Iso]; }; + BOIN = derive2 { name="BOIN"; version="2.6"; sha256="0vg7rfypkqy8l0q9zyqhbciangv744rvylv9741rk87mdiwgjr8k"; depends=[Iso]; }; BPEC = derive2 { name="BPEC"; version="1.1"; sha256="14bkpmi1rmpl728nb7kmbmd687s5cvlzj181cxzwcaz3yb8x58nw"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools R2G2 sp]; }; BRugs = derive2 { name="BRugs"; version="0.9-0"; sha256="0f0v30mvfw97vfwzkjpqzf2894b2yhksja0xhpranprk135srxp0"; depends=[coda]; }; BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; 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]; }; + BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; }; BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; 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-6"; sha256="03yfkwgjscki9xbv6myyhdhbz6xrd81zny576vvwqyz14l1sygs0"; depends=[Matrix Rcpp RcppArmadillo stringr TeachingDemos]; }; + BTLLasso = derive2 { name="BTLLasso"; version="0.1-7"; sha256="1lhi3dlg37g4r7nrj46w1yc8jkrzi9159ansapnqdi15jrjpx9p9"; depends=[Matrix psychotools 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.2"; sha256="188d9f0gdhym28xvvk5z10amdbg50w6ab4ik2r9qfc3p1v7k10q9"; depends=[]; }; BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; }; + BVSNLP = derive2 { name="BVSNLP"; version="0.9.10"; sha256="06q7pdv0jc7q9m5ahyxj5dqv8bjc2zva3gjy8ys139mmv7i37pjv"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; 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.2.1"; sha256="0qqq7f2s9jqr85xvab9d4pma4aknlfigh4vgm445bwamb6x8ms2n"; depends=[foreach iterators R6 RColorBrewer rTensor]; }; + BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.2.11"; sha256="0gab9iz1ra72hw8j31n97ysyr3cclhgvdxriyjk8wwv2nrmbw12h"; 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]; }; + Ball = derive2 { name="Ball"; version="1.0.0"; sha256="1b4p4isgybxid14yywpgl7nv4d126281901wvwx6qwvf40nbfq3l"; depends=[gam survival]; }; 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.2"; sha256="077b66pj60sryjnd6zkwqdd5hvbqh4pj8r65k4jb2rjvlbqyxln8"; 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.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]; }; + Barycenter = derive2 { name="Barycenter"; version="1.3"; sha256="1xrcbr80az80h9hx1ik9cxi86j9j9663iv62kgkh6lknafl3mmh5"; depends=[Rcpp RcppArmadillo]; }; + BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.2"; sha256="0zvcpgzhbna6p37jlf57j7mzrvh5xs5w17janmv9v4210cpbzi1q"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; }; + BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.0"; sha256="0jjw7iqlyasyivssmkwkn97al9k8l6bs57zkjwf7hjrj36jfa4x1"; depends=[curl dplyr quantmod rvest stringr tidyr XML]; }; + BatchJobs = derive2 { name="BatchJobs"; version="1.7"; sha256="035658marnw57p4f38g99rwmvmb6hpbq0fhlxp3qbw22zfnnkvs9"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; }; + BatchMap = derive2 { name="BatchMap"; version="1.0.2.0"; sha256="0v3k4xrmsbyhzgmph8xna11dgpp10yxqmss95asrj6n814jxj19b"; 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=[]; }; @@ -281,7 +307,6 @@ in with self; { BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; }; BayesBD = derive2 { name="BayesBD"; version="1.2"; sha256="10ik2lndqgmy6pvdm6cx4fsxgjb2fgi6hlz5ic35ab7fkpi90ka5"; depends=[jpeg mritc png Rcpp RcppArmadillo shiny]; }; BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; }; - BayesBridge = derive2 { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lhbrfvddjglrzs6px7bc89yvfzj776amm7myqd0l"; depends=[]; }; BayesCR = derive2 { name="BayesCR"; version="2.1"; sha256="1qav7l64iqqdvr1v6c7hlzvbx7zbvsa55pyisvkq5rsayy1rdsl1"; depends=[mnormt mvtnorm rootSolve truncdist]; }; BayesCombo = derive2 { name="BayesCombo"; version="1.0"; sha256="01rzjja0xzvqyjivl8a9da13v13ylm4dwv4f27cmgz2znakfg5y8"; depends=[]; }; BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; }; @@ -289,16 +314,17 @@ in with self; { BayesFM = derive2 { name="BayesFM"; version="0.1.2"; sha256="0fiw2x29cpv3prywsbvs1m8a588s2wpi3bwzzjisi2rafbl619xd"; depends=[checkmate coda ggplot2 gridExtra plyr]; }; BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-2"; sha256="17zfs8bmzp59zaxzcrzis2sxdnqxrv9h1kpb22112mp9l1alvwl4"; depends=[coda gtools Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; }; BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; }; + BayesGOF = derive2 { name="BayesGOF"; version="2.1"; sha256="13frvpb3jl8vq1h545k2pbqdj7547k9zipxxiggryvk65l2p4v30"; depends=[orthopolynom VGAM]; }; BayesH = derive2 { name="BayesH"; version="1.0"; sha256="0mjd1i3rkhyq3qcalq0ing0ap0igbhyvczaihl4pcfidgs70bci3"; depends=[]; }; BayesLCA = derive2 { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; }; - BayesLogit = derive2 { name="BayesLogit"; version="0.6"; sha256="0jygw6wkmb6887qglzhl525v56kb0y8ig0w56dywbd8dmsv967z7"; depends=[]; }; BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; }; 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]; }; + BayesNetBP = derive2 { name="BayesNetBP"; version="1.3.0"; sha256="01blqc48ssgr3dg5bk7yzwpa59n3ja1dggglwm2441dwjxf10vxx"; depends=[bnlearn 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]; }; + BayesRS = derive2 { name="BayesRS"; version="0.1.2"; sha256="11xpkq8x4xcpr4kmflr5blq0pn0ssfi9204bs5xfihn7q3d9bzwy"; depends=[coda ggplot2 metRology reshape rjags]; }; BayesS5 = derive2 { name="BayesS5"; version="1.30"; sha256="1nx61sq1d20238hbgr9p9hrmnxsxpsjhnb4sdhmqg1m7klq8qyrw"; depends=[abind Matrix snowfall]; }; BayesSAE = derive2 { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[coda Formula lattice]; }; BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; }; @@ -308,23 +334,23 @@ in with self; { 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.1"; sha256="08zhy1brhb4zyishwgsc0hnmplw776d6qvakx39jiwbi02nvwvx9"; depends=[MASS mvtnorm]; }; + BayesVarSel = derive2 { name="BayesVarSel"; version="1.8.0"; sha256="1sf18m4p8zaw2s5fv4p9s99n1n0cgzscgfhm5ngkzif43kwz1l6n"; 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=[]; }; + BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-0"; sha256="1w5v2z39wm04s1j0vjw7kvgnkgf423qk2yzxdkpf38x47za2wrfh"; depends=[]; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; }; BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; }; BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.3"; sha256="1lli3v922cvp1kwg4sllgvm4rnb972anlpl0lklqk3aqi7ff6flw"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard]; }; - BayesianTools = derive2 { name="BayesianTools"; version="0.1.3"; sha256="03lvds5hxanygmc46sivh7vin48phr3xs27gdz5f6j5pcm8j8xj5"; depends=[coda DHARMa ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm vioplot]; }; + BayesianTools = derive2 { name="BayesianTools"; version="0.1.4"; sha256="13imh2vc3picfy1ppzfisgkhk2n8w8s0fnhklkni06wz1816h2zd"; depends=[bridgesampling coda DHARMa ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; }; 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]; }; + Bchron = derive2 { name="Bchron"; version="4.2.7"; sha256="13zqwl4a6wg0163c3qnfnxlljh6yndim0qcz617hxka5iib74afs"; 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.3"; sha256="0qli3p15mp9q5hl7av7dqpdnh9rzn9hxrqabkfh3h2di0vpwv78g"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; + BeSS = derive2 { name="BeSS"; version="1.0.5"; sha256="1gq0zfrzkh2cndly7amhjy0qnfb60lsj7izmdlf2m8h7yrcicjzv"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; Benchmarking = derive2 { name="Benchmarking"; version="0.26"; sha256="00w7a16lhra6rjylyj26q67mvgbc3wa27a2wmiwjz5yh7wdnh193"; depends=[lpSolveAPI ucminf]; }; BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; }; - Bergm = derive2 { name="Bergm"; version="4.0.0"; sha256="1iw9k9v540bnrjqqq9hvpjh8g4cr53sli31ldw4k1savzq0jirdf"; depends=[coda ergm MCMCpack mvtnorm network]; }; + Bergm = derive2 { name="Bergm"; version="4.1.0"; sha256="13qdcwycppwy9qqc42zi5fz6wg4a47pfczb3nnfj1bdn2drxqw2x"; depends=[coda ergm Matrix 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="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; }; @@ -332,48 +358,53 @@ in with self; { BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; }; BiDAG = derive2 { name="BiDAG"; version="1.0.2"; sha256="1y91vb9g6642c0j7cr3g9fg999fxb7bhbfvm0bdlnaixpbnky6qa"; depends=[pcalg Rcpp]; }; BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; }; + BiG = derive2 { name="BiG"; version="0.1.0"; sha256="1wi2lyj3q1x47cpf1mdm5kqvjlcvbrliym6j5jbmwz7npc910vrb"; depends=[truncnorm]; }; BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; }; BiTrinA = derive2 { name="BiTrinA"; version="1.2"; sha256="0q2wqxj2ipmppilhvq80cnvhnhcp26h422i8ghx26nrkswhx378s"; depends=[diptest]; }; BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; }; - BibPlots = derive2 { name="BibPlots"; version="0.0.2"; sha256="04j5wmdy464sgv1yz4km9i14i3j95qr3m2vi96nmsy5158ga9ilz"; depends=[]; }; + BibPlots = derive2 { name="BibPlots"; version="0.0.3"; sha256="06cpz4h57mz5vpapgsrc9g67dkkiabp1n6avnccvgcpzjr0zscsw"; depends=[]; }; 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.2"; sha256="14vb6nc6bn22dd112sg9zypkchmkv17gnwxs915k0k5vbb9czlr5"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; BimodalIndex = derive2 { name="BimodalIndex"; version="1.1.5"; sha256="08hkdpvwvi5vczc9hdzbk5qnr6s44wyf6n0xv0zbd51dqcmv2xbk"; depends=[mclust oompaBase]; }; - 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.3"; sha256="18cks0hh6a49jr1yq0pwgw3scy1b7cl2060miwxswpwry9lcnnn5"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; + BinNonNor = derive2 { name="BinNonNor"; version="1.4"; sha256="00405ww9mh910jqww60w7cb8qbjql2jn13m60ly0bnxilg44r0bb"; depends=[BB corpcor Matrix mvtnorm]; }; + BinNor = derive2 { name="BinNor"; version="2.2"; sha256="03cggpk9fhndnk9vv5i6fzsq4wjxc5405xxlxg3l9gb618kj437f"; depends=[corpcor Matrix mvtnorm psych]; }; + BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.4"; sha256="0qiy0wf9i9r44ycz1jl666nwpsv5yz7vzz1szdy22sk68lz984bv"; 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]; }; + BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.1"; sha256="1f4y1mrscy9z87yglbynnsis623ar0gqpda3dfm9isa2z10c24qr"; depends=[expm Formula lmtest numDeriv]; }; BinarybalancedCut = derive2 { name="BinarybalancedCut"; version="0.2"; sha256="1rs7x7ggqzaz9r2912g0fi9x7przd8gjy6pianx457w5f39fqx4v"; depends=[ggplot2 reshape2]; }; + BioCircos = derive2 { name="BioCircos"; version="0.3.3"; sha256="0l8kd1imb8022n631psm9na0vp502ndn2q7m3mshx9c0mnqsv8n3"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; }; 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.2.1"; sha256="0479cv5hq73s8vm8y8wdxkvv7dqnnjx1gk6zzlbssy084czlf71s"; depends=[configr devtools futile_logger git2r R_utils RCurl rvest stringi stringr]; }; + BioInstaller = derive2 { name="BioInstaller"; version="0.3.3"; sha256="0mr3qyabr4pwz4cjnig5nzbq0hqqd9rmrpnhmgb1gp3c6l013yk1"; depends=[configr devtools futile_logger git2r R_utils RCurl rvest stringi stringr]; }; BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; }; BioPET = derive2 { name="BioPET"; version="0.2.1"; sha256="0pwkgffm8hlgvpk3dfzskl50kp9b4rnxc8aj119kwrmlfazhhl50"; depends=[ggplot2 gridExtra pROC VGAM]; }; BioPhysConnectoR = derive2 { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; }; BioStatR = derive2 { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; }; Biocomb = derive2 { name="Biocomb"; version="0.3"; sha256="0shhsljg0knfp83b3hrs2c674sqx2348h5m99jhf19jf1i98pf1k"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; }; Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; }; - BiodiversityR = derive2 { name="BiodiversityR"; version="2.8-4"; sha256="18g283cs9fz5nscni4kaai6z7w0p2g619n3wzdz6kqmjdafy6bhv"; depends=[Rcmdr vegan]; }; + BiodiversityR = derive2 { name="BiodiversityR"; version="2.9-2"; sha256="15wa7la36mfr9fi8cahvrkcd5n5gjiar66mj1c1gsaazjwqsfw6n"; 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]; }; + Bioi = derive2 { name="Bioi"; version="0.2.9"; sha256="0kvqvvaws1zc3npxvl3jqidak24n5y8n98ml44mkbh7c5n296z2p"; depends=[assertthat dplyr igraph Rcpp]; }; + Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; }; Bios2cor = derive2 { name="Bios2cor"; version="1.2"; sha256="00fzvj20x85gcpb9l6rfnm3qml8nnl365z1a68j90qi14wy6dfh6"; depends=[bigmemory bio3d circular igraph]; }; - BisRNA = derive2 { name="BisRNA"; version="0.2.1"; sha256="1sjx53lkdhiygr2w7drs9c47hnmv2s232bsd96d6k2xn6yai593i"; depends=[knitr MASS]; }; + BisRNA = derive2 { name="BisRNA"; version="0.2.2"; sha256="11jl5109nlm272vncprwplkz4kpvg7yx6yfnbjg47lfrsxcj8n0g"; depends=[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]; }; + BivUnifBin = derive2 { name="BivUnifBin"; version="1.2"; sha256="0m4a2m7lvlm02hqqigwg3cd6sjzxnxqw1mchxj5g19whk34vwkwi"; depends=[BinOrdNonNor rootSolve]; }; BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; }; + Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.0"; sha256="0m5a41q56z6v0681y9093n5rdd33mg4fc904wjkqznlb4kn1156x"; depends=[]; }; BlakerCI = derive2 { name="BlakerCI"; version="1.0-5"; sha256="16zj678qzwqih92q19dma7a602d0hif2dhii5hvxdgjymg7hg2bj"; depends=[]; }; BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; }; - Blaunet = derive2 { name="Blaunet"; version="2.0.6"; sha256="0zbc7nc962hr4j604zx1xn15xwnfwws55xiwgp61r7a3vfsysg7g"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; }; + Blaunet = derive2 { name="Blaunet"; version="2.0.7"; sha256="19p2rqbg44pi0dz2iimjgr69zyrjf0dfsic6spph81dyrri1zyvh"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; }; + Blendstat = derive2 { name="Blendstat"; version="1.0.1"; sha256="1riw2g114xar6ix1q97701lbbsgc55c1q73nrdvwm0raicjxhisi"; depends=[lattice MASS]; }; + BlockFeST = derive2 { name="BlockFeST"; version="1.3"; sha256="062x7lrcpkd15j3ar58j1gssbd0h66dym7c004jf0k040dkk0z43"; depends=[BASIX]; }; 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.1"; sha256="0y9ayr5yb92w9q8lqaqsnkfmy8nvi4r1yvasf7avp2bvf19c7x2w"; depends=[ape jsonlite phangorn plotrix RSQLite]; }; + BoSSA = derive2 { name="BoSSA"; version="3.2"; sha256="03m4l77mq1h7vxfwkkp2r9acnbwd46mq85z27iizmwixnh81pgxy"; depends=[ape jsonlite phangorn plotrix RSQLite]; }; BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; }; - Bolstad = derive2 { name="Bolstad"; version="0.2-34"; sha256="0snqy580glwpv37hvjnivb3f06hf2prqply1nj5ks5aryabiiz59"; depends=[mvtnorm]; }; + Bolstad = derive2 { name="Bolstad"; version="0.2-37"; sha256="12ivpaqx46yhvpnmncvprn4dkqgk7aqfjyvi69j8v31c1al9h5d3"; 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]; }; @@ -382,6 +413,7 @@ in with self; { 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=[]; }; + BootValidation = derive2 { name="BootValidation"; version="0.1.3"; sha256="097s6yd2g6ahc7rrdpzjarmvqajvzfz2dzawm8gijiami0dkfm9m"; depends=[glmnet pbapply pROC]; }; BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; }; Boruta = derive2 { name="Boruta"; version="5.2.0"; sha256="111rp7lbq79p7c1w4dkzhb9wh32mns5p17xxq0qbjzaiv41377dy"; depends=[ranger]; }; BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; }; @@ -390,21 +422,23 @@ in with self; { BrailleR = derive2 { name="BrailleR"; version="0.26.0"; sha256="1grqs3sb1xk28vmpcbidb6s805wqzkrrx41qqz7jc5y8vpspba51"; depends=[devtools extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest pander rmarkdown XML 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]; }; + BrownDog = derive2 { name="BrownDog"; version="0.2.1"; sha256="0wnf1jcf4cakbvj9j1l7jk9mq7gd4j1il1ha2vglghqn04f27938"; depends=[httpuv jsonlite RCurl]; }; Brq = derive2 { name="Brq"; version="2.0"; sha256="0j6d1m2drzy1wyr5y25qb8gs6555vh0lkyh415kw17x9dj4ks0zx"; depends=[]; }; - Brundle = derive2 { name="Brundle"; version="1.0.5"; sha256="18r54afnh8lylly89qpsgy39r81qkpijx482p62m2dsswhfhj022"; depends=[DESeq2 DiffBind lattice Rsamtools]; }; - BsMD = derive2 { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; }; + Brundle = derive2 { name="Brundle"; version="1.0.8"; sha256="1yj196x6xb75qgi16pgg3dyjmxmjklfjcpxymaki32drhmylf24z"; depends=[DESeq2 DiffBind lattice Rsamtools]; }; + BsMD = derive2 { name="BsMD"; version="2013.0718-1"; sha256="06w1dl5zp1cgjhk3m2zz6xsmcfwdk6ar3gmxdn96v71mqnhv81v1"; depends=[]; }; + BullsEyeR = derive2 { name="BullsEyeR"; version="0.2.0"; sha256="1p8b5w818zi7zs0n13cc3sw8z0z9mfr5cn5y5icsx1jam5amppci"; depends=[Matrix NLP slam tm topicmodels]; }; 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]; }; + C50 = derive2 { name="C50"; version="0.1.1"; sha256="1pq1plsh7kf45f0ghrja0xjikaxgvq14k8k80ml5rkabyv11zg03"; depends=[Cubist partykit]; }; 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]; }; + CAISEr = derive2 { name="CAISEr"; version="0.2.1"; sha256="1y070r50vhs5ri91zw28wr8nkiq15n9dpjggi6hs601a0bj7463v"; depends=[assertthat]; }; 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]; }; + CANSIM2R = derive2 { name="CANSIM2R"; version="0.12"; sha256="1r8fln9rqjsqhbnxvng9wpdnp6mb1gxlq3qkff4q2wbhf18wwn7w"; depends=[Hmisc reshape2]; }; 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.1"; sha256="10mzjcybj549wp07sigr7m0r93gjskmwd8i6i1017wyh1vv5vlyc"; 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]; }; @@ -412,93 +446,98 @@ in with self; { CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; }; CARS = derive2 { name="CARS"; version="0.2"; sha256="1n8p4n9fbl20jps9g9pbspw54hq9y6kqbggc8h0i9pbm1b25ngrg"; depends=[np]; }; CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; }; + CAST = derive2 { name="CAST"; version="0.1.0"; sha256="0mihpcknwk86m41x14j2g3f2s2ya20sh99ng85rcph57a4v6ar05"; depends=[caret]; }; CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; }; CATTexact = derive2 { name="CATTexact"; version="0.1.0"; sha256="0mklkmay9ph4d0z2l1gcg0lj429xkyhmz7srdil5rgwqxx9dnqs8"; depends=[]; }; - CATkit = derive2 { name="CATkit"; version="3.0.0.2"; sha256="1afaa1s8clynpna9hwgbgfdp5jciv0n5q9vb27cgyl9n69nla991"; depends=[magic MASS png rtf season signal]; }; + CATkit = derive2 { name="CATkit"; version="3.2.3"; sha256="1vl60m6x3mqgghqzpxq8aalpjpcagamjk5zg62mqpwx0vgdwv2fy"; depends=[assertr magic MASS png rtf season signal]; }; CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; }; CBCgrps = derive2 { name="CBCgrps"; version="2.1"; sha256="0cvgcpvdvpvjkzkwapx0y4a666xq54dwm00w4w9n8fhgp05mnkn8"; depends=[nortest]; }; - CBPS = derive2 { name="CBPS"; version="0.13"; sha256="16g62pvxd2njawk2sfaznhicy1dfxab3v1k0bfrzj5a4l1501l2z"; depends=[MASS MatchIt nnet numDeriv]; }; + CBPS = derive2 { name="CBPS"; version="0.18"; sha256="0dd63s9nrgra51w005j35scbswbknqgv9ppawh0311hpr7anrir9"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; }; CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; }; CCM = derive2 { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; }; CCMnet = derive2 { name="CCMnet"; version="0.0-3"; sha256="0mbw3yhlgnmq7q4wnwiff7rlmciq83cch7kkav3wll6nqvxcdiax"; depends=[ergm network sna]; }; CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; }; - CCTpack = derive2 { name="CCTpack"; version="1.5.1"; sha256="0j4c7w5jfixsjhpn460iai7q0dd9znchp1iv7dxvyqdm45149p36"; depends=[MASS mvtnorm polycor psych R2jags rjags]; }; + CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; }; CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; }; + CDECRetrieve = derive2 { name="CDECRetrieve"; version="0.1.0"; sha256="059pppiczvnfm4shyac6myzbq1vyz2pl7mxq225sy9ppdf813y61"; depends=[dplyr httr lazyeval lubridate magrittr purrr readr roxygen2 rvest stringr tibble tidyr xml2]; }; 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.8-9"; sha256="05xfnf4llag1g96kv0sgkkpl67w0j76bjggi0wvg9z5f9pdjhmxj"; depends=[mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; }; + CDM = derive2 { name="CDM"; version="6.1-10"; sha256="00c25k4hliqc4w15njasp0azsyy1x13h7y3kh1b9dl3qkpqs5r2z"; depends=[MASS mvtnorm polycor 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]; }; CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; }; CEC = derive2 { name="CEC"; version="0.9.4"; sha256="194n190szwzxjxfdhiah1f50vp6n7f3q567yky7pq1x2hngna5rs"; depends=[]; }; CEGO = derive2 { name="CEGO"; version="2.2.0"; sha256="0k01fb8bciq3m2rcqcicrlhx6av46sdczgcyn8df1f3pr28l1fyf"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; }; + CENFA = derive2 { name="CENFA"; version="0.1.0"; sha256="1bxrqvi67s93mvkbigb8l7rrn2j2ix7qw7vcxf4dbwd7xf3qqv6q"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; }; CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; }; CFC = derive2 { name="CFC"; version="1.1.0"; sha256="0yhb314qcdxig5vg0nbzvsqiddlsqlm50vzddhpp0z5n3xfa7h2c"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; }; CGP = derive2 { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; }; CHAT = derive2 { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DNAcopy DPpackage]; }; CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; }; - CHMM = derive2 { name="CHMM"; version="0.1.0"; sha256="18wpld1anws9hv1z8sgib5nvjdg1wmk4dv5s1ysh8s0rzwnq9x2p"; depends=[mclust]; }; - CHNOSZ = derive2 { name="CHNOSZ"; version="1.1.0"; sha256="1nbszjvz43ijxdq8pv7bci7csbggg5gg16r3538gxd8yainrwkjr"; depends=[colorspace]; }; + CHMM = derive2 { name="CHMM"; version="0.1.1"; sha256="07fdvnwhblwvljbl2z0vs42nwki67yl5ly3fj40p50k3rnqqmavj"; depends=[mclust]; }; + CHNOSZ = derive2 { name="CHNOSZ"; version="1.1.3"; sha256="07j1xvv6rn57hirxw1dajnvk9hmj3r9bgk4fckzmmpclf22z4mwq"; depends=[]; }; CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; }; CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.2"; sha256="0s3a9ay0l9n5kc6q0wb7f9625vba4giz1pdg3ikq4h4zhp1ldq62"; depends=[Matrix mvtnorm numDeriv stringr]; }; CIDnetworks = derive2 { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[igraph MASS msm mvtnorm numDeriv pbivnorm Rcpp]; }; + CIEE = derive2 { name="CIEE"; version="0.1.0"; sha256="1z4061rkryhnhf6qdxlna1w2dsy06pipx3sk1hswah4i2n7cc7sq"; depends=[survival]; }; CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; }; CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; }; - CINNA = derive2 { name="CINNA"; version="1.0.0"; sha256="1ikmml2dr9xgs4nip9x4glri54qaib7janvifwwbrrqn0r377yyf"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph network pheatmap plyr qdapTools Rtsne sna viridis]; }; + CINNA = derive2 { name="CINNA"; version="1.1.3"; sha256="0y2xymk323xjkwpii1i13q38dsfi1ywlvw3ykq4928jb58f96121"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph network pheatmap plyr qdapTools Rtsne sna viridis]; }; CINOEDV = derive2 { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; }; CITAN = derive2 { name="CITAN"; version="2015.12-2"; sha256="08h91q7529q04izgqw3ahm4r0zjpwnwyc0vynykvv9fz2fkbk7wb"; depends=[agop DBI hash RGtk2 RSQLite stringi]; }; CIplot = derive2 { name="CIplot"; version="1.0"; sha256="0hx3dn7d8hvsh75747d9046iqriy3bjnchph8xllnvlhkrm4di1f"; depends=[MASS multcomp]; }; - CLME = derive2 { name="CLME"; version="2.0-6"; sha256="0cd3sn6amariap04lhc2kwsdcj4i4axrx95xr10spykr8py4skmc"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; }; + CLA = derive2 { name="CLA"; version="0.90-1"; sha256="1rpklm21i9rjw0vfhaz9brq9571yjynwfhpv6dp6fbl3cj7bwb8g"; depends=[]; }; + CLME = derive2 { name="CLME"; version="2.0-9"; sha256="11kwk3v5kbk1k2gsglpvlq6nyh0b0qd97jpqcv1s2swx12pzdxqc"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; }; CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; }; 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]; }; - CMatching = derive2 { name="CMatching"; version="1.0"; sha256="1qvixshdkv1sgy4ianfcvb4mfnc05rwm7hxs3rssnma7m9j3g2np"; depends=[lme4 lmtest Matching multiwayvcov]; }; - CMplot = derive2 { name="CMplot"; version="3.2.1"; sha256="0gnqqw59xsjq671kiykj8k1qx1m2j7hj8dsnh7ccirpq55hqajff"; depends=[]; }; + CMatching = derive2 { name="CMatching"; version="2.0"; sha256="0g8hiag51cqj0wy7lbaa5x4xbnyb74s5xiws6pwxhrvbp3ym69bs"; depends=[lme4 lmtest Matching multiwayvcov]; }; + CMplot = derive2 { name="CMplot"; version="3.3.1"; sha256="01qpy7bb3503i3b8v4psrxbx9ff5vzcv54j55mdr1bphwmnp1kzq"; 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.2"; sha256="1qjrhxn6dkxyimdca3nslaiw3hncfpk1pk4v01mcrnz550z001nz"; 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]; }; + COMBAT = derive2 { name="COMBAT"; version="0.0.4"; sha256="0m700pl33frdpc9y16y4zyh1ixpardh0r5kmz8a78jrh1acn30id"; depends=[corpcor mvtnorm]; }; + COMBIA = derive2 { name="COMBIA"; version="1.0.5"; sha256="0f4p2gb16bb46jcdmzlaaicymqnw18c7qc39m0s5jwps4c8whyym"; depends=[gdata hash lattice latticeExtra oro_nifti]; }; COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.4.1"; sha256="14gjrf2hj7dy4hd0qnh6vqjzh7gc6g7gm7rh1d8dingkjwmjzrqb"; depends=[]; }; CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; }; CONS = derive2 { name="CONS"; version="0.1.1"; sha256="0w0rca4z3hij0lbabpdnhv2lb52gx574g7bqp6q16772pi4685hf"; depends=[FactoMineR gridExtra gWidgets pander raster readxl REdaS]; }; CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; }; - CORElearn = derive2 { name="CORElearn"; version="1.51.2"; sha256="0ifj7b29ij8ab96j733afkracwxpz5skcg9j3y9v21ny775l9cps"; depends=[cluster nnet rpart]; }; + CORElearn = derive2 { name="CORElearn"; version="1.52.0"; sha256="01kby6kddfbv6qhmsja1q4gyqq57f7n9kk4555g258f9a6900c2n"; depends=[cluster nnet 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.2.0"; sha256="1h4mipvmcjhs1s1dqbibxz2sf73psbwplgc5ki65y5654yqc26pl"; depends=[forestplot MASS]; }; + CPBayes = derive2 { name="CPBayes"; version="0.3.0"; sha256="1vzh9sgij194j7kiwjgba7xsqffiif9zamj9gdv2lk91wdcqaxid"; 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]; }; + CPMCGLM = derive2 { name="CPMCGLM"; version="1.2"; sha256="07hx2ik5zg05w1h6i94398mp54q958phws9ydgp6syjqlp9dpf1p"; depends=[abind 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]; }; + CREAM = derive2 { name="CREAM"; version="1.1.0"; sha256="09mmfcgh5vfh4hq9vgsr1qsph7qq4w555j1j7zjcq69cfabp0np9"; depends=[]; }; CRF = derive2 { name="CRF"; version="0.3-14"; sha256="0xhjj76730yjlpwbhcpdzqp7s37a9rhf4adk1s7hfb0jm8b76fgh"; depends=[Matrix Rglpk]; }; CRM = derive2 { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; }; + CRPClustering = derive2 { name="CRPClustering"; version="1.0"; sha256="1mr6wcfsgl3x9dx3sx1iav1i82r70jn985y7jkmvip0h9xslrk7g"; depends=[MASS mvtnorm png randomcoloR]; }; CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; }; CRTgeeDR = derive2 { name="CRTgeeDR"; version="2.0"; sha256="1fzw8618k152b8d4d6wmzp0bfkz2grwp0rqsplwvfdx23nxq437n"; 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=[]; }; + CTT = derive2 { name="CTT"; version="2.3.2"; sha256="1f4ba2qnxx5vlj64sxz4ynby9hv7f32v6ls8yn887z51m33xdxi8"; 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.3"; sha256="1lv3gzh2wmw2dfmyc1fpxng221y1nr9qjxq8fjaxd71khcmzbykg"; depends=[openxlsx xtable]; }; + CUB = derive2 { name="CUB"; version="1.1.2"; sha256="031jkzh6cr8gd2naqv54xs3vlrqmcbl9d2in66kd0dr2i41l3qj7"; depends=[Formula]; }; + CUFF = derive2 { name="CUFF"; version="1.4"; sha256="01lx4ds1rlh7vndv13s11mhhamgsbqnsqjgd44iryfl3jmy3xfz3"; 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=[]; }; @@ -506,18 +545,20 @@ in with self; { 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=[]; }; + CVXR = derive2 { name="CVXR"; version="0.95"; sha256="1sf8n27w7dlix55bc5rdrrn361yc6xslwykd1vj51zh908c5as1w"; depends=[bit64 ECOSolveR gmp Matrix R_utils R6 Rcpp RcppEigen Rmpfr scs]; }; CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; }; - CaDENCE = derive2 { name="CaDENCE"; version="1.2.4"; sha256="1v6930wyh12jc2mrr4svg36nppxd1bqvcqardj2bjxzxzg998bq7"; depends=[pso]; }; + CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; }; Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; 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]; }; - Canopy = derive2 { name="Canopy"; version="1.2.0"; sha256="10z511vp9nmyf7jaihdx2367ddsnlrfg4rdzlz7rg9b5k9d92pja"; depends=[ape fields pheatmap scatterplot3d]; }; + Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; 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.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; }; + CatPredi = derive2 { name="CatPredi"; version="1.1"; sha256="1fqz2mb3xhpzvamf0bpqfql3vd86vq6fq7n6p8xq7lraj1w77lys"; depends=[CPE mgcv rgenoud rms survival]; }; 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]; }; + CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; }; CausalImpact = derive2 { name="CausalImpact"; version="1.2.3"; sha256="16qwf1kcs7x6qw18zpabs4zsv3m7xwxixf89krnipydiwlpxjjn6"; 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]; }; @@ -530,22 +571,23 @@ in with self; { CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.9"; sha256="0s3pd4y165v69m4wmg9jlc7dl4gz64la9yic67l3n4242wa84p19"; depends=[robustbase]; }; CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; }; ChIPtest = derive2 { name="ChIPtest"; version="1.0"; sha256="1yn5b5s56k2dbhw6damxj18xbaiz180ym7fiq2i3p2gkcgwpddbz"; depends=[]; }; - ChainLadder = derive2 { name="ChainLadder"; version="0.2.4"; sha256="0wp8cihvyrlbixzpp7fhr5qcsq46m54j0m4az97b0v6lwr5dfp4w"; depends=[actuar cplm ggplot2 lattice MASS Matrix reshape2 statmod systemfit tweedie]; }; + ChainLadder = derive2 { name="ChainLadder"; version="0.2.5"; sha256="0023qbwyrb6vifsllws9jj1hlylmglzfc339d5rg8nhb50i4v6fd"; depends=[actuar cplm ggplot2 lattice MASS Matrix reshape2 statmod systemfit tweedie]; }; ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; }; - ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.10"; sha256="1a1fzlp5fc5l357gklya096cwry26hymxrlpqsy1xdr60fd7pfx5"; depends=[Rcpp RcppArmadillo]; }; + ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.12"; sha256="0iz40xbkcjlydxnlm437iiy3pb8viqym6bwimhbjvm2v3dq5p8h5"; depends=[Rcpp RcppArmadillo]; }; 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=[]; }; + Chaos01 = derive2 { name="Chaos01"; version="1.1.1"; sha256="0ibxibmlyc6wkhqj2achwkwdkniin60y8xh8b80nq6ggmm7w9crw"; depends=[]; }; ChaosGame = derive2 { name="ChaosGame"; version="0.3"; sha256="0nfp2qnhzpncs0yd5rknspin6c4hidqhxdd973ysiivg63wxwz8d"; 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.85"; sha256="1wb9jvrsydia9lnc0pw55lngiqwa62ff02bfqj1slmr53nw864mp"; depends=[plyr]; }; + ChemoSpec = derive2 { name="ChemoSpec"; version="4.4.97"; sha256="0kdcwv9kncv2r5mabp0mf9bmnajcnxmqavrl2lpn3d2pji6pv1qq"; depends=[plyr]; }; ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.11"; sha256="00z09bplm5qvd31y7m4b4knsrl0n27j9635m1gdak6lg4db4nxrd"; depends=[devtools kohonen MASS pls]; }; - ChoR = derive2 { name="ChoR"; version="0.0-1"; sha256="1zxzgmww368zfdd3fq4wmj4v9prh8fqdb2d3wplqszxjf1irmb45"; depends=[rJava]; }; + ChoR = derive2 { name="ChoR"; version="0.0-3"; sha256="085p604zbk4l88q4ig2fnfhadxvsssyjl2r48g8s99yx49cvd9sx"; depends=[commonsMath 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=[]; }; + CholWishart = derive2 { name="CholWishart"; version="0.9.0"; sha256="123m7byr4rcmg9h91g1p1v1aby5qpaidnjid9vg4gr1ywhbvjh63"; depends=[]; }; CircE = derive2 { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; }; - CircMLE = derive2 { name="CircMLE"; version="0.2.0"; sha256="1zqpn3viwb0364pcrc6nfjd25fvn3bmniqnkvqiccwdlfncqqsvq"; depends=[circular]; }; + CircMLE = derive2 { name="CircMLE"; version="0.2.1"; sha256="031pmfyqwif16am7h1csk1dg9vhy0jgdc8w4z60kqqsgf3yk6il9"; 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]; }; @@ -560,6 +602,7 @@ in with self; { 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]; }; + ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="0.1.0"; sha256="1lqf2ksgchl1j5hfkz7r5yczvkjgi3238k8nkfkd70nyil9vjq06"; depends=[Rcpp]; }; CluMix = derive2 { name="CluMix"; version="2.1"; sha256="080gd6v8yj83djmf4wg7cwk6q6w6gsg4xfsgw5qd6z8h3kpyn45m"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; }; ClueR = derive2 { name="ClueR"; version="1.2"; sha256="17phjzpdx11sw259xk16h2w28xdaxxpzbh0sxli61icnssw35n7z"; depends=[e1071]; }; ClusVis = derive2 { name="ClusVis"; version="1.0.0"; sha256="0d8s4gd5dl4mc1538rhy2pwk1xfgbq2ca76qaqrl2q3mswb1p6wp"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod]; }; @@ -567,18 +610,20 @@ in with self; { ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; }; ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; }; ClustVarLV = derive2 { name="ClustVarLV"; version="1.5.1"; sha256="11zydj3iq15sg84kny6nklpmh8wj9j9nklkknzfqnaagai8jgsmy"; depends=[Rcpp]; }; + Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.1"; sha256="18is8aa496qr7afmyqy12s267ans0hhzy0xs8nzr3qp70mwrbbh1"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr tibble]; }; ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="0.9.3"; sha256="1znyj39mwdi02xhypvr2fsx2yp45w8br7r8qkn831d6fza5pkcyc"; depends=[]; }; - ClusterR = derive2 { name="ClusterR"; version="1.0.6"; sha256="1pmh0i8ldnf8ka7hjh7sh6l22w34rrs7ci4z0l2cvzfjs7jz5swz"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; }; + ClusterR = derive2 { name="ClusterR"; version="1.1.1"; sha256="0b9x0a1s0d9nnkkcm417xsaciwb66771s14ir6n6mm7yq1g6x417"; 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]; }; + CoClust = derive2 { name="CoClust"; version="0.3-2"; sha256="04xv807785xv9kdspsspx1302ardv8gda06kd590lgawjixai7dh"; depends=[copula gtools]; }; + CoDiNA = derive2 { name="CoDiNA"; version="1.0.0"; sha256="1anc127d4xx1yks5kq2glcv8sijs0sfab9wjs7j9g1aqp97hmk33"; depends=[data_table geometry igraph magrittr plot3D plyr reshape2 visNetwork]; }; 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]; }; + CollapseLevels = derive2 { name="CollapseLevels"; version="0.2.0"; sha256="1fn5k83lh0vw5j9vhq0x6ksbkrm25acpslav85wfyknsj9vzmzid"; depends=[dplyr ggplot2 lazyeval magrittr]; }; CollocInfer = derive2 { name="CollocInfer"; version="1.0.4"; sha256="1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj"; depends=[deSolve fda MASS Matrix spam]; }; ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; }; ComICS = derive2 { name="ComICS"; version="1.0.3"; sha256="1jfs0ygr88532jjw2ablyn2r3sg3hfsv5yrm4gkdgzakychj3dy2"; depends=[glmnet]; }; @@ -587,7 +632,7 @@ in with self; { Combine = derive2 { name="Combine"; version="1.0"; sha256="0n3jkxf4s778d6fzcanb2b09xhpv5sqzawpg17bbfngfhp0vfyrq"; depends=[]; }; CombinePValue = derive2 { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; }; CombinePortfolio = derive2 { name="CombinePortfolio"; version="0.3"; sha256="0w4mw748ix7jyqfirr8bm93i742y7bpir7q5x1j3r9cqpi9h5zfv"; depends=[]; }; - CommEcol = derive2 { name="CommEcol"; version="1.6.4"; sha256="02fmiil8sy5dwkpcdabcz5yhn7h9vlrsyyc9ilnmzb62z5447kdz"; depends=[ape gmp picante vegan]; }; + CommEcol = derive2 { name="CommEcol"; version="1.6.5"; sha256="02xra47znnbnsgxy6xinyk2dv8asshd4fgh7bn6qf7m6p4d743pj"; depends=[ape gmp picante vegan]; }; CommT = derive2 { name="CommT"; version="0.1.1"; sha256="1kimm8z3k7p5lxsjnkb203js2rqn09grywxs890fab1hhgssgv2r"; depends=[ape ggplot2 gridExtra phangorn reshape]; }; CommonJavaJars = derive2 { name="CommonJavaJars"; version="1.0-5"; sha256="0kwf504g1izyy7hxss21dgz26w0spxibdlacrjdh7q10z799hfhh"; depends=[]; }; CommonTrend = derive2 { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; }; @@ -602,12 +647,12 @@ in with self; { CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.1.9"; sha256="086yacr5fgqzgl1hh0m6qpx59smk66bsxglaic3ynd9n9k1n9p6c"; depends=[data_table expm 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.2"; sha256="0xlsfrgh3pk0vfwhp81108fpcbhlddv31w449744rhpwzjbnx04b"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; }; - Compositional = derive2 { name="Compositional"; version="2.5"; sha256="1962h3zcyc16alri9yybjskwwb5h6sal53rjhimw3wmcz9ykry11"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; }; + Compind = derive2 { name="Compind"; version="2.0"; sha256="1qadyl96c9cmk1i763gc055hgv414ha59418lqk183kwl5sgbqy5"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; }; + Compositional = derive2 { name="Compositional"; version="2.9"; sha256="1vmnckp17hl3yr4qfpisavmfcvvsnh3d6v721dgns9a93cqs30z0"; 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.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]; }; + ConSpline = derive2 { name="ConSpline"; version="1.2"; sha256="16r0v0llj0pri69jqxribp8dpzh6yn6acpq20aaky14fyh3i4q7x"; 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=[]; }; @@ -617,30 +662,34 @@ in with self; { ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; }; ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; }; ConsRank = derive2 { name="ConsRank"; version="2.0.1"; sha256="18f1gqa46f8jrcf2zj4njyy78cl0scjs9k8s9mvg0f9dpr44xnan"; depends=[gtools proxy rgl]; }; - ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.1"; sha256="04i8n8fmf2qs08dmlfls9j2509aqzb665qaz97na0wanbldxidbr"; depends=[caret mclust mixture mnormt mvtnorm]; }; + ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.3.2"; sha256="0761wfjxh26kf4q1qcfzfaj52553yiw1ny6l84r3wzzx4hv893qy"; 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=[]; }; + ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.0.0"; sha256="0ndb7k2lfv6014a7c61a2mmcsywpa478lk6fh7d0jkv55hmnzvs9"; depends=[lmtest sandwich]; }; ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; }; + CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="1.0-6"; sha256="1jhyb9hw10cpsac6jyrp21g9habpy0mqglg1aq6qyi59c4n95b46"; depends=[geosphere ggplot2 raster rgeos rnaturalearth sp]; }; 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]; }; + CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.0"; sha256="1bx0jvlbhaxf4yhrfpd5l5zp7kmp6f17ckb1y9974sgc7s3hpqcd"; 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]; }; 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]; }; + CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; 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.4"; sha256="15x9l4swgrbry10k5iws75xs4bbh7mpcg4f4fx9yd9z92yq72ly2"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; }; + CorrToolBox = derive2 { name="CorrToolBox"; version="1.5"; sha256="1ggrm144zmi54cqb5l2nif7dn1zb1kn31i1xhxc4jwr7fn380iyi"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; }; CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.2.14"; sha256="1if4qb1d6mg3435pk3znln8id8fj12n3j9sjv4zn104v2fr90mhr"; depends=[caTools digest xcms XML]; }; + CorrectedFDR = derive2 { name="CorrectedFDR"; version="1.0"; sha256="15047cfjniljzhznkbzq3hyq221y9k7fa04f69zm0k0sxr627gxg"; depends=[]; }; 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]; }; CosmoPhotoz = derive2 { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[arm COUNT ggplot2 ggthemes gridExtra mvtnorm pcaPP shiny]; }; Counterfactual = derive2 { name="Counterfactual"; version="1.1"; sha256="0mz0h5zsmca8fww7nq08m9cld2zbaydn8qad5f2g6vxn382842p9"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; }; - Countr = derive2 { name="Countr"; version="3.2.8"; sha256="0nx0xavpm3kkh6q9q4snqjs3dmp45b9dm2zqwg7lkrv0f32inkyp"; depends=[boot car flexsurv Formula MASS Matrix numDeriv optimx Rcpp RcppArmadillo VGAM]; }; + Countr = derive2 { name="Countr"; version="3.4.1"; sha256="1qv773psgmk6ndznl4f2364vadh9qimagm38v5a3xzjnn9dpd23b"; depends=[boot car dplyr flexsurv Formula lattice lmtest MASS Matrix numDeriv optimx pscl RColorBrewer Rcpp RcppArmadillo Rdpack standardize VGAM xtable]; }; 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.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; }; + CovTools = derive2 { name="CovTools"; version="0.3.0"; sha256="0p5mfrdp4p5fz9ld0rqrd2kj73hi1dzx0iwl4rihhgfgdplzknhf"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes]; }; 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]; }; @@ -649,38 +698,42 @@ in with self; { CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; }; Cprob = derive2 { name="Cprob"; version="1.4"; sha256="1kjw5hhb3fy12xlyg01i8ynl78gx0r57kvmgafbqix1s3pg2hyw6"; depends=[geepack lattice lgtdl prodlim tpr]; }; CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; }; - CreditRisk = derive2 { name="CreditRisk"; version="0.1.0"; sha256="1nrzpafgd0liqa8b7mhg8xgkqp4kqgz1a60xzi5bh5wmxp9bqf99"; depends=[fOptions]; }; + CreditRisk = derive2 { name="CreditRisk"; version="0.1.3"; sha256="09ks8xlsrbp3an1drcwmmd6df4fsfz61z21ma2p62a1pk0bnc86c"; depends=[fOptions]; }; 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.1"; sha256="13skbazs1mh5am70qlwxhvxgfx4gwlzzq6zy3vdzaa3zbykkxlvw"; depends=[lubridate]; }; CrossValidate = derive2 { name="CrossValidate"; version="2.3.1"; sha256="1v9fwhhy2xxrrn0xd2yg7ngy7adm85fmyvqhcvnpa91ifr4ijrly"; depends=[Modeler oompaBase]; }; - Crossover = derive2 { name="Crossover"; version="0.1-16"; sha256="19697wy066apkxrm99s7vflc0ih6zxxmyvj7x3dzh2icnv1gg1bb"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; }; + Crossover = derive2 { name="Crossover"; version="0.1-17"; sha256="168j8fl6h7x1pia5f5c18yrf0y1lvznib8clq1mv0imb7cjzkkhi"; 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]; }; CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[car chopsticks ellipse rJPSGCS]; }; + CsChange = derive2 { name="CsChange"; version="0.1.3"; sha256="08ss1dzwirmnlgw440g3k3vnrl1imhmd2gljnid8z2dzj5450alr"; depends=[boot Hmisc rms survival]; }; CuCubes = derive2 { name="CuCubes"; version="0.1.0"; sha256="1cpazar85rp8xfjvy0vxivr61grzvxz7a9mirxvhynln964by6ns"; depends=[]; }; - Cubist = derive2 { name="Cubist"; version="0.0.19"; sha256="1bjajcr2qnmqy8cakgiy4q07nj9dygz15a9jry5sa4nbkabpj4qh"; depends=[lattice reshape2]; }; + Cubist = derive2 { name="Cubist"; version="0.2.1"; sha256="18w82l44b6jsmz19l34dmaqb22qvjcwhs4cddzhs6pzicvqw645k"; depends=[lattice reshape2]; }; Cyclops = derive2 { name="Cyclops"; version="1.3.0"; sha256="0sznzzz21qn1cxxfa3wiwvfza7lykzzf0xyqvawha9vzm8qzgqnq"; depends=[BH bit ff ffbase Matrix Rcpp RcppEigen RcppParallel survival]; }; CytobankAPI = derive2 { name="CytobankAPI"; version="1.1.0"; sha256="1014r17krw74drykdlw24pgqylidp8yxa00zhf340ilcxfpacxyi"; depends=[curl httr jsonlite]; }; CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="1.0"; sha256="0hr74igy43d5ybzlgqpvx9ingw6h83w502b6k55cp6zqcv5rl8d5"; depends=[CytobankAPI]; }; + CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; }; 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]; }; + D3partitionR = derive2 { name="D3partitionR"; version="0.5.0"; sha256="10067rdgbpjzgw2wiq75kdd0gd7bl41hp16sxc0k2p72ybqfpw03"; depends=[data_table functional htmlwidgets magrittr RColorBrewer titanic]; }; DAAG = derive2 { name="DAAG"; version="1.22"; sha256="16xp4qk09v9jwm4cs7b4mpn0kgl1va9rw86viwcjc54vjc32953f"; depends=[lattice latticeExtra]; }; DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; }; DAAGxtras = derive2 { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; }; DAC = derive2 { name="DAC"; version="0.1.0"; sha256="0x27asjn1y8bxgc35ic4jpara4f7vn8w61fpg4glkjy5nbh5ss0p"; depends=[fGarch flexmix]; }; + DACF = derive2 { name="DACF"; version="1.0.0"; sha256="0hv7c9lk6ivj4iz953yn11iy5p611q4si4ghn9d5a9i229s5hig8"; depends=[]; }; DAGGER = derive2 { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Matrix quadprog Rglpk]; }; 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]; }; + DALEX = derive2 { name="DALEX"; version="0.1.1"; sha256="0nafdpfiawmlv6v43i4glhq1p3aaqph5f8ikcvi75l44n1rwkazk"; depends=[ALEPlot breakDown ggplot2 pdp]; }; 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]; }; + DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; }; 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.7"; sha256="1j4aa6pglxmwlafg0927x6dgdjbx7k5hbfahmdmlq7qcni5pg5h6"; depends=[zoo]; }; + DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; }; DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; - 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]; }; + DBI = derive2 { name="DBI"; version="0.8"; sha256="16nf8flxr5vdz8yrpprfbzydy3ajixkp9hc8ibd9n7r9nc29waym"; depends=[]; }; + DBItest = derive2 { name="DBItest"; version="1.5-2"; sha256="05wizjm2b97fsdha2i391h38xb0zrkhnd036qvdcm0r5l0y56sm8"; 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="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; }; DCD = derive2 { name="DCD"; version="0.1.0"; sha256="0p6vk8fdvpcvb1bb5fwy3h1v8y3djlvcm5jl5lnx30ngqj6d7rcj"; depends=[data_table doParallel foreach ggplot2 igraph lattice lsa Matrix plyr qlcMatrix Rdpack ROCR WGCNA]; }; @@ -691,8 +744,8 @@ in with self; { DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; }; DCchoice = derive2 { name="DCchoice"; version="0.0.15"; sha256="1qdqn45ipq0806r25ri4aygzq48k8j5k8rlhi1cafym421yq6bfg"; depends=[Formula interval MASS]; }; DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; }; - DClusterm = derive2 { name="DClusterm"; version="0.1"; sha256="0xkl4677vqy4sdkm0fczscqszjxk1kfmlbzdgm88shcnjzjg71d8"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; }; - DDD = derive2 { name="DDD"; version="3.4"; sha256="0rjn28ndwa5cp23xdk830qidgs0kg3rx34yipkfg1bi4r7751was"; depends=[ade4 ape deSolve expoRkit Matrix phytools SparseM subplex]; }; + DClusterm = derive2 { name="DClusterm"; version="0.2"; sha256="0bnl9ic8q7mrb2508c5g2fkpp7wbhasivgvhldqnbqn2lyy8l76a"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; }; + DDD = derive2 { name="DDD"; version="3.6"; sha256="0lkij10z6bviay2dg6k5pmb9ddg4smcz96fkww0qx8h636zd2xlq"; depends=[ade4 ape deSolve expoRkit Matrix phytools pracma 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]; }; DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; }; @@ -702,14 +755,15 @@ in with self; { DEMEtics = derive2 { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; }; DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; }; DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; }; - DESP = derive2 { name="DESP"; version="0.2-2"; sha256="1s5x6x36ra83izcyrgdzc26a02cbbgy3xxn32sl30z6srys1j3j3"; depends=[graph MASS Matrix RBGL SparseM]; }; DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; }; DEoptim = derive2 { name="DEoptim"; version="2.2-4"; sha256="10nlsvms5pf0wmn4z1lj6vnmpwr10q8nhdy5xy9rn7hd1627fm0a"; depends=[]; }; DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; }; DEploid = derive2 { name="DEploid"; version="0.4.4"; sha256="1hcn54mn1kil6kg77j4aij15h69fnmp40d6xxfgijjcgydp211bf"; depends=[magrittr plotly Rcpp scales]; }; 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]; }; + DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; DHARMa = derive2 { name="DHARMa"; version="0.1.5"; sha256="1mgvpyhllp7pqnas5sbn6393jkin205109g2b4pn3diyb20avqwp"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; }; + DHS_rates = derive2 { name="DHS.rates"; version="0.2.0"; sha256="0fhbsylm0j6s4ah5iam2rc0c716zljhqf8l87n3gll5kfh08427x"; depends=[reshape survey]; }; DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; }; 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]; }; @@ -718,8 +772,8 @@ in with self; { 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="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; }; - DLMtool = derive2 { name="DLMtool"; version="4.4.1"; sha256="0ld3v7qkjkp8f9didzf79ds0gdzywpk453i6fdx1wv6xr65m8kqn"; depends=[abind coda devtools LBSPR MASS mvtnorm r4ss Rcpp RcppArmadillo readxl snowfall]; }; - DMMF = derive2 { name="DMMF"; version="0.3.2.0"; sha256="17v7ksmknbgh7h9k2l6mgkykg0rq352nlw585yhfck0bvvb5vdb3"; depends=[raster rgdal sp]; }; + DLMtool = derive2 { name="DLMtool"; version="5.0.2"; sha256="0fz8qy3328wmxqg5s13bl2qr4f54zc2bk4amb9kz490vf00by0iw"; depends=[abind coda devtools ggplot2 ggrepel gridExtra knitr LBSPR MASS mvtnorm openxlsx r4ss Rcpp RcppArmadillo readxl rmarkdown snowfall]; }; + DMMF = derive2 { name="DMMF"; version="0.4.0.1"; sha256="0fypj0a0kjzfghazs55mxkig9n3ngjmbi3xmdxkpa35jbn71bfdd"; depends=[raster rgdal sp]; }; DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; }; DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; }; DMRnet = derive2 { name="DMRnet"; version="0.1.0"; sha256="0p5iyj6zqrv1hsfdq7bp96ly8dkf2ky6gzilrha336lhm35ym7sr"; depends=[glmnet grpreg]; }; @@ -729,25 +783,25 @@ in with self; { 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]; }; DNMF = derive2 { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[doParallel foreach gplots Matrix]; }; - DOBAD = derive2 { name="DOBAD"; version="1.0.5"; sha256="0nvjs4vsbl1db4g0yyrqyllawhvrzv1lgs6gmn49iqvajxyrpnvi"; depends=[lattice numDeriv]; }; + DNetFinder = derive2 { name="DNetFinder"; version="1.0"; sha256="0q56c2389qaq3wsqpj8s95ncm0xmbl1slr0jmpixb48hhgk0l0ji"; depends=[flare]; }; + DOBAD = derive2 { name="DOBAD"; version="1.0.6"; sha256="0ifrrfm4yp1416z58qgnak042rgj1xvqby2vvzgrv19z6b3250p3"; depends=[lattice Matrix numDeriv]; }; DODR = derive2 { name="DODR"; version="0.99.2"; sha256="16ia9j8vab8n2i6a17wz8nfvkfgj2gsyhxvwgxvjg2cz99hsbhdj"; depends=[Matrix npsm Rfit]; }; DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; }; - DOvalidation = derive2 { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; }; + DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; }; DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; }; - DPWeibull = derive2 { name="DPWeibull"; version="1.1"; sha256="1q47bq5qanrqnx0j5zrij4lm5mkpiar58wxabwxfqdcr7yncm5pq"; depends=[matrixStats Rcpp truncdist]; }; - DPpackage = derive2 { name="DPpackage"; version="1.1-7"; sha256="027zwznkqn2ny21dqvmk1fclzxnvsf8lpn1ks0rbigc58df4cvx2"; depends=[MASS nlme survival]; }; + DPpackage = derive2 { name="DPpackage"; version="1.1-7.4"; sha256="0lfw55kbjwr1dqkd98p6488p6c0nh5pkfkc9wpds8wsqm38siad6"; depends=[MASS nlme survival]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRIP = derive2 { name="DRIP"; version="1.1"; sha256="050xfq30fp9m03ig938bci2haiglj6jj4k327fpz7r2y78cgcnn4"; depends=[caTools readbitmap]; }; - DRR = derive2 { name="DRR"; version="0.0.2"; sha256="1scfwp6ry6apxzqjclsmn2frxp9qfw6zxsxn5w0j0q3sz42hz1h2"; depends=[CVST kernlab Matrix]; }; + DRR = derive2 { name="DRR"; version="0.0.3"; sha256="1yd1fvllfkcrwg9v322n4wkk4q4q84nvy58y4vac9pdr3yf3i4vl"; depends=[CVST kernlab Matrix]; }; DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; }; - DSAIDE = derive2 { name="DSAIDE"; version="0.5.0"; sha256="03q4clm5gr08z3lad995slw1w054b16ng4mzs5yhcpp90f00ylfc"; depends=[adaptivetau deSolve knitr shiny]; }; + DSAIDE = derive2 { name="DSAIDE"; version="0.6.0"; sha256="0jg5shgq1f9k0fcpzkpynd87xfcj8ky09xsz8n8yfvy4fw8d77kl"; depends=[adaptivetau deSolve knitr shiny]; }; DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; DSL = derive2 { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; }; DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; }; DSsim = derive2 { name="DSsim"; version="1.1.2"; sha256="1n46r7nn2wl8xnc22wf91mcz745yzx83g8nk5mmj429j3i0sfd77"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; }; DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; }; DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; }; - DT = derive2 { name="DT"; version="0.2"; sha256="1g86p0jcjqi2ph5rhm45jkzibsa6yfcj8n5cg3giy90sqgjzkdx1"; depends=[htmltools htmlwidgets magrittr]; }; + DT = derive2 { name="DT"; version="0.4"; sha256="06gsqz7p2fv6hc3fm3759gaa50krcfrqrmy7qbxyam6a36w9daix"; depends=[crosstalk htmltools htmlwidgets magrittr]; }; DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; @@ -755,8 +809,9 @@ in with self; { 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.3"; sha256="1144kcqblyrpdqyj9as6y47iq3x99bf76hdw6j43cmgcs11gapc3"; depends=[]; }; - DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.6"; sha256="0r3wjkr6grrh4nybrg0rs9ialrppjsdjshb47m0knn48vi0iwm77"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; }; - DWLasso = derive2 { name="DWLasso"; version="0.1.0"; sha256="11w6cds1cp90bcf7pj5klvby802vdn9a23pwdpjajw8bh17302qf"; depends=[glmnet hglasso Matrix]; }; + DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.7"; sha256="1syxw49pzh36nfq0zfr83cwpac86fnj0b7nlqiin4jb00h8vrf6i"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; }; + DWDLargeR = derive2 { name="DWDLargeR"; version="0.1-0"; sha256="1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy"; depends=[Matrix SparseM]; }; + DWLasso = derive2 { name="DWLasso"; version="1.1"; sha256="1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z"; depends=[glmnet hglasso Matrix]; }; 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=[]; }; @@ -764,17 +819,20 @@ in with self; { 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]; }; Dark = derive2 { name="Dark"; version="0.9.8"; sha256="1f01aq4g50f07005c8k91cfy9hvl3fmb4yl2924d7512m3884xlv"; depends=[]; }; + Dasst = derive2 { name="Dasst"; version="0.3.3"; sha256="0nrcvcfzr2y1jc984rpi3fmggns65sphc6nqr9l91h5qvpdcw7cl"; depends=[]; }; DatABEL = derive2 { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; }; + DatAssim = derive2 { name="DatAssim"; version="1.0"; sha256="120gazyyxda9faydv2lyqgvflhqi2fhih1szq0sy5v1gh4xb0hhy"; depends=[Rcpp RcppArmadillo]; }; 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-2"; sha256="1hp1601cq3rc9d84v86445mjpms6ji19lv122gdn9z0ppr39djps"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; }; - DataExplorer = derive2 { name="DataExplorer"; version="0.4.0"; sha256="0yxx20wzdnsz924q7mh9sbbbby04vv5rybvyqbk2s78a8lqv7abw"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; }; + DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; }; + DataExplorer = derive2 { name="DataExplorer"; version="0.5.0"; sha256="1vsbnm720p786f627sfx447p8q45nwd2gdm7b9hf4d3rsmrcwqsf"; 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]; }; - DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="0.9.7"; sha256="0r90jmrg3w0crfkyacaz14kg7z5ri2fjcil5b8nyf18pg4w0gnbp"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; }; + DataVisualizations = derive2 { name="DataVisualizations"; version="0.9.2"; sha256="0np64vbk878i52gbh7gs1pklqy60zpa7n44ir7mxqyw3v50bvp8s"; depends=[AdaptGauss ggplot2 magrittr Rcpp RcppArmadillo]; }; + DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.0.1"; sha256="0j7l8jgm19gbi5xprhy1brqaghm4r1a7qy0wkcjb3i46as3v9dyj"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; }; 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=[]; }; - DeLorean = derive2 { name="DeLorean"; version="1.2.5"; sha256="17qrgij2npdgsdifsa2bvcs99p28why3wbdz5a8dkhyj4plj14kk"; depends=[broom coda dplyr fastICA functional ggplot2 kernlab MASS memoise Rcpp reshape2 rstan seriation stringr]; }; + DeLorean = derive2 { name="DeLorean"; version="1.3.0"; sha256="0bsmrpraaks4nsjdbhn1npvybb29pxiby8sdimv36nqpb1fyjgpk"; depends=[broom coda dplyr fastICA functional ggplot2 kernlab MASS memoise Rcpp reshape2 rstan seriation stringr]; }; DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; }; Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; }; DeducerExtras = derive2 { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; }; @@ -793,38 +851,39 @@ in with self; { 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="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.22"; sha256="0nl2zk0sp4fdilg6a5rgkidjg7xncy252ihbqpjia4bda8y23mkn"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; - DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="0.9.1"; sha256="10q51qakascv14f8yzp2izvd404230wzvygql23ja37xgkyhz3v1"; depends=[DescTools rstudioapi]; }; + Deriv = derive2 { name="Deriv"; version="3.8.4"; sha256="1la2afxr9nilb32s3nc1j3spxzgcqn48aywq96pckpjk8vypsjyy"; depends=[]; }; + DescTools = derive2 { name="DescTools"; version="0.99.23"; sha256="0y3br8s2kvvi552xv5ir2av810l8qknc06hw9x6bryjxj42ywa4i"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; + DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.0"; sha256="1qyxbnmr2dycyfivdyvdqcbpk993q9glrixgp64pflx3sqz91yyk"; depends=[DescTools rstudioapi]; }; DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; }; DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.2.1"; sha256="0mb33ihqr8jj1ispykvyc7jn1wyaagb535ya5jgwlqrians41ihc"; depends=[jsonlite RCurl reshape]; }; 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]; }; - Dforest = derive2 { name="Dforest"; version="0.4.0"; sha256="05a3hhddkyk1jlmgvlswa5bsaqlfpgvprzpays18rd7af60542n8"; depends=[ggplot2 rpart]; }; - DiagrammeR = derive2 { name="DiagrammeR"; version="0.9.2"; sha256="0fz6d1j4jkymdz94rad96wsjzw653zz3hi6p3n6nhacv2b2j97fw"; depends=[downloader dplyr htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; }; + Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; }; + DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.0"; sha256="0zik8j50yfxgzdv2cf6q80kw8nb5y55l9sbrp60qc08r3fp6s61b"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr 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]; }; DiceDesign = derive2 { name="DiceDesign"; version="1.7"; sha256="05bmscy275077kmbmg75npnmw30kd5x5wmlizcfq771zixby3f7h"; depends=[]; }; DiceEval = derive2 { name="DiceEval"; version="1.4"; sha256="06p3v161ig714k7z59iji64xhxw1a68kqhnlwhwpjpyrx7kn137b"; depends=[DiceKriging]; }; DiceKriging = derive2 { name="DiceKriging"; version="1.5.5"; sha256="035kbk633v4kfb44wiyb556sayl73c24fc1w09r3f33shqgidzjm"; depends=[]; }; DiceOptim = derive2 { name="DiceOptim"; version="2.0"; sha256="1hx4379yb6d36c494qc237vld4jnfxq18m994p5ii9ks6s7amifn"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; }; - DiceView = derive2 { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceEval DiceKriging rgl]; }; + DiceView = derive2 { name="DiceView"; version="1.3-2"; sha256="0ny9gbaycrq3lr4gqil1yyhkkyxmabl8w6cmkkzlx3yaara0idkf"; depends=[DiceEval DiceKriging rgl]; }; DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; }; - Diderot = derive2 { name="Diderot"; version="0.11"; sha256="1lqrmgb3lxmkqyv0ys7w8fvr3n8vmgdnvhlqjqvkqys50x9a5pzl"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; + Diderot = derive2 { name="Diderot"; version="0.12"; sha256="1cq8yk4r0csnslp286hzs04zzq44q0frz0kyll9jhqjil34qh0x7"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; DiffCorr = derive2 { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; }; DiffNet = derive2 { name="DiffNet"; version="1.0-0"; sha256="04dvf0qxnc6jizwfjxw731j7d2fxyapk06rmqvga6h3p075q0mqk"; depends=[data_table doParallel foreach gplots Hmisc igraph lsa Matrix qlcMatrix Rcpp RcppEigen]; }; DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.3"; sha256="1gf5jpvimfrc9ccva0jk85rl4zfkbijm2305ky1rxcgm4kgw4lax"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; DiffusionRimp = derive2 { name="DiffusionRimp"; version="0.1.2"; sha256="1h7145ldlgwrrwj4l1wxdp2rbg2pm4v3pngiq0saz0xi3vpcxwl6"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; 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]; }; + DirectEffects = derive2 { name="DirectEffects"; version="0.1"; sha256="0c9inxn624c5rxa86d8r8jhsrm42rcsm4xxrwg7h3lvpairiyil2"; depends=[Formula]; }; DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; }; - Directional = derive2 { name="Directional"; version="2.8"; sha256="135xssvd3jvw2b98pyw33hdphhr08ha3mspx57hjzw37xxavyb24"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; }; + DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; }; + Directional = derive2 { name="Directional"; version="3.0"; sha256="08m6yg2jpz8fcdw4dlbpb1679d72q059ab2sgc3wj53m7vqirm4a"; 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]; }; + DisHet = derive2 { name="DisHet"; version="0.2.1"; sha256="1w0fpc73pk1fs05j328aw368qcabxfxz97zfqr5mda7wcmkwwnj3"; 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]; }; DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; }; DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; }; @@ -838,14 +897,15 @@ 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.31"; sha256="0kr9d8ga6dif02gzn6z72n46a85n2kx933m16ja6gpa3wmp3x2wh"; depends=[combinat conf_design lattice MASS numbers vcd]; }; + DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.11"; sha256="0plwvji2rrxmjnf61mj1ijglc9z62n26ijqsf65s35c19qv2g0y1"; depends=[DoE_base]; }; + DoE_base = derive2 { name="DoE.base"; version="0.32"; sha256="1qy3n8m9y9h4cv3p6vdjifv7118rmqqxshk7sqls0m4xr3vyzwv5"; depends=[combinat conf_design lattice MASS numbers vcd]; }; DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.9"; sha256="0l4dxb0f4ql5k3x1avfzs1w54qwjxfp8rl9h9vg6p1zhbkz4qz06"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; }; Dodge = derive2 { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; }; Dominance = derive2 { name="Dominance"; version="1.0.17"; sha256="07xsyadmq47szvp1vnf53ijq43pwd9g7554fgl803fhkwq6b3jgh"; depends=[chron gdata igraph XLConnect]; }; - DoseFinding = derive2 { name="DoseFinding"; version="0.9-15"; sha256="0sc3z62jn2jh6kjacqpf9vnpv0wzihcln24m5ipspmz0n1b0nvz7"; depends=[lattice mvtnorm]; }; - DoubleCone = derive2 { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3ji1x8j7h548pfam9z99hxylcjcxnnvc7xs2fw"; depends=[coneproj MASS Matrix]; }; + DoseFinding = derive2 { name="DoseFinding"; version="0.9-16"; sha256="0ncr95lf4mifmx6n2qkg8m3cn326zj9w4hr7afsdxg155l11w89z"; depends=[lattice mvtnorm]; }; + DoubleCone = derive2 { name="DoubleCone"; version="1.1"; sha256="1kbvsj93nn2306s6pgqiiznmlcn2nqsgcxinihl613ivczxhzpqg"; 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]; }; @@ -856,11 +916,12 @@ in with self; { DstarM = derive2 { name="DstarM"; version="0.2.2"; sha256="014xlj5kipl2jpcgcqs1ynw05x17wbsgc5mhfjn3p96bbp6pkzzy"; depends=[DEoptim ggplot2 rtdists RWiener]; }; DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; }; DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; }; + Dykstra = derive2 { name="Dykstra"; version="1.0-0"; sha256="1rc1409ky0ysqr3ccq28yhbs94m6d0z2dfa66k4c7irxjvbagwz6"; depends=[]; }; DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; DynNom = derive2 { name="DynNom"; version="4.1.1"; sha256="1c4hykp8fwr6h5y09m4qs23bmbaj6im2c833mv2ymlhy5bwhmnfi"; depends=[BBmisc compare ggplot2 plotly rms shiny stargazer survival]; }; - DynTxRegime = derive2 { name="DynTxRegime"; version="3.01"; sha256="0kcg4yqh1srhcn4wp0k97ppwn6w8vh05y9ssn82sjhlgxfbhzzjx"; depends=[dfoptim kernlab modelObj rgenoud]; }; + DynTxRegime = derive2 { name="DynTxRegime"; version="3.2"; sha256="0a6s28vc7kf6r7qmy9xjmxm39fl0ijnbl01d8rzr4w9sbnr3n85l"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; - EAinference = derive2 { name="EAinference"; version="0.2.0"; sha256="1655m1li2xa4slcaj8sg5w5svm44gdcxmyy13w61i1g5zksd4fl3"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; }; + EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; }; EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; }; EBMAforecast = derive2 { name="EBMAforecast"; version="0.52"; sha256="1809ia0dpkilprv7x19drp1v2qckk0wm596f1i1vl0k37wbhcziv"; depends=[abind Hmisc plyr Rcpp separationplot]; }; @@ -868,42 +929,44 @@ in with self; { EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; }; EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; }; ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; }; - ECOSolveR = derive2 { name="ECOSolveR"; version="0.3-2"; sha256="1awkylhsd0l5k2iflcx5y2779zhxjzr8l0xrk7v24m4nak6xj1jg"; depends=[Matrix]; }; + ECOSolveR = derive2 { name="ECOSolveR"; version="0.4"; sha256="14dpja9wr1qqip388c8b6xvdvdpwwmyq5piv182ir0rwrla5nzdb"; depends=[Matrix]; }; ECctmc = derive2 { name="ECctmc"; version="0.2.4"; sha256="1aw0cbfgzlrkyc3m1rfhbdcdyb8wjcfx6p2mz1hvds86mf1pzv1i"; depends=[Rcpp RcppArmadillo]; }; - ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.12"; sha256="0g0591dddkdvpq1wgw5wjz0b0qlwkjxi0zz9g33qs442ijq8v1wc"; depends=[jsonlite shiny]; }; + ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.13"; sha256="0dq8ja4ydxnc7qx35qhh9ryqgi7ambwz6ka2821mmq3p994crswn"; depends=[jsonlite shiny]; }; + ECoL = derive2 { name="ECoL"; version="0.1.0"; sha256="0rizs41fk4w3lwrc4xw8hl035pvg0y746w1zy3bs8ch0hqyplhdm"; depends=[cluster e1071 igraph MASS]; }; + EDA = derive2 { name="EDA"; version="1.0.1"; sha256="13qyi7yh1xqsyyvd51j5dl6dx4xh6kr97pz5v4wn46nbx6vna0dk"; depends=[ggplot2]; }; 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]; }; + EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; }; EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; }; EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; }; - EFAutilities = derive2 { name="EFAutilities"; version="0.1.0"; sha256="1kbbhwvqj6c5n2nknjy7kfm4i0zhil5x8rsl1k4xh1zcvnlj22bs"; depends=[GPArotation mvtnorm]; }; + EFAutilities = derive2 { name="EFAutilities"; version="1.2.1"; sha256="1hgmj9zk9mwqwmqila1ana6jzqg55aj535pkrzai2y6yq45dvfh9"; depends=[GPArotation mvtnorm plyr]; }; EFDR = derive2 { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; }; EGRET = derive2 { name="EGRET"; version="2.6.0"; sha256="0alr47pmq1ml64j500vkqwmvrqa3i1ccbf3w7w44fbbjy1vfp04a"; depends=[dataRetrieval fields lubridate survival truncnorm]; }; EGRETci = derive2 { name="EGRETci"; version="1.0.2"; sha256="15jf4bgxvqqz64y4i6ncfj0ymgwmhahxlhdnfps4zj7gwxgcbvqh"; depends=[binom EGRET lubridate]; }; + EHR = derive2 { name="EHR"; version="0.1-3"; sha256="1y12j0sjr1zp3bzha1p31f903js674l6ifjccw0y9718sry8dbv2"; depends=[logistf]; }; 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]; }; + EKMCMC = derive2 { name="EKMCMC"; version="0.1.0"; sha256="0sfj6w8780fik0ar9bg8zrxkj10wqagvwrngd58g50fc0z4lhr53"; depends=[numDeriv]; }; 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=[]; }; - ELMSurv = derive2 { name="ELMSurv"; version="0.4"; sha256="0vziygjvs50wih318jvksj4z4mn1r35xx200p7ywf2a39xmr4490"; depends=[Rcpp RcppArmadillo survival]; }; 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.3"; sha256="1kzna29kd6s2hgli5azrfz85mbyl1x6knvhhhny2scf7a1fcijsy"; depends=[DataCombine ggplot2 lmerTest sjstats]; }; EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; }; - EMCC = derive2 { name="EMCC"; version="1.3"; sha256="166yqr17a72lhimpgbgzpf9frribj47n4rddzqd9m4xmh4f6x7x5"; depends=[EMC MASS mclust]; }; - EMCluster = derive2 { name="EMCluster"; version="0.2-8"; sha256="15ngm8k0iscasi1jcn4ffya0y4rq5llj5m7gjv8f61rw31yfyjm0"; depends=[MASS Matrix]; }; + EMCluster = derive2 { name="EMCluster"; version="0.2-10"; sha256="1p8zy0f10383svgm2di0gmqwmn4m8ydsn16xh5rymssg831xwql6"; depends=[MASS Matrix]; }; EMD = derive2 { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; }; 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]; }; - 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.2"; sha256="1avg6q3z77786wx6gpcn53sv5lhj3d6597kp885i418k4hyh72qv"; depends=[KernSmooth lattice mvtnorm]; }; + EMMIXcskew = derive2 { name="EMMIXcskew"; version="0.9-5"; sha256="1ys5kvns6jlw2lk9m6xcy71wx1d581cmphiaxnp3hsqimc8wz7hq"; depends=[MASS mnormt rgl]; }; + EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.3"; sha256="05y1ivbzbsfab90925l3ahzd3b8y5kjfk3f0p2s9s3sfyxphqah7"; 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.2"; sha256="0l9wyxmcl8b6jiykc4mim6npmz5wrsapk2wgxbfhg27dwdb847ha"; depends=[ROCR]; }; - EMSC = derive2 { name="EMSC"; version="0.8.2"; sha256="1wclkyq528fhvbr6n5592byjlpi0xszhqzbbzsq64ilg88q9cmaj"; depends=[pracma]; }; + EMSC = derive2 { name="EMSC"; version="0.9.0"; sha256="13d915g7iyv724x35i9mr8msy5mhrpqhhva21vdinxbjdy6vdlr9"; 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.3"; sha256="1n7fxmqg8762lc7lg50h6wcrxrrz4nvi0xdaganz84l8vp8w90ms"; depends=[]; }; @@ -911,7 +974,6 @@ in with self; { 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]; }; ENmisc = derive2 { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; }; - EPGLM = derive2 { name="EPGLM"; version="1.1.2"; sha256="1x7n16pjr38gh5llraszjwgm650zmcm14j6v1kc5k81g4ghgdsq6"; depends=[BH MASS Rcpp RcppArmadillo]; }; EQL = derive2 { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; }; EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; }; ERP = derive2 { name="ERP"; version="1.1"; sha256="00w9zz5rp1asvk13sj9gkd14n2akbclsyz26jp5a3r85fh6chdm0"; depends=[fdrtool mnormt]; }; @@ -920,22 +982,24 @@ in with self; { ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; }; ESGtoolkit = derive2 { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; }; ESKNN = derive2 { name="ESKNN"; version="1.0"; sha256="1w43v3q9i7dkx1qwcl5cgh9wdgg5r4s7vfbkk0vcsq9qd8nbcvfy"; depends=[caret]; }; - ETAS = derive2 { name="ETAS"; version="0.4.3"; sha256="08i8i3az5f4nb6cwfyilc0dk84j6i3f3k6bxr2k1lrds1rqx0fla"; depends=[fields lattice maps Rcpp spatstat]; }; + ESTER = derive2 { name="ESTER"; version="0.2.0"; sha256="1jiyqq5hgqc754r434sik9jnlpw66xz56cjdf5ig95qkffzsg224"; depends=[brms cowplot doParallel dplyr foreach ggplot2 lme4 magrittr rlang tidyr]; }; + ETAS = derive2 { name="ETAS"; version="0.4.4"; sha256="0s0j7r1nyf82qz3lavsvyd11hl0jkq69c70wh00nfy93n2ygp376"; depends=[fields goftest lattice maps Rcpp spatstat]; }; ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; - ETLUtils = derive2 { name="ETLUtils"; version="1.3"; sha256="13xq9i9fr34kx1nym7nr02gynshzm4jjn4qzx6ydg044b7xl57jp"; depends=[bit ff]; }; + ETLUtils = derive2 { name="ETLUtils"; version="1.4.1"; sha256="07wqrg7mnxmbdf2ibxj5kppl4sd3l608yfhbbsngkhpsrm203qva"; depends=[bit ff]; }; + EValue = derive2 { name="EValue"; version="1.1.1"; sha256="0fdihngqgl2m7385ih08zzh9y38aal1d9lv7358qf0z68i9bgfa2"; depends=[ggplot2 metafor]; }; EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; - EWGoF = derive2 { name="EWGoF"; version="2.2"; sha256="0limqk1hcpla9mz41ylm8qcvg8q4491d4dhhb1pbvdnskb70g5i4"; depends=[Rcpp]; }; + EWGoF = derive2 { name="EWGoF"; version="2.2.1"; sha256="0n1fx6k9ndb2s9ybzizbqz662c9s1f48q6v697pqhnfy9si1nplz"; depends=[Rcpp]; }; EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; }; Eagle = derive2 { name="Eagle"; version="1.0.2"; sha256="0n36h23jkac93d9f13bdwvac0fv198fjmh3981z32cn9glz0xbl8"; depends=[data_table matrixcalc Rcpp RcppEigen shiny shinyBS shinyjs shinythemes]; }; 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]; }; + EasyMx = derive2 { name="EasyMx"; version="0.2-1"; sha256="03yshzb4wh3n667z9lmrwsz16chpgnl8qv3qlx425mj5iiyv626z"; depends=[OpenMx]; }; EasyStrata = derive2 { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; }; EbayesThresh = derive2 { name="EbayesThresh"; version="1.4-12"; sha256="07a2dd3za2dc81n6m2xy794sclp3yw7f46lg1igaflh7m9407198"; depends=[wavethresh]; }; 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.1"; sha256="0ww0p4allaaz2zmj88105xr75gffcsycjjyy1ph4m9q7w5sw3c5y"; depends=[d3heatmap edgebundleR ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; }; + EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-4"; sha256="18l5v7zsmz35brnf6b8qfxbs8906rmyc2kkh9bm96x01m3vx8pkh"; 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.2"; sha256="1p2m4kramcf71xlm9hbk5l5mb8nmjfac1p3csai7m2gmikf559yj"; depends=[]; }; EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; }; @@ -944,22 +1008,22 @@ in with self; { Ecohydmod = derive2 { name="Ecohydmod"; version="1.0.0"; sha256="0imkzjqp3g28l42jz5m4p85wg5rawmn9hy1wys9xndnaliv6d7r2"; 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]; }; + EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.0"; sha256="1pbpknz1v5k7fgwvzv5ldyxxshys4sx7d17hbwzph1z68jcmixzg"; depends=[editrules igraph 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]; }; + EffectStars = derive2 { name="EffectStars"; version="1.8"; sha256="0gcgwlywx7slbk8nyzv47r4wx837gimmshrb1kl2m4cl4xbm84jh"; 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.3"; sha256="10awzpl6vb4rz9yja8ly6w2vizggpzicp7s42s4806nwf116zwv5"; depends=[]; }; + EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; 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.3.1"; sha256="04ivyw09pb49vj7x0mfb62d60ra2byzfj90d67xr47jyxbfhfjah"; depends=[ggplot2]; }; - EnQuireR = derive2 { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR MASS Rcmdr SensoMineR]; }; + Emcdf = derive2 { name="Emcdf"; version="0.1.2"; sha256="0jb59jp1drcwipmk6yzg0cl366i8nhffa13c3x3fmhaj7ifv77vv"; depends=[lattice Rcpp]; }; + EmiStatR = derive2 { name="EmiStatR"; version="1.2.0.6"; sha256="1ygi3rz4xc7y0m1jd23g3li62br7fs0dcm6fj8kha5q93xn6yvrx"; depends=[doParallel foreach lattice shiny xts zoo]; }; + EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.3.6"; sha256="0fiwvdzcyz6ayzqfa6j2ygpab1cwbi04gd2c2g1j9qbdq95myipa"; depends=[ggplot2 gridExtra]; }; + EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; }; 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]; }; EnsembleBase = derive2 { name="EnsembleBase"; version="1.0.2"; sha256="1wbkh89gz6m2m9hxbcymsymz3b7pynhdwfyq4qg3h4wn8409anxy"; depends=[bartMachine doParallel e1071 foreach gbm glmnet kknn nnet randomForest]; }; @@ -968,19 +1032,21 @@ in with self; { EnsemblePenReg = derive2 { name="EnsemblePenReg"; version="0.7"; sha256="00218yh0vzlb5g94asq5nz4i8blppskdzz9fl4c0v3fld3kxz2md"; depends=[EnsembleBase glmnet]; }; EntropyEstimation = derive2 { name="EntropyEstimation"; version="1.2"; sha256="13kb83lfpkw6yq687j0ci23yn5c9dqjibybyyaplk6jixy08lrvy"; depends=[]; }; EntropyExplorer = derive2 { name="EntropyExplorer"; version="1.1"; sha256="02ljnq9ayxg4lrrnb6nlxr1k5ki8dd5i8hjb9fvvb19hwr2id5h4"; depends=[]; }; - EnvCpt = derive2 { name="EnvCpt"; version="0.1.1"; sha256="052yz26lypcffwnxdqxm2d029rzcdkw5dvf2xyvyhi5lcnxjrn9r"; depends=[changepoint forecast MASS zoo]; }; + EnvCpt = derive2 { name="EnvCpt"; version="1.0"; sha256="0rdcxb924ij3rdcnzfz8pxahvwza2qi2siqpxsafjkg2mrqil9kj"; depends=[changepoint forecast MASS zoo]; }; EnvNicheR = derive2 { name="EnvNicheR"; version="1.4"; sha256="0hxx9wmzlw0clvdgdsy8msc78nvm81j3naxr57i7lqqa360sjy3a"; depends=[IDPmisc]; }; - EnvStats = derive2 { name="EnvStats"; version="2.2.1"; sha256="0gjjw2pvqh4m18f7m0pkcr1lsryqmfai1kqc34146h1a4wv7gbdv"; depends=[ggplot2 MASS]; }; + EnvStats = derive2 { name="EnvStats"; version="2.3.0"; sha256="0f0sda26in2a25vq8xr6pkskjk10q2pg463h9c1xap3bghq4xgc3"; depends=[ggplot2 MASS nortest]; }; 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.19"; sha256="1zd5q5w8l9gvq0x5j00vwfb61kfadbziqmff5fm0cmwnvpizl55k"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival zoo]; }; + Epi = derive2 { name="Epi"; version="2.26"; sha256="0c54nvcyjvsmzmk326avbi69vbpw9vlvcqh8c6j32byiwj251ans"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival zoo]; }; EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; }; - EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.11.0"; sha256="1ry7s4snq6hgbw55b6w615f2y2iskpdcy9kpjg1zv6hp06b6hyqr"; depends=[]; }; + EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.12.0"; sha256="1i84fslz8sdngvkv34zhzjwzrzzxx6f4s31p8f5smmf028jlpyys"; depends=[]; }; EpiCurve = derive2 { name="EpiCurve"; version="2.0-1"; sha256="15y6nlinw3ppi4bn8xpsrch1avn7642f06lcsv2bjyi1carhfqkw"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; }; EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; }; EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; }; - EpiILM = derive2 { name="EpiILM"; version="1.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]; }; + EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; }; + EpiILMCT = derive2 { name="EpiILMCT"; version="1.0"; sha256="1s7f4g1d44mqp475z5cn97dqv6b1caxmfq1p6gr1w7jvgq0dfqp5"; depends=[]; }; + EpiModel = derive2 { name="EpiModel"; version="1.6.1"; sha256="0jmwrpcfrfwrw5zwvwl0cv961nvqfvxjggx93iyc8z8bd6mf1wba"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; }; + EpiStats = derive2 { name="EpiStats"; version="1.0"; sha256="17i8i3v8qpwas4h6g8sbdl42syg20fm22c7p1bnv4nzx28p9yzhy"; depends=[dplyr epiR]; }; 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=[]; }; @@ -989,13 +1055,14 @@ in with self; { 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.1.1"; sha256="10i2cwrsgi6q5fq9ksjrhrdwg6hjjd284xsjdiwlfcbfa59390dc"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; }; - EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.0"; sha256="08m7igh6n8haf8yi8ikrz6ih4agvsnx415kdx4cgjw4xilvgpgqm"; depends=[clinfun data_table plyr shiny VGAM]; }; + EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.1"; sha256="12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm"; 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.11"; sha256="1zir62009fw4w4ixkyc5s9428krlh6bz8ir2vl11206xxf8rbkd4"; depends=[zoo]; }; - EventStudy = derive2 { name="EventStudy"; version="0.33"; sha256="1jyy0mhmykysv7qmmcr3anl2gm01swh19csxjkm1aanwdxc11835"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI openxlsx purrr RColorBrewer readr rstudioapi scales shiny stringr testthat tidyquant]; }; + Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.12"; sha256="065rd8hwbzanfd0px0nli9szj9afm06a07vxl9bwj9n744whi3r3"; depends=[zoo]; }; + EventStudy = derive2 { name="EventStudy"; version="0.34"; sha256="04w8cjmpy0ndcrad20ni9wa03pds8bvirks258pxyflx2kdvj0bf"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI openxlsx purrr RColorBrewer readr rstudioapi scales shiny stringr testthat tidyquant]; }; EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; }; + EvolutionaryGames = derive2 { name="EvolutionaryGames"; version="0.1.0"; sha256="1v6xpxk4kbjbmv8vh517rd76gyrd9znpxqdh4jqz8lvdpnpla4wv"; depends=[deSolve geometry ggplot2 interp MASS reshape2 rgl]; }; 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]; }; Exact = derive2 { name="Exact"; version="1.7"; sha256="0d0h406w2l99gxq6pmh9crxxrvdidcajk7bqzmifl7nfb77vp1av"; depends=[]; }; @@ -1004,21 +1071,20 @@ in with self; { 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=[]; }; + ExpDE = derive2 { name="ExpDE"; version="0.1.4"; sha256="0yjsap92dd1sb23fhw69i0ddk3lyj5f4kwp9rvz4k0vxry10hx7g"; depends=[assertthat]; }; ExpDes = derive2 { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; }; ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; }; ExpRep = derive2 { name="ExpRep"; version="1.0"; sha256="0spv3wd9c8sr338n5kdzrs28yh7s90fl70wsdnkibmlxhnh3ay3g"; depends=[]; }; - ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.1.8"; sha256="15qqfmgcfc77cygp5zabbf8b5bqs3wyj223waqxrryrnhvzdxxvh"; depends=[CORElearn semiArtificial]; }; - ExtDist = derive2 { name="ExtDist"; version="0.6-3"; sha256="1vsxm578bb70wnz3mxm7y1n5vs0x5pby99hvxg5y5ksh2g2ascwa"; depends=[numDeriv optimx]; }; - ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.5.2"; sha256="010k2ddrrmrv4ayr009sm0vdgql5n1hy2b7rxyggj8iqsm8lkxim"; depends=[Formula]; }; + ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.3.0"; sha256="14m3b9fsrpfpr8avsnhl8b3bzk2xlhwgkwag5iq8bj7bzvv4yck1"; depends=[CORElearn semiArtificial]; }; + ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.6"; sha256="12bc4mmkmggvk3kfmz6nq13fa2470z0bx8smnvq9vf1ypdiiw85y"; depends=[Formula]; }; FACTMLE = derive2 { name="FACTMLE"; version="1.1"; sha256="0qz2i0hnn84bpps1h8jmfkgp5p59axr0wayj9dvl839radrvpqvy"; depends=[rARPACK]; }; FACTscorer = derive2 { name="FACTscorer"; version="0.1.0"; sha256="1gbfpm5szi6w8iyp7ywpqrmdq0wrv5axj29sj9gxjwmjfh5qgqjx"; depends=[]; }; - FADA = derive2 { name="FADA"; version="1.3.2"; sha256="0093j4sgm1fv9bz9h9ldgaac0ggxwwk2qk46c7vxfh9zkmlm6zmb"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; }; + FADA = derive2 { name="FADA"; version="1.3.3"; sha256="1kckksim3m6kypm3qnyijgmnrq6dwjfs5jax5dr94giwlpfcdl8q"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; }; FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; }; FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; }; FAOSTAT = derive2 { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO scales]; }; + FASeg = derive2 { name="FASeg"; version="0.1.9"; sha256="0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik"; depends=[]; }; 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.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]; }; @@ -1032,19 +1098,18 @@ in with self; { 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.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]; }; + FENmlm = derive2 { name="FENmlm"; version="2.1.0"; sha256="112n9px4hw2k7kgbkfvw9my6fjwb2ggf2q2xrycn7dp3wblsmz20"; depends=[MASS Matrix numDeriv Rcpp]; }; FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; }; - FFTrees = derive2 { name="FFTrees"; version="1.3.4"; sha256="06f1vjmypcdai8smac7acixc2zdah3la4lbwr8s3a0ksrj2590sk"; depends=[circlize e1071 igraph progress randomForest rpart stringr yarrr]; }; + FFTrees = derive2 { name="FFTrees"; version="1.3.5"; sha256="0qz3w7qh8lgl4fn2hmrd4mnp17vaz5yf7kcpcrm038xvqq3w5c5k"; depends=[circlize e1071 igraph 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]; }; + FHDI = derive2 { name="FHDI"; version="1.2.1"; sha256="12vw8l0jk2z3i9gz108l2wrha6psqrg508rv1d44r4fss3xa233l"; depends=[]; }; + FHtest = derive2 { name="FHtest"; version="1.4"; sha256="1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2"; 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]; }; 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-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; }; FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; @@ -1063,13 +1128,13 @@ 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.3"; sha256="01gc6pcj7fsg3ha2ykaji75b7iasrbjcmqhdlbdnhyzzakg50mpl"; depends=[Matrix]; }; + FREGAT = derive2 { name="FREGAT"; version="1.1.0"; sha256="04rcbwbwi53d8his0ss9hj4s2c28r292f4f2ayl70av7k74nnccy"; 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]; }; + FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.0.1"; sha256="05hcds1g1hkpr3fww1i462p633xlhwv594fpbphvw8fm10mc0hns"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; FREddyPro = derive2 { name="FREddyPro"; version="1.0"; sha256="0h2rdydcx9pwjl1zxghzb5vqynrwdkscyq6c9adjgz4dngfwyzsw"; depends=[dismo ggplot2 lubridate raster RColorBrewer sp]; }; - FRK = derive2 { name="FRK"; version="0.1.5"; sha256="01r7w2m9f6lr63hiv8sfg49jccyf5xk0fw7xipvwmq0daxl250y1"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime]; }; + FRK = derive2 { name="FRK"; version="0.1.8"; sha256="037rk9l9bl65wskrii07x4z0g0ic92fx7i0p522bgy53qxa3sbq0"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime]; }; FRegSigCom = derive2 { name="FRegSigCom"; version="0.1.0"; sha256="02lvgxxr12rfs4k7dg3rl249nbvfkqaywas3k6jhm378j3j8yaaf"; depends=[fda]; }; - FSA = derive2 { name="FSA"; version="0.8.16"; sha256="0vsaldpnz648mrhbix6688pqf4ayxkn3375cqjy8spk4kpwrpwpl"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; }; + FSA = derive2 { name="FSA"; version="0.8.17"; sha256="1mpkbz5q4xbncmwqrylww679ghz52fsr81flavkksb8ljr4z6f7p"; depends=[car dplyr dunn_test epitools gplots lmtest 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]; }; @@ -1082,15 +1147,16 @@ in with self; { FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; }; 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.6"; sha256="0wkz1kvpsl4z688y9qwp3hlycn66vbsl85s70wwv8ww12z3dwpcd"; depends=[ade4 KernSmooth scatterplot3d xtable]; }; - 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.21"; sha256="0kd9q4nh01hh9ky9f2gx880cbhsipk5cl0173z8kn5vqag9ms4wj"; depends=[Matrix Rcpp]; }; + FactoClass = derive2 { name="FactoClass"; version="1.2.4"; sha256="0rzbzl32hk4mrs6njm4cnj84ifsf52ms5khy43m9bfmwwmadbilr"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; }; + FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.1"; sha256="09fnlqwnijg94yfm3q41pdck9yxaq037m7421g4hdxaigljjb6ml"; depends=[FactoMineR rmarkdown rrcov]; }; + FactoMineR = derive2 { name="FactoMineR"; version="1.39"; sha256="12m0yi4w3iw07gx8viwvy8v8l1qh3qr7ghv39cdb2g0zgmnivfxh"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; }; FactorsR = derive2 { name="FactorsR"; version="1.2"; sha256="0y6r5ch0h0sag1xinvnjr7q4495naygvi5iiqq9bc51ijv228c0m"; depends=[]; }; - Factoshiny = derive2 { name="Factoshiny"; version="1.0.5"; sha256="1jqk80raqf3kxympkqfayzwwc61yipzh4cbklrb9kmay5ryg4gj9"; depends=[colourpicker FactoMineR shiny]; }; + Factoshiny = derive2 { name="Factoshiny"; version="1.0.6"; sha256="1rb16g4gqq9mmwgpp94j9g5iv5p1psjqllsp9qn7ccccmgn6nnw9"; depends=[colourpicker FactoMineR shiny]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; 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]; }; + FarmSelect = derive2 { name="FarmSelect"; version="1.0.1"; sha256="1qpa46igan3dqgn4ny2lmj08y6jk7krp7pb27afi694nw5l3l97h"; depends=[glmnet ncvreg Rcpp RcppArmadillo]; }; + FarmTest = derive2 { name="FarmTest"; version="1.0.1"; sha256="0h829706ilq2czjnn48wpwb09ryx0nwbl953m6p6z1wp4a3dzcv4"; depends=[Rcpp RcppArmadillo]; }; 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]; }; @@ -1102,35 +1168,40 @@ in with self; { FastRWeb = derive2 { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; }; FastSF = derive2 { name="FastSF"; version="0.1.1"; sha256="1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb"; depends=[limSolve Rcpp RcppArmadillo]; }; FatTailsR = derive2 { name="FatTailsR"; version="1.7-5"; sha256="1l2anaf4kixidmvya64ni5b78bl9w2n6xf1lnf297lkdka8gxigw"; depends=[minpack_lm timeSeries]; }; + FateID = derive2 { name="FateID"; version="0.1.0"; sha256="0q2pq5w93n2zh0qz96b33pc9bbjfp1dqzsi1kcizi468a7jgkfmx"; depends=[caTools DESeq2 destiny lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som]; }; 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.6"; sha256="0b2fk2x634m91j5rvn7mf7wfa8dz8kafgridq1slhb9mkdk5w21y"; depends=[curl data_table devtools dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp]; }; + FedData = derive2 { name="FedData"; version="2.5.1"; sha256="1yvmy7y26rqrxqap8nicdfrh3s66nyrcn5lvasnairaz1fvx5qxs"; depends=[curl data_table devtools dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp stringr]; }; FeedbackTS = derive2 { name="FeedbackTS"; version="1.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; }; Fgmutils = derive2 { name="Fgmutils"; version="0.9.4"; sha256="0k5pafgrcb7smklgzgw2mf6npj55nm5fsr6k0xp6ji380rvdxc0y"; depends=[data_table devEMF ggplot2 gridExtra plyr png ReporteRs sqldf stringr]; }; FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; }; - FinAna = derive2 { name="FinAna"; version="0.1.1"; sha256="092jw6y06r48dph4h0dnsv96bjh8knx91lrdlchb3q43dzfdz4i1"; depends=[]; }; + FinAna = derive2 { name="FinAna"; version="0.1.2"; sha256="09svg5z52vv90ih85awgh6ns3pqi789qjm2wi1gb9hbg9v5g7pdv"; depends=[]; }; FinAsym = derive2 { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; }; FinCal = derive2 { name="FinCal"; version="0.6.3"; sha256="1clvnvhpf2krrf8flhmdxmys6ym3xw3v4v07kk1if4xb0dfk9wgy"; depends=[ggplot2 RCurl reshape2]; }; FinCovRegularization = derive2 { name="FinCovRegularization"; version="1.1.0"; sha256="0h3i46s0rpqvgnqgjwqrlrfa3vv5jn2hm6bqc0ijwmrr9f80g4ir"; depends=[quadprog]; }; - FinancialInstrument = derive2 { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod TTR xts zoo]; }; + FinancialInstrument = derive2 { name="FinancialInstrument"; version="1.3.1"; sha256="0f1zaclrcmpkdhcfc8a09f7lsf2b7gfyd7js3173qckn84a01f3w"; depends=[quantmod TTR xts zoo]; }; FinancialMath = derive2 { name="FinancialMath"; version="0.1.1"; sha256="11nhphvd7bvbc7xfs85rib763r1mpvxmsj6hgzfib5aifib5k5js"; depends=[]; }; FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; - FindIt = derive2 { name="FindIt"; version="1.1.1"; sha256="069n260dqzxw3d5xqlrzw4h6m3w8zkcd4zra9xzv0h561xr3b237"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; }; + FindIt = derive2 { name="FindIt"; version="1.1.3"; sha256="1d4cvd4651fdbwmj83q2x9vwvg92fbmq8112z7ian8n96n30rchd"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; }; FindMinIC = derive2 { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; }; - FinePop = derive2 { name="FinePop"; version="1.4.0"; sha256="0bq6p95mpwbx38gly61n58jrqz6rymwdq6dwxghpx98f6isa83xh"; depends=[]; }; + FinePop = derive2 { name="FinePop"; version="1.4.1"; sha256="06wabgrxfq11ncbll5d0f07kkh23w2hrvjx8k1vy55q9f1dwd3sb"; 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]; }; + FishResp = derive2 { name="FishResp"; version="0.2.0"; sha256="1iscxa06pqd6rci3fwdxq2pqyiirr2fzbhs9c9xwyp3c9cmamv8h"; depends=[chron lattice mclust respirometry rMR]; }; 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=[]; }; + FixedPoint = derive2 { name="FixedPoint"; version="0.2"; sha256="1gmh9ipv010q4lgpnka1rwfza5c7llgjpn7yvcsvlxglmplh8969"; depends=[MASS]; }; FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; }; + FlexGAM = derive2 { name="FlexGAM"; version="0.7.0"; sha256="1pjlsi747j347vwn94391xr3aknnspgw7rc1jnin7g0n1fgkcww4"; depends=[MASS Matrix mgcv scam]; }; FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; }; - FlowScreen = derive2 { name="FlowScreen"; version="1.2.3"; sha256="1yzar8r8jdd385xic5wmqpkwm5f0pysckv70ss9sficwqrgrfcsp"; depends=[changepoint evir zyp]; }; + FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; }; + FlowScreen = derive2 { name="FlowScreen"; version="1.2.4"; sha256="0lp5andxzcs2wyhgwp44ss6b3jjqzf7qy0w9a0yiqxby3h58szwd"; 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]; }; + ForecastComb = derive2 { name="ForecastComb"; version="1.1"; sha256="1ki769m3cw3kb8jhbrgiwssspszsipmg2hlbk4ifldi8s19l9m12"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; }; ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; }; ForecastFramework = derive2 { name="ForecastFramework"; version="0.9.0"; sha256="131h9f148wn89znzsnym43amlvf4s7jzg4f2p7ld9ns7727sf56q"; depends=[abind dplyr lubridate magrittr R6 reshape2]; }; ForestTools = derive2 { name="ForestTools"; version="0.1.5"; sha256="0yjyc5i2jhagvwpzg420zhhygs966ncjn9aggh4gd4zdsi0nzqcx"; depends=[APfun imager raster rgeos sp TileManager]; }; @@ -1141,21 +1212,22 @@ in with self; { FrF2 = derive2 { name="FrF2"; version="1.7-2"; sha256="1qjgx7zbnabbs4zq7hn3j1i1xyy4yjwnz7pn25kz9s3szqr1fk66"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; }; FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.1"; sha256="0l015v99hzmiyic0klvq71ljk9f8ipr57ki7x4cjyz1gam9f84p5"; depends=[]; }; - Fragman = derive2 { name="Fragman"; version="1.0.7"; sha256="0dh1gk2arj7r6zd5dhkmxpr7a1hd3pl8x5klmlsg4n6rwsx2p4v8"; depends=[]; }; + Fragman = derive2 { name="Fragman"; version="1.0.9"; sha256="03vmvmnyza4i46v1awkdjz6ccbsiq49dm0mlmwsm801rq6yfihgp"; depends=[]; }; 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]; }; + FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; 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.3"; sha256="1wy76ich0bibf4938m97iww8zilgycha8351ryc3fqid0v78xzvg"; depends=[BH Rcpp]; }; + FunChisq = derive2 { name="FunChisq"; version="2.4.5"; sha256="0m9w5v9pdi84r5z2rzcr0v1fn3ycx5d344ab67c9984j55p8pqpj"; 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]; }; + FusionLearn = derive2 { name="FusionLearn"; version="0.1.0"; sha256="03x21dpl72dkd4cmmaqdh42hwbdpp5c5ib79ig8pkv196231r5dn"; depends=[]; }; Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; }; FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.0"; sha256="02c08rzmmdd2l84jlzb0vck9m08afm7j599n0g09hffflcrb3fz7"; depends=[MASS]; }; FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-5"; sha256="1achmsc107b26d266q0vmip8vi3qaa5z0p183z2fjdm7zh9ch6ag"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; }; FuzzyMCDM = derive2 { name="FuzzyMCDM"; version="1.1"; sha256="0ss0s65mm6j0nax4mb9g668d9n9cgl0l016mc3h9hbjxfpqrbkks"; depends=[RankAggreg]; }; - FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; }; + FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-2"; sha256="0nvnz5df25slqdwnlw1fdv3xx9sz980x71805h8baw32ajg28a72"; depends=[]; }; FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="3.2"; sha256="0gldq0bg1p1vmrn35prha44d7lyymz0jzshdyp2c5rx433mny7h5"; depends=[FuzzyNumbers]; }; FuzzyR = derive2 { name="FuzzyR"; version="2.1"; sha256="08mhwzyksw0snxxcwn2kg62ya8smfvrls30znqhmnbkn5ijz0642"; depends=[plyr shiny]; }; FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.3"; sha256="0ry2cr5ds7kd7vk6ihdg68gqs2rv6qfmzlszr33a9ia5gsbi8b7b"; depends=[DEoptim FuzzyNumbers MultinomialCI]; }; @@ -1164,7 +1236,6 @@ in with self; { G1DBN = derive2 { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[igraph MASS]; }; G2Sd = derive2 { name="G2Sd"; version="2.1.5"; sha256="165i6x2k56vwhk5p2p5m9vjmp9flblsapjdlz7nw9b719l6xz5zk"; depends=[ggplot2 reshape2 rJava shiny xlsx xlsxjars]; }; GA = derive2 { name="GA"; version="3.0.2"; sha256="0jpgbniyxvilnr1jv6vmrfgnar3qczvq819xjb70inp5f41zd6wx"; depends=[foreach iterators]; }; - 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]; }; @@ -1175,45 +1246,49 @@ in with self; { 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.2.4"; sha256="1brk16fqciprggwx96xfzbz8jswg8k9d0qvfaj9hffnl0gq0jpxa"; depends=[MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; }; + GAS = derive2 { name="GAS"; version="0.2.6"; sha256="18a3hagwfy0xa7abkwgf2pk5l2n0bxg4kr8y0m5iapkbc3gx5rvz"; depends=[MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; }; GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; }; GAparsimony = derive2 { name="GAparsimony"; version="0.9-1"; sha256="1j8r56pri7h0xr0fiihkwgccjb33n89lz8ah5p42bak7ay9fglkm"; depends=[foreach iterators]; }; GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; }; - GBJ = derive2 { name="GBJ"; version="0.4.0"; sha256="0b1612ijmbif7qbsnfnnkq1fsz0qmz4hbq14clpv59d3bsccs6jc"; depends=[BH mvtnorm Rcpp SKAT]; }; + GBJ = derive2 { name="GBJ"; version="0.5.0"; sha256="07wrydd2vlvwc56hgcrqbass0d0qamn3rg5vsf9bamxa6pcg9s53"; depends=[BH mvtnorm Rcpp SKAT]; }; GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; - GCD = derive2 { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; }; + GCD = derive2 { name="GCD"; version="4.0.0"; sha256="05cn9g9pahx5g9qh2lyqqlaafd1jji9awi9wx6r9hm09g4bmqrba"; depends=[]; }; GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; }; - GCalignR = derive2 { name="GCalignR"; version="1.0.0"; sha256="09qwxl39csrljkbfn3n0fxzypslhjzf10p61p0qmqkc9shh4yk6c"; depends=[ggplot2 pbapply readr reshape2 stringr]; }; + GCalignR = derive2 { name="GCalignR"; version="1.0.1"; sha256="1p1zxf5s75ckyj7a61n43ix314p3b99knyg6z5d4sn5n417h2m42"; depends=[ggplot2 pbapply readr reshape2 stringr]; }; + GD = derive2 { name="GD"; version="1.2"; sha256="10csmsf4xkd3w73nskd1sxm8c9i0rlrsxyb4dmjrv8l207cc80pb"; depends=[BAMMtools ggplot2 reshape2]; }; GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; }; 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.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.1.1"; sha256="1akgl4j38x4qf3z9d6z7cgjd7x9f0k3lrzyrzgykqhrzmbh68z2m"; depends=[gee]; }; - GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.5"; sha256="1hrsdpfk0iz0agi3rms43fk0yjv5ys10awqfxgwz9r9qfgczkh7j"; depends=[changepoint GENEAread MASS rpart signal]; }; + GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.9"; sha256="1imq71nhr0bc08w8jvw57fvghczn1p3vb1n7xnk7i7n6aq23dzsx"; depends=[changepoint GENEAread MASS rpart signal]; }; GENEAread = derive2 { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; }; + GENEAsphere = derive2 { name="GENEAsphere"; version="1.4"; sha256="0z6qazcgjcs03zz26167dxg6mgjaq1z0qdsa4ggh32813l4k0ijw"; depends=[GENEAread ggplot2 MASS misc3d rgl]; }; GENLIB = derive2 { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; - GEOmap = derive2 { name="GEOmap"; version="2.4-0"; sha256="0jhzsp5f427r652mnaw3zg0vv13jaz11bfbbxppmxvya6k2jimyg"; depends=[fields MBA RPMG splancs]; }; + GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; 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.5"; sha256="0nqym5jqgshx6ad4k4nwain6lnhx5y7s3b10f2xmcn93287p3rji"; depends=[VGAM]; }; + GEVcdn = derive2 { name="GEVcdn"; version="1.1.6"; sha256="09lzhh16r1hsxa23jkq716yf3x9ap6fkkrz3ij2x83rvwznj8hb3"; depends=[VGAM]; }; GEint = derive2 { name="GEint"; version="0.1.4"; sha256="0xwp8hqds4lf6nb8hcbvsj2000w7f90bi62b1v3iry0y6cbpwbjg"; depends=[bindata 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.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; }; - GFD = derive2 { name="GFD"; version="0.2.4"; sha256="10ijin08saamr0i2hcp0gjh372q2w30s0dia1bi9zxlwna1h9hxp"; depends=[magic MASS Matrix plotrix plyr]; }; + GFD = derive2 { name="GFD"; version="0.2.5"; sha256="14bhqk5hi9w2078nn382ksgw37bx5r1jadizcrwbisglccxa0ncd"; depends=[magic MASS Matrix plotrix plyr]; }; + GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.2"; sha256="0xxxjhhngc23ac891pn6hwn4y4wqil4xb83s7pq92izz5mb05q96"; depends=[cmprsk joint_Cox]; }; GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; }; GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; }; - GGIR = derive2 { name="GGIR"; version="1.5-12"; sha256="1n8xckhv3x9clphp696clqzcvc5z4v9npw1y69dfk6m1f29gcik4"; depends=[data_table Rcpp]; }; + GGIR = derive2 { name="GGIR"; version="1.5-17"; sha256="0p452p9xcbd0r9w2aqdiw4i740xxxbgi9hk4k5xqifdlkfg4gvmb"; depends=[data_table Rcpp]; }; GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; }; - GGMselect = derive2 { name="GGMselect"; version="0.1-12"; sha256="1vjzmnnvnckr8s0badqm3l15arsa31fwg4wq6c2wx3g0hi1nzxxs"; depends=[gtools lars mvtnorm]; }; + GGMselect = derive2 { name="GGMselect"; version="0.1-12.1"; sha256="0nrkbai9jps54ldx3cvwd4x4wingfj73najwx4bv98z8zxpbnky5"; depends=[gtools lars mvtnorm]; }; + GGUM = derive2 { name="GGUM"; version="0.3.1"; sha256="1dgnhg0ggnp3f8qwzrcnapwzaraddnk2xsksin6pzybz21hfdvxd"; depends=[abind psych Rdpack viridis xlsx]; }; GGally = derive2 { name="GGally"; version="1.3.2"; sha256="02px7j28wzbhcgcwm2m0pxb6g7s5zvphl64ix55pkvag4m2ky57l"; 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.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; }; GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; }; - GJRM = derive2 { name="GJRM"; version="0.1-2"; sha256="02s0s4kh9vxap5qyr2imr8zbfixkhiyrk7fg5fk7hjbs3ziy6q0s"; depends=[copula gamlss_dist ggplot2 magic matrixStats mgcv mnormt psych Rmpfr scam survey survival trust VGAM VineCopula]; }; + GJRM = derive2 { name="GJRM"; version="0.1-4"; sha256="1bx2amhrrsghh6s6115z3qajkvnrrk1kjscx4x05ybw1b4pqyy28"; depends=[copula gamlss_dist ggplot2 magic matrixStats mgcv mnormt psych Rmpfr scam survey survival trust VGAM VineCopula]; }; 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]; }; @@ -1221,12 +1296,12 @@ in with self; { 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]; }; + GMAC = derive2 { name="GMAC"; version="3.0"; sha256="0c2cfpr8dik7j5br87hkvswrhqzj5vcna54gw6ffdf1rk9rz9j22"; depends=[]; }; 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]; }; GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; }; - GMSE = derive2 { name="GMSE"; version="0.2.2.7"; sha256="0n5dl5spv8265n43vwy4j8v13j7gg4sg49j2nkpc7q9f9bqczq4b"; depends=[]; }; + GMSE = derive2 { name="GMSE"; version="0.3.1.9"; sha256="02qzz4w99qissb3b95p7y5bk2wn43k01802vwnzxlq27swhkg17i"; depends=[shiny shinydashboard shinyjs]; }; GNE = derive2 { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; }; GOGANPA = derive2 { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; }; GORCure = derive2 { name="GORCure"; version="2.0"; sha256="1hazin0q74hf16azxa5h08kfj7g1079q77n2fn4fahpfxb8hmvwm"; depends=[ICsurv MASS pracma survival]; }; @@ -1234,63 +1309,68 @@ in with self; { GPArotation = derive2 { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; }; GPB = derive2 { name="GPB"; version="1.0"; sha256="18cdgz00j0j1rchzn2l253rii3b0iv9ipnh5sk3yvmwrqiabmrf8"; depends=[]; }; GPC = derive2 { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[ks lars orthopolynom randtoolbox]; }; + GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-1"; sha256="1qlbs9xxdn7q90afh5zc6fgp213fxyh3xmmhz5dm6azbwx92x3la"; depends=[car caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos wordcloud]; }; 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]; }; + GPM = derive2 { name="GPM"; version="1.0"; sha256="0k2mglgmq1hb0x9gdypvzgi7s3vkdpf6qcvgyd4qc3mfg3avbnmk"; depends=[lattice lhs randtoolbox]; }; GPPFourier = derive2 { name="GPPFourier"; version="2.1"; sha256="1wlzpiqlg5zx3rv29l1ql3apcaykvk72zc0anwxr152qlk910l2q"; depends=[mFilter Tides]; }; - GPareto = derive2 { name="GPareto"; version="1.1.0"; sha256="0y4jskrbsv7apc5blchnzgd2mfphvrpc03qgbgyvnzpc0yq18vmh"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud]; }; + GPareto = derive2 { name="GPareto"; version="1.1.1"; sha256="100r7v7vdkd8i8asb8fnz86rgmkd9kd5bnrc7kdzndfg6jsyycrg"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; }; 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]; }; + GPoM = derive2 { name="GPoM"; version="1.1"; sha256="0n1fnmwiygispihqgcx762wkvp28pnm8kcwlx9vxhpafswsp112q"; 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-4"; sha256="1vqvm9647jnw91vpf4dhjjp9rc05n5k6qgzilfpmcg4a7zzi917k"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; - GRANBase = derive2 { name="GRANBase"; version="1.2.1"; sha256="1fxbgl7z61qdfg0lcjylc00wr819kg9kycc42gsjl1gxxy94b433"; depends=[hwriter switchr]; }; + GRANBase = derive2 { name="GRANBase"; version="1.6.8"; sha256="1pcm0fy3jwwaifd4m7qyil1miaxmi6v7glp2krbkngp6f8qb0bph"; depends=[covr dplyr hexSticker htmlTable jsonlite RCurl sendmailR stringi switchr]; }; GRAPE = derive2 { name="GRAPE"; version="0.1.0"; sha256="0kcyz8x6yzq83hcwdlx7yw5jpww819f9d1hax19vn31ccq71xkyw"; depends=[]; }; GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; }; - GROAN = derive2 { name="GROAN"; version="1.0.0"; sha256="0bhr8hqzn639zl52raapxipc3cwhwwsj5fvj0dk39mpaychc2dg1"; depends=[plyr rmarkdown rrBLUP]; }; - GRS_test = derive2 { name="GRS.test"; version="1.0"; sha256="1igyb3rma1v2arx1k16fanvzmlywx0n9lf5jz69vnf6z2qmqvrg5"; depends=[]; }; + GROAN = derive2 { name="GROAN"; version="1.1.0"; sha256="06xcbdcg3rmb9939d9ansy75jn0axy0c36rmgjhcji8gf959kmyz"; depends=[plyr rrBLUP]; }; + GRS_test = derive2 { name="GRS.test"; version="1.1"; sha256="1ap9453rj5zan6c3ix7jb1qxhxh42bfv295dgqbgjpdygjdlbm6n"; depends=[]; }; GRTo = derive2 { name="GRTo"; version="1.3"; sha256="1xkcx2agvrpfnmplgaqx70vz303v8rhwnxdyr4hmdlf4h92lbv8i"; depends=[bootstrap]; }; GRaF = derive2 { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; }; GSA = derive2 { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; }; GSAQ = derive2 { name="GSAQ"; version="1.0"; sha256="1p1rab2dlh4h9bfg464nhx708p7kc4q01ifccdh5756lq1qh2kzv"; depends=[]; }; GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; }; + GSCAD = derive2 { name="GSCAD"; version="0.1.0"; sha256="0a5smd1prfi6n58ghhz5v81p88v3cnmk2v6r0nn9gy7sa1r2z8xc"; depends=[fields Matrix Rcpp RcppArmadillo]; }; GSE = derive2 { name="GSE"; version="4.1"; sha256="00pvpramk7n3195i3vkmp982igyc1b0xzjqs7xdsvzsnfv7kpcbh"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; }; - GSED = derive2 { name="GSED"; version="1.5"; sha256="0r1fgwk1v11bwq83a64cgmxh5snw3mnaq4mlgi0h4n5f1yjgg5wj"; depends=[memoise rootSolve survival]; }; + GSED = derive2 { name="GSED"; version="1.6"; sha256="0zvj91a3sbpgy4988xzmz6xa73rn8b2hkh67jryahm2l5azigsng"; depends=[coin 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="1.2"; sha256="0prnvhz5j0y77xywgc057vrnawzdjz9s4l08j60sg12p6gm1q2fj"; depends=[MASS]; }; - GSODR = derive2 { name="GSODR"; version="1.0.6"; sha256="0v2g5sssrf23v7369jh0ddja0yf0j6f4gblhf3iasnq2i8fnbxhl"; depends=[curl data_table dplyr fields magrittr purrr R_utils readr rgdal sp]; }; + GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; }; + GSODR = derive2 { name="GSODR"; version="1.1.2"; sha256="1zr19zik2ic38wg71gk9iapzmdh4z426djy8w4z25v148940liss"; depends=[curl dplyr magrittr purrr R_utils readr rgdal rlang sp tibble]; }; 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]; }; + GUTS = derive2 { name="GUTS"; version="1.0.4"; sha256="0mgvgi9vyd35gpm1sxk1pi5sx3nbwlbxqa7l0nazc1fq77fabai4"; depends=[Rcpp]; }; + GUniFrac = derive2 { name="GUniFrac"; version="1.1"; sha256="1vgij7c9b0afl5wzwcn0pjdvn8gqz2jxk5q0gchd9zk1qd10a1vl"; depends=[ape matrixStats vegan]; }; GWAF = derive2 { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; }; GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; + GWASinlps = derive2 { name="GWASinlps"; version="1.1"; sha256="1041yb5zn27a9srylmawj2kbkcsjz65x0apa413wyb32pz73l6ni"; depends=[horseshoe mombf]; }; 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.3"; sha256="16ahlf1pbcpgha50a7ml2c336by50r287kihwshiazshifi5p3n3"; depends=[doParallel foreach]; }; - GWmodel = derive2 { name="GWmodel"; version="2.0-4"; sha256="1q4z715yi5rasmcxv1acy14sf18knk11cznqi481kxc4mhxl2ay2"; depends=[maptools Rcpp RcppArmadillo robustbase sp]; }; + GWSDAT = derive2 { name="GWSDAT"; version="3.0.0"; sha256="1nyvbaxfh2hp3nk1lw6aksq2cjj2w4qa1cy7vjkrisl2dz0nfi2z"; depends=[deldir geometry Kendall lattice MASS Matrix readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; }; + GWmodel = derive2 { name="GWmodel"; version="2.0-5"; sha256="1v0a2fxs1nfm84vrggj1zmbij6kqzc5mgmqlvrh80hj3w87zpiry"; depends=[maptools Rcpp RcppArmadillo robustbase sp spdep]; }; 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.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; }; GameTheoryAllocation = derive2 { name="GameTheoryAllocation"; version="1.0"; sha256="0733vmyr0d9scjd5ixpnggr548snd7nj70knf5hbzc59nmbc5y11"; depends=[e1071 lpSolveAPI]; }; Gammareg = derive2 { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; }; GauPro = derive2 { name="GauPro"; version="0.2.2"; sha256="127agnhqbbavcf7sx0zq1c8ldh3w1d1iz5bpd1ixxkyaapmiq4qy"; depends=[lbfgs R6 Rcpp RcppArmadillo]; }; + GeDS = derive2 { name="GeDS"; version="0.1.3"; sha256="1ddq4hnyl3m3s4cchccxiqphi742ljcm86zqpa01a5nrjbnr87x6"; depends=[Matrix Rcpp Rmpfr]; }; GeNetIt = derive2 { name="GeNetIt"; version="0.1-1"; sha256="1xjz22m4yn642m0bqa33w4m2rygpxjwg43c54lw168jck9zzgv1f"; depends=[nlme raster rgeos sp spatialEco spdep]; }; GenABEL = derive2 { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[GenABEL_data MASS]; }; GenABEL_data = derive2 { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; }; GenAlgo = derive2 { name="GenAlgo"; version="2.1.3"; sha256="00lr13kvkmw7zgg6b67yba0qym24vqb09xm94rwh2wd5mbh2fh2v"; depends=[ClassDiscovery MASS oompaBase]; }; GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; }; - GenCAT = derive2 { name="GenCAT"; version="1.0.3"; sha256="1rzhp4aypdryr7hrqazax3lzfkxqhls5cf8zsjjip8jb701x46hf"; depends=[doParallel dplyr foreach ggplot2]; }; GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; }; GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; }; GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; }; - GenSA = derive2 { name="GenSA"; version="1.1.6"; sha256="1llhjhg39fd2pnm6kn8zjhw6kkg88wn7y3yizr8fna7qc3ixlcii"; depends=[]; }; + GenSA = derive2 { name="GenSA"; version="1.1.7"; sha256="03xqwxm7v7rnihx730a4p65dfwhjh4345r3d78y0qxxplk8d76cx"; depends=[]; }; GenWin = derive2 { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0fssfx2ym2n36d3zgnfd32gqckz3s4"; depends=[pspline]; }; GeneClusterNet = derive2 { name="GeneClusterNet"; version="1.0.1"; sha256="1xi4c041c4m39f9wb5fklgmhi6ng78iwzzqch5xk9hx5blq6zd4m"; depends=[G1DBN igraph MASS]; }; GeneCycle = derive2 { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[fdrtool longitudinal MASS]; }; @@ -1300,9 +1380,9 @@ in with self; { GeneReg = derive2 { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; }; GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; }; GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; }; - GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="0.9.5"; sha256="0jz89z5qs0r46bby5d1ki49dj9n71x6i42llzpjqv3832kywqp86"; depends=[ggplot2 Rcpp RcppArmadillo shiny shinyjs]; }; + GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.0.0"; sha256="1r63ikfv5s1f3agl6i2ny84yzky0macxmknkavnzbn4sqb8cmrbd"; depends=[ggplot2 Rcpp RcppArmadillo]; }; GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; }; - GenomicMating = derive2 { name="GenomicMating"; version="1.2"; sha256="0kli32vsjighgl6hvrn2g3hwxdfysxh0ci3kiysddn2h4gqc44lz"; depends=[Rcpp RcppArmadillo]; }; + GenomicMating = derive2 { name="GenomicMating"; version="1.3"; sha256="1qnxr1dxw7xk6zncvql1lq4zba8vdfprhjgq56lzv1dckfddzfgc"; depends=[emoa Rcpp RcppArmadillo scatterplot3d]; }; GenomicTools = derive2 { name="GenomicTools"; version="0.2.6"; sha256="19illcfcm34vr90kh4cbdwf7k8hy700dlzylsaicv3h4xi7iydgs"; 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]; }; @@ -1310,15 +1390,15 @@ in with self; { GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; }; GeoMongo = derive2 { name="GeoMongo"; version="1.0.1"; sha256="19wim724sgmxx9rd5yvmqdml0hppb92b8qvpl5zqrlnzxzm0ih5x"; depends=[data_table geojsonR R6 reticulate]; }; GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; }; - GeoXp = derive2 { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[KernSmooth quantreg rgeos rgl robustbase spdep splancs]; }; GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; }; - GerminaR = derive2 { name="GerminaR"; version="1.1"; sha256="1ijx2bd0fpki3pqm9grksc60f43qg9y5412mwd847xqqjpc1mxm4"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tidyr]; }; - GetHFData = derive2 { name="GetHFData"; version="1.4"; sha256="0m9s65wyd0r37fn83dh5d2w4dr7x5z4sk9pgxbq9mcgz276i7anx"; depends=[curl dplyr lubridate RCurl readr stringr]; }; - GetLattesData = derive2 { name="GetLattesData"; version="0.5"; sha256="18kaqmgx019jfwp6mhdy29kiz4w54xnnywbsipbp621f7k2is6zd"; depends=[curl dplyr readr stringdist stringr XML]; }; + GerminaR = derive2 { name="GerminaR"; version="1.2"; sha256="10x22xl3r93i5mc6w7m5mqm3z386dsffwrb8h9c1bznrnynnsy63"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tibble tidyr]; }; + GetDFPData = derive2 { name="GetDFPData"; version="0.6"; sha256="19srfls3fmxbjhwhsc3r76n34ls8s5940d831j4n93f4lzq33wyp"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; }; + GetHFData = derive2 { name="GetHFData"; version="1.5"; sha256="1lm2k37y86fn45hhvyswj60dql0m33kia0wirs3zc981s4nsxp0i"; depends=[curl dplyr lubridate RCurl readr stringr]; }; + GetITRData = derive2 { name="GetITRData"; version="0.7"; sha256="0cmqbncd5bjxgb1r9yvdv2hkx4qdmnpn2a62bgndnaya1yk5050l"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; }; + GetLattesData = derive2 { name="GetLattesData"; version="0.9"; sha256="1rqhs8039m3ar76nail7gavw6678zs20r9dg98rp5igqx5jjys73"; depends=[curl dplyr readr stringdist stringr XML]; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; - GetTDData = derive2 { name="GetTDData"; version="1.3"; sha256="0x8hgpjk3ah5izr4da7xkazha5j737cq5y84qmjbsgaxn9jdmvj5"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; }; + GetTDData = derive2 { name="GetTDData"; version="1.3.1"; sha256="1a8f22nxs85g2zznh1ma37lmycypg8f7d5kdhyb5vrirvrpi5p05"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; }; 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]; }; GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; }; @@ -1329,10 +1409,12 @@ in with self; { GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; }; GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.12"; sha256="1abpc03cfvazbwj2sx6qgngs5pgpzysvxkana20hyvb4n7ws77f0"; depends=[]; }; Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; 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]; }; + Gmisc = derive2 { name="Gmisc"; version="1.5"; sha256="0jiyqi0mmwbb7v8jqksvm42r4sq1d5najqkapnpj5jzn6izq6vh5"; 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="2.0"; sha256="0018ljzlj7nkf12g0sqa8iyq3j2bnj9la3fwblx9lbdn8nxgllhn"; depends=[Rsolnp]; }; GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.2"; sha256="1qwarachkhc2yvjyxfcfbgjc1x9ni5xb7f93zviv8mz3c35bhs3b"; depends=[classInt corrplot]; }; + GoogleKnowledgeGraphR = derive2 { name="GoogleKnowledgeGraphR"; version="0.1.0"; sha256="1jxiq1s48skn43pydsw8s67hf70v9fhhw2drcx9vni3c3szs44qd"; depends=[curl jsonlite]; }; + GpGp = derive2 { name="GpGp"; version="0.1.0"; sha256="1z03fcpcjm7waxci4c0a233xs21l2ds3p993y3shp7snbplbrfgf"; depends=[FNN Rcpp]; }; 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]; }; @@ -1340,7 +1422,8 @@ in with self; { GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; }; GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; }; GreedyEPL = derive2 { name="GreedyEPL"; version="1.0"; sha256="19b8fwxsjd6shwjxhpawa8pmlj6yn0j4577g6b93xbcs76wgrvd1"; depends=[Rcpp RcppArmadillo]; }; - GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.0"; sha256="00a2lcqrj17ckw4npkvm3sxydfn2lyvs7pzpccy3xnzrr006ibsx"; depends=[rJava]; }; + GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.1"; sha256="0r6b8hzzx0ja0skp4w4s49jpkkjbb3an62vp74qh5sf2wi1hx9x6"; depends=[rJava]; }; + GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; }; Greg = derive2 { name="Greg"; version="1.2"; sha256="19bzv2nknahzbdnl7n0pcnavsdlwgkprc0yk3ksqllfawnvi39f9"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; }; Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.2.1"; sha256="0db5kv0rbsg077h2badw28x9363ymqkr52sw5wlg9x1bk9cczhi7"; depends=[inlmisc raster rgeos sp]; }; GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; }; @@ -1363,18 +1446,19 @@ in with self; { HDGLM = derive2 { name="HDGLM"; version="0.1"; sha256="0a5lnh3780lsczj8339sp97c5y64a2gsdf77i56fvpxpphq0dnf8"; depends=[]; }; HDInterval = derive2 { name="HDInterval"; version="0.1.3"; sha256="1zjddw8s6xc2gsz6285g3dzzarnhb77sra1dbxghgn2nrgn2y0i5"; depends=[]; }; HDMD = derive2 { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; }; - HDPenReg = derive2 { name="HDPenReg"; version="0.93.1"; sha256="1av4x9xqf4y1qfdkh9f0msskj9fqimng1i9bdlgl2ycfn8a64cjp"; depends=[Matrix Rcpp rtkore]; }; + HDPenReg = derive2 { name="HDPenReg"; version="0.93.2"; sha256="0blmp7cwsklp8aqdcyyjmv419cgc7iz0pb4629y8slqw0zq2n6gm"; depends=[Matrix Rcpp rtkore]; }; HDclassif = derive2 { name="HDclassif"; version="2.0.2"; sha256="0gykjqqhrqz1x9xl867hxhrp197y3x4679zh9v84i1nd9yxlamah"; depends=[MASS rARPACK]; }; - HDoutliers = derive2 { name="HDoutliers"; version="0.15"; sha256="01ylj4wnhqy8931lkhdgx552kv1h7hl4ngkpqbnhq75amyh34c46"; depends=[FactoMineR FNN mclust]; }; + HDoutliers = derive2 { name="HDoutliers"; version="1.0"; sha256="0pby640bad0jcf1lkwg2g6flassb1pimnjm411c6x8rgvmiphc23"; depends=[FactoMineR FNN mclust]; }; 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=[]; }; - HEMDAG = derive2 { name="HEMDAG"; version="1.0.0"; sha256="0hgxhd8c87ngyh87vdzlmmbfllxjrmqr6ndh561hkxzmbiw1q655"; depends=[graph PerfMeas precrec preprocessCore RBGL]; }; + HEMDAG = derive2 { name="HEMDAG"; version="2.0.1"; sha256="1sdgcc1adf21zd6qy48wkvnfakgpx7c4f750hnp8vjpanlrizp1w"; depends=[graph PerfMeas precrec preprocessCore RBGL]; }; HGNChelper = derive2 { name="HGNChelper"; version="0.3.6"; sha256="1bm6zxwafbp65p6w4rk2y1bw7ig60br2mk75c4frdzqw3yw0zwxd"; 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.1"; sha256="0930pgq0xzixj0rl6rkd1cd007zpa9krfdyaav8cbx8sgg5bfknp"; depends=[]; }; + HHG = derive2 { name="HHG"; version="2.2"; sha256="114nfpdjdisryil9l8cws885qdskgrjm2cclx543hh4cdhpnkxnp"; depends=[Rcpp]; }; HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; HIBPwned = derive2 { name="HIBPwned"; version="0.1.6"; sha256="0ym62n1rmi8pjj37cxbrdmih7530nhmy77gxb8yylppjf3rikci4"; depends=[httr jsonlite ratelimitr urltools]; }; + HIMA = derive2 { name="HIMA"; version="1.0.7"; sha256="0mvphwmm8gmin933bji2l2gbpjzm42vyc7sdka4xpjfsaal9pp9i"; depends=[doParallel foreach iterators ncvreg]; }; 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=[]; }; @@ -1384,23 +1468,24 @@ in with self; { HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.1.8"; sha256="15z0war5isw9xnln7py3di8f45pwvdw6x6wljl18fcxpmanmlfcf"; depends=[RCurl XML]; }; HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; }; HMMCont = derive2 { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; }; + HMMEsolver = derive2 { name="HMMEsolver"; version="0.1.0"; sha256="19iwy0nj0vw3cslrfdai1l1yg84c5diyxpy65jd2f419ag3rmki3"; depends=[Rcpp RcppArmadillo Rdpack]; }; + HMMoce = derive2 { name="HMMoce"; version="1.0.0"; sha256="0w2hrqjz75j9l6wimz9rsr8bwa5rvag0pavmyqkcb8jgqdgka8hx"; depends=[curl doParallel dplyr fields foreach imager locfit lubridate maptools raster RColorBrewer rgeos RNetCDF sp]; }; HMMpa = derive2 { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; }; - HMP = derive2 { name="HMP"; version="1.5"; sha256="1jsvk0ban726qrf31gkq5c3gnyxvqv9jpcpk68md9xw3a2r3lxy6"; depends=[dirmult doParallel foreach ggplot2 gplots MASS rpart rpart_plot vegan]; }; + HMP = derive2 { name="HMP"; version="1.5.1"; sha256="0v32pkgr9rhpz77y18z356lc68hcncbszawwqsldwhwc8dvb3rwn"; depends=[dirmult doParallel foreach ggplot2 gplots lattice MASS rpart rpart_plot vegan]; }; HMPTrees = derive2 { name="HMPTrees"; version="1.4"; sha256="1jha64iyb0816rdg2i3z7i31z02r72k6acmvw0ibw3sli8zcvphb"; depends=[ape dirmult doParallel foreach HMP]; }; 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.7.1"; sha256="1asd63x61r1ll0jkm677jghd92yp0n04qg0ayslygr9hh02gva9k"; depends=[cairoDevice ggplot2 MASS matrixcalc plyr reshape2 RGtk2Extras xtable]; }; + HRM = derive2 { name="HRM"; version="0.8.0"; sha256="0p6m73l6i9psa3xh2l02c6r2f2wiysn5nharyryz0p50rz7ajhls"; depends=[ggplot2 MASS matrixcalc plyr reshape2 xtable]; }; 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]; }; + HSAR = derive2 { name="HSAR"; version="0.4.2"; sha256="0rxb2klmyynr8rzq6ka8p40lw81wjd0jkw2wg3vg90zny0zps98j"; depends=[Rcpp RcppArmadillo spdep]; }; HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; }; HSAUR2 = derive2 { name="HSAUR2"; version="1.1-17"; sha256="0jc554lz5lj7180vd4rbrjkywar4bh38c7i9kyxhd5clg4afxpw8"; depends=[]; }; HSAUR3 = derive2 { name="HSAUR3"; version="1.0-8"; sha256="0s3m771l83psfwk6dqw2zf0vyvk5v2h730b5nwaky9xvgvp0mrms"; 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.2.0"; sha256="1w9xky4rdjg646x6aaif29xrrz901yzkh3x5lpv9xbbdam5v5na9"; depends=[ape coenocliner DESeq2 dplyr ggplot2 lazyeval magrittr phyloseq plyr stringr tidyr]; }; + HTSSIP = derive2 { name="HTSSIP"; version="1.3.2"; sha256="0y5xqpq55x1q4afs9qwn949y6f4f11fl9zxn2ffzv17zsia7b7xl"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; }; 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=[]; }; @@ -1412,14 +1497,14 @@ in with self; { 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]; }; + Haplin = derive2 { name="Haplin"; version="6.2.1"; sha256="13kix0skxk35zgwci1fwxkqm8bxbsxf5kid7qs88ib9pgix7qg41"; 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.8"; sha256="0xbcchmzii0jv0ygr91n72r39j1axraxd2i607b56v4yd5d8sy4k"; depends=[mice Rcpp]; }; + HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.9"; sha256="0qk3lly5qczn61rj0q9xzscppspvk238yjgr4p71pkzkjhiv40jz"; depends=[mice Rcpp Rsolnp]; }; 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="2.0"; sha256="0gp5mmb7w4s6mr0cnjlx0qrdplgq6sc7cvh912kdqfjz5ayr297i"; depends=[coda]; }; + HelpersMG = derive2 { name="HelpersMG"; version="3.0.0"; sha256="1y5q4z9yxap16bkcjsybm2754wm0x31hfqdnp2bb4gbvhz1jhas6"; 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]; }; + HiCblock = derive2 { name="HiCblock"; version="1.2"; sha256="17d5jzswzjy7hwr9lyfd273xqa5ssm715wybk0zxd4gsnipvnbsk"; 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.1"; sha256="1q47kayga6g4vczh92a63a4ni5hvmrc7477wsjkhp846j3wswm5j"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; }; HiClimR = derive2 { name="HiClimR"; version="1.2.3"; sha256="1yv01pyfmgq306f3yravwf6sm79m0m93gpya95k85rxqdjl3c2hx"; depends=[]; }; @@ -1427,14 +1512,14 @@ in with self; { 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=[]; }; - HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-8"; sha256="13db9qxcky91nck49w6iz98yx3c5rb70dc993gdmnwhzzrl92lfp"; depends=[]; }; + HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-11"; sha256="1yh85pdb9r90qxcl5gxslyplxzrx8knrrsl2q65l57zfkqj185ja"; 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.7"; sha256="16mn6z8gvg9x5flia7kl5qi5nbnd9fr7bfggz58vpfqwd8xl9g4n"; depends=[class colorspace FactoMineR ggplot2 histogram]; }; + HistDAWass = derive2 { name="HistDAWass"; version="1.0.0"; sha256="0si57vmgnkrhyilk3vv4189c093n6if6i5nv3jylvhpmbf5nvm7p"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; }; HistData = derive2 { name="HistData"; version="0.8-2"; sha256="0qd3a1v3xg39nwqfw63k6210vqkpknq0j3r36sy1910hn0nr83fa"; depends=[]; }; HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; }; HiveR = derive2 { name="HiveR"; version="0.3.42"; sha256="09h061511pk7iy1k9gb3ifa5q6gd17ix9sn2fshl6gp5sxnysn4f"; depends=[jpeg plyr png RColorBrewer rgl tkrgl]; }; - 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]; }; + Hmisc = derive2 { name="Hmisc"; version="4.1-1"; sha256="160l50ppjs69ipcaya1mlcz29zbn5rmqg91r09dvzzvkvwfb47cr"; 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=[]; }; @@ -1442,17 +1527,18 @@ in with self; { HotDeckImputation = derive2 { name="HotDeckImputation"; version="1.1.0"; sha256="1mqfn6yw5846ynrcgzka0m6ikfppa5civjkhj42rhp2v2xk25li7"; depends=[Rglpk]; }; Hotelling = derive2 { name="Hotelling"; version="1.0-4"; sha256="1ncq74ifdn1ha6wbkvygbwi2n0nwaj1lifyqp36sy0hql3ahrac9"; depends=[corpcor]; }; HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; - HybridFS = derive2 { name="HybridFS"; version="0.1.1"; sha256="09kb9zy70i2z7qd9ilkv3g4sb8giyh5mqsz3cgyd3dph7d9y0979"; depends=[caTools FSelector InformationValue ROCR woeBinning]; }; + HybridFS = derive2 { name="HybridFS"; version="0.1.2"; sha256="05skml3v2zm5hmd6slpmx3lfwi6x5wfgbx7cnhc6l077b11jpdd9"; depends=[caTools FSelector InformationValue ROCR woeBinning]; }; 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]; }; + HydeNet = derive2 { name="HydeNet"; version="0.10.7"; sha256="001ifh5ddg7q4rckhi662zd9a8milfi3v2gmgy76x0wq2xph7yrj"; depends=[checkmate DiagrammeR dplyr graph gRbase magrittr nnet pixiedust plyr rjags stringr]; }; HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; }; HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; }; 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]; }; + IATScore = derive2 { name="IATScore"; version="0.1.1"; sha256="0sg4apj1sp0xc311cbkvflhv9kw1jxvjhdr0xjw79s662mnhkhgz"; depends=[]; }; + IATscores = derive2 { name="IATscores"; version="0.2.1"; sha256="1nm07wlrnjx36wr3jbv2faayh1vrlfid124b27w9v0x0dk145i82"; depends=[dplyr qgraph reshape2 stringr]; }; IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; }; + IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.2-5"; sha256="1b5fsrbqycz8zgpxk3vc48cba7vb818rw5hgmf92q11azm4n1q5s"; depends=[lsa tidyr]; }; 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-7"; sha256="1wq0w9d4kwvq1hc5l0m8wrqfhnncapmnrh29x9vvafv50ym7yb3l"; depends=[paramlink]; }; @@ -1460,34 +1546,39 @@ in with self; { IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; }; IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; }; - ICAOD = derive2 { name="ICAOD"; version="0.9.2"; sha256="12fkcc2ii3652n8ihzm29f9gip790wdmil7c1bzd5ma4l959w7hy"; depends=[nloptr Rcpp RcppEigen Rsolnp]; }; + ICAOD = derive2 { name="ICAOD"; version="0.9.6"; sha256="1c9zlskhsz5w1a5lkfcxclnsgxbvkgcgnbzvc3xk1mpa2zb2pvap"; depends=[cubature mnormt nloptr Rcpp RcppEigen sn]; }; ICBayes = derive2 { name="ICBayes"; version="1.1"; sha256="1bmxba3bv9szzxvjf1blwxwdhw87h7s04cfn63c1gqpnpwsmr03y"; depends=[coda HI survival]; }; ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; }; ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; }; - ICCbin = derive2 { name="ICCbin"; version="1.1"; sha256="0jlq1rlpgw52kxaj02mh0jlvvxw4f1bj8094p7f5hqdjhjc53ynf"; depends=[]; }; + ICCbin = derive2 { name="ICCbin"; version="1.1.1"; sha256="1pzlaj7w98pgrlg3zvpmdv0dpgi5gih0j73qv86ak75fkxvrnzzw"; depends=[]; }; ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; 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]; }; - ICRanks = derive2 { name="ICRanks"; version="1.0"; sha256="0354rilqyqinf7gp936541rhlb714fqgf8r083wd0lx14qkciqiq"; depends=[multcomp Rcpp]; }; - ICS = derive2 { name="ICS"; version="1.3-0"; sha256="0r5lf8km77h29lcpi7z0hkmy4vh0p5m7p2xbxsxj6w9hsgyanv72"; depends=[mvtnorm survey]; }; - ICSNP = derive2 { name="ICSNP"; version="1.1-0"; sha256="1g7n8jlilg36hm989s5x18kf8jqn5wy98xi9jmnqkqpds4ff217y"; depends=[ICS mvtnorm]; }; - ICSOutlier = derive2 { name="ICSOutlier"; version="0.2-0"; sha256="1dxbh3qhirr7f2bv68g1xlya5fprm230fdgxhccrzdc0wh0ijh3i"; depends=[ICS moments mvtnorm]; }; + ICRanks = derive2 { name="ICRanks"; version="1.3"; sha256="0n8gyqlwx38v2lfx7r49h43k2f4z4ml78x3lq0sc952n4rckzgiv"; depends=[multcomp Rcpp]; }; + ICS = derive2 { name="ICS"; version="1.3-1"; sha256="0x3cwhvzcibgyb8gqy6dc6lgnvbf6x8425zai57g8yn5i6zzc1li"; depends=[mvtnorm survey]; }; + ICSNP = derive2 { name="ICSNP"; version="1.1-1"; sha256="1zf0k1kwdmjjqsbiiy3r2l47vjsrg09fj65p6zfld3j4gjbp17fd"; depends=[ICS mvtnorm]; }; + ICSOutlier = derive2 { name="ICSOutlier"; version="0.3-0"; sha256="1vj1y4zw8pkghkg4qnmx0yk1yw4zzl9075n5czrna9ckk2p29fmh"; depends=[ICS moments mvtnorm]; }; + ICSShiny = derive2 { name="ICSShiny"; version="0.4"; sha256="02qcph5ax4gwz44zq8riv4yl4h0wdiwgxv7m96cpdh7gwfhwzgzr"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; }; ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; }; + ICcalib = derive2 { name="ICcalib"; version="1.0.7"; sha256="1p224srs1jakl7iyybcn9f6r9kcwxyrikdrfa9wjgkhz60pv88fs"; depends=[fitdistrplus icenReg ICsurv MASS msm numDeriv Rcpp RcppArmadillo survival]; }; ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; ICtest = derive2 { name="ICtest"; version="0.3"; sha256="0g4h6gkz6zp28a1hvrvm89wckx6sg5fqzy0flb97a6lh9xpmb83g"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; }; - IDCard = derive2 { name="IDCard"; version="0.1.0"; sha256="1hc319avacxprg8vdp218dbkhzi6fn5ahd2rr1m7qwz4gnhwl95q"; depends=[]; }; + IDCard = derive2 { name="IDCard"; version="0.3.0"; sha256="06b5zqmgh4clni3mv6ab2a52r4z34isbz0hd1i61793gps9fkc0y"; depends=[stringr]; }; + IDF = derive2 { name="IDF"; version="1.1"; sha256="19fx04gvzwzkxbd453l3wx46s22dbnh0nxdrmsr4f7l67kihbwdr"; depends=[evd ismev]; }; 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.2"; sha256="1ffjwcf3j2v950ksshajwld0h2ld71ij2i76vncl2qmwdlmx0ip3"; depends=[data_table doParallel foreach]; }; + IDetect = derive2 { name="IDetect"; version="0.1.0"; sha256="1q1jwgildhx6sp883ni7vcsa3gj997855v5ky41dyf34kv7hvdl1"; depends=[]; }; + IDmining = derive2 { name="IDmining"; version="1.0.3"; sha256="1kvnp0y0837cgvjjwv2rmh64vksa7c6ififs60w7g05l690fkb9v"; depends=[data_table doParallel foreach]; }; IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; }; IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.5"; sha256="09k5di7bqlqi2m3jn39ahnf7x96wx1h06bw0ah6pdszwd97yy33i"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; }; IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; }; 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]; }; + IIS = derive2 { name="IIS"; version="1.0"; sha256="01h7nncxn1drnqf1h7snw0pvkgkn8dxq53k2sqcw3kdjlk5mj2l6"; depends=[asbio BSDA Hmisc NSM3 Rfit]; }; + ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice 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.3.1"; sha256="1xk2l1zk7arrbb8lxs5s03pjapks98xx8dfpic8qmha3qjlav90c"; depends=[abind e1071 matrixStats mclust mvnfast plotrix Rfast slam viridis]; }; @@ -1496,31 +1587,33 @@ in with self; { IMPACT = derive2 { name="IMPACT"; version="0.1.1"; sha256="0ai22gvmfj9j00cw742szfqqay63b5lmnszkwwdfdvidls43v0bm"; 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=[]; }; + INCATome = derive2 { name="INCATome"; version="1.0"; sha256="1gbmcirs49ydmk5rg2vl5gdy39dfx9psw5mijibzjszcfjar3kqs"; depends=[genefilter limma multtest RankProd siggenes]; }; INLABMA = derive2 { name="INLABMA"; version="0.1-8"; sha256="13r89r14xpihfqddwzkhxg4jgxyl59826x2insrall3mj2yffj90"; depends=[Matrix sp spdep]; }; - INLAutils = derive2 { name="INLAutils"; version="0.0.4"; sha256="0bfqczwqyfdy343n3pa6pzard9wqzl382p1z42q6vclgx6h0h7rc"; depends=[assertthat ggfortify ggplot2 raster RColorBrewer reshape2 sp]; }; 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.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm 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]; }; + IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; }; IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; }; 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.6"; sha256="1kccc4rbnyczdif7plvl3jfa3nfqfasybbbqmdkfiz0mhgvn1z4r"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; + IROmiss = derive2 { name="IROmiss"; version="1.0.1"; sha256="01l08s1g7h8cki372daa61pw3wac3pbv5d4yqnphg5p8ihsmrc5d"; depends=[equSA huge mvtnorm ncvreg]; }; 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=[]; }; ISDA_R = derive2 { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; }; - ISLR = derive2 { name="ISLR"; version="1.1"; sha256="1w6k90mbzrx1756rvx7b3y22ypgkzl9p7mjjdlzs8i5g1yz8gzqv"; depends=[]; }; - ISOcodes = derive2 { name="ISOcodes"; version="2017.09.20"; sha256="0yzn0qh5qh863zqr3vdsspr9diy2whx92gqm84d2brxm195sd1x8"; depends=[]; }; - ISOpureR = derive2 { name="ISOpureR"; version="1.0.21"; sha256="093wvnh7fv9shvssgl8slfg394f0v0jazj4jpihhaqkfchq1vryy"; depends=[futile_logger Rcpp RcppEigen]; }; + ISLR = derive2 { name="ISLR"; version="1.2"; sha256="1bfay6cs40crhh34v2ksn4zdxivimfyjvk19wqbnjr7vs837l3xh"; depends=[]; }; + ISM = derive2 { name="ISM"; version="0.1.0"; sha256="0by0w6zgnwcwzbmxx16s8mb1avhc6aiavqp0qkxx6hr70vrgb997"; depends=[rJava xlsx xlsxjars]; }; + ISOcodes = derive2 { name="ISOcodes"; version="2017.09.27"; sha256="1nnbp110fzlckbi6vdigrn275d3j7ixys0b8np8ran876piwddjp"; depends=[]; }; + ISOpureR = derive2 { name="ISOpureR"; version="1.1.1"; sha256="1mi0hl32wfgc7znvs1ay9i9lwdj022d88asdgcbs63vx335qg99w"; depends=[futile_logger Rcpp RcppEigen]; }; 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=[]; }; ITGM = derive2 { name="ITGM"; version="0.6"; sha256="0acrm15vb1r0nnp0bp5zf8g27i3sy3d7bpd50lj0w1rl6dgwfznh"; depends=[data_table Fgmutils ggplot2 gsubfn plyr randomcoloR rbokeh sqldf]; }; + ITNr = derive2 { name="ITNr"; version="0.1.0"; sha256="0fxh7qs96w945sp7gnjk069rp1j8bj949r9c2skabw8bnkf5yi1k"; depends=[animation blockmodeling circlize cowplot dplyr fastmatch GGally ggplot2 GoodmanKruskal igraph intergraph Matrix ndtv network networkDynamic plyr RColorBrewer reshape2 sna statnet tnet WDI xergm xergm_common]; }; 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=[]; }; @@ -1532,11 +1625,13 @@ in with self; { ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; }; ImputeRobust = derive2 { name="ImputeRobust"; version="1.2"; sha256="0hr5payxqyk5nckwx84j5wqrj477219qbp76908aylwb7c7iw9n4"; 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]; }; - IncDTW = derive2 { name="IncDTW"; version="0.1.3"; sha256="11mlrwy5x11hd1q2gjcnxfrvvrn6y8njgn0ywdxyhlxr0hcbylp0"; depends=[ggplot2 Rcpp scales]; }; + InSilicoVA = derive2 { name="InSilicoVA"; version="1.1.5"; sha256="15r3pdbwgnvk1qaqvb3m2xiczlv5jr7j7iwdgrxsn8n09q0aa4ds"; depends=[coda ggplot2 rJava]; }; + IncDTW = derive2 { name="IncDTW"; version="1.0.1"; sha256="0ycr46l1h1zxrw5kszfgl3w1f9law539fi7j1i3fb2s59n5kh2k5"; depends=[ggplot2 Rcpp scales]; }; 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=[]; }; + IndepTest = derive2 { name="IndepTest"; version="0.1.0"; sha256="0l9vfp34k4nhlg3nymj0gqkpjblzbbvnz0zcajvq4c8nw9968c5i"; depends=[FNN mvtnorm Rdpack]; }; IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; }; + IndexNumR = derive2 { name="IndexNumR"; version="0.1.0"; sha256="1385j7a1hz8i5g00x1p1rd32gq243w2zrzvk781zjqdq7az33fsw"; 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]; }; @@ -1546,16 +1641,14 @@ 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.1.0"; sha256="07wzs0gnqgasxsvqawdsywasb2ybcml8fbg4jrmdy02ni8d8zmhs"; depends=[blackbox geometry Matrix mvtnorm numDeriv proxy rcdd Rmixmod spaMM viridis]; }; + Infusion = derive2 { name="Infusion"; version="1.1.8"; sha256="084k36d9bgwmcnrp1bw2vvby9j14qmw2c99pzaps0nlg10j8k4hg"; depends=[blackbox 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.6"; sha256="0fv24z7vidhn09ljk09pjzkrlg2rlwxcrhfjc53ybjjgsgay99z6"; 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.4"; sha256="0mlcn8mlrwgb54iclvadjwgpgav3zfm1y513bn2gypafq7x3bk81"; depends=[]; }; + InterVA4 = derive2 { name="InterVA4"; version="1.7.5"; sha256="0la99ylx8fnn4kpqa364nhs12y2hzp3sm0awsx5sfdv6n7m9js33"; 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]; }; @@ -1563,9 +1656,9 @@ in with self; { 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="1.1"; sha256="00nhfz1hs2j1pqhwgw5c337kl1azr3vmlcd1krnl4fgs5yz6ksyq"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; }; - InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.6-1"; sha256="16qlskxszpi24qsdl821n72pzdvmf1gg7lnlwyhyzhzzkh9az1pd"; depends=[glmnet mboost]; }; + InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.7-1"; sha256="1pz06l50fm8327n1v8wnvh8q51g97crb4c07si3hywd5y1hkiwkp"; depends=[glmnet linprog mboost RColorBrewer]; }; InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; }; - Inventorymodel = derive2 { name="Inventorymodel"; version="1.0.5"; sha256="16aqc8202k84pwbss6g2cw7lvykjjjfdg62jg9r82skjf7zzprpg"; depends=[e1071 GameTheoryAllocation]; }; + Inventorymodel = derive2 { name="Inventorymodel"; version="1.1.0"; sha256="1l87xghdksgmb2k3a8j382p7ffi2pma38a6pn31sfjsa6bgmrdnk"; depends=[e1071 GameTheoryAllocation]; }; IrishDirectorates = derive2 { name="IrishDirectorates"; version="0.2.0"; sha256="1m3c3dj4729chk1n3k7awvi1jdfnds2w36vm268azg53j6c7l4b6"; depends=[]; }; IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; }; IsingSampler = derive2 { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[magrittr nnet plyr Rcpp]; }; @@ -1573,18 +1666,20 @@ 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.17"; sha256="02sd9qvab4lbb5dw9lvcv0l45rfv4z12irlsy83kr2wj0vkfxam7"; depends=[MASS]; }; + IsoplotR = derive2 { name="IsoplotR"; version="1.0"; sha256="0cf2y81s2sc2jqbr431hjv5i347m1q5c5dxrak7ns7s8d902729y"; depends=[MASS]; }; IsoriX = derive2 { name="IsoriX"; version="0.7"; sha256="0b94s94axrqgv3dm9dbkdnh6imlzn245f2pi7wbj99nqhwa47ynb"; depends=[latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; }; 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]; }; + JADE = derive2 { name="JADE"; version="2.0-1"; sha256="0s7cdvhjcdxdqv4mgjd07xi3s0ngjvpxsmy0ary735rs5y6198mm"; depends=[clue]; }; JAGUAR = derive2 { name="JAGUAR"; version="3.0.1"; sha256="0lyc8biwj9yir1i06klp2jkb31mnzwp226aw7pwabkprfhqgfmqd"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; }; JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; JBTools = derive2 { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; }; + JFE = derive2 { name="JFE"; version="1.2"; sha256="1jfdphn9435f9nmwnb4x2wj8fv7c2i432n9wyvrlqcm424ql0cml"; depends=[BurStFin fAssets fBasics fPortfolio iClick MASS PerformanceAnalytics quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; }; 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.8-4"; sha256="0zfjfqlfrsz4wjdq78zasvgd3ldgcx20h16bbar1l7wv843j71ym"; depends=[JavaGD rJava]; }; JM = derive2 { name="JM"; version="1.4-7"; sha256="1ajdmabifzg4jp74ghas5wf3vp4x2vnc6sh811n44a1ni727sb2n"; depends=[MASS nlme survival]; }; - JMbayes = derive2 { name="JMbayes"; version="0.8-67"; sha256="02gcpbn3nw1bfrsdybb17wrs4bwp2kzg22m2k6080b4gbrhqspi4"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; + JMbayes = derive2 { name="JMbayes"; version="0.8-70"; sha256="1xvzyy2h3p30wxvgrm6d4dmxwiqs4l7dafpanlnykgih9wmh7xsf"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; + JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.3"; sha256="0bjaiygn2sq40f2cwa1c6j73748j2cx5q69pd4jgfgbpm9r25r4f"; depends=[MASS Rcpp]; }; 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="2.1.0"; sha256="0f3rr7aw20nvmlpqrq3wzgmr55lqdqhk3wphpqq7msgvaf1zrcl7"; depends=[doParallel foreach Rcpp rpart]; }; @@ -1593,74 +1688,79 @@ in with self; { JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; }; JSM = derive2 { name="JSM"; version="0.1.2"; sha256="18h3jhfg5ch9312aidpbs0fz5rd54alv4kjhvkchddhp3alyhp82"; 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=[]; }; - Jdmbs = derive2 { name="Jdmbs"; version="1.0"; sha256="1mhr1z6427lcm018pmllmhhsbnxa7cbmp9a5bjxb5n2zy1j71623"; depends=[igraph rmarkdown]; }; + Jdmbs = derive2 { name="Jdmbs"; version="1.1"; sha256="06af66128vfcf28fylaz7qqzqrpn6s9hz89pd5jwpr32wxc5vwcg"; depends=[igraph png rmarkdown]; }; Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; }; JoSAE = derive2 { name="JoSAE"; version="0.2.3"; sha256="0b1jwplds5b7z15v6bvqj1rbn7zxpgvh2ykhqplxzv4mlaw6i0li"; depends=[nlme]; }; Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; }; 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=[]; }; - JuliaCall = derive2 { name="JuliaCall"; version="0.7.3"; sha256="00kj1mwsgs5fj9s5qipbh81dmb908610ajng1k1yxkkrnc4nxqpk"; depends=[inline]; }; + JuliaCall = derive2 { name="JuliaCall"; version="0.12.1"; sha256="1qw5qq35z525wrfrqlawm16bm4p0yzcabp2yzk8piiyhqpd7cma6"; depends=[R6 Rcpp]; }; JumpTest = derive2 { name="JumpTest"; version="0.0.1"; sha256="1d5zmjwmajzdg5d1ws40zchx9wiaav01fby1v3irym2mx30jgbqn"; depends=[MASS Rcpp RcppEigen]; }; + JuniperKernel = derive2 { name="JuniperKernel"; version="1.2.3.0"; sha256="17r4ssjjayvnp9fp9jalklp3p8dadyx5hvi9z3bh3sw4b7kx4lyd"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; }; 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.9"; sha256="04iq4zyy98rqvv7q4f3ypg0bmdawmwa3lwm9agbrsaiz8v89cqhk"; depends=[]; }; + KFAS = derive2 { name="KFAS"; version="1.3.1"; sha256="0hnf9ljy19hng7cvr0qixcf8h9z2spp5c9512gfm9c7zn6802k54"; depends=[]; }; KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; }; + KGode = derive2 { name="KGode"; version="1.0.1"; sha256="05g8zr3jm13cl6wk9m693gxa3fn5cjppm56j7ih4zzswzk9b67h9"; depends=[mvtnorm pracma pspline R6]; }; KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; }; - KMgene = derive2 { name="KMgene"; version="1.0"; sha256="0fyi594djnz6phhw507bvscyi7qwskch5ykwrc7w0npxxjyryp2h"; depends=[CompQuadForm coxme kinship2 MASS mgcv nlme]; }; + KMgene = derive2 { name="KMgene"; version="1.2"; sha256="1yj9l1mqhvyhicyycnkd639q3zkrx15ba11z9911l4c0gql8syf1"; depends=[CompQuadForm coxme kinship2 MASS Matrix mgcv nlme survival]; }; 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]; }; + KRIG = derive2 { name="KRIG"; version="0.1.0"; sha256="1hpmjzzrh5b042xh14dgxvn5x5ini63vq5jz1i6rjgvsdf734f98"; depends=[Rcpp RcppArmadillo Rdpack]; }; KRLS = derive2 { name="KRLS"; version="1.0-0"; sha256="1zyf3smfzfm3n43i35rlj1w6vcip2hxkvk4f8lp77xbsry0gmwjw"; 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]; }; + KScorrect = derive2 { name="KScorrect"; version="1.2.3"; sha256="1i69glkyi3ydzfgd8d6zrbgjq7gy9laq00jdppbqnl13i1n14sp7"; depends=[MASS mclust]; }; + KSgeneral = derive2 { name="KSgeneral"; version="0.1.0"; sha256="19rrm411c2fvx4bxi9qc6v9spqpf52k08i7gvhici9dx2hhm3134"; depends=[dgof MASS Rcpp]; }; KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.1"; sha256="1hsndxslqgca0ay4q277zjwnwz8bzwfkzz915dgqvjd2v4afrvzx"; depends=[]; }; KappaGUI = derive2 { name="KappaGUI"; version="2.0.1"; sha256="0l2kgh9bflag5s056ib8fkajl56yr8c0qsmd9ma56i9ay7i540da"; depends=[irr shiny]; }; 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]; }; + KarsTS = derive2 { name="KarsTS"; version="2.0"; sha256="0mha0q5zvijrhrl0nsq229ipf6k2mhw2yqc21vvv8sifh9b9qp4y"; depends=[BaylorEdPsych circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; }; + KenSyn = derive2 { name="KenSyn"; version="0.2"; sha256="19xbdgxafrgxwz7swg7gzrkxszxy7ksgnmz96sar8ysmwrp7dz9i"; depends=[lme4 metafor nlme]; }; 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]; }; - KernelKnn = derive2 { name="KernelKnn"; version="1.0.5"; sha256="0qrrndmrpqszwdjn1np63g8inz5l98wzsjf7yx0bc8fp8i0lj4lg"; depends=[Rcpp RcppArmadillo]; }; - 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]; }; + KernelKnn = derive2 { name="KernelKnn"; version="1.0.8"; sha256="1xiz90n9wggn5fv42h8c6gd3j6vmkwyq1433wwnmzrz5kw7f6vgb"; depends=[Rcpp RcppArmadillo]; }; + Kernelheaping = derive2 { name="Kernelheaping"; version="2.1.8"; sha256="03m5dwgm98x6ncifyyp2yxln4bm87rkrx84bdihywjd0x73pbklv"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; - Knoema = derive2 { name="Knoema"; version="0.1.7"; sha256="1f9sndva2pfv4r8g8dspywg8rs1vzlb8adf5zdc5gz8hl03b3dgr"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; - KnowBR = derive2 { name="KnowBR"; version="1.3"; sha256="1083kficxc716sxzxj93arzx97bzcfm9fim3vkyvx9m9q26m3axl"; depends=[fossil plotrix sp splancs vegan]; }; + Knoema = derive2 { name="Knoema"; version="0.1.13"; sha256="10r7gpr39f32h4znmh8kywcs0l2g9ij75qqcyd3ai1fyif54wyqc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; + KnowBR = derive2 { name="KnowBR"; version="1.5"; sha256="18xcdlzr8ipsv4zxmk3424apqrgzgf87h00lwjw5ll2y99vy2ds5"; depends=[fossil mgcv plotrix sp vegan]; }; 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.2"; sha256="14qc0ghylsj83l3pjlb9vld5i7hm7139cj6gqp2c38xmddr97wmx"; depends=[dplyr ggplot2 tibble]; }; + Kpart = derive2 { name="Kpart"; version="1.2.1"; sha256="0jx5rqiw0y9hc1czg75iy4jvd993d7dri90s4iiskbg6x6z65mi9"; depends=[leaps]; }; + KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; }; KrigInv = derive2 { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm randtoolbox rgenoud]; }; - L1pack = derive2 { name="L1pack"; version="0.38.1"; sha256="17ln5w6faq6wm95rxm6yqybay6r1wvdhn59pwzzm4j1ysrvxdzzs"; depends=[]; }; - LAM = derive2 { name="LAM"; version="0.0-17"; sha256="1ip9gz4i5ap7z6rsg0yh7sv590bji2kq4pcpaz16jpjgy5802skg"; depends=[CDM coda Rcpp RcppArmadillo sirt]; }; + L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; }; + LAGOSNE = derive2 { name="LAGOSNE"; version="1.1.0"; sha256="08sf4mm40gv9mr57pxsl1b62s2dqvbvrhy2irzqspyqk5ai2aw0m"; depends=[curl dplyr lazyeval magrittr purrr rappdirs sf stringr]; }; + LAM = derive2 { name="LAM"; version="0.1-22"; sha256="0gj4j5yqyllxbhz6iayh0w473hzq0xc1r9dlyxhh67k9mg951phb"; 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.2"; sha256="09jvdjagf4icnigbfw18z36ya4llg84fa6j2khd22cl60y81r5i3"; 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]; }; + LCAvarsel = derive2 { name="LCAvarsel"; version="1.1"; sha256="0aqc9rbrc8n6s9xllmamby219qsnxd4ajvffjr21qlkhkaklirb1"; depends=[doParallel foreach GA MASS memoise nnet poLCA]; }; + LCF = derive2 { name="LCF"; version="1.7.0"; sha256="1n5gwnkj26b7w6bzapda049bd4aqb317cip05nf0vy04xjc8giyc"; depends=[quadprog]; }; LCFdata = derive2 { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; }; LCMCR = derive2 { name="LCMCR"; version="0.4.3"; sha256="1pzavzlr3fml4chrh0fmj8688a3xa153w5gp404nx3qld5sizqrm"; depends=[]; }; LCox = derive2 { name="LCox"; version="0.1.0"; sha256="1cqkqmi6bkd41xxwqqzpdiwdv8m5nrqz3f6cajnnbmgfcjawmrzq"; depends=[fdapace survival]; }; LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; }; 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=[]; }; + LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; }; 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.1.1"; sha256="108bxw98z0hgm4nnxvn54c5npm48qsif7y91dqsjx69p6azckqmh"; depends=[doSNOW foreach formula_tools iterators pROC snow]; }; + LEGIT = derive2 { name="LEGIT"; version="1.2.1"; sha256="1ma4rpchinl4i58ljcdfgwik1rfc79waicpv1f9wdddjfsijwyay"; depends=[boot doSNOW foreach formula_tools gtools Hmisc iterators pROC snow]; }; LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0"; sha256="11vy6gg2x98s1y8a5ns9vcd61gw8ax1lhn4lvicdjbd1lg18nm83"; depends=[]; }; + LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; }; LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; }; LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; }; LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; }; @@ -1669,16 +1769,19 @@ in with self; { LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; }; 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=[]; }; + LLM = derive2 { name="LLM"; version="1.0.0"; sha256="0x4488mg8q4nhyjhqlzkwmh51frkkjn0gir22rk8rfzg4r6d18d6"; depends=[partykit RWeka stringr]; }; 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.4"; sha256="1ag3w0789qfr0ypbkcwy81j61mmf0nwriiw22w7gqjn1ripx94kv"; depends=[MASS MultiLCIRT]; }; - LMfilteR = derive2 { name="LMfilteR"; version="0.1.0"; sha256="1sn5ag59zfbq8birvb84zwksy0z0qiqc4sm66ixvmfrxhfikan9l"; depends=[MASS]; }; + LMest = derive2 { name="LMest"; version="2.4.2"; sha256="0a0azn3lyy0n1882c0zxf7f1b0h26rcck8mmsbh2wxg7r3nckkrd"; depends=[MASS MultiLCIRT]; }; + LMfilteR = derive2 { name="LMfilteR"; version="0.1.1"; sha256="0wjrnzki6mnar3lxfr2mcvk98b58qkqpbb9xx7vgrw567g1ga1ig"; depends=[MASS]; }; + LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; }; 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.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]; }; + LPKsample = derive2 { name="LPKsample"; version="1.0"; sha256="0vxps8zd9zg1aw4p2qd8wamcjkbl68yvppnlvshm2ry5dahwz1wk"; depends=[apcluster igraph mclust]; }; + LPM = derive2 { name="LPM"; version="2.7"; sha256="1anjgflj1272xrghn3s9a21f2dfggppnzjqh3p8zaid91bzg0g34"; depends=[fracdiff MASS QRM]; }; LPR = derive2 { name="LPR"; version="1.0"; sha256="16kmfm6p7cwnzpd054ik0cy0ipif6zssdfyxyfm0cijz8z4z40x7"; depends=[doParallel foreach glmnet iterators lattice Matrix slam]; }; LPS = derive2 { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; }; LPStimeSeries = derive2 { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; }; @@ -1689,38 +1792,42 @@ in with self; { LS2W = derive2 { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; }; LS2Wstat = derive2 { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[geoR LS2W matrixStats RandomFields spdep]; }; LSAfun = derive2 { name="LSAfun"; version="0.5.1"; sha256="0wj2j53jizg014sppag9zbs5hzc3mvpg1fx1s7l4ff6rabhgvlff"; depends=[lsa rgl]; }; - LSAmitR = derive2 { name="LSAmitR"; version="1.0-0"; sha256="18rpvbiq3vqdcxzbx15x16y4hwdk050fk0wpccwcdgzlf79fjv6f"; depends=[Hmisc lme4]; }; + LSAmitR = derive2 { name="LSAmitR"; version="1.0-1"; sha256="0p1j4q1b7488wbwl2c9py6ldq2j7ri1dvnmmknx5lwvzv0xsawsd"; depends=[Hmisc lme4]; }; LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; }; - LSD = derive2 { name="LSD"; version="3.0"; sha256="069p33aw6iwikp82b7b8wa77wlyjqwr4hcwvrgaxgwqdgn6jjg3k"; depends=[]; }; - LSDinterface = derive2 { name="LSDinterface"; version="0.3.0"; sha256="146qahfqqk9nvi52dv0z3v8yy4zhs9y295hzaaczxa2kqii2wprb"; depends=[abind]; }; + LSD = derive2 { name="LSD"; version="4.0-0"; sha256="0fsp3pwrnnic9mzkd6yxa4bnxbvg68712lb20vd42wf6jb39r2h3"; depends=[]; }; + LSDinterface = derive2 { name="LSDinterface"; version="0.4.0"; sha256="0nj4m924cj7x2djalrfyrrmycq2ha6s52m34kjgs7fc9f548lhx0"; depends=[abind]; }; + LSDsensitivity = derive2 { name="LSDsensitivity"; version="0.1.4"; sha256="1gfd890vr31ab37xbx7yhwbqk6y659d0dqyir7vrgma48cd0nidv"; depends=[abind car DiceKriging kSamples LSDinterface randtoolbox rgenoud sensitivity tseries]; }; LSMonteCarlo = derive2 { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[fBasics mvtnorm]; }; LSPFP = derive2 { name="LSPFP"; version="1.0.0"; sha256="074qd7zxa54cawipmba1khb6hyrkg553vc25gf2z0ydyv14shm0w"; depends=[bit64 data_table R_utils RCurl seqinr tcltk2]; }; + LSRS = derive2 { name="LSRS"; version="0.2.0"; sha256="0p70v5vbxi1rf055mqgsp8v0lxnaj53bmbghli1764yn3x1k3iw6"; depends=[]; }; LSTS = derive2 { name="LSTS"; version="1.0"; sha256="1vgdqyj6k50gqfffqfb4n3sw27jrq21nl2h8sz8942w4a8fn7sgv"; depends=[]; }; LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; }; 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]; }; + LTRCtrees = derive2 { name="LTRCtrees"; version="1.0.0"; sha256="08wkhd7sqk0q9sahg6bd1m2xgl5yk9ldvripa6vyps0nni1h8lb6"; depends=[interval inum partykit rpart survival]; }; LVMMCOR = derive2 { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[MASS nlme]; }; LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; }; - LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.1"; sha256="1inq88yqm1155shx81lsmjvc0snnid0ibim991g46yibf3jpcyzf"; depends=[]; }; - LaF = derive2 { name="LaF"; version="0.6.3"; sha256="0mp1g8pikmkahxgshgs4a7iryxzzcxhxdzvdn60s6m9h1addvhww"; depends=[Rcpp]; }; - LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.1"; sha256="0ic6rm47iqkrlds7cshfcd0vjpgd7hldlicjq1wzxx0p3fbbnqjm"; depends=[data_table maptools rgdal rgeos sp spdep]; }; + LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; }; + LaF = derive2 { name="LaF"; version="0.8.0"; sha256="1nasj0502i0dbzqgm1pdvmc0wj1hk2q5fzanpcsh7zslsikiqxyq"; depends=[Rcpp]; }; + LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2"; sha256="08jm419cf22z144csif2ndf53743v1xl9zpa6zamd3df2snr59x2"; depends=[data_table maptools rgdal rgeos sp spdep]; }; Lahman = derive2 { name="Lahman"; version="6.0-0"; sha256="1616iaa28z6wrxcvvmnic5awj33b7km9yxnn8bnll9yw99ks6qk6"; 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=[]; }; LambertW = derive2 { name="LambertW"; version="0.6.4"; sha256="09ygalklv0d767nwziqwaxa7h517rzqgaznmb04q43122x2gwb3k"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; }; 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=[]; }; + LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.0"; sha256="1fx85kfdvap914b2fsylkd6wiwcfxpmndkrynivwjczwx1hr5na1"; depends=[]; }; LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.2"; sha256="1z1cnj6r6cq3b8xa9qck3ijfmzsr70r2p9m1ndakijb36pgwrzcs"; depends=[Matrix Rcpp]; }; + LassoSIR = derive2 { name="LassoSIR"; version="0.1.1"; sha256="0ap8335ms12nsc7jvd48244zya54w05wj91qkhb0i63730r508c3"; depends=[glmnet]; }; Laterality = derive2 { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; }; LatticeKrig = derive2 { name="LatticeKrig"; version="6.4"; sha256="02il7cks03kmbra3sf90kdfp0dzg4kfmy512hd542nzwwa8pivsm"; depends=[fields spam]; }; + Lavash = derive2 { name="Lavash"; version="1.0"; sha256="0cjl8crk0rdkyzp069fk4k0sapcjmqm3q40z5mgl0i1n59kn4s07"; depends=[glmnet MASS pracma]; }; LeArEst = derive2 { name="LeArEst"; version="0.1.5"; sha256="13rxch3f16yvcil255abdp2vc7v2ipy3xj38s7hmjikqfdmxpkw4"; depends=[conicfit jpeg opencpu]; }; LeLogicielR = derive2 { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[gdata IndependenceTests RColorBrewer xtable]; }; LeafAngle = derive2 { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; }; LeafArea = derive2 { name="LeafArea"; version="0.1.7"; sha256="0pn6hh9ipr609pi49ls8wxnx7v8q1wyp84i22zzwxyzwaap5nmj2"; depends=[]; }; LearnBayes = derive2 { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; }; - LearnGeom = derive2 { name="LearnGeom"; version="1.0"; sha256="0n97jzmi7zg1iysawgr753mig49fvzymldgh8nqqcgql1rjf3yph"; depends=[RgoogleMaps]; }; - LendingClub = derive2 { name="LendingClub"; version="1.0.3"; sha256="0gnykp51nnchm79w0s3wx7q5790yzjp1fjgm12v4jjxzq30gjmcm"; depends=[dplyr httr jsonlite plyr]; }; + LearnGeom = derive2 { name="LearnGeom"; version="1.3"; sha256="0fqf5k3gsdxwyfcbkypqiq0ir8ay8r9bdy8iljhj308ammq0mxzk"; depends=[RgoogleMaps]; }; + LendingClub = derive2 { name="LendingClub"; version="1.0.4"; sha256="03pgarbraj6in7pk7zaci98aq6dh52vsqb64my5p0bczgl2cpzmm"; 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=[]; }; @@ -1733,50 +1840,47 @@ in with self; { LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; }; 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="2.1.0"; sha256="1k2qrpxvy9ymkll63icbm2b9alfw0hg10rawigwbs2xv9n8vyb4p"; depends=[plotrix RColorBrewer]; }; - LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.2.0"; sha256="14q8n0zqm21fwfyfqvxdacxj6mdipgi2143d8xksifk5ihhdj64v"; depends=[]; }; + LinkageMapView = derive2 { name="LinkageMapView"; version="2.1.2"; sha256="101g4djzkxgxbn87an2vz4s9nwn8gwz7a3p3wg0y4zpdd1pdp716"; depends=[plotrix qtl RColorBrewer]; }; + LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.3.0"; sha256="1p5rg50g1pq700cx9jk4ackiyin5c2nanxq677cn840w6r11vm2g"; depends=[crochet]; }; 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]; }; LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; }; 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]; }; + LocalControl = derive2 { name="LocalControl"; version="1.1.0"; sha256="0hfm8lllsg5h95ib0h89hbhwcnk2959y9i3kllwmxhmqbirvlpx9"; depends=[cluster gss lattice Rcpp]; }; Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; 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]; }; LogicForest = derive2 { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[CircStats gtools LogicReg plotrix]; }; - LogicOpt = derive2 { name="LogicOpt"; version="1.0.0"; sha256="15wcc2655vn1yz9gwxmqm9n1lmybk2gf4nlwz4i02kk4gabdazz0"; depends=[]; }; LogicReg = derive2 { name="LogicReg"; version="1.5.9"; sha256="0rxzhbf51psdj7wb2dcah16y8f5q7y8p0yybz54rm00d1qagl6nq"; depends=[survival]; }; LogisticDx = derive2 { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; }; LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; - LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-4"; sha256="02p46agsdbvw6dpgzahq9hfmy184jrkwa1hhnrcbrsmm54n3m2bx"; depends=[nlme]; }; + LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-6"; sha256="1gy9v6qiwkwbwp4snif2imf6zn50ffjrig54ln57c5v5pk3phnvv"; depends=[nlme]; }; LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; }; - LowRankQP = derive2 { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; }; + LowRankQP = derive2 { name="LowRankQP"; version="1.0.3"; sha256="1a46rk0fhpnrlfzmydy7zjswrm6hf056qxgf5p10naq6025whf8x"; depends=[]; }; LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; }; LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; }; LumReader = derive2 { name="LumReader"; version="0.1.0"; sha256="1h2r3c9xkwlnaicn65085bdx7y86ha2fpd5mxirqax5lm6d8lirc"; depends=[gridExtra lattice plotly shiny]; }; - 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]; }; + Luminescence = derive2 { name="Luminescence"; version="0.8.2"; sha256="0fk7vmgp0ws31azl7hazx925ddksqfgsmfwz2akfhbzi1y4bys3m"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm plotrix 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]; }; - MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.0"; sha256="0vvzjqjhxnjxj3askm708bl07ph4zs9jykpw4yg5dsysy58cjl0z"; 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.4"; sha256="1pmhsfvd45a44xdiml4zx3zd5fhygqyziqvygahkk9yibnyhv4cv"; depends=[]; }; - MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.11"; sha256="11akflnz4d3vbal1zqyv58n8dwggnix2lzd1r1kkvwja6izb5z08"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; + MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.2"; sha256="11031gmc6zrhn6vdzza4qqvwc48h09kbvkikqznqr9hhkysv7c11"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; }; + MAINT_Data = derive2 { name="MAINT.Data"; version="1.2.1"; sha256="0fmlmb88005diqwbxlgkzzb7bvxpdkiqiadp649id3mgcz100kcd"; depends=[MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; }; + MALDIquant = derive2 { name="MALDIquant"; version="1.17"; sha256="047s6007ydc38x8wm027mlb4mngz15n0d4238fr8h43wyll5zy0z"; depends=[]; }; + MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.11.1"; sha256="1aj6gakhbpis576b264s43w55dhmd5rszj54z910plybxq8hzmir"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.1"; sha256="1y2nr65cvqkvzzjsr3lmpk58lqd5rqvmzjdakhwhw4s6ymggd9hf"; depends=[lattice MALDIquant robustbase signal wmtsa]; }; MAMS = derive2 { name="MAMS"; version="1.2"; sha256="19w6ydsbr60p1cmizhhmsajzasg76r23x29qcaa7mibcb5gh1yzs"; 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.1.2"; sha256="14vs6a4kh6w3qjsphid4czkzg1456igv4q0laxi4wfm8pb1j3aym"; depends=[ellipse magic MASS Matrix plotrix plyr]; }; - MAPA = derive2 { name="MAPA"; version="2.0.2"; sha256="1sk95zpsw6lhciyyq8jzz8mdj4gbnq5vk9z3hxbyl0v0g2rr1gqz"; depends=[forecast RColorBrewer smooth]; }; + MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.2.1"; sha256="1pq1mkanp1jxyygw09p4x8cgfbkrks7g6qvzfdjgdy8kli1b3mmw"; depends=[ellipse magic MASS Matrix plotrix plyr]; }; + MAPA = derive2 { name="MAPA"; version="2.0.4"; sha256="02s223s58k2jk49m0xlz3q9m3nip3h4dl4v58j18z2vgi54dwnjr"; 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]; }; 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=[]; }; + MASS = derive2 { name="MASS"; version="7.3-49"; sha256="1yjbnj1p4z0vw84wga8q5fyqiw4n6r7pc6rdwam7vsbiamyzfcqs"; 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=[]; }; @@ -1788,27 +1892,27 @@ in with self; { 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-9"; sha256="06kmrdkhwwvr3kd5w8ws6r528hhpvbhixyj98lv36kkwlx14x06g"; depends=[BH]; }; - MBC = derive2 { name="MBC"; version="0.10-2"; sha256="0c40k3m9z9cqk3778hwyy0i56qnsvw1dwpa6p9v097fbpacfsrg2"; depends=[energy Matrix]; }; + MBC = derive2 { name="MBC"; version="0.10-4"; sha256="1fp06xx9jpz5mcxs0yppzzhch9w9c1qbsdbb60r4izrxnrhggpf7"; depends=[energy Matrix]; }; MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; }; - MBESS = derive2 { name="MBESS"; version="4.4.0"; sha256="0qr5p5znwfq8j7ixdqyd45hdvjkk6nnd1s52ixzzmzv888bafflg"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; - MBHdesign = derive2 { name="MBHdesign"; version="1.0.76"; sha256="04nrfgi8l4hn1shzvzf389hgdd7d5psxhvplk0qn5x99ya8ldr7l"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; + MBESS = derive2 { name="MBESS"; version="4.4.3"; sha256="03i7xpcb7xx8gzxdz3abdylga1hbyvz4k0m6bi4vkgyf4y2v6xv8"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; + MBHdesign = derive2 { name="MBHdesign"; version="1.0.79"; sha256="1qz0igm8h3ij8yc9bg3vr3mkmf99h1kyxscdhkfphc66zaazhyw1"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; }; MBTAr = derive2 { name="MBTAr"; version="1.0.1"; sha256="0zak19pdk0wwkhl4kj1jbwx0qmqcgpmmqv3vk0wg8nwgf1l65idy"; depends=[jsonlite]; }; MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; }; MC2toPath = derive2 { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; }; MCAvariants = derive2 { name="MCAvariants"; version="2.0"; sha256="0akff64v49d5r0wvspal0pz17jhz1ry4vdmj47m28gzjj69zcab0"; depends=[]; }; - MCDA = derive2 { name="MCDA"; version="0.0.17"; sha256="1j9lahacdhvcvj7h32yb9fimlwfcl2q8jc7dlvnsc95wai43khfr"; depends=[combinat glpkAPI RColorBrewer Rglpk]; }; + MCDA = derive2 { name="MCDA"; version="0.0.18"; sha256="1m8kf8xxli3dbbabrcanpsmsmywf21ma0nb9jq2phz7ifgladdyi"; depends=[combinat glpkAPI RColorBrewer Rglpk]; }; MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; }; - MCI = derive2 { name="MCI"; version="1.3.2"; sha256="1qmvxpxhdzzlsdgi8gv5m3vknshvalsac38mh00v4v5sqpw4zc7l"; depends=[]; }; + MCI = derive2 { name="MCI"; version="1.3.3"; sha256="1wn8lcr5sq3697nsmly6syb9jv7p99ks0fy933ff5rx54x3rf9hz"; depends=[]; }; MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; }; 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.4-0"; sha256="0cz5djmf1xfv54sgwan0r6ln1mlnkpnqh2zhqkss2m3ys2v087yh"; depends=[coda lattice MASS mcmc quantreg]; }; + MCMCglmm = derive2 { name="MCMCglmm"; version="2.25"; sha256="0crici0g6x2471kk9092f72gc6ghbwwqid3w8jsnsvy6ymmk2wih"; depends=[ape coda corpcor cubature Matrix tensorA]; }; + MCMCpack = derive2 { name="MCMCpack"; version="1.4-2"; sha256="1nizmfxyyrp0sbmyprgm97xmi3amxwix1gj7p9v0sjjklv1djap4"; depends=[coda lattice MASS mcmc quantreg]; }; MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.7"; sha256="0pbyg6v478di1w9cpp2rmhr4p5ncnwmks042981snqc5gnwysjx4"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; }; - MCMCvis = derive2 { name="MCMCvis"; version="0.7.1"; sha256="1hqkxqs1s0m1znqlf6bjx5nscqv8galnkxgp738pcvvw0mwn19pk"; depends=[coda rstan]; }; + MCMCvis = derive2 { name="MCMCvis"; version="0.9.4"; sha256="0pfj14pji0dqzlq6vy76prkh8m0hj784yjr5lz3p68kviwzrk9r6"; depends=[coda overlapping rstan]; }; MCPAN = derive2 { name="MCPAN"; version="1.1-20"; sha256="0j36dhi3bf3q14bbcmrmipz2fcn6g9gsqidzm43i8x5r7hcvv2lh"; depends=[magic MCMCpack multcomp mvtnorm plyr]; }; MCPMod = derive2 { name="MCPMod"; version="1.0-10"; sha256="0ns74qhm9bzi70m9bn61zs4mmqmmxxi77f49pdrcnr8wrrnn1kdn"; depends=[lattice mvtnorm]; }; MCPerm = derive2 { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; }; @@ -1817,29 +1921,30 @@ 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.5.0"; sha256="185qdm39mydsb7h09j0763a13wd84h0w8rx2g0xwdynp2rakkw75"; depends=[car CompQuadForm lme4]; }; + MDMR = derive2 { name="MDMR"; version="0.5.1"; sha256="1pv57xl7pjsqxz1j8mnfmjaa36mlr749yb4c44ppdrx6khvw662x"; 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]; }; + MDSMap = derive2 { name="MDSMap"; version="1.0"; sha256="15557ca83bvsqcmsa48vispagg9a05658i22cqk706shjsp782n5"; depends=[princurve reshape rgl smacof]; }; MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; }; MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; 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-15"; sha256="0cfhbl099znjyij6sfhp5ma7yk1cj20paqixdy8lrif31mgkibd0"; depends=[geeM geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; + MEPDF = derive2 { name="MEPDF"; version="1.0"; sha256="171pzhz4z0373663mfnfi5cqd9gnj0aamwr56ag16dxm8xfyppcj"; depends=[MASS plyr pracma]; }; + MESS = derive2 { name="MESS"; version="0.5.0"; sha256="1khm9x7kk68xcnjm9iij1s5zvj8n6dp1iwyp2y8fcv12qnvrjpbc"; 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]; }; - MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9"; sha256="16f1kdaqczjlv5cx0nv9fybvjwf22yaj3f4blkgm7mf9h78cyz05"; depends=[corpcor Matrix matrixcalc scs]; }; - MFPCA = derive2 { name="MFPCA"; version="1.1"; sha256="1nbm8j9g36jqbalja5zcgkiy03i0pmr75hiqnhigxyy4dnp0wj4a"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; + MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9.1"; sha256="1bcdqfzmllp3dri1phy365wgc9c37wlag65pzljn4p3mf43w10nq"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; MFT = derive2 { name="MFT"; version="1.3"; sha256="029apjg1fqrqfg98jczbxfy267m3f68qxvxqjzbsw1xisq4j7wc0"; depends=[]; }; - MGGM = derive2 { name="MGGM"; version="1.0"; sha256="0j9wyshwxd7zqb60avb7dmfgnrzv2nyn983bw0g5997zixz0w6mp"; depends=[]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; - MGLM = derive2 { name="MGLM"; version="0.0.8"; sha256="1yzi679jm7x9qkz0d3az84clkjfc7wjnxkk6n6s6ia4bnw05d5v7"; depends=[]; }; + MGLM = derive2 { name="MGLM"; version="0.1.0"; sha256="06gaz82nn7fbfv7bm9xx6dsk95xq3gircvh6knzm963r1bw8f1pk"; 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=[]; }; + MHCtools = derive2 { name="MHCtools"; version="1.1.0"; sha256="03y6m3a46bzazxkrxdrii2p1fyc26il09z5676c63rk8wz9wcxa0"; depends=[rlist]; }; + MHTdiscrete = derive2 { name="MHTdiscrete"; version="1.0.0"; sha256="0w1hxa3qk8glijhc4h1wrl5xw54zflibgilhs1w872w9wrkxs5ih"; 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]; }; @@ -1853,61 +1958,65 @@ in with self; { MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; }; MKLE = derive2 { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; }; - MKmisc = derive2 { name="MKmisc"; version="0.993"; sha256="0zhscicwcppwhpylax69ablkfllgf6f4fmp1gb7yi2cm59f94ny1"; depends=[RColorBrewer robustbase]; }; + MKmisc = derive2 { name="MKmisc"; version="1.0"; sha256="1ykzj9flq1nx8k7aybd2sh5rd8a2hzk4gwz0iqqsl18k1khzbdla"; depends=[ggplot2 RColorBrewer robustbase]; }; + ML_MSBD = derive2 { name="ML.MSBD"; version="1.0.0"; sha256="1myr4pnznkypb7jjpyr5iv4yh29q9kv6g8gmfh9x3wy96xy15wmz"; depends=[ape]; }; MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1"; sha256="07fhbhfnlmllxxdpdqiaz6d72y4pj3vrz6lw5rnlb2m7vknx51ik"; depends=[limSolve MASS MultiLCIRT]; }; 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.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; }; + MLML2R = derive2 { name="MLML2R"; version="0.2.0"; sha256="1r8a2sbv7c0xhdacg3gm3x5iml713xbc54c26q5rqx7mdnhsjiqk"; depends=[]; }; 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.2.0"; sha256="083007bp3spgjx9y65hwk6074yky1sf5n7w44pfnxzrjbc7d0qhb"; depends=[DirichletReg]; }; + MMDai = derive2 { name="MMDai"; version="1.4.0"; sha256="0bb7hg8fkmzg87xr1b2hxhy75xi461ks6w12z85k4c77kswfpx3b"; 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="3.0-2"; sha256="08q4qqhpgnmkw18kgzxsanp6qhwikx1wxcr6byr6zylqnqgx2id9"; depends=[MASS]; }; + MNM = derive2 { name="MNM"; version="1.0-3"; sha256="16b2yrm2kn943vzrr38qhk6qq20a842xv7iiln4is02csijxw2b3"; depends=[ellipse ICS ICSNP SpatialNP]; }; + MNP = derive2 { name="MNP"; version="3.1-0"; sha256="06qs2vsmjs6rcpqlwfc1n5y5hzxf7pngbdmiza1wijm9hh54ikh0"; 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.1.0"; sha256="0a0gjncbh9dskbmvl5yzzg33jxvvfrsvc3axy1r5j5nfp3hb6zn6"; depends=[bitops devtools mapdata mapedit maps ptw raster RCurl rgdal sf sp XML]; }; + MODIS = derive2 { name="MODIS"; version="1.1.2"; sha256="1iww1rnxv2xw63b5bz7xrxb3q8dmgqzbw704gshislkhjwn37q87"; depends=[bitops devtools mapdata mapedit maps maptools ptw raster RCurl rgdal rgeos sf sp XML]; }; MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; }; MODIStsp = derive2 { name="MODIStsp"; version="1.3.3.1"; sha256="0685mrddw47428p61dw30yqdp5m0z2xh3rjfdrrdicfyx7kaii5m"; 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="1.0.0"; sha256="0v5cmnin1fg5yzk2jkbi0fjmgbxls1mgpsr9qkss1cskyxw1d4lz"; depends=[assertthat FNN]; }; + MOEADr = derive2 { name="MOEADr"; version="1.1.0"; sha256="0q0bm13v85raq5hdfpzg4v5kj12zjh31fr1x0zv9g5blxy10dqgy"; depends=[assertthat FNN]; }; MOJOV = derive2 { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod lattice saws survey]; }; + MOLHD = derive2 { name="MOLHD"; version="0.1"; sha256="1si1sfrznq477pdzwqz5p3x2vsx3bl9bhrmxaqsimsja58blxygn"; depends=[fields iterpc]; }; MOQA = derive2 { name="MOQA"; version="2.0.0"; sha256="17w4iwf38k0r2fiwqr420hkbbz1a3r89sqwnd2yn300zmaz64hpr"; depends=[gplots psych readr]; }; + MOST = derive2 { name="MOST"; version="0.1.0"; sha256="0nmjx5hsn67hdglcqyanq3az76rs15knv8qy28f8paah5s9w24xf"; depends=[]; }; 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=[]; }; MPDiR = derive2 { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; }; MPINet = derive2 { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; }; MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.1"; sha256="0xgj349jkv29ldia4lmsiwnkhrk99aqcrvyiy3si5knmi1jvx9q0"; depends=[MASS survival]; }; + MPR_genotyping = derive2 { name="MPR.genotyping"; version="0.8"; sha256="0lsrbks7nhfnrmk8kclh09rc132j3divjxrzjfrg8zijbzkfx1pn"; depends=[qtl]; }; MPSEM = derive2 { name="MPSEM"; version="0.3-3"; sha256="0ir1zlg0vz0nfdair3apa737dw4078lbxyk932755d3rj0cm20c3"; depends=[ape MASS]; }; MPTinR = derive2 { name="MPTinR"; version="1.10.3"; sha256="0281w5dhg8wmi1rz80xribq437shp4m890c504kggsacr28mbhkw"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; }; MPV = derive2 { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; }; + MPsychoR = derive2 { name="MPsychoR"; version="0.10-6"; sha256="0lxfsxcry5r619cw751m5wn8wgf08j41cgan67xswn42ir7prdpx"; depends=[]; }; MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; }; MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; }; MRFA = derive2 { name="MRFA"; version="0.2"; sha256="1ld9bchldx4y8g0zp2nr6r439f9vqy5xcr9bkv4g4vphm2c5zq72"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; }; MRH = derive2 { name="MRH"; version="2.2"; sha256="1icwlq8js58g9fkiq7fwjg8r97ca47xl3dscnhnga99gkgsfgjwl"; depends=[coda KMsurv survival]; }; MRMR = derive2 { name="MRMR"; version="0.1.4"; sha256="0dgbhlynaaka7mdzl6igwgcdzvy6cm2y8mbxaf9pfla8w3z8y0lq"; depends=[ggplot2 lmtest lubridate plyr reshape2]; }; MRQoL = derive2 { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; }; - MRS = derive2 { name="MRS"; version="1.2.1"; sha256="07kpj5q1slplqm3907yj74dkfq348a9fwfr0dzhjzdbkhph2iwpi"; depends=[igraph optimx Rcpp RcppArmadillo]; }; + MRS = derive2 { name="MRS"; version="1.2.4"; sha256="1sksg70zb72ys1b7vi8amjaqarmdh8vf2l1rb0rasrlvrip3z3br"; depends=[igraph Rcpp RcppArmadillo]; }; MRSP = derive2 { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[Formula matrixcalc]; }; MRTSampleSize = derive2 { name="MRTSampleSize"; version="0.1.0"; sha256="1f6ivr6cx4irqkry219x4nk6k5zhp3b19axy2xbfc3dx5zixhpjl"; depends=[]; }; MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; }; MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; }; MSBVAR = derive2 { name="MSBVAR"; version="0.9-3"; sha256="0ybkkl3hfff2jgz4a0z105bb0v6jl4dkkqmdg382and8w0mc496c"; depends=[bit coda KernSmooth lattice mvtnorm xtable]; }; - MSCMT = derive2 { name="MSCMT"; version="1.3.0"; sha256="0rwhfk6dh10zn1zgjamwx23j8i9kw1p6yzfgxj5ch7w3d3yzhrbf"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; }; + MSCMT = derive2 { name="MSCMT"; version="1.3.2"; sha256="00s4wwggc70w6cg94ff853jnw5hcln6i0719n4xr92cpxaa7irnw"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; }; MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; }; - MSGARCH = derive2 { name="MSGARCH"; version="1.1"; sha256="1pclfp7x629axby4kpfnrvnr6lpm8f4pimwsvwnpda3sx0pfvkkx"; depends=[adaptMCMC coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; + MSGARCH = derive2 { name="MSGARCH"; version="2.1"; sha256="0z4fp37x65ggbn8kx0xbdwq1x18z93azr36smpfqxaykiiwwfa22"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; 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="2.0"; sha256="131c98lzy1cs1gbv20nv9r6yhlyyhk43hh1mrx12k1cgw299265k"; depends=[Formula MASS partykit survival]; }; - MSbox = derive2 { name="MSbox"; version="0.1.0"; sha256="0r6dprmvlga58drdk3x7z1rzy12lmmxcqng8534la8d3g6hhdwmz"; depends=[]; }; + MST = derive2 { name="MST"; version="2.1"; sha256="16mnsn2an02k4jrqb6yj0n1i563zny5v10ngfq1y28fqaw6h8yyq"; depends=[Formula MASS partykit survival]; }; + MSbox = derive2 { name="MSbox"; version="1.0"; sha256="0r6bvw7ddb8lvz5cjvcng9vkc6pn765xgd4bws594jyc0avm0jkx"; depends=[stringr]; }; 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]; }; @@ -1920,87 +2029,89 @@ in with self; { MTurkR = derive2 { name="MTurkR"; version="0.8.0"; sha256="0q498chr2s67ai7lfxi6kdficqbs5sxj9asyv69z2a37fmsr4va7"; depends=[base64enc curl digest XML]; }; MTurkRGUI = derive2 { name="MTurkRGUI"; version="0.1.5"; sha256="1rlgz80na0v1nx70cda1fzyswlb1lg5kcx64zl9dcqy6accsrpmp"; depends=[curl MTurkR XML]; }; MUCflights = derive2 { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; }; - MUS = derive2 { name="MUS"; version="0.1.4"; sha256="0h65gmxi65qax0qky7667p1jzi8y4pdncaa899d1nb0gvg9x0yh2"; depends=[]; }; + MUS = derive2 { name="MUS"; version="0.1.5"; sha256="1vjfd9jhjs8llkqsdaynrlny93mb8y7wifg6cdjmnaq5fm9gyv9j"; depends=[]; }; MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; }; MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; }; MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; }; - MVN = derive2 { name="MVN"; version="4.0.2"; sha256="0k8fbhnw2lbjgafab4m6j7nkzclj1226fdiv8bmv5vcm6g82nb19"; depends=[MASS moments mvoutlier nortest plyr psych robustbase]; }; + MVN = derive2 { name="MVN"; version="5.0"; sha256="1rpb9hxi4g87h6gvg6qdvk3f208cdayikmb8ib499ax3wv1zszhy"; depends=[boot energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; }; MVR = derive2 { name="MVR"; version="1.32.0"; sha256="18arp9xh9dflbmc5zxafy132mnz5xwc6kb9hv51njz602kms70qg"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; - MVar_pt = derive2 { name="MVar.pt"; version="1.9.8"; sha256="0ysdrdjlljbscw92ylyq4m22zvj3b9yp9mpw4pdlnzwix9z0k2yx"; depends=[]; }; + MVar_pt = derive2 { name="MVar.pt"; version="1.9.9"; sha256="1lhy66k9x9ymj03d4f7wi6rdx60bwgy6gfv49jq3vr4cj8dv22i9"; depends=[]; }; MVisAGe = derive2 { name="MVisAGe"; version="0.2.0"; sha256="18w3qf85l81sbxhzxs61jbsng14lbd8vzvbprq0ywkxb2lsq16n2"; 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="1.0.0"; sha256="1f2ml4q33ml28y0h68bll2lmb1xxnjxgdxi5mf8arzl42b3d72b6"; depends=[doParallel energy foreach lme4 MASS nnet ordinal quantreg relations Rfast speedglm survival visNetwork]; }; + MXM = derive2 { name="MXM"; version="1.3.2"; sha256="0d3x773870ky6q36g6skcyfvywrwc264f5g55sh3229c6qpjgzq2"; depends=[doParallel energy foreach geepack hash lme4 MASS nnet ordinal quantreg relations Rfast 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.3"; sha256="1ppc0ik7vx14n6alq9wpykgfacg78ph9fc5r9k9jqm55nwz4d3xh"; depends=[Rcpp RcppArmadillo]; }; - ManlyMix = derive2 { name="ManlyMix"; version="0.1.9"; sha256="0zf3j0vs3gg697dlma9j92davf6x7isykgx01018zzivlabrrc6b"; depends=[]; }; + ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.4"; sha256="0c5hw01nlnxrys8d9qhwvnls834i0081pf9iic9kx5k6ckc7iwha"; depends=[Rcpp RcppArmadillo]; }; + ManlyMix = derive2 { name="ManlyMix"; version="0.1.11"; sha256="0vnx4cmx5vv8qh3pn75lz1mxap1ar4jnc5j15552vvi4i9pgmmar"; depends=[]; }; ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; }; Map2NCBI = derive2 { name="Map2NCBI"; version="1.1"; sha256="19gafyql767f1p4fxdw7d5a8z1b4vg7jfrvzaml5x16fj6c78fjm"; depends=[]; }; MapGAM = derive2 { name="MapGAM"; version="1.0"; sha256="1hzv3sy2szxl4fhnnzlwagh3qm4z22cbhiwi8whgn5ymwlnw0pca"; depends=[gam maptools sp survival]; }; - MareyMap = derive2 { name="MareyMap"; version="1.3.3"; sha256="0d8prx08321f0p42xbnf0b1446fq4km35xs3ih5ssbdm14q7fnln"; depends=[tkrplot]; }; + MareyMap = derive2 { name="MareyMap"; version="1.3.4"; sha256="1wap0syzgd0w3xla2x4bcasn8zzlj63r5yyf9r479nvifjxdqxzz"; depends=[tkrplot]; }; MarkowitzR = derive2 { name="MarkowitzR"; version="0.9900.0"; sha256="1wyqlgmb376dsvx7nixpbynjzp7xpmsh4fx9s7nai6fhjb50mxha"; depends=[gtools matrixcalc sandwich]; }; + Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; }; MasterBayes = derive2 { name="MasterBayes"; version="2.55"; sha256="14532l41x5k3z2qg0vklafqyzmn45qny9hlrrgriykajv3xjf2lz"; depends=[coda genetics gtools kinship2]; }; - MatManlyMix = derive2 { name="MatManlyMix"; version="0.1.2"; sha256="08iny27gsf89r7c938nx8pmkivkiyrsq7za9ijamz61cf4kyawcl"; depends=[]; }; - MatchIt = derive2 { name="MatchIt"; version="3.0.1"; sha256="0iifn286ssdavpg3ajlmd5z7n5wn0rsj3l23xf6qnvij35k95kbw"; depends=[MASS Matching rgenoud]; }; + MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; }; + MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; }; 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-11"; sha256="1yvd6fx3n99j4gvzrng43ji38pr5h8y03kijccgjdalym2hcp36g"; depends=[lattice]; }; + Matrix = derive2 { name="Matrix"; version="1.2-12"; sha256="1wm45hg4x5ay15y03k6rmgkd1n9r01da72mszk24vafwd7pimr8n"; depends=[lattice]; }; Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.6"; sha256="0aa225y6vqm0dqjfppfrc43wbq3ks9aszhmy73xbai2v12sh439g"; depends=[grr Matrix]; }; MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.2"; sha256="0s4gxgl6fsy0fnjmsdz4k7p96vl6p00xl9w2fg7v0gikjpz6h5bg"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; - MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; }; + MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.2"; sha256="1205jxx5aj783r2dmpawiq4rr30b60fq1qf053i7wylw07pz6vba"; 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.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; }; - MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.5.1"; sha256="1c5lba3v7agl6wvgnr7af3raxpl9jaffk0ri20jn3gn5mq3bpjrk"; depends=[dplyr lubridate rgdal rgeos rmapshaper rvest sp stringr xml2]; }; + MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; }; + MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.5.2"; sha256="0k64yzn7qnjxkxxqg5yrgq1ksdp37qfx0yc8a2n1zrdwj9f9ba2i"; depends=[dplyr lubridate rgdal rgeos rmapshaper rvest sp stringr xml2]; }; + MazamaWebUtils = derive2 { name="MazamaWebUtils"; version="0.1.5"; sha256="065l1n2nr5jsc0mdlxj10plzp8m09025hzbd8if3pn6gsl520b6l"; depends=[dplyr futile_logger stringr webutils]; }; 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]; }; + Mcomp = derive2 { name="Mcomp"; version="2.7"; sha256="1bv88z0cy2ark9i8wggxj101bygpsfkaxql5k0g7m90jlq8b4xr1"; 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.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.2"; sha256="0hwmixcby68a6p6vrq0jy9g6ky26q94haz7m9drzf50zzkv5df0g"; depends=[ggplot2 knitr plotly rmarkdown robustbase stargazer]; }; + Mediana = derive2 { name="Mediana"; version="1.0.6"; sha256="0cx2bkz5m96dirqknfsi9944rhnn14wwdimw1hq1p8c073z40i7a"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; }; + Mega2R = derive2 { name="Mega2R"; version="1.0.0"; sha256="1rprbn7pkp0haahf34d1w7pmzn6hv8ci93gfp68hpyxxi6qm61g0"; depends=[AnnotationDbi DBI GenABEL GenomeInfoDb pedgene Rcpp RSQLite SKAT]; }; + MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.3.0"; sha256="1nnj4nmzrvdj2arq74bg5ckhmll2z9ydnd75ds48njbhxla2645l"; depends=[ggplot2 iterpc knitr Matrix plotly rmarkdown robustbase]; }; 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]; }; MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; }; - MetFns = derive2 { name="MetFns"; version="3.0.1"; sha256="1irrwg3a1m6a820zg7f13x84rfgd3z2xl4qc4y096y4agn6h7v97"; depends=[astroFns lubridate plotrix pracma]; }; + MetFns = derive2 { name="MetFns"; version="3.2.0"; sha256="1nm7yv0cl0kl9dn284fja8a9lf77a2xaqv6v53b2f9sravj5pkfv"; depends=[astroFns lubridate plotrix pracma]; }; MetNorm = derive2 { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; }; MetProc = derive2 { name="MetProc"; version="1.0.1"; sha256="1z6538pij1rq5wv9s8rjcn0sck15y26asv4vamav8a6s4135ia3q"; depends=[fastcluster gplots]; }; MetSizeR = derive2 { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; }; MetStaT = derive2 { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; }; MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; }; - MetaComp = derive2 { name="MetaComp"; version="1.0.1"; sha256="11h0b62c54vgvdnxfjg233ripyfpi4b1d9lkpkc09d8jifhbga7q"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; }; + MetaComp = derive2 { name="MetaComp"; version="1.1.1"; sha256="0ndnjpg0c9k4171n190qwxmy79kw2ax4y5ap4xvaf0x561p072l6"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; }; MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; }; - MetaDE = derive2 { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; }; MetaIntegrator = derive2 { name="MetaIntegrator"; version="1.0.3"; sha256="0611k497ixy0f51lmqzs08zqqq5krrxrm7m0xqdl18gkwrw3w656"; depends=[Biobase DBI GEOmetadb GEOquery ggplot2 gplots multtest preprocessCore reshape rmeta Rmisc RMySQL RSQLite stringr]; }; - MetaLandSim = derive2 { name="MetaLandSim"; version="0.5.6"; sha256="1hrgq15qgi26qdiz9iwkhf98nlzx86d3980z717w3gl1yr3i9kal"; depends=[e1071 fgui googleVis igraph maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; }; - MetaLonDA = derive2 { name="MetaLonDA"; version="1.0.4"; sha256="0nly4wbklbbihqnxw1nxhydvs6n1fd3j068am9hapf0nwf8kp02g"; depends=[caTools doParallel ggplot2 gss plyr]; }; + MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.1"; sha256="1m7h1bdk172zjx7xxlh4lac17ndx28vjpvdkyb352j5f4r4aq09g"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; }; + MetaLonDA = derive2 { name="MetaLonDA"; version="1.0.9"; sha256="1iy7p91ln48fhym7gna8xmqrva6fcwxapqcyh1h6hqr0h3j392qd"; depends=[caTools DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr]; }; MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; 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]; }; - MetaSubtract = derive2 { name="MetaSubtract"; version="1.1"; sha256="0p1fqglrhf3yvdmg6cr3clipf4jhhv3fmb7visrjc27sgcvlwws8"; depends=[]; }; + MetaSubtract = derive2 { name="MetaSubtract"; version="1.3"; sha256="0z7l666n3whfs5zqjqlq1aa10f1h4mv1di0alksllkijfi6pcnzq"; depends=[]; }; 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]; }; + MetamapsDB = derive2 { name="MetamapsDB"; version="0.0.2"; sha256="0y5szb52karxcqr1f9mb050awprbk1ynckr987aw3d4ia6i9gcif"; depends=[base64enc cluster data_table DBI dplyr forcats future GenomicRanges ggplot2 gridExtra httr igraph IRanges lubridate magrittr Matrix purrr RCurl rgexf RJSONIO RSQLite shiny ShortRead stringr tidyr zoo]; }; Metatron = derive2 { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; }; Meth27QC = derive2 { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; }; MethComp = derive2 { name="MethComp"; version="1.22.2"; sha256="0f9l36d00x054yqgbw0dckc7ldlgap6vnbb03n6n5yz47xxg0ic3"; depends=[nlme]; }; MethodCompare = derive2 { name="MethodCompare"; version="0.1.0"; sha256="0zl20v8k8bhn3skbpzdiglywrqghwf0r42q2jn8zmq4x0drvjzpl"; depends=[nlme]; }; 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.2"; sha256="1q407lisi65qaxqlp3lfjfwz3m93csrmjip689ryck7559my9zxh"; depends=[]; }; + Metrics = derive2 { name="Metrics"; version="0.1.3"; sha256="1mpqbi1lihxgndfpm8b6c5hiibvnscz1b5xjgi16x2fqk3cz4i0z"; 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]; }; MiRKAT = derive2 { name="MiRKAT"; version="1.0"; sha256="1j2sasxrld9lxmhm4lrrxm2r32nfdiqsg5qjnplx7z55djjxqq4m"; depends=[GUniFrac MASS PearsonDS survival]; }; @@ -2014,22 +2125,25 @@ in with self; { MigClim = derive2 { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[raster SDMTools]; }; MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; }; Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; }; + Miso = derive2 { name="Miso"; version="0.1.1"; sha256="151klf07k5f670ssclg6bba18vfamyclz1sq3x0l9bzdvkng0lak"; depends=[S4Vectors]; }; 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.2"; sha256="0dn398vrxh16gmy7ghh5000dgk7cbhb3gi3myrxp5dfri3ysjxcj"; 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]; }; + MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.2.0"; sha256="1r6hamc4vanxdbmp37ib20drw49c4vxkskqb93qlagaqxgr9xch0"; depends=[stabledist]; }; + MixGHD = derive2 { name="MixGHD"; version="2.2"; sha256="1cq6mar6h56nscnd7xs6spf45mlqp48lssw2i57zfvi75f6s70p4"; 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-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]; }; + MixedPsy = derive2 { name="MixedPsy"; version="1.0.0"; sha256="19cgw82jdkcpkca90bab1k5gcb2prlxm634n4m7yx0p0mj736fha"; depends=[beepr boot brglm lme4 Matrix mnormt]; }; MixedTS = derive2 { name="MixedTS"; version="1.0.4"; sha256="0gwcg115idbcm5llgzqsygvqgshq8dywawxkaddsmw4sbbhj4555"; depends=[MASS]; }; MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; }; MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; }; - MoLE = derive2 { name="MoLE"; version="1.0.0"; sha256="1iwmn3axyz2kjwh8bq10q8b7dwsn3m628nxq0qa9z2xj1jf2cnf9"; depends=[]; }; + MlBayesOpt = derive2 { name="MlBayesOpt"; version="0.3.3"; sha256="0aazcf94gckgxd51r21hv3msa18br5xcq8xp03w448di546qzbnn"; depends=[data_table dplyr e1071 foreach Matrix ranger rBayesianOptimization rlang xgboost]; }; + MoEClust = derive2 { name="MoEClust"; version="1.1.0"; sha256="1442x2ajiib1fgj6bc3zlqy9q3bjnhnn29f7fjin99lq7c5r132p"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; + MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; }; MoTBFs = derive2 { name="MoTBFs"; version="1.0"; sha256="09ymfgw6psc1y0dczvsrsw5cki58wn0d8vj56ydfylrxn24g3jfq"; depends=[bnlearn lpSolve quadprog]; }; Mobilize = derive2 { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[ggplot2 Ohmage reshape2 wordcloud]; }; Modalclust = derive2 { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[class mvtnorm zoo]; }; @@ -2037,23 +2151,27 @@ in with self; { 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]; }; Modeler = derive2 { name="Modeler"; version="3.4.2"; sha256="0zf3z3y4w1jixmcbhkgrjh4dx7x3bfi66hrbzsxyfp7abk0p2d6l"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; }; - Momocs = derive2 { name="Momocs"; version="1.1.6"; sha256="15rmda0d270wallhn9f0nksms194js3vy71cii0aih02rwcpg9kw"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS plyr reshape2 sp]; }; + MomTrunc = derive2 { name="MomTrunc"; version="1.41"; sha256="0az499xzvnczqnbh4g3h5jyz8isq0zdw0x654haac6v6045f5xav"; depends=[matrixcalc mvtnorm]; }; + Momocs = derive2 { name="Momocs"; version="1.2.2"; sha256="1a4y4zg9zd0pmhcjwvi5k1x36lyl1cw5i6bfm9qphd5bm438n70y"; 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.4.1"; sha256="082589ywbg7bjkivymwprx24jnxdcb4xnh0ax64h4xhzfynbw93a"; depends=[codetools DBI digest]; }; + MonetDBLite = derive2 { name="MonetDBLite"; version="0.5.1"; sha256="01gcwr5r47dkmr1y2q387xv1qr2fryq9574aijx1a39ywhvcm8pq"; 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]; }; + MonoPoly = derive2 { name="MonoPoly"; version="0.3-9"; sha256="130hv05fwsskk1bvr7fk8bmafq26vimkfgssjdk3zaz0hm3pxrp4"; depends=[quadprog]; }; 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=[]; }; + MortCast = derive2 { name="MortCast"; version="1.1-1"; sha256="077kk08pckm07rh7vxiw8whiyc4fbsj3qihih6mg09slaq8zr825"; depends=[wpp2017]; }; + MortHump = derive2 { name="MortHump"; version="0.2"; sha256="1yhrdcwqf27v22mrysh51m3jcrnf74x21x7db25nic8q8fdmchj2"; depends=[demography HMDHFDplus Matrix minpack_lm MortalitySmooth RColorBrewer svcm WeightedCluster]; }; + MortalityLaws = derive2 { name="MortalityLaws"; version="1.3.0"; sha256="1db4p7kl3kh3kdzqbbvyj3zxv6pz0jnc9fl7j2590ajwd5m9crg4"; depends=[minpack_lm pbapply RCurl]; }; 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.7"; sha256="0xnipvfib16ycxglqnr5x0h19km0sw966w1xhaxw2ii6cm82ks0l"; depends=[boot coda digest gsubfn lattice pander plyr texreg xtable]; }; + MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-1"; sha256="1f6gd227pkcs0sa9bwng0m617pjv3b0dm6rsij06a4n2gp50aysw"; depends=[boot coda digest gsubfn lattice pander plyr texreg xtable]; }; Mposterior = derive2 { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; }; MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; }; MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; - MuMIn = derive2 { name="MuMIn"; version="1.15.6"; sha256="08qac7d1w367wjsz7n9ydziacbf8np8w8mm9izbxd4pk3ibxwi5a"; depends=[Matrix]; }; + MuMIn = derive2 { name="MuMIn"; version="1.40.4"; sha256="1xw7b74qg0ivgk3l1krjn2wrl969c41hr0y2nk0z8fw94xcfggyr"; depends=[Matrix]; }; MuViCP = derive2 { name="MuViCP"; version="1.3.2"; sha256="1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4"; depends=[gtools MASS sm]; }; MullerPlot = derive2 { name="MullerPlot"; version="0.1.2"; sha256="0am5brdmbh2mw74fbw9nha6h4qlhj8psg3142mql1ad99bd0zg4w"; depends=[RColorBrewer]; }; MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; }; @@ -2065,23 +2183,25 @@ in with self; { MultiGHQuad = derive2 { name="MultiGHQuad"; version="1.2.0"; sha256="00prkn5awxrh365j1jz312har1x4p8v52a0sqfy00pqr44ncmqqq"; depends=[fastGHQuad Matrix mvtnorm]; }; 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]; }; + MultiOrd = derive2 { name="MultiOrd"; version="2.3"; sha256="157bsd5x3cw2yyv5y1hccpn7v42lqf99w09m6kdm0rxnhgjm8k1v"; depends=[corpcor Matrix mvtnorm psych]; }; 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=[]; }; + MultiRNG = derive2 { name="MultiRNG"; version="1.1"; sha256="1kljkxwl0ym0dzvhvj2jqkp8077wdgkcqfi3m4zrjcxdblzjmm00"; 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=[]; }; + MultipleBubbles = derive2 { name="MultipleBubbles"; version="0.1.0"; sha256="1g6yqp53dbd96jcjgmif39zb3a7f9zil10dhqi3vz3qv6r2vsnkj"; depends=[foreach MASS]; }; + MultiplierDEA = derive2 { name="MultiplierDEA"; version="0.1.17"; sha256="0s67w8ifd7g231aqq0qdia13kyb1cczhxrigsgrw48pqcfkv9208"; depends=[lpSolveAPI]; }; MultisiteMediation = derive2 { name="MultisiteMediation"; version="0.0.1"; sha256="0x13q2kckw7c7bl35vdxyhhr7ij62wf0qbkxa40fi6aq2gjh89m6"; depends=[lme4 Matrix statmod]; }; 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]; }; + Myrrix = derive2 { name="Myrrix"; version="1.2"; sha256="05x2h4ppjhfm0wlpwyp8ycjg59qj3gv0yqdilxrzb1lkrzln92xb"; depends=[Myrrixjars rJava]; }; + Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-2"; sha256="1hhfg83z5kl6l250z3lippx3qc68k1wj1qlfzd6m66rgmk699gyl"; depends=[rJava]; }; 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.3"; sha256="1z6gw53y8w98krh92l0a83wnfnw14g8di4q3qz2hc2kn6834s8lq"; depends=[randomForest Rcpp]; }; + NAM = derive2 { name="NAM"; version="1.5.5"; sha256="1g3jvqvzs0wmy1phz25irfb5xh4274cdwcjm5dxmqnjdh30d31n3"; 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]; }; @@ -2090,6 +2210,7 @@ in with self; { 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]; }; + NCutYX = derive2 { name="NCutYX"; version="0.1.0"; sha256="0r2ghnvrbya3p1d8rb5bsnz5v852vvc6rq65yafn2xzr7886wrg2"; depends=[fields glmnet MASS mvtnorm Rcpp RcppEigen]; }; 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]; }; NEpiC = derive2 { name="NEpiC"; version="1.0.1"; sha256="11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8"; depends=[igraph PairedData]; }; @@ -2097,20 +2218,23 @@ in with self; { 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=[]; }; - NHMSAR = derive2 { name="NHMSAR"; version="1.6"; sha256="02g3yhd5xmrk15ydj110yd80aff2vxk852b4kbhnl3flnf3j2mzk"; depends=[caTools glasso lars ncvreg ucminf]; }; + NHMSAR = derive2 { name="NHMSAR"; version="1.7"; sha256="14jc0zfl39yn7vkprcnv80mk1i4vp8w4wk7nz6f34cf473xbf49d"; depends=[caTools glasso lars ncvreg 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]; }; + NIRStat = derive2 { name="NIRStat"; version="1.0"; sha256="1hi8201zslp1f7m3jci8q03y3f1zlcck2x3i793l7lsyl7qbzd1z"; depends=[ggplot2 gridExtra mgcv]; }; NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; }; + NLMR = derive2 { name="NLMR"; version="0.2.1"; sha256="0vyha5sx0mz2kky8qwylamqc6k0gnmbkyanapy3dqav66l98ki8b"; depends=[checkmate dismo dplyr extrafont ggplot2 igraph magrittr purrr RandomFields raster rasterVis sp spatstat tibble tidyr viridis]; }; NLP = derive2 { name="NLP"; version="0.1-11"; sha256="15v50gxzmpqx49wzkwxfpb5xjpg9y829a0ifys372kf1cfj521aq"; depends=[]; }; NLPutils = derive2 { name="NLPutils"; version="0.0-4"; sha256="1dqbf8xmrzx81ybmp5qkd5a5rw3c19l2wxfnpddij4a1n074bwym"; depends=[NLP qdap SnowballC]; }; NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; - NMF = derive2 { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; }; + NMF = derive2 { name="NMF"; version="0.21.0"; sha256="1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; }; NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; }; - NMOF = derive2 { name="NMOF"; version="0.40-0"; sha256="1zxbhpcl82v0wvp4dfpavwckvfyd2a9f4pbghk4mgqi0vhl8fgpz"; depends=[]; }; + NMOF = derive2 { name="NMOF"; version="1.2-2"; sha256="03286pp57m7imbgw334r34yg7c5zbaw3d1qxr0sbhmc2jxvv1arm"; depends=[]; }; NNLM = derive2 { name="NNLM"; version="0.4.1"; sha256="1wi2rbj56v49hsnhwdyyjwfk4hb84sagfq6mpjis4ccq65hxkvfv"; depends=[Rcpp RcppArmadillo RcppProgress]; }; - NNS = derive2 { name="NNS"; version="0.3.6"; sha256="01ahwpid9xc5ivzs7qgys92a63gw1hvlya4vz8mgwq5m4qrp0c4a"; depends=[data_table rgl stringr]; }; + NNMIS = derive2 { name="NNMIS"; version="1.0.0"; sha256="02k766klw2fssiii5f4291qvs144ab9i5b6pmqvhyr87zdb87nf9"; depends=[survival]; }; + NNS = derive2 { name="NNS"; version="0.3.8.3"; sha256="0qyb8y54hxy5ac6m0mqyqbfjc4r3m4qvb83nw2vp4mb49fiinwxx"; 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=[]; }; @@ -2129,21 +2253,23 @@ in with self; { NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; 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.10"; sha256="118pp3a11w4wyjq18jm3f7xy79l5jyjsyxgkyxbwsrr7lvplqzb2"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; + NSM3 = derive2 { name="NSM3"; version="1.11"; sha256="0lnmzpmh3i4lh5lfba6rhacf4zadbcrs7ify354h5245j0gxp1bv"; 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.4.1"; sha256="1grz2yxrklqglw9027c8k01jnb42p453fcd38arw4wd85y5hbam4"; depends=[snowfall]; }; NameNeedle = derive2 { name="NameNeedle"; version="1.2.4"; sha256="1f8hmabwafjmgx2z381a3m84zfrd0s9x51haa4c1phq41yfq2lm5"; depends=[]; }; - NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.1.21"; sha256="1rbmhk5kags3mm4znakfp1c7axdpv4gmh2h0sydvyc2dm1vds5k4"; depends=[gdata vsn]; }; + NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1"; sha256="05r1hvrxwi2mcq3pv6b699291qg120ijad96s5dah2f6cwx7gm7j"; depends=[gdata vsn XML]; }; + NatureSounds = derive2 { name="NatureSounds"; version="1.0.0"; sha256="1gx0h0z3zc373l0mxcigc25s41l3yiylzsrir5k4rrr2bvzgf8ir"; depends=[]; }; NbClust = derive2 { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; }; NeatMap = derive2 { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; }; NegBinBetaBinreg = derive2 { name="NegBinBetaBinreg"; version="1.0"; sha256="0ryi9gdf4sis77c0qxm6r86mfkk1nq9djs297y64nr6ng3rv9p9d"; depends=[boot Matrix mvtnorm]; }; - NestedCategBayesImpute = derive2 { name="NestedCategBayesImpute"; version="1.0.0"; sha256="1az32kqr5bl0mn9d69v21m80w4w3xm3pydwmr2awlfmdq674410i"; depends=[coda dplyr Rcpp]; }; + NestedCategBayesImpute = derive2 { name="NestedCategBayesImpute"; version="1.1.0"; sha256="07gfp8k7v4krm4wsbynzs6zwprgg3g0c36jh8myqjxp2276ii8zn"; depends=[coda dplyr Rcpp]; }; NestedCohort = derive2 { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[MASS survival]; }; NetCluster = derive2 { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; }; NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; }; NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; }; NetIndices = derive2 { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; }; + NetLogoR = derive2 { name="NetLogoR"; version="0.3.2"; sha256="1dqskma7iw178sy6gz0gr00zg84jgh95dv8w3hwz1wxsqpbpf1sb"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; }; NetOrigin = derive2 { name="NetOrigin"; version="1.0-2"; sha256="1ldlx4nmc5k756fmbm9vxn9rwzxmad84zpi6318pjr52izms6q2k"; depends=[colorspace Hmisc igraph]; }; NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; }; NetRep = derive2 { name="NetRep"; version="1.0.4"; sha256="1a58wxmjhd2jm5n6bl5l2706fbvfvjksfaal65fy04ssw14nziw8"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo ref RhpcBLASctl statmod]; }; @@ -2152,42 +2278,48 @@ in with self; { NetWeaver = derive2 { name="NetWeaver"; version="0.0.2"; sha256="0wsmz7db8q2fycz6rfbbfs67ccj857y9zs4d80k1gnqazgj5whkn"; depends=[]; }; NetworkChange = derive2 { name="NetworkChange"; version="0.3"; sha256="1brpa6fhmrgafmk1iw19g0pppwxi0ld0nyhx9c0fgnkn9m82isjk"; depends=[abind ggplot2 ggvis LaplacesDemon MASS MCMCpack mvtnorm RColorBrewer Rmpfr]; }; NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.0.1"; sha256="09fqlnpdibf9jr5mw2pzmwi66f6cjz8rmm8jay0cv2bami7jhy2a"; depends=[IsingFit IsingSampler qgraph reshape2]; }; - NetworkInference = derive2 { name="NetworkInference"; version="1.1.1"; sha256="053p7cpzmr2jwrgmdlwvipv5vfhvy52xw0xc51lnd4yiwmv4y5l0"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp]; }; + NetworkDistance = derive2 { name="NetworkDistance"; version="0.1.0"; sha256="0k11crn1wiisw4qrc2yidrhdvscx59skqy4ckxdiykpb1jh5a7s4"; depends=[doParallel foreach igraph Matrix network Rcpp RcppArmadillo Rdpack RSpectra]; }; + NetworkInference = derive2 { name="NetworkInference"; version="1.1.2"; sha256="0lydfkpgsi842fbapnggpngarvqc8arhy4qn13x47myk1mmkkisj"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; }; 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]; }; + NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.0.0"; sha256="1z0l8fdxvyxgajq0j6sx6mvr15sxd45kavy8ywk3hnlwcz1xy7m8"; depends=[corrplot devtools fdrtool graph hypergeo igraph MASS Matrix psych pwr qgraph R_matlab RBGL RColorBrewer]; }; + NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.1"; sha256="1dsjv0vm45skw74x1fz3gd7g6p52ayfwz85bh92j29mfxbnacbnn"; 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]; }; + Nippon = derive2 { name="Nippon"; version="0.6.5"; sha256="187jzqsabg0vfvipbaig6nsdwclk5p3hgkvg0yid2ip8qc5qcmdw"; depends=[maptools sf sp stringr]; }; + NipponMap = derive2 { name="NipponMap"; version="0.1"; sha256="09cvzw32f0kwlwvrv7r6cx2x2jkc2wv843aip8r3iziixmcy7vxq"; depends=[sf tibble]; }; NlcOptim = derive2 { name="NlcOptim"; version="0.5"; sha256="0chrf9ac3x1a0b86lf6wjzdsjcv5n08rav88b7xf4c31lflf1rd1"; depends=[MASS quadprog]; }; NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; }; NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; }; NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; }; NonCompart = derive2 { name="NonCompart"; version="0.3.3"; sha256="0f66p122rdibn8k79wjhvslgankhxk4dq9sfvq0gcabmi1skfqgq"; depends=[]; }; NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; }; - NormPsy = derive2 { name="NormPsy"; version="1.0.5"; sha256="0zhv6p9ffm2g02nr302j3qc6mrk5n4xxznircgbp4jx7hcj7cf1m"; depends=[lcmm]; }; + Nonpareil = derive2 { name="Nonpareil"; version="3.3"; sha256="0bli88salj7mxmnh3b8wims1jlfzlq2lxd4kn2bp2vi58ij9v9pm"; depends=[]; }; + NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; }; 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]; }; + NormalizeMets = derive2 { name="NormalizeMets"; version="0.24"; sha256="0n75swaybsggrawplkncb1vnnyy2imz1b4wy74crdgfg02bzzz2r"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; }; 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=[]; }; + Numero = derive2 { name="Numero"; version="1.0.3"; sha256="1jj269b5cw7w4bgp6qvh0b3kpj32fjpsb2nbhyhjlkf7m03gnwwv"; depends=[Rcpp]; }; OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; }; OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; }; OBRE = derive2 { name="OBRE"; version="0.1-0"; sha256="1sxfb8mn0ky8x177l3v6wwcr96h5hfwd718h1akwrpir7acldchl"; depends=[pracma]; }; - OBsMD = derive2 { name="OBsMD"; version="0.2-0.00"; sha256="16km0v6678lbgh9n2d9nvmpq6k7d2gicc68wnfy4kvn9vmpr79cz"; depends=[Rcpp]; }; + OBsMD = derive2 { name="OBsMD"; version="2.1"; sha256="1w5d23m3nzswin803icw9vsafqcis2lkzr5bnhaa3bl5dq1xn5q5"; depends=[]; }; 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]; }; OData = derive2 { name="OData"; version="0.6"; sha256="10r4kfhdabramjmkgc4fl0bljaiqbvc7rq4byas7q8cmji2czw6f"; depends=[RJSONIO XML]; }; OECD = derive2 { name="OECD"; version="0.2.2"; sha256="07flhhca7734fffcqvxjl1hlhbbhn6lch868rlpps0r99jxy8m5q"; depends=[httr rsdmx xml2]; }; + OGI = derive2 { name="OGI"; version="1.0.0"; sha256="0qw55jamkvdf3vfa5c0ygbymbs4d9q15dihiqz691hdfnyjvc2mk"; depends=[lpSolve]; }; OHPL = derive2 { name="OHPL"; version="1.3"; sha256="0hm229nyv96s3sjljn5rwh89g1n6wsf24qm3ll5ccb0q2pcwnd7r"; depends=[glmnet mvtnorm pls]; }; OIdata = derive2 { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[maps RCurl]; }; OIsurv = derive2 { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[KMsurv survival]; }; OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; }; ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; }; - OOBCurve = derive2 { name="OOBCurve"; version="0.1"; sha256="1dx2lfdpfl0aq1wshjrwa58wz20s57q03pzfj5rv6xyfmm8qhrzw"; depends=[mlr randomForest ranger]; }; - OOR = derive2 { name="OOR"; version="0.1.1"; sha256="09c7c2inpnag3kckrg9lfzxd3giqkj9xm91ibjkgpfv68nf733qc"; depends=[]; }; + OOBCurve = derive2 { name="OOBCurve"; version="0.2"; sha256="1dr2mp2wi2dir1h5w3rw17154byfy3gx02x2kz1r67l9dfgrr505"; depends=[mlr randomForest ranger]; }; + OOR = derive2 { name="OOR"; version="0.1.2"; sha256="1zw7g0365znyn828qqsn83l2a837wwj9cx7dzcbns28vhqmsn6hm"; depends=[]; }; OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; }; OPDOE = derive2 { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; }; - OPI = derive2 { name="OPI"; version="2.5"; sha256="1rdm0zn62i2m9hbnhy1jbj2l0n3a8qckf8iv5hpfkj7xq6zzams7"; depends=[]; }; + OPI = derive2 { name="OPI"; version="2.7"; sha256="0mmk8alpwm4vmq2yr4qkri2zkh4lxfvrp70j0zljinxcynaraqzn"; depends=[]; }; ORCI = derive2 { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; }; ORCME = derive2 { name="ORCME"; version="2.0.2"; sha256="1pm8ajj24qqj2fir0gjzq5f4mfpl1cnj6fm2z5qg6g3sbnm57ayk"; depends=[Iso]; }; ORDER2PARENT = derive2 { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; }; @@ -2195,6 +2327,7 @@ in with self; { ORMDR = derive2 { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; }; 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]; }; + OSTSC = derive2 { name="OSTSC"; version="0.0.1"; sha256="0p92w25xvajsn44rd5hg1m7l9l4m0rpmw175nnqr438432hqh7cc"; depends=[doParallel doSNOW fields foreach MASS]; }; OTE = derive2 { name="OTE"; version="1.0"; sha256="18w483syhs523yfib9sibzmj16bypqxk4sc4771kfr1958h3igai"; depends=[randomForest]; }; OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; }; OTUtable = derive2 { name="OTUtable"; version="1.1.1"; sha256="0mjjfndc67gzkqskcq4sxpr8fwx3lm3wjgapgg64rbj5x4i1w4rp"; depends=[]; }; @@ -2207,45 +2340,50 @@ 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.3"; sha256="0i8vc4lg642pgy934hv1nln91g5s15la0328bbs530fx6c2132dz"; depends=[ggplot2]; }; + OmicsPLS = derive2 { name="OmicsPLS"; version="1.1.0"; sha256="16q226y8wshjdry538w6zk116rip97hr5bfjyz8g960gy40pjn6j"; depends=[ggplot2]; }; + OnAge = derive2 { name="OnAge"; version="1.0.1"; sha256="1zby5sf92c185b5m19jv4ndgbv6mz107nc47zn1d6bijrypzpc20"; depends=[]; }; Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; - OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="0.1.6"; sha256="0whd5vwaqhvv5qmryzh7nh5skc4lv740ziha7vxfpb91ph0mgrz8"; depends=[Rcpp]; }; + OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; }; OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; }; OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; }; + OpVaR = derive2 { name="OpVaR"; version="1.0"; sha256="03bl7z78zgjmpc0mpmcq98zfscj3jja1fiwzx58rw5yk0dhqrhm8"; depends=[actuar evmix goftest MASS ReIns tea truncnorm vcd VineCopula]; }; OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph 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.6"; sha256="0mp79l2yaix4pagvjv41z01arpw2qpx1mzib82vklsbb7g85k1z2"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; }; - OpenML = derive2 { name="OpenML"; version="1.6"; sha256="0khcach9myls6nfqm308nvhv8ylzysg2v3aw8l79ajfmdp83s1am"; 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.17"; sha256="0f7x2d9rgb93rlwhjcr0fhgi7bi8f0hjfp4gg8kq8z64cw668qij"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; + OpenImageR = derive2 { name="OpenImageR"; version="1.0.8"; sha256="1j7p1wrzznrisbzw8j1qsxyyv3zr5hk6q9yxw97y6lrfh3c26ig1"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; }; + OpenML = derive2 { name="OpenML"; version="1.8"; sha256="04m2gi35hykqs4iy3ipvi41cmkv8vg145cpafjrsf98kj7jg4pmv"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; }; + OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; }; + OpenMx = derive2 { name="OpenMx"; version="2.8.3"; sha256="0kz1x3x43jf326x7l8lb7rlnng4r5cp11vrs1pnnxkmbhqzbbwy8"; 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]; }; + OptSig = derive2 { name="OptSig"; version="1.0"; sha256="1jmnxwci4rzlwgnq4zxhkii9j7ch1bymx44hk3qv7ws24k7g87nn"; depends=[pwr]; }; + OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.2"; sha256="0yf3wk0y650cyp5x8jvjr4ncq34phka8z0r9zk9cjn1k0ic2zmjc"; depends=[car clisymbols crayon dplyr e1071 lme4 MASS nnet nortest rpart]; }; OptimaRegion = derive2 { name="OptimaRegion"; version="0.2"; sha256="0xhl7jp2429007jzx305ggfwyx0vh2vxw7l2a7f3c0prklhyqpqc"; depends=[boot DepthProc fields nloptr rsm spam]; }; OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; }; OptimalDesign = derive2 { name="OptimalDesign"; version="0.2"; sha256="1gpcasdbcgqqr1l6f63q4jqva28rpz0cbgs1f4l3bizldd9kf4kh"; depends=[]; }; + OptimalTiming = derive2 { name="OptimalTiming"; version="0.1.0"; sha256="1mchb7wdk1v56la30ivi40aq6zma64lrdb94d64d0s7x67m8315w"; depends=[mstate survival]; }; OptionPricing = derive2 { name="OptionPricing"; version="0.1"; sha256="0j98h3fn29xfv7xyp7av459v56chw99pnvmsbqvrv4g77p60f5q2"; depends=[]; }; OrdFacReg = derive2 { name="OrdFacReg"; version="1.0.6"; sha256="16mavsmp6d8rfmimmp5ynwyzir0gycpg8rhd8cwanlrndyclqlpv"; depends=[eha MASS survival]; }; OrdLogReg = derive2 { name="OrdLogReg"; version="1.1"; sha256="18s75pmz1g3yac2rfl41kj8sfflq298qkijnvqlybgxpq98ickxx"; depends=[LogicReg]; }; OrdMonReg = derive2 { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; }; - OrdNor = derive2 { name="OrdNor"; version="2.0"; sha256="1zr8zzigrbf6r0zz4f0za6my6d67wxqzvmabl36pjxc3sq7jh83j"; depends=[corpcor GenOrd Matrix mvtnorm]; }; + OrdNor = derive2 { name="OrdNor"; version="2.1"; sha256="1s3lhkscr4w36qjq02qlb3pw37naq0k99khr9648qzshhzsfxibl"; depends=[corpcor GenOrd Matrix mvtnorm]; }; OrdinalLogisticBiplot = derive2 { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[MASS mirt NominalLogisticBiplot]; }; OrgMassSpecR = derive2 { name="OrgMassSpecR"; version="0.5-3"; sha256="1dx9d8rb1dfqyhyc26zhfnxiv3rz2ikvs2mwqnsrq3lsjs9dvyc8"; depends=[]; }; OriGen = derive2 { name="OriGen"; version="1.4.3"; sha256="0a7mql87dqxrfx7phgy32hbanfwnjx8x52mj83xf2mgmqhrcikr6"; depends=[ggplot2 maps]; }; OrthoPanels = derive2 { name="OrthoPanels"; version="1.1-0"; sha256="1g78abh9i3x0g34vjqz2ic9330rbgn8k0hgdcrznxgsfnlgnpx9x"; depends=[MASS]; }; - OutbreakTools = derive2 { name="OutbreakTools"; version="0.1-14"; sha256="03bdb7w5nsrjxz5kd5zvgwybgmv2mzsxyzdc7v3kpwi20yfb9ax8"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; }; + OutbreakTools = derive2 { name="OutbreakTools"; version="0.1-16"; sha256="1ffqfr1pwlf53ahbh01ygv3d2d8fl47k9kk61l2h0g4h601swadi"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; }; OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; }; OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; }; - OutliersO3 = derive2 { name="OutliersO3"; version="0.2.1"; sha256="09kq3jhsqxwqsnn8av12jd0qxw0ai1h0f46mib1z0bwwbxg6bf9h"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers rlist robustbase robustX tidyr]; }; + OutliersO3 = derive2 { name="OutliersO3"; version="0.5.4"; sha256="0mbhbgq9qh74gb8x1hapx4pjik3p7jrls3bg7rg1zzddakxibis2"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; }; 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.9"; sha256="1757wpy92hhk1gpzm719kkhh31qkn0a2cbagyn3pnx5vklywfzz1"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; }; + PAC = derive2 { name="PAC"; version="1.0.10"; sha256="0cr34vjd6dr5jkbv1hhd7ln35ih8h62fmz2q8h2plbxaww88zcjf"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; }; PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; }; - PAFit = derive2 { name="PAFit"; version="1.0.0.1"; sha256="12cq692wfvakyhxqjjzcvrwy7yclki7pqn6k507hd44ka3lva3nl"; depends=[igraph magicaxis MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; + PAFit = derive2 { name="PAFit"; version="1.0.0.3"; sha256="0s9zxr9368cf6skskqb2q67jkynzm4s3qp07i0m1zrmn9142hw9z"; depends=[igraph magicaxis mapproj 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]; }; @@ -2258,67 +2396,77 @@ 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=[]; }; + PAmeasures = derive2 { name="PAmeasures"; version="0.1.0"; sha256="0c2pkms06lijly9clxp6zkasqy4zjicdwnvbqwvhp45yavwmkkkj"; depends=[survival]; }; 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=[]; }; + PBIBD = derive2 { name="PBIBD"; version="1.3"; sha256="0zh73bsiwmsqw1vhs2dazndsf0894kfv3vfv88wr4fnh7njysz6r"; 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]; }; + PBNPA = derive2 { name="PBNPA"; version="0.0.2"; sha256="1qyjksm2z1p279aimb3zaaaj4328m5p0cbkqm3qzl87yp5g45vyq"; 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.70.4"; sha256="09kzydgghgmhnna24gpq1hjgw7w9i1lm6nwkj358jsik6fjph73r"; depends=[]; }; - PBSmodelling = derive2 { name="PBSmodelling"; version="2.67.266"; sha256="0ych9k20x0m71gkdrpwv5jnx6pfsk45wwsaaamy32cmnhd3y14sq"; depends=[XML]; }; + PBSmodelling = derive2 { name="PBSmodelling"; version="2.68.6"; sha256="1d5shqvzfyi0fy03wcib2db497nsdw211ahfcvl1kaady1immz2w"; depends=[XML]; }; PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; }; + PCA4you = derive2 { name="PCA4you"; version="1.2.4"; sha256="117wb0h4jqjymm1p90m6vgj713iavrmj035c2gz5nynligvfnm83"; depends=[mixOmics]; }; PCADSC = derive2 { name="PCADSC"; version="0.8.0"; sha256="0pwkmmnsw3c6ch2k5wdc8ig71994pdp79v3a5aa9n9aq55a8c2ir"; depends=[ggplot2 Matrix pander reshape2]; }; - PCAmixdata = derive2 { name="PCAmixdata"; version="3.0"; sha256="03das7hwfhssixz8rzwvawvl8hmvqcbmf6l0rr8v0mmnh26dssxp"; depends=[]; }; + PCAmixdata = derive2 { name="PCAmixdata"; version="3.1"; sha256="0flrsnbchwk06dmkg3vqykp9n4pqs265szn1r10navp8ki3rrmvh"; depends=[]; }; PCDSpline = derive2 { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; }; + PCDimension = derive2 { name="PCDimension"; version="1.1.8"; sha256="1359cmswynv9xqbfb60kh32ifm9wgm20iplkdfzf5v2c4vxd0rmf"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; }; 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=[]; }; + PCMRS = derive2 { name="PCMRS"; version="0.1-1"; sha256="10n4am4qm23aaghf8awv2llcq7392s62yr6mf5h8nf18hfz29wrn"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; }; PCPS = derive2 { name="PCPS"; version="1.0.3"; sha256="1ys3xp1nripy5zkq25byak9k6yf5rdbfnww8j13yc469428ip8q0"; depends=[ape phylobase picante SYNCSA vegan]; }; + PCRedux = derive2 { name="PCRedux"; version="0.2.5-1"; sha256="1p5qmz09ajbm1iypyz5rn9bwzbbx57gc6a0xzrm900dw2r2cf7ph"; depends=[bcp changepoint chipPCR ecp fda_usc FFTrees magrittr MBmca pbapply plotly pracma qpcR robustbase testthat visdat zoo]; }; 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.7"; sha256="00920h0qlw81vwh46inmvm4mdv0dfd8xvqvrj7l038hhmjb7qsjz"; depends=[GPArotation MASS Matrix ThreeWay]; }; PDM = derive2 { name="PDM"; version="0.1"; sha256="1pbdy13ji9c6krgh2r1qgrzmf4hdmrdzylsr71n3hh5jq4n9xg8x"; depends=[jpeg]; }; + PDN = derive2 { name="PDN"; version="0.1.0"; sha256="082ydvwcjc2rs7hlakrkgbbm9c419m408a14a9dgfdwm16yif3jd"; depends=[ggplot2 glmnet network survival]; }; 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]; }; + PEIP = derive2 { name="PEIP"; version="2.2-1"; sha256="0bzynmd7azs33994dlsabxp29lncs1v2njp6iy5l62rwrnxj9y0a"; depends=[bvls fields geigen 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]; }; + PET = derive2 { name="PET"; version="0.5.0"; sha256="0k26lfkb58sdqy5b5kd7dkd7nzhxqh1b8pxyx2bdl0lx50sn94jc"; depends=[adimpro]; }; 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.2"; sha256="1m6511bgml76gb3pc8dgq3i30sci1hnayhmxq62farzdcd4wxnfs"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; + PGRdup = derive2 { name="PGRdup"; version="0.2.3.3"; sha256="1s0v44922zpxl3w9kzn9xzvs5jldg35gjrnlf89f89i3rs59gg98"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; 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="1.1"; sha256="0pc24rvvxzpgrsx7xsj98n5vd462hjggakzwp36qdkib69yyr4bn"; depends=[ARTP snowfall survival xtable]; }; PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; }; PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; - PK = derive2 { name="PK"; version="1.3-3"; sha256="07qxyszj0f7qwrg5ixvciy33mjsfxxi9rk32a1fz46z8wiwfil9i"; depends=[]; }; + PK = derive2 { name="PK"; version="1.3-4"; sha256="1zkjq64p34gzbsbmbdqphssnplzz65wpl486qf4yhawnb4wnkj1v"; depends=[]; }; PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; }; - PKNCA = derive2 { name="PKNCA"; version="0.8.1"; sha256="1by2yp1ngqv06w7dfl7lbb80gnmpid4xg1yhk4zvx8bwss0ggzph"; depends=[digest dplyr lattice nlme plyr tidyr]; }; - PKPDmisc = derive2 { name="PKPDmisc"; version="2.0.0"; sha256="0rn5m5wak6lis5wck2ws934bzy8w65wj1d0l3rz8svfd8agf2ys8"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; }; + PKNCA = derive2 { name="PKNCA"; version="0.8.4"; sha256="013b4d74virwjpxq20m566ya85q31aq6bdgk5fpjrwh5ja6805ka"; depends=[digest dplyr lattice nlme plyr rlang tidyr]; }; + PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.1"; sha256="1p47zdhilprzcwarfmisq7g7znr73wgxns43mn3d7w5sv671mygv"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; }; PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; }; PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; }; PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; }; - PLMIX = derive2 { name="PLMIX"; version="1.0"; sha256="1z59z7ynlfh7cskanj7drvry0fpzl5mq52as8adi2zxp2q8q032p"; depends=[abind combinat foreach FSA rcdd Rcpp]; }; + PLMIX = derive2 { name="PLMIX"; version="2.0"; sha256="1dvlzv3hajdj3cc83kkna7igzppy88dwppap12zaxnh2afwpvv7k"; depends=[abind foreach gtools label_switching MCMCpack rcdd Rcpp]; }; PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; }; PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; }; - PLmixed = derive2 { name="PLmixed"; version="0.1.1"; sha256="1ihhrmhzvbd4mswi227s81wkk42vdps42pnvkaz71p4y9a7d7szf"; depends=[lme4 Matrix numDeriv]; }; + PLmixed = derive2 { name="PLmixed"; version="0.1.2"; sha256="1pi4ivw090lbg983d8wymhk0i97jrzi1nrkrrz3llnafadysh4rh"; depends=[lme4 Matrix numDeriv]; }; PLordprob = derive2 { name="PLordprob"; version="1.0"; sha256="156lvz6vfm68hm32l5nlhq15hfacdla627d6lf8l4g34lwzdh8k8"; depends=[mnormt]; }; PMA = derive2 { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; }; - PMCMR = derive2 { name="PMCMR"; version="4.1"; sha256="0mfms8wvdwcakkgsnrb2wawp07hvlr7s6cvl54kxv7f5fqllw5kc"; depends=[]; }; + PMCMR = derive2 { name="PMCMR"; version="4.2"; sha256="1dqfn68034xkik4xfl8mlqsh7x427f7cwna5axj8gvjcj9l48x8c"; depends=[]; }; + PMCMRplus = derive2 { name="PMCMRplus"; version="1.0.0"; sha256="11sliznixsrrlr0y365hxpg64jfva8l1ilrnkdd32ddy8713sin7"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; + PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.4.0"; sha256="1lr7ycsjp9dimkbxfapl1qpvlvl0771rdipaf26sgi7iabqpz5b4"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; }; 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]; }; + POPdemog = derive2 { name="POPdemog"; version="1.0.3"; sha256="0j83c853ligmw8ag4pb0vj46sfn2w2ynh4wvgkabzs688hxxni8r"; depends=[]; }; POT = derive2 { name="POT"; version="1.1-6"; sha256="08av53rnishk3mhwrb6ydbgc3n9nwi87jlx5vmag3vpiidhn1laj"; depends=[]; }; - POUMM = derive2 { name="POUMM"; version="1.3.2"; sha256="0v7wgswgqikqlhz087qg75026saqd88ml1mxp375m5nab412ng3d"; depends=[adaptMCMC ape coda data_table foreach GGally ggplot2 gsl Rcpp RcppArmadillo]; }; PP = derive2 { name="PP"; version="0.6.1"; sha256="10innn1nhc4zqimd0gww7k3k30jkfkkj89zkddcjqa2sqq5gs3xr"; depends=[Rcpp]; }; + PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; }; + PPCI = derive2 { name="PPCI"; version="0.1.1"; sha256="1f3jmrkszjq6ajbl0kjf5rghiliim96wz53mfrjjvpc6piajs5ym"; depends=[rARPACK]; }; + PPforest = derive2 { name="PPforest"; version="0.1.0"; sha256="1s0g8icyx30sih2xbdihp9xbmygfgd1hs642qdl5559fqshylbzs"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; }; PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; - PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.1"; sha256="02073yxdwns9mnnjvw13ydw1s3vrxl53szcd9jy8ibj78vnm57r3"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; - PRIMME = derive2 { name="PRIMME"; version="2.1-0"; sha256="1sjgy923ppp28qhkvhgv2xmx7b7aqd17g60af1my44ygdsd8c1kw"; depends=[Matrix Rcpp]; }; - PRIMsrc = derive2 { name="PRIMsrc"; version="0.7.4"; sha256="1g373v404zlwpzjamrwjbl472vyczhdz4fx4m6dczinbajysfcl1"; depends=[glmnet Hmisc quantreg superpc survival]; }; + PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.3"; sha256="1x5rcls49jz19y3h98n2k4kypm8mv8p586clhdj62bvp2nl8wg3x"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; + PRIMME = derive2 { name="PRIMME"; version="2.2-0"; sha256="1iwwh871v87fz6j6q9nvfiq8x8nz2v87n52l80a15d5rvvxv2rbi"; depends=[Matrix Rcpp]; }; + PRIMsrc = derive2 { name="PRIMsrc"; version="0.7.5"; sha256="12wfb4p8ra1b8xwq42350cxl2fy9gsrp5m7inyxnh31vplgripy9"; 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]; }; @@ -2327,34 +2475,38 @@ in with self; { 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]; }; + PReMiuM = derive2 { name="PReMiuM"; version="3.1.6"; sha256="14y3c5l050szdm2zh88byzawrfc224j4dr4msc5a5vh10bsa1wd9"; depends=[ald BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; }; + PResiduals = derive2 { name="PResiduals"; version="0.2-5"; sha256="05jk543lv8isbxv24cbzqh80l6xs05lx2k9xzz7s0121vb2yd3v4"; 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.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]; }; PSIMEX = derive2 { name="PSIMEX"; version="1.1"; sha256="0cndzasvg4y49incyd9nfz8y3z88ywbc7xk0zzjir665pv2xn23b"; depends=[knitr MCMCglmm pedigree plotrix]; }; + PSLM2015 = derive2 { name="PSLM2015"; version="0.2.0"; sha256="1f8kzlqil2ac8a9fbj9fhdni2narh2yaaz044mlx7gsv2ns3ai19"; depends=[dplyr ggplot2 magrittr]; }; + PSM = derive2 { name="PSM"; version="0.8-11"; sha256="1p1a8k0c44z75vsh55yni5gxmw6znxw4x1mjbgwj59y1k3pf2aiv"; depends=[deSolve MASS numDeriv ucminf]; }; + PSPManalysis = derive2 { name="PSPManalysis"; version="0.1.1"; sha256="1mbgfblxflk12vr8y70a6avzjz9jh2m0wkmnzg0njgcwaqwvhlpm"; depends=[devtools]; }; PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; }; PSTR = derive2 { name="PSTR"; version="1.1.0"; sha256="1wzbwll5c2qsvngzqycg2zk6dghbr45mk8chj6kzzppmkk7vzj47"; depends=[ggplot2 snowfall tibble]; }; - PSW = derive2 { name="PSW"; version="1.1-1"; sha256="0zrf8daxwxypw2ckr9h9b0xl7m2zbhbssg7bv584m3k3mk6aqwl1"; depends=[gtools Hmisc]; }; + PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; }; PTAk = derive2 { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; }; - PTE = derive2 { name="PTE"; version="1.5"; sha256="1wx90b34yrc2rwg6yh2hiivirp1c1357h276jzjc0kzchkkxv4g2"; depends=[doParallel foreach survival]; }; - PTXQC = derive2 { name="PTXQC"; version="0.90.0"; sha256="1jcx864skn1p9y7v951grm7n8waby8wkqahhnyb2r51qj3zdlilf"; depends=[data_table ggdendro ggplot2 gridExtra gtable kableExtra knitr plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; }; + PTE = derive2 { name="PTE"; version="1.6"; sha256="0y2zqvm2d9minpc22ndq6mar3brbv9k6s1apl19zwpc8h5g3jx5l"; depends=[doParallel foreach survival]; }; + PTXQC = derive2 { name="PTXQC"; version="0.92.3"; sha256="1spkbjji36s2dlhm5b8svpnjmana2jy1ppa0pfgjg7rpsp3369xq"; depends=[data_table ggdendro ggplot2 gridExtra gtable kableExtra knitr plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; }; + PUlasso = derive2 { name="PUlasso"; version="2.2"; sha256="0chk26ll134fqvaqdwdnm49vbvklbrxm0j0qkcydm166p24k8n2z"; depends=[BH Matrix Rcpp RcppEigen]; }; PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; }; PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; }; - PWEALL = derive2 { name="PWEALL"; version="1.1.0"; sha256="0k66wzyvy89zfnsyrgbj5vr4w6c008lw2jlfkrm11l01vvgy7wgf"; depends=[survival]; }; - 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]; }; + PWEALL = derive2 { name="PWEALL"; version="1.2.0"; sha256="0h7azgns88qwgdp41v35v6293xqs2hksbr82p15n754ci2hsvzja"; depends=[survival]; }; + PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.0.16"; sha256="015zqbq9wsg0wc1y5s4x8vc7klkfa928xcl23v732vy28j0jf20h"; depends=[cluster dplyr dygraphs futile_logger ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaSpatialUtils openair png raster RColorBrewer readr reshape2 rgdal 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]; }; + PairedData = derive2 { name="PairedData"; version="1.1.0"; sha256="1wga7cln8gvbvxycbbd859vq6gyjjvmcqvvzqmqdpwcdjf2j47gz"; depends=[ggplot2 gld lattice MASS mvtnorm]; }; PairwiseD = derive2 { name="PairwiseD"; version="0.9.62"; sha256="19qjms99gf7s39nwwgj56n8426d0gw80dipz165sk3km4zb2mcwv"; depends=[openxlsx xlsx]; }; - PakPC2017 = derive2 { name="PakPC2017"; version="0.3.0"; sha256="0cm6yjplc49qkvash9lswf0k6j92m0arwgk51y5xczixhz4xlg2n"; depends=[curl data_table]; }; + PakPC2017 = derive2 { name="PakPC2017"; version="1.0.0"; sha256="196jvhv7pv4pvnnz9izk6icxv3aml26mif0w6g4907izyszf8cal"; depends=[dplyr magrittr]; }; PakPMICS2014Ch = derive2 { name="PakPMICS2014Ch"; version="0.1.0"; sha256="0gjrx34613d9wzal292zfzh8hmkav271fqb0skdxd1f8rs2c79dg"; depends=[data_table]; }; PakPMICS2014HH = derive2 { name="PakPMICS2014HH"; version="0.1.0"; sha256="1n6cyanqafscizgi1xqmc19w59yigxk5mvqinbivpdr7rydhrac6"; depends=[data_table]; }; PakPMICS2014HL = derive2 { name="PakPMICS2014HL"; version="0.1.0"; sha256="18i5p54zmqxph0lkbgz4ahrbmi2jwhjwdca7aqvx9az18ki5c9sx"; depends=[data_table]; }; PakPMICS2014Wm = derive2 { name="PakPMICS2014Wm"; version="0.1.0"; sha256="1sczczk07n91c21iqkxz1j1hixrk6p0c30ggahxbmk1cawqfn4cb"; depends=[data_table]; }; - PanJen = derive2 { name="PanJen"; version="1.4"; sha256="1b5nsacy4bfda4kbvabddkj2mkl709kbbgwgws2p2sj3zxjv554i"; depends=[mgcv]; }; + PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; 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]; }; @@ -2364,10 +2516,11 @@ in with self; { ParamHelpers = derive2 { name="ParamHelpers"; version="1.10"; sha256="0nzsl3hby4dhnp7rw47zjmdrrfsgp5w1ai9fpw3bgc4k5sk9nql0"; depends=[BBmisc checkmate]; }; ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; }; ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; }; + PartCensReg = derive2 { name="PartCensReg"; version="1.39"; sha256="0blzv57cbxqghkz4fc3plvrcw80g0kx17dzmajkfv598m1wm6hc8"; depends=[Matrix optimx ssym]; }; Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="1.0"; sha256="1wwfq0zwf2b2wlq4pwhw92d02f715l7bkc0si7gndk0mp2pibcrx"; depends=[]; }; - PathSelectMP = derive2 { name="PathSelectMP"; version="1.0"; sha256="19gkd7il4whxp1mm4pinlrl8yj09b5sknz8c4g75n2hhh96libns"; depends=[mice MplusAutomation]; }; + PathSelectMP = derive2 { name="PathSelectMP"; version="1.1"; sha256="036b70bpylmibny6dny79f7gdzn78arqgl2hfs031vygw63yyh9b"; 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]; }; + PdPDB = derive2 { name="PdPDB"; version="2.0.1"; sha256="05aqg0rqrnlmvjxa32ms1vywgwhw5zlfkyf2ij0fn06rp8l2z3lv"; depends=[dendextend plyr tseries]; }; 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.08.15"; sha256="1ndf4d4ikcyqi0k51kil2jw777z4c1m4pda3dahrjmjyz0jhrhkw"; depends=[]; }; @@ -2386,14 +2539,15 @@ in with self; { 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]; }; + PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.5.2"; sha256="01bgm57z079g6r505w3bj293zkbd49fwa8sg55z87vizwavipml6"; depends=[quadprog xts zoo]; }; PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.2"; sha256="133rwbvapk99dmh3vi8p7sa81d7hjmy0g4a5hcmwr3mdq8jzgwrj"; depends=[]; }; PermAlgo = derive2 { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; }; PersomicsArray = derive2 { name="PersomicsArray"; version="1.0"; sha256="1d5gxd65b01m13rgbdhk6w3l43vqcbdk0s1pbgc8h6cnipj55z0i"; depends=[jpeg raster stringr tiff]; }; PhViD = derive2 { name="PhViD"; version="1.0.8"; sha256="038pw24sb8ja8pbbmj05rww6413i2ljybb2dxwgrpffv22aqawmc"; depends=[LBE MCMCpack]; }; PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; }; + Phase123 = derive2 { name="Phase123"; version="1.4"; sha256="1iw0xgfsvfzrhcnfxvq6rcwfcycyvc2bbg8d7g2spvvjk7aa4bwd"; depends=[Rcpp RcppArmadillo survival]; }; PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; }; - PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.1.3"; sha256="1gjhrdy3pd9y13akqcfp50h241lvlyxsrzd860jg11x7hgkzhzb1"; depends=[mvtnorm optparse plyr R_utils Rcpp snpStats]; }; + PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.2.0"; sha256="1vnissx2p10w2w435vr2jqw50cs5518l1gpq4pkyyxckcrd300w9"; depends=[data_table dplyr ggplot2 mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; }; 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]; }; @@ -2401,30 +2555,34 @@ in with self; { PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.1.0"; sha256="0ji78zx0gp1nd5assrmwxdkxryfjijnn9g34w2g2qv32s1fdj6ak"; depends=[ape capushe foreach glmnet grplasso 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=[]; }; + PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.1"; sha256="0agy9jp5vbh6cj5mipbmn11m69w4ydz91nprph0jyf1drl92730h"; depends=[Rcpp RcppArmadillo]; }; Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; }; PivotalR = derive2 { name="PivotalR"; version="0.1.18.3"; sha256="14l7y57zmfr7h4bq01j83am2plxx320kkhbsh0x2ypif9dni4rf2"; depends=[Matrix]; }; + PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-2"; sha256="0lzgffw5kbx9psd68r7yigqv8dszjb2xkayxm3rhfs8jv9309yr0"; depends=[igraph MASS Matrix partykit psychotools qvcalc rARPACK sandwich]; }; Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; }; - PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.5.2"; sha256="0bhrz0c134ckfw8b8f0pwa5jkwjy1v7brqcsi6rjdywg0zw2qhxw"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; + PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.6.10"; sha256="1dqc6k7mq9k6g9gndgjm6cf61mgl0liy4qwpzragbhq6lym8hw6w"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; Plasmidprofiler = derive2 { name="Plasmidprofiler"; version="0.1.6"; sha256="10m3knmz0596rm30ncyfprar6l42bjm7r34n4pjz1biqmiz6yz6k"; depends=[ape dplyr gdata ggdendro ggplot2 gridExtra gtable htmlwidgets magrittr plotly plyr RColorBrewer reshape2 stringr]; }; + Plasmode = derive2 { name="Plasmode"; version="0.1.0"; sha256="1qcni9zdckhsnw616jn7rdfd09kbl5wd4hljdja0w73jz1wd1z14"; depends=[arm epiDisplay foreign gbm glm2 lattice latticeExtra lme4 MASS Matrix mgcv nlme nnet RColorBrewer survey survival twang xtable]; }; PlayerRatings = derive2 { name="PlayerRatings"; version="1.0-1"; sha256="0fdk70vfxgmf2hy6j0djbksi5znvilsi74rrbqd0lfhi841j15qj"; depends=[]; }; PlotPrjNetworks = derive2 { name="PlotPrjNetworks"; version="1.0.0"; sha256="13kbyx2phxb3kss6l32f7krf4k5i350indlsmbhav686v0h3nsgp"; depends=[ggplot2 reshape2]; }; PlotRegionHighlighter = derive2 { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; }; PoSI = derive2 { name="PoSI"; version="1.0"; sha256="0c08czjvm09mcnkqnas4l22v22r9akgklnacx1j62smk4m546q2m"; depends=[]; }; PogromcyDanych = derive2 { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca44h8kdf9cd67annw6dxxwiscidzfnjrzqmqa4v6n7rsg"; depends=[dplyr SmarterPoland]; }; 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.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]; }; + PoisBinNonNor = derive2 { name="PoisBinNonNor"; version="1.2"; sha256="0lvbkbpfm4iva7fmxm1hmma20hnbcsrd1jpy1kq3l60lmxk031wi"; depends=[BB corpcor Matrix mvtnorm]; }; + PoisBinOrd = derive2 { name="PoisBinOrd"; version="1.3"; sha256="122z4mqig8hrqlislmazcpjg6q47pmi1pmpw93kyg81016p2gmxi"; depends=[corpcor GenOrd Matrix mvtnorm]; }; + PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.4"; sha256="14xmq1rcx901fd96aivq6m2vrcj8h1p1pxwkfjpn5dh4kqfy7921"; depends=[BB corpcor GenOrd MASS Matrix]; }; + PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.5"; sha256="03jgd2f7wvk7nhpkzrbjx8y4ymwgf53hxbz89ydmjk039flsp6x6"; depends=[corpcor GenOrd Matrix mvtnorm psych]; }; + PoisNonNor = derive2 { name="PoisNonNor"; version="1.5"; sha256="1078lfq8y5gsklmgj0jharqpgw7w0yqhc0l4xvkjhr0ifvigmd0h"; depends=[BB corpcor MASS Matrix]; }; + PoisNor = derive2 { name="PoisNor"; version="1.2"; sha256="0jpndpxajv598lpk2bx0np0yzfh1k903hpdadr4labpbjmr4pfrr"; depends=[corpcor Matrix mvtnorm]; }; PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; PoloniexR = derive2 { name="PoloniexR"; version="0.0.1"; sha256="1qik272z5lmzv9k1kfr5v0m8sydbdhbrc732n1zpwnqc1spfqb20"; depends=[anytime digest httr jsonlite RApiDatetime xts zoo]; }; 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=[]; }; + Polychrome = derive2 { name="Polychrome"; version="1.0.0"; sha256="09yxrwh7a5hgq52jv2d0b0jvwbgm1f1dg6w4vziwdx5cwyny9psl"; depends=[colorspace rgl]; }; + PolynomF = derive2 { name="PolynomF"; version="1.0-1"; sha256="0sr5v43hp1ydy2230vm3mrg4pnnv7nivhnp3zni9svc8g0bd8z8p"; depends=[]; }; + Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; }; + PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; 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]; }; @@ -2435,15 +2593,16 @@ in with self; { PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.4"; sha256="1sfgkwyn7vfy3rqb1cglywiv5xmyxhzvj38vgrvfq5jf3hvzsg21"; depends=[PortfolioEffectHFT rJava]; }; PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.8"; sha256="0y4x0d91j6g52136d921hfs5swzf85gkxafxfkf3c15dl5ns120v"; depends=[ggplot2 rJava zoo]; }; PortfolioOptim = derive2 { name="PortfolioOptim"; version="1.0.3"; sha256="1s9msqjxqxqafhncc3hi5prhzl5cj0incd5rc9fxc23l5l4n9xjx"; depends=[Rglpk]; }; - PottsUtils = derive2 { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; }; + PottsUtils = derive2 { name="PottsUtils"; version="0.3-3"; sha256="165k4sjh3kqkb8bzi68wx00yl77yfbgs70fcbpzmsmcw4g4hdpzn"; depends=[miscF]; }; 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]; }; + Power2Stage = derive2 { name="Power2Stage"; version="0.4-6"; sha256="1fzzvv3c7z9fb63l0wz9i0vd413mfn1dzw19kw7rnldv773lwir1"; depends=[mvtnorm PowerTOST]; }; PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; }; PowerTOST = derive2 { name="PowerTOST"; version="1.4-6"; sha256="0fy9g1zkkxx45pz7axyhv9v9yajfwi19pxcr2bc9dih3j41kazjr"; depends=[cubature mvtnorm TeachingDemos]; }; - PowerUpR = derive2 { name="PowerUpR"; version="0.1.3"; sha256="1znhkyxl8qrs288zf0cr6sxgq6ir029fmilda0k73scc6k1jxz7f"; depends=[nloptr]; }; - PracTools = derive2 { name="PracTools"; version="0.6"; sha256="0y6gqqk2inq96afr50qwv19bwjc0kyvd1jnmacsda2fxgplflzgx"; depends=[]; }; + PowerUpR = derive2 { name="PowerUpR"; version="0.2.3"; sha256="046p4mrw50k1a0m672i2zx5vxfpyggiazp95qz8kx6bnq472ixp2"; depends=[]; }; + PracTools = derive2 { name="PracTools"; version="0.8"; sha256="0hmdsm1ya6fw0f2fv4b85bkr35vlqmjf1sd9jmw1d4izpifv187h"; depends=[]; }; PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; }; PreProcess = derive2 { name="PreProcess"; version="3.1.4"; sha256="0zvy7wx9wfsdcvnjdr1angh0shqwhlm48byc0ymciqlx6xagaw0b"; depends=[oompaBase]; }; + PreciseSums = derive2 { name="PreciseSums"; version="0.1"; sha256="14d42n1wby1srrjyi0yc565g2ldmxy3r3z5bf7ki2x6snj569n0g"; depends=[]; }; PredPsych = derive2 { name="PredPsych"; version="0.3"; sha256="0bqc2vl32z9wzby7ncrab742cajy4w5kq7wv2gh2jjqdnv9nkia7"; 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]; }; @@ -2452,9 +2611,10 @@ in with self; { 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]; }; + ProFit = derive2 { name="ProFit"; version="1.1.1"; sha256="0krnxdf9dddry4a5k1dag43va7lii1ykk0857kk1dfnl56sm3l51"; depends=[celestial fftw FITSio LaplacesDemon magicaxis R2Cuba RColorBrewer Rcpp]; }; + ProFound = derive2 { name="ProFound"; version="1.0.1"; sha256="0ym8ggzm0b8zpfsq8xjjnwa09826gssaqhrqjyq88pwbhzh0y4pl"; depends=[celestial data_table FITSio magicaxis]; }; ProNet = derive2 { name="ProNet"; version="1.0.0"; sha256="10r0gcxv0djrw99nd6a1jrnwvqmidw10ll645gvkp8l39li0107n"; depends=[igraph linkcomm MCL Rcpp]; }; - ProTrackR = derive2 { name="ProTrackR"; version="0.3.4"; sha256="10xwj1d7k1n85hjdwh7q7pkbmcb625y6fzcbyvnplin25v2b03qc"; depends=[audio lattice signal tuneR XML]; }; + ProTrackR = derive2 { name="ProTrackR"; version="0.3.5"; sha256="19ilj03w5jpc1hw5avyb780iy3rdbby3kliym0si2zv6gyi9k541"; depends=[audio lattice signal tuneR XML]; }; 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]; }; @@ -2462,27 +2622,27 @@ in with self; { 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.8"; sha256="0kagahw30m0drlda75hgwbpp7cqrxyf1512ar56qlgm8z73hab3n"; depends=[]; }; - ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.0.4"; sha256="0h11gn09wd2mw3gawc6k6pqjpxldy7i3qdkgck8zqpvkvx5m41a4"; depends=[deldir GeneralizedUmatrix geometry ggplot2 Rcpp shiny shinyjs vegan]; }; + ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.0.6"; sha256="0hx8v18m0wymbjjccy8sm34sqchs9gsf6piyhbs50nm00dqiamv6"; depends=[deldir GeneralizedUmatrix geometry ggplot2 Rcpp shiny shinyjs vegan]; }; ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.0"; sha256="1baf4v9c2pqqmlgxs1jf7fhwqbsw0l1g7rdiia21acxix2j3b7wj"; depends=[]; }; - PropCIs = derive2 { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh6827f5r7gdhajx1iwp5fggdlm808hgq7"; depends=[]; }; - PropClust = derive2 { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[dynamicTreeCut flashClust]; }; + PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; }; + PropClust = derive2 { name="PropClust"; version="1.4-3"; sha256="0k1wn62vlrddzhknyjpizpqxzrgl38frncql3mrlwakkn0kh8l5z"; depends=[dynamicTreeCut flashClust]; }; PropScrRand = derive2 { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; }; ProteinDescriptors = derive2 { name="ProteinDescriptors"; version="0.1.0"; sha256="1ydm8aym1wwxmfh4krh84nmj1wkgb574igg1sywl58l3qlnhya0l"; depends=[]; }; Przewodnik = derive2 { name="Przewodnik"; version="0.16.12"; sha256="1aq80aqflfm1ypqa51h10mc3g0qdr651j6g1b7008k7h0ryq42gv"; depends=[PBImisc PogromcyDanych]; }; PsiHat = derive2 { name="PsiHat"; version="1.0"; sha256="0an71x75j6ih55alxp7kfwi0qf4z3y5bwswrjk01z2w4b9glacqh"; depends=[qvalue]; }; - Pstat = derive2 { name="Pstat"; version="1.0"; sha256="13mm5jk3frl74sm988q8yazm790wlx2npf2cav6h5rb8ck637ffb"; depends=[]; }; + Pstat = derive2 { name="Pstat"; version="1.2"; sha256="17bqkaf9590jhiaamaafmvkqmy2aqkcfqhk8m4w35g58j48yk4yx"; depends=[]; }; PsumtSim = derive2 { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[boot EffectsRelBaseline]; }; PsyControl = derive2 { name="PsyControl"; version="1.0.0.0"; sha256="1c5ml6s3c8kzf7p0mig84bmq40b0491ah713bm6jpy2s3nwnmafs"; depends=[irtoys ltm]; }; - PtProcess = derive2 { name="PtProcess"; version="3.3-12"; sha256="14d39xxgkqnqq79v9sp6g9csj2rp6pix2hzg9acjdmw1xyadn71h"; depends=[]; }; + PtProcess = derive2 { name="PtProcess"; version="3.3-13"; sha256="0vk1n7hk6v592fi5ld70db6m92zgpjx97axs5h8p53c29984qhwz"; depends=[]; }; PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; }; - PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.4"; sha256="04gc0vypmdrls967idhvzkwbm374awr2wkg6dsbkizjahf2n3v0p"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; }; + PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.5"; sha256="0vpd48daamd9q3mdr59sx7zj86qcq2yx8bnrzblyx0ryqx6jnq8m"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; }; + Publish = derive2 { name="Publish"; version="2017.10.24"; sha256="14zbbchff4mjvsxs9c2bypqdsfbnnl6lvr0k5v50wkd00avnv9s7"; depends=[data_table lava multcomp prodlim survival]; }; 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.6"; sha256="1f518s990i23yiddkp2d756864nfkk6zadrl373ibqlgl3ahp74b"; depends=[fastdigest lpSolve shiny venn]; }; - QCAGUI = derive2 { name="QCAGUI"; version="2.5"; sha256="1v15rd5wmdx1zdssklbchw71cr9v1mjp1mfkv5kg2xa3hp0x2hz9"; depends=[QCA]; }; + PwrGSD = derive2 { name="PwrGSD"; version="2.2"; sha256="0z42l7vb3yya59g9rymypfzjbbs5zkknwgcl710rqa64l421sp8z"; depends=[survival]; }; + PythonInR = derive2 { name="PythonInR"; version="0.1-4"; sha256="0krr5k0y9rggzq8f74nc6pyf47g8va1lvva31vc774hbb0rmr7gf"; depends=[pack R6]; }; + QCA = derive2 { name="QCA"; version="3.1"; sha256="1nfwfv19rjqba28kmz9yk78zaq9jiiap8yhr0qcpf41q7381sn7q"; depends=[fastdigest shiny venn]; }; QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; }; - QCApro = derive2 { name="QCApro"; version="1.1-1"; sha256="0rp1mcgp21m4wi301kwb7vzilb4z0pq78h9wavkpyxnq0ch6hnlh"; depends=[lpSolve]; }; + QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; }; QCAtools = derive2 { name="QCAtools"; version="0.2.3"; sha256="1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2"; depends=[directlabels ggplot2 QCA stringr]; }; QCEWAS = derive2 { name="QCEWAS"; version="1.1-0"; sha256="0snqg1q9848g8gmxxlz1fhw4cnfxwp28qkfyrpc0yzmkswvysx6v"; depends=[]; }; QCGWAS = derive2 { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; }; @@ -2490,10 +2650,9 @@ in with self; { QCSimulator = derive2 { name="QCSimulator"; version="0.0.1"; sha256="1ff7xagnzibhrwrmkqyky4ik3kx7rrlajrs1ypm210sl1d73jwvs"; depends=[ggplot2]; }; 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]; }; + QGglmm = derive2 { name="QGglmm"; version="0.6.0"; sha256="1n53qba6y1hcxg1ry8bp41mgcycckli9q2syippvd7xdlq3srhqd"; depends=[mvtnorm R2Cuba]; }; QICD = derive2 { name="QICD"; version="1.2.0"; sha256="0ppyl978y7md2n9m4kwhbrgdr5i3df0yw124x84f53w4acipgz5q"; depends=[]; }; QLearning = derive2 { name="QLearning"; version="0.1.1"; sha256="1bx77yxsnzh0ny3ghala5fw54lxzrxqk9s32qk3dzvfbyp4paggn"; depends=[]; }; - QNB = derive2 { name="QNB"; version="1.1.10"; sha256="12lb0kayndq8gipf457qvk0g9ar0ywaspbffi7s3hvh98gmlzws6"; depends=[exomePeak GenomicFeatures locfit Rsamtools]; }; 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=[]; }; @@ -2502,7 +2661,7 @@ in with self; { QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; }; QRegVCM = derive2 { name="QRegVCM"; version="1.1"; sha256="01dhc0r1nialwv7dp2108znyc3ip1hswkcbpf3kmabxxj5y4vyvx"; depends=[quantreg SparseM truncSP]; }; QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; - QTLRel = derive2 { name="QTLRel"; version="0.2-17"; sha256="0csn7xijzdw9wnsd7ilm3fjn2zrv87i8dqwvkm9d7qs5ssxsi44v"; depends=[gdata lattice]; }; + QTLRel = derive2 { name="QTLRel"; version="1.0"; sha256="0hlnh04w45imf0f7rm9pg1whlps5zxh00qvvn81hip16bv48cw79"; 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-6"; sha256="1vgqwv3rbnmz2sgbmbivgnxcwy5dzgk6ivqskdnqkil4f10zflmi"; depends=[Matrix]; }; @@ -2511,26 +2670,27 @@ in with self; { 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]; }; + QuantNorm = derive2 { name="QuantNorm"; version="1.0.3"; sha256="1kc8qfa5fwdmk4nfzlkd22968zn44ggr65ysm1l31bhbgjh59ly3"; depends=[]; }; QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; QuantTools = derive2 { name="QuantTools"; version="0.5.6"; sha256="0ykfxrg4chq4n24spfj2v6cqiw5y7wps2rmnd0150fa6fqk7nd2k"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; }; QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; }; QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; }; - QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.4"; sha256="1dqibl4rnf1qbk44srh8ndka0ni7a463hlpf7sdpgx2b57414jkd"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; }; - QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-1"; sha256="05d47cc632sgi0bjwx408dq0nx7ylkf3l6ln4bf191l40hr1r4j7"; depends=[edgeR mgcv pracma uniqueAtomMat]; }; - R_cache = derive2 { name="R.cache"; version="0.12.0"; sha256="006x52w9r8phw5hgqmyp0bz8z42vn8p5yibibnzi1sfa1xlw8iyx"; depends=[digest R_methodsS3 R_oo R_utils]; }; + QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; }; + R_cache = derive2 { name="R.cache"; version="0.13.0"; sha256="1hf5cb7xvnca5zlh9245b5g62sgsaxwdhiv7x59yld37cydakm6k"; 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]; }; + R_filesets = derive2 { name="R.filesets"; version="2.12.0"; sha256="16djdiwl4rpyhc75q2dpyfpzf2gwqkg9rbk99fbx69my1if0vs7w"; depends=[digest future_apply R_cache R_methodsS3 R_oo R_utils]; }; R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; }; 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.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]; }; + R_rsp = derive2 { name="R.rsp"; version="0.42.0"; sha256="1zcq0hzi0j7fvj2rs796a1i120wbr0387vck17rrd644awwbsbm0"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; }; + R_utils = derive2 { name="R.utils"; version="2.6.0"; sha256="03j7hrs03kyj9qrjxyp5kqv4lpqqpk6xwbkzx6j15d8928yrjr2x"; 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=[]; }; - R2BayesX = derive2 { name="R2BayesX"; version="1.1-0"; sha256="043hrznc16j6mkr3h9vjvi9yn6xn497xz5pjp53ks48pzz54jp9p"; depends=[BayesXsrc colorspace mgcv]; }; + R2BayesX = derive2 { name="R2BayesX"; version="1.1-1"; sha256="1ff8cscl839ykp7l34sscc8zqp516mh64igk7dfv9n02l40w8ypf"; depends=[BayesXsrc colorspace mgcv]; }; R2Cuba = derive2 { name="R2Cuba"; version="1.1-0"; sha256="1zmlsambajzxkc9dawlqb0png8s502hwblq0vyhqgc08yf29b43w"; depends=[]; }; R2DGC = derive2 { name="R2DGC"; version="1.0.3"; sha256="0f84fmpf3m2s2p6bllvjs8rgnhwjy54adblv02dq8gakwvb4j2aw"; depends=[]; }; + R2DT = derive2 { name="R2DT"; version="0.1"; sha256="0zydrdx6xdlacq6s01jwv4rv6ydmbwmiif40rilp8h76bim0kdbr"; depends=[data_table devFunc plyr]; }; 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=[]; }; @@ -2539,14 +2699,13 @@ in with self; { 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-2"; sha256="1f7bj2jqm7ys3rimgpsn252j39mw0xd008p3zqi77x1flisla0z3"; 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]; }; + R2admb = derive2 { name="R2admb"; version="0.7.16"; sha256="0s8p82avxdp5zmkz7amvnphn3lcyhha31mbjghibnhm9g16k0b84"; 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.2"; sha256="13xfdr19ca7ymisidsanm6w7hsk3qmy5l8c0mlz3nk48f7s5cxq8"; depends=[]; }; - R6Frame = derive2 { name="R6Frame"; version="0.1.0"; sha256="0ib0van2qk0p89qmii8naj1jx56i6j7srvydzm41pyq2xdg0bmga"; depends=[data_table lazyeval R6]; }; RAC = derive2 { name="RAC"; version="1.1.1"; sha256="0ybyjjpw8f4wbdhkhbnjg8wy82ibxsywyjrsi406l2knnkx0mvmg"; depends=[matrixStats plotrix rstudioapi]; }; RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; }; RADami = derive2 { name="RADami"; version="1.1-2"; sha256="1k4g58r64i19j8wj3d202283bnwaxf19l7ckiz29dlw4zidx6mvz"; depends=[ape Biostrings geiger hierfstat IRanges phangorn]; }; @@ -2560,44 +2719,50 @@ in with self; { 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]; }; - RATest = derive2 { name="RATest"; version="0.1.0"; sha256="1pi082iydl6k6l78gpvff5hfk4y7fr82vnhnp28dw215hi0x3891"; depends=[ggplot2 gridExtra quantreg]; }; - RAdwords = derive2 { name="RAdwords"; version="0.1.13"; sha256="0zpryvrrbmwd5mnn2wifbfmy26kmf6rpjsqvif8s17sjqqyh7ynj"; depends=[RCurl rjson]; }; + RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; }; + RATest = derive2 { name="RATest"; version="0.1.2"; sha256="0cxb82kzmywgslf6hfjl6v015s64jh483bzxnhph420mcp3ysbfk"; depends=[ggplot2 gridExtra quantreg]; }; + RAdwords = derive2 { name="RAdwords"; version="0.1.15"; sha256="0f0j5fllkxwa63gpwgaks0sbsq9a68jw6g9djydq4c3jfzw1sqyl"; 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.1.0"; sha256="09zhx06m7513w4srxkv0bmskm21m33zd28mscgzgma4ifbyxr55h"; depends=[data_table ggplot2 httr plotly rjson]; }; + RBMRB = derive2 { name="RBMRB"; version="2.1.2"; sha256="1m6n2kfg83mlfy22k75hy5zjf547v0rdwk9w6l04yfyrr6himbr8"; depends=[data_table ggplot2 httr plotly rjson]; }; RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; - RBesT = derive2 { name="RBesT"; version="1.2-3"; sha256="1d6m3r8amcw9rvivzgxgvsqjxq3xq78z2s29f20r6dxfl7wl7d99"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 lme4 mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; + RBesT = derive2 { name="RBesT"; version="1.3-3"; sha256="0pink9jza2pfm1vqmzgp0pcyg9a4ak4c9igcxj692np82mv8hi0j"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 lme4 mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; }; - 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]; }; + RCPmod = derive2 { name="RCPmod"; version="2.186"; sha256="0qxk6236xq391czyr043wn8rfml70gkc0xa6vz24s768gxmdk46l"; depends=[fishMod glmnet gtools MASS]; }; + RCRnorm = derive2 { name="RCRnorm"; version="0.0.2"; sha256="1mz1jb7mc9c47hbk9flnddny4zir6r2k5qis30iynwqny521l6ln"; depends=[truncnorm]; }; RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; }; RChronoModel = derive2 { name="RChronoModel"; version="0.4"; sha256="0haqxwic160pnnm90bgchzxmsdwmi6m97i9xrh8js8bp2xn76l5f"; depends=[hdrcde]; }; RCircos = derive2 { name="RCircos"; version="1.2.0"; sha256="0jj4jj9qnj7pils99hzw9yx5bwi182q4afdsqh7w7d9kzhp6xl3z"; depends=[]; }; + RClickhouse = derive2 { name="RClickhouse"; version="0.4.0"; sha256="0lb0sgs2f78y2z5ip2wqml88vykrwkdhn3i36y9hyrm34ackis6h"; depends=[DBI dbplyr dplyr Rcpp yaml]; }; RClimMAWGEN = derive2 { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; }; RClone = derive2 { name="RClone"; version="1.0.2"; sha256="1kv02acj0mk5102wvmdnxnkb7qig3jb9amcs4k2r26fpa4hyfa7f"; depends=[]; }; 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]; }; - RCurl = derive2 { name="RCurl"; version="1.95-4.8"; sha256="1yrbm8sypizy18qxkl6534fk2gf2ijxhahw6qldk9v5v3cjl68p7"; depends=[bitops]; }; + RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; }; + RCurl = derive2 { name="RCurl"; version="1.95-4.10"; sha256="02pyh6kvsfbwgccf8v77aa3ky21kps1rpgaii20wmridrgqj90vg"; depends=[bitops]; }; + RCzechia = derive2 { name="RCzechia"; version="1.1.1"; sha256="070k93aj694jyvjmr5rbdzkdmi1sx69fild06dqf8idrkh3i2a55"; depends=[httr]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; RDML = derive2 { name="RDML"; version="0.9-9"; sha256="0amlr7mxp7175a7rd3jw7lhyvp3lnr01y81l27sl148sfb85zar6"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; - RDS = derive2 { name="RDS"; version="0.8-0"; sha256="1waqrnr3hlr1zyvs8qh14dmq8ax2nghnkvz6gs32dbvlirl7zmxk"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales]; }; + RDS = derive2 { name="RDS"; version="0.8-1"; sha256="18xn0ci35xs2myzj8rny6pp08cn8ljl3l4fdgaqp05fphgb5fh8j"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network 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=[]; }; RDataCanvas = derive2 { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; }; RDieHarder = derive2 { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; }; + RDocumentation = derive2 { name="RDocumentation"; version="0.8.2"; sha256="0qdn3c5xbjyrhk56wfch50xpyyfd4f79hs0v00cqk9iwsnjlwmb5"; depends=[httr proto rjson]; }; RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; }; REAT = derive2 { name="REAT"; version="1.3.2"; sha256="1vp103jwq6zf3w6bn3xvbh4zcgsdrwiycp23ab8mj42axk8pw5li"; depends=[]; }; - REBayes = derive2 { name="REBayes"; version="0.85"; sha256="0r8fd43qrwfg38sg2xchl4p2lhyfwbaqbr0xs2zln720s6zcwgi6"; depends=[Matrix reliaR Rmosek]; }; + REBayes = derive2 { name="REBayes"; version="1.3"; sha256="0byd7587vddffplzp8kc2aakab61pck2r25rajxfn0rsvl5yvxyx"; depends=[Matrix reliaR Rmosek]; }; RECA = derive2 { name="RECA"; version="1.3"; sha256="1v9ff2inxwpq91pjl6g9bpl9nmlyryp030g6abydikkhkcq3n74b"; depends=[]; }; 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=[]; }; + REIDS = derive2 { name="REIDS"; version="0.0.1"; sha256="1pzbwmbz2agqlj28qpm7msahnk5viih5bqkimq3j8wp2pp580gwz"; depends=[aroma_affymetrix aroma_core data_table lmtest MCMCpack RColorBrewer]; }; REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; }; REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; }; REQS = derive2 { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; }; @@ -2605,11 +2770,11 @@ 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.2"; sha256="0ghr2iww4fiwah2aalk3fbn90wgx2r5mdkvn37kpbg2q9prvcmwd"; depends=[AER corpcor e1071 gmm lme4 lmtest Matrix mvtnorm optimx plyr sandwich]; }; + REddyProc = derive2 { name="REddyProc"; version="1.1.3"; sha256="1ixc3bdsqy1mavzpbgw9sxlbnkrmy7sbb7wizh5133gi4p2f2bdh"; depends=[dplyr logitnorm mlegp purrr Rcpp rlang tibble]; }; + REndo = derive2 { name="REndo"; version="1.3"; sha256="02hk2azmhdbr28vf8fglljiccij0284ypjzkk9yh23rw7pnbdk4g"; depends=[AER corpcor data_table 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.4-3"; sha256="04nm672pfrlqywhdpw0yrylwk3gqjfhxfdghf6af27ry6m3rjpcd"; depends=[GEOmap MASS RPMG RSEIS splancs]; }; - RFc = derive2 { name="RFc"; version="0.1-2"; sha256="0zqnx9hbwp6j4y4r6mndgm95px07if93mpdmp3ls5kh4pnj2n6ff"; depends=[httr jsonlite sp]; }; + RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; }; 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]; }; RFinfer = derive2 { name="RFinfer"; version="0.2.0"; sha256="1cgdrg7gm8hdaaycipn8wjx7s4652jyy664n1my9qynmc56qib4n"; depends=[Matrix party pbapply randomForest]; }; @@ -2618,52 +2783,52 @@ 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-7"; sha256="1amyf43jmm1zh04kj7w98v4iim5zw8zq0p851xjb9lvdkwhvpdfy"; depends=[doParallel foreach plyr]; }; + RGBM = derive2 { name="RGBM"; version="1.0-8"; sha256="0xd64g07y808nzs4zvbx6bxdpbj2ndqg6yzc3p0l43pxm4hyxva0"; 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]; }; + RGF = derive2 { name="RGF"; version="1.0.1"; sha256="1kj67sc10khzl9xxk8ss366hcnmqiad0ap1xsc738ya6bv4xrr5w"; depends=[Matrix R6 reticulate]; }; RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; RGeode = derive2 { name="RGeode"; version="0.1.0"; sha256="1g8ha6zg4pvi8qimiihsa6rjfdcyj0q526l44jajjbqczmwg59lv"; depends=[MASS Rcpp]; }; 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.3.1"; sha256="0g4r5vb9zv6mqym1mh028ic9hkmlpklrhq4ks5sys7y60ps893k1"; depends=[bit64 httr jsonlite RCurl]; }; - RGraphM = derive2 { name="RGraphM"; version="0.1.11"; sha256="0fj1ww4q3gl707id2qv4c2aw9cdbnhxxi6x6a72r3d0bbb0yl8l9"; depends=[Rcpp RcppGSL]; }; RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; }; - RGtk2 = derive2 { name="RGtk2"; version="2.20.33"; sha256="0d5r0lrkk1ixhln94pm6d5d88bqs0h8p2sdczb7r7ah007ffmhic"; depends=[]; }; + RGtk2 = derive2 { name="RGtk2"; version="2.20.34"; sha256="1yhdcd7f987bdd2y08dcx95i1hbfakgd8v1c606jxwr2dclyhx70"; 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.3"; sha256="0pp67p8i6nsh9nvxsd1m453735s0whlril8l640m888zl6a3463j"; 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=[]; }; + RHawkes = derive2 { name="RHawkes"; version="0.0"; sha256="0qi32f6im6fsgvjs8bravc5z21557zn2d0a7i88dy0rri7czm5p7"; depends=[IHSEP]; }; RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; }; - RIA = derive2 { name="RIA"; version="1.2.0"; sha256="0fyp1rz8xwq8jvp208yp4kx6v7jxcnj8dm923ii9jciy25q4i20i"; depends=[oro_dicom]; }; + RIA = derive2 { name="RIA"; version="1.3.0"; sha256="0wz2c770faravsmlp3ivbw136x82l1i14ilikrdn7cn49bz0r5mh"; depends=[oro_dicom]; }; RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; 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=[]; }; + RInSp = derive2 { name="RInSp"; version="1.2.3"; sha256="1nm29q2gysway4r7rdjr08m0w8lh2m9akhjh7swgjwrg4f15kfmy"; depends=[]; }; RInside = derive2 { name="RInside"; version="0.2.14"; sha256="1ks9hs78s2vgdp9nfpzwifkqnh3vnaqwand51yh9r1zyjc4k9rcd"; depends=[Rcpp]; }; RItools = derive2 { name="RItools"; version="0.1-15"; sha256="0f7g0w8bnbxryll48rnn7blgskgcdqqx9xv4fqmwcbkbasjz37va"; depends=[abind SparseM survival svd xtable]; }; - RJDBC = derive2 { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; }; - RJSDMX = derive2 { name="RJSDMX"; version="1.7"; sha256="13qd1ynxyyxsz11aiiqv47wlbygs5z3vsyw53fbcrcq4r34y4zx4"; depends=[rJava zoo]; }; + RJDBC = derive2 { name="RJDBC"; version="0.2-7"; sha256="0db2s3qkkv16a4xskym8q3lv5s5jscwd5hh1pgl9bndb91wm9qj7"; depends=[DBI rJava]; }; + RJSDMX = derive2 { name="RJSDMX"; version="1.9-3"; sha256="0myjhimx1p8ndyk60qgaw6csq58s4rxr67hgx9a5i1swsmlkwciz"; depends=[rJava zoo]; }; RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; }; - RJSplot = derive2 { name="RJSplot"; version="2.3"; sha256="0wswfdr8ml0wrnspdkp2s8kqimq2pgkkyr86zw0p8m5brzm6cr27"; depends=[]; }; + RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; 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]; }; + RJafroc = derive2 { name="RJafroc"; version="1.0.1"; sha256="16a8j4bw754ci8mxfhh3c3y5g53f2hr1l1mh05xw31asqcxzafrm"; depends=[bbmle binom caTools ggplot2 mvtnorm numDeriv Rcpp stringr xlsx]; }; RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; }; - RKEAjars = derive2 { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; }; + RKEAjars = derive2 { name="RKEAjars"; version="5.0-3"; sha256="0sm7dkdprmqh319jc43ra7qbk4qq0b2kdj9zs9mjcjz58gcrkl7s"; depends=[rJava]; }; RKEEL = derive2 { name="RKEEL"; version="1.1.22"; sha256="1k0xdy23za38lmav7hh9zchy9x61nkdm34s3cqrclzhf4nnlndfi"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; }; RKEELdata = derive2 { name="RKEELdata"; version="1.0.3"; sha256="1imz5qsr04hkhblivax30jlvbvjxya6h0z9x7s0llgqssfxbawpy"; depends=[]; }; 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=[]; }; + RLT = derive2 { name="RLT"; version="3.2.1"; sha256="14im1lvsfpl1vlhc3fmmi4vq41br48mlgqqnwnj0qqxawzzs5738"; depends=[]; }; RLeafAngle = derive2 { name="RLeafAngle"; version="1.0"; sha256="1anks22hn6qpac556p99kilkhc80h572dvcyz3wj1nqffdrhgrh3"; depends=[]; }; RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; }; - RLumModel = derive2 { name="RLumModel"; version="0.2.1"; sha256="1v2a2rrk9x0s3f62jg1v919ilia4r8h3n732rid3hbpmpky1iha0"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; }; + RLumModel = derive2 { name="RLumModel"; version="0.2.3"; sha256="059nqbvy13jjgzhp4n9afqkc3dbv06aml5v5ffkhpx8kcmv48xp1"; 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]; }; @@ -2676,27 +2841,29 @@ in with self; { RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; }; RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; }; + RMariaDB = derive2 { name="RMariaDB"; version="1.0-4"; sha256="0xzy1af1w0cjym48zlgdsngksp8j90b0197v78s5jkm1vxmr0ada"; depends=[BH bit64 DBI hms plogr Rcpp]; }; RMark = derive2 { name="RMark"; version="2.2.4"; sha256="1vns8bl3fnk6hkwmm0wl2c6lgyv3vabsk07kkxrxrl1nzy11wj3a"; depends=[coda matrixcalc msm]; }; 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]; }; + RMixpanel = derive2 { name="RMixpanel"; version="0.6-3"; sha256="025fg36jwq44y5m7msmjql3m0avc0hl0iw49wap0fvmzy5qn24qq"; depends=[base64enc jsonlite RCurl uuid]; }; RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; }; - RMySQL = derive2 { name="RMySQL"; version="0.10.13"; sha256="1j0vr2l4s02cg2hzgr3pla96pjj4h85sxw28lidy58rg5awnsf82"; depends=[DBI]; }; - RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.1"; sha256="145wp9wz2ir1ni36zrp53qzpdh4vz5j0f9h27w1vljrll6v0mwck"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; + RMySQL = derive2 { name="RMySQL"; version="0.10.14"; sha256="01891kn263b02y6addgpy3gn5axg7m10bqbqv7dg9yx9k85am590"; depends=[DBI]; }; + RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.2"; sha256="07wk0i8iz3cvkiqawxhm61g3nka8adw0zrrv60zx329gg49w0ycl"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; RNAsmc = derive2 { name="RNAsmc"; version="0.1.0"; sha256="02r8y43hrhjyhmim2yf7s4c46q8ys6b8qla9vwjqpmx5104v5v5g"; depends=[RRNA]; }; 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]; }; + RNOmni = derive2 { name="RNOmni"; version="0.1.5"; sha256="1lahwala3j0rcxdq1aswngqp89d4za167nrmsbj1lqscd7bn6qkd"; depends=[abind foreach mvtnorm RcppEigen]; }; RNRCS = derive2 { name="RNRCS"; version="0.2.0"; sha256="1wg7ld6g94wby5lagf68h19qgx2mf0pc8rfvmnz4fac7xpdsg9s8"; depends=[ggplot2 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=[]; }; + RNeXML = derive2 { name="RNeXML"; version="2.0.8"; sha256="0ikdv60nkhiv70x1crd21xd92iq2gshj6248m896v1l276513g5j"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; }; + RNentropy = derive2 { name="RNentropy"; version="1.2.0"; sha256="19zbjy2xrrsz674qhi6dfzppsgfdy9hp93bqj14p1w3z6smh0k8c"; depends=[]; }; + RNetCDF = derive2 { name="RNetCDF"; version="1.9-1"; sha256="0idfskxb1k8x0zzl6b0kgskdxn7zr49gw9xcj870ah9zp93iwnkx"; depends=[]; }; 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.7.1"; sha256="0ysr967qqid84vh6q13z045lqpi15d4pmicx59qmvfpsdpy0dz6w"; depends=[Rcpp]; }; - RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.0"; sha256="0a820m1f4j8d6xwpkmk1n6g73zycrygrxzs3c4fx09kfsbc0v0rk"; depends=[ore Rcpp RcppEigen RNifti]; }; + RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.1"; sha256="07ibpdh2z01jh9nmhs7lcz630fdq6lwal6w58np3axgcd91ch1mj"; 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]; }; @@ -2707,71 +2874,75 @@ in with self; { RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; RODBCext = derive2 { name="RODBCext"; version="0.3.1"; sha256="06ky97k93bbrlxm4fg770mnz6yqp2zzgwmvzdqrpanfbg7qkfwwn"; depends=[RODBC]; }; RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; }; - ROI = derive2 { name="ROI"; version="0.2-6"; sha256="0ajr9yclp0wjrjmway6wnj4pgczgphgnk4yxnvmqxia6s923bzap"; depends=[registry slam]; }; + ROI = derive2 { name="ROI"; version="0.3-1"; sha256="00mi22z7gs77pixi4090l5wh67s2pfm45cf3bmy7p3c3nlim24fp"; depends=[registry slam]; }; + ROI_models_globalOptTests = derive2 { name="ROI.models.globalOptTests"; version="1.1"; sha256="0cr4iy4p590zsp47jqyrvhamc4xa9nkpnnddmwqbkgvzmzxf83ap"; depends=[globalOptTests ROI]; }; 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_alabama = derive2 { name="ROI.plugin.alabama"; version="0.2-5"; sha256="0hd5v0n9pa3a02hhlknj4xa2h1y4p8132i6wky7v5h2gls6prqwl"; depends=[alabama ROI]; }; + ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="0.3-0"; sha256="0k012kv29hxw61iy1r06h70aiiqxrpmv62i4va80vmdfa2zr8zjg"; depends=[alabama ROI]; }; ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.4"; sha256="0fzrb4q2mcf3j4d4j8r354n6fyv2rik0ypp01l54zbm8s2r29bwb"; 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_cplex = derive2 { name="ROI.plugin.cplex"; version="0.3-0"; sha256="1ipwvclrxws7nvirvns58gpakg23ldiphyl6g0akxk5hczr0lazf"; depends=[Rcplex ROI slam]; }; + ROI_plugin_deoptim = derive2 { name="ROI.plugin.deoptim"; version="0.3-0"; sha256="15b5151xmwmmqgiwj4sy1agc9abk8dd2q95lva3ilkjj2j8y0zrh"; depends=[DEoptim DEoptimR ROI]; }; + ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="0.3-0"; sha256="1b5lbnynzkfj9wys8v8ly6g0fijk9vs6kk4pzgfp6pladdq3y35v"; depends=[ECOSolveR Matrix ROI slam]; }; + ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="0.3-0"; sha256="1a1vag47lfhiqmplrbkp95k36angpi9nvh0jd4cgy5y2416w22hn"; 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_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.3-1"; sha256="0i1skxk88s8cgxbr2hl5z8h88aqchrfs3206dfb92libw3yi1vas"; depends=[lpSolveAPI ROI]; }; + ROI_plugin_msbinlp = derive2 { name="ROI.plugin.msbinlp"; version="0.3-0"; sha256="00zvjqq2sj7iaymc0lrf5lmqfbqilwh8llmq841lvsmbps45w41k"; depends=[ROI slam]; }; + ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.3-0"; sha256="0niq0q08033vcm59wflilii7lciqixcpf13a93hgdaypdca8lxcw"; depends=[nloptr ROI]; }; + ROI_plugin_optimx = derive2 { name="ROI.plugin.optimx"; version="0.3-0"; sha256="0hwjgwmaclq6y5mfmykjrchpyb632qzwcvvs1nnanmrh3yhfmpg9"; 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_scs = derive2 { name="ROI.plugin.scs"; version="0.3-0"; sha256="0krlrmw85j1g35pvh4ig10djb6y6akyrfymkfk4dqg751w7mb4fm"; 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]; }; + ROlogit = derive2 { name="ROlogit"; version="0.1.1"; sha256="1bmhq3vcrfxl7flr28x5yhk8akfv59c0xs10s73dchf1qqjfz5ld"; depends=[evd survival]; }; 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.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]; }; - ROptSpace = derive2 { name="ROptSpace"; version="0.1.1"; sha256="01n99hsph4p4hvh9wimh7p3g38ww1bcdh6v4rd1hj18964v166a2"; depends=[]; }; + ROptSpace = derive2 { name="ROptSpace"; version="0.1.2"; sha256="0g5v4kf5kkylc3agizv2r534dnbgkjap1x146hdgl4jx2ggddnfk"; depends=[Rdpack]; }; ROptimizely = derive2 { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; }; ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; }; RPANDA = derive2 { name="RPANDA"; version="1.3"; sha256="0rah5l5nfjs65zxgsgsy3q3vaph6qkr7p41x3arfhjsyma96p0zn"; depends=[ape BioGeoBEARS cluster corpcor deSolve fpc igraph mvMORPH mvtnorm phytools picante pspline pvclust TESS]; }; RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.1"; sha256="0m5ml8ywxrf66mjz6m3xp1lajd7wdq9g7xsaln8n7ykq7h5615fc"; depends=[]; }; - RPEnsemble = derive2 { name="RPEnsemble"; version="0.3"; sha256="052c9cnsrjxbk2yxj08psy3nw0mq3mdr75fhnxpz64n4cqzxbr2q"; depends=[class distr MASS]; }; - RPMG = derive2 { name="RPMG"; version="2.2-1"; sha256="03gqam7lp6ycrwm30gdwh2irqkcviwzk74ysyxff7b23ng4jkz1j"; depends=[]; }; + RPEnsemble = derive2 { name="RPEnsemble"; version="0.4"; sha256="0y9g22swcz0m5jbzi87ahxw27fb3jlf3iwvxb73kkzixqlvksw9y"; depends=[class MASS]; }; + RPMG = derive2 { name="RPMG"; version="2.2-2"; sha256="1hyqhyn8g43cpdvh3iyrf12dbyafp6gv64hb53hr0h1094hrvz81"; 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.4"; sha256="0gi3zknxgxxmxjmb238vd64yqg02fv4qdirn2xf5badlqzwv3r71"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; + RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.5"; sha256="0cf4mb7mjp7x3k7083c8n8fjbvrmcgq359wh6pdyj817mgkanqzv"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.6-2"; sha256="1mdhw5821v2h7hpa53v10wz53k4i90r0vb6a3dia5gq8f9j1h088"; depends=[DBI]; }; + RPostgres = derive2 { name="RPostgres"; version="1.0-4"; sha256="0ymlz5av86xy434mr319p2sw7gl42dpj5vfi83wfiq1qri2vvx23"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; }; RPresto = derive2 { name="RPresto"; version="1.3.0"; sha256="01w832ia4c44nhir5rzw33qa8h7afmf04vkfdlg32jaqi1gv5861"; depends=[DBI httr jsonlite openssl Rcpp stringi]; }; - RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.10"; sha256="0fnyk04bnmgk9c14ng0bw1xd7vf1z1r76fzrk7dqdihqym52gi1m"; depends=[Rcpp RCurl]; }; + RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.11"; sha256="0q05hdlbgbjydi0x80kgfayfkisalvmb9wy1n6afcw66pbikyb4l"; 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.3-0"; sha256="0p060wilvmz5wyahbga6gxkhs49rw8nb093bfrha7vhqhxnmdyqk"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; }; - 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]; }; + RQGIS = derive2 { name="RQGIS"; version="1.0.3"; sha256="0wrzjfxwciirl838lakcw7f6qyqyykqd999c9krll5krqzyq7c3c"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; }; + RQuantLib = derive2 { name="RQuantLib"; version="0.4.4"; sha256="1pki0c265nmgph9dbz2pyrq8h7295mxswavfdwsr7m1lpbpzk8s5"; depends=[Rcpp zoo]; }; RRF = derive2 { name="RRF"; version="1.7"; sha256="1nxwqb0ybia8cglqlrbwnm9xzab6ayrn5f3j3l0kqszq1rvkfw95"; depends=[]; }; RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; }; + RRPP = derive2 { name="RRPP"; version="0.1.0"; sha256="1c29zgfhhssg7m1ckn45bdk1jcqxs4q68bf4rq3jg8h1805jql1h"; 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.2"; sha256="0cm1r34hqdil3d27670q6a5iixh3lg8r4rzam6mq4zf2fqiwdpb9"; depends=[doParallel foreach lme4]; }; + RRreg = derive2 { name="RRreg"; version="0.6.5"; sha256="1hn69zqcafiq1fb38fl4gah90kim8pc2m35sbi1cgkgcbzz1vg16"; depends=[doParallel foreach lme4]; }; RSA = derive2 { name="RSA"; version="0.9.11"; sha256="1hsjy755r78my6ib9s9da7mibcjxd5svh2kq0v7a466m60cyfrss"; 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]; }; + RSAGA = derive2 { name="RSAGA"; version="1.0.0"; sha256="1023br8q0i6w18kmn261kf4ql32061hq7xngl1w5mamvvp17d6b1"; depends=[gstat plyr rgdal sf 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.2"; sha256="13l4ql40ahm06yi5a9zys62h5452fchkkhlhqh9gzh3pbpyjawgc"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; }; - RSDA = derive2 { name="RSDA"; version="2.0.2"; sha256="17hymak1i9zkwdn9hv7diccs0vdbx16cwhaxyw89xsq3lwqfi2ap"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr pander princurve RJSONIO rlang scales scatterplot3d sqldf stringr tidyr XML xtable]; }; - RSEIS = derive2 { name="RSEIS"; version="3.7-4"; sha256="0yz1lgq79chvcz70a82pyiy7s9z0af22pcnbkw629plzrxlpfppx"; depends=[RPMG Rwave]; }; + RSDA = derive2 { name="RSDA"; version="2.0.3"; sha256="18rka6g93yksgnwgzy4planjvsmc4d5xzf4fxarv57v6frg37y98"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr pander princurve RColorBrewer RJSONIO rlang scales scatterplot3d sqldf stringr tidyr XML xtable]; }; + RSEIS = derive2 { name="RSEIS"; version="3.7-8"; sha256="0f065jkdz91gi6l8y5y4m95vwgjsagrxx6r5982jbafi7zyqxm7j"; 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]; }; RSMET = derive2 { name="RSMET"; version="1.2.9"; sha256="1da7kck5g0vcd1ly7xaa1i8d9b1qjf6kwf35sq5d71hfbgx2fb4k"; depends=[stringr]; }; - 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]; }; + RSNNS = derive2 { name="RSNNS"; version="0.4-10"; sha256="1khsv1sy8jgsl9s5fypcg77lzj811xzrygwnq6ki9v375sk383gh"; depends=[Rcpp]; }; + RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; }; 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]; }; @@ -2783,41 +2954,42 @@ 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.2"; sha256="0a4i9mpffmblgzj6qh4kg2x2cv9s93b1pgpfd0z6dh8czdzkdd8j"; depends=[NLP openNLP plyr stringr]; }; + RSentiment = derive2 { name="RSentiment"; version="2.2.1"; sha256="0djp530yzj5a6y5nqk98pdvsgy9apqcqvkz0yjqx6856d9wrycm0"; depends=[NLP openNLP plyr stringr]; }; RSiena = derive2 { name="RSiena"; version="1.2-3"; sha256="125qkh8j42zm8r4acxw20m6ylq6vksja3qz6zxyyvfd3l2vqb2gy"; depends=[lattice MASS Matrix]; }; - RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.13"; sha256="03993xck4274r6sxkzxlzcvwviafdb3d7icfn6f0xin4cnj6ry4m"; depends=[base64enc digest httr jsonlite plyr stringr]; }; + RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.14"; sha256="0h5s9vhihjlz44l61vm83zqavkglb6f304sb04n0vhzzl797l04c"; 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]; }; + RSocrata = derive2 { name="RSocrata"; version="1.7.4-7"; sha256="1cblp0fq7836jkb8cps3l1f8gx25bsdclkjvmxmd4b79y4hapiy2"; depends=[httr jsonlite mime plyr]; }; RSpectra = derive2 { name="RSpectra"; version="0.12-0"; sha256="0aa33mhzj03gznpza5l5qj94s45imfhrgx52bsa8rq00f93fgaf0"; depends=[Matrix Rcpp RcppEigen]; }; RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; }; RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; }; - RStoolbox = derive2 { name="RStoolbox"; version="0.1.9"; sha256="0gra980cmv9xw2dzpqk9vfr78n03i8zcv9pbzmvkjb3x8ln8288h"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; }; + RStoolbox = derive2 { name="RStoolbox"; version="0.1.10"; sha256="0qz9k7qjwhgw2hm4b6iys365y8dnd9b9js2yzyxpyqwdwmvmkxjj"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal 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]; }; - RSurvey = derive2 { name="RSurvey"; version="0.9.1"; sha256="0q0iyljdrg6avskqmsczda3008nrzg0lf1bmp4x188vx4dm0cs11"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; }; + RSurvey = derive2 { name="RSurvey"; version="0.9.2"; sha256="0mg0g93bli2v5nsm3jqbbm3qxk1kk0ngf8fkdq4z9n8k291shx25"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; }; RSvgDevice = derive2 { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; }; + RSwissMaps = derive2 { name="RSwissMaps"; version="0.1.0"; sha256="0p57pb3p6j0g4ngzikys9i4d02p4dc4k0s8k7r1wgdmdy2rak3k2"; depends=[downloader dplyr ggplot2]; }; RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; RTDE = derive2 { name="RTDE"; version="0.2-0"; sha256="1dj7dsj4256z9m70y2fpcgprxpqbgqxz0dqwn0jl80sj2325f66s"; depends=[]; }; - RTOMO = derive2 { name="RTOMO"; version="1.1-5"; sha256="0wnxmzad2q5cpnqmglqh92clsk2c8fngd3gzh8f91alpj6nz69jp"; depends=[GEOmap RPMG RSEIS splancs]; }; + RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; }; RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; 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.9"; sha256="1khwr62qdmgzkqzxqgkcjvxl1w8lnabqm68x18d5rk0hq3rpi1wj"; depends=[]; }; + RTransProb = derive2 { name="RTransProb"; version="0.2.0"; sha256="0ka923kg52f7dv19z9vjb7m9ji12wk92kva41idryfignxpa2bkf"; depends=[chron e1071 expm MASS Matrix matrixStats nnet pracma Rcpp RcppArmadillo zoo]; }; + RTriangle = derive2 { name="RTriangle"; version="1.6-0.10"; sha256="07ya95gmv53i2argqwgad6wd4sslql2wl1rkvsmgsvmhsb4wp9hd"; depends=[]; }; RUnit = derive2 { name="RUnit"; version="0.4.31"; sha256="1jqr871jkll2xmk7wk5hv1z3a36hyn2ibgivw7bwk4b346940xlx"; depends=[]; }; - RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-68"; sha256="1gxh6w3b83szagirci84iik1ah0cvyzy4l61pnxli3abbzakzxc8"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; }; + RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-69"; sha256="1fcblvvpydczakvjsiz8ffcs8zid2ln6dbah0y9ha3xfzp2qcj4z"; 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.9"; sha256="1xvjl2mfknrb3jrvxxdza4l21sh76n6w6r12makvjkr9q0nal408"; depends=[Rcpp]; }; + RViennaCL = derive2 { name="RViennaCL"; version="1.7.1.7"; sha256="08mhn6732sb284y4garx0nvhad4r42pk39p3r82fad4c1c3rxkhg"; depends=[]; }; + RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.12"; sha256="1x3pq6cnkjashf49imrw76xkw9nzqgn9132l03l9v4vacgh0s47m"; 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-34"; sha256="1qvsm5v0rb4ridin82q03fhyi217sssagsc6gpiniz9b21kkmqkw"; depends=[rJava RWekajars]; }; - RWekajars = derive2 { name="RWekajars"; version="3.9.1-3"; sha256="1jcp53qvj3wfaii8j18yvr4kx32hckqs2w6bzzmhx0py40zz1d01"; depends=[rJava]; }; + RWeka = derive2 { name="RWeka"; version="0.4-37"; sha256="1q0riy7w2ighyy7fh1hj3q4wa0vbbn6h7nisgkyzwkcxkfq3n2pw"; depends=[rJava RWekajars]; }; + RWekajars = derive2 { name="RWekajars"; version="3.9.2-1"; sha256="006n7m3qxnzvfhkzcr0nbwqdlhygzdhyp8x3534dx6075bm00v0f"; 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.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; }; @@ -2826,14 +2998,16 @@ in with self; { 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.3"; sha256="15ww09dpyljph2pq0d2d0pbr3dzwkwsn0zv8f3w8jhhgc3s8hqkz"; depends=[geometry oro_dicom ptinpoly rgl]; }; + RZigZag = derive2 { name="RZigZag"; version="0.1.4"; sha256="1p0p9imdv40vw59m95x00zv9a3knl4m4gwlrbd2v93yzdc1n2a26"; depends=[Rcpp RcppEigen]; }; + RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; }; + RadOnc = derive2 { name="RadOnc"; version="1.1.4"; sha256="1ri6ybzhfdgbrbfcy12mmvv2ipg61az7vwp1dbjyzs8mgsc1cxb5"; 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=[]; }; + RandPro = derive2 { name="RandPro"; version="0.2.0"; sha256="1bhbg6lvgr9h6rq3g3ljm2422ngjb18maj80l7f659ql88c8h6mj"; depends=[caret e1071]; }; 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=[]; }; @@ -2845,22 +3019,21 @@ in with self; { 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.1"; sha256="0h9wlx87wbavx7hs3ryx88iykk0lj3lfsvrdi4w9h31y3x6cwagy"; depends=[ggplot2 pROC]; }; + RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2"; sha256="0bw2j2wx0l56wp0k6fg8dddphggz0fycjzjydsd55rkg4zq6gpf3"; 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]; }; + Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; }; Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; }; - Rblpapi = derive2 { name="Rblpapi"; version="0.3.6"; sha256="1n25dyggqlvgqjfq30022i5ydpzmli2bcw08kaidgp23l7f90ghh"; depends=[BH Rcpp]; }; + Rblpapi = derive2 { name="Rblpapi"; version="0.3.8"; sha256="1d1b3rdp9zqz9x6xb7zmbs4yrz339qjvlhif7s8ifcz1zdpzzhal"; depends=[BH Rcpp]; }; Rborist = derive2 { name="Rborist"; version="0.1-8"; sha256="0zr8vfbv11ascng7n2zv5xbqv7h0r0bycwn8bqlq8q10y2lyxg70"; 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.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; }; 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.4-0"; sha256="0wb2ai48xy67c7pw7k8wx2bn9zxkk8asdsg2rjgw2sh9nrc6kia7"; depends=[abind car effects RcmdrMisc relimp tcltk2]; }; - RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-6"; sha256="1afz5j96m1cyiwnbwsndkqhbn986bdbznzd2z64cygnqhb04gs70"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; }; + Rcmdr = derive2 { name="Rcmdr"; version="2.4-2"; sha256="0027s3g7wzjaqnx3yhn9whpxsrvz7ar70r1a0lwd5hs6g008m8ja"; depends=[abind car effects RcmdrMisc relimp tcltk2]; }; + RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-8"; sha256="1lc26k2f6r37id85baii7rr5m36vy34p6xxl1fjs87s94zifkfsp"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; }; RcmdrPlugin_BCA = derive2 { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; }; RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; }; RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; }; @@ -2871,13 +3044,13 @@ in with self; { RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; }; RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.6-0"; sha256="07k9x3mdaqzk1503wjsha9f8bxzw1074i9g7sa16yqz5lwky4lr7"; depends=[FactoMineR Rcmdr]; }; RcmdrPlugin_FuzzyClust = derive2 { name="RcmdrPlugin.FuzzyClust"; version="1.1"; sha256="1lg6k3h4n45s6wjkl3ycwfngfr2i6mkhirifhbazsvv297bg0iba"; depends=[clue doParallel foreach ggplot2 iterators MASS Rcmdr reshape2 tcltk2 tkrplot]; }; - RcmdrPlugin_GWRM = derive2 { name="RcmdrPlugin.GWRM"; version="1.0.1"; sha256="1ib9lpvz0ns3f44in29cvh746zl101lrv29p1df1zcdfcjnq1qq1"; depends=[GWRM Rcmdr RcmdrMisc]; }; + RcmdrPlugin_GWRM = derive2 { name="RcmdrPlugin.GWRM"; version="1.0.2"; sha256="01q4k9s815pgd5cavm6nyxy5npmpxryari9v6wys4n5cjpn5g6xq"; depends=[GWRM Rcmdr RcmdrMisc]; }; RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-46"; sha256="0bl9nq89ga16rxlf411lbm5qsx28f1axxwchr5rp46n0h15d0d3f"; depends=[HH lattice mgcv Rcmdr]; }; RcmdrPlugin_IPSUR = derive2 { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="1lk7divj5va74prsnchq8yx9fbyym7xcsyqzkf72w448fgvvvwlv"; depends=[Rcmdr]; }; - RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-4"; sha256="0lmsd76q31bg2j8jd5p0891wi8cxibpjqx0196177w3y9kgcj3s1"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; }; + RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-5"; sha256="069kpvhflk0rwwll0vyxfdrln1lzr1zhzfzm39si63ji6v7l6msb"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; }; RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; }; RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.1"; sha256="0c3mcr8bmmbpxsqm8zfy07cbyglnq5466nafbglfs5m0z836yz9i"; depends=[ordinal Rcmdr]; }; - RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.7"; sha256="1pfv4ar3i9mkj6d4jv206dpwhbz5an1yd4g758pxsanliy5mi6cb"; depends=[MASS mixlm phia pls Rcmdr xtable]; }; + RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.8"; sha256="1s7947zvrhjrc7vchvaajp2q7xdqfg5vsmg6r7ym416cqq39i5kd"; depends=[MASS mixlm phia pls Rcmdr xtable]; }; RcmdrPlugin_PcaRobust = derive2 { name="RcmdrPlugin.PcaRobust"; version="1.1.4"; sha256="17rq3sv8payazjjn5j37cgd6df5b62d2y8al3grw6hw5nfba7lvn"; depends=[Rcmdr robustbase rrcov tkrplot]; }; RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; }; RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; }; @@ -2886,8 +3059,8 @@ 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="4.1-1"; sha256="0qlkqb3s4g417l9cfjq1hhi8y528lb3ibswkdk2bfsghn38yrmr4"; depends=[car randtests Rcmdr TeachingDemos tseries]; }; - RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.4"; sha256="1f5swkwlii0wgw38m0pzziycqdhh2v00bxnr7815pdmr2yx0frqr"; depends=[Rcmdr]; }; + RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.1-2"; sha256="1gg6gi0l0vzcp29c3s8law68bgyms0hczpk41wzzcvvvkhdbr7xi"; depends=[car randtests Rcmdr TeachingDemos tseries]; }; + RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.5"; sha256="0ys3565pcbr554yb1gi2h149vhvwc0gdfmh7mz8zzd4367hqn553"; depends=[Rcmdr]; }; 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]; }; @@ -2901,65 +3074,69 @@ in with self; { RcmdrPlugin_sampling = derive2 { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve MASS Rcmdr sampling]; }; RcmdrPlugin_sos = derive2 { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; }; 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_survival = derive2 { name="RcmdrPlugin.survival"; version="1.2-0"; sha256="1z13rf5iwmzb7mj3yn4ykkh1r9bl4f4idlc4a34rn4psi9j7wlh1"; depends=[date Rcmdr survival]; }; RcmdrPlugin_sutteForecastR = derive2 { name="RcmdrPlugin.sutteForecastR"; version="1.0.0"; sha256="1np42kizkk572vharki84ka34lr7bdlckn4227bnq2l37c0zsq5y"; depends=[Rcmdr sutteForecastR]; }; RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.9"; sha256="0nacpipaimb1348rhv1rma85gnd38wsg741pz7xpvn347wnnc0wz"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; }; 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.12"; sha256="1byyqvlgb2p46p1gv243k73rk69fa8pa4l5m5asmckag2pkb2glz"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="0.12.15"; sha256="1pnv6sl4vdn69ygmgrb1b3gsigfdcfb56wnzikic93l8gkvdsvxv"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.4"; sha256="0xbaamv3bg08ymbmiq6kwh86p17y6qzgydq02syig2a3ykp0042c"; depends=[Rcpp]; }; + RcppAlgos = derive2 { name="RcppAlgos"; version="1.0.1"; sha256="0668anb3kjw3h71n2hjqqjrmiz4dwrgw71ikviq0imw2v5030392"; depends=[Rcpp]; }; RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.10"; sha256="08s86ak26zybawry6l6l30k1lakc71k2j58539h70dnrmsd15jna"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.7.960.1.2"; sha256="0kg8vbamaz3413h283f23hzgqkmfpf6fs0vbklmpj0l3ricvp9cc"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.8.400.0.0"; sha256="11y2ksf46zw6fcz0kk70szyfn7qqxwwd33xylrxvnyb7ldmbc5yr"; 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]; }; + RcppBlaze = derive2 { name="RcppBlaze"; version="0.2.2"; sha256="0hi7gh7xlmdcyzxsis8wl841d6czbcgb8qdg8y822am1mvc0wmb7"; depends=[BH Matrix Rcpp]; }; RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.3"; sha256="0cb04filbr0mymcg891lc0dw2b3fnjmhn8z50xcilb3v72ccrvqg"; depends=[Rcpp]; }; - RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.7"; sha256="10i9gjkq7grr7s24x62nji87zikabjx0pfrrp6jvm6nbmaxcb8yj"; depends=[Rcpp]; }; - RcppClassic = derive2 { name="RcppClassic"; version="0.9.8"; sha256="1yijzkznn5w883idx8fq5ibw1ag12sswhj98ywflc9nb8q44f9d9"; depends=[Rcpp]; }; + RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.8"; sha256="0fwz942pd1r7jcxwqjbagcai153kv7csflhg7agwhxyj49m97i82"; depends=[Rcpp]; }; + RcppCWB = derive2 { name="RcppCWB"; version="0.1.7"; sha256="13iax4kr5gchm483gib3cdjcbvkymhiwbpnj705c325fbsfk5rj7"; depends=[Rcpp]; }; + RcppClassic = derive2 { name="RcppClassic"; version="0.9.9"; sha256="102gi1l6hxdkz50iy9xbpb57iy5j7flv78sdq36pn9zi8x4k8k95"; 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.3.3.0"; sha256="0zz9v0f8nnlvhhqv91lkyfblvjnmav84l89mr6vmbqjc2hzqd3n8"; depends=[Matrix Rcpp]; }; + RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.4.0"; sha256="1m6ssq6lvi36ggf26y4hhq996583pxxdb978jnn1x6r9gdb0q0hi"; 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.3"; sha256="0ih6lcby6rx0pkzwnd4bxq40cxa3cw9nfrphhhm9q71ng5vj1vrr"; depends=[Rcpp]; }; RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.2"; sha256="0z5sg2jlr465196ws2pqi7j7hfmd7j8xlqqj6841m635cg4q48ba"; depends=[Rcpp]; }; - RcppHMM = derive2 { name="RcppHMM"; version="1.2"; sha256="0i3n4lca6rbi4lfyv65y6i6xaxb0mzcv999vccl38zhdg42sf1vk"; depends=[Rcpp RcppArmadillo]; }; - RcppHoney = derive2 { name="RcppHoney"; version="0.1.6"; sha256="1llbs6x4qcvgnlmnd391s1j9lqvybnnq3d4gjwyyc8vy2i5jr28c"; depends=[Rcpp]; }; + RcppGreedySetCover = derive2 { name="RcppGreedySetCover"; version="0.1.0"; sha256="1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x"; depends=[BH data_table Rcpp]; }; + RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; }; + RcppHoney = derive2 { name="RcppHoney"; version="0.1.7"; sha256="1jnng6271i2a564y115mr2bq324xffcjpq0ysy8yar2cgljxgspr"; depends=[Rcpp]; }; RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; }; - RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.0"; sha256="1q5r4sj3rqs5xdxsmpzcxzs3jyx36siawz6j4ghc37mjb04rrdrl"; depends=[BH 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]; }; + RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.1"; sha256="0pd5jgv24yskxzp76c3i6lkpq9npdgw1i15dcf02v9h43q8n1s9s"; depends=[BH Rcpp]; }; + RcppNumerical = derive2 { name="RcppNumerical"; version="0.3-2"; sha256="0j0hvwsbidahk2zx3zk7fhc6m9cca27iq3ivx7vdvggz8iqzszrz"; depends=[Rcpp RcppEigen]; }; + RcppParallel = derive2 { name="RcppParallel"; version="4.4.0"; sha256="1gjqmkzsi1fi0vss1nvq6i77j3aixdxd047mw9vf4l60z2ypr3h1"; depends=[BH]; }; + RcppProgress = derive2 { name="RcppProgress"; version="0.4"; sha256="09ayw6d69i0lplmaj5md25p5hn1nmiyp6a4sh60v93nrrs1cq7iv"; depends=[devtools Rcpp]; }; + RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.2"; sha256="1si5njb8g4g6fjrkqbp3y6z23yxs901nq9kmiwwbqs8di6svc5q3"; depends=[BH Rcpp]; }; RcppRedis = derive2 { name="RcppRedis"; version="0.1.8"; sha256="05c4c65ayiqyzmkj2mrgwwflgjk54rf9nmb3rhickj16yy9b071q"; depends=[BH RApiSerialize Rcpp]; }; RcppRoll = derive2 { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; }; RcppSMC = derive2 { name="RcppSMC"; version="0.2.0"; sha256="063ds546hd5dfsickiawm5c92sw2kb6n79fqz4gy4hvnbkf00q84"; depends=[Rcpp RcppArmadillo]; }; 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]; }; - RcppTN = derive2 { name="RcppTN"; version="0.2-1"; sha256="09ssggx66b3cyjh7mlc73lax2nfw7agfiph090w1qblaam9jz8sy"; depends=[Rcpp]; }; + RcppTN = derive2 { name="RcppTN"; version="0.2-2"; sha256="0m2wc5n1fzxv56s4gqqnygb24dbadgrpgjm4bs4hr6qazgjapymf"; depends=[Rcpp]; }; RcppTOML = derive2 { name="RcppTOML"; version="0.1.3"; sha256="0krw4104m8drgyf53aq22kl5q0abrd0y4j1fvrwsj1dkbkybas05"; depends=[Rcpp]; }; + RcppThread = derive2 { name="RcppThread"; version="0.1.3"; sha256="1nnyamjap1kgganvgwj48nip8nd7h35hzj7yvd131jnpq31gvvjg"; depends=[Rcpp]; }; RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.0"; sha256="0833j7hy7dpdxkj1m5cfyxzpp7j0n7mxjc5kx32mdn5s43iaf7yh"; 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.2"; sha256="036ycw60zh8bynnxskgrabr6smqwvxz5w669krv37f0yk18z238y"; depends=[data_table doParallel foreach httr xml2]; }; - Rcriticor = derive2 { name="Rcriticor"; version="1.1"; sha256="0imhzf55w3fvfhrpjppkaxndb56bmpqnkibkq9li9g9i7zda2q8w"; depends=[]; }; + RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.4"; sha256="16wdsm0zzn6q0h29a1w8yjn4zxvrirsws6h31k0ljgprsn3jjhz4"; depends=[Rcpp RcppGSL]; }; + Rcrawler = derive2 { name="Rcrawler"; version="0.1.7-0"; sha256="0r8s3d4dby9vn0qc5lbhab4vh3yl5yifi7ipxafsgffdxislnsdw"; depends=[data_table doParallel foreach httr selectr xml2]; }; + Rcriticor = derive2 { name="Rcriticor"; version="2.0"; sha256="1cnmmcdp2g3syrlld1pm7101cbzxh02cpvqvgsj7mp6zxm2k5plv"; depends=[]; }; Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; }; - Rcssplot = derive2 { name="Rcssplot"; version="0.2.0.0"; sha256="0pv1yzpsc68bahfxh5h79xmh798a22nk6i88gj1s81sp7l5fbqlm"; depends=[]; }; + Rcssplot = derive2 { name="Rcssplot"; version="0.3.0"; sha256="1qwrwzyqbwwwjf2zx6712q6wj629vf9rjrgscf0fim10fa6k5grn"; 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]; }; - Rdimtools = derive2 { name="Rdimtools"; version="0.1.1"; sha256="0ivap8c71c0gja11k72sl4ma4ka73l8dbm3i802b78rikjn9r8m2"; depends=[Rcpp RcppArmadillo Rcsdp Rtsne]; }; + Rdimtools = derive2 { name="Rdimtools"; version="0.3.2"; sha256="0wk6sv2ahxscy4nsk826c9rlq8vxgnflg9banwdxhs6qlqhipnlb"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo Rcsdp Rdpack RSpectra Rtsne]; }; Rdistance = derive2 { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; }; - Rdpack = derive2 { name="Rdpack"; version="0.4-21"; sha256="15i2xby0jys9pxyy8c19najxyh98mbsw7pll14p69rfsx8s07kbn"; depends=[bibtex gbRd]; }; - Rdrools = derive2 { name="Rdrools"; version="1.0.2"; sha256="1xn46lp6kgj6bns5nwjx4s8a3iif1g38iwf58hsrbqjhyygqvdzv"; depends=[Rdroolsjars rJava]; }; + Rdpack = derive2 { name="Rdpack"; version="0.5-5"; sha256="19rib96758r2zkq4wlys0gfj60zff34gv1wpb8d7pa34h81gpi9p"; depends=[bibtex gbRd]; }; + Rdrools = derive2 { name="Rdrools"; version="1.0.3"; sha256="1y805j2xrv8kgh42s5lig07mb76fcz5yrxal0zaykj16cvid8287"; 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]; }; + Rduino = derive2 { name="Rduino"; version="0.1"; sha256="0r1yy3a2n8a4niasfjn77gv130a062i802r7xhbg0abljv5m6ra5"; depends=[serial]; }; ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; - ReIns = derive2 { name="ReIns"; version="1.0.5"; sha256="1p6m3xkkhh2jj8h2lphwirk9zzbjv4gvag2bpypan8c6cic8rd9a"; depends=[doParallel foreach Rcpp survival]; }; + ReIns = derive2 { name="ReIns"; version="1.0.6"; sha256="1q2f3ggg534dlgrmb4bsv8ikph11qg29asw1fpkndd9a96kc8gbk"; depends=[doParallel foreach Rcpp survival]; }; ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; }; RealVAMS = derive2 { name="RealVAMS"; version="0.4-0"; sha256="1byh7in3bpfgdwfxp15334h167bvrcfj0cdswqy3yd81l9g2ickn"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; @@ -2971,65 +3148,73 @@ in with self; { RefManageR = derive2 { name="RefManageR"; version="0.14.20"; sha256="18g2w32ldfakmnmlk1gaxq64jhx4iy7kil1s7g6lnvv1fygxpg8k"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; }; 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]; }; + RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.0"; sha256="02mf1iy3npa5611kc9ifqcl9ap2bhab9qq5pn6cfyw9lxa3q1if0"; 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=[]; }; + Relatedness = derive2 { name="Relatedness"; version="2.0"; sha256="1aidklwk8q2wdfsmhlbd3vzq9kzsyh4wn1g28biyb6lq7iwq1hl4"; depends=[]; }; Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; }; ReliabilityTheory = derive2 { name="ReliabilityTheory"; version="0.1.5"; sha256="14k979b9baqnz1gbhbjnp76nvdg5z1sc6p29h3v9qgvwv4aanp4v"; depends=[actuar combinat FRACTION HI igraph mcmc PhaseType sfsmisc]; }; + RelimpPCR = derive2 { name="RelimpPCR"; version="0.2.3"; sha256="0qxngmkfb7sqjcyydk1z0rc857sfikf10iamxbv2d207spaha5l0"; depends=[caret ggplot2 relaimpo reshape2 Rmisc]; }; Renext = derive2 { name="Renext"; version="3.1-0"; sha256="074djs4y71667aylpgh514pzijr90rgpzm4w5ayq9cgaqz22m3am"; depends=[evd numDeriv]; }; RenextGUI = derive2 { name="RenextGUI"; version="1.4-0"; sha256="0jfg4a85j06wxk8vq2q6j8md2kcss0s7k71218gfh9vybk7hl4h6"; depends=[gWidgets gWidgetstcltk R2HTML Renext]; }; - Reol = derive2 { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[ape RCurl XML]; }; + Renvlp = derive2 { name="Renvlp"; version="2.5"; sha256="0zsvjqbbakbr5bcgwpbjl8ns7hqgkk9v8g9b9yx2mjbv8vg40pz2"; depends=[Rsolnp]; }; ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; }; RepeatABEL = derive2 { name="RepeatABEL"; version="1.1"; sha256="00bq9ls4d0kczdv752xasqbavb11bjfvpriggfc8dw3g3i7pizpg"; depends=[GenABEL hglm]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; - ReporteRs = derive2 { name="ReporteRs"; version="0.8.8"; sha256="1pw3hy3g0nc6amga59sb1nnwqc9asdpn6lh2zfh87y8nazrf1hf0"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; }; - ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; }; + Replicate = derive2 { name="Replicate"; version="1.0.1"; sha256="110pvissyv3dx1wpwpngcg18mpmpml49gcmdykip55s1d3ljf791"; depends=[metafor]; }; + ReporteRs = derive2 { name="ReporteRs"; version="0.8.9"; sha256="1wsqbn231xqs87dmcry13bdkvv09y17jfqkdnpigcsiivbh3zr3x"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; }; + ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.3"; sha256="0rn000xkkda08kfh1b1l01piw596j3rca8sv4r23q52indrm7vzs"; depends=[rJava]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; }; 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.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; - Rfast = derive2 { name="Rfast"; version="1.8.4"; sha256="1x63bndlcvjyndqmd2n7jf2bmp317rpnxldd4y3dw5xdqvgj8pgb"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; + Rfast = derive2 { name="Rfast"; version="1.8.8"; sha256="0hbzkdi180l004y1l6v0nd6zp7rn45wx4ahaqnrm67pa366j500p"; 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=[]; }; + Rfmtool = derive2 { name="Rfmtool"; version="2.0.0"; sha256="1a8s4a4mdblzy76ljslfvz8zav2639plhby0ib5ccjnpz2sxhc7s"; depends=[]; }; Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; }; 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=[]; }; - RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.15-148"; sha256="1carylfz9gafradbdyg7fz2bypr7n72fbm8vhyiinmp0k4s5ipvc"; depends=[]; }; + Rgretl = derive2 { name="Rgretl"; version="0.2.1"; sha256="07a83nmx3q0yl7fbwqmkmnzxm5rrh8p4nrayv3rj18s1r98i4jph"; depends=[lubridate png xml2]; }; + Rhpc = derive2 { name="Rhpc"; version="0.18-12"; sha256="095mrr6g05y9g8h88k1nf19zmjvg8hnmf5b3r6krqs4cxhp2qls2"; depends=[]; }; + RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-12"; sha256="14qypi76h73iv3xwbb860r4f7516jyb88j92lmkifw03x86lx2b3"; depends=[]; }; RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; }; Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; - Rilostat = derive2 { name="Rilostat"; version="0.2"; sha256="1ziy0g2piz4z37gnl0xdi486ig6p9b39v0qyiwcbdn03srizbj3a"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; }; + Rilostat = derive2 { name="Rilostat"; version="0.2.1"; sha256="058qz5kn7p8wn3lvw92c11cqpkz9brgf1igmawfkb0lqvj366vyd"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; }; 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]; }; + RiverBuilder = derive2 { name="RiverBuilder"; version="0.1.0"; sha256="0qs21qz1zc0wsykd7qhry93il6qz255mgxyxnrdmxf5989k5mvxi"; depends=[]; }; Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; }; Rjpstatdb = derive2 { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; }; RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; 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.135"; sha256="1gmwi30gl78psg5a34w0l5957vs7mb8pplgcwh7d5dszp92jw2xc"; depends=[Rcpp RCurl rjson]; }; - Rlda = derive2 { name="Rlda"; version="0.2.2"; sha256="0wp2lgflpai3pqxkmbsadrdzlm27xafb129zzqm8nx70zwww611c"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; - Rlibeemd = derive2 { name="Rlibeemd"; version="1.3.7"; sha256="0k2snw8a6h4dvbpl97fklvvbbqma4g9r0ksvh5ndyk4vqwyxy1na"; depends=[Rcpp]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.2.0"; sha256="1gzywhbdkd4f392fasa91ral8wg7jr51b4n1kll7r8hvyjz7bmgy"; depends=[httr Rcpp rjson]; }; + Rlda = derive2 { name="Rlda"; version="0.2.4"; sha256="01dh6x0yh9y7q8c8qy0zkkn2y18wzg5y90v4gcawdb1adz46izg2"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; + Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.0"; sha256="0nnkblrgycvfwn0lb9j92f5wpln69kk54z4irwi35rrfl31f689m"; depends=[Rcpp]; }; Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; }; + Rlinsolve = derive2 { name="Rlinsolve"; version="0.2.0"; sha256="08ib0jjqicscn4mx5yv25q0x66iycx8jhazvjb47nqvn24mirprp"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo Rdpack]; }; 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.7"; sha256="0dmmvvz7cpn378mji9hfmzr5xz99s3z0sd5anmidb6qzppkcxhks"; depends=[dplyr ggplot2 lazyeval lubridate magrittr plyr raster tidyr zoo]; }; + RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.16.1"; sha256="1z1i43imm0ch5ki7m5pxyjcxl280zmfzv8nizraf73zw852gzhb2"; depends=[dplyr ggplot2 lazyeval lubridate plyr raster rlang tibble tidyr zoo]; }; + RmecabKo = derive2 { name="RmecabKo"; version="0.1.6.2"; sha256="1i08wlfd14wmvwrsvjyhgzxkwzfp4jiwbzymw8m25pvyjxgi7jmy"; depends=[Rcpp stringr]; }; 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]; }; Rmosek = derive2 { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix]; }; - Rmpfr = derive2 { name="Rmpfr"; version="0.6-1"; sha256="073f01wga1ccxxgspsprjqdmb84iiap13mqhl7b6qcz9al89jl5z"; depends=[gmp]; }; + Rmpfr = derive2 { name="Rmpfr"; version="0.7-0"; sha256="0jpj3nl76jd6vc2p1xwr8jl62q8ckwsdaxqnk9b20srkq63mfrig"; depends=[gmp]; }; Rmpi = derive2 { name="Rmpi"; version="0.6-6"; sha256="184skad8m4y4pzk8v98b7k7prqxm9mg1b2pfxbknyvzakq6aizv1"; depends=[]; }; 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]; }; - Rnightlights = derive2 { name="Rnightlights"; version="0.1.2"; sha256="15jpb4rpnw4pm58101hvb7i981cwgzagp89qpvgfys9fcjlj7zxy"; depends=[cleangeo data_table doParallel dplyr foreach gdalUtils lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings sp stringr xml2]; }; + RndTexExams = derive2 { name="RndTexExams"; version="1.4.1"; sha256="1gi96hfd7dkvmbvy6hj25g1l7nwk4yhxkdjx1l3ws3c2zpi27cvj"; depends=[CopyDetect data_table stringi stringr]; }; + Rnets = derive2 { name="Rnets"; version="0.9.8"; sha256="0lcgapspl7ndrf3gxkrsv1172f2sv2587zaa1q6b950zympcvcj3"; depends=[data_table glasso igraph]; }; + Rnightlights = derive2 { name="Rnightlights"; version="0.1.5"; sha256="162n1k8dxd8g5ymwj59v8fkiflqhl2ik9mk1g8rf46dk84h0zflb"; depends=[cleangeo data_table doSNOW dplyr ff ffbase foreach gdalUtils lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings snow sp stringr xml2]; }; + Rnumerai = derive2 { name="Rnumerai"; version="0.2"; sha256="03qjrpi3hdbn8ni0ga57s3fsd2207mm34vl3p3n6y4vn15vg1k4n"; depends=[httr lubridate]; }; 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]; }; @@ -3039,10 +3224,12 @@ in with self; { RobRex = derive2 { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; }; Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; }; RobustAFT = derive2 { name="RobustAFT"; version="1.4-1"; sha256="180gmlinrpnk4ghl1xickbjkdqr7vb6qzmy6701xpji5k8g9il60"; depends=[robustbase survival]; }; - RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.3"; sha256="1kzi5mvz78gxwrg1z822pkqzmqwvw73x2gh2yfsaxcwy2d7nr2mx"; depends=[Rcpp RcppEigen]; }; + RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.0"; sha256="1pkgwglnb68563hiirkagz33jfksbzj3cvdyv13brrzx6jzcvw11"; depends=[Rcpp RcppEigen RobustGaSP]; }; + RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.4"; sha256="1zq62vx5bq2wbdh9irmcfpbpr83qqr9m9icbpksxc8bp9zdsdzkq"; 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]; }; + RonFHIR = derive2 { name="RonFHIR"; version="0.1.0"; sha256="14a5s9w77gb8v4ak5rv22m38d7ga4p4nnqqqhp41jj1snqqw45h3"; depends=[httr jsonlite R6]; }; Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; 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]; }; @@ -3052,38 +3239,41 @@ in with self; { 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]; }; + Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.1.0"; sha256="06i8pmvn7fl8likxzzqzkggqf7x20pwi10mcv4x46cacil80ir2z"; depends=[futile_logger R6 rgl stringr testthat]; }; Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; }; + Rprofet = derive2 { name="Rprofet"; version="1.1.0"; sha256="1aflqic2jfx9y6mxj155n0900xp20g1lliq8ad4nd4z2k0rfcpi2"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf]; }; 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="1.0.1"; sha256="1npv854iasvnrx51vgpda356dqwg7lgnx0d1lm174a0423cj3kmh"; depends=[ape haplo_stats Rcpp]; }; + Rramas = derive2 { name="Rramas"; version="0.1-5"; sha256="0wy0flzp68mikq4v9k5pv6hbzx0w9mpa74dwx79i3iiddn0ylby6"; depends=[diagram]; }; + Rraven = derive2 { name="Rraven"; version="1.0.2"; sha256="0mhf0vv58la1xh8vc31ak1wfi47zsqbjgxy7zz4bjk90g6110jyp"; depends=[doParallel dplyr foreach kableExtra pbapply pbmcapply vegan warbleR]; }; + Rrdrand = derive2 { name="Rrdrand"; version="0.1-15"; sha256="1i7snj33p44v43bz57x1887ing8h02xrf86rv7q0qijj198qf7dr"; depends=[]; }; + Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.2"; sha256="1wz3dp1myjkxzf9l5mfli3dfbkc2fwg70xx7m9cxa06vq0a4w5pv"; 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.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.4"; sha256="1a2x85r2q5h6951frq5d0kvvxyiw18riq9xbswg5g1yhs093yrrs"; depends=[kohonen Rcpp]; }; - Rssa = derive2 { name="Rssa"; version="0.14"; sha256="0r51jw7fl0nxmly05dj85chw804vf8gmrkfs6yi59zh7fq7jsis6"; depends=[forecast lattice svd]; }; + Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.5.1"; sha256="09dsiic9bfy1yq7bwspidn6w21vff3jay8812abydz1l1fz4qv5i"; depends=[kohonen Rcpp]; }; + Rssa = derive2 { name="Rssa"; version="1.0"; sha256="0alh0vq3qqzrn1kklqfp52qknasfq6yzk2dprz3g9pyq05qhmhlw"; depends=[forecast lattice svd]; }; Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; }; - Rsymphony = derive2 { name="Rsymphony"; version="0.1-27"; sha256="0zlkkh2k5il0bqmx9wf2w8wk21zkaf6sm1hx1v1qvzz780cngfh4"; depends=[]; }; + Rsymphony = derive2 { name="Rsymphony"; version="0.1-28"; sha256="02x54ygbcd2600prcww1l9pb02skn96rj0jdljpky1228jbib4nx"; 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.13"; sha256="17crbdi80q4g2pwp9v7j3bdaznk96qlrqx01zvj3wwqippizyfqw"; depends=[Rcpp]; }; - Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.4"; sha256="19wcjgcv871vzclgskvb7xywnzvvi9v5k0qhwxwwi3qc9yx2kpaq"; depends=[]; }; + Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.6"; sha256="18pi42n8zdrahwazcf553clqf0j1ngndb9vg5y71zcdwwphg7caf"; 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]; }; + RtutoR = derive2 { name="RtutoR"; version="1.1"; sha256="132vyqkzjzwms9sbw6dmkqqk45si89r0xvy477xl98k14a2q4jlw"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes plotly ReporteRs rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; }; Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; }; Ruchardet = derive2 { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; }; 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]; }; + Runuran = derive2 { name="Runuran"; version="0.24"; sha256="1528jzpg0m4gya63xjf7ya4x1c96anm6bpzjgsa1vq1a4dz9m4y9"; depends=[]; }; + RunuranGUI = derive2 { name="RunuranGUI"; version="0.2"; sha256="0k3vgn027c2zbrk7pc2wcy2h6dn2djhdi70m8fi1qpz6vg7k8c7x"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 Runuran rvgtest]; }; Rvcg = derive2 { name="Rvcg"; version="0.17"; sha256="0ssmi8mqmq82qrw0hzrmfqpwnkxwdlfa6j049r4l3gn28cfqhg1j"; depends=[Rcpp RcppArmadillo RcppEigen]; }; Rvmmin = derive2 { name="Rvmmin"; version="2017-7.18"; sha256="14jzwqwi1zd8sg1vb18hgvbvsax38hdqjy540qqhn2xb4z8qx3hy"; depends=[optextras]; }; Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; - Rwave = derive2 { name="Rwave"; version="2.4-5"; sha256="1q80759382yig5gmjd83qafavhbbh7bbbgil8qha91xfs27m45br"; depends=[]; }; + Rwave = derive2 { name="Rwave"; version="2.4-8"; sha256="1rmqwyj2r84sii0vfqhyhpi3n1n1zia2ca627fq9ksvwn110nrvh"; 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-6"; sha256="06y4cdkx93ldhdbs5iaiad7hzlbnsjnimmnmvcnfv4gbicxjq9c5"; depends=[]; }; + RxODE = derive2 { name="RxODE"; version="0.6-1"; sha256="1dkz6kq9wq7q2xw2wdzii5682w9f7rmgq28g7pfh8ivimfg1q4bi"; depends=[brew digest dparser inline magrittr Matrix memoise R_utils Rcpp RcppArmadillo rex]; }; RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; 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]; }; @@ -3094,7 +3284,6 @@ in with self; { 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]; }; SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; }; SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; }; SAM = derive2 { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; }; @@ -3102,12 +3291,13 @@ 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_compo = derive2 { name="SARP.compo"; version="0.0.3"; sha256="1fn2rrd89qhz3vnz58xmmdjda70k474iyh4v1cmjfdam74fax7kh"; depends=[car igraph]; }; 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=[]; }; - SASmarkdown = derive2 { name="SASmarkdown"; version="0.3.3"; sha256="0wwqy9gr35isaqzgg48d2gaayaz40n8mjymlj28brbsbrfhddpbw"; depends=[knitr]; }; + SASmarkdown = derive2 { name="SASmarkdown"; version="0.4.3"; sha256="0jc21ylflvv4snik13731acxh9zw79s7hpswk58p2wzvavq8k9zn"; depends=[knitr]; }; SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; - SASxport = derive2 { name="SASxport"; version="1.5.3"; sha256="0hkwz4szl4rzl6arkn6kp8s7nk55g902hpslgzbkaz94wlrzp77z"; depends=[chron Hmisc]; }; + SASxport = derive2 { name="SASxport"; version="1.6.0"; sha256="1g8sfi61im9i04whybwqq4rl6glisbziqaag1mdfqykxryakjf04"; depends=[Hmisc stringi]; }; 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]; }; @@ -3117,18 +3307,20 @@ in with self; { 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.2"; sha256="0z4f8p1d0ry35g5a13blc8w73vid7nwdn2w9d3i0nfb05fj7i5qf"; depends=[]; }; + SCMA = derive2 { name="SCMA"; version="1.2.1"; sha256="17hn3axhmd6wchh1zmgrj026y5yhg6w68d1mif38rrf5cb2wwjnq"; depends=[]; }; SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; SCORPIUS = derive2 { name="SCORPIUS"; version="1.0"; sha256="1ipqscj20qkqik5gsiramsv18ld4k5g9w0gllf1izjimrlrnqc6n"; depends=[dplyr fitdistrplus ggplot2 magrittr MASS mclust pbapply pheatmap princurve purrr ranger RColorBrewer Rcpp reshape2 testthat tidyr TSP]; }; SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; }; - SCRT = derive2 { name="SCRT"; version="1.2.1"; sha256="09d9ghviskg1ifjgqcgdlcp1p3w09bpkixvbxqr4354rq31kwf21"; depends=[]; }; + SCRT = derive2 { name="SCRT"; version="1.2.2"; sha256="1x6bzcgb5blavj4zdw4jam5r8yad3plyfzk31vz9pjv39784k229"; depends=[]; }; SCVA = derive2 { name="SCVA"; version="1.2.1"; sha256="1ixy4ybw3c9w6q8csjv27r5f9x6988zrbr2a3yybhyw8xmkszc4v"; depends=[]; }; - SCperf = derive2 { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; }; + SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; 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]; }; SDEFSR = derive2 { name="SDEFSR"; version="0.7.1.0"; sha256="1pknkda7iaq5247557b93kc3cf2ih7b3wpqpkqyfgfay3ci9kg16"; depends=[]; }; - SDMPlay = derive2 { name="SDMPlay"; version="1.0"; sha256="0pmqn487lvaxbcbx5nz86xpxsbbbiin20havhw6h9j43ly4qic7q"; depends=[dismo gbm ncdf4 raster rgdal SDMTools sp]; }; + SDLfilter = derive2 { name="SDLfilter"; version="1.0.0"; sha256="0g6cwpz1mzmcq16h34255sanqqwyb0a8dn6h043ksvnc91h2haa0"; depends=[data_table geosphere raster sp trip]; }; + SDMPlay = derive2 { name="SDMPlay"; version="1.2"; sha256="0kafj5z1fi5d824h0n23qzn8a6n8fqm3bfc0pdfypzbaj2arjz3k"; depends=[dismo gbm raster SDMTools]; }; SDMTools = derive2 { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; }; + SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; }; SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; }; SDraw = derive2 { name="SDraw"; version="2.1.3"; sha256="179h5byh92dkycchalf875pwq1h4ryg3hba9fs7fbq4dshki5i7p"; depends=[deldir rgeos sp spsurvey]; }; SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; }; @@ -3136,7 +3328,8 @@ in with self; { SEER2R = derive2 { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; }; SEERaBomb = derive2 { name="SEERaBomb"; version="2017.2"; sha256="0fjw8gjafhy6jdj4w9b4xj634gzpdnjbmn2dhhlfg3a7fqh4y91q"; depends=[DBI dplyr ggplot2 LaF mgcv plyr Rcpp reshape2 rgl RSQLite scales survival XLConnect]; }; SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; }; - SEMID = derive2 { name="SEMID"; version="0.3.0"; sha256="1i7pp1jviyx48l5wsb0dh8kgmshkyqkqwaj557ndavpa0v7mn2fg"; depends=[igraph R_methodsS3 R_oo R_utils]; }; + SELF = derive2 { name="SELF"; version="0.1.1"; sha256="1yafjhxwsanr33dqy7w9x61ghldr29s8k6h68idq6nnfb77ghjyx"; depends=[bnlearn CompareCausalNetworks data_table Rcpp xgboost]; }; + SEMID = derive2 { name="SEMID"; version="0.3.1"; sha256="0q2lbcfl5yq2kihdfyql5n74bpf4d8z8vjkqwnpwxzmpg5qa5q32"; depends=[igraph R_methodsS3 R_oo R_utils]; }; 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]; }; @@ -3146,21 +3339,21 @@ in with self; { SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; }; 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]; }; + SHELF = derive2 { name="SHELF"; version="1.3.0"; sha256="0qhkp1ypbimiq9r8yv95bipbmhm7b38ibbk9nmhdckrr6ymd2w35"; 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.3"; sha256="14ab9zid0i400kj924m2y5qgp2iibnpllhqw11rlmdf8j9cr7858"; depends=[dplyr ggplot2 hdrcde magrittr mnormt rjags spatstat_utils tidyr viridis]; }; - SIBERG = derive2 { name="SIBERG"; version="2.0.1"; sha256="0679npp89d6xqs95c2kj95dbbp2v4g933ppkcn315siw2s553nv5"; depends=[mclust]; }; SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; }; 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.1.0"; sha256="05qwcc3l4b54wn51y10x03yk7sp1habnpmqzn304kz3lv3s5whdf"; depends=[glmnet MASS survival xtable]; }; + SILGGM = derive2 { name="SILGGM"; version="1.0.0"; sha256="1lhmisgg2zbfksl7czz0fqag3732gkjc44n615ipxbdi2pvnc7m0"; depends=[glasso MASS Rcpp reshape]; }; + SIMMS = derive2 { name="SIMMS"; version="1.1.1"; sha256="1wgqz8zgijv5psz5r5zj9k63ikq5sr1dxqxvh48n2041slj6jdap"; depends=[doParallel foreach glmnet MASS survival xtable]; }; SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; - SIS = derive2 { name="SIS"; version="0.8-4"; sha256="1bhpj0l28804f48nc68xg0cfbpzplr2n32ccfs4w9g2m7lgarg07"; depends=[glmnet ncvreg survival]; }; + SIRItoGTFS = derive2 { name="SIRItoGTFS"; version="0.2.2"; sha256="1vjpnhpf8b3fwxgmmp7nljmk8js7sn2sn9ajlsgpmnww1bq4sh5f"; depends=[data_table dplyr easycsv reshape2 rgdal rgeos sp]; }; + SIS = derive2 { name="SIS"; version="0.8-6"; sha256="1749ks5iqlj6lrn0hglifj1iy86dcpqz2pcnf1l798pa05rq8ngd"; 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.3.2.1"; sha256="0ylfz63xiq2zw9nc8nqr89qbhl3fnkhjgg9x7yxjm78vrn640hkl"; depends=[]; }; SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; - SLDAssay = derive2 { name="SLDAssay"; version="1.7"; sha256="123yh2xasfa90bjjqdihrrrjb2754frlkggx5wg6590sk3i1kp5n"; depends=[]; }; + SLDAssay = derive2 { name="SLDAssay"; version="1.8"; sha256="04ykj7s9kpvg5bmf7x16154kfpdy45b7y7hhyh31sxlscv7c5bbp"; depends=[]; }; SLHD = derive2 { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; }; SLICER = derive2 { name="SLICER"; version="0.2.0"; sha256="10i0hfl6js26n8xwk9pldzm9vv7hmii6gzj04lhqy0g3njds25kp"; depends=[alphahull igraph lle]; }; SLOPE = derive2 { name="SLOPE"; version="0.1.3"; sha256="12naak08qjpn6l1ikqwf17h72zk4b5mppgxx7ks9wmnqy9ylhy3x"; depends=[Rcpp]; }; @@ -3171,14 +3364,15 @@ in with self; { SMIR = derive2 { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; }; SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; }; SMM = derive2 { name="SMM"; version="1.0.1"; sha256="0g2blwcir0sxvqrivcyn9a8ssx34834lgcwrjwb6kcrq224dchws"; depends=[DiscreteWeibull seqinr]; }; - SMMA = derive2 { name="SMMA"; version="1.0.1"; sha256="0ld8jjh67iw5w5cmb2gb899269apjydgqjsnn5hq5lzqjilpzzl8"; depends=[Rcpp RcppArmadillo]; }; + SMMA = derive2 { name="SMMA"; version="1.0.2"; sha256="13psgrpljnaxpcq4amiyg5mqhpzmb2hyb7jzh3h8wyq18rvs3s4d"; 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=[]; }; SMVar = derive2 { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; }; - SNFtool = derive2 { name="SNFtool"; version="2.2"; sha256="1d84ybsi91mr3ma4jzmr9606hg1q00yg0dn50vkjnyda50igcb1c"; depends=[heatmap_plus]; }; + SNFtool = derive2 { name="SNFtool"; version="2.2.1"; sha256="0id8qvkvxvnlqn3wha45v457pr4061j35wcwlqwh03n0j549s84l"; depends=[heatmap_plus]; }; SNPMClust = derive2 { name="SNPMClust"; version="1.3"; sha256="1gad1jfla4qpczh8vpwyss5cckzgpffsyj0d71r8drbspr4i3r90"; depends=[MASS mclust]; }; SNPassoc = derive2 { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; }; + SNPknock = derive2 { name="SNPknock"; version="0.5.1"; sha256="0vp6nsa2ydfn6m7fwsgjwdzhvrwzjyv79n1fa5910lj1f0g5ijw2"; depends=[Rcpp]; }; 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.3.1"; sha256="1w6yai79996pgg98skfb63kha8rqjzn751nmxg961rc4id1g8ysn"; depends=[emdbook knitr magic plyr progress statmod]; }; @@ -3189,7 +3383,7 @@ in with self; { SOFIA = derive2 { name="SOFIA"; version="1.0"; sha256="1jlaggxa2nz2r5yb2xmf0dh5wmxfdk6xwn0l3nwsqh82vyxhp7l9"; depends=[png]; }; SOIL = derive2 { name="SOIL"; version="1.1"; sha256="0dvfh84xjzald51kmdb546par2rbjdn3nys9y9w7cvafv2lc5yj9"; depends=[brglm2 glmnet MASS ncvreg]; }; SOLOMON = derive2 { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; }; - SOMbrero = derive2 { name="SOMbrero"; version="1.2-2"; sha256="1y1shgzsl922id3r7yrc5715zg5l6pxmim969h3ba32ry6mr0sr8"; depends=[igraph knitr RColorBrewer scatterplot3d shiny wordcloud]; }; + SOMbrero = derive2 { name="SOMbrero"; version="1.2-3"; sha256="04vla01y3qagzpyr70mx9dgl0ihk9a9vh02896fr8kc9ch3sx6bd"; depends=[igraph RColorBrewer scatterplot3d shiny wordcloud]; }; SOPIE = derive2 { name="SOPIE"; version="1.5"; sha256="0isvb2vzzpn57bq0ix2pfaqdnl5z8qk6v6fvf15vnxcqg2sm63q5"; depends=[ADGofTest circular]; }; SOR = derive2 { name="SOR"; version="0.23.0"; sha256="0djmz57g23xpzv6p8i71f3zrsc6xdgqkbcvn5cbx9m78n31ipkm5"; depends=[Matrix]; }; SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; }; @@ -3198,8 +3392,9 @@ in with self; { 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="2.0.0"; sha256="1285ayvx1rfjd7gn3gxqbc6rjclp41rdsy47r0zijipj0y0b99wp"; depends=[]; }; + SPAtest = derive2 { name="SPAtest"; version="2.0.2"; sha256="1h1qgjisd1kxw3644s5xmj212mnqkbfdzz9sa9wk4vb2dzv4660r"; depends=[]; }; SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; }; + SPCAvRP = derive2 { name="SPCAvRP"; version="0.2"; sha256="1kqx2mf75h491aj6rm923frpj1yl9c1p666cq3f1d7aa1k9byrzi"; depends=[MASS]; }; SPECIES = derive2 { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; }; SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.5"; sha256="1m8als33k8db82pr9k8n4jk6i1dqimd9klw8xawwz7gzk1h31fsr"; depends=[]; }; SPEI = derive2 { name="SPEI"; version="1.7"; sha256="0lj7d3bbik7q4di5nqc3a1rn94z2y2v9x45r1jjkvgf03frj96qd"; depends=[ggplot2 lmomco]; }; @@ -3207,32 +3402,35 @@ in with self; { 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="2.0.1"; sha256="0zyh0pn0mc7n150851vdqx3ixjn53id3pm3a408365h0wafcrn3g"; depends=[MASS randomForest]; }; + SPOT = derive2 { name="SPOT"; version="2.0.2"; sha256="17apfbsh4qv3yhv7jpmmyz7whwx4ilm0krspxyc4knm3yxxw26bp"; depends=[DEoptim MASS nloptr randomForest rgenoud rsm]; }; 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=[]; }; SPSL = derive2 { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; }; + SPUTNIK = derive2 { name="SPUTNIK"; version="1.0.1"; sha256="1b8rawkcq15r4cyji245x59l1m3qkj0n31nhs1bjd3286zpdcg7b"; depends=[autothresholdr ggplot2 imager infotheo reshape SDMTools spatstat viridis viridisLite]; }; + SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; }; SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; }; SPreFuGED = derive2 { name="SPreFuGED"; version="1.0"; sha256="1cdamkrr0xpc0l2dypd9lgjidrmalfxs0ms7z3wfmf22a8b3y0d2"; depends=[Biobase boot CMA lattice limma lme4 mvtnorm]; }; SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; }; SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; }; - SQUAREM = derive2 { name="SQUAREM"; version="2016.8-2"; sha256="1iywv8sj5v0qr5vc0zcs8yqwqrivp0jd45j1g4zkq332c68vvl0k"; depends=[]; }; + SQRL = derive2 { name="SQRL"; version="0.2.1"; sha256="01nad4j2q20agi62zay0n731ljwgil7ql0gick5s7f9khhciilf6"; depends=[RODBC]; }; + SQUAREM = derive2 { name="SQUAREM"; version="2017.10-1"; sha256="10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv"; depends=[]; }; SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; }; SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; }; SSBtools = derive2 { name="SSBtools"; version="0.2.1"; sha256="1cqdmvh9gxyx2yciy0j54v84hl8cayifv368ip5y3k6g1cff6488"; depends=[]; }; - SSDM = derive2 { name="SSDM"; version="0.2.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]; }; + SSDM = derive2 { name="SSDM"; version="0.2.4"; sha256="1zn0iaav58pjzd6ckm28w16pblkjxacj2s1daj0sk0423dhjkf76"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; }; + SSDforR = derive2 { name="SSDforR"; version="1.4.17"; sha256="0c4w1fl199ksb63xxpawmld8bri9vcpbd2ypx5qrdfk4if5jhrrf"; depends=[MASS psych TSA TTR]; }; SSL = derive2 { name="SSL"; version="0.1"; sha256="0fy6svf8xfni72bpsg8a5wr8ly46srhfixk8866lrcsp8pb6mqcd"; depends=[caret e1071 klaR NetPreProc proxy Rcpp xgboost]; }; SSLASSO = derive2 { name="SSLASSO"; version="0.0-1"; sha256="045w4j9rqqmkp1am838isa9an30hlvc46w9fkpl0q6npk6fl9rws"; depends=[]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; - SSN = derive2 { name="SSN"; version="1.1.10"; sha256="0fhwshl6vwf9cvbg8j284i27vayjrslk5hpyvrby390jma9klk4i"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; + SSN = derive2 { name="SSN"; version="1.1.12"; sha256="1c2dx7d9izd4z76pvsbbfb0r1a6w45x96mv4vb9h99yafcw380nv"; 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.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.1-51"; sha256="1gpnhwmlwc742pg8c7ya9yn591xryi6cq631q5c4180d8s424gsr"; depends=[CDM LAM sirt]; }; + STARTS = derive2 { name="STARTS"; version="0.2-10"; sha256="16d578rgl13x29lbv95g7qrcf0lmxjcz8mxrrd5cb7405bl4a1rq"; depends=[CDM LAM sirt]; }; STARTdesign = derive2 { name="STARTdesign"; version="1.0"; sha256="1q61l3v8ishzax3ppy0pz4ky4l46472l6j36hjlsa8cl01ik1zjf"; depends=[Rcpp]; }; 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]; }; @@ -3240,10 +3438,11 @@ in with self; { 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]; }; + SUMMER = derive2 { name="SUMMER"; version="0.1.0"; sha256="14dq64h931l8r4pfhdg3i8wabb08n1fnnp8ql1bmhl1z4dqbggfl"; depends=[classInt ggplot2 maptools RColorBrewer sp spdep survey survival]; }; + SVMMaj = derive2 { name="SVMMaj"; version="0.2-8"; sha256="13d9v1l85md1v6qyfrdc3l36yanw5canskngjr1sh0hmyla182bz"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; }; SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; }; 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]; }; + SWMPr = derive2 { name="SWMPr"; version="2.3.0"; sha256="1z6gg8ih1m5nxm1kilpwxj4xvlbyqr67la7idrfa722y6f6264rf"; 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]; }; 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]; }; @@ -3251,13 +3450,12 @@ in with self; { SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.1.0"; sha256="0wx1rfyf753wppjwwb3l1zpmg4b2mwnwjcw45yzav54yxaszy2v3"; depends=[]; }; SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; 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]; }; + SamplerCompare = derive2 { name="SamplerCompare"; version="1.2.9"; sha256="1fl9wgbfnkn2ai4swspl88crqpgd9b43hj8rkqkky4b49b8f6bj8"; depends=[mvtnorm]; }; + SamplingStrata = derive2 { name="SamplingStrata"; version="1.2"; sha256="1qz0pcmp8a9wbq8qx1j2bv1j4makx97v9n4aiklagnmszg2gvggy"; 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]; }; + SciViews = derive2 { name="SciViews"; version="0.9-13"; sha256="11zkq3dz2c7l8qxm3wrr3b5bb9h70sf9qxaz983lqwpjva30baa8"; depends=[ellipse]; }; 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="2.0.2"; sha256="08pg51rjvb29fhv8wx03q6ncfw616pszgpcdywkplbgab26rrx1q"; depends=[car effsize forecast reshape2]; }; @@ -3272,61 +3470,68 @@ in with self; { 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]; }; + SegCorr = derive2 { name="SegCorr"; version="1.2"; sha256="1g4bwfs539jf7ckzjyindi3v1av7vd38yz16m7cb20qqa0a33kbj"; depends=[jointseg]; }; 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.7"; sha256="092mf3dfwa78rh9bh3a4f2gsflax013100a4zld47j5lkp24diy4"; depends=[MASS survival]; }; + Select = derive2 { name="Select"; version="1.2"; sha256="0ljlh7zj4r3izns47sa8bx17ll0ki6p02fpjxwghy1hz9k6ak9ir"; depends=[lattice latticeExtra Rsolnp]; }; + SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; }; + SemiCompRisks = derive2 { name="SemiCompRisks"; version="2.8"; sha256="1f4cpqjb737fz6iiadhdi1ansfi5wj1zl403b3xw7l20k4f39952"; 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]; }; 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=[]; }; - SensMap = derive2 { name="SensMap"; version="0.3"; sha256="1x15gch688249ly6qw9wwl9dg72j815f03v964pffajki0m67ban"; depends=[doBy factoextra FactoMineR fields ggdendro ggfortify ggplot2 glmulti lattice MCMCpack mgcv plotly shiny]; }; + SensMap = derive2 { name="SensMap"; version="0.6"; sha256="0j52aplvdlwwfswyrij0vv7zsdr015cn5931c6631rlps94gka0w"; depends=[doBy factoextra FactoMineR fields ggdendro ggplot2 glmulti lattice MCMCpack mgcv plotly shiny]; }; 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]; }; + SensoMineR = derive2 { name="SensoMineR"; version="1.23"; sha256="0a1s2wrb86a0y2faxj5ax8fa6vfcclgg7bcff4j7jb40ilxnxhn4"; depends=[AlgDesign cluster FactoMineR ggplot2 gtools KernSmooth reshape2]; }; SensusR = derive2 { name="SensusR"; version="2.2.0"; sha256="0ahgy6mvlxfdavdarmfmb1ld1pykhbrjgg8mdh5q71b3a75vbp47"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; }; - SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.2-0"; sha256="1hxn7lnq21ja9hgi35pz446q7gr6pzmfxg3mcd7yfk9679cixjpq"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; }; + SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-0"; sha256="098w4kcd6xsgwi996plm06nmyg8f7sg9wjphymmfl29k5y2zyz4s"; 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]; }; + SeqBayesDesign = derive2 { name="SeqBayesDesign"; version="0.1.0"; sha256="0426v7lf7z0r8lc9clwnq6n977m27cd7l218i5dfssllkv17h88k"; depends=[MASS Rcpp]; }; + SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.6"; sha256="0y06am4q9cgf8cfycw9ym5qys0g99ks3cfxgk0mss34i5vhbfjfr"; 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.2"; sha256="01zvgvdj57js08krskahk1ng3wkv9iblmirslgrmllf4q18zwsdr"; depends=[]; }; - SetMethods = derive2 { name="SetMethods"; version="2.1"; sha256="1n6pd6cs11qahbfimqg1mskvq364gs1hvjbyygr49pv28cb3rig7"; depends=[betareg lattice QCA]; }; + SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; }; + SetMethods = derive2 { name="SetMethods"; version="2.3"; sha256="10xzvr7xfv2vwa3byw4qb3v8gi8d36w9drjzqsxx52ffnjb95670"; depends=[betareg fmsb 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=[]; }; - Seurat = derive2 { name="Seurat"; version="2.0.1"; sha256="1w24fy60r7lkdz7rn09a0jnmdg6gf5q3q25bckiqp6mjmyikm8va"; depends=[ape caret compositions cowplot diffusionMap dplyr dtw e1071 FNN fpc gdata ggjoy ggplot2 gplots gridExtra Hmisc ica igraph irlba lars MASS Matrix mixtools NMF NMOF pbapply plotly ranger RColorBrewer Rcpp RcppEigen RcppProgress reshape2 ROCR Rtsne SDMTools stringr tclust tidyr tsne VGAM]; }; + Seurat = derive2 { name="Seurat"; version="2.2.1"; sha256="1sr82nf38hq07avrfn8vlrzjq7dfm4pcr8l1nh6mnglcql2bk9z2"; depends=[ape caret cowplot diffusionMap dplyr dtw FNN fpc gdata ggplot2 ggridges gplots gridExtra Hmisc ica igraph irlba lars MASS Matrix metap mixtools pbapply plotly ranger RColorBrewer Rcpp RcppEigen RcppProgress reshape2 ROCR Rtsne SDMTools stringr tclust tidyr tsne VGAM]; }; 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]; }; ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; }; - ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.3"; sha256="1l7x1aw1nfjcwv3b47x3hr5yvdhbxyn8gxipwx5asr6gc62jxlqf"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap xtable]; }; + ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.6"; sha256="126rvy7pra60fz7pmc6n9liahhwrq313gbqrkvcpcwdv807l39c8"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly 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]; }; + ShortForm = derive2 { name="ShortForm"; version="0.3.0"; sha256="03yxn535yv11l5ckw26jd0maf2k0xpvichid5vwn0vb1f6ryk1xn"; depends=[lavaan MplusAutomation]; }; ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.2.0"; sha256="1ybd8vm69y50lj2mkmcdyplxb689xfg4spbl129v8hlvhw69mzmy"; depends=[]; }; SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; }; - SiMRiv = derive2 { name="SiMRiv"; version="1.0.1"; sha256="17aja5blbslj6pzypxk2nx91lnqdq2z5kn0ss9xfd3x4h9hvw81y"; depends=[mco raster rgdal sp]; }; + SiMRiv = derive2 { name="SiMRiv"; version="1.0.3"; sha256="1kzvbzmqcxs0sh23nmjd39zkg68kbnc5djpbjhqhn55qjdfx5776"; depends=[mco raster rgdal sp]; }; 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]; }; + SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; 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.8"; sha256="07zg8azj9giay460x0y4cmmipl22cbfc2ba3hi3szmmnfn6z21i7"; depends=[Deriv MASS rgl scatterplot3d]; }; + Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.0"; sha256="04p6q3g0afyky2ljxf471axik6vwj9l4dv4r487jrykrlhnjrm4z"; depends=[Deriv MASS rgl scatterplot3d]; }; + Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; }; SimComp = derive2 { name="SimComp"; version="3.2"; sha256="04rmpxasaa888p6f0rhhpvpqc39fppdkcwbq5sxcslx7bwc9w9z8"; depends=[mratios multcomp mvtnorm]; }; + SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; }; SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.5.0"; sha256="10afb3k4rvsmgfx6m1csb0pvnjba1d896llfh3ksmjzxglmvslgw"; depends=[evd]; }; - SimDesign = derive2 { name="SimDesign"; version="1.7"; sha256="0n71irxa2yjy3hx3138r2fjnwn46ihbbq235vk7h9sxdy37ksp1f"; depends=[foreach pbapply plyr]; }; + SimCorrMix = derive2 { name="SimCorrMix"; version="0.1.0"; sha256="1fq1gjjjs2d91lvvpwlw1xqcr1kw10qzybzphpy6hniq1xx00nnj"; depends=[BB ggplot2 MASS Matrix mvtnorm nleqslv SimMultiCorrData triangle VGAM]; }; + SimDesign = derive2 { name="SimDesign"; version="1.9"; sha256="1pwci1n7psrsv4mbl1mw3806cilmf3y9v507cdlzcd8jxl354vj7"; depends=[foreach pbapply plyr]; }; SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; }; - 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]; }; + SimInf = derive2 { name="SimInf"; version="5.1.0"; sha256="0ylkz6vybwza7fk24f4gybwm4afp0kcx0hlbl05jpif9gmwx6n3s"; depends=[Matrix]; }; + SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.1"; sha256="08zd9bvi3vi2nz3ljaw9rymmqwg1k9yislk3s4ak3jgqmcaq9zls"; depends=[BB GenOrd ggplot2 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]; }; + SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.1.0"; sha256="1krdz4gxnqxj3wabc5hn7ayfqdfmpgg66zj09b3jnngcdaxkjlwb"; depends=[dplyr kinship2]; }; SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; }; SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; + SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; }; SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; }; SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; @@ -3335,7 +3540,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-4"; sha256="01bsr98m3a7i075f2q04jjmhqb2m9120w6yg1af168s25qymfjwy"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; }; + SixSigma = derive2 { name="SixSigma"; version="0.9-51"; sha256="0101zdz2dqlazg7k8li762g58z0xds76s8nzjjfb3y2j5nqkbjga"; 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]; }; @@ -3346,11 +3551,11 @@ in with self; { 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]; }; + Smisc = derive2 { name="Smisc"; version="0.3.9"; sha256="12chfjjg588a55q3yg0i507vl68hhk7zzprj849smq9azaxidn4k"; depends=[doParallel plyr]; }; SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; }; SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; }; SmoothWin = derive2 { name="SmoothWin"; version="1.0.0"; sha256="19yd3gnanv8q8ab0x8ds61rznm5w71dri0liknylikiqgbqwxrcn"; depends=[msgps]; }; - SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.6"; sha256="1p15k57hi31i3p6v63v9s7hi1w9kb4aqjcgz405jk4klsifzw8va"; depends=[jsonlite Rcpp stringr]; }; + SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.7"; sha256="1i8g0p51mp0j46434zzhmijwwk1v6my7rdw8j41ac3b4as3g0c73"; 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=[]; }; SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; }; @@ -3360,37 +3565,43 @@ in with self; { SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; }; Sofi = derive2 { name="Sofi"; version="0.16.4.8"; sha256="0h9ir0xrwmsabfhwsr9hbpwabh1fsb3p51y8qcgm92iyvc6dl3mf"; depends=[foreign sampling shiny]; }; SoftClustering = derive2 { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; }; + SoilHyP = derive2 { name="SoilHyP"; version="0.1.0"; sha256="030xzhd2mfibj4z3d73zplx814w9mpsf08bdllj6crqd9ipj4sbq"; depends=[]; }; SoilR = derive2 { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; }; + SolveLS = derive2 { name="SolveLS"; version="1.0"; sha256="0yb2sx3wjhccmkq8p3jj5pp8dgsdfvv4hr88km5yajl950wkbizp"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; SorptionAnalysis = derive2 { name="SorptionAnalysis"; version="0.1.0"; sha256="0drns1ajcga5z56hcgjxld1riwjn7vli8k1ma1xqifpy1qwy7ci6"; depends=[]; }; SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; }; SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; }; - SoyNAM = derive2 { name="SoyNAM"; version="1.3"; sha256="128iq8rrj6nm8zdqrv17gsjxzdsfashgzk1k7lnw38w04a2g05zs"; depends=[lme4 NAM reshape2]; }; - SpATS = derive2 { name="SpATS"; version="1.0-5"; sha256="0nxv6mnbwd1a9yh883dqhcz6qnjznqc7q6c43s23lggj9wmjlzwj"; depends=[data_table fields plot3Drgl spam]; }; + SourceSet = derive2 { name="SourceSet"; version="0.1.0"; sha256="0vibh0v9j8sfsh8535g03q8m28881fagkkra8xxazf3zv5197p11"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; }; + SoyNAM = derive2 { name="SoyNAM"; version="1.4"; sha256="0b48nm3xgvzws9222fmq07chqx4yllz4qjgzxg156s0waxfrjjfi"; depends=[lme4 NAM reshape2]; }; + SpATS = derive2 { name="SpATS"; version="1.0-7"; sha256="0gnv0hw5h4fin4vy6q8rjb1pry3c1vs0djkhbbkjvh52ycwlxjm7"; depends=[data_table fields plot3Drgl spam]; }; SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; }; - SpaDES = derive2 { name="SpaDES"; version="2.0.0"; sha256="1fbf40qyb0nhvk1sdzxwn7g3p73v325z9mkij1mzgjyprb91i9k9"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; }; - SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.0"; sha256="0jggwywzs5i9v3xvyqk6j39mwp45zjhh145pb972yrdivxlw6vhc"; depends=[devtools magrittr miniUI rstudioapi shiny SpaDES_core stringi]; }; - SpaDES_core = derive2 { name="SpaDES.core"; version="0.1.0"; sha256="17gr386xxp22i5ln7grd1dbfxmkwfs0fnhyd7v40lmwdknj7myl7"; depends=[chron CircStats data_table DEoptim DiagrammeR digest dplyr fastdigest fpCompare httr igraph lazyeval lubridate quickPlot R_utils RandomFields raster reproducible sp stringi]; }; - SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.1.0"; sha256="178xcvh5m5hkyjiqq6bgk6a7r7nrfd4fv5r6g27b26inxlpxc2bg"; depends=[bit checkmate CircStats data_table fastdigest fastmatch ff ffbase fpCompare magrittr quickPlot RandomFields raster Rcpp reproducible sp]; }; + SpaDES = derive2 { name="SpaDES"; version="2.0.1"; sha256="00l05kc7mgip41r8yqq3nk2mr5i0acal2b4man5lsgb5vblp4ij9"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; }; + SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.1"; sha256="0sipgq00lacy7yk81crr8h7xfm4vs4h66w6rqsll8i7di19g13cj"; depends=[devtools magrittr miniUI rstudioapi shiny SpaDES_core stringi]; }; + SpaDES_core = derive2 { name="SpaDES.core"; version="0.1.1"; sha256="12w2yr4q440n68p4gcj82h7gzjd240khfxjwxpngfbhbgp7rmv4b"; depends=[crayon data_table DEoptim DiagrammeR digest dplyr fastdigest fpCompare httr igraph lubridate quickPlot R_utils raster RCurl reproducible sp stringi]; }; + SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.1.1"; sha256="0qfwcgy0nx4754zqi8fhk6q11yv9c5w6pa0wds6szga53hwwdi8g"; depends=[bit checkmate CircStats data_table digest fastdigest fastmatch ff ffbase fpCompare httr magrittr quickPlot RandomFields raster Rcpp reproducible sp]; }; 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.12"; sha256="158c2y3qc0b9nnk437hqx18wcx9k4na62hkplyy809j4c6fkk4n0"; depends=[]; }; + SparkR = derive2 { name="SparkR"; version="2.3.0"; sha256="0dm4yqpppf2chpcsgsj812vx8mzgmwsc4jwkilrpgxfr6s54imgi"; depends=[]; }; + SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; 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.77"; sha256="0p6ljma2h12cq1xmy0cxb48ih8dhxxbnwkqzvx3cckxf2kprycm9"; depends=[]; }; SparseTSCGM = derive2 { name="SparseTSCGM"; version="2.5"; sha256="004hbk5fdd5b5hdvg25wl1908pfya26brm2pz00zypfvis99lps3"; depends=[abind flare glasso longitudinal MASS mvtnorm network QUIC]; }; + SpatEntropy = derive2 { name="SpatEntropy"; version="0.1.0"; sha256="0nk399anjhsdki9cra650ynk6sa0366495470sawxcfs3vxmlzrl"; depends=[spatstat]; }; 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]; }; + SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.0"; sha256="12b9ijbzzkhwrs7q0z5srawiskr3gdjvgdsrmsn4dhyqdzdbi8b6"; depends=[Rcpp RcppArmadillo RcppParallel]; }; SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-2"; sha256="1nyxxwvlnhz78pw31dqijp1crlar5nak5934s4h0a4sajv9syif2"; depends=[]; }; + SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; }; SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.2"; sha256="172i4khjb2fh818bq7wdfdm79fwxjwi60nqfj69dgbgcaww55ffr"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; }; SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; 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-5"; sha256="0p56h2dbdgbxzvfrdjnbr1yxr3wrlsrfgfgk4j8gf4nb4j6mrbiz"; depends=[fields maps]; }; - SpatialFloor = derive2 { name="SpatialFloor"; version="1.0.1"; sha256="0bb7crfqnfswr01dhv374iwxs36sxajs4y5qi1y6x3jjwach6nbg"; depends=[fields reshape2]; }; + SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-6"; sha256="14clsb7w7p39ak00127lfa7irl67vqydvafkj8vs8qn9i3kaj6iz"; depends=[fields maps]; }; + SpatialFloor = derive2 { name="SpatialFloor"; version="1.0.3"; sha256="14nbl0kb4c46kxvw900d972n78x6q0y9039l6p4r9w2i9ir7g1yh"; depends=[fields reshape2]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-2"; sha256="048zzyy3hav8qg0zad2fsv5z1avdppwwdcv0rc6j635wzhdmsl1j"; depends=[]; }; SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; }; SpatialPosition = derive2 { name="SpatialPosition"; version="1.2.0"; sha256="140fg3bjj7383nrdbgnk9lccj4yjq65rkprqpmf4q0mwbc89mmqc"; depends=[raster rgdal rgeos sp]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; }; - SpatialVx = derive2 { name="SpatialVx"; version="0.6-1"; sha256="1yscz5w6ydh87qh4ncgn6br49pzg08nqgx95m5bmydqx2r74h9jg"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; + SpatialVx = derive2 { name="SpatialVx"; version="0.6-2"; sha256="12kwwhxlvlkss1rg9ipaw97l5kw50m7crpcpv1y420sf14873j7r"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; }; SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.7"; sha256="1v3v717ah2fkx9225860dwppdf5m6nnnaaa4iwmj30rn17nqr4jh"; depends=[gsubfn splancs]; }; SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; }; @@ -3399,19 +3610,19 @@ in with self; { SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; 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.4.3"; sha256="1xv71qx1wxfbczrqxh1zrywzwwvjjd2yrwl62cg5hclnbivn4435"; depends=[rJava]; }; - StAMPP = derive2 { name="StAMPP"; version="1.4"; sha256="0rmp5l50dkkldq9xc1abhdxjhbwlqk3i3g0d8w3xissidnz5n31b"; depends=[adegenet doParallel foreach pegas]; }; + SqlRender = derive2 { name="SqlRender"; version="1.4.8"; sha256="08q9h6aca7vzgy1ipvghvrspdvmzlgmvhjgibcn38lfyl09xyfas"; depends=[rJava]; }; + StAMPP = derive2 { name="StAMPP"; version="1.5.1"; sha256="0yyssscx3l4csban66gb4q35h37gf7pqvvycfsy56n96pnnlrgkf"; depends=[adegenet doParallel foreach pegas]; }; StMoMo = derive2 { name="StMoMo"; version="0.4.0"; sha256="0zkcp19a76dm29fba5r96dxly709sic2k5p9hzc70cvwjhwhfr7v"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; }; StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; }; 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]; }; - StakeholderAnalysis = derive2 { name="StakeholderAnalysis"; version="1.0"; sha256="0gjjyxw9413xi8vx9fvw2mlz90br6viws1qzyvy4gxc5mp2bsmaw"; depends=[]; }; - StanHeaders = derive2 { name="StanHeaders"; version="2.16.0-1"; sha256="0i1gq32ys7iwgbdrwc86ww8kj5aqc7jbl663dynackb7wmqwlb7r"; depends=[]; }; + StakeholderAnalysis = derive2 { name="StakeholderAnalysis"; version="1.2"; sha256="164mah8h8izxaqp8hc43l6mlnf95pydkcx2laqrlqr9b0bybadxb"; depends=[]; }; + StanHeaders = derive2 { name="StanHeaders"; version="2.17.2"; sha256="11fcc59z63rkgk6pp5vhb5avjlbhbjs2v5mn496ai9jms4223ivc"; 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]; }; + StatCharrms = derive2 { name="StatCharrms"; version="0.90.7"; sha256="082pwqn08b9ij0vmc68sf43fin2hp16mlpi3d0i9ynpda9v22nr8"; 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]; }; @@ -3420,36 +3631,40 @@ in with self; { 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]; }; + StepReg = derive2 { name="StepReg"; version="1.0.0"; sha256="1ifdns1fpsjcbwcy19h5hxnd3an53qwba2a7gpn2571zb1phraz8"; depends=[Rcpp RcppEigen]; }; StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.5.9"; sha256="11lsjiry04m6yf4n1q0kniad6qdrj88pkziabi5glivijq0dh1wr"; depends=[Rcpp]; }; StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; }; 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=[]; }; + StrainRanking = derive2 { name="StrainRanking"; version="1.2"; sha256="1r8avm9xajqmsy4x7pgh1yaffq7wl5i5kg75kdilydwmii6n19i0"; depends=[]; }; StratSel = derive2 { name="StratSel"; version="1.2"; sha256="11dkhyh0xgl23f9ksxcjl6bqfhwm6k6i1chgx23dvjifbm6s5s5p"; depends=[Formula MASS memisc mnormt pbivnorm]; }; Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; }; StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.2.0"; sha256="0iwzvschncb2vrmsawb6i94shn2cjbkph854x1z4ykr6ddw411g2"; depends=[plyr]; }; StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; 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=[]; }; + String2AdjMatrix = derive2 { name="String2AdjMatrix"; version="0.1.0"; sha256="058r30kjjna02nmd6ngqfcnn1yk5390i20xvl6qb5qk3bcp2wmxn"; depends=[stringr]; }; StroupGLMM = derive2 { name="StroupGLMM"; version="0.1.0"; sha256="1w0xizdmwqflfhqwygyq7fw5ci7pdzmr8dfv3j0g3ljbj84kndzd"; depends=[aod broom car ggplot2 lme4 lmerTest lsmeans MASS mutoss nlme pbkrtest phia survey]; }; StructFDR = derive2 { name="StructFDR"; version="1.2"; sha256="00h3mx7kf01snngkcarhyidqiycvnjhcs81x3kprgp6597md7ph1"; depends=[ape cluster dirmult matrixStats nlme]; }; SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; }; - SubTite = derive2 { name="SubTite"; version="1.1.1"; sha256="07d5v6gzbgkp0svlr7ff73q1w07znkyawyhb0j1igkjy0jq1h648"; depends=[Rcpp RcppArmadillo]; }; + SubTite = derive2 { name="SubTite"; version="2.0.1"; sha256="1wmsks2dn3lv2m818g57115aqi821bs6ik94hx75knkfvw1835ys"; depends=[Rcpp RcppArmadillo]; }; 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]; }; + Sunclarco = derive2 { name="Sunclarco"; version="1.0.0"; sha256="0jv92a4ciwkm0wa4irgb6ql3vf6v6p24fmbnk24pqp5p8drp8g5v"; depends=[survival]; }; 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.4"; sha256="0wjqvwff5ag8hh6v2plc774hk6ydsyvr6ihlp9a15v0f0p61x6bk"; depends=[]; }; + SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.0"; sha256="184s0pnwv9irqjlv24svfz3ami559ln03wjknyj67pwi4pfbzz87"; depends=[]; }; SuperGauss = derive2 { name="SuperGauss"; version="1.0"; sha256="1yqskaz4zsx87mcb9p7081h2lilaiwa3213yxlkyihyans7gnmp8"; depends=[fftw Rcpp RcppEigen]; }; SuperLearner = derive2 { name="SuperLearner"; version="2.0-22"; sha256="1yajqqsxfrp9ybaa8ffwdrbwm3rfy5pgp6ma1ak43qg3plclllyr"; depends=[cvAUC nnls]; }; - SuperRanker = derive2 { name="SuperRanker"; version="1.0.1"; sha256="0s5d38xaan4jznb3nlr9rj054haf6wks0229lggykj8mfz746wky"; depends=[prodlim Rcpp]; }; + SuperRanker = derive2 { name="SuperRanker"; version="1.1.0"; sha256="19cfz89557ygf5dvvqykmxcr72sfa0s2d37pplp6iwbhkl4wfw04"; depends=[prodlim Rcpp]; }; SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; }; - Surrogate = derive2 { name="Surrogate"; version="0.4"; sha256="04lscndba5imqjhd8ajb13812qsg0yzpgdfyjlz3y9xzvafpkg3w"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; }; + Surrogate = derive2 { name="Surrogate"; version="0.6"; sha256="18cqcnzf64wk33qshsamija0r9xpnca0w2a8qz1ikj9r21vabhhw"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; }; + SurrogateTest = derive2 { name="SurrogateTest"; version="1.0"; sha256="0dw8ic2rskwhj9f013q0j5my7qfsqihfis93frrlz4qag68jddqn"; depends=[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=[]; }; @@ -3462,28 +3677,31 @@ in with self; { 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=[]; }; + SympluR = derive2 { name="SympluR"; version="0.1.0"; sha256="11ni1x2k24b8g62gga0wvfxhjjf0pm4bir8sjspk97sii4l19037"; depends=[httr jsonlite plyr]; }; SyncMove = derive2 { name="SyncMove"; version="0.1-0"; sha256="1jlnsj5v8y5pijfkww7ng7nkwvj93naw29wcxxj130ww5qk7qk1z"; depends=[]; }; - SyncRNG = derive2 { name="SyncRNG"; version="1.2.1"; sha256="0360pdx2p8a6519y3ik5xfdm2yxndyl31p3bb73nj4ihmr4w6lmj"; depends=[]; }; + SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; 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="2.6-2"; sha256="0d7dgwn9pqpv9y4i9kh323rrdrd7ifrgq6l51w9kckwagvbhcmn1"; depends=[CDM coda mvtnorm Rcpp RcppArmadillo sfsmisc]; }; + TAM = derive2 { name="TAM"; version="2.9-35"; sha256="0n49g642xn3c82843l03rhksjbdq81bibj084aihw1nnby1l67k4"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; }; 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]; }; TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; }; + TBFmultinomial = derive2 { name="TBFmultinomial"; version="0.1.1"; sha256="0cwga4pkfz4azm62v54jql07ymkhm97wyccz4gg6mhwy4qzigyjq"; depends=[nnet plotrix stringr VGAM]; }; 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]; }; - TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.1"; sha256="0jxpv0a7lyd0lb5mijpfw0pcp80h9s7bhxn9j4w7bkwsg1n59c83"; depends=[httr jsonlite testthat]; }; - TDA = derive2 { name="TDA"; version="1.5.1"; sha256="1ab60b1wk2j4271vikbglkk12nwl77d5b9w3xqvzpcbrbjfqsmjh"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; + TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.2"; sha256="1fgjmz297jckdb0xsly1scq5n8y8awfgdkr4yfml4lim2mkdsigx"; depends=[httr jsonlite]; }; + TDA = derive2 { name="TDA"; version="1.6"; sha256="1i0jgj72rpxn7icgl5f43c7lyq4jghmz4r9jn7bxa5kbavc8asy3"; 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]; }; TDPanalysis = derive2 { name="TDPanalysis"; version="0.99"; sha256="1kyhs4rpkm3gr55l6hrz4xcb9igk95si1m1sp175580k16n885z0"; depends=[plyr]; }; TDboost = derive2 { name="TDboost"; version="1.2"; sha256="0sc9vby4892gm5b5h8gbdl4misqvgbkfp8fms53dk83malxkw1zx"; depends=[lattice]; }; + TE = derive2 { name="TE"; version="0.1-1"; sha256="05xm9hlcsrcqa3yfw1rp4fb08yjkp66lcvdpw3a3fnx7k69j5p3g"; depends=[MASS rainbow]; }; TED = derive2 { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[animation fields foreach geoR RcppArmadillo zoo]; }; TEEReg = derive2 { name="TEEReg"; version="1.1"; sha256="0v5qz3vvmcm3fh16kjb05j1r0yj23r7hrxf2www20ng3dmga5q0f"; depends=[]; }; TELP = derive2 { name="TELP"; version="1.0"; sha256="0wzm3dz0489ha7dd6lkashvvjydck9jw2pavlx9plpksvzr4q9ph"; depends=[arules arulesViz ggplot2 gridExtra RColorBrewer tcltk2 tm wordcloud]; }; @@ -3494,6 +3712,7 @@ in with self; { TFDEA = derive2 { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; }; TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.6"; sha256="1892jmgqywm0jp5l5k88brp4h8szkbi9bxi0v1jni1929qnsmqyf"; depends=[Rcpp]; }; TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; }; + TFisher = derive2 { name="TFisher"; version="0.1.0"; sha256="1fvqgy9djhcyrnvvbb3r4p7p3206qsm6yrnv444x48gmadl3mfym"; depends=[mvtnorm sn]; }; TH_data = derive2 { name="TH.data"; version="1.0-8"; sha256="17csnwyk2f3d47nghkfy9wly5kff8zhdcfwfml7509hjrjgi13s7"; depends=[MASS survival]; }; TIMP = derive2 { name="TIMP"; version="1.13.0"; sha256="0b6g2afwjz2m7bnfhx1pjmq6x1ghjxgrwi6hz1l867qa4i2yx5hx"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; }; TITAN2 = derive2 { name="TITAN2"; version="2.1"; sha256="0cxcgkf776411ln5wbfdyjxa42jw473vcq1kns6k6p8dpm1y91c2"; depends=[]; }; @@ -3502,12 +3721,13 @@ in with self; { TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; }; TLMoments = derive2 { name="TLMoments"; version="0.7.2.1"; sha256="1xgkbdnh79dj54jg5kf0c5kwykcvjaf4y16yyqf0vcc7aand6a3y"; depends=[hypergeo Rcpp]; }; TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; }; - TMB = derive2 { name="TMB"; version="1.7.11"; sha256="1v74iw4pmklhnq5rc0xaahrfd78bgz1fylnwp8gahha72lbcdzrq"; depends=[Matrix RcppEigen]; }; + TMB = derive2 { name="TMB"; version="1.7.12"; sha256="06gky76x5bc95l22ygnnamgdym7ysnqg42fa213ic9ws2rjv40ni"; depends=[Matrix RcppEigen]; }; TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; }; TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; }; TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; }; - TOSTER = derive2 { name="TOSTER"; version="0.2.4"; sha256="0x01a9z3620akp22h85ssqc5n5iiw17x52gb2kpb63dbk24x3pkn"; depends=[ggplot2 jmvcore R6]; }; - TP_idm = derive2 { name="TP.idm"; version="1.2"; sha256="08n5bgc7gw1cbn9q7kd6jfxcwmb5mfjmdmhkhr35fi5ah21a57mh"; depends=[]; }; + TOSTER = derive2 { name="TOSTER"; version="0.3"; sha256="0yjvxb2a2vx1zjg8sqsbz5p1qpnv6kbxrnkz76m08s3hn6ql4jpx"; depends=[ggplot2 jmvcore R6]; }; + TP_idm = derive2 { name="TP.idm"; version="1.3"; sha256="1j1s48342kg2lvydfy0250lyyzchj9qr6qi7d4rwy5xpvx8sy2b0"; depends=[]; }; + TPD = derive2 { name="TPD"; version="0.1.2"; sha256="1h8lgcrlsk68x2y01vgcn7dpq5q5180khz4csr8jbscbcdwljcl9"; depends=[ggplot2 gridExtra ks mvtnorm]; }; 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.18"; sha256="14nfyqwqv1l5lr5zvywd5pxrv4qz0g5v5x8sdxkjbkxi9s7xrlaw"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; }; @@ -3517,7 +3737,8 @@ in with self; { TROM = derive2 { name="TROM"; version="1.2"; sha256="1gfnlchaa16q9cksrgdkissy2fz481bcbac0cmxnc4vb0vbnz4h5"; depends=[AnnotationDbi GO_db gplots gtools lattice openxlsx RColorBrewer topGO]; }; TRSbook = derive2 { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[gdata IndependenceTests RColorBrewer xtable]; }; TSA = derive2 { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; }; - TSCS = derive2 { name="TSCS"; version="0.1.0"; sha256="19g74xbk9q8xrwl2d2bld3hlbj0gcl2paxbpf8lv75x79pmkywan"; depends=[ggplot2 rgl tseries]; }; + TSCS = derive2 { name="TSCS"; version="0.1.1"; sha256="0dllaw69rl26hgqac5q66k13gfmnxhn3wf0j8nx5xvi7yclzc3ay"; depends=[ggplot2 rgl tseries]; }; + TSEtools = derive2 { name="TSEtools"; version="0.1.0"; sha256="16wrlbgq4xli49hha0bsg4nrv33jy0sd0d6nnzvfiqaqw8jml3rs"; depends=[xts]; }; TSF = derive2 { name="TSF"; version="0.1.1"; sha256="0v3pq64yknp3n6lw6c87slv1avsv7rlb82gm670q4jzv5d174phv"; depends=[forecast fracdiff]; }; TSGSIS = derive2 { name="TSGSIS"; version="0.1"; sha256="0zrlin6xi6sv5qb18a0wi8lzldqlwa9lbwnra44w3jza3kakff7n"; depends=[glmnet MASS]; }; TSHRC = derive2 { name="TSHRC"; version="0.1-5"; sha256="05vv2zdkzlg04dicwa0lyww92fiafr7bnvsbm6990xkip1lf3cih"; depends=[]; }; @@ -3527,11 +3748,12 @@ in with self; { 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="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]; }; + TSS_RESTREND = derive2 { name="TSS.RESTREND"; version="0.2.13"; sha256="0wbwkhc1b5dql87sj1441cknidpgwcflwlid2yj6d64a6wsipn1l"; 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]; }; TSTutorial = derive2 { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; }; - TSclust = derive2 { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc wmtsa]; }; + TSVC = derive2 { name="TSVC"; version="1.0.0"; sha256="1v2402shrsdighnhrphvqnsnwq0y4rpx7hg4bxpzqhcma5a3z1r2"; depends=[plotrix]; }; + TSclust = derive2 { name="TSclust"; version="1.2.4"; sha256="0dh6bybr5298cjz9fxfz7wbkp7f45d3r2zl9fb0wgngb6bd0cwfl"; 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="2017.4-1"; sha256="0vwx2wyls4byyp67q9bp1psxdq5jnlimwk2162khk6daaxs14aiv"; depends=[DBI tframe]; }; @@ -3540,45 +3762,49 @@ in with self; { 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]; }; + TSrepr = derive2 { name="TSrepr"; version="1.0.0"; sha256="1r2704zx9mk5w9k98labslp9wqj23jgn28k5jl31lvwcqgj5qqpv"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; }; TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; }; 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]; }; + TSstudio = derive2 { name="TSstudio"; version="0.1.1"; sha256="1myvih5kd9pliczddjscqlq811dswqh9d8an8p5bi12h31w9pp30"; depends=[forecast lubridate magrittr plotly reshape2 xts zoo]; }; + TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.4"; sha256="0r79qbmn4z9v4f4g737xs3mhc4dp6s6llkcz6c3hihwnq1vrvd7h"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape rkt 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-2"; sha256="0djlqwbqqzlnjali8qs00vvd6h0qa8rmcr7csrrxan0x6v9c27qs"; depends=[curl xts zoo]; }; + TTR = derive2 { name="TTR"; version="0.23-3"; sha256="07r62ngyzjl4aszdxnr3n6bnbcgcap32yhd430jsilicg8n06di1"; depends=[curl xts zoo]; }; TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; }; TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; }; TUWmodel = derive2 { name="TUWmodel"; version="0.1-8"; sha256="0c00jd2bq4i5fd55hj7l2grkpn990p0kmhbsh95b2zrzhbwgcjp6"; depends=[]; }; Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; TableMonster = derive2 { name="TableMonster"; version="1.2"; sha256="1cl70d0svzx8nsg6kw5dv50s9d6wxqkyg39d2d4vissbpilq6arn"; depends=[xtable]; }; TableToLongForm = derive2 { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; }; - TailRank = derive2 { name="TailRank"; version="3.1.3"; sha256="1d1i2i12lg4isyy9d37anpd26v7jp9ph5p82dkv66bhsj8fb0y8m"; depends=[Biobase oompaBase oompaData]; }; + TailRank = derive2 { name="TailRank"; version="3.2.0"; sha256="15m4wzhngrv8001r2cmq0a4a7j2kk8p061rhnpbqa7mfbfg6jkr5"; depends=[Biobase oompaBase oompaData]; }; TanB = derive2 { name="TanB"; version="0.1"; sha256="05y9j1a5nzqfpsw48gix5c4ds1cm80liad9wnwmddhbx4fda6p32"; depends=[fdrtool pracma]; }; TaoTeProgramming = derive2 { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; }; TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; }; - Tariff = derive2 { name="Tariff"; version="1.0.2"; sha256="0x139hhjjc1iyx9m3h5vdjh57q5kbc6x1mzjysz0ibnqpvhanjb2"; depends=[]; }; + Tariff = derive2 { name="Tariff"; version="1.0.3"; sha256="1z1yzy4f9k0zxa6zx1vp5axgjszics5wa8niy6087jz3r7y2bwph"; depends=[]; }; TauP_R = derive2 { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; }; TauStar = derive2 { name="TauStar"; version="1.1.3"; sha256="06iq3kjbhyx2i8qlhvamnlch4j32psgw8q0wnvs4js513r6c0cqn"; depends=[Rcpp RcppArmadillo]; }; - Taxonstand = derive2 { name="Taxonstand"; version="2.0"; sha256="1g3k2mb2wxjy9sznjmv8358qa9kmszldahihq7jkr3h54fjlnlff"; depends=[pbapply]; }; + Taxonstand = derive2 { name="Taxonstand"; version="2.1"; sha256="0dvhiqggbv1by284fg38rcvvrxr9q3zp5gh51p1dh0129h73qj7i"; depends=[pbapply]; }; TcGSA = derive2 { name="TcGSA"; version="0.10.5"; sha256="14gnlk2r0q9zjc3431v97s7ydcyycvl0xh8bmz08mhzi20snrkpq"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; }; Tcomp = derive2 { name="Tcomp"; version="1.0.0"; sha256="0ddswvww9yk31gh8qb9nh0glf9w2mp3ny7zps79kdcnvbkrpcbfs"; depends=[forecast Mcomp]; }; - TeXCheckR = derive2 { name="TeXCheckR"; version="0.2.0"; sha256="1dr0sls05p0np8l65vprwrmxn56mbs5k431s60ljq7xinzw3k20l"; depends=[clisymbols crayon data_table dplyr gmailr hunspell magrittr readr stringi twitteR zoo]; }; + TeXCheckR = derive2 { name="TeXCheckR"; version="0.4.4"; sha256="1dbs9i5py9amnx8l6z74py12v52d1b0wl0azcwqsgd8n76xlfqg1"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr readr rstudioapi stringi 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=[]; }; + TempleMetrics = derive2 { name="TempleMetrics"; version="1.1.0"; sha256="02cs2dgcmxgz1y98x4rpq4l4khqvbnr0248s6rgrgq5l3z2s4qr0"; depends=[BMisc pbapply]; }; + Ternary = derive2 { name="Ternary"; version="1.0.0"; sha256="1dqkvddsb0g4bhiqnq22n4lfkxcrwimygai5lsrn1nlijyhcxfn1"; depends=[]; }; TestDataImputation = derive2 { name="TestDataImputation"; version="1.0"; sha256="07k4sgjda1gwdlx5rap5fhs5rww2ahzyf0fq98dsm99gvjajnmwn"; depends=[Amelia mice]; }; 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]; }; - ThankYouStars = derive2 { name="ThankYouStars"; version="0.1.0"; sha256="1wzpd9riaphdaw8nfvq25hywpi4qik0cb13qp26q8704acdm55wm"; depends=[httr jsonlite]; }; + TexExamRandomizer = derive2 { name="TexExamRandomizer"; version="1.2.3"; sha256="0l0vpx4rkib2m8hwhwy9j8pqyf7gpb9qg8wpnh3238snwpadgy3a"; depends=[assertthat jsonlite Rcpp stringr]; }; + ThankYouStars = derive2 { name="ThankYouStars"; version="0.2.0"; sha256="0r77ns3102wj1wvrfsa06l427imxyfhigpbs36cdxl2j87qrjzl6"; depends=[httr jsonlite]; }; ThermIndex = derive2 { name="ThermIndex"; version="0.2.0"; sha256="0s9d55577dq61qixwwfwmqc2k2c8my00j2ng97ng42cw0jc7aylm"; depends=[]; }; - Thermimage = derive2 { name="Thermimage"; version="3.0.0"; sha256="0l098praarg5kg0m5hxs9zbwhl8w7g48ngyiry1rlwkp2rsl3cza"; depends=[png tiff]; }; + Thermimage = derive2 { name="Thermimage"; version="3.1.0"; sha256="1gbbmmgmp6a8swl6kdfzf4kj9dpm17m809r2xrc58wg8gslx8m1c"; 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=[]; }; ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; }; - ThresholdROC = derive2 { name="ThresholdROC"; version="2.5"; sha256="1c727qbplwrclhg41jjygm6a5k45whzar9pjm2nlp9ccr9fv710a"; depends=[MASS numDeriv pROC]; }; + ThresholdROC = derive2 { name="ThresholdROC"; version="2.6"; sha256="0ah102z6v9k5pxp3kbj5ffa9vhb7vi7axjkrg5qy5b4spnb71qsg"; 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.3"; sha256="0wll0zbkfas6hs4h8ma5km68nv2brw1k75ngw5lrnxilya22lrgp"; depends=[chron data_table fields]; }; @@ -3586,42 +3812,49 @@ in with self; { TideTables = derive2 { name="TideTables"; version="0.0.2"; sha256="1grm9s9np7xs2d8gql4sgg72rxpxiidw6g1ni8q97qgqr7r3105l"; depends=[chron data_table]; }; Tides = derive2 { name="Tides"; version="2.0"; sha256="0s7ja0vs8ag7myjq4kmza4ja9p76sdbbkaaamxbsgp9yaf02c6nf"; depends=[]; }; TileManager = derive2 { name="TileManager"; version="0.2.0"; sha256="1zk5q1m3imlr9ms81jyb9kibm0m5zmiidsv86qgnqj8r4b8hpqyh"; depends=[APfun raster rgeos sp]; }; - TilePlot = derive2 { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; }; TimeMachine = derive2 { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; }; TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; }; + TimeSeries_OBeu = derive2 { name="TimeSeries.OBeu"; version="1.2.2"; sha256="1a44fb29yacwgdiwaf5fpxzc5222cpi5mkv7l0dh43b6lh8f0j5k"; depends=[forecast jsonlite locfit trend tseries]; }; + TimeVTree = derive2 { name="TimeVTree"; version="0.2.1"; sha256="0657y6s4w83yda36q1isr3zwd8vv9wminljdpivs8c89p0cwm3yb"; depends=[survival]; }; TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; 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]; }; + TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.0-7"; sha256="1lc63xghjny45nkrppf06lxvhbqnw9w5i06bmncm90hm0kam092b"; 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.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]; }; + ToolsForCoDa = derive2 { name="ToolsForCoDa"; version="1.0.2"; sha256="0x05phwm6gqw1pmars1ypg86sggflffw9g2d0lc5gfsy93nrg0rv"; depends=[calibrate HardyWeinberg MASS]; }; 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="2.0-7"; sha256="0skc52da2l137zx015yx28bw43z4snl01ahm7d0x1gnp3ps7lvr9"; depends=[boot cluster Hmisc RColorBrewer]; }; - TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.1"; sha256="11vr9f0l4bg4cga5wfflrmq3zhs1hdwmv18xxgni194g642h7k8b"; depends=[cluster RColorBrewer survival TraMineR]; }; + TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.0"; sha256="1w8irl49cxg0rsbk57cl443gmy4i3vrh3ialx9c9d08wc7d2zisa"; depends=[]; }; + TraMineR = derive2 { name="TraMineR"; version="2.0-8"; sha256="0x4ppghg7rbsj7q4q274vcs6kcwajjbi0s181r5qmzbxf20l8k9r"; depends=[boot cluster Hmisc RColorBrewer]; }; + TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.2"; sha256="1k2s3syx27vma5k0qcfx2579jyaxmx7crizkvz3wplhzdwag7wbk"; depends=[cluster 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=[]; }; + TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; }; Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; }; + TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.5"; sha256="0zdni9zqz3yy5ac2xfn3x2ad2lsmm7aw67nshv2sis828f9bsj9x"; depends=[geosphere ggplot2 magrittr rgdal rgeos RPostgreSQL sp spacetime trajectories xts]; }; 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.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; }; - TreeBUGS = derive2 { name="TreeBUGS"; version="1.1.1"; sha256="1zhxmmks263khrdckp570j6lykfhhlpc6rnhw3rk35a9k89yp90v"; depends=[coda hypergeo MASS Rcpp RcppArmadillo rjags runjags]; }; + TreeBUGS = derive2 { name="TreeBUGS"; version="1.3.1"; sha256="0zwbp7z31hw6krwhf21wpy5ryfhf0hhipjrsmvbrb7d4sx9am2vb"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; }; + TreeSearch = derive2 { name="TreeSearch"; version="0.0.8"; sha256="1w65pw2qj5jcpg2v41kyhp0zq7pr56rxw1vrshxcpwxlwjj1sii6"; depends=[ape memoise phangorn R_cache Rdpack]; }; TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; }; TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; }; TrendInTrend = derive2 { name="TrendInTrend"; version="1.0.2"; sha256="0ymlgalddnfnb55s31bysm68yh823ys0rr5fgiic4a2ipnbfd8qf"; depends=[pROC rms]; }; - TriMatch = derive2 { name="TriMatch"; version="0.9.7"; sha256="06idgh9bwwbwa16hlc2kgm06n9shzm0825f7k65zpz3isq23dp7q"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; }; + TriMatch = derive2 { name="TriMatch"; version="0.9.9"; sha256="17v8hdm594i9qs5hvrzb1k94wrzvx07479rmvbk4314fim27mabg"; depends=[ez ggplot2 gridExtra PSAgraphics psych randomForest 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=[]; }; + TrioSGL = derive2 { name="TrioSGL"; version="1.1.0"; sha256="0xzyv1vppw0v1xjpf83nnv1sx1xy7197ay6l7dzvr0vllappdam9"; depends=[]; }; TripleR = derive2 { name="TripleR"; version="1.5.3"; sha256="13s1vlmr4sqa2sq2fbcld86bh3g73yb204aawbks11rjblwzvb0h"; depends=[ggplot2 plyr reshape2]; }; - TropFishR = derive2 { name="TropFishR"; version="1.1.4"; sha256="120w48rjszcs9c59vi4my98jdbg08s9lld93j38g7a6gnkv2hg8s"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; }; + TropFishR = derive2 { name="TropFishR"; version="1.2.1"; sha256="17c7v85srx2l5chlz4yj8x6qrnlp9vvm11qkag73ma2x2a365sgn"; depends=[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=[]; }; + TukeyC = derive2 { name="TukeyC"; version="1.3-0"; sha256="1rkd20m9f97n88zlyidipqs6nd6hldw8s4bxiwvrj1ba2lbg09p3"; depends=[doBy]; }; + TukeyRegion = derive2 { name="TukeyRegion"; version="0.1.2"; sha256="03lik9vkah3hjhn0l4ci95v2h4q8mnziq006idipn69l4gmnddxl"; depends=[bfp BH ddalpha MASS Rcpp rgl Rglpk]; }; TunePareto = derive2 { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; }; - TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-5"; sha256="18azwbvs3cv3arp6zhh5bklf7n04p13jpfjh44nxv5159jry7arr"; depends=[]; }; + TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; }; TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; }; TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; }; TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.5"; sha256="050y7na91izg36gkwd8yn8rx3r39dk6qlvhd3137f3jnk4v00bck"; depends=[survival]; }; @@ -3642,25 +3875,27 @@ in with self; { UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; UdderQuarterInfectionData = derive2 { name="UdderQuarterInfectionData"; version="1.0.0"; sha256="084bq5ai1ccp4www64z0ipic74zkd8j1ygv0py900164a25wdr9b"; depends=[]; }; Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; }; + Umatrix = derive2 { name="Umatrix"; version="3.1"; sha256="131j7yrb0yzffl6gvirdj29zmsbwg8163i15gg9f0clfcrl1kcx6"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png Rcpp reshape2 shiny shinyjs]; }; Umpire = derive2 { name="Umpire"; version="1.3.4"; sha256="0kxndg96ah6sk1m216f2dmkg73w10lyg3rv7qsrnn145mznsdlw1"; depends=[]; }; 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]; }; + UncertainInterval = derive2 { name="UncertainInterval"; version="0.4.6"; sha256="17xirpichh4c9qajkz4xywd8881wqdni6d3pqvsy2h13fvidb83q"; depends=[nloptr reshape2 rootSolve]; }; + UniDOE = derive2 { name="UniDOE"; version="1.0.1"; sha256="1hjraksvxvxz4xbrq97x6xf3r0f90c484ix92zapylyxvkifx628"; depends=[Rcpp]; }; + UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; }; Unicode = derive2 { name="Unicode"; version="10.0.0-1"; sha256="1kj4b29gj3p0wzlzxqn7lwzabair6np705va0nxissfybpmwalgk"; depends=[]; }; - UnivRNG = derive2 { name="UnivRNG"; version="1.0"; sha256="1d55a103q30vhyjq659a6bbnqbm4g4calr5j4xw8p0h0x5i4p5xh"; depends=[]; }; + UnivRNG = derive2 { name="UnivRNG"; version="1.1"; sha256="0vjsqc1y24z7zlclglh55kkxjhy0dc5gjsy427zdv95j58jbxa66"; 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.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.4"; sha256="1g0qpa21gkp2s0sr336bkdqfrcxygrdl77i3lv09vqimyinbi0p2"; depends=[]; }; + VARSEDIG = derive2 { name="VARSEDIG"; version="1.5"; sha256="07zc1k3h9bh0vlqmxqgpniq8ccsfv99bp18h9x9gjl24dppc0xz7"; depends=[]; }; VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; }; VARtests = derive2 { name="VARtests"; version="1.0.1"; sha256="19xmf4mg4v1fwd002ccinfbsbpcq9qfmzc2sf710mqv6i8ghv6jm"; depends=[Rcpp RcppArmadillo sn]; }; VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; }; - VBmix = derive2 { name="VBmix"; version="0.3.2"; sha256="09kgllh8wbsgx9ykv95igczy4hi8d8grvffvdkp2zygdiyvkhsxa"; depends=[lattice mnormt pixmap]; }; VCA = derive2 { name="VCA"; version="1.3.3"; sha256="03ibvn3a6bbgq36a1ibhi4givdnba6d0qcfbpbdxkz5masn1r23q"; 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]; }; VDSPCalibration = derive2 { name="VDSPCalibration"; version="1.0"; sha256="1hrmmhvk3mhd3bdl0msnm5shcj4cjgd3pn1rkfkv8fh4llqvz7w8"; depends=[]; }; - VGAM = derive2 { name="VGAM"; version="1.0-4"; sha256="0r59hyp3afmvms890b3v2yyckf8v0qkjf2w11rnqd2zgg1gri0g5"; depends=[]; }; + VGAM = derive2 { name="VGAM"; version="1.0-5"; sha256="0ik3wyv6jj54bg34z0fzzk4xg0h6x98jqx4q2r7g1f0in0qgbb01"; depends=[]; }; VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; }; VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; @@ -3670,33 +3905,32 @@ in with self; { VIMGUI = derive2 { name="VIMGUI"; version="0.10.0"; sha256="14na9ss0vkcys979kdcciynwssqsvy2w566nydgzd3n7gcmx2agm"; depends=[Cairo foreign gWidgets gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; }; VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; VLMC = derive2 { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; }; - VNM = derive2 { name="VNM"; version="5.1"; sha256="132m23np3qk4cf2fnsjg0ykcifqs20psavybmzs5b86qp9m77h9h"; depends=[Rcpp]; }; + VNM = derive2 { name="VNM"; version="6.1"; sha256="195fcgs6rzpji250j5kikim4k2rfg1gqgz65f2vgfbmz76wi4za6"; depends=[Rcpp]; }; VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; 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.6"; sha256="11ild9xs3wgjbsbcbrz8037k60sqgfhxvvb4kq6rxnagzbkilvkx"; depends=[dplyr ggplot2 lazyeval mgcv shiny tidyr]; }; + VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; }; + VWPre = derive2 { name="VWPre"; version="1.0.1"; sha256="1q6i1ijw9sx5k9k1gpmhsm99hwgsj6kjkak3lnq7458563vd640m"; depends=[dplyr ggplot2 mgcv rlang 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="2.0"; sha256="0m0va9qdjwzaaf0ch5b8z5r038lcw9mfpa0sbwd0489igszc3ng7"; depends=[mgcv Rcpp RcppArmadillo]; }; + VarSelLCM = derive2 { name="VarSelLCM"; version="2.0.1"; sha256="08kpnppa5mm1xjbdgl354py9jy57x4r0nbv8z4skzc1k972qrgy9"; depends=[mgcv Rcpp RcppArmadillo]; }; VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; 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]; }; VdgRsm = derive2 { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[AlgDesign permute]; }; Vdgraph = derive2 { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; }; VecStatGraphs2D = derive2 { name="VecStatGraphs2D"; version="1.8"; sha256="0jjxdwcj0n6kk5l7hw4zibpikqxhkkik5819qv75z4gqdgg0fgch"; depends=[MASS]; }; 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]; }; + VennDiagram = derive2 { name="VennDiagram"; version="1.6.19"; sha256="0f0kw5rvxl6v39yhgrz819hk1j0xd48iz5wfl91qd1vjw1kg9fn2"; depends=[futile_logger]; }; VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; }; VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; }; - VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.0"; sha256="1lb1bsapczryw5sabfcvvj0g7p3ar997awphda5fxi4q3s118dxy"; depends=[Rcpp]; }; + VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.6"; sha256="1ccl4j3vb6aw1qfbqil67dy74daldajwzm7s5hqcidm73fd0wknc"; depends=[Rcpp]; }; 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.3"; sha256="1v15fq4wgqcxwkqzk1wyfsmlrslshlp0faxmnfajis7a59cwlwgp"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; }; + VineCopula = derive2 { name="VineCopula"; version="2.1.4"; sha256="1mzxq3ci4z24z8d5w9x1n0d5h7ck7wbcx9y38vlaryyi5ipbhadh"; 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]; }; @@ -3704,36 +3938,39 @@ in with self; { W2CWM2C = derive2 { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; }; W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-6"; sha256="0nfay5nqss3zlw4nikj8h3zzlnjfxjch4pm3qky15qrcigrybrbl"; depends=[curl xml2]; }; WACS = derive2 { name="WACS"; version="1.0"; sha256="1x6vn7xhrnaggrxkvap6si8gz7b6z2zpjpbb9zgag4vyq3s7nxgy"; depends=[mclust mnormt mvtnorm tmvtnorm]; }; - WARN = derive2 { name="WARN"; version="1.2-2"; sha256="1kp0p9ax6k4y990j95q70dhd1r37hjw3i583c2f6ds8gpddqdi3v"; depends=[MASS]; }; + WARN = derive2 { name="WARN"; version="1.2-3"; sha256="0vkp70cc3slz9y8qfybrqyjyglsxz9fnqrid735h2a113h4xvr3v"; depends=[MASS]; }; WCE = derive2 { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; }; WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; }; WDI = derive2 { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; }; WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; }; - WGCNA = derive2 { name="WGCNA"; version="1.61"; sha256="1vrc2k33a196hrrl7k0z534fp96vv0shmigcr65ny1q0v6lq0h6i"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust survival]; }; + WGCNA = derive2 { name="WGCNA"; version="1.63"; sha256="1225dqm68bynkmklnsxdqdd3zqrpzbvqwyly8ibxmk75z33xz309"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust 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=[]; }; + WMWssp = derive2 { name="WMWssp"; version="0.3.2"; sha256="019fcmf5zmbm20zyvx96nwp66lqm2xw7hbpacfwn8cvw3dq85chr"; depends=[rankFD]; }; 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-2"; sha256="0szjq9ffckjqa128avs4cymqvxk7dhldzj620kcq7q59aagrnj04"; depends=[MASS mc2d plyr reshape]; }; + WRSS = derive2 { name="WRSS"; version="1.1"; sha256="1iv6msack3ha2i8l4c7p9964b9f3c2qza1yxjsyx9sn1wzfxs6fj"; depends=[Hmisc]; }; 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.6"; sha256="0j399zjm2izg52fa1x06aqi56kmpcj8ciabvkyrcfpmf0bk8bxls"; depends=[ggplot2 gridExtra mgcv plotly replyr reshape2 sigr wrapr]; }; + WVPlots = derive2 { name="WVPlots"; version="0.2.8"; sha256="1d9016k05s3v3gmxsig6xk87npmgni9mfyqcwcvd522zisfx2g6z"; depends=[cdata ggplot2 gridExtra mgcv plotly replyr seplyr sigr wrapr]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; - WWR = derive2 { name="WWR"; version="1.2.0"; sha256="1m60zchm1f85m2b5h1yqcyhnm4593d0r7wakhmx5zpkhbx1rhgmg"; depends=[inline]; }; + WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; 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.1"; sha256="1pc32vaw7c1xqh8shf8nwja4rmfg0xaxwr2ij5shp6ab6h8060fg"; depends=[fracdiff wmtsa]; }; + WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.2"; sha256="1p9ld6w2qgbvkvp7xkzzd14v89rxcwl6vlr1zgxkpc5awl1ln1a8"; depends=[fracdiff wmtsa]; }; + WaveletArima = derive2 { name="WaveletArima"; version="0.1.0"; sha256="1f8g6r9qmhr2y7sf7x2vphv2sab5rywpfjvhsxfmzljjmirf2v3n"; depends=[forecast fracdiff wavelets]; }; 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.1.1"; sha256="0cdpfwp4whx8pff73acxga072lwbibl44hxdjs9jsb5i21h55vbr"; depends=[data_table doParallel foreach pkgmaker PythonInR rjson]; }; + WeightIt = derive2 { name="WeightIt"; version="0.3.1"; sha256="0iadn4hpmfpih75nz17kligh3avjzs1cfi3pkkgx378ml64kdz8m"; depends=[cobalt]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; WeightedCluster = derive2 { name="WeightedCluster"; version="1.2-1"; sha256="04gsr65mssv4cz4v8sh44qhyzn0isll057d45z4ljv6sx0an5yhl"; depends=[cluster RColorBrewer TraMineR]; }; WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; - WeightedROC = derive2 { name="WeightedROC"; version="2017.07.12"; sha256="1s9ic2nv4xd3j9xhan46fv9a14n70v0skw9q70rix6kaydi6cjf9"; depends=[]; }; WhatIf = derive2 { name="WhatIf"; version="1.5-9"; sha256="0ihpp3wbhpsg00g0s31l0ca4q0a2sch2a2j8cgz14g8na43x8831"; depends=[lpSolve pbmcapply Zelig]; }; - WhiteStripe = derive2 { name="WhiteStripe"; version="2.2.2"; sha256="0jaxy5a4m4ir25assi2dsdgfcm88lbgjdghsh36v7zvhblrfcfap"; depends=[mgcv oro_nifti]; }; + WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.0"; sha256="10rnfwq3f6msrzmgifm33dqwnncfhybiah8czh1z7g3iw2859qbc"; 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]; }; @@ -3742,7 +3979,7 @@ in with self; { 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=[]; }; - Wmisc = derive2 { name="Wmisc"; version="0.3.2"; sha256="1dyfpmsl1fdznnz79l8zkp6v4kxc9a260qp7g52mwxj9xw0jb0z7"; depends=[hash R6 Rcpp]; }; + WindCurves = derive2 { name="WindCurves"; version="0.1.3"; sha256="0bvbnrkdk0g0radgcw4zbhq6czpvq3f7f34x83qk09i8ngmwd28c"; depends=[drc imputeTestbench readbitmap]; }; WordPools = derive2 { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; }; WordR = derive2 { name="WordR"; version="0.2.2"; sha256="1q8im3v30xil5qg4m1hypmj439rsx5g2x4mfxsgkz4xz2hwlfh4f"; depends=[dplyr officer ReporteRs]; }; Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; }; @@ -3750,34 +3987,37 @@ in with self; { WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; }; 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]; }; + XGR = derive2 { name="XGR"; version="1.1.2"; sha256="0zvqsd7ff8a46w58qklp2w0w785y8nhpx4mcvp27r0k8j9y5yji7"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex tidyr XML]; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; 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=[]; }; + XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; }; + XLConnect = derive2 { name="XLConnect"; version="0.2-14"; sha256="06c88rkyavjv3p90hr3cz4y9jx3g6ik3sannjynjnms7d793w0fi"; depends=[rJava XLConnectJars]; }; + XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-14"; sha256="0ckkvm8i2r60npx0zb36h98gmzgqig9d806cn6r5cghczz6g0xf6"; depends=[rJava]; }; + XML = derive2 { name="XML"; version="3.98-1.10"; sha256="1faza9bbllp67lf1yv1sllxc3iv8llz52m9diazhq322iqbh97m1"; 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=[]; }; - XR = derive2 { name="XR"; version="0.7"; sha256="1wvjvvwmp39i23v61x46b4cw90yf8khcn5c61icpms0rmxcbdc7n"; depends=[jsonlite]; }; - XRJulia = derive2 { name="XRJulia"; version="0.7"; sha256="0xcm8rkgg6l5p50x7mpzxx4ln29j8s2ngdswfmgb6vq48p7ws9gw"; depends=[XR]; }; - XRPython = derive2 { name="XRPython"; version="0.7"; sha256="1vgxby01ac8s9ldfnjdyg0yj0y0341w596pp4sx5szdrl359n0fn"; depends=[rPython XR]; }; + XR = derive2 { name="XR"; version="0.7.1"; sha256="1wly2wpjvmfjjng5kjr9rq1by550amigz10rfpl8iibv5b9kvzjy"; depends=[jsonlite]; }; + XRJulia = derive2 { name="XRJulia"; version="0.7.6"; sha256="1bvkrx4nvni858qw3p51bm2pidlfqdmk2pbmhwmb61pcbls3gpk8"; depends=[XR]; }; + XRPython = derive2 { name="XRPython"; version="0.8"; sha256="0alg33spiaqf3jwg1qn543nxvbfaqv8gvf5px3grhbgrcmi5mcmj"; depends=[reticulate XR]; }; XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; }; - XiMpLe = derive2 { name="XiMpLe"; version="0.10-1"; sha256="10163snplpw4r4902w2ws60m6wr1icnniv7y0vy7y1nq2c0i0is5"; depends=[]; }; + XiMpLe = derive2 { name="XiMpLe"; version="0.10-2"; sha256="16dmslc3ji9zbbm2khw8ib8rhwan0mdlfyd4h29v42lcx6l1d0pv"; 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]; }; + Xplortext = derive2 { name="Xplortext"; version="1.1.1"; sha256="18a8qqpakwgv60gm89cmil18q35mlir3xl4yl5j5fswcj5qpdkdx"; depends=[FactoMineR ggplot2 gridExtra slam stringr tm]; }; + YPInterimTesting = derive2 { name="YPInterimTesting"; version="0.1.0"; sha256="0jfvj08acldigd9q25dv2cqyp5a5wjzcb5wa0640y4kc5ga8p08s"; depends=[Rcpp]; }; 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]; }; + ZOIP = derive2 { name="ZOIP"; version="0.1"; sha256="0fraxzr2mfd7w705j2fryhh9vpg6nkag6kmk7p7in3zknxwipfh3"; depends=[boot GHQp numDeriv rmutil]; }; 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.1-4"; sha256="0bivbgi70livmddndf7jxgjfy99clsj7psd08jjz4bj47vv32a7x"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; }; + Zelig = derive2 { name="Zelig"; version="5.1.6"; sha256="142kjmgma25pvr525y0mjiwivnmq8y8s1abw4kyqipcmphmgh3an"; 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]; }; + Zseq = derive2 { name="Zseq"; version="0.2.0"; sha256="06dndi2b1q79bmxax11bv0l5ifcz1mhpvbn90y6a6xymrgcq0ivi"; depends=[gmp]; }; aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; }; aLFQ = derive2 { name="aLFQ"; version="1.3.4"; sha256="1q2l5cwkcsng22nxckgc7aalvy3qhvgga5nkchfpy53sxg68awqv"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; }; aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; }; @@ -3785,7 +4025,7 @@ in with self; { 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]; }; + aVirtualTwins = derive2 { name="aVirtualTwins"; version="1.0.1"; sha256="1jg19ns3mxfycc11i2c152d83n4kqz3dd6d269sijnxrw80kzjki"; depends=[party randomForest rpart]; }; 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=[]; }; @@ -3793,9 +4033,10 @@ in with self; { abcrf = derive2 { name="abcrf"; version="1.7"; sha256="1gz1jhbc2qj2dvsdn22hb03lm99v8hfr5qjrjql14jvhw8y2smz8"; depends=[MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; }; 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]; }; + abe = derive2 { name="abe"; version="3.0.1"; sha256="1f19h3xzzmjhvwc1rrb8z0rai3ip03y4gdi2gg9bfr5sg2nfklk6"; depends=[]; }; abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; }; abind = derive2 { name="abind"; version="1.4-5"; sha256="0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis"; depends=[]; }; - abjutils = derive2 { name="abjutils"; version="0.0.1"; sha256="0bgk522jxj31crzg3pa4pghz1sjx6gr3jchh9cwqdslr9ydd0g0j"; depends=[devtools dplyr httr magrittr stringr tibble]; }; + abjutils = derive2 { name="abjutils"; version="0.2.1"; sha256="0qrsc4if7aif73qp95lw6b5986c2r0jn7m39123zij8k15vc935b"; depends=[devtools dplyr glue httr magrittr plyr progress purrr rstudioapi scales stringi stringr tibble tidyr]; }; abn = derive2 { name="abn"; version="1.0.2"; sha256="0jxpw5mplnpc57jjg9w3zrik40g7va6s8m9zbfsyf0vqn645wfwq"; depends=[Cairo]; }; abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; abundant = derive2 { name="abundant"; version="1.1"; sha256="1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"; depends=[QUIC]; }; @@ -3803,7 +4044,7 @@ in with self; { accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; }; accelerometry = derive2 { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; }; 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]; }; + accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; }; accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; }; acebayes = derive2 { name="acebayes"; version="1.4.1"; sha256="0wkygvhwf0y5jzkcj6prjmr9dlak1xgsbswlixqwrx5b48iqxgwh"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; }; @@ -3814,18 +4055,18 @@ in with self; { 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]; }; - acs = derive2 { name="acs"; version="2.1.1"; sha256="0c0w9ayjb80nmibg2fsyz61ywciiyyvjaym4y1lsx946hzg5arqj"; depends=[httr plyr stringr XML]; }; + acs = derive2 { name="acs"; version="2.1.3"; sha256="1r6lywjhdi53873c2hl670hbaycrlycaps5pll2i9czr1phlv0rj"; depends=[httr plyr stringr XML]; }; acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; }; 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-1"; sha256="0d390sygdcy67ww4wdxxfybars7jqpwbc12pvyv01hdqzhzqp04z"; depends=[expint]; }; + actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; }; + actuar = derive2 { name="actuar"; version="2.3-0"; sha256="0qzzsc9s25l29fi1xgd5ypb4j1l08ghx180n0q5k9p2fn36zjz27"; 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]; }; + adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; }; adagio = derive2 { name="adagio"; version="0.6.5"; sha256="0jy8g5604alaqbi5ynj95ig07igzbgk8x03a4x1rzkvfwvydfflz"; depends=[]; }; - adapr = derive2 { name="adapr"; version="1.0.2"; sha256="1mbl0b9njjf0zwddkylmwyvrridqqx69v9invxqhc5kc6fvk4f10"; depends=[devtools digest doParallel gdata ggplot2 git2r igraph knitr plotly plyr rmarkdown shiny shinydashboard]; }; - adaptDA = derive2 { name="adaptDA"; version="1.0"; sha256="0nk7n628d30jz03a2rmpgzrwwd79rlpqvr6lwhilmkg1gblvz7r1"; depends=[MASS]; }; - adaptMCMC = derive2 { name="adaptMCMC"; version="1.2"; sha256="07zf7kv7q885zjqxcrdl09mzjmjn028g40r1l11y8cg697q0qx75"; depends=[coda Matrix]; }; + adapr = derive2 { name="adapr"; version="2.0.0"; sha256="1s57jdbi5pik56xjz1d4438ax6cywg2yq2s47h5g6wrwvpgr1qfw"; depends=[archivist devtools digest doParallel gdata ggplot2 git2r igraph knitr plotly plyr rmarkdown shiny shinydashboard versions]; }; + adaptMCMC = derive2 { name="adaptMCMC"; version="1.3"; sha256="08v11rl0p4w94knb0yzs1ysj42xillya62yaw3zm40d4pqv7vcky"; depends=[coda Matrix]; }; adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; }; adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.1"; sha256="1jhkiz0gdjvgclqfksm10zza9iwy1z6k5wpviwa4r9a936f1i88k"; depends=[ape ggplot2 phyloseq shiny]; }; adaptivetau = derive2 { name="adaptivetau"; version="2.2-1"; sha256="1hd2l1jv4i5mg0k0g8bbrvv43nk1zxbwh21594zayrzjyikb2593"; depends=[]; }; @@ -3833,58 +4074,66 @@ in with self; { addhaz = derive2 { name="addhaz"; version="0.4"; sha256="0i3czmv538m8s3pnxrhh2a1mrdv9m3hgzjkb25p7hygwnzz54drg"; depends=[boot MASS Matrix]; }; 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]; }; - additiveDEA = derive2 { name="additiveDEA"; version="1.0"; sha256="0hnjmcv8gicpbmvw57igmj61kafas3apis90fzviyg2dc8fymgbi"; depends=[Benchmarking lpSolveAPI]; }; + additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; }; 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-8"; sha256="1a5p3wf8l9cp1bjp57b1pc5bqs39kw1v21i4waj9j18wawzlmpb6"; depends=[]; }; + addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; }; + ade4 = derive2 { name="ade4"; version="1.7-10"; sha256="0zk81x0yn30gbyc0jpzyw1nxd08ccihl6vyk0ijvj3aw3nr5flc6"; depends=[MASS]; }; ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.2-9"; sha256="0kfnikkzhyfxskrphr65b8amjhdfq35x6dda4kivdhn7ak07s3ll"; depends=[ade4 adegraphics lattice tkrplot]; }; - adeba = derive2 { name="adeba"; version="1.0.2"; sha256="12zs6rh7sl1fsf8q20hgqms5pykmysnb9mfcwf9x63g44yi26dj4"; depends=[pdist Rcpp]; }; - 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-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]; }; - adepro = derive2 { name="adepro"; version="0.1.0"; sha256="0gvqfrdmd755nz72022wq5vmdh2z83lr7bg44b07bxyd6id2pak0"; depends=[audio Cairo MASS shape shiny shinyBS]; }; - adespatial = derive2 { name="adespatial"; version="0.0-9"; sha256="0cmpsf4vhllykmvkxd71qw8axw270zhj9g7n1nr1myvy46p8iqy2"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep]; }; + adeba = derive2 { name="adeba"; version="1.1.2"; sha256="1z1law3qh6l902g62y8yapk4nypdmb20jmpwhxp9jbglalw9lm73"; depends=[mixtools pdist Rcpp]; }; + adegenet = derive2 { name="adegenet"; version="2.1.1"; sha256="0ynfblp0hbd3dp3k86fn1wyhqr28lk6hs2bg4q7gyf0sfdfzwhrh"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; }; + adegraphics = derive2 { name="adegraphics"; version="1.0-9"; sha256="1fscmisvfd3j9fy1562pjsfpgx16fhr5xwmkzmssxhgyia19f4sr"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; + adehabitat = derive2 { name="adehabitat"; version="1.8.20"; sha256="18z4a8168a2c7248s15hwkjj70dzlkif360cy28jry4a61cm6d81"; depends=[ade4 shapefiles sp tkrplot]; }; + adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.15"; sha256="1bwx2mfkzfknr6fjjkbx2xnm4gksd78i8fz0bcizqyi1zhg5hd0c"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; }; + adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.13"; sha256="158a6qzks0hml6hk4f1vr66gvwdn09792i2ca3k23061i3j3xp75"; depends=[ade4 adehabitatHR adehabitatMA sp]; }; + adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.23"; sha256="0hf6wpwhsvfp906xk5sadfnvz524zmm05d0h2zxpx6089c6hnw3j"; depends=[ade4 adehabitatMA CircStats sp]; }; + adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.12"; sha256="13mhj36nfs36988g53yrmhyd8yq2zzxl8ppzql63964n04fybbpb"; depends=[filehash sp]; }; + adephylo = derive2 { name="adephylo"; version="1.1-11"; sha256="06pnrycc7562h17gxbli935289a48na3p4vpb2w96i5cbrjg4jqm"; depends=[ade4 adegenet ape phylobase]; }; + adepro = derive2 { name="adepro"; version="2.0.0"; sha256="0q9h7wmkgdnbhg2ygw32jl0bm2vrl32ig2nci9pphgwpsfzb34jq"; depends=[audio Cairo MASS shape shiny shinyBS]; }; + adespatial = derive2 { name="adespatial"; version="0.1-1"; sha256="19i83s19sbvjm5k0gkw8awz359q67rr3768icsjd118fji45dvg0"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep]; }; + adfExplorer = derive2 { name="adfExplorer"; version="0.1.4"; sha256="11z6jm20giqmmz4dwcpa9fshvrmlmv8m0y1vg053nch05884niz2"; depends=[]; }; 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]; }; adiv = derive2 { name="adiv"; version="1.1"; sha256="12m8p1agahzck1nm8j765wacc6vrl0pa31wld4rqxl7c2pvhs7f4"; depends=[ade4 adegraphics adephylo ape cluster phylobase]; }; + adjclust = derive2 { name="adjclust"; version="0.5.6"; sha256="0hff2fjp6dyrsc6crcipq72x7bs3jblv42z7v2c63clrrs7byc0h"; depends=[Matrix matrixStats]; }; + adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; }; + adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; }; adlift = derive2 { name="adlift"; version="1.3-3"; sha256="0q4ipk9yax4wqp3jckpx6ihriqaaaz0knxd19cm20qzdx37vz4id"; depends=[EbayesThresh]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; + adnuts = derive2 { name="adnuts"; version="1.0.0"; sha256="0jy9wq269r7s70bwld6ngxc6vmaj9vplq4wn97x4f3c6lqy42swc"; depends=[ellipse rstan]; }; ads = derive2 { name="ads"; version="1.5-2.2"; sha256="17k24dihl41jgkkglhnkj7lvvl53dgahjkb5jhfmfgk6i16c7s23"; depends=[ade4 spatstat]; }; advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; }; adwave = derive2 { name="adwave"; version="1.2"; sha256="1fnaq9v84y52kb66aq4g0xiqgllk7mi0is5qiafqf546hck3kzz6"; depends=[waveslim]; }; aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; }; + afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; }; 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]; }; + afex = derive2 { name="afex"; version="0.19-1"; sha256="10qbwqwashddj93ivvwlkf3lk14411lmxp24cn7sahqr9lm714f7"; depends=[car coin emmeans lme4 lmerTest 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]; }; afpt = derive2 { name="afpt"; version="1.0.0"; sha256="0kshyzvw8sp7p686xi98g758zld3n7kq44lnvly8d0y8fg6ahcl2"; depends=[]; }; 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]; }; + agRee = derive2 { name="agRee"; version="0.5-1"; sha256="1hmqvpcz4vnpcl9f92q5fy1ca89l9sq25fnsw2mxfsa0yqbyxpw6"; depends=[coda lme4 miscF R2jags]; }; + aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; }; agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; }; + agriTutorial = derive2 { name="agriTutorial"; version="0.1.2"; sha256="0zcyawmhflm4rbxnyf6gdwrnff4f13yajc81n13ykw7bfi8xphqi"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; }; agricolae = derive2 { name="agricolae"; version="1.2-8"; sha256="1c6n52jralp33hl3nmpv9fc9vsvs6lcz9j75f2zbz0r4sqd2mw89"; depends=[AlgDesign cluster klaR MASS nlme spdep]; }; - agridat = derive2 { name="agridat"; version="1.12"; sha256="1b3dgrp6mkfpfaywqdm22sakadhnl1vlyj1n3rq6bc2f0gf8kcrw"; depends=[lattice reshape2]; }; + agridat = derive2 { name="agridat"; version="1.13"; sha256="1029n2jkbvybvkbf4pwdjrw6m05xyzn5xyqyfziqb7xnw51ksm2p"; depends=[]; }; agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; }; agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; }; ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; }; ahnr = derive2 { name="ahnr"; version="0.2.0"; sha256="0bfy7xxfxfzhv4yl9dlsyl304673p23r2h0lz3lv75iqp2gbzdjr"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; }; - ahp = derive2 { name="ahp"; version="0.2.11"; sha256="09n06k5dmmpw6h6s51x9xy6rkk54fswss8pflh3v9nprbx7vzx4i"; depends=[data_tree DiagrammeR formattable yaml]; }; + ahp = derive2 { name="ahp"; version="0.2.12"; sha256="0zjhgl0smzx4bkhmdm4rmpyrq4hmxy1nkxvwqjr40pz7vm69icqx"; depends=[data_tree DiagrammeR formattable yaml]; }; aiRthermo = derive2 { name="aiRthermo"; version="1.1"; sha256="0i3sq7i37i82ad70z2mai09rxzk4kk27hfg5jjbh6pajwzyn5yri"; depends=[]; }; - aidar = derive2 { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; }; + aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; 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=[]; }; + airGR = derive2 { name="airGR"; version="1.0.9.64"; sha256="08nw07v5d5pljk839i5j5wgrc5lny7v6kl8m2hd6bm9aijql7hg4"; depends=[]; }; + aire_zmvm = derive2 { name="aire.zmvm"; version="0.5.0"; sha256="14n2wycfxpj8wb45671pysqxr434b3wgrnbx2vfpsxw46lkqid0i"; depends=[dplyr httr lubridate readr rvest sp stringr tidyr xml2]; }; 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=[]; }; - alR = derive2 { name="alR"; version="2.2.0"; sha256="1hri2vifgwrklmx5087vlxkd1nv1y42rrhpzm4nk1sbn2b3lcway"; depends=[alabama DEoptimR pbdMPI Rcpp RcppArmadillo]; }; alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; alakazam = derive2 { name="alakazam"; version="0.2.8"; sha256="0lilldxynwhp1i538k3xb9c73956agxj6v8zickxkba1sx4k5zrc"; 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.3"; sha256="0vradid3i83x1n5ss4v85w4vva8psf4byysjv4wrz11mxhy8c68i"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; }; + ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; }; + alfred = derive2 { name="alfred"; version="0.1.5"; sha256="0slqmfv5nsjb463n86qf540dd8airzqc98946kbs24xmyi9npyb8"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; }; 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.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; }; @@ -3897,22 +4146,24 @@ in with self; { 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]; }; + alphashape3d = derive2 { name="alphashape3d"; version="1.3"; sha256="15l8hsn3jcn5jzwfpya99v2mzrgmhl3i587nw6cx4aky75ajslcx"; depends=[geometry rgl]; }; alphavantager = derive2 { name="alphavantager"; version="0.1.0"; sha256="02vv0mks73rih4xwabsnk8rkl3cipd27k5lak9lp1rl0agp8g68v"; depends=[devtools dplyr glue httr jsonlite lubridate purrr readr stringr tibble tidyr]; }; 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]; }; + alterryx = derive2 { name="alterryx"; version="0.3.0"; sha256="0y76xy7m7dklvkhfr2czq54ffgj2j5zhnm2kza7m463j1w1mkcqz"; 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=[]; }; ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; }; - ameco = derive2 { name="ameco"; version="0.2.7"; sha256="0n4y2k7cifly94qhfasy8r8i0mgaap1p0s9qqh2i19wiacr348gh"; depends=[]; }; + ameco = derive2 { name="ameco"; version="0.2.8"; sha256="1i2ap11z1awalw71hai719xh57banpfgj1nllca66zf781x80di9"; depends=[]; }; amei = derive2 { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; }; + amelie = derive2 { name="amelie"; version="0.1.0"; sha256="19cn8rhc5lzy9x9wslljjdnmli76bnam2yg5v9l87jvzb712vl6p"; 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=[]; }; - anMC = derive2 { name="anMC"; version="0.1.0"; sha256="14kihqh95hqw0rqr7wjh6pzw0k3zz3nlgg8gmxpj9c9i3c903gyj"; depends=[microbenchmark mvtnorm Rcpp RcppArmadillo]; }; + amt = derive2 { name="amt"; version="0.0.2.0"; sha256="1w6rdyzyzxsa5qxmcpm1ahgz65z72nil3ay51m8g9qjk7v1xrj8p"; depends=[broom circular dplyr fitdistrplus FNN geosphere lazyeval leaflet lubridate maptools purrr raster Rcpp rgeos rlang sp survival tibble tidyr tidyverse]; }; + anMC = derive2 { name="anMC"; version="0.2.0"; sha256="1j6dah49sgfsb7bj4xys5rcaqw12rrkqhqryqz2xhdkazjmz3gpq"; depends=[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]; }; + analogsea = derive2 { name="analogsea"; version="0.6.0"; sha256="1fcvf3yci3szm155pnk89q36dgc55wdlffvll642zn26zc5d1y5n"; depends=[aws_s3 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="2.0"; sha256="1jkdjqc3fnvvsgi6x9ncf36rxzq0a55cmgkcv92mfmpcramg2lk6"; depends=[car cluster fractal lmtest MASS np powerplus robust trend TSA urca]; }; @@ -3921,21 +4172,21 @@ in with self; { 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=[]; }; angstroms = derive2 { name="angstroms"; version="0.0.1"; sha256="1k8q4pkb5vcjfp2n2dga3q2ydmdxv020k5qzrb6w01ixrgf15d8l"; depends=[nabor ncdf4 proj4 raster sp spbabel]; }; - aniDom = derive2 { name="aniDom"; version="0.1.2"; sha256="0lmq7k2l7nk120m96wj8zdsw03dqfvhz9y9miizrhl8db9nw9qka"; depends=[rptR]; }; + aniDom = derive2 { name="aniDom"; version="0.1.3"; sha256="1xjbj9d6kv5nprsh1z58gbi338f7sj7dimgvy92j6n1xbrlh83p5"; depends=[rptR]; }; anim_plots = derive2 { name="anim.plots"; version="0.2"; sha256="1plpi90qzk4ng0sm77fvqyv1063w67axvdc29q5nvz4h6v4j7ks3"; depends=[animation]; }; animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; }; animation = derive2 { name="animation"; version="2.5"; sha256="0pxmihfr3q1hh4cdnzf7wbzqak5spa3kv4p1wl89giqqngqzwcmj"; depends=[]; }; - anocva = derive2 { name="anocva"; version="0.1.0"; sha256="1kira0bs3yjmsq7zrd4y5zzl948pz3rgbfsvkzidi2n6vvcl5344"; depends=[cluster]; }; + anipaths = derive2 { name="anipaths"; version="0.9.3"; sha256="0pip9vhp3d4c6i6l9cmdds3nwaf8cspqviff6q7xng0ib8mi995n"; depends=[animation knitr mgcv RColorBrewer rgdal scales sp]; }; + annovarR = derive2 { name="annovarR"; version="1.0.0"; sha256="0l2csp06m5f3i1b4h0pvl8mmzx25c0b411c5sdc3qszirbplh038"; depends=[AnnotationDbi BioInstaller configr data_table DBI futile_logger glue ngstk RMySQL RSQLite stringi stringr vcfR]; }; + anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; }; anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; }; - anomalyDetection = derive2 { name="anomalyDetection"; version="0.2.4"; sha256="0a9m9bxz9v9xx19lq8yih727p7zy25ndfamwajzgh0zvx394h0jz"; depends=[caret dplyr ggplot2 gmp magrittr MASS plyr purrr Rcpp RcppArmadillo tibble tidyr]; }; + anomalyDetection = derive2 { name="anomalyDetection"; version="0.2.5"; sha256="132wb0xz04zib3x7802b2q546rkf097rsxyi9mi86g6vv7yyw9z1"; depends=[caret dplyr ggplot2 gmp magrittr MASS plyr purrr Rcpp RcppArmadillo tibble tidyr]; }; + anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; }; anonymizer = derive2 { name="anonymizer"; version="0.2.0"; sha256="0zlzxcqy8fjhh6ab58a1pi0k686dzgap58d160ms6bsr5mgn3fbf"; depends=[]; }; - antaresProcessing = derive2 { name="antaresProcessing"; version="0.11"; sha256="165rqsqq3cp5kak4513rv5ibbq61nipvybvmm4m8ynwbd4q5p7p9"; depends=[antaresRead data_table]; }; - antaresRead = derive2 { name="antaresRead"; version="1.1.4"; sha256="1n59rspxswxsljhwhbqdcq8grd5899403581rc46bd8l81hldapp"; depends=[data_table lubridate plyr]; }; - antaresViz = derive2 { name="antaresViz"; version="0.11"; sha256="0v6li8m6zl39pvs7h6cwc5zqsap7q973cqcdwar29l0zrg2f6x4a"; 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]; }; + antaresRead = derive2 { name="antaresRead"; version="2.1.0"; sha256="1khvwh55gfd62avaj9vl709nrcykyc4zn11fxikbqqgwm9mq7835"; depends=[data_table lubridate plyr shiny stringr]; }; + antitrust = derive2 { name="antitrust"; version="0.99"; sha256="0j76kbb8l0n3lq74nacymgilf4xzs8g1x2g1jw55v6avqnwyps6p"; depends=[BB evd ggplot2 MASS numDeriv rhandsontable shiny]; }; 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=[]; }; @@ -3946,12 +4197,12 @@ in with self; { apTreeshape = derive2 { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; }; apa = derive2 { name="apa"; version="0.2.0"; sha256="1f9c8m5z8j7mbmbh61vcs680ya1zq5spwqs90zhajaw5fhvlg8km"; depends=[dplyr magrittr purrr rmarkdown stringr]; }; apaStyle = derive2 { name="apaStyle"; version="0.5"; sha256="1x3kgyxhgbx3r7wi759j75wh811jcm6z559mrk4zm4p99vqz10bl"; depends=[ReporteRs]; }; - apaTables = derive2 { name="apaTables"; version="1.5.1"; sha256="1ajff635vvypi457wk55bp8kddm80hg2af3hayp3rvjvdk8a8fjv"; depends=[broom car dplyr MBESS]; }; + apaTables = derive2 { name="apaTables"; version="2.0.2"; sha256="0b3vaknj0a9znrgr98v35ka0lf5y1wcy1x0yv249gysikncn9mjc"; depends=[boot broom car dplyr tibble]; }; apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; }; - apcluster = derive2 { name="apcluster"; version="1.4.4"; sha256="16m6akgs4cg5423cdz25i11wayff2c2qbq2sih5yfs9ssdk4ii64"; depends=[Matrix Rcpp]; }; + apcluster = derive2 { name="apcluster"; version="1.4.5"; sha256="0ipg5m3d7fnbvvlavbv8q8ixyrcgdspzwkv00q93f4biybza27x6"; 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]; }; + ape = derive2 { name="ape"; version="5.0"; sha256="0q59pmxawz498cb9mv5m49lhiwxib8ak94yyydz7qg8b6lpd4bn3"; depends=[lattice nlme Rcpp]; }; + apercu = derive2 { name="apercu"; version="0.2.3"; sha256="0w9hi8pdjb3nschh4cy387q67jxhkl2bn9vir949rsl831x4cs1j"; depends=[pls]; }; apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; }; aphid = derive2 { name="aphid"; version="1.0.1"; sha256="1s41ph6i28l14h8s5vvgmx6kby378x27y3vwbz25f2jmq8i7fqi2"; depends=[openssl phylogram Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; @@ -3962,28 +4213,30 @@ in with self; { apple = derive2 { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; }; appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; }; approximator = derive2 { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; }; + approxmatch = derive2 { name="approxmatch"; version="1.0"; sha256="1z1lrbfvm380p2az88hrxr3f2cgbv2h70wzm99vi9a2dmh0pl7qy"; depends=[]; }; aprean3 = derive2 { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; }; apricom = derive2 { name="apricom"; version="1.0.0"; sha256="1gyd1yln14cn0iswj7sjs4hav6j6d4f3ncps4gqbci5fwha5blcr"; depends=[logistf penalized rms shrink]; }; - aprof = derive2 { name="aprof"; version="0.3.2"; sha256="1rv7nr1y7jdvj2p8c6p67sn11bvmif2kj70fb2029hnsjk7lm15b"; depends=[]; }; + aprof = derive2 { name="aprof"; version="0.3.9"; sha256="1w95z3n08nq2fsj8dljgfkz76s1jc3sz2aia3bnfq62yd003qsnl"; depends=[]; }; 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]; }; + aqp = derive2 { name="aqp"; version="1.15"; sha256="0hgz2m3nn45marvx49n62xmq1d1xhy9cf6wb829cvxczisvlakgy"; 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]; }; arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; }; - arc = derive2 { name="arc"; version="1.1.2"; sha256="145sapcawsp7aan1g2c70a6ck3krxapj9k1w8vkv69irvggbbkql"; depends=[arules discretization Matrix R_utils]; }; - archdata = derive2 { name="archdata"; version="1.1"; sha256="07ca51kl5imy6d9s0qi501xxl3zn4q3gbm0w8kvznfw8imclq17z"; depends=[]; }; + arc = derive2 { name="arc"; version="1.1.4"; sha256="1qzj5bzn2dfssjz1r464ys7c0wab0la23hcrbjbmn93iqm2a648g"; depends=[arules discretization Matrix R_utils]; }; + archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; }; archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; - 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]; }; + archiDART = derive2 { name="archiDART"; version="3.0"; sha256="0yh9asf45l2fxxm67vg9snaqbvs1bb24lm2xsrb6xrr62avdrqlq"; depends=[rgl sp TDA XML]; }; + archivist = derive2 { name="archivist"; version="2.3"; sha256="0rwdk2scmd06j428zadcxmvshvssf421265632595hvcacqz6yy4"; 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]; }; + areaplot = derive2 { name="areaplot"; version="1.2-0"; sha256="0xzfgbnzqsvnq46nsxwyqrwldbaqns3h5np0f5wxpjda9cy2rna1"; depends=[]; }; arf3DS4 = derive2 { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; }; - arfima = derive2 { name="arfima"; version="1.6-2"; sha256="05ya1h6xpvs1gmhv68xfm7xf8g3g312ch7ibqi9xhi02vxniwg85"; depends=[ltsa]; }; + arfima = derive2 { name="arfima"; version="1.6-6"; sha256="0nb0r937jcl2khyj7xy41a383dbzdigjls87yjcwwgmzbpcznwal"; 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.7"; sha256="1ph13n8zv591vc427sihj765h27mkdrjyf1whg3as3i644bjsaqs"; depends=[findpython getopt proto rjson]; }; + argparse = derive2 { name="argparse"; version="1.1.1"; sha256="0fzrbj87b274vf96azdnsjxk2nf45d5wy58vzmlah4b4h7q4j524"; depends=[findpython getopt jsonlite proto]; }; argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; }; ari = derive2 { name="ari"; version="0.1.0"; sha256="05pva8jp7dhl46dm1fha6f8mavrs76a6c491fq3mavly8qcbgx44"; depends=[aws_polly progress purrr rmarkdown rvest tuneR webshot xml2]; }; arm = derive2 { name="arm"; version="1.9-3"; sha256="00773z8ai07s9wa2annzjqrxml3z13fh9zqls0z1n7s3h8fwrvqw"; depends=[abind coda lme4 MASS Matrix nlme]; }; @@ -3993,28 +4246,30 @@ in with self; { 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.1.1"; sha256="0mbhk818m8if6cr7g42yy7ba13jh2xs66xkx4zh7dqlwrrmgjnk1"; 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]; }; + arrangements = derive2 { name="arrangements"; version="1.0.2"; sha256="0vqxx0pzvvqnbklpxrcq7d5ppicwbwk3gb2846in0gqjhn4ya4g1"; depends=[gmp R6]; }; 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.6.0"; sha256="1p3yfqjbxg1j1k65n1lfnkgncsw1wbrbvswn5psvn9cdfnjnf939"; depends=[testthat]; }; + arsenal = derive2 { name="arsenal"; version="1.0.0"; sha256="0fv3zq0i28sbdvwh589c27j4k734vr90aik3gxdablgasrhdjfza"; depends=[testthat]; }; artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; }; - arules = derive2 { name="arules"; version="1.5-3"; sha256="04x29jdj0b7pz6rfxs1l4lvsf0xrpjaxw94p69cg3b3ymv822c79"; depends=[Matrix]; }; - arulesCBA = derive2 { name="arulesCBA"; version="1.1.2"; sha256="0c37cffb89gsyv5shpgiksrh5hi2lzdqsk7xl8lxzz6mnv4v1xrj"; depends=[arules caret Matrix testthat]; }; + arules = derive2 { name="arules"; version="1.6-0"; sha256="14gbq5k2zkx4wc7kkfazz313ngij89qp1xmyxfg3nq3v1s84c3sl"; depends=[Matrix]; }; + arulesCBA = derive2 { name="arulesCBA"; version="1.1.3"; sha256="0dpa9v8xksq21lyv6g7m81ccpd08lq816vfy5ga8g3blkg1qfrf2"; depends=[arules caret discretization Matrix testthat]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; }; arulesSequences = derive2 { name="arulesSequences"; version="0.2-19"; sha256="1cncvrf7za38b3vdwbzy4yrbakj7jbpxrl1jg6bvjnlkymiajavx"; depends=[arules]; }; arulesViz = derive2 { name="arulesViz"; version="1.3-0"; sha256="0k9lq1w0cdk9mlbr5mwh87qrzank1nd8bwlymv4xyi7xm5y6wq4l"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; }; 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.4-2"; sha256="0f7zw4vmlklf8sc0sdhn67z15xawl0qaxsk7i29m98a2q8gfnjl4"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; + asbio = derive2 { name="asbio"; version="1.5"; sha256="0p54a9x54jg81hd86br6b3dg3sr9kzl9rmnrh7x3m6bkinzc780c"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; ascii = derive2 { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; }; - asciiSetupReader = derive2 { name="asciiSetupReader"; version="1.0"; sha256="0xslny66fpfmgj6wxznnswzbd9riddh09g0v356m1aqb10z1by4a"; depends=[data_table readr stringr]; }; + asciiSetupReader = derive2 { name="asciiSetupReader"; version="1.2"; sha256="11smjl1cvbsgiql3b90x05aa8bspikijc5vzzw4d0hzpyj1j0zmy"; depends=[data_table haven readr stringi stringr]; }; + asciiruler = derive2 { name="asciiruler"; version="0.2"; sha256="0xhkbsy9dypk09avazgxczyfkh3rhdxhwci688dw1lxnhxv1hj24"; depends=[stringr]; }; asd = derive2 { name="asd"; version="2.2"; sha256="0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"; depends=[mvtnorm]; }; asdreader = derive2 { name="asdreader"; version="0.1-3"; sha256="15a922aw0v5w4hrha03xifx8cpifcc773gambgwqq6i5nz08ya26"; depends=[]; }; ash = derive2 { name="ash"; version="1.0-15"; sha256="1ay2a2agdmiz7zzvn26mli0x0iwk09g5pp4yy1r23knhkp1pn2lb"; depends=[]; }; - ashr = derive2 { name="ashr"; version="2.0.5"; sha256="0blr19ipcanwjxizilkd8hb37dlhb6idjcw2lf0ll8pkd2l68f5z"; depends=[assertthat doParallel etrunct foreach pscl Rcpp SQUAREM truncnorm]; }; - asht = derive2 { name="asht"; version="0.9.1"; sha256="1la0dnyxrl35pb531awfkajinx7bwf78gzm8f1pryh5x5g8lpli6"; depends=[bpcp coin exact2x2 exactci ssanv]; }; + ashr = derive2 { name="ashr"; version="2.2-7"; sha256="1bgkzab7f7fqi259vxrpkxq8yzhh1sl3mqdzc73dk54c5849b2pz"; depends=[assertthat doParallel etrunct foreach Matrix pscl Rcpp SQUAREM truncnorm]; }; + asht = derive2 { name="asht"; version="0.9.3"; sha256="075gzxly8sqkbwnznxcr4z3zs1qvlyl8c4ishgxk035ik1w6p16n"; depends=[bpcp coin exact2x2 exactci perm 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.4"; sha256="0sskw0vrk9qg9c4gzvqvhva7yb3kzj64svy9vph42hrbnwjrxm0s"; depends=[MASS Matrix]; }; + asnipe = derive2 { name="asnipe"; version="1.1.8"; sha256="10pza52bcfdj9412hr69lcv4n43y0n91hfkbq8338fsqpad98ilz"; 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=[]; }; @@ -4036,49 +4291,54 @@ in with self; { assertive_sets = derive2 { name="assertive.sets"; version="0.0-3"; sha256="1cqvh2syvh5b6d85h601zjmsdbbf3h8q98ids4dfl4frdshpasc7"; depends=[assertive_base]; }; assertive_strings = derive2 { name="assertive.strings"; version="0.0-3"; sha256="0n6jrk88670g4ym0r8ii40a08a90z1xadj8wcryk8h0nl04dchfm"; depends=[assertive_base assertive_types stringi]; }; assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; }; - assertr = derive2 { name="assertr"; version="2.0.2.2"; sha256="0l2sjj9amhpkd8mg88mfs82gy0v84brkk8504mkjcaz7j2j9s3l5"; depends=[dplyr lazyeval MASS]; }; + assertr = derive2 { name="assertr"; version="2.5"; sha256="17j5aw19cp9csbxhf277yrr4vlr2c5sk70v9a4fnch0c2q14l5f3"; depends=[dplyr lazyeval MASS rlang]; }; 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]; }; assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; }; assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; }; - aster = derive2 { name="aster"; version="0.9.1"; sha256="0z976r9ljawfdzvmsb1arpllgs3l2r5wimdvbpcw08r1qdyyzwj8"; depends=[trust]; }; + aster = derive2 { name="aster"; version="0.9.1.1"; sha256="12zn3wcx0n37fbnwwcz517libsgkbfphwbr4m68zba4craqhh5mi"; 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.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]; }; + astsa = derive2 { name="astsa"; version="1.8"; sha256="023nk6chyy79scjzhv42px5cpym7rnm1c55ylcslyjdmlr5i6afk"; depends=[]; }; + asus = derive2 { name="asus"; version="1.0.0"; sha256="16hp8xajb631a5amm1cvhzq8z4cwh1vjiavv3n11fzpxyskhmfrb"; depends=[rwt wavethresh]; }; asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; }; - asymmetry = derive2 { name="asymmetry"; version="1.2.3"; sha256="1h5jnpqbjdnr7x6imxm7rvhlhv1p4j8wc2k2zs521rdq2qj5ir5w"; depends=[gplots rJava smacof]; }; + asymmetry = derive2 { name="asymmetry"; version="1.2.5"; sha256="0wsmarmij4crhv5wr4mqibsf787cy7fmmp4xrclsb3gm3g1xwvzz"; 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.3"; sha256="06rb0c4ralx55mdlqwpjzim0inxif4cdi9732v4h1ll8jhlm5v7d"; 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]; }; + atsd = derive2 { name="atsd"; version="1.2.0"; sha256="0jan8r5f2r3l2xpdf9rrv4smkr2l645rfdgdfjb1xa54jd3pqvqs"; depends=[httr RCurl]; }; + attempt = derive2 { name="attempt"; version="0.2.0"; sha256="1i3y39qzk1bpg1m8f3v8bhigdcklv00ypy93npbh8lyhq4w8lk3v"; depends=[rlang]; }; attrCUSUM = derive2 { name="attrCUSUM"; version="0.1.0"; sha256="113y40v9hyvnvvzvyqg81n0n1h84pj4zph5q8p0vc0384hw00544"; depends=[Rcpp RcppArmadillo]; }; attribrisk = derive2 { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[boot survival]; }; atus = derive2 { name="atus"; version="0.1"; sha256="15arijdfyci43k0a32zc8qmm73fmzrr3ghhxw0kgipdr3w5xcmz3"; depends=[]; }; auRoc = derive2 { name="auRoc"; version="0.1-0"; sha256="1ijk127p6g5mzc7b4b9lnjnfzvklz3g8w6bckrdahlw7djd9mgz1"; depends=[coda MBESS ProbYX rjags]; }; - aucm = derive2 { name="aucm"; version="2017.3-2"; sha256="124rb1lhssvmlzkzb5h6hc5plv0hk7wkid53cbd28nxx1grp2wwm"; depends=[kyotil]; }; + aucm = derive2 { name="aucm"; version="2018.1-24"; sha256="0x10dawlwxqywjl7mxc2gpp2r4wnd7pb6n80xlrb9yywm7zbb6x2"; depends=[kyotil]; }; + auctestr = derive2 { name="auctestr"; version="1.0.0"; sha256="15b1x0c9yhl91gir7jmivp8vxzc8q7wvb0mgam9454avc6l29x4y"; depends=[dplyr tidyr]; }; audio = derive2 { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; }; audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; }; audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; augSIMEX = derive2 { name="augSIMEX"; version="1.0"; sha256="1d13kh9xfkpwy2285awhvgfkwyqlsdk2bypm0i1jjf10avrynxvf"; depends=[MASS Rcpp rootSolve]; }; - auk = derive2 { name="auk"; version="0.0.2"; sha256="0vi1fs2nda77sfhq3xzqs04kd7fq14bknv7jqffa30g84bm8qkb1"; depends=[assertthat countrycode magrittr stringi stringr tidyr]; }; + auk = derive2 { name="auk"; version="0.1.0"; sha256="042yygs00vya9xynl2i9bwhwwns3ba25ajp5zlgpv1zw6csby9ml"; depends=[assertthat countrycode dplyr rlang stringi stringr tidyr]; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; }; auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; }; autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; }; 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.3"; sha256="109n23j9wx0nbbawpr28l3xsxhc3pq21b0pg6h2symgjahvw9b5n"; depends=[fields ggplot2 mapproj maps viridisLite]; }; + autoimage = derive2 { name="autoimage"; version="2.0"; sha256="102f7wkrglsvdrsmyy79v0w7za5b79sn59czxzhriwrp4mrpdl47"; depends=[fields ggplot2 mapproj maps MBA 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]; }; + autoplotly = derive2 { name="autoplotly"; version="0.1.1"; sha256="1pm1760dd9p0h66q7y1v9icfhz1lk6i5akjda06jc2f0rq7mzlj0"; depends=[ggfortify ggplot2 plotly]; }; autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; }; - autothresholdr = derive2 { name="autothresholdr"; version="0.6.0"; sha256="1m3nz094czxx8sdnpww47qrh4g8g9lk97g9vs95v7al34whlq8xd"; depends=[EBImage magrittr Rcpp rJava RSAGA]; }; - autovarCore = derive2 { name="autovarCore"; version="1.0-0"; sha256="08h51bh1m3d47nprd5z7v3k3lkrixbxwinr73zd5442wskf4x82v"; depends=[Amelia jsonlite Rcpp urca vars]; }; + autothresholdr = derive2 { name="autothresholdr"; version="1.1.2"; sha256="0gkab2fnavjfb7h2fd2jbk5phz10hc18kf3l6r2zvvmq3gfhh2db"; depends=[checkmate ijtiff magrittr Rcpp RSAGA]; }; + autovarCore = derive2 { name="autovarCore"; version="1.0-2"; sha256="0yvz3nn792xdam8hgnkdrhcyaf9idp0shb1s0yfj1xigknlinn9n"; depends=[Amelia jsonlite Rcpp urca vars]; }; + available = derive2 { name="available"; version="1.0.0"; sha256="0w4i0ajw0p71k717v8hg9d8az08m8yl97w5lly87kli36p7mv30h"; depends=[cli clisymbols crayon desc glue jsonlite memoise purrr SnowballC stringdist tibble tidytext udapi yesno]; }; 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.4"; sha256="1dqfmmmvdmlpk9ld563f65chwp2ahhlnrvbzsj9m5rfjs0bw6yny"; depends=[aws_signature httr plyr XML]; }; @@ -4092,119 +4352,126 @@ in with self; { aws_signature = derive2 { name="aws.signature"; version="0.3.5"; sha256="1ijzdxv46x5iydmhgbri4lfpdhhlhz1ybhwwdcy4m4mjz9s74yhk"; depends=[base64enc digest]; }; aws_sns = derive2 { name="aws.sns"; version="0.1.7"; sha256="0i8nn5jnykhsjwn4nsqdqbagankjc09zs8and54rkirdigzdny8v"; depends=[aws_signature httr jsonlite xml2]; }; aws_sqs = derive2 { name="aws.sqs"; version="0.1.10"; sha256="09sh3injb4kfrq5al7hmbnqdn5v5hnjkqqsz86vpi4154435ymdg"; depends=[aws_signature httr jsonlite xml2]; }; - awsMethods = derive2 { name="awsMethods"; version="1.0-4"; sha256="0n4mxn9fkqkvv19mfaqhrmhwhmkxiahfnls47b5ki3a3gsr6cm8l"; depends=[]; }; + awsMethods = derive2 { name="awsMethods"; version="1.1-0"; sha256="1xywcadpjyzlw5f2k9sbr8fvrj3kcr1r6swi23lc952yrl3gvpkl"; depends=[]; }; awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; }; awspack = derive2 { name="awspack"; version="0.1.6"; sha256="0pf6g9w2r2rm887sa3v0gfwia2w2q94m40m76sq66gb3spkmngd5"; depends=[aws_alexa aws_cloudtrail aws_ec2metadata aws_iam aws_lambda aws_polly aws_s3 aws_ses aws_signature aws_sns aws_sqs]; }; aylmer = derive2 { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; }; 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-1"; sha256="113giw1aw6b5h0h5794p2p7zrwqz38mn9ihhpca7r8g7w74kpsdi"; depends=[]; }; - bWGR = derive2 { name="bWGR"; version="1.4"; sha256="0sj6fa4ajp7a7k8z7znqn3wkibvxmdlnj5xf1n0zmsvncmgqhkwh"; depends=[Rcpp]; }; + bReeze = derive2 { name="bReeze"; version="0.4-2"; sha256="04zapsxb4lsi85m9qgrsm49yasf0b8wk0djdpa7xks4hjvmskfhq"; depends=[]; }; + bWGR = derive2 { name="bWGR"; version="1.5.1"; sha256="0dkpj9xskflnhqr92bi54cg3qckjja1jj5vjypzijikwqimz879h"; 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.3.0"; sha256="018wyajdkpvcywcvkna57m5sqnsh7i9zq2hqlyb8q93mgyb3ddzm"; depends=[tibble]; }; backShift = derive2 { name="backShift"; version="0.1.4.2"; sha256="1nj7mcdpzfzq68qg86rrys752gzw69n99yyb0jzg6r8qrgpcxj49"; depends=[clue ggplot2 igraph 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.1.1"; sha256="15w8psmv203wzijrk4hvwaw3i4byh2m5s09yrkqwhfckhaj82kj9"; depends=[]; }; + backports = derive2 { name="backports"; version="1.1.2"; sha256="0mml9h3xagi7144pyb3jj9zbh9qzns7izkhdg7df20v7bikr6nz8"; 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]; }; bairt = derive2 { name="bairt"; version="0.1.1"; sha256="1i0y7bkhx0rsv93j32i2v3g2h3csxvnkkkx9kvkdnkcwzffps5x2"; depends=[coda mvtnorm shiny shinyjs]; }; 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]; }; + ballr = derive2 { name="ballr"; version="0.1.1"; sha256="1n2kaindpr6ba2fc1zvkl78jxl24y1gxn9dxv10c8m594l8shbxw"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; }; + bamboo = derive2 { name="bamboo"; version="0.9.19"; sha256="1k81r06kw50w6lm0vi6xwjymc4l13abagrn5b6czcyki3i6pwqc2"; 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]; }; banR = derive2 { name="banR"; version="0.2.0"; sha256="0m71m99f8f4wckylry6z16gw6r2cc4wxbd9287ns00jr6s13x6c8"; depends=[dplyr httr magrittr purrr readr rlang stringr tibble]; }; bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; + bang = derive2 { name="bang"; version="1.0.0"; sha256="16wy2imrdvhpdzi6ix9k69afqdyc44d1xr655yd3q1cl12x1nr04"; depends=[bayesplot rust]; }; 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]; }; bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; }; barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; }; - bartMachine = derive2 { name="bartMachine"; version="1.2.3"; sha256="15bv7q64ifjdg5ppx7vp3i3agil6dwirk5cf02lc243hmlg5lk1i"; depends=[bartMachineJARs car missForest randomForest rJava]; }; - bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.0"; sha256="1vnicq9amayxh69jqgly8jm7hvgjr22kvm1g6y2n7vphz70p9cq9"; depends=[rJava]; }; + bartMachine = derive2 { name="bartMachine"; version="1.2.4"; sha256="09w3gb7lh12ls8hmmnssvmlmp3lkbr2j0jqdihfb6049cgl31m60"; depends=[bartMachineJARs car missForest randomForest rJava]; }; + bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.1"; sha256="1wpfzrb6mrx3xmxy4rgnwygmpqq2l4ki2xqr4m51g1bl9nwirhzj"; depends=[rJava]; }; + basad = derive2 { name="basad"; version="0.2.0"; sha256="1qc2amkrjrgdqys275p82lmbpjszm5rzjdpri7hqc9d8b8q1vc9q"; depends=[Rcpp RcppEigen rmutil]; }; 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.2"; sha256="1dmpb6cyabs6fqnbwshyws107p961203wic7his6zywsn9axymfc"; depends=[backports]; }; + base64url = derive2 { name="base64url"; version="1.3"; sha256="1azik4yqafay4m2panbnyyf7cq5qb2qjv74ikhb8rljbsgv2xchd"; 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]; }; + basefun = derive2 { name="basefun"; version="1.0-0"; sha256="1a2ksmxki1jg0g9359zxzxignpcz7lcahqf6k3nclv7s0p22vb42"; depends=[Matrix orthopolynom polynom variables]; }; baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; }; + basicTrendline = derive2 { name="basicTrendline"; version="1.0.1"; sha256="0rsmlp70ylpkqv437jcy3skwbfkj4xwkpjb2q79b9n8kw2ir0716"; depends=[]; }; + basicspace = derive2 { name="basicspace"; version="0.20"; sha256="0nyljk8ydasirgv7ijxplyhk10s8m9k3rw5qmgf0z81dm7p257wc"; depends=[]; }; + basictabler = derive2 { name="basictabler"; version="0.1.0"; sha256="1m4cgghfh3aixsnwjlbaj3prnnqxhij60bakz9vdr5dvnqg92an9"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; 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.6"; sha256="1yr5ar2c7jwm5c6q8gky6xi8fyp92y4nm0jvg0wcxb3lhwvmr42k"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi withr]; }; + batchtools = derive2 { name="batchtools"; version="0.9.8"; sha256="1ch03hj8ahkfc9sr4gv985s6zzxk5xm2dbm0hm8xjygkqkd8r5n9"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi withr]; }; 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="1.1.0"; sha256="0g74n6jvpmb2sbmywcagb10rk8sd3pxzkw9s8s6qpg34q58v01a6"; depends=[ggplot2 Rcpp]; }; bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; }; - bayesDP = derive2 { name="bayesDP"; version="1.2.2"; sha256="0lfw3mnk6kgpzg0h0r54k5dndgpbsb2i2q59qwsm6k14nz1b5n5j"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; + bayesDP = derive2 { name="bayesDP"; version="1.3.0"; sha256="1g7d64brln5p2gindc18jk4wqmh6phqr4zhs8jhl0yk9g4jhsqzn"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; }; bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; }; bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; }; bayesGDS = derive2 { name="bayesGDS"; version="0.6.2"; sha256="0ash16hmassn76x3f59dfvp4plqp8vb17qzcwmag7vi3mi3y2ap6"; depends=[Matrix]; }; - bayesImageS = derive2 { name="bayesImageS"; version="0.4-0"; sha256="1z8jvjqz56xlj5x2ilp9m93v74qsqd7xvdld5pk7y80pxnfd6wpy"; depends=[Rcpp RcppArmadillo]; }; - bayesLife = derive2 { name="bayesLife"; version="3.1-0"; sha256="01b8ih2n1yqsimicml17qz8vm8pyylq4igl4j6wi9gx9abxx1xg4"; depends=[bayesTFR car coda hett wpp2017]; }; - bayesMCClust = derive2 { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[bayesm boa e1071 gplots gtools MASS mnormt xtable]; }; - bayesPop = derive2 { name="bayesPop"; version="6.1-1"; sha256="0vf82bf400wsm8pkp1pzsxylijajp01z6q260cdri12c0qjdzcy5"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2015]; }; + bayesImageS = derive2 { name="bayesImageS"; version="0.5-1"; sha256="1p4l3i57xm8yrczdiz4nxmd8qv0pv0chlrpvndfn3fnjbcx2cfa2"; depends=[Rcpp RcppArmadillo]; }; + bayesLife = derive2 { name="bayesLife"; version="3.2-0"; sha256="1a3x3y77542hgndvymhnyg6dys0s5rimkgprl8psflsgsrxnbmcv"; depends=[bayesTFR car coda hett wpp2017]; }; + bayesLopod = derive2 { name="bayesLopod"; version="1.0.1"; sha256="0v9yy75mvr74jc0fz10qj1acwxjy0lbqkdqaj1hn88v294r9dw3q"; depends=[BH inline raster Rcpp RcppEigen rgeos rstan rstantools slam sp StanHeaders]; }; + bayesPop = derive2 { name="bayesPop"; version="6.2-3"; sha256="1znjf8mihip0dl7dyk8h3nbkzihz8lnf7kxvhf1l363v449s0bff"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2017]; }; bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; }; - bayesSurv = derive2 { name="bayesSurv"; version="3.1"; sha256="1dbk9bi4l5m5hmn10i7qm3ypb5y91dxr7b01xvrb2wpn6i1s9h7n"; depends=[coda smoothSurv survival]; }; - bayesTFR = derive2 { name="bayesTFR"; version="6.1-1"; sha256="12f3s1k7jalaqd3hxhlrn2i6nvzsmcgv5k1jfhbmk7py5b7ybj2p"; depends=[coda MASS mvtnorm wpp2017]; }; + bayesSurv = derive2 { name="bayesSurv"; version="3.2"; sha256="1zp302pfi64nnqdiqldvfi1lm0wv2dplz5sfjp0ydl1qc16z0axp"; depends=[coda smoothSurv survival]; }; + bayesTFR = derive2 { name="bayesTFR"; version="6.1-2"; sha256="092sl8xk82kybpp0v06j0dxh4zal0d6j2na42ghl2ri36iy6wqvx"; depends=[coda MASS mvtnorm wpp2017]; }; 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=[]; }; - bayeslm = derive2 { name="bayeslm"; version="0.2.0"; sha256="04p01rkgn2mbr0ihyclf1hsmr5410cihk4xwwcay7saxdbpsxn3d"; depends=[Rcpp RcppArmadillo]; }; + bayeslm = derive2 { name="bayeslm"; version="0.7.0"; sha256="132dli5lfxdghiz6g9jlzvbb71il0yv679947xrzfy68hln85d40"; depends=[coda Rcpp RcppArmadillo RcppParallel]; }; bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; }; bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; }; bayesm = derive2 { name="bayesm"; version="3.1-0.1"; sha256="04b4s8clxrmdyhnhd2arnsdi992422yam3z91w6dzrmngwxq4yaq"; depends=[Rcpp RcppArmadillo]; }; - bayesmeta = derive2 { name="bayesmeta"; version="1.6"; sha256="0drg3dwqq5zc70iq8a4znhk99k73vnczg45vna0d55p4ldr0nirf"; depends=[forestplot]; }; + bayesmeta = derive2 { name="bayesmeta"; version="2.1"; sha256="02aw7fgvdsnqasmvljh1pd5nks1hjys7n3kmlwnkr5a6w476v1q9"; depends=[forestplot metafor]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; }; bayesplot = derive2 { name="bayesplot"; version="1.4.0"; sha256="0izp2v734n4pcdlfjrhasl2srlnhccsf93ni6hfhl5l5xyf02043"; depends=[dplyr ggplot2 reshape2 rlang]; }; 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.6"; sha256="07jmfw2xf2zh3jqw0ai6wm9mdm0hl2b4fsghsm8fwgyc8vixy239"; depends=[kimisc]; }; + bazar = derive2 { name="bazar"; version="1.0.6"; sha256="12b1x218x1yh9iadv8ciyncr841s0arvj4pbn74bryhcgbvmbwqm"; depends=[kimisc]; }; bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; }; bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; }; - bbmle = derive2 { name="bbmle"; version="1.0.19"; sha256="014h6mw16gv4acs2p78dy7lla7s428n633aybsb1mbi6250dg0p8"; depends=[lattice MASS numDeriv]; }; + bbmle = derive2 { name="bbmle"; version="1.0.20"; sha256="1xzij7swrrzl5ly8l3lw6awh486zcm00251dwqws1y23fbgyh3vc"; depends=[lattice MASS numDeriv]; }; bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; + bbw = derive2 { name="bbw"; version="0.1.3"; sha256="1z3an561qh0rfi3jhh1ghsdbg8aimqmf4hpqri2jz39in3p0gwg4"; depends=[car]; }; bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; }; bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-2"; sha256="0v1zjbgpalr5ag97s9rxcd2z0r7qpw8yhc4lw4p4i3xkw2paf5zh"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; bcRep = derive2 { name="bcRep"; version="1.3.6"; sha256="1fibx11ykkkjv4sgg6zc2a0g270384z2cf68hwghnld0wi002b5z"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; }; bclust = derive2 { name="bclust"; version="1.5"; sha256="01kx02azj26b6swly53zhf3sny6c6jglkxnzylsc0pvri89x7yj2"; depends=[]; }; + bcmaps = derive2 { name="bcmaps"; version="0.17.0"; sha256="18rn9zlagp5f0268m8azcbl52jcyx33jjxaqpg05cz853fxib24h"; depends=[httr rappdirs sf]; }; bcp = derive2 { name="bcp"; version="4.0.0"; sha256="1bkd7812jacyk955l71b2szpc9550p0hpv3x337qgl09zck4vdgm"; depends=[Rcpp RcppArmadillo]; }; bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; }; 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="1.0"; sha256="12qlad4rb5zjj7ilcj11zhiir9jvp8hciz7f7viwk2m6jpl0dl2b"; depends=[openssl]; }; - bcs = derive2 { name="bcs"; version="1.0.0"; sha256="0wv7kfcr6i36ik8v3prwp4mrwg1x6vf5nmybq9a57fz66pf1ff1x"; depends=[fda Rcpp RcppArmadillo wmtsa]; }; + bcrm = derive2 { name="bcrm"; version="0.4.7"; sha256="0s0xmmphrrsqnrsnnsqh9ska6afl4jyk0s0290w6askrlqdzjgil"; depends=[ggplot2 mvtnorm]; }; + bcrypt = derive2 { name="bcrypt"; version="1.1"; sha256="1wwdin8x09y8n8zrwj1ylh5ikcz0v0la4wmrsvbdr61cg336wzx4"; depends=[openssl]; }; bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; }; - bda = derive2 { name="bda"; version="5.1.6"; sha256="0rpxvmjbqiph8hpzsvlj8q6h70jsc9771fiq7l3lmkz69jn1gf4q"; depends=[]; }; + bda = derive2 { name="bda"; version="10.1.9"; sha256="06ycxqjpnsywakjkjxf1czhxsbdzbpwa11m69gad5538z066d24x"; depends=[]; }; bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; }; 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]; }; + bdots = derive2 { name="bdots"; version="0.1.15"; sha256="1a665f9f18wajf4y6jp17icg9w6wx698xfnlry2sm5pq6nrkmwln"; 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.18"; sha256="0m1nxq6bjinagmbkixkqdyx9s4vwggcihb33aqpixlm6vqcf7wyh"; depends=[chron ggplot2 lattice leafletR maps plotrix plyr sqldf taxize treemap]; }; + bdsmatrix = derive2 { name="bdsmatrix"; version="1.3-3"; sha256="17ddvz4gnih7rx0lr1gzk280xyh6x796cf2x794dvplpiiq83skh"; depends=[]; }; + bdvis = derive2 { name="bdvis"; version="0.2.20"; sha256="1iif70s17d9nh6bylm9s0ky70qx441n56h953gz4hxp7rb5dly31"; 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.2"; sha256="0zh5gaplkwp3mq0dpj6avjlgxbni05mzbh782kb230754nshr27h"; 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]; }; + bea_R = derive2 { name="bea.R"; version="1.0.6"; sha256="15pdbwz7av8862bl144n998qk0w9rqwip9m2brdm5hj7id5xdlif"; 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]; }; + beadplexr = derive2 { name="beadplexr"; version="0.1.0"; sha256="1aw75v4bjxrf22x0bm57qqp6r7cz8zmkd1hmk4amlxypbxd2479f"; depends=[cluster dplyr drc flowCore fpc ggplot2 lazyeval magrittr mclust purrr raster tibble tidyr yaml]; }; beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; }; 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]; }; + beast = derive2 { name="beast"; version="1.0"; sha256="1j4afp8cm6psxqidanvcfqrz6zy1klkzjkm7ia5w5qlvgll2micz"; depends=[RColorBrewer]; }; + bedr = derive2 { name="bedr"; version="1.0.4"; sha256="052sn90gjr34hjgyndzvcl66pv22q0kjqbx95y1pdydiwhwmhpa3"; 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.1.0"; sha256="0zi2c6agkxx6aq7ih2c1z4r93fsjmqp2iymxllld0d7jcpp5qbv6"; depends=[cranlogs jsonlite]; }; belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; }; + belg = derive2 { name="belg"; version="0.1.1"; sha256="0bbp413q6y24g05xsk49lpz7b2i6n9fb791h05ml39x8r9lapif6"; depends=[Rcpp RcppArmadillo]; }; 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.6.0"; sha256="0w98q4b814bz3q0vqdfnwqrgfrky3ggsyyzmdiz17kv6xk17qds8"; depends=[benchmarkmeData doParallel foreach httr Matrix]; }; @@ -4212,13 +4479,15 @@ in with self; { 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=[]; }; + benthos = derive2 { name="benthos"; version="1.3-4"; sha256="015p9wxykr2g29r95wdslw1d2klc9ps4wznjrv1rxm5mazdbb2wv"; depends=[dplyr lazyeval readr]; }; ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; - berryFunctions = derive2 { name="berryFunctions"; version="1.15.0"; sha256="006q9p97mz7mc6z892680a49s2j4jcykjgkddgb69jpbj5shx1pg"; depends=[abind]; }; + berryFunctions = derive2 { name="berryFunctions"; version="1.16.3"; sha256="0bwqp999niakmihhj4wp9q63bg4mr4gsygxzss0dl276q7ma8x5i"; depends=[abind]; }; + bestNormalize = derive2 { name="bestNormalize"; version="1.0.1"; sha256="0mlvaa35nsp19154g894xvfd6wg99lwxnfissf8yykwfl7fb265x"; depends=[LambertW nortest]; }; 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=[]; }; betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; }; - betapart = derive2 { name="betapart"; version="1.4-1"; sha256="1ldz6hr08vsgvz0h9ilsm5ab5fyppjpnz215lhri80x7biym3c0q"; depends=[ape geometry picante rcdd]; }; + betapart = derive2 { name="betapart"; version="1.5.0"; sha256="0hk016hpdb927d142rfa13kjwhgzki1fy4xqbwdphzwv37nyxag7"; depends=[ape geometry picante rcdd]; }; betaper = derive2 { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[ellipse vegan]; }; betareg = derive2 { name="betareg"; version="3.1-0"; sha256="05s5lszj22186xhvk0dxgz4vqfvmss40pbh147mwqkz1h48z5pf7"; depends=[flexmix Formula lmtest modeltools sandwich]; }; betas = derive2 { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; }; @@ -4228,91 +4497,92 @@ in with self; { 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-35"; sha256="13jfbzijg087sva45bxzdnpz16l51mbszzh443nad23lym0w4bfg"; depends=[Rcpp]; }; + bfp = derive2 { name="bfp"; version="0.0-38"; sha256="117rr680jjfn2xksqwhy7sx03cf5444jdgr9dzlr3bcc6pcxslx2"; 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.11"; sha256="1d35fvwk8v8b2x1knhsk5rz48hc5k9lkrxqd6y8p0gn63k5iy5ag"; depends=[coda survival]; }; + bhm = derive2 { name="bhm"; version="1.13"; sha256="1iq1hjc7xn2kmmxgzv6mzcvvf48kqp5b8lavmzrqykak3v4z02nz"; depends=[coda survival]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; - bib2df = derive2 { name="bib2df"; version="1.0.0"; sha256="0qhhv23lr5ya3jhqrx4x5zx3bl0mrjlwd8i30lbinl7hlz50ahgr"; depends=[dplyr httr humaniformat stringr]; }; - bibliometrix = derive2 { name="bibliometrix"; version="1.8"; sha256="1wzdyymmzikbkr41mw5s3srsvzh4zww8657r8i60dnf8dajgcryj"; depends=[factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer rscopus SnowballC stringdist stringr]; }; + bibliometrix = derive2 { name="bibliometrix"; version="1.9"; sha256="1yzdbh5h3fvc6agr551g9n10mlr72cbsrw9mpigfhxb953wvda54"; depends=[factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer RISmed rscopus SnowballC stringdist stringr]; }; bibliospec = derive2 { name="bibliospec"; version="0.0.4"; sha256="0abrbaw2knnlh8g5r4c2i6cc7a6ilfxry8zhscrx0x58irmp790b"; depends=[DBI RSQLite]; }; bibtex = derive2 { name="bibtex"; version="0.4.2"; sha256="0wl3925ryd54g1nv3ncwllc493d39dpgy5md61940h69c0van1hz"; depends=[stringr]; }; 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.4"; sha256="1h3r5vigs2ghga84smx492m0v9aq6gynnw5r23n20kkbiscv1fxk"; depends=[Formula Rcpp RcppArmadillo]; }; + bife = derive2 { name="bife"; version="0.5"; sha256="0lzij8sazfdr687bi5lfp5ndvwlx18vyzr3svc0zv9mnv8s8vfvd"; depends=[Formula Rcpp RcppArmadillo]; }; bigFastlm = derive2 { name="bigFastlm"; version="0.0.2"; sha256="012vxy5mpknc3998h382qdzgrxnyfpyddy003zjp3v42clim5y64"; depends=[BH bigmemory Rcpp RcppEigen]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; - bigKRLS = derive2 { name="bigKRLS"; version="2.0.2"; sha256="0m58mjk3s4slpblxiby6j7fd2pha19nl7gl71f49k5gkz87skd2m"; 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]; }; + bigKRLS = derive2 { name="bigKRLS"; version="2.0.4"; sha256="027p1v89fpi2rgxca035nyzk51dxv0x04sy3mqb5z38rvj8r08k9"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; + bigQueryR = derive2 { name="bigQueryR"; version="0.3.2"; sha256="0l61yvvjlv1zgb1vyf1q3sj4dff1vi6lkf61hc9kqs5cvhqbf87y"; 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]; }; biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; }; biglasso = derive2 { name="biglasso"; version="1.3-6"; sha256="044l2l34l4pl7ijwgq569cn8x5clj795qpfwb1b9qfwvggvgzgni"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; + bigleaf = derive2 { name="bigleaf"; version="0.3.0"; sha256="1y1z9hi23w0n374jvndr0prry7msp6lfzkwzdr7ivpi89af0h027"; depends=[robustbase]; }; 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 = derive2 { name="bigmemory"; version="4.5.33"; sha256="0ycl9dzm3drpyas625h34rir5bnbjlncxlvawfsfmqwcbmwdjdvj"; 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]; }; + bigpca = derive2 { name="bigpca"; version="1.1"; sha256="09rd8ryar8wiih50s6b246jf0idmi62fsi7ljysx7j0jarj3jyhz"; depends=[biganalytics bigmemory bigmemory_sri irlba NCmisc reader]; }; 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]; }; - bigstatsr = derive2 { name="bigstatsr"; version="0.2.2"; sha256="0x46csllfdiyr0krsiicvlcdkafh114r6iv71barah3sfib6rash"; depends=[BH cowplot doParallel foreach ggplot2 glue magrittr Matrix Rcpp RcppArmadillo RSpectra]; }; 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.4"; sha256="0j4zyphnmmgdckvlhf0sbmnjkz1xpbikfsgk111lpcn5dg1h526g"; depends=[BH DBI httr lubridate magrittr Rcpp reshape2 RSQLite tibble xml2]; }; + bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; }; + bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; + bikedata = derive2 { name="bikedata"; version="0.1.1"; sha256="0vs1cal05a80zjz6gqfsxs616dqrq47vgk91mrdhca3b95ywxyfq"; depends=[BH DBI dodgr httr lubridate magrittr Rcpp readxl 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=[]; }; billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; }; - billboarder = derive2 { name="billboarder"; version="0.0.3"; sha256="1zw18cxsk4q6lbasig6bw2zjxws76rmpcp4qna4jdq6ars1p8sl1"; depends=[htmlwidgets jsonlite magrittr]; }; + billboarder = derive2 { name="billboarder"; version="0.2.1"; sha256="0xmkj6l3cpyyq23hp6jhfqllpg7gkksajnq25wyccqmypxjik8jv"; depends=[ggplot2 htmlwidgets jsonlite magrittr scales]; }; bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; }; binGroup = derive2 { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; }; binMto = derive2 { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; }; binaryGP = derive2 { name="binaryGP"; version="0.2"; sha256="0i4xi0gxk0lamjdygyx0azdp3kfqmva1g20nl3p65w4yx77m88d6"; depends=[GPfit lhs logitnorm nloptr Rcpp RcppArmadillo]; }; - binaryLogic = derive2 { name="binaryLogic"; version="0.3.5"; sha256="1zaqwkrr1dyxsbfa3zvz1ciipmqddl932jkw9r00qmnhdh3ybpa6"; depends=[]; }; + binaryLogic = derive2 { name="binaryLogic"; version="0.3.9"; sha256="19ig9qgjjnivfihjy41pc13qlrb95679mmk4zks5lbbri8qi4qxj"; depends=[]; }; 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.2"; sha256="0l1l22zl87wiyl79m3gj2vlxmkhxvrkl4alhyy08h55q7hqs3vyh"; depends=[bindr plogr Rcpp]; }; - binequality = derive2 { name="binequality"; version="1.0.2"; sha256="09gafmz77qbyci8ih8zag3l8a92qij8nyr8hw57ymcvnzafq5iad"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; }; + binequality = derive2 { name="binequality"; version="1.0.3"; sha256="0hhcmw1mq785zylcxghfnazi3xvnl7sqpqll8fqdk064a4drqkw1"; 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.3"; sha256="1y68rgafipfad78yrzcygdszgy1d5q739kap06pzr78bn3i8hiwa"; depends=[doParallel foreach gplots matrixStats network vegan]; }; 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]; }; + binneR = derive2 { name="binneR"; version="1.1.1"; sha256="07cfcp9jj5bks8kmxvir9y9z7fj44hvy1wyrg4jy029dvkz8g2ki"; depends=[dplyr magrittr mzR plyr tidyr]; }; + binnednp = derive2 { name="binnednp"; version="0.1.0"; sha256="0cfgz6828b2525dmph5n4zxdgkbx0nsrm4k2azhw1xfi3pz4z6ga"; depends=[fitdistrplus kedd mclust nor1mix Rcpp Rdpack]; }; binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; }; binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; }; - binomTools = derive2 { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; }; binomen = derive2 { name="binomen"; version="0.1.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=[]; }; binseqtest = derive2 { name="binseqtest"; version="1.0.3"; sha256="0661a2bqmv6bckq23c6m04ggwrp8z10lfgjg9dgkz4bfxsd297gs"; depends=[clinfun]; }; 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=[]; }; + binst = derive2 { name="binst"; version="0.2.1"; sha256="09kzk7n1j9nzgyijwirzk33z6p6hc67zkd05hv1i9qfijy31gci4"; depends=[rpart]; }; bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; bio3d = derive2 { name="bio3d"; version="2.3-3"; sha256="0cw6nhkj5mxh89lfrnhrmv0rwxkmh05g6nd6rvd7ahcaxd3mid7l"; 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.8.1"; sha256="1q10q6mk8qzf6an52qhlps61zv8vwy0lcx3128zyn8p6b98ymy8d"; depends=[]; }; + biofiles = derive2 { name="biofiles"; version="1.0.0"; sha256="1bglgl2jcp6jy3f7xwndil56i98xx4kn518s3fqdixw7n5ibmqd2"; depends=[assertthat BiocGenerics Biostrings foreach GenomeInfoDb GenomicRanges IRanges iterators Rcpp RCurl reutils S4Vectors XVector]; }; + biogas = derive2 { name="biogas"; version="1.10.0"; sha256="1il4r71h2a0xqpjs7q97ypdd12jmdnh0kqcs6j5gpjxdsmgnhlsy"; 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]; }; - biolink = derive2 { name="biolink"; version="0.1.2"; sha256="12hpd50swnij9jzc8m6bz7iwmndgwmlyj7vnd8hvnz1gc68bjs2p"; depends=[memoise rentrez xml2]; }; - biomartr = derive2 { name="biomartr"; version="0.5.2"; sha256="1q1zizfixi7rcbigxmi1vk271b704z5lxnzph9cqa3zwsv1clfxb"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite RCurl readr stringr tibble XML]; }; + bioinactivation = derive2 { name="bioinactivation"; version="1.2.1"; sha256="1dxpa549y6dqzmi8nk57x0blqmcz51v9hj0sy3g9laj9aj0rmyzz"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS rlang]; }; + biolink = derive2 { name="biolink"; version="0.1.3"; sha256="0cy9s9wg5rgwczqjfw6xp9ragqcj9gzp7icpm0nqwrdghsj7azjv"; depends=[DBI glue memoise rentrez RMySQL xml2]; }; + biomartr = derive2 { name="biomartr"; version="0.7.0"; sha256="1gjl4xh9ryxsf3lhn4fqa3zw10yc0mwrfgkrbq117njsw988kms7"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite purrr RCurl readr stringr tibble XML]; }; biomod2 = derive2 { name="biomod2"; version="3.3-7"; sha256="0mbf6j4m7vvq82l1grmznfqirj1ynr6jzzlpx0s2wjd3hdbvgzia"; depends=[abind dismo earth gbm ggplot2 MASS maxent mda nnet PresenceAbsence pROC randomForest raster rasterVis reshape rpart sp]; }; bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; }; - biorxivr = derive2 { name="biorxivr"; version="0.1.3"; sha256="1vi035c4jld5i52xnp79dn5642308cv11vfrw0n62wlsbjfbdma4"; depends=[XML]; }; bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; }; - biosignalEMG = derive2 { name="biosignalEMG"; version="2.0.1"; sha256="1prdr0pa1vd190pqxr7y87sjy10icfj9wb7jc3r5q8qmk5lpnyq5"; depends=[signal]; }; + bioset = derive2 { name="bioset"; version="0.2.0"; sha256="1cv4sgmbvxghwa22qwvgp5zgbfcyhljsh6c6k7gakxsv0wz1xq46"; depends=[dplyr magrittr rlang tibble tidyr]; }; + biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; }; biospear = derive2 { name="biospear"; version="1.0.1"; sha256="03wsyzlxmqff6xvr10jy49p229xr6jjvr8kk93wm7wil7q6b7z42"; 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.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; }; @@ -4321,6 +4591,7 @@ in with self; { 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]; }; birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; }; + birtr = derive2 { name="birtr"; version="1.0.0"; sha256="0bcxvj30wzwclw1lcyhvwj3k7awd39lrvzia1nrg53hw90bfs811"; depends=[]; }; 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=[]; }; @@ -4329,14 +4600,13 @@ in with self; { 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.4"; sha256="0vl9anlwvnnaiz67h256r386gy57fbbygjahsjaiaw8zrp84fj3p"; 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.1.2"; sha256="1r6pdd82gz7fy866abhgx7xm6c31x24yzk5gjpc6ws2m29lik3ba"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; }; + blackbox = derive2 { name="blackbox"; version="1.1.7"; sha256="1qdj6wsgr623wnhc573krnhjx65d4k9y8i3n2l2lj1qpqd538ygw"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; }; blandr = derive2 { name="blandr"; version="0.4.3"; sha256="03w1k646izbrygcsynrzrph7crpqdqn58544mmm9zxfvkmsilpmi"; depends=[ggplot2 knitr]; }; blastula = derive2 { name="blastula"; version="0.1"; sha256="0i306x0xm34r9fz7iq8frjbcvfbgg64fm5nn7mbk29a58kn91axp"; depends=[commonmark ggplot2 glue htmltools httr knitr magrittr mailR rJava stringr]; }; - blavaan = derive2 { name="blavaan"; version="0.2-4"; sha256="1bjczm5i9q1h3i1sl5p31jv87hi9bj4b546fi4g338ljqqrzx6a5"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; }; + blavaan = derive2 { name="blavaan"; version="0.3-1"; sha256="1r5kararl5d8fk6zlawhyjpi1sc3xp1pd2cf83qmh9wbvdsfphwg"; 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=[]; }; @@ -4348,42 +4618,45 @@ in with self; { blmeco = derive2 { name="blmeco"; version="1.1"; sha256="1hzg5dimzj1khygm9dv0y30mx1nf9vdhgicqdg1rvj7nf426h2ki"; depends=[arm lme4 MASS MuMIn]; }; 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]; }; + blockcluster = derive2 { name="blockcluster"; version="4.2.6"; sha256="0dskcwdh89a24j1lr829p9rrs88l13738b1gvsmsqrcrg9z955xc"; depends=[Rcpp rtkore]; }; blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; blockmodeling = derive2 { name="blockmodeling"; version="0.1.9"; sha256="1rd8ifwv5q9yl0ayzkgi0h4k79w3r46dr164l73iz1ny77a78fn9"; 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.7"; sha256="0pkkp1i6dsj4q4p6529qkbyy8mqmw9zhs1ww1y55yn1adkkwfd4z"; depends=[crossdes]; }; blockseg = derive2 { name="blockseg"; version="0.2"; sha256="183hjb66589qqjwf14rzdmy770biad73r0l5pkh6f4xk9xac1r62"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; }; - blogdown = derive2 { name="blogdown"; version="0.1"; sha256="05cicpk8yv7v2fbq0yg8rqga88by0zr1ygr7phmsb4fzgzmv709n"; depends=[bookdown htmltools httpuv knitr rmarkdown servr yaml]; }; + blogdown = derive2 { name="blogdown"; version="0.5"; sha256="1i34vynvb496w638g0mip30vrxcx60nbr48g1nfkmgiw1nrvr8c5"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; blsAPI = derive2 { name="blsAPI"; version="0.1.9"; sha256="1p7s799kix396fbx8ap9vy9akwpaps37awr18qbj53n9qcm74wkp"; depends=[RCurl rjson]; }; - blscrapeR = derive2 { name="blscrapeR"; version="3.0.0"; sha256="1846n1hm1xprdni847zvs187f7yxay0a7x9vq67kmhd0n5lxn5cq"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr tibble]; }; + blscrapeR = derive2 { name="blscrapeR"; version="3.1.1"; sha256="1s76d6511ifhh17dnwhrd8hzmfnb26qal68pn4v4smz35srgfa9j"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; }; 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.5"; sha256="144nd1s18nyii135jfr2f65szyzw8hi4zg57z85dnmr2xwas22qb"; depends=[BDgraph]; }; bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; }; - bmlm = derive2 { name="bmlm"; version="1.3.3"; sha256="0r9x4yfi583733r1qmrbcw8smw7w9crf48kwi2fwbyi5ysvpi7ms"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; }; + bmlm = derive2 { name="bmlm"; version="1.3.5"; sha256="091yjllx4kfngaam1ac8rxcx547k7s7qa75pb5350qkr096pvsvs"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; }; bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; + bmotif = derive2 { name="bmotif"; version="1.0.0"; sha256="1zjwlsimihszg8gg7mvvi8xmzvlsdph9x6524gb28jmd24xb4gwj"; depends=[tensor]; }; bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; }; - bmrm = derive2 { name="bmrm"; version="3.4"; sha256="1588nz3h05sss94sa1d87v5si7p3316canxc2dbbdqgv51ds377w"; depends=[LowRankQP lpSolve matrixStats]; }; - bnclassify = derive2 { name="bnclassify"; version="0.3.3"; sha256="11c1sraxlz9sgyg6i257asmxx9pnf0qcblnjp0pwlh1r50h0z5wa"; depends=[assertthat entropy graph matrixStats RBGL rpart]; }; - bnlearn = derive2 { name="bnlearn"; version="4.2"; sha256="1k9zfz8sc3ikrxp513cjgxw6fgxx9knz3wv5nikpcjmmrvlvwqya"; depends=[]; }; + bmrm = derive2 { name="bmrm"; version="3.7"; sha256="1lv4bcjri95nh4yqcp9hd3ad90lcp2drh1dwfn99i3344yw196x2"; depends=[LowRankQP lpSolve matrixStats]; }; + bnclassify = derive2 { name="bnclassify"; version="0.3.4"; sha256="0gjca802l3lvxy1ri8qff51mrgzj8ng0lk97kb4harvrsqx3i1wi"; depends=[assertthat entropy graph matrixStats RBGL rpart]; }; + bnlearn = derive2 { name="bnlearn"; version="4.3"; sha256="11zp8vf79h5a6dyijazld199pzp1lsgk3x049ykgy0bqjx2ivfvq"; 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.2"; sha256="0lhxcxkgi2mi99hq6vx8jwq6xafl8b7cfn84r40ikipp97ss0jha"; depends=[doParallel foreach gRain gRbase raster]; }; + bnpsd = derive2 { name="bnpsd"; version="1.0.1"; sha256="0f9w3qcdmf6qx5k01vddmxj1vadx6d9zcgw6prpbmcf3cdy3fwg0"; depends=[]; }; + bnspatial = derive2 { name="bnspatial"; version="1.0.3"; sha256="018rb5wacjk8igyc0qbp9rk3vjz3lffx81awlba8d2npiaxq6jbv"; depends=[doParallel foreach gRain gRbase raster]; }; bnstruct = derive2 { name="bnstruct"; version="1.0.2"; sha256="0n4gn1vhka694wdzignawyaca0rx2l0wjgw09fw42bkrswfjvxy1"; depends=[bitops igraph Matrix]; }; boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; }; + boclust = derive2 { name="boclust"; version="0.1.2"; sha256="0p6wx053yrq5cff2djqc341pj9q550b870rngspdlbqb0m4k6lr4"; depends=[d3heatmap DT genefilter ggplot2 psych reshape2 Rtsne shiny venn]; }; 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.5.0"; sha256="0gdmb3zsspcp594d32yzqhdpw4dwg7a3pfm7kgbghz368yw662gl"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; }; - bomrang = derive2 { name="bomrang"; version="0.0.7"; sha256="0az3vl2qmbb1v0wjr75lg5qypzfi3vgcn48k4ma3q8ack0nwpm1c"; depends=[curl data_table dplyr foreign httr janitor jsonlite magrittr rappdirs raster readr rgdal rlang rvest tidyr xml2]; }; - bookdown = derive2 { name="bookdown"; version="0.5"; sha256="0zm63kr4f4kja4qpwkzl119zzyciqj7ihajfqgfjpgb4dzaiycxp"; depends=[htmltools knitr rmarkdown yaml]; }; - bookdownplus = derive2 { name="bookdownplus"; version="1.3.0"; sha256="1297hwxkc1i3h706p135704rxc2hhkppmwkq5b04d7d03a1kv9pn"; depends=[bookdown knitr yaml]; }; + bomrang = derive2 { name="bomrang"; version="0.1.1"; sha256="1r1k8ridclmlsbrwlrjh7syw4fy3q1hf2rpi2xssh7gg2n709cjb"; depends=[curl data_table dplyr foreign hoardr httr janitor jsonlite magrittr raster readr rgdal rvest tidyr xml2]; }; + bookdown = derive2 { name="bookdown"; version="0.7"; sha256="1b3fw1f41zph5yw3kynb47aijq53vhaa6mnnvxly72zamyzdf95q"; depends=[htmltools knitr rmarkdown tinytex xfun yaml]; }; + bookdownplus = derive2 { name="bookdownplus"; version="1.3.2"; sha256="0vkivgjfmqy2xfs75w8ylkpgcvca294q61jrhbpg24vnll3c281n"; 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.2.0"; sha256="0sn22imcq8w9c1347d1pd680xlkh47s687100y6mh3xrwa1x5nsj"; depends=[nlme randomForestSRC]; }; + boostmtree = derive2 { name="boostmtree"; version="1.2.1"; sha256="0k79zfkck1plcd51sk6i8n5qh7hpnhchkqqhjn460hf0rl2mcjab"; depends=[nlme randomForestSRC]; }; boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; boot = derive2 { name="boot"; version="1.3-20"; sha256="0ai1qpm0p4z07xr0dvag8sdn9jrxcwanrsk9khzmww094jvr1jxd"; depends=[]; }; bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; }; @@ -4391,80 +4664,84 @@ in with self; { 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]; }; + bootcluster = derive2 { name="bootcluster"; version="0.1.0"; sha256="1mx08p0csz06mq55bdg4vgnqa9khdgqrz4jnm48c24pg8rpaj98b"; depends=[cluster flexclust fpc mclust plyr sets]; }; bootnet = derive2 { name="bootnet"; version="1.0.1"; sha256="1r5kbcycdlb8g4zs5vsrmcxl20a6x2kj47ybz6h1s83rqiylxg1b"; 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]; }; + bootsPLS = derive2 { name="bootsPLS"; version="1.1.1"; sha256="0ypffscbv7l13kwbgvz18smfass49sqrmivnbb84qiq91wr5frnm"; 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.4"; sha256="1risn5f48l5rmrx5pyifbrcbh92v94siqlwwiz2jljnhgsqgc1d4"; depends=[abind coda fishMod MASS mvtnorm R2jags]; }; + boral = derive2 { name="boral"; version="1.5"; sha256="1h1vf4j8p1vmhhqsrrn8jn0gynxjvkykm7f4jpsiivkfh69b0w95"; 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=[]; }; - boxcoxmix = derive2 { name="boxcoxmix"; version="0.13"; sha256="16hqhdlh04v7dfk44anvsa9vp2yziwwf7xccm9wknqpbbwif39p2"; depends=[qicharts statmod]; }; - boxoffice = derive2 { name="boxoffice"; version="0.1.1"; sha256="19l65nxrj0q7vr5ds6cwf7ynaqzd3ivzx673svvl6wmxlgn67cfi"; depends=[foreach lubridate rvest xml2]; }; + boxcoxmix = derive2 { name="boxcoxmix"; version="0.15"; sha256="0qvlk3kcvqzrak2rvf41fs8421fpfh3ch51rq0c9ac62x2dkfidh"; depends=[qicharts statmod]; }; + boxoffice = derive2 { name="boxoffice"; version="1.0.1"; sha256="0s8zx6n203l2cszq4xrwvazpw1fl36g1cln8n9sh20vyqrdcbgvh"; depends=[rvest xml2]; }; boxplotdbl = derive2 { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; }; boxr = derive2 { name="boxr"; version="0.3.4"; sha256="0wx3x65rk1ma8bw5h4yskr7ii95ynkm7il22l1bj34kv9f4bfyj3"; depends=[assertthat bit64 digest dplyr httpuv httr mime rio stringr]; }; bpa = derive2 { name="bpa"; version="0.1.1"; sha256="0np7q1nasrq4j7ssaipvbjgrsi9n612p9lp96frq1dgix95mcgf0"; depends=[magrittr plyr]; }; bpca = derive2 { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[rgl scatterplot3d]; }; bpcp = derive2 { name="bpcp"; version="1.3.4"; sha256="0l4x3n7lcwinnrh2sy386grisj1x7k1d5hll1k4bljg01p7lb475"; depends=[]; }; bpkde = derive2 { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; }; + bpnreg = derive2 { name="bpnreg"; version="1.0.0"; sha256="0mpwrhbbbw8m3cz0fl0x9j9m3n9zfdamnw83mmg4bjd0wmxkkm90"; depends=[BH haven MASS Rcpp RcppArmadillo]; }; bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; }; bqtl = derive2 { name="bqtl"; version="1.0-32"; sha256="0jjqgsm9fmvz5nkgz608xfljjpmaf4rs4f7kxvpqn4b1l9s5lhci"; depends=[]; }; - braQCA = derive2 { name="braQCA"; version="0.9.9.6"; sha256="1xqy0vykxdp0kr87w1sq8yjqrj0y8xh64fr2y8l79763xkyxpn0y"; depends=[bootstrap dplyr QCA QCAGUI]; }; + braQCA = derive2 { name="braQCA"; version="1.0.0.1"; sha256="1chyy8sk3iqs54sqg79dp1vjz3gcvnbzqbmgasdynir38b45scjh"; depends=[bootstrap dplyr QCA]; }; 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="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]; }; + brainGraph = derive2 { name="brainGraph"; version="2.0.2"; sha256="14jj4da2l92fgv924a8s4kw39vhxafaxj6pgwpxw86d5bqmc994g"; depends=[abind ade4 boot cairoDevice data_table expm foreach ggplot2 ggrepel gridExtra Hmisc igraph MASS Matrix mediation oro_nifti permute RcppEigen RGtk2 scales]; }; + brainR = derive2 { name="brainR"; version="1.5.1"; sha256="0ih4vwy445ciyyvf8snm42vg7rzzf6vn9qkbhj0yyd8sy88mgyss"; 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]; }; + brant = derive2 { name="brant"; version="0.2-0"; sha256="1hdwdrdl6ad112zd7q248am3qk19alnj647nrk9xxxgd7s6a9pnb"; depends=[MASS Matrix]; }; brazilmaps = derive2 { name="brazilmaps"; version="0.1.0"; sha256="1nvd8x4m4m3966qph6390kqwpsrv7vy4yf6pam98xxkjbl9a41nf"; depends=[dplyr ggplot2 magrittr sf sp]; }; - brea = derive2 { name="brea"; version="0.1.0"; sha256="0jawpl4d7himydb9z4kqpa7s6b7ghw9yp5j6xvzilbka0agpazck"; depends=[]; }; + brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; }; + breakDown = derive2 { name="breakDown"; version="0.1.4"; sha256="0mxn38pg95ih2p2gk2nayzwn6h8dhvsk46g0ndrhrr3l9nkbij3w"; depends=[ggplot2]; }; 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]; }; + breakfast = derive2 { name="breakfast"; version="1.0.0"; sha256="0p0svsqphd5w99pf5c5jmak1xxl8md881lapa8aps9xr73m4x6lf"; 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]; }; + breathtestcore = derive2 { name="breathtestcore"; version="0.4.0"; sha256="04vi9rlb5lkml91jv55v3dyyqcjp9ly760sshpsv9lpbwq47ch7c"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; }; + breathteststan = derive2 { name="breathteststan"; version="0.4.0"; sha256="13wqb33gvzmjpgzqyyadydz5hnqcran80azaxbixj7wga0c35pqq"; 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.6.1"; sha256="17r3az6za98v2r06aak77kypdaqssc9wxcc6m6vb20y7xm8dp1mp"; depends=[profileModel]; }; - brglm2 = derive2 { name="brglm2"; version="0.1.4"; sha256="15fv8hkn05zifwd0l2a3x4nf83pd59r2r8dbvii6pjch4b447chv"; depends=[enrichwith lpSolveAPI MASS Matrix nnet]; }; + brglm2 = derive2 { name="brglm2"; version="0.1.7"; sha256="04hfvb0s6xjswv9f1z2aa80j490jcpf3jlplb4s576hc3fd8qqda"; 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]; }; + bridgesampling = derive2 { name="bridgesampling"; version="0.4-0"; sha256="1gv2h2wgj1ym7qpmxmj5s3q2xsz217ijwdx70qnh4ijvacsvaxwm"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; briskaR = derive2 { name="briskaR"; version="0.1.1"; sha256="0w614lb94vim6wlzj13gnfgkq0vg9fjlvwvvs11pnqq501qn2hzl"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; brlrmr = derive2 { name="brlrmr"; version="0.1.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; }; brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; }; - brms = derive2 { name="brms"; version="1.10.0"; sha256="19wv02kgrfxnbxmhf4gxwls9dkba6qnnhsf6vcgmgw7q80dh533c"; depends=[abind bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools shinystan]; }; + brms = derive2 { name="brms"; version="2.1.0"; sha256="1ahm539add6g26vfj8szmpcwkhnkjcqqqq35mfryrp94yslb6a8n"; depends=[abind bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; }; brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; }; - broman = derive2 { name="broman"; version="0.65-4"; sha256="0cmcyifp49c1m3sawcs5ijjl218wk4sffvr68dfi3y9vh58f5iss"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; - broom = derive2 { name="broom"; version="0.4.2"; sha256="0i2s3jbi0v5xhbqkmms4f17i3x9s6lan4bj521qmxwiwc89r8h4z"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; }; - brotli = derive2 { name="brotli"; version="1.0"; sha256="0sicqwri8rxqxwhj4z8ckfls2yz09jwb9c5pjk5dhxrsyh85k80m"; depends=[]; }; + broman = derive2 { name="broman"; version="0.67-4"; sha256="1jv1543zq74zjdrmhkcrjwxhn9bmsmmwadd9rjnn18svnrbnlq0g"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; + broom = derive2 { name="broom"; version="0.4.3"; sha256="119pc2jnxvm13cvd77c7d14p3bn68f4jm310vj3yfck40101n9if"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; }; + brotli = derive2 { name="brotli"; version="1.1"; sha256="1jdhc03ycafjm6zfl9m95pd3krkb94mq2lhfjchfjc876mbam8x6"; 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.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; }; - bsamGP = derive2 { name="bsamGP"; version="1.0.1"; sha256="1chg1bd89cbrpi1g8wrfzz3q1m8fhhca1xrr57bhqjs7qjibm5i6"; depends=[ggplot2 gridExtra MASS]; }; + bsamGP = derive2 { name="bsamGP"; version="1.1.2"; sha256="037xgkmcli24jiqahxcingyx97q0jci2ahahcpn3xbzixa161rvf"; depends=[ggplot2 gridExtra MASS]; }; 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=[]; }; - bsplinePsd = derive2 { name="bsplinePsd"; version="0.1.0"; sha256="1sicbrammayy56fa72jjygxiqxri93kglpyalhm30llsdm4jic33"; depends=[Rcpp]; }; + bsplinePsd = derive2 { name="bsplinePsd"; version="0.2.0"; sha256="0fxm53sdlxjrvwvlihar8iwzin7ajkzvnm3h3nbzh37lf00gz0sb"; depends=[Rcpp]; }; 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-1"; sha256="06pizcbxp6l4cjl88ccpn3hsxgq51vcw2bzyc6li4z01jaqvxh5y"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; }; + bssm = derive2 { name="bssm"; version="0.1.4"; sha256="0wrai7s5sdjykiz8c5qrlcscm1awfz9cjaggarrs83h9fcs3n38x"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; }; bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; }; bst = derive2 { name="bst"; version="0.3-14"; sha256="02rnnv3f89329kw81a1v88wjzrfjshqjijw5hp3zyydcsfa3j088"; depends=[doParallel foreach gbm rpart]; }; bsts = derive2 { name="bsts"; version="0.7.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]; }; + btergm = derive2 { name="btergm"; version="1.9.1"; sha256="1bvq6v35fpfd4vhbq1c5jb4gg3iyfflbv0n89gv4hzm80xx50rs9"; 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]; }; + bucky = derive2 { name="bucky"; version="1.0.4"; sha256="1irzv1ib40h0ijlpawp0lac572nik3x77xcdi1vyncvinc9pcmr8"; depends=[lmtest sandwich]; }; 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]; }; + bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; }; bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; }; bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; }; - bupaR = derive2 { name="bupaR"; version="0.3.0"; sha256="0732h95pv8a235qvaydfaziwbq0q2gxmn4ffh7n1ar4azkgc94l3"; depends=[data_table dplyr magrittr miniUI purrr shiny]; }; - burnr = derive2 { name="burnr"; version="0.2.1"; sha256="138n52rwlkkxpbrz65cfcv9rp4vp4c17w9ydpqfk9fa8b3sqhhsn"; depends=[ggplot2 MASS plyr reshape2]; }; + bupaR = derive2 { name="bupaR"; version="0.3.2"; sha256="08xkf88fx8wn22vzn2ghm1jagh09pafqgmx41k99vrqkl3nrfm58"; depends=[data_table dplyr forcats glue magrittr miniUI purrr rlang shiny tidyr]; }; + burnr = derive2 { name="burnr"; version="0.2.2"; sha256="1b5ys0jm2dmiz1jd5f3907dhv44wh60kmfdfhj3fzx8rk7zllm06"; 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=[]; }; @@ -4478,8 +4755,10 @@ in with self; { cAIC4 = derive2 { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; }; cIRT = derive2 { name="cIRT"; version="1.2.1"; sha256="1i43pqlyzykyd1a6abg1yi7ai9ay7d2jkvnw1sa4c6q07jk56d89"; depends=[Rcpp RcppArmadillo]; }; cOde = derive2 { name="cOde"; version="0.3"; sha256="1r49q7qansn86wrxbhxqnn1dccd9av4lh4h5pn9kk42pls9q60nf"; depends=[Rcpp RcppArmadillo]; }; + cRegulome = derive2 { name="cRegulome"; version="0.1.0"; sha256="0yf5kx583k483rs3vw614qfv92k3c8gld8vsw16j1vlsbrasbiah"; depends=[DBI dplyr ggplot2 ggridges httr magrittr purrr R_utils reshape2 RSQLite tidyr UpSetR VennDiagram]; }; 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=[]; }; + caRamel = derive2 { name="caRamel"; version="1.0"; sha256="0al4yk77a4bh8rjdpl841bnnjvs0sjyxqswqwik1n6y0bfr8f7pl"; depends=[geometry]; }; caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; }; caTools = derive2 { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; }; cablecuttr = derive2 { name="cablecuttr"; version="0.1.1"; sha256="1v3zhaxkp1h6lack2qk0v4zxh6fd0ymjnikw6bs7k540w2vrbs1g"; depends=[httr jsonlite]; }; @@ -4492,16 +4771,17 @@ in with self; { calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; }; calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; }; calibrator = derive2 { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; }; - callr = derive2 { name="callr"; version="1.0.0"; sha256="05gp4y69ixajvmhrh1qrn5cnzj9jhfdxrfxnm2l2xfisfa680mic"; depends=[]; }; + callr = derive2 { name="callr"; version="2.0.2"; sha256="0m51p39vfwldxv6h8x4y9w3laf8q9bldhfqhlcrlx3xhy3irb1bp"; depends=[assertthat crayon debugme R6 testthat]; }; 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.8"; sha256="06sl3rlzgjf3yq9y0sg664xc0xfxwlvvd5w4wr5946h6kwvnhih4"; depends=[overlap rgdal ritis secr sp taxize]; }; + camtrapR = derive2 { name="camtrapR"; version="0.99.9"; sha256="1kzy90mwmpn2yb47xp5b8s3lj8lbkg8hfw44pwfb54gqf7wi2lkm"; depends=[overlap rgdal ritis secr sp taxize]; }; + cancensus = derive2 { name="cancensus"; version="0.1.7"; sha256="0v3wbmdqg36zn30kgj5xbndz69x3vvr0i6ag57gz8sbbgc4nyqbr"; depends=[digest dplyr httr jsonlite rlang]; }; 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.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; }; - canprot = derive2 { name="canprot"; version="0.1.0"; sha256="0g3sqc81qw8jx6v2p6makclccnvhshimwlhk2cabq20rfs8npgbm"; depends=[CHNOSZ colorspace xtable]; }; - canvasXpress = derive2 { name="canvasXpress"; version="0.17.2"; sha256="138385yc84py49fgq5b074c3f52s9hvcqsvlmfr9zlcj8wcs17mi"; depends=[htmlwidgets]; }; + canprot = derive2 { name="canprot"; version="0.1.1"; sha256="14g7wl4p9bgwf5jm48mp676z0pwlsd2xgxjwzixri7mxxh0ivfh1"; depends=[CHNOSZ xtable]; }; + canvasXpress = derive2 { name="canvasXpress"; version="1.18.5"; sha256="052qwymd28pi4c5pkdrwb85r1f1342y46fpirz2mrspx9r877d7h"; 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.11.0"; sha256="1yw7h1r5m4md8yv0fn1j4wxvhwybifqyvrn8ip3fl32kxbwsmnvz"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; }; @@ -4510,46 +4790,51 @@ in with self; { 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-5"; sha256="1bm0ks9ga60z3izgq0d4kvirr9v4yf1820d1wznkihnbb55bc3m6"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; + car = derive2 { name="car"; version="2.1-6"; sha256="14l4d9j87xnb0bz2wgqqbxnlnbcdfb5vx2fw6kdxj91kyrk6lhnj"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; carData = derive2 { name="carData"; version="3.0-0"; sha256="1ggz4py77bgwlpl6rsv7vlxj1kjs6c10dskizwwjps910r76pd79"; depends=[]; }; + carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; }; 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.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; }; - caret = derive2 { name="caret"; version="6.0-77"; sha256="05c504567s2nppzfgi36mhszbym2pr80nf50dgxcxfx030721v5y"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; }; + caret = derive2 { name="caret"; version="6.0-78"; sha256="0h1nxzii2h80aslp1zsjczrlfmaks44sskabk4yq9c5rafc7ka6y"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; }; caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; + carfima = derive2 { name="carfima"; version="1.0.0"; sha256="0bxk254q916w5h5zyyp2bs6nvbmbzqfx3jr4a80fkgbmr49chzzp"; depends=[DEoptim invgamma MASS numDeriv truncnorm]; }; 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.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="2.0.1"; sha256="0ji5igf6vs07aagmj7lwarlmb32jjk5fja9a975cpd38fsj9a5v2"; depends=[classInt raster Rcpp rgeos rosm sf sp]; }; - carx = derive2 { name="carx"; version="0.6.2"; sha256="1wijkpbv2x75ay9pba4sjazjpalrd31zclnnansmhghf1wiizciq"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; }; + cartography = derive2 { name="cartography"; version="2.0.2"; sha256="0wnm9hffqa751q8savfrwrnzlwdzg3rs648h17rxa0a1wqq93lzc"; depends=[classInt raster Rcpp rgeos rosm sf sp]; }; + carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; 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.2.1"; sha256="1pgpcsw272spf0bvrq1nmyxh8ih0hccj82k91z09nzd1i74yz46g"; depends=[naturalsort Rcpp]; }; + castor = derive2 { name="castor"; version="1.3.2"; sha256="0pz02wbm9w3mkp2gmnl92zgv1b63dvcp6j374hqjgxxpc79aw30m"; 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.13"; sha256="1xzxgf9d33h46qxz6a8d71mi673yzdnvxcxj073z7y19hjss3pkw"; depends=[]; }; catSurv = derive2 { name="catSurv"; version="1.0.3"; sha256="1qjmjdmc81inim5kpwh4k2r3cffmkyp2wpcqqzv731hciqrad8a8"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; }; + catcont = derive2 { name="catcont"; version="0.3.0"; sha256="1gz7bh3xi7x7clbwa7qvy64nqx5g6dfkyxysick2razr47dac0y1"; depends=[]; }; 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]; }; + catlearn = derive2 { name="catlearn"; version="0.5"; sha256="12sl1jlnn8669via3fbslbqs3f34andwsizkllpiw0b6k9z2yid6"; depends=[doParallel foreach 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=[]; }; + catnet = derive2 { name="catnet"; version="1.15.3"; sha256="1dgqrn1lz57pwb5pca0mlvcmw9piy9xgf6fs0y2lsy4qxa9k0plk"; depends=[]; }; catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; + cattonum = derive2 { name="cattonum"; version="0.0.1"; sha256="04vayxycv9w5ssw69gifb1y15jkz294wia5s386wyz3bz0sf3fn6"; depends=[rlang tidyselect]; }; causalMGM = derive2 { name="causalMGM"; version="0.1.1"; sha256="13qx71rfc6m7mvlpwma7ks09f3mlxknxw3jlv3b4iq5pjs8f1v5r"; depends=[rJava]; }; causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; }; - causaleffect = derive2 { name="causaleffect"; version="1.3.5"; sha256="12acm5k1nx6axhxfsiqwyaplfl5z8zzjr3kwk1hdzdrmxni6vhxs"; depends=[ggm igraph XML]; }; + causaleffect = derive2 { name="causaleffect"; version="1.3.7"; sha256="0j7k1g2s6akwbqrijbfkxsad94knjj5mz5lkwwwfr1bpxs719916"; depends=[ggm igraph XML]; }; causalsens = derive2 { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; }; + causalweight = derive2 { name="causalweight"; version="0.1.0"; sha256="1hig92w18vsyfpv1kvgymk37ik7rw7ql80p886b3s6vwdz8z0r3j"; depends=[mvtnorm np]; }; cba = derive2 { name="cba"; version="0.2-19"; sha256="0nyssc7j5rkv1gcgx4cg31hwc37wd5k3yn9s2k22ffxlnrknss2l"; depends=[proxy]; }; cbanalysis = derive2 { name="cbanalysis"; version="0.2.0"; sha256="0h0h8krlb6rckjpcw0jbbr8pcy3jm0cszimbm56l0ca668kiix06"; depends=[]; }; - cbar = derive2 { name="cbar"; version="0.1.2"; sha256="1y7p0ygxy5c53ms5ylrvw4zlj66z8sj4py21q018g2i6cmwb5vc5"; depends=[Boom bsts dplyr ggplot2 magrittr]; }; + cbar = derive2 { name="cbar"; version="0.1.3"; sha256="1jy52qnpjvszdd8xviv3vr00ds6bah73q0mhd4kixf68jafnxd35"; 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]; }; + cbsodataR = derive2 { name="cbsodataR"; version="0.2.5"; sha256="1dc4hbida1fbxin22paa31c0f4xj1pqzcc4649p7lbygqvf1fhqh"; depends=[httr jsonlite whisker yaml]; }; ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; ccRemover = derive2 { name="ccRemover"; version="1.0.4"; sha256="1npd0vx2hyg7qbwd650987i49v5cxr6i1hlj5rw6fxc0b808s596"; depends=[]; }; ccaPP = derive2 { name="ccaPP"; version="0.3.2"; sha256="166spwqsqbp42mr1acglydlxspcpn8vhnim8r3s9m81sa9pmazpj"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; }; @@ -4559,104 +4844,113 @@ in with self; { 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.4"; sha256="192pfsk6yw26b6f23qgkxslsfwpav8zv6js46i61vj2wa10f4mf2"; depends=[Rcpp sparsebnUtils]; }; + ccfa = derive2 { name="ccfa"; version="1.0.0"; sha256="0hhrcckiig1qfj7qb04jdmm7bwk9a17y6fn7ldxbmmw8546ad7md"; depends=[BMisc formula_tools ggplot2 pbapply quantreg TempleMetrics tidyr]; }; ccgarch = derive2 { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; }; cchs = derive2 { name="cchs"; version="0.4.0"; sha256="1dahiyn3rj65w56hmhqdxvxh7vkjy5rxlkp1l59aq5iba21ldsyj"; depends=[survival]; }; cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; }; ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; }; - 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.5"; sha256="1pqy186x7s3kdiz07b963n57jh83acs9ri0k1h44gfjrywj8jdyx"; depends=[dplyr tibble tidyr wrapr]; }; + cctools = derive2 { name="cctools"; version="0.1.1"; sha256="1baqijxg75wr90y38d5g1gg8jmpz8ji7zv51wp9n1knif27rg348"; depends=[qrng Rcpp RcppArmadillo]; }; + cdata = derive2 { name="cdata"; version="0.5.2"; sha256="0l0vqmvizvb7h31796yjbyd0wspxvl3zx64xarkqpq8vwqwkfv51"; depends=[DBI RSQLite 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]; }; + cdcfluview = derive2 { name="cdcfluview"; version="0.7.0"; sha256="00yc3q28y20l2ppqxy6h53p9fvwhvpkc8m7csmp2lizqh787i2cc"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; }; cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; }; - cdfquantreg = derive2 { name="cdfquantreg"; version="1.1.3"; sha256="08l9kg4rclgh29r8cyk3d0619k4mkw2vj1phiyww4qr1dn5ssnda"; depends=[Formula MASS pracma]; }; + cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.0"; sha256="1z9a2rivi1i56369hkz94azfhyqch8wph819lgrxlrr4mcpl6k2p"; depends=[Formula MASS pracma]; }; cdlTools = derive2 { name="cdlTools"; version="0.11"; sha256="0jqr0j6hwqwx574659i3mfzf4hcmmxfd3x28d52dwgpwsv0r10gn"; depends=[raster RCurl rgdal XML]; }; cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; }; cdparcoord = derive2 { name="cdparcoord"; version="1.0.0"; sha256="0a08rpc7chqbix10jimjh46dy6val97mrzqk972pq446b6ci95sn"; depends=[data_table freqparcoord magrittr partools plotly]; }; cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; }; cec2005benchmark = derive2 { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; }; cec2013 = derive2 { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; }; + ceg = derive2 { name="ceg"; version="0.1.0"; sha256="01la7kv0a3inc9vy5x010ysicfiv404bqfgs8csvqixviap9rd74"; depends=[graph Rgraphviz]; }; celestial = derive2 { name="celestial"; version="1.4.1"; sha256="0cvfka5lj0sj9cd7xs68szhckzfm6cgxwxim1nd530s6gxh0l7kz"; depends=[NISTunits pracma RANN]; }; cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; }; - cellWise = derive2 { name="cellWise"; version="1.0.0"; sha256="1cpkz256z6ngqdd1wa0ajyjcl0j1xln2f0hwsw24wfzgb8sdj6ac"; depends=[ggplot2 gridExtra matrixStats reshape2 scales]; }; + cellWise = derive2 { name="cellWise"; version="2.0.8"; sha256="1xahayqlpylysdiqggzqh7z75r3ldi79bx124ky84r1vab659lm7"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 scales]; }; 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]; }; cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; }; censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; }; censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; censReg = derive2 { name="censReg"; version="0.5-26"; sha256="1g69261ajha9p762xg2a5pj127b9pfws6ylpiqhjv7h96n12f2pi"; depends=[glmmML maxLik miscTools plm sandwich]; }; censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; }; + census = derive2 { name="census"; version="0.2.0"; sha256="02qlmifppnfxw7bzh0zngih8z8qz0sxpsi38h7bv324vxx94gvz2"; depends=[ggmap RCurl]; }; censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; }; censusapi = derive2 { name="censusapi"; version="0.2.1"; sha256="1ax1lwnw9978iss8j1hpmbnp8pbsz8rppz37cyfn0m7xnpg9mq8b"; depends=[httr jsonlite]; }; - censusr = derive2 { name="censusr"; version="0.0.3"; sha256="0lcji62kzdxaslvvp54bwfdmbx69lds7inmvywlj0plfqg1kvsid"; depends=[dplyr httr stringr]; }; + censusr = derive2 { name="censusr"; version="0.0.4"; sha256="1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc"; depends=[dplyr httr stringr]; }; censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; }; centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; }; cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; }; cepR = derive2 { name="cepR"; version="0.1.0"; sha256="1yqny6vgsjbrfxlk965pyk38n87ylf4513kbaljmgggrlyaz0qap"; depends=[dplyr httr magrittr purrr tibble]; }; cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; }; + cepreader = derive2 { name="cepreader"; version="1.1-2"; sha256="0pyycacsnbqz7hyrvrwwmmphrhny0byyxv66fwrvcsk3s88a7crf"; depends=[]; }; cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; }; cetcolor = derive2 { name="cetcolor"; version="0.1.0"; sha256="013ghlfs27a585851cir5fxgxhi41h48irq90932y55npa8gwdak"; depends=[]; }; cfa = derive2 { name="cfa"; version="0.10-0"; sha256="12z58y4ls9m58wpj1xa4ir2p2apzxaskps05sxy2946m24i71zfk"; depends=[]; }; cffdrs = derive2 { name="cffdrs"; version="1.7.6"; sha256="00n3h2vf855anxh0xgsps7sv0kj819864wjdmkiak1lsacysav8s"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; }; cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; }; cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; }; - cgam = derive2 { name="cgam"; version="1.7"; sha256="0i0vi2xca0y95bcskzf2apfpphavsz3h9gygzx0l28gfjp91b6jv"; depends=[coneproj Matrix svDialogs]; }; - cgdsr = derive2 { name="cgdsr"; version="1.2.6"; sha256="05q26g7gflq4hsd3xa5xkjc3mhvml7i6dzamfwm0i14kxigghqp8"; depends=[R_methodsS3 R_oo]; }; + cgam = derive2 { name="cgam"; version="1.9"; sha256="0hc8q6mdd8fy2229biknissmg95b88kryr4c33yv5j77z6gw3s4y"; depends=[coneproj Matrix svDialogs]; }; + cgdsr = derive2 { name="cgdsr"; version="1.2.10"; sha256="1xyhw7mhmjichr1l6f9y1qvfj9wm87kfbm87ji7lcwf36gxh5g23"; 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=[]; }; + cgmanalysis = derive2 { name="cgmanalysis"; version="1.3"; sha256="0fb93czybl9rpndvz3lykfiwksa154vdrmils8c8l688c62gyq55"; depends=[gdata pracma zoo]; }; + chandwich = derive2 { name="chandwich"; version="1.0.0"; sha256="05x9mg33yl4d9kh5sc4lqi00hwnxdhfg2m0dkm5q0jynkhap7bmz"; depends=[numDeriv]; }; 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]; }; + changepointsHD = derive2 { name="changepointsHD"; version="0.3.0"; sha256="05zmypz2jz55m9avzg63dmp7fpcgi7jpc9vf2fv0kywcvf2wz5ym"; depends=[Rcpp RcppArmadillo]; }; + changepointsVar = derive2 { name="changepointsVar"; version="0.1.0"; sha256="0kj9m9jik1dm5fx4c4hb559f5irpl1mvxk4wwajd5577a2fdqxb5"; depends=[lars MASS]; }; 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.4"; sha256="1xpq73myr39i33mwihvy494sam77hb3z15yr172a31d8wn1qi53g"; depends=[backports]; }; - checkpoint = derive2 { name="checkpoint"; version="0.4.1"; sha256="0hp37scj0iaivwk5w2vprq2yzqfpg6zi19nzaxzaz8w2sk8dql7v"; depends=[]; }; + checkmate = derive2 { name="checkmate"; version="1.8.5"; sha256="1q6igk50lq4fp5d3imgcn1j063h3gsp214ra4nlf534hf4wjlkg9"; depends=[backports]; }; + checkpoint = derive2 { name="checkpoint"; version="0.4.3"; sha256="0r7v7ijyq92yd95ssxxbdlp5dv1sd09yvxr8c0yihf48kzw65s63"; depends=[]; }; + checkr = derive2 { name="checkr"; version="0.1.0"; sha256="01071y7jgvang5yi00304wr4p4040b8fc4ncfj6qfmk0bc97h51b"; depends=[]; }; cheddar = derive2 { name="cheddar"; version="0.1-631"; sha256="0s6v3xcpv8ppgx6q6h2hgrjcf3f3i87kmylnr9q9zhry7729aiyn"; depends=[]; }; chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; depends=[]; }; chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; }; chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; }; - cherry = derive2 { name="cherry"; version="0.6-11"; sha256="0ixrzbzg559h0qb33b9158rk6w6as2b34b7iq5vzm429cpyzl7l8"; depends=[bitops lpSolve Matrix slam]; }; + cherry = derive2 { name="cherry"; version="0.6-12"; sha256="1b74wlvjqxa532gxs400m1k4qs7xwpdap9ms60nlcwr7x1857mk6"; depends=[bitops lpSolve Matrix]; }; chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; }; chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; }; - childsds = derive2 { name="childsds"; version="0.6.6"; sha256="0k2xiq4jgs206fxpj6hvfyc79cnsl3qfghjqhkra72hpj74ii4y9"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr reshape2 tibble 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.7"; sha256="1asv4538p42r8mhvkcp0f2h75nq3bwm0v5arwc7masdmpp4fqayn"; depends=[jiebaR Matrix NLP Ruchardet slam stringi tm]; }; + childhoodmortality = derive2 { name="childhoodmortality"; version="0.2.0"; sha256="1kdxb02xryc46p7q39gpvn1gwkkrr0rr398i9zxizpxaxvn0r6ql"; depends=[matrixStats plyr]; }; + childsds = derive2 { name="childsds"; version="0.6.7"; sha256="1m5w0wbdk032b6d6h1704wji84yckyl427bja0mb4vqp28m99z48"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr reshape2 tibble tidyr]; }; + chillR = derive2 { name="chillR"; version="0.70.2"; sha256="01hn2b88ra7kadjylj2y840lpkapm93kdracnamy15c6f5f27kmb"; depends=[fields httr Kendall pls raster RCurl readxl RMAWGEN sp XML]; }; + chinese_misc = derive2 { name="chinese.misc"; version="0.1.8"; sha256="0c2qhdia7wpkv4x2qnq2lyvgnr0n37brd7m579hcl6zq7dw4y2m7"; 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="2017.08-28"; sha256="0dpfkpp79wrxlfa1x6jhz3lfrbdm1m4h04fiwn8fys75yn1inkcy"; depends=[boot kyotil MASS survival]; }; + chngpt = derive2 { name="chngpt"; version="2018.1-3"; sha256="0x4jifap8y4gs7mdzawxyvfdfjg245zak2zljdl6351ppslzaj6z"; depends=[boot kyotil MASS survival]; }; choiceDes = derive2 { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; }; - cholera = derive2 { name="cholera"; version="0.2.1"; sha256="0w213qlnkwbs7y1z5kmxicrbimkqlws46w12vadghf96rn1pb4fv"; depends=[deldir HistData igraph pracma RColorBrewer scales sp]; }; + cholera = derive2 { name="cholera"; version="0.3.0"; sha256="08ijini3d4ir26di655315lvs9vjscixpawv8r7499idcb1jz87i"; depends=[alphahull deldir HistData igraph KernSmooth pracma RColorBrewer scales sp]; }; choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; - chopthin = derive2 { name="chopthin"; version="0.2.1"; sha256="0sib3ic79hff5w2xmmw4z9c6bax33jczrcijs7ywdb8y3viwy5av"; depends=[Rcpp]; }; + chopthin = derive2 { name="chopthin"; version="0.2.2"; sha256="1ixmgq6igd2ji88qba7scny1j8rrizcf76dk4ymk3hah5dln97fz"; depends=[Rcpp]; }; chords = derive2 { name="chords"; version="0.95.4"; sha256="1v6zvl1mv9fyf6hx1fpbj3i7s893n4y1w4j9rw1arps006qz2jqn"; depends=[MASS Matrix]; }; 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=[]; }; + chron = derive2 { name="chron"; version="2.3-52"; sha256="185lfp75cv3l4cavg64sccj8lgc5sivch13n6gkannv3pd5cyzy4"; depends=[]; }; + chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; }; chunked = derive2 { name="chunked"; version="0.4"; sha256="0pqk6nnxxnlsw9zal62ajjalrlmvkdrzyz2l8r10jd7s61vhra40"; depends=[DBI dplyr LaF lazyeval]; }; - ciTools = derive2 { name="ciTools"; version="0.1.0"; sha256="1v871qnfr4f4lab0yq6jg0wqz72wjg3jjnv6wnyyd5zai7pc2vw5"; depends=[arm dplyr lme4 magrittr merTools tibble]; }; - cifti = derive2 { name="cifti"; version="0.4.2"; sha256="1l7dfq53plisyf244l1ch0il0ziy1qcxv0zj3gr4fxdp6k8d1br1"; depends=[base64enc gifti oro_nifti rgl xml2]; }; + ciTools = derive2 { name="ciTools"; version="0.3.0"; sha256="0mqrnln7iz6jm30nh1qb2457icaz3hcqmgqbj8m61z0sf6jj9pd7"; depends=[arm boot dplyr lme4 magrittr MASS tibble]; }; + cifti = derive2 { name="cifti"; version="0.4.5"; sha256="092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9"; depends=[gifti oro_nifti R_utils xml2]; }; cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; }; - circlize = derive2 { name="circlize"; version="0.4.1"; sha256="1w7i3jgxgq510axglzmw54ma9kq7k4c86i9ccndz10mrwc51fji0"; depends=[colorspace GlobalOptions shape]; }; + circglmbayes = derive2 { name="circglmbayes"; version="1.2.3"; sha256="1a60d8jpvwx2qwmy2if60c5vni9hp73fdwgz7mwi5xd5l67zwd3h"; depends=[BH coda ggplot2 Rcpp RcppArmadillo reshape2 shiny]; }; + circlize = derive2 { name="circlize"; version="0.4.3"; sha256="0pg947gkryygikfbv6admx8gsg02b6g219j6a1sdnqij2908yxna"; 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=[]; }; + cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; 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]; }; - civis = derive2 { name="civis"; version="1.0.2"; sha256="1y4f7sqr2wxibr9kfvpq1b743c9b1zi5w8ir67l9r2dx65fchypq"; depends=[DBI dbplyr devtools dplyr ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; }; - cjoint = derive2 { name="cjoint"; version="2.0.5"; sha256="0q2mp790maphiz77lw1lashgfcl2a174mmxw65hfvvv7m49plcy3"; depends=[ggplot2 lmtest Matrix sandwich survey]; }; + civis = derive2 { name="civis"; version="1.2.0"; sha256="10idsjq5grg9mw18f8v2wqz1rg95s12dsfglkrg7jar1782yq822"; depends=[DBI dbplyr devtools dplyr future ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; }; + cjoint = derive2 { name="cjoint"; version="2.0.6"; sha256="1bhzw751ll43qbyif589yxmi3m1pbm206lqnsc5zcxsnxjf4li5n"; depends=[ggplot2 lmtest Matrix 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]; }; + clam = derive2 { name="clam"; version="2.3.1"; sha256="1n30fvx4macyawhzv17bzvc1s4qdn51p9mx28apfjbf80qck24g9"; depends=[]; }; 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]; }; @@ -4669,44 +4963,47 @@ in with self; { classyfire = derive2 { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[boot e1071 ggplot2 neldermead optimbase snowfall]; }; cld2 = derive2 { name="cld2"; version="1.1"; sha256="0zlvnnyz5aqjwzxwghfs9pyxcgr86yg3wpmrdg85dnlggjh2j12z"; depends=[Rcpp]; }; cld3 = derive2 { name="cld3"; version="1.0"; sha256="0qka14z9w01b7xy6k97qcgd9qi6myfaw61imnf09mc8nqm0z3kya"; depends=[Rcpp]; }; - cleanEHR = derive2 { name="cleanEHR"; version="0.1"; sha256="1ppjg72cfh9kdwl8kk7zxyr529xqcwpfcl5lisy7hgpqirma52qn"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; }; - cleanNLP = derive2 { name="cleanNLP"; version="1.10.0"; sha256="127h5aycgwzm8cdgy1ybabviisj4lbb029c8p1czzfwcdvxzpf8s"; depends=[dplyr Matrix readr stringi]; }; + cleanEHR = derive2 { name="cleanEHR"; version="1.0"; sha256="0i8q7y4izc7q1pshdajy0n9wyihj4wlzzkd52ykam3dxqnwlnyh4"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; }; + cleanNLP = derive2 { name="cleanNLP"; version="2.0.3"; sha256="0hmivb2yhj47alxc9z1hlk23hfan9vz938m6xyp639xf58l97scz"; depends=[dplyr Matrix stringi]; }; cleangeo = derive2 { name="cleangeo"; version="0.2-2"; sha256="1bhpn53v36652mwg2ba2a6cs34slb7i0df2ibssyr2lnx5gciq4i"; 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]; }; + clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; }; clhs = derive2 { name="clhs"; version="0.5-7"; sha256="0n7zy8wf78lka1l0zm42zxwi24bvavfy3irfqcnz5nslqkg61il2"; depends=[ggplot2 plyr raster reshape2 scales sp]; }; - clickR = derive2 { name="clickR"; version="0.3.29"; sha256="15z6gv3gfimhzhn0zm1n8s931mnx05f5hd04wh32xc9n432pb0ik"; depends=[beeswarm boot lme4 lmerTest ReporteRs xtable]; }; - 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]; }; + cli = derive2 { name="cli"; version="1.0.0"; sha256="07as3dr7vwx02p3qgzlmxz1dlrd3x3lysrzp222ip9jcjpydp8wg"; depends=[assertthat crayon]; }; + clickR = derive2 { name="clickR"; version="0.3.38"; sha256="1qlc4lz2y2ls5qx1rqiswl5qr5qqkn6l30cp5ikhzr3ffvwp3nym"; depends=[beeswarm boot brms lme4 lmerTest ReporteRs xtable]; }; + clickstream = derive2 { name="clickstream"; version="1.3.0"; sha256="01bii527xy7hdph1pm6f1g4qnwa5yf3mwz01rjg1h2gc12s5vzgg"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; }; + clifro = derive2 { name="clifro"; version="3.1-5"; sha256="1fbl5zljy60xp3klrsgs84rqw9484xmyq84n3wkrqc6pyvhskp4c"; 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.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]; }; + climextRemes = derive2 { name="climextRemes"; version="0.2.0"; sha256="0cjvmd48iaid0f95354zpxlgwy79jga9lz0p82yiv0fb2mvjpbqn"; depends=[boot extRemes]; }; + climwin = derive2 { name="climwin"; version="1.2.0"; sha256="0xqgf9hmpidxq85rfm0vndh3waw0qf2yhrzmp04sqbbqhzkf9v7n"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv plyr RcppRoll reshape]; }; + clinDR = derive2 { name="clinDR"; version="1.7"; sha256="0xnrnmwg4y2vlxsmhj5pzpyiqk90xjxl91i9nn3lv90xszmdh0x2"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; }; 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.14"; sha256="13ip144qzgx9bg9pvdgz7y4v21sjvyjjixbm8mnvn6a6k62ycgmf"; depends=[mvtnorm]; }; clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; }; - clipr = derive2 { name="clipr"; version="0.3.3"; sha256="1dr1cranf9cp7ccj2lnld4x9g3xfdiric6kfayc36zy5jc4ia441"; depends=[]; }; + clipr = derive2 { name="clipr"; version="0.4.0"; sha256="1bz841r3kmv16r6zxmlkvasp4nyldam00n6gh7zf8lyy9ymz38j4"; 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]; }; + clordr = derive2 { name="clordr"; version="1.2.0"; sha256="0i04wx3gablbhc8g6591pgb13hhj4gr9jbswv477x3s3rw30mv6s"; depends=[doParallel foreach MASS pbivnorm rootSolve ttutils]; }; cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; }; clpAPI = derive2 { name="clpAPI"; version="1.2.7"; sha256="19bn5d7qjj7g0x17jnh2snymcn2r2skzj35hkhsgcj5r43834f3r"; depends=[]; }; clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; - clubSandwich = derive2 { name="clubSandwich"; version="0.2.3"; sha256="110zl62xa7dih1lszf9w91fnci9550mdv71z8dis2pklf645qvf5"; depends=[sandwich]; }; + clubSandwich = derive2 { name="clubSandwich"; version="0.3.0"; sha256="1az4q95swknjjbaisg0whcqyyrfxs8vhax3af9bnm6n2l2czihvk"; depends=[sandwich]; }; clue = derive2 { name="clue"; version="0.3-54"; sha256="1fnl1wi0g8f243ra5krlpyz69pg8s8m2wwxa53hb086k7hqv74af"; depends=[cluster]; }; 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=[]; }; - clustEff = derive2 { name="clustEff"; version="0.1.1"; sha256="149x9m9x1yxh48ky54gyzps4pdh4jq36bz59ri3xd6v19i8r1ws3"; depends=[cluster fda qrcm]; }; + clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.1.2"; sha256="11lqd3vmx4kg08n6iv9na8rra49dkldx4f8jyf43hppbjrbvfinm"; depends=[]; }; + clustEff = derive2 { name="clustEff"; version="0.1.2"; sha256="1hy7jc8yfg554l439lfrppdsizrdmvxrqf9dwbkjckbvggg54f0k"; depends=[cluster fda qrcm]; }; 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-28"; sha256="0g7cw89pk5vmws4mwsd73z288g9dxvl1q81kp00x5h2vk2nzdzcn"; depends=[RColorBrewer]; }; - clustRcompaR = derive2 { name="clustRcompaR"; version="0.1.0"; sha256="1md1ra18q1iga01q12jyy9va4qyvzlybvbdrdfy2kxhh82w057ww"; depends=[dplyr ggplot2 ppls quanteda tidyr]; }; + clustMixType = derive2 { name="clustMixType"; version="0.1-29"; sha256="01rc84ppy5mw3cdcx15xs6061lg1mwh6kxa80rnj3ax3g10x37sh"; depends=[RColorBrewer]; }; + clustRcompaR = derive2 { name="clustRcompaR"; version="0.2.0"; sha256="151xq8qf1mrl35kyhdliwl2jpdkpkbl3gdnrvrybanihry2p0kqg"; depends=[dplyr ggplot2 ppls quanteda]; }; 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=[]; }; @@ -4714,12 +5011,13 @@ in with self; { clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; }; clusterPower = derive2 { name="clusterPower"; version="0.6.111"; sha256="1mwq188x9d495my75cdcahfjm3w46cas9jqxks5c0j63395cw9g3"; depends=[lme4]; }; clusterRepro = derive2 { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; }; - clusterSEs = derive2 { name="clusterSEs"; version="2.4"; sha256="10xlcmmsrca8zwis94cv3pafp9k5ykbq9fnmadbhk0ppibndyjak"; depends=[AER Formula lmtest mlogit plm sandwich]; }; - clusterSim = derive2 { name="clusterSim"; version="0.46-2"; sha256="1l8hcqkz2p8gbnfz8fdb64fk0mbfxx8b725f3pz77c7bjrx4s4l1"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; }; + clusterSEs = derive2 { name="clusterSEs"; version="2.4.1"; sha256="04f30zsk96yv7c77darfqkkqw4ij4cq8r438lzlb1l063kpaclh4"; depends=[AER Formula lmtest mlogit plm sandwich]; }; + clusterSim = derive2 { name="clusterSim"; version="0.47-1"; sha256="0k9cn0ycz7l9g4lb434cqp9yx2ilmp25xa5hlhma9jmxlbdsbji2"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; }; + clusteredinterference = derive2 { name="clusteredinterference"; version="1.0.0"; sha256="1dnbymivxkrhx39maannhvm8ynlgjxsiavd2d9ych5nq4mjvhnjg"; depends=[cubature Formula lme4 numDeriv rootSolve]; }; 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=[]; }; - clustermq = derive2 { name="clustermq"; version="0.7.0"; sha256="16z90z8i7vbcqw09ka8ivs9b6qg8g91ybaqvzl3yfbqfyvn080gg"; depends=[infuser narray pryr purrr R6 rzmq tibble]; }; + clustermq = derive2 { name="clustermq"; version="0.8.3"; sha256="1w5gklz7dw26861dqnvvm9hismn6p4wjw4hi0kf37p5hjq7cvfjh"; depends=[infuser narray purrr R6 rzmq]; }; 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]; }; @@ -4729,57 +5027,62 @@ in with self; { 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=[]; }; + cmm = derive2 { name="cmm"; version="0.12"; sha256="0q6hs56hhi9vaanx7i7gg7ncv0h29lndla66g9chzmh3lchq3r20"; 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.8.1"; sha256="0fcm3nqlydlsn1hsm1lrxq7jmmwf8kjqcxfhflsgmd4l0s06pr15"; depends=[fields ncdf4 raster sp]; }; + cmsaf = derive2 { name="cmsaf"; version="1.9.0"; sha256="1r0cny0i3wi3xfi38l5ls6zycnp0q1a0s00qrdgi1956yrmnm5x1"; depends=[fields ncdf4 raster sp]; }; cmvnorm = derive2 { name="cmvnorm"; version="1.0-3"; sha256="0810kzg78yaxzniq59a4swvdk9qxp37ja52f5n1zssgn0cwz1vk9"; depends=[elliptic emulator]; }; cna = derive2 { name="cna"; version="2.0.0"; sha256="0cfr4g63wwqkkz2xxz76m82p0am2kyazal6sqp7gnrc48x9lv8im"; depends=[Rcpp]; }; cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; }; 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]; }; + cnmlcd = derive2 { name="cnmlcd"; version="1.2-0"; sha256="1vpn926wf8vkifscnb35y4c74721iar2wykrl50fcv0fg16yggnd"; 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]; }; + coala = derive2 { name="coala"; version="0.5.2"; sha256="1rj9my20ba79alkhszh5lfvb9gjr6vcgiwqk2szawkpd1np3lpsr"; 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="2.2.0"; sha256="1rq4mdyq10slmpqxy0h9dpdn0xa9sqppz902rad7h6mrh56bd989"; depends=[ggplot2 ggstance]; }; + cobalt = derive2 { name="cobalt"; version="3.2.1"; sha256="1ip8d2inr3369iq4bpx52fbvfwy31c0mzg1rpydj8x4m3jfh83fz"; 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.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]; }; - coda_base = derive2 { name="coda.base"; version="0.1.7"; sha256="1rjw5d76vxl0fx0675q994l8wwbfv8az5kzqj4g9xmgbj8iwdhan"; depends=[MASS Rcpp RcppArmadillo]; }; + coda_base = derive2 { name="coda.base"; version="0.1.8"; sha256="05bbmfswajmjc8l3g2clwj3hyj06y9v7camq910b881frl2xj584"; depends=[MASS Rcpp RcppArmadillo]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; - codep = derive2 { name="codep"; version="0.6-5"; sha256="18da81wja7z9gnn11xiwi7cg43mrj4w2kjkk8s780krbycnfsn5p"; depends=[]; }; + codemetar = derive2 { name="codemetar"; version="0.1.4"; sha256="0klwwf4ws2l15iq33d3jk7whp4inql6if7yai5z7493zs9c30z3x"; depends=[devtools git2r jsonld jsonlite readr stringi]; }; + codep = derive2 { name="codep"; version="0.7-1"; sha256="1icj9mijp3x93rn7xbi0aivj7r4rlgiclsa920b1x9ws8b3jrv06"; depends=[]; }; codetools = derive2 { name="codetools"; version="0.2-15"; sha256="0h7sjmvvsi35041jp47cxhsqzgf1y8jrw6fxii7n26i8g7nrh1sf"; depends=[]; }; - codingMatrices = derive2 { name="codingMatrices"; version="0.3.1"; sha256="09jr163n886qnw2hy8fvdvaw2w8n1752z7yrwy2bqrpfj3cw93yh"; depends=[fractional Matrix]; }; + codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; 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]; }; + coefplot = derive2 { name="coefplot"; version="1.2.6"; sha256="036njf2xwmjvyamanb7nfn2n09ps2rdgk3zrxn6khwp8ly245nps"; depends=[dplyr dygraphs ggplot2 magrittr plyr purrr reshape2 tibble useful]; }; coenocliner = derive2 { name="coenocliner"; version="0.2-2"; sha256="0r4h0r3av2d1cxmjpwaabjn807626pzqnra2x542wdnnf7h8nmdf"; depends=[]; }; 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]; }; - coga = derive2 { name="coga"; version="0.2.1"; sha256="0cb9hvrlhm8c9fjmg4s577r46lp6xj9g0amwd5n9j2vs4m2h8dnf"; depends=[Rcpp RcppGSL]; }; - coin = derive2 { name="coin"; version="1.2-1"; sha256="1lnxzafsnk2w856hcbx3664drlmyk125v4h3q3gxlv00k8a068b1"; depends=[modeltools multcomp mvtnorm survival]; }; + cofeatureR = derive2 { name="cofeatureR"; version="1.1.0"; sha256="1yz73541zsasw4k08b94vkhhs9ilchgpi5mrn4a0cqhb52il73sz"; depends=[dplyr ggplot2 lazyeval]; }; + coga = derive2 { name="coga"; version="0.2.2"; sha256="0zbcx5g48168clvy8n4pp7pmvx0xlqfwr10fp34wf1k0j08smzx3"; depends=[Rcpp RcppGSL]; }; + coin = derive2 { name="coin"; version="1.2-2"; sha256="1fq58793bymzig1syjg2lvn6hsxfwkhh00jfrchh3c0y7rfhc66m"; depends=[modeltools multcomp mvtnorm survival]; }; + coindeskr = derive2 { name="coindeskr"; version="0.1.0"; sha256="0iwkg9qx5gymzjxw3w1zlwq9336kbqp4z8a9wf9a1p2gp9727qcm"; depends=[httr jsonlite]; }; coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.1"; sha256="006ndsj37rx7fg3laama9y3xc6ivhp6b67w4wf3g161ypphlhkxv"; depends=[ggplot2 jsonlite RCurl]; }; 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]; }; - colf = derive2 { name="colf"; version="0.1.2"; sha256="1xbmc32rp0xlj73krwhqn2ji5xa9kd2anaw88mvi5psdi3d2y1np"; depends=[nlmrt]; }; + colf = derive2 { name="colf"; version="0.1.3"; sha256="1av82yrp6csw7700ymipd02j73cmzn0apv7ykachjw09nzk86kvj"; depends=[nlsr]; }; collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; }; collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.6"; sha256="1l02rk1lmm2ac9rr5p1633y1chc203cr9mhlc9s95bv12791i5zb"; depends=[data_tree htmlwidgets]; }; + collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; }; 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]; }; + colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; }; + coloc = derive2 { name="coloc"; version="3.1"; sha256="1321675wz1vn7rcd2sm4c9h183nwnmp0lqww5nykjf792ijyaal8"; depends=[BMA flashClust ggplot2 reshape snpStats speedglm]; }; colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; - colorSpec = derive2 { name="colorSpec"; version="0.5-3"; sha256="0ffn1x9763xzhfsm5vgkvgpm2a792bqx54ra2x4vda7m78lb6nqr"; depends=[MASS]; }; + colorSpec = derive2 { name="colorSpec"; version="0.6-2"; sha256="153jps1l0wv0b726b0l7bhsg7g45jdfsralg6k8nvyij4yw1dqi1"; 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]; }; + colorednoise = derive2 { name="colorednoise"; version="0.0.2"; sha256="0y2a86fwndcgkaxr4jmls7a9d1ipij4zi3r4nchwda0bynlw6mq4"; depends=[dplyr purrr Rcpp]; }; colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; - colorhcplot = derive2 { name="colorhcplot"; version="1.0"; sha256="1hxh09sg9mdbfz4vx2z9wyx9xs5a82l8sw1wbwaa717a6q3ayjyj"; depends=[]; }; + colorhcplot = derive2 { name="colorhcplot"; version="1.3.1"; sha256="009pyyb30kwshldd7v7zfy5rxys6i0dhlc5w8ail61acbg4rlrmz"; 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]; }; @@ -4788,26 +5091,29 @@ in with self; { colorspace = derive2 { name="colorspace"; version="1.3-2"; sha256="0d1ya7hx4y58n5ivwmdmq2zgh0g2sbv7ykh13n85c1355csd57yx"; depends=[]; }; 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="1.1"; sha256="1lygk7ak8hdpscdh80bf3p3z58a37nlrmx02wqfnyd0v6qns8azv"; depends=[rgl]; }; + colourpicker = derive2 { name="colourpicker"; version="1.0"; sha256="0z3v2083g7kwdp21x9s2n1crfh24agpdq3yxkcdzc2awn2pwpnpi"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; }; + colourvision = derive2 { name="colourvision"; version="2.0"; sha256="0gxhdyajrmnks1ivbnhxl37ivq4h3figp5kgk6g2wdn80i2b8k1a"; depends=[Matrix 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]; }; + colt = derive2 { name="colt"; version="0.1.1"; sha256="028jqvgr14ig8jxp8h2lrf7mainzppgqh6v1479qfv4l9is3bnwy"; depends=[crayon]; }; + comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; }; combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; }; - combiter = derive2 { name="combiter"; version="1.0.2"; sha256="159q7zh6bafh10mjjvl641gbxqhv5car62k8hjg9v7wflaqw7rab"; depends=[iterators itertools Rcpp]; }; + combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; 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]; }; + cometExactTest = derive2 { name="cometExactTest"; version="0.1.5"; sha256="0ar9axm9cd1wd937xcmsmd7xqilnfyab8gsrpkiqpc3fjh86qyrp"; depends=[dplyr]; }; 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.4"; sha256="1vb8r9khpvcf0q7acv8rsplfjjwcll302bg5kp596cvn6aacypl6"; depends=[]; }; - commonsMath = derive2 { name="commonsMath"; version="1.0.0"; sha256="0yx5yglsdplm3vz268016b1mbwk92hyqwnjircifm81ihivqb3r1"; depends=[]; }; + commonsMath = derive2 { name="commonsMath"; version="1.1"; sha256="0v9jlk75ihh8yjhq5ybighvndp0hn1d6rqh78jkh4g6ylhbpvcw0"; depends=[]; }; + comorbidity = derive2 { name="comorbidity"; version="0.1.0"; sha256="0j2znk4w4vr1swnqp2pldhzrg28sb13ykzan15l1c1p3yg8pp35w"; depends=[checkmate]; }; 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.2.0"; sha256="09y8bh9d9m2pf9j7qqyk1s07pp7rgbhzbkswl12vnx2cm24lp525"; depends=[dplyr htmlTable tidyr]; }; - compareGroups = derive2 { name="compareGroups"; version="3.3.1"; sha256="1sb7acmsdw6zzczksiwh95q6hjf37hqi22njlfdxi233k3ad554y"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; }; + compareGroups = derive2 { name="compareGroups"; version="3.3.3"; sha256="18v5as6037ndihsslk25455y553wcbrdriav1p6zbbc52lqcf0a3"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; + comparer = derive2 { name="comparer"; version="0.1.1"; sha256="1nmvqzrvyxdsidkr243qdn0lj2s7j3jv1sh0mdlxm2v5063nyryr"; depends=[progress]; }; 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]; }; @@ -4817,9 +5123,9 @@ in with self; { complmrob = derive2 { name="complmrob"; version="0.6.1"; sha256="1dr80r1p05h3mlnjbgh6kfw86np8y2bhy9yi5qydv85w52k133n1"; depends=[boot ggplot2 robustbase scales]; }; compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; }; compositions = derive2 { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[bayesm energy robustbase tensorA]; }; - compound_Cox = derive2 { name="compound.Cox"; version="3.3"; sha256="13gqc094c3sx52qx4yvk3la6qs31rgrpm8l6asysn4jp0q6hqgqq"; depends=[numDeriv survival]; }; + compound_Cox = derive2 { name="compound.Cox"; version="3.8"; sha256="0sskkcillpdxyibph4y35nhk67zmxylbql8igy5lq2r86wfsrp5a"; depends=[numDeriv survival]; }; compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; }; - comtradr = derive2 { name="comtradr"; version="0.0.2"; sha256="1abfvs0fcfrwhvh94vkvhjjgnz9kj4aw4zi3d874vpwvng7hmx3y"; depends=[dplyr httr jsonlite]; }; + comtradr = derive2 { name="comtradr"; version="0.1.0"; sha256="0az61xsrwzr4g1s6g52vm9fivh985c6s06y3rb1c9ic0my385zhx"; depends=[httr jsonlite magrittr purrr]; }; concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; }; concaveman = derive2 { name="concaveman"; version="1.0.0"; sha256="0b6a37h4k3p879gp4qp3297q0fzq3yn79yhkwjrcxhcl86sg5nb6"; depends=[dplyr jsonlite magrittr sf V8]; }; conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; }; @@ -4830,56 +5136,60 @@ 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.6.0"; sha256="150rvgs5v20k3l4hjzvjjckzv0xs788aiigi3pjgdgx1q2kgicbk"; depends=[dplyr gplots htmlTable htmltools knitr lazyeval rmarkdown scales tibble]; }; + condformat = derive2 { name="condformat"; version="0.7.0"; sha256="04q78ghahwdy8q58fd80b45fm129zmiscwn146r741ld5gr9m82z"; depends=[dplyr gplots htmlTable htmltools knitr lazyeval magrittr rlang rmarkdown scales tibble tidyselect]; }; 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]; }; - condvis = derive2 { name="condvis"; version="0.4-1"; sha256="1fqwybfw5sv4g8kg1yk41ixm5bmzcx7dry1a7ijca5wakchghvya"; depends=[MASS]; }; + condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; }; + condvis = derive2 { name="condvis"; version="0.4-2"; sha256="0l515wpsmh7g4q4w29gb1gv5kafwzfhb8as0ml8vbbrh6xcgmz9q"; depends=[MASS]; }; coneproj = derive2 { name="coneproj"; version="1.12"; sha256="1937sf7b9s2y421gf2srjjdpv2knxrr03xyq5vg5j77z73kh9s6d"; depends=[Rcpp RcppArmadillo]; }; + conf = derive2 { name="conf"; version="1.0"; sha256="0skfmk1vz8ry52l811rxnk6a8hicajza8m5ycfg7p0xb8ssyj6gi"; depends=[]; }; conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; - confSAM = derive2 { name="confSAM"; version="0.1"; sha256="00l4hk0n63p3gdv6hpxqkkn3nw4rgw77rpwzn2k8fgq53ja44yfg"; depends=[]; }; + confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; }; confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; }; config = derive2 { name="config"; version="0.2"; sha256="1p0gaqrqhcrdkp5cr3rn4i5ny8mr96b3q1fwgs0i8lk5riljkk20"; depends=[yaml]; }; - configr = derive2 { name="configr"; version="0.3.1"; sha256="12hl7w215s41zkz3cc0k96p3r68cqhxry6dgvfbi7583c5yddlxv"; 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]; }; + configr = derive2 { name="configr"; version="0.3.2.1"; sha256="184iafdsj0k8i4n877g00fsnqmdq7k4y1azwn4d18gq2l7kg3qn1"; depends=[glue ini jsonlite RcppTOML stringr yaml]; }; + confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; }; + conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench 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.4"; sha256="1dscb0rwwvl83ag4lbn13bxnn9apv3dkr37q8qr5i4diahcva17c"; depends=[]; }; - constants = derive2 { name="constants"; version="0.0.1"; sha256="0vlfy80ww0xlkdrd493223rh4cq75pa7fmb57gkmzhclvfy9i608"; depends=[]; }; + conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; }; + constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; }; + constellation = derive2 { name="constellation"; version="0.1.0"; sha256="1q6kv8gg89xk80y24ma0zp8zy3cy4i93bjzax524cjbfnhpknx1k"; depends=[data_table fasttime]; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; }; contfrac = derive2 { name="contfrac"; version="1.1-11"; sha256="0vmcazjlg0p3xaksai3k7yb9bbqkd4lhmbvxf2qymr2asqm51mdi"; depends=[]; }; - conting = derive2 { name="conting"; version="1.6"; sha256="0hyg1nj89i780mf1fgmrfiv5gl5nzlar8i1zy8fsim73cw9y39fm"; depends=[BMS coda gtools mvtnorm tseries]; }; + conting = derive2 { name="conting"; version="1.6.1"; sha256="0vw6gwiajxzaai6ky0b89l2jg4kd4c6xxzb1cmzxlcdrhwmhz402"; depends=[BMS coda gtools mvtnorm tseries]; }; contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; }; contrast = derive2 { name="contrast"; version="0.21"; sha256="1fgm6qm3svqg8ryq2kd1h9z6f3ni8kki7gl3izvjw6wir97ph8nw"; depends=[geepack Hmisc MASS nlme rms sandwich]; }; - controlTest = derive2 { name="controlTest"; version="1.0"; sha256="0gzhd92qy3dykwdfwckw6x46bd9m044hcn4bqwpv16af1xbrj963"; depends=[survival]; }; + control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; }; + controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; }; convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; }; convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; }; - convevol = derive2 { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape cluster geiger MASS phytools]; }; - convexjlr = derive2 { name="convexjlr"; version="0.5.1"; sha256="18fagv4xnylc03fakf3k6r700bs6sb2dhji8cbgi69w7n7ibq5rz"; depends=[magrittr XRJulia]; }; + convevol = derive2 { name="convevol"; version="1.1"; sha256="1d9h2vjzfmnbm4aprbvhndgjh85zp3j1hssm9082nw7zb9ycxs1s"; depends=[ape cluster geiger MASS phytools]; }; + convexjlr = derive2 { name="convexjlr"; version="0.6.1"; sha256="08p8vgjwd0d1b2x50sihq3nxxxvddg22qvbp6g416nmhqm9pw0wb"; depends=[JuliaCall 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]; }; + convoSPAT = derive2 { name="convoSPAT"; version="1.2.4"; sha256="0by1z2z7gzycwrll1agkqnpn5h5cjr6b62gpwy11wl4lh48p4213"; 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=[]; }; + coop = derive2 { name="coop"; version="0.6-1"; sha256="1hr78w7qlslpwnrz9mk6w4p5qa8sxhkzans5givy5hf9qkykn0dp"; 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]; }; + copBasic = derive2 { name="copBasic"; version="2.0.7"; sha256="05fikcba2nmr7lphdc17nlrhxqyv8mw81q26fycwhagmahbsm2ag"; depends=[lmomco randtoolbox]; }; copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; }; cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; }; - coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.2"; sha256="0cvc4nz329pkjkpir3as8vvqyjmcrg9bxp6mqv12vhxyxqsp6hbg"; depends=[]; }; + coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; }; coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; }; copula = derive2 { name="copula"; version="0.999-18"; sha256="1xdjnp8zgla2hixyp524nvgbji0jcrmqc4j99hr8xp9365xb6z86"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; + copulaData = derive2 { name="copulaData"; version="0.0-1"; sha256="1s917g8wasxndg1xq4b4fjaq29nyzzigpflgqcy4rxdb7r54dl0z"; depends=[]; }; copulaedas = derive2 { name="copulaedas"; version="1.4.2"; sha256="09w6b1m1lnlnsx0qp2mzlp0z9rxzz90qs9jqzwwjl56lzdad3vpr"; depends=[copula mvtnorm truncnorm vines]; }; corHMM = derive2 { name="corHMM"; version="1.22"; sha256="03di9250hjn5fiwn47f0pr4zprmsza4if3xpmy3j1czahc8zlqnj"; depends=[ape corpcor expm GenSA nloptr nnet numDeriv phangorn Rmpfr]; }; corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; corclass = derive2 { name="corclass"; version="0.1.1"; sha256="0ai8si992f58mrvc8hq598zbw9d4jslnc96lpzj5d89lljjv3hf5"; depends=[igraph]; }; corcounts = derive2 { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; }; cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; }; - cordillera = derive2 { name="cordillera"; version="0.7-0"; sha256="0lapg9h2lw233h8plavs92c1l51m0sicslsr7gjyr0w3vkg13mxq"; depends=[dbscan yesno]; }; + cordillera = derive2 { name="cordillera"; version="0.8-0"; sha256="0cpysfivwmim36gcqn1i7450a33hv4pdbvil7syb0hr7vdm083dd"; depends=[dbscan yesno]; }; coreCT = derive2 { name="coreCT"; version="1.2.1"; sha256="19aq5snv5kin913rf0a1n9z0cg2l1jn2hnxbd0h05p1qrsysx52b"; depends=[igraph oro_dicom plyr raster]; }; coreNLP = derive2 { name="coreNLP"; version="0.4-2"; sha256="0rvyqj7s3lijq4rzil65060b29m393m7zmg99mykp1g1kby5bjd8"; depends=[rJava XML]; }; coreSim = derive2 { name="coreSim"; version="0.2.4"; sha256="1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm"; depends=[dplyr MASS]; }; @@ -4889,16 +5199,18 @@ in with self; { corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; }; corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; }; corpora = derive2 { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; }; - corpus = derive2 { name="corpus"; version="0.9.2"; sha256="1kz6k6v2820lxxk6mbpkxzl2n63q1z5xir43srzw5pir93ssqrbv"; depends=[]; }; + corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; }; + corpustools = derive2 { name="corpustools"; version="0.3.1"; sha256="0723n7gjk4yrnbvars6c6a805cqpx21z9yn9745wbvfgq7a8c4hy"; depends=[data_table Matrix memoise plyr R6 Rcpp SnowballC stringi wordcloud]; }; corr2D = derive2 { name="corr2D"; version="0.2.0"; sha256="02z9k0j6j8jyjfgff55amkzsa5w0xbr9nqm1247qylsh8sl2rqcz"; 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="1.0.3"; sha256="07zsbxhvh7n4ma6lgsmg0kkmgcs5afa02k6cq57afaqvxisw18l3"; depends=[diagram ellipse gplots rgl]; }; correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; }; corrgram = derive2 { name="corrgram"; version="1.12"; sha256="1z0h2mkf4805w3wnhy31cf1gm9miliapxchgc4ksg3kx2799gv91"; depends=[seriation]; }; - corrplot = derive2 { name="corrplot"; version="0.77"; sha256="1lr873lqg4zdjccf9g8a1fbvvdbvyb30j980ygiyxwpajpwnzdjl"; depends=[]; }; + corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; 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=[]; }; + cosa = derive2 { name="cosa"; version="1.1.0"; sha256="1fdyxc3c5wknxkjmz9xcyf4yri8nh0zkim1prn3xgblwab98b5sv"; depends=[nloptr]; }; cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; cosinor2 = derive2 { name="cosinor2"; version="0.1.0"; sha256="0pxkkp8dxhzqp2v3pfzigh1ka7ardf168k5p41z289xgar9p33g0"; depends=[cosinor ggplot2 Hmisc matrixStats]; }; cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; }; @@ -4906,29 +5218,31 @@ in with self; { costat = derive2 { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; }; 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]; }; + countrycode = derive2 { name="countrycode"; version="1.00.0"; sha256="1b2ijbf74bxvi01f53lbb2b9jya2rlyazvzacxpj79y1dbs600s6"; depends=[]; }; + countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; 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-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.1"; sha256="0fb08jdvdg6jdsmpp10dmbmhral6kgmfs5mqlprr4p3qbn8pis69"; depends=[ggplot2 RcppEigen]; }; - covatest = derive2 { name="covatest"; version="0.2.1"; sha256="1a89fr3v20w6afgirfy2n0hwnbnaimz58ya6c4idb7226s1wbdir"; depends=[gstat matrixcalc sp spacetime]; }; + covTestR = derive2 { name="covTestR"; version="0.1.3"; sha256="13sjnc3yrh2hzdcnnh6sfzl8gqilarg79n0sjr8vqyvclmz686k0"; depends=[dplyr lazyeval Rcpp RcppArmadillo]; }; + covafillr = derive2 { name="covafillr"; version="0.4.2"; sha256="00790rgpdxxwc48cw0w5savvmvi8ljmyrh6w3f8qzx6pq1s982gm"; depends=[ggplot2 RcppEigen]; }; + covatest = derive2 { name="covatest"; version="1.0.0"; sha256="0g4wfwxngvcssi2bmmb2q5fv909z9qm4wfc8gcldz7fckbsc0k10"; depends=[gstat matrixcalc sp spacetime]; }; + covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; }; 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="3.0.0"; sha256="0qww8mpwk38dz963202n2yx3aia8plzlcivv3smn0wm8xf93bcha"; depends=[crayon httr jsonlite rex withr]; }; + covr = derive2 { name="covr"; version="3.0.1"; sha256="116ix1ihqsslfhqmm44978ziwgb083zz971d72msk0yb0gyrkdv6"; 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.8.0"; sha256="03bh0r6ynr95gk4lc8asfi3kpmskm59vfzwn417pdziha3igs5x6"; depends=[ggplot2 gtable plyr]; }; + cowplot = derive2 { name="cowplot"; version="0.9.2"; sha256="13yjw7yv7imyqiawqqp304hkp6x36iv6rf6gn03dwzwkj9zwx4lb"; depends=[ggplot2 gtable plyr scales]; }; 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]; }; + coxme = derive2 { name="coxme"; version="2.2-7"; sha256="0jbaw055whbbxwx6y0gggj5i9rlr787nyknwgqdf1dnzrfzm69v7"; depends=[bdsmatrix Matrix nlme survival]; }; coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; }; coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; }; - coxphf = derive2 { name="coxphf"; version="1.12"; sha256="0vsdpbpc18fm6dwiqjwclgimwng34xqzy2mqbcijs6p7h1j124a0"; depends=[survival]; }; + coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; 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]; }; coxsei = derive2 { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; }; @@ -4942,14 +5256,14 @@ in with self; { 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]; }; cprr = derive2 { name="cprr"; version="0.1.1"; sha256="0bnq3961bqf1y1f37x60qkwmq50vnvcpv4axq0yw5n1mrs20mllj"; depends=[]; }; - cpt = derive2 { name="cpt"; version="0.9"; sha256="03nvxkwwvqmzpphax4zfij6jvh26x4bsl3mn2xr4mbr7cjb2x12w"; depends=[MASS nnet randomForest]; }; + cpt = derive2 { name="cpt"; version="1.0"; sha256="0cfjsni8m3sx2vh5cxiwqh50gl65nag5zp757jy75sx44rky63m8"; depends=[glmnet MASS nnet randomForest]; }; + cptcity = derive2 { name="cptcity"; version="1.0.0"; sha256="0gvgjy8m5bcihkcxzdzvxxawpk74zvd185ds28vbwvdibx8kjvph"; depends=[]; }; cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; }; cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; }; cquad = derive2 { name="cquad"; version="1.4"; sha256="1sxf30rikzr4mj1nyr12ys7gcnx5vq0rpd9djc2lkfbqlvi4mmai"; depends=[MASS plm]; }; cr17 = derive2 { name="cr17"; version="0.1.0"; sha256="1zyq77gxycbwyqhv5w0zw4n7v3ipjs6rcbja43g0k5q8h0gjnnn1"; depends=[cmprsk dplyr ggplot2 gridExtra gtable scales survival]; }; 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.8"; sha256="12sz54csqnwk49iwg5zcigyczxhgskxsak6ws2ih7nqpv19v8a0m"; depends=[]; }; crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; }; cranlike = derive2 { name="cranlike"; version="1.0.1"; sha256="0lnbdkyk5mdy0qlvkx2hakqrisrxsdp5r3gif6f46pf4d9cpfj8v"; depends=[DBI debugme desc RSQLite]; }; cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; }; @@ -4957,20 +5271,20 @@ in with self; { 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.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; 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]; }; + crch = derive2 { name="crch"; version="1.0-1"; sha256="0h97vr9sy7hncjxv5v3y79pw2qqzpx6z6nqgx6k2ics1lf9misyb"; depends=[Formula ordinal sandwich scoringRules]; }; creditr = derive2 { name="creditr"; version="0.6.1"; sha256="1dhjl99gjc97bdsdg29mq6xifivjn9kr0y7m2jzvrzb26x856z97"; depends=[devtools quantmod Rcpp RCurl XML xts zoo]; }; credsubs = derive2 { name="credsubs"; version="1.0"; sha256="12bs1whk23y41hxa976j30d31x81rmxapz9ll5y2hi5c1h4fypn4"; depends=[]; }; credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; }; 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=[]; }; + crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; 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.1"; sha256="0n6731b5l4vsyk8r35jgvrmmb7sjrlxfcybhrvbpd9m0w5aqi3dz"; depends=[BayesLogit GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; + crmPack = derive2 { name="crmPack"; version="0.2.6"; sha256="0jpf0626nkl3inbgb8hcgkhilrd1bkxjhm3jzscxrdghpzwvzw6h"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; crminer = derive2 { name="crminer"; version="0.1.4"; sha256="1vnl01q5sw13g6qhvn61w9i40zpg9cszisgi0h8d6q6rr23iws9w"; 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]; }; + crochet = derive2 { name="crochet"; version="2.0.1"; sha256="1il29hnnx3kwjvsnirvm5vxdd04x94qn4526411cw0syyqqlbnp8"; depends=[]; }; + cronR = derive2 { name="cronR"; version="0.4.0"; sha256="0ydlwhlzb57vbr8ya6hdsw2mhsjkb01jspn0jw081anrxfy5m2jw"; 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=[]; }; @@ -4978,20 +5292,23 @@ in with self; { crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; }; 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=[]; }; + crosswalkr = derive2 { name="crosswalkr"; version="0.1.1"; sha256="0yk5yxxsd1alfbfjg5bzjc5b07jfj5s551bzrv3dg57hxnqw9b2z"; depends=[dplyr haven labelled readr readxl tibble]; }; + crossword_r = derive2 { name="crossword.r"; version="0.3.5"; sha256="1h6r5rrmla3jsdfnkxsv4drvp3nrkqkygqv9ak0pn37zlbms99z9"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; }; crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; }; crplyr = derive2 { name="crplyr"; version="0.1.4"; sha256="1z50hplp6m4zgjfhmf2j8b22np6kjzqnprrdc0qx8408cb9vc9zr"; 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-27"; sha256="15f2nvf37r74z8vpisi89zxqa670v6nh0shl2rvl0p1s3s7h6lfz"; depends=[boot np quantreg rgl]; }; + crs = derive2 { name="crs"; version="0.15-30"; sha256="1mv5rf8xfgqlqnvmgsj0zdpwlddzv4d0ymsjl00g21zjq4805g09"; 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.8"; sha256="1vcwbdmj357n36hgyldv70a9m8vlb5g14zn6z00ssxagsw1gk5lz"; depends=[curl httpcode mime R6 urltools]; }; - crunch = derive2 { name="crunch"; version="1.18.0"; sha256="08yf42aqn1vaa6adsc4c4fwrm9ra7ghi9rg95hrh21mjvd6r55qx"; depends=[curl httpcache httr jsonlite]; }; + crul = derive2 { name="crul"; version="0.5.2"; sha256="0sfjv8jrb5x85b4dicp7789xxa0g6y89sfd96war84yidmh2a6z0"; depends=[curl httpcode mime R6 urltools]; }; + crunch = derive2 { name="crunch"; version="1.20.0"; sha256="1hsya10ba6mb3xd1lvbn2d74g9glm0l98fbh130phq5wdnn8lpx9"; depends=[crayon 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]; }; + crypto = derive2 { name="crypto"; version="0.1.4"; sha256="1b3i0f2ll6cj5z8xmws1g6c8zgwz1ip9qwgi205ncxc0nq9xlqlc"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest tidyr xml2]; }; cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; }; csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; }; @@ -5003,30 +5320,32 @@ in with self; { cssTools = derive2 { name="cssTools"; version="1.0"; sha256="1p8c21c1hilmd9ibqyz493fy1x95hb2pidybsyicch53gkb542br"; depends=[sna]; }; cstab = derive2 { name="cstab"; version="0.2-1"; sha256="08s1vann21k4afq84cp3gjzn2z0hqr7mb2znag0qyd9lzh3z6jd2"; depends=[cluster fastcluster Rcpp]; }; cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; }; - csv = derive2 { name="csv"; version="0.5"; sha256="1bpxbms54xigfz1z9jalcv5g61f74591ndcdpqrh53bgq6n0l7vv"; depends=[]; }; + csv = derive2 { name="csv"; version="0.5.2"; sha256="1gwib79fysmiwaw48ghsygyqgc00j5zwy7lfgcziw1kp6nxkdk19"; depends=[]; }; csvread = derive2 { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; }; 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.1"; sha256="05r04bxd1n866rcizjgw1267ms8zdcpny3i1vycrk31ja953fs0a"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; }; + ctmcd = derive2 { name="ctmcd"; version="1.2"; sha256="0ci2lcbyl94c6nkwwd6birhdklj936qh79cdnanb50jjfbv75wyz"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; }; ctmcmove = derive2 { name="ctmcmove"; version="1.2.8"; sha256="16qi4y3ivcys2dfixm4vzyqbqbm2j1gc1l4bjrrp46c268qja2z3"; depends=[fda gdistance Matrix raster sp]; }; + ctmle = derive2 { name="ctmle"; version="0.1.1"; sha256="1k9nr2xbaqrbpp31vdcnmpwyazcw79k0r3gbcbinva4pgv2psp29"; depends=[glmnet SuperLearner tmle]; }; ctmm = derive2 { name="ctmm"; version="0.4.1"; sha256="1ggq86j643k2xrl1lbkp9is5759fw63vq544z69bfxm889925bm0"; depends=[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-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=[]; }; + ctsem = derive2 { name="ctsem"; version="2.5.0"; sha256="15k2f9x436n78k63izgg31083spwh4r42s843h69kpvz25717m6p"; depends=[Matrix OpenMx plyr Rcpp rstan shiny]; }; + ctv = derive2 { name="ctv"; version="0.8-4"; sha256="0yl20b1j8c11b1g0q6qv0wsaivxpikwslhky4lckbm3rwbn5vbb2"; depends=[]; }; cubature = derive2 { name="cubature"; version="1.3-11"; sha256="06f6gsvbb732p80r6hxvzh4ik546icxfvx21dyh65ypmw3kgm64k"; depends=[Rcpp]; }; cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; }; + cubing = derive2 { name="cubing"; version="1.0-2"; sha256="00fch9vgxcaasxgrz79x21wb54yspnw5ysdjcdfym4qjknh9m3b6"; depends=[rgl]; }; 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.8.1"; sha256="0dgfl7wn4r8inv55xnk4ybf1y2x4qmi4cbr6phr3lfi1dnjm4hsm"; depends=[]; }; + curl = derive2 { name="curl"; version="3.1"; sha256="15fbjya2xrf2k9hhvg3frisrram4yk5wlfz67zj1z8ahpsb2a3r7"; depends=[]; }; currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; }; curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; }; - curstatCI = derive2 { name="curstatCI"; version="0.1.0"; sha256="00prppvrfk8d234rrazhbjq1ms1ww53pc8zvgywpjf7jiknas2ym"; depends=[Rcpp]; }; + curstatCI = derive2 { name="curstatCI"; version="0.1.1"; sha256="0igqdv0fzzji10gz3j3ir8qxpy7vdjfl137067rc28qzbrl2sy2c"; depends=[Rcpp]; }; curvHDR = derive2 { name="curvHDR"; version="1.2-0"; sha256="185097ikqhmqqc4ha7l74inx5cmg1bhgw3cw40wk0ngc4wv4sfqi"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; }; curvecomp = derive2 { name="curvecomp"; version="0.1.0"; sha256="0ykgbwnh32w61cjcg1nyqak42hx0jrsrpbra2wh3pgj9clg1qad2"; depends=[multcomp]; }; curvetest = derive2 { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_methodsS3 R_oo]; }; @@ -5037,7 +5356,6 @@ in with self; { cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; }; cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; }; cvequality = derive2 { name="cvequality"; version="0.1.1"; sha256="0pqvaz8vfwd0x433rrdwdwjp3hgsw1nb5nzsxci5zibjksk14kgp"; depends=[]; }; - cvplogistic = derive2 { name="cvplogistic"; version="3.1-0"; sha256="1lm66nn0q7665r64rdslxp35b7drdss4mys42ks54xdydcminns9"; depends=[]; }; cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; }; cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; }; @@ -5051,105 +5369,112 @@ 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.1"; sha256="14i6x13kh8kx9vavs4vhv5zxbqwg4r5cxkd1jd801v640p7z9qmm"; depends=[ggplot2 igraph mclust Rcpp RcppArmadillo]; }; + cytometree = derive2 { name="cytometree"; version="1.1.1"; sha256="1v90dp2bk06iv7im6r3rgj442ajxyy0h05h1higrjyw6k2v78dmd"; depends=[ggplot2 igraph mclust Rcpp RcppArmadillo]; }; cytominer = derive2 { name="cytominer"; version="0.1.0"; sha256="1p988aw689kgpbglmzrnl30krnbynwk3dgjv7w3x2719hi481z2j"; depends=[caret doParallel dplyr foreach futile_logger magrittr purrr rlang tibble tidyr]; }; 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]; }; + d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; }; d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; }; - d3r = derive2 { name="d3r"; version="0.6.9"; sha256="1gh4s0rrzwzzaqjd3gr0dgw6dz9dwijp9lb2hfjbmk5jlj55akhj"; depends=[dplyr htmltools tidyr]; }; + d3r = derive2 { name="d3r"; version="0.7.1"; sha256="1v25jh4gfp921q5cgjzxyar1sx2q842slkkshq1lnb31zkzidygq"; 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.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; }; dHSIC = derive2 { name="dHSIC"; version="2.0"; sha256="1acbzln2rlyranccsjndpw6pj4a2lyb24jb52r2wms8lsg4fn2m9"; depends=[Rcpp]; }; - dLagM = derive2 { name="dLagM"; version="0.1.0"; sha256="02923n5m5fpjr0vcbszbhxpr1xrywbb6bvqlih9yg5vngkryram5"; depends=[AER dynlm Hmisc wavethresh]; }; + dLagM = derive2 { name="dLagM"; version="1.0.2"; sha256="0wl1sivphm6plmvjixxs90ki8a1pi4nb2vxqdm5xxbi0ljwpgl1x"; depends=[AER dynlm formula_tools Hmisc plyr wavethresh]; }; dMod = derive2 { name="dMod"; version="0.4"; sha256="12q80pk0j5081qz4rb19iib0n4h1yf1c42iq1z14yyrmki3266pm"; depends=[cOde deSolve ggplot2 plyr rootSolve stringr]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; - dad = derive2 { name="dad"; version="3.0.1"; sha256="0h8nj8nsmhyv1xww3x0z2fgnh1cd1jyszd91i79wba465vbsi4mh"; depends=[e1071 lattice]; }; - dae = derive2 { name="dae"; version="3.0-04"; sha256="1fykmdgg29smdm8qn2cfspjh8lspa57h4s0jsdfz8gh5zfmvsn1h"; depends=[ggplot2]; }; + dad = derive2 { name="dad"; version="3.1.0"; sha256="1vwwcrawci8v5rz3al2647gypk0bpngvngkb5s6zxhrdvk785m9a"; depends=[e1071 lattice]; }; + dae = derive2 { name="dae"; version="3.0-12"; sha256="0xp6cyyk4s06igh2jvrdr28n0bhma79c4cfqxx9mihfx9hcw4bh9"; depends=[ggplot2]; }; daewr = derive2 { name="daewr"; version="1.1-7"; sha256="01n9g3adjk66wx9lm9gl6wa3y9ba5w0w0p5ayj8rx5ywxnm8fnvi"; depends=[BsMD FrF2 lattice]; }; 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=[]; }; dagitty = derive2 { name="dagitty"; version="0.2-2"; sha256="11jpjr2l89glr9962mbhy4dfbdjs80nf603w90xx16s4qcmcsghc"; depends=[boot jsonlite MASS V8]; }; + dalmatian = derive2 { name="dalmatian"; version="0.3.0"; sha256="06j7ampp0hwjqgw2agplfc8mngxnb6g4yv3l08plg35769jxxz7f"; depends=[coda dglm gdata ggmcmc rjags]; }; dam = derive2 { name="dam"; version="0.0.1"; sha256="1b0fi3l8jxgpr9fwvi03giq7wm39msbh0c82ffgkh54a3bbf5blc"; depends=[]; }; 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.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; }; - dartR = derive2 { name="dartR"; version="0.93"; sha256="1mkap7dvbd6j4d2zqp9kdld06ds78fi4w01w7zqmnvz3xzigp3li"; depends=[adegenet ape data_table DBI Demerelate directlabels dismo doParallel foreach ggplot2 MASS misc3d pca3d pegas plotly plyr quadprog qvalue reshape2 rgl seqinr SNPassoc SNPRelate StAMPP stringr tidyr vegan]; }; + dartR = derive2 { name="dartR"; version="1.0"; sha256="1pp739vwvs4k2a3xnkywvaxppkr764zgf5jfrf8l8830jidg2fsc"; depends=[adegenet ape data_table DBI Demerelate directlabels dismo doParallel foreach ggplot2 MASS misc3d pca3d pegas plotly plyr quadprog qvalue reshape2 rgdal rgl seqinr SNPassoc SNPRelate sp StAMPP 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.3.0"; sha256="1mzkxjyph4xka32c6bl0krr7723sch15x9wh8v9rcawn0gwnknmj"; 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.3"; sha256="1r442a1mbmrv7x88769kbz4p32cy8hacliahbls2qsr2ikbk1w2p"; depends=[DiagrammeR R6 stringr]; }; - data_world = derive2 { name="data.world"; version="1.1.1"; sha256="0kmlls8wicyfjxl27pajkagi4ps1s85rd7ywwfjfrkzkangy05xz"; depends=[dwapi httr ini]; }; - dataCompareR = derive2 { name="dataCompareR"; version="0.1.0"; sha256="06chgmgrb5n2iiynwxxgf6aq0y5ldsy43s7pwnl64w0vsa7nj8wc"; depends=[dplyr knitr markdown stringi]; }; - dataMaid = derive2 { name="dataMaid"; version="0.9.2"; sha256="13wim5375vlhaba2gawjb7lykzfj4py89cdhip44xaq19agg5675"; depends=[ggplot2 gridExtra haven pander rmarkdown robustbase]; }; + dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; }; + data_table = derive2 { name="data.table"; version="1.10.4-3"; sha256="12caklgr19vy9wprdks6zh825vr1iw1cajgwcnbpyvmijqdlz2xs"; depends=[]; }; + data_tree = derive2 { name="data.tree"; version="0.7.5"; sha256="07mavj30pqgk831dw5nj0z0jri6fq8wx9a6nyx0q873if7q3j52w"; depends=[DiagrammeR R6 stringr]; }; + data_world = derive2 { name="data.world"; version="1.2.0"; sha256="0bw1yi5qwnm3fx8d7j2q9r9fyzf4c10z3m4yxs1srp3z77i8v6d9"; depends=[dwapi httr ini miniUI shiny stringi]; }; + data360r = derive2 { name="data360r"; version="1.0.1"; sha256="1g245zg70ch81zjmd1ng16lks38qr0a6m63y582w558mza7v148g"; depends=[curl data_table jsonlite reshape2]; }; + dataCompareR = derive2 { name="dataCompareR"; version="0.1.1"; sha256="06nba2yir2yz1189bsag9yavdf9hfmpswxdy92dlnbz9d27jjsic"; depends=[dplyr knitr markdown stringi]; }; + dataMaid = derive2 { name="dataMaid"; version="1.1.0"; sha256="1scpyc0c4rcb0hk1dnzaqprb59n9vrngkg2h1h1knl5klxabkj2y"; depends=[ggplot2 gridExtra haven htmltools magrittr pander robustbase whoami]; }; dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; }; - dataPreparation = derive2 { name="dataPreparation"; version="0.2"; sha256="1r8x679ba0c55za0ayj38g846bapxphpxik3qlcjj9qjwjz6l2ln"; depends=[data_table lubridate Matrix stringr]; }; + dataPreparation = derive2 { name="dataPreparation"; version="0.3.5"; sha256="186xi3nbjgqwf8kilinzd92kzwdazgcpmbb5q420vrs2va6dv0x8"; depends=[data_table lubridate Matrix progress stringr]; }; dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; - dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.2"; sha256="1c830qwvmh5xw2iw79s0pjnli4zw3r5kf2acx7nllxbj1wkmbpgd"; depends=[curl dplyr httr jsonlite lubridate readr reshape2 xml2]; }; + dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.3"; sha256="0lrv6fyqi7k079wdpqilgjlb4j2qfs3r02d9ip8s9yznfwqsl826"; depends=[curl dplyr httr jsonlite lubridate readr reshape2 xml2]; }; datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; }; datacheckr = derive2 { name="datacheckr"; version="0.2.0"; sha256="1kk38pb4dsy6ll6drz2gsngzsv81pwmjrbvh3izm22h849mvlypv"; depends=[]; }; datadogr = derive2 { name="datadogr"; version="0.1.1"; sha256="1b6c5c3m005zlky67gi9lf1y0938gdjyjs8yjg7x51h848sy4i5p"; 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]; }; + datafsm = derive2 { name="datafsm"; version="0.2.1"; sha256="16l6ssprsvnpzxlfnqj7r061x700704s5gdci5x9ixdjmglakmdd"; depends=[caret GA Rcpp]; }; datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; + datamaps = derive2 { name="datamaps"; version="0.0.1"; sha256="1y44adffpwwfv905qmwx1kkmakh6vfyvrblgjjaqqssp6v597wrq"; depends=[htmlwidgets magrittr]; }; datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; }; - dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.0"; sha256="17588r2b528ylchdh8aa1k7q7w7wc3f2mxixif8j6snzpwsvwpzc"; depends=[assertthat httr lubridate readr tibble]; }; + dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.1"; sha256="0q1zd1l7l0hmbs1bx469d706rmprjbz2f2dgcnfp9wxfgqpfxkz1"; depends=[assertthat httr lubridate readr tibble]; }; dataone = derive2 { name="dataone"; version="2.1.0"; sha256="0vpa4gb30dvxax4sxbnbn8gblnzdfcf2k0v5js3gqwjb95ah4w4y"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; }; datapack = derive2 { name="datapack"; version="1.3.1"; sha256="0hzc68vgjvpm235zg8k2642c3jzh3ls9kp6lpz720y1b56q8k3n7"; 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.7.1"; sha256="13aabv0h1ssfd3llbqgapcfgd0x87h99bdzhhfhmkr84mzd6pzpv"; depends=[curl httr jsonlite yaml]; }; + datapasta = derive2 { name="datapasta"; version="3.0.0"; sha256="022ci7iy683lh3fh13a4b3szzqp6j4fchil695bifhi0a34bnxyr"; depends=[clipr readr rstudioapi]; }; + datarobot = derive2 { name="datarobot"; version="2.8.0"; sha256="06yqp1lvskvcyiz8a2jy7kzv721qrvf5ycw6g9jl2bj84raifmap"; depends=[curl 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]; }; - datastructures = derive2 { name="datastructures"; version="0.2.0"; sha256="03jyn1ksxpgva4r22h06lkyrm5ar8xxk3ssaskwqw7l5482i6rvf"; depends=[BH Rcpp]; }; + datastructures = derive2 { name="datastructures"; version="0.2.1"; sha256="05m9zrqil1qmjax3r86wn6k1fq4v7x3hwq2hs9n36lyhj06r031y"; depends=[BH Rcpp]; }; datasus = derive2 { name="datasus"; version="0.4.0"; sha256="18mvgdzk2f2plzgz9w47w4zxbdz24rymxvjv08j0cm242pcl11l7"; 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=[]; }; + date = derive2 { name="date"; version="1.2-38"; sha256="1ziy17kz02j7lals14s43rs9lmxxfn2ppfi55q4b3m4gfj9pr4jc"; depends=[]; }; datetime = derive2 { name="datetime"; version="0.1.2"; sha256="0qbd1makidkbpr26wkxchnb8rpwzm4l42j4vipwwmfwv3gpslmjx"; depends=[]; }; - datetimeutils = derive2 { name="datetimeutils"; version="0.2-7"; sha256="1ql44k6s0pskc7kg28aly9k7ncl58gzs80d9gpwyjdhrgimimcxk"; 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]; }; + datetimeutils = derive2 { name="datetimeutils"; version="0.2-12"; sha256="023jxsih2zlfv9yldn68cbrdl7jw5rpbz4cc9y0z530bb1fs8d1k"; depends=[]; }; + datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; }; + dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; }; + dawai = derive2 { name="dawai"; version="1.2.3"; sha256="18dg81d1018f8ibm4p43ih6fjgm6r0qs5phqbp7pqrixjj3ydk58"; depends=[boot ibdreg mvtnorm]; }; dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; }; dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; }; dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; }; - dbarts = derive2 { name="dbarts"; version="0.8-7"; sha256="0wmwg8g8xy83yv4wpdpas3jjs5jxx258wh9463q30a8hnr3izc0l"; depends=[]; }; + dbarts = derive2 { name="dbarts"; version="0.9-1"; sha256="15z70wzkp88r5djq9y6ckj2yqkasbbz0zfx7mmc6w8an7j8flhdg"; depends=[]; }; 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-3"; sha256="03s0h7vykg2wwynw1n4maazwp77r65ai63qslcabr6vzc8a0x4yc"; depends=[httr reshape2 XML]; }; + dbhydroR = derive2 { name="dbhydroR"; version="0.2-4"; sha256="189yzc7nchl31203jadf6qs3w1d3s01ifn9y6403c11qm4y63fpf"; depends=[httr reshape2 XML]; }; dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; - dbmss = derive2 { name="dbmss"; version="2.4-0"; sha256="0rxldlyrwfbpmvgmqzmzifflnc7hv2dv62fmhqihvac7ya1h2rx8"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; }; - dbplyr = derive2 { name="dbplyr"; version="1.1.0"; sha256="17gn8vr4a6m9ynarjbm9xsrhcvgn5lnxhb2qhiiglmhh5mm4a7kv"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble]; }; + dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; }; + dbmss = derive2 { name="dbmss"; version="2.5-1"; sha256="1giwbzjgz2qiry9mmqyby1jxpdsxaifv1p227i9jyq9d46gs9qiy"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; }; + dbplot = derive2 { name="dbplot"; version="0.2.1"; sha256="1ksjxvq8y5n5vwnpvxwbdmcywnld9fnkmq63ckcv7nbgbiyi5wgw"; depends=[dplyr ggplot2 rlang]; }; + dbplyr = derive2 { name="dbplyr"; version="1.2.1"; sha256="1nwrls9c3kc9q7405jp6b9sh23642sz13yw55iikgw134shffj5k"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; }; 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]; }; + dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; 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]; }; + dclone = derive2 { name="dclone"; version="2.2-0"; sha256="05myb01ypnhf9wdk3i8s9xldn8ihvw7gf4ajqld886nvc306rfkv"; depends=[coda Matrix rjags]; }; + dcminfo = derive2 { name="dcminfo"; version="0.1.7"; sha256="03r0ynzc5cck2rz20zbg5zx8v6s66ivizqav1pjkyvp6kxkmnf8q"; depends=[CDM]; }; dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; }; + dcmodify = derive2 { name="dcmodify"; version="0.1.1"; sha256="1a909v6jhihwwmq7lzv2xazrkfa1553kbrjsbjfsh1qrqdiam3sr"; depends=[settings validate yaml]; }; dcmr = derive2 { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; }; dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; }; 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]; }; + ddalpha = derive2 { name="ddalpha"; version="1.3.1.1"; sha256="13w8ir5rd80rka4mq343zd4wn93vfw870lzfqrd3cxgwb1bwcw7y"; depends=[BH class MASS Rcpp robustbase sfsmisc]; }; ddeploy = derive2 { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; }; 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]; }; + deGradInfer = derive2 { name="deGradInfer"; version="1.0.0"; sha256="1wl1pw1rwins4gr47a8ii4diw6wd6cx8ib4l5bhri5f3crbw7l86"; depends=[deSolve gdata gptk]; }; deSolve = derive2 { name="deSolve"; version="1.20"; sha256="18nx3maww979a8p8ly4hv63y65mnjx8vbj2fpipd6rhcbf1lbsan"; depends=[]; }; deTestSet = derive2 { name="deTestSet"; version="1.1.5"; sha256="07wbgniwkpp0yry6wvchvszr8isxs1i9k6km951r5c009w1iviwk"; depends=[deSolve]; }; deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; }; deal = derive2 { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; }; deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; debug = derive2 { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; }; - debugme = derive2 { name="debugme"; version="1.0.2"; sha256="0ayqai6a5zv8mmhv2pcj6yzlpkkhjh7fa3l4pjljgi37ma3pi38z"; depends=[crayon]; }; + debugme = derive2 { name="debugme"; version="1.1.0"; sha256="1c9sg55zvf10h8198jdnpamm6f66lzw3c3jnmdp9ls6na0j0xbjd"; depends=[crayon]; }; decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; }; - decisionSupport = derive2 { name="decisionSupport"; version="1.101.2"; sha256="0zmf87wjrpkg12ix8dz3asrwldwvclj1ifvzff46zgipdm3viqr0"; depends=[msm mvtnorm]; }; + decisionSupport = derive2 { name="decisionSupport"; version="1.103.6"; sha256="1lfv1a9pcf1f7la1vxpwvw8abk4jbq7cmalp374l0xasfyin2mr5"; depends=[chillR msm mvtnorm nleqslv rriskDistributions]; }; decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; }; decoder = derive2 { name="decoder"; version="1.1.12"; sha256="0jacp5fqi3l87a86kzhivwd7bl9ndcpymw1vkzmr9r5my8d119pk"; depends=[backports]; }; decomposedPSF = derive2 { name="decomposedPSF"; version="0.1.3"; sha256="0p9n0qi21facdp9c4fzs78ap4w1wvpvkv51kgx1gkr949kw8cv4n"; depends=[forecast PSF Rlibeemd tseries]; }; @@ -5159,13 +5484,13 @@ in with self; { 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.2"; sha256="1lz849p0if16877gndkxh7khx1rdvaayhps6khypayddajjr1njq"; depends=[lintools stringdist validate]; }; - deepboost = derive2 { name="deepboost"; version="0.1.5"; sha256="1varzk3dlsxl8y1p4cblw3ivk5h088agsxar02jbl9hs3r6pj17l"; depends=[Rcpp]; }; + deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; }; deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; }; deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; }; - defrostR = derive2 { name="defrostR"; version="1.0.0"; sha256="1ncj4qjbalb3v4kcp82wmik9p32lm5rc6cw2fqll88cni49mr62f"; depends=[XML]; }; degenes = derive2 { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; }; degreenet = derive2 { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; }; + deisotoper = derive2 { name="deisotoper"; version="0.0.3"; sha256="1263cgwzgl3dnv1y9qhzjl4b7r69h59x38ggb7c8zn7g6qbdc0kc"; depends=[rJava]; }; dejaVu = derive2 { name="dejaVu"; version="0.2.0"; sha256="1cnbgssdnvl092vz0j2n4bamvysrr0n9wy6ycz2mkm5wvf4r296i"; depends=[MASS]; }; deldir = derive2 { name="deldir"; version="0.1-14"; sha256="12cjr4r50rdrh2l0105cvd42rqwzsmmiqcax3sbqk1ggh2lnblw9"; depends=[]; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; @@ -5176,33 +5501,33 @@ in with self; { demoKde = derive2 { name="demoKde"; version="0.9-4"; sha256="0p4v808m42wbv8ibdfqzm43cbbg0yl452wnm1mzqq2n37z6yljkr"; depends=[]; }; demogR = derive2 { name="demogR"; version="0.5.0"; sha256="1y7pkf1m8fqjsvs0szyaqga2y7p3dvj0r85nz8nzqbmy4zrrv4w8"; depends=[]; }; demography = derive2 { name="demography"; version="1.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]; }; - dendroExtra = derive2 { name="dendroExtra"; version="0.0.2"; sha256="038qda2giqvbwrlpz6dmww912fhbhfz5ll6id6s8ngrd597nn998"; depends=[brnn ggplot2 oce reshape2 scales]; }; - dendroextras = derive2 { name="dendroextras"; version="0.2.2"; sha256="1a42g29w9dvmwrfd244a8ixak6asbkqhzmggl0c4j5fkrp74fpll"; depends=[]; }; + dendextend = derive2 { name="dendextend"; version="1.7.0"; sha256="1krvqadnnh53xx5ql7bwzxaif6a317jzbs1m00gnc6jnj03rfl5d"; depends=[fpc ggplot2 magrittr viridis whisker]; }; + dendroTools = derive2 { name="dendroTools"; version="0.0.6"; sha256="0mqzlysp0kihs9ymz8y3agvjl6ihn996cmpw331c4jb5n7vhjx0r"; depends=[brnn caret dplyr ggplot2 gridExtra MLmetrics oce randomForest reshape reshape2 RWeka scales]; }; + dendroextras = derive2 { name="dendroextras"; version="0.2.3"; sha256="0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx"; 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=[]; }; - denoiSeq = derive2 { name="denoiSeq"; version="0.1.0"; sha256="0jsq8qz7bm314gsa3vyavh3ychicqsm5z9yj0vz0jgihmlrdqaxk"; depends=[]; }; + denoiSeq = derive2 { name="denoiSeq"; version="0.1.1"; sha256="18w69gxbnazg5k8bzi76slcqxnbfmrndp548zazz8bpxz3jns699"; 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]; }; + densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; }; 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.8"; sha256="1157m2cpa35aymkwx98vkdlg33ngbsyszk8r30988w636nhs2gh6"; depends=[mvtnorm]; }; + depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; 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]; }; depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; }; depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; }; - dequer = derive2 { name="dequer"; version="2.0-0"; sha256="1cvc201g6jc0y09vccswsvvwlmxi7w8raffpald4b3pin10zfr6q"; depends=[]; }; + dequer = derive2 { name="dequer"; version="2.0-1"; sha256="04kzlff8xa733qkkx0gacgig7d4l7yvgqmzva0mj8di12byh214p"; depends=[]; }; derivmkts = derive2 { name="derivmkts"; version="0.2.2"; sha256="00bcffqzzsm2h4gfwri772q8i7h40xhv07wl8xj682fnlk246ggs"; depends=[mnormt]; }; desc = derive2 { name="desc"; version="1.1.1"; sha256="0k07qighac1xzmm8k988zi7i88a0yfvia3gk5hbz0fyvb2v9kzrj"; depends=[assertthat crayon R6 rprojroot]; }; descomponer = derive2 { name="descomponer"; version="1.4"; sha256="12zpkixclm6jmrgzvcy48c1mdqh9dgadzf9026wjyamphxkkjbip"; depends=[taRifx]; }; - descr = derive2 { name="descr"; version="1.1.3"; sha256="0fp91gbxxxvn2hqdyddhb3x85031wgq7gnqrhzjr956prlv086r6"; depends=[xtable]; }; + descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; }; describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; - descriptr = derive2 { name="descriptr"; version="0.2.0"; sha256="1295pgw69v2r60pqff01mcrj619lg769y6x8dilwffl767w0d95n"; depends=[dplyr forcats magrittr tibble]; }; - desctable = derive2 { name="desctable"; version="0.1.0"; sha256="002x4zjrcjz0xxh924z00rka1c61ldrj6lypakkf3p4hbwid6j30"; depends=[dplyr DT htmltools pander purrr]; }; + descriptr = derive2 { name="descriptr"; version="0.4.0"; sha256="1v21fb90vhh7mjx9q29cbdvbxyi8sjcfbvdxf0xd8n7fkd6gd4yj"; depends=[dplyr forcats ggplot2 magrittr rlang scales shiny tibble tidyr]; }; + desctable = derive2 { name="desctable"; version="0.1.1"; sha256="188pw8fjgm2g88nraagmxbnpv4gg89vm6mxm9w9vk88iq4hgbhjc"; 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=[]; }; @@ -5210,65 +5535,72 @@ in with self; { 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.2"; sha256="0526bl16gkfb6zrnaffyacp174q02m0gdn85rhr4fpczfm2gi36n"; depends=[lattice reshape2]; }; - detect = derive2 { name="detect"; version="0.4-0"; sha256="119kvkgpgd12v31ps1bg5dmc9djkaqzls548nlrvn1pbmahfnfx5"; depends=[Formula pbapply]; }; + desplot = derive2 { name="desplot"; version="1.3"; sha256="06aa4ijxk34z9v309jnsapa7bc95wx2g2hbasljwrb90f2z87wq9"; depends=[lattice reshape2]; }; + detect = derive2 { name="detect"; version="0.4-1"; sha256="0hq3imp4w6bd8x4njcfrvcs5lf0vrfnags1zdph86d7hlrwfds62"; depends=[Formula Matrix pbapply]; }; + detectRUNS = derive2 { name="detectRUNS"; version="0.9.5"; sha256="0w4pz7waaabgsb47xcmgiz8bzlrs2a83y3v6j7bqb5125y1wn8hw"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; }; detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; }; + detpack = derive2 { name="detpack"; version="1.0.1"; sha256="00qyjhv7y5mk4h0a428i780fsvlamqnxv12kl6lqs776rhf0skfv"; depends=[]; }; detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; - detzrcr = derive2 { name="detzrcr"; version="0.2.0"; sha256="10868k4vmc5n8y0xx123klp7hz6fnycsssg9nnq3nm1z36fmgcb7"; depends=[ggplot2 MASS shiny]; }; + detrendr = derive2 { name="detrendr"; version="0.4.0"; sha256="0syxd5bds81ihm692bgps7wwl4n5fvi08jwd90hxaddksdskf2p6"; depends=[autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr purrr Rcpp RcppParallel rlang RSAGA stringr]; }; + detzrcr = derive2 { name="detzrcr"; version="0.2.1"; sha256="1y1lbckm4a4m50x2a47r1wk47z4m4pvkslwgzcvw00nch47h9d8s"; depends=[ggplot2 MASS shiny]; }; devEMF = derive2 { name="devEMF"; version="3.6"; sha256="1n5i68f1j3d5yp0p0845zsvr4xhjrvj610wsb5rrlf90jwnarsx2"; depends=[]; }; - devRate = derive2 { name="devRate"; version="0.1.3"; sha256="1jh3j69r12sr77kwhg6k53byc6z3izpza4rw3q5sr1gl8cb7jbx9"; depends=[]; }; - devtools = derive2 { name="devtools"; version="1.13.3"; sha256="146wb09cmfh10vhn1ps2nmzx104zldb3nj9qv2ic0gbcikbbryp6"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; }; - dexter = derive2 { name="dexter"; version="0.4.4"; sha256="1ngp1srrfkhjd1nr9m3s8siqg856jlny8vvckvz6mlyjgbhmayj1"; depends=[colorspace DBI dbplyr dplyr DT fastmatch formula_tools purrr Rdpack rlang RSQLite shiny shinyBS shinydashboard tidyr]; }; + devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; + devRate = derive2 { name="devRate"; version="0.1.6"; sha256="0wm6nqnr76azpwg00cspi4n8r4w5qfkvm5qqp0kshv701pnbsjbp"; depends=[]; }; + devtools = derive2 { name="devtools"; version="1.13.5"; sha256="1x3wsk7dh3yakii61kbfvafx9yz66h40ixiwfkf03dnp2n24hngs"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; }; + dexter = derive2 { name="dexter"; version="0.6.0"; sha256="1qz4j33y6n115gijxs1jg5712g8cmsv7406cx6bsm2zswvv7ra22"; depends=[colorspace DBI dbplyr dplyr DT fastmatch purrr RColorBrewer rlang rprintf RSQLite shiny shinyBS shinydashboard tibble tidyr]; }; df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; }; 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]; }; + dfcomb = derive2 { name="dfcomb"; version="2.4-2"; sha256="163sc18ka4wkf208ml7ghjsn43b3mbyf9zm4id563az6ckkzw45p"; 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.5"; sha256="1npa7hvcaimhjp31hbvwj1xhriryghwny3nnnp7vpvmy54i7hx84"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; - dfoptim = derive2 { name="dfoptim"; version="2016.7-1"; sha256="1hs0ln5iz3h1x1b27jai83r3gad6698zwhr2jgpviiv9zwhic8c2"; depends=[]; }; + dfmta = derive2 { name="dfmta"; version="1.6-2"; sha256="0icpgsxhzd9y0d3xv82cy807wylxck7zn31g0b3nv0nq3jxy04jk"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; + dfoptim = derive2 { name="dfoptim"; version="2017.12-1"; sha256="03sh92ks29hcdy4ma1b5rs29f65q65wi30j1pxkmsjxkp8179jgf"; depends=[]; }; dfped = derive2 { name="dfped"; version="1.0"; sha256="0xhyh5sm1a009pwfn2yb3vg2hr4sfpf9ifg09hqcvjx56pxfd8zh"; depends=[ggplot2 rstan]; }; dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; }; - dfpk = derive2 { name="dfpk"; version="3.3.1"; sha256="007rxz7xfhp1r15hnfndh7fx5jwshszg2x9zgy2wk79gxdf2gy9w"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; }; + dfpk = derive2 { name="dfpk"; version="3.4.0"; sha256="0fvvyn1zc0s0z4xaqinf8im2ynmbs7irh9q9h66ym1pxmrqhb5zw"; 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="2.0.1"; sha256="1af5sn3py3my543vn6izqmlsc80rvyx7dqxprylk4pzsmc8yyx4c"; depends=[dplyr ggplot2 Rcpp rgdal sp]; }; 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]; }; + dgo = derive2 { name="dgo"; version="0.2.14"; sha256="0pizzyqgnng3g5g9q2qa5wcwfdl94rz69ah071qx01k03fzayg86"; 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.7"; sha256="09wasgvjw0xc9k68m6a8lx372p2hywk4j6ikr9wjjjfl6f17j1cw"; depends=[boot MASS Matrix numDeriv]; }; - di = derive2 { name="di"; version="1.1.1"; sha256="1rq0cq59p5fgf0sb1n8dm5z5a8b0qnwp5qa6jmgsa8kjwn04hw8z"; depends=[scales]; }; - diagis = derive2 { name="diagis"; version="0.1.3"; sha256="0ni7xqpnzr5drdw12sslm7d7amwzaifhlr2pw6b4f264wcab72i8"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; }; + di = derive2 { name="di"; version="1.1.3"; sha256="1i3s1rw62iy49141b3lqy5d97iwcj6ihdhsz2716v2497c39qhhy"; depends=[scales]; }; + diagis = derive2 { name="diagis"; version="0.1.3-1"; sha256="1cagcr5znhrg4fp96d79ly0z7bs3hhh3zfspclyfc88p2p3qsd96"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; }; diagonals = derive2 { name="diagonals"; version="0.4.0"; sha256="03n6lm0hkgylswgj1qlgrjigm7basl5frip99mxx19mvaqa3bhqy"; depends=[]; }; diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; 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]; }; - dicecrawler = derive2 { name="dicecrawler"; version="0.1.0"; sha256="04cfzc6qldfaga4mj7bw8hdbznl6jr5h91nq20c74khv5g7vas7m"; depends=[curl jsonlite rvest xml2]; }; + diceR = derive2 { name="diceR"; version="0.4.0"; sha256="1pxkwrbm69b97jia7nc18sprvxqxwwvvvzmxh147wgpqlmgqq47m"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen largeVis magrittr mclust NNLM pheatmap progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble 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]; }; + dief = derive2 { name="dief"; version="1.1"; sha256="0x3dwlfi130wmbsmm8vf66qxqn001b07yaiq6mp1s707dnl131mc"; depends=[flux fmsb ggplot2 plyr]; }; 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.1.1"; sha256="14sgya6s8i6r6861dcwwiv8scwvxgk780yka1vlzsqg9bsklcyi9"; depends=[CTT ggplot2 msm nnet reshape2]; }; + difNLR = derive2 { name="difNLR"; version="1.2.1"; sha256="102b6hczmvm2pn0ld1pmqjc1pyvbgq1zk1whrgvai35c6qba40r2"; depends=[CTT ggplot2 msm 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]; }; + diffMeanVar = derive2 { name="diffMeanVar"; version="0.0.6"; sha256="0zivbd22hp0biy4vnjh21f4djfg5bl9az0wlhn47rk7fw65rgipb"; depends=[Biobase lawstat MASS methylumi missMethyl]; }; 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]; }; + diffee = derive2 { name="diffee"; version="1.0.0"; sha256="0phkiq14qajif1nymfymwnhkdrlcx4xnk9mnyf5wgrkgywssgz21"; depends=[igraph]; }; + diffobj = derive2 { name="diffobj"; version="0.1.9"; sha256="1adqn472qbwrfb8m2iy3sfvj2n8g3d4h6xc3hqxpbv03yyfia2c2"; depends=[crayon]; }; diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; }; diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; }; diffractometry = derive2 { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; }; 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]; }; + diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; }; diffusionMap = derive2 { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[igraph Matrix scatterplot3d]; }; - 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=[]; }; + diffusr = derive2 { name="diffusr"; version="0.1.2"; sha256="1rvfbs757rngxz7z3kq82nwls26qx35gkjiv1laay06kjs9qrgy5"; depends=[igraph Rcpp RcppEigen]; }; + digest = derive2 { name="digest"; version="0.6.15"; sha256="1ia4ak956gnn0f5aqhwgam6g9z6f1y57zz8jv45jc8h79yxp8bl8"; 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]; }; @@ -5278,13 +5610,13 @@ in with self; { 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="2017.03.31"; sha256="01ahw0c56mnzwl611s8hnghicww4c4dgf5v2wv6bl1s1pramw9pr"; depends=[quadprog]; }; + dirichletprocess = derive2 { name="dirichletprocess"; version="0.2.0"; sha256="1q6rnrzyvkz9hn9czlm9sha80qsmrz7n4l3r8r1plkgrnf0biajv"; depends=[ggplot2 gtools mvtnorm]; }; 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.7"; sha256="0shxwxbvbbgp0qphpbih582d5psqj5n0izv7zvcw97vh82bzra4l"; depends=[functional mgcv mvtnorm]; }; - discgolf = derive2 { name="discgolf"; version="0.1.0"; sha256="15bk2k7glahcbz4kyl3fiayi7ck6z3wabl9y25fg6cnxkbyh6dbn"; depends=[httr jsonlite xml2]; }; + discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul 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]; }; @@ -5300,10 +5632,12 @@ in with self; { dispmod = derive2 { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; }; disposables = derive2 { name="disposables"; version="1.0.3"; sha256="0q5wacjclspn2fh7z1pg2l67ll51n75wck5h2fdq2vxy3qn3vwis"; depends=[]; }; dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; }; + dissever = derive2 { name="dissever"; version="0.2-2"; sha256="0s4g84lq15i00vpaafwmcbspdqy23cbj2fbyfnq60mzllyzgs0n2"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; }; distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; }; 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=[]; }; + distcrete = derive2 { name="distcrete"; version="1.0.3"; sha256="0sa6z2mpmk51ig1r7bmpbyv2jd8z6z7mixki2vlq1kybg8cx3wmi"; depends=[]; }; + distdrawr = derive2 { name="distdrawr"; version="0.1.3"; sha256="1c8wznfml8k5gwyanfg7rqr22a96xx8rgm7f4z3bv5gsgsbps49y"; depends=[]; }; distfree_cr = derive2 { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; }; distillery = derive2 { name="distillery"; version="1.0-4"; sha256="1m0pgmlvk7bsb6q3kxagnq422babk61sf73naavac68v8x2q8fix"; depends=[]; }; distory = derive2 { name="distory"; version="1.4.3"; sha256="1mszk8fv1z46d7y1q37mhq9b5yk39w2i9rq6mgdf03afdslrmrip"; depends=[ape]; }; @@ -5316,54 +5650,57 @@ in with self; { distrSim = derive2 { name="distrSim"; version="2.6"; sha256="1kq85ivnw4mplpr2jmc2w19kvk0d1wffz6laypay2j5gyd8fm44x"; depends=[distr setRNG startupmsg]; }; distrTEst = derive2 { name="distrTEst"; version="2.6"; sha256="1c0xwpyr5gs89psiflcz5dplsb1g9r651jiqg8nxcqa05r9kyhkr"; depends=[distrSim setRNG startupmsg]; }; 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]; }; + distrom = derive2 { name="distrom"; version="1.0"; sha256="0wylw7yaylf5j8cy8g45jrw91mwx6w0i7vf9ysnj5kxyznq1gl6y"; depends=[gamlr Matrix]; }; distrr = derive2 { name="distrr"; version="0.0.4"; sha256="0nywvgcbk2i2n2qa80yk68zikl2fs7nybhq540808rjksldh9pvy"; depends=[dplyr lazyeval magrittr tidyr]; }; divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; }; - diveMove = derive2 { name="diveMove"; version="1.4.3"; sha256="18420gm1cb0pinp05n08cj5qgf9rmn5ksr7bfq464s61isrhmzhy"; depends=[caTools geosphere KernSmooth quantreg uniReg]; }; + diveMove = derive2 { name="diveMove"; version="1.4.4"; sha256="0mq3nkcn1w8mry9lda6fkycb1a5qmkyzpckwxbrvsyc5kyyx755c"; 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]; }; + divest = derive2 { name="divest"; version="0.5.0"; sha256="07qv8zjhajyjc7yhm3kk33xj806rxv92810d52gvk4iwgmgczl78"; depends=[Rcpp RNifti]; }; + divo = derive2 { name="divo"; version="1.0.0"; sha256="0xy4yxvx2grskdzb5z73mhgrq0nfhdkm2hxahdns7pb1fgajxyjx"; depends=[cluster]; }; + dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; }; dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; }; dlib = derive2 { name="dlib"; version="1.0"; sha256="0d6p28r86jq7gwqh3njnsfgl6mmgx7famqx7p1xmra91cdlp3hqj"; depends=[Rcpp]; }; dlm = derive2 { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; }; 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.9"; sha256="1j72w9lpxsmlf39458pq72mgy6yz4rnsyx4d7s08rvl1jh32a8ni"; depends=[graph gRbase nnet Rgraphviz]; }; + dlnm = derive2 { name="dlnm"; version="2.3.4"; sha256="08k9x29iakgnzf4zbj6bgv6i4812mhbgraxm468wvv8ia574dm1m"; depends=[mgcv nlme tsModel]; }; + dlsem = derive2 { name="dlsem"; version="2.2"; sha256="05ph3zqh2300b1qm6awwixiyg33rjym1m3l943cvgc036axa7smk"; depends=[graph gRbase Rgraphviz]; }; dlstats = derive2 { name="dlstats"; version="0.1.0"; sha256="0s92rdpw3m534wgjaic4srsp9i1pa3ibfmr4h7p3ly51zhza6l5h"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; }; - dma = derive2 { name="dma"; version="1.3-0"; sha256="12gjrk0dp5w49wf0zkwc16vf8hd82822k88zb9fax3dklwm1dd3p"; depends=[MASS mnormt]; }; + dma = derive2 { name="dma"; version="1.3-1"; sha256="0azask61cmkklly32nbpw9rq03v0g976i7shhvawxj20dh4h1jz9"; 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]; }; + dmm = derive2 { name="dmm"; version="2.1-3"; sha256="0hxd4k721imicnc97h319gxs6n4plyl9y9sr5hc7pwas543dm7k3"; depends=[MASS Matrix nadiv pls robustbase]; }; dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; }; dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; }; dna = derive2 { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; }; - 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.1.1"; sha256="1pj31586li19dybfvwljmpv18k6k2mvrx6g0a8rjjdcqczasf8yr"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; - dng = derive2 { name="dng"; version="0.1.0"; sha256="03c47kviy1bw8sfb9705cr8bqi4d47mfnrkql1c079gqyhxbkv2z"; depends=[Rcpp]; }; + dnet = derive2 { name="dnet"; version="1.1.3"; sha256="1av4kbcbhpj1ivz6ln26p80z5fd170971mrcy59zm67h6kdi56az"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; + dng = derive2 { name="dng"; version="0.1.1"; sha256="04r06k6mmif7kbpham52dq2zv5rijjnsdc3sgxz6kbh5mqdn6jfq"; depends=[Rcpp]; }; + dnr = derive2 { name="dnr"; version="0.3.2"; sha256="0f5xahd86x196mg7c9zrhxj7c8cg7mrnd4nzyr02xcym6cff6vqm"; depends=[arm ergm glmnet igraph network sna]; }; doBy = derive2 { name="doBy"; version="4.5-15"; sha256="0n1ml47f78nqhy92a0fgsb4brz0qyfr4q3c7im8pnb0ngia4ssdx"; depends=[MASS Matrix]; }; - doFuture = derive2 { name="doFuture"; version="0.5.1"; sha256="0jhsvs6k7m5n5v37ybwnank38lvdiiwazzsy9hp04y9mgh2p3ysz"; depends=[foreach future iterators]; }; - doMC = derive2 { name="doMC"; version="1.3.4"; sha256="0y47jl6g4f83r14pj8bafdzq1phj7bxy5dwyz3k43d2rr8phk8bn"; depends=[foreach iterators]; }; + doFuture = derive2 { name="doFuture"; version="0.6.0"; sha256="04pvs2h1ibdbl6cph30rvdn5vzj9afllvh8f0iy64pgy83vls790"; depends=[foreach future iterators]; }; + doMC = derive2 { name="doMC"; version="1.3.5"; sha256="1vfrykvfvsyq12mypd266867ml1dcwc3rj5k9c3wrn5bddcm88kr"; depends=[foreach iterators]; }; 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]; }; + doParallel = derive2 { name="doParallel"; version="1.0.11"; sha256="0sppgxk3d8mfsrb3cjdyn0mv0s4i7pcy8g8c3cjzbr6k8vmx5jsc"; depends=[foreach iterators]; }; doRNG = derive2 { name="doRNG"; version="1.6.6"; sha256="0xnqrc74qncg5iv4cvq0vh3r1sd407wvzx0hfpy8j2rcqy12574k"; depends=[foreach iterators pkgmaker rngtools]; }; doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; }; - doSNOW = derive2 { name="doSNOW"; version="1.0.14"; sha256="1xfk48i465sv2jqzydsaff3a656ggkrxzvhsqnrsgqh1k3423a1g"; depends=[foreach iterators snow]; }; + doSNOW = derive2 { name="doSNOW"; version="1.0.16"; sha256="13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n"; depends=[foreach iterators snow]; }; + dobson = derive2 { name="dobson"; version="0.2"; sha256="1fyf4dyzpg6hqdvr8n4ncs4dny8mg23nxbd49jd3mrlajszzg0vp"; depends=[]; }; docker = derive2 { name="docker"; version="0.0.2"; sha256="00zq4zmv2y6q069q92dn8db2bj96kfy7pv2s58q21dxkp1c4s6qg"; depends=[reticulate]; }; + dockerfiler = derive2 { name="dockerfiler"; version="0.1.0"; sha256="16y70blrv9crmgrcnq6dk3bjk73ajlkxv72xj3qrmw78zjy5an19"; depends=[attempt glue R6]; }; 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]; }; + docuSignr = derive2 { name="docuSignr"; version="0.0.3"; sha256="0q90z31svbdnvylfr0yj2f0gahvpi089c1d5llvwqy8qc5p9fbqw"; depends=[httr jsonlite magrittr]; }; documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; }; - document = derive2 { name="document"; version="2.1.0"; sha256="1f9dr6kvmdb3lgxka2j5jr3ar1p4h0f2f7a1qqbq8a69s7f4qa7z"; depends=[callr checkmate devtools roxygen2 rstudioapi]; }; + document = derive2 { name="document"; version="3.0.0"; sha256="1jd7pgifnlffibmmsflgp0gbv83qclqsfi8glvr9kfxw66yx0mhq"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; }; 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=[]; }; + dodgr = derive2 { name="dodgr"; version="0.0.3"; sha256="161qy9iyszpb44v26zn6w4d7c9bw8pg7vwgqcba0k0xc5dnr2wjc"; depends=[igraph magrittr osmdata rbenchmark Rcpp sp]; }; + domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; }; dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; }; dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; }; - dotCall64 = derive2 { name="dotCall64"; version="0.9-04"; sha256="0qp6magpp0jaa0b9sfkbxd91afayl24kj0yrh0ix1v3ahdnaar8f"; depends=[]; }; + dotCall64 = derive2 { name="dotCall64"; version="0.9-5.2"; sha256="1jw0kyw95nivjimh25ri9sigqwlvk12kd45ydsh1yggigzc0k23k"; depends=[]; }; dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; }; dotwhisker = derive2 { name="dotwhisker"; version="0.3.0"; sha256="1sbj8blnqnsyvf7pq2cc9q7nqb66n0v2gi2rr09yjlppf7v1pcjf"; depends=[broom dplyr ggplot2 ggstance gridExtra gtable plyr stringr]; }; doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; }; @@ -5371,33 +5708,37 @@ in with self; { downscale = derive2 { name="downscale"; version="2.0-3"; sha256="0jvzvmwhpdr7ygcxky4yl1ldb843hrmnzhmnvl0694mmswwqsf8l"; depends=[cubature minpack_lm raster Rmpfr sp]; }; downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; }; dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; }; - dparser = derive2 { name="dparser"; version="0.1.5"; sha256="0h2q7bdx51bzd2zs72gsi4957zlshvb6kf848nl70665pvz04m2v"; depends=[digest]; }; + dparser = derive2 { name="dparser"; version="0.1.8"; sha256="1yx425s3iq03j043g41pyfp3cgmajb4qh50zirhd0qpplzwy8xj5"; 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.6"; sha256="04b0j9l2gkkycjjn16zbhv0kczhrij0bsnrdyh9qd6z53pvd3ryc"; depends=[digest lattice Matrix matrixStats plyr png R_utils stringi stringr XML]; }; + dplR = derive2 { name="dplR"; version="1.6.7"; sha256="0i4s4anklia0bnygqrkk35gnc972qfnvzr3sfzwz7jxghigw7k8l"; depends=[animation 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.7.3"; sha256="0wz5vrcsxzmxpxvs1raz9kyfc7mq3591nadq4rb4hx4sc97ysrxf"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble]; }; + dplyr = derive2 { name="dplyr"; version="0.7.4"; sha256="1hm8ml7yaraag1ak6kvz2mxx6if568c759ix8a1n9d7va03wj7vv"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble]; }; + dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.2.0"; sha256="1flhsl4c1hws2ccrf81y4lybdz9dsbmws9zdpiry9h98h3rlaxp8"; depends=[bit64 cli crayon DBI dbplyr dplyr odbc purrr rstudioapi tidyverse]; }; dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; }; 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]; }; + dprint = derive2 { name="dprint"; version="0.0.4"; sha256="13bq6yjlp5p5rcsz684rqcigp42xnz3p5phnqmrhzm874gfzm8rj"; depends=[]; }; dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; }; + dr4pl = derive2 { name="dr4pl"; version="1.0.0"; sha256="1gcddnjmzqm16vzqvh8hxw2spvfa41jmapf7n87lv100j5f8ahl5"; depends=[devtools drc ggplot2 Matrix Rdpack tensor testthat]; }; 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="4.1.0"; sha256="0jzr35d49fm9cd0d07sk98y5kfybypynzyywanpl6jad0y5plh2h"; depends=[base64url codetools crayon digest eply igraph lubridate magrittr plyr R_utils storr stringi stringr testthat visNetwork withr]; }; - drat = derive2 { name="drat"; version="0.1.3"; sha256="14q2ahy51b8mlp7fb0nbwzy5hcnlg1z73wgi85sxx4pyq1ycp4zn"; depends=[]; }; + drake = derive2 { name="drake"; version="5.0.0"; sha256="0hldxadlcl3m249rb68yikvn4gck98zj2x67jjxfgas27a1n4pjx"; depends=[codetools crayon digest evaluate formatR future future_apply igraph knitr lubridate magrittr plyr R_utils rprojroot storr stringi stringr testthat visNetwork withr]; }; + drat = derive2 { name="drat"; version="0.1.4"; sha256="0vrpqf793vinx4v7jrbn910iplvpmrlwhdjqqzx8cl2k9hl43x08"; 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]; }; drfit = derive2 { name="drfit"; version="0.7.1"; sha256="1k2chmhdwd78a5d1pxi3iskzfb4h1fxp51ji72qs73m3i6s2mqpz"; depends=[drc MASS qcc reshape2 RODBC]; }; drgee = derive2 { name="drgee"; version="1.1.6"; sha256="01404mqvkvndn5gybq8dgkfc1cy9wk94p7k7i64h47w3zbkcwsax"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; }; + driftR = derive2 { name="driftR"; version="1.0.0"; sha256="0mlhv22xmgiq4a680rk9d39gk2p1b5lrkvvmqjzmlynfy9f8bkj0"; depends=[dplyr ggplot2 glue magrittr readr rlang stringr tibble]; }; drm = derive2 { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; }; drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; }; dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; }; drsmooth = derive2 { name="drsmooth"; version="1.9.0"; sha256="1wgi961bvbsnq4bygxbpy4sy5fy34lrrkaaj0r2rxcahwa1sc38n"; depends=[boot car DTK lubridate mgcv multcomp pgirmess segmented]; }; - drtmle = derive2 { name="drtmle"; version="1.0.0"; sha256="1fnzgy3sq5nys7qw8g5bhmzw92azripjg6pb93vxrfsbr4agmmrz"; depends=[foreach np plyr SuperLearner]; }; + drtmle = derive2 { name="drtmle"; version="1.0.2"; sha256="02i75qj1l0zd518dmkv4qdbd6r8xqrxvsg6ahaxi6pwy00dvqnqm"; depends=[doFuture future future_batchtools np plyr SuperLearner]; }; ds = derive2 { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; }; dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; }; dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; }; - dslabs = derive2 { name="dslabs"; version="0.2.0"; sha256="13aw1v1znkvnajgrll120x9vam4vsxy4ihg1066f5f2kiyx8ycgs"; depends=[ggplot2]; }; + dslabs = derive2 { name="dslabs"; version="0.3.3"; sha256="1bh6n0s171n6r68fsizz2jryjlj0990bn4rbinl2ln8j17r8lgpf"; depends=[ggplot2]; }; dslice = derive2 { name="dslice"; version="1.1.5"; sha256="0qwz9rlgpgx0k28hca2m40ab0qad9rfp1gxswygchv7rcnl4f6ml"; depends=[ggplot2 Rcpp scales]; }; dsm = derive2 { name="dsm"; version="2.2.15"; sha256="1b7ixbfq2xpgbc5hyhyzcr6nx4larl3qg1idccraiwrj3m2dr59h"; depends=[ggplot2 mgcv mrds nlme numDeriv statmod]; }; dsmodels = derive2 { name="dsmodels"; version="1.1.0"; sha256="0gidxi4ph49mjm2hdf9flphfb9916al4cpdkiig504n7ms2sbpbg"; depends=[latex2exp pryr shape]; }; @@ -5407,63 +5748,71 @@ in with self; { 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.2"; sha256="1q75xnk52zfxnphj095dppcqdmk9v1n32069rffpnvr39nnik565"; depends=[data_table dplyr lazyeval]; }; - dtree = derive2 { name="dtree"; version="0.2.3"; sha256="03kma2hb373gd87yr10yn76i20r0yncxjfamgpnijr2yf6b5fq20"; depends=[caret evtree party partykit rpart]; }; + dtree = derive2 { name="dtree"; version="0.4.2"; sha256="1cpv0pyf515610djxzfw1c83p3alk5a93clg4x9gk7a7qy4cyhr1"; 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.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.1.1"; sha256="1awpqch4jdm70x6hjhzp3g98yikg12sv82zfyd2jwjh4nssiawh1"; depends=[BH bigmemory clue dtw flexclust foreach ggplot2 Matrix plyr proxy Rcpp RcppArmadillo reshape2 rngtools RSpectra]; }; + dtwclust = derive2 { name="dtwclust"; version="5.3.0"; sha256="0p6v7d7lp5fsbky5c1qcss2cxx4x5w0ass0ami15aijdb8154qyf"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 RSpectra shiny shinyjs]; }; dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; }; + dub = derive2 { name="dub"; version="0.1.0"; sha256="0sdk8sppjcfx2bsngpngm2446warsnipzzw4yz5z4jpickp52ay0"; depends=[]; }; 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.4"; sha256="1vnh98vqy0zy9bi3kpdzp74apy8zw8jl9r75vnqz5hjs3d6rg7lb"; depends=[]; }; + dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; }; dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; dvfBm = derive2 { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; }; + dvmisc = derive2 { name="dvmisc"; version="1.1.2"; sha256="1dy0yykskwhkql19bhzmbwsgv028afc8jh9yqwbczj6f3vpv31zh"; depends=[MASS rbenchmark Rcpp]; }; 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]; }; + dwapi = derive2 { name="dwapi"; version="0.1.3"; sha256="149v1yjnrdbqjg7cpnanm1jv1dcpzqy264qk5dx8wvw9kdc5h3b8"; depends=[httr jsonlite readr rjson xml2]; }; + dyads = derive2 { name="dyads"; version="1.1"; sha256="0jlyg4bz3zp4g5ig0swwi72bxaj85wll05h6vishnvmnprpdc96n"; depends=[MASS mvnfast]; }; 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="1.0.0"; sha256="0qx8kwa6jnqb2qxwvhh509sylwdrv684dsjd9w13lafyjxgvdnlj"; depends=[lpridge]; }; + dynCorr = derive2 { name="dynCorr"; version="1.1.0"; sha256="0l5k764j1zhsqpgp0ndihah63hsk3zv9hviixfmh4h3i0sr0q52p"; 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]; }; + dynRB = derive2 { name="dynRB"; version="0.10"; sha256="0nd1z96rrd7dv1212ibf268dws64n7d9dqzgrqmzs4qz7gwwhngl"; depends=[caTools corrplot]; }; dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; }; dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; }; - dynamichazard = derive2 { name="dynamichazard"; version="0.4.0"; sha256="0cq79kn45rpfzvnsdxa4sglv1qdr5imy5pkjqgznc99n8sfa8alj"; 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]; }; + dynamichazard = derive2 { name="dynamichazard"; version="0.5.1"; sha256="11lx88g0rizwxa4rfmaz9b2g8p7nnzgiqz5b0gqsc4dvz92i74fg"; depends=[boot data_table Rcpp RcppArmadillo stringr survival]; }; + dynamo = derive2 { name="dynamo"; version="1.0"; sha256="0arsv686ix7xpca57ayqgifim1q35dl4w2mx7fw8bc0lidapilyp"; depends=[abind glamlasso MortalitySmooth Rcpp RcppArmadillo]; }; + dynatopmodel = derive2 { name="dynatopmodel"; version="1.2.1"; sha256="0lpfhj69bvagqzzg2kjqvn9xx8f93ii34flrrns20z3bxla6gds9"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; }; + dyncomp = derive2 { name="dyncomp"; version="0.0.1-5"; sha256="1626z5523s4igw55fw97lplfgg9mzf4np8imrarkligslvc5q8ip"; depends=[zoo]; }; dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; }; + dynfrail = derive2 { name="dynfrail"; version="0.5.2"; sha256="1q7ml24j0ycy2bwpa14vl96315ni7x9rfp0qmf36w00mylgc3ry6"; depends=[dplyr magrittr Rcpp RcppArmadillo survival tibble tidyr]; }; 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.11-8"; sha256="1rnpzwzcdqvlh6h6npz7akw4dmw1r0958mk665z5cwssq4fha2dm"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; }; - dynsbm = derive2 { name="dynsbm"; version="0.4"; sha256="036m5gcwfcdjj5xkrbvnnx1a6i31n9j3q2mcijc7qimbld31pfj6"; depends=[RColorBrewer Rcpp riverplot]; }; + dynr = derive2 { name="dynr"; version="0.1.12-5"; sha256="1l9waqwg5mkqy8ipryickrkf141mjpzdvsc4qbw8bq4rkrgykklc"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; }; + dynsbm = derive2 { name="dynsbm"; version="0.5"; sha256="01vi4qzgp25l4wg2ij9pqrn775x4yj9gck0l397nwjg96pa7x2lz"; 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]; }; + dynsurv = derive2 { name="dynsurv"; version="0.3-6"; sha256="12bfv6bykgsyxryydhjs89yvk7akam5gy89mzn1hv4ilrpc5mlmw"; 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]; }; + eDMA = derive2 { name="eDMA"; version="1.5-0"; sha256="111iphlcxfy891xwxma7h8qylazwxhx6srffid4i167kd1dibkak"; 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]; }; + ePCR = derive2 { name="ePCR"; version="0.9.9-4"; sha256="0lnkb4zffn62vbx8hh953z9zh0plj8l15cc1k3x936zblzgd226r"; depends=[Bolstad2 c060 glmnet hamlet impute MASS Matrix pracma ROCR survival timeROC]; }; + eRm = derive2 { name="eRm"; version="0.16-0"; sha256="18shx4jjvymhzdab1qvlfqnmg49mwllyw3v46j9v19dy6h9l3n8m"; depends=[lattice MASS Matrix]; }; eVenn = derive2 { name="eVenn"; version="2.4"; sha256="1qs5qsrc89kb6w6xqc8jdxkih6h48zprvavffdqhxq4ab4i1nvbf"; depends=[]; }; eaf = derive2 { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; }; + earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; }; 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.5.1"; sha256="1fkjrdlq0a8w9dvvp0akxpyg0sxrcd08qzflpxjbwd73pm1l31m5"; depends=[plotmo TeachingDemos]; }; + earth = derive2 { name="earth"; version="4.6.1"; sha256="0hrbpa0qvhsdrdi06p0kdl2mw0n84sxcrqk96f6rh7cb6j8bm9bg"; depends=[plotmo TeachingDemos]; }; earthtones = derive2 { name="earthtones"; version="0.1.0"; sha256="1phl50bgd40i36fdkfs9xkqm703vgwxlnpyik6lk8ssip0m4rn9j"; depends=[ggmap]; }; - easyAHP = derive2 { name="easyAHP"; version="0.1.0"; sha256="11ccxqw016ji32c57gq9zlzz0m8gk7bqqhfvm750mwq1yb96bqdi"; depends=[]; }; + easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; }; 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.3.0"; sha256="1dyj66vd1g06s2fs6xqrf7b4sr2p55azhzdjhazvkm9h8j55ai02"; depends=[sdcTable shiny SSBtools]; }; - easyVerification = derive2 { name="easyVerification"; version="0.4.3"; sha256="02f7n5iwivzbsdaj2pca0vs50zins6hapn4bn4nxg624qnrldnfy"; depends=[pbapply Rcpp SpecsVerification]; }; - easyanova = derive2 { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; }; - easycsv = derive2 { name="easycsv"; version="1.0.5"; sha256="1fk7fj6y69hjgwgrfpz69jhbhz6yj5gjlrmji74h2k5qfk3fssky"; depends=[data_table]; }; + easySVG = derive2 { name="easySVG"; version="0.1.0"; sha256="03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3"; depends=[]; }; + easySdcTable = derive2 { name="easySdcTable"; version="0.3.1"; sha256="0z0fq73m7vjc8wry633lvz58r2c6a6zz6w867hij1627c74mjhs4"; depends=[sdcTable shiny SSBtools]; }; + easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; }; + easyanova = derive2 { name="easyanova"; version="5.0"; sha256="13m4ddvl3nbh610y00nnihmag62g39v4ds7rx6lmifx4zq86mylp"; depends=[car nlme]; }; + easycsv = derive2 { name="easycsv"; version="1.0.7"; sha256="03bhcylvs9q3bv4svj4mznqzv5h0m773vbikpymawk94r3gg0qaz"; depends=[data_table]; }; 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=[]; }; + easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; 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]; }; easyreg = derive2 { name="easyreg"; version="1.0"; sha256="01wpqr2vfa245xln1zmqr1a9bibj0cnx60bw24l1q1li7r13wjyy"; depends=[car nlme]; }; @@ -5475,13 +5824,13 @@ in with self; { ebimetagenomics = derive2 { name="ebimetagenomics"; version="0.3"; sha256="1nvdpgq88yf7a89qy896wc1h7afjwj90jdbpm144fn12b2pba0a7"; depends=[breakaway sads vegan]; }; ebmc = derive2 { name="ebmc"; version="1.0.0"; sha256="0v9hkzy8ljddmi6wdjd1jga4ib566ikr1vgrvxba67ka524r6bbp"; depends=[C50 DMwR e1071 pROC randomForest rpart]; }; ecb = derive2 { name="ecb"; version="0.2"; sha256="17hj4d48j6rran64ajzlgkgz17mab51fa3lz8rm3mw0qhahkjlmc"; depends=[curl httr rsdmx xml2]; }; - ecd = derive2 { name="ecd"; version="0.8.3"; sha256="0ksr5yixg4psgx4nf3y061k2fj5843f6f3xwbfl0nyfly8595s1x"; depends=[digest gsl moments optimx polynom Rmpfr RSQLite xts yaml zoo]; }; + ecd = derive2 { name="ecd"; version="0.9.1"; sha256="0d8mf5q6n7k5qj6kxvrb3habl0qmn2rxv814kydkrz2bg0scvm1q"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom RcppFaddeeva Rmpfr RSQLite stabledist xtable xts yaml zoo]; }; ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; }; - ecespa = derive2 { name="ecespa"; version="1.1-8"; sha256="0rdjr0ss7a1n66dmvykbs3x944r88l08md2rfkg9w7bxm361ib8p"; depends=[spatstat splancs]; }; + ecespa = derive2 { name="ecespa"; version="1.1-10"; sha256="1n6wvz463w0ainn9a52arjhs5q9pwciknb5328pr6y287fwa3nnn"; depends=[spatstat]; }; echogram = derive2 { name="echogram"; version="0.1.1"; sha256="0f93s9f1ghin8129vb3bvsp7jmy2hfrx97p86hci8b2y4f7b83qh"; 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="2.0.0"; sha256="1xfcpsnimik8a2rzsywgiw4dj3r66mfcq7l79096d3zifg2vjgxc"; depends=[car]; }; + ecm = derive2 { name="ecm"; version="3.0.0"; sha256="19szjkfy2iivdw5zbag9mbk3pm7a8qb6hvg1y4jdrpf519xb4935"; depends=[car]; }; eco = derive2 { name="eco"; version="4.0-1"; sha256="08fblbr9qp2v0cp69hy68c18xjqvx0nsnx42n2vd1gc6r7apapj6"; depends=[MASS]; }; ecodist = derive2 { name="ecodist"; version="2.0.1"; sha256="04piv52b4b9rgv1gy6s3b1lzapc0rqiwp1yi7f8yzgjd9329kc5g"; depends=[]; }; ecoengine = derive2 { name="ecoengine"; version="1.11.0"; sha256="1d5x6hvqrqjj0wg07m4dbgb9ljdq73ibavzy2q5magnfn50a7rzm"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; }; @@ -5489,32 +5838,33 @@ in with self; { ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; }; econullnetr = derive2 { name="econullnetr"; version="0.1.0"; sha256="0l4qy7x8f8sjc3s1bhz3kadfqifw0x9jl7dvcjwkh9q14h093cz5"; depends=[bipartite gtools reshape2]; }; ecoreg = derive2 { name="ecoreg"; version="0.2.2"; sha256="1yzyqvhshgc7ip251y7hsvip4xwf8i92bvvz84mn0mzv5b4mq3im"; depends=[]; }; - ecoseries = derive2 { name="ecoseries"; version="0.1.4"; sha256="0bvh2p3fv0lr55w2b86qzg1plw99q50nk0myxyxg6jv2q5aw3pp0"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; }; + ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; }; 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]; }; + ecospace = derive2 { name="ecospace"; version="1.3.1"; sha256="0xrhlhpndycj2hdf50lygymc1hwmczx74r6l9f2qmm6v90c0729k"; depends=[FD]; }; + ecospat = derive2 { name="ecospat"; version="2.2.0"; sha256="0awzhzl90j72jxp7qk5q5vqmgyccbkw2rbw0jrhjvlwkr5q9gyvx"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim PresenceAbsence randomForest raster rms sp spatstat vegan]; }; + ecotox = derive2 { name="ecotox"; version="1.3.0"; sha256="05k3hdz25kw28222bnlk814b2rlwq2f6b5kdqxqls9wdfvdknij3"; depends=[ggplot2]; }; 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]; }; + ecp = derive2 { name="ecp"; version="3.1.0"; sha256="0siq5acpy4wmqzm6zvpqj1m8a05hgk5jhb1clv06y40kqk5kjrap"; depends=[Rcpp]; }; ecr = derive2 { name="ecr"; version="2.1.0"; sha256="0vvkdxlcqaim9mkgwgdxrx1xhw3lshi1nxfw3kqllq14p3l6xss4"; depends=[BBmisc checkmate ggplot2 parallelMap ParamHelpers reshape2 smoof]; }; + eda4treeR = derive2 { name="eda4treeR"; version="0.2.0"; sha256="0fh6nfgvbkvjm1f0b292ggi0mr8ylq5pg2wp8cph46j8rhbgbdxz"; depends=[dae dplyr emmeans ggplot2 lme4 magrittr pbkrtest tidyverse]; }; 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.7.1"; sha256="1551hwl0gb55kkfpl990yhwa6l9hbx7a6bcggv5nkfqc66cs9rcm"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI purrr shiny shinyTime tibble tidyr XML xml2]; }; + edeaR = derive2 { name="edeaR"; version="0.7.2"; sha256="0k043g2qrm58l7dvb2ylpg76wcznkr4p4vp2p3b4hhg1hzq8zccf"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr]; }; 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.2"; sha256="02cclg549z6samhkraaknsmqvk0yxxcf4s9qpbcxb2cl9fcj1cjr"; depends=[]; }; + edfReader = derive2 { name="edfReader"; version="1.2.0"; sha256="0r4918swpfddz246kkvy10a07s178zmwp7m4ydxvi8di6iga76hk"; depends=[]; }; edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; }; edgar = derive2 { name="edgar"; version="1.0.9"; sha256="1jh0aaizirj4i4kc6gq9kkpa1xdqxbjhj7fys8ap1xxxx6nfpcnf"; depends=[ggplot2 R_utils RColorBrewer tm wordcloud XML]; }; - edgarWebR = derive2 { name="edgarWebR"; version="0.1.1"; sha256="04q5bz43wpjw69pp2xm42jvy62qyajqvnzpf2nz1ic5zzdz6x04x"; depends=[xml2]; }; + edgarWebR = derive2 { name="edgarWebR"; version="0.3.1"; sha256="0gakrgag7rm18njhrs7bq99mv7yn7yxis9yscz88va16dqdp17l8"; depends=[httr xml2]; }; 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]; }; - editData = derive2 { name="editData"; version="0.1.0"; sha256="1r4qji1dai6a0h3s4mmds4an09zdfzn0pzh8myxcc7h1q4psl0fl"; depends=[DT miniUI rstudioapi shiny tibble]; }; + editData = derive2 { name="editData"; version="0.1.2"; sha256="1ibpd2rlm6i9izyizmdhzxv8agrw920hxbin5y79cmf78rdg1sxy"; depends=[DT miniUI rstudioapi shiny tibble]; }; editrules = derive2 { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; }; - edmcr = derive2 { name="edmcr"; version="0.1"; sha256="1x0l963ccamfw6m9nsbqcfm45wxmq3jpfxzxmc4gxvpz8c7yf4jh"; depends=[igraph lbfgs MASS Matrix nloptr sdpt3r truncnorm vegan]; }; - edpclient = derive2 { name="edpclient"; version="0.2.0"; sha256="090yp94j3mm7g6lyc9vs8l1zhimnh9cizf55gw3g7ffqma2pl1rs"; depends=[httr ini jsonlite plyr]; }; + edpclient = derive2 { name="edpclient"; version="0.3.1"; sha256="0czvwyp7z27cydsjwf3xrk88g62vsllgfcwrq13ylgki7zw5gclj"; depends=[httr ini jsonlite plyr]; }; edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.2"; sha256="105jv2sz10xbl881lkhgmxzgmb8629mqsminhd197khrkf9nv40i"; 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]; }; @@ -5524,9 +5874,10 @@ in with self; { 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.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]; }; + eeptools = derive2 { name="eeptools"; version="1.1.1"; sha256="15b7rdjcl00jdb59llmgmwbxk31shayyv5skfbljwwm7vkwa22j7"; 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]; }; + effectR = derive2 { name="effectR"; version="1.0.0"; sha256="08r1jifrqa9fxm5jp6jsvazdpql53kpm6mj0sg70hvd8q0cilryb"; depends=[ggplot2 reshape2 seqinr shiny viridis]; }; effects = derive2 { name="effects"; version="4.0-0"; sha256="0h3247xcccanp0cp18r5k4l87i9862yjr5jc8sxcsfvjzn13xgf6"; depends=[carData colorspace lattice lme4 nnet survey]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; effsize = derive2 { name="effsize"; version="0.7.1"; sha256="0l0ja7qcknn8r5hf7nrjk5cy0ajw0z60ggbyj8qvjzf8qah4mlss"; depends=[]; }; @@ -5536,7 +5887,7 @@ in with self; { egg = derive2 { name="egg"; version="0.2.0"; sha256="03k6xnbpakzgwlirxcvhrb10qh1pqvj9mv8rhr4snhnf753rb75j"; depends=[ggplot2 gridExtra gtable]; }; eggCounts = derive2 { name="eggCounts"; version="1.4"; sha256="04rhyfckkg3q6n6izbmhh1m6ywywvrr719isnx8qghlx774qab86"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rstan StanHeaders testthat]; }; egonet = derive2 { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; }; - eha = derive2 { name="eha"; version="2.4-6"; sha256="09wbyn0s2cfafjnaq5vb89l2j42irbxx70h6dk8flakp42p62i27"; depends=[survival]; }; + eha = derive2 { name="eha"; version="2.5.1"; sha256="0www19cc80xg2hi1ibajqnp931gda9pk95cnx976lq1kpxzb2pyl"; 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="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]; }; @@ -5545,26 +5896,30 @@ in with self; { eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; eive = derive2 { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp]; }; eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; }; + eixport = derive2 { name="eixport"; version="0.3.0"; sha256="1ykv5jqri4zkshawck3lfl6jrzw24k27gwhi02rckzbrg2nb3909"; depends=[ncdf4 raster sf sp]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; elastic = derive2 { name="elastic"; version="0.8.0"; sha256="17aqf0a3spwh8k7s3kgnccbgad3sr3w63if96piygjz0lxgc7kzs"; depends=[curl httr jsonlite]; }; elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; }; elasticnet = derive2 { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; }; - elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.0"; sha256="0hw2pwfh6k8q1646cprg3d84acwgw5bi7vmp7wrnxkxg7npz5pyz"; depends=[httr jsonlite]; }; + elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.1"; sha256="1x20w13hkpnf1kjvml99a9q1w162f6703ccqvcqy6z0vamcvylw8"; 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]; }; + elect = derive2 { name="elect"; version="1.1.1"; sha256="025h69qsify0v3bsr9082wjdkglmarkjaqqkwr8j826466617n1v"; depends=[msm nnet]; }; + elections = derive2 { name="elections"; version="1.0"; sha256="0ig3pd1dw978g2sg4ynzd3p15nk6hx17pxvbxfi5rm131mjdmjdm"; depends=[]; }; electionsBR = derive2 { name="electionsBR"; version="0.3.0"; sha256="18aq1yz2l2g4cjbmk18n5vl8x8lkp90xwm82l0bg1z1smyv3agan"; depends=[data_table dplyr haven magrittr]; }; - elementR = derive2 { name="elementR"; version="1.3.2"; sha256="1pzgxfdwzvp58ba5h4jp4rgs6bmj7x24z3brd3vj5aldf9z0v68h"; 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]; }; + electoral = derive2 { name="electoral"; version="0.1.0"; sha256="0y4kkxm8vmj4gsan6qyhg28b0b6hgl4fghslk21d8w5w6syln4kh"; depends=[dplyr ineq tibble]; }; + elementR = derive2 { name="elementR"; version="1.3.5"; sha256="1b9f601r0gdcyclr23rf33skbbvh7lnr4nlmgcwxixkfsg8mabs9"; depends=[abind colourpicker devtools EnvStats gdata gnumeric lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; }; + elevatr = derive2 { name="elevatr"; version="0.1.4"; sha256="0gxwlcfn271p8gf2iqwqbi61kcaahfdghsc0rwm3xxxysjb5a2b2"; depends=[httr jsonlite progress raster ratelimitr sp]; }; elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; }; elhmc = derive2 { name="elhmc"; version="1.1.0"; sha256="0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5"; depends=[emplik MASS plyr]; }; elliplot = derive2 { name="elliplot"; version="1.1.1"; sha256="1sl85kyjpxiw0gs3syhlhfrci03fl054py7m24xln5vk07665vbp"; depends=[]; }; - ellipse = derive2 { name="ellipse"; version="0.3-8"; sha256="0ibz1qvf1qbb5sigyhpxb8hgip69z3wcimk3az1701rg2i64g3ah"; depends=[]; }; + ellipse = derive2 { name="ellipse"; version="0.4.1"; sha256="0g82vc51m3c1k0hnpp2zla6amxxgk2mmkl8ssnsc49jv3599r6hs"; depends=[]; }; elliptic = derive2 { name="elliptic"; version="1.3-7"; sha256="1bzd5x0yph76jh59ljl875grm52s8xpnmbgww1jjxx0hgkv7938g"; depends=[MASS]; }; elmNN = derive2 { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; }; - elo = derive2 { name="elo"; version="0.1.2"; sha256="00yrwzkgvxc7m5pnimr51b4h9vdw1cj17m6al14b3zs0yvf4a8v6"; depends=[Rcpp]; }; + elo = derive2 { name="elo"; version="1.0.1"; sha256="0dhlac5l68a3jps2hx0bc7qjj8hsr1ha137hcwxnrfdwnki6chlp"; depends=[pROC Rcpp]; }; 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="7.0"; sha256="0nc7nf1rcqfq4myhfmf0z07qy2damysc1xmfiy32wxjnjd7pqn7g"; depends=[deSolve HelpersMG numDeriv optimx]; }; + embryogrowth = derive2 { name="embryogrowth"; version="7.1"; sha256="0gm5ww7vwc6kcv6lzrca4f9a6nkilb79d5b4kidfhwrcbfrkdb2k"; 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.1.1"; sha256="1gbjx0pxfzkbp0csgq07iwqqww5lixpkvwn3k53na65gwx9afsq4"; depends=[boot FNN ggmap ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap reshape2 rgeos simFrame]; }; emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; @@ -5572,41 +5927,43 @@ in with self; { emil = derive2 { name="emil"; version="2.2.8"; sha256="02xjf8ipqr136y3pa375lwpg6h63yvbphhghs9jjxfl2r4fdkvcn"; 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]; }; + emmeans = derive2 { name="emmeans"; version="1.1.2"; sha256="12gkg2r7g1n481mvry354az5gzqji7rsl43jrmvq504sqyg4z41n"; depends=[coda estimability ggplot2 multcomp mvtnorm nlme plyr xtable]; }; emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; - emojifont = derive2 { name="emojifont"; version="0.5.0"; sha256="0vmfkhvf4icaq2wgf0wv331a1ay0driywln158977fzrd9z3h0q4"; depends=[ggplot2 proto showtext sysfonts]; }; + emojifont = derive2 { name="emojifont"; version="0.5.1"; sha256="0i4id9631ah5vzkzh6zfxgk55b2ppnbgabp1w2ivy29i0nji9wk4"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; emov = derive2 { name="emov"; version="0.1.1"; sha256="04w0bjyxvfb4ky573byp7j9b7x4gqycr5pgpnsl6rzag00zsf45a"; depends=[]; }; empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; }; emplik = derive2 { name="emplik"; version="1.0-3"; sha256="0b52383m2djdcg9b1a7r10k5pkzljz6dalvbg2gg962ckvpndb11"; depends=[quantreg]; }; emplik2 = derive2 { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; }; - ems = derive2 { name="ems"; version="0.3.1.6"; sha256="0swa1jxc52m695ankkn0kv9l012wh48ajy8n4yzssj4w8l4c4pyi"; depends=[]; }; + ems = derive2 { name="ems"; version="1.0.0"; sha256="1x6zsrf15xn865v8awbnq1cpaqp5j2k1pmis5a8mjnw568xi0hhw"; depends=[]; }; emuR = derive2 { name="emuR"; version="0.2.3"; sha256="04nxrg95qgwc5ss139bgjcsxkarwzkxy132dz0vk3sq7sddnagws"; 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.10.0"; sha256="09hzpmjbwg433b8ibrbvjzi8622cgfcq4rz194vq6qgknjr57z2j"; depends=[gdata MASS network sna stringr]; }; - encode = derive2 { name="encode"; version="0.3"; sha256="0s2xva9yadk0s9x6kiwmh6bbq79aa1zx4gb5d1m7nbp2z8x4z77i"; depends=[]; }; + enaR = derive2 { name="enaR"; version="3.0.0"; sha256="0sy7k8l6b8p34bcf9bpjr1y6qkjkvn77y2w2ws7ivcr1fynrhm5p"; depends=[gdata limSolve MASS network sna stringr]; }; + enc = derive2 { name="enc"; version="0.2.0"; sha256="0n4s3abxmpndppm18dcibap2n22xpjzafn5xjskfdfrz3wjfy1kb"; depends=[]; }; + encode = derive2 { name="encode"; version="0.3.3"; sha256="01jippva8gfbg3bq6g1sz8mpmglywg4mkb4k44bfspiv60bmv98f"; 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.6.0"; sha256="1j75sb2di2c092dilbjj5qsvb52h3zmm7wxflf9kg7xw227wq3zw"; depends=[coda]; }; endtoend = derive2 { name="endtoend"; version="1.0"; sha256="0x8f6h0mznmncqdwvsp2f0x524g5clgvk64qflf373lyn6h1v0ap"; depends=[]; }; energy = derive2 { name="energy"; version="1.7-2"; sha256="19c7bgjnm4ggf7w5mk64c5shkma3sa9wc8x117iqv7pk1bvvyy3p"; depends=[boot Rcpp]; }; energyr = derive2 { name="energyr"; version="0.1.1"; sha256="1mid5f8l6v55pjzfx304a303mkn9b5r3jzmjl2fi2pz4v2jsdw04"; depends=[RgoogleMaps]; }; + enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; }; 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.8"; sha256="1cgpwfv4xrnikkxxrswzvlzlr8dbwrx53wax3bdn14a3fivv1fgk"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; }; + enpls = derive2 { name="enpls"; version="5.9"; sha256="07id08k7pg2gvlyn8vnjprpr0gnggldg9am1h62s50dw54axixwd"; 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.4"; sha256="0fzj93zzs7a2qcwnw83iry6ybr3wnnnl4bpkpp6fczgmxrl0m0cw"; depends=[]; }; - ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.4"; sha256="14zq22h8nna7j403c1x9py90fwas8fg0vq3im2zh31dyrk1j8d7k"; depends=[chron]; }; - ensembleMOS = derive2 { name="ensembleMOS"; version="0.8"; sha256="01pv3nhns9n5fwcngsgjj10657mfg27isxbnhfq36y4cv5igk4jk"; depends=[chron ensembleBMA evd]; }; + enrichwith = derive2 { name="enrichwith"; version="0.1"; sha256="10x7p0s96hkalnnnwx2gczywblqxig9p4pllzk1ciyjjfidsc9va"; depends=[]; }; + ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; }; + ensembleEN = derive2 { name="ensembleEN"; version="1.1.2"; sha256="033i4bcnr62kmrp1fafdw6vx8ir38kqchgxp4fidg3i750nkjnda"; depends=[Rcpp RcppArmadillo]; }; + ensembleMOS = derive2 { name="ensembleMOS"; version="0.8.1"; sha256="1xbk3m4b619wni64i7wrccgp7gwaql2g6lg42lqwbsscdr3j0cls"; depends=[chron ensembleBMA evd]; }; ensembleR = derive2 { name="ensembleR"; version="0.1.0"; sha256="0xvq1jlsp7gsk46i847nfvadxwlh09gi2rgwss2wf2xmh1855ray"; depends=[caret]; }; ensemblepp = derive2 { name="ensemblepp"; version="0.1-0"; sha256="1b3rhg8mv1x3caz3xg84cwx8m88055n6yl36d9i4ws6vbj8vx68f"; depends=[]; }; ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; - entropart = derive2 { name="entropart"; version="1.4-7"; sha256="18h8jzan7q9wkz0awpzlypvz8xzq7ak0j21jy7nk02k64v7zkpch"; depends=[ade4 ape EntropyEstimation geiger vegan]; }; + entropart = derive2 { name="entropart"; version="1.5-3"; sha256="02jzcqb7sqg9fcf2vi4myki9mgdsx0jwyf535zzh124h1bwz3f3y"; depends=[ade4 ape EntropyEstimation geiger vegan]; }; entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; envDocument = derive2 { name="envDocument"; version="2.4.0"; sha256="0r7h9p0b0gr2l18mv1ydlamsc0iq474dfhp450mdfnw2q289mhrn"; depends=[]; }; - enveomics_R = derive2 { name="enveomics.R"; version="1.1.6"; sha256="115rqddy5llsncj5nbscan26lqr8x9fmyxxl3c8gpiyil8c266ja"; depends=[fitdistrplus investr modeest sn]; }; + enveomics_R = derive2 { name="enveomics.R"; version="1.2.0"; sha256="0bbm16k2i9lwm662hsglv3a5mf367bgxh25c87cvvfxafrbd67wj"; depends=[fitdistrplus investr modeest sn]; }; enviGCMS = derive2 { name="enviGCMS"; version="0.3.4"; sha256="1wjf1rxwzd590qsyljw1pd59kppx91m32p6nkdy4yvbnv39rk8dq"; depends=[BiocParallel genefilter limma mixtools qvalue rcdk RColorBrewer sva xcms]; }; enviPat = derive2 { name="enviPat"; version="2.2"; sha256="1cf1h4v05riivjwil4167sncdxzgxf3r4snx1imjb6s4msx67ibi"; depends=[]; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; }; @@ -5614,29 +5971,35 @@ 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.5.1"; sha256="19w4cckdhc8qjvncymznd9jnwj16gklpp2fb96x4rf9qnmh8zdvq"; depends=[]; }; + epanet2toolkit = derive2 { name="epanet2toolkit"; version="0.2.1"; sha256="18drz4pi2mqqwp2ji3a8k6mxh04n8yrwggf2p1k7bg3jchgh0kx3"; depends=[]; }; + epanetReader = derive2 { name="epanetReader"; version="0.6.2"; sha256="0xj56ykfrm7m2r0rr4abgv6ip40nc2j1byxhmi7m97b2q953akld"; depends=[]; }; epiDisplay = derive2 { name="epiDisplay"; version="3.2.2.0"; sha256="1f9kifjgdwxs7c236nsr369ij71rj7l5ady88h4n5p5pjw2h451a"; depends=[foreign MASS nnet survival]; }; - epiR = derive2 { name="epiR"; version="0.9-87"; sha256="1cxcm3x1r8dfjs5kp73nzlx6a684w075mb98jnyd5a8apwrh181p"; depends=[BiasedUrn survival]; }; + epiR = derive2 { name="epiR"; version="0.9-93"; sha256="1i0vi1dx5pjq4rcw8r9g7qkhrn4ra8lffrspzkrrjj12y97izmrg"; 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]; }; + epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; 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]; }; - episensr = derive2 { name="episensr"; version="0.9.1"; sha256="1sb0lq0rqk5n7l2d62z8832xzx7cf2f25b01bc3nf6v763yrh20g"; depends=[boot ggplot2 gridExtra plyr reshape trapezoid triangle]; }; + epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; }; + episensr = derive2 { name="episensr"; version="0.9.2"; sha256="1w1228q8q2ysi3xi3m8a9z0c7japj97dssjkzpjcrng094cy82is"; depends=[actuar boot ggplot2 gridExtra llogistic logitnorm plyr reshape trapezoid triangle]; }; episheet = derive2 { name="episheet"; version="0.2.0"; sha256="15c4xbam9b60xkkgmbswj4raln49hk43pxp2l75a7j1wykgkif95"; depends=[dplyr ggplot2 magrittr tidyr]; }; + episode = derive2 { name="episode"; version="1.0.0"; sha256="1djk36jkvr8xvhfddqg6xsmhxc3yrgivkm8g2hr4n1qixsk1ad8m"; depends=[glmnet Matrix nnls Rcpp RcppArmadillo]; }; 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-9"; sha256="1lnwygbwpw0b29sxiz3wry2wf6k7kcjlb4c8bj02gyaxq7rssnzk"; depends=[]; }; + epitab = derive2 { name="epitab"; version="0.2.1"; sha256="0q8fxxx7ddzaj8dxxlsh1a2gxf6byw5041mr7abac9yjjga2kz97"; depends=[kableExtra knitr MASS survival xml2]; }; + epitable = derive2 { name="epitable"; version="0.1.2"; sha256="1g0ab5bah7v52mzsyfxdv8azmpz66pipbc15q3vpvvhl3gjhsaik"; depends=[broom dplyr htmlTable magrittr purrr readr rlang stringr survival tidyr tidyverse]; }; + epitools = derive2 { name="epitools"; version="0.5-10"; sha256="1qqa2kam3j3mkbgk62g6lwygk2fkdlrpbi27wl37j4dkdkvx013m"; depends=[]; }; + epitrix = derive2 { name="epitrix"; version="0.1.2"; sha256="1fnmcpjbbk645s7q2jcccjv0q20z8hlzr8sl0jh6d00jrgk8qif4"; depends=[digest distcrete stringi]; }; 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.2-0"; sha256="0rivlyvvj09ahph22aq8b7xabvagjjvwb9h908zwddzhh2hljj3h"; depends=[httr XML]; }; + epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; }; + epxToR = derive2 { name="epxToR"; version="0.3-0"; sha256="0ckz7cvqsdilfkqap88brh4av9zv1fl3ijs4h4vlwwn7qvdcnhay"; depends=[httr XML]; }; eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; }; eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; }; - equSA = derive2 { name="equSA"; version="1.1.2"; sha256="13iva2iwliav3dd3cis0583d4z2ywwy7rnx73x7h0n0769rvnkg5"; depends=[huge igraph mvtnorm XMRF ZIM]; }; + equSA = derive2 { name="equSA"; version="1.1.5"; sha256="0sknx2p820i26m1d0ypz4ay5rm4j9i97nvcd3wxawqk72ypvbvw1"; depends=[huge igraph mvtnorm speedglm XMRF ZIM]; }; equaltestMI = derive2 { name="equaltestMI"; version="0.1.0"; sha256="1zqhgx1x6lqjwqisl3ydb6yqp3jn6x7dgnc57r93v73sjx2j5aiz"; depends=[lavaan]; }; equate = derive2 { name="equate"; version="2.0.6"; sha256="0fkgz4747wf2n1sfkskpbp20zdmxvykqhncr7a8wl5lp314r48x3"; depends=[]; }; - equateIRT = derive2 { name="equateIRT"; version="2.0-3"; sha256="10n296hs2x20lpqhzwjs1fsfyrdyv1xnns5drdl4qpyp32a3ayq7"; depends=[mirt statmod]; }; + equateIRT = derive2 { name="equateIRT"; version="2.0-4"; sha256="0j5dpgp4r5qisgw65yk7x9nwq7wxfppp0n0qqg734gqwjyfyp68b"; depends=[mirt statmod]; }; + equateMultiple = derive2 { name="equateMultiple"; version="0.0.0"; sha256="0q29bv8bb0c3sprhnkbbpn31phw37dwgk23v5ny4abzvlcgwncdb"; depends=[equateIRT numDeriv Rcpp RcppArmadillo 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]; }; @@ -5652,82 +6015,89 @@ in with self; { erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; }; erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; }; errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; }; + errorist = derive2 { name="errorist"; version="0.0.1"; sha256="1569yvncc9rdzchs7cvx44dhy8xf10g2hwkiy3kp68h47qghxlbd"; depends=[searcher]; }; 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.1.0"; sha256="0d9wa1wjyd69ym3har51ycggcs66y5z5qzv7r3r2ss7impsvghz3"; depends=[]; }; + errors = derive2 { name="errors"; version="0.2.0"; sha256="0l7yxshfc2ig7354r3vk35fsx2vyj09w7abwxakic93grvr09a71"; depends=[]; }; esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; }; esaddle = derive2 { name="esaddle"; version="0.0.3"; sha256="04imppwls6a485kdfwykk4s0pyxas3i92ccghi780ys29y0nggmy"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; }; - esc = derive2 { name="esc"; version="0.3.1"; sha256="0ihld8sklgr2waif3n8ca96x7z5zi1wi4ygf50x5n8h47p0hrj3v"; depends=[dplyr purrr readr sjmisc tibble]; }; + esc = derive2 { name="esc"; version="0.4.0"; sha256="07mgf1kdz6gjkmbsis24gjsppclaxlf7b03jpvasm1k4snfvgb5h"; 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]; }; - esmprep = derive2 { name="esmprep"; version="0.1.0"; sha256="0yv73czpvl6xdwwcxgssm6yw33lr3s27v4r67gcbslnidhcbq192"; depends=[lubridate]; }; + esmprep = derive2 { name="esmprep"; version="0.1.3"; sha256="0s5ij63v3v9hx1xnl8ygbnxbgik65yd8xn3irpbvc41mp9spgcdz"; depends=[lubridate]; }; esreg = derive2 { name="esreg"; version="0.3.1"; sha256="19ikfy0g8yd224ah4gyq2k29lz3gagc6vrcv53awvdadqw0cpz8l"; depends=[quantreg Rcpp RcppArmadillo]; }; + ess = derive2 { name="ess"; version="0.1.1"; sha256="1i94sfg8r9mnzcmyddq3zb56gwkgqdclyx90a5plpyy5insk13d7"; depends=[haven httr rvest stringr tibble xml2]; }; + essHist = derive2 { name="essHist"; version="1.0.1"; sha256="0xnf5cxc7x3chs508am9qhnavz89fim10ffkn8mp1b29jdw88aax"; depends=[Rcpp]; }; 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=[]; }; + estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; }; + estimatr = derive2 { name="estimatr"; version="0.4.0"; sha256="19k8b4rglz4b7r12x8da6wzrkd0j40dp1zxzdwj6pfw3fhpacl2i"; depends=[Rcpp RcppEigen]; }; estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; estprod = derive2 { name="estprod"; version="0.0.1"; sha256="0nd2iz1gqinvppyxgxsdh9m26v46h2ra3cc4nqz6dqnqkslzrl4k"; depends=[boot Formula lazyeval minpack_lm]; }; + estudy2 = derive2 { name="estudy2"; version="0.8.4"; sha256="190wxdy1qsf8fgpbp2cr0blwa97vgmdw83pmfk9i44zkpm4nrij1"; depends=[matrixStats Rcpp tseries zoo]; }; esvis = derive2 { name="esvis"; version="0.1.0"; sha256="19avayz2igw8sjc2743a9c3ikyrf18d42czadd98gdn8ny53vr6b"; depends=[sfsmisc]; }; etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; }; etasFLP = derive2 { name="etasFLP"; version="1.4.0"; sha256="04d526yajakzivlcsz8631p0j482cbbgfpdmzkc9zr1m4495xxif"; depends=[fields mapdata maps rgl]; }; - etl = derive2 { name="etl"; version="0.3.6"; sha256="1kgbds0whnn80lh9bgai3r2rlxn6rq8fbm63jk2y3yvm582yas2n"; depends=[DBI downloader dplyr lubridate readr stringr]; }; + ether = derive2 { name="ether"; version="0.1.4"; sha256="1q6qxda5iw8zj7gy9h35apij5mbndd969ddip7zn5d720131kqra"; depends=[dplyr httr jsonlite Rmpfr]; }; + etl = derive2 { name="etl"; version="0.3.7"; sha256="045hkh95ki3s10l9mz4710ws2i9and4rqb0qk1c5sfslglc0riq5"; depends=[DBI downloader dplyr lubridate readr rlang rvest stringr tibble xml2]; }; etm = derive2 { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[lattice survival]; }; etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; }; 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="2.0.0"; sha256="16hnplwpv38zk22y1d503hcdq406ry6x11kq4i9dsrlvw9l64j80"; depends=[assertthat lattice Rcpp RcppArmadillo]; }; - europepmc = derive2 { name="europepmc"; version="0.1.4"; sha256="0kh61jmr2y0wjqch0jzk594anpwq56x9lhx6sx54y2pqjqw68b0i"; depends=[dplyr httr jsonlite plyr urltools xml2]; }; + eulerr = derive2 { name="eulerr"; version="4.0.0"; sha256="1zjqzlr67qihvh7v66rggz8khf6f11wqw2cvxjvg07qmh3xk7sf5"; depends=[lattice polyclip Rcpp RcppArmadillo RcppDE]; }; + europepmc = derive2 { name="europepmc"; version="0.2"; sha256="1kh1mma21jjwlwxq2h3l5klzlgy98zsryhs1si9z5cfx48lszxdb"; depends=[dplyr httr jsonlite plyr progress urltools xml2]; }; europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; }; eurostat = derive2 { name="eurostat"; version="3.1.5"; sha256="128rlkkxdpl95wjxnrw8yzxpc6sml0vaghnaz0ra90ak1s43ndda"; 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.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]; }; + evaluator = derive2 { name="evaluator"; version="0.1.1"; sha256="19ria8y1bc8cvn1sb28p5zbkgs73m20i4c9v26byhd0rn9gjpm2f"; depends=[dplyr extrafont ggplot2 mc2d purrr purrrlyr readr readxl scales stringi tibble tidyr viridis]; }; evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; }; evclust = derive2 { name="evclust"; version="1.0.3"; sha256="0cd0a8w0ixd9ilcqlxiaql4l2r49qrqnllb9qpg3xgnlxka3yb5m"; depends=[FNN limSolve Matrix R_utils]; }; 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.1"; sha256="1vabawwb41v3gs7x3s1w8nll02h544xbsr21c2wbdx9h304rs54m"; depends=[]; }; + eventdataR = derive2 { name="eventdataR"; version="0.1.2"; sha256="0f0w5cir3hc01ag9l69y27cfp6bgh1ikk4n99z7pb16373ficjjw"; depends=[]; }; events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstudies = derive2 { name="eventstudies"; version="1.2"; sha256="0z449j7yrd6j6hhacz6f048ibilib6m97684cz2wc4pqq2wlj8hg"; depends=[boot sandwich testthat xts zoo]; }; + evidence = derive2 { name="evidence"; version="0.8.8"; sha256="1bfdwl41yqvhc3jg0xddwaw7h0s7qa4xfz2i94jh6wa247r51gwf"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; }; evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; }; evir = derive2 { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; }; - evmix = derive2 { name="evmix"; version="2.7"; sha256="0x3m4lwpwcavr950q66p7bkimshnvav4842dr505g5rc9vkw9xxg"; depends=[gsl MASS SparseM]; }; + evmix = derive2 { name="evmix"; version="2.9"; sha256="1w1mm858515hnjpq2yjj0x05skyprhnvbpyif4mdcm24blyb81di"; 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.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-5"; sha256="06afqr0gsyh80f2j56vl4cbjsz5gpywri87ykfmf1wxls7jqxqac"; depends=[partykit]; }; + evtree = derive2 { name="evtree"; version="1.0-6"; sha256="0nvk78haghvp6vw6936di0bd5gfv603nxzgw3i647i68291wav0f"; depends=[partykit]; }; + ewoc = derive2 { name="ewoc"; version="0.2.0"; sha256="0kanx14fhcbqz6gpyj7628vgy9fwz3ji5mkd4107b8pgpz2hkg00"; depends=[coda doParallel foreach Formula ggplot2 rjags]; }; exCon = derive2 { name="exCon"; version="0.2.5"; sha256="0gqnv01dw4ncf3x3p74pc6f14a1ixq7icl2p18hsmvxdqqg7kgy7"; depends=[jsonlite]; }; - exact2x2 = derive2 { name="exact2x2"; version="1.5.2"; sha256="12m3kaxdrf4bsw7lrylk15nimhy4sgmjbnlqm684y2kyvii9yrg0"; depends=[exactci ssanv]; }; + exact2x2 = derive2 { name="exact2x2"; version="1.6.2"; sha256="172g6ahgd7j42bjidp6svjl70ws3bz58vb8vxgnalii6awcizkcm"; 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]; }; + exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; - exampletestr = derive2 { name="exampletestr"; version="1.0.1"; sha256="0352rv81isk820srwfpz7bf3349fpbygbq06lmjz8qgjvdfl1r4i"; depends=[devtools filesstrings formatR magrittr purrr roxygen2 stringr]; }; + exampletestr = derive2 { name="exampletestr"; version="1.2.0"; sha256="05p819a6s6anxjqvs10df9kcfdg7lkg1205iw635db9g6biplrb7"; depends=[checkmate devtools filesstrings magrittr purrr readr roxygen2 stringr styler]; }; exams = derive2 { name="exams"; version="2.3-0"; sha256="0y21cx6knx253gka1bib8z0jmyndl4k7c2d8hfh3rwn5bdqyqj53"; depends=[]; }; - excerptr = derive2 { name="excerptr"; version="1.3.1"; sha256="0z1qgivk4plfap9j1fllx6wdj6z4nyblgj0rqjvgalk1sjk9b5zl"; depends=[git2r rprojroot rPython]; }; - excursions = derive2 { name="excursions"; version="2.2.2"; sha256="1f6vvv33205lj6hsmmhx3q82mkhh0shzyk5hrwzf2nh1cn61w1x0"; depends=[Matrix sp]; }; + excerptr = derive2 { name="excerptr"; version="1.4.0"; sha256="0z69lqfdm2dh9z6rqhfnj6f4b2p6sgmlvcxasg49wd0qasx86ph6"; depends=[git2r rprojroot rPython]; }; + excursions = derive2 { name="excursions"; version="2.3.2"; sha256="1fh04kkv9nj7wxrklpapsfh0xi8k5hfaa1f4dvnz2wxvzz3iz5nb"; 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]; }; + exifr = derive2 { name="exifr"; version="0.2.1"; sha256="0969ip7vwhs3r9zwy5l1gqg886yl4gfw8ss2frnq9nmqpn1ib1v2"; depends=[curl dplyr jsonlite purrr tibble]; }; 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="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]; }; + expands = derive2 { name="expands"; version="2.1.0"; sha256="0870jbjk2yzddvs57fdnl4psy55r6rjdbs7w7jc7s3vrzdsziwxa"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; }; + experiment = derive2 { name="experiment"; version="1.1-2"; sha256="1wswfxfk3b5gvdxb6i3mzx66i1qszvb9alfwhv95y0dr5q6vss1w"; depends=[boot MASS]; }; expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; }; 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]; }; + explor = derive2 { name="explor"; version="0.3.3"; sha256="1b3swb7ikp2ik3300ljg2rll5gka4l4lfg95bqbgap3ph4dclv7y"; depends=[dplyr DT ggplot2 highr scatterD3 shiny tidyr]; }; exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; }; expm = derive2 { name="expm"; version="0.999-2"; sha256="1mihl67kvv1xv0figp25jkmwfn4iwkcx15cng2348y8gm6zybw9q"; depends=[Matrix]; }; expoRkit = derive2 { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; }; 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]; }; + exprso = derive2 { name="exprso"; version="0.2.7"; sha256="0s8vf1rn7mwsiypd3k8diki5brlx95rzsqikprg9j9difv03f976"; depends=[cluster e1071 kernlab lattice MASS nnet plyr randomForest ROCR sampling]; }; expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; }; - expss = derive2 { name="expss"; version="0.8.2"; sha256="1jsfpvxji8rwvp64x42nvkn9n4gbx36fvzbnbzbnk9jgxvkhs1zv"; depends=[data_table DT foreign htmlTable htmltools magrittr matrixStats]; }; + expss = derive2 { name="expss"; version="0.8.6"; sha256="0yzbgmqblbxk494yhrs3mnr2jgsxvybamdbwc5w2w389baa78wny"; depends=[data_table foreign htmlTable 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]; }; @@ -5738,18 +6108,18 @@ 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.7"; sha256="1r90q14snx6h665qkij1lza2bs87iw61y6waabdzw6p3cqgg4pds"; depends=[Rcpp]; }; + extraDistr = derive2 { name="extraDistr"; version="1.8.8"; sha256="0ywn4qwnamv36l1hw27l9y5kh3v6ha5781wsv2bz6szqjgg7kdb3"; 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.2"; sha256="1mkmb3rz0v2wm5m323xqaic628jv6xnlrx4cm2dpgsxj2mkznmg7"; depends=[]; }; + extremeStat = derive2 { name="extremeStat"; version="1.4.0"; sha256="0fvkvlm47ri05w9h5qa937ijsc5lg51jc825wq9pmn7aiv58yxzm"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; }; + extremefit = derive2 { name="extremefit"; version="0.2.3"; sha256="1m2960qbs2qha4975sq5awsvlk10s1mgb3cm91fyrm6lh50plv5m"; 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]; }; eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; }; - eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.6"; sha256="0azfakn5kh80bvywqf52wy3c0q5k13zcasniggjf273f5z1415pn"; depends=[broom dplyr ggplot2 lazyeval tidyr zoo]; }; + eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.7"; sha256="1an39l4bkbw7s75y1pjgdwhixshdaawpy4kwyaqk7jkhhy7nl1nh"; depends=[broom dplyr ggplot2 lazyeval purrr tidyr zoo]; }; ez = derive2 { name="ez"; version="4.4-0"; sha256="0a58s94x576dfz7wcbivrr2hmdh5x1vy16zwkqp9fmdzqx38pagq"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; }; ezec = derive2 { name="ezec"; version="1.0.1"; sha256="0lpx55a8fhy6fqdv3zvzx9mh75q34r71v5kp96hkm9jzl4yvrpd2"; depends=[dplyr drc]; }; ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; }; @@ -5757,31 +6127,37 @@ in with self; { ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; }; ezsummary = derive2 { name="ezsummary"; version="0.2.1"; sha256="16rwg1h7gs7mnkmbwfb273fy1pwdq9ng6l4ad00anpmilqcck5ng"; depends=[dplyr tidyr]; }; fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; }; - fAssets = derive2 { name="fAssets"; version="3011.83"; sha256="0i3phc8kxwhzf6010bv5k2ff5zlv7aqrwavqmhly4wwby73i39yl"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; }; - fBasics = derive2 { name="fBasics"; version="3011.87"; sha256="1x4jv4db0nr2fig6hglk0kv6j27ngkc8qzclgiklbl8wjfrrp9zh"; depends=[gss MASS stabledist timeDate timeSeries]; }; - fBonds = derive2 { name="fBonds"; version="3010.77"; sha256="00rc3i0iyqcpsqvc036csa1c8gxwcnniwj3l2irmcalx4p8650w0"; depends=[fBasics timeDate timeSeries]; }; + fArma = derive2 { name="fArma"; version="3042.81"; sha256="1m27lkw17g6mmrc52y0labif8gdyacvw2lgdmwnb01vyrkghqy20"; depends=[fBasics timeDate timeSeries]; }; + fAsianOptions = derive2 { name="fAsianOptions"; version="3042.82"; sha256="13p1r93rgnf03wj0kkfpw4w4dlzd1ypkam50xqpjfm38qm4zvkds"; depends=[fBasics fOptions timeDate timeSeries]; }; + fAssets = derive2 { name="fAssets"; version="3042.84"; sha256="0aj3gjd54ajviikwh075bympw7dx2dcsgj5p8j96vx2qbbwjmgvb"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; }; + fBasics = derive2 { name="fBasics"; version="3042.89"; sha256="0x6s6js52sz0rv3y66ax1bkf4mn9ihjmkyrm5clf7ymw5hvd5f5q"; depends=[gss MASS spatial stabledist timeDate timeSeries]; }; + fBonds = derive2 { name="fBonds"; version="3042.78"; sha256="1yb5vyqj66m82xks5qi5cnsppylpprbk656z4lxzg30873hi8pcf"; depends=[fBasics timeDate timeSeries]; }; fCertificates = derive2 { name="fCertificates"; version="0.5-4"; sha256="1a49gkzvb83lqqw65lxlaszpicn663hwi9wrbsb3f6z7znylkzaf"; depends=[fBasics fExoticOptions fOptions]; }; fChange = derive2 { name="fChange"; version="0.1.0"; sha256="1pj4q9dsqqgv198kfv410qkpgynhd580bcsigmak598m5jx3rf7l"; depends=[fda lattice reshape2 sandwich sde]; }; - fCopulae = derive2 { name="fCopulae"; version="3011.81"; sha256="0r4g567icgiiz6cxi6ak3kzrav9qzsc6zvww5dj1pd8mkd4r1f0y"; depends=[fBasics fMultivar timeDate timeSeries]; }; - fDMA = derive2 { name="fDMA"; version="2.0"; sha256="06917d985gzjn7hv72gdz6ygxfqp98bsvdr48qfxv6n8822r5k7h"; depends=[doParallel foreach forecast gplots iterators MSwM png tseries xts zoo]; }; - fExoticOptions = derive2 { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[fBasics fOptions timeDate timeSeries]; }; + fCopulae = derive2 { name="fCopulae"; version="3042.82"; sha256="10wknqrrs5j63v7qnp5qmk85688r36vli4r99i49y2i2nv10yp5r"; depends=[fBasics fMultivar timeDate timeSeries]; }; + fDMA = derive2 { name="fDMA"; version="2.2.3"; sha256="17c9qm32pmbn236ynkkk0z4fdfyij3h1kx7y2i9x3m5q1z7dzwb4"; depends=[doParallel foreach forecast gplots iterators MSwM png psych Rcpp RcppArmadillo tseries xts zoo]; }; + fExoticOptions = derive2 { name="fExoticOptions"; version="3042.80"; sha256="1b3y7j5ywic6xhsj2afq6y5f5l0npgav854rb87938rjckz95d4h"; depends=[fBasics fOptions timeDate timeSeries]; }; fExpressCertificates = derive2 { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[fCertificates Matrix mvtnorm tmvtnorm]; }; - fExtremes = derive2 { name="fExtremes"; version="3010.81"; sha256="0bzgnn0wf7lqhj7b2dbbhi61s8fi2kmi87gg9hzqqi6p7krnz1n5"; depends=[fBasics fGarch fTrading timeDate timeSeries]; }; - fGarch = derive2 { name="fGarch"; version="3010.82.1"; sha256="0n5mzqc7lj7h63rf4nw4w3mics02gaf049c7m3bjfbp5cwwnf9pf"; depends=[fBasics timeDate timeSeries]; }; + fExtremes = derive2 { name="fExtremes"; version="3042.82"; sha256="1n0afql4csgsqf7j9x2v8yxncvpknms643l9knm0fqb4pdbaw58c"; depends=[fBasics fGarch timeDate timeSeries]; }; + fGarch = derive2 { name="fGarch"; version="3042.83"; sha256="14cj9i1850vnas5vqsfcc3l5dzjsli97k3dsz97j0k89jwzhq1s6"; depends=[fastICA fBasics Matrix timeDate timeSeries]; }; fICA = derive2 { name="fICA"; version="1.1-0"; sha256="0lfs31clax57qsrriq9wxjrjv2bckl7lf1csffzfwiqm6sp6mgxg"; depends=[JADE Rcpp RcppArmadillo]; }; - fImport = derive2 { name="fImport"; version="3000.82"; sha256="07yqppl8sbfa0x9k4n7hh6hcgyxpcvlk74hhylib4nzqm70bn0sq"; depends=[timeDate timeSeries]; }; - fMultivar = derive2 { name="fMultivar"; version="3011.78"; sha256="115hqbbxsdjs5v2rhalg8vz0m5lyg8ppjjqmbq1x21jdnbg6l0fl"; depends=[cubature fBasics mvtnorm sn timeDate timeSeries]; }; - fNonlinear = derive2 { name="fNonlinear"; version="3010.78"; sha256="0pmz16b606i3mx05zjln4nyl53ks7rlwgm45ldr9qgmw51pflwz9"; depends=[fBasics fGarch timeDate timeSeries]; }; - fOptions = derive2 { name="fOptions"; version="3022.85"; sha256="1v99j9kl4fcfg3l3149ss9dx1sg9fi2887qjd2aazpphmi7zk0pv"; depends=[fBasics timeDate timeSeries]; }; - fPortfolio = derive2 { name="fPortfolio"; version="3011.81"; sha256="1rmyp2dv1jgrfj76mnggvi98ffa0yr8d9dlxxmg5pc6pdy2g4q4c"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp Rsymphony slam timeDate timeSeries]; }; - fRegression = derive2 { name="fRegression"; version="3011.81"; sha256="1qyacwwa2mjq9szwwwfdnny4np68bj1j4bvfkywl7q7x44p4n5b4"; depends=[fBasics lmtest mgcv nnet polspline timeDate timeSeries]; }; + fImport = derive2 { name="fImport"; version="3042.85"; sha256="0rm4mwhk5ial016vl6dny8s87gd5i9p04akdyg2fndpcqwfmb5lc"; depends=[timeDate timeSeries]; }; + fMultivar = derive2 { name="fMultivar"; version="3042.80"; sha256="0d9ijyjqqnzvy04ncx4vqd38gvgprrnzwiy5mn61wj9a4zsfgnbc"; depends=[cubature fBasics mvtnorm sn timeDate timeSeries]; }; + fNonlinear = derive2 { name="fNonlinear"; version="3042.79"; sha256="0kwjs7xx4ykw14mw3pff2axrq497jl4g23gbayswb8vrx1qhjibd"; depends=[fBasics timeDate timeSeries]; }; + fOptions = derive2 { name="fOptions"; version="3042.86"; sha256="1cqyggb1hb7z0gfgkziynz7nm85z0fn3bvz1iwpy49yy8ll7rfzr"; depends=[fBasics timeDate timeSeries]; }; + fPortfolio = derive2 { name="fPortfolio"; version="3042.83"; sha256="05dprxn0h2cd13m84rb1s5n8nr9m4v4dslqmm99481rp66kgc004"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp slam timeDate timeSeries]; }; + fRegression = derive2 { name="fRegression"; version="3042.82"; sha256="0pi777xfk101g0r2qpcd0qxqqfnvck3sii990d946ljw6366mamc"; 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]; }; + fTrading = derive2 { name="fTrading"; version="3042.79"; sha256="0xnfg4npfdrvmp1n6vbsm7if16n5j83b7y1i2m5b34cqnlz9d69y"; depends=[fBasics timeDate timeSeries]; }; + fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; }; fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; }; - face = derive2 { name="face"; version="0.1-3"; sha256="0l4sp79p72n6iqbgi5aqif1669rwx3pka7l91d8dsw7x60bhikxj"; depends=[Matrix matrixcalc mgcv]; }; + fabricatr = derive2 { name="fabricatr"; version="0.2.0"; sha256="1jgfxifp7v80bddcs5zi5zidzhnzmsbvfa7qznaxyp3qknax2k67"; depends=[rlang]; }; + face = derive2 { name="face"; version="0.1-4"; sha256="0kkgblxzhjzifxnym6g5psiwvfgydk1scqbxraldklm8c4a12zc3"; depends=[Matrix matrixcalc mgcv refund]; }; facebook_S4 = derive2 { name="facebook.S4"; version="1.1.0"; sha256="1if3fgyvj6pbf48yjwa5fkn3s4rl6kj9s1nk6dwphykhx72ghzrj"; depends=[httr magrittr plyr rjson]; }; + facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; }; factoextra = derive2 { name="factoextra"; version="1.0.5"; sha256="1l6m8k7qhdw8ndar8nhmym0lfyd1i2iszl1cicjax0vq23ss6xw1"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; - factorMerger = derive2 { name="factorMerger"; version="0.3.1"; sha256="0fipm9b7xynzljbrhgv8qh47ik13y937jry0zms3rpmmxw8a16dy"; depends=[agricolae colorRamps dplyr forcats ggplot2 gridExtra knitr magrittr MASS mvtnorm proxy reshape2 scales survival survminer]; }; + factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; }; + factorMerger = derive2 { name="factorMerger"; version="0.3.5"; sha256="0j5bjn8jmmdxr88aiw3i46frphkn4s5a54iqz6hcqq70cgg91cj4"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; }; 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]; }; @@ -5790,9 +6166,11 @@ in with self; { fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; }; faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; }; fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; }; + fakemake = derive2 { name="fakemake"; version="1.2.0"; sha256="1acd404fl0bc6xsal39vgx4j5jdqa24csn15cmw26yach7dxrm87"; depends=[callr igraph MakefileR withr]; }; 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]; }; + famSKATRC = derive2 { name="famSKATRC"; version="1.1.0"; sha256="1xbh0by4sjxrmy00v1svcj3lb98p9krpncbhpjbli1jd2p47yk60"; depends=[bdsmatrix CompQuadForm coxme kinship2]; }; 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=[]; }; @@ -5806,14 +6184,14 @@ in with self; { fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; 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.2"; sha256="15c5rkz4d7ghmm052ybd4l0gbbyr0wrihal4fi5y6cvss1jja7gq"; depends=[data_table]; }; + fastDummies = derive2 { name="fastDummies"; version="1.1.0"; sha256="0ns1279sxfiv5ll4faag36ldc5v40l48li36kqr1bb09s3sx9p9w"; depends=[data_table tibble]; }; 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]; }; fastICA = derive2 { name="fastICA"; version="1.2-1"; sha256="108z2ymby5y4h8l4l2krqwm28rya93gq09yylgilnm3afvfrfabg"; depends=[]; }; fastJT = derive2 { name="fastJT"; version="1.0.4"; sha256="1pa4qpcf4qmzk6s8qgk60n5ialz8gcj5m8d7xr10cmn4jfwghc7b"; depends=[Rcpp]; }; - fastLink = derive2 { name="fastLink"; version="0.2.0"; sha256="1n8yzwlcvj1bcdzxvlprh5q3wk2mbw7jpc40bjc5mpgrx0vpf95c"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; }; - fastM = derive2 { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp RcppArmadillo]; }; + fastLink = derive2 { name="fastLink"; version="0.3.1"; sha256="0d77z88vv8gw1hp3cpnx481yn7p5y4nq3qzsv63bifad0msnqixy"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; }; + fastM = derive2 { name="fastM"; version="0.0-3"; sha256="1gyrkci6iv7j4aymy2qlwjshmigiff5x7kqjsh1yjzd43jg9ij86"; depends=[Rcpp RcppArmadillo]; }; fastR = derive2 { name="fastR"; version="0.10.3"; sha256="1sz6krxiamq3rp4h9ah2b1zvyyrlvsn7lpvrjv1xda2c1kqqkvmk"; depends=[lattice mosaic mosaicCalc mosaicData]; }; fastR2 = derive2 { name="fastR2"; version="0.2.0"; sha256="1xwa4v0j2n0qxn1prhc9x0sz53fhsfbg2m1a6kfdp7cpvvk46pw5"; depends=[dplyr ggformula ggplot2 lattice magrittr maxLik miscTools mosaic numDeriv]; }; fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; }; @@ -5824,37 +6202,39 @@ in with self; { fastcox = derive2 { name="fastcox"; version="1.1.3"; sha256="0jn19v6mkwgyz8x63xrfgkgnf0f2rq338r5qkhz690mdzr4c47a3"; depends=[Matrix]; }; fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; }; fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; }; + fastmaRching = derive2 { name="fastmaRching"; version="1.0.0"; sha256="17z5frf5c50y4387l4vbwwbm8z1wn0yyr7kp044s4q8bp1k2pqv3"; depends=[raster rgdal sp]; }; fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; }; - fastnet = derive2 { name="fastnet"; version="0.1.3"; sha256="06nxfwv85gm93bcgq53a6z929sqcij0adkg55g5y03hcm8v8v3aa"; depends=[doParallel foreach igraph]; }; + fastnet = derive2 { name="fastnet"; version="0.1.4"; sha256="0hc18yc2cmvb5v8vjj1xvnciz35hyfp9iyqhkg9jfjrlf89icny6"; depends=[doParallel foreach igraph tidygraph]; }; 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]; }; - fastrtext = derive2 { name="fastrtext"; version="0.2.1"; sha256="06r8bqkc415n1ycq8nqpffq5wp053s2yz50v2k5sbg36laqyschi"; depends=[assertthat Rcpp]; }; + fastrtext = derive2 { name="fastrtext"; version="0.2.5"; sha256="0zbd2sxzarxic90d2pkbn7fak5gyb81b180m91f784smb3sx1p1j"; depends=[assertthat Rcpp]; }; 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]; }; + fauxpas = derive2 { name="fauxpas"; version="0.2.0"; sha256="0l77gxcf06p984z9vgaf1kag609h9qyrgav84lxkv97h6f3fflnc"; depends=[httpcode R6 whisker]; }; favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; }; fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; }; fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; - fbar = derive2 { name="fbar"; version="0.1.23"; sha256="1s23wiwyi9fj99zz8m8lhfz91cr8cnl92gb5wl2im691jvhvsr3s"; depends=[assertthat dplyr magrittr Matrix purrr ROI stringr tibble tidyr]; }; + fbar = derive2 { name="fbar"; version="0.3.4"; sha256="0nsw7axdgmkbmn87wxg3adyy060vrqqbr0s2hfdh54fj58i6nq71"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; }; fbati = derive2 { name="fbati"; version="1.0-1.1"; sha256="18k8a1m2znzzwmm25dbqnqzwbjxqz4rbjaw3z9affky7lzqgbg6l"; depends=[fgui pbatR rootSolve]; }; fbroc = derive2 { name="fbroc"; version="0.4.0"; sha256="0bxi027iqqn50mn5nrlgx3z4qdlfkrq88s0dqyaxdl8rsrwp3d2w"; depends=[ggplot2 Rcpp]; }; fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; }; fclust = derive2 { name="fclust"; version="1.1.2"; sha256="08gi7w74215r44qbysg233s5n8r905b66gsi4i66xf5r7zgaqsm0"; depends=[]; }; fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; }; - fcros = derive2 { name="fcros"; version="1.5.4"; sha256="112mgs69p3642rfk1w3dkkyn72icvda0asllanmgjym1lrzdp0lj"; depends=[]; }; + fcros = derive2 { name="fcros"; version="1.5.5"; sha256="1kyrilm6g0nqgba3bf4vbvcgcfj8044n6jfysbrvvlhwypkzqa0q"; depends=[]; }; fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; }; fdANOVA = derive2 { name="fdANOVA"; version="0.1.0"; sha256="10c12yns1sv4ph61hma1mymab03xyyx933f27977lw3c0npy7b02"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; }; fda = derive2 { name="fda"; version="2.4.7"; sha256="0371c32kxxvfdh18ldgc2p76dr2436ay0n9prdjwm9v0azp4rp9k"; depends=[Matrix]; }; - fda_usc = derive2 { name="fda.usc"; version="1.3.0"; sha256="1ask7g6mqwx8r1hd9vxzdl96z0gyqprswjpfcl7l5l3611m7mzdm"; depends=[fda MASS mgcv nlme rpart]; }; + fda_usc = derive2 { name="fda.usc"; version="1.4.0"; sha256="0gp19c5lxp0g4690vdr0gpw89rl9v3l6872mf7hr8nsyyd6776vn"; depends=[fda MASS mgcv nlme rpart]; }; 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]; }; + fdadensity = derive2 { name="fdadensity"; version="0.1.1"; sha256="0jj5gprv3ihdjic261czqnv7c13mxsmjmv7gn2gv4483kgijlkz9"; depends=[fdapace Rcpp]; }; fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; }; - fdapace = derive2 { name="fdapace"; version="0.3.0"; sha256="1r4s20spsiags7z8hyvbvi9gxjxs4v8hfnrqya872shagk9iadyl"; depends=[Hmisc Matrix numDeriv pracma Rcpp RcppEigen]; }; - fdasrvf = derive2 { name="fdasrvf"; version="1.8.2"; sha256="10j2zh0jfxi46vf2cf9k561ff3qy6vhp1hj1q2zwvpbxaa1lyjb3"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo viridisLite]; }; + fdapace = derive2 { name="fdapace"; version="0.4.0"; sha256="09qwl1bkcrfaxk0938v0ddd8aiyf0vi6619rpsg7f82rbc5i73mp"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; }; + fdasrvf = derive2 { name="fdasrvf"; version="1.8.3"; sha256="1lqyadg17ddd3vksbaxc7bpwvk0afsd59rfg0n5wrgvhbd473s0y"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat 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]; }; + fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; }; fdq = derive2 { name="fdq"; version="0.2"; sha256="1iyplxm6niywfhmdnliy9nvvax1w6sijar8gpsj853cdfvn6kz5m"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; }; - fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.1"; sha256="0vhm40q63sknzh7ax4mhv41vpg2pn4cinsln6wfk3q4nqkn7bd45"; depends=[discreteMTP MCMCpack]; }; + fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.3"; sha256="17nzqy4i1c5kcqyps52827q5apyjn4znb1ql4qvfm8v2m1fvily3"; depends=[MCMCpack qvalue]; }; fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; }; fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; }; fds = derive2 { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; }; @@ -5863,9 +6243,11 @@ in with self; { 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=[]; }; + febr = derive2 { name="febr"; version="1.0-0"; sha256="0c0kgj31n2z2qqbga9waqrrm6xxksi27c6riyp1c57z4wjais860"; depends=[cellranger dplyr glue googlesheets knitr pedometrics readr sp stringr xlsx]; }; fecR = derive2 { name="fecR"; version="0.0.2"; sha256="1p4166cxajapm158aqbz9p7m8c8dqga1infl6y6wazjnayaib3cb"; 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]; }; + fedreporter = derive2 { name="fedreporter"; version="0.2.1"; sha256="18hs358iyxmbh28jy9f65zvanpr6bk4gq75qbj255y1zzdsjr9x1"; depends=[httr jsonlite]; }; feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; }; fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; }; fergm = derive2 { name="fergm"; version="0.2.1"; sha256="14asdvr98nh6rayqff9xda54w95bjg4g2f72a21rhyc932d7589g"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan statnet stringr]; }; @@ -5881,80 +6263,94 @@ in with self; { fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; }; fgui = derive2 { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; }; - fields = derive2 { name="fields"; version="9.0"; sha256="0fjk1gcgmmra38f574smv2grk3vkd81gldic85liaws1nqvb0z4w"; depends=[maps spam]; }; - fiery = derive2 { name="fiery"; version="1.0.0"; sha256="1hhh9wbhhzjns24khfdvryg0npabq702j65x1z75pl2jyfcyj7hb"; depends=[assertthat desc future httpuv later R6 reqres stringi uuid]; }; + fields = derive2 { name="fields"; version="9.6"; sha256="1v7z48a8jmdcil28rj8c3455k6rssr5v9qi6dyhhpbb193bj8121"; depends=[maps spam]; }; + fiery = derive2 { name="fiery"; version="1.1.0"; sha256="0251vfr7b8r4xjgcf8gyh1ddj0lj73fl0pim0k3vpzva5wmwigs1"; depends=[assertthat crayon desc future glue httpuv later R6 reqres stringi uuid]; }; fifer = derive2 { name="fifer"; version="1.1"; sha256="1gcv8ns4c1y3pjmixdm16raa5h6jqmc3i4m37ahj97l720j1f2ya"; depends=[fields Hmisc MASS party plotrix randomForest randomForestSRC rpart xtable]; }; fiftystater = derive2 { name="fiftystater"; version="1.0.1"; sha256="1nri9vsqif03xrmm3g5llasqm49hj169mgv046f2l0mh9vp0fqpc"; depends=[]; }; filehash = derive2 { name="filehash"; version="2.4-1"; sha256="1x7an7rsy5pz2qr86m511rsv297vacxwk3y1a71754yq739qgq6h"; depends=[]; }; 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=[]; }; + filelock = derive2 { name="filelock"; version="1.0.1"; sha256="11mmq296zg62gnxjk7dyr866kihihmsjpfg6bcc7hv6ivh4812nn"; depends=[]; }; + filematrix = derive2 { name="filematrix"; version="1.3"; sha256="1v3aj1ng742msb0sfdnjsbqb508mqjf8jlq2v33vxldhradw5w0b"; depends=[]; }; + filenamer = derive2 { name="filenamer"; version="0.2.2"; sha256="0289qpy4891fb71fa4bhc8wp4g7n1sw1kis5k5irdyyzmsa9dfhn"; 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="1.1.0"; sha256="0nyrmc3lhr4dx5ga90mra3jchi6i64vvm68m503lxiiix9s8ii9s"; depends=[magrittr matrixStats ore Rcpp readr stringr tibble]; }; + filesstrings = derive2 { name="filesstrings"; version="2.1.0"; sha256="1ik6m0ks6k1fhmpd3fk9z4mav3f8hs7si84vjcg8jk37xxqhfnd8"; depends=[checkmate magrittr matrixStats ore purrr Rcpp stringr tibble]; }; + filling = derive2 { name="filling"; version="0.1.0"; sha256="0avlfl06nd8wn76ydii09ng2fqp92d4n9v2y5vg16m3my58l0srd"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; financial = derive2 { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; }; - finch = derive2 { name="finch"; version="0.1.0"; sha256="0pqli6l049s9pdk0gphch1pw8i0f1fr3562akms1x7hvdkn9c0i9"; depends=[data_table digest EML plyr rappdirs xml2]; }; - findpython = derive2 { name="findpython"; version="1.0.2"; sha256="1x38dbxr6yvxy2z2fvv00y263g66ljbzf3a8znl2fywj462i92xk"; depends=[]; }; + finch = derive2 { name="finch"; version="0.2.0"; sha256="1vganbkz2d96xfz2jf1q0kqarc575w3nswss2igynsbbd0y53mjm"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; }; + findR = derive2 { name="findR"; version="0.2.0"; sha256="03xkp8akjaciv2cl1przzz56nc3ma8l7pr4k0c3w2y0sivkmawdk"; depends=[pdftools]; }; + findpython = derive2 { name="findpython"; version="1.0.3"; sha256="1y08jk2ffmkf9zpwiz2xymjhfwqvls9vzsnq62v278ghw9d571jl"; depends=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; - fingerprint = derive2 { name="fingerprint"; version="3.5.6"; sha256="1qidi88i1wh0gpicklk0f0l4j3azwmh0crpwnandkjx4nk1pfxxs"; depends=[]; }; + fingerPro = derive2 { name="fingerPro"; version="1.0"; sha256="17r23x8cdllr8slk56dsmrwc4ns69b3cqy59mxxbsjnhjl3di6x8"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL reshape rgl scales]; }; + fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; }; + fingertipsR = derive2 { name="fingertipsR"; version="0.1.5"; sha256="0g1r2mrivnfv7icba1y9lx5h2a3swmd41ry2064n82l05iaw9wsp"; depends=[dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; }; 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=[]; }; + fishdata = derive2 { name="fishdata"; version="0.1.3"; sha256="04162m1j570cdwhffkwjs1x1qlsc20djj1jwx2hl2cqmbp584ppq"; 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-3"; sha256="0hildpbgzqghbl3b5w8ghn7j40dw6wldslind8cgskbafyfxy7d6"; depends=[boot bootstrap lme4 MASS numDeriv]; }; + fishmethods = derive2 { name="fishmethods"; version="1.10-4"; sha256="1ir9r0bnp4klmm0i2iqqg03jd2qm19q885mqwpgcnl2mv8d45dwn"; depends=[boot bootstrap lme4 MASS numDeriv]; }; fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; }; fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; }; fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; }; fitDRC = derive2 { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; }; + fitODBOD = derive2 { name="fitODBOD"; version="1.1.0"; sha256="15ylldlq12mrw06pzww54hsl8nb9krs5w1cgh037km9sndsswvji"; depends=[hypergeo]; }; fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; 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-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.4.0"; sha256="0ak6hcfi3q6i78xjqdy02rq4c8zy27gq8a3k7jw174l93rgmphrp"; depends=[actuar e1071 fitdistrplus]; }; - fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.3.0"; sha256="0m70yxfp1aspf4g4v21pwhkapnzxjx8cg06w37z0i69gl4lmyq9j"; depends=[]; }; + fitteR = derive2 { name="fitteR"; version="0.1.0"; sha256="1kgnyl7am966vkfap8gmvchlpankrcj5dv5aj7ws8ix9shr76db6"; depends=[dplyr DT maxLik R_utils shiny]; }; + fitur = derive2 { name="fitur"; version="0.5.25"; sha256="0f33c4mg0257s9c0qldryihaq8p3y07j2nwghjpqhi3rv4mrg2xf"; depends=[actuar e1071 fitdistrplus ggplot2]; }; + fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.4.0"; sha256="1sdj5b365hi11dd2yxvg9w3fz3rx9rbv1nnhf5i8v2ydg4kqyrws"; 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.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.5"; sha256="0nzsn26fgj458h8za7drd78jqx3az8kx742d69j49pylxixblvxy"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; }; + flan = derive2 { name="flan"; version="0.6"; sha256="0idlvi4xlfr5l0csj75xmn94856y71j92im6dwv0rcawkwh8ghqh"; 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=[]; }; + flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; }; 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.5"; sha256="1dv1h32diff7174mxw2n3l2216crnyb6c38qbrramhj5w72zf3da"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; }; + flexclust = derive2 { name="flexclust"; version="1.3-5"; sha256="19ihdhmhaglccqpvrpc51367gkfafg4jdpabbk0j6mh2n16hi511"; depends=[lattice modeltools]; }; + flexdashboard = derive2 { name="flexdashboard"; version="0.5.1"; sha256="0jb5wswbjr58g121nbvl93p73gxr8cx56kajgpiaw1fis6dsyfyz"; 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.2"; sha256="1lhw2z8i4l822ncziwpw6hg0dzc244q60n7l5aahgdhcr0xgylhz"; depends=[flexsurv gtools survival]; }; - flextable = derive2 { name="flextable"; version="0.3.0"; sha256="0pim9yw33v608c9vjvz0r4xw44v8wwncvnv5j6k5ppm9nmz2x51x"; depends=[gdtools htmltools htmlwidgets lazyeval magrittr officer purrr R6 stringr tibble]; }; + flextable = derive2 { name="flextable"; version="0.4.2"; sha256="07a962ylr3y8v31557iqzr1m0c8bvprilfdimwzjl9fhlplb9y4h"; depends=[gdtools htmltools knitr officer R6 rmarkdown stringr]; }; 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]; }; + flipscores = derive2 { name="flipscores"; version="0.1"; sha256="0jb9im2p3x20y356av749mni3cka2byhv7glz7qhdmsdryrdizh7"; depends=[]; }; + float = derive2 { name="float"; version="0.1-1"; sha256="0bzwc48l4wijrxz3swrp720q9jsa74qwv6s8zpigbnjkspsqy3vi"; depends=[]; }; flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; }; flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; }; - flora = derive2 { name="flora"; version="0.2.8"; sha256="1asggrfp7i6z9p7lp1ab9i9i6xzz0qafxs03irpqig4pqw0qwm7d"; depends=[dplyr httr jsonlite]; }; - flowDiv = derive2 { name="flowDiv"; version="1.0"; sha256="1xgg73gbhysss82faqxn25l494sjbi3j0ls0dj6znzll8bhlrkb1"; depends=[flowCore flowWorkspace vegan]; }; + flora = derive2 { name="flora"; version="0.3.0"; sha256="1nsc2q6y02shpk70p44rr7nl7pnj6as7jgdyakxqs64imwais8x2"; depends=[dplyr httr jsonlite stringdist]; }; + flowDiv = derive2 { name="flowDiv"; version="2.0"; sha256="1p89l8q1i610bl1bvx6lmkygb094pvydgbmd8kx0640a11rblx8v"; depends=[flowCore flowWorkspace ggplot2 gridExtra vegan]; }; flower = derive2 { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; }; flowfield = derive2 { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; }; flowr = derive2 { name="flowr"; version="0.9.10"; sha256="18mjshfg3827b26b8nz52pl04ph7n887vw0ym5fybjm8gy5wwpdg"; depends=[diagram params whisker]; }; flows = derive2 { name="flows"; version="1.1.1"; sha256="0l152p17plkrbnrlis8rfr9ij406agckdxvnjsciilv6qwcync29"; depends=[igraph reshape2 sp]; }; flsa = derive2 { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; }; flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; }; + fluxweb = derive2 { name="fluxweb"; version="0.1.0"; sha256="1fwxqm8pn9h0bl1cpvz9rx56zsvxz22la5bj8yrrkbg3m8jdzgvi"; depends=[]; }; fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; }; - 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]; }; + fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; }; + fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; }; + fmlogcondens = derive2 { name="fmlogcondens"; version="1.0.0"; sha256="15n2vjfriicg3mijzkz55w54xyq0h8zjchhlgdxsycysqv59lxag"; depends=[geometry MASS mclust mvtnorm]; }; fmri = derive2 { name="fmri"; version="1.7-2"; sha256="1ifp0fkmr0bj5vkg9vh0lk74f04fk0zc90vknmjmxd2hbdb5kh4r"; depends=[awsMethods metafor nlme]; }; + fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; }; fmrs = derive2 { name="fmrs"; version="1.0-9"; sha256="1x9g67701kcnz3p97iynr74sn0mfpxpp16mv1l4zxlhhfn2v5lwx"; depends=[survival]; }; fmsb = derive2 { name="fmsb"; version="0.6.1"; sha256="1kdw0j1jl76dzsk56lpl5vvrx5l0w9rc94kmj1dhbqb5yh64xai7"; depends=[]; }; fmt = derive2 { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; }; foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; - foghorn = derive2 { name="foghorn"; version="0.4.4"; sha256="19cabq0ffc03x2p9jjsnfh1bpkdlqa8lnf7qr6cvd3sczj4n1pdl"; depends=[clisymbols crayon curl dplyr httr lazyeval magrittr rvest tibble tidyr xml2]; }; - fold = derive2 { name="fold"; version="0.2.2"; sha256="1zc9zzaf878khhldl5h7gg285y5izq408vaxxssygmr696w7xv21"; depends=[csv dplyr encode lazyeval rlang spec tidyr]; }; + foghorn = derive2 { name="foghorn"; version="1.0.1"; sha256="14g82mvh7ylqdms5si3xna1zy5jfxjksv5v2ijikjz40iddxmh5s"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; + fold = derive2 { name="fold"; version="0.2.5"; sha256="1h7vx8saq4mbmylh1zgldm8n17i8waq8fgr5d4q68553xmazws41"; depends=[csv dplyr encode lattice lazyeval magrittr metaplot rlang spec 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=[]; }; @@ -5963,23 +6359,27 @@ in with self; { fontquiver = derive2 { name="fontquiver"; version="0.2.1"; sha256="0qv3i9hch7cygl9983s3w68wfh5qvym2jkm52pp06p6mq8a1i1wm"; depends=[fontBitstreamVera fontLiberation]; }; foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; }; forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; }; - 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]; }; + forcats = derive2 { name="forcats"; version="0.3.0"; sha256="0mxn1hng43zdjh1v8shd80hrszrqahcpaqxs1s1sif0qxh84d0cm"; depends=[magrittr rlang tibble]; }; + foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.2"; sha256="1wr99jq8a0cbc7n5sdzr0gwnxsv8sjqy1x1lrazxswyj49xc06i4"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; }; + foreach = derive2 { name="foreach"; version="1.4.4"; sha256="0j2yj0rn0d5nbzz9nq5rqqgnxhp9pbd92q4klsarl2xpsn8119y0"; depends=[codetools iterators]; }; forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; }; forecast = derive2 { name="forecast"; version="8.2"; sha256="04mqx1szm22lhiqzncm8ad0kyqhv1y4d6v02gn70d78kxmjangzb"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; }; - forecastHybrid = derive2 { name="forecastHybrid"; version="1.1.9"; sha256="03wkfzlg8pcpalakq5cgmhcy9p7ds4x0hqnhsiaja4zghrqbj5b6"; depends=[doParallel foreach forecast ggplot2 reshape2 zoo]; }; + forecastHybrid = derive2 { name="forecastHybrid"; version="2.0.10"; sha256="04lspngh44y815amxlnhl74k5g7sj3bm0w8yy58fk8nqrl382pb6"; depends=[doParallel foreach forecast ggplot2 reshape2 zoo]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; }; - forega = derive2 { name="forega"; version="1.0.2"; sha256="0kkfpj63rf6m7zi8pyi4n4m7gihfyfmaws2syw0znpvcd6d6m2l5"; depends=[forecast Rcpp robfilter]; }; + forega = derive2 { name="forega"; version="1.0.3"; sha256="1n1gqm0bjdw13jm95zp0ni0hps07xjkswzrszvamn2f6sglrn73d"; depends=[forecast Rcpp robfilter]; }; 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]; }; + forestControl = derive2 { name="forestControl"; version="0.1.1"; sha256="0qfj4qf0d1bb1wllhpg9r8gvg353zdqv7py9a3hm33yhs3l5x0g5"; depends=[Rcpp]; }; 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]; }; + forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; }; forestmodel = derive2 { name="forestmodel"; version="0.4.3"; sha256="1v1m8dvird2r1jqig492msqpp9sb4s79bhgnrs9y2c0ba46jzykh"; depends=[broom dplyr ggplot2 lazyeval]; }; forestplot = derive2 { name="forestplot"; version="1.7.2"; sha256="1cqk0fwpbn4an6xn28kpvqmcp3mgv8isg8dy755sv5fkqzzjz1dg"; depends=[checkmate magrittr]; }; + forestr = derive2 { name="forestr"; version="1.0.1"; sha256="0m26x7ngl89ngk1qhg50npmwli2npmjs9pfb9rg5hmx4fzr8k63i"; depends=[dplyr ggplot2 plyr]; }; 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.8"; sha256="10j7cgzdfkpqnxy9jpw5yd1bwrz55yi8b1zn144wwqb779l2c5yn"; depends=[operator_tools]; }; + formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; }; + formulize = derive2 { name="formulize"; version="0.1.0"; sha256="1fz8q48z4zvfglxzmmjznb7lcfrrfqmnws85jfkihs3ff43h7ccc"; depends=[recipes rlang]; }; fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; }; forward = derive2 { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; }; forwards = derive2 { name="forwards"; version="0.1.0"; sha256="0pb101gdf2a4plalhhm34aixkss3lzfg8yj6yfi0d6khjmaza33i"; depends=[]; }; @@ -5988,37 +6388,38 @@ in with self; { 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]; }; + fpc = derive2 { name="fpc"; version="2.1-11"; sha256="04alsqb5gbhsjg1000d8w52pmpnlwca29r0s12f7n7mdccdv6xar"; 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=[]; }; + fpmoutliers = derive2 { name="fpmoutliers"; version="0.1.0"; sha256="108bp3smk9jnckd5237xly4ywmal03rq1kidq5z61l6zrhc3yfh9"; depends=[arules doParallel foreach Matrix pmml pryr R_utils XML]; }; 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.1"; sha256="1plnp946r48f058g3i31865jmlxh6xn4yfbwwdfiqqxvsk7jz66l"; depends=[expsmooth fma forecast ggplot2]; }; + fpp2 = derive2 { name="fpp2"; version="2.2"; sha256="1mjd8mk169k47mb3cjgd72zgjivrh4kr1yclxxxdds3bm1jh2x8l"; 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]; }; - fractal = derive2 { name="fractal"; version="2.0-1"; sha256="1varigsw5chwz88dgipdg55fqfarvll3s7kcyqmhfm0wc7vvmz2q"; depends=[ifultools MASS sapa scatterplot3d splus2R wmtsa]; }; + fractal = derive2 { name="fractal"; version="2.0-4"; sha256="18lr9z0gslvfc3z8vyj3krqj3bfhg60zv1fzinrwwkc4cpk1w7mp"; depends=[ifultools MASS sapa scatterplot3d splus2R wmtsa]; }; fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; }; 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.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; }; - frailtyEM = derive2 { name="frailtyEM"; version="0.7.2"; sha256="05ar0lypm4xbajxvdilv7l55zr6j83fkp1fi3krpswfaf6yk0yfn"; depends=[expint ggplot2 magrittr msm Rcpp survival tibble]; }; - frailtyHL = derive2 { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; }; + frailtyEM = derive2 { name="frailtyEM"; version="0.8.3"; sha256="02nsq5zjxg1hg578jn6ihygvyzscisx8r0s14a51dq1v6cjrz402"; depends=[expint ggplot2 magrittr Matrix msm Rcpp survival tibble]; }; + frailtyHL = derive2 { name="frailtyHL"; version="2.1"; sha256="02vk1hwjpdwdajy527q034dpvnchsnwhqqlf6nq19wqhxq7355qj"; depends=[cmprsk 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.12.5"; sha256="0qqy5jp77fkcfxp44k2g6wzccsfg0cv3xd4pdzqizl6dyfdbf3rz"; depends=[boot MASS nlme statmod survC1 survival]; }; + frailtypack = derive2 { name="frailtypack"; version="2.12.6"; sha256="0w2v5ik4ryvl5hph9cwxcrrglwpqbyirfrayyw9g0l1wdc1mfvi4"; 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=[]; }; freestats = derive2 { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; }; - freesurfer = derive2 { name="freesurfer"; version="1.0"; sha256="0wsj5px7apfia55kajxhh5717sp6n1lh8wr1bdbk6v29cq4svvd6"; depends=[neurobase R_utils reshape2]; }; + freesurfer = derive2 { name="freesurfer"; version="1.6.1"; sha256="1ibhl5sbz85skkawmfdr9df6wdq6b3bl6cdvykx0gcszmd3fiabh"; depends=[neurobase R_utils reshape2]; }; freqMAP = derive2 { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; }; freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; }; freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; }; freqdom_fda = derive2 { name="freqdom.fda"; version="0.9.1"; sha256="15wq9s3v441dybc8kglpbv9hdvsr9rjjq4qp4d2ipxglfp0iqj9p"; depends=[fda freqdom mvtnorm]; }; freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; }; 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]; }; + frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.0"; sha256="02ha5jfkjaxyfp7x1h0xx32ijha2dh7h52z687a9y9azrqvjv0jp"; depends=[knitr pbapply 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=[]; }; @@ -6028,11 +6429,14 @@ in with self; { 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]; }; + fs = derive2 { name="fs"; version="1.1.0"; sha256="1rcpji6qygjm75y51gb6x0vg0fjnvkl3x734d6dgd50xal59blb9"; depends=[Rcpp]; }; + fscaret = derive2 { name="fscaret"; version="0.9.4.3"; sha256="1miqg7rd3q11aksbjf0nswwnxb7c2p2f0b85nmnwm11snbf1gg8s"; depends=[caret gsubfn hmeasure]; }; + fsdaR = derive2 { name="fsdaR"; version="0.2-21"; sha256="121khfqy1ixqp86cl3cngc40zxjpd4nm5k0lk558nxcfgyyzvx8y"; depends=[rJava robustbase]; }; 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]; }; + fslr = derive2 { name="fslr"; version="2.17.3"; sha256="1g7z1jsj89kqyclb3qdc7c6dgn18jqjmrxpxi62llkixhqg21yha"; 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]; }; + fst = derive2 { name="fst"; version="0.8.4"; sha256="1jarhz5c6bib4n3xms1xhgybzaqdf4llfbgmnqndz2gwxjx1igia"; depends=[Rcpp]; }; + fsthet = derive2 { name="fsthet"; version="1.0.0"; sha256="10mimnlq01q0mmaljfp27iq0pv11znbcv3mah57nrwpy0a3zqwhb"; depends=[]; }; 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]; }; @@ -6041,22 +6445,23 @@ in with self; { fueleconomy = derive2 { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; }; fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; }; fullfact = derive2 { name="fullfact"; version="1.2"; sha256="13729m2s8b32d9i9c6g2r0zkcqsw9p7nhdig8isarfn4bjzqhf71"; depends=[afex lme4]; }; - fulltext = derive2 { name="fulltext"; version="0.1.8"; sha256="14gvhjc9433hnb5dh88svxyahbcv968njxjfwgc5ii9lpcpw5935"; depends=[aRxiv digest httr jsonlite magrittr R_cache rcrossref rentrez rplos rredis tm whisker xml2]; }; + fulltext = derive2 { name="fulltext"; version="1.0.1"; sha256="08pwasz1rpnnq81mvaldjiqv79wbvw5ma89skk95h0k2pbahblka"; depends=[aRxiv crminer crul data_table hoardr httr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble whisker xml2]; }; fun = derive2 { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; }; - funData = derive2 { name="funData"; version="1.1"; sha256="0qr3rwa4z6173px9wqb17wcdfsnjgfqvfwwpzi8sldgmvq3l7dfg"; depends=[abind fields foreach]; }; + funData = derive2 { name="funData"; version="1.2"; sha256="0y3ar26d6hxc4bg263qjqfb92ivhkphzizhz91wrzbfxha9dcrzz"; 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.5"; sha256="0vmkfn2nv6iynadmlv37wxcyazfknjxzk485hl12a7d9rj2nhqfd"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; }; + funModeling = derive2 { name="funModeling"; version="1.6.7"; sha256="0blanw0aw7qvcs6a8ryaqvi322gaz65g6flijkbssf681im9pmjr"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; }; + funbarRF = derive2 { name="funbarRF"; version="1.0.1"; sha256="05smi717j4zhbrfqjyvx1rzckygigg1x8c6kb3brbpv8w33gcvx7"; depends=[BioSeqClass Biostrings bold randomForest]; }; 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.2.0"; sha256="0dsp3aldvnc7lkp6sl89p0i7yga7wvjvl77zkjgjhxwpr8a2ry22"; depends=[cluster dplyr]; }; + funrar = derive2 { name="funrar"; version="1.2.2"; sha256="179kxhwkd431d2n917mzjnr5qvh09f0hdm2c78lww4ijb54dhn0l"; 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.6.0"; sha256="0gd61sf3n6mb0z4wnmdq1ifw6b73saafbrfscf7m8fz6ml6rfiy2"; depends=[knitr]; }; + funtimes = derive2 { name="funtimes"; version="5.0"; sha256="0xq0n3939rsrz7dna4d3d7mrpxad2xswnblsc4a88nbq6cmx5c70"; depends=[dbscan Jmisc Kendall]; }; + furniture = derive2 { name="furniture"; version="1.7.3"; sha256="1bayp2cfd3vacy83jf9x5l2kp4dr2kvfx9zvmw7z2z03lfmjj841"; depends=[knitr]; }; fuser = derive2 { name="fuser"; version="1.0.0"; sha256="0l2ddc3lal3gvzkn8b09i7pzd9nvqnr45naz3ni52nmgygwdk5ma"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; }; fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; }; futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; }; @@ -6064,17 +6469,19 @@ in with self; { futile_matrix = derive2 { name="futile.matrix"; version="1.2.6"; sha256="10v7ffjm8az75lb39526p3y8b1zhmmzx07pybiy20zydznhyvv2p"; depends=[futile_logger lambda_r lambda_tools RMTstat]; }; futile_options = derive2 { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; - futility = derive2 { name="futility"; version="0.1"; sha256="0nbsdk4abjshjvd4nrcx0ai88h2i8lf3ml1prz83zsvivb8dnam0"; depends=[]; }; - future = derive2 { name="future"; version="1.6.1"; sha256="07fy6njcpc823i04f6i6k0likq84n5ybp0dpvqh12ll6pzgl338v"; depends=[digest globals listenv]; }; + futility = derive2 { name="futility"; version="0.2"; sha256="0njckhwmawqhiznv241yjghh99wl72c4xknp9nzbmvi5j575rnlh"; depends=[]; }; + future = derive2 { name="future"; version="1.7.0"; sha256="0lfzw53z1d4bksishjkmwphfkgdr6zpvnpwr1jx8dsj0b1y2laiq"; depends=[digest globals listenv]; }; future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.15.0"; sha256="0r1bnp9mnv8jk9d6dpr94cqn4zihpm7cgxqj0c3l0x9b6i0ny3z2"; depends=[BatchJobs future R_utils]; }; + future_apply = derive2 { name="future.apply"; version="0.1.0"; sha256="1c5jyklam5j9lmr5jmn6972wwlbyaaihy4kczxib87glmc4g0a4k"; depends=[future globals]; }; future_batchtools = derive2 { name="future.batchtools"; version="0.6.0"; sha256="0npvy8d927k3ilmnwcq1fh5lvpdr009pyc93ils5qhwhfma3wfh0"; depends=[batchtools future]; }; + future_callr = derive2 { name="future.callr"; version="0.2.0"; sha256="0b6f7iwx3pa6fdvb9zrzmx7ak94bgmscswyvinaysjxxcyfkmym2"; depends=[callr 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.1"; sha256="10f9qd7cn0sqk02b5p1iq9prf5kjdivn0fkky4lb7chqvk2cwbv5"; depends=[assertthat progress purrr]; }; fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; }; fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; }; - fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.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.1"; sha256="1w4cr41w876wf6jb413axlk147jpgjc1mjvpghbkmq4kaplwjcr0"; depends=[R6 reticulate]; }; + fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.5"; sha256="1ifhvdzn0rs8gxqmpz8w1prxg3pxs5jqx5lh0r4i5rai49qjy3sb"; depends=[doParallel doRNG foreach ggplot2 mvtnorm randomForest]; }; + fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.4"; sha256="06r103hshc6xcjllv5qfiw3i1ddz4c8svy0i4j0avnffaarlc2wa"; depends=[dplyr geosphere purrr stringdist stringr tidyr]; }; + fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.3"; sha256="1kbli1m44317m95a0r34vza9p27vd9ala05jrbrdkadninwdynal"; 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]; }; @@ -6083,70 +6490,69 @@ in with self; { g2f = derive2 { name="g2f"; version="0.1"; sha256="1njx03hnfvzqyzhyjg5zwikv36xggss2vc82vpfybg6rqkx3rqbd"; depends=[KEGGREST minval sybil]; }; gCat = derive2 { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; }; gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; }; - gLRTH = derive2 { name="gLRTH"; version="0.1.0"; sha256="0a4vcfb54sqbk43gp397dwc02701wzsf4sxq2r121m2amad79nl5"; depends=[]; }; - gMCP = derive2 { name="gMCP"; version="0.8-10"; sha256="1alfy91mk6zx0k49w5ksa77qg5iqbav20ydfl1w7bh8dzp4xxxqk"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; }; + gLRTH = derive2 { name="gLRTH"; version="0.2.0"; sha256="1drmmr576n3pbr0q1cnnx4k7r4iz061n2cizv1kpr3wcc1g291pn"; depends=[]; }; + gMCP = derive2 { name="gMCP"; version="0.8-13"; sha256="19chbcqiw13rppp7s7y8vf42spwnna78xl2mb37n96s23fpj3qpf"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; }; gMOIP = derive2 { name="gMOIP"; version="1.1.0"; sha256="122yzwicsq7q98x5dxk1mmf148v2w64jz3pd3535himx85gy9zy3"; depends=[ggplot2 ggrepel]; }; gMWT = derive2 { name="gMWT"; version="1.1"; sha256="1ws96x3vjswh6m6s9zn3r9gp7xp6ybdkkxsq9a73ng2zqz2qjdl0"; depends=[clinfun Rcpp RcppArmadillo]; }; gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; }; gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; }; - gProfileR = derive2 { name="gProfileR"; version="0.6.1"; sha256="1qix15d0wa9nspdclcawml94mng4qmr2jciv7d24py315wfsvv8p"; depends=[plyr RCurl]; }; + gProfileR = derive2 { name="gProfileR"; version="0.6.4"; sha256="1cka02zbz1rbppm782qpxk1xn9qxbrv2gp5rgf970j906hxm2y0b"; depends=[plyr RCurl]; }; 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-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.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.4"; sha256="0fcjhf8hznh1rzyfrk3f3hy16zs1n61b7r3j90pzg873razf97a2"; depends=[]; }; - gTests = derive2 { name="gTests"; version="0.1"; sha256="19037qn7q92dykry4wrnbdg7irkzk2vwz1j0kq2r836m03bs04nc"; depends=[]; }; + gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; }; gWQS = derive2 { name="gWQS"; version="1.0.0"; sha256="0n0zwfqz5g4js5y3ss64dv5842jypr6sqacs32ax37immd34slhq"; depends=[ggplot2 Rsolnp tableHTML ztable]; }; gWidgets = derive2 { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; }; gWidgets2 = derive2 { name="gWidgets2"; version="1.0-7"; sha256="02jrv5x7s3jm2ajpdvgsp4zkn65gjy96rvgdxhf9smp1kb6llzg0"; depends=[digest]; }; - gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-6"; sha256="1lv0vf1nchkx8v8464ijdmqlpw6y00f07ipx7a4pkii9ai9qv2pw"; depends=[gWidgets2 memoise RGtk2]; }; + gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; }; gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-5"; sha256="1g0p7bl76rkkrixzw4b1s99gyvi8b5a4vbnsj2wmy7y9grbzndkm"; depends=[digest gWidgets2 memoise]; }; - gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-84"; sha256="0rn8v9cjziq1xm3w67nii4763w450n49jm253glpk9pvzxdkxhna"; depends=[cairoDevice gWidgets RGtk2]; }; + gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-86"; sha256="0b1xqffbzxlaaaqf1vzfl0a7b6wnnslsp8v5fbxblv7w951rsc4m"; depends=[cairoDevice gWidgets RGtk2]; }; gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; }; gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; }; 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.2"; sha256="1nmrhc7qjlyzn04r1qyjdws5fin3idmi789kbxzilax12ya8xr7k"; depends=[]; }; - galts = derive2 { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[DEoptim genalg]; }; - gam = derive2 { name="gam"; version="1.14-4"; sha256="13ma6zkqf1xlyrjlp228b2kq6pgh3fg9a7xmy3r3p0y40zvxfrba"; depends=[foreach]; }; + galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; }; + gam = derive2 { name="gam"; version="1.15"; sha256="1w6icadyfyqlkz5qijwifa3z96d460m88k8b2iaqj0cf6agmydhy"; depends=[foreach]; }; gamCopula = derive2 { name="gamCopula"; version="0.0-4"; sha256="1nj5pxcbr6k7k1m44ky306yycpx20pw8awlx7lzyw1rx1hrv5ivb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; - gamRR = derive2 { name="gamRR"; version="0.1.0"; sha256="1hry7y9mx7yv4ai3hgg6ic91dzd5mqf0yp12d5jkxjlqy9c1xwd3"; depends=[mgcv]; }; + gamRR = derive2 { name="gamRR"; version="0.3.0"; sha256="07zgh6hxkqxrw5da1pbscl8z8hzbgc5ipkzmpimimxa0i9g04c4h"; depends=[boot mgcv]; }; gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; }; - gambin = derive2 { name="gambin"; version="2.1.1"; sha256="023fmbn1c0zjyvb6b3x4c3wx60qs27i8vi5n4nr0shsamwr7cp6h"; depends=[doParallel foreach gtools]; }; + gambin = derive2 { name="gambin"; version="2.3.0"; sha256="1kwh8s191m6gsjczqc3svf6zp1k4zi86rqz7s94rahg84vwh6a9b"; depends=[doParallel foreach gtools]; }; 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-2"; sha256="1l77ng3hrlw59qzs1543p62c3sqx9b5n7fs82hrnb9dxjsgvkgd4"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; + gamlr = derive2 { name="gamlr"; version="1.13-4"; sha256="08igzs2raz6nnkz2aisxaq9jy2mlb49cqlm6gwxp0mrag4q6xxrz"; depends=[Matrix]; }; + gamlss = derive2 { name="gamlss"; version="5.0-6"; sha256="1gwnp3i7458ms79fqi7pyna6adh0hz2jjigyxgdz98vxh39ix5ps"; 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-2"; sha256="0cqc590r2wx94igyvflgds8hxvj4banpkanx6x9mjg6ax382gygr"; depends=[MASS]; }; - gamlss_inf = derive2 { name="gamlss.inf"; version="1.0-0"; sha256="0n8d8q7ibin4q80js9b8qvxwjkb52xf9y33mmysq2sbl9652b22x"; depends=[gamlss gamlss_dist]; }; + gamlss_dist = derive2 { name="gamlss.dist"; version="5.0-4"; sha256="165ll56frlxka7iqix1anxdx6612gr62h7p0a27vi45yjbdj24id"; depends=[MASS]; }; 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.4"; sha256="08al70wjwb0w98ifhi8mphk332p1q92b5jxfbvam51k7m6s36i3s"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; }; + gamlss_spatial = derive2 { name="gamlss.spatial"; version="1.3.5"; sha256="192syg12qwhv9782spdg3sbpm2mfaj20bkr78h1ww64755srfc5k"; 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-5"; sha256="11wblnh22xq3m3z25i30v2kd0zlf8wa3cm5z38z56rhk3l2wf5bc"; 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]; }; + gamm4_test = derive2 { name="gamm4.test"; version="0.1.0"; sha256="0ab6rksr88fsv6whp6cxyshpv5ixmf9lw51cl3rzk870r8q326wg"; depends=[doParallel foreach gamm4 Matrix mgcv plotly RColorBrewer]; }; + gamreg = derive2 { name="gamreg"; version="0.3"; sha256="1svrgbb8qdy2hzpq1g38v2lzmlbrn7qljix827biqzwgiajy69gg"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; }; gamsel = derive2 { name="gamsel"; version="1.8-0"; sha256="0s29czlakix5ksblixcv7y5in5az9syzs2n71mqzf32vqgf8sf18"; depends=[foreach mda]; }; gaoptim = derive2 { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; }; - gap = derive2 { name="gap"; version="1.1-17"; sha256="0pkimpjrdbz04yh2z9n3hbhn4gkpwgx5w9nkj8zqv773qsdj8h5c"; depends=[]; }; + gap = derive2 { name="gap"; version="1.1-21"; sha256="0vslbk66h1gkpqrpj4pkxnx7nr1fnjp0zvym9cxzyxww797bd57s"; depends=[]; }; + gap_datasets = derive2 { name="gap.datasets"; version="0.0.2"; sha256="0skxgiwymd8c4vsy2dbddifjj9a0bq52gdd2r62slsv0q9haw96y"; 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=[]; }; + gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; }; gaselect = derive2 { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp RcppArmadillo]; }; gasfluxes = derive2 { name="gasfluxes"; version="0.2-1"; sha256="0cdqyyqb5dcn5978jmwmf06d9jcga5ma72zf3cdz72hbcil4f93k"; depends=[AICcmodavg data_table MASS sfsmisc]; }; 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]; }; + gaston = derive2 { name="gaston"; version="1.5.3"; sha256="0y49rgsnzbikm1162awxlamjc2djnxqd9j8if9si4gbmkkp90iwm"; 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=[]; }; @@ -6159,12 +6565,12 @@ in with self; { 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.2"; sha256="084rxc5dmnn1gdvfdhy48fyqrbcbbrjgs9sziv55c9r85hvn086c"; depends=[Rcpp RcppArmadillo]; }; + gbutils = derive2 { name="gbutils"; version="0.2-1"; sha256="0br5b1l5dwq65v6d85mki6fpcz4y819ji7w5pgfl3h312q5s627v"; depends=[]; }; + gcKrig = derive2 { name="gcKrig"; version="1.1.1"; sha256="0bfxwi3ahhgyn1mh00b27iwz3cgabz74r00q4bhl45wjps4vngc3"; 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="17.8.7"; sha256="0w5valj2jm6i8z3g0cd3q2liwhy2h7qrwzhm0ryygn4ycqj8fd4x"; depends=[cmprsk ggplot2 survival]; }; - gcite = derive2 { name="gcite"; version="0.6"; sha256="1dy3asc2029mci0nixg56pvykl825ajnpw4ybhr66a4jixnrn880"; depends=[data_table httr pbapply rvest tm wordcloud xml2]; }; + gcdnet = derive2 { name="gcdnet"; version="1.0.5"; sha256="159dl8v1n7s9wnfrjb6f0b3ssblkqgbfzs15vjxhc8xkz0jp9z1c"; depends=[Matrix]; }; + gcerisk = derive2 { name="gcerisk"; version="18.02.22"; sha256="1wy9l4s17ji5xj1cxjnb59qz3242yjs4zp76fy3rg1m0k7ib52vg"; depends=[cmprsk ggplot2 survival]; }; + gcite = derive2 { name="gcite"; version="0.9.2"; sha256="1xwnf8hsakzqg5nm5c14zw239scd2dl9rfd02mj5xp6548qwxrz9"; 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="1.0.0"; sha256="13xja7rh2wkmi2j7yxrkj99sl96mlcgkp3v5aagnz140jx3jibsx"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; }; gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; @@ -6173,16 +6579,16 @@ in with self; { 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.4"; sha256="1z2g1gn8vxrcvyq5lw78wizilcq741ka9xf3isj2wxfhx9a8mqzi"; 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.1"; sha256="0dvrknhx0d00yi429zjdcs3ghgbpfjhrclkn6cicd049qdp4q396"; depends=[dplyr httr jsonlite purrr stringi tibble]; }; - gdpc = derive2 { name="gdpc"; version="1.0.2"; sha256="03gh69vb3zmsi7rlikl3a7vr7sar3x12d8lar2qa0nfksn0qa6dk"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; + gdpc = derive2 { name="gdpc"; version="1.0.3"; sha256="0qc9wl7zxqwzigvzpm0nyx735ah8ascmcwd0yays5mqc74iqqx3b"; 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.6"; sha256="103wnc8sq0iwcnj4j14hd420d2dqdyf13s3f25icsznrlyzdkhf5"; depends=[Rcpp withr]; }; + gdtools = derive2 { name="gdtools"; version="0.1.7"; sha256="122k9spymawfnfyksxyapwq9cigydy5nrjwhrwrhy3qkax3aycf6"; 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]; }; + geecure = derive2 { name="geecure"; version="1.0-2"; sha256="0y3h079hyr8p6i0hyf0zzkbfds36zz782ffiw18w7qavnj70yj98"; depends=[geepack MASS Matrix survival]; }; 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]; }; geex = derive2 { name="geex"; version="1.0.3"; sha256="0px197mz3qfx7s4wfdjlgjpss03y7wid1qa34xf4xan05dnrrnzc"; depends=[lme4 Matrix numDeriv rootSolve]; }; @@ -6190,10 +6596,9 @@ in with self; { geiger = derive2 { name="geiger"; version="2.0.6"; sha256="1zry3iclj7yciiiysbq6z0kn759c7hdy5fq0dcszkskqcd92qfz1"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; }; 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.24"; sha256="10yw5q2mni3nls87hbsn3kndxj7ln81jhzb3nbqqnqknbmm55pqd"; depends=[signal]; }; + gemlog = derive2 { name="gemlog"; version="0.26"; sha256="1cbm9rd2zwih5glj5nkmavb27j21dhsrrrr1d0ss6faf00nprbfq"; depends=[signal]; }; 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]; }; genBaRcode = derive2 { name="genBaRcode"; version="1.0.0"; sha256="0313kyhy9bg9rabxk2jdgxq2brhj2kkiq0xyd3mlq6j9c626pqi8"; depends=[ape Biostrings ggnetwork ggplot2 igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist visNetwork]; }; genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; }; genMOSSplus = derive2 { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; }; @@ -6202,7 +6607,7 @@ in with self; { genasis = derive2 { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[fitdistrplus Kendall]; }; gencve = derive2 { name="gencve"; version="0.3"; sha256="00wbmaffm7mbfv3zl6mb24w1df1a8p24girwdh3a522lw3045iwf"; depends=[C50 class e1071 glmnet lars MASS nnet plus randomForest rpart]; }; gendata = derive2 { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; }; - gender = derive2 { name="gender"; version="0.5.1"; sha256="0qiwqnpk2pzwvvvnnny0wmmrix1aq3kwnk6n9jyvqzh0v9bzd65g"; depends=[dplyr httr jsonlite]; }; + gender = derive2 { name="gender"; version="0.5.2"; sha256="1kd5024z9mbyiwmj7rpn7zflmpw6jsj2sz153g3ckzyhxjbc3x36"; depends=[dplyr httr jsonlite]; }; genderBR = derive2 { name="genderBR"; version="1.0.1"; sha256="1sbxp0wz138xxcv31xz411gp7krzghvfmjfg5hmv66l8014s6s6c"; depends=[dplyr httr jsonlite]; }; genderizeR = derive2 { name="genderizeR"; version="2.0.0"; sha256="0r9r5x93zr58sfrww3l2vyvjyj8lir2yds08y6dzf88rs9v15w3c"; depends=[data_table httr magrittr stringr tm]; }; gendist = derive2 { name="gendist"; version="1.0"; sha256="0n3ax7iy40ymrxhmb88w31a4aacaps9f1iild42afin7i7vy4dq9"; depends=[]; }; @@ -6213,18 +6618,22 @@ in with self; { genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; }; genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; genepop = derive2 { name="genepop"; version="1.0.5"; sha256="17s3azcq1fjjqi5n8rw071k1as4nnwvppmdaz2l5scn0wv120vcq"; depends=[Rcpp]; }; - generalCorr = derive2 { name="generalCorr"; version="1.0.8"; sha256="04mwx0hkg8k4fhw841l3nb3nly1s77kc6ivrnj3kv7z009f1a0jd"; depends=[meboot np psych xtable]; }; - generalhoslem = derive2 { name="generalhoslem"; version="1.2.5"; sha256="1kx2yzaawagxd0vx29h74ik1zccasikr6qzks3m09hgmc6g4kf2p"; depends=[epiR MASS reshape]; }; + generalCorr = derive2 { name="generalCorr"; version="1.1.1"; sha256="1ihp9pksi47f3fsv7wgrp1z4ylmf5n57n6h27v130mi7k5lh1gdy"; depends=[meboot np psych xtable]; }; + generalhoslem = derive2 { name="generalhoslem"; version="1.3.2"; sha256="1c6mmgdxdm384fl9yqpij3fvjzzima10knljsf50hl4q9f66lvag"; depends=[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.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; }; + geniusr = derive2 { name="geniusr"; version="1.0.0"; sha256="0akz6hkw9mjwgx9s9j24j5l1z4q41kbhna2245l26ymn4cf0rwjc"; depends=[httr purrr rvest stringr tibble xml2]; }; genlasso = derive2 { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[igraph MASS Matrix]; }; - genoPlotR = derive2 { name="genoPlotR"; version="0.8.6"; sha256="0n92d60sccx0gfakskmvan6z20v9nl0fsxsixrqmrfzp64d1n01d"; depends=[ade4]; }; + genlogis = derive2 { name="genlogis"; version="0.5.0"; sha256="0ybbfm9znkm52kin4f8dxb63rn6b91zsa31baw1lgczh41yswg3r"; depends=[distr doParallel foreach ggplot2 manipulate]; }; + geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; }; + genoPlotR = derive2 { name="genoPlotR"; version="0.8.7"; sha256="1zplk0acismv4x528rmmg5jcv6ng6c4vjf5h0mr124fj3kizsrg0"; depends=[ade4]; }; genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; }; + genomic_autocorr = derive2 { name="genomic.autocorr"; version="1.0-1"; sha256="1lidrjz1flxw4jvhqdi8y813m7ss4kkvm7bxsdpz60dxxw3204gm"; depends=[data_table magrittr reshape]; }; genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; }; genotypeR = derive2 { name="genotypeR"; version="0.0.1.6"; sha256="1y8fm3l97hrwra7a1n2gry6583r09rch1sk7vp6r9f5qwmmjc3r7"; depends=[colorspace doBy plyr reshape2 zoo]; }; 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]; }; + genridge = derive2 { name="genridge"; version="0.6-6"; sha256="1hqarvd767h2vbjqfjzdr0548hxj87kv1073hfqyq5fybdlzsjx3"; depends=[car]; }; gensemble = derive2 { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; }; gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; }; geo = derive2 { name="geo"; version="1.4-3"; sha256="0yxlafm99ypwf1700nh3hnnpndb6ghwwbi5sp6715zjbkkx94482"; depends=[mapdata maps]; }; @@ -6232,114 +6641,125 @@ in with self; { geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; }; geoGAM = derive2 { name="geoGAM"; version="0.1-2"; sha256="0q09pk2npn4hjymklwfrhz2ybmjpcb6kvqkpn9l3a6cdjgk6bkmj"; 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]; }; + geoRglm = derive2 { name="geoRglm"; version="0.9-11"; sha256="0qf3nm0snrmplbwgcac0iinni7h2wqm13lm34zzfl00idzv0k9b9"; depends=[geoR sp]; }; geoSpectral = derive2 { name="geoSpectral"; version="0.17.4"; sha256="0i2k5k66gmf7zvipcd0a489rnpj14j4a4xw9k5dccpj6ybwd47l7"; 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.5"; sha256="1fx7qgvyqkm8728ai1nd7kgj295q46jlps56zwvlvlzhqy437p5n"; depends=[ggplot2 gtable]; }; geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; }; + geogrid = derive2 { name="geogrid"; version="0.1.0"; sha256="1aiar70cy8rf7hc7kwc2g3p02x3zmp6nf9vfjjrjm94mb7yr8s48"; depends=[Rcpp RcppArmadillo rgeos sf sp]; }; geohash = derive2 { name="geohash"; version="0.3.0"; sha256="1yabnf0a6jd4r6zh83sxb9wcn4vs8csp7c80qs6pi1nx016lirx7"; 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.3"; sha256="102crv0yk28j71zlwaz4892fvvf040v533w4p3gq8kl71v35l5jd"; depends=[R6 Rcpp RcppArmadillo]; }; - geojsonio = derive2 { name="geojsonio"; version="0.4.2"; sha256="0lim5jgwnfaskmvhasb0wfk2bsa8zcwi2frxkyh0551c7ff4m9q7"; depends=[geojson httr jsonlite magrittr maptools readr rgdal rgeos sp V8]; }; + geojson = derive2 { name="geojson"; version="0.2.0"; sha256="1xvbkdaaf55x015pflvcdy06ayrmhqi3my0sdqb48z129rdbr3i7"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; + geojsonR = derive2 { name="geojsonR"; version="1.0.4"; sha256="0248lb1kgj43czp5z4q7dcrq6ra0jhq62q9x79mgyb83bqn940h8"; depends=[R6 Rcpp RcppArmadillo]; }; + geojsonio = derive2 { name="geojsonio"; version="0.5.0"; sha256="1ywrzjksiim7xhjywhjmp6s3dalqyzh1948xr8958ahpbk242252"; depends=[geojson httr jqr 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.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]; }; + geomedb = derive2 { name="geomedb"; version="0.2"; sha256="1nsf7xzqayk8zbw3b6xpgiqk2w2kzc896gjswzxq128xw05cia0a"; depends=[ape httr]; }; geomerge = derive2 { name="geomerge"; version="0.3.0"; sha256="12r60rxsi6x30q8h7mx0m50avvssm493qzyxiva7nglydcmhjn9r"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; - geometa = derive2 { name="geometa"; version="0.1-0"; sha256="1p030v19851pp9x7d4rz51qpfr7vdk3zfihm4vx5yvn5r3ls3fr8"; depends=[R6 XML]; }; + geometa = derive2 { name="geometa"; version="0.2-0"; sha256="1dz23jgix8sxnb69hb7jd41kdqifkf95jmcg2f6zqncqa6qg7glk"; 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.5"; sha256="015ijpmx44agmr2ddwgxy5rs1rhkxr6j6dh5wzksaw1p4mxmhfks"; depends=[ape geiger jpeg Matrix rgl]; }; geonames = derive2 { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; }; + geoops = derive2 { name="geoops"; version="0.1.2"; sha256="1p2nc6lhqvnxs4l8k0kyqb7mjigaycjms61139sd39qs6wy7cnvp"; depends=[Rcpp]; }; 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]; }; + geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; + georob = derive2 { name="georob"; version="0.3-6"; sha256="01gq9ymqk3zyjs5n7nj27ky2bnhc7x7npbipa5bcq7jda6gxirhr"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; + geosapi = derive2 { name="geosapi"; version="0.2-0"; sha256="15w2rd0scv0aywngp2h7nzbgh4ddbgnf54scd454ixgv67m99p5f"; 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]; }; - geosphere = derive2 { name="geosphere"; version="1.5-5"; sha256="0vffppnyxp7ryg7rvsb1ww9z0ghh1vk20vzgw245pi2gfh9f0vwb"; depends=[sp]; }; + geosphere = derive2 { name="geosphere"; version="1.5-7"; sha256="186qdm5niq7v3d4w4rngx71znsgi44hnam7698bsx9ar5mg5b6wx"; depends=[sp]; }; geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; }; geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; }; - geostatsp = derive2 { name="geostatsp"; version="1.5.4"; sha256="1c2306sh2h0kp3yclgx49z6zy91ghi53ajrj89hjgaxkhzhf6ba7"; depends=[abind Matrix numDeriv raster sp]; }; + geostatsp = derive2 { name="geostatsp"; version="1.6.0"; sha256="12lkmwfg4wqmc13xzsmgc1g624v2kpacxpycwlcafr60rbix6f9w"; depends=[abind Matrix numDeriv raster sp]; }; geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; }; geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; geotoolsR = derive2 { name="geotoolsR"; version="1.0"; sha256="1arbyb1q96ya3smn9sqzqji5v21x37iyyxmvlmqmjj75an8ix5dp"; depends=[dplyr geoR ggplot2 tidyr]; }; geotopbricks = derive2 { name="geotopbricks"; version="1.4"; sha256="1jqkdhljf0syfvkcy7wgaccrhp3hfx0kymw3vyckhmf1dkwbjvyj"; depends=[raster rgdal stringr zoo]; }; + geozoning = derive2 { name="geozoning"; version="1.0.0"; sha256="0cqdi2jgqrxc339qkr57dp11jp40x99f9inwamnh7ymg2q7kq14s"; depends=[deldir fields ggplot2 gstat maptools RandomFields raster rgeos sp]; }; geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; }; - gepaf = derive2 { name="gepaf"; version="0.1.0"; sha256="0ld7r0dkap7bpmb2fc8x0pzffvnlzp2q1bndx4l2ffiyygsq6f72"; depends=[bitops]; }; - gesca = derive2 { name="gesca"; version="1.0.3"; sha256="1xr9kls6wdd1lnk4nrwix5p0dl93rl1zd3x88c0qyxzp11m2pcsf"; depends=[]; }; + gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; }; + gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; }; gesis = derive2 { name="gesis"; version="0.2.1"; sha256="1cdmhfdjiwsp48a7b0r1mnagnymz606mkzpam9fsvfl72vzji2w7"; depends=[httr rvest xml2]; }; - getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.1.9"; sha256="0mq9pi64ybwwl5rx91f1jszy8vbapw0sm5jqxwp280vlxxnh1002"; depends=[data_table dplyr httr purrr rappdirs raster tibble tidyr]; }; + getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.2.2"; sha256="14rw7pdcan4bdjfb16z3h0acx2s8l34vywsp4nn8l1pmmsvgqpap"; depends=[data_table dplyr hoardr httr raster tibble tidyr]; }; getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; }; getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; }; + getTBinR = derive2 { name="getTBinR"; version="0.5.3"; sha256="0yn8abdixckp32yicp1b5bqmdl4l9s3f67jb8d70yy77kyckzw3m"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr scales tibble viridis]; }; 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]; }; + getopt = derive2 { name="getopt"; version="1.20.2"; sha256="13p35lbpy7i578752fa71sbfvcsqw5qfa9p6kf8b5m3c5p9i4v1x"; depends=[]; }; + gets = derive2 { name="gets"; version="0.14"; sha256="01pdpw56q27ihqyp58f0rsggqaqzay74ah1lwi54y7kcyw09yq5w"; 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.8"; sha256="0qz74gp94qx0w6njspm8n6kcpn87y2wxcr2g93l17plafl4pi04p"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; }; + gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; }; gfmR = derive2 { name="gfmR"; version="1.0-1"; sha256="1irzkiq93wh4yphq8x1v2a7plcrskb8fs36qjaa0qhyhvhn0f57i"; depends=[faraway nnet]; }; ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; }; - 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.7"; sha256="0vygac13cjcq63f57zd28jyla09za58r77kq1mmsa4qx4dxyfsbl"; depends=[colourpicker ggplot2 gtable miniUI shiny shinyjs]; }; - ggQC = derive2 { name="ggQC"; version="0.0.1"; sha256="0sf7hq69nzdhbrx3rhw92mxqq3cm2wqa79csp9lsvx97gwb60sfl"; depends=[ggplot2 plyr reshape2]; }; + ggFacetSample = derive2 { name="ggFacetSample"; version="1.0.0"; sha256="04h5j54wblrygiscvb6n40b9lz42ssds1yz9qs5hxppiph68k5zq"; depends=[ggplot2 plyr]; }; + ggQC = derive2 { name="ggQC"; version="0.0.2"; sha256="1wi9hb5ihix2vfpzbhpq2clbs7c0qh84qbmdfcxw4lknb0ha9ai1"; depends=[dplyr ggplot2 tidyr]; }; 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]; }; + ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; }; + ggalluvial = derive2 { name="ggalluvial"; version="0.6.0"; sha256="1c7jigi5zph0slfk8z0has3irlm39xlpklzak6s04m2idwl7dcjz"; depends=[dplyr ggplot2 lazyeval rlang tidyr]; }; ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; }; + ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; }; ggconf = derive2 { name="ggconf"; version="0.1"; sha256="1h7z4amlycfddisf8ix5kmax56ix8hdllfn77rf4fs5sbqsqxkdm"; depends=[ggplot2 rly tibble]; }; ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.1"; sha256="04jq1qpsgy8bgpilp1a02va4vz0adkjwrz9znmhv54q81qiv7h51"; depends=[ggplot2 reshape2]; }; ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; }; ggdmc = derive2 { name="ggdmc"; version="0.1.3.9"; sha256="07a9g6kwq4hg5zlcxndwmyprl3di7fzsn2960qyixn5bzrfk7sh2"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; }; - gge = derive2 { name="gge"; version="1.2"; sha256="00kwm4xsr8796qm98b00rlznaicgn0aagkqn2h1qmdw70scifg8l"; depends=[Rcpp reshape2 rgl]; }; + gge = derive2 { name="gge"; version="1.3"; sha256="0bqclmm4jr7y52n7qh4jikd0804iccjdpy55bvbc2k8ypsp2biik"; depends=[nipals 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.2.2"; sha256="0yxsb4309m5kxyidbrp0x2mv071figk1jksqlnqimybif0mygvpr"; depends=[dplyr effects ggplot2 magrittr prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr]; }; + ggeffects = derive2 { name="ggeffects"; version="0.3.1"; sha256="04wmyrs1pzdv120w7pq2g0x51h061lj27p42gaxfcrzdbplvrwv1"; depends=[dplyr effects ggplot2 magrittr prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; }; ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; - ggfittext = derive2 { name="ggfittext"; version="0.4.3"; sha256="0s1v8kpbjj1vvpdhkwcgjy93j9r2qcqn4nfxcca30n9gk5phsmp7"; depends=[ggplot2 stringi]; }; + ggfan = derive2 { name="ggfan"; version="0.1.1"; sha256="0sqf37afz9kpl2wm3cpansav9ndil8agwrblzj0fhnyrj41s148n"; depends=[colorspace dplyr ggplot2 rstan]; }; + ggfittext = derive2 { name="ggfittext"; version="0.5.0"; sha256="0ih6mqg53y5iaiq003wbzp6qqx4844yh5z9zw5d0k7gqclprmpn5"; depends=[ggplot2 stringi]; }; 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.6"; sha256="0ibzp6m9i87kqi3xjjkgc4lvbhhcvw0j90axr1v8khj2zaxsbwnx"; depends=[ggplot2 magrittr mosaicCore rlang stringr tibble]; }; - ggfortify = derive2 { name="ggfortify"; version="0.4.1"; sha256="19jwcz1z6g7l65l6cj8zspypfb86pn3x18vzdcgf932n14g646d2"; depends=[dplyr ggplot2 gridExtra scales tibble tidyr]; }; + ggformula = derive2 { name="ggformula"; version="0.6.2"; sha256="08smdd3s8dh3qjcm25v8h1r8pfvlfvkymnbhlyw4bymq479g4w0j"; depends=[ggplot2 magrittr mosaicCore rlang stringr tibble]; }; + ggfortify = derive2 { name="ggfortify"; version="0.4.3"; sha256="031fq82g7n9r9mvvh1sqbhq8m0swkha0vl78rkgkmzbrp88lkvqg"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; gggenes = derive2 { name="gggenes"; version="0.2.0"; sha256="1s3lkdl9wmhcdra90bv8zzb16h2sdmpr15x8c3d0gfw7yir6prj2"; depends=[ggplot2]; }; 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.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.1"; sha256="1bda2p84dia2kgran40d45wag45kpbrq19vxd0j9p07n1s86014m"; depends=[ggplot2 htmltools htmlwidgets plyr rvg uuid xml2]; }; + gghighlight = derive2 { name="gghighlight"; version="0.0.1"; sha256="12by8q31fl2kc6w5p72wvd2nxg1cpvhgdbais6hjly1sxi8jd6zp"; depends=[dplyr ggplot2 ggrepel magrittr purrr rlang]; }; + ggimage = derive2 { name="ggimage"; version="0.1.0"; sha256="1kh8r859bayrha96b5wyfncbns2qw49v5kfai1jx66w89x3bsr7h"; depends=[ggplot2 gridGraphics magick rvcheck scales tibble]; }; + ggiraph = derive2 { name="ggiraph"; version="0.4.2"; sha256="0bk6q0psxzggm69yyhfw047xyygp23rk63xvdd9dv6avndfn1h7n"; depends=[ggplot2 htmltools htmlwidgets rvg xml2]; }; ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.1.0"; sha256="09fiwkaai4sy5kxy4p0c4ldb8ya63czff53hbm6d8fm858fw2byw"; depends=[ggiraph ggplot2 mapproj mgcv moonBook mycor plyr reshape2 scales XML]; }; ggjoy = derive2 { name="ggjoy"; version="0.4.0"; sha256="1s24zn7gmk52bvjjhanxby7rxbnc2yfl0nx5nv7x7z0zja8gg7nb"; depends=[ggplot2 ggridges]; }; gglasso = derive2 { name="gglasso"; version="1.4"; sha256="0r4zfgkys8104iw1vzww3qid8a6dyn03x0jlgwrdvavfj86yhq54"; depends=[]; }; gglogo = derive2 { name="gglogo"; version="0.1.3"; sha256="1dq0bixz44p32kpma5wrqjqklal2ipjmqdwqap0xch542drlpqbn"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2]; }; ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; }; + gglorenz = derive2 { name="gglorenz"; version="0.0.1"; sha256="0ar9ih6yvxb5pyba8y8jjsbwaq808baysjhpd15psjzhfbimjqfm"; depends=[ggplot2 ineq]; }; ggm = derive2 { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; }; ggmap = derive2 { name="ggmap"; version="2.6.1"; sha256="0mssb09w818jv58h7mly9y181pzv22sgcd4a079cfpq04bs0wigw"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; }; ggmcmc = derive2 { name="ggmcmc"; version="1.1"; sha256="09b89cnmdmiwy18igzxjiq60l1xqjh022fw3rhd5kx7lnh02yza3"; depends=[dplyr GGally ggplot2 tidyr]; }; ggmosaic = derive2 { name="ggmosaic"; version="0.1.2"; sha256="1mxa09914j9i8b14brl70a7j7ngycj8wkil3sqkd4jwplaszvhsn"; depends=[dplyr ggplot2 gridExtra NHANES plotly productplots purrr tidyr]; }; - ggmuller = derive2 { name="ggmuller"; version="0.2.2"; sha256="111ldv4h7hcc27lpxyxcm2nr0iks3dczfk3z9zd1y5pl9s7wlkp2"; depends=[ape dplyr ggplot2]; }; + ggmuller = derive2 { name="ggmuller"; version="0.5.1"; sha256="1wa4gcyzbwy1s200w57phahh6rwaf62qn3i400xywkf34fsi1il8"; depends=[ape dplyr ggplot2]; }; ggnetwork = derive2 { name="ggnetwork"; version="0.5.1"; sha256="13qisn4msjzkpcmn7rh2c4ymqfxp9bayrvqngp9pysfmr6wvc6ia"; depends=[ggplot2 ggrepel network sna]; }; 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=[]; }; + ggplotAssist = derive2 { name="ggplotAssist"; version="0.1.3"; sha256="1g0s1dkbrxmwqjqppagdbnx24s0nbjn09xwxix3dkfssz6drhala"; depends=[dplyr editData gcookbook ggplot2 ggthemes magrittr miniUI moonBook rstudioapi scales shiny shinyAce shinyWidgets stringr tibble tidyverse]; }; ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; }; ggpmisc = derive2 { name="ggpmisc"; version="0.2.16"; sha256="1hq5zpc3zf4hq49ykrzrgj92cmh6gjsq6kpzcvzvnm5wyh9yy2iq"; 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.5"; sha256="1ny0z5lc50hnsg21s7c5dyl4c79c34cqfkpi091dzs61w79m27jp"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif gridExtra magrittr purrr scales tidyr]; }; + ggpubr = derive2 { name="ggpubr"; version="0.1.6"; sha256="0mvw215bj887958p34f0dzlrb8mgyfcz9b5zvsschvbhamqinqna"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif gridExtra magrittr purrr scales tidyr]; }; ggpval = derive2 { name="ggpval"; version="0.2.0"; sha256="1nwf3cz1258khp1barxxp28326bagvlsfhg4rcccbxcpny9vbl7d"; depends=[data_table ggplot2]; }; ggquiver = derive2 { name="ggquiver"; version="0.1.0"; sha256="0p6li7cxjy54qrmaf9ja6aknnlxwq4sl0z1yip1mznb5rhv6lpxw"; depends=[dplyr ggplot2]; }; - ggraph = derive2 { name="ggraph"; version="1.0.0"; sha256="0xkhqkckqz201601aqznrgnlgqzs7is1nfpdyalag58q5wl934j8"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; }; + ggraph = derive2 { name="ggraph"; version="1.0.1"; sha256="0sm1hf2fjfia0s8m5b1x6pi8wvww77rpck86clpa2figwvck8jqr"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; }; ggraptR = derive2 { name="ggraptR"; version="1.0"; sha256="1n3ildrm8jh6m1j8njx1icbjhpkv3d2ndx59d6ddyg4np09cmp8w"; depends=[assertthat backports colorspace colourpicker DBI dplyr DT evaluate futile_logger futile_options gdtools GGally ggplot2 ggthemes gtable htmltools htmlwidgets httpuv labeling lambda_r lazyeval magrittr miniUI munsell plyr RColorBrewer Rcpp reshape rmarkdown rprojroot scales shiny shinyBS shinyjs stringi stringr svglite tibble xtable yaml]; }; - ggrepel = derive2 { name="ggrepel"; version="0.6.5"; sha256="0lm78662p1iajkcvq82g08zsv3s4lfmkpggg1wk9wpvmk78yj2in"; depends=[ggplot2 Rcpp scales]; }; + ggrepel = derive2 { name="ggrepel"; version="0.7.0"; sha256="0g0qfm6g71rv27423c1x846ipilnj213knyzrcr09vrpxc87l618"; depends=[ggplot2 Rcpp scales]; }; ggridges = derive2 { name="ggridges"; version="0.4.1"; sha256="0kfa3icqdalqdg1klxjrhfl7if35d3wnsiyl86bprw5dyqyh3lh3"; depends=[ggplot2 plyr scales]; }; - ggsci = derive2 { name="ggsci"; version="2.7"; sha256="15ay3dgdzaxxyspdai50i66r44v2qz3y2am3wkazg3afcs2qszk4"; depends=[ggplot2 scales]; }; + ggsci = derive2 { name="ggsci"; version="2.8"; sha256="1s2asx9aprpzs6xqbl7yb1dv9ci9ivwqcq46fzvys8zgwzf7mkml"; depends=[ggplot2 scales]; }; ggseas = derive2 { name="ggseas"; version="0.5.1"; sha256="1r23j701rvia49si42fbi6zws7x9r92h1bcp0a15h28hpl7zlp7l"; depends=[ggplot2 seasonal zoo]; }; ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; }; ggsignif = derive2 { name="ggsignif"; version="0.4.0"; sha256="1rn58d7pb3axk6chiihryykrzw76adaa2yiafq4d0j6qbhax78f7"; 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.2"; sha256="162hbi3nygxrazckmjc8nah2i49mwr0kddqrgvdzwqwn05ysdw53"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; }; + ggspectra = derive2 { name="ggspectra"; version="0.2.3"; sha256="11y2vlcpxyh56pdfzz11bkip2nxv6rrwscqv48p5fvgn9sllly4q"; 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.1"; sha256="05dszysn1qr5s4ji4il91pv19xjh5yd09w9f153fmg4cyfl716iz"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; }; @@ -6347,39 +6767,42 @@ in with self; { ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; }; ggvis = derive2 { name="ggvis"; version="0.4.3"; sha256="1p7c8f83da30grj5n0v80p5djp6z0r62z5zqpv2a3ahn61w1gm9l"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; }; gh = derive2 { name="gh"; version="1.0.1"; sha256="1llinfajb0g7006jd2w1hpskxpmkjhnqarcjb71r1qvsccb2ph7k"; depends=[httr ini jsonlite]; }; - ghibli = derive2 { name="ghibli"; version="0.1.0"; sha256="0qss6kgmvrjx2cp6lwymh1sc9jmcnkl17lghmh2b19f600d2shr4"; depends=[ggplot2]; }; + ghibli = derive2 { name="ghibli"; version="0.1.1"; sha256="1jnl017hkzhiic0fndprs68xx3njlijxkaqj9d65xazcwynaq436"; depends=[ggplot2]; }; 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=[]; }; - gibble = derive2 { name="gibble"; version="0.0.1"; sha256="0cxxd02njjkd5z0n9qy5w1rdwhirjjbn2p4i9m9q68li9cwi4r2i"; depends=[dplyr tibble]; }; + gibble = derive2 { name="gibble"; version="0.0.2"; sha256="0a9h3q0kwk9aagcpnmih59vbm5n7hdjpa4idwagky351almblmr6"; depends=[dplyr tibble]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; - gifti = derive2 { name="gifti"; version="0.7.4"; sha256="02z6r9p0vx22ja2bs6hqb9hjwlcnb8g0kcphqpj6ivkanwh6702w"; depends=[base64enc R_utils xml2]; }; - gimme = derive2 { name="gimme"; version="0.2-2"; sha256="1fx6vh0zzrn2vqbaprv0iyihx4y93qshi82jgi9lrjhaaqw3dmfh"; depends=[gWidgets igraph lavaan qgraph]; }; - gimms = derive2 { name="gimms"; version="1.0.0"; sha256="0f959gr4nzf9p2gpvdrzlndp24g2hhzc0wbkgpbs056wp8ij0mws"; depends=[Kendall raster RCurl zyp]; }; - giphyr = derive2 { name="giphyr"; version="0.1.1"; sha256="0q5gkx2qmdn2z00fyd25q7n5izvhqa6b70cjzarxisjn2f07jdvj"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; }; + gifti = derive2 { name="gifti"; version="0.7.5"; sha256="1y64bc33b5f64a4khp916s9zb7kbb24xgdg3pdlh0f8m6zrbmp4a"; depends=[base64enc R_utils xml2]; }; + gimme = derive2 { name="gimme"; version="0.3-2"; sha256="1k79c057024i59iccphzdkh0022dd4dv0vrpn3pvlw9px6j9fbz3"; depends=[igraph lavaan qgraph]; }; + gimms = derive2 { name="gimms"; version="1.1.0"; sha256="0mqffqvaapb0m0d50vg4kvdp67yq99qf54f5anwq4md0rf3x8lid"; depends=[curl Kendall ncdf4 raster RCurl zyp]; }; + giphyr = derive2 { name="giphyr"; version="0.1.2"; sha256="1id3r291xyj1ylxgmw2cbazaz0jq4bksj8bijwagcawimfxibz45"; 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.19.0"; sha256="0ws6fbndmaafk2am4dwnz24qizxhld0yh54hgx0z6lzv3p1j209q"; depends=[]; }; + git2r = derive2 { name="git2r"; version="0.21.0"; sha256="11xgddmxzh9cy85k8fb90il43qswpvryz0h9r0j1gbclfg2f9004"; 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]; }; + githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; }; 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.6"; sha256="07xx71bk3wwpznmpi2pads6rcf6vx00i2cwyfn9zmg52282kdl4i"; 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]; }; + gjam = derive2 { name="gjam"; version="2.1.9"; sha256="05xi8wf1bp75irdklgxbx5clik0l1bpykl30hvda0dxp6qyrzm4w"; depends=[MASS RANN Rcpp RcppArmadillo]; }; + gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; }; + gkmSVM = derive2 { name="gkmSVM"; version="0.79.0"; sha256="04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; }; + glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; }; + glamlasso = derive2 { name="glamlasso"; version="3.0"; sha256="1ynhl868kh25l8m04ln6ix31z9r26lrbr5ajprpq9yfhqs4l9ddc"; depends=[Rcpp RcppArmadillo]; }; + glarma = derive2 { name="glarma"; version="1.6-0"; sha256="0n0mv4xvh5q3y383cs224x6r608ciw4822pkanvmcjsc9zl0z1ar"; depends=[MASS]; }; glassdoor = derive2 { name="glassdoor"; version="0.7.6"; sha256="0zgkz32vp71fyy25lx4kaa5gj5aj7glhxa0yqnawl1j1a4klj3v3"; depends=[httr xml2]; }; glasso = derive2 { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; }; 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]; }; - gldrm = derive2 { name="gldrm"; version="1.1"; sha256="0ixvxlgfvn7dbwd3nr27qr1x3lh0spynmkl9qprk8blvf68lsrvp"; depends=[]; }; - glinternet = derive2 { name="glinternet"; version="1.0.5"; sha256="1kjy0w6gaj161f52w3gn7kgsld4kqvm53n81kl6lvfwwh2qzw4q4"; depends=[]; }; + gldrm = derive2 { name="gldrm"; version="1.4"; sha256="0kjd78zpn65zs7nd2fqmm5qs6d0vyjyww93jgcx5ay5qpx83vyrv"; depends=[]; }; + glinternet = derive2 { name="glinternet"; version="1.0.7"; sha256="0kvhkhkhf5bmqvhxiz83cqw478s55gbkk3s2csa9bnz8ymkcn3f4"; depends=[]; }; gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; }; + gllvm = derive2 { name="gllvm"; version="0.1.0"; sha256="13ca5ms6bbrj3ny5n438v5ma0d7ccnghysz7c8452cpdq8sn87iy"; depends=[fishMod MASS Matrix mvabund mvtnorm Rcpp RcppEigen statmod TMB]; }; glm_ddR = derive2 { name="glm.ddR"; version="0.1.1"; sha256="123xqyw73l5lv746zvy2wjwr8xx6gpmwi5n86m8d05dj3bx02dzm"; depends=[ddR Matrix]; }; - 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=[]; }; + glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; }; + glm_predict = derive2 { name="glm.predict"; version="3.0-0"; sha256="1kqh8g7mrpfnzklk23x7ckbn5p2qcw951cg4s9gnlncggby864ig"; depends=[MASS nnet]; }; + glm2 = derive2 { name="glm2"; version="1.1.3"; sha256="0mmvba1ccmykm2k02ysjbiqj1lwzdwrbxr1hq1kn1gl97xlarp2x"; depends=[]; }; glmBfp = derive2 { name="glmBfp"; version="0.0-51"; sha256="15jm450j1f0nl7vqvpb2mwapdlvn7kq2kxf5s96x21siwsz7sssv"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; }; glmbb = derive2 { name="glmbb"; version="0.3"; sha256="12yabwswps0fmprh8nb9jdny9xrm13jvc0d9m3w04ppmsvalrmwl"; depends=[digest]; }; glmc = derive2 { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; }; @@ -6387,71 +6810,74 @@ in with self; { 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.2.1"; sha256="00xbv65cwgfjr6njy6wx4g3i8kk75gd51lsd09qfwx5mp7blg2ww"; depends=[Matrix mvtnorm trust]; }; + glmm = derive2 { name="glmm"; version="1.2.3"; sha256="0cxlcx09a5vypv6kkcfvfjdpz2rnxhay0pjv6q53hdmbshmchbmj"; depends=[digest Matrix mvtnorm trust]; }; glmmBUGS = derive2 { name="glmmBUGS"; version="2.4.0"; sha256="1clnnf0ja2xiqdgi2f1xs04hhi13rnp8jzzdjncbqbdzk2ic3ynl"; depends=[abind MASS sp]; }; 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.2.0"; sha256="1p9k8iiv3n3jvp20lfbrrfnml809kndfwbw8vilb4dhx9bqds3c9"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; }; + glmmTMB = derive2 { name="glmmTMB"; version="0.2.0"; sha256="1yqizxjapdh0n872d26bdgn8a04xc6647mnjhb40g0jj59qgmxrc"; depends=[lme4 Matrix nlme RcppEigen TMB]; }; + glmmsr = derive2 { name="glmmsr"; version="0.2.1"; sha256="1f2q8zy3jy97y59bdyxhachkv5ndiwp71ihnspjbwz17mvc38cmn"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; }; glmnet = derive2 { name="glmnet"; version="2.0-13"; sha256="1zdqp6wnqxzp5qn2ky47phbkrxv3cpgbwmdp896h3xxjvp58sa7k"; depends=[foreach Matrix]; }; glmnetUtils = derive2 { name="glmnetUtils"; version="1.1"; sha256="0abvxkwfadh56672qh16vql49js9ar8cz8is0bs6i8jgsl5csz91"; depends=[glmnet Matrix]; }; glmnetcr = derive2 { name="glmnetcr"; version="1.0.3"; sha256="0w04m0q7w5xxm0yv14f2g1ykpy54pxzdplr0xcz9mn43wi4sl65a"; depends=[glmnet]; }; - glmpath = derive2 { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; }; - glmpathcr = derive2 { name="glmpathcr"; version="1.0.4"; sha256="01jn8ryx6sp6qd0cx5m8n3dpkrb0665qw5ads9ai24g6ssl1y6bd"; depends=[glmpath]; }; + glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; }; + glmpathcr = derive2 { name="glmpathcr"; version="1.0.5"; sha256="0iygw7nj2bin66dh3jwz7p2nwrrz2lir0nmbgk3a2rv3w982r01q"; depends=[glmpath]; }; + glmtlp = derive2 { name="glmtlp"; version="1.1"; sha256="01kyw0xipyr9z7x9z41wz7rqargzqd8s8ri34ffdvd3ggrdznl0p"; depends=[glmnet]; }; glmulti = derive2 { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; }; glmvsd = derive2 { name="glmvsd"; version="1.4"; sha256="03axsn85axs4d6fdlr3wcdwq6qa4991svkqc7k9r52kk1ar0w5zz"; depends=[brglm glmnet MASS ncvreg]; }; glmx = derive2 { name="glmx"; version="0.1-1"; sha256="06v2qxgr16w0qnfhjr9vdqcad5v475pwg2yhw0i236yzqbnsssh6"; depends=[Formula lmtest MASS sandwich]; }; 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.10.2"; sha256="1j6w70jplxb2z1d8h0c5jn7d4glplwnqr3r7xdj1zfqc8pszw4ld"; depends=[codetools]; }; + globals = derive2 { name="globals"; version="0.11.0"; sha256="17spygv9m3mmn01cfxrm05pvny5ddzvr78c60hixqbfh8385na5c"; 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]; }; + glue = derive2 { name="glue"; version="1.2.0"; sha256="0vi9y8ix95g6hjqdz9c9y4119apbdjcypdv0ag8cl6vaxqs5n9qr"; depends=[]; }; gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; }; gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; }; 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=[]; }; + gmapsdistance = derive2 { name="gmapsdistance"; version="3.3"; sha256="09vgrfv5dj0myys0rl767wn0xx1yvmm176c48812ysj2kj3fa29v"; depends=[RCurl XML]; }; 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]; }; + gmeta = derive2 { name="gmeta"; version="2.3-0"; sha256="1izfz6gkisa8rskhfka6q73rcgzwdsmkdhy79jwcaqk25jrwfk60"; depends=[BiasedUrn binom]; }; + gmfd = derive2 { name="gmfd"; version="1.0"; sha256="1l6hf191v76l5p9f6r4qpq5y940nb23x07mb6lmwna8nnz1sspaz"; depends=[]; }; gmm = derive2 { name="gmm"; version="1.6-1"; sha256="0giq0ic7gdvglkjby217r70dbz9v0xnvzvzv6icqj0m3rxwarmn1"; depends=[sandwich]; }; gmnl = derive2 { name="gmnl"; version="1.1-3"; sha256="05p2kikv8zz9ldc6xi5bz7fyinpd0sp2v82hxhx6h54hfa6i7b9v"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; }; gmodels = derive2 { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; }; gmp = derive2 { name="gmp"; version="0.5-13.1"; sha256="0xh9dli4i7hyjywsn2h780cxl3k7v0q421djyr1wshk7l9s5701g"; depends=[]; }; gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; }; - gmum_r = derive2 { name="gmum.r"; version="0.2.1"; sha256="127h76nm99ldpaznys5y4rnrvq0kh5pcsjmw21hz79a8rjni7r16"; depends=[BH ggplot2 httr igraph Matrix Rcpp RcppArmadillo SparseM]; }; + gnFit = derive2 { name="gnFit"; version="0.1.0"; sha256="05hbzxxv8443w51mwpdcdk3gyc9bh8va6i65wydw7msdk69daqxs"; depends=[ismev rmutil]; }; 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=[]; }; + gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; }; 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=[]; }; gofCopula = derive2 { name="gofCopula"; version="0.2-3"; sha256="1xigbv9mc0c1j3qc0nay0fjwmqvw91cy3x1z6m56bgkgfli7gp2l"; depends=[copula doParallel foreach MASS numDeriv R_utils SparseGrid VineCopula]; }; 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]; }; + gofastr = derive2 { name="gofastr"; version="0.3.0"; sha256="02jn4xbbafl7siwvkqns1818wmw813x9cvqfcnpnmcippiqhrb0b"; depends=[data_table quanteda slam SnowballC tm]; }; + goft = derive2 { name="goft"; version="1.3.4"; sha256="15n1av7r6w8hihxlgw9pd570qgrlcprkkacln15chvjs3b0i60la"; depends=[fitdistrplus]; }; goftest = derive2 { name="goftest"; version="1.1-1"; sha256="183imn6dy28ama8bywxgyh32vgakv7bsbz4k5qbhnlhqdvzv2v6v"; depends=[]; }; - goftte = derive2 { name="goftte"; version="1.0.3"; sha256="158cz6x57fhcnfg1gqmv2zd6i9lnglhwwpipiia98yz9gjfnkwh0"; depends=[survival]; }; + goftte = derive2 { name="goftte"; version="1.0.5"; sha256="0mqibs8kpj8qq3wpnlpfdzxx33q77clwli1q7yaxllwzbq0b99hw"; 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.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]; }; + googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.5.0"; sha256="183wywvsfq58yn8hj6kz83c3by36w8knckndwbih2xhxqqqj3cf0"; depends=[assertthat dplyr googleAuthR httr magrittr memoise purrr rlang tidyr]; }; + googleAuthR = derive2 { name="googleAuthR"; version="0.6.2"; sha256="14a236yz0610rh98f80prcnc2401zy52rw326wvk11ghl3w1f88z"; depends=[assertthat digest httr jsonlite memoise R6]; }; + googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.4.0"; sha256="1iwn0qjyxyg1xr1s492h7z2g5yzcfw8kasd4ghxmghnqvhzzf7vn"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; }; googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.2.0"; sha256="1kslsi7gc4na8pm8dyizswf9pfpdq1rprn08rd7kbxsisclbzc7y"; depends=[assertthat future googleAuthR httr jsonlite]; }; - googleLanguageR = derive2 { name="googleLanguageR"; version="0.1.0"; sha256="11z6sai3dha9j6v0v35v86nsdrv9w9xndnaal3fwdh45c07cr8a0"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; - googlePublicData = derive2 { name="googlePublicData"; version="0.15.7.28"; sha256="1bkfj88rn8ai0kbjbd0s3zih6iz018xybr13w2h9i6wdi3dhs75s"; depends=[XLConnect XML]; }; + googleLanguageR = derive2 { name="googleLanguageR"; version="0.1.1"; sha256="1r601s81dm18wb44r65ssx9kxdj849caykzpvwba1bk1xvpp4fni"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; + googlePolylines = derive2 { name="googlePolylines"; version="0.4.0"; sha256="041dmsi938y47287hdv30c99d8rxjwdc12d7s29shghh64h96y50"; depends=[BH Rcpp]; }; + googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; }; + googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; }; googleVis = derive2 { name="googleVis"; version="0.6.2"; sha256="1idnp9ndgg2dwybdpw7q3pkaw9kw2vy2xkls9qykrpz1p6nf3mn1"; depends=[jsonlite]; }; googledrive = derive2 { name="googledrive"; version="0.1.1"; sha256="1fshv85s4ldw2kc7lbbdvrl260pz76z04awx1n6lg0f5xmba9rfg"; depends=[curl glue httr jsonlite purrr rlang tibble uuid]; }; googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; }; 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]; }; + googleway = derive2 { name="googleway"; version="2.4.0"; sha256="176jmwnn6k8w6078jcq9b4pzix70sbs118g28jpi4in4sznr1dvg"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr Rcpp scales shiny viridisLite]; }; 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=[]; }; @@ -6459,18 +6885,18 @@ in with self; { 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.5"; sha256="1l13wwmhayyhgl2m3r5f5p3m3y3z3pcj38liywx6a24hpxmir7pp"; depends=[curl]; }; + gphmm = derive2 { name="gphmm"; version="0.99.0"; sha256="0qn1z9pc8gzq63iwvjibaha525abjg45qp01nx3ggsrr4hm9xm69"; depends=[Biostrings docopt dplyr Rcpp stringi stringr]; }; 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]; }; gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; }; gpr = derive2 { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; }; 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=[]; }; + gpuR = derive2 { name="gpuR"; version="2.0.0"; sha256="1aq9gmnl69yw7124nr8jaih7598gkknp7krmdsnx600i4k37yzjs"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; }; gqlr = derive2 { name="gqlr"; version="0.0.1"; sha256="0qvyvy514ma5wi2qm6a8praqa7js9wl0hh0ack1hknw33g2gyqhy"; depends=[graphql jsonlite magrittr pryr R6]; }; gquad = derive2 { name="gquad"; version="2.1-1"; sha256="19k7cqp2j5vb6m9hxdm951wfjh6nsswb64pdz9g93ypcqrg02wa4"; depends=[ape seqinr]; }; grImport = derive2 { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; }; - gradDescent = derive2 { name="gradDescent"; version="2.0.1"; sha256="0kxyvr30hygg82s5m7nng02fvn6nak43y2v18445xbb05y6f5gmx"; depends=[]; }; + gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; }; grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; }; gramEvol = derive2 { name="gramEvol"; version="2.1-3"; sha256="0z2511zhs2gcdkwp29n6fpafhn49h69yi56nmrhh9zc8jqj1rwpa"; depends=[]; }; @@ -6478,27 +6904,28 @@ in with self; { 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]; }; + grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; }; graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.1"; sha256="1z4x32ji71rq1x89r3wmjhm1fq7klggpz6c1cf45fvcd9qs6ykhk"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; }; graphkernels = derive2 { name="graphkernels"; version="1.4"; sha256="1dwk1bd2nx9kdzxq31cgynd75r7am49ygkaryb6iqcmva1wc5xs0"; depends=[igraph Rcpp RcppEigen]; }; - graphon = derive2 { name="graphon"; version="0.1.1"; sha256="13ng0lxv0j40zwzgxh84mlxqfp1qff6v5dmvb6s9h9khj1vfxczs"; depends=[ROptSpace]; }; + graphon = derive2 { name="graphon"; version="0.2.0"; sha256="0fdvi2nn7g39mc85jg3rgwyk2wjh2k60pd9lyivfbg3140k1yawh"; depends=[ROptSpace]; }; graphql = derive2 { name="graphql"; version="1.4"; sha256="103vggx9273dg4fkrhik4p1vj8qh7gxavyh933qxhajpmhnfhksh"; 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.5.1.2"; sha256="0jpqm3m9nz5ml96s2w1kp99h65zxmfq49va8w1gvqq3iqrf5bdhj"; 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]; }; + grattan = derive2 { name="grattan"; version="1.5.3.7"; sha256="0lvmypw77za3nafq6mqasfhbhci59mq7cia9y988czs9fs9l3858"; depends=[assertthat data_table fastmatch forecast hutils magrittr Rcpp rsdmx zoo]; }; + gravity = derive2 { name="gravity"; version="0.6"; sha256="15ngk6a5f6xjvisk6ma625iaw4ybg7722xgmnr4rnlmsgm95v668"; depends=[censReg glm2 lmtest MASS multiwayvcov sandwich survival]; }; grec = derive2 { name="grec"; version="1.1.1"; sha256="1qn1vbhlw42wqg9vj5plb12pg9xskn32z27ifyzm4kggp1vckgbf"; depends=[imagine raster]; }; greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; - 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=[]; }; + greta = derive2 { name="greta"; version="0.2.3"; sha256="10vli747b5a1m53qszxk91wppg9511la9yc823qrr51s92z8i222"; depends=[coda progress R6 reticulate tensorflow]; }; + grex = derive2 { name="grex"; version="1.7"; sha256="0bciyafqwx404axidz4dlj856mzy73ij5sifxhvbjnn07rx844c9"; depends=[]; }; greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; }; - grf = derive2 { name="grf"; version="0.9.3"; sha256="107w6mxn5irwxvx8ck6vv4l8ix10a6283grf3xs10ralmlc4y5kh"; depends=[Rcpp]; }; + grf = derive2 { name="grf"; version="0.9.5"; sha256="0i3x5h19n3cq8mchm3zwg3rgr1ywknkghsk50m70zcjpb4cdbsj6"; depends=[Matrix Rcpp RcppEigen]; }; 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.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; }; - gridGraphics = derive2 { name="gridGraphics"; version="0.2"; sha256="1lxqr257gqyasln8j0538jyb9q0s6i72cxx8i6sya7w7dwgrv1xp"; depends=[]; }; + gridGraphics = derive2 { name="gridGraphics"; version="0.2-1"; sha256="1ly6fxnac9g5p3dwxfscz95whaxvc2r713fi36x526yhaayj7xwj"; depends=[]; }; gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; }; - gridSVG = derive2 { name="gridSVG"; version="1.5-1"; sha256="13l7mn8kx36g74f39nq6c39d7l0zkkkgnmfmy5g8qnydw5qn5bkq"; depends=[jsonlite XML]; }; + gridSVG = derive2 { name="gridSVG"; version="1.6-0"; sha256="06nxp0h6clsfxcx5lf11sgzq7v4ijbynh6hldbnpm6pqwn18hb0j"; 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=[]; }; @@ -6506,20 +6933,19 @@ in with self; { grofit = derive2 { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; }; gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; }; groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; - groupdata2 = derive2 { name="groupdata2"; version="0.1.0"; sha256="1kqmwjf06bnm0fbvcsicfrkgl7kn42v5bip1m9riiqmk4wh2bkqx"; depends=[dplyr plyr]; }; + groupdata2 = derive2 { name="groupdata2"; version="1.0.0"; sha256="11j5p3afr5qc227ljdwwwp17jzaylqlhc7g0gr3jvgrhjnijs2a0"; depends=[dplyr numbers 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]; }; + grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; 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]; }; growth = derive2 { name="growth"; version="1.1.0"; sha256="0d1hc56ybp5chckqv5q5jvpgbl7xn9dkbc4dd4sz5gawn1hngbxm"; depends=[rmutil]; }; growthcurver = derive2 { name="growthcurver"; version="0.2.1"; sha256="0q70g940ggpwnx2cpq2j8ambfbj9sqw6ivyp9cya1nbn05bah9ds"; depends=[caTools minpack_lm]; }; growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; }; - growthrates = derive2 { name="growthrates"; version="0.7.0"; sha256="0favz0v7q79m630xqsznyckvch1q3mrf19wj1if17l98bys7x9js"; depends=[deSolve FME lattice]; }; + growthrates = derive2 { name="growthrates"; version="0.7.1"; sha256="0ci846jgshnvrvifl8snyax8ljs9n13lr42mzm89l0gpkg6lh2g0"; depends=[deSolve FME lattice]; }; 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.1-2"; sha256="042waw813jfc163376019zd7ngwrmrr26z17c2kw7ggvp1vz5m9q"; 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]; }; @@ -6537,65 +6963,67 @@ in with self; { gsl = derive2 { name="gsl"; version="1.9-10.3"; sha256="00isw2iha5af4s7rr8svqka9mkl9l26l8h2rnk4r7fkhh7fc97sg"; depends=[]; }; gsloid = derive2 { name="gsloid"; version="0.1.0"; sha256="1ma5si86ynfsis0pnw8hyv6xc4frbkhy5ks03mr0z16gasffkycg"; depends=[]; }; gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; }; - gsrc = derive2 { name="gsrc"; version="1.1"; sha256="12rrp9v0r5qzxcs1l29238nkc1haql1c4vva3vdm26kglpg7qj18"; depends=[Ckmeans_1d_dp dbscan DNAcopy illuminaio limma openxlsx preprocessCore R6]; }; gsrsb = derive2 { name="gsrsb"; version="1.0.3"; sha256="1r4pc3zcmgwxbsmpwb6m24mmy0p78nq35bigjqvwcc32imyw4ls9"; depends=[ldbounds mvtnorm xtable]; }; gss = derive2 { name="gss"; version="2.1-7"; sha256="1nrs1yhf2h06pkkhkvaal92h0mzrwixs0pay6dkb8q2d9igbn184"; depends=[]; }; gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; }; gstat = derive2 { name="gstat"; version="1.1-5"; sha256="1wfzffl0wfimb93d5ln96yhv2g64aywzmh6hdaadl8qyqx6rx7q3"; depends=[FNN lattice sp spacetime zoo]; }; gsubfn = derive2 { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; }; gsw = derive2 { name="gsw"; version="1.0-5"; sha256="0lv4x4is53xybgg205dncizpnqnakqk47b5wgys2kr4ixqc8jipb"; depends=[testthat]; }; - gsynth = derive2 { name="gsynth"; version="1.0.3"; sha256="07cr4lnjpqzlbsv8w35iazag89n75wy1lj7db2nh5msd9qsb1a79"; depends=[abind doParallel foreach GGally ggplot2 Rcpp RcppArmadillo]; }; + gsynth = derive2 { name="gsynth"; version="1.0.6"; sha256="0fzdlflrl9qlvbzjdspws3naabwyphwqys01wp4wkw5y7whq0mar"; depends=[abind doParallel foreach GGally ggplot2 mvtnorm Rcpp RcppArmadillo]; }; gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; }; + gtWAS = derive2 { name="gtWAS"; version="1.0.0"; sha256="1pk7m1apgksbh8a3xb94aj3wp9dbcv5rm6brdcjb5fsgxj7iaq5c"; 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]; }; gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; }; gtools = derive2 { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; }; gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; }; - gtrendsR = derive2 { name="gtrendsR"; version="1.3.5"; sha256="0jfriygsgi1pm8kvnnydf7ahqs9m6n4j093am076pc9sfxafjj13"; depends=[ggplot2 googleVis rvest zoo]; }; + gtrendsR = derive2 { name="gtrendsR"; version="1.4.1"; sha256="08zfh73viv9p1c4qmw3jnywa5xzbm39kfi60whl0w5pvh3q9pksf"; depends=[anytime curl ggplot2 jsonlite]; }; gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; }; 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.3"; sha256="1x4db2dgnqi17w5rdx46v78j6055vqp8nnh7m87yq7j7b3d1r9gi"; depends=[dplyr lazyeval purrr readr stringr urltools]; }; + gutenbergr = derive2 { name="gutenbergr"; version="0.1.4"; sha256="1xf9h0ikfzgq6bzzxa7wih29cgbfk6lgdv041fprxbd9rz38agi9"; depends=[dplyr lazyeval purrr readr stringr urltools]; }; gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; }; + gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; }; 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=[]; }; gwdegree = derive2 { name="gwdegree"; version="0.1.1"; sha256="0p06hjp7vay83kbpqsgfr1d8z3ayv483rxbv86fdka94gvi1sjyc"; depends=[dplyr ergm ggplot2 gtools magrittr network scales shiny shinydashboard sna tidyr]; }; gwerAM = derive2 { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; }; gwfa = derive2 { name="gwfa"; version="0.0.4"; sha256="0jz82d9lfyd07z0jjlfqzsg7a3vnyz0s1j0rrb5sg9pnvcfjk9qy"; depends=[Rcpp sp]; }; + gwrpvr = derive2 { name="gwrpvr"; version="1.0"; sha256="0x15nv2pfv99c04lgs6q6hgczarld34xc4aqw9bn179m7j02v6m3"; depends=[]; }; 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.5.3"; sha256="0xk9aa87dch138k6zagcanqifs44shjv3da0yajrx4pgghl8xdmb"; depends=[jsonlite RCurl]; }; + h2o = derive2 { name="h2o"; version="3.16.0.2"; sha256="181rm5y7wwmpzi45sy62blr6jk9wfbs3j14ansmh7ad1rbml3zm3"; depends=[jsonlite RCurl]; }; h5 = derive2 { name="h5"; version="0.9.9"; sha256="14p7i1sj24ky87kd7qr3n9fc9l64s0bp0rwbyl6i2x69xn75gpsx"; depends=[Rcpp]; }; - hBayesDM = derive2 { name="hBayesDM"; version="0.4.0"; sha256="0x7lpfx3d559fzkmrj3fb057zb3jm2y5l55zaqy0w7pnzgdpqnh6"; depends=[ggplot2 loo mail Rcpp rstan rstantools]; }; + hBayesDM = derive2 { name="hBayesDM"; version="0.5.0"; sha256="174z98jvi04df04lpdxh3j8lmjvgrg287nxfnrcvjkibc0jiss4m"; depends=[ggplot2 loo Rcpp rstan rstantools]; }; hIRT = derive2 { name="hIRT"; version="0.1.2"; sha256="0pqp6bycr13di1hbi5sqnkiannz2hyg0ysshswv2i9fp0vkhdhqf"; depends=[pryr rms]; }; - hNMF = derive2 { name="hNMF"; version="0.3"; sha256="1kil1dkh8yqm5z2krc6n73hpm5m0h2dwwz4fg2xzvk5hsbg9qff3"; depends=[NMF nnls oro_nifti R_matlab rasterImage spatialfil]; }; + hR = derive2 { name="hR"; version="0.1.1"; sha256="18a9nhnsw7va1ambj2lc99ralhildc3a2l6xpilfanig4pg7cq08"; depends=[data_tree reshape2 visNetwork]; }; 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.5.2"; sha256="121rb5805ybjafs2v9d95yyr8rqzci1gnck3wvc65g9lf5z39x0k"; depends=[dplyr httr jsonlite lubridate tibble tidyr]; }; + hamlet = derive2 { name="hamlet"; version="0.9.5-2"; sha256="1fj7bqn6g127kan4l1pnv0qvzsgxqiixjaf3yn0g3cwawyzqixmv"; depends=[]; }; + hansard = derive2 { name="hansard"; version="0.6.0"; sha256="13h68b300c4lkqbl5gw4hkqcbb2ikvan4hx8092ds995514rg4x8"; depends=[dplyr httr jsonlite lubridate stringi 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.6.1"; sha256="1w945n310q2pmywqh3jr39ab8k5p6na6d70mgksrmvqrf8h7x8ly"; depends=[httr plyr RUnit tibble XML]; }; + haploR = derive2 { name="haploR"; version="1.6.2"; sha256="0xzh18170gxxd91yjvh2j3a8jkkz8hyf5rbvh4c9vfi5zirbi82z"; depends=[httr plyr 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]; }; happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; }; hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; }; harmonicmeanp = derive2 { name="harmonicmeanp"; version="1.0"; sha256="071ysgyi8daq8q1vqzgypkz4bgaxr0iw4djv906vkfx5ywihr768"; depends=[FMStable]; }; - harrietr = derive2 { name="harrietr"; version="0.2.2"; sha256="1h6i9ls33h0dgncq6i33ig04yq7i1wy1cl1xx2nvbp78ig02klng"; depends=[ape dplyr ggplot2 ggtree lazyeval magrittr tidyr]; }; + harrietr = derive2 { name="harrietr"; version="0.2.3"; sha256="0n6vsqysj4ijh06z6nqmj8x1z4w9711dxhbfp8p8fwi0l75pj0cj"; depends=[ape dplyr ggtree lazyeval magrittr rlang 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.2.0"; sha256="0dy5q11s5ds69yqzax7nqjjq2kfljk7m7sjh6s114bchx3wc77zg"; depends=[BH Rcpp]; }; + hashmap = derive2 { name="hashmap"; version="0.2.2"; sha256="1qypmyi033rjxjk055rv94qfqa99gm5hj5gfd9fiiq1xln3z700j"; 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.1.0"; sha256="068x009dygwh8d3lg4i4p0h3lvzrk4bh78yh92y0lcjzjp8b97q8"; depends=[forcats hms Rcpp readr tibble]; }; + haven = derive2 { name="haven"; version="1.1.1"; sha256="1fkcvsrnw8waqwggv0aydbvbi99x5kp9g78xfxj4w6s3xvdzcysz"; depends=[forcats 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.1"; sha256="1lmbhl757hdswfq3skwbwsgxpfgim8475d9hk511dbwrzcm6wsxr"; depends=[]; }; @@ -6608,26 +7036,27 @@ 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-5"; sha256="01ljwb4glignq78gpm3n8ap8ws1ss7ibdy7ybdvhnm5zj6nnvjpp"; 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=[]; }; + hdf5r = derive2 { name="hdf5r"; version="1.0.0"; sha256="1s6p4cj909kc635fh5xpl87bqlcdj3dn3r1wk5g40abimk2b0pva"; depends=[bit64 R6]; }; 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.8"; sha256="0z6rj8r7v1z2f8c5vgslnzl6f09ncbpzv0l2xyiy5c78j68z16l3"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; }; + hdm = derive2 { name="hdm"; version="0.2.3"; sha256="0nj7pbkygzbiraw1b3pqv3bnkjhi1a0h48q0zgkcq8y79kj2f8cl"; depends=[checkmate Formula ggplot2 glmnet MASS]; }; + hdme = derive2 { name="hdme"; version="0.1.0"; sha256="1wq4kl7dc853v8v1wgihayrd50x5asx5r190lq6flm2ssqd1m6nm"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack Rglpk]; }; + hdnom = derive2 { name="hdnom"; version="4.9"; sha256="11yzjfp6b4apn0nyqmi0qm5rd8xy49w6hwwiq7p566mxqy32i2j2"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; }; hdpca = derive2 { name="hdpca"; version="1.0.0"; sha256="1sv7caw4nhpcvsb7fxpvf2b5zskvfsv004hrqc51b5jx4fsc7y92"; depends=[boot lpSolve]; }; - hdrcde = derive2 { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[ash KernSmooth ks locfit mvtnorm]; }; + hdrcde = derive2 { name="hdrcde"; version="3.2"; sha256="1901mg2k2ch9fzn1n9k0kmxkgd1m4pxvrda7mv0mp64nf4mx43xw"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; }; hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; }; - healthcareai = derive2 { name="healthcareai"; version="1.0.0"; sha256="1pcibdg34s46628s6jzfn8vk8nhm17y6j8y8qpdp086pzc8nmfwx"; depends=[caret data_table DBI doParallel e1071 grpreg lme4 odbc pROC R6 ranger ROCR RSQLite xgboost]; }; + healthcareai = derive2 { name="healthcareai"; version="1.2.4"; sha256="0ksanvwfdz8xdfqdkjb4i65q7x9jdrjl4z4qwsff16zfg6sj7q2c"; depends=[caret data_table DBI doParallel dplyr e1071 ggplot2 grpreg lme4 odbc pROC R6 ranger ROCR RSQLite xgboost]; }; 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.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=[]; }; + heatmaply = derive2 { name="heatmaply"; version="0.14.1"; sha256="03p2caclhfgqgpx3wwck5h06jy3mxgs05gjmwkb7hmwghkjh41jc"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; + heavy = derive2 { name="heavy"; version="0.38.19"; sha256="15bg2qqkslkqfnsq3ixbgmq72xagh8laji0265l06xgf2l6045kx"; depends=[]; }; heemod = derive2 { name="heemod"; version="0.9.2"; sha256="0qln5c4m11vxpsa0l07qrzs006b05hsl342pc5dgz0hwdpn5dd9j"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble]; }; hei = derive2 { name="hei"; version="0.1.0"; sha256="1cvwdkm5c9p3cfgpgdj0r7222mzz1jghq2i5f20xh3786gx05sqd"; depends=[nhanesA]; }; - 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]; }; + heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; }; + helixvis = derive2 { name="helixvis"; version="0.2.0"; sha256="02ypsh6qjbdcnvj4bh71ghc9igsp50sj2dvc0qvk6nlbdg7cfhlz"; 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]; }; @@ -6636,13 +7065,15 @@ in with self; { 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]; }; + hesim = derive2 { name="hesim"; version="0.1.0"; sha256="002phncl1glv3c3gwp9ifpk56j06rka26a3774xlj3zcs6izglns"; depends=[data_table Rcpp RcppArmadillo]; }; het_test = derive2 { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; + hetGP = derive2 { name="hetGP"; version="1.0.2"; sha256="0dffkn11pm1x5jafc7yzy0jh4c2qqipfzhw205qiqxk5gny185k8"; depends=[DiceDesign MASS Rcpp]; }; 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]; }; + hexSticker = derive2 { name="hexSticker"; version="0.4.3"; sha256="0f3zm6z0gsq2ps5zv0z4d8z6v5ncgpamnpl8a9l022klqifkg6x1"; depends=[ggimage ggplot2 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]; }; + hexbin = derive2 { name="hexbin"; version="1.27.2"; sha256="0lpfl0015lg5x7lvv9dr302bca22c7fs91pnd896ypgpzqg7pm26"; depends=[lattice]; }; hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; }; hflights = derive2 { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; }; hgam = derive2 { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; }; @@ -6660,52 +7091,52 @@ in with self; { hierarchicalDS = derive2 { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[coda ggplot2 Matrix mc2d mvtnorm rgeos truncnorm xtable]; }; hierarchicalSets = derive2 { name="hierarchicalSets"; version="1.0.2"; sha256="0m5mnx1zmiscj0k1gnljr7fla4y1qhysi32a8q9jlah2q7grk7x9"; depends=[ggdendro ggplot2 gtable MASS Matrix RColorBrewer Rcpp scales]; }; hierband = derive2 { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; }; - hierformR = derive2 { name="hierformR"; version="0.1.0"; sha256="0ym6i5ajp55mmk085slmma3g5xqgdk0d0gba28fdg3csxsxl9w1r"; depends=[igraph]; }; hierfstat = derive2 { name="hierfstat"; version="0.04-22"; sha256="1fav2v2996v5kb1ffa6v5wxfm921syxg6as034vd3j4jfhdibyfx"; depends=[ade4 adegenet gtools]; }; hiertest = derive2 { name="hiertest"; version="1.1"; sha256="17maf1w4vkqknxff3f00fzv136j3dbbigyzl4vq4sln9j27w10r3"; depends=[]; }; highD2pop = derive2 { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; }; - highSCREEN = derive2 { name="highSCREEN"; version="0.1"; sha256="0g2pcxdg5fix63jqpddqnldalg95x7ghvmbfr1ijjwi9m3ki2bby"; depends=[gplots]; }; + highSCREEN = derive2 { name="highSCREEN"; version="0.2"; sha256="0lgwxavshqd826g1zmjakhxlbngbhrc36nc8wsh9nakklx4nq9g4"; 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.2"; sha256="1bjqjf4ki7r21mwlhrd83v8k6lknrypkl9wrax9ccr7fln7ha7wn"; 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=[]; }; + highfrequency = derive2 { name="highfrequency"; version="0.5.3"; sha256="1d218504ghg8d3cwmsxwkznxpr2wy5li062i2lynbxzrhrk59i0l"; depends=[chron cubature MASS mvtnorm numDeriv robustbase sandwich timeDate xts zoo]; }; + highlight = derive2 { name="highlight"; version="0.4.7.2"; sha256="0xc1akglgby3qd6c9y2rhcd0gpfihx5jvakji38vzlxb1m21sn10"; depends=[]; }; + highlightHTML = derive2 { name="highlightHTML"; version="0.2.1"; sha256="06k2idx9aadjd6xp6kadm9jh7ap1hwg7vh0bc8vw9ll82wcp1nv1"; depends=[]; }; highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; highr = derive2 { name="highr"; version="0.6"; sha256="0n9v44dxdy5fhkdmpbpa2p78whyd9z3rhhy42ipdz5m5vsr55qa3"; depends=[]; }; - highriskzone = derive2 { name="highriskzone"; version="1.4-1"; sha256="0m1g6f0hj8wqp69ca2f8jpqhz71mz0a11aj70yvjk2sk1yz5hv4x"; depends=[deldir fields ks Matrix mvtnorm rgeos spatstat]; }; + highriskzone = derive2 { name="highriskzone"; version="1.4-2"; sha256="1q9y34nj73kg5y6qy4kb023vyzbdb0f6x23asq20bj5pmz2l25y1"; depends=[deldir fields ks Matrix mvtnorm rgeos spatstat]; }; hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; 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.1-0"; sha256="17qd0wzbap5gammaahyxg9lifznzzv65k8iqiyc8y1xw4ayq3cw7"; depends=[fda Iso Matrix]; }; - hisse = derive2 { name="hisse"; version="1.8.4"; sha256="06lpbxz4ci4m45c3knrnmy65ymdfmbqkr0dlnqqimrricsd282sa"; depends=[ape data_table deSolve GenSA nloptr phytools subplex]; }; + hisse = derive2 { name="hisse"; version="1.8.5"; sha256="1lhxj0cz3sdidpafll64fg1797y0472yxcr21dp2b83qbygkwfgl"; 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=[]; }; + histry = derive2 { name="histry"; version="0.1.2"; sha256="1m9zpqwzq7sqv4wpj2xxf0ndvz3cqk3bi8xq9n75z6b8q2lr74j8"; depends=[evaluate fastdigest]; }; hit = derive2 { name="hit"; version="0.4.0"; sha256="1vyla7jlg61rlrmqjb1wya404xj90xys175h12qy30paxsl5icqz"; depends=[glmnet Rcpp speedglm]; }; hitandrun = derive2 { name="hitandrun"; version="0.5-3"; sha256="0cmn8rzgksnygqwa5pngbdc6pds3kxx4y7mq3mg3xk1vys9b6r4n"; depends=[rcdd]; }; hive = derive2 { name="hive"; version="0.2-0"; sha256="0ywakjphy67c4hwbh6prs4pgq5ifd8x8inxjkigjiqz6jx3z852v"; depends=[rJava XML]; }; - hkclustering = derive2 { name="hkclustering"; version="1.0"; sha256="1xzzrvm847n1k2q2sg5dir5wgnix76arq4my211y8l0n1d5b2q38"; depends=[cluster]; }; + hkclustering = derive2 { name="hkclustering"; version="1.0.1"; sha256="19syq06y5dl0mcwyaxr7w1hj8ffp5s140j72djcz0lljhskzmp6f"; depends=[cluster]; }; 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.8"; sha256="1wyjp1xmni18fq3v4n75qbmavvfidrqrvagd9kghg59jhc8jk988"; depends=[boot linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nnet pbivnorm tmvtnorm]; }; + hmi = derive2 { name="hmi"; version="0.9.10"; sha256="1swbzxykf4mwgahadi5l1xy06h4ivpc4gq3izshg6fvgrapbg1r5"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm tmvtnorm VGAM]; }; 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-3"; sha256="0y7vp60ah41h5aj18zqby9zb8ai0nqcnzb4xmi0mjcnf2fd370yv"; depends=[MASS]; }; + hms = derive2 { name="hms"; version="0.4.2"; sha256="1g6hslk3z0xga38r71irxq802wskg6nv804mp8y9f7i2wfrj0y55"; depends=[pkgconfig rlang]; }; + hnp = derive2 { name="hnp"; version="1.2-4"; sha256="14w2n95pgi5h71fag4ndrc82z7q26za99vj5z99rv19l5jkvmd46"; 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]; }; + hogsvdR = derive2 { name="hogsvdR"; version="0.1"; sha256="0ji4j9fzwnacdqbzrj5zphak5nsin7vcja15w48fik8hv5w6qs46"; depends=[MASS Rcpp RcppArmadillo]; }; holdem = derive2 { name="holdem"; version="1.2"; sha256="0mcb4civ4p7apm7kfl88apvb4yznsmn4hggfggmjhs046g6bi2p7"; 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=[]; }; hommel = derive2 { name="hommel"; version="1.1"; sha256="1vrfw3zxj6hlfr5czrhmx67bjbd94whfgdmsdzlmdpmj0w5r0naz"; depends=[Rcpp]; }; + homologene = derive2 { name="homologene"; version="1.1.68"; sha256="0i2ywr3rxryakp7qskgjc0pll9nskwngk5m2d2jikxxq2biqf5zj"; depends=[dplyr magrittr]; }; 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=[]; }; @@ -6717,73 +7148,76 @@ in with self; { hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; }; hrbrthemes = derive2 { name="hrbrthemes"; version="0.1.0"; sha256="1hf4370hj80m6zr20236p9068g6ky0366gfk5l9hnj6l8jpmy9qa"; depends=[extrafont ggplot2 hunspell purrr scales stringi]; }; - hrr = derive2 { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; }; + hsdar = derive2 { name="hsdar"; version="0.7.0"; sha256="09yx8zc9qbf2kj8k76z9a6rhh5zy4ggsxvwhx35666phdml42dy0"; depends=[caret raster rgdal signal]; }; hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsm = derive2 { name="hsm"; version="0.1"; sha256="1dacsq2f23bz94rh4s3477hs38pbrpz2lis4s1l9im894bcbny1x"; depends=[]; }; hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive2 { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; }; htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; }; - htm2txt = derive2 { name="htm2txt"; version="1.0.0"; sha256="1zq1rr7ary79pag13xhz51h509vqczvkvh42nhshv8ri5d3xqg9p"; depends=[gsubfn]; }; - htmlTable = derive2 { name="htmlTable"; version="1.9"; sha256="0ciic1f4iczq14j81fg7kxibn65sy8z1zxkvk1yxnxxg6dzplj2v"; depends=[checkmate htmlwidgets knitr magrittr stringr]; }; + htm2txt = derive2 { name="htm2txt"; version="2.1.1"; sha256="09q026yy8qm1fb3a4bf9vsp4j09kayl7xmk0p58ikar5l3bmfdjv"; depends=[]; }; + htmlTable = derive2 { name="htmlTable"; version="1.11.2"; sha256="1lbpi0kkk8b41w10scmlf27dg5azcv51a4q3p5bpqyphrnqp78k4"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi 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]; }; + htmltidy = derive2 { name="htmltidy"; version="0.4.0"; sha256="090rj1fzdsa8m4g33d4mx92dm8afh173i4hqa4zym8c909jwh9qn"; depends=[htmltools htmlwidgets Rcpp XML xml2]; }; htmltools = derive2 { name="htmltools"; version="0.3.6"; sha256="18k8r1s8sz1jy7dkz35n69wj20xhmllr53xmwb4pdzf2z61gpbs4"; depends=[digest Rcpp]; }; - htmlwidgets = derive2 { name="htmlwidgets"; version="0.9"; sha256="0plqkfqys1ca3ki7sb7yc6gwjpi7yy4g3mzh7hfy8s6qri0vam0i"; depends=[htmltools jsonlite yaml]; }; + htmlwidgets = derive2 { name="htmlwidgets"; version="1.0"; sha256="09lkmzh35l1420sg0dyh4vgyishqx3g8xmgs2y9z7lbi09xgwwwr"; depends=[htmltools jsonlite yaml]; }; 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.7"; sha256="1l29wpb03l7lk7y4lzjpxksr96jymg4sdvh7amd6068kdch0lqqp"; depends=[data_table deSolve msm mvtnorm survey truncnorm]; }; + httk = derive2 { name="httk"; version="1.8"; sha256="1snwqqvacxgl4cyadx5la87xh4kxiqpdmyq4szqz5r1aq2sxrr03"; 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.2"; sha256="0bggfsxf42mdx2zj6ipqd7a328j7py0ldc31452f6lccc7xryp46"; depends=[digest httr jsonlite]; }; + httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; }; 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="2.1.2"; sha256="1145aca2bkqk39xp6m2vc8plh3xcgcdi5dwp1c30yifbqa3szamh"; depends=[digest httr jsonlite testthat]; }; - httpuv = derive2 { name="httpuv"; version="1.3.5"; sha256="1sg4f223zfyd265b28rlhsn3b6mqflcpnmya98cjmjncmy9vjdj3"; depends=[Rcpp]; }; + httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; }; + httptest = derive2 { name="httptest"; version="3.0.0"; sha256="1k75i84ajka0abc8x51w74dldb0z9i08dlqbkcdby25465k01l8r"; depends=[digest httr jsonlite testthat]; }; + httpuv = derive2 { name="httpuv"; version="1.3.6.2"; sha256="0h3hkw575b211bxma23inbq1565wkhiapgasd539h219apqs534f"; depends=[Rcpp]; }; httr = derive2 { name="httr"; version="1.3.1"; sha256="0n7jz2digbgv48rbr9vmzv4vmf4rahl9jjy31izs7sxj4rs4s4r2"; depends=[curl jsonlite mime openssl R6]; }; + hues = derive2 { name="hues"; version="0.1"; sha256="0b6y4ld242fqzx4ccxzk4i4zbx7myk7v3a03r0klgbh2mmw3ixm0"; depends=[colorspace]; }; huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; }; humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; }; 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]; }; + humanleague = derive2 { name="humanleague"; version="2.0.2"; sha256="1svsqfqisywf0iqf3mrh4xnssvjmml6wn7l8iq5shvpmw71l4nnl"; depends=[curl Rcpp]; }; humidity = derive2 { name="humidity"; version="0.1.1"; sha256="0ifxjz7216ld5c4kc9vs83fcijbg5i2z0mwfzszch9j1s734yc8y"; depends=[]; }; - hunspell = derive2 { name="hunspell"; version="2.6"; sha256="02z7d3s9mc2gg6ha9hwvpnxrx9vjpppjpggg8cgj88c09y943fkq"; depends=[digest Rcpp]; }; + hunspell = derive2 { name="hunspell"; version="2.9"; sha256="10186544s6nyd2ba470idxrxsl788dkmr1g1ri8x2n1lky9zmrik"; depends=[digest Rcpp]; }; hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; }; hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; }; - hutils = derive2 { name="hutils"; version="0.8.0"; sha256="12ql3iaxksfy1vkdxbx5jrn4sjh4l00l9xyi4kq4h6vyag4f0fzf"; depends=[data_table fastmatch magrittr]; }; - huxtable = derive2 { name="huxtable"; version="0.3.1"; sha256="1nfkzdqgj6n81m68n0cc8rvm11wyc1bs74kzanrr39varjfq2xjz"; depends=[crayon dplyr htmltools knitr lazyeval rmarkdown tibble xtable]; }; + hutils = derive2 { name="hutils"; version="1.0.0"; sha256="0s30wiyn8j37hi4lzs1w1lcvg8dskmbi4z396wpq3ixjvna0cfxv"; depends=[data_table fastmatch magrittr]; }; + huxtable = derive2 { name="huxtable"; version="3.0.0"; sha256="0vb596x9c6hhnrdpqvj0x8fawaizn9yhqp8b6i13n93synyv93gy"; depends=[assertthat dplyr glue htmltools knitr lazyeval rmarkdown stringr tibble tidyselect]; }; 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]; }; hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; }; hybridHclust = derive2 { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; }; - hybridModels = derive2 { name="hybridModels"; version="0.2.9"; sha256="1y8793wqd22w042pgz8fnd83pl2jcr6afr6ss600qhphm5h6cig5"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; }; + hybridModels = derive2 { name="hybridModels"; version="0.2.15"; sha256="1qq466cjs1q2rz76npc6cs4rknfc6aal9q64548iv223fq16zq8z"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; }; hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; }; hydroGOF = derive2 { name="hydroGOF"; version="0.3-10"; sha256="010f2i53rl4fjl65fg5wzaci0kc5khpak5v1zz9yxsj77fmrmvfy"; 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.5-1"; sha256="053id9ldr10mafww3vas9fiy16lz0n1mqqfg6wjsbm5r15jkz3ha"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; }; hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; }; + hydrolinks = derive2 { name="hydrolinks"; version="0.7.1"; sha256="1yghqn5wvwx2s1lqjh8pi051hki5f9glhaqnrnjlx4bbsirf3hv7"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; }; + hydroscoper = derive2 { name="hydroscoper"; version="0.1.0"; sha256="06w3rzdv0cjyk5pfx6ji1hkjf23pfd2z0aigyynj7ajbqfxmibna"; depends=[readr stringi stringr XML]; }; hydrostats = derive2 { name="hydrostats"; version="0.2.5"; sha256="1n0wy8i1cfsgmqh898qi0qnqn4qx1srjvd05vmsf9qmhpnnyqw5m"; depends=[]; }; hyfo = derive2 { name="hyfo"; version="1.3.9"; sha256="03f3irmhndwfnv4i121gwxb2yv1868pggzyr80pgp4969qzddacm"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; hyper_fit = derive2 { name="hyper.fit"; version="1.0.3"; sha256="17f5i2i960796hl92y7ci9ffspway435r02kw1zk91lvfn927hng"; depends=[LaplacesDemon magicaxis MASS rgl]; }; hyper2 = derive2 { name="hyper2"; version="1.0-1"; sha256="107cp6na0srqax42fmvcsrviy631hg6phqmkc0cxz1zdxxxw6442"; 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]; }; - hypergea = derive2 { name="hypergea"; version="1.3.3"; sha256="0spchrbb5y3yx63acs9ns256h7k3nd5wxg8vw258kqlvyapj50l6"; depends=[]; }; + hyperSMURF = derive2 { name="hyperSMURF"; version="1.1.4"; sha256="0mqymg4326cjvcz9qvlfdsydfqgd6szfzy89llr5mwz2s3arnv6j"; depends=[doParallel foreach iterators randomForest unbalanced]; }; + hyperSpec = derive2 { name="hyperSpec"; version="0.99-20171005"; sha256="0rhn9f4faxscwrip14ndymaddc5nfd6pyrhgwkwm8hf680wdrhbl"; depends=[ggplot2 lattice latticeExtra testthat]; }; + hypercube = derive2 { name="hypercube"; version="0.1.0"; sha256="0iv3cfs636mwijm2rjk427izf0gk5lh2fknd7bmb8pd188ckwqmf"; depends=[stringr]; }; + hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; 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="2.0.7"; sha256="1j348xw41yafgs8fpvlsy5gbhbng5m839rc3p0w9h961p6q69f0j"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; }; + hypervolume = derive2 { name="hypervolume"; version="2.0.8"; sha256="003r5x9w5fvx2z8ysadx0bihz521ndizi14x8z69hvg5g74xwz84"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; }; 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]; }; hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; }; - hysteresis = derive2 { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car MASS msm]; }; + hysteresis = derive2 { name="hysteresis"; version="2.6"; sha256="00v19m52bg2i3zg8p7yj56axzj9sm64qr61226p5h7sn0zrpws3b"; depends=[car MASS msm]; }; hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; }; iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; }; iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; }; - iBUGS = derive2 { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[gWidgetsRGtk2 R2WinBUGS]; }; iC10 = derive2 { name="iC10"; version="1.1.3"; sha256="19dlrwj47zmdgmvzjfs5qa9fqq8g9ywhgy5mqbp99n7d9hg4ybxh"; depends=[iC10TrainingData pamr]; }; iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; }; - iClick = derive2 { name="iClick"; version="1.2"; sha256="04d82wbddvj73cw6ys492nasvxcj8m5594zf9r41y72i5yha11pa"; depends=[fBasics forecast lattice lubridate openair rugarch timeDate timeSeries]; }; + iClick = derive2 { name="iClick"; version="1.4"; sha256="1j1mk4w1m90f90ijxdiw67sycxms4mqljcmsic81m2pq228l8zd5"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; }; iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; }; - iDINGO = derive2 { name="iDINGO"; version="1.0.1"; sha256="1ias99v9a4rb3w19cjp20mk0r3kq22kpcjq92yykmjhmklp55i20"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; }; + iDINGO = derive2 { name="iDINGO"; version="1.0.2"; sha256="041yvp3nzk3ipjlx17xcn9yiwr1hlns0pd3vzqrck5v9glnp4sbr"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; }; 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]; }; @@ -6791,9 +7225,8 @@ in with self; { 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]; }; + iMRMC = derive2 { name="iMRMC"; version="1.1.0"; sha256="04wpqdds5vfqvl8n5g64vnyh4a40dxjh8l1bgw1vdz1372n0421g"; depends=[]; }; iMediate = derive2 { name="iMediate"; version="0.4"; sha256="0pwvzd0k9m2jd7sizl436vs63rg9yinisrb0flz34yj5avn6rmb0"; depends=[mediation mvtnorm plotly]; }; - 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]; }; @@ -6814,41 +7247,44 @@ in with self; { ibmcraftr = derive2 { name="ibmcraftr"; version="1.0.0"; sha256="0zm5j0a1wjj5agibp38h73qxpq0njvrhfq3077xhhfizcb3v24sb"; depends=[Rcpp]; }; ibmdbR = derive2 { name="ibmdbR"; version="1.49.0"; sha256="1rr64gwdy65njy0a52y3vncp7hlkp0mmq5ik92xbs49f4vagz58a"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; }; 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]; }; + ic_infer = derive2 { name="ic.infer"; version="1.1-6"; sha256="14vcwx5592br4zky9mq82akwk8pfiz7p1rx2jvyb48prrs2mm9gy"; depends=[boot kappalab mvtnorm quadprog]; }; ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; }; - icRSF = derive2 { name="icRSF"; version="1.1"; sha256="0yrlwf6p3k0i9vjm4zmf585cfv39ihchkyz9jfi4lzdh15msrzlx"; depends=[icensmis Rcpp]; }; + icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; }; ica = derive2 { name="ica"; version="1.0-1"; sha256="1bkl4a72l0k6gm82l3jxnib898z20cw17zg81jj39l9dn65rlmcq"; depends=[]; }; icaOcularCorrection = derive2 { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; }; icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; }; icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; }; iccbeta = derive2 { name="iccbeta"; version="1.1.0"; sha256="1xw0mz3ipkfz1jsjzwjnrm0af1gs31js7nvgy79cxqz31955zjww"; depends=[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]; }; + icd = derive2 { name="icd"; version="2.4.1"; sha256="1ygik4kd8ip4n8vjy2n6idj3cnc966sx41sckcqbjsqdsv5g5ghc"; depends=[checkmate magrittr Rcpp testthat]; }; icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; }; - icenReg = derive2 { name="icenReg"; version="2.0.3"; sha256="1g0jzbw23dmh54ksxnjr8a1i5b9hfivczk5il017w3i8bdadpx65"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; + icenReg = derive2 { name="icenReg"; version="2.0.7"; sha256="1fc6l3mqnm4rcg49bk2plfa011g7nay71gzd4nxnjisifmw6qi2s"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; + icensBKL = derive2 { name="icensBKL"; version="1.1"; sha256="12zx5x81jy48mp0l6a5ga0ikkjxvndv5cv2xf6d2lczfk7fz9lbp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; }; icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; }; - icesAdvice = derive2 { name="icesAdvice"; version="1.3-1"; sha256="1afkb5f48f03l9hcjv7xgm6nindk4gn6f38k51pf31a7rxg0114x"; depends=[]; }; + icesAdvice = derive2 { name="icesAdvice"; version="1.4-0"; sha256="0ra25g6am75qh32rfjps59x31zwav98k5d4nf6gbam98cr7vr5h3"; depends=[]; }; icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; }; 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=[]; }; + icesTAF = derive2 { name="icesTAF"; version="1.5-0"; sha256="19xg24k4fz64ki8mxf9g0r49syqh97a98dfb9zgiga3da3f2rk4w"; depends=[httr]; }; icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; }; - icmm = derive2 { name="icmm"; version="1.0"; sha256="01raszc1phz0iqb4gm6jsrpkdrrxvbnb1cnr9g4232fzbcmcraam"; depends=[EbayesThresh]; }; + icmm = derive2 { name="icmm"; version="1.1"; sha256="1w9f1rniz67rrvq0akc64s5433ddmr2cgbcljil4c58yyz8hinx8"; depends=[EbayesThresh]; }; 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]; }; + icr = derive2 { name="icr"; version="0.5.2"; sha256="1qmr6sc56v7ywy01f2mdhdxv2yp6rnwhbq347lfhb4ikhax3znpy"; depends=[ggplot2 Rcpp reshape2]; }; 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]; }; - idefix = derive2 { name="idefix"; version="0.1.2"; sha256="00whk6w8mfh8z7l4lhb7c26yniq9a59ja1qfiy6dsxfdcbwdbcnd"; depends=[dplyr gtools MASS maxLik Rdpack scales]; }; + idealstan = derive2 { name="idealstan"; version="0.2.7"; sha256="1818vwlv5cr6qyg7p6kgyb996n89d2xr4cy6ys9pdhrp7lip9prr"; depends=[bayesplot BH dplyr ggplot2 lazyeval Rcpp RcppEigen rlang rstan rstantools shinystan StanHeaders stringr tidyr]; }; + idefix = derive2 { name="idefix"; version="0.2.4"; sha256="0j64pmccg01lscvjg9z97ypv3svl4jbvs4819jn4kc9ni6gq4fai"; depends=[dplyr gtools MASS maxLik Rdpack scales shiny]; }; idem = derive2 { name="idem"; version="3.0"; sha256="15k6gk3v2hijdfabc1c2xabm5v84hgs0p9lpddrpir3h5jzilr3i"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; }; idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; }; idm = derive2 { name="idm"; version="1.8.1"; sha256="14cy1gv12wjpsv5jih7pgq5d36gfpdc56ih4mc6hx638qkkyk87z"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; }; - idmTPreg = derive2 { name="idmTPreg"; version="1.0"; sha256="0lqig005zln84670pglifnhc9g4nz7g7gfkl476a4q4q920pn9ll"; depends=[doParallel foreach survival]; }; + idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; }; idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; }; ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; }; + idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; }; ie2misc = derive2 { name="ie2misc"; version="0.8.5"; sha256="1i59836a3kjsra5ibk66ic35yqk28p3biylall8gngjssiig92c1"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate openxlsx qdap reader readxl stringi]; }; ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; iemisc = derive2 { name="iemisc"; version="0.9.6"; sha256="0yr2pqklj3qjlmkk2sc5rgi8dfnm9jdaagzh2dhm05lharhfzy6d"; depends=[data_table fpCompare gsubfn iemiscdata pracma r_import zoo]; }; @@ -6860,25 +7296,28 @@ in with self; { ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; }; ifultools = derive2 { name="ifultools"; version="2.0-4"; sha256="0pv2msaa1rmj8csxdclzi2jwg9pfdvh87blj9j3xa3myisglq092"; depends=[MASS splus2R]; }; ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; }; - igraph = derive2 { name="igraph"; version="1.1.2"; sha256="1v26wyk52snh8z6m5p7yqwcd9dbqifhm57j112i9x53ppi0npcc9"; depends=[irlba magrittr Matrix pkgconfig]; }; + igraph = derive2 { name="igraph"; version="1.2.1"; sha256="1hcr6b1lz030lgay1bz8y8sxaf2j93ds8n8gsqr6qhssz141hd2m"; depends=[magrittr Matrix pkgconfig]; }; igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; }; igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; }; igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; + iheatmapr = derive2 { name="iheatmapr"; version="0.4.3"; sha256="0124d7h8n83zb5kvvavccprlqknpqrd634zv7sz9s915xzhp7jgz"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr plyr RColorBrewer S4Vectors scales]; }; ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; }; + ijtiff = derive2 { name="ijtiff"; version="0.3.0"; sha256="1c5pamxjmipgmqipnf0gg4yx7i0hjrb80c0mb2sjab4v05finz55"; depends=[checkmate fields filesstrings magrittr purrr Rcpp readr RSAGA stringr]; }; 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.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]; }; + imageData = derive2 { name="imageData"; version="0.1-41"; sha256="1rkkg9zzhkamql5y47kx9s8p7fnffgm7hgsdv85brj45gc441sfm"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; }; 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.3.1"; sha256="0sgzsyqqfi7rcs2xqxdc6f9kji09wsa38lxv7k2vymy3kdy8p9f6"; depends=[Rcpp]; }; - imfr = derive2 { name="imfr"; version="0.1.4"; sha256="0q6iy6arq2c0gqcpnpr2safig3ki32m2gai1lmz19pwcfi9qkgf2"; depends=[dplyr httr jsonlite]; }; + imbalance = derive2 { name="imbalance"; version="1.0.0"; sha256="1pfhwf4844m0a8qsm852am63x18vlkbs6m1s9izrpd219616skpr"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; + imfr = derive2 { name="imfr"; version="0.1.5"; sha256="1f4zynra79h42dmd9qhg67wwvs7c640f5is98bq30fdphiybihgz"; depends=[dplyr httr jsonlite]; }; imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; }; 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]; }; + imp4p = derive2 { name="imp4p"; version="0.5"; sha256="0s1vq64qspni5fqzz781a1l8ldfbwhb57h8z4dr5k9bama5s3g6l"; depends=[imputeLCMD Iso Rcpp truncnorm]; }; + implyr = derive2 { name="implyr"; version="0.2.2"; sha256="1kqz8pzgdbyvngsbab3v578jxm01hqmh2ipcqxsv1h9j628mvqj8"; depends=[assertthat DBI dbplyr dplyr rlang]; }; r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; - importar = derive2 { name="importar"; version="0.1.0"; sha256="188ad139fa6plla1rraqwi8dvi4xfknm92nb72z21ahdpkdp80i3"; depends=[]; }; + importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; 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]; }; imputeMDR = derive2 { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; }; @@ -6891,38 +7330,42 @@ in with self; { 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]; }; + inaparc = derive2 { name="inaparc"; version="0.2.0"; sha256="0rgbnvvqzbx4j40qz32l1bxmg3wwzbl6719wb9m3xpakblvhhxs2"; depends=[kpeaks lhs]; }; inarmix = derive2 { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; }; inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; }; - incR = derive2 { name="incR"; version="0.3.1"; sha256="1dml24yg64yxq6xb88nkyi7hvkc13v8l5xxmflkpnfqn0y1rdi9s"; depends=[dplyr lubridate maptools rgeos]; }; - inca = derive2 { name="inca"; version="0.0.2"; sha256="1wj8f1ga0km9k9zrjcd7g228kw2pp6y6pgnfwmgdd05bx4hzjhdw"; depends=[Matrix Rcpp RcppArmadillo]; }; + incR = derive2 { name="incR"; version="1.0.2"; sha256="07v0jg3cw04qnblpr3zslfwxw8ng444f5545q4yznnbdw8wfmk8x"; depends=[dplyr lubridate maptools rgeos]; }; + inca = derive2 { name="inca"; version="0.0.3"; sha256="1g9js84xa5b6jl8gp4k0c55kjazfaw5g9biwk4v6vz3vwkwayyzh"; depends=[Matrix Rcpp RcppArmadillo]; }; incadata = derive2 { name="incadata"; version="0.6.1"; sha256="05i0zifdzc1w6p6annhzp9rdd4v82gx2sxi4lqpdnraaczdrhgbb"; depends=[backports decoder dplyr rccmisc rvest sweidnumbr xml2]; }; - 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]; }; + incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; }; + incidence = derive2 { name="incidence"; version="1.2.1"; sha256="0fjbccsyrxjmc17kzqhh1ykx1ai6a8gmbxsjr42crm8bjpnq77iy"; depends=[ggplot2 ISOweek]; }; + inctools = derive2 { name="inctools"; version="1.0.11"; sha256="08a1aqsx1f1mkykpgbqbgvai60zxj9zwpmxynyajbm4lwr3rc6rp"; depends=[cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma tmvtnorm]; }; + indelmiss = derive2 { name="indelmiss"; version="1.0.8"; sha256="0674hvgdq0fxab3h55iililphrr6lqp25359crvkqqgb8higbs0h"; 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=[]; }; + infer = derive2 { name="infer"; version="0.1.1"; sha256="1ln2vw4d4xcy9g6cv594glrrcqwmjynv0mfq6nsl1h94gz8wnh8a"; depends=[assertive dplyr ggplot2 magrittr rlang tibble]; }; inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; - inferference = derive2 { name="inferference"; version="0.5.4"; sha256="1i164dh82q3k9ql0hgrbflzyc15zdcn2b324mjz84pfhbp2qp4hn"; depends=[Formula lme4 numDeriv]; }; - inferr = derive2 { name="inferr"; version="0.1.1"; sha256="148n1dwfjzzcahsqy9s3wlgpf9p6jpcn692j7dvyaw6rdk3bq1i3"; depends=[dplyr magrittr purrr Rcpp tibble tidyr]; }; + inferference = derive2 { name="inferference"; version="1.0.0"; sha256="1x6i8ycba9z57m1n143p1j9pmlfrhjhi4iw0fsny8xmcvqrlr85p"; depends=[Formula lme4 numDeriv]; }; + inferr = derive2 { name="inferr"; version="0.3.0"; sha256="1z5bfq0gv1h6iw8nwc19ar6f2sgsvgs3ghq52s09wclqk2yy4azz"; depends=[dplyr magrittr purrr Rcpp rlang shiny 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]; }; - influxdbr = derive2 { name="influxdbr"; version="0.13.0"; sha256="0pab0ad98jdqpansshk5a9dlx9a3s3h51npk2ha9anaiykpdpp94"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr xts zoo]; }; + influxdbr = derive2 { name="influxdbr"; version="0.14.2"; sha256="03dzw86mvbc8w38q9skjki1z17vc04k9q8dx7sd3xg6xbr10f9d9"; depends=[dplyr httr jsonlite magrittr purrr rlang tibble tidyr xts zoo]; }; 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.7"; sha256="0dr5xl81mps46da040xjbm8b42m58aa3zzrprm6ysh4ivcbw368l"; depends=[]; }; + infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.6"; sha256="04j5nl5vxk79iciz6s9bpiyn319c2dbh7fdahgwira2r30w2fxv9"; depends=[fields]; }; + infuser = derive2 { name="infuser"; version="0.2.8"; sha256="07qgszk8gsx3yvy47iqgp5zykn26jm65ncvyqqgwrdgibf2zamgh"; depends=[]; }; infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; - ini = derive2 { name="ini"; version="0.2"; sha256="0dzy2zzzczs7xnnm7v6achd6qsy2wbrvsgahkgbsrpvwxpcb79bp"; depends=[]; }; + ini = derive2 { name="ini"; version="0.3.0"; sha256="0ybqklgbij69dvq8dxl8z2mb9fhdizcdcm9b5hg5n1x20ph3vbyj"; depends=[]; }; injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; }; + inlabru = derive2 { name="inlabru"; version="2.1.3"; sha256="09sdbzg3cdg43clkwnahkhyns019gjya55m6zhq340mgrnirx2i5"; depends=[ggplot2 rgdal rgeos sp]; }; 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.3.2"; sha256="1alxbn5x7gvk0na3d670ny3cxafshk7fwwx4hmd9gm1icc7krxjb"; depends=[dplyr htmlwidgets igraph knitr leaflet 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]; }; + inlmisc = derive2 { name="inlmisc"; version="0.3.5"; sha256="0m215fgyh17nbp2cqmyism3i77rgqkpdggc6fnpn3njxgw7wyb9m"; depends=[checkmate dplyr GA htmlwidgets igraph knitr leaflet raster rgdal rgeos sp]; }; + inpdfr = derive2 { name="inpdfr"; version="0.1.6"; sha256="0fwznjsq4wccqfnb3a5ic1nyx538jxmlcv59xdz06y6raczjp9q9"; depends=[ca cluster entropart metacom R_devices RColorBrewer 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=[]; }; inspectr = derive2 { name="inspectr"; version="1.0.0"; sha256="04rpr5ajpdx1d49y327dryxwxk27yljj4c96i9qglf02i9kmplkg"; depends=[openxlsx]; }; @@ -6933,7 +7376,7 @@ in with self; { 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]; }; + intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-12"; sha256="1h8kzinfpp2rwal11xqs9g99rmigs0jlsr5h0qh0zsill73minid"; depends=[automap gstat intamap rgdal sp spatstat spcosa]; }; intccr = derive2 { name="intccr"; version="0.2.0"; sha256="0sm66c0ivvky01k5v28k7rc6ba15jpnalhgc019nbrly1s5kyqcy"; depends=[alabama doParallel foreach]; }; integIRTy = derive2 { name="integIRTy"; version="1.0.5"; sha256="13p1r3rccsmaqwn0mrskr86jpww72aaq8zf2a8rnbpzkfrq9ni14"; depends=[abind doParallel foreach ltm MASS mclust]; }; interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; }; @@ -6945,147 +7388,160 @@ in with self; { intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; }; interim = derive2 { name="interim"; version="0.7.0"; sha256="05hgypckfjb9pr60cv6m8lgqibdkgksw13gy8g1rmd9njs6qcb8i"; 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]; }; + interp = derive2 { name="interp"; version="1.0-30"; sha256="1gzxh0xz0zdw5fr9m4w4w99rg540bljwkcmlla4pc0974d6fcg6i"; 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]; }; intervals = derive2 { name="intervals"; version="0.15.1"; sha256="1r2akz8dpix1rgvdply4r3m2zc08r0n96w9c97hma80g61a3i2ws"; depends=[]; }; interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; intpoint = derive2 { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; }; + intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.1.0"; sha256="0mxg9dvhn5rr1rchpqzf5i1p37kvabcb9jyqbn49zgzcwdvm6cbs"; depends=[yaImpute]; }; 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="2.0"; sha256="0vc12nkqqx6560dh6lzf28ynarcqpqhyr8vw03qp1nk7ijawq6jm"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; }; + intsvy = derive2 { name="intsvy"; version="2.1"; sha256="0fsib9w1zvg3phmzrspdc3d44rl5p222j0j9xmdhpcq9r6sy0bp9"; 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=[]; }; + inum = derive2 { name="inum"; version="1.0-0"; sha256="1b013ak4d0iiwk5a0s7vvsl34d0hs881iq7zrvah4skb89x82cpm"; depends=[libcoin]; }; 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.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]; }; + io = derive2 { name="io"; version="0.3.0"; sha256="16mnbxq217ixfg2qfqrj97qqfpc5dj622hf80nwray6hp47lbw2s"; depends=[filenamer stringr]; }; + ioncopy = derive2 { name="ioncopy"; version="2.0.1"; sha256="1iy4a894yp91f7sm89hvr9sh69abjrygx4yaks1d405vbfxa6z58"; depends=[multtest shiny]; }; ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; }; ionicons = derive2 { name="ionicons"; version="0.1.1"; sha256="0v7icjx2bpb0hd3j8a14lijklyjkmw7qgp336z66wzscm6f411ip"; depends=[png rsvg xml2]; }; ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; }; iopsych = derive2 { name="iopsych"; version="0.90.1"; sha256="0adxwxnb1zdlld3icdggx7cq6cp8z4h1jf105485w322a8c6s9ik"; depends=[mco mvtnorm]; }; iosmooth = derive2 { name="iosmooth"; version="0.94"; sha256="06xgzhjgb6pznjzfli193q7kn8sh5jmqsssgymwj98bw7iwn4q3z"; depends=[]; }; - iotools = derive2 { name="iotools"; version="0.1-12"; sha256="1b2crnhx84h1gp10sy2mkhi9vylp9z97ld16jijddzlf4v23bmlx"; depends=[]; }; + iotables = derive2 { name="iotables"; version="0.2.4"; sha256="17xw0xjj6xy99f41ln043agaqcw6q3s0i99as06471kyscgan8n7"; depends=[dplyr eurostat forcats magrittr plyr tidyr]; }; + iotools = derive2 { name="iotools"; version="0.2-5"; sha256="0rn6kvlcijnhlwajh6nmi80qlamxgz0x3pn09yp4hyfpl3zxg1fz"; depends=[]; }; ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; }; 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.7.1"; sha256="1vprm3dlfh5bqn3hk5sdx2d8qdagn1a3crg8s9w1jykp7ivnahac"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; + ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; 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.5"; sha256="11zb8vs8pv5cbdvfd4s70l2ars3f78lasrvp691s5hvkv882lq51"; depends=[RColorBrewer Rcpp RcppEigen]; }; + iprior = derive2 { name="iprior"; version="0.7.1"; sha256="01sav9594grc413kf6s9jnp4hs4q9f9424qphm91xckydiqisaav"; depends=[doSNOW foreach ggplot2 mvtnorm Rcpp RcppEigen reshape2 scales]; }; 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]; }; + ipumsr = derive2 { name="ipumsr"; version="0.1.1"; sha256="0bms1jl1hwqcz6awdgs0wpxvxgsydrvfmp10qnhglh52nckf0dyb"; depends=[dplyr haven purrr raster Rcpp readr rlang stringr tibble tidyr xml2]; }; ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; }; + ipwErrorY = derive2 { name="ipwErrorY"; version="1.0"; sha256="1n1j1crxnnfkg38drgg8rhc13y6s8hcsr5g0f6hi4v680dgrkhmp"; depends=[nleqslv]; }; iqLearn = derive2 { name="iqLearn"; version="1.4"; sha256="0vgnfr6x6f6qlnag63brnkdymlmm2vbkl8fg02w98qsc48lal454"; depends=[]; }; iqspr = derive2 { name="iqspr"; version="2.3"; sha256="190d0mc36l3ggh62km3z7ylhi9f0wp4brkwmm72qjqbm1przvk0w"; depends=[doParallel fingerprint ggplot2 glmnet gridExtra kernlab ranger rBayesianOptimization rcdk tictoc xgboost]; }; irace = derive2 { name="irace"; version="2.4"; sha256="07xzg4jcq0rjdq1drs3xh02y29z1gmkjkw54apmaqzc0s1pwzkk4"; depends=[]; }; ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; }; - irlba = derive2 { name="irlba"; version="2.2.1"; sha256="0zfb7x1701n6gask0f8y2yq0vmb82xkxf6limp43ivx551hx600s"; depends=[Matrix]; }; + irlba = derive2 { name="irlba"; version="2.3.2"; sha256="0f7wb12wa0zbyllk5adcf4f517wgjpkhsx4j176i9ax6xy7jvprz"; 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]; }; + irtDemo = derive2 { name="irtDemo"; version="0.1.3"; sha256="057m8p6qnws09kbq30712hfqkdyqkshpc4vprmj65mrdx6kwvqr7"; depends=[fGarch shiny shinydashboard]; }; irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; }; - irtoys = derive2 { name="irtoys"; version="0.2.0"; sha256="1rjw7f8r7kg4yrlkv6cwiiggm6hgx3gqc4jzcmvvmv0ycyi2w3pw"; depends=[ltm sm]; }; + irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; }; irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; }; + irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; }; isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; }; isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; }; isdparser = derive2 { name="isdparser"; version="0.2.0"; sha256="061wi94rj3iyvf3dgvcjy0x46hvwhr4ifx0jhirz44bj0c8g3h7j"; depends=[data_table tibble]; }; isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; }; island = derive2 { name="island"; version="0.1.3"; sha256="1wb44zyfkgk62aidw5qg660473dxh9nyahmxzxn7ffmi8a0hmdnf"; depends=[]; }; ismev = derive2 { name="ismev"; version="1.41"; sha256="19vmjgz1baqkryi34ffhjznc46z3zwqaqblwafhk9fd50xgn4bi6"; depends=[mgcv]; }; - isnullptr = derive2 { name="isnullptr"; version="1.0.0"; sha256="11pkkvbnbjcpx4nzas2cksmwz6naf6w9d6djk8b34yhnxlvhg09z"; depends=[]; }; + isni = derive2 { name="isni"; version="0.1"; sha256="0xqz5ha6ca02xk5n0c8awx8m7zibrb6h2mwwsr44jchdb3dj39sr"; depends=[matrixcalc mvtnorm nlme nnet numDeriv]; }; + isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; }; 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="1.1.1"; sha256="1sm03lr03w5zhbi4dl27sid9wxil9891317aichipkyrvqbkkri1"; depends=[Iso survival]; }; + isoph = derive2 { name="isoph"; version="1.1.2"; sha256="1qw98cnil3rb9d3vbii8drca744qig6bfd3rc74dxm23cj86f66g"; 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]; }; italy = derive2 { name="italy"; version="0.1.0"; sha256="0is90xp6980ja12jzi3816jq1y90ifcw6cvfmybb7invj6rr1cks"; depends=[]; }; itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; }; - itcSegment = derive2 { name="itcSegment"; version="0.6"; sha256="0wzp84p6cysk2488p9g9p0r8950ry5wqg13kd34yixzp9m3rx0w4"; depends=[maptools raster rgeos sp]; }; + itcSegment = derive2 { name="itcSegment"; version="0.7"; sha256="15im0aqnl73c7gg6v4al40mappfsb4axfxclpzmdganvr6fccvay"; 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-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; }; - iterators = derive2 { name="iterators"; version="1.0.8"; sha256="1f057pabs7ss9h1n244can26qsi5n2k3salrdk0b0vkphlrs4kmf"; depends=[]; }; - iterpc = derive2 { name="iterpc"; version="0.3.3"; sha256="1dqckb3raq5d6fy0h4ikg2xk61pin1hd4cdvpbngzgjzn6b5q1f6"; depends=[gmp iterators Rcpp]; }; + iterators = derive2 { name="iterators"; version="1.0.9"; sha256="16sycjq912ix52fjxjhcwiaqr0yj1v5iqmrvjljd3z857031w06y"; depends=[]; }; + iterpc = derive2 { name="iterpc"; version="0.3.4"; sha256="1nbwd6lx6srjb94skghy4jd323sn8a08wvh8r5zqa4l69qg47r65"; depends=[gmp iterators Rcpp]; }; itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; }; itertools2 = derive2 { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; }; itree = derive2 { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; }; itsadug = derive2 { name="itsadug"; version="2.3"; sha256="0wzdy82h05264n9cr84w5j98vz24was9hh1y0wdp56ws3dfbav9m"; depends=[mgcv plotfunctions]; }; - itsmr = derive2 { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; }; - itunesr = derive2 { name="itunesr"; version="0.1"; sha256="0vfn3vvbfl0ckgr50449xffj8726wsa120ibppbzhalp8rb6hq4a"; depends=[curl jsonlite lubridate xml2]; }; + itsmr = derive2 { name="itsmr"; version="1.8"; sha256="1w2sjdw9s4smsqdbjabj9jjync0fb931aajjbqhm49cx0g72hi8g"; depends=[]; }; + itunesr = derive2 { name="itunesr"; version="0.1.1"; sha256="1h6yyqcmvm9dfwscmq5ghqi3r4fdracw1n206058j9bdjpakxqkl"; depends=[curl jsonlite lubridate xml2]; }; 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.7"; sha256="05rw76yhppm0sii49lilnss4czc65an5s7l964f16xxas6f54hd0"; depends=[Formula ggplot2 Matrix reshape2]; }; + ivmodel = derive2 { name="ivmodel"; version="1.7.1"; sha256="0v8alqn141s9rymk29xqmdx7gpp8ivz4525afvarxmp9sm2rqq0q"; depends=[Formula ggplot2 Matrix reshape2]; }; 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=[]; }; + ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; }; ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; }; jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; }; jaatha = derive2 { name="jaatha"; version="3.2.0"; sha256="00886j0cabrq6a69w8s1gsfkmx1wqs1vpxjafpm71msk54r0dj55"; depends=[assertthat R6]; }; jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; }; jackstraw = derive2 { name="jackstraw"; version="1.1.1"; sha256="18iah8sq64p7c6rxs21w8rbxvbmbh03jzqbam1ilp46ayfqzk9qc"; depends=[corpcor lfa]; }; jacpop = derive2 { name="jacpop"; version="0.5"; sha256="056c82d4a10rgq0p4p63y9i94dy1kqp3yh7xms9nx9q2xb940xb5"; depends=[]; }; - jagsUI = derive2 { name="jagsUI"; version="1.4.4"; sha256="0jfziaxxrlf1izp7s61d7xckdx33hnbq1cs2zlp7c9bcpp4mdkzv"; depends=[coda lattice rjags]; }; + jagsUI = derive2 { name="jagsUI"; version="1.4.9"; sha256="1c2fq7q3kvf092j6r9ci0gigjpb61dj19phzm8mqi05q2k08siin"; 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.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; }; - janitor = derive2 { name="janitor"; version="0.3.0"; sha256="1x2598yv6r2z4q13vbzsqns6d4q0bki97sqsm67pp77djpw8wkay"; depends=[dplyr magrittr tidyr]; }; + janitor = derive2 { name="janitor"; version="0.3.1"; sha256="0s2inn0apzwrvm5dvvdh36n9fhhrwvfbs6f3fn6byrbd713xl7rq"; depends=[dplyr magrittr tidyr]; }; jaod = derive2 { name="jaod"; version="0.1.0"; sha256="0wh1nlfhks4c1dga6h7554pg44pamj73x5in71k2xw0yp292zm6x"; depends=[crul jsonlite tibble]; }; - jcolors = derive2 { name="jcolors"; version="0.0.1"; sha256="0a5p8778s14rk7xsivmb0g0c4kzdvbhyxsl8v1lk3cpq6898zv2d"; depends=[ggplot2 scales]; }; + jcext = derive2 { name="jcext"; version="0.1"; sha256="18vmf57l2kv3rvi6laqp948m8mjkdxdy0vi4xp68480b2mjmvij1"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; }; + jcolors = derive2 { name="jcolors"; version="0.0.2"; sha256="0d71sdvj7hwafj0sx2z1nyza5j2lfd8y5yj1p94yrw32wi7b89jn"; depends=[ggplot2 scales]; }; + jdx = derive2 { name="jdx"; version="0.1.2"; sha256="0963h1ppasw5psxgxzav0mnwc5gq0ah5xv5cyhnm8d1a66svn6pw"; depends=[rJava]; }; 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]; }; + jmcm = derive2 { name="jmcm"; version="0.1.8.0"; sha256="0nv30shwd1219cvs9kaql0n7ppwqngj3avf2qd7nzrnbqp2gl23h"; 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.8"; sha256="0zxq16yn3hn4hnlm7914pz1zdypppa25vdbv11qvp77mhprpvj4f"; depends=[afex BayesFactor car GGally ggplot2 ggridges GPArotation jmvcore lavaan lsmeans multcomp mvnormtest PMCMR psych R6 vcd vcdExtra]; }; - jmvcore = derive2 { name="jmvcore"; version="0.8"; sha256="1ii0prwnxaxk32wnyzi6gm89s4v4sh2xwj3ipwb3m8yzf1g8a8kr"; depends=[base64enc R6 rjson]; }; + jmotif = derive2 { name="jmotif"; version="1.0.3"; sha256="1llmrksajrd35kfdzq2vqfm17yv5kwark6gz3rvyzcmbrqk5spqv"; depends=[Rcpp RcppArmadillo]; }; + jmuOutlier = derive2 { name="jmuOutlier"; version="1.4"; sha256="1vrihjvq8l2q7d3z80fkzzzwg6xmnfi8sipsgwic1lcbv6vnqndp"; depends=[]; }; + jmv = derive2 { name="jmv"; version="0.8.1.16"; sha256="1m7h0sbva865ki2wf0sxlb6bl1qw936grks2g4h82i2xq9nrlrhh"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan multcomp mvnormtest PMCMR psych R6 vcd vcdExtra]; }; + jmvcore = derive2 { name="jmvcore"; version="0.8.1.6"; sha256="1k1w4c0c8ayjzhbi4fqxr2pcynf73jhkr4wc933nijhkyd6w8m29"; 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.2.2"; sha256="0xx89ykympdff8a5zz58syj771kbpzrq393hw5z1rgjswzlyi8r9"; depends=[lattice MASS nlme statmod survival]; }; - joineRML = derive2 { name="joineRML"; version="0.3.0"; sha256="04v6nqrq4yw3i5xgc4rsqfyb1a4q7iyhlsyq7mhpwydzxxg7nwdg"; depends=[ggplot2 lme4 MASS Matrix mvtnorm nlme Rcpp RcppArmadillo survival]; }; - joint_Cox = derive2 { name="joint.Cox"; version="2.13"; sha256="061qfx4n3s1nfp77rar25762x79wjr3g39l5d3yvia1csjcm6xyy"; depends=[survival]; }; + joineR = derive2 { name="joineR"; version="1.2.3"; sha256="0cg7bfn0hb7ayx2s7myja5qzdvsbzyk8fbb1x5z0fp21gyrpfz18"; depends=[lattice MASS nlme statmod survival]; }; + joineRML = derive2 { name="joineRML"; version="0.4.1"; sha256="08zl6wv6yvk2cgp6ln2i9ziip0mjr4jrfpb1y75ln5wi00dbna3x"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; }; + joineRmeta = derive2 { name="joineRmeta"; version="0.1.1"; sha256="0d9wwb3v43v30xjy67j366mhwixzz79bm67j01fqmcdsnmn3qpjn"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm nlme statmod survival]; }; + joint_Cox = derive2 { name="joint.Cox"; version="2.14"; sha256="0k9v1v4zbv0952zyp7xv5gkmnihfswpsqzp684f9y6n6xcg3v8fx"; depends=[survival]; }; jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; 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.4-1"; sha256="0hjpvxm8zbvbnhjhk959fd3wrx4igqgzlxphv1hcc2iyz2975fl8"; depends=[lme4]; }; + jointseg = derive2 { name="jointseg"; version="1.0.1"; sha256="0wa531b5shrxhnzflfjqn2wypfb565qc2c8wngysgrgyj1kjq1pl"; depends=[acnr DNAcopy matrixStats]; }; + jomo = derive2 { name="jomo"; version="2.5-3"; sha256="1ig6r4sc4c2vf3h51by78610c5yqd7ap8gqcf0hswn3h2zsf6vm8"; depends=[lme4 survival]; }; 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]; }; - jpndistrict = derive2 { name="jpndistrict"; version="0.2.0"; sha256="106i3mxxlfj2mq0ghymp39i70mc1w71mrycza31dpccmp1k9habd"; depends=[dplyr leaflet magrittr miniUI readr sf shiny stringi tibble]; }; - jqr = derive2 { name="jqr"; version="0.2.4"; sha256="1w4832pymnavgrlhldqg1mdf0bkd3rwfywgd98hxik51yadfszjb"; depends=[BH lazyeval magrittr Rcpp]; }; + jpmesh = derive2 { name="jpmesh"; version="1.1.0"; sha256="01f0020ghl1f5fsri54gni15b36fg9vkr4xj43vy881sv11c5yr8"; depends=[dplyr leaflet miniUI purrr rlang sf shiny tibble tidyr units]; }; + jpndistrict = derive2 { name="jpndistrict"; version="0.3.0"; sha256="0vnawpkrkhv0vjvw49ldn86qy07pqsdw7mmq13h3l4qw5jmfsd9i"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr readr rlang sf shiny stringi tibble tidyr]; }; + jqr = derive2 { name="jqr"; version="1.0.0"; sha256="1jdr3wb1fd2zjmmdicqhskgk7xbn5y6998fi9szj86p8smfckl74"; depends=[lazyeval magrittr]; }; 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="1.1"; sha256="1xsdr14k4djcd1nqybvfzhviics4igsj8yz3r0j2nqhin2wjynlf"; depends=[V8]; }; + jsTree = derive2 { name="jsTree"; version="1.0.1"; sha256="0n754illyw29bprll676k9qm5vk5h8qss6gb8lls57kdzj51x2jz"; depends=[data_table htmlwidgets jsonlite]; }; 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.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; }; - jtools = derive2 { name="jtools"; version="0.7.1"; sha256="1hnbf13ymskpcal5d0zv6d4h5wv5ld8w63s4m2sf7j0573v7pbvs"; depends=[boot]; }; + jtools = derive2 { name="jtools"; version="0.9.4"; sha256="0vljw3n1ykvf3f2ydar9rb24cgiqljh195g2jc4dx77zy1kcfh4d"; depends=[ggplot2]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jug = derive2 { name="jug"; version="0.1.7"; sha256="01m6hyr26f6zih49pz2bmmr8ypdl1qiz0wv3padcy68kaccf44a4"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; }; - junr = derive2 { name="junr"; version="0.1.2"; sha256="1b1x0fma51wapchia49351wig57fgwc5sw7xsm8rb1g30k294rkz"; depends=[httr jsonlite]; }; + junctions = derive2 { name="junctions"; version="1.0"; sha256="13vqmy4968hpxi6vs3kfgd802miw8navcvsjmak6knwa2mjhhd54"; depends=[Rcpp]; }; + junr = derive2 { name="junr"; version="0.1.3"; sha256="0wcglpziyi6z4n7w70srziljba3jkb27iqxbxz4kk6774c7valbf"; 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-7"; sha256="0f19rjngk0lg6s8c6h5l55qpxp8sl4vxj3kpi05cizzncny9b9bj"; depends=[SuppDists]; }; - kableExtra = derive2 { name="kableExtra"; version="0.5.2"; sha256="10lsvn8z2pqsg40a58h9la6g1189v85wr15ps2i8rcd4czrdp53j"; depends=[knitr magrittr readr rmarkdown rvest stringr xml2]; }; - kamila = derive2 { name="kamila"; version="0.1.1.1"; sha256="06jl868i8a6zg3pyaf1r6ccd33ya5f83apc5w6d3m111dzdqqlcy"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; }; + kableExtra = derive2 { name="kableExtra"; version="0.7.0"; sha256="1rj41kcvc46nn6fvqhsc9v1snq2phh09vchkdng1avbm3g5sld62"; depends=[htmltools knitr magrittr readr rmarkdown rvest scales stringr viridisLite xml2]; }; + kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; }; + kamila = derive2 { name="kamila"; version="0.1.1.2"; sha256="0mcray8byifjddsmwzmcpmw3zpm1y8q3nfrgpgacb36rwprqkj6z"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; }; kangar00 = derive2 { name="kangar00"; version="1.1"; sha256="1rm3mjghgfq8fliha6flqvcb6m4xag1697c0q5smg515453l0s0p"; 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]; }; - kaphom = derive2 { name="kaphom"; version="0.1.0"; sha256="19wqk0mngxfisgza12a642bbikjhf9z4zbm442wj5nr0n4f7j7ss"; depends=[]; }; + kaphom = derive2 { name="kaphom"; version="0.2"; sha256="09rxvg37nbjs78l9yh86a2kd428dnfws2wz82mx9frys3ys6zhfl"; depends=[]; }; 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.9.0"; sha256="0jiy2kmjnngl1lhjzgq6x3qdzrbnwnk7azfj52jr92rv8psdyhxc"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; + kdecopula = derive2 { name="kdecopula"; version="0.9.1"; sha256="0qbrm4b2ijyp7fmljz8m918zkv5aywm549lbwjk3rk8isvaac10m"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; + kdensity = derive2 { name="kdensity"; version="1.0.0"; sha256="0di027xjcd8xllkbygmkmpvp9wchh3haf15vrw7sjck3yvh68k5f"; depends=[assertthat EQL knitr rmarkdown]; }; kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; }; 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=[]; }; @@ -7093,31 +7549,36 @@ in with self; { kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; }; kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; }; kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; }; - keras = derive2 { name="keras"; version="2.0.6"; sha256="1q7jp5a89glswa8dcy30v5gxw7fll20k2pgarxqd04an44lhi9ql"; depends=[magrittr R6 reticulate tensorflow tfruns]; }; + keras = derive2 { name="keras"; version="2.1.4"; sha256="1z08fi5a0hxw96xj95w9k0d918b1yvqixlv0szqbdrd5dqnfj0xa"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; }; kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; }; + kerasformula = derive2 { name="kerasformula"; version="0.1.1"; sha256="0c19208y9v8a1w4p54z7yng5vvmb6h79fs0a20ij98ngys9afbwz"; depends=[dplyr keras Matrix]; }; 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.2"; sha256="04bdggxvggmppp289n2zw6ijdm7y05gws6z7bp6fr8n1zsxy2w3c"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; }; kerndwd = derive2 { name="kerndwd"; version="2.0.1"; sha256="1grinlqjjsxw1x152f9y38lhijh74zc831ddc0lk2niq2rvzszdw"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; - kernelboot = derive2 { name="kernelboot"; version="0.1.2"; sha256="0k06zxq8978v7zsfylxld64819vd3wj33brpxz0fan3ni01rh7kn"; depends=[future Rcpp]; }; + kernelboot = derive2 { name="kernelboot"; version="0.1.4"; sha256="1d1l9sbnlyx5a88qmd6q2zxlkr6dykcwlkk648yqmmfvqmq4xjmj"; depends=[future future_apply 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]; }; + kexpmv = derive2 { name="kexpmv"; version="0.0.3"; sha256="1nx2bpyc06vlr78nhig4zaaygphjp4wqsz9jzhs4qx8wy3kh7rmy"; depends=[Rcpp SparseM]; }; + keyholder = derive2 { name="keyholder"; version="0.1.1"; sha256="1dp326vayjzjpfhd2ajrpqjvbn6vvqa7iw9mdhblprz4cvv65g30"; depends=[dplyr rlang]; }; 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=[]; }; keyring = derive2 { name="keyring"; version="1.0.0"; sha256="0asa62cgs08k0g0yhvsxr2k8rfxy3hqkd4hrv0396394v13b08w5"; depends=[assertthat getPass openssl R6]; }; keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; }; + kfda = derive2 { name="kfda"; version="1.0.0"; sha256="0861hzry55gj8ykdd8cwil1wb7234pkmipp4v1749fpmzggq1xgi"; depends=[kernlab MASS]; }; kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; }; + kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; }; kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; }; - kimisc = derive2 { name="kimisc"; version="0.3"; sha256="1cdjhfdfidilvz0w92xfjwwnp2h73y8l1n7fxnh5jsv6wnx491l4"; depends=[plyr pryr]; }; + kimisc = derive2 { name="kimisc"; version="0.4"; sha256="0nbjspbq9akhmamfdn192p5b6ki7xqhp422ih6v77xsnrhl5m24z"; depends=[memoise 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=[]; }; 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]; }; - kirby21_t1 = derive2 { name="kirby21.t1"; version="1.5.1"; sha256="0gs39fy8wxrilgfyz1dlkaar4gf9qifcdxc4vzy2vha0z2ci46sy"; depends=[kirby21_base]; }; + kirby21_base = derive2 { name="kirby21.base"; version="1.6.0"; sha256="1l9ynmkh27m6c3862j7xqiydanknd1zplqvsay5amh7k13isj9gg"; depends=[git2r]; }; + kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.6.0"; sha256="15dhb7d2xrka55gg4f1n74dysj74c4fv9hpdx2n1vc79n90zl6yr"; depends=[kirby21_base]; }; + kirby21_t1 = derive2 { name="kirby21.t1"; version="1.6.0"; sha256="0zanqmndm15fld31g7zpam3y3z63aw1sgk74ya2l95cn21ln34a3"; depends=[kirby21_base]; }; kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; }; kitagawa = derive2 { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; }; kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; }; @@ -7129,6 +7590,8 @@ in with self; { 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]; }; + kmed = derive2 { name="kmed"; version="0.0.1"; sha256="0vcks4n0dpfd5cl5b8mhvhw6r2f3y12jn3d3j3dkj2grxmb9lh4c"; depends=[ggplot2]; }; + kmer = derive2 { name="kmer"; version="1.0.0"; sha256="0zknmcmv96bq0yqmmbshjwwh7vy2iwks4masmglayx7jw323n9cx"; depends=[openssl phylogram Rcpp]; }; kmi = derive2 { name="kmi"; version="0.5.3"; sha256="0b3nibvi0skrx3mjfzypqmdqx8s9zkn11f0ljscqpjr28idx4hr0"; depends=[mitools survival]; }; kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; }; kml3d = derive2 { name="kml3d"; version="2.4.2"; sha256="1a3hqyhrsh12l1j1xlz4zy88impw3biz6w2qc80r11m549h0m6s9"; depends=[clv kml longitudinalData misc3d rgl]; }; @@ -7137,20 +7600,21 @@ in with self; { 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.8"; sha256="07h8d5cp52qcm0912c55j59k2p3c7s4af87qa7a9hafhgimnsdiv"; depends=[digest httr RefManageR]; }; - knitr = derive2 { name="knitr"; version="1.17"; sha256="00gljbz57n9lkvbd6az4n37gpbs8vg3fxx5p9biamhmhqyra514l"; depends=[digest evaluate highr markdown stringr yaml]; }; + knitr = derive2 { name="knitr"; version="1.20"; sha256="1408dm25cxahk2clff8hlajaqdj5v1gs40nm3q6rf0ghd82hj93v"; depends=[evaluate highr markdown stringr yaml]; }; knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.1"; sha256="089147g7nqp99rwdxxsfmklsrwc8aia09sr8ndmrc335r33v6r6p"; depends=[knitr markdown rmarkdown]; }; + knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; }; 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]; }; - knor = derive2 { name="knor"; version="0.0-2"; sha256="1fpck9n3p16ii4ycr4daz8if71yps2bb4rq53sy2q4z9gqq7fr2q"; depends=[Rcpp]; }; + knockoff = derive2 { name="knockoff"; version="0.3.0"; sha256="0irqbidp00rh07xsfyyv5d3ksa4fn9vv49rsy8ah2gb9y41iy046"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; + knor = derive2 { name="knor"; version="0.0-5"; sha256="19wjrcmfam1ck5vbidksmy923d5p5llikjxn0v248vzfz96ia1yc"; depends=[Rcpp]; }; knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; }; kntnr = derive2 { name="kntnr"; version="0.4.1"; sha256="0d78mgmz2yhfbf4m5jaa28aazaw2wf9vf1vxl53wrnpy0hxw329y"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr tibble]; }; 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]; }; + kofdata = derive2 { name="kofdata"; version="0.1.3"; sha256="135fkfciya8d215iv0ir7kmd01w7rlzqfcif5jz918skrv2p9mcl"; depends=[httr jsonlite xts zoo]; }; kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; }; kohonen = derive2 { name="kohonen"; version="3.0.4"; sha256="1aq98qbmbzsdyimhn28qiyqfrwkwq70qmm5yhx0rvhjq53bn9622"; depends=[MASS Rcpp]; }; - kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.2.0"; sha256="1sk7r5v3d65w126vin9gawan3f21zrd9ps974l9nxj7kv1pa3szh"; depends=[digest dplyr httr purrr rgdal shiny xml2]; }; + kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.4.2"; sha256="1nwydfyr9waa5h8h8nrmwxy0jx7i4893g5khfv6b4g09z6g5cyly"; depends=[curl dplyr glue httr purrr rlang sf shiny stringr tibble xml2]; }; kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; }; komadown = derive2 { name="komadown"; version="0.1.0"; sha256="08rg2qz4dmxl4xi0d7wdl2xgdmsc29fdc0yi40yddzrbpj4vs2z4"; depends=[bookdown knitr rmarkdown]; }; kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; }; @@ -7159,39 +7623,42 @@ in with self; { kpodclustr = derive2 { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; }; 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.7"; sha256="01s5lzv5nmj5c8siz9wpiqcnixdhcqd5z5fhc5g7x6ym3xgcc1d5"; depends=[FNN KernSmooth misc3d multicool mvtnorm rgl]; }; + krm = derive2 { name="krm"; version="2018.1-24"; sha256="0qysv61vjdz8674hn6mk0913dkm2bfkqmr7cybls9z9h4i068vdk"; depends=[kyotil]; }; + ks = derive2 { name="ks"; version="1.11.0"; sha256="1wbw6zqsm7n65hbxiabpap2nbqq7795ir2r3fd7rw125hibj73k4"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv misc3d multicool mvtnorm OceanView 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]; }; + kst = derive2 { name="kst"; version="0.3-1"; sha256="1b4lqjg9j91qhr5gk0y1xsyfbhgaixza7qw6kl05yz88p6m7p35z"; depends=[proxy relations sets]; }; + kstIO = derive2 { name="kstIO"; version="0.1-0"; sha256="04s8lyg7622zcq947qlx5brwf1an7icg94i5di8vwjp7d8zgczq6"; depends=[MASS pks sets stringr]; }; 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="1.0"; sha256="12rlvaqq0dgz9qvm7lnmr3x90gg5iz58jh3d1hf08lbj4s50a8d4"; depends=[lavaan openxlsx plyr xtable]; }; + kutils = derive2 { name="kutils"; version="1.34"; sha256="17f6pzinmp4lcjd5glhnvbjy1yg912jccx9d4n55bini93vlcz0z"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; }; + kvh = derive2 { name="kvh"; version="1.1"; sha256="1dvq7wbpx1hpjshvsihivd8q8hyhji047gifxc6cjnv778r4irb1"; depends=[Rcpp]; }; kwb_hantush = derive2 { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[hydroGOF lattice]; }; - kyotil = derive2 { name="kyotil"; version="2017.6-1"; sha256="1ia4c9y7fk5myjxyfq1zfk6k80z7hwn0b034ks9hrnms8da21dv1"; depends=[]; }; + kyotil = derive2 { name="kyotil"; version="2017.12-27"; sha256="0xd64xg3nj0pj0ziycq4ndpl8kwxfng96ag8zmqzzxk85zw2vyq3"; depends=[]; }; kza = derive2 { name="kza"; version="4.0.0"; sha256="0yfn6ijbskdkcgbgk4fwhgiiy34cw9k9vy1psi779mqd9kyjf56j"; depends=[]; }; 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.5"; sha256="15qajzpvqnikg9k199cqvwp9qbrxx4zr9lsvyad96pa9qr156gvb"; depends=[Rcpp RcppArmadillo]; }; l1kdeconv = derive2 { name="l1kdeconv"; version="1.2.0"; sha256="1mk92sz9nsmxsn7yplhfcz07k022lrr61114ckrmm0x8hfd89zj8"; depends=[ggplot2 mixtools]; }; - l2boost = derive2 { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; }; - laGP = derive2 { name="laGP"; version="1.5"; sha256="0b308biwkjndzr9jrxi8m2yc55kyik17xza1xfgghksix2wc2mgz"; depends=[tgp]; }; + l2boost = derive2 { name="l2boost"; version="1.0.1"; sha256="0f2gapzpvjnr8n1jgn60jpmcas4s8nk2q8q4k5v4ypwvpfqp7kk1"; depends=[MASS]; }; + laGP = derive2 { name="laGP"; version="1.5-1"; sha256="0sqzvz78p50afp892p7ghy4fmy9p3a2ik51bzzwrx6r96ax7w971"; 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]; }; + labelVector = derive2 { name="labelVector"; version="0.0.1"; sha256="0iwk8p3m2g6732q2pilwr3wlaiys15khd54r0vxsp2irlw77lzrg"; depends=[]; }; labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; }; - labelled = derive2 { name="labelled"; version="1.0.0"; sha256="02jg7zq52wfq2dw8a26vmp28bv88v651ysbqfqf7jv3dr9xgim4f"; depends=[haven]; }; + labelled = derive2 { name="labelled"; version="1.0.1"; sha256="18mz4qraxalq50rzmblsvavx4isb4194rj4iqab09qzh8ib1qzwv"; depends=[haven]; }; labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; }; - labeltodendro = derive2 { name="labeltodendro"; version="1.3"; sha256="13kpmv26zzjf5iwpr4vs797irplmaixp1agx5v80wr4lvd2hirvg"; depends=[]; }; labstatR = derive2 { name="labstatR"; version="1.0.8"; sha256="1qs76vhw6ihsriq5v0s980fxbb0pbvgwqm0a97b226cpqqabkpfm"; depends=[]; }; 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]; }; + lagged = derive2 { name="lagged"; version="0.1-1"; sha256="062a9hrnp2bsahsdasml0wzqpapyslfiwy9q2mvwqsl6j2pqkk0s"; depends=[]; }; + lagsarlmtree = derive2 { name="lagsarlmtree"; version="1.0-0"; sha256="0nrrr2n2q228d1c7qrhcnczmr374i56p7kr868yl19g8ddd3gx3w"; depends=[Formula partykit spdep]; }; + lakemorpho = derive2 { name="lakemorpho"; version="1.1.1"; sha256="0asrp9rvyi5ykxw922qx25rgxvyc9mh4sc7qkbpwzqw8xvgpad2z"; depends=[cluster geosphere raster rgdal rgeos sp]; }; laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; lamW = derive2 { name="lamW"; version="1.3.0"; sha256="00qa1sxyqb2r7f9yidg43cq2v1285f45xpm3z928jpi424mpg0fc"; depends=[Rcpp RcppParallel]; }; lambda_r = derive2 { name="lambda.r"; version="1.2"; sha256="0vql32np716dpd0kjn7s7wgawd02ysgp2a5il4kb19nlw661ii3x"; depends=[]; }; @@ -7202,54 +7669,59 @@ in with self; { landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; }; landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; }; languageR = derive2 { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; }; - languagelayeR = derive2 { name="languagelayeR"; version="1.1.0"; sha256="1588bdv2nwqvzkhj607b3r8z8hkp2bay4bhh0nm2b89q1a7r2g4v"; depends=[httr magrittr rjson]; }; + languagelayeR = derive2 { name="languagelayeR"; version="1.2.3"; sha256="1sh3k8xw88pm93wmpy1qi44i8pv5b5g6ajzas36bdi1bqm8cqzax"; depends=[attempt curl httr rjson]; }; + languageserver = derive2 { name="languageserver"; version="0.1.0"; sha256="05ph152xrw8qmnb1mwqsq2qx11d6f4g57v9qp1mxi6y11wl21rxq"; depends=[callr jsonlite lintr R6 repr stringr]; }; lans2r = derive2 { name="lans2r"; version="1.0.5"; sha256="1m3hz85gl9m4vafdy7mj3z560d11mdwlwvnzy8n7d1cjqryn7a2b"; depends=[dplyr ggplot2 lazyeval R_matlab reshape2 tidyr]; }; lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; }; largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; }; - largeVis = derive2 { name="largeVis"; version="0.2.1"; sha256="0jzqkgs81xf3wgw8mx6mgvy2sgriakbhzbiizmbk24q177dw09bx"; depends=[ggplot2 Matrix Rcpp RcppArmadillo RcppProgress testthat]; }; + largeVis = derive2 { name="largeVis"; version="0.2.1.1"; sha256="14jgfykvawcqmb94zwpss246ljbwf4qdgmpwwfsnplrxs7agycb5"; depends=[ggplot2 Matrix Rcpp RcppArmadillo RcppProgress testthat]; }; lars = derive2 { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; }; lasso2 = derive2 { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; }; - lassopv = derive2 { name="lassopv"; version="0.1.3"; sha256="07b7n74z4jvrirf0rc0sbvz9nm2s2s22mb8y973iwpf0i7fqxq2c"; depends=[lars]; }; + lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; }; lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; }; lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; }; 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.8.0"; sha256="05r7hzj5i7rgpxl798lwi2m62l1qkl5zdza0q2awcd5ydkgj34hp"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; }; - later = derive2 { name="later"; version="0.4"; sha256="189kx72lyf0yrsy0yq3w8aym9vb17347kvgfj915z3sf7hfr6349"; depends=[BH Rcpp rlang]; }; + later = derive2 { name="later"; version="0.7.1"; sha256="0z9jymmclkq9zcg1fd8p6gsnm5z1sn3n9pfz3bs03qjrkbizgrvz"; depends=[BH Rcpp rlang]; }; latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; }; + latexpdf = derive2 { name="latexpdf"; version="0.1.3"; sha256="1zsdz3nvhifxbhp69nigq1crgm39g6gmc8xl5akp5jdidmzyrh84"; 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.5"; sha256="0x6s7x111x87a4rh5nbk7vw6j4iq40i1c21w0j795h28rgyc7zc2"; depends=[numDeriv survival]; }; + lava = derive2 { name="lava"; version="1.6"; sha256="02xf5d968raz9gnq5ywy04wz29xpdyca1hm79vbbg1mcxvzdl1dz"; depends=[numDeriv SQUAREM survival]; }; lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; }; + lavaSearch2 = derive2 { name="lavaSearch2"; version="1.1.0"; sha256="1nmzj4yfgas6a9wss34ckd55gajxmd9a0fk8lmpxc2130hlr4ld8"; depends=[ggplot2 lava MASS Matrix multcomp mvtnorm nlme reshape2 sandwich]; }; lavaan = derive2 { name="lavaan"; version="0.5-23.1097"; sha256="11wxzjg09q5wzvbp1lhi9sjnp4rrjpdxnmq3zf8npx08iwkw79ws"; depends=[MASS mnormt numDeriv pbivnorm quadprog]; }; lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; }; lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; }; - lavaanPlot = derive2 { name="lavaanPlot"; version="0.1.0"; sha256="13m4rsh0nbqfnyasbrf3bw844jg1l7bqd2drckrqwss2h7ks029q"; depends=[DiagrammeR lavaan]; }; - lawn = derive2 { name="lawn"; version="0.4.0"; sha256="1fg5bn2h1lqxnbmf317nh8myi6zg2qj60hxdhqcsqczjk3b6a2n5"; depends=[jsonlite magrittr V8]; }; - lawstat = derive2 { name="lawstat"; version="3.1"; sha256="0sdsxh2h06d3maqd1pvmnnvphaxav0z2kv5wpiy7dg17cgwv35c2"; depends=[Hmisc Kendall mvtnorm VGAM]; }; + lavaanPlot = derive2 { name="lavaanPlot"; version="0.3.0"; sha256="12j6r98p4ghcnk813s2z9r1mlwzkp6jyxjllk5nl554h5s5jg92i"; depends=[DiagrammeR lavaan]; }; + lawn = derive2 { name="lawn"; version="0.4.2"; sha256="17nj88n5xzhjkwm0hi8g9h5a3nclvkq3k1pv3690ph14g4l9lgcj"; depends=[jsonlite magrittr V8]; }; + lawstat = derive2 { name="lawstat"; version="3.2"; sha256="03ppzyx3x6vx1n2k5l8gl9j2q2mnqa1im5smxnrlncan7yzjy7sf"; depends=[Kendall mvtnorm VGAM]; }; lazy = derive2 { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; }; lazyData = derive2 { name="lazyData"; version="1.1.0"; sha256="0mbmmx6dh8ph4lrx1b4gxbwz3jwxv4nqi0xvfzpzrm3bwbsjc634"; depends=[]; }; - lazyWeave = derive2 { name="lazyWeave"; version="3.0.1"; sha256="02c3z479y6xxng2x6vp6m0rvf3jsb9n26h00l93djxads8717i1x"; depends=[Hmisc]; }; - lazyeval = derive2 { name="lazyeval"; version="0.2.0"; sha256="1jwdz40nznlc44hpjli7h98gnpa4d98ifggmj7z88h84n9aqywqk"; depends=[]; }; + lazyWeave = derive2 { name="lazyWeave"; version="3.0.2"; sha256="1a7l0rgkp3xq2s6bikciq778fwyr282baa6jk9ip4a71s931p2ag"; depends=[Hmisc labelVector]; }; + lazyeval = derive2 { name="lazyeval"; version="0.2.1"; sha256="0q9zx78ncy2ffzrf9sh053069kd3w1xn1ss3gsbyf3y4jhza9cw3"; depends=[]; }; lazyrmd = derive2 { name="lazyrmd"; version="0.2.0"; sha256="0ahm1wspvm625lx7y2zz05bvv66rlswphs84vpkcqb0dqfcn3s48"; depends=[digest htmltools htmlwidgets knitr rmarkdown]; }; lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; }; - lba = derive2 { name="lba"; version="2.4.3"; sha256="0q83abkdwxrj4x17wrx0zcmv2z8rzji0qzz8psvjx1vkcxma3ix7"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; + lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; 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.1"; sha256="13gzjkrnsdkxzinfzb0fvpijif8n66xxjmwfqpg99hgc13kn9y36"; depends=[MASS]; }; + lbreg = derive2 { name="lbreg"; version="1.2"; sha256="0wcw5w07fgmxwzmamf380l8vxw9fnxhbrhcwwfy6x87xby3bzr1b"; 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.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-6"; sha256="06hhz0sjdrci1li03f09wij1qrl74sla2938fbkx72ffy0mdg310"; depends=[MASS pscl reshape weights]; }; + lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.0"; sha256="0m8wfp8vs4pgzmxinlbxask1i0z6mf35cyyib77mbyqlfvf0hic0"; depends=[quantmod TTR xts zoo]; }; 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]; }; + ldat = derive2 { name="ldat"; version="0.1.0"; sha256="1ga96m1sl7khhwi41ab07k02ay4w8vzi5cl895h9kfavgbhqsf6m"; depends=[BH lvec]; }; ldatuning = derive2 { name="ldatuning"; version="0.2.0"; sha256="18nm4hj7733c1cp03hyddnivhiiyv7ndnw9m6j3af019jjmvf215"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; 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.2"; sha256="0kfhb53p1pzgbn8v7hy3sqb0q04hrm7cbykv7bml0hn30z4r8hjx"; depends=[ecd ggplot2 moments optimx scales xts zoo]; }; + ldhmm = derive2 { name="ldhmm"; version="0.4.5"; sha256="1pax1hl0h07nc9d34pf0jqgpcxr7y7dpqcm2hlclrmsinhj9q8vi"; 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.1"; sha256="152dlphxxzllgf7al8k34qcfg6n8ajxqym62i61ahbbgjlcd0x9r"; depends=[camel cluster corpcor evd fExtremes huge igraph MASS Matrix qvalue RBGL robustbase VGAM]; }; @@ -7259,7 +7731,7 @@ in with self; { 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.5.1"; sha256="037x7ajdwshhmjf5cr4ha5bw1cc53cbczdc3ybdl4kp2i07gwrsq"; depends=[htmltools leaflet]; }; + leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.5.2"; sha256="028nw9nh4q3lkw9kr4lgs78wnm79ynkjx7f215ch42183nfzlypi"; 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]; }; @@ -7267,78 +7739,84 @@ in with self; { learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; }; learningCurve = derive2 { name="learningCurve"; version="1.1.1"; sha256="1rvh6i3vmwrff491k9w551402m3i9sra8rzkljgk9b5fmw7hk5ki"; depends=[ggplot2 gridExtra scales tidyverse]; }; learningr = derive2 { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; }; - learnr = derive2 { name="learnr"; version="0.9"; sha256="0iz2wr999h7wamjfkg8frrm3y088hvfj7nswh9ya6amly0adglcr"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; }; + learnr = derive2 { name="learnr"; version="0.9.2"; sha256="1z04c1djg7ghsl7p9ypc6k5m7snahnmjy10xmrzqfayx1wkfkn9n"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; }; learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; }; learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; }; lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; - lemon = derive2 { name="lemon"; version="0.3.1"; sha256="0p0hvw0ndqcxcg8sqwk1kfrlksp985vd4jpkww7ijmw6kmwl9mwy"; depends=[ggplot2 gridExtra gtable knitr lattice RCurl]; }; + lemon = derive2 { name="lemon"; version="0.3.3"; sha256="0jxcyplr69a3rganqc02ry57xj7is7dylsh9kvsy6kwnji6bvdib"; depends=[ggplot2 gridExtra gtable knitr lattice]; }; lero_lero = derive2 { name="lero.lero"; version="0.1"; sha256="1jndsgy48fn085ilkh8dfc3w76kfnfj0x70d1m3h59zxi3x9lb82"; depends=[stringr]; }; - lessR = derive2 { name="lessR"; version="3.6.6"; sha256="1i02i9lzgx8rf5x7pcp1vxvsgdl9jdnldj7q7qg22blaphdbl7qb"; depends=[ellipse foreign lattice latticeExtra leaps png readxl robustbase sas7bdat triangle]; }; + lessR = derive2 { name="lessR"; version="3.7.0"; sha256="14zzm7dsjwl94bcnzrkf8bk83nxsini11s5l0pia31xnm6yl89ln"; depends=[colorspace ellipse foreign lattice latticeExtra leaps png readxl robustbase sas7bdat triangle]; }; lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; - letsR = derive2 { name="letsR"; version="3.0"; sha256="1mm0d7v29d594w2xxv6h1k6dsav2cs31hi64lyxjar1bi4snp6hj"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; + letsR = derive2 { name="letsR"; version="3.1"; sha256="0wyqqq7w21k87md3pwsz3kdaws345fdhh2xgavwiiywalg0gvxxx"; 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.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]; }; + lexRankr = derive2 { name="lexRankr"; version="0.5.0"; sha256="1l0p4qg6lcpp1f2n6mh1glvxzy3bis0c1ra8x9z5v26x31wmwq68"; depends=[igraph Rcpp SnowballC]; }; + lexicon = derive2 { name="lexicon"; version="0.7.4"; sha256="1f2n90xdpbxk6ffzzlib7fxxswwkfrpf404vzx85s016529dy42m"; depends=[data_table syuzhet]; }; + lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; }; 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]; }; + lfe = derive2 { name="lfe"; version="2.6-2291"; sha256="1hdzq85y1nxrinikf308mvdmyw883bfzbamr27ffdphlk403ry70"; depends=[Formula Matrix sandwich xtable]; }; 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]; }; + lg = derive2 { name="lg"; version="0.1.0"; sha256="0gaid5aihc9dk3igbm8jhsspl1k4k3prqvn7j2vsm92jc7m00iyw"; depends=[ggplot2 ks localgauss logspline mvtnorm]; }; lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; }; lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; }; lgcp = derive2 { name="lgcp"; version="1.4"; sha256="10gnfqq5vx18w6f52fliyfnrjmyns9q5q59pn2m82q2fqwaz26d8"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; }; lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; }; lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; }; - lhs = derive2 { name="lhs"; version="0.14"; sha256="1qnr3s9511nq3xqdbngllmw3mvnnpblma5dafyghxlpvydc2l481"; depends=[]; }; + lhs = derive2 { name="lhs"; version="0.16"; sha256="09clh386i5iig8x36lx02p01zqq0kb9hzvw5slv1ggmjnp1rklcw"; depends=[]; }; libamtrack = derive2 { name="libamtrack"; version="0.6.3"; sha256="0pdwrz19q1yls0rgr4579f31j86awizx3j31h7vdh6y70ngpmb82"; depends=[]; }; - libcoin = derive2 { name="libcoin"; version="0.9-3"; sha256="1gmgppc5vf11zmsbyayljijd9n3n9j0ns1hia0x7m5jm6nyjxgql"; depends=[mvtnorm]; }; - libsoc = derive2 { name="libsoc"; version="0.5"; sha256="0p01mcwnkb4g3dq0mx1gbwfbznp4b2dmhs8k8wmnh7wll16v9i6z"; depends=[]; }; + libcoin = derive2 { name="libcoin"; version="1.0-1"; sha256="1i38v0pq5snx9clhgfiymk6lq87h41pajhp2dvin30snnq0py6qq"; depends=[mvtnorm]; }; + librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; }; + libsoc = derive2 { name="libsoc"; version="0.6.4"; sha256="1hdnqgnvzm5116gphxa55k2bc3ksr607px2s2yg1ilmmxdghdccw"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0"; sha256="0qk70rl76lz2izgp2c1asx0yvi8xgfq1yg579kcygxk4pnxjdwv4"; depends=[Rcpp]; }; - lidR = derive2 { name="lidR"; version="1.3.1"; sha256="162gf587rhpfx29kxlq21axhvjxkj9bx5zryl3vfzad9309n0an9"; depends=[data_table gdalUtils geometry gstat lazyeval magrittr mapedit mapview memoise raster Rcpp RcppProgress rgeos rgl rlas settings sp stringr]; }; - lifecontingencies = derive2 { name="lifecontingencies"; version="1.3"; sha256="0qjx7czyrk47lnpq3aw43hh2z8b8yiqllcayk911f1hpf5vwbcir"; depends=[markovchain Rcpp]; }; + lidR = derive2 { name="lidR"; version="1.4.1"; sha256="01nw6i7ddk99zayblqhxsnx2cy29ippii9vdqahffv91644iqqb1"; depends=[data_table future gdalUtils geometry gstat lazyeval magrittr mapedit mapview memoise RANN raster Rcpp RcppProgress rgeos rgl rlas settings sp stringr]; }; + lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.2"; sha256="012pfiz4l8xrwrjlzwfc0vxw1wpw2n2f2vj39mlpmg5aswg4mm8k"; 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-6"; sha256="1mnrhdig7kb7g6ffw7x9l8bpn66y7bh3n6ds5r2gb3nplnidi45y"; depends=[adlift nlt]; }; - liftr = derive2 { name="liftr"; version="0.6"; sha256="1i4d9fsyik8i0dcpp8drsm3xmjnmb8i48fxgci959n8f7w384w57"; depends=[knitr rmarkdown rstudioapi stringr yaml]; }; + liftr = derive2 { name="liftr"; version="0.8"; sha256="1z5n7xfmaymkz9pl6pbss351dy626nd0m1wn4jpbxvx74fw99a1y"; depends=[knitr rmarkdown rstudioapi stringr yaml]; }; lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; }; - likeLTD = derive2 { name="likeLTD"; version="6.2.1"; sha256="1b5rg1nijc4vsl7xabq35ini84rpnd1yrxsk1vr7wd57yac25mmk"; depends=[DEoptim gdata ggplot2 gtools rtf]; }; + likeLTD = derive2 { name="likeLTD"; version="6.3.0"; sha256="1mjf4667xd9pf2684d7vqaj54l5s9pgljn4vkfp32wzbfknq6y8r"; 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]; }; + likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.50"; sha256="009alsxsv9fjpihp3zl0a94y6cvr49nh21skba64lzz9fypm9j8l"; depends=[alabama cond digest nleqslv pracma Rsolnp]; }; + likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; }; likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; limSolve = derive2 { name="limSolve"; version="1.5.5.3"; sha256="1ll6ir42h3g2fzf0wqai213bm82gpwjj2hfma2np3mz024sc09rg"; depends=[lpSolve MASS quadprog]; }; - lime = derive2 { name="lime"; version="0.3.0"; sha256="0ly921qf1hhcg6djbqxn0r6pbqxx4dznjy17hmskk9dmm7cadipf"; depends=[assertthat ggplot2 glmnet htmlwidgets Matrix Rcpp RcppEigen shiny shinythemes stringdist stringi]; }; + lime = derive2 { name="lime"; version="0.4.0"; sha256="0hml1f3fq21s45h1cg3qi4w7vdfdxcsz8q4h1429gbppbdanz9i1"; depends=[assertthat ggplot2 glmnet gower htmlwidgets magick Matrix Rcpp RcppEigen shiny shinythemes stringdist stringi]; }; 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.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]; }; + linearQ = derive2 { name="linearQ"; version="1.0"; sha256="0c6ccllv4zf8zgs3957zjvnkdwbv2ryrs0f5lzk1clc233vm7acm"; depends=[Rcpp stepR]; }; linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; }; lineup = derive2 { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; }; - lingtypology = derive2 { name="lingtypology"; version="1.0.7"; sha256="1257yxhqizzhl8cdllagk05ny5k4wsh1kgjc1vy7i0x7zi8jlkk1"; depends=[leaflet magrittr MASS rowr sp stringdist]; }; - link2GI = derive2 { name="link2GI"; version="0.1-0"; sha256="1i16yf387izv8vn0z8f7wgk02hld83lhfb5c263mn1v3q5zj9kki"; depends=[gdalUtils raster rgdal rgrass7 sf sp]; }; + lingtypology = derive2 { name="lingtypology"; version="1.0.12"; sha256="03rjnr4hy7im88pawrd86nas0fzkgz3mnzdc8rclcfbbv1vyzxf5"; depends=[leaflet leaflet_minicharts magrittr MASS rowr sp stringdist]; }; + link2GI = derive2 { name="link2GI"; version="0.3-0"; sha256="0jzk1p9cygcw0xz9hqfzx74acl4ymn3jmcjj0dxrmknsvfdzcl2d"; depends=[gdalUtils raster rgdal rgrass7 RSAGA 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=[]; }; + linl = derive2 { name="linl"; version="0.0.2"; sha256="1n3sljyycsppk11ri9jijsif3g7v4n8xvk1n4hhx0qg65kh7wmry"; depends=[knitr rmarkdown]; }; linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; }; lintools = derive2 { name="lintools"; version="0.1.1.4"; sha256="18rqpm0cg233hclcqskdh3mfpwpbawc582j800mjalii233jzr36"; depends=[]; }; - lintr = derive2 { name="lintr"; version="1.0.1"; sha256="08yw80imf71vkhhp7szhwk4lswhs0fsnfc6d2kwrwkmbqwsjswzc"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; }; + lintr = derive2 { name="lintr"; version="1.0.2"; sha256="14l6fi2mdc2swi4xw865q63yngk2b5k553qbyvnhmwq2w4pv07pn"; 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.2.1"; sha256="0nw8n4qg2jijbnlza15ifzqsl4pj7gjzi4nd71zp7h0aw5mnp80x"; depends=[]; }; - lira = derive2 { name="lira"; version="1.2.0"; sha256="1n4vjq5v0qj26bq56w5vchwdv10ysc94aizblwm1wl9ss8lpsc0a"; depends=[coda rjags]; }; + lira = derive2 { name="lira"; version="2.0.1"; sha256="10bjmapnlw5z5cnbdpkwisvjkmk7zi9xqrvgmb5psj317zcxfc2p"; depends=[coda rjags]; }; liso = derive2 { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[Iso MASS]; }; 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.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=[]; }; + listenv = derive2 { name="listenv"; version="0.7.0"; sha256="0ma5jsri2zqkrlsm9nqpikl7imbwfy1glsmk13mblw0q245h49k1"; 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=[]; }; + liteq = derive2 { name="liteq"; version="1.0.1"; sha256="080ljgb2qsfmyppnlp9acmskgq94pmdbbgbhygqkxvzda5bbas8h"; depends=[assertthat DBI rappdirs RSQLite]; }; + littler = derive2 { name="littler"; version="0.3.3"; sha256="1cbsnm4ffzld93b9q8g6g6h6yskjfwa8j1xani5682ipb7r290x7"; depends=[]; }; liureg = derive2 { name="liureg"; version="1.1.1"; sha256="11cybb1i3a0na3yadzwmn1hlglqk0zdzxj0n07ygsxrdq7sxbpnj"; 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=[]; }; @@ -7350,16 +7828,15 @@ in with self; { 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.11"; sha256="1yvckfahw3kq0r28ggrml7qhgm4ib5ihd971zxg62li4inrkri6b"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; - lme4 = derive2 { name="lme4"; version="1.1-13"; sha256="13j4a721rx0272pdxrz6nabjv56xb6srklq5w4z1abc82lyvda2z"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; + lme4 = derive2 { name="lme4"; version="1.1-15"; sha256="0sc6rvhiizxxpkdc3wps200wg3pqc0d89crn29lzm75fk8qdd7vx"; 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]; }; - lmeVarComp = derive2 { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; }; lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; lmem_gwaser = derive2 { name="lmem.gwaser"; version="0.1.0"; sha256="0i315plqq1c8d7nvzk7jj9b3n4pgy27673pgdbii4c5bccwm12vn"; depends=[fdrtool genetics lattice LDheatmap lme4 pastecs qtl stringr]; }; lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; }; lmenssp = derive2 { name="lmenssp"; version="1.2"; sha256="1vc90x3y1vzmzblc15kqar3nd3c3p8p9nvmpk0ib52n0qv5pr6wz"; depends=[geoR MASS mvtnorm nlme]; }; - lmerTest = derive2 { name="lmerTest"; version="2.0-33"; sha256="1r4bwxq36hn41hwjph2nrn4jhh0y2kwc746374ng5jd480gkgl8m"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; }; + lmerTest = derive2 { name="lmerTest"; version="2.0-36"; sha256="1ja56y45fdxa5xqwzng4rk3vjcfjvmchfcpdy08lv9dzkp71g1qp"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; }; lmeresampler = derive2 { name="lmeresampler"; version="0.1.0"; sha256="00v3qg5vyjjb0pcbrknzxy80kkwsypkhwkv3nsck5rscaf86y3aq"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; }; lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; lmfor = derive2 { name="lmfor"; version="1.2"; sha256="1lad1sfrf6lsksix4nn2c2dc5fx0rfm4kdhvbmqf9dc55f98rla8"; depends=[MASS nlme]; }; @@ -7369,15 +7846,15 @@ in with self; { lmmot = derive2 { name="lmmot"; version="0.1.4"; sha256="1a8msh9yvvd7cv1zxlxdv8arlfvxqghxzcxls23v6ifl5jf4d1p3"; depends=[MASS maxLik]; }; lmmpar = derive2 { name="lmmpar"; version="0.1.0"; sha256="1l3zjmlfjfn2wv4yayqzv6qrwaxk2sgx3hjx371b5fs54zspdj20"; depends=[bigmemory doParallel MASS matrixcalc mnormt plyr]; }; 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=[]; }; + lmodel2 = derive2 { name="lmodel2"; version="1.7-3"; sha256="1fiin2nkffbihz1s8ixmw9lgf8mn3j9krr8iiflizk10mdv54hnb"; depends=[]; }; lmom = derive2 { name="lmom"; version="2.6"; sha256="0wxlclzypg6dnvk09k26pdgn3nijl06xsa9rny5l03xzar01mz5s"; depends=[]; }; + lmomPi = derive2 { name="lmomPi"; version="0.5.0"; sha256="07ggfzgvhc6kkqs8bbs6z01rbhgb0ki2y4li6r0nkiby1wcpx0py"; depends=[lmom stringr]; }; lmomRFA = derive2 { name="lmomRFA"; version="3.1"; sha256="1gq5sjdywz1jbsshrh350zad7iifml2yj8an5xa63ghxiskrxscx"; depends=[lmom]; }; - lmomco = derive2 { name="lmomco"; version="2.2.7"; sha256="1xrw2a3iyp0i2kmcwgq0sr10v40q5c2n84xx8dxpvl3978vqidj8"; depends=[goftest Lmoments MASS]; }; - lmridge = derive2 { name="lmridge"; version="1.0"; sha256="07zchmdcyz8agrs9q2ydcgicz3sxg893vv4rsynlpgyk2z5xnnjf"; depends=[]; }; + lmomco = derive2 { name="lmomco"; version="2.3.1"; sha256="0nyl18kipsab4ka5ywbmw28kkr6i09w4lc9pa96m1fh765zghjxi"; depends=[goftest Lmoments MASS]; }; + lmridge = derive2 { name="lmridge"; version="1.1"; sha256="1r4g7482iz4b7jk0gj169bj96ip2wyrff1ndkwhf0qzg6r6vqa8d"; depends=[]; }; lmtest = derive2 { name="lmtest"; version="0.9-35"; sha256="107br1l7p52wxvazs031f4h5ryply97qywg9dzrkw4ydnvqq4j9g"; depends=[zoo]; }; - lmvar = derive2 { name="lmvar"; version="1.3.0"; sha256="0iczn4r83gdsvb8hk7av3pjf3am0z7hpqdn7xqpnyby5sqga5kv9"; 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]; }; + lmvar = derive2 { name="lmvar"; version="1.4.0"; sha256="0pwpsdmqjlj79ybx5rw82qgkjzak941d9vvdzwipjh8n51mcvwcd"; depends=[Matrix matrixcalc maxLik]; }; + loa = derive2 { name="loa"; version="0.2.43.3"; sha256="0krrv5sicm4xvgilri8nwby6jlidx375b4sk273hxq7bhayw4hqq"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; }; localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; }; localsolver = derive2 { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; }; locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; }; @@ -7390,23 +7867,28 @@ in with self; { log4r = derive2 { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; }; 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]; }; logcondens_mode = derive2 { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; }; 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=[]; }; + loggit = derive2 { name="loggit"; version="1.0.0"; sha256="1h2m4a55v54nvgh665rzhxhzjqkky6lx0f8f43zqh7l152z7bsh2"; depends=[dplyr jsonlite]; }; + logiBin = derive2 { name="logiBin"; version="0.1.0"; sha256="146jh5cpydpvv8g3ccrglm88zp8sam4airw521cxcfyg5v8qvdqs"; depends=[data_table doParallel foreach iterators partykit]; }; + logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; }; logistf = derive2 { name="logistf"; version="1.22"; sha256="0npwqbl8rfvn6w2y0qpkckj44mvjjccj0cn9axp2wcs03cmz0rp8"; depends=[mgcv mice]; }; logistic4p = derive2 { name="logistic4p"; version="1.5"; sha256="0h0dxyklqc95ykyril1a3d2bdnszj5l9dqbxzh2wbfmk06prvh8b"; depends=[MASS]; }; logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; }; logitchoice = derive2 { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; }; - logitnorm = derive2 { name="logitnorm"; version="0.8.34"; sha256="08jm49picrxbwr8d0c64z5gbslrliq674vr0h30gljf3r9w6s5jj"; depends=[]; }; + logitnorm = derive2 { name="logitnorm"; version="0.8.35"; sha256="0bpj3dsxqwx96ffbx8479271nbf30pfvl7914m5af8hacqlga912"; depends=[]; }; loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; - logmult = derive2 { name="logmult"; version="0.6.4"; sha256="1p40ava74qdhzysp9w8bkp7hiwr6wq61gvc0jlm4cppxa7ag2n5n"; depends=[gnm qvcalc]; }; + logmult = derive2 { name="logmult"; version="0.6.5"; sha256="0ak13nfgaima6g75rxbghl7xmagfp4qshj09x1fxh2r2rcags7dk"; 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]; }; + lolR = derive2 { name="lolR"; version="1.0.1"; sha256="1lhhasbbpacqpc3d7bvw7q183czdjqc6xdlc7yafk7rnwgmpxjxz"; depends=[abind ggplot2 irlba MASS]; }; lomb = derive2 { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; }; longCatEDA = derive2 { name="longCatEDA"; version="0.31"; sha256="0dji41lsknfwmgb2fczzm37dm97wvi45rh878w7pwlzwdh9vq8va"; depends=[]; }; + longROC = derive2 { name="longROC"; version="1.0"; sha256="1fs11vqi4hy99d7shzzdvd6ic5gay6rh2027w6j0qpd04n8q88m8"; depends=[survival]; }; + longRPart2 = derive2 { name="longRPart2"; version="0.2.3"; sha256="1vqcsxi6c4hqrpk3ns7yhghfryin1psxl38qkz2xz8cvyn58f685"; depends=[formula_tools ggplot2 MASS nlme rpart]; }; 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]; }; @@ -7415,11 +7897,12 @@ in with self; { longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; }; 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]; }; - loon = derive2 { name="loon"; version="1.1.0"; sha256="1yqbv91sk241n4rv35g374015wy4hricpm5k8r78aaqdhzgl0539"; depends=[]; }; + loon = derive2 { name="loon"; version="1.1.1"; sha256="023vrnbn4pikiq6l57phwy9zy1lp6vxrkinrffaxwicvaj58c931"; depends=[]; }; 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]; }; lordif = derive2 { name="lordif"; version="0.3-3"; sha256="1yby9fvzdi1dzvzp6d6h144k1p9nfacd8l5bd66dmhnc8sp2nlx5"; depends=[mirt rms]; }; lorec = derive2 { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; }; + lori = derive2 { name="lori"; version="0.1.0"; sha256="1sqwfai0h776i3g0gxqfagisayv428gzw9540d90nzbrg9vkj28j"; depends=[ade4 FactoMineR glmnet lars lattice logmult NLRoot pdist psych svd]; }; lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; }; lpSolve = derive2 { name="lpSolve"; version="5.6.13"; sha256="13a9ry8xf5j1f2j6imqrxdgxqz3nqp9sj9b4ivyx9sid459irm6m"; depends=[]; }; lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17"; sha256="1gfxnjkhhyybhyg29qdrdqzwq569b6pgwjgacmw3q7aldc724cyz"; depends=[]; }; @@ -7427,25 +7910,26 @@ in with self; { lpc = derive2 { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; }; lpdensity = derive2 { name="lpdensity"; version="0.2.2"; sha256="1fv1biyc12zg0wfqcr5kp761fy6n6879knvlxr2zjp6rjssi3h6d"; depends=[ggplot2]; }; lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; }; - lplyr = derive2 { name="lplyr"; version="0.1.6"; sha256="1a7wry5v78z4aij7ii64340ycx30wqbm3x2wllka79gkll1fn78h"; depends=[bazar dplyr lazyeval magrittr]; }; - lpme = derive2 { name="lpme"; version="1.1.0"; sha256="1mq1lf4vdlbxjax9p8k17vdkc2h3xslbbs17xzy10fbkdicljc10"; depends=[decon flexmix Rcpp RcppArmadillo]; }; + lplyr = derive2 { name="lplyr"; version="0.1.12"; sha256="1wcab8wwdzpgb61q83gfn2d34vsrd3qa4xyb9sqna6krss1ii1in"; depends=[bazar dplyr lazyeval magrittr]; }; + lpme = derive2 { name="lpme"; version="1.1.1"; sha256="0si90nkgl8bqk8yvd2igdsrngiwqh8891072pfpzipifnd0f5448"; depends=[decon flexmix locpol 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=[]; }; lqmm = derive2 { name="lqmm"; version="1.5.3"; sha256="1gl609irhxk7qi4x8as2xylc6iybm9jyrnm7dvb92nxl0ksp44v7"; depends=[nlme SparseGrid]; }; - lqr = derive2 { name="lqr"; version="1.5"; sha256="1rcs6p8jx86r40ys8qiz5gynkfqyg3lkv7wsv551w9c5m3s1z2gy"; depends=[ghyp spatstat]; }; + lqr = derive2 { name="lqr"; version="1.7"; sha256="110c18wc3y3nkdwjgrksw20kvvy65822njrpy4gwb100ifigw0v7"; depends=[ghyp spatstat]; }; lrequire = derive2 { name="lrequire"; version="0.1.3"; sha256="03c8h9v2xhlv7bj5jv117a27gaqaly2kdxs9zyihsm9yh9rg3d79"; depends=[]; }; - lrgs = derive2 { name="lrgs"; version="0.5.1"; sha256="1hzcmrvax03bzrljnqskmnnpsw6amnwcfygnls727369h0dbzc4a"; depends=[mvtnorm]; }; + lrgs = derive2 { name="lrgs"; version="0.5.3"; sha256="0aqz07vg3z52lq224mapwgwr9mspa7aswzdfngg6x933aqsha4gj"; 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.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=[]; }; + lsei = derive2 { name="lsei"; version="1.2-0"; sha256="1xl06fb3is744pxlh42wx5hn1h0ab1k31wnmsmh0524kxzcyp0a7"; depends=[]; }; lsgl = derive2 { name="lsgl"; version="1.3.6"; sha256="0zkv5xgwrnwx0w0qpzsg7krd7fdnlr3a85q64xj1wx0gd578dqq6"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; - lsl = derive2 { name="lsl"; version="0.5.5"; sha256="0555za3yqqdbcpxrl6vzj494784xl1wsmwp1apszaqncz2vwc9pg"; depends=[ggplot2 lavaan reshape2]; }; - lsmeans = derive2 { name="lsmeans"; version="2.27-2"; sha256="18b69cg09zkcxlvb838157gzr9bqwdnzf9vrwzr1vpzwdybl7np0"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; }; + lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; }; + lslx = derive2 { name="lslx"; version="0.6.2"; sha256="0girzjmkmqym5bnw492991smyhvlz7xw70n8hlswpa4lw3x15q2n"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; }; + lsmeans = derive2 { name="lsmeans"; version="2.27-61"; sha256="0qw4lkgaynld56ywvdyy5nqvq7c6r2v24gsy54rkcw2n4xhlnahm"; 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]; }; lsplsGlm = derive2 { name="lsplsGlm"; version="1.0"; sha256="1qh68r033fwq1hc19h2srl1k6znvvvrcp38ghxadsksjfxllvniy"; depends=[]; }; @@ -7453,39 +7937,39 @@ in with self; { 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.1-0"; sha256="1gxjz3rn5bacv7xdlinzk6rdcwragb76grjpk5wqs4shqbk0rld2"; depends=[MASS msm polycor]; }; - ltmle = derive2 { name="ltmle"; version="0.9-10"; sha256="0j52jjjcrvalaan26msykwhz63p7jym6ilgh562cjv4jpi9bxplk"; depends=[Matrix matrixStats speedglm]; }; + ltmle = derive2 { name="ltmle"; version="1.0-1"; sha256="0g3nybhxz7mivqkzvlzkasc1m489s4fsi4874wvlhqg3x3mww0x9"; 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]; }; + ltsk = derive2 { name="ltsk"; version="1.0.5"; sha256="0x142w2l6qaqw1kmx5kix7lkadaw2kl8dqx11d091vqj2imi9wlr"; depends=[fields gstat sp]; }; ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; }; - lubridate = derive2 { name="lubridate"; version="1.6.0"; sha256="0ci6rwij9i1inn840m0mlh1nqgh6vm2lada9kdnjpcjp5kyfv1qs"; depends=[stringr]; }; + lubridate = derive2 { name="lubridate"; version="1.7.3"; sha256="1pzkqfiahnsdm3zx46asgn8fw43vlxvbh7r4cn70c7ffmxabzzrc"; depends=[Rcpp stringr]; }; luca = derive2 { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; }; 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]; }; + ludic = derive2 { name="ludic"; version="0.1.6"; sha256="0srs3bx9cw89mlpg8b8vcmz2gnsv729j3n23pnnxgbh2w7xf705b"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; }; lulcc = derive2 { name="lulcc"; version="1.0.2"; sha256="1vlaidyqgx5vnf8w2y1a1jmmq7z4195avnv1mryhh414r5r1kpy0"; depends=[lattice raster rasterVis ROCR]; }; lumberjack = derive2 { name="lumberjack"; version="0.2.0"; sha256="0yn6482wrwinabys3awp0jjnzs6mnv29jjpvr980m1jm15nwva4g"; 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=[]; }; + lutz = derive2 { name="lutz"; version="0.1.0"; sha256="1yf1bd005nhr5afwzs9y9h36q6hs93c8bfhgjwjvhsjrdl3rz26i"; depends=[V8]; }; luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; }; lvec = derive2 { name="lvec"; version="0.1.1"; sha256="1mpw01z0n0cql451qmi0b77pbfkhx6jyc4zzs5nl82jb6x3y20wn"; depends=[BH]; }; lvm4net = derive2 { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; }; lvnet = derive2 { name="lvnet"; version="0.3.2"; sha256="0ynp7399q98dgh51fkw1r1z8iy3qm41ny887a955n8kp8pp9l737"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; }; + lwgeom = derive2 { name="lwgeom"; version="0.1-4"; sha256="0x58a04sklrr6vr38hbd2900b3bigdfj7zyk6pzj9y7yy5mr2cjg"; depends=[Rcpp sf units]; }; 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=[]; }; + mBvs = derive2 { name="mBvs"; version="1.1"; sha256="0nkm0yyzl3ajjfhprnkr7d4mkvwd86lf6ic9cyqx76isfwwz3wyq"; depends=[]; }; mExplorer = derive2 { name="mExplorer"; version="1.0.0"; sha256="1563d9r7f25vw5vsph21z3dwz9n40dpaiyx28ay1bbp5i1x2l3rb"; depends=[nnet qusage]; }; 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.1"; sha256="1rz5ncrvvv9h9grls15apa63v2nh9j87fmp4mwjjil37jx6a5zki"; 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]; }; + mRMRe = derive2 { name="mRMRe"; version="2.0.7"; sha256="1njapjphy4b8nvrsnzrf2nbfp7mjizb7wlxgx1igfqncfhbskqfn"; 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.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]; }; @@ -7495,21 +7979,21 @@ in with self; { macc = derive2 { name="macc"; version="1.0.1"; sha256="1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4"; depends=[car lme4 MASS nlme optimx]; }; machQA = derive2 { name="machQA"; version="0.1.4"; sha256="1rdrjy9sxql2c9y691a1jrmgsv7m1ihsschixxb6wc7aahf7mav6"; depends=[machina plyr]; }; machina = derive2 { name="machina"; version="0.1.6"; sha256="009mzqb5jgnilj9b5ldmm5600008bljlqacm8jjxvqsfnfdfg8zv"; depends=[DT httr jsonlite lubridate rhandsontable xts]; }; - 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]; }; + macleish = derive2 { name="macleish"; version="0.3.2"; sha256="1kna1wq3p6xfzfdhw8dpdfvy4l656xcrra1f0ir86a815pm2a8l3"; depends=[dplyr etl lubridate readr rgdal rgeos sp]; }; + mada = derive2 { name="mada"; version="0.5.8"; sha256="17d41kpxjf6h8j83w6jhxm71f03nc8i2aw0xaqzrpcf5rxxy8wv8"; depends=[ellipse mvmeta mvtnorm]; }; maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; }; - madness = derive2 { name="madness"; version="0.2.2"; sha256="0facd1km06kjd70prkjkns8x2nyavj4m7lgiyxd7gpr9plba5wmr"; depends=[expm Matrix matrixcalc]; }; + madness = derive2 { name="madness"; version="0.2.3"; sha256="0qmqgrjxb0853m9kdi8cl1b9q9dljdi2zylw22asfv77f323413z"; depends=[expm Matrix matrixcalc]; }; madr = derive2 { name="madr"; version="1.0.0"; sha256="0lzg75kphz4a0w6n0jbsq87g72jvrbkyas4j813mryq2nv4lmsl4"; depends=[]; }; madrat = derive2 { name="madrat"; version="1.22.1"; sha256="0wk2svhi4209p8ab8i2g9q22kswpisphb2a9ln5lzwdhnryk4ya9"; depends=[digest magclass spam stringr]; }; 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]; }; + mafs = derive2 { name="mafs"; version="0.0.3"; sha256="1apacrk8y5b5ids62vd1kn2k28bya9pydxxmdw2dhjyzkgrakdhn"; 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="4.51.1"; sha256="1p4pbwjkn9ic3vqjh9m4b18s78f8wx0815n4dyg9pin8p14klzil"; depends=[abind maptools ncdf4 reshape2 sp]; }; - magic = derive2 { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; }; + magic = derive2 { name="magic"; version="1.5-8"; sha256="083cgpp3v03li0h8597b3g21pd9lkbmn9pyssblnhc800mpc52vz"; depends=[abind]; }; magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; }; magicaxis = derive2 { name="magicaxis"; version="2.0.3"; sha256="08nkf9k2ijlm52ybncfiwrghy911wpvwpvdvllcz2d4slk1vdakj"; depends=[celestial mapproj MASS plotrix sm]; }; magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; }; - magick = derive2 { name="magick"; version="1.3"; sha256="1bb5mcbxi917m4pxi8hk76h276kysgmsbq3vdnzl2nhh38d1ayfg"; depends=[curl magrittr Rcpp]; }; + magick = derive2 { name="magick"; version="1.7"; sha256="09dcgfbpp6lls943yps3qaylrs6n9dd1svwab5rmwj0fa4ph2by4"; depends=[curl knitr magrittr 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=[]; }; @@ -7526,21 +8010,23 @@ in with self; { manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; }; 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.7.0"; sha256="1xiiaaay8szmw36vli3kgg4mn73hjdbaqq0w0l01wc2qhv3fa30n"; depends=[base64enc htmltools htmlwidgets knitr lazyeval miniUI shiny]; }; + manipulateWidget = derive2 { name="manipulateWidget"; version="0.8.0"; sha256="19vcf3q2q8r53dygc8kh7pbcbjs9q6knylz2jnc9pwxq3wdkbrp7"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny]; }; mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; }; 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.2"; sha256="0x1jyll45kx1q3bq3visyq75jvinhw3h0yy1n1rams61vvxrqfxk"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; }; + mapedit = derive2 { name="mapedit"; version="0.4.1"; sha256="1dy87kmwra917716r99hp139fbxy3z0cx03cw61b832isizd0b51"; 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.6.3"; sha256="0akrrm5zrsgq0i69m1wb43xy5nh2w8fa05zz6fpwdmpjy4x09c2g"; depends=[raster sp]; }; + mapfuser = derive2 { name="mapfuser"; version="0.1.2"; sha256="1q7l6rfs6dv76ifizfqq4pdpjpb2zwzd3vvrnhdzh8vw2mrlqcjg"; depends=[doParallel dplyr foreach ggplot2 igraph lazyeval LPmerge mgcv plotly stringi tidyr visNetwork]; }; + mapmisc = derive2 { name="mapmisc"; version="1.7.0"; sha256="0m8a0zzdrmqkkv9clfar9acij80fmanqny08g9xlir14620aq38c"; depends=[raster sp]; }; mapplots = derive2 { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; }; 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=[]; }; + mapsapi = derive2 { name="mapsapi"; version="0.3.0"; sha256="070dckm5dkicmwkpji4zvap9h9rl3n3l7fxhz2ryslblbrzx70fn"; depends=[bitops magrittr plyr sf xml2]; }; 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="2.1.4"; sha256="1aqjk1hkr6vs8bf6z0alyqyclknv10q682wg4xcnq20c91mvzwdw"; depends=[base64enc brew gdalUtils htmltools htmlwidgets lattice leaflet png raster Rcpp satellite scales sf sp viridisLite webshot]; }; + mapview = derive2 { name="mapview"; version="2.3.0"; sha256="07sp891j8dqryjibwdnb2j0d5kjnbndl13hgazqrk5rg4phj0hl5"; depends=[base64enc brew gdalUtils htmltools htmlwidgets lattice leaflet png raster Rcpp satellite scales sf sp svglite uuid 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]; }; @@ -7551,30 +8037,34 @@ in with self; { marinespeed = derive2 { name="marinespeed"; version="0.1.0"; sha256="1r9bpggb88px8149dsga3xmkjhjq6ybs6a5kp60qz28iyr183mar"; depends=[bit geosphere sp]; }; 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]; }; + markmyassignment = derive2 { name="markmyassignment"; version="0.8.1"; sha256="1y388s73b1zs482d1d7z40kg4hizp46lc3279xspm2ryx4m49mzj"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; }; + markophylo = derive2 { name="markophylo"; version="1.0.6"; sha256="1gyj3ykwh4ljrb5s80hihy7wl89y3p4xkckspvv4ynl9lnsbm7cs"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; markovchain = derive2 { name="markovchain"; version="0.6.9.8-1"; sha256="1av89829fwnf2bll7b75v2vrglw4130d5c42c3i1fiqh54jxjy7k"; 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-3"; sha256="0jpx4k82h0mdhbwb1jc8g18qjsr9448m6d69zii99bdinsd637rv"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; }; - matchingR = derive2 { name="matchingR"; version="1.2.1"; sha256="09vx3yqaq0pq341v8rm2hjxx0aza0bnh9iffrygwbhls7fi7kn7y"; depends=[Rcpp RcppArmadillo]; }; + matchMulti = derive2 { name="matchMulti"; version="1.1.6"; sha256="05nkrncrf7vq2bmqbhm9n6p6cyb4drbhjrrfdcw6qcdgvh3bbiy0"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; }; + matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; }; + matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-5"; sha256="083gnqjxvzgqd0lvg13qwzw3cp1imp4xn2nacspfxqg4878jjpn3"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; }; + matchingR = derive2 { name="matchingR"; version="1.3.0"; sha256="1rpw5a52alh5diiqr7f87vhpgp3w3f8lg8wkaqvr5idid9fkll1i"; 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]; }; mathgraph = derive2 { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; }; + mathpix = derive2 { name="mathpix"; version="0.2.0"; sha256="0a2yybhim2l08n03505ks8vzk8w8azlz3pngsczzd42dqfdphi9q"; depends=[base64enc httr magick purrr rstudioapi texPreview]; }; matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; }; matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; - matlabr = derive2 { name="matlabr"; version="1.1.3"; sha256="0kbfvc83ccyg3dzviz0xz2jn7n3zcjlp4g3qwi623b5f2pvw7qq4"; depends=[stringr]; }; + matlabr = derive2 { name="matlabr"; version="1.5.0"; sha256="0gy639fv0b85h4z96b2b3m635q4w62q63kfxfqny3pwr0r5vsc2p"; depends=[stringr]; }; 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.52.2"; sha256="19fjf19cr0p3j9pj17myz39zpi5bh7ci72db3la9my09n6k6mnir"; depends=[]; }; + matrixStats = derive2 { name="matrixStats"; version="0.53.1"; sha256="0bkiz5fm09d3512mfr2ymj9qsb1b8aic5l5m6fkaf5j7nsgvqw6z"; depends=[]; }; + matrixTests = derive2 { name="matrixTests"; version="0.1.0"; sha256="0784wfp14z7lh6ylzgh9kvzs5gwapfs7ksx63jf3qwb95zfwyixx"; depends=[matrixStats]; }; matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; matrixpls = derive2 { name="matrixpls"; version="1.0.5"; sha256="04sshb88rq2mp3y4rrs6nkzr4kc380vx380r911c7j975l55a183"; depends=[assertive lavaan MASS matrixcalc psych]; }; - mau = derive2 { name="mau"; version="0.1.0"; sha256="0ssvj089smndr7h73la4gnn3dp63p8zkimm19q3rsw4lajv8ws79"; depends=[data_table ggplot2 gtools igraph RColorBrewer stringr]; }; + matrixsampling = derive2 { name="matrixsampling"; version="1.1.0"; sha256="1q0vcail34iwxc0wnwg2nw9n710fsjg5lgil5hib74vwrww1x1h7"; depends=[keep]; }; + mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; }; maxLik = derive2 { name="maxLik"; version="1.3-4"; sha256="0jjb5kc7dvx940ybg7b7z9di79v75zm2xlb0kj2y7rmi45vvh6hq"; depends=[miscTools sandwich]; }; maxTPR = derive2 { name="maxTPR"; version="0.1.0"; sha256="13x5rz0mfha5pzahkk4x67ncz9v77sa690cyl6wigwsldsrvzr3h"; depends=[aucm Rsolnp]; }; maxent = derive2 { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; }; @@ -7582,7 +8072,9 @@ in with self; { 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.2"; sha256="05lsb7ldk6nzmfaklbvkcb4n5sfnimgcv5vgilblw5awzhavj5vm"; depends=[igraph]; }; + mazeGen = derive2 { name="mazeGen"; version="0.1.3"; sha256="192xygg3l4rpqp49sgd5hpp4h3f8wjhyldn0l8abxhsks7jd2kfb"; depends=[igraph]; }; + mazealls = derive2 { name="mazealls"; version="0.2.0"; sha256="14j6syw1zkgs4cnmxzqpm6klmgvck2gg97wkzmy9al6n0biy8gmb"; depends=[TurtleGraphics]; }; + mazeinda = derive2 { name="mazeinda"; version="0.0.1"; sha256="0ns4ib73y4fghf7p1wg0a05js4mqr66dpp49p1h039pqrb0f1vwd"; depends=[foreach]; }; mbbefd = derive2 { name="mbbefd"; version="0.8.8.1"; sha256="0akga4p8nj5nnfv18gk84mhl2nd6s10k1c1rh730sd44qm6zpiai"; 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]; }; @@ -7599,19 +8091,19 @@ in with self; { mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; 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=[]; }; + mcca = derive2 { name="mcca"; version="0.2.0"; sha256="01c7dp9m8vqffhq0ixsqcfw40jsmb6dwiblym31h84f9s0x4f00j"; depends=[e1071 MASS nnet pROC rpart]; }; 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]; }; mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; }; mcglm = derive2 { name="mcglm"; version="0.3.0"; sha256="1q2zc0xn4inp9inadb52yc0svbh581qxxjzc08pgrm9l3xms4a14"; depends=[assertthat Matrix]; }; mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; }; 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.5.1"; sha256="1qnkkjq7gxivpz3mmbq5dx9a128r3xhrdzx96kc80h3w67yc7hbl"; depends=[Matrix memisc]; }; - mclust = derive2 { name="mclust"; version="5.3"; sha256="0h5syvpg3azrz5d10z2afilaa27jb4azi38idzlv05mfcs16s6rb"; depends=[]; }; - mclustcomp = derive2 { name="mclustcomp"; version="0.1.0"; sha256="1j3r1gv6lbs40l1z5qn8010a7mqx7lnq2dkagx17bffg7d9pxv81"; depends=[Rcpp RcppArmadillo]; }; + mclust = derive2 { name="mclust"; version="5.4"; sha256="1i3v1q8qq0al3ifvjhcvxfsg68cx9mq8jz67jwmiqai78mw0aqvk"; depends=[]; }; + mclustcomp = derive2 { name="mclustcomp"; version="0.2.0"; sha256="0ijsy1p80bqbknw9did3dqa90ck7zd0xplvw870578h4x5q30qdp"; depends=[Rcpp RcppArmadillo]; }; 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.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; }; @@ -7621,27 +8113,27 @@ in with self; { mcprofile = derive2 { name="mcprofile"; version="0.2-3"; sha256="0rakaa1p6z0p4jl4df357vi58wzph81ik6plc8zzl370r8mj1y8q"; depends=[ggplot2 mvtnorm quadprog]; }; mcr = derive2 { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; }; mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; }; - mctest = derive2 { name="mctest"; version="1.1"; sha256="0ck41xkrhfznzqqxk5yx5467ayd7wxqcjb6dzizbyz6dyjxbwm0n"; depends=[]; }; + mctest = derive2 { name="mctest"; version="1.2"; sha256="0rsyqdfsmyvjgns7z2vj24n91ziaz45q4vidk48ay3acfam8i274"; 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]; }; + mda = derive2 { name="mda"; version="0.4-10"; sha256="19g6kn6g0shidrjfffklbmzc5w7mcimrxhagx4nmpslg59ibqdkh"; 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.4-15"; sha256="0qm5nyag19in8mpck1gvmsxmpj9dzfsnryx4gbwrss4yaapn7gmx"; depends=[CDM coda miceadds sirt TAM]; }; + mdmb = derive2 { name="mdmb"; version="0.6-17"; sha256="1ydvfjqid7bsgryr8j77ajmh2q40s3gh67n8027f70pa8amr9fnq"; depends=[CDM coda MASS miceadds sirt TAM]; }; 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-4"; sha256="1nbs2dxwh78kh2qp19whk6infckxrkckyxjlmcmcfmk578ivb5xb"; depends=[clusterSim smacof]; }; + mdsOpt = derive2 { name="mdsOpt"; version="0.2-2"; sha256="1wg0f2a3z5pdiw8lljfrifn7lf00rza8rmrdh61dmna2nkrg9j4g"; depends=[clusterSim smacof symbolicDA]; }; 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.4"; sha256="1g9a6g8rf2svndis7569bnbj3jx1mgli172fjzdypfnhiyhd46vb"; depends=[babynames DBI dbplyr downloader dplyr ggplot2 mosaic RMySQL tidyverse]; }; - mdw = derive2 { name="mdw"; version="2017.8-27"; sha256="0rsp6s15fgb7rni2qhgjx6dz1byvbaan5zhi6ixskpfs3z6h8fv8"; depends=[]; }; + mdsr = derive2 { name="mdsr"; version="0.1.5"; sha256="0b80l478v68w91vsmvvyvnmk0yasybmm013psy4181lhvxc93kma"; depends=[babynames DBI dbplyr downloader dplyr ggplot2 mosaic RMySQL tidyverse]; }; + mdw = derive2 { name="mdw"; version="2017.12-03"; sha256="054vssnypbik0yf6smicggnkrqf6kx8k21nbf5rminsh00sx39k1"; depends=[]; }; + meaRtools = derive2 { name="meaRtools"; version="1.0.2"; sha256="1xxw0aq4k5z4i3ndja1rxl9calb8hmp4jv9l79zm33vdlggpkxzg"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; }; meanShiftR = derive2 { name="meanShiftR"; version="0.51"; sha256="0qcciayriygfwkb15n863amcpcfl97fr1sarwm3d269idf5m7w6x"; depends=[]; }; - 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]; }; + meanr = derive2 { name="meanr"; version="0.1-1"; sha256="080x21jnbsl6qlrgv12p9qd332ciph3lh18fgs9jagfyygf4f9hg"; depends=[]; }; + measuRing = derive2 { name="measuRing"; version="0.5"; sha256="0yblqkv5444y75jkb6d0zs728i6vybm294h7b5622pwfjqlfhnh2"; 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=[]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; medfate = derive2 { name="medfate"; version="0.2.2"; sha256="1vw9j04063sjwyfdkk94xsgz5zps7vmqha6dbsvi8ncb951cfijp"; depends=[meteoland Rcpp sp spdep]; }; medflex = derive2 { name="medflex"; version="0.6-4"; sha256="0nd9izvmmpdw87y5f0hrz2fml51x53zvvn0irdc1ass3cj1b7bxc"; depends=[boot car Matrix multcomp sandwich]; }; @@ -7649,35 +8141,40 @@ in with self; { medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; }; medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; }; medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; }; + meetupapi = derive2 { name="meetupapi"; version="0.1.0"; sha256="1iaxpfzgn478np9cjwz0zalfy1p7jwabnwpfv31svw052i8bs9yl"; depends=[dplyr httr magrittr purrr]; }; mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; }; mefa4 = derive2 { name="mefa4"; version="0.3-4"; sha256="11zg30i2fkxdv8fn7jilbmm7k5g0ls8f91bpq6qiwiagwg8gj2lh"; depends=[Matrix pbapply]; }; meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; }; - meltt = derive2 { name="meltt"; version="0.3.2"; sha256="0d66mxjn1a3a4m8pg45py9a2ylmaab1yly11pfa669cjkih76lz8"; depends=[ggmap ggplot2 plotGoogleMaps plyr reticulate scales sp]; }; + mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; }; + meltt = derive2 { name="meltt"; version="0.3.3"; sha256="08qifdpk0c9digpayw1d9h2p9q4nyrlihg8kjqacirb5wh39wr6r"; 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="2.10"; sha256="1g122njbl50cdwga52zaf5iv3ds71yxzzyysffqsz4lg4khpr862"; depends=[boot mixtools RColorBrewer reshape2 sm stringr]; }; - memapp = derive2 { name="memapp"; version="2.5"; sha256="0lslxhxdfmb24142bs2xxcv1scgfgywz4275cszcvr86l20c0hh0"; depends=[DT formattable ggplot2 ggthemes mem openxlsx plotly RColorBrewer readxl reshape2 RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr]; }; + mem = derive2 { name="mem"; version="2.12"; sha256="0075i2mbkck06bljck44d26ys68p8vjfb1jhgzrjy1sv2g2w0qa8"; depends=[boot dplyr ggplot2 mclust RColorBrewer reshape2 sm stringr tidyr]; }; + memapp = derive2 { name="memapp"; version="2.8"; sha256="0y5wl0rv1s8dgxhb0q42wy5rlj4smw9pz7a4j23195llql8lfc9m"; depends=[dplyr DT formattable ggplot2 ggthemes magrittr mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr tidyr]; }; + meme = derive2 { name="meme"; version="0.1.1"; sha256="102z3zgfldggcykb7wlmw0wbdas6jbpvy2kfdps0wky3j552ir95"; depends=[ggplot2 magick showtext sysfonts]; }; + memery = derive2 { name="memery"; version="0.4.2"; sha256="0wfp3hf567a1q6mhrsgn4hr8x52yp4na8783f2d19hm0c3r4z51q"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; }; memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; }; - memisc = derive2 { name="memisc"; version="0.99.14.2"; sha256="1z2qqr24dz0prxbyfgwcg8nsj9svvgm7wymclb0yy4qppsz0cmw6"; depends=[lattice MASS repr]; }; - memo = derive2 { name="memo"; version="1.0"; sha256="1pqlsn79gpm0d5bxnjg1c1gjaqdrdvcjvr84zpfk6nmsb2862w48"; depends=[digest]; }; + memisc = derive2 { name="memisc"; version="0.99.14.9"; sha256="1gh6shm9nwfjwfi5f4cz2jsldfdnkj6f73279l86wki5gdf36zri"; depends=[lattice MASS repr]; }; + memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; 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-2"; sha256="05z0lkhmxbw82sy3qlyyb58fwbillx296ay3sskbz1clj0plph82"; depends=[lme4 Matrix nonnest2 sandwich]; }; + memuse = derive2 { name="memuse"; version="4.0-0"; sha256="1g63nssxrgqgzw8qjz8202qpwhps8fbck6pn77j2wsc82dm73y7v"; depends=[]; }; + merDeriv = derive2 { name="merDeriv"; version="0.1-3"; sha256="0kgmv220nlg0r31bwg5qxkc8ybngg4c5q16bkknzf4khmbx19iwm"; 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-26-2"; sha256="1i9lxgphn8nmkcp2zgjs6ylbccmfgv9lfch00xmx1xfb538jz82q"; depends=[MASS numDeriv robustbase]; }; - 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-4"; sha256="0s2f1n404gfjf4k1h7x3jcys56x83y35zir7gyc32ydn88zfn57z"; depends=[]; }; - meta4diag = derive2 { name="meta4diag"; version="2.0.5"; sha256="0hwzwyzr23sqlqpx2372419167wad1q7spyzmcxhf4f5hmqv14c9"; depends=[caTools shiny shinyBS sp]; }; + metScanR = derive2 { name="metScanR"; version="1.1.1"; sha256="0cl3vfh8hcx230xpv5611liwk7jr49a2akz18f641yd04akk7f19"; depends=[geosphere leaflet plyr RColorBrewer RCurl]; }; + meta = derive2 { name="meta"; version="4.9-0"; sha256="012yhxbn114q8bf75mm8ap11q33a5azzkh1b811saq77p1f6lwgq"; depends=[]; }; + meta4diag = derive2 { name="meta4diag"; version="2.0.7"; sha256="024rxnqzw9xydy0mm1w38s739qgkzjsifq23bwpvkwj0x0jnwry0"; depends=[caTools shiny shinyBS sp]; }; metaBMA = derive2 { name="metaBMA"; version="0.3.9"; sha256="14c3q4aw89r3apzm0ils886xsc6agbn8d2wgp47dc2ddwf5n8p58"; depends=[coda LaplacesDemon logspline mvtnorm runjags]; }; 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.14"; sha256="0hzx2wp81hf3dkkq3vq8dpi8cxhkas6xv3zj822zchc1nwk4dn8g"; depends=[ellipse MASS Matrix mvtnorm OpenMx]; }; + metaSEM = derive2 { name="metaSEM"; version="1.0.0"; sha256="1i77w7b6xbi8p43s9vicj121kz7f3qp1zhqwy6qc5xcj9qaqjklp"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; }; metabolomics = derive2 { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; }; - 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.9"; sha256="1l3agymxz3qlrk0kzwlkqhalyw5ylsl6l0an8xcljgclymrb27j0"; depends=[vegan]; }; + metacart = derive2 { name="metacart"; version="1.0-0"; sha256="13dp9yz6yjd2jc7lf3w3ac3vk69ry7zygf6xnvzrcwsdmxd0258n"; depends=[ggplot2 gridExtra rpart rpart_plot]; }; + metacoder = derive2 { name="metacoder"; version="0.2.0"; sha256="0dyd16yy7adpyksfpg6d414s1l6nls5hv1k938mn7fji1px14sgj"; depends=[ape biomformat cowplot dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr taxa taxize traits vegan zoo]; }; + metacom = derive2 { name="metacom"; version="1.5.0"; sha256="1zsnzzxv3vsj1swybhh6g8ddffp4xrn081y192xa6a78ii8q4kav"; 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="2.0-0"; sha256="0h14wd7hr1d40p5r70f2jgdgj24jwpnr4nrj6yp5qjr466v81z96"; depends=[Matrix nlme]; }; @@ -7686,13 +8183,14 @@ in with self; { 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.6"; sha256="1y5hg8lp3n63q9p9xv0304i9g912xsy815lx50jcr9fx4w35i3dx"; depends=[ellipse lme4 metafor mvtnorm]; }; + metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="1.0.0"; sha256="1wzy5dnmrdfdj1386snjyisrbzbq8v4qsnq57l3wvkg1pgnz1vh2"; depends=[]; }; + metamisc = derive2 { name="metamisc"; version="0.1.8"; sha256="06dzjnrbxqkb0d0zcdxg8fyadsbq0f0fca4xifjz16yjz1047n5k"; depends=[ellipse ggplot2 lme4 metafor mvtnorm plyr]; }; metansue = derive2 { name="metansue"; version="2.0"; sha256="102cddahlzm0b76y6pr7jxqxf28j6y3hsjd17fpnyvrwnzhqbz5m"; depends=[]; }; metap = derive2 { name="metap"; version="0.8"; sha256="06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"; depends=[lattice]; }; - metaplot = derive2 { name="metaplot"; version="0.1.6"; sha256="0fkgsi6jbpp3fchl9dc4bn9ccjhvcn0s7ij7lvpwkvbxvfjwjsml"; depends=[dplyr encode fold lattice lazyeval magrittr rlang]; }; + metaplot = derive2 { name="metaplot"; version="0.4.6"; sha256="1qh7v7s8jrdpjzyw41zjlwv8dlq7k49zi2h5slk0jfa9jd635w4x"; depends=[dplyr encode lattice magrittr rlang tidyr]; }; 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]; }; + metaplus = derive2 { name="metaplus"; version="0.7-10"; sha256="066w0klii6a82mq4kdzbx3ccshmsxikym9x8w288pjw92r2z2cfn"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; }; + metasens = derive2 { name="metasens"; version="0.3-2"; sha256="1wxp6gzq3wmas8hm8vqxclawxkc4p8dw2apzmg0nciqvas6dzic8"; depends=[meta]; }; metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; }; metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; }; metaviz = derive2 { name="metaviz"; version="0.1.1"; sha256="1myhh16a7mad4gidl2xhnfv940gjqhbl8rlg6vrwvawgaiwigbxp"; depends=[ggplot2 metafor nullabor plyr RColorBrewer]; }; @@ -7700,23 +8198,25 @@ in with self; { meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; 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.6.4"; sha256="1bdwcrc55jlsljc8r16ccnfi2gfzglzjfghjyk4b9kdsqkm2xa85"; 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]; }; + meteoland = derive2 { name="meteoland"; version="0.7.1"; sha256="1nsn4z3gbkcdhgyn13fjcpsyb0lb85kiyy6fhirlnw63dwr56a2l"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; }; + metricTester = derive2 { name="metricTester"; version="1.3.4"; sha256="1z4z8km1jr0azh2zxp1sffm5picc9y6w9yn68zr1axli0l64y3a0"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; }; metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; }; - mets = derive2 { name="mets"; version="1.2.2"; sha256="1rdljq4069n7i05sqi75bcp1zpq69m13vf1nrjfg568cpwmr4m37"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; }; - mev = derive2 { name="mev"; version="1.10"; sha256="0kidgghwjc81rx2vb8y1iiwvlfxafv7r11n3zz1gb7705w6ynw1m"; depends=[boot evd gmm ismev nleqslv numDeriv Rcpp RcppArmadillo rootSolve]; }; + mets = derive2 { name="mets"; version="1.2.3"; sha256="1f1mqpzpvh5vb8b8w72q13jhk978bcvwipf4bx3kzzgsf6yfxk5s"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; }; + mev = derive2 { name="mev"; version="1.11"; sha256="0iqcslnchap8zh4s3bllqqb8z0klpzg2pn8ays1xk66lj5ywl390"; depends=[boot evd gmm ismev nleqslv nloptr numDeriv Rcpp RcppArmadillo revdbayes rootSolve]; }; mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; - mexhaz = derive2 { name="mexhaz"; version="1.3"; sha256="1sqys7k6hrs892b50cn54q2k3vnlmgz1467rdwaksailhhizpbc5"; depends=[MASS numDeriv statmod survival]; }; + mexhaz = derive2 { name="mexhaz"; version="1.4"; sha256="1c3n8g93pb38dw45ls6wh81giqw7zkksh2rmpbw46ink23ks12ij"; depends=[MASS numDeriv statmod survival]; }; + mfGARCH = derive2 { name="mfGARCH"; version="0.1.2"; sha256="08gkba5v8l0867rrxakn7js11v1yj7qp9vmzbjmri9hjcm02s44a"; depends=[numDeriv Rcpp zoo]; }; 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]; }; mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; }; - mgcv = derive2 { name="mgcv"; version="1.8-22"; sha256="1546p6aflg3z6xl2mns1n2c3j8q2spr9cjggj9rn33vrrhsv4fss"; depends=[Matrix nlme]; }; + mgcv = derive2 { name="mgcv"; version="1.8-23"; sha256="1lsrhf1yzn25pfn3f5x8yxjqnfryim4jx3iqd7ah8aalh5asqwbp"; 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.2-1"; sha256="131zw61d2g39pzgy7ap95ah6mgbbybcpci665cxshascmlki3rpr"; depends=[glmnet Hmisc matrixcalc stringr]; }; + mgm = derive2 { name="mgm"; version="1.2-2"; sha256="0n0db6np7i0lycvis9pc1bsnzam4nrr9qzlwimz7d8pp7gm313xn"; 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]; }; + mgsub = derive2 { name="mgsub"; version="1.5.0"; sha256="03w40vs3vfyrksnzbawyvp02kwrmn7cqhlv6xhfzfbh8jmz55wvr"; depends=[]; }; mhde = derive2 { name="mhde"; version="1.0-1"; sha256="1q7lbj2is024f5rmfpdn3a0hsb78bf62ddal3chhnh3bi1z3jrjk"; depends=[]; }; mhsmm = derive2 { name="mhsmm"; version="0.4.16"; sha256="009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"; depends=[mvtnorm]; }; mht = derive2 { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; }; @@ -7724,7 +8224,8 @@ 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.2"; sha256="001pknxjlkdrpcvv2rrjgciyn26j8d65vjwni2pz9lxjvrww9kvb"; depends=[CORElearn Matrix Rcpp RSpectra]; }; + miLineage = derive2 { name="miLineage"; version="2.0"; sha256="091wf4kwakdr91xkyg038f0vj941gvziy7yc4l8cylcjbr647qzz"; depends=[data_table geepack MASS]; }; + miRNAss = derive2 { name="miRNAss"; version="1.4"; sha256="0p852vyn44g84i4hzm7b02m5cxyqajnczx0s9x9373rn7fi6r98c"; depends=[CORElearn Matrix Rcpp RSpectra]; }; miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; }; miRtest = derive2 { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; }; micEcon = derive2 { name="micEcon"; version="0.6-14"; sha256="1d3cdg36ighyhly5by9gl6lxkdvx2agb5cv2mf77pwwd7rpq35h3"; depends=[miscTools plm]; }; @@ -7732,40 +8233,42 @@ in with self; { 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.7-19"; sha256="1znshkz1rc934rkl08axiszl24ziibs7namqacfcdh1jz2jrggxv"; depends=[CDM lme4 mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; }; - micemd = derive2 { name="micemd"; version="1.1.0"; sha256="0y452xsrxdcb3kahya1f969lrf9lq9cv7zxsdf329x3q563lrcsm"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; - micompr = derive2 { name="micompr"; version="1.0.2"; sha256="1hmxi5wz7vfnvawh50zk316gr3ry59m820ddj2v9p7cxq21hwv9i"; depends=[]; }; + mice = derive2 { name="mice"; version="2.46.0"; sha256="1gjvlk67zvgipfczsca8zqk97vg3sivv82hblsdwp14s7smhjcax"; depends=[lattice MASS nnet Rcpp rpart survival]; }; + miceExt = derive2 { name="miceExt"; version="1.1.0"; sha256="07xj9f5w0kh4d1yj8mx1jydvhd0vwpvvrb6h67xz5gb1ban4k6c6"; depends=[mice RANN RANN_L1]; }; + miceadds = derive2 { name="miceadds"; version="2.9-15"; sha256="03jvs643cq23y5fj1ffilqr9bi7g4blk7c0bh7nvrpjx5sscqjck"; depends=[CDM lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; }; + micemd = derive2 { name="micemd"; version="1.2.0"; sha256="0l4qzhkxy43xwgfqp2c638fimixdrm94hgiabfds3sc1vbxma4r8"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; + micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; }; microPop = derive2 { name="microPop"; version="1.3"; sha256="072qldi020m84j9crfvzvw2nzn5fagqmjjzb7g7i70zwqhl1kjsa"; 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]; }; + microbenchmark = derive2 { name="microbenchmark"; version="1.4-4"; sha256="0fv2w2vsiz18imf4115nd9chhmf275w2mb49pn7pkxi6z3bamc9c"; depends=[]; }; microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; }; microcontax = derive2 { name="microcontax"; version="1.0"; sha256="0l5mfgda5xagjbh9bwv328k3m7kgggdm90rc8fr1ic59hvg56f3g"; depends=[microseq]; }; - microdemic = derive2 { name="microdemic"; version="0.1.0"; sha256="0sywdgxldmlin3bdns8549xlngn6qm6rql2avb2m5z7w4q7ql4d5"; depends=[crul data_table jsonlite tibble]; }; - micromap = derive2 { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; }; + microdemic = derive2 { name="microdemic"; version="0.2.0"; sha256="0g39j9bdfcv90332g9mp7khn15vqs0fzqx38criw4rxwi8dcd307"; depends=[crul data_table jsonlite tibble]; }; + micromap = derive2 { name="micromap"; version="1.9.3"; sha256="1iciwy0kcg4qa0xc4gkqcilq33ac1s184vw13cbbkv0d1b5cgkgv"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; }; micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; }; - micropan = derive2 { name="micropan"; version="1.1.2"; sha256="0rvaampr5vlpz253lhy330380646g2vqj1hqp6gsk0gp0hdlkd7g"; depends=[igraph microseq]; }; - microplot = derive2 { name="microplot"; version="1.0-16"; sha256="144rj86lkjkmwlqwlwmnagvlknhg0wg92kabpfpz2w0swfhfa742"; depends=[Hmisc]; }; - microseq = derive2 { name="microseq"; version="1.2"; sha256="14w1fycw0jgrc5g0ygks9j28hy37li057qf097qnp18w05jk3hws"; depends=[Rcpp]; }; + micropan = derive2 { name="micropan"; version="1.2"; sha256="1b3hd5c6l9njns372zhqfryibrpqmrjxmc1p5gzdwm7450cs7qky"; depends=[BH igraph microseq Rcpp]; }; + microplot = derive2 { name="microplot"; version="1.0-25"; sha256="05b29l5s4g4yvprxsla28ykr4823lfhqlxm46p406p06r9wki3d7"; depends=[ggplot2 HH Hmisc htmltools lattice ReporteRs]; }; + microseq = derive2 { name="microseq"; version="1.2.2"; sha256="1h828iviraqrm43lhd0s3r7rdlakc6yfc6ngrcrkacpflfcmx3c7"; depends=[Rcpp]; }; midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; }; midasr = derive2 { name="midasr"; version="0.6"; sha256="1sg6m36jg3b6znfg97ln5a6b4z36xkyjvgxk7wmqdq3h528z8613"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; }; midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; }; midrangeMCP = derive2 { name="midrangeMCP"; version="1.3"; sha256="1733dlhzbgrjdzd88rh9dkqhxh05gr078sbmihab7whbrpsq8068"; depends=[SMR WriteXLS xtable]; }; - migest = derive2 { name="migest"; version="1.7.3"; sha256="1g49b4fa2974w8alb97k06k3zi49q66n16cvcbqdaj9j21c9qfmy"; depends=[]; }; + migest = derive2 { name="migest"; version="1.7.4"; sha256="0v47qnhk48dh1vvw0b9d4z1l7iv09h47b0vh9f3s3pryn076vn9q"; 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]; }; + miic = derive2 { name="miic"; version="1.0.3"; sha256="088szscn9v9279w86mypxphp3avv17iijvcvlckx3h1ka75lkx27"; depends=[bnlearn igraph MASS ppcor Rcpp]; }; 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.1.0"; sha256="102r7m6jiadgmkw4w7535ba2qfxknj00y4b9hhawcjqm5v67jipz"; depends=[htmlwidgets]; }; minerva = derive2 { name="minerva"; version="1.4.7"; sha256="19snlbnk4y0lj7kfypa2g1d1s7bl3xkrxabn8p15hlwwcfb0x7vm"; depends=[]; }; - miniCRAN = derive2 { name="miniCRAN"; version="0.2.9"; sha256="1zf2488ycx24b6rf1b4mql5rf6kqlhs5v6rx7mdz7jvbcmfm6ijk"; depends=[httr igraph magrittr XML]; }; + miniCRAN = derive2 { name="miniCRAN"; version="0.2.11"; sha256="1ffc367ipcxyk2a8f2y46xa01rbr5254cryf1qzzfflb3xj8n6pa"; depends=[httr igraph XML]; }; miniGUI = derive2 { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; }; miniUI = derive2 { name="miniUI"; version="0.1.1"; sha256="1qfca55phw6614qh5ligvqawpyvpb08x7ky44sffwxgff4h074lw"; depends=[htmltools shiny]; }; 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.2"; sha256="0sbycipns8nx63lp0426b9fwmlq3lprb9j3cfry7a1ibfkw63qf9"; depends=[DiceDesign doParallel doSNOW foreach gtools MaxPro nloptr randtoolbox Rcpp RcppArmadillo]; }; + minimaxdesign = derive2 { name="minimaxdesign"; version="0.1.3"; sha256="0jxfvlsjd6bippjziplpgvpbnwd816dx2kf3gj32xmfwzminjx5f"; depends=[DiceDesign doParallel doSNOW foreach gtools jpeg 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]; }; @@ -7773,10 +8276,10 @@ in with self; { 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.25"; sha256="11ssbf4lsamj7xcf2frsdmbyv6yd7rqggm4qy58nnpvbqrq2kkw4"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; }; - mirtCAT = derive2 { name="mirtCAT"; version="1.6.1"; sha256="00jy27ilv1fw9ijhcyyi2lnxghyjb0dhpcqf1dqc6wi61wf5pagk"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; + mirt = derive2 { name="mirt"; version="1.26.3"; sha256="1jzvxcq7s179vi5cwrxkcqzffl2pyay5abnvlgazhabzf4150sml"; depends=[GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; + mirtCAT = derive2 { name="mirtCAT"; version="1.7"; sha256="038jp680hn17q8hcz346j4i0p913h7gbkqfswn0ygf1kwgsz1mpa"; 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]; }; + miscF = derive2 { name="miscF"; version="0.1-4"; sha256="1kvkbvrmaqclwdfghkrsmnzb6xbi97icay2wwb7k5m34xhx4ha82"; depends=[MASS MCMCpack mvtnorm R2jags]; }; 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]; }; @@ -7788,7 +8291,7 @@ in with self; { missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; }; missMDA = derive2 { name="missMDA"; version="1.11"; sha256="185ia5zg5gdrkjpj5sql46lz5svw77wjy9zplpqhrmgx43fv0w0i"; depends=[FactoMineR mice mvtnorm]; }; missRanger = derive2 { name="missRanger"; version="1.0.0"; sha256="0advj6a57pj79xn43gxp7ll4b3y7hl5cvz5d7hw69f4yk4blwkjr"; depends=[FNN ranger]; }; - mistat = derive2 { name="mistat"; version="1.0-4"; sha256="0gzng0kl3handy3k7g62c4sdcf9l6x0b69jxmfrwfd4297f57n9n"; depends=[]; }; + mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; }; mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; }; mitml = derive2 { name="mitml"; version="0.3-5"; sha256="1s888r9y2ri39b48h1iypps6lddqkqv3g31l2sjmi2pvyccfpkwb"; depends=[haven jomo pan]; }; mitools = derive2 { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; }; @@ -7796,7 +8299,7 @@ in with self; { 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.2.0"; sha256="1vgm6sxxlycv99sp58s8vrqlbpn8r0qw2kmi19mmsyi6vz841cln"; depends=[corpcor dplyr ellipse ggplot2 igraph lattice MASS plyr RColorBrewer reshape2 rgl tidyr]; }; + mixOmics = derive2 { name="mixOmics"; version="6.3.1"; sha256="0bvlbxx94mxsqjwlc5pgxw8c6k32fzrv1ab2xc5zl3ag1v3g10qq"; depends=[corpcor dplyr ellipse ggplot2 gridExtra igraph lattice MASS matrixStats plyr rARPACK 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=[]; }; @@ -7804,10 +8307,9 @@ in with self; { mixdist = derive2 { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; }; mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; }; mixedsde = derive2 { name="mixedsde"; version="3.0"; sha256="1libm4pyzfqi11hcx823qdhgshdsy84dzv7jhz3b89w9bkla5l17"; depends=[MASS moments plot3D sde]; }; - 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.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; }; - mixlm = derive2 { name="mixlm"; version="1.2.1"; sha256="0gh3w7nhnzwq65b9fs2m4dfhy6n04mw09s3q5sjlxrw571v0h1pl"; depends=[car leaps multcomp pls pracma]; }; + mixlm = derive2 { name="mixlm"; version="1.2.3"; sha256="0i7nrn31yaicdpwfssnid1x8w51iv17lcl96zfr1pgrf97d7gkqd"; 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=[]; }; @@ -7816,21 +8318,23 @@ in with self; { mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; 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=[]; }; + mixture = derive2 { name="mixture"; version="1.5"; sha256="1ahr8jw93xnd5hmy3h4sr209ql7gmkwbvnnfmiplbpc17czqgcn4"; depends=[]; }; mize = derive2 { name="mize"; version="0.1.1"; sha256="18mnpwwbwlyx0ixsjqai28ahp4g0wncv8c5qwy17xq2zbhwlq3jh"; depends=[]; }; - mizer = derive2 { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; }; + mizer = derive2 { name="mizer"; version="0.4"; sha256="0ir6hx3fb4lkfgg7dln96fd50fr4jdrxbqp70461fsyzi3lxn6nv"; depends=[ggplot2 plyr Rcpp reshape2]; }; mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; }; - mkin = derive2 { name="mkin"; version="0.9.46.1"; sha256="094kdhawkdl30rw9r0djqk6hzw3vbg1b3yl0mhbqawlfnjca97ca"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; }; + mkin = derive2 { name="mkin"; version="0.9.47.1"; sha256="1cz6f9122im594dvqdmdm9yjlnmwzrx2ka63dgj0zf1ysqzf0872"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; }; 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.4"; sha256="08iaq6wq0ngd60nhmlj8c0x8r1fal1zfv2zpd6ll54szcvdbxahr"; depends=[abind arm clusterGeneration corpcor dplyr lme4 MplusAutomation mvtnorm plyr qgraph]; }; + mlapi = derive2 { name="mlapi"; version="0.1.0"; sha256="023vk5bp8cjcq88sapkl87kdxr92bay1dyxl6xirnyj699pyj51k"; depends=[Matrix R6]; }; 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=[]; }; + mlbgameday = derive2 { name="mlbgameday"; version="0.1.0"; sha256="1d339hr7iys8qlw6m0zbvpcw4b1k04504k6l1xz63ijdgpyr593y"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr xml2]; }; + mldr = derive2 { name="mldr"; version="0.4.0"; sha256="1nx21yyxfaiyxpbjkc5sif6pis5v2skisxcxdqk4479h54qzwlj3"; depends=[circlize shiny XML]; }; + mldr_datasets = derive2 { name="mldr.datasets"; version="0.4.0"; sha256="0kbfaf39vkhvscw47bkx2mmc6cmgwz1cys62iiw3yb6kvkzddr3s"; depends=[]; }; mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; }; mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; }; - mlegp = derive2 { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; }; + mlegp = derive2 { name="mlegp"; version="3.1.6"; sha256="12w6gw1g1xn3i42pgall09w5im8gf84h28d3fa9m3fhkifkid2db"; depends=[]; }; 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=[]; }; @@ -7841,27 +8345,29 @@ in with self; { 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.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]; }; + mlr = derive2 { name="mlr"; version="2.12"; sha256="0qf1yl487jmg7w85vjd7wdky8agysi1xlvl20dnqrn2cms4h1q6g"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; + mlrMBO = derive2 { name="mlrMBO"; version="1.1.1"; sha256="1r6p5ph7nyqs6cqqsg04mass1zppys75n8448lv6iadlm499jzg8"; 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.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.3"; sha256="0r2i46hkzckgl3ly7sdzkzi94bwzkni2rqyrz647r5rhjqhfgkhj"; 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-1"; sha256="02y8fahaz3lxix9cg9sxpyap441k1az9bf1zadqzx8mvw510ixvs"; depends=[car doParallel foreach gbm gplots survival]; }; + mlt = derive2 { name="mlt"; version="1.0-0"; sha256="0vbja0sxjg3a5gpa8wwnj1fvr8kkvkpzhim6lssvyy7kcb44fcya"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; }; + mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-0"; sha256="1shhf5pk90cfia51a0qnbg8pvvv5n86d3mjy961rjs1wj30vj3yd"; depends=[mlt numDeriv]; }; + mltools = derive2 { name="mltools"; version="0.3.4"; sha256="18dxhims684a6fk44nrzdnry8dpxs69wim8kd7zamp8zdhy38kyy"; depends=[data_table Matrix]; }; + mlxR = derive2 { name="mlxR"; version="3.3.0"; sha256="0qbhmxmsyqfc2csk96qwizpjj7yk35r85rr5xaqkyr72mjn2m3gh"; depends=[ggplot2 Rcpp XML]; }; + mma = derive2 { name="mma"; version="6.1-0"; sha256="1rrnm7szlaly8klqgi8wdh5qvfx4kx5bkl1q2y9y6zjpxmb4zvi6"; depends=[car doParallel foreach gbm gplots plotrix survival]; }; mmand = derive2 { name="mmand"; version="1.5.3"; sha256="1n0h7nia9jjc11g8417nfd3wsg4m3bmblm9bsjd0b52vqxhpxmzh"; depends=[Rcpp]; }; mmap = derive2 { name="mmap"; version="0.6-15"; sha256="0p3dsq0vffb0x0i8xh8p1r0b2hwk4zfi6nbwsi3cyaj1m7dzm0fh"; depends=[]; }; + mmapcharr = derive2 { name="mmapcharr"; version="0.1.0"; sha256="0szabsacbqm51jw4q4pg304vvgqsqna5c7q1sh3f54za6dddmyxw"; depends=[BH Rcpp]; }; 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]; }; + mmcm = derive2 { name="mmcm"; version="1.2-7"; sha256="11dgb8crz5pjpx66cxxzn4lg58jbaxxhfqlcw3hdp9wpvyqjh3sb"; depends=[mvtnorm OpenMPController]; }; 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.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]; }; + mmmgee = derive2 { name="mmmgee"; version="1.11"; sha256="0q7gf8r48vw4rxq7b848hcfz9iqw89sld4ra33n6kb2jqczv49xi"; depends=[Matrix mvtnorm]; }; 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=[]; }; + mmpf = derive2 { name="mmpf"; version="0.0.4"; sha256="1lskpnhqiimf7ch5xg5f0mpvhxy18a5w9daxpp4133vx1dydm4c2"; depends=[checkmate data_table]; }; + mmpp = derive2 { name="mmpp"; version="0.6"; sha256="16aypjf4i0ya3qgxqrrg8y0xbnq1pnqky1dpkgln5q494hphyg91"; 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]; }; mmtsne = derive2 { name="mmtsne"; version="0.1.0"; sha256="1by0hrggla6idc1isnq072i1wfpw4x7id3hkg8l65gy8iycccd12"; depends=[]; }; @@ -7869,93 +8375,101 @@ in with self; { 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=[]; }; - mnreadR = derive2 { name="mnreadR"; version="1.1.0"; sha256="15zlksrqkp8kqfaqvmg83cxyyvmxnxs0ybl79ksc5j7h28j3nh8j"; depends=[dplyr ggplot2]; }; - mockery = derive2 { name="mockery"; version="0.3.0"; sha256="1ydgxqdzwn68b84a7557nasgm1r5jk2mivzwq9x71p7zwqf4c8vd"; depends=[testthat]; }; + mnreadR = derive2 { name="mnreadR"; version="1.2.0"; sha256="0ymkwbfrba5nnnvi3s52fdhzva7qd0b7ab75j1m0s2i546cbwv9l"; depends=[dplyr ggplot2]; }; + mobForest = derive2 { name="mobForest"; version="1.3.0"; sha256="0gzn3lyi9ph5dcrfbw4xs4rkf5ngf28abf1n8vap96fdhc6nmg88"; depends=[modeltools party sandwich strucchange zoo]; }; + mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; }; + mockery = derive2 { name="mockery"; version="0.4.1"; sha256="1h8976rlwykpqrh2p6x3bcyxdhlhcwsi1wvkdk08k6hynbw877cm"; 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]; }; modQR = derive2 { name="modQR"; version="0.1.1"; sha256="1dc04wrax73f6fzkl6ycsa3wzf5347h79ah3vy3m24f4hjncnffw"; depends=[geometry lpSolve]; }; modTempEff = derive2 { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; }; + modcmfitr = derive2 { name="modcmfitr"; version="0.1.0"; sha256="1d6fi7pc10w2a97h1prhkg5cvzmxjp11c5bwrz90zry0m8anwjyh"; depends=[gtools nloptr]; }; modeest = derive2 { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; + model4you = derive2 { name="model4you"; version="0.9-1"; sha256="13ask2hcrw2r6qq4yz6wm2nsj2iwinnn0w78lj11fdrsj5cymnqv"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; 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.1"; sha256="1rqw0b583vp107zqp4h3wj51dvv4hb3wszfr1f5f48xassc53f95"; depends=[broom dplyr lazyeval magrittr purrr tibble tidyr]; }; modeltools = derive2 { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; }; modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; }; + moderndive = derive2 { name="moderndive"; version="0.1.1"; sha256="11xxklaqizlx36nyx3nzj9xkszg99qsmjqmr59z235h4wkrw8xg3"; depends=[assertive broom dplyr formula_tools janitor knitr magrittr rlang stringr tibble]; }; 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]; }; + modest = derive2 { name="modest"; version="0.3-1"; sha256="07rs014hdcabp2n0gg14pz2gmqgbw38vjv7a80vkzzh3601hxqws"; depends=[knitr rhandsontable shiny shinyBS]; }; + modifiedmk = derive2 { name="modifiedmk"; version="0.1.2"; sha256="1ajllhv33sdqa6bdylb6hs68kkk75qa1abv6kmnfix9k2g0bqlxq"; depends=[]; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; }; - modmarg = derive2 { name="modmarg"; version="0.6.0"; sha256="0ncfpsbaby03fbpkgdlx0yfcvqiydlb4fsnc869kf6yzs8vv5ifj"; depends=[]; }; + modmarg = derive2 { name="modmarg"; version="0.9.2"; sha256="1clyfvn5k87nyh5cj4b0yi2zkavwvnirhlirxkzi8m2qijdl9vgh"; depends=[]; }; moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; }; modules = derive2 { name="modules"; version="0.6.0"; sha256="0nzypmx8p84dd7pdw7ilrjrc2nji5qzwylb9yn1zmr8wp5lzvidc"; depends=[stringr]; }; modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; }; 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.7"; sha256="04crg01wshvb88s4kw1sfdyywm7zzprc7mi2nxymrllppz2msd4w"; depends=[poLCA]; }; + mogavs = derive2 { name="mogavs"; version="1.1.0"; sha256="0lhmwdv991bv7j8k066jr7ii94w60ydjpf5pzmv8jlblf3w2pr02"; depends=[cvTools]; }; + mokken = derive2 { name="mokken"; version="2.8.10"; sha256="1lh9gqjm13k7wfmff2vikc1qg7lqr4fagm3jiklr1pv9vgn4dnc3"; depends=[poLCA]; }; moko = derive2 { name="moko"; version="1.0.1"; sha256="1d1gyv44z8k196hfh8a9iccmlrwb42bj1xzabs07h306gpi9m73d"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; }; molaR = derive2 { name="molaR"; version="4.3"; sha256="1bzk7k6d1zbi0fhf9xwdg5mv7dcgajjbb6wxafx4nc2fjxhlldzi"; depends=[alphahull rgl Rvcg]; }; - mombf = derive2 { name="mombf"; version="1.9.5"; sha256="1s776bvfkivif7i3338l1pk8qi5b6b7sxb9zgcidw4kwmj388rdd"; depends=[actuar mgcv mvtnorm ncvreg survival]; }; + mombf = derive2 { name="mombf"; version="1.9.6"; sha256="01qvgxiw0wqp7j4l1qkdy88fvmydz5il09k6nrblbq0sfjf0khmq"; 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.1.1"; sha256="10n9w861dknh4ifqp4ry0wzl26nrz18yz5kasl4l9xx3i31qmlnb"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel foreach geosphere ggmap ggplot2 gstat LaplacesDemon MASS mitools moveHMM mvtnorm nleqslv numDeriv qdapRegex raster Rcpp RcppArmadillo sp splines2 survival]; }; + momentuHMM = derive2 { name="momentuHMM"; version="1.4.0"; sha256="0dfnxq16a2hyy1a4w7v55f6mp62xhldwsj2v54yw4s2d21dqir4y"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel foreach geosphere ggmap ggplot2 gstat LaplacesDemon MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo sp survival]; }; momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; }; mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; - mongolite = derive2 { name="mongolite"; version="1.2"; sha256="19zhscsgqvzx5gqryzl82dw6impc6sacx2shanmnj4zfgs7bgwqr"; depends=[jsonlite openssl]; }; - monitoR = derive2 { name="monitoR"; version="1.0.5"; sha256="1rqcdg4gha5vh3dvxqzr2albi2capm18rkgf79rd769hrk3z09l5"; depends=[tuneR]; }; + mongolite = derive2 { name="mongolite"; version="1.5"; sha256="06qry561kdg4lxvdayghmhmgb94sqy16gxjp081xnmya0vqf9wjy"; depends=[jsonlite openssl]; }; + monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; }; 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]; }; + monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; }; 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=[]; }; + monoreg = derive2 { name="monoreg"; version="1.2"; sha256="16n622j1j998a5fhn1c1qbzk5bfa5h09d95ry89gsd00p40hqg0a"; 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]; }; + mopa = derive2 { name="mopa"; version="1.0.1"; sha256="1v876al1afli002v44b4j2acb6n66f0hzz4bmcl60jyny43d1n0c"; 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="1.1.0"; sha256="18d8qxrxldyjb2aanbih5qh91wi5gcf989j6vcnnikgvxyxizz1s"; depends=[dplyr ggdendro ggformula ggplot2 glue gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicCore mosaicData readr tidyr]; }; + morse = derive2 { name="morse"; version="3.0.0"; sha256="18657cd3pqy170wapxy3jw4cc13710bf7ix07dss30gpkbvilyvl"; depends=[coda dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; }; + mortAAR = derive2 { name="mortAAR"; version="1.0.0"; sha256="0d599npgfk11mv39rk2a64vs5x31g4f7n1n13mzzzcy1lz5y1ih2"; depends=[magrittr Rdpack reshape2]; }; + mosaic = derive2 { name="mosaic"; version="1.1.1"; sha256="1c82im22sj0sfqnwwfg7kyp2dllj89f79by07220br5wpa18bsn7"; depends=[broom dplyr ggdendro ggformula ggplot2 glue gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicCore mosaicData readr tidyr]; }; mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.0"; sha256="05s14rmgi15xcz50hcz7l26l95yx9g4i3kihzh0laz8bpi443i39"; depends=[MASS mosaic mosaicCore]; }; - mosaicCore = derive2 { name="mosaicCore"; version="0.4.0"; sha256="0624lnflwhraqrp3h3s5ryi3skn74gr0b10fq77qmp5h4is3cbc0"; depends=[dplyr lazyeval rlang tidyr]; }; - mosaicData = derive2 { name="mosaicData"; version="0.14.0"; sha256="0f092wp2lpj8rk6r2bd5mxp4q3n7ia9h838z8prrz56vwh3gbpw0"; depends=[]; }; + mosaicCore = derive2 { name="mosaicCore"; version="0.4.2"; sha256="17yani6781znrrnrcji1q7h6y422bq443gzly0mm6yn8bj7v5qrc"; depends=[dplyr lazyeval MASS rlang tidyr]; }; + mosaicData = derive2 { name="mosaicData"; version="0.16.0"; sha256="09kp3d3h3xmz9fnjaz9nr1jldjd93gyq5gq9sk2a2ymgnbmbc5wm"; depends=[]; }; mosaicModel = derive2 { name="mosaicModel"; version="0.3.0"; sha256="1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w"; depends=[caret dplyr ggformula ggplot2 knitr lazyeval MASS mosaicCore testthat tibble tidyr tidyverse]; }; - moult = derive2 { name="moult"; version="2.0.0"; sha256="177fhi3f5qsg2k4qb1cgviq96aln80qwri1hf9yym6wrzn8crj7r"; depends=[Formula Matrix]; }; + motmot_2_0 = derive2 { name="motmot.2.0"; version="1.1.2"; sha256="1hnpp2850yhvxki7pcwscg79knvxzs3gx4b19wza0wg3p02fvsb6"; depends=[ape caper coda MASS mvtnorm]; }; + moult = derive2 { name="moult"; version="2.1.0"; sha256="0k0969fwy648x25xw42w5ncimyw2cbq305rzf4m77p3pf0k50m9b"; depends=[Formula Matrix]; }; mountainplot = derive2 { name="mountainplot"; version="1.2"; sha256="1bbgkps1yhfa0lmapqkhhl5mc63p0gzszxw2g910dbi1cjc0pphx"; depends=[lattice]; }; mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; 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="3.0.1"; sha256="1wfk8ak3nzybi525mfwffsqx7ikyizq4vvcx3wpzvk1gg9y3l5i5"; depends=[geosphere httr raster Rcpp rgdal sp xml2]; }; + movMF = derive2 { name="movMF"; version="0.2-2"; sha256="0kk3b16vlr6nbqn9fzgk5pb4nyy9w9b5x7khyvn34b9r0pnqmmds"; depends=[clue skmeans slam]; }; + move = derive2 { name="move"; version="3.0.2"; sha256="0pi59k2kq1z92qgsbbqn1cjx0rbkjzjhaskk76wv95s3078k062d"; depends=[geosphere httr raster Rcpp rgdal sp xml2]; }; moveHMM = derive2 { name="moveHMM"; version="1.5"; sha256="16r0lp3lqnmplhagixyidgyg82zsxln22v9l9fgb07lxhszrs0rj"; depends=[boot CircStats geosphere ggmap ggplot2 MASS Rcpp RcppArmadillo sp]; }; - moveVis = derive2 { name="moveVis"; version="0.9.5"; sha256="1b48dmqlnd048m8rrfvkab226dxim7sgs5pqi3pblbpah9zlhcx4"; depends=[animation dismo geosphere ggplot2 gridExtra maptools move raster rasterVis RCurl reshape sp xts]; }; + moveVis = derive2 { name="moveVis"; version="0.9.6"; sha256="15w11zdi2amzvq7xgz5wsf9136s127inc44x8cl3ra7jy2sbgpiy"; depends=[dismo geosphere ggplot2 gridExtra lubridate maptools move pbapply plyr raster rasterVis RCurl RStoolbox simecol sp zoo]; }; moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.1"; sha256="020bl3i0i393dfknix03k8y70fjsf0lbw0mqrnhwsvz8kwrw3hi1"; depends=[move Rcpp]; }; + mozzie = derive2 { name="mozzie"; version="0.1.0"; sha256="09dwrv4r0hi19gzi1vpif3q4wlbny9h22430g1hhv0wkqs86mhmw"; depends=[]; }; mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; }; mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; - mpath = derive2 { name="mpath"; version="0.3-3"; sha256="05izx1zh21xaqbm80xkfg9z2z1i6wm79dsms07mgn7h45ipa28p1"; depends=[bst doParallel foreach glmnet MASS numDeriv pscl]; }; + mpath = derive2 { name="mpath"; version="0.3-4"; sha256="0qn2nqravnfjjr76p2049z24cwfzy4av8xr2rvpgkan14jcm6xra"; depends=[bst doParallel foreach glmnet MASS numDeriv pscl]; }; mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; }; mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; mpe = derive2 { name="mpe"; version="1.0"; sha256="17bgdbg1zrf78djd3mwycidwibxvsis7pwkrcynvghcc8l2zfci9"; depends=[mvtnorm]; }; - mph = derive2 { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; }; - mplot = derive2 { name="mplot"; version="0.7.9"; sha256="10syv0wibqyzgjhkya2chpb2izhk2b6aibj5wvgypvr7zyjhd5f8"; depends=[bestglm doParallel dplyr foreach ggplot2 glmnet glmulti googleVis leaps plyr reshape2 scales shiny shinydashboard]; }; + mplot = derive2 { name="mplot"; version="1.0.1"; sha256="1bs9hy28hmiz630dwjynlc0apnyi7hz5h9p8al9dy0k7lcsmc4g1"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps plyr reshape2 scales shiny shinydashboard tidyr]; }; 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]; }; + mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-4"; sha256="0gv9xswrfvndcjal0csab1w2cnl4rg8pznyxbz84b0qr95jg81ag"; depends=[vegan]; }; mpmi = derive2 { name="mpmi"; version="0.42"; sha256="1j7xsgz3pgbb7a4ykrcj22isbi5svqsxcckai05q7b401h1ppsnh"; depends=[KernSmooth]; }; 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]; }; + mr_raps = derive2 { name="mr.raps"; version="0.2"; sha256="069vyvsdgc5m7n2fd0h7jrllz789zvsxka7h5wiy36dc7lagd6f8"; depends=[nortest]; }; 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.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; 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.18"; sha256="0nhfyl5vcisb9z33sm37vfgnfkkmikr2wwvsjq84jaw2x2jmbxvz"; 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.4"; sha256="0dfx85yd4swd2cwm7pmxa3q7sgqkrj1sr145i13cdcp76wh95hp1"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; - mrgsolve = derive2 { name="mrgsolve"; version="0.8.9"; sha256="1k6rzmhkgp2gc2m5d2zz1b0cn1czmgsl1h3gw61gmz8gkw55835y"; depends=[BH dplyr lazyeval magrittr Rcpp RcppArmadillo tibble]; }; + mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; }; + mrfDepth = derive2 { name="mrfDepth"; version="1.0.6"; sha256="1g3bv0vpalp54pgdrfbfa32bcrph0q4j5jp1m91f328hzyx2lrmj"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; + mrgsolve = derive2 { name="mrgsolve"; version="0.8.10"; sha256="0qanj35ppyiyhcyf2iqji68j00i1y47319mms96llwpcl039f37p"; 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]; }; @@ -7963,23 +8477,24 @@ in with self; { msBP = derive2 { name="msBP"; version="1.3-1"; sha256="0ziqzkylawc6kpcfzqwrwn6vp0562rd2yx5a4zg8p1n0y2gdpdzc"; depends=[]; }; 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.7"; sha256="15jxdyc2s0dzjm6665win9y96ijyiv3ggin54z4rrh7qgv6vs7xa"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; + msaR = derive2 { name="msaR"; version="0.3.0"; sha256="0lj9yhsissr4rgavyhgdxi2nrkq2088darzraisx9jsirjr49jf8"; depends=[ape htmlwidgets]; }; + msaenet = derive2 { name="msaenet"; version="2.8"; sha256="1293qdvn2qv3prnp4rwwndcjnzk49v565yfvzrvb9j7sqvjshf07"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; - mschart = derive2 { name="mschart"; version="0.2.1"; sha256="0pbzs05gx0qxyggaqld3ysi3aqdqrggj6d3zbzcj3m93q6xpabv8"; depends=[cellranger data_table officer purrr R6 writexl xml2]; }; + mschart = derive2 { name="mschart"; version="0.2.2"; sha256="0h6q7vzrhw9ccj3m037kw72ylqdsj7hlf0bqpghqpa3sv280ap2n"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; }; 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]; }; - msde = derive2 { name="msde"; version="1.0"; sha256="00szyab9sazw89fc1wg35nx36y0xyrq3x78y69h07kr4wxzcd2rc"; depends=[Rcpp]; }; + msde = derive2 { name="msde"; version="1.0.3"; sha256="18l5ca4s1ryyb9i0zsb03klm53f25klwyg171dqkn5z4bqwznp2m"; depends=[Rcpp RcppProgress]; }; mseapca = derive2 { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; }; msgl = derive2 { name="msgl"; version="2.3.6"; sha256="0qq9v8bb70iw67raygpzsg35nb2wdafp7rh7wzq42xd4gghi31ya"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; + msgpack = derive2 { name="msgpack"; version="1.0"; sha256="1j1nnca9nm3l1r4wjjlb15zr8p6zw1lcgyj4383ndy156bbh1f5a"; depends=[]; }; 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]; }; msir = derive2 { name="msir"; version="1.3.1"; sha256="1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950"; depends=[mclust rgl]; }; msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; }; - 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]; }; + msm = derive2 { name="msm"; version="1.6.6"; sha256="06m7fflb6lgjfnj9v4wjc63x2as8jvc24qmz6jvgm9fw7hnm24px"; depends=[expm mvtnorm survival]; }; + msma = derive2 { name="msma"; version="1.0"; sha256="1pq1m8hrvpfjh89wiz4f3jlzlp620clxzash5061zbhm0xjmxjpd"; depends=[mvtnorm]; }; msme = derive2 { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[lattice MASS]; }; 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]; }; @@ -7988,56 +8503,64 @@ in with self; { mstR = derive2 { name="mstR"; version="1.0"; sha256="0c189ia2mbhn183j0vbqxhwb20ww64fj11pq7p2cd55zfih4kp4b"; depends=[]; }; mstate = derive2 { name="mstate"; version="0.2.10"; sha256="14namzs0s7v28xkj1pidccjpxg7570fdqhd64rihvyv1r7ybfyav"; depends=[RColorBrewer survival]; }; mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; }; + msu = derive2 { name="msu"; version="0.0.1"; sha256="1vhh9725dbywmzihnmsq1jircpn91r8227j2f76fvma9rwss90p7"; depends=[entropy]; }; mtconnectR = derive2 { name="mtconnectR"; version="1.1.0"; sha256="068rp4n2afl9qgqrnp0a4lmnq7mq9wrc2yi361bfvib96gzg1fdw"; depends=[data_table dplyr dtw ggplot2 magrittr plyr proxy stringr tidyr XML]; }; mthapower = derive2 { name="mthapower"; version="0.1.0"; sha256="17svh0q9a982a390fgwgvrc2kygxxgyacb3j6gcksbikjrvkcfpw"; depends=[]; }; 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]; }; + mtsdi = derive2 { name="mtsdi"; version="0.3.5"; sha256="0j4hl690n8x7zfpygw5qv0m0jyl8dnz1d3r4314w06h7c578n2kp"; depends=[gam]; }; 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]; }; + mudata2 = derive2 { name="mudata2"; version="1.0.0"; sha256="0wlj9kra99ll3vmhkrw3gibricq3gwfl27iymnzrvv847lpvqjml"; depends=[dplyr ggplot2 hms jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect]; }; + mudfold = derive2 { name="mudfold"; version="1.1.0"; sha256="0mp25lad79dx2101srarx26my172jbkd6a0bzr87hjdgqr1pys5b"; depends=[ggplot2 gtools reshape2 yesno 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-7"; sha256="0njhm9b0znnp1pj7sfg8mnqvc6pkc7vrb82wzwpsywp1f5nbdgx3"; depends=[codetools mvtnorm sandwich survival TH_data]; }; + multcomp = derive2 { name="multcomp"; version="1.4-8"; sha256="0fm78g4zjc6ank316qfw977864shmy890znn4fahwc8jjdhpc252"; depends=[codetools mvtnorm sandwich survival TH_data]; }; multcompView = derive2 { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; }; multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; - multfisher = derive2 { name="multfisher"; version="1.0"; sha256="1pc3f6f87n29cb4caszp4arpy33pc3a0iwmrqinhyw66xjnqm8qp"; depends=[]; }; + multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; }; multgee = derive2 { name="multgee"; version="1.6.0"; sha256="17qrfvxxapqzjy2ps7kk9k9hkmb9zdxflwclyagp1amgv50la49f"; depends=[gnm VGAM]; }; - multiApply = derive2 { name="multiApply"; version="0.0.1"; sha256="1hgvvi00297rri9k5mnz7kmzpf1yxjmj153wwx4a68wv2mf9sx44"; depends=[abind doParallel foreach future plyr]; }; + multiApply = derive2 { name="multiApply"; version="1.0.0"; sha256="1hlrh5v52ym226dg4by0hxbkbpv4qsmmbaraxiyywsmwh3nx2fw8"; depends=[abind doParallel foreach plyr]; }; multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; }; multiDimBio = derive2 { name="multiDimBio"; version="1.1.1"; sha256="0b0lymnli7w91bfd67dsvzbj3flxsrsmbg4a18mzch0j9y6a40x0"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; }; multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; + multiROC = derive2 { name="multiROC"; version="1.0.0"; sha256="0zb52g1s4km7gs6krmn3k76p4qywx4bjakfr5gs4s4x7ki3w3x43"; depends=[boot ggplot2 magrittr]; }; 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]; }; + multichull = derive2 { name="multichull"; version="1.0.0"; sha256="1gc7kxxlbanc6rmmbf6h85jf7kj0a78h23m5vwwqqliv018qsv2n"; depends=[igraph plotly shiny shinythemes]; }; 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]; }; + multifluo = derive2 { name="multifluo"; version="1.0"; sha256="1blmr2cdbdwfyivvla0nmv2n44m168f3d11g5i7vydh8fl17l8vr"; depends=[ellipse imager]; }; multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; }; - multigraph = derive2 { name="multigraph"; version="0.71"; sha256="1h162vhx439fmkq0pi95d3lsrcjf06kii91hamj66dpjg9wma8q7"; depends=[multiplex]; }; + multigraph = derive2 { name="multigraph"; version="0.75"; sha256="0y4ibyy7v5hgxilrw5fxhj12597yl9q8zla5xvvhn9g7ir6xvmxd"; depends=[multiplex]; }; multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; }; multilaterals = derive2 { name="multilaterals"; version="1.0"; sha256="11zfdhn6qzqz0n31g23bn40wnfzkjndb753iiqvihirphzb74v5v"; depends=[ape igraph]; }; 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]; }; multimark = derive2 { name="multimark"; version="2.0.1"; sha256="0d283gvzqmdwr1sxgfb5ir9zw0sahj1wph7izcy1h63h6qlci828"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; }; + multimode = derive2 { name="multimode"; version="1.1"; sha256="0dhzpvw71szyw454gi7460yr46j1vas109xgwyz9h6kwm6gi5ysn"; depends=[diptest ks rootSolve]; }; multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; multinet = derive2 { name="multinet"; version="1.1.1"; sha256="13f7gqf45ydnyiv36gwcrc8mgv5gy61fak0in7f8bss4bvfldbxx"; depends=[igraph Rcpp]; }; + multinets = derive2 { name="multinets"; version="0.2.0"; sha256="05m0xin8wxshmwb3b9cgsvi8037wvmirbyyim1xxx2ppfwrdr2a6"; depends=[igraph Rcpp]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; - multipanelfigure = derive2 { name="multipanelfigure"; version="0.10.5"; sha256="0am4vi8mwbrvg6lmh53xp70mwi0klkpd11bd262kcfz125hbjy7n"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; }; + multipanelfigure = derive2 { name="multipanelfigure"; version="0.10.6"; sha256="1v53fanbnyba3f1ymgxr6q8yy1g5ax49z9ig1bxk3qywpixl8yh3"; 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.7"; sha256="1da28sb2rsnhs3bisgc4npjky3v1rssqh4jb0l51p50p665b5sjz"; depends=[]; }; + multiplex = derive2 { name="multiplex"; version="2.8"; sha256="01l3kmvsrrq0c98dv5m25yjjcbc99in6dv9k5h54cyjsw4jsjhns"; 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=[]; }; + multiselect = derive2 { name="multiselect"; version="0.1.0"; sha256="1cda38zq7c1r56wdfpr5dg0jfw4kzi9p7jq59qm04j461j9ag3q6"; depends=[Hmisc]; }; multisensi = derive2 { name="multisensi"; version="2.1"; sha256="17c1cddgzkgd583fh31wfjahpl5iv1casfs1aja000rqq1x2kfqm"; depends=[knitr sensitivity]; }; multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; }; multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; multistate = derive2 { name="multistate"; version="0.2"; sha256="0jdgyzc99k4py39g98c4dlcdl918568ihcyhb7csxbsn1zn1qm9l"; depends=[date relsurv statmod survival]; }; - multitaper = derive2 { name="multitaper"; version="1.0-13"; sha256="1ckf9bhvd5k7ypaw2viqh3cyj9jij0ygcp4q9pxwqs508s6yx3a5"; depends=[]; }; + multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; }; + multivariance = derive2 { name="multivariance"; version="1.1.0"; sha256="1yl1qfckpf98j4ca3wv8zw8vd79isaqvq7qkakyhxy0ljx20jmlk"; depends=[abind igraph]; }; 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-3"; sha256="0n90bjqp1s5dij2wq2mv967np25achlj2qlxdv4i0f958wf4pv00"; depends=[quadprog]; }; + multiway = derive2 { name="multiway"; version="1.0-4"; sha256="0gzsxcmavyrsrkmiq7yr0jmxbyk91h9kk9w2gazqxddk2c8q4g2s"; 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]; }; @@ -8049,42 +8572,43 @@ in with self; { 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]; }; + mutoss = derive2 { name="mutoss"; version="0.1-12"; sha256="1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"; depends=[multcomp multtest mvtnorm plotrix]; }; + mutossGUI = derive2 { name="mutossGUI"; version="0.1-11"; sha256="08pcca9gzns83az6jbjzv4xhm1wgmchhzz4f54x1aq0nmvsz3qq1"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; }; mvLSW = derive2 { name="mvLSW"; version="1.2.1"; sha256="012p828pyzz6xnv2akax5hx79v522dg4a2gqrjss526qylpg5j9l"; depends=[fields wavethresh xts zoo]; }; mvMORPH = derive2 { name="mvMORPH"; version="1.0.9"; sha256="09368vgyb1s18awfr07hs1s40n2h15hy08fmir3ayhdfrdain4k6"; depends=[ape corpcor phytools spam subplex]; }; + mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; }; mvPot = derive2 { name="mvPot"; version="0.1.3"; sha256="16m9i33sbgx69426i1nkimkrp75a6jbmkzlsp9bjbm7iyxdcl48b"; 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.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.3"; sha256="1lk1kqglj7czbq38714dwlbhnhazba8clbg9s1pmrakh5b2gkvz7"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; + mvabund = derive2 { name="mvabund"; version="3.13.1"; sha256="1z8bj9zbc8h7w1xki9sc2p2rq6lv8gbcmiy9819z54d7lx1i9cnj"; 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.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]; }; + mvdalab = derive2 { name="mvdalab"; version="1.4"; sha256="18wchy517qd45w5y0sr8lcafb7kmscy0q9vsryk9if6x2jq22lqz"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; }; mvglmmRank = derive2 { name="mvglmmRank"; version="1.1-2"; sha256="1051l10fbr7m9rmrlvj98660f0pn992n3vxiwnhml07wvvdknw3d"; depends=[Matrix numDeriv]; }; mvinfluence = derive2 { name="mvinfluence"; version="0.8"; sha256="08p5hxqa8qp8g52w2d3jqbjzrv607fdm80k6vwaz63fxhk8h82wq"; depends=[car heplots]; }; mvmesh = derive2 { name="mvmesh"; version="1.5"; sha256="0my43559jh8ln1fx5rh5vw24vr6kxpd2h5scylfxfv2qfk794l0b"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; - mvmeta = derive2 { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; }; + mvmeta = derive2 { name="mvmeta"; version="0.4.11"; sha256="1h1393s7xdi4sv461srsard6w961mcxxmxq9mkmfsgw5hdmkwkr2"; depends=[]; }; mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; }; mvna = derive2 { name="mvna"; version="2.0.1"; sha256="10i42hjm5bk62c20pmxhya283yzw1902ivkflmyqy79jri266dxf"; depends=[lattice]; }; - mvnfast = derive2 { name="mvnfast"; version="0.2.2"; sha256="1b548cl6gf5vks90z7hf4nl5hbl5jb1r50vnpv1hsjv2qbn0k9hr"; depends=[BH Rcpp RcppArmadillo]; }; + mvnfast = derive2 { name="mvnfast"; version="0.2.5"; sha256="122zjzr0v4943cax10lp6flwfv479mncvalaj09kb173s5rgmf91"; depends=[BH Rcpp RcppArmadillo]; }; mvngGrAd = derive2 { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; }; mvnmle = derive2 { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; }; mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; }; mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; }; - mvord = derive2 { name="mvord"; version="0.0.1"; sha256="0lx7gs9yi43am6rynqm8kiddi8jyn6q06vn886w5y2wm1hqxpw59"; depends=[MASS optimx pbivnorm]; }; - mvoutlier = derive2 { name="mvoutlier"; version="2.0.8"; sha256="07a2pv8bw5k0faiy0skdchg7c0n236saq5d8plqq7234n3rjl8pg"; depends=[robCompositions robustbase sgeostat]; }; + mvord = derive2 { name="mvord"; version="0.2.1"; sha256="1s9b1lcgfbz333mq6bhqfi9753mhgf3hl5mrakzw2i0inmhjr9mx"; depends=[MASS Matrix mnormt numDeriv optimx pbivnorm]; }; + mvoutlier = derive2 { name="mvoutlier"; version="2.0.9"; sha256="1d562h3xicq962h27fi95qhrz9vkwxk0p8axhps1cy4b49w4bygi"; depends=[robCompositions robustbase sgeostat]; }; mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; }; mvsf = derive2 { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; }; mvst = derive2 { name="mvst"; version="1.0.1"; sha256="0sv8pd1524pr3xpxplq468dxfd0wipdr41awqwvcljpw5wgl34qa"; depends=[MCMCpack mnormt mvtnorm]; }; mvtboost = derive2 { name="mvtboost"; version="0.5.0"; sha256="06zgx1c2470bh3x6s2awzkxbyij6bvzv23xbvamg77v5pz5bjj6h"; depends=[gbm RColorBrewer]; }; mvtmeta = derive2 { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; }; - mvtnorm = derive2 { name="mvtnorm"; version="1.0-6"; sha256="0i74s9dl4jf1gln6agra8h38qn9ifd5v0gi13caj1da5nrbmn0aa"; depends=[]; }; + mvtnorm = derive2 { name="mvtnorm"; version="1.0-7"; sha256="0f7hzflygdnbwvzadr3knhybhanwg7agqddclj6mhbvwqpgb0qyh"; depends=[]; }; mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; }; mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; }; mwaved = derive2 { name="mwaved"; version="1.1.5"; sha256="1hb7y42fy26pv6cf235g4xx1vyvwx7chwryi7phjd2aavxffj18z"; depends=[Rcpp shiny]; }; @@ -8094,30 +8618,33 @@ in with self; { mycor = derive2 { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; }; myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; }; + n1qn1 = derive2 { name="n1qn1"; version="6.0.0-1"; sha256="01bci81lhanxpfl454gl09krgb4229dnq9f34bngwm8ygvdadfgy"; depends=[Rcpp RcppArmadillo]; }; nCDunnett = derive2 { name="nCDunnett"; version="1.1.0"; sha256="0q2db1pixqr0wbx4bd05c98i1p0vgaqsfa1iwjxr08c62a5xhkks"; depends=[]; }; - nCal = derive2 { name="nCal"; version="2016.7-31"; sha256="12zj22myfxqxyq7bl669ngyk6yb3i9gsg00qqw5a5x2w95imwv20"; depends=[drc gdata gWidgets kyotil]; }; + nCal = derive2 { name="nCal"; version="2017.12-3"; sha256="1k03zrf67il7miap81r2fdnsi15i98wmwc3a8zxn54qfr2w9pcy6"; depends=[drc gdata gWidgets kyotil]; }; 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]; }; + na_tools = derive2 { name="na.tools"; version="0.2.1"; sha256="1fdbrf97mvak44vzarwqr4w6cs6msr42zcfxl2ci3i67nlgsv4pl"; depends=[]; }; 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=[]; }; + naivebayes = derive2 { name="naivebayes"; version="0.9.2"; sha256="0xmgcvvhfh7v8afi8fywaldawbx3s5hwgpvyyp2c9m6nrhw1kknl"; depends=[]; }; + naivereg = derive2 { name="naivereg"; version="1.0.1"; sha256="0wvyv54q3r4jz03jdbsmnxsinzpqcac6xjvzcrjjdzbkqfxicxal"; depends=[gmm grpreg]; }; 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.1"; sha256="18xk1xk77a14n9dvwrhqihagiblawgacyicx37vbza01b4x502c5"; depends=[abind autothresholdr BH BiocParallel DescTools dplyr EBImage filesstrings ggplot2 hexbin magrittr matrixStats ore purrr R_utils Rcpp RcppRoll readr reshape2 RSAGA stringr tibble viridis]; }; - naniar = derive2 { name="naniar"; version="0.1.0"; sha256="036izabfxc5mni7brxk0ksijypwq6hbbrib980z90i3zixgqjh1b"; depends=[dplyr forcats ggplot2 magrittr purrr purrrlyr rlang tibble tidyr viridis visdat]; }; + naniar = derive2 { name="naniar"; version="0.2.0"; sha256="04r3yfv6sv1yrwl4vasn5nxr0bn6fwdjk2zyx4p7vy8kfcw24300"; depends=[dplyr forcats ggplot2 glue magrittr purrr purrrlyr rlang tibble tidyr viridis visdat]; }; nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; }; 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]; }; - nardl = derive2 { name="nardl"; version="0.1.0"; sha256="0rd4a9diz5mv7ra2c8d60yl407i8bnkxz2dq5iz02c6vm94j322v"; depends=[car]; }; - narray = derive2 { name="narray"; version="0.2.2"; sha256="0cxibb8lhv3in44xxln3fw6rf8c9a18bdhcdiyp3cpcm83h22nh7"; depends=[abind pryr reshape2 stringr]; }; + nardl = derive2 { name="nardl"; version="0.1.3"; sha256="1361bh94m4dzcijg1929av88sni4f5ccwwyxsrg7kcxdxl3zhqp0"; depends=[Formula gtools matlab strucchange tseries]; }; + narray = derive2 { name="narray"; version="0.4.0"; sha256="0cr0y8mqwprxk0bv9160xvqxgvqkihn3avzsjm6ccivvb8zlkqxv"; depends=[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.9"; sha256="1pw8bzyfry5px2gsngywq1cqvfh9qlnlhaw5qvhkv58z62sxif4d"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; + nat = derive2 { name="nat"; version="1.8.11"; sha256="1s5hbi1b20jq0qv4px0zrwsivhi2mdlqbwx4lv55mdhj447rxk1x"; 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.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]; }; + natural = derive2 { name="natural"; version="0.9.0"; sha256="0zxwbf3gg2h0bhl2w0md3rd162vlsgg0dv3187hc0ax7333cc4cx"; depends=[glmnet Matrix]; }; 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=[]; }; @@ -8130,120 +8657,138 @@ in with self; { 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=[]; }; + ncf = derive2 { name="ncf"; version="1.1-8"; sha256="1hnx6k21ss1mp4llzbfxpsv2y7z1nxf4c46rwq3qpmvqhnw6hh9s"; depends=[]; }; ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; + ncmeta = derive2 { name="ncmeta"; version="0.0.2"; sha256="1qr0zfyy8g3zrmvg6i6b7sfvl3lavr391rqgf6pqhslg7i9cgpiz"; depends=[dplyr rlang RNetCDF tibble]; }; + ncpen = derive2 { name="ncpen"; version="0.2.0"; sha256="1wrpscd9n7z9lz7537qyy4rn4pjznlb8zwb79kkzmnfvyj21fi1r"; depends=[Rcpp RcppArmadillo]; }; 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]; }; + ndjson = derive2 { name="ndjson"; version="0.6.0"; sha256="0w7a587q45hkzmjhzlyrhk0hw4c8avkfzf4ai0wib5qk3al8gk6n"; 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.1"; sha256="0i2nc1b4vslgjj29x5q24yxv9l3i0g5hcrbm9xy1b3039n70cwix"; depends=[car GenSA MASS nbpMatching]; }; neariso = derive2 { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; }; - neat = derive2 { name="neat"; version="1.1.1"; sha256="12q9g8b0cf9j9cp0xc4h4bs4jv251arq9pf7c2hqgvirgr10ni2g"; depends=[igraph]; }; - neatmaps = derive2 { name="neatmaps"; version="1.0.5"; sha256="13v23xsvc5jd3pv5z931h4gdwwf5d2qfix8pqgnj726d94cjgiig"; depends=[dendextend ggplot2 heatmaply igraph pvclust]; }; + neat = derive2 { name="neat"; version="1.1.3"; sha256="0d8igx576jhi7f666nwn0wpdyvin974k5cfm7wdszzbnpng5961k"; depends=[igraph]; }; + neatmaps = derive2 { name="neatmaps"; version="1.0.7"; sha256="07nr8c5i1s3sba4l2123vb50b1cgn1qjdckwmyjwwai1yb3smkag"; depends=[dendextend ggplot2 heatmaply igraph pvclust]; }; 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]; }; + neldermead = derive2 { name="neldermead"; version="1.0-11"; sha256="0gf9rfwz48sadl6960mpfb6a3l9n5p28yq3n0a9vz8mr57vh1dzg"; depends=[optimbase optimsimplex]; }; 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=[]; }; + nesRdata = derive2 { name="nesRdata"; version="0.1.0"; sha256="1h33hql0vgkr2ps1ysisdxxb0cnm18mh8sbd3fxy9xf42icwfwdb"; depends=[dataone dplyr purrr rappdirs readr]; }; 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]; }; - netCoin = derive2 { name="netCoin"; version="0.2.6"; sha256="0vg1kqkgqb93n5mdq1ivf4nals7iffdkdxccj5m54bvm2j65028l"; depends=[igraph Matrix]; }; + netCoin = derive2 { name="netCoin"; version="0.2.7"; sha256="0dzncn72zl3yp2gds7vmjk5j82rb80j03ivkf74b0z5s4ckxhc9b"; depends=[haven 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]; }; netcom = derive2 { name="netcom"; version="1.0.4"; sha256="0fka14sffm0p1gldk27fd62ng05spfpbn665b4w5hdf1z4z0bs20"; depends=[clue expm igraph Matrix pdist pracma vegan]; }; - netdiffuseR = derive2 { name="netdiffuseR"; version="1.18.1"; sha256="18wssrhdqwjd7v3gly3v6s9s32vzqa340s1cmizwzbmfsf8vzm0r"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM]; }; + netdiffuseR = derive2 { name="netdiffuseR"; version="1.19.0"; sha256="0rnf7hf5vxpqw2rn00yqmkgpsx752pmfigyggbs4ikfbcsjq24sx"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic 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-6"; sha256="077pwbyd1hj8mqhik410dpccyb6h605zrfw03sjynxvkhyf4pb5b"; depends=[magic MASS meta]; }; - nets = derive2 { name="nets"; version="0.8"; sha256="10h6sqy9jw2a909nzmzd5x9cjg3w4wpqwikp23k4q9fj71aswd5v"; depends=[igraph]; }; + netgwas = derive2 { name="netgwas"; version="0.1.3.1"; sha256="1fgs7dr4dhrs4hmscazsyiq1nkkx1vvygmarmy7pyqhxzv13kdwg"; depends=[glasso huge igraph MASS Matrix RBGL tmvtnorm]; }; + netmeta = derive2 { name="netmeta"; version="0.9-7"; sha256="0yi1x0dyi7kim2yz9qwsbdnx1k6k15nmv6wlaby9z9yl7p2ij3jq"; depends=[magic MASS meta]; }; + netrankr = derive2 { name="netrankr"; version="0.2.0"; sha256="1y56y5wv95d7mmjf8rrwr7cs0k64h9a2qbpind4xp0kakpjihn7m"; depends=[igraph Rcpp RcppArmadillo]; }; + nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; 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.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]; }; - networkGen = derive2 { name="networkGen"; version="0.1.0"; sha256="0301a1vmkvnsiyii5hkmnqdw6gp8ipfqpvzgl7b5ca5fwhpad169"; depends=[igraph mgcv]; }; + networkGen = derive2 { name="networkGen"; version="0.1.1"; sha256="1vnh5dajiaf47kx1sxyp744mlk3yvl4sxj380i3b3ic1wlgyd2h1"; depends=[igraph mgcv]; }; + networkR = derive2 { name="networkR"; version="0.1.0-0"; sha256="1apgvnny2ynhnyn1a2kjiyvxrdqgkqar2w543wph4lnavsi4i0cp"; depends=[data_table fastmatch Matrix Rcpp RcppArmadillo]; }; 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.1.0"; sha256="1arfanladgnk6gkswd4hbhvycf5zz70v0cj8300qza7ksmmyvl7v"; depends=[devtools ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet qgraph reshape2]; }; + networktools = derive2 { name="networktools"; version="1.1.1"; sha256="1cfjhh0w5gs1v6d9q40bcjs658p308i20nybnqb8r7nkf77acxbg"; depends=[cocor 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.13.2"; sha256="1sv2kxahw123f6a7cl35n6dyz4ip8iifzk4dcp6jf8fnnnjyg8aq"; depends=[matrixStats oro_nifti R_utils RNifti]; }; + neurobase = derive2 { name="neurobase"; version="1.26.1"; sha256="0fb2cvh3j650zjx7b60jfrvm5i7n3l98wis91bmyr9hx3qz24rj5"; depends=[abind 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]; }; + neurohcp = derive2 { name="neurohcp"; version="0.7.3"; sha256="0mz8aiyimw3vqkgm54mwfvnki5hg1j958r71fs1k213zn1cg9qqr"; depends=[base64enc digest httr xml2]; }; neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; }; neuropsychology = derive2 { name="neuropsychology"; version="0.5.0"; sha256="0hlbjf8hxz4cl7fvg9mbyfmcyyxncc2nh9h1mrd2yzgrpgn0d0b5"; depends=[BayesFactor caret dplyr ggcorrplot ggplot2 Hmisc htmlTable lme4 MuMIn png ppcor psych stringi tidyr tidyverse tm wordcloud2]; }; - ngram = derive2 { name="ngram"; version="3.0.3"; sha256="03jfi07b7wzh2ydrrim9d9laragc9a7mri2gqmnqbf98f74s8vkn"; depends=[]; }; + neverhpfilter = derive2 { name="neverhpfilter"; version="0.2-0"; sha256="0m4gbqnjw2nmhf25svznlf6pd0b0mslk52lpirmlj1iv04w1aq1i"; depends=[xts zoo]; }; + ngram = derive2 { name="ngram"; version="3.0.4"; sha256="1q4y64dy7vcjikbfx20fpdiy1kwvxay4y90xr5j8d8zkqnva0way"; depends=[]; }; ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; }; - ngspatial = derive2 { name="ngspatial"; version="1.2"; sha256="09sc67g7xyqzhmnzvnj6hhjkvkl3xzkwj1vi3idfl093g8m7x29v"; depends=[batchmeans Rcpp RcppArmadillo]; }; + ngspatial = derive2 { name="ngspatial"; version="1.2-1"; sha256="1c65ws9b9s2grr44lqg8026c4p2875d0426dfmrakpb44mw2zppp"; depends=[batchmeans Rcpp RcppArmadillo]; }; + ngstk = derive2 { name="ngstk"; version="0.2.1"; sha256="12zpl20i07d1f9navs9jjrialfh798wrfn1241j7s9h3rd6xi40l"; depends=[configr data_table stringr]; }; nhanesA = derive2 { name="nhanesA"; version="0.6.4.3.3"; sha256="09mpxmk8w48hc14167jd2xifnj0kjz9h3h76bdnbb33wvhkn4jld"; depends=[Hmisc magrittr plyr rvest stringr xml2]; }; nhlscrapr = derive2 { name="nhlscrapr"; version="1.8.1"; sha256="107k063279w9cy6in99rn03w2rq42ci8s6dvb9x6f9w7y3bdpvzn"; depends=[biglm bitops RCurl rjson]; }; nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nima = derive2 { name="nima"; version="0.4.5"; sha256="1fllq76k4r07ymd58s865hgg3yrmwa34kr5mjd89n50mm1m110mh"; depends=[assertthat devtools ggplot2 ggthemes gridExtra gtools plyr ProjectTemplate scales survival]; }; - nimble = derive2 { name="nimble"; version="0.6-6"; sha256="0y1gziq7aks5kzzpwn852w6d9b3gj6vky0m4hwd302ps4gw1i6k3"; depends=[coda igraph]; }; + nimble = derive2 { name="nimble"; version="0.6-9"; sha256="1lkf386qcgw5gr8cpxfh2ncrc9wj59icygi9m37c8077h3h0sj03"; depends=[coda igraph R6]; }; + nipals = derive2 { name="nipals"; version="0.4"; sha256="0h9jxmj44x3lllxk1y2izkslafbiab175qrsxlnfcvhnaj13zsds"; depends=[]; }; nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; }; nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; }; + nlcv = derive2 { name="nlcv"; version="0.3.2"; sha256="1lknlqd64p15lnkydbi7zx7lmhg1fdl750yjqjaccdjzrgrqvgkv"; depends=[a4Core Biobase e1071 ipred kernlab limma MASS MLInterfaces multtest pamr randomForest RColorBrewer ROCR xtable]; }; nleqslv = derive2 { name="nleqslv"; version="3.3.1"; sha256="1n1sbp7436yd5g6v0060j2iwk4rppjq2pc5x47g9wlwnskdfgvl7"; depends=[]; }; - nlme = derive2 { name="nlme"; version="3.1-131"; sha256="0k2nvdzhic6bzhfsbq6la6q6a1i5nlj4pnh6lpdxiiwvxdks3nkr"; depends=[lattice]; }; + nlme = derive2 { name="nlme"; version="3.1-131.1"; sha256="1xafi670a9jzb52kqxkacxfmy0viac3aql5byfq86kgkgla2sg0y"; 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]; }; + nlmixr = derive2 { name="nlmixr"; version="0.9.0-3"; sha256="1fwnq0bnsqadadgy9i1083dz4zkidwdxm2ncy6jyrk1pb055m318"; depends=[BH brew dparser ggplot2 inline lattice lbfgs Matrix memoise minqa mvtnorm n1qn1 nlme numDeriv PreciseSums R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders]; }; nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; }; nlnet = derive2 { name="nlnet"; version="1.0"; sha256="1ipds80qlv2zrl51v0n670g9ihb68sm98p06nvs97w05i64g8frq"; depends=[coin fdrtool igraph TSP]; }; nloptr = derive2 { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; }; nlreg = derive2 { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; }; nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; }; + nls_multstart = derive2 { name="nls.multstart"; version="1.0.0"; sha256="08zdyx5hp1xbqjspk0f89fca5gc0b5j87hsccvn9dxn2lrnwk8nb"; depends=[dplyr minpack_lm purrr tibble tidyr]; }; 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.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.6.18"; sha256="1zgdzm2r06mgps44ql8rnjksb149zcp06rw9rkdrgq6p5w5vyxp1"; depends=[digest]; }; + nlsr = derive2 { name="nlsr"; version="2018.1.28"; sha256="113g656j6zqdqip6dw55pimmwq36xrxgfyix10y3qqn9lxvqrpqq"; 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-2"; sha256="0bx6xqa3j0k01p43vnv5lcv2pryjzgsak77y1cr9rm2xwqa3j6az"; depends=[acepack locfit]; }; nmaINLA = derive2 { name="nmaINLA"; version="0.1.1"; sha256="0976jafmdhy2rz5fcarb7hh1vaanm8l2610hk06f5k93xjhypg8j"; depends=[]; }; + nmathresh = derive2 { name="nmathresh"; version="0.1.2"; sha256="1ldxhk2ry3m8q0881fis403r303n431csmp0gp4785mafy476b5h"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; + nmfem = derive2 { name="nmfem"; version="1.0.0"; sha256="0bkw27b59knppfh4qnhrcs2j0mpxak7iyb7lskccv6ibym2kvljw"; depends=[d3heatmap dplyr mixtools plyr tidyr]; }; 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=[]; }; + nmslibR = derive2 { name="nmslibR"; version="1.0.0"; sha256="12022g9jww718bqpp7yaapafnjxj29sx7mircj8a7zwww58a7v0q"; depends=[Matrix R6 Rcpp RcppArmadillo reticulate]; }; + nmw = derive2 { name="nmw"; version="0.1.2"; sha256="1p2h13g0ss0v2jy0ii0r0qgf8i1f0dc8zhii05k2vr6cbiapslv3"; depends=[numDeriv]; }; 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]; }; + nnfor = derive2 { name="nnfor"; version="0.9.2"; sha256="1wxv8s5547spw155rj7nlilsfn5d7m40xpfy87mady93n25pwm3d"; depends=[forecast glmnet MASS neuralnet plotrix]; }; + nngeo = derive2 { name="nngeo"; version="0.1.0"; sha256="1r92d5bgd7m9d6v424fry4hsbnwzhzww1sqrphwnk2aag70hqv0g"; depends=[geosphere lwgeom RANN sf units]; }; nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; noaastormevents = derive2 { name="noaastormevents"; version="0.1.0"; sha256="1pkfmvp20f6xi2iy7l6c67zspp9f4wkrh7s308hlklms2difhp6m"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer stringr tidyr viridis XML]; }; nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; }; - nodiv = derive2 { name="nodiv"; version="1.1.6"; sha256="1srcmv4mmmsmkk4nbbnmrkv4z19l80agvwlh2q1j7xdi26wpqc5r"; depends=[ape picante raster sp vegan]; }; - nofrills = derive2 { name="nofrills"; version="0.2.0"; sha256="07c7hwml49dzslbxlq8m6h6xfya5a2s0fg177mv436387qrdyf1n"; depends=[rlang]; }; + nodiv = derive2 { name="nodiv"; version="1.1.8"; sha256="0ws0yp4j26yf45gmbvb6dpq476z8mn8yl6xdrzs0yxliizpz8jsf"; depends=[ape picante raster sp vegan]; }; + nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; }; 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.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; }; + nomine = derive2 { name="nomine"; version="1.0.0"; sha256="1yaxhac002fxcyiz5x562fnhrsq9h9nx0qmw4rykjsc5l2qbi9gd"; depends=[httr RCurl]; }; nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; 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]; }; noncomplyR = derive2 { name="noncomplyR"; version="1.0"; sha256="1a9m6r9cizw42nmy24jdsrsbllg5z84fs8b239axnh1fxzskg2qy"; depends=[MCMCpack]; }; nonlinearICP = derive2 { name="nonlinearICP"; version="0.1.2.1"; sha256="1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np"; depends=[caTools CondIndTests data_tree randomForest]; }; nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; }; - nonmem2R = derive2 { name="nonmem2R"; version="0.1.7"; sha256="1a3azvf9dbmi3l3crmkv1qvrd0j1d14x4s9hjk2r1cayiazpmbib"; depends=[lattice latticeExtra MASS mvtnorm xpose4]; }; - nonmemica = derive2 { name="nonmemica"; version="0.7.6"; sha256="0x4xfnl0yjaznpr5a80qmb721lcs9m6gsjyx3qr1jcd5pqhwm01z"; depends=[csv dplyr encode fold lazyeval magrittr metaplot rlang spec tidyr xml2]; }; - nonnest2 = derive2 { name="nonnest2"; version="0.4-1"; sha256="0lgcrxvyyw789hw80lqbxvvxl6z95qxzq9k5lphl5435xqzpfj6f"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; + nonmem2R = derive2 { name="nonmem2R"; version="0.1.8"; sha256="1250y5ylwfc3gwc0ilmzrwzk577bp7pj7bljvamzs3pqy4sflvrv"; depends=[ggplot2 lattice latticeExtra MASS mvtnorm]; }; + nonmemica = derive2 { name="nonmemica"; version="0.7.9"; sha256="0krixfwzxjalmj4b1ln79c1fxxx07qj71gzdddix3p056cdrxlyq"; depends=[csv dplyr encode fold lazyeval magrittr metaplot rlang spec tidyr xml2]; }; + nonnest2 = derive2 { name="nonnest2"; version="0.5-1"; sha256="02pflg6frvsq7azwcr660qj9mpj4q3kjx6xr6v5lshg77mjfhgdg"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; 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="1.0.3"; sha256="1sbjgzd7q2gjhs5qsy23w30cv73d9d6g08ymq18wppqpir5hikh2"; depends=[Matrix]; }; - nopp = derive2 { name="nopp"; version="1.0.8"; sha256="0yjnzxlmadh2g0frfwm7rrr0kqb5pjvrnjmzl6pikzr99yh8aags"; depends=[MASS mlogit]; }; + nopp = derive2 { name="nopp"; version="1.1.0"; sha256="1zn3ss89i7fwqps6b8syd9jzm68k95p3fdlf285q819dzlk61ypk"; depends=[MASS mlogit]; }; nor1mix = derive2 { name="nor1mix"; version="1.2-3"; sha256="1bvk888qml9qr7q703s7qzgm0sqfchcjdjqwqllm5vrjx0cnapj3"; depends=[]; }; + nord = derive2 { name="nord"; version="0.0.1"; sha256="0ajymjn2xw7zik62nhjp11g8bkvsqhhsrzi3bl2k70y544wbl3kn"; depends=[ggplot2]; }; nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; }; norm = derive2 { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; }; - norm2 = derive2 { name="norm2"; version="2.0.1"; sha256="09447dng9px1ynfp382vjmh5iqdnhc7kxg28cbmqx7ncj1z5a2bm"; depends=[]; }; normalp = derive2 { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; }; normalr = derive2 { name="normalr"; version="0.0.3"; sha256="1ydlp6nbldq7sq60zdlvqah43xdfvx5nyiqaq2m5vgma6yny930x"; depends=[ddR magrittr MASS purrr shiny]; }; normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; }; @@ -8256,43 +8801,44 @@ in with self; { 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=[]; }; - nowcasting = derive2 { name="nowcasting"; version="0.0.90"; sha256="0ggrsv92s4hpf960m1vbnnlkzp15v35vilabvzb665y53sj8wb6x"; depends=[corpcor httr lubridate matlab RCurl xts zoo]; }; + nowcasting = derive2 { name="nowcasting"; version="0.1.2"; sha256="08f45k0z5k9fmf1k9sjg71jrnlvalkylimby8plqqxiza05ga25b"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL xts zoo]; }; noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; }; - np = derive2 { name="np"; version="0.60-3"; sha256="12hzmhh59dfifssj08bjwxszxy38irami70bq14dxlm48fjyz17g"; depends=[boot cubature quantreg]; }; + np = derive2 { name="np"; version="0.60-6"; sha256="1y72x5j9j9mcgcy2xizk31gl843hfkngxdn8s4qw7yhw2qj79hsr"; depends=[boot cubature quantreg]; }; npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; }; 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]; }; + nparACT = derive2 { name="nparACT"; version="0.8"; sha256="0zwhz52j526n3xd21s7kghjaby56a8g296bkkc6scaa23zn1xg4b"; 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.6"; sha256="1jvq4snwrwjhhjgm8n8yxd5y94ks5zzi0xwdn931yp300qnikyzc"; depends=[Benchmarking np quadprog Rglpk]; }; - npcopTest = derive2 { name="npcopTest"; version="1.02"; sha256="1avjhm6rzyawwaabch6cxc7w2if4631jwrd2l8lyd3nk39kpr8ch"; depends=[]; }; + npcopTest = derive2 { name="npcopTest"; version="1.03"; sha256="1kpa3avi95aa93y038f4zqhhdp8vdscdk0c6397qmqjg34hf1dnr"; depends=[]; }; npcp = derive2 { name="npcp"; version="0.1-9"; sha256="16vzl3psa806ns387d5mhlp369r45ljcqlhl0lzdjpc1niv572nc"; depends=[]; }; npde = derive2 { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; }; nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; }; nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; }; + npmlda = derive2 { name="npmlda"; version="1.0.0"; sha256="1dr25an7cac89jyb8zhmj3ry6lq7sh7zxci1injplnk4gzy17mc5"; depends=[]; }; npmlreg = derive2 { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; }; npmr = derive2 { name="npmr"; version="1.1"; sha256="1ss8ypvv6qcdxv7l3szivliwmhidmzi3572p3nz96ysndf56akl4"; depends=[]; }; npmv = derive2 { name="npmv"; version="2.4.0"; sha256="04lfks2rlax59gxdnbgkpmk2vaax718z6hkgsvmyxf52iby6rvlr"; depends=[Formula]; }; nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; }; npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; }; - npregfast = derive2 { name="npregfast"; version="1.4.0"; sha256="1p5hp8mld05p03lrgyqwdh5wg4qh7n2bqx9w5p7z4dvvh6h67nji"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; + npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; nprobust = derive2 { name="nprobust"; version="0.1.1"; sha256="0aynp42y0qn0jl9f26rk358hjdswkz6anwvni7frxnkb7l1vyrd5"; depends=[ggplot2 Rcpp RcppArmadillo]; }; - nproc = derive2 { name="nproc"; version="2.0.9"; sha256="0n2jjizwdrdf9jq409lv7z0bxvy7dk7lki6xfp5fmsdcd2dmshly"; depends=[ada e1071 glmnet MASS randomForest ROCR tree]; }; - npsf = derive2 { name="npsf"; version="0.2.0"; sha256="0cww1fi0amgc9n1hbfy3z7xgwrbcdwvsr2d6l8lpsr1bdcpgbjzv"; depends=[Formula]; }; + nproc = derive2 { name="nproc"; version="2.1.1"; sha256="0wpny7c1n9mmv1yywlws8gjbidkrikvcqcckrxpba9avjw2c5df8"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; }; + npsf = derive2 { name="npsf"; version="0.3.1"; sha256="1mv2dzn3gc7b9ynpw8dv22xd31igg4hmkgrds12n9920pghkya44"; depends=[Formula Rcpp]; }; 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.4"; sha256="0n2nqnb1gp6vxsrm8zlg8p52jb5a5pg5k6iyimwy0xcrh7ss7iv7"; depends=[survival]; }; + npsurv = derive2 { name="npsurv"; version="0.4-0"; sha256="1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20"; depends=[lsei]; }; + nricens = derive2 { name="nricens"; version="1.5"; sha256="0a7b4kw91qkr9vrm8swflby06a78d059im54zxxgvy42qjsijwqx"; 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=[]; }; + nscancor = derive2 { name="nscancor"; version="0.6.1-25"; sha256="183kvzlln5lhmi51dm0skq1165c3hhy1yz5h2g7nxwqk2b4p23xj"; 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]; }; + nspmix = derive2 { name="nspmix"; version="1.4-0"; sha256="1cd133ncnr4g0n6w4c44q6mda8y1n7cfmsgy1x1kczvwp7cm9kk2"; 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]; }; @@ -8301,21 +8847,22 @@ in with self; { 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=[]; }; - numform = derive2 { name="numform"; version="0.3.0"; sha256="1lxb4gqa5z3ncrh95i10cnv3kxnvc4lqs7yypdhqn5yidddvcydj"; depends=[]; }; + numform = derive2 { name="numform"; version="0.4.0"; sha256="09vim4ajnnkdf27ag5j8pj7p8qyfakfh3ar1dki8bqzms2d7bkcm"; 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.3.3"; sha256="1y1nwcgghk64gmh1jn01gm3qqk5ja88gm59xq6bhl9pb03416n0p"; depends=[]; }; - nzpullover = derive2 { name="nzpullover"; version="0.0.2"; sha256="0c50854dhvjmhh8c34w9w0r8v8wk5j8bi6j81m5wpcd2jxrkbw4f"; depends=[]; }; + nyctaxi = derive2 { name="nyctaxi"; version="0.0.1"; sha256="187fs819g45f8irx2s9bgwnzr00lyamfv2ra88kyb8q2cq1icwwy"; depends=[DBI dplyr etl rlang stringr]; }; + nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; }; + nzpullover = derive2 { name="nzpullover"; version="0.3.0"; sha256="0b3mz5i58m48fa1x7gv4l3gqj0gvrar201ph2l1gkbcnfmazwjp8"; depends=[]; }; 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]; }; - oapackage = derive2 { name="oapackage"; version="2.0.23"; sha256="1kkwxwgb23i4m8dlh1ybskardwf8ql0m18cv9c5zi1qd2vkk5dx0"; depends=[RcppEigen]; }; - oasis = derive2 { name="oasis"; version="2.1"; sha256="0yh54vip2bx1ifpc3d7acr9488i3w9iyh3gl209fivnrn555plqf"; depends=[fslr mmand neurobase oro_nifti]; }; - oaxaca = derive2 { name="oaxaca"; version="0.1.3"; sha256="0pi3lrvx5cjl35hww9w8bwh0720zibph636c2ay38k83lzf3kcb8"; depends=[Formula ggplot2 reshape2]; }; + oaqc = derive2 { name="oaqc"; version="1.0"; sha256="1rc0l79xygmr2rp5sjadzigbj65a13z5xlvrxzy26cl0wsxwhmjf"; depends=[]; }; + oasis = derive2 { name="oasis"; version="3.0.4"; sha256="1h1w46rbkbsjvh3fjniy3v7y30r2vf1kiqs807kavf0bpb6a1202"; depends=[fslr mmand neurobase oro_nifti]; }; + oaxaca = derive2 { name="oaxaca"; version="0.1.4"; sha256="12w5l2a8i2964rxy9km2srlycx35y7ia8p07ra7gsxr4h8156z3c"; depends=[Formula ggplot2 reshape2]; }; obAnalytics = derive2 { name="obAnalytics"; version="0.1.1"; sha256="1l4ld120qk0adycmvqrkzada10kb7z03lj2njzqagmacl1z8598f"; depends=[ggplot2 reshape2 zoo]; }; objectProperties = derive2 { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; }; objectSignals = derive2 { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; }; @@ -8324,60 +8871,63 @@ in with self; { 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="1.01"; sha256="12idrh4jxxq28lgqzr6jzgrvmmwysh5amzhmmaqn3yz49i17gcaf"; depends=[pscl]; }; occ = derive2 { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; }; - oce = derive2 { name="oce"; version="0.9-22"; sha256="0wxgk4hr5s0kz3qby7zwrp8pdpcwb4p67mrza5gh90kv0hfirnjh"; depends=[gsw testthat]; }; - oceanmap = derive2 { name="oceanmap"; version="0.0.9"; sha256="07awxbj0gc1k8f6myqk5g54qk1n3bammrpfqi0rbfambgzrw3n5c"; depends=[abind extrafont fields mapdata maps maptools marmap ncdf4 plotrix raster sp]; }; + oce = derive2 { name="oce"; version="0.9-23"; sha256="0k5h6k4y9bas2aqwkh1dkxmwgx4d41hxy87zfih5iq8ff61d03rr"; depends=[gsw testthat]; }; 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.1.1"; sha256="1n9i1x238di3ydcx7533ifa3q72iacskfx436z8agfasfz2lmy5l"; depends=[BH bit64 blob DBI hms Rcpp]; }; + odbc = derive2 { name="odbc"; version="1.1.5"; sha256="0wsi2sv51v4ij3b72lzn8jlsc5d45hyj4qmr4iygpimflqsibjqm"; depends=[BH bit64 blob DBI hms Rcpp]; }; odds_converter = derive2 { name="odds.converter"; version="1.4"; sha256="13y3s04l2jvjhn1i4syz4y3q42ba8br0sp3mks5f5h4cp8w4j3wy"; depends=[]; }; - oddsratio = derive2 { name="oddsratio"; version="1.0.0"; sha256="19xihbdcyx19lbvylpzqwgdf7ij043zfn7cz5v7ax5byhhz26vdk"; depends=[cowplot ggplot2 MASS mgcv]; }; + oddsratio = derive2 { name="oddsratio"; version="1.0.2"; sha256="0s9w5iqcabkc7lqdh27nmg7xnw2jpwik5djjlqxb6xgabzls97d6"; 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]; }; + odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; }; + odkr = derive2 { name="odkr"; version="0.1.3"; sha256="0vcpsykr4sq4rq721vyd3wbm4jzlldvvxqh75q7x7wwhjhrnr3qn"; depends=[Hmisc stringr]; }; odpc = derive2 { name="odpc"; version="1.0.0"; sha256="1mhak9drp0a7h1yrbk08cs00hbvkfkj8r1y6klhr40sdych4q506"; depends=[forecast gdpc Rcpp RcppArmadillo]; }; - odr = derive2 { name="odr"; version="0.3.2"; sha256="0bp6aw0mv649clrm84firm4wdrxardpzgwaqddkzi222czgba7is"; depends=[]; }; - oec = derive2 { name="oec"; version="2.4"; sha256="18pww1isp8w1g1l7xrxlxdv27abwmwp7rd6q1gn5kqn5sdq0spc6"; depends=[curl dplyr jsonlite readr servr]; }; - oem = derive2 { name="oem"; version="2.0.6"; sha256="1q8nwxmf9gizwsn2795qah7f4fb8zhygqxj6kwdy5j7afr1h3zjz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; - officer = derive2 { name="officer"; version="0.1.7"; sha256="0gyl3pm80cg035gwk090475zhhgb8s34y9pkjnbs6cdkk21f1d35"; depends=[base64enc digest dplyr ggplot2 htmltools magrittr purrr R_utils R6 Rcpp tibble uuid xml2 zip]; }; + odr = derive2 { name="odr"; version="0.7.3"; sha256="07jfd809wv92ijgw1r1nq9516zi2rkf3ik243br42glf6lszn19p"; depends=[]; }; + oec = derive2 { name="oec"; version="2.5.2"; sha256="17np562cv6ln3j4b9iawyhbz8kfd5cy1ifj96kzyhv082jgpsk1s"; depends=[dplyr jsonlite magrittr readr servr]; }; + oem = derive2 { name="oem"; version="2.0.7"; sha256="12z6cgkm8yyk9dz3s1bswccn7vrvca2wiqz0ylr65q88ws828snz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; + officer = derive2 { name="officer"; version="0.2.1"; sha256="0l8xj6zsklh2dyl6kn4piv5wjalqm1ifakxh31zfz714s9w0y8qj"; depends=[base64enc digest htmltools magrittr R_utils R6 Rcpp 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]; }; + ohtadstats = derive2 { name="ohtadstats"; version="1.0"; sha256="1wpil3ag7vzinz4ky7jpzny88a4ycfifbhayyib9cldk8d0mbcgh"; depends=[lattice]; }; + oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; 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.3.0"; sha256="0y5s11bqkir4wllk2aigll8791hw5pxn9qk9i32n9d8h5s88spdg"; depends=[dplyr ggplot2 goftest gridExtra magrittr nortest purrr Rcpp tibble tidyr]; }; + olsrr = derive2 { name="olsrr"; version="0.4.0"; sha256="0ka8a6gm4ynbr2ss4syw2znnqcjly209sh992shyzp01yp5vy7bm"; depends=[dplyr ggplot2 glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr 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]; }; + ompr = derive2 { name="ompr"; version="0.7.0"; sha256="06zhmddg19sjnl18zmjjswggjg58rjgarqj2wqf5jf0g0qz3my2n"; depends=[dplyr lazyeval Matrix progress Rcpp]; }; + ompr_roi = derive2 { name="ompr.roi"; version="0.7.0"; sha256="1gcgwln7gfxd2jiqq3qbsiqircvjs8yhnxk9rcamim14x6gky4xg"; depends=[Matrix ompr ROI slam]; }; oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; }; - onemap = derive2 { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; }; - onewaytests = derive2 { name="onewaytests"; version="1.4"; sha256="0p48bic8fnj4bgrlh3r7flbaj12z3ir5bigmvh8izznablq93wkk"; depends=[car ggplot2 moments nortest]; }; + onemap = derive2 { name="onemap"; version="2.1.1"; sha256="0j9c0ynwpzyr548n72wzmmk8gi52qvxlxgzqzn8g6n4v5zmzlkhy"; depends=[fields ggplot2 maps Rcpp reshape2 tkrplot]; }; + onewaytests = derive2 { name="onewaytests"; version="1.6"; sha256="0xxqsqnk0s9w0xjj3ixghm9d1yg9fhq5lc5xyicfimnigb13hddl"; depends=[car ggplot2 moments nortest]; }; onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; }; onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; }; + onlineVAR = derive2 { name="onlineVAR"; version="0.1-0"; sha256="1hqriwrlxhbi5v5wpqxfvvcb6np1iaarb3zf84ykfzi4llqqgz24"; depends=[lattice]; }; onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; }; + onnx = derive2 { name="onnx"; version="0.0.1"; sha256="0yzvgcpqad19sw9mhh3dfci1cqa7p3i1ssmpjyycy7rkqq8kb0xs"; depends=[reticulate]; }; 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]; }; - oompaBase = derive2 { name="oompaBase"; version="3.2.4"; sha256="15l6xkacixczz5ig63blszx546hgsimy1an9lx8az4n22pjfmh5w"; depends=[cluster]; }; + oompaBase = derive2 { name="oompaBase"; version="3.2.5"; sha256="0269jmdw236jy008ic6iwg9y2fq674alqvd5zdvy1k2grxm72hvw"; depends=[cluster]; }; oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; }; - opefimor = derive2 { name="opefimor"; version="1.2"; sha256="06j5diwp42x7yrhclwyiimfwmx66y23dkwlnkd2lj2zcsgam9s8w"; depends=[]; }; - openEBGM = derive2 { name="openEBGM"; version="0.2.0"; sha256="0yjabg15v2zvhlj3fhb92g8kpsknhg1kk1n3499jf6kg5rpvpqcs"; depends=[data_table ggplot2]; }; + openEBGM = derive2 { name="openEBGM"; version="0.4.0"; sha256="0293cy1p3nh4q37qjjkzxivk6lw5sqs6n93hlmvr93ywz4h4wvyf"; 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]; }; + openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; }; openSTARS = derive2 { name="openSTARS"; version="1.0.0"; sha256="0arry24nkd50nkdnddzxagrpy4lky9smc4xr1nl6q9nwxyfgdskg"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; }; openVA = derive2 { name="openVA"; version="1.0.3"; sha256="09wbhl0g6q1rhi6yr3wpbns4ik7jalpagacn6am09i6zvmz8745j"; depends=[ggplot2 InSilicoVA InterVA4 nbc4va Tariff]; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; }; - openair = derive2 { name="openair"; version="2.1-5"; sha256="19fqg05swsxqs19gi125h9xq43s44fxg51q05y4fhgsvxbvd7aj9"; 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.4"; sha256="1vxc52qh5mgfga689l8w0isrxxnd2jmgkh9fha2hhyk874hhcawq"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; }; + openair = derive2 { name="openair"; version="2.2-3"; sha256="0gp5q84r6psqd3900f74dm0qgiig6vhnm5400nbwjm0arp1jlyp7"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; }; + opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; }; + opencpu = derive2 { name="opencpu"; version="2.0.5"; sha256="1bs2z3y2zc3aqzfjh6bq3qrpzm106f5xhw7lbyng1bpcp4rch6y3"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; }; - openssl = derive2 { name="openssl"; version="0.9.7"; sha256="178fcp9f245i0k9s2w45kbw0ml0r9pfc73ak8hvicw4jz639wzb9"; depends=[]; }; + openssl = derive2 { name="openssl"; version="1.0.1"; sha256="1qyql5gpwf88bkm1qarjhbqbq4hn6w0d8j4pxb5x7i96is30ap30"; depends=[]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; - openwindfarm = derive2 { name="openwindfarm"; version="0.1.0"; sha256="1f1pmp1h283ypyl0bz54ps0b6hwax59mmlfl0qzickmq4wjdn0qz"; depends=[anytime dplyr foreach httr leaflet magrittr readr]; }; 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=[]; }; @@ -8392,33 +8942,33 @@ in with self; { 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="1.0.0"; sha256="01ia01byp4fnclafr727bjiww8k8cygzbjlrk4i2qpbd0jp2hm6w"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline quadprog Rcpp RcppArmadillo stringr]; }; + optiSel = derive2 { name="optiSel"; version="2.0"; sha256="1k8xbxabbzrlyqb12zdd3jyd8i1cfppah8m8sdkc40y02llgzgyv"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; }; optiSolve = derive2 { name="optiSolve"; version="0.1"; sha256="1wnpj7z0vqf91gzgz6r2ympnljq4mczxnnyk3sq7gvf6df4ic2m1"; depends=[alabama cccp MASS Matrix nloptr plyr Rcpp Rcsdp shapes stringr]; }; - opticut = derive2 { name="opticut"; version="0.1-0"; sha256="0dh7zw8yrzxw3vfzfm776rdhfczmlwfs3fw568s5cc60xsn8fa93"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; }; + opticut = derive2 { name="opticut"; version="0.1-2"; sha256="1j479wa7mlp62c2y7shha1w7ybhfy8wvjfaz27kmwd1f61ma1g0l"; 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-5"; sha256="1lg8al7i3yrbjf1z8d9qgh9n67b34l5cww443asyciq362zjalnw"; depends=[colorspace Rcpp]; }; + optimization = derive2 { name="optimization"; version="1.0-7"; sha256="09s62ax3w8zijfp2cmh2lvdqbl3nijbjkwq4n3icasi53lzg2179"; 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-6"; sha256="1hbcd2pq8hlr9vh5k1hh8icr0zyri9ar4k8iq93kpfqpfif9vppp"; depends=[optimbase]; }; - optimus = derive2 { name="optimus"; version="0.1.0"; sha256="1dz0wczyl1awv3s01malmyrzwijxdywh0xhpfh1i0pncbb4rq3vc"; depends=[mvabund ordinal]; }; + optimsimplex = derive2 { name="optimsimplex"; version="1.0-7"; sha256="1if32133556zwmijlz6085fg1h65442hy03lzia0ahap3yndqfqy"; depends=[optimbase]; }; + optimus = derive2 { name="optimus"; version="0.2.0"; sha256="01njyjfrm6kjwx2qq41c0hsgxzydnrmr3538cpbfdn5i0z5blgyx"; depends=[mvabund ordinal]; }; optimx = derive2 { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[BB dfoptim minqa numDeriv Rcgmin Rvmmin setRNG svUnit ucminf]; }; optional = derive2 { name="optional"; version="1.0"; sha256="1bh3w5mcv3rhlpklncwgjr0lmjhv164q17zls0xm00qr8knzm9kp"; depends=[magrittr]; }; 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]; }; + optmatch = derive2 { name="optmatch"; version="0.9-8"; sha256="1fmk60yyrxgzi24f7a1r7vsbny8064ibm8dmx2h4xvslc1ynxa4c"; depends=[digest Rcpp RItools survival]; }; optparse = derive2 { name="optparse"; version="1.4.4"; sha256="1ff4wmsszrb3spwfp7ynfs8w11qpy1sdzfxm1wk8dqqvdwris7qb"; 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]; }; - optrdd = derive2 { name="optrdd"; version="0.9"; sha256="1l27rs4ry8qsak7fbdnx06bwhzyp432d4slj4bb18agm192j1rq3"; depends=[Matrix quadprog]; }; + optrdd = derive2 { name="optrdd"; version="1.0"; sha256="0261dwx7g8vxpnwgr53g1qhlwf12sjrb3zb7d02viaxg8fpk61k7"; depends=[CVXR Matrix quadprog]; }; 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.1"; sha256="1ljzgi6dgawgz3rr9n7g3r4cfil3qplzjphd9bxj84ayi31vy0pk"; depends=[lmtest]; }; + orcutt = derive2 { name="orcutt"; version="2.2"; sha256="0mwfbbsn39nla083p845xbbgh3y8kkrg0q735kap64jf4pgcyac7"; 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]; }; @@ -8429,53 +8979,59 @@ in with self; { 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.2"; sha256="0a30yba3gmhrl4ln47kk046fk9wqn32hjkqwmrhzjyzl3w4jq8jz"; depends=[boot]; }; - ordinalForest = derive2 { name="ordinalForest"; version="2.0"; sha256="00qp90wy6h8bkadr08bv4xm4fja2r4xh8fg1fnakak6absl401j6"; depends=[combinat ggplot2 Rcpp]; }; - ordinalNet = derive2 { name="ordinalNet"; version="2.2"; sha256="0n1c96impvygs8n8mhfs5f7qfph26mfn18i31967ihfydxxsvsbx"; depends=[]; }; - ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.3"; sha256="0ki91l6vvfxpzq7zgl3d08r5pzx47jxkgf7g0g95580xx2q7n7zx"; depends=[survival]; }; + ordinalClust = derive2 { name="ordinalClust"; version="1.2.1"; sha256="1035471ni5f8129w23kkj7263p5pa9jlihqdq2skda410lj50vnk"; depends=[progress Rcpp RcppArmadillo]; }; + ordinalCont = derive2 { name="ordinalCont"; version="1.3.0"; sha256="0zi9cfvkb811hhcplp159zpnmmk4rs0nid19gi4g9g3dgn9pa296"; depends=[boot]; }; + ordinalForest = derive2 { name="ordinalForest"; version="2.1"; sha256="1ancr7xdwhbqq3rj5hijrkjbrcaih8rqcx5r41mykrrp1k1s55dd"; depends=[combinat ggplot2 Rcpp]; }; + ordinalNet = derive2 { name="ordinalNet"; version="2.4"; sha256="0c9k3p62d482sl0vg94xm6hllk2mic2nd1c5m4vhci5ycavqzdd3"; depends=[]; }; ore = derive2 { name="ore"; version="1.6.0"; sha256="115s3wq7rrpmx65k9jlpf2x1d218gnl7vsc8zsvmjbsi4gfyliwf"; depends=[]; }; - ores = derive2 { name="ores"; version="0.3.0"; sha256="1snkbvl38rwha6zb3ff1nq71j9rb77f6yz335ryimiczp0z3x466"; depends=[httr]; }; + ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; 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]; }; + origami = derive2 { name="origami"; version="1.0.0"; sha256="0692n4javr0lwxcd0b83sbbhxbmxxs41sjvlsq5bc5l7n140qaca"; depends=[abind data_table future future_apply 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]; }; + orloca = derive2 { name="orloca"; version="4.3"; sha256="0mc337rjmdhrg6aw2pyiz68y311d6znh9ppl4k0v0rgavapw2aml"; depends=[png ucminf]; }; + orloca_es = derive2 { name="orloca.es"; version="4.3"; sha256="1yqwvzqlk70jfr9qb50g7xb4spnff4yg5rc9lw37zx13lnn4kcva"; depends=[orloca]; }; oro_dicom = derive2 { name="oro.dicom"; version="0.5.0"; sha256="05dmhfglp76apyilwicf3n2ylyjhp1gq6b9bnzsiiblpjnfpia43"; depends=[oro_nifti]; }; - 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]; }; + oro_nifti = derive2 { name="oro.nifti"; version="0.9.1"; sha256="19w9dzyfmfgxgxb5i0l06b6gzqksx879iwicfs76fwmb1q2ph540"; depends=[abind bitops RNifti]; }; + oro_pet = derive2 { name="oro.pet"; version="0.2.6"; sha256="1dczii7knh9241ksswxk9zg1d69mhk2ilrk4kjv7cj9nfm8fgmja"; depends=[minpack_lm msm oro_dicom oro_nifti]; }; orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; }; orsk = derive2 { name="orsk"; version="1.0-3"; sha256="0j8bz5kddzglcljycxy8lv8h5f6hvz88nzwq3b9cdyayd8mlbxs2"; depends=[BB BHH2]; }; - orthoDr = derive2 { name="orthoDr"; version="0.1.0"; sha256="1lh65g6jk2ciig9z6mc477wwwar9z7bcfid12ki9390icxz5f464"; depends=[plot3D pracma Rcpp RcppArmadillo rgl survival]; }; + orthoDr = derive2 { name="orthoDr"; version="0.3.0"; sha256="14z3zl6hvvvsm3q9slwl4sfnzd5igsgdycimg0ww3xg2nw7hln4l"; depends=[plot3D pracma Rcpp RcppArmadillo rgl survival]; }; 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=[]; }; osc = derive2 { name="osc"; version="1.0.0"; sha256="08ac64xqq3diw9xkialvxjvqk5khd3kjdxdi3zic2if05i3rb4ns"; depends=[raster]; }; osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; }; + oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; }; 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.5"; sha256="12zfpgp4x5akh25w1f01g5rv4nqqzn2wwysak4vvwh8h7iha0ajc"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; }; + osmdata = derive2 { name="osmdata"; version="0.0.6"; sha256="1sjaqsj0jxipg00raj20gszzjspgpy9ja37rfkx6jpaa2wh3ii87"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; }; + osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; }; osmplotr = derive2 { name="osmplotr"; version="0.3.0"; sha256="0w45riwwjigh1bxf9gx0wdj2yhdizwi6ydprp83pss2z9wph66yb"; depends=[curl e1071 ggm ggplot2 httr osmdata rgeos sp spatstat]; }; - osrm = derive2 { name="osrm"; version="3.0.2"; sha256="17nwc4wak5pxzr29gwrlsm31aaskng9z1dmbb7mry7pvgmqylbhd"; depends=[gepaf jsonlite raster RCurl rgeos sp]; }; + osrm = derive2 { name="osrm"; version="3.1.0"; sha256="12gbgjp3hq0vg0wf6xq0l9wgq0h6w4l0bfwmlnyhq26z9n08a1lq"; 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]; }; + otvPlots = derive2 { name="otvPlots"; version="0.2.0"; sha256="1halgpk5ld5ihz0da69wf72l0624r73h2wjc0zjn8b8kw1v9xgzs"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; }; ouch = derive2 { name="ouch"; version="2.11-1"; sha256="0xkwwi62vdahlcg3k32zb1nfwsx87zdssk79mvcxgfsw9bw4gahx"; depends=[subplex]; }; outbreaker = derive2 { name="outbreaker"; version="1.1-8"; sha256="0przz78jzkwl580w83p0aigaykfki2hdzprwqic7dy6yxnpqlpm3"; depends=[adegenet ape igraph]; }; + outbreaker2 = derive2 { name="outbreaker2"; version="1.0.1"; sha256="1v49i9z4kx9l485ib5q91s4z6r03lyijzjrr9zyjgham59rncyij"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; }; outbreaks = derive2 { name="outbreaks"; version="1.3.0"; sha256="1k0g9x6wvdw8lkpjiv8z1ijp6pg5hri3gawx7zfpnm05g6ncvg81"; depends=[]; }; outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; }; overlap = derive2 { name="overlap"; version="0.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]; }; + oxcAAR = derive2 { name="oxcAAR"; version="1.0.0"; sha256="19inf2bcpfj4jzfym1v5f1w5fkmcycz5jrfc2hf0wsvixy53lfxa"; depends=[jsonlite stringr]; }; oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; }; p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; }; p3state_msm = derive2 { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; }; pAnalysis = derive2 { name="pAnalysis"; version="2.0"; sha256="0pykdlbynzgcbnjs8xs8frgncf53l8qgf6na34adq7da76n570hi"; depends=[coin ggplot2]; }; pBrackets = derive2 { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; }; - pETM = derive2 { name="pETM"; version="0.1.5"; sha256="0a677jbaxhvcjz6846cd1y867srgrmxm78k06xva3hds7hbycm3w"; depends=[Matrix]; }; + pCalibrate = derive2 { name="pCalibrate"; version="0.1-1"; sha256="04a7dmf9sjw44y53i469f8fjm8as2vwr0pgk4s91l63pxdqnjvfl"; depends=[epitools exact2x2 MCMCpack]; }; pGLS = derive2 { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; }; pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; }; + pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; }; 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.10.0"; sha256="0rm08hf2gxqn5b83ara733w5nihkg1jmdilz67zzrc9iwmqznfa0"; depends=[ggplot2 plyr Rcpp]; }; @@ -8489,13 +9045,13 @@ 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.2.0"; sha256="1z0s5lnzpmipcsdk0wsjp18mm6j50yfn8qip98rx30hmyh3flwmc"; depends=[Rcpp]; }; - packrat = derive2 { name="packrat"; version="0.4.8-1"; sha256="1wvjyvb7yy6hq188msqzf8qa00lhll865jp939byc6d4zpscm0x2"; depends=[]; }; + packcircles = derive2 { name="packcircles"; version="0.3.1"; sha256="0f2y651i96sa7b7mfxg5kinmhhzvcv18lia74fdpdnmc6fxlxg17"; depends=[Rcpp]; }; + packrat = derive2 { name="packrat"; version="0.4.9"; sha256="1l0p59h0w0qdg5vlgq93932hpkidg6kd9cwg3ckn3vwms4sh2p7x"; depends=[]; }; pacman = derive2 { name="pacman"; version="0.4.6"; sha256="1vdak1hv3j44dsj6cckzc1a86dg933jqhxdys8fyxacmk101l388"; depends=[devtools]; }; paco = derive2 { name="paco"; version="0.3.2"; sha256="0qf692fqlq0d7hh9yllywaswmj5spy6q1r67nzkhgyh311nhjh6c"; depends=[plyr vegan]; }; pacotest = derive2 { name="pacotest"; version="0.2.2"; sha256="0n17qzn7wabs6am55z96zg8759fdcz3vpm7yx25dyaqliawgqnj7"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; }; - padr = derive2 { name="padr"; version="0.3.0"; sha256="00zh3k1rijmxkm3jj3frgwnihbw4ix1p1xd1vrd5fll1xiiy1n7l"; depends=[dplyr Rcpp]; }; + padr = derive2 { name="padr"; version="0.4.0"; sha256="1liks4cj1cyzf6ls2h8f68xd7nry6y9ml3zdmw1fsax251dhmbq4"; depends=[dplyr lubridate Rcpp rlang]; }; 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.1"; sha256="0908rlr9sd1a2qwz0idw8ccxhji73sk24gyrdl071lpnd1rs2wl7"; depends=[]; }; @@ -8504,20 +9060,21 @@ in with self; { pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; }; - pairwise = derive2 { name="pairwise"; version="0.4.1"; sha256="06g6ma8wfn3zxyxhbj3bi851aflddsdisw4rwvg0w6l3w2q9mvnf"; depends=[]; }; + pairwise = derive2 { name="pairwise"; version="0.4.3-2"; sha256="1kb73jsfyp1daqbrmpwh8l9j28fgiapimfwdypz82m46wza1qgww"; depends=[]; }; pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-25"; sha256="0wpv22db63xkgjw0nwa39clgrr2finxvl0a510hkc54ijqjx9ksh"; depends=[binMto boot coin MASS MCPAN mcprofile mratios]; }; palaeoSig = derive2 { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[MASS mgcv rioja TeachingDemos vegan]; }; paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; }; 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]; }; + paleofire = derive2 { name="paleofire"; version="1.2.1"; sha256="0f2bvwc370fjpacv4ipjr1gk6l4ni3lg6da2549zn6hqca0hyjis"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; }; paleomorph = derive2 { name="paleomorph"; version="0.1.4"; sha256="05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa"; depends=[]; }; - paleotree = derive2 { name="paleotree"; version="2.7"; sha256="0h2rch89p8n1i1zdy3xj5966hsz47a49r5baqvn1s9c9pr024czk"; depends=[ape phangorn phytools]; }; + paleotree = derive2 { name="paleotree"; version="3.0.0"; sha256="1nk7j3l310c9wh5mqf0zw4cg6wmvx4c8pl06ahkknx3imslar96q"; 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]; }; + palm = derive2 { name="palm"; version="1.1.0"; sha256="05r6hwkvsd30f5frqxh6k2f1p291s78kfh492lvdmcg8jwrnrvll"; depends=[gsl mvtnorm R6 Rcpp spatstat]; }; + palmtree = derive2 { name="palmtree"; version="0.9-0"; sha256="0cd5p82gp2g1zq8kf9ybi4wa1r2jg4dbxbp5n01qs4apmyyncl4d"; depends=[Formula partykit]; }; palr = derive2 { name="palr"; version="0.0.6"; sha256="163c0kcsl0k3fp5q9afv3pb8246j2b3jzmd6g2vcgxb8nhs8wr2f"; depends=[]; }; - pals = derive2 { name="pals"; version="1.4"; sha256="1dbg5rvagmbxa0kbyp1c9sv6w7r8yc6zn6gqpy2yh6j2h1hiblll"; depends=[colorspace dichromat mapproj maps rgl]; }; + pals = derive2 { name="pals"; version="1.5"; sha256="0zc4dw8ipvhdm2qvy71k16vf8fmjs08nqbvvdi1k8h4fs648ddhi"; 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]; }; @@ -8527,19 +9084,21 @@ 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.3.0"; sha256="1kkjvcwdnak5rxdz5q066b1q7yx75djm5q0gbx6iqcgvvhly1kpp"; depends=[httr jsonlite oai rappdirs tibble xml2]; }; + pangaear = derive2 { name="pangaear"; version="0.6.0"; sha256="0dykacf5ckhck08rbk6l5kyw51i2p1ncy44agcxj79cr290cd5ck"; depends=[crul jsonlite oai png 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]; }; + parSim = derive2 { name="parSim"; version="0.1"; sha256="15d3k91mvbv2hmq0l1jfr0hsv2zkz3cr6axg85kf9bd9q79b85qp"; depends=[dplyr]; }; + parallelDist = derive2 { name="parallelDist"; version="0.2.1"; sha256="1w6c5ijnynqq7q15f5mflmxcad6yblpdaflh378lf9vm2xdq0yjp"; 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="1.1-1"; sha256="1v2nmigvgc6n33dh2rhn984kxkplc7v5gz72b47zvgxnkcpkrab9"; depends=[assertthat kinship2 maxLik]; }; + paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; }; params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; }; + paramtest = derive2 { name="paramtest"; version="0.1.0"; sha256="0yn1s1qkgby8x0qn7cy1zhxzc0wyi7bm30pkvijhn5h5afjpylsy"; depends=[boot]; }; 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]; }; @@ -8550,56 +9109,58 @@ in with self; { 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]; }; + parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; - partialAR = derive2 { name="partialAR"; version="1.0.10"; sha256="18hw0azhvd3737wi5cy8ympwfrj6ag01w1a4csy6kl2kifldg6b7"; depends=[data_table FKF ggplot2 MASS plot3D Rcpp tseries urca zoo]; }; - partialCI = derive2 { name="partialCI"; version="1.1.0"; sha256="00gdr25zz327iscasm74bxj0k6h94m59qwaf9vf8xcqfpp0n22wa"; depends=[data_table FKF ggplot2 glmnet MASS partialAR Rcpp TTR zoo]; }; + partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; + partialCI = derive2 { name="partialCI"; version="1.1.1"; sha256="07c3484v8axqxss877dvb6d5gh4vrr8dbvcqgq2xgwb6wcs59nyy"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; }; partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; - partitionComparison = derive2 { name="partitionComparison"; version="0.2.2"; sha256="1dhwwifq1f4i1qi2sdnhiampbj6bpwc65j3qnbiikzcchs1mb6nd"; depends=[lpSolve Rdpack]; }; + particles = derive2 { name="particles"; version="0.2.1"; sha256="0rhxn3c62x3xc9lcy7xbg6r7pgfylan7cz24v8i9icjhl7xfswmv"; depends=[digest dplyr igraph magrittr mgcv Rcpp rlang tidygraph]; }; + partitionComparison = derive2 { name="partitionComparison"; version="0.2.3"; sha256="1p0f08za30kpmj9ky4jw6i3nl38i7xrslwsj60ih7gvph2jd39ix"; depends=[lpSolve Rdpack]; }; 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-19"; sha256="1pklfnjdc094c8nzkqcdvqzdh8v3p5n8jbg4pf9678iw648saiyx"; depends=[gmp polynom]; }; 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-3"; sha256="1rpp4qfb7igpqlz0jw12ykd7p3ri8miby6nlvyzbblz3h67lplkb"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; - partykit = derive2 { name="partykit"; version="1.1-1"; sha256="0cl3ir54pafjhk1cvyzx1a8a244x0qa5lky47m7fx1fdj0k7dx6r"; depends=[Formula survival]; }; + party = derive2 { name="party"; version="1.2-4"; sha256="10i1zxk93c5asinxmi6af1jbw1j4a25d5hzg7viyh73grvlkw7bc"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; + partykit = derive2 { name="partykit"; version="1.2-0"; sha256="1zxgx0wrvn4fj2l6pjwmczj7n4232szm1kzfzaq5cn13qzndnk66"; depends=[Formula inum libcoin mvtnorm rpart 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]; }; - passport = derive2 { name="passport"; version="0.1.1"; sha256="0mbkiq9qxlflhyii31phva67q89zm7klpj8f2jwhdagjgy48mflx"; depends=[]; }; + passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; }; password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; }; - pasta = derive2 { name="pasta"; version="0.1.0"; sha256="12ps5bhyk3hllfa9smyw8vxglr45xz9kvhkx2v65pb86iqm0r0kg"; depends=[]; }; pastecs = derive2 { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; }; pastis = derive2 { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; }; patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; patchDVI = derive2 { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; }; patchPlot = derive2 { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; }; patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; }; - patentsview = derive2 { name="patentsview"; version="0.1.0"; sha256="01x1k24xz6315j44jshinp6snxmrfsmnqh61hm5rzb3i10wvwlmi"; depends=[httr jsonlite]; }; + patentsview = derive2 { name="patentsview"; version="0.2.0"; sha256="1n599ksd4vdpfxdlq8bfc0h94v76qbsrrpd5p0q1c6cl083fvvzq"; depends=[httr jsonlite]; }; 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]; }; + pathfindR = derive2 { name="pathfindR"; version="1.0.0"; sha256="1wwl7cxgdrvcyrzyv1jrhhp850fc512585ih5g24jmrfr6n0422h"; depends=[AnnotationDbi DBI doParallel foreach knitr org_Hs_eg_db pathview rmarkdown shiny]; }; 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]; }; + patternplot = derive2 { name="patternplot"; version="0.2"; sha256="15kvihsyabg8l4458hqyg2dzaj37lshk5jx019vvzr9rjbcznj17"; depends=[dplyr ggplot2 gtable jpeg png R6 Rcpp RcppParallel]; }; pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; - pavo = derive2 { name="pavo"; version="1.3.0"; sha256="0jp9k2wszzzwzn9bgxikv58mqxvxswi2hkzqr270vidc71qyngy8"; depends=[geometry mapproj pbmcapply rcdd]; }; + pavo = derive2 { name="pavo"; version="1.3.1"; sha256="1vr3crp71dibm3jn88wh4gdia2l3z4aqmfns7v5pllqadk9s1064"; depends=[geometry mapproj pbmcapply rcdd]; }; 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-3"; sha256="0iqhymf65jffh00qf056h1p76xf92bfmij6aymlmgnvn24fv4ybk"; depends=[]; }; + pbapply = derive2 { name="pbapply"; version="1.3-4"; sha256="0lk5kxac09xzdv6vf7ix6r5bfrm7cnpyr2l5mkd4igpciadszzfd"; 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]; }; + pbdBASE = derive2 { name="pbdBASE"; version="0.4-5.1"; sha256="0ghdq8ry6fiq8qj3plq2n8isjx6iacnhqd1z73bjckmvp99g221n"; depends=[pbdMPI pbdSLAP]; }; pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; }; pbdDMAT = derive2 { name="pbdDMAT"; version="0.4-2"; sha256="1xiwfpi8r0l8jlfrc35aknm09y4qbn0hvvkscdpcxv9q7zifvl3v"; depends=[pbdBASE pbdMPI]; }; - pbdMPI = derive2 { name="pbdMPI"; version="0.3-3"; sha256="0bgnx2d7ykfzq85jkiggwakqz2ngmvf7d4lx8qp95w272bkpm779"; depends=[rlecuyer]; }; + pbdMPI = derive2 { name="pbdMPI"; version="0.3-4"; sha256="05b0f8hqnn5wrmxg1yjd60h5v0hys7bvzb9brgbsxp1nbsashqq9"; depends=[rlecuyer]; }; pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; }; 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-6"; sha256="1kqpl8y55a9m2qkh56wb9qgxxwckwwjabj2m519nvwv55avkgy61"; depends=[R6]; }; + pbdRPC = derive2 { name="pbdRPC"; version="0.2-0"; sha256="0qndlgv6r9k17mz75g7d2k5alg0qp5h7scpnz2zl6kqlpr8z6l2p"; depends=[]; }; + pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-3"; sha256="1famaxkm385ka7kgk997lvkb68cpch0vb26l94vzkhxwfxl0fyjp"; depends=[pbdMPI rlecuyer]; }; + pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-2"; sha256="0dzwwffinn9bbb73dmmh88c374f9057bl0a8dq97fbv63j4a5qpc"; depends=[]; }; pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; }; pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; }; + pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; }; pbmcapply = derive2 { name="pbmcapply"; version="1.2.4"; sha256="0wh0ljy9nbb7ifh06bf79hwc2ci9482hdppgpa1zpz8x2mgyvy04"; depends=[future]; }; pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; }; pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; @@ -8608,29 +9169,31 @@ in with self; { pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; }; pcaL1 = derive2 { name="pcaL1"; version="1.5.2"; sha256="1f7481wn2c935llb9visfdlv958ixxqybp5r2dy7nm18jacf2a0l"; depends=[]; }; pcaPA = derive2 { name="pcaPA"; version="2.0.2"; sha256="14hi09qksr1z54l268yv4g2x5hlikir7zir4ccd9yi5z1918ksj5"; depends=[ggplot2 ltm mc2d polycor sfsmisc]; }; - 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]; }; + pcaPP = derive2 { name="pcaPP"; version="1.9-73"; sha256="1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa"; depends=[mvtnorm]; }; pcalg = derive2 { name="pcalg"; version="2.5-0"; sha256="002y7b0r750nbnrg8w53q2fyvk13jk4jrqlf3f2777qw7si5vmz3"; depends=[abind bdsmatrix BH clue corpcor dagitty fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; + pccc = derive2 { name="pccc"; version="1.0.1"; sha256="1br157yip3cizd05rgw22shrvjz2jrd6kad3dkswayksx8wrnvhz"; depends=[dplyr Rcpp]; }; pcdpca = derive2 { name="pcdpca"; version="0.4"; sha256="0ys4hrin0w3f87d1d986wvrfkfwapzj9hz7d7v92r60ns74g7r5m"; depends=[fda freqdom]; }; pcensmix = derive2 { name="pcensmix"; version="1.2-1"; sha256="1yrz4hdj52in8z65qyl18kh7frv75rb8ss5ljv3vbm6yhxi32jnd"; depends=[]; }; - pcev = derive2 { name="pcev"; version="1.1.1"; sha256="0vhn5514dnmhv98bchvsfd6pfjmvbc7hhb9zabgf8syk9rh8y9h8"; depends=[RMTstat]; }; + pcev = derive2 { name="pcev"; version="2.2.2"; sha256="1l0afcdzkxzkhkc8ln2fzi50hc7nfq46lg6hhx6rrzkb41w82iqw"; depends=[corpcor RMTstat]; }; pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; pch = derive2 { name="pch"; version="1.3"; sha256="13pfrvp539fz4hxp08yil93caw3cjdna7xnky5fqd0lhc84fwq76"; depends=[survival]; }; - pcnetmeta = derive2 { name="pcnetmeta"; version="2.5"; sha256="0542vacgb8ij7cid2i5fnq038wxndkz9lpw1vanr07zgslssdyl9"; depends=[coda rjags]; }; + pcnetmeta = derive2 { name="pcnetmeta"; version="2.6"; sha256="0rpd1bgg932xhj03fnskhbg7ni9nfd8qrvxvix8qmbgw8bwdsbgd"; depends=[coda rjags]; }; pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; }; + pcr = derive2 { name="pcr"; version="1.1.0"; sha256="1rz9jxjs9s7kwg3aljfm1x2v7jsg94wawmhgs8va83g46pbl26g8"; depends=[broom devtools dplyr ggplot2 magrittr purrr readr tidyr]; }; pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; }; 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.1.1"; sha256="1984gxyp9y8hnc3cqdr51bk2l85qpqrkrlslw38q2dmsq40v26rz"; depends=[astsa ddalpha multitaper Rcpp RcppArmadillo]; }; + pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.1"; sha256="0j68jmsm6c9pan195k0l0nm1ldbipl5ywlbwkz61dblspizh04iw"; depends=[ddalpha multitaper Rcpp RcppArmadillo]; }; pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; + pder = derive2 { name="pder"; version="1.0-0"; sha256="097klk334bjhlss8x73f27l7jcp7d7vh10jr5sazm5kcvi95619i"; depends=[]; }; pdfCluster = derive2 { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; }; - pdfetch = derive2 { name="pdfetch"; version="0.2.2"; sha256="0nr34c7iyv2gbxrdbpkk43b61c7g9z85kgzahzq1wcx08x49bpxs"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; }; + pdfetch = derive2 { name="pdfetch"; version="0.2.3"; sha256="1fcjhq79dcbnghmkfpy1h29gcywr1hq91xij5f21wgp4xx465sha"; depends=[curl httr jsonlite lubridate readr reshape2 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.4"; sha256="0qm90dq1cjn57csvmls9yznpb7bb0w986990kwwh21i9pkl9rc3n"; depends=[Rcpp]; }; + pdftools = derive2 { name="pdftools"; version="1.5"; sha256="09z4174zbp0nzdkpwx5yxxlmzskqg48gc6n5qpmx0hkanfz8g7ls"; depends=[Rcpp]; }; pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; }; - pdmod = derive2 { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; }; + pdmod = derive2 { name="pdmod"; version="1.0.1"; sha256="04bk9gjg2c55hk6k1hy0m29927s8a5ig6mr4xb89npam68g0pcms"; depends=[mco]; }; pdolsms = derive2 { name="pdolsms"; version="0.2"; sha256="18gwr1xnm7jbqna911b7haa9sv1i2qvq18w00dkbnj796rh0h78f"; depends=[reshape2]; }; pdp = derive2 { name="pdp"; version="0.6.0"; sha256="12x9j3lwnss45wlafd5kc4nw293vhffijmgyafahqwz9if829m10"; depends=[ggplot2 gridExtra lattice magrittr mgcv plyr viridis]; }; peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; }; @@ -8639,7 +9202,7 @@ in with self; { 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.5.4"; sha256="1gi8vvdj3mwpi5rgfqci1lan1a34nbcyyypwa171sfj7j1m770r3"; depends=[foreach prodlim rms survival timereg]; }; - pedantics = derive2 { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[kinship2 MasterBayes MCMCglmm]; }; + pedantics = derive2 { name="pedantics"; version="1.6"; sha256="08d13igjprqb8l2i8y07rn8pdq6bvjy8bf2ccpixv34d8cg5758j"; depends=[genetics kinship2 MasterBayes MCMCglmm mvtnorm]; }; 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]; }; @@ -8652,10 +9215,11 @@ in with self; { 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.07.11"; sha256="0ab1dy0kh3fmbcdg29qhvrjnaxpk7lqcnsz4bwplq0ia3assc8sl"; depends=[data_table geometry ggplot2]; }; + penaltyLearning = derive2 { name="penaltyLearning"; version="2017.12.08"; sha256="0pkd853dq7frp0f9aii99qpnx9mk4gzb73iykfa5q9bnp45z8qd0"; 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]; }; + pense = derive2 { name="pense"; version="1.2.0"; sha256="0wilfjhkj5hrgm7mak1hvlk07wrr3f774w26vyvbwlm8xsxxsbzz"; depends=[Matrix Rcpp RcppArmadillo robustbase]; }; 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]; }; peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; }; @@ -8671,34 +9235,35 @@ in with self; { permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; 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]; }; + permuco = derive2 { name="permuco"; version="1.0.1"; sha256="19spn5ra41v7s4ixdg5pbksfi8linhvhvfmllz72iw6wbzsw8m0m"; depends=[MASS Matrix permute]; }; 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.1.0"; sha256="1xdiddzifaqfsm6pr477whj09i549jd9qzvn3vag5plc276vsv2g"; depends=[foreach gbm ggplot2 glmnet mgcv plotly survival]; }; + personalized = derive2 { name="personalized"; version="0.1.4"; sha256="0w6qvkbzpbsyjvsgadx59h49im4c03x8kyd39z2w825vznds9xmz"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly 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=[]; }; + perturbR = derive2 { name="perturbR"; version="0.1.0"; sha256="0zn10xm39sbv9g8mvp582c6bwpdk6ss1b50pdk7nkdmih3g6cxqb"; depends=[dils ggplot2 igraph mcclust]; }; pesticides = derive2 { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; }; petrinetR = derive2 { name="petrinetR"; version="0.1.0"; sha256="0na8srzwi933bva9j3hrn4ji8s58dm28jpxw9q13mpahzch4r454"; depends=[dplyr visNetwork]; }; + petro_One = derive2 { name="petro.One"; version="0.1.3"; sha256="13bxd011lprimy5m3z08l4yng2fkp28b1ad1bqs0piffx5bxw13n"; depends=[cluster data_table dplyr ggplot2 graph magrittr RColorBrewer Rgraphviz rvest RWeka tibble tm urltools wordcloud xml2]; }; pewdata = derive2 { name="pewdata"; version="0.2.0"; sha256="17j8fdn9x6hannr91zyccya523z3zm03gr517xfcyrd0m486xnqb"; depends=[httr magrittr purrr rvest]; }; pez = derive2 { name="pez"; version="1.1-1"; sha256="14n9s604wwh07kjir5kw6sra6bbmnpg00h3zvli3zqd8lx892hm8"; depends=[ade4 ape apTreeshape caper FD Matrix mvtnorm picante quantreg vegan]; }; pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; }; - pgam = derive2 { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; }; + pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; 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.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=[]; }; + pgirmess = derive2 { name="pgirmess"; version="1.6.8"; sha256="1sy5jf356mylsr0bjmvdykcv1ssf60v4bnrsqjdqsrry9a7iyp7g"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; + pglm = derive2 { name="pglm"; version="0.2-1"; sha256="14hnlidf62kzcf83jc7k17n4hjjaj82scdwh8a7qxd056vygkqx2"; depends=[maxLik plm statmod]; }; pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; }; pgraph = derive2 { name="pgraph"; version="0.8"; sha256="1r784snci5m81qljfh1r3w8qzszmy0476zvsd1alh43afzg9zpr5"; depends=[energy glasso glmnet SAM]; }; pgs = derive2 { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; }; - ph2bayes = derive2 { name="ph2bayes"; version="0.0.1"; sha256="09ns3i5dgbn8573g4sism6d3y8jp26icy21l8d8px91jfhlx7kxv"; depends=[Rcpp]; }; + ph2bayes = derive2 { name="ph2bayes"; version="0.0.2"; sha256="1xm7930gycxrz308dnfnp023yidqik52sbrli35f3773mnfcid2g"; depends=[Rcpp]; }; 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.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]; }; + phangorn = derive2 { name="phangorn"; version="2.4.0"; sha256="0xc8k552nxczy19jr0xjjagrzc8x6lafasgk2c099ls8bc1yml1i"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; }; + phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 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]; }; @@ -8706,74 +9271,80 @@ in with self; { 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="6.0"; sha256="0r7h7rg3dl2c1gz6vmy89sw1sdcikav1aj6i8qwmslgjwd1qh6ci"; depends=[HelpersMG lmf numDeriv optimx]; }; + pheno2geno = derive2 { name="pheno2geno"; version="1.4.0"; sha256="0fy8z6x1y0sakp07jb6zs0w0f86pbbllicj4qylxzfd5rpn1rqr0"; depends=[mixtools qtl VGAM]; }; + phenoCDM = derive2 { name="phenoCDM"; version="0.0.2"; sha256="07fmljdn5dg9v2mv0k7hjk7xlldhvzvcxia8vda0xkpn3hlrriid"; depends=[rjags]; }; + phenology = derive2 { name="phenology"; version="6.0.3"; sha256="17idd9znwmgsa6wzijc4ahvlld4qp6sihyg3cdv91gfl0yjd51w1"; depends=[HelpersMG lmf numDeriv optimx]; }; + phenomap = derive2 { name="phenomap"; version="1.2.0"; sha256="1lz0sjpk8nj9v2fxqzwhcdppjy3hafb3ag2lbi3v85lc9ngwccdd"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; }; 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]; }; + phmm = derive2 { name="phmm"; version="0.7-10"; sha256="1ra5qf24qmwjf8cra9yh20i2s8jv0kzb1gyw96il8r5cdl20gbcz"; 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.5"; sha256="0llwn0ws5g0ri6bywj5jkx67954xil8w666nhy9jwnx0jzpa0cf2"; depends=[BH Rcpp]; }; - photobiology = derive2 { name="photobiology"; version="0.9.17"; sha256="02xk0vpcfmwsr8h2yjgp5lh6rlzv26yz14r78z686g02hpzcf0d8"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; }; + phonics = derive2 { name="phonics"; version="1.0.0"; sha256="02bkw589iijlzbw0cbg9qhq99jij2p92cqrxa77chkly4naqkqds"; depends=[BH Rcpp]; }; + photobiology = derive2 { name="photobiology"; version="0.9.19"; sha256="1islzlsj37y41c30r1cqmi646596n5b2swx8csxl0l1lrz0h8nnd"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; }; + photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.4.4"; sha256="14aiw5jxd6wnngy1rbbm85l0yx64nxrancal017wvr5n867c32d6"; depends=[photobiology]; }; 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]; }; + photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; }; + photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.2"; sha256="0fcin04xc2k39qdipslqd3w3bsd8yl3xlvg7mlgm3aphfwg4hnmj"; depends=[photobiology]; }; photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.1"; sha256="0mpb5sv4wkvqzbhf193zkhap44yzlhxrnjx1p3j9iyjdg4bb1kka"; depends=[photobiology photobiologyWavebands]; }; + photobiologySensors = derive2 { name="photobiologySensors"; version="0.4.0"; sha256="1d0rphlx6k2hqvmhndbw143djsfr4fmwjih3s37bhksc2dn7nh2v"; depends=[photobiology]; }; + photobiologySun = derive2 { name="photobiologySun"; version="0.4.0"; sha256="0aczf1ki623pflsnn08z0nrsx7wwn67b8ql08ar08rpk1bj93nfy"; depends=[photobiology]; }; 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=[]; }; - phuse = derive2 { name="phuse"; version="0.1.4"; sha256="04q9aylm8k7yahsv19d2b1xd0lqr5iab55in45sa51nz93d3bs45"; depends=[git2r RCurl shiny yaml]; }; + phuse = derive2 { name="phuse"; version="0.1.5"; sha256="0cl36yxxhadg5rwdz3pxzqly52bv5510rr5ijyzb0x24l7zx6pjk"; depends=[git2r RCurl rlist shiny yaml]; }; phybreak = derive2 { name="phybreak"; version="0.2.0"; sha256="0vapc0w308wv1cd72p2xbj3q7jfnxwp08g5g8855a38pcn3njbfg"; depends=[ape phangorn Rcpp stringr]; }; - phyclust = derive2 { name="phyclust"; version="0.1-20"; sha256="0i1rhq54p9069z1ms60dfg6jvmmn5rc0ni6sxxkdm1p3n72zrl1f"; depends=[ape]; }; + phyclust = derive2 { name="phyclust"; version="0.1-22"; sha256="0c3w1vafhcshnh5lkb6bykk6w7w91qigz3sf215zqmrra1acri0d"; depends=[ape]; }; phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; phylin = derive2 { name="phylin"; version="1.1.1"; sha256="1hxmh5jgcz41bhmi8kvimw0b6m4p3yq85bh79hl7xbx2kshxmvzq"; depends=[]; }; - phyloTop = derive2 { name="phyloTop"; version="2.0.1"; sha256="1mwifnmq4zk83vj7886ndz6i3xa9dyxsz9p4b0ah53cdvbcqcspd"; depends=[ape igraph NHPoisson phylobase]; }; + phyloTop = derive2 { name="phyloTop"; version="2.1.1"; sha256="1n44kr3a9yg8yvy3m493zi04x6aiqm424fp2ls9yzyx1cga2h9nk"; 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]; }; + phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; }; phyloclim = derive2 { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; }; phylocurve = derive2 { name="phylocurve"; version="2.0.9"; sha256="1d01nwfpyh61r00dq6cnhxdwzk81jr3l6aa51dl1wck4cy0frscp"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; }; 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.3.1"; sha256="02c7n08spmb2hpx2jmvjg57asy9laljllf4bips0hxk9y9rb12a6"; depends=[ape dplyr ggm ggplot2 ggraph 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]; }; + phylopath = derive2 { name="phylopath"; version="1.0.0"; sha256="1n6f7piygps3pwqapsvqpz764995kxhdqz1hc5n6znvl01ykdqx5"; depends=[ape dplyr ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble tidyr]; }; + phylosignal = derive2 { name="phylosignal"; version="1.2"; sha256="0apsg4v1n58wn8y8wnl6x1ahl903i29hh8bs2dw6ky2jafkjj4jb"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; }; phylosim = derive2 { name="phylosim"; version="3.0.2"; sha256="148zm43cgdhr264ffcabjx4abykks07jix6lypqysqy25fbmdngk"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; }; - 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]; }; + phylotate = derive2 { name="phylotate"; version="1.2"; sha256="19nssrdax5w5a50159j39jgs7305s48k3h56ivyzs5di6l7x1yxj"; depends=[]; }; + phylotools = derive2 { name="phylotools"; version="0.2.2"; sha256="1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w"; depends=[ape]; }; 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.6-20"; sha256="06ysvhpkg9lnnjla056as39bd47aax0dndbck7wz66ypy6676m6p"; depends=[animation ape clusterGeneration coda combinat maps mnormt msm nlme numDeriv phangorn plotrix scatterplot3d]; }; + phytools = derive2 { name="phytools"; version="0.6-44"; sha256="1y815pv1cksj244vcb7q4qr45gzr4cb1qwi166h65ryggywcj48w"; depends=[animation ape clusterGeneration coda combinat maps MASS 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-1"; sha256="09sjcmc6d45b7c7zfq150ncpyqsy3qkq2g88kv52csi7kwl7828n"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue scatterplot3d]; }; picante = derive2 { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; }; - picasso = derive2 { name="picasso"; version="1.0.1"; sha256="03108gga5a5r6cqi1c8l6n2bj81rg32277pdg6ja6d2n2c7pyah6"; depends=[MASS Matrix]; }; + picasso = derive2 { name="picasso"; version="1.2.0"; sha256="1bclrv0g2frdw6bfqacjbbzn9vg3354i2bh5zn6hkix7r8rqymzg"; depends=[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]; }; - pifpaf = derive2 { name="pifpaf"; version="1.0.0"; sha256="1xizy0m3rm11wp4q5431axbhphx4azahh1vs7kc5ry3mwivnafhz"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; }; + pifpaf = derive2 { name="pifpaf"; version="1.0.1"; sha256="0wj1fbhd871fnw7fjlbh0gdjz848mbwl1bzjp3cgmh9s7jnd2kci"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; }; + pillar = derive2 { name="pillar"; version="1.2.1"; sha256="1ryd7m570y6q3w71wd5dz042b3d0dv24g2rbkw1kdx0n6jj9gsbd"; depends=[cli crayon rlang utf8]; }; 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]; }; + pinbasic = derive2 { name="pinbasic"; version="1.2.0"; sha256="1sn4q9g2pw8z6gyxi302bd7p578ldy1g6419w56z7jgv7m8n7g73"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; }; pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; }; pingr = derive2 { name="pingr"; version="1.1.2"; sha256="17fh2gjlmwy6wy8i24q76fivjig8jm05g9kvfz81q0h6b5zxnpmg"; depends=[]; }; - pinnacle_API = derive2 { name="pinnacle.API"; version="2.0.9"; sha256="1pq7q2wa4g8gxbyiascygnng53ihwmf5hsazwbyzjqgyyhi0hd9m"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; }; + pinnacle_API = derive2 { name="pinnacle.API"; version="2.3.3"; sha256="1b6adns1xr3cgcj2mdjvl16cm2vjjgsj2l8m2c47plyc5jh05qmb"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; }; pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; }; - pinp = derive2 { name="pinp"; version="0.0.2"; sha256="1d4csr3ida6srw4ykbggka766j25kb2d450nhbschrgp345g81ra"; depends=[knitr rmarkdown]; }; - pinyin = derive2 { name="pinyin"; version="1.1.0"; sha256="15zv8rqz61a52pv47b0cdmmnm8ynb30ypyki7dprpdidrz3mhk8m"; depends=[]; }; + pinp = derive2 { name="pinp"; version="0.0.4"; sha256="1bjvhq9glrahknh46irfpg83wilpws923mm5l4aldb75xrbpliyw"; depends=[knitr rmarkdown]; }; pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; }; - pipeGS = derive2 { name="pipeGS"; version="0.2"; sha256="1p014fw3lxaspcmb3qgirz815ykycjh5r4ql59pi46ryxharn19j"; depends=[]; }; + pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; 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]; }; 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.8.1"; sha256="1cpxsh3y9k66mkmks7mn3q4zjix1i8jc0dl62wrwwsp379vxcc3r"; depends=[broom checkmate dplyr Hmisc htmltools knitr magrittr scales stringr tidyr]; }; + pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.1.0"; sha256="024srncm288mn3bz6hv7ljzkchmnljk4yc2d4z7i05vsn7dzd2c6"; depends=[curl httr]; }; + pivottabler = derive2 { name="pivottabler"; version="0.4.0"; sha256="1q7gmfrqx3sn32q9rrr0y3hywq0fvm5gs5d3jj6mqcbs53jqvzqc"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; }; + pixels = derive2 { name="pixels"; version="0.1.0"; sha256="0lna0z2shs49kh48ipjnyigaa22wb9gm4mq970ldhh9msb7wcv55"; depends=[htmlwidgets miniUI shiny]; }; + pixiedust = derive2 { name="pixiedust"; version="0.8.2"; sha256="0p04bs0p52k38qn1mv7qcsyilqbcaq3gnksvk9ij8j6r2qr4l8h4"; depends=[broom checkmate dplyr htmltools knitr labelVector magrittr scales tidyr]; }; pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; pkgKitten = derive2 { name="pkgKitten"; version="0.1.4"; sha256="0c44zrvpyz87s5mjhsqdrkyrvyzhyldnq371bwnn9crbpbac3wnd"; depends=[]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.1"; sha256="0h2sp93fqqjbfqgq82a3i94ybnndx6ghaal8pbf99firnsjb40mb"; depends=[]; }; @@ -8789,11 +9360,10 @@ 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-7"; sha256="01qlfv33adf3qyg6yzpigr4mm891xix39z8nkfz5d9q9iyx6fmx6"; depends=[bit64 conf_design Rcpp RcppArmadillo]; }; - plantecophys = derive2 { name="plantecophys"; version="1.3"; sha256="0paqank2n262iizs09k40d3za2b81knnifj7y6pr2s33crbkm9qx"; depends=[]; }; + plantecophys = derive2 { name="plantecophys"; version="1.3-2"; sha256="1jj9rkhdmcnmp6fzbxmkfwmsdx2w7v923rv0xn5c5iv7wys7vwfm"; depends=[]; }; plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; }; 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]; }; + platetools = derive2 { name="platetools"; version="0.1.0"; sha256="1cx01hspha59w1vd33kv8prapjinfipv1ikli97zhxrcs45r6v07"; 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.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]; }; @@ -8801,7 +9371,7 @@ in with self; { 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]; }; + plm = derive2 { name="plm"; version="1.6-6"; sha256="1a14a8zbqzm2a6z44haa0c23ax9j1jk72dhrkca8q0abbd5lkx85"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik 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]; }; pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; }; @@ -8817,17 +9387,17 @@ in with self; { plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; 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.7.1"; sha256="0wj9lw7w28z8w9ip9vadv6sydjhqyg65kfiai9m3bndzz50b1m3w"; 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.4"; sha256="1j2nc6n5kv6zvxwlr1cr1shxdcihw7d5k7z0a90phmdp834x8agy"; depends=[plotrix TeachingDemos]; }; + plotmo = derive2 { name="plotmo"; version="3.3.5"; sha256="1hiak4gg73ifml24mx1bjhgwqx9706v2mk5pxh59jvbrrc6mzvf4"; depends=[plotrix TeachingDemos]; }; plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; }; plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; }; - plotrix = derive2 { name="plotrix"; version="3.6-6"; sha256="07hywp3ym0gbpqdj3f4vhr0bhmynhby8vh6p1b9cm2hv26pzs9q4"; depends=[]; }; - plotrr = derive2 { name="plotrr"; version="0.2.0"; sha256="12kab7w32hcdqmwh3nfpk1zqkgnvpx3p0292w47643ahl26s9whj"; depends=[dplyr ggplot2]; }; + plotrix = derive2 { name="plotrix"; version="3.7"; sha256="0rw81n9p3d2i03b4pgcfj5blryc94f29bm9a4j9bnp5h8qjj6pry"; depends=[]; }; + plotrr = derive2 { name="plotrr"; version="1.0.0"; sha256="07ilqpa3ypqb2gpnq23r9v4kkfxz06mcak9si9adr9sf6c7gqwxz"; depends=[dplyr ggplot2]; }; plotwidgets = derive2 { name="plotwidgets"; version="0.4"; sha256="1w7c9grw4pyyra230196yq32snr4wdg6xi8vh4dx5df2v500wz22"; depends=[]; }; pls = derive2 { name="pls"; version="2.6-0"; sha256="15j59p5x0rkdrk7iqzkipsy50rsyjl31w8zxc4w3v1j5gzxhi1rx"; depends=[]; }; plsRbeta = derive2 { name="plsRbeta"; version="0.2.0"; sha256="1b8yldz5nzw3gilv9wk79bxcqb0hrgsxi2cn6qlby5nf9b4zmzv8"; depends=[betareg boot Formula MASS mvtnorm plsdof plsRglm]; }; plsRcox = derive2 { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79ilzl0i6cyp870x66swlbg6387whf7wn2r"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; }; plsRglm = derive2 { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd97j10v2h8jqiybcqbm3kvqhgqydm07rp"; depends=[bipartite boot car mvtnorm]; }; - plsVarSel = derive2 { name="plsVarSel"; version="0.9.1"; sha256="0jwhdcrr68562q83528h7x3kjadfzn6j5l02axyfvflzgdnxwcnc"; depends=[bdsmatrix genalg MASS mvtnorm pls progress]; }; + plsVarSel = derive2 { name="plsVarSel"; version="0.9.4"; sha256="19xz7ds4jx5ql999mwn9zs983rlshf14y4nlah8cfy9gpi0vl1g1"; 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.5-1"; sha256="0d2k3h2cwwhcv7mbxqypd7g6yp1l6j32n3wslm348zmcx50j9pn4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; }; @@ -8836,30 +9406,31 @@ in with self; { plspolychaos = derive2 { name="plspolychaos"; version="1.1-1"; sha256="078arfv8z5nfrmsfi0n7hskmv394ysi6nhlskpy5cg37lqiwh0r1"; depends=[lhs MASS]; }; 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.4.2"; sha256="0ralab3hqz22hcd4rvi82dshsvic1qfnl631s2fcr8saddw8ki8n"; depends=[crayon httpuv jsonlite R6 stringi]; }; + plumber = derive2 { name="plumber"; version="0.4.4"; sha256="0fxbqp7x74x21dkkxklg7j0020pmvl9byfs9lgp1bxrnli84h6ik"; depends=[crayon 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]; }; plyr = derive2 { name="plyr"; version="1.8.4"; sha256="1igar5pcjqh0jyxv0z3jah8rz617vfa86vw0r5c7c031b7bj5db0"; depends=[Rcpp]; }; + pmap = derive2 { name="pmap"; version="0.6.0"; sha256="1g7das8bbp31r6syzn3zbxb8han1lqs9zpija7z8w2jpbw7gj4lb"; depends=[data_table DiagrammeR dplyr lubridate shiny stringr]; }; + pmatch = derive2 { name="pmatch"; version="0.1.2"; sha256="1sbd02q2jqjqnh269m9f83mk0vbhh4mqqv0p23p6rj6gz0wljz9c"; depends=[dplyr glue purrr rlang tibble]; }; 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]; }; - pmhtutorial = derive2 { name="pmhtutorial"; version="1.0.0"; sha256="0r1yw65ixm3zjpiwg800rfwr1p26i6apv4332pgfl84hj5vvp3ws"; depends=[mvtnorm Quandl]; }; + pmclust = derive2 { name="pmclust"; version="0.2-0"; sha256="1bpfix76ylmn5ds6y0v40mfad7znaa6dj5ngr4mzv96yy6mg13ns"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; }; + pmhtutorial = derive2 { name="pmhtutorial"; version="1.2"; sha256="1dviqazdk3ggxwwyv20409w3qadka0gbcgviwyywssn2x4cg0vih"; 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]; }; + pmml = derive2 { name="pmml"; version="1.5.4"; sha256="1acld1x0z5rgyxb5id071s3zvf2vbv4b9nngvxrb63ay3yyy124b"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.1"; sha256="1cxmp3fgsf3z71v6qpd9l9ilgda5knan7vqifxpgm8m7a30sp3f3"; depends=[]; }; pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; }; pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; }; pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; }; poLCA = derive2 { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; }; - pocrm = derive2 { name="pocrm"; version="0.9"; sha256="0p7a7xm1iyyjgzyi7ik2n34gqc3lsnallrijzdakghb8k5cybm4m"; depends=[dfcrm nnet]; }; - pogit = derive2 { name="pogit"; version="1.1.0"; sha256="145dh48scxx4wcdr2g7548vg4g03w1ji7hz91752im9a27v7s4pa"; depends=[BayesLogit ggplot2 logistf plyr]; }; + pocrm = derive2 { name="pocrm"; version="0.11"; sha256="04snn7k8baf2ymjzr3zkxd425r5dq9h6abr5dm10mhfjqj1njpq0"; depends=[dfcrm nnet]; }; poibin = derive2 { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; }; poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; }; pointblank = derive2 { name="pointblank"; version="0.1"; sha256="11v0x264065iljhv77m4yc44zqd0i9bg95c6qiv8d85nf97201hh"; depends=[digest dplyr Hmisc htmltools knitr lazyWeave lubridate magrittr mailR pixiedust purrr readr rJava rlang rmarkdown stringr tibble tidyr]; }; - pointdensityP = derive2 { name="pointdensityP"; version="0.2.1"; sha256="013vamdh987w56bmz0m6j2xas4ycv1zwxs860rs5z4i55dhgf9kh"; depends=[]; }; + pointdensityP = derive2 { name="pointdensityP"; version="0.3.2"; sha256="1wi1lv5y589vmibvzigpqk0m9k5m265brhnz520g7wa4h3wpsdq3"; depends=[data_table]; }; 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]; }; @@ -8869,12 +9440,13 @@ in with self; { poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; 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.53.00"; sha256="0gkmy5g16794zrr21g6yap0k4xl1bvsq5npyivsdflvvrg985nzw"; depends=[dplyr lubridate purrr]; }; + politeness = derive2 { name="politeness"; version="0.2.2"; sha256="06h4g9xbk5dbaqzhybqc0mppa61ypb7ryi6hghqnqyj32y8r6dbr"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; }; + pollen = derive2 { name="pollen"; version="0.70.0"; sha256="1hk9sjxzwglj98ryic3m80lajzv1klnq9dl6i97c8f0ihbf97zdq"; 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.4"; sha256="1mraxg06cy27jk8gj0l7pymj2rcvzz9fg9zd6qppw69jca6f826h"; depends=[data_table DT jsonlite Matrix R6 slam tm]; }; + polmineR = derive2 { name="polmineR"; version="0.7.5"; sha256="0yz2c915jrf3dqadi6px9jidfwr4jd23rjrpas4xg4m6dx0f70jm"; depends=[data_table DT jsonlite Matrix pbapply R6 slam tm]; }; polspline = derive2 { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; }; - polyCub = derive2 { name="polyCub"; version="0.6.0"; sha256="1xmk87vfs9vwp8j3iywir5591dcz0hfdmxgzwcyi8416qfbc9d54"; depends=[sp spatstat]; }; - polyPK = derive2 { name="polyPK"; version="1.0.0"; sha256="135l8s0jh37nip1ly6dzcbb07vz1vsvs1vq2kn810jrpqs9jkbr6"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD missForest mixOmics pcaMethods PKNCA plyr sqldf xlsx]; }; + polyCub = derive2 { name="polyCub"; version="0.6.1"; sha256="16nr83gmv6pnk89nqxh8ihzacb0y8l4lz05c8sp6whmr26ja9vnf"; depends=[sp]; }; + polyPK = derive2 { name="polyPK"; version="3.0.0"; sha256="1vdfsad2b9habvm2ikjgn7ihnm851q9lqmgqjlsl737ka1vsgisf"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD mixOmics pcaMethods pkr plyr ropls samr sqldf xlsx]; }; 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=[]; }; @@ -8883,77 +9455,85 @@ in with self; { 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]; }; + polymapR = derive2 { name="polymapR"; version="1.0.13"; sha256="18bwi149y2622bdcyb5gcq0mxwalg6dsv3dgsnx2km4kd5x1a4ck"; depends=[combinat doParallel foreach igraph knitr Matrix MDSMap]; }; polynom = derive2 { name="polynom"; version="1.3-9"; sha256="1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk"; depends=[]; }; polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; }; polysat = derive2 { name="polysat"; version="1.7-2"; sha256="0ahx2pvlv2vdfiskwgawcrp447249ha0dq4qkhav3hpyvdg3in38"; 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.15"; sha256="1cba1wj1af7rb3ng8lm1m7zbvcjspak4ppz36ix5hbs956mxi8ss"; depends=[coda deSolve digest mvtnorm nloptr subplex]; }; + pomp = derive2 { name="pomp"; version="1.16"; sha256="1ns1ygza76dqrrscm7ajv3pbf5wgvcfsfbjxc20b50z30zjm7712"; depends=[coda deSolve digest mvtnorm nloptr subplex]; }; + pompom = derive2 { name="pompom"; version="0.1.4"; sha256="0j37gq6lfccypclhrp7w3yfgsjbhfgqwg7x87r6rgywz6b3fnsgh"; depends=[ggplot2 lavaan qgraph reshape2]; }; pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; }; - pool = derive2 { name="pool"; version="0.1.1"; sha256="0dk89xgrhhgmiv1h5j2vn6w0d4srfgg19ns0mnp5p39s61bayij9"; depends=[DBI dbplyr dplyr later R6]; }; + pool = derive2 { name="pool"; version="0.1.4"; sha256="0k209n40l2kwahy7b6hjwj1l19pdhnnq36jzxjmhv5zdad7dmckq"; depends=[DBI dbplyr dplyr later R6]; }; 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.3"; sha256="0d3pfxi4ab2jijgj9h3wnjadl1mhg99bc1agyqjg9v6l1k34kbwb"; depends=[data_table Epi survival]; }; + popEpi = derive2 { name="popEpi"; version="0.4.4"; sha256="010nsb3jlz769i8srkd3528a52h9gpw7q7gn4vraz9nx8g8585bs"; depends=[data_table Epi survival]; }; popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; popRange = derive2 { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; }; 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]; }; - poplite = derive2 { name="poplite"; version="0.99.17.3"; sha256="0fqkwxlzj92rh187wns7zrygsgch1gw3l8kmnpvc59gdbk1wbbi7"; depends=[DBI dplyr igraph lazyeval RSQLite]; }; - poppr = derive2 { name="poppr"; version="2.5.0"; sha256="18r89wdad8yja8jgdvispwx67ssj26yf2rdd1j4x0w9r3cpxxkmm"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn rlang shiny vegan]; }; + popkin = derive2 { name="popkin"; version="1.0.5"; sha256="147ic0d7cgs4x9vz4jm4wd6ckikn0s8a0q1mknmcrcfisq8zim75"; depends=[RColorBrewer Rcpp RcppEigen]; }; + poplite = derive2 { name="poplite"; version="0.99.19"; sha256="0y1l21clp9b5m50chqnqmvyd6rsk6xgn2bqf1877gx3h1qidh5fm"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; }; + poppr = derive2 { name="poppr"; version="2.6.1"; sha256="1ib6z5rpx8xr5wfvjiy56fn9vgjda4d7x16n6wn4377b5fi4l3zp"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn rlang shiny vegan]; }; popprxl = derive2 { name="popprxl"; version="0.1.3"; sha256="1l842zgn04s8ghbcp8s2lzg7lgc809xd7hg9crnyp23c2cr0jlvi"; depends=[poppr readxl]; }; 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]; }; + population = derive2 { name="population"; version="0.2"; sha256="1k0hwh17dyfbbyw8gprsz1klx6l2ncq5mxkmnjmknlnrkpah0bbl"; depends=[abind]; }; portes = derive2 { name="portes"; version="2.1-4"; sha256="09liy2bia76h5dh21s8skq9pj8k4wpq5agwrmr1pnvlpgc8m2b60"; depends=[]; }; portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; }; portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; postGIStools = derive2 { name="postGIStools"; version="0.2.1"; sha256="1dmf77xpy61pqis3j9qzjjksmm9hkyhzxqdmjajpj7rkbqhl5qvp"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; }; postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; }; potts = derive2 { name="potts"; version="0.5-7"; sha256="194996wr4rnpr42xqfi5yrcnxvd82all2fxki95dklr2qfjxg98a"; depends=[]; }; - powdist = derive2 { name="powdist"; version="0.1.3"; sha256="1j8i3nyr9xbs4acrqpblnqny5wj3ds59s1aayb3iv3z68pj2vz6j"; depends=[VGAM]; }; + powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; }; poweRlaw = derive2 { name="poweRlaw"; version="0.70.1"; sha256="04sr0nhdd1v915m0zf5gasznzgi08ykcy20kkwdw0l5mvvdbic8m"; 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.8"; sha256="1mfsap5li6limmr9pfv98wgsnx7a23abjx067vrvg0s5m03v52yi"; depends=[]; }; - powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.0.9"; sha256="0f8i867zc1yjdp66rjb1cp92fcfrlq167z3d0c4iv355wv4s35az"; depends=[survival]; }; + powerMediation = derive2 { name="powerMediation"; version="0.2.9"; sha256="1rk8h8qn4b68ra5h5hiy9fvvbpskj9y806rwrvl1l7gs7xlmji7l"; depends=[]; }; + powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.0"; sha256="1xxicvw113mc2y889rklws3xml5z64sgjpn4wg95gbw6nadch7zz"; depends=[survival]; }; powerbydesign = derive2 { name="powerbydesign"; version="1.0.3"; sha256="0dv4j0kwdzvxnq587vs1dsy2yci3v3q2smncpscpcsalp38rvx4i"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; powerlmm = derive2 { name="powerlmm"; version="0.1.0"; sha256="0fsd3h94va5hn0nqxdalchw02s4daxq8dlgdxb5a4nigg64lfkm2"; depends=[ggplot2 ggsci gridExtra lme4 lmerTest MASS Matrix pbmcapply scales testthat]; }; powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; }; + ppcSpatial = derive2 { name="ppcSpatial"; version="0.2.0"; sha256="1gi57zngc42wcrihg29nn7qa3gaq105ckp76qmczkldshlpd7x4r"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 rgdal scales shiny tidyr tmap]; }; ppcc = derive2 { name="ppcc"; version="1.0"; sha256="022c8w7ws7fw6yy572rn6m8ki14d2ph7nd2hk2c6mmx2c4lbc20v"; depends=[]; }; + ppclust = derive2 { name="ppclust"; version="0.1.1"; sha256="10fcyayda634lg5g992g21casqx5k0jni9r30km5rczzib7cz9gg"; depends=[inaparc MASS]; }; 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]; }; + ppitables = derive2 { name="ppitables"; version="0.1.2"; sha256="1hw25zvvbmc6vxbhcrpz9xkwc6lbc9v1r77fil3gv2wm5n672s4h"; depends=[]; }; ppls = derive2 { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; }; ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; }; pps = derive2 { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; }; pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; }; prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; }; prabclus = derive2 { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; }; - pracma = derive2 { name="pracma"; version="2.0.7"; sha256="0hxa0rbbp54j0c05qj7vfwhqfdmiz5ax8vhqxd09g33x7c0hqbc5"; depends=[quadprog]; }; + pracma = derive2 { name="pracma"; version="2.1.4"; sha256="1ygm81i7mqvh229dp9935djjyb120p3bqvaf4k572sa4q63fzjhc"; depends=[]; }; 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]; }; + praznik = derive2 { name="praznik"; version="4.1.0"; sha256="1f652s1gpc2sw2i9xd4ga22kpdbihwpkb3a8csvycm07dhgynv03"; depends=[]; }; + prc = derive2 { name="prc"; version="2018.1-31"; sha256="0xvf1f202qwpjb1kh469jk45l592q7bfzngyi8ifry94bi7mphp7"; depends=[kyotil nlme]; }; 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.5"; sha256="1hfr0jijnj5nd25rh16i81bsz8kwz0q9vmn7bqgy467cwvypg9k2"; depends=[class dplyr ggplot2 irr lpSolve purrr tibble tidyr]; }; - pre = derive2 { name="pre"; version="0.4"; sha256="0az0dfmzfzin7zbbgqzg8y6f6dajj2y88dddlzy3rav580n3dvwg"; depends=[earth Formula glmnet MatrixModels partykit stringr]; }; - preText = derive2 { name="preText"; version="0.6.0"; sha256="0cw74vix6cd6algadl8m8i236gvkhapkfjhra5y5cficvfzqbdgk"; depends=[cowplot ecodist ggplot2 proxy quanteda reshape2 topicmodels vegan]; }; + pre = derive2 { name="pre"; version="0.4-1"; sha256="1pcc8njy43pfpszrgs782fgwsnh8h990giq8q7ra6vvwyhgza8m3"; depends=[earth Formula glmnet MatrixModels partykit stringr]; }; + preText = derive2 { name="preText"; version="0.6.2"; sha256="0pcnqssv542cfajzrqfsbq0jf628nnmcb3nryvd7d5wk4wdkji4q"; 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.9.1"; sha256="0kppl4x8ji8hzll5wss1nzlk8qvf4g78f14x4c2b8dcxjikgl939"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; }; - predatory = derive2 { name="predatory"; version="1.1"; sha256="18nv8riw380acvgb8iz771wzdgrmkrwcvdxbxhkbczcdhgw1p0ig"; depends=[readr stringr]; }; + predatory = derive2 { name="predatory"; version="1.2"; sha256="1qbkifx16ixzimshm8lsg3d1y7cj453ksn8cpwy03xql6b19r8x4"; depends=[readr stringr]; }; prediction = derive2 { name="prediction"; version="0.2.0"; sha256="09jlwk3fh7lkka9vsbr0bp7bpaf2p7q96qb8mv56rcmfrsf5446c"; depends=[]; }; predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; }; + predkmeans = derive2 { name="predkmeans"; version="0.1.0"; sha256="1xmzdv35hxnslffkj8nbahhxrxmv7995pkdq2igw72x9wbryqlhs"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; }; predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; predtoolsTS = derive2 { name="predtoolsTS"; version="0.1.0"; sha256="08j9q46a0xq9z5n78zbk35745rv7ni2ymz500b02f04hl2x7wrrm"; depends=[caret forecast Metrics tseries TSPred]; }; prefeR = derive2 { name="prefeR"; version="0.1.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; }; - preference = derive2 { name="preference"; version="0.1.0"; sha256="15h5p86sdp3xm4qpqr4kh54j57cxw534qk1lxn27m1vyp8rs280k"; depends=[]; }; + preference = derive2 { name="preference"; version="0.1.2"; sha256="113car6miax832kl0gzlqawwq3f5xbp06fz1ygz9nkzxh7mpmi11"; depends=[]; }; prefmod = derive2 { name="prefmod"; version="0.8-34"; sha256="1fkqp75w3im6b0l4sfs1yr2id8ffp2xbpb6lkgnv833cri787d5x"; 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]; }; @@ -8964,8 +9544,8 @@ in with self; { preseqR = derive2 { name="preseqR"; version="3.1.2"; sha256="0xafl51yc0y8rxwz3cc0a6mjv7ajgn8bzpynxgmkb3gjx0jla5kp"; 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]; }; + prettycode = derive2 { name="prettycode"; version="1.0.1"; sha256="0iw38q5yx92m71wrbp52d14bl3nqwpjrd57l2w9chasmlrjnl2aw"; depends=[crayon withr]; }; + prettydoc = derive2 { name="prettydoc"; version="0.2.1"; sha256="00amqn0izg2jrn96pmm5papqmp0chn25msjk94nim3avqg9x4x92"; depends=[rmarkdown]; }; prettymapr = derive2 { name="prettymapr"; version="0.2.2"; sha256="151jp0l728krmxcyzwjh01mvd1zhqijq0nsgjaqsh0q8n3jmndi0"; 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]; }; @@ -8978,16 +9558,20 @@ in with self; { 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]; }; + prioritizr = derive2 { name="prioritizr"; version="3.0.3"; sha256="111y7zdalai0wd2w1a9fn89axz568gxn91x2zp2x3101y263q1kx"; depends=[assertthat BH data_table doParallel magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp uuid]; }; + prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.1"; sha256="0mskny9j6dwfbndzqpbmqh552vc86xqwjdpjk2h64qza2abyh5vr"; depends=[raster sp]; }; prioritylasso = derive2 { name="prioritylasso"; version="0.2.1"; sha256="1wcykrhv1d762h7k7qkvnsjk7l6sincmh6vc6wmgpmmwx5nch70x"; depends=[glmnet survival]; }; prism = derive2 { name="prism"; version="0.0.7"; sha256="03z1m09vf2gd277xp3y5nhvgrp0fnbr2x0r9b92kp46ca09fq9y8"; depends=[ggplot2 httr raster]; }; prisonbrief = derive2 { name="prisonbrief"; version="0.1.0"; sha256="1fnhg6vqdabdnhvgd19vnkfrdgz8a53snfrx6m6mmdwb6cvavb8m"; depends=[data_table dplyr httr magrittr passport rlang rnaturalearth rnaturalearthdata rvest stringr tibble tidyr xml2]; }; pro = derive2 { name="pro"; version="0.1.1"; sha256="0f0iliq7bhf313hi0jbwavljic4laxfc0n3gac5y6hzm39gvvgag"; depends=[]; }; + proPubBills = derive2 { name="proPubBills"; version="0.1"; sha256="1fpn9x31jjahdyk0f30mbb3ijj4dsghrq9q94r04pjsgr2jw23zx"; depends=[dplyr httr stringr]; }; probFDA = derive2 { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; }; probemod = derive2 { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; }; + probout = derive2 { name="probout"; version="1.1.1"; sha256="1hasrvxdig8n3fhzsbmq27050dyanzp1j0qlybnrkb41k9gyljda"; depends=[FNN MASS mclust]; }; 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.2.0"; sha256="02gj8h30bmz02qhr2xw6b72sa872cn57blszhw1llfmk7ml1zys2"; depends=[bupaR data_table DiagrammeR dplyr edeaR ggplot2 ggthemes glue miniUI purrr shiny stringr]; }; + processmapR = derive2 { name="processmapR"; version="0.2.1"; sha256="0qlz6av6f0ik62md0wa5il3id55rnbwc6i34sxjhv9awwvm2ygrv"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr]; }; 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.1"; sha256="0yw23lp9xjvbpswzghkmjiayw7p19hbvmgv58k3i6b8g5nav4qcg"; depends=[assertthat crayon debugme R6]; }; prodest = derive2 { name="prodest"; version="0.1.1"; sha256="1j8gqxswwvnd45givadlvblnsc3qli228gz77d7alc19qf1wrrvz"; depends=[DEoptim dplyr Matrix Rsolnp]; }; @@ -8997,27 +9581,32 @@ in with self; { 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=[]; }; + profile = derive2 { name="profile"; version="1.0"; sha256="0m7fm490gqkbmnbdq3lac87zqb9qyx6546rlpa130rq1jnlgxfp6"; depends=[rlang tibble withr]; }; profileModel = derive2 { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; }; profileR = derive2 { name="profileR"; version="0.3-4"; sha256="1vinqddhd4jbncn37rbypja7ili3kwmj2sacgf491s94zil4ijik"; depends=[ggplot2 lavaan RColorBrewer reshape]; }; profilr = derive2 { name="profilr"; version="0.1.0"; sha256="0rw5cjvvrgsdmhgrsaw4skfdk8h488b6mkmibgjj3dd3x0j3caq6"; depends=[]; }; - profmem = derive2 { name="profmem"; version="0.4.0"; sha256="1nnk145hzr447z9frk3c58xks3jp0cdl7cv8schqnyjxqlv967g9"; depends=[]; }; + profmem = derive2 { name="profmem"; version="0.5.0"; sha256="152dka39p9i17ydlhc92y6x6i8girn3wab1ycbqb9kva07j9d2h8"; depends=[]; }; profr = derive2 { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; }; proftools = derive2 { name="proftools"; version="0.99-2"; sha256="1vx0270sgx15dl6x3nnx13v5y4c0m18yvrhiycl429zky0jzxfr0"; depends=[]; }; - profvis = derive2 { name="profvis"; version="0.3.3"; sha256="0lj4cr9jkbnvb4876kzkwy8gzrw2flbbwb0gw744f4q0240zybs6"; depends=[htmlwidgets stringr]; }; + profvis = derive2 { name="profvis"; version="0.3.5"; sha256="0wkpmjlrfrvrn0pp81n7cbxg8xzi796d0mxfi1v7m41x6z43fm6a"; depends=[htmlwidgets stringr]; }; progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; }; 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=[]; }; - projmanr = derive2 { name="projmanr"; version="0.1.0"; sha256="0mfp1b00a5ndw7011q3jivxm8bsykm6q7pm7dplmqffgs0p3drvv"; depends=[ggplot2 igraph R6 tidyr]; }; + projections = derive2 { name="projections"; version="0.0.1"; sha256="1qrgazxdihzp1i4aghkwkh6q5g1all39bvd83gwh4hj9pxm2w5zy"; depends=[distcrete ggplot2 incidence]; }; + projector = derive2 { name="projector"; version="0.0.2"; sha256="15n5b2xgs0zj87pc3svlmnkjrxgkjkx941g8bs3ms90fg7nh2drc"; depends=[assertthat dbscan plotly RColorBrewer RcppAnnoy Rtsne shiny shinyjs shinythemes]; }; + projmanr = derive2 { name="projmanr"; version="0.1.1"; sha256="0mmfmp5qf4r75q4hjbra2pxym77m16g28n94z5yj2qdzq46hgl4c"; depends=[ggplot2 igraph R6 tidyr]; }; + projpred = derive2 { name="projpred"; version="0.7.0"; sha256="1n2lwzc3hvjr4d6csc2nqlxqcrr979h52lfvbr81alybkg1nbqch"; depends=[ggplot2 loo Rcpp RcppArmadillo rstan rstanarm]; }; + promote = derive2 { name="promote"; version="1.0.1"; sha256="1f8f5rm25fx4146hf3rds2lb7qpfz17fa5r2a1f4s3q5p86svgqn"; depends=[httr jsonlite stringr]; }; 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.2"; sha256="1v8jznwy0158mpaym5a98d088zsrcaa1qfbqbqcdjzv0lv9wn0rr"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr]; }; + propagate = derive2 { name="propagate"; version="1.0-5"; sha256="168ya3a74fjqwl9bzsb3ywzypb90h8snymgvxryrx7plrfcmwlav"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; }; + properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; }; + prophet = derive2 { name="prophet"; version="0.2.1"; sha256="10qd3w9jgk3d53465005b0di2lxa6cg67lj81fzmf2h919ai9i5m"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr]; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; - propr = derive2 { name="propr"; version="3.0.7"; sha256="0asp57f6z0v4qlngd84x0h72y3sc6j50yhxh0nxn47ngcxa0z07h"; depends=[fastcluster ggplot2 igraph Rcpp]; }; + propr = derive2 { name="propr"; version="3.1.4"; sha256="1hggj926zphhg6v09bbrv77rp11bg6vciy3xfnkqi2hakjw3ak59"; 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.31"; sha256="05bmxc5hq2bpd8saqs36wwkmbywkw7rm3b4zl1dxpdpxmywsbf1a"; depends=[Rcpp]; }; + protViz = derive2 { name="protViz"; version="0.2.45"; sha256="0mvq0p0lnxwpia1znyizha5gdj6f9i07nghp3gv9kfficlq3fw03"; 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]; }; @@ -9027,22 +9616,22 @@ in with self; { protolite = derive2 { name="protolite"; version="1.7"; sha256="002vncki8r33z9k208h19q90jwjy3d58fk3xzkh6cbsv4hgay9g0"; 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.4-1"; sha256="01ly3908j4biabn9nwx2pfjsidgyf9zw8p50pd5342r0rvmg79dy"; 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=[]; }; + protr = derive2 { name="protr"; version="1.5-0"; sha256="1mi14hph6cqdsgjw4p00miaa4bh2axkwfcmxaiv7f7v4dk8i52y1"; depends=[]; }; + proustr = derive2 { name="proustr"; version="0.2.1"; sha256="17syaxfrwm9kh5q825hj7bsrvi4h9avpdabw9y0vq20y87w8cq1s"; depends=[assertthat dplyr magrittr purrr rlang SnowballC stringr tidyr tokenizers]; }; + provenance = derive2 { name="provenance"; version="1.9"; sha256="1d40k85cxnnxy480ylvy6wwswgf8hbxgcbansx90hyg9cb3rvhil"; depends=[MASS]; }; + proxy = derive2 { name="proxy"; version="0.4-21"; sha256="1vih8gsfzv97h5c8ixd1qjnn02i7fzla2p9fdj2wpisqhx0p0xv0"; depends=[]; }; 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]; }; + prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; }; + pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; 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.4"; sha256="0l1hmgw4sislryws8hv7r2nglhcs6g9khg0372a70djvhz2l6gfi"; depends=[LearnBayes mvtnorm SuppDists]; }; - pscl = derive2 { name="pscl"; version="1.5.1"; sha256="1905467qwd2jhc7cfrshpffj65vi0vsfnsg4pshpv68hs12924w3"; depends=[MASS]; }; + pscl = derive2 { name="pscl"; version="1.5.2"; sha256="1phf3awsfr4ncqfqzin5m1pz0g7y1zhbcm2sz7358ssw914fd7rc"; depends=[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]; }; psda = derive2 { name="psda"; version="1.0.0"; sha256="0zsvm6rqcxv186xbi8nqd4ak93lhrm1hp7339cks140vdp8yl7ys"; depends=[ggplot2 plyr raster rgeos sp]; }; pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; }; pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; 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]; }; psidR = derive2 { name="psidR"; version="1.4"; sha256="1whdjsab5cihlq4gp06xafl3zg7z0cjb4622d23v24igz7kr0ic2"; depends=[data_table foreign RCurl SAScii]; }; pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; }; psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; }; @@ -9052,7 +9641,8 @@ in with self; { pstest = derive2 { name="pstest"; version="0.1.1"; sha256="0k8413ilpbz23v210wz80mli7ajpc8p7y4pbn1za371qw04b81c5"; depends=[harvestr]; }; psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; psych = derive2 { name="psych"; version="1.7.8"; sha256="0daismb8pdk392vdy304hqx0m3jx62gx3a0hygjygc125rhfla7k"; depends=[foreign lattice mnormt nlme]; }; - psychmeta = derive2 { name="psychmeta"; version="0.1.0"; sha256="0xrw24d09imzhh4r2dpby4ps10d211yp8nfixvi04pjhk8dz16j4"; depends=[boot dplyr ggplot2 MASS metafor reshape2 tibble tmvtnorm]; }; + psychmeta = derive2 { name="psychmeta"; version="0.2.3"; sha256="0lfgsbvb1dplwbxfqim3q7lnf4sclngdik1l5cxl9rkdwb54lcy6"; depends=[boot dplyr fungible ggplot2 MASS metafor nor1mix progress reshape2 rtf tibble tidyr tmvtnorm]; }; + psycho = derive2 { name="psycho"; version="0.1.0"; sha256="0qfgq5sivr01jiglaykh3jqjz11zag8si1nmw0ffr28bp94gibrg"; depends=[dplyr ggcorrplot ggplot2 lmerTest MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm stringr tidyr]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; psychomix = derive2 { name="psychomix"; version="1.1-4"; sha256="15yk3z11w4bzk6vljr13bkfhzycypww6blc1djb5iwl635xq1c49"; depends=[flexmix Formula lattice modeltools psychotools]; }; psychotools = derive2 { name="psychotools"; version="0.4-2"; sha256="04p5yb39c8j28q6brqsrw0dr1zvgpyzb7008v2kk3d5sncgl4dd0"; depends=[]; }; @@ -9065,14 +9655,14 @@ in with self; { ptw = derive2 { name="ptw"; version="1.9-12"; sha256="111b0s66p7fk6z6bnm3wckpfjxr1gshv0rqqy5wy6qg60hp7bcfd"; depends=[nloptr]; }; ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; }; ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; }; + pubh = derive2 { name="pubh"; version="0.1.7"; sha256="0dha3adlbrxgkamlb5i2lcnqcsspqb30fmj0f2zhz0bh4i83lznb"; depends=[bookdown car descr Epi epiR epitools gee lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR rmdformats sandwich survival visreg]; }; pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.11"; sha256="01b4dd28x3a25d0s8k0dwbcr6asaqh2b9c4fddg683i54q483lkd"; 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]; }; - pulver = derive2 { name="pulver"; version="0.1.0"; sha256="0kjx2wxpyzwd4wgn519j2r4cpxrvdd1zg561ngz9af28gcc2ikvz"; depends=[DatABEL Rcpp]; }; + pulsar = derive2 { name="pulsar"; version="0.3.1"; sha256="0y72wpxa9rqjzyqrfpl1sa06zpx6rbxi4jfncxzac8m534l5l7l5"; depends=[Matrix]; }; + pulver = derive2 { name="pulver"; version="0.1.1"; sha256="0zj3a66hjing4a87lvhxlvdp72kpn0s2d6r5kc0pi06ls04r8sax"; depends=[DatABEL Rcpp]; }; 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.3"; sha256="0j1y0nbvljcis9hgic4wbbzslcsidhpw0wzs7d2hx7a2ygi6mkma"; depends=[magrittr rlang tibble]; }; + purrr = derive2 { name="purrr"; version="0.2.4"; sha256="0wgbnbrqncjpggg8f9bdpcd1gy351s5f0az5k8lc55cvs9lhz3gd"; depends=[magrittr rlang 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]; }; @@ -9080,9 +9670,10 @@ in with self; { pvclust = derive2 { name="pvclust"; version="2.0-0"; sha256="0hfpf257k5f1w59m0zq6sk0gaamflc3ldkw6qzbpyc4j94hiaihs"; depends=[]; }; pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; }; pweight = derive2 { name="pweight"; version="0.0.1"; sha256="0pxxfrap1bmnhbfbmkddfbqwkpw42hq37s0y26zmkxqlx4wblira"; depends=[qqman]; }; - pwr = derive2 { name="pwr"; version="1.2-1"; sha256="0k3jzx7jjgzha3vkpknj9nvx4yqlc9rq0mw25shvzi0xbr1y2cdb"; depends=[]; }; + pwr = derive2 { name="pwr"; version="1.2-2"; sha256="0r5g781lr677vp3zyhgmi7r68c87l8gd05l1s3ffnxgn5wf043sm"; depends=[]; }; pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; }; pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; }; + pwrFDR = derive2 { name="pwrFDR"; version="1.85"; sha256="1al8dh5h32lipnqfa823wwx7nsrz8z3fadl7hz4qvj8vpfijpz1i"; 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=[]; }; @@ -9091,18 +9682,20 @@ 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=[]; }; - qGaussian = derive2 { name="qGaussian"; version="0.1.4"; sha256="00dn6cxix1yhaz877g240i1rkk9j6f3ys5hj41l9rvwsq95ayi5h"; depends=[robustbase zipfR]; }; + qCBA = derive2 { name="qCBA"; version="0.3.1"; sha256="0lr97hig9c4l9k7vjalvgar4f1dic1lqf91li4q63j07lgdyvh4c"; depends=[arc arules rJava]; }; + qGaussian = derive2 { name="qGaussian"; version="0.1.6"; sha256="0j8n4y4yzidkp52db73zv2snx0kwpg3aiz7vr82ybq3x9scy8c4n"; depends=[Rcpp 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=[]; }; + qboxplot = derive2 { name="qboxplot"; version="0.2"; sha256="07f05n7zxgwyxg2r5fz691ra64m218w9v874xfzjx6671c40y1q2"; depends=[]; }; + qcQpcr = derive2 { name="qcQpcr"; version="1.5"; sha256="1298zla8z5w9z4idc07v3ca9rc1afx853y7iz3jmqnqnv8mr0s48"; depends=[ggplot2]; }; qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; 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.8"; sha256="1fxkfxhsxjbgicb065vldjpfwvz5m5cbgc5yn6n3i8bybw68wp2w"; 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=[]; }; + qdap = derive2 { name="qdap"; version="2.2.9"; sha256="19jlh6k3vw6c20xfygn20dgs86h2a16imn23afgxlfggbazwxjyd"; 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.7"; sha256="0jdx7bxmvc4p41jb4fhaagg5jsbsi7gva870cmyia72li52grhyn"; depends=[]; }; 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=[]; }; @@ -9112,18 +9705,19 @@ in with self; { 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.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; }; - qicharts2 = derive2 { name="qicharts2"; version="0.1.1"; sha256="16pjk3np2y3isd147f65islxmjwalrzgh91qgsd990xhdyf3kqcy"; depends=[dplyr ggplot2 scales]; }; + qicharts2 = derive2 { name="qicharts2"; version="0.4.0"; sha256="0dd7jn7g7b85yvq39ykl75jdixk3dpinscsizxqwcfcjyhpvszq6"; depends=[dplyr ggplot2 scales]; }; qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; }; qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; }; - qlcData = derive2 { name="qlcData"; version="0.1.0"; sha256="00xfr7dywvadyhs2z32za06fzdzmm20sn31grin0b3xw5qndai0f"; depends=[stringi yaml]; }; + qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; }; 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]; }; + qle = derive2 { name="qle"; version="0.16-6"; sha256="1gah72vv7zfaxl2i9r58qzpkml7pkspxffd7jaf9z93izrzcsp74"; depends=[digest expm lhs mvtnorm nloptr]; }; qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; }; 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.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; }; - qqplotr = derive2 { name="qqplotr"; version="0.0.1"; sha256="0npvl90gqw1graa8bvn0nijvj1klcr7vnsl8d8samanj3af8z7vb"; depends=[dplyr ggplot2 robustbase]; }; + qqplotr = derive2 { name="qqplotr"; version="0.0.2"; sha256="1cfzs77labxsfqq3flqz40gihyaz4bsi9vhsx6qqgpl6v4iz0a2h"; depends=[dplyr ggplot2 knitr MASS robustbase]; }; 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.3"; sha256="1k85d09yvhx3pgmvqrsmhd14hqaah4pdr87vp4kg60dp9w5sydjz"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; }; @@ -9137,13 +9731,13 @@ in with self; { 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]; }; 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]; }; + qrmtools = derive2 { name="qrmtools"; version="0.0-8"; sha256="111rhfaj2hwh2267y3y20wh9dxp0fj2m68j0hv4rmdslm2xwfjzq"; 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=[]; }; + qrnn = derive2 { name="qrnn"; version="2.0.2"; sha256="0w4gzignkfrx220fk9j4by0ibr4r9s66il0f43k6abf0czvqdxx4"; 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=[]; }; + qtbase = derive2 { name="qtbase"; version="1.0.13"; sha256="0bi3lxhnfj4pzhc11yd580zmfn9wnkbvag5rlm2g7c9i2dsi0inj"; depends=[]; }; + qte = derive2 { name="qte"; version="1.2.1"; sha256="1skl7a4dqxfj8p2d1wpan4j7bmr1l5aqyxlzl9qmbx0brf9r5gk4"; depends=[BMisc formula_tools ggplot2 Hmisc pbapply quantreg texreg]; }; + qtl = derive2 { name="qtl"; version="1.42-8"; sha256="1l528dwvfpdlr05imrrm4rq32axp6hld9nqm6mm43kn5n7z2f5k6"; depends=[]; }; qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; qtlbook = derive2 { name="qtlbook"; version="0.18-6"; sha256="0kbz7icp6fzl2bgk50fcg8x704aijpz3xbqrzraj7qa3z8gakaj6"; depends=[qtl]; }; qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; }; @@ -9152,37 +9746,37 @@ in with self; { qtlmt = derive2 { name="qtlmt"; version="0.1-6"; sha256="023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c"; depends=[]; }; qtlnet = derive2 { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[graph igraph pcalg qtl sem]; }; qtpaint = derive2 { name="qtpaint"; version="0.9.1"; sha256="08x7qcxwkaclwv1p4s9a5k95x35hzp69whiihkakjv5blm83m3g9"; depends=[qtbase]; }; - qtutils = derive2 { name="qtutils"; version="0.1-3"; sha256="018k9v3mab1mfcjh4mv1a1iish50fwdhb51mqn17k6fyrrrv7vs5"; depends=[qtbase]; }; quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; }; quadmesh = derive2 { name="quadmesh"; version="0.1.0"; sha256="1k1midhszmi843krv9sdwbyhjmffgps0xx9aigkp7yw7mpif07vx"; depends=[dplyr raster]; }; quadprog = derive2 { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; }; - quadprogXT = derive2 { name="quadprogXT"; version="0.0.1"; sha256="0q1yph4hri04i4k8rw5zpm60yc0irrb8nvxf0vipzd2chn4d9k6f"; depends=[quadprog]; }; + quadprogXT = derive2 { name="quadprogXT"; version="0.0.2"; sha256="1yqcxpzahrmlyz1rsp3fgs1dsjf7y7lhp98ybpmlgpj6c9z2abcl"; 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-3"; sha256="1yyqk223ydcc0125gsn33a4mcdp8bd76fpn8kj9bfz9g78b8dqmx"; depends=[KernSmooth]; }; qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; }; qualpalr = derive2 { name="qualpalr"; version="0.4.2"; sha256="0lgg8r7w2fwd2nw8x3k876pyc9r3igqri57akc5fwi92gb8grj5b"; 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=[]; }; + qualtRics = derive2 { name="qualtRics"; version="3.0"; sha256="1cd49jvk04gx278v74yc93f4jni7k30v0anz95mz98x4y3xr45nd"; depends=[assertthat dplyr httr jsonlite readr rlang sjlabelled stringr yaml]; }; + qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; 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.99.9"; sha256="0rln64zykl4mwm7zs0jqkbrh9m7vafwdh6kyiylgw5vv3i7h06gm"; depends=[data_table fastmatch ggplot2 lubridate magrittr Matrix Rcpp RcppArmadillo RcppParallel RSpectra SnowballC stringi wordcloud XML yaml]; }; + quanteda = derive2 { name="quanteda"; version="1.1.1"; sha256="1yi59lr968y6l7v537xc6p50yi9y7hgyg5lwghqqgk13glg6zmbg"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi 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-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]; }; + quantmod = derive2 { name="quantmod"; version="0.4-12"; sha256="0y7gh0k1s10vdsfch8777avbhf99mc9crikvx7ahqrw0j631vmhq"; depends=[curl TTR xts zoo]; }; + quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; }; + quantreg = derive2 { name="quantreg"; version="5.35"; sha256="18f3qxv1j1bqmq55hzssz8mnp5ww4flhy80rm2v1rk0mmg9paz7m"; 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]; }; + quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; }; + quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-0"; sha256="0lscz07k14z1mgxdgi7j0nd5098x6p4hsm9qzw8fgnsz4xgm5qxn"; depends=[quantreg]; }; + quantregRanger = derive2 { name="quantregRanger"; version="1.0"; sha256="1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx"; depends=[ranger Rcpp]; }; quantspec = derive2 { name="quantspec"; version="1.2-1"; sha256="0kvwifdwy3big0lls5h3wcb48v3jvlfp1l0zjd07jnvj43zj3ysd"; depends=[abind quantreg Rcpp snowfall zoo]; }; quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; }; - questionr = derive2 { name="questionr"; version="0.6.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=[]; }; + questionr = derive2 { name="questionr"; version="0.6.2"; sha256="0mjgwm6xm753r6bjlz79c9vp7xxkb69hiv3mlzrm50slh34x7jhx"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; }; + queuecomputer = derive2 { name="queuecomputer"; version="0.8.2"; sha256="0zpyi4hqhsy2jlbf2ygfl25wh3m166ifp9yw4h4ycd1pga9bj43n"; depends=[dplyr Rcpp RcppArmadillo tidyr]; }; + queueing = derive2 { name="queueing"; version="0.2.11"; sha256="1rgavpivvxwww1qiphbjm25d1avhjcjv31imsrzrkwh1d12b2k7x"; depends=[]; }; quhomology = derive2 { name="quhomology"; version="1.1.0"; sha256="0acglmjp4x8f81iysxp8x7v5279p8gdidj308b9spn6xbmqgbr8z"; depends=[MASS numbers]; }; - quickPlot = derive2 { name="quickPlot"; version="0.1.1"; sha256="0pi82wrwiaj02qgn0dgfgk9jjs56wmsdkkcrwz1h180xqfk30nmp"; depends=[data_table ggplot2 gridBase igraph raster RColorBrewer rgdal sp]; }; - quickReg = derive2 { name="quickReg"; version="1.0.0"; sha256="0dgs0ja2srivrbzl11d3al45ncnrlx7940sk0h8c6lnnxv7nz77k"; depends=[ggplot2 nortest psych survival]; }; + quickPlot = derive2 { name="quickPlot"; version="0.1.3"; sha256="091d81x5kbjs4hawrdlvkp6ylmcsjg4xqs47hk2nrv5im2nl8i7z"; depends=[data_table ggplot2 gridBase igraph raster RColorBrewer rgdal sp]; }; + quickReg = derive2 { name="quickReg"; version="1.5.0"; sha256="1l1v3k8albxlaz18l2b2x2ryifq4pbdq6n4q7555hnfcik9rqmw5"; depends=[dplyr ggplot2 nortest psych rlang survival]; }; quickblock = derive2 { name="quickblock"; version="0.1.0"; sha256="15zv7znhq3rl5jkdy0jyxr0h2mkpxir04vvl2hw57c5mn79izcpr"; depends=[distances scclust]; }; 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]; }; @@ -9190,26 +9784,27 @@ in with self; { quickregression = derive2 { name="quickregression"; version="0.2"; sha256="1z0sspi8q7dvgxqbj5na56v458pv6jhxrssnm6j23156dchgw39h"; depends=[car]; }; quint = derive2 { name="quint"; version="1.2.1"; sha256="1d9dnrjnl9cg2yn5snr6x9qr6lf74639j3ymsxpw0wn5c4fm8z46"; depends=[Formula partykit rpart]; }; quipu = derive2 { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae pixmap shiny stringr xtable]; }; - quotedargs = derive2 { name="quotedargs"; version="0.1.0"; sha256="1wnzcywrahcf2wwxnwqfxbfmrhzlq2ghfzbhs10gj9nsbbp1l0ch"; depends=[]; }; - qut = derive2 { name="qut"; version="1.2"; sha256="1w6zsjphzfb1gby21cq20j8cclj15xklwga821sj07x3nchgn421"; depends=[flare glmnet lars Matrix]; }; + quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; }; + quotedargs = derive2 { name="quotedargs"; version="0.1.1"; sha256="05y3jgix3aix3d4nazd7h9c27mfcl52xl6fdpfpi7zyd4iznpv9g"; depends=[]; }; + qut = derive2 { name="qut"; version="2.0"; sha256="1r0yg99p88ar1d9qhayzpplssjpsy901b7n6yr7r4n9nldh8p7xz"; depends=[flare glmnet lars Matrix]; }; qvcalc = derive2 { name="qvcalc"; version="0.9-1"; sha256="1ll71yww8rsbp0qa60w7vdna8yk60cq66cjn5cdk3bkdwyni28yy"; depends=[]; }; qwraps2 = derive2 { name="qwraps2"; version="0.2.4"; sha256="18ail1y3kpiiwgkf7zn1acfz1ipz7wbk8pcmlganayr8p9yv7sh2"; depends=[dplyr ggplot2 knitr Rcpp tidyr]; }; 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.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; }; - r2lh = derive2 { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; }; 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]; }; + r6extended = derive2 { name="r6extended"; version="0.1.1"; sha256="184c3jh84vihbwg81c2wv3ndaddki8cpas3wgvqk2akyq168rnfc"; depends=[digest hellno magrittr R6]; }; rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; }; rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; }; - rAmCharts = derive2 { name="rAmCharts"; version="2.1.5"; sha256="1lvcws288dxw6j3xjxd3rfr4k1izvnq8ykpmh02v4fqh4hzhqgwn"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; }; + rAmCharts = derive2 { name="rAmCharts"; version="2.1.6"; sha256="00bc05jjyaky71pdic455cs6anqf0gm7563vwwxxzqnrm8lknrag"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; }; rAverage = derive2 { name="rAverage"; version="0.5-8"; sha256="09yap3qv02k5nidi6a4png9xa5yy7cb8hg8s2dq99wnc88s42d26"; 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=[]; }; rCAT = derive2 { name="rCAT"; version="0.1.5"; sha256="03nbhcfgawz0a8h5fr51aqn1n9v7kprwvafxzjb2pb8751rica2d"; depends=[pracma rgdal sp]; }; - rCBA = derive2 { name="rCBA"; version="0.0.1"; sha256="0mfd4jn5bcn4kqnfmycm5x7kcvll60dp1nma3l1bfj0v2hybxm5d"; depends=[arules rJava]; }; + rCBA = derive2 { name="rCBA"; version="0.3.0"; sha256="1jsykb747clzd5j78h50gclf7171hk015yssi02lbai79q359r56"; depends=[arules R_utils rJava TunePareto]; }; rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; }; rCUR = derive2 { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; }; rCarto = derive2 { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; }; @@ -9219,50 +9814,52 @@ in with self; { rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; }; rDVR = derive2 { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; }; rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; }; - rEDM = derive2 { name="rEDM"; version="0.5.4"; sha256="1vhhc1yfswvba6qfff5y9l96g8xjw0szshzs4hd4yxh6rq1bnjlr"; depends=[Rcpp RcppEigen]; }; + rEDM = derive2 { name="rEDM"; version="0.6.9"; sha256="0825yh82vlkmjkrwbk7xfhdq4c7yq7n4bmmw6x7ywmhbnayqj6b3"; depends=[Rcpp RcppEigen]; }; rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; }; + rENA = derive2 { name="rENA"; version="0.1.3"; sha256="03sb6fb6d41nf4qd7ifsbr3gqgdk9g5lvjcxvdqhldxrhwn4b1ji"; depends=[data_table data_tree doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo RcppEigen RcppParallel RcppRoll scales]; }; rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; - rFSA = derive2 { name="rFSA"; version="0.1.0"; sha256="14drlivamb818dgh808h6j81ww1zlwil42whpclz7ayfddna5rg4"; depends=[]; }; + rFSA = derive2 { name="rFSA"; version="0.9.1"; sha256="14qpxmzy4vy1fydn8yqh1001mqrgv1i67ai42w61dkk0d4m75z60"; depends=[hashmap tibble]; }; rFTRLProximal = derive2 { name="rFTRLProximal"; version="1.0.0"; sha256="1458gqy2zbaa62vaimawdr1nk0lsgwz1j4pgw21fkw7bskcszz0f"; depends=[data_table FeatureHashing foreach magrittr Matrix Rcpp RcppArmadillo RcppProgress]; }; - 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]; }; + rFerns = derive2 { name="rFerns"; version="2.0.3"; sha256="02lq43mgcz8n21hwb0pjqi0aq5dacnaakpx336q1xzw1kwlvfkhv"; depends=[]; }; 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]; }; + rGoodData = derive2 { name="rGoodData"; version="0.1.1"; sha256="092sgy6y3dkyr32hrir4jvjwh7n6gfvv9z7i631fipg59255g0zy"; depends=[data_table httr jsonlite]; }; + rGroovy = derive2 { name="rGroovy"; version="1.2"; sha256="0wx17d4c7202dbmgw4nvnvw42fiwlzsl151idrmm4fzfff8y1vdi"; 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]; }; rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; }; - rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-7"; sha256="1j8lc56q20b0qkl20r8mqa6q822rpfphj00dlmj50rgwk02pfc69"; depends=[chopsticks rJava]; }; - rJava = derive2 { name="rJava"; version="0.9-8"; sha256="12mxajy300gyi5bsd3fn84nvj83chr8ls0mrh3mm9nhl2h1mxnns"; depends=[]; }; + rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-8"; sha256="0maws52n4lj2byfyv8fj8npk2qyd3dzy83x5h2s1nmgbjm2m36kj"; depends=[chopsticks rJava]; }; + rJava = derive2 { name="rJava"; version="0.9-9"; sha256="0ilibvhxydnh9yhhi9h9isgkq41xvwj43b5m9dhnsm2w5cziaawk"; depends=[]; }; 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]; }; + rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; }; rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; }; - rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.8.7"; sha256="17vq8lapiviyibl1jm12a73qq98bgpnh7xp66jnv3lfksv9q3ck6"; depends=[plyr]; }; + rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.0"; sha256="0y6ir41yl8xj19lbwlvzcrfcrdk9cn9i4q4z1pg7mwj4cq6bc6gd"; depends=[plyr]; }; rLiDAR = derive2 { name="rLiDAR"; version="0.1.1"; sha256="1w0yi4ygw0l9ydbllqjylp30d401bsf7b6fng6qg3pssbi9v3kln"; 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.5"; sha256="18p2z2njb6j8pj7i1mdwl91qynwqmszy8pck02bdynzdag47wl6r"; depends=[biglm]; }; + rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; 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.6"; sha256="007yha5ils7wdbld6id3gfgm99cks3vc64awammrv0kvq85c8g8k"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; }; - rODE = derive2 { name="rODE"; version="0.99.5"; sha256="0y1m03dlkf4gspif0jp0bkh4bk6n7zq4m54rfpbc8vag91h56lpv"; depends=[data_table]; }; + rNOMADS = derive2 { name="rNOMADS"; version="2.3.9"; sha256="15l6150vsaa7y2wv896mhdbakxdsg87fx74bbj0rsn0757jss525"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; }; + rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; }; + rPackedBar = derive2 { name="rPackedBar"; version="0.1.0"; sha256="12jwkch3264m6ksl8rdjirwdzm1g8b4050mm6rysw9v57k3v57ji"; depends=[data_table plotly scales]; }; rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.1"; sha256="0yk61ck2br81cd40yvqxrzi9s680ii26wbl0wjdam04dyf0vh1cv"; depends=[mvtnorm ssanv]; }; rPraat = derive2 { name="rPraat"; version="1.0.8"; sha256="06f97sa43i0b4x8j48higgx5jyj5q73j6mf2730yfm4db6ahz94m"; depends=[dplyr dygraphs readr stringr]; }; 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]; }; rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; }; rSARP = derive2 { name="rSARP"; version="1.0.0"; sha256="0gg6qs7jgn2qvzdwbz0xyfpfzjwa2dwi0j0hal7glc5qlhrrynwl"; depends=[ggplot2 lattice qcc]; }; - rSCA = derive2 { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; }; + rSCA = derive2 { name="rSCA"; version="3.0"; sha256="1ka8p1slqb3a9hfc8z4j7v90k0wn6y35vmwxqaf8jlgwfhhc1v9f"; depends=[]; }; 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]; }; - rSQM = derive2 { name="rSQM"; version="1.2.42"; sha256="0s4ncvrhxnpnxmrilsx6y57s00nc859b9czh08i6na1z31354cpj"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; }; + rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; }; rSymPy = derive2 { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; }; - rTableICC = derive2 { name="rTableICC"; version="1.0.4"; sha256="0if18is64m3ka2dxfbj7vb1lbwwhn2hgfh3kdh7d47nr3z4ak7p0"; depends=[aster partitions]; }; + rTableICC = derive2 { name="rTableICC"; version="1.0.6"; sha256="1wasfkcnbd2azv2v0n02932zxa86lxrvndny2821lvf7xrc9yy55"; 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.3.0"; sha256="17qap8dlrgkh4kkyighxgpsbghjq4n1cgqp8asdw5giyakm5v7d4"; depends=[gdistance igraph Matrix raster shape]; }; + rWind = derive2 { name="rWind"; version="0.4.1"; sha256="19bv69y236sjlkf082wrs38nhijhrpbsnh4vc8phdzg7dj9my09j"; depends=[gdistance Matrix raster]; }; + rWishart = derive2 { name="rWishart"; version="0.1.0"; sha256="1kg2n8lyfdp76fw36m13rlb0qy1ffk8n701ffmf5dgkfp0x8nnn7"; depends=[lazyeval MASS Matrix]; }; rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; }; + rabi = derive2 { name="rabi"; version="0.1.0"; sha256="02ldpkqpdvh0b660j34bppw5j9pl3a2b4vkzaaiq4kcangahg2r6"; depends=[numbers polynom stringdist]; }; 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]; }; @@ -9272,17 +9869,18 @@ in with self; { 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.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]; }; + ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.1"; sha256="0zjqrvy1k1lz4caakcj3c6l2j637wp6nxbzfj0gvcn2c4pjcrdyp"; depends=[abind expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; }; ragtop = derive2 { name="ragtop"; version="0.5"; sha256="0h09h9ws9c2d9xc00w4hl000h0kbvq16lz4vgv1w93am8zmsp4wm"; depends=[futile_logger limSolve]; }; + railtrails = derive2 { name="railtrails"; version="0.0.3"; sha256="0dbyqviig0sadialqr66x93v3xn8y4qgdb323mji7rasdp5w8ws4"; depends=[tibble]; }; 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]; }; rainfreq = derive2 { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; }; - rakeR = derive2 { name="rakeR"; version="0.2.0"; sha256="11zazjr56x8dbnxryxjxqrxqpnkvangkdzy8869smvhd52qvcqa1"; depends=[ipfp wrswoR]; }; + rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; }; + ramchoice = derive2 { name="ramchoice"; version="0.2"; sha256="0br6n6mxcz099rj3dh1sp28wy9g5rqwh0arg0s968pc5h0jfbai5"; depends=[MASS]; }; ramcmc = derive2 { name="ramcmc"; version="0.1.0"; sha256="0s5jgjqkschr64srblppv9lbvhynlpfiy8cy12fywpmnbv8viazq"; depends=[Rcpp RcppArmadillo]; }; ramidst = derive2 { name="ramidst"; version="0.1.0"; sha256="1q4lvq2c2vj9xrm2p2w2qjsl4qvwcl6y54y68mmbd6cw7wqpffjj"; depends=[rJava]; }; ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; }; @@ -9297,58 +9895,60 @@ in with self; { randomForest = derive2 { name="randomForest"; version="4.6-12"; sha256="1i43idaihhl6nwqw42v9dqpl6f8z3ykcn2in32lh2755i27jylbf"; depends=[]; }; randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.2"; sha256="1fijnzzap8my4l211m5pgj4fwna04z1db5m3hhim72i3xzc77hy2"; depends=[ddR Matrix randomForest]; }; randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.9"; sha256="0gqqm3784krl6xdx7j6xvvyi2rjbyi6c8shm44yvq59is5i7fypc"; depends=[data_table dplyr DT dtplyr GGally ggplot2 ggrepel MASS randomForest reshape2 rmarkdown]; }; - randomForestSRC = derive2 { name="randomForestSRC"; version="2.5.0"; sha256="0jh7j4zwcxhgqrklz0g249am5s91q4ddi7w7yswlx6gs7yy8zcfr"; depends=[]; }; + randomForestSRC = derive2 { name="randomForestSRC"; version="2.5.1"; sha256="1p5a5z7ddhnsrln8vpdrwvxbgknwdigczjw8vpxzbkckmf6qfidd"; depends=[]; }; randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; }; - randomLCA = derive2 { name="randomLCA"; version="1.0-12"; sha256="0vn3pb24r8iwadmkaps86p5qq9qwr801lvh3a19jf70lzv1g9j2i"; depends=[boot fastGHQuad lattice Matrix]; }; + randomLCA = derive2 { name="randomLCA"; version="1.0-15"; sha256="10rx2ah50dcjxz5y492c59d3pn0dvlgjaxfdf8sknkf6s4pmwkis"; depends=[boot fastGHQuad lattice Matrix]; }; 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]; }; + randomcoloR = derive2 { name="randomcoloR"; version="1.1.0"; sha256="0sirxgrf7xf470d7lls45c698l6c078hqjkjcswmwz6kphykrzhg"; depends=[cluster colorspace Rtsne scales stringr V8]; }; randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; }; randomizeBE = derive2 { name="randomizeBE"; version="0.3-3"; sha256="0vdvgk2b1h1lsj0ka01lwldfxanngir91axc8ywa6pg12hrdkkb0"; depends=[]; }; randomizeR = derive2 { name="randomizeR"; version="1.4"; sha256="0l7gvpm52fwbz79vgy7vn4z2n4gqigimdj6r9drm3lfzbylmx3js"; depends=[ggplot2 plotrix]; }; - randomizr = derive2 { name="randomizr"; version="0.6.0"; sha256="1hkazj25ipvrdcy9845lgqvnncw3ilrxrhzvh5lm865rk8z0i2cg"; depends=[]; }; + randomizr = derive2 { name="randomizr"; version="0.8.0"; sha256="0yrjw3q8ivimbir6m3adw22mwq2ka0vpyrsrkvvn05bm5x5mffvs"; 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]; }; + randtoolbox = derive2 { name="randtoolbox"; version="1.17.1"; sha256="13akf13qi4yhj9gapym05074b1qzk03vgysy81qsd73pd8r107ls"; depends=[rngWELL]; }; 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.8.0"; sha256="1fdbm879wx3hlng8s4c4f8f2x5yxz57llakcqnpa0lymybidw3vz"; depends=[Matrix Rcpp RcppEigen]; }; + ranger = derive2 { name="ranger"; version="0.9.0"; sha256="1pilj5pxl8jl0gsy9vsyqxqdqfcxzvphbgvrlp4hf7r9mrfw9v0p"; 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]; }; rapiclient = derive2 { name="rapiclient"; version="0.1.2"; sha256="072rlr7z9rj4agkzmy12cz4axh4pajavfd83lpcx2b1lgxpj6ck4"; depends=[httr jsonlite]; }; + rapidraker = derive2 { name="rapidraker"; version="0.1.0"; sha256="17jzkzm5hvd8vcqql40bwl89sfgz8yicvi0753nzgkmbvanzjhjx"; depends=[openNLPdata rJava slowraker]; }; rappdirs = derive2 { name="rappdirs"; version="0.3.1"; sha256="0ji6sg3bdn5gazkq14xmmcq7jnbsyxw4lzmmbgv6526j2vn93n1g"; depends=[]; }; rapport = derive2 { name="rapport"; version="1.0"; sha256="1i1zawar5yxw23km74mrvaxnc9hr06kqjvbm046c09cqi6pw0hjh"; depends=[pander rapportools stringr yaml]; }; rapportools = derive2 { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; }; - raptr = derive2 { name="raptr"; version="0.0.5"; sha256="1jp2p439in0j19xkv9nyh39a61srrb3zcy6y37nz0jnffzkw5mb4"; 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]; }; + raptr = derive2 { name="raptr"; version="0.1.1"; sha256="17k392vid1is0wl5iyr8b41xyw5y0ad7drvlmrcsda7683yal3p3"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; }; 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]; }; + rarhsmm = derive2 { name="rarhsmm"; version="1.0.5"; sha256="0h5njhvpl2msb2wbb80bmlzzci0ma10rx5y5hxa4vdxgj23g6rpm"; depends=[glmnet Rcpp RcppArmadillo]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; - raster = derive2 { name="raster"; version="2.5-8"; sha256="1k34caqj8fab7am44zmp1szk0w15rjc04xz3phzm2l1lg2yjm6a7"; depends=[Rcpp sp]; }; + raster = derive2 { name="raster"; version="2.6-7"; sha256="009bwil3n9gaf11wzifwxyw9j6pl0pyjk3l5v7csd935si7q14gv"; 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]; }; rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; }; - rasterVis = derive2 { name="rasterVis"; version="0.41"; sha256="0dsg8ypsxxa7qagy5yjcyqyjqqyy7xgfbmiijr3xbn2n1wp090n9"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; + rasterVis = derive2 { name="rasterVis"; version="0.43"; sha256="0g6ij4h5di4c0pzv7ghc63jfl3j3rm1g541apbjr6n4k9ci12k4l"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; 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.2-0"; sha256="0gviaiia2jih6xx1maf9ajizmgh4vdbca4r17h9m817v3xn21y7b"; depends=[]; }; + ratesci = derive2 { name="ratesci"; version="0.3-0"; sha256="1mdx47xpgjrjbb3lybajdmxb87dqr6cvv3fsvwfx0n629mjbih4z"; depends=[]; }; rationalfun = derive2 { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; }; - ratios = derive2 { name="ratios"; version="1.1.0"; sha256="1nss6xfkm5axp8mld1aiqaygrmrwl2jn9k2476la2j3pla047xgm"; depends=[data_table stringr]; }; + ratios = derive2 { name="ratios"; version="1.2.0"; sha256="16q9v2lhgklvdp3hi9x3afdldznfpwg775p80m2g5074q2dzjpgg"; depends=[data_table stringr]; }; rattle = derive2 { name="rattle"; version="5.1.0"; sha256="0xxf2wpazsk29y2byyk010n59vmzmhm4phpsqvklmsr1v3m10pvp"; depends=[cairoDevice dplyr ggplot2 magrittr RGtk2 rpart_plot stringi stringr tidyr XML]; }; rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; }; raw = derive2 { name="raw"; version="0.1.5"; sha256="0w0k35izvsi8vwp38har4ygh1zxnz7hfla8d8fcbvckpfbkwpggp"; depends=[]; }; + rbacon = derive2 { name="rbacon"; version="2.3.3"; sha256="0kkj4ylvk7gsbzzqdg8b66kp4mn99k8yzmgml7z0nkll0lr54srk"; depends=[coda Rcpp]; }; 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]; }; + rbcb = derive2 { name="rbcb"; version="0.1.3"; sha256="0bghbxrgy4lpxyazqlm90i42dav1kjca02l2nmw320v01rvw5qvd"; 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.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; }; - rbi = derive2 { name="rbi"; version="0.8.0"; sha256="0hizf3mffp72pgzkwsdg2dw0p0dfbnbb80jv3gmayvg7kkq1nabv"; depends=[data_table ncdf4 reshape2]; }; - rbiouml = derive2 { name="rbiouml"; version="1.7"; sha256="0bk0pvx0rfk74s7lbr8lc664yplfky94j1ym098w029045k233pi"; depends=[RCurl RJSONIO]; }; + rbi = derive2 { name="rbi"; version="0.9.0"; sha256="0am6r8dy3nfahprkyvap73x3b6vxgc604v7mf9wbb9vwjja00xzp"; depends=[data_table ncdf4 reshape2]; }; + rbiouml = derive2 { name="rbiouml"; version="1.8"; sha256="0qvc896sf6idczbxix3klf56paxf0wpfbmga8qqlcyjasv1dsdql"; depends=[RCurl RJSONIO]; }; 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]; }; @@ -9359,54 +9959,59 @@ 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.4"; sha256="1qkajg92yy5jp8gr4warrz6jmnp8p162br5lk4iiql2zv10rwxv1"; depends=[MASS plyr]; }; - rcbsubset = derive2 { name="rcbsubset"; version="1.1.2"; sha256="0izvxbkjmhyp8jz4mlwa5grdgcd8q9pdc3jwrccby0xz0f5gw2x0"; depends=[MASS plyr]; }; + rcarbon = derive2 { name="rcarbon"; version="1.0.0"; sha256="0xgf26m8cw3g4nc4s413xgplxv8a6s2m4m7g3zavsjl3517b86bc"; depends=[doParallel foreach sp]; }; + rcartocolor = derive2 { name="rcartocolor"; version="0.0.22"; sha256="1dh1n01v70sfmymg1w0f272j6nwnrzawqx5x4ljgh46pzqprx56r"; depends=[ggplot2 scales]; }; + rcbalance = derive2 { name="rcbalance"; version="1.8.5"; sha256="15qlk3cqwsvixl17l1fxcajrabmz4y7q5gz0a1pd66f6i1xskcqq"; depends=[MASS plyr]; }; + rcbsubset = derive2 { name="rcbsubset"; version="1.1.3"; sha256="16wd0j0z2ll8hqrk27fss4k9fyjw6xwx30xkrphx9jj2ws08wibl"; 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.2"; sha256="1s7idrfvl0hhyckrfiakszqw6fk34f9iiyxspzya3rqyhih014ay"; depends=[]; }; - rcdk = derive2 { name="rcdk"; version="3.4.3"; sha256="055k6p40ai2dfc3kn6m1pgj6wryyh3l84w1wy86ckqny24h4xvqd"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; + rcdk = derive2 { name="rcdk"; version="3.4.5"; sha256="0wybaa5wmxixqlrf84sph3shg495jvawsxqd7xg8adp7jixa8iiv"; depends=[fingerprint iterators itertools png rcdklibs 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]; }; + rclimateca = derive2 { name="rclimateca"; version="1.0.0"; sha256="1wydh7k7yyi56l3xdprzx4s7425k68a7f53hx9pvr0xmn501l67z"; depends=[digest dplyr hms httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; }; rclipboard = derive2 { name="rclipboard"; version="0.1"; sha256="0qphr3qrp0k2gnzk27bgfiq3ff6b8564gmkrjw1kri1p7ilf71wx"; depends=[shiny]; }; rcmdcheck = derive2 { name="rcmdcheck"; version="1.2.1"; sha256="04gh0drvkikn91i5zmpixhrhyjnsyxwz8k8bx4kgwwrmh1dc7f2s"; depends=[callr clisymbols crayon digest withr]; }; - rcompanion = derive2 { name="rcompanion"; version="1.10.1"; sha256="1mcibxnkaqb0pbag90jpwxvshdhabszg95cka55igjg4sc3x7iy9"; depends=[boot BSDA coin DescTools EMT hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; }; + rcompanion = derive2 { name="rcompanion"; version="1.11.3"; sha256="1wzqqss86z2qggyjwpc41wblw9kkca20mbh6q4dwl4yc7gb4ggaf"; depends=[boot BSDA coin DescTools EMT hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; }; + rcongresso = derive2 { name="rcongresso"; version="0.3.2"; sha256="15b7m1z5lr66kwhl8v8k2car4id9ssd0ypz75z259v8c1w0k7xkl"; depends=[dplyr httr jsonlite magrittr tibble tidyr]; }; 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.7.0"; sha256="09br2nmb1cz4x57w5vj0ggxyqna5898zxnyrjj4nafkqkwblycl5"; depends=[bibtex crul dplyr jsonlite miniUI plyr R6 shiny stringr xml2]; }; + rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; }; + rcrossref = derive2 { name="rcrossref"; version="0.8.0"; sha256="01k3jpd6awan8r4kc5wjw0did30i2bafzjr8mwaaqv87gni2yiyf"; 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.1"; sha256="0i5z3a918ykl56dv3dvzwwcv550gvjjdg5kfh63jlpaxn9ybmv3f"; depends=[dplyr 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]; }; + rdatacite = derive2 { name="rdatacite"; version="0.3.0"; sha256="10ivlng40f213iag30ygfihxx0415z2jdz3kx329wd4xjcj7fy02"; depends=[crul jsonlite 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]; }; + rddapp = derive2 { name="rddapp"; version="1.0.0"; sha256="0js2y34k971ydv4nx2g4lr3mnpr3pagdiwqfi9l5431fxxr0pf0n"; depends=[AER Formula lmtest sandwich shiny]; }; rddensity = derive2 { name="rddensity"; version="0.2.2"; sha256="10530il8fxpgcads6yvj09jwanldlpvjgjqcknl2wly4gmwcwjq9"; depends=[ggplot2 lpdensity]; }; rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; }; rdefra = derive2 { name="rdefra"; version="0.3.4"; sha256="05fskap0vvrq08m4gql9gczy04lc3dgxgjcsb57dgp3nng358sf6"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; }; rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; + rdflib = derive2 { name="rdflib"; version="0.1.0"; sha256="1xq378nfvbk8b2nbnr6yswqr351pgli7jcmhcr1ipynkl93rl5qm"; depends=[jsonld readr redland stringi]; }; 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]; }; + rdomains = derive2 { name="rdomains"; version="0.1.7"; sha256="1w6jvwzd9lwha4qkf8rhd1g3cpr79fsl4rrmh5chdnbahqg60gh9"; depends=[aws_alexa curl glmnet httr Matrix rlang RSelenium urltools virustotal XML xml2]; }; rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; rdpla = derive2 { name="rdpla"; version="0.2.0"; sha256="0d32bp68z1agymcmjwnds4fkblhjrcx8i2q6f5b7sl4kdfdbjchf"; depends=[crul data_table hoardr jsonlite tibble]; }; - 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.8.0"; sha256="1j5yz5qlf7xv722rh8qsbazksgs7mwv2s789lnlpr8cv127qfh8d"; depends=[berryFunctions pbapply]; }; + rdrobust = derive2 { name="rdrobust"; version="0.99"; sha256="1c9issw0mssswln2mdirwjlaps4ps8q9z1wr4ailr4c2z9klla9p"; depends=[]; }; + rdrop2 = derive2 { name="rdrop2"; version="0.8.1"; sha256="1f4ysck58dm40k4wn9nfjaxym0mbgfkm146iidfkz7agmd1x0xyl"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; }; + rdryad = derive2 { name="rdryad"; version="0.3.0"; sha256="18vjq5amaian174ywymsx1px7ckirk36386h66lsq0h87qwnrwj7"; depends=[crul curl oai solrium xml2]; }; + rdwd = derive2 { name="rdwd"; version="0.9.0"; sha256="1zqmfrxjrkp0f8d943wlzvr7g0rrnbp3x9klx3syrbkn7jqxz49i"; depends=[berryFunctions pbapply]; }; re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; }; reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; }; - reReg = derive2 { name="reReg"; version="1.0-0"; sha256="0xd78frrzykdrdwj39vv5m11s5v3xg9fym200gz7sffw8vjv3z96"; depends=[aftgee BB MASS SQUAREM survival]; }; - reactR = derive2 { name="reactR"; version="0.1.2"; sha256="011ga8f72qq0ljqc7j0qvcbbr2jg167ri1yny65n55dls80flmng"; depends=[htmltools]; }; + reReg = derive2 { name="reReg"; version="1.1-1"; sha256="1pjzh9r7488d39a5s0hkymzxh79zc1kp2ag2cp037v3j65mifbin"; depends=[aftgee BB ggplot2 MASS nleqslv plyr SQUAREM survival]; }; + reactR = derive2 { name="reactR"; version="0.2.0"; sha256="17jdcby95fxfa3imalllnqsp16py5vqqj4y0za4wli91vd37555q"; depends=[htmltools]; }; read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; }; readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.5"; sha256="1qmimfxwh6d7s5qrnnk20i2f9l5j1ci3wpfs3qlmggz69jzf589m"; depends=[]; }; readHAC = derive2 { name="readHAC"; version="1.0"; sha256="0z80ai6xfswwgdfh83l9sq279c97n0wz25bk2l7xfb6w0sndzq53"; depends=[]; }; @@ -9419,13 +10024,15 @@ in with self; { readbitmap = derive2 { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; }; readbulk = derive2 { name="readbulk"; version="1.1.0"; sha256="0m02isvja0ihvy1fscjdl5f9gfdlmfmabgvpirgd2m9j3lz6mi8s"; depends=[plyr]; }; reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; }; + readobj = derive2 { name="readobj"; version="0.3"; sha256="0hwxfk27azay8hjz702b10cg395is06wnypqdw4788gm25d0i041"; 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]; }; + realestateDK = derive2 { name="realestateDK"; version="0.1.0"; sha256="02y3c2zww9jakh9a0jqxkgcwshjz1hd5mw63603hyic7q4a07iv3"; depends=[statsDK]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; rebird = derive2 { name="rebird"; version="0.4.0"; sha256="1awwjr0gsd7hksh84fz5p17qwd857zn03fc2q0kzncy6q6iiw481"; depends=[dplyr httr jsonlite]; }; - rebmix = derive2 { name="rebmix"; version="2.9.3"; sha256="1dw1az7wzkhxcc8ixcmdxrlc4hzi2c4093brvj1m4z44mrw28vws"; depends=[mvtnorm]; }; + rebmix = derive2 { name="rebmix"; version="2.10.0"; sha256="0n9s3xklrlzw6mb798q8p395506baj0pxp6n9lj9hhfibbgjif1c"; 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]; }; @@ -9433,20 +10040,22 @@ in with self; { 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]; }; - recipes = derive2 { name="recipes"; version="0.1.0"; sha256="0rydk403qihxmcv3zz323r3ywk4g1v7ibvj452rxhm0z22sqk9kb"; depends=[ddalpha dimRed dplyr gower ipred lubridate magrittr purrr RcppRoll rlang tibble tidyselect timeDate]; }; + recipes = derive2 { name="recipes"; version="0.1.2"; sha256="1car3a3mqn87pz049cbgkaayz86970mvkapk6al2k7jjw76306l9"; depends=[broom ddalpha dimRed dplyr gower ipred lubridate magrittr Matrix purrr RcppRoll rlang tibble tidyselect timeDate]; }; recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; }; - recmap = derive2 { name="recmap"; version="0.5.24"; sha256="0ijs331f9x6r2qamx5b47x4wblz2pg7k5b7593hdwhiiwzh5c0ly"; depends=[GA Rcpp sp]; }; + recmap = derive2 { name="recmap"; version="0.5.26"; sha256="02fvl275k4455yw5n31fxb2jhiaciki4i7zzzks166gz33rc0dwy"; depends=[GA Rcpp sp]; }; recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; }; + recombinator = derive2 { name="recombinator"; version="1.0.0"; sha256="0amcpicsk270l9h7qgv764wp09phsffdpi4adcxrsrwiwm274ibw"; depends=[crayon]; }; 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.2"; sha256="1bn6l23gqmfpr6w60ph7zgv53vy3vnq9zdy5x0a8n1yp6b0lw48x"; depends=[Rcpp RcppProgress]; }; - red = derive2 { name="red"; version="1.2.0"; sha256="0g15yx1wk70ds3qadfzv2hkiyliwfgzc1h66klhqi1n4f8gsalcz"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; }; + recurse = derive2 { name="recurse"; version="1.1.0"; sha256="1zgzzhbvdzqgmgzj43yvpyc7ahbkn96l5wyr1iqpnn3ha78fy0p3"; depends=[Rcpp]; }; + red = derive2 { name="red"; version="1.3.1"; sha256="1m8jk3k0g17dlqbws74wi1lsa11v26si2857sxgzv659f46ybmq3"; 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]; }; + reda = derive2 { name="reda"; version="0.4.1"; sha256="0aq6c2h694kdmjis12g4nxq5hdlzsi42nbnpzq7wic305l5r7nxl"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; }; + redcapAPI = derive2 { name="redcapAPI"; version="2.0"; sha256="1n4kwmd0kgmnx2zcgvrz2dlkxmv6wflyj4pll00qvpb1njgnq1xv"; depends=[checkmate chron DBI httr labelVector lubridate stringr tidyr]; }; + reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; }; redist = derive2 { name="redist"; version="1.3-1"; sha256="0rivfi3jpjvhd36rkhlazx4vr7wsig9lf3im1masjmzd4s00zrd8"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; }; redland = derive2 { name="redland"; version="1.0.17-9"; sha256="01jx6r7zznb6cpi2bx36fpsgig3bkc1nv9afz5s2nfqisxiq48w5"; depends=[roxygen2]; }; redlistr = derive2 { name="redlistr"; version="1.0.0"; sha256="0v2j8fkq8p2g071fkimlhn0ydba1h70rs48p2sy2hsbicj9qsd4z"; depends=[plyr raster rgdal rgeos sp]; }; @@ -9455,8 +10064,9 @@ in with self; { 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="1.0.0"; sha256="0qifqhar2pv81npsxl2pj713vgldyap7y79fq20jpk7qigzf9573"; depends=[checkmate curl httr jsonlite tibble xml2]; }; + refinr = derive2 { name="refinr"; version="0.2.0"; sha256="0dwmqq0wigbzk7vv0ddd066pmwf1sd7rid4nhmsxajv21aghqc3i"; depends=[Rcpp stringdist]; }; refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; }; - refset = derive2 { name="refset"; version="0.1.0"; sha256="0yj87sp6ghxv20hz5knmw3d7way1hsggk759wqxsbfprd38y6khd"; depends=[]; }; + refset = derive2 { name="refset"; version="0.1.1"; sha256="1xbwvm9066g3f7pd34z5jh04vph4ddy2lkcgmf4kiwa1k5czpwg1"; depends=[]; }; refund = derive2 { name="refund"; version="0.1-16"; sha256="0npq12bf3qmcbgwdxilwvzvf5x2m3qrxljlsx1sz9xczms2dz7kg"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; }; refund_shiny = derive2 { name="refund.shiny"; version="0.3.0"; sha256="0r2xrm4wz35wn9zg4vvw2ysl7zzbz9i080vnbrlp4yrhhlkhpkm1"; depends=[dplyr ggplot2 gridExtra lme4 plotly refund reshape2 shiny tidyr]; }; refund_wave = derive2 { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; }; @@ -9466,26 +10076,30 @@ in with self; { regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; }; 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]; }; + registry = derive2 { name="registry"; version="0.5"; sha256="1yqfl1g6vsl28zn8brzc39659k8lqsmfms7900j7p64ilydyb2sx"; depends=[]; }; + reglogit = derive2 { name="reglogit"; version="1.2-5"; sha256="123l9n3m2v16skhj0rf77swlhy0ii6ridz13pp68hrxb72sr243c"; depends=[boot Matrix mvtnorm]; }; + regnet = derive2 { name="regnet"; version="0.2.0"; sha256="1c7l2wmb5143ly53griy87c40xr8shxfk54kvf36grjxs7grl7pd"; depends=[glmnet Rcpp RcppArmadillo]; }; + regplot = derive2 { name="regplot"; version="0.1"; sha256="1jw93pplg6qdrfv9jhnifkhclxzrhg84zs8gkfl0nb40jxb6pc34"; depends=[beanplot sm survival vioplot]; }; regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; }; 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.9.2"; sha256="1xbqmsgw98hwwyx4cf9qsjhkwkzhv14fsnwb3jrmqmmcg97w4rwp"; depends=[lavaan Rcpp RcppArmadillo]; }; + regsem = derive2 { name="regsem"; version="1.1.2"; sha256="0d843h1kv78hsn48ibci6w7y69yqd3q32bidgsqs5dxk980kxcsk"; 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=[]; }; regtools = derive2 { name="regtools"; version="1.0.1"; sha256="0807r8721qmdl8ahvlzcvqaq2rfvlvhblwbwdpi79fm7dk8vvq1i"; depends=[car dummies FNN mvtnorm]; }; 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=[]; }; + reinforcelearn = derive2 { name="reinforcelearn"; version="0.1.0"; sha256="025v8flr8q2p473kz760vywczhvx8b4lakm6rasr9ijgxpbd2jpn"; depends=[checkmate nnet purrr R6]; }; reinstallr = derive2 { name="reinstallr"; version="0.1.4"; sha256="1fcmy2cyqy4zwh815j2jbmziaiq6kypwsnj5bx0f10dlq3522m5q"; depends=[]; }; + reinsureR = derive2 { name="reinsureR"; version="0.1.0"; sha256="19ayikzcq6z4i7xrlby76yy2nwvrsv6xdfrmvzyr7rz934flh8kd"; depends=[data_table dplyr ggplot2 viridis viridisLite]; }; 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]; }; + relSim = derive2 { name="relSim"; version="0.2-9"; sha256="0qy1fy7xclzaqwhxpclllpypac41s406jc413cgd4jss5c87k4c4"; depends=[multicool Rcpp xtable]; }; rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; relabeLoadings = derive2 { name="relabeLoadings"; version="1.0"; sha256="16gxdrhkaaa33hypnsacn4vd1g3lbqdl3j8p8va54v777c561g81"; depends=[]; }; - relaimpo = derive2 { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[boot corpcor MASS mitools survey]; }; + relaimpo = derive2 { name="relaimpo"; version="2.2-3"; sha256="0pbffalyhmfigyynkl6il60dyyf2aw1i71sncwrqcp18qgx4bxq9"; depends=[boot corpcor MASS mitools survey]; }; + relatable = derive2 { name="relatable"; version="1.0.0"; sha256="0147gin6dn76gg7gassar64f0w2gny1sh0k60v7914qhb4sj4s7i"; depends=[compare]; }; relations = derive2 { name="relations"; version="0.6-7"; sha256="1c16sb4v5n44nichwizilqs491rddn8kpf8qrqw54khj5zzg6w52"; depends=[cluster sets slam]; }; relax = derive2 { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; }; relaxnet = derive2 { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; }; @@ -9495,27 +10109,26 @@ in with self; { relevent = derive2 { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; }; 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.1"; sha256="093h3f1rpinsxns9995gnkzrhibmrbcwnqvbnjw75sf7wsq8fmk2"; depends=[date survival]; }; + relsurv = derive2 { name="relsurv"; version="2.1-1"; sha256="0jdxjnrxygn3ppzsndyzcch19c726s15lrd0kc1vxbjp3b4r0lhl"; depends=[date 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.1.0"; sha256="15q2gr4a2gk5zprs9a0bn21fi2ijayk1s5dibrn7zc0g1mwhk2wc"; depends=[]; }; - rentrez = derive2 { name="rentrez"; version="1.1.0"; sha256="0mlxrbds8bjgi91yxxgsn0dxzjwghnhwjzvvg0z4lpdhrc1nrm4d"; depends=[httr jsonlite XML]; }; + remoter = derive2 { name="remoter"; version="0.4-0"; sha256="1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl"; depends=[argon2 getPass pbdZMQ png]; }; + remotes = derive2 { name="remotes"; version="1.1.1"; sha256="07sxlwd09jzlfn7xakw9hwkr9k970lw2mnl0l3rpb5w71968km98"; depends=[]; }; + rentrez = derive2 { name="rentrez"; version="1.2.1"; sha256="115ffrmsg755ynfwywql7xkcnlvv8ch4nlr1ab11i5923fz6vkvl"; 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=[]; }; + repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; }; 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]; }; + replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; }; replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; }; - replyr = derive2 { name="replyr"; version="0.5.3"; sha256="1v05a3lyb63fcygwg4392lnrmr0zsk26x18a78jrnqnrx8c00wg2"; depends=[DBI dplyr RSQLite wrapr]; }; + replyr = derive2 { name="replyr"; version="0.9.1"; sha256="0vxxmnin8a9mrak33cm01wndbc333dyjh83iyn633yc6ll092klr"; depends=[cdata DBI dbplyr dplyr RSQLite seplyr wrapr]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; - repo = derive2 { name="repo"; version="2.1.1"; sha256="0raxdjar1fzfr4122zd5hq9pifs13kkswpc0lfqxfzk9izwdk5f7"; depends=[digest]; }; + repo = derive2 { name="repo"; version="2.1.2"; sha256="14a7lw1rvn7n7caz3p3y69n9wqw48qsxsjs5kwvpbwsmap7bjj7l"; 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]; }; + reportROC = derive2 { name="reportROC"; version="3.0"; sha256="0jq3y1mia7nsnab14axyrvafw2b64g2zq25n42zplvm4pyfh1czr"; 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]; }; @@ -9524,77 +10137,84 @@ in with self; { 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]; }; + reprex = derive2 { name="reprex"; version="0.1.2"; sha256="105d9vsmqfilgpw8psfb2wyiz1hvcycvh4cqhb3ab37lm3rcavvs"; depends=[callr knitr rmarkdown whisker]; }; reproducer = derive2 { name="reproducer"; version="0.1.9"; sha256="092gz58sanpawgg0jk1634x9ki0jw460csbb6cywp0ndghswfgwh"; depends=[ggplot2 gridExtra lme4 MASS metafor openxlsx xtable]; }; - reproducible = derive2 { name="reproducible"; version="0.1.3"; sha256="0a5czpvydy5z98yh6dbhwfya5jix630g0zh3yf1xja069fj6bgav"; depends=[archivist data_table devtools digest fastdigest git2r magrittr raster sp]; }; + reproducible = derive2 { name="reproducible"; version="0.1.4"; sha256="1z14hpinlykj1y1xf2qhfdabyfvfywrkzbyfjv3vhw8lvvkwajlw"; depends=[archivist crayon data_table devtools digest fastdigest git2r magrittr memoise raster Rcpp RCurl sp versions]; }; repurrrsive = derive2 { name="repurrrsive"; version="0.1.0"; sha256="1ffldcs30xa4wcd825bgpcmqsndfyxx70dfmbb3c86ic9kq17p01"; depends=[tibble]; }; - reqres = derive2 { name="reqres"; version="0.2.0"; sha256="1sy88adw45fxyvi4ma25zplsvqi71rknjc0qi66p7yfs260l9hgj"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; }; + reqres = derive2 { name="reqres"; version="0.2.1"; sha256="056cjdx0nmf32vma2jkpbaznbaf76kc4jn0w6nv7blq33qlvx37z"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; }; 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.4.2"; sha256="0jn5fqjjn4nqn6hyaiadq8xdg7vd23l09h9ax6nq8r5iiizpv249"; depends=[data_table digest dplyr hoardr httr jsonlite ncdf4 tibble xml2]; }; + rerf = derive2 { name="rerf"; version="1.0"; sha256="04q2g9pn34cvvzf790s6wlxd3v2qhwi7yx57cmm3h1ak9b4a6ics"; depends=[dummies Rcpp RcppArmadillo RcppZiggurat]; }; 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]; }; reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; }; reshape = derive2 { name="reshape"; version="0.8.7"; sha256="14ir3w4bb3bsz8jsak27nj7kpn227pdgr9653gjq5wc93rywi9ig"; depends=[plyr]; }; - reshape2 = derive2 { name="reshape2"; version="1.4.2"; sha256="0swvjmc9f8cvkrsz463cp6snd8bncbv6q8yrfrb4rgkr0dhq6dvd"; depends=[plyr Rcpp stringr]; }; + reshape2 = derive2 { name="reshape2"; version="1.4.3"; sha256="03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa"; 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.4.0"; sha256="0qrirnzyszmn6g392gkan1w0dn7sm7y69wmsy2v61v7g2slffkl6"; depends=[birk lubridate marelac measurements seacarb]; }; + respirometry = derive2 { name="respirometry"; version="0.6.0"; sha256="0dglmf3m8wpqs3jlza6lj8hamb1j1h8b85a4bfrcwkyap7pggcc5"; depends=[birk lubridate marelac measurements seacarb]; }; restfulr = derive2 { name="restfulr"; version="0.0.13"; sha256="1dk45mzrr6ka92yjz7hfhkj12kpx1wg4szv1h1mg80mgga4ganbv"; 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]; }; restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; }; - restriktor = derive2 { name="restriktor"; version="0.1-70"; sha256="07j6ypd5jms7kfk0fnlncvwdbmjbfpq3j1fb5j6s2kqn8d21wqy7"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; + restriktor = derive2 { name="restriktor"; version="0.1-80.711"; sha256="10kbfr7gzah119xm4cnx7br9i9fcga38kymjajw7m2571f4jsji9"; 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="1.1"; sha256="0ahfhir3mg33zry5i1l584ics37viw6pga9i5v0y6v1kr5krjmrn"; depends=[jsonlite Rcpp]; }; + rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; }; + reticulate = derive2 { name="reticulate"; version="1.5"; sha256="0bbsd87ajw9s37g0m8gpv0rws4jfiic9q31fn5a3lb06r2i4wl53"; depends=[jsonlite Rcpp]; }; retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; retistruct = derive2 { name="retistruct"; version="0.5.12"; sha256="11m4i29i3zqh9chyjgdhzqj4yqlslfm8y4q0x14xxc2r9lqbkj9l"; 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.2.1"; sha256="0dq4knlmf1pcag09pqvcrp18sypm0zs64r3nrxn00i3mlhv90gr7"; depends=[bayesplot Rcpp RcppArmadillo rust]; }; + revdbayes = derive2 { name="revdbayes"; version="1.3.2"; sha256="09xxy3yk2fwd0113dgsz0kd2k1k1ghjv9ay2n03b5cnxqaksa99s"; depends=[bayesplot Rcpp RcppArmadillo rust zoo]; }; revealedPrefs = derive2 { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp RcppArmadillo]; }; revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; }; revengc = derive2 { name="revengc"; version="1.0.0"; sha256="0ccbw61xqjf9y15ghhzx57q3l48xpw9pq2nb11nrqapp5w3f9vzy"; depends=[stringr]; }; - revgeo = derive2 { name="revgeo"; version="0.11"; sha256="1ybphg00ja2xysh8f1s8cz855689b7vybsic07fj7q8wzrbqda3f"; depends=[RCurl RJSONIO]; }; + revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; }; + revtools = derive2 { name="revtools"; version="0.2.2"; sha256="0sn7k5vcp09vp6j1bf879jrig382ayhfnwp569z9dxgdh7s18v6n"; depends=[ade4 modeltools plotly shiny shinydashboard SnowballC stringdist tm topicmodels viridisLite]; }; 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.26.1"; sha256="12zg56gv9miqlhyi4c61nk2fpgz40xi1kd2wzgs4sjwxn5g8cgvk"; depends=[Rcpp]; }; + rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; }; + rexpokit = derive2 { name="rexpokit"; version="0.26.2"; sha256="0jydx3rlsbdn74gx2is1x6gsb4b64wqbc5jw2sb4xflvvhxfci67"; depends=[Rcpp]; }; rfPermute = derive2 { name="rfPermute"; version="2.1.5"; sha256="0c7yi395j640mvnr1qlm9hy1w6vva33fa2lqb3amzkafy4j1cs63"; depends=[abind ggplot2 gridExtra randomForest reshape2 swfscMisc]; }; - rfUtilities = derive2 { name="rfUtilities"; version="2.1-1"; sha256="0dycsq5w4a2j5xzk5i8mbv742ryv1q0lyi3i7yfjl9vfbm1p1wjw"; depends=[randomForest]; }; + rfUtilities = derive2 { name="rfUtilities"; version="2.1-3"; sha256="0vnhvdkqqqn894abznw97j07gwdvvmvk8vsf4aaxx9yzk44cnk5g"; depends=[cluster randomForest]; }; rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; }; rfishbase = derive2 { name="rfishbase"; version="2.1.2"; sha256="1w8jk6qfhyzzmxf8qnqqwckm4syrqimi8k6dqmwflgxz6bsxcz0v"; depends=[dplyr httr lazyeval tidyr]; }; rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; }; 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]; }; - rfoaas = derive2 { name="rfoaas"; version="1.1.0"; sha256="15a49s84xyyv324gf15avgxa4cj7dpbmlxcgsrnddxy661yd3bg5"; depends=[httr]; }; + rfoaas = derive2 { name="rfoaas"; version="1.1.1"; sha256="1rglqmbhnasc3ciypms3qqgfaj19202cnqdimsi69lvig2rnkca5"; depends=[httr]; }; rfordummies = derive2 { name="rfordummies"; version="0.1.3"; sha256="13jqvww65wzac1c8ajkljz89vi4j76y9ga52w3ygajjzg0rn15l5"; depends=[]; }; 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.8"; sha256="17pixyx2wicxdwqz7mziharanqdv865hmb9lz2kfqy1gzpv29jp2"; depends=[crul data_table geoaxe ggplot2 jsonlite magrittr oai tibble whisker wicket xml2]; }; + rgbif = derive2 { name="rgbif"; version="0.9.9"; sha256="11gji0b1gzh3zpmaff7ly9pvv6jdig5d1277hrss8x4zj7r34iap"; 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-11"; sha256="06hna03nk74hsqyzn9px8gy9m2yk8azc0y5if4j1mdxv0agkydwv"; depends=[sp]; }; - rgenoud = derive2 { name="rgenoud"; version="5.7-12.4"; sha256="19y0297fsxggjrdjv8n3a5klbqf8y3mq4mmdz6xx28cz3k65dk4n"; depends=[]; }; + rgdal = derive2 { name="rgdal"; version="1.2-16"; sha256="1j83bc16ndk561vgr67z99gba9bhgcchgir8s504avcs9zmfyzq1"; depends=[sp]; }; + rgdax = derive2 { name="rgdax"; version="0.4.0"; sha256="0f8n016p9y62rpxmqrycmbdb7b3h7vnsyd9qcicqs19yvpm91im2"; depends=[digest httr jsonlite RCurl]; }; + rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; }; + rgenoud = derive2 { name="rgenoud"; version="5.8-1.0"; sha256="12n34r0p00bmflxrmbj927jm0q19j5r9mjplz5mzb1v8praa7v4x"; depends=[]; }; rgeoapi = derive2 { name="rgeoapi"; version="1.1.0"; sha256="0k8p1l0vrgx0bifbc2i9gxxwih513vbqhjh7fiifyfq3r74i4j7k"; depends=[httr magrittr rjson]; }; rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; }; - rgeos = derive2 { name="rgeos"; version="0.3-25"; sha256="0fjk2xmly0p27r6rmcns1m2xza8fwl6is4126xpaj1c9nhg684yi"; depends=[sp]; }; + rgeopat2 = derive2 { name="rgeopat2"; version="0.2.0"; sha256="12n5zgx8svcrgsihvhw0drd0l3r48clshs2b36p0md111a2b1gh3"; depends=[readr sf stringr]; }; + rgeos = derive2 { name="rgeos"; version="0.3-26"; sha256="0czlwfqilzh1zj61axisg06d9dksdvvg5hgcs31ydaqkh45llllq"; 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.98.1"; sha256="11k93b3wkfasx63w0niin1ns1kgzrmjm66la7kvp5rljw3cvwjaz"; depends=[htmltools htmlwidgets jsonlite knitr magrittr shiny]; }; - rglobi = derive2 { name="rglobi"; version="0.2.10"; sha256="1y4li552ly5ww7rd6da7kbm5v5r6hwm7n2475dwlqyshnsc3x3gh"; depends=[RCurl rjson]; }; + rgl = derive2 { name="rgl"; version="0.99.9"; sha256="1rv4gq03mbx62v4kyj83y5kh1f77d68aqwmdb00r8szqlx5w5gdm"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr shiny]; }; + rglobi = derive2 { name="rglobi"; version="0.2.13"; sha256="15hqcmh8r6lsc60139f9q9kyspkys61q0y39i5wq86lsq6i3q4js"; 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]; }; - rgpui = derive2 { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[emoa rgp shiny]; }; - rgr = derive2 { name="rgr"; version="1.1.14"; sha256="1g5ssxfamghl7d8smlb9zwk31zf5m090y9f88nripad4k9l58fkl"; depends=[fastICA MASS]; }; - rgrass7 = derive2 { name="rgrass7"; version="0.1-9"; sha256="079rkzxpp6l9gppnag83sq87y5l6pby3k0dg32065sr758yr3vx0"; depends=[sp XML]; }; + rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; }; + rgrass7 = derive2 { name="rgrass7"; version="0.1-10"; sha256="0w5vy8163xlfmdrpyp00x25wwq4jnaspzggpvj160azigndsc1kr"; depends=[sp XML]; }; rgw = derive2 { name="rgw"; version="0.1.0"; sha256="12f7bsfg24cld9y47jyqxswgc1bk4adbhhdpycapinbcfhyzc91p"; depends=[]; }; - rhandsontable = derive2 { name="rhandsontable"; version="0.3.4"; sha256="1ng97l2x9hyqv3cckis81p5bxm4wndv6sipyxy26x9pnyw9lq3kp"; depends=[htmlwidgets jsonlite magrittr]; }; + rhandsontable = derive2 { name="rhandsontable"; version="0.3.6"; sha256="1n631vffbfi8mgbcjgav1209ryj88igb17h73xvjdmglh5f0s6dz"; depends=[htmlwidgets jsonlite magrittr]; }; + rhmmer = derive2 { name="rhmmer"; version="0.1.0"; sha256="0875b29i8rl9iypxp7vw514avq0ac4abdlfq3861cdd3kgycw8jh"; depends=[dplyr magrittr readr rlang tidyr]; }; rhnerm = derive2 { name="rhnerm"; version="1.1"; sha256="1fkh2pr4kzvqvagdyjlyab7p591s913104gyq05q170gmvlpmiww"; depends=[]; }; rhoR = derive2 { name="rhoR"; version="1.1.0.0"; sha256="00djh16s144a9cl2z8zm3za1bsnpzd3i5b9nyqad10xlkgll36li"; depends=[]; }; rhosp = derive2 { name="rhosp"; version="1.07"; sha256="09wq96micv9wpr3sx8ir7frkanpy3zi3mwn6rbixw2kxvn5wkkfn"; depends=[]; }; + rhub = derive2 { name="rhub"; version="1.0.2"; sha256="18aq28q4vggbp19l9wcw3dylnyv7sd26wg0i5w8jrva5cq1v2n5j"; depends=[assertthat callr clisymbols crayon desc httr jsonlite parsedate prettyunits R6 rappdirs rcmdcheck rematch whoami withr]; }; + rhymer = derive2 { name="rhymer"; version="1.0.0"; sha256="1k15sd5q6a1ijayl585vc54d1zs4nyrxsfck9bn4nlfdiwc5arwf"; depends=[httr jsonlite]; }; ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; + ri2 = derive2 { name="ri2"; version="0.1.0"; sha256="02rlczjpfy1q5i7lq4ypindhc65cnryryvbklqjh5dh2xzwjkain"; depends=[estimatr ggplot2 pbapply randomizr]; }; riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; }; rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; }; ridge = derive2 { name="ridge"; version="2.2"; sha256="01yldzzlqg0xqha31l3py62lyq7fw5xfsbmz6ifzff24gqsf029x"; depends=[]; }; @@ -9605,15 +10225,16 @@ in with self; { 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.2.0"; sha256="0qdry88f6ci5g6k0i8mycm9k5ibnmb9zjppjvqqaflw3g3nsnli2"; depends=[jsonlite shiny]; }; - 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]; }; + rio = derive2 { name="rio"; version="0.5.9"; sha256="1cb7p0kgas3y84sc1p59zcsp0c4qhg01cs9s7kl927qhral778kd"; depends=[curl data_table foreign haven openxlsx readxl tibble]; }; + rioja = derive2 { name="rioja"; version="0.9-15.1"; sha256="18fyqcykg12mf4ap0a2la30656xq32immqz11ddmrfrb0vpd2h7h"; 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.4.3"; sha256="1r9habv47wwhnbvcjl6yin4i415ayhisg67rzggv899nqcyqpm80"; depends=[abind 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]; }; + riskyr = derive2 { name="riskyr"; version="0.1.0"; sha256="1s6yrij5d1vhvzc7nnajjnjmxnhrs0r1psppcvwb0qg3ff181y22"; depends=[diagram vcd]; }; 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]; }; + ritis = derive2 { name="ritis"; version="0.7.0"; sha256="0f2xhxz8aqq1bhz6pwcdlfpchlvrnpgyh926hzfyg0rhz11k4fmv"; depends=[crul data_table jsonlite solrium tibble]; }; riv = derive2 { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS quantreg rrcov]; }; riverdist = derive2 { name="riverdist"; version="0.15.0"; sha256="145mvqnhv12dcvss54wdycgb3wwk95phl4kx5z0jnh3kmm1zsdl4"; depends=[rgdal sp]; }; rivernet = derive2 { name="rivernet"; version="1.1"; sha256="1brdgm2fbdq4qw85va6isj7p9bva4sj3spgsx8nsqvc8vaa90y4p"; depends=[]; }; @@ -9623,7 +10244,6 @@ in with self; { 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.3.2"; sha256="1s3bm6ahazqlzw3z7p3f873nga930qb72sn34sqz39py62fdwq6n"; depends=[coda madness mvtnorm]; }; 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]; }; @@ -9632,38 +10252,41 @@ in with self; { rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; }; rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; }; rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; }; - rlang = derive2 { name="rlang"; version="0.1.2"; sha256="1yc5qyq6h0nrya7m2fqnfv19zh5xwsl28jx6zi2g1zz6ra4cvkwh"; depends=[]; }; - rlas = derive2 { name="rlas"; version="1.1.5"; sha256="04s71d724yjwdlh5906l6c4dra3q6pqvvqimlx51jjb75yf761pv"; depends=[data_table Rcpp]; }; + rlang = derive2 { name="rlang"; version="0.2.0"; sha256="0f87fhw5pj6s2zjdxnpnd7pwn78czdz71b0xhm5adqg1p38sfwj8"; depends=[]; }; + rlas = derive2 { name="rlas"; version="1.1.9"; sha256="1c8sc277jiij1j5sb3wsjdm1pxlp0ia3a39xqzglvmlcnlvcygbq"; 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=[]; }; rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; }; rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; }; + rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; }; rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; }; rly = derive2 { name="rly"; version="1.4.2"; sha256="0mppl3y808k9ydn1lwng2bqmdzbbsla2p9p8qk73mp0xyq8iq9sm"; depends=[futile_logger R6]; }; + rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; }; rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; }; rmapshaper = derive2 { name="rmapshaper"; version="0.3.0"; sha256="0v7p8wqgjymidavyq9lfl6kzlpn5ybfc9lqhsaxbxcc9hb80xjxz"; depends=[geojsonio geojsonlint rgdal sp V8]; }; rmapzen = derive2 { name="rmapzen"; version="0.3.3"; sha256="0rz3wwy8dbb2620gy07aib2aad6ds001vf47bxrj3vzrxp5h448i"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; }; - rmarkdown = derive2 { name="rmarkdown"; version="1.6"; sha256="0p8ph5z5pifk1nxc1bppkfs1ir5gjc6ap9n64b4255m2fdaqfrc7"; depends=[base64enc caTools evaluate htmltools jsonlite knitr rprojroot stringr yaml]; }; + rmarkdown = derive2 { name="rmarkdown"; version="1.9"; sha256="0wq6kbhrkv3fhcy4hg5yyv9gdvf8gr4nsjwdifs4ih8lnn0dmdyb"; depends=[base64enc evaluate htmltools jsonlite knitr mime rprojroot stringr yaml]; }; rmatio = derive2 { name="rmatio"; version="0.12.0"; sha256="1cw7j44rgjgbw2xln7lh29ln53lwfadr8rx0sffkjwc7lbh1r6wa"; depends=[Matrix]; }; - rmcfs = derive2 { name="rmcfs"; version="1.2.6"; sha256="0q8h0h86swm4fz4lv30sm84078dqdzm9mdhg7d2s8sg7w4ad0m16"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; }; - rmcorr = derive2 { name="rmcorr"; version="0.2.0"; sha256="0s356ly6d46fv28q176ahz2y0w8igmgcy2li0mi4wkj5gnc0yxx4"; depends=[psych RColorBrewer]; }; + rmcfs = derive2 { name="rmcfs"; version="1.2.9"; sha256="1ar2dsxjf0a6ij91d380arlh9wlywqpfaii80bk6mrq4xg6qy4b0"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; }; + rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; }; rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; }; rmda = derive2 { name="rmda"; version="1.4"; sha256="0agh4mrs8mjjb7hc41r59mbnq0h873fmykljla1cbf4ikhxwjihf"; depends=[caret MASS pander reshape]; }; 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]; }; + rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; }; rmeta = derive2 { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; }; - rmetasim = derive2 { name="rmetasim"; version="3.1.3"; sha256="1i1rrfgjh1axvd6kdjlm19i3qj0zif7k4dvlfh64ayg8i3nwb38p"; depends=[ade4 adegenet gtools pegas]; }; + rmetasim = derive2 { name="rmetasim"; version="3.1.7"; sha256="0sz4mdprdi6sgkfwfdvh2hr9nxiwq17sw0vggq3cvs7lzb0i6m9r"; depends=[ade4 adegenet gtools pegas]; }; rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; }; - rmonad = derive2 { name="rmonad"; version="0.2.0"; sha256="1r15i7z8y3j9bh2lgigxc7m97qwbcwxmdywpbq4k0xmfaikqzf1y"; depends=[DiagrammeR magrittr pryr R6]; }; + rmonad = derive2 { name="rmonad"; version="0.5.0"; sha256="0m7hhmn87rfh49hxrjlcxcq6q36niyxlh3w2frld68jkbks71jn5"; depends=[digest glue igraph magrittr pryr]; }; 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-1"; sha256="1qxzs640yq61629d0fb9ydbx222fbd7q922jrw5v8d64yn6r92f4"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; }; + rmpw = derive2 { name="rmpw"; version="0.0.3"; sha256="1iidiq0pz88wgh155hfy8mw0cwwwcl77zshcjrbw11zpx6p8qy94"; depends=[gtools MASS]; }; + rms = derive2 { name="rms"; version="5.1-2"; sha256="01wjxlqfz6l1bdsvxqq0lsbps0k86hx3ayb6fl2n2hxccvsfxkzi"; 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.1.1-3"; sha256="1bkz6kdyjrz88f0awp9zx0kv3jx2fqpnf8ip2vhrpwcgrbv6d0d8"; depends=[Rcpp]; }; + rmsfuns = derive2 { name="rmsfuns"; version="0.0.0.2"; sha256="0by2d6l25lf5vidxbkcxghpxycffyldzzbxcw6h4rm86zmkkv1m0"; depends=[magrittr purrr readr tidyverse xts zoo]; }; + rmumps = derive2 { name="rmumps"; version="5.1.2-4"; sha256="1qdpvyxwb18dapa8xqj8kjjmrnrqixkn29qn6q4cnwdwi1zcbdx6"; 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]; }; @@ -9678,45 +10301,48 @@ in with self; { rnn = derive2 { name="rnn"; version="0.8.0"; sha256="04924zn448x9rc3z9vh033l4rv9lz0hxv1bhfl0gn6gvd5wavlc7"; depends=[shiny sigmoid]; }; 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]; }; + rnr = derive2 { name="rnr"; version="0.1.0"; sha256="1209gayyn98zdkwv51liq62b2xvza6xndfqkpc73w5dgj1rqn343"; depends=[assertthat purrr]; }; rnrfa = derive2 { name="rnrfa"; version="1.3.0"; sha256="1zrj7y0qh57r7r9c5pspz238w0j1kaicd2l6vcg92lgxi8b9i558"; depends=[ggmap ggplot2 httr plyr rjson sp stringr xml2 xts]; }; - roadoi = derive2 { name="roadoi"; version="0.3"; sha256="0cdqir1kwifrgiv1ki5hsp72ds6lii0yl720a6p4763zq54rqbqr"; depends=[dplyr httr jsonlite miniUI plyr shiny]; }; + roadoi = derive2 { name="roadoi"; version="0.4.1"; sha256="1g4x1gkcrq8pd5vdikhf16ghgd990hhb1m387r2smz21v993cfk8"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; }; roahd = derive2 { name="roahd"; version="1.3"; sha256="1pn2xzc5fnp2hb3fw3gpqng0x9rvpd4qfhx9gclf31algpzaidbb"; depends=[robustbase scales]; }; robCompositions = derive2 { name="robCompositions"; version="2.0.6"; sha256="1r74w6ssq9fhjain02hr9sz0x2j1fi1waw7319gls69kp73b51hw"; 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=[]; }; - robets = derive2 { name="robets"; version="1.3"; sha256="123f08h763ifd2ydh1hp3jp6gqnc12cia9ndlp8jxkck8l3pnwkh"; depends=[forecast Rcpp]; }; + robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; }; robfilter = derive2 { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; }; + robis = derive2 { name="robis"; version="1.0.0"; sha256="02spxy33vh675dvhx2v6f06hxzcwfrsmkzb6yk5h30xp21blqv4g"; depends=[dplyr httr jsonlite leaflet]; }; robmed = derive2 { name="robmed"; version="0.1.1"; sha256="1716vzci0lmim4n28bc2pjky1shjxqrclgllj3hc4dzf8j22dxbz"; depends=[boot ggplot2]; }; - robotstxt = derive2 { name="robotstxt"; version="0.4.1"; sha256="1azsdddy5vcr0qw6fh2n9hz4j4lq6p04p6ckvckkbf6a52bmnifa"; depends=[httr magrittr stringr]; }; + robotstxt = derive2 { name="robotstxt"; version="0.6.0"; sha256="1xia7xivqnqj0xis6i4qzm3v414ga1m7lmv1piz1b431faq9s1ai"; depends=[future httr magrittr spiderbar stringr]; }; robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; }; 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]; }; + robustBLME = derive2 { name="robustBLME"; version="0.1.3"; sha256="18wx116l1riy4wn4083kxl637mkyyi9wbwnmvhkgqw3vb36s4vxd"; 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]; }; robustX = derive2 { name="robustX"; version="1.2-2"; sha256="0pgfq78qd8s40ciqval01bwajy6zfdjms1lbh0b5g0rww6920s6f"; depends=[robustbase]; }; robustarima = derive2 { name="robustarima"; version="0.2.5"; sha256="0mqlp4xmma74rgwb6rihbzs5nillcnddl6smlxmm8lq1wba27jdj"; depends=[splusTimeDate splusTimeSeries]; }; - robustbase = derive2 { name="robustbase"; version="0.92-7"; sha256="13xz4am7y0s0kl5bmbcw3dlhl7ji8h9sjx56wsgmj6r9n35nrggw"; depends=[DEoptimR]; }; + robustbase = derive2 { name="robustbase"; version="0.92-8"; sha256="080ynchq8pvhnmbivj4fp74n0x9lyr9923sg0s9gq5irgm68kgxw"; 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-3"; sha256="0a5gk8n8aap14s1d6cmsla5x07cqgy6i266zd0922l93k40b60rk"; depends=[ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; }; + robustlmm = derive2 { name="robustlmm"; version="2.1-4"; sha256="0qli04ylw25vc35k1maaddkn7rh8y5p7ggla1qvi8b1sglg43xhh"; 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=[]; }; + robustrank = derive2 { name="robustrank"; version="2017.12-2"; sha256="0lcjn77lsdfbcby89hfcz2h049v2fndw7rankdcdgnl6lw2bdpvr"; depends=[kyotil]; }; robustrao = derive2 { name="robustrao"; version="1.0-3"; sha256="0gcxxizsg380blrv55vl9f3az8gnr274c6idi0pimhh5c26h7ma6"; depends=[doParallel foreach gmp igraph iterpc quadprog]; }; 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=[]; }; rocc = derive2 { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; }; - roccv = derive2 { name="roccv"; version="1.0"; sha256="13pycz05x0d1azc28yc7569awikd9lidzhhsgljqgsxvazr8fg0i"; depends=[glmnet pROC]; }; - rockchalk = derive2 { name="rockchalk"; version="1.8.101"; sha256="1aa0m3whvb190cyfl4177pfd2l1i1a0dz9rn2fxkvls393cssfmb"; depends=[car lme4 MASS]; }; + roccv = derive2 { name="roccv"; version="1.1"; sha256="13pwrc31w279l7j58wdz24p8j9jdh53rsavj1mymj92jpm52nfzl"; depends=[glmnet pROC]; }; + rockchalk = derive2 { name="rockchalk"; version="1.8.110"; sha256="1991g4vslbanz6swvj76bwfc7xpnrcwqwr59xn8nzf7kkb721w6a"; depends=[car lme4 MASS]; }; rococo = derive2 { name="rococo"; version="1.1.5"; sha256="062pj62haf0xw74p6c1dd20ipcxka8nn0mxsq490d22kqwm4vf5a"; depends=[Rcpp]; }; 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]; }; + rodeo = derive2 { name="rodeo"; version="0.7.4"; sha256="16yzj12m9wvcrqxc33rpbyzbq019swi5jxnbda9crfwjdvafaa0d"; depends=[deSolve R6]; }; rodham = derive2 { name="rodham"; version="0.1.1"; sha256="15mrlx7azvwkwjgfplvs5fhk2nwlg9pay2l99q327p8hx87jr8ra"; depends=[jsonlite plyr splitstackshape stringr tibble]; }; 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]; }; + rollmatch = derive2 { name="rollmatch"; version="1.0.0"; sha256="1v9kdfvci26vdyis6b9qb43w8mixx94hybvfmx3f55nbwng4dy00"; depends=[dplyr magrittr]; }; 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]; }; @@ -9724,24 +10350,25 @@ in with self; { rootWishart = derive2 { name="rootWishart"; version="0.4.0"; sha256="028k1h6vibbcnmh35kg0z388c991k8v78ac0fbrv1k2ajqrrl4lg"; depends=[BH Rcpp RcppEigen]; }; roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; }; rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; }; - ropenaq = derive2 { name="ropenaq"; version="0.2.2"; sha256="0ppmh8dnszrw3nmldirhb5srx22wnslsdacm11hcn7rdda4fi3cf"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; }; + ropenaq = derive2 { name="ropenaq"; version="0.2.6"; sha256="065p4c8l4bqxy00clbjhad8hqw4gg2h2c00b06n2fa5n70z0akgq"; 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]; }; + rorcid = derive2 { name="rorcid"; version="0.4.0"; sha256="1diz14b5jzs9i4khyykq58cbgz87qraivv9lhq5nrrrfi2gryl9r"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; }; rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; }; - rosetteApi = derive2 { name="rosetteApi"; version="1.7.0"; sha256="0iqir8cbk2fx0wmkz52cb850fpvxr3rjldyf0m45n4fp041rd8mp"; depends=[httr jsonlite]; }; + rosetteApi = derive2 { name="rosetteApi"; version="1.9.0"; sha256="0pnrfc0dcbh5r3qwfwyb0q063bzwpw4ga60965y5qyxz64cyx74r"; 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]; }; + rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; }; + rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; }; 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.3"; sha256="0pfpgynvdi011m6j6gs98irldpjrdc8rgza36ndk60q2w5z436h4"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; }; - routr = derive2 { name="routr"; version="0.2.0"; sha256="0h14s90id2qfxv153wml4q3v1ban327rdvg9gpqmbmzq2bi3vwgr"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; }; + routr = derive2 { name="routr"; version="0.3.0"; sha256="1mjf1vwrh1k1kjl1kcgqs29zb8h9m05630czsjkz7li3pmvy9mrv"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; }; 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-11"; sha256="165djqj7lk81jr7z5fwccq3h7ayys26hx1kj9hndvg2rkyaq1arq"; depends=[]; }; + rpart = derive2 { name="rpart"; version="4.1-13"; sha256="0k29qx3k3pj5sgrpg0p47yd8i811rmdakaw57bigpq1449asc4cf"; 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]; }; @@ -9749,80 +10376,86 @@ in with self; { rpatrec = derive2 { name="rpatrec"; version="1.0.1"; sha256="0zj461frf6n5s97zq7r52q0blsn2xq2759impgz6v4pr87gmq0si"; depends=[np]; }; rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; }; rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; }; - rpdo = derive2 { name="rpdo"; version="0.2.2"; sha256="1yzvi4givrwpbs56p2vf0gciaigq50qq0r0n5lyaqk73azzhnhxc"; depends=[curl datacheckr dplyr lubridate magrittr readr stringr tidyr]; }; - 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="1.0.2"; sha256="1pr4s6q9cbw3895c2wal9ydd0fqrcancc35y5nchy0bbmgqagzpg"; depends=[]; }; - rphast = derive2 { name="rphast"; version="1.6.5"; sha256="1jff94hx7skvd6icbrcyabsvz80sgqqv28vz91mcz5jh6v6afhl3"; depends=[]; }; + rpdo = derive2 { name="rpdo"; version="0.2.3"; sha256="150kd9pvfr7msrh55vsqcj8lv994izlvhxf4g5n1qbzdcaqsdjzp"; depends=[checkr]; }; + rpf = derive2 { name="rpf"; version="0.56"; sha256="089n2mmczvvwga8ak3l0p326qsp83d0cz03lc6fhx6a9w5vhl67i"; depends=[mvtnorm RcppEigen]; }; + rpg = derive2 { name="rpg"; version="1.6"; sha256="1vn5cswrkmw98z1dr0f0yjkz3n8kwvjb4zknqg81fzqsagfc89yx"; depends=[getPass RApiSerialize Rcpp uuid]; }; + rpgm = derive2 { name="rpgm"; version="1.1.2"; sha256="0pbja877gb3mn7m78lfdl217dm7qsrblq6gwrjh5wbv1nd532hvz"; depends=[]; }; + rphast = derive2 { name="rphast"; version="1.6.9"; sha256="111m824z7z0lqdj4kk4cp1yfjhx7d5d9463k892dyvgjvkagvi9g"; depends=[]; }; + rphylotastic = derive2 { name="rphylotastic"; version="0.0.4"; sha256="1as3cndbrnby70qbi43q8v5gpyr8fpms30jwsarizwwbdrxbjgw9"; depends=[ape httr jsonlite phylobase rentrez]; }; + rpicosat = derive2 { name="rpicosat"; version="1.0.1"; sha256="1zj2d6jairmvya91vhv9kpkf34zmzl9vlha5yvfjj0j0apmqc0li"; depends=[]; }; rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; }; - 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]; }; + rpivotTable = derive2 { name="rpivotTable"; version="0.3.0"; sha256="0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5"; depends=[htmlwidgets]; }; + rplos = derive2 { name="rplos"; version="0.8.0"; sha256="0l38zllzklsy6q2l2r0v2x8wcsldnxjhilcsq5ykl1k35gbva19y"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; }; rplotengine = derive2 { name="rplotengine"; version="1.0-6"; sha256="1x9lf5h6cmjyi5xyvmk2ii2dwkwmjqbg0m1fhfabay0flqc7qdm0"; depends=[xtable]; }; 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.3.0"; sha256="09q54si187wv2bh2akrdan3d1klx9jczi6bllpl5iwjp1wasxiys"; depends=[DBI raster rgeos RPostgreSQL sp]; }; - rpostgisLT = derive2 { name="rpostgisLT"; version="0.5.0"; sha256="0dvzprhwdqm763b0n82vzj4blns9chlcpp7wkrsm1w67zakn02mk"; depends=[adehabitatLT DBI rpostgis RPostgreSQL sp testthat]; }; + rpostgis = derive2 { name="rpostgis"; version="1.4.0"; sha256="0rgi7ax2n2fln12501zshwaz23nns9qk4vy1ylnaqb4bg0x30gn4"; depends=[DBI raster rgeos RPostgreSQL sp]; }; + rpostgisLT = derive2 { name="rpostgisLT"; version="0.6.0"; sha256="1adwpkfndm6n3s9xcx8zrwnj6bmgvq4nzs072fnl5i6kjy6ngjm6"; depends=[adehabitatLT DBI htmltools leaflet lubridate magrittr mapview rpostgis RPostgreSQL sf shiny shinyWidgets sp]; }; rpql = derive2 { name="rpql"; version="0.5"; sha256="1d5mr04jk08l617zkqn13njglwj0w9an1rix937bcxw69blshahi"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm]; }; rprev = derive2 { name="rprev"; version="0.2.4"; sha256="1krrplgi2qfcm5kdz2am8fq8kjx67gjwxyd4ylf406r18xbvjd1d"; 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.2.0"; sha256="1k6qnc025l4f1klwllf9whd14v389wj2b5a7q5jj2b7d99pfkqri"; depends=[ggplot2 rootSolve survival]; }; + rprojroot = derive2 { name="rprojroot"; version="1.3-2"; sha256="12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz"; depends=[backports]; }; + rpsftm = derive2 { name="rpsftm"; version="1.2.2"; sha256="0xfw2rc8k9nnwzmzf803w5aarhm09hvi8ry5gi21d9n8fxsj1q97"; depends=[ggplot2 rootSolve 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.2"; sha256="0qa9ml4kmmm0r06akf9azra0z3903w1qfi2zkvzhxahp508l20gs"; depends=[lme4 pbapply]; }; + rptR = derive2 { name="rptR"; version="0.9.21"; sha256="0wqh9d372s2222qm5w0wx77l2sj7zvdnl7zvxcn5wfs3cz84fj15"; 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="2.0"; sha256="13m21v753njaramgpbhn0lb793b6946crv5v8vl127w38q0z3wyd"; depends=[quantreg regpro]; }; + rquery = derive2 { name="rquery"; version="0.4.0"; sha256="080q99q5bkhdxbnd2xg3mjpyvj3ad2lvvay845h50s9c9gpsn9wp"; depends=[DBI RSQLite wrapr]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; - rrBLUP = derive2 { name="rrBLUP"; version="4.5"; sha256="19xzlmbi43nywyxcydcjzbs9a175fcwps5ndnvkz7xp2g3lnpcdq"; depends=[]; }; + rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; 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.7.1"; sha256="03qdpy6n1f4bqnpladzp0qc3ky7ccdjr176m6pla7x205pll03w7"; depends=[ggplot2 knitr MASS Rcpp registry]; }; + rrecsys = derive2 { name="rrecsys"; version="0.9.7.3"; sha256="034p7ncnzlkniicl5nd58m9wjy7mc00f027zpg5das226svhfywf"; depends=[ggplot2 knitr MASS Rcpp registry]; }; rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; }; rredlist = derive2 { name="rredlist"; version="0.4.0"; sha256="0j2hab26zs9dyg9fggza7yffbvwvnmrk5frbfs2ys8h3hg2x6ncy"; depends=[crul jsonlite]; }; rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; }; + rreg = derive2 { name="rreg"; version="0.1.2"; sha256="06zang5m39bla4c5wxb9p4fgrn66a69l190z5gnsyp8r6b166x3p"; depends=[directlabels ggplot2]; }; 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]; }; + rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; }; + rrpack = derive2 { name="rrpack"; version="0.1-7"; sha256="0svrw2ik59hjyfb0kag4nv8ilcaz7irmkp7ndbxxn0jg7dacb411"; 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]; }; - rsMove = derive2 { name="rsMove"; version="0.2.1"; sha256="1vi4gb30sibmyvng56r0m4fl256ql5838nnarc9mjfm8hiq67rdy"; depends=[caret gdalUtils ggplot2 httr ncdf4 raster RCurl rgdal sp XML]; }; + rsMove = derive2 { name="rsMove"; version="0.2.3"; sha256="0s256ifiq76rakabw2jn5jslsdd0r55cy7hm55214pgjfq8fiqpi"; depends=[caret gdalUtils ggplot2 raster RCurl rgdal sp]; }; rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; - rsample = derive2 { name="rsample"; version="0.0.1"; sha256="1l2b6wy9pgq84c40wpj5rnbx25cdp226fw6lmx93wri29a613652"; depends=[broom dplyr purrr rlang tibble tidyr]; }; + rsample = derive2 { name="rsample"; version="0.0.2"; sha256="10lmpy4ca045j2fxbz5xzl1w9242dkp6sc8hhrk0fxs0dkfb7amf"; depends=[broom dplyr purrr recipes rlang tibble tidyr]; }; rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; - rscala = derive2 { name="rscala"; version="2.3.5"; sha256="0y92n0fciz0sn23i992p64smq8q9llj8yvwz5crqjjp9yv23hxcd"; depends=[]; }; + rscala = derive2 { name="rscala"; version="2.5.1"; sha256="0az638dlg7nqhj7xf1bwcpv9anqqcif8ni4a8q68lcn2sxb4wamp"; depends=[]; }; rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; }; - rsconnect = derive2 { name="rsconnect"; version="0.8.5"; sha256="0y2sajcw1yngig06l7bxzcw993jbx13fl47fag9fa4f70qpnnwmq"; 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]; }; + rsconnect = derive2 { name="rsconnect"; version="0.8.8"; sha256="019phwamg2irb0ak9y0sn25ihi0a9sfdpa02dz9x0bhpcg55x0li"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; }; + rscopus = derive2 { name="rscopus"; version="0.5.3"; sha256="1d6265ffmhd6ajlp607y5jy77nqgcrdym6w1j8vnil0705z3swzb"; depends=[httr plyr tidyr]; }; + rscorecard = derive2 { name="rscorecard"; version="0.7.0"; sha256="02bjkk03cppd88dljxj72lngwryhbbffvin8h3fkl7jkcaccsq1z"; depends=[dplyr httr jsonlite lazyeval magrittr]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; - rsdmx = derive2 { name="rsdmx"; version="0.5-9"; sha256="0wgwd7087xb811fmi9n16f33v1gf2b50mwx2zk1298fv57rx5bil"; depends=[plyr RCurl XML]; }; + rsdmx = derive2 { name="rsdmx"; version="0.5-11"; sha256="06sjkjl9y2fg2yz740a1z5zn4afnjfv1nsykszxsnwn7s23rxi31"; depends=[plyr RCurl XML]; }; + rsed = derive2 { name="rsed"; version="0.1.2"; sha256="1rk7wkidvdn1d39a11cbgglz2dg74bbv3v1ijjdx903kgwg3nnrc"; depends=[Smisc]; }; rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; }; rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; }; rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; }; 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]; }; + rsimsum = derive2 { name="rsimsum"; version="0.3.0"; sha256="11zc6ga4d4i9bilmbfinkanv3fkz8xpcikc38mxf88lv9jfv0kx1"; depends=[checkmate ggplot2]; }; rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; }; - 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]; }; + rslurm = derive2 { name="rslurm"; version="0.4.0"; sha256="1ck4ky5d0pf8hnxz1ijbjk0nfyj1hfnhf9la5qrqw2spa09z82ki"; depends=[whisker]; }; + rsm = derive2 { name="rsm"; version="2.9"; sha256="1rj2qdlv44hbv1ipv7hdpssn90ypp6bfc7nqdaf9dak0bd6khwni"; depends=[estimability]; }; rsnps = derive2 { name="rsnps"; version="0.2.0"; sha256="10g1b2i2mp0b4p78iiy83sz2jwz73xfjkhc6ih4ag2wmbdmwf9pb"; depends=[httr jsonlite plyr stringr XML]; }; rsoi = derive2 { name="rsoi"; version="0.3.0"; sha256="0syl90akbbg50pyhsa4nyq2r4psi2n6qg48a4nxprgz412n8rjbv"; depends=[dplyr lubridate readr]; }; rsolr = derive2 { name="rsolr"; version="0.0.8"; sha256="1swhg7hnkdphnw0d9jrzn18nk2v5a6ny7n652fh8d0k88a27xx4d"; 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.2"; sha256="0ji7890ba6ry553kgffsgsqmk5lawg3jyd4y6y59a2a4ysvvwq8z"; depends=[h2o sparklyr]; }; - rsq = derive2 { name="rsq"; version="1.0"; sha256="151f7pngx54wpawb5hchacj0rbymdzyki16fkj9291cfz1cqbcx9"; depends=[MASS]; }; + rsparkling = derive2 { name="rsparkling"; version="0.2.3"; sha256="1dskwni79hrskwmlvlbm4v9fy59bvzgcjqwsdqk31iz3xfaanj39"; depends=[h2o sparklyr]; }; + rsq = derive2 { name="rsq"; version="1.0.1"; sha256="1c7604g48rcsbfk66xfwia1jaxlqsjiw19zx9pg51n8d6c0l17zb"; 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.16.2"; sha256="0irqh4ggk23s3c0ipihwv8m0qmkxh5j7vdxgnsarhqca6254r2vb"; 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]; }; + rstan = derive2 { name="rstan"; version="2.17.3"; sha256="10fdasqbdwlisnm7hjmgl5f027ypfhni86d1c5fykb09g1pvkjz3"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; }; + rstanarm = derive2 { name="rstanarm"; version="2.17.3"; sha256="196fi09fpxf3v0kbdf6ci6f8c0mw1vx3g30cmkvl5rm17abhwifs"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; }; rstansim = derive2 { name="rstansim"; version="0.1.1"; sha256="09hg4ishzp6q90nrl94h21al0ad0jn7fr8brp8f0xa9cvkwlzjpg"; depends=[doRNG doSNOW foreach loo Rcpp rstan]; }; - rstantools = derive2 { name="rstantools"; version="1.3.0"; sha256="080mn4yh7fhd5qww1zr6l14gfsk5d6fakm8x2lmsqkn42j2i6cw9"; depends=[]; }; + rstantools = derive2 { name="rstantools"; version="1.4.0"; sha256="1k1nhcy0d2lcnllrdslk4p2d6cp12s5v2vzl5j7l9c7l24syq2ar"; 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.4.1"; sha256="0pgy9a8llj0zzzc06afzd0w11mdbx3xvmjf0qpzvsid1zqdbcqxr"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; }; @@ -9831,54 +10464,55 @@ in with self; { 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]; }; rsurface = derive2 { name="rsurface"; version="1.0.2"; sha256="0lmwk8gk9h9np5fp652zvlapfdwgifarmib23dnifn5d904ia2sl"; depends=[plotly rsm]; }; - rsurfer = derive2 { name="rsurfer"; version="0.1"; sha256="1qxnvhlwdiianzkj3hidg1qkqzai0ds8k1y67cvjlfcdyy4f01w9"; depends=[gdata stringr]; }; - rsvd = derive2 { name="rsvd"; version="0.6"; sha256="0vrsgxbbk5n51i1s80bixcxph2ws86zpbdqs81yfvnzghrc99nas"; depends=[]; }; + rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; }; + rsvd = derive2 { name="rsvd"; version="0.9"; sha256="1d71y4r27gpwsaq195yys301va8wdc2bvwxjk6501f7ma2yhl7y9"; 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.7-3"; sha256="13fd49c92yh5pb3lnqf7abikp1jzzainqpbs555dg532i7f2j9zx"; depends=[evd gsl msm Rcpp]; }; + rtdists = derive2 { name="rtdists"; version="0.8-1"; sha256="0chhlnx3zppsxxwnq3h2aykdpm6zcg2nmrdgxfy14yw133fnbykf"; 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]; }; + rtfbs = derive2 { name="rtfbs"; version="0.3.9"; sha256="02irj6c7nfgp42yb5zdmhbr5pi09xgx0z76d1ccfczjf0r1cyvfz"; depends=[rphast]; }; 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.5.0"; sha256="1z8iaxkvd99fnk46vzbw6lax2qayng6s5n1sxn78kvp8py552f61"; depends=[crul data_table dplyr jsonlite tibble]; }; rtimicropem = derive2 { name="rtimicropem"; version="1.3"; sha256="1z7nrmzwdgz7fy2i23rl07jd39sdxqsdmmmkaaxzagj7whd58inj"; depends=[changepoint dplyr ggplot2 knitr lazyeval lubridate pathological R6 rbokeh readr stringr tibble tidyr]; }; - rtip = derive2 { name="rtip"; version="1.0.0"; sha256="1xkw0m4fnwbsqqyhvxhsia3hlpjb2qhs6y0c4g7f7qa7f0ibcbja"; depends=[boot ggplot2 mvtnorm plyr]; }; - rtk = derive2 { name="rtk"; version="0.2.5.3"; sha256="1jislv9kw858rv9wkj1ff6d8bfrw0h779d5yhfxw4kgb48jci6rn"; 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]; }; + rtip = derive2 { name="rtip"; version="1.1.0"; sha256="1fpxg85lhdvc68rr13x1w7k9s7j0cwsc18gc579bd44jqpgfkw72"; depends=[boot ggplot2 mvtnorm plyr]; }; + rtk = derive2 { name="rtk"; version="0.2.5.4"; sha256="1nh757l4ih5pmmh7b84ca1f5wpz9mcksdb0a4rvs2hhgap38ihg9"; depends=[Rcpp]; }; + rtkore = derive2 { name="rtkore"; version="1.5.1"; sha256="03vmgrsil5yrrs3ndgqvfcwv9plcawc8v2y2x9nwcashxg40djn6"; depends=[Rcpp]; }; + rtop = derive2 { name="rtop"; version="0.5-13"; sha256="1md9sgsmbc3jv1lc4l6r26830k9vjljjqpzzna4s23bn6ky7glgp"; 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-38"; sha256="1m9kir2snfhxyagsflp4cyii33ycw4fr0f8bn7r92757l92i7vr7"; depends=[raster RCurl 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]; }; + rtweet = derive2 { name="rtweet"; version="0.6.0"; sha256="0bh483wfl4f8xscdyv3ys5hhdabc91dynlbqlxxv8mil7pgg3chg"; depends=[bit64 httr jsonlite magrittr openssl readr tibble]; }; rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; }; - rtypeform = derive2 { name="rtypeform"; version="0.3.1"; sha256="1aavmyc7siy1834j1zmgkir24kkk0069hn27422i4fpklg8jywqk"; depends=[httr jsonlite purrr]; }; + rtypeform = derive2 { name="rtypeform"; version="0.3.3"; sha256="13nqlgi4wwby8ka014ggilnh2m4qr940zbsks27zfd7q56ng7sbq"; depends=[httr jsonlite purrr tibble]; }; + rubias = derive2 { name="rubias"; version="0.1.0"; sha256="0k8f1aaj3zpxqkhzjfl7iyyx7pjssp5lldajjsghw110j75qksh4"; depends=[dplyr ggplot2 gtools magrittr Rcpp readr rlang stringr tibble tidyr]; }; rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; }; - 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]; }; + rucrdtw = derive2 { name="rucrdtw"; version="0.1.3"; sha256="0wbh9zbgqf5bk1ix5qry18lhgdqk90pn5xnv401268gldjy4z777"; depends=[Rcpp]; }; + rugarch = derive2 { name="rugarch"; version="1.4-0"; sha256="0b0rq88v93945g7pr6xin7wfdm8zl2vw8hxwa2kfak4xnrrprsyy"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; + ruler = derive2 { name="ruler"; version="0.1.2"; sha256="1d0vf505fyinq4k2lfcvsii9fxs2xygfj5hrcwd566arpd2wkg7m"; depends=[dplyr keyholder rlang tidyr]; }; 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.2.3"; sha256="13aa8hq2zzzm1ydcva1067shxasqwhyfc4mxyvp4gsspgbpf8q2n"; depends=[Rcpp RcppArmadillo spatstat]; }; + rusk = derive2 { name="rusk"; version="0.1"; sha256="05ci4f0k2b54sqf0h6j38h3kkq3r27klva0hfg968snr9bb6v0wv"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; }; + rust = derive2 { name="rust"; version="1.3.4"; sha256="1jb970kskl2wdhqcjbxl8gh986abdy96jbipnsdi3656ic5dxivn"; depends=[Rcpp RcppArmadillo spatstat]; }; ruv = derive2 { name="ruv"; version="0.9.6"; sha256="12zi775nx6k1j9sz691x6r9r0arfnhwddf5nxbr1xk25dj9qa210"; 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.9"; sha256="14pa7fa7yyhmk0v5md7x5xr5jd4gjwjlvgbynnhq30fj56qffyvf"; depends=[]; }; rversions = derive2 { name="rversions"; version="1.0.3"; sha256="0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"; depends=[curl xml2]; }; - rvertnet = derive2 { name="rvertnet"; version="0.6.0"; sha256="1xxk4951vdg7qd1bn0hnnrsgnamdayc0vdw6kswpkbnzi9bfsmdk"; depends=[crul dplyr ggplot2 jsonlite maps]; }; + rvertnet = derive2 { name="rvertnet"; version="0.6.2"; sha256="12qffkkl3yqiqh0zi4zrj6irv7jnylja7fv21h3fnjpvqwkazv8a"; depends=[crul dplyr ggplot2 jsonlite maps]; }; rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; }; - rvg = derive2 { name="rvg"; version="0.1.5"; sha256="1ssvglkq8f0zmrsn55nwfw8zrsk9nlsb3mbvhmnzg4xl967zdfwz"; depends=[gdtools officer Rcpp xml2]; }; + rvg = derive2 { name="rvg"; version="0.1.8"; sha256="03hank94b5d1spig9jzrm5h2xbipi8skwqjg8sfwxwy5sjyrbaam"; depends=[gdtools officer Rcpp xml2]; }; rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; - rvinecopulib = derive2 { name="rvinecopulib"; version="0.1.0.1.1"; sha256="015cmq7hdizzb49jr0y6zgrr4ncwn17s166r3bbfnln814bq6g86"; depends=[BH lattice Rcpp RcppEigen RcppProgress]; }; - rwalkr = derive2 { name="rwalkr"; version="0.3.1"; sha256="04pkzifj1gx7915s8d3gq9w90vcpy8lchag6r72qg4p78lq1qjbk"; depends=[dplyr httr tidyr]; }; + rvinecopulib = derive2 { name="rvinecopulib"; version="0.2.7.1.0"; sha256="1w3nwxpvmmkcvyymhz434xh6srjc87hj824bcjydmavx221ncf6p"; depends=[BH lattice Rcpp RcppEigen RcppThread]; }; + rwalkr = derive2 { name="rwalkr"; version="0.3.2"; sha256="0vp7iizc6bn3y30vcrvksy91aiid52q01vgzjphc5m5sy99gsxj2"; depends=[dplyr httr tibble tidyr]; }; rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; }; rwc = derive2 { name="rwc"; version="1.1"; sha256="0gdpskj87wjnpas90i3iqn1qv6frrki2xqiyyakg3zpaviw1imag"; depends=[MASS Matrix mvtnorm raster]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; @@ -9886,14 +10520,14 @@ in with self; { rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; rwt = derive2 { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; }; rwty = derive2 { name="rwty"; version="1.0.1"; sha256="1w66jlcbn8javlr2l0qinah3cxxadpjzvbz088saysyg277ikfxm"; depends=[ape coda GGally ggdendro ggplot2 phangorn plyr reshape2 viridis]; }; - rwunderground = derive2 { name="rwunderground"; version="0.1.6"; sha256="1q6dn635xshr0sp7iswya1fqqrj5y5xgzyssmmijmrb2s8v52sdr"; depends=[countrycode dplyr httr]; }; + rwunderground = derive2 { name="rwunderground"; version="0.1.7"; sha256="1mdqlijjximfxqd9bx4hnsayq9h3ss7fp3hr2vxx2qb60b0fjx67"; depends=[countrycode dplyr httr lubridate]; }; rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; }; - rxylib = derive2 { name="rxylib"; version="0.2.0"; sha256="0x02mapz5ym9sd5cq4c077sa39ykdgn0rzmj43ws0mm9fs9li8w9"; depends=[BH Rcpp]; }; + rxylib = derive2 { name="rxylib"; version="0.2.1"; sha256="0qfdd7z9as6igc82i8dbvjz03jk8scxz599jw8xm69y5qs5zf104"; depends=[BH Rcpp]; }; 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.2"; sha256="0vlh9q5d5mddajxn87nbmjmxx99hn5bsj29pzwkn4mvxs1xa80bi"; depends=[]; }; - s2 = derive2 { name="s2"; version="0.1-1"; sha256="1k6329ra119ygb0z496894s4yra7f4dsg1ghpdk8k3ashd9yh6gd"; depends=[Rcpp]; }; - s20x = derive2 { name="s20x"; version="3.1-23"; sha256="0bncgwn3l1wnjsqncidd941ljcbl7rdfbxklgl8q8jy63zq80hpk"; depends=[]; }; + rzmq = derive2 { name="rzmq"; version="0.9.3"; sha256="04rb54gr1wr0nczxnhk5jbk9ar65yn2vs8bsa41i1hfhzjhnsvxb"; depends=[]; }; + s2 = derive2 { name="s2"; version="0.3-0"; sha256="16258mmp4rkfpqa6255s7fdd44why0vky2rxb52440fgpwic5zdq"; depends=[Rcpp]; }; + s20x = derive2 { name="s20x"; version="3.1-26"; sha256="1p931r8y4c9fac8x29sxw33q1knfjf78saj348mxddaaqrf90v1n"; 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=[]; }; @@ -9902,8 +10536,9 @@ in with self; { sEparaTe = derive2 { name="sEparaTe"; version="0.2.1"; sha256="0k1c0wa052f1fprc9jn0i3g2cawxfhkan998jlhkr4iy986jynw9"; depends=[]; }; 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.2.0"; sha256="11qxdr55axhx497vasphjfdlvwq9gpsd0q8dx0ypk7bf8dcf7kaf"; depends=[car ks MASS Matrix pbapply plotrix rgl]; }; + sGMRFmix = derive2 { name="sGMRFmix"; version="0.1.3"; sha256="19kfcg36yvwcsq24cn16s5zv9l42rnd9yk2p85j40d6f00ncivkr"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; }; + sNPLS = derive2 { name="sNPLS"; version="0.3.31"; sha256="0ja2f4n000r7cvf0jj2qypa5mfkikig47hfpqwh4611sl70qgx2y"; depends=[car ggplot2 ks MASS Matrix pbapply plotrix rgl]; }; + sRDA = derive2 { name="sRDA"; version="1.0.0"; sha256="0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk"; depends=[doParallel elasticnet foreach Matrix mvtnorm]; }; 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]; }; @@ -9911,7 +10546,7 @@ in with self; { sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; }; saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; }; sadists = derive2 { name="sadists"; version="0.2.3"; sha256="17jlzx5h5l1w7riz0rs99w31n6lxnnxwzbzqn2z5r292j2nxvmkw"; depends=[hypergeo orthopolynom PDQutils]; }; - sads = derive2 { name="sads"; version="0.4.0"; sha256="1pqbdg2vxh18lg0vpi5yrh6j0nv58yzjrzahic3bdyy1lwaahdg3"; depends=[bbmle GUILDS MASS poilog VGAM]; }; + sads = derive2 { name="sads"; version="0.4.1"; sha256="1ir5cfjw3416gg7bvfp2qrn9qy1xbklb9a57rp06ghjg7d4slwpr"; 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]; }; @@ -9919,13 +10554,14 @@ in with self; { saemix = derive2 { name="saemix"; version="2.1"; sha256="1g52vkqg2dfld7miakkmp23yf4yzc7ka0hbg2fl6ya9cq9m7wyqq"; 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]; }; + safer = derive2 { name="safer"; version="0.2.0"; sha256="0659xn8jzd5md2mm71p4036ljrfvlhkfshsgidx7l2k9ig532059"; depends=[assertthat base64enc sodium]; }; safi = derive2 { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; }; samon = derive2 { name="samon"; version="4.0.0"; sha256="0pvv93ahh0i69ncc3sic9481wd5rv5dfxysxyzkl61ds3yvrr09v"; 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]; }; + sampSurf = derive2 { name="sampSurf"; version="0.7-4"; sha256="0azs8d1d4cp5vzrlzpn2lbqmbha6rxq109apg6hr2hf7i81g19d7"; depends=[boot lattice latticeExtra raster rasterVis sp]; }; + sampleSelection = derive2 { name="sampleSelection"; version="1.2-0"; sha256="1s3p5fvvxkjkm6vjpxi3rw8ncbmyvqpfb0gghcvf2sspdyzam1s2"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; }; samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; }; samplesize4surveys = derive2 { name="samplesize4surveys"; version="3.1.2.400"; sha256="16q8pird6ic7001i3gkwqb2rlak9l853bf2m1y9njmdprsjs82yl"; depends=[TeachingSampling timeDate]; }; + samplesizeCMH = derive2 { name="samplesizeCMH"; version="0.0.0"; sha256="0gdywqmylid4fkz5syzf1wgcan71whhm9gjylmsg4p05hlwvpv1d"; depends=[]; }; samplesizelogisticcasecontrol = derive2 { name="samplesizelogisticcasecontrol"; version="0.0.6"; sha256="1xznql86r6snkkmk9g05jhdam06pr0qmg40mdzasl291nc50v5aa"; depends=[mvtnorm]; }; sampling = derive2 { name="sampling"; version="2.8"; sha256="06pj7dan0mknpsblmlnk7am78qrnwgnql5vvx7vmbfvib7rj6s9m"; depends=[lpSolve MASS]; }; samplingDataCRT = derive2 { name="samplingDataCRT"; version="1.0"; sha256="0ah3fi2sn642c8nicikhjhl1hdsjzshrf1j02swq0jaqggcqjdvk"; depends=[mvtnorm]; }; @@ -9936,13 +10572,14 @@ in with self; { sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; }; sandwich = derive2 { name="sandwich"; version="2.4-0"; sha256="1h6c12cfv2x42laxf6ifxfk9hqzagvvvimzak88fv8vnxnf5nc9l"; depends=[zoo]; }; sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; - sankey = derive2 { name="sankey"; version="1.0.0"; sha256="0wm10f514sg3gfrz291k720kznnyssznyvr49c15i26bhb82m0q0"; depends=[simplegraph]; }; + sankey = derive2 { name="sankey"; version="1.0.2"; sha256="0jvcr2bn69aklfbgj4hbsrc047mymrx0jmsg26m0g6w7n1igqvcw"; depends=[simplegraph]; }; sanon = derive2 { name="sanon"; version="1.5"; sha256="1iikm7ivlz87kbq0ax9r1dz29zdq1kmhxd2imzc4hkvr1rwgciv6"; depends=[]; }; + santaR = derive2 { name="santaR"; version="1.0"; sha256="10g4z951mpxw9d21s5f6zwfch5xs9vx812fb0wyrbw9s8drmlbkh"; depends=[doParallel foreach ggplot2 gridExtra iterators pcaMethods plyr reshape2 shiny shinythemes]; }; sapa = derive2 { name="sapa"; version="2.0-2"; sha256="056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds"; depends=[ifultools splus2R]; }; - sarima = derive2 { name="sarima"; version="0.4-5"; sha256="1qhw9csfci1z9wsf3rylhfhw59180qhn575xlwmi1zvp179hlmrj"; depends=[FitAR FitARMA lagged ltsa PolynomF portes]; }; + sarima = derive2 { name="sarima"; version="0.5-2"; sha256="00xlfd8hrplxn66k2nfc7ivyacrr6rqgsv9ylsjynibpidvkkn17"; depends=[FitAR FitARMA lagged ltsa PolynomF portes Rdpack]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; }; - satellite = derive2 { name="satellite"; version="1.0.0"; sha256="0kzy2rhvs4g78sndnj0mj2cs35sbkj9dkjlhkxdf3ibrbx4lisqx"; depends=[plyr raster Rcpp]; }; + satellite = derive2 { name="satellite"; version="1.0.1"; sha256="1g8zzlsdvb56l2jph7i5wjgbpyx5dkwa3nv8mzmg0qyh3zd9pyi0"; 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=[]; }; @@ -9952,9 +10589,9 @@ in with self; { sbgcop = derive2 { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; }; sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; }; sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; }; + sbpiper = derive2 { name="sbpiper"; version="1.5.0"; sha256="0ighjp1934y3f6myl60fjxman7333yi9fnhhk3d5xgazsfb8bnnp"; depends=[colorRamps data_table ggplot2 Hmisc reshape2 scales stringr]; }; sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; }; sbtools = derive2 { name="sbtools"; version="1.1.6"; sha256="1wvd7xbkfyx88bi1vz30c6jb20fgsrcgpvkw4g4ym0966vhv1ca1"; depends=[curl httr jsonlite stringr]; }; - sca = derive2 { name="sca"; version="0.9-0"; sha256="1xqdcxxsrsl8v2i8ifqcgb38vayz8ymay2sw4m9hmpma54a6r9j5"; depends=[]; }; 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]; }; scaleboot = derive2 { name="scaleboot"; version="0.3-4"; sha256="16shdj4b8pbdbphqzw7r5xzx6k2qfkr729inv21gkp9qcp4h0vrm"; depends=[mvtnorm pvclust]; }; @@ -9963,20 +10600,21 @@ in with self; { scalreg = derive2 { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; }; scam = derive2 { name="scam"; version="1.2-2"; sha256="04w0y2l4h3xddb6mzyhf0mcx6kbphrmjyfc59cqw9z88sssfrmm7"; depends=[Matrix mgcv]; }; scan = derive2 { name="scan"; version="0.20"; sha256="1xyng9dlfmp7n2h91n4xy9lx3jm205gjiizdqk1yj1qw8mmahvqc"; depends=[nlme]; }; - scanstatistics = derive2 { name="scanstatistics"; version="1.0.0"; sha256="0mgrjkn4yhpyjv313d4arnaipv107nlcbkqzvkv6b2c97z57mpds"; depends=[dplyr emdbook gamlss_dist ismev magrittr plyr purrr Rcpp RcppArmadillo reliaR sets tibble tidyr]; }; + scanstatistics = derive2 { name="scanstatistics"; version="1.0.1"; sha256="147fhq34vqkq50bw0g3a112048s5jaxxcwm3iv5wykp8zl45msmz"; depends=[dplyr emdbook ismev magrittr plyr purrr Rcpp RcppArmadillo reliaR sets tibble tidyr]; }; scape = derive2 { name="scape"; version="2.3-1"; sha256="0maccnkhn7wf6brwnb5b7nh2yx3afx0h7kji2475mvg19909mddq"; depends=[coda Hmisc lattice]; }; scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; }; - scatterD3 = derive2 { name="scatterD3"; version="0.8.1"; sha256="1fyk2z8ari73nbah2r4c677nm3v0whfia6sh39gr674cczp6vc8q"; depends=[digest ellipse htmlwidgets]; }; - scatterpie = derive2 { name="scatterpie"; version="0.0.7"; sha256="0bfzhpakdwlps900dnsp6b5hrrmi02jcmk31afp4pixyj3r7h3c8"; depends=[ggforce ggplot2 tidyr]; }; + scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; }; + scatterD3 = derive2 { name="scatterD3"; version="0.8.2"; sha256="1cfh060ffwxy33b1f7n8mba1sbbwgx28mqn08im16dqbphkcmx1z"; depends=[digest ellipse htmlwidgets]; }; + scatterpie = derive2 { name="scatterpie"; version="0.0.8"; sha256="1dfwz83hxdms7qglsz540wszzcd5hfmjzw440c93jgi18n6kx9s4"; 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]; }; + scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; }; 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="1.0"; sha256="0qsbpza1x6kjs4jizg9fvhg0q5s05b5s6jv7r4fjajq9552dc83c"; depends=[]; }; - schwartz97 = derive2 { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; }; scidb = derive2 { name="scidb"; version="2.0.0"; sha256="079akdsxxjnca5jsv0grw1c2nd3dl368xhy4mzm94mh5j6ghi57l"; depends=[bit64 curl data_table digest openssl]; }; scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; }; scifigure = derive2 { name="scifigure"; version="0.1.1"; sha256="0wfvg0c9hbdc3ipsnq6nkf7k9hf8yl27aqg012nqk9ynlwp9qa56"; depends=[]; }; @@ -9985,58 +10623,64 @@ in with self; { 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]; }; - scorecard = derive2 { name="scorecard"; version="0.1.0"; sha256="08fmlbg2r149dynbdn1dynknmxy6a98bcsry1fsffmris6g84a0m"; depends=[data_table ggplot2 gridExtra]; }; + scorecard = derive2 { name="scorecard"; version="0.1.5"; sha256="1cf4cmn3csbv1l3nnr3873vszp7xb5v4864g072mwzg7xr1maj4w"; depends=[data_table ggplot2 gridExtra]; }; scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; }; - scoring = derive2 { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; }; - scoringRules = derive2 { name="scoringRules"; version="0.9.3"; sha256="1n26k9vg95gq292xgva65wnzk2whfrpyw8ngq7h8jd5zn9by7fpl"; depends=[MASS Rcpp RcppArmadillo]; }; + scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; }; + scoringRules = derive2 { name="scoringRules"; version="0.9.4"; sha256="0m8050qqb3j0miwfbadp6lmd2q5vicsqn4waw4jszz52fhb8mv27"; depends=[MASS Rcpp RcppArmadillo]; }; scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; }; scpm = derive2 { name="scpm"; version="1.0-2"; sha256="0jrr90lcalchfqmq5c8ja7ws88rpri3gjdc5z4jfpazn2vznx26n"; depends=[geoR interp lattice MASS Matrix mvtnorm RandomFields rgl]; }; + scraEP = derive2 { name="scraEP"; version="1.0"; sha256="1pmab2nhymb7vjfg7vysqn2cs9apdkwxgi55qn8kjg2g5r0098p7"; depends=[RCurl XML]; }; 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=[]; }; - scrm = derive2 { name="scrm"; version="1.7.2-0"; sha256="1i4mdymds8xmxcxzc7a9lcmy2q11gmdgnfbm2hircf07j5pbb2d8"; depends=[Rcpp]; }; + scriptexec = derive2 { name="scriptexec"; version="0.2.1"; sha256="09gaccqadb51ia66xk9vi3p9472s82bg6v8i6ba390g04yipbipi"; depends=[]; }; + scrm = derive2 { name="scrm"; version="1.7.2-1"; sha256="123rxx1a13fbv975hp9f9rjcigp8vfai7679wbn9dlyvph5nivaz"; depends=[Rcpp]; }; 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.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; }; 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.3"; sha256="1kl61n3y7h9ay96nd5ijis45siimzf03xvdr0ic0ih8mlswl9nbn"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; }; + sdcMicro = derive2 { name="sdcMicro"; version="5.1.0"; sha256="06rnnm5g7rpbbxgdb9sl7gkcimdbx1qmgzg5d2n0jl4b81jac2n2"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; }; sdcTable = derive2 { name="sdcTable"; version="0.22.8"; sha256="134a0g1v5w9airckn1bqp4k7hv2dcl5kmb1hx78nw5s8h92y3gkc"; 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-41"; sha256="083agia8091k0c44alrpxm9qqz74f1i9xycaxkfj7f626p8f6qjj"; depends=[raster sp]; }; + sdm = derive2 { name="sdm"; version="1.0-46"; sha256="14z8336yxja1j7mx8xszqqi6s24nk6r5bycmw8h01wvq4rqgxi4g"; depends=[raster sp]; }; sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.6"; sha256="1kbgv5x5ilzccafl20x86fi9f7jqxnccvb8k7dy8q41s9n36qwfs"; 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=[]; }; + sdols = derive2 { name="sdols"; version="1.4"; sha256="1wamzpw8q55a5zkvk21c3hilr97lxz1yq3b0dcfgcdvcqap2i14w"; depends=[commonsMath rscala]; }; sdprisk = derive2 { name="sdprisk"; version="1.1-5"; sha256="1c6mipq8sh8347i7m7dh47f69fr21xkrsk8yjgsdvcy41h8zijmf"; depends=[numDeriv PolynomF rootSolve]; }; sdpt3r = derive2 { name="sdpt3r"; version="0.1"; sha256="06mw1h6c8gkhi3vhal17h7px3bb277xz15k2ryqjwc7agzwhmv8c"; depends=[Matrix]; }; 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.2"; sha256="048wbzap9pc7iv7lh9rzdxawbnnjd6lmw7bfadry5xnw26p6vnad"; depends=[gsw oce]; }; + seaaroundus = derive2 { name="seaaroundus"; version="1.2.0"; sha256="09nyypzylb0y04ssd9ak2cw8wpy6a3nmabg9p7jrc8qz54wl6z4q"; depends=[crul ggplot2 jsonlite maps rgdal scales sp wicket]; }; + seacarb = derive2 { name="seacarb"; version="3.2.6"; sha256="1036hrmgv7xn0khddbfdg0p9d4hmhhxxb3fd7fysjmzlk7k7naqb"; 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]; }; + searchConsoleR = derive2 { name="searchConsoleR"; version="0.3.0"; sha256="1z8bdlxq2sk8bcg164wy0yrmsx0inf0aj5ya2pybvadss8wr0qlr"; depends=[googleAuthR stringr]; }; searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; }; + searcher = derive2 { name="searcher"; version="0.0.2"; sha256="0lj7zyqldr8m7ky20frzaxmf9by2h3p89ibwsa7dyrf378swkwwj"; depends=[]; }; 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.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="3.1.0"; sha256="0g2fmfbxf69jy2r8adw0hpwhb3a3s9ya9vzjw91l84rid50l4900"; depends=[abind MASS mgcv nlme raster sp]; }; - secrdesign = derive2 { name="secrdesign"; version="2.4.0"; sha256="0v9d94ra614884imv29qwhr4zkx3dzssdpz8nv86k1kigx51w1xp"; depends=[abind secr]; }; + secr = derive2 { name="secr"; version="3.1.5"; sha256="1sxapy8h1kx4fk405j6nanvdl5g9gz4arg0v15cmhb4plij3mg3c"; depends=[abind MASS mgcv nlme raster sp stringr]; }; + secrdesign = derive2 { name="secrdesign"; version="2.5.4"; sha256="1kbqgdjpyns11ag16rgw9n6mvmjgdypk9lv3yzwf4kynds46wbbk"; depends=[abind secr]; }; 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]; }; + secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; }; secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; }; + securitytxt = derive2 { name="securitytxt"; version="0.1.0"; sha256="117xmhclv219ci8vki8ni8yqvlnwgj0pd8n0r752wd8333y130wr"; depends=[Rcpp]; }; seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; }; seedCCA = derive2 { name="seedCCA"; version="1.0"; sha256="1grs6ykiyp8p5gh93hgb4niggppbh2wzwl6yx0l1qs9fkcz5zvy7"; depends=[CCA corpcor]; }; seedy = derive2 { name="seedy"; version="1.3"; sha256="1a21sl8i7z12cjaqj08lkq3viazxlgxv82vaarm58fgbpsvdi0m0"; depends=[]; }; - seewave = derive2 { name="seewave"; version="2.0.5"; sha256="1ml0jcqb6i6v0xgarvzg51rgax6lsf6y2255jq1kfz4v8n39vnh0"; depends=[tuneR]; }; + seewave = derive2 { name="seewave"; version="2.1.0"; sha256="0i0zhvgl64fwpabnwvfdxndmw5whhh2fd4lhpg399w4rzrwzv92y"; depends=[tuneR]; }; seg = derive2 { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; }; + segclust2d = derive2 { name="segclust2d"; version="0.1.0"; sha256="0kymw36cvakx84c96npkbnsvv0a1s82773ib5c802ybvkb2r1k9p"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; }; segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; }; - segmented = derive2 { name="segmented"; version="0.5-2.2"; sha256="1wdjxkgqjqw5q2nywmgkf6y21lb0alhvaqg0m0dr2xyxf1ii79rs"; depends=[]; }; + segmented = derive2 { name="segmented"; version="0.5-3.0"; sha256="0nrik5fyq59hwiwjcpbi4p5yfavgfjq6wyrynhkrbm4k6v1g1wlq"; depends=[]; }; seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; }; seismicRoll = derive2 { name="seismicRoll"; version="1.1.2"; sha256="183lx9lgmi06lv1l4gbmlmblfgjzhph4aavdnxrykpp6122hsq61"; depends=[Rcpp]; }; sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; }; @@ -10044,8 +10688,8 @@ in with self; { 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.3"; sha256="1fbfnbysy4zzkkwc2w3gkqwficfzn176sksxxadq7l6yv6l1y1d6"; depends=[glmnet intervals survival]; }; - selectr = derive2 { name="selectr"; version="0.3-1"; sha256="0jc946456qp3g2icaifrqn4z7z5pn23rfw77796aa8mmlkp7qkyv"; depends=[stringr]; }; + selectiveInference = derive2 { name="selectiveInference"; version="1.2.4"; sha256="1k7lnf6fplnxp3giwinldg9g5spi21infln21k413dv3wkksk71f"; depends=[glmnet intervals survival]; }; + selectr = derive2 { name="selectr"; version="0.3-2"; sha256="0kdrj64rqg4z6hg92y9r2h602a2i73r5rnlpg23ys33d5d32n8jy"; depends=[stringr]; }; selectspm = derive2 { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; }; 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]; }; @@ -10058,14 +10702,15 @@ in with self; { 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.2.5"; sha256="1m8kwjhqjpqjzz22caiwpb4nb70d8y0ssf9j4rfyyh530x2q2k1m"; depends=[cluster CORElearn flexclust fpc ks logspline MASS mcclust nnet robustbase RSNNS StatMatch timeDate]; }; + seminr = derive2 { name="seminr"; version="0.4.0"; sha256="1vgmakj94s0l400wmk31hq8xl75dnhpbmdn85px6lsm1jhp6l8i5"; depends=[]; }; 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.10"; sha256="1xx86pqzilxpd6zki7zd846vf13dcphn9d478hjjn2zlvzlxhfkz"; depends=[bitops digest OpenMx rpart rpart_plot sets]; }; + semtree = derive2 { name="semtree"; version="0.9.12"; sha256="07i82f3bnn9x7gy8gsjyd99mzcq9pk3xqb3479d338vpky2afv43"; depends=[bitops cluster digest OpenMx plotrix 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]; }; sensR = derive2 { name="sensR"; version="1.5-0"; sha256="01rs0kiv73rqrlgzwf7hnprb029i5sq1h1qjb9q3879jxj4823pf"; depends=[MASS multcomp numDeriv]; }; - sensiPhy = derive2 { name="sensiPhy"; version="0.7.0"; sha256="18sps4nqr38bc2bsy8zq6yq45asd3s88daal7j2lz2ca6wxn5hgp"; depends=[ape caper ggplot2 phylolm phytools]; }; + sensiPhy = derive2 { name="sensiPhy"; version="0.8.1"; sha256="0pqwxs36g31qvy8ygx5grsx782magwsmh3v2qkv3rn2ycwy3brgp"; depends=[ape caper geiger ggplot2 phylolm phytools]; }; sensitivity = derive2 { name="sensitivity"; version="1.15.0"; sha256="02vqs1pqzivxpg2ql3wi0530cshdkz7hxvablpd1dzhvjnindknm"; 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]; }; @@ -10076,15 +10721,16 @@ in with self; { 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]; }; senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; }; - sentimentr = derive2 { name="sentimentr"; version="1.0.0"; sha256="1hniwvm2mr85hs6v9pvs04n73a13nf0qkikxkz9bcb3hfgkk8v6c"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean]; }; + sentimentr = derive2 { name="sentimentr"; version="2.2.3"; sha256="0f9hwiyja9cgig0ja9miqzsfwpn25bfa8xrwfm34v1n2l3v2gbxv"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; }; + sentometrics = derive2 { name="sentometrics"; version="0.2"; sha256="0pndbas1xya2pnriil94r0pp6zjd44flhsqimdgmi7w5k87wlabf"; depends=[abind caret data_table foreach ggplot2 ggthemes glmnet ISOweek MCS quanteda Rcpp RcppArmadillo RcppRoll sentimentr stringi zoo]; }; + seoR = derive2 { name="seoR"; version="0.1.0"; sha256="0aa74a9vi176ap4ap44sjm8lm3025dss067sm5lgc4b73a6ph75p"; depends=[digest dplyr httr igraph jsonlite RCurl readr robotstxt rvest stringr XML xml2]; }; separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; }; - seplyr = derive2 { name="seplyr"; version="0.1.5"; sha256="0np2z67swh567dhp6l7apfa6rbysq90hgh9wgwkalw7dc3xbzh2j"; depends=[dplyr rlang wrapr]; }; + seplyr = derive2 { name="seplyr"; version="0.5.4"; sha256="1ha3cxz5wql9bsw4japc5kj2c42mkk0g1yb141hpxpqq1c416gd1"; depends=[DBI dbplyr dplyr rlang RSQLite wrapr]; }; seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; }; seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; }; - seqHMM = derive2 { name="seqHMM"; version="1.0.7"; sha256="1pap3i2zxgnxr3frw648hkzbhn4rnz20lzhhvrp89vhc77vh4ds1"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; + seqHMM = derive2 { name="seqHMM"; version="1.0.8"; sha256="1zr70ym32isav13wsb7zv4gv3bn04qi0dn5k0fqjbdcw36m5hfi8"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; seqICP = derive2 { name="seqICP"; version="1.1"; sha256="1dfhl7g47icjw38p9c0hyvnn3pwzw7pndywk22vgcyfhiz23xjcp"; 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.4-5"; sha256="17zv0n5cji17izwmwg0jcbxbjl3w5rls91w15svcnlpxjms38ahn"; depends=[ade4 segmented]; }; seqminer = derive2 { name="seqminer"; version="6.0"; sha256="057j1l6dip35l1aivilapl2zv9db677b3di2pb3sfgq2sxg0ps3l"; depends=[]; }; @@ -10095,49 +10741,53 @@ in with self; { sequoia = derive2 { name="sequoia"; version="0.9.3"; sha256="1lxq88bw5fbm2afdh79fs363dvb1c2jsz02dc6c0ndwkwch04igc"; depends=[plyr]; }; sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; }; serial = derive2 { name="serial"; version="1.3"; sha256="1ibwd8xmkd0pwdhivm6h3yd3rsi28mai5n7qcs1bq2mx8hb5lg7f"; depends=[]; }; - seriation = derive2 { name="seriation"; version="1.2-2"; sha256="1b6glraxi5zrqzihnh39bbdnzsbd925r9hjpi020d470266g2c8f"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; + seriation = derive2 { name="seriation"; version="1.2-3"; sha256="1q6hw4hjw224b4y0dc0j630v2pgj6sn455nwkilb70w8k31hpk92"; 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.7"; sha256="0rxh89csqlpyf9wv5wlymya9kbddj79mlmxz2x0xmls12gbrxaaa"; depends=[httpuv jsonlite mime]; }; + serrsBayes = derive2 { name="serrsBayes"; version="0.3-12"; sha256="137pm5s7w6fxaalyc7hzvdkg7rayjhqw2dnb2q8q9ijp0v9wx7mr"; depends=[MASS Matrix Rcpp RcppEigen truncnorm]; }; + servr = derive2 { name="servr"; version="0.8"; sha256="05pz4ychqp4cqywcdavdi8jj3y09gmam097d2idjnlcg9x61h2s9"; depends=[httpuv jsonlite mime]; }; sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; }; session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; sessioninfo = derive2 { name="sessioninfo"; version="1.0.0"; sha256="00g3lbvk1cjjzckl70fn5n3579qb301im4lbm3cip5c2v8k283dk"; depends=[clisymbols withr]; }; setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; }; - sets = derive2 { name="sets"; version="1.0-17"; sha256="1ib7wyzrdadxz7d29prr0k0dpx8yqgj9b1rnjn6lankjdlw7m08p"; depends=[]; }; + sets = derive2 { name="sets"; version="1.0-18"; sha256="16v7650p47khqrbbw0z98llmwmmhswqmhri0n7nrfhdqwmby1lbl"; 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.5-4"; sha256="1hma75i0x6mvdrq8i4njwkpmp7dvskxv8mwdjm7xx8bmq13flcgw"; depends=[DBI magrittr Rcpp units]; }; + sf = derive2 { name="sf"; version="0.6-0"; sha256="0g6ghmjpxvlpi2sgvcxb6dx74pl7nc70cr8lgslrnv0fhnjr49jk"; depends=[classInt DBI magrittr pillar 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.4"; sha256="0q392wgdlv2fdksk2rwqjqddxrzgkr3pg1czzqywr3l07pl7gxbj"; depends=[dplyr RTriangle sf sp tibble]; }; + sfdct = derive2 { name="sfdct"; version="0.0.5"; sha256="02di504pcv423wk40ap8k18b2q759x8f5wsp8kkbwks54j42s69a"; depends=[dplyr RTriangle sf sp tibble]; }; sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; }; - sfsmisc = derive2 { name="sfsmisc"; version="1.1-1"; sha256="0jzmbywlyzfxs7hlmyd0iynghfc9qp5sa5lnhr73y8r360yv1ahf"; depends=[]; }; - sft = derive2 { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; }; + sfsmisc = derive2 { name="sfsmisc"; version="1.1-2"; sha256="0cgq2h11ngkzd6p34k6mqjnvlvc5vj4lnqrl64k05lb391j391w0"; depends=[]; }; + sft = derive2 { name="sft"; version="2.2-0"; sha256="0d1yiimc899i09yyrv1x40ixqss87xjpy08ab16h9faxd4bsk3y2"; depends=[fda SuppDists]; }; sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; }; 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.5-0"; sha256="040llsmgwdvq8qr02zh4vnpvyqs8zsbla4qrdrjpcmv9ja52ppb9"; depends=[copula mvtnorm]; }; + sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; }; sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; 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]; }; - sglg = derive2 { name="sglg"; version="0.1.0"; sha256="13ai3vd7466ffh5960fnl60na8mqkj2d5fqiaq4vj6ws3sxfq7mr"; depends=[Formula robustloggamma ssym survival]; }; + sglg = derive2 { name="sglg"; version="0.1.2"; sha256="0wqjw466j3j5ipjgp18978g7fwb2fvzxhfv2bp4dqdazmxrjyyqm"; depends=[Formula robustloggamma ssym survival]; }; sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; - sgmcmc = derive2 { name="sgmcmc"; version="0.2.0"; sha256="1jqk6bic8g5zsdxa9f6w6j6ha6dnghfdi61cyy9vi94xsmkbkv66"; depends=[tensorflow]; }; + sgmcmc = derive2 { name="sgmcmc"; version="0.2.1"; sha256="13wgc6rd6knmcw8nj12j43qqjsipxf702a4cycsnn9z7jlaxzszh"; depends=[tensorflow]; }; 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.3.5"; sha256="1y0j90rhd9jpznknyy76g6qnvrdc52wh9s8khabka4gqjgvrmb98"; depends=[raster rgeos sp]; }; - shallot = derive2 { name="shallot"; version="0.4.1"; sha256="1d9ljq8kgr9qcg545w1jzk71zmv103rj5myc47gsk0c84bbaw0n4"; depends=[commonsMath rscala]; }; - shape = derive2 { name="shape"; version="1.4.3"; sha256="1v9xp60p813rnx41vchkh32qmcb4z2zp9l7r1a8a6f8aqylnq3vj"; depends=[]; }; + shades = derive2 { name="shades"; version="1.1.0"; sha256="0ajdpwisfax96mc3w1akjlkk36b6gni1aprxqvqlwlw8bmgsmj4p"; depends=[]; }; + shadow = derive2 { name="shadow"; version="0.5.0"; sha256="0a5flgc3r5psbsig3dns4pr1fyvkhmb7gh17sb5r4vm8w202p98y"; depends=[plyr raster rgeos sp]; }; + shadowtext = derive2 { name="shadowtext"; version="0.0.2"; sha256="17ccylxnl6837cf81fwkgywjmqizmcm6mhqak10sl5apnqm5n1nl"; depends=[ggplot2]; }; + shallot = derive2 { name="shallot"; version="0.4.3"; sha256="1rxx15qma6sbi4h2iv90ym4r22lwh64z495psrxv624w1zjypbvf"; depends=[commonsMath rscala]; }; + shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; 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]; }; - shapes = derive2 { name="shapes"; version="1.2.1"; sha256="1f8dy6b2gam0pn4hm10zhw3n5pbmlgkyzgwns5g264x0c49dgbqk"; depends=[MASS rgl scatterplot3d]; }; + shapes = derive2 { name="shapes"; version="1.2.3"; sha256="1fzwpqa0paql4n652diqsqylz5r5crblfip6g6c0vszrvy7avi4q"; depends=[MASS rgl scatterplot3d]; }; sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; }; + sharpr2 = derive2 { name="sharpr2"; version="1.0.0.0"; sha256="018xzpl9h07cddpmr2bxm9iz50ky0ja12kybjil7ipjfn0kxavyr"; depends=[mvtnorm]; }; 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.8"; sha256="0j953zf0wigr645a52088ajrchhr7xlf891hybbx8pvspj240f3y"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; }; + shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; }; + shiftR = derive2 { name="shiftR"; version="1.4"; sha256="12mb4b5zhiq7hfkpc9hgi004hqli1kkkzdy2169svwrjv7bfifrn"; depends=[]; }; shiny = derive2 { name="shiny"; version="1.0.5"; sha256="0hps6nlyffh685smsm9sd0rdmip0y8v7hgv6a4hqlq7kf8zmzqi0"; 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]; }; @@ -10146,47 +10796,54 @@ in with self; { 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]; }; + shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; }; 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.4"; sha256="0c221lk75mny8h80dsc1qlcavlzqdgyj5m0laqsmkkahfzg8d6r2"; depends=[htmltools jsonlite shiny]; }; + shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.1"; sha256="11qwwz4il4n8ha587bc32n1z5pnhw4vv2ffxl9cc1i431k01p7yc"; depends=[htmltools jsonlite shiny]; }; + shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; }; + shinyalert = derive2 { name="shinyalert"; version="1.0"; sha256="0ngmpbzw6fw1gs6sv9m3xv2c9bmrxg0bs6lnvxn8hm8cwr4440xi"; depends=[digest shiny]; }; shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite 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.2.0"; sha256="07ijd5psywlkfrz54d4q68bwij1as4ai0360fya8ikngkwg393mj"; 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.3.0"; sha256="1hhl5bz287faqxkl9wd0s7w5pyxzglpici7hcq1g556hqyw1x1w6"; depends=[shiny]; }; + shinyjs = derive2 { name="shinyjs"; version="1.0"; sha256="113zpijri0l80rlgrvqn6bxk0sdqgl79h7yhja2p76f9dc9i2sr8"; depends=[digest htmltools jsonlite shiny]; }; + shinymaterial = derive2 { name="shinymaterial"; version="0.5.2"; sha256="1xdvk8icnzc156bdn6782qgj1dgzc8v22b8qhfnxabxxgpap5nm9"; depends=[shiny]; }; shinystan = derive2 { name="shinystan"; version="2.4.0"; sha256="18bdh2h6grlwfx6p00214p7cgzg7zfhbvnkd1dmxihp9wf4l80af"; 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]; }; shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyr = derive2 { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; }; shotGroups = derive2 { name="shotGroups"; version="0.7.3"; sha256="0h6c4fz2b4gpbfqykic6apflvp11bcafqm87gzl0zv8b03ydylxk"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; - showtext = derive2 { name="showtext"; version="0.5"; sha256="1fn3467n3lgl55dh62y7aq5mg3paf6faxp5kp4s04bn33g87zxgx"; depends=[showtextdb sysfonts]; }; + showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; }; + showtext = derive2 { name="showtext"; version="0.5-1"; sha256="0zb9h6frw580cql0nbkvfb0jajq6k4yhqaifvz8cpysd32dk35wm"; depends=[showtextdb sysfonts]; }; showtextdb = derive2 { name="showtextdb"; version="2.0"; sha256="1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh"; depends=[sysfonts]; }; shp2graph = derive2 { name="shp2graph"; version="0-3"; sha256="0mfb3f64kpd23qa1yb19j7j234snls7yvszp2yxnv9yahk0blifw"; depends=[igraph maptools sp]; }; shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; }; 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.2"; sha256="14bgn97jsgfgpfk5pd3vh0g9gvdpsk6qw971cx3q5l493mc8qxyq"; depends=[cowplot dplyr fBasics ggplot2 minpack_lm]; }; + sicegar = derive2 { name="sicegar"; version="0.2.2"; sha256="0fnr0wv8zbhs2i5y1kqyvhm0kzisc68ys3iy0wxwbdj3bnfgzj70"; 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="4.0.2"; sha256="1zzlgd20aw2asbsb3g9m5gvlmmgkai3bqrxyn48mphc2ncl4y7w0"; depends=[ape ggmap ggplot2 gridBase igraph network]; }; sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; 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=[]; }; + sigQC = derive2 { name="sigQC"; version="0.1.12"; sha256="1m7vywpmrwlldgdg9d8vjlfxkdnhcaz3w5vbkyljd9qfsqbwaipz"; depends=[biclust class cluster ComplexHeatmap fmsb gplots gridGraphics KernSmooth lattice MASS mclust moments nnet RankProd]; }; sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigloc = derive2 { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; }; + sigmaNet = derive2 { name="sigmaNet"; version="1.0.3"; sha256="0b9p5kgcbpzb83s0vgmfwmh15lvsfz5q0yk5wl16rxyiqqg2nxag"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; }; 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.7"; sha256="06phjjs3c53nlyh0hbwlzk5qms7g0yz3lnbd8sb8pl04v6h0y3d3"; depends=[]; }; - sim1000G = derive2 { name="sim1000G"; version="1.32"; sha256="1x0dzg58wb1kzn1j3ad44v3x4lyy7vwsx1hj1klyk7dgnmhlniym"; depends=[hapsim MASS stringr]; }; - simEd = derive2 { name="simEd"; version="1.0.2"; sha256="1r8m5sajc362bx5wzjwd75zn05q7j1kxzzdynbxwb2c8k8q83qyq"; depends=[rstream]; }; + sigr = derive2 { name="sigr"; version="0.2.3"; sha256="1kyj8xizswwg5agv4ac296pqvxxq3kla537z10qvg16ilskbqny5"; depends=[pwr]; }; + siland = derive2 { name="siland"; version="1.0"; sha256="0zqwslg0vak22q475azwank81wr4kfx33h21w84lsg7iihrb08nv"; depends=[lme4 raster rgdal sp]; }; + sim1000G = derive2 { name="sim1000G"; version="1.39"; sha256="1qxl7lsdsd4skn6x8iw7jx60ly0rwsj27yh5yiqmhxa34jpyjg0m"; depends=[hapsim MASS readr stringr]; }; + simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; 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]; }; @@ -10198,17 +10855,17 @@ in with self; { 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-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; }; - simcausal = derive2 { name="simcausal"; version="0.5.3"; sha256="1k0cbnkgd8sn5vjvmpa496yir868xldhcnkynfqdcs4qsfywfrzs"; depends=[assertthat data_table igraph Matrix R6 stringr]; }; + simcausal = derive2 { name="simcausal"; version="0.5.4"; sha256="19mqabxqz2mvfhslbln5vsnlrnmgcfmgp7ypf5k2yd03755b0k4b"; depends=[assertthat data_table igraph Matrix R6 stringr]; }; simctest = derive2 { name="simctest"; version="2.5"; sha256="038ipxww0n09sh8al5isbm1fikr8kazwxn9cj2d0wgm6cdpy681n"; depends=[]; }; - simecol = derive2 { name="simecol"; version="0.8-9"; sha256="1r4nivm6nicqskx2d2jdlszifhlpjkp6iyzppqkavnrhib7g600j"; depends=[deSolve minqa]; }; + simecol = derive2 { name="simecol"; version="0.8-10"; sha256="027x19w4l85129cb71c5cp9y8msg3nkq5cy4cfrlw2dl5zky4j5j"; depends=[deSolve minqa]; }; simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; }; simex = derive2 { name="simex"; version="1.7"; sha256="0dmyxhg3bk23y08xbgwlg791pcl3131im3jkh9x5pjqczfjvim0a"; depends=[]; }; simexaft = derive2 { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; }; simglm = derive2 { name="simglm"; version="0.6.0"; sha256="1kmi5lpx8m14iz0i9z8811cp6fq2x700qsxn6rxrkxbq88a5mdss"; depends=[dplyr Matrix purrr tibble tidyr]; }; - simmer = derive2 { name="simmer"; version="3.6.3"; sha256="0kg7grlsi4mbjnfhhb01aj7jnyfznrhr5g3gd0vxl7xnwj6g8ppv"; depends=[BH codetools magrittr R6 Rcpp]; }; - simmer_plot = derive2 { name="simmer.plot"; version="0.1.10"; sha256="1l6bck2af77mq86yqqhgxqxskb55fg2rabbqq2z37sbi3r2dvqr0"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; + simmer = derive2 { name="simmer"; version="3.7.0"; sha256="1jirp7bl5a0mfc0hg495mxfz5cjdigg2dzwj8rbc9qkgibfvfnih"; depends=[BH codetools magrittr R6 Rcpp]; }; + simmer_bricks = derive2 { name="simmer.bricks"; version="0.1.0"; sha256="1sb1ayh56sbgs4p0r3frjjfn4vcdr43xm85lvb9aqk3wmj2lddqy"; depends=[simmer]; }; + simmer_plot = derive2 { name="simmer.plot"; version="0.1.13"; sha256="0afp4il95dmdgw815rk0c3cyf56gli237v4i716l4agag5l1rp60"; 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]; }; simpleCache = derive2 { name="simpleCache"; version="0.3.1"; sha256="14jrsfxcrndfgi7yl5frfsyixxkhagc7cfav8h6mf6apfxx0v1ls"; depends=[]; }; simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; }; simpleRCache = derive2 { name="simpleRCache"; version="0.3.2"; sha256="0ldmxa5rw1kcb24swnk8s471ww11jfbscynaahnnsi0zzqmhwirk"; depends=[digest]; }; @@ -10216,67 +10873,70 @@ in with self; { 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.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]; }; + simr = derive2 { name="simr"; version="1.0.3"; sha256="0kp1x2bxr0ck49y9pn44jr7pp3ji1cqi48dr5z600mzacx6l95xp"; 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.4"; sha256="040q269qhgrdgrhp41zc5a0g6fjf7xwd8lmr8q7pi9xbzhlr1d6y"; depends=[data_table mvnfast Rcpp]; }; - simsurv = derive2 { name="simsurv"; version="0.1.0"; sha256="08w5kbzx3wlksl17kjg9j4dj1f40ddm32mafi75y5c8bwgcfzqzy"; depends=[]; }; + simstudy = derive2 { name="simstudy"; version="0.1.8"; sha256="0n8wq8xw4vlpcz6qlqkza9zwd3nkbmhs8nw2gzz64q9blzcp69mw"; depends=[data_table mvnfast Rcpp]; }; + simsurv = derive2 { name="simsurv"; version="0.2.0"; sha256="16rg13chr78c8d8y1s29zkcz6s0v7zgv5jzq4309xbnw8w7h7y8m"; depends=[]; }; + simtimer = derive2 { name="simtimer"; version="3.0.0"; sha256="0hfp652s97dz07fs92gfsaiwd6pwg95qsvr6qjwj1k5d3h6hzf8y"; depends=[]; }; simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; }; - simule = derive2 { name="simule"; version="1.1.2"; sha256="06x30rvs6fzbc1bgp4262rjljsisy03annsprfa5mm76mk00xm4v"; depends=[igraph lpSolve pcaPP]; }; + simule = derive2 { name="simule"; version="1.2.0"; sha256="09lhd0q0xn15v0j172749rih3p2qgn3sbprhj2az9s4fm9752az3"; depends=[igraph lpSolve pcaPP]; }; sinaplot = derive2 { name="sinaplot"; version="1.1.0"; sha256="0zfq6l8wjvdj7rndsfyh0a2xjlxmn2ij1q50hg3xjfpwrjxcsck8"; depends=[plyr]; }; - sinew = derive2 { name="sinew"; version="0.3.2"; sha256="0n02lwcb9v8zw1mvdlkwkzwhgbwf7wsb62j6ikmacq5g27b9ws43"; depends=[miniUI rstudioapi shiny yaml]; }; + sinew = derive2 { name="sinew"; version="0.3.5.1"; sha256="0fp5afjnkah3ig1c1fy23zlfxkfg590jai8iqf5s8wl8r4s0ywgm"; depends=[miniUI rstudioapi shiny sos stringi yaml]; }; 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="2.2-14"; sha256="1rwjp4ynksfli368llknnl0dg52wjxxfl9n5k5dh5nby6mabqf57"; depends=[CDM coda lavaan lavaan_survey mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; }; + sirt = derive2 { name="sirt"; version="2.4-20"; sha256="0kgy5jv6yz6hlx4c8mbb4fgqfb8ihslmaxqxlr8qpqh79fvgv2q6"; depends=[CDM coda lavaan lavaan_survey mirt mvtnorm Rcpp RcppArmadillo sfsmisc 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.10"; sha256="1qsk998fa5839f9yp08sxlj48mzdm46z07x1113q63483k5bnrrc"; depends=[nlme quantreg]; }; - sitmo = derive2 { name="sitmo"; version="1.2.1"; sha256="1i4bcri3vz7r49zizzqqw1m188983izvl3ja9q4nblggikif611f"; depends=[Rcpp]; }; + sitmo = derive2 { name="sitmo"; version="1.2.2"; sha256="0az4hpyyyx380slsk1kkcl8msi0c4lkwg8az2bmrhq3cik2ai8sn"; depends=[Rcpp]; }; sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; sitree = derive2 { name="sitree"; version="0.1-2"; sha256="0scfbj33mdqz10rgw6pznxca0hbmg64k53y30lwal957430yflz5"; depends=[data_table lattice latticeExtra]; }; sitreeE = derive2 { name="sitreeE"; version="0.0-1"; sha256="1gb0n5gis4ac0fdjcc496fwpvwmw5iwafpsjy3i1mpkjkxpn7za9"; depends=[sitree]; }; sivipm = derive2 { name="sivipm"; version="1.1-3"; sha256="1l0j1bi38s09ax4kwikk615lyd074gzg1aa1j2jfmhr3igannm3z"; depends=[seqinr]; }; sizeMat = derive2 { name="sizeMat"; version="0.3.0"; sha256="0766wxcc1980ivlib2saagl20y9dm0ar7i43qcqk2jpdbbaky33z"; depends=[MASS matrixStats mcmc MCMCpack]; }; - sjPlot = derive2 { name="sjPlot"; version="2.3.3"; sha256="14yl3y4faiw5g3cql8vra4d8xrxn2fri55zsddlgsnqxf1qar5w1"; depends=[broom dplyr effects forcats ggeffects ggplot2 knitr lme4 MASS merTools modelr nlme psych purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr]; }; + sjPlot = derive2 { name="sjPlot"; version="2.4.1"; sha256="0aazxrqsbp5jsd5yfm6hrx17rmlqbh5vs314xms7g620aj383zrh"; depends=[arm broom dplyr effects forcats ggeffects ggplot2 glmmTMB knitr lme4 magrittr MASS merTools modelr nlme psych purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; }; - sjlabelled = derive2 { name="sjlabelled"; version="1.0.3"; sha256="18mbdppprbvmpy9lp38fryxr4db8fgcjyjr7301zd75ffb910gm9"; depends=[broom dplyr haven magrittr purrr tibble]; }; - sjmisc = derive2 { name="sjmisc"; version="2.6.1"; sha256="1bk1f0kigyhxp40gjdxj60jmw5x984bdp1k170xw9hqfar29dn7x"; depends=[broom dplyr haven magrittr psych purrr rlang sjlabelled stringdist stringr tibble tidyr]; }; - sjstats = derive2 { name="sjstats"; version="0.11.1"; sha256="12xm6x24ddpzil8ck4w4wlhl8riypi6s08p1ifwap6bsp1grbxz0"; depends=[broom coin dplyr glmmTMB lme4 lmtest MASS Matrix modelr nlme purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr]; }; + sjlabelled = derive2 { name="sjlabelled"; version="1.0.8"; sha256="1hhcv5d5jbrd9wv9hdvck40wdpr4nr6hr972ng5w2wbh7bikvgqg"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase tibble]; }; + sjmisc = derive2 { name="sjmisc"; version="2.7.0"; sha256="1bni8ppvabzjx94hd8ygp14n2g6a8qhjvnimm0v7pqbf7czmpapy"; depends=[broom cli crayon dplyr haven magrittr pillar psych purrr rlang sjlabelled stringdist stringr tibble tidyr tidyselect]; }; + sjstats = derive2 { name="sjstats"; version="0.14.1"; sha256="10siniyy1nqsacayyl7p35yc9gmdh5rjlwzv8aywid2a1ld13lfs"; depends=[bayesplot broom cli coin crayon dplyr emmeans glmmTMB lme4 lmtest magrittr MASS Matrix modelr nlme prediction purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr tidyselect]; }; 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]; }; + skeleSim = derive2 { name="skeleSim"; version="0.9.8"; sha256="1wxdl30cy8vr1cd0wcjxyklp6crw4bv8r77ma2dkzmxm2ma5jw92"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; }; 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=[]; }; + skimr = derive2 { name="skimr"; version="1.0.1"; sha256="173ymwkx7n24xj70azdwlpiyswdfy17mw2dhpqcm6ssv0crnjjcc"; depends=[dplyr knitr magrittr pander purrr rlang stringr tibble tidyr tidyselect]; }; skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; }; skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; }; - skpr = derive2 { name="skpr"; version="0.35.1"; sha256="0i0vapwf0wjacnzszc6y34j2i3nayyd4pkian5srklm5s061bw0m"; depends=[doParallel foreach iterators lme4 nlme Rcpp RcppArmadillo rintrojs shiny shinythemes survival]; }; + skpr = derive2 { name="skpr"; version="0.45.2"; sha256="1wi19rz9mhim91pqdzljjscpsv2dbm838jjbv9ynmscjnfcbbfl6"; depends=[doParallel foreach iterators kableExtra knitr lme4 nlme Rcpp RcppArmadillo rintrojs shiny shinythemes survival]; }; + skynet = derive2 { name="skynet"; version="1.0"; sha256="00i3gvl9hz72id449wph8f0gncps6gzj0yz4n34ys8ih0j8n8b81"; depends=[data_table dplyr ggplot2 ggrepel igraph maps stringr]; }; + skyscapeR = derive2 { name="skyscapeR"; version="0.2.2"; sha256="08h3vvn9zglw3xrl0xpyj95r1n3v6lk835a4nbanxdvi21mgpi77"; depends=[astrolibR doParallel foreach MESS numDeriv oce plotrix png pracma RColorBrewer rootSolve]; }; sla = derive2 { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3nz7v25lij7wb5nrf3sl74yb"; depends=[]; }; slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; }; - slam = derive2 { name="slam"; version="0.1-40"; sha256="1di5qs8sz4bh47653kmjcdbdxir03k3nin8mh817ga9af7aa3b5g"; depends=[]; }; + slam = derive2 { name="slam"; version="0.1-42"; sha256="1pvmfvqa2gcwmap41rp3rx9jrk16jvw80pq0hf5qgja4jlcb01kj"; depends=[]; }; 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]; }; - slickR = derive2 { name="slickR"; version="0.2.0"; sha256="1c9z997fj7yq6nx9il8qrnf7lla66a1z823mxj7y92s5bf5308ar"; depends=[base64enc htmlwidgets xml2]; }; + slickR = derive2 { name="slickR"; version="0.2.4"; sha256="14y4rwa450xqw6prdgp2l7xs9vv6zqbxwg7hc3hjgq47jy8qsdm1"; depends=[base64enc htmltools 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]; }; - slowraker = derive2 { name="slowraker"; version="0.1.0"; sha256="1csikr5kcp62wbhkg9079rshy511r1ql8fqr703yc731ja50pnh7"; depends=[NLP openNLP SnowballC]; }; + slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; }; 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.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]; }; + smacpod = derive2 { name="smacpod"; version="2.0"; sha256="05bylhh98qlnq4gn0wwg3wb3pwa1q2kh06v2skj2fgbjgr03fhkn"; depends=[abind pbapply plotrix sp 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]; }; - smapr = derive2 { name="smapr"; version="0.1.0"; sha256="01nhmr40vivshysq6fjixjaddr7nmimlyim26qf6knvphpl6hrdd"; depends=[httr rappdirs raster rgdal rhdf5 rvest xml2]; }; + smapr = derive2 { name="smapr"; version="0.1.1"; sha256="0ci0j26nsgl4yi0b0bhxqgpn281ml5clhih2nl7hm5l8nybdyp3q"; depends=[httr rappdirs raster rhdf5 rvest xml2]; }; smart = derive2 { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[elasticnet gplots gtools igraph Matrix pcaPP PMA]; }; 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]; }; + smbinning = derive2 { name="smbinning"; version="0.6"; sha256="13izdq2pl7hi8ppzmpmiiz4pmc43m63ixjrbj9lwa371vx60ndmh"; depends=[Formula gsubfn partykit sqldf]; }; smcUtils = derive2 { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; }; smcfcs = derive2 { name="smcfcs"; version="1.3.0"; sha256="1860qzhfpdr78a8ha8537izbkm0dx9j63l9fv6mswcs5sjl25i09"; depends=[MASS survival VGAM]; }; smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; @@ -10284,13 +10944,13 @@ in with self; { smdata = derive2 { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; }; smdc = derive2 { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; }; smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; }; - sme = derive2 { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; }; + sme = derive2 { name="sme"; version="1.0.2"; sha256="0gszpy1sx2qsypps3iza79sab475wcrscl7wnbbrv97a3ry0ybp6"; 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=[]; }; smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; }; smoof = derive2 { name="smoof"; version="1.5.1"; sha256="01jkldmxn86vmcmmz81mdlhpm1m3bddj4sv550a3b4wm1r3gddng"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; }; - smooth = derive2 { name="smooth"; version="2.1.1"; sha256="113la6byqr6sjr9349z3yyh407mvxhk9d1q7qldw55pkp4mrahac"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; }; + smooth = derive2 { name="smooth"; version="2.4.1"; sha256="1iv34nzvz0y2cwlhq7ddm2ym0mdkp7jqxbfik2l64r4mfm8l0k8h"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; }; smoothAPC = derive2 { name="smoothAPC"; version="0.2"; sha256="06f0d4bjygpgcayzg9cxcb5plhsls0ljla2mrmjnjxpq8g3c3cl8"; depends=[colorspace lmtest quantreg rgl SparseM]; }; smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; }; smoothSurv = derive2 { name="smoothSurv"; version="2.0"; sha256="0ypgmqf7mj0x0ibid9qx6cbqn4cpig8333g095b64297bf0syvjc"; depends=[survival]; }; @@ -10298,58 +10958,63 @@ in with self; { smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; }; smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; }; smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; }; - smotefamily = derive2 { name="smotefamily"; version="1.1"; sha256="1qriyvfa6vgs7i8al7sipz0a887jzbw725kxsfa9mw22h6wm1ld8"; depends=[]; }; + smotefamily = derive2 { name="smotefamily"; version="1.2"; sha256="166gqwqljips2r0030m3q44zmxlnxcpb9hmwbg1bk3dqk9gfl8ra"; depends=[]; }; + smovie = derive2 { name="smovie"; version="1.0.0"; sha256="07sf9nxanfkcp42bv4x12vrlsdr2nnyfgdm6bhcfpggavd4s8r9q"; depends=[revdbayes rpanel SuppDists]; }; + smpic = derive2 { name="smpic"; version="0.1.0"; sha256="0ff2146gjcrc6nvrbf4779jh076abhb843zzlk2zvqir13qfap61"; depends=[ggplot2 imager stringr]; }; sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; }; smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; }; - sn = derive2 { name="sn"; version="1.5-0"; sha256="0fh7xjsfd2x8d9lbnss7raldh24b72b3pvcv7zqa1qprzg7zfr01"; depends=[mnormt numDeriv]; }; + sn = derive2 { name="sn"; version="1.5-1"; sha256="0l7qlah6dwkp8jswnr2mn3phlm15naba5zkmv0g5pcqy5ix0gz7w"; depends=[mnormt numDeriv]; }; sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; }; - snakecase = derive2 { name="snakecase"; version="0.5.1"; sha256="0mgnmdjrg3xkhfq5mc29ixpaw12fm4052i5733xc2ch6793ikmpm"; depends=[magrittr purrr stringi stringr]; }; + snakecase = derive2 { name="snakecase"; version="0.9.0"; sha256="02s3avsdvdmqfrwlliw90yza8rq2wlf56iwpvj36a2qkzxg54b6a"; depends=[stringi stringr]; }; + snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; }; 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]; }; + snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; 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=[]; }; + snnR = derive2 { name="snnR"; version="1.0"; sha256="0qrl5ivpmipibszx8k9fvd8g462zzdcmzbjj1hb8apv4z79gzima"; depends=[]; }; snow = derive2 { name="snow"; version="0.4-2"; sha256="1mxbrkpnmq32x4wd0194d541661yvfrrjlr3lsf7qq53ms3h21zf"; depends=[]; }; 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]; }; + snowflakes = derive2 { name="snowflakes"; version="1.0.0"; sha256="0adna9jfs0wv4dhyjczxhq7c0ldjfai07p1q9119avxyilv9x0vi"; depends=[]; }; snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; }; snpEnrichment = derive2 { name="snpEnrichment"; version="1.7.0"; sha256="1lja1n26nr8lgbca2kraryv933jwa2w3h41appzylflf0w3liz9y"; depends=[ggplot2 snpStats]; }; snpRF = derive2 { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025gqdqkla2asz7x97sjdnnj9kzzn"; depends=[]; }; - snpReady = derive2 { name="snpReady"; version="0.9.3"; sha256="04k457nm4mipcddzcv1491mkw1gljzqh66xjwpfcm62bfd3p4xkr"; depends=[Matrix matrixcalc stringr]; }; + snpReady = derive2 { name="snpReady"; version="0.9.4"; sha256="16nfwjda15gjk0y1rvvnlbx350rgdvpk397glp7yl2ji0amwv20r"; depends=[Matrix matrixcalc stringr]; }; snpStatsWriter = derive2 { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; }; snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; }; - snplist = derive2 { name="snplist"; version="0.18"; sha256="1x1l6z34b6k6325rjjmfa5nkbf5j472hrn9lyiw8s7h1wvf4gc1v"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; }; + snplist = derive2 { name="snplist"; version="0.18.1"; sha256="14x31h8h3lx25rm30vhp89byrzy3qrmawi07pmzy4xpxdf0rxm4s"; 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]; }; social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; }; + socialmixr = derive2 { name="socialmixr"; version="0.1.2"; sha256="0cj8l1gl7c9hk3hpznfqhblmh79qvi9866713sry538f3kkv897c"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; }; 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]; }; + sofa = derive2 { name="sofa"; version="0.3.0"; sha256="10f01a23bq6a30f95cilfan588dg0bg36y7g14q46rmcz15cqbrx"; depends=[crul 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]; }; softermax = derive2 { name="softermax"; version="0.3.0"; sha256="0shsd7cbj8j8z65flyddkjdpigyyqpw4j6ljl9pl9hwasksi05gk"; depends=[readr xml2]; }; 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]; }; + soilDB = derive2 { name="soilDB"; version="2.0-1"; sha256="0nzi0fss77x0bjdzslhy0flwvhap0i0cq3xw82x7sggnbmc3ya72"; depends=[aqp curl Hmisc plyr raster reshape2 sp xml2]; }; soilcarbon = derive2 { name="soilcarbon"; version="1.2.0"; sha256="1gxq7np5xh3jcqbsf8xva4b82rv6rab2j23mbkc4pjs6nbnzvzba"; 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]; }; + soiltexture = derive2 { name="soiltexture"; version="1.4.5"; sha256="0a9n89ygfqpm6sir76ginri1l6gmw3gfd58szl4ikzaz8fk5hxqh"; depends=[MASS sp]; }; soilwater = derive2 { name="soilwater"; version="1.0.5"; sha256="11gal7hj73j82qx65krmzpmf0gpm41ph8hw70df46dbf4w23vvjn"; depends=[]; }; solaR = derive2 { name="solaR"; version="0.44"; sha256="1waxi2zfns4dh1vpsl3khbgaw07icp4f1ax9l0pry9qipmk0nk3k"; depends=[lattice latticeExtra RColorBrewer zoo]; }; solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; }; solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; }; - 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="2.0.2"; sha256="0j7dpwq2l6g0rabrh01r2xw1rgd8yrmnazwkskv5zayfcxfh5las"; depends=[digest dplyr httr jsonlite mime]; }; + solrium = derive2 { name="solrium"; version="1.0.0"; sha256="1rlf60kynqb8pvzllfdkiabxgnqx60hwm8vy86y9f2bh7d7jsdhf"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; }; + solvebio = derive2 { name="solvebio"; version="2.3.1"; sha256="0mbb7ri8shknlw1m7985as84i0m837awpsd89yxc5gr1hvzgdvlh"; depends=[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="3.0"; sha256="0jfdf4pjkwlm0r6f1njcri7wf4yj9sjgwcg9s3xz17l4fv34vy0x"; depends=[MASS Matrix]; }; + sommer = derive2 { name="sommer"; version="3.3"; sha256="1r83inm3b32gqaq2n39pj65h86lr9hxl7ciixqx90pxv15gr6xng"; depends=[data_table lattice 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=[]; }; @@ -10364,26 +11029,27 @@ in with self; { sos4R = derive2 { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[RCurl sp XML]; }; 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]; }; - soundgen = derive2 { name="soundgen"; version="1.0.0"; sha256="04hbhyk5b9g4q71z4pa70byx8xxadq7921vigkg3c9hv7yxz550d"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny shinyBS tuneR zoo]; }; + sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; }; + soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; + soundgen = derive2 { name="soundgen"; version="1.2.0"; sha256="1k6my6lcwy36fa25glyd8vfr3b57fwx7nz4s24bkf40vp0vkpsc2"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; 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]; }; + sp = derive2 { name="sp"; version="1.2-7"; sha256="0q04yfgyjannsrzl0ppwcv0simrxrrbx2iz5mzaafc5x38zf0q3d"; depends=[lattice]; }; sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; - spAddins = derive2 { name="spAddins"; version="0.1.7"; sha256="1ci246770j40zzmsjwjqwkwi6b2w5qwb0n4f4wah5rjf6zjwkd5r"; depends=[rstudioapi]; }; + spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; }; spBayes = derive2 { name="spBayes"; version="0.4-1"; sha256="1cypl3kvcr7nwdkq59zpdhkasz0z5r2gk8hr6wf1a1992k8c33ag"; depends=[abind coda Formula magic]; }; - spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.1"; sha256="0pcfy3w2aqld10w9jdcizcy0rdpmdaj8z7qwpam4s2f6sap1q26b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; - spData = derive2 { name="spData"; version="0.2.5.0"; sha256="1piqnxmvxksd5viasb5l50incf631fgphrnqfp0x17rz3jdrfzvg"; depends=[]; }; - spMC = derive2 { name="spMC"; version="0.3.8"; sha256="1glkyv6wmh766ssdlm4z7dck32r0284kwah0ksmmkwxkfw1qx7xb"; depends=[]; }; + spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.2"; sha256="0m1432gkjkkqmzhksv19yca1wyvp5vjwcmpavhiik4ghfx72rgrr"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; + spData = derive2 { name="spData"; version="0.2.8.1"; sha256="0lbrgc701w8x248cmpl3pwngb9kjz1dqxfplrnr3jpyl9d3qkqv4"; depends=[]; }; + spMC = derive2 { name="spMC"; version="0.3.9"; sha256="10cvha5j2pi3b2qiq3jbrc10yi84a595zlg0wshx3wrzxb1rim85"; depends=[]; }; + spMaps = derive2 { name="spMaps"; version="0.2"; sha256="1rrrkbj9bvs217dgvwm686zczcwjqcbq0x268cwl6qnsm39mxzzf"; depends=[raster rgeos sp]; }; spNNGP = derive2 { name="spNNGP"; version="0.1.1"; sha256="0b55arvy5xr592bs2082djyzaa48jbv0y85h7nnj479f8c31grqp"; depends=[coda Formula RANN]; }; - 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]; }; + spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; }; + spTest = derive2 { name="spTest"; version="0.2.5"; sha256="11x2wq3031mqbj4n6hvb4l3sp4382qankdl1v1qh7ab2xa0h6xw8"; 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]; }; + spTimer = derive2 { name="spTimer"; version="3.0-1"; sha256="1vl26d248642grca63kv1rsghqscchkhbybby0fgfg58v042qbs5"; depends=[coda sp spacetime]; }; spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; }; - spaMM = derive2 { name="spaMM"; version="2.1.6"; sha256="188qds6pxa7hl1p7rg6zmlvyxfx7pfwwgcs2as3naws2ipshlxh8"; depends=[MASS Matrix nlme nloptr proxy Rcpp RcppEigen]; }; + spaMM = derive2 { name="spaMM"; version="2.3.0"; sha256="1625nplyxklviifhalfwylc0cr2qlhrr57zhm3dj3n2daxjhid87"; 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]; }; @@ -10391,26 +11057,29 @@ in with self; { spacetime = derive2 { name="spacetime"; version="1.2-1"; sha256="1i6yrmyr9vc5lr99w7qhr0jqdx97ckjqay5g0lqdrk98sygpfl4g"; 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]; }; + spacyr = derive2 { name="spacyr"; version="0.9.6"; sha256="0s4gn2nfd2bamvpzk68n4ym1nylzay8hrgkax6c9ghhvi3p7rch7"; depends=[data_table reticulate]; }; spaero = derive2 { name="spaero"; version="0.2.0"; sha256="0srkah89z23j30y2smlnyhf97mm123apma8vgmgfarbx188bkwpn"; depends=[]; }; - spam = derive2 { name="spam"; version="2.1-1"; sha256="1j6yppyf3sngpmq99w0d3j8wlrmjsfsixw902rl6339w985b1lxc"; depends=[dotCall64]; }; - spam64 = derive2 { name="spam64"; version="2.1-1"; sha256="0l34z630q749b27w033n504x6lspgz1d8jrw4cnzs6jkrlz6paw7"; depends=[]; }; + spam = derive2 { name="spam"; version="2.1-2"; sha256="06c2bal2hj4qjb65qagfq6icy52cjn8sn8yl0c0dbzcz4gmidvy2"; depends=[dotCall64]; }; + spam64 = derive2 { name="spam64"; version="2.1-2"; sha256="15cjdz71fh04hcqjn93lnnqbmyfgm67p1x5lyiiq3wz7k1fk5a0h"; depends=[]; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; - spant = derive2 { name="spant"; version="0.4.0"; sha256="0cfk2dxwzibxm87fkhcdl82invxvw1hryvf5mk6lvhsx88mswjsc"; depends=[abind complexplus foreach matrixcalc minpack_lm nnls plyr pracma signal smoother stringr svd]; }; + spanish = derive2 { name="spanish"; version="0.3.2"; sha256="1dg4wnvxhybhagag9xx27af6760dlclaivx27mfxywfha312xfpn"; depends=[magrittr xml2]; }; + spant = derive2 { name="spant"; version="0.9.0"; sha256="0cfvi5pxg1wg9kl9rxrarbb3jaxwjfwy34lmg1yy5nj8ld8lzlfc"; depends=[abind complexplus foreach matrixcalc minpack_lm nnls plyr pracma signal smoother stringr svd tkrplot]; }; 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]; }; spark = derive2 { name="spark"; version="2.0.0"; sha256="062i9qah9zws6p555pk1b42qmd04l8sx22h71skpx76vgb0lsn83"; depends=[clisymbols]; }; 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]; }; + sparkavro = derive2 { name="sparkavro"; version="0.1.0"; sha256="0jihqvjs7dgyxhyzhsbki7khy7fjniwf9xwlangzqfi4rcan8g7x"; depends=[DBI dplyr sparklyr]; }; sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; }; - sparklyr = derive2 { name="sparklyr"; version="0.6.3"; sha256="11k8jhlg9n3sb72p5j865plflxfcm4pp15483axhnkck6bhnlb77"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr httr jsonlite lazyeval openssl rappdirs readr rlang rprojroot rstudioapi shiny withr xml2]; }; + sparklyr = derive2 { name="sparklyr"; version="0.7.0"; sha256="0lyn5xlz7a826dmlihn6jp2kq72abr3jy0ylsa4lvk9sj3acy988"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr httr jsonlite lazyeval openssl rappdirs readr rlang rprojroot rstudioapi shiny withr xml2]; }; 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="2.1-12"; sha256="13mcmbbr9r1i9qgbchi8v0lx90c42x5m1xycqdgwhyinm71swnqw"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; }; + sparr = derive2 { name="sparr"; version="2.2-11"; sha256="01li60cybv9kg54zkc9rh4ra6danzbnap9rx59pgfj7zkhs2phmn"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; }; sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; }; + sparseEigen = derive2 { name="sparseEigen"; version="0.1.0"; sha256="0vqcy61rarmp3liz8fr3vs3y40hkb3wfw89b5xsj1byaiap4772s"; depends=[]; }; sparseFLMM = derive2 { name="sparseFLMM"; version="0.2.0"; sha256="0r7080d2s5vrcwi4h11iiapmdl0l59kd0j8r1avmw9x0d0qw6lh8"; depends=[data_table MASS Matrix mgcv refund]; }; - sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3"; sha256="13v8zia1i0k6faiz6faikqmlrp16riwv637yygjq2cq8fcm75pyf"; depends=[Matrix Rcpp RcppEigen]; }; + sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3.2"; sha256="0475zyij6h19diaalnkj39j4n0lx6mgfq3sl479mlngf9fhr9zvx"; 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.1"; sha256="1k4jiday24rdiscprwifrc0py13h707ijavspz15jannvjaz9qdh"; depends=[Matrix]; }; @@ -10419,105 +11088,110 @@ in with self; { sparsebn = derive2 { name="sparsebn"; version="0.0.5"; sha256="19315nzj9pz98498amlhas6ii3vwvn3qxz5a6136nh2xfwfg2bhc"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; }; sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.5"; sha256="0hdzrp2wcjl849v7np7ybmyp15zjfqr8gkwhij2qjrpprf7z8s57"; depends=[Matrix nnet]; }; sparsediscrim = derive2 { name="sparsediscrim"; version="0.2.4"; sha256="1sa3yssncbpx8yid5wrnxdq7jl3hy5rskyh60v5x592ijcb2mif0"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm]; }; - sparsenet = derive2 { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; }; + sparseinv = derive2 { name="sparseinv"; version="0.1.1"; sha256="1c0vkfq4kh78rs8x484jyi29rcswq9slljxvvc7km6qlz1mnrzlm"; depends=[Matrix spam]; }; sparsepp = derive2 { name="sparsepp"; version="0.2.0"; sha256="0ibadyv7lchxw3y1dspjnbhc4pin4dxwqj9rdrdxfbvlx0i3jgxr"; 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]; }; + sparsesvd = derive2 { name="sparsesvd"; version="0.1-4"; sha256="1yf373552wvdnd65r7hfcqa3v29dqn7jd4cn431mqd2acnqjrsam"; 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="3.0.0"; sha256="1q78l04nbrllrsk14haln5s829rkkhkhmb34xzfgyd8glbi7z4ay"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; }; - spass = derive2 { name="spass"; version="1.0"; sha256="1pgv4yzbdv475gp53qz40ys731v9960cyxbp84gff6y5f2y4axah"; depends=[geepack MASS multcomp mvtnorm Rcpp]; }; + spass = derive2 { name="spass"; version="1.1"; sha256="1kr2ixyvsm82h2brdm51bzll69632mkj9f88a2ny0pcyqrbggg83"; depends=[geepack MASS multcomp mvtnorm Rcpp]; }; spatcounts = derive2 { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; }; spate = derive2 { name="spate"; version="1.5"; sha256="1hlh4iwx1lrl8r2gag33z2xdv6k4hg86ch4f0jlqnqkhm9hapshf"; depends=[mvtnorm truncnorm]; }; - spatgraphs = derive2 { name="spatgraphs"; version="3.0"; sha256="04p2hlwb9rwck2v2j4hlf87wlqx1vz1czmljpk3xw3f0b1pf26sc"; depends=[Matrix Rcpp rgl]; }; + spatgraphs = derive2 { name="spatgraphs"; version="3.2-1"; sha256="0n7f3r4ahv1w5mwx5mnib3g4263kz73rh1fcfk5wb12y52x8n1iz"; depends=[Matrix Rcpp]; }; spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; }; spatial_gev_bma = derive2 { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[coda msm SpatialExtremes]; }; 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-7"; sha256="0l8nshsapbgfzli1rpls3j3s8gyqy2nzsgqf2x4v1r699r419i5k"; depends=[cluster MASS RANN raster RCurl rgdal rgeos rms SDMTools sp SpatialPack spatstat spdep yaImpute]; }; + spatialEco = derive2 { name="spatialEco"; version="1.1-0"; sha256="1cvll6z775w8nvl5q5p62qgp3j2d0kcdb2avqwcqybk23jlxl7dr"; depends=[cluster EnvStats maptools MASS RANN raster RCurl readr rgeos rms SDMTools sf 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-23"; sha256="0kvhirh7afk2gfy21pa6117yk6kzbaf2dxfkr1ax3b554rnrv4p0"; depends=[spatstat]; }; spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; }; spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; }; - spatstat = derive2 { name="spatstat"; version="1.52-1"; sha256="17p7pfdi5cxaafbkwxxfnrfpxniymvxqvlp2icy560rs6x90jjjl"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_utils tensor]; }; - spatstat_data = derive2 { name="spatstat.data"; version="1.1-0"; sha256="1iiyqv305gsr0xbnsnbddcymj9j37w6hgmzv6bxx2kwhmq6lqkj6"; depends=[spatstat_utils]; }; - 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.7-1"; sha256="1j6r71mcch91rm2ww6kqz5685pancpbwyl33jdzwm23rlpcpvr9l"; depends=[]; }; + spatialwarnings = derive2 { name="spatialwarnings"; version="1.0"; sha256="1j8zr9pv769ji9ynzrhah3nd56mjjap450c28g26ff00l3kr9l03"; depends=[ggplot2 moments plyr poweRlaw Rcpp RcppArmadillo reshape2 tidyr VGAM]; }; + spatstat = derive2 { name="spatstat"; version="1.55-0"; sha256="05mpw0zdw4mdlkcf8q9h0nmviq37ihwpgl472wyxqw69l93vk4k3"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; + spatstat_data = derive2 { name="spatstat.data"; version="1.2-0"; sha256="0nzw5y1in36mib5g4v076b9jii71jjidxajn3n8v67lvl48dmwgm"; depends=[spatstat_utils]; }; + spatstat_local = derive2 { name="spatstat.local"; version="3.5-7"; sha256="1sdcx4qxv0z5q97rljn34mssbs4w6qbqxhn71xmkns01xypl1wr2"; depends=[spatstat spatstat_utils tensor]; }; + spatstat_utils = derive2 { name="spatstat.utils"; version="1.8-0"; sha256="053j67mrnjcw1mdbm3qjvf67hrfnhsma4770r7l67bs4xys2qhfg"; 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.8"; sha256="1f0lradf7a3fjkdhbviw24awpqj1pzw1wfvigrqhnmf0jjw3nng3"; depends=[dplyr sp tibble]; }; - spc = derive2 { name="spc"; version="0.5.3"; sha256="0y730vh04j4cyz5zfyx4xqfw07ic1l93197640q543adnmil40vf"; depends=[]; }; + spc = derive2 { name="spc"; version="0.5.4"; sha256="1ii848jcpsg5jij1i17flhz4v5vgsb8j6iijgpha7sigmj7gynk3"; depends=[]; }; spc4sts = derive2 { name="spc4sts"; version="0.2.1"; sha256="1mwgqj9gph3fzvmqp03khi541g13ljx8xn09ji9qcjl6j032rk2p"; depends=[gridExtra rpart]; }; spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; }; - spcosa = derive2 { name="spcosa"; version="0.3-6"; sha256="0zj5yr0by1pbixs4z6w3c6yr1k55k5gqmvjkwiq2gsgq00vs7q94"; depends=[ggplot2 rJava sp]; }; + spcosa = derive2 { name="spcosa"; version="0.3-7"; sha256="11q6zr4y0hv1vnhl45g38f1906pq9a695ynn6yfkzlpz1kbf2jma"; 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-15"; sha256="14kmr72zlna77q624y7vb6v8f7rxpf0fjpsaspgyapvgjjz41wb4"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp]; }; + spdep = derive2 { name="spdep"; version="0.7-4"; sha256="1iskcrlka8p49i3lvfp9l5y4q9vapdn0m6wlin7pq47017jz2hwn"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp spData]; }; spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; }; 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]; }; + spduration = derive2 { name="spduration"; version="0.17.0"; sha256="1s41rs5nbdrknn6ag7zn8ds3203q2x5z5mb9vf80y6ba6w3ksr32"; depends=[corpcor forecast 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="2.1.0"; sha256="1alwqwxx5mmmlqwj5dz9dzzwxcs8hyz85kkmj3ajb3wp09z5dhaq"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; }; + speaq = derive2 { name="speaq"; version="2.2.0"; sha256="1y6sa639b2pcxcd2lh9ivfllvc734pmb0bv63hcnr74f8nmn3ywf"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; }; 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]; }; - specmine = derive2 { name="specmine"; version="1.0"; sha256="1dd8ymyq3894br2fv54r1z93aifh2iiz94a3r4xj1qq07005hr29"; depends=[baseline caret ChemoSpec compare ellipse genefilter GGally ggdendro ggplot2 hyperSpec impute MAIT MASS Metrics pcaPP pls qdap RColorBrewer rgl scatterplot3d xcms]; }; + specklestar = derive2 { name="specklestar"; version="0.0.1.7"; sha256="04vm989yi31vqnf5rs6cdyikm4jzfd9njxh0ls3dvjrg19ipsnmn"; depends=[Rcpp]; }; + spectacles = derive2 { name="spectacles"; version="0.5-0"; sha256="0i1kzp0fpljcvkws15w3iwgpjig2llhlrfs5blk562kgb7vwshqm"; depends=[baseline epiR ggplot2 plyr reshape2 signal stringr]; }; spectral = derive2 { name="spectral"; version="1.0.1"; sha256="0mawgxz1gbzgb3lxm6gfbv3wan0ykziprqym8ajvdjsdq4fwkk2m"; depends=[rasterImage Rcpp]; }; 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=[]; }; - spectrolab = derive2 { name="spectrolab"; version="0.0.2"; sha256="1s9js7q075v81nva475q5jznj8ms39f9yb0mb91q873r3qxwbgxp"; depends=[devtools prospectr RColorBrewer shiny shinyjs]; }; + spectrolab = derive2 { name="spectrolab"; version="0.0.4"; sha256="1vmrpszjwl9iq8z6p8rhh560l79iya6rah7jld8ykvm9irwdf15h"; depends=[devtools prospectr RColorBrewer shiny shinyjs]; }; speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; }; - spef = derive2 { name="spef"; version="1.0-5"; sha256="0hbb2vmgx5x135kvb5c525q78m8ccpv4j6hv16v31zka2fjwcj8z"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; }; + spef = derive2 { name="spef"; version="1.0-7"; sha256="006qp0qsqrlbbbv4b86ikqz1ig0php0cahqz4c9n3js1kxwsdi7d"; 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]; }; - spelling = derive2 { name="spelling"; version="1.0"; sha256="0r293l451b0fxs6yf5ygak6s9m3alsc1cnpwhzf091blhi76s2jr"; depends=[commonmark hunspell knitr xml2]; }; + spelling = derive2 { name="spelling"; version="1.1"; sha256="10zhzbpyjw5lkg4iyjwgs5xp2c8bgwyzjg146fcml6cjs6xhl8ni"; depends=[commonmark hunspell knitr xml2]; }; sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; }; - sperrorest = derive2 { name="sperrorest"; version="2.1.0"; sha256="1qpjqbifqzw92j5b8sc0bp9rjmx3w3np3gzh88kxqapdbq770w47"; depends=[doFuture foreach future gdata magrittr pbapply pbmcapply purrr ROCR rpart stringr]; }; + sperrorest = derive2 { name="sperrorest"; version="2.1.1"; sha256="0rbfr6dg8dx6lm3npsrinr2vxxsq0f3xwprzl0fyzabdhd82na4y"; depends=[doFuture foreach future gdata magrittr pbapply pbmcapply purrr ROCR rpart stringr]; }; + spew = derive2 { name="spew"; version="1.3.0"; sha256="09g8j5v5k455c3kqm1fn09ql3x34xy22igicakwl99s8gsln7v3p"; depends=[maptools plyr sp]; }; spex = derive2 { name="spex"; version="0.4.0"; sha256="0b2zcpbjr8lqfsmwvmy4lp88xz16v7fyqx1yv10yhcgxlgw0yw8p"; 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-1"; sha256="1jabgcc8bd6kikcd5rv9xczbg6r52mwyc68r8filn5i0gva4by57"; depends=[]; }; - spgwr = derive2 { name="spgwr"; version="0.6-31"; sha256="021h5qzz7gifxhripyd3alw6z7a9rj4r7c23dr7vk0szyd9shmgl"; depends=[sp]; }; + spgwr = derive2 { name="spgwr"; version="0.6-32"; sha256="0xdv0yy6md9kv1aay6xxj1k3x59apflip0qpfvyk2aa2wbn1sx2v"; depends=[sp spData]; }; 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=[]; }; - spiderbar = derive2 { name="spiderbar"; version="0.2.0"; sha256="1lhzj2fvn83plnifwvmdkjf3zpmb5bvqh6ddzf9jhzmfsqa46h7x"; depends=[Rcpp]; }; + spider = derive2 { name="spider"; version="1.5.0"; sha256="1y034v42jxjl3vj87iz5kaizq7fwppmn56z7yyvrrmk5ps4nqr1j"; depends=[ape pegas]; }; + spiderbar = derive2 { name="spiderbar"; version="0.2.1"; sha256="1mm9g58riyjxpfwjj28shlw9zlycsgcxl6xw8im0gm815v2plyhv"; depends=[Rcpp]; }; 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.1"; sha256="0d0pjjipnn1jkdi70npfqssz7m72h68dshg7gzpch8ycq8iqz9sz"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje sp splancs stringr waveslim]; }; + spind = derive2 { name="spind"; version="2.1.2"; sha256="0z00fc9r6aycv5v9ms7v64xszfc58wvy6y7bd2z0xima1gpppq2r"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje splancs stringr waveslim]; }; spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; }; splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; }; - splashr = derive2 { name="splashr"; version="0.4.0"; sha256="0k6ylq4vrs4ymr8cjvwm4id1kkng76hlg4bzxak4sd9sjk914xp2"; depends=[clipr curl docker formatR HARtools httr jsonlite lubridate magick openssl purrr scales stringi xml2]; }; - splines2 = derive2 { name="splines2"; version="0.2.6"; sha256="1a58pl1a0lc7ljs9q9p3licpzzfr75lcahfzc3hdzhg3zn6m56cx"; depends=[]; }; + splashr = derive2 { name="splashr"; version="0.4.1"; sha256="1gydnl6qdkqxvgzy3j6n8y4nan4wz6p7wybcgnm5p37n7q6m2rhk"; depends=[curl docker formatR HARtools httr jsonlite lubridate magick openssl purrr scales stringi xml2]; }; + splines2 = derive2 { name="splines2"; version="0.2.7"; sha256="1hh7zd2gqmfc5xx91kjwi465yvq6lwrhgjdim1b40g6canh0ixlb"; 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]; }; - splot = derive2 { name="splot"; version="0.3.0"; sha256="1amz7b9bcc1qr8wa650j1v5bbqq4d0q5xwmxf9rv6npra6c6db7w"; depends=[]; }; + splm = derive2 { name="splm"; version="1.4-10"; sha256="0zz28mfs84nqyvl1l0ba7yrhgcxxzw1v0542jc39h4pr537yz1nc"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; }; + splot = derive2 { name="splot"; version="0.3.2"; sha256="1nix7pzqlla3iga99pw9jqcylg4j5xpfrf94y0abzpy3z4gq3kgc"; depends=[]; }; 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]; }; spm = derive2 { name="spm"; version="1.0.0"; sha256="0q87sbp39axmlnj15srnsysm7d9rpm5q6zic0h6hc1xwp205v0sf"; depends=[gbm gstat psy randomForest sp]; }; - spm12r = derive2 { name="spm12r"; version="2.3.1"; sha256="1fkm961phkxy5rmv2vav0a7vy9j89i0gwgfi2rjg682xl473j3gk"; depends=[git2r matlabr neurobase oro_nifti R_utils]; }; + spm12r = derive2 { name="spm12r"; version="2.7.4"; sha256="0v0zmsbzk6446n1yipz3w99n0n4yya6idff3gfyj7fgq10pcalgz"; depends=[git2r matlabr neurobase oro_nifti R_utils]; }; spmoran = derive2 { name="spmoran"; version="0.1.2"; sha256="19rl14w0zry649c3kgvrmb7bsw3dxsprf52naiqfxxs7qy3pxcm2"; 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.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.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; }; sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; - sppmix = derive2 { name="sppmix"; version="1.0.1"; sha256="0l9hmjrb0yl4c6y9l39h6kggxda9qz6xspf719hjc30zq76h4k1a"; depends=[fields ggplot2 matrixcalc mvtnorm Rcpp RcppArmadillo rgl sp spatstat USAboundaries]; }; + spotifyr = derive2 { name="spotifyr"; version="1.0.0"; sha256="1f7sv6qc8bim8vkcsma96zdzd1ci73dpag2dp27mqjcbh716xfy0"; depends=[dplyr httr lubridate purrr tidyr]; }; + spp = derive2 { name="spp"; version="1.15.3"; sha256="1wn7a6aznxyvr6kwgf3bd8c1n1pxm4b43km3pgfw8mf2vx69cynd"; depends=[BH caTools Rcpp Rsamtools]; }; + sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; }; 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=[]; }; @@ -10527,7 +11201,7 @@ in with self; { 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=[]; }; sptemExp = derive2 { name="sptemExp"; version="0.1.1"; sha256="0a4y355j24sll8jmm17lh4j13k21b3nlalsxzpzx2gp5xw1x7jr6"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; }; - sptm = derive2 { name="sptm"; version="16.7-9"; sha256="0x8824zccrwdl38jbhq8skzcvxb7a3b1zggkd7gmyjd94xvxll9k"; depends=[kyotil survey survival]; }; + sptm = derive2 { name="sptm"; version="17.12-7"; sha256="1l5in0jkqg44rr2id3h25jrfbn7x855p31z338hnmdpfwkpm2b1a"; depends=[kyotil survey survival]; }; spuRs = derive2 { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[lattice MASS]; }; spup = derive2 { name="spup"; version="0.1-1"; sha256="0iwmydvd6bwpyr4q3hk2hlvgrvpzrdhnbq0frxadwcaaap75pfv0"; depends=[gstat magrittr mvtnorm purrr raster whisker]; }; sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; }; @@ -10537,7 +11211,8 @@ in with self; { 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=[]; }; - srvyr = derive2 { name="srvyr"; version="0.2.2"; sha256="0k8s96hldv9jya6v0l6xls3cxr7mzxk0nqjhwizsqbqb773x95j7"; depends=[dplyr lazyeval magrittr survey tibble]; }; + srp = derive2 { name="srp"; version="1.0.0"; sha256="10mpyy8q419dw0zd96l0z8lkxpcyn1l5fvnyvr3n0lyl6jmf91sy"; depends=[fda mgcv]; }; + srvyr = derive2 { name="srvyr"; version="0.3.1"; sha256="1xad4n3bpldaaci83mvpfa8sq6bh0ll5k1fgrapwb8142hvk6m13"; depends=[dplyr magrittr rlang 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=[]; }; @@ -10554,80 +11229,88 @@ in with self; { 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-2"; sha256="06sysp4jyf79y53i7xl5yvbpvfxrf929zhf3s54wsi6014mbkh23"; depends=[coda]; }; + sspse = derive2 { name="sspse"; version="0.5-5"; sha256="07656miqrv9g5nn3ahyfj7wb010cwkr3qjhysbsih0p43dwczq0y"; depends=[coda]; }; + ssrm_logmer = derive2 { name="ssrm.logmer"; version="0.1"; sha256="1i9rrsixl3swd04w1gf9gf1r2wb9nkvwhc8ld4bx4zxzm1031f67"; depends=[sfsmisc statmod]; }; 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]; }; stR = derive2 { name="stR"; version="0.3"; sha256="0zad25s9wp4lapkww3rdbqsd4y7p8xhz9is7avq400srxakinx7n"; depends=[foreach forecast Matrix quantreg rgl SparseM]; }; staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; }; + stability = derive2 { name="stability"; version="0.2.0"; sha256="154dp26aghznibnp9h7j86hi30caylvyxp87jkf2p7cb4l3qn5r4"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; }; 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.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; }; stabs = derive2 { name="stabs"; version="0.6-3"; sha256="17sa0sjxf6h7gx1ga1pxhv17yrz3qisaivbf5cbc3asvshhswqg9"; depends=[]; }; stackoverflow = derive2 { name="stackoverflow"; version="0.1.2"; sha256="1psw96iscgsx11drmcnh0yjg2jjcaa4akmywh337i6gbgam8kj61"; depends=[]; }; - 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]; }; + stacomiR = derive2 { name="stacomiR"; version="0.5.3.1"; sha256="1d05k8s8239d615vqjs6r6rx7r3vqc5gmms8iqds6lhr59bxv83g"; 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=[]; }; + stapler = derive2 { name="stapler"; version="0.6.5"; sha256="0xhwlm3iyxxmaaf0smj8g5zdawb51d7dc636czbvk5g551g7wfdb"; depends=[matrixStats RNifti]; }; + staplr = derive2 { name="staplr"; version="1.1.0"; sha256="08kk1zi89ggyli05y7lr1vhq4xszjp6z5jscaaknp38gav7jd5lc"; depends=[]; }; + stargazer = derive2 { name="stargazer"; version="5.2.1"; sha256="1nfmb8qka6qxhjagk1a9am43dgnp39fy4cjbygivzp2hlzy22f46"; 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]; }; startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; }; - startup = derive2 { name="startup"; version="0.7.0"; sha256="0g5wdj31vq83j6hanhckpxxwb8s7i8d5vavwvx9qdci848diid4h"; depends=[]; }; + startup = derive2 { name="startup"; version="0.9.0"; sha256="0cr3lp5aq93d8mk55nhfpszjkr4iv5ysm7jj7igj7yy3ag93snm0"; 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.5"; sha256="0vmdrdq6db16vfl0rb39x8yfnbdzpcrvywfgp4lss6jby3nvjwd9"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang 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]; }; + states = derive2 { name="states"; version="0.2.0"; sha256="0gwisvzww7jl0n5ck8rnnw4ikr8gyq94m3362sdjmic9h7318f03"; depends=[dplyr lubridate]; }; statesRcontiguous = derive2 { name="statesRcontiguous"; version="0.1.0"; sha256="0yzi6ycfj4cc4q0zzzckdz65wp9m4yx6fi7kp9nssj9pj6a8xlrp"; depends=[dplyr magrittr sf]; }; 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]; }; + statip = derive2 { name="statip"; version="0.1.5"; sha256="1gyn86kg96yrs9drc23xabf4s8ii32hgjla310sy6pd7c97bwqgf"; depends=[bazar dplyr]; }; 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="4.0.0"; sha256="0yw6l5b4qv0jqlg4zyczas7m12a5pyqghs6ydxy2f6v6vxkijvi0"; 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.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; }; - statsDK = derive2 { name="statsDK"; version="0.1.0"; sha256="00idjwn003gcfj78jf92sqfpaan9i65zgld6mfp24xqwgkblw8jd"; depends=[dplyr ggplot2 jsonlite rjstat stringr tibble tidyr tidyverse]; }; + statsDK = derive2 { name="statsDK"; version="0.1.1"; sha256="0insx4sivac0nfxaa11iz9dd7374g51fcndsgljj3f14zw1xyq66"; depends=[dplyr ggplot2 httr jsonlite lubridate readr stringr tibble tidyr]; }; stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; }; - stdReg = derive2 { name="stdReg"; version="2.2.0"; sha256="166f0icz2gmnyp5fd824gylksjizyp2rm2h6i59h8q6brq3r79q8"; depends=[data_table numDeriv survival]; }; + stdReg = derive2 { name="stdReg"; version="3.0.0"; sha256="0mjn2zvpadxm3q5kw4v3jpfmx94chjxdf8n1m7c4dm7gfaj0q38x"; depends=[data_table drgee numDeriv survival]; }; 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=[]; }; + stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; }; stepR = derive2 { name="stepR"; version="2.0-1"; sha256="1r45wxw9kvzyybkl4f1r9c2d7wmi0k4ji39w3nxqrf7n5kp2cnj4"; depends=[digest R_cache Rcpp]; }; stepp = derive2 { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; }; stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; }; sticky = derive2 { name="sticky"; version="0.5.2"; sha256="0yib9llvlxyzcwam3qd3wxz91mdacvh4v888ifxwjhhjihffqvbj"; depends=[]; }; - stilt = derive2 { name="stilt"; version="1.1.0"; sha256="0qap66gl1iabwvar4fw7r159slmgzriljn4ikp3pas65y0pw2dz6"; depends=[fields]; }; + stilt = derive2 { name="stilt"; version="1.2.0"; sha256="1b9z64g1v5764h3y75xk1zkcv3imskvd44nqjp5m2dzmsw33nzji"; depends=[fields]; }; 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.3.0"; sha256="07q8kgw46rhj2lgfcxjz2z7b65z1syh5q94lfzp3zqd7lcbfp5yy"; 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]; }; + stm = derive2 { name="stm"; version="1.3.3"; sha256="1b1i4r161i92f5q63zjfghzg39bw9d2rqdxx0y6zjd8n2p0ni3wv"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; 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.1"; sha256="0ymk5skzsga0jr9chl52njlb23803a7cij0iaw6crssdf3sk226s"; depends=[data_tree R6]; }; + stminsights = derive2 { name="stminsights"; version="0.1.2"; sha256="17vpkrhhv8k5wyyrnc2hza175p51yl2nghvv9y2ymq27x4r2xq5c"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; }; + stoRy = derive2 { name="stoRy"; version="0.1.2"; sha256="1n2ivdv6fa3qkk2xhgcy8cixpbw6mijr4p8q34q8d9fvh9qs9g11"; depends=[data_tree 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.3"; sha256="0cg61djjfw4jmq71g8kddrihdy9n2vlpzlf7kl2f3p8njc1f8kk2"; depends=[coda Rcpp RcppArmadillo]; }; - stocks = derive2 { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; }; + stocks = derive2 { name="stocks"; version="1.1.2"; sha256="1i77cg4vmmc362ixqqkz48wipsszmb1z8pjrh713d27726nhj3ig"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp zoo]; }; stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; + stopwords = derive2 { name="stopwords"; version="0.9.0"; sha256="050v3hq1wd3w83zrp76nv6n67qsf5fss2cbihb6waijancm7zfzh"; depends=[ISOcodes]; }; 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.1.2"; sha256="1bv5qriqh1w8rishwxkm9xzz30ildrpcvnh4g3d8khh5r8dlz5lg"; depends=[digest R6]; }; + storr = derive2 { name="storr"; version="1.1.3"; sha256="0rmljnlnbi5jdxbh5mzxgkq9aa3mm46kl04jlasyng8pv3prxj1v"; depends=[digest R6]; }; stosim = derive2 { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[Rcpp tcltk2]; }; - stplanr = derive2 { name="stplanr"; version="0.1.9"; sha256="171m2d22wmcchh52sddd8rsna37718019cwb30d2j3zm8wcairgn"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sp stringi stringr]; }; + stplanr = derive2 { name="stplanr"; version="0.2.3"; sha256="1h6vflcb9pmfl2h3rny3p79isrd5gkp0cblvwi2yfvxi2ll5axp9"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sf sp stringi stringr]; }; stpm = derive2 { name="stpm"; version="1.6.8"; sha256="0gifkrpp8n4r31i4dfvjfq7w0l6jfid43i94ygqwwv0ca583aw4y"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; }; + stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; }; stppResid = derive2 { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[cubature deldir splancs]; }; + strandCet = derive2 { name="strandCet"; version="1.0"; sha256="019cacj0g9f6i8v03rq7qyph7f14d8n0qw0axvczijvnk99q602a"; depends=[boot corpcor MASS minpack_lm mvtnorm numDeriv]; }; + stranger = derive2 { name="stranger"; version="0.3.2"; sha256="05s4dv9w8dxy2x63ai8vyh3rwphr4h59axjsh7lqa05ja06pai5z"; depends=[assertthat data_table dplyr ggplot2 tidyr]; }; strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; strataG = derive2 { name="strataG"; version="2.0.2"; sha256="1rf1xf07yb0dzasgig9sfm4i9ggdkjgy5iiysqgdapk3sxs26c8r"; depends=[adegenet ape apex copula data_table DT ggplot2 gridExtra Hmisc pegas phangorn RColorBrewer Rcpp shiny shinyFiles survival swfscMisc]; }; @@ -10637,19 +11320,20 @@ in with self; { 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]; }; + streamMOA = derive2 { name="streamMOA"; version="1.1-3"; sha256="0vgnd27xl7lgir0ps3zsz7ca2vvjg8yp28zbfvdgvm3agk7dpra7"; depends=[rJava stream]; }; streamR = derive2 { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; }; + streambugs = derive2 { name="streambugs"; version="1.0"; sha256="1dyh5rwi47dn584nyy7f7vg5j5nlpz7ygcl8lwkj7prahplmzg5d"; depends=[deSolve]; }; stremr = derive2 { name="stremr"; version="0.4"; sha256="0n8ickmzjqlxwrz8dsphh1nsbnsgp4mnwm52i5ji099ps5292f65"; depends=[assertthat data_table pander R6 Rcpp rmarkdown speedglm stringr zoo]; }; stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; }; + strider = derive2 { name="strider"; version="1.1"; sha256="00r6gbvwmla5h27iyi7rdfd0kr4alxz19fd7g2ba0in3779za3sw"; depends=[BH Rcpp]; }; stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; }; stringdist = derive2 { name="stringdist"; version="0.9.4.6"; sha256="0j5b7hr53nr9xq44famkpwzi4khix93ffani5pwldqkf8bpdvhci"; 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.5"; sha256="1wh20is24lmzhcd9487ckv7r19009fyz4is3ianp3ky69vy8a7k5"; depends=[]; }; - stringr = derive2 { name="stringr"; version="1.2.0"; sha256="16hj2rmv8x03lp6cp2jk0k2plibvbggf444kp05przdvd03v7l31"; depends=[magrittr stringi]; }; + stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; }; + stringi = derive2 { name="stringi"; version="1.1.6"; sha256="122im5m8x9bqpahc0hbxmvdq6hnsmgnxwwyjpvbihyv2jq5kd44m"; depends=[]; }; + stringr = derive2 { name="stringr"; version="1.3.0"; sha256="07dvfbkhv8gk6l32j43jvxpmqlhqp0mdby406h5a3bsc6k94ic13"; depends=[glue 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.4.5"; sha256="002whpmzhqw8bhqbdilfmlz0q4hgh9yy4ad1kly6lngx2n3p7db0"; depends=[magrittr Rcpp stringr]; }; + striprtf = derive2 { name="striprtf"; version="0.5.1"; sha256="1pv67grm8fb1plsfxrfrmv0yk6cjnf44ssawddlcxy9mvg3ka5mm"; 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.5"; sha256="0m14jzhmkfn8dpxjzj8xh9zf6cggqj3awnfz7zh1xlkkka91jz8d"; depends=[lme4 mgcv penalized]; }; @@ -10657,32 +11341,36 @@ in with self; { strvalidator = derive2 { name="strvalidator"; version="2.0.0"; sha256="03f7clhs1hda3lkard7lbx4pfyqvhwm35r3d9sz2yksp5s78wbjk"; depends=[data_table ggplot2 gridExtra gtable gWidgets2 gWidgets2RGtk2 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.2.0"; sha256="0ib1jvrhxahlpaqai0zg49jr2iwn04c0iimfgvhvx3hyp9qhhbll"; depends=[testthat]; }; - stylo = derive2 { name="stylo"; version="0.6.4"; sha256="1z4db5p83b3fb3cfy4y8a4pi5hybda283988ri7215fk7rifg1jk"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; + stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; }; + styler = derive2 { name="styler"; version="1.0.1"; sha256="01iy3p0jn57c2glq2a5wh7ds3fyxlmcjpvxnmafvvvlhca73zw88"; depends=[backports cli enc magrittr purrr rematch2 rlang rprojroot tibble withr]; }; + stylo = derive2 { name="stylo"; version="0.6.5"; sha256="15y7iwk1w9kkdhpbgbvi1cqzza4jgw8zxsp3xbqzhm4qaf4kymia"; 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=[]; }; subgroup_discovery = derive2 { name="subgroup.discovery"; version="0.2.0"; sha256="17z49l26sfly3fln2z1x9vd6a6rsxn65z9lcb8kjylngm5s63rqj"; depends=[]; }; sublime = derive2 { name="sublime"; version="1.3"; sha256="0455fppc68azxknxjvxci4kjpcj6c1jkp9adbxqrn3qnnywaj5v2"; depends=[AnalyzeFMRI downloader oro_nifti]; }; + submax = derive2 { name="submax"; version="1.1.1"; sha256="0b9x55gqzw20smr3hx9izvyr0i8zv0h03hadn4c7ks7w8ga5i0kj"; depends=[mvtnorm sensitivityfull]; }; subniche = derive2 { name="subniche"; version="0.9.7"; sha256="1jsdcaf6d38j7c0ppjyilj0jd2dbpdldw6w4prmsbmx8mh7lplww"; depends=[ade4]; }; - subplex = derive2 { name="subplex"; version="1.4-1"; sha256="1imfdiw8r7kb2i0ir7z69cwz2ai7a3nr248m4pqacad2m9hvkdwl"; depends=[]; }; - subprocess = derive2 { name="subprocess"; version="0.8.0"; sha256="0hvja2gacr84izlsvxcbw1xmm57ycx0n9k5yn62p1v40d135wk9p"; depends=[]; }; - subrank = derive2 { name="subrank"; version="0.9.7"; sha256="0f1m4zk7s49f3kg8gz8g5af8r1x00m4zybdy5fmzvgnx9cx6crkc"; depends=[]; }; + subplex = derive2 { name="subplex"; version="1.5-2"; sha256="1v9xrnkapnq7v1jbhlg32ignklzf2vn8rqpayc8pzk8wvz53r33g"; depends=[]; }; + subprocess = derive2 { name="subprocess"; version="0.8.2"; sha256="1qyl8726vq94vqd6iyh9kca6wwxi3g7yv4b784wn2ifrm4waixxd"; depends=[]; }; + subrank = derive2 { name="subrank"; version="0.9.9"; sha256="1z6sp9rfmpy28gpw13bh0c7y98lbbgv1cciavg3gix01whqa49n3"; depends=[]; }; + subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; }; subscore = derive2 { name="subscore"; version="2.0"; sha256="1vscmzw6ama2kc7ic6b2rfbbczcpyhp0m4dd5khg9vkyihww5b5h"; depends=[CTT irtoys]; }; subscreen = derive2 { name="subscreen"; version="0.2.2"; sha256="08s8ys0ban80xbyfzjimbgld4622c5bn0qwjmsa7g0dn5ss3ccq9"; depends=[data_table plyr]; }; - subselect = derive2 { name="subselect"; version="0.13"; sha256="1zvvh6xcvbb05hxmyjwg80j2zhmqrlsjbj396k5s0kazkyvrwdyg"; depends=[corpcor ISwR MASS]; }; + subselect = derive2 { name="subselect"; version="0.14"; sha256="03sfnpj219a0ma92c2z953bh2y6s7w2c84lf2shnghmmxmg7jq9l"; 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.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-11"; sha256="1hv9d99ir1xz6p0arxr77dv5qb45sr8jhapm6wf755l7pxlqqklq"; depends=[magrittr]; }; - sugrrants = derive2 { name="sugrrants"; version="0.1.0"; sha256="12dqayn8hwbdqqn13v4zywn2h96q1wya4g04qs586qm6wx4p64nk"; depends=[dplyr ggplot2 lubridate magrittr purrr readr rlang tidyr timeDate]; }; + sugrrants = derive2 { name="sugrrants"; version="0.1.1"; sha256="08f5xdgimdvpivzrlwvdyrmy21nbh379pgfdrx4lxqcxd55y2hil"; depends=[dplyr ggplot2 lubridate purrr readr rlang tidyr timeDate]; }; + sumFREGAT = derive2 { name="sumFREGAT"; version="1.0.0"; sha256="13g3px3c3dxacrvgwrvqdp8lm7k185npr0dlq3siq9x9mgjr7hsj"; depends=[Matrix]; }; 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="1.0.2"; sha256="16z2c6xaf1mss5qygwpacn1slqzlkb502d1rw40m48v5akfg93sx"; depends=[d3r dplyr htmltools htmlwidgets]; }; - suncalc = derive2 { name="suncalc"; version="0.2"; sha256="0l62zdc9hqjyrd1nphdx57pi64ncw6j389hxbd1xnyrcnszlnwp0"; depends=[V8]; }; + summarytools = derive2 { name="summarytools"; version="0.8.2"; sha256="014hxyk0r87j5prqdckxy7h41agk2p1w1kxzl0a3pxwbj1j0r2fh"; depends=[htmltools matrixStats pander pryr rapportools RCurl]; }; + sunburstR = derive2 { name="sunburstR"; version="1.0.3"; sha256="0xxxi01klrm7kspi588n4h5zdzhph5vihs26n2x8fdm2k82jyjp9"; depends=[d3r dplyr htmltools htmlwidgets]; }; + suncalc = derive2 { name="suncalc"; version="0.4"; sha256="190bnh26bl26piq6512ijrx2hygzdscryjsjyz8y4ara8bf646r3"; 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]; }; @@ -10690,20 +11378,22 @@ in with self; { superbiclust = derive2 { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust fabia Matrix]; }; superdiag = derive2 { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[boa coda]; }; superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; }; + supernova = derive2 { name="supernova"; version="1.0"; sha256="18hyfq7gqx9n4s95yymkazyif9gzscrgfckis0s7hbban08iimpr"; depends=[]; }; 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-4"; sha256="1zg0wgqhcnk3sx87k3l9z4zf3ck3gk75rn37am1rq6wbzbfm96i4"; depends=[]; }; + support_BWS = derive2 { name="support.BWS"; version="0.2-0"; sha256="1yfjpr9v9zsbkysm3r6zk9r0a072g038lmj9wk4014a3rk9kmm80"; 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]; }; sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; }; surface = derive2 { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape geiger MASS ouch]; }; - surrosurv = derive2 { name="surrosurv"; version="1.1.15"; sha256="0ns189h33akzl8rs53yg9g1975133wv0csn5cg0lp26b2sh9qp1x"; depends=[copula eha lme4 MASS Matrix msm mvmeta optextras optimx parfm SurvCorr survival]; }; + surrosurv = derive2 { name="surrosurv"; version="1.1.24"; sha256="0c18pjkqgp5nm927jvcbgpfa4knrhnsq0492d1ysfr1li8sf9n7q"; 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]; }; + survClip = derive2 { name="survClip"; version="0.2.3"; sha256="1s82z8cld6qlg6dv0l4j4vyg58ji9qp7xkg6sxd9s88fpcjdnz3g"; depends=[checkmate clipper corpcor elasticnet FactoMineR graph qpgraph rrcov survival]; }; survHE = derive2 { name="survHE"; version="1.0.6"; sha256="128pjnm1m12qqhnz2izwmir64m99389qjr73vcqr19dgbkbgv28c"; 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]; }; @@ -10712,25 +11402,24 @@ in with self; { survPresmooth = derive2 { name="survPresmooth"; version="1.1-10"; sha256="0m1037v857g140lypck5zq2zf52rkdxzaqlj9kjn7h7lp6gif6ia"; 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.14.0"; sha256="0gx6ry2qyapn5lwk5hgl7pdijpqnpc0ccp623g79lzwx98w9rp4k"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; }; + surveillance = derive2 { name="surveillance"; version="1.16.0"; sha256="1nbskhbs8qfwnchig4rckbgy296ifl1hx0w3v71knj693x54r9cj"; 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.32-1"; sha256="0law5dw2kprbkclrq0xj5vy6qcbx4i0rmasmsawyl35q4y1v01ny"; depends=[lattice Matrix survival]; }; + survey = derive2 { name="survey"; version="3.33"; sha256="11pmk26hirq5p7p4131crpb175hvgg4id5y5m14rskpx8nbp9l94"; 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.2.0"; sha256="1iwhjhazfy38dbcj224kz3zbw2nvpq01ry54wmmkg9d0n6mb02h4"; depends=[dplyr magrittr plyr purrr stringr]; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; - surveyplanning = derive2 { name="surveyplanning"; version="2.8"; sha256="0p4yigwypy2hl747qvm0qm0q7vp7p8af0yapqi7aadbbpwyy9z7h"; depends=[data_table laeken]; }; - survidm = derive2 { name="survidm"; version="0.1.0"; sha256="0jpbnvwx7ilb3z10xg5y8palbk05ax1ad1qlz319rrblx0fxi75r"; depends=[doParallel doRNG foreach KernSmooth np survival]; }; - survivALL = derive2 { name="survivALL"; version="0.9.0"; sha256="1igilpba178za7cpp7h7w690w90vxmd24mxiw65wlyr0xvyn357b"; depends=[Biobase broom cowplot data_table desiR ggplot2 ggthemes magrittr pander png readr survcomp survival survsim testthat viridis]; }; + surveyplanning = derive2 { name="surveyplanning"; version="2.9"; sha256="0ad4122m78hbzhkkaspzpr62bl59w1j8z0qa67slqljjldhq1akv"; depends=[data_table laeken]; }; + survidm = derive2 { name="survidm"; version="1.0.0"; sha256="13iwl687g4qps6s3d8x0xr916b2ja6487dwnyqwc3nwr6gadqicw"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; }; + survivALL = derive2 { name="survivALL"; version="0.9.2"; sha256="0mqmlmip6lr1d6i8yj4kc1zzj5jvvqrkipqxlprsrqbwni2ipp7l"; depends=[cowplot desiR ggplot2 ggthemes survcomp survival viridis]; }; survival = derive2 { name="survival"; version="2.41-3"; sha256="07cnr0hnki6ybbjll54l4s5lllhk19vni5f8m0mvsfp99ls7qygk"; depends=[Matrix]; }; - survivalMPL = derive2 { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; }; + survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; }; survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; - 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]; }; + survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; }; + survminer = derive2 { name="survminer"; version="0.4.2"; sha256="15npx3q7xf7sl7pbb1476khgfpqrvidqcb101iim3iym125sl54r"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; }; survsim = derive2 { name="survsim"; version="1.1.4"; sha256="16njbqlzmk34zrh485kc0a52yacdyj9z4z4a9zcq1z5psm87c58m"; depends=[eha statmod]; }; survtmle = derive2 { name="survtmle"; version="1.0.0"; sha256="1sdp88br1ry6yzzav67787n0clpq6vjffxqpkvld93dyvmlb6zb1"; depends=[ggplot2 Matrix plyr stringr SuperLearner tidyr]; }; - survutils = derive2 { name="survutils"; version="1.0.0"; sha256="1dha1i2k9dyc9m9awqiq2ypy617zmw9yflfzv182z5fpd491ghrv"; depends=[broom dplyr ggplot2 lazyeval magrittr purrr survC1 survival]; }; + survutils = derive2 { name="survutils"; version="1.0.1"; sha256="09844i5nfyn0fm5i8ca96xz8dza21shh2f89w41zh17xaxvidjsw"; depends=[broom dplyr ggplot2 glue lazyeval magrittr purrr survC1 survival]; }; sutteForecastR = derive2 { name="sutteForecastR"; version="0.1"; sha256="13dd0v3l3s7xb1wnpf6qvnvclzab87831z8bsxsq53vpb26xcw1b"; depends=[forecast forecastHybrid fracdiff robets]; }; 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]; }; @@ -10738,187 +11427,212 @@ in with self; { svHttp = derive2 { name="svHttp"; version="0.9-55"; sha256="0qxsh6ifk3fszgzz497qwia4pxzplwraf2qnn5cqlv5l79nja5yq"; depends=[svMisc]; }; svIDE = derive2 { name="svIDE"; version="0.9-52"; sha256="19wsmi1i7nlnqdah1h2pxzsy8m50bnb282fdbj4219p86bb92a86"; depends=[svMisc XML]; }; svKomodo = derive2 { name="svKomodo"; version="0.9-63"; sha256="0x2774lhckhg8kw6plsn6dpks3b3fisb0psa03p7di7jx8vrkg5n"; depends=[svMisc]; }; - svMisc = derive2 { name="svMisc"; version="0.9-70"; sha256="1xprymz5hblbc929kmbaz0lj633xvgz6mm4snhhjib47cz5anl1w"; depends=[]; }; + svMisc = derive2 { name="svMisc"; version="1.0-2"; sha256="1a5wlz1csq6y2bqiznz14dlx5jc8z3x882yi2v82hinn647vn4m8"; depends=[]; }; svSocket = derive2 { name="svSocket"; version="0.9-57"; sha256="0id93b500iybza6sbn60ybm91mkh5cjpvhypqs4f3dv13m6blb9j"; depends=[svMisc]; }; svSweave = derive2 { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; }; svTools = derive2 { name="svTools"; version="0.9-4"; sha256="0szr5dcxjsh5p1nkszvmj0vmi9x70d656hfvhmqf0wyjwv63vp90"; depends=[codetools svMisc]; }; svUnit = derive2 { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; }; svWidgets = derive2 { name="svWidgets"; version="0.9-44"; sha256="18k06wldcg6xpyf8nz9rdbig5nhvghn7zgf1316413kq3v90vz7b"; depends=[svMisc]; }; svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; }; + svars = derive2 { name="svars"; version="1.1.2"; sha256="1d3dk4vn5l46xw5nh7k63v35phzvy9ixmbz0d2znl2nm05ih7gyy"; depends=[clue copula DEoptim expm ggplot2 pbapply reshape2 steadyICA tsDyn vars]; }; svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; }; svd = derive2 { name="svd"; version="0.4.1"; sha256="00plnwrjnp3majssr3qbz2zp25z9cfivgpggyfvy4lnc4av5qn3g"; depends=[]; }; svdvis = derive2 { name="svdvis"; version="0.1"; sha256="1z3z86izl2gpxllpx56vn6kkdg9cjjikfd90hdjnfi4bmmpx50dn"; depends=[GGally ggplot2 gridExtra RColorBrewer reshape2 scales]; }; svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; }; svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; }; svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; }; - svgViewR = derive2 { name="svgViewR"; version="1.2"; sha256="0h3smaplnkkvbl9c6lwl67jbk34m6sygkh2d82xz66hbyw2i6q7k"; depends=[]; }; + svgViewR = derive2 { name="svgViewR"; version="1.3"; sha256="0771k1v0aqlq8q9rvynb5dkwq0kmlsn8nh251lka98jwh36vhld0"; depends=[rjson Rook]; }; svglite = derive2 { name="svglite"; version="1.2.1"; sha256="1bws3lc4hlhln11zd7lalhiyc43yk6c6vrzy41fkxk1dkjazfx51"; depends=[BH gdtools Rcpp]; }; svmadmm = derive2 { name="svmadmm"; version="0.3"; sha256="15ccda1r9cc6v30j37i052rdwxgw0wg37hwyn2vp8c7bkr0ybgkm"; depends=[kernlab]; }; svmpath = derive2 { name="svmpath"; version="0.955"; sha256="02j5xs4gg8k16imnwk6aram168cv1dqdrky3bszyc98l7xd0nlrj"; depends=[]; }; svs = derive2 { name="svs"; version="1.1.0"; sha256="0575msaxg04ck76mbr815m29y895qvg8b9qg4y0ggv6b1lvwp5p6"; depends=[gtools]; }; svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; - swCRTdesign = derive2 { name="swCRTdesign"; version="2.1"; sha256="0c5pya5jgpj5ncrvpzahhrbhl7b39w19f3vl06r8q0nandbn7rwq"; depends=[]; }; + swCRTdesign = derive2 { name="swCRTdesign"; version="2.2"; sha256="0kggniy5p900cj074swh7g47zf8bhwjmqph9b5frw86nycxwyn3v"; depends=[]; }; + swa = derive2 { name="swa"; version="0.8.1"; sha256="1zy1a6c17vmdkmkwp8vv3niww2zs1m0hylsa0b2cz68vfhnmpim4"; depends=[ggplot2 reshape ROCR]; }; + swagger = derive2 { name="swagger"; version="3.4.0"; sha256="1590335n9l1s65li5018m0r3ss67ccgy10lnywxi2ypya71c58zs"; depends=[]; }; swamp = derive2 { name="swamp"; version="1.3.1"; sha256="1l4rk79hbggn31y5skslqsz9bv7lmya4q5ligki3x1677345hyhv"; depends=[amap gplots impute MASS]; }; swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; }; - sweep = derive2 { name="sweep"; version="0.2.0"; sha256="11hyv48hldacdbi7avvgmrqk9andjkabdswf1blfb4qyc2z0199v"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; }; + swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; }; + sweep = derive2 { name="sweep"; version="0.2.1"; sha256="0v6166p1h14klf1avqvry8jj3as498qnydksy0da8q1bp1sy007f"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; }; 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]; }; - swirlify = derive2 { name="swirlify"; version="0.5.0"; sha256="1j5xrv9nbfxmwxr77qa545fcm0vg76zwv1l5msgykq2g6cc9vc4z"; depends=[base64enc rmarkdown shiny shinyAce stringr swirl whisker yaml]; }; + swirlify = derive2 { name="swirlify"; version="0.5.2"; sha256="07r6rdj079ryafdgs0p8jhnk4h7iqm7agh9wjhvm12abbwjr9g1x"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; - switchr = derive2 { name="switchr"; version="0.11.2"; sha256="0kwkadw1hfkjvlpgr8lfx9qknlml3alk8ka2yhbga019y7ifbm7y"; depends=[RCurl RJSONIO]; }; - switchrGist = derive2 { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4yic133q07vki803zywhijadymrgyq7qlx3d1m97d"; depends=[gistr httpuv RJSONIO switchr]; }; - swmmr = derive2 { name="swmmr"; version="0.7.0"; sha256="1155gdsgbhr9fabsf5b63f47zicqj02yjm0fpgbbf3ds550s0hq8"; depends=[Rcpp xts]; }; + switchr = derive2 { name="switchr"; version="0.12.7"; sha256="1ymvghjvbrbsgn49mp8f9n4kv81626pa4pv05hrx813ly8h30mmq"; depends=[RCurl RJSONIO]; }; + swmmr = derive2 { name="swmmr"; version="0.8.0"; sha256="0cyr5x8k6agrgflqp14lxbas0yslwkz432ks71svqhdrl7dd5sg2"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; }; sybil = derive2 { name="sybil"; version="2.0.4"; sha256="0iyqr9iyb4bydmzjzrc721nzf5q36p2i3zciai9rzjlwx2mdw930"; depends=[lattice Matrix]; }; sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; }; sybilEFBA = derive2 { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; }; - 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]; }; - sylly = derive2 { name="sylly"; version="0.1-2"; sha256="04jbz0rzn2vx9xblfzxyk6x9l1g2s27cdq5ai0gbwgakjn6nx4j7"; depends=[]; }; + sylly = derive2 { name="sylly"; version="0.1-4"; sha256="14lw5sxrdvidk0465a7x0jz74cvqjbqv0wlqdy78qzbq4ilcmcaa"; depends=[]; }; 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]; }; + symbolicDA = derive2 { name="symbolicDA"; version="0.4-3"; sha256="012ha8m3137gns0q38lanpijdrqq6kcw934f2jgnxj6inl6drca0"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; }; symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; }; synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; }; synbreed = derive2 { name="synbreed"; version="0.12-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]; }; + synchronicity = derive2 { name="synchronicity"; version="1.3.2"; sha256="1idrjzl7nkamf1ip55s6qcf64s63xs9j8z9jv3r89p6r5lw7k5mv"; depends=[BH bigmemory_sri Rcpp uuid]; }; 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-2"; sha256="0rprvrixpnzc2yxgvp8gq72k145hb1f37fzp9lbpjc7yxy7hncmz"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; }; - sys = derive2 { name="sys"; version="1.4"; sha256="0x9npf3hybrh0vsr2bxax31k3x99p6klrc1gplp295mjiqxiy7sk"; depends=[]; }; - sysfonts = derive2 { name="sysfonts"; version="0.7.1"; sha256="04kimfdp895c6839ss7lqahd77jx3lz2gd3i849c2vkwi89v6vs9"; depends=[]; }; + synthpop = derive2 { name="synthpop"; version="1.4-1"; sha256="0725gv7b7kj564rf0nz6djvk58i39d9vv4g12qmgnsipgjs9rsrw"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; }; + sys = derive2 { name="sys"; version="1.5"; sha256="0yskm5mzps4435yvld9nfp6i5lqdy5ckpdwydvvbyjznz5yv01x2"; depends=[]; }; + sysfonts = derive2 { name="sysfonts"; version="0.7.2"; sha256="1jl66pyw9khi117523zanjjzdpnpgqdqx190w829xc4ljxzi8n55"; depends=[]; }; sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; systemfit = derive2 { name="systemfit"; version="1.1-20"; sha256="1qzgx4hn6f71hnk70ccf6inajprrb6my5af8q2manz41577z0ka7"; depends=[car lmtest MASS Matrix sandwich]; }; - systemicrisk = derive2 { name="systemicrisk"; version="0.4"; sha256="1qpimrfr75l6phr425m7av02l57yyn1n2if7h26cndf9ynmv6vz1"; depends=[lpSolve Rcpp]; }; - syuzhet = derive2 { name="syuzhet"; version="1.0.1"; sha256="0b0w98mx0zf28c55qmv93hfcfcjplrfk68qk2691fas23q14jn56"; depends=[dtt NLP openNLP zoo]; }; - tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.0"; sha256="088bh4miaskp0j15kcsi55x9iykry0wly66z78gpwanyb6zid04d"; depends=[coda dplyr ggplot2 gridExtra hdrcde MCMCglmm MCMCvis plyr rjags runjags SIBER]; }; + systemicrisk = derive2 { name="systemicrisk"; version="0.4.1"; sha256="1zimkyj58lk3iq5x4g6a76dain65j36s8c8jhx25sqjr5z2zmfsr"; depends=[lpSolve Rcpp]; }; + syuzhet = derive2 { name="syuzhet"; version="1.0.4"; sha256="0wf4rls7v7h7zkq2k550d16aqvaij27iim85cwif7dkbinajfngi"; depends=[dplyr dtt NLP textshape tidyr zoo]; }; + tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.5"; sha256="0qmkdsl0b2aw485vpbdqxdlfwg5a3i5bj4l67xv6h51fnbyfqfiz"; depends=[ArgumentCheck coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr rjags]; }; 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.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; }; table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; }; - tableHTML = derive2 { name="tableHTML"; version="1.0.1"; sha256="08dcl4a8lz3abw6cjsrvwj344yq7fj2qdak6l3aj2axnnjxiqqmh"; depends=[htmltools magrittr shiny]; }; + tableHTML = derive2 { name="tableHTML"; version="1.1.0"; sha256="0j2dk11h0dvibppyxjix4pxr6i9ji9ipzaizsr1fadrpk5xzawd5"; depends=[htmltools magrittr shiny]; }; tableMatrix = derive2 { name="tableMatrix"; version="0.8"; sha256="00l03blrrkwdrihqnwz8afx6s3d7a19laj44584546yd3prqx5dy"; depends=[data_table]; }; - tableone = derive2 { name="tableone"; version="0.8.1"; sha256="1rzh59ij53wzhnsxib47pgqmcmk65h0s9i9ifmwcvgjmcx71mn86"; depends=[e1071 gmodels MASS nlme survey zoo]; }; + tableone = derive2 { name="tableone"; version="0.9.2"; sha256="12lyyhfirj768fws1j93qhc6n8b89hrlafixiilsg7fy14w89620"; depends=[e1071 gmodels labelled lmerTest 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]; }; + tables = derive2 { name="tables"; version="0.8.3"; sha256="1n0kqsvwx2vg7nwyz7hi708xpf2jc9bz3y84aflnzcmbspj1wvf3"; 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=[]; }; - tabularaster = derive2 { name="tabularaster"; version="0.3.0"; sha256="1wym0m3i8k3vil8ylzn23jlzpaxjh3zndjiq3lwlz9xj8v96ni6n"; depends=[dplyr raster sp spbabel spex tibble viridis]; }; - tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.13.0"; sha256="089g2753zn1hw9nx7d00dkv80jx1h3njrla0nh619q5ahi1sqpmf"; depends=[broom car cowplot dplyr ggplot2 haven lazyeval lsr magrittr nortest pixiedust pwr ryouready sjlabelled sjmisc vcd viridis]; }; + tabularaster = derive2 { name="tabularaster"; version="0.4.0"; sha256="1hgbynjp19xwpin31j0647ldbzxam2kmkqnvj6v8kd4svps0kr3g"; depends=[dplyr raster sp spbabel spex tibble viridis]; }; + tactile = derive2 { name="tactile"; version="0.1.0"; sha256="0ygray05jlxrg7mxg412s04jrxjyskxlrl0xgxir8s6mzjg79iqy"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; }; + tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.16.0"; sha256="0i69zyiqq8mc5wfc9r43dpcjhwmq4iwj605n4a6h4hma37jjnc2g"; depends=[broom car DescTools ggplot2 magrittr nortest pixiedust pwr 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.7"; sha256="0y7hlwwjyc50hk8bci4r3ihasdqfq11v2ahfl90lyjpvrjnrd4zb"; depends=[assertthat data_table magrittr openxlsx purrr rlang stringi]; }; - tau = derive2 { name="tau"; version="0.0-19"; sha256="0z7ylw590r7jrw4rlmhahxiwqrnw3124fssnzqs36qa7pa3zqhq2"; depends=[]; }; + tailr = derive2 { name="tailr"; version="0.1.0"; sha256="1i7dvmmqrg2hylf5n1kwr5m6xc3ydcvfi5fx2dx9zapsv9bhlr4v"; depends=[glue rlang]; }; + tangram = derive2 { name="tangram"; version="0.3.2"; sha256="1dyfyl608k6a7vx9w0s2r6jr0y430qvkqkrrv24wav7snza4d5q2"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; }; + tatoo = derive2 { name="tatoo"; version="1.1.0"; sha256="1dsycdp3vln1m1w3nhhrr60x8raw6gbihjpav0d4ad8qla2fq8nh"; depends=[assertthat colt crayon data_table magrittr openxlsx purrr rlang stringi withr]; }; + tau = derive2 { name="tau"; version="0.0-20"; sha256="1inpqc2cz1vvjkmp8h3jpjvnvj0y5cwbbj92jlq0322w5w45vip9"; depends=[]; }; + tauturri = derive2 { name="tauturri"; version="0.1.1"; sha256="0v0p1avrx9vgnrli4zp6figm3s9265k9yny0acblbjlmz3z8smai"; depends=[httr magrittr plyr purrr tibble]; }; 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]; }; - taxa = derive2 { name="taxa"; version="0.1.0"; sha256="1pfdh68q1x2n6x3idh1c5mbygqhsf2bkbg5c5bri0zj2pxmrmv0g"; depends=[dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr tibble]; }; - taxize = derive2 { name="taxize"; version="0.8.9"; sha256="0dnghv9rwr6z1hk950zbvd1nnyngakzhvjr68321vmb5s58y4xs6"; depends=[ape bold data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2]; }; + taxa = derive2 { name="taxa"; version="0.2.0"; sha256="16jif3s5xf4cawwkhpmjrwb0c4ycmwicrshd5m0arlkcfmq85623"; depends=[dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr tibble]; }; + taxize = derive2 { name="taxize"; version="0.9.2"; sha256="15xv9j644a9zcbywx57ba6x6rsdj0pywdq58zak2fyx7c7fwpahm"; depends=[ape bold crul data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; }; 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.2"; sha256="1cl97f8g92549y177b6888hfrmfvvhzx9gsqv6pbix2a67k8zvcz"; depends=[foreign taxize vegdata]; }; + taxlist = derive2 { name="taxlist"; version="0.1.3"; sha256="0lsphap7brl67y458x29843wkxvvf2ppjn1crz4hby7wmn1psarx"; 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.2"; sha256="1zz310253s6gz0hzzldil5r03mm7ngvvnba7hxm8fm9dhfmvkbj6"; 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.6.2"; sha256="1cnakn8v0ijsq7bxw38fiab32cxcfyfm6k30ypsb3rr82hb8kh0l"; depends=[CompQuadForm ggplot2 GSA KernSmooth]; }; + tccox = derive2 { name="tccox"; version="0.1.0"; sha256="0b7f8kfsh97viplkjiiy8xm5b94ijnb0m748wqrnxgrvy8ikiy5k"; depends=[survival]; }; + tcgsaseq = derive2 { name="tcgsaseq"; version="1.6.6"; sha256="0sk8fydhfx1c3mrir3qx8bqcif220l6ggzmlw9yw8faha210ak2y"; depends=[CompQuadForm ggplot2 GSA KernSmooth]; }; tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; tclust = derive2 { name="tclust"; version="1.3-1"; sha256="1li62wynv81kb17fx7nk63a26qlb78l8fdf63in8yzcl7fkpji7y"; depends=[cluster mclust mvtnorm sn]; }; tcpl = derive2 { name="tcpl"; version="1.2.2"; sha256="1f32qq5816qkyx3n16vgf13g2piv2pqn2nki3c91vg51bwfap7z1"; depends=[data_table DBI numDeriv RColorBrewer RMySQL RSQLite]; }; tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; }; - tdr = derive2 { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; }; + tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; }; tdthap = derive2 { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; }; tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; }; teachingApps = derive2 { name="teachingApps"; version="1.0.2"; sha256="0rdgylcjwgbsasvd2mvi4qp74c3n4vg8yr59a82c2sidfkllci36"; depends=[actuar d3heatmap d3Network data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI needs networkD3 plotly radarchart Rcpp rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; }; + teamcolors = derive2 { name="teamcolors"; version="0.0.1"; sha256="07mqsbhrsy23qc4j1w1wji36cbh6dijkp6p7g3598nlzhw7ln3aj"; depends=[]; }; teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; }; - teigen = derive2 { name="teigen"; version="2.2.0"; sha256="0ljm8dz4hndnc37psr7mnl1gbxs1kghygz3cyqzld1xpjwsjc2cz"; depends=[]; }; + teigen = derive2 { name="teigen"; version="2.2.2"; sha256="1k5k3lj6av5pyx130w1j7avd0jdmm12ryc71mi5mq49sp95ndl4v"; depends=[]; }; telegram = derive2 { name="telegram"; version="0.6.0"; sha256="02wwa115f0vz2d9y4nf01397hjkpc3cv2gdl47snrajrm41gji7y"; depends=[curl httr jsonlite R6]; }; - tempR = derive2 { name="tempR"; version="0.9.9.10"; sha256="1lrl3q51xy598kpak97im7r0cp61zb7lygwxkib2ryskihrcfk7b"; depends=[]; }; + telegram_bot = derive2 { name="telegram.bot"; version="1.0.0"; sha256="10i126wa5dbpzxvr8f9zysfwg53051sk9cjdpdrjva1p3yvyn143"; depends=[httr R6 telegram]; }; + tempR = derive2 { name="tempR"; version="0.9.9.12"; sha256="1ipr9yb26f1mmyivbapbb83n1fxa4gpxqgb99p5nx6mzw71vyp4j"; depends=[]; }; tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; }; tempdisagg = derive2 { name="tempdisagg"; version="0.25.0"; sha256="0zi11jqb3i5kd2z1bbkz8y7g16kmkcn3xpkwj2brv0s86wxwsny7"; depends=[]; }; + temperatureresponse = derive2 { name="temperatureresponse"; version="0.1"; sha256="0q2x09cyy4zacbgmnwd43h1rwv2g3f2rk9cbg2phsvgxqx9vfm24"; depends=[AICcmodavg broom dplyr minpack_lm nlme numDeriv rootSolve tidyr]; }; 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.3.1"; sha256="1w8wl3s48wnxmahaklzkipsj3hrwzch8dp084j0zmk6rpbl1q4b7"; depends=[JADE Rcpp RcppArmadillo tensor tsBSS]; }; - tensorflow = derive2 { name="tensorflow"; version="1.3.1"; sha256="12r2bck3vz58cx8fznivda456g3f4xscai4hxcxv64yyz0gr8y1c"; depends=[config jsonlite processx reticulate tfruns yaml]; }; + tensorBSS = derive2 { name="tensorBSS"; version="0.3.4"; sha256="0wh14qy7fa7klb7yy272d16cvgfgnrf25wba3bqbpral9pv5nkmv"; depends=[ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; + tensorflow = derive2 { name="tensorflow"; version="1.5"; sha256="00g5fdr0ij2ximmqgd7a1hz66462lkjf4q6pn0knkhxcgp7jv8nn"; depends=[config jsonlite processx reticulate rstudioapi tfruns 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.1"; sha256="10sanqbnqdyqafjjcwm99zfnpgrv18z4y2rgaq5wqq7nni184hfm"; 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.6"; sha256="1apcmbkrbyrcdjc39w46shbic404pnkmqqdr0bdp193svp5df8rb"; depends=[curl digest rappdirs Rcpp]; }; + tesseract = derive2 { name="tesseract"; version="2.0"; sha256="0dps8nji7rx5vfa9g2kmdh3vgm9f61dbainl4arrqngcr5fglpnf"; depends=[curl digest pdftools rappdirs Rcpp tibble]; }; 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.7"; sha256="07qsnhghdgyxdknzq7ngpkf3qw9939m3lvk9dv9nk2zypy4jhcq3"; depends=[]; }; - testthat = derive2 { name="testthat"; version="1.0.2"; sha256="0pj1r01x4ny4capr83dfa19hi5i2sjjxky99schzip8zrq5dzxqf"; depends=[crayon digest magrittr praise R6]; }; + testthat = derive2 { name="testthat"; version="2.0.0"; sha256="155l53kb69jga5d8c5nvdwqlvlgfmk4vzyyl4d0108j53jnlgh1v"; depends=[cli crayon digest magrittr praise R6 rlang withr]; }; + testthis = derive2 { name="testthis"; version="1.0.3"; sha256="1q42nhp4nsazn31lxymb3zfj928ygbiv6jy7f0j4m3p02w2hqz5n"; depends=[assertthat devtools magrittr rprojroot stringi testthat usethis]; }; tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; }; texPreview = derive2 { name="texPreview"; version="1.1.0"; sha256="085aa9qgnmf3mqan2pff0gcdrz7kxd84r12lz780r1mr05ckk8zk"; depends=[magick rstudioapi svgPanZoom xml2]; }; - 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]; }; + texmex = derive2 { name="texmex"; version="2.4"; sha256="0s3x681f1qnbgmzi5iwqpmkfzpx9gsccd3q1vz1dppzq8fbid3c2"; depends=[ggplot2 mvtnorm]; }; texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; }; - text2vec = derive2 { name="text2vec"; version="0.5.0"; sha256="00bimgj82fbbicvbki22m3xvs42jqml3w3fmpw5rz743z2p8y34p"; depends=[data_table digest foreach futile_logger irlba magrittr Matrix R6 Rcpp RcppParallel sparsepp uuid]; }; - textTinyR = derive2 { name="textTinyR"; version="1.0.7"; sha256="1p5qsjs1k2n99p6vc05bqw3zfhh481ynrsnr5qjidf02iavcq00m"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; + text2vec = derive2 { name="text2vec"; version="0.5.1"; sha256="0vcp50mgpgxbf534vd8l56m8006i3sh8a4v9nrf9vxkq2pv7xygc"; depends=[data_table digest foreach futile_logger irlba Matrix mlapi R6 Rcpp RcppParallel sparsepp stringi]; }; + textTinyR = derive2 { name="textTinyR"; version="1.0.9"; sha256="1spzmxywzx6xk9z8jwhyab1g96rjq979zkb4sabl0sp362ccalfy"; 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]; }; + textclean = derive2 { name="textclean"; version="0.6.3"; sha256="0i6linb782257clkdpl7rv354myl9wc1417ad2glhh53lgcprfk2"; depends=[data_table english lexicon qdapRegex stringi textshape]; }; + texteffect = derive2 { name="texteffect"; version="0.1"; sha256="0fwcbz7bpynvcivac16z77j8d398bf7vl4l8sppi9yvg72l0k94w"; depends=[boot ggplot2 MASS]; }; + textfeatures = derive2 { name="textfeatures"; version="0.1.1"; sha256="0pcs3nax21npb5blbwrmzl7q85ya8n7vgjn83z2abjr80gj3f5lj"; depends=[dplyr rlang tibble]; }; textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; }; textile = derive2 { name="textile"; version="0.1.2"; sha256="067zli6sl7bp9843spgx47hmw55aq61yinqw1lqifmrpk7b0ywk5"; depends=[]; }; - textir = derive2 { name="textir"; version="2.0-4"; sha256="1ky22xar980afyydddahppad9m263mxnrdqpj1fcbmdhg8flwjgz"; depends=[distrom gamlr Matrix]; }; - textmineR = derive2 { name="textmineR"; version="2.0.6"; sha256="1rmypjg4p1gazyi1jvxc145yha2dg2mkkm5hm6y37is2h62badx2"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; }; + textir = derive2 { name="textir"; version="2.0-5"; sha256="0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb"; depends=[distrom gamlr Matrix]; }; + textmineR = derive2 { name="textmineR"; version="2.1.1"; sha256="15cs2x8cn1766inqck3bdfig0wngwny689bwmjrs5w66618007ji"; 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.5.1"; sha256="03j69xn5ligqypkkhj4w0avl4nzn5c87hz3ycz7cwlm2symkwadw"; depends=[antiword curl pdftools readxl rvest textshape xml2]; }; + textrank = derive2 { name="textrank"; version="0.2.0"; sha256="0s2mnid3dha3nyyc9abhb36vlij4bg0024i9ay4pvvy4l1x947gr"; depends=[data_table digest igraph]; }; + textreadr = derive2 { name="textreadr"; version="0.7.0"; sha256="081lqqclx2dlrv341178dagd5zajndf27lbrkrv78668cdfk58xr"; depends=[antiword curl data_table pdftools readxl rvest striprtf 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.5.0"; sha256="0hvp3mz7j2qkw38jg9cj92ikhyic1c9w8jk07z3vh3f5cm1klvbm"; depends=[data_table slam stringi]; }; - textstem = derive2 { name="textstem"; version="0.0.1"; sha256="09010a5flly5kiifx2jha5zvwncpk1xsgx2idipjnrav01plhin2"; depends=[dplyr hunspell koRpus lexicon quanteda SnowballC textshape]; }; + textstem = derive2 { name="textstem"; version="0.1.2"; sha256="172y1hvxhb33syqj5y369aq7fvcyn659cx6abcz7i5na8q1v9v0l"; depends=[dplyr hunspell koRpus lexicon quanteda SnowballC stringi textclean textshape]; }; textutils = derive2 { name="textutils"; version="0.1-6"; sha256="0xvsd6pfg4kv40l14xcvmirqiq8rmky4s8v8diagzri3a7i45nqn"; depends=[]; }; + tfdatasets = derive2 { name="tfdatasets"; version="1.5"; sha256="1ik6rzfnjmm54m7s2rvp1bq5jk0k2vl631bz3db3dk639jndiz6a"; depends=[magrittr reticulate rlang tensorflow tidyselect]; }; tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; }; + tfestimators = derive2 { name="tfestimators"; version="1.5"; sha256="069j6d5i19yc3nhxrrzwzassv4fv3bdhygxvqqc49nndyf5vwwbj"; depends=[magrittr progress purrr reticulate rlang tensorflow tfruns tibble tidyr tidyselect]; }; tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; }; tframe = derive2 { name="tframe"; version="2015.12-1"; sha256="0k0favda3z6zdg7ykc2nnl28gxz7sfzbyr5pcifiyi984pa2zgfx"; depends=[]; }; tframePlus = derive2 { name="tframePlus"; version="2016.7-1"; sha256="12xi2xw4pr78n3cppfknpxmjp2263pb4kqj9v412yxwp82rgb6yk"; depends=[tframe timeSeries]; }; - tfruns = derive2 { name="tfruns"; version="0.9.1"; sha256="1j90phx4xz9myappssx6kj8jgpsjhzhl5f94gqy13mlf36fm97hz"; depends=[config jsonlite magrittr tibble yaml]; }; + tfruns = derive2 { name="tfruns"; version="1.3"; sha256="02ib3k3jsmskk5cdxl2nyvnvpn7nlkgjb353z7qlwal0fgrssaln"; depends=[base64enc config jsonlite magrittr reticulate rlang rstudioapi tidyselect whisker yaml]; }; tgcd = derive2 { name="tgcd"; version="2.0"; sha256="1553f464jpmngdj8fmbjn9cpmrcp4ysgsfx4w7q4pm4csslsqvlr"; depends=[]; }; tggd = derive2 { name="tggd"; version="0.1.1"; sha256="1izar1b3w148vp2r8gv3vpwfndib8ilxcjxgbfzbxn7q5mr73mwa"; depends=[gsl]; }; - 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]; }; + tgram = derive2 { name="tgram"; version="0.2-3"; sha256="0vlnry8drq3fqfy8dk50pcwcx9dj657kx6s19fs2b6acigkr4g7w"; 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=[]; }; + theseus = derive2 { name="theseus"; version="0.1.0"; sha256="1f6vl0m8fcchafn78vrfw610d0sp9rf8kd3q5n7b0zd2yby10dq0"; depends=[dplyr ggplot2 gridExtra magrittr phyloseq ShortRead splancs tidyr tidyverse vegan viridis]; }; 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]; }; + thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; }; + thinkr = derive2 { name="thinkr"; version="0.11"; sha256="1rr90q91nn406n2sbn3k9q5y1mjcb4i4ixsp05mh38r9qjkbirhk"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr ReporteRs stringi stringr tidyr XLConnect]; }; threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; }; threejs = derive2 { name="threejs"; version="0.3.1"; sha256="1s3rdlzy7man6177ycayg6xsh6k8y1r9rdj9yzn3b93j2rs0nxbi"; depends=[base64enc crosstalk htmlwidgets igraph]; }; 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.3"; sha256="1nacwpzwzb6v6gxrdrarpnrgmsgnn6nsrg53b6866lcqsg09imvj"; depends=[Formula survival]; }; + thregI = derive2 { name="thregI"; version="1.0.4"; sha256="0zddd32fnfi98zwq08akkvhkg3c66sj3jii6ap8p1m9a0wg2k2k3"; depends=[Formula survival]; }; threshr = derive2 { name="threshr"; version="1.0.0"; sha256="1zrhmqpz3k2gyddrzg96yyyc1jffj3aic2dmbidxxc97b9g5hi53"; depends=[revdbayes rust]; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; - tibble = derive2 { name="tibble"; version="1.3.4"; sha256="02vn6yqzcvmazy5jaqar3wwbrmh83a1bfgsqgk0hgz38i80zgvm7"; depends=[Rcpp rlang]; }; - tibbletime = derive2 { name="tibbletime"; version="0.0.1"; sha256="0c7iyzlldrxwkjvchsc6clv3ylv1krm3grl8wlmdb13iyjfp6p1r"; depends=[assertthat dplyr lubridate magrittr purrr rlang stringr tibble tidyr]; }; + tibble = derive2 { name="tibble"; version="1.4.2"; sha256="05svbjkm1xqv56ybjgsqqg2pp8nn6hams1yxcr8aanbhzx9h6rqi"; depends=[cli crayon pillar rlang]; }; + tibbletime = derive2 { name="tibbletime"; version="0.1.1"; sha256="15rp66p4pgiv7fd0rx1pzqlpsg4i4j5j368cwqm1mf1m4xknz6yy"; depends=[assertthat dplyr glue hms lubridate purrr Rcpp rlang tibble zoo]; }; tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; }; 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.2.2"; sha256="1vyn6fr25b0216716sp26rg3gdklqz60m6hffd01m52pvwvhk9qx"; depends=[dplyr httr jsonlite lubridate magrittr purrr testthat tibble xml2]; }; - tidycensus = derive2 { name="tidycensus"; version="0.2"; sha256="0d80yy59avy9h2ksyv6iabiqkqa8bgr1i2s8n43w569fisjzlf9i"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; + tidyLPA = derive2 { name="tidyLPA"; version="0.1.2"; sha256="11xc8lnhs63ykaq2g3jzrp4kz48zz03cvw5s935fvhsp05drf6g5"; depends=[dplyr forcats ggplot2 magrittr mclust purrr readr rlang stringr tibble tidyr]; }; + tidyRSS = derive2 { name="tidyRSS"; version="1.2.3"; sha256="1m21cwdbhial4h3084vqs0j6zwa267ia75gyjivprqjzcccjaqdp"; depends=[dplyr httr jsonlite lubridate magrittr purrr testthat tibble xml2]; }; + tidyboot = derive2 { name="tidyboot"; version="0.1.0"; sha256="1h997hrwacm91myhy93jrinx0h715da76wm9kwz9nwwzisv62m6k"; depends=[dplyr modelr purrr rlang tidyr]; }; + tidycensus = derive2 { name="tidycensus"; version="0.4.1"; sha256="1ay6qw25r809fpgs0fsvblgsrpi91ph82mm2w21vj59gba1bkr71"; 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]; }; - tidygraph = derive2 { name="tidygraph"; version="1.0.0"; sha256="1z0jmhwj3m1xk9zmds2riyqmq189716j5qi6ijgf3xni3n25c0m0"; depends=[dplyr igraph magrittr R6 Rcpp rlang tibble tidyr]; }; - tidyquant = derive2 { name="tidyquant"; version="0.5.3"; sha256="1vvmx0l5vd434gjsqd19vlnzk0hxgh82b1dsf2zwshc9hni1b75l"; depends=[broom curl devtools dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries timetk tseries TTR XLConnect xml2 xts zoo]; }; - tidyr = derive2 { name="tidyr"; version="0.7.1"; sha256="18fii18f967xaw6swn0w744sncx37rfq6gd8d9dccrpyf8647hmr"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; }; - tidyselect = derive2 { name="tidyselect"; version="0.2.0"; sha256="1h10qc5bxk5v0zhmip3gwnzy50fs2gbdvcg2163is0k9a8rifq9r"; depends=[glue purrr Rcpp rlang]; }; - 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.3"; sha256="1rl51qrkzfw65px236x3hryfcfkrv6v1mxy5bqanlxcxyv94pnp2"; depends=[Rcpp]; }; + tidygraph = derive2 { name="tidygraph"; version="1.1.0"; sha256="1cqmii1pia5s8cj1hfm5jh4qgg9dn65dcb666bqfhq51nzgwy6b4"; depends=[dplyr igraph magrittr R6 Rcpp rlang tibble tidyr]; }; + tidyhydat = derive2 { name="tidyhydat"; version="0.3.3"; sha256="01l4dwsrrmfavskbqxcq5v1ykggk363nn0m0nf6ks51xdr7lckf5"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr RSQLite tibble tidyr]; }; + tidyimpute = derive2 { name="tidyimpute"; version="0.1.0"; sha256="03b475nn206hxq3i0n7j1qws82rwwk5vqivmdg5mff44dvz4gl5s"; depends=[dplyr na_tools rlang]; }; + tidyinftheo = derive2 { name="tidyinftheo"; version="0.2.1"; sha256="1lh1smhnfg5x35ans3rlj6nvrqwkaiac3ycy7r8wz5h9fhlri3pg"; depends=[dplyr ggplot2 infotheo magrittr purrr rlang tibble tidyselect tidyverse]; }; + tidyposterior = derive2 { name="tidyposterior"; version="0.0.1"; sha256="09q2j6kjwqphdzi60w26mlax9fnmndw7s3fsxfcj0pjjl8688w52"; depends=[broom dplyr ggplot2 purrr rlang rsample rstanarm tibble tidyr]; }; + tidypredict = derive2 { name="tidypredict"; version="0.2.0"; sha256="1hq9xzaa234679qvf02nc5w8l21yh1f3dhl76zxzqc7na7chn13k"; depends=[dplyr purrr rlang tibble tidyr]; }; + tidyquant = derive2 { name="tidyquant"; version="0.5.4"; sha256="1ip3vivn6x0ip2y4izq4cz5lh31ygsymkvbb4jqvb8dj5wywr2hq"; depends=[alphavantager broom curl devtools dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries timetk tseries TTR xml2 xts zoo]; }; + tidyr = derive2 { name="tidyr"; version="0.8.0"; sha256="1qjpbj1a2vw6nw4hdb6fgassnrxrdpqwf9a8i6wqnv3wxvjb6zqb"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; }; + tidyselect = derive2 { name="tidyselect"; version="0.2.4"; sha256="1592dbzawhd1hpsp9919l4sifyiaaj6xr7lnhsbwa6jwmmb0xcsw"; depends=[glue purrr Rcpp rlang]; }; + tidystats = derive2 { name="tidystats"; version="0.1"; sha256="0dy4yqdc0y8pmix29100x80q828rapnq9y3qn2p6rs763c7canmr"; depends=[dplyr magrittr purrr readr tibble tidyr]; }; + tidystringdist = derive2 { name="tidystringdist"; version="0.1.2"; sha256="1jk5yqkjf33arbbfgfzk7ym943gy95n3yncybmvwbjsff07qpmaw"; depends=[attempt dplyr magrittr purrr rlang stringdist]; }; + tidytext = derive2 { name="tidytext"; version="0.1.7"; sha256="1pvf46z1jiwi1j0z917mml1cg9527zkdckh8h3d1ks4wawz099a9"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; + tidytree = derive2 { name="tidytree"; version="0.1.7"; sha256="1hf4xzdaww9vbh7ii88p43fpd8344zvqnw20ylvx58f7p82yl23b"; depends=[ape dplyr lazyeval magrittr tibble]; }; + tidyverse = derive2 { name="tidyverse"; version="1.2.1"; sha256="0yy3fkjksgcn6wkbgsb0pbnmsyqs4m01mziqafhig578nixs4rxd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; }; + tidyxl = derive2 { name="tidyxl"; version="1.0.0"; sha256="1bsvxsz24qbk9wca8kh4qrb4fi22i49vpciq1pm5c48jb11bjb6b"; depends=[piton 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]; }; @@ -10926,78 +11640,85 @@ in with self; { tigger = derive2 { name="tigger"; version="0.2.11"; sha256="1kbqlfr3lsiiv0l7dzahna706zb4mx0gfx91220n2ckfc81pyrv5"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval 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.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]; }; + tigris = derive2 { name="tigris"; version="0.6.2"; sha256="0m4zramm38111rzifh0lqyly2dgdfgg5y39sns2rp8x1n0b69bc2"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; + tikzDevice = derive2 { name="tikzDevice"; version="0.10-1.2"; sha256="1rwxmjwmjr1dssg9dx7rc6nz11225pz2ac9rhp8581slwzw79icl"; depends=[filehash png]; }; 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=[]; }; + timeDate = derive2 { name="timeDate"; version="3043.102"; sha256="0wvl5pq261rvbgly7vilk3x3m9xk3ly6il1i5scwdf6srl1vlz1p"; depends=[]; }; timeROC = derive2 { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; }; timeSeq = derive2 { name="timeSeq"; version="1.0.3"; sha256="1jdmcbghqmp9phfx7bii8nfqdc10f1nqmi1mk70n0fysm6cdvhn6"; depends=[gss lattice pheatmap reshape]; }; - timeSeries = derive2 { name="timeSeries"; version="3022.101.2"; sha256="0yr5j8w6p0k05g76hjhkrbx3vb166p5916grigc1yag6baj6nsij"; depends=[timeDate]; }; + timeSeries = derive2 { name="timeSeries"; version="3042.102"; sha256="185hmd70hida6i12mxbrccapkpwb6jhf6cmcfbz8bc3sv9h3q5gs"; depends=[timeDate]; }; timedelay = derive2 { name="timedelay"; version="1.0.7"; sha256="01rl3nwazxlypimaclyjr6ihwn75jfaffp43b94msvf25xd30aiy"; depends=[mnormt]; }; 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.1"; sha256="1rm3b8i3vrajd50rfm39hlyz1idxxwlj73zga2q8gm0md75034rv"; depends=[lava numDeriv survival]; }; + timereg = derive2 { name="timereg"; version="1.9.2"; sha256="0ddckk8vrfkk4kwlrjms6niry6g6c8dz0yf96z2kq03jgs06kfdh"; 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]; }; timetk = derive2 { name="timetk"; version="0.1.0"; sha256="0z4zb00c4xbjn3ppz6ypcab2ahkr76mj6v68yfxkjb233cb18641"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; }; - timetools = derive2 { name="timetools"; version="1.12.2"; sha256="17vw0piqzjr3vkpccksxk0razlvb9pcbwq737xkhabp363b8rqbx"; depends=[]; }; + timetools = derive2 { name="timetools"; version="1.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; 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]; }; - timsac = derive2 { name="timsac"; version="1.3.5"; sha256="1p2fwizq95fhbw0jk23sy0qgkkkab0iy37sw71krpm0dzrgi6lj0"; depends=[]; }; + timsac = derive2 { name="timsac"; version="1.3.6"; sha256="186919qka9j3kfpdw2gbh16n48d6xgz9lfqgk4b17f1d7l72iplg"; depends=[]; }; tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; }; - tint = derive2 { name="tint"; version="0.0.3"; sha256="1ffysnp2q4g123lgyhjw92j9dwh8b1yfqsrpqfv4s9qnjb6bqr7z"; depends=[htmltools knitr rmarkdown]; }; + tint = derive2 { name="tint"; version="0.0.5"; sha256="1283rik1ynnhy40lm1dipmwzihsy0pdn383k9m1yczl2fqf1qcfi"; depends=[htmltools knitr rmarkdown]; }; + tinyProject = derive2 { name="tinyProject"; version="0.5"; sha256="10sllhjcla4pfgp5n1y5vi318q9bcy82j88rx3k1sgzmbq1nc1c2"; depends=[brew devtools]; }; + tinytex = derive2 { name="tinytex"; version="0.4"; sha256="0ipmv5jrp6kkfj4m4zvhfys54x34zi15lzdxbgzmnil9lyn391zm"; depends=[]; }; tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; - tis = derive2 { name="tis"; version="1.32"; sha256="1qiywhsqgshs5v7780wlyic9ykxdpf26rsywakmb4y6fc3pjrhi7"; depends=[]; }; + tipr = derive2 { name="tipr"; version="0.1.1"; sha256="138xmkfad0xjrmr9v3ladbwsyknyad27wxcav03n6f72plhxmxb6"; depends=[broom purrr tibble]; }; + tis = derive2 { name="tis"; version="1.34"; sha256="01bpl8q2n49wpr2gghkcv1zf16b3375xa71mv0q7wwn0da3n7m0n"; depends=[]; }; titan = derive2 { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; }; titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; }; titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; }; + tkRplotR = derive2 { name="tkRplotR"; version="0.1.1"; sha256="0fr30c2xjgpjh0pkqv0m7g413wkzzffbak7ak26k7bsi2ls341qa"; depends=[]; }; 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.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 = derive2 { name="tm"; version="0.7-3"; sha256="048wrk1grd3r95a46aaxrwsgpj1l5afbzda8434b1zr1wr8y3hzk"; depends=[BH NLP Rcpp slam xml2]; }; tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; }; tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-8"; sha256="0z843i2wlmx75748p95jz3j45d9bzmlmqa3awgya24k7bdhpd6kd"; depends=[DSL NLP slam tm]; }; tm_plugin_europresse = derive2 { name="tm.plugin.europresse"; version="1.4"; sha256="03qi9rkfwgjvir4cjpi9imc8zaldvan42v9lqfr5d6zhr0ajy6wx"; depends=[NLP tm XML]; }; - tm_plugin_factiva = derive2 { name="tm.plugin.factiva"; version="1.6"; sha256="1g4gqhha4936whnir1j31jlcbg9x6jhay7yl1c2pzhldldqj98ih"; depends=[NLP tm XML]; }; + tm_plugin_factiva = derive2 { name="tm.plugin.factiva"; version="1.7"; sha256="1zcddarjd083p3sly49wvsnbn6bmpx5wd1bqm3acgydxk8y84nif"; depends=[NLP rvest tm xml2]; }; tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.3.1"; sha256="15k4bzx1p271yzskkijlf2pm6m7pb5dqxmfab9rhwynllszv96if"; 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.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=[]; }; + tmap = derive2 { name="tmap"; version="1.11-1"; sha256="0day8hy210a2v2ps9pqcv4mnlx39h7dcj47hkyjsm76qlcdccv3l"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; }; + tmaptools = derive2 { name="tmaptools"; version="1.2-3"; sha256="08m8dir5k7da72fp3hcsb055alwzpbxr2f9lxmhdbk991bmwacjr"; depends=[classInt dichromat geosphere KernSmooth magrittr osmar raster RColorBrewer rgdal rgeos rmapshaper sp spdep XML]; }; + tmbstan = derive2 { name="tmbstan"; version="1.0.0"; sha256="01x1nw0mlbpsldrd6hx2g040d9slrhk7hm2pm1v7pci3vxgbpgy9"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; }; + tmcn = derive2 { name="tmcn"; version="0.2-12"; sha256="1gqmq3f0plgd44056905l5jd7x9k4ls06hcp006w8skxj1rnwzb9"; 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 = derive2 { name="tmle"; version="1.3.0"; sha256="0krnf2mzxmcb105gsx1b0gpc009lv27s0brh6sa1sm87a76p6dqd"; depends=[SuperLearner]; }; tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; }; tmlenet = derive2 { name="tmlenet"; version="0.1.0"; sha256="1pg9w7yci9j0m1cxi0nwdpp6jwap0b7ql4xkh25kjbq3w5r8w8pr"; depends=[assertthat data_table Matrix R6 Rcpp simcausal speedglm stringr]; }; - tmod = derive2 { name="tmod"; version="0.31"; sha256="1qqzngqnj4vk170ild34fpzsnpb1125zisf6xx5hp8q899z88q81"; depends=[beeswarm pca3d plotwidgets tagcloud XML]; }; + tmod = derive2 { name="tmod"; version="0.36"; sha256="054kg3rwcmrn1y1x1ba8wflb6m76nmf69g4yj3x1vw0qjjs421nh"; depends=[beeswarm plotwidgets tagcloud XML]; }; tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; }; + tmuxr = derive2 { name="tmuxr"; version="0.1.0"; sha256="0njd1wdk11bni0pinplyzywqlmswkq2xq7qid68v4s93q9069zn6"; depends=[magrittr purrr stringr]; }; 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.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="1.0-0.0"; sha256="1y46rcm6v2c5n71hdf5rgsgvy913wiazmml60mlxqb70dvz42649"; depends=[crayon testthat]; }; 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]; }; + togglr = derive2 { name="togglr"; version="0.1.3"; sha256="033d4mcl2w7nbjmaa5bc28skd63x34k4k4ib94nf11iwdj7bipkw"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr prettyunits purrr rstudioapi]; }; 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-6"; sha256="13z04bgr6nxn5mr7891nm8ryixfp988ad9vmfjy4li9jsyr48q6d"; depends=[modeltools slam tm]; }; - topmodel = derive2 { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; }; + toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; }; + topicmodels = derive2 { name="topicmodels"; version="0.2-7"; sha256="16qa27pw19an6snqsqmgx439jqjjm8fx2lva3pnz5rd33xf701yc"; depends=[modeltools slam tm]; }; + topmodel = derive2 { name="topmodel"; version="0.7.3"; sha256="15w9id90d6l0i0ji3ln3sxnpispb6pgabk4waysqn0nh6y4lfdgb"; 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=[]; }; tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; }; + totalcensus = derive2 { name="totalcensus"; version="0.3.0"; sha256="0i7srsfhskfcq7fdc3sq2rq2p6x508pwgbig86l92zki3ljm7qgs"; depends=[data_table magrittr purrr stringr]; }; touch = derive2 { name="touch"; version="0.1-3"; sha256="1zzc4h6y0xmr3p7jl0vlvn4yswxz5akgvz8laxgmjgqzk926g9jl"; depends=[stringr]; }; tourr = derive2 { name="tourr"; version="0.5.5"; sha256="12293kp36kz056zd3fnsaf2gy4g8mcs79ws0vgbs7b0hx09sy9vp"; depends=[]; }; 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]; }; - toxplot = derive2 { name="toxplot"; version="0.1.0"; sha256="0sl3ihagfxa7xl2l7xsrmvp6j1pxlrsqcljmwpwrn0sd5sdwyjm0"; depends=[dplyr ggplot2 ggthemes tcpl tidyr]; }; toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; }; tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; }; tpe = derive2 { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; }; @@ -11005,43 +11726,47 @@ in with self; { tracer = derive2 { name="tracer"; version="1.0.0"; sha256="1jdh4ljcz7d0w2y5miggqkvv397jdx7fn108hbjw93af2gnh698q"; depends=[clisymbols crayon prettycode]; }; tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; }; track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; }; - trackdem = derive2 { name="trackdem"; version="0.2"; sha256="0gvra57bilx504lijp7gr7z6alkivsnpqi2lbbvcp1dchzaf4gwi"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools]; }; - trackeR = derive2 { name="trackeR"; version="0.0.5"; sha256="0c1wfc41a0n9ldz7mmcss3m2c7lz5wjmv5ifwn9h6ih7wng9d707"; depends=[colorspace fda ggmap ggplot2 gridExtra gtable jsonlite leaflet raster RSQLite scam XML zoo]; }; + trackdem = derive2 { name="trackdem"; version="0.3.1"; sha256="10qq9217mpd4abhkwsh4yjzpi06qpqa5rnwhxls6yzmymf9apngl"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; }; + trackeR = derive2 { name="trackeR"; version="1.0.0"; sha256="0z200jlkgcdxwss0ckbh3vqcfw56fi7pivr9vzf4rkwyf2n6v25s"; depends=[fda ggmap ggplot2 gridExtra gtable jsonlite leaflet raster RSQLite scam XML zoo]; }; + trackr = derive2 { name="trackr"; version="0.7.5"; sha256="1achrnkqnpdjp2vr1s7xsl8fdfdyifgv5vr00b3xq9pkr4jggj6z"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools knitr lattice miniUI RJSONIO rmarkdown rsolr shiny]; }; 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.3.0"; sha256="155y8j69214xxi1bfk07k30zlpm3q6fmz7ydhnkvw0kv4l0i5pc5"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; }; traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; }; trajectories = derive2 { name="trajectories"; version="0.1-4"; sha256="0vwfbx5s8ywasxwv8cld4s6r96vlyknxipp49rsfpqn94nawhwnx"; depends=[lattice sp spacetime]; }; + trajr = derive2 { name="trajr"; version="1.0.0"; sha256="1q17lgwgxn9j3ym1vikrnnyqf61ri3vl7jqq3f1fvy2280nac0s8"; depends=[plotrix signal]; }; + tram = derive2 { name="tram"; version="0.2-0"; sha256="02jbgp011qbinyjwdmj0nc2mpphmqlhm0dvvs7x2lfngrw1fw163"; depends=[basefun Formula mlt multcomp sandwich survival variables]; }; tranSurv = derive2 { name="tranSurv"; version="1.1-4"; sha256="1vsp12x4h0s1lba1kf7n0v71kgm1dz6cjfp8lffm4ps80nahs63l"; depends=[rootSolve SQUAREM survival]; }; transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; }; translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; }; 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-2"; sha256="0l6scyfw8ygzjg2b0q04k3mkrmhv8gj4hmjkkcqvpa7q1cnma10h"; depends=[]; }; + transport = derive2 { name="transport"; version="0.9-4"; sha256="0ham0cla4qwfd6fqyckpdl2n2gm3qnl7ry1xi9kjvbajlcc0xwi2"; depends=[Rcpp]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; - treatSens = derive2 { name="treatSens"; version="2.1.2"; sha256="0zqpx0lwx3vzbwi55n0517zs5vn4zlaf66js506vxnzf1dzx2h0a"; depends=[BH dbarts mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; + treatSens = derive2 { name="treatSens"; version="2.1.3"; sha256="159dpd4wg0i4cidg40lad665sm3j4qch8d1y3k9chwggbhcad5jn"; depends=[BH dbarts lme4 mvtnorm nlme Rcpp RcppEigen]; }; tree = derive2 { name="tree"; version="1.0-37"; sha256="091297qhvqhgjmnyr96jkwaghz8dkbf03rnhwfhks8bsgax6jl13"; depends=[]; }; + tree_bins = derive2 { name="tree.bins"; version="0.1.0"; sha256="0cqpvh9cbnsk4qv886n2sc1v1s51z4m6aj0ydqzijvy6ckigbiij"; depends=[data_table dplyr rpart rpart_utils]; }; treeClust = derive2 { name="treeClust"; version="1.1-6"; sha256="07cw8mnfrkw733ga3aq4am1pj50g8vk0rw6b3lflnb4wdhm2fgbi"; depends=[cluster rpart]; }; treeDA = derive2 { name="treeDA"; version="0.0.2"; sha256="0ldk7g0bfs8y0znivhj8db5si7glxawicc5zvapbf8d9djlaxxga"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; }; - treeHFM = derive2 { name="treeHFM"; version="1.0.3"; sha256="10pyvyyz9ia4dpj8zkil56ipbvbks5xh0n9hkdy0hcinsyq0ba29"; depends=[mclust]; }; treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; }; 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.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]; }; - treemapify = derive2 { name="treemapify"; version="2.3.2"; sha256="0cixn3v41fki4iyvwmxsljwacffyb27q87cgnnw7sqf0vnkgb2gy"; depends=[ggfittext ggplot2 plyr reshape2]; }; + treemapify = derive2 { name="treemapify"; version="2.4.0"; sha256="1cg8jwlls3r3kjlmmxcm9id2spsn5ggsjrw0826ih2khdlnjc0jy"; depends=[ggfittext ggplot2 plyr]; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; }; treeplyr = derive2 { name="treeplyr"; version="0.1.3"; sha256="00fkmmzivwy603grfbwdabsik1swkyba7sbwcjzxbgsmx3s472g6"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; }; - 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]; }; + treespace = derive2 { name="treespace"; version="1.1.2"; sha256="0am3ssdxf8v98hffncrg1zdpgcr79gvvr6z2mara04r0rxk86kaw"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools 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.8"; sha256="1581ss5c3f7mnv6s3p9f8kfwnks0l80kxwpxv9mq61w3lf9fksm2"; 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="1.0.0"; sha256="1fbzylw90y2h8qmg6hivhrrvv154jgfi77qij9wrh58rl2yq6gsj"; depends=[extraDistr]; }; - triangle = derive2 { name="triangle"; version="0.10"; sha256="02s7iblk3fdrjhz0sns76bqrfwi0y0l6vbjfsb5mzq6pn45n0nkv"; depends=[]; }; + trend = derive2 { name="trend"; version="1.1.0"; sha256="06yifqbsvxbmk5gld4z2nnyhf59v8ks5xjwacmb25mv9r6bn388b"; depends=[extraDistr]; }; + trialr = derive2 { name="trialr"; version="0.0.1"; sha256="0v274a4w9pamlp9y7xs8hw783ib7z3p19gx94dciyvgm2wj9h7di"; depends=[BH gtools Rcpp RcppEigen rstan rstantools StanHeaders]; }; + triangle = derive2 { name="triangle"; version="0.11"; sha256="0983bvywbyl0sms29j1hby2qy6p984vy4r0q1awh1f8gr01bbk5b"; depends=[]; }; triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; }; - trib = derive2 { name="trib"; version="1.2.0"; sha256="0bvz1cvi2fx40b5rdv4gfama11dn20rz4506k4fjsny32yswpqyw"; depends=[zoo]; }; + tribe = derive2 { name="tribe"; version="0.1.6"; sha256="0sx6hyfyg8x0vxq4l4gvv5kb8afrbjp3qk3s48l85vf5v1chwnhf"; depends=[bazar dplyr lazyeval magrittr rlist rstudioapi]; }; triebeard = derive2 { name="triebeard"; version="0.3.0"; sha256="1hqyz57gph02c9fdc07lxz113bbklif3g18sw8jan6pakhhdc7dz"; depends=[Rcpp]; }; trifield = derive2 { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; }; trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; }; @@ -11051,19 +11776,21 @@ 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=[]; }; - tropAlgebra = derive2 { name="tropAlgebra"; version="0.1.0"; sha256="1pimvcnmj9gg454vxgx0cp8lip89f704w5v6pmlpfj34s7h88474"; depends=[]; }; + triversity = derive2 { name="triversity"; version="1.0"; sha256="1bar2bpy8jvj91jmzzdwy6rlvirsbxrzqnx4r825irqhc69gc53r"; depends=[data_tree Matrix]; }; + tropAlgebra = derive2 { name="tropAlgebra"; version="0.1.1"; sha256="1idvhxhw2f6z8iq0nfdj6jmzy8913vid84rvln6rx2dkzw3s9wnl"; 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=[]; }; + trtf = derive2 { name="trtf"; version="0.3-0"; sha256="1fca08lkwaa9m7ac69i3k3d8dxn8fp231yh68gz3ym8ja9vhzd7w"; depends=[Formula libcoin mlt partykit sandwich variables]; }; trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; }; truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; }; truncdist = derive2 { name="truncdist"; version="1.0-2"; sha256="02ihw4ixhadwr3sqm6r264i8vpcaz8pn69vkzabd8fwqvn5vcj5q"; depends=[evd]; }; truncgof = derive2 { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; }; - truncnorm = derive2 { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; }; + truncnorm = derive2 { name="truncnorm"; version="1.0-8"; sha256="0zn88wdd58223kibk085rhsikl4yhlrwiyq109hzjg06hy6lwmj9"; 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.6"; sha256="14vxcpdmp3avkjdwqyh3hj3v315zwdp7cl5f67pwzj3l69gm1yh5"; depends=[Matrix Rcpp RcppEigen]; }; - tsBSS = derive2 { name="tsBSS"; version="0.3.1"; sha256="0dsf93as0afyfbsca6p3g23ss38jl55xkgb4lmimxd4c0kf8fy92"; depends=[ICtest 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]; }; + trustOptim = derive2 { name="trustOptim"; version="0.8.6.1"; sha256="07xkif11s3mdp4fmhl6zks6p2kdy4fdys2wpa8ibqpc6gd50vhvn"; depends=[Matrix Rcpp RcppEigen]; }; + tsBSS = derive2 { name="tsBSS"; version="0.4"; sha256="0mli9y63bp7n21wzz5gga8i0c8f3db6cdcc5jp4zm529svilzkxm"; depends=[forecast ICtest JADE Rcpp RcppArmadillo]; }; + tsDyn = derive2 { name="tsDyn"; version="0.9-46"; sha256="1cq36qxpimiwlzjnnjqj5rjb3l1h684day4kch99vza1v62h1lkv"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; tsPI = derive2 { name="tsPI"; version="1.0.2"; sha256="0lw4s7gxn4xldsk5f3dz27bb9jywa14195703b5q1497h9j966gk"; depends=[KFAS]; }; tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; }; @@ -11071,22 +11798,25 @@ 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.4.1"; sha256="0bnzv06wxc1kzjlysljndsjimjsn3g8v6s1vbics1cwcs5jkjwr4"; depends=[ltsa]; }; tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; }; - tsdf = derive2 { name="tsdf"; version="1.1-2"; sha256="11yapq3ml9clj0sqwibraj3wd7pikh2qrhq4df4m45ib6fiaa3jc"; depends=[gsDesign]; }; + tsdf = derive2 { name="tsdf"; version="1.1-4"; sha256="0kjcfh7vrnyg2aqzr5kkzdccriy2h5x1byzhdhvyb68fi4fjf4dh"; depends=[gsDesign]; }; tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; }; - tsensembler = derive2 { name="tsensembler"; version="0.0.2"; sha256="0yhm6vayh1yjrvki04f86xvxmrl9pcj92z0gzwyh0j1cqp48sh79"; depends=[Cubist earth gbm glmnet kernlab nnet pls ranger RcppRoll xts zoo]; }; - tseries = derive2 { name="tseries"; version="0.10-42"; sha256="1i26ankmbc96w6abqhxhbvhd12m87f2jfb5xrbl01iqmhy2pjzw2"; depends=[quadprog quantmod zoo]; }; + tsensembler = derive2 { name="tsensembler"; version="0.0.3"; sha256="0f4n2w18cii19ls3706cw0kc2gky2x5nh2sz92f5k2smg28dhia4"; depends=[Cubist earth forecast gbm glmnet kernlab nnet pls ranger RcppRoll softImpute xts zoo]; }; + tseries = derive2 { name="tseries"; version="0.10-43"; sha256="1yjxhj7l1p2przczl6frggfcr5iwda9lbcsmh0y75gbbbps14yf2"; depends=[quadprog quantmod zoo]; }; tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; }; tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; }; tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; }; tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; }; tsiR = derive2 { name="tsiR"; version="0.3.0"; sha256="1brlwsbs4rac8z6cf1q3xm1apdi4ban5hj7p3qvz2yx810gbxp1d"; depends=[ggplot2 kernlab reshape2]; }; + tsibble = derive2 { name="tsibble"; version="0.1.3"; sha256="08m4k14hiab6nsqrc6qdnjvgqqngyjdv1m81dyk9v4p6l7x24rsj"; depends=[dplyr lubridate pillar purrr Rcpp rlang tibble tidyr tidyselect]; }; 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-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]; }; + tstools = derive2 { name="tstools"; version="0.3.5.1"; sha256="11n56jd4hap8bl8dicdy1zvf916jc66nkg9v2i31n6n42v5dw699"; depends=[data_table jsonlite xts zoo]; }; 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]; }; @@ -11095,10 +11825,10 @@ in with self; { tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; }; ttutils = derive2 { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; }; ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; }; - tuber = derive2 { name="tuber"; version="0.9.1"; sha256="011nlnyj49zb9gyh1h745s748zd486g0nrqgjsmyc6jhv5anmhi1"; depends=[httr plyr]; }; + tuber = derive2 { name="tuber"; version="0.9.5"; sha256="0519qsgs8cnhd5qx5amh8rz6qa7fhryf5i9wjr38zrlrzvksqblh"; depends=[dplyr httr plyr purrr]; }; 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]; }; + tufte = derive2 { name="tufte"; version="0.3"; sha256="1fpv9ilf8ajynz38ny0abfnq20xzpgwbxaxj8ijwy8viki893bd0"; depends=[htmltools knitr rmarkdown xfun]; }; 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]; }; @@ -11109,10 +11839,12 @@ in with self; { turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; }; turner = derive2 { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; }; tutorial = derive2 { name="tutorial"; version="0.4.3"; sha256="0sxdlpw0w4azlaxdlk36ycrric6pbj2zi4nyv26pgsp0cr1hrx6r"; depends=[base64enc knitr markdown rjson]; }; + tvR = derive2 { name="tvR"; version="0.1.1"; sha256="1amcaala3lqzj4cv51hdqd7xydvx4fjs7hprc0n0b1b6xv7md1v3"; depends=[imager Matrix Rcpp RcppArmadillo Rdpack]; }; + tvReg = derive2 { name="tvReg"; version="0.2.1"; sha256="10ad9475i6q1phrjc2hh1h9si14qv9z27yn0n31cnm9fqnprdqn8"; depends=[bvarsv MASS Matrix systemfit vars]; }; tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; }; tvm = derive2 { name="tvm"; version="0.3.0"; sha256="1iv0qrks1zdiq8jaqr1h46snq8wc3g3q017hxc8zc6fqnsz1whf6"; depends=[ggplot2 reshape2]; }; twang = derive2 { name="twang"; version="1.5"; sha256="1sp1vb6l0mwpy9b9my5d3spc0q0zs7xg4dkmi4cl7hy7m9xy1dbk"; depends=[gbm lattice latticeExtra survey xtable]; }; - tweedie = derive2 { name="tweedie"; version="2.2.5"; sha256="1n08xdkqklh020zwgkkj6wbf7gyjghjl5wbs0xj83zi9jcmn08sn"; depends=[]; }; + tweedie = derive2 { name="tweedie"; version="2.3.2"; sha256="10fv998qjxsyx0h94fi0xbh6xbf24nwgh254n9zfnmix9vk2cqls"; 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]; }; @@ -11123,26 +11855,27 @@ in with self; { twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; }; txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; }; types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; }; - uGMAR = derive2 { name="uGMAR"; version="1.0.1"; sha256="1hjqx6m0617240b438zzk4y1jz0hpcwaj279555mldr6af445h1l"; depends=[Brobdingnag]; }; + uGMAR = derive2 { name="uGMAR"; version="2.0.0"; sha256="1qgbqqn70n5m0bw8nppzvf0gwgwic7iaidmp9xpmp4mpliybq2j0"; depends=[Brobdingnag]; }; uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; }; uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; }; + uavRmp = derive2 { name="uavRmp"; version="0.5.3"; sha256="05annx1vzpssxf5ycrgk2dizgl83zbwvl2x3bj8r5d8w5lvlpwrb"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; }; ubeR = derive2 { name="ubeR"; version="0.1.4"; sha256="1ilclna04hd1ykcp2b3gcj0v4qznwx0d24yavxnf2yh5d91wr6z2"; depends=[dplyr ggmap ggplot2 ggthemes googleway httpuv httr jsonlite]; }; ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; }; ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; }; udapi = derive2 { name="udapi"; version="0.1.0"; sha256="0hwnrx9qkazja288m6irmwwybiys9npk6sk60acjdczsfrn1hvl0"; depends=[curl httr]; }; - udpipe = derive2 { name="udpipe"; version="0.1.1"; sha256="1q1hl5swn0psds7wdfrng21xar4n1fr1s0qrk1rhv9g3m7a7jlpk"; depends=[data_table Rcpp]; }; + udpipe = derive2 { name="udpipe"; version="0.4"; sha256="00n4779g7idc29m7j32plqc4cnhrhhh28zmhd3lp74sxzfhi2vkb"; depends=[data_table Matrix Rcpp]; }; udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; }; - uiucthemes = derive2 { name="uiucthemes"; version="0.1.1"; sha256="0d1agg94z0qy6k4pbv01p1xb0zh42gkjl5i9kbqblplnk2swkzyi"; depends=[rmarkdown]; }; + uiucthemes = derive2 { name="uiucthemes"; version="0.2.0"; sha256="1z1wx89b2d7z1a2zc4ai05v9slfpidja8f561jcsrcdi9hz2yp81"; depends=[rmarkdown]; }; ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; }; - ukbtools = derive2 { name="ukbtools"; version="0.9.0"; sha256="0kdi5x8ylbqwnj4iwpfb8zc5w0ljr42iba517vcvznqh4072n2fv"; depends=[dplyr ggplot2 magrittr purrr readr XML]; }; + ukbtools = derive2 { name="ukbtools"; version="0.10.1"; sha256="1q1pp15lmia1cadiyqpbk532yy8r8hfskglybpkrxrjq2i1sdm4j"; depends=[dplyr ggplot2 magrittr plyr purrr readr scales stringr tibble tidyr XML]; }; ukds = derive2 { name="ukds"; version="0.1.0"; sha256="00lgr9jy57bwa8p38mqcf4fk29g2w2wqk3pwf9av6f5lapzzgc94"; depends=[magrittr rio RSelenium stringr]; }; ukgasapi = derive2 { name="ukgasapi"; version="0.13"; sha256="0bnblha96ldbxj0nqhcj26d1dk2xm6nkjqqval1jlc2pki20mr9n"; depends=[RCurl XML]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; - umx = derive2 { name="umx"; version="1.7.5"; sha256="1pzxf2ghds4wdqky670da4ig17g9knwmckx3c3sb7pmin75k79vz"; depends=[DiagrammeR knitr MASS Matrix mvtnorm numDeriv OpenMx polycor R2HTML RCurl sfsmisc]; }; + umx = derive2 { name="umx"; version="2.0.2"; sha256="1665h1yjs28zfpy7ziy0qnv8chm5nb5fcca1jj0cfbsspzndm24p"; depends=[cowplot DiagrammeR ggplot2 knitr MASS Matrix mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; }; 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=[]; }; + unfoldr = derive2 { name="unfoldr"; version="0.6.1"; sha256="1s1sy4x808w7nvc5kmskv7ksi2xcnfbb26qn0wkinbqma9aicqm2"; 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]; }; uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; @@ -11150,18 +11883,17 @@ in with self; { unifDAG = derive2 { name="unifDAG"; version="1.0.1"; sha256="1zf2pclddswrssil7ikq75449ks3070jxkzy2lmggq9gyipdypps"; depends=[gmp graph]; }; uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; }; uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; }; - uniqueAtomMat = derive2 { name="uniqueAtomMat"; version="0.1-3-2"; sha256="1msk9wzxhqdq6737b5xay1nqyvppb2yjcpnff2l7c7jf4xrlw0pp"; depends=[]; }; - unitedR = derive2 { name="unitedR"; version="0.2"; sha256="0glcyji0cypb2687cvyra0zzlzbq0md7qb60abgi0199hf51q3dj"; depends=[plyr]; }; - unitizer = derive2 { name="unitizer"; version="1.4.4"; sha256="0lx8x8y9hm5ilrw8i04krg9jlrs6j29cpmn723xjasgb3byj2sx6"; depends=[crayon diffobj]; }; - units = derive2 { name="units"; version="0.4-6"; sha256="1vx11yrmpk61gkhafbhhl97c8r4h9zvz9pd257daa8f2gsdkqf6v"; depends=[udunits2]; }; - unittest = derive2 { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; }; - univOutl = derive2 { name="univOutl"; version="0.1-3"; sha256="0p6x38szag3ngk48rz3vlsph5y6yd2vckpkqfd9h7yz2ziyyy5m6"; depends=[Hmisc robustbase]; }; + unitedR = derive2 { name="unitedR"; version="0.3.1"; sha256="06plbhjbn1gflpxarn21knhiwfr02vxprak9qcghl30fkkymd02r"; depends=[plyr]; }; + unitizer = derive2 { name="unitizer"; version="1.4.5"; sha256="1ml1x9jvwmh8mg2w2j2g8ffibw6a1ihj0aih11zzf4gjhs0w5p9d"; depends=[crayon diffobj]; }; + units = derive2 { name="units"; version="0.5-1"; sha256="07hbhgk7vpfb94gyk028rrqy793aa8sgykkqm3k2fgb23nwcd6vl"; depends=[udunits2]; }; + unittest = derive2 { name="unittest"; version="1.3-0"; sha256="0haf3s3pc5bhsm6y5njghr9w8ifsjxczm5r7g0ynylwzvd019n8b"; depends=[]; }; + univOutl = derive2 { name="univOutl"; version="0.1-4"; sha256="041cc1jn95zababc4i84c378i204zkn865k2vd7mk1piwm3qkrj5"; depends=[Hmisc robustbase]; }; unix = derive2 { name="unix"; version="1.3"; sha256="1l5w22j0h3qzya13wx7y8lx2baw496vcmn39l2y8r1v38as9dybc"; depends=[]; }; unjoin = derive2 { name="unjoin"; version="0.0.3"; sha256="08vjgl4dnh9kycrvdq5ngf57fy61n0nc582bi4znv06pq696rkwp"; depends=[dplyr rlang tibble]; }; unmarked = derive2 { name="unmarked"; version="0.12-2"; sha256="1ql8l7kc8py7zand164w3yszqbmwyxvrkjvr10l4hx2mkcnvxzx0"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; }; - unpivotr = derive2 { name="unpivotr"; version="0.2.1"; sha256="0gijbx2ziyfh9wl0a8dxnmm31961sdd9hi0i09frkqhxmcch45fx"; depends=[data_table dplyr dtplyr lazyeval magrittr purrr tibble tidyr xml2]; }; + unpivotr = derive2 { name="unpivotr"; version="0.3.1"; sha256="184xpnvcc8k0nxqad3q9qsj47g7icw98sm9bnx8fz4ga4zppxn4p"; depends=[data_table dplyr dtplyr magrittr purrr rlang tibble tidyr xml2]; }; unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; }; - unrtf = derive2 { name="unrtf"; version="1.0"; sha256="16z2i5194hawbyfrc5xyr54vwcfnylhr6jdz1flnw8pylbjm4z1j"; depends=[sys]; }; + unrtf = derive2 { name="unrtf"; version="1.2"; sha256="11q2p6cnf1pqsh8sys45gb4xf713bh693lm59d8nw09kcbm23210"; 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.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; }; @@ -11170,83 +11902,89 @@ in with self; { upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; }; uptasticsearch = derive2 { name="uptasticsearch"; version="0.1.0"; sha256="0kr9lmfp5fa3rcmk0s56pgr4h2pabic17m9yv2sljg7cvx50iss6"; depends=[data_table futile_logger httr jsonlite purrr stringr uuid]; }; uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; + upwaver = derive2 { name="upwaver"; version="1.0.1"; sha256="0pl5r1rh91s8i74zrsrblp6mjn371a2lp01f5d37d1vnjxc3dn9n"; depends=[assertthat httr rjson XLConnect]; }; 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]; }; + urltools = derive2 { name="urltools"; version="1.7.0"; sha256="0kxv54j4rf8jwyfv3z3plyb9vycwi0m1jv7z2nxnm3729p72y9xl"; depends=[Rcpp triebeard]; }; uroot = derive2 { name="uroot"; version="2.0-9"; sha256="0nxc8d4v9v5z3wbnj325iq2yrh0mipqgg2rn8pp2jyyq9vb1cxlv"; depends=[]; }; 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]; }; + userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.0"; sha256="14wdy74mj9rzlpmrsy3b4fda5f2sx078w1k1lgahz0yra3bypl3k"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest fBasics GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists viridis XML xtable]; }; + usethis = derive2 { name="usethis"; version="1.3.0"; sha256="0r61pf8qisjvrshm6jpcb76ck1v79s7lg9zwdgad4fasyyrzrcx2"; depends=[backports clipr clisymbols crayon curl desc gh git2r httr rematch2 rmarkdown rprojroot rstudioapi styler whisker]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; usl = derive2 { name="usl"; version="1.8.0"; sha256="04w7p9i08a51smgg11kh4hablic5rjmr5hndrnlg49j5h20i7w1v"; depends=[nlsr]; }; usmap = derive2 { name="usmap"; version="0.2.1"; sha256="0ilg8fzrxpljdly8xkniirqa3lw74kfark75pv071aa4l6xkiwlg"; depends=[]; }; ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; }; + utf8 = derive2 { name="utf8"; version="1.1.3"; sha256="03s4j6059q0nly68vpk6wy3p3f5ypakw93fj35kzd82b4z1r9cs3"; depends=[]; }; utf8latex = derive2 { name="utf8latex"; version="1.0.4"; sha256="12isrl056h7y7nr7wk52dnvf3frcp66qqy7si869ark2aj81f959"; depends=[]; }; - utility = derive2 { name="utility"; version="1.4.1"; sha256="1q94ax5vp0js4rskklkq91mvz07m4ryn5z1333cxkjmgilv9975j"; depends=[]; }; - utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.1"; sha256="0zlqfl8gvi9ywv5g6wf4c2fck2jcli1pb2p3cnrs74s195zp0jy2"; depends=[data_table stringr]; }; + utility = derive2 { name="utility"; version="1.4.2"; sha256="0q08yc0sxbcjhsr0nkgc2pyxkd93zwlbf0jyq21cf535mj4036gq"; depends=[]; }; + utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.5"; sha256="1kllm94c23pb176nazcfgsv38aawbzdwqdhyxx1c1n1jlsls2zk6"; depends=[data_table dplyr RCurl stringdist stringr]; }; utiml = derive2 { name="utiml"; version="0.1.3"; sha256="08r2qfvxlz50jzvhl0k9pvzf9xs8jm838bv9ncg59ir1b3ijbkk5"; 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]; }; + uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.4"; sha256="1kkmi2dqd2f4jryrkf9br4m6p7qxknlg62xyw28nirs4a12h52w8"; depends=[Exact geepack plyr sandwich survival]; }; vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; }; vaersvax = derive2 { name="vaersvax"; version="1.0.4"; sha256="15znkwbhr624qgwlcrdhaxpdfl85ym845mr2sy8b016d3ngz7n94"; depends=[]; }; + vagalumeR = derive2 { name="vagalumeR"; version="0.1.1"; sha256="1l1p63yhwqvkh8kgqii9n96vdm86jfc64nrinjp5l7jhx99sn013"; depends=[httr jsonlite plyr stringr]; }; valaddin = derive2 { name="valaddin"; version="0.1.2"; sha256="0j1c3g9gn2j0manz3jjh58cnl7b1rfwm9494xqrfqpia8948p9vq"; depends=[lazyeval purrr]; }; + valection = derive2 { name="valection"; version="1.0.0"; sha256="0104zcg3cw57ksgmb321hnyv095mn3frxci9vikj1smwarpnrpzc"; depends=[testthat]; }; validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; }; validate = derive2 { name="validate"; version="0.2.0"; sha256="178paxywwiaa45pqhknpw2k6f08b35nlnhwvqv2d1d289fz4f6qh"; 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]; }; + validatetools = derive2 { name="validatetools"; version="0.4.1"; sha256="1ivwgva37j26csvp4w3w7d10yq6myqdg6gcgxrl9z8j3gldnzv7p"; depends=[lpSolveAPI validate]; }; 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.3.1"; sha256="1f98qr204fv5dngm6qricx4mnrfds8nlpnszxidk4bnvhc23xq93"; 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]; }; + valr = derive2 { name="valr"; version="0.4.0"; sha256="1km828lif5nh15fxc3kbk3xp14gmsd6f3n0g5ml9zbdimh9n990z"; depends=[BH bindrcpp broom dplyr ggplot2 plogr Rcpp readr rlang stringr tibble]; }; + valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; }; vanddraabe = derive2 { name="vanddraabe"; version="1.0.0"; sha256="0hnfkwrrk50a5rica3lk2d52qi77xya3aspf13g0zygbyvv7ls72"; depends=[bio3d cowplot fastcluster ggplot2 openxlsx reshape2 scales]; }; - varComp = derive2 { name="varComp"; version="0.2-0"; sha256="05a8f4r16ryy81has6k68p6bybg8khbqlbfm5b12ba8fdfy9lj87"; 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-8"; sha256="0h49rl1j13yfh97rsfsyh9s2c4wajny4rzms2qw77d0cavxqg53i"; depends=[randomForest]; }; varband = derive2 { name="varband"; version="0.9.0"; sha256="16z66rx7xq5zan8pnw100c9r5syw1ml4hgzi9mch52aia23v21p9"; depends=[Rcpp RcppArmadillo]; }; varbvs = derive2 { name="varbvs"; version="2.4-0"; sha256="0f6c9acrir8c8m8mg928azlp31yh49faz5s2g7cbgf5f1pxi07nl"; depends=[lattice latticeExtra Matrix Rcpp]; }; vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; }; - vardpoor = derive2 { name="vardpoor"; version="0.9.10"; sha256="0q5pfdml4hq8sznm10h2fdjcyzyw9y3gfi0ijq2h3rdsgm8ap174"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; }; + vardpoor = derive2 { name="vardpoor"; version="0.9.11"; sha256="0ij45lq3dgvxm2nf6n8amd4si7giajnwlzq0lia568zfisdw4k0l"; 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=[]; }; + variables = derive2 { name="variables"; version="1.0-0"; sha256="0i1nmrbps1snyzdwlki7sfxf2vpqghd9ap8pmy235d5r399jmpkb"; depends=[]; }; varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; }; + variosig = derive2 { name="variosig"; version="0.1"; sha256="191d4f52z686s8xbx7aw9c3qjp77iri43l52n8nxjgfjl877x5m4"; depends=[geoR gstat sp]; }; vars = derive2 { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; }; vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; 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.5.0"; sha256="08hsfk69j2xafmf98izhnimxcda12fsqdvy94xhwy811sx9d7mvw"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tidyr vegan viridisLite]; }; + vcd = derive2 { name="vcd"; version="1.4-4"; sha256="1lp99h0wvsc61l1dgcqjxdrcgpgw88ak430cdsv43kmm43qssqd5"; depends=[colorspace lmtest MASS]; }; + vcdExtra = derive2 { name="vcdExtra"; version="0.7-1"; sha256="163x9hhvhgdmrqbcig7b120lk63svy0y652scbrcb11f85zrgb0c"; depends=[ca gnm MASS vcd]; }; + vcfR = derive2 { name="vcfR"; version="1.7.0"; sha256="1vx4s5z8h8mk8gqra2a5mkapz5xv1im76klq8qkpvj6ic4wcwsxs"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble tidyr vegan viridisLite]; }; vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; }; - vcrpart = derive2 { name="vcrpart"; version="1.0-0"; sha256="1qxj6jp9h0x64qh10amsy80kgwavji9fs5d2xc75g7w61mm2fq3p"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; + vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools 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.2.0"; sha256="1gm5saqi3z6jrngrl1bnqj79c646pmqps42v65qv4w31pwcwaaqc"; depends=[devtools fontquiver gdtools glue htmlwidgets purrr R6 Rcpp rlang shiny svglite testthat xml2]; }; - vdmR = derive2 { name="vdmR"; version="0.2.4"; sha256="05y2zaj37ydqrb3lw16mr8brwsdcdyl5bq1kb84shfmmi0qarsqa"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr rgdal rgeos rjson Rook sp]; }; + vdiffr = derive2 { name="vdiffr"; version="0.2.2"; sha256="11annh6dl4xyky4c6jx0jhvwpfmqfha57666qzs225sj30xq84dc"; depends=[devtools fontquiver gdtools glue htmlwidgets purrr R6 Rcpp rlang shiny svglite testthat xml2]; }; + vdmR = derive2 { name="vdmR"; version="0.2.5"; sha256="1v96khvg3k33kg3aavanl8g05n5mjkbqsbf8c4lya73f3rs4sfgb"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr Rdpack rgdal rgeos rjson Rook sp]; }; vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; veccompare = derive2 { name="veccompare"; version="0.1.0"; sha256="03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1"; depends=[corrplot gtools pander purrr qgraph reshape2 VennDiagram]; }; - vecsets = derive2 { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; }; + vecsets = derive2 { name="vecsets"; version="1.2.1"; sha256="086af6swjpbkd140yvb76affy5gn4p9xm41m3akm8axc3qk0hybg"; 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-4"; sha256="1n57dzv2aid6iqd9fkqik401sidqanhzsawyak94qbiyh6dbd1x9"; depends=[cluster lattice MASS mgcv permute]; }; - vegan3d = derive2 { name="vegan3d"; version="1.1-0"; sha256="1rhqk9sj71mrb53r2pgdy87bdq3drx5j4a9ilwvw23dlvjry889l"; depends=[cluster rgl scatterplot3d vegan]; }; + vegan = derive2 { name="vegan"; version="2.4-6"; sha256="175mqr42mmxy98gpf3rky8alnkw3w1k90ggdw3cispl36841p76w"; depends=[cluster lattice MASS mgcv permute]; }; + vegan3d = derive2 { name="vegan3d"; version="1.1-1"; sha256="1jd9m2immkhgb1zr39gsgl746y7qpi5fhj8awmqq5lyr5j6jp6jh"; depends=[cluster rgl scatterplot3d vegan]; }; vegclust = derive2 { name="vegclust"; version="1.7.1"; sha256="1k1dcw424s19f8ngsksvdmsayahl1hkxd9v2irf8ljpp688l8idi"; depends=[Rcpp sp vegan]; }; vegdata = derive2 { name="vegdata"; version="0.9.1"; sha256="0w4dk7qcl89w04qgnlna5lk5hxnyrvwmgjjxmnvb6r5dspq7qyad"; depends=[foreign httr jsonlite XML]; }; vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; - vegtable = derive2 { name="vegtable"; version="0.1.0"; sha256="12nfw0263vw9x74siqdfmlyf7dxi0kyjrla5wiwn9gfq9xbz1hrj"; depends=[foreign plotKML qdapRegex sp taxlist vegdata]; }; - vein = derive2 { name="vein"; version="0.2.2-3"; sha256="1jqcpb7p46wxih62ckl69wl1vzzwvy60fmnlram3kxb0iy88qvcv"; depends=[raster rgdal rgeos sp units]; }; + vegtable = derive2 { name="vegtable"; version="0.1.1"; sha256="0vpkfagkvwkij4kn4zxxiddbnw1qxv6dajjlis4byl766606xi1v"; depends=[foreign plotKML qdapRegex sp taxlist vegdata]; }; + vein = derive2 { name="vein"; version="0.3.9"; sha256="1h5j7fa0c7q1p3fj3pr98f4y1dc4n2r6gm0a8rddv4m8nf2cjgq7"; depends=[data_table sf 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]; }; + velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; }; vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; }; - venn = derive2 { name="venn"; version="1.2"; sha256="18il18i13p92dm167c6mwppzjldp2blq482l5206lp1gqvxyc7f0"; depends=[]; }; - vennLasso = derive2 { name="vennLasso"; version="0.1"; sha256="0bxygzxckv9b1nh33aggb914na7lxfpjbb9r68jhg5hxzm3xra7s"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; }; + venn = derive2 { name="venn"; version="1.5"; sha256="0mb8864kmn98184q007jnn7cydh02sx8bh1mhsskycmi70c8w8ai"; depends=[]; }; + vennLasso = derive2 { name="vennLasso"; version="0.1.1"; sha256="1xlf60xjvk0xq96mgzkj65q21mjk2k274xkcwsfmgir9xfdq60rd"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; }; 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]; }; + vennplot = derive2 { name="vennplot"; version="1.0"; sha256="0x59awa1zsjwk5qb1jzv6d2mn2fm4aq1lq8zlbnf1da0h4837yab"; 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]; }; - vetr = derive2 { name="vetr"; version="0.2.1"; sha256="041sjbyi47g9b3cla8rnrbff3asz9frgajgc6gmajw95aqr9z0l8"; depends=[]; }; - vfcp = derive2 { name="vfcp"; version="1.3.0"; sha256="072y458dy6s1qsylypxp0lccr3faa0vkz2ssvafxh21syg3gidiv"; depends=[copula cubature extraDistr polyCub]; }; + vetr = derive2 { name="vetr"; version="0.2.3"; sha256="1b35j8zzaj626dgz34hlprgsplnnskpl6zw3vppw27nnds7fdlh8"; depends=[]; }; + vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; }; 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]; }; @@ -11254,178 +11992,195 @@ in with self; { 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.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=[]; }; + viridis = derive2 { name="viridis"; version="0.5.0"; sha256="1ka6amybgzqkg3cbwfxwwqzzzpfn6q5jcia5am0bw48y5hbpg97y"; depends=[ggplot2 gridExtra viridisLite]; }; + viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; }; virtualspecies = derive2 { name="virtualspecies"; version="1.4-2"; sha256="19qw8vqf08x6fgm8w159qabpgr2wv2cxishpj6888ihcaa9ykp8f"; depends=[ade4 dismo raster rworldmap]; }; virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; }; - visNetwork = derive2 { name="visNetwork"; version="2.0.1"; sha256="1dvnr7zw1azggmdvr281q2kyy6b7gj36vcjp2xc1zblwiz2r35sq"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; + visNetwork = derive2 { name="visNetwork"; version="2.0.3"; sha256="0bs6war8m6vnzyhmzfmry5sfc5v1crq8i8r8nn70shf19k7pabmw"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; visdat = derive2 { name="visdat"; version="0.1.0"; sha256="1r009jlg3wwg06j5066c09567q24986c74f0cd68kcbmihaxngbx"; depends=[dplyr ggplot2 magrittr purrr tidyr]; }; - visreg = derive2 { name="visreg"; version="2.4-1"; sha256="1lkp668ni5p7k0vzcr75p1bsc1pyg0j0sghagdjb11abinmfzsm1"; depends=[lattice]; }; + visreg = derive2 { name="visreg"; version="2.5-0"; sha256="0n19k6rsmpqga6r8lyhjviqs3nw881dhr211621m2cl7knqhhi4y"; 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.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; }; + visvow = derive2 { name="visvow"; version="0.1.0"; sha256="0nb849m6dqfanqlaqcargw0rlf4ch9v09zmf0zqmxkwcil0w0dka"; depends=[Cairo DT ggplot2 plot3D plyr pracma psych Rdpack readxl shiny shinyBS svglite WriteXLS]; }; 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]; }; + vlad = derive2 { name="vlad"; version="0.1.0"; sha256="0gdp9488ir6zsnwaf0zb1n4qivafccqky7i867vjc2zb9nnji6a9"; depends=[Rcpp RcppArmadillo]; }; + vmd = derive2 { name="vmd"; version="0.1.0"; sha256="17c06a9l6i90ivpvf3rgv6yrsqv36qmywmmy92y5b81zqhgmh907"; depends=[ggplot2 magrittr R6 Rcpp reshape2 scales]; }; 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.2"; sha256="15314sq2gbi1z47ppvy8y3ljjk12jq4k5a1dfyi56h2lpzrc76ny"; 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]; }; + vote = derive2 { name="vote"; version="1.1-0"; sha256="1kxbv4062g4x9vn4gh74c6zwdshysw5n7vx9qljhq2wrdnqzjpyg"; depends=[formattable knitr]; }; + voteogram = derive2 { name="voteogram"; version="0.2.0"; sha256="0m4j7iz7mc6z536vk0kmqfd8ank87ingv5vnjl7mn62r53c5fbsf"; depends=[dplyr ggplot2 jsonlite scales]; }; vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; }; - vowels = derive2 { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; }; + vowels = derive2 { name="vowels"; version="1.2-2"; sha256="0xhfn3avx9h6kg3jwd47n2x7w8q8c9h13wsxd74hhbbn2gkjrs84"; 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.3.2"; sha256="0sixcan3v5nczmrrxn56rw5dqjq8xx7z3cp18j23jq26mvq4nm34"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti]; }; - vpc = derive2 { name="vpc"; version="1.0.0"; sha256="1d8k7d016qzd6njqraacdzb91j6drm5985aj6bxhcyz499pg3gbi"; depends=[classInt dplyr ggplot2 MASS readr reshape2 survival]; }; - 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]; }; + vpc = derive2 { name="vpc"; version="1.0.1"; sha256="0zxiakls7wi0278f6v74xdcaw500am8gfs8lp7cciaxnw2clvsbv"; depends=[classInt dplyr ggplot2 MASS readr reshape2 survival]; }; + vqtl = derive2 { name="vqtl"; version="2.0.0"; sha256="193jd5wcz8s3n2571jn5f6vz7kgf6l8a6w9anzd53pgc2644w3f9"; depends=[dglm doParallel dplyr evd foreach ggplot2 gtools hglm iterators knitr lazyeval purrr 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.6.0"; sha256="1xq4v81w6y6z1sah57bsy29642rzg32z0829rhc7slx1w46zqmya"; depends=[]; }; + vtreat = derive2 { name="vtreat"; version="1.0.3"; sha256="04kicd7jxvcnvd0n9ssxv3jsi075wass30l3jg0ikdr3kc899vfs"; 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.9.1"; sha256="1n4qd11bh0aq80fsw68vfky7nnvgkk6irsfjrknkf9bjvwvihlak"; depends=[minqa mnormt Rcpp RcppArmadillo]; }; + wNNSel = derive2 { name="wNNSel"; version="0.1"; sha256="19j2yz6lvkxpmjr0vv6pjc7j1c02y0hb3gay5sy1y0xk706aggb5"; depends=[]; }; 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.2"; sha256="1cr61c9vq5axx7g35f1cikny2dcjsy5kgmhmrhmbyljh6pipv99i"; depends=[data_table igraph magrittr plyr reshape2 som visNetwork]; }; + wTO = derive2 { name="wTO"; version="1.5"; sha256="0zz89r60fq47gdd08p29xxsx22097ynz1zrc4zmkv5z99wsmsssp"; depends=[data_table igraph magrittr plyr reshape2 som visNetwork]; }; waccR = derive2 { name="waccR"; version="0.1.0"; sha256="092p1bibyqx1gcrch68l9ilzilg5aqf46b6iagm562292cfi074l"; depends=[dplyr lubridate magrittr rvest tibble xml2]; }; 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.2.0"; sha256="0mr4ihai82w217kmg60b910jk9pjmzysws8b2j91w5528yv618kv"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; }; + walker = derive2 { name="walker"; version="0.2.1"; sha256="1q99nny7mdh7wc3yj4dz0s2454aqyxjcsp5hpjrha14h4p3fcirf"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo 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.4"; sha256="0ydhzklhpn9hqm6np9g0kjlry4z3w91ix89s587w0j8v5lxjivwd"; 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="1.0.4"; sha256="1adc070z94gwpfv4b1r0m2ylw9nzigzf412zlllbzlmn3pz42076"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos shiny shinyjs shinythemes spocc spThin]; }; wally = derive2 { name="wally"; version="1.0.9"; sha256="1g6dywny8s8fpdnfvrlbzsp9d9dhxdxrm1j4dd3b9r6rpiajf964"; depends=[data_table prodlim riskRegression]; }; + walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; }; walrus = derive2 { name="walrus"; version="1.0.1"; sha256="032s2k122z5cqkcjvh9gva4vvmj5prn6z3rs8j5y16d98kgambpy"; 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.8"; sha256="0igh1vk4j39bbrzbgfjllzp5kzj2znqdcbl433m1qd476ajfa54k"; depends=[bitops doParallel dtw fftw foreach iterators jpeg maps monitoR pbapply proxy RCurl rjson seewave signal tuneR]; }; + warbleR = derive2 { name="warbleR"; version="1.1.10"; sha256="0xwzrl08zvq4r280adz50rvr304i391l0g8m90dd5cdwxmfn071x"; depends=[bitops doParallel dtw fftw foreach iterators jpeg maps monitoR NatureSounds pbapply pbmcapply proxy RCurl rjson seewave signal tuneR]; }; warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; }; + washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; }; wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; }; - water = derive2 { name="water"; version="0.6"; sha256="0f569lcr68dk383cacgagyhkbyfh9aqgnn9w4c2y5x9bj3awjvq9"; depends=[raster rgdal sp]; }; + water = derive2 { name="water"; version="0.7"; sha256="1rdwmld4xxaxx003cjj67jylgg507r2jjqvncbp539q7c2z5b201"; 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]; }; + waterfalls = derive2 { name="waterfalls"; version="0.1.2"; sha256="01gby1mlhrwcalizpywxcakkx2zifswb0188nrl6z9dkkd1866lm"; depends=[ggplot2]; }; waveband = derive2 { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; }; waved = derive2 { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; }; + wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; }; wavelets = derive2 { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; }; wavemulcor = derive2 { name="wavemulcor"; version="2.1.0"; sha256="0z2vyb3rsxxh7k9fgaxi0xa6rwrw3pka1h4xkfrb9xydsacwbvx2"; depends=[waveslim]; }; - waver = derive2 { name="waver"; version="0.2.0"; sha256="0zxhnrxc68i5jvkc0k2gk11wf0hj92slhb40qiddryx3i7m2yrli"; depends=[geosphere rgdal rgeos sp]; }; + waver = derive2 { name="waver"; version="0.2.1"; sha256="1kl14cd96fwrqvk35sqbgi8bf31gc2ccxxy5d1v46scwyqkb0g5l"; depends=[geosphere rgdal rgeos sp]; }; waveslim = derive2 { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqhhk57m9vkbnfsznkvk8430cvbcsn7vridii"; depends=[]; }; wavethresh = derive2 { name="wavethresh"; version="4.6.8"; sha256="1nz74bm7pgck1i9c28svxnic8wkwkm5dhc8bhrxiih5wxb36kcwk"; depends=[MASS]; }; wbs = derive2 { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; }; - wbstats = derive2 { name="wbstats"; version="0.1.1"; sha256="18yws6zgvs773mhml5hn6aqyc2xyas10cg5jvnk4l50wir2qknxq"; depends=[httr jsonlite]; }; - wbsts = derive2 { name="wbsts"; version="0.3"; sha256="1h749j20q30lrn3b4ffcap3mvxjpih1gchvv8yag0gbzcs0wc1fm"; depends=[mvtnorm wmtsa]; }; + wbstats = derive2 { name="wbstats"; version="0.2"; sha256="0rfc9c6892jq7y17dwp6vsn62ggnac964xndmxq3mip6k2pk8yi0"; depends=[httr jsonlite tidyr]; }; + wbsts = derive2 { name="wbsts"; version="2.0"; sha256="12k68nsrrxglrm9ik53rm8160xvjlsgzi7v4wp78jhmh2slmyxw3"; depends=[mvtnorm Rcpp wmtsa]; }; wdman = derive2 { name="wdman"; version="0.2.2"; sha256="1a6zav82w0krk0ncm5b79ahy2hc0xakg9i1m2143ih5p6zvcm5m0"; depends=[assertthat binman semver subprocess yaml]; }; - 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]; }; webTRISr = derive2 { name="webTRISr"; version="0.1.0"; sha256="19xal5zg9mg25vzvkz55zm6gkd8b0y3sw3zbbrxn73a1jg8x5v0l"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr stringr]; }; - webchem = derive2 { name="webchem"; version="0.2"; sha256="0mxikd2ls0jcal9z0byan1l78965qq8jdyym9ydb4c56g1p2iyl8"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; + webchem = derive2 { name="webchem"; version="0.3.0"; sha256="11ryyniqcf6pa5avc5qks0hpksmapk3564bjva86626vml0mixby"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; + webdriver = derive2 { name="webdriver"; version="1.0.4"; sha256="0k031f26iihk2dxypqvfi60bhpj78yhwvhbmxqv7yrpa8s6j5flm"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage]; }; 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]; }; + webmockr = derive2 { name="webmockr"; version="0.2.0"; sha256="1zzfam380gy1d3k909ixbk61gmmv0w1x17qz8avrrnjlvqbp9gmn"; depends=[crul curl fauxpas 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]; }; - websearchr = derive2 { name="websearchr"; version="0.0.1"; sha256="1a174mf5j7z7q57fc1411h5hg54jg18kb00fp911w01mhd2zwmyx"; depends=[]; }; - webshot = derive2 { name="webshot"; version="0.4.2"; sha256="1ljp2c7yj21smr8ihzvmcs29z5gjr9wwfqfp33zrqc8xd8599iq9"; depends=[jsonlite magrittr]; }; + websearchr = derive2 { name="websearchr"; version="0.0.2"; sha256="1yf8ch86khg5syppcxs94mxgc3i5623qyhzh174nssw1wzyqb9ba"; depends=[]; }; + webshot = derive2 { name="webshot"; version="0.5.0"; sha256="07r71zzmggp4jf92x4ws4wg6v1x98vaj01lsar85bnb30n5vx8gh"; depends=[jsonlite magrittr processx withr]; }; webuse = derive2 { name="webuse"; version="0.1.2"; sha256="0ks3pb9ir778j9x4l0s4ly2xa1jc9syddqm65wkck52q3lrarg3l"; depends=[haven]; }; 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=[]; }; + wec = derive2 { name="wec"; version="0.4-1"; sha256="10lqh43536d44d6082rpp11q1323pmjbmgrgb8v9mrk9c1ysf50w"; depends=[dplyr]; }; + weco = derive2 { name="weco"; version="1.1"; sha256="1xnhbm499vypn8iwm33h1hv0wih1lj3bglm1rlgxaypbwj1acg53"; 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.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=[]; }; + welchADF = derive2 { name="welchADF"; version="0.2"; sha256="1gyii50khjd1pamv3v19ajx6b2vw2aspbzmqiqrqmvcl46nha24y"; depends=[lme4]; }; 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.6"; sha256="0y8f042hzlqwgsr63rl2apl7hkw9bs69a287dynvz9w078am61ch"; 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.4"; sha256="0d49j24jmk6n7fzzdvhc9fxi8yb1shghf7fc7jvm3cahhjffxay2"; depends=[bindata geepack MASS PoisNor]; }; + wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; }; wgsea = derive2 { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; }; + whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; }; whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; }; - whoami = derive2 { name="whoami"; version="1.1.1"; sha256="1njyjzp9jl5k0vys0ymnvx9vbfckscg4r8hgl1nq7a2q9b9cg06f"; depends=[httr jsonlite]; }; + whitening = derive2 { name="whitening"; version="1.0.0"; sha256="0vncjbrw9gafplz6r02x0j1fnrfvxq027h1pqcbdwqykjzg0zcym"; depends=[corpcor]; }; + whoami = derive2 { name="whoami"; version="1.1.2"; sha256="1wkgh8mxm2ci5ylwppbh38sx5fm5rsm06bimdpc07z35bz4825xg"; depends=[httr jsonlite]; }; whoapi = derive2 { name="whoapi"; version="0.1.2"; sha256="0ib0an08xsxan24q8mb5ai375njmkdc61lh4321rzgr25iqvi682"; depends=[httr]; }; - wicket = derive2 { name="wicket"; version="0.3.0"; sha256="1n6ji4zx48japlfbqyz4hbk40vr58l8d3wjdagjvc2jqx36cn19k"; depends=[BH Rcpp]; }; + wicket = derive2 { name="wicket"; version="0.4.0"; sha256="1lizzmj69bswzlk18fv2v4yxxc6dynvmkymdiafznzcyyz4a8xnf"; 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.3.0"; sha256="1yza8wylfrs3lfrc1hlhjga0j94m7ngq9ikkia1f87wmc3w59sjh"; depends=[htmltools htmlwidgets magrittr purrr]; }; - widyr = derive2 { name="widyr"; version="0.1.0"; sha256="0vy34phli9jynjdwss8cpadaaizh9bhc1h0amsblc0il6xanviqm"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; }; + widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; }; + widyr = derive2 { name="widyr"; version="0.1.1"; sha256="14r1qiq4i7lmn3i76aa0d9wcjw1jclm1jf371j25s92w8z36mdln"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; }; wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; wikilake = derive2 { name="wikilake"; version="0.3"; sha256="1y4vinm8gxyj6x36nb4xzhx1yf96x1nwlzzhvj4g36rbcix7dn6q"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; }; wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.14"; sha256="00i38py9n4l0iqkn3257a3jbiwh3hrmx1p9x6rfh9sgfcch8yyj5"; depends=[hellno httr jsonlite RColorBrewer rvest stringr xml2]; }; - wikitaxa = derive2 { name="wikitaxa"; version="0.1.4"; sha256="0d6ycn8j40lcc4plv7z34h14icaljywbl7b91gd803wxln4nhr6f"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; }; + wikitaxa = derive2 { name="wikitaxa"; version="0.2.0"; sha256="06ccb1ix5lsz3jgr3aq2ywq9bdnz020sa5dzlq1ayw95gdqj6icl"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; }; wildcard = derive2 { name="wildcard"; version="1.1.0"; sha256="0qkzab84z95g5f4fv3v4wisccgd7k9m3210pz4nvm1x8rfaqfjf1"; 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.1.1"; sha256="1fns58q8bzsa6z8dghqs41xiv331pl75d4awrfgwslbg3lrd2x49"; depends=[calibrate data_table dplyr geoR ggplot2 googleVis gstat gtools leaflet maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; }; + windfarmGA = derive2 { name="windfarmGA"; version="1.2"; sha256="1g1m7q8gdkd4mawdxi06lsalhii2ymzqlmxfdqhp2cnvj4k7fqby"; depends=[calibrate data_table doParallel dplyr foreach geoR ggplot2 googleVis gstat gtools leaflet magrittr maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; }; 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.2"; sha256="0y974yjj5ckjb3kwwgsll8kcxa6kb8kzzkmy1by6f7qz5smkvx4s"; depends=[coda HDInterval MASS truncnorm]; }; - withr = derive2 { name="withr"; version="2.0.0"; sha256="0ncq9ygx33rx7aazn53p0a0vbr5xv0r6wbkzcwbhbwyd8k55bgin"; depends=[]; }; + wiqid = derive2 { name="wiqid"; version="0.1.3"; sha256="06six8w77lf9rc49hnr42xgn2jvhb84wvqgi08ns22yn4z2iz9pz"; depends=[coda HDInterval MASS truncnorm]; }; + withr = derive2 { name="withr"; version="2.1.1"; sha256="17pbllxv18gf1mli9mm5px4wzp364907a4wrl20r1y5q8qwawpxx"; depends=[]; }; wkb = derive2 { name="wkb"; version="0.3-0"; sha256="0s7libkg27jdmcw5qmk5j0cmz3nqq7ny4q8gy4vhbgsgj4gbbdn9"; depends=[sp]; }; wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; 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]; }; + wmtsa = derive2 { name="wmtsa"; version="2.0-3"; sha256="1q436krz5p1f4a7a7sya6a9rh9x9mi8zzcgq66gbk9w9w4hcqcj6"; depends=[ifultools MASS splus2R]; }; + wmwpow = derive2 { name="wmwpow"; version="0.1.0"; sha256="0hvim7b9zn6h6w6m6hgil919nkzkn8676x8b2f3lbmm8m7dwm3lq"; depends=[lamW MASS smoothmest]; }; + wnl = derive2 { name="wnl"; version="0.3.3"; sha256="1dcq7xicsbwwlw8f2g1f2q4b4ph0w5kjs3108cfg12yww0qjl4ss"; depends=[numDeriv]; }; + wnominate = derive2 { name="wnominate"; version="1.2.5"; sha256="0pvw36jzx90z7ah4f7cyf95csdn5x7n9rh3ddsppa61y1dmjsn5k"; depends=[pscl]; }; woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; }; - woeBinning = derive2 { name="woeBinning"; version="0.1.4"; sha256="0fjflnhyya93xns2mcklq8vw5zwwivw1ahz4smdmlcpxf35f9cz9"; depends=[]; }; + woeBinning = derive2 { name="woeBinning"; version="0.1.5"; sha256="04pw32vng31v1n4r1g1fisvv8cacxmcx7m65vw4a2byamp2d25yq"; depends=[]; }; + woeR = derive2 { name="woeR"; version="0.1.3"; sha256="15bdhgjq39svzaqzmfykyaq4r543lq15jf0sz8m9bwjv2c6vlx5l"; depends=[dplyr]; }; womblR = derive2 { name="womblR"; version="1.0.2"; sha256="0cnggwi47pmyjqz78vcvdzv3kpss6v4h404w2d7dii0zfqjr7bpk"; depends=[msm mvtnorm Rcpp RcppArmadillo]; }; wooldridge = derive2 { name="wooldridge"; version="1.2.0"; sha256="1ib7qqmzybk7a171ny0zszh1lw2zgqyz35rb7g6y4ign2ng9ml9k"; depends=[]; }; - 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]; }; + word_alignment = derive2 { name="word.alignment"; version="1.0.9"; sha256="02dy4a9agfb99rjbqxy35nf11bpxyjcq15bnyzjkbvcy0ppfgz0l"; depends=[data_table openxlsx quanteda]; }; 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]; }; + wordcloud2 = derive2 { name="wordcloud2"; version="0.2.1"; sha256="1a2q42bn65q4idxq0vxysyam16q6c18inxv4dqhfy0x52j8z9x6k"; depends=[base64enc htmlwidgets]; }; wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; - wordnet = derive2 { name="wordnet"; version="0.1-11"; sha256="0c04wda7im5jzvsb3bhql2krlpvbsv7cc5gdw3dshfqz33knyy9i"; depends=[rJava]; }; + wordnet = derive2 { name="wordnet"; version="0.1-14"; sha256="12a21zlc7h973gi1632gngbk8b09vhp3sldh1mh9b5n6h18ga25p"; 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]; }; + worldmet = derive2 { name="worldmet"; version="0.8.4"; sha256="15crnmlcj1yi9rm35n8f34jprms24r2xwx550zz627bdvq4vmam4"; depends=[doParallel dplyr foreach leaflet openair readr zoo]; }; worms = derive2 { name="worms"; version="0.2.1"; sha256="0qxij56wvhlz9pgc1wp5nr3yi2r0h0r7xvlhhvsflch60gprpi1s"; depends=[httr plyr]; }; worrms = derive2 { name="worrms"; version="0.2.0"; sha256="1mqv2j9235pqdwqnw11b0zdv763wf9wqjqpf3p6fxpmki24j7xk6"; depends=[crul data_table jsonlite tibble]; }; + wosr = derive2 { name="wosr"; version="0.1.0"; sha256="0j3srk8siiip192w6wdc2w9azbhpdxyrzgyinwmi1z58xqmi9c38"; depends=[httr jsonlite pbapply xml2]; }; 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=[]; }; - wpp2017 = derive2 { name="wpp2017"; version="1.1-0"; sha256="0w1mh21zgkj22gwyxpd0vi6m8s7h28ad1hz0n7spr8fk46jd7d4a"; depends=[]; }; + wpp2017 = derive2 { name="wpp2017"; version="1.1-2"; sha256="18hyygk928kp25n5iy5nwz2fdicgpk3ncpkp2pksnp0cxzw3585w"; depends=[]; }; wppExplorer = derive2 { name="wppExplorer"; version="2.1-1"; sha256="0n0ayn8bxkrabw2iyqv3hfkdchbk9bzv1lhkjpxnjb6z3zl1sggl"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2017]; }; wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; }; - wrapr = derive2 { name="wrapr"; version="0.4.2"; sha256="0w4gbajgw3qnpb3r7090p5fv825adc1a0y0pijxq0vhk9x1g6ac4"; depends=[]; }; - wrassp = derive2 { name="wrassp"; version="0.1.4"; sha256="0w1hzxwk00lk1hkdxxz6vqa6xzw5sf60y54xzfr510yd02x3r1gn"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="1.2.0"; sha256="1dagjsbi75gplzkc44p4jqjbh3plp0kw9dz060kqsf0y7z6dk9vh"; depends=[]; }; + wrassp = derive2 { name="wrassp"; version="0.1.6"; sha256="1f6yyw6mmwc267cd9v17k6n4fhymi0y201bm6ii56rcw86n4ix77"; depends=[]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; writexl = derive2 { name="writexl"; version="0.2"; sha256="0hclrbn21sc0ifd2c5xfww84jf47412wzs86a73swxxjzcbrkg5k"; 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 = derive2 { name="wrswoR"; version="1.1"; sha256="0jnb818xz841bx2i03k3hhy4hxcwpxblskg9nrc8kgbc22rxx4lz"; depends=[logging Rcpp]; }; wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.2"; sha256="0vzs2lqq48kzk63xz2k9b7qcy0ph5yyvih6z98jfz36kpdfhdps9"; depends=[curl lazyeval]; }; wru = derive2 { name="wru"; version="0.1-7"; sha256="1fvbl5i07f6kdwjhirjla4kc1rrmrm8blvn8aa79s87ljagg0ql9"; depends=[devtools]; }; wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; }; wsrf = derive2 { name="wsrf"; version="1.7.17"; sha256="0gmlvfcy2iqa5sqhwps3hx0hl9fir8nf5xq62f25sn8i3llw752z"; depends=[Rcpp]; }; - wtest = derive2 { name="wtest"; version="1.0"; sha256="0rn2wp4xqd1b95asc1ppscfm21p3r85za778f88kgqax2lx7kq96"; depends=[]; }; + wtest = derive2 { name="wtest"; version="2.0"; sha256="16fprxy8lxvipzynxbbs2ras8wflc4g4p1x1439ym1xkg2vwys9a"; depends=[]; }; + wtss = derive2 { name="wtss"; version="1.0.0"; sha256="041686mnhqcljxm3ska35mslpq30ah47anvnmrgnkx5y05pwa8pj"; depends=[jsonlite lubridate RCurl roxygen2 zoo]; }; + wunderscraper = derive2 { name="wunderscraper"; version="0.1.0"; sha256="1h9nhxvs673n2ivw466qm77k20541cwgmmq35iv3dcb3hvw36p0r"; depends=[httr jsonlite sf tigris]; }; 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.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; }; - x12 = derive2 { name="x12"; version="1.8.0"; sha256="1pw1dp9prdik6ffh89p3dfq4iciwyfha7sxpyildi726dr8gmkhm"; depends=[stringr x13binary]; }; + x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; 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="1.1.39-1"; sha256="1v6slh5136av3l7bk99a57gj6i6khx2j55qv4pyz1zmrzzgaayyc"; depends=[]; }; xLLiM = derive2 { name="xLLiM"; version="2.1"; sha256="1q6ryw9z5wi0amv5f4drz14p36zy8gc2a0s59q10jixhhyas7ycl"; depends=[abind capushe corpcor igraph MASS Matrix]; }; + xSub = derive2 { name="xSub"; version="0.0.1"; sha256="0ccvkdylsia8qkfjlbbyggpy4l8z3r05cmvp4xb3j4628fa82jav"; depends=[countrycode haven RCurl]; }; xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; }; - xaringan = derive2 { name="xaringan"; version="0.4"; sha256="1yc6wgn3x25csl8sk0xl2v5ddw5hz1h0hqqxqxnz8f7hf5hkg9mg"; depends=[htmltools knitr rmarkdown servr]; }; + xaringan = derive2 { name="xaringan"; version="0.6"; sha256="0jgdixgbkwp9jnvjnrzdmlawz8f24z8in56cma3hn79glbvxfaw4"; depends=[htmltools knitr rmarkdown servr xfun]; }; 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.2.1"; sha256="0q932zkrsg20nchbjf0yynq6c3j6jgslag5n77jc3fdzadk6yf6r"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; - xgboost = derive2 { name="xgboost"; version="0.6-4"; sha256="1vfiz44prcjx2y442zc4x1b50k57qwd7sqbz6lq0kiqhp78ivicz"; depends=[data_table magrittr Matrix stringi]; }; + xesreadR = derive2 { name="xesreadR"; version="0.2.2"; sha256="1y7iilqdj9jv5snzylihs996hvpcj9s3yaiy7wr20m5yh1ngwkvj"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; + xfun = derive2 { name="xfun"; version="0.1"; sha256="1sm51gmwgw876d6d1q8smxmfgfh6zsnykfx8qp8z6jmh0fvd89pj"; depends=[]; }; + xgboost = derive2 { name="xgboost"; version="0.6.4.1"; sha256="0n47xvsrk8f8gy2x33rf93yfpkk4ir4z06f09qhlnrnpq1dvwfzf"; 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]; }; @@ -11433,32 +12188,39 @@ in with self; { 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]; }; + xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; }; xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; }; xmeta = derive2 { name="xmeta"; version="1.1-4"; sha256="1y9jldi8qn4jpr05g8fnvb23gig180hh36pc2v4y8n8289s9yvg2"; depends=[aod glmmML metafor mvmeta numDeriv]; }; - xml2 = derive2 { name="xml2"; version="1.1.1"; sha256="05iifrcgzx53w5ciw8bbm4vdwc3giv4xsvazv8chqxkndfvf7wq0"; depends=[BH Rcpp]; }; + xml2 = derive2 { name="xml2"; version="1.2.0"; sha256="154lmksfiwkhnlmryas25mjhfg6k4mmnnk7bbb29mnn5x5pr2yha"; depends=[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.6.0"; sha256="1pyzpb6ddvpm3nx49brkam6afzhvf7jg8xnijg9jwd2qfijp8lav"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; }; + xmrr = derive2 { name="xmrr"; version="1.0.1"; sha256="0h5861mym7k7xkby6zilcxq8i3yr06kcaam5pzi2y0q85iycb88f"; depends=[dplyr ggplot2 tidyr]; }; + xoi = derive2 { name="xoi"; version="0.67-4"; sha256="180zzc81d883qzl1xgj88d9aslqmsgdvv8w1mx2613h1rkirkpdp"; depends=[qtl]; }; + xpose = derive2 { name="xpose"; version="0.4.2"; sha256="11k07z76fpp4fvp3kfx1jc7bx1mwc1xfwyp46xwfhgfbazbvyfd7"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; }; + xpose4 = derive2 { name="xpose4"; version="4.6.1"; sha256="1722ai8r94dmy4d2r728iir0hl2b2gmym8xjsqscfc6jw070734i"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; }; + xptr = derive2 { name="xptr"; version="1.1"; sha256="12yvgbwm311hap3kk24wdx5zz084h0lhkj9k10mjzqp4a6aayi88"; depends=[]; }; + xray = derive2 { name="xray"; version="0.2"; sha256="1ibj92ljlj8a5rmbrci691yhpd4kwrfyl944nzl2dcbf58l01dzq"; depends=[dplyr foreach ggplot2 lubridate scales]; }; xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; }; - xslt = derive2 { name="xslt"; version="1.2"; sha256="1b342hncyn1dba7hz951ckp4qd8j28kyj98b5zcxlcc58acis1nc"; depends=[Rcpp xml2]; }; + xslt = derive2 { name="xslt"; version="1.3"; sha256="0giqzmdby9ax8gwx9b7xqka28k3hgymv4289k8p8dvg26d683p3l"; 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=[]; }; - xtensor = derive2 { name="xtensor"; version="0.1.1-0"; sha256="06kzk8nrcgxkmm614wlafbrq3m7zm11wf33p3669f52bmkzwam38"; depends=[Rcpp]; }; xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; - xtractomatic = derive2 { name="xtractomatic"; version="3.3.2"; sha256="10a1apsjqg0cpr267g5336cl6qr3ax03jcl234l9a8b2nh8sbwi5"; depends=[httr ncdf4 sp]; }; - xts = derive2 { name="xts"; version="0.10-0"; sha256="1w7lxy3hbf005fvpzbwiznj8jbxi07s4189vbgxisd35l9a4v6q4"; depends=[zoo]; }; + xtractomatic = derive2 { name="xtractomatic"; version="3.4.1"; sha256="189lya8ijm8vxjki76gjdhv1nyp3860ydpzg5ij12ggd5qqn1zgy"; depends=[dplyr httr ncdf4 readr sp]; }; + xts = derive2 { name="xts"; version="0.10-1"; sha256="1j9ddh9v9081zrqlpylsk13fldilhjdyaw6r6pa726fhgnrsf8a2"; depends=[zoo]; }; + xwf = derive2 { name="xwf"; version="0.2-1"; sha256="1g94wbsq8flnkxxfxx6yg87siiwpyrx219an9a2cf1blnwjv9b68"; depends=[mgcv]; }; xxIRT = derive2 { name="xxIRT"; version="2.0.3"; sha256="10n9rrhp0v71gmn0s2l2qi6sfplwj7anydw6rxqk409wg5is3x93"; depends=[dplyr ggplot2 lpSolveAPI magrittr reshape2]; }; xyloplot = derive2 { name="xyloplot"; version="1.5"; sha256="0h90070m3xgcfky5q6vx6l2lfz0ihwbp2xg25mgmbijz4kg3n9d3"; depends=[]; }; 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=[]; }; + yaImpute = derive2 { name="yaImpute"; version="1.0-29"; sha256="1zxl4l54y9f9lmi17hlhsbsc4f1qb0dnnl5dg9frhq6bhw2lqxqb"; 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=[]; }; + yaml = derive2 { name="yaml"; version="2.1.18"; sha256="15m4q5krfqg0avvqg9i2g6ns4757lk6zbyrwbx5c5bgh51glvd8v"; depends=[]; }; + yardstick = derive2 { name="yardstick"; version="0.0.1"; sha256="165czwi62nrhhci06fb0rfpk2gki94aiyl4wlflmgpzmspmgz7m8"; depends=[broom dplyr MLmetrics pROC rlang tibble tidyr tidyselect]; }; yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; }; + yasp = derive2 { name="yasp"; version="0.1.0"; sha256="082w1l0892v0vrvfmc1ssgy9ccj30hcrg7m56x61spgcmckfshy4"; depends=[]; }; 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]; }; + yearn = derive2 { name="yearn"; version="0.1.3"; sha256="03aqbf3q0nhg73pqpwlqdhpbmfa0rvv78b84b4mqir43601vjx65"; 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.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; }; @@ -11468,30 +12230,31 @@ in with self; { yuimaGUI = derive2 { name="yuimaGUI"; version="1.2.0"; sha256="166hsq1nc0jzkqbz08y3dl0qdi58swascbkm1lc7zhsh6g93azjs"; depends=[DT ggplot2 plotly 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.1.1"; sha256="1j6v7mfxhn67mr3q6cvcjj9pqc8a02w114z8q74h3l6jw8ahjg6m"; depends=[MASS NADA truncnorm]; }; - zFactor = derive2 { name="zFactor"; version="0.1.6"; sha256="0mgqrqdqgm49yf7hmmnak21srxdvlbp57apjgr72w7iy0pwrlf58"; depends=[data_table dplyr ggplot2 rootSolve tibble tidyr]; }; + zFactor = derive2 { name="zFactor"; version="0.1.7"; sha256="0vsjafg65qydfz0j75rrw40si5v2hwbf09z6d58wzffrwzgrwpvd"; 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.5"; sha256="0mv4ajprsyzscibc5c67va4pa8zrcm1ncddkkmpd0aqgby6kn2g8"; depends=[]; }; - zebu = derive2 { name="zebu"; version="0.1.1"; sha256="1d1s455vckd7148dycsqcfsdql0l4pzanipqn5k60kla03bic5i5"; depends=[doParallel foreach ggplot2 iterators plyr reshape2]; }; + zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; }; + zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[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]; }; + zenplots = derive2 { name="zenplots"; version="0.0-3"; sha256="1ba9xv522knzbirl6ac5hzbmsw8ignsmymbkps2w057w0fsc9iyz"; depends=[graph MASS PairViz]; }; 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.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; 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-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; }; - ziphsmm = derive2 { name="ziphsmm"; version="1.0.7"; sha256="0ydxxk9rhh4b6rk9x0p04jan1b5vm7mx0vnw6fif5dir87ar146d"; 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]; }; - zonator = derive2 { name="zonator"; version="0.5.8"; sha256="1slpyg8h5vb695gf31z66m4isibvckbk7b19vbl8s5svgh7ddl12"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; }; - zoo = derive2 { name="zoo"; version="1.8-0"; sha256="0mqklbx92ifwa0awm7gpm4r9dvwa09p55zjxjnypiqsxy532r4h9"; depends=[lattice]; }; + ziphsmm = derive2 { name="ziphsmm"; version="2.0.2"; sha256="0ki9slsrh9skb23svc9m5a0gbzf4crhgrricr0swr97n5h9xfzkw"; depends=[Rcpp RcppArmadillo]; }; + zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; }; + zoib = derive2 { name="zoib"; version="1.5.0"; sha256="133d5qxhv5vlxb9f1lh0zsmcb7ycbr42hjynzmd8f5fd91x8k43i"; depends=[abind coda Formula matrixcalc rjags]; }; + zonator = derive2 { name="zonator"; version="0.5.9"; sha256="04gjrm9nxnxsigrc30zghmv37ijsx27134hfnrbm51smw2y60dm4"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; }; + zoo = derive2 { name="zoo"; version="1.8-1"; sha256="16nc5jnpkf5j9vgq3pzssv7knj30mi055wj7q3sygz3l0d88hgfr"; 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]; }; + zoon = derive2 { name="zoon"; version="0.6.3"; sha256="11accyiv9n2zk7fq5bapbmv1ixadab19666i8w41bw642lafgivq"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap SDMTools sp testthat]; }; + zscorer = derive2 { name="zscorer"; version="0.1.0"; sha256="1199d72v9hm7k5jnll2ngn3jlfsiaxrrpbqzrkl0fghm6wnxcc6h"; depends=[]; }; 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]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index eaf3731bc4e9a3e929ed07e521ab70a31a0bb9ea..37d6611cd9f0abe9c1d48db38660ba569b4374b8 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -3,7 +3,7 @@ { R, pkgs, overrides }: let - inherit (pkgs) fetchurl stdenv lib; + inherit (pkgs) cacert fetchurl stdenv lib; buildRPackage = pkgs.callPackage ./generic-builder.nix { inherit R; @@ -42,16 +42,17 @@ let # from the name, version, sha256, and optional per-package arguments above # deriveBioc = mkDerive { - mkHomepage = {name, rVersion}: "https://bioconductor.org/packages/${rVersion}/bioc/html/${name}.html"; - mkUrls = {name, version, rVersion}: [ "mirror://bioc/${rVersion}/bioc/src/contrib/${name}_${version}.tar.gz" ]; + mkHomepage = {name, biocVersion}: "https://bioconductor.org/packages/${biocVersion}/bioc/html/${name}.html"; + mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/bioc/src/contrib/${name}_${version}.tar.gz" + "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ]; }; deriveBiocAnn = mkDerive { - mkHomepage = {name, rVersion}: "http://www.bioconductor.org/packages/${name}.html"; - mkUrls = {name, version, rVersion}: [ "mirror://bioc/${rVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" ]; + mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html"; + mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" ]; }; deriveBiocExp = mkDerive { - mkHomepage = {name, rVersion}: "http://www.bioconductor.org/packages/${name}.html"; - mkUrls = {name, version, rVersion}: [ "mirror://bioc/${rVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" ]; + mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html"; + mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" ]; }; deriveCran = mkDerive { mkHomepage = {name, snapshot}: "http://mran.revolutionanalytics.com/snapshot/${snapshot}/web/packages/${name}/"; @@ -230,6 +231,7 @@ let packagesWithNativeBuildInputs = { abn = [ pkgs.gsl_1 ]; adimpro = [ pkgs.imagemagick ]; + animation = [ pkgs.which ]; audio = [ pkgs.portaudio ]; BayesSAE = [ pkgs.gsl_1 ]; BayesVarSel = [ pkgs.gsl_1 ]; @@ -246,6 +248,7 @@ let ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; cit = [ pkgs.gsl_1 ]; curl = [ pkgs.curl.dev ]; + data_table = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ]; diversitree = [ pkgs.gsl_1 pkgs.fftw ]; EMCluster = [ pkgs.liblapack ]; @@ -279,13 +282,12 @@ let ncdf4 = [ pkgs.netcdf ]; nloptr = [ pkgs.nlopt ]; odbc = [ pkgs.unixODBC ]; - openssl = [ pkgs.openssl pkgs.openssl.dev ]; outbreaker = [ pkgs.gsl_1 ]; pander = [ pkgs.pandoc pkgs.which ]; pbdMPI = [ pkgs.openmpi ]; pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; - pbdZMQ = [ pkgs.which ]; + pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; pdftools = [ pkgs.poppler.dev ]; PKI = [ pkgs.openssl.dev ]; png = [ pkgs.libpng.dev ]; @@ -304,17 +306,16 @@ let rcdd = [ pkgs.gmp.dev ]; RcppCNPy = [ pkgs.zlib.dev ]; RcppGSL = [ pkgs.gsl_1 ]; - RcppOctave = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.octave ]; RcppZiggurat = [ pkgs.gsl_1 ]; rgdal = [ pkgs.proj pkgs.gdal ]; rgeos = [ pkgs.geos ]; rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ]; - rgl = [ pkgs.mesa pkgs.xlibsWrapper ]; + rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ]; - Rhtslib = [ pkgs.zlib.dev ]; + Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf ]; RJaCGH = [ pkgs.zlib.dev ]; rjags = [ pkgs.jags ]; rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ]; @@ -322,7 +323,7 @@ let rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.mysql.lib pkgs.mariadb pkgs.openssl.dev ]; + RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; @@ -351,7 +352,6 @@ let simplexreg = [ pkgs.gsl_1 ]; SOD = [ pkgs.opencl-headers ]; spate = [ pkgs.fftw.dev ]; - sprint = [ pkgs.openmpi ]; ssanv = [ pkgs.proj ]; stsm = [ pkgs.gsl_1 ]; stringi = [ pkgs.icu.dev ]; @@ -366,10 +366,9 @@ let udunits2 = [ pkgs.udunits pkgs.expat ]; V8 = [ pkgs.v8_3_14 ]; VBLPCM = [ pkgs.gsl_1 ]; - VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ]; WhopGenome = [ pkgs.zlib.dev ]; XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; - xml2 = [ pkgs.libxml2.dev ]; + xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ]; affyPLM = [ pkgs.zlib.dev ]; bamsignals = [ pkgs.zlib.dev ]; @@ -385,7 +384,6 @@ let affyio = [ pkgs.zlib.dev ]; VariantAnnotation = [ pkgs.zlib.dev ]; snpStats = [ pkgs.zlib.dev ]; - gputools = [ pkgs.pcre.dev pkgs.lzma.dev pkgs.zlib.dev pkgs.bzip2.dev pkgs.icu.dev ]; }; packagesWithBuildInputs = { @@ -394,24 +392,24 @@ let nat = [ pkgs.which ]; nat_nblast = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; + pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; qtpaint = [ pkgs.cmake ]; qtbase = [ pkgs.cmake pkgs.perl ]; - gmatrix = [ pkgs.cudatoolkit pkgs.which ]; RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkgconfig ]; rggobi = [ pkgs.pkgconfig ]; RGtk2 = [ pkgs.pkgconfig ]; RProtoBuf = [ pkgs.pkgconfig ]; Rpoppler = [ pkgs.pkgconfig ]; - VBmix = [ pkgs.pkgconfig ]; XML = [ pkgs.pkgconfig ]; cairoDevice = [ pkgs.pkgconfig ]; chebpol = [ pkgs.pkgconfig ]; fftw = [ pkgs.pkgconfig ]; geoCount = [ pkgs.pkgconfig ]; gdtools = [ pkgs.pkgconfig ]; + JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ]; kza = [ pkgs.pkgconfig ]; magick = [ pkgs.pkgconfig ]; mwaved = [ pkgs.pkgconfig ]; @@ -427,12 +425,10 @@ let tesseract = [ pkgs.pkgconfig ]; Cairo = [ pkgs.pkgconfig ]; Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; - qtutils = [ pkgs.qt4 ]; tcltk2 = [ pkgs.tcl pkgs.tk ]; tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ]; rPython = [ pkgs.which ]; gridGraphics = [ pkgs.which ]; - gputools = [ pkgs.which pkgs.cudatoolkit ]; adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; PET = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ]; dti = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ]; @@ -495,10 +491,8 @@ let "EasyqpcR" "EcoVirtual" "ENiRG" - "EnQuireR" "eVenn" "exactLoglinTest" - "FAiR" "fat2Lpoly" "fbati" "FD" @@ -519,7 +513,6 @@ let "geoR" "geoRglm" "georob" - "GeoXp" "GGEBiplotGUI" "gnm" "GPCSIV" @@ -535,7 +528,6 @@ let "HH" "HiveR" "HomoPolymer" - "iBUGS" "ic50" "iDynoR" "in2extRemes" @@ -591,10 +583,8 @@ let "prefmod" "PrevMap" "ProbForecastGOP" - "QCAGUI" "qtbase" "qtpaint" - "qtutils" "R2STATS" "r4ss" "RandomFields" @@ -700,16 +690,11 @@ let packagesToSkipCheck = [ "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 ]; # Packages which cannot be installed due to lack of dependencies or other reasons. brokenPackages = [ - "gputools" # depends on non-free cudatoolkit-8.0.61 - "gmatrix" # depends on non-free cudatoolkit-8.0.61 ]; otherOverrides = old: new: { @@ -746,6 +731,11 @@ let patchPhase = "patchShebangs configure"; }); + data_table = old.data_table.overrideDerivation (attrs: { + NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + + lib.optionalString stdenv.isDarwin " -fopenmp"; + }); + rpf = old.rpf.overrideDerivation (attrs: { patchPhase = "patchShebangs configure"; }); @@ -768,10 +758,29 @@ let ''; }); + JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: { + postPatch = '' + for file in {R,src}/*.R; do + sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file + done + ''; + preConfigure = '' + patchShebangs configure + ''; + }); + Mposterior = old.Mposterior.overrideDerivation (attrs: { PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); + pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: { + postPatch = lib.optionalString stdenv.isDarwin '' + for file in R/*.{r,r.in}; do + sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file + done + ''; + }); + qtbase = old.qtbase.overrideDerivation (attrs: { patches = [ ./patches/qtbase.patch ]; }); @@ -800,10 +809,10 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - MYSQL_DIR="${pkgs.mysql.lib}"; + MYSQL_DIR="${pkgs.mysql.connector-c}"; preConfigure = '' patchShebangs configure - ''; + ''; }); devEMF = old.devEMF.overrideDerivation (attrs: { @@ -827,20 +836,9 @@ let patches = [ ./patches/spMC.patch ]; }); - BayesLogit = old.BayesLogit.overrideDerivation (attrs: { - patches = [ ./patches/BayesLogit.patch ]; - buildInputs = (attrs.buildInputs or []) ++ [ pkgs.openblasCompat ]; - }); - - BayesBridge = old.BayesBridge.overrideDerivation (attrs: { - patches = [ ./patches/BayesBridge.patch ]; - }); - openssl = old.openssl.overrideDerivation (attrs: { - OPENSSL_INCLUDES = "${pkgs.openssl.dev}/include"; - preConfigure = '' - sed -i.bak 's|^\( *PKG_LIBS_VERSIONED=\).*$|\1$PKG_LIBS|' configure - ''; + PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; + PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto"; }); Rserve = old.Rserve.overrideDerivation (attrs: { @@ -916,15 +914,20 @@ let }); geojsonio = old.geojsonio.overrideDerivation (attrs: { - preConfigure = '' - export SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt - ''; + buildInputs = [ cacert ] ++ attrs.buildInputs; }); rstan = old.rstan.overrideDerivation (attrs: { NIX_CFLAGS_COMPILE = "${attrs.NIX_CFLAGS_COMPILE} -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION"; }); + mongolite = old.mongolite.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include -I${pkgs.cyrus_sasl.dev}/include -I${pkgs.zlib.dev}/include"; + PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz"; + }); }; in self diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R index 8dc3a50abec5a5b1b8e0b6cd543866e6c678f644..6614116a3bf6e6508366555a07dba004f65dcfc4 100755 --- a/pkgs/development/r-modules/generate-r-packages.R +++ b/pkgs/development/r-modules/generate-r-packages.R @@ -3,12 +3,12 @@ library(data.table) library(parallel) cl <- makeCluster(10) -rVersion <- paste(R.Version()$major, strsplit(R.Version()$minor, ".", fixed=TRUE)[[1]][1], sep=".") +biocVersion <- 3.6 snapshotDate <- Sys.Date()-1 -mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/bioc/src/contrib/") - , "bioc-annotation"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/annotation/src/contrib/") - , "bioc-experiment"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/experiment/src/contrib/") +mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/bioc/src/contrib/") + , "bioc-annotation"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/data/annotation/src/contrib/") + , "bioc-experiment"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/data/experiment/src/contrib/") , cran=paste0("http://mran.revolutionanalytics.com/snapshot/", snapshotDate, "/src/contrib/") ) @@ -81,7 +81,7 @@ cat("{ self, derive }:\n") cat("let derive2 = derive ") if (mirrorType == "cran") { cat("{ snapshot = \"", paste(snapshotDate), "\"; }", sep="") } else if (mirrorType == "irkernel") { cat("{}") -} else { cat("{ rVersion = \"", rVersion, "\"; }", sep="") } +} else { cat("{ biocVersion = \"", biocVersion, "\"; }", sep="") } cat(";\n") cat("in with self; {\n") cat(paste(nix, collapse="\n"), "\n", sep="") diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 582b8aa44dc29bfb54db4f5be1e9e884f7bfa8e9..0d731de33f84191cbdf0da601e2cf1b3e99d8bce 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -3,9 +3,9 @@ { name, buildInputs ? [], ... } @ attrs: stdenv.mkDerivation ({ - buildInputs = buildInputs ++ [R] ++ + buildInputs = buildInputs ++ [R gettext] ++ stdenv.lib.optionals attrs.requireX [utillinux xvfb_run] ++ - stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gettext gfortran]; + stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -41,8 +41,8 @@ stdenv.mkDerivation ({ ''; postFixup = '' - if test -e $out/nix-support/propagated-native-build-inputs; then - ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages + if test -e $out/nix-support/propagated-build-inputs; then + ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages fi ''; diff --git a/pkgs/development/r-modules/patches/BayesBridge.patch b/pkgs/development/r-modules/patches/BayesBridge.patch deleted file mode 100644 index 2fb0392bf3e991228dbbdc4ad5476e8154211c18..0000000000000000000000000000000000000000 --- a/pkgs/development/r-modules/patches/BayesBridge.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -ru -x '*~' BayesBridge_orig/src/Makevars BayesBridge/src/Makevars ---- BayesBridge_orig/src/Makevars 2014-07-19 05:08:55.000000000 +0900 -+++ BayesBridge/src/Makevars 2014-10-25 18:35:01.398539305 +0900 -@@ -9,4 +9,4 @@ - # PKG_CPPFLAGS = -DUSE_R -DDISABLE_FIO -I../inst/include/ -DDISABLE_SINGLE -DNTHROW - PKG_CPPFLAGS = -DUSE_R -DDISABLE_FIO -DDISABLE_SINGLE -DNTHROW - # PKG_CPPFLAGS = -DUSE_R -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wshadow -ansi -Wsequence-point --PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) diff --git a/pkgs/development/r-modules/patches/BayesLogit.patch b/pkgs/development/r-modules/patches/BayesLogit.patch deleted file mode 100644 index 83c865e479c244efc063bdc0f4eed145ee0937e0..0000000000000000000000000000000000000000 --- a/pkgs/development/r-modules/patches/BayesLogit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' BayesLogit_orig/src/Makevars BayesLogit/src/Makevars ---- BayesLogit_orig/src/Makevars 2014-04-24 23:31:13.000000000 +0900 -+++ BayesLogit/src/Makevars 2014-10-25 18:33:32.398572641 +0900 -@@ -6,7 +6,7 @@ - ## W/OUT Dynamic Stuff - OBJECTS = Matrix.o MatrixFrame.o RRNG.o RNG.o FSF_nmix.o LogitWrapper.o \ - PolyaGamma.o PolyaGammaAlt.o PolyaGammaSP.o InvertY.o --PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) - # PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wextra - PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW - diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 64a88d8f7b83fe9cead0def595632f3b07d7141a..16f1abe1a899ea7446477fa626acfe8d6c0d97aa 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -29,7 +29,9 @@ with import ./functions.nix { inherit lib gemConfig; }; let gemFiles = bundlerFiles args; - importedGemset = import gemFiles.gemset; + importedGemset = if builtins.typeOf gemFiles.gemset != "set" + then import gemFiles.gemset + else gemFiles.gemset; filteredGemset = filterGemset { inherit ruby groups; } importedGemset; diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index b17a4639e779178e8718299ad2478a14386cdfb3..85e93959e4b5f388398d19d231666bb31af6dd7d 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -67,8 +67,10 @@ rec { }; in res; - composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["source" "platforms"]) // attrs.source // { + composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["platforms"]) // { inherit ruby; + inherit (attrs.source) type; + source = removeAttrs attrs.source ["type"]; gemName = name; gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []); }); diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 99d1dd64dc4fa8ab0bc142808e6cf9baa1efd188..c8f61389ad3fa151db42b261bbbb7d7197cfeab7 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -26,12 +26,13 @@ , allowSubstitutes ? false , meta ? {} , postBuild ? "" +, gemConfig ? null }@args: let basicEnv = (callPackage ../bundled-common {}) args; - cmdArgs = removeAttrs args [ "pname" "postBuild" ] + cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults in runCommand basicEnv.name cmdArgs '' diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index 2e2653621a767cb35df920b8cdc3fcd588c2478b..5d1489ba20054426917e8d8bc4ff8544f1c99af4 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -1,7 +1,4 @@ -{ stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib -, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, buildEnv -, linkFarm, git, makeWrapper, bundler, tree -}@defs: +{ ruby, lib, callPackage, defaultGemConfig, buildEnv, bundler }@defs: { name ? null , pname ? null diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 9251c4d2a4151bf756bafc448422ab7dc3e327b5..6ba1d5f10ec1cb26f2c72a8e27afc14fbe736ce8 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -5,7 +5,7 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundler"; version = "1.14.6"; - sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl"; + source.sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 05415b8896808cbf9581da10e061e89e2028c4bd..a447cd1a103280bc0c624e61c37030873a518ba3 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,7 +21,7 @@ , 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, pcre, gecode_3, curl -, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xlibs, gtk2, buildRubyGem +, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobjectIntrospection, gdk_pixbuf }@args: @@ -31,8 +31,7 @@ let rainbow_rake = buildRubyGem { name = "rake"; gemName = "rake"; - remotes = ["https://rubygems.org"]; - sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + source.sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; type = "gem"; version = "12.0.0"; }; @@ -61,12 +60,12 @@ in cairo = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; + buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; }; cairo-gobject = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo pcre xlibs.libpthreadstubs xlibs.libXdmcp ]; + buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; }; capybara-webkit = attrs: { @@ -89,6 +88,18 @@ in ''; }; + ethon = attrs: { + dontBuild = false; + postPatch = '' + substituteInPlace lib/ethon/curls/settings.rb \ + --replace "libcurl" "${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary}" + ''; + }; + + do_sqlite3 = attrs: { + buildInputs = [ sqlite ]; + }; + eventmachine = attrs: { buildInputs = [ openssl ]; }; @@ -109,7 +120,7 @@ in gio2 = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 pcre ]; + buildInputs = [ gtk2 pcre gobjectIntrospection ]; }; gitlab-markup = attrs: { meta.priority = 1; }; @@ -121,7 +132,7 @@ in gtk2 = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; + buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.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"; }; @@ -132,8 +143,9 @@ in }; grpc = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ]; }; hitimes = attrs: { @@ -167,11 +179,11 @@ in }; mysql = attrs: { - buildInputs = [ mysql.lib zlib openssl ]; + buildInputs = [ mysql.connector-c zlib openssl ]; }; mysql2 = attrs: { - buildInputs = [ mysql.lib zlib openssl ]; + buildInputs = [ mysql.connector-c zlib openssl ]; }; ncursesw = attrs: { @@ -197,7 +209,7 @@ in pango = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 xlibs.libXdmcp pcre xlibs.libpthreadstubs ]; + buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ]; }; patron = attrs: { @@ -251,8 +263,9 @@ in ]; }; rugged = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake openssl libssh2 zlib ]; + dontUseCmakeConfigure = true; }; scrypt = attrs: diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 62a9d60686f388382fff549d418da4f49ad12778..d00ce7fccf5c1f4b17a814e71bca6e9a87fb9d5c 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -36,12 +36,10 @@ lib.makeOverridable ( rubyName = builtins.parseDrvName ruby.name; in "${rubyName.name}${rubyName.version}-") , buildInputs ? [] -, doCheck ? false , meta ? {} , patches ? [] , gemPath ? [] , dontStrip ? true -, remotes ? ["https://rubygems.org"] # Assume we don't have to build unless strictly necessary (e.g. the source is a # git checkout). # If you need to apply patches, make sure to set `dontBuild = false`; @@ -56,14 +54,18 @@ let src = attrs.src or ( if type == "gem" then fetchurl { - urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes; - inherit (attrs) sha256; + urls = map ( + remote: "${remote}/gems/${gemName}-${version}.gem" + ) (attrs.source.remotes or [ "https://rubygems.org" ]); + inherit (attrs.source) sha256; } else if type == "git" then fetchgit { - inherit (attrs) url rev sha256 fetchSubmodules; + inherit (attrs.source) url rev sha256 fetchSubmodules; leaveDotGit = true; } + else if type == "url" then + fetchurl attrs.source else throw "buildRubyGem: don't know how to build a gem of type \"${type}\"" ); @@ -74,16 +76,16 @@ let in -stdenv.mkDerivation (attrs // { +stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit ruby; - inherit doCheck; inherit dontBuild; inherit dontStrip; inherit type; buildInputs = [ ruby makeWrapper - ] ++ lib.optionals (type == "git") [ git bundler ] + ] ++ lib.optionals (type == "git") [ git ] + ++ lib.optionals (type != "gem") [ bundler ] ++ lib.optional stdenv.isDarwin darwin.libobjc ++ buildInputs; @@ -92,8 +94,6 @@ stdenv.mkDerivation (attrs // { inherit src; - phases = attrs.phases or [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "fixupPhase" ]; - unpackPhase = attrs.unpackPhase or '' runHook preUnpack @@ -158,14 +158,22 @@ stdenv.mkDerivation (attrs // { echo "buildFlags: $buildFlags" + ${lib.optionalString (type == "url") '' + ruby ${./nix-bundle-install.rb} \ + "path" \ + '${gemName}' \ + '${version}' \ + '${lib.escapeShellArgs buildFlags}' + ''} ${lib.optionalString (type == "git") '' ruby ${./nix-bundle-install.rb} \ - ${gemName} \ - ${attrs.url} \ - ${src} \ - ${attrs.rev} \ - ${version} \ - ${lib.escapeShellArgs buildFlags} + "git" \ + '${gemName}' \ + '${version}' \ + '${lib.escapeShellArgs buildFlags}' \ + '${attrs.source.url}' \ + '${src}' \ + '${attrs.source.rev}' ''} ${lib.optionalString (type == "gem") '' diff --git a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb index 8eac766554e1d70d46eab06610ce4cde825bdb78..142d2da9bee2ac336c6b8317e6a4c7231680b880 100644 --- a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb +++ b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb @@ -13,31 +13,46 @@ end # Options: # +# type - installation type, either "git" or "path" # name - the gem name +# version - gem version +# build-flags - build arguments +# +# Git-only options: +# # uri - git repo uri # repo - path to local checkout # ref - the commit hash -# version - gem version -# build-flags - build arguments ruby = File.join(ENV["ruby"], "bin", RbConfig::CONFIG['ruby_install_name']) out = ENV["out"] bin_dir = File.join(ENV["out"], "bin") -name = ARGV[0] -uri = ARGV[1] -REPO = ARGV[2] -ref = ARGV[3] -version = ARGV[4] -build_flags = ARGV[5] +type = ARGV[0] +name = ARGV[1] +version = ARGV[2] +build_flags = ARGV[3] +if type == "git" + uri = ARGV[4] + REPO = ARGV[5] + ref = ARGV[6] +end # options to pass to bundler options = { - "name" => name, - "uri" => uri, - "ref" => ref, + "name" => name, "version" => version, } +if type == "path" + options.merge!({ + "path" => Dir.pwd, + }) +elsif type == "git" + options.merge!({ + "uri" => uri, + "ref" => ref, + }) +end # Monkey-patch Bundler to use our local checkout. # I wish we didn't have to do this, but bundler does not expose an API to do @@ -63,26 +78,28 @@ Bundler.module_eval do end end -Bundler::Source::Git.class_eval do - def allow_git_ops? - true +if type == "git" + Bundler::Source::Git.class_eval do + def allow_git_ops? + true + end end -end -Bundler::Source::Git::GitProxy.class_eval do - def checkout - unless path.exist? - FileUtils.mkdir_p(path.dirname) - FileUtils.cp_r(File.join(REPO, ".git"), path) - system("chmod -R +w #{path}") + Bundler::Source::Git::GitProxy.class_eval do + def checkout + unless path.exist? + FileUtils.mkdir_p(path.dirname) + FileUtils.cp_r(File.join(REPO, ".git"), path) + system("chmod -R +w #{path}") + end end - end - def copy_to(destination, submodules=false) - unless File.exist?(destination.join(".git")) - FileUtils.mkdir_p(destination.dirname) - FileUtils.cp_r(REPO, destination) - system("chmod -R +w #{destination}") + def copy_to(destination, submodules=false) + unless File.exist?(destination.join(".git")) + FileUtils.mkdir_p(destination.dirname) + FileUtils.cp_r(REPO, destination) + system("chmod -R +w #{destination}") + end end end end @@ -94,7 +111,11 @@ Bundler.ui = Bundler::UI::Shell.new({"no-color" => no_color}) Bundler.ui.level = "debug" if verbose # Install -source = Bundler::Source::Git.new(options) +if type == "git" + source = Bundler::Source::Git.new(options) +else + source = Bundler::Source::Path.new(options) +end spec = source.specs.search_all(name).first Bundler.rubygems.with_build_args [build_flags] do source.install(spec) @@ -139,8 +160,10 @@ FileUtils.ln_s(spec.loaded_from.to_s, "#{meta}/spec") File.open("#{meta}/name", "w") do |f| f.write spec.name end -File.open("#{meta}/install-path", "w") do |f| - f.write source.install_path.to_s +if type == "git" + File.open("#{meta}/install-path", "w") do |f| + f.write source.install_path.to_s + end end File.open("#{meta}/require-paths", "w") do |f| f.write spec.require_paths.join(" ") @@ -150,8 +173,10 @@ File.open("#{meta}/executables", "w") do |f| end # make the lib available during bundler/git installs -File.open("#{out}/nix-support/setup-hook", "a") do |f| - spec.require_paths.each do |dir| - f.puts("addToSearchPath RUBYLIB #{source.install_path}/#{dir}") +if type == "git" + File.open("#{out}/nix-support/setup-hook", "a") do |f| + spec.require_paths.each do |dir| + f.puts("addToSearchPath RUBYLIB #{source.install_path}/#{dir}") + end end end diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index fbf784db0cc6505fd2c36b724a6c01ad90ac3be7..c965e5a937a4978f747c2def835341ffd4613e80 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -54,6 +54,5 @@ stdenv.mkDerivation rec { downloadPage = http://alloy.mit.edu/alloy/download.html; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index f0a9837ce48137ffc5478b659f5173a20bd3a932..beebd8ada9bba6125fea528f2ae60758644d2c4f 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.0.3"; + version = "1.1.0"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0pa60fy5skx781hwspaskisv8zx0sfddkvprgmwkhfdpz892srwm"; + sha256 = "0dx5w1ffnqazsyp6zxrmfcn7yhkkd81h7njwbqqv1pbchj5znj6l"; }; propagatedBuildInputs = [ jre ] ; @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://www.lihaoyi.com/Ammonite/; license = lib.licenses.mit; platforms = lib.platforms.all; - maintainer = [ lib.maintainers.nequissimus ]; + maintainers = [ lib.maintainers.nequissimus ]; }; } diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ce650adb7ef2332448f24d2a0846d806bdf9a4cc --- /dev/null +++ b/pkgs/development/tools/analysis/autoflake/default.nix @@ -0,0 +1,24 @@ +{ stdenv, python3Packages }: + +with python3Packages; +buildPythonApplication rec { + pname = "autoflake"; + version = "1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "a74d684a7a02654f74582addc24a3016c06809316cc140457a4fe93a1e6ed131"; + }; + + propagatedBuildInputs = [ pyflakes ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://github.com/myint/autoflake; + description = "A simple program which removes unused imports and unused variables as reported by pyflakes"; + license = licenses.mit; + maintainers = with maintainers; [ yuriaisaka ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 91037588552c9bc3bd1d88d4117f1f2800b3111e..c06cd9c3eb5adfb283fc79ac4dc1b5dc5190773c 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.19"; + version = "8.9"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "0x899i5yamwyhv7wgii80fv5hl8bdq0b8wlx1f789l85ik8rjwk9"; + sha256 = "058lffmlzw7nqz5z89m2k640q7ffz6dz008bddvjsgpxbrdb89cd"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 3ce5f23f6457f0ec55d460dff0c5ed0fa9ff4c0e..2b4a87ffcb8dce91eb4c97c04956887c9ee69253 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { homepage = http://coan2.sourceforge.net/; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 97bd0d6e3dff860f7cad39232ad2409653c32ca0..6019235c47b9335225843d40381be806223ff0f9 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.80"; + version = "1.83"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1yx06yhkqlv9849ns7p97mj09gm9j7xc51q7yvzkk8ldvx4d4h88"; + sha256 = "14d4afjz0jshwpqryvwvzrs3rrqnd7cgg3x19awgy116591ibd83"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index 572e2f744714e2f47b0bc9c18fd47bf1b4e5111d..a7f29017fbe0442170503e02a080b46b376e8d6a 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -28,6 +28,5 @@ buildPerlPackage rec { homepage = http://www.gson.org/egypt/; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 2f794c583e53226c08c9ef7ef7c25ef588260064..042b338b2b142e009946f9d1bafe5a4825d72940 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, findlib, camlp4, sedlex, ocamlbuild }: +{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, + findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }: with lib; stdenv.mkDerivation rec { - version = "0.59.0"; + version = "0.70.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1i47k9dg3pawwkdccb57n6882q92jsmclk5ip2y6dv5hhv4s5z49"; + sha256 = "1pydmfs7xxrqjdnidp2nagwpk2d0vf5nx3m821plld3vbyh22b76"; }; installPhase = '' @@ -18,8 +19,9 @@ stdenv.mkDerivation rec { cp bin/flow $out/bin/ ''; - buildInputs = [ ocaml libelf findlib camlp4 sedlex ocamlbuild ] - ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; + buildInputs = [ + ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa + ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { description = "A static type checker for JavaScript"; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 33ce0531e3b063d1c4b3569516628bbfd254f67c..c950228907a093c1080db271307825d4e0dbb77c 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "20170501"; - slang = "Phosphorus"; + version = "20171101"; + slang = "Sulfur"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; - sha256 = "16bccacms3n4rfpsxdxpdf24bk0hwrnzdpa2pbr6s847li73hkv1"; + sha256 = "1vwjfqmm1r36gkybsy3a7m89q5zicf4rnz5vlsn9imnpjpl9gjw1"; }; why2 = fetchurl { diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh b/pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh deleted file mode 100644 index 6c66eb25ba31d08f111e6cc96369ff5a59ee9b7d..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source "$stdenv"/setup - -cp --recursive "$src" ./ - -chmod --recursive u=rwx ./"$(basename "$src")" - -cd ./"$(basename "$src")" - -cmake ./ - -make - -mkdir --parents "$out"/bin -cp ./TraceFileGen "$out"/bin - -mkdir --parents "$out"/share/doc/"$name"/html -cp --recursive ./Documentation/html/* "$out/share/doc/$name/html/" diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix index 07e3a579d3454384f08228f0c138df1ded92ed49..f96f7e9b66bd0fba652ad469fdf4fc8f5852f906 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchgit, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "tracefilegen-2015-11-14"; + name = "tracefilegen-2017-05-13"; - src = fetchgit { - url = "https://github.com/GarCoSim/TraceFileGen.git"; - rev = "4acf75b142683cc475c6b1c841a221db0753b404"; - sha256 = "0mh661l9d1lczv0mr2y9swzqqlwikyqiv1hdd71r9v8cvm54y5ij"; + src = fetchFromGitHub { + owner = "GarCoSim"; + repo = "TraceFileGen"; + rev = "0ebfd1fdb54079d4bdeaa81fc9267ecb9f016d60"; + sha256 = "1gsx18ksgz5gwl3v62vgrmhxc0wc99i74qwhpn0h57zllk41drjc"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - builder = ./builder.sh; + patches = [ ./gcc7.patch ]; + + installPhase = '' + install -Dm755 TraceFileGen $out/bin/TraceFileGen + mkdir -p $out/share/doc/${name}/ + cp -ar $src/Documentation/html $out/share/doc/${name}/. + ''; meta = with stdenv.lib; { description = "Automatically generate all types of basic memory management operations and write into trace files"; - homepage = https://github.com/GarCoSim; + homepage = https://github.com/GarCoSim; maintainers = [ maintainers.cmcdragonkai ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch b/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch new file mode 100644 index 0000000000000000000000000000000000000000..48301bbf61ad84f22b456105e8cffc1f28c85e53 --- /dev/null +++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch @@ -0,0 +1,13 @@ +diff --git a/Utils/Logger.cpp b/Utils/Logger.cpp +index 747cd63..e3efdf1 100644 +--- a/Utils/Logger.cpp ++++ b/Utils/Logger.cpp +@@ -29,7 +29,7 @@ Logger::Logger(char* tracepath) { + trace = fopen(tracepath, "w"); + + // dot file is not used, set null as default value +- dot = '\0'; ++ dot = nullptr; + //dot = fopen("gcKons.dot", "w"); + //fprintf(dot,"digraph G {\n"); + } diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 7f34ec0fd630110ed4250b08d21407ecc18bc432..ec4d19423e6d50d79d0e3c2601aacda4c151adbb 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ''; homepage = http://include-what-you-use.org; license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 509f3e19e80239d3dae144121f705369d289975e..3c3665e72200c847c506df2371e2d2227f1b6580 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, binutils}: +{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}: stdenv.mkDerivation rec { name = "kcov-${version}"; @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { }; preConfigure = "patchShebangs src/bin-to-c-source.py"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake zlib curl elfutils python libiberty binutils ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index ad887baf23e984ca75971cf4418bce9f0f186372..000e5e3393bf001bf3a6df0598c4172acba54fdd 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://ltp.sourceforge.net/coverage/lcov.php; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with maintainers; [ dezgeg mornfall ]; + maintainers = with maintainers; [ dezgeg ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index 99958a416c39e84e56e36978df0a125d04b5e891..a9793e04883905de61c8ad73a5f94dc8a0fe9b00 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, qtsvg, qtxmlpatterns, karchive, kconfig, kcoreaddons, kparts, kio, ki18n, kdiagram, kgraphviewer }: @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; }; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtsvg qtxmlpatterns karchive kconfig kcoreaddons kparts kio ki18n diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a50f6993c33115d33d8b93c45ced96c1e5cd86b4 --- /dev/null +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake +, pkgconfig, makeWrapper }: + +rustPlatform.buildRustPackage rec { + pname = "panopticon"; + version = "unstable-20171202"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "das-labor"; + repo = pname; + rev = "33ffec0d6d379d51b38d6ea00d040f54b1356ae4"; + sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ makeWrapper ]; + propagatedBuildInputs = with qt5; [ + qt5.qtbase + qtdeclarative + qtsvg + qtquickcontrols2 + qtgraphicaleffects + pkgconfig + git + ]; + + cargoSha256 = "02k21mh0jyc6vz52jx1qijsfk07pkdv1g2hqx7gyvmm4v10vbfna"; + doCheck = false; + + postInstall = '' + mkdir -p $out/share/${pname} $out/bin + cp -R qml $out/share/${pname} + mv $out/bin/${pname} $out/share/${pname} + chmod +x $out/share/${pname} + makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + description = "A libre cross-platform disassembler"; + longDescription = '' + Panopticon is a cross platform disassembler for reverse + engineering written in Rust. It can disassemble AMD64, + x86, AVR and MOS 6502 instruction sets and open ELF files. + Panopticon comes with Qt GUI for browsing and annotating + control flow graphs. + ''; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index e5bed62d324f0ec0c5edd2f9bbec6d5392e0462c..83da9926170aa7ebc1a3ace0dcdc0972a8c4134d 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "5.2.3"; + version = "6.2.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "03frkyiii7304qrcypdqcxqxjf5n3p59zjib0r802mbbx1nzcisn"; + sha256 = "12j6m6lhp4xw27x0x8jcy0vlwbanjwks7w6zl56xihv6r8cm40fz"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 395f720906c96ac9eef6b3f8b0a7280ce4116bb5..15be7554c198931ee7ea741e934801ef88557fc6 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php }: +{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind, fetchpatch }: -stdenv.mkDerivation rec { - name = "qcachegrind-${version}"; - version = "16.12.3"; +let + name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; - src = fetchurl { - url = "http://download.kde.org/stable/applications/${version}/src/kcachegrind-${version}.tar.xz"; - sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q"; - }; +in stdenv.mkDerivation rec { + inherit name; + + src = kcachegrind.src; buildInputs = [ qtbase perl python php ]; nativeBuildInputs = [ qmake ]; + patches = [ + (fetchpatch { + name = "fix-qt5_10-build.patch"; + url = https://github.com/KDE/kcachegrind/commit/c41607a.patch; + sha256 = "00kh5im3hpcarch8rc2dsgxsajfmd8vd7rry9x6mxrbkgr4ifq8y"; + }) + ]; + postInstall = '' mkdir -p $out/bin cp -p converters/dprof2calltree $out/bin/dprof2calltree @@ -28,8 +35,8 @@ stdenv.mkDerivation rec { '' else '' install qcachegrind/qcachegrind cgview/cgview -t "$out/bin" install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications" - install -Dm644 kcachegrind/hi32-app-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png" - install -Dm644 kcachegrind/hi48-app-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" + install -Dm644 kcachegrind/32-apps-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png" + install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" ''); meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d1ff712be2d3fb50c04c77f7256ab0298741f1c5 --- /dev/null +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, fetchpatch, qmake, pkgconfig, qtbase, qtsvg, radare2 }: + + +stdenv.mkDerivation rec { + name = "radare2-cutter-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "radareorg"; + repo = "cutter"; + rev = "v${version}"; + sha256 = "1z76yz2i9k8mxjk85k2agdj941szdbl2gi66p3dh50878zqavfrr"; + }; + + postUnpack = "export sourceRoot=$sourceRoot/src"; + + patchFlags = [ "-p2" ]; + + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ qtbase qtsvg radare2 ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A Qt and C++ GUI for radare2 reverse engineering framework"; + homepage = src.meta.homepage; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 9468842f0c4d2ffa4b3e510dbd2ff0b82d2ba8ad..5f7b389cc2b125e79a6718ec4a8610acf50f72b4 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,9 +1,10 @@ -{stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, -gtk2 ? null, vte ? null, gtkdialog ? null, -python ? null, -ruby ? null, -lua ? null, -useX11, rubyBindings, pythonBindings, luaBindings}: +{stdenv, fetchFromGitHub, pkgconfig, libusb, readline, libewf, perl, zlib, openssl +, gtk2 ? null, vte ? null, gtkdialog ? null +, python ? null +, ruby ? null +, lua ? null +, useX11, rubyBindings, pythonBindings, luaBindings +}: assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; @@ -13,37 +14,35 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "2.0.1"; + version = "2.5.0"; name = "radare2-${version}"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "031ndvinsypagpkdszxjq0hj91ijq9zx4dzk53sz7il7s3zn65c7"; + sha256 = "07x94chkhpn3wgw4pypn35psxq370j6xwmhf1mh5z27cqkq7c2yd"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-15385.patch"; - url = https://github.com/radare/radare2/commit/21a6f570ba33fa9f52f1bba87f07acc4e8c178f4.patch; - sha256 = "19qg5j9yr5r62nrq2b6mscxsz0wyyfah2z5jz8dvj9kqxq186d43"; - }) - ]; + # do not try to update capstone + WITHOUT_PULL=1; postPatch = let - cs_ver = "3.0.4"; # version from $sourceRoot/shlr/Makefile - capstone = fetchurl { - url = "https://github.com/aquynh/capstone/archive/${cs_ver}.tar.gz"; - sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax"; + cs_tip = "4a1b580d069c82d60070d0869a87000db7cdabe2"; # version from $sourceRoot/shlr/Makefile + capstone = fetchFromGitHub { + owner = "aquynh"; + repo = "capstone"; + rev = cs_tip; + sha256 = "0v6rxfpxjq0hf40qn1n5m5wsv1dv6p1j8vm94a708lhvcbk9nkv8"; }; in '' - if ! grep -F "CS_VER=${cs_ver}" shlr/Makefile; then echo "CS_VER mismatch"; exit 1; fi - substituteInPlace shlr/Makefile --replace CS_RELEASE=0 CS_RELEASE=1 - cp ${capstone} shlr/capstone-${cs_ver}.tar.gz - + if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi + cp -r ${capstone} shlr/capstone + chmod -R u+rw shlr/capstone ''; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libusb libewf perl zlib openssl] ++ optional useX11 [gtkdialog vte gtk2] @@ -51,13 +50,6 @@ stdenv.mkDerivation rec { ++ optional pythonBindings [python] ++ optional luaBindings [lua]; - postInstall = '' - # replace symlinks pointing into the build directory with the files they point to - rm $out/bin/{r2-docker,r2-indent} - cp sys/r2-docker.sh $out/bin/r2-docker - cp sys/indent.sh $out/bin/r2-indent - ''; - meta = { description = "unix-like reverse engineering framework and commandline tools"; homepage = http://radare.org/; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a4c62e6fc32c19ba470fd4f6205c6392915f77d3 --- /dev/null +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -0,0 +1,121 @@ +{ stdenv, fetchFromGitHub, fetchurl, fetchzip, +# Native build inputs +cmake, +autoconf, automake, libtool, +pkgconfig, +bison, flex, +groff, +perl, +python, +# Runtime tools +time, +upx, +# Build inputs +ncurses, +libffi, +libxml2, +zlib, +# PE (Windows) data, huge space savings if not needed +withPEPatterns ? false, +}: + +let + release = "3.0"; + + rapidjson = fetchFromGitHub { + owner = "Tencent"; + repo = "rapidjson"; + rev = "v1.1.0"; + sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; + }; + jsoncpp = fetchFromGitHub { + owner = "open-source-parsers"; + repo = "jsoncpp"; + rev = "1.8.3"; + sha256 = "05gkmg6r94q8a0qdymarcjlnlvmy9s365m9jhz3ysvi71cr31lkz"; + }; + googletest = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "release-1.8.0"; + sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399"; + }; + tinyxml2 = fetchFromGitHub { + owner = "leethomason"; + repo = "tinyxml2"; + rev = "5.0.1"; + sha256 = "015g8520a0c55gwmv7pfdsgfz2rpdmh3d1nq5n9bd65n35492s3q"; + }; + yara = fetchurl { + url = "https://github.com/avast-tl/yara/archive/v1.0-retdec.zip"; + sha256 = "1bjrkgp1sgld2y7gvwrlrz5fs16521ink6xyq72v7yxj3vfa9gps"; + }; + openssl = fetchurl { + url = "https://www.openssl.org/source/openssl-1.1.0f.tar.gz"; + sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj"; + }; + + retdec-support = fetchzip { + url = "https://github.com/avast-tl/retdec-support/releases/download/2017-12-12/retdec-support_2017-12-12.tar.xz"; + sha256 = if withPEPatterns then "0pchl7hb42dm0sdbmpr8d3c6xc0lm6cs4p6g6kdb2cr9c99gjzn3" + else "1hcyq6bf4wk739kb53ic2bs71gsbx6zd07pc07lzfnxf8k497mhv"; + # Removing PE signatures reduces this from 3.8GB -> 642MB (uncompressed) + extraPostFetch = stdenv.lib.optionalString (!withPEPatterns) '' + rm -rf $out/generic/yara_patterns/static-code/pe + ''; + }; +in stdenv.mkDerivation rec { + name = "retdec-${version}"; + version = "${release}.0"; + + src = fetchFromGitHub { + owner = "avast-tl"; + repo = "retdec"; + name = "retdec-${release}"; + rev = "refs/tags/v${release}"; + sha256 = "0cpc5lxg8qphdzl3gg9dx992ar35r8ik8wyysr91l2qvfhx93wks"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake autoconf automake libtool pkgconfig bison flex groff perl python ]; + + buildInputs = [ ncurses libffi libxml2 zlib ]; + + prePatch = '' + find . -wholename "*/deps/rapidjson/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${rapidjson}|' + find . -wholename "*/deps/jsoncpp/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${jsoncpp}|' + find . -wholename "*/deps/googletest/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${googletest}|' + find . -wholename "*/deps/tinyxml2/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${tinyxml2}|' + + find . -wholename "*/yaracpp/deps/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|URL .*|URL ${yara}|' + + find . -wholename "*/deps/openssl/CMakeLists.txt" -print0 | \ + xargs -0 sed -i -e 's|OPENSSL_URL .*)|OPENSSL_URL ${openssl})|' + + cat > cmake/install-share.sh < qtbase == null; -assert qtbase != null -> qt4 == null; +{ stdenv, fetchFromGitHub, cmake, boost, qtbase }: stdenv.mkDerivation rec { name = "snowman-${version}"; - version = "2017-08-13"; + version = "2017-11-19"; src = fetchFromGitHub { owner = "yegord"; repo = "snowman"; - rev = "cd9edcddf873fc40d7bcb1bb1eae815faedd3a03"; - sha256 = "10f3kd5m5xw7hqh92ba7dcczwbznxvk1qxg0yycqz7y9mfr2282n"; + rev = "d03c2d6ffbf262c0011584df59d6bd69c020e08e"; + sha256 = "0bzqp3zc100dzvybf57bj4dvnybvds0lmn1w2xjb19wkzm9liskn"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost qt4 qtbase ]; + buildInputs = [ boost qtbase ]; postUnpack = '' export sourceRoot=$sourceRoot/src diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 9d361aced32649e6bbbe7c2017799f10dda2caa3..a59b452b432bee2ad7b94acd19e4f3b54b54c531 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -7,12 +7,15 @@ let in stdenv.mkDerivation rec { name = "spin-${version}"; - version = "6.4.7"; + version = "6.4.8"; url-version = stdenv.lib.replaceChars ["."] [""] version; src = fetchurl { - url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz"; - sha256 = "17m2xaag0jns8hsa4466zxq35ylg9fnzynzvjjmx4ympbiil6mqv"; + # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. + # Dropbox mirror from developers: + # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa + url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADya1lOBJZDbgWGrUSq-dfHa/spin${url-version}.tar.gz?raw=1"; + sha256 = "1rvamdsf0igzpndlr4ck7004jw9x1bg4xyf78zh5k9sp848vnd80"; }; nativeBuildInputs = [ makeWrapper ]; @@ -35,6 +38,6 @@ in stdenv.mkDerivation rec { homepage = http://spinroot.com/; license = licenses.free; platforms = platforms.linux; - maintainers = with maintainers; [ mornfall pSub ]; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..16d2782b7340314a7f6fe65864d0bec5ac09e6e0 --- /dev/null +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, pythonPackages, ansible }: + +pythonPackages.buildPythonPackage rec { + pname = "ansible-lint"; + version = "3.4.20"; + + src = fetchFromGitHub { + owner = "willthames"; + repo = "ansible-lint"; + rev = "v${version}"; + sha256 = "0wgczijrg5azn2f63hjbkas1w0f5hbvxnk3ia53w69mybk0gy044"; + }; + + propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ]; + + checkInputs = [ pythonPackages.nose ]; + + postPatch = '' + patchShebangs bin/ansible-lint + ''; + + checkPhase = '' + nosetests test + ''; + + meta = { + homepage = "https://github.com/willthames/ansible-lint"; + description = "Best practices checker for Ansible"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.sengaya ]; + }; +} diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 158de9226c69ac930fdc7deb21969add03bcf2f2..65211ca088b487059bc1c5fef30d66a4a1f882b1 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "b724c158ec99dbad723024e259fd73e5135c40d652a3c599cec6ade9264a568e"; + sha256 = "01sjrc3fwkpkr8b4w1i9amyiix02b29n0w2zcrw5sdj91n8vm3b4"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 812053902a57fb166cb131b575cf5b880127a1e3..e0b9aec9ee15693bc5224ea15f38cbaaf1c8615a 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -1,30 +1,25 @@ -{ stdenv, fetchFromGitHub, python2Packages, makeWrapper }: +{ stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake +, pytestrunner, pytest, six, pyparsing, asn1ate }: -stdenv.mkDerivation rec { +buildPythonApplication rec { pname = "asn2quickder"; - name = "${pname}-${version}"; - version = "0.7-RC1"; + version = "1.2-6"; src = fetchFromGitHub { - sha256 = "0ynajhbml28m4ipbj5mscjcv6g1a7frvxfimxh813rhgl0w3sgq8"; + sha256 = "00wifjydgmqw2i5vmr049visc3shjqccgzqynkmmhkjhs86ghzr6"; rev = "version-${version}"; owner = "vanrein"; - repo = "${pname}"; + repo = "quick-der"; }; - propagatedBuildInputs = with python2Packages; [ pyparsing makeWrapper ]; + patchPhase = '' + patchShebangs ./python/scripts/* + ''; - patchPhase = with python2Packages; '' - substituteInPlace Makefile \ - --replace '..' '..:$(DESTDIR)/${python.sitePackages}:${python2Packages.pyparsing}/${python.sitePackages}' \ - ''; + buildInputs = [ makeWrapper cmake ]; + checkInputs = [ pytestrunner pytest ]; - installPhase = '' - mkdir -p $out/${python2Packages.python.sitePackages}/ - mkdir -p $out/bin $out/lib $out/sbin $out/man - make DESTDIR=$out PREFIX=/ all - make DESTDIR=$out PREFIX=/ install - ''; + propagatedBuildInputs = [ pyparsing asn1ate six ]; meta = with stdenv.lib; { description = "An ASN.1 compiler with a backend for Quick DER"; diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 94960e1b74da5bb078c72ddc3ffeadcaccfb1b36..5bda2d945eb6c2be1ec67bf0ae04429d70b0b62e 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,17 +1,19 @@ -{ fetchFromGitHub, makeWrapper, pythonPackages, stdenv }: +{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper +, arrow, futures, logfury, requests, six, tqdm +}: -pythonPackages.buildPythonApplication rec { - name = "backblaze-b2-${version}"; - version = "0.6.2"; +buildPythonApplication rec { + pname = "backblaze-b2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; - rev = "3a4cd3f0b5309f79f98c2e0d51afc19fb2fe4201"; - sha256 = "1gl1z7zg3s1xgx45i6b1bvx9iwviiiinl4my00h66qkhrw7ag8p1"; + rev = "v${version}"; + sha256 = "0697rcdsmxz51p4b8m8klx2mf5xnx6vx56vcf5jmzidh8mc38a6z"; }; - propagatedBuildInputs = with pythonPackages; [ futures requests six tqdm ]; + propagatedBuildInputs = [ arrow futures logfury requests six tqdm ]; checkPhase = '' python test_b2_command_line.py test @@ -27,7 +29,7 @@ pythonPackages.buildPythonApplication rec { cp contrib/bash_completion/b2 "$out/etc/bash_completion.d/backblaze-b2" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tool for accessing the Backblaze B2 storage service"; homepage = https://github.com/Backblaze/B2_Command_Line_Tool; license = licenses.mit; diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index e61b7f78302b206fa295038527f0fbb9eb0ae256..0dbe1aa78c50872d287114aadf5af0d307bfbac5 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/bloaty.cc \ --replace "c++filt" \ - "${stdenv.lib.getBin binutils}/bin/c++filt" + "${binutils.bintools}/bin/c++filt" ''; doCheck = true; diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 6b9dd6393cb693d4ebcbbd0a9c24de15fa3c985e..f83353034a8f1590d3d9b869a5a687d1c8e21388 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -1,38 +1,43 @@ -{ stdenv, fetchgit, cmake, expat, qt5, boost }: +{ stdenv, fetchFromGitHub, cmake, qtbase }: stdenv.mkDerivation rec { name = "boomerang-${version}"; - version = "0.3.99-alpha-2016-11-02"; + version = "0.4.0-alpha-2018-01-18"; - src = fetchgit { - url = "https://github.com/nemerle/boomerang.git"; - rev = "f95d6436845e9036c8cfbd936731449475f79b7a"; - sha256 = "1q3q92lfj24ij5sxdbdhcqyan28r6db1w80yrks4csf9zjij1ixh"; + src = fetchFromGitHub { + owner = "ceeac"; + repo = "boomerang"; + rev = "b4ff8d573407a8ed6365d4bfe53d2d47d983e393"; + sha256 = "0x17vlm6y1paa49fi3pmzz7vzdqms19qkr274hkq32ql342b6i6x"; }; - buildInputs = [ cmake expat qt5.qtbase boost ]; - - patches = [ ./fix-install.patch ./fix-output.patch ]; - - postPatch = '' - substituteInPlace loader/BinaryFileFactory.cpp \ - --replace '"lib"' '"../lib"' - - substituteInPlace ui/DecompilerThread.cpp \ - --replace '"output"' '"./output"' - - substituteInPlace boomerang.cpp \ - --replace 'progPath("./")' "progPath(\"$out/share/boomerang/\")" - - substituteInPlace ui/commandlinedriver.cpp \ - --replace "QFileInfo(args[0]).absolutePath()" "\"$out/share/boomerang/\"" + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase ]; + + postPatch = + # Look in installation directory for required files, not relative to working directory + '' + substituteInPlace src/boomerang/core/Settings.cpp \ + --replace "setDataDirectory(\"../share/boomerang\");" \ + "setDataDirectory(\"$out/share/boomerang\");" \ + --replace "setPluginDirectory(\"../lib/boomerang/plugins\");" \ + "setPluginDirectory(\"$out/lib/boomerang/plugins\");" + '' + # Fixup version: + # * don't try to inspect with git + # (even if we kept .git and such it would be "dirty" because of patching) + # * use date so version is monotonically increasing moving forward + + '' + sed -i cmake-scripts/boomerang-version.cmake \ + -e 's/set(\(PROJECT\|BOOMERANG\)_VERSION ".*")/set(\1_VERSION "${version}")/' ''; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://boomerang.sourceforge.net/; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; description = "A general, open source, retargetable decompiler"; + maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/development/tools/boomerang/fix-install.patch b/pkgs/development/tools/boomerang/fix-install.patch deleted file mode 100644 index bc656acfd6a5e62ce09abe74f90c970ac28d020d..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/boomerang/fix-install.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5851256422a4debc34c956439d8129a4d5f80722 Mon Sep 17 00:00:00 2001 -From: Will Dietz -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 deleted file mode 100644 index 18fbe74177b3d1b88e994a548ac798e2cdaf3b98..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/boomerang/fix-output.patch +++ /dev/null @@ -1,24 +0,0 @@ -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/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix new file mode 100644 index 0000000000000000000000000000000000000000..8816a005ca0fc5853c280e26029769f687f269c9 --- /dev/null +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -0,0 +1,111 @@ +{ fetchurl, stdenv, coreutils, makeWrapper }: + +let version = "1.9.6"; in + +stdenv.mkDerivation { + name = "ant-${version}"; + + buildInputs = [ makeWrapper ]; + + src = fetchurl { + url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; + sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4"; + }; + + contrib = fetchurl { + url = mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2; + sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1"; + }; + + installPhase = + '' + mkdir -p $out/bin $out/lib/ant + mv * $out/lib/ant/ + + # Get rid of the manual (35 MiB). Maybe we should put this in a + # separate output. Keep the antRun script since it's vanilla sh + # and needed for the task (but since we set ANT_HOME to + # a weird value, we have to move antRun to a weird location). + # Get rid of the other Ant scripts since we provide our own. + mv $out/lib/ant/bin/antRun $out/bin/ + rm -rf $out/lib/ant/{manual,bin,WHATSNEW} + mkdir $out/lib/ant/bin + mv $out/bin/antRun $out/lib/ant/bin/ + + # Install ant-contrib. + unpackFile $contrib + cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/ + + cat >> $out/bin/ant <&2 + exit 1 + fi + fi + + if [ -z \$NIX_JVM ]; then + if [ -e \$JAVA_HOME/bin/java ]; then + NIX_JVM=\$JAVA_HOME/bin/java + elif [ -e \$JAVA_HOME/bin/gij ]; then + NIX_JVM=\$JAVA_HOME/bin/gij + else + NIX_JVM=java + fi + fi + + LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" + + exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \ + -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ + org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ + -cp "\$CLASSPATH" "\$@" + EOF + + chmod +x $out/bin/ant + ''; # */ + + meta = { + homepage = http://ant.apache.org/; + description = "A Java-based build tool"; + + longDescription = '' + Apache Ant is a Java-based build tool. In theory, it is kind of like + Make, but without Make's wrinkles. + + Why another build tool when there is already make, gnumake, nmake, jam, + and others? Because all those tools have limitations that Ant's + original author couldn't live with when developing software across + multiple platforms. Make-like tools are inherently shell-based -- they + evaluate a set of dependencies, then execute commands not unlike what + you would issue in a shell. This means that you can easily extend + these tools by using or writing any program for the OS that you are + working on. However, this also means that you limit yourself to the + OS, or at least the OS type such as Unix, that you are working on. + + Ant is different. Instead of a model where it is extended with + shell-based commands, Ant is extended using Java classes. Instead of + writing shell commands, the configuration files are XML-based, calling + out a target tree where various tasks get executed. Each task is run + by an object that implements a particular Task interface. + ''; + + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 8816a005ca0fc5853c280e26029769f687f269c9..b6c2702485b169cd30e9450e34fee8e6e8d29498 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, coreutils, makeWrapper }: -let version = "1.9.6"; in +let version = "1.10.2"; in stdenv.mkDerivation { name = "ant-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4"; + sha256 = "0662qammjvibh9kgkxzadkayfn2r7iwnagbwaw28crqqclrb2rp1"; }; contrib = fetchurl { diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0aec7491e4ad8ff07e8eefaf866c0284005fd2d1 --- /dev/null +++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "arpa2cm"; + version = "0.5"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + sha256 = "093h7njj8d8iiwnw5byfxkkzlbny60fwv1w57j8f1lsd4yn6rih4"; + rev = "version-${version}"; + repo = "${pname}"; + owner = "arpa2"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "CMake Module library for the ARPA2 project"; + license = licenses.bsd2; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index f8c1f01d44646a73043bb3b8d208d1b16c41fba0..7fa39ef21627844024e7457e7c7869838feb922b 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; maintainers = with maintainers; [ cstrahan philandstuff ]; - platforms = platforms.unix; + platforms = platforms.linux; }; name = "bazel-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; sourceRoot = "."; - patches = lib.optional enableNixHacks ./nix-hacks.patch; + patches = lib.optional enableNixHacks ./nix-hacks-0.4.patch; postPatch = '' for f in $(grep -l -r '/bin/bash'); do diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index a1452d330be09303d18b15b40042cd67cd566e32..593fe6c159b259aeca31394cb1edd3fbccaa7b9a 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - version = "0.7.0"; + version = "0.11.1"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "05n4zz2a29y4vr2svc7ya9fx7qxb9151a6gkycxk9qj3v32sk150"; + sha256 = "e8d762bcc01566fa50952c8028e95cfbe7545a39b8ceb3a0d0d6df33b25b333f"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch b/pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch new file mode 100644 index 0000000000000000000000000000000000000000..563fe635e6b0ba1f8714ba8ecf4ec856626c26e3 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch @@ -0,0 +1,51 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +index eafa09fb5..d2d5e40e8 100644 +--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java ++++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +@@ -287,21 +287,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction { + markerData.put(key, value); + } + } +- boolean result = false; +- if (markerRuleKey.equals(ruleKey)) { +- result = handler.verifyMarkerData(rule, markerData, env); +- if (env.valuesMissing()) { +- return null; +- } +- } + +- if (result) { +- return new Fingerprint().addString(content).digestAndReset(); +- } else { +- // So that we are in a consistent state if something happens while fetching the repository +- markerPath.delete(); +- return null; +- } ++ return new Fingerprint().addString(content).digestAndReset(); + + } catch (IOException e) { + throw new RepositoryFunctionException(e, Transience.TRANSIENT); +diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java +index a7ebc8f7a..40f2049fa 100644 +--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java ++++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java +@@ -129,7 +129,6 @@ public class JavaSubprocessFactory implements SubprocessFactory { + ProcessBuilder builder = new ProcessBuilder(); + builder.command(params.getArgv()); + if (params.getEnv() != null) { +- builder.environment().clear(); + builder.environment().putAll(params.getEnv()); + } + +diff --git a/src/main/java/com/google/devtools/build/lib/worker/Worker.java b/src/main/java/com/google/devtools/build/lib/worker/Worker.java +index 0268d1b2b..637364657 100644 +--- a/src/main/java/com/google/devtools/build/lib/worker/Worker.java ++++ b/src/main/java/com/google/devtools/build/lib/worker/Worker.java +@@ -77,7 +77,6 @@ class Worker { + new ProcessBuilder(command) + .directory(workDir.getPathFile()) + .redirectError(Redirect.appendTo(logFile.getPathFile())); +- processBuilder.environment().clear(); + processBuilder.environment().putAll(workerKey.getEnv()); + + this.process = processBuilder.start(); diff --git a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch index 563fe635e6b0ba1f8714ba8ecf4ec856626c26e3..da3f6248f220cd07652072a32d564b3204a8a462 100644 --- a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch +++ b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch @@ -1,8 +1,7 @@ -diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java -index eafa09fb5..d2d5e40e8 100644 ---- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java -+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java -@@ -287,21 +287,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction { +diff -Naur a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 1980-01-01 00:00:00.000000000 -0500 ++++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 2018-01-18 08:17:22.420459162 -0500 +@@ -287,21 +287,8 @@ markerData.put(key, value); } } @@ -25,11 +24,10 @@ index eafa09fb5..d2d5e40e8 100644 } catch (IOException e) { throw new RepositoryFunctionException(e, Transience.TRANSIENT); -diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java -index a7ebc8f7a..40f2049fa 100644 ---- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java -+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java -@@ -129,7 +129,6 @@ public class JavaSubprocessFactory implements SubprocessFactory { +diff -Naur a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java +--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 1980-01-01 00:00:00.000000000 -0500 ++++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 2018-01-18 08:17:53.274877980 -0500 +@@ -129,7 +129,6 @@ ProcessBuilder builder = new ProcessBuilder(); builder.command(params.getArgv()); if (params.getEnv() != null) { @@ -37,15 +35,3 @@ index a7ebc8f7a..40f2049fa 100644 builder.environment().putAll(params.getEnv()); } -diff --git a/src/main/java/com/google/devtools/build/lib/worker/Worker.java b/src/main/java/com/google/devtools/build/lib/worker/Worker.java -index 0268d1b2b..637364657 100644 ---- a/src/main/java/com/google/devtools/build/lib/worker/Worker.java -+++ b/src/main/java/com/google/devtools/build/lib/worker/Worker.java -@@ -77,7 +77,6 @@ class Worker { - new ProcessBuilder(command) - .directory(workDir.getPathFile()) - .redirectError(Redirect.appendTo(logFile.getPathFile())); -- processBuilder.environment().clear(); - processBuilder.environment().putAll(workerKey.getEnv()); - - this.process = processBuilder.start(); diff --git a/pkgs/development/tools/build-managers/bear/cmakepaths.patch b/pkgs/development/tools/build-managers/bear/cmakepaths.patch new file mode 100644 index 0000000000000000000000000000000000000000..d237267078e68aab1ac9119063c62177fb759a03 --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/cmakepaths.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04c5c58..429ca47 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Rogue") + + set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear") +-set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") ++set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") + + add_subdirectory(libear) + add_subdirectory(bear) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 2bfec89aa66035f6a40cb9ca0178eb93ee1a0a81..8f352f84b2287c5e569fa7674d7448adecd9d240 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.2.1"; + version = "2.3.11"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "1rwar5nvvhfqws4nwyifaysqs3nxpphp48lx9mdg5n6l4z7drz0n"; + sha256 = "0r6ykvclq9ws055ssd8w33dicmk5l9pisv0fpzkks700n8d3z9f3"; }; nativeBuildInputs = [ cmake ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # all fail - patches = [ ./ignore_wrapper.patch ]; + patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ]; meta = with stdenv.lib; { description = "Tool that generates a compilation database for clang tooling"; @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/rizsotto/Bear; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.vcunat ]; + maintainers = [ maintainers.vcunat maintainers.babariviere ]; }; } - diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch index 16d7a9bfd3e4b1bea71e947a5d070b4e8ac3313c..f70e3811f654f7ed72a2d81e9bed5ef6cae3a48c 100644 --- a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch +++ b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch @@ -1,31 +1,23 @@ ---- Bear-2.2.1-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 -+++ Bear-2.2.1-src-patch/bear/main.py.in 2016-11-02 20:23:38.050134984 +0100 -@@ -48,6 +48,7 @@ +--- Bear-2.3.11-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 ++++ Bear-2.3.11-src-patch/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 +@@ -49,6 +49,7 @@ import shutil import contextlib import logging +from distutils.spawn import find_executable - # Ignored compiler options map for compilation database creation. - # The map is used in `split_command` method. (Which does ignore and classify -@@ -447,7 +448,6 @@ - # do extra check on number of source files - return result if result.files else None + # Map of ignored compiler option for the creation of a compilation database. + # This map is used in _split_command method, which classifies the parameters +@@ -540,7 +541,11 @@ + any(pattern.match(cmd) for pattern in COMPILER_PATTERNS_CXX) -- - def split_compiler(command): - """ A predicate to decide the command is a compiler call or not. - -@@ -467,7 +467,11 @@ - for pattern in COMPILER_CPP_PATTERNS) - - if command: # not empty list will allow to index '0' and '1:' -- executable = os.path.basename(command[0]) -+ absolute_executable = os.path.realpath(find_executable(command[0])) -+ if 'wrapper' in absolute_executable: -+ return None + if command: # not empty list will allow to index '0' and '1:' +- executable = os.path.basename(command[0]) # type: str ++ absolute_executable = os.path.realpath(find_executable(command[0])) ++ if 'wrapper' in absolute_executable: ++ return None + -+ executable = os.path.basename(absolute_executable) - parameters = command[1:] - # 'wrapper' 'parameters' and - # 'wrapper' 'compiler' 'parameters' are valid. ++ executable = os.path.basename(absolute_executable) # type: str + parameters = command[1:] # type: List[str] + # 'wrapper' 'parameters' and + # 'wrapper' 'compiler' 'parameters' are valid. \ No newline at end of file diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index a2d77f0321a3b239eba000cb8588c725fc8d63b5..3e994227ef05b4c017db360feccbb73347ade282 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, openssh, buildbot-worker, pythonPackages, runCommand, makeWrapper }: +{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }: let withPlugins = plugins: runCommand "wrapped-${package.name}" { @@ -14,11 +14,11 @@ let package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.11"; + version = "1.0.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1s3y218wry7502xp4zxccf3z996xm8cnp3dcxl7m5ldmmb055qwv"; + sha256 = "0y7gpymxl09gd9dyqj7zqhaihpl9da1v8ppxi4r161ywd8jv9b1g"; }; buildInputs = with pythonPackages; [ @@ -36,6 +36,7 @@ let pyflakes openssh buildbot-worker + buildbot-pkg treq ]; diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix new file mode 100644 index 0000000000000000000000000000000000000000..ef8a0cdc38ef753a8a22d46df1035851065f5d9d --- /dev/null +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "buildbot-pkg"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "7b255f5ec97946c3d32e822b8fcbff0459cfe4f94fb26ee4813ffd80440c93e8"; + }; + + propagatedBuildInputs = [ setuptools ]; + + postPatch = '' + # Their listdir function filters out `node_modules` folders. + # Do we have to care about that with Nix...? + substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" "" + ''; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + description = "Buildbot Packaging Helper"; + 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 ec4bf161562abb70c40f70c3aa0742b648b40c27..1d1b963df9935eec766648f2b0763d7e3156896f 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -1,27 +1,6 @@ -{ stdenv, pythonPackages }: +{ stdenv, pythonPackages, buildbot-pkg }: -let - buildbot-pkg = pythonPackages.buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "buildbot-pkg"; - version = "0.9.11"; - - src = pythonPackages.fetchPypi { - inherit pname version; - sha256 = "1gh7wj9z7n7yfs219jbv9pdd2w8dwj6qpa090ffjkfpgd3xana33"; - }; - - propagatedBuildInputs = with pythonPackages; [ setuptools ]; - - meta = with stdenv.lib; { - homepage = http://buildbot.net/; - description = "Buildbot Packaging Helper"; - maintainers = with maintainers; [ nand0p ryansydnor ]; - license = licenses.gpl2; - }; - }; - -in { +{ www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; @@ -32,7 +11,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "0fk1swdncg4nha744mzkf6jqh1zv1cfhnqvd19669kjcyjx9i68d"; + sha256 = "0nmrq50c5ib185rpb8ai1mm7gjq2mjvxik1kqrjfa62i1ia9ikyj"; }; meta = with stdenv.lib; { @@ -50,7 +29,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "16wxgnh35916c2gw34971ynx319lnm9addhqvii885vid44pqim0"; + sha256 = "1laz7l7cbbz0czb6skxw314bd2qk2f63qw3n2rs7m7v11gd9cdll"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -70,7 +49,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1hcr8xsc0ajfg2vz2h8g5s8ypsp32kdplgqp21jh8z5y0a6nzqsl"; + sha256 = "0mmri8c4n1zwxc1dx2a11yllrmnwqqxjvvil9224lbs98mpchppi"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -90,7 +69,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0aw1073xq549q5jkjk31zhqpasp8jiy4gch0fjyw8qy0dax8hc7r"; + sha256 = "0nwlw2m3qfifia6gy3d4lrnycra50k98ax071p2zjqknanh563vr"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -110,7 +89,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0x99mdmn1ngcnmkxr40hwqafsq48jybdz45y5kpc0yw68n0bfwmv"; + sha256 = "1zml9bd910zwcby4vr3lmzap2grinha2w5zgb2cmixmz7hfrqswp"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 4fe728b9ce64ca4550a05c9e02aa13d326915aa5..59d3c93bb8775d102fc6984dfc3a022e13e947d7 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.11"; + version = "1.1.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0lb8kwg3m9jgrww929d5nrjs4rj489mb4dnsdxcbdb358jbbym22"; + sha256 = "0hpiawf0dq8phsvihlcx9bpl70n7s3rhcgbgma36bark6sgr4y8y"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/cask/default.nix b/pkgs/development/tools/build-managers/cask/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..234dab99c03cdc3d8b9c7d48f2d743990a9741c9 --- /dev/null +++ b/pkgs/development/tools/build-managers/cask/default.nix @@ -0,0 +1,11 @@ +{ emacsPackagesNg, writeScriptBin }: +let + + emacs = emacsPackagesNg.emacsWithPackages (epkgs: [ epkgs.cask-package-toolset ]); + cpt = emacsPackagesNg.cask-package-toolset; + +in writeScriptBin "cask" '' +#!/bin/sh + +exec ${emacs}/bin/emacs --script ${cpt}/share/emacs/site-lisp/elpa/cask-package-toolset-${cpt.version}/cask-package-toolset.el -- "$@" +'' diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index fb38e52811cfd0f41f438fcf6727dc9eaf480e8d..5fcd6b341653f7a4f209de5f1477a08a0cc1b00d 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 -, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null +, useNcurses ? false, ncurses, useQt4 ? false, qt4, ps , buildPlatform, hostPlatform }: with stdenv.lib; -assert wantPS -> (ps != null); assert stdenv ? cc; assert stdenv.cc ? libc; @@ -43,11 +42,16 @@ stdenv.mkDerivation rec { sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; }); + postPatch = '' + substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \ + --replace '"-framework CoreServices"' '""' + ''; + buildInputs = [ curl expat zlib bzip2 ] ++ optional useNcurses ncurses ++ optional useQt4 qt4; - propagatedBuildInputs = optional wantPS ps; + propagatedBuildInputs = [ ps ]; CMAKE_PREFIX_PATH = concatStringsSep ":" (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); @@ -76,7 +80,7 @@ stdenv.mkDerivation rec { meta = { 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; [ mornfall ]; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 94428ecc174d8790a946a3f06cb0476b82f75f0e..97c02cd9cc12f6b4e68035322d46f24e4845da0e 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash +, majorVersion ? "3.10" # darwin attributes , ps , isBootstrap ? false @@ -14,10 +15,23 @@ assert useQt4 -> withQt5 == false; with stdenv.lib; +with ( + { + "3.10" = { + minorVersion = "2"; + sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b"; + }; + "3.9" = { + minorVersion = "6"; + sha256 = "7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218"; + }; + + }.${majorVersion} + or (abort ''Unsupported configuration for cmake: majorVersion = "${majorVersion}";'') +); + let os = stdenv.lib.optionalString; - majorVersion = "3.9"; - minorVersion = "4"; version = "${majorVersion}.${minorVersion}"; in @@ -28,8 +42,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - # from https://cmake.org/files/v3.9/cmake-3.9.4-SHA-256.txt - sha256 = "b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1"; + # from https://cmake.org/files/v3.10/cmake-3.10.2-SHA-256.txt + inherit sha256; }; prePatch = optionalString (!useSharedLibraries) '' @@ -69,15 +83,29 @@ stdenv.mkDerivation rec { configureFlags = [ "--docdir=share/doc/${name}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup ++ optional (useQt4 || withQt5) "--qt-gui" - ++ optionals (!useNcurses) [ "--" "-DBUILD_CursesDialog=OFF" ]; + ++ ["--"] + ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ] + ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" + "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" + "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" + # TODO: Why are ar and friends not provided by the bintools wrapper? + ]; dontUseCmakeConfigure = true; enableParallelBuilding = true; + # This isn't an autoconf configure script; triples are passed via + # CMAKE_SYSTEM_NAME, etc. + configurePlatforms = [ ]; + + meta = with stdenv.lib; { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else platforms.all; - maintainers = with maintainers; [ mornfall ttuegel lnl7 ]; + maintainers = with maintainers; [ ttuegel lnl7 ]; }; } diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 331f907ae6129237c947cecdaa137e82a84b94ec..5053559bcca343a2b2ef93297e80425ce9ff5783 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -33,9 +33,31 @@ cmakeConfigurePhase() { # By now it supports linux builds only. We should set the proper # CMAKE_SYSTEM_NAME otherwise. # http://www.cmake.org/Wiki/CMake_Cross_Compiling - cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-g++ -DCMAKE_C_COMPILER=$crossConfig-gcc $cmakeFlags" + # + # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and + # strip. Otherwise they are taken to be relative to the source root of + # the package being built. + cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-c++ $cmakeFlags" + cmakeFlags="-DCMAKE_C_COMPILER=$crossConfig-cc $cmakeFlags" + cmakeFlags="-DCMAKE_AR=$(command -v $crossConfig-ar) $cmakeFlags" + cmakeFlags="-DCMAKE_RANLIB=$(command -v $crossConfig-ranlib) $cmakeFlags" + cmakeFlags="-DCMAKE_STRIP=$(command -v $crossConfig-strip) $cmakeFlags" fi + # on macOS we want to prefer Unix-style headers to Frameworks + # because we usually do not package the framework + cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags" + + # we never want to use the global macOS SDK + cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags" + + # disable OSX deployment target + # we don't want our binaries to have a "minimum" OSX version + cmakeFlags="-DCMAKE_OSX_DEPLOYMENT_TARGET= $cmakeFlags" + + # correctly detect our clang compiler + cmakeFlags="-DCMAKE_POLICY_DEFAULT_CMP0025=NEW $cmakeFlags" + # This installs shared libraries with a fully-specified install # name. By default, cmake installs shared libraries with just the # basename as the install name, which means that, on Darwin, they @@ -43,7 +65,7 @@ cmakeConfigurePhase() { # libraries are in a system path or in the same directory as the # executable. This flag makes the shared library accessible from its # nix/store directory. - cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=$prefix/lib $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags" cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags" cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags" @@ -51,10 +73,19 @@ cmakeConfigurePhase() { # And build always Release, to ensure optimisation flags cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" + if [ "$buildPhase" = ninjaBuildPhase ]; then + cmakeFlags="-GNinja $cmakeFlags" + fi + echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}" cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}" + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "cmake: enabled parallel building" + fi + runHook postConfigure } @@ -63,11 +94,7 @@ if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then configurePhase=cmakeConfigurePhase fi -if [ -n "$crossConfig" ]; then - crossEnvHooks+=(addCMakeParams) -else - envHooks+=(addCMakeParams) -fi +addEnvHooks "$targetOffset" addCMakeParams makeCmakeFindLibs(){ isystem_seen= diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 4a2afbeedfe6ff96190b9768fd76c75c1409fc71..04d7d93455e901ccc1bf2e8859b6e42d445873ee 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,27 +1,59 @@ -{ lib, buildPythonApplication, fetchPypi -, requests, fasteners, pyyaml, pyjwt, colorama, patch -, bottle, pluginbase, six, distro, pylint, node-semver -, future, pygments, mccabe -}: - -buildPythonApplication rec { - version = "0.28.1"; +{ lib, fetchpatch, python }: + +let newPython = python.override { + packageOverrides = self: super: { + distro = super.distro.overridePythonAttrs (oldAttrs: rec { + version = "1.1.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j"; + }; + }); + node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec { + version = "0.2.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3"; + }; + }); + }; +}; + +in newPython.pkgs.buildPythonApplication rec { + version = "1.1.1"; # remove patch below when updating pname = "conan"; - src = fetchPypi { + src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "0zf564iqh0099yd779f9fgk21qyp87d7cmgfj34hmncf8y3qh32a"; + sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl"; }; - propagatedBuildInputs = [ + checkInputs = with newPython.pkgs; [ + nose + parameterized + mock + webtest + codecov + ]; + + propagatedBuildInputs = with newPython.pkgs; [ requests fasteners pyyaml pyjwt colorama patch bottle pluginbase six distro pylint node-semver future pygments mccabe ]; - # enable tests once all of these pythonPackages available: - # [ nose nose_parameterized mock webtest codecov ] - doCheck = false; + patches = [ + # already merged, remove with the next package update + (fetchpatch { + url = "https://github.com/conan-io/conan/commit/51cc4cbd51ac8f9b9efa2bf678a2d7810e273ff3.patch"; + sha256 = "0d93g4hjpfk8z870imwdswkw5qba2h5zhfgwwijiqhr2pv7fl1y7"; + }) + ]; + + preCheck = '' + export HOME="$TMP/conan-home" + mkdir -p "$HOME" + ''; meta = with lib; { homepage = https://conan.io; diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix index 200ec6429a7979c5f50a8fd8d1b755d6c00c58aa..e6ec8c2a80ce3ec3e473b9bece39eb0294a069f6 100644 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -3,14 +3,14 @@ let name = "doit"; - version = "0.30.3"; + version = "0.31.1"; in python3Packages.buildPythonApplication { name = "${name}-${version}"; src = fetchurl { url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz"; - sha256 = "1fcsslc3mc4bszq5xdqbxv37720s1s31d6pbfwc2iyxk1x2wi219"; + sha256 = "1spm8vfjh4kvalaj0i2ggbdln1yy5k68d8mfwfnpqlzxxx4ikl5s"; }; buildInputs = with python3Packages; [ mock pytest ]; diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 007ce5b07cde8a06e817001d58a7e06ce3bac48c..28894850bbd96925034f9ec4cf10989328d4f4cb 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,65 +1,103 @@ -{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: +{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }: -stdenv.mkDerivation rec { - name = "dub-${version}"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "dlang"; - repo = "dub"; - rev = "v${version}"; - sha256 = "0kmirx4ijhzirjwdqmnwqhngg38zdaydpvny2p0yj3afqgkj6vq5"; - }; +let - postPatch = '' - # Avoid that the version file is overwritten - substituteInPlace build.sh \ - --replace source/dub/version_.d /dev/null + dubBuild = stdenv.mkDerivation rec { + name = "dubBuild-${version}"; + version = "1.8.0"; - substituteInPlace build.sh \ - --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + enableParallelBuilding = true; - patchShebangs build.sh - patchShebangs test + src = fetchFromGitHub { + owner = "dlang"; + repo = "dub"; + rev = "v${version}"; + sha256 = "0788d375sc6xdak9x6xclkkz243lb7di68yxfvl4v0n178mi22bk"; + }; - # Remove unittest which is not working for now (upstream already fixed: https://github.com/dlang/dub/issues/1224) - rm test/interactive-remove.sh + postUnpack = '' + patchShebangs . + ''; - # Fix test as long as there is no upstream solution. (see https://github.com/dlang/dub/pull/1227) - substituteInPlace test/issue884-init-defer-file-creation.sh \ - --replace "< /dev/stdin" "<(while :; do sleep 1; done)" \ - --replace "sleep 1" "" - ''; + # Can be removed with https://github.com/dlang/dub/pull/1368 + dubvar = "\\$DUB"; + postPatch = '' + substituteInPlace test/fetchzip.sh \ + --replace "dub remove" "\"${dubvar}\" remove" + ''; - nativeBuildInputs = [ dmd libevent rsync ]; - buildInputs = [ curl ]; + nativeBuildInputs = [ dmd libevent rsync ]; + buildInputs = [ curl ]; - buildPhase = '' - export DMD=${dmd.out}/bin/dmd - ./build.sh - ''; + buildPhase = '' + export DMD=${dmd.out}/bin/dmd + ./build.sh + ''; + + installPhase = '' + mkdir $out + mkdir $out/bin + cp bin/dub $out/bin + ''; + + meta = with stdenv.lib; { + description = "Package and build manager for D applications and libraries"; + homepage = http://code.dlang.org/; + license = licenses.mit; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; + }; + + # Need to test in a fixed-output derivation, otherwise the + # network tests would fail if sandbox mode is enabled. + dubUnittests = stdenv.mkDerivation rec { + name = "dubUnittests-${version}"; + version = dubBuild.version; + + enableParallelBuilding = dubBuild.enableParallelBuilding; + preferLocalBuild = true; + inputString = dubBuild.outPath; + outputHashAlgo = "sha256"; + outputHash = builtins.hashString "sha256" inputString; - doCheck = false; + src = dubBuild.src; + + postUnpack = dubBuild.postUnpack; + postPatch = dubBuild.postPatch; - checkPhase = '' - export DUB=$PWD/bin/dub + nativeBuildInputs = dubBuild.nativeBuildInputs; + buildInputs = dubBuild.buildInputs; + + buildPhase = '' + # Can't use dub from dubBuild directly because one unittest + # (issue895-local-configuration) needs to generate a config + # file under ../etc relative to the dub location. + cp ${dubBuild}/bin/dub bin/ + export DUB=$NIX_BUILD_TOP/source/bin/dub export DC=${dmd.out}/bin/dmd export HOME=$TMP ./test/run-unittest.sh - ''; + ''; + + installPhase = '' + echo -n $inputString > $out + ''; + }; + +in + +stdenv.mkDerivation rec { + inherit dubUnittests; + name = "dub-${dubBuild.version}"; + phases = "installPhase"; + buildInputs = dubBuild.buildInputs; installPhase = '' mkdir $out - mkdir $out/bin - cp bin/dub $out/bin + cp -r --symbolic-link ${dubBuild}/* $out/ ''; - meta = with stdenv.lib; { - description = "Package and build manager for D applications and libraries"; - homepage = http://code.dlang.org/; - license = licenses.mit; - maintainers = with maintainers; [ ThomasMader ]; - platforms = platforms.unix; - }; + meta = dubBuild.meta; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index 87897017f86aaa98fd8b6c04a4a0c5ae1c665abd..94fa7e7201a3508fa2ced13404f9b518ed7f2498 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation { ./construct-command-line.patch ./long-command-line.patch ./darwin-library_search-dylib.patch + + # Fix support for glibc 2.27's glob + ../4.2/glibc-2.27-glob.patch ]; patchFlags = "-p0"; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 7914d8ebb4f8559e6a29867fd17c3c1372a039e0..95466d843d693fb3e1343fddfe486cb3d4403970 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -20,9 +20,11 @@ stdenv.mkDerivation { # included Makefiles, don't look in /usr/include and friends. ./impure-dirs.patch ./pselect.patch + # Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html + ./glibc-2.27-glob.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; buildInputs = stdenv.lib.optionals guileSupport [ guile ]; configureFlags = stdenv.lib.optional guileSupport "--with-guile"; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch new file mode 100644 index 0000000000000000000000000000000000000000..186212d0d29899da3b1633a7df22ff643968b25e --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch @@ -0,0 +1,32 @@ +diff -Naur glob/glob.c glob/glob.c +--- glob/glob.c 2013-10-20 13:14:38.000000000 -0400 ++++ glob/glob.c 2018-03-16 14:32:38.483496170 -0400 +@@ -208,28 +208,9 @@ + #endif /* __GNU_LIBRARY__ || __DJGPP__ */ + + +-#if !defined __alloca && !defined __GNU_LIBRARY__ +- +-# ifdef __GNUC__ +-# undef alloca +-# define alloca(n) __builtin_alloca (n) +-# else /* Not GCC. */ +-# ifdef HAVE_ALLOCA_H + # include +-# else /* Not HAVE_ALLOCA_H. */ +-# ifndef _AIX +-# ifdef WINDOWS32 +-# include +-# else +-extern char *alloca (); +-# endif /* WINDOWS32 */ +-# endif /* Not _AIX. */ +-# endif /* sparc or HAVE_ALLOCA_H. */ +-# endif /* GCC. */ +- + # define __alloca alloca + +-#endif + + #ifndef __GNU_LIBRARY__ + # define __stat stat diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index bbfcc8513078c78471a132c4e390d5c76ccb431a..fbbddbd0fcbcb8bd1d439d6a5ed2b3f20b4acfbd 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.3"; + name = "gradle-4.7"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0k358y18pp2809kn5il4kv3qvlqrbwmy276bbm3mnmwjxx7g9jwd"; + sha256 = "016vvjvk3gfasv3h6dxxp48kp9v4ariqj280bijn835mr1yhi9gw"; }; }; diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 79e391a858955a26771e01a5d5339c458dce8c33..8d1ad4490e98861ff6cbbcfa701cd0e6671c5c59 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, lib, python, which }: let - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { - sha256 = "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr"; + sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; rev = "version-${version}"; repo = "gup"; owner = "timbertson"; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 11caff8ddab55e5d6527e33ad3bf1876daf4b581..2f4daa2edc86a9dbef967a0fa8c441d1c20ac8e6 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, gcc }: +{ stdenv, fetchFromGitHub, makeWrapper, gcc, ncurses }: stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.02.03"; + version = "9.02.07"; src = fetchFromGitHub { - sha256 = "1g3pdcd2i8n29rqwrdg6bd7qnsii55hi0rnma86hy0pm5cshpwi5"; + sha256 = "1q3rwri5s1sqm4h75bahkjnlym4bk2ygg4fb75yrniwnj8rhdp12"; rev = version; repo = "icmake"; owner = "fbb-git"; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */icmake) ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ gcc ]; preConfigure = '' @@ -30,13 +31,16 @@ stdenv.mkDerivation rec { installPhase = '' ./icm_install all / + + wrapProgram $out/bin/icmbuild \ + --prefix PATH : ${ncurses}/bin ''; meta = with stdenv.lib; { description = "A program maintenance (make) utility using a C-like grammar"; homepage = https://fbb-git.github.io/icmake/; license = licenses.gpl3; - maintainers = with maintainers; [ nckx pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 05bf8e76db73a7548612b98a8d2a2e6e3760223a..30531c980b0bd66b05b615dd2420fe0e27ae0431 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.7.1"; + version = "2.8.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0rmshl4xchf3blwvar4q9dpxm9xznn3yzas4vwxqiq3yhapgqkn0"; + sha256 = "0wk4m7m66xxx7i3nis08mc8qna7acgcmpim562vdyyrpbxdhj24i"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; - sha256 = "0ivwb1qlxs1hyical0fjgavm9wfkw3f10sk67p5g2p5lpf4pxp1d"; + sha256 = "0n3wkb0a9g25r1xq93lskay2lw210qymz2qakjnl5vr5zz3vnjgw"; }; JARNAME = "${name}-standalone.jar"; diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch new file mode 100644 index 0000000000000000000000000000000000000000..bef89c881b5a049b99966e996436ed21714500a7 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch @@ -0,0 +1,25 @@ +--- a/mesonbuild/coredata.py ++++ b/mesonbuild/coredata.py +@@ -282,18 +282,13 @@ + ''' + if option.endswith('dir') and os.path.isabs(value) and \ + option not in builtin_dir_noprefix_options: +- # Value must be a subdir of the prefix + # commonpath will always return a path in the native format, so we + # must use pathlib.PurePath to do the same conversion before + # comparing. +- if os.path.commonpath([value, prefix]) != str(PurePath(prefix)): +- m = 'The value of the {!r} option is {!r} which must be a ' \ +- 'subdir of the prefix {!r}.\nNote that if you pass a ' \ +- 'relative path, it is assumed to be a subdir of prefix.' +- raise MesonException(m.format(option, value, prefix)) +- # Convert path to be relative to prefix +- skip = len(prefix) + 1 +- value = value[skip:] ++ if os.path.commonpath([value, prefix]) == str(PurePath(prefix)): ++ # Convert path to be relative to prefix ++ skip = len(prefix) + 1 ++ value = value[skip:] + return value + + def init_builtins(self, options): diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 8e4c5d4801a403d73977dc5e432af0d04499000c..298c669e690b410b11138576127495f1341e6fe3 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,14 @@ -{ lib, python3Packages }: -python3Packages.buildPythonApplication rec { - version = "0.43.0"; +{ lib, python3Packages, stdenv, ninja, pkgconfig, targetPlatform, writeTextDir, substituteAll }: let + targetPrefix = lib.optionalString stdenv.isCross + (targetPlatform.config + "-"); +in python3Packages.buildPythonApplication rec { + version = "0.45.1"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0qn5hyzvam3rimn7g3671s1igj7fbkwdnf5nc8jr4d5swy25mq61"; + sha256 = "154kxx49dbw7p30qfg1carb3mgqxx9hyy1r0yzfsg07hz1n2sq14"; }; postFixup = '' @@ -18,12 +20,62 @@ python3Packages.buildPythonApplication rec { popd ''; - postPatch = '' - sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py - ''; + patches = [ + # Upstream insists on not allowing bindir and other dir options + # outside of prefix for some reason: + # https://github.com/mesonbuild/meson/issues/2561 + # We remove the check so multiple outputs can work sanely. + ./allow-dirs-outside-of-prefix.patch + + # Unlike libtool, vanilla Meson does not pass any information + # about the path library will be installed to to g-ir-scanner, + # breaking the GIR when path other than ${!outputLib}/lib is used. + # We patch Meson to add a --fallback-library-path argument with + # library install_dir to g-ir-scanner. + ./gir-fallback-path.patch + + # In common distributions, RPATH is only needed for internal libraries so + # meson removes everything else. With Nix, the locations of libraries + # are not as predictable, therefore we need to keep them in the RPATH. + # At the moment we are keeping the paths starting with /nix/store. + # https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634 + (substituteAll { + src = ./fix-rpath.patch; + inherit (builtins) storeDir; + }) + + # No one will ever need more than 128 bytes of data structure + # https://github.com/mesonbuild/meson/issues/3113 + ./overly-strict-size-check.patch + ]; setupHook = ./setup-hook.sh; + crossFile = writeTextDir "cross-file.conf" '' + [binaries] + c = '${targetPrefix}cc' + cpp = '${targetPrefix}c++' + ar = '${targetPrefix}ar' + strip = '${targetPrefix}strip' + pkgconfig = 'pkg-config' + + [properties] + needs_exe_wrapper = true + + [host_machine] + system = '${targetPlatform.parsed.kernel.name}' + cpu_family = '${targetPlatform.parsed.cpu.family}' + cpu = '${targetPlatform.parsed.cpu.name}' + endian = ${if targetPlatform.isLittleEndian then "'little'" else "'big'"} + ''; + + # 0.45 update enabled tests but they are failing + doCheck = false; + # checkInputs = [ ninja pkgconfig ]; + # checkPhase = "python ./run_project_tests.py"; + + inherit (stdenv) cc isCross; + 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/meson/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/fix-rpath.patch new file mode 100644 index 0000000000000000000000000000000000000000..e52428a7db264e7e3a24b7ad2421f34eb6c803ab --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/fix-rpath.patch @@ -0,0 +1,32 @@ +--- a/mesonbuild/compilers/compilers.py ++++ b/mesonbuild/compilers/compilers.py +@@ -846,8 +848,10 @@ + if paths != '': + paths += ':' + paths += build_rpath +- if len(paths) < len(install_rpath): +- padding = 'X' * (len(install_rpath) - len(paths)) ++ store_paths = ':'.join(filter(lambda path: path.startswith('@storeDir@'), paths.split(':'))) ++ extra_space_needed = len(install_rpath + (':' if install_rpath and store_paths else '') + store_paths) - len(paths) ++ if extra_space_needed > 0: ++ padding = 'X' * extra_space_needed + if not paths: + paths = padding + else: +--- a/mesonbuild/scripts/depfixer.py ++++ b/mesonbuild/scripts/depfixer.py +@@ -300,6 +300,14 @@ + return + self.bf.seek(rp_off) + old_rpath = self.read_str() ++ ++ if new_rpath: ++ new_rpath += b':' ++ else: ++ new_rpath = b'' ++ ++ new_rpath += b':'.join(filter(lambda path: path.startswith(b'@storeDir@'), old_rpath.split(b':'))) ++ + if len(old_rpath) < len(new_rpath): + sys.exit("New rpath must not be longer than the old one.") + # The linker does read-only string deduplication. If there is a diff --git a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..d8d14f188a2f8f59e2395cfbe73785e8b460d758 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch @@ -0,0 +1,13 @@ +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -427,6 +427,10 @@ + scan_command += ['--no-libtool', '--namespace=' + ns, '--nsversion=' + nsversion, '--warn-all', + '--output', '@OUTPUT@'] + ++ fallback_libpath = girtarget.get_custom_install_dir()[0] ++ if fallback_libpath is not None and isinstance(fallback_libpath, str) and len(fallback_libpath) > 0 and fallback_libpath[0] == "/": ++ scan_command += ['--fallback-library-path=' + fallback_libpath] ++ + header = kwargs.pop('header', None) + if header: + if not isinstance(header, str): diff --git a/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch b/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch new file mode 100644 index 0000000000000000000000000000000000000000..ea0e9bcd7eac2a3a3d189680bac8074a68b5ab50 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch @@ -0,0 +1,12 @@ +diff -Naur a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py +--- a/mesonbuild/compilers/c.py 2017-12-10 08:37:19.000000000 -0500 ++++ b/mesonbuild/compilers/c.py 2018-03-24 07:46:04.739929307 -0400 +@@ -406,7 +406,7 @@ + }}''' + if not self.compiles(t.format(**fargs), env, extra_args, dependencies): + return -1 +- return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies) ++ return self.cross_compute_int('sizeof(%s)' % typename, 1, 1024, None, prefix, env, extra_args, dependencies) + + def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): + if extra_args is None: diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index dacad017ede0de132fb3491f7798fa0fd59004af..36a7fe23ef5bcf6999ac8d27ff5bab9a7fd0e6f2 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -6,13 +6,31 @@ mesonConfigurePhase() { fi # Build release by default. - mesonFlags="--buildtype=${mesonBuildType:-release} $mesonFlags" + if [ -n "@isCross@" ]; then + crossMesonFlags="--cross-file=@crossFile@/cross-file.conf" + fi + + # See multiple-outputs.sh and meson’s coredata.py + mesonFlags="\ + --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ + --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ + --includedir=${!outputInclude}/include \ + --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ + --localedir=${!outputLib}/share/locale \ + $mesonFlags" + + mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags" echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" - meson build $mesonFlags "${mesonFlagsArray[@]}" + CC=@cc@/bin/cc CXX=@cc@/bin/c++ meson build $mesonFlags "${mesonFlagsArray[@]}" cd build + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "meson: enabled parallel building" + fi + runHook postConfigure } @@ -20,3 +38,15 @@ if [ -z "$dontUseMesonConfigure" -a -z "$configurePhase" ]; then setOutputFlags= configurePhase=mesonConfigurePhase fi + +mesonCheckPhase() { + runHook preCheck + + meson test --print-errorlogs + + runHook postCheck +} + +if [ -z "$dontUseMesonCheck" -a -z "$checkPhase" ]; then + checkPhase=mesonCheckPhase +fi diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index fff6af396b9fba176de9b711958aa56802c7a18a..c59d2faaf26c7a7263b9949ae06a94d115ce4957 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -1,29 +1,28 @@ -{ stdenv, fetchurl, python, asciidoc, re2c }: +{ stdenv, fetchFromGitHub, python, asciidoc, re2c }: stdenv.mkDerivation rec { name = "ninja-${version}"; - version = "1.7.2"; + version = "1.8.2"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/ninja-build/ninja/archive/v${version}.tar.gz"; - sha256 = "1n8n3g26ppwh7zwrc37n3alkbpbj0wki34ih53s3rkhs8ajs1p9f"; + src = fetchFromGitHub { + owner = "ninja-build"; + repo = "ninja"; + rev = "v${version}"; + sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f"; }; - buildInputs = [ python asciidoc re2c ]; + nativeBuildInputs = [ python asciidoc re2c ]; buildPhase = '' - python bootstrap.py + python configure.py --bootstrap asciidoc doc/manual.asciidoc ''; installPhase = '' - mkdir -p $out/bin - cp ninja $out/bin/ - - mkdir -p $out/share/doc/ninja - cp doc/manual.asciidoc $out/share/doc/ninja/ - cp doc/manual.html $out/share/doc/ninja/ + install -Dm555 -t $out/bin ninja + install -Dm444 -t $out/share/doc/ninja doc/manual.asciidoc doc/manual.html + install -Dm444 misc/bash-completion $out/share/bash-completion/completions/ninja + install -Dm444 misc/zsh-completion $out/share/zsh/site-functions/_ninja ''; setupHook = ./setup-hook.sh; @@ -36,9 +35,9 @@ stdenv.mkDerivation rec { input files generated by a higher-level build system, and it is designed to run builds as fast as possible. ''; - homepage = http://martine.github.io/ninja/; + homepage = https://ninja-build.org/; license = licenses.asl20; platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice maintainers.bjornfor ]; + maintainers = with maintainers; [ thoughtpolice bjornfor orivej ]; }; } diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh index 9ea6549a82433153659c783acb7db947967c6514..d9ad74609316410858d343b472c2494578b19993 100644 --- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh +++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh @@ -4,9 +4,16 @@ ninjaBuildPhase() { if [[ -z "$ninjaFlags" && ! ( -e build.ninja ) ]]; then echo "no build.ninja, doing nothing" else + local buildCores=1 + + # Parallel building is enabled by default. + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + # shellcheck disable=SC2086 local flagsArray=( \ - ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ + -j"$buildCores" -l"$NIX_BUILD_CORES" \ $ninjaFlags "${ninjaFlagsArray[@]}" \ $buildFlags "${buildFlagsArray[@]}") diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 8ce495557e7fe3c8de1d62b6dc1b33bf7495f559..54e6d38f716a64e70df632b13826bf1982488aa3 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; with pythonPackages; let - version = "1.3.0"; + version = "1.5.0"; in buildPythonApplication rec { inherit version; pname = "pantsbuild.pants"; @@ -12,7 +12,7 @@ in buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "18fcf9047l9k006wz21g525p1w5avyjabmabh0giyz22xnm8g5gp"; + sha256 = "7c0a1206594c615fce0a7f6daa4ea1028645bc20afa5599c2cf0ad7c06223fa7"; }; prePatch = '' @@ -24,15 +24,15 @@ in buildPythonApplication rec { 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 + twitter-common-collections setproctitle ansicolors packaging pathspec + scandir twitter-common-dirutil psutil requests pystache pex docutils + markdown pygments twitter-common-confluence fasteners pywatchman + futures cffi subprocess32 contextlib2 faulthandler pyopenssl ]; meta = { description = "A build system for software projects in a variety of languages"; - homepage = "http://www.pantsbuild.org/"; + homepage = "https://www.pantsbuild.org/"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index f81ff3b91d4f56f1929ab73a67dd6619c103feff..3036ef235845d3227367b9374116b029bbba6619 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { - version = "1.2.6"; + version = "2.0.3"; name = "redo-sh-${version}"; src = fetchurl { url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; - sha256 = "1cwrk4v22rb9410rzyb4py4ncg01n6850l80s74bk3sflbw974wp"; + sha256 = "1ycx3hik7vnlbwxacn1dzr48fwsn2ials0sg6k9l3gcyrha5wf1n"; }; buildInputs = [ makeWrapper ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mv man "$out/share" mv bin "$out" for p in $out/bin/*; do - wrapProgram "$p" --set PATH '$PATH:'"$out/bin" + wrapProgram "$p" --suffix PATH : "$out/bin" done ''; diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 7a199cc925a7f085743ba7c1109569527d7bf181..926cc83cd97676c23c2516528458837adf782ab1 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = http://bashdb.sourceforge.net/remake/; license = stdenv.lib.licenses.gpl3; description = "GNU Make with comprehensible tracing and a debugger"; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index fbbca9a0cfe45947b936cd0def141c2b20bcfbeb..d501a7953841a44018d1fc221038a6ea42882e85 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, which, curl, makeWrapper }: +{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let - rev = "77686b3dfa20a34270cc52377c8e37c3a461e484"; + rev = "3c8fcadc3376edfd8e4b08b35f174935bf97bbac"; version = stdenv.lib.strings.substring 0 7 rev; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1bhqigm0clv3i1gvn4gsllywcnwfsa73xvqp8m7pbvn8g7i2ws6x"; + sha256 = "0r79w4kgdrsdnm4ma9rmb9k115rvidpaha7sr9rsxv68jpagwgrj"; }; dontBuild = true; @@ -21,9 +21,12 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin + + substituteInPlace bin/sbt --replace 'declare java_cmd="java"' 'declare java_cmd="${jdk}/bin/java"' + install bin/sbt $out/bin - wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl]} + wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl ]} ''; meta = { diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 4dacfd0568ac53ef4dfe8c6847c1c5e2be756996..04102e7e8f867229d6b827496f69a794fcc69b40 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, jre, bc }: +{ stdenv, fetchurl, jre }: stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.0.3"; + version = "1.1.4"; src = fetchurl { urls = [ @@ -10,14 +10,11 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "041cv25gxqsi3rlglw5d8aqgdzb6y5ak3f52dwqvzrrj854vyx13"; + sha256 = "0hc361gb71psadx9gj78j0j60fw4sljjk8sl45hw6yzx3hmmkg9g"; }; patchPhase = '' echo -java-home ${jre.home} >>conf/sbtopts - - substituteInPlace bin/sbt-launch-lib.bash \ - --replace "| bc)" "| ${bc}/bin/bc)" ''; installPhase = '' @@ -30,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://www.scala-sbt.org/; license = licenses.bsd3; description = "A build tool for Scala, Java and more"; - maintainers = with maintainers; [ rickynils ]; + maintainers = with maintainers; [ nequissimus rickynils ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index b7d75999fdf679768679c6f9730d382f56dcdad1..36d9ddfb8ea12318f957d7d258e320d987374d72 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shards-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz"; - sha256 = "31de819c66518479682ec781a39ef42c157a1a8e6e865544194534e2567cb110"; + sha256 = "1qiv9zzpccf6i5r2qrzbl84wgvqapbs0csazayhcpzfjfhg6i8wp"; }; buildInputs = [ crystal libyaml which ]; diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 61184cb6ba1ae9d0c3886bf3ef618ee840e65012..000943f117f63db59fe3e22d0ceedcb43e92c6ca 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "waf-${version}"; - version = "1.9.0"; + version = "2.0.6"; src = fetchurl { url = "https://waf.io/waf-${version}.tar.bz2"; - sha256 = "1sjpqzm2fzm8pxi3fwfinpsbw4z9040qkrzbg3lxik7ppsbjhn58"; + sha256 = "1wyl0jl10i0p2rj49sig5riyppgkqlkqmbvv35d5bqxri3y4r38q"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c778b67a95f5c875a4220c7a14bf5056b3bf6301 --- /dev/null +++ b/pkgs/development/tools/buildah/default.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand +, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux +, go-md2man }: + +let + version = "0.12"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "projectatomic"; + repo = "buildah"; + sha256 = "0xyq7rv0lj6bxwh2rnf44w9gjcqbdkfcdff88023b9vlsc8h4k0m"; + }; + goPackagePath = "github.com/projectatomic/buildah"; + +in buildGoPackage rec { + name = "buildah-${version}"; + inherit src; + + outputs = [ "bin" "man" "out" ]; + + inherit goPackagePath; + excludedPackages = [ "tests" ]; + + nativeBuildInputs = [ pkgconfig go-md2man.bin ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; + + # Copied from the skopeo package, doesn’t seem to make a difference? + # If something related to these libs failed, uncomment these lines. + /*preBuild = with lib; '' + 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" + '';*/ + + postBuild = '' + # depends on buildGoPackage not changing … + pushd ./go/src/${goPackagePath}/docs + make docs + make install PREFIX="$man" + popd + ''; + + meta = { + description = "A tool which facilitates building OCI images"; + homepage = https://github.com/projectatomic/buildah; + maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f8389786b9da308921abec8caf148853effc964c --- /dev/null +++ b/pkgs/development/tools/castxml/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub +, pythonPackages +, pkgconfig +, cmake +, llvmPackages +, withMan ? true +}: +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + pname = "CastXML"; + version = "20180403"; + + src = fetchFromGitHub { + owner = "CastXML"; + repo = "CastXML"; + rev = "c2a44d06d9379718292b696f4e13a2725ff9d95e"; + sha256 = "1hjh8ihjyp1m2jb5yypp5c45bpbz8k004f4p1cjw4gc7pxhjacdj"; + }; + + buildInputs = [ + cmake + llvmPackages.clang-unwrapped + llvmPackages.llvm + ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + + propagatedbuildInputs = [ llvmPackages.libclang ]; + + preConfigure = '' + cmakeFlagsArray+=( + ${if withMan then "-DSPHINX_MAN=ON" else ""} + )''; + + # 97% tests passed, 96 tests failed out of 2866 + # mostly because it checks command line and nix append -isystem and all + doCheck=false; + checkPhase = '' + # -E exclude 4 tests based on names + # see https://github.com/CastXML/CastXML/issues/90 + ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd' + ''; + + meta = with stdenv.lib; { + homepage = http://www.kitware.com; + license = licenses.asl20; + description = "Abstract syntax tree XML output tool"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cbor-diag/Gemfile b/pkgs/development/tools/cbor-diag/Gemfile new file mode 100644 index 0000000000000000000000000000000000000000..798e507460eb698bb97f50b5cde455bd06dd9125 --- /dev/null +++ b/pkgs/development/tools/cbor-diag/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cbor-diag' diff --git a/pkgs/development/tools/cbor-diag/Gemfile.lock b/pkgs/development/tools/cbor-diag/Gemfile.lock new file mode 100644 index 0000000000000000000000000000000000000000..0d129765aa4ad9c3252b7d13e0b7bc35fe8a0cfc --- /dev/null +++ b/pkgs/development/tools/cbor-diag/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + cbor-diag (0.5.2) + json + treetop (~> 1) + json (2.1.0) + polyglot (0.3.5) + treetop (1.6.10) + polyglot (~> 0.3) + +PLATFORMS + ruby + +DEPENDENCIES + cbor-diag + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/tools/cbor-diag/default.nix b/pkgs/development/tools/cbor-diag/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..049d9f38c0c14c120d1e61036d72a4f252e419a6 --- /dev/null +++ b/pkgs/development/tools/cbor-diag/default.nix @@ -0,0 +1,30 @@ +{ lib, bundlerApp, ruby }: + +bundlerApp { + pname = "cbor-diag"; + + inherit ruby; + gemdir = ./.; + + exes = [ + "cbor2diag.rb" + "cbor2json.rb" + "cbor2pretty.rb" + "cbor2yaml.rb" + "diag2cbor.rb" + "diag2pretty.rb" + "json2cbor.rb" + "json2pretty.rb" + "pretty2cbor.rb" + "pretty2diag.rb" + "yaml2cbor.rb" + ]; + + meta = with lib; { + description = "CBOR diagnostic utilities"; + homepage = https://github.com/cabo/cbor-diag; + license = with licenses; asl20; + maintainers = with maintainers; [ fdns ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cbor-diag/gemset.nix b/pkgs/development/tools/cbor-diag/gemset.nix new file mode 100644 index 0000000000000000000000000000000000000000..2de0e9a647a704ec4c3221bc21cde4f34ff954bf --- /dev/null +++ b/pkgs/development/tools/cbor-diag/gemset.nix @@ -0,0 +1,36 @@ +{ + cbor-diag = { + dependencies = ["json" "treetop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1"; + type = "gem"; + }; + version = "0.5.2"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + treetop = { + dependencies = ["polyglot"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; + type = "gem"; + }; + version = "1.6.10"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/cddl/Gemfile b/pkgs/development/tools/cddl/Gemfile new file mode 100644 index 0000000000000000000000000000000000000000..2ba729084f1a7b8826631f14144806c97c6b8cd4 --- /dev/null +++ b/pkgs/development/tools/cddl/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cddl' diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/development/tools/cddl/Gemfile.lock new file mode 100644 index 0000000000000000000000000000000000000000..65701dd45bf8f453a43ad21fb3d25a8542c833fe --- /dev/null +++ b/pkgs/development/tools/cddl/Gemfile.lock @@ -0,0 +1,28 @@ +GEM + remote: https://rubygems.org/ + specs: + abnc (0.1.0) + cbor-diag (0.5.2) + json + treetop (~> 1) + cddl (0.8.5) + abnc + cbor-diag + colorize + json + regexp-examples + colorize (0.8.1) + json (2.1.0) + polyglot (0.3.5) + regexp-examples (1.4.2) + treetop (1.6.10) + polyglot (~> 0.3) + +PLATFORMS + ruby + +DEPENDENCIES + cddl + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/development/tools/cddl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..37ad593d79642525c1efb976de85dfd12e397bfe --- /dev/null +++ b/pkgs/development/tools/cddl/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, ruby }: + +bundlerApp { + pname = "cddl"; + + inherit ruby; + gemdir = ./.; + exes = [ "cddl" ]; + + meta = with lib; { + description = "A parser, generator, and validator for CDDL"; + homepage = https://rubygems.org/gems/cddl; + license = with licenses; mit; + maintainers = with maintainers; [ fdns ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/development/tools/cddl/gemset.nix new file mode 100644 index 0000000000000000000000000000000000000000..92aa419950515c03d2f3cd57c05c69b07c9c488c --- /dev/null +++ b/pkgs/development/tools/cddl/gemset.nix @@ -0,0 +1,69 @@ +{ + abnc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13nvzrk72nj130fs8bq8q3cfm48939rdzh7l31ncj5c4969hrbig"; + type = "gem"; + }; + version = "0.1.0"; + }; + cbor-diag = { + dependencies = ["json" "treetop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1"; + type = "gem"; + }; + version = "0.5.2"; + }; + cddl = { + dependencies = ["abnc" "cbor-diag" "colorize" "json" "regexp-examples"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pg91wrby0qgrdnf089ddy5yy2jalxd3bb9dljj16cpwv4gjx047"; + type = "gem"; + }; + version = "0.8.5"; + }; + colorize = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; + type = "gem"; + }; + version = "0.8.1"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + regexp-examples = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "104f0j0h2x5ijly7kyaj7zz0md65r2c03cpbi5cngm0hs2sr1qkz"; + type = "gem"; + }; + version = "1.4.2"; + }; + treetop = { + dependencies = ["polyglot"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; + type = "gem"; + }; + version = "1.6.10"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/chefdk/Gemfile b/pkgs/development/tools/chefdk/Gemfile index 7d974e4989105757e771b86a512e224397c5c880..4d9640c8e9f9290b90e80c9a442a9fbcd65a01f4 100644 --- a/pkgs/development/tools/chefdk/Gemfile +++ b/pkgs/development/tools/chefdk/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'chef-dk' +gem 'chef-dk', '2.4.17' gem 'pry' gem 'test-kitchen' gem 'inspec' diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index c397758aaac141919641c32a352afca35949af9e..139649b78f1418f7589c1499588a452e772a22b9 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -1,33 +1,27 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) app_conf (0.4.2) - 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, < 4.0) + backports (3.10.3) + berkshelf (6.3.1) buff-config (~> 2.0) buff-extensions (~> 2.0) - buff-shell_out (~> 1.0) + chef (>= 12.7.2) cleanroom (~> 1.0) + concurrent-ruby (~> 1.0) faraday (~> 0.9) httpclient (~> 2.7) minitar (~> 0.5, >= 0.5.4) mixlib-archive (~> 0.4) + mixlib-shellout (~> 2.0) octokit (~> 4.0) retryable (~> 2.0) ridley (~> 5.0) - solve (> 2.0, < 4.0) + solve (~> 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) @@ -42,16 +36,17 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef (12.19.36) + chef (13.6.4) addressable bundler (>= 1.10) - chef-config (= 12.19.36) - chef-zero (>= 4.8) + chef-config (= 13.6.4) + chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) + iso8601 (~> 0.9.1) mixlib-archive (~> 0.4) mixlib-authentication (~> 1.4) mixlib-cli (~> 1.7) @@ -60,7 +55,7 @@ GEM 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) + ohai (~> 13.0) plist (~> 3.2) proxifier (~> 1.0) rspec-core (~> 3.5) @@ -71,14 +66,14 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef-config (12.19.36) + chef-config (13.6.4) addressable fuzzyurl mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-dk (1.3.40) + chef-dk (2.4.17) addressable (>= 2.3.5, < 2.6) - chef (~> 12.5) + chef (~> 13.0) chef-provisioning (~> 2.0) cookbook-omnifetch (~> 0.5) diff-lcs (~> 1.0) @@ -87,147 +82,153 @@ GEM mixlib-cli (~> 1.7) mixlib-shellout (~> 2.0) paint (~> 1.0) - solve (> 2.0, < 4.0) - chef-provisioning (2.2.1) - cheffish (>= 4.0, < 6.0) + solve (> 2.0, < 5.0) + chef-provisioning (2.6.0) + cheffish (>= 4.0, < 14.0) inifile (>= 2.0.2) - mixlib-install (>= 1.0, < 3.0) + mixlib-install (>= 1.0) net-scp (~> 1.0) net-ssh (>= 2.9, < 5.0) - net-ssh-gateway (~> 1.2) + net-ssh-gateway (> 1.2, < 3.0) winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.0) - chef-vault (2.9.1) - chef-zero (5.3.2) + chef-vault (3.3.0) + chef-zero (13.1.0) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) rack (~> 2.0) uuidtools (~> 2.1) - cheffish (5.0.1) - chef-zero (~> 5.0) + cheffish (13.1.0) + chef-zero (~> 13.0) net-ssh - chefspec (6.2.0) - chef (>= 12.0) - fauxhai (>= 3.6, < 5) + chefspec (7.1.1) + chef (>= 12.14.89) + fauxhai (>= 4, < 6) rspec (~> 3.0) cleanroom (1.0.0) - coderay (1.1.1) - cookbook-omnifetch (0.5.1) + coderay (1.1.2) + concurrent-ruby (1.0.5) + cookbook-omnifetch (0.8.0) mixlib-archive (~> 0.4) - cucumber-core (2.0.0) - backports (~> 3.6) - gherkin (~> 4.0) + cucumber-core (3.1.0) + backports (>= 3.8.0) + cucumber-tag_expressions (~> 1.1.0) + gherkin (>= 5.0.0) + cucumber-tag_expressions (1.1.1) diff-lcs (1.3) diffy (3.2.0) - docker-api (1.33.3) - excon (>= 0.38.0) - json + docker-api (1.34.0) + excon (>= 0.47.0) + multi_json erubis (2.7.0) - excon (0.55.0) - faraday (0.9.2) + excon (0.59.0) + faraday (0.13.1) multipart-post (>= 1.2, < 3) - fauxhai (4.1.0) + fauxhai (5.5.0) net-ssh ffi (1.9.18) - ffi-yajl (2.3.0) + ffi-yajl (2.3.1) libyajl2 (~> 1.2) - foodcritic (10.2.2) + foodcritic (12.2.1) cucumber-core (>= 1.3) erubis + ffi-yajl (~> 2.0) nokogiri (>= 1.5, < 2.0) rake rufus-lru (~> 1.0) treetop (~> 1.4) - yajl-ruby (~> 1.1) fuzzyurl (0.9.0) - gherkin (4.1.1) + gherkin (5.0.0) git (1.3.0) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hashie (3.5.5) - highline (1.7.8) - hitimes (1.2.4) + hashie (3.5.6) + highline (1.7.10) + hitimes (1.2.6) + htmlentities (4.3.4) httpclient (2.8.3) inifile (3.0.0) - iniparse (1.4.2) - inspec (1.19.2) + iniparse (1.4.4) + inspec (1.47.0) addressable (~> 2.4) faraday (>= 0.9.0) hashie (~> 3.4) + htmlentities json (>= 1.8, < 3.0) method_source (~> 0.8) mixlib-log parallel (~> 1.9) + parslet (~> 1.5) pry (~> 0) rainbow (~> 2) rspec (~> 3) rspec-its (~> 1.2) rubyzip (~> 1.1) - sslshake (~> 1) + semverse + sslshake (~> 1.2) thor (~> 0.19) - toml (~> 0.1) - train (>= 0.22.0, < 1.0) + tomlrb (~> 1.2) + train (~> 0.30) ipaddress (0.8.3) - json (2.0.3) - kitchen-inspec (0.17.0) + iso8601 (0.9.1) + json (2.1.0) + kitchen-inspec (0.20.0) hashie (~> 3.4) inspec (>= 0.34.0, < 2.0.0) test-kitchen (~> 1.6) - kitchen-vagrant (1.1.0) + kitchen-vagrant (1.2.1) test-kitchen (~> 1.4) - knife-spork (1.6.3) + knife-spork (1.7.1) 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.2.0) + logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - method_source (0.8.2) - mini_portile2 (2.1.0) + method_source (0.9.0) + mini_portile2 (2.3.0) minitar (0.5.4) mixlib-archive (0.4.1) mixlib-log - mixlib-authentication (1.4.1) - mixlib-log + mixlib-authentication (1.4.2) mixlib-cli (1.7.0) mixlib-config (2.2.4) - mixlib-install (2.1.12) - artifactory + mixlib-install (3.8.0) 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) + mixlib-shellout (2.3.2) + mixlib-versioning (1.2.2) + molinillo (0.6.4) + multi_json (1.12.2) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (4.1.0) + net-ssh (4.2.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 (2.0.0) - nokogiri (1.7.1) - mini_portile2 (~> 2.1.0) + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) nori (2.6.0) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (8.23.0) - chef-config (>= 12.5.0.alpha.1, < 13) + ohai (13.7.0) + chef-config (>= 12.5.0.alpha.1, < 14) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress @@ -239,25 +240,24 @@ GEM systemu (~> 2.6.4) wmi-lite (~> 1.0) paint (1.0.1) - parallel (1.11.1) - parser (2.4.0.0) - ast (~> 2.2) - parslet (1.5.0) - blankslate (~> 2.0) - plist (3.2.0) + parallel (1.12.0) + parser (2.4.0.2) + ast (~> 2.3) + parslet (1.8.1) + plist (3.3.0) polyglot (0.3.5) powerpack (0.1.1) proxifier (1.0.3) - pry (0.10.4) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - public_suffix (2.0.5) - rack (2.0.1) - rainbow (2.2.1) - rake (12.0.0) + method_source (~> 0.9.0) + public_suffix (3.0.1) + rack (2.0.3) + rainbow (2.2.2) + rake + rake (12.3.0) retryable (2.0.4) - ridley (5.1.0) + ridley (5.1.1) addressable buff-config (~> 2.0) buff-extensions (~> 2.0) @@ -267,7 +267,7 @@ GEM celluloid-io (~> 0.16.1) chef-config (>= 12.5.0) erubis - faraday (~> 0.9.0) + faraday (~> 0.9) hashie (>= 2.0.2, < 4.0.0) httpclient (~> 2.7) json (>= 1.7.7) @@ -275,33 +275,34 @@ GEM retryable (~> 2.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) + rspec (3.7.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-core (3.7.0) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.7.0) rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.5.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-support (~> 3.7.0) + rspec-support (3.7.0) rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.48.1) + rubocop (0.51.0) + parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) - rubyntlm (0.6.1) + ruby-progressbar (1.9.0) + rubyntlm (0.6.2) rubyzip (1.2.1) rufus-lru (1.1.0) safe_yaml (1.0.4) @@ -309,38 +310,39 @@ GEM addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) semverse (2.0.0) - serverspec (2.38.0) + serverspec (2.41.3) multi_json rspec (~> 3.0) rspec-its - specinfra (~> 2.53) + specinfra (~> 2.72) sfl (2.3) - slop (3.6.0) - solve (3.1.0) - molinillo (>= 0.5) + solve (4.0.0) + molinillo (~> 0.6) semverse (>= 1.1, < 3.0) - specinfra (2.67.7) + specinfra (2.72.1) net-scp net-ssh (>= 2.7, < 5.0) net-telnet sfl - sslshake (1.1.0) + sslshake (1.2.0) syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (1.16.0) - mixlib-install (>= 1.2, < 3.0) + test-kitchen (1.19.2) + mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) net-ssh (>= 2.9, < 5.0) net-ssh-gateway (~> 1.2) safe_yaml (~> 1.0) thor (~> 0.19, < 0.19.2) + winrm (~> 2.0) + winrm-elevated (~> 1.0) + winrm-fs (~> 1.1.0) thor (0.19.1) timers (4.0.4) hitimes - toml (0.1.2) - parslet (~> 1.5.0) - train (0.23.0) + tomlrb (1.2.6) + train (0.31.1) docker-api (~> 1.26) json (>= 1.8, < 3.0) mixlib-shellout (~> 2.0) @@ -348,14 +350,14 @@ GEM net-ssh (>= 2.9, < 5.0) winrm (~> 2.0) winrm-fs (~> 1.0) - treetop (1.6.8) + treetop (1.6.9) polyglot (~> 0.3) - unicode-display_width (1.1.3) + unicode-display_width (1.3.0) uuidtools (2.1.5) varia_model (0.6.0) buff-extensions (~> 2.0) hashie (>= 2.0.2, < 4.0.0) - winrm (2.2.1) + winrm (2.2.3) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) @@ -367,20 +369,19 @@ GEM winrm-elevated (1.1.0) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.0.1) + winrm-fs (1.1.1) erubis (~> 2.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) winrm (~> 2.0) wmi-lite (1.0.0) - yajl-ruby (1.3.0) PLATFORMS ruby DEPENDENCIES berkshelf - chef-dk + chef-dk (= 2.4.17) chef-provisioning chef-vault chefspec @@ -396,4 +397,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 1.14.4 + 1.14.6 diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index b453b0ca5044bfefc505023fbc45e0663bc45cdc..df06793eaec0b752335905bc2ba0d267e223cd6d 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,9 +1,11 @@ -{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }: +{ stdenv, lib, bundlerEnv, ruby_2_4, perl, autoconf }: bundlerEnv { - name = "chefdk-1.3.40"; + # Last updated via: + # nix-shell -p bundix -p gcc -p libxml2 -p zlib --run "bundix -mdl" + name = "chefdk-2.4.17"; - inherit ruby; + ruby = ruby_2_4; gemdir = ./.; buildInputs = [ perl autoconf ]; diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index 18e430a3dec71190fd6fc03b3befe41a0a47d1e8..d4e97deea8dca41010b204ab8ca6a4ab8978e29f 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -1,11 +1,12 @@ { addressable = { + dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.2"; }; app_conf = { source = { @@ -15,14 +16,6 @@ }; version = "0.4.2"; }; - artifactory = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zaxa5fxrfal6vi90w725n8cd57fxw1jf99h38vn8d4vimvan2cc"; - type = "gem"; - }; - version = "2.8.1"; - }; ast = { source = { remotes = ["https://rubygems.org"]; @@ -34,36 +27,22 @@ backports = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1qlaq999znlbjw9wb0kwbjvidrbcimnd4v59y682kvm5c09mfn0l"; + sha256 = "1agsk23kfr194s690jnrpijh9pf3hq4a9yy66j1wzzj2x19ss9y0"; type = "gem"; }; - version = "3.7.0"; + version = "3.10.3"; }; berkshelf = { + dependencies = ["buff-config" "buff-extensions" "chef" "cleanroom" "concurrent-ruby" "faraday" "httpclient" "minitar" "mixlib-archive" "mixlib-shellout" "octokit" "retryable" "ridley" "solve" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aajjag7l55gi7k67n27dr6pscbdlzjaj751r2zhaggrczhh6yyq"; - type = "gem"; - }; - version = "5.6.4"; - }; - berkshelf-api-client = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n9bmrqmyy8cqm9vakscf5s1k2chks43x7dr201zp4bv2i6g3ih2"; + sha256 = "03rwq5njxh3d3fcr3ap0wivqlavfcm1ywxj50m4arfndsdvvjih1"; type = "gem"; }; - version = "3.0.0"; - }; - blankslate = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx"; - type = "gem"; - }; - version = "2.1.2.4"; + version = "6.3.1"; }; buff-config = { + dependencies = ["buff-extensions" "varia_model"]; source = { remotes = ["https://rubygems.org"]; sha256 = "06zx175sww4grk1rwyn1g3b1j2y324jf1506wl4xx96iss8spa4r"; @@ -96,6 +75,7 @@ version = "1.0.0"; }; buff-shell_out = { + dependencies = ["buff-ruby_engine"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0zg1li17759whsi2yhb08wvbbqn5cy6i5v51384yjk2a29vs9lck"; @@ -112,6 +92,7 @@ version = "3.2.3"; }; celluloid = { + dependencies = ["timers"]; source = { remotes = ["https://rubygems.org"]; sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; @@ -120,6 +101,7 @@ version = "0.16.0"; }; celluloid-io = { + dependencies = ["celluloid" "nio4r"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1l1x0p6daa5vskywrvaxdlanwib3k5pps16axwyy4p8d49pn9rnx"; @@ -128,68 +110,75 @@ version = "0.16.2"; }; chef = { + dependencies = ["addressable" "chef-config" "chef-zero" "diff-lcs" "erubis" "ffi-yajl" "highline" "iniparse" "iso8601" "mixlib-archive" "mixlib-authentication" "mixlib-cli" "mixlib-log" "mixlib-shellout" "net-sftp" "net-ssh" "net-ssh-multi" "ohai" "plist" "proxifier" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec_junit_formatter" "serverspec" "specinfra" "syslog-logger" "uuidtools"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "057m3c7h3fz3682r7wxmm7dm3n90rv56lc7svrk1hmf4c3g4b99v"; + sha256 = "1whvkx1a3877vnpv6q84bp9sb4aq5p5hgv9frln90l61f5nrx1gb"; type = "gem"; }; - version = "12.19.36"; + version = "13.6.4"; }; chef-config = { + dependencies = ["addressable" "fuzzyurl" "mixlib-config" "mixlib-shellout"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j4m13zzhd4w7j09a2cnj9sinxd9669i5qanbb1cvj90my0raxa2"; + sha256 = "0r5bd2901bwcr8zffhvri1ypkqfmqinbg78aj0xnndg6lkbr9rd5"; type = "gem"; }; - version = "12.19.36"; + version = "13.6.4"; }; chef-dk = { + dependencies = ["addressable" "chef" "chef-provisioning" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wvdv3hmxnp7ydcwji1w4x0g48dy4qq1ik8zd6n43mqcfgkjq0cb"; + sha256 = "0zqbwkad61rn4wli6z8a7l7glfnnrhbg474vfshvr0k1sicy8z2d"; type = "gem"; }; - version = "1.3.40"; + version = "2.4.17"; }; chef-provisioning = { + dependencies = ["cheffish" "inifile" "mixlib-install" "net-scp" "net-ssh" "net-ssh-gateway" "winrm" "winrm-elevated" "winrm-fs"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z5334zp76fswj7ygs5gzf8vsc13ixvyxywpyd5sif75dqsays48"; + sha256 = "0mxax73kblcbsz5bzqc655igbjwqjpl5f7vz478afr6amh3lsxsw"; type = "gem"; }; - version = "2.2.1"; + version = "2.6.0"; }; chef-vault = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pqxmraiai9jrld53fyfsglaqcw14xwmy4f3rjfwbrsmparsxjc2"; + sha256 = "0ks248hqd3s9w0nq8pnpp6and3522b128f2avg63cx5gq6889hwh"; type = "gem"; }; - version = "2.9.1"; + version = "3.3.0"; }; chef-zero = { + dependencies = ["ffi-yajl" "hashie" "mixlib-log" "rack" "uuidtools"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qmpn8wq2wns8m28pcn8ljgwz0v2ksninzc4wn5nq66gvksmpjig"; + sha256 = "1nzmc0fzi73k692j09zipm3gqx1fkrw4r4r4g2b3i1zvasaxbi7x"; type = "gem"; }; - version = "5.3.2"; + version = "13.1.0"; }; cheffish = { + dependencies = ["chef-zero" "net-ssh"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19hn46s3qm2ncnfzggm0lcdrsagspdxg699k97a4hbl18k1n6lb1"; + sha256 = "0mpyf9bhnxil5mwy8cffcfl5l9alxhdnjzsmpzcdwihbz401qrn3"; type = "gem"; }; - version = "5.0.1"; + version = "13.1.0"; }; chefspec = { + dependencies = ["chef" "fauxhai" "rspec"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18xkzcxglrr3bfy5k0c1cjk5a3ka49xg3xirldb5yhv395svgg1r"; + sha256 = "0zpycdwp18k6nkgyx7l3ndhyaby1v4bfqh9by6ld2fbksnx29p6k"; type = "gem"; }; - version = "6.2.0"; + version = "7.1.1"; }; cleanroom = { source = { @@ -202,26 +191,44 @@ coderay = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r"; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + type = "gem"; + }; + version = "1.0.5"; }; cookbook-omnifetch = { + dependencies = ["mixlib-archive"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qkzlkszq9f74i71vz72skvmrw24zvdpzfl2029x6vyxrwn83hwf"; + sha256 = "0dm93zjr2a9pappkncnw4hlrn7dl9vwmrx5xly4128rnzbcgn41p"; type = "gem"; }; - version = "0.5.1"; + version = "0.8.0"; }; cucumber-core = { + dependencies = ["backports" "cucumber-tag_expressions" "gherkin"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "136hnvqv444qyxzcgy1k60y4i6cn3sn9lbqr4wan9dzz1yzllqbm"; + sha256 = "06lip8ds4lw3wyjwsjv1laimk5kz39vsmvv9if7hiq9v611kd3sn"; type = "gem"; }; - version = "2.0.0"; + version = "3.1.0"; + }; + cucumber-tag_expressions = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc"; + type = "gem"; + }; + version = "1.1.1"; }; diff-lcs = { source = { @@ -240,12 +247,13 @@ version = "3.2.0"; }; docker-api = { + dependencies = ["excon" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xg2iw6rffyd6zahm6rc80m10dghqmvjg8s83zjm6bqsqdg5h2dk"; + sha256 = "09wsm6ims9gndfkh1ndhq3mps581g0slmvlvcdmsjfjb3qgm6fj5"; type = "gem"; }; - version = "1.33.3"; + version = "1.34.0"; }; erubis = { source = { @@ -258,26 +266,28 @@ excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "149grwcry52hi3f1xkbbx74jw5m3qcmiib13wxrk3rw5rz200kmx"; + sha256 = "0mnc9lqlzwqj5ayp0lh7impisqm55mdg3mw5q4gi9yjic5sidc40"; type = "gem"; }; - version = "0.55.0"; + version = "0.59.0"; }; faraday = { + dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; + sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw"; type = "gem"; }; - version = "0.9.2"; + version = "0.13.1"; }; fauxhai = { + dependencies = ["net-ssh"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk8cspxgs7y29hgzv248albld4d0y5z498xmgh7kqxav6vxpigj"; + sha256 = "0145yfn48qh64wbr55lzs1xjd6fi0z9000ix1z086dziks508c2v"; type = "gem"; }; - version = "4.1.0"; + version = "5.5.0"; }; ffi = { source = { @@ -288,23 +298,22 @@ version = "1.9.18"; }; ffi-yajl = { + dependencies = ["libyajl2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dlfzbs1amvqv9lrl87h614xz7319zcwn29qjl1mhnbclny98hqz"; + sha256 = "0mv7h8bjzgv96kpbmgkmg43rwy96w54kg39vldcdwym6kpqyfgr5"; type = "gem"; }; - version = "2.3.0"; - dependencies = [ - "libyajl2" - ]; + version = "2.3.1"; }; foodcritic = { + dependencies = ["cucumber-core" "erubis" "ffi-yajl" "nokogiri" "rake" "rufus-lru" "treetop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0js522pp3q1xx929mpbzska2i87ydkax1dnyczpll4c46dkc2ivx"; + sha256 = "0snnfv95zwv3rc9ilkzvw1pjch8cykkxq5q42ckx9zr9yd4bzmhz"; type = "gem"; }; - version = "10.2.2"; + version = "12.2.1"; }; fuzzyurl = { source = { @@ -317,10 +326,10 @@ gherkin = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2ibsl5vi3961cci677zjb03wg4wh5hcci5g87i416333qq69xx"; + sha256 = "0arfhyjcsf5bv1anj4ysqhgl621nwl9qfcs7gg20y3sapcjwl2y7"; type = "gem"; }; - version = "4.1.1"; + version = "5.0.0"; }; git = { source = { @@ -331,6 +340,7 @@ version = "1.3.0"; }; gssapi = { + dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix"; @@ -339,6 +349,7 @@ version = "1.2.0"; }; gyoku = { + dependencies = ["builder"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; @@ -349,26 +360,34 @@ hashie = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0lfmbh98ng141m7yc8s4v56v49ppam416pzvd2d7pg85wmm44ljw"; + sha256 = "120mkd2hkwhcfj7avi1dphb0lm7wx364d1cjm9yr4fibqpvsgqi7"; type = "gem"; }; - version = "3.5.5"; + version = "3.5.6"; }; highline = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; type = "gem"; }; - version = "1.7.8"; + version = "1.7.10"; }; hitimes = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1a4yfhj7vp5gx20y99z45skynyn57wzxwwjp9mjm0b6dgiv6l0lz"; + sha256 = "06222h9236jw9jgmdlpi0q7psac1shvxqxqx905qkvabmxdxlfar"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; + }; + htmlentities = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; }; httpclient = { source = { @@ -389,18 +408,19 @@ iniparse = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pj4r636swr6j7zisgs6xjws1hkkj8wxdbbknpzydcmaridk880r"; + sha256 = "1xbik6838gfh5yq9ahh1m7dzszxlk0g7x5lvhb8amk60mafkrgws"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.4"; }; inspec = { + dependencies = ["addressable" "faraday" "hashie" "htmlentities" "json" "method_source" "mixlib-log" "parallel" "parslet" "pry" "rainbow" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "thor" "tomlrb" "train"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "03c1xxp13yv601b5fdbjbqy0sq84ymn5bx4d7k34h553lgc0124f"; + sha256 = "0yvmqdhpag7v6m9z1mcwqj6y1rnrx6hbqws0lhh1zp4xky3w7fn4"; type = "gem"; }; - version = "1.19.2"; + version = "1.47.0"; }; ipaddress = { source = { @@ -410,41 +430,51 @@ }; version = "0.8.3"; }; + iso8601 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0diaqrf9lxmjamasydmd8mbc9p1lh01mb2d9y66kd1mmi7ml85yp"; + type = "gem"; + }; + version = "0.9.1"; + }; json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql"; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.0"; }; kitchen-inspec = { + dependencies = ["hashie" "inspec" "test-kitchen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpkb9hy6hbdk58xs2lf8rcdbm9l02m607bzdramwfm7czzh08rs"; + sha256 = "0giqlpwhc7d91245pa9wkjad6ag6wd0q1757kwxmpgz4rh59xwnz"; type = "gem"; }; - version = "0.17.0"; + version = "0.20.0"; }; kitchen-vagrant = { + dependencies = ["test-kitchen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qanaqs769lvp3bw0bp2jivjs7n0y1y71x99j0cnx3qag9nbjca5"; + sha256 = "0nd09fwk6ncb6rflhl8pwfnq8iyhfzrfqdx4pyhjqq18n5pp3nk6"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; knife-spork = { + dependencies = ["app_conf" "chef" "diffy" "git"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k2lmcz9ym6n7a5xn3jvlmfls10lbk7h6phqpc7ah1dz6dk4qw8d"; + sha256 = "0h9ifjwlqhav04j40psmz22vdz1s3xvq35kzqyc22ir3w6s9nrlj"; type = "gem"; }; - version = "1.6.3"; + version = "1.7.1"; }; libyajl2 = { source = { - # remotes = ["https://rubygems.org"]; sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi"; type = "gem"; }; @@ -459,28 +489,29 @@ version = "1.1.4"; }; logging = { + dependencies = ["little-plugger" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ddy1dh8sshbfaz3magaww1frlk0p3dpishmakpq0c2skp988wl2"; + sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.2"; }; method_source = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; + sha256 = "0xqj21j3vfq4ldia6i2akhn2qd84m0iqcnsl49kfpq3xk6x0dzgn"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.0"; }; mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; type = "gem"; }; - version = "2.1.0"; + version = "2.3.0"; }; minitar = { source = { @@ -491,6 +522,7 @@ version = "0.5.4"; }; mixlib-archive = { + dependencies = ["mixlib-log"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1b56iprv8cdhxjpzb8ck0mc54cl0kmyzlkn6bzzdqws4gxvdf6gk"; @@ -501,10 +533,10 @@ mixlib-authentication = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1v2r5klw6c8b67yw906slp8a7wi4v2gmhhi9b1slmm4sg2v0pgah"; + sha256 = "1lh8vrkq2nnf0rx69mlyiqkx664baxbp32imb7l517lbcw5xspgb"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.2"; }; mixlib-cli = { source = { @@ -523,12 +555,13 @@ version = "2.2.4"; }; mixlib-install = { + dependencies = ["mixlib-shellout" "mixlib-versioning" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08fmrc9qaagj3i85n37l50d9qpjsv0lkdppmx3y69r3d0xcgfv3p"; + sha256 = "0rsi3f3rcg3vky3biy59rvllk3wvx8xnyfch0d4h74r6sxcgbf79"; type = "gem"; }; - version = "2.1.12"; + version = "3.8.0"; }; mixlib-log = { source = { @@ -541,34 +574,34 @@ mixlib-shellout = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0c6zhas6jfr4zd7f6s7sq7qi34ljs7qmdr4zj3ighpcsawm16zg9"; + sha256 = "1aszrg8b6nrsb3avdm2x04f2n0xx81rdip0waxibkqpslcmb8zx5"; type = "gem"; }; - version = "2.2.7"; + version = "2.3.2"; }; mixlib-versioning = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07an7gxrw6gda98bg9zbfk55b2d58hwpms8wx8sd2x2lv8qs670s"; + sha256 = "04ayjzsqqgi0ax8c657wwnmclxh53jvn82mnsf7jb2h7fzlb59v3"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.2"; }; molinillo = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758"; + sha256 = "0hiy8qvk7hsy5bl5x5b19zf3v3qbmcpa0a9w1kywhvd9051a9vnr"; type = "gem"; }; - version = "0.5.7"; + version = "0.6.4"; }; multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; type = "gem"; }; - version = "1.12.1"; + version = "1.12.2"; }; multipart-post = { source = { @@ -579,6 +612,7 @@ version = "2.0.0"; }; net-scp = { + dependencies = ["net-ssh"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; @@ -587,6 +621,7 @@ version = "1.2.1"; }; net-sftp = { + dependencies = ["net-ssh"]; source = { remotes = ["https://rubygems.org"]; sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; @@ -597,12 +632,13 @@ net-ssh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; + sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx"; type = "gem"; }; - version = "4.1.0"; + version = "4.2.0"; }; net-ssh-gateway = { + dependencies = ["net-ssh"]; source = { remotes = ["https://rubygems.org"]; sha256 = "04ws9bvf3ppvcj9vrnwyabcwv4lz1m66ni443z2cf4wvvqssifsa"; @@ -611,6 +647,7 @@ version = "1.3.0"; }; net-ssh-multi = { + dependencies = ["net-ssh" "net-ssh-gateway"]; source = { remotes = ["https://rubygems.org"]; sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71"; @@ -629,18 +666,19 @@ nio4r = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ka4923544ckvc9bxd75van9y901cjxmsiq9h5is9j743bz71k1f"; + sha256 = "1n7csawahihc4z0d1888l2c9hlxxd06m093c58gkp1mcbj9bvyb0"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; nokogiri = { + dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fhmgciw6pfckqgc0aq9kqpbvnakxwh1xf351c9x4xqcj9xjgn0y"; + sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.1"; }; nori = { source = { @@ -651,6 +689,7 @@ version = "2.6.0"; }; octokit = { + dependencies = ["sawyer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0h6cm7bi0y7ysjgwws3paaipqdld6c0m0niazrjahhpz88qqq1g4"; @@ -659,12 +698,13 @@ version = "4.7.0"; }; ohai = { + dependencies = ["chef-config" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "systemu" "wmi-lite"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18bxqa2rh6y6v3pvimy9ffjzrqh7q1my4vd0l7bnsczv07d5gxns"; + sha256 = "05dx2nsswcnd9f7qvz4jgiwwh18z4qbx6mqvflzlx276adx68i0s"; type = "gem"; }; - version = "8.23.0"; + version = "13.7.0"; }; paint = { source = { @@ -677,34 +717,35 @@ parallel = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1iyiyd6s2dy42mhqfnvq2f64h78w0jjwgnyha1kz7dnxavncdb7i"; + sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd"; type = "gem"; }; - version = "1.11.1"; + version = "1.12.0"; }; parser = { + dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq"; + sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3"; type = "gem"; }; - version = "2.4.0.0"; + version = "2.4.0.2"; }; parslet = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3"; + sha256 = "15ls4zgarhic522r767nbsfn7hddrhd7zv8hvlx5flas8b2ybirf"; type = "gem"; }; - version = "1.5.0"; + version = "1.8.1"; }; plist = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1abhg9bcdk2v4liyf10mnww3ngvkmr7flbzzajwsg2z1pmax8g8b"; + sha256 = "0k0pyqrjcz9kn1b3ahsfs9aqym7s7yzz0vavya0zn0mca3jw2zqc"; type = "gem"; }; - version = "3.2.0"; + version = "3.3.0"; }; polyglot = { source = { @@ -731,47 +772,46 @@ version = "1.0.3"; }; pry = { + dependencies = ["coderay" "method_source"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05xbzyin63aj2prrv8fbq2d5df2mid93m81hz5bvf2v4hnzs42ar"; + sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g"; type = "gem"; }; - version = "0.10.4"; + version = "0.11.3"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.1"; }; rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "053bqbrxr5gjw5k3rrmh6i35s83kgdycxv292lid072vpwrq1xv1"; + sha256 = "1kczgp2zwcrvp257dl8j4y3mnyqflxr7rn4vl9w1rwblznx9n74c"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.3"; }; rainbow = { + dependencies = ["rake"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0frz90gyi5k26jx3ham1x661hpkxf82rkxb85nakcz70dna7i8ri"; + sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w"; type = "gem"; }; - version = "2.2.1"; - dependencies = [ - "rake" - ]; + version = "2.2.2"; }; rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + sha256 = "190p7cs8zdn07mjj6xwwsdna3g0r98zs4crz7jh2j2q5b0nbxgjf"; type = "gem"; }; - version = "12.0.0"; + version = "12.3.0"; }; retryable = { source = { @@ -782,38 +822,43 @@ version = "2.0.4"; }; ridley = { + 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"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y6dcbxmn74qg5psdjk9i751zryfwypf56rb458dkq6b7mwfxxwb"; + sha256 = "0n2ykdnr1cn9fk8ns2dh3qf7g5dywl8p8kw4zbw4amb4v5xlkwjh"; type = "gem"; }; - version = "5.1.0"; + version = "5.1.1"; }; rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s"; + sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01"; type = "gem"; }; - version = "3.5.0"; + version = "3.7.0"; }; rspec-core = { + dependencies = ["rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i"; + sha256 = "15c4mgivvs9hpi0i1a8gypdl1f0hg6xknsbizgpm3khc95lqd9r9"; type = "gem"; }; - version = "3.5.4"; + version = "3.7.0"; }; rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs"; + sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy"; type = "gem"; }; - version = "3.5.0"; + version = "3.7.0"; }; rspec-its = { + dependencies = ["rspec-core" "rspec-expectations"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"; @@ -822,22 +867,24 @@ version = "1.2.0"; }; rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24"; + sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3"; type = "gem"; }; - version = "3.5.0"; + version = "3.7.0"; }; rspec-support = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0"; + sha256 = "0hvpqpkh7j5rbwkkc0qwicwpgn0xlnpq935ikmx8n1wxxf553v3p"; type = "gem"; }; - version = "3.5.0"; + version = "3.7.0"; }; rspec_junit_formatter = { + dependencies = ["builder" "rspec-core"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai"; @@ -846,28 +893,29 @@ version = "0.2.3"; }; rubocop = { + dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mzv23i11hqwpxh4srvhm8dpzvnk90y46xdfd1fc1g9s054nnbq0"; + sha256 = "0cy2plq67b47ql06ypx3svbnnjmr2q616scwyhfd6330cg0aacf1"; type = "gem"; }; - version = "0.48.1"; + version = "0.51.0"; }; ruby-progressbar = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm"; + sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; rubyntlm = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nfl35b2lgc4p3bgl6vmhsisap8h7p0rrb4b20gahji7s4m93bbk"; + sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.2"; }; rubyzip = { source = { @@ -894,6 +942,7 @@ version = "1.0.4"; }; sawyer = { + dependencies = ["addressable" "faraday"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; @@ -910,12 +959,13 @@ version = "2.0.0"; }; serverspec = { + dependencies = ["multi_json" "rspec" "rspec-its" "specinfra"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j8fvjzmkcri83p0hiyfdypgbc616w2r0nr6rsi1696cd4nppknp"; + sha256 = "1zsi7nb7mn6jsxbs6gbbkavmbnpdpk9xn2rsd5hbayzmqnb7qk43"; type = "gem"; }; - version = "2.38.0"; + version = "2.41.3"; }; sfl = { source = { @@ -925,37 +975,31 @@ }; version = "2.3"; }; - slop = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; - type = "gem"; - }; - version = "3.6.0"; - }; solve = { + dependencies = ["molinillo" "semverse"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bbzny2bl94mv1xwcfrxbi3fjhxxawlz6la7mip2wwz9kkaf376h"; + sha256 = "08jywdc6wgfb57ncjnsdjb694fzq8aqw0iv289nijpw5hccd32g4"; type = "gem"; }; - version = "3.1.0"; + version = "4.0.0"; }; specinfra = { + dependencies = ["net-scp" "net-ssh" "net-telnet" "sfl"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gdbkqr82p7s0aq0sixsahapijccs8qswssfmsb76hi40xb2s3sg"; + sha256 = "1dh4ydl4rr6dc8dw9nqns9z3d4f5inmpjnspnvgppvy9hk9lnx9h"; type = "gem"; }; - version = "2.67.7"; + version = "2.72.1"; }; sslshake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1sm0vxh9ryywsl9iqj8kkwpykh8xrr2fmlv5ysm9jjgwmdpslfvl"; + sha256 = "19j8q4mnjvjnhlbzs9r0pn608bv5a4cihf6lswv36l3lc35gp9zl"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; syslog-logger = { source = { @@ -974,12 +1018,13 @@ version = "2.6.5"; }; test-kitchen = { + dependencies = ["mixlib-install" "mixlib-shellout" "net-scp" "net-ssh" "net-ssh-gateway" "safe_yaml" "thor" "winrm" "winrm-elevated" "winrm-fs"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mg13w1xi36r7vsbdwf7cb06s2j1p2hig144r0hzqwi599w5l9hr"; + sha256 = "0wypsc0yl5zgw4f39i8nwq35z0lnjpqx333w9ginmiifs9jydlvm"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.2"; }; thor = { source = { @@ -990,6 +1035,7 @@ version = "0.19.1"; }; timers = { + dependencies = ["hitimes"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz"; @@ -997,37 +1043,39 @@ }; version = "4.0.4"; }; - toml = { + tomlrb = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v"; + sha256 = "09gh67v8s1pr7c37490sjp782gi4wf9k9cadp4l926h1sp27bcgz"; type = "gem"; }; - version = "0.1.2"; + version = "1.2.6"; }; train = { + dependencies = ["docker-api" "json" "mixlib-shellout" "net-scp" "net-ssh" "winrm" "winrm-fs"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dglwr6kirqn9k7am4gszvgkpndvyqydlfgmwjwikvpsvf8rxgrl"; + sha256 = "1ic719ghmyvf93p4y91y00rc09s946sg4n1h855yip9h5795q9i5"; type = "gem"; }; - version = "0.23.0"; + version = "0.31.1"; }; treetop = { + dependencies = ["polyglot"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kx3qqdbdk5sy44cyinfx2jxr4w9z3qb17f7wicqa2kshbrvnp1q"; + sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.9"; }; unicode-display_width = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1r28mxyi0zwby24wyn1szj5hcnv67066wkv14wyzsc94bf04fqhx"; + sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8"; type = "gem"; }; - version = "1.1.3"; + version = "1.3.0"; }; uuidtools = { source = { @@ -1038,6 +1086,7 @@ version = "2.1.5"; }; varia_model = { + dependencies = ["buff-extensions" "hashie"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0kgj37rc3yia4pr5pma0psgar6xjk064qdfii3nwr6dj1v73cyxz"; @@ -1046,14 +1095,16 @@ version = "0.6.0"; }; winrm = { + dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xf36sf2cgangij9maphprzhznv4w50arnwrik5jdnmfxc8lqfmh"; + sha256 = "02lzbixdbjvhmb0byqx9rl9x4xx9pqc8jwm7y6mmp7w7mri72zh6"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.3"; }; winrm-elevated = { + dependencies = ["winrm" "winrm-fs"]; source = { remotes = ["https://rubygems.org"]; sha256 = "04krbwnj4cw7jy42w3n2y5kp2fbcp3v9mbf59pdhfk1py18bswcr"; @@ -1062,12 +1113,13 @@ version = "1.1.0"; }; winrm-fs = { + dependencies = ["erubis" "logging" "rubyzip" "winrm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p9kv5hj57krlrh20ykq8pz4i911r30mbl57n6mc6hfba2zfl7j8"; + sha256 = "0vax34qbr3n6jifxyzr4nngaz8vrmzw6ydw21cnnrhidfkqgh7ja"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.1"; }; wmi-lite = { source = { @@ -1077,12 +1129,4 @@ }; version = "1.0.0"; }; - yajl-ruby = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sah2lpvpsh555dcnhgcqylinjj5544md9dh1a0a13da0qv1p57i"; - type = "gem"; - }; - version = "1.3.0"; - }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fc085b3e5ea5e8b4b4e0c8213e410dd2eee6358e --- /dev/null +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -0,0 +1,36 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, go }: + +buildGoPackage rec { + name = "cloudfoundry-cli-${version}"; + version = "6.32.0"; + + goPackagePath = "code.cloudfoundry.org/cli"; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "cloudfoundry-attic"; + repo = "cli-with-i18n"; + sha256 = "16r8zvahn4b98krmyb8zq9370i6572dhz88bfxb3fnddcv6zy1ng"; + }; + + outputs = [ "out" ]; + + buildFlagsArray = '' + -ldflags= -X ${goPackagePath}/version.binaryVersion=${version} + ''; + + installPhase = '' + install -Dm555 go/bin/cli "$out/bin/cf" + remove-references-to -t ${go} "$out/bin/cf" + install -Dm444 -t "$out/share/bash-completion/completions/" "$src/ci/installers/completion/cf" + ''; + + meta = with stdenv.lib; { + description = "The official command line client for Cloud Foundry"; + homepage = https://github.com/cloudfoundry/cli; + maintainers = with maintainers; [ ris ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix index bad35e2422b547f11b9ec79f7110feae2968b2b8..db7df2af7009af3a980ad3ed8bda35489f99004c 100644 --- a/pkgs/development/tools/compile-daemon/default.nix +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Very simple compile daemon for Go"; license = licenses.bsd2; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index eaae51f726bb6b6397580ffb2d65b778f133161c..8d43736d3a8a560233992a67c5c0e5654c3c66b3 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "ct-${version}"; - version = "0.4.1"; + version = "0.7.0"; goPackagePath = "github.com/coreos/container-linux-config-transpiler"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "coreos"; repo = "container-linux-config-transpiler"; rev = "v${version}"; - sha256="1017xkinja30jcam8p1x2d9q4vkgkfn7gvkad004jkbbmd2216sa"; + sha256="058zjk9yqgdli55gc6y48455il6wjpslyz2r2ckk2ki9c5qc8b7c"; }; buildFlagsArray = '' diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 46cee51e0e6f0e1a3804dec0c7517d68fa2f8f58..7a5f2f44823b26ba72a1b28d11ac72eb63b2d3f7 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: let - version = "2.6.6"; + version = "2.6.10"; goPackagePath = "github.com/buildkite/agent"; in buildGoPackage { @@ -12,11 +12,15 @@ buildGoPackage { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "0rpi63mfzlm39517l4xjcka3m4dnfjzwvpi0i1rpf1z2288cnkyx"; + sha256 = "07065hhhb418w5qlqnyiap45r59paysysbwz1l7dmaw3j4q8m8rg"; }; nativeBuildInputs = [ makeWrapper ]; + # on Linux, the TMPDIR is /build which is the same prefix as this package + # remove once #35068 is merged + noAuditTmpdir = stdenv.isLinux; + postInstall = '' # Install bootstrap.sh mkdir -p $bin/libexec/buildkite-agent @@ -44,6 +48,6 @@ buildGoPackage { homepage = https://buildkite.com/docs/agent; license = licenses.mit; maintainers = with maintainers; [ pawelpacana zimbatm ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index ed6c7f4fefb686f5514e3d0fa895183f349e5e8c..845e3f8a1dc49bd1c8aff11b33871d5a72f027ad 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -61,7 +61,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - maintainer = with maintainers; [ avnik ]; + maintainers = with maintainers; [ avnik ]; license = licenses.asl20; description = "Continuous Integration platform built on container technology"; }; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 44e4f494ff241a1015f90a7feb5ee15190377c89..6cce9803c9156141e102f4db8d99799c6764c4a6 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 = "10.1.0"; + version = "10.6.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "0h8fwqsr8ibd82jxq4pc9p8x7af0i8jyrrsj13p4daqhla0srxr4"; + sha256 = "0icn4xgnlrmxvhbw1lrdkg3x0cr9vhbi1vc51ahd708f9hd64ik6"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0bzj8zr6d5ab5bjlbw7q3iwn19ha8fksymrvw6cyzs4qacfsj54w"; + sha256 = "0wgkvgcmby89w1vy06v7milj62656zflw2wi2g30645g72gz0as9"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0knvjmxcscyr6v5b9vvyvm8w6p58a1h6nfcvf13dxp59psm71q00"; + sha256 = "113vkx3dnv3fvnracszlhf56fb5jr41fr3s0bs025hv8b9sp04zz"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 377f35150f46ef7253dfb8f97fb43dc803b28603..2d534435b5f9eabd7a09567cc9f153c4a2780fec 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.90"; + version = "2.89.4"; src = fetchurl { - url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "15h1abcvr8b5n8l4kqivxncvc9dwz66pmdy9ycs3qaz4nrypws8z"; + url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; + sha256 = "0lwv3y12r36amkr70fap5g1zfd7vv92809lh9w7178s91sikm28x"; }; buildCommand = '' diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 2764c81d6d86b6152d9e4f09ae558f8146f95eb6..e3c8d7ed014de31f603f32e781edd1f8cf8784f5 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,22 +2,18 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.0.0-RC3"; + version = "1.0.1"; src = fetchurl { url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; - sha256 = "0iiv79ig8p9pm7fklxskxn6bx1m4xqgdfdk6bvqq81gl8b101z5w"; + sha256 = "1rn1vb33zfl9iy80fhqvi9ykdjxz029nah5yfr5xixcx9al0bai3"; }; 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 ; + buildCommand = '' + install -Dm555 $src $out/bin/coursier + wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 11932965af4911d4dbd7af57d285a1925bce1ba0..df9addcad3cb316bd422236320e6ad22c81681d8 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liquibase"; - version = "3.5.3"; + version = "3.6.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; - sha256 = "04cpnfycv0ms70d70w8ijqp2yacj2svs7v3lk99z1bpq3rzx51gv"; + sha256 = "0nrszf80s5v485li7xy8jkl1wsgjq6inr33m7p85splxhdgszjlb"; }; buildInputs = [ jre makeWrapper ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "Version Control for your database"; homepage = http://www.liquibase.org/; license = licenses.asl20; - maintainers = with maintainers; [ nequissimus profpatsch ]; + maintainers = with maintainers; [ nequissimus ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/database/pg_tmp/default.nix b/pkgs/development/tools/database/pg_tmp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b7d960d5af482c231de1fe713b2ffd74d91d7a5d --- /dev/null +++ b/pkgs/development/tools/database/pg_tmp/default.nix @@ -0,0 +1,25 @@ +{ fetchFromBitbucket, stdenv }: + +stdenv.mkDerivation rec { + name = "pg_tmp-${version}"; + version = "2.3"; + + src = fetchFromBitbucket { + owner = "eradman"; + repo = "ephemeralpg"; + rev = "ephemeralpg-${version}"; + sha256 = "0j0va9pch2xhwwx4li3qx3lkgrd79c0hcy5w5y1cqax571hv89wa"; + }; + + installPhase = '' + PREFIX=$out make install + ''; + + meta = with stdenv.lib; { + homepage = http://ephemeralpg.org; + description = "Run tests on an isolated, temporary PostgreSQL database"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ hrdinka ]; + }; +} diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index bcb0cf1d5e4c2775c78dc4222d7c37aa808a638a..4ea3589476bd685b671b0ab7b738a13293729c12 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -35,6 +35,5 @@ pythonPackages.buildPythonApplication rec { ''; homepage = https://pgcli.com; license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0390e7b86bbc9f5a7b73033cc54b88cbbb777e93 --- /dev/null +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -0,0 +1,45 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +let + pgdbconn = pythonPackages.buildPythonPackage rec { + pname = "pgdbconn"; + version = "0.8.0"; + src = fetchFromGitHub { + owner = "perseas"; + repo = "pgdbconn"; + rev = "26c1490e4f32e4b5b925e5b82014ad106ba5b057"; + sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z"; + }; + # The tests are impure (they try to access a PostgreSQL server) + doCheck = false; + propagatedBuildInputs = [ + pythonPackages.psycopg2 + pythonPackages.pytest + ]; + }; +in + +pythonPackages.buildPythonApplication rec { + pname = "pyrseas"; + version = "0.8.0"; + src = fetchFromGitHub { + owner = "perseas"; + repo = "Pyrseas"; + rev = "2e9be763e61168cf20d28bd69010dc5875bd7b97"; + sha256 = "1h9vahplqh0rzqjsdq64qqar6hj1bpbc6nl1pqwwgca56385br8r"; + }; + # The tests are impure (they try to access a PostgreSQL server) + doCheck = false; + propagatedBuildInputs = [ + pythonPackages.psycopg2 + pythonPackages.pytest + pythonPackages.pyyaml + pgdbconn + ]; + meta = { + description = "A declarative language to describe PostgreSQL databases"; + homepage = https://perseas.github.io/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ pmeunier ]; + }; +} diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ab62fdf3d52330d5aa97fcfd41b5af463c3658f3 --- /dev/null +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper, graphviz }: + +stdenv.mkDerivation rec { + version = "6.0.0-rc2"; + name = "schemaspy-${version}"; + + src = fetchurl { + url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${name}.jar"; + sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn"; + }; + + unpackPhase = "true"; + + buildInputs = [ + jre + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + wrappedPath = lib.makeBinPath [ + graphviz + ]; + + installPhase = '' + install -D ${src} "$out/share/java/${name}.jar" + + makeWrapper ${jre}/bin/java $out/bin/schemaspy \ + --add-flags "-jar $out/share/java/${name}.jar" \ + --prefix PATH : "$wrappedPath" + ''; + + meta = with lib; { + homepage = "http://schemaspy.org"; + description = "Document your database simply and easily"; + license = licenses.mit; + maintainers = with maintainers; [ jraygauthier ]; + }; +} + diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index a397ba696977b516d034692aeb14e71f0ff07b25..49e90ce64c87d6491d585e292c3f6324178e1ff3 100644 --- a/pkgs/development/tools/database/shmig/default.nix +++ b/pkgs/development/tools/database/shmig/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , withMySQL ? false, withPSQL ? false, withSQLite ? false -, mariadb, postgresql, sqlite, gawk, which +, mysql, postgresql, sqlite, gawk, which , lib }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { patchShebangs . substituteInPlace shmig \ - --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb}/bin/mysql"}" \ + --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mysql.client}/bin/mysql"}" \ --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \ --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \ --replace "awk" "${gawk}/bin/awk" \ diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index d5acd487e6b38062eab4cffecd953bdeea61303e..a5d5702029b9c8ba8ef49385c05a911883b4cb11 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - version = "17.3.0.271.2323"; + version = "17.4.1.054.0712"; name = "sqldeveloper-${version}"; src = requireFile rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { obtain it you need to - navigate to ${url} - - make sure that it says "Version ${version}" above the list of downloads + - make sure that it says "Version ${version}" above the list of downloads - if it does not, click on the "Previous Version" link below the downloads and repeat until the version is correct. This is necessarry because as the time of this writing there exists no permanent link for the current version @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nix-prefetch-url --type sha256 file:///path/to/${name} ''; # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip` - sha256 = "06ba5920544bacbea83425548b1b8f69ab3e9bb279076321aece2c0c6d415dad"; + sha256 = "7e92ca94d02489002db291c96f1d67f9b2501a8967ff3457103fcf60c1eb154a"; }; buildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 74adac9f8a32e3597a8ec74dfb6a4e9c7594af1d..054eabdb5e43953a21423ec6fe6070eb6c7cf9bd 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { description = "DB Browser for SQLite"; homepage = http://sqlitebrowser.org/; license = licenses.gpl3; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; # can only test on linux }; } diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index afac17e121ad99d385441acb450203876fd7fc7a..7d4cf6ea5d5e9c3e479c0a30f7d279bc4758e8ee 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -5,13 +5,13 @@ , drivers ? [] }: let - version = "3.7.1"; + version = "3.8.1"; in stdenv.mkDerivation rec { name = "squirrel-sql-${version}"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "1v141ply57k5krwbnnmz4mbs9hs8rbys0bkjz69gvxlqjizyiq23"; + sha256 = "1vv38i4rwm8c8h0p9mmz21dyafd71pqprj7b8i5vx7f4q8xns2d2"; }; buildInputs = [ diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index fe4ec06322f436f80ded8a28e2cf2096edceec6d..91037e6dfaa911f0c9a1374fccec0922e6261546 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "deis-${version}"; - version = "1.13.3"; + version = "1.13.4"; rev = "v${version}"; goPackagePath = "github.com/deis/deis"; @@ -18,7 +18,7 @@ buildGoPackage rec { inherit rev; owner = "deis"; repo = "deis"; - sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p"; + sha256 = "0hndzvlgpfm83c4i1c88byv8j9clagswa79nny8wrw33dx90dym1"; }; preBuild = '' diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 06b6a0993bec5fe104ae4185bd8c37d5ef492beb..9a7a600d13436d0f50220b6f196b4afa6d14f021 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "delve-${version}"; - version = "0.12.1"; + version = "1.0.0"; goPackagePath = "github.com/derekparker/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,14 +11,14 @@ buildGoPackage rec { owner = "derekparker"; repo = "delve"; rev = "v${version}"; - sha256 = "0vkyx9sd66yrqz9sa4pysmpjv6gdgpfk1icrbjk93h2ry15ma8d6"; + sha256 = "08hsairhrifh41d288jhc65zbhs9k0hs738dbdzsbcvlmycrhvgx"; }; - meta = { + meta = with stdenv.lib; { description = "debugger for the Go programming language"; homepage = https://github.com/derekparker/delve; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ vdemeester ]; + license = licenses.mit; + platforms = [ "x86_64-linux" ] ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index e22be524f0216ef12a51b07c387d4a6847e2fa9c..0d4f72fad80af66212c1839c6f83bc8135f78e16 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "dep-${version}"; - version = "0.3.1"; + version = "0.4.1"; rev = "v${version}"; goPackagePath = "github.com/golang/dep"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "golang"; repo = "dep"; - sha256 = "0dsiaqfrp7ihhx10qapkl6zm3dw3rwdgcr9rkvmq8zprcp7njz90"; + sha256 = "0183xq5l4sinnclynv6xi85vmk69mqpy5wjfsgh8bxwziq3vkd7y"; }; buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); @@ -21,7 +21,7 @@ buildGoPackage rec { homepage = https://github.com/golang/dep; description = "Go dependency management tool"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.carlsverre ]; }; } diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 9da88f6c63d84feb2d08fa8090587a436551fc0e..905314efe5a9b8aca62863ae7e48199857f24ab6 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,28 +1,48 @@ -{ stdenv, pythonPackages, glibcLocales} : +{ stdenv +, lib +, pythonPackages +, glibcLocales +, devpi-server +, git +, mercurial +} : pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "devpi-client"; - version = "3.1.0rc1"; + version = "3.1.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0kfyva886k9zxmilqb2yviwqzyvs3n36if3s56y4clbvw9hr2lc3"; + sha256 = "0w47x3lkafcg9ijlaxllmq4886nsc91w49ck1cd7vn2gafkwjkgr"; }; - # requires devpi-server which is currently not packaged - doCheck = true; - checkInputs = with pythonPackages; [ pytest webtest mock ]; - checkPhase = "py.test"; + + checkInputs = with pythonPackages; [ + pytest webtest mock + devpi-server tox + sphinx wheel git mercurial detox + setuptools + ]; + checkPhase = '' + export PATH=$PATH:$out/bin + + # setuptools do not get propagated into the tox call (cannot import setuptools) + rm testing/test_test.py + + # test_pypi_index_attributes tries to connect to upstream pypi + # test_download_release_error is fixed in the next release + py.test -k 'not test_pypi_index_attributes and not test_download_release_error' testing + ''; LC_ALL = "en_US.UTF-8"; - buildInputs = with pythonPackages; [ glibcLocales pkginfo tox check-manifest ]; - propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy ]; + buildInputs = with pythonPackages; [ glibcLocales pkginfo check-manifest ]; + propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy setuptools ]; - meta = { + meta = with stdenv.lib; { homepage = http://doc.devpi.net; - description = "Github-style pypi index server and packaging meta tool"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ lewo makefu ]; - + description = "Client for devpi, a pypi index server and packaging meta tool"; + license = licenses.mit; + maintainers = with maintainers; [ lewo makefu ]; }; + } diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6823ae3372cb8a46e194d1cc294da30189f22802 --- /dev/null +++ b/pkgs/development/tools/devpi-server/default.nix @@ -0,0 +1,34 @@ + { stdenv, pythonPackages, glibcLocales, nginx }: + +pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "devpi-server"; + version = "4.4.0"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0y77kcnk26pfid8vsw07v2k61x9sdl6wbmxg5qxnz3vd7703xpkl"; + }; + + propagatedBuildInputs = with pythonPackages; + [ devpi-common execnet itsdangerous pluggy waitress pyramid passlib ]; + checkInputs = with pythonPackages; [ nginx webtest pytest beautifulsoup4 pytest-timeout mock pyyaml ]; + preCheck = '' + # These tests pass with pytest 3.3.2 but not with pytest 3.4.0. + sed -i 's/test_basic/noop/' test_devpi_server/test_log.py + sed -i 's/test_new/noop/' test_devpi_server/test_log.py + sed -i 's/test_thread_run_try_again/noop/' test_devpi_server/test_replica.py + ''; + checkPhase = '' + runHook preCheck + cd test_devpi_server/ + PATH=$PATH:$out/bin pytest --slow -rfsxX + ''; + + meta = with stdenv.lib;{ + homepage = http://doc.devpi.net; + description = "Github-style pypi index server and packaging meta tool"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index a28e4a32168d203a96bbd0f8ea80cfefd67c38b9..be852066bfcc8328c858ac73a3f90289ee661dfa 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "doctl-${version}"; version = "${major}.${minor}.${patch}"; major = "1"; - minor = "5"; + minor = "8"; patch = "0"; goPackagePath = "github.com/digitalocean/doctl"; @@ -19,9 +19,9 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "digitalocean"; - repo = "doctl"; - rev = "v${version}"; - sha256 = "0dk7l4b0ngqkwdlx8qgr99jzipyzazvkv7dybi75dnp725lwxkl2"; + repo = "doctl"; + rev = "v${version}"; + sha256 = "1h94qagbni8cvzdparmgx3m9qcnbwbk0kjlvy9jzxfd3vcpbg38j"; }; meta = { diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index c803de9e0247dd56826d46542a4551e604b0a838..05418aa39a8cfd2c9f66c0f0bf9620651e49b6fa 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "doxygen-1.8.11"; + name = "doxygen-1.8.14"; src = fetchurl { url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "0ja02pm3fpfhc5dkry00kq8mn141cqvdqqpmms373ncbwi38pl35"; + sha256 = "d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 5f0b6b628cb2514d4ffbe271c28d7f0e4274a87e..f6920a83e09c9d76f8288eb2b397cd67ec104392 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -10,8 +10,14 @@ python2Packages.buildPythonApplication { sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; }; + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = [ libxslt ]; + configureFlags = "--disable-scrollkeeper"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxslt intltool ]; + + preBuild = '' + substituteInPlace xml2po/xml2po/Makefile --replace '-e "s+^#!.*python.*+#!$(PYTHON)+"' '-e "s\"^#!.*python.*\"#!$(PYTHON)\""' + ''; + propagatedBuildInputs = [ libxml2Python ]; } diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 5f31a2dfb7c638a67dbee2289814ee2381add2b6..a52afd6c39ad70b16cd819c2c48f5dc048aa5476 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,29 +1,38 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which -, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext, itstool }: +, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }: + +let + pythonEnv = python.withPackages (ps: with ps; [ six ]); +in stdenv.mkDerivation rec { name = "gtk-doc-${version}"; - version = "1.25"; + version = "1.28"; src = fetchurl { url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz"; - sha256 = "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y"; + sha256 = "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"; }; patches = [ - ./respect-xml-catalog-files-var.patch + passthru.respect_xml_catalog_files_var_patch ]; outputDevdoc = "out"; nativeBuildInputs = [ autoreconfHook ]; buildInputs = - [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl - gnome_doc_utils dblatex gettext which itstool + [ pkgconfig perl pythonEnv libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl + gnome-doc-utils dblatex gettext which itstool ]; configureFlags = "--disable-scrollkeeper"; + passthru = { + # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch + respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; + }; + meta = with stdenv.lib; { homepage = https://www.gtk.org/gtk-doc; description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; diff --git a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch index 78c57306b797daed51994cd02b09e52b63bae114..95f6879a0069117807ff07631b68f6487e4b217b 100644 --- a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch +++ b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch @@ -1,28 +1,13 @@ -diff --git a/m4/gtkdoc_jh_check_xml_catalog.m4 b/m4/gtkdoc_jh_check_xml_catalog.m4 -index 618c1c9..1842a0d 100644 --- a/m4/gtkdoc_jh_check_xml_catalog.m4 +++ b/m4/gtkdoc_jh_check_xml_catalog.m4 -@@ -10,7 +10,21 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], +@@ -5,8 +5,8 @@ + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then AC_MSG_RESULT([found]) ifelse([$3],,,[$3]) else -- AC_MSG_RESULT([not found]) -- ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) -+ jh_check_xml_catalog_saved_ifs="$IFS" -+ IFS=' ' -+ for f in $XML_CATALOG_FILES; do -+ if [[ -f "$f" ]] && \ -+ AC_RUN_LOG([$XMLCATALOG --noout "$f" "$1" >&2]); then -+ jh_found_xmlcatalog=true -+ AC_MSG_RESULT([found]) -+ ifelse([$3],,,[$3]) -+ break -+ fi -+ done -+ IFS="$jh_check_xml_catalog_saved_ifs" -+ if ! $jh_found_xmlcatalog; then -+ AC_MSG_RESULT([not found]) -+ ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) -+ fi - fi - ]) diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 144bd059634f424eae5e547b32048a82709860ba..128eed603b039029c54d14d86d38e379cf8ebc38 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -4,16 +4,20 @@ with python.pkgs; buildPythonApplication rec { pname = "mkdocs"; - version = "0.16.3"; - name = "${pname}-${version}"; + version = "0.17.3"; src = fetchFromGitHub { owner = "mkdocs"; repo = "mkdocs"; rev = version; - sha256 = "0gssa5gbd1y2v3azdhf2zh7ayx4ncfag4r2a6fi96jbic64r3qrs"; + sha256 = "15lv60gdc837zja5kn2rfp78kwyb1ckc43jg01zfzqra4qz7b6rw"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "tornado>=4.1,<5.0" "tornado>=4.1" + ''; + checkInputs = [ nose nose-exclude mock ]; diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..17aa94ebf366dc1517246ed533c664c7480cd460 --- /dev/null +++ b/pkgs/development/tools/drip/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, jdk, which, makeWrapper }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "drip"; + version = "0.2.4"; + + src = fetchFromGitHub { + repo = pname; + owner = "ninjudd"; + rev = version; + sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ jdk ]; + + postPatch = '' + patchShebangs . + ''; + + installPhase = '' + runHook preInstall + mkdir $out + cp ./* $out -r + wrapProgram $out/bin/drip \ + --prefix PATH : "${which}/bin" + $out/bin/drip version + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster"; + license = licenses.epl10; + homepage = https://github.com/ninjudd/drip; + platforms = platforms.linux; + maintainers = [ maintainers.rybern ]; + }; +} diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 0d639875da5714b9542e953cdef57aefe69e1663..d5f691b0cac573065e27a7b75200e4116d103258 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,51 +2,51 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.075.1"; - - src = fetchFromGitHub { - owner = "dlang"; - repo = "tools"; - rev = "v${version}"; - sha256 = "0lxn400s9las9hq6h9vj4mis2jr662k2yw0zcrvqcm1yg9pd245d"; - }; - - postPatch = '' - substituteInPlace posix.mak \ - --replace "../dmd/generated/\$(OS)/release/\$(MODEL)/dmd" ${dmd.out}/bin/dmd - - substituteInPlace posix.mak \ - --replace gcc $CC - - # To fix rdmd test with newer phobos - substituteInPlace rdmd.d \ - --replace " std.stdiobase," "" + version = "2.079.0"; + + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = "1k6cky71pqnss6h6391p1ich2mjs598f5fda018aygnxg87qgh4y"; + name = "dmd"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "tools"; + rev = "v${version}"; + sha256 = "0fvpfwh3bh3fymrmis3n39x9hkfklmv81lrlqcyl8fmmk694yvad"; + name = "dtools"; + }) + ]; + + sourceRoot = "."; + + postUnpack = '' + mv dmd dtools + cd dtools ''; nativeBuildInputs = [ dmd ]; buildInputs = [ curl ]; + makeCmd = '' + make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc + ''; + buildPhase = '' - make -f posix.mak DMD=${dmd.out}/bin/dmd INSTALL_DIR=$out + $makeCmd ''; doCheck = true; checkPhase = '' - export BITS=${builtins.toString stdenv.hostPlatform.parsed.cpu.bits} - export OSNAME=${if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name} - ./generated/$OSNAME/$BITS/rdmd -main -unittest rdmd.d - ${dmd.out}/bin/dmd rdmd_test.d - ./rdmd_test + $makeCmd test_rdmd ''; installPhase = '' - mkdir -p $out/bin - ${ - let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in - "find $PWD/generated/${osname}/${bits} -perm /a+x -type f -exec cp {} $out/bin \\;" - } + $makeCmd INSTALL_DIR=$out install ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 74884e6f5a8a4966a9a88db831798fbc5141f81f..f2b9348103ab26c2447db63148440eba5be3f7a5 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,25 +1,40 @@ { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: let - version = "1.7.5"; + version = "1.8.2"; name = "electron-${version}"; + throwSystem = throw "Unsupported system: ${stdenv.system}"; + meta = with stdenv.lib; { description = "Cross platform desktop application shell"; homepage = https://github.com/electron/electron; license = licenses.mit; - maintainers = [ maintainers.travisbhartwell ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + maintainers = with maintainers; [ travisbhartwell manveru ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; }; linux = { inherit name version meta; - src = fetchurl { - url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "1z1dzk6d2mfyms8lj8g6jn76m52izbd1d7c05k8h88m1syfsgav5"; - name = "${name}.zip"; - }; + src = { + i686-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; + sha256 = "12q5h6gh9zzhndg6yfka821rblq3l80d2qzqrq4nbq6rlsshjp9d"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; + sha256 = "07ggq9wgfz3z5z0lwzzgs6im0qs83pz0pcfwr0r42zgmwg7j78b8"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; + sha256 = "1b0p5x9zigyd6d8gz2hxc4scllrpnbx1dzzwlsvw6ilqbj1ypc7i"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; + sha256 = "0k4np2d4y15x1qfay8y9m8v9y223vdpbq5fdxa3ywbbyf8j361zd"; + }; + }.${stdenv.system} or throwSystem; buildInputs = [ unzip makeWrapper ]; @@ -45,18 +60,17 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "1d3c3y5j99wbyxlzk1nkry0m1xgxy3mi4a6irvlgyxl729dnwi97"; - name = "${name}.zip"; + sha256 = "0pq587vr1i87jdwcpbf6n136i9dp6i39dp5s95kihnm9qglxr42b"; }; buildInputs = [ unzip ]; buildCommand = '' - mkdir -p $out/Applications - unzip $src - mv Electron.app $out/Applications - mkdir -p $out/bin - ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + mkdir -p $out/Applications + unzip $src + mv Electron.app $out/Applications + mkdir -p $out/bin + ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron ''; }; in diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c587505600c98ec5fb35578460e0b695f420674e --- /dev/null +++ b/pkgs/development/tools/fac/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }: + +let + # TODO: Remove this on next update, should be included + fac_1 = fetchurl { + url = https://raw.githubusercontent.com/mkchoi212/fac/0a500c2a2dba9017fe7c2a45f15c328755f561a6/doc/fac.1; + sha256 = "1fsyx9i20ryhpihdpvs2z7vccl13b9bnh5hcdxn7bvqjz78mbqhw"; + }; +in buildGoPackage rec { + name = "fac-${version}"; + version = "1.0.4"; + + goPackagePath = "github.com/mkchoi212/fac"; + + src = fetchFromGitHub { + owner = "mkchoi212"; + repo = "fac"; + rev = "v${version}"; + sha256 = "0jhx80jbkxfxj95hmdpb9wwwya064xpfkaa218l1lwm3qwfbpk95"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $bin/bin/fac \ + --prefix PATH : ${git}/bin + + install -D ${fac_1} $out/share/man/man1/fac.1 + ''; + + meta = with stdenv.lib; { + description = "CUI for fixing git conflicts"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/development/tools/flock/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ac145fae7efe0ce0d9875324fe86063c27a5ace0 --- /dev/null +++ b/pkgs/development/tools/flock/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, ronn }: + +stdenv.mkDerivation rec { + pname = "flock"; + name = "${pname}-${version}"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "discoteq"; + repo = pname; + rev = "v${version}"; + sha256 = "1vdq22zhdfi7wwndsd6s7fwmz02fsn0x04d7asq4hslk7bjxjjzn"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ronn ]; + + meta = with lib; { + description = "Cross-platform version of flock(1)"; + maintainers = [ maintainers.matthewbauer ]; + platforms = platforms.all; + license = licenses.isc; + }; +} diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9535ba86dd0600149358fb947ef52bf7673b500c --- /dev/null +++ b/pkgs/development/tools/flootty/default.nix @@ -0,0 +1,23 @@ +{ stdenv, python }: + +let + inherit (python.pkgs) buildPythonApplication fetchPypi; +in + +buildPythonApplication rec { + pname = "Flootty"; + version = "3.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vjwl6g1bwm6jwp9wjla663cm831zf0rc9361mvpn4imdsfz7hxs"; + }; + + meta = with stdenv.lib; { + description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session"; + homepage = "https://floobits.com/help/flootty"; + license = licenses.asl20; + maintainers = with maintainers; [ sellout ]; + }; +} diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 6233b9c6bdb4a2117f0adfdd180afe48242c1f5b..43026e55e7f34213e0a98296cee31b5899f6acf6 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "4.2.0"; + version = "5.0.7"; in stdenv.mkDerivation { name = "flyway-${version}"; src = fetchurl { - url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/4.2.0/flyway-commandline-${version}.tar.gz"; - sha256 = "1fxj760qx6apsz50p60c9n79k6bqkjcv2zfgab0awvmdvdy4k661"; + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.0.7/flyway-commandline-${version}.tar.gz"; + sha256 = "1zmnzz7d5kb2wpmfizryxxhpjs16j5k9mich1hbb2qfkqvygk6sv"; }; buildInputs = [ makeWrapper ]; dontBuild = true; @@ -23,7 +23,7 @@ description = "Evolve your Database Schema easily and reliably across all your instances"; homepage = "https://flywaydb.org/"; license = licenses.asl20; - platforms = platforms.linux; - maintainers = maintainers.cmcdragonkai; + platforms = platforms.unix; + maintainers = [ maintainers.cmcdragonkai ]; }; } diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..11880213bada44daa31a4703208fce11fdc4ea78 --- /dev/null +++ b/pkgs/development/tools/fmbt/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, python, autoreconfHook, pkgconfig, makeWrapper +, flex +, gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz +, tesseract, gts, libXtst +}: +stdenv.mkDerivation rec { + version = "0.39"; + name = "fMBT-${version}"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "fMBT"; + rev = "v${version}"; + sha256 = "15sxwdcsjybq50vkla4md2ay8m67ndc4vwcsl5vwsjkim5qlxslb"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper + python.pkgs.wrapPython ]; + + buildInputs = [ python gettext libedit glib imagemagick libxml2 boost + gnuplot graphviz tesseract gts + ]; + + propagatedBuildInputs = with python.pkgs; [ + pyside pydbus pexpect pysideShiboken + ]; + + preBuild = '' + export PYTHONPATH="$PYTHONPATH:$out/lib/python${python.pythonVersion}/site-packages" + export PATH="$PATH:$out/bin" + export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [libXtst]}" + ''; + + postInstall = '' + echo -e '#! ${stdenv.shell}\npython "$@"' > "$out/bin/fmbt-python" + chmod a+x "$out/bin/fmbt-python" + patchShebangs "$out/bin" + for i in "$out"/bin/*; do + wrapProgram "$i" --suffix "PATH" ":" "$PATH" \ + --suffix "PYTHONPATH" ":" "$PYTHONPATH" \ + --suffix "LD_LIBRARY_PATH" ":" "$LD_LIBRARY_PATH" + done + ''; + + meta = with stdenv.lib; { + description = "Free Model-Based Testing tool"; + homepage = "https://github.com/intel/fMBT"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; + }; +} + diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index d553a57455241ff13a56d918ce668e39a0ba2963..bbcdc0cd798e93b552718c18fd6b95200757ef6c 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "galen"; - version = "2.3.0"; + version = "2.3.6"; name = "${pname}-${version}"; inherit jre8; src = fetchurl { url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; - sha256 = "10z7vh3jiq7kbzzp3j0354swkr4xxz9qimi5c5bddbiy671k6cra"; + sha256 = "0kndib3slj7mdvhd36fxin5q87cnsz4hs135yxgjx0nccxq4f2h5"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..58bc24e1ec64d33fecb605149ddb8d44f89f4a0b --- /dev/null +++ b/pkgs/development/tools/gauge/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gauge-${version}"; + version = "0.9.7"; + + goPackagePath = "github.com/getgauge/gauge"; + excludedPackages = ''\(build\|man\)''; + + src = fetchFromGitHub { + owner = "getgauge"; + repo = "gauge"; + rev = "v${version}"; + sha256 = "09afsi97yxlqwmrxvihravqvz17m7y402gbw4hvdk0iixa6jpq6a"; + }; + + meta = with stdenv.lib; { + description = "Light weight cross-platform test automation"; + homepage = http://gauge.org; + license = licenses.gpl3; + maintainers = [ maintainers.vdemeester ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 8f6e0dde58993cb16d3bb3587dc9128612ceee6d..9bc760bf1126edd38e4d71f39883cf4a0e76f590 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -1,20 +1,24 @@ { lib -, fetchurl +, fetchFromGitHub , rustPlatform }: with rustPlatform; buildRustPackage rec { - version = "0.19.1"; + version = "unstable-2018-02-24"; name = "geckodriver-${version}"; - src = fetchurl { - url = "https://github.com/mozilla/geckodriver/archive/v${version}.tar.gz"; - sha256 = "04zpv4aiwbig466yj24hhazl5hrapkyvwlhvg0za5599ykzdv47m"; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "gecko-dev"; + rev = "ecb86060b4c5a9808798b81a57e79e821bb47082"; + sha256 = "1am84a60adw0bb12rlhdqbiwyywhza4qp5sf4f4fmssjl2qcr6nl"; }; - cargoSha256 = "1cny8caqcd9p98hra1k7y4d3lb8sxsyaplr0svbwam0d2qc1c257"; + sourceRoot = "${src.name}/testing/geckodriver"; + + cargoSha256 = "0dvcvdb623jla29i93glx20nf8pbpfw6jj548ii6brzkcpafxxm8"; meta = with lib; { description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 7d94863ea1cb9421837862b57b81a2c17f0dfdd3..fdb6616e5fd045b3d6b4fd6cc457928bc9133885 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -43,6 +43,6 @@ buildRustPackage rec { homepage = https://github.com/git-series/git-series; license = licenses.mit; - maintainer = [ maintainers.vmandela ]; + maintainers = [ maintainers.vmandela ]; }; } diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index f6fe24cc281f9d80771741cb66e11972b11e3fa4..6a336b7015a083a3cf328b275b10014780b43226 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/pkgs/development/tools/github/cligh/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: -pythonPackages.buildPythonApplication rec { +buildPythonApplication rec { name = "cligh-${version}"; version = "0.3"; @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0d1fd78rzl2n75xpmy1gnxh1shvcs4qm0j4qqszqvfriwkg2flxn"; }; - propagatedBuildInputs = with pythonPackages; [ pyxdg PyGithub ]; + propagatedBuildInputs = [ pyxdg PyGithub ]; meta = with stdenv.lib; { homepage = http://the-brannons.com/software/cligh.html; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..58ee7699b4599c8c77d6f8d398e346d0fae2105e --- /dev/null +++ b/pkgs/development/tools/gllvm/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gllvm-${version}"; + version = "2018-02-09"; + + goPackagePath = "github.com/SRI-CSL/gllvm"; + + src = fetchFromGitHub { + owner = "SRI-CSL"; + repo = "gllvm"; + rev = "ef83222afd22452dd1277329df227a326db9f84f"; + sha256 = "068mc8q7jmpjzh6pr0ygvv39mh4k7vz0dmiacxf3pdsigy3d1y1a"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/SRI-CSL/gllvm; + description = "Whole Program LLVM: wllvm ported to go"; + license = licenses.bsd3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 86f78891b2fcffb8ae3668da948d6f9e5683b04d..fbae0a76f254fe26e93f3bf8a03c7e284250a4b6 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,36 +1,46 @@ { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi -, libX11, mesa_glu, Cocoa +, libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook +, Cocoa }: stdenv.mkDerivation rec { name = "glslviewer-${version}"; - version = "1.2"; + version = "2018-01-31"; src = fetchFromGitHub { owner = "patriciogonzalezvivo"; repo = "glslViewer"; - rev = version; - sha256 = "05ya821l2pd58anyx21mgmlm2bv78rz8cnbvqw4d9pfhq40z9psw"; + rev = "cac40f6984dbeb638950744c9508aa88591fea6c"; + sha256 = "1bykpp68hdxjlxvi1xicyb6822mz69q0adz24faaac372pls4bk0"; }; + nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + glfw libGLU glfw libXrandr libXdamage + libXext libXrender libXinerama libXcursor libXxf86vm + libXi libX11 + ] ++ (with python2Packages; [ python setuptools wrapPython ]) + ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + pythonPath = with python2Packages; [ requests.dev ]; + # Makefile has /usr/local/bin hard-coded for 'make install' preConfigure = '' substituteInPlace Makefile \ --replace '/usr/local' "$out" \ --replace '/usr/bin/clang++' 'clang++' + substituteInPlace Makefile \ + --replace 'python setup.py install' "python setup.py install --prefix=$out" ''; preInstall = '' - mkdir -p $out/bin + mkdir -p $out/bin $(toPythonPath "$out") + export PYTHONPATH=$PYTHONPATH:$(toPythonPath "$out") ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - glfw mesa_glu glfw libXrandr libXdamage - libXext libXrender libXinerama libXcursor libXxf86vm - libXi libX11 - ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + postInstall = '' + wrapPythonPrograms + ''; meta = with stdenv.lib; { description = "Live GLSL coding renderer"; diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ff03897edb29306ecc0fba83a7f8264fcfd6eca0 --- /dev/null +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -0,0 +1,26 @@ +{ stdenv, glib, autoreconfHook, pkgconfig, libgsystem, fetchgit }: + +stdenv.mkDerivation rec { + version = "2016.1"; + name = "gnome-desktop-testing-${version}"; + + src = fetchgit { + url = https://git.gnome.org/browse/gnome-desktop-testing; + rev = "v${version}"; + sha256 = "18qhmsab6jc01qrfzjx8m4799gbs72c4jg830mp0p865rcbl68dc"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib libgsystem ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "GNOME OSTree testing code"; + homepage = https://live.gnome.org/Initiatives/GnomeGoals/InstalledTests; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.jtojnar ]; + }; +} diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index f11bb83a74ab4ef45fd6b5282d91aafb297fb5b7..eeaec8eb0335b2f391afe60442d34038b70ed20f 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "gnulib-0.1-357-gffe6467"; - - phases = ["unpackPhase" "installPhase"]; + name = "gnulib-20180226"; src = fetchgit { url = "http://git.savannah.gnu.org/r/gnulib.git"; - rev = "92b60e61666f008385d9b7f7443da17c7a44d1b1"; - sha256 = "0sa1dndvaxhw0zyc19al5cmpgzlwnnznjz89lw1b4vj3xn7avjnr"; + rev = "0bec5d56c6938c2f28417bb5fd1c4b05ea2e7d28"; + sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k"; }; - installPhase = "mkdir -p $out; mv * $out/"; + dontFixup = true; + # no "make install", gnulib is a collection of source code + installPhase = '' + mkdir -p $out; mv * $out/ + ln -s $out/lib $out/include + ''; meta = { homepage = http://www.gnu.org/software/gnulib/; diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..84efaf2a4b6355729a04eaa65f0b1e3cd416c245 --- /dev/null +++ b/pkgs/development/tools/go-langserver/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-langserver-${version}"; + version = "unstable-2018-03-05"; + rev = "5d7a5dd74738978d635f709669241f164c120ebd"; + + goPackagePath = "github.com/sourcegraph/go-langserver"; + subPackages = [ "." ]; + + src = fetchFromGitHub { + inherit rev; + owner = "sourcegraph"; + repo = "go-langserver"; + sha256 = "0aih0akk3wk3332znkhr2bzxcc3parijq7n089mdahnf20k69xyz"; + }; + + meta = with stdenv.lib; { + description = "A Go language server protocol server"; + homepage = https://github.com/sourcegraph/go-langserver; + license = licenses.mit; + maintainers = with maintainers; [ johnchildren ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fe159c85c3d64feefb4591a203ecea7002ce88df --- /dev/null +++ b/pkgs/development/tools/go-outline/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-outline-${version}"; + version = "unstable-2017-08-04"; + rev = "9e9d089bb61a5ce4f8e0c8d8dc5b4e41b0e02a48"; + + goPackagePath = "github.com/ramya-rao-a/go-outline"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + inherit rev; + owner = "ramya-rao-a"; + repo = "go-outline"; + sha256 = "0kbkv4d6q9w0d41m00sqdm10l0sg56mv8y6rmidqs152mm2w13x0"; + }; + + meta = { + description = "Utility to extract JSON representation of declarations from a Go source file."; + homepage = https://github.com/ramya-rao-a/go-outline; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/go-outline/deps.nix b/pkgs/development/tools/go-outline/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..6a333b58bec6a7b21653b215343a6d3ae318365d --- /dev/null +++ b/pkgs/development/tools/go-outline/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://github.com/golang/tools"; + rev = "96b5a5404f303f074e6117d832a9873c439508f0"; + sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42"; + }; + } +] diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..361fc74c729b915cb29b909ea52c4925f5c758ff --- /dev/null +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-protobuf-${version}"; + version = "2018-01-04"; + rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; + + goPackagePath = "github.com/golang/protobuf"; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "protobuf"; + sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/golang/protobuf"; + description = " Go bindings for protocol buffer"; + maintainers = with maintainers; [ lewo ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9a8b592b038ded7855c121912d73ac37b0500d51 --- /dev/null +++ b/pkgs/development/tools/go-symbols/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "go-symbols-${version}"; + version = "unstable-2017-02-06"; + rev = "5a7f75904fb552189036c640d04cd6afef664836"; + + goPackagePath = "github.com/acroca/go-symbols"; + goDeps = ./deps.nix; + + src = fetchgit { + inherit rev; + url = "https://github.com/acroca/go-symbols"; + sha256 = "0qh2jjhwwk48gi8yii0z031bah11anxfz81nwflsiww7n426a8bb"; + }; + + meta = { + description = "A utility for extracting a JSON representation of the package symbols from a go source tree."; + homepage = https://github.com/acroca/go-symbols; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/go-symbols/deps.nix b/pkgs/development/tools/go-symbols/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..6a333b58bec6a7b21653b215343a6d3ae318365d --- /dev/null +++ b/pkgs/development/tools/go-symbols/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://github.com/golang/tools"; + rev = "96b5a5404f303f074e6117d832a9873c439508f0"; + sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42"; + }; + } +] diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e4ef9d26da2575c55ba9011dc84d2616cecad6f9 --- /dev/null +++ b/pkgs/development/tools/goconvey/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "goconvey-${version}"; + version = "1.6.3"; + + goPackagePath = "github.com/smartystreets/goconvey"; + excludedPackages = "web/server/watch/integration_testing"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "smartystreets"; + repo = "goconvey"; + rev = "${version}"; + sha256 = "1ph18rkl3ns3fgin5i4j54w5a69grrmf3apcsmnpdn1wlrbs3dxh"; + }; + + meta = { + description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go."; + homepage = https://github.com/smartystreets/goconvey; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/goconvey/deps.nix b/pkgs/development/tools/goconvey/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..d329359da7099768a8fbd8f1c4e803d02d29f4a0 --- /dev/null +++ b/pkgs/development/tools/goconvey/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "77f18212c9c7edc9bd6a33d383a7b545ce62f064"; + sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "0b37b35ec7434b77e77a4bb29b79677cced992ea"; + sha256 = "1j0adgbykl55rf2945g0n5bmqdsnjcqlx5dcmpfh4chki43hiwg9"; + }; + } +] diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index fdb53dd288f05ce83c9459390457cec0336b6513..6644c8fcfc4f7c333a496e9b3dc93c1f2835fbe2 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "godef-${version}"; - version = "20160620-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "ee532b944160bb27b6f23e4f5ef38b8fdaa2a6bd"; + version = "20170920-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "b692db1de5229d4248e23c41736b431eb665615d"; goPackagePath = "github.com/rogpeppe/godef"; excludedPackages = "go/printer/testdata"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://github.com/rogpeppe/godef"; - sha256 = "1r8c4ijjnwvb9pci4wasmq88yj0ginwly2542kw4hyg2c87j613l"; + sha256 = "0xqp9smfyznm8v2iy4wyy3kd24mga12fx0y0896qimac4hj2al15"; }; meta = { diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 54e0c53d692cee07208b079e065471e67d772a9d..89cc7eb1bfee7ed211bc57607e2f2f6e3bd4c0e0 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,41 +1,67 @@ -{ stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor -, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib -, libpulseaudio, mesa_glu, zlib }: +{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor +, libXinerama, libXrandr, libXrender, libpulseaudio ? null +, libXi ? null, libXext, libXfixes, freetype, openssl +, alsaLib, libGLU, zlib, yasm ? null }: -stdenv.mkDerivation rec { +let + options = { + touch = libXi != null; + pulseaudio = false; + }; +in stdenv.mkDerivation rec { name = "godot-${version}"; - version = "2.1.4"; + version = "3.0.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "0d2zczn5k7296sky5gllq55cxd586nx134y2iwjpkqqjr62g0h48"; + sha256 = "1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender - freetype openssl alsaLib libpulseaudio mesa_glu zlib + scons libX11 libXcursor libXinerama libXrandr libXrender + libXi libXext libXfixes freetype openssl alsaLib libpulseaudio + libGLU zlib yasm ]; - patches = [ ./pkg_config_additions.patch ]; + patches = [ + ./pkg_config_additions.patch + ./dont_clobber_environment.patch + ]; enableParallelBuilding = true; buildPhase = '' - scons platform=x11 prefix=$out -j $NIX_BUILD_CORES + scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \ + ${lib.concatStringsSep " " + (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)} ''; installPhase = '' - mkdir $out/bin -p - cp bin/godot.* $out/bin/ + mkdir -p $out/bin + cp bin/godot.x11.tools.* $out/bin/godot + + mkdir -p "$out/share/applications" + cp misc/dist/linux/godot.desktop "$out/share/applications/" + substituteInPlace "$out/share/applications/godot.desktop" \ + --replace "Exec=godot" \ + "Exec=$out/bin/godot" + + mkdir -p "$out/share/icons/hicolor/scalable/apps/" + cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg" + cp icon.png "$out/share/icons/godot.png" + + mkdir -p "$out/share/man/man6" + cp misc/dist/linux/godot.6 "$out/share/man/man6/" ''; meta = { homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.twey ]; }; } diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch new file mode 100644 index 0000000000000000000000000000000000000000..c57c85588a016b860b6e1792fd47e5c3c64526c4 --- /dev/null +++ b/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -0,0 +1,16 @@ ++++ build/SConstruct +@@ -69,10 +69,10 @@ + custom_tools = ['mingw'] + + env_base = Environment(tools=custom_tools) +-if 'TERM' in os.environ: +- env_base['ENV']['TERM'] = os.environ['TERM'] +-env_base.AppendENVPath('PATH', os.getenv('PATH')) +-env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH')) ++for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): ++ if (k in os.environ): ++ env_base["ENV"][k] = os.environ[k] ++ + env_base.global_defaults = global_defaults + env_base.android_maven_repos = [] + env_base.android_flat_dirs = [] diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index c4675322e2b3bd17e99756551e02f41731f19ed0..286372f060ae727e701b5a026e2bad50787c5511 100644 --- a/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,12 +1,13 @@ -+++ build/platform/x11/detect.py -@@ -139,6 +139,10 @@ - env.ParseConfig('pkg-config xinerama --cflags --libs') ++++ b/platform/x11/detect.py +@@ -142,6 +142,11 @@ env.ParseConfig('pkg-config xcursor --cflags --libs') + env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xrandr --cflags --libs') + env.ParseConfig('pkg-config xrender --cflags --libs') -+ env.ParseConfig('pkg-config osmesa --cflags') ++ env.ParseConfig('pkg-config xext --cflags --libs') ++ env.ParseConfig('pkg-config xfixes --cflags --libs') + env.ParseConfig('pkg-config glu --cflags --libs') + env.ParseConfig('pkg-config zlib --cflags --libs') - - if (env['builtin_openssl'] == 'no'): - # Currently not compatible with OpenSSL 1.1.0+ + + if (env['touch']): + x11_error = os.system("pkg-config xi --modversion > /dev/null ") diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index c54a924a1a65393a13c31a23251103059b1df57a..99f049314ae801f64a8f27444baa4ac4ec6b713c 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "lint-${version}"; - version = "20160428-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "c7bacac2b21ca01afa1dee0acf64df3ce047c28f"; + version = "20180208-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d"; goPackagePath = "github.com/golang/lint"; excludedPackages = "testdata"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://github.com/golang/lint"; - sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg"; + sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix index f03bf9b5b23b77da8295a253d1fa565ecc79af3c..caf3615c666b28fb97cdf33501008c66e52e0d8f 100644 --- a/pkgs/development/tools/golint/deps.nix +++ b/pkgs/development/tools/golint/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; - sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + rev = "66487607e2081c7c2af2281c62c14ee000d5024b"; + sha256 = "03wiraqkms4jb5gi7vmp52mpmp4av08yw4gr2nk31c2rnhyd3jv4"; }; } ] diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f1452bc121148a9d9f2f54f3200433b9d49465a3 --- /dev/null +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "gomodifytags-${version}"; + version = "unstable-2017-12-14"; + rev = "20644152db4fe0ac406d81f3848e8a15f0cdeefa"; + + goPackagePath = "github.com/fatih/gomodifytags"; + + src = fetchgit { + inherit rev; + url = "https://github.com/fatih/gomodifytags"; + sha256 = "0k0ly3mmm9zcaxwlzdbvdxr2gn7kvcqzk1bb7blgq7fkkzpp7i1q"; + }; + + meta = { + description = "Go tool to modify struct field tags."; + homepage = https://github.com/fatih/gomodifytags; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 2041491cf80d23b9fdd55a0ac7d7cc1a39a95505..c85186e1c0b29fcf8d185d05fc02dff00911961a 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -4,17 +4,17 @@ with python27Packages; stdenv.mkDerivation rec { name = "google-app-engine-go-sdk-${version}"; - version = "1.9.55"; + version = "1.9.61"; 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"; + sha256 = "1i2j9ympl1218akwsmm7yb31v0gibgpzlb657bcravi1irfv1hhs"; } else fetchzip { url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_darwin_amd64-${version}.zip"; - sha256 = "0b8r2fqg9m285ifz0jahd4wasv7cq61nr6p1k664w021r5y5lbvr"; + sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp"; }; buildInputs = [python27 makeWrapper]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -r "$src" "$out/share/go_appengine" # create wrappers with correct env - for i in goapp appcfg.py; do + for i in goapp go-app-stager *.py; do makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \ --prefix PATH : "${python27}/bin" \ --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})" diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..298657fe38c57c5995f791c96afbbd82851213b9 --- /dev/null +++ b/pkgs/development/tools/gopkgs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gopkgs-${version}"; + version = "unstable-2017-12-29"; + rev = "b2ea2ecd37740e6ce0e020317d90c729aab4dc6d"; + + goPackagePath = "github.com/uudashr/gopkgs"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + inherit rev; + owner = "uudashr"; + repo = "gopkgs"; + sha256 = "1hwzxrf2h8xjbbx6l86mjpjh4csxxsy17zkh8h3qzncyfnsnczzg"; + }; + + meta = { + description = "Tool to get list available Go packages."; + homepage = https://github.com/uudashr/gopkgs; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/gopkgs/deps.nix b/pkgs/development/tools/gopkgs/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..0f72ee3e5e0fc599323e6f6a610128043a8a19db --- /dev/null +++ b/pkgs/development/tools/gopkgs/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/MichaelTJones/walk"; + fetch = { + type = "git"; + url = "https://github.com/MichaelTJones/walk"; + rev = "4748e29d5718c2df4028a6543edf86fd8cc0f881"; + sha256 = "03bc3cql3w8cx05xlnzxsff59c6679rcpx4njzk86k00blkkizv7"; + }; + } +] diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ccdab780e6cfac448129ccbca5b9ae35984e25e1 --- /dev/null +++ b/pkgs/development/tools/gotests/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gotests-${version}"; + version = "1.5.2"; + rev = "v${version}"; + + goPackagePath = "github.com/cweill/gotests"; + excludedPackages = "testdata"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + inherit rev; + owner = "cweill"; + repo = "gotests"; + sha256 = "0ff2jvpc1xb5jr6dv9izlpfavxaivzirqmdmicpznrqjz0d56pri"; + }; + + meta = { + description = "Generate Go tests from your source code."; + homepage = https://github.com/cweill/gotests; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/gotests/deps.nix b/pkgs/development/tools/gotests/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..6a333b58bec6a7b21653b215343a6d3ae318365d --- /dev/null +++ b/pkgs/development/tools/gotests/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://github.com/golang/tools"; + rev = "96b5a5404f303f074e6117d832a9873c439508f0"; + sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42"; + }; + } +] diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 92bb619be70afda2681a66f53ca4d911a4d2218b..65bc55c6d8d7ba30e4e40710dad916a8470d4e17 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,18 +1,25 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gox-${version}"; - version = "20140904-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549"; + version = "0.4.0"; - goPackagePath = "github.com/mitchellh/gox"; - src = fetchgit { - inherit rev; - url = "https://github.com/mitchellh/gox"; - sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "gox"; + rev = "v${version}"; + sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r"; }; goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/mitchellh/gox; + description = "A dead simple, no frills Go cross compile tool"; + platforms = platforms.all; + license = licenses.mpl20; + }; + } diff --git a/pkgs/development/tools/gox/deps.nix b/pkgs/development/tools/gox/deps.nix index d15b8e7c0916cbd220abc975650266d862dd7fe9..c4991e38ff0262e7b1cb2825e6c0ad3e581971cb 100644 --- a/pkgs/development/tools/gox/deps.nix +++ b/pkgs/development/tools/gox/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/iochan"; - rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; - sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7"; + sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx"; }; } ] diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..461110b63d71b2c0f96c268dbffa2d36371c8ac2 --- /dev/null +++ b/pkgs/development/tools/gpp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "gpp-${version}"; + version = "2.25"; + + src = fetchFromGitHub { + owner = "logological"; + repo = "gpp"; + rev = "96c5dd8905384ea188f380f51d24cbd7fd58f642"; + sha256 = "0bvhnx3yfhbfiqqhhz6k2a596ls5rval7ykbp3jl5b6062xj861b"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + installCheckPhase = "$out/bin/gpp --help"; + doInstallCheck = true; + + meta = with stdenv.lib; { + description = "General-purpose preprocessor with customizable syntax"; + homepage = "https://logological.org/gpp"; + license = licenses.lgpl3; + maintainers = with maintainers; [ nmattia ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..59f7360df2aeec688ebbcdcb6087d5adbc1c2f6e --- /dev/null +++ b/pkgs/development/tools/gron/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gron-${version}"; + version = "0.5.1"; + + owner = "tomnomnom"; + repo = "gron"; + goPackagePath = "github.com/${owner}/${repo}"; + + src = fetchFromGitHub { + inherit owner repo; + rev = "v${version}"; + sha256 = "1s688ynjddchviwbiggnfbw28s4wsff2941f4b1q1j7mfak7iym2"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Make JSON greppable!"; + longDescription = '' + gron transforms JSON into discrete assignments to make it easier to grep + for what you want and see the absolute 'path' to it. It eases the + exploration of APIs that return large blobs of JSON but have terrible + documentation. + ''; + homepage = "https://github.com/tomnomnom/gron"; + license = licenses.mit; + maintainers = [ maintainers.fgaz ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/tools/gron/deps.nix b/pkgs/development/tools/gron/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..c5b1feb888ae5a33ba6ec89fe52d87efe5dbc9fe --- /dev/null +++ b/pkgs/development/tools/gron/deps.nix @@ -0,0 +1,35 @@ +[ + rec { + owner = "fatih"; + repo = "color"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "v1.6.0"; + sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; + }; + } + rec { + owner = "nwidger"; + repo = "jsoncolor"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40"; + sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; + }; + } + rec { + owner = "pkg"; + repo = "errors"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } +] diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 19441c5401796c52b928976d152114a23cc1cac9..fd9347a4007fae06ebda6be970b4be11ce325ef2 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "exec guile" "exec ${guile}/bin/guile" ''; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { description = "Checks syntax and semantics in a Guile program or module"; diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..31697750a702e18c7b63cb26e7fd92b2a3432ee9 --- /dev/null +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, writeText, jshon, electron, hyper-haskell-server, extra-packages ? [] }: + +let + binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); + +in stdenv.mkDerivation rec { + name = "hyper-haskell-${version}"; + version = "0.1.0.2"; + + src = fetchFromGitHub { + owner = "HeinrichApfelmus"; + repo = "hyper-haskell"; + rev = "v${version}"; + sha256 = "1k38h7qx12z7463z8466pji0nwfkp4qkg7q83kns2mzmwmw5jnmb"; + }; + + propagatedBuildInputs = extra-packages; + + buildCommand = '' + mkdir -p $out/bin $out/share/hyper-haskell/worksheets $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/mime/packages + + # Electron app + cp -R $src/app $out + + # Desktop Launcher + cp $src/resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop + cp $src/resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg + cp $src/resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml + + # install example worksheets with backend set to nix + for worksheet in "$src/worksheets/"*.hhs; do + ${jshon}/bin/jshon -e settings -s nix -i packageTool -p < $worksheet > $out/share/hyper-haskell/worksheets/`basename $worksheet` + done + + # install electron wrapper script + cat > $out/bin/hyper-haskell < cfr - #!${stdenv.shell} - exec ${jre}/bin/java -jar $jar "\''${@}" - EOF - install -Dm755 cfr $out/bin/cfr + buildCommand = '' + jar=$out/share/java/cfr_${version}.jar + install -Dm444 $src $jar + makeWrapper ${jre}/bin/java $out/bin/cfr --add-flags "-jar $jar" ''; meta = with stdenv.lib; { @@ -35,6 +27,5 @@ stdenv.mkDerivation rec { homepage = http://www.benf.org/other/cfr/; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..03aa841dc7b2280d9e2a6e789a73af18fa977c1a --- /dev/null +++ b/pkgs/development/tools/java/jhiccup/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "jhiccup-${version}"; + version = "2.0.8"; + + src = fetchzip { + url = "https://www.azul.com/files/jHiccup-${version}-dist.zip"; + sha256 = "1q4wd5ywisgh0f4ic7iglxai0gc8mnl1pkjw1hm1xdij8j5i488g"; + }; + + configurePhase = ":"; + buildPhase = ":"; + installPhase = '' + mkdir -p $out/bin $out/share/java + cp *.jar $out/share/java + + # Fix version number (out of date at time of import), and path to + # jHiccup.jar + for x in ./jHiccup ./jHiccupLogProcessor; do + substituteInPlace $x \ + --replace 'JHICCUP_Version=2.0.5' 'JHICCUP_Version=${version}' \ + --replace '$INSTALLED_PATH' $out/share/java + done + + mv jHiccup jHiccupLogProcessor $out/bin/ + ''; + + meta = { + description = "Measure JVM application stalls and GC pauses"; + homepage = https://www.azul.com/jhiccup/; + license = stdenv.lib.licenses.cc0; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index a71ee53dced9e079a62c9f2741645f423a510c5e..2eeefb23e0427b26813b627a497055d7ee74998a 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2, gawk }: +{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }: stdenv.mkDerivation rec { - name = "visualvm-1.3.9"; + version = "1.4"; + name = "visualvm-${version}"; src = fetchzip { - url = "https://github.com/visualvm/visualvm.src/releases/download/1.3.9/visualvm_139.zip"; - sha256 = "1gkdkxssh51jczhgv680i42jjrlia1vbpcqhxvf45xcq9xj95bm5"; + url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; + sha256 = "0qpkal3yc8c8di4dmdglq54a4m7hciqximn5n6hwx2zqnfwx909z"; + }; + + desktopItem = makeDesktopItem { + name = "visualvm"; + exec = "visualvm"; + comment = "Java Troubleshooting Tool"; + desktopName = "VisualVM"; + genericName = "Java Troubleshooting Tool"; + categories = "Application;Development;"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - rm bin/visualvm.exe - rm platform/lib/nbexec64.exe - rm platform/lib/nbexec.exe - rm profiler/lib/deployed/jdk15/windows-amd64/profilerinterface.dll - rm profiler/lib/deployed/jdk15/windows/profilerinterface.dll - rm profiler/lib/deployed/jdk16/windows-amd64/profilerinterface.dll - rm profiler/lib/deployed/jdk16/windows/profilerinterface.dll - rm platform/modules/lib/amd64/jnidispatch-410.dll - rm platform/modules/lib/x86/jnidispatch-410.dll - rm platform/lib/nbexec.dll - rm platform/lib/nbexec64.dll + find . -type f -name "*.dll" -o -name "*.exe" -delete; substituteInPlace etc/visualvm.conf \ --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \ @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = https://visualvm.java.net/; license = licenses.gpl2ClasspathPlus; platforms = platforms.all; - maintainers = with maintainers; [ michalrus ]; + maintainers = with maintainers; [ michalrus moaxcp ]; }; } diff --git a/pkgs/development/tools/jazzy/Gemfile b/pkgs/development/tools/jazzy/Gemfile new file mode 100644 index 0000000000000000000000000000000000000000..27c230a9829ad4be016a6417ec4ef4100c70a12d --- /dev/null +++ b/pkgs/development/tools/jazzy/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'jazzy' diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock new file mode 100644 index 0000000000000000000000000000000000000000..b8fc28a740e876879427008d82f3625ff8b170d4 --- /dev/null +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -0,0 +1,100 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.5) + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + claide (1.0.2) + cocoapods (1.3.1) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.3.1) + cocoapods-deintegrate (>= 1.0.1, < 2.0) + cocoapods-downloader (>= 1.1.3, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.2.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (~> 2.0.1) + gh_inspector (~> 1.0) + molinillo (~> 0.5.7) + nap (~> 1.0) + ruby-macho (~> 1.1) + xcodeproj (>= 1.5.1, < 2.0) + cocoapods-core (1.3.1) + activesupport (>= 4.0.2, < 6) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.1) + cocoapods-downloader (1.1.3) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.0.0) + cocoapods-trunk (1.3.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.1.0) + colored2 (3.1.2) + concurrent-ruby (1.0.5) + escape (0.0.4) + ffi (1.9.18) + fourflusher (2.0.1) + fuzzy_match (2.0.4) + gh_inspector (1.0.3) + i18n (0.9.0) + concurrent-ruby (~> 1.0) + jazzy (0.9.0) + cocoapods (~> 1.0) + mustache (~> 0.99) + open4 + redcarpet (~> 3.2) + rouge (~> 1.5) + sass (~> 3.4) + sqlite3 (~> 1.3) + xcinvoke (~> 0.3.0) + liferaft (0.0.6) + minitest (5.10.3) + molinillo (0.5.7) + mustache (0.99.8) + nanaimo (0.2.3) + nap (1.1.0) + netrc (0.11.0) + open4 (1.3.4) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + redcarpet (3.4.0) + rouge (1.11.1) + ruby-macho (1.1.0) + sass (3.5.3) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sqlite3 (1.3.13) + thread_safe (0.3.6) + tzinfo (1.2.4) + thread_safe (~> 0.1) + xcinvoke (0.3.0) + liferaft (~> 0.0.6) + xcodeproj (1.5.3) + CFPropertyList (~> 2.3.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.3) + +PLATFORMS + ruby + +DEPENDENCIES + jazzy + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7d96e2c07d26dcaf4fa126f7ac042c8e09d8d321 --- /dev/null +++ b/pkgs/development/tools/jazzy/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + inherit ruby; + pname = "jazzy"; + gemdir = ./.; + + meta = with lib; { + description = "A command-line utility that generates documentation for Swift or Objective-C"; + homepage = https://github.com/realm/jazzy; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ + peterromfeldhk + ]; + }; +} diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix new file mode 100644 index 0000000000000000000000000000000000000000..a88724a3de308373484933bae2b76035588f612f --- /dev/null +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -0,0 +1,343 @@ +{ + activesupport = { + dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + type = "gem"; + }; + version = "4.2.10"; + }; + CFPropertyList = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06dddgcai6nay552h8wmnb2m93xx5hni48s16vkbf9vbym4nfw5x"; + type = "gem"; + }; + version = "2.3.5"; + }; + claide = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + type = "gem"; + }; + version = "1.0.2"; + }; + cocoapods = { + dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050b7795jc6802wcpcgi702qkgy8vjidgq6c6mbx2alrq7l0n8q7"; + type = "gem"; + }; + version = "1.3.1"; + }; + cocoapods-core = { + dependencies = ["activesupport" "fuzzy_match" "nap"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pr42lpqs6q51gnnfxmgmbx7sw0dwyawylssj588izj8av18rhpy"; + type = "gem"; + }; + version = "1.3.1"; + }; + cocoapods-deintegrate = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x4hxlip6zkrs1vcmw7sh45ayn5pxvsg782iifnmgjwn2pyskj7l"; + type = "gem"; + }; + version = "1.0.1"; + }; + cocoapods-downloader = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1664qg1wml70slcfklpnyq5ixp145f6iyn3c6pcqkqc64i1bsg87"; + type = "gem"; + }; + version = "1.1.3"; + }; + cocoapods-plugins = { + dependencies = ["nap"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16na82sfyc8801qs1n22nwq486s4j7yj6rj7fcp8cbxmj371fpbj"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-search = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-stats = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfcwq2vq6cadj1811jdjys3d28pmk2r2a83px6w94rz6i19axid"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-trunk = { + dependencies = ["nap" "netrc"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0shxr64j7f50yglp5l90vr1ba5p9pkk0a3b8apkbci2lmq5kq60b"; + type = "gem"; + }; + version = "1.3.0"; + }; + cocoapods-try = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + type = "gem"; + }; + version = "1.1.0"; + }; + colored2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + type = "gem"; + }; + version = "1.0.5"; + }; + escape = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sa1xkfc9jvkwyw1jbz3jhkq0ms1zrvswi6mmfiwcisg5fp497z4"; + type = "gem"; + }; + version = "0.0.4"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + type = "gem"; + }; + version = "1.9.18"; + }; + fourflusher = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5"; + type = "gem"; + }; + version = "2.0.1"; + }; + fuzzy_match = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19gw1ifsgfrv7xdi6n61658vffgm1867f4xdqfswb2b5h6alzpmm"; + type = "gem"; + }; + version = "2.0.4"; + }; + gh_inspector = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x"; + type = "gem"; + }; + version = "1.0.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h5wygnbpxas8kwhqkwk6n4s334dxyxvlxykc6mxfndb0m56166r"; + type = "gem"; + }; + version = "0.9.0"; + }; + jazzy = { + dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sass" "sqlite3" "xcinvoke"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vvyszmpnzm0my5fp50z5bnqij6zq3cig2p46vgl683hsm48ldsq"; + type = "gem"; + }; + version = "0.9.0"; + }; + liferaft = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kasbbx84gzsxx8w8bgr6xjg43h9bvzzaqg7si8jirnja8yc27k3"; + type = "gem"; + }; + version = "0.0.6"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05521clw19lrksqgvg2kmm025pvdhdaniix52vmbychrn2jm7kz2"; + type = "gem"; + }; + version = "5.10.3"; + }; + molinillo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758"; + type = "gem"; + }; + version = "0.5.7"; + }; + mustache = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + type = "gem"; + }; + version = "0.99.8"; + }; + nanaimo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd"; + type = "gem"; + }; + version = "0.2.3"; + }; + nap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll"; + type = "gem"; + }; + version = "1.1.0"; + }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + open4 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; + type = "gem"; + }; + version = "1.3.4"; + }; + rb-fsevent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + type = "gem"; + }; + version = "0.10.2"; + }; + rb-inotify = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + type = "gem"; + }; + version = "0.9.10"; + }; + redcarpet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + type = "gem"; + }; + version = "3.4.0"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13amckbdknnc5491ag28y8pqbyfpbzx5n4rlmadxhd3wkrhp92c8"; + type = "gem"; + }; + version = "1.11.1"; + }; + ruby-macho = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i9vkz3ki3yvps4z1hca2q2axniq95x4yypnc22p9pcfjdfrbrq6"; + type = "gem"; + }; + version = "1.1.0"; + }; + sass = { + dependencies = ["sass-listen"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1167camc4ccqf9lcjlpyf96ji00f0041i7xanj2nm41fkx7kr7kr"; + type = "gem"; + }; + version = "3.5.3"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + type = "gem"; + }; + version = "4.0.0"; + }; + sqlite3 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + type = "gem"; + }; + version = "1.3.13"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp"; + type = "gem"; + }; + version = "1.2.4"; + }; + xcinvoke = { + dependencies = ["liferaft"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16pyq7wvx2c0fywrqxk3vg6psa3yjhbd7hw7hv2mjim6myjkdsb7"; + type = "gem"; + }; + version = "0.3.0"; + }; + xcodeproj = { + dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7"; + type = "gem"; + }; + version = "1.5.3"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/jazzy/update b/pkgs/development/tools/jazzy/update new file mode 100755 index 0000000000000000000000000000000000000000..58a7bd4a4539540f9d76cea9438946a43f13954a --- /dev/null +++ b/pkgs/development/tools/jazzy/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -rf ~/.gem +fi diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f4fb1b5a9e9c7272843ed840878e0238665ce973 --- /dev/null +++ b/pkgs/development/tools/jbake/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip, makeWrapper, jre }: + +stdenv.mkDerivation rec { + version = "2.6.1"; + name = "jbake-${version}"; + + src = fetchzip { + url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; + sha256 = "0zlh2azmv8gj3c4d4ndivar31wd42nmvhxq6xhn09cib9kffxbc7"; + }; + + buildInputs = [ makeWrapper jre ]; + + installPhase = '' + mkdir -p $out + cp -vr * $out + wrapProgram $out/bin/jbake --set JAVA_HOME "${jre}" + ''; + + meta = with stdenv.lib; { + description = "JBake is a Java based, open source, static site/blog generator for developers & designers"; + homepage = "https://jbake.org/"; + license = licenses.mit; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix deleted file mode 100644 index 9c52ac615514523d9e219baac82d5447fb278fe7..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/jid/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: - -buildGoPackage rec { - name = "jid-${version}"; - version = "0.7.1"; - rev = "${version}"; - - goPackagePath = "github.com/simeji/jid"; - - src = fetchFromGitHub { - owner = "simeji"; - repo = "jid"; - inherit rev; - sha256 = "08snlqqch91w88zysfcavmqsafq93zzpkdjqkq1y7hx516fdaz1w"; - }; - - goDeps = ./deps.nix; - - meta = with stdenv.lib; { - description = "Incremental JSON digger"; - license = licenses.mit; - maintainers = [ maintainers.profpatsch ]; - }; -} diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix deleted file mode 100644 index c3ec502b2a998087c58287009abed5ba4bcc07de..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/jid/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/bitly/go-simplejson"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-simplejson"; - rev = "aabad6e819789e569bd6aabf444c935aa9ba1e44"; - sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "e8e01ee22a7d4a91b49646e39245fe08e69c7878"; - sha256 = "1660g29qhshk6zxhpnc0f52m69jdqqdw2ccbkqw9y4kilnripfvl"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "d228849504861217f796da67fae4f6e347643f15"; - sha256 = "0ch5sfcpmqczsh8kjbwpzdw31lacbkfyzvpzh4disnhhydbxjq0d"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "30a891c33c7cde7b02a981314b4228ec99380cca"; - sha256 = "03gsxn89pgkj4jkxm9avnj4f0ckvcskc6fj2lcd98l3akrz50ndg"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "737072b4e32b7a5018b4a7125da8d12de90e8045"; - sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; - sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv"; - }; - } - { - goPackagePath = "github.com/nwidger/jsoncolor"; - fetch = { - type = "git"; - url = "https://github.com/nwidger/jsoncolor"; - rev = "0192e84d44af834c3a90c8a17bf670483b91ad5a"; - sha256 = "17mndgd1d233c22bd19xv4v2l2i5k8kz7y6n4n54a9i7fi9d10al"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302"; - sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks"; - }; - } -] diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ea62142845825d07972ca9f1e78f53987c4bfcad --- /dev/null +++ b/pkgs/development/tools/jl/default.nix @@ -0,0 +1,28 @@ +{ mkDerivation, fetchFromGitHub +, aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra +, containers, exceptions, mtl, optparse-simple, parsec, scientific, stdenv +, text, unordered-containers, vector +}: +mkDerivation rec { + pname = "jl"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "chrisdone"; + repo = "jl"; + rev = "v${version}"; + sha256 = "0wsdfj4m729q0kjpkn0ywpncdhvpvvprd4rh45vcg6kjw20krm3r"; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions mtl parsec + scientific text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring conduit conduit-extra containers + mtl optparse-simple text vector + ]; + license = stdenv.lib.licenses.bsd3; + description = "Functional sed for JSON"; + maintainers = with stdenv.lib.maintainers; [ fgaz ]; +} diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix index 09b5edeeecdfa49e0bcd91fda5f9b4620999a4c5..a730cde042e2bd5f30569c94c0bcd5aef7fe9ff1 100644 --- a/pkgs/development/tools/jo/default.nix +++ b/pkgs/development/tools/jo/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "jo-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "jpmens"; repo = "jo"; rev = "v${version}"; - sha256="0vyi0aaxsp6x3cvym7mlcfdsxjhj5h0b00mqc42mg8kc95cyp2c1"; + sha256="1gn9fa37mfb85dfjznyfgciibf142kp0gisc2l2pnz0zrakbvvy3"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock index d3e1556a7b39fbe13fd4e35e30f8e0ff5f0e86e6..2a95d72c946500607cb7eabe6ce771e61ed8472b 100644 --- a/pkgs/development/tools/jsduck/Gemfile.lock +++ b/pkgs/development/tools/jsduck/Gemfile.lock @@ -8,7 +8,7 @@ GEM parallel (~> 0.7.1) rdiscount (~> 2.1.6) rkelly-remix (~> 0.0.4) - json (1.8.3) + json (1.8.6) parallel (0.7.1) rdiscount (2.1.8) rkelly-remix (0.0.7) diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/development/tools/jsduck/gemset.nix index d80bd70dd728da841734ccd67d78c57f3f4878fa..493cc42f4f4e23bec1d0b905e1b9e6ab4cc30fac 100644 --- a/pkgs/development/tools/jsduck/gemset.nix +++ b/pkgs/development/tools/jsduck/gemset.nix @@ -19,10 +19,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.6"; }; parallel = { source = { @@ -48,4 +48,4 @@ }; version = "0.0.7"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d53b39021339d1d02018e2e788269a0d1a209907 --- /dev/null +++ b/pkgs/development/tools/json2hcl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "json2hcl"; + name = "${pname}-${version}"; + version = "0.0.6"; + + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = "v${version}"; + sha256 = "0knil88n2w41w3nzqz6ljgfjkl5r3x0bh7ifqgiyf6sin3pl4pn0"; + }; + + owner = "kvz"; + goPackagePath = "github.com/${owner}/${pname}"; + goDeps = ./deps.nix; + + meta = with lib; { + description = "Convert JSON to HCL, and vice versa"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.matthewbauer ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/json2hcl/deps.nix b/pkgs/development/tools/json2hcl/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..bb9df28ad87f3f203c259097ed8bf51287a4a0de --- /dev/null +++ b/pkgs/development/tools/json2hcl/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/Acconut/hcl"; + fetch = { + type = "git"; + url = "https://github.com/Acconut/hcl"; + rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; + sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; + sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; + }; + } +] diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 261d16367d40872d8eb05b8961beb3a7cce5c6f5..9e41ef3813180cf49e45203af1a11fce112d5343 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "leaps-${version}"; - version = "0.5.1"; + version = "0.9.0"; - goPackagePath = "github.com/jeffail/leaps"; + goPackagePath = "github.com/Jeffail/leaps"; src = fetchFromGitHub { - owner = "jeffail"; + owner = "Jeffail"; repo = "leaps"; - sha256 = "0w63y777h5qc8fwnkrbawn3an9px0l1zz3649x0n8lhk125fvchj"; + sha256 = "1bzas7ixyfsfh81lnvplhx59yghkmnmy5p7jv9rnwp219dwbylpz"; rev = "v${version}"; }; @@ -20,7 +20,7 @@ buildGoPackage rec { homepage = https://github.com/jeffail/leaps/; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; - meta.platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/leaps/deps.nix b/pkgs/development/tools/leaps/deps.nix index d611d9b4954098744c0fc2feafbd169c478ad36f..afaf42779b3eed777a0165f18f196d6544ff1872 100644 --- a/pkgs/development/tools/leaps/deps.nix +++ b/pkgs/development/tools/leaps/deps.nix @@ -1,94 +1,185 @@ -[ - { - goPackagePath = "github.com/amir/raidman"; - fetch = { - type = "git"; - url = "https://github.com/amir/raidman"; - rev = "91c20f3f475cab75bb40ad7951d9bbdde357ade7"; - sha256 = "0pkqy5hzjkk04wj1ljq8jsyla358ilxi4lkmvkk73b3dh2wcqvpp"; - }; - } - { - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/go-bindata-assetfs"; - rev = "57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2"; - sha256 = "1za29pa15y2xsa1lza97jlkax9qj93ks4a2j58xzmay6rczfkb9i"; - }; - } - { - goPackagePath = "github.com/garyburd/redigo"; - fetch = { - type = "git"; - url = "https://github.com/garyburd/redigo"; - rev = "8873b2f1995f59d4bcdd2b0dc9858e2cb9bf0c13"; - sha256 = "1lzhb99pcwwf5ddcs0bw00fwf9m1d0k7b92fqz2a01jlij4pm5l2"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "7ebe0a500653eeb1859664bed5e48dec1e164e73"; - sha256 = "1gyan3lyn2j00di9haq7zm3zcwckn922iigx3fvml6s2bsp6ljas"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "bf531ff1a004f24ee53329dfd5ce0b41bfdc17df"; - sha256 = "10lnvmq28jp2wk1xc32mdk4745lal2bmdvbjirckb9wlv07zzzf0"; - }; - } - { - goPackagePath = "github.com/jeffail/gabs"; - fetch = { - type = "git"; - url = "https://github.com/jeffail/gabs"; - rev = "ee1575a53249b51d636e62464ca43a13030afdb5"; - sha256 = "0svv57193n8m86r7v7n0y9lny0p6nzr7xvz98va87h00mg146351"; - }; - } - { - goPackagePath = "github.com/jeffail/util"; - fetch = { - type = "git"; - url = "https://github.com/jeffail/util"; - rev = "48ada8ff9fcae546b5986f066720daa9033ad523"; - sha256 = "0k8zz7gdv4hb691fdyb5mhlixppcq8x4ny84fanflypnv258a3i0"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "3cd0097429be7d611bb644ef85b42bfb102ceea4"; - sha256 = "1q7qfzyfgjk6rvid548r43fi4jhvsh4dhfvfjbp2pz4xqsvpsm7a"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "f9ab0dce87d815821e221626b772e3475a0d2749"; - sha256 = "0z18j6zxq9kw4lgcpmhh3k7jrb9gy1lx252xz5qhs4ywi9w77xwi"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; - sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; - }; - } -] + # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) + [ + + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722"; + sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r"; + }; + } + + { + goPackagePath = "github.com/Jeffail/gabs"; + fetch = { + type = "git"; + url = "https://github.com/Jeffail/gabs"; + rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c"; + sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr"; + }; + } + + { + goPackagePath = "github.com/amir/raidman"; + fetch = { + type = "git"; + url = "https://github.com/amir/raidman"; + rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; + sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; + }; + } + + { + goPackagePath = "github.com/azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/azure/azure-sdk-for-go"; + rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f"; + sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq"; + }; + } + + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "61153c768f31ee5f130071d08fc82b85208528de"; + sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; + }; + } + + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } + + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; + sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; + }; + } + + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "d1ed5c67e5794de818ea85e6b522fda02623a484"; + sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24"; + }; + } + + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "a0583e0143b1624142adab07e0e97fe106d99561"; + sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; + sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + }; + } + + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "88edab0803230a3898347e77b474f8c1820a1f20"; + sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p"; + }; + } + + { + goPackagePath = "github.com/marstr/guid"; + fetch = { + type = "git"; + url = "https://github.com/marstr/guid"; + rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca"; + sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x"; + }; + } + + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; + sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; + }; + } + + { + goPackagePath = "gopkg.in/alexcesaro/statsd.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alexcesaro/statsd.v2"; + rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90"; + sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj"; + }; + } + + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } + +] \ No newline at end of file diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1e2a421a67025cf7aca3de123625d670620098d9 --- /dev/null +++ b/pkgs/development/tools/librarian-puppet-go/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "librarian-puppet-go-${version}"; + version = "0.3.9"; + + goPackagePath = "github.com/tmtk75/librarian-puppet-go"; + + src = fetchFromGitHub { + owner = "tmtk75"; + repo = "librarian-puppet-go"; + rev = "v${version}"; + sha256 = "19x2hz3b8xkhy2nkyjg6s4qvs55mh84fvjwp157a86dmxwkdf45y"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + inherit (src.meta) homepage; + description = "librarian-puppet implementation in go."; + license = licenses.unfree; # still unspecified https://github.com/tmtk75/librarian-puppet-go/issues/5 + maintainers = with maintainers; [ womfoo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/librarian-puppet-go/deps.nix b/pkgs/development/tools/librarian-puppet-go/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..e5729707d8abd6eac5794bd2c704b168d6d8c35d --- /dev/null +++ b/pkgs/development/tools/librarian-puppet-go/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/jawher/mow.cli"; + fetch = { + type = "git"; + url = "https://github.com/jawher/mow.cli"; + rev = "3ff64ca21987cfa628bd8d1865162b7ccd6107d7"; + sha256 = "0vws79q4x3c9kjdsin3vw5200sinkxag3bfa0n9k69svsb222bij"; + }; + } +] diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 1f4c21cb7f9c1f7a5d615deaddbd606532cab64c..0271cbee92c17b0fc72932f97a04e4f9f8810153 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { name = "libsigrok-${version}"; src = fetchurl { - url = "http://sigrok.org/download/source/libsigrok/${name}.tar.gz"; + url = "https://sigrok.org/download/source/libsigrok/${name}.tar.gz"; inherit sha256; }; firmware = fetchurl { - url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz"; + url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz"; sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Core library of the sigrok signal analysis software suite"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 57bb159c58631d94f27400adfdaf623e224d5e26..9fd70cb60c9622a8b824be70ad578ea03c8bfbd4 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.5.0"; + name = "libsigrokdecode-0.5.1"; src = fetchurl { - url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; - sha256 = "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a"; + url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; + sha256 = "07mmb6s62ncqqgsc6szilj2yxixf6gg99ggbzsjlbhp4b9aqnga9"; }; nativeBuildInputs = [ pkgconfig ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Protocol decoding library for the sigrok signal analysis software suite"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4bc3e77dbaa714a592f516671fa532b997103968 --- /dev/null +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit, dmd, dub }: + +stdenv.mkDerivation { + name = "Literate-2017-05-28"; + + src = fetchgit { + url = "https://github.com/zyedidia/Literate.git"; + rev = "23928d64bb19b5101dbcc794da6119beaf59f679"; + sha256 = "094lramvacarzj8443ns18zyv7dxnivwi7kdk5xi5r2z4gx338iq"; + }; + + buildInputs = [ dmd dub ]; + + installPhase = "install -D bin/lit $out/bin/lit"; + + meta = with stdenv.lib; { + description = "A literate programming tool for any language"; + homepage = http://literate.zbyedidia.webfactional.com/; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 00c2663e3a4683b451e0f2a6716731d3bf72d872..d569b8d3068747818e84680a20a40bb3388e7fd5 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.0.14"; + version = "2.1.7"; in stdenv.mkDerivation { name = "minizinc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "${version}"; owner = "MiniZinc"; repo = "libminizinc"; - sha256 = "02wy91nv79lrvvhhimcxp7sqz5wd457n1n68zl7qcsm5vfn1hm4q"; + sha256 = "05rifsgzfaalv5ymv59sjcvhr6i1byzbmq5p36hj3hpi5f929kip"; }; # meta is all the information about the package.. diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 760ad521cef63d0408144b41fcbe197e3dce2b0a..15b8f82d0ab2116cea75f4bf433303c770b6486b 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -21,11 +21,18 @@ stdenv.mkDerivation rec { src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; - unpackPhase = "true"; - buildPhase = '' + unpackPhase = '' cp -R ${libphutil} libphutil cp -R ${arcanist} arcanist chmod +w -R libphutil arcanist + ''; + + postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' + substituteInPlace libphutil/support/xhpast/Makefile \ + --replace "-minline-all-stringops" "" + ''; + + buildPhase = '' ( cd libphutil/support/xhpast make clean all install diff --git a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix b/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix deleted file mode 100755 index fff91c6f7f38d6fef1425f1cb70697e6d633b226..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{stdenv, fetchurl, glibc, bison, arm-frc-linux-gnueabi-eglibc}: - -stdenv.mkDerivation rec { - _target = "arm-frc-linux-gnueabi"; - - version = "2.28"; - name = "${_target}-binutils-${version}"; - - src = fetchurl { - url = "ftp://ftp.gnu.org/gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88"; - }; - - nativeBuildInputs = [ bison arm-frc-linux-gnueabi-eglibc ]; - buildInputs = [ glibc ]; - - configureFlags = '' - --target=${_target} - --with-pkgversion='GNU-Binutils-for-FRC' - --with-sysroot=$out/${_target} - --with-build-sysroot=/$out/${_target} - --disable-multilib - --disable-nls - --enable-lto - --disable-libiberty-install - --enable-ld - --enable-gold=default - --enable-plugins - ''; - - postConfigure = '' - make configure-host - ''; - - postInstall = '' - rm -rf $out/share/info - ''; - - meta = { - description = "FRC binutils"; - longDescription = '' - binutils used to build arm-frc-linux-gnueabi and user programs. - ''; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.colescott ]; - platforms = stdenv.lib.platforms.linux; - broken = true; # since 2017-09-10 - priority = 3; - }; -} diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 9aea35104320274f5fd9b0ef434197ce16026e73..e66d92e34d65b61cf584951f176af4c7b98343cb 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,14 +2,14 @@ let name = "astyle"; - version = "2.05.1"; + version = "3.1"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz"; - sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv"; + sha256 = "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b"; }; sourceRoot = if stdenv.cc.isClang diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 1b19a1caff6765a754b2d8ae62c585e587d2505f..cb64a4c876b101e841f9cf14fdbed6fe32d1590c 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autoconf-archive-${version}"; - version = "2017.03.21"; + version = "2018.03.13"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "0rfpapadka2023qhy8294ca5awxpb8d4904js6kv7piby5ax8siq"; + sha256 = "0ng1lvpijf3kv7w7nb1shqs23vp0398yicyvkf9lsk56kw6zjxb1"; }; buildInputs = [ xz ]; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 472f437978bf58d265bdc3c4858b9d8b36061619..579dea33df4753bec8901b23a519cf04373288ac 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; }; - buildInputs = [ m4 perl ]; + nativeBuildInputs = [ m4 perl ]; + buildInputs = [ m4 ]; # Work around a known issue in Cygwin. See # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 28034f9d54927c90db75e5da2f455112c0e2c1dd..660917ee9f1ff9ec35cdc48bd860fc291698d269 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, pkgconfig, perl, guile, libxml2 }: +{ stdenv, buildPackages, fetchurl, which, pkgconfig, texinfo, perl, guile, libxml2 }: stdenv.mkDerivation rec { name = "autogen-${version}"; @@ -11,8 +11,21 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; - nativeBuildInputs = [ which pkgconfig perl ]; - buildInputs = [ guile libxml2 ]; + nativeBuildInputs = [ which pkgconfig perl ] + # autogen needs a build autogen when cross-compiling + ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + buildPackages.buildPackages.autogen buildPackages.texinfo ]; + buildInputs = [ + guile libxml2 + ]; + + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--with-libxml2=${libxml2.dev}" + "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2" + # the configure check for regcomp wants to run a host program + "libopts_cv_with_libregex=yes" + #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" + ]; postPatch = '' # Fix a broken sed expression used for detecting the minor diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix deleted file mode 100644 index d6399e128a390de7e49d404e0869336fa5118cc4..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: - -stdenv.mkDerivation rec { - name = "automake-1.15.1"; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "1bzd9g32dfm4rsbw93ld9x7b5nc1y6i4m6zp032qf1i28a8s6sxg"; - }; - - buildInputs = [ perl autoconf ]; - - setupHook = ./setup-hook.sh; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - inherit doCheck; - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.15"; - homepage = http://www.gnu.org/software/automake/; - description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..affc400a9ed0f9d5d1c730fad7f5f7cd54080d08 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: + +stdenv.mkDerivation rec { + name = "automake-1.16.1"; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.xz"; + sha256 = "08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax"; + }; + + nativeBuildInputs = [ autoconf perl ]; + buildInputs = [ autoconf ]; + + setupHook = ./setup-hook.sh; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + inherit doCheck; + + # The test suite can run in parallel. + enableParallelBuilding = true; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + meta = { + branch = "1.15"; + homepage = http://www.gnu.org/software/automake/; + description = "GNU standard-compliant makefile generator"; + license = stdenv.lib.licenses.gpl2Plus; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/automake/setup-hook.sh b/pkgs/development/tools/misc/automake/setup-hook.sh index 5cd8c6229f68b547c97a07518258a5026c0010c4..292632b7cbce8b2ce56a17c6a0d52c301f2c3b8c 100644 --- a/pkgs/development/tools/misc/automake/setup-hook.sh +++ b/pkgs/development/tools/misc/automake/setup-hook.sh @@ -2,4 +2,4 @@ addAclocals () { addToSearchPathWithCustomDelimiter : ACLOCAL_PATH $1/share/aclocal } -envHooks+=(addAclocals) +addEnvHooks "$hostOffset" addAclocals diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index ca6cb14c2a43baf68e987dab2f0667f73461953a..a8f6426a3b7b27d0693ea7e6baae2e69bf35f046 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/avarice/files/avarice/; maintainers = [ stdenv.lib.maintainers.smironov ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index e7d5aaceb2bb91ab9116ba0de4f7b13905889721..66b0467657a201614cefdec375ff9fa239f608f3 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/avrdude/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 2adc61ce6456ae0737777432047a78923a753706..48cf4b31a1762350dd2924b5355590bdd3c2b5dd 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { - name = "babeltrace-1.5.3"; + name = "babeltrace-1.5.5"; src = fetchurl { url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2"; - sha256 = "0z0k4qvz4ypxs4dmgrzv9da7ylf6jr94ra6nylqpfrdspvjzwj92"; + sha256 = "1b78fam1gbsalga5pppn8ka461q35a9svz3mlbv82ssakdw4d4a0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index fda527ee905a9138e142f5efaa6aa784369fcc1e..ac7eb557f2ed27b1075728b97910e978a136a96a 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { downloadPage = ftp://ohnopub.net/mirror/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/misc/binutils/always-search-rpath.patch b/pkgs/development/tools/misc/binutils/always-search-rpath.patch new file mode 100644 index 0000000000000000000000000000000000000000..2e9956e6b6e4582dae9f7f51495bde7d22bfffd9 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/always-search-rpath.patch @@ -0,0 +1,14 @@ +diff --git a/ld/genscripts.sh b/ld/genscripts.sh +index b6940d376d..0feb1adfd0 100755 +--- a/ld/genscripts.sh ++++ b/ld/genscripts.sh +@@ -125,6 +125,9 @@ if test "x$NATIVE" = "xyes" ; then + USE_LIBPATH=yes + fi + ++# TODO: why is this needed? ++USE_LIBPATH=yes ++ + # Set the library search path, for libraries named by -lfoo. + # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used. + # Otherwise, the default is set here. diff --git a/pkgs/development/tools/misc/binutils/build-components-separately.patch b/pkgs/development/tools/misc/binutils/build-components-separately.patch new file mode 100644 index 0000000000000000000000000000000000000000..d3cd0d2131ccbdb2c3604e8243ef651886c279d3 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/build-components-separately.patch @@ -0,0 +1,178 @@ +From bc09a9236f67e710d545ac11bcdac7b55dbcc1a0 Mon Sep 17 00:00:00 2001 +From: John Ericson +Date: Thu, 12 Oct 2017 11:16:57 -0400 +Subject: [PATCH] Build components separately + +--- + bfd/configure.ac | 18 +++--------------- + opcodes/Makefile.am | 17 +++++++++++++---- + opcodes/configure.ac | 45 ++++++--------------------------------------- + 3 files changed, 22 insertions(+), 58 deletions(-) + +diff --git a/bfd/configure.ac b/bfd/configure.ac +index 9a183c1628..8728837384 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -241,31 +241,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, + + LT_LIB_M + +-# When building a shared libbfd, link against the pic version of libiberty +-# so that apps that use libbfd won't need libiberty just to satisfy any +-# libbfd references. +-# We can't do that if a pic libiberty is unavailable since including non-pic +-# code would insert text relocations into libbfd. + SHARED_LIBADD= +-SHARED_LDFLAGS= ++SHARED_LDFLAGS=-liberty + if test "$enable_shared" = "yes"; then +-changequote(,)dnl +- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` +-changequote([,])dnl +- if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" +- fi +- + # More hacks to build DLLs on Windows. + case "${host}" in + *-*-cygwin*) + SHARED_LDFLAGS="-no-undefined" +- SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" ++ SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32" + ;; + + # Hack to build or1k-src on OSX + or1k*-*-darwin*) +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" ++ SHARED_LIBADD="-liberty -lintl" + ;; + esac + +diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am +index 925e7ff651..47b395c195 100644 +--- a/opcodes/Makefile.am ++++ b/opcodes/Makefile.am +@@ -52,7 +52,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) + endif + + # This is where bfd.h lives. +-BFD_H = ../bfd/bfd.h ++BFD_H = $(BFDDIR)/bfd.h + + BUILD_LIBS = @BUILD_LIBS@ + BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ +@@ -303,7 +303,7 @@ OFILES = @BFD_MACHINES@ + # development.sh is used to determine -Werror default. + CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh + +-AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ ++AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ + + disassemble.lo: disassemble.c + if am__fastdepCC +@@ -324,12 +324,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c + # old version of libbfd, or to pick up libbfd for the wrong architecture + # if host != build. So for building with shared libraries we use a + # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. +-libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ ++libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion + libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@ +-libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@ ++libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@ + # Allow dependency tracking to work on all the source files. + EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES) + ++libtool-soversion: ++ @echo "creating $@" ++ bfd_soversion="$(VERSION)" ;\ ++ . $(BFDDIR)/development.sh ;\ ++ if test "$$development" = true ; then \ ++ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ ++ fi ;\ ++ echo "$${bfd_soversion}" > $@ ++ + # libtool will build .libs/libopcodes.a. We create libopcodes.a in + # the build directory so that we don't have to convert all the + # programs that use libopcodes.a simultaneously. This is a hack which +diff --git a/opcodes/configure.ac b/opcodes/configure.ac +index b9f5eb8a4f..ef2c2152b7 100644 +--- a/opcodes/configure.ac ++++ b/opcodes/configure.ac +@@ -89,6 +89,7 @@ AC_PROG_INSTALL + + AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h) + ACX_HEADER_STRING ++GCC_HEADER_STDINT(bfd_stdint.h) + + AC_CHECK_DECLS([basename, stpcpy]) + +@@ -134,61 +135,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, + + LT_LIB_M + +-#Libs for generator progs +-if test "x$cross_compiling" = "xno"; then +- BUILD_LIBS=../libiberty/libiberty.a +- BUILD_LIB_DEPS=$BUILD_LIBS +-else +- # if cross-compiling, assume that the system provides -liberty +- # and that the version is compatible with new headers. +- BUILD_LIBS=-liberty +- BUILD_LIB_DEPS= +-fi +-BUILD_LIBS="$BUILD_LIBS $LIBINTL" +-BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP" ++BUILD_LIBS="-liberty $LIBINTL" ++BUILD_LIB_DEPS="$LIBINTL_DEP" + + AC_SUBST(BUILD_LIBS) + AC_SUBST(BUILD_LIB_DEPS) + + # Horrible hacks to build DLLs on Windows and a shared library elsewhere. + SHARED_LDFLAGS= +-SHARED_LIBADD= ++SHARED_LIBADD=-liberty + SHARED_DEPENDENCIES= + if test "$enable_shared" = "yes"; then +-# When building a shared libopcodes, link against the pic version of libiberty +-# so that apps that use libopcodes won't need libiberty just to satisfy any +-# libopcodes references. +-# We can't do that if a pic libiberty is unavailable since including non-pic +-# code would insert text relocations into libopcodes. + # Note that linking against libbfd as we do here, which is itself linked + # against libiberty, may not satisfy all the libopcodes libiberty references + # since libbfd may not pull in the entirety of libiberty. +-changequote(,)dnl +- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` +-changequote([,])dnl +- if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" +- fi +- + case "${host}" in + *-*-cygwin*) + SHARED_LDFLAGS="-no-undefined" +- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin" ++ SHARED_LIBADD="-lbfd -liberty -lintl -lcygwin" + ;; +- *-*-darwin*) +- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}" +- SHARED_DEPENDENCIES="../bfd/libbfd.la" +- ;; + *) +- case "$host_vendor" in +- hp) +- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}" +- ;; +- *) +- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so ${SHARED_LIBADD}" +- ;; +- esac +- SHARED_DEPENDENCIES="../bfd/libbfd.la" ++ SHARED_LIBADD="-lbfd ${SHARED_LIBADD}" + ;; + esac + +-- +2.14.2 + diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 62b4812fae5b93e95940207a415e230ca49326e8..123f679d779d6743c14c36c411a4f9571fc3286a 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,27 +1,27 @@ { stdenv, buildPackages -, fetchurl, zlib +, fetchurl, zlib, autoreconfHook264 , buildPlatform, hostPlatform, targetPlatform , noSysDirs, gold ? true, bison ? null }: let - # Note to whoever is upgrading this: 2.29 is broken. - # ('nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test' segfaults on aarch64) - # Also glibc might need patching, see commit 733e20fee4a6700510f71fbe1a58ac23ea202f6a. - version = "2.28.1"; + # Remove gold-symbol-visibility patch when updating, the proper fix + # is now upstream. + # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 + version = "2.30"; basename = "binutils-${version}"; inherit (stdenv.lib) optional optionals optionalString; - # The prefix prepended to binary names to allow multiple binuntils on the + # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. - prefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; + targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; in stdenv.mkDerivation rec { - name = prefix + basename; + name = targetPrefix + basename; src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939"; + sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; }; patches = [ @@ -48,15 +48,32 @@ stdenv.mkDerivation rec { # there) and causes a cycle between the lib and bin outputs, so # get rid of it. ./no-plugins.patch - ]; - - outputs = [ "out" ] - ++ optional (targetPlatform == hostPlatform && !hostPlatform.isDarwin) "lib" # problems in Darwin stdenv - ++ [ "info" ] - ++ optional (targetPlatform == hostPlatform) "dev"; - nativeBuildInputs = [ bison ] - ++ optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; + # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and + # elf32-littlearm-vxworks in favor of the first. + # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 + ./disambiguate-arm-targets.patch + + # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's + # not clear why this behavior was decided upon but it has the unfortunate + # consequence that the linker will fail to find transitive dependencies of + # shared objects when cross-compiling. Consequently, we are forced to + # override this behavior, forcing ld to search DT_RPATH even when + # cross-compiling. + ./always-search-rpath.patch + + # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 + ./gold-symbol-visibility.patch + ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch; + + outputs = [ "out" "info" "man" ]; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ + bison + ] ++ stdenv.lib.optionals targetPlatform.isiOS [ + autoreconfHook264 + ]; buildInputs = [ zlib ]; inherit noSysDirs; @@ -80,23 +97,28 @@ stdenv.mkDerivation rec { then "-Wno-string-plus-int -Wno-deprecated-declarations" else "-static-libgcc"; - # TODO(@Ericson2314): Always pass "--target" and always prefix. + # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - configureFlags = - [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ] - ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop" - ++ optionals gold [ "--enable-gold" "--enable-plugins" ] - ++ optional (stdenv.system == "i686-linux") "--enable-targets=x86_64-linux-gnu"; + configureFlags = [ + "--enable-targets=all" "--enable-64-bit-bfd" + "--disable-install-libbfd" + "--disable-shared" "--enable-static" + "--with-system-zlib" + + "--enable-deterministic-archives" + "--disable-werror" + "--enable-fix-loongson2f-nop" + ] ++ optionals gold [ "--enable-gold" "--enable-plugins" ]; enableParallelBuilding = true; passthru = { - inherit prefix; + inherit targetPrefix version; }; meta = with stdenv.lib; { @@ -109,6 +131,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/binutils/; license = licenses.gpl3Plus; + maintainers = with maintainers; [ ericson2314 ]; platforms = platforms.unix; /* Give binutils a lower priority than gcc-wrapper to prevent a diff --git a/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch b/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch new file mode 100644 index 0000000000000000000000000000000000000000..abbfa73da05dca7abcc20121881457e0f896b8ae --- /dev/null +++ b/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch @@ -0,0 +1,23 @@ +diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c +index 9f956d3..f5b61f1 100644 +--- a/bfd/elf32-arm.c ++++ b/bfd/elf32-arm.c +@@ -19585,7 +19585,10 @@ elf32_arm_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) + #undef ELF_MAXPAGESIZE + #define ELF_MAXPAGESIZE 0x1000 + ++/* Prioritize elf32-*arm (priority 1) over elf32-*arm-vxworks (priority 2) */ ++#define elf_match_priority 2 + #include "elf32-target.h" ++#undef elf_match_priority + + + /* Merge backend specific data from an object file to the output +@@ -19974,4 +19977,7 @@ elf32_arm_symbian_plt_sym_val (bfd_vma i, const asection *plt, + #undef ELF_MAXPAGESIZE + #define ELF_MAXPAGESIZE 0x8000 + ++/* Prioritize elf32-*arm (priority 1) over elf32-*arm-symbian (priority 2) */ ++#define elf_match_priority 2 + #include "elf32-target.h" ++#undef elf_match_priority diff --git a/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch b/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch new file mode 100644 index 0000000000000000000000000000000000000000..0fb05a482d1cce234d810320b164d33c06d079b6 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch @@ -0,0 +1,79 @@ +commit 8564af037f5c4c6d2744a89497691359205b2bbc +Author: Shea Levy +Date: Mon Mar 19 10:52:40 2018 -0400 + + Revert "Allow multiply-defined absolute symbols when they have the same value." + + This reverts commit 5dc824ed42cd173c1525f5abc76f4091f11a4dbc. + +diff --git a/gold/ChangeLog-2017 b/gold/ChangeLog-2017 +index b2a47710b5..d7ca1b48c0 100644 +--- a/gold/ChangeLog-2017 ++++ b/gold/ChangeLog-2017 +@@ -114,11 +114,6 @@ + (localedir): Define as @localedir@. + (gnulocaledir, gettextsrcdir): Use @datarootdir@. + +-2017-11-28 Cary Coutant +- +- * resolve.cc (Symbol_table::resolve): Allow multiply-defined absolute +- symbols when they have the same value. +- + 2017-11-28 Cary Coutant + + * object.h (class Sized_relobj_file): Remove discarded_eh_frame_shndx_. +diff --git a/gold/resolve.cc b/gold/resolve.cc +index 4a5784cf8b..803576bfed 100644 +--- a/gold/resolve.cc ++++ b/gold/resolve.cc +@@ -247,28 +247,18 @@ Symbol_table::resolve(Sized_symbol* to, + Object* object, const char* version, + bool is_default_version) + { +- bool to_is_ordinary; +- const unsigned int to_shndx = to->shndx(&to_is_ordinary); +- + // It's possible for a symbol to be defined in an object file + // using .symver to give it a version, and for there to also be + // a linker script giving that symbol the same version. We + // don't want to give a multiple-definition error for this + // harmless redefinition. ++ bool to_is_ordinary; + if (to->source() == Symbol::FROM_OBJECT + && to->object() == object +- && to->is_defined() + && is_ordinary ++ && to->is_defined() ++ && to->shndx(&to_is_ordinary) == st_shndx + && to_is_ordinary +- && to_shndx == st_shndx +- && to->value() == sym.get_st_value()) +- return; +- +- // Likewise for an absolute symbol defined twice with the same value. +- if (!is_ordinary +- && st_shndx == elfcpp::SHN_ABS +- && !to_is_ordinary +- && to_shndx == elfcpp::SHN_ABS + && to->value() == sym.get_st_value()) + return; + +@@ -360,8 +350,8 @@ Symbol_table::resolve(Sized_symbol* to, + && (sym.get_st_bind() == elfcpp::STB_WEAK + || to->binding() == elfcpp::STB_WEAK) + && orig_st_shndx != elfcpp::SHN_UNDEF ++ && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF + && to_is_ordinary +- && to_shndx != elfcpp::SHN_UNDEF + && sym.get_st_size() != 0 // Ignore weird 0-sized symbols. + && to->symsize() != 0 + && (sym.get_st_type() != to->type() +@@ -372,7 +362,7 @@ Symbol_table::resolve(Sized_symbol* to, + { + Symbol_location fromloc + = { object, orig_st_shndx, static_cast(sym.get_st_value()) }; +- Symbol_location toloc = { to->object(), to_shndx, ++ Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary), + static_cast(to->value()) }; + this->candidate_odr_violations_[to->name()].insert(fromloc); + this->candidate_odr_violations_[to->name()].insert(toloc); diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/pkgs/development/tools/misc/binutils/support-ios.patch new file mode 100644 index 0000000000000000000000000000000000000000..919a3920727f53b0050f9590e749af503b7b85ae --- /dev/null +++ b/pkgs/development/tools/misc/binutils/support-ios.patch @@ -0,0 +1,112 @@ +diff --git a/bfd/config.bfd b/bfd/config.bfd +index f04a993f06..3357022f35 100644 +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -238,7 +238,7 @@ case "${targ}" in + + # START OF targmatch.h + #ifdef BFD64 +- aarch64-*-darwin*) ++ aarch64-*-darwin* | aarch64-*-ios*) + targ_defvec=aarch64_mach_o_vec + targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec" + targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" +@@ -358,7 +358,7 @@ case "${targ}" in + targ_selvecs=arc_elf32_be_vec + ;; + +- arm-*-darwin*) ++ arm-*-darwin* | arm-*-ios*) + targ_defvec=arm_mach_o_vec + targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec" + targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" +diff --git a/configure.ac b/configure.ac +index aae94501e4..4b1121e0d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then + ;; + *-*-solaris2* | *-*-hpux11*) + ;; +- *-*-darwin* | *-*-aix*) ++ *-*-darwin* | *-*-ios* | *-*-aix*) + ;; + nvptx*-*-*) + ;; +@@ -706,7 +706,7 @@ case "${target}" in + ;; + x86_64-*-darwin[[912]]*) + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + noconfigdirs="$noconfigdirs target-libffi" + ;; + *-*-netware*) +@@ -788,7 +788,7 @@ esac + # Disable the go frontend on systems where it is known to not work. Please keep + # this in sync with contrib/config-list.mk. + case "${target}" in +-*-*-darwin* | *-*-cygwin* | *-*-mingw*) ++*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*) + unsupported_languages="$unsupported_languages go" + ;; + esac +@@ -797,7 +797,7 @@ esac + # For testing, you can easily override this with --enable-libgo. + if test x$enable_libgo = x; then + case "${target}" in +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + # PR 46986 + noconfigdirs="$noconfigdirs target-libgo" + ;; +@@ -916,11 +916,11 @@ esac + case "${target}" in + *-*-chorusos) + ;; +- aarch64-*-darwin*) ++ aarch64-*-darwin* | aarch64-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- arm-*-darwin*) ++ arm-*-darwin* | arm-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +@@ -936,7 +936,7 @@ case "${target}" in + noconfigdirs="$noconfigdirs ld gas gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +@@ -1226,7 +1226,7 @@ case "${host}" in + hppa*-*) + host_makefile_frag="config/mh-pa" + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + host_makefile_frag="config/mh-darwin" + ;; + powerpc-*-aix*) +@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. + # warn during gcc/ subconfigure; unless you're bootstrapping with + # -flto it won't be needed until after installation anyway. + case $target in +- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; ++ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;; + *) if test x"$enable_lto" = x"yes"; then + AC_MSG_ERROR([LTO support is not enabled for this target.]) + fi +@@ -2590,7 +2590,7 @@ rm -f conftest* + # Decide which environment variable is used to find dynamic libraries. + case "${host}" in + *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; +- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; ++ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; + *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; + *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; + esac diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 8035388c5f06273fa58c7f18e26122fa7c7d4335..bb81a461188a015d2b3bcb02b4266369edd6f1a7 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - name = "bossa-2014-08-18"; + name = "bossa-1.8"; src = fetchgit { url = https://github.com/shumatech/BOSSA; - rev = "0f0a41cb1c3a65e909c5c744d8ae664e896a08ac"; /* arduino branch */ - sha256 = "0xg79kli1ypw9zyl90mm6vfk909jinmk3lnl8sim6v2yn8shs9cn"; + rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62"; + sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm"; }; patches = [ ./bossa-no-applet-build.patch ]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 65c7e633f8e28023e06f723c4d2265880c392b36..34d1d8a829b137dddf8469c19ddef10d1b4f66e9 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, zlib, makeWrapper }: +{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.3.4"; + version = "3.4.1"; src = fetchurl { - sha256 = "0ks0vk408mdppfbk8v38p46fqx3p30r9a9cwiia43373i7rmpw94"; + sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; url = "mirror://samba/ccache/${name}.tar.xz"; }; + nativeBuildInputs = [ perl ]; + buildInputs = [ zlib ]; + outputs = [ "out" "man" ]; + # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) - patches = [ ./skip-fs-dependent-test.patch ]; + patches = [ + ./fix-debug-prefix-map-suite.patch + ./skip-fs-dependent-test.patch + ]; postPatch = '' substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' @@ -69,7 +76,6 @@ let ccache = stdenv.mkDerivation rec { homepage = http://ccache.samba.org/; downloadPage = https://ccache.samba.org/download.html; license = licenses.gpl3Plus; - maintainers = with maintainers; [ nckx ]; platforms = platforms.unix; }; }; diff --git a/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch b/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch new file mode 100644 index 0000000000000000000000000000000000000000..98a6fbf10bf18ceb410779245e90c0de23cb5b6c --- /dev/null +++ b/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch @@ -0,0 +1,42 @@ +--- a/test/suites/debug_prefix_map.bash ++++ b/test/suites/debug_prefix_map.bash +@@ -29,7 +29,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + +@@ -39,7 +39,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + +@@ -52,10 +52,10 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi +- if ! grep "name" test.o >/dev/null 2>&1; then ++ if ! objdump -g test.o | grep ": name$" >/dev/null 2>&1; then + test_failed "Relocation (name) not found in test.o" + fi + +@@ -65,7 +65,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + } diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch index ecd3c4c9a74ec42c07cb4def6e45a39e9f4821bc..7b233df6531b5d1663d2b5462ebe02d585d3ed0a 100644 --- a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch +++ b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch @@ -1,9 +1,9 @@ ---- ccache-3.3.4.org/test.sh 2017-02-17 21:28:53.000000000 +0000 -+++ ccache-3.3.4/test.sh 2017-07-01 18:38:00.523403023 +0100 -@@ -2631,23 +2631,23 @@ +--- a/test/suites/cleanup.bash ++++ b/test/suites/cleanup.bash +@@ -94,23 +94,6 @@ + $CCACHE -F 0 -M 256K >/dev/null - $CCACHE -c >/dev/null - # floor(0.8 * 4) = 3 + CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null - expect_file_count 3 '*.o' $CCACHE_DIR - expect_file_count 3 '*.d' $CCACHE_DIR - expect_file_count 3 '*.stderr' $CCACHE_DIR @@ -21,23 +21,6 @@ - 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" + TEST "Automatic cache cleanup, limit_multiple 0.9" diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 2564b42731b31ba882ac202520291892f06e5551..6f4330ef0a9aa5e3c1c149a18562b6c1d2e4d0f9 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "2.0.0.2"; + version = "2.18.1"; name = "checkbashisms-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms"; - sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; + url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; + sha256 = "1yaygfzv5jzvcbahz6sdfnzhch9mxgsrlsym2ad62nk0svsnp24n"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index ffd668dbdeef6c9d71b782884854eb6bf8c7579b..c245a32a06d9d781ac26a605d6e7e1becef79ca4 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { description = ''Common Lisp launcher script''; license = stdenv.lib.licenses.llgpl21 ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..09220b2dc651e575850634b7d1543f11019a24b8 --- /dev/null +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, cmake, llvmPackages, ncurses }: + +let + src = fetchFromGitHub { + owner = "cquery-project"; + repo = "cquery"; + rev = "e45a9ebbb6d8bfaf8bf1a3135b6faa910afea37e"; + sha256 = "049gkqbamq4r2nz9yjcwq369zrmwrikzbhfza2x2vndqzaavq5yg"; + fetchSubmodules = true; + }; + + stdenv = llvmPackages.stdenv; + +in +stdenv.mkDerivation rec { + name = "cquery-${version}"; + version = "2018-03-25"; + + inherit src; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = with llvmPackages; [ clang clang-unwrapped llvm ncurses ]; + + cmakeFlags = [ + "-DSYSTEM_CLANG=ON" + "-DCLANG_CXX=ON" + ]; + + shell = stdenv.shell; + postFixup = '' + # We need to tell cquery where to find the standard library headers. + + standard_library_includes="\\\"-isystem\\\", \\\"${if (stdenv.hostPlatform.libc == "glibc") then stdenv.cc.libc.dev else stdenv.cc.libc}/include\\\"" + standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" + export standard_library_includes + + wrapped=".cquery-wrapped" + export wrapped + + mv $out/bin/cquery $out/bin/$wrapped + substituteAll ${./wrapper} $out/bin/cquery + chmod --reference=$out/bin/$wrapped $out/bin/cquery + ''; + + doInstallCheck = true; + installCheckPhase = '' + pushd ${src} + $out/bin/cquery --ci --clang-sanity-check && \ + $out/bin/cquery --ci --test-unit + ''; + + meta = with stdenv.lib; { + description = "A c/c++ language server powered by libclang"; + homepage = https://github.com/cquery-project/cquery; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.tobim ]; + priority = 3; + }; +} diff --git a/pkgs/development/tools/misc/cquery/wrapper b/pkgs/development/tools/misc/cquery/wrapper new file mode 100644 index 0000000000000000000000000000000000000000..f0bea41536d07f9c845d6641fc51acc949898d9f --- /dev/null +++ b/pkgs/development/tools/misc/cquery/wrapper @@ -0,0 +1,12 @@ +#! @shell@ -e + +initString="--init={\"extraClangArguments\": [@standard_library_includes@" + +if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then + read -a cflags_array <<< ${NIX_CFLAGS_COMPILE} + initString+=$(printf ', \"%s\"' "${cflags_array[@]}") +fi + +initString+="]}" + +exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "${extraFlagsArray[@]}" "$@" diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 37ec63627b153bdaa74764e18fbbe1e57e475eba..cbf5883b297372845ddb8b6430c100ea68b69484 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -6,8 +6,6 @@ , utillinux }: -assert stdenv.isLinux -> (utillinux != null); - stdenv.mkDerivation rec { name = "creduce-${version}"; version = "2.7.0"; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 9a8c24fa16853c53db553508d8ee1245420d80c4..c4994ad24d794dfcd90877dcf20c042f461fa0a3 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ m4 makeWrapper ]; - buildInputs = [ libbsd perl SysCPU ]; + buildInputs = [ perl SysCPU libbsd ]; postInstall = '' substituteInPlace $out/bin/compiler_test.pl \ diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 14a52f4e08a633010ab4896af99488186b817c88..ae8f17c213a9b43b366e1431a0af52969bd0e057 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,31 +1,30 @@ { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3 -, pythonPackages, makeWrapper, gnome3, libwnck3 }: +, python3Packages, wrapGAppsHook, gnome3, libwnck3, gobjectIntrospection }: let - version = "${major}.12"; - major = "0.3"; -in pythonPackages.buildPythonApplication rec { - name = "d-feet-${version}"; + pname = "d-feet"; + version = "0.3.13"; +in python3Packages.buildPythonApplication rec { + name = "${pname}-${version}"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; - sha256 = "054hl56rii9ff7rzl42h7993ywjbxmhlcd7bk8fi1c2bx98c6s68"; + url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1md3lzs55sg04ds69dbginpxqvgg3qnf1lfx3vmsxph6bbd2y6ll"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 itstool intltool glib gtk3 - gnome3.defaultIconTheme makeWrapper libwnck3 - ]; + nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ]; + buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobjectIntrospection ]; - propagatedBuildInputs = with pythonPackages; [ pygobject3 pep8 ]; + propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ]; - preFixup = - '' - wrapProgram $out/bin/d-feet \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "dfeet"; + versionPolicy = "none"; + }; + }; meta = { description = "D-Feet is an easy to use D-Bus debugger"; @@ -35,7 +34,7 @@ in pythonPackages.buildPythonApplication rec { and invoke methods on those interfaces. ''; - homepage = https://wiki.gnome.org/action/show/Apps/DFeet; + homepage = https://wiki.gnome.org/Apps/DFeet; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ktosiek ]; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 76d34bfd5640a3ca5ccaeb95c92068410d341f8b..8c2365974843714e19f441cad9b0fed14c6fc72b 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -13,11 +13,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { name = "dialog-${version}"; - version = "1.3-20160209"; + version = "1.3-20171209"; src = fetchurl { - url = "ftp://invisible-island.net/dialog/${name}.tgz"; - sha256 = "11rzh14xy9s99gxdi5i7fgmgihjqsv0ls0ksavkmip2y37rgf503"; + urls = [ + "ftp://ftp.invisible-island.net/dialog/${name}.tgz" + "https://invisible-mirror.net/archives/dialog/${name}.tgz" + ]; + sha256 = "1rk72as52f5br3wcr74d00wib41w65g8wvi36mfgybly251984r0"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 28b108c743f0a0f6eadd42e0b25689ac25e5c280..928f12602909978a3c1d8ac68e9610c4cbeb0ae5 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation { - name = "doclifter-2.15"; + name = "doclifter-2.17"; src = fetchurl { - url = http://www.catb.org/~esr/doclifter/doclifter-2.15.tar.gz; - sha256 = "14k750bxp0kpnm130pp22vx3vmppfnzwisc042din1416ka07yv0"; + url = http://www.catb.org/~esr/doclifter/doclifter-2.17.tar.gz; + sha256 = "1m8yfjbl8wzcml9q4k7m1crwid0a14r07fqf33bmmgx1zpjk8kmv"; }; buildInputs = [ python ]; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index 5509ededb070f538ab04f67301e06e3db6248adf..a0d6e49c025800315fde454266c476e30f0364c6 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ pcre ]; nativeBuildInputs = [ cmake doxygen ]; + # Multiple doxygen can not generate man pages in the same base directory in + # parallel: https://bugzilla.gnome.org/show_bug.cgi?id=791153 + enableParallelBuilding = false; + meta = with stdenv.lib; { homepage = http://editorconfig.org/; description = "EditorConfig core library written in C"; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 27dadd08e56056052869866884b43deed2425393..9f0ea147b5856a1203df19079446bfb8527fe55d 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus dbus_glib ]; + buildInputs = [ glib dbus dbus-glib ]; meta = { homepage = https://hal.freedesktop.org/releases/; diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index 9d84011e3657f91e16dd6a3e451acaab5b2db62b..8d2e678590056f00e6a674cd1572c64273bb9a38 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -1,16 +1,22 @@ -{stdenv, fetchurl, rpm}: +{stdenv, fetchFromGitHub, rpm}: stdenv.mkDerivation rec { name = "epm-${version}"; - version = "4.2"; + version = "4.4"; - src = fetchurl { - url = "http://www.msweet.org/files/project2/epm-4.2-source.tar.bz2"; - sha256 = "13imglm1fgd7p5y9lc0xsl6x4cdjsk5lnan5sn8f7m4jwbx8kik6"; + src = fetchFromGitHub { + repo = "epm"; + owner = "michaelrsweet"; + rev = "v${version}"; + sha256 = "0kaw7v2m20qirapkps4dna6nf9xibnwljvvv0l9vpvi920kw7j7p"; }; buildInputs = [ rpm ]; + preInstall = '' + sed -i 's/README/README.md/' Makefile + ''; + meta = with stdenv.lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; homepage = http://www.msweet.org/projects.php?Z2; diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e84aa0ef555a241abd14a2930a1a3b8e1a5f9ec1 --- /dev/null +++ b/pkgs/development/tools/misc/fsatrace/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "fsatrace-${version}"; + version = "0.0.1-160"; + + src = fetchFromGitHub { + owner = "jacereda"; + repo = "fsatrace"; + rev = "2bf89d836e0156e68f121b0ffeedade7c9381f77"; + sha256 = "0bndfmm0y738azwzf6m6xg6gjnrwcqlfjsampk67vga40yylwkbw"; + }; + + preConfigure = '' + mkdir -p $out/libexec/${name} + export makeFlags=INSTALLDIR=$out/libexec/${name} + ''; + + postInstall = '' + mkdir -p $out/bin + ln -s $out/libexec/${name}/fsatrace $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/jacereda/fsatrace; + description = "filesystem access tracer"; + license = licenses.isc; + maintainers = [ maintainers.peti ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index cdddad5155ff264ffdb02781afd628646e38ba4f..2b26383ed3101a4b90d92b10a5eaff52f24cec16 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "fswatch-${version}"; - version = "1.9.3"; + version = "1.11.2"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "1g329aapdvbzhr39wyh295shpfq5f0nlzsqkjnr8l6zzak7f4yrg"; + sha256 = "05vgpd1fx9fy3vnnmq5gz236avgva82axix127xy98gaxrac52vq"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/tools/misc/gdb/darwin-target-match.patch b/pkgs/development/tools/misc/gdb/darwin-target-match.patch new file mode 100644 index 0000000000000000000000000000000000000000..1328d919503aefaf3a2b99bd2bdb59e307324fc7 --- /dev/null +++ b/pkgs/development/tools/misc/gdb/darwin-target-match.patch @@ -0,0 +1,11 @@ +--- a/configure 2017-06-05 00:51:26.000000000 +0900 ++++ b/configure 2018-03-06 23:12:58.000000000 +0900 +@@ -3603,7 +3603,7 @@ + noconfigdirs="$noconfigdirs ld gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- x86_64-*-darwin[912]*) ++ x86_64-*-darwin*) + noconfigdirs="$noconfigdirs ld gas gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 6ecc6bc0e52fee828c119d2d0d8e9105c35741c6..b5840d07466866c5b1db1a83f395bd3edae12fc8 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,23 +1,24 @@ -{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo, zlib -, dejagnu, perl, pkgconfig +{ stdenv + +# Build time +, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs + +# Run time +, ncurses, readline, gmp, mpfr, expat, zlib, dejagnu , buildPlatform, hostPlatform, targetPlatform , pythonSupport ? hostPlatform == buildPlatform && !hostPlatform.isCygwin, python ? null , guile ? null -# Support all known targets in one gdb binary. -, multitarget ? false - # Additional dependencies for GNU/Hurd. , mig ? null, hurd ? null -, setupDebugInfoDirs }: let basename = "gdb-${version}"; - version = "8.0.1"; + version = "8.1"; in assert targetPlatform.isHurd -> mig != null && hurd != null; @@ -31,10 +32,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "1qwmcbaxf0jc7yjl0fimgcfj2yqcrl6h7azgs1d838kbwf9mzg9x"; + sha256 = "0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg"; }; - patches = [ ./debug-info-from-env.patch ]; + patches = [ ./debug-info-from-env.patch ] + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-target-match.patch; nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ] # TODO(@Ericson2314) not sure if should be host or target @@ -58,10 +60,16 @@ stdenv.mkDerivation rec { 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 (!pythonSupport) "--without-python" - ++ stdenv.lib.optional multitarget "--enable-targets=all"; + "--enable-targets=all" "--enable-64-bit-bfd" + "--disable-install-libbfd" + "--disable-shared" "--enable-static" + "--with-system-zlib" + "--with-system-readline" + + "--with-gmp=${gmp.dev}" + "--with-mpfr=${mpfr.dev}" + "--with-expat" "--with-libexpat-prefix=${expat.dev}" + ] ++ stdenv.lib.optional (!pythonSupport) "--without-python"; postInstall = '' # Remove Info files already provided by Binutils and other packages. diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..de66bf5da14ef6d66fc20a2cdab000f5abf7070c --- /dev/null +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -0,0 +1,43 @@ +{ stdenv, python27Packages, gdb, pkgs }: +let + deps = import ./requirements.nix { inherit pkgs; }; +in +python27Packages.buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "gdbgui"; + version = "0.11.1.2"; + + buildInputs = [ gdb ]; + propagatedBuildInputs = builtins.attrValues deps.packages; + + src = python27Packages.fetchPypi { + inherit pname version; + sha256 = "15502fg90df183mcg6nic8fakf111pgrlp7f044g3136wpwgfln7"; + }; + + postPatch = '' + echo ${version} > gdbgui/VERSION.txt + ''; + + postInstall = '' + wrapProgram $out/bin/gdbgui \ + --prefix PATH : ${stdenv.lib.makeBinPath [ gdb ]} + ''; + + # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox + preCheck = stdenv.lib.optionalString stdenv.isLinux '' + export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ + LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so + ''; + + postCheck = stdenv.lib.optionalString stdenv.isLinux '' + unset NIX_REDIRECTS LD_PRELOAD + ''; + + meta = with stdenv.lib; { + description = "A browser-based frontend for GDB"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ yrashk ]; + }; +} diff --git a/pkgs/development/tools/misc/gdbgui/requirements.nix b/pkgs/development/tools/misc/gdbgui/requirements.nix new file mode 100644 index 0000000000000000000000000000000000000000..13978645c29985c2a6cbf00a95fe03d4f3df7650 --- /dev/null +++ b/pkgs/development/tools/misc/gdbgui/requirements.nix @@ -0,0 +1,336 @@ +# generated using pypi2nix tool (version: 1.8.1) +# See more at: https://github.com/garbas/pypi2nix +# +# COMMAND: +# pypi2nix -V 2.7 -r requirements.txt +# + +{ pkgs ? import {} +}: + +let + + inherit (pkgs) makeWrapper; + inherit (pkgs.stdenv.lib) fix' extends inNixShell; + + pythonPackages = + import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" { + inherit pkgs; + inherit (pkgs) stdenv; + python = pkgs.python27Full; + # patching pip so it does not try to remove files when running nix-shell + overrides = + self: super: { + bootstrapped-pip = super.bootstrapped-pip.overrideDerivation (old: { + patchPhase = old.patchPhase + '' + sed -i -e "s|paths_to_remove.remove(auto_confirm)|#paths_to_remove.remove(auto_confirm)|" -e "s|self.uninstalled = paths_to_remove|#self.uninstalled = paths_to_remove|" $out/${pkgs.python35.sitePackages}/pip/req/req_install.py + ''; + }); + }; + }; + + commonBuildInputs = []; + commonDoCheck = false; + + withPackages = pkgs': + let + pkgs = builtins.removeAttrs pkgs' ["__unfix__"]; + interpreter = pythonPackages.buildPythonPackage { + name = "python27Full-interpreter"; + buildInputs = [ makeWrapper ] ++ (builtins.attrValues pkgs); + buildCommand = '' + mkdir -p $out/bin + ln -s ${pythonPackages.python.interpreter} $out/bin/${pythonPackages.python.executable} + for dep in ${builtins.concatStringsSep " " (builtins.attrValues pkgs)}; do + if [ -d "$dep/bin" ]; then + for prog in "$dep/bin/"*; do + if [ -f $prog ]; then + ln -s $prog $out/bin/`basename $prog` + fi + done + fi + done + for prog in "$out/bin/"*; do + wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" + done + pushd $out/bin + ln -s ${pythonPackages.python.executable} python + ln -s ${pythonPackages.python.executable} python2 + popd + ''; + passthru.interpreter = pythonPackages.python; + }; + in { + __old = pythonPackages; + inherit interpreter; + mkDerivation = pythonPackages.buildPythonPackage; + packages = pkgs; + overrideDerivation = drv: f: + pythonPackages.buildPythonPackage (drv.drvAttrs // f drv.drvAttrs // { meta = drv.meta; }); + withPackages = pkgs'': + withPackages (pkgs // pkgs''); + }; + + python = withPackages {}; + + generated = self: { + + "Flask" = python.mkDerivation { + name = "Flask-0.12.2"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/eb/12/1c7bd06fcbd08ba544f25bf2c6612e305a70ea51ca0eda8007344ec3f123/Flask-0.12.2.tar.gz"; sha256 = "49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ + self."Jinja2" + self."Werkzeug" + self."click" + self."itsdangerous" + ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://github.com/pallets/flask/"; + license = licenses.bsdOriginal; + description = "A microframework based on Werkzeug, Jinja2 and good intentions"; + }; + }; + + + + "Flask-Compress" = python.mkDerivation { + name = "Flask-Compress-1.4.0"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/0e/2a/378bd072928f6d92fd8c417d66b00c757dc361c0405a46a0134de6fd323d/Flask-Compress-1.4.0.tar.gz"; sha256 = "468693f4ddd11ac6a41bca4eb5f94b071b763256d54136f77957cfee635badb3"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ + self."Flask" + ]; + meta = with pkgs.stdenv.lib; { + homepage = "https://libwilliam.github.io/flask-compress/"; + license = licenses.mit; + description = "Compress responses in your Flask app with gzip."; + }; + }; + + + + "Flask-SocketIO" = python.mkDerivation { + name = "Flask-SocketIO-2.9.3"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/a0/ac/4024b73e071d5a000a998d6f26ba0a090011d5abdc7aa41f2774173c3276/Flask-SocketIO-2.9.3.tar.gz"; sha256 = "df23f790db8529c543bd0b54165215c342cf6955a4a1f605650e759197a46d59"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ + self."Flask" + self."python-socketio" + ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://github.com/miguelgrinberg/Flask-SocketIO/"; + license = licenses.mit; + description = "Socket.IO integration for Flask applications"; + }; + }; + + + + "Jinja2" = python.mkDerivation { + name = "Jinja2-2.10"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/56/e6/332789f295cf22308386cf5bbd1f4e00ed11484299c5d7383378cf48ba47/Jinja2-2.10.tar.gz"; sha256 = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ + self."MarkupSafe" + ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://jinja.pocoo.org/"; + license = licenses.bsdOriginal; + description = "A small but fast and easy to use stand-alone template engine written in pure python."; + }; + }; + + + + "MarkupSafe" = python.mkDerivation { + name = "MarkupSafe-1.0"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz"; sha256 = "a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://github.com/pallets/markupsafe"; + license = licenses.bsdOriginal; + description = "Implements a XML/HTML/XHTML Markup safe string for Python"; + }; + }; + + + + "Pygments" = python.mkDerivation { + name = "Pygments-2.2.0"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz"; sha256 = "dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://pygments.org/"; + license = licenses.bsdOriginal; + description = "Pygments is a syntax highlighting package written in Python."; + }; + }; + + + + "Werkzeug" = python.mkDerivation { + name = "Werkzeug-0.14.1"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/9f/08/a3bb1c045ec602dc680906fc0261c267bed6b3bb4609430aff92c3888ec8/Werkzeug-0.14.1.tar.gz"; sha256 = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ ]; + meta = with pkgs.stdenv.lib; { + homepage = "https://www.palletsprojects.org/p/werkzeug/"; + license = licenses.bsdOriginal; + description = "The comprehensive WSGI web application library."; + }; + }; + + + + "click" = python.mkDerivation { + name = "click-6.7"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897/click-6.7.tar.gz"; sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://github.com/mitsuhiko/click"; + license = licenses.bsdOriginal; + description = "A simple wrapper around optparse for powerful command line utilities."; + }; + }; + + + + "gevent" = python.mkDerivation { + name = "gevent-1.2.2"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/1b/92/b111f76e54d2be11375b47b213b56687214f258fd9dae703546d30b837be/gevent-1.2.2.tar.gz"; sha256 = "4791c8ae9c57d6f153354736e1ccab1e2baf6c8d9ae5a77a9ac90f41e2966b2d"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ + self."greenlet" + ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://www.gevent.org/"; + license = licenses.mit; + description = "Coroutine-based network library"; + }; + }; + + + + "greenlet" = python.mkDerivation { + name = "greenlet-0.4.12"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/be/76/82af375d98724054b7e273b5d9369346937324f9bcc20980b45b068ef0b0/greenlet-0.4.12.tar.gz"; sha256 = "e4c99c6010a5d153d481fdaf63b8a0782825c0721506d880403a3b9b82ae347e"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ ]; + meta = with pkgs.stdenv.lib; { + homepage = "https://github.com/python-greenlet/greenlet"; + license = licenses.mit; + description = "Lightweight in-process concurrent programming"; + }; + }; + + + + "itsdangerous" = python.mkDerivation { + name = "itsdangerous-0.24"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/itsdangerous-0.24.tar.gz"; sha256 = "cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://github.com/mitsuhiko/itsdangerous"; + license = licenses.bsdOriginal; + description = "Various helpers to pass trusted data to untrusted environments and back."; + }; + }; + + + + "pygdbmi" = python.mkDerivation { + name = "pygdbmi-0.8.2.0"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/4e/34/a8c86d85e0d3d8df2c289657a55c19408dbdbf0b1468859e7f1a745ae8ff/pygdbmi-0.8.2.0.tar.gz"; sha256 = "47cece65808ca42edf6966ac48e2aedca7ae1c675c4d2f0d001c7f3a7fa245fe"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ ]; + meta = with pkgs.stdenv.lib; { + homepage = "https://github.com/cs01/pygdbmi"; + license = licenses.mit; + description = "Parse gdb machine interface output with Python"; + }; + }; + + + + "python-engineio" = python.mkDerivation { + name = "python-engineio-2.0.2"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/e5/91/f6fd80298e68b4ca22a1a9cc3091116e2fef22fd8fb017ad9e5c6ec6ddcc/python-engineio-2.0.2.tar.gz"; sha256 = "46c710a72c3b2a8511b0d7963c46e200010f8ea3eb0721ce15603d0f23e993c4"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ + self."six" + ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://github.com/miguelgrinberg/python-engineio/"; + license = licenses.mit; + description = "Engine.IO server"; + }; + }; + + + + "python-socketio" = python.mkDerivation { + name = "python-socketio-1.8.4"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/58/a9/52af6a7ad0805977afc838ed394f8d26d078ef61e8c1bdd632801c58ef3a/python-socketio-1.8.4.tar.gz"; sha256 = "13807ce17e85371d15b31295a43b1fac1c0dba1eb5fc233353a3efd53aa122cc"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ + self."python-engineio" + self."six" + ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://github.com/miguelgrinberg/python-socketio/"; + license = licenses.mit; + description = "Socket.IO server"; + }; + }; + + + + "six" = python.mkDerivation { + name = "six-1.11.0"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz"; sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; }; + doCheck = commonDoCheck; + buildInputs = commonBuildInputs; + propagatedBuildInputs = [ ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://pypi.python.org/pypi/six/"; + license = licenses.mit; + description = "Python 2 and 3 compatibility utilities"; + }; + }; + + }; + localOverridesFile = ./requirements_override.nix; + overrides = import localOverridesFile { inherit pkgs python; }; + commonOverrides = [ + + ]; + allOverrides = + (if (builtins.pathExists localOverridesFile) + then [overrides] else [] ) ++ commonOverrides; + +in python.withPackages + (fix' (pkgs.lib.fold + extends + generated + allOverrides + ) + ) \ No newline at end of file diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 9e2f358755834d1580ebf9779c0671d2bba7e263..9e8ce3d93314198e0aba1701fabc1bf9a898c707 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }: +{ stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }: stdenv.mkDerivation rec { name = "gede-${version}"; - version = "2.0.4"; + version = "2.6.1"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba"; + sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r"; }; - nativeBuildInputs = [ makeWrapper python ]; + nativeBuildInputs = [ qmake makeWrapper python ]; - buildInputs = [ qt4 ]; + buildInputs = [ ctags ]; - postPatch = '' - sed -i build.py -e 's,qmake-qt4,qmake,' - ''; + dontUseQmakeConfigure = true; buildPhase = ":"; installPhase = '' - python build.py install --prefix="$out" + python build.py install --verbose --prefix="$out" wrapProgram $out/bin/gede \ --prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]} ''; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 35126c85d3fef82a0ac907913849d009d26d8fcd..296d9673d8f152cc3e71be768446835972ebe949 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.7"; + version = "6.6.2"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "0cnd7a7d1pl46yk15q6mnr9i9w3xi8pxgchw4ia9njgr4jjqzh6r"; + sha256 = "0zvi5vxwiq0dy8mq2cgs64m8harxs0fvkmsnvi0ayb0w608lgij3"; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index ca8d0c6f71738f61efef1d2d1f9be7ffa7c27fdc..73c9021c5e9f9665022af240c0060b636d4cd714 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, bison, flex }: stdenv.mkDerivation rec { - name = "gob2-${minVer}.18"; + name = "gob2-${minVer}.20"; minVer = "2.0"; src = fetchurl { - url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.gz"; - sha256 = "1r242s3rsxyqiw2ic2gdpvvrx903jgjd1aa4mkl26in5k9zk76fa"; + url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.xz"; + sha256 = "5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428"; }; # configure script looks for d-bus but it is only needed for tests diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 50f451ebae2382d233a30a50ff4968f6b337ac60..02b4d15576785f5ebcb7ace5211329815a86972d 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig, hicolor_icon_theme }: +{stdenv, fetchurl, gtk2, pkgconfig, hicolor-icon-theme }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; meta = { homepage = https://code.google.com/archive/p/gtkdialog/; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index ada2dd1a89a12bc3606f9b476e0317199f678014..b786aa2123f6da5cdaaddadb38144eb6fc8fc268 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,26 +1,34 @@ -{ stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: +{ stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.4"; + name = "help2man-1.47.6"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; + sha256 = "0vz4dlrvy4vc6l7w0a7n668pfa0rdm73wr2gar58wqranyah46yr"; }; - nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; + nativeBuildInputs = [ gettext LocaleGettext ]; buildInputs = [ perl LocaleGettext ]; doCheck = false; # target `check' is missing 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)" \ - ${stdenv.lib.optionalString hostPlatform.isCygwin "--prefix PATH : ${gettext}/bin"} - ''; - + # We don't use makeWrapper here because it uses substitutions our + # bootstrap shell can't handle. + postInstall = '' + gettext_perl="$(echo ${LocaleGettext}/lib/perl*/site_perl)" + mv $out/bin/help2man $out/bin/.help2man-wrapped + cat > $out/bin/help2man < 1) -- putchar(`,'); -+ putchar(','); - if (lf->guardflags) { - struct pff_tab *tp; - long gf; - - (void) printf("guard="); -- tp = Pgf_tab; -+ tp = Pff_tab; - gf = lf->guardflags; - while (gf && !FsvFlagX) { - while (tp->nm) { diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index e1602b0d24e7bd777ceb3a6a4410b02f42df5b6d..66fbed514dc54a3ea8a1acddfb5f927b282d4d6a 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elfutils }: +{ stdenv, fetchurl, elfutils, libunwind }: stdenv.mkDerivation rec { name = "ltrace-0.7.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"; }; - buildInputs = [ elfutils ]; + buildInputs = [ elfutils libunwind ]; preConfigure = '' @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { makeFlagsArray=(INSTALL="install -c") ''; - meta = { + meta = with stdenv.lib; { description = "Library call tracer"; - homepage = http://www.ltrace.org/; + homepage = https://www.ltrace.org/; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 3591cdc0f529488cf0e6490340bec2d871f6d7b7..8294b68126fc076ff633d8fce7c797c059678d1a 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.10.1"; + version = "2.10.3"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "005axllajfbxh73vh1cacbapdvbxjsi3pkzq40giih4ps9x4pg10"; + sha256 = "0x3b6jps053s9pxc7bslj5qsn2z53yf0fk9pcrmxjf9yri17n3qr"; }; nativeBuildInputs = [ pkgconfig ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tracing tools (kernel + user space) for Linux"; - homepage = http://lttng.org/; + homepage = https://lttng.org/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 827ddedaee325010709e9820d35839d4dbfb9255..b708ce490d298cb8941f440ad09862253126bbdb 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -13,22 +13,24 @@ stdenv.mkDerivation rec { name = "lttng-ust-${version}"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "1avx4p71g9m3zvynhhhysxnpkqyhhlv42xiv9502bvp3nwfkgnqs"; + sha256 = "17gfi1dn6bgg59qn4ihf8hag96lalx0g7dym2ccpzdz7f45krk07"; }; - buildInputs = [ liburcu python ]; + buildInputs = [ python ]; preConfigure = '' patchShebangs . ''; + + propagatedBuildInputs = [ liburcu ]; meta = with stdenv.lib; { description = "LTTng Userspace Tracer libraries"; - homepage = http://lttng.org/; + homepage = https://lttng.org/; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 45dd86db41b29b4db842356947fea2cf629f9d61..36a89726e81cd1b364e13e50aa0279fb0b64fc58 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "lttv-1.5"; src = fetchurl { - url = "http://lttng.org/files/packages/${name}.tar.bz2"; + url = "https://lttng.org/files/packages/${name}.tar.bz2"; sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical trace viewer for LTTng trace files"; - homepage = http://lttng.org/; + homepage = https://lttng.org/; # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. # The rest of the LTTV package is distributed under the GNU GPL v2. license = with licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 6d3dffa894ce05be12a460cd6f29d6723546e551..afe026359e5339df000fe33abdf06345949c220e 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="luarocks"; - version="2.4.3"; + version="2.4.4"; name="${baseName}-${version}"; - hash="0binkd8mpzdzvx0jw0dwm4kr1p7jny015zykf8f15fymzqr4shad"; - url="http://luarocks.org/releases/luarocks-2.4.3.tar.gz"; - sha256="0binkd8mpzdzvx0jw0dwm4kr1p7jny015zykf8f15fymzqr4shad"; + hash="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r"; + url="http://luarocks.org/releases/luarocks-2.4.4.tar.gz"; + sha256="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r"; }; buildInputs = [ lua curl makeWrapper which unzip diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index cace3e7f0a94dec548078d00f29c5722300f73fb..ecee27c1385836266490aa9dbaa2bffba86cda48 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2}: stdenv.mkDerivation rec { - version = "0.94"; + version = "0.97"; name = "msitools-${version}"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.94/${name}.tar.xz"; - sha256 = "0bndnm3mgcqkw5dhwy5l1zri4lqvjbhbn5rxz651fkxlkhab8bhm"; + url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz"; + sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs"; }; nativeBuildInputs = [ pkgconfig ]; @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = https://wiki.gnome.org/msitools; license = [licenses.gpl2 licenses.lgpl21]; - maintainer = [maintainers.vcunat]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index c2268ba8da20624c88ed4a3cd988ce5ceb069518..a0434f2d0e72a24b569a51b553bc8ec8721aebe2 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { name = "opengrok-${version}"; - version = "0.12.5"; + version = "1.0"; - # 0.12.5 is the latest distributed as a .tar.gz file. + # 1.0 is the latest distributed as a .tar.gz file. # Newer are distribued as .zip so a source build is required. # if builded from source @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # binary distribution src = fetchurl { url = https://github.com/OpenGrok/OpenGrok/files/213268/opengrok-0.12.1.5.tar.gz; - sha256 = "c3ce079f6ed1526c475cb4b9a7aa901f75507318c93b436d6c14eba4098e4ead"; + sha256 = "1bafiq4s9sqldinl6fy931rm0x8zj2magfdlbi3nqlnidsghgkn3"; }; buildInputs = [ makeWrapper ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code search and cross reference engine"; - homepage = http://opengrok.github.io/OpenGrok/; + homepage = https://opengrok.github.io/OpenGrok/; license = licenses.cddl; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 2ab0dbd1b5f57cd72579c4013d72bd57090e583d..73c5b762318436ab908556ae619aa67e0a68475f 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-implicit-fallthrough" + "-Wno-format-truncation" + "-Wno-format-overflow" + ]; + postInstall = '' mkdir -p "$out/etc/udev/rules.d" rules="$out/share/openocd/contrib/60-openocd.rules" diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index cde8eae0f7fc416467725d12039d4ee75a288038..de68a4066d7dd579893cfdcb1025408936078455 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,15 +1,21 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "patchelf-0.10-pre-20160920"; + name = "patchelf-0.10-pre-20180108"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "327d80443672c397970738f9e216a7e86cbf3ad7"; - sha256 = "0nghzywda4jrj70gvn4dnrzasafgdp0basj04wfir1smvsi047zr"; + rev = "48452cf6b4ccba1c1f47a09f4284a253634ab7d1"; + sha256 = "1f1s8q3as3nrhcc1a8qc2z7imm644jfz44msn9sfv4mdynp2m2yb"; }; + # Drop test that fails on musl (?) + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace tests/Makefile.am \ + --replace "set-rpath-library.sh" "" + ''; + setupHook = [ ./setup-hook.sh ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 5be42855a9c7f964d1422e994de491f9589b4775..15d00b0a2a52210c858d87c07a9eab2c85c77ede 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -19,12 +19,19 @@ stdenv.mkDerivation rec { patches = optional (!vanilla) ./requires-private.patch ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; - preConfigure = optionalString (stdenv.system == "mips64el-linux") - ''cp -v ${automake}/share/automake*/config.{sub,guess} .''; + preConfigure = ""; # TODO(@Ericson2314): Remove next mass rebuild buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; configureFlags = [ "--with-internal-glib" ] - ++ 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" ] + # Can't run these tests while cross-compiling + ++ optional (stdenv.hostPlatform != stdenv.buildPlatform) + [ "glib_cv_stack_grows=no" + "glib_cv_uscore=no" + "ac_cv_func_posix_getpwuid_r=yes" + "ac_cv_func_posix_getgrgid_r=yes" + ]; + postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh index 1c153976a3432dc7b562835232042d14a1134cf7..34a9b9f1173b8f0d221dd9ce56737b028b3faf77 100644 --- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh +++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh @@ -3,8 +3,4 @@ addPkgConfigPath () { addToSearchPath PKG_CONFIG_PATH $1/share/pkgconfig } -if test -n "$crossConfig"; then - crossEnvHooks+=(addPkgConfigPath) -else - envHooks+=(addPkgConfigPath) -fi +addEnvHooks "$targetOffset" addPkgConfigPath diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index b0bb32449a4cbf4a3f252ba9866f6162f85d0103..93220a02e2dfe270ff440aacaa52f4b2d5b6474b 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, CoreServices }: +{ stdenv, fetchFromGitHub, Foundation, readline }: with stdenv.lib; stdenv.mkDerivation rec { - name = "premake-${version}"; - version = "5.0.0pre.alpha.11"; + name = "premake5-${version}"; + version = "5.0.0-alpha12"; src = fetchFromGitHub { owner = "premake"; repo = "premake-core"; - rev = "5dfb0238bc309df04819dd430def621ce854678d"; - sha256 = "0k9xbqrnbwj0hnmdgcrwn70py1kiqvr10l42aw42xnlmdyg1sgsc"; + rev = "v${version}"; + sha256 = "1h3hr96pdz94njn4bg02ldcz0k5j1x017d8svc7fdyvl2b77nqzf"; }; - buildInputs = optional stdenv.isDarwin [ CoreServices ]; + buildInputs = optionals stdenv.isDarwin [ Foundation readline ]; patchPhase = optional stdenv.isDarwin '' substituteInPlace premake5.lua \ diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..df4b91a79b096922efea73d7642a38bfcec149ed --- /dev/null +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gdb }: + +stdenv.mkDerivation rec { + name = "pwndbg-2018-04-06"; + + src = fetchFromGitHub { + owner = "pwndbg"; + repo = "pwndbg"; + rev = "e225ba9f647ab8f7f4871075529c0ec239f43300"; + sha256 = "1s6m93qi3baclgqqii4fnmzjmg0c6ipkscg7xiljaj5z4bs371j4"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + propagatedBuildInputs = with pythonPackages; [ + future + isort + psutil + pycparser + pyelftools + python-ptrace + ROPGadget + six + unicorn + pygments + enum34 + ]; + + installPhase = '' + mkdir -p $out/share/pwndbg + cp -r *.py pwndbg $out/share/pwndbg + makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \ + --add-flags "-q -x $out/share/pwndbg/gdbinit.py" + ''; + + preFixup = '' + sed -i "/import sys/a import sys; sys.path[0:0] = '$PYTHONPATH'.split(':')" \ + $out/share/pwndbg/gdbinit.py + ''; + + meta = with stdenv.lib; { + description = "Exploit Development and Reverse Engineering with GDB Made Easy"; + homepage = http://pwndbg.com; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 86be86cb6d63e881fe2cdcd89c31c30dfc551e46..de2d6c5b7bfda41b7b0b8edfbdbbb3137a6ce414 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7"; } else - abort "Saleae Logic software requires i686-linux or x86_64-linux"; + throw "Saleae Logic software requires i686-linux or x86_64-linux"; desktopItem = makeDesktopItem { name = "saleae-logic"; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index cf143f7d9e9d74782f74232fdf551b2a2f386931..28500ee08eee1420242b5c363dee48550d7b2f48 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sloccount-2.26"; src = fetchurl { - url = "http://www.dwheeler.com/sloccount/${name}.tar.gz"; + url = "https://www.dwheeler.com/sloccount/${name}.tar.gz"; sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.dwheeler.com/sloccount/; + homepage = https://www.dwheeler.com/sloccount/; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index f81b327d842825dff0a1baf95482fb9eae22c128..3da98f38ebc76491e4e59b5bcf10ca8b40617c0e 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - name = "stm32flash-1.0"; +stdenv.mkDerivation rec { + name = "stm32flash-0.5"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/stm32flash/stm32flash.tar.gz"; - sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6"; + url = "mirror://sourceforge/stm32flash/${name}.tar.gz"; + sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp"; }; buildFlags = [ "CC=cc" ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = https://sourceforge.net/projects/stm32flash/; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms - maintainers = [ maintainers.the-kenny ]; + maintainers = with maintainers; [ the-kenny elitak ]; }; } diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index eff849744ac488bdc923e937d9cbcb3c38a819cf..fce2fa4fa4b4d427a5636ed60bdd295b3cfad080 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,23 +1,26 @@ -{ stdenv, fetchurl, perl, libunwind }: +{ stdenv, fetchurl, perl, libunwind, buildPackages }: stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.20"; + version = "4.22"; src = fetchurl { - url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "08y5b07vb8jc7ak5xc3x2kx1ly6xiwv1gnppcqjs81kks66i9wsv"; + url = "https://strace.io/files/${version}/${name}.tar.xz"; + sha256 = "17dkpnsjxmys1ydidm9wcvc3wscsz44fmlxw3dclspn9cj9d1306"; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; - buildInputs = [ libunwind ]; # support -k + buildInputs = stdenv.lib.optional libunwind.supportsHost [ libunwind ]; # support -k + + configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check"; meta = with stdenv.lib; { - homepage = http://strace.sourceforge.net/; + homepage = http://strace.io/; description = "A system call tracer for Linux"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ mornfall jgeerds globin ]; + maintainers = with maintainers; [ jgeerds globin ]; }; } diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 45a31ad66f2056212eb2a6207d764f465813751d..dbd036d03fdf4427ebbd33e8a0c3b0f72bf24a63 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysql, - libaio }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql +, libaio }: stdenv.mkDerivation rec { - name = "sysbench-1.0.6"; + name = "sysbench-1.0.14"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ vim libmysql libaio ]; + buildInputs = [ vim mysql.connector-c libaio ]; src = fetchFromGitHub { owner = "akopytov"; repo = "sysbench"; - rev = "1.0.6"; - sha256 = "0y3hlhzrggyyxwf378n006zlg2kwhmhh6vq6il0qn9agjmjmhl5l"; + rev = "1.0.14"; + sha256 = "0mp1wqdm87zqyn55z23qf1izqz7ijgcbsysdwqndd98w6m5d86rp"; }; meta = { diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 7b360655c4f71d0ed2561f7ac46dc7a7580c44f6..4263b80789a204d90c09bccffaed581942267863 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { license = licenses.gpl3; description = "Firmware uploader for the Teensy microcontroller boards"; - homepage = http://www.pjrc.com/teensy/; + homepage = https://www.pjrc.com/teensy/; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 571af764fcf7ba17514c8efb006b47b20fa224e6..0feb4b943df3b93ebe4ba224da062a7392f7954c 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, xz, procps, interactive ? false }: +{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, procps, interactive ? false }: with stdenv.lib; @@ -10,10 +10,17 @@ stdenv.mkDerivation rec { sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal"; }; + # We need a native compiler to build perl XS extensions + # when cross-compiling. + depsBuildBuild = [ buildPackages.stdenv.cc perl ]; + buildInputs = [ perl xz.bin ] ++ optional interactive ncurses ++ optional doCheck procps; # for tests + configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] + ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + preInstall = '' installFlags="TEXMF=$out/texmf-dist"; installTargets="install install-tex"; diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix index 4691df6917b4a385c97dc35f4aad8b55ab38d109..afa7e9a0a20692ef7015407b8bf1cb29394ccb8c 100644 --- a/pkgs/development/tools/misc/texinfo/6.5.nix +++ b/pkgs/development/tools/misc/texinfo/6.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }: +{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }: with stdenv.lib; @@ -10,12 +10,17 @@ stdenv.mkDerivation rec { sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"; }; - buildInputs = [ perl xz ] + # We need a native compiler to build perl XS extensions + # when cross-compiling. + depsBuildBuild = [ buildPackages.stdenv.cc perl ]; + + buildInputs = [ xz ] ++ optionals stdenv.isSunOS [ libiconv gawk ] ++ optional interactive ncurses ++ optional doCheck procps; # for tests - configureFlags = stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] + ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; preInstall = '' installFlags="TEXMF=$out/texmf-dist"; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 2759b18e35c36b4d3bbdb086bfeec095c5f003d6..d1f6cc4ea29b196844ee50948482a91adf268e12 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,26 +2,21 @@ rustPlatform.buildRustPackage rec { name = "tokei-${version}"; - version = "6.1.2"; + version = "7.0.0"; src = fetchFromGitHub { owner = "Aaronepower"; repo = "tokei"; rev = "v${version}"; - sha256 = "1bzs3mr6f9bna39b9ddwwq0raas07nbn106mnq3widxg59i0gxhd"; + sha256 = "1c8m2arhy58ky8pzj0dp3w9gpacia9jwmayi0il640l4fm8nr734"; }; - cargoSha256 = "0y0rkxhkv31v5sa0425dwskd80i6srwbqhqkrw1g1kbmbs9y0vxz"; - - buildPhase = '' - # do not pass --frozen since Cargo.lock has the wrong tokei version - cargo build --release - ''; + cargoSha256 = "1cl4fjbvrw7zhpb8rxj566ddlxbj9vdsb1cp7mh6llmvaia2vgks"; meta = with stdenv.lib; { description = "Count code, quickly"; homepage = https://github.com/Aaronepower/tokei; - license = licenses.mit; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; }; diff --git a/pkgs/development/tools/misc/travis/Gemfile b/pkgs/development/tools/misc/travis/Gemfile index d52f576be243ada8ed5e3a324b926db30fb3bdb5..788341de3fa6870418b1c1ce92338c99d223acab 100644 --- a/pkgs/development/tools/misc/travis/Gemfile +++ b/pkgs/development/tools/misc/travis/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "travis" +gem "travis", "1.8.8" diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index 529be0793605607f0a6c5d7d16d76f89256d9b58..a1c8332a3d448b48db28ad150a84465dac486c31 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -45,7 +45,7 @@ PLATFORMS ruby DEPENDENCIES - travis + travis (= 1.8.8) BUNDLED WITH - 1.14.4 + 1.14.6 diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix index a520c4deb34220d821c4558368115251c5eaa68d..b5c5740e80ff40cd5ebcdf00fcb64ba8324c16b8 100644 --- a/pkgs/development/tools/misc/travis/default.nix +++ b/pkgs/development/tools/misc/travis/default.nix @@ -1,5 +1,10 @@ { lib, bundlerEnv, ruby }: +# Maintainer notes for updating +# 1. increment version number in Gemfile +# 2. run $ nix-shell --command "bundler install && bundix" +# in the travis directory in nixpkgs + bundlerEnv { inherit ruby; pname = "travis"; diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix index 148923848beb0d6bd14566abe9941ddf870a2221..c9a54bd324c2aad5654eaf649a47fa12c5ca4dd0 100644 --- a/pkgs/development/tools/misc/travis/gemset.nix +++ b/pkgs/development/tools/misc/travis/gemset.nix @@ -16,6 +16,7 @@ version = "3.6.8"; }; ethon = { + dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1i873cvma4j52xmij7kasjylh66vf60cy5prkp4cz4hcn9jlkznl"; @@ -24,6 +25,7 @@ version = "0.10.1"; }; faraday = { + dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr"; @@ -32,6 +34,7 @@ version = "0.11.0"; }; faraday_middleware = { + dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0bcarc90brm1y68bl957w483bddsy9idj2gghqnysk6bbxpsvm00"; @@ -48,6 +51,7 @@ version = "1.9.18"; }; gh = { + dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0g4df0jsscq16g6f27flfmvk7p4sbq81d5mdylbz4ikqq60kywzg"; @@ -72,6 +76,7 @@ version = "2.0.3"; }; launchy = { + dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; @@ -112,6 +117,7 @@ version = "1.0.1"; }; pusher-client = { + dependencies = ["json" "websocket"]; source = { remotes = ["https://rubygems.org"]; sha256 = "18ymxz34gmg7jff3h0nyzp5vdg5i06dbdxlrdl2nq4hf14qwj1f4"; @@ -120,6 +126,7 @@ version = "0.6.2"; }; travis = { + dependencies = ["backports" "faraday" "faraday_middleware" "gh" "highline" "launchy" "pusher-client" "typhoeus"]; source = { remotes = ["https://rubygems.org"]; sha256 = "02bjz73f6r9b7nskwzcvcbr4hlvgwrf9rnr6d218d2i1rk4ww936"; @@ -128,6 +135,7 @@ version = "1.8.8"; }; typhoeus = { + dependencies = ["ethon"]; source = { remotes = ["https://rubygems.org"]; sha256 = "03x3fxjsnhgayl4s96h0a9975awlvx2v9nmx2ba0cnliglyczdr8"; diff --git a/pkgs/development/tools/misc/travis/shell.nix b/pkgs/development/tools/misc/travis/shell.nix new file mode 100644 index 0000000000000000000000000000000000000000..ddcf493bb46823417b5bc31bde3a4c478f2ef836 --- /dev/null +++ b/pkgs/development/tools/misc/travis/shell.nix @@ -0,0 +1,11 @@ +# Env to update Gemfile.lock / gemset.nix + +with import {}; +stdenv.mkDerivation { + name = "env"; + buildInputs = [ + ruby.devEnv + gnumake + bundix + ]; +} diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 889595ab743a172705a989255a306e4c259067aa..2ea87fe6d7f1519b9a9d69e601f4bb3f6052ceb7 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -7,36 +7,45 @@ # SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" # SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" -stdenv.mkDerivation rec { - name = "uhd-${version}"; - version = "3.10.2.0"; +let + uhdVer = "v" + version; + ImgVer = "uhd-images_3.11.0.git-227-g9277fc58.tar.xz"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz - # and xxx.yyy.zzz. Hrmpf... + # and xxx.yyy.zzz. Hrmpf... style keeps changing + version = "3.11.0.0"; + + # Firmware images are downloaded (pre-built) from: + # http://files.ettus.com/binaries/images/ + uhdImagesSrc = fetchurl { + url = "http://files.ettus.com/binaries/images/${ImgVer}"; + sha256 = "1z8isnlxc5h0168jjpdvdv7rkd55x4dkfh14m8pc501zsf8azd6z"; + }; + +in stdenv.mkDerivation { + name = "uhd-${version}"; src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "release_003_010_002_000"; - sha256 = "0g6f4amw7h0vr6faa1nc1zs3bc645binza0zqqx5cwgfxybv8cfy"; + rev = "${uhdVer}"; + sha256 = "1ilx1a8k5zygfq7acm9yk2fi368b1a1l7ll21kmmxjv6ifz8ds5q"; }; enableParallelBuilding = true; - cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"; + # ABI differences GCC 7.1 + # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector::iterator {aka __gnu_cxx::__normal_iterator >}' changed in GCC 7.1 + + cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++ + [ (stdenv.lib.optionalString stdenv.isArm "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ]; # Build only the host software preConfigure = "cd host"; - - # Firmware images are downloaded (pre-built) - uhdImagesName = "uhd-images_003.007.003-release"; - uhdImagesSrc = fetchurl { - url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz"; - sha256 = "1pv5c5902041494z0jfw623ca29pvylrw5klybbhklvn5wwlr6cv"; - }; + patches = if stdenv.isArm then ./neon.patch else null; postPhases = [ "installFirmware" ]; @@ -55,7 +64,7 @@ stdenv.mkDerivation rec { ''; homepage = https://uhd.ettus.com/; license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor fpletz ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ bjornfor fpletz tomberek ]; }; } diff --git a/pkgs/development/tools/misc/uhd/neon.patch b/pkgs/development/tools/misc/uhd/neon.patch new file mode 100644 index 0000000000000000000000000000000000000000..18ec59c1d64bef27aed4c53212e90ed01b7d95c6 --- /dev/null +++ b/pkgs/development/tools/misc/uhd/neon.patch @@ -0,0 +1,19 @@ +Description: When building for armhf, enable NEON + NEON is part of the armhf baseline, so this will always be enabled on + armhf. +Author: Paul Tagliamonte +Bug-Debian: https://bugs.debian.org/873608 +Origin: vendor +Last-Update: 2017-08-29 + +--- uhd-3.10.2.0.orig/host/lib/convert/CMakeLists.txt ++++ uhd-3.10.2.0/host/lib/convert/CMakeLists.txt +@@ -67,6 +67,8 @@ IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_V + ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/convert_neon.S + ) ++ ++ SET ( CMAKE_CXX_FLAGS "-mfpu=neon" ) + ENDIF() + + ######################################################################## diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 6c27ad408603d6ecbb168d1813944c9c103b70bd..3cf707c6bebb1c4245c82ab82b3d945eb8c5b8a5 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.66"; + version = "0.66.1"; src = fetchFromGitHub { owner = product; repo = product; rev = name; - sha256 = "156y71yf2xxskvikbn6yjfv8xgnsrrjij08irv21z0n7nx35jgmm"; + sha256 = "1y69b0g07ksynf1fwfh5qqwmscxfbvs1yi3n3lbdd4vplb9zakyx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 2a77fc42602adbf4574b10e61306819c68f384e7..eb51abe0321400dc02988bf0c01b411b97705b2b 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,22 +2,25 @@ stdenv.mkDerivation rec { name = "universal-ctags-${version}"; - version = "2017-09-22"; + version = "2018-01-05"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "b9537289952cc7b26526aaff3094599d714d1729"; - sha256 = "1kbw9ycl2ddzpfs1v4rbqa4gdhw4inrisf4awyaxb7zxfxmbzk1g"; + rev = "c66bdfb4db99977c1bd0568e33e60853a48dca65"; + sha256 = "0fdzhr0704cj84ym00plkl5l9w83haal6i6w70lx6f4968pcliyi"; }; nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + # to generate makefile.in autoreconfPhase = '' - ./autogen.sh --tmpdir + ./autogen.sh ''; + configureFlags = [ "--enable-tmpdir=/tmp" ]; + postConfigure = '' sed -i 's|/usr/bin/env perl|${perl}/bin/perl|' misc/optlib2c ''; diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix index 0ad79005d91e4814646f2976366b0a06b2ca03aa..0fa854f9b2a159db5620a9c6c29f9c8ddc6468af 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/data.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "usb-modeswitch-data-${version}"; - version = "20170205"; + version = "20170806"; src = fetchurl { url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; - sha256 = "1l9q4xk02zd0l50bqhyk906wbcs26ji7259q0f7qv3cj52fzvp72"; + sha256 = "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff"; }; inherit (usb-modeswitch) makeFlags; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 8a1ce7c0886866f421f3e86b6c7746cfd276f68a..d34a94e0467001d0ef3e6aac1791edca04c59a9d 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "usb-modeswitch-${version}"; - version = "2.5.0"; + version = "2.5.2"; src = fetchurl { url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; - sha256 = "0cvnd16n2sp3w46fy507nl29q39jxxdk5qqbvk1rxaa91llbxh1i"; + sha256 = "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb"; }; makeFlags = [ diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index f05988e7026437401339494df8ebcdc2baf8b8a9..844758c0f0650e772283bb7cc1e8671746a6cd25 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -14,17 +14,17 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; + # Fixes build with Qt 5.9 + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + preConfigure = '' - ln -s ${qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs - ln -s ${qtbase.dev}/bin/* ../__nix_qt*__/bin || true + cd src + make -f Makefile.bootstrap ''; - NIX_CFLAGS_COMPILE="-I${qtbase.dev}/include/QtCore -I${qtbase.dev}/include/QtGui -I${qtbase.dev}/include/QtWidgets"; - - configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap"; - - installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin"; - + postInstall = '' + install -D ../bin/xxdiff $out/bin/xxdiff + ''; meta = with stdenv.lib; { homepage = http://furius.ca/xxdiff/; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 4c60067c48efdc35040db7158d3fbab3fb56009f..5f90525feca127c9d1926076f66a7e2199f88123 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -15,12 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0bs94iv521ac2n53n3k8mw3s6v0hi3hhxhjsr0ips3n99al8wndi"; }; - buildInputs = [ cmake boost ] + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost llvmPackages.libclang ] ++ 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 + ${python.interpreter} build.py --system-libclang --clang-completer --system-boost ''; patches = [ ./dont-symlink-clang.patch ]; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index e0bf9eac69632f7ec7a69a7b0803f41ab5ab87cd..1f5ead84677b504e32d64f2bbaf1d55527ce90d3 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 = "4.01.00"; + version = "4.02.00"; nativeBuildInputs = [ icmake ]; buildInputs = [ perl ]; src = fetchFromGitHub { - sha256 = "1aahwmj4gmf59lrij2373lkgfj77i3ghdas9c7iqrjwaizb0430p"; + sha256 = "08i3q3h581kxr5v7wi114bng66pwwsjs5qj3ywnnrr7ra1h5rzwa"; rev = version; repo = "yodl"; owner = "fbb-git"; @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt ''; + # Set TERM because icmbuild calls tput. + TERM = "xterm"; + buildPhase = '' ./build programs ./build macros @@ -43,7 +46,7 @@ stdenv.mkDerivation rec { description = "A package that implements a pre-document language and tools to process it"; homepage = https://fbb-git.github.io/yodl/; license = licenses.gpl3; - maintainers = with maintainers; [ nckx pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index 6dc57afb51ef1deaee59277c18f6632a28517c54..fd21a8a23d3426638105af7fd664c1c581b3a749 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast }: +{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast, psutil }: buildPythonApplication rec { - name = "${pname}-${version}"; pname = "mypy"; - version = "0.540"; + version = "0.590"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "5d82f51e228a88e5de6ac1d6699dd09e250ce7de217a5ff1256e317266e738ec"; + sha256 = "0ynyrrj0wjyw130ay9x1ca88lbhbblp06bfsjrpzbcvp4grgxgq4"; }; - propagatedBuildInputs = [ lxml typed-ast ]; + propagatedBuildInputs = [ lxml typed-ast psutil ]; meta = with stdenv.lib; { description = "Optional static typing for Python"; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index aef851e647653819add1ea082714fa3586b4bd90..dea1ab2a4459b2989264ba8cb9ddde863f54c5c6 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = http://martiansoftware.com/nailgun/; license = licenses.apsl20; platforms = platforms.linux; - maintainer = with maintainers; [ volth ]; + maintainers = with maintainers; [ volth ]; }; } diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix deleted file mode 100644 index 5028ac9580c5fccffa6d885db3cd8c0b6cf34b48..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap -, libnotify}: -let - bits = if stdenv.system == "x86_64-linux" then "x64" - else "ia32"; - - nwEnv = buildEnv { - name = "node-webkit-env"; - paths = [ - xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf - freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage - xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc - xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap - libnotify - ]; - - extraOutputsToInstall = [ "lib" "out" ]; - }; - -in stdenv.mkDerivation rec { - name = "node-webkit-${version}"; - version = "0.11.2"; - - src = fetchurl { - url = "http://dl.node-webkit.org/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz"; - sha256 = if bits == "x64" then - "1iby0yrnbk9xfcsfz59f6g00l6rxiyxvq78shs0c145ky7lknq5q" else - "1hk3c9z3kwmqaj87vc5k1a7fv8jhkyqw1wjmsl3q5i50w880h398"; - }; - - installPhase = '' - mkdir -p $out/share/node-webkit - cp -R * $out/share/node-webkit - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot - - ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0 - - patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw - patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot - - mkdir -p $out/bin - ln -s $out/share/node-webkit/nw $out/bin - ln -s $out/share/node-webkit/nwsnapshot $out/bin - ''; - - buildInputs = [ makeWrapper ]; - - meta = with stdenv.lib; { - description = "An app runtime based on Chromium and node.js"; - homepage = https://github.com/rogerwang/node-webkit; - platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix deleted file mode 100644 index ba5d6c8e3343da96cb99b18ec25b6dbcced45bec..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd }: -let - bits = if stdenv.system == "x86_64-linux" then "x64" - else "ia32"; - - nwEnv = buildEnv { - name = "node-webkit-env"; - paths = [ - xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf - freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage - xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc - xorg.libXtst xorg.libXi - ]; - - extraOutputsToInstall = [ "lib" "out" ]; - }; - -in stdenv.mkDerivation rec { - name = "node-webkit-${version}"; - version = "0.9.2"; - - src = fetchurl { - url = "http://dl.node-webkit.org/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz"; - sha256 = if bits == "x64" then - "04b9hgrxxnvrzyc7kmlabvrfbzj9d6lif7z69zgsbn3x25nxxd2n" else - "0icwdl564sbx27124js1l4whfld0n6nbysdd522frzk1759dzgri"; - }; - - installPhase = '' - mkdir -p $out/share/node-webkit - cp -R * $out/share/node-webkit - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot - - ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0 - - patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw - patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot - - mkdir -p $out/bin - ln -s $out/share/node-webkit/nw $out/bin - ln -s $out/share/node-webkit/nwsnapshot $out/bin - ''; - - buildInputs = [ makeWrapper ]; - - meta = with stdenv.lib; { - description = "An app runtime based on Chromium and node.js"; - homepage = https://github.com/rogerwang/node-webkit; - platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6a2995b2bbe063ea923269af860c58039a410e33 --- /dev/null +++ b/pkgs/development/tools/nwjs/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchurl, buildEnv, makeWrapper + +, xorg, alsaLib, dbus, glib, gtk2, gtk3, atk, pango, freetype, fontconfig +, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap +, libnotify +, ffmpeg, libxcb, libXScrnSaver, cups +, sqlite, udev +}: +let + bits = if stdenv.system == "x86_64-linux" then "x64" + else "ia32"; + + nwEnv = buildEnv { + name = "nwjs-env"; + paths = [ + xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus + xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr + xorg.libXScrnSaver cups + libcap libnotify + # libnw-specific (not chromium dependencies) + ffmpeg libxcb + # chromium runtime deps (dlopen’d) + sqlite udev + ]; + + extraOutputsToInstall = [ "lib" "out" ]; + }; + +in stdenv.mkDerivation rec { + name = "nwjs-${version}"; + version = "0.23.6"; + + src = fetchurl { + url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; + sha256 = if bits == "x64" then + "0ppyjspdvacarhdn4xd5i1pqgmf4z1bxnh1cry780489h25rcjgj" else + "0c0j73vnzhsry5rdx41d954a29jmjnvzli728cfbjybfr51zdybg"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + # we have runtime deps like sqlite3 that should remain + dontPatchELF = true; + + installPhase = + let ccPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; + in '' + mkdir -p $out/share/nwjs + cp -R * $out/share/nwjs + find $out/share/nwjs + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw + + ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 + + libpath="$out/share/nwjs/lib/" + for f in "$libpath"/*.so; do + patchelf --set-rpath "${nwEnv}/lib:${ccPath}:$libpath" "$f" + done + patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${ccPath}:$libpath" $out/share/nwjs/nw + # check, whether all RPATHs are correct (all dependencies found) + checkfile=$(mktemp) + for f in "$libpath"/*.so "$out/share/nwjs/nw"; do + (echo "$f:"; + ldd "$f" ) > "$checkfile" + done + if <"$checkfile" grep -e "not found"; then + cat "$checkfile" + exit 1 + fi + + mkdir -p $out/bin + ln -s $out/share/nwjs/nw $out/bin + ''; + + buildInputs = [ makeWrapper ]; + + meta = with stdenv.lib; { + description = "An app runtime based on Chromium and node.js"; + homepage = http://nwjs.io/; + platforms = ["i686-linux" "x86_64-linux"]; + maintainers = [ maintainers.offline ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 0acd70b424a89a0e04b3aca99d207cf8eb8de651..31cd7ccfd2c0bcbfdb1990499dff2bd34743044f 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -6,15 +6,22 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-7.03"; + name = "camlp5${if transitional then "_transitional" else ""}-7.05"; src = fetchzip { - url = https://github.com/camlp5/camlp5/archive/rel703.tar.gz; - sha256 = "0bwzhp4qjypfa0x8drp8w434dfixm1nzrm6pcy9s5akpmqvb50a8"; + url = https://github.com/camlp5/camlp5/archive/rel705.tar.gz; + sha256 = "16igfyjl2jja4f1mibjfzk0c2jr09nxsz6lb63x1jkccmy6430q2"; }; buildInputs = [ ocaml ]; + postPatch = '' + for p in compile/compile.sh config/Makefile.tpl test/Makefile test/check_ocaml_versions.sh + do + substituteInPlace $p --replace '/bin/rm' rm + done + ''; + prefixKey = "-prefix "; preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 846546ae7699e4fb2de577e03d363fa84df94d7c..6f136a7ef289e0dd21b0b82e4f9f58efbc8fea48 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m4, ncurses, ocaml, writeText}: +{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ./install_topfind.patch ]; + patches = [ ./ldconf.patch ./install_topfind.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; + sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; + }) + ]; dontAddPrefix=true; @@ -34,13 +39,16 @@ stdenv.mkDerivation rec { if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/" fi + if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"; then + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs" + fi export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" if test -n "$createFindlibDestdir"; then mkdir -p $OCAMLFIND_DESTDIR fi } - envHooks+=(addOCamlPath) + addEnvHooks "$targetOffset" addOCamlPath ''; meta = { diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index bef994f30b7c4073a7eb3ebd042a17e841229235..d48bc4101113bfb6ca0c94530ae6af1625ab8af2 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchzip, ocaml, opam }: +{ stdenv, fetchFromGitHub, ocaml, opam }: -stdenv.mkDerivation { - name = "jbuilder-1.0+beta14"; - src = fetchzip { - url = http://github.com/janestreet/jbuilder/archive/1.0+beta14.tar.gz; - sha256 = "0vq4chqp7bm3rd5n6ry1j1ia6xqlz463059ljd1jmawa4dcyilvl"; +stdenv.mkDerivation rec { + name = "jbuilder-${version}"; + version = "1.0+beta17"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "dune"; + rev = "${version}"; + sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index b3a37e3f7608a1021e8d71b99228802398446320..3caeabaae78b6c2dd7be391d7e05a20a672bab4b 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -1,5 +1,5 @@ { stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler -, camlp4 +, camlp4, ocsigen_deriving }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib jbuilder camlp4 ]; + buildInputs = [ ocaml findlib jbuilder camlp4 ocsigen_deriving ]; buildPhase = "jbuilder build -p js_of_ocaml-camlp4"; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 11df26818c1f0a8ada6e9eca2c55d93a5b3f5c38..6d269552f62898f560a6e3c8edbf53416ad54505 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -8,13 +8,13 @@ else stdenv.mkDerivation rec { name = "js_of_ocaml-compiler-${version}"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "17w1pqjk521jd4yp34miyif0cxjxchnw59xhj188qfl635ykb4k8"; + sha256 = "17a0kb39bcx2qq41cq7kjrxghm67l1yahrs47yakgb1avna0pqd9"; }; buildInputs = [ ocaml findlib jbuilder cmdliner cppo ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix new file mode 100644 index 0000000000000000000000000000000000000000..31a5c3ea17bb4662890fdabd5919512bbefd1d07 --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -0,0 +1,16 @@ +{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx +, ocaml-migrate-parsetree, ppx_tools_versioned +, js_of_ocaml, ocaml_lwt +}: + +stdenv.mkDerivation rec { + name = "js_of_ocaml-lwt-${version}"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt ]; + + buildPhase = "jbuilder build -p js_of_ocaml-lwt"; +} diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix new file mode 100644 index 0000000000000000000000000000000000000000..8f32887c5bf5dd19ce5d5316a711407eb4821666 --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -0,0 +1,15 @@ +{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler +, js_of_ocaml, ppx_deriving +}: + +stdenv.mkDerivation rec { + name = "js_of_ocaml-ppx_deriving_json-${version}"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder ]; + + propagatedBuildInputs = [ js_of_ocaml ppx_deriving ]; + + buildPhase = "jbuilder build -p js_of_ocaml-ppx_deriving_json"; +} diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix new file mode 100644 index 0000000000000000000000000000000000000000..041fd71f92fa68c15156c5d29610464e3c651c50 --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -0,0 +1,16 @@ +{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler +, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned +, js_of_ocaml, reactivedata, tyxml +}: + +stdenv.mkDerivation rec { + name = "js_of_ocaml-tyxml-${version}"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + + propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; + + buildPhase = "jbuilder build -p js_of_ocaml-tyxml"; +} diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 904e070e5115a637cd47b8ead473e96d77b24290..d09f06623a7e49b70bc4c87c67fc6f8bb0299349 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.0.3"; + version = "3.0.5"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "19gz9vcdna84xcm2b53m6b5g4c7ppb61j05fnvry3shvjiz2p58p"; + sha256 = "06h0klzzvb62rzb6m0pq8aa207fz7z54mjr05vky4wv8195bbjiy"; }; buildInputs = [ ocaml findlib yojson ] diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index e9331d078cf36dad8de878e919f2396ca598543e..3cf70d66ddbdb1a88e3984e6ff23c3353fee4179 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { inherit (jbuilder) installPhase; meta = { - homepage = http://www.typerex.org/ocaml-top.html; + homepage = https://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 = ocamlPackages.ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index b6e439e4e17461c0bd09861eb47f300d22ca2864..3f42e71e7783238d1fc72445f9d3ac876b613bbf 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib }: let - version = "0.11.0"; + version = "0.12.0"; in stdenv.mkDerivation { name = "ocamlbuild-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "0c8lv15ngmrc471jmkv0jp3d573chibwnjlavps047d9hd8gwxak"; + sha256 = "1shyim50ms0816fphc4mk0kldcx3pnba2i6m10q0cbm18m9d7chq"; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index 2876464ab502ed60b54181f742b1dfa2a45055ad..df480903d15408ce46634b54e528e2487e8b8244 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -10,9 +10,16 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + configurePhase = '' + substituteInPlace src/ocamlify.ml --replace 'OCamlifyConfig.version' '"0.0.2"' + ''; + + buildPhase = "ocamlbuild src/ocamlify.native"; + + installPhase = '' + mkdir -p $out/bin + mv _build/src/ocamlify.native $out/bin/ocamlify + ''; dontStrip = true; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 2a9a634d0a4a11367861b788200771780580b58b..8da0f781a8b24e2db2187a6e19c3feff613ba0a0 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -22,7 +22,7 @@ buildOcaml { ''; meta = with stdenv.lib; { - homepage = http://www.typerex.org/ocp-build.html; + homepage = https://www.typerex.org/ocp-build.html; description = "A build tool for OCaml"; longDescription = '' ocp-build is a build system for OCaml application, based on simple diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index f96b7888db0f537237906ccd11c162803f23f52a..d11278f4d29c49a3862636e7a67c7f8a94c7249b 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -9,11 +9,11 @@ assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; stdenv.mkDerivation rec { name = "ocp-indent-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchzip { url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz"; - sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; + sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; nativeBuildInputs = [ ocpBuild opam ]; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index c212ce324b331789fc604509d2d2ac9c1ffd0f05..37807b245ff2735fb917b5516fd1802e0e0146f5 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -7,6 +7,9 @@ stdenv.mkDerivation rec buildInputs = with ocamlPackages; [ ocaml findlib ]; + + dontStrip = true; + installPhase = '' mkdir -p $out/bin make bindir=$out/bin install diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 9f318afc67d76523216c3e0fa21e1af77dce9973..84365889638cbafc22dfd327fbb4543f87123368 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; + url = "http://src.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; }; patchFlags = "-p0"; diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 821401d578c7c98461e952684c6a25e7e3166793..cdd599c451f8d48dbb1b14726f23fd6b81f27c47 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "omniorb-${version}"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl rec { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl"; + sha256 = "1klf6ivhsisdnqxcbf161jxva0xzmfgmwypnxfzf4jq16770knfx"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index f8dc96c2394b90b653aaddfaeb3d85e6ab62ccc0..b7757b47471681de47af150d1c1a1c9adafff589 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 = "1.1.0"; + version = "1.2.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "09hwq6dxyzhpl97akwbb02bjrisz9rf296avg5zj2p5qdsf4y777"; + sha256 = "05qsyh6d4qsvabr543ggd4b09fipxzr270cawsx0glmkgw82nkzi"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 23141185f68e1e919cba1f41a1d3394e70ae7724..017ef20e81c66641c45c1a52f868cf3aa870142b 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { walk parse trees. ''; homepage = http://www.antlr.org/; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index 41b079bbd23b8f688cef8ea91a4e36fac59ffc42..f58d0f9904aa0347f9c25d27ca2102cf84f06373 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "antlr-${version}"; - version = "4.7"; + version = "4.7.1"; src = fetchurl { url ="http://www.antlr.org/download/antlr-${version}-complete.jar"; - sha256 = "0r08ay63s5aajix5j8j7lf7j7l7wiwdkr112b66nyhkj5f6c72yd"; + sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; }; unpackPhase = "true"; diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index c34eb9fc708414b4dfbe4680cc1e2a5fa238b6ef..612196cba77a94edc5f44c10501ca5f7052bfbf8 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "byacc-${version}"; - version = "20170201"; + version = "20170709"; src = fetchurl { urls = [ - "ftp://invisible-island.net/byacc/${name}.tgz" - "http://invisible-mirror.net/archives/byacc/${name}.tgz" + "ftp://ftp.invisible-island.net/byacc/${name}.tgz" + "https://invisible-mirror.net/archives/byacc/${name}.tgz" ]; - sha256 = "90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91"; + sha256 = "1syrg1nwh2qmlr5mh7c4vz9psdv4gf55h8i5ffw84q6whlcq1kr7"; }; doCheck = true; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 4ea11a622ea19005c4843c31f00b6cd0a33ec5a9..17323a06cc18827903299bb1b52a09c971a0558d 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, m4 +{ stdenv, buildPackages, fetchurl, bison, m4 , fetchpatch, autoreconfHook, help2man }: @@ -19,28 +19,27 @@ stdenv.mkDerivation rec { + "/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch"; sha256 = "1aarhcmz7mfrgh15pkj6f7ikxa2m0mllw1i1vscsf1kw5d05lw6f"; })]; - nativeBuildInputs = [ autoreconfHook help2man ]; + postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace Makefile.in --replace "tests" " " - buildInputs = [ bison ]; + substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: ' + ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ autoreconfHook help2man ]; + buildInputs = [ bison ]; propagatedBuildInputs = [ m4 ]; + preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + export ac_cv_func_malloc_0_nonnull=yes + export ac_cv_func_realloc_0_nonnull=yes + ''; + postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; - crossAttrs = { - - # disable tests which can't run on build machine - postPatch = '' - substituteInPlace Makefile.in --replace "tests" " "; - ''; - - preConfigure = '' - export ac_cv_func_malloc_0_nonnull=yes - export ac_cv_func_realloc_0_nonnull=yes - ''; - }; + dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform; meta = { homepage = https://github.com/westes/flex; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index c782df5075805557997ed18df5f03de089f559d0..681f90bbe5a677ed1c5dcb3f37a6b8b920b20d83 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { homepage = https://fbb-git.github.io/flexcpp/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index 5406b4e9a0e53ebf6935d433796da735bbe84f39..359daad2d517c282964612600c212fe747357601 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, jansson }: stdenv.mkDerivation rec { - name = "jshon-20140712"; + name = "jshon-20160111.2"; rev = "a61d7f2f85f4627bc3facdf951746f0fd62334b7"; - sha256 = "b0365e58553b9613a5636545c5bfd4ad05ab5024f192e1cb1d1824bae4e1a380"; + sha256 = "1053w7jbl90q3p5y34pi4i8an1ddsjzwaib5cfji75ivamc5wdmh"; src = fetchFromGitHub { inherit rev sha256; diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index 480ee5b88f6ace35c86f50668294b72bc2d168e3..108576d0b11ccc6573181f80052a84e02613d687 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -41,6 +41,5 @@ in stdenv.mkDerivation rec { homepage = http://www.hwaci.com/sw/lemon/; license = licenses.publicDomain; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix index 1706b5448e147ee8b28d32fa85ad49da19b389e1..3a273e1ddbfaf55e1e344e234c2026399aed9ffc 100644 --- a/pkgs/development/tools/parsing/peg/default.nix +++ b/pkgs/development/tools/parsing/peg/default.nix @@ -1,20 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "peg-0.1.4"; + name = "peg-0.1.18"; src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "01agf4fbqv0r1xyqvj0va8kcrh3f2ka59f1aqvzfrabn7n5p8ik4"; + sha256 = "114h1y4k8fwcq9m0hfk33dsp7ah8zxzjjzlk71x4iirzczfkn690"; }; preBuild="makeFlagsArray+=( PREFIX=$out )"; - preInstall='' - mkdir -pv $out/bin $out/share/man/man1 - cp -pv *.1 $out/share/man/man1 - ''; - meta = { homepage = http://piumarta.com/software/peg/; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 66895fb7fd3ed49cabbd8d2dabb583eab0fb1c11..6b497e456300c39c9aa5db9e0ee4f798d1243f3d 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -20,7 +20,7 @@ let configureFlags = [ "--with-colm=${colm}" ]; - NIX_CFLAGS_COMPILE = "-std=gnu++98"; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-std=gnu++98"; doCheck = true; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index dcf89d1604d9251ae71563fcb81cce7489302d9e..da1bcced32ec08a093a88400995f787a8a327ec1 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "re2c-${version}"; - version = "0.16"; + version = "1.0.3"; sourceRoot = "${src.name}/re2c"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "0cijgmbyx34nwl2jmsswggkgvzy364871rkbxz8biq9x8xrhhjw5"; + sha256 = "0grx7nl9fwcn880v5ssjljhcb9c5p2a6xpwil7zxpmv0rwnr3yqi"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index 16fc48174175c5daf012ebe1e4c61db1c6170f78..73046165b1ab95687d33ca56d0a2563c22e817d0 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pew"; - version = "1.1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0b8z1vjsll1kgnh3mmdjps5rr9gayy091rapp2dra71jrwkx3yfh"; + sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; }; propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; @@ -29,4 +29,4 @@ with python3Packages; buildPythonApplication rec { platforms = platforms.all; maintainers = with maintainers; [ berdario ]; }; - } \ No newline at end of file + } diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 1a6a4ca890c0f8346745f6fb84957c0c8574d462..3c062dbe1ab4a8237749c50a82d2a34a0189ae5b 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -74,6 +74,10 @@ in stdenv.mkDerivation rec { url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-print.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw"; }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/unlock-qt.patch"; + sha256 = "13bwz4iw17d6hq5pwkbpcckqyw7fhc6648lvs26m39pp31zwyp03"; + }) ./system-qtbase.patch ]; @@ -101,6 +105,7 @@ in stdenv.mkDerivation rec { $out/bin/phantomjs '' + '' wrapProgram $out/bin/phantomjs \ + --set QT_QPA_PLATFORM offscreen \ --prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]} ''; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 01433a6ce4d4b19eb4fb0636ef8de84fc5142004..153c0f76a40597275cadb6fd5037c4e77bca8f8d 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "8.2.7"; + version = "11.9.0"; src = fetchPypi { inherit pname version; - sha256 = "08wkxs6qqgzxamym523bjv7zahg8p9v18x0yi9vwclij5k91iyzm"; + sha256 = "7b3c52fb57e17ca61b6141b75c8f5ba61a95c713ca470754240f7f1dbd0a4968"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index 004e5dbd46e554a3303c7f457476bc919e830a71..98b38697992d6cebd61f9e9ac81b441146640fed 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, autoconf, libelf, libiberty, gfortran, zlib, binutils }: +{ stdenv +, fetchurl, autoconf, gfortran +, libelf, libiberty, zlib, libbfd, libopcodes +, buildPackages +}: stdenv.mkDerivation rec { version = "1.0.6"; @@ -9,12 +13,15 @@ stdenv.mkDerivation rec { sha256 = "06q5y9qmdn1h0wjmy28z6gwswskmph49j7simfqcqwv05gvd9svr"; }; - # Goes past the rpl_malloc linking failure + # Goes past the rpl_malloc linking failure; fixes silent file breakage preConfigure = '' export ac_cv_func_malloc_0_nonnull=yes + substituteInPlace ./configure \ + --replace "/usr/bin/file" "${buildPackages.file}/bin/file" ''; - buildInputs = [ autoconf libelf libiberty gfortran zlib binutils ]; + nativeBuildInputs = [ autoconf gfortran ]; + buildInputs = [ libelf libiberty zlib libbfd libopcodes ]; meta = { description = "Tool that aims at generating automatically execution trace from HPC programs"; diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index e97ff61a0dc0c6822e1e7bc63636020a2e5c0ae5..f5f9a15dd00affbd07d85cc897cbfdf5b12e9468 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, cmake, extra-cmake-modules, - zlib, boost162, libunwind, elfutils, sparsehash, - qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, + zlib, boost, libunwind, elfutils, sparsehash, + qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram }: stdenv.mkDerivation rec { name = "heaptrack-${version}"; - version = "2017-10-30"; + version = "2018-01-28"; src = fetchFromGitHub { owner = "KDE"; repo = "heaptrack"; - rev = "2bf49bc4fed144e004a9cabd40580a0f0889758f"; - sha256 = "0sqxk5cc8r2vsj5k2dj9jkd1f2x2yj3mxgsp65g7ls01bgga0i4d"; + rev = "a4534d52788ab9814efca1232d402b2eb319342c"; + sha256 = "00xfv51kavvcmwgfmcixx0k5vhd06gkj5q0mm8rwxiw6215xp41a"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ - zlib boost162 libunwind elfutils sparsehash - qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons + zlib boost libunwind elfutils sparsehash + qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index dc447465b238652b528ed3316f125e310b4b2f4e..6087400af5be3ea90134b9da97b86ea8ec5585cd 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders, coreutils -, libiberty_static, withGUI ? false , qt4 ? null}: +{ stdenv, buildPackages +, fetchurl, pkgconfig +, libbfd, popt, zlib, linuxHeaders, libiberty_static +, withGUI ? false, qt4 ? null +}: # libX11 is needed because the Qt build stuff automatically adds `-lX11'. assert withGUI -> qt4 != null; @@ -14,12 +17,12 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace opjitconv/opjitconv.c \ - --replace "/bin/rm" "${coreutils}/bin/rm" \ - --replace "/bin/cp" "${coreutils}/bin/cp" + --replace "/bin/rm" "${buildPackages.coreutils}/bin/rm" \ + --replace "/bin/cp" "${buildPackages.coreutils}/bin/cp" ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ binutils zlib popt linuxHeaders libiberty_static ] + buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ] ++ stdenv.lib.optionals withGUI [ qt4 ]; configureFlags = [ diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/tools/profiling/pyprof2calltree/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b2497633a6801d380fd55883ebd53c899654359a --- /dev/null +++ b/pkgs/development/tools/profiling/pyprof2calltree/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonApplication, fetchFromGitHub }: + +buildPythonApplication rec { + pname = "pyprof2calltree"; + version = "1.4.3"; + + # Fetch from GitHub because the PyPi packaged version does not + # include all test files. + src = fetchFromGitHub { + owner = "pwaller"; + repo = "pyprof2calltree"; + rev = "v" + version; + sha256 = "0i0a895zal193cpvzbv68fch606g4ik27rvzbby3vxk61zlxfqy5"; + }; + + meta = with lib; { + description = "Help visualize profiling data from cProfile with kcachegrind and qcachegrind"; + homepage = https://pypi.python.org/pypi/pyprof2calltree/; + license = licenses.mit; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 001560df0a040ad52266e7059299374f05bb6533..a2ea3444db6026c83afeb4acb5f7ec3b10507fb9 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -1,5 +1,7 @@ -{ fetchurl, stdenv, binutils -, pkgconfig, gtk2, glib, pango, libglade }: +{ stdenv +, fetchurl, pkgconfig +, gtk2, glib, pango, libglade +}: stdenv.mkDerivation rec { name = "sysprof-1.2.0"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ binutils gtk2 glib pango libglade ]; + buildInputs = [ gtk2 glib pango libglade ]; meta = { homepage = http://sysprof.com/; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index b397f02665bc453646bfc78e014962b09f1556e6..55902f48bb733092789241a60f1ec14fe041fc2d 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,13 +1,13 @@ { fetchgit, pkgconfig, gettext, runCommand, makeWrapper -, elfutils, kernel, gnumake, python2, pythonPackages +, elfutils, kernel, gnumake, python2, python2Packages }: let ## fetchgit info url = git://sourceware.org/git/systemtap.git; - rev = "276ed27a3cc64531542ab73bb36bb04784e79bbc"; - sha256 = "11967dx3cjs96v3ncfljw0h7blsgg9wm8g9z2270q9a90988g2c2"; - version = "2017-02-04"; + rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892"; + sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq"; + version = "2017.10.18"; inherit (kernel) stdenv; inherit (stdenv) lib; @@ -16,8 +16,8 @@ let stapBuild = stdenv.mkDerivation { name = "systemtap-${version}"; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ elfutils gettext python2 pythonPackages.setuptools ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs postPatch = '' substituteInPlace buildrun.cxx --replace \ @@ -39,6 +39,8 @@ let done ''; + pypkgs = with python2Packages; makePythonPath [ pyparsing ]; + in runCommand "systemtap-${kernel.version}-${version}" { inherit stapBuild kernelBuildDir; buildInputs = [ makeWrapper ]; @@ -54,8 +56,10 @@ in runCommand "systemtap-${kernel.version}-${version}" { for bin in $stapBuild/bin/*; do # hello emacs */ ln -s $bin $out/bin done - rm $out/bin/stap + rm $out/bin/stap $out/bin/dtrace makeWrapper $stapBuild/bin/stap $out/bin/stap \ --add-flags "-r $kernelBuildDir" \ --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc stdenv.cc.bintools elfutils gnumake ]} + makeWrapper $stapBuild/bin/dtrace $out/bin/dtrace \ + --prefix PYTHONPATH : ${pypkgs} '' diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix index 772178dd84c1d0e73a65f21022de1d1b3feaa3cc..10a10fa21efb578d8f80c53a1bcba0ddfd52bf56 100644 --- a/pkgs/development/tools/pup/default.nix +++ b/pkgs/development/tools/pup/default.nix @@ -1,15 +1,21 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "pup-${version}"; - version = "20160425-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "e76307d03d4d2e0f01fb7ab51dee09f2671c3db6"; - + version = "0.4.0"; + rev = "v${version}"; + goPackagePath = "github.com/ericchiang/pup"; src = fetchgit { inherit rev; - url = "https://github.com/ericchiang/pup"; - sha256 = "15lwas4cjchlwhrwnd5l4gxcwqdfgazdyh466hava5qzxacqxrm5"; + url = "https://${goPackagePath}"; + sha256 = "0mnhw0yph5fvcnrcmj1kfbyw1a4lcg3k9f6y28kf44ihlq8h1dfz"; + }; + + meta = with lib; { + description = "Streaming HTML processor/selector"; + license = licenses.mit; + maintainers = with maintainers; [ yegortimoshenko ]; }; } diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..de94b7a8eff34b7f2a53b79bd9f73b2a0bc1ed43 --- /dev/null +++ b/pkgs/development/tools/qtcreator/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, makeWrapper +, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake +, withDocumentation ? false +}: + +with stdenv.lib; + +let + baseVersion = "4.5"; + revision = "0"; +in + +stdenv.mkDerivation rec { + name = "qtcreator-${version}"; + version = "${baseVersion}.${revision}"; + + src = fetchurl { + url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; + sha256 = "1yfrfma23xxzz8hl43g7pk7ay5lg25l9lscjlih617lyv6jmc0hl"; + }; + + buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; + + nativeBuildInputs = [ qmake makeWrapper ]; + + doCheck = true; + + enableParallelBuilding = true; + + buildFlags = optional withDocumentation "docs"; + + installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; + + preConfigure = '' + substituteInPlace src/plugins/plugins.pro \ + --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' + ''; + + preBuild = optional withDocumentation '' + ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share + ''; + + postInstall = '' + substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ + --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" + ''; + + meta = { + description = "Cross-platform IDE tailored to the needs of Qt developers"; + longDescription = '' + Qt Creator is a cross-platform IDE (integrated development environment) + tailored to the needs of Qt developers. It includes features such as an + advanced code editor, a visual debugger and a GUI designer. + ''; + homepage = https://wiki.qt.io/Category:Tools::QtCreator; + license = "LGPL"; + maintainers = [ maintainers.akaWolf ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5e88384c58dbfc4225cc1133687549e5a96e31fe --- /dev/null +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib +, freetype, dbus, nss, nspr, alsaLib, cups, expat, libudev, makeDesktopItem +}: + +let + rpath = stdenv.lib.makeLibraryPath [ + cairo + stdenv.cc.cc + gdk_pixbuf + fontconfig + pango + atk + gtk2 + glib + freetype + dbus + nss + nspr + alsaLib + cups + expat + libudev + + gnome2.GConf + + xorg.libX11 + xorg.libXcursor + xorg.libXtst + xorg.libxcb + xorg.libXext + xorg.libXi + xorg.libXdamage + xorg.libXrandr + xorg.libXcomposite + xorg.libXfixes + xorg.libXrender + xorg.libXScrnSaver + ]; +in stdenv.mkDerivation rec { + name = "react-native-debugger-${version}"; + version = "0.7.18"; + + src = fetchurl { + url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; + sha256 = "186n438sy9wzrx2zdw4qq4hsz89wiy01bpfa6fdjisvxgz6r8sgw"; + }; + + buildInputs = [ unzip ]; + buildCommand = '' + shopt -s extglob + mkdir -p $out + unzip $src -d $out + + mkdir $out/{lib,bin,share} + mv $out/lib{node,ffmpeg}.so $out/lib + mv $out/!(lib|share|bin) $out/share + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath ${rpath}:$out/lib \ + $out/share/React\ Native\ Debugger + + ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger + + install -Dm644 "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + ''; + + desktopItem = makeDesktopItem { + name = "rndebugger"; + exec = "React\\ Native\\ Debugger"; + desktopName = "React Native Debugger"; + genericName = "React Native Debugger"; + categories = "Development;Tools;"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/jhen0409/react-native-debugger; + license = licenses.mit; + description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index 054517ea547cc5454471148e1d045177a18352ca..88c975b5735210e7b037ffc9b131107e920f0131 100644 --- a/pkgs/development/tools/redis-dump/default.nix +++ b/pkgs/development/tools/redis-dump/default.nix @@ -9,6 +9,7 @@ bundlerEnv { buildInputs = [ perl autoconf ]; meta = with lib; { + broken = true; # needs ruby 2.0 description = "Backup and restore your Redis data to and from JSON"; homepage = http://delanotes.com/redis-dump/; license = licenses.mit; diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3e69b4ffa073ff50895d1f28e7f2509186e8e9a4 --- /dev/null +++ b/pkgs/development/tools/reflex/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + + +buildGoPackage rec { + name = "reflex-${version}"; + version = "0.2.0"; + + goPackagePath = "github.com/cespare/reflex"; + + src = fetchFromGitHub { + owner = "cespare"; + repo = "reflex"; + rev = "v${version}"; + sha256 = "0ccwjmf8rjh03hpbmfiy70ai9dhgvb5vp7albffq0cmv2sl69dqr"; + }; + + meta = with lib; { + description = "A small tool to watch a directory and rerun a command when certain files change"; + homepage = https://github.com/cespare/reflex; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ nicknovitski ]; + }; +} diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index ac4a39f069203ea2b4c5325fda9cb6cc7f245154..baba4fd75ea93fea220e78632dc14a12fd6337d6 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "remarshal-${version}"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "dbohdan"; repo = "remarshal"; rev = "v${version}"; - sha256 = "0jslawpzghv3chamrfddnyn5p5068kjxy8d38fxvi5h06qgfb4wp"; + sha256 = "1wsgvzfp40lvly7nyyhv9prip4vi32rfc8kdji587jpw28zc1dfb"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/development/tools/remarshal/deps.nix b/pkgs/development/tools/remarshal/deps.nix deleted file mode 100644 index 32f9f6eb0bb5a5b7072db7083c6e5bc15b72ace5..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/remarshal/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; - sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; - }; - } -] diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix index da8a8e2e77db29ed88993a9438582f4e31f22629..46665e8b47ecf056fe8eae210a042f14e6b68945 100644 --- a/pkgs/development/tools/rhc/default.nix +++ b/pkgs/development/tools/rhc/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby_2_2, stdenv, makeWrapper }: +{ lib, bundlerEnv, ruby, stdenv, makeWrapper }: stdenv.mkDerivation rec { name = "rhc-1.38.7"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "rhc-1.38.7-gems"; - ruby = ruby_2_2; + inherit ruby; gemdir = ./.; }; @@ -21,9 +21,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = true; # requires ruby 2.2 homepage = https://github.com/openshift/rhc; description = "OpenShift client tools"; license = licenses.asl20; - maintaners = maintainers.szczyp; + maintainers = [ maintainers.szczyp ]; }; } diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 8fe47bd0cb54b15d358fa33851c01f1a24cd9d57..a2c75a02aa28a20fbfebf2a959ed7bf3d7a89402 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -2,19 +2,18 @@ stdenv.mkDerivation rec { name = "rtags-${version}"; - version = "2.15"; + version = "2.16"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ llvmPackages.llvm openssl emacs ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; - src = fetchgit { rev = "refs/tags/v${version}"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "12nnyav2q1ddkz9wm0aclhn7r74xj4ibrb0x05k7mcf694bg79c0"; + sha256 = "15qmwkajw2zzfnw9hnv08p0asa6prg88nvqlxmv56c0dyhldjpkm"; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation postFetch = '' @@ -33,6 +32,6 @@ stdenv.mkDerivation rec { description = "C/C++ client-server indexer based on clang"; homepage = https://github.com/andersbakken/rtags; license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.allBut [ "i686-linux" ]; + platforms = with stdenv.lib.platforms; x86_64 ++ aarch64; }; } diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index d304560515c41f64387a92ecf1cbcb5d3f11c1fe..2f4c89ab43becddf7a7342fa63563dfbcb58b25a 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -4,27 +4,27 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.31.1"; + version = "0.36.0"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "0b0nr42vvxzrykzn11mwk1h9cqn87fh8423wwrs3h8vpk5jqg55i"; + sha256 = "1bpya490qh2jvq99mdlcifj6mgn3yxr0sqas6y5xw842b46g6hi6"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ llvmPackages.clang-unwrapped ]; + buildInputs = [ llvmPackages.clang-unwrapped.lib ]; configurePhase = '' - export LIBCLANG_PATH="${llvmPackages.clang-unwrapped}/lib" + export LIBCLANG_PATH="${llvmPackages.clang-unwrapped.lib}/lib" ''; postInstall = '' - wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" + wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped.lib}/lib" ''; - cargoSha256 = "1pjyancb5w9rrxirwx8ghhjbnfcc2r0ha5bfnmlfamj8aaaqdc5w"; + cargoSha256 = "0b8v6c7q1abibzygrigldpd31lyd5ngmj4vq5d7zni96m20mm85w"; doCheck = false; # A test fails because it can't find standard headers in NixOS diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index f3cb4e789502e0c9c14c675ece433c4161d53d2a..058185acdbe4c2559083e42545e245ab330a92f3 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -4,17 +4,17 @@ with rustPlatform; buildRustPackage rec { name = "racerd-${version}"; - version = "2017-02-17"; + version = "2017-09-15"; src = fetchFromGitHub { owner = "jwilm"; repo = "racerd"; - rev = "e3f3ff010fce2c67195750d9a6a669ffb3c2ac5f"; - sha256 = "125pmbkjnjh83xwikcwfbb8g150nldz7wh0ly1gv9kl1b521dydk"; + rev = "29cd4c6fd2a9301e49931c2e065b2e10c4b587e4"; + sha256 = "0knz881mjhd8q2i8ydggaa7lfpiqy11wjmnv5p80n1d8zca6yb7z"; }; doCheck = false; - cargoSha256 = "1h7hm7vkk1grah6pn5ydfi5pzc2kd48lh2kxim5jlvrxhd2dingg"; + cargoSha256 = "00gxj98zdkbrc5cxd4w5hk7iwv9a1kwa535hhspx9xd02r4d8rzl"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index b7065cc5d7dae6a61d8f4271cc4cf8255f89076b..65a4a05633c0f268958abe95008e0bce6aeaac98 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,15 +4,15 @@ rustPlatform.buildRustPackage rec { name = "rustup-${version}"; - version = "2017-10-29"; + version = "1.11.0"; - cargoSha256 = "1xwxv8y9xjgdmm92ldrn9m9fml2zb5h7qqm7dhw63j6psb3ajqrw"; + cargoSha256 = "1r9mnj3x9sn16hi1r09gl5q0cnsa2g6kbjw2g115858i2a9k6hkr"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustup.rs"; - rev = "13c8092507bf646f3ef6a621fe2c5a68212e800f"; - sha256 = "1qd01rjk9qpfzgqs35f5nxrcf00kmf76zwmgj3yzdig9zymjwndg"; + rev = version; + sha256 = "05rbgkz4fk6c1x6bpmpx108bg2qcrf6vv3yfz378s7bmr3l319iz"; }; nativeBuildInputs = [ pkgconfig ]; @@ -35,23 +35,23 @@ rustPlatform.buildRustPackage rec { postInstall = '' pushd $out/bin mv rustup-init rustup - for link in cargo rustc rustdoc rust-gdb rust-lldb; do + for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt; 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} + mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,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 fish > "$out/share/fish/vendor_completions.d/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 ]; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index eb82cf84966065037169c13a032ba8ed06fe78ee..5598dc1606d98ad885cca42ac4023833764556fe 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sassc-${version}"; - version = "3.4.5"; + version = "3.5.0"; src = fetchurl { url = "https://github.com/sass/sassc/archive/${version}.tar.gz"; - sha256 = "1xk4kmmvziz9sal3swpqa10q0s289xjpcz8aggmly8mvxvmngsi9"; + sha256 = "0hl0j4ky13fzcv2y7w352gaq8fjmypwgazf7ddqdv0sbj8qlxx96"; }; patchPhase = '' diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 3caec9a75c15e895e72b20eb19b6c504d2191e53..fe32f7c24506968452cfb00ac156b07818ed0a86 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.8"; + version = "4.4.12"; src = fetchurl ( if stdenv.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "1y6jmz0kdaz1fq9sirwxznzw52if6ypd0dp9mk7dkpipy0bx7pz6"; + sha256 = "1yqvx64bgiq27hdhwkzgmzyib8pbjn1idpq6783srxq64asf6iyw"; } else if stdenv.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; - sha256 = "13nd2g1z4nvc3fa30xr3jnkqcy3fv4751s7ws4l93p7x6nc4aw1n"; + sha256 = "02kib56lv4lhwkj5r15484lvvbyjvf9ydi5vccsmxgsxrzmddnl6"; } else { url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; - sha256 = "0f8kcx7qd6bqbd74y6n83lb52zban9k631qkv1vyddvs9pjsxmpg"; + sha256 = "1gqsbw9f6nachk3c86knbqq417smqyf19mi63fmrfxrbxzy2fkv2"; } ); diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 391c653b98abbe48f7152d97f5802d815844a2bf..d50b1435b7332081f5f108fa520bf31525eca4f6 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,29 +1,37 @@ -{ stdenv, fetchurl, unzip, jre }: +{ stdenv, jdk, jre, coursier, makeWrapper }: -stdenv.mkDerivation rec { - version = "0.6.8"; +let baseName = "scalafmt"; - name = "${baseName}-${version}"; - - src = fetchurl { - url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "1iaanrxk5lhxx1zj9gbxzgqbnyy1azfrab984mga7di5z1hs02s2"; + version = "1.4.0"; + deps = stdenv.mkDerivation { + name = "${baseName}-deps-${version}"; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/coursier fetch com.geirsson:scalafmt-cli_2.12:${version} > deps + mkdir -p $out/share/java + cp $(< deps) $out/share/java/ + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "12hsix3b7qnyr9x2v7i6jgqljdqxpfj4bfvhjdl99ijr793g3lnp"; }; +in +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; - unpackPhase = "tar xvzf $src"; + buildInputs = [ jdk makeWrapper deps ]; - installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" + doCheck = true; - cp cli/target/scala-2.11/scalafmt.jar "$out/lib/${name}.jar" + phases = [ "installPhase" "checkPhase" ]; - cat > "$out/bin/${baseName}" << EOF - #!${stdenv.shell} - exec ${jre}/bin/java -jar "$out/lib/${name}.jar" "\$@" - EOF + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/${baseName} \ + --add-flags "-cp $CLASSPATH org.scalafmt.cli.Cli" + ''; - chmod a+x "$out/bin/${baseName}" + checkPhase = '' + $out/bin/${baseName} --version | grep -q "${version}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 61f5f93ebfaa19c84b0a2cb6d6c53713db5e5ed2..d865a20fbb9f1d8c700affacabda794277a30fb5 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -4,19 +4,14 @@ }: let allSpecs = { - "i686-linux" = { - system = "linux32"; - sha256 = "13fngjg2v0l3vhlmjnffy785ckgk2kbpm7307li75vinkcly91cj"; - }; - "x86_64-linux" = { system = "linux64"; - sha256 = "0x5vnmnw6mws6iw9s0kcm4crx9gfgy0vjjpk1v0wk7jpn6d0bl47"; + sha256 = "1h7avlns00hd44ayi53lvdj2l85h9higky0jk7bad07hm39nagks"; }; "x86_64-darwin" = { system = "mac64"; - sha256 = "09y8ijj75q5a7snzchxinxfq2ad2sw0f30zi0p3hqf1n88y28jq6"; + sha256 = "11hs4mmlvxjaanq41h0dljj4sff0lfwk31svvdmzfg91idlikpsz"; }; }; @@ -33,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.33"; + version = "2.38"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5d1f015e805254f92af2dbab2016bdf881394a31 --- /dev/null +++ b/pkgs/development/tools/setupcfg2nix/default.nix @@ -0,0 +1,19 @@ +{ buildSetupcfg, fetchFromGitHub, lib }: + +buildSetupcfg rec { + info = import ./info.nix; + src = fetchFromGitHub { + owner = "target"; + repo = "setupcfg2nix"; + rev = info.version; + sha256 = "1zn9njpzwhwikrirgjlyz6ys3xr8gq61ry8blmnpscqvhsdhxcs6"; + }; + application = true; + meta = { + description = "Generate nix expressions from setup.cfg for a python package."; + homepage = https://github.com/target/setupcfg2nix; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix new file mode 100644 index 0000000000000000000000000000000000000000..b0d5873ed63cda0b0caa4abb6ad2c2d31fd2799d --- /dev/null +++ b/pkgs/development/tools/setupcfg2nix/info.nix @@ -0,0 +1,7 @@ +{ + pname = ''setupcfg2nix''; + version = ''1.1.0''; + install_requires = [ + ''setuptools'' + ]; +} diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index 2d36b09adb35c2350224563ed24100b7a3d08517..3d8027a1299465de8faef64f00ab97da18df7c4f 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sigrok-cli-0.7.0"; src = fetchurl { - url = "http://sigrok.org/download/source/sigrok-cli/${name}.tar.gz"; + url = "https://sigrok.org/download/source/sigrok-cli/${name}.tar.gz"; sha256 = "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line frontend for the sigrok signal analysis software suite"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index e3dda5094275ea6e08b19c6f150f45c162b1c9a6..b009d5ed601bd2425da1eca93bd47909205117e6 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, avrbinutils, avrgcc, avrlibc, libelf, which, git, pkgconfig, freeglut -, mesa }: +, libGLU_combined }: stdenv.mkDerivation rec { name = "simavr-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut mesa ]; + buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut libGLU_combined ]; meta = with stdenv.lib; { description = "A lean and mean Atmel AVR simulator"; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index d05706a7fadfb61d55a02713069e14124ab39642..bb99e887ac6f8561a50f5757383b0c3d9b33c428 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,43 +1,53 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand +, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux +, go-md2man }: with stdenv.lib; -buildGoPackage rec { - name = "skopeo-${version}"; - version = "0.1.23"; - rev = "v${version}"; - - goPackagePath = "github.com/projectatomic/skopeo"; - excludedPackages = "integration"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree ]; +let + version = "0.1.29"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "projectatomic"; repo = "skopeo"; - sha256 = "1axxnm87fpsd7q28v951ilhmzd42k8wyh741gdfdcajjwglfj0nn"; + sha256 = "1lhzbyj2mm25x12s7g2jx4v8w19izjwlgx4lml13r5yy1spn65k2"; }; - patches = [ - ./path.patch - ]; + defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; + + goPackagePath = "github.com/projectatomic/skopeo"; + +in +buildGoPackage rec { + name = "skopeo-${version}"; + inherit src goPackagePath; + + outputs = [ "bin" "man" "out" ]; + + excludedPackages = "integration"; + + nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; + + buildFlagsArray = "-ldflags= -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}"; 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 + postBuild = '' + # depends on buildGoPackage not changing … + pushd ./go/src/${goPackagePath} + make install-docs MANINSTALLDIR="$man" + popd ''; meta = { description = "A command line utility for various operations on container images and image repositories"; homepage = https://github.com/projectatomic/skopeo; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ]; license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch deleted file mode 100644 index eb3c54ae66c4a332b73a41593096997a6170f029..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/skopeo/path.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index bfd4b7370e0ab43657484a6bd5b758a642b43f07..35e0d276101bd48bd57cdac08db6f0faaeb55589 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -3,19 +3,18 @@ let spirv_sources = { - # `vulkan-loader` requires a specific version of `spirv-tools` and `spirv-headers` as specified in - # `/external_revisions/spirv-tools_revision`. + # `glslang` requires a specific version of `spirv-tools` and `spirv-headers` as specified in `known-good.json`. tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "7fe8a57a5bd72094e91f9f93e51dac2f2461dcb4"; - sha256 = "0rh25y1k3m3f1nqs032lh3mng5qfw9kqn6xv9yzzm47i1i0b6hmr"; + rev = "9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8"; + sha256 = "1zpwznq0fyvkzs5h9nnkr7g6svr0w8z6zx62xgnss17c2a5cz0lk"; }; headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "6c08995e6e7b94129e6086c78198c77111f2f262"; - sha256 = "07m12wm9prib7hldj7pbc8vwnj0x6llgx4shzgy8x4xbhbafawws"; + rev = "ce309203d7eceaf908bea8862c27f3e0749f7d00"; + sha256 = "1sv1iy2d46sg7r3xy591db6fn9h78wd079yvfa87vwmwsdkhiqhm"; }; }; @@ -23,7 +22,7 @@ in stdenv.mkDerivation rec { name = "spirv-tools-${version}"; - version = "2017-03-23"; + version = "2018-02-05"; src = spirv_sources.tools; patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index deb5c8106282e10512420d5cf2301faf509b7ef7..279bce20d142cde5860c9aa5eb4739a85845ade0 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, perl, makeWrapper, openssl }: stdenv.mkDerivation rec { - name = "sslmate-1.5.0"; + name = "sslmate-1.6.0"; src = fetchurl { url = "https://packages.sslmate.com/other/${name}.tar.gz"; - sha256 = "1vxdkydwww4awi6ishvq68jvlj6vkbfw7pin1cdqpl84vs9q7ycg"; + sha256 = "1ypabdk0nlqjzpmn3m1szjyw7yq20svgbm92sqd5wqmsapyn3a6s"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index eb626d0aa586dc78f8611f2c6d65a87157b71544..f6687f4e4328b97b9f5b28c043c81757a065d425 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,21 +1,29 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { name = "textql-${version}"; version = "2.0.3"; - rev = "${version}"; goPackagePath = "github.com/dinedal/textql"; src = fetchFromGitHub { - inherit rev; - owner = "dinedal"; - repo = "textql"; + owner = "dinedal"; + repo = "textql"; + rev = version; sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; }; + postInstall = '' + install -Dm644 -t $out/share/man/man1 ${src}/man/textql.1 + ''; + + # needed for tests + nativeBuildInputs = [ sqlite ]; + goDeps = ./deps.nix; + doCheck = true; + meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; homepage = https://github.com/dinedal/textql; diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 578e759548a10a174184377726d30049a9f1d7a0..5b46b975cf7f1c3fd6c9f9b55939db1c45bf098c 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -17,7 +17,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; buildInputs = [ - boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase + boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintillaLib qtbase ]; preConfigure = '' @@ -51,6 +51,8 @@ in mkDerivation rec { "-lssl" ]; + NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ]; + postFixup = '' wrapProgram $out/bin/tora \ --prefix PATH : ${lib.getBin graphviz}/bin diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..10a27e2e3b88e7fdc526e612e51634fb18fde091 --- /dev/null +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "toxiproxy-${version}"; + version = "2.1.3"; + src = fetchFromGitHub { + owner = "Shopify"; + repo = "toxiproxy"; + rev = "v${version}"; + sha256 = "1a7yry846iwi9cs9xam2vjbw73fjy45agjrwk214k0n1ziaawz2f"; + }; + + goPackagePath = "github.com/Shopify/toxiproxy"; + subPackages = ["cmd" "cli"]; + buildFlagsArray = "-ldflags=-X github.com/Shopify/toxiproxy.Version=v${version}"; + + postInstall = '' + mv $bin/bin/cli $bin/bin/toxiproxy-cli + mv $bin/bin/cmd $bin/bin/toxiproxy-cmd + ''; + + meta = { + description = "Proxy for for simulating network conditions."; + maintainers = with lib.maintainers; [ avnik ]; + }; +} diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index e5a3004bfdb69e89471c3874d0f62265a9d65b06..3891617e1c790509ac2d1732e1bbec7778ab3673 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation { - name = "tradcpp-0.4"; + name = "tradcpp-0.5.2"; src = fetchurl { - url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.4.tar.gz; - sha256 = "c60aa356945e0b6634bd449ead6a4fca0059d2ce3ae8044cf982140bbd54e688"; + url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz; + sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; }; # tradcpp only comes with BSD-make Makefile; the patch adds configure support diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index c7ba985d0f75b74860090ec37c200bcfc2f3f15f..e507e3898c38635f21895f3d0020e0d9678b39ad 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, udev +, gtk2, gdk_pixbuf, glib, libGLU, 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 @@ -9,7 +9,7 @@ let libPath64 = lib.makeLibraryPath [ - gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr + gcc.cc gtk2 gdk_pixbuf glib libGLU postgresql nss nspr alsaLib GConf cups libcap fontconfig freetype pango cairo dbus expat zlib libpng12 udev libX11 libXcursor libXdamage libXfixes libXrender libXi diff --git a/pkgs/development/tools/vagrant/Gemfile b/pkgs/development/tools/vagrant/Gemfile new file mode 100644 index 0000000000000000000000000000000000000000..d32951f1c054d0297c560964eef1174679d94093 --- /dev/null +++ b/pkgs/development/tools/vagrant/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gem 'vagrant' diff --git a/pkgs/development/tools/vagrant/Gemfile.lock b/pkgs/development/tools/vagrant/Gemfile.lock new file mode 100644 index 0000000000000000000000000000000000000000..2c63b57443ad5db55473bc68a746be449ef3d884 --- /dev/null +++ b/pkgs/development/tools/vagrant/Gemfile.lock @@ -0,0 +1,149 @@ +GIT + remote: https://github.com/mitchellh/vagrant-spec.git + revision: 7ac8b4191de578e345b29acaf62ecc72c8e73be1 + specs: + vagrant-spec (0.0.1) + childprocess (~> 0.6.0) + log4r (~> 1.1.9) + rspec (~> 3.5.0) + thor (~> 0.18.1) + +PATH + remote: . + specs: + vagrant (2.0.2) + childprocess (~> 0.6.0) + erubis (~> 2.7.0) + hashicorp-checkpoint (~> 0.1.5) + i18n (>= 0.6.0, <= 0.8.0) + listen (~> 3.1.5) + log4r (~> 1.1.9, < 1.1.11) + net-scp (~> 1.2.0) + net-sftp (~> 2.1) + net-ssh (~> 4.2.0) + rb-kqueue (~> 0.2.0) + rest-client (>= 1.6.0, < 3.0) + ruby_dep (<= 1.3.1) + wdm (~> 0.1.0) + winrm (~> 2.1) + winrm-elevated (~> 1.1) + winrm-fs (~> 1.0) + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + builder (3.2.3) + childprocess (0.6.3) + ffi (~> 1.0, >= 1.0.11) + crack (0.4.3) + safe_yaml (~> 1.0.0) + diff-lcs (1.3) + domain_name (0.5.20170404) + unf (>= 0.0.5, < 1.0.0) + erubis (2.7.0) + fake_ftp (0.1.1) + ffi (1.9.18) + gssapi (1.2.0) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) + hashdiff (0.3.7) + hashicorp-checkpoint (0.1.5) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + i18n (0.8.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + little-plugger (1.1.4) + log4r (1.1.10) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + multi_json (1.13.1) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (4.2.0) + netrc (0.11.0) + nori (2.6.0) + public_suffix (3.0.1) + rake (12.0.0) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rb-kqueue (0.2.5) + ffi (>= 0.5.0) + rest-client (2.0.2) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + 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.5.0) + rspec-its (1.2.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + ruby_dep (1.3.1) + rubyntlm (0.6.2) + rubyzip (1.2.1) + safe_yaml (1.0.4) + thor (0.18.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.5) + wdm (0.1.1) + webmock (2.3.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + winrm (2.2.3) + 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, >= 0.6.1) + winrm-elevated (1.1.0) + winrm (~> 2.0) + winrm-fs (~> 1.0) + winrm-fs (1.2.0) + erubis (~> 2.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 1.1) + winrm (~> 2.0) + +PLATFORMS + ruby + +DEPENDENCIES + fake_ftp (~> 0.1.1) + rake (~> 12.0.0) + rspec (~> 3.5.0) + rspec-its (~> 1.2.0) + vagrant! + vagrant-spec! + webmock (~> 2.3.1) + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index e72520d61b33a533d9b9ac138c872d044e8c12f9..3b055d38d03f1ea3b9be21d5bcc1d4721d562055 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,141 +1,67 @@ -{ stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, rake, ruby, buildRubyGem, libiconv -, libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }: +{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }: let - version = "2.0.1"; - - 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}_${arch}.dmg" - else "system ${stdenv.system} not supported"; - - sha256 = { - "x86_64-linux" = "0kyqchjsy747vbvhqiynz81kik8g0xqpkv70rz7hyr9x7fl9i51g"; - "i686-linux" = "0p3xhxy6shkd0393wjyj8qycdn3zqv60vnyz1b6zclz0kfah07zs"; - "x86_64-darwin" = "01hr5j9k31hsdlcwv3srzk0lphd8w0n9z95jvfkschdyjm9clpwm"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - - arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system; - -in stdenv.mkDerivation rec { - name = "vagrant-${version}"; - inherit version; - - src = fetchurl { - inherit url sha256; - }; - - meta = with stdenv.lib; { - description = "A tool for building complete development environments"; - homepage = http://vagrantup.com; - license = licenses.mit; - maintainers = with maintainers; [ lovek323 globin jgeerds kamilchm ]; - platforms = with platforms; linux ++ darwin; + version = "2.0.2"; + url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; + sha256 = "1sjfwgy2y6q5s1drd8h8xgz2a0sv1l3kx9jilgc02hlcdz070iir"; + + deps = bundlerEnv rec { + name = "${pname}-${version}"; + pname = "vagrant"; + inherit version; + + inherit ruby; + gemdir = ./.; + gemset = lib.recursiveUpdate (import ./gemset.nix) { + vagrant = { + source = { + type = "url"; + inherit url sha256; + }; + inherit version; + }; + }; }; - buildInputs = [ makeWrapper ] - ++ stdenv.lib.optional stdenv.isDarwin [ p7zip xar gzip cpio ]; - - unpackPhase = if stdenv.isLinux - then '' - ${dpkg}/bin/dpkg-deb -x "$src" . - '' - else '' - 7z x $src - cd Vagrant/ - xar -xf Vagrant.pkg - cd core.pkg/ - cat Payload | gzip -d - | cpio -id - - # move unpacked directories to match unpacked .deb from linux, - # so installPhase can be shared - mkdir -p opt/vagrant/ usr/ - mv embedded opt/vagrant/embedded - mv bin usr/bin - ''; - - buildPhase = ""; - - installPhase = '' - sed -i "s|/opt|$out/opt|" usr/bin/vagrant - - # overwrite embedded binaries - - # curl: curl, curl-config - rm opt/vagrant/embedded/bin/{curl,curl-config} - ln -s ${curl.bin}/bin/curl opt/vagrant/embedded/bin - ln -s ${curl.dev}/bin/curl-config opt/vagrant/embedded/bin - - # libarchive: bsdtar, bsdcpio - rm opt/vagrant/embedded/lib/libarchive* - ln -s ${libarchive}/lib/libarchive.so opt/vagrant/embedded/lib/libarchive.so - rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio} - ln -s ${libarchive}/bin/bsdtar opt/vagrant/embedded/bin - ln -s ${libarchive}/bin/bsdcpio opt/vagrant/embedded/bin - - # openssl: c_rehash, openssl - rm opt/vagrant/embedded/bin/{c_rehash,openssl} - ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin - ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin - - # libiconv: iconv - rm opt/vagrant/embedded/bin/iconv - ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin - - # libxml: xml2-config, xmlcatalog, xmllint - rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} - ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin - - # libxslt: xslt-config, xsltproc - rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} - ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin - ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin - - '' + (stdenv.lib.optionalString (! stdenv.isDarwin) '' - # ruby: erb, gem, irb, rake, rdoc, ri, ruby - rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby} - ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin - ln -s ${ruby}/bin/gem opt/vagrant/embedded/bin - ln -s ${ruby}/bin/irb opt/vagrant/embedded/bin - ln -s ${rake}/bin/rake opt/vagrant/embedded/bin - ln -s ${ruby}/bin/rdoc opt/vagrant/embedded/bin - ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin - ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin - - # ruby libs - rm -rf opt/vagrant/embedded/lib/* - for lib in ${ruby}/lib/*; do - ln -s $lib opt/vagrant/embedded/lib/''${lib##*/} - done +in buildRubyGem rec { + name = "${gemName}-${version}"; + gemName = "vagrant"; + inherit version; - # libffi - ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6 + doInstallCheck = true; + dontBuild = false; + src = fetchurl { inherit url sha256; }; - '') + '' - mkdir -p "$out" - cp -r opt "$out" - cp -r usr/bin "$out" - wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxml2 libxslt ]}" \ - --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib" + patches = [ + ./unofficial-installation-nowarn.patch + ]; - install -D "opt/vagrant/embedded/gems/gems/vagrant-$version/contrib/bash/completion.sh" \ - "$out/share/bash-completion/completions/vagrant" + # PATH additions: + # - libarchive: Make `bsdtar` available for extracting downloaded boxes + postInstall = '' + wrapProgram "$out/bin/vagrant" \ + --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \ + --prefix PATH ':' "${lib.getBin libarchive}/bin" ''; - preFixup = '' - # 'hide' the template file from shebang-patching - chmod -x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" + installCheckPhase = '' + if [[ "$("$out/bin/vagrant" --version)" == "Vagrant ${version}" ]]; then + echo 'Vagrant smoke check passed' + else + echo 'Vagrant smoke check failed' + return 1 + fi ''; - postFixup = '' - chmod +x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" - '' + - (stdenv.lib.optionalString stdenv.isDarwin '' - # undo the directory movement done in unpackPhase - mv $out/opt/vagrant/embedded $out/ - rm -r $out/opt - ''); + passthru = { + inherit ruby deps; + }; + + meta = with lib; { + description = "A tool for building complete development environments"; + homepage = https://www.vagrantup.com/; + license = licenses.mit; + maintainers = with maintainers; [ aneeshusa ]; + platforms = with platforms; linux ++ darwin; + }; } diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix new file mode 100644 index 0000000000000000000000000000000000000000..5d3d2693d01324f03ab25e9f8a9883312f6196ea --- /dev/null +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -0,0 +1,457 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + builder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + type = "gem"; + }; + version = "3.2.3"; + }; + childprocess = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv"; + type = "gem"; + }; + version = "0.6.3"; + }; + crack = { + dependencies = ["safe_yaml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + type = "gem"; + }; + version = "0.4.3"; + }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + domain_name = { + dependencies = ["unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + type = "gem"; + }; + version = "0.5.20170404"; + }; + erubis = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + type = "gem"; + }; + version = "2.7.0"; + }; + fake_ftp = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn7lxdk3sqc2i4v2c5k25b9ca1qnkdf32nv04y760aml9mszwf7"; + type = "gem"; + }; + version = "0.1.1"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + type = "gem"; + }; + version = "1.9.18"; + }; + gssapi = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix"; + type = "gem"; + }; + version = "1.2.0"; + }; + gyoku = { + dependencies = ["builder"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; + type = "gem"; + }; + version = "1.3.1"; + }; + hashdiff = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; + type = "gem"; + }; + version = "0.3.7"; + }; + hashicorp-checkpoint = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z6mwzvd7p2wqhmk07dwrhvm0ncgqm7pxn0pr2k025rwsspp9bsd"; + type = "gem"; + }; + version = "0.1.5"; + }; + http-cookie = { + dependencies = ["domain_name"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + httpclient = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + i18n = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00nsll7q89ab6k43dl3apxjhy4zidlgjmgb9mpk42bj3wk5zdyzf"; + type = "gem"; + }; + version = "0.8.0"; + }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; + type = "gem"; + }; + version = "3.1.5"; + }; + little-plugger = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + log4r = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ri90q0frfmigkirqv5ihyrj59xm8pq5zcmf156cbdv4r4l2jicv"; + type = "gem"; + }; + version = "1.1.10"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + type = "gem"; + }; + version = "2.2.2"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + 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"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; + net-scp = { + dependencies = ["net-ssh"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + type = "gem"; + }; + version = "1.2.1"; + }; + net-sftp = { + dependencies = ["net-ssh"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; + type = "gem"; + }; + version = "2.1.2"; + }; + net-ssh = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx"; + type = "gem"; + }; + version = "4.2.0"; + }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + nori = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + type = "gem"; + }; + version = "2.6.0"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; + type = "gem"; + }; + version = "3.0.1"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + type = "gem"; + }; + version = "12.0.0"; + }; + rb-fsevent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + type = "gem"; + }; + version = "0.10.3"; + }; + rb-inotify = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + type = "gem"; + }; + version = "0.9.10"; + }; + rb-kqueue = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14mhzrhs2j43vj36i1qq4z29nd860shrslfik015f4kf1jiaqcrw"; + type = "gem"; + }; + version = "0.2.5"; + }; + rest-client = { + dependencies = ["http-cookie" "mime-types" "netrc"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; + type = "gem"; + }; + version = "2.0.2"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i"; + type = "gem"; + }; + version = "3.5.4"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-its = { + dependencies = ["rspec-core" "rspec-expectations"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"; + type = "gem"; + }; + version = "1.2.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + 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"; + }; + ruby_dep = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v0qznxz999lx4vs76mr590r90i0cm5m76wwvgis7sq4y21l308l"; + type = "gem"; + }; + version = "1.3.1"; + }; + rubyntlm = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; + type = "gem"; + }; + version = "0.6.2"; + }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; + type = "gem"; + }; + version = "1.2.1"; + }; + safe_yaml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3"; + type = "gem"; + }; + version = "0.18.1"; + }; + 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 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; + type = "gem"; + }; + version = "0.0.7.5"; + }; + vagrant = { + dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; + }; + vagrant-spec = { + dependencies = ["childprocess" "log4r" "rspec" "thor"]; + source = { + fetchSubmodules = false; + rev = "7ac8b4191de578e345b29acaf62ecc72c8e73be1"; + sha256 = "0qybgxdnndx7xfmhyjcj46b2mv78d98yk30d68ppmfnmm3jx590h"; + type = "git"; + url = "https://github.com/mitchellh/vagrant-spec.git"; + }; + version = "0.0.1"; + }; + wdm = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x5l2pn4x92734k6i2wcjbn2klmwgkiqaajvxadh35k74dgnyh18"; + type = "gem"; + }; + version = "0.1.1"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + type = "gem"; + }; + version = "2.3.2"; + }; + winrm = { + dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02lzbixdbjvhmb0byqx9rl9x4xx9pqc8jwm7y6mmp7w7mri72zh6"; + type = "gem"; + }; + version = "2.2.3"; + }; + winrm-elevated = { + dependencies = ["winrm" "winrm-fs"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04krbwnj4cw7jy42w3n2y5kp2fbcp3v9mbf59pdhfk1py18bswcr"; + type = "gem"; + }; + version = "1.1.0"; + }; + winrm-fs = { + dependencies = ["erubis" "logging" "rubyzip" "winrm"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3w2j2rmhjqj8lynca2m1dm1m5fv1x35xwhk3vyr15dn260z56g"; + type = "gem"; + }; + version = "1.2.0"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch new file mode 100644 index 0000000000000000000000000000000000000000..885959428956fb63257726f3b280391650b99245 --- /dev/null +++ b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch @@ -0,0 +1,16 @@ +diff --git i/bin/vagrant w/bin/vagrant +index 19df75033..682fae226 100755 +--- i/bin/vagrant ++++ w/bin/vagrant +@@ -128,11 +128,6 @@ begin + end + end + +- if !Vagrant.in_installer? && !Vagrant.very_quiet? +- # If we're not in the installer, warn. +- env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) +- end +- + begin + # Execute the CLI interface, and exit with the proper error code + exit_status = env.cli(argv) diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix index 3fd92dfeba41d8c2b5cd2bdc85b88af909dc8436..2e2fc1ad92736e39193d84893e979a95cde1b67e 100644 --- a/pkgs/development/tools/valadoc/default.nix +++ b/pkgs/development/tools/valadoc/default.nix @@ -1,12 +1,11 @@ -{stdenv, fetchgit, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}: +{stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}: stdenv.mkDerivation rec { - version = "2016-11-11"; - name = "valadoc-unstable-${version}"; + version = "0.36.1"; + name = "valadoc-${version}"; - src = fetchgit { - url = "git://git.gnome.org/valadoc"; - rev = "8080b626db9c16ac9a0a9802677b4f6ab0d36d4e"; - sha256 = "1y00yls4wgxggzfagm3hcmzkpskfbs3m52pjgl71lg4p85kv6msv"; + src = fetchurl { + url = "mirror://gnome/sources/valadoc/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "07501k2j9c016bd7rfr6xzaxdplq7j9sd18b5ixbqdbipvn6whnv"; }; nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ]; @@ -14,6 +13,12 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; + passthru = { + updateScript = gnome3.updateScript { + packageName = "valadoc"; + }; + }; + meta = with stdenv.lib; { description = "valadoc is a documentation generator for generating API documentation from Vala source code"; homepage = http://valadoc.org; diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index fae0ca88124fab2b03436efd32d87d917919c7e1..aafff7290c5c0fd129362da070daf1eeb0ab0fa7 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -6,11 +6,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "vcstool"; - version = "0.1.31"; + version = "0.1.35"; src = fetchPypi { inherit pname version; - sha256 = "0n2zkvy2km9ky9lljf1mq5nqyqi5qqzfy2a6sgkjg2grvsk7abxc"; + sha256 = "c52ef4bae424deb284d042005db22844dae290758af77d76cac37d26bed9ad1c"; }; propagatedBuildInputs = [ pyyaml ]; @@ -23,6 +23,6 @@ buildPythonApplication rec { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; homepage = https://github.com/dirk-thomas/vcstool; license = licenses.asl20; - maintainer = with maintainers; [ sivteck ]; + maintainers = with maintainers; [ sivteck ]; }; } diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index f8134a88643c151df8c771e058dfc5ac5154911c..96307c8d134c20ac40e65ea111c02a4132561245 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { name = "vim-vint-${version}"; - version = "0.3.11"; + version = "0.3.18"; src = fetchFromGitHub { owner = "kuniwak"; repo = "vint"; rev = "v${version}"; - sha256 = "0xl166xs7sm404f1qz2s0xcry7fr1hgyvhqhyj1qj0dql9i3xx8v"; + sha256 = "0qrlimg385sxq4y6vqbanby31inaa1q47w9qcw5knwffbz96whrs"; }; # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 66fdb1841e40a56e0e219d37ba7e04e51d6495d1..2a4ddaf803985d04870ba2a8fab66e8b3b3bfafb 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "vndr-${version}"; - version = "20170511-${lib.strings.substring 0 7 rev}"; - rev = "0cb33a0eb64c8ca73b8e2939a3430b22fbb8d3e3"; + version = "20171005-${lib.strings.substring 0 7 rev}"; + rev = "b57c5799efd5ed743f347a025482babf01ba963e"; goPackagePath = "github.com/LK4D4/vndr"; excludedPackages = "test"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "LK4D4"; repo = "vndr"; - sha256 = "02vdr59xn79hffayfcxg29nf62rdc33a60i104fgj746kcswgy5n"; + sha256 = "15mmy4a06jgzvlbjbmd89f0xx695x8wg7jqi76kiz495i6figk2v"; }; meta = { diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index e351a75db4b2658d72e364d381a02bb2fb2c955c..e87ba2b52c1432c31dea7a442e9855df325f9def 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -3,7 +3,8 @@ , qtbase, qtx11extras , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf -, freeglut, mesa_glu +, freeglut, libGLU +, fetchpatch }: mkDerivation rec { @@ -17,6 +18,14 @@ mkDerivation rec { sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n"; }; + patches = [ + (fetchpatch { + name = "fix-qt59.patch"; + url = "https://github.com/ValveSoftware/vogl/commit/be3d85f.patch"; + sha256 = "1yh4jd35mds337waqxdw3w22w7ghn05b5jm7fb4iihl39mhq6qyv"; + }) + ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ @@ -24,7 +33,7 @@ mkDerivation rec { qtbase qtx11extras libdwarf libjpeg_turbo libunwind lzma tinyxml libX11 SDL2 SDL2_gfx SDL2_image SDL2_ttf - freeglut mesa_glu + freeglut libGLU ]; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 29fedde90801df44a2bc61c1fb8dd915a7efaa40..8e17c531547d019839be9d85355daf458daa9022 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.13.0"; + version = "1.15.0"; goPackagePath = "github.com/JamesClonk/vultr"; src = fetchFromGitHub { owner = "JamesClonk"; repo = "vultr"; rev = "${version}"; - sha256 = "0xjalxl2yncrhbh4m2gyg3cahv3wvq782qd668vim6qks676d9nx"; + sha256 = "1bx2x17aa6wfn4qy9lxk8sh7shs3x5ppz2z49s0xm8qq0rs1qi92"; }; meta = { diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index ffa6d4aac0ca1d3f3d99285774394c3308a66acf..df32d68767fb88adffa84ff7403f12543950edf8 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "wiggle-1.0"; + name = "wiggle-1.1"; src = fetchurl { - url = "https://github.com/neilbrown/wiggle/archive/v1.0.tar.gz"; - sha256 = "0552dkdvl001b2jasj0jwb69s7zy6wbc8gcysqj69b4qgl9c54cs"; + url = "https://github.com/neilbrown/wiggle/archive/v1.1.tar.gz"; + sha256 = "0gg1c0zcrd5fgawvjccmdscm3fka8h1qz4v807kvy1b2y1cf9c4w"; }; buildInputs = [ ncurses groff ]; diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 19bdb1cd9ef7a94a34c100da54d80d1df72ef538..c78767e115a2b237c82d3cfd5df0e3bdaf15a3f6 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,13 +1,13 @@ { stdenv, python3Packages }: python3Packages.buildPythonApplication rec { - version = "1.1.3"; + version = "1.1.5"; pname = "wllvm"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1scv9bwr888x2km8njg0000xkj8pz73c0gjbphhqaj8vy87y25cb"; + sha256 = "02lnilhqz7mq0w6mp574rmjxiszp1wyla16jqr89r0z9vjg2j9rv"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index e0aac84abb70abd6619ae82adc8be931d6c804d1..e35bdd22e2d7ee2ff508d08b3e443effbcad508f 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -2,11 +2,11 @@ let name = "wp-cli-${version}"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "0rav5a6znx81gwaxin1ib10sbfg16bgdnnyv1zn5sjify3f1wpqj"; + sha256 = "17dgbcalvz5gw6xqgcywh6jrybj0qlglm16cgbshjsp6axwxa5gn"; }; completion = fetchurl { @@ -25,6 +25,9 @@ let ''; ini = writeText "wp-cli.ini" '' + [PHP] + memory_limit = -1 ; no limit as composer uses a lot of memory + [Phar] phar.readonly = Off ''; @@ -37,6 +40,9 @@ in stdenv.mkDerivation rec { ln -s ${bin} $out/bin/wp install -Dm644 ${completion} $out/share/bash-completion/completions/wp + + # this is a very basic run test + $out/bin/wp --info ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b99780d41382d3bab76d9c9af167c10ec52811da --- /dev/null +++ b/pkgs/development/tools/ws/default.nix @@ -0,0 +1,26 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "ws-${version}"; + version = "0.2.1"; + rev = "e9404cb37e339333088b36f6a7909ff3be76931d"; + + goPackagePath = "github.com/hashrocket/ws"; + + src = fetchgit { + inherit rev; + url = "https://github.com/hashrocket/ws"; + sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "websocket command line tool"; + homepage = https://github.com/hashrocket/ws; + license = licenses.mit; + maintainers = [ maintainers.the-kenny ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/ws/deps.nix b/pkgs/development/tools/ws/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..82988437145ff73182b56c39843038fa228256aa --- /dev/null +++ b/pkgs/development/tools/ws/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5df930a27be2502f99b292b7cc09ebad4d0891f4"; + sha256 = "1xqwvpn5jkp1xqvv9hx4h7cxrsnamryhy2pszcqpbm28dpd3airb"; + }; + } +] diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index d0836daf61357b64b3666cc05c44b60bec731863..a36c4f4bf80647b59036d75c1b294bfcc19bc151 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -258,6 +258,27 @@ let }; PackageTypes = [ "com.apple.package-type.wrapper.application" ]; } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.framework"; + 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"; + } ]; in diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 169fd5f6ec66dbfcc1d7fce5c7d6f1f8418ede47..87bbedd57880b2c7c109c6b01f779357ac917c04 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -1,26 +1,30 @@ { stdenv, writeText, toolchainName, sdkName, xcbuild }: let + # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here. + version = "10.10"; SDKSettings = { CanonicalName = sdkName; DisplayName = sdkName; Toolchains = [ toolchainName ]; - Version = "10.10"; - MaximumDeploymentTarget = "10.10"; + Version = version; + MaximumDeploymentTarget = version; isBaseSDK = "YES"; }; SystemVersion = { ProductName = "Mac OS X"; - ProductVersion = "10.10"; + ProductVersion = version; }; - in stdenv.mkDerivation { - name = "MacOSX.sdk"; + name = "MacOSX${version}.sdk"; + inherit version; + buildInputs = [ xcbuild ]; + buildCommand = '' mkdir -p $out/ plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index c3b26a6ac7964cdc4885c55aaeb830c174352707..70100c196973e1e67c323765de8dffd2410bb991 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -5,7 +5,7 @@ xcbuildBuildPhase() { echo "running xcodebuild" - xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build + xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates $xcbuildFlags build runHook postBuild } diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 2f6b42e7a00ed0a00ab48be96e132af770affe9b..06c48ec0a73f996a6f131b0acf5056d9912a2694 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation { - name = "xcbuild-wrapper"; + name = "xcbuild-wrapper-${xcbuild.version}"; buildInputs = [ xcbuild makeWrapper ]; @@ -46,6 +46,9 @@ stdenv.mkDerivation { ln -s $file done + mkdir $out/usr + ln -s $out/bin $out/usr/bin + mkdir -p $out/Library/Xcode/ ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1a8d7f13aff5d6820997dc0f980dbe8911fca8c6 --- /dev/null +++ b/pkgs/development/tools/yaml2json/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + + +buildGoPackage rec { + name = "yaml2json-${version}"; + version = "unstable-2017-05-03"; + goPackagePath = "github.com/bronze1man/yaml2json"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + rev = "ee8196e587313e98831c040c26262693d48c1a0c"; + owner = "bronze1man"; + repo = "yaml2json"; + sha256 = "16a2sqzbam5adbhfvilnpdabzwncs7kgpr0cn4gp09h2imzsprzw"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/bronze1man/yaml2json; + description = "Convert yaml to json"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.adisbladis ]; + }; +} diff --git a/pkgs/development/tools/yaml2json/deps.nix b/pkgs/development/tools/yaml2json/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..f907520cc872a455b358012b218ecde5c31e2501 --- /dev/null +++ b/pkgs/development/tools/yaml2json/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } +] diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 72b0fe2adaf787cedbcaaffdbe53033e4aea5c8b..eefe7dcfa74a340dad735ea3ad0a947f736add4c 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 = "1.3.2"; + version = "1.6.0"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0lyh24ais8xqfmzbb4sszd2002xl6qbsg9sdjnpwh6aysrwp56r8"; + sha256 = "0bblp1jy4s9y5rpcqn40w61qwsmxr342xkcn7ykk88i7sng2cgfw"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/development/tools/yarn2nix/bin/yarn2nix.js b/pkgs/development/tools/yarn2nix/bin/yarn2nix.js new file mode 100755 index 0000000000000000000000000000000000000000..3eadea559032f740fe43237043b4e3622728ecdc --- /dev/null +++ b/pkgs/development/tools/yarn2nix/bin/yarn2nix.js @@ -0,0 +1,144 @@ +#!/usr/bin/env node +"use strict"; + +const crypto = require('crypto'); +const fs = require("fs"); +const https = require("https"); +const path = require("path"); +const util = require("util"); + +const lockfile = require("@yarnpkg/lockfile") +const docopt = require("docopt").docopt; + +//////////////////////////////////////////////////////////////////////////////// + +const USAGE = ` +Usage: yarn2nix [options] + +Options: + -h --help Shows this help. + --no-nix Hide the nix output + --no-patch Don't patch the lockfile if hashes are missing + --lockfile=FILE Specify path to the lockfile [default: ./yarn.lock]. +` + +const HEAD = ` +{fetchurl, linkFarm}: rec { + offline_cache = linkFarm "offline" packages; + packages = [ +`.trim(); + +//////////////////////////////////////////////////////////////////////////////// + +function generateNix(lockedDependencies) { + let found = {}; + + console.log(HEAD) + + for (var depRange in lockedDependencies) { + let dep = lockedDependencies[depRange]; + + let depRangeParts = depRange.split('@'); + let [url, sha1] = dep["resolved"].split("#"); + let file_name = path.basename(url) + + if (found.hasOwnProperty(file_name)) { + continue; + } else { + found[file_name] = null; + } + + + console.log(` + { + name = "${file_name}"; + path = fetchurl { + name = "${file_name}"; + url = "${url}"; + sha1 = "${sha1}"; + }; + }`) + } + + console.log(" ];") + console.log("}") +} + + +function getSha1(url) { + return new Promise((resolve, reject) => { + https.get(url, (res) => { + const { statusCode } = res; + const hash = crypto.createHash('sha1'); + if (statusCode !== 200) { + const err = new Error('Request Failed.\n' + + `Status Code: ${statusCode}`); + // consume response data to free up memory + res.resume(); + reject(err); + } + + res.on('data', (chunk) => { hash.update(chunk); }); + res.on('end', () => { resolve(hash.digest('hex')) }); + res.on('error', reject); + }); + }); +}; + +function updateResolvedSha1(pkg) { + // local dependency + if (!pkg.resolved) { return Promise.resolve(); } + let [url, sha1] = pkg.resolved.split("#", 2) + if (!sha1) { + return new Promise((resolve, reject) => { + getSha1(url).then(sha1 => { + pkg.resolved = `${url}#${sha1}`; + resolve(); + }).catch(reject); + }); + } else { + // nothing to do + return Promise.resolve(); + }; +} + +function values(obj) { + var entries = []; + for (let key in obj) { + entries.push(obj[key]); + } + return entries; +} + +//////////////////////////////////////////////////////////////////////////////// +// Main +//////////////////////////////////////////////////////////////////////////////// + +var options = docopt(USAGE); + +let data = fs.readFileSync(options['--lockfile'], 'utf8') +let json = lockfile.parse(data) +if (json.type != "success") { + throw new Error("yarn.lock parse error") +} + +// Check fore missing hashes in the yarn.lock and patch if necessary +var pkgs = values(json.object); +Promise.all(pkgs.map(updateResolvedSha1)).then(() => { + let newData = lockfile.stringify(json.object); + + if (newData != data) { + console.error("found changes in the lockfile", options["--lockfile"]); + + if (options["--no-patch"]) { + console.error("...aborting"); + process.exit(1); + } + + fs.writeFileSync(options['--lockfile'], newData); + } + + if (!options['--no-nix']) { + generateNix(json.object); + } +}) diff --git a/pkgs/development/tools/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e86c0aac2c9943cde748c2642a0adc482bd044a5 --- /dev/null +++ b/pkgs/development/tools/yarn2nix/default.nix @@ -0,0 +1,199 @@ +{ stdenv, lib, fetchurl, linkFarm, runCommand, nodejs, yarn }: + +let + unlessNull = item: alt: + if item == null then alt else item; + + yarn2nix = mkYarnPackage { + src = ./.; + yarnNix = ./yarn.nix; + + passthru = { + inherit + defaultYarnFlags + linkNodeModulesHook + mkYarnModules + mkYarnNix + mkYarnPackage + # Export yarn again to make it easier to find out which yarn was used. + yarn + ; + }; + + meta = with lib; { + description = "generate nix expressions from a yarn.lock file"; + homepage = "https://github.com/moretea/yarn2nix"; + license = licenses.gpl3; + maintainers = with maintainers; [ manveru zimbatm ]; + }; + }; + + # Generates the yarn.nix from the yarn.lock file + mkYarnNix = yarnLock: + runCommand "yarn.nix" {} + "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch > $out"; + + # Loads the generated offline cache. This will be used by yarn as + # the package source. + importOfflineCache = yarnNix: + let + pkg = import yarnNix { inherit fetchurl linkFarm; }; + in + pkg.offline_cache; + + defaultYarnFlags = [ + "--offline" + "--frozen-lockfile" + "--ignore-engines" + "--ignore-scripts" + ]; + + mkYarnModules = { + name, + packageJSON, + yarnLock, + yarnNix ? mkYarnNix yarnLock, + yarnFlags ? defaultYarnFlags, + pkgConfig ? {}, + preBuild ? "", + }: + let + offlineCache = importOfflineCache yarnNix; + extraBuildInputs = (lib.flatten (builtins.map (key: + pkgConfig.${key} . buildInputs or [] + ) (builtins.attrNames pkgConfig))); + postInstall = (builtins.map (key: + if (pkgConfig.${key} ? postInstall) then + '' + for f in $(find -L -path '*/node_modules/${key}' -type d); do + (cd "$f" && (${pkgConfig.${key}.postInstall})) + done + '' + else + "" + ) (builtins.attrNames pkgConfig)); + in + stdenv.mkDerivation { + inherit name preBuild; + phases = ["configurePhase" "buildPhase"]; + buildInputs = [ yarn nodejs ] ++ extraBuildInputs; + + configurePhase = '' + # Yarn writes cache directories etc to $HOME. + export HOME=$PWD/yarn_home + ''; + + buildPhase = '' + runHook preBuild + + cp ${packageJSON} ./package.json + cp ${yarnLock} ./yarn.lock + chmod +w ./yarn.lock + + yarn config --offline set yarn-offline-mirror ${offlineCache} + + # Do not look up in the registry, but in the offline cache. + # TODO: Ask upstream to fix this mess. + sed -i -E 's|^(\s*resolved\s*")https?://.*/|\1|' yarn.lock + yarn install ${lib.escapeShellArgs yarnFlags} + + ${lib.concatStringsSep "\n" postInstall} + + mkdir $out + mv node_modules $out/ + patchShebangs $out + ''; + }; + + # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into + # the shell-hook environment. + linkNodeModulesHook = '' + if [[ -d node_modules || -L node_modules ]]; then + echo "./node_modules is present. Replacing." + rm -rf node_modules + fi + + ln -s "$node_modules" node_modules + ''; + + mkYarnPackage = { + name ? null, + src, + packageJSON ? src + "/package.json", + yarnLock ? src + "/yarn.lock", + yarnNix ? mkYarnNix yarnLock, + yarnFlags ? defaultYarnFlags, + yarnPreBuild ? "", + pkgConfig ? {}, + extraBuildInputs ? [], + publishBinsFor ? null, + ... + }@attrs: + let + package = lib.importJSON packageJSON; + pname = package.name; + version = package.version; + deps = mkYarnModules { + name = "${pname}-modules-${version}"; + preBuild = yarnPreBuild; + inherit packageJSON yarnLock yarnNix yarnFlags pkgConfig; + }; + publishBinsFor_ = unlessNull publishBinsFor [pname]; + in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig"] // { + inherit src; + + name = unlessNull name "${pname}-${version}"; + + buildInputs = [ yarn nodejs ] ++ extraBuildInputs; + + node_modules = deps + "/node_modules"; + + configurePhase = attrs.configurePhase or '' + runHook preConfigure + + if [ -d npm-packages-offline-cache ]; then + echo "npm-pacakges-offline-cache dir present. Removing." + rm -rf npm-packages-offline-cache + fi + + if [[ -d node_modules || -L node_modules ]]; then + echo "./node_modules is present. Removing." + rm -rf node_modules + fi + + mkdir -p node_modules + ln -s $node_modules/* node_modules/ + ln -s $node_modules/.bin node_modules/ + + if [ -d node_modules/${pname} ]; then + echo "Error! There is already an ${pname} package in the top level node_modules dir!" + exit 1 + fi + + runHook postConfigure + ''; + + # Replace this phase on frontend packages where only the generated + # files are an interesting output. + installPhase = attrs.installPhase or '' + runHook preInstall + + mkdir -p $out + cp -r node_modules $out/node_modules + cp -r . $out/node_modules/${pname} + rm -rf $out/node_modules/${pname}/node_modules + + mkdir $out/bin + node ${./fixup_bin.js} $out ${lib.concatStringsSep " " publishBinsFor_} + + runHook postInstall + ''; + + passthru = { + inherit package deps; + } // (attrs.passthru or {}); + + # TODO: populate meta automatically + }); +in + yarn2nix diff --git a/pkgs/development/tools/yarn2nix/fixup_bin.js b/pkgs/development/tools/yarn2nix/fixup_bin.js new file mode 100644 index 0000000000000000000000000000000000000000..dab1759c2046b78c29a6e1109f291d3c6d98ad24 --- /dev/null +++ b/pkgs/development/tools/yarn2nix/fixup_bin.js @@ -0,0 +1,45 @@ +#!/usr/bin/env node +"use strict"; + +/* Usage: + * node fixup_bin.js [, ... ] + */ + +const fs = require("fs"); +const path = require("path"); + +const output = process.argv[2]; +const packages_to_publish_bin = process.argv.slice(3); +const derivation_bin_path = output + "/bin"; + +function processPackage(name) { + console.log("Processing ", name); + const package_path = output + "/node_modules/" + name; + const package_json_path = package_path + "/package.json"; + const package_json = JSON.parse(fs.readFileSync(package_json_path)); + + if (!package_json.bin) { + console.log("No binaries provided"); + return; + } + + // There are two alternative syntaxes for `bin` + // a) just a plain string, in which case the name of the package is the name of the binary. + // b) an object, where key is the name of the eventual binary, and the value the path to that binary. + if (typeof package_json.bin == "string") { + let bin_name = package_json.bin; + package_json.bin = { }; + package_json.bin[package_json.name] = bin_name; + } + + for (let binName in package_json.bin) { + const bin_path = package_json.bin[binName]; + const full_bin_path = path.normalize(package_path + "/" + bin_path); + fs.symlinkSync(full_bin_path, derivation_bin_path + "/"+ binName); + console.log("Linked", binName); + } +} + +packages_to_publish_bin.forEach((pkg) => { + processPackage(pkg); +}); diff --git a/pkgs/development/tools/yarn2nix/package.json b/pkgs/development/tools/yarn2nix/package.json new file mode 100644 index 0000000000000000000000000000000000000000..130eee67c56064f53af12b3d77972c4203494169 --- /dev/null +++ b/pkgs/development/tools/yarn2nix/package.json @@ -0,0 +1,19 @@ +{ + "name": "yarn2nix", + "version": "1.0.0", + "description": "Convert packages.json and yarn.lock into a Nix expression that downloads all the dependencies", + "main": "index.js", + "repository": ".", + "author": "Maarten Hoogendoorn ", + "license": "MIT", + "scripts": { + "yarn2nix": "bin/yarn2nix.js" + }, + "bin": { + "yarn2nix": "bin/yarn2nix.js" + }, + "dependencies": { + "@yarnpkg/lockfile": "^1.0.0", + "docopt": "^0.6.2" + } +} diff --git a/pkgs/development/tools/yarn2nix/yarn.lock b/pkgs/development/tools/yarn2nix/yarn.lock new file mode 100644 index 0000000000000000000000000000000000000000..976d2c530e1e79940872281d4664d1155f716984 --- /dev/null +++ b/pkgs/development/tools/yarn2nix/yarn.lock @@ -0,0 +1,11 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@yarnpkg/lockfile@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.0.tgz#33d1dbb659a23b81f87f048762b35a446172add3" + +docopt@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz#b28e9e2220da5ec49f7ea5bb24a47787405eeb11" \ No newline at end of file diff --git a/pkgs/development/tools/yarn2nix/yarn.nix b/pkgs/development/tools/yarn2nix/yarn.nix new file mode 100644 index 0000000000000000000000000000000000000000..a9e42e7d986c562a2a25ff4df18009f78997684d --- /dev/null +++ b/pkgs/development/tools/yarn2nix/yarn.nix @@ -0,0 +1,23 @@ +{fetchurl, linkFarm}: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + + { + name = "lockfile-1.0.0.tgz"; + path = fetchurl { + name = "lockfile-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.0.tgz"; + sha1 = "33d1dbb659a23b81f87f048762b35a446172add3"; + }; + } + + { + name = "docopt-0.6.2.tgz"; + path = fetchurl { + name = "docopt-0.6.2.tgz"; + url = "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz"; + sha1 = "b28e9e2220da5ec49f7ea5bb24a47787405eeb11"; + }; + } + ]; +} diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..201e85985d825ae7e59b7411f255e6e5a2257fd3 --- /dev/null +++ b/pkgs/development/tools/yq/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }: + +buildPythonApplication rec { + pname = "yq"; + version = "2.5.0"; + + propagatedBuildInputs = [ pyyaml xmltodict jq ]; + + # ValueError: underlying buffer has been detached + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "e9fd2aa32defcd051058e3b6f665873282aa4eed19e11b1db94fe70847535d4c"; + }; + + meta = with lib; { + description = "Command-line YAML processor - jq wrapper for YAML documents."; + homepage = https://github.com/kislyuk/yq; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.womfoo ]; + }; +} diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index c447173b608779ef28805f3222059e08c9dc78e0..a0d8a0b84bac45180acaa2cbd59c8f332133d08d 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "grails-${version}"; - version = "3.3.0"; + version = "3.3.5"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0lk9ll0x9w2akmlwkams9pxyafmgjmsr3fa45gx1r16nx563qxsg"; + sha256 = "0796jbcblr3vxdf6sngzcfs1m24d1ra1n8jc7cnfrfxpf8r0z15m"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..df46cf3ab920a9c6d0333acfc7d59ec1dbb3640f --- /dev/null +++ b/pkgs/development/web/insomnia/default.nix @@ -0,0 +1,66 @@ +{ stdenv, lib, makeWrapper, fetchurl, dpkg, + + alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk2-x11, + nspr, nss, + + libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, + libXrender, libXtst, libxcb, + + libudev0-shim, glibc, curl +}: + +let + libPath = lib.makeLibraryPath [ + alsaLib atk cairo cups dbus_daemon.lib expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango + gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes + libXi libXrandr libXrender libXtst libxcb + ]; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl ]; +in stdenv.mkDerivation rec { + name = "insomnia-${version}"; + version = "5.15.0"; + + src = fetchurl { + url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; + sha256 = "17pxgxpss5jxzpmcim7hkyyj0fgyxwdiyxb2idpsna2hmhaipyxa"; + }; + + nativeBuildInputs = [ makeWrapper dpkg ]; + + buildPhase = ":"; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p $out/share/insomnia $out/lib $out/bin + + mv usr/share/* $out/share/ + mv opt/Insomnia/* $out/share/insomnia + mv $out/share/insomnia/*.so $out/lib/ + + ln -s $out/share/insomnia/insomnia $out/bin/insomnia + ''; + + preFixup = '' + for lib in $out/lib/*.so; do + patchelf --set-rpath "$out/lib:${libPath}" $lib + done + + for bin in $out/bin/insomnia; do + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$out/lib:${libPath}" \ + $bin + done + + wrapProgram "$out/bin/insomnia" --prefix LD_LIBRARY_PATH : ${runtimeLibs} + ''; + + meta = with stdenv.lib; { + homepage = https://insomnia.rest/; + description = "The most intuitive cross-platform REST API Client"; + license = stdenv.lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ markus1189 ]; + }; + +} diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index eac2046a233d9a4d61d659bdd831c708aea33839..b0dc2ba041af01eb331b7dcfaf4334ad838a0e07 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + # added to fix build w/gcc7 and clang5 + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare" + + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option"; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/web/nodejs/no-xcodebuild.patch b/pkgs/development/web/nodejs/no-xcodebuild.patch new file mode 100644 index 0000000000000000000000000000000000000000..94184152a03b983cfdf8126deef31fddc496a773 --- /dev/null +++ b/pkgs/development/web/nodejs/no-xcodebuild.patch @@ -0,0 +1,13 @@ +diff -Naur node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v8.9.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py +--- node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2018-01-03 03:34:44.000000000 +0100 ++++ node-v8.9.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2018-03-12 11:15:37.972537585 +0100 +@@ -1251,7 +1251,8 @@ + if XCODE_VERSION_CACHE: + return XCODE_VERSION_CACHE + try: +- version_list = GetStdout(['xcodebuild', '-version']).splitlines() ++ #version_list = GetStdout(['xcodebuild', '-version']).splitlines() ++ version_list = ['Xcode 9.2', 'Build version 9C40b'] + # In some circumstances xcodebuild exits 0 but doesn't return + # the right results; for example, a user on 10.7 or 10.8 with + # a bogus path set via xcode-select diff --git a/pkgs/development/web/nodejs/nodejs-release-keys.asc b/pkgs/development/web/nodejs/nodejs-release-keys.asc new file mode 100644 index 0000000000000000000000000000000000000000..c89b3b37f8767a81ee49854ed712b514414267dd --- /dev/null +++ b/pkgs/development/web/nodejs/nodejs-release-keys.asc @@ -0,0 +1,776 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFKKodABCADiE7Ex8GXnQNgipqbTADO5+BfufYFeq9YLEKkuOUfnjAZ8Wzle +4eLL4rdfFSuwuUO0rkSFOpNjkjKqxfRo0RkmlMxdHwT2auf/yrfX4EyhyKDn1Vh8 +MP2JecXQN3FVa1yR8AMGfT0zOP138MNp21tNp3Dy9r/ds6ZhttrnR+mrKnhKMmTj +1J+MX/LKw3o9ERIz0O8dxw75pA27npX1EcSCM1Vcq1bam7xD6d3cfQtfQsidXkQ/ +nFpD7BQFU+nemYaa6Vkuy4VJ11AMLNvzoWc2iHofD0kO60am3z6x8t63m+BUSU5I +r7B5GNbatekJqu/Qn1qrCjyuXcExEsGnCJl/ABEBAAG0ElJvZCBWYWdnIDxyQHZh +LmdnPokBOAQTAQIAIgUCUoqh0AIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA +CgkQwnN5L32DVF2cywf/Vws0J68vxn+ngUzq/wcWlQANfwMFUcD/8eM0N1B3OMXQ +9+GSlsuEUvh6/oxYxn4EPIgdqsV25SB/fAUz4uN50qvc0ft+wTgh20pnMP0qLf7/ +adb/dBf/NTV4TWzHaUDAkwPXqPd4He7AI5/PZeaMGmJPJmeR8ZM0ZrvLsNTmYV6N +byWcqYvbbRSNSn4ypb/QbYjFQZB2QKrC1LAW9jpdNnfQViYeZDmoSRaCTOv7SeSy +TkzOhMFRZDP9NmUvnl3chWNdmBoLls3/lO1Kpuc8h+nXkgU1hUyvsPjs8zBaqUDI +oMudExnECyEUHlZvVLlfpocznOPqlBhxjR0Q9VRYYokCHAQQAQIABgUCWL7qpAAK +CRCVUaCxpuKXzorJEACb96lsYyavUJOsFd6w8pgOENJjxZF64JR0Dx1rSsC4VgUa +m5zVVasJ29oAnzpeCQzt0sazTgLYrzxA4RY/guI7FBmI3p1nwhUCprG5QMuE1iZ+ +PXVvkTNnNWDlpGGSkDyiC0ER3kWVlECaJhDmSDHxVNl+IwXgd6Jmx47RHYv64rON +FERHfMjzCUi5uLs+zoIU2V8sy3j7Hv10+/zUGBSy3wSaUlmNK+7wkI9WS3BkcQ/1 +6Afet+De5XSVdDJu2TwhESEyXHFgXv9UQAbj5e8/fG8S/kPalQKnzQxp4eYtgC7a +cq1LGOX5BS0eFdwCnyNkZUhuHkjSYqg6GjEhmgEhUmow9FzaAD2JO8lXMYXtiXTX +U3VeY92b7gEt76HdefuAhPFRo2DppSQB2Qh1d6+WRWjxfIcVZcMjby3cDzBYZvfj +Jhzxv+3qSlzeYeDSLZUkyARRshLcd1LvlZiHntveiMuvehemVLcQ2XtCJh6mCfFJ +HwkRloAswSW1XiDEaybcc/Cok5aPjk/sozVCH1g9lyeQTIQ7QCYQzA2TrfCLOvL0 +9pguTGRFC22ikZzgPD9dC5vo1MvjRczT2g3gDxqrjvt35v3+ZlQ4ZJ+U2G9Ew+XF +Jn9bo4ZXxffj6jPnFiELZfSwIGP9EUaPXMXh/lov8IMfr37cQsE360A82RRAd4kC +IgQTAQgADAUCVw1LygWDB4YfgAAKCRDnO8ZBzBH0yHMND/46YV031EzwZL67h+ZC +SWka9SR+o1XHVWvjLGOcSOeBnD+8C170Q30NYVMEgSwtF8kY0M5k6GlEpIKNuOYq +NphXkNfn00ysqJ1G8WIGmGnsA/g/4LYSGt4ttL8roW582Ps3ITAYR/OVgHBccssL +6QdylghWW6wKYs5yoOn51pr0Ff0WyARfQxiaFNtwrZseSRrFlgCgX0+Hrfin1iHz +l8m/I8BIywM+fW+kk6ixitkFPszvT+9sgLj5viUl7+pJzLIs3GwODkLVCWCetLfO +XP7XDrcBQpU6OExpaC4ua4tVhfiaTJkYFB43Za0rP8egx8u7tBs9WC6rU3wygsLJ +uD9sdahFHY4c52eBRdIvAQow1oEj3WW3JIN72TiSOFbCMiFNR1t1nezaokef89pN +LMlJnzJ6BeKWmiSMsmOcT3Uq8cmmQpmbF3N0cZyOy2MMrnBtm0iIwY4NJ/YlLbAj +1f4urrAWkFInzWCdE/L6VO93WwD7sHLOcq8fKWv/2/QY7kGP8Cbut59ie6wUr53S +IEM7B21/zdcrI2ND7R9Bdo0h867NgIuve6EN/W08QbCsTAu8ukdtKOISprqBXQ7y +7CEUGRFlHbiLfhyaNs1IHtSDVpt6Rq/U5X35Zk3MSsL44ZuTqS7HE/QMjQy8oQ2U +tJyhZrnOkqHjT+g/kz1bKZ+JPbQXUm9kIFZhZ2cgPHJvZEB2YWdnLm9yZz6JATgE +EwECACIFAlKKo5ACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEMJzeS99 +g1RdocEIAJCkX71Kddk6B1HD9V80dpTVvm+YMup2qca6LqLtsiYE/O/XZHRZZ1WJ +RdxTGqGLKLkHgea0PUaxrcUxSzibDFJqEcRBz90ojaVu2jXb8Wbr9PkNcV0ABivy +PCpx0IFUxKj3+94akK9DOzwLpAf2QMSm0JlQhdql8K0JCRyk9ehkBCxcssVKocgZ +TCRur475lYNDU4SiQoJJ7iFirf1SvNAoeXwXiqDAR2q/k5VrANmfzKvmQ4UMciEx +vQaxc+q7LsBI0/EzFtWCnhPabEzhY8lzqsxlfdEbFXWFO1V6206FBYuymTE6IDxg +trhVg6FZgmWSrxnWWasJSZxv2iWhwgKJAhwEEAECAAYFAli+6qQACgkQlVGgsabi +l843ZRAAsPXN0qd5njBzcSMOTSwYVOX5/1NNWI4ac0kbtdgh9bvcWxL1OtR0nkiA +6evmTtC7HuMSKtviMtpHwIHp1TVu4nuosFUJaLRkxv43U7ReQSk8nxFWBcucLIaL +8/V89YmLH6LAWEr6zaP2KoRwDLJr5mfpU8GLaBVittGzxN9llkmPRA12uS7HHgRq +i1D8bcZVj4EHoB4Lj5U0L/GpqgU/UitUR32fmmfvzQFMWVRMfJHP389Y2lRbcqC/ +rZXa2USH5WC+oDejhRq50S3B/v1jB8jtYtWZXmYQCk98KCUB+4ck8uSLYZGtZpt4 +lb2ZSFb3IhGAzJR5DBgZI6YrfwnBfOxdt0VWv/pU0PzNGbl/iLRWFI1aIOcIsWkV +0+XDegde8kTdhvrlbE+Dst8sBdIKN+4BJxkGVlugKFnlLcTPiMAsz1W3b0wT3PgA +zSYgf32KUCtxSgJO7rkKOf1vzcuH8L/MYH6X3CV9Zm4ZXXbTSyMp04LCJZMO3K/L +4lc+sYs/KFJCl5mt7zCXs56ta522TFgg+4JV7ZyI+74ZPA+MJB647cdHiNYMIh3r +FUiz4PJRQCu3NdeyCktChASFKag2AMIKEKeow5z+e3EE6zRy7ErBBLb9T/14BBPn +5FRSv0A3iiQVw77i30Ds1YuROX7sWsN74sgJfytLiy9vdT3Jiz+JAiIEEwEIAAwF +AlcNS7sFgweGH4AACgkQ5zvGQcwR9MiizBAA5IaFWe3L1TckdaIu+z/OlxEsL8jF +NJVCXdjUoOUk4PKf2BpMbWXM9N+JrZw3kjyWX//S6Dl5Do/tO9JTMX0btwIfhZUk +uvx7H4Oh38UKwkDl207DF9JMDeU6/h/rsWjAmzVLxMhdbEGIDQlhjYgsZbJjC5be +ZDuYfDKOye65HUa++O6h5EOBd2qLRl/pGJHLlAiGPLtwY3jewEZlCrlO958aTkPl +AHxh+ltRWLd2zYF0xnBaWvpFOVArjDNkTSuyYYNtBa6OmKPZ4BkPQb5Av9b9GCwJ +2dxdlUf7GexBHlANRbAcw0kXmCJOYLxxOx8jQRnQ8TLiL9Rds4c+XlloJfYsD/Rx +vIvUAKMqFEXmMlBnO9VJeiw4r0F7pNH6VYp7bnz1NiW3Mimk0Kjz2TTOVpfR+kht +hMFO+oCpJShsfqq9WWX2+MM/dC11oIGfr/kGqK6DSkIbflkqFnBEVuM+uUe0OeDV +IWrEF5O22+pGeC0Yezrzp4x+3lL8ObsFKGWwxTdmbpIcR4zT+Er3dPAdLBFcm/Le +0Odjv1sj/LLOC6FKg7qKG7raglkQSMEF8DAtWkE2H1P2ywvky8HArk5OM0LXcxub +Mo849kZrLhGblt8+zp32fafsQEIsNAzoqCR50XSHJhMb0zmPmvXCAfsk1wWKlgFg +M7vo0zXSYLg8ifa5AQ0EUoqh0AEIANGUbt///24seQv1o9hgAWJ6i7sjC79jCH1m +tPlLjAsUcGg+16fTwAlII1Z2ffXYKs9MvcGBNVdxkR8S1g+aYM/ds3hY2CglHe7z +N+/pkYr5I1jchmCE6LQDbGA/yIfiufMkUFB1Pry34P+G3mcnENfeETns/26yCSJ9 +plysIggJiPKS3ihrPnp8qjCEByzBn70HRkliS4nnjws1aSG67aWUn0RdELrK7Mgm +EWRacrMu308pgdn7XQ/hUUPcsOAqiI9tc0xeG2FXEg2WS7aklqAw7yjEpJK7qid0 +ntEbKy3Erlu29ZxzH/kphNJH5eQFgXJ0guhG/Sm4ljt45nn7H+8AEQEAAYkBHwQY +AQIACQUCUoqh0AIbDAAKCRDCc3kvfYNUXVfxCAC1ajXnKPFswIU2RgJETuY1GgUH +NL8oU3bp5oGhocKPcDPQL8rLZkAhTfKYkRoc6hLS5wcgz8FSEEz5oMesBWCXSZBS +8xTW0vgncbrTUVnVmCAz88qeQ7SA9RVmgnpgKnVAv46azZQkB+x1FR2scSEf7uoo +Go5zxB7LvSwRX+bgyct5TRcs37lLLaaGlgsy7yrcZYqqUXjEOGrZ78KMNDifK+X0 +XYoGY+p4sCfl4Uf46qANa4shQMZjKaWGZpiqs673aIg0MoZPCyTTO6Atfsv2Li8E +ossDZpvJuroJFZw5zvIEy7AiDAcCZjMj8FLoLzom0A1FNxCvgzOraMITOobsmQIN +BFM7JpoBEACmf7uB5P5QJ8X38ARQn+dr+/O+6/wzkKzUcoFvRArwZTcpdEO/0C12 +kNSpK2UkVMh4sorYwA8W0yv3spZJWU3TiIfCVryxqZaAWEIU+dwsQ0P6EAUythjd +QEs81bG6aN0dUqE26fWjGL/mU7BPtAwfzg6lty2cwZJP5zaNCl/PjRUeTKC2oNas +3M5dWoOqWq6HLPqnTEPHPlZ/mhkOfLOnJA6r669sQcml5R+Lhwd8wdJp+ANiDLW6 +61MmaiA4VqjEXwsXKK0KISWftEgd9WGBsHH8rn4KdKj9u6EtnDlA3vaPmADZmf7R +VSMRoMkdiswFqEIMQuhTVbqS69vyhtByQs1fhriYrPy3OMeSMjJ/zNDCnHTBuKxo +NHgMcznVu1tjz+ggso7Whd0IiXEaHXhF5ASWnJJa+xLxXQRQV2X1RXEK0bAySX5B ++NmxJRVY+ixpO5TVhQhzzzL9Ivz4z0odlvt5VJJIHHFIAWkgXRNAo0wgDzfe+jHO +E7nz9uzYsqDBV25Zo22oMZURTBN87WZ1TFpDiORvvjR8QXJIBIUvMHAhG/ZlEkVo +poNaznUOplnr/ToDpA1RDrdxeUAQ1i99EeBtXRREFgByFvETnVCkX/pvQA1yFrhG +FgqCYBpN4IK0UcUx1MuwPBrfZxbL/cy+FhmJqutB6ufaJzatMQHu5QARAQABtClr +ZXliYXNlLmlvL2Zpc2hyb2NrIDxmaXNocm9ja0BrZXliYXNlLmlvPokBHAQQAQIA +BgUCVu4HLwAKCRDCc3kvfYNUXW4MB/9dLmaZaaPUPrEaUQfN6UngTKRNLOJj22FW +2S+e7ALUcA808o80BaK/9dk6mmQCD8L8INRzsNOyBGfN3KL/hV0Zg7BtX2R5ed5p +0S1CmJzsutV6AAsXJvu73bOCy0QosnpsJDRx51k/4+1jUt6PkTMy4YxbVDDBRQTG +DApi2EeX5kwaw1jNiubsfOPtBbyuZbXS0IBKQREFwXtbwUmEc9amw2QopNj8N8Oh +eXbmc6AjiZUdDjOj3tZ9oflc3t6lDVH5EypuKZbcR6fOf4AlrXnuE3uHYMW57D/h +QL5/BMIe1fmK0HYEwg4BaLqCu9lgsYTYJtcTHHfisRDMs7F9Wxw7iQIcBBABAgAG +BQJYvupKAAoJEJVRoLGm4pfOzKsQAMVG0EblgGmcLA+VKZkuHtOgasrBBJXkxDnG +B5Xepg+1hOduxkO1rR5tGvejlWhcX8S17o1hdnl2LFdyzHwBU+i3BYYDkUFOWkO/ +mkUvB3SPyHuNMRxZtNne3aZ08Sl/3yxIJFiEvg9ZPS3NDS9G/jxcGzP4b9FHE170 +34BxSorHQxER7upkow1eO7dhjTCRVeDggMqWPYUjPGLDypiZHfkeItHvjTYaueQ9 +oUzFzRPLOBaGVl+aIlojkIWWv010Dk54/uisEBbFuVoX9b76dBx1INEVLEb66MvC +BLhqsDH16fyj0tQEaTjSSdkJNul6n9DH2idjEkIf/+sZ11B7rW3FxuodtCB+se3Z +c4xWWtuvahTV+UwNiPC10pOUZbEnqeo69VpETSVK5h3jQ7HsLiTIgAVgwEUjPpLD +GsFbJ9VB9m/OYNmN8gtk67OVTu5IjHY06eifrHzBNXNf7A+udJgs+PSxfFd3jOuP +uaR80cU3gbhbzu5LzDWo37Zj9o1MPmSENKEGnW576RKZ6lJYWkpD7XJlwYs9mPse +LScqT2z09G4N0R/cgxGo1UCSuzWxc7eTFG8Q4kEBul7KjA2t3jxyzALbbcGDbnqS +Ufvsr5jQQdwh0LU/xDL2sAm8Z+4yrU4mqQFicWHDCOQPUF/C0GCMbKfbqqCC56Vs +sToI7UaTiQIiBBMBCAAMBQJXDUv7BYMHhh+AAAoJEOc7xkHMEfTIBaUP/jguidAV +f1iW4N/Hk059nISZM0RbjxXJh6PbEgroTzyEEJljV4c8Yv21/wMXiCklNmVhVgcc +OoEqZMwDAz2vu4uDwDk/z41rM6lkFNVdMvBx92de+WjYYsdIBQYfklRY3LeImrkV +vHW9YW/yyqjh/wqVKpfMTuUUufaXgr+hbB9u5UMGY2dgq+3bTj/MqgDHa6sazam2 +uU0C95CCW/rY0GzX6azVEJkEacSlue5sX2/y2UCpCI2oCc5w1NUASSYpiBrTajnE +loDYpgt00deEonGrhTZ4zCRdHSBaaAZbzZ5KQ7AYfRnk6C8Iawlhhm4TirQb2bXq +Oj20E2ly7tpzeo1F0ZdOQQXuolfp7Gf5UQOitMqdUeTQQ0HelWqfOoGPBkbXcOwJ +Kz7ptfESnBD1JjNVXtBIxyG9rCeqwJxNcTt+bWrXaqfybJFUldYwKmdITnsbjlj4 +3ArxOUm/wfxgg3uVcshZ1g6etU3t+57rTQHT32VdPSKKW2AfzZS7um6+LypnIch2 +ve16PzM22HUWpounMmKc43BNa729+3R64EJ1/0qftiFuYoF+IAIkePcLc8qxJxJ/ +TJbsmSpThLz65645wbGD/b7Bnbb80ewBFMwivtwc58WSi+0oWhbuGUSAzCZfN/7I +hcPbWtQjN0W4Fc6KCmAiIyTML8Z1CJs83k+LiQI9BBMBCgAnAhsvBQkSzAMABQsJ +CAcDBRUKCQgLBRYCAwEAAh4BAheABQJXBCGnAAoJEAn+RHNOt5kOLQEP+QHDbHiZ +FTkJNwmx+3+WV9VeJanGXSjccM/yA/lS14PcD5ic3rm0ttI3xa8FmzePZyH17hQB +R7eawYSrWNErJr3ODd+P8rgXy2PVr3nUdQP+jIgCcbLiGgcFaTtYnAiBXNVzZHrS +xVKyzxECHQAtnkarIzMmVTpm985nwcSEUdj87cqFRwS4LIBDme8q+0lI+WMR0QaG +18wO/70/7jnw1vP8J4Qn6W9dt1GTTBpTnIw+PF552YRQy4V+WSPVcijOp5/8+sdI +DD+g11TtJLpoMsJtqNJS8XCal0LONqN7noXGc15BU9Y8LnhEvs7aG/7R1CEOeR75 +ifWnuUIrKj75xg96TPHhwzKKyuhoc2UYf4hhMgDaZhY6YrZ2LAie7CQneh9uWZn9 +Ku93UMWB01f/LyVnDrr0scvZG5g0T70h6woYuf3hIoUokma/cck4svcrv19gQ+UA +gw7PbxbL32oaX5TShLh6j13O6UNqwYZbDslnuyp2TJy72TM0m1ESCZqF5BKZXvrB +vvRwIkD5Oi+Y7EJBuT9ZCu3rPyTNoRfxKKAcNV3lSkQx32tucu3IYwYS3twi9y7/ +uC0fU8UQw4wDATi91vq6t8+nFMBfuZC4ZklG8ztSbF/G259WpsSuQsprFge3KKBU +oIEde3zdEC5i7U/Tv84ON1iEoTyalDnfPDjoiQI9BBMBCgAnBQJTOyaaAhsvBQkS +zAMABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEAn+RHNOt5kOgmwP/i9jLD0h +yEyusmJaIo26TW7wlN4gc1rk43AU4WXrlar2nCbW3wd5Mq5sqZPCqmOhGxXdCVP0 +Y1bXSunSQnmGWaWRxo/H+rhWYOSwICGnc3JAjSnSHndgHPBkqyw1qGivI92xghT7 +WPAn/aBDH/VgQ0LuDPeJReDFc0KFCpnxBql/eBVS5/D25LYyNhFaZcCZJItNzieP +dJfhGdml9NoC92AP2qHTO6UgrmPJKlxDOWIEs8ITwClZp9Y5jWnSY1xhQYPfoa2M +87WbDJRZ9XMrhUyGuqdoADdsnSIKIr+So2QOM3dPsQ/Fq6tkK9tTBlT2n9wHgmuc +uTuT3n27GkFIF5Npz1/TnsGM8WzIsBmfOaUh8DVcurhW0ovmq+drLV15FillcV4r +hAMBLKYquj35BjoxXaX39NKjKe7+Ngh4gUZVeQPeQtQq0jZ4rEd26x5Pj0DH3Jkz +OaphQjS4K1Im9fZ5EL+mJ89AMKGSmMNAGnivIt84CUd6i4sT2a1YxUkq8HKQJpgr +nPMkWpsXpq0+xnr/43CC6vnalEUjrKsT63ToHOQGRxK7RLBbUioBVy0tWKKr3ujp +W9iPefELT8Refw5PIXHXedb8cpr0jmblQ77DM0mXXljQuTjxE9VaakHA+RwBYy0Z +zdMMKKTcUXcHOJJgZ22RTA+07RO5c7NLkC2ziQJABBMBCgAqAhsvBQkSzAMABQsJ +CAcDBRUKCQgLBRYCAwEAAh4BAheABQJXBCF2AhkBAAoJEAn+RHNOt5kOABMP/2Df +9RUECEKAoxnUQvDpdki0UTEJvgjdQVDonztdpGw7kaquH7KLQBxacIU0J3KDr5Da +60RyKL1InGugbLRIt/iMbLn+ENPsIGOHAJNmIBXvChwUGFzGmSRKxZG921DJmI89 +qjtFbK0nSy3m5AUpPAmj3UD+JXGGc5QIxmhOZLcPcY9YGv0oQA51ukiycgy8s4uZ +7SuT+VYk9wMA3EoDlMbh6nwJjaiz9eunlqMF2aB25Ri6SxtXLNJDhuTzEJSVZQTO +k068wBR6271Y5gC6K9+DPqBQeVXoKrFzCFfGmaMAkiK25WFfwqJJKvejkWNi0FwE +tlBKOc3KzCG3rV+0FYu/4rzNL5j9EQuMZIsu+drCz76/hA4j/sWOz1wqwRMf0197 +/EqnRVXHPnDIa9h5WbCGTKFbVaXth0bP0EXgCZ1IxFsZh7JjtVSUHYDSfZc61npe +zXshg1JKEk9f4XIW4PoVpjrIKWFMJ0ILsE7GQA/MlW2gK4CpEMAxH8EuXQPXEHA0 +yJ1pKdpVfO35ChqYdVBIp/oNkAbYp+hwUe44/TJsWN7ARVioH9JK+EHef+QskZl0 +796cQLNW9I5txkOpSQ7cSbEF4SEaCGS/gHVtFo8xCEhVBt2ElBHeQ4Y7B4Zbv62e +yM44mcJTTxP2SoZ/dwyFMUEbJ6PA8HScDLbFZL74tC5KZXJlbWlhaCBTZW5rcGll +bCA8ZmlzaHJvY2sxMjNAcm9ja2V0bWFpbC5jb20+iQIcBBABAgAGBQJYvupKAAoJ +EJVRoLGm4pfOpIQP/36ItdPwRczrB8eH3ifzqXCJXoeOZ8a1Ys/XWtzGp2j7+wwO +PwL/t5YY8oxbZarQr3QX2RRCIiz2Ftjfea3/AN0J+AgFs+0t4zEuBkVX17SUrp5T +Gc8EeyH39KHX2B42VgFmZyQPQMxbg/yTnhH6qUeUuteiZ+mFBhap/od+ORHfZzk4 +19ybLpOYPZPjSYw+XKgv+mLt+59h2Tt8fCy1mZUYuQOGb+YJ64Hi4IQAtLdL3x8d +dhhG6pAsXDU5ezb8obHpySQkBqVUOcUWSYPU6p92nM0klXA5QvYuynxl8LRUy1Mx +FL74o7aisQ3CKzIxXFkoAeorYWAAzBVDOIOiI3aEFMxHu0FQIebfI3ln0mCwSCKE +IlrTWdeBFfJ1m9gTmbrA9ljnkMXaTcDWNszCjB9btcxV0nRqQGyEZ9wBFMwrLVy9 +cNiJ2qophrha5OmAN2lwVlKUTwTM7zisgpAPs60Z4OPsKUQ0wTjqLp6Xmv2xiTdX +ezBEQPIBGRRcUSwO8dvKt0zRZqYBChIsgWxyTK2a5eeiTpqD4g0W8rSwf7i1GZUl +ZR4PqgeEAuRw8ERz0o9lMuYYLBqnyMnoar+MPF/tewiKgQsiaVwBGsy/UFLP6fEA +BE0cjueF3AtZscR5WU7oT1Qn8DzoVC54GG5QfGmV9bgRmeyon4ksMFl/6SDciQIi +BBMBCAAMBQJXDUv7BYMHhh+AAAoJEOc7xkHMEfTI5dYQALdHmZ+NlBsDOrGCY/kn +qdsDreLnmHWjoK3cMrU5jkO7PgpZybjlyx7fI0A/q5HP20ZSg6BuqEn2wmLPHW34 +Xpdcr14XXjU2fZkRDFV2X4XM30to+MViQLDxcy32qguuC6HhoZBbGGgUHZ9kJQOY +bBb6BerpEsF+5/1kUeLuHDy5BBLHWmU+qt78Qqrp1mOWE06abKpkrdkIR91FVgmQ +a7ILIPjXWfLq/AukgZgv/Pqxq7b8wbSAKn15t7v4NjCtMHYVSfNPyRotO08H7cME +6KxdnIbyVBwoCx0K8CAl3vq2654Z5hy+Y7Cj+ecxXxld8RHpZqzIUaqGaG6bf2gW +uuRpFcOqDUKT7DhHK6Pg+TkyaVoh+K0ORk1B49EPY2v29WGe2TlrUJhgmecVLdi0 +ylvHF9FkBsyqxMFFm7Ph4xqa1O6Okyng3KLX/A/Il5qlI90dRCiVUMY8zZd9B1Qm +q2Es15bDdI13YG/9K61eoO94kD6af8w+PAPmTWok7nxr/YlZ8hgo5o8cApyDHOnI +iKF+Kk1NUeZqLjI5Ht0dzcCyE1+Kjqh8EGQFAN4AijT2ERApj1ipRqs/KxDpoUkJ +jkJ5V3gfIKfsTZDYLVh5aqm46A2pg8jd8rhF1dZCl8XjUYylSZCrl0bLZkV2/sFS +Y1w5mrUJlwzd5Fp7PhWWbKR4iQI9BBMBCgAnBQJXBCFqAhsvBQkSzAMABQsJCAcD +BRUKCQgLBRYCAwEAAh4BAheAAAoJEAn+RHNOt5kOMjkP+gL22iXwbP4B4WVRScj5 +FFjT0lm3/5nP8Mg+RYL63E66ZLcVH76B63s8le0u7IGtUpj8U4DX6EJx0ihJqROp +o3cZrBKj0OYUz8yUDFk4BnvhqpTmACiBaVBNSlQHdTMT4PR+j3BuWpzOiwthPjYg +tDd7Dm51hsJYg7kuFJWDYPdnP+BqwWksHx75TSLiFWzUXmFRaAvLFUIxu+9/fptd +ITHKAOBkJRAInAd/NcAiJBjDFTYjqqztST6xv5cJgtDSpR1Nd+dw5A+y+cfcN1vm +3prZgpKbj5F40q9kDqE5GHJB3gEMh9PF+SPdPeudkafLPU7tQ5x6yo/82NyH1Vvz +mPJ9S5fBK5NWvhs2WIvtnU+3DiCbDX+m1lVDJzusuBAJKvR4Qku+CT2OcjONpNpv +09MwOro075fgKmFrtssOexDPp82k28qrA14HjuRH3I0Af4KfGhU3cL4DE1GB0nib +QSjPGp516eiQtU2YTZUDrONNfquNIbKAVmHsW8+JCXS3Mxn4ShWv4+rG3bcVMKAC +hi0bm+/U8lFiIEmB3d+Oa5CFV483pAofbyPbC665t9rS9ihLJDI6684qnK+FmLYO +xuhPT1U4WL9E/+09VpnafrL+vrHXNNhLf/V+uJ+DvqI744j6d3zBlxl7Re5nOGV7 +j3jsizc0PAyTfQy1SOvc+1r/iQJABBMBCgAqAhsvBQkSzAMABQsJCAcDBRUKCQgL +BRYCAwEAAh4BAheABQJXBCGnAhkBAAoJEAn+RHNOt5kON3AP/2RfLbVPFTNaNktN +RRBzO3AdX9F5WvvyTuISP1yPXTyirrdTyzr/mYzc9/hj3Cl0aXGmhtTMqyw2RkG4 +Xvy/Sz8XlDxDb7+6H+DnNrJvAPaspCL0Nt8xQNKqnfJaQzpWOH9BMuO2DbBSYcdH +gbWtrj7WRVJHMrvkMb+ZxFQBoXGGK1qYRy/APqYLWEA7iwahlkfF9hLsqKxq0QQF +kn/j3C4vir5GX2D5sE6DMTOwbk/WjbR5B7ClsLrcsJOjRQS/VR7bAfmSz5SbQaLG +ODshpWmm02cVBSYFrFy3rI5c1XWsRPUyVMgeV4Xet3IqPIeF2V+fUAa4pAZ/Kum1 +D+2+ww04s5ClLxIDDDzQtNMs51Rysp4e+512i3PlFHThpzOdyecTUuJ4rzdlkFab ++xF+GgWb3e2RbWO7cuqsreMNKJZb1B6qLBgpzKkgdhUyh3oWvm5VCGwxyrmI/fgt +PCfhV6W5MrZon9KJ4Bjac6YqurfEJNJNY977N7pe6+bDpCMIVTAzI5Ts0ghcticQ +vMONTPqtEkQ8tBpGglJ5AxdyeRqC1SFinLwcRt+BjB1rgMA0/Jq2/E7ztMdKcWDH +vdX334gTEaNZnlWcHcVh0vEoQAQCKrslnfvHktxbFvkDTC2LpSasjWkelObbVfxz +qpGa21qQV9ZfDn1tpdG/vfz6FTxDuQINBFM7JpoBEAC8b4+YhGkK7yqWzWXMk3oJ +HWN8wYU8GkbURn52jg1yuYS4cJOH9C3T/iKAMsUYGIjIJD384FQX+V/vOJEWo32b +O0L44LHhQtZSxO27Zpm4dp4jGVK0vQTN7w0ov8Eve708nRK+9uHO0S8Y6/6Ex1iB +EfU+4s8vOLMg6jW+D5rfU/y/O6iFbZDJWXDrVLmEM5yViQNR8/EpD67T9+8wBRcE +Bxwa6zeezh3Y9p4GOqK5JLwx8LDrr/mPfgOpLlq8l+yJHSHVz5ZoJLwY8TE4+K+I +7WqtNcuEnDqSHrOocihIwFycY5Rp9Ta+PkjQPssymMfAIQhaBx45SZGwTybp4GB7 +j2oQ11dUYQtCBV+8eB8UQQoo5EocZfuSEvFU9kvdmFCt4Q8tebveGm+MHu4FQEox +pplg4ei2F891R38ldG3VlDbjMJJ2oaknvHWsglZZWj0QztCrTC2+7eDq28s9/zKg +4FxDsG+LcFhg4qkABkQZp3s33vWkxWN5Vgm8tvXn3mcibBt07jZhRPjBXSjHJRO3 +HYxJGvWm2++Jc1CuQKjvhDR0IzTD+XBHYg4ajmYcpIsGXGQGNOHTWfoi/0AJYYCq +nAm+1kqUHsub2DNccUzZY88n3LSelEMZLYiO1S+yGtbte2LCO0zmIQF4JOyWFkfO +mAEO/Q9QYdTL344e3H0uVQARAQABiQREBBgBCgAPBQJTOyaaAhsuBQkSzAMAAikJ +EAn+RHNOt5kOwV0gBBkBCgAGBQJTOyaaAAoJEEX17r2BPa6OgjMP/1lduIq+zHYM +EWBfdBeOsxZPVc9zt2/XHghbblvsJarQ4blasMiAkJu5R+nnu2DsL5gUvPmOekrk +e3y6/Ioe2SBtLS0i41pKsObpfmoLF5GG3JAoqOgpKcr4WPgZ5Kj+FZDeMnQIIPFA +0XXcDrpiD/IPbtqlrTV/0YtoRQiISNtcvpeAudADAJwROTEcFY+WbVdPs/U4SMui +ixZFZSLvbatrHnm71Hi5zLeZPtjcMMhuGcnl8GBSD/jFz0XaJfImqtiZHnH1nPjk +KcXV7afBZJRJ0dCVyM9uJZmsIqE4OCXDcyTTCZY/V+A0mDxNcfHZl200grdIAmhU +Z74McRpPAvyj0fLdmt3XJ74NaF4rooRibOf/5kwWNoSSThKbpxfdmFrzfPvBS1P6 +MtGKfJ/bCq7BUZ1wnDwxSQ2G/X1U9sW2b5XOJX59uI6KZy4qyrp4XWNSJdKiw4qH +qy1z/6H4nk/TQLQ5LL4q7vD0FndpN7eK6DIZYoekC1AC3iXTsKFTIqh09uhpIxeI +j5c/lyjQpm3sWCEoLsGfW20kOPvQiBuo266IPCFoeEZgHHD3RGmB1c7f7Bu2DsHY +5SYGYvNMlU1Yju+ozMi9onLRkLBKE1IJhPUVmTST8Cw6LF7kZuGGLujwMKgBkLWc +z7EdivTjrXc2U+znZupWTxzlM76i02APtQ0QAJB3IZr6yWl0cwtWt25tq0FUlqsf +dZ3S9QfcFrkiv02NISmKKNGhB59sfXBJRXT8C1BjYvA7OG58UYrnE2s5U+g9Nspc +3V9TAKS2xoQYOu/ZGmv9OJi6o6wATbpR58rvK8ppv2cRVsE+rohBGXylISqbFsoP +3MFukjr7ZYsxb4+ck9bPl/aDc/F20Wl95V6rSjbb4vqx0YcfxC5Cr/qh3t9IHW28 +fHM9ey7Dsy9QtGgaeqHZ/ffoPMyiEFt+zauIj4iTrru44XhGss1F8NVFvk+INxMC +4cZoO0mNSkGWsb1Y1mXCOj2TdaFRYU+FrhkqJEga9OH4LjAmYl5HnW7jU6VCMQXg +wlOBmIZZlKdMpu/3jYW9dCkrPkOC3o1oYNzERc6PmiE/xVaUtl6XwfydyiWM0RxP +bL5JTcLyjerTHO/qNOVlH+mLXkTGRniZ/tVB0+QvBSvCnXQcxG3ynEIGNOe8QHAx +UvKrV+jnPdzO/cuJZbxEFi1MFn+wW/bFFxqt91V4ZjmvtkpGGWQmPovzH3peKTsP +lv0blKIgSLpdfdk4hqJXiYN8NpUW4gic92tTQGDWOoFZBkOqMS99EdggNCl3cCHF +u/nonTa2Xqzb2AxPl1hEUTs6FonQIKmGwfrqpw+9YiazJDc51UnsBTd+4VEVUiBD +CiiFOkooIgZMny7WmQINBFZypZgBEADeIdm42LaylSWw5CosOAte2m6S9DgAGEBr +g/yHSFTZWz341EZrlq1fghIC9nHh09wVlJNOOo3orB9tYoJ3LArB0MQb7Ha7dcnf +n98O1od0T4QTlEroEeJaOfuElLD+5b9HVYqhdRtMIFiUTfSTbEXbQcvZhaLf3M8a +I1G+poPRYNVRx30pX9PM5N8DDmW8Q/xYg3T1uHuYUmd6HlzBiESNE2WWcJoxoKuQ +R2Lk4Wkt+qYnxdHH0vYIsk9mN0yDySpPEv+kzrAU/UuZ9Ve0GhlLsVLL3yHFUjLQ +Ox1gV/ofrV/v0vcWM3+rRovU1cFPUUv75mzA/TJ8aseAbboAY84RyF0b4jQLOmiT +HWdDMSZwDVR05r82JqynI0GGfXRgztNpnnebiYk5QLAqvUzzdfRMyrU0SSl6VDCX +UQAEz3CyODwJ8GGk6PaTQ9/9vmt3OY4leEEf3SrSwH+l4E8Z59gCvAUx/ao1pIac +PdCd/kdx1mPVcwxTjiPDMp8sIeBSdLt9Lo8jt5m/92nKoH9SnE6L4snJVvB21mfw +RxRj1cWmeZ1+BAC7+5WfcJRM6xhr7XXeEmZO+QQYjLzKS1t+zIsv1modQMl/f2ci +Si1RTO82mIEaCfRBXVEpewsRV+nikjsAJ9FOV+kr4NAUIg6zg9QRiHtTulm3P/c7 +iRKFnbdehQARAQABtB1FdmFuIEx1Y2FzIDxldmFubHVjYXNAbWUuY29tPokBHAQQ +AQIABgUCVu4HGAAKCRDCc3kvfYNUXfVmB/9pxeCKnQlj56TKRyKwp1vg1UyWnse+ +OF546ILttRf7/6GE5BfmOQZ6S6SnvEr3l7+2QGlV3mPEydKpxwpn4hCWgjwosDNJ +tBxbNLwypMkAGNxkb554Fuj7jU9qg90oX/EqEQpj2nrM1/pjsaDHOF1wH7M7k2fX +sWMCjoC7o6EzS9OzuNlyAlb50t9eUB1ZoaqS3LHaMwoGb/Ou1emZbd2k5Z5zzp+j +cZXHlxPCJ2OCLOtlrnQMW6QrAMF1Me5c3hOy34GhlzkIWJUv7dQk+GGM7/YRIDmY +sSSpyllMU/oSGN8uAwVxfqWi9RAoNqHP68uRKhAJDtsARh1wS91kg65RiQEcBBAB +CAAGBQJXyhfIAAoJEImmV2CeyUCYHYoIAImOHk6YWRJYvC1mq1qnctJuhXoZOt3j +aeF9gIzc9qyPAxf0tChn1g4pmhmBbgZmoIjxHuB1BqgcV1Y2P/1tW8mHJdJNbhy/ +ndQl36EgMYzVEt2mbuj01BE/eW12h10KYC1Ul3rXLrhUy/Ig5KUT5aGIrDawx3kx +xDXafsjS7R9hBhwz6M3LujgBvvsyGgN2Crh/h/hERYZ5ckXNlixbjez2cB2DZQFB +vE4eKqBGRAj/Ij2JQljHKt/FczBBhXDCVTW7SSeGi9wPlpgj6w6NsTSiKRCi85s3 +BtVAH7zIy0YxxmECUEeqRQ91gQTcg9YqFdhIJY9/ze7xMQKTRWqR2JeJAhwEEAEC +AAYFAli+6tAACgkQlVGgsabil87JwQ/+JT/RooAGS4d5Bg3TyZQOSfw3v4iHyV+V +P1U2lyf4s9/xUiAMw1d6JH1Evu2K5EcS9biC7JcnRNWOGlnxTzShBm9dP+itpeLx +hAEoWjRBYATgWn48PpiUIejWzlkp8ulNR8s3cf7Pj9osXHx4ml8I+bOfESKffilB +a05iaJusPraZvdxkGzI3oPmFY0wMKWq0YPWDosik499ceBZvLku8a49GFPDB0yoe +0QJnYpx7J+Gp84tXO9YiOB2hAZUiLBlEJ7DAxxiFCrzWxhKNVuh5kz9/aJnL2slY +AuifQ3fwIBJvV0fgzwuAgQf0nX14zhlRXnKS04nKfJVcDaZ8FsMliYndvNBImQFY +Xey7HNEZyutEnS1p1BZJRDEc/vp9jBfKyQNU8EO6WZ5gy36CRf1cd8zf3QB/7FlR +WlDxvqrrfrjSwEm/cyA8IEoBbAhUssMMloV1pxtb9mGZZk/QXt6eZTcNTBVZjNQY +VNwnuKPfNfgX3JQ92pwqg+pb23BPi4NRxXBAzupLpcwG1lTC5cG4PLdJtut1LJSu +p+0Fbm0/AesHCXDSpHz/vgmlcAX8feaEzq3TDsj0ZOD/Fn9EN9127WebR41XYQk+ +Xj4V70VWy6esS5ECLioir9rIba0KhJlGBKh+AFnMM1nKiv7mzjNfssOuwKC7kSka ++VY9/qqUvFiJAiIEEwEIAAwFAlcNTBIFgweGH4AACgkQ5zvGQcwR9MitRRAAyWkY +hvT5ctDMhxj6KgQVn2Vf+j5d49Zqu5e0piNMDtjoeudTeFFDhEHZPiP04vRre3+d +rPdgUbm7UpFOSh82cIODf/1NhLiSjKL4BKS7UF+boD9vcRbnb9VDzsMnaxyfZ68n +0lAm1hu2GD/At+bfOKFbdvTkDlk6byikMEKAeLROC1+07aQbtscnpJTDqEyi39gN +65SXheghpmDZUrjt3LGlSgeEPncKhL6Dqb5CitEnX02Bs9LG/f9yk4PaiqSkkGsP +3AXLrCRAEloq3+8JhlZI643uz2SYsQPv4PTrCuYhPua3+/nL5ONxJ04vhDwckVb/ +hupEdg0hpbWmen0149YcdkGdqnNrL8W2lDFETO1zN0vKO09L0wJ8aSshts6/sU1g +vqDjogPhyL99XMdeaZn1b2czq3J6jTRaKV4fSub54Msm9UbggHhxZrO2LByTPzEk +bCbK4tAwpQm/sZa0/V3ORHGZd1KuwtAn3fkQwNDsrFZl8YdgZk/TAgGR7Iq6DkYp +UG5mtFjOrjRNEmgXDFESJsMmOMlhL/uZJfE0g5qlRkOFfqci5sc9ovy5F2OmrtSG +g7ZTFsG8eF9Cdlem+6iwLVeccHHOjCPRiVfJEIe3VrhZVpMV/MUWjnc3ikzrw+T9 +ryio7Y3Zv7VTM9D75nHDD9CBtBjWw9EParmqWS6JAj0EEwEKACcFAlZypZgCGwMF +CQeGH4AFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQtjtTWkwgbKmCbg//VXdM +k2GkmI9QVg7rAfBqMIVbIj4hxTvm+yz3DTutJjzlPHpiQsiA0ezGU8xrohz2s8Ve +M2ICtSBGdWtuDOPN4vudwarno+56nIdwBlZSgPaJDxTU7CTrdEJG7j0xs7VPvmUn +4lJzaWO4TANH+a2VaB4NQSDkr/Y87fxI+Dz0SqIjAe39MEnkJGMl6I6tYpXGQ2CL +pPYpencQ/Ji4HOR6CXAiyIbgVIag5RDB/9cjg6qKJwyTFEoSajmRPtV6esyesAXj +AviBhnn6fFMiL7prU/PZdia0uY/ugyz0QuyCqKPWXHSsHV/3q1+L33ntrqKwy/7u +uKDdaLWBHmXc+e9a6vmIqU5cqgPuJL5s8ZelbM9IW1TrJLbSzk640JGfsLuuHeFa +XM6Jnr7KmXBE6yMMvtJZ4JDsbEHYdPOZDv14If2m0Yw5Fne28VpHTGr5n2NKHmh4 +tfzVlogWZ/DzNxBYTSDVYAoy3X8A/oByeEhWQl1plXMSHpaPZGdGcIeui1Yg4RwH +xNnv6a/rUN+4VuUo9y4GFJUypBS+IkpXIm+hCi+wTZpkbZgw6XZ+kJOQmV490yKo +xp6cFMoHDcZrNb79mbR6q9nT5p1SU/JM60IUB2hN8ky8nk468D5xQN9OATmhJpHQ +mwFVfUJOlHxlex39qydECOk86S6LVTdkHJWButiJAkAEEwEKACoCGwMFCQeGH4AF +CwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlZyph4CGQEACgkQtjtTWkwgbKnJPRAA +qjncEbZ3/19r6nbDsYrD48b7X2+IxQtY9Pa7FnF5jqFURcaYa4l+2PhGtfqcAEnj +B0elD9YC6WyEjFSqAcQ6dJ/derE8R+Sj3quaPcXInkQKDbm88UHRAK8ApHeeOS7+ +CtUpWEzVlGcRAhwpBxHKVANyQTmM3db5CU0u9waMdNszqw19hU19DWn9qXbjRxbE +Nm+6dVo91yBDdGA7x0plginapUEX8WC/u6mpHdde9CC6pj2aYyLVPoy5C+3e1lzY +CPBI/99DgcoDZ7XYFGYngeNDoM7r8nttJQh4wExdtm2w+4MnNXrQCGQoLQhYiwqK +ayUztMApMt8HrI0UxJ8+Z/FZc/11i5ZQhDrum94liVSoB1FD+wD9xFCE0+eLAbgx +JxxO/Ns4W2mBo3DyUAloNISkxHR580GotAmoEhJcK5vns9pCvztUekA3aPT/8ca6 +YZej6Ce5x44L4FfJLqB/zpZTdxOEmeEzhFNGvdPUASpqIpMkk7ZS/7q+ePuL+6S5 +yhaE9tSQ+UqPiVHoeolyRwyHdsns+AoGRoekrbEmbGwyencabrfkkzMqAzmblrjo +wR8d2Yt7UjJDsz2khn71Y90j6IJ7hneLT1PaxggfX7TFv9fc7OE8/BtI+/JaJj18 +oFIiimequgSNJ/aTeOQ59pdVBhfUTfhWXQDZAsMNdkC0IUV2YW4gTHVjYXMgPGV2 +YW5sdWNhc0BrZXliYXNlLmlvPokBHAQQAQIABgUCVu4HGAAKCRDCc3kvfYNUXeF0 +CACDdJ1DfgFZGy0j6krl7GF78r6RKjixOOZHBVaVKl+K3sWqbFQxCfVGWJDaxRBO +ACngV8pPdp7Kj3vbWE3lENaaPushB2++8PdkHSAvJohwRLNbhuRmDck/dUy/nw3r +9lFKp2eRr4fkHRdnWelsfxqD5Eye7Id9bOaeIF7XfIcKbK9HRmfs2ZJVWX6tQGVK +LcC6mYk2iIRTnzKBGJ1Jf9fGj+JnBhH31ct4SpNHTq0+85Bo7biG9l6jIrbl14V9 +cfIV0ZHGnIrKC4E7r/l0cYX4UPgl92A6J6DqtGi8AWXodtPnQTdZm6kq7zMCX7iN +qkednlohGP5JhwKFvlzhn+OZiQEcBBABCAAGBQJXyhfOAAoJEImmV2CeyUCYd3QH +/AtbL+UtD9Tqcay9nHTeM1aXP/edzjjui2+5nE8+fIWxrFRL4X7Qs9Xps0KQnrY3 +n0b7OMxk2cJgI6Bl5gVu83Oz7Pljpp1+W22BXS5a0pU1VNjjsXqW08ICRDnqBzIH +hsoPsUcLPD5v1+cW9O/SO3ucg28sonE7fuVraLc5T3hgxe3AQFYOBsGwypNjO1VV +fWl+PTuyZlHW5+IH1Hv0omIaauEnr81ONu3KGf+ckQW3Qt6D/Nu/DeplA/NANhT6 +tlRybWNxFDn3pLfMM0Xn/EoNZAnyd8GArE9j6aRAvVN7pWqr5AbSlhC9Um3/64nc +gTomS+iy4H06o7qODEXlBT2JAhwEEAECAAYFAli+6tAACgkQlVGgsabil87mdQ/+ +NPKWzfFwdQVHmQVcm1jFvnQA5VNLGs0pYXwhNYXF0V78FODZi1N7P5Eag4+VvBzE +tMuBfYUwq6ZLxsqlyGXMaHsPdtdJ2S5UBByP7UQzJmEjraUUgpaO210mekrCGSUl +I3quCEiC0+ytaM9bvBh2EeNfupSIknXZ/0aTs+jYMTmttNU9QuFdgEVR21Vx9WC3 +0qLdiDnuBBENddGCfDWXGw+n7JulWNQhsxxqbsynRQV4rK9fCGfgLIIf5Mb0VI9p ++hDlKqNtVRQt1S6npE5SU7Ilqgj5SGE6j9ClCh3FOGxxqGhpF6fwk4tl67wmdC7/ +JR7zPAb+JtTY/ayRl0QsuqvOMFuAUEG+LE23IhLGpD8VwWdx9hYFn60C2Q/bC2WU +pdS/ZWhkCuA1Gdi+DvLMmSIv5V+o0N2bM7Wv6JwrXIbjg//+aYN1hlTvlj2rOmp+ +5iICTLkVUvFgnJeVhES4sVchUnOpLQkTn4JsMGpqX1++UDsUb1cdLW3Br6E1jFm+ +EO8yOJJ7Xu10qvVOdhk+H1AhWFTKngsPxp+M92NPFp+ZtkXkZJX+pLzW1YYHL2OJ +JJYxjvo0RhGNuZAzsNGOo6MP0guy0SCf9Z8vLyQxz7GcUlJb0I9xe5oclcw8KiGp +zq5iziLImz8PBQ72FvYTft5GVm6NcEZ9c7o2KudBzkeJAiIEEwEIAAwFAlcNTBIF +gweGH4AACgkQ5zvGQcwR9MiKAxAAlcAV4pEvw0Sj2fBJLEVblqwE+ACLR/reTP+e +sFOCv08zr1EDNPKM3PVqP4jZrPhANa02GmzZEdslgn/PasCmgqxmnHCquyf2gkkT +uPPgdbweYQ6wiR9PWvedNMQhgHySYSO7n4Rxd83isfoUAiwe66FH7r8+T4Z6pOS6 +XJocE88eIvh3zghBcaeg70ME0goq6TDhrpGfKhExvMXotyx3iOiqx/vUbmDTvp0g +kQtWcBfX07cyGzgIR0NSqeKFK7F6USUc257uKRCGiaXMwIwFyN7eb+KsdA7+emNG +ChwdIQHOjfEiq7c8LyUGY5Z1ZMMbi2F0WuWQlhpBmKCK29HXCOffkH/NIyMf8VAb +bi56b73y2kwH5KKFb48XpIxMcV0abPCJCsbcgAUmDytTHbLBuPM8VbHWP5uIhto8 +Ff68zb75iv6F2nYHDZUJ1EGLWb8tZWacoxd/+Wx9TEAc0S/o25gOG4c1ZwF94b8M +2jsOT2Df1JMcrrQsoIf+mN9wLS1kGbj6tyfKF+k1oWpDmaBQEVgF2vrxMJ/w7wPO +JuHV5CRDRxQPZNbCwo6B8PXyY8oL6vLg0bDP7OLSZL9rF3u7wGShezgz42yCWeii +ErOwBKprp+9zxA2Oahrimgi7Cl9Lhvm4Mti0zHKAXV6O/EIpZX63QAqjJkiNj1FM +uYWsBNuJAj0EEwEKACcFAlZyphUCGwMFCQeGH4AFCwkIBwMFFQoJCAsFFgIDAQAC +HgECF4AACgkQtjtTWkwgbKkB0g/9GcjCZXIIdEMWfqImVGQif5UN+fo2JWWiu7ZU +URomUadJm5dpiT74u9AtvbVIkIk9TUJT88OYA4FJUparbEKiD1ZUN1Rks3fiCCoY +ElZAUxgWaVMWtiYMetI7sU/GLj9SX/xSa88g5X6CQswkunj7hoReHZ0PWU69Y9fa +1XFpR4ynby2kvoXVEcQdTMXuG/4STWhN9Y8gMiXrlbyne9VQ4b5UmLeIVLL9Xf9H +/Fsj7rHiqstA+IGXFBDyddpdqpHPsLNjTG5GH1ertcbm2mJUeC8uvp+tkUFCIKfH +ZQsMukULwX7mYRlBSmlrr27Q78RtJ/alV0jopeoU2dA24d8/655fBCQBk6NA0gfU +eLgIcmEbiIfVMD0UuOCC/86uIyZ6JjPdo6FT28NcS928yplJWIbTcsHMRLPYsZ9E +GO7JTs+MUwp5E3wGLJescTzBdWnSfhnqWF8JUCjVxUaJ5Tlr6FKcL1dZDXZSV+QT +AT/tzYUNAGnDZQK6LvQ9BNi6ZY7Z0/Trv4cfuiMLJSL3i0ZBbMks5vP5/bLRMhZh +gaDIGJ7ZdpiuQ7vWuX+/LGBdBXzMy9aSpI6m6DNb91bJE9AYTppLjrY2AiRZ526O +uXRVmoAba9+4RuIJZf5I4RYD31FmAa8haMiQqx4ESyVC9EIsw46L0r8fQGp4yOct +/ke7vgG5Ag0EVnKlmAEQALpPU/Kd58YIaCOGMh59cGBLH13dflRycXj4m4wbru0R +q7VtcEC5y9sP8VkA5ziwJfUr/If4Ky+9NqbcKJXwiQkYGAiPhWRaU1uL/NC+DDX5 +vM5hFW2HnvGHnxIdQ0cimXtxwUsw6GYKNR8BqTrEL89V/Re0rXfZmP64RPwST320 +Jl+nFpm5GZGRy0h1KeXfkCOZXhZv6XhGztJV/EfwmwOm7w8gXyuwZTUk1NVy6MZq +JPcYHm8mPM7ZCesLazc8TZMOCf2MMKz+L9Tg2BysDgEmHxB0fggi6X9TyUZ5Bxkl +vn+K7zKAGqP5nKWku0eiULrVesUm1NvZfaYgs7A6qvIcu6LO5KRk6lMbbWGB1DgW +eymcXrIW85e4cPVFY2BTuN6wBJgEbGkdHL+jDPB69LGq9zGe/f0/hHUEyaD1HqHH +qd9ArrSLAibVcHVTpcVuX2akiCuJ+jit5uwZqJeDUNGFuU57uogKq84zPsN2QUKk +LM1JsGf/ctmcOU/h/K7v/7LrRJTnmUvCnk+YLa4mSUH0tgdEq9QsrcrHlWRd+1jH +LsOS0clOkmlT8zV2tAUNghKSJBQ4cqExid2vh/A0CBITW5DvKbd9QXgRfcWi7CHV +bXwYvrY+RxXaLlWQT4F6/Tt0Gie6ee3OkdGpm6Wyn03Q+L/efqzu0zHyhHz2h7x7 +ABEBAAGJAiUEGAEKAA8FAlZypZgCGwwFCQeGH4AACgkQtjtTWkwgbKmagA//YZXg +hn9XaW39IRjnhDnViFFpAcZP75y96aR8IhAsn6dY5IMUllRpmLA0XuwLdTRytcwn +zsCKzkvETkQgWqqMqf9xtNlfhr0l3u42ihlC8bNPzbnOv3wwfwaj09l2h1xLDC0t +/oL+A9rZVgjpfvCl18FLVFpQH1Jb49fRH+tBHq5ZXJSdPXvGT228fMXJq7EECbRR +Z33oLcjjO8e6Osfch/tCiX59YEMxlnuUyMh35/cjH57Lf2WxpJVleJE/YabKOk+K +Una0417UGP3ox8R6/SjCXdTPksmuFPL33NB19Q1UuBeW6+yUr9bOmk2Y5df67dfD +hzendAv2q3JdrL22/auyLX0dQuk8TkWRm6WxxsOttQgRzIBzUJOrRLTAm9W+c821 +QiI6SIsY2VMhmlWnp7e+LXrkGbgrHsrDEQvK4TTukkm/o9seN9sPhRMYY8HEZrf3 +L+HvaeHSG/vcS/gcMNEDCBCEAuEewvV5fJzqQwzEteE1Hdb8B0GrYEMgPWqPiDXk +WoGdWZw4snv0ABuzND7ZKHTw+Y8bDTwPSIAayq86yZZb7j5LbToQh8qXjd4t388w +TWi34UA56lP0JeRDFoCz5kfusqaXHyaajC6PBfQJvWOmRq0eElkCypjwpSNJeoV9 +WM8eCXEvI//zLCCL8wGXBKdNO1sfIqaoPK2zU8+ZAg0EVpWOlAEQAO39kLgWyyQ8 +2QCAurbjQr4KM8nOr/Ry4TIAEl4BV5hYkVQlFxvM0cFXOvzm9bSkQolQbJPJXEZX +U/1XOSpovlFGK6lWLALmV/jw/vx8IyARrbPgsi2eUiJacnVSUN5O8tzUOIsLFaCx +hNFGP7HvT+wvoSYfuVoTUL/lGWeQae7EzhWCu5xPVQwexkkT+R58973k2HMm276K +L+/fjlmoeGwY/J94lhXYKJLaJMirG/K+uWJ2tXCGqKt3UIou6/T778VjnQ7xOrjF +vsrP20hA4O0JIGx7HbiwHZrAe3dF0LCZbt30XpkGZbJwqWUW25eM1/RsM0Ikty1U +DLBQrbyXCOtDDzrLdU72S2ZUINKxIEl3RNuEPthSe+RqdMnNaEX68KhDBqsK4Phl +1pYG+UtMgW/ReMntUDb5GXBG5i9M3Y+UhHMu/Gvj4mIiKi6cacEflbIBXF27p6da +x0goIia6ObQlSq9Jcsm1j+ZTktQjJoZ73AGc4PFF5K2808JZp6GALzc0cyQ7u34C +f3MO6aYNkXebPBRlE7w1c8CjCbD5f5i37juNQ4C6UddquOJG6ibQidbfr0kn1lSZ +3Wb2kKahD5X9g9pDnrLmuIjPhbgcmoBqqSyHi87QkzIivdUmMEPFVHpAD1QwdXY9 +NVQAUD29hO6/3FNdXfIckV7BfjjYfrtbABEBAAG0IU15bGVzIEJvcmlucyA8bWJv +cmluc0Bnb29nbGUuY29tPokCHAQQAQIABgUCWL7qvwAKCRCVUaCxpuKXztn0D/9k +JpQL0eqVj7xr3vPFsBRugEuQB/sbhjVK+E9ZOq+Ssvs9QRSkJAiQrLVVDQZEIx7z +56U67lAOIRyxNeT9eL+9MTNaWop8F9bFyAoD7s/eH6LGA+h5BLK5DfAORJbUwzBm +fqleTgIToU7ckr/83wOyH14KItOz2JGvuo5P209pFNYZ114TCJgtg8aVZRZQCx9y +fOI4kXHy+wHmiPHv2/shnDEISUlfgrmWJgg4fkauQbgD6G9U9Kf0rpJodidWG/dy +TX+j5KsTKmV5XiY/5+0dkN+hjx98QZE6RAmtq58aerirYAntZYMrkknM+1bgJnEG +yKUredZbSIVaYgc9tAUk793aCCD7Ew9JVLl1prP8a1HA+ZeRbzSw6lGmuK+YKSyt +/01Tz6i05Bi7wdDVjiU70r8gR5ZnP/OduOSmvMoFXCq91YzePt+bJioPPIIPX6Z/ +1dTpOvBK8AlJwp79Vb/+iyuxATKk6RwRSETSDRcqA8p3yoRSMv+2/OtlyIFU5GxQ +VimdJVHMnwnxJ0OgrqNq+Bsk70qWeqDyJKBBRDm5HkyW59XIZ9B0QEdnFTGsNS89 +hfCGyUuNJt7U+uL2cQdf5UWX4FAo8B6UIiqzul2dw8umXCHA+DxuolEoK8JsvSb1 +UKnt5qtKUtckbRzkffcQyKNClwqNuZOqahLLjZKvJIkCOQQTAQgAIwUCWJCxOAIb +AwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOc7xkHMEfTImAMQAJvksYVm +iDOXoqK6eTTDiGM2DsK57v8z5UajvYhw+Dnc//fobtC13uQxGlMiLYIIWmvmMuFv +rnl+8xiytCOmosNeuoSUcD5CC/vUObwJM7QJlvx6y00onjsdLuHAyM57dmZgFWuj +aI//iyXkkRTCEs7X2JrgkJzE7zCn9P1qLqZ6sGuHfDKSbQs75UV9wOE33cr5O4/r +rE1QvJtHE8kjuqLcDoRPM9to/2j3IelTQHtwKRgNevpzxLpfrdp5O2g06+VETEOB +vriPuaSo88254NWBNEslGjABPrdnLEzRS2UNjAC3A7LKzptsb56znkGj2/I1ZNPc +a0cmUvxao95/roP7JD6w11Oa+V3iYSV+EGYRq9UD+T5nfQPK76/PW9T/GjcFUPON +kr2ItrEZ5vURhz1ChHUkkP9FIfDzZthwsVV8aR3ktM9YzAT6tNhanBWzMDQc/MMm +4Zo4Idh8U1lf/rLrEIDR0RzH8d4uW8T/K0GF7XA6JUO5bFk6+E6MwV3pUtMn/pcm +jJoNuWOJsE8LoGjkaTjIID+DA4tbmVVhegPQjiRayVkIflAFjO1bczoyxU/6J3QN +ePLiLqp3SJSePCa9dCnm7rtRCZ3GwQOKbKMLjBcpCtQAiaMXrxCtE4580JsCZDif +PqQRMqA+pGQgchifOfRdtxYoCJudmNyfiMkutCFNeWxlcyBCb3JpbnMgPG1ib3Jp +bnNAdXMuaWJtLmNvbT6JARwEEAECAAYFAlbuBzsACgkQwnN5L32DVF2YRgf/Y45C +QErahooYrXghHqN0q3Tt7iGuJr/GyLCEcQFkEeUj8G25Q6PdnAWSb5/qm1De7LY8 +UcOFDo/seVj5ANNxrVnWXXLlpEZwrtN2CWDVbWEUHxxpDESH+0FrAN1F589bT8DI +L7Vq5z2dh+ulXnymqiGSwQkFzMlZYbrS05/O5+Ljpxv1ZYKQ3N1ulJJi+Z68GTpr +rtkMEns4S+la0cj9Aw/S/94uGvXA82k5mvhKbsqz1nFvnde8QhPyVDTwMCJ0f++J +n1KzPNXnHjzMes+fBuCNVV97jOoPZZF1TMJvJeAOgRqQkxNAEzb7E4W41WMsPRMB +SsoyDiFkFXeoHbp3SYkCHAQQAQgABgUCV+ReKgAKCRAUXU4NeXB5mqlZD/sGvm6o +pVbHlshEu3hmsEzBzWgaa94VFJ21mO5h7joDX+lSM6ozTKjCovklLGybGUj9caUw +3DuZx472HBsATcJH70koSNJcrD5ePzK35YLtkuZq0rWr/o1GxelEzoeJgjmsZqEj +6vGVkyZc6+NW5dBhMcKkITHMrFprq5R9do6v7dYlNbnBySMT1FOTTay1yhoHw3Az +/afTE6DsH0s9MUJExmok1hSn5cpcWQjnY1GeL17UikO7BGaHQD9n3/4+KOX/Ga40 +dLUUtBL4sL6l31HlyTbcPO1AQPvHzUdvsBIbZKk7MilzBPz13GLcoMQEQb/UMIqB +dc5M18oHMzckVbOoAMjKujPgP68m7+wYnaj7Xl9uYtfTgj9RtzVsh7JRoWxmPPx1 +Rx6VaHO50QkALtrgr0BXuFqjzkVqmb4nEi1OaI4Mv1grBXkoYl48P98MMVNfmtJk +LE45NrHEsZAqOaU4eTeOmcedivTFilku6lKKdkBwLuLr+UHeVDEFCLKPY5jVdEbr +vYnfitDFsY+x/QUKkaLrqEEFgeHCAMUp7mtDXhGgE8j3UY+U6ftrtOgbt3SUF5nB +nFD6aPplWZW8FDlGecVjxuG3NHPCyg92GMa5pIBlnlDnZuS0u4Mc1CpzFgcrg2u4 +8kQnpHGHJ7Xo2R7F6r0CLUGayK5lAtxhX43W64kCHAQQAQgABgUCV+VoygAKCRDU +L1Awh3AmJ1dYD/wNSDzkUZpH+5rubJROIdVnR8DNDQkqVZln/ZVWXc8bghK3OlR1 +35NmjiFrtvEEudHMxkLdoJBFuDBNR1yf4Y0nJU25El/WehqYzQe/rMNPyJ/uPOmT +P1AQrNUBc1x4nrMJbZq/1yiTst8mJu7ZRnEvM0F1JOy+rDwySNM8918aOuX+ZqNf +vL4oAALkLvLL0x0pj5gdgVu666X29z+wZJ3b4sJKZAuZfYWS9WS+Y7AELu5oiH97 +DJo04vgyqcJOpcrNp17B+3yoAxjTHv0jW3xPg3MLfHRx2ZSfnSV7QNc0DWj0KU1i +MaQYRM593BFOXLwJrEw3xiCONnArgrUC7L7DsaveJtuVN8BLKZDT709Bi6p4DpQn +IvsSztiAPapgg+e7Lt/V1f6kWcXub5ga5wTMubZYAlkk61vh5nPAwQymcKyAIMEp +4Q7vrQhqv8/COYRnYhwIrvdPRay4lgLQ0OJz0A3X1RtRlaH7ODOapsrZn0LT5Syc +MDIk76fnhg857jxhfnpWjc3Xp0JB/twaBdvUWWDjpIb5t3d4l4nO5DkXNKfSQEmw +PWKUetQlMjEzPD7B1nPZrmbZNK0RXe21ZfVjHvXXvXiHXp+HT3RxAMNCH4mVX3LR +SQzz8OOEieLFO50vNc4mxDN+AknM0Q7aC1FiEcJtEXdiFkPbtL460R62R4kCHAQQ +AQgABgUCV/Ok/gAKCRCYZCyGIK9H1tkUD/0TnHwIF8sGbrPQWvKNrNSpuTEx8i5P +w/To8yyrI+59abcJSHWh8uYJ/bm7Z9HQsguKF7Fdi2pwWxsjC4ND80x+a9f0DGS6 +AoIJDtYXdVInsbaAkBqLp7JMWI0gmCgnTdHRPSmJXM/l0BX0zFAGQbWGC7XBYc8M +cBpjiVMJXyDqYFm9QEBLW9zShB3Pb8y0lEiAPmsCfsnwiOIAFJw7eBtimdYo/e9O +5VAxFFImZ5Yk14nvyUdL80e4RX7O+lZ9JJq0wIz98fmR1aaPcKTQirTuJRLft43g +nFdxeH43REzkqyj+9PB99ewjF16+0RGNWm+vpk5TyM80UGj7Ok/pzkxr82qzQwJi +XDl5XmvgTAuagVeglKqh4onQHtvXTh9sVKg4zJqm/+eesjh0YrNn5qWOWOjtyfCX +3/WlcKBbvZ1X7S0l4mkG7iKAfOB+sgs66Nq2a+sf1EUou4iz40wLfxpz1fB3SLgN +oQQxkB4k7PDntjM6y8FiXRUvELKF46QJ8OIbEjsdDOpY8fA2M1Mwd8WgpcJpFxDj +DYUPW8e6m1KvIwwpkcpYSSVna7KzBGtTCy+3+R/RB6c7MpJgl+sSIt3yL+S22M36 +LSW5Yh+gtm7BZS22bEB2NL0kQEDY1S+j4y6qDQmTxR/X904ofsQLj9gJ0gxsQ3w4 +cXwFJWEnG2vmZYkCHwQwAQgACQUCWJCxHgIdAAAKCRDnO8ZBzBH0yCq/EADbu9TZ +i8AlVAgk9D1uxMuLGYrSheOlX/NJKVQmyMBLzp4oLNiSSmScUlzXQjRxHOf12pF4 +GLrvQZo2VxxoGt+WQlL64n/IT+imVM8qesHuKODtPlHRiltFtK8J+w/WnMXyAq6Y +4WyOYly4ilTPAtkKPW4x12fItB2xB/JEKRW8oeWFe4KXJaq1hImOuSSAObfkkC9+ +9wdF39Lu6U8KECOEvCfgaQ2yxCvT6b1tDQjUP8/O3CCFz0/66QJFSNq+/Gmzvkpx +cxpHflqS7vVZuR4lLAhlg9pSH2QEganBDcg4Pm5cZhJiOcAYfjxDtZrXmAYfbF5B +oZZICVmv2K7eXzVdvTv7mkTjynaUehv0W7OTWWsdUHI1qiAtbK/IXfzd6fcNqtyA +CtWIxtWocHrdkZdMS+9Hd/0FGV3aPn3ApyYDsdOmhFgSUF/bmpY0jcW88b0QJtz2 +CXl5IIrmqTfmgWWA7NmLj/F0zw3TU5M/NKBtL/wDVHEzfiFEj2uNXFrI5waxbtjk +iwvGLsAb3TIDVBdBhKQWPflHy/kvxaRrQX5Z5HhNJKtFFbk9CfP7p/dFB0VN7FDH +1ANbfLUOhdA5zgI2+zoLcIf54Yx5MD9NlSXMruo4x7+GkqdeDV4JxjeCpeCbjXGE +ZJxwzBcMjR+Q9nJtwlU/FAKyDWgm8b6z5pB8G4kCIgQTAQoADAUCV9/YSAWDB4Yf +gAAKCRCBhnRIn7wSfqyDD/48iOpq+Rm1+oHRdmz0iYdVsyt8E435PtlkW7l6NE0k +1BgGnubLkNbDgbJBbdr3AgTAzotBqAQmAnRLdirlWeCYaTIM0Ng2lYRfWmlmHkcb +1P/f4aBzVjsCz68IzYIrRlsSxg2Imm0klSNN8IGL9Xl7unBS8Gk+1o1/d8HY8y6x +eWkpqcLJ4wVCwuCBbRlxOmp0n0Wk2cPi9KWzKWonb+KwYrfDLKzoxvlcs6B3PPSs +FDyIIdLfwFAHlbJBACWVZHKCNZXG6GsqT/pW+xdcXAhG8a/Is1GCGHBURxtZeLbi +qrcsrtIx0fEQjINKA0v00vPU7OoJF8BGrKntVqHzP6BHaqo4nZzgyOZqIBwH/YIU +X3RJOQNAMKqK10ywYauL6YnOL1rr8DrYrXBHCCmBl6QsQPlmAhHgdPl9ZKiYDpLh +VPSDW+4eXYm4i+IEUJ/GuNZhxjI1V7gjJ/bsKD64qAiGYjPBxfnqM5xNF0p7JiU7 +/D4FXUOllNFM8yx5vRzBwo7Q1l5yVlZ80fpcKk99QUrHBuBZ6Hd6tlNRCYiyARwe +Ezzw0tybVpYDQ0Hhp47Mp1tMyuSo4eJwQDExDz9lFlO2uBnmC2OnUrRnpe2D2ZM7 +FJUFq+xFIVnPpDC186gDSN3w4h5+pAzokfy1xtGDFm7EUbwLlNwphNG/GE+AJw+R +dIkCMQQTAQoAGwUCVpWOlAIbAwMLCQcDFQoIAh4BAheAAxYCAQAKCRDnO8ZBzBH0 +yHnBEACIuAutkvqNa3eWm3WjH50Mkxgvcp1ox9UT6YoUctnBvR7lbZJQIsrtBbV+ +DMwN/Z76surTP10Tj6QKDfVz4nL2zka+tlatWDDUujWuC/wSjqSJ4DZnAA9l6m+x +8v3/s/HFB9f+iDRBGjOWXMfcdoePdyVFW0ZbPMceernITA9g5trNfeaXUI1YPVPE ++e7LDawNjB2OEUccOyUVeT3rbZoNJOk4mmlaPgYwG3u65HvlnRyTXn7bQrCBvD+P +61/K4ZxViWVqQYwYFRXi9okhocckGynHxoa4bFnook4P8L8N3qYh/3B0s/XvHF8A +gbTimbo7+kk655eYtG7kxziks+YGQKe0AlBqF0ztaLVjMswQXkYgy9yh5ot5sxmS +Rle1ZJk/A+0vJghVeaE/o+886BzT4YogfYWvZX1vq90vDMqX6RhZzb459jt2L158 +APQVbnWk0pNzUAMUudj4zWBGs7LzXjo07nsicKARDO/ratkwV58u9gfYf20ZevCh +pFbrh4WuMCh0zGtFa4Wiwksxauk05iZgYOdwWoIlyjkR4oU1fPOuulKI9qBCMwzd +S+wvcIzdhvoEQoxck6W+DezYEfxWUG4SRcd9a49hgJixb/bZL/DsOwTFGq2arwG/ +FCRIvpcBDlazeJUbxQ61WTxGP4btqla5IClHHer9oF+XEkNWv7QlTXlsZXMgQm9y +aW5zIDxteWxlcy5ib3JpbnNAZ21haWwuY29tPokBHAQQAQIABgUCVu4HOwAKCRDC +c3kvfYNUXeyIB/0b87yed4qZ+YYYBGvrm68OP6zanl1XlNfJS9sUMZLlFzvP6RX7 +3LzvZTRqMsXCjiimbgU2E069xiSfpozFb/fQl5l4V2981D+rI5MGkxMK9UV8nPTK +wXd6S12CY5Pr+k4452vHEt2lcoEBGlTxEzuvN2OKSKbgThDBVKXH4IXdWa1Bh8I4 +U5JwfQykdLeiCXUwURdfyE7Ky+4/aBPvTTIv8nbdOuj+ivrBN2V1+CBKMx4UC71x +RyyiUUnZSOsVnrzgKYZ2ukmljJ/tbknYepZd2CY0pX3f8b1bVUXj6vOjnetPj2fH +6ITbOwEwneHKDA0P7/+gB0Cunbet1xa2d/4FiQIcBBABAgAGBQJYvuq/AAoJEJVR +oLGm4pfOs0MP/3IZxRCUfuwRHrO0tViAz3OH4G0BNOU3qdzKZ2/sDEaZKUbMRgyO +XF+GhHkhAJdB+JrepdlugTKdvgZ8iGwse3ojmxgAGXPtKbi6nP1DrZ6p5vBluCdc +z/MC+LFA2iQUKMbLcj9NUwQW+9/Hw6D/WHs2JALIi6B76sGOtQHrYCpwCtNzCoGE +UsNd/K20FIRkmt2zEOnuDrF59U1Y6439nv+WCtYVg8T41hyKs0H4aNZOGC9CaAbN +mxeNLbTGthsnXsNKVyw3Hvm0wIOOIo5qG7W434a2bULuZVQEHW/LRV4kXuWbg1SL +n2gt+QZrI/eJ+qHnWMzxBFuwqYCGus0zciOmDbKnCwsZxq2kPXFyXz4rZzZoOcpN +jFZ07hpooGzulL6oVz+1QDc1fnatbgeKMQEoRw+4Va1aiYbGQDTsww4knpejEJyS +MlbIy71R5ZOtRKEfu01BIn0MiX+RDQTpV4oY013lkVSHYe+4JcEM4yZy++lVLfea +rRkQi2mdT6aSeIWeb822ptt2REt5QS7MFresD30JLQRAuaJVlQ3NEWntQq+LAwcc +uvubDGwqVLAMK6tmQ43bLEwasZ+AYawc8Q/5SjTylASdyxSJUUK63JyCYfnqdw9s +uCLcSVS4by0NUqS8Gr3++GLlyfZ5Wt5JdjsQfbcTHLdnYJ85g/r6371/iQIcBBAB +CAAGBQJX5F4pAAoJEBRdTg15cHmaWzQP/3TDwyDrjOaXZZrp16rvBcRoXgBmE2l1 +idK77k7dyrZ0IdzCdmAeALC0S7b5hnOJCyHj9Si7/qPwBOIdlT2E8+0WkUktsFtr +ZqVgQFYvAWdyxiYMh6s1jvmbPQvq/u1BxZlwlLiPUo+V3NKz+hl890hc3duhIzmJ +7X3SkW4pMFMLI/9H5ulqvvQyAbhXlQ5j50RcgGVpduAJGy37Cc6QxdxUkGXF6FPx +Ne7lhVGmDn6cU8jpZZ05p79cDh3Qh4HsR7SHC2YzxKLIwsdgn41bGbqQOuh/ZXfz +aGC6EsxZWo2QMkeCz9ayNNz3E2QxH7o5TajFCFAwb5HW+ufxGd3O6IY79r1R667g +sTF+W1yo6vMMFpoP/MDEvf2cOzaiJ1JiQ7iq+XkPVDGw72+FzsyzQ+m0ajb31fIQ +zSiW7BdnMjn7IvHOO/2/KvKCLRZMK1H4sUUsERnPOAT6gkL+WIvAboLb6sx/l35S +aHHKIyNSjc8jTR9FxtmTZATjcz6Wj3+MR/4VRr/LZpCc4TG585emJnjoTp5JmQz4 +mnU+M1urKh8lNcoJV6oKAEJZmejWs6C1s/UF+7MqfUXh925FE3HDkLfm6R7CWUHc +XrB9FGRwRd1kK2+f9TtQlQOC0tJH9ntufPFkfDpV/oMD5x6UIW9qEWIUlFbPYtMa +DwNrvtY5gwg5iQIcBBABCAAGBQJX5WjFAAoJENQvUDCHcCYnJYIQALbnxsnzyh8L +MXRH0LSM7xuCh1U+xKupAKMC19Yy9sc0HRzYwjdcqY3QbaaxOjexHRHii6hXCUjs +woefVtg6/Xw+NiGaK3VEwK7VGMq4ZBObSJHGmZOzv/NOTOtW07xtsJ5Cta1njbHq +znsklgFW5u/PJ1Id9EsROzm80CDK9ZAhqhT5s7bzBPV4ThDxGyaiDIVXX7TxGkp8 ++BQfAzvj6QZgwXfl8pr6ReES/4qL+SyFrQkmz7ZEirhWFnN6dEa4WjHkH0NMasgM +bB5uRuOP5BP2DKYSUpx4J3LHHW0kqhwoJ7y/k2agcMtu2VvorehsmTJYCJroCg/5 +drtyHKVu6NCDAir58c5ZLpgSyKCAa/xTUtd7+Yce0HHixwt1LW23iqC3BSKMT9OZ +ZGTDv+khWzM0vTuIobm+KmuCJq3MOXk0OTYkRV4O1JsytQRWhw8w0zw3Ziq0eepw +h+emUey/ammePNuaHBx0MTnV0rgnlqRgTIFK3fC1YJQQ4vi0OqiSDMnCfAO1u6ht +GS6TDULOb3grSQnZBl1IFB1594VsZ6KaMxpA4Ko7Vc1ZlPsvfJdonDEhjZFNa3Ue +z19ZPIKhj8vuxWFwakUVM4g3724F3bjI8H+cbF851n92LM591nR5uYddr/DVK8d6 +yW5qYmpUBsLw7CRLTQjNzI0o0iZn6dIKiQIcBBABCAAGBQJX86T5AAoJEJhkLIYg +r0fW1fgQALygE1VC6TN3afQ+UkALedXqZ07b2ypYeL6wE5aSFI3qhTOwcrRFkwll +iZ0Ou0xhKOUkvfMoCfujrpK1VNQQ5LK4OYu64ga5K8WU4AzePgYzPY7Nn5LoSWl7 +tXSoxFMuk8AWpIt7XJ9hQqa9PsbDLwvKgQ0ZPkp26dSzx0Epic5lqzy9/u13H6IE +hQDhdHbQlPNSr/JxivIzhvg93k+zFbmreryVp8VN33rWnPdkv7NJs868hNztaBIa +Wm4ZtIoQBEtSsVTJ8llSLJEfwMN0fRNM76skmK1jzmtrnngsHvvZIdU6HwAwisg4 +ZLcpsrv0M/MLXH/tjHfdMudnj6HZenkDG07mRvRuNKxFBgoPC5KWrJ63+JqhR35S +D5HfVhl7WWeDS/bsQEWK+hu82Jl0W5uoG7TgIO1S8viKN7Zdcv8NhDjSV9VRaGgC +Nt4KS1lhWIRQZo7hww4Ex/dh0QVbHthnvcwEdn3DbJ7NdjR3hu9howgXzhEZfTgf +c4PyN7h9jgdtbcaL+dQzA1lkSxe0DtVNLurOlTJnUBVHOb0evz9QcqkT0abh3Itr +vpcz8aOoI2r1Jjgtm6toDpELa/9WTHiECW3oxAUrZFrzYigVShWym1FGrz8lk3w2 +sDO+A6YqGgN7ar0PdmeaRFUYwNzQmhrKfW4a82gd70s2BEdFAR8CiQIiBBMBCgAM +BQJX39hIBYMHhh+AAAoJEIGGdEifvBJ+SBsQAKgXFN+vYHwj+tRSLYOLU9mzM5Jl +JUeCV1RVxb/hbTh4RdcRJ3Do7WmXt0qTQ+1yMgfvTad84y9w7QA7xI64s3uv3kD4 +vWBgw1pLqxix+FIXZTIHNe3OaNkEfcTdMoJyvuWVpOXUz8xbWFZIJke41aA3QJXK +KLy132/NGiieKoYlGgJ4kaXzM4/17qfS1gnfiOw/sAMKna6FlV9qZwxtS3PqeYbV +iZZ5yPIuXb2CD+nG8Fnj98KrZWOI4/YAZiIe16ccCNxcdXjROXHzBdOY1OG/6Np5 +c+BtCaG0D+Oa7U5K6ZHfu6TTCo7c+L25ekZp8YGn5Whb2HNzfRjn1NkKmDKxa5ar +hTIHGgB3Zizcf22PwNnrUx3godC20ELTWA4MV/JB596MKp+p6j5hxhoJrZnJl33Y +P1jALLSmO3CukOmRUgw5MPSgaloInO4yyJgL9vmZ71ikPJ4D1sEFeKAia/hvTU+Y +dOb8jg7wtuBrwF+2vgbjbfCzIMvi/7hLJjmDF6qVs6hRjCSQVPPsBXaM4gtrhNOh +ZwNPL70bkg0icsal1Hdua2MXoPmY3eX9g4CatuWcnVu9oL0mtAmAzP1I/gP8OPYd +R5YA7mXSdCp2smutC1hvW/kWyv9SrU7oIu0/e1nkx4O3Xv5LbK1TRXMk4YDrVLrg +nIuFf+gUxkeck51AiQI0BBMBCgAeBQJWlY6UAhsDAwsJBwMVCggCHgECF4ADFgIB +AhkBAAoJEOc7xkHMEfTIB1IP/jd39peJKGZkKeK7X4fUB6CmnxWAWX7aTe4cZA9/ +Rpbts7O6LRYaErlabEqYW3RUXIiuqr34Z/2sw9JGaPCmXWBP2d6mwSaCyJW4d8+m +rv+BzAcoWjdf6XdohLCNp/9XwAsE9Pe/i4I1oxLWYRsnlJBEK8ANpseDImiwR4D5 +HLnelCEt73Jhl0stDtlALz+4Ex5nq0PL+QYDKE6Ol6Blut3Zr0InL77PLBHcfl6C +TKPs3jbHZVS2zve8Zz2iI73mpqzSkSqB5ZZmdPCof5a1d5Tm+hcfu9VG4xPASuAI +GuB/wLQX9BK7t18LFH7oPej6pn97WmkchnO+SQzhVxG1OKdNNCA8/qikUAxHi+TN +z990hQU8AaUR0LPcmoreY+QZX7EJjn1rpa4KKmxigNGFwiTLqScBekwpIv9VDOoV +EnPJ2MjFfHTXpFED2btey4bKWneisqAgiUxLcBv8h7ibBG/TdgBxmKzofeuDSLRZ +H206wfMhff+YAqADF/Rg8CafZBMErNM1BUNg3IBgwH/GKqsX5Qt2IyVQf3NYAkRX +ZUHWMqB+/TEON3gAkd7ZvYDP1KEINUnVA3xDwztA+bP2tlBnJdLkBis/nOYFZtsi +8AkityhOzVC+7dnKw1QoqwuGBxwJgX9hmqgtETJw0HabXEPosyAngh57iDVFPSaK +4+sntCVNeWxlcyBCb3JpbnMgPG15bGVzYm9yaW5zQGdvb2dsZS5jb20+iQIcBBAB +AgAGBQJYvuq/AAoJEJVRoLGm4pfO3mIQAIIR/5JwKuwuu1H4NYG58A3TXB8Izy2Y +GGrwmF0YfrwLDvHsXMeMkl46PmSWz6qJcs1fnyNwTurP/3qknPEH5spdjyLECXdG +ps1MyeYyEjVFu7cxA5qpvil+TU7tn89mwf4CaHDKi5Li/RsgQT0kcSAX0EQ690rO +m1xOkWjpDas5tfJPXX35e6lPvlzhlRDzVuxRgRzi6CDhMy+KtYyzABpG0xt+ak++ +aonL7yWiHoKZGNUmstGR3ZfcvgYa7A/jA3/EPKxovqj5k7KzC0MkUU2OyrhmUK3m +HnY7/hqtc7LLE2HfmBctprZ06fGkgmY+tn8E3sRCT/nncGn4Ur2ovdNtFcwSWvfK +9uGR3N6Sa5OFCVt6Uxgt7yL3PEryDsq7x+ycbtUYr1n0GxMxPQYee0kah1RHqIKk +JaNJuUL4pkgzAEXHZUXoEE09UjoJQRPcebFV42ssONz3ENLFMKUEd6xbzkVWa9RV +h+CPTRLagYkfnpvJd4qSbqeo9bjtFQyqhhfeBekVxzj1bixG6tKQ/mMpqSkLHXFU +WzbNJWBx0yG1LvW/0IfjpkNoTETGii+JeVUD4Z3N0tCXR8tgyatiptZGjp87jfxD +KTF5A5aIZPMQzlNqZdJ6y2MAFvNLtBwqi2Rn1HFP3p5vaEe4XyuVI2QiaR4jFhnD +lYnp2NFwjxz6iQI3BBMBCgAhBQJYkWsOAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4B +AheAAAoJEOc7xkHMEfTI8s8QAK1qXN5jxhzPYDLiz4NvjchC5wTNZYD+g74bxyYg +jJOA7u6HIBLwCs3xaptzlYseci9nDsPVZ1fzCDHQemjWHMlFfVeZlK9nc3qyj9BY +woUI1eQgZMGOFYf56gnbDSHOHPzSmQfw1CzDmXHdv4h/5HMT00Q/wJXjN/F1MpjR +fm4vIigHRcZ8cJCHjJOtr9qppRdMQqxYg2KLA/Ly6UO04chkqj643Zmv0UGwlCzA +/yfrZd9LeKDw7WXt2S2M0AslB8J6I8LYXDx4n3ri32G3bQ/ifCIvsTuTsHpqIdAU +CiqQErMSuw5kFQley3YkJEYDuFsNfFrizCq+1JyNlUARGKANUbjLiLgb3pDe1LCk +dCxQTlHhLpd5H2xy6/0SVy9XYzYHR3gRVX0TId14MRspgC/TKE6GvOcu4lP0qd0x +WxbIdO0YW3qjmkCoyAGN0S/842x1RyEbzlSguBIetGh0dpoVc9teSOaotoRO9hv1 +LkY1bUroaJLIcJE5M9eihvZIVfzCW5rMAmJ5hT+i83x+3IforsdbCRKatd/T//uQ +8QXv4/Qu9JfhGL9fbN9r4aCR+YgrrqfxWX/5hdJnGvzdh/TqTXo2XSWhhmphiSFC +93EojKtcrHjMuIhTdA4pYVTLkS8AXCD76Lmzxi9K/Fvvanm2WFnsLYjn/PNkbr5U +8URriQI5BBMBCAAjBQJYngOvAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AA +CgkQ5zvGQcwR9MjdFRAApqCfPXRkjRZRdhtCVnT15QbMPPEDyCmwwCgRvfX6+jdv +AUnyGUStKRZ79awehoXvLQGKpaVRiJt2kqt2Y2eK9uyPlNNvkwSd0/+Qpix8pBm1 +s1nA/khNTeUpUQ8cIFlsNhBYo91AFKr/qq9DUPX+VKvpUSEwvSn9dsXL2y3baMyp +NaJIS7rEfI5/u3r6eItwu4Gj951H/6M4QXyqLMZhlpRHt4W1GRYPkjzLyw9a2OOJ +GZudX/Vhwk19koM27hF5XNeH2IkG3eILwdjWdQWjaJzZtnfWh3CkYut95se0vreP +K7sFbUauVArs3CtBuAWDZ4+k0K/rY/PP4tSReXhQfZAoVEGEn4wyar1PHgggBStw +7H/Bzb3ZLz5U6gfjThJynzLXd2xbi/Via9s7vOhuiYV5MDVNnfvWrs6q6bG0KXYH +yCcAXHME8ftbo7dgdKzbMSnC13evbRVL9ZnajCXz4cvWEaDUBj4sJUGxfgGIEX/h +7iqv/oGCG9JzGKYtshOFL2MskImzSOmGE8q51Lt0wBC94ZKVYlQnWy0uqhaSZC6j +Sd0Csu2cdAX6kVG01xoiqafZk5Az4YP3U/EiUyZH+HB0rNV/pvmdzC99LZ2LTJKX +y/nRKAG9lNsub8LZCHlVwH02iXNUeogK2hU798Pgjc+BLnYCx3HoN56rXzzKhdS0 +P015bGVzIEJvcmlucyAoTm90IHVzZWQgYWZ0ZXIgSmFudWFyeSAyMDE3KSA8bWJv +cmluc0B1cy5pYm0uY29tPokCHAQQAQIABgUCWL7qvwAKCRCVUaCxpuKXziHaEACN +U6bIrEP229xDXRmhcx0xQ6nJ30wBbX0uNS7WJXxmyo2AuSfxx2dIjrF3O9UDDHpl +u3hsL6rdaIzYO0tg/Vgy1KJVYhbwpFuOWz/NRW24KbY7mnyq7rx31jmTPCMptM4P +yYv6mC/9j0ZOH+xzOjzmXuE6fuZIB4GCqqlWPBzJiqxh++sRxMejYGe5HVfe0t17 +TJNTHk0RKViM8c3bBnQi6RLASUn9wGFI/yPbEE7R0+dPgqLe/10Hrc74vv5RDJhL +UimiyL4hTodhsV9bcaOBio9DiB8gAC9hfYBNw4ps7HaVBnqrJNSPuIMk6boXjtTz +XENBU15BWsyKMUQ2gpBqDcspnHZqRTzNDjplMB6d6pMoKZpLljnflBu+F/kq3TSE +u9JthqxeevAGa+IS8ZGJ/P7HO3b5SDyh/wdIMstTgGrfB3fA0fGfGUUQIqLOZWqW +S+Ud7k4XdydaUeGlfK+1x7/41WYDULad0UlIM/G1Z7FaEJAouBfGM0TAkQnGsA1+ +QhUOaIJqUjP2szzfzn/gswr6eYBGwvojVVClbPCvBn3RUB+Y+NgOMKhF/xJiYA38 +nYv27TW8MQASoh1prLQsci9gtwoR+MUlA8eCKcf+TyOgVz/f/N271vWSEWesqLj3 +wtx37edD10AWgzTFMsNSJMtbBpy1csDgWT7aNwclzIkCOQQTAQgAIwUCWKFlowIb +AwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOc7xkHMEfTIvsIQANvVntac +LCksR8dYkAV9syIn8uHzbVTYJPPZ4kq6UW6nR3k+9dbGRL6kBk/YOn0/ib3mVz/q +MPZLFqmoWTkRh3qCGeBLfZtOd4HjLQ5vvpFsnkWmN4BW3Ji/lSeYHyXU5Zv9Z9YO +xbo1y9tOHvhrsre3kh31E9AN5rb9x2KVS3dwfmN4PIx+m0aC6JqfNlf78hDUbGdu +Pm6TkHcmEVfbJT/XqqzUTcJsNVk7047rGxZGo+TxbW8Ri3CPoe7QR/LhQ/IxIPp1 +eNu6oMWycY6m7EYhNiagf76j/Jv9T7R5XmRtxZq21z4985cRNC5auooD+apdOiVj +ft3gAbey/DZPhpY6P2Dtzq1MFXdHRfoW5an40Bg5IgnbRhqcg9EY1+182WNB2iaz +ntR43IeNNZXXlkLIVxW4oAG3vq6DV37lwNuOYLTsdGUvbkMd/u1zmecfX9C8wU4/ +Exefk676SE1v5shA54UDUvUhaGnDbLZZ66MfiXfitE/RuG3/uFfkxeKc3/CsUKk3 +RYbtKA3Ou/0O9C6pKIVCiQhUe/HVSidkk0GAZ3Fq64Cqajd2Byz0QFDHwKv16BSY ++E4mmAWXYw2aV7pO+tivib6XXbLHU/WgJ1qbm/Qr3uo+ZYv4k7f4IwYi0kbSb9nx +tbft90fuq3xmJk/BzY6NZ2f6FIO8aaJzTIGbuQENBFaVjpQBCAC3wjTlC5/jdi2j +nIophctvA8XaqmrQeD6GaLugfCfy1zzU/7LbzGbb0mzPdnF1OT8htQFu+CWNrInU +DqM2sHE0tqx2EQ82KoK9uQduFjyX33GK0FFkQh+cDHkTDSIQkoqx67FHP+jgehv8 +rAzpwc/G4QgoWppj+q1GwcPe34WMCazsfUMYyr/+iyw6PY0WZyQNMUgOItwGlvq7 +QsYqW2rF8bl6qO8KPlXxXK7f7ERm1ScLvec6W7DbaQcO3KlK+tUgsFVAkHEYwz7M +Gy2ybNN/fHTjS0uB9ODkyRFFGsEXcg1BhJsgHNy+mWTs6dOmtKEZW41BeXL6pgpp ++xQcCfCVABEBAAGJA0QEGAEKAA8FAlaVjpQFCQ8JnAACGwwBKQkQ5zvGQcwR9MjA +XSAEGQEKAAYFAlaVjpQACgkQ3qFjcZdAMaXgNAgAkmmQPq02lPA7cjdkWtbYF0tx +YnnjPcIhj8metii3YseDkfJcsVc5IVDMqg3Ns6W2cudSR9cgfw+Jc5MeVtEgBerR +w6UXAfvGK7khVXe9TFe46Fx1TEJ1rW/hc0lNKNNcJfQhYPIlsjFRiYQEvOi7A9VK +cpatFXqHDRGSvjWnZfavJEpQL7f5eFd/GXzFTNOzKYwTRqOn3ESQEzY65lbORQwb +wTT4V704i6x3aBhwjmqnOMFaPlU69QQgrmPZkaSk+R7NkUS/AcpDFJ5t1L/z2HiK +F/XeG5U6lmDy/Pna0et6jnTFEkDOkMPQSpuV5kVrmYychbWiSbX2xLSnHOWh3un+ +D/9zafSr+LbYbKsp8lmSrcucZZeuD7OLJCk5MnGboNzdGuwMmxKmtRSuL+lk9L/k +gNLRIvy4XlgnVycVUDFoKcUCNxgIwN/P7vkEbvfdYVeqcS4QWGyPYh0XdBvDWl3E +Wt5iCyHItkRu4gYwphMuqH0HT1ukilwxwyVi7grJr+b6BAWmfLyWEuN1ewaxNoII +q302TraoPGlbrQb3klqtkiL1i1y6zIbkwsycxkSZ6TX02hKLBB0bvAPBA6wJpL6y +mUrKAJSynTvg0YFmT1A8qdKvpGaIjNx23d8Ak/wxOW0aBjsOXowJbWxAzsjzYWgz +UjHxqjlu5M0L1eAgAjB7uHWM/CQvUKevn3NB/QvvSTxBKF3idebMrGBjeIIbpefM +v4q84+6msPeNpZOAjL86uHi6+Afd/R/eZU36mAuLepEO27M+5Y1dZbtbSsSy85Xb +DPJwdnPnZm9iASoxLdUqKYPTn3P6grmlFR6PaxSlvH4VOwOJZ/00ZocUkwev8xQF +babOCpb8+LhtqHx+4fU36HzPl/DnFclgXwld4yxw8ui7HQahjfvkIM+wdpp/G+2+ +iGggWWZZ3aJ8AGx9NgbZg6Tt5VvS8o/B1BQR4li0Lq3qyzINz5tCrlaUXFpAJB/j +l3Gu785wMDCEQb/ea29LIKzfYiqK6KOG9K+VaYi6STifNbkBDQRWlY6UAQgAveYL +9Vh+G8jdNcPxr7oneutYclTxbLDAXcF1cPygn4h71dGrE3tNpbsLxG8K3C8nxQdc +L0NwBnRp5LAF/QNLhxWLbFRnxXlULU9McWc9oUC6VFKSBGOmtdbuyzKneBIri0BT +Xqrjmc4lI3dwvHxRRX1Bf4krbk8UTeM2P5tt6NciJ1yQliXvPk6iHVeP+LWv+k6A +kG6KLn5TVwZjHbEflGcPrwX/1vWQPySp/36kx91t9+xbw/LW+Sa8bxyNvovH8oXQ +aEFmHlk0BhgN1nyftutFpT7FcJfglf6ljXPx5WJynib1baAnu70VsPsL6SVlXxQn +mfNyeS+ts2y7hqJdQwARAQABiQNEBBgBCgAPBQJWlY6UBQkPCZwAAhsiASkJEOc7 +xkHMEfTIwF0gBBkBCgAGBQJWlY6UAAoJEJM7AfQLXKlG4xgH/2rkUtqEPcpZHPHT +6Yd6qvyQVLA4YDad7VwIHHI+XtOReq6GbEOlHUJaaQthwobO9HfZ07winb9DeMnM +mx+QY3yrdMidS57vSp0Z1sJsA69UaOCcMO4HEZEoMC4W45YRZhMHJ5V/uL47uCHj +be+Ss7RwGn9+1DrmFApNPQqJ/KYZC4uXJxbS8qStZtcjbEdcKYsoegAdtzXOMaI1 +G1YACZgzrPmATp5jQ7xpo4l5YCyCbqH4dDMnUiXDjl4Av2dczX0Jbd9DKpw2U9rL +AsGTbRtEv36hWKDPW9Cb0FcqO9e8w4Mxv6teOip4+WQMgITkoVZ3BOaLi3BYi1NJ +RajTpN60AQ/+O0ElgIoCFsHcVYI4NSWDzmmFXqeE1jllVw2wnA2rO8gp3q0fcjEd +57LjowC3GVFBZfrwKX94G0Jtl4WHtzNUymUxnuz6z35jT6C5ijNNDgd/+uAszaGg +Shp61pl0hFTibIx4rUT4fXYuQhwu+JsYgiE7kLjGG4wNaOP1EqtoBrhR+vud+Obi +2K/iz2wlfbhF45Lrh/om8B795uA2kn42X+FhgYwrf2x++2jkO2McJ3VvZdv5AoVx +zQYkkUb3pJrCPhK/l7Awgf7qpRvrrQcOX+tpnlhJ2keWUSjd1Kk1QcbFPKWQG4kU +nMUcMWp8VG+WCLBu1MleYF5DFAwkGrGQV6pQNdMOs14Qy5xZJoVYrNuL349BYeKr +AxPbkNhNPYxXhdNi35jmXvXIExnoe0scJgcjhcHC9rgX3NOVmD9HEY4MzAZnNLzi +5EUsbtWV1/Sui/tjnojbnCxq7uncPvBZNiMS8voKsFIXXjewhctO+VNLRBbvM18M +JOaK/QJVeR8lwvvsDzly9QcvA8YPpyOZVr83MXl3nk0fkGT0rjZzHzvNhvL0zWSo +LbGK3K95XCBzNHuOUqJCMlRDcdgW43WYMzzpLvMOGSxlm36n4EyncCo4bDMl9OMP +mp78cAZSaannJqbKrGZp4bNzIgnoupPeo3DurGIiTvr0weuQZHymNlqZAg0EV/eG +ZgEQALphDJCKCF/WZ5TWAbw7KOV9GnsowkkebG0GO0fl9a0zwhYJ2ZmcKhSA1skc +hgPYWfeH+KNfj9L/j3aZvKZp2ZbbgPuZh1784G4BAKZ9+PKkEJRLkaFmZkXS270O +DhyflnH6ZyGe3ffSbtPpxSt5ZHX8KIFcg0lZDohK7A7wwNb85Iok3KtF2t/gervc +8MGRKQcrdrBdUfId/Kl4k/jh+oFZsb6PjfvFYkUSqdVIiEyWTnL6pLtOhlOaPJur +QDzy18xnO1K5S/oICkZVtL/PFKnJisVtJbW9kr2CWtnaomxZlgIGW3rXtbU/mdZg +ik/pPY0s6bHoeT2iRAv5NWt84awGR0wEj8oGVX1KXFAWXAg9KPbhrt9SOmM/zYHH +yx0StQz8NESevt6ktTzyN0vFrNbLAj7KH6sR8TgD72jGlybHAm2nM/vaxWWhaFpU +uNYNtpIn4Au+QWv0+Y5rbufGdFi3vsPkAxa22ePKha9Lx8nkFyb43u1utUE5GqTr +VYIkOa4r2CEKBD9icLV7s8YSHFRVh8kRT6b40gA9w4TSW/ecdJMC6d+kjMfAj1NO +R30qPisfPG1Bb62ZOh4Y7SCGcGPqnvjWvMxh1UcRHmKy8PfpWKPdtbR/6oki0htw +OnCI8wFQ4g8HmxpnOfu2hc0yj5+ZgA3jileTfwiadkzkXSWNABEBAAG0JUdpYnNv +biBGYWhuZXN0b2NrIDxnaWJmYWhuQGdtYWlsLmNvbT6JAjkEEwEIACMFAlf3hmYC +GwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRCwH7uSghxYerFZD/4yuqSl +Hdrm+1PPnen6mBT/VcBGvz88hJMgsD3r0Vlnidpc/JSlggJWdUyCziwW7tfwPkjS +1JSZUMPXNAffn53xKDF3nYCCseDWBdrwPJzc09qYbXIPmtUH/5B2ETzfiSW+z+Ub +9hmsBJDVWtEfrFWZ0ECcYQ/X2MnbFJAYqJ3OzejRKPc5nyAyVZFgnGbL6eeG64oZ +lZvpT5xBc/xsxPN/hHGGCaLrqyeYvd9999rxgaD+EyJbabRtfL3+f2MBleOKHMYO +KeA9i/pWHas7yU9b7ChVZf9L/n2ejVDuYJbskQzH68PyS55P85i+EOBcLKWpKSIP +ORpNDO70dFMi3Q4NIhzSBXWvqsWkqgGW6gkXg9Fdu3BiIz72EdP+UWaHhFesvgq9 +u3WQ7BOEJZASJHagN3w7e/hGD+Y10eNdpJSceZMNqBkTDtAu4gCVAIBAr88g3urQ +JWnNr8DfmuVZy6T3lHHlNhy09+BPdXMNe2rCy23HNKx54M3FJRfrNHYyoAyDw8tI +g3izFJDkPAOgWMZ7MO3RIXP5/Wxks5fVlDq+pJ4YrhLczS2bzoxo0PcXwh7WjWD9 +PGtkdVpJh0teGmQTE4TRNbam97QSEEMuMNzqe0T+S9Kcymii7rEYDVCn8Gu2og0E +6rXrq5muYKO67P6e6WSiv9PdFvN2TFMNluxwUrkCDQRX94ZmARAAp8o5b/A2nI5E +BaXq1fGWWEUV8IQdlDLwZnmWCj56Bocs1c2swcsbmw4HlHDRMhIS3tHFYnpvXMwk +hvZbKG8bkCpADRnwT6gvqmwoSiCQRaSuHrs2PbcGeYNCVjmuPMvH8yP2VWJaGxye +rtEkNRcrradu0OdkYhtay2ppZ1EUDGG/ensm8MCuNMR01Btk/DJOpyamJTsGdfFs +DG0mNTfYOD1EVZ2YrjO5GohWIBOy08XwxYPwPP/EF02jSgBbJ3hXA2wsc2OozLz/ +iPZA1Ok0PKpwGvfZoJq9TckzGUGHVuEBjqMoQm7MMVYC0vo1X26He8RsqU1Jby/X +OBJS0LLmYP7+RTpEBhJcicUNrl/1Np/8NVR8U0A4LwHCDT/yctSMMZm+zQ+T6T1x +pXtyQx/oNNGScc5rX48766q/6LNYfXTktSVEr1kPpuA8brHenT0zX1C5nTn9DTx/ +XWVvn0jVAnriR07PVLjlW2UR8L7puwKsQJZ/oWTpy8gVvfnMRuUDLdmxktIyT8yR +ltGUAWHrkA+b7Phj3RGP5mWq0FgadOBaHsE+lyhZ8sdx4cdFXja9tDeVg3NQ9iCi +kq0DcA3WQRyT8Y48Wpc4eF4MKiROnEudIKNotwdQS9yQwyILgGMLsoyf1ZCCercW +OWM0pGV3xWGRcu8If3DFmPEL+e1FQl8AEQEAAYkCHwQYAQgACQUCV/eGZgIbDAAK +CRCwH7uSghxYerY9EACRtMAzk3Ax3oFTvZi6HLemr6/ptsgppqq9XcsN9F0AEDrs +BaYQK7kHMteX4V4oIQOxrQnZZf1/p+14CFrvhzYq35QxfoaMdV4wX1yG+wF/uhtu +mCBHABhMMnWAZmfT6SbiAxny8FcmgW3Sf+OQeKLcTAP59tEOiUFTE39OYSPnVDxR +dWQHAMJupxrtsdrzho5hZjlLN+asj3YU5twztHr7pk2iZzPKNw4ZBLjrj1NKi4Ly +66KWiJyOFn5PS5texF9sCYw59kedG/kaBbxz4O/5xSYwvW7zGFAOX/cLehpoDwhh +mwmIRJm85brDfjvXldO8ZQZi8GWdKD4WdnRXVUQyRntux2bRseiXkTfN/NTrFYPr +gZvYmNflMdSQKqP1P0rjQpHabfWR6aSqzjtDSKdfj09HXWs3NbvpVnLBOIvInggt +PCU7lWaeIyM0rqvCgl8pRVWWJ0/CCsuTQ71FigPd9ifvu4DIdgj+QAIOGpkEre+u +4RAaaXzvzIRhDtELzsVp7UYGOzZ6TD1M35fmnqu8/jy4I/jOQ0H/6CKBr0tfyzjy +luh/yZ6zHR8uYECpweWWG4T1PhbGUvq5GwB+nODHR1Ag9qk4efHq187DNJTNkGkp +XD/6E+tsVumhHOmMNIB7Rd4+6JNxVsZkhC2OwCAmwrq36YYemlZOuL8qhmYVIpkC +DQRYhpLWARAA6AT3VJMFQPXTVYs9sMW/nt14mkGnrEh70UXg6TqVkO8rsNsi3cXl +Hq+iHsXKI3v4tfMfng+xRdYIvi6NidS1SEXIUwsdrxrPT9omFtYsqQkZfPQu9rKt +Gh8+koltDgHLZORTibZTsnLmKRq2vGyqsk5PHp9e7OhMoxHL0OeBVmnK4i8+n5NW +Z1d5gSIstNyFhDmlVMSL5rgTPDEEVF2J/wcVF9VaaNKqan/arV0e0G4lMo0zf3R1 +M978WE9uumnxLDphToHVNi8LGbDSgElJx7EczTHjKkyKKRA9zC1R9SL8bABMpZQN +HxB1daQhCPLnuhm7359qNK/hslwGRQe6ScHkiSpxeJJry34+muaP1ARtSVkAQWRZ +Z46QmReYS/FupXXDI9HghA9jxGxRohIq5Dc48lNbFHrEpbi7LznOH869D2BQTRgJ +/UjU5RKuRaQrm8KbJirGQ6v1FmmPX0oLgv1IUXuqJJ7cubMCrZKeISq60z48FFUz +f38HYIhyhfzSKL3T/r4SLZL9+KQXKhfPbnT17bAx7cqNQZte3sxV1Rl1kp8H8KfS +nS1ZyFxmynts9XKZrzNwCNUGlqZdpwPm132BVWqx4U6fp1rOT80lFxCLQ/Sta0lG +vVc+qEMdVqbDPWWYt6xeLCoUkXNq9VQVKHhE0Iz84ytM7EqnQOFcBgUAEQEAAbQj +SXRhbG8gQS4gQ2FzYXMgPG1lQGl0YWxvYWNhc2FzLmNvbT6JAiIEEgEIAAwFAlia +OQsFgweGH4AACgkQ5zvGQcwR9MjBjxAAtLf1vcDkOsYtU+RCrpfWotwaFoYLRDlc +DIjFLO1bX2TIy1YFXDA9c0x8J5Pbt3wmhtkFojgmaGqvWpCJkb7lnudx9Qi/a2gx +ys7HS9heaUDoYM8kgeXVHJe1UcVi4veOthg8wp/hQJDUuKba1Xw9ujVi1PqbBNCw +5ALJK1iNcFmgjtk4Ab2rgCFHqTr/KOUNtYLs/uI9YOHGnzUAW0SrLgHQFD2B6TWv +kFBsRkR+LrY1xGinzt2V34BWmTgIvivC/DNdibhVoU2tSEj0VFkJuyKNSEj2PLA3 +lzaDteCezITqkn0TFpWVkl0NH8c39WV9d9OE60zvTPKfWYteio7VKIQpnCIMGhwr +ojt0RD0EEznmc5UV+RWKRcoWk7B2BqsZxFp94XRBqFjVOmWeK/hMZxoMl7I0V4gk +NyLbPMRyi87ZrVmof+wv7B7Vs8eBKiPDQu9W53bozX4bSf2oyZ3EWSPg+GCCSFc6 +NbBfkq8kdyA5LTKGRgxYZseiKaGvAP20AgRVSYhikl1zlcnGtnjjv6PeAAb4PlQc +ANhLLZ27XUVOWAtUdm9WQyGC7ONNKF7VbR1ikT04JaQMHb7a+cSiLlsV27B+9gk0 +bqIDSr8LOT1EDYFb4Xpw1eWCHlepbCFGl0MHOSuOzr4MXgZAjPiGrW6fCk7zCFlc +bjfaMmOafUSJAjgEEwEIACwFAliGktYJECPv7+k8TP/+AhsDBQkeEzgAAhkBBAsH +CQMFFQgKAgMEFgABAgAAx9IQANh9VjRLD8cLrsjVgKeC8/ncD6cpk7OqbH5vKjse +56RK0ABpU3ZSS9rzJdT+h3vTnIgRKCUBaw2xcv7oN+GCNT3VJ7MmyF4NyDTOjBiP +o/Wvck1C81n2t4+05INt6AL7Zn5HfeEGWVLo7zbzReCXdm3kmoifYxxwIEnPZeJa +Ly3nJRUlTMWm59lfU88q0RCyBZdI9+muiD7voSIR5Nu6Uf/Erw+YryXcBLlRIG9k +1nML5cAcH1qhvhyu9Fj6B2SeDcBHK37KyxiOmsIY5H1KsX7ijdR1MrLUSIbqODpi +pN4qFHPR+IzDyAWXs2QdEAEruh33SCzYX1rcVpVQU0buARBlGK+XzxwIXUn/V1Ku +2bTRl5eKbgvn4bB6V9fxrUvN3g/mdmB/pGLCt9imEqPcVoiApnLbTJ6HIIFT/rNe +RomqK5iDNG27HjGxofIKbkqhFJ2j/JEBJKpG4DHrVEkup6GTxzAzCHLr6Rkmyp32 +LQUq5yrV6u7e7tV6HoyaEDo6ywafAuBTfh3DAcfMandkpFdujGVniGrj9PJ8Ux4/ +Jxu1pN151uHifMITuVCkmjrS6gfFzCoSzcQV7yjNecvnse5ipCcyo6QJ2yCkwK+f +u+VcWy5JVw+FOvS44tgGLcsBexPPOtZPxVeZ1GCMVjPawNMjOjmB0jLBA2lmvDJk +iSumuQINBFiGktYBEACvROrJShVGFXjlldqr+DpTMsN7HBirnM7v6esapd1HGJNB +QNhK16vGC6NwD7fpOJ5bn0AzE1RPNKZ/CXOEoCne70M4XuzskUlqR74kwvRcxkV1 +WAHN+ABUIOXmfIVQZiQ9bM8FlUFFoW75MXDd8UeaOnMaxOMfYMQn0zCk+0w2o6UH +KtyTJEQ6L9XfFePaxTqxpWlWgDL50JeLPcqQbF5av851xppPqRrrSMat0E4T5I4h +W2m96A4KTCXt0TyrcziYSJ1elhiXZpgJ+ZlwEpk3lD32JDjar49gpcx2Nno4qj2i +Mdx62D2/OxpckLoRNaj25sdgC7JZBzmGGwbuSbE1q5QTwjMInbNccsUmFNECWPBM +vpJK/RC+/Htz8q373t/45W4d7zXNgQxlAKF99NVhZ1EBD5CSy3Q6qPqdrbdJh3Dl +VH/KnFl+hLwxsnjV0VhXPJgsg62TzIGDlS/N6N5C62lj9cCW6biek4QULgN1/Ni0 +hedK6aBdzDtpS4CR1s1rca+rgqimrgOtl6qJW3+MSxtiLsDLLDAYsZdhWnuBhUB7 +XIyBBtNir5rFibLNjkdxUF4Ug89U99m8vNOFiTaOBjy3rTvF9XtEqY3qg/KSUf75 +Wwp4ys1LuA7RoKkNET/WXsGiU47eS0dD6DOQmSKrrAIPfqseW9phJD+hbbrPWQAR +AQABiQI1BBgBCAApBQJYhpLWCRAj7+/pPEz//gIbDAUJHhM4AAQLBwkDBRUICgID +BBYAAQIAAAsJD/0aaHE3/txaeMU1bfDs0nWIBmSrqhVvHEvyzIzWK30D6Nfmv7bP +81hILfa2PfxjIgOCHtdA4xtAqV3G2/+7UeWLKlv0tuiZmx8p8mQkA6MsOnuDR4sW +TQ8Vd0arkTyzlBOwvz/SL8YXDSxWeSAgSSbQ+Ri7XrwwE+BjcWSeKabqmgQ4Hp7L +bQ0IvQ5f+hBWfLvugCgHI/7PRPhQbpallIdQLE7Qoavl8aDG8AqeN6tBLfjn19RR +kottbntbUlSG+WoYk2hYiydZGRlKwkNfcsuaaNF0p9pH0HR6RrsknrqxT+l8DaLm +4BwIMFXjnSuCEPfiJ3kV4bzRRND7iOfokdjJioj4ChrFR6461kDl7zqdkGIqU45q +Q+aklo0WTFvfiiTrsMXLpIhrCNn8oGST0eM8u3GCfmMFbxhO897NTDYnz1wOMcXu +MVqJ489aDKKvEV8zLljjUjJiZVDnbq0QE1abzVdmBtJRA3732buBwrzlHL5z4Bca +Zwe1bQsPHAzyC9EpJn7PtJcdDkfBk1PsGWx9cmPvqvX1Xbm8UoVie0x+wge5SM77 +5JeDdR41lHndWw67Ry59GgQapkOoargTqKyNYMYAxZBqKvdvIhS8jdAt5ldagJpV +quRCpSq91OAxMG0TFGCBXKjtqzsHk58WtAalk49TvO/0r0inTnfWSORiKQ== +=jVEm +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index eafaf956ee02e55e898fea74d83c3d5ce661757e..3f0ab5ff5067205b84d90e35597ce4a4db68c0ce 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser , pkgconfig, which +# Updater dependencies +, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix +, gnupg , darwin ? null }: with stdenv.lib; -{ enableNpm ? true, version, sha256, patches }: +{ enableNpm ? true, version, sha256, patches } @args: let @@ -26,6 +29,11 @@ let */ ]) (builtins.attrNames sharedLibDeps); + copyLibHeaders = + map + (name: "${getDev sharedLibDeps.${name}}/include/*") + (builtins.attrNames sharedLibDeps); + extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; in @@ -54,6 +62,8 @@ in setupHook = ./setup-hook.sh; + pos = builtins.unsafeGetAttrPos "version" args; + inherit patches; preBuild = optionalString stdenv.isDarwin '' @@ -74,13 +84,22 @@ in mkdir -p $out/share/bash-completion/completions/ $out/bin/npm completion > $out/share/bash-completion/completions/npm ''} + + # install the missing headers for node-gyp + cp -r ${concatStringsSep " " copyLibHeaders} $out/include/node ''; + passthru.updateScript = import ./update.nix { + inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix; + inherit (stdenv) lib; + majorVersion = with stdenv.lib; elemAt (splitString "." version) 0; + }; + meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = https://nodejs.org; license = licenses.mit; - maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; + maintainers = with maintainers; [ goibhniu gilligan cko ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh index e1f4d9089f38b518a1e5f85865fa56e762508351..18368588c2afcde393e005885dfb447bdcd9dd8c 100644 --- a/pkgs/development/web/nodejs/setup-hook.sh +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -2,4 +2,4 @@ addNodePath () { addToSearchPath NODE_PATH $1/lib/node_modules } -envHooks+=(addNodePath) +addEnvHooks "$hostOffset" addNodePath diff --git a/pkgs/development/web/nodejs/update-keyring b/pkgs/development/web/nodejs/update-keyring new file mode 100755 index 0000000000000000000000000000000000000000..39737758e765458cb0a2ccfcb730c802c53a4e3f --- /dev/null +++ b/pkgs/development/web/nodejs/update-keyring @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#! nix-shell --pure -i bash -p coreutils findutils gnupg curl + +# https://github.com/nodejs/node#release-team +HOME=`mktemp -d` +keyserver="pool.sks-keyservers.net" +cat << EOF | xargs -P 4 -n 1 gpg --keyserver $keyserver --recv-keys +94AE36675C464D64BAFA68DD7434390BDBE9B9C5 +FD3A5288F042B6850C66B31F09FE44734EB7990E +71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 +DD8F2338BAE7501E3DD5AC78C273792F7D83545D +C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 +B9AE9905FFD7803F25714661B63B535A4C206CA9 +56730D5401028683275BD23C23EFEFE93C4CFFFE +77984A986EBC2AA786BC0F66B01FBB92821C587A +EOF + +gpg -a --export > nodejs-release-keys.asc diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix new file mode 100644 index 0000000000000000000000000000000000000000..9ff11982b6568cbfae3131b6c66e1567bb9fdbdd --- /dev/null +++ b/pkgs/development/web/nodejs/update.nix @@ -0,0 +1,27 @@ +{ lib +, writeScript +, coreutils +, curl +, gnugrep +, jq +, gnupg +, common-updater-scripts +, majorVersion +, nix +}: + +writeScript "update-nodejs" '' + PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq gnupg nix ]} + + HOME=`mktemp -d` + cat ${./nodejs-release-keys.asc} | gpg --import + + tags=`curl --silent https://api.github.com/repos/nodejs/node/git/refs/tags` + version=`echo $tags | jq -r '.[] | select(.ref | startswith("refs/tags/v${majorVersion}")) | .ref' | sort --version-sort | tail -1 | grep -oP "^refs/tags/v\K.*"` + + curl --silent -o $HOME/SHASUMS256.txt.asc https://nodejs.org/dist/v''${version}/SHASUMS256.txt.asc + hash_hex=`gpgv --keyring=$HOME/.gnupg/pubring.kbx --output - $HOME/SHASUMS256.txt.asc | grep -oP "^([0-9a-f]{64})(?=\s+node-v''${version}.tar.xz$)"` + hash=`nix-hash --type sha256 --to-base32 ''${hash_hex}` + + update-source-version nodejs-${majorVersion}_x "''${version}" "''${hash}" +'' diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix deleted file mode 100644 index 08fd91aaf8ded9dd1e6e3183f5f212117468790e..0000000000000000000000000000000000000000 --- a/pkgs/development/web/nodejs/v4.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, callPackage, lib, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix {}; -in - buildNodejs { - inherit enableNpm; - version = "4.8.5"; - sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4"; - patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; - } diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index c703377d5a046b52aca5f187d388b8e0dd35f06c..6dd9dd6f8e1a9c298828a2f5f699b23bc6246bd8 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "6.11.5"; - sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w"; - patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; + version = "6.14.1"; + sha256 = "1hxyasy42ih9brgp37n9j85s5vwir3g32k5i3j0vx2kizy4xlphi"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ]; } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 14dfb8164f43c75a80d3fbe09bef1940dad47562..942c6cc3fd83f7cdd917431cfce71eda59ea9121 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "8.9.1"; - sha256 = "1q0p9zl260pd8038yvn13lw5whs480dy11ar2ijcm2hgyqhhq5pg"; - patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + version = "8.11.1"; + sha256 = "12kmsh5cl72dq5hzik1cczn2n5crbfqqd1xmrzqgryipx98yp9j0"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index aa51421253fb6fdc418b3eb43d3abb5a70016682..f6f8aa8d1ab02886869d1cd23da1fccaa8042b9a 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.0.0"; - sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv"; + version = "9.11.1"; + sha256 = "0k4xkcymf4y3k2bxjryb2lj97bxnng75x7a77i2wgx94749kvp13"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..48f76e9e85d232c9f23a12517fe777eb32af1e69 --- /dev/null +++ b/pkgs/development/web/postman/default.nix @@ -0,0 +1,89 @@ +{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, udev, makeWrapper, makeDesktopItem }: + +stdenv.mkDerivation rec { + name = "postman-${version}"; + version = "5.5.2"; + + src = fetchurl { + url = "https://dl.pstmn.io/download/version/${version}/linux64"; + sha1 = "68886197A8375E860AB880547838FEFC9E12FC64"; + name = "${name}.tar.gz"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontPatchELF = true; + + buildPhase = ":"; # nothing to build + + desktopItem = makeDesktopItem { + name = "postman"; + exec = "postman"; + icon = "$out/share/postman/resources/app/assets/icon.png"; + comment = "API Development Environment"; + desktopName = "Postman"; + genericName = "Postman"; + categories = "Application;Development;"; + }; + + installPhase = '' + mkdir -p $out/share/postman + mkdir -p $out/share/applications + cp -R * $out/share/postman + mkdir -p $out/bin + ln -s $out/share/postman/Postman $out/bin/postman + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + ''; + + preFixup = let + libPath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + gnome2.pango + gnome2.GConf + pkgs.atk + pkgs.alsaLib + pkgs.cairo + pkgs.cups + pkgs.dbus_daemon.lib + pkgs.expat + pkgs.gdk_pixbuf + pkgs.glib + pkgs.gtk2-x11 + pkgs.freetype + pkgs.fontconfig + pkgs.nss + pkgs.nspr + pkgs.udev.lib + xorg.libX11 + xorg.libxcb + xorg.libXi + xorg.libXcursor + xorg.libXdamage + xorg.libXrandr + xorg.libXcomposite + xorg.libXext + xorg.libXfixes + xorg.libXrender + xorg.libX11 + xorg.libXtst + xorg.libXScrnSaver + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/share/postman" \ + $out/share/postman/Postman + patchelf --set-rpath "${libPath}" $out/share/postman/libnode.so + patchelf --set-rpath "${libPath}" $out/share/postman/libffmpeg.so + + wrapProgram $out/share/postman/Postman --prefix LD_LIBRARY_PATH : ${libPath} + ''; + + meta = with stdenv.lib; { + homepage = https://www.getpostman.com; + description = "API Development Environment"; + license = stdenv.lib.licenses.postman; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ xurei ]; + }; +} diff --git a/pkgs/development/web/remarkjs/generate.sh b/pkgs/development/web/remarkjs/generate.sh index 63d43c6773f0e014df2d1b8b1f12dc76c44e543e..040aaf9771687f7277bdeea8ceaabc9853775539 100644 --- a/pkgs/development/web/remarkjs/generate.sh +++ b/pkgs/development/web/remarkjs/generate.sh @@ -1,3 +1,3 @@ #!/bin/sh -e -node2nix -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix +node2nix -6 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 8ece92b4a3ff951d7b93b6abbfd622f5b1779708..4c8a6c6db97af08b6307e24768ba71bdaf15fd7c 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -1,448 +1,457 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "JSONStream-1.3.1" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.3.1"; + "@sinonjs/formatio-2.0.0" = { + name = "_at_sinonjs_slash_formatio"; + packageName = "@sinonjs/formatio"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz"; - sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a"; + url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz"; + sha512 = "37dc2svic03crmc9mvs4xc16rd28cbbf33js9ndp8278gb5xi40h1yzx467h3ca9mszjfwwr9vyfnvfbk07dj7gz039izrsq0085kln"; }; }; - "assert-1.4.1" = { - name = "assert"; - packageName = "assert"; - version = "1.4.1"; + "JSONStream-1.3.2" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; + sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; }; }; - "browser-pack-6.0.2" = { - name = "browser-pack"; - packageName = "browser-pack"; - version = "6.0.2"; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz"; - sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531"; + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; - "browser-resolve-1.11.2" = { - name = "browser-resolve"; - packageName = "browser-resolve"; - version = "1.11.2"; + "acorn-4.0.13" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; - sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"; + sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; - "browserify-zlib-0.1.4" = { - name = "browserify-zlib"; - packageName = "browserify-zlib"; - version = "0.1.4"; + "acorn-5.5.3" = { + name = "acorn"; + packageName = "acorn"; + version = "5.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; - sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz"; + sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld"; }; }; - "buffer-5.0.5" = { - name = "buffer"; - packageName = "buffer"; - version = "5.0.5"; + "acorn-node-1.3.0" = { + name = "acorn-node"; + packageName = "acorn-node"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; - sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz"; + sha512 = "0pxd0cjsh0kdh8nxcpm000fcsgwmr8b13gyxkac8yxzz9a5wblqka5crksicnx8mqwy499k1jryr83bjzb3355xikgs5mfxgpigkwvr"; }; }; - "cached-path-relative-1.0.1" = { - name = "cached-path-relative"; - packageName = "cached-path-relative"; - version = "1.0.1"; + "adm-zip-0.2.1" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; - sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz"; + sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; }; }; - "concat-stream-1.5.2" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.5.2"; + "ajv-4.11.8" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; }; }; - "console-browserify-1.1.0" = { - name = "console-browserify"; - packageName = "console-browserify"; - version = "1.1.0"; + "array-filter-0.0.1" = { + name = "array-filter"; + packageName = "array-filter"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; - sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; + sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; }; }; - "constants-browserify-1.0.0" = { - name = "constants-browserify"; - packageName = "constants-browserify"; - version = "1.0.0"; + "array-map-0.0.0" = { + name = "array-map"; + packageName = "array-map"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; - sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; + sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; }; }; - "crypto-browserify-3.11.0" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "3.11.0"; + "array-reduce-0.0.0" = { + name = "array-reduce"; + packageName = "array-reduce"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz"; - sha1 = "3652a0906ab9b2a7e0c3ce66a408e957a2485522"; + url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; + sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; }; }; - "defined-1.0.0" = { - name = "defined"; - packageName = "defined"; - version = "1.0.0"; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; - sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; - "deps-sort-2.0.0" = { - name = "deps-sort"; - packageName = "deps-sort"; - version = "2.0.0"; + "asn1-0.1.11" = { + name = "asn1"; + packageName = "asn1"; + version = "0.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz"; - sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; - "domain-browser-1.1.7" = { - name = "domain-browser"; - packageName = "domain-browser"; - version = "1.1.7"; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz"; - sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "duplexer2-0.1.4" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.1.4"; + "asn1.js-4.10.1" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; - sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; }; }; - "events-1.1.1" = { - name = "events"; - packageName = "events"; - version = "1.1.1"; + "assert-1.4.1" = { + name = "assert"; + packageName = "assert"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; - sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; + url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; }; }; - "glob-7.1.1" = { - name = "glob"; - packageName = "glob"; - version = "7.1.1"; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; - sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; }; }; - "has-1.0.1" = { - name = "has"; - packageName = "has"; - version = "1.0.1"; + "assert-plus-0.2.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; - sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "htmlescape-1.1.1" = { - name = "htmlescape"; - packageName = "htmlescape"; - version = "1.1.1"; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; - sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "https-browserify-0.0.1" = { - name = "https-browserify"; - packageName = "https-browserify"; - version = "0.0.1"; + "astw-2.2.0" = { + name = "astw"; + packageName = "astw"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; - sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; + sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; }; }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; }; }; - "insert-module-globals-7.0.1" = { - name = "insert-module-globals"; - packageName = "insert-module-globals"; - version = "7.0.1"; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz"; - sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"; + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "labeled-stream-splicer-2.0.0" = { - name = "labeled-stream-splicer"; - packageName = "labeled-stream-splicer"; - version = "2.0.0"; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; - sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; }; }; - "module-deps-4.1.1" = { - name = "module-deps"; - packageName = "module-deps"; - version = "4.1.1"; + "aws-sign2-0.6.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; - sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "os-browserify-0.1.2" = { - name = "os-browserify"; - packageName = "os-browserify"; - version = "0.1.2"; + "aws4-1.6.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; - sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; - "parents-1.0.1" = { - name = "parents"; - packageName = "parents"; - version = "1.0.1"; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; - sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "path-browserify-0.0.0" = { - name = "path-browserify"; - packageName = "path-browserify"; - version = "0.0.0"; + "base64-js-1.2.3" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; - sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz"; + sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j"; }; }; - "process-0.11.9" = { - name = "process"; - packageName = "process"; - version = "0.11.9"; + "bcrypt-pbkdf-1.0.1" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/process/-/process-0.11.9.tgz"; - sha1 = "7bd5ad21aa6253e7da8682264f1e11d11c0318c1"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; + "bn.js-4.11.8" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; + sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; }; }; - "querystring-es3-0.2.1" = { - name = "querystring-es3"; - packageName = "querystring-es3"; - version = "0.2.1"; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; - sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; }; }; - "read-only-stream-2.0.0" = { - name = "read-only-stream"; - packageName = "read-only-stream"; - version = "2.0.0"; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz"; - sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; - "readable-stream-2.2.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.2.6"; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; - sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; - "resolve-1.3.2" = { - name = "resolve"; - packageName = "resolve"; - version = "1.3.2"; + "brorand-1.1.0" = { + name = "brorand"; + packageName = "brorand"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz"; - sha1 = "1f0442c9e0cbb8136e87b9305f932f46c7f28235"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; - "shasum-1.0.2" = { - name = "shasum"; - packageName = "shasum"; - version = "1.0.2"; + "browser-pack-6.0.4" = { + name = "browser-pack"; + packageName = "browser-pack"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; - sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz"; + sha512 = "0ylgxzrsxs25v3c4mz5ggqawb8k3xb39ialqlflk1nadfk8wrig2g2ipkpnw6bf9zhdhmigkwqbbl8yssibcb6fgnbbqfgsnfgnz123"; }; }; - "shell-quote-1.6.1" = { - name = "shell-quote"; - packageName = "shell-quote"; - version = "1.6.1"; + "browser-resolve-1.11.2" = { + name = "browser-resolve"; + packageName = "browser-resolve"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; + sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; }; }; - "stream-browserify-2.0.1" = { - name = "stream-browserify"; - packageName = "stream-browserify"; - version = "2.0.1"; + "browser-stdout-1.3.1" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; - sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; + sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; }; }; - "stream-http-2.6.3" = { - name = "stream-http"; - packageName = "stream-http"; - version = "2.6.3"; + "browserify-aes-1.1.1" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz"; - sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"; + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz"; + sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah"; }; }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; + "browserify-cipher-1.0.0" = { + name = "browserify-cipher"; + packageName = "browserify-cipher"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; + sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; }; }; - "subarg-1.0.0" = { - name = "subarg"; - packageName = "subarg"; + "browserify-des-1.0.0" = { + name = "browserify-des"; + packageName = "browserify-des"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; - sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; + sha1 = "daa277717470922ed2fe18594118a175439721dd"; }; }; - "syntax-error-1.3.0" = { - name = "syntax-error"; - packageName = "syntax-error"; - version = "1.3.0"; + "browserify-rsa-4.0.1" = { + name = "browserify-rsa"; + packageName = "browserify-rsa"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; - sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; + "browserify-sign-4.0.4" = { + name = "browserify-sign"; + packageName = "browserify-sign"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; }; }; - "timers-browserify-1.4.2" = { - name = "timers-browserify"; - packageName = "timers-browserify"; - version = "1.4.2"; + "browserify-zlib-0.2.0" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"; - sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; }; }; - "tty-browserify-0.0.0" = { - name = "tty-browserify"; - packageName = "tty-browserify"; - version = "0.0.0"; + "buffer-5.1.0" = { + name = "buffer"; + packageName = "buffer"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; - sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; + sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2"; }; }; - "url-0.11.0" = { - name = "url"; - packageName = "url"; - version = "0.11.0"; + "buffer-xor-1.0.3" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; - sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "util-0.10.3" = { - name = "util"; - packageName = "util"; - version = "0.10.3"; + "builtin-status-codes-3.0.0" = { + name = "builtin-status-codes"; + packageName = "builtin-status-codes"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; - sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; - "vm-browserify-0.0.4" = { - name = "vm-browserify"; - packageName = "vm-browserify"; - version = "0.0.4"; + "cached-path-relative-1.0.1" = { + name = "cached-path-relative"; + packageName = "cached-path-relative"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; - sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; + sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; }; }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "jsonparse-1.3.0" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "1.3.0"; + "cipher-base-1.0.4" = { + name = "cipher-base"; + packageName = "cipher-base"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz"; - sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; + sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; }; }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; + "cli-1.0.1" = { + name = "cli"; + packageName = "cli"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz"; + sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; + }; + }; + "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"; }; }; "combine-source-map-0.7.2" = { @@ -454,166 +463,130 @@ let sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; }; }; - "umd-3.0.1" = { - name = "umd"; - packageName = "umd"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"; - sha1 = "8ae556e11011f63c2596708a8837259f01b3d60e"; - }; - }; - "convert-source-map-1.1.3" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.1.3"; + "combine-source-map-0.8.0" = { + name = "combine-source-map"; + packageName = "combine-source-map"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; - sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; + url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz"; + sha1 = "a58d0df042c186fcf822a8e8015f5450d2d79a8b"; }; }; - "inline-source-map-0.6.2" = { - name = "inline-source-map"; - packageName = "inline-source-map"; - version = "0.6.2"; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz"; - sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "lodash.memoize-3.0.4" = { - name = "lodash.memoize"; - packageName = "lodash.memoize"; - version = "3.0.4"; + "combined-stream-1.0.6" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; - sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; - "source-map-0.5.6" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.6"; + "commander-2.11.0" = { + name = "commander"; + packageName = "commander"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; }; }; - "resolve-1.1.7" = { - name = "resolve"; - packageName = "resolve"; - version = "1.1.7"; + "commander-2.14.1" = { + name = "commander"; + packageName = "commander"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; + sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; }; }; - "pako-0.2.9" = { - name = "pako"; - packageName = "pako"; - version = "0.2.9"; + "commander-2.15.0" = { + name = "commander"; + packageName = "commander"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; - sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; + url = "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz"; + sha512 = "090my2m6q69l4kgn1slqs845mf9s5zx7l1p345z2qij174pyk4jr2xkalnq8k0dfhghvdmcjxba03qn959n64r8nkg2cq9d3ja647gc"; }; }; - "base64-js-1.2.0" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.2.0"; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; - sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "ieee754-1.1.8" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.1.8"; + "concat-stream-1.5.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; - sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; }; }; - "typedarray-0.0.6" = { - name = "typedarray"; - packageName = "typedarray"; - version = "0.0.6"; + "concat-stream-1.6.1" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz"; + sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2"; }; }; - "readable-stream-2.0.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.0.6"; + "config-chain-1.1.11" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; + sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; }; }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; + "console-browserify-1.1.0" = { + name = "console-browserify"; + packageName = "console-browserify"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; }; }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; + "constants-browserify-1.0.0" = { + name = "constants-browserify"; + packageName = "constants-browserify"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; + "convert-source-map-1.1.3" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; + sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; }; }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; - "date-now-0.1.4" = { - name = "date-now"; - packageName = "date-now"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; - sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; - }; - }; - "browserify-cipher-1.0.0" = { - name = "browserify-cipher"; - packageName = "browserify-cipher"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; - sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; - }; - }; - "browserify-sign-4.0.4" = { - name = "browserify-sign"; - packageName = "browserify-sign"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; - sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; "create-ecdh-4.0.0" = { @@ -625,103 +598,121 @@ 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" = { - name = "diffie-hellman"; - packageName = "diffie-hellman"; - version = "5.0.2"; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; - sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; }; }; - "pbkdf2-3.0.9" = { - name = "pbkdf2"; - packageName = "pbkdf2"; - version = "3.0.9"; + "cryptiles-2.0.5" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz"; - sha1 = "f2c4b25a600058b3c3773c086c37dbbee1ffe693"; + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; }; }; - "public-encrypt-4.0.0" = { - name = "public-encrypt"; - packageName = "public-encrypt"; - version = "4.0.0"; + "crypto-browserify-3.12.0" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; - sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; }; }; - "randombytes-2.0.3" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.0.3"; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz"; - sha1 = "674c99760901c3c4112771a31e521dc349cc09ec"; + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }; }; - "browserify-aes-1.0.6" = { - name = "browserify-aes"; - packageName = "browserify-aes"; - version = "1.0.6"; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz"; - sha1 = "5e7725dbdef1fd5930d4ebab48567ce451c48a0a"; + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; - "browserify-des-1.0.0" = { - name = "browserify-des"; - packageName = "browserify-des"; - version = "1.0.0"; + "date-now-0.1.4" = { + name = "date-now"; + packageName = "date-now"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; - sha1 = "daa277717470922ed2fe18594118a175439721dd"; + url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; + sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; - "evp_bytestokey-1.0.0" = { - name = "evp_bytestokey"; - packageName = "evp_bytestokey"; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + }; + }; + "defined-1.0.0" = { + name = "defined"; + packageName = "defined"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"; - sha1 = "497b66ad9fef65cd7c08a6180824ba1476b66e53"; + url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; + sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; }; }; - "buffer-xor-1.0.3" = { - name = "buffer-xor"; - packageName = "buffer-xor"; - version = "1.0.3"; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; - sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; }; }; - "cipher-base-1.0.3" = { - name = "cipher-base"; - packageName = "cipher-base"; - version = "1.0.3"; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "deps-sort-2.0.0" = { + name = "deps-sort"; + packageName = "deps-sort"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; - sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; + url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz"; + sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; }; }; "des.js-1.0.0" = { @@ -733,1255 +724,1084 @@ let sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; }; }; - "minimalistic-assert-1.0.0" = { - name = "minimalistic-assert"; - packageName = "minimalistic-assert"; - version = "1.0.0"; + "detective-5.1.0" = { + name = "detective"; + packageName = "detective"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; - sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz"; + sha512 = "1cm9sp1rl54d3y7v9nvw12kad47g5pcmbzf96s7kpm85j1cc79yc8qb8q0xjj71w32pgz2p4fym47sa851i5lswglmmiimgyflwqlac"; }; }; - "bn.js-4.11.6" = { - name = "bn.js"; - packageName = "bn.js"; - version = "4.11.6"; + "diff-3.5.0" = { + name = "diff"; + packageName = "diff"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz"; - sha1 = "53344adb14617a13f6e8dd2ce28905d1c0ba3215"; + url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; + sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; }; }; - "browserify-rsa-4.0.1" = { - name = "browserify-rsa"; - packageName = "browserify-rsa"; - version = "4.0.1"; + "diffie-hellman-5.0.2" = { + name = "diffie-hellman"; + packageName = "diffie-hellman"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; + sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "elliptic-6.4.0" = { - name = "elliptic"; - packageName = "elliptic"; - version = "6.4.0"; + "dom-serializer-0.1.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; - sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; + sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; }; }; - "parse-asn1-5.1.0" = { - name = "parse-asn1"; - packageName = "parse-asn1"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; - sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; - }; - }; - "brorand-1.1.0" = { - name = "brorand"; - packageName = "brorand"; - version = "1.1.0"; + "domain-browser-1.2.0" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; - sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; + sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f"; }; }; - "hash.js-1.0.3" = { - name = "hash.js"; - packageName = "hash.js"; - version = "1.0.3"; + "domelementtype-1.1.3" = { + name = "domelementtype"; + packageName = "domelementtype"; + 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/domelementtype/-/domelementtype-1.1.3.tgz"; + sha1 = "bd28773e2642881aec51544924299c5cd822185b"; }; }; - "hmac-drbg-1.0.0" = { - name = "hmac-drbg"; - packageName = "hmac-drbg"; - version = "1.0.0"; + "domelementtype-1.3.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; - sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; }; }; - "minimalistic-crypto-utils-1.0.1" = { - name = "minimalistic-crypto-utils"; - packageName = "minimalistic-crypto-utils"; - version = "1.0.1"; + "domhandler-2.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; + sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; }; }; - "asn1.js-4.9.1" = { - name = "asn1.js"; - packageName = "asn1.js"; - version = "4.9.1"; + "domutils-1.5.1" = { + name = "domutils"; + packageName = "domutils"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz"; - sha1 = "48ba240b45a9280e94748990ba597d216617fd40"; + url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; }; }; - "ripemd160-1.0.1" = { - name = "ripemd160"; - packageName = "ripemd160"; - version = "1.0.1"; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"; - sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"; + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; }; }; - "sha.js-2.4.8" = { - name = "sha.js"; - packageName = "sha.js"; - version = "2.4.8"; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"; - sha1 = "37068c2c476b6baf402d14a49c67f597921f634f"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; - "miller-rabin-4.0.0" = { - name = "miller-rabin"; - packageName = "miller-rabin"; - version = "4.0.0"; + "elliptic-6.4.0" = { + name = "elliptic"; + packageName = "elliptic"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz"; - sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; + sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; + "entities-1.0.0" = { + name = "entities"; + packageName = "entities"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; + sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; }; }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; + "entities-1.1.1" = { + name = "entities"; + packageName = "entities"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; + sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "minimatch-3.0.3" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.3"; + "errno-0.1.7" = { + name = "errno"; + packageName = "errno"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; + url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; + sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; }; }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; + "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/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; + "events-2.0.0" = { + name = "events"; + packageName = "events"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + url = "https://registry.npmjs.org/events/-/events-2.0.0.tgz"; + sha512 = "1r878as79mx3xg56nvjxxbryqa8lqn8xmiqi1xqfx2vjygnfaf15h5l658a9ikfr1bhc6ygxny8jr8ddjxpzlh6y443rxv08di3kwxg"; }; }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; + "evp_bytestokey-1.0.3" = { + name = "evp_bytestokey"; + packageName = "evp_bytestokey"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; }; }; - "brace-expansion-1.1.6" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.6"; + "exit-0.1.2" = { + name = "exit"; + packageName = "exit"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }; }; - "balanced-match-0.4.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "0.4.2"; + "extend-3.0.1" = { + name = "extend"; + packageName = "extend"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; - sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; + sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; }; }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "function-bind-1.1.0" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.0"; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"; - sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771"; + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; }; }; - "is-buffer-1.1.5" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.5"; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; - sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "lexical-scope-1.2.0" = { - name = "lexical-scope"; - packageName = "lexical-scope"; - version = "1.2.0"; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; - sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; }; }; - "astw-2.2.0" = { - name = "astw"; - packageName = "astw"; - version = "2.2.0"; + "form-data-2.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; - sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; - "acorn-4.0.11" = { - name = "acorn"; - packageName = "acorn"; - version = "4.0.11"; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; - sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; }; }; - "stream-splicer-2.0.0" = { - name = "stream-splicer"; - packageName = "stream-splicer"; - version = "2.0.0"; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"; - sha1 = "1b63be438a133e4b671cc1935197600175910d83"; + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "detective-4.5.0" = { - name = "detective"; - packageName = "detective"; - version = "4.5.0"; + "glob-7.1.2" = { + name = "glob"; + packageName = "glob"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz"; - sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; + sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; }; }; - "stream-combiner2-1.1.1" = { - name = "stream-combiner2"; - packageName = "stream-combiner2"; - version = "1.1.1"; + "graceful-fs-4.1.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; - sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; - "path-platform-0.11.15" = { - name = "path-platform"; - packageName = "path-platform"; - version = "0.11.15"; + "growl-1.10.3" = { + name = "growl"; + packageName = "growl"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; - sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; + url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; + sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; }; }; - "buffer-shims-1.0.0" = { - name = "buffer-shims"; - packageName = "buffer-shims"; - version = "1.0.0"; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; - sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; }; }; - "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"; - version = "0.0.1"; + "har-validator-4.2.1" = { + name = "har-validator"; + packageName = "har-validator"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; - sha1 = "611c23e814db375527df851193db59dd2af27f45"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; + "has-1.0.1" = { + name = "has"; + packageName = "has"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; + sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; }; }; - "array-filter-0.0.1" = { - name = "array-filter"; - packageName = "array-filter"; - version = "0.0.1"; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; - sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; - "array-reduce-0.0.0" = { - name = "array-reduce"; - packageName = "array-reduce"; - version = "0.0.0"; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; - sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; - "array-map-0.0.0" = { - name = "array-map"; - packageName = "array-map"; - version = "0.0.0"; + "hash-base-2.0.2" = { + name = "hash-base"; + packageName = "hash-base"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; - sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz"; + sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; }; }; - "builtin-status-codes-3.0.0" = { - name = "builtin-status-codes"; - packageName = "builtin-status-codes"; - version = "3.0.0"; + "hash-base-3.0.4" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; - sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; }; }; - "to-arraybuffer-1.0.1" = { - name = "to-arraybuffer"; - packageName = "to-arraybuffer"; - version = "1.0.1"; + "hash.js-1.1.3" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; - sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz"; + sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx"; }; }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; + "hawk-1.0.0" = { + name = "hawk"; + packageName = "hawk"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; }; }; - "punycode-1.3.2" = { - name = "punycode"; - packageName = "punycode"; - version = "1.3.2"; + "hawk-3.1.3" = { + name = "hawk"; + packageName = "hawk"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; }; }; - "querystring-0.2.0" = { - name = "querystring"; - packageName = "querystring"; - version = "0.2.0"; + "he-1.1.1" = { + name = "he"; + packageName = "he"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; + url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; + sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; - "inherits-2.0.1" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.1"; + "hmac-drbg-1.0.1" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; }; }; - "indexof-0.0.1" = { - name = "indexof"; - packageName = "indexof"; - version = "0.0.1"; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; }; }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; + "hoek-2.16.3" = { + name = "hoek"; + packageName = "hoek"; + version = "2.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; + "htmlescape-1.1.1" = { + name = "htmlescape"; + packageName = "htmlescape"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; + sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; + "htmlparser2-3.8.3" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; + sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; }; }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; + "http-signature-1.1.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; }; }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; + "https-browserify-1.0.0" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; + "ieee754-1.1.8" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; + sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; }; }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; + "image-size-0.5.5" = { + name = "image-size"; + packageName = "image-size"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + url = "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"; + sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"; }; }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; + "indexof-0.0.1" = { + name = "indexof"; + packageName = "indexof"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; }; }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; + "inherits-1.0.2" = { + name = "inherits"; + packageName = "inherits"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; + sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; }; }; - "kind-of-3.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.1.0"; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; - sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; }; }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; + "ini-1.1.0" = { + name = "ini"; + packageName = "ini"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; }; }; - "errno-0.1.4" = { - name = "errno"; - packageName = "errno"; - version = "0.1.4"; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz"; - sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"; + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; + "inline-source-map-0.6.2" = { + name = "inline-source-map"; + packageName = "inline-source-map"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz"; + sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; }; }; - "image-size-0.5.1" = { - name = "image-size"; - packageName = "image-size"; - version = "0.5.1"; + "insert-module-globals-7.0.2" = { + name = "insert-module-globals"; + packageName = "insert-module-globals"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/image-size/-/image-size-0.5.1.tgz"; - sha1 = "28eea8548a4b1443480ddddc1e083ae54652439f"; + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.2.tgz"; + sha512 = "19lb0lqjmyxr13va9m2mdyjmpfb2c4lgnnnwysri85znpa37gcgi6b57zj0h5ymk6fbl3snjfw07gb9azb8yvkldj6av6wdvs1knyx7"; }; }; - "mime-1.3.4" = { - name = "mime"; - packageName = "mime"; - version = "1.3.4"; + "interpret-1.1.0" = { + name = "interpret"; + packageName = "interpret"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; + sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; }; }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; - "promise-7.1.1" = { - name = "promise"; - packageName = "promise"; - version = "7.1.1"; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz"; - sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; }; }; - "prr-0.0.0" = { - name = "prr"; - packageName = "prr"; - version = "0.0.0"; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; - sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "asap-2.0.5" = { - name = "asap"; - packageName = "asap"; - version = "2.0.5"; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; - sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "aws4-1.6.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.6.0"; + "json-stable-stringify-0.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; + sha1 = "611c23e814db375527df851193db59dd2af27f45"; }; }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; + "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/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; }; }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "extend-3.0.0" = { - name = "extend"; - packageName = "extend"; - version = "3.0.0"; + "jsonify-0.0.0" = { + name = "jsonify"; + packageName = "jsonify"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; - sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; }; }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; + "jsonparse-1.3.1" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; }; }; - "form-data-2.1.2" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.2"; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; - sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; + "just-extend-1.1.27" = { + name = "just-extend"; + packageName = "just-extend"; + version = "1.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + url = "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz"; + sha512 = "3x01f92pvzs341qv1cin9mb3yiimkzjpy0f4dms78ki26ba01kjqcjpcm85sw005lc8d5dkk9wsigwh7zawnh10vml03siifbbnk5cq"; }; }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; + "kew-0.1.7" = { + name = "kew"; + packageName = "kew"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; + sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; }; }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; + "labeled-stream-splicer-2.0.0" = { + name = "labeled-stream-splicer"; + packageName = "labeled-stream-splicer"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; + sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; }; }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; + "lexical-scope-1.2.0" = { + name = "lexical-scope"; + packageName = "lexical-scope"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; + sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; }; }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; + "lodash-3.7.0" = { + name = "lodash"; + packageName = "lodash"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; + sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; }; }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; + "lodash.get-4.4.2" = { + name = "lodash.get"; + packageName = "lodash.get"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; }; }; - "mime-types-2.1.15" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.15"; + "lodash.memoize-3.0.4" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; - sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; + sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; + "lolex-2.3.2" = { + name = "lolex"; + packageName = "lolex"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + url = "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz"; + sha512 = "2g7dp64fm1kp17mxgz5r8hlgd65k8wfxz8jwcgqskdxn7vsnm6vj1bylcqblyzl6879p3g7qcjqqwmw0nik6032fksb33q5v7d4v6h3"; }; }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; + "md5.js-1.3.4" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; + sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; }; }; - "qs-6.4.0" = { - name = "qs"; - packageName = "qs"; - version = "6.4.0"; + "miller-rabin-4.0.1" = { + name = "miller-rabin"; + packageName = "miller-rabin"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; }; }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; }; }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; - "tough-cookie-2.3.2" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.2"; + "mime-db-1.33.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"; - sha1 = "f081f76e4c85720e6c37a5faced737150d84072a"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; + sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; }; }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; + "mime-types-2.1.18" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; + sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; }; }; - "uuid-3.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.1"; + "minimalistic-assert-1.0.0" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; - sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; + sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; }; }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; + "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/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; }; }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; }; }; - "ajv-4.11.5" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.5"; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; - sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; + "mkdirp-0.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.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/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; + "mocha-phantomjs-core-1.3.1" = { + name = "mocha-phantomjs-core"; + packageName = "mocha-phantomjs-core"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + url = "https://registry.npmjs.org/mocha-phantomjs-core/-/mocha-phantomjs-core-1.3.1.tgz"; + sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; }; }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; + "module-deps-6.0.0" = { + name = "module-deps"; + packageName = "module-deps"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.0.tgz"; + sha512 = "0ri32x2v7ywi8n4h92scc5pq6zlh7mmzbmk0gh2gsh3490w4d9islz1rs0in98cl2h5fl0dfx2dfcad0disnaiqflw46d24ja20raq4"; }; }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; + "ncp-0.4.2" = { + name = "ncp"; + packageName = "ncp"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; + "nise-1.3.0" = { + name = "nise"; + packageName = "nise"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + url = "https://registry.npmjs.org/nise/-/nise-1.3.0.tgz"; + sha512 = "20b9q52bz8ncm5jqjfhrhrcr2rb0y8jhb867ayrkdsf78y1c186qra112a6sj6lbnkab0dx0i1cnr2hz4l4dzzkn1l8khvc71vspqjk"; }; }; - "jsprim-1.4.0" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.0"; + "node-uuid-1.4.8" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; - sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; - "sshpk-1.11.0" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.11.0"; + "nopt-2.2.1" = { + name = "nopt"; + packageName = "nopt"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; - sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; + url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; + sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; + "npmconf-0.0.24" = { + name = "npmconf"; + packageName = "npmconf"; + version = "0.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + url = "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz"; + sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c"; }; }; - "extsprintf-1.0.2" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.0.2"; + "oauth-sign-0.3.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; - sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; }; }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "verror-1.3.6" = { - name = "verror"; - packageName = "verror"; - version = "1.3.6"; + "once-1.1.1" = { + name = "once"; + packageName = "once"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; - sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz"; + sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; }; }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; + "os-browserify-0.3.0" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; }; - "getpass-0.1.6" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.6"; + "osenv-0.0.3" = { + name = "osenv"; + packageName = "osenv"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; - sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; }; }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; + "pako-1.0.6" = { + name = "pako"; + packageName = "pako"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; + sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; }; }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; + "parents-1.0.1" = { + name = "parents"; + packageName = "parents"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; + sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "jodid25519-1.0.2" = { - name = "jodid25519"; - packageName = "jodid25519"; - version = "1.0.2"; + "parse-asn1-5.1.0" = { + name = "parse-asn1"; + packageName = "parse-asn1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; + sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; }; }; - "ecc-jsbn-0.1.1" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.1"; + "path-browserify-0.0.0" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; }; }; - "bcrypt-pbkdf-1.0.1" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "mime-db-1.27.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.27.0"; + "path-parse-1.0.5" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; - sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; + sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; }; }; - "browser-stdout-1.3.0" = { - name = "browser-stdout"; - packageName = "browser-stdout"; - version = "1.3.0"; + "path-platform-0.11.15" = { + name = "path-platform"; + packageName = "path-platform"; + version = "0.11.15"; src = fetchurl { - url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; - sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; + sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; }; }; - "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"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - }; - "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"; - }; - }; - "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"; - version = "7.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"; - sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95"; - }; - }; - "growl-1.9.2" = { - name = "growl"; - packageName = "growl"; - version = "1.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; - sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; - }; - }; - "json3-3.3.2" = { - name = "json3"; - packageName = "json3"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - }; - "lodash.create-3.1.1" = { - name = "lodash.create"; - packageName = "lodash.create"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz"; - sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7"; - }; - }; - "supports-color-3.1.2" = { - name = "supports-color"; - packageName = "supports-color"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; - 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"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; - "lodash._baseassign-3.2.0" = { - name = "lodash._baseassign"; - packageName = "lodash._baseassign"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; - sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; - }; - }; - "lodash._basecreate-3.0.3" = { - name = "lodash._basecreate"; - packageName = "lodash._basecreate"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz"; - sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821"; - }; - }; - "lodash._isiterateecall-3.0.9" = { - name = "lodash._isiterateecall"; - packageName = "lodash._isiterateecall"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; - sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; - }; - }; - "lodash._basecopy-3.0.1" = { - name = "lodash._basecopy"; - packageName = "lodash._basecopy"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; - sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; - }; - }; - "lodash.keys-3.1.2" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"; - sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; - }; - }; - "lodash._getnative-3.9.1" = { - name = "lodash._getnative"; - packageName = "lodash._getnative"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; - }; - }; - "lodash.isarguments-3.1.0" = { - name = "lodash.isarguments"; - packageName = "lodash.isarguments"; - version = "3.1.0"; + "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/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; }; }; - "lodash.isarray-3.0.4" = { - name = "lodash.isarray"; - packageName = "lodash.isarray"; - version = "3.0.4"; + "pbkdf2-3.0.14" = { + name = "pbkdf2"; + packageName = "pbkdf2"; + version = "3.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; - sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"; + sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; }; }; - "has-flag-1.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "1.0.0"; + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; }; }; "phantomjs-1.9.7-15" = { @@ -1993,58 +1813,31 @@ let sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b"; }; }; - "mocha-phantomjs-core-1.3.1" = { - name = "mocha-phantomjs-core"; - packageName = "mocha-phantomjs-core"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mocha-phantomjs-core/-/mocha-phantomjs-core-1.3.1.tgz"; - sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; - }; - }; - "adm-zip-0.2.1" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz"; - sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; - }; - }; - "kew-0.1.7" = { - name = "kew"; - packageName = "kew"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; - sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; - }; - }; - "ncp-0.4.2" = { - name = "ncp"; - packageName = "ncp"; - version = "0.4.2"; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; - sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; }; }; - "npmconf-0.0.24" = { - name = "npmconf"; - packageName = "npmconf"; - version = "0.0.24"; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz"; - sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c"; + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; - "mkdirp-0.3.5" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.5"; + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; }; }; "progress-1.1.8" = { @@ -2056,328 +1849,292 @@ let sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; - "request-2.36.0" = { - name = "request"; - packageName = "request"; - version = "2.36.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.36.0.tgz"; - sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; - }; - }; - "request-progress-0.3.1" = { - name = "request-progress"; - packageName = "request-progress"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"; - sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"; - }; - }; - "rimraf-2.2.8" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }; - }; - "which-1.0.9" = { - name = "which"; - packageName = "which"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz"; - sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; - }; - }; - "config-chain-1.1.11" = { - name = "config-chain"; - packageName = "config-chain"; - version = "1.1.11"; + "promise-7.3.1" = { + name = "promise"; + packageName = "promise"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; - sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; + sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy"; }; }; - "inherits-1.0.2" = { - name = "inherits"; - packageName = "inherits"; - version = "1.0.2"; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; - sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "once-1.1.1" = { - name = "once"; - packageName = "once"; - version = "1.1.1"; + "prr-1.0.1" = { + name = "prr"; + packageName = "prr"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz"; - sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; }; }; - "osenv-0.0.3" = { - name = "osenv"; - packageName = "osenv"; - version = "0.0.3"; + "public-encrypt-4.0.0" = { + name = "public-encrypt"; + packageName = "public-encrypt"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; - sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; + sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; }; }; - "nopt-2.2.1" = { - name = "nopt"; - packageName = "nopt"; - version = "2.2.1"; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; - sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; }; }; - "semver-1.1.4" = { - name = "semver"; - packageName = "semver"; - version = "1.1.4"; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; - sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; - "ini-1.1.0" = { - name = "ini"; - packageName = "ini"; - version = "1.1.0"; + "qs-0.6.6" = { + name = "qs"; + packageName = "qs"; + version = "0.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; - sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; + url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; }; }; - "proto-list-1.2.4" = { - name = "proto-list"; - packageName = "proto-list"; - version = "1.2.4"; + "qs-6.4.0" = { + name = "qs"; + packageName = "qs"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; }; }; - "ini-1.3.4" = { - name = "ini"; - packageName = "ini"; - version = "1.3.4"; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; - sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; }; }; - "abbrev-1.1.0" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.0"; + "querystring-es3-0.2.1" = { + name = "querystring-es3"; + packageName = "querystring-es3"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"; - sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f"; + url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "qs-0.6.6" = { - name = "qs"; - packageName = "qs"; - version = "0.6.6"; + "randombytes-2.0.6" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; - sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; + sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; }; }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; + "randomfill-1.0.4" = { + name = "randomfill"; + packageName = "randomfill"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; + sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; }; }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; + "read-only-stream-2.0.0" = { + name = "read-only-stream"; + packageName = "read-only-stream"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz"; + sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; }; }; - "node-uuid-1.4.8" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.8"; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; - sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; }; }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; - "tunnel-agent-0.4.3" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.4.3"; + "readable-stream-2.3.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz"; + sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl"; }; }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "oauth-sign-0.3.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.3.0"; + "request-2.36.0" = { + name = "request"; + packageName = "request"; + version = "2.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + url = "https://registry.npmjs.org/request/-/request-2.36.0.tgz"; + sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; }; }; - "hawk-1.0.0" = { - name = "hawk"; - packageName = "hawk"; - version = "1.0.0"; + "request-2.81.0" = { + name = "request"; + packageName = "request"; + version = "2.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; - sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; + "request-progress-0.3.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + url = "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"; + sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"; }; }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; + "resolve-1.5.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; + sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; }; }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; + "rimraf-2.2.8" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; + "ripemd160-2.0.1" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"; + sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; }; - }; - "asn1-0.1.11" = { - name = "asn1"; - packageName = "asn1"; - version = "0.1.11"; + }; + "safe-buffer-5.1.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; }; }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; + "samsam-1.3.0" = { + name = "samsam"; + packageName = "samsam"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + url = "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz"; + sha512 = "1p5ac86nbwsyxsaqbfa288xk904a0lfc8fph9h2nflvgmz5ilwyprs12lb6as5n6k8q24y541sr4bvv7dy3pl1d2nnm6lpw7xh0hz6l"; }; }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; + "semver-1.1.4" = { + name = "semver"; + packageName = "semver"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + url = "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; + sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; }; }; - "boom-0.4.2" = { - name = "boom"; - packageName = "boom"; - version = "0.4.2"; + "sha.js-2.4.10" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz"; + sha512 = "2lfna0mg4mzdki4p3q29rsgywbghvy6f6jy6b61zj68d2d936wfqjgqpsdjchfcqkiim53qknpcnq9iiafyidfrw154qf75a2n2cz5y"; }; }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; + "shasum-1.0.2" = { + name = "shasum"; + packageName = "shasum"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; + sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; }; }; - "sntp-0.2.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.2.4"; + "shell-quote-1.6.1" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; + sha1 = "f4781949cce402697127430ea3b3c5476f481767"; }; }; - "throttleit-0.0.2" = { - name = "throttleit"; - packageName = "throttleit"; - version = "0.0.2"; + "shelljs-0.3.0" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"; - sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; + sha1 = "3596e6307a781544f591f37da618360f31db57b1"; }; }; - "should-equal-1.0.1" = { + "should-equal-2.0.0" = { name = "should-equal"; packageName = "should-equal"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/should-equal/-/should-equal-1.0.1.tgz"; - sha1 = "0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7"; + url = "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz"; + sha512 = "16cp397231rnlk9vc4i8jggycqwxpgrn3pm9l2bf5y02ln4gawz41z2ycqnw9h1rkm7x8zf5qy5d7jv7ll0c634p62fpxfar96gmzb4"; }; }; "should-format-3.0.3" = { @@ -2398,13 +2155,13 @@ let sha1 = "0756d8ce846dfd09843a6947719dfa0d4cff5cf3"; }; }; - "should-type-adaptors-1.0.1" = { + "should-type-adaptors-1.1.0" = { name = "should-type-adaptors"; packageName = "should-type-adaptors"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.1.tgz"; - sha1 = "efe5553cdf68cff66e5c5f51b712dc351c77beaa"; + url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz"; + sha512 = "1y2b2dwphk185za2spffsr383na1pdjl2bf8lwv6yzaix1q9px92brp5i0m670kz5lb9kdlxkp61vq53v7mcxjadhgfjdz7h9v223i4"; }; }; "should-util-1.0.0" = { @@ -2416,58 +2173,157 @@ let sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063"; }; }; - "diff-3.2.0" = { - name = "diff"; - packageName = "diff"; - version = "3.2.0"; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; - sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; }; }; - "formatio-1.2.0" = { - name = "formatio"; - packageName = "formatio"; - version = "1.2.0"; + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz"; - sha1 = "f3b2167d9068c4698a8d51f4f760a39a54d818eb"; + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "lolex-1.6.0" = { - name = "lolex"; - packageName = "lolex"; - version = "1.6.0"; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz"; - sha1 = "3a9a0283452a47d7439e72731b9e07d7386e49f6"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; }; }; - "native-promise-only-0.8.1" = { - name = "native-promise-only"; - packageName = "native-promise-only"; - version = "0.8.1"; + "sshpk-1.14.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; - sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; }; }; - "path-to-regexp-1.7.0" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "1.7.0"; + "stream-browserify-2.0.1" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; - sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; + sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "samsam-1.2.1" = { - name = "samsam"; - packageName = "samsam"; - version = "1.2.1"; + "stream-combiner2-1.1.1" = { + name = "stream-combiner2"; + packageName = "stream-combiner2"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + }; + }; + "stream-http-2.8.0" = { + name = "stream-http"; + packageName = "stream-http"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz"; - sha1 = "edd39093a3184370cb859243b2bdf255e7d8ea67"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz"; + sha512 = "2ghzil78wsr29z8p1883i0vwx9gpsspha4wvdbpvqzbknrfiavwis010i5a7vy0xx8n486f6kwmjxsk3mg1w4bjy4whvizriz28b4xi"; + }; + }; + "stream-splicer-2.0.0" = { + name = "stream-splicer"; + packageName = "stream-splicer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"; + sha1 = "1b63be438a133e4b671cc1935197600175910d83"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "string_decoder-1.0.3" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; + }; + }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; + "strip-json-comments-1.0.4" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; + sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + }; + }; + "subarg-1.0.0" = { + name = "subarg"; + packageName = "subarg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; + sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; + }; + }; + "supports-color-4.4.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; + sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + }; + }; + "supports-color-5.3.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; + sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; + }; + }; + "syntax-error-1.4.0" = { + name = "syntax-error"; + packageName = "syntax-error"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz"; + sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0"; }; }; "text-encoding-0.6.4" = { @@ -2479,157 +2335,202 @@ let sha1 = "e399a982257a276dae428bb92845cb71bdc26d19"; }; }; - "type-detect-4.0.0" = { - name = "type-detect"; - packageName = "type-detect"; - version = "4.0.0"; + "throttleit-0.0.2" = { + name = "throttleit"; + packageName = "throttleit"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.0.tgz"; - sha1 = "62053883542a321f2f7b25746dc696478b18ff6b"; + url = "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"; + sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"; }; }; - "cli-1.0.1" = { - name = "cli"; - packageName = "cli"; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "through2-2.0.3" = { + name = "through2"; + packageName = "through2"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; + sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + }; + }; + "timers-browserify-1.4.2" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"; + sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; + }; + }; + "to-arraybuffer-1.0.1" = { + name = "to-arraybuffer"; + packageName = "to-arraybuffer"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz"; - sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; + url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; }; }; - "exit-0.1.2" = { - name = "exit"; - packageName = "exit"; - version = "0.1.2"; + "tough-cookie-2.3.4" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; + }; + }; + "tty-browserify-0.0.1" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz"; + sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b"; + }; + }; + "tunnel-agent-0.4.3" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; - sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; + sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "htmlparser2-3.8.3" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.8.3"; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; - sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; - "shelljs-0.3.0" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.3.0"; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; - sha1 = "3596e6307a781544f591f37da618360f31db57b1"; + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "strip-json-comments-1.0.4" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "1.0.4"; + "type-detect-4.0.8" = { + name = "type-detect"; + packageName = "type-detect"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; - sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; + sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni"; }; }; - "lodash-3.7.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.7.0"; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; - sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "domhandler-2.3.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.3.0"; + "umd-3.0.2" = { + name = "umd"; + packageName = "umd"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; - sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; + url = "https://registry.npmjs.org/umd/-/umd-3.0.2.tgz"; + sha512 = "0wgy2hbi34ncj74m0vw30yjcrw0wg3m465r28y458kvvkp7lsmm3klki0f79slyspfnr4c3l0qzcmpggcybk4d6lcb05kh0aj5c2rx6"; }; }; - "domutils-1.5.1" = { - name = "domutils"; - packageName = "domutils"; - version = "1.5.1"; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; - "domelementtype-1.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.0"; + "util-0.10.3" = { + name = "util"; + packageName = "util"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; }; }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "entities-1.0.0" = { - name = "entities"; - packageName = "entities"; - version = "1.0.0"; + "uuid-3.2.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; - sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; + sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; }; }; - "dom-serializer-0.1.0" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "0.1.0"; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "domelementtype-1.1.3" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.1.3"; + "vm-browserify-0.0.4" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; + sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; }; }; - "entities-1.1.1" = { - name = "entities"; - packageName = "entities"; - version = "1.1.1"; + "which-1.0.9" = { + name = "which"; + packageName = "which"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz"; + sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; }; }; - "interpret-1.0.2" = { - name = "interpret"; - packageName = "interpret"; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz"; - sha1 = "f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"; + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "rechoir-0.6.2" = { - name = "rechoir"; - packageName = "rechoir"; - version = "0.6.2"; + "xtend-4.0.1" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; - sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; }; @@ -2638,341 +2539,185 @@ in marked = nodeEnv.buildNodePackage { name = "marked"; packageName = "marked"; - version = "0.3.6"; + version = "0.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz"; - sha1 = "b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"; + url = "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz"; + sha512 = "2cw4hwy4hyxspppby5ww0sljhyg0nhlgy0aamqvf7nrhg4vyrgyp8ah52pz99rr8pvsjk3h9z9q8fhrlqaixw5kgk2si5yrr0v9n0pq"; }; buildInputs = globalBuildInputs; meta = { description = "A markdown parser built for speed"; - homepage = https://github.com/chjj/marked; + homepage = https://github.com/markedjs/marked; license = "MIT"; }; production = true; + bypassCache = false; }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.1.0"; + version = "16.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; - sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; + url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz"; + sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9"; }; dependencies = [ - (sources."JSONStream-1.3.1" // { - dependencies = [ - sources."jsonparse-1.3.0" - sources."through-2.3.8" - ]; - }) + sources."JSONStream-1.3.2" + sources."acorn-4.0.13" + sources."acorn-node-1.3.0" + sources."array-filter-0.0.1" + sources."array-map-0.0.0" + sources."array-reduce-0.0.0" + sources."asn1.js-4.10.1" sources."assert-1.4.1" - (sources."browser-pack-6.0.2" // { - dependencies = [ - (sources."combine-source-map-0.7.2" // { - dependencies = [ - sources."convert-source-map-1.1.3" - sources."inline-source-map-0.6.2" - sources."lodash.memoize-3.0.4" - sources."source-map-0.5.6" - ]; - }) - sources."umd-3.0.1" - ]; - }) + sources."astw-2.2.0" + sources."balanced-match-1.0.0" + sources."base64-js-1.2.3" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.11" + sources."brorand-1.1.0" + sources."browser-pack-6.0.4" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" ]; }) - (sources."browserify-zlib-0.1.4" // { - dependencies = [ - sources."pako-0.2.9" - ]; - }) - (sources."buffer-5.0.5" // { - dependencies = [ - sources."base64-js-1.2.0" - sources."ieee754-1.1.8" - ]; - }) + sources."browserify-aes-1.1.1" + sources."browserify-cipher-1.0.0" + sources."browserify-des-1.0.0" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."buffer-5.1.0" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - (sources."console-browserify-1.1.0" // { - dependencies = [ - sources."date-now-0.1.4" - ]; - }) + sources."cipher-base-1.0.4" + sources."combine-source-map-0.8.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.1" + sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - (sources."crypto-browserify-3.11.0" // { + sources."convert-source-map-1.1.3" + sources."core-util-is-1.0.2" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" + (sources."crypto-browserify-3.12.0" // { dependencies = [ - (sources."browserify-cipher-1.0.0" // { - dependencies = [ - (sources."browserify-aes-1.0.6" // { - dependencies = [ - sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" - ]; - }) - (sources."browserify-des-1.0.0" // { - dependencies = [ - sources."cipher-base-1.0.3" - (sources."des.js-1.0.0" // { - dependencies = [ - sources."minimalistic-assert-1.0.0" - ]; - }) - ]; - }) - sources."evp_bytestokey-1.0.0" - ]; - }) - (sources."browserify-sign-4.0.4" // { - dependencies = [ - sources."bn.js-4.11.6" - sources."browserify-rsa-4.0.1" - (sources."elliptic-6.4.0" // { - dependencies = [ - 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.1.0" // { - dependencies = [ - (sources."asn1.js-4.9.1" // { - dependencies = [ - sources."minimalistic-assert-1.0.0" - ]; - }) - (sources."browserify-aes-1.0.6" // { - dependencies = [ - sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" - ]; - }) - sources."evp_bytestokey-1.0.0" - ]; - }) - ]; - }) - (sources."create-ecdh-4.0.0" // { - dependencies = [ - sources."bn.js-4.11.6" - (sources."elliptic-6.4.0" // { - dependencies = [ - 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."create-hash-1.1.2" // { - dependencies = [ - sources."cipher-base-1.0.3" - sources."ripemd160-1.0.1" - sources."sha.js-2.4.8" - ]; - }) - sources."create-hmac-1.1.4" - (sources."diffie-hellman-5.0.2" // { - dependencies = [ - sources."bn.js-4.11.6" - (sources."miller-rabin-4.0.0" // { - dependencies = [ - sources."brorand-1.1.0" - ]; - }) - ]; - }) - sources."pbkdf2-3.0.9" - (sources."public-encrypt-4.0.0" // { - dependencies = [ - sources."bn.js-4.11.6" - sources."browserify-rsa-4.0.1" - (sources."parse-asn1-5.1.0" // { - dependencies = [ - (sources."asn1.js-4.9.1" // { - dependencies = [ - sources."minimalistic-assert-1.0.0" - ]; - }) - (sources."browserify-aes-1.0.6" // { - dependencies = [ - sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" - ]; - }) - sources."evp_bytestokey-1.0.0" - ]; - }) - ]; - }) - sources."randombytes-2.0.3" + sources."hash-base-2.0.2" ]; }) + sources."date-now-0.1.4" sources."defined-1.0.0" sources."deps-sort-2.0.0" - sources."domain-browser-1.1.7" + sources."des.js-1.0.0" + sources."detective-5.1.0" + sources."diffie-hellman-5.0.2" + sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."events-1.1.1" - (sources."glob-7.1.1" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (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."has-1.0.1" // { - dependencies = [ - sources."function-bind-1.1.0" - ]; - }) + sources."elliptic-6.4.0" + sources."events-2.0.0" + sources."evp_bytestokey-1.0.3" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."glob-7.1.2" + sources."has-1.0.1" + sources."hash-base-3.0.4" + sources."hash.js-1.1.3" + sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" - sources."https-browserify-0.0.1" + sources."https-browserify-1.0.0" + sources."ieee754-1.1.8" + sources."indexof-0.0.1" + sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."insert-module-globals-7.0.1" // { + sources."inline-source-map-0.6.2" + (sources."insert-module-globals-7.0.2" // { dependencies = [ - (sources."combine-source-map-0.7.2" // { - dependencies = [ - sources."convert-source-map-1.1.3" - sources."inline-source-map-0.6.2" - sources."lodash.memoize-3.0.4" - sources."source-map-0.5.6" - ]; - }) - sources."is-buffer-1.1.5" - (sources."lexical-scope-1.2.0" // { - dependencies = [ - (sources."astw-2.2.0" // { - dependencies = [ - sources."acorn-4.0.11" - ]; - }) - ]; - }) + sources."combine-source-map-0.7.2" + sources."concat-stream-1.5.2" + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" ]; }) + sources."is-buffer-1.1.6" + sources."isarray-1.0.0" + sources."json-stable-stringify-0.0.1" + sources."jsonify-0.0.0" + sources."jsonparse-1.3.1" (sources."labeled-stream-splicer-2.0.0" // { dependencies = [ sources."isarray-0.0.1" - sources."stream-splicer-2.0.0" - ]; - }) - (sources."module-deps-4.1.1" // { - dependencies = [ - (sources."detective-4.5.0" // { - dependencies = [ - sources."acorn-4.0.11" - ]; - }) - sources."stream-combiner2-1.1.1" ]; }) - sources."os-browserify-0.1.2" - (sources."parents-1.0.1" // { + sources."lexical-scope-1.2.0" + sources."lodash.memoize-3.0.4" + sources."md5.js-1.3.4" + sources."miller-rabin-4.0.1" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + (sources."module-deps-6.0.0" // { dependencies = [ - sources."path-platform-0.11.15" + sources."acorn-5.5.3" + sources."minimist-1.2.0" ]; }) + sources."once-1.4.0" + sources."os-browserify-0.3.0" + sources."pako-1.0.6" + sources."parents-1.0.1" + sources."parse-asn1-5.1.0" sources."path-browserify-0.0.0" - sources."process-0.11.9" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.5" + sources."path-platform-0.11.15" + sources."pbkdf2-3.0.14" + sources."process-0.11.10" + sources."process-nextick-args-1.0.7" + sources."public-encrypt-4.0.0" sources."punycode-1.4.1" + sources."querystring-0.2.0" sources."querystring-es3-0.2.1" + sources."randombytes-2.0.6" + sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.6" // { - 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."util-deprecate-1.0.2" - ]; - }) - (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" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - sources."sha.js-2.4.8" - ]; - }) - (sources."shell-quote-1.6.1" // { + (sources."readable-stream-2.3.5" // { dependencies = [ - sources."jsonify-0.0.0" - sources."array-filter-0.0.1" - sources."array-reduce-0.0.0" - sources."array-map-0.0.0" + sources."process-nextick-args-2.0.0" ]; }) + sources."resolve-1.5.0" + sources."ripemd160-2.0.1" + sources."safe-buffer-5.1.1" + sources."sha.js-2.4.10" + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + sources."source-map-0.5.7" sources."stream-browserify-2.0.1" - (sources."stream-http-2.6.3" // { - dependencies = [ - sources."builtin-status-codes-3.0.0" - sources."to-arraybuffer-1.0.1" - ]; - }) - sources."string_decoder-0.10.31" + sources."stream-combiner2-1.1.1" + sources."stream-http-2.8.0" + sources."stream-splicer-2.0.0" + sources."string_decoder-1.0.3" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) - (sources."syntax-error-1.3.0" // { - dependencies = [ - sources."acorn-4.0.11" - ]; - }) + sources."syntax-error-1.4.0" + sources."through-2.3.8" sources."through2-2.0.3" sources."timers-browserify-1.4.2" - sources."tty-browserify-0.0.0" + sources."to-arraybuffer-1.0.1" + sources."tty-browserify-0.0.1" + sources."typedarray-0.0.6" + sources."umd-3.0.2" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" - sources."querystring-0.2.0" ]; }) (sources."util-0.10.3" // { @@ -2980,75 +2725,31 @@ in sources."inherits-2.0.1" ]; }) - (sources."vm-browserify-0.0.4" // { - dependencies = [ - sources."indexof-0.0.1" - ]; - }) + sources."util-deprecate-1.0.2" + sources."vm-browserify-0.0.4" + sources."wrappy-1.0.2" sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; - homepage = "https://github.com/substack/node-browserify#readme"; + homepage = "https://github.com/browserify/browserify#readme"; license = "MIT"; }; production = true; + bypassCache = false; }; uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.20"; + version = "3.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz"; + sha512 = "0b7d9nvyrhc5ij0xaxvgha7h97d5h36zhnwmbbbj5abk64bvn38sf4d5jwy64n8algm2q36a08n0z4k4khhnnq4h4ysvrin0lyib3rr"; }; 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."commander-2.14.1" + sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; meta = { @@ -3057,123 +2758,85 @@ in license = "BSD-2-Clause"; }; production = true; + bypassCache = false; }; less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "2.7.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-2.7.2.tgz"; - sha1 = "368d6cc73e1fb03981183280918743c5dcf9b3df"; + url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz"; + sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59"; }; dependencies = [ - (sources."errno-0.1.4" // { - dependencies = [ - sources."prr-0.0.0" - ]; - }) + sources."ajv-4.11.8" + sources."asap-2.0.6" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.6.0" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-2.10.1" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."combined-stream-1.0.6" + sources."core-util-is-1.0.2" + sources."cryptiles-2.0.5" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."errno-0.1.7" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."getpass-0.1.7" sources."graceful-fs-4.1.11" - sources."image-size-0.5.1" - sources."mime-1.3.4" - (sources."mkdirp-0.5.1" // { + sources."har-schema-1.0.5" + sources."har-validator-4.2.1" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" + sources."image-size-0.5.5" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonify-0.0.0" + (sources."jsprim-1.4.1" // { dependencies = [ - sources."minimist-0.0.8" + sources."assert-plus-1.0.0" ]; }) - (sources."promise-7.1.1" // { - dependencies = [ - sources."asap-2.0.5" - ]; - }) - sources."source-map-0.5.6" - (sources."request-2.81.0" // { + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."promise-7.3.1" + sources."prr-1.0.1" + sources."punycode-1.4.1" + sources."qs-6.4.0" + sources."request-2.81.0" + sources."safe-buffer-5.1.1" + sources."sntp-1.0.9" + sources."source-map-0.5.7" + (sources."sshpk-1.14.1" // { dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.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-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.5" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (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.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.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.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.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - sources."oauth-sign-0.8.2" - 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.6.0" - sources."uuid-3.0.1" + sources."assert-plus-1.0.0" ]; }) + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uuid-3.2.1" + sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -3182,86 +2845,40 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "3.2.0"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz"; - sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz"; + sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww"; }; dependencies = [ - sources."browser-stdout-1.3.0" - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - sources."diff-1.4.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."browser-stdout-1.3.1" + sources."commander-2.11.0" + sources."concat-map-0.0.1" + sources."debug-3.1.0" + sources."diff-3.5.0" sources."escape-string-regexp-1.0.5" - (sources."glob-7.0.5" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (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."growl-1.9.2" - sources."json3-3.3.2" - (sources."lodash.create-3.1.1" // { - dependencies = [ - (sources."lodash._baseassign-3.2.0" // { - dependencies = [ - sources."lodash._basecopy-3.0.1" - (sources."lodash.keys-3.1.2" // { - dependencies = [ - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - ]; - }) - ]; - }) - sources."lodash._basecreate-3.0.3" - sources."lodash._isiterateecall-3.0.9" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."supports-color-3.1.2" // { - dependencies = [ - sources."has-flag-1.0.0" - ]; - }) + sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."growl-1.10.3" + sources."has-flag-2.0.0" + sources."he-1.1.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."supports-color-4.4.0" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -3270,6 +2887,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; mocha-phantomjs = nodeEnv.buildNodePackage { name = "mocha-phantomjs"; @@ -3280,90 +2898,56 @@ in sha1 = "c75e16612e1a6af0ad8d281e3a2fef49d55e505b"; }; dependencies = [ - (sources."phantomjs-1.9.7-15" // { + sources."abbrev-1.1.1" + sources."adm-zip-0.2.1" + sources."asn1-0.1.11" + sources."assert-plus-0.1.5" + sources."async-0.9.2" + sources."aws-sign2-0.5.0" + sources."boom-0.4.2" + sources."combined-stream-0.0.7" + sources."commander-2.15.0" + (sources."config-chain-1.1.11" // { dependencies = [ - sources."adm-zip-0.2.1" - sources."kew-0.1.7" - sources."ncp-0.4.2" - (sources."npmconf-0.0.24" // { - dependencies = [ - (sources."config-chain-1.1.11" // { - dependencies = [ - sources."proto-list-1.2.4" - sources."ini-1.3.4" - ]; - }) - sources."inherits-1.0.2" - sources."once-1.1.1" - sources."osenv-0.0.3" - (sources."nopt-2.2.1" // { - dependencies = [ - sources."abbrev-1.1.0" - ]; - }) - sources."semver-1.1.4" - sources."ini-1.1.0" - ]; - }) - sources."mkdirp-0.3.5" - sources."progress-1.1.8" - (sources."request-2.36.0" // { - dependencies = [ - sources."qs-0.6.6" - sources."json-stringify-safe-5.0.1" - sources."mime-1.2.11" - sources."forever-agent-0.5.2" - sources."node-uuid-1.4.8" - (sources."tough-cookie-2.3.2" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - (sources."form-data-0.1.4" // { - dependencies = [ - (sources."combined-stream-0.0.7" // { - dependencies = [ - sources."delayed-stream-0.0.5" - ]; - }) - sources."async-0.9.2" - ]; - }) - sources."tunnel-agent-0.4.3" - (sources."http-signature-0.10.1" // { - dependencies = [ - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - ]; - }) - sources."oauth-sign-0.3.0" - (sources."hawk-1.0.0" // { - dependencies = [ - sources."hoek-0.9.1" - sources."boom-0.4.2" - sources."cryptiles-0.2.2" - sources."sntp-0.2.4" - ]; - }) - sources."aws-sign2-0.5.0" - ]; - }) - (sources."request-progress-0.3.1" // { - dependencies = [ - sources."throttleit-0.0.2" - ]; - }) - sources."rimraf-2.2.8" - sources."which-1.0.9" + sources."ini-1.3.5" ]; }) + sources."cryptiles-0.2.2" + sources."ctype-0.5.3" + sources."delayed-stream-0.0.5" + sources."forever-agent-0.5.2" + sources."form-data-0.1.4" + sources."hawk-1.0.0" + sources."hoek-0.9.1" + sources."http-signature-0.10.1" + sources."inherits-1.0.2" + sources."ini-1.1.0" + sources."json-stringify-safe-5.0.1" + sources."kew-0.1.7" + sources."mime-1.2.11" + sources."mkdirp-0.3.5" sources."mocha-phantomjs-core-1.3.1" - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) + sources."ncp-0.4.2" + sources."node-uuid-1.4.8" + sources."nopt-2.2.1" + sources."npmconf-0.0.24" + sources."oauth-sign-0.3.0" + sources."once-1.1.1" + sources."osenv-0.0.3" + sources."phantomjs-1.9.7-15" + sources."progress-1.1.8" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-0.6.6" + sources."request-2.36.0" + sources."request-progress-0.3.1" + sources."rimraf-2.2.8" + sources."semver-1.1.4" + sources."sntp-0.2.4" + sources."throttleit-0.0.2" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.4.3" + sources."which-1.0.9" ]; buildInputs = globalBuildInputs; meta = { @@ -3371,20 +2955,21 @@ in homepage = "https://github.com/nathanboktae/mocha-phantomjs#readme"; }; production = true; + bypassCache = false; }; should = nodeEnv.buildNodePackage { name = "should"; packageName = "should"; - version = "11.2.1"; + version = "13.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/should/-/should-11.2.1.tgz"; - sha1 = "90f55145552d01cfc200666e4e818a1c9670eda2"; + url = "https://registry.npmjs.org/should/-/should-13.2.1.tgz"; + sha512 = "21w1m96rk6ljlx72mlkyg4ix3bg2s4s461fpwi1i6shz7fvl6kfmyqgmij3374iq187a4qfhn7vsc0zs7qw1i61nqn3gy0f8g0cvvwp"; }; dependencies = [ - sources."should-equal-1.0.1" + sources."should-equal-2.0.0" sources."should-format-3.0.3" sources."should-type-1.4.0" - sources."should-type-adaptors-1.0.1" + sources."should-type-adaptors-1.1.0" sources."should-util-1.0.0" ]; buildInputs = globalBuildInputs; @@ -3394,28 +2979,30 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "2.1.0"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-2.1.0.tgz"; - sha1 = "e057a9d2bf1b32f5d6dd62628ca9ee3961b0cafb"; + url = "https://registry.npmjs.org/sinon/-/sinon-4.4.4.tgz"; + sha512 = "2wny4iakvr5mfcbgka4hb99893a7v00ygavndsavqpvijidhigwg9iqq9w225vgb741z0waxn4fdi2ndzp83dk2dja2fkj10kglb6q3"; }; dependencies = [ - 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."isarray-0.0.1" - ]; - }) - sources."samsam-1.2.1" + sources."@sinonjs/formatio-2.0.0" + sources."diff-3.5.0" + sources."has-flag-3.0.0" + sources."isarray-0.0.1" + sources."just-extend-1.1.27" + sources."lodash.get-4.4.2" + sources."lolex-2.3.2" + sources."nise-1.3.0" + sources."path-to-regexp-1.7.0" + sources."samsam-1.3.0" + sources."supports-color-5.3.0" sources."text-encoding-0.6.4" - sources."type-detect-4.0.0" + sources."type-detect-4.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -3424,81 +3011,53 @@ in license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; 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."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."cli-1.0.1" + sources."concat-map-0.0.1" + sources."console-browserify-1.1.0" + sources."core-util-is-1.0.2" + sources."date-now-0.1.4" + (sources."dom-serializer-0.1.0" // { dependencies = [ - (sources."glob-7.1.1" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) + sources."domelementtype-1.1.3" ]; }) - (sources."console-browserify-1.1.0" // { + sources."domelementtype-1.3.0" + sources."domhandler-2.3.0" + (sources."domutils-1.5.1" // { dependencies = [ - sources."date-now-0.1.4" + sources."entities-1.1.1" ]; }) + sources."entities-1.0.0" sources."exit-0.1.2" - (sources."htmlparser2-3.8.3" // { - dependencies = [ - sources."domhandler-2.3.0" - (sources."domutils-1.5.1" // { - dependencies = [ - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - sources."entities-1.1.1" - ]; - }) - ]; - }) - sources."domelementtype-1.3.0" - (sources."readable-stream-1.1.14" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."inherits-2.0.3" - ]; - }) - sources."entities-1.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."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."htmlparser2-3.8.3" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."isarray-0.0.1" + sources."lodash-3.7.0" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."readable-stream-1.1.14" sources."shelljs-0.3.0" + sources."string_decoder-0.10.31" sources."strip-json-comments-1.0.4" - sources."lodash-3.7.0" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -3507,60 +3066,40 @@ in license = "(MIT AND JSON)"; }; production = true; + bypassCache = false; }; shelljs = nodeEnv.buildNodePackage { name = "shelljs"; packageName = "shelljs"; - version = "0.7.7"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; - sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz"; + sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0"; }; dependencies = [ - (sources."glob-7.1.1" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (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."interpret-1.0.2" - (sources."rechoir-0.6.2" // { - dependencies = [ - (sources."resolve-1.3.2" // { - dependencies = [ - sources."path-parse-1.0.5" - ]; - }) - ]; - }) + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."interpret-1.1.0" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.5" + sources."rechoir-0.6.2" + sources."resolve-1.5.0" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { description = "Portable Unix shell commands for Node.js"; - homepage = https://github.com/shelljs/shelljs; + homepage = http://github.com/shelljs/shelljs; license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; } \ No newline at end of file diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 751638e02da8cc38f324f6646bcfe2884d9e42ce..186302f2715a3910598133bfdd3cd9214513b864 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -1,13 +1,14 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ../../node-packages/node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index ad11542f04b0604c59d332c08dcce651b7f5e87c..266217d94e24c45a656c410d86f79109de2cd1bf 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -1,29 +1,24 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python, glib, vala_0_28, ctpl +{ stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { name = "valum-${version}"; - version = "0.2.16"; + version = "0.3.15"; src = fetchFromGitHub { owner = "valum-framework"; repo = "valum"; rev = "v${version}"; - sha256 = "0ca067gg5z1798bazwzgg2yd2mbysvk8i2q2v3i8d0d188y2hj84"; + sha256 = "1wk23aq5lxsqns58s4g9jrwx6wrk7k9hq9rg8jcs42rxn2pckaxw"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python glib vala_0_28 ctpl libgee libsoup fcgi ]; - - configurePhase = ''python waf configure --prefix=$out''; - - buildPhase = ''python waf build''; - - installPhase = ''python waf install''; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; meta = with stdenv.lib; { homepage = https://github.com/valum-framework/valum; description = "Web micro-framework written in Vala"; + license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1142c1e006b766e352fbc286e22ffdb3f0cd9ebe --- /dev/null +++ b/pkgs/development/web/woff2/default.nix @@ -0,0 +1,32 @@ +{ brotli, cmake, fetchFromGitHub, stdenv }: + +stdenv.mkDerivation rec { + name = "woff2-${version}"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "google"; + repo = "woff2"; + rev = "v${version}"; + sha256 = "13l4g536h0pr84ww4wxs2za439s0xp1va55g6l478rfbb1spp44y"; + }; + + outputs = [ "out" "dev" "lib" ]; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = [ brotli ]; + + # without this binaries only get built if shared libs are disable + patchPhase = '' + sed 's@^if (NOT BUILD_SHARED_LIBS)$@if (TRUE)@g' -i CMakeLists.txt + ''; + + meta = with stdenv.lib; { + description = "Webfont compression reference code"; + homepage = https://github.com/google/woff2; + license = licenses.mit; + maintainers = [ maintainers.hrdinka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index a056f5880a4c59e08005725ada89f28469007bb0..4d5a4fe8379c11977e18a678d980a6b6baea591b 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,7 +1,7 @@ { stdenv, lib, callPackage, perl, fetchurl, python2 , pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc -, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2 +, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL, SDL2 , gloox, nvidia-texture-tools , withEditor ? true, wxGTK ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ spidermonkey_38 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet miniupnpc openal - mesa xproto libX11 libXcursor nspr SDL2 gloox + libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox nvidia-texture-tools ] ++ lib.optional withEditor wxGTK; diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix index 30e930c294a6edf7338b490590d2d329183e062a..5d91bc04114bd6c3e38fd0a16d68428f8ed4136c 100644 --- a/pkgs/games/2048-in-terminal/default.nix +++ b/pkgs/games/2048-in-terminal/default.nix @@ -2,29 +2,32 @@ stdenv.mkDerivation rec { name = "2048-in-terminal-${version}"; - version = "2015-01-15"; + version = "2017-11-29"; src = fetchFromGitHub { - sha256 = "1fdfmyhh60sz0xbilxkh2y09lvbcs9lamk2jkjkhxhlhxknmnfgs"; - rev = "3e4e44fd360dfe114e81e6332a5a058a4b287cb1"; + sha256 = "1cqv5z1i5zcrvj0w6pdfnnff8m6kjndqxwkwsw5ma9jz503bmyc6"; + rev = "4e525066b0ef3442e92d2ba8dd373bdc205ece28"; repo = "2048-in-terminal"; owner = "alewmoose"; }; buildInputs = [ ncurses ]; + prePatch = '' + sed -i '1i#include \n' save.c + ''; + enableParallelBuilding = true; preInstall = '' mkdir -p $out/bin ''; - installFlags = [ "DESTDIR=$(out)" ]; + installFlags = [ "DESTDIR=$(out)/bin" ]; meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Animated console version of the 2048 game"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 016c965b6c0b1342547ff52d97f09400e7e95be3..fd575975fed555dd3379409ac9471a624b7d1001 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio +{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU_combined, alsaLib, libpulseaudio , xorg }: assert stdenv.system == "x86_64-linux"; @@ -7,7 +7,7 @@ let inherit (xorg) libXext libX11; lpath = "${stdenv.cc.cc.lib}/lib64:" + stdenv.lib.makeLibraryPath [ - zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio]; + zlib libmad libpng12 libcaca libXext libX11 libGLU_combined alsaLib libpulseaudio]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 0c95aa98894367ddbc9bdbf091a073b75b6421dc..1b23d1ccd6d20d37486338bc1424fc87f97d22ce 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg -, libvorbis, freetype, openal, mesa }: +, libvorbis, freetype, openal, libGLU_combined }: stdenv.mkDerivation rec { name = "alienarena-7.65"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjpeg libX11 curl libogg libvorbis - freetype openal mesa libXxf86vm ]; + freetype openal libGLU_combined libXxf86vm ]; patchPhase = '' substituteInPlace ./configure \ --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 \ - --replace libGL.so.1 ${mesa}/lib/libGL.so.1 + --replace libGL.so.1 ${libGLU_combined}/lib/libGL.so.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 4e5f85f7d5ae79241fdf3be0ef4e8e6495fbf5ba..491b20d9969089f9c7473e9ef875db6d9d5dbc30 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, mesa_glu, pkgconfig }: +{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, pkgconfig }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib expat freetype gtk2 libvorbis mesa_glu ]; + buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1/ diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 34b31cdf7ec81b686f1a7e669c7d9f58e4a58b21..317550059b455317e84ac1acaae2958b46e6b377 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: stdenv.mkDerivation rec { - version = "4.0.5"; + version = "4.1.2"; name = "angband-${version}"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "1l7ybqmsxpsijm7iqiqjpa7lhjafxml743q4crxn8wnwrbjzbi86"; + sha256 = "1n18i8ni154ym3d32zlbxcw0zz62h66iifr0h1yvvv2kp13p5zix"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 0208739706d7bc9c8bef15e344dc15df070bd58e..efc30c1bbf3c79b04e7811c4df10f67ab6def955 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -28,7 +28,7 @@ let qt4 = pyqt4.qt; in buildPythonApplication rec { - version = "2.0.47"; + version = "2.0.51"; name = "anki-${version}"; src = fetchurl { @@ -37,7 +37,7 @@ in buildPythonApplication rec { # "http://ankisrs.net/download/mirror/${name}.tgz" # "http://ankisrs.net/download/mirror/archive/${name}.tgz" ]; - sha256 = "067bsidqzy1zc301i2pk4biwp2kwvgk4kydp5z5s551acinkbdgv"; + sha256 = "17prfkz9hbz1sdb62ddi6m4jwsb50n08myhai997x8d0r0xxilw0"; }; propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ] diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 21f545100b3132ca605079382dd3f1c9a53d62da..5318108c49136080a2153bcaa87a9a4d02e0f809 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, mesa, zlib }: +{ stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU_combined, zlib }: let versionMajor = "0.2.8"; @@ -15,8 +15,10 @@ stdenv.mkDerivation { NIX_LDFLAGS = [ "-lSDL_image" ]; + enableParallelBuilding = true; + configureFlags = [ "--disable-etc" ]; - buildInputs = [ SDL SDL_image libxml2 libjpeg libpng mesa zlib ]; + buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU_combined zlib ]; meta = with stdenv.lib; { homepage = http://armagetronad.org; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index e6594adde5528bb0da872014d894f0b05f44c9c8..e000f743173b352f1eb0dc1f5d4449853bacd228 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, zlib, boost, - openal, glm, freetype, mesa, glew, SDL2, + openal, glm, freetype, libGLU_combined, glew, SDL2, dejavu_fonts, inkscape, optipng, imagemagick }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake zlib boost openal glm - freetype mesa glew SDL2 inkscape + freetype libGLU_combined glew SDL2 inkscape optipng imagemagick ]; diff --git a/pkgs/games/assaultcube/assaultcube-next.patch b/pkgs/games/assaultcube/assaultcube-next.patch new file mode 100644 index 0000000000000000000000000000000000000000..92fc7996670773ef3001066d52e9a01ec710be64 --- /dev/null +++ b/pkgs/games/assaultcube/assaultcube-next.patch @@ -0,0 +1,11 @@ +--- 1.1.0.4/source/src/Makefile ++++ 1.1.0.4/source/src/Makefile +@@ -6,7 +6,7 @@ + # found to have been caused by the g++ compiler in the past. This seems to have + # been fixed now by relaxing the optimization that g++ does, so although we'll + # continue using clang++ (just in case), you can use g++ if you prefer. +-CXX=clang++ ++#CXX=clang++ + + # Changing this to ACDEBUG=yes will compile a debug version of AssaultCube. + ACDEBUG=no diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cef48978b6d0f2c885a6e18f00c2f98573cfcf5b --- /dev/null +++ b/pkgs/games/assaultcube/default.nix @@ -0,0 +1,82 @@ +{ fetchFromGitHub, stdenv, makeDesktopItem, openal, pkgconfig, libogg, + libvorbis, SDL, SDL_image, makeWrapper, zlib, + client ? true, server ? true }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + + # master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix. + pname = "assaultcube"; + version = "01052017"; + name = "${pname}-${version}"; + + meta = { + description = "Fast and fun first-person-shooter based on the Cube fps"; + homepage = http://assault.cubers.net; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; # should work on darwin with a little effort. + license = stdenv.lib.licenses.zlib; + }; + + src = fetchFromGitHub { + owner = "assaultcube"; + repo = "AC"; + rev = "9f537b0876a39d7686e773040469fbb1417de18b"; + sha256 = "0nvckn67mmfaa7x3j41xyxjllxqzfx1dxg8pnqsaak3kkzds34pl"; + }; + + # ${branch} not accepted as a value ? + # TODO: write a functional BUNDLED_ENET option and restore it in deps. + patches = [ ./assaultcube-next.patch ]; + + nativeBuildInputs = [ pkgconfig ]; + + # add optional for server only ? + buildInputs = [ makeWrapper openal SDL SDL_image libogg libvorbis zlib ]; + + #makeFlags = [ "CXX=g++" ]; + + targets = (optionalString server "server") + (optionalString client " client"); + buildPhase = '' + make -C source/src ${targets} + ''; + + desktop = makeDesktopItem { + name = "AssaultCube"; + desktopName = "AssaultCube"; + comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay."; + genericName = "First-person shooter"; + categories = "Application;Game;ActionGame;Shooter"; + icon = "assaultcube.png"; + exec = "${pname}"; + }; + + gamedatadir = "/share/games/${pname}"; + + installPhase = '' + + bindir=$out/bin + + mkdir -p $bindir $out/$gamedatadir + + cp -r config packages $out/$gamedatadir + + # install custom script + substituteAll ${./launcher.sh} $bindir/assaultcube + chmod +x $bindir/assaultcube + + if (test -e source/src/ac_client) then + cp source/src/ac_client $bindir + mkdir -p $out/share/applications + cp ${desktop}/share/applications/* $out/share/applications + install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png + install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png + fi + + if (test -e source/src/ac_server) then + cp source/src/ac_server $bindir + ln -s $bindir/${pname} $bindir/${pname}-server + fi + ''; +} diff --git a/pkgs/games/assaultcube/launcher.sh b/pkgs/games/assaultcube/launcher.sh new file mode 100644 index 0000000000000000000000000000000000000000..331cb861f66cdfdd553bea2b12ea6d4291451567 --- /dev/null +++ b/pkgs/games/assaultcube/launcher.sh @@ -0,0 +1,20 @@ +#!@shell@ +# original scripts are very awful + +CUBE_DIR=@out@@gamedatadir@ + +case $(basename "$0") in + assaultcube-server) + CUBE_OPTIONS="-Cconfig/servercmdline.txt" + BINARYPATH=@out@/bin/ac_server + ;; + assaultcube) + CUBE_OPTIONS="--home=${HOME}/.assaultcube/v1.2next --init" + BINARYPATH=@out@/bin/ac_client + ;; + *) echo "$0" is not supported. + exit 1 +esac + +cd $CUBE_DIR +exec "${BINARYPATH}" ${CUBE_OPTIONS} "$@" diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 0a7218bba72cea8dd67a214feef5abec4ac960a5..737f31d6e105bbc8d424d0c49cac8f6ddf49d161 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, xlibsWrapper, mesa, SDL, openal, freealut, libogg, libvorbis }: +{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; }; - buildInputs = [ cmake xlibsWrapper mesa SDL openal freealut libogg libvorbis ]; + buildInputs = [ cmake xlibsWrapper libGLU_combined SDL openal freealut libogg libvorbis ]; buildPhase = '' cmake ./ diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 95d6365b99db60e6c2a801f5c0c2963e0db53421..94a1e6ee91ab633d31920bd8f1ac496979ecda77 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, lua, mesa }: +{ stdenv, fetchurl, SDL, lua, libGLU_combined }: stdenv.mkDerivation rec { name = "bitsnbots-20111230"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ln -s $out/share/${name}/bitsnbots $out/bin ''; - buildInputs = [ SDL lua mesa ]; + buildInputs = [ SDL lua libGLU_combined ]; meta = { description = "Simple puzzle game with moving robots"; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 42a1b19c4d7ad471a0940e3fbe6f03edff470b6d..4b874c954b0a2dda9592b422bf698f76d29ccf62 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, SDL, mesa, openal, libvorbis, freealut, SDL_image}: +{stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image}: stdenv.mkDerivation rec { name = "blackshades-svn-110"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lSDL_image"; - buildInputs = [ SDL SDL_image mesa openal libvorbis freealut ]; + buildInputs = [ SDL SDL_image libGLU_combined openal libvorbis freealut ]; patchPhase = '' sed -i -e s,Data/,$out/opt/$name/Data/,g \ diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index d7e2cf4894dd461eaa1218906df719b84bcd3286..2f503e02ec20da0db1a6d8ab440714b605795f06 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, SDL, mesa, openal, libvorbis, freealut, SDL_image, popt}: +{stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image, popt}: stdenv.mkDerivation rec { name = "blackshades-elite-svn-29"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lSDL_image"; NIX_CFLAGS_COMPILE = "-fpermissive"; - buildInputs = [ SDL SDL_image mesa openal libvorbis freealut popt ]; + buildInputs = [ SDL SDL_image libGLU_combined openal libvorbis freealut popt ]; patchPhase = '' sed -i -e s,Data/,$out/opt/$name/Data/,g \ diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 35f5699a231b6ab9433cb73ac008fdbfd179506d..35a2bfaed803fd03c72b04037d2316a15490af46 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL2, SDL2_image, mesa, cmake, physfs, boost, zip, zlib +{stdenv, fetchurl, SDL2, SDL2_image, libGLU_combined, cmake, physfs, boost, zip, zlib , pkgconfig, unzip}: stdenv.mkDerivation rec { version = "1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib + buildInputs = [SDL2 SDL2_image libGLU_combined cmake physfs boost zip zlib unzip]; preConfigure='' diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 3f490b2976c1905096b0061ba6369d068aaebfc7..8379e1aa7bb28d11d74a2d9c9b876aadee577fe1 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, scons, pkgconfig, SDL, mesa, zlib, smpeg +{ stdenv, fetchurl, fetchpatch, scons, pkgconfig, SDL, libGLU_combined, zlib, smpeg , SDL_image, libvorbis, expat, zip, lua5_1 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ scons pkgconfig ]; - buildInputs = [ SDL mesa zlib smpeg SDL_image libvorbis expat zip lua5_1 ]; + buildInputs = [ SDL libGLU_combined zlib smpeg SDL_image libvorbis expat zip lua5_1 ]; NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL"; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 1269b4346344bb69f9721961f82b458b17e6e60f..332e84402bb170ff56bf6fc66d447659d1b91dee 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -1,18 +1,18 @@ { stdenv, lib, fetchurl, pkgconfig -, curl, SDL2, mesa, glew, ncurses, c-ares }: +, curl, SDL2, libGLU_combined, glew, ncurses, c-ares }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bzflag"; - version = "2.4.10"; + version = "2.4.12"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; - sha256 = "1ylyd5safpraaym9fvnrqj2506dqrraaaqhrb2aa9zmjwi54aiqa"; + sha256 = "0380y47kgl97ld3dybjgjr2zwxqky8f938k9z7vad647cic3m8d8"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ curl SDL2 mesa glew ncurses c-ares ]; + buildInputs = [ curl SDL2 libGLU_combined glew ncurses c-ares ]; meta = with lib; { description = "Multiplayer 3D Tank game"; diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index b46114ec62bea8255914b9f531f79ad383ef1471..0de118234a7dc5bdc88270619223353e2e3cee8c 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -1,5 +1,6 @@ -{ fetchFromGitHub, stdenv, makeWrapper, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, -SDL2_mixer, freetype, gettext }: +{ fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, +SDL2_mixer, freetype, gettext, Cocoa, libicns, +tiles ? true }: stdenv.mkDerivation rec { version = "0.C"; @@ -12,25 +13,57 @@ stdenv.mkDerivation rec { sha256 = "03sdzsk4qdq99qckq0axbsvg1apn6xizscd8pwp5w6kq2fyj5xkv"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ libicns ]; - buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ]; + buildInputs = with stdenv.lib; [ ncurses lua gettext ] + ++ optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ] + ++ optionals (tiles && stdenv.isDarwin) [ Cocoa ]; + + patches = [ ./patches/fix_locale_dir.patch ]; postPatch = '' patchShebangs . - sed -i Makefile \ - -e 's,-Werror,,g' \ - -e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g' - - sed '1i#include ' \ - -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp ''; - makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1"; + makeFlags = with stdenv.lib; [ + "PREFIX=$(out)" + "LUA=1" + "RELEASE=1" + "USE_HOME_DIR=1" + # "LANGUAGES=all" # vanilla C:DDA installs all translations even without this flag! + ] ++ optionals tiles [ + "TILES=1" + "SOUND=1" + ] ++ optionals stdenv.isDarwin [ + "NATIVE=osx" + "CLANG=1" + "OSX_MIN=10.6" # SDL for macOS only supports deploying on 10.6 and above + ] ++ optionals stdenv.cc.isGNU [ + "WARNINGS+=-Wno-deprecated-declarations" + "WARNINGS+=-Wno-ignored-attributes" + ] ++ optionals stdenv.cc.isClang [ + "WARNINGS+=-Wno-inconsistent-missing-override" + ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-user-defined-warnings"; + + postBuild = stdenv.lib.optionalString (tiles && stdenv.isDarwin) '' + # iconutil on macOS is not available in nixpkgs + png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/* + ''; - postInstall = '' - wrapProgram $out/bin/cataclysm-tiles \ - --add-flags "--datadir $out/share/" + postInstall = stdenv.lib.optionalString (tiles && stdenv.isDarwin) '' + app=$out/Applications/Cataclysm.app + install -D -m 444 data/osx/Info.plist -t $app/Contents + install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources + mkdir $app/Contents/MacOS + launcher=$app/Contents/MacOS/Cataclysm.sh + cat << SCRIPT > $launcher + #!/bin/sh + $out/bin/cataclysm-tiles + SCRIPT + chmod 555 $launcher ''; # Disable, possible problems with hydra @@ -61,9 +94,9 @@ stdenv.mkDerivation rec { substances or radiation, now more closely resemble insects, birds or fish than their original form. ''; - homepage = http://en.cataclysmdda.com/; + homepage = https://cataclysmdda.org/; license = licenses.cc-by-sa-30; maintainers = [ maintainers.skeidel ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 21f6e68e416a0cff213d53308be2b9a3c2345943..fe4dcb251753df41713cdab0d7bee42369223b65 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,39 +1,68 @@ -{ fetchFromGitHub, stdenv, makeWrapper, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, -SDL2_mixer, freetype, gettext }: +{ fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, +SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa, +tiles ? true }: stdenv.mkDerivation rec { - version = "2017-07-12"; + version = "2017-12-09"; name = "cataclysm-dda-git-${version}"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; - rev = "2d7aa8c"; - sha256 = "0xx7si4k5ivyb5gv98fzlcghrg3w0dfblri547x7x4is7fj5ffjd"; + rev = "24e92956db5587809750283873c242cc0796d7e6"; + sha256 = "1a7kdmx76na4g65zra01qaq98lxp9j2dl9ddv09r0p5yxaizw68z"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ]; + buildInputs = with stdenv.lib; [ ncurses lua gettext ] + ++ optionals stdenv.isDarwin [ CoreFoundation ] + ++ optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ] + ++ optionals (tiles && stdenv.isDarwin) [ Cocoa ]; + + patches = [ ./patches/fix_locale_dir_git.patch ]; postPatch = '' patchShebangs . - sed -i Makefile \ - -e 's,-Werror,,g' \ - -e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g' - - sed '1i#include ' \ - -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp + sed -i data/xdg/com.cataclysmdda.cataclysm-dda.desktop \ + -e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2," ''; - makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1"; + makeFlags = with stdenv.lib; [ + "PREFIX=$(out)" + "LUA=1" + "RELEASE=1" + "USE_HOME_DIR=1" + "LANGUAGES=all" + "VERSION=git-${version}-${substring 0 8 src.rev}" + ] ++ optionals tiles [ + "TILES=1" + "SOUND=1" + ] ++ optionals stdenv.isDarwin [ + "NATIVE=osx" + "CLANG=1" + ]; - postInstall = '' - wrapProgram $out/bin/cataclysm-tiles \ - --add-flags "--datadir $out/share/cataclysm-dda/" + postInstall = with stdenv.lib; optionalString (tiles && !stdenv.isDarwin) '' + install -D -m 444 data/xdg/com.cataclysmdda.cataclysm-dda.desktop -T $out/share/applications/cataclysm-dda.desktop + install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps + '' + optionalString (tiles && stdenv.isDarwin) '' + app=$out/Applications/Cataclysm.app + install -D -m 444 data/osx/Info.plist -t $app/Contents + install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources + mkdir $app/Contents/MacOS + launcher=$app/Contents/MacOS/Cataclysm.sh + cat << SCRIPT > $launcher + #!/bin/sh + $out/bin/cataclysm-tiles + SCRIPT + chmod 555 $launcher ''; - enableParallelBuilding = true; + # https://hydra.nixos.org/build/65193254 + # src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory + # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1 + enableParallelBuilding = false; meta = with stdenv.lib; { description = "A free, post apocalyptic, zombie infested rogue-like"; @@ -60,8 +89,8 @@ stdenv.mkDerivation rec { substances or radiation, now more closely resemble insects, birds or fish than their original form. ''; - homepage = http://en.cataclysmdda.com/; + homepage = https://cataclysmdda.org/; license = licenses.cc-by-sa-30; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch b/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch new file mode 100644 index 0000000000000000000000000000000000000000..775a8ec6007de769ba0cfa066413704b7c47d091 --- /dev/null +++ b/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch @@ -0,0 +1,20 @@ +diff --git a/src/translations.cpp b/src/translations.cpp +index 6520cfe..49f7b2c 100644 +--- a/src/translations.cpp ++++ b/src/translations.cpp +@@ -72,15 +72,11 @@ void set_language(bool reload_options) + + // Step 2. Bind to gettext domain. + const char *locale_dir; +-#ifdef __linux__ + if (!FILENAMES["base_path"].empty()) { + locale_dir = std::string(FILENAMES["base_path"] + "share/locale").c_str(); + } else { + locale_dir = "lang/mo"; + } +-#else +- locale_dir = "lang/mo"; +-#endif // __linux__ + + bindtextdomain("cataclysm-dda", locale_dir); + bind_textdomain_codeset("cataclysm-dda", "UTF-8"); diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch b/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch new file mode 100644 index 0000000000000000000000000000000000000000..c3140af03c8b18383305bbc0e952eb6a7e37d709 --- /dev/null +++ b/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch @@ -0,0 +1,20 @@ +diff --git a/src/translations.cpp b/src/translations.cpp +index 3a86291..e6c5f84 100644 +--- a/src/translations.cpp ++++ b/src/translations.cpp +@@ -176,15 +176,11 @@ void set_language() + + // Step 2. Bind to gettext domain. + std::string locale_dir; +-#if (defined __linux__ || (defined MACOSX && !defined TILES)) + if( !FILENAMES["base_path"].empty() ) { + locale_dir = FILENAMES["base_path"] + "share/locale"; + } else { + locale_dir = "lang/mo"; + } +-#else +- locale_dir = "lang/mo"; +-#endif // __linux__ + + const char *locale_dir_char = locale_dir.c_str(); + bindtextdomain( "cataclysm-dda", locale_dir_char ); diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index e8daca26ef7d02427d6c8f80d4c4c4b723dab747..c8d23fcc9de68aeacbc4d3a29f6ff625ab8f5637 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,10 +1,10 @@ { stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }: stdenv.mkDerivation rec { name = "chessx-${version}"; - version = "1.4.0"; + version = "1.4.6"; src = fetchurl { url = "mirror://sourceforge/chessx/chessx-${version}.tgz"; - sha256 = "1x10c9idj2qks8xk9dy7aw3alc5w7z1kvv6dnahs0428j0sp4a74"; + sha256 = "1vb838byzmnyglm9mq3khh3kddb9g4g111cybxjzalxxlc81k5dd"; }; buildInputs = [ qtbase @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake ]; # RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm' - #enableParallelBuilding = true; + enableParallelBuilding = false; installPhase = '' runHook preInstall diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 9baa38777068fc0993e3abe6304e7661db22bd55..70413f0f941b65237f1a8fe22c5425589dfa4890 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,19 +1,24 @@ { lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig -, libvorbis, mesa_noglu, boost, cmake }: - +, libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 +}: stdenv.mkDerivation rec { name = "commandergenius-${version}"; - version = "1822release"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gerstrong"; repo = "Commander-Genius"; rev = "v${version}"; - sha256 = "07vxg8p1dnnkajzs5nifxpwn4mdd1hxsw05jl25gvaimpl9p2qc8"; + sha256 = "1hjx4j325vj1ayxi3j2dpplpd3x0iqx98gyb093ld7dfnsyilbph"; }; - buildInputs = [ SDL2 SDL2_image mesa_noglu boost libvorbis ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ]; + + preConfigure = '' + export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DSHAREDIR=$out/share" + export makeFlags="$makeFlags DESTDIR=$(out)" + ''; nativeBuildInputs = [ cmake pkgconfig ]; @@ -24,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern Interpreter for the Commander Keen Games"; - longdescription = '' + longDescription = '' Commander Genius is an open-source clone of Commander Keen which allows you to play the games, and some of the mods diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 0c9e83cdb9ab2285e4e161886a14b390a3698828..7db641367311186973b4f6af10687cf9b84ed14d 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, zlib, xproto, mesa ? null, freeglut ? null }: +{ stdenv, fetchurl, libX11, zlib, xproto, libGL ? null, freeglut ? null }: stdenv.mkDerivation rec { name = "construo-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libX11 zlib xproto ] - ++ stdenv.lib.optional (mesa != null) mesa + ++ stdenv.lib.optional (libGL != null) libGL ++ stdenv.lib.optional (freeglut != null) freeglut; preConfigure = '' diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 3fceb796dde53bf06f5d9731dc4efe6705536fc3..d8de785ef1f8fe4740dd5261d3b6165c861b0509 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, mesa, libXi, libXmu}: +{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, libGLU_combined, libXi, libXmu}: stdenv.mkDerivation { name = "crack-attack-1.1.14"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 freeglut SDL mesa libXi libXmu ]; + buildInputs = [ gtk2 freeglut SDL libGLU_combined libXi libXmu ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 430da66c21c51544e74d418004afddd8e83c8d21..66e199a3f0d2f6ab9cd62ffadc27e2e51876fe53 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush, advancecomp +, dejavu_fonts, libpng, SDL2, SDL2_image, libGLU_combined, freetype, pngcrush, advancecomp , tileMode ? false }: stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.20.1"; + version = "0.21.1"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26"; + sha256 = "191pmd7vpp9qni5l13fb5s8g1axniah8a6hhi31gp0848c8n7hlh"; }; patches = [ ./crawl_purify.patch ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] - ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype mesa ]; + ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ]; preBuild = '' cd crawl-ref/source @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; - makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" + makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] ++ lib.optional tileMode "TILES=y"; diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 23980c5842b4a1e9d0d1bfe5115edececea2e1b2..98baafbb2fd273182439c69f469b7e5819155ee4 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, SDL, SDL_mixer, plib, libjpeg }: +{ stdenv, fetchurl, libGLU_combined, SDL, SDL_mixer, plib, libjpeg }: let version = "0.9.13"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - mesa SDL SDL_mixer plib libjpeg + libGLU_combined SDL SDL_mixer plib libjpeg ]; patches = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A model-airplane flight simulator"; maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..253a7fcbf30482e7a0226bad84159bbdd147ccc4 --- /dev/null +++ b/pkgs/games/cutemaze/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, qmake, qttools, qtsvg }: + +stdenv.mkDerivation rec { + name = "cutemaze-${version}"; + version = "1.2.2"; + + src = fetchurl { + url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2"; + sha256 = "1a2jmkm7fjzdrvzgvbqfq20k0vvpwfcycagsm0haxb3fpv86950y"; + }; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtsvg ]; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv CuteMaze.app $out/Applications + ''; + + meta = with stdenv.lib; { + homepage = https://gottcode.org/cutemaze/; + description = "Simple, top-down game in which mazes are randomly generated"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix deleted file mode 100644 index 52aec1b8a59065f3a62a54b4f45e66e4242a652e..0000000000000000000000000000000000000000 --- a/pkgs/games/d1x-rebirth/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }: - -stdenv.mkDerivation rec { - name = "d1x-rebirth-0.58.1"; - src = fetchurl { - url = "http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz"; - sha256 = "13p3nfqaa78h6bl0k8mdsn90ai99wbqaj6qlsjsgsn8imficivsv"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons SDL mesa physfs SDL_mixer ]; - - installPhase = '' - scons prefix=$out install - ''; - - meta = { - homepage = http://www.dxx-rebirth.com/; - description = "Source Port of the Descent 1 engine"; - license = stdenv.lib.licenses.unfree; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [viric]; - }; -} diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix deleted file mode 100644 index 566b6f8cc82dc392e1a1dd1439dcc6273307ec22..0000000000000000000000000000000000000000 --- a/pkgs/games/d2x-rebirth/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }: - -stdenv.mkDerivation rec { - name = "d2x-rebirth-0.58.1"; - src = fetchurl { - url = "http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.58.1-src.tar.gz"; - sha256 = "08mg831afc1v068c0ds70lhmxk8a54494jls7s9hwf02ffhv3sx8"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons SDL mesa physfs SDL_mixer ]; - - installPhase = '' - scons prefix=$out install - ''; - - meta = { - homepage = http://www.dxx-rebirth.com/; - description = "Source Port of the Descent 2 engine"; - license = stdenv.lib.licenses.unfree; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [viric]; - }; -} diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 4bae8e1d58ad8814e2ed039cf3f3a0525a9d2b88..0d0cb8a11fddf183c98d92664e4c5055fda962ed 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, mesa, zlib, libjpeg, libogg, libvorbis +{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU_combined, zlib, libjpeg, libogg, libvorbis , openal, curl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1s64xr1ir4d2z01fhldy577b0x80nd1k6my7y1hxp57lggr8dy5y"; }; - # Add mesa linking + # Add libGLU_combined linking patchPhase = '' sed -i 's/\ 0.59.100 + patches = [ + (fetchpatch { + name = "dxx-gcc7-fix1.patch"; + url = "https://github.com/dxx-rebirth/dxx-rebirth/commit/1ed7cec714c623758e3418ec69eaf3b3ff03e9f6.patch"; + sha256 = "026pn8xglmxryaj8555h5rhzkx30lxmksja1fzdlfyb1vll75gq0"; + }) + (fetchpatch { + name = "dxx-gcc7-fix2.patch"; + url = "https://github.com/dxx-rebirth/dxx-rebirth/commit/73057ad8ec6977ac747637db1080686f11b4c3cc.patch"; + sha256 = "0s506vdd2djrrm3xl0ygn9ylpg6y8qxii2nnzk3sf9133glp3swy"; + }) + ]; + + nativeBuildInputs = [ pkgconfig scons ]; + + buildInputs = [ libGLU_combined physfs SDL SDL_mixer ]; + + enableParallelBuilding = true; + + buildPhase = '' + runHook preBuild + + scons prefix=$out + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + scons prefix=$out install + install -Dm644 ${music} $out/share/games/dxx-rebirth/d2xr-sc55-music.dxa + install -Dm644 -t $out/share/doc/dxx-rebirth *.txt + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Source Port of the Descent 1 and 2 engines"; + homepage = https://www.dxx-rebirth.com/; + license = licenses.free; + maintainers = with maintainers; [ viric peterhoeg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix new file mode 100644 index 0000000000000000000000000000000000000000..020a4593de241d5264d8ceb7926ba9f1d08b7e83 --- /dev/null +++ b/pkgs/games/dxx-rebirth/full.nix @@ -0,0 +1,30 @@ +{ stdenv, makeWrapper +, dxx-rebirth, descent1-assets, descent2-assets }: + +let + generic = ver: assets: stdenv.mkDerivation rec { + name = "d${toString ver}x-rebirth-full-${assets.version}"; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + + makeWrapper ${dxx-rebirth}/bin/d${toString ver}x-rebirth $out/bin/descent${toString ver} \ + --add-flags "-hogdir ${assets}/share/games/descent${toString ver}" + ''; + + meta = with stdenv.lib; { + description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG"; + homepage = https://www.dxx-rebirth.com/; + license = with licenses; [ free unfree ]; + maintainers = with maintainers; [ peterhoeg ]; + platforms = with platforms; linux; + hydraPlatforms = []; + }; + }; + +in { + d1x-rebirth-full = generic 1 descent1-assets; + d2x-rebirth-full = generic 2 descent2-assets; +} diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..be45866a7dd7f59e14bf2fc38dcd24c00b1455ae --- /dev/null +++ b/pkgs/games/easyrpg-player/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, doxygen ? null, pkgconfig, freetype ? null, harfbuzz ? null +, liblcf, libpng, libsndfile ? null, libxmp ? null, libvorbis ? null, mpg123 ? null +, opusfile ? null, pixman, SDL2, speexdsp ? null, wildmidi ? null, zlib }: + +stdenv.mkDerivation rec { + name = "easyrpg-player-${version}"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "EasyRPG"; + repo = "Player"; + rev = version; + sha256 = "1cn3g08ap6cf812s8p3ilf31q7y7y4knp1s0gk45mqcz215cpd8q"; + }; + + nativeBuildInputs = [ cmake doxygen pkgconfig ]; + + buildInputs = [ + freetype + harfbuzz + liblcf + libpng + libsndfile + libxmp + libvorbis + mpg123 + opusfile + SDL2 + pixman + speexdsp + wildmidi + zlib + ]; + + meta = with stdenv.lib; { + homepage = https://easyrpg.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 185295a20b64b6b8c4998263b4ef2142f840a263..733b6070b1fc7e62b7166642300be46180a6846d 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, mesa, nasm +{ stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, libGLU_combined, nasm , pkgconfig, SDL2, SDL2_mixer }: let @@ -14,14 +14,14 @@ in stdenv.mkDerivation rec { sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; }; - buildInputs = [ flac gtk2 libvorbis libvpx mesa SDL2 SDL2_mixer ] + buildInputs = [ flac gtk2 libvorbis libvpx libGLU_combined SDL2 SDL2_mixer ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; nativeBuildInputs = [ pkgconfig ]; postPatch = '' substituteInPlace build/src/glbuild.c \ - --replace libGL.so ${mesa}/lib/libGL.so \ - --replace libGLU.so ${mesa}/lib/libGLU.so + --replace libGL.so ${libGLU_combined}/lib/libGL.so \ + --replace libGLU.so ${libGLU_combined}/lib/libGLU.so ''; NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_mixer}/include/SDL2"; @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { description = "Enhanched port of Duke Nukem 3D for various platforms"; license = licenses.gpl2Plus; homepage = http://eduke32.com; - maintainers = with maintainers; [ nckx sander ]; + maintainers = with maintainers; [ sander ]; platforms = with platforms; linux; }; } diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 96ff52446ec4d70c31214c3cf59b19e98b83788d..29ad352c31686beb757d14041b4ae132481085c3 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, SDL, SDL_mixer, SDL_image, SDL_ttf }: +{ stdenv, fetchurl, libGLU_combined, SDL, SDL_mixer, SDL_image, SDL_ttf }: stdenv.mkDerivation rec { # pf5234 (a developer?) at freenode #egoboo told me that I better use 2.7.3 until @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/${name} ''; - buildInputs = [ mesa SDL SDL_mixer SDL_image SDL_ttf ]; + buildInputs = [ libGLU_combined SDL SDL_mixer SDL_image SDL_ttf ]; /* This big commented thing may be needed for versions 2.8.0 or beyond diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 40dbd1d33a77de53777fc3c4633a85a113a7b0b4..8e1bd52eb42fefa761d934112d6abe7d0a942b19 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain ]; maintainers = with maintainers; [ lheckemann ]; - platforms = with platforms; allBut darwin; + platforms = platforms.linux; # Maybe other non-darwin Unix }; } diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6bbb58c1a18cbbe78a49ccd3505e04c9a7010d30 --- /dev/null +++ b/pkgs/games/enyo-doom/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitLab, cmake, qtbase }: + +stdenv.mkDerivation rec { + name = "enyo-doom-${version}"; + version = "1.05"; + + src = fetchFromGitLab { + owner = "sdcofer70"; + repo = "enyo-doom"; + rev = version; + sha256 = "1bmpgqwcp7640dbq1w8bkbk6mkn4nj5yxkvmjrl5wnlg0m1g0jr7"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase ]; + + enableParallelBuilding = true; + + meta = { + homepage = "https://gitlab.com/sdcofer70/enyo-doom"; + description = "Frontend for Doom engines"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.tadfisher ]; + }; +} diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 453afe9e985b6041dff50b7211c119ea9dba5a81..911308a078a565d748039c4f4756a15891adf16a 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, mesa_noglu, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: +{ stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { name = "eternity-engine-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ mesa_noglu SDL SDL_mixer SDL_net ]; + buildInputs = [ libGL SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 411101955093558bbc62831ddb7e908a42f5d3a7..d1bf190be574e6d19edb6490f7ef2a87e92350b3 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, mesa, libX11, xproto, tcl, freeglut, freetype -, SDL, SDL_mixer, SDL_image, libXi, inputproto +{ stdenv, fetchurl, libGLU_combined, libX11, xproto, tcl, freeglut, freetype +, sfml, libXi, inputproto , libXmu, libXext, xextproto, libXt, libSM, libICE , libpng, pkgconfig, gettext, intltool }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.7.4"; name = "extremetuxracer-${version}"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; - sha256 = "0fl9pwkywqnsmgr6plfj9zb05xrdnl5xb2hcmbjk7ap9l4cjfca4"; + sha256 = "0d2j4ybdjmimg67v2fndgahgq4fvgz3fpfb3a4l1ar75n6hy776s"; }; buildInputs = [ - mesa libX11 xproto tcl freeglut freetype - SDL SDL_mixer SDL_image libXi inputproto + libGLU_combined libX11 xproto tcl freeglut freetype + sfml libXi inputproto libXmu libXext xextproto libXt libSM libICE libpng pkgconfig gettext intltool ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tcl=${tcl}/lib" ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE" ''; meta = { diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 2c544abddd07c8ad08e191f99b3ef9fedfdee81c..2684a56a82862e08d0bad90bac44b7133d62f7cf 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, curl, expat -, jansson, libpng, libjpeg, mesa, pcre +, jansson, libpng, libjpeg, libGLU_combined, pcre , pkgconfig, SDL2, vimNox }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - expat curl jansson libpng libjpeg mesa pcre SDL2 vimNox + expat curl jansson libpng libjpeg libGLU_combined pcre SDL2 vimNox ]; installPhase = with stdenv.lib; let diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index ba23db2fbdf5d287fbd829de89fbbb4c6932aaff..2cc63e9ecdefeda40698cade52f885214b24b270 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,9 +1,10 @@ { stdenv, callPackage, fetchurl, makeWrapper -, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu +, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , factorio-utils , releaseType , mods ? [] , username ? "" , password ? "" +, experimental ? false }: assert releaseType == "alpha" @@ -14,22 +15,41 @@ let # NB If you nix-prefetch-url any of these, be sure to add a --name arg, # where the ultimate "_" (before the version) is changed to a "-". + branch = if experimental then "experimental" else "stable"; binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { - alpha = bdist { sha256 = "0y6d7pvf3dgyll175323xp4zmrbyrjn73zrb478y1gpl6dqh064d"; fetcher = authenticatedFetch; }; - headless = bdist { sha256 = "1agkra3qq11la307ymsfb7v358wc2s2mdpmfbc5n0sb4gnmnqazq"; }; - demo = bdist { sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; version = "0.15.33"; }; + alpha = { + stable = bdist { sha256 = "0gxa8wh0py4l1ym57sfq792kfh00khi0f9ykjlmjqqkdksyxgddf"; fetcher = authenticatedFetch; }; + experimental = bdist { sha256 = "1iy3k9zrw3za9mabf89lfl8i20xfij66ih5vngz5xfyy99mwxiy6"; version = "0.16.35"; fetcher = authenticatedFetch; }; + }; + headless = { + stable = bdist { sha256 = "0n2j86af41dkbsyyy5lawjpdd7c0lvfdwxpwbj1m8v470i1g8zq4"; }; + experimental = bdist { sha256 = "0x4miyva1lmiyv3lb4savdlycia1kzw6bri4qj9b2jmyw1dr8x8h"; version = "0.16.35"; }; + }; + demo = { + stable = bdist { sha256 = "1z04rdlcxnfwami0l5nm292w4ydfhr1s6rcl8hxrsa73d4xk5lch"; version = "0.16.36"; }; + experimental = bdist { }; + }; }; i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in { - alpha = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; }; - headless = bdist { }; - demo = bdist { }; + alpha = { + stable = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; }; + experimental = bdist { }; + }; + headless = { + stable = bdist { }; + experimental = bdist { }; + }; + demo = { + stable = bdist { }; + experimental = bdist { }; + }; }; }; - actual = binDists.${stdenv.system}.${releaseType} or (throw "Factorio: unsupported platform"); + actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform"); bdistForArch = arch: { sha256 ? null - , version ? "0.15.37" + , version ? "0.16.36" , fetcher ? fetchurl , nameMut ? x: x }: @@ -120,7 +140,7 @@ let libXinerama libXrandr libXi - mesa_noglu + libGL ]; installPhase = base.installPhase + '' diff --git a/pkgs/games/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix index 439f2478a66739f637f629fb94aa6a654e1e5be4..7dbe2064a5c4fa12db7475cb47715ca387b13b14 100644 --- a/pkgs/games/factorio/fetch.nix +++ b/pkgs/games/factorio/fetch.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation { - buildInputs = [ curl xidel ]; + nativeBuildInputs = [ curl xidel ]; inherit name url loginUrl username password cacert; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 7431942699176adccfc07ba278577d8379c9ddee..b7a4af54929d228f9e9951f10be30cd46234bf2e 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib +, freeglut, freealut, libGLU_combined, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr , makeDesktopItem, qtbase, qtdeclarative, glew @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - freeglut freealut mesa libICE libjpeg openal openscenegraph plib + freeglut freealut libGLU_combined libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xproto libXext xextproto libXi inputproto libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase glew qtdeclarative diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index dd14edf8eb128b0b6db45d33bdc4a13a32eb61ae..a096b17b71a5869bf37ff42a70ec28618e332ecf 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "freecell-solver-${version}"; - version = "4.8.0"; + version = "4.18.0"; src = fetchurl { url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz"; - sha256 = "0274l1p71ps222i62whqfkg80fcc8m4w2hmpbrbbd5gh8kfpman3"; + sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index a968526e5cd37bb3aed71715877ce7aae7b210d7..b0bead7bbf9e178189dccf8a2464f283f95c6b48 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.9"; + version = "2.5.11"; 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 = "0a2rjw6065psh14bkk6ar4i19dcicn9lz63rffr9h278b9c76g5q"; + sha256 = "1bcs4mj4kzkpyrr0yryydmn0dzcqazvwrf02nfs7r5zya9lm572c"; }; nativeBuildInputs = [ pkgconfig ]; @@ -37,6 +37,8 @@ stdenv.mkDerivation { ++ optional (!gtkClient) "--enable-fcmp=cli" ++ optional (!server) "--disable-server"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Multiplayer (or single player), turn-based strategy game"; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index 94451ef8930d182a863c8acbedafc4c043e66e51..c1bfda9e2f2f3fccfddb43df2dd9fb9eee16031b 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -28,11 +28,18 @@ in stdenv.mkDerivation rec { pkgconfig intltool fontconfig libzip zip zlib ]; + preConfigure = '' + # Build fails on Linux with windres. + export ac_cv_prog_ac_ct_WINDRES= + ''; + postInstall = '' mkdir -p "$out/share/" ln -s ${freedink_data}/share/dink "$out/share/" ''; + enableParallelBuilding = true; + meta = { description = "A free, portable and enhanced version of the Dink Smallwood game engine"; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..875af8e06642b4bc61b83df0f362d7a0f8e8b4fb --- /dev/null +++ b/pkgs/games/freedroidrpg/default.nix @@ -0,0 +1,62 @@ +{ fetchurl, stdenv, pkgconfig, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: + +let + version = "0.16.1"; +in stdenv.mkDerivation rec { + name = "freedroidrpg-${version}"; + + src = fetchurl { + url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz"; + sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"; + }; + + nativeBuildInputs = [ pkgconfig gettext python3 ]; + + buildInputs = [ + SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib + ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + + meta = with stdenv.lib; { + description = "Isometric 3D RPG similar to game Diablo"; + + longDescription = '' + + FreedroidRPG is an original isometric 3D role playing game + taking place in the future, on Earth. It features action and + dialogs. + + + The game tells the story of a world destroyed by a conflict between + robots and their human masters. Play as Tux in a quest to save the + world from the murderous rebel bots who know no mercy. You get to + choose which path you wish to follow, and freedom of choice is + everywhere in the game. + + + FreedroidRPG features a real time combat system with melee and + ranged weapons, fairly similar to the proprietary game Diablo. + There is an innovative system of programs that can be run in order + to take control of enemy robots, alter their behavior, or improve one's + characteristics. You can use over 50 different kinds of items and + fight countless enemies on your way to your destiny. An advanced + dialog system provides story background and immersive role + playing situations. + + + The game is complete, fully playable, and can provide about + 12 hours of fun. It is still being actively developed, and + help is welcome in many areas. People having - or trying to acquire - + programming, map editing, or writing skills will find FreedroidRPG + to be an exciting, fast-moving project in which they can fully + express their creativity. + + ''; + + homepage = http://www.freedroid.org/; + + license = licenses.gpl2Plus; + + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 438b01fe51acfa2000d0da28f86fd5618c6b7bbb..011812580e71eb36646c4744989c8ea613554117 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -1,23 +1,34 @@ -{ stdenv, fetchurl, cmake, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, mesa, glew, doxygen -, libxslt, makeWrapper }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, graphviz, makeWrapper +, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff +, libjpeg, libGLU_combined, glew, libxslt +}: stdenv.mkDerivation rec { - version = "0.4.6"; + version = "0.4.7.1"; name = "freeorion-${version}"; - src = fetchurl { - url = "https://github.com/freeorion/freeorion/releases/download/v0.4.6/FreeOrion_v0.4.6_2016-09-16.49f9123_Source.tar.gz"; - sha256 = "04g3x1cymf7mnmc2f5mm3c2r5izjmy7z3pvk2ykzz8f8b2kz6gry"; + src = fetchFromGitHub { + owner = "freeorion"; + repo = "freeorion"; + rev = "v${version}"; + sha256 = "1m05l3a6ilqd7p2g3aqjpq89grb571cg8n9bpgz0y3sxskcym6sp"; }; - buildInputs = [ cmake boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew doxygen makeWrapper ]; + buildInputs = [ boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU_combined glew ]; + + nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ]; + + enableParallelBuilding = true; patches = [ + # fix build with boost 1.66 + (fetchpatch { + url = https://github.com/freeorion/freeorion/commit/c9b5b13fb81b1ed142dee0e843101c6b8832ca95.patch; + sha256 = "0agqhxk8462sgd230lmdzbrbrfd77zyy7a4g8hrf28zxza1nza94"; + }) ./fix_rpaths.patch ]; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/fixpaths # We need final slashes for XSLT replace to work properly @@ -36,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game"; homepage = http://www.freeorion.org; - license = [ licenses.gpl2 licenses.cc-by-sa-30 ]; + license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9d07eda74b81c1be5c69d77eec25bf1ade0512c9 --- /dev/null +++ b/pkgs/games/freesweep/default.nix @@ -0,0 +1,35 @@ +{ fetchurl, ncurses, stdenv, + updateAutotoolsGnuConfigScriptsHook }: + +stdenv.mkDerivation rec { + name = "freesweep-${version}"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/rwestlund/freesweep/archive/v${version}.tar.gz"; + sha256 = "0l2kf14558lsq9qd2hs0kcyn9bbl1jdbzwrvcs6mnyjl7zpizcpj"; + }; + + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + buildInputs = [ ncurses ]; + + preConfigure = '' + configureFlags="$configureFlags --with-prefsdir=$out/share" + ''; + + installPhase = '' + runHook preInstall + install -D -m 0555 freesweep $out/bin/freesweep + install -D -m 0444 sweeprc $out/share/sweeprc + install -D -m 0444 freesweep.6 $out/share/man/man6/freesweep.6 + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A console minesweeper-style game written in C for Unix-like systems"; + homepage = https://github.com/rwestlund/freesweep; + license = licenses.gpl2; + maintainers = with maintainers; [ kierdavis ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 114eaa3027b0cb975d7c735b39a4c1a5fa4e6606..d7487c22e28e055bf90f73c149b90db07c982713 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, mesa, wxGTK, libX11, xproto }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xproto }: stdenv.mkDerivation { name = "fsg-4.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 glib mesa wxGTK libX11 xproto ]; + buildInputs = [ gtk2 glib libGLU_combined wxGTK libX11 xproto ]; preBuild = '' sed -e ' diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index b8550b3712e36c66ff6577c1b4d679e655ae02e2..066cadb13b17d67af2bbd30106595f29653465b1 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Old-school vertical shoot-em-up / bullet hell"; homepage = http://garden.sourceforge.net/drupal/; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; license = licenses.gpl3; }; diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch index cf44dffc897cd6b2b185f297d840779eb4637cd8..230f453acad7a850612eaf93429a53ed6670fc24 100644 --- a/pkgs/games/gargoyle/darwin.patch +++ b/pkgs/games/gargoyle/darwin.patch @@ -26,6 +26,147 @@ index 1f8829d..d8455eb 100644 } SEARCH_SOURCE = +diff --git a/garglk/fontmac.m b/garglk/fontmac.m +index d6e1426..72304a3 100644 +--- a/garglk/fontmac.m ++++ b/garglk/fontmac.m +@@ -167,7 +167,7 @@ static void propfont(char *file, int style) + } + } + +-static NSMutableArray * gli_registered_fonts = nil; ++static NSMutableArray * gli_registered_fonts = nil; + static NSDistributedLock * gli_font_lock = nil; + + void fontreplace(char *font, int type) +@@ -181,7 +181,7 @@ void fontreplace(char *font, int type) + NSFontDescriptor * fontFamilyDescriptor = + [[NSFontDescriptor fontDescriptorWithFontAttributes: nil] fontDescriptorWithFamily: fontFamily]; + +- NSArray * fontMatches = ++ NSArray * fontMatches = + [fontFamilyDescriptor matchingFontDescriptorsWithMandatoryKeys: nil]; + + for (NSFontDescriptor * sysfont in fontMatches) +@@ -197,7 +197,7 @@ void fontreplace(char *font, int type) + + else if ([sysfont symbolicTraits] & NSFontItalicTrait) + style = FONTI; +- ++ + /* find path for font */ + CFURLRef urlRef = CTFontDescriptorCopyAttribute((CTFontDescriptorRef)sysfont, kCTFontURLAttribute); + if (!urlRef) +@@ -259,7 +259,7 @@ void fontload(void) + + // obtain a list of all files in the Fonts directory + NSString * fontFolder = [[NSString stringWithUTF8String: env] stringByAppendingPathComponent: @"Fonts"]; +- NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil]; ++ NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil]; + + // create a collection to hold the registered font URLs + gli_registered_fonts = [NSMutableArray new]; +diff --git a/garglk/launchmac.m b/garglk/launchmac.m +index 68deca5..9f752ac 100644 +--- a/garglk/launchmac.m ++++ b/garglk/launchmac.m +@@ -72,14 +72,14 @@ char *winfilters[] = + height: (unsigned int) height + { + [[self openGLContext] makeCurrentContext]; +- ++ + /* allocate new texture */ + glDeleteTextures(1, &output); + glGenTextures(1, &output); + + /* bind target to texture */ +- glEnable(GL_TEXTURE_RECTANGLE_ARB); +- glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output); ++ glEnable(GL_TEXTURE_RECTANGLE_ARB); ++ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output); + + /* set target parameters */ + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE); +@@ -460,7 +460,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) + if (filter != FILTER_ALL) + { + NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter] +- encoding: NSUTF8StringEncoding]]; ++ encoding: NSUTF8StringEncoding]]; + [openDlg setAllowedFileTypes: filterTypes]; + [openDlg setAllowsOtherFileTypes: NO]; + } +@@ -485,7 +485,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) + if (filter != FILTER_ALL) + { + NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter] +- encoding: NSUTF8StringEncoding]]; ++ encoding: NSUTF8StringEncoding]]; + [saveDlg setAllowedFileTypes: filterTypes]; + [saveDlg setAllowsOtherFileTypes: NO]; + } +@@ -518,7 +518,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) + + { + BOOL openedFirstGame; +- NSMutableDictionary * windows; ++ NSMutableDictionary * windows; + NSConnection * link; + } + - (BOOL) launchFile: (NSString *) file; +@@ -760,20 +760,20 @@ static BOOL isTextbufferEvent(NSEvent * evt) + - (BOOL) launchFileDialog + { + int result; +- ++ + NSOpenPanel * openDlg = [NSOpenPanel openPanel]; + + [openDlg setCanChooseFiles: YES]; + [openDlg setCanChooseDirectories: NO]; + [openDlg setAllowsMultipleSelection: NO]; + [openDlg setTitle: [NSString stringWithCString: AppName encoding: NSUTF8StringEncoding]]; +- ++ + NSMutableArray *filterTypes = [NSMutableArray arrayWithCapacity:100]; +- +- NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary] ++ ++ NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary] + objectForKey:@"CFBundleDocumentTypes"] objectEnumerator]; + NSDictionary *docType; +- ++ + while (docType = [docTypeEnum nextObject]) + { + [filterTypes addObjectsFromArray:[docType objectForKey: @"CFBundleTypeExtensions"]]; +diff --git a/garglk/ttsmac.m b/garglk/ttsmac.m +index 9f6ab0e..de3d6fe 100644 +--- a/garglk/ttsmac.m ++++ b/garglk/ttsmac.m +@@ -30,7 +30,7 @@ + #import "sysmac.h" + + // a queue of phrases to feed to the speech synthesizer +-static NSMutableArray * phraseQueue = nil; ++static NSMutableArray * phraseQueue = nil; + static NSRange purgeRange; + + @interface SpeechDelegate : NSObject +@@ -96,10 +96,10 @@ void gli_initialize_tts(void) + NSString * lang = [NSString stringWithCString: gli_conf_speak_language + encoding: NSUTF8StringEncoding]; + +- NSArray * voices = [NSSpeechSynthesizer availableVoices]; ++ NSArray * voices = [NSSpeechSynthesizer availableVoices]; + for (NSString * voice in voices) + { +- NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice]; ++ NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice]; + if ([lang isEqualToString: [attr objectForKey: NSVoiceLocaleIdentifier]]) + { + [synth setVoice: voice]; diff --git a/tads/tads3/vmtz.cpp b/tads/tads3/vmtz.cpp index 5e193a1..dce46f7 100644 --- a/tads/tads3/vmtz.cpp diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 4c5b2827a0e8b816e8402bca2e5401edec3f02df..fc02bdffcad8b4a629aefa0efcb04ba122904171 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation { patches = [ ./darwin.patch ]; + postPatch = '' + substituteInPlace Jamrules \ + --replace -mmacosx-version-min=10.7 -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET + ''; + buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + '' diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..89b9fca06eabf741c2a24cd1853398a2a9e88ec2 --- /dev/null +++ b/pkgs/games/gcompris/default.nix @@ -0,0 +1,37 @@ +{stdenv, cmake, qtbase, fetchurl, qtdeclarative, qtmultimedia, qttools, qtsensors, qmlbox2d, gettext, qtquickcontrols, qtgraphicaleffects, makeWrapper, + gst_all_1, ninja +}: +stdenv.mkDerivation rec { + version = "0.90"; + name = "gcompris-${version}"; + + src = fetchurl { + url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; + sha256 = "1i5adxnhig849qxwi3c4v7r84q6agx1zxkd69fh4y7lcmq2qiaza"; + }; + + cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0"; + + nativeBuildInputs = [ cmake ninja makeWrapper ]; + buildInputs = [ qtbase qtdeclarative qttools qtsensors qmlbox2d gettext qtquickcontrols qtmultimedia qtgraphicaleffects] ++ soundPlugins; + soundPlugins = with gst_all_1; [gst-plugins-good gstreamer gst-plugins-base gst-plugins-bad]; + + postInstall = '' + # install .desktop and icon file + mkdir -p $out/share/applications/ + mkdir -p $out/share/icons/hicolor/256x256/apps/ + cp ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop + cp -r ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png + + wrapProgram "$out/bin/gcompris-qt" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + meta = with stdenv.lib; { + description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10"; + homepage = "https://gcompris.net/"; + maintainers = [ maintainers.guibou ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 42d80f86e8280542c4150bd1c48a0dfea4978b25..0e9025259224bbb95f150950deaf12cac7551787 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -1,37 +1,39 @@ -{ stdenv, fetchurl, cmake, SDL, openal, zlib, libpng, python, libvorbis }: - -assert stdenv.cc.libc != null; +{ stdenv, fetchFromGitHub, cmake +, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis }: stdenv.mkDerivation rec { - name = "gemrb-0.8.1"; - - src = fetchurl { - url = "mirror://sourceforge/gemrb/${name}.tar.gz"; - sha256 = "1g68pc0x4azy6zm5y7813g0qky96q796si9v3vafiy7sa8ph49kl"; + name = "gemrb-${version}"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = "gemrb"; + repo = "gemrb"; + rev = "v${version}"; + sha256 = "0xkjsiawxz53rac26vqz9sfgva0syff8x8crabrpbpxgmbacih7a"; }; - buildInputs = [ cmake python openal SDL zlib libpng libvorbis ]; # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional + buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis ]; - # Necessary to find libdl. - CMAKE_LIBRARY_PATH = "${stdenv.cc.libc.out}/lib"; + nativeBuildInputs = [ cmake ]; - # Can't have -werror because of the Vorbis header files. - cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON"; + enableParallelBuilding = true; - # upstream prefers some symbols to remain - dontStrip = true; + cmakeFlags = [ + "-DLAYOUT=opt" + ]; meta = with stdenv.lib; { description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate"; longDescription = '' - GemRB (Game engine made with pre-Rendered Background) is a portable open-source implementation of - Bioware's Infinity Engine. It was written to support pseudo-3D role playing games based on the - Dungeons & Dragons ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment). + GemRB (Game engine made with pre-Rendered Background) is a portable + open-source implementation of Bioware's Infinity Engine. It was written to + support pseudo-3D role playing games based on the Dungeons & Dragons + ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment). ''; homepage = http://gemrb.org/; license = licenses.gpl2; - platforms = stdenv.lib.platforms.all; - hydraPlatforms = []; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; }; } diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index 49f61a2f2bca09274dbe5e7a817718501a38c55e..f654dfc1573fa6cc1bcc9d6e472e38b28ea02793 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, mesa, SDL, freeglut, SDL_mixer, autoconf, automake, libtool +, libGLU_combined, SDL, freeglut, SDL_mixer, autoconf, automake, libtool }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4"; }; - buildInputs = [ mesa SDL freeglut SDL_mixer autoconf automake libtool ]; + buildInputs = [ libGLU_combined SDL freeglut SDL_mixer autoconf automake libtool ]; meta = { description = "An air combat simulator"; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index 49353f5d7b5bded582e63fbd05ce388d4f24e533..4bcf6cffa1659bcceb21b27b58f45ca58986f264 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net +{ stdenv, fetchurl, libGLU_combined, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net , speex, libvorbis, libogg, boost, fribidi, bsdiff , fetchpatch }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct ''; - buildInputs = [ mesa SDL scons SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; + buildInputs = [ libGLU_combined SDL scons SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; buildPhase = '' scons diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index 77d122b36117a7ebeadc0bcb366559db1638eaa4..6ede118526d82a0b77cc2dbf61e3a58e9e619b2d 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, mesa, zlib, libpng, libvorbis, libmikmod, SDL_sound } : +{stdenv, fetchurl, SDL, libGLU_combined, zlib, libpng, libvorbis, libmikmod, SDL_sound } : stdenv.mkDerivation rec { name = "gltron-0.70"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # The build fails, unless we disable the default -Wall -Werror configureFlags = "--disable-warn"; - buildInputs = [ SDL mesa zlib libpng libvorbis libmikmod SDL_sound ]; + buildInputs = [ SDL libGLU_combined zlib libpng libvorbis libmikmod SDL_sound ]; meta = { homepage = http://www.gltron.org/; diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index 1527a22b4abe865584f893c086366bfa11284f72..01815cade5ea678f75892ec5b53cbad2687596ee 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, python, gtk2, readline }: -let version = "1.04.000"; in +let version = "1.06.001"; in stdenv.mkDerivation { name = "gnubg-"+version; src = fetchurl { url = "http://gnubg.org/media/sources/gnubg-release-${version}-sources.tar.gz"; - sha256 = "0gsfl6qbj529d1jg3bkyj9m7bvb566wd7pq5fslgg5yn6c6rbjk6"; + sha256 = "0snz3j1bvr25ji7lg82bl2gm2s2x9lrpc7viw0hclgz0ql74cw7b"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ae2cbd818417c6ac26e441956d3fe75058f50b67 --- /dev/null +++ b/pkgs/games/gnujump/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: + +stdenv.mkDerivation rec { + name = "gnujump-${version}"; + version = "1.0.8"; + src = fetchurl { + url = "mirror://gnu/gnujump/${name}.tar.gz"; + sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk"; + }; + buildInputs = [ SDL SDL_image SDL_mixer ]; + + meta = with stdenv.lib; { + homepage = "https://jump.gnu.sinusoid.es/"; + description = "A clone of the simple yet addictive game Xjump"; + longDescription = '' + The goal in this game is to jump to the next floor trying not to fall + down. As you go upper in the Falling Tower the floors will fall faster. + Try to survive longer get upper than anyone. It might seem too simple but + once you've tried you'll realize how addictive this is. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/games/gnushogi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e85674550308eba53c49fc284f6ddf0c3c76a126 --- /dev/null +++ b/pkgs/games/gnushogi/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "gnushogi-${version}"; + version = "1.4.2"; + buildInputs = [ zlib ]; + + src = fetchurl { + url = "mirror://gnu/gnushogi/${name}.tar.gz"; + sha256 = "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y"; + }; + + meta = with stdenv.lib; { + description = "GNU implementation of Shogi, also known as Japanese Chess"; + homepage = https://www.gnu.org/software/gnushogi/; + license = licenses.gpl3; + maintainers = [ maintainers.ciil ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 2110dfee11ef4cfed313d6a0aeae5765de54b087..d622299cf0f33bac1b29e245714d1ca3828da501 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub, cmake, zdoom, makeWrapper -, openal, fluidsynth, soundfont-fluid, mesa_noglu, SDL2 +, openal, fluidsynth, soundfont-fluid, libGL, SDL2 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "3.1.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "02287xvlk4a07ssm9y9h5vfsvdssshz13n5bbz13pfcani5d9flv"; + sha256 = "1q1hjfxhksny236a058ys36mpdl434vbmgapqr51n82pia838h2l"; }; nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - SDL2 mesa_noglu openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 + SDL2 libGL openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 game-music-emu ]; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 8aba24dd3468b2202688c9b77c8382373a6ce640..2196fede32fc2319eab1004c62f08870f37216d7 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,25 +1,25 @@ -{ SDL_image, SDL_ttf, SDL_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut -, stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer -, zlib, libpng, mesa, physfs +{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut +, stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer +, zlib, libpng, libGLU_combined, physfs }: let ghc = ghcWithPackages (pkgs: with pkgs; [ network vector utf8-string bytestring-show random hslogger - dataenc SHA entropy pkgs.zlib + SHA entropy pkgs.zlib sandi regex-tdfa ]); in stdenv.mkDerivation rec { - version = "0.9.22"; + version = "0.9.23"; name = "hedgewars-${version}"; src = fetchurl { - url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2"; - sha256 = "14i1wvqbqib9h9092z10g4g0y14r5sp2fdaksvnw687l3ybwi6dn"; + url = "http://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; + sha256 = "12df5ar3zk186ah51c3myr4hlzyybcshmf1w1wf6vr9b0h44jbns"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL_ttf SDL_net cmake lua5_1 SDL SDL_mixer SDL_image fpc + SDL2_ttf SDL2_net cmake lua5_1 SDL2 SDL2_mixer SDL2_image fpc qt4 ghc ffmpeg freeglut makeWrapper physfs ]; @@ -28,20 +28,20 @@ stdenv.mkDerivation rec { ''; preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib - -rpath ${SDL_mixer}/lib - -rpath ${SDL_net}/lib - -rpath ${SDL_ttf}/lib - -rpath ${SDL.out}/lib + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL2_image}/lib + -rpath ${SDL2_mixer}/lib + -rpath ${SDL2_net}/lib + -rpath ${SDL2_ttf}/lib + -rpath ${SDL2.out}/lib -rpath ${libpng.out}/lib -rpath ${lua5_1}/lib - -rpath ${mesa}/lib + -rpath ${libGLU_combined}/lib -rpath ${zlib.out}/lib " ''; postInstall = '' - wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${stdenv.lib.makeLibraryPath [ mesa freeglut physfs ]} + wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${stdenv.lib.makeLibraryPath [ libGLU_combined freeglut physfs ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index ffa414cac3a1c34db4c00fca8a26561e2590071d..343b2948d5ea87e4e18273ac3c769d68f6ca7b6a 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 = "3.0.1"; + version = "3.2.0"; # 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 = "0ynqzmr35zd1vbbv8n3vk93zj0njhs45w9z33wwkphg2zlniwnzb"; + sha256 = "0l57qdngxv9nbfj4ixr4fyanlazmdib2kr1nzv3g578308xzjv6a"; }; NIX_LDFLAGS = "-llua -lgcc_s"; diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 2c45e1361b40421da7cc45fb224e564425b01504..b6d14085351e126b3e2592967618b9c5e41a818e 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, mesa} : +{stdenv, fetchurl, SDL, SDL_image, libGLU_combined} : stdenv.mkDerivation { name = "kobodeluxe-0.5.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c"; }; - buildInputs = [ SDL SDL_image mesa ]; + buildInputs = [ SDL SDL_image libGLU_combined ]; prePatch = '' sed -e 's/char \*tok/const char \*tok/' -i graphics/window.cpp diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index eb9bed9e1d950ea5b5bc44f708c22e4abff54665..5ab9954739b2ad0358e043f1bc5738ba918a6251 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintlOrEmpty }: +{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }: stdenv.mkDerivation rec { name = "lbreakout2-${version}"; version = "2.6.5"; - buildInputs = [ SDL SDL_mixer zlib libpng ] ++ libintlOrEmpty; + buildInputs = [ SDL SDL_mixer zlib libpng libintl ]; 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/; diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index c857ccc47a857adacd11b27f39bd11028a5f9e86..ba273cfb6b97a8064e6cb7a6908a1923469b394a 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lgogdownloader-${version}"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - sha256 = "0p1zh2l8g4y2z02xj0fndbfhcxgcpwhf5d9izwsdi3yljvqv23np"; + sha256 = "056idwwxjcp2zjqk5h7l3py1h45sax4vbsm93bz9shnfx1s1h3gc"; }; nativeBuildInputs = [ cmake pkgconfig help2man ]; diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 4ca2cd271cdb41f866931332ba90a5e19ca8c3b3..a5142dba88fd831fda2e9b9890a658c7a2615d44 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -1,41 +1,55 @@ -{stdenv, fetchgit -, zlib, jam, pkgconfig, gettext, libxml2, libxslt, xproto, libX11, mesa, SDL -, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs, autoconf, automake, libtool +{ stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig +, zlib, libxml2, libxslt, xproto, libX11, libGLU_combined, SDL +, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs }: + stdenv.mkDerivation rec { name = "lincity-ng-${version}"; version = "2.9beta.20170715"; - src = fetchgit { - url = "https://github.com/lincity-ng/lincity-ng"; - rev = "0c19714b811225238f310633e59f428934185e6b"; + src = fetchFromGitHub { + owner = "lincity-ng"; + repo = "lincity-ng"; + rev = "0c19714b811225238f310633e59f428934185e6b"; sha256 = "1gaj9fq97zmb0jsdw4rzrw34pimkmkwbfqps0glpqij4w3srz5f3"; }; hardeningDisable = [ "format" ]; nativeBuildInputs = [ - jam autoconf automake libtool pkgconfig + autoreconfHook jam pkgconfig ]; buildInputs = [ - zlib gettext libxml2 libxslt xproto libX11 mesa SDL SDL_mixer SDL_image + zlib libxml2 libxslt xproto libX11 libGLU_combined SDL SDL_mixer SDL_image SDL_ttf SDL_gfx physfs ]; - preConfigure = '' - ./autogen.sh - ''; + autoreconfPhase = '' + ./autogen.sh + ''; + + buildPhase = '' + runHook preBuild + + AR='ar r' jam -j $NIX_BUILD_CORES + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + touch CREDITS + AR='ar r' jam install - installPhase = '' - touch CREDITS - AR='ar r' jam install - ''; + runHook postInstall + ''; - meta = { - documentation = ''City building game''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [stdenv.lib.maintainers.raskin]; + meta = with stdenv.lib; { + description = "City building game"; + license = licenses.gpl2; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3b0aca6df28533d74c84ca968d6fead8a5f2dbb4 --- /dev/null +++ b/pkgs/games/linux-steam-integration/default.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, pkgs, gettext, + gcc_multi, libressl }: + +let + version = "0.7.2"; + steamBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ steam ])}/steam"; + zenityBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ gnome3.zenity ])}/zenity"; + +in stdenv.mkDerivation rec { + name = "linux-steam-integration-${version}"; + + nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; + buildInputs = [ gtk libressl ]; + + src = fetchFromGitHub { + owner = "solus-project"; + repo = "linux-steam-integration"; + rev = "v${version}"; + sha256 = "0yn71fvjqi63dxk04jsndb26pgipl0nla10sy94bi7q95pk3sdf6"; + fetchSubmodules = true; + }; + + # Patch lib paths (AUDIT_PATH and REDIRECT_PATH) in shim.c + # Patch path to lsi-steam in lsi-steam.desktop + # Patch path to zenity in lsi.c + postPatch = '' + sed -i -e "s|/usr/|$out/|g" src/shim/shim.c + sed -i -e "s|/usr/|$out/|g" data/lsi-steam.desktop + sed -i -e "s|zenity|${zenityBinPath}|g" src/lsi/lsi.c + sed -i -e "s|Name=Linux Steam Integration|Name=Linux Steam Integration Settings|" data/lsi-settings.desktop.in + + ''; + + configurePhase = '' + # Configure 64bit things + meson build \ + -Dwith-shim=co-exist \ + -Dwith-frontend=true \ + -Dwith-steam-binary=${steamBinPath} \ + -Dwith-new-libcxx-abi=true \ + -Dwith-libressl-mode=native \ + --prefix / \ + --libexecdir lib \ + --libdir lib \ + --bindir bin + + # Configure 32bit things + CC="gcc -m32" CXX="g++ -m32" meson build32 \ + -Dwith-shim=none \ + -Dwith-libressl-mode=native \ + --prefix / \ + --libexecdir lib32 \ + --libdir lib32 + ''; + + buildPhase = '' + # Build 64bit things + ninja -C build + + # Build 32bit things + ninja -C build32 + ''; + + installPhase = '' + DESTDIR="$out" ninja -C build install + DESTDIR="$out" ninja -C build32 install + ''; + + meta = with stdenv.lib; { + description = "Steam wrapper to improve compability and performance"; + longDescription = '' + Linux Steam Integration is a helper system to make the Steam Client and + Steam games run better on Linux. In a nutshell, LSI automatically applies + various workarounds to get games working, and fixes long standing bugs in + both games and the client + ''; + homepage = https://github.com/solus-project/linux-steam-integration; + license = licenses.lgpl21; + maintainers = [ maintainers.etu ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index b072fa942b86fe3488a2d9ecd7ae7c7ea8cc3143..53556b8cd9141170707adbfe5d410bb96343d9f6 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xproto, libX11, libXrender -, gmp, mesa, libjpeg, libpng +, gmp, libGLU_combined, libjpeg, libpng , expat, gettext, perl, guile , SDL, SDL_image, SDL_mixer, SDL_ttf , curl, sqlite @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xproto libX11 gmp guile - mesa libjpeg libpng + libGLU_combined libjpeg libpng expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 72b0b0d00cddd2746fda1d2d50ac9f7ef2f8e4d4..b490231442e3a66b5355e4ddf3eefd702fe095a9 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk openssl ]; + preConfigure = '' + # Build fails on Linux with windres. + export ac_cv_prog_WINDRES= + ''; + + enableParallelBuilding = true; + meta = { description = "Mascot Constructive Pilot for X"; homepage = http://rosegray.sakura.ne.jp/macopix/index-e.html; diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index 5494e32b16b63d03f122bc5cff6feb6655461f38..dce52d4c2957d92dedb6800fff9fcb50d8b72943 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, mesa_glu +, libGLU , x11 , xorg , xinput_calibrator @@ -41,12 +41,13 @@ stdenv.mkDerivation rec { doxygen libao libpthreadstubs - mesa_glu + libGLU x11 xinput_calibrator xorg.libXrandr xorg.libXi xorg.xinput + xorg.libXxf86vm ]; preConfigure = '' diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 57e260508246e24f0b686d1bdfdc12b8fef4ea85..2d2a31dd812c424d7d6f10b6d84d8716e136cd15 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, mesa, sfml, fribidi, taglib }: +{ stdenv, fetchgit, cmake, libGLU_combined, sfml, fribidi, taglib }: stdenv.mkDerivation rec { name = "mars-${version}-${rev}"; version = "0.7.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { inherit rev; sha256 = "1r4c5gap1z2zsv4yjd34qriqkxaq4lb4rykapyzkkdf4g36lc3nh"; }; - buildInputs = [ cmake mesa sfml fribidi taglib ]; + buildInputs = [ cmake libGLU_combined sfml fribidi taglib ]; patches = [ ./unbind_fix.patch ./fix-gluortho2d.patch diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 3fafcfddcbfb6d97477f92362c2aca9aa0a1f2a0..de67afe45a9473cb2f52b43ac6441d599ff4b66c 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchgit, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc +{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib +, fetchFromGitHub }: let - version = "3.9.2"; + version = "3.13.0"; lib-env = buildEnv { name = "megaglest-lib-env"; - paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext + paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype - stdenv.cc.cc glew mesa_glu wxGTK ]; + stdenv.cc.cc glew libGLU wxGTK ]; }; path-env = buildEnv { name = "megaglest-path-env"; @@ -18,18 +19,24 @@ in stdenv.mkDerivation { name = "megaglest-${version}"; - src = fetchgit { - url = "git://github.com/MegaGlest/megaglest-source"; - rev = "refs/tags/${version}"; - sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv"; + src = fetchFromGitHub { + owner = "MegaGlest"; + repo = "megaglest-source"; + rev = "${version}"; + fetchSubmodules = true; + sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK - glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; + buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK + glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON + cmake -DCMAKE_INSTALL_PREFIX=$out \ + -DBUILD_MEGAGLEST=On \ + -DBUILD_MEGAGLEST_MAP_EDITOR=On \ + -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On \ + -DBUILD_MEGAGLEST_MODEL_VIEWER=On ''; postInstall = '' diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index ebf04ec75363ff53a1a4a247688c53e1aef696ca..e59181bb0fa0800faf5132b48e5125401b822980 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm , openjdk -, mesa, openal +, libGLU_combined, openal , useAlsa ? false, alsaOss ? null }: with stdenv.lib; @@ -36,7 +36,7 @@ in stdenv.mkDerivation { cat > $out/bin/minecraft << EOF #!${stdenv.shell} - export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa openal ]} + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libGLU_combined openal ]} ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \ ${jre}/bin/java -jar $out/minecraft.jar EOF diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index b40083bedba8513c87892c1f55dce542a2f32d4c..fee8919bb2363536aacaa29337070fc54f4a12c8 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit +, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, sqlite, luajit , freetype, gettext, doxygen, ncurses, leveldb }: let - version = "0.4.15"; + version = "0.4.16"; sources = { src = fetchFromGitHub { owner = "minetest"; repo = "minetest"; rev = "${version}"; - sha256 = "0bn4102d0hq774bn6hqhrs6qzl4sancrs4j15w4318bqdndk4676"; + sha256 = "048m8as01bw4pnwfxx04wfnyljxq7ivk88l214zi18prrrkfamj3"; }; data = fetchFromGitHub { owner = "minetest"; repo = "minetest_game"; rev = "${version}"; - sha256 = "1mjj40slfiw0khg9nrq8yfmnay237z5jm1cg9hrsiq2fkjrr8w2m"; + sha256 = "0alikzyjvj9hd8s3dd6ghpz0y982w2j0yd2zgd7a047mxw21hrcn"; }; }; in stdenv.mkDerivation { @@ -36,7 +36,7 @@ in stdenv.mkDerivation { 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 + cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm libGLU_combined openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen ncurses leveldb ]; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 03052c52f7fe02695ca58890878942f71e86bdb2..a5b349334923eebd5d7ae1a9b48890d95deb9da5 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,32 +1,42 @@ { stdenv , fetchurl -, pythonPackages +, python }: -let - version = "2.3.2"; -in pythonPackages.buildPythonApplication rec { - name = "mnemosyne-${version}"; + +python.pkgs.buildPythonApplication rec { + pname = "mnemosyne"; + version = "2.6"; + src = fetchurl { - url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; - sha256 = "0jkrw45i4v24p6xyq94z7rz5948h7f5dspgs5mcdaslnlp2accfp"; + url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${version}/Mnemosyne-${version}.tar.gz"; + sha256 = "0b7b5sk5bfbsg5cyybkv5xw9zw257v3khsn0lwlbxnlhakd0rsg4"; }; - propagatedBuildInputs = with pythonPackages; [ - pyqt4 + + propagatedBuildInputs = with python.pkgs; [ + pyqt5 matplotlib cherrypy + cheroot webob + pillow ]; - preConfigure = '' + + # No tests/ directrory in tarball + doCheck = false; + + prePatch = '' substituteInPlace setup.py --replace /usr $out find . -type f -exec grep -H sys.exec_prefix {} ';' | cut -d: -f1 | xargs sed -i s,sys.exec_prefix,\"$out\", ''; + postInstall = '' mkdir -p $out/share - mv $out/lib/python2.7/site-packages/$out/share/locale $out/share - rm -r $out/lib/python2.7/site-packages/nix + mv $out/${python.sitePackages}/$out/share/locale $out/share + rm -r $out/${python.sitePackages}/nix ''; + meta = { - homepage = http://mnemosyne-proj.org/; + homepage = https://mnemosyne-proj.org/; description = "Spaced-repetition software"; longDescription = '' The Mnemosyne Project has two aspects: diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix index 8ea8dfccb166a9f8944565aaa49101bbc831658d..d0c07b71e2ea5558f14f142120a81dedc2ff4f1e 100644 --- a/pkgs/games/moon-buggy/default.nix +++ b/pkgs/games/moon-buggy/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.rybern]; platforms = stdenv.lib.platforms.linux; - homepage = http://www.seehuhn.de/pages/moon-buggy; + homepage = https://www.seehuhn.de/pages/moon-buggy; }; } diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 078075931dae71c686ffa3e1bc33ad10681c9850..673efb0e118dac69e9cddaea0d0056e938601842 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp -r mudlet-lua $out makeWrapper $out/mudlet $out/bin/mudlet \ - --set LUA_CPATH "\"${luaFileSystemPath};${luaZipPath};${lrexlibPath};${luasqlitePath}\"" \ + --set LUA_CPATH "${luaFileSystemPath};${luaZipPath};${lrexlibPath};${luasqlitePath}" \ --run "cd $out"; ''; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index e438008b19c26260184669f9524f60cf4c6f8d28..35444f82f66e876d956d4fc6f498dc66295d093a 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,46 +1,24 @@ -{ stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, quazip }: +{ stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: let - libnbt = fetchFromGitHub { - owner = "MultiMC"; - repo = "libnbtplusplus"; - rev = "4b305bb"; - sha256 = "1zj7pxk0g5zl16hrngb4rss00hi019rylin7zgf18kaymc54nbcs"; - }; -in -stdenv.mkDerivation { - name = "multimc-0.5.1"; + libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; +in stdenv.mkDerivation rec { + name = "multimc-${version}"; + version = "0.6.1"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "0.5.1"; - sha256 = "0wmlnwcq3gxrbmc53j96aa64pp1kmnlxiifhzngcb5kfmbbc8a20"; + rev = version; + sha256 = "0glsf4vfir8w24bpinf3cx2ninrcp7hpq9cl463wl78dvqfg47kx"; + fetchSubmodules = true; }; - buildInputs = [ cmake qtbase jdk zlib file makeWrapper ]; - - libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; - postUnpack = '' - 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 - ''; + nativeBuildInputs = [ cmake file makeWrapper ]; + buildInputs = [ qtbase jdk zlib ]; enableParallelBuilding = true; - # the install rule tries to bundle ALL deps into the output for portability - installPhase = '' - RESULT=/run/opengl-driver/lib/ - for x in $libpath; do - RESULT=$x/lib/:$RESULT - done - - mkdir -pv $out/bin/jars $out/lib - cp -v MultiMC $out/bin/ - cp -v jars/*.jar $out/bin/jars/ #*/ - 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/ + postInstall = '' + wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 3fd20e6221e67eb4e40760f2a00e5aa04610a297..d8a4e32faaab4b22fed8ed6a4c6b498627fc7372 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis -, libpng, mesa, makeWrapper, zlib, freetype }: +, libpng, libGLU_combined, makeWrapper, zlib, freetype }: let pname = "naev"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb"; }; - buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib freetype ]; + buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU_combined zlib freetype ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 92d87697fb16fcd602f6018ed0f6ae3331bbdcba..b67a79aa3fe772887b19e8e78c0e364766c38b05 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -2,11 +2,11 @@ let platform = - if lib.elem stdenv.system lib.platforms.unix then "unix" - else abort "Unknown platform for NetHack"; + if stdenv.hostPlatform.isUnix then "unix" + else throw "Unknown platform for NetHack: ${stdenv.system}"; unixHint = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macosx10.10" + /**/ if stdenv.hostPlatform.isLinux then "linux" + else if stdenv.hostPlatform.isDarwin then "macosx10.10" # We probably want something different for Darwin else "unix"; userDir = "~/.config/nethack"; diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 0006f895809b62ae8ad1d8e1cb3e9870a00b22cb..50f96a7ee2c8b7642ae00836a4d287ce39554707 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, SDL2, mesa_noglu, libpng, libjpeg, SDL2_ttf, libvorbis, gettext +{ stdenv, fetchurl, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext , physfs }: stdenv.mkDerivation rec { name = "neverball-1.6.0"; src = fetchurl { - url = "http://neverball.org/${name}.tar.gz"; + url = "https://neverball.org/${name}.tar.gz"; sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk"; }; - buildInputs = [ libpng SDL2 mesa_noglu libjpeg SDL2_ttf libvorbis gettext physfs ]; + buildInputs = [ libpng SDL2 libGL libjpeg SDL2_ttf libvorbis gettext physfs ]; dontPatchElf = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://neverball.org/; + homepage = https://neverball.org/; description = "Tilt the floor to roll a ball"; license = "GPL"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index 7bbc797b4f16ff3cb58f09d1232a5e108ac5bfc7..0fe9d1ee0f57cff4e5eb755011c86e2e20276c9b 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, freeglut, mesa }: +{ stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }: stdenv.mkDerivation rec { name = "newtonwars-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0g63fwfcdxxlnqlagj1fb8ngm385gmv8f7p8b4r1z5cny2znxdvs"; }; - buildInputs = [ makeWrapper freeglut mesa ]; + buildInputs = [ makeWrapper freeglut libGLU_combined ]; patchPhase = '' sed -i "s;font24.raw;$out/share/font24.raw;g" display.c @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/nw \ --prefix LD_LIBRARY_PATH ":" ${freeglut}/lib \ - --prefix LD_LIBRARY_PATH ":" ${mesa}/lib + --prefix LD_LIBRARY_PATH ":" ${libGLU_combined}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index bde567a190339b866728d83cb671e77178a1de4c..39b3ae36f506f658245baaad1c058bec6e9e0edf 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -3,7 +3,7 @@ unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora , libogg, libmodplug , # glx - libX11, mesa, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib + libX11, libGLU_combined, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib , # sdl SDL }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation { # required for both unzip # glx - libX11 mesa libXpm libXext libXxf86vm libXxf86dga alsaLib + libX11 libGLU_combined libXpm libXext libXxf86vm libXxf86dga alsaLib # sdl SDL ]; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index 0b0561afd24dcef4eb1f8736ae793a89ec87e511..e4bcef29878cd6cc026aec9d799f00197cbe74ba 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, gnome3, pcre, freetype, glew, gtk3, libjpeg, libpng, - SDL, SDL_mixer, libupnp, xorg, pkgconfig, gtest, tinyxml, gmock, readline, - libxkbcommon, epoxy, at_spi2_core, dbus, libxml2, - enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther +{ stdenv, fetchurl, cmake, pkgconfig +, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal +, freealut, readline, gcc-unwrapped +, enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther }: let @@ -10,32 +10,38 @@ let sha256 = "1ckj0dlpp5zsnkbb5qxxfxpkiq76jj2fgj91fyf3ll7n0gbwcgw5"; }; in stdenv.mkDerivation rec { - version = "7.0"; + version = "8.1"; name = "openclonk-${version}"; src = fetchurl { - url = "http://www.openclonk.org/builds/release/7.0/openclonk-${version}-src.tar.bz2"; - sha256 = "0ch71dqaaalg744pc1gvg6sj2yp2kgvy2m4yh6l7ljkpf8fj66mw"; + url = "http://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; + sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"; }; postInstall = '' mv -v $out/games/openclonk $out/bin/ '' + stdenv.lib.optionalString enableSoundtrack '' - cp -v ${soundtrack_src} $out/share/games/openclonk/Music.ocg + ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ - cmake gnome3.gtksourceview pcre freetype glew gtk3 libjpeg libpng SDL - SDL_mixer libupnp tinyxml xorg.libpthreadstubs libxkbcommon xorg.libXdmcp - pkgconfig gtest gmock readline epoxy at_spi2_core dbus libxml2 + SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut + readline ]; + cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; + + cmakeBuildType = "RelWithDebInfo"; + meta = with stdenv.lib; { description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; - homepage = http://openclonk.org; + homepage = https://www.openclonk.org; license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; - platforms = platforms.all; + maintainers = with maintainers; [ lheckemann ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index c65dad7bd4fa459a5c64f59cafc2be39f659e5c2..fd662fe9743e57182d056e187944ffaf5db3478a 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, mesa_noglu, SDL2 }: +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, libGL, SDL2 }: let jamp = makeDesktopItem rec { @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper cmake ]; - buildInputs = [ libjpeg zlib libpng mesa_noglu SDL2 ]; + buildInputs = [ libjpeg zlib libpng libGL SDL2 ]; # move from $out/JediAcademy to $out/opt/JediAcademy preConfigure = '' diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 53c2cc5d073a7ea0ba5d711b4984e3ff310bb486..f64bbe4c1255024c0a1067c3454ce1a46b1375b8 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -6,12 +6,12 @@ let src = fetchFromGitHub { owner = "OpenMW"; repo = "osg"; - rev = "35f1a459a4ab6da9d70427e6539bdf4faae4cc91"; - sha256 = "1s3a9dpbcc6v8d05pqin4xfv36i2031xpdja1vl8x11cw05fln91"; + rev = "2b4c8e37268e595b82da4b9aadd5507852569b87"; + sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb"; }; }); in stdenv.mkDerivation rec { - version = "0.42.0"; + version = "0.43.0"; name = "openmw-${version}"; src = fetchFromGitHub { diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index cb9e296cdd4f7314c78e34ef1d20506ad8ef9d12..aba92ac087e8f502bd31c7654fc8142781aa821d 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal -, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, mesa_noglu, terra }: +, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, libGL, terra }: let mygui_ = mygui.override { @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper fakegit ]; buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt - ncurses mesa_noglu ]; + ncurses libGL ]; buildPhase = '' mkdir dependencies keepers diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 5665dfc9e945d50b651d5d94a328193ea5c51fe0..069ed900e8f09407499ed50f366bd49bf3029f59 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "openra-${version}"; - version = "20171014"; + version = "20180307"; meta = with stdenv.lib; { description = "Real Time Strategy game engine recreating the C&C titles"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "OpenRA"; repo = "OpenRA"; rev = "release-${version}"; - sha256 = "0nlwpmiwhjs3qc2lxwnrh4p874v5y6mf4avi6bqgr1wvzc43n8wr"; + sha256 = "05c6vrmlgzfxgfx1idqmp6czmr079px3n57q5ahnwzqvcl11a2jj"; extraPostFetch = '' sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 6881767cbb904ead5af79e0c3948110d0c6227ea..e34f29300ab4a3e8f4c0800007ed9a328471360b 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchurl, fetchFromGitHub, SDL2, cmake, curl, fontconfig, freetype, jansson, libiconv, libpng, - libpthreadstubs, libzip, mesa_glu, openssl, pkgconfig, speexdsp, zlib + libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib }: let name = "openrct2-${version}"; - version = "0.1.1"; + version = "0.1.2"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1xxwqx2gzvsdrsy76rz3sys9m4pyn9q25nbnkba3cw1z4l2b73lg"; + sha256 = "1zqrdxr79c9yx4bdxz1r5866hhwq0lcs9qpv3vhisr56ar5n5wk3"; }; title-sequences-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "title-sequences"; - rev = "v0.1.0"; - sha256 = "17c926lhby90ilvyyl6jsiy0df8dw5jws97xigp3x8hddhvv7c16"; + rev = "v0.1.2"; + sha256 = "1yb1ynkfmiankii3fngr9km5wbc07rp30nh0apkj6wryrhy7imgm"; }; in stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libpng libpthreadstubs libzip - mesa_glu + libGLU openssl pkgconfig speexdsp diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 6dd098ee7b8e511513e7dd8a63f876f9cd9844c1..5a8a8d244bf6dc5c130ad174c435cc93a1237282 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, sfml, mesa, bullet, glm, libmad, x11, openal +{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, x11, openal , SDL2, boost, ffmpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake sfml mesa bullet glm libmad x11 openal SDL2 boost ffmpeg + cmake sfml libGLU_combined bullet glm libmad x11 openal SDL2 boost ffmpeg ]; meta = with stdenv.lib; { diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 02e4e9c608f0bc509499afc23e74b6d415a9ccaa..582cafcc4d462f59331d171574b5f76326e9439b 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,24 +1,24 @@ { stdenv, lib, fetchurl, fetchFromGitHub, cmake, unzip, zip, file -, curl, glew , mesa_noglu, SDL2, SDL2_image, zlib, freetype, imagemagick +, curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick , openal , opusfile, libogg }: stdenv.mkDerivation rec { name = "openspades-${version}"; - version = "0.1.1b"; + version = "0.1.2"; devPakVersion = "33"; src = fetchFromGitHub { owner = "yvt"; repo = "openspades"; rev = "v${version}"; - sha256 = "1xk3il5ykxg68hvwb42kpspcxppdib7y3ysaxb8anmmcsk1m3drn"; + sha256 = "1mfj46c3pnn1f6awy3b6faxs26i93a5jsrvkdlr12ndsykvi6ng6"; }; nativeBuildInputs = [ cmake imagemagick unzip zip file ]; buildInputs = [ - freetype SDL2 SDL2_image mesa_noglu zlib curl glew opusfile openal libogg + freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg ]; cmakeFlags = [ diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 2ecff1c835e86f744faf1354ce7b29c9491d44c5..78fdb32b43605a37119e7551dd4853da8d99acfd 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.7.1"; + version = "1.8.0"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0dhv5bbbg1dmmq7fi3xss0a9jq2rqgb5sf9fsqzlsjcdm590j6b1"; + sha256 = "0zq8xdg0k92p3s4j9x76591zaqz7k9ra69q008m209vdfffjvly2"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 65c2a42922b284c01c4fbc0f8cd84f82c8863cdf..30470e98c58d0ac18f82fd322c1d6fcaaa2a5061 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,22 +1,18 @@ -{stdenv, fetchurl, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost +{stdenv, fetchFromGitHub, fetchpatch, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: -let version = "1.0.0"; in +let version = "1.0.0.2018.01.28"; in stdenv.mkDerivation { name = "openxcom-${version}"; - src = fetchurl { - url = http://openxcom.org/file/1726/; - sha256 = "1rmg10nklvf86ckbbssyvbg5cd4p7in5zq3mas2yyffdjk9i40v6"; - name = "openxcom-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "SupSuper"; + repo = "OpenXcom"; + rev = "b148916268a6ce104c3b6b7eb4d9e0487cba5487"; + sha256 = "1128ip3g4aw59f3f23mvlyhl8xckhwjjw9rd7wn7xv51hxdh191c"; }; - buildInputs = [ cmake mesa zlib openssl libyamlcpp boost - SDL SDL_image SDL_mixer SDL_gfx ]; - - patches = [ (fetchpatch { - url = "https://github.com/SupSuper/OpenXcom/commit/49bec0851fc6e5365cac0f71b2c40a80ddf95e77.patch"; - sha256 = "156fk8wz4qc0nmqq3zjb6kw84qirabads2azr6xvlgb3lcn327v2"; - }) ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU_combined openssl zlib ]; meta = { description = "Open source clone of UFO: Enemy Unknown"; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 9704cb93e6b4b7b9569479a038a5cf8dc50d5b08..e8bac9571f89b0a3b889b69005996c2140134e52 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig -, mesa}: +{stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer +, pkgconfig, libGLU_combined}: let s = # Generated upstream information rec { @@ -14,10 +14,17 @@ in stdenv.mkDerivation rec { inherit (s) name version; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU_combined]; src = fetchurl { inherit (s) url sha256; }; + patches = [ + # fix build with gcc7 + (fetchpatch { + url = https://github.com/Pingus/pingus/commit/df6e2f445d3e2925a94d22faeb17be9444513e92.patch; + sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p"; + }) + ]; makeFlags = '' PREFIX="$(out)" ''; meta = { inherit (s) version; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 51f2b6a8c4e4096cd10f07ebc22cf546b3c1403f..ffe0841184b1bf8a0aca0f81c6ea527b8b5116a5 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,38 +1,35 @@ -{ fetchFromGitHub, stdenv, automake, curl, libsigcxx, SDL2 -, SDL2_image, freetype, libvorbis, libpng, assimp, mesa -, autoconf, pkgconfig }: - -let - version = "20160116"; - checksum = "07w5yin2xhb0fdlj1aipi64yx6vnr1siahsy0bxvzi06d73ffj6r"; -in +{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig +, curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU_combined +}: + stdenv.mkDerivation rec { name = "pioneer-${version}"; + version = "20180203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = checksum; + sha256 = "0hp2mf36kj2v93hka8m8lxw2qhmnjc62wjlpw7c7ix0r8xa01i6h"; }; - buildInputs = [ - automake curl libsigcxx SDL2 SDL2_image freetype libvorbis - libpng assimp mesa autoconf pkgconfig - ]; + nativeBuildInputs = [ autoconf automake pkgconfig ]; + + buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng assimp libGLU_combined ]; NIX_CFLAGS_COMPILE = [ "-I${SDL2}/include/SDL2" ]; - preConfigure = '' export PIONEER_DATA_DIR="$out/share/pioneer/data"; ./bootstrap ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { - description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century"; + description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = https://pioneerspacesim.net; license = with licenses; [ gpl3 cc-by-sa-30 diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 3898ddba71395e45fb64fd886a92fa3489f8c694..53de9fa29e2d088c5f259ea73d87779b94dc62db 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -1,16 +1,14 @@ -{stdenv, fetchurl, gtk2, pkgconfig, intltool } : +{stdenv, fetchurl, gtk3, pkgconfig, intltool } : stdenv.mkDerivation rec { - name = "pioneers-0.12.3"; + name = "pioneers-15.4"; src = fetchurl { url = "mirror://sourceforge/pio/${name}.tar.gz"; - sha256 = "1yqypk5wmia8fqyrg9mn9xw6yfd0fpkxj1355csw1hgx8mh44y1d"; + sha256 = "1p1d18hrfmqcnghip3shkzcs5qkz6j99jvkdkqfi7pqdvjc323cs"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 intltool ]; - - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gtk3 ]; meta = { homepage = http://pio.sourceforge.net/; diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index 95ad53cb1ae3787912ec46f95dc95dfe6fd40888..4babc1caea5abf2af4768910b714e1805e6acfeb 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_mixer, SDL_net, mesa}: +{stdenv, fetchurl, SDL, SDL_mixer, SDL_net, libGLU_combined}: stdenv.mkDerivation { name = "prboom-2.5.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12"; }; - buildInputs = [ SDL SDL_mixer SDL_net mesa ]; + buildInputs = [ SDL SDL_mixer SDL_net libGLU_combined ]; crossAttrs = { propagatedBuildInputs = [ SDL.crossDrv SDL_mixer.crossDrv SDL_net.crossDrv ]; configureFlags = "--disable-gl --disable-cpu-opt --without-x --disable-sdltest diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index e3116ae6e9da82564ba2e3b85643cbbc31184183..f6f3e6001825c7d2b2e1e03f132a1d7131ea6ff8 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib, gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, - libXmu, mesa, openal, pixman, pkgconfig, python27, SDL }: + libXmu, libGLU_combined, openal, pixman, pkgconfig, python27, SDL }: stdenv.mkDerivation { name = "privateer-1.03"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng - libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal + libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU_combined openal pixman pkgconfig python27 SDL ]; patches = [ ./0001-fix-VSFile-constructor.patch ]; diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..85424ebea9ba6c14c74abc269b15737c09405c7c --- /dev/null +++ b/pkgs/games/pysolfc/default.nix @@ -0,0 +1,39 @@ +{ fetchurl, python2, stdenv }: + +with python2.pkgs; + +buildPythonApplication rec { + pname = "PySolFC"; + version = "2.0"; + + src = fetchurl { + url = "mirror://sourceforge/pysolfc/${pname}-${version}.tar.bz2"; + sha256 = "0v0v8iflw55f5mghglkw80j8b7lv1hffjassfhqc4y84dmz8xjyv"; + }; + + patches = [ + ./pysolfc-datadir.patch + ]; + + propagatedBuildInputs = [ + tkinter + ]; + + # No tests in archive + doCheck = false; + + postInstall = '' + # executables should not have an extension + pushd $out/bin + mv pysol.py pysol + rm pysol.pyc + popd + ''; + + meta = with stdenv.lib; { + description = "A collection of more than 1000 solitaire card games"; + homepage = http://pysolfc.sourceforge.net/; + license = licenses.gpl3; + maintainers = with maintainers; [ kierdavis ]; + }; +} diff --git a/pkgs/games/pysolfc/pysolfc-datadir.patch b/pkgs/games/pysolfc/pysolfc-datadir.patch new file mode 100644 index 0000000000000000000000000000000000000000..d9f1cf4e09f50bf318b3969f77494f7d1b02dc9c --- /dev/null +++ b/pkgs/games/pysolfc/pysolfc-datadir.patch @@ -0,0 +1,19 @@ +diff --git a/pysollib/util.py b/pysollib/util.py +index 8de3f00..26f4bc7 100644 +--- a/pysollib/util.py ++++ b/pysollib/util.py +@@ -110,13 +110,7 @@ class DataLoader: + head, tail = os.path.split(argv0) + if not head: + head = os.curdir +- # dir where placed startup script +- path.append(head) +- path.append(os.path.join(head, "data")) +- path.append(os.path.join(head, os.pardir, "data")) +- # dir where placed pysol package +- path.append(os.path.join(sys.path[0], "data")) +- path.append(os.path.join(sys.path[0], "pysollib", "data")) ++ path.append(os.path.join(head, "..", "share", "PySolFC")) + # from settings.py + path.extend(DATA_DIRS) + # check path for valid directories diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index 4848d1a3e2151e03bf08221620e80764f41ffce3..924101c2d4a892386ac3f7948105a1e7b8f6e406 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -1,8 +1,15 @@ -{ stdenv, fetchFromGitHub, makeWrapper, qmake, qt56 }: +{ stdenv +, fetchFromGitHub +, makeWrapper +, qmake +, qtbase +, qtmultimedia +, qttranslations +}: stdenv.mkDerivation rec { name = "qgo-${version}"; - version = "unstable-2016-06-23"; + version = "unstable-2017-12-18"; meta = with stdenv.lib; { description = "A Go client based on Qt5"; @@ -26,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "pzorin"; repo = "qgo"; - rev = "1e65b0c74914e534ea4d040f8f0ef8908383e374"; + rev = "bef526dda4c79686edd95c88cc68de24f716703c"; sha256 = "1xzkayclmhsi07p9mnbf8185jw8n5ikxp2mik3x8qz1i6rmrfl5b"; }; @@ -35,14 +42,7 @@ stdenv.mkDerivation rec { 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 ]; + buildInputs = [ qtbase 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 "${stdenv.lib.getBin qt56.qtbase}/lib/qt-5.6/plugins/platforms/" - ''; + } diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bee7d7703ab5bc57d0126d68e052dc249668db5d --- /dev/null +++ b/pkgs/games/quake2/yquake2/default.nix @@ -0,0 +1,93 @@ +{ stdenv, lib, fetchFromGitHub, buildEnv, cmake, makeWrapper +, SDL2, libGL +, oggSupport ? true, libogg, libvorbis +, openalSupport ? true, openal +, zipSupport ? true, zlib +}: + +let + mkFlag = b: if b then "ON" else "OFF"; + + games = import ./games.nix { inherit stdenv lib fetchFromGitHub cmake; }; + + wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; }; + + yquake2 = stdenv.mkDerivation rec { + name = "yquake2-${version}"; + version = "7.20"; + + src = fetchFromGitHub { + owner = "yquake2"; + repo = "yquake2"; + rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "1yrmn8vajab3zd0fni029s6wrvv2ljn1kyhaiw02wm1dc5yyzb2g"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ SDL2 libGL ] + ++ lib.optionals oggSupport [ libogg libvorbis ] + ++ lib.optional openalSupport openal + ++ lib.optional zipSupport zlib; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DOGG_SUPPORT=${mkFlag oggSupport}" + "-DOPENAL_SUPPORT=${mkFlag openalSupport}" + "-DZIP_SUPPORT=${mkFlag zipSupport}" + "-DSYSTEMWIDE_SUPPORT=ON" + ]; + + preConfigure = '' + # Since we can't expand $out in `cmakeFlags` + cmakeFlags="$cmakeFlags -DSYSTEMDIR=$out/share/games/quake2" + ''; + + installPhase = '' + # Yamagi Quake II expects all binaries (executables and libs) to be in the + # same directory. + mkdir -p $out/bin $out/lib/yquake2 $out/share/games/quake2 + cp -r release/* $out/lib/yquake2 + ln -s $out/lib/yquake2/quake2 $out/bin/yquake2 + ln -s $out/lib/yquake2/q2ded $out/bin/yq2ded + cp $src/stuff/yq2.cfg $out/share/games/quake2 + ''; + + meta = with stdenv.lib; { + description = "Yamagi Quake II client"; + homepage = "https://www.yamagi.org/quake2/"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ tadfisher ]; + }; + }; + +in rec { + inherit yquake2; + + yquake2-ctf = wrapper { + games = [ games.ctf ]; + name = "yquake2-ctf"; + inherit (games.ctf) description; + }; + + yquake2-ground-zero = wrapper { + games = [ games.ground-zero ]; + name = "yquake2-ground-zero"; + inherit (games.ground-zero) description; + }; + + yquake2-the-reckoning = wrapper { + games = [ games.the-reckoning ]; + name = "yquake2-the-reckoning"; + inherit (games.the-reckoning) description; + }; + + yquake2-all-games = wrapper { + games = lib.attrValues games; + name = "yquake2-all-games"; + description = "Yamagi Quake II with all add-on games"; + }; +} diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix new file mode 100644 index 0000000000000000000000000000000000000000..059fb26eb9b888feaa4b5c4c58c2462477572284 --- /dev/null +++ b/pkgs/games/quake2/yquake2/games.nix @@ -0,0 +1,59 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +let + games = { + ctf = { + id = "ctf"; + version = "1.05"; + description = "'Capture The Flag' for Yamagi Quake II"; + sha256 = "15ihspyshls645ig0gq6bwdzvghyyysqk60g6ad3n4idb2ms52md"; + }; + + ground-zero = { + id = "rogue"; + version = "2.04"; + description = "'Ground Zero' for Yamagi Quake II"; + sha256 = "0x1maaycrxv7d3xvvk1ih2zymhvcd3jnab7g3by8qh6g5y33is5l"; + }; + + the-reckoning = { + id = "xatrix"; + version = "2.05"; + description = "'The Reckoning' for Yamagi Quake II"; + sha256 = "0gf2ryhgz8nw1mb1arlbriihjsx09fa0wmkgcayc8ijignfi1qkh"; + }; + }; + + toDrv = title: data: stdenv.mkDerivation rec { + inherit (data) id version description sha256; + inherit title; + + name = "yquake2-${title}-${version}"; + + src = fetchFromGitHub { + inherit sha256; + owner = "yquake2"; + repo = data.id; + rev = "${lib.toUpper id}_${builtins.replaceStrings ["."] ["_"] version}"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + mkdir -p $out/lib/yquake2/${id} + cp Release/* $out/lib/yquake2/${id} + ''; + + meta = with stdenv.lib; { + inherit (data) description; + homepage = "https://www.yamagi.org/quake2/"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = with maintainers; [ tadfisher ]; + }; + }; + +in + lib.mapAttrs toDrv games diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix new file mode 100644 index 0000000000000000000000000000000000000000..8cd1044456ac4e69b7636854d885924bbd57797d --- /dev/null +++ b/pkgs/games/quake2/yquake2/wrapper.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, buildEnv, makeWrapper, yquake2 }: + +{ games +, name +, description +}: + +let + env = buildEnv { + name = "${name}-env"; + paths = [ yquake2 ] ++ games; + }; + +in stdenv.mkDerivation { + inherit name; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + '' + lib.concatMapStringsSep "\n" (game: '' + makeWrapper ${env}/bin/yquake2 $out/bin/yquake2-${game.title} \ + --add-flags "+set game ${game.id}" + makeWrapper ${env}/bin/yq2ded $out/bin/yq2ded-${game.title} \ + --add-flags "+set game ${game.id}" + '') games; + + meta = { + inherit description; + }; +} diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index d94a1f9a8d4db08855fc4b3dd2ae9d9dae47ccb4..4e3a50b37b9a23ec432f217e6fac29bdda8cb9d5 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, which, pkgconfig, xlibsWrapper, SDL2, mesa, openalSoft -, curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype +{ stdenv, fetchFromGitHub, which, pkgconfig, SDL2, libGLU_combined, openalSoft +, curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype }: stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2017-07-25"; + version = "2018-02-23"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "356ae10ef65d4401958d50f03288dcb22d957c96"; - sha256 = "0dz4zqlb9n3skaicj0vfvq4nr3ig80s8nwj9m87b39wc9wq34c5j"; + rev = "0d6edd227a13f1447938da1d1b020303c2545eb2"; + sha256 = "1nsagyzrai8cxhabcv2my8bbwmwckvri288j6x4qi5bmp78xl4hx"; }; nativeBuildInputs = [ which pkgconfig ]; - buildInputs = [ xlibsWrapper SDL2 mesa openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ]; + buildInputs = [ + SDL2 libGLU_combined openalSoft curl speex opusfile libogg libvorbis libopus libjpeg + freetype mumble + ]; enableParallelBuilding = true; @@ -28,11 +31,11 @@ stdenv.mkDerivation rec { mkdir -p $out/baseq3 ''; - meta = { + meta = with stdenv.lib; { homepage = https://ioquake3.org/; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.eelco lib.maintainers.abbradar ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ eelco abbradar ]; }; } diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 5f65d26140c843da85f75968bb0737e5cc24efbd..69b166664be4242751bcf708eaba5bc00e250d43 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildEnv, lib, fetchurl, mesa_noglu, ioquake3, makeWrapper }: +{ stdenv, buildEnv, lib, fetchurl, libGL, ioquake3, makeWrapper }: { paks, name ? (stdenv.lib.head paks).name, description ? "" }: let - libPath = lib.makeLibraryPath [ mesa_noglu stdenv.cc.cc ]; + libPath = lib.makeLibraryPath [ libGL stdenv.cc.cc ]; env = buildEnv { name = "quake3-env"; paths = [ ioquake3 ] ++ paks; diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index be480009b8a6a0b69fd08d38a35bb3d1ea6beaf4..45c3deef172fdf3cd85530d46e182cb04cad72bf 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -10,30 +10,32 @@ stdenv.mkDerivation rec { }; sourceRoot = "${name}/Quake"; - + buildInputs = [ gzip SDL libvorbis libmad ]; + buildFlags = [ "DO_USERDIRS=1" ]; + 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, + 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 + 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/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix new file mode 100644 index 0000000000000000000000000000000000000000..d53977448f63e5fe0f03d1583d19ea793119b214 --- /dev/null +++ b/pkgs/games/quakespasm/vulkan.nix @@ -0,0 +1,49 @@ +{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-loader }: +stdenv.mkDerivation rec { + name = "vkquake-${version}"; + majorVersion = "0.97"; + version = "${majorVersion}.3"; + + src = fetchFromGitHub { + owner = "Novum"; + repo = "vkQuake"; + rev = version; + sha256 = "11z9k5aw9ip7ggmgjdnaq4g45pxqiy0xhd4jqqmgzpmfdbjk4x13"; + }; + + sourceRoot = "source/Quake"; + + buildInputs = [ + makeWrapper gzip SDL2 libvorbis libmad vulkan-loader.dev + ]; + + buildFlags = [ "DO_USERDIRS=1" ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + makeFlags = [ "prefix=$(out) bindir=$(out)/bin" ]; + + postFixup = '' + wrapProgram $out/bin/vkquake --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + + enableParallelBuilding = true; + + meta = { + description = "Vulkan Quake port based on QuakeSpasm"; + homepage = src.meta.homepage; + longDescription = '' + vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering. + It is based on the popular QuakeSpasm port and runs all mods compatible with it + like Arcane Dimensions or In The Shadows. vkQuake also serves as a Vulkan demo + application that shows basic usage of the API. For example it demonstrates render + passes & sub passes, pipeline barriers & synchronization, compute shaders, push & + specialization constants, CPU/GPU parallelism and memory pooling. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + }; +} diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index e96cf5e59322aa36b9b87c52514ed9cc73fc8caf..d0f1d500eaf5484bd2789d8cc41ad49cb19844a2 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib -, openglSupport ? false, mesa ? null +, openglSupport ? false, libGLU_combined ? null }: -assert openglSupport -> mesa != null; +assert openglSupport -> libGLU_combined != null; with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] - ++ optional openglSupport mesa; + ++ optional openglSupport libGLU_combined; configureFlags = [ "--enable-all-engines" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Interpreter for LucasArts' Lua-based 3D adventure games"; homepage = http://residualvm.org/; repositories.git = https://github.com/residualvm/residualvm.git; - licencse = licenses.gpl2; + license = licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 0d0602524e7952d393a232a1298acc7bc2dd3ee8..a038957f701edc0baa14d6a99034132b71baf2a7 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, mesa, boost, +{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost, pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, pixman, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost + buildInputs = [ wxGTK30 freeimage cmake zziplib libGLU_combined boost libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index caaedc44ee0c30db00d97eceaae6e715b2840382..b84e7dd3af61557254a87d588340b8be8ede6e6f 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${project}-${version}"; project = "rocksndiamonds"; - version = "4.0.0.2"; + version = "4.0.1.4"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz"; - sha256 = "0dzn6vlayvnkjm64zwva337rn07lc21kq93m2h8zz8j3wpl11pb4"; + sha256 = "0rvi4crfh4rfczpsflzcfj6nqrg49mhm163k6ms9gxz97xj2jp3g"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index b246a94715e45319aa5d47180a9246cf01217348..40f0b17549412669927a08acf9f8aab23169d884 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - "http://pkgs.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" + "http://src.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue5.4.4-src.tar.gz" "http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz" ]; @@ -14,6 +14,9 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; + # Fix build for recent ncurses versions + NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + meta = { homepage = http://rogue.rogueforge.net/rogue-5-4/; description = "The final version of the original Rogue game developed for the UNIX operating system"; diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 61a9310ae212c0aa53f3a709f247e3784fc374b4..f48736a56d601333f033296ab1090f50a28719a5 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, mesa, SDL, SDL_image, SDL_mixer +{ stdenv, fetchsvn, libGLU_combined, SDL, SDL_image, SDL_mixer , libpng, zlib, libjpeg, imagemagick, libX11 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - mesa SDL SDL_image SDL_mixer libpng zlib libjpeg imagemagick + libGLU_combined SDL SDL_image SDL_mixer libpng zlib libjpeg imagemagick libX11 ]; diff --git a/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch b/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch new file mode 100644 index 0000000000000000000000000000000000000000..63f31d7ef9e0548b9cbc1029cb4a0349a53a26a0 --- /dev/null +++ b/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch @@ -0,0 +1,77 @@ +From 7e99cf4ae3f38406133a4abf962527cd02416f8e Mon Sep 17 00:00:00 2001 +From: Sebastian Galkin +Date: Wed, 20 Dec 2017 18:23:03 -0200 +Subject: [PATCH] put fonts in $out + +--- + Makefile.conf | 22 ++++------------------ + configure | 12 ------------ + 2 files changed, 4 insertions(+), 30 deletions(-) + +diff --git a/Makefile.conf b/Makefile.conf +index e7f8de9..87f3fff 100644 +--- a/Makefile.conf ++++ b/Makefile.conf +@@ -226,19 +226,11 @@ install_scid: all_scid + fi + install -m 755 -d $(SHAREDIR)/bitmaps + cp -r ./bitmaps/* $(SHAREDIR)/bitmaps/ +- @if [ "`id -u`" -eq 0 ]; then \ +- install -m 755 -d $(FONTDIR); \ +- install -m 644 -p fonts/*.ttf $(FONTDIR); \ +- else \ +- install -m 755 -d ~/.fonts; \ +- install -m 644 -p fonts/*.ttf ~/.fonts; \ +- fi ++ install -m 755 -d $(FONTDIR); \ ++ install -m 644 -p fonts/*.ttf $(FONTDIR); \ ++ + @if [ ! -z "`which fc-cache`" ]; then \ +- if [ "`id -u`" -eq 0 ]; then \ +- fc-cache -fv $(FONTDIR); \ +- else \ +- fc-cache -fv ~/.fonts; \ +- fi; \ ++ fc-cache -fv $(FONTDIR); \ + else \ + echo "Don't know how to setup truetype fonts (fc-cache not available)."; \ + echo "Please contact your system administrator."; \ +@@ -292,12 +284,6 @@ uninstall: + for f in `ls fonts/*.ttf`; do \ + rm -f ~/.$$f; \ + done; \ +- if [ ! -z "`which fc-cache`" ]; then \ +- fc-cache -fv ~/.fonts; \ +- fi; \ +- if [ "`find ~/.fonts -type d -empty`" = "`ls -d ~/.fonts`" ]; then \ +- rmdir ~/.fonts; \ +- fi; \ + fi + + clean: +diff --git a/configure b/configure +index 4599c77..8b09678 100755 +--- a/configure ++++ b/configure +@@ -473,18 +473,6 @@ proc writeMakefile {{type ""}} { + exit 1 + } + +- if {[isDarwin]} { +- set var(FONTDIR) /Library/Fonts/ +- } else { +- # Just install fonts in to /usr irrespective of system prefix. /usr/local may not be active +- set prefix /usr +- if {![file isdirectory $prefix/share/fonts]} { +- set var(FONTDIR) "~/.fonts" +- } else { +- set var(FONTDIR) $prefix/share/fonts/truetype/Scid +- } +- } +- + set line [gets $from] + while {1} { + set line [gets $from] +-- +2.15.1 + diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..db32cb70d4135bbbd4572bb0266c4a0c8456e548 --- /dev/null +++ b/pkgs/games/scid-vs-pc/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: + +stdenv.mkDerivation rec { + name = "scid-vs-pc-${version}"; + version = "4.18.1"; + + src = fetchurl { + url = "mirror://sourceforge/scidvspc/scid_vs_pc-4.18.1.tgz"; + sha256 = "01nd88g3wh3avz1yk9fka9zf20ij8dlnpwzz8gnx78i5b06cp459"; + }; + + buildInputs = [ tcl tk libX11 zlib makeWrapper ]; + + prePatch = '' + sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \ + -e '/^ *set libraryPath *{/a ${tcl}/lib ${tk}/lib' \ + -e '/^ *set x11Path *{/a ${libX11}/lib/' \ + configure + + sed -i -e '/^ *set scidShareDir/s|\[file.*|"'"$out/share"'"|' \ + tcl/config.tcl + ''; + + # configureFlags = [ + # "BINDIR=$(out)/bin" + # "SHAREDIR=$(out)/share" + # "FONTDIR=$(out)/fonts" + # ]; + + preConfigure = ''configureFlags=" + BINDIR=$out/bin + SHAREDIR=$out/share + FONTDIR=$out/fonts" + ''; + + patches = [ + ./0001-put-fonts-in-out.patch + ]; + + hardeningDisable = [ "format" ]; + + dontPatchShebangs = true; + + postFixup = '' + for cmd in sc_addmove sc_eco sc_epgn scidpgn \ + sc_import sc_spell sc_tree spliteco + do + sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/$cmd" + done + + sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote" + sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid" + + for cmd in $out/bin/* + do + wrapProgram "$cmd" \ + --set TCLLIBPATH "${tcl}/${tcl.libdir}" \ + --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" + done + ''; + + + meta = with stdenv.lib; { + description = "Chess database with play and training functionality"; + homepage = http://scidvspc.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.paraseba ]; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 0c2952696e2c358001ac323fca13ca7f7fa20f24..430b22c9ba97a0b74770b6bd2361343836688f05 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg +{ stdenv, fetchurl, libGLU_combined, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg , freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis + [ libGLU_combined glew openalSoft freealut wxGTK libogg freetype libvorbis SDL SDL_net expat libjpeg libpng fftwSinglePrec ]; diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index c2beeb13cadf25255a35d37ea7e76ebb8e56f7a8..5f1e1a17553ba34d81eb1ebbe9d5ab64b829d5cd 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gcc -, mesa_glu, libX11, libXext, libXcursor, libpulseaudio +, libGLU, libX11, libXext, libXcursor, libpulseaudio }: stdenv.mkDerivation { name = "scrolls-2015-10-13"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ gcc - mesa_glu + libGLU libX11 libXext libXcursor diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index e965fc459ad861ff0af4aab9e271fcc421dd050b..fcde5b5ea59f0a17d2d8c70d91f7fc3d8b6e2c6e 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,19 +1,29 @@ -{ stdenv -, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib, mesa +{ stdenv, fetchurl, nasm +, alsaLib, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU_combined, SDL2, zlib , hostPlatform }: stdenv.mkDerivation rec { - name = "scummvm-1.9.0"; + name = "scummvm-${version}"; + version = "2.0.0"; src = fetchurl { - url = "http://scummvm.org/frs/scummvm/1.9.0/scummvm-1.9.0.tar.bz2"; - sha256 = "813d7d8a76e3d05b45001d37451368711dadc32899ecf907df1cc7abfb1754d2"; + url = "http://scummvm.org/frs/scummvm/${version}/${name}.tar.xz"; + sha256 = "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p"; }; - - buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib mesa ]; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ nasm ]; + + buildInputs = [ + alsaLib freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU_combined SDL2 zlib + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--enable-c++11" + "--enable-release" + ]; crossAttrs = { preConfigure = '' @@ -27,10 +37,11 @@ stdenv.mkDerivation rec { ''; }; - meta = { + meta = with stdenv.lib; { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; homepage = http://www.scummvm.org/; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.peterhoeg ]; + platforms = platforms.linux; }; } - diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index a9f2aae443fca784d09030a3dc9bca0c017a3446..30e2bcfdf52405c70e3945e759982c1931d62dc1 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "sgt-puzzles-r${version}"; - version = "20171029.69773d8"; + version = "20180409.d95f476"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "0m1gaa802jyih9hcwpvb05zrzprgj6akafgvbsnq321s0sqzaxf0"; + sha256 = "1psml0abh3i577dns440h52568ggdny2wk1hhr30815nxibbribx"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ]; diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..de91f26d95de92d0a84477338298b9d4688d4e5d --- /dev/null +++ b/pkgs/games/sil/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchzip, ncurses, libX11, libXaw, libXt, libXext, libXmu, makeWrapper, writeScript, ... }: +let + setup = writeScript "setup" '' + mkdir -p "$ANGBAND_PATH" + # Copy all the data files into place + cp -ar $1/* "$ANGBAND_PATH" + # The copied files are not writable, make them so + chmod +w -R "$ANGBAND_PATH" + ''; +in +stdenv.mkDerivation rec { + name = "Sil-${version}"; + version = "1.3.0"; + + src = fetchzip { + url = "http://www.amirrorclear.net/flowers/game/sil/Sil-130-src.zip"; + sha256 = "1amp2mr3fxascra0k76sdsvikjh8g76nqh46kka9379zd35lfq8w"; + stripRoot=false; + }; + + buildInputs = [ makeWrapper ncurses libX11 libXaw libXt libXext libXmu ]; + + sourceRoot = "source/Sil/src"; + + makefile = "Makefile.std"; + + prePatch = '' + # Allow usage of ANGBAND_PATH + substituteInPlace config.h --replace "#define FIXED_PATHS" "" + ''; + + preConfigure = '' + buildFlagsArray+=("LIBS=-lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses") + ''; + + installPhase = '' + # the makefile doesn't have a sensible install target, so we hav to do it ourselves + mkdir -p $out/bin + cp sil $out/bin/sil + # Wrap the program to set a user-local ANGBAND_PATH, and run the setup script to copy files into place + # We could just use the options for a user-local save and scores dir, but it tried to write to the + # lib directory anyway, so we might as well give everyone a copy + wrapProgram $out/bin/sil \ + --run "set -u" \ + --run "export ANGBAND_PATH=\$HOME/.sil" \ + --run "${setup} ${src}/Sil/lib" + ''; + + meta = { + description = "A rouge-like game set in the first age of Middle-earth"; + longDescription = '' + A game of adventure set in the first age of Middle-earth, when the world still + rang with elven song and gleamed with dwarven mail. + + Walk the dark halls of Angband. Slay creatures black and fell. Wrest a shining + Silmaril from Morgoth’s iron crown. + ''; + homepage = http://www.amirrorclear.net/flowers/game/sil/index.html; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.michaelpj ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 02f6026371fe1eaa959409f9dd27c084b51f6f52..ada2520a097c5bf655c87844752bf4c3e1b9e18f 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -4,7 +4,7 @@ let # Choose your "paksets" of objects, images, text, music, etc. - paksets = config.simutrans.paksets or "pak64 pak128"; + paksets = config.simutrans.paksets or "pak64 pak64.japan pak128 pak128.britain pak128.german"; result = with stdenv.lib; withPaks ( if paksets == "*" then attrValues pakSpec # taking all @@ -12,15 +12,15 @@ let ); ver1 = "120"; - ver2 = "1"; - ver3 = "1"; + ver2 = "2"; + ver3 = "2"; version = "${ver1}.${ver2}.${ver3}"; ver_dash = "${ver1}-${ver2}-${ver3}"; ver2_dash = "${ver1}-${ver2}"; binary_src = fetchurl { url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip"; - sha256 = "00cyxbn17r9p1f08jvx1wrhydxknkrxj5wk6ld912yicfql998r0"; + sha256 = "1yi6rwbrnfd65qfz63cncw2n56pbypvg6cllwh71mgvs6x2c28kz"; }; @@ -29,22 +29,21 @@ let (pakName: attrs: mkPak (attrs // {inherit pakName;})) { pak64 = { - # No release for 120.1 yet! - srcPath = "120-0/simupak64-120-0-1"; - sha256 = "0y5v1ncpjyhjkkznqmk13kg5d0slhjbbvg1y8q5jxhmhlkghk9q2"; + srcPath = "120-2/simupak64-120-2"; + sha256 = "1s310pssar4s1nf6gi9cizbx4m75avqm2qk039ha5rk8jk4lzkmk"; }; "pak64.japan" = { - # No release for 120.1 yet! + # No release for 120.2 yet! srcPath = "120-0/simupak64.japan-120-0-1"; sha256 = "14swy3h4ij74bgaw7scyvmivfb5fmp21nixmhlpk3mav3wr3167i"; }; pak128 = { - srcPath = "pak128%20for%20ST%20120%20%282.5.3%2C%20minor%20changes%29/pak128-2.5.3--ST120"; - sha256 = "19c66wvfg6rn7s9awi99cfp83hs9d8dmsjlmgn8m91a19fp9isdh"; + srcPath = "pak128%20for%20ST%20120.2.2%20%282.7%2C%20minor%20changes%29/pak128"; + sha256 = "1x6g6yfv1hvjyh3ciccly1i2k2n2b63dw694gdg4j90a543rmclg"; }; "pak128.britain" = { - srcPath = "pak128.Britain%20for%20${ver2_dash}/pak128.Britain.1.17-${ver2_dash}"; + srcPath = "pak128.Britain%20for%20120-1/pak128.Britain.1.17-120-1"; sha256 = "1nviwqizvch9n3n826nmmi7c707dxv0727m7lhc1n2zsrrxcxlr5"; }; "pak128.cs" = { # note: it needs pak128 to work @@ -53,8 +52,8 @@ let }; "pak128.german" = { url = "mirror://sourceforge/simutrans/PAK128.german/" - + "PAK128.german_0.8_${ver1}.x/PAK128.german_0.8.0_${ver1}.x.zip"; - sha256 = "1a8pc88vi59zlvff9i1f8nphdmisqmgg03qkdvrf5ks46aw8j6s5"; + + "PAK128.german_0.10.x_for_ST_120.x/PAK128.german_0.10.3_for_ST_120.x.zip"; + sha256 = "1379zcviyf3v0wsli33sqa509k6zlw6fkk57vahc44mrnhka5fpb"; }; /* This release contains accented filenames that prevent unzipping. @@ -164,7 +163,7 @@ let homepage = http://www.simutrans.com/; license = with licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ kkallio vcunat phile314 ]; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux; # TODO: ++ darwin; }; }; diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 9fcab8b1ec9a5a885c7ee81f0b87466774656987..8d102e98433babcde58eb62854be65c32c800319 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake -, boost, eigen2, lua, luabind, mesa, SDL }: +, boost, eigen2, lua, luabind, libGLU_combined, SDL }: stdenv.mkDerivation rec { name = "soi-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost lua luabind mesa SDL ]; + buildInputs = [ boost lua luabind libGLU_combined SDL ]; cmakeFlags = [ "-DEIGEN_INCLUDE_DIR=${eigen2}/include/eigen2" @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A physics-based puzzle game"; - maintainers = with maintainers; [ raskin nckx ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.free; downloadPage = http://sourceforge.net/projects/soi/files/; diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index 32142a2834e363428d118dbda8f4942c84fdf94f..6f7876e4872318d12e843affcb0f612be95a22d8 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -5,18 +5,20 @@ stdenv.mkDerivation rec { name = "solarus-${version}"; version = "1.4.5"; - + src = fetchFromGitHub { owner = "christopho"; repo = "solarus"; rev = "d9fdb9fdb4e1b9fc384730a9279d134ae9f2c70e"; sha256 = "0xjx789d6crm322wmkqyq9r288vddsha59yavhy78c4r01gs1p5v"; }; - + buildInputs = [ cmake luajit SDL2 SDL2_image SDL2_ttf physfs openal libmodplug libvorbis ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A Zelda-like ARPG game engine"; longDescription = '' @@ -28,5 +30,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.Nate-Devv ]; platforms = platforms.linux; }; - + } diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix index e41ecf16136f3ec0eeb576a1ba001e1d4915ff56..162db96726993d8fde6cc2265f322c4de1779c1a 100644 --- a/pkgs/games/space-orbit/default.nix +++ b/pkgs/games/space-orbit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, mesa, libXi, libXt, libXext, libX11, libXmu, freeglut +, libGLU_combined, libXi, libXt, libXext, libX11, libXmu, freeglut }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.01"; patchversion = "9"; - buildInputs = [ mesa libXi libXt libXext libX11 libXmu freeglut ]; + buildInputs = [ libGLU_combined libXi libXt libXext libX11 libXmu freeglut ]; src = fetchurl { url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz"; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index cb7a345900af944bfcf526b02c708117ed4c5b82..10ce55f4e217d638efdb8564ac33c08579992663 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis}: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libpng mesa freeglut libX11 plib openal freealut libXrandr xproto + buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xproto libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat SDL2 enet libjpeg openscenegraph libvorbis ]; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 40e97567d39430ac4cfb95df8f0179a44b989d91..3bb69359f16268a834902474110d26b692a58e1d 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xorg, SDL2, mesa, binutils +, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined, binutils , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, glibc, which, minizip , withAI ? true # support for AI Interfaces and Skirmish AIs @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 - xorg.libX11 xorg.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper + xorg.libX11 xorg.libXcursor libGLU_combined glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd libunwind glibc.dev glibc.static which minizip ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix index 74d9bdcb35dcaf208ff41c3017c38a23edb0b881..5130db6cb3c8acef319c8f0406b2ca16b0f7ca54 100644 --- a/pkgs/games/stardust/default.nix +++ b/pkgs/games/stardust/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xproto, libX11 -, libXi, inputproto, libXmu, libXext, xextproto, mesa }: +, libXi, inputproto, libXmu, libXext, xextproto, libGLU_combined }: stdenv.mkDerivation rec { name = "stardust-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libtiff libxml2 SDL xproto libX11 libXi inputproto - libXmu libXext xextproto mesa + libXmu libXext xextproto libGLU_combined ]; installFlags = [ "bindir=\${out}/bin" ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index a7392bbc34e9252c6b8a58092c1a58c5db391009..c44a166268cc5f0b29050470a5f17790a1048842 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeScript, buildFHSUserEnv, steam +{ stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , withJava ? false , withPrimus ? false @@ -9,29 +9,18 @@ let commonTargetPkgs = pkgs: with pkgs; - let - tzdir = "${pkgs.tzdata}/share/zoneinfo"; - # I'm not sure if this is the best way to add things like this - # to an FHSUserEnv - etc-zoneinfo = pkgs.runCommand "zoneinfo" {} '' - mkdir -p $out/etc - ln -s ${tzdir} $out/etc/zoneinfo - ln -s ${tzdir}/UTC $out/etc/localtime - ''; - in [ + [ steamPackages.steam-fonts # Errors in output without those pciutils python2 # Games' dependencies - xlibs.xrandr + xorg.xrandr which # Needed by gdialog, including in the steam-runtime perl # Open URLs xdg_utils - # Zoneinfo - etc-zoneinfo iana-etc ] ++ lib.optional withJava jdk ++ lib.optional withPrimus primus @@ -62,12 +51,13 @@ in buildFHSUserEnv rec { multiPkgs = pkgs: with pkgs; [ # These are required by steam with proper errors - xlibs.libXcomposite - xlibs.libXtst - xlibs.libXrandr - xlibs.libXext - xlibs.libX11 - xlibs.libXfixes + xorg.libXcomposite + xorg.libXtst + xorg.libXrandr + xorg.libXext + xorg.libX11 + xorg.libXfixes + libGL # Not formally in runtime but needed by some games gst_all_1.gstreamer @@ -75,20 +65,108 @@ in buildFHSUserEnv rec { libdrm mono xorg.xkeyboardconfig - xlibs.libpciaccess - + xorg.libpciaccess + ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { - inherit nativeOnly runtimeOnly; + inherit runtimeOnly; }) - ]; + ] else [ + # Required + glib + gtk2 + bzip2 + zlib + gdk_pixbuf + + # Without these it silently fails + xorg.libXinerama + xorg.libXdamage + xorg.libXcursor + xorg.libXrender + xorg.libXScrnSaver + xorg.libXxf86vm + xorg.libXi + xorg.libSM + xorg.libICE + gnome2.GConf + freetype + (curl.override { gnutlsSupport = true; sslSupport = false; }) + nspr + nss + fontconfig + cairo + pango + expat + dbus + cups + libcap + SDL2 + libusb1 + dbus-glib + libav + atk + # Only libraries are needed from those two + libudev0-shim + networkmanager098 + + # Verified games requirements + xorg.libXt + xorg.libXmu + xorg.libxcb + libGLU + libuuid + libogg + libvorbis + SDL + SDL2_image + glew110 + openssl + libidn + tbb + wayland + mesa_noglu + libxkbcommon - extraBuildCommands = '' + # Other things from runtime + flac + freeglut + libjpeg + libpng12 + libsamplerate + libmikmod + libtheora + libtiff + pixman + speex + SDL_image + SDL_ttf + SDL_mixer + SDL2_ttf + SDL2_mixer + gstreamer + gst-plugins-base + libappindicator-gtk2 + libcaca + libcanberra + libgcrypt + libvpx + librsvg + xorg.libXft + libvdpau + ] ++ steamPackages.steam-runtime-wrapped.overridePkgs); + + extraBuildCommands = if (!nativeOnly) then '' mkdir -p steamrt ln -s ../lib/steam-runtime steamrt/${steam-runtime-wrapped.arch} ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' ln -s ../lib32/steam-runtime steamrt/${steam-runtime-wrapped-i686.arch} ''} ln -s ${runSh} steamrt/run.sh + '' else '' + ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0 + ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' + ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0 + ''} ''; extraInstallCommands = '' @@ -99,11 +177,33 @@ in buildFHSUserEnv rec { ''; profile = '' - export STEAM_RUNTIME=/steamrt - export TZDIR=/etc/zoneinfo + export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"} ''; - runScript = "steam"; + runScript = writeScript "steam-wrapper.sh" '' + #!${stdenv.shell} + if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS + ${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1 + # If there was an error running glxinfo, we know something is wrong with the configuration + if [ $? -ne 0 ]; then + cat < /dev/stderr + ** + WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix + and then run \`sudo nixos-rebuild switch\`: + { + hardware.opengl.driSupport32Bit = true; + hardware.pulseaudio.support32Bit = true; + } + ** + EOF + fi + fi + exec steam "$@" + ''; + + meta = steam.meta // { + broken = nativeOnly; + }; passthru.run = buildFHSUserEnv { name = "steam-run"; @@ -119,8 +219,8 @@ in buildFHSUserEnv rec { exit 1 fi shift - export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH - exec "$run" "$@" + ${lib.optionalString (!nativeOnly) "export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH"} + exec -- "$run" "$@" ''; }; } diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 54805e91b2bd63517919bd50d56d19f57db0ba00..b7dbba552698d21c4dd98e1de3a2dbd9f105019c 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -6,13 +6,14 @@ let self = rec { steamArch = if pkgs.stdenv.system == "x86_64-linux" then "amd64" else if pkgs.stdenv.system == "i686-linux" then "i386" - else abort "Unsupported platform"; + else throw "Unsupported platform: ${pkgs.stdenv.system}"; steam-runtime = callPackage ./runtime.nix { }; steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; steam = callPackage ./steam.nix { }; steam-fonts = callPackage ./fonts.nix { }; steam-chrootenv = callPackage ./chrootenv.nix { + glxinfo-i686 = pkgs.pkgsi686Linux.glxinfo; steam-runtime-wrapped-i686 = if steamArch == "amd64" then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 388e5cc3a6cf504789659313ed083e40c182efad..b3746a50c77783e90db453141883dc2ab3b48f49 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -1,101 +1,22 @@ { stdenv, steamArch, lib, perl, pkgs, steam-runtime -, nativeOnly ? false , runtimeOnly ? false }: -assert !(nativeOnly && runtimeOnly); - -let - runtimePkgs = with pkgs; [ - # Required - glib - gtk2 - bzip2 - zlib - gdk_pixbuf - - # Without these it silently fails - xlibs.libXinerama - xlibs.libXdamage - xlibs.libXcursor - xlibs.libXrender - xlibs.libXScrnSaver - xlibs.libXxf86vm - xlibs.libXi - xlibs.libSM - xlibs.libICE - gnome2.GConf - freetype - (curl.override { gnutlsSupport = true; sslSupport = false; }) - nspr - nss - fontconfig - cairo - pango - expat - dbus - cups - libcap - SDL2 - libusb1 - dbus_glib - libav - atk - # Only libraries are needed from those two - libudev0-shim - networkmanager098 - - # Verified games requirements - xlibs.libXmu - xlibs.libxcb - mesa_glu - libuuid - libogg - libvorbis - SDL - SDL2_image - glew110 - openssl - libidn - tbb - - # Other things from runtime - xlibs.libXinerama - flac - freeglut - libjpeg - libpng12 - libsamplerate - libmikmod - libtheora - pixman - speex - SDL_image - SDL_ttf - SDL_mixer - SDL2_net - SDL2_ttf - SDL2_mixer - gstreamer - gst-plugins-base - ]; - - overridePkgs = with pkgs; [ +let + overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [ libgpgerror libpulseaudio alsaLib openalSoft - libva + libva1-full + libvdpau vulkan-loader gcc.cc - ]; - - ourRuntime = if runtimeOnly then [] - else if nativeOnly then runtimePkgs ++ overridePkgs - else overridePkgs; - steamRuntime = lib.optional (!nativeOnly) steam-runtime; + nss + nspr + ]); - allPkgs = ourRuntime ++ steamRuntime; + allPkgs = overridePkgs ++ [ steam-runtime ]; gnuArch = if steamArch == "amd64" then "x86_64-linux-gnu" else if steamArch == "i386" then "i386-linux-gnu" @@ -112,7 +33,7 @@ in stdenv.mkDerivation rec { builder = ./build-wrapped.sh; passthru = { - inherit gnuArch libs bins; + inherit gnuArch libs bins overridePkgs; arch = steamArch; }; diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 5ca0de6a7732e25b7a5665486971429748f2b975..d51d1bb154d693e8f4ea8ed409a194ba8889a29a 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "Free dance and rhythm game for Windows, Mac, and Linux"; platforms = platforms.linux; license = licenses.mit; # expat version - maintainers = [ maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 14b9b424345d1851eadde95b0a4e6bb1375f71eb..159f1faf096bd7cf40fc151d7cf47babace51f35 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -7,11 +7,11 @@ in stdenv.mkDerivation rec { - name = "stockfish-7"; + name = "stockfish-8"; src = fetchurl { url = "https://stockfish.s3.amazonaws.com/${name}-src.zip"; - sha256 = "0djzg3h5d9qs27snf0rr6zl6iaki1jb84v8m8k3c2lcjbj2vpwc9"; + sha256 = "1sachz41kbni88yjxwv5y4vl0gjbnyqvp1kpdm7v56k43zr3dbbv"; }; buildInputs = [ unzip ]; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index e05f5a92a33ad32e185de2cfbc18ffd61b9d3883..a7b82b8913f50f8f82fd64f80d4d13458c1c0433 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig -, openal, freealut, mesa, libvorbis, libogg, gettext, curl, freetype +, openal, freealut, libGLU_combined, libvorbis, libogg, gettext, curl, freetype , fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr }: let @@ -8,33 +8,39 @@ let in stdenv.mkDerivation rec { name = "supertuxkart-${version}"; - version = "0.9.2"; + version = "0.9.3"; + srcs = [ (fetchFromGitHub { owner = "supertuxkart"; repo = "stk-code"; rev = version; - sha256 = "1zsc5nw8il8xwppk624jampfk6qhqzjnni8zicrhqix0xg07nxca"; + sha256 = "1smnanjjaj4yq2ywikv0l6xysh6n2h1cm549plbg5xdk9mx2sfia"; name = dir; }) (fetchsvn { url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "16503"; # 0.9.2 crashes with 16937. Refer to stk-code/doc/assets_version - sha256 = "0j1dy27gxm4hx26xddr2ak6vw0lim0nqmjnszfb4c61y92j12cqp"; + rev = "17448"; + sha256 = "0lxbb4k57gv4gj12l5hnvhwdycpzcxjwg7qdfwglj2bdvaxf9f21"; name = "stk-assets"; }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake gettext libtool pkgconfig ]; + buildInputs = [ - cmake libtool libX11 libXrandr - openal freealut mesa libvorbis libogg gettext zlib freetype + openal freealut libGLU_combined libvorbis libogg zlib freetype curl fribidi bluez libjpeg libpng ]; enableParallelBuilding = true; + cmakeFlags = [ + "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs + "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 + ]; + sourceRoot = dir; meta = with stdenv.lib; { diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index bb297c1af4ee3c26b66cb882d0c5e135ebd06a4a..cf6ba4648687a2af77b2a9bdabddbddd15cae134 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl -, libogg, libvorbis, mesa, openal, boost, glew +, libogg, libvorbis, libGLU_combined, openal, boost, glew }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ SDL2 SDL2_image curl libogg libvorbis mesa openal boost glew ]; + buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU_combined openal boost glew ]; cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ]; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 504353afebeff99c6887f931a42143a7cbb4968c..7c5074c0708548c64cfc374ec5b6878a929731bf 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, makeWrapper, python, alsaLib -, libX11, mesa_glu, SDL, lua5, zlib, bam, freetype +, libX11, libGLU, SDL, lua5, zlib, bam, freetype }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = "rm -r other/{freetype,sdl}/{include,lib32,lib64}"; buildInputs = [ - python makeWrapper alsaLib libX11 mesa_glu SDL lua5 zlib bam freetype + python makeWrapper alsaLib libX11 libGLU SDL lua5 zlib bam freetype ]; buildPhase = '' @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { Flag. You can even design your own maps! ''; - homepage = http://teeworlds.com/; + homepage = https://teeworlds.com/; license = "BSD-style, see `license.txt'"; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 5fcb5063bbc8fe2eddd2e77be5160ac8292c7070..1c145f6d71c0db88527260091bc9fbe8592be009 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -3,12 +3,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "terraria-server-${version}"; - version = "1.3.1.1"; + version = "1.3.5.3"; urlVersion = lib.replaceChars ["."] [""] version; src = fetchurl { url = "http://terraria.org/server/terraria-server-${urlVersion}.zip"; - sha256 = "0bwh0na0dy6cjc1xchd5sp3c7av50q38hk03219dmqd72n9p44rq"; + sha256 = "0l7j2n6ip4hxph7dfal7kzdm3dqnm1wba6zc94gafkh97wr35ck3"; }; buildInputs = [ file unzip ]; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index ffbcd595cc3548dd7c83cc49fa7acd2da7558399..ce5b0b2696601620ec06cf322eff119ca7f560c2 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "the-powder-toy-${version}"; - version = "92.0.331"; + version = "92.5"; src = fetchFromGitHub { owner = "simtr"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "185zlg20qk6ic9llyf4xka923snqrpdazg568raz0jiafzzsirax"; + sha256 = "1n15kgl4qnz55b32ddgmhrv64cl3awbds8arycn7mkf7akwdg1g6"; }; patches = [ ./fix-env.patch ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free 2D physics sandbox game"; homepage = http://powdertoy.co.uk/; - platforms = platforms.unix; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 3594a04f03bf9759d1a2a38339fca681d41f188e..e5bb211eb227e808e789cf035fd33ccce38db1fe 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, glibc, libX11, mesa }: +{ stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }: with stdenv.lib; assert stdenv.isi686; @@ -25,7 +25,7 @@ stdenv.mkDerivation { cp -r * $out/res patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 mesa ]} \ + --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 libGLU_combined ]} \ "$out/res/Tibia" # We've patchelf'd the files. The main ‘Tibia’ binary is a bit diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 4514735bb70941406f33c1eda3138f663c7e8361..286e408e2555615707dc52947069e0e9b0bfe3e6 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.01.1"; + name = "tintin-2.01.4"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "195wrfcys8yy953gdrl1gxryhjnx9lg1vqgxm3dyzm8bi18aa2yc"; + sha256 = "1g7bh8xs1ml0iyraps3a3dzaycci922y7fk5j0wyr4ssyjzsy8nx"; }; buildInputs = [ zlib pcre ]; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index ad9b5f7dc6cd9a4ea2826df68e243aaab3387452..19cf026933e443f23c2964863eb07425d8b5e344 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -1,43 +1,87 @@ -{stdenv, fetchurl, openal, libpng, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf }: +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, premake4, unzip +, openal, libpng, libvorbis, libGLU, SDL2, SDL2_image, SDL2_ttf }: + +let + pname = "tome4"; + + desktop = makeDesktopItem { + desktopName = pname; + name = pname; + exec = "@out@/bin/${pname}"; + icon = "${pname}"; + terminal = "False"; + comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal."; + type = "Application"; + categories = "Game;RolePlaying;"; + genericName = pname; + }; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "1.5.5"; -stdenv.mkDerivation rec { - version = "1.4.9"; - name = "tome4-${version}"; src = fetchurl { - url = "http://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "0c82m0g1ps64zghgdrp78m6bvfngcb75whhknqiailld7kz1g9xl"; + url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; + sha256 = "0v2qgdfpvdzd1bcbp9v8pfahj1bgczsq2d4xfhh5wg11jgjcwz03"; }; - nativeBuildInputs = [ premake4 ]; + + nativeBuildInputs = [ premake4 makeWrapper unzip ]; + + # tome4 vendors quite a few libraries so someone might want to look into avoiding that... buildInputs = [ - mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image + libGLU openal libpng libvorbis SDL2 SDL2_ttf SDL2_image ]; + + # disable parallel building as it caused sporadic build failures + enableParallelBuilding = false; + NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" "-I${SDL2_ttf}/include/SDL2" ]; - preConfigure = '' + + postPatch = '' substituteInPlace premake4.lua \ --replace "/opt/SDL-2.0/include/SDL2" "${SDL2.dev}/include/SDL2" \ --replace "/usr/include/GL" "/run/opengl-driver/include" + ''; + + preConfigure = '' premake4 gmake ''; + makeFlags = [ "config=release" ]; + + # The wrapper needs to cd into the correct directory as tome4's detection of + # the game asset root directory is faulty. + installPhase = '' - install -Dm755 t-engine $out/opt/tome4/t-engine - cat > tome4 <' -i $(find . -name '*.c' -o -name '*.cpp') diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index ce68f190992b67f92dbfbb7ea737c79e728c955b..2e9b3cf8d8ca219f0c1a1bddace4275ed205593a 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -1,13 +1,13 @@ { 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 }: +, ffmpeg, sqlite, zlib, libX11, libGLU_combined }: let sharedLibs = [ pcre portaudio freetype SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf - sqlite lua zlib libX11 mesa ffmpeg + sqlite lua zlib libX11 libGLU_combined ffmpeg ]; in stdenv.mkDerivation rec { @@ -42,6 +42,6 @@ in stdenv.mkDerivation rec { homepage = http://ultrastardx.sourceforge.net/; description = "Free and open source karaoke game"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index 57749c4f228c150a9c1078934012b9f4a4b244fe..a1a8272fd0f9d634b56d5b2b91caab1aa3d0524a 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fork of NetHack"; - homepage = http://unnethack.wordpress.com/; + homepage = https://unnethack.wordpress.com/; license = "nethack"; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index af50759fd2fe730dd5f859ce52dbaded3653bb5e..5ea84b9ef41f94d24dcdde618deda68e7c951b02 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, SDL, libjpeg, libpng, glew, libwebp, ncurses +{ stdenv, fetchurl, cmake, libGLU_combined, SDL, libjpeg, libpng, glew, libwebp, ncurses , gmp, curl, nettle, openal, speex, libogg, libvorbis, libtheora, xvidcore , makeWrapper }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://github.com/Unvanquished/Unvanquished/archive/v${version}.tar.gz"; sha256 = "1k7mlpwalimn6xb2s760f124xncpg455qvls6z3x0ii5x0wc1mp2"; }; - buildInputs = [ cmake mesa SDL libjpeg libpng glew libwebp ncurses gmp curl + buildInputs = [ cmake libGLU_combined SDL libjpeg libpng glew libwebp ncurses gmp curl nettle openal speex libogg libvorbis libtheora xvidcore makeWrapper ]; preConfigure = ''prefix="$prefix/opt"''; diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix index 0eb6e02eac54e5cd482030d74e3a380671faa66b..8d1bf2b6887263b3e8a76ee330044874cfbb6bbb 100644 --- a/pkgs/games/uqm/3dovideo.nix +++ b/pkgs/games/uqm/3dovideo.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { The reason for this is because the 3DO uses its own proprietary disk format. - Save the file as videos.tar and use "nix-prefetch-url file://${name}" to + Save the file as videos.tar and use "nix-prefetch-url file://\$PWD/${name}" to add it to the Nix store. [*] ${helper}/bin/uqm3donix CDIMAGE ${name} diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index d8dcdf6b7b60722bfb5553867a4aa567cbf67da0..dd60c0efb599b6e8d99093d8fabbd8275002cd27 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, mesa +{ stdenv, lib, fetchurl, pkgconfig, libGLU_combined , SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod mesa ]; + buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod libGLU_combined ]; postUnpack = '' mkdir -p uqm-${version}/content/packages diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index bc293a881079f66c85fc5231a2475cad3cf9a14b..afff5a5c9eb3e84925952e6a0e2ffbcc239fb9d2 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl, libXxf86vm }: +{ stdenv, fetchurl, unzip, SDL, libGLU_combined, openal, curl, libXxf86vm }: stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.3.2"; + version = "4.3.3"; srcs = [ (fetchurl { - url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror432_full.zip"; - sha256 = "192jwdyfy18cg413ysaklqc8yzmdnshljqc6dnr0xkd6dxbf3pkl"; + url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror433_full.zip"; + sha256 = "0rrh08ypnw805gd2wrs6af34nvp02x7vggfp0ymcmbr44wcjfn63"; }) (fetchurl { url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.zip"; - sha256 = "0m376hdkk8vjnbdy8zakjazyag6jiw4n8zy4lxhv2ndn9mii8lcx"; + sha256 = "1624zsnr02nhdksmwnwmvw129lw3afd8h0hvv2j8qmcyxa7jw68b"; }) ]; - buildInputs = [ unzip SDL mesa openal curl libXxf86vm ]; + buildInputs = [ unzip SDL libGLU_combined openal curl libXxf86vm ]; sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}"; configurePhase = '' @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postFixup = '' p=$out/opt/urbanterror/Quake3-UrT cur_rpath=$(patchelf --print-rpath $p) - patchelf --set-rpath $cur_rpath:${mesa}/lib $p + patchelf --set-rpath $cur_rpath:${libGLU_combined}/lib $p ''; hardeningDisable = [ "format" ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.urbanterror.net; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ astsmtl ]; + maintainers = with maintainers; [ astsmtl fpletz ]; platforms = platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 8961dfdce3c986904aef5d34f184acd6b67c6258..84984fcbb587dd6fc57d7c2658a99c9511289f88 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "VASSAL-3.2.15"; + name = "VASSAL-3.2.17"; src = fetchurl { url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2"; - sha256 = "10ng571nxr5zc2nlviyrk5bci8my67kq3qvhfn9bifzkxmjlqmk9"; + sha256 = "0nxskr46janxnb31c03zv61kr46vy98l7cwxha3vll81l4ij1sjb"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch b/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch new file mode 100644 index 0000000000000000000000000000000000000000..6794e8018affc4da0a8cd6f96a8c5d197843bf6e --- /dev/null +++ b/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch @@ -0,0 +1,27 @@ +From 7ebe252a8488a63675d1c50c0faa1bdc5ff97889 Mon Sep 17 00:00:00 2001 +From: Linus Heckemann +Date: Fri, 5 Jan 2018 21:27:28 +0100 +Subject: [PATCH] Ignore missing data for installation + +This is for packaging vdrift separately from its data in nixpkgs. +--- + SConstruct | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 4394de0b..beef29a4 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -511,9 +511,6 @@ env.Alias(target = 'bin-package', source = bin_archive) + #----------------# + Export(['env', 'version', 'src_dir', 'bin_dir']) + if 'install' in COMMAND_LINE_TARGETS: +- if not os.path.isfile('data/SConscript'): +- raise 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' +- SConscript('data/SConscript') + # desktop appdata installation + install_desktop = env.Install(env['destdir'] + env['prefix'] + '/share/applications', 'vdrift.desktop') + install_appdata = env.Install(env['destdir'] + env['prefix'] + '/share/appdata', 'vdrift.appdata.xml') +-- +2.15.0 + diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 27eef26142636a6a69efef3137ac756a29de44ae..ce20d1b3f1779d2af3071cd08ca86980e0198c2b 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,41 +1,60 @@ -{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, mesa, SDL2, SDL2_image, libvorbis, - bullet, curl, gettext }: +{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, libGLU_combined, SDL2, SDL2_image +, libvorbis, bullet, curl, gettext, writeTextFile, writeShellScriptBin -stdenv.mkDerivation rec { - version = "2014-10-20"; - name = "vdrift-${version}"; - - src = fetchFromGitHub { - owner = "VDrift"; - repo = "vdrift"; - rev = version; - sha256 = "09yny5qzdrpffq3xhqwfymsracwsxwmdd5xa8bxx9a56hhxbak2l"; - }; - - data = fetchsvn { +, data ? fetchsvn { url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data"; rev = 1386; sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1"; - }; + } +}: +let + version = "git"; + bin = stdenv.mkDerivation { + name = "vdrift-${version}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; + src = fetchFromGitHub { + owner = "vdrift"; + repo = "vdrift"; + rev = "12d444ed18395be8827a21b96cc7974252fce6d1"; + sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; + }; - buildPhase = '' - 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"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons libGLU_combined SDL2 SDL2_image libvorbis bullet curl gettext ]; - meta = { - description = "Car racing game"; - homepage = http://vdrift.net/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.linux; + patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; + + buildPhase = '' + sed -i -e s,/usr/local,$out, SConstruct + export CXXFLAGS="$(pkg-config --cflags SDL2_image)" + scons -j$NIX_BUILD_CORES + ''; + installPhase = "scons install"; + + meta = { + description = "Car racing game"; + homepage = http://vdrift.net/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = stdenv.lib.platforms.linux; + }; + }; + wrappedName = "vdrift-${version}-with-data-${toString data.rev}"; +in writeTextFile { + name = wrappedName; + text = '' + export VDRIFT_DATA_DIRECTORY="${data}" + exec ${bin}/bin/vdrift "$@" + ''; + destination = "/bin/vdrift"; + executable = true; + checkPhase = '' + ${stdenv.shell} -n $out/bin/vdrift + ''; +} // { + meta = bin.meta // { hydraPlatforms = []; }; + unwrapped = bin; + inherit bin data; } diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 34b9a606fb9647bbe5dfbf573fa9ec0d86b24b0f..62feeb97d521526886515d5ae2376228511e59fb 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. - You can do this by using "nix-prefetch-url file://${name}-bin" in the + You can do this by using "nix-prefetch-url file://\$PWD/${name}-bin" in the directory where you saved it. ''; diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index c3ec47273d8f8bc9d4563d913459f3f9a55b16eb..9990c9108c4984af566c5e8b32f3e8e075f39a46 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite -, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, pkgconfig }: +, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { name = "voxelands-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg sqlite - libXxf86vm mesa openal libvorbis xlibsWrapper pkgconfig + libXxf86vm libGLU_combined openal libvorbis xlibsWrapper pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 85246aea2d5fe19a8e0e026a25759bcf2e25af96..1b51130768eb1d8600a8a80dc7aad238c2e82dfc 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -1,52 +1,27 @@ -{ stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libpng, libvorbis -, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal, freetype -, makeWrapper -}: +{ stdenv, fetchurl, warsow-engine, makeWrapper }: + stdenv.mkDerivation rec { name = "warsow-${version}"; - version = "1.03"; - mversion = "1.02"; # sometimes only engine is updated - src1 = fetchurl { - url = "http://www.warsow.net:1337/~warsow/${version}/warsow_${version}_sdk.tar.gz"; - sha256 = "0z6r5v30p8fxbszmkxssv5fnnjw7w5wfn7wfgbwvmy87ayi7mkcq"; + version = "2.1.2"; + + src = fetchurl { + url = "http://sebastian.network/warsow/${name}.tar.gz"; + sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc"; }; - src2 = fetchurl { - url = "http://www.warsow.net:1337/~warsow/${mversion}/warsow_${mversion}.tar.gz"; - sha256 = "0ai5v1h5g9nq21ixz23v0qsj9dr7dbiz7l8r34mq4c3z6ili8zpy"; - }; - unpackPhase = '' - tar xf "$src1" - cd warsow_${version}_sdk - tar xf "$src2" - mkdir -p source/release/ - mv warsow_${mversion}/basewsw source/release/ - cd source - ''; - patchPhase = '' - substituteInPlace snd_openal/snd_main.c --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 - ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ unzip zlib curl libjpeg libpng libvorbis libtheora - libXxf86dga libXxf86vm libXinerama SDL mesa openal makeWrapper - ]; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' - dest=$out/opt/warsow - cd release - mkdir -p $dest + mkdir -p $out/share/warsow + cp -r basewsw $out/share/warsow + ln -s ${warsow-engine}/lib/warsow $out/share/warsow/libs + mkdir -p $out/bin - cp -v {warsow,wsw_server,wswtv_server}* $dest - cp -rv basewsw libs $dest - # Since 1.03 some modules are _always_ downloaded from server, thus - makeWrapper $dest/warsow $out/bin/warsow \ - --suffix-each LD_LIBRARY_PATH ':' "${freetype.out}/lib" - makeWrapper $dest/wsw_server $out/bin/wsw_server - makeWrapper $dest/wswtv_server $out/bin/wswtv_server - ''; - postFixup = '' - p=$out/opt/warsow/warsow.* - cur_rpath=$(patchelf --print-rpath $p) - patchelf --set-rpath $cur_rpath:${mesa}/lib $p + for i in ${warsow-engine}/bin/*; do + makeWrapper "$i" "$out/bin/$(basename "$i")" --run "cd $out/share/warsow" + done ''; + meta = with stdenv.lib; { description = "Multiplayer FPS game designed for competitive gaming"; longDescription = '' @@ -56,10 +31,8 @@ stdenv.mkDerivation rec { and macOS. ''; homepage = http://www.warsow.net; - # Engine is under GPLv2, everything else is under license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux; - broken = true; # Depends on a specific old libjpeg version + maintainers = with maintainers; [ astsmtl abbradar ]; + platforms = warsow-engine.meta.platforms; }; } diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix new file mode 100644 index 0000000000000000000000000000000000000000..12832f2a439180d79c3f7b6bf1b9024aae924234 --- /dev/null +++ b/pkgs/games/warsow/engine.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, fetchurl, cmake, libogg, libvorbis, libtheora, curl, freetype +, libjpeg, libpng, SDL2, libGL, openal, zlib +}: + +let + # The game loads all those via dlopen(). + libs = lib.mapAttrs (name: x: lib.getLib x) { + inherit zlib curl libpng libjpeg libogg libvorbis libtheora freetype; + }; + +in stdenv.mkDerivation (libs // rec { + name = "warsow-engine-${version}"; + version = "2.1.0"; + + src = fetchurl { + url = "http://sebastian.network/warsow/warsow_21_sdk.tar.gz"; + sha256 = "0fj5k7qpf6far8i1xhqxlpfjch10zj26xpilhp95aq2yiz08pj4r"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libogg libvorbis libtheora curl freetype libjpeg SDL2 libGL openal zlib + libpng + ]; + + patches = [ ./libpath.patch ]; + postPatch = '' + cd source/source + substituteAllInPlace gameshared/q_arch.h + ''; + + cmakeFlags = [ "-DQFUSION_GAME=Warsow" ]; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/lib + cp -r libs $out/lib/warsow + for i in warsow.* wsw_server.* wswtv_server.*; do + install -Dm755 "$i" "$out/bin/''${i%.*}" + done + ''; + + meta = with stdenv.lib; { + description = "Multiplayer FPS game designed for competitive gaming (engine only)"; + homepage = http://www.warsow.net; + license = licenses.gpl2; + maintainers = with maintainers; [ astsmtl abbradar ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/games/warsow/libpath.patch b/pkgs/games/warsow/libpath.patch new file mode 100644 index 0000000000000000000000000000000000000000..ad248710237950a7ef47830e8f42af67b5a5d073 --- /dev/null +++ b/pkgs/games/warsow/libpath.patch @@ -0,0 +1,28 @@ +diff -ru3 warsow_21_sdk_old/source/source/gameshared/q_arch.h warsow_21_sdk_new/source/source/gameshared/q_arch.h +--- warsow_21_sdk_old/source/source/gameshared/q_arch.h 2016-03-26 22:22:10.000000000 +0300 ++++ warsow_21_sdk_new/source/source/gameshared/q_arch.h 2018-03-13 00:37:29.907019953 +0300 +@@ -206,15 +206,15 @@ + #endif + + // FIXME: move these to CMakeLists.txt +-#define LIBZ_LIBNAME "libz.so.1|libz.so" +-#define LIBCURL_LIBNAME "libcurl.so.4|libcurl.so.3|libcurl.so" +-#define LIBPNG_LIBNAME "libpng16.so.16|libpng15.so.15|libpng14.so.14|libpng12.so.0|libpng.so" +-#define LIBJPEG_LIBNAME "libjpeg.so.8|libjpeg.so" +-#define LIBOGG_LIBNAME "libogg.so.0|libogg.so" +-#define LIBVORBIS_LIBNAME "libvorbis.so.0|libvorbis.so" +-#define LIBVORBISFILE_LIBNAME "libvorbisfile.so.3|libvorbisfile.so" +-#define LIBTHEORA_LIBNAME "libtheora.so.0|libtheora.so" +-#define LIBFREETYPE_LIBNAME "libfreetype.so.6|libfreetype.so" ++#define LIBZ_LIBNAME "@zlib@/lib/libz.so" ++#define LIBCURL_LIBNAME "@curl@/lib/libcurl.so" ++#define LIBPNG_LIBNAME "@libpng@/lib/libpng.so" ++#define LIBJPEG_LIBNAME "@libjpeg@/lib/libjpeg.so" ++#define LIBOGG_LIBNAME "@libogg@/lib/libogg.so" ++#define LIBVORBIS_LIBNAME "@libvorbis@/lib/libvorbis.so" ++#define LIBVORBISFILE_LIBNAME "@libvorbis@/lib/libvorbisfile.so" ++#define LIBTHEORA_LIBNAME "@libtheora@/lib/libtheora.so" ++#define LIBFREETYPE_LIBNAME "@freetype@/lib/libfreetype.so" + + #if defined ( __FreeBSD__ ) + #define BUILDSTRING "FreeBSD" diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index dd21d13a0273e852d5b7a4bbe1540fd03b722b84..6ed276c0695b72239c41d6364f1dfd1e764dc585 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -12,12 +12,12 @@ let in stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.2.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz"; - sha256 = "064xfxwkqpvqyy7kz46cwi71mxmimxi4wgjly9g51wwxkvz8snmg"; + sha256 = "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw"; }; buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi ]; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 66833ceb21048458b53d1ba4daf7da110d2b794d..d3128210a1be173134c11fe394745e081b07d9d6 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = http://www.wesnoth.org/; license = licenses.gpl2; maintainers = with maintainers; [ kkallio abbradar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index 95d49dd6375993da1b2b34bff1a1b64c20a6185b..c9cd7119d8f216c38683d5ecbb6eb6338203a14e 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf -, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre +, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , enableTools ? false }: stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.8"; + version = "1.13.13"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0snm4n7l21cr4443rk93wnaqdzr91pihn452w66344zqwf33xgfr"; + sha256 = "1jn3gvw0x8ndwvdm4bqpki1p1cxg2ij02s6w0frhfi4kz706al0c"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost - libvorbis fribidi dbus libpng pcre ]; + libvorbis fribidi dbus libpng pcre openssl icu ]; cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 94fd23cd8cbdadb5bf2e1491e9cbf5288e9dc869..222275a2ba1ade50edc5212467f750fab04a31ee 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -26,9 +26,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://launchpad.net/widelands/build${version}/build${version}/+download/" - + "widelands-build${version}-src.tar.bz2"; - sha256 = "19h1gina7k1ai2mn2fd75lxm8iz8wrs6dz6dchdvg8i8d39gj4g5"; + url = "http://launchpad.net/widelands/build${version}/build${version}/+download/widelands-build${version}-src-gcc7.tar.bz2"; + sha256 = "0n2lb1c2dix32j90nir96zfqivn63izr1pmabjnhns3wbb7vhwzg"; }; preConfigure = '' @@ -47,12 +46,12 @@ stdenv.mkDerivation rec { ]; prePatch = '' - substituteInPlace ./debian/widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/" + substituteInPlace ./debian/org.widelands.widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/" ''; postInstall = '' mkdir -p "$out/share/applications/" - cp -v "../debian/widelands.desktop" "$out/share/applications/" + cp -v "../debian/org.widelands.widelands.desktop" "$out/share/applications/" ''; enableParallelBuilding = true; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index ba887d91de19c5d280759fd2b2e95d75ce4469dd..af76e85346f7934ad0fbb73da0fc2e2243c4da92 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,5 +1,5 @@ { stdenv, config, requireFile, fetchurl -, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, mesa +, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined , demo ? false }: # TODO: add i686 support @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. - You can do this by using "nix-prefetch-url file://WorldOfGooSetup.1.41.tar.gz" in the + You can do this by using "nix-prefetch-url file://\$PWD/WorldOfGooSetup.1.41.tar.gz" in the directory where you saved it. Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. ''; getTheDemo = '' - We cannot download the demo version automatically, please go to + We cannot download the demo version automatically. Please go to http://worldofgoo.com/dl2.php?lk=demo, then add it to your nix store. - You can do this by using "nix-prefetch-url file://WorldOfGooDemo.1.41.tar.gz" in the + You can do this by using "nix-prefetch-url file://\$PWD/WorldOfGooDemo.1.41.tar.gz" in the directory where you saved it. ''; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis mesa ] + + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis libGLU_combined ] + ":" + stdenv.cc.cc + "/lib64"; installPhase = '' diff --git a/pkgs/games/xjump/darwin.patch b/pkgs/games/xjump/darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..8221677658e3363ab735fbdc680675848692b3c1 --- /dev/null +++ b/pkgs/games/xjump/darwin.patch @@ -0,0 +1,21 @@ +--- xjump/src/main.c 2018-02-20 09:15:15.608807657 +0100 ++++ xjump-patched/src/main.c 2018-02-20 09:15:34.148949100 +0100 +@@ -604,18 +604,6 @@ + * optimistic privilege dropping function. */ + setgroups(0, NULL); + +- if (setresgid(-1, realgid, realgid) != 0) { +- perror("Could not drop setgid privileges. Aborting."); +- exit(1); +- } +- +- /* Dropping user privileges must come last. +- * Otherwise we won't be able to drop group privileges anymore */ +- if (setresuid(-1, realuid, realuid) != 0) { +- perror("Could not drop setuid privileges. Aborting."); +- exit(1); +- } +- + /* From now on we run with regular user privileges */ + + static XtActionsRec a_table[] = { diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..df9ff30f210144006be88876850adc8ba7333836 --- /dev/null +++ b/pkgs/games/xjump/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPlatform, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }: + +stdenv.mkDerivation rec { + name = "xjump-${version}"; + version = "2.9.3"; + src = fetchFromGitHub { + owner = "hugomg"; + repo = "xjump"; + rev = "e7f20fb8c2c456bed70abb046c1a966462192b80"; + sha256 = "0hq4739cvi5a47pxdc0wwkj2lmlqbf1xigq0v85qs5bq3ixmq2f7"; + }; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libX11 libXt libXpm libXaw ]; + preConfigure = "autoreconf --install"; + patches = if buildPlatform.isDarwin then [ ./darwin.patch ] else []; + configureFlags = + if localStateDir != null then + ["--localstatedir=${localStateDir}"] + else + []; + + meta = with stdenv.lib; { + description = "The falling tower game"; + license = licenses.gpl2; + maintainers = with maintainers; [ pmeunier ]; + }; +} diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 7d4f2e53a941f477910dc93a2ae0cb06f8e28982..ffb3a0227d9e97f8859885dc23f7a54a76517422 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg -, libpng, freeglut, mesa, SDL, SDL_mixer, SDL_image, SDL_net +, libpng, freeglut, libGLU_combined, SDL, SDL_mixer, SDL_image, SDL_net , SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: stdenv.mkDerivation rec { @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { buildInputs = [ chipmunk sqlite curl zlib bzip2 libjpeg libpng - freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf + freeglut libGLU_combined SDL SDL_mixer SDL_image SDL_net SDL_ttf lua5 ode libxdg_basedir libxml2 ]; + CXXFLAGS = [ "-fpermissive" ]; + meta = with stdenv.lib; { description = "Obstacled race game"; homepage = http://xmoto.tuxfamily.org; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 531560fd309e779dfc87fea7542190e6bdb07674..7fd5612bf8868d478bf1c662b1abbf35e7c2cfdd 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -2,7 +2,7 @@ , # required for both unzip, libjpeg, zlib, libvorbis, curl, patchelf , # glx - libX11, mesa, libXpm, libXext, libXxf86vm, alsaLib + libX11, libGLU_combined, libXpm, libXext, libXxf86vm, alsaLib , # sdl SDL2 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # required for both unzip libjpeg # glx - libX11 mesa libXpm libXext libXxf86vm alsaLib + libX11 libGLU_combined libXpm libXext libXxf86vm alsaLib # sdl SDL2 zlib libvorbis curl diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 90c1ad6f8ebc89a231035d06c7dc8b740ee2a6e1..cd927a820aaa470436a71bc76f3c00cc2c47ffda 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, SDL, mesa, expat, zlib, SDL_ttf, SDL_image }: +{ stdenv, fetchurl, libX11, SDL, libGLU_combined, expat, zlib, SDL_ttf, SDL_image }: stdenv.mkDerivation rec { version = "1.5.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 SDL SDL_ttf SDL_image mesa expat zlib + libX11 SDL SDL_ttf SDL_image libGLU_combined expat zlib ]; NIX_LDFLAGS = [ "-lX11" ]; diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 514dd2f41db42aed50905e88527da6938f53b73b..86412c0fa7684bcb4ae38b7c9ac05ddd62946f01 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, libX11, libSM, SDL, mesa, expat, SDL_ttf, SDL_image, zlib}: +{stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf, SDL_image, zlib}: let buildInputs = [ - libX11 libSM SDL SDL_ttf SDL_image mesa expat zlib + libX11 libSM SDL SDL_ttf SDL_image libGLU_combined expat zlib ]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index bd41531d923630eaad40606262a4740d38a91b5e..383bdb882844454f72249d26f38748b882408df0 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Famous german card game''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.free; longDescription = ''Play the german card game Skat against the AI or over IRC.''; homepage = http://www.xskat.de/; diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index 503deb695f7f195b88fe9930e874fe581ad35895..2f898a5aed3974d95ef2c31421153b889003a342 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "xsnow-${version}"; src = fetchurl { - url = "http://dropmix.xs4all.nl/rick/Xsnow/${name}.tar.gz"; + url = "http://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz"; sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "An X-windows application that will let it snow on the root, in between and on windows"; - homepage = http://dropmix.xs4all.nl/rick/Xsnow/; + homepage = http://janswaal.home.xs4all.nl/Xsnow/; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.robberer ]; }; diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index e683e96d206d701793894f6ca1d8dc016e1d6bfc..0aa0c97f07d2fcc4153411742298571c6092ccb8 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { sed -e '/chown /d' -i src/Imakefile sed -e '/chmod /d' -i src/Imakefile sed -e '/InstallAppDefaults/d' -i src/Imakefile + sed -e 's/CC = gcc/CC = cc/g' -i src/Imakefile ''; makeFlags = ["BINDIR=$(out)/bin"]; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { description = "A generic Sokoban game for X11"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = https://tracker.debian.org/pkg/xsok; }; } diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index df58304b38d87f0be5e12ace19836aeb5b52b2ce..ce32e435608b83e6bddca0e667a35df2a9f29500 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper, callPackage -, soundfont-fluid, SDL, mesa, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3 +, soundfont-fluid, SDL, libGL, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3, libgme , serverOnly ? false }: @@ -7,6 +7,7 @@ let suffix = lib.optionalString serverOnly "-server"; fmod = callPackage ./fmod.nix { }; sqlite = callPackage ./sqlite.nix { }; + clientLibPath = lib.makeLibraryPath [ fluidsynth ]; in stdenv.mkDerivation { name = "zandronum${suffix}-3.0"; @@ -27,8 +28,8 @@ in stdenv.mkDerivation { # I have no idea why would SDL and libjpeg be needed for the server part! # But they are. - buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite ] - ++ lib.optionals (!serverOnly) [ mesa glew fmod fluidsynth gtk2 ]; + buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite libgme ] + ++ lib.optionals (!serverOnly) [ libGL glew fmod fluidsynth gtk2 ]; nativeBuildInputs = [ cmake pkgconfig makeWrapper python3 ]; @@ -44,9 +45,10 @@ in stdenv.mkDerivation { ''; cmakeFlags = - lib.optional (!serverOnly) "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" - ++ lib.optional serverOnly "-DSERVERONLY=ON" - ; + [ "-DFORCE_INTERNAL_GME=OFF" ] + ++ (if serverOnly + then [ "-DSERVERONLY=ON" ] + else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]); enableParallelBuilding = true; @@ -59,16 +61,18 @@ in stdenv.mkDerivation { *.pk3 \ ${lib.optionalString (!serverOnly) "liboutput_sdl.so"} \ $out/lib/zandronum - '' + (if (!serverOnly) then - ''makeWrapper $out/lib/zandronum/zandronum $out/bin/zandronum --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${fluidsynth}/lib"'' - else - ''makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix}''); + makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix} + ''; postFixup = lib.optionalString (!serverOnly) '' - patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum \ + patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum:${clientLibPath} \ $out/lib/zandronum/zandronum ''; + passthru = { + inherit fmod sqlite; + }; + meta = with stdenv.lib; { homepage = http://zandronum.com/; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index b45ec24ca6bdb9268932d76b30392b643edd1053..7f76101d8ce11869288dcad8a78a4f0ef2e7d045 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -1,52 +1,35 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl, alsaLib, libpulseaudio }: -assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux"); let bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64"; + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ]; - libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64"; - patchLib = x: "patchelf --set-rpath ${libPath} ${x}"; - - src = - (if (bits == "64") then - fetchurl { - url = "http://zandronum.com/essentials/fmod/fmodapi42416linux64.tar.gz"; - sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y"; - } - else - fetchurl { - url = "http://zandronum.com/essentials/fmod/fmodapi42416linux.tar.gz"; - sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5"; - } - ); in stdenv.mkDerivation rec { - inherit src; + name = "fmod-${version}"; + version = "4.44.64"; - name = "fmod-${version}"; - version = "4.24.16"; + src = fetchurl { + url = "https://zdoom.org/files/fmod/fmodapi44464linux.tar.gz"; + sha256 = "047hk92xapwwqj281f4zwl0ih821rrliya70gfj82sdfjh9lz8i1"; + }; dontStrip = true; dontPatchELF = true; dontBuild = true; - makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ]; - - preInstall = '' - mkdir -p $out/lib - ''; - - postInstall = '' - mv $out/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex.so - mv $out/lib/libfmodexp${bits}-${version}.so $out/lib/libfmodexp.so + installPhase = '' + install -Dm755 api/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex-${version}.so + ln -s libfmodex-${version}.so $out/lib/libfmodex.so + patchelf --set-rpath ${libPath} $out/lib/libfmodex.so + cp -r api/inc $out/include ''; meta = with stdenv.lib; { description = "Programming library and toolkit for the creation and playback of interactive audio"; - homepage = "http://www.fmod.org/"; + homepage = http://www.fmod.org/; license = licenses.unfreeRedistributable; - platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.lassulus ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.lassulus ]; }; } diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix new file mode 100644 index 0000000000000000000000000000000000000000..2a1219e66ea03a3cd62a492449ce48dbcceea2f0 --- /dev/null +++ b/pkgs/games/zdoom/bcc-git.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "doom-bcc-git-0.8.0.2018.01.04"; + + src = fetchFromGitHub { + owner = "wormt"; + repo = "bcc"; + rev = "d58b44d9f18b28fd732c27113e5607a454506d19"; + sha256 = "1m83ip40ln61qrvb1fbgaqbld2xip9n3k817lwkk1936pml9zcrq"; + }; + + enableParallelBuilding = true; + makeFlags = ["CC=cc"]; + + patches = [ ./bcc-warning-fix.patch ]; + + installPhase = '' + mkdir -p $out/{bin,lib,share/doc} + install -m755 bcc $out/bin/bcc + cp -av doc $out/share/doc/bcc + cp -av lib $out/lib/bcc + ''; + + meta = with stdenv.lib; { + description = "Compiler for Doom/Hexen scripts (ACS, BCS)"; + homepage = https://github.com/wormt/bcc; + license = licenses.mit; + maintainers = with maintainers; [ertes]; + }; +} diff --git a/pkgs/games/zdoom/bcc-warning-fix.patch b/pkgs/games/zdoom/bcc-warning-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..4a352cb1e471ef418e89c69831f36e493adf0f8c --- /dev/null +++ b/pkgs/games/zdoom/bcc-warning-fix.patch @@ -0,0 +1,25 @@ +From c6ac05c96b7908ccd35f3908fc0f13650b0583c0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= +Date: Sat, 3 Feb 2018 17:08:54 +0100 +Subject: [PATCH] Remove -Werror + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index bbe2c75..3357d2d 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ EXE=bcc + BUILD_DIR=build + CC=gcc + INCLUDE=-Isrc -I src/parse +-OPTIONS=-Wall -Werror -Wno-unused -std=c99 -pedantic -Wstrict-aliasing \ ++OPTIONS=-Wall -Wno-unused -std=c99 -pedantic -Wstrict-aliasing \ + -Wstrict-aliasing=2 -Wmissing-field-initializers -D_BSD_SOURCE \ + -D_DEFAULT_SOURCE $(INCLUDE) + VERSION_FILE=$(BUILD_DIR)/version.c +-- +2.15.1 + diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index f795a2ea3a257f0de78d83159715c0a5a05e614d..da2f256aeb7189504eed1282805689802d3f6f7b 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer -, libmysql, makeWrapper }: +, mysql, makeWrapper }: stdenv.mkDerivation rec { name = "zod-engine-2011-03-18"; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { sourceRoot=`pwd`/src ''; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql makeWrapper ]; + buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ]; - NIX_LDFLAGS = "-L${stdenv.lib.getLib libmysql}/lib/mysql"; + NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql"; installPhase = '' mkdir -p $out/bin $out/share/zod diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 4b2323eaa71694ed533fe1e2ba8b121be28dd873..58e50a50f0f965047d93abcdf4bd6ed76782f571 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib }: +{ stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib +, tracingSupport ? true, logToStderr ? true }: + +let oz = x: if x then "1" else "0"; in stdenv.mkDerivation rec { name = "apulse-${version}"; - version = "0.1.10"; + version = "0.1.11.1"; src = fetchFromGitHub { owner = "i-rinat"; repo = "apulse"; - rev = "v${version}"; - sha256 = "018gaxn647wz1vjbr49hfrch9svnv0d1nzijc8ckb4fsr8vv95a1"; + rev = "602b3a02b4b459d4652a3a0a836fab6f892d4080"; + sha256 = "0yk9vgb4aws8xnkhdhgpxp5c0rri8yq61yxk85j99j8ax806i3r8"; }; enableParallelBuilding = true; @@ -17,6 +20,11 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib glib ]; + cmakeFlags = [ + "-DWITH_TRACE=${oz tracingSupport}" + "-DLOG_TO_STDERR=${oz logToStderr}" + ]; + meta = with stdenv.lib; { description = "PulseAudio emulation for ALSA"; homepage = https://github.com/i-rinat/apulse; diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix new file mode 100644 index 0000000000000000000000000000000000000000..142b7278457831f51730e896e670ef7481663801 --- /dev/null +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -0,0 +1,82 @@ +{ stdenv, apulse, libpulseaudio, pkgconfig, intltool, autoreconfHook }: + +stdenv.mkDerivation { + name = "libpressureaudio-${apulse.version}"; + + src = libpulseaudio.src; + + nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + + configurePhase = ":"; + + buildPhase = ":"; + + installPhase = '' + echo "Copying libraries from apulse." + mkdir -p $out/lib + ls ${apulse}/lib/apulse $out/lib + cp -a ${apulse}/lib/apulse/* $out/lib/ + + echo "Copying headers from pulseaudio." + mkdir -p $out/include/pulse + cp -a src/pulse/*.h $out/include/pulse + + echo "Generating custom pkgconfig definitions." + mkdir -p $out/lib/pkgconfig + for a in libpulse.pc libpulse-simple.pc libpulse-mainloop-glib.pc ; do + cat > $out/lib/pkgconfig/$a << EOF + prefix=$out + libdir=$out/lib + includedir=$out/include + + EOF + done + + cat >> $out/lib/pkgconfig/libpulse.pc << EOF + Name: libpulse + Description: PulseAudio Client Interface + Version: ${libpulseaudio.version}-rebootstrapped + Libs: -L$out/lib -lpulse + Cflags: -I$out/include -D_REENTRANT + EOF + + cat >> $out/lib/pkgconfig/libpulse-simple.pc << EOF + Name: libpulse-simple + Description: PulseAudio Simplified Synchronous Client Interface + Version: ${libpulseaudio.version}-rebootstrapped + Libs: -L$out/lib -lpulse-simple + Cflags: -I$out/include -D_REENTRANT + Requires: libpulse + EOF + + cat >> $out/lib/pkgconfig/libpulse-mainloop-glib.pc << EOF + Name: libpulse-mainloop-glib + Description: PulseAudio GLib 2.0 Main Loop Wrapper + Version: ${libpulseaudio.version}-rebootstrapped + Libs: -L$out/lib -lpulse-mainloop-glib + Cflags: -I$out/include -D_REENTRANT + Requires: libpulse glib-2.0 + EOF + ''; + + meta = apulse.meta // { + description = "libpulse without any sound daemons over pure ALSA"; + longDescription = '' + apulse (${apulse.meta.homepage}) implements most of libpulse + API over pure ALSA in 5% LOC of the original PulseAudio. + + But apulse is made to be used as a wrapper that substitutes its + replacement libs into LD_LIBRARY_PATH. The problem with that is + that you still have to link against the original libpulse. + + pressureaudio (http://git.r-36.net/pressureaudio/) wraps apulse + with everything you need to replace libpulse completely. + + This derivation is a reimplementation of pressureaudio in pure + nix. + + You can simply override libpulse with this and most + packages would just work. + ''; + }; +} diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..868d60d6d3224a8cbf22cbb3bb52c989753804be --- /dev/null +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchFromGitHub, buildPackages }: + +let + buildArmTrustedFirmware = { filesToInstall + , installDir ? "$out" + , platform + , extraMakeFlags ? [] + , extraMeta ? {} + , ... } @ args: + stdenv.mkDerivation (rec { + + name = "arm-trusted-firmware-${platform}-${version}"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "ARM-software"; + repo = "arm-trusted-firmware"; + rev = "refs/tags/v${version}"; + sha256 = "1gm0bn2llzfzz9bfsz11fhwxj5lxvyrq7bc13fjj033nljzxn7k8"; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + makeFlags = [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + "PLAT=${platform}" + ] ++ extraMakeFlags; + + installPhase = '' + runHook preInstall + + mkdir -p ${installDir} + cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir} + + runHook postInstall + ''; + + hardeningDisable = [ "all" ]; + dontStrip = true; + + # Fatal error: can't create build/sun50iw1p1/release/bl31/sunxi_clocks.o: No such file or directory + enableParallelBuilding = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ARM-software/arm-trusted-firmware; + description = "A reference implementation of secure world software for ARMv8-A"; + license = licenses.bsd3; + maintainers = [ maintainers.lopsided98 ]; + } // extraMeta; + } // builtins.removeAttrs args [ "extraMeta" ]); + +in rec { + inherit buildArmTrustedFirmware; + + armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { + version = "1.0"; + src = fetchFromGitHub { + owner = "apritzel"; + repo = "arm-trusted-firmware"; + # Branch: `allwinner` + rev = "91f2402d941036a0db092d5375d0535c270b9121"; + sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys"; + }; + platform = "sun50iw1p1"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["build/${platform}/release/bl31.bin"]; + }; + + armTrustedFirmwareQemu = buildArmTrustedFirmware rec { + platform = "qemu"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ + "build/${platform}/release/bl1.bin" + "build/${platform}/release/bl2.bin" + "build/${platform}/release/bl31.bin" + ]; + }; + + armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec { + extraMakeFlags = [ "bl31" ]; + platform = "rk3328"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; + }; +} diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index bb98d7ab9cc92cc4e3476c687512cc45720e23bc..a112dcdec97563ce6d6bc5e43a12a816ccde7629 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -6,11 +6,11 @@ let nodeEnv = import ./../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages-generated.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..36c8825d27a811c0daf5d19806b07d9524094ba4 --- /dev/null +++ b/pkgs/misc/calaos/installer/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qmake, qttools, qtbase }: + +stdenv.mkDerivation rec { + name = "calaos_installer-3.1"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "calaos"; + repo = "calaos_installer"; + rev = "v${version}"; + sha256 = "0g8igj5sax5vjqzrpbil7i6329708lqqwvg5mwiqd0zzzha9sawd"; + }; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase ]; + + qmakeFlags = [ "REVISION=${version}" ]; + + installPhase = '' + mkdir -p $out/bin + cp -a calaos_installer $out/bin + ''; + + meta = with stdenv.lib; { + description = "Calaos Installer, a tool to create calaos configuration"; + homepage = https://www.calaos.fr/; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ tiramiseb ]; + }; +} diff --git a/pkgs/misc/cups/cups-clean-dirty.patch b/pkgs/misc/cups/cups-clean-dirty.patch new file mode 100644 index 0000000000000000000000000000000000000000..0bdc8198e8fb840adb85c9d9a724189b457f6d5e --- /dev/null +++ b/pkgs/misc/cups/cups-clean-dirty.patch @@ -0,0 +1,13 @@ +diff --git a/scheduler/main.c b/scheduler/main.c +index 8925c8373..acf031684 100644 +--- a/scheduler/main.c ++++ b/scheduler/main.c +@@ -893,7 +893,7 @@ main(int argc, /* I - Number of command-line args */ + * Write dirty config/state files... + */ + +- if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0) ++ if (DirtyCleanTime && current_time >= DirtyCleanTime) + cupsdCleanDirty(); + + #ifdef __APPLE__ diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index d005f6becadbe536ae09c556a658fb0198d2c018..feeb73a27e90158d0806c0ad18bfacbd36eb1dc4 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam -, dbus, systemd, acl, gmp, darwin +{ stdenv, fetchurl, fetchpatch, pkgconfig, removeReferencesTo +, zlib, libjpeg, libpng, libtiff, pam, dbus, systemd, acl, gmp, darwin , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: @@ -9,18 +9,29 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "cups-${version}"; - version = "2.2.2"; + version = "2.2.6"; passthru = { inherit version; }; src = fetchurl { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "1xp4ji4rz3xffsz6w6nd60ajxvvihn02pkyp2l4smhqxbmyvp2gm"; + sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"; }; outputs = [ "out" "lib" "dev" "man" ]; - nativeBuildInputs = [ pkgconfig ]; + patches = [ + (fetchpatch { + name = "cups"; # weird name to avoid change (for now) + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch" + + "?h=packages/cups&id=41fefa22ac518"; + sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5"; + }) + ./cups-clean-dirty.patch + ]; + + nativeBuildInputs = [ pkgconfig removeReferencesTo ]; + buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] ++ optionals stdenv.isDarwin (with darwin; [ @@ -30,16 +41,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp ]; configureFlags = [ - # Put just lib/* and locale into $lib; this didn't work directly. - # lib/cups is moved back to $out in postInstall. - # Beware: some parts of cups probably don't fully respect these. - "--prefix=$(lib)" - "--datadir=$(out)/share" - "--localedir=$(lib)/share/locale" - "--localstatedir=/var" "--sysconfdir=/etc" - "--with-systemd=\${out}/lib/systemd/system" "--enable-raw-printing" "--enable-threads" ] ++ optionals stdenv.isLinux [ @@ -49,15 +52,24 @@ stdenv.mkDerivation rec { ++ optional (gnutls != null) "--enable-ssl" ++ optional (avahi != null) "--enable-avahi" ++ optional (libpaper != null) "--enable-libpaper" - ++ optionals stdenv.isDarwin [ - "--with-bundledir=$out" - "--disable-launchd" - ]; + ++ optional stdenv.isDarwin "--disable-launchd"; + + preConfigure = '' + configureFlagsArray+=( + # Put just lib/* and locale into $lib; this didn't work directly. + # lib/cups is moved back to $out in postInstall. + # Beware: some parts of cups probably don't fully respect these. + "--prefix=$lib" + "--datadir=$out/share" + "--localedir=$lib/share/locale" - # XXX: Hackery until https://github.com/NixOS/nixpkgs/issues/24693 - preBuild = if stdenv.isDarwin then '' - export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks - '' else null; + "--with-systemd=$out/lib/systemd/system" + + ${optionalString stdenv.isDarwin '' + "--with-bundledir=$out" + ''} + ) + ''; installFlags = [ # Don't try to write in /var at build time. @@ -80,21 +92,26 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - moveToOutput lib/cups "$out" + libexec=${if stdenv.isDarwin then "libexec/cups" else "lib/cups"} + moveToOutput $libexec "$out" + + # $lib contains references to $out/share/cups. + # CUPS is working without them, so they are not vital. + find "$lib" -type f -exec grep -q "$out" {} \; \ + -printf "removing references from %p\n" \ + -exec remove-references-to -t "$out" {} + # Delete obsolete stuff that conflicts with cups-filters. rm -rf $out/share/cups/banners $out/share/cups/data/testprint - # Some outputs in cups-config were unexpanded and some even wrong. moveToOutput bin/cups-config "$dev" - sed -e "/^cups_serverbin=/s|\$(lib)|$out|" \ - -e "s|\$(out)|$out|" \ - -e "s|\$(lib)|$lib|" \ + sed -e "/^cups_serverbin=/s|$lib|$out|" \ -i "$dev/bin/cups-config" # Rename systemd files provided by CUPS for f in "$out"/lib/systemd/system/*; do substituteInPlace "$f" \ + --replace "$lib/$libexec" "$out/$libexec" \ --replace "org.cups.cupsd" "cups" \ --replace "org.cups." "" diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7a6d6c3861dfa96f56f14873ed673476d04e9991 --- /dev/null +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, cmake, zlib, cups, ghostscript }: + +stdenv.mkDerivation rec { + + name = "brlaser"; + + src = fetchFromGitHub { + owner = "pdewacht"; + repo = "brlaser"; + rev = "a52149823373e11f918d9e6a56eda7242935c99b"; + sha256 = "12d8g0aispdj2virf6vrvb0vx6d6ardjg3qyav75shsm1f94ids6"; + }; + + buildInputs = [ cmake zlib cups ]; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DCUPS_SERVER_BIN=$out/lib/cups/ -DCUPS_DATA_DIR=$out/share/cups/" + ''; + + meta = with stdenv.lib; { + description = "A CUPS driver for Brother laser printers"; + longDescription = + '' + Although most Brother printers support a standard printer language such as PCL or PostScript, not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help. + + This driver is known to work with these printers: + + Brother DCP-1510 + Brother DCP-7030 + Brother DCP-7040 + Brother DCP-7055 + Brother DCP-7055W + Brother DCP-7065DN + Brother HL-L2300D + Brother MFC-7360N + ''; + homepage = https://github.com/pdewacht/brlaser; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ StijnDW ]; + }; +} diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 3577f5b38b0a7cac72b3b6cb29bfedf24aa6f84b..2634b7128719bb5319ca6e8efcdca3a17d5bf917 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { --replace /usr/include/libusb-1.0 \ ${libusb.dev}/include/libusb-1.0 ./autogen.sh --prefix=$out --enable-progpath=$out/bin \ + --datadir=$out/share \ --enable-libdir=/var/cache/cups make ) diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b83e84154bbe9eaba2b5d129afbad0df311dd232 --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -0,0 +1,150 @@ +{ stdenv, lib, fetchzip, + autoconf, automake, libtool, + cups, popt, libtiff, libpng, + ghostscript, glib, libusb, libxml2 }: + +/* this derivation is basically just a transcription of the rpm .spec + file included in the tarball */ + +let arch = + if stdenv.system == "x86_64-linux" then "64" + else if stdenv.system == "i686-linux" then "32" + else throw "Unsupported system ${stdenv.system}"; + +in stdenv.mkDerivation rec { + name = "cnijfilter-${version}"; + + /* important note about versions: cnijfilter packages seem to use + versions in a non-standard way. the version indicates which + printers are supported in the package. so this package should + not be "upgraded" in the usual way. + + instead, if you want to include another version supporting your + printer, you should try to abstract out the common things (which + should be pretty much everything except the version and the 'pr' + and 'pr_id' values to loop over). */ + version = "4.00"; + + src = fetchzip { + url = "http://gdlp01.c-wss.com/gds/5/0100005515/01/cnijfilter-source-4.00-1.tar.gz"; + sha256 = "1f6vpx1z3qa88590i5m0s49j9n90vpk81xmw6pvj0nfd3qbvzkya"; + }; + + buildInputs = [ autoconf libtool automake + cups popt libtiff libpng + ghostscript glib libusb libxml2 ]; + + # patches from https://github.com/tokiclover/bar-overlay/tree/master/net-print/cnijfilter + patches = [ + ./patches/cnijfilter-3.80-1-cups-1.6.patch + ./patches/cnijfilter-3.80-6-cups-1.6.patch + ./patches/cnijfilter-4.00-4-ppd.patch + ./patches/cnijfilter-4.00-5-abi_x86_32.patch + ./patches/cnijfilter-4.00-6-headers.patch + ]; + + postPatch = '' + sed -i "s|/usr/lib/cups/backend|$out/lib/cups/backend|" backend/src/Makefile.am; + sed -i "s|/usr/lib/cups/backend|$out/lib/cups/backend|" backendnet/backend/Makefile.am; + sed -i "s|/usr/lib/cups/backend|$out/lib/cups/backend|" cnijbe/src/Makefile.am; + sed -i "s|/usr|$out|" backend/src/cnij_backend_common.c; + sed -i "s|/usr/bin|${ghostscript}/bin|" pstocanonij/filter/pstocanonij.c; + ''; + + configurePhase = '' + cd libs + ./autogen.sh --prefix=$out + + cd ../bscc2sts + ./autogen.sh + + cd ../cnijnpr + ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib + + cd ../cngpij + ./autogen.sh --prefix=$out --enable-progpath=$out/bin + + cd ../cngpijmnt + ./autogen.sh --prefix=$out --enable-progpath=$out/bin + + cd ../pstocanonij + ./autogen.sh --prefix=$out --enable-progpath=$out/bin + + cd ../backend + ./autogen.sh --prefix=$out + + cd ../backendnet + ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin + + cd ../cmdtocanonij + ./autogen.sh --prefix=$out --datadir=$out/share + + cd ../cnijbe + ./autogen.sh --prefix=$out --enable-progpath=$out/bin + + cd ../lgmon2 + substituteInPlace src/Makefile.am \ + --replace /usr/include/libusb-1.0 \ + ${libusb.dev}/include/libusb-1.0 + ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin + + cd ..; + + sed -e "s,cnijlgmon2_LDADD =,cnijlgmon2_LDADD = -L../../com/libs_bin${arch}," \ + -i lgmon2/src/Makefile.am || die + ''; + + preInstall = '' + mkdir -p $out/bin $out/lib/cups/filter $out/share/cups/model; + ''; + + postInstall = '' + set -o xtrace + for pr in mg2400 mg2500 mg3500 mg5500 mg6400 mg6500 mg7100 p200; do + cd ppd; + ./autogen.sh --prefix=$out --program-suffix=$pr + make clean; + make; + make install; + + cd ../cnijfilter; + ./autogen.sh --prefix=$out --program-suffix=$pr --enable-libpath=/var/lib/cups/path/lib/bjlib --enable-binpath=$out/bin; + make clean; + make; + make install; + + cd ..; + done; + + mkdir -p $out/lib/bjlib; + for pr_id in 423 424 425 426 427 428 429 430; do + install -c -m 755 $pr_id/database/* $out/lib/bjlib; + install -c -s -m 755 $pr_id/libs_bin${arch}/*.so.* $out/lib; + done; + + pushd $out/lib; + for so_file in *.so.*; do + ln -s $so_file ''${so_file/.so.*/}.so; + patchelf --set-rpath $out/lib $so_file; + done; + popd; + ''; + + /* the tarball includes some pre-built shared libraries. we run + 'patchelf --set-rpath' on them just a few lines above, so that + they can find each other. but that's not quite enough. some of + those libraries load each other in non-standard ways -- they + don't list each other in the DT_NEEDED section. so, if the + standard 'patchelf --shrink-rpath' (from + pkgs/development/tools/misc/patchelf/setup-hook.sh) is run on + them, it undoes the --set-rpath. this prevents that. */ + dontPatchELF = true; + + meta = with lib; { + description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series."; + homepage = https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ chpatrick ]; + }; +} diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch new file mode 100644 index 0000000000000000000000000000000000000000..dfc0bb2268cb2a6d313c8824fd87a7d31f65e2ac --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch @@ -0,0 +1,62 @@ +--- a/cngpij/cngpij/bjcups.c ++++ a/cngpij/cngpij/bjcups.c +@@ -698,8 +719,8 @@ + else { + pRequest = ippNew(); + +- pRequest->request.op.operation_id = CUPS_GET_PRINTERS; +- pRequest->request.op.request_id = 1; ++ ippSetOperation(pRequest, CUPS_GET_PRINTERS); ++ ippSetRequestId(pRequest, 1); + + pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19 + +@@ -708,29 +729,29 @@ + ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL); + + if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) { +- if (pResponse->request.status.status_code > IPP_OK_CONFLICT) { ++ if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) { + fputs("ERROR: IPP ERROR\n", stderr); + goto onErr; + } + else { +- pAttribute = pResponse->attrs; ++ pAttribute = ippFirstAttribute(pResponse); + + while (pAttribute != NULL) { +- while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) { +- pAttribute = pAttribute->next; ++ while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) { ++ pAttribute = ippNextAttribute(pResponse); + } + if (pAttribute == NULL) { + break; + } + +- while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) { +- if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) { +- pPrinter = pAttribute->values[0].string.text; ++ while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) { ++ if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) { ++ pPrinter = ippGetString(pAttribute, 0, NULL); + } +- if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) { +- pDUri = pAttribute->values[0].string.text; ++ if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) { ++ pDUri = ippGetString(pAttribute, 0, NULL); + } +- pAttribute = pAttribute->next; ++ pAttribute = ippNextAttribute(pResponse); + } + + if (strcasecmp(pDestName, pPrinter) == 0) { +@@ -739,7 +760,7 @@ + } + + if (pAttribute != NULL) +- pAttribute = pAttribute->next; ++ pAttribute = ippNextAttribute(pResponse); + } + } + diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch new file mode 100644 index 0000000000000000000000000000000000000000..6b51d4837d45552634f81b9167de85d1c04eb0d7 --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch @@ -0,0 +1,87 @@ +diff --git a/cngpijmnt/src/getipc.c b/cngpijmnt/src/getipc.c +index 8688032..54c7933 100755 +--- a/cngpijmnt/src/getipc.c ++++ b/cngpijmnt/src/getipc.c +@@ -42,7 +42,7 @@ int GetIPCData(LPIPCU pipc, char *sname) + int server_fd; + int client_fd; + char buf[128]; +- size_t len; ++ socklen_t len; + short ret = RET_ERROR; + + if( (server_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0 ) + +--- a/cngpijmnt/src/main.c 2016-11-12 23:39:03.534855723 +0100 ++++ b/cngpijmnt/src/main.c 2016-11-12 23:47:02.521847145 +0100 +@@ -308,8 +308,8 @@ + *pResponse; // Pointer to CUPS IPP response. + ipp_attribute_t *pAttribute; // Pointer to CUPS attributes. + cups_lang_t *pLanguage; // Pointer to language. +- char *pPrinter = NULL; // Pointer to printer name. +- char *pDUri = NULL; // Pointer to Device uri. ++ const char *pPrinter = NULL; // Pointer to printer name. ++ const char *pDUri = NULL; // Pointer to Device uri. + short retVal = -1; // Return value. + /*** Parameters end ***/ + +@@ -321,8 +321,8 @@ + else { + pRequest = ippNew(); + +- pRequest->request.op.operation_id = CUPS_GET_PRINTERS; +- pRequest->request.op.request_id = 1; ++ ippSetOperation(pRequest, CUPS_GET_PRINTERS); ++ ippSetRequestId(pRequest, 1); + + pLanguage = bjcupsLangDefault(); // cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19 + +@@ -331,29 +331,29 @@ + ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL); + + if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) { +- if (pResponse->request.status.status_code > IPP_OK_CONFLICT) { ++ if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) { + fputs("ERROR: IPP ERROR\n", stderr); + goto onErr; + } + else { +- pAttribute = pResponse->attrs; ++ pAttribute = ippFirstAttribute(pResponse); + + while (pAttribute != NULL) { +- while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) { +- pAttribute = pAttribute->next; ++ while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) { ++ pAttribute = ippNextAttribute(pResponse); + } + if (pAttribute == NULL) { + break; + } + +- while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) { +- if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) { +- pPrinter = pAttribute->values[0].string.text; ++ while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) { ++ if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) { ++ pPrinter = ippGetString(pAttribute, 0, NULL); + } +- if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) { +- pDUri = pAttribute->values[0].string.text; ++ if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) { ++ pDUri = ippGetString(pAttribute, 0, NULL); + } +- pAttribute = pAttribute->next; ++ pAttribute = ippNextAttribute(pResponse); + } + + if (strcasecmp(pDestName, pPrinter) == 0) { +@@ -362,7 +362,7 @@ + } + + if (pAttribute != NULL) +- pAttribute = pAttribute->next; ++ pAttribute = ippNextAttribute(pResponse); + } + } + diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch new file mode 100644 index 0000000000000000000000000000000000000000..92bef72ba0563a718e0510270eb6e75b3df9090c --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch @@ -0,0 +1,10 @@ +--- a/backend/src/cnij_backend_common.c 2016-11-13 00:08:34.600824006 +0100 ++++ a/backend/src/cnij_backend_common.c 2016-11-13 00:08:52.037823694 +0100 +@@ -37,6 +37,7 @@ + // CUPS Header + #include + #include ++#include + + // Header file for CANON + #include "cnij_backend_common.h" diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch new file mode 100644 index 0000000000000000000000000000000000000000..dc85801a256b2d5ce3d5c550aee64c423d63edc6 --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch @@ -0,0 +1,45 @@ +--- a/backendnet/configure.in 2014-08-11 08:38:46.034984462 +0200 ++++ a/backendnet/configure.in 2014-08-11 08:35:42.902985813 +0200 +@@ -19,7 +19,11 @@ + AC_DEFINE_UNQUOTED(BJLIB_PATH, "$enable_libpath") + AC_SUBST(BJLIB_PATH) + +-ARC=`getconf LONG_BIT` ++case "$ABI" in ++ x86) ARC=32;; ++ amd64) ARC=64;; ++ *) ARC=`getconf LONG_BIT`;; ++esac + AC_SUBST(ARC) + + # Checks for programs. +--- a/cnijfilter/configure.in 2014-08-11 08:39:44.426984031 +0200 ++++ a/cnijfilter/configure.in 2014-08-11 08:35:19.788985984 +0200 +@@ -43,7 +43,11 @@ + esac + AC_SUBST(CNCL_LIB_ID) + +-ARC=`getconf LONG_BIT` ++case "$ABI" in ++ x86) ARC=32;; ++ amd64) ARC=64;; ++ *) ARC=`getconf LONG_BIT`;; ++esac + AC_SUBST(ARC) + + AC_PROG_CC +--- a/cnijnpr/configure.in 2014-08-11 08:41:12.712983380 +0200 ++++ a/cnijnpr/configure.in 2014-08-11 08:40:44.354983589 +0200 +@@ -37,7 +37,11 @@ + + CFLAGS="-O2" + +-ARC=`getconf LONG_BIT` ++case "$ABI" in ++ x86) ARC=32;; ++ amd64) ARC=64;; ++ *) ARC=`getconf LONG_BIT`;; ++esac + AC_SUBST(ARC) + + AC_OUTPUT(Makefile diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch new file mode 100644 index 0000000000000000000000000000000000000000..7dba799951141c0b29f96cce614eac2af0a20e56 --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch @@ -0,0 +1,11 @@ +--- a/cnijnpr/src/cnijnpr.c 2016-11-13 21:51:33.844977618 +0100 ++++ a/cnijnpr/src/cnijnpr.c 2016-11-13 21:52:03.129977094 +0100 +@@ -34,6 +34,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6f27985bdbfcf27e4f2883df4d31c5aeda1832ef --- /dev/null +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -0,0 +1,73 @@ +{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, patchelf}: + +let + version = "3.0.1-1"; +cupsdeb = fetchurl { + url = "http://download.brother.com/welcome/dlf100421/hl1110cupswrapper-${version}.i386.deb"; + sha256 = "a87880f4ece764a724411b5b24d15d1b912f6ffc6ecbfd9fac4cd5eda13d2eb7"; +}; +srcdir = "hl1110cupswrapper-GPL_src-${version}"; +cupssrc = fetchurl { + url = "http://download.brother.com/welcome/dlf100422/${srcdir}.tar.gz"; + sha256 = "be1dce6a4608cb253b0b382db30bf5885da46b010e8eb595b15c435e2487761c"; +}; +lprdeb = fetchurl { + url = "http://download.brother.com/welcome/dlf100419/hl1110lpr-${version}.i386.deb"; + sha256 = "5af241782a0d500d7f47e06ea43d61127f4019b5b1c6e68b4c1cb4521a742c22"; +}; + in +stdenv.mkDerivation { + name = "cups-brother-hl1110"; + + srcs = [ lprdeb cupssrc cupsdeb ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + unpackPhase = '' + tar -xvf ${cupssrc} + ''; + buildPhase = '' + gcc -Wall ${srcdir}/brcupsconfig/brcupsconfig.c -o brcupsconfig4 + ''; + installPhase = '' + # install lpr + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \ + --replace /opt "$out/opt" \ + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/HL1110/lpd/psconvert2 + + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/brprintconflsr3 + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/rawtobr3 + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter + + wrapProgram $out/opt/brother/Printers/HL1110/lpd/psconvert2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + wrapProgram $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + + dpkg-deb -x ${cupsdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 --replace /opt "$out/opt" + + mkdir -p $out/lib/cups/filter + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 $out/lib/cups/filter/brother_lpdwrapper_HL1110 + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brother-HL1110-cups-en.ppd $out/lib/cups/filter/brother-HL1110-cups-en.ppd + cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/ + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 + + wrapProgram $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + ''; + + meta = { + homepage = http://www.brother.com/; + description = "Brother HL1110 printer driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl1110_us_eu_as&os=128#SelectLanguageType-561_0_1"; + }; +} diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cda4ed6304d212c6ed033f3989e5a9cc778a887f --- /dev/null +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, makeWrapper +, cups +, dpkg +, a2ps, ghostscript, gnugrep, gnused, coreutils, file, perl, which +}: + +stdenv.mkDerivation rec { + name = "hll2390dw-cups-${version}"; + version = "4.0.0-1"; + + src = fetchurl { + # The i386 part is a lie. There are x86, x86_64 and armv7l drivers. + # Though this builds only supports x86_64 for now. + url = "http://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb"; + sha256 = "0w8rxh1sa5amxr87qmzs4m2p06b1b36wn2q127mg427sbkh1rwni"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + + unpackPhase = "true"; + + installPhase = '' + dpkg-deb -x $src $out + + substituteInPlace $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ + --replace /opt "$out/opt" \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out\"; #" \ + --replace "PRINTER =~" "PRINTER = \"HLL2390DW\"; #" + + # FIXME : Allow i686 and armv7l variations to be setup instead. + _PLAT=x86_64 + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 $out/opt/brother/Printers/HLL2390DW/lpd/brprintconflsr3 + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 $out/opt/brother/Printers/HLL2390DW/lpd/rawtobr3 + + for f in \ + $out/opt/brother/Printers/HLL2390DW/cupswrapper/lpdwrapper \ + $out/opt/brother/Printers/HLL2390DW/cupswrapper/paperconfigml2 \ + ; do + #substituteInPlace $f \ + wrapProgram $f \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils ghostscript gnugrep gnused + ]} + done + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter $out/lib/cups/filter/brother_lpdwrapper_HLL2390DW + + mkdir -p $out/share/cups/model + ln -s $out/opt/brother/Printers/HLL2390DW/cupswrapper/brother-HLL2390DW-cups-en.ppd $out/share/cups/model/ + + wrapProgram $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } + ''; + + meta = with stdenv.lib; { + homepage = http://www.brother.com/; + description = "Brother HL-L2390DW combined print driver"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128; + maintainers = [ maintainers.samueldr ]; + }; +} + diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index be9d4f8370922ad00c86e143a33edaf4dd51a899..db787021ce03a1dc16ddf1fb85f1d9095d059f12 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -4,7 +4,7 @@ let platform = if stdenv.system == "x86_64-linux" then "64bit" else if stdenv.system == "i686-linux" then "32bit" - else abort "Unsupported platform"; + else throw "Unsupported system: ${stdenv.system}"; libPath = lib.makeLibraryPath [ cups ]; in @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontStrip = true; src = fetchzip { - # this side does not like curl -> override useragent + # this site does not like curl -> override useragent curlOpts = "-A ''"; url = "http://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; sha256 = "0z1pbgidkibv4j21z0ys8cq1lafc6687syqa07qij2qd8zp15wiz"; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d45b53b5b80bf18202c042bc9184462b6b54ac2c --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }: + +stdenv.mkDerivation rec { + name = "mfcl2720dwcupswrapper-${version}"; + version = "3.2.0-1"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf101802/${name}.i386.deb"; + sha256 = "6d131926ce22c51b1854d2b91e426cc7ecbf5d6dabd698ef51a417090e35c598"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + + basedir=${mfcl2720dwlpr}/opt/brother/Printers/MFCL2720DW + dir=$out/opt/brother/Printers/MFCL2720DW + + substituteInPlace $dir/cupswrapper/brother_lpdwrapper_MFCL2720DW \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "basedir =~" "basedir = \"$basedir\"; #" \ + --replace "PRINTER =~" "PRINTER = \"MFCL2720DW\"; #" + + substituteInPlace $dir/cupswrapper/paperconfigml1 \ + --replace /usr/bin/perl ${perl}/bin/perl + + wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2720DW \ + --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_MFCL2720DW $out/lib/cups/filter + ln $dir/cupswrapper/brother-MFCL2720DW-cups-en.ppd $out/share/cups/model + ''; + + meta = { + description = "Brother MFC-L2720DW CUPS wrapper driver"; + homepage = http://www.brother.com/; + license = stdenv.lib.licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ stdenv.lib.maintainers.xeji ]; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7791d71114b41ddfc82a02b1a5ea122eabca2731 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -0,0 +1,45 @@ +{ pkgs, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: + +stdenv.mkDerivation rec { + name = "mfcl2720dwlpr-${version}"; + version = "3.2.0-1"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf101801/${name}.i386.deb"; + sha256 = "088217e9ad118ec1e7f3d3f8f60f3bd839fe2c7d7c1136b249e9ac648dc742af"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + + dir=$out/opt/brother/Printers/MFCL2720DW + + substituteInPlace $dir/lpd/filter_MFCL2720DW \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \ + --replace "PRINTER =~" "PRINTER = \"MFCL2720DW\"; #" + + wrapProgram $dir/lpd/filter_MFCL2720DW \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils ghostscript gnugrep gnused which + ]} + + # need to use i686 glibc here, these are 32bit proprietary binaries + interpreter=${pkgs.pkgsi686Linux.glibc}/lib/ld-linux.so.2 + 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-L2720DW lpr driver"; + homepage = http://www.brother.com/; + license = stdenv.lib.licenses.unfree; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ stdenv.lib.maintainers.xeji ]; + }; +} 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 16b40798a5daabfbaffa7faa1f669d09d331f251..18dd6c14822b94d357a69988b1e49f9d8cf9d8d0 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -38,6 +38,5 @@ in stdenv.mkDerivation rec { homepage = http://www.samsung.com/; license = licenses.unfree; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index 556c408012d268b9878b9c270da72a0b23835131..e8da0541f6c56eeb547df67bd446e390482aba91 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -94,6 +94,5 @@ in stdenv.mkDerivation rec { # Tested on linux-x86_64. Might work on linux-i386. # Probably won't work on anything else. platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9321cf526bee6fac2f9ffa611a1b16b26726157f --- /dev/null +++ b/pkgs/misc/cups/drivers/zj-58/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchFromGitHub, cups}: + +stdenv.mkDerivation rec { + pname = "cups-zj-58"; + version = "2018-02-22"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "klirichek"; + repo = "zj-58"; + rev = "e4212cd"; + sha256 = "1w2qkspm4qqg5h8n6gmakzhiww7gag64chvy9kf89xsl3wsyp6pi"; + }; + + buildInputs = [ cups ]; + + installPhase = '' + install -D rastertozj $out/lib/cups/filter/rastertozj + install -D ZJ-58.ppd $out/share/cups/model/zjiang/ZJ-58.ppd + ''; + + meta = with stdenv.lib; { + description = "CUPS filter for thermal printer Zjiang ZJ-58"; + homepage = https://github.com/klirichek/zj-58; + platforms = platforms.linux; + maintainers = with maintainers; [ makefu ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index be788f9add46dc6e20113c4b6d8fdc0f8292f628..02a7ce219c4bb05b7c03e1aa702b8b447ab6b860 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.16.0"; + version = "1.20.3"; src = fetchurl { url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "1kcndzpbbcaxafnz1wa6acy3p3r5likfqmf057i5q0q6i176lz5k"; + sha256 = "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -62,6 +62,5 @@ 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/documentation-highlighter/LICENSE b/pkgs/misc/documentation-highlighter/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..422deb7350fe14c2cefdc65d0689f214b45c4764 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/LICENSE @@ -0,0 +1,24 @@ +Copyright (c) 2006, Ivan Sagalaev +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of highlight.js nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS AND CONTRIBUTORS 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. diff --git a/pkgs/misc/documentation-highlighter/README.md b/pkgs/misc/documentation-highlighter/README.md new file mode 100644 index 0000000000000000000000000000000000000000..f4baa3c8e001508512ecd0750414f9067ef5bbc9 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/README.md @@ -0,0 +1,152 @@ +This file was generated with pkgs/misc/documentation-highlighter/update.sh + +# Highlight.js + +[![Build Status](https://travis-ci.org/isagalaev/highlight.js.svg?branch=master)](https://travis-ci.org/isagalaev/highlight.js) + +Highlight.js is a syntax highlighter written in JavaScript. It works in +the browser as well as on the server. It works with pretty much any +markup, doesn’t depend on any framework and has automatic language +detection. + +## Getting Started + +The bare minimum for using highlight.js on a web page is linking to the +library along with one of the styles and calling +[`initHighlightingOnLoad`][1]: + +```html + + + +``` + +This will find and highlight code inside of `
` tags; it tries
+to detect the language automatically. If automatic detection doesn’t
+work for you, you can specify the language in the `class` attribute:
+
+```html
+
...

+```
+
+The list of supported language classes is available in the [class
+reference][2].  Classes can also be prefixed with either `language-` or
+`lang-`.
+
+To disable highlighting altogether use the `nohighlight` class:
+
+```html
+
...

+```
+
+## Custom Initialization
+
+When you need a bit more control over the initialization of
+highlight.js, you can use the [`highlightBlock`][3] and [`configure`][4]
+functions. This allows you to control *what* to highlight and *when*.
+
+Here’s an equivalent way to calling [`initHighlightingOnLoad`][1] using
+jQuery:
+
+```javascript
+$(document).ready(function() {
+  $('pre code').each(function(i, block) {
+    hljs.highlightBlock(block);
+  });
+});
+```
+
+You can use any tags instead of `
` to mark up your code. If
+you don't use a container that preserve line breaks you will need to
+configure highlight.js to use the `
` tag:
+
+```javascript
+hljs.configure({useBR: true});
+
+$('div.code').each(function(i, block) {
+  hljs.highlightBlock(block);
+});
+```
+
+For other options refer to the documentation for [`configure`][4].
+
+
+## Web Workers
+
+You can run highlighting inside a web worker to avoid freezing the browser
+window while dealing with very big chunks of code.
+
+In your main script:
+
+```javascript
+addEventListener('load', function() {
+  var code = document.querySelector('#code');
+  var worker = new Worker('worker.js');
+  worker.onmessage = function(event) { code.innerHTML = event.data; }
+  worker.postMessage(code.textContent);
+})
+```
+
+In worker.js:
+
+```javascript
+onmessage = function(event) {
+  importScripts('/highlight.pack.js');
+  var result = self.hljs.highlightAuto(event.data);
+  postMessage(result.value);
+}
+```
+
+
+## Getting the Library
+
+You can get highlight.js as a hosted, or custom-build, browser script or
+as a server module. Right out of the box the browser script supports
+both AMD and CommonJS, so if you wish you can use RequireJS or
+Browserify without having to build from source. The server module also
+works perfectly fine with Browserify, but there is the option to use a
+build specific to browsers rather than something meant for a server.
+Head over to the [download page][5] for all the options.
+
+**Don't link to GitHub directly.** The library is not supposed to work straight
+from the source, it requires building. If none of the pre-packaged options
+work for you refer to the [building documentation][6].
+
+**The CDN-hosted package doesn't have all the languages.** Otherwise it'd be
+too big. If you don't see the language you need in the ["Common" section][5],
+it can be added manually:
+
+```html
+
+```
+
+**On Almond.** You need to use the optimizer to give the module a name. For
+example:
+
+```
+r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js
+```
+
+
+## License
+
+Highlight.js is released under the BSD License. See [LICENSE][7] file
+for details.
+
+## Links
+
+The official site for the library is at .
+
+Further in-depth documentation for the API and other topics is at
+.
+
+Authors and contributors are listed in the [AUTHORS.en.txt][8] file.
+
+[1]: http://highlightjs.readthedocs.io/en/latest/api.html#inithighlightingonload
+[2]: http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html
+[3]: http://highlightjs.readthedocs.io/en/latest/api.html#highlightblock-block
+[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options
+[5]: https://highlightjs.org/download/
+[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html
+[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE
+[8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.en.txt
diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a9fbcc178bb8bd66f43ed463e57e58f9fff367cd
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, runCommand }:
+runCommand "documentation-highlighter" {
+  meta = {
+    description = "Highlight.js sources for the Nix Ecosystem's documentation.";
+    homepage = https://highlightjs.org;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.grahamc ];
+  };
+} ''
+  cp -r ${./.} $out
+''
diff --git a/pkgs/misc/documentation-highlighter/highlight.pack.js b/pkgs/misc/documentation-highlighter/highlight.pack.js
new file mode 100644
index 0000000000000000000000000000000000000000..f909702367ec92e4ddb0c07f92bcde050fbca976
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/highlight.pack.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&").replace(//g,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset"}function u(e){s+=""}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"
":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("nix",function(e){var r={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},t={cN:"subst",b:/\$\{/,e:/}/,k:r},i={b:/[a-zA-Z0-9-_]+(\s*=)/,rB:!0,r:0,c:[{cN:"attr",b:/\S+/}]},s={cN:"string",c:[t],v:[{b:"''",e:"''"},{b:'"',e:'"'}]},a=[e.NM,e.HCM,e.CBCM,s,i];return t.c=a,{aliases:["nixos"],k:r,c:a}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});
\ No newline at end of file
diff --git a/pkgs/misc/documentation-highlighter/loader.js b/pkgs/misc/documentation-highlighter/loader.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ad7dbf24b514c577d52e7b8d644aab2c12981cb
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/loader.js
@@ -0,0 +1,7 @@
+/* This file is NOT part of highlight.js */
+document.onreadystatechange = function () {
+    var listings = document.querySelectorAll('.programlisting, .screen');
+    for (i = 0; i < listings.length; ++i) {
+        hljs.highlightBlock(listings[i]);
+    }
+}
diff --git a/pkgs/misc/documentation-highlighter/mono-blue.css b/pkgs/misc/documentation-highlighter/mono-blue.css
new file mode 100644
index 0000000000000000000000000000000000000000..884c97c7673f6eabbc8cafb0ac3aa0e9fc6f3517
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/mono-blue.css
@@ -0,0 +1,59 @@
+/*
+  Five-color theme from a single blue hue.
+*/
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #eaeef3;
+}
+
+.hljs {
+  color: #00193a;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-title,
+.hljs-section,
+.hljs-doctag,
+.hljs-name,
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-comment {
+  color: #738191;
+}
+
+.hljs-string,
+.hljs-title,
+.hljs-section,
+.hljs-built_in,
+.hljs-literal,
+.hljs-type,
+.hljs-addition,
+.hljs-tag,
+.hljs-quote,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #0048ab;
+}
+
+.hljs-meta,
+.hljs-subst,
+.hljs-symbol,
+.hljs-regexp,
+.hljs-attribute,
+.hljs-deletion,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link,
+.hljs-bullet {
+  color: #4c81c9;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
diff --git a/pkgs/misc/documentation-highlighter/update.sh b/pkgs/misc/documentation-highlighter/update.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3b77af4af41633c5f7d7230697f40ba773ddc7bd
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/update.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl -p unzip
+
+set -eu
+set -o pipefail
+
+root=$(pwd)
+
+if [ ! -f "./update.sh" ]; then
+    echo "Please run this script from within pkgs/misc/documentation-highlighter/!"
+    exit 1
+fi
+
+scratch=$(mktemp -d -t tmp.XXXXXXXXXX)
+function finish {
+  rm -rf "$scratch"
+}
+trap finish EXIT
+
+
+mkdir $scratch/src
+cd $scratch/src
+
+token=$(curl https://highlightjs.org/download/ -c "$scratch/jar" \
+    | grep csrf \
+    | cut -d"'" -f6)
+
+curl --header "Referer: https://highlightjs.org/download/"\
+    -b "$scratch/jar" \
+    --data "csrfmiddlewaretoken=$token&nix.js=on&bash.js=on" \
+    https://highlightjs.org/download/ > $scratch/out.zip
+
+unzip "$scratch/out.zip"
+out="$root/"
+mkdir -p "$out"
+cp ./{highlight.pack.js,LICENSE,styles/mono-blue.css} "$out"
+
+(
+    echo "This file was generated with pkgs/misc/documentation-highlighter/update.sh"
+    echo ""
+    cat README.md
+) > "$out/README.md"
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index 114568fdd528fe6fc9a5360ab6d4891077aec5f0..1c79be712b064b75d0cc1a81289c555f6a170ceb 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch";
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch?h=b6e4c805d53b49da79a0f64ef16bb82d6d800fcf";
       sha256 = "04y70qjd220dpyh771fiq50lha16pms98mfigwjczdfmx6kpj1jd";
     })
     ./firmware_location.patch
@@ -138,5 +138,6 @@ stdenv.mkDerivation rec {
       Supported hardware: at least :
     '' +
     stdenv.lib.concatStringsSep ", " (stdenv.lib.mapAttrsToList (name: value: value.passthru.hw) plugins);
+    maintainers = with stdenv.lib.maintainers; [ symphorien ];
   };
 }
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix
index bfc8271ad65998287a0830a28e459a3bec2f3b73..8e24cf53c2f0f61f206e32d143bd07fa3a5202b4 100644
--- a/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/pkgs/misc/drivers/foo2zjs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim }:
 
 stdenv.mkDerivation rec {
-  name = "foo2zjs-20110210";
+  name = "foo2zjs-20171202";
 
   src = fetchurl {
     url = "http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz";
-    sha256 = "0vss8gdbbgxr694xw48rys2qflbnb4sp4gdb1v6z4m9ab97hs5yk";
+    sha256 = "b63c65e8e0e7c9fd8d19b9e63f7cd85048eba01a877aac1ca13a6bfc979ea182";
   };
 
   buildInputs = [ foomatic-filters bc unzip ghostscript systemd vim ];
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 7917d1e361608f0c639c3d0661022b4a5d8fc762..7c8750905d9c35ac7ca00d18bf9e06712ac334a8 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -1,21 +1,21 @@
 # this package was called gimp-print in the past
-{ stdenv, lib, fetchurl, pkgconfig
-, ijs, makeWrapper
+{ stdenv, lib, fetchurl, makeWrapper, pkgconfig
+, ijs, zlib
 , gimp2Support ? false, gimp
 , cupsSupport ? true, cups, libusb, perl
 }:
 
 stdenv.mkDerivation rec {
-  name = "gutenprint-5.2.13";
+  name = "gutenprint-5.2.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/gimp-print/${name}.tar.bz2";
-    sha256 = "0hi7s0y59306p4kp06sankfa57k2805khbknkvl9d036hdfp9afr";
+    sha256 = "1293x19gw1b742id7c7bz5giv3vlxaqpmbdz2g0n99wny5k0ggs5";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs =
-    [ ijs ]
+    [ ijs zlib ]
     ++ lib.optionals gimp2Support [ gimp.gtk gimp ]
     ++ lib.optionals cupsSupport [ cups libusb perl ];
 
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index f538066e75ce3bde4e67a1195d997bff135f1dde..37f2361b45e80413e61b106cc612691939a397b7 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -73,7 +73,7 @@ pythonPackages.buildPythonApplication {
     pyqt4
   ];
 
-  makeWrapperArgs = [ ''--prefix PATH : "${nettools}/bin"'' ];
+  makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ];
 
   prePatch = ''
     # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 66ed1d44adc7b2e53ffa3253ac321babfbe01b99..b18ae7762df2d7d883e58c25f631361e131672ef 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -11,16 +11,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.17.10";
+  version = "3.17.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0v27hg856b5z2rilczcbfgz8ksxn0n810g1glac3mxkj8qbl8wqg";
+    sha256 = "0xda7x7xxjvzn1l0adlvbwcw21crq1r3r79bkf94q3m5i6abx49g";
   };
 
   plugin = fetchurl {
-    url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "07am3dnl0ipgfswz5wndprryljh9rqbfhq7mm4d4yyj3bdnnzlig";
+    url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
+    sha256 = "0vqhwqc33vxncdhbzdchbgrcrxvkwnp7rc2hkswwn9da112s0c9w";
   };
 
   hplipState = substituteAll {
@@ -57,6 +57,7 @@ pythonPackages.buildPythonApplication {
     dbus
     net_snmp
     openssl
+    zlib
   ];
 
   nativeBuildInputs = [
@@ -69,21 +70,22 @@ pythonPackages.buildPythonApplication {
     pygobject2
     reportlab
     usbutils
+    sip
   ] ++ stdenv.lib.optionals withQt5 [
     pyqt5
   ];
 
-  makeWrapperArgs = [ ''--prefix PATH : "${nettools}/bin"'' ];
+  makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ];
 
   prePatch = ''
     # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
     find . -type f -exec sed -i \
-      -e s,/etc/hp,$out/etc/hp, \
-      -e s,/etc/sane.d,$out/etc/sane.d, \
-      -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0, \
-      -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \
-      -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \
-      -e s,/var/lib/hp,$out/var/lib/hp, \
+      -e s,/etc/hp,$out/etc/hp,g \
+      -e s,/etc/sane.d,$out/etc/sane.d,g \
+      -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0,g \
+      -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor,g \
+      -e s,/usr/lib/systemd/system,$out/lib/systemd/system,g \
+      -e s,/var/lib/hp,$out/var/lib/hp,g \
       {} +
   '';
 
@@ -96,6 +98,8 @@ pythonPackages.buildPythonApplication {
       --with-systraydir=$out/xdg/autostart
       --with-mimedir=$out/etc/cups
       --enable-policykit
+      --disable-qt4
+      ${stdenv.lib.optionalString withQt5 "--enable-qt5"}
     "
 
     export makeFlags="
@@ -140,9 +144,6 @@ pythonPackages.buildPythonApplication {
     mkdir -p $out/var/lib/hp
     cp ${hplipState} $out/var/lib/hp/hplip.state
 
-    mkdir -p $out/etc/sane.d/dll.d
-    mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf
-
     rm $out/etc/udev/rules.d/56-hpmud.rules
   '';
 
@@ -183,7 +184,7 @@ pythonPackages.buildPythonApplication {
 
   meta = with stdenv.lib; {
     description = "Print, scan and fax HP drivers for Linux";
-    homepage = http://hplipopensource.com/;
+    homepage = https://developers.hp.com/hp-linux-imaging-and-printing;
     license = if withPlugin
       then licenses.unfree
       else with licenses; [ mit bsd2 gpl2Plus ];
diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..93e8ffbc3ca8cc4449dbfea06db92cb986c70d30
--- /dev/null
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -0,0 +1,62 @@
+{ lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook
+, gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg
+, evdev, pygobject3, pylibacl, pytest
+, linuxHeaders
+, libX11, libXext, libXfixes, libusb1
+}:
+
+buildPythonApplication rec {
+  pname = "sc-controller";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner  = "kozec";
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "0zal8sl3j17gqmynig8jhqrhj7zfqql8vci4whn19gymchwjalzi";
+  };
+
+  nativeBuildInputs = [ wrapGAppsHook ];
+
+  buildInputs = [ gtk3 gobjectIntrospection libappindicator-gtk3 librsvg ];
+
+  propagatedBuildInputs = [ evdev pygobject3 pylibacl ];
+
+  checkInputs = [ pytest ];
+
+  postPatch = ''
+    substituteInPlace scc/paths.py --replace sys.prefix "'$out'"
+    substituteInPlace scc/uinput.py --replace /usr/include ${linuxHeaders}/include
+  '';
+
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 ];
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH")
+    # gdk-pixbuf setup hook can not choose between propagated librsvg
+    # and our librsvg with GObject introspection.
+    GDK_PIXBUF_MODULE_FILE=$(echo ${librsvg}/lib/gdk-pixbuf-2.0/*/loaders.cache)
+  '';
+
+  postFixup = ''
+    (
+      # scc runs these scripts as programs. (See find_binary() in scc/tools.py.)
+      cd $out/lib/python*/site-packages/scc/x11
+      patchPythonScript scc-autoswitch-daemon.py
+      patchPythonScript scc-osd-daemon.py
+    )
+  '';
+
+  checkPhase = ''
+    PYTHONPATH=. py.test
+  '';
+
+  meta = with lib; {
+    homepage    = https://github.com/kozec/sc-controller;
+    # donations: https://www.patreon.com/kozec
+    description = "User-mode driver and GUI for Steam Controller and other controllers";
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ orivej rnhmjoj ];
+  };
+}
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d44c90d198a91e21804320b207b2c28d5ed93f38
--- /dev/null
+++ b/pkgs/misc/drivers/steamcontroller/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders
+, GyroplotSupport ? false
+}:
+
+with python3Packages;
+
+buildPythonApplication rec {
+  name = "steamcontroller-${version}";
+  version = "2017-08-11";
+
+  src = fetchFromGitHub {
+    owner  = "ynsta";
+    repo   = "steamcontroller";
+    rev    = "80928ce237925e0d0d7a65a45b481435ba6b931e";
+    sha256 = "0lv9j2zv8fmkmc0x9r7fa8zac2xrwfczms35qz1nfa1hr84wniid";
+  };
+
+  postPatch = ''
+    substituteInPlace src/uinput.py --replace \
+      "/usr/include" "${linuxHeaders}/include"
+  '';
+
+  buildInputs = [ libusb1 ];
+  propagatedBuildInputs =
+    [ psutil python3Packages.libusb1 ]
+    ++ lib.optionals GyroplotSupport [ pyqtgraph pyside ];
+
+  meta = with stdenv.lib; {
+    description = "A standalone Steam controller driver";
+    homepage    = https://github.com/ynsta/steamcontroller;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix
index 4dc0f2591d82a75456848f2865869cb11d788769..35a9bd2e384428b1aaec451a01df5a7e0a7f458f 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -9,7 +9,7 @@ let
     if isx86_64 then "64bit"
     else
     if isi686 then "32bit"
-    else abort "${system} not considered in build derivation. Might still be supported.";
+    else throw "${system} not considered in build derivation. Might still be supported.";
 
 in
   stdenv.mkDerivation {
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix
index ffb2052ca0c189c0f0539d6cd6b5350e1488700a..3cc7869eb0a74fc14fa3df3e21c6ee60739c79fd 100644
--- a/pkgs/misc/drivers/xboxdrv/default.nix
+++ b/pkgs/misc/drivers/xboxdrv/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, scons, libX11, pkgconfig
-, libusb1, boost, glib, dbus_glib }:
+, libusb1, boost, glib, dbus-glib }:
 
 let
   version = "0.8.8";
@@ -16,10 +16,10 @@ in stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ scons libX11 libusb1 boost glib dbus_glib];
+  buildInputs = [ scons libX11 libusb1 boost glib dbus-glib];
 
   meta = with stdenv.lib; {
-    homepage = http://pingus.seul.org/~grumbel/xboxdrv/;
+    homepage = https://pingus.seul.org/~grumbel/xboxdrv/;
     description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.fuuzetsu ];
diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix
index d669233e7593fa48a59083fab06d33b019b040bd..5a37b1b32c5be39661596465461fba4c78f0620a 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/pkgs/misc/emulators/atari++/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, libSM, libX11, SDL }:
+{ stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
   name = "atari++-${version}";
-  version = "1.73";
+  version = "1.81";
 
   src = fetchurl {
     url = "http://www.xl-project.com/download/atari++_${version}.tar.gz";
-    sha256 = "1y5kwh08717jsa5agxrvxnggnwxq36irrid9rzfhca1nnvp9a45l";
+    sha256 = "1sv268dsjddirhx47zaqgqiahy6zjxj7xaiiksd1gjvs4lvf3cdg";
   };
 
-  buildInputs = [ libSM libX11 SDL ];
+  buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ];
+
+  postFixup = ''
+    patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} "$out/bin/atari++"
+  '';
 
   meta = {
     homepage = http://www.xl-project.com/;
diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index cc5d57ab6f9c9e5a6d1464641f7a16d1a3e5150e..9467345db1c27fc6b94fd1c6d75f40992d934805 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, unzip, zlib, SDL, readline, mesa, libX11 }:
+, unzip, zlib, SDL, readline, libGLU_combined, libX11 }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec{
     sha256 = "030yz5l1wyq9l0dmiimiiwpzrjr43whycd409xhhpnrdx76046wh";
   };
 
-  buildInputs = [ unzip zlib SDL readline mesa libX11 ];
+  buildInputs = [ unzip zlib SDL readline libGLU_combined libX11 ];
 
   configureFlags = "--target=default --with-video=sdl --with-sound=sdl --with-readline --with-opengl --with-x --enable-riodevice";
 
diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix
index 4b8378368a3f02e1dc099cfdd009f7ae4a664497..601503dc07ec99faae67f0f20b353a8c8db4d579 100644
--- a/pkgs/misc/emulators/attract-mode/default.nix
+++ b/pkgs/misc/emulators/attract-mode/default.nix
@@ -1,5 +1,5 @@
 { expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg
-, mesa, openal, pkgconfig, sfml, stdenv, zlib
+, libGLU_combined, openal, pkgconfig, sfml, stdenv, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    expat ffmpeg fontconfig freetype libarchive libjpeg mesa openal sfml zlib
+    expat ffmpeg fontconfig freetype libarchive libjpeg libGLU_combined openal sfml zlib
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c0c3b40f6b65a3898226a4c3b3a0526c522b94e4
--- /dev/null
+++ b/pkgs/misc/emulators/caprice32/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib }:
+
+stdenv.mkDerivation rec {
+
+  repo = "caprice32";
+  version = "unstable-2018-02-10";
+  rev = "53de69543300f81af85df32cbd21bb5c68cab61e";
+  name = "${repo}-${version}";
+
+  src = fetchFromGitHub {
+    inherit rev repo;
+    owner = "ColinPitrat";
+    sha256 = "12yv56blm49qmshpk4mgc802bs51wv2ra87hmcbf2wxma39c45fy";
+  };
+
+  postPatch = "substituteInPlace cap32.cfg --replace /usr/local $out";
+
+  meta = with stdenv.lib; {
+    description = "A complete emulation of CPC464, CPC664 and CPC6128";
+    homepage = https://github.com/ColinPitrat/caprice32 ;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libpng SDL freetype zlib ];
+  makeFlags = [ "GIT_HASH=${src.rev}" "DESTDIR=$(out)" "prefix=/"];
+}
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index d03b18f12d636aee240ec60dfa58cce9869ac156..081846f78e352544c3ccb4344a00454abc6d8905 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, kernel, libelf }:
 
 stdenv.mkDerivation rec {
   name = "vhba-${version}";
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];
+  nativeBuildInputs = kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];
 
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "Provides a Virtual (SCSI) HBA";
     homepage = http://cdemu.sourceforge.net/about/vhba/;
     platforms = platforms.linux;
-    licenses = licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [ bendlas ];
   };
 }
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index 97f61e452ff243cba2b12c924f067af59fe02cc4..453114e3b7a0f9630a50618bd43ea08cd4ffa6d7 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchgit, cmake, SDL2, qtbase, boost, curl, gtest }:
 
 stdenv.mkDerivation rec { 
-  name = "citra-2017-07-26";
+  name = "citra-2018-02-23";
 
   # Submodules
   src = fetchgit {
     url = "https://github.com/citra-emu/citra";
-    rev = "a724fb365787718f9e44adedc14e59d0854905a6";
-    sha256 = "0lkrwhxvq85c0smix27xvj8m463bxa67qhy8m8r43g39n0h8d5sf";
+    rev = "e51a642a13b9c2eda43d875fe318f627e11d480f";
+    sha256 = "0cw9cqbljc87rjyr2alfryp04mxpvd5mdlyrmnp9yis3xr8g9sa1";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://citra-emu.org/;
     description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix
index 3e7b033b57889e3a12e372578ee660f01bffc7d5..d177012546e9c3445e139c99fc7bc3fdcbcb1431 100644
--- a/pkgs/misc/emulators/desmume/default.nix
+++ b/pkgs/misc/emulators/desmume/default.nix
@@ -3,9 +3,9 @@
 , libXmu
 , lua
 , agg, alsaLib, soundtouch, openal
-, desktop_file_utils
+, desktop-file-utils
 , gtk2, gtkglext, libglade, pangox_compat
-, mesa_glu, libpcap, SDL, zziplib }:
+, libGLU, libpcap, SDL, zziplib }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -26,10 +26,12 @@ stdenv.mkDerivation rec {
      })
   ];
 
+  CXXFLAGS = "-fpermissive";
+
   buildInputs =
   [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch
-    openal desktop_file_utils gtk2 gtkglext libglade pangox_compat
-    mesa_glu libpcap SDL zziplib ];
+    openal desktop-file-utils gtk2 gtkglext libglade pangox_compat
+    libGLU libpcap SDL zziplib ];
 
   configureFlags = [
     "--disable-glade"  # Failing on compile step
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index 8025cf766f07d913ed5b2d04d6ea63f4779c4bd9..01e1847973c70acc7498651ac4494bd67d8a002b 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, mesa
+{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, libGLU_combined
 , gettext, libpthreadstubs, libXrandr, libXext, readline, openal
 , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
 , wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake bluez ffmpeg libao mesa gtk2 glib
+  buildInputs = [ cmake bluez ffmpeg libao libGLU_combined gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
                   libevdev libXdmcp portaudio libusb libpulseaudio
                   libevdev libXdmcp portaudio libusb libpulseaudio
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 41dbfd1999c40d4fe380c3695c863a301d3f0c77..e2bac5d3884c3745bfc78efb5a56b0cf4634130c 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,38 +1,72 @@
-{ stdenv, gcc, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib
 , pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline
-, openal, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
-, libpulseaudio ? null }:
+, openal, libXdmcp, portaudio, libusb, libevdev
+, libpulseaudio ? null
+, curl
+
+, qt5
+# - Inputs used for Darwin
+, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL
+, wxGTK
+, libpng
+, hidapi
+
+# options
+, dolphin-wxgui ? true
+, dolphin-qtgui ? false
+}:
+# XOR: ensure only wx XOR qt are enabled
+assert dolphin-wxgui || dolphin-qtgui;
+assert !(dolphin-wxgui && dolphin-qtgui);
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20170902";
+  name = "dolphin-emu-20171218";
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "b073db51e5f3df8c9890e09a3f4f8a2276c31e3f";
-    sha256 = "0pr5inkd7swc6s7im7axhvmkdbqidhrha2wpflnr25aiwq0dzm10";
+    rev = "438e8b64a4b080370c7a65ed23af52838a4e7aaa";
+    sha256 = "0rrd0g1vg9jk1p4wdr6w2z34cabb7pgmpwfcl2a372ark3vi4ysc";
   };
 
-  cmakeFlags = ''
-    -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-    -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-    -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-    -DENABLE_LTO=True
-  '';
+  cmakeFlags = [
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
+    "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
+    "-DENABLE_LTO=True"
+  ] ++ stdenv.lib.optionals (!dolphin-qtgui)  [ "-DENABLE_QT2=False" ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ];
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gcc cmake bluez ffmpeg libao mesa gtk2 glib pcre
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre
                   gettext libpthreadstubs libXrandr libXext libSM readline openal
-                  libevdev libXdmcp portaudio libusb libpulseaudio ];
+                  libXdmcp portaudio libusb libpulseaudio libpng hidapi
+                ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ]
+                  ++ stdenv.lib.optionals stdenv.isLinux  [ bluez libevdev  ]
+                  ++ stdenv.lib.optionals dolphin-qtgui [ qt5.qtbase ];
+
+  # - Change install path to Applications relative to $out
+  # - Allow Dolphin to use nix-provided libraries instead of building them
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i -e 's,/Applications,Applications,g' Source/Core/DolphinWX/CMakeLists.txt
+    sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' CMakeLists.txt
+    sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt
+  '';
+
+  preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    mkdir -p "$out/Applications"
+  '';
 
   meta = {
     homepage = http://dolphin-emu.org/;
     description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ MP2E ];
+    branch = "master";
     # x86_32 is an unsupported platform.
     # Enable generic build if you really want a JIT-less binary.
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix
index ed15ab6c56e2b639b391bbc1e913b96b263c85ba..57e76a9643769b3f9b89fe65bcd412ab8e4e9b84 100644
--- a/pkgs/misc/emulators/dosbox/default.nix
+++ b/pkgs/misc/emulators/dosbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, SDL, makeDesktopItem, mesa }:
+{ stdenv, lib, fetchurl, SDL, makeDesktopItem, libGLU_combined }:
 
 stdenv.mkDerivation rec {
   name = "dosbox-0.74";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ SDL mesa ];
+  buildInputs = [ SDL libGLU_combined ];
 
   configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
     description = "A DOS emulator";
     platforms = platforms.unix;
     maintainers = with maintainers; [ matthewbauer ];
-    licenses = licenses.gpl2;
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix
index a17dd6a775eafbb8b13f27915981f5a340cd8410..86dfd25d175f83710a7fffca29f7e0339d52813a 100644
--- a/pkgs/misc/emulators/dosbox/unstable.nix
+++ b/pkgs/misc/emulators/dosbox/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, mesa, autoreconfHook }:
+{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }:
 
 let revision = "4025";
     revisionDate = "2017-07-02";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ SDL SDL_net SDL_sound libpng mesa ];
+  buildInputs = [ SDL SDL_net SDL_sound libpng libGLU_combined ];
 
   desktopItem = makeDesktopItem {
     name = "dosbox";
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index b700b22807c4dd86b6b8948ddf276e5d47055ac5..16cb7af3d60081b9f03a0e8c893f2fb66077492c 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
-, freeimage, freetype, mesa, SDL2, alsaLib, libarchive }:
+, freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }:
 
 stdenv.mkDerivation rec {
   name = "emulationstation-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ];
+  buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU_combined SDL2 ];
 
   buildPhase = "cmake . && make";
   installPhase = ''
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index e367d6a149841e46dc8f7ebb85e8ef53e93cace5..2f11384d845a18c895a7873b2d90bac561227369 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "epsxe-${version}";
   version = "2.0.5";
 
-  src = with stdenv.lib; let
+  src = let
     version2 = concatStrings (splitString "." version);
     platform = "linux" + (optionalString stdenv.is64bit "_x64");
   in fetchurl {
diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix
index 4d698563469e1daa2a5fb6ec1f3744b166ca9a35..eb7964cc017d522c7aa05751ed42cc7d374781bb 100644
--- a/pkgs/misc/emulators/fakenes/default.nix
+++ b/pkgs/misc/emulators/fakenes/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, allegro, openal, mesa, zlib, hawknl, freeglut, libX11,
+{stdenv, fetchurl, allegro, openal, libGLU_combined, zlib, hawknl, freeglut, libX11,
   libXxf86vm, libXcursor, libXpm }:
 
 stdenv.mkDerivation {
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4";
   };
 
-  buildInputs = [ allegro openal mesa zlib hawknl freeglut libX11
+  buildInputs = [ allegro openal libGLU_combined zlib hawknl freeglut libX11
     libXxf86vm libXcursor libXpm ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix
index ce8f8e030e308c0370f4890056798df4c044a13f..70cf32d54cc23d8cbd2c6cb68b76360d63411300 100644
--- a/pkgs/misc/emulators/fceux/default.nix
+++ b/pkgs/misc/emulators/fceux/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, scons, zlib, SDL, lua5_1, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "fceux-2.2.2";
+  name = "fceux-2.2.3";
 
   src = fetchurl {
-    url = mirror://sourceforge/fceultra/Source%20Code/2.2.2%20src/fceux-2.2.2.src.tar.gz;
-    sha256 = "1qg5bygla8ka30b7wqvq6dv84xc7pq0jspffh2jz75d1njyi2kc0";
+    url = mirror://sourceforge/fceultra/Source%20Code/2.2.3%20src/fceux-2.2.3.src.tar.gz;
+    sha256 = "0gl2i3qdmcm7v9m5kpfz98w05d8m33990jiwka043ya7lflxvrjb";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 8b2409b74c33d8a0ac2607ac3c11a682a82bb80a..6d462c0e3797313cfb02729c7e85221491b56224 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, pkgconfig
-, gettext, gtk2, SDL2, zlib, glib, openal, mesa, lua, freetype, libmpeg2, zip }:
+, gettext, gtk2, SDL2, zlib, glib, openal, libGLU_combined, lua, freetype, libmpeg2, zip }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "fs-uae-${version}";
-  version = "2.8.3";
+  version = "2.8.4";
 
   src = fetchurl {
-    url = "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
-    sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2";
+    url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
+    sha256 = "19ccb3gbpjwwazqc9pyin3jicjl27m2gyvy5bb5zysq0mxpzassj";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ];
+  buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU_combined lua freetype libmpeg2 zip ];
 
   meta = {
     description = "An accurate, customizable Amiga Emulator";
diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix
index bfe43403bc6c415548baea81390d362c3d4f3dcb..f5ba2ef218d103d40cafb87bf5b0562d325c6fe6 100644
--- a/pkgs/misc/emulators/gens-gs/default.nix
+++ b/pkgs/misc/emulators/gens-gs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, mesa }:
+{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU_combined }:
 
 stdenv.mkDerivation { 
   name = "gens-gs-7";
@@ -9,14 +9,14 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 SDL nasm zlib libpng mesa ];
+  buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ];
 
   # Work around build failures on recent GTK+.
   # See http://ubuntuforums.org/showthread.php?p=10535837
   NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE";
 
   meta = {
-    homepage = http://segaretro.org/Gens/GS;
+    homepage = https://segaretro.org/Gens/GS;
     description = "A Genesis/Mega Drive emulator";
     platforms = [ "i686-linux" ];
     maintainers = [ stdenv.lib.maintainers.eelco ];
diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix
index ed241de5b2730dbd638d68d823360ef9e1a4fe12..440eb681eb3855f2558274e1595836742c063274 100644
--- a/pkgs/misc/emulators/hatari/default.nix
+++ b/pkgs/misc/emulators/hatari/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, SDL, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "hatari-1.8.0";
+  name = "hatari-2.1.0";
 
   src = fetchurl {
-    url = "http://download.tuxfamily.org/hatari/1.8.0/${name}.tar.bz2";
-    sha256 = "1szznnndmbyc71751hir3dhybmbrx3rnxs6klgbv9qvqlmmlikvy";
+    url = "http://download.tuxfamily.org/hatari/2.1.0/${name}.tar.bz2";
+    sha256 = "0909l9fq20ninf8xgv5qf0a5y64cpk5ja1rsk2iaid1dx5h98agb";
   };
 
   # For pthread_cancel
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 75331e0e09a2f770523fca0c2a08c713143ff42c..7b42e8d60339102ae092808e2f656ae657f264fe 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -2,7 +2,7 @@
 , p7zip, pkgconfig
 , libX11, libXv
 , udev
-, mesa, SDL
+, libGLU_combined, SDL
 , libao, openal, libpulseaudio
 , gtk2, gtksourceview }:
 
@@ -10,12 +10,12 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "higan-${version}";
-  version = "105";
+  version = "106";
   sourceName = "higan_v${version}-source";
 
   src = fetchurl {
     urls = [ "http://download.byuu.org/${sourceName}.7z" ];
-    sha256 = "1lpj345vlnwcywhzq1fzxwl08zc2x4d103rgyyp7yw8m0f8f9sdl";
+    sha256 = "063dzp9wrdnbvagraxi31xg0154y2gf67rrd0mnc8h104cgzjr35";
     curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   postPatch = "sed '1i#include ' -i higan/fc/ppu/ppu.cpp";
 
   buildInputs =
-  [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk2 gtksourceview ];
+  [ p7zip pkgconfig libX11 libXv udev libGLU_combined SDL libao openal libpulseaudio gtk2 gtksourceview ];
 
   unpackPhase = ''
     7z x $src
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
           Game Boy, Game Boy Color, Game Boy Advance;
         - Sega's Master System, Game Gear, Mega Drive;
         - NEC's PC Engine, SuperGrafx;
-        - Bandai' WonderSwan, WonderSwan Color.
+        - Bandai's WonderSwan, WonderSwan Color.
     '';
     homepage = https://byuu.org/higan/;
     license = licenses.gpl3Plus;
diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bdc372c7ca23a1232e4df5fc8e6a6b960f95da01
--- /dev/null
+++ b/pkgs/misc/emulators/kega-fusion/default.nix
@@ -0,0 +1,78 @@
+{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123 }:
+
+let
+  libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk_pixbuf pango libXinerama ];
+
+in stdenv.mkDerivation rec {
+  name = "kega-fusion-${version}";
+  version = "3.63x";
+
+  src = fetchurl {
+    url = "http://www.carpeludum.com/download/Fusion363x.tar.gz";
+    sha256 = "14s6czy20h5khyy7q95hd7k77v17ssafv9l6lafkiysvj2nmw94g";
+  };
+
+  plugins = fetchurl {
+    url = "http://www.carpeludum.com/download/PluginsLinux.tar.gz";
+    sha256 = "0d623cvh6n5ijj3wb64g93mxx2xbichsn7hj7brbb0ndw5cs70qj";
+  };
+
+  runner = writeText "kega-fusion" ''
+    #!${stdenv.shell} -ex
+
+    kega_libdir="@out@/lib/kega-fusion"
+    kega_localdir="$HOME/.Kega Fusion"
+
+    # create local plugins directory if not present
+    mkdir -p "$kega_localdir/Plugins"
+
+    # create links for every included plugin
+    if [ $(ls -1A $kega_libdir/plugins | wc -l) -gt 0 ]; then
+      for i in $kega_libdir/plugins/*; do
+        if [ ! -e "$kega_localdir/Plugins/$(basename "$i")" ]; then
+          ln -sf "$i" "$kega_localdir/Plugins/"
+        fi
+      done
+    fi
+
+    # copy configuration file if not present
+    if ! [ -f "$kega_localdir/Fusion.ini" ]; then
+      cat > "$kega_localdir/Fusion.ini" < {} }:
+## we default to importing  here, so that you can use
+## a simple shell command to insert new sha256's into this file
+## e.g. with emacs C-u M-x shell-command
+##
+##     nix-prefetch-url sources.nix -A {stable{,.mono,.gecko64,.gecko32}, unstable, staging, winetricks}
+
+# here we wrap fetchurl and fetchFromGitHub, in order to be able to pass additional args around it
 let fetchurl = args@{url, sha256, ...}:
   pkgs.fetchurl { inherit url sha256; } // args;
     fetchFromGitHub = args@{owner, repo, rev, sha256, ...}:
@@ -6,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "2.0.2";
-    url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.xz";
-    sha256 = "16iwf48cfi39aqyy8131jz4x7lr551c9yc0mnks7g24j77sq867p";
+    version = "3.0";
+    url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz";
+    sha256 = "1v7vq9iinkscbq6wg85fb0d2137660fg2nk5iabxkl2wr850asil";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
@@ -32,26 +39,27 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.19";
-    url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "15b0lvs456zjh5wwkhs9wh1ycih12ragk6170hnrrbkmk3k32wa8";
+    version = "3.5";
+    url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
+    sha256 = "0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
+    # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "16jps0x4srxnpdy3vxygvspz7qpd09i83c6j6kg8vv4qkna2lswi";
-    owner = "wine-compholio";
+    sha256 = "0kcwg7w79zbsg29b9ma9mapzhj9dg7z0vccy4a35fx04044xj0zn";
+    owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20171018";
-    sha256 = "0qlnxyaydpqx87kfyrkkmwg0jv9dfh3mkq27g224a8v1kf9z3r3h";
+    # https://github.com/Winetricks/winetricks/releases
+    version = "20180217";
+    sha256 = "0k3vlsqjbzys5dfbxwgw76al8gh44jsjqkc06va103frkrgjxvc5";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;
   };
-
 }
diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix
index e13abb6fe2b6facd7f326380f0a0c019835ca735..7be91176318194fcd1bb2533356c8dcc3b59a1c8 100644
--- a/pkgs/misc/emulators/wxmupen64plus/default.nix
+++ b/pkgs/misc/emulators/wxmupen64plus/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, mesa}:
+{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined}:
 
 stdenv.mkDerivation {
   name = "wxmupen64plus-0.3";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c";
   };
 
-  buildInputs = [ python wxGTK29 SDL libX11 mesa ];
+  buildInputs = [ python wxGTK29 SDL libX11 libGLU_combined ];
 
   configurePhase = ''
     tar xf ${mupen64plus.src}
diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/misc/emulators/xcpc/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5eb6e3b160efb267bd1906326efc7a3801085766
--- /dev/null
+++ b/pkgs/misc/emulators/xcpc/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, libdsk, pkgconfig, glib, libXaw, libX11, libXext, lesstif }:
+
+stdenv.mkDerivation rec {
+  version = "20070122";
+  name = "xcpc-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/xcpc/${name}.tar.gz";
+    sha256 = "0hxsbhmyzyyrlidgg0q8izw55q0z40xrynw5a1c3frdnihj9jf7n";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib libdsk libXaw libX11 libXext lesstif ];
+
+  meta = with stdenv.lib; {
+    description = "A portable Amstrad CPC 464/664/6128 emulator written in C";
+    homepage = https://www.xcpc-emulator.net;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix
index fb99421a61aeb38acff2d4820dbe17d9f318e126..e7237fd4454c83b816f810b3e908b205b958f859 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/pkgs/misc/emulators/yabause/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qtbase, mesa
+{ stdenv, fetchurl, cmake, pkgconfig, qtbase, libGLU_combined
 , freeglut ? null, openal ? null, SDL2 ? null }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ qtbase mesa freeglut openal SDL2 ];
+  buildInputs = [ qtbase libGLU_combined freeglut openal SDL2 ];
 
   patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ];
 
diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index ad80cb13f78c89c3c602a73d6b0b7fbf3df0d700..1ea8d7e68d3c074471cf8d997b12643776934b3c 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, mesa
+{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU_combined
 , makeDesktopItem }:
 
 let
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
     sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v";
   };
 
-  buildInputs = [ nasm SDL zlib libpng ncurses mesa ];
+  buildInputs = [ nasm SDL zlib libpng ncurses libGLU_combined ];
 
   prePatch = ''
     for i in $(cat debian/patches/series); do
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 84272992f2bbdfd7959cfb37b23845fe846980d8..af4c54d9d0d82714759e6dd99a0aa7a05d044c27 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, pythonPackages, lilypond}:
+{ lib, fetchFromGitHub, python3Packages, lilypond }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   name = "frescobaldi-${version}";
-  version = "2.0.16";
+  version = "3.0.0";
 
-  src = fetchurl {
-    url = "https://github.com/wbsoft/frescobaldi/releases/download/"
-          + "v2.0.16/${name}.tar.gz";
-    sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q";
+  src = fetchFromGitHub {
+    owner = "wbsoft";
+    repo = "frescobaldi";
+    rev = "v${version}";
+    sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ lilypond
-    pyqt4 poppler-qt4 pygame ];
+  propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly poppler-qt5 ];
 
-  patches = [ ./setup.cfg.patch ./python-path.patch ];
+  # no tests in shipped with upstream
+  doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://frescobaldi.org/;
     description = ''Frescobaldi is a LilyPond sheet music text editor'';
     longDescription = ''
@@ -31,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
       fonts and keyboard shortcuts
     '';
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.sepi ];
+    maintainers = with maintainers; [ sepi ma27 ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/misc/frescobaldi/python-path.patch b/pkgs/misc/frescobaldi/python-path.patch
deleted file mode 100644
index 6c54d9f208ec343e47960b533f9fa563e9ad5d99..0000000000000000000000000000000000000000
--- a/pkgs/misc/frescobaldi/python-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u frescobaldi-2.0.16.old/frescobaldi frescobaldi-2.0.16/frescobaldi
---- frescobaldi-2.0.16/frescobaldi	2014-10-24 11:29:28.705687224 +0200
-+++ frescobaldi-2.0.16.new/frescobaldi	2014-10-24 11:31:08.086444793 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- import sys
- import frescobaldi_app.main
- import app
-Common subdirectories: frescobaldi-2.0.16/frescobaldi_app and frescobaldi-2.0.16.new/frescobaldi_app
-Common subdirectories: frescobaldi-2.0.16/macosx and frescobaldi-2.0.16.new/macosx
diff --git a/pkgs/misc/frescobaldi/setup.cfg.patch b/pkgs/misc/frescobaldi/setup.cfg.patch
deleted file mode 100644
index 502cdd61966d48b125e840c478a1de064ca0854f..0000000000000000000000000000000000000000
--- a/pkgs/misc/frescobaldi/setup.cfg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Common subdirectories: frescobaldi-2.0.16.old/build and frescobaldi-2.0.16/build
-Common subdirectories: frescobaldi-2.0.16.old/frescobaldi_app and frescobaldi-2.0.16/frescobaldi_app
-Common subdirectories: frescobaldi-2.0.16.old/macosx and frescobaldi-2.0.16/macosx
-diff -u frescobaldi-2.0.16.old/setup.cfg frescobaldi-2.0.16/setup.cfg
---- frescobaldi-2.0.16.old/setup.cfg	2012-02-05 07:08:24.000000000 +0100
-+++ frescobaldi-2.0.16/setup.cfg	2014-10-24 15:08:48.141335620 +0200
-@@ -1,6 +1,2 @@
--[bdist_wininst]
--bitmap=frescobaldi-wininst.bmp
--install-script=frescobaldi-wininst.py
--
- [sdist]
- force-manifest=1
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 524121a898e35472a913c3ad34b6b0f61d9586f9..182e176cacba33f6bc7e326c294a0e69b5578186 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -8,8 +8,9 @@
 assert x11Support -> xlibsWrapper != null;
 assert cupsSupport -> cups != null;
 let
-  version = "9.20";
-  sha256 = "1az0dnvgingqv78yvfhzmx1zavn5sv1xrrscz984hy3gvz2ks3rw";
+  version = "9.${ver_min}";
+  ver_min = "22";
+  sha256 = "1fyi4yvdj39bjgs10klr31cda1fbx1ar7a7b7yz7v68gykk65y61";
 
   fonts = stdenv.mkDerivation {
     name = "ghostscript-fonts";
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
   name = "ghostscript-${version}";
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/${name}.tar.xz";
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${name}.tar.xz";
     inherit sha256;
   };
 
@@ -117,7 +118,7 @@ stdenv.mkDerivation rec {
       of output drivers for various file formats and printers.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = stdenv.lib.licenses.agpl3;
 
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.viric ];
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index d7a6cebcc563589bec86aa587f349db1c4760994..c0b86336163ddfc85a3d8b5cf3b07f83eb30778a 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -6,7 +6,7 @@
 # renderers
 , enableAGG    ? true,  agg   ? null
 , enableCairo  ? false, cairo ? null
-, enableOpenGL ? false, mesa  ? null
+, enableOpenGL ? false, libGLU_combined  ? null
 
 # GUI toolkits
 , enableGTK ? true,  gtk2 ? null, gnome2 ? null, gnome3 ? null
@@ -49,7 +49,7 @@ in
 # renderers
 assert enableAGG    -> available agg;
 assert enableCairo  -> available cairo;
-assert enableOpenGL -> available mesa;
+assert enableOpenGL -> available libGLU_combined;
 
 # GUI toolkits
 assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome3.gconf ];
@@ -62,7 +62,7 @@ assert enableGstreamer -> all available [ gst-plugins-base gst-plugins-ugly gst-
 
 # misc
 assert enableJemalloc -> available jemalloc;
-assert enableHwAccel  -> available mesa;
+assert enableHwAccel  -> available libGLU_combined;
 assert enablePlugins  -> all available [ xulrunner npapi_sdk ];
 
 assert length toolkits  == 0 -> throw "at least one GUI toolkit must be enabled";
@@ -90,11 +90,11 @@ stdenv.mkDerivation rec {
     libpng libjpeg giflib pango atk
   ] ++ optional  enableAGG       agg
     ++ optional  enableCairo     cairo
-    ++ optional  enableOpenGL    mesa
+    ++ optional  enableOpenGL    libGLU_combined
     ++ optional  enableQt        qt4
     ++ optional  enableFFmpeg    ffmpeg_2
     ++ optional  enableJemalloc  jemalloc
-    ++ optional  enableHwAccel   mesa
+    ++ optional  enableHwAccel   libGLU_combined
     ++ optionals enablePlugins   [ xulrunner npapi_sdk ]
     ++ optionals enableGTK       [ gtk2 gnome2.gtkglext gnome3.gconf ]
     ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
diff --git a/pkgs/misc/jackaudio/clang.patch b/pkgs/misc/jackaudio/clang.patch
deleted file mode 100644
index 131f8c4c04dd4906bfa1372ead45421e6ad343da..0000000000000000000000000000000000000000
--- a/pkgs/misc/jackaudio/clang.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/test.cpp b/tests/test.cpp
-index 8a8a811..31e8459 100644
---- a/tests/test.cpp
-+++ b/tests/test.cpp
-@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
- 	jack_nframes_t delta_time = cur_time - last_time;
- 
- 	Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
--	if (delta_time > 0  && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
-+	if (delta_time > 0  && (jack_nframes_t)fabs(delta_time - cur_buffer_size) > tolerance) {
- 		printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
- 	}
- 
-@@ -1064,7 +1064,7 @@ int main (int argc, char *argv[])
-     }
-     jack_sleep(1 * 1000);
-     cur_buffer_size = jack_get_buffer_size(client1);
--    if (abs((old_buffer_size * factor) - cur_buffer_size) > 5) {  // Tolerance needed for dummy driver...
-+    if (fabs((old_buffer_size * factor) - cur_buffer_size) > 5) {  // Tolerance needed for dummy driver...
-         printf("!!! ERROR !!! Buffer size has not been changed !\n");
-         printf("!!! Maybe jack was compiled without the '--enable-resize' flag...\n");
-     } else {
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 20da91efede8d13899d77089a14f7587142d7585..52b0abc48a7a5584defdd492e489c6f8ca194b1c 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -15,7 +15,7 @@
 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;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   libOnly = prefix == "lib";
 
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}jack2-${version}";
-  version = "1.9.11-RC1";
+  version = "1.9.12";
 
   src = fetchFromGitHub {
     owner = "jackaudio";
     repo = "jack2";
     rev = "v${version}";
-    sha256 = "0i708ar3ll5p8yj0h7ffg84nrn49ap47l2yy75rxyw30cyywhxp4";
+    sha256 = "0ynpyn0l77m94b50g7ysl795nvam3ra65wx5zb46nxspgbf6wnkh";
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
 
   # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ];
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-cf.patch ];
 
   prePatch = ''
     substituteInPlace svnversion_regenerate.sh \
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 28ce85bd8a3f0740e89bbe97d7d275fd5bbd903e..848215ae17af1642fc6e59a8532397ce6db5d5b7 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   optAlsaLib = shouldUsePkg alsaLib;
   optDb = shouldUsePkg db;
@@ -15,11 +15,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "jack1-${version}";
-  version = "0.124.1";
+  version = "0.125.0";
 
   src = fetchurl {
     url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz";
-    sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb";
+    sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm";
   };
   
   configureFlags = ''
diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..186fcb263cae6888a74a41ff0771989d82391ba6
--- /dev/null
+++ b/pkgs/misc/libcardiacarrest/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, pkgconfig, glib, libpulseaudio }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "libcardiacarrest-${version}";
+  version = "11.0-6"; # -
+
+  src = fetchFromGitHub {
+    owner = "oxij";
+    repo = "libcardiacarrest";
+    rev = "1220b37b3de75238fedee1a66ca703fe1c8c71c3";
+    sha256 = "0fkfiixjybac3rwcd26621hh5dw4f5gnmm230cr4g8fl0i2ikmrz";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ glib ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    moveToOutput $out/include $dev
+    moveToOutput $out/lib/pkgconfig $dev
+    moveToOutput $out/lib/cmake $dev
+  '';
+
+  meta = src.meta // {
+    description = "A trivial implementation of libpulse PulseAudio library API";
+    longDescription = ''
+      libcardiacarrest is a trivial implementation of libpulse
+      PulseAudio library API that unconditionally (but gracefully)
+      fails to connect to the PulseAudio daemon and does nothing else.
+
+      apulse and pressureaudio (which uses apulse internally) are an
+      inspiration for this but unlike those two projects
+      libcardiacarrest is not an emulation layer, all it does is it
+      gracefully fails to provide the requested PulseAudio service
+      hoping the application would try something else (e.g. ALSA or
+      JACK).
+    '';
+    license = libpulseaudio.meta.license; # "same as PA headers"
+    maintainers = [ maintainers.oxij ]; # also the author
+  };
+
+}
diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix
new file mode 100644
index 0000000000000000000000000000000000000000..94d5449100dbb837cb603f35e2d9c4a0aeda251f
--- /dev/null
+++ b/pkgs/misc/logging/beats/5.x.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 = "00g90i58c6gnyzszsx7y75vn1350hrkzrsb50xx700jqg9ii8yin";
+      };
+
+      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/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ce911ae40d5e9a93eacedf896054b24af550087e
--- /dev/null
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap }:
+
+let beat = package : extraArgs : buildGoPackage (rec {
+      name = "${package}-${version}";
+      version = elk6Version;
+
+      src = fetchFromGitHub {
+        owner = "elastic";
+        repo = "beats";
+        rev = "v${version}";
+        sha256 = "194z3j9zwlbc6j97iy1m1cl0xqks3ws2bjp2xrgy8cwpi7fclaw2";
+      };
+
+      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/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix
deleted file mode 100644
index e3333fa5caacd8a45af2ebe18a5a5e0ad3047ec7..0000000000000000000000000000000000000000
--- a/pkgs/misc/logging/beats/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ 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 = "1lbdi4c0y4bfkmim9q98ravknv4yw0dl3z57c3w5aqhi2sx0w23h";
-      };
-
-      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/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 2d210ca009866a54ac4a39f05b435d81d020751c..d0b7458bf572f6e2fef0cd54550a4a71f781aa8b 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -79,7 +79,7 @@ mkDerivation {
     mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin"
     s="$out/nix-support/setup-new-modified"
     # shut some warning up.., do not use set -e
-    sed -e 's@set -e@@' \
+    sed -e 's@set -eu@@' \
         -e 's@assertEnvExists\s\+NIX_STORE@:@' \
         -e 's@trap.*@@' \
         -e '1i initialPath="${toString initialPath}"' \
diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e724869b235c27be20c847500385b209394570ac
--- /dev/null
+++ b/pkgs/misc/riscv-pk/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let
+  rev = "e5846a2bc707eaa58dc8ab6a8d20a090c6ee8570";
+  sha256 = "1clynpp70fnbgsjgxx7xi0vrdrj1v0h8zpv0x26i324kp2gwylf4";
+  revCount = "438";
+  shortRev = "e5846a2";
+in stdenv.mkDerivation {
+  name = "riscv-pk-0.1pre${revCount}_${shortRev}";
+
+  src = fetchFromGitHub {
+    owner = "riscv";
+    repo = "riscv-pk";
+    inherit rev sha256;
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  preConfigure = ''
+    mkdir build
+    cd build
+  '';
+
+  configureScript = "../configure";
+
+  configureFlags = stdenv.lib.optional (payload != null)
+    "--with-payload=${payload}";
+
+  hardeningDisable = [ "all" ];
+
+  postInstall = ''
+    mv $out/* $out/.cleanup
+    mv $out/.cleanup/* $out
+    rmdir $out/.cleanup
+  '';
+
+  meta = {
+    description = "RISC-V Proxy Kernel and Bootloader.";
+    homepage = https://github.com/riscv/riscv-pk;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.riscv;
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+}
diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
index 1dc03e1e9f0327d4857fdee4ffa739e33e47f667..5b7c12dee1b03cdd9514a936e2c2fc4705a451cd 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       xscreensaver and never will. It's just for locking the current
       X session.
     '';
-    platforms = with platforms; allBut cygwin;
+    platforms = platforms.unix; # Cygwin had problems at one point
     maintainers = with maintainers; [ ftrvxmtrx chris-martin ];
   };
 }
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 72fb7b41c6978875b0547faeb1d584553cfadbed..17cf99d8b00ce57c2df48d3d03f86ba384655ba1 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl
-, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, mesa
+, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU_combined
 , glee }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "electricsheep";
-  version = "2.7b33-2017-02-04";
+  version = "2.7b33-2017-10-20";
 
   src = fetchFromGitHub {
     owner = "scottdraves";
     repo = pname;
-    rev = "12420cd40dfad8c32fb70b88f3d680d84f795c63";
-    sha256 = "1zqry25h6p0y0rg2h8xxda007hx1xdvsgzmjg13xkc8l4zsp5wah";
+    rev = "c02c19b9364733fc73826e105fc983a89a8b4f40";
+    sha256 = "1z49l53j1lhk7ahdy96lm9r0pklwpf2i5s6y2l2rn6l4z8dxkjmk";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   buildInputs = [
     wxGTK30 libav lua5_1 curl libpng xorg.libXrender
-    flam3 libgtop boost tinyxml freeglut mesa glee
+    flam3 libgtop boost tinyxml freeglut libGLU_combined glee
   ];
 
   preAutoreconf = ''
diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
index 67cb0a4ca6d25d26576f0c863e274e1b82475e8e..5fff7b8f0ea3b4f2d1550643142b13090b011c68 100644
--- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix
+++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "i3lock-pixeled-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://github.com/Ma27/i3lock-pixeled/archive/${version}.tar.gz";
-    sha256 = "046qbx4qvcc66h53h4mm9pyjj9gjc6dzy38a0f0jc5a84xbivh7k";
+    sha256 = "0vlynm833fk1mmdnkcgh4hwqmfypn22zskhysm110k39zvikif0h";
   };
 
   propagatedBuildInputs = with pkgs; [
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     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;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ ma27 ];
   };
 }
diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
index a0dac519a0b8b2426901561b8631d19f2cf98e38..f38851d6fa0cc364c8f91b89fcb2e80eaec13439 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -8,7 +8,7 @@
 , libXScrnSaver
 , libXxf86misc
 , gtk3
-, dbus_glib
+, dbus-glib
 , systemd
 , wrapGAppsHook
 }:
@@ -16,21 +16,18 @@
 stdenv.mkDerivation rec {
   name = "${basename}-${version}";
   basename = "light-locker";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "the-cavalry";
     repo = basename;
     rev = "v${version}";
-    sha256 = "0ygkp5vgkx2nfhfql6j2jsfay394gda23ir3sx4f72j4agsirjvj";
+    sha256 = "1zsafc10bmliknf12h3mgy7f73lvgph0q0wkaqp42iagmw11yaj8";
   };
 
-  # Patch so that systemd is "found" when configuring.
-  patches = [ ./systemd.patch ];
-
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which xfce.xfce4_dev_tools glib systemd
-                  libX11 libXScrnSaver libXxf86misc gtk3 dbus_glib wrapGAppsHook ];
+  buildInputs = [ which xfce.xfce4-dev-tools glib systemd
+                  libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ];
 
   preConfigure = ''
     ./autogen.sh
diff --git a/pkgs/misc/screensavers/light-locker/systemd.patch b/pkgs/misc/screensavers/light-locker/systemd.patch
deleted file mode 100644
index 9cba8b9c0d2fb18daeb6ddf8cb3e24b5f16bb85c..0000000000000000000000000000000000000000
--- a/pkgs/misc/screensavers/light-locker/systemd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac.in b/configure.ac.in
-index f7d5f5d..341bc83 100644
---- a/configure.ac.in
-+++ b/configure.ac.in
-@@ -424,7 +424,7 @@ AC_ARG_WITH(systemd,
-             [with_systemd=$withval], [with_systemd=auto])
- 
- PKG_CHECK_MODULES(SYSTEMD,
--                  [libsystemd-login],
-+                  [libsystemd],
-                   [have_systemd=yes], [have_systemd=no])
- 
- if test "x$with_systemd" = "xauto" ; then
diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix
index 8539db5e00277fca1cfb4c32a874f8b6b73e6cf2..6e4ae16e9c82413e639f98d7bb18bc24177dfa89 100644
--- a/pkgs/misc/screensavers/pipes/default.nix
+++ b/pkgs/misc/screensavers/pipes/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/pipeseroni/pipes.sh;
     description = "Animated pipes terminal screensaver";
     license = licenses.mit;
-    maintainers = [ maintainers.matthiasbeyer ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix
index 7b280d770b3823ce7110fe256f0529c6278371ca..e8b9346a8727371c5eb55388b050959167580974 100644
--- a/pkgs/misc/screensavers/rss-glx/default.nix
+++ b/pkgs/misc/screensavers/rss-glx/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, mesa, imagemagick, libtiff, bzip2}:
+{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU_combined, imagemagick, libtiff, bzip2}:
 
 stdenv.mkDerivation rec {
   version = "0.9.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ mesa xlibsWrapper imagemagick libtiff bzip2 ];
+  buildInputs = [ libGLU_combined xlibsWrapper imagemagick libtiff bzip2 ];
 
   NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick";
   NIX_LDFLAGS= "-rpath ${libXext}/lib";
diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 6b310236de426dc98b5f870ba6482868ed1bcade..82ce4c20df8e7af636b0adf7db727859c82a788d 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, writeText
 , xproto, libX11, libXext, libXrandr
 # default header can be obtained from
-# http://git.suckless.org/slock/tree/config.def.h
+# https://git.suckless.org/slock/tree/config.def.h
 , conf ? null }:
 
 with stdenv.lib;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "slock-1.4";
 
   src = fetchurl {
-    url = "http://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${name}.tar.gz";
     sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m";
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://tools.suckless.org/slock;
+    homepage = https://tools.suckless.org/slock;
     description = "Simple X display locker";
     longDescription = ''
       Simple X display locker. This is the simplest X screen locker.
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 87b55e3948b8e3a2a8a04705ea98f16d9af1f051..d93d982924d15017fc412ab0ab13f9dd92fb827f 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
-, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk2
+, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU_combined, gtk2
 , libxml2, libglade, intltool, xorg, makeWrapper, gle
 , forceInstallAllHacks ? false
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.37";
+  version = "5.39";
   name = "xscreensaver-${version}";
 
   src = fetchurl {
-    url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
-    sha256 = "1ng5ddzb4k2h1w54pvk9hzxvnxxmc54bc4a2ibk974nzjjjaxivs";
+    url = "https://www.jwz.org/xscreensaver/${name}.tar.gz";
+    sha256 = "09i47h4hdgwxyqgrsnshl4l5dv5mrsp37h705cc22lwby601ikj8";
   };
 
   buildInputs =
-    [ pkgconfig bc perl libjpeg mesa gtk2 libxml2 libglade pam
+    [ pkgconfig bc perl libjpeg libGLU_combined gtk2 libxml2 libglade pam
       libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
       libXxf86misc intltool xorg.appres makeWrapper gle
     ];
@@ -47,12 +47,12 @@ stdenv.mkDerivation rec {
   ;
 
   meta = {
-    homepage = http://www.jwz.org/xscreensaver/;
+    homepage = https://www.jwz.org/xscreensaver/;
     description = "A set of screensavers";
     maintainers = with stdenv.lib.maintainers; [ raskin ];
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
     inherit version;
-    downloadPage = "http://www.jwz.org/xscreensaver/download.html";
+    downloadPage = "https://www.jwz.org/xscreensaver/download.html";
     updateWalker = true;
   };
 }
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index d302fbe6d4b69ce81371d0e4679334b05a66eef4..f1ab822c6f4a5d1797c363f7c53554450c2ef80c 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,42 +1,35 @@
-{stdenv, fetchurl, which, automake, autoconf, pkgconfig, curl, libtool, vala_0_23, python, intltool, fuse, ccnet}:
+{stdenv, fetchurl, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
 
-stdenv.mkDerivation rec
-{
+stdenv.mkDerivation rec {
   version = "6.1.0";
   name = "seafile-shared-${version}";
 
-  src = fetchurl
-  {
+  src = fetchurl {
     url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
     sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which automake autoconf libtool vala_0_23 python intltool fuse ];
+  nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];
+  buildInputs = [ python fuse ];
   propagatedBuildInputs = [ ccnet curl ];
 
-  preConfigure = ''
-  sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh
-  ./autogen.sh
-  '';
-
-  configureFlags = "--disable-server --disable-console";
-
-  buildPhase = "make -j1";
+  configureFlags = [
+    "--disable-server"
+    "--disable-console"
+  ];
 
   postInstall = ''
-  # Remove seafile binary
-  rm -rf "$out/bin/seafile"
-  # Remove cli client binary
-  rm -rf "$out/bin/seaf-cli"
+    # Remove seafile binary
+    rm -rf "$out/bin/seafile"
+    # Remove cli client binary
+    rm -rf "$out/bin/seaf-cli"
   '';
 
-  meta =
-  {
+  meta = with stdenv.lib; {
     homepage = https://github.com/haiwen/seafile;
     description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.calrama ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ec8ef076c2fce07c9f882fd44897a834b11809e1
--- /dev/null
+++ b/pkgs/misc/stabber/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat
+, libmicrohttpd
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "stabber-unstable-${version}";
+  version = "2016-11-09";
+
+  src = fetchFromGitHub {
+    owner = "boothj5";
+    repo = "stabber";
+    rev = "ed75087e4483233eb2cc5472dbd85ddfb7a1d4d4";
+    sha256 = "1l6cibggi9rx6d26j1g92r1m8zm1g899f6z7n4pfqp84mrfqgz0p";
+  };
+
+  preAutoreconf = ''
+    mkdir m4
+  '';
+
+  buildInputs = [ autoreconfHook pkgconfig glib expat libmicrohttpd ];
+
+  meta = {
+    description = "Stubbed XMPP Server";
+    homepage = https://github.com/boothj5/stabber;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ hschaeidt ];
+  };
+}
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 9a4ec9f49f68ce1e2dd5f6e9f3c0b941e701ac77..c0c67eeb6abe9578bce65f637043a53581fea88c 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.92.1.72";
+  version = "3.93.0.258";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "19kav8m6aj4h7qg0z92k09lppzdgy6h9lxxv3qqqrl3hmg7bn0sx";
+    sha256 = "114rryaqr97f7qlwxn3fdspzigxx1jgpsbhypdn265511rsh30hx";
   };
 
   preferLocalBuild = true;
@@ -21,15 +21,16 @@ stdenv.mkDerivation rec {
     inkscape
     libxml2
     glib.dev
-    gnome3.gnome_shell
+    gnome3.gnome-shell
   ];
 
   buildInputs = [
     gdk_pixbuf
     librsvg
-    gtk-engine-murrine
   ];
 
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
   postPatch = "patchShebangs .";
 
   configureFlags = [
@@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    description = "An adaptive Gtk+ theme based on Material Design";
+    description = "An adaptive Gtk+ theme based on Material Design Guidelines";
     homepage = https://github.com/adapta-project/adapta-gtk-theme;
     license = with licenses; [ gpl2 cc-by-sa-30 ];
     platforms = platforms.linux;
diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..42ff954a46ba8fd71989f529f71c07d0209257c0
--- /dev/null
+++ b/pkgs/misc/themes/arc-kde/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "arc-kde-theme-${version}";
+  version = "2017-11-09";
+
+  src = fetchFromGitHub {
+    owner = "PapirusDevelopmentTeam";
+    repo = "arc-kde";
+    rev = "a0abe6fc5ebf74f9ae88b8a2035957cc16f706f5";
+    sha256 = "1p6f4ny97096nb054lrgyjwikmvg0qlbcnsjag7m5dfbclfnvzkg";
+  };
+
+  makeFlags = ["PREFIX=$(out)" ];
+
+  # Make this a fixed-output derivation
+  outputHashMode = "recursive";
+  outputHashAlgo = "sha256";
+  ouputHash = "2c2def57092a399aa1c450699cbb8639f47d751157b18db17";
+
+  meta = {
+    description = "A port of the arc theme for Plasma";
+    homepage = https://git.io/arc-kde;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.nixy ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index 2106b816e07b56c827e8e16fc4caabfe9de8485d..b9c0d0d4436f3214de62a39a03b962acdb172684 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -4,8 +4,9 @@ let
   # treat versions newer than 3.22 as 3.22
   gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version;
   pname = "arc-theme";
+in
 
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   version = "2017-05-12";
 
@@ -17,8 +18,9 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ gnome3.gtk ];
 
-  buildInputs = [ gtk-engine-murrine gnome3.gtk ];
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   preferLocalBuild = true;
 
diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix
index dbc0beb1872bd62b51dbf0b05a6b8eff8dd87f1f..4b7702ed6359b2da41771c77c0ff5e2fbc46915c 100644
--- a/pkgs/misc/themes/blackbird/default.nix
+++ b/pkgs/misc/themes/blackbird/default.nix
@@ -2,19 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "Blackbird";
-  version = "2017-02-20";
+  version = "2017-12-13";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     repo = "${pname}";
     owner = "shimmerproject";
-    rev = "51eaa1853675866e2e4bd026876162b35ab1a196";
-    sha256 = "06d040s5jmw9v6fkif6zjcd3lp56dmvwchcwflinc165iazbp5n2";
+    rev = "a1c5674c0ec38b4cc8ba41d2c0e6187987ae7eb4";
+    sha256 = "0xskcw36ci2ykra5gir5pkrawh2qkcv18p4fp2kxivssbd20d4jw";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs = [ gtk-engine-murrine ];
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   meta = {
     description = "Dark Desktop Suite for Gtk, Xfce and Metacity";
diff --git a/pkgs/misc/themes/deepin/default.nix b/pkgs/misc/themes/deepin/default.nix
deleted file mode 100644
index d8a3ecaa4119bdc80da283ab0f5e3fe5fa392358..0000000000000000000000000000000000000000
--- a/pkgs/misc/themes/deepin/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
-  name = "deepin-gtk-theme-${version}";
-  version = "17.10.4";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "deepin-gtk-theme";
-    rev = version;
-    sha256 = "1hb0y72fzmcj2yl6q7mbc0c7yxkd1qgnyw4vixdqxnxk2c82sxzw";
-  };
-
-  buildInputs = [ gtk-engine-murrine ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  meta = {
-    description = "Deepin GTK Theme";
-    homepage = https://github.com/linuxdeepin/deepin-gtk-theme;
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
-  };
-}
diff --git a/pkgs/misc/themes/elementary/default.nix b/pkgs/misc/themes/elementary/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0d02b32c8ffe66d0f7cb79cc9b7b5ddb1264ec6f
--- /dev/null
+++ b/pkgs/misc/themes/elementary/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "elementary-gtk-theme-${version}";
+  version = "5.1.1";
+
+  src = fetchFromGitHub {
+    owner = "elementary";
+    repo = "stylesheet";
+    rev = version;
+    sha256 = "1749byc2lbxmprladn9n7k6jh79r8ffgayjn689gmqsrm6czsmh2";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/themes/elementary
+    cp -r gtk-* plank $out/share/themes/elementary
+  '';
+
+  meta = with stdenv.lib; {
+    description = "GTK theme designed to be smooth, attractive, fast, and usable";
+    homepage = https://github.com/elementary/stylesheet;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ davidak ];
+  };
+}
diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix
index 73e9ea604d7728b3ab4d8dcc82d392aafeb46927..cc1769b48df27634d0587f0b4aa4c67c47e2a206 100644
--- a/pkgs/misc/themes/gnome-breeze/default.nix
+++ b/pkgs/misc/themes/gnome-breeze/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
     cp -r Breeze* $out/share/themes
   '';
 
+  preferLocalBuild = true;
+
   meta = {
     description = "A GTK theme built to match KDE's breeze theme";
     homepage = https://github.com/dirruk1/gnome-breeze;
@@ -19,6 +21,5 @@ stdenv.mkDerivation {
     maintainers = with stdenv.lib.maintainers; [ bennofs ];
     platforms = stdenv.lib.platforms.all;
     hydraPlatforms = [];
-    preferLocalBuild = true;
   };
 }
diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
index 5800bd5c045906657138ac598ed7a43f5d236230..1221c6606872fd6bfd644ec1288894ed434fab69 100644
--- a/pkgs/misc/themes/greybird/default.nix
+++ b/pkgs/misc/themes/greybird/default.nix
@@ -3,19 +3,19 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "greybird";
-  version = "3.22.5";
+  version = "3.22.7";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "${pname}";
     rev = "v${version}";
-    sha256 = "0l107q9fcbgp73r4p4fmyy3a7pmc4mi4km5hgp67fm2a4dna7rkd";
+    sha256 = "118k0bb780h54i2vn5my5r6vbkk134899xwp4aigw5a289xzryvb";
   };
 
   nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];
 
-  buildInputs = [ gtk-engine-murrine ];
-  
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
   meta = {
     description = "Grey and blue theme (Gtk, Xfce, Emerald, Metacity, Mutter, Unity)";
     homepage = https://github.com/shimmerproject/Greybird;
diff --git a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix b/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix
deleted file mode 100644
index 4ede14d3bb39eaef0c1697d92275e0c30fd3fb8e..0000000000000000000000000000000000000000
--- a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchFromGitHub, sass, glib, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  version = "20160919";
-  name = "numix-solarized-gtk-theme-${version}";
-
-  src = fetchFromGitHub {
-    owner = "Ferdi265";
-    repo = "numix-solarized-gtk-theme";
-    rev = version;
-    sha256 = "0243w918ycmf9vnkzfvwnrxz9zc6xxk7167h8ywxj901pqy59kad";
-  };
-
-  postPatch = ''
-    substituteInPlace Makefile --replace \
-      'INSTALL_DIR=$(DESTDIR)/usr/share/themes' "INSTALL_DIR=$out/share/themes"
-    patchShebangs .
-  '';
-
-  buildInputs = [sass glib gdk_pixbuf];
-
-  meta = with stdenv.lib; {
-    description = "GTK3.20-compatible version of bitterologist's Numix Solarized from deviantart";
-    longDescription = ''
-      This is a fork of the Numix GTK theme that replaces the colors of the theme
-      and icons to use the solarized theme with a solarized green accent color.
-      This theme supports both the dark and light theme, just as Numix proper.
-    '';
-    homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme;
-    downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.offline ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1d281b3ac90df4bfa8528a9fde2452502f693a01
--- /dev/null
+++ b/pkgs/misc/themes/kde2/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub
+, cmake, extra-cmake-modules
+, qtbase, kcoreaddons, kdecoration }:
+
+let
+  version = "2017-03-15";
+in stdenv.mkDerivation rec {
+  name = "kde2-decoration-${version}";
+
+  src = fetchFromGitHub {
+    owner = "repos-holder";
+    repo = "kdecoration2-kde2";
+    rev = "2a9cf18ac0646b3532d4db2dd28bd73c4c229783";
+    sha256 = "0kilw6sd3blvm6gx9w4w5ivkjfxlv6wnyivw46pwwvhgxqymkbxk";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
+
+  buildInputs = [ qtbase kcoreaddons kdecoration ];
+
+  meta = with stdenv.lib; {
+    description = "KDE 2 window decoration ported to Plasma 5";
+    homepage = src.meta.homepage;
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index e66b7767c6ececa418356e336868efb69efbda76..69a874d07c3fc8f8cd632e530d5af52f822c26e3 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -1,33 +1,36 @@
-{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }:
+{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
 
 stdenv.mkDerivation rec {
   name = "materia-theme-${version}";
-  version = "20171112";
+  version = "20180321";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "materia-theme";
     rev = "v${version}";
-    sha256 = "0iwak15mxkwazfnkxw4wf2qgr6s64jh8lxy0wfqvb2willzabprk";
+    sha256 = "1nj9ylg9g74smd2kdyzlamdw9cg0f3jz77vn5898drjyscw5qpp6";
   };
 
-  nativeBuildInputs = [ gnome3.glib libxml2 ];
+  nativeBuildInputs = [ gnome3.glib libxml2 bc ];
 
-  buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine gdk_pixbuf librsvg ];
+  buildInputs = [ gnome3.gnome-themes-standard gdk_pixbuf librsvg ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   dontBuild = true;
 
   installPhase = ''
     patchShebangs install.sh
     sed -i install.sh \
-      -e "s|^gnomever=.*$|gnomever=${gnome3.version}|" \
-      -e "s|/usr||"
-    destdir="$out" ./install.sh
+      -e "s|if .*which gnome-shell.*;|if true;|" \
+      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
+    mkdir -p $out/share/themes
+    ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING
   '';
 
   meta = with stdenv.lib; {
-    description = "A Material Design-like theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)";
+    description = "A Material Design theme for GNOME/GTK+ based desktop environments";
     homepage = https://github.com/nana-4/materia-theme;
     license = licenses.gpl2;
     platforms = platforms.all;
diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/misc/themes/numix-solarized/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3c81e4308ca9e8e04a00c71d34392e702ed85a6e
--- /dev/null
+++ b/pkgs/misc/themes/numix-solarized/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, python3, sass, glib, gdk_pixbuf, libxml2,
+  inkscape, optipng, gtk-engine-murrine
+}:
+
+stdenv.mkDerivation rec {
+  version = "20170810";
+  name = "numix-solarized-gtk-theme-${version}";
+
+  src = fetchFromGitHub {
+    owner = "Ferdi265";
+    repo = "numix-solarized-gtk-theme";
+    rev = version;
+    sha256 = "0l4xvsiyg15kp6xwpvm3jckxyhr1lxd678lkhrcyf40n7rd4xinl";
+  };
+
+  nativeBuildInputs = [ python3 sass glib gdk_pixbuf libxml2 inkscape optipng ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  postPatch = ''
+    patchShebangs .
+    substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
+    substituteInPlace scripts/render-assets.sh \
+      --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \
+      --replace /usr/bin/optipng ${optipng}/bin/optipng
+  '';
+
+  buildPhase = "true";
+
+  installPhase = ''
+    for theme in *.colors; do
+      make THEME="''${theme/.colors/}" install
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Solarized versions of Numix GTK2 and GTK3 theme";
+    longDescription = ''
+      This is a fork of the Numix GTK theme that replaces the colors of the theme
+      and icons to use the solarized theme with a solarized green accent color.
+      This theme supports both the dark and light theme, just as Numix proper.
+    '';
+    homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme;
+    downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.offline ];
+  };
+}
diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix
index a56f67b8df4513620cfc1c26f8c9adcf80720c0c..9001ad9e5a3afa6dfb975944de61a2000aa874c0 100644
--- a/pkgs/misc/themes/numix-sx/default.nix
+++ b/pkgs/misc/themes/numix-sx/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "7e1983924b2d90e89eddb3da8f4c43dc1326fe138fd191c8212c7904dcd618b0";
   };
 
-  buildInputs = [ gtk-engine-murrine ];
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   dontBuild = true;
 
diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix
index e21faf8b805c59a6309886f5a6162992cbb84347..f7b5f3d91af48e3066f781abfbb0237d0365e93a 100644
--- a/pkgs/misc/themes/numix/default.nix
+++ b/pkgs/misc/themes/numix/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];
 
-  buildInputs = [ gtk-engine-murrine ];
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   postPatch = ''
     substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/misc/themes/plano/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..64d4e807e425c3b3d9a394529ea0512fe8927ca6
--- /dev/null
+++ b/pkgs/misc/themes/plano/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "plano-theme-${version}";
+  version = "3.24-3";
+
+  src = fetchFromGitHub {
+    owner = "lassekongo83";
+    repo = "plano-theme";
+    rev = "v${version}";
+    sha256 = "079gj3kgsim01r7yb9dcxvrci3my1y0zkn86igdlspxcnjzmxkq0";
+  };
+
+  buildInputs = [ gdk_pixbuf gtk_engines ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -dm 755 $out/share/themes/Plano
+    cp -a * $out/share/themes/Plano/
+    rm $out/share/themes/Plano/{LICENSE,README.md}
+  '';
+
+  meta = {
+    description = "Flat theme for GNOME & Xfce4";
+    homepage = https://github.com/lassekongo83/plano-theme;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index 9c41d838659238aa0e9eb842f1946536663fac76..86a6b4883acf6897749cc2b2254b9d072d6787a6 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  buildInputs = [ gtk-engine-murrine ];
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   configureFlags = [ "--disable-unity" ];
 
diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
index 3d0de843a91b74fad21d0cb06db16bcd155236c1..dbdc4632dc701f560af5ad0b172591410a8a5bb2 100644
--- a/pkgs/misc/themes/zuki/default.nix
+++ b/pkgs/misc/themes/zuki/default.nix
@@ -2,29 +2,31 @@
 
 stdenv.mkDerivation rec {
   name = "zuki-themes-${version}";
-  version = "3.24-2";
+  version = "3.26-1";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "zuki-themes";
     rev = "v${version}";
-    sha256 = "1js92qq1zi3iq40nl6n0m52hhhn9ql9i7y8ycg8vw3w0v8xyb4km";
+    sha256 = "17p75h1i3hbpshhhliliq0mm88amvfnxq8659vabqd17ccgzwzns";
   };
 
-  buildInputs = [ gdk_pixbuf gtk_engines gtk-engine-murrine ];
+  buildInputs = [ gdk_pixbuf gtk_engines ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   dontBuild = true;
 
   installPhase = ''
     install -dm 755 $out/share/themes
-    cp -va Zuki* $out/share/themes/
+    cp -a Zuki* $out/share/themes/
   '';
 
   meta = {
-    description = "A selection of themes for GTK3, gnome-shell and more";
+    description = "Themes for GTK3, gnome-shell and more";
     homepage = https://github.com/lassekongo83/zuki-themes;
     license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.romildo ];
   };
 }
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b29565d01ecb82a6780953b3c95de57f4cc50b7f
--- /dev/null
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -0,0 +1,224 @@
+{ fetchgit, stdenv, pkgs }:
+
+let
+  rtpPath = "share/tmux-plugins";
+
+  addRtp = path: pluginName: attrs: derivation:
+    derivation // { rtp = "${derivation}/${path}/${builtins.replaceStrings ["-"] ["_"] pluginName}.tmux"; } // {
+      overrideAttrs = f: buildTmuxPlugin (attrs // f attrs);
+    };
+
+  buildTmuxPlugin = a@{
+    pluginName,
+    namePrefix ? "tmuxplugin-",
+    src,
+    unpackPhase ? "",
+    configurePhase ? "",
+    buildPhase ? "",
+    addonInfo ? null,
+    preInstall ? "",
+    postInstall ? "",
+    path ? (builtins.parseDrvName pluginName).name,
+    dependencies ? [],
+    ...
+  }:
+    addRtp "${rtpPath}/${path}" pluginName a (stdenv.mkDerivation (a // {
+      name = namePrefix + pluginName;
+
+      inherit pluginName unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
+
+      installPhase = ''
+        runHook preInstall
+
+        target=$out/${rtpPath}/${path}
+        mkdir -p $out/${rtpPath}
+        cp -r . $target
+        if [ -n "$addonInfo" ]; then
+          echo "$addonInfo" > $target/addon-info.json
+        fi
+
+        runHook postInstall
+      '';
+
+      dependencies = [ pkgs.bash ] ++ dependencies;
+    }));
+
+  buildTmuxPluginFrom2Nix = a: buildTmuxPlugin ({
+    buildPhase = ":";
+    configurePhase =":";
+  } // a);
+
+in rec {
+
+  battery = buildTmuxPluginFrom2Nix {
+    pluginName = "battery";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-battery";
+      rev = "09be78c35ee84f858f724442b94ad045ade23eb0";
+      sha256 = "0gm6qiay0k5b3yzrabfmh4inyh9r6rfhja2l3r4cixcvc8sgvh8l";
+    };
+  };
+
+  continuum = buildTmuxPluginFrom2Nix {
+    pluginName = "continuum";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-continuum";
+      rev = "90f4a00c41de094864dd4e29231253bcd80d4409";
+      sha256 = "1hviqz62mnq5h4vgcy9bl5004q18yz5b90bnih0ibsna877x3nbc";
+    };
+    dependencies = [ resurrect ];
+  };
+
+  copycat = buildTmuxPluginFrom2Nix {
+    pluginName = "copycat";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-copycat";
+      rev = "6f9b9cd2d93872cef60e3ea7f7ae89598569ed25";
+      sha256 = "12dgn5wnzrhd6sqa64w875ld3lrrny8xvdq6b6lzxyain9q49mrf";
+    };
+  };
+
+  cpu = buildTmuxPluginFrom2Nix {
+    pluginName = "cpu";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-cpu";
+      rev = "12f7a74e25bf59701456e2c0d98b39bb19ec7039";
+      sha256 = "0qxn8ngg297980lj6w8ih2m8m8bxxdbcz5hsjmlia92h5rdkm5kl";
+    };
+  };
+
+  fpp = buildTmuxPluginFrom2Nix {
+    pluginName = "fpp";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-fpp";
+      rev = "ca125d5a9c80bb156ac114ac3f3d5951a795c80e";
+      sha256 = "1b89s6mfzifi7s5iwf22w7niddpq28w48nmqqy00dv38z4yga5ws";
+    };
+    postInstall = ''
+      sed -i -e 's|fpp |${pkgs.fpp}/bin/fpp |g' $target/fpp.tmux
+    '';
+    dependencies = [ pkgs.fpp ];
+  };
+
+  logging = buildTmuxPluginFrom2Nix {
+    pluginName = "logging";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-logging";
+      rev = "b2706119cd587230beae02980d3d7fa2d5afebe9";
+      sha256 = "1w1ymscfbz87lypaxgjdva1rg7jw2jyf7nnfgyngghw9m1l2xk2c";
+    };
+  };
+
+  net-speed = buildTmuxPluginFrom2Nix {
+    pluginName = "net-speed";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-net-speed";
+      rev = "536d2bdd053a3bdfcc5cf7680c0dba76127c95ca";
+      sha256 = "1bly5f40dgiym378jkfwm7qag9xl6qvziqiqnj65yblqd5py325z";
+    };
+  };
+
+  maildir-counter = buildTmuxPluginFrom2Nix {
+    pluginName = "maildir-counter";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-maildir-counter";
+      rev = "9415f0207e71e37cbd870c9443426dbea6da78b9";
+      sha256 = "0dwvqhiv9bjwr01hsi5c57n55jyv5ha5m5q1aqgglf4wyhbnfms4";
+    };
+  };
+
+  online-status = buildTmuxPluginFrom2Nix {
+    pluginName = "online-status";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-online-status";
+      rev = "ea86704ced8a20f4a431116aa43f57edcf5a6312";
+      sha256 = "1hy3vg8v2sir865ylpm2r4ip1zgd4wlrf24jbwh16m23qdcvc19r";
+    };
+  };
+
+  open = buildTmuxPluginFrom2Nix {
+    pluginName = "open";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-open";
+      rev = "f99d3189c445188eae5fa9bfeabc95df16deca92";
+      sha256 = "13q3zd5jv7akkjjwhgimmfylrvalxdn54fnpfb14g6xam6h8808m";
+    };
+  };
+
+  pain-control = buildTmuxPluginFrom2Nix {
+    pluginName = "pain-control";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-pain-control";
+      rev = "731667692da46d51a6a9dffb4c43384a5d68ff28";
+      sha256 = "1ihpl5wgjmhfgcrasgnydd7vpsar865sx2whra19gpfm4bglmdzl";
+    };
+  };
+
+  prefix-highlight = buildTmuxPluginFrom2Nix {
+    pluginName = "prefix-highlight";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-prefix-highlight";
+      rev = "34f7125ae46e5123bedad03e08027332d1186186";
+      sha256 = "16z8sm8pifg1m9lmv0z50fb0ws9mk5zqs7a1ddl2bfwkqi7yc0c0";
+    };
+  };
+
+  resurrect = buildTmuxPluginFrom2Nix {
+    pluginName = "resurrect";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-resurrect";
+      rev = "7c77c70483b818d331e46c4cf64c716ded09a152";
+      sha256 = "08gjxwdmfy16xpgi87rp9dj5338imqsy392pixf7xcnr05413ap1";
+    };
+  };
+
+  sensible = buildTmuxPluginFrom2Nix {
+    pluginName = "sensible";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-sensible";
+      rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5";
+      sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx";
+    };
+  };
+
+  sessionist = buildTmuxPluginFrom2Nix {
+    pluginName = "sessionist";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-sessionist";
+      rev = "09ec86be38eae98ffc27bd0dde605ed10ae0dc89";
+      sha256 = "030q2mmj8akbc26jnqn8n7fckg1025p0ildx4wr401b6p1snnlw4";
+    };
+  };
+
+  sidebar = buildTmuxPluginFrom2Nix {
+    pluginName = "sidebar";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-sidebar";
+      rev = "23014524cab53f8d36373983500fe05a527a444d";
+      sha256 = "1w363587isdip1r81h0vkp5163lpa83lvasg8l04h43sbip2y6i8";
+    };
+  };
+
+  urlview = buildTmuxPluginFrom2Nix {
+    pluginName = "urlview";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-urlview";
+      rev = "b84c876cffdd22990b4ab51247e795cbd7813d53";
+      sha256 = "1jp4jq57cn116b3i34v6yy69izd8s6mp2ijr260cw86g0470k0fn";
+    };
+    postInstall = ''
+      sed -i -e '14,20{s|urlview|${pkgs.urlview}/bin/urlview|g}' $target/urlview.tmux
+    '';
+    dependencies = [ pkgs.urlview ];
+  };
+
+  yank = buildTmuxPluginFrom2Nix {
+    pluginName = "yank";
+    src = fetchgit {
+      url = "https://github.com/tmux-plugins/tmux-yank";
+      rev = "feb9611b7d1c323ca54cd8a5111a53e3e8265b59";
+      sha256 = "1ywbm09jfh6cm2m6gracmdc3pp5p2dwraalbhfaafqaydjr22qc3";
+    };
+  };
+
+}
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 1947fd30a4011ca6421352546e63bf537c3b02af..4cf1748bad449b72881e960bfcebcbab61657392 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,22 +1,31 @@
-{ stdenv, fetchurl, fetchpatch, bc, dtc, python2
-, hostPlatform
+{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig
+, armTrustedFirmwareAllwinner
+, hostPlatform, buildPackages
 }:
 
 let
-  buildUBoot = { targetPlatforms
-            , filesToInstall
+  # Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05
+  sunxiPatch = fetchpatch {
+    name = "sunxi.patch";
+    url = "https://github.com/u-boot/u-boot/compare/v2018.03...dezgeg:2018-03-sunxi.patch";
+    sha256 = "1pqn7c6c06hfygwpcgaraqvqxcjhz99j0rx5psfhj8igy0qvk2dq";
+  };
+
+  buildUBoot = { filesToInstall
             , installDir ? "$out"
             , defconfig
+            , extraPatches ? []
+            , extraMakeFlags ? []
             , extraMeta ? {}
             , ... } @ args:
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2017.11";
+    version = "2018.03";
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "01bcsah5imy6m3fbjwhqywxg0pfk5fl8ks9ylb7kv3zmrb9qy0ba";
+      sha256 = "1z9x635l5164c5hnf7qs19w7j3qghbkgs7rpn673dm898i9pfx3y";
     };
 
     patches = [
@@ -29,23 +38,35 @@ let
         sha256 = "0bbw0q027xvzvdxxvpzjajg4rm30a8mb7z74b6ma9q0l7y7bi0c4";
       })
       (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2017-11.patch;
-        sha256 = "162b2lglp307pzxsf9m7nnmzwxqd7xkwp5j85bm6bg1a38ngpl9v";
+        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
+        sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
       })
-    ];
+      (fetchpatch {
+        url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
+        sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
+      })
+    ] ++ extraPatches;
 
     postPatch = ''
       patchShebangs tools
     '';
 
-    nativeBuildInputs = [ bc dtc python2 ];
+    nativeBuildInputs = [ bc dtc openssl python2 swig ];
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
 
     hardeningDisable = [ "all" ];
 
-    makeFlags = [ "DTC=dtc" ];
+    makeFlags = [
+      "DTC=dtc"
+      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+    ] ++ extraMakeFlags;
 
     configurePhase = ''
+      runHook preConfigure
+
       make ${defconfig}
+
+      runHook postConfigure
     '';
 
     installPhase = ''
@@ -57,24 +78,18 @@ let
       runHook postInstall
     '';
 
-    enableParallelBuilding = true;
-    dontStrip = true;
+    # make[2]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'.  Stop.
+    enableParallelBuilding = false;
 
-    crossAttrs = {
-      makeFlags = [
-        "ARCH=${hostPlatform.platform.kernelArch}"
-        "CROSS_COMPILE=${stdenv.cc.prefix}"
-      ];
-    };
+    dontStrip = true;
 
     meta = with stdenv.lib; {
       homepage = http://www.denx.de/wiki/U-Boot/;
       description = "Boot loader for embedded systems";
       license = licenses.gpl2;
       maintainers = [ maintainers.dezgeg ];
-      platforms = targetPlatforms;
     } // extraMeta;
-  } // args);
+  } // removeAttrs args [ "extraMeta" ]);
 
 in rec {
   inherit buildUBoot;
@@ -82,75 +97,144 @@ in rec {
   ubootTools = buildUBoot rec {
     defconfig = "allnoconfig";
     installDir = "$out/bin";
-    buildFlags = "tools NO_SDL=1";
+    hardeningDisable = [];
     dontStrip = false;
-    targetPlatforms = stdenv.lib.platforms.linux;
-    filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"];
+    extraMeta.platforms = stdenv.lib.platforms.linux;
+    # build tools/kwboot
+    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
+    postConfigure = ''
+      sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
+    '';
+    filesToInstall = [
+      "tools/dumpimage"
+      "tools/fdtgrep"
+      "tools/kwboot"
+      "tools/mkenvimage"
+      "tools/mkimage"
+    ];
   };
 
   ubootA20OlinuxinoLime = buildUBoot rec {
     defconfig = "A20-OLinuXino-Lime_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootBananaPi = buildUBoot rec {
     defconfig = "Bananapi_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootBeagleboneBlack = buildUBoot rec {
     defconfig = "am335x_boneblack_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["MLO" "u-boot.img"];
   };
 
+  # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
+  ubootClearfog = buildUBoot rec {
+    defconfig = "clearfog_defconfig";
+    extraMeta.platforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot-spl.kwb"];
+  };
+
+  ubootGuruplug = buildUBoot rec {
+    defconfig = "guruplug_defconfig";
+    extraMeta.platforms = ["armv5tel-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
+    # tegra-uboot-flasher expects this exact directory layout, sigh...
+    postInstall = ''
+      mkdir -p $out/spl
+      cp spl/u-boot-spl $out/spl/
+    '';
   };
 
   ubootOdroidXU3 = buildUBoot rec {
     defconfig = "odroid-xu3_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-dtb.bin"];
   };
 
+  ubootOrangePiPc = buildUBoot rec {
+    defconfig = "orangepi_pc_defconfig";
+    extraMeta.platforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootPcduino3Nano = buildUBoot rec {
     defconfig = "Linksprite_pcDuino3_Nano_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootPine64 = buildUBoot rec {
+    extraPatches = [sunxiPatch];
+    defconfig = "pine64_plus_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
+  ubootQemuAarch64 = buildUBoot rec {
+    defconfig = "qemu_arm64_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
+  ubootQemuArm = buildUBoot rec {
+    defconfig = "qemu_arm_defconfig";
+    extraMeta.platforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootRaspberryPi = buildUBoot rec {
     defconfig = "rpi_defconfig";
-    targetPlatforms = ["armv6l-linux"];
+    extraMeta.platforms = ["armv6l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi2 = buildUBoot rec {
     defconfig = "rpi_2_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi3_32bit = buildUBoot rec {
     defconfig = "rpi_3_32b_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi3_64bit = buildUBoot rec {
     defconfig = "rpi_3_defconfig";
-    targetPlatforms = ["aarch64-linux"];
+    extraMeta.platforms = ["aarch64-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootSheevaplug = buildUBoot rec {
+    defconfig = "sheevaplug_defconfig";
+    extraMeta.platforms = ["armv5tel-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
+  ubootSopine = buildUBoot rec {
+    extraPatches = [sunxiPatch];
+    defconfig = "sopine_baseboard_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-with-nand-spl.imx"];
     buildFlags = "u-boot-with-nand-spl.imx";
     postConfigure = ''
@@ -164,7 +248,7 @@ in rec {
 
   ubootWandboard = buildUBoot rec {
     defconfig = "wandboard_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.img" "SPL"];
   };
 }
diff --git a/pkgs/misc/uboot/gas220.patch b/pkgs/misc/uboot/gas220.patch
deleted file mode 100644
index c5a91b0f3d00ef609d22cafa0058ddffa09c92e6..0000000000000000000000000000000000000000
--- a/pkgs/misc/uboot/gas220.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to allow assembling with binutils 2.20. It worked without this patch in 2.19.1
-diff --git a/board/mv_feroceon/USP/jump.S b/board/mv_feroceon/USP/jump.S
-index 4b6b9ee..58037fc 100644
---- a/board/mv_feroceon/USP/jump.S
-+++ b/board/mv_feroceon/USP/jump.S
-@@ -29,9 +29,11 @@ disclaimer.
- #include "sys/mvCpuIfRegs.h"
- 
- 
--jumpStart:
- 
- .section	".reset_vector_sect",#alloc, #execinstr
-+
-+jumpStart:
-+
- #if defined(MV_88F6082) || defined(MV_88F6183) || defined(DB_88F5181_OLD) || defined(DB_FPGA) || \
- 	defined(MV88F6281) || defined(MV88F6192) || defined(MV88F6180)  || defined(MV_88F6183L) || \
-     defined(MV88F6190)
diff --git a/pkgs/misc/uboot/guruplug-file-systems.patch b/pkgs/misc/uboot/guruplug-file-systems.patch
deleted file mode 100644
index 30dc1994303dbd35ec1f590b916ff00dc81275dd..0000000000000000000000000000000000000000
--- a/pkgs/misc/uboot/guruplug-file-systems.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Add support for the various file systems as found in `sheevaplug.h'.
-As for the SheevaPlug, the increase in size means that the environment
-must be pushed further away.
-
-In addition, increase the malloc area size to allow compilation of UbiFS.
-
---- u-boot/include/configs/guruplug.h	1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/include/configs/guruplug.h	2010-09-29 18:59:52.000000000 +0200
-@@ -123,8 +123,8 @@
-  * it has to be rounded to sector size
-  */
- #define CONFIG_ENV_SIZE			0x20000	/* 128k */
--#define CONFIG_ENV_ADDR			0x40000
--#define CONFIG_ENV_OFFSET		0x40000	/* env starts here */
-+#define CONFIG_ENV_ADDR			0x60000
-+#define CONFIG_ENV_OFFSET		0x60000	/* env starts here */
- 
- /*
-  * Default environment variables
-@@ -145,7 +145,7 @@
- /*
-  * Size of malloc() pool
-  */
--#define CONFIG_SYS_MALLOC_LEN	(1024 * 128) /* 128kB for malloc() */
-+#define CONFIG_SYS_MALLOC_LEN	(1024 * 1024) /* 1 MiB for malloc() */
- /* size in bytes reserved for initial data */
- #define CONFIG_SYS_GBL_DATA_SIZE	128
- 
-@@ -195,4 +195,18 @@
- 
- #define CONFIG_SYS_ALT_MEMTEST
- 
-+/*
-+ * File system
-+ */
-+#define CONFIG_CMD_EXT2
-+#define CONFIG_CMD_FAT
-+#define CONFIG_CMD_JFFS2
-+#define CONFIG_CMD_UBI
-+#define CONFIG_CMD_UBIFS
-+#define CONFIG_RBTREE
-+#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-+#define CONFIG_MTD_PARTITIONS
-+#define CONFIG_CMD_MTDPARTS
-+#define CONFIG_LZO
-+
- #endif /* _CONFIG_GURUPLUG_H */
-
diff --git a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch b/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
deleted file mode 100644
index 4f32dd89031f1e6e33346268034a08e89fa0a074..0000000000000000000000000000000000000000
--- a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-The GuruPlug's microSD card reader is a USB mass storage device that
-has two logical units (LUNs), i.e., two "SCSI disks".  This patch
-adds multi-LUN support to the USB MSD driver.
-
-See the thread at .
-
---- u-boot/common/usb_storage.c	1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/common/usb_storage.c	2010-10-02 00:38:15.000000000 +0200
-@@ -204,6 +204,22 @@ int usb_stor_info(void)
- 	return 1;
- }
- 
-+static unsigned int usb_get_max_lun(struct us_data *us)
-+{
-+	int len;
-+	unsigned char result;
-+	len = usb_control_msg(us->pusb_dev,
-+			      usb_rcvctrlpipe(us->pusb_dev, 0),
-+			      US_BBB_GET_MAX_LUN,
-+			      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-+			      0, us->ifnum,
-+			      &result, sizeof(result),
-+			      USB_CNTL_TIMEOUT * 5);
-+	USB_STOR_PRINTF("Get Max LUN -> len = %i, result = %i\n",
-+			len, (int) result);
-+	return (len > 0) ? result : 0;
-+}
-+
- /*******************************************************************************
-  * scan the usb and reports device info
-  * to the user if mode = 1
-@@ -241,13 +257,21 @@ int usb_stor_scan(int mode)
- 			break; /* no more devices avaiable */
- 
- 		if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) {
--			/* ok, it is a storage devices
--			 * get info and fill it in
--			 */
--			if (usb_stor_get_info(dev, &usb_stor[usb_max_devs],
--						&usb_dev_desc[usb_max_devs]) == 1)
-+			/* OK, it's a storage device.  Iterate over its LUNs
-+			 * and populate `usb_dev_desc'.  */
-+			int lun, max_lun, start = usb_max_devs;
-+
-+			max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]);
-+			for (lun = 0;
-+			     lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV;
-+			     lun++) {
-+				usb_dev_desc[usb_max_devs].lun = lun;
-+				if (usb_stor_get_info(dev, &usb_stor[start],
-+						      &usb_dev_desc[usb_max_devs]) == 1) {
- 				usb_max_devs++;
- 		}
-+			}
-+		}
- 		/* if storage device */
- 		if (usb_max_devs == USB_MAX_STOR_DEV) {
- 			printf("max USB Storage Device reached: %d stopping\n",
-@@ -882,6 +906,7 @@ static int usb_inquiry(ccb *srb, struct 
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_INQUIRY;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->cmd[4] = 36;
- 		srb->datalen = 36;
- 		srb->cmdlen = 12;
-@@ -905,6 +930,7 @@ static int usb_request_sense(ccb *srb, s
- 	ptr = (char *)srb->pdata;
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_REQ_SENSE;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[4] = 18;
- 	srb->datalen = 18;
- 	srb->pdata = &srb->sense_buf[0];
-@@ -924,6 +950,7 @@ static int usb_test_unit_ready(ccb *srb,
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_TST_U_RDY;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->datalen = 0;
- 		srb->cmdlen = 12;
- 		if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -943,6 +970,7 @@ static int usb_read_capacity(ccb *srb, s
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_RD_CAPAC;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->datalen = 8;
- 		srb->cmdlen = 12;
- 		if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -957,6 +985,7 @@ static int usb_read_10(ccb *srb, struct 
- {
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_READ10;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- 	srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- 	srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
-@@ -973,6 +1002,7 @@ static int usb_write_10(ccb *srb, struct
- {
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_WRITE10;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- 	srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- 	srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix
deleted file mode 100644
index 9f24f1da86a4c7fb4f29af5a04e3180dafadd284..0000000000000000000000000000000000000000
--- a/pkgs/misc/uboot/guruplug.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{stdenv, fetchgit, unzip}:
-
-# Marvell's branch of U-Boot for the GuruPlug.
-
-let
-  # Aug 2010 revision of the `testing' branch of Marvell's U-Boot repository.
-  # See
-  # 
-  # for details.
-  rev = "f106056095049c2c748c2a2797e5353295240e04";
-in
-stdenv.mkDerivation {
-  name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}";
-
-  src = fetchgit {
-    url = "git://git.denx.de/u-boot-marvell.git";
-    sha256 = "18gwyj16vml7aja9cyan51jwfcysy4cs062z7wmgdc0l9bha6iw7";
-    inherit rev;
-  };
-
-  patches =
-    [ ./guruplug-file-systems.patch ./guruplug-usb-msd-multi-lun.patch ];
-
-  enableParallelBuilding = true;
-
-  # Remove the cross compiler prefix.
-  configurePhase = ''
-    make mrproper
-    make guruplug_config
-    sed -i /CROSS_COMPILE/d include/config.mk
-  '';
-
-  buildPhase = ''
-    unset src
-    if test -z "$crossConfig"; then
-        make all u-boot.kwb
-    else
-        make all u-boot.kwb ARCH=arm CROSS_COMPILE=$crossConfig-
-    fi
-  '';
-
-  nativeBuildInputs = [ unzip ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp -v u-boot u-boot.{kwb,map} $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
-  '';
-
-  meta = {
-    platforms = [ "armv5tel-linux" ];
-  };
-}
diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
new file mode 100644
index 0000000000000000000000000000000000000000..623c6015534a022d0a55a8694d245feedd923d62
--- /dev/null
+++ b/pkgs/misc/uboot/rock64.nix
@@ -0,0 +1,37 @@
+{ lib, buildUBoot, fetchFromGitHub, armTrustedFirmwareRK3328 }: let
+  rkbin = fetchFromGitHub {
+    owner = "ayufan-rock64";
+    repo = "rkbin";
+    rev = "d8b90685b3d93c358936babdd854f1018bc6d35e";
+    sha256 = "0wrh3xa968sdp0j9n692jnv3071ymab719zc56vllba0aaabiaxr";
+  };
+in buildUBoot rec {
+  name = "uboot-${defconfig}-${version}";
+  version = "2018.01";
+
+  src = fetchFromGitHub {
+    owner = "ayufan-rock64";
+    repo = "linux-u-boot";
+    rev = "19e31fac0dee3c4f6b2ea4371e4321f79db0f495";
+    sha256 = "1vmv7q9yafsc0zivd0qdfmf930dvhzkf4a3j6apxxgx9g10wgwrg";
+  };
+
+  extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ];
+
+  # So close to being blob free... But U-Boot TPL causes the kernel to hang
+  postBuild = ''
+    ./tools/mkimage -n rk3328 -T rksd -d ${rkbin}/rk33/rk3328_ddr_786MHz_v1.06.bin idbloader.img
+    cat spl/u-boot-spl.bin >> idbloader.img
+    dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc
+  '';
+
+  defconfig = "rock64-rk3328_defconfig";
+  filesToInstall = [ "spl/u-boot-spl.bin" "tpl/u-boot-tpl.bin" "u-boot.itb" "idbloader.img"];
+
+  extraMeta = with lib; {
+    maintainers = [ maintainers.lopsided98 ];
+    platforms = ["aarch64-linux"];
+    # Because of the TPL blob
+    license = licenses.unfreeRedistributableFirmware;
+  };
+}
diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix
deleted file mode 100644
index 53d811d1a44ebfddac73ad55bf1b63a924f8f92b..0000000000000000000000000000000000000000
--- a/pkgs/misc/uboot/sheevaplug.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-# We should enable this check once we have the cross target system information
-# assert stdenv.system == "armv5tel-linux" || crossConfig == "armv5tel-linux";
-
-# All this file is made for the Marvell Sheevaplug
-   
-stdenv.mkDerivation {
-  name = "uboot-sheevaplug-3.4.27";
-   
-  src = fetchurl {
-    url = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2";
-    sha256 = "19vp4rlikz7h72pqsjhgz7nmgjy4c6vabvxkw67wni70vy5ddy8s";
-  };
-
-  srcAddon = fetchurl {
-    url = "http://www.plugcomputer.org/405/us/plug-basic/uboot/u-boot-3.4.27.zip";
-    sha256 = "1wqxznpdb6d2kx58gral4q0mg5ddxyrv7az8c6v29nr3cd9yrfsg";
-  };
-
-  postUnpack = ''
-    mv u-boot-1.1.4 u-boot-3.4.27
-    unzip -o $srcAddon
-    sourceRoot=u-boot-3.4.27
-  '';
-
-  patches = [ ./gas220.patch ];
-
-  # Remove the cross compiler prefix, and add reiserfs support
-  configurePhase = ''
-    make mrproper
-    make rd88f6281Sheevaplug_config NBOOT=1 LE=1
-    sed -i /CROSS_COMPILE/d include/config.mk
-  '';
-
-  buildPhase = ''
-    unset src
-    if test -z "$crossConfig"; then
-        make clean all
-    else
-        make clean all ARCH=arm CROSS_COMPILE=$crossConfig-
-    fi
-  '';
-
-  nativeBuildInputs = [ unzip ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out
-    cp u-boot u-boot.map $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
-  '';
-
-  meta = {
-    platforms = [ "armv5tel-linux" ];
-  };
-}
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index a9468e5356df49304c80e5c000cfd305adc0d8b4..a48f9943779a51d0a65c4bc0685cc810a3e9e697 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,22 +1,26 @@
 # TODO check that no license information gets lost
-{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
-, which, fetchgit, llvmPackages
-, xkb_switch, rustracerd, fzf
-, python3, boost, icu
+{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby
+, which, fetchgit, llvmPackages, rustPlatform
+, xkb_switch, rustracerd, fzf, skim
+, python3, boost, icu, ncurses
 , ycmd, makeWrapper, rake
 , pythonPackages, python3Packages
+, substituteAll
+, languagetool
 , Cocoa ? null, git
 }:
 
 let
 
+  _skim = skim;
+
 inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin
   buildVimPluginFrom2Nix vimHelpTags;
 in
 
 # TL;DR
 # Add your plugin to ./vim-plugin-names
-# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix ) {}; 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'"
-    '';
+    buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
   };
 
-  commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "commentary-2017-10-09";
+  vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-mru-2013-08-08";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-commentary";
-      rev = "89f43af18692d22ed999c3097e449f12fdd8b299";
-      sha256 = "0nqm4s00c607r58fz29n67r2z5p5r9qayl5y1chy8bcrl59m17a2";
+      url = "https://github.com/MarcWeber/vim-addon-mru";
+      rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb";
+      sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm";
     };
-    dependencies = [];
+    dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
 
   };
 
-  ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-cmatcher-2015-10-15";
+  vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-mw-utils-2018-03-09";
     src = fetchgit {
-      url = "git://github.com/JazzCore/ctrlp-cmatcher";
-      rev = "6c36334f106b6fd981d23e724e9a618734cab43a";
-      sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q";
+      url = "https://github.com/MarcWeber/vim-addon-mw-utils";
+      rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2";
+      sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f";
     };
     dependencies = [];
-    buildInputs = [ python ];
-    buildPhase = ''
-      patchShebangs .
-      ./install.sh
-    '';
+
   };
 
-  ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-py-matcher-2017-11-01";
+  vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-nix-2017-09-11";
     src = fetchgit {
-      url = "git://github.com/FelikZ/ctrlp-py-matcher";
-      rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13";
-      sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1";
+      url = "https://github.com/MarcWeber/vim-addon-nix";
+      rev = "3001a9db5f816dd7af11384f15415bddd146ef86";
+      sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy";
     };
-    dependencies = [];
+    dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"];
 
   };
 
-  ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-z-2015-10-17";
+  vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-other-2014-07-15";
     src = fetchgit {
-      url = "git://github.com/amiorin/ctrlp-z";
-      rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026";
-      sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl";
+      url = "https://github.com/MarcWeber/vim-addon-other";
+      rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b";
+      sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6";
     };
-    dependencies = [];
+    dependencies = ["vim-addon-actions" "vim-addon-mw-utils"];
 
   };
 
-  extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "extradite-2015-09-22";
+  vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-php-manual-2015-01-01";
     src = fetchgit {
-      url = "git://github.com/int3/vim-extradite";
-      rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526";
-      sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i";
+      url = "https://github.com/MarcWeber/vim-addon-php-manual";
+      rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff";
+      sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir";
     };
     dependencies = [];
 
   };
 
-  fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2017-10-21";
+  vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-signs-2013-04-19";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-fugitive";
-      rev = "7c9b87a3c3ef4b53425aca4a27e11a7359caae9f";
-      sha256 = "1kpgnn3pmy82kqy9vcvd1vi9jjmfj03p4606pvh42ky4y0m0qmms";
+      url = "https://github.com/MarcWeber/vim-addon-signs";
+      rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae";
+      sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy";
     };
     dependencies = [];
 
   };
 
-  ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-2016-06-19";
+  vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-sql-2017-02-11";
     src = fetchgit {
-      url = "git://github.com/eagletmt/ghcmod-vim";
-      rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff";
-      sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a";
+      url = "https://github.com/MarcWeber/vim-addon-sql";
+      rev = "048a139af36829fce670c8ff80d3aad927557ee6";
+      sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3";
     };
-    dependencies = [];
+    dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
 
   };
 
-  vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-auto-save-2017-03-10";
+  vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-syntax-checker-2017-06-26";
     src = fetchgit {
-      url = "https://github.com/907th/vim-auto-save";
-      rev = "a81dea26d2a62dbe1a0f89aba5834aee40a89512";
-      sha256 = "16ljzp2rww9c13pl2ci2pqri1774qp3yhhh042n7vqxcwy80kjjc";
+      url = "https://github.com/MarcWeber/vim-addon-syntax-checker";
+      rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344";
+      sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9";
     };
-    dependencies = [];
+    dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
 
-  vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2017-10-23";
+  vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-toggle-buffer-2012-01-13";
     src = fetchgit {
-      url = "https://github.com/Chiel92/vim-autoformat";
-      rev = "c32b27cd4059770ff6f4639082b69e76ada948bd";
-      sha256 = "1sy1bjrk560qww97538m883r8gkmfl114lbp68gdl0j48fdhmh78";
+      url = "https://github.com/MarcWeber/vim-addon-toggle-buffer";
+      rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b";
+      sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03";
     };
-    dependencies = [];
+    dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
 
-  vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nix-2017-04-30";
+  vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-xdebug-2014-08-29";
     src = fetchgit {
-      url = "https://github.com/LnL7/vim-nix";
-      rev = "867488a04c2ddc47f0f235f37599a06472fea299";
-      sha256 = "1mwc06z9q45cigyxd0r9qnfs4ph6lbcwx50rf5lmpavakcn3vqir";
+      url = "https://github.com/MarcWeber/vim-addon-xdebug";
+      rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172";
+      sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw";
     };
-    dependencies = [];
+    dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"];
 
   };
 
   tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2017-11-01";
+    name = "tsuquyomi-2018-03-23";
     src = fetchgit {
       url = "https://github.com/Quramy/tsuquyomi";
-      rev = "fb5a5fd26bcca3c3a9fcde732b969e34c1ae89ea";
-      sha256 = "0pg2w250fksnj168ygkdniryyr4asrr8y5fh2gq2hpyx6wpph7f8";
+      rev = "94f10d312134fc59b53b2e821d3315320f694cf0";
+      sha256 = "1f084y9vv8rkb2d0ig6lc40sbdchpfc68fkxlvaky4jk1l1l89ay";
     };
     dependencies = [];
 
   };
 
-  deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-11-04";
+  clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "clang_complete-2018-01-18";
     src = fetchgit {
-      url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "bea8e1c122d31ab6f2dd6f7d9a5b4545d08b2c4f";
-      sha256 = "0y88h7w8d3h43yfjkawgn9inkyky5llrk8gmdfax5fqvgjgz4jg9";
+      url = "https://github.com/Rip-Rip/clang_complete";
+      rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275";
+      sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p";
     };
     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'"
+    '';
   };
 
-  Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Spacegray-vim-2017-05-05";
+  riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "riv-vim-2018-01-21";
     src = fetchgit {
-      url = "https://github.com/ajh17/Spacegray.vim";
-      rev = "95a5adbbbba7fb641af847d8666b8cad20431333";
-      sha256 = "10p02n4arml1b4ah0bz754ifvkqnbms4j0wlgzqs5azb20y2kliv";
+      url = "https://github.com/Rykka/riv.vim";
+      rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09";
+      sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j";
     };
     dependencies = [];
 
   };
 
-  nerdtree-git-plugin = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nerdtree-git-plugin-2017-03-12";
+  deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "deoplete-nvim-2018-04-16";
     src = fetchgit {
-      url = "https://github.com/albfan/nerdtree-git-plugin";
-      rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d";
-      sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj";
+      url = "https://github.com/Shougo/deoplete.nvim";
+      rev = "0d48792663437d81bdfa195c676d5c37ef10c89a";
+      sha256 = "1zqrxxi7ci1mp5ml7nayj3crzpqgdl09q20wilp68kf2mvll28xi";
     };
     dependencies = [];
 
   };
 
-  vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-closetag-2017-11-01";
+  ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ultisnips-2018-04-16";
     src = fetchgit {
-      url = "https://github.com/alvan/vim-closetag";
-      rev = "277e21d04c417112da6ecd3485373c6d3ff93b90";
-      sha256 = "1wx9qqas0gd301pn9zabbl4b9v41i1hwbnd8fyy8kxxf0cbpdwaf";
+      url = "https://github.com/SirVer/ultisnips";
+      rev = "905e5249246169b6db2bb060e0a2b06eac1890e6";
+      sha256 = "025b2f4gs04qb6wnxa0yclwm5jysdj6q10i2zkbiclvblfbxxv19";
     };
     dependencies = [];
 
   };
 
-  flake8-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "flake8-vim-2017-02-17";
+  vim-hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-hoogle-2018-03-04";
     src = fetchgit {
-      url = "https://github.com/andviro/flake8-vim";
-      rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795";
-      sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g";
+      url = "https://github.com/Twinside/vim-hoogle";
+      rev = "871d104c92e33cb238506f2805f1652561978cc8";
+      sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n";
     };
     dependencies = [];
 
   };
 
-  vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-css-color-2017-11-03";
+  vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-gitgutter-2018-04-11";
     src = fetchgit {
-      url = "https://github.com/ap/vim-css-color";
-      rev = "fcf5829daa7817994fb856dbaa905e6fd8beb50c";
-      sha256 = "1a617ji11395zimqjgpcq2qciyjzq5ixm85vc8rkj8jda0qgm91c";
+      url = "https://github.com/airblade/vim-gitgutter";
+      rev = "5481318fc1b97e7c04eab5496ec45c63335d6bc1";
+      sha256 = "1jwqxkaqvkmdqi9k9nx25xz28av374a70izs0534hx12crgg8g3w";
     };
     dependencies = [];
 
   };
 
-  LanguageClient-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "LanguageClient-neovim-2017-11-06";
+  Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Spacegray-vim-2018-04-07";
     src = fetchgit {
-      url = "https://github.com/autozimu/LanguageClient-neovim";
-      rev = "a42cad5247417a1dbe7517748df14a76bd795fc1";
-      sha256 = "1dk44xmxpq7yix0vpy8pzabk90l0cqxjm79w1zh8vqmpcp27z4jd";
+      url = "https://github.com/ajh17/Spacegray.vim";
+      rev = "255a6086aa5af07e38e441964623029a39fa17c1";
+      sha256 = "0pfwmazcmsz9wdjmbw6hjcvbsd9j99jrjxw81xy1s6vqxmlhi8gj";
     };
     dependencies = [];
 
   };
 
-  clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-09-30";
+  nerdtree-git-plugin = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "nerdtree-git-plugin-2017-03-12";
     src = fetchgit {
-      url = "https://github.com/bbchung/clighter8";
-      rev = "193512aaa722d1f3dfd3c07bd60942e59c753f25";
-      sha256 = "1xl1ggkvwg8j6xhfgs1vcah9wksw2z03b1333iyfbgcjdxrdail6";
+      url = "https://github.com/albfan/nerdtree-git-plugin";
+      rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d";
+      sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj";
     };
     dependencies = [];
-    buildInputs = [ makeWrapper ];
-    preFixup = ''
-      sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \
-        -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
-    '';
+
   };
 
-  neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-11-04";
+  vim-colors-solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-colors-solarized-2011-05-09";
     src = fetchgit {
-      url = "https://github.com/benekastah/neomake";
-      rev = "ef4e5be7315ffcb536b855974c91b1378beda62d";
-      sha256 = "1xma1isbk7b3gccddfphvyxpi2sih6i1jgk69p8cig5rbggkrc4a";
+      url = "https://github.com/altercation/vim-colors-solarized";
+      rev = "528a59f26d12278698bb946f8fb82a63711eec21";
+      sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1";
     };
     dependencies = [];
 
   };
 
-  vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hdevtools-2017-03-11";
+  vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-closetag-2018-03-09";
     src = fetchgit {
-      url = "https://github.com/bitc/vim-hdevtools";
-      rev = "4ffdace7002915cb10d663a2c56386286c5b8e37";
-      sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka";
+      url = "https://github.com/alvan/vim-closetag";
+      rev = "aa14c2c1e7da4112e46ef6b287cacdd7af96da6f";
+      sha256 = "058z8dzqki3idv7r5654xd91wplhhnsa2l533rszmkzji3hj2why";
     };
     dependencies = [];
 
   };
 
-  vim-trailing-whitespace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-trailing-whitespace-2017-09-22";
+  ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ctrlp-z-2015-10-17";
     src = fetchgit {
-      url = "https://github.com/bronson/vim-trailing-whitespace";
+      url = "https://github.com/amiorin/ctrlp-z";
+      rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026";
+      sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl";
+    };
+    dependencies = [];
+
+  };
+
+  vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-logreview-2017-07-08";
+    src = fetchgit {
+      url = "https://github.com/andreshazard/vim-logreview";
+      rev = "b7b66ab338e904127d796af49235b8c29742f18f";
+      sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3";
+    };
+    dependencies = [];
+
+  };
+
+  peskcolor-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "peskcolor-vim-git-2016-06-11";
+    src = fetchgit {
+      url = "https://github.com/andsild/peskcolor.vim.git";
+      rev = "cba4fc739bbebacd503158f6509d9c226651f363";
+      sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq";
+    };
+    dependencies = [];
+
+  };
+
+  flake8-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "flake8-vim-2017-02-17";
+    src = fetchgit {
+      url = "https://github.com/andviro/flake8-vim";
+      rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795";
+      sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g";
+    };
+    dependencies = [];
+
+  };
+
+  vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-css-color-2018-03-06";
+    src = fetchgit {
+      url = "https://github.com/ap/vim-css-color";
+      rev = "afaacf50e65b7d30b170e70ee13c1518dce1e032";
+      sha256 = "1ck8qv3wfmc7rdddzd7zh2dsnb0rx69grmc0laz7n1358xg0i4vx";
+    };
+    dependencies = [];
+
+  };
+
+  vim-bazel = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-bazel-2018-01-10";
+    src = fetchgit {
+      url = "https://github.com/bazelbuild/vim-bazel";
+      rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3";
+      sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy";
+    };
+    dependencies = ["maktaba"];
+
+  };
+
+  clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "clighter8-2018-04-15";
+    src = fetchgit {
+      url = "https://github.com/bbchung/clighter8";
+      rev = "6d325abd043fd1bc31bea821f751996541bfc944";
+      sha256 = "1kmk6q1hca97052dif1m3ygcr9zrnc3i2lrvkzlmsqb159mgfsgq";
+    };
+    dependencies = [];
+    preFixup = ''
+      sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \
+        -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
+    '';
+  };
+
+  neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neomake-2018-04-17";
+    src = fetchgit {
+      url = "https://github.com/benekastah/neomake";
+      rev = "df72c7a2f1bdcc08b5dbcd86f165fe7cd5eb6e1f";
+      sha256 = "1vlc0irqkl27dyh52wci36fcj80a67fcb9q9cpcbr94lwh4l7l26";
+    };
+    dependencies = [];
+
+  };
+
+  vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-hdevtools-2017-03-11";
+    src = fetchgit {
+      url = "https://github.com/bitc/vim-hdevtools";
+      rev = "4ffdace7002915cb10d663a2c56386286c5b8e37";
+      sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka";
+    };
+    dependencies = [];
+
+  };
+
+  vim-trailing-whitespace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-trailing-whitespace-2017-09-22";
+    src = fetchgit {
+      url = "https://github.com/bronson/vim-trailing-whitespace";
       rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6";
       sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9";
     };
@@ -565,12 +743,100 @@ rec {
 
   };
 
+  vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-toml-2018-03-06";
+    src = fetchgit {
+      url = "https://github.com/cespare/vim-toml";
+      rev = "624f02475080ea26d9430b8d31d7c3199b0ec939";
+      sha256 = "0frjdv50rhd3awrddq25x4l22ca15i5587pgcmvwxz92y52484lx";
+    };
+    dependencies = [];
+
+  };
+
+  denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "denite-extra-2018-03-18";
+    src = fetchgit {
+      url = "https://github.com/chemzqm/denite-extra";
+      rev = "c48443ba1a27375b8a3c04b7b0a5b2c96c7ff62b";
+      sha256 = "142s6c4af7h0jrnyl0smflg2wmkwsvhvly04rci3p54x59w7xdc5";
+    };
+    dependencies = [];
+
+  };
+
+  denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "denite-git-2018-03-20";
+    src = fetchgit {
+      url = "https://github.com/chemzqm/denite-git";
+      rev = "d1feb1470f667a5086ae45136642cefa5fc74810";
+      sha256 = "001mwa6691a46lv9m9w8gb2syxgsny6ifv4l80f1chb7hjkblkhh";
+    };
+    dependencies = [];
+
+  };
+
+  concealedyank-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "concealedyank-vim-2013-03-24";
+    src = fetchgit {
+      url = "https://github.com/chikatoike/concealedyank.vim";
+      rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd";
+      sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb";
+    };
+    dependencies = [];
+
+  };
+
+  sourcemap-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "sourcemap-vim-2012-09-19";
+    src = fetchgit {
+      url = "https://github.com/chikatoike/sourcemap.vim";
+      rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1";
+      sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350";
+    };
+    dependencies = [];
+
+  };
+
+  CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "CheckAttach-2017-03-15";
+    src = fetchgit {
+      url = "https://github.com/chrisbra/CheckAttach";
+      rev = "b583efd45e03902438a55299623390a0f9253513";
+      sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34";
+    };
+    dependencies = [];
+
+  };
+
+  csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "csv-vim-2018-04-15";
+    src = fetchgit {
+      url = "https://github.com/chrisbra/csv.vim";
+      rev = "5ca39450e6d40265086d929ff82ca2c9566fdc68";
+      sha256 = "0i6j6c6027vpdcjq6znmkbdbbsdgwqb89jswkyhyx7ff3lwmzryq";
+    };
+    dependencies = [];
+
+  };
+
+  sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "sparkup-2012-06-10";
+    src = fetchgit {
+      url = "https://github.com/chrisgeo/sparkup";
+      rev = "6fbfceef890e705c47b42b27be743ffed6f9296e";
+      sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm";
+    };
+    dependencies = [];
+
+  };
+
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sort-motion-2017-10-03";
+    name = "vim-sort-motion-2018-03-05";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-sort-motion";
-      rev = "7384f20d829b4abde28ced40975f0beb319dce27";
-      sha256 = "1x4hxa7dijb5g7vmrbgs2zi8aiqc759ljmh8qqwk6lafc016plnj";
+      rev = "b4455cea401c86d189e84c4dda55f18d8a4a67d4";
+      sha256 = "0cav0l152qy8fvhwpcdr7lddf0jnjkjw6hnjrmmpvikxj7rq2yik";
     };
     dependencies = [];
 
@@ -588,44 +854,77 @@ rec {
   };
 
   spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "spacevim-2017-03-31";
+    name = "spacevim-2018-03-29";
     src = fetchgit {
       url = "https://github.com/ctjhoa/spacevim";
-      rev = "f4cd52c1746021bb3278c6a085e8d07f1c1a9258";
-      sha256 = "0y146z0w1cbqwzw84k479a5hxs1phg1s11fqfvszn8928fsm8c4d";
+      rev = "30142a518ba77feb22791b5cb2387d88b70c58f2";
+      sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg";
     };
     dependencies = [];
 
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2017-08-30";
+    name = "ctrlp-vim-2018-04-10";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "bde7a2950adaa82e894d7bdf69e3e7383e40d229";
-      sha256 = "19q3cfs3rd3q1xfhyz55r1c3750nrjvwz7jxnhqqn751zgimnsyl";
+      rev = "4b9e7cac612902a25498cca49f13475fe1a821a4";
+      sha256 = "1wa2kxiwipnxwd19gyv6grgqn0ms6zdxsj2xg80whkk3namlgg7m";
+    };
+    dependencies = [];
+
+  };
+
+  vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim2hs-2014-04-16";
+    src = fetchgit {
+      url = "https://github.com/dag/vim2hs";
+      rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
+      sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b";
+    };
+    dependencies = [];
+
+  };
+
+  quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "quickfixstatus-2011-09-02";
+    src = fetchgit {
+      url = "https://github.com/dannyob/quickfixstatus";
+      rev = "fd3875b914fc51bbefefa8c4995588c088163053";
+      sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v";
     };
     dependencies = [];
 
   };
 
   agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "agda-vim-2017-07-18";
+    name = "agda-vim-2018-03-16";
     src = fetchgit {
       url = "https://github.com/derekelkins/agda-vim";
-      rev = "d82c5da78780e866e1afd8eecba1aa9c661c2aa8";
-      sha256 = "1aq7wyi1an6znql814w3v30p96yzyd5xnypblzxvsi62jahysfwa";
+      rev = "911a9695f550b47e4dedbe8a3dd1b6a9a745fe52";
+      sha256 = "1bmi3d39hllrsnsy37dxhziffvs9qzns631gd9psk6xgcchkan7n";
     };
     dependencies = [];
 
   };
 
   vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-scala-2017-04-29";
+    name = "vim-scala-2017-11-10";
     src = fetchgit {
       url = "https://github.com/derekwyatt/vim-scala";
-      rev = "e7640f26e56f0be344d60a6098e05d6928fd396d";
-      sha256 = "17gyqzsjjsg48x760qpm31bi169bzq0g80nm88jjkjw75m9jbv2j";
+      rev = "0b909e24f31d94552eafae610da0f31040c08f2b";
+      sha256 = "1lqqapimgjr7k4imr26ap0lgx6k4qjl5gmgb1knvh5kz100bsjl5";
+    };
+    dependencies = [];
+
+  };
+
+  vim-table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-table-mode-2018-03-22";
+    src = fetchgit {
+      url = "https://github.com/dhruvasagar/vim-table-mode";
+      rev = "e646bee5c45201b52f8f879eddf84b5c2e360e98";
+      sha256 = "1kaszrik5mqrvavl0lzfy9i0r3b2vf1jmjxp23azy0jfanflrxwa";
     };
     dependencies = [];
 
@@ -654,22 +953,33 @@ rec {
   };
 
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2017-05-24";
+    name = "vim-2018-04-13";
     src = fetchgit {
       url = "https://github.com/dracula/vim";
-      rev = "6a5bf34193927c70b6c21dcbe1c130d2ab0951d6";
-      sha256 = "1mmqrc52k133ddpxcs0mxjph4n4b856r5wbs17bgcpk95cfbspb1";
+      rev = "7668d800a20c1f180bb49655d98378f2605ad616";
+      sha256 = "07xcqickvw22yx5b91blvb463jn5dpn3drzf8y0nmpz08kfs4qfc";
     };
     dependencies = [];
 
   };
 
   xptemplate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "xptemplate-2017-04-18";
+    name = "xptemplate-2017-12-06";
     src = fetchgit {
       url = "https://github.com/drmingdrmer/xptemplate";
-      rev = "52d84e361e9da53c4309b0d96a1ab667c67b7f07";
-      sha256 = "195r5p4cyiip64zmgcih56c59gwm0irgid6cdrqc2y747gyxmf7m";
+      rev = "74aac3aebaf9c67c12c21d6b25295b9bec9c93b3";
+      sha256 = "01yvas50hg7iwwrdh61407mc477byviccksgi0fkaz89p78bbd1p";
+    };
+    dependencies = [];
+
+  };
+
+  ghcmod-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ghcmod-vim-2016-06-19";
+    src = fetchgit {
+      url = "https://github.com/eagletmt/ghcmod-vim";
+      rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff";
+      sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a";
     };
     dependencies = [];
 
@@ -697,6 +1007,17 @@ rec {
 
   };
 
+  vim-cute-python-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-cute-python-git-2016-04-04";
+    src = fetchgit {
+      url = "https://github.com/ehamberg/vim-cute-python.git";
+      rev = "d7a6163f794500447242df2bedbe20bd751b92da";
+      sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf";
+    };
+    dependencies = [];
+
+  };
+
   acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "acp-2013-02-05";
     src = fetchgit {
@@ -709,11 +1030,11 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2017-10-20";
+    name = "vim-elixir-2018-04-16";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "3066d5fb5e1c694e607b2bb5d8277266ca524262";
-      sha256 = "1j5sic3rssh2kaj73lv4m5sck3irn1jzgkpdr5qw7qi0gyfgpg81";
+      rev = "36e54e1cf965d92f251ead359207d4a7b04cfdf2";
+      sha256 = "0y296falc5l6k52vpw1f0bwzxgdbdjiljjg394s472228mnb2r3p";
     };
     dependencies = [];
 
@@ -730,12 +1051,23 @@ rec {
 
   };
 
+  vim-json = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-json-2018-01-10";
+    src = fetchgit {
+      url = "https://github.com/elzr/vim-json";
+      rev = "3727f089410e23ae113be6222e8a08dd2613ecf2";
+      sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1";
+    };
+    dependencies = [];
+
+  };
+
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2017-07-06";
+    name = "vim-localvimrc-2018-04-05";
     src = fetchgit {
       url = "https://github.com/embear/vim-localvimrc";
-      rev = "48c01c214ea0312e8045aaa1a28b30850e98a194";
-      sha256 = "158ajdg3n8j0cxk2ry8rmnpfvnzmznhl573v8ddw6xni58b7bg4d";
+      rev = "736f9712dd2eb8a7a3ae15d61611db9b5a66c648";
+      sha256 = "09r8hvvm8fdr5rlrgfwnhjkk967dfmis8vgi3d45c9svhsybhkja";
     };
     dependencies = [];
 
@@ -763,6 +1095,17 @@ rec {
     pythonDependencies = with pythonPackages; [ sexpdata websocket_client ];
   };
 
+  supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "supertab-2017-11-14";
+    src = fetchgit {
+      url = "https://github.com/ervandew/supertab";
+      rev = "40fe711e088e2ab346738233dd5adbb1be355172";
+      sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db";
+    };
+    dependencies = [];
+
+  };
+
   YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "YUNOcommit-vim-2014-11-26";
     src = fetchgit {
@@ -775,11 +1118,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-11-05";
+    name = "vim-go-2018-04-11";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "c0d209cce7f0eb0af250d2471ae9495a8bf1f19e";
-      sha256 = "1ci8nhsnda4wrpqi0knara1dqjjba6bccbqiw6va8d9mzsr12ivn";
+      rev = "7491209072ed4aa746e6fe7894f976ecd251801e";
+      sha256 = "1a7fy8n9h383776jixlwxl8y3h8h5mixi0bcv4lv61x0g3xxh8gx";
     };
     dependencies = [];
 
@@ -808,160 +1151,314 @@ rec {
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2017-10-24";
+    name = "psc-ide-vim-2018-03-11";
     src = fetchgit {
       url = "https://github.com/frigoeu/psc-ide-vim";
-      rev = "23bf302de91181d409fb988ce372ab703b119bc5";
-      sha256 = "1yjnc6173zdxbcbszrv7184rk5jax6d187c1klsm8b6lx4j1jv4d";
+      rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f";
+      sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g";
     };
     dependencies = [];
 
   };
 
-  vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsonnet-2017-04-06";
+  vim-snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-snipmate-2017-04-20";
     src = fetchgit {
-      url = "https://github.com/google/vim-jsonnet";
-      rev = "2637e273713322befc476760809d46500e6088f3";
-      sha256 = "0fxmqasznb3ra49r4j3fmksik7narnd3b6j1j4najp4l61x27ip2";
+      url = "https://github.com/garbas/vim-snipmate";
+      rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e";
+      sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj";
     };
-    dependencies = [];
+    dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
 
-  vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsdoc-2017-02-11";
+  vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vundle-2018-02-02";
     src = fetchgit {
-      url = "https://github.com/heavenshell/vim-jsdoc";
-      rev = "cd8f084c3b4bd198620d45a007cee6b009b57b35";
-      sha256 = "0a2d9jwxjws8l7y89yn7xl07r5yh7r7987a8hfalvz12qmdmff1j";
+      url = "https://github.com/gmarik/vundle";
+      rev = "9a38216a1c0c597f978d73547d37681fc689c90d";
+      sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c";
     };
     dependencies = [];
 
   };
 
-  vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-leader-guide-2017-03-18";
+  csapprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "csapprox-2013-07-26";
     src = fetchgit {
-      url = "https://github.com/hecal3/vim-leader-guide";
-      rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e";
-      sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw";
+      url = "https://github.com/godlygeek/csapprox";
+      rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd";
+      sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6";
     };
     dependencies = [];
 
   };
 
-  idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2017-08-02";
+  tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tabular-2016-05-04";
     src = fetchgit {
-      url = "https://github.com/idris-hackers/idris-vim";
-      rev = "7f1363b65e14a8918d17f98b7f16de8f44f6bd00";
-      sha256 = "07ws5c1yfv4kp1yl4fa634l9w162pp784zg12r2953xzwwmgwr83";
+      url = "https://github.com/godlygeek/tabular";
+      rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367";
+      sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz";
     };
     dependencies = [];
 
   };
 
-  calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2017-07-08";
+  vim-codefmt = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-codefmt-2017-03-04";
     src = fetchgit {
-      url = "https://github.com/itchyny/calendar.vim";
-      rev = "6d6be26b2ad1870658525e2a42046429c845516c";
-      sha256 = "0g4k7vn3r8y0ss0nl6apxgpkdi7ixi87a9g5xr66n70lxyn7m9pz";
+      url = "https://github.com/google/vim-codefmt";
+      rev = "8bae55b45c3f030845ab636d6860cef4071915d1";
+      sha256 = "0wg0fplpwsgkbycjx1ryl29afbfzfsdv0j7xisjik26m9q8shn1k";
     };
-    dependencies = [];
+    dependencies = ["maktaba"];
 
   };
 
-  lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2017-11-05";
+  vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-jsonnet-2018-04-10";
     src = fetchgit {
-      url = "https://github.com/itchyny/lightline.vim";
-      rev = "73f125dcf24db4baabe9be76d02de63be22dbd44";
-      sha256 = "1aj0sn3fs78993nk8qfvyfbbny3586fnmsvkqkg7n9j2gd7dfn93";
+      url = "https://github.com/google/vim-jsonnet";
+      rev = "1425166887329363381194adc457b02b663b1354";
+      sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j";
     };
     dependencies = [];
 
   };
 
-  thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "thumbnail-vim-2017-04-24";
+  vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-maktaba-2018-04-09";
     src = fetchgit {
-      url = "https://github.com/itchyny/thumbnail.vim";
-      rev = "71cb5d48e59fc77149c1d1036ecd9e39f0b46a00";
-      sha256 = "0b25n28ri6n5rrvgfynv8rm5pzzxpnrnj1l3647pf2fjxd2z2rv5";
+      url = "https://github.com/google/vim-maktaba";
+      rev = "77a4dcecd7d65ae2bf362bd7d9055d2806a8edf3";
+      sha256 = "0fvspd6q0dj9bqnv8xavfx7xwmg5g68r1kksfv54bbzckkhkw28w";
     };
     dependencies = [];
 
   };
 
-  vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ipython-2015-06-23";
+  gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "gitv-2017-11-26";
     src = fetchgit {
-      url = "https://github.com/ivanov/vim-ipython";
-      rev = "42499f094b805b90b683afa5009cee99abd0bb75";
-      sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x";
+      url = "https://github.com/gregsexton/gitv";
+      rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35";
+      sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w";
     };
-    dependencies = [];
+    dependencies = ["fugitive"];
 
   };
 
-  vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hier-2011-08-27";
+  xterm-color-table-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "xterm-color-table-vim-2013-12-31";
     src = fetchgit {
-      url = "https://github.com/jceb/vim-hier";
-      rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
-      sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n";
+      url = "https://github.com/guns/xterm-color-table.vim";
+      rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4";
+      sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19";
     };
     dependencies = [];
-    buildInputs = [ vim ];
+
   };
 
-  vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-orgmode-2017-04-19";
+  vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-jsdoc-2017-12-18";
     src = fetchgit {
-      url = "https://github.com/jceb/vim-orgmode";
-      rev = "8a5cb51fbb8d89b0151833a6deb654929818a964";
-      sha256 = "0siqzwblads3n69chqsifpgglcda2iz2k40q76llf78fw5ylqd16";
+      url = "https://github.com/heavenshell/vim-jsdoc";
+      rev = "a164cb4c14b9063e82b6ccba96b4bc8b3a6d8f73";
+      sha256 = "0f4hj2vd4l4rprizkg64q6dmm86f5yc9gk554a6f4kpagw2w9y76";
     };
     dependencies = [];
 
   };
 
-  vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-buffergator-2017-02-05";
+  vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-leader-guide-2017-03-18";
     src = fetchgit {
-      url = "https://github.com/jeetsukumaran/vim-buffergator";
-      rev = "04dfbc0c78b0a29b340a99d0ff36ecf8f16e017d";
-      sha256 = "1z13qqmvzismz7f6ss2pk956adnqh14df8qrlzk9rgplknm4w6k7";
+      url = "https://github.com/hecal3/vim-leader-guide";
+      rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e";
+      sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw";
     };
     dependencies = [];
 
   };
 
-  tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tslime-vim-2016-06-14";
+  vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-snippets-2018-04-16";
     src = fetchgit {
-      url = "https://github.com/jgdavey/tslime.vim";
-      rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2";
-      sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1";
+      url = "https://github.com/honza/vim-snippets";
+      rev = "d081fa5117acdd972bd0a3ec1c0424e79ef6121e";
+      sha256 = "0wrm5f15lf6hlyv9ca2a8jil14647acicsmaq34nr11gd375bvvc";
     };
     dependencies = [];
 
   };
 
-  vim-docbk = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-docbk-2015-04-01";
+  idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "idris-vim-2017-12-04";
     src = fetchgit {
-      url = "https://github.com/jhradilek/vim-docbk";
-      rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e";
-      sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d";
+      url = "https://github.com/idris-hackers/idris-vim";
+      rev = "091ed6b267749927777423160eeab520109dd9c1";
+      sha256 = "1zibar2vxcmai0k37ricwnimfdv1adxfbbvz871rc4l6h3q85if1";
     };
     dependencies = [];
 
   };
 
-  auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+  vim-SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-SyntaxRange-2018-03-09";
+    src = fetchgit {
+      url = "https://github.com/inkarkat/vim-SyntaxRange";
+      rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3";
+      sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr";
+    };
+    dependencies = [];
+
+  };
+
+  vim-extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-extradite-2015-09-22";
+    src = fetchgit {
+      url = "https://github.com/int3/vim-extradite";
+      rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526";
+      sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i";
+    };
+    dependencies = [];
+
+  };
+
+  calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "calendar-vim-2018-03-12";
+    src = fetchgit {
+      url = "https://github.com/itchyny/calendar.vim";
+      rev = "1aee272cc37670b4f96c5d75975ae8af3bd8809e";
+      sha256 = "1mr7yb07aycpc9famb0kq71sb4xyw87zgnkn0gk9i96pcjaab5fs";
+    };
+    dependencies = [];
+
+  };
+
+  lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "lightline-vim-2018-04-14";
+    src = fetchgit {
+      url = "https://github.com/itchyny/lightline.vim";
+      rev = "e54d2ae512c9c081bfff9303cb22ffa94ed48ba3";
+      sha256 = "042sfdwj46yv0bmf0cm5vm24j197isc3asdj4ymxzh5d6jy2i5qb";
+    };
+    dependencies = [];
+
+  };
+
+  thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "thumbnail-vim-2017-04-24";
+    src = fetchgit {
+      url = "https://github.com/itchyny/thumbnail.vim";
+      rev = "71cb5d48e59fc77149c1d1036ecd9e39f0b46a00";
+      sha256 = "0b25n28ri6n5rrvgfynv8rm5pzzxpnrnj1l3647pf2fjxd2z2rv5";
+    };
+    dependencies = [];
+
+  };
+
+  vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-cursorword-2017-10-19";
+    src = fetchgit {
+      url = "https://github.com/itchyny/vim-cursorword";
+      rev = "4878d6185b99131c5f610cc6ad0e223439ac4601";
+      sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf";
+    };
+    dependencies = [];
+
+  };
+
+  vim-gitbranch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-gitbranch-2017-05-28";
+    src = fetchgit {
+      url = "https://github.com/itchyny/vim-gitbranch";
+      rev = "8118dc1cdd387bd609852be4bf350360ce881193";
+      sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j";
+    };
+    dependencies = [];
+
+  };
+
+  vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-ipython-2015-06-23";
+    src = fetchgit {
+      url = "https://github.com/ivanov/vim-ipython";
+      rev = "42499f094b805b90b683afa5009cee99abd0bb75";
+      sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x";
+    };
+    dependencies = [];
+
+  };
+
+  vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-test-git-2018-04-16";
+    src = fetchgit {
+      url = "https://github.com/janko-m/vim-test.git";
+      rev = "61dbd5621bcf0fe74c1008083d7f103f041fc7c7";
+      sha256 = "0r5nxspznniviy0j89pmvksgvyzrzvx1qivabbcds7i62vqrxyw0";
+    };
+    dependencies = [];
+
+  };
+
+  vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-hier-2011-08-27";
+    src = fetchgit {
+      url = "https://github.com/jceb/vim-hier";
+      rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
+      sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n";
+    };
+    dependencies = [];
+    buildInputs = [ vim ];
+  };
+
+  vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-orgmode-2017-11-17";
+    src = fetchgit {
+      url = "https://github.com/jceb/vim-orgmode";
+      rev = "ce17a40108a7d5051a3909bd7c5c94b0b5660637";
+      sha256 = "0ni99a5zylb0sbmik2xydia87qlv1xcl18j92nwxg8d6wxsnywb9";
+    };
+    dependencies = [];
+
+  };
+
+  vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-buffergator-2017-02-05";
+    src = fetchgit {
+      url = "https://github.com/jeetsukumaran/vim-buffergator";
+      rev = "04dfbc0c78b0a29b340a99d0ff36ecf8f16e017d";
+      sha256 = "1z13qqmvzismz7f6ss2pk956adnqh14df8qrlzk9rgplknm4w6k7";
+    };
+    dependencies = [];
+
+  };
+
+  tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tslime-vim-2016-06-14";
+    src = fetchgit {
+      url = "https://github.com/jgdavey/tslime.vim";
+      rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2";
+      sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1";
+    };
+    dependencies = [];
+
+  };
+
+  vim-docbk = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-docbk-2015-04-01";
+    src = fetchgit {
+      url = "https://github.com/jhradilek/vim-docbk";
+      rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e";
+      sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d";
+    };
+    dependencies = [];
+
+  };
+
+  auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "auto-pairs-2017-07-03";
     src = fetchgit {
       url = "https://github.com/jiangmiao/auto-pairs";
@@ -1017,11 +1514,22 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2017-11-02";
+    name = "fzf-vim-2018-04-17";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "5c6cee878a71ed27b137aafa7993624a357c0b82";
-      sha256 = "07wavw8j170siysjvpmm2znv6c1q72w1m0cgs908v9pr1fh1bghj";
+      rev = "bbda33b402d92d43c75827bd54ee1932cf03a7b6";
+      sha256 = "02f16kdgs1ahsja84ls1zpjidcg1yx1bhpp39fd7zqqvzw16mf1q";
+    };
+    dependencies = [];
+
+  };
+
+  goyo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "goyo-vim-2017-06-01";
+    src = fetchgit {
+      url = "https://github.com/junegunn/goyo.vim";
+      rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592";
+      sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj";
     };
     dependencies = [];
 
@@ -1038,6 +1546,28 @@ rec {
 
   };
 
+  vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-easy-align-2017-06-03";
+    src = fetchgit {
+      url = "https://github.com/junegunn/vim-easy-align";
+      rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0";
+      sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774";
+    };
+    dependencies = [];
+
+  };
+
+  vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-dashboard-2017-08-08";
+    src = fetchgit {
+      url = "https://github.com/junegunn/vim-github-dashboard";
+      rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6";
+      sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y";
+    };
+    dependencies = [];
+
+  };
+
   vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-peekaboo-2017-03-20";
     src = fetchgit {
@@ -1060,6 +1590,94 @@ rec {
 
   };
 
+  vim-niceblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-niceblock-2018-01-30";
+    src = fetchgit {
+      url = "https://github.com/kana/vim-niceblock";
+      rev = "178629a8b81da2fa614bd6c19e7797e325ee9153";
+      sha256 = "1bz8qjnwk3gz9h0194g3qqga91i4k78r9s1xymn2fv35llrfsdx0";
+    };
+    dependencies = [];
+
+  };
+
+  vim-operator-replace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-operator-replace-2015-02-25";
+    src = fetchgit {
+      url = "https://github.com/kana/vim-operator-replace";
+      rev = "1345a556a321a092716e149d4765a5e17c0e9f0f";
+      sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q";
+    };
+    dependencies = [];
+
+  };
+
+  vim-operator-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-operator-user-2015-02-17";
+    src = fetchgit {
+      url = "https://github.com/kana/vim-operator-user";
+      rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa";
+      sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb";
+    };
+    dependencies = [];
+
+  };
+
+  vim-tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-tabpagecd-2013-11-29";
+    src = fetchgit {
+      url = "https://github.com/kana/vim-tabpagecd";
+      rev = "8b71a03a037608fa5918f5096812577cec6355e4";
+      sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm";
+    };
+    dependencies = [];
+
+  };
+
+  vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-coffee-script-2018-02-27";
+    src = fetchgit {
+      url = "https://github.com/kchmck/vim-coffee-script";
+      rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb";
+      sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x";
+    };
+    dependencies = [];
+
+  };
+
+  rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "rainbow_parentheses-vim-2013-03-04";
+    src = fetchgit {
+      url = "https://github.com/kien/rainbow_parentheses.vim";
+      rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695";
+      sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7";
+    };
+    dependencies = [];
+
+  };
+
+  vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-signature-2018-04-04";
+    src = fetchgit {
+      url = "https://github.com/kshenoy/vim-signature";
+      rev = "968622e98238dd7cbd32fc5f4faa60c6b5aed6d8";
+      sha256 = "0cwkb28zszf4sd5i0mcg6bjamjxxkxsr1plx79pwai5ckcgc2x72";
+    };
+    dependencies = [];
+
+  };
+
+  vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-gista-2017-02-20";
+    src = fetchgit {
+      url = "https://github.com/lambdalisue/vim-gista";
+      rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c";
+      sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s";
+    };
+    dependencies = [];
+
+  };
+
   latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "latex-box-2015-06-01";
     src = fetchgit {
@@ -1072,11 +1690,11 @@ rec {
   };
 
   typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "typescript-vim-2017-10-24";
+    name = "typescript-vim-2018-03-08";
     src = fetchgit {
       url = "https://github.com/leafgarland/typescript-vim";
-      rev = "fbd0e9e508535f7d89778f7280dc76505348dcc6";
-      sha256 = "1psxdkr35m1x6lpsrn2v482sn9n4pysw1i0j9nr1g7r4nh1058fk";
+      rev = "e25636b44211a4be7b089bfed7cf09aa7dd086f5";
+      sha256 = "1i422j4za5xwcv3zz7cjw523nnh5q652c04phqp681lgdmgqszh4";
     };
     dependencies = [];
 
@@ -1094,11 +1712,22 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-11-01";
+    name = "vimtex-2018-04-15";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "b56537a229d74fab815090e8e4b4ae873121e69c";
-      sha256 = "1d94i19bkgqay7n5108majla2bx3nw5s230a2nw761v327bp65wd";
+      rev = "a7fc6f62e8234fc0696cfe4325153e922e2fddd5";
+      sha256 = "0bvv9k3zqdmvh80mwhrzxwjacrfq1x56ba7yqndggygfxb3l17mf";
+    };
+    dependencies = [];
+
+  };
+
+  cosco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "cosco-vim-2018-02-15";
+    src = fetchgit {
+      url = "https://github.com/lfilho/cosco.vim";
+      rev = "434dc68b93b8f42babe1887a269145ce39c97edf";
+      sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv";
     };
     dependencies = [];
 
@@ -1153,22 +1782,77 @@ rec {
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2017-10-03";
+    name = "vim-highlightedyank-2018-04-17";
     src = fetchgit {
       url = "https://github.com/machakann/vim-highlightedyank";
-      rev = "5fb7d0f2cb9e25397b1a6e1a5345584a6975b724";
-      sha256 = "19jzaiv4iqgqvbwj6r5m6037qfm5nhk6jcwciyfacispdycmpkp7";
+      rev = "6387f7cc3b768300d1fcf82d367dbcb8d16b6230";
+      sha256 = "1ldyiy3qlxnxqkqa9yv39y5xkm7gma5gjy6nccqxxxjpjlyj39hb";
+    };
+    dependencies = [];
+
+  };
+
+  tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tagbar-2017-12-17";
+    src = fetchgit {
+      url = "https://github.com/majutsushi/tagbar";
+      rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70";
+      sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9";
+    };
+    dependencies = [];
+
+  };
+
+  vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-jsbeautify-2018-01-31";
+    src = fetchgit {
+      url = "https://github.com/maksimr/vim-jsbeautify";
+      rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624";
+      sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq";
     };
     dependencies = [];
 
   };
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Jenkinsfile-vim-syntax-2017-08-29";
+    name = "Jenkinsfile-vim-syntax-2018-04-03";
     src = fetchgit {
       url = "https://github.com/martinda/Jenkinsfile-vim-syntax";
-      rev = "e3d2e19ad1c8f79872380901c0392c2671757831";
-      sha256 = "18bfyjsxgqg562n8kkcnyd05pp17ipap7ray9az92fapzhw5q4x9";
+      rev = "45418b171e06f63e0814cac6a656832384708aba";
+      sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p";
+    };
+    dependencies = [];
+
+  };
+
+  gist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "gist-vim-2016-10-10";
+    src = fetchgit {
+      url = "https://github.com/mattn/gist-vim";
+      rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63";
+      sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17";
+    };
+    dependencies = [];
+
+  };
+
+  webapi-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "webapi-vim-2018-03-14";
+    src = fetchgit {
+      url = "https://github.com/mattn/webapi-vim";
+      rev = "252250381a9509257bfb06b9f95441e41e3e23b5";
+      sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a";
+    };
+    dependencies = [];
+
+  };
+
+  undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "undotree-2017-10-26";
+    src = fetchgit {
+      url = "https://github.com/mbbill/undotree";
+      rev = "cdbb9022b8972d3e156b8d60af33bf795625b058";
+      sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253";
     };
     dependencies = [];
 
@@ -1207,41 +1891,63 @@ rec {
 
   };
 
-  vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-11-02";
+  vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-grepper-git-2018-04-13";
     src = fetchgit {
-      url = "https://github.com/mhinz/vim-startify";
-      rev = "22ccf5861397dd2365756c24ce1952736632cd8c";
-      sha256 = "1np32vz56hz19hd6zpz154dim2mzw3x1lx1vyhkkyda8rd9w4rmb";
+      url = "https://github.com/mhinz/vim-grepper.git";
+      rev = "27e73cfa7970bf38fe9037c0053a2edbb622b000";
+      sha256 = "1hy9rjvfgry9426gflw4k5qmwzmijwg3gzmmzavf7m7sagl101kd";
     };
     dependencies = [];
 
   };
 
-  vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-indent-object-2017-03-23";
+  vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-signify-2018-04-17";
     src = fetchgit {
-      url = "https://github.com/michaeljsmith/vim-indent-object";
-      rev = "41d700f14b3decccdde421fbfe49e95a084a2f89";
-      sha256 = "12mi4n5abfxx7xjl46aw400acgrjf1fxjgzak763l874y0whf5v2";
+      url = "https://github.com/mhinz/vim-signify";
+      rev = "8351e5212f9415ccc1d9696518e1ec4337ad539f";
+      sha256 = "12gix280mmsgn1z1ihbvzh67xqribrc39h670fzyn6302dzb05p0";
     };
     dependencies = [];
 
   };
 
-  ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ack-vim-2017-11-05";
+  vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-startify-2018-04-10";
     src = fetchgit {
-      url = "https://github.com/mileszs/ack.vim";
-      rev = "6e04746a63dd2453601ae36c83d53fe2021a45f4";
-      sha256 = "0453ghmaaqwv6z8a3sncd3jxs9j050sp9ymiw2aqpc1a28kdlrv8";
+      url = "https://github.com/mhinz/vim-startify";
+      rev = "532f3db6be8c6e123abb3f6523c419b6b19436da";
+      sha256 = "19inxsafsivdwgdvw59x3dbx65xkb09q0k2p66q4n57fj60bajmb";
     };
     dependencies = [];
 
   };
 
-  vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-yapf-2017-03-21";
+  vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-indent-object-2018-04-08";
+    src = fetchgit {
+      url = "https://github.com/michaeljsmith/vim-indent-object";
+      rev = "5c5b24c959478929b54a9e831a8e2e651a465965";
+      sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19";
+    };
+    dependencies = [];
+
+  };
+
+  ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ack-vim-2018-02-28";
+    src = fetchgit {
+      url = "https://github.com/mileszs/ack.vim";
+      rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042";
+      sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm";
+    };
+    dependencies = [];
+
+  };
+
+  vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-yapf-2017-03-21";
     src = fetchgit {
       url = "https://github.com/mindriot101/vim-yapf";
       rev = "324380d77c9cf8e46e22b2e4391702273a53f563";
@@ -1250,7 +1956,7 @@ rec {
     dependencies = [];
     buildPhase = ''
       substituteInPlace ftplugin/python_yapf.vim \
-        --replace '"yapf"' '"${pythonPackages.yapf}/bin/yapf"'
+        --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
     '';
   };
 
@@ -1265,6 +1971,17 @@ rec {
 
   };
 
+  gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "gruvbox-2018-02-25";
+    src = fetchgit {
+      url = "https://github.com/morhetz/gruvbox";
+      rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86";
+      sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi";
+    };
+    dependencies = [];
+
+  };
+
   hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "hlint-refactor-vim-2015-12-05";
     src = fetchgit {
@@ -1298,23 +2015,34 @@ rec {
 
   };
 
+  vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-easygit-2018-04-02";
+    src = fetchgit {
+      url = "https://github.com/neoclide/vim-easygit";
+      rev = "db10f7bbe0106c7b74875d4530f0c20e6aceee51";
+      sha256 = "194mgkyqxn4s8mj8gwkjznixm7kbpzhawr6f0bphk6bc5llphnkr";
+    };
+    dependencies = [];
+
+  };
+
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2017-10-16";
+    name = "haskell-vim-2018-04-13";
     src = fetchgit {
       url = "https://github.com/neovimhaskell/haskell-vim";
-      rev = "d877d5cd5f2f5747fa835d4b639499187fa4ae9e";
-      sha256 = "16iihz0jy61s5dyzzf5dbvd6ii1zna98pckqkjlpxcqqx636sm5c";
+      rev = "e027b314df128979dbd00dd94c9db080db156b5c";
+      sha256 = "13dx1ifwa444q8zkwda4qha74xjm4jfhhk9lbgbj9p1mj7gvbl7f";
     };
     dependencies = [];
 
   };
 
   cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "cpsm-2017-10-30";
+    name = "cpsm-2018-02-01";
     src = fetchgit {
       url = "https://github.com/nixprime/cpsm";
-      rev = "3744240ca48f98eea064f3cbc1a62b3f25f44030";
-      sha256 = "0x5jac7x85bqdh38vggi1fvxjw2z29b2227n471f3cxy8arvylrw";
+      rev = "8a4a0a05162762b857b656d51b59a5bf01850877";
+      sha256 = "0v44gf9ygrqc6rpfpiq329jija4icy0iy240yk30c0r04mjahc0b";
     };
     dependencies = [];
     buildInputs = [
@@ -1323,6 +2051,7 @@ rec {
       cmake
       boost
       icu
+      ncurses
     ];
     buildPhase = ''
       patchShebangs .
@@ -1331,6 +2060,17 @@ rec {
     '';
   };
 
+  vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-iced-coffee-script-2013-12-27";
+    src = fetchgit {
+      url = "https://github.com/noc7c9/vim-iced-coffee-script";
+      rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2";
+      sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7";
+    };
+    dependencies = [];
+
+  };
+
   shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "shabadou-vim-2016-07-19";
     src = fetchgit {
@@ -1342,34 +2082,56 @@ rec {
 
   };
 
+  vim-textobj-multiblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-textobj-multiblock-2014-06-02";
+    src = fetchgit {
+      url = "https://github.com/osyo-manga/vim-textobj-multiblock";
+      rev = "670a5ba57d73fcd793f480e262617c6eb0103355";
+      sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf";
+    };
+    dependencies = [];
+
+  };
+
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2017-10-23";
+    name = "vim-watchdogs-2017-12-03";
     src = fetchgit {
       url = "https://github.com/osyo-manga/vim-watchdogs";
-      rev = "4ba5e8f2d456d36ef4e660580245c648a6f106ff";
-      sha256 = "1736m48yp41p2kwn6n0jmkzvxi84mf4llk1zw38n0v8npzcc2lnp";
+      rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03";
+      sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff";
+    };
+    dependencies = [];
+
+  };
+
+  vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-javascript-2018-04-06";
+    src = fetchgit {
+      url = "https://github.com/pangloss/vim-javascript";
+      rev = "c99c96bdf12b5a5749c9bbdb977b070e14c15eb3";
+      sha256 = "1lyiy7vfkliw91j6mvq77n4221fws6hkv0az362r32114d97309l";
     };
     dependencies = [];
 
   };
 
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-markdown-2017-05-10";
+    name = "vim-markdown-2018-03-23";
     src = fetchgit {
       url = "https://github.com/plasticboy/vim-markdown";
-      rev = "3fcde7215e22913f004c2836fd46ff61746be6db";
-      sha256 = "0ymbs7235zi5hwyzc0vaikb3n6jwj6xarmgjj4lpf4wbsa1212yy";
+      rev = "8ace66328c7a2f416671b863cd842712d36c53cc";
+      sha256 = "09pcxwwblq2bwdrq6qa42hw7sllgym42n7gb8igg6p9krkwvjx7s";
     };
     dependencies = [];
 
   };
 
   python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2017-07-04";
+    name = "python-mode-2018-04-09";
     src = fetchgit {
       url = "https://github.com/python-mode/python-mode";
-      rev = "d2dead6ce9d900b26dbf1a06c52969f4194eda64";
-      sha256 = "1iq26a2l9maapz3433pwywmqla4wf7jass7s7bh32h10m2fh88a0";
+      rev = "5308d0cc241080057a58c1772ebd254f2922998d";
+      sha256 = "1pkwhl9ab1fybc4sp5721xzlrzhzigf34w8zlmxby8v4nvmb8ggq";
     };
     dependencies = [];
 
@@ -1387,33 +2149,86 @@ rec {
   };
 
   purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "purescript-vim-2017-10-19";
+    name = "purescript-vim-2018-03-31";
     src = fetchgit {
       url = "https://github.com/raichoo/purescript-vim";
-      rev = "ece34d9782a075761f31854a33eccd932eb2cf57";
-      sha256 = "0x6hpibmhgw5aqq25rcpvgz2a60jh7i8x23gigakmmrxv51cjcrj";
+      rev = "8528d2a4a84f428aefad5882212c34db5c852699";
+      sha256 = "0dkh1cm9z644x5cj9dxwdkyb0r9sji71jv35cyy7z0aj9b8x2jbf";
+    };
+    dependencies = [];
+
+  };
+
+  vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-pencil-2017-06-14";
+    src = fetchgit {
+      url = "https://github.com/reedes/vim-pencil";
+      rev = "2dcd974b7255e4af83cf79a208f04a3489065e22";
+      sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0";
+    };
+    dependencies = [];
+
+  };
+
+  vim-wordy = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-wordy-2018-03-10";
+    src = fetchgit {
+      url = "https://github.com/reedes/vim-wordy";
+      rev = "14b9dbf76a82e29273a74768573900361200467f";
+      sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk";
+    };
+    dependencies = [];
+
+  };
+
+  committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "committia-vim-git-2018-04-11";
+    src = fetchgit {
+      url = "https://github.com/rhysd/committia.vim.git";
+      rev = "02a317cb49689b2424232d607d218511f921f2e4";
+      sha256 = "1bfdkj0jbhkklnzd894aigx1cply8bbpzkskvzmbsj7h7jm9iyz5";
     };
     dependencies = [];
 
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2017-08-25";
+    name = "vim-grammarous-2018-04-16";
     src = fetchgit {
       url = "https://github.com/rhysd/vim-grammarous";
-      rev = "51ef5190813c0d9d8aaebd5191f183cff767f805";
-      sha256 = "1mm8hd39q2sl4hi83c4zvrl27a8djr1pv35ch0pivg84ad9p7qq5";
+      rev = "fc7e73f2af96fb1745887dabde9bf8b945d0273d";
+      sha256 = "0zfnbdsva140hc50s4fr1as5c1mn3hfm43x53sk50fylb51r9hr7";
+    };
+    dependencies = [];
+    # use `:GrammarousCheck` to initialize checking
+    # In neovim, you also want to use set
+    #   let g:grammarous#show_first_error = 1
+    # see https://github.com/rhysd/vim-grammarous/issues/39
+    patches = [
+      (substituteAll {
+        src = ./patches/vim-grammarous/set_default_languagetool.patch;
+        inherit languagetool;
+      })
+    ];
+  };
+
+  vim-operator-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-operator-surround-2017-12-23";
+    src = fetchgit {
+      url = "https://github.com/rhysd/vim-operator-surround";
+      rev = "001c0da077b5b38a723151b19760d220e02363db";
+      sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh";
     };
     dependencies = [];
 
   };
 
   vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-puppet-2017-08-25";
+    name = "vim-puppet-2018-04-12";
     src = fetchgit {
       url = "https://github.com/rodjek/vim-puppet";
-      rev = "0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e3";
-      sha256 = "1jgn9vahyn80zz0wfzx9abamsahh9wrrq1nf9qghljm4si3fq766";
+      rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097";
+      sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv";
     };
     dependencies = [];
 
@@ -1431,44 +2246,77 @@ rec {
   };
 
   nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nvim-completion-manager-2017-10-26";
+    name = "nvim-completion-manager-2017-12-28";
     src = fetchgit {
       url = "https://github.com/roxma/nvim-completion-manager";
-      rev = "a56d17bcfc107bed851c9a36f1a6fc8e93c04acd";
-      sha256 = "18zd7sigp93057lw4mx9jfqrp1l31kwhh8df5kfimbyh75xpj469";
+      rev = "e724a442072261993ca503e969d2cb25722ab1d2";
+      sha256 = "00q52vl06hgcinclszm21a3rx7ivc147p52w1p29icksc26yxhjb";
     };
     dependencies = [];
 
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2017-09-20";
+    name = "rust-vim-2018-01-15";
     src = fetchgit {
       url = "https://github.com/rust-lang/rust.vim";
-      rev = "b6d88adcf9867aa69f4d20d45d49bb54979842a4";
-      sha256 = "0n0hiqlv3amnzn69wyyq6z3r8zr0gcg86hw6flk7z39cxjhjv3vr";
+      rev = "8e75da9834abb22f8d7ece3f4ca4324a14fa18a6";
+      sha256 = "1mn4jijfzz2jq215dnwkq5gxiw0ysmvrsrvq4aypr2ms2040iqiq";
     };
     dependencies = [];
 
   };
 
   vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-devicons-2017-10-13";
+    name = "vim-devicons-2018-03-14";
     src = fetchgit {
       url = "https://github.com/ryanoasis/vim-devicons";
-      rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8";
-      sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m";
+      rev = "390b0142f1b6f02bdecc4867009e83c9ecc01db2";
+      sha256 = "1pzvhdcgyp85xx858a7i357d3xymrd0y2afwfpnsrhz35fsaw96z";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-11-01";
+    name = "neoformat-2018-04-07";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "0e2cfe93a14639b9e26373593a4a61b30e5e96ff";
-      sha256 = "1nzc8yjpbimbg0sn3cmn4jkb1f91lk0iqg4c38czlzlvbfb2xasq";
+      rev = "77c2c007508823f353f75a6b525d63ae21e55e82";
+      sha256 = "1xrvbkc8y40dgyiq5jnp0nhg19mh7m7v902hb9z3lkl6fsbcwbmb";
+    };
+    dependencies = [];
+
+  };
+
+  nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "nerdcommenter-2018-03-03";
+    src = fetchgit {
+      url = "https://github.com/scrooloose/nerdcommenter";
+      rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1";
+      sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4";
+    };
+    dependencies = [];
+
+  };
+
+  nerdtree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "nerdtree-2018-04-10";
+    src = fetchgit {
+      url = "https://github.com/scrooloose/nerdtree";
+      rev = "727770147a7589ab3a06722f4852c0237c8b3549";
+      sha256 = "105vgwy7qs6l92dm6kfby7lmxv35v2hbpjk9z5sr0qak5rad4m6c";
+    };
+    dependencies = [];
+
+  };
+
+  syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "syntastic-2018-04-17";
+    src = fetchgit {
+      url = "https://github.com/scrooloose/syntastic";
+      rev = "d31e270cc8affc6338a9ed44e2efcaec0ca4cd34";
+      sha256 = "121a1mxgfng2y5zmivyyk02mca8pyw72crivf4f1q9nhn0barf57";
     };
     dependencies = [];
 
@@ -1486,11 +2334,55 @@ rec {
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2017-10-27";
+    name = "vim-polyglot-2018-04-03";
     src = fetchgit {
       url = "https://github.com/sheerun/vim-polyglot";
-      rev = "a61ab44810a0cb78223a179d78eff16d2e0b8bf6";
-      sha256 = "0q3h46blqv963c4m636hr48j9ka1x2qv4naja7q2rr4f2pndhd23";
+      rev = "cab6866e21341cab7419cdb4ae1fd18437d31bb0";
+      sha256 = "17mizznm80yj5vz6vajwix8m8xmsn552lph5vmic5dpg7bcny6m6";
+    };
+    dependencies = [];
+
+  };
+
+  context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "context_filetype-vim-2018-04-01";
+    src = fetchgit {
+      url = "https://github.com/shougo/context_filetype.vim";
+      rev = "9ed76080795ef76f52b8c9ae4432df7cd81abc5a";
+      sha256 = "137ki4104j4ch54k9n1l1xd75vbxqssi1fdckzv8kd07m5i159i2";
+    };
+    dependencies = [];
+
+  };
+
+  denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "denite-nvim-2018-04-14";
+    src = fetchgit {
+      url = "https://github.com/shougo/denite.nvim";
+      rev = "c0c75a752577399be53aa7a7e235e6ff5387494c";
+      sha256 = "1zbf2f0w02q8jwr824l6v0pxbc620rwfsah6mxyqbr5mxddcf1v6";
+    };
+    dependencies = [];
+
+  };
+
+  echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "echodoc-vim-2018-03-26";
+    src = fetchgit {
+      url = "https://github.com/shougo/echodoc.vim";
+      rev = "f1f711bc814165cf5b09b56fd5d733917ed1c015";
+      sha256 = "0l0sm862fbr8p8m4wykx1riidxgp233cq6r2zdm2l7gvmqyj3zcr";
+    };
+    dependencies = [];
+
+  };
+
+  neco-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neco-syntax-2017-10-01";
+    src = fetchgit {
+      url = "https://github.com/shougo/neco-syntax";
+      rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3";
+      sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip";
     };
     dependencies = [];
 
@@ -1508,55 +2400,99 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2017-10-22";
+    name = "neocomplete-vim-2018-03-28";
     src = fetchgit {
       url = "https://github.com/shougo/neocomplete.vim";
-      rev = "46791e7692e07384a089d125c5c536246698d04c";
-      sha256 = "1iqd6fqlkm8bvibsapcvqqmyklzjad2l0c745lppdgdb959v016a";
+      rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3";
+      sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8";
+    };
+    dependencies = [];
+
+  };
+
+  neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neoinclude-vim-2018-02-12";
+    src = fetchgit {
+      url = "https://github.com/shougo/neoinclude.vim";
+      rev = "b63757822e0c31db04b32f0ca6bab01a560c2498";
+      sha256 = "1q2pbvl0xspjzwnisnrmv6w9wq289avzz2248hnm0v20rxvy5lwj";
+    };
+    dependencies = [];
+
+  };
+
+  neomru-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neomru-vim-2017-10-01";
+    src = fetchgit {
+      url = "https://github.com/shougo/neomru.vim";
+      rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d";
+      sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2017-09-26";
+    name = "neosnippet-snippets-2018-04-15";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "8dbb78599984140c50418d3dd23d0de4c8f13e74";
-      sha256 = "1hs4xvr9x03ccrcczhly4qlvr5bfxfvdk3ir4821mlg1gsgclkwh";
+      rev = "f453635c60998071299c3239c3d881f2be0c248e";
+      sha256 = "1df6mzk5yjhjlmzgz7lr9aa69a973mzfxmwldqnpi6yjfnmjn04c";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-10-01";
+    name = "neosnippet-vim-2018-03-12";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "ddd01d0ee3d965d9a30051f2e12b14234c83b3ae";
-      sha256 = "0475ilqyg0ppk276awvva2iaslm993l364vqcxqrl31x7ir2qa7f";
+      rev = "8cf286e3bf7a5fc859f4c5f1bef52c351f24fefa";
+      sha256 = "15mxckg5s9pjfm7xkhs4awx0vpmwdwwifqrvrh1r4mbia39pk6ry";
+    };
+    dependencies = [];
+
+  };
+
+  neoyank-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neoyank-vim-git-2018-03-26";
+    src = fetchgit {
+      url = "https://github.com/shougo/neoyank.vim.git";
+      rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef";
+      sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928";
+    };
+    dependencies = [];
+
+  };
+
+  tabpagebuffer-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tabpagebuffer-vim-2014-09-30";
+    src = fetchgit {
+      url = "https://github.com/shougo/tabpagebuffer.vim";
+      rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc";
+      sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2017-10-22";
+    name = "unite-vim-2018-04-14";
     src = fetchgit {
       url = "https://github.com/shougo/unite.vim";
-      rev = "c5c69d5d94e61a67d61730d04c82763196f63b10";
-      sha256 = "1zn23x1bx40z0anl42v8ac8dv0c7f29rd1vwdqsmwdrkyxlyi1n1";
+      rev = "7252fc334ed24722ad70867ba9e4aba125b611d7";
+      sha256 = "0r2na9i15qfmshzk0wr845nyn8h8mpbkz5xanjibsch2xz6fps76";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2017-07-22";
+    name = "vimproc-vim-2018-01-07";
     src = fetchgit {
       url = "https://github.com/shougo/vimproc.vim";
-      rev = "03a38f283ca9e15784e8fea84e8afc5d633b9639";
-      sha256 = "0ypffp724f3qp0mryxmmmi1ci0bnz34nnr7yi3c893pd9mpkrjjr";
+      rev = "2300224d366642f4f8d6f88861535d4ccbe20143";
+      sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -1592,11 +2528,22 @@ rec {
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2017-10-31";
+    name = "alchemist-vim-2018-03-22";
     src = fetchgit {
       url = "https://github.com/slashmili/alchemist.vim";
-      rev = "15e6439439997a02fddb65fd3db51c1eb62207c0";
-      sha256 = "03hvkj6957hcmlfqpzlddhm675ljqb7ka5r3j95ykl80npmqrnml";
+      rev = "fdc880663e0d76d29d6310553ae12d51565f692d";
+      sha256 = "03p5cw5j1j6v3x9gg61d95qzcijj1q0yqz5qdkjgll0fp507j8ak";
+    };
+    dependencies = [];
+
+  };
+
+  vim-smalls = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-smalls-2015-05-02";
+    src = fetchgit {
+      url = "https://github.com/t9md/vim-smalls";
+      rev = "9619eae81626bd63f88165e0520c467698264e34";
+      sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad";
     };
     dependencies = [];
 
@@ -1624,960 +2571,730 @@ rec {
 
   };
 
-  vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimpreviewpandoc-2016-03-07";
+  vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-multiple-cursors-2018-04-09";
     src = fetchgit {
-      url = "https://github.com/tex/vimpreviewpandoc";
-      rev = "b109d41ad6478df5ec7f1311950c6efca66f36e4";
-      sha256 = "1gx326xarjs3qjygpkrknncad90crjqfx8v6pir4r7k1hl7dfxc4";
+      url = "https://github.com/terryma/vim-multiple-cursors";
+      rev = "8ae5dd3f4f344cc2abe79783a8b808e4093bf084";
+      sha256 = "0zj5dm86daqzl6f76prlfalpsb3vxxl7x1k6kza8hcbyicaxsi49";
     };
     dependencies = [];
 
   };
 
-  vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2017-08-14";
+  vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimpreviewpandoc-2018-04-02";
     src = fetchgit {
-      url = "https://github.com/thinca/vim-quickrun";
-      rev = "13e60587a503620bd7d0dd1b822c29e18350e461";
-      sha256 = "185pqahvpmag01vzr2xh68vnfz6fybpd3qlpr2qdq8712x11apwi";
+      url = "https://github.com/tex/vimpreviewpandoc";
+      rev = "83b0958b570dace55166f565e2d88c468d99d854";
+      sha256 = "1fa8624wxry53x62xjmglgm6kwppfcg50ifbzms555bfjsd4fxn8";
     };
     dependencies = [];
 
   };
 
-  molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "molokai-2015-11-11";
+  vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-ft-diff_fold-2013-02-10";
     src = fetchgit {
-      url = "https://github.com/tomasr/molokai";
-      rev = "c67bdfcdb31415aa0ade7f8c003261700a885476";
-      sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s";
+      url = "https://github.com/thinca/vim-ft-diff_fold";
+      rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87";
+      sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma";
     };
     dependencies = [];
 
   };
 
-  vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2017-10-10";
+  vim-prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-prettyprint-2016-07-16";
     src = fetchgit {
-      url = "https://github.com/tpope/vim-dispatch";
-      rev = "be7b194f47bdee6baa4460ccd030b860ada548dd";
-      sha256 = "0lxhk6y1lf625i8hnsl44wzh8mfxi2h1hswrmisbmm2dbmyy84hd";
+      url = "https://github.com/thinca/vim-prettyprint";
+      rev = "d6060d2b1ff1cff71714e126addd3b10883ade12";
+      sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9";
     };
     dependencies = [];
 
   };
 
-  vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eunuch-2017-06-08";
+  vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-quickrun-2018-04-16";
     src = fetchgit {
-      url = "https://github.com/tpope/vim-eunuch";
-      rev = "b536b887072ff3cc382842ce9f675ec222302f4f";
-      sha256 = "0vp037kb12mawy186cm384m5hl0p051rihhm1jr2qck0vwaps58p";
+      url = "https://github.com/thinca/vim-quickrun";
+      rev = "630ddff167e30c55d21985713ad6729adeb8e40b";
+      sha256 = "0r2gg3a8q5627n28xgyhmb6275xwvg76ghc1wdy38xdszvykh024";
     };
     dependencies = [];
 
   };
 
-  vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-repeat-2017-04-21";
+  vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-scouter-2014-08-10";
     src = fetchgit {
-      url = "https://github.com/tpope/vim-repeat";
-      rev = "070ee903245999b2b79f7386631ffd29ce9b8e9f";
-      sha256 = "1grsaaar2ng1049gc3r8wbbp5imp31z1lcg399vhh3k36y34q213";
+      url = "https://github.com/thinca/vim-scouter";
+      rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc";
+      sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8";
     };
     dependencies = [];
 
   };
 
-  vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-speeddating-2017-05-24";
+  vim-themis = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-themis-2017-12-28";
     src = fetchgit {
-      url = "https://github.com/tpope/vim-speeddating";
-      rev = "a418667791f03694065948342f2d6c5cca8d0f32";
-      sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw";
+      url = "https://github.com/thinca/vim-themis";
+      rev = "691cd3912ba318dbd8d9fa0035fee629b424766d";
+      sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd";
     };
     dependencies = [];
 
   };
 
-  hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "hasksyn-2014-09-03";
+  molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "molokai-2015-11-11";
     src = fetchgit {
-      url = "https://github.com/travitch/hasksyn";
-      rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
-      sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx";
+      url = "https://github.com/tomasr/molokai";
+      rev = "c67bdfcdb31415aa0ade7f8c003261700a885476";
+      sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s";
     };
     dependencies = [];
 
   };
 
-  vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-haskellconceal-2017-06-15";
+  vim-solidity = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-solidity-2018-04-17";
     src = fetchgit {
-      url = "https://github.com/twinside/vim-haskellconceal";
-      rev = "802f82a5afee56e9e1251e6f756104a3bd114234";
-      sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r";
+      url = "https://github.com/tomlion/vim-solidity";
+      rev = "569bbbedc3898236d5912fed0caf114936112ae4";
+      sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx";
     };
     dependencies = [];
 
   };
 
-  youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-10-27";
+  tlib_vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tlib_vim-2018-04-08";
     src = fetchgit {
-      url = "https://github.com/valloric/youcompleteme";
-      rev = "bade99f5e9c5ba2f848cffb2d1a905e85d3ddb05";
-      sha256 = "0rf9gd4asq9bddhp3c6qvvjcm6zpiadjhvslknkqh1i9aq01kj7a";
+      url = "https://github.com/tomtom/tlib_vim";
+      rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b";
+      sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx";
     };
     dependencies = [];
-    buildPhase = ''
-      substituteInPlace plugin/youcompleteme.vim \
-        --replace "'ycm_path_to_python_interpreter', '''" \
-                  "'ycm_path_to_python_interpreter', '${python}/bin/python'"
-
-      rm -r third_party/ycmd
-      ln -s ${ycmd}/lib/ycmd third_party
-    '';
 
-    meta = {
-      description = "Fastest non utf-8 aware word and C completion engine for Vim";
-      homepage = https://github.com/Valloric/YouCompleteMe;
-      license = stdenv.lib.licenses.gpl3;
-      maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
-      platforms = stdenv.lib.platforms.unix;
-    };
   };
 
-  vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2017-10-29";
+  vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-commentary-2018-04-06";
     src = fetchgit {
-      url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "26f67b926553555e505ac60e992c97ab5fdfc83f";
-      sha256 = "0gzhi7l0cwzd66mzkrs6pgbzm9vqkkyhv4cwblywh5dkqqa9q71x";
+      url = "https://github.com/tpope/vim-commentary";
+      rev = "296d99b353261191adb7a356ee3fefbce8e6096b";
+      sha256 = "1n29rbgm2464byncmgxbvyizmag1gzswg00nfg2387nwprmpg7zj";
     };
     dependencies = [];
 
   };
 
-  vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2017-11-04";
+  vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-dispatch-2018-04-15";
     src = fetchgit {
-      url = "https://github.com/vim-pandoc/vim-pandoc";
-      rev = "e9a24376c17817632951088838a3c3bdc1c5da30";
-      sha256 = "17mmvsvdzmx9xqhxiryvv8l67m52bd4xl9lyrg0h9vk8s58cy0ig";
+      url = "https://github.com/tpope/vim-dispatch";
+      rev = "f6b3e7799e6dce08869d7744aa7faa6528f065f5";
+      sha256 = "1zn6c54hlygkx348vd7kgkfpdj93vsijhc2ma42k6s7vhwqfyylg";
     };
     dependencies = [];
 
   };
 
-  vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-after-2015-06-01";
+  vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-eunuch-2018-03-16";
     src = fetchgit {
-      url = "https://github.com/vim-pandoc/vim-pandoc-after";
-      rev = "4377665e5c98f29ea838deb3b942200b8dd096ef";
-      sha256 = "1379g174pvsaw1wdv1n18gby84sv59rsamfcgq9bqd4kg54g6h3j";
+      url = "https://github.com/tpope/vim-eunuch";
+      rev = "0971b4cb5c0865d3dd0316f725cd4236ff75b828";
+      sha256 = "1lw2ycgxypp0j8kyvlgn8hivqf1dj9rfrx8n7zgayy5w756g45cy";
     };
     dependencies = [];
 
   };
 
-  vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-syntax-2017-04-13";
+  vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-fugitive-2018-04-15";
     src = fetchgit {
-      url = "https://github.com/vim-pandoc/vim-pandoc-syntax";
-      rev = "56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3";
-      sha256 = "19ll4zrw5yd0frgsbi7pg9b68lmy4bfiwbnwgzii7inifrqsykfw";
+      url = "https://github.com/tpope/vim-fugitive";
+      rev = "40d78f07dee2ffab68abb9d6d1a9e27843df0fe0";
+      sha256 = "16fh3n8sr57cfhfpilqhz9f3svhj4swa9yqjf4wicbw9zn40hrir";
     };
     dependencies = [];
 
   };
 
-  Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Colour-Sampler-Pack-2012-11-29";
+  vim-pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-pathogen-2018-04-05";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/Colour-Sampler-Pack";
-      rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
-      sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3";
+      url = "https://github.com/tpope/vim-pathogen";
+      rev = "06da921608b971fb47603671bcafdb2843992eb3";
+      sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi";
     };
     dependencies = [];
 
   };
 
-  Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Rename-2011-08-30";
+  vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-repeat-2018-01-30";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/Rename";
-      rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34";
-      sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r";
+      url = "https://github.com/tpope/vim-repeat";
+      rev = "8106e142dfdc278ff3eaaadd7b362ad7949d4357";
+      sha256 = "1q0bmqxi1kqxq7g8l0qj7y93g9rqffwc3fbmhpj3chx2kswhd5hc";
     };
     dependencies = [];
 
   };
 
-  ReplaceWithRegister = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ReplaceWithRegister-2014-10-30";
+  vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-rhubarb-2017-06-28";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/ReplaceWithRegister";
-      rev = "832efc23111d19591d495dc72286de2fb0b09345";
-      sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g";
+      url = "https://github.com/tpope/vim-rhubarb";
+      rev = "6caad2b61afcc1b7c476b0ae3dea9ee5f2b1d14a";
+      sha256 = "1bmc5j9056bgdhyhvylbd93jkp1k9067mv3af6skzh0r77rx1a0g";
     };
     dependencies = [];
 
   };
 
-  a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "a-vim-2010-11-06";
+  vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-sensible-2018-01-22";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/a.vim";
-      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
-      sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
+      url = "https://github.com/tpope/vim-sensible";
+      rev = "2d60332fa5b2b1ea346864245569df426052865a";
+      sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb";
     };
     dependencies = [];
 
   };
 
-  align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "align-2012-08-07";
+  vim-sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-sleuth-2018-03-30";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/align";
-      rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
-      sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp";
+      url = "https://github.com/tpope/vim-sleuth";
+      rev = "3b9df28c39f93c5ec8179d958900be1d0100b536";
+      sha256 = "10rba71hmmbgv5kfsl0lmj59z1nz7b2rr6p0dmww82zp6cyzy5j0";
     };
     dependencies = [];
 
   };
 
-  argtextobj-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "argtextobj-vim-2010-10-17";
+  vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-speeddating-2017-05-24";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/argtextobj.vim";
-      rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b";
-      sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48";
+      url = "https://github.com/tpope/vim-speeddating";
+      rev = "a418667791f03694065948342f2d6c5cca8d0f32";
+      sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw";
     };
     dependencies = [];
 
   };
 
-  changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "changeColorScheme-vim-2010-10-17";
+  vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-surround-2016-06-01";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/changeColorScheme.vim";
-      rev = "b041d49f828629d72f2232531a230d1ec5de2405";
-      sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09";
-    };
-    dependencies = [];
-
-  };
-
-  random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "random-vim-2010-10-17";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/random.vim";
-      rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
-      sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp";
+      url = "https://github.com/tpope/vim-surround";
+      rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313";
+      sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46";
     };
     dependencies = [];
 
   };
 
-  tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tabmerge-2010-10-17";
+  vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-vinegar-2018-04-03";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/tabmerge";
-      rev = "074e5f06f26e7108a0570071a0f938a821768c06";
-      sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq";
+      url = "https://github.com/tpope/vim-vinegar";
+      rev = "97f3fbc9596f3997ebf8e30bfdd00ebb34597722";
+      sha256 = "0y2nzvn4xxbgyjmm4mirwak4hnzka2g3w8xm64f1smh4cb3jn0yf";
     };
     dependencies = [];
 
   };
 
-  wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "wombat256-vim-2010-10-17";
+  hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "hasksyn-2014-09-03";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/wombat256.vim";
-      rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
-      sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg";
+      url = "https://github.com/travitch/hasksyn";
+      rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
+      sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx";
     };
     dependencies = [];
 
   };
 
-  ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ale-2017-11-05";
+  vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-haskellconceal-2017-06-15";
     src = fetchgit {
-      url = "https://github.com/w0rp/ale";
-      rev = "fa7d041c26aa6616c13a62274a7fc8458f6096dd";
-      sha256 = "13h4pcahnfm0b5f7zbyfg7w2ailv8id58v59sp7h2qk3cx7zwb9k";
+      url = "https://github.com/twinside/vim-haskellconceal";
+      rev = "802f82a5afee56e9e1251e6f756104a3bd114234";
+      sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r";
     };
     dependencies = [];
 
   };
 
-  vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2017-11-05";
+  caw-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "caw-vim-2018-01-01";
     src = fetchgit {
-      url = "https://github.com/wakatime/vim-wakatime";
-      rev = "23e92a5701bad21f3604b3ab129546aef51a9b80";
-      sha256 = "0hmpjrqy1w4qimpfg1l6sj5h9zbyz7lfzs3mjv1d3d2sp413warh";
+      url = "https://github.com/tyru/caw.vim";
+      rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42";
+      sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari";
     };
     dependencies = [];
-    buildInputs = [ python ];
-  };
-
-  command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2017-09-29";
-    src = fetchgit {
-      url = "https://github.com/wincent/command-t";
-      rev = "c5882de56f0ca3ce8e891c434f192519aca5c7bb";
-      sha256 = "0dbghh7fwy49zyjick7840dkbybqchjw2sg9c6p0kmp5w3j46b92";
-    };
-    dependencies = [];
-    buildInputs = [ ruby rake ];
-    buildPhase = ''
-      rake make
-      rm ruby/command-t/ext/command-t/*.o
-    '';
-  };
-
-  vim-easytags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easytags-2015-07-01";
-    src = fetchgit {
-      url = "https://github.com/xolox/vim-easytags";
-      rev = "72a8753b5d0a951e547c51b13633f680a95b5483";
-      sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i";
-    };
-    dependencies = ["vim-misc"];
 
   };
 
-  vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-misc-2015-05-21";
+  open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "open-browser-vim-2018-03-11";
     src = fetchgit {
-      url = "https://github.com/xolox/vim-misc";
-      rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b";
-      sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi";
+      url = "https://github.com/tyru/open-browser.vim";
+      rev = "43b08d6642f26af5a875b0d0bdb3aa9a6d12e7eb";
+      sha256 = "162dv172n16jpjr812d561yyj9rz9xn4qrfx18wlpyixj3qf2bda";
     };
     dependencies = [];
 
   };
 
-  nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nim-vim-2017-10-31";
+  neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neco-look-2018-01-21";
     src = fetchgit {
-      url = "https://github.com/zah/nim.vim";
-      rev = "ae63bd21211b68d21b176ad5ea0cc4fc8f90eda5";
-      sha256 = "1i5yxddwlcr3d2bzv5g9jz1z2lg7xnd6i038ph02rvllngcfsv00";
+      url = "https://github.com/ujihisa/neco-look";
+      rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c";
+      sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj";
     };
     dependencies = [];
 
   };
 
-  deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2017-09-08";
+  youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "youcompleteme-2018-04-16";
     src = fetchgit {
-      url = "https://github.com/zchee/deoplete-go";
-      rev = "9330737f365bcf430a9481561f24271ea2ab120b";
-      sha256 = "1j8i2ahpwa0v9mjwl45a6bdqdsksyh0fpwpl96jgylq58d2g5gzb";
+      url = "https://github.com/valloric/youcompleteme";
+      rev = "6975efddc1a90514db7c8ee882ccac91f70ff4cc";
+      sha256 = "1zmbb91fc0axavxln4milmn95d9szx8zwdiiwqjdyybkm29nxhc9";
     };
     dependencies = [];
-    buildInputs = [ python3 ];
     buildPhase = ''
-      pushd ./rplugin/python3/deoplete/ujson
-      python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
-      popd
-      find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \;
+      substituteInPlace plugin/youcompleteme.vim \
+        --replace "'ycm_path_to_python_interpreter', '''" \
+                  "'ycm_path_to_python_interpreter', '${python}/bin/python'"
+
+      rm -r third_party/ycmd
+      ln -s ${ycmd}/lib/ycmd third_party
     '';
-  };
 
-  deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2017-10-24";
-    src = fetchgit {
-      url = "https://github.com/zchee/deoplete-jedi";
-      rev = "436624ce43d1424d4efef42e0990ac5fd19b5029";
-      sha256 = "0phgjf6v90lwcbx2lks461ny6v4x5ypcs2cidg51w2jav2xvlqrq";
+    meta = {
+      description = "Fastest non utf-8 aware word and C completion engine for Vim";
+      homepage = http://github.com/Valloric/YouCompleteMe;
+      license = stdenv.lib.licenses.gpl3;
+      maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
+      platforms = stdenv.lib.platforms.unix;
     };
-    dependencies = [];
-
   };
 
-  zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zig-vim-2017-10-17";
+  vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-airline-2018-04-17";
     src = fetchgit {
-      url = "https://github.com/zig-lang/zig.vim";
-      rev = "6059db59f61b517f5d65303b61f03324e01fdc2f";
-      sha256 = "0w3pa63s0r6h6w1iqmc444qrsc99xcccwapd6nyh3gb72z228d7z";
+      url = "https://github.com/vim-airline/vim-airline";
+      rev = "3ad4a18d858bb80d45a1c054b845021abe5c8f0d";
+      sha256 = "1sgf9czgajba8nf7xbfa2dm26vw356ca55m1myaxlkqrlcckcvav";
     };
     dependencies = [];
 
   };
 
-  goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "goyo-2017-06-01";
+  vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-airline-themes-2018-03-24";
     src = fetchgit {
-      url = "git://github.com/junegunn/goyo.vim";
-      rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592";
-      sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj";
+      url = "https://github.com/vim-airline/vim-airline-themes";
+      rev = "b0fca80555b8249f3c62271b7635542a7de22363";
+      sha256 = "1ap7b7v1v3n4hpnj2w24w0dli2sliphvpyfhkdbhbq4c30znm1pk";
     };
     dependencies = [];
 
   };
 
-  gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gruvbox-2017-10-01";
+  vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-pandoc-2018-01-11";
     src = fetchgit {
-      url = "git://github.com/morhetz/gruvbox";
-      rev = "16504d394e145e0372d2491e02769d241350399a";
-      sha256 = "0yhas9lnsn9lfld37lvm5msmmkj6c7d8ajgarazc5rykbl8bw8rg";
-    };
-    dependencies = [];
-
-  };
-
-  matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "matchit-zip";
-    src = fetchurl {
-      url = "http://www.vim.org/scripts/download_script.php?src_id=8196";
-      name = "matchit.zip";
-      sha256 = "1bbm8j1bhb70kagwdimwy9vcvlrz9ax5bk2a7wrmn4cy87f9xj4l";
+      url = "https://github.com/vim-pandoc/vim-pandoc";
+      rev = "3a686781ab5ea622616798475deb394e48d3cc48";
+      sha256 = "1nvz8v52jydkvnlid5w8dkjmr548ryla2vaxnlgj125aamkvmgn3";
     };
-    buildInputs = [ unzip ];
     dependencies = [];
-    meta = {
-       url = "http://www.vim.org/scripts/script.php?script_id=39";
-    };
 
-    unpackPhase = ''
-      (
-       sourceRoot=d
-       mkdir $sourceRoot; cd $sourceRoot;
-       unzip $src
-      )
-    '';
   };
 
-  pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2017-08-04";
+  vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-pandoc-after-2017-11-22";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-pathogen";
-      rev = "e7857bed4e0705f91f781dbe99706f07d08d104b";
-      sha256 = "15s08q1chrdywj7fdiwzygxywg4cpcbvk5r1r8zvw6d82kyhadw1";
+      url = "https://github.com/vim-pandoc/vim-pandoc-after";
+      rev = "844f27debf4d72811049167f97191a3b551ddfd5";
+      sha256 = "0i99g9lnk1xzarw3vzbc47i4bg4iybaywkjvd2krln4q426a6saf";
     };
     dependencies = [];
 
   };
 
-  quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "quickfixstatus-2011-09-02";
+  vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-pandoc-syntax-2017-04-13";
     src = fetchgit {
-      url = "git://github.com/dannyob/quickfixstatus";
-      rev = "fd3875b914fc51bbefefa8c4995588c088163053";
-      sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v";
+      url = "https://github.com/vim-pandoc/vim-pandoc-syntax";
+      rev = "56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3";
+      sha256 = "19ll4zrw5yd0frgsbi7pg9b68lmy4bfiwbnwgzii7inifrqsykfw";
     };
     dependencies = [];
 
   };
 
-  rainbow_parentheses = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rainbow_parentheses-2013-03-04";
+  vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-ruby-2018-04-01";
     src = fetchgit {
-      url = "git://github.com/kien/rainbow_parentheses.vim";
-      rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695";
-      sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7";
+      url = "https://github.com/vim-ruby/vim-ruby";
+      rev = "71f5df78a45c5458da793b2c897ff5dcdcd9a819";
+      sha256 = "1nblkhb1yp3q0rfq43l9968inn1z26vngf28n23y161ncfmq674y";
     };
     dependencies = [];
 
   };
 
-  sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sensible-2017-05-09";
+  Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Colour-Sampler-Pack-2012-11-29";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-sensible";
-      rev = "49ee364222dc2a5a00dddf89fd61880e3e39d46a";
-      sha256 = "0x9zn547hzzxjzplr2rkzhydh2y0a4fdkrwmdvw2yp203msyhcjx";
+      url = "https://github.com/vim-scripts/Colour-Sampler-Pack";
+      rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
+      sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3";
     };
     dependencies = [];
 
   };
 
-  sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sleuth-2017-10-24";
+  Improved-AnsiEsc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Improved-AnsiEsc-2015-08-25";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-sleuth";
-      rev = "d56a4302358359ddf9845252addf637a5e6bd6d5";
-      sha256 = "1klp2lqsql90v156kih0mnm0j957pc4r0zy5y6srww2q3wkkjgr2";
+      url = "https://github.com/vim-scripts/Improved-AnsiEsc";
+      rev = "e1c59a8e9203fab6b9150721f30548916da73351";
+      sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz";
     };
     dependencies = [];
 
   };
 
-  snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "snipmate-2017-04-20";
-    src = fetchgit {
-      url = "git://github.com/garbas/vim-snipmate";
-      rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e";
-      sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj";
-    };
-    dependencies = ["vim-addon-mw-utils" "tlib"];
-
-  };
-
-  sourcemap = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sourcemap-2012-09-19";
+  Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Rename-2011-08-30";
     src = fetchgit {
-      url = "git://github.com/chikatoike/sourcemap.vim";
-      rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1";
-      sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350";
+      url = "https://github.com/vim-scripts/Rename";
+      rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34";
+      sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r";
     };
     dependencies = [];
 
   };
 
-  surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "surround-2016-06-01";
+  ReplaceWithRegister = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ReplaceWithRegister-2014-10-30";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-surround";
-      rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313";
-      sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46";
+      url = "https://github.com/vim-scripts/ReplaceWithRegister";
+      rev = "832efc23111d19591d495dc72286de2fb0b09345";
+      sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g";
     };
     dependencies = [];
 
   };
 
-  table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2017-10-26";
+  YankRing-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "YankRing-vim-2015-07-28";
     src = fetchgit {
-      url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "40fe641708c58476c3a1b9aeafb68dd888d4920b";
-      sha256 = "1rb2jq81965gpziqxlljr2bqjyfbikqa9ncxaaak3x61prn4z084";
+      url = "https://github.com/vim-scripts/YankRing.vim";
+      rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65";
+      sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw";
     };
     dependencies = [];
 
   };
 
-  taglist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "taglist";
-    src = fetchurl {
-      url = "http://www.vim.org/scripts/download_script.php?src_id=19574";
-      name = "taglist_46.zip";
-      sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj";
-    };
-    buildInputs = [ unzip ];
-    dependencies = [];
-    meta = {
-       url = "http://www.vim.org/scripts/script.php?script_id=273";
-    };
-
-    setSourceRoot = ''
-      export sourceRoot=taglist
-      mkdir taglist
-      mv doc taglist
-      mv plugin taglist
-    '';
-  };
-
-  tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2017-08-13";
+  a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "a-vim-2010-11-06";
     src = fetchgit {
-      url = "git://github.com/tomtom/tlib_vim";
-      rev = "c96db6151fde9d06a8fed71b7df05c6dbb3f14fe";
-      sha256 = "1dhvf1v2mkmq8aifwq57ylm7nnk3zz3hna33q2gj6p7v70vay7v8";
+      url = "https://github.com/vim-scripts/a.vim";
+      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
+      sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
     };
     dependencies = [];
 
   };
 
-  undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "undotree-2017-10-26";
+  align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "align-2012-08-07";
     src = fetchgit {
-      url = "git://github.com/mbbill/undotree";
-      rev = "cdbb9022b8972d3e156b8d60af33bf795625b058";
-      sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253";
+      url = "https://github.com/vim-scripts/align";
+      rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
+      sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp";
     };
     dependencies = [];
 
   };
 
-  vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-actions-2017-09-23";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-actions";
-      rev = "7f48bea57fd9dfb06498422bc1cbe9f7553efa6e";
-      sha256 = "0q9w2x49zd3a43cm4ikgpwrqiz0k9a6pss0zrvskaxhh6mifpxpg";
-    };
-    dependencies = ["vim-addon-mw-utils" "tlib"];
-
-  };
-
-  vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-async-2017-03-20";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-async";
-      rev = "eca316a4480f68c2cb62128f3187dc7b2002afde";
-      sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q";
-    };
-    dependencies = ["vim-addon-signs"];
-
-  };
-
-  vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-background-cmd-2015-12-11";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-background-cmd";
-      rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a";
-      sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4";
-    };
-    dependencies = ["vim-addon-mw-utils"];
-
-  };
-
-  vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-commenting-2013-06-10";
+  argtextobj-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "argtextobj-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-commenting";
-      rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b";
-      sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc";
+      url = "https://github.com/vim-scripts/argtextobj.vim";
+      rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b";
+      sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48";
     };
     dependencies = [];
 
   };
 
-  vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-completion-2015-02-10";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-completion";
-      rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75";
-      sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr";
-    };
-    dependencies = ["tlib"];
-
-  };
-
-  vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-errorformats-2014-11-05";
+  bats-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "bats-vim-2013-07-03";
     src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-errorformats";
-      rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28";
-      sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1";
+      url = "https://github.com/vim-scripts/bats.vim";
+      rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a";
+      sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx";
     };
     dependencies = [];
 
   };
 
-  vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-goto-thing-at-cursor-2012-01-11";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor";
-      rev = "f052e094bdb351829bf72ae3435af9042e09a6e4";
-      sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0";
-    };
-    dependencies = ["tlib"];
-
-  };
-
-  vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-local-vimrc-2015-03-19";
+  changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "changeColorScheme-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-local-vimrc";
-      rev = "6a27f95b35befa70cd0d049329cd0920566c764b";
-      sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h";
+      url = "https://github.com/vim-scripts/changeColorScheme.vim";
+      rev = "b041d49f828629d72f2232531a230d1ec5de2405";
+      sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09";
     };
     dependencies = [];
 
   };
 
-  vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-manager-2017-05-07";
+  matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "matchit-zip-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-manager";
-      rev = "2434225ae48e608c2b6ac86c8da1c62209da746f";
-      sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb";
+      url = "https://github.com/vim-scripts/matchit.zip";
+      rev = "ced6c409c9beeb0b4142d21906606bd194411d1d";
+      sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm";
     };
     dependencies = [];
-    buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
-  };
-
-  vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-mru-2013-08-08";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-mru";
-      rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb";
-      sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm";
-    };
-    dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
 
   };
 
-  vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-mw-utils-2012-11-05";
+  mayansmoke-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "mayansmoke-git-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-mw-utils";
-      rev = "0c5612fa31ee434ba055e21c76f456244b3b5109";
-      sha256 = "147s1k4n45d3x281vj35l26sv4waxjlpqdn83z3k9n51556h1d45";
+      url = "https://github.com/vim-scripts/mayansmoke.git";
+      rev = "168883af7aec05f139af251f47eadd5dfb802c9d";
+      sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd";
     };
     dependencies = [];
 
   };
 
-  vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-nix-2017-09-11";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-nix";
-      rev = "3001a9db5f816dd7af11384f15415bddd146ef86";
-      sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy";
-    };
-    dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"];
-
-  };
-
-  vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-other-2014-07-15";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-other";
-      rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b";
-      sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6";
-    };
-    dependencies = ["vim-addon-actions" "vim-addon-mw-utils"];
-
-  };
-
-  vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-php-manual-2015-01-01";
+  random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "random-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-php-manual";
-      rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff";
-      sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir";
+      url = "https://github.com/vim-scripts/random.vim";
+      rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
+      sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp";
     };
     dependencies = [];
 
   };
 
-  vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-signs-2013-04-19";
+  tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tabmerge-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-signs";
-      rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae";
-      sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy";
+      url = "https://github.com/vim-scripts/tabmerge";
+      rev = "074e5f06f26e7108a0570071a0f938a821768c06";
+      sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq";
     };
     dependencies = [];
 
   };
 
-  vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-sql-2017-02-11";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-sql";
-      rev = "048a139af36829fce670c8ff80d3aad927557ee6";
-      sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3";
-    };
-    dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
-
-  };
-
-  vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-syntax-checker-2017-06-26";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-syntax-checker";
-      rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344";
-      sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9";
-    };
-    dependencies = ["vim-addon-mw-utils" "tlib"];
-
-  };
-
-  vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-toggle-buffer-2012-01-13";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-toggle-buffer";
-      rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b";
-      sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03";
-    };
-    dependencies = ["vim-addon-mw-utils" "tlib"];
-
-  };
-
-  vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-xdebug-2014-08-29";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-xdebug";
-      rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172";
-      sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw";
-    };
-    dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"];
-
-  };
-
-  vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2017-11-06";
+  taglist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "taglist-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/vim-airline/vim-airline";
-      rev = "396cc9226171f8dbf1069800a0ae56700bbf3913";
-      sha256 = "1km9cvvrip5z8xzaa1r83n7w0kdw21zrxax27qmvnhlnq74s24zb";
+      url = "https://github.com/vim-scripts/taglist.vim";
+      rev = "53041fbc45398a9af631a20657e109707a455339";
+      sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd";
     };
     dependencies = [];
 
   };
 
-  vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2017-03-03";
+  wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "wombat256-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/kchmck/vim-coffee-script";
-      rev = "aace5c23d812a205c93e87ff79df72d9366928df";
-      sha256 = "1saz5m3c329m2vk8ffhvxw4virz70k2qrjncwhvjpkik27jf75yy";
+      url = "https://github.com/vim-scripts/wombat256.vim";
+      rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
+      sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg";
     };
     dependencies = [];
 
   };
 
-  vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easy-align-2017-06-03";
+  vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimoutliner-2018-04-09";
     src = fetchgit {
-      url = "git://github.com/junegunn/vim-easy-align";
-      rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0";
-      sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774";
+      url = "https://github.com/vimoutliner/vimoutliner";
+      rev = "4f12628247940d98eedd594961695dc504261058";
+      sha256 = "1z44zf9wvd6mc1zb6ywrkjw87yrj1blmc5s03xk9zv5q8hskjl78";
     };
     dependencies = [];
 
   };
 
-  vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gista-2017-02-20";
+  vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimwiki-2018-04-17";
     src = fetchgit {
-      url = "git://github.com/lambdalisue/vim-gista";
-      rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c";
-      sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s";
+      url = "https://github.com/vimwiki/vimwiki";
+      rev = "90dc1e58717bd25798bb16d3badab8908b619912";
+      sha256 = "01a2gy1r4k5gw7vrdn6p0vmybb2s0gf9q0w07qps5cnxapsggxk9";
     };
     dependencies = [];
 
   };
 
-  vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2017-11-01";
+  ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ale-2018-04-17";
     src = fetchgit {
-      url = "git://github.com/airblade/vim-gitgutter";
-      rev = "1e60667322b7cd1bfcba98762fbba746a888d21a";
-      sha256 = "1g9giir7gmkp6n6w4z20qm2dyq00w2a8f573c0b8b27cj36ri0wq";
+      url = "https://github.com/w0rp/ale";
+      rev = "f9ba3d924fc445ceea6ab7a6700b95dd12d268ca";
+      sha256 = "12905gq95xif3963720yqywvzpvxz7j8qyk0i6pnmzjf92xnk8xm";
     };
     dependencies = [];
 
   };
 
-  vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-iced-coffee-script-2013-12-27";
+  vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-wakatime-2018-04-05";
     src = fetchgit {
-      url = "git://github.com/noc7c9/vim-iced-coffee-script";
-      rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2";
-      sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7";
+      url = "https://github.com/wakatime/vim-wakatime";
+      rev = "e0e7621f18a8763b851b0feb4a735633bf147cf7";
+      sha256 = "1xnrcxd7r08hqrv2fnv8x8p60nx2flh2pfcr4pkkscr0ilinakwz";
     };
     dependencies = [];
-
+    buildInputs = [ python ];
   };
 
-  vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-latex-live-preview-2017-09-22";
+  targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "targets-vim-2018-02-28";
     src = fetchgit {
-      url = "git://github.com/xuhdev/vim-latex-live-preview";
-      rev = "63abf0f2361e332597a5278b2dbd0fef980ebdb2";
-      sha256 = "0pk2nx04bl8ym77mlylb6q5n3vz0y96jzs72gydjiffp1nm062l9";
+      url = "https://github.com/wellle/targets.vim";
+      rev = "c1732189c9ec29cc3320094304019ffcafadafc4";
+      sha256 = "12ryicmb29qhmn216xdv9g8rl170mz5zrbfnmqja3wdlwkj3g83j";
     };
     dependencies = [];
 
   };
 
-  vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2017-08-04";
+  vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-dirdiff-2018-01-30";
     src = fetchgit {
-      url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "a97dab5bc440bf0a7b62bb2de4479963a888f4ff";
-      sha256 = "1ac5l5h138ns9z9ni4qbcykkg9yfpjjalk0g9wrra4rp0nlakaqk";
+      url = "https://github.com/will133/vim-dirdiff";
+      rev = "b5a3d59bfbeb5cef7dbadbe69c455b470988b58c";
+      sha256 = "16hc88k00xa757k0h53r1sbqwxdxdy0118yl2vsigd6rqk474nw1";
     };
     dependencies = [];
 
   };
 
-  vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2017-09-24";
+  command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "command-t-2017-11-16";
     src = fetchgit {
-      url = "git://github.com/kshenoy/vim-signature";
-      rev = "eaa8af20ac4d46f911a083298d7a19e27be180e0";
-      sha256 = "1vha52bmbs88lnwjfvkbx2jb74k8gqjky0c9gv8gqy74lypcdas5";
+      url = "https://github.com/wincent/command-t";
+      rev = "7147ba92c9c1eef8269fd47d47ba636ce7f365a6";
+      sha256 = "171z1jjjv1l15rh3i2hc400vjf4zns8sjvda0vcjkx2717ax658r";
     };
     dependencies = [];
-
+    buildInputs = [ ruby rake ];
+    buildPhase = ''
+      rake make
+      rm ruby/command-t/ext/command-t/*.o
+    '';
   };
 
-  vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2017-08-19";
+  vim-easytags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-easytags-2015-07-01";
     src = fetchgit {
-      url = "git://github.com/mhinz/vim-signify";
-      rev = "1a8a15d835d8f2da56cd793a0222227af6c89839";
-      sha256 = "13yvwy2vw64g4v08k83svhp26nmmir0qd21wpp89qclbzwb2q2k2";
+      url = "https://github.com/xolox/vim-easytags";
+      rev = "72a8753b5d0a951e547c51b13633f680a95b5483";
+      sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i";
     };
-    dependencies = [];
+    dependencies = ["vim-misc"];
 
   };
 
-  vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2017-11-02";
+  vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-misc-2015-05-21";
     src = fetchgit {
-      url = "git://github.com/honza/vim-snippets";
-      rev = "a7670a7b71e44fd93e0b97fe2c24739a20732f94";
-      sha256 = "0bm4475x723bk9q6snl5d804pn3vvsk0p9bvgil6c0q24ams6abh";
+      url = "https://github.com/xolox/vim-misc";
+      rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b";
+      sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi";
     };
     dependencies = [];
 
   };
 
-  vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2017-10-13";
+  vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-latex-live-preview-2017-11-09";
     src = fetchgit {
-      url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8";
-      sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m";
+      url = "https://github.com/xuhdev/vim-latex-live-preview";
+      rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624";
+      sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy";
     };
     dependencies = [];
 
   };
 
-  vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim2hs-2014-04-16";
+  nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "nim-vim-2018-02-27";
     src = fetchgit {
-      url = "git://github.com/dag/vim2hs";
-      rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
-      sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b";
+      url = "https://github.com/zah/nim.vim";
+      rev = "bdc19809d22190d9b8e85377252a24d930cd25f8";
+      sha256 = "08abwnzim767jvin6jsp2a580hpxzb2w5hbf8w5dhkvxv2pgk0vz";
     };
     dependencies = [];
 
   };
 
-  vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2017-11-04";
+  deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "deoplete-go-2018-02-04";
     src = fetchgit {
-      url = "git://github.com/vimwiki/vimwiki";
-      rev = "7c2ae8a714a71956297cb291dbaefb6a0ce47da3";
-      sha256 = "1sis3g7v5ck9gan3x6i64kdfmn6r40zvxp2jyw0qxaha1kfb1qa1";
+      url = "https://github.com/zchee/deoplete-go";
+      rev = "513ae17f1bd33954da80059a21c128a315726a81";
+      sha256 = "0rfxzryccrq3dnjgb9aljzrmfjk7p8l2qdjkl8ar4bh2hmz8vn5y";
     };
     dependencies = [];
-
+    buildInputs = [ python3 ];
+    buildPhase = ''
+      pushd ./rplugin/python3/deoplete/ujson
+      python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
+      popd
+      find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \;
+    '';
   };
 
-  vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vinegar-2017-06-27";
+  deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "deoplete-jedi-2018-04-07";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-vinegar";
-      rev = "c795cb739347cbddeeb288c3c35da9f140a513c9";
-      sha256 = "1dcirb0b73s2l14ppn8mlh79pjpf9kgym9im05039ynr9rl83fv3";
+      url = "https://github.com/zchee/deoplete-jedi";
+      rev = "eb777b50b7d218a23464c7d58c8573b5223d52f4";
+      sha256 = "1j2jfvgzj2y7pp8z441rs8ffbn1hmiwa7h556kf6mjlmyzs5cfma";
     };
     dependencies = [];
 
   };
 
-  vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2017-06-08";
+  zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "zig-vim-2018-04-15";
     src = fetchgit {
-      url = "git://github.com/gmarik/vundle";
-      rev = "6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87";
-      sha256 = "13k194g0rs5hz7ci0ys4gml71jily5hdd0yljzmmn8qjiq88v6p4";
+      url = "https://github.com/zig-lang/zig.vim";
+      rev = "eba14b79890b674432a78291ff0f16de4da2ed08";
+      sha256 = "1yj7gijwbsc1vrxlb158pf083ahrpgg5g7j3gjrkrazdcmmx5d2j";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch b/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch
new file mode 100644
index 0000000000000000000000000000000000000000..72c928d1a9711a348b0fa1fb8dd60d02cd7b129b
--- /dev/null
+++ b/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch
@@ -0,0 +1,11 @@
+--- vim-grammarous-51ef519.org/autoload/grammarous.vim	1970-01-01 01:00:01.000000000 +0100
++++ vim-grammarous-51ef519/autoload/grammarous.vim	2017-11-21 16:33:27.473403322 +0000
+@@ -22,7 +22,7 @@
+ let g:grammarous#enable_spell_check              = get(g:, 'grammarous#enable_spell_check', 0)
+ let g:grammarous#move_to_first_error             = get(g:, 'grammarous#move_to_first_error', 1)
+ let g:grammarous#hooks                           = get(g:, 'grammarous#hooks', {})
+-let g:grammarous#languagetool_cmd                = get(g:, 'grammarous#languagetool_cmd', '')
++let g:grammarous#languagetool_cmd                = get(g:, 'grammarous#languagetool_cmd', '@languagetool@/bin/languagetool-commandline')
+ let g:grammarous#show_first_error                = get(g:, 'grammarous#show_first_error', 0)
+ 
+ highlight default link GrammarousError SpellBad
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index dd5cc1ba1007549eb9ca50ba10bd28724c4899ad..fcc4fcaa76f4cb5e3d03992d7863543eb92f1ee1 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,72 +1,82 @@
-"CSApprox"
-"CheckAttach"
-"Gist"
-"Hoogle"
-"Solarized"
-"Supertab"
-"Syntastic"
-"Tabular"
-"Tagbar"
-"The_NERD_Commenter"
-"The_NERD_tree"
-"UltiSnips"
-"VimOutliner"
-"WebAPI"
-"YankRing"
-"clang_complete"
-"commentary"
-"ctrlp-cmatcher"
-"ctrlp-py-matcher"
-"ctrlp-z"
-"extradite"
-"fugitive"
-"ghcmod"
 "github:907th/vim-auto-save"
-"github:Chiel92/vim-autoformat"
-"github:LnL7/vim-nix"
-"github:Quramy/tsuquyomi"
-"github:Shougo/deoplete.nvim"
+"github:airblade/vim-gitgutter"
 "github:ajh17/Spacegray.vim"
 "github:albfan/nerdtree-git-plugin"
+"github:altercation/vim-colors-solarized"
 "github:alvan/vim-closetag"
+"github:amiorin/ctrlp-z"
+"github:andreshazard/vim-logreview"
+"github:andsild/peskcolor.vim.git"
 "github:andviro/flake8-vim"
 "github:ap/vim-css-color"
-"github:autozimu/LanguageClient-neovim"
+"github:bazelbuild/vim-bazel"
 "github:bbchung/clighter8"
 "github:benekastah/neomake"
 "github:bitc/vim-hdevtools"
 "github:bronson/vim-trailing-whitespace"
+"github:cespare/vim-toml"
+"github:chemzqm/denite-extra"
+"github:chemzqm/denite-git"
+"github:Chiel92/vim-autoformat"
+"github:chikatoike/concealedyank.vim"
+"github:chikatoike/sourcemap.vim"
+"github:chrisbra/CheckAttach"
+"github:chrisbra/csv.vim"
+"github:chrisgeo/sparkup"
 "github:christoomey/vim-sort-motion"
 "github:christoomey/vim-tmux-navigator"
 "github:ctjhoa/spacevim"
 "github:ctrlpvim/ctrlp.vim"
+"github:dag/vim2hs"
+"github:dannyob/quickfixstatus"
 "github:derekelkins/agda-vim"
 "github:derekwyatt/vim-scala"
+"github:dhruvasagar/vim-table-mode"
 "github:digitaltoad/vim-jade"
 "github:dleonard0/pony-vim-syntax"
 "github:dracula/vim"
 "github:drmingdrmer/xptemplate"
+"github:eagletmt/ghcmod-vim"
 "github:eagletmt/neco-ghc"
 "github:editorconfig/editorconfig-vim"
+"github:ehamberg/vim-cute-python.git"
 "github:eikenb/acp"
 "github:elixir-lang/vim-elixir"
 "github:elmcast/elm-vim"
+"github:elzr/vim-json"
 "github:embear/vim-localvimrc"
 "github:enomsg/vim-haskellConcealPlus"
 "github:ensime/ensime-vim"
+"github:ervandew/supertab"
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"
+"github:FelikZ/ctrlp-py-matcher"
 "github:flazz/vim-colorschemes"
 "github:floobits/floobits-neovim"
 "github:frigoeu/psc-ide-vim"
+"github:garbas/vim-snipmate"
+"github:gmarik/vundle"
+"github:godlygeek/csapprox"
+"github:godlygeek/tabular"
+"github:google/vim-codefmt"
 "github:google/vim-jsonnet"
+"github:google/vim-maktaba"
+"github:gregsexton/gitv"
+"github:guns/xterm-color-table.vim"
 "github:heavenshell/vim-jsdoc"
 "github:hecal3/vim-leader-guide"
+"github:honza/vim-snippets"
 "github:idris-hackers/idris-vim"
+"github:inkarkat/vim-SyntaxRange"
+"github:int3/vim-extradite"
 "github:itchyny/calendar.vim"
 "github:itchyny/lightline.vim"
 "github:itchyny/thumbnail.vim"
+"github:itchyny/vim-cursorword"
+"github:itchyny/vim-gitbranch"
 "github:ivanov/vim-ipython"
+"github:janko-m/vim-test.git"
+"github:JazzCore/ctrlp-cmatcher"
 "github:jceb/vim-hier"
 "github:jceb/vim-orgmode"
 "github:jeetsukumaran/vim-buffergator"
@@ -77,139 +87,189 @@
 "github:jnurmine/zenburn"
 "github:jonbri/vim-colorstepper"
 "github:joonty/vim-xdebug"
+"github:JuliaEditorSupport/julia-vim"
 "github:junegunn/fzf.vim"
+"github:junegunn/goyo.vim"
 "github:junegunn/limelight.vim"
+"github:junegunn/vim-easy-align"
+"github:junegunn/vim-github-dashboard"
 "github:junegunn/vim-peekaboo"
 "github:justincampbell/vim-eighties"
+"github:KabbAmine/zeavim.vim"
+"github:kana/vim-niceblock"
+"github:kana/vim-operator-replace"
+"github:kana/vim-operator-user"
+"github:kana/vim-tabpagecd"
+"github:kchmck/vim-coffee-script"
+"github:kien/rainbow_parentheses.vim"
+"github:kshenoy/vim-signature"
+"github:lambdalisue/vim-gista"
 "github:latex-box-team/latex-box"
 "github:leafgarland/typescript-vim"
 "github:lepture/vim-jinja"
 "github:lervag/vimtex"
+"github:lfilho/cosco.vim"
+"github:LnL7/vim-nix"
 "github:lokaltog/vim-easymotion"
 "github:ludovicchabant/vim-lawrencium"
 "github:luochen1990/rainbow"
 "github:lyokha/vim-xkbswitch"
 "github:machakann/vim-highlightedyank"
+"github:majutsushi/tagbar"
+"github:maksimr/vim-jsbeautify"
+"github:MarcWeber/vim-addon-actions"
+"github:MarcWeber/vim-addon-async"
+"github:MarcWeber/vim-addon-background-cmd"
+"github:MarcWeber/vim-addon-commenting"
+"github:MarcWeber/vim-addon-completion"
+"github:MarcWeber/vim-addon-errorformats"
+"github:MarcWeber/vim-addon-goto-thing-at-cursor"
+"github:MarcWeber/vim-addon-local-vimrc"
+"github:MarcWeber/vim-addon-manager"
+"github:MarcWeber/vim-addon-mru"
+"github:MarcWeber/vim-addon-mw-utils"
+"github:MarcWeber/vim-addon-nix"
+"github:MarcWeber/vim-addon-other"
+"github:MarcWeber/vim-addon-php-manual"
+"github:MarcWeber/vim-addon-signs"
+"github:MarcWeber/vim-addon-sql"
+"github:MarcWeber/vim-addon-syntax-checker"
+"github:MarcWeber/vim-addon-toggle-buffer"
+"github:MarcWeber/vim-addon-xdebug"
 "github:martinda/Jenkinsfile-vim-syntax"
+"github:mattn/gist-vim"
+"github:mattn/webapi-vim"
+"github:mbbill/undotree"
 "github:megaannum/forms"
 "github:megaannum/self"
 "github:mfukar/robotframework-vim"
+"github:mhinz/vim-grepper.git"
+"github:mhinz/vim-signify"
 "github:mhinz/vim-startify"
 "github:michaeljsmith/vim-indent-object"
 "github:mileszs/ack.vim"
 "github:mindriot101/vim-yapf"
 "github:mkasa/lushtags"
+"github:morhetz/gruvbox"
 "github:mpickering/hlint-refactor-vim"
 "github:nathanaelkane/vim-indent-guides"
 "github:nbouscal/vim-stylish-haskell"
+"github:neoclide/vim-easygit"
 "github:neovimhaskell/haskell-vim"
 "github:nixprime/cpsm"
+"github:noc7c9/vim-iced-coffee-script"
 "github:osyo-manga/shabadou.vim"
+"github:osyo-manga/vim-textobj-multiblock"
 "github:osyo-manga/vim-watchdogs"
+"github:pangloss/vim-javascript"
 "github:plasticboy/vim-markdown"
 "github:python-mode/python-mode"
+"github:Quramy/tsuquyomi"
 "github:racer-rust/vim-racer"
 "github:raichoo/purescript-vim"
+"github:reedes/vim-pencil"
+"github:reedes/vim-wordy"
+"github:rhysd/committia.vim.git"
 "github:rhysd/vim-grammarous"
+"github:rhysd/vim-operator-surround"
+"github:Rip-Rip/clang_complete"
 "github:rodjek/vim-puppet"
-"github:roxma/nvim-completion-manager"
 "github:roxma/nvim-cm-racer"
-"github:ryanoasis/vim-devicons"
+"github:roxma/nvim-completion-manager"
 "github:rust-lang/rust.vim"
+"github:ryanoasis/vim-devicons"
+"github:ryanoasis/vim-devicons"
+"github:Rykka/riv.vim"
 "github:sbdchd/neoformat"
+"github:scrooloose/nerdcommenter"
+"github:scrooloose/nerdtree"
+"github:scrooloose/syntastic"
 "github:sebastianmarkow/deoplete-rust"
 "github:sheerun/vim-polyglot"
+"github:shougo/context_filetype.vim"
+"github:shougo/denite.nvim"
+"github:Shougo/deoplete.nvim"
+"github:shougo/echodoc.vim"
+"github:shougo/neco-syntax"
 "github:shougo/neco-vim"
 "github:shougo/neocomplete.vim"
+"github:shougo/neoinclude.vim"
+"github:shougo/neomru.vim"
 "github:shougo/neosnippet-snippets"
 "github:shougo/neosnippet.vim"
+"github:shougo/neoyank.vim.git"
+"github:shougo/tabpagebuffer.vim"
 "github:shougo/unite.vim"
 "github:shougo/vimproc.vim"
 "github:shougo/vimshell.vim"
+"github:SirVer/ultisnips"
 "github:sjl/gundo.vim"
 "github:slashmili/alchemist.vim"
+"github:t9md/vim-smalls"
 "github:takac/vim-hardtime"
 "github:terryma/vim-expand-region"
+"github:terryma/vim-multiple-cursors"
 "github:tex/vimpreviewpandoc"
+"github:thinca/vim-ft-diff_fold"
+"github:thinca/vim-prettyprint"
 "github:thinca/vim-quickrun"
+"github:thinca/vim-scouter"
+"github:thinca/vim-themis"
 "github:tomasr/molokai"
+"github:tomlion/vim-solidity"
+"github:tomtom/tlib_vim"
+"github:tpope/vim-commentary"
 "github:tpope/vim-dispatch"
 "github:tpope/vim-eunuch"
+"github:tpope/vim-fugitive"
+"github:tpope/vim-pathogen"
 "github:tpope/vim-repeat"
+"github:tpope/vim-rhubarb"
+"github:tpope/vim-sensible"
+"github:tpope/vim-sleuth"
 "github:tpope/vim-speeddating"
+"github:tpope/vim-surround"
+"github:tpope/vim-vinegar"
 "github:travitch/hasksyn"
 "github:twinside/vim-haskellconceal"
+"github:Twinside/vim-hoogle"
+"github:tyru/caw.vim"
+"github:tyru/open-browser.vim"
+"github:ujihisa/neco-look"
 "github:valloric/youcompleteme"
+"github:vim-airline/vim-airline"
 "github:vim-airline/vim-airline-themes"
+"github:vimoutliner/vimoutliner"
 "github:vim-pandoc/vim-pandoc"
 "github:vim-pandoc/vim-pandoc-after"
 "github:vim-pandoc/vim-pandoc-syntax"
-"github:vim-scripts/Colour-Sampler-Pack"
-"github:vim-scripts/Rename"
-"github:vim-scripts/ReplaceWithRegister"
-"github:vim-scripts/a.vim"
+"github:vim-ruby/vim-ruby"
 "github:vim-scripts/align"
 "github:vim-scripts/argtextobj.vim"
+"github:vim-scripts/a.vim"
+"github:vim-scripts/bats.vim"
 "github:vim-scripts/changeColorScheme.vim"
+"github:vim-scripts/Colour-Sampler-Pack"
+"github:vim-scripts/Improved-AnsiEsc"
+"github:vim-scripts/matchit.zip"
+"github:vim-scripts/mayansmoke.git"
 "github:vim-scripts/random.vim"
+"github:vim-scripts/Rename"
+"github:vim-scripts/ReplaceWithRegister"
 "github:vim-scripts/tabmerge"
+"github:vim-scripts/taglist.vim"
 "github:vim-scripts/wombat256.vim"
+"github:vim-scripts/YankRing.vim"
+"github:vimwiki/vimwiki"
 "github:w0rp/ale"
 "github:wakatime/vim-wakatime"
+"github:wellle/targets.vim"
+"github:will133/vim-dirdiff"
 "github:wincent/command-t"
 "github:xolox/vim-easytags"
 "github:xolox/vim-misc"
+"github:xuhdev/vim-latex-live-preview"
 "github:zah/nim.vim"
 "github:zchee/deoplete-go"
 "github:zchee/deoplete-jedi"
 "github:zig-lang/zig.vim"
-"goyo"
-"gruvbox"
-"matchit.zip"
-"pathogen"
-"quickfixstatus"
-"rainbow_parentheses"
-"sensible"
-"sleuth"
-"snipmate"
-"sourcemap"
-"surround"
-"table-mode"
-"taglist"
-"tlib"
-"undotree"
-"vim-addon-actions"
-"vim-addon-async"
-"vim-addon-background-cmd"
-"vim-addon-commenting"
-"vim-addon-completion"
-"vim-addon-errorformats"
-"vim-addon-goto-thing-at-cursor"
-"vim-addon-local-vimrc"
-"vim-addon-manager"
-"vim-addon-mru"
-"vim-addon-mw-utils"
-"vim-addon-nix"
-"vim-addon-other"
-"vim-addon-php-manual"
-"vim-addon-signs"
-"vim-addon-sql"
-"vim-addon-syntax-checker"
-"vim-addon-toggle-buffer"
-"vim-addon-xdebug"
-"vim-airline"
-"vim-coffee-script"
-"vim-easy-align"
-"vim-gista"
-"vim-gitgutter"
-"vim-iced-coffee-script"
-"vim-latex-live-preview"
-"vim-multiple-cursors"
-"vim-signature"
-"vim-signify"
-"vim-snippets"
-"vim-webdevicons"
-"vim2hs"
-"vimwiki"
-"vinegar"
-"vundle"
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 23749fd4ce60241a531d81a4d9f2f28a8b15ee1b..e11419846aeb8a600cd07d9732237fe919413d47 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -325,11 +325,14 @@ rec {
 
   # add a customize option to a vim derivation
   makeCustomizable = vim: vim // {
-    customize = {name, vimrcConfig}: vimWithRC {
+    customize = { name, vimrcConfig }: vimWithRC {
       vimExecutable = "${vim}/bin/vim";
       inherit name;
       vimrcFile = vimrcFile vimrcConfig;
     };
+
+    override = f: makeCustomizable (vim.override f);
+    overrideAttrs = f: makeCustomizable (vim.overrideAttrs f);
   };
 
   pluginnames2Nix = {name, namefiles} : vim_configurable.customize {
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm
index ea360765925b2d4bccd73af0a6fc183b2e2d5d77..c3a210a642d2ef7d68edb96baed4971ba0e1167d 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm
@@ -4,6 +4,7 @@
       cmake
       boost
       icu
+      ncurses
     ];
     buildPhase = ''
       patchShebangs .
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip
deleted file mode 100644
index cc9d3fb726406bea979bb89452f355ad08821652..0000000000000000000000000000000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip
+++ /dev/null
@@ -1,7 +0,0 @@
-    unpackPhase = ''
-      (
-       sourceRoot=d
-       mkdir $sourceRoot; cd $sourceRoot;
-       unzip $src
-      )
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous
new file mode 100644
index 0000000000000000000000000000000000000000..66a91b619d16d5ecd10402cf95291b4e68668b9d
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous
@@ -0,0 +1,10 @@
+    # use `:GrammarousCheck` to initialize checking
+    # In neovim, you also want to use set
+    #   let g:grammarous#show_first_error = 1
+    # see https://github.com/rhysd/vim-grammarous/issues/39
+    patches = [
+      (substituteAll {
+        src = ./patches/vim-grammarous/set_default_languagetool.patch;
+        inherit languagetool;
+      })
+    ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf
index 63b54b22e0e079e6f820587ea70633a494b1206d..c1eb9efefc36abbe74155dd9e5fc934a184b6541 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf
@@ -1,4 +1,4 @@
     buildPhase = ''
       substituteInPlace ftplugin/python_yapf.vim \
-        --replace '"yapf"' '"${pkgs.yapf}/bin/yapf"'
+        --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
     '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
index 89a96133fba5ada405687d530addb8aea45b627e..0ddbeaae6be1cf8ce04c3f44e9042964ec75deaa 100644
--- a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
+++ b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
@@ -109,7 +109,7 @@ fun! nix#NixDerivation(opts, name, repository) abort
           \ '    buildInputs = [ unzip ];',
           \ '    dependencies = ['.join(map(copy(dependencies), "'\"'.nix#ToNixAttrName(v:val).'\"'")).'];',
           \ '    meta = {',
-          \ '       url = "http://www.vim.org/scripts/script.php?script_id='.a:repository.vim_script_nr.'";',
+          \ '       homepage = "http://www.vim.org/scripts/script.php?script_id='.a:repository.vim_script_nr.'";',
           \ '    };',
           \ addon_info == {} ? '' : ('    addon_info = '.nix#ToNix(string(addon_info), [], "").';'),
           \ additional_nix_code,
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index 87c782222fc519f2c85bcfe9017fc3d401103afc..c537aa8a1f92da6abfdace84d8d1c28b6a32a6a8 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -120,9 +120,9 @@ vscode-utils.buildVscodeMarketplaceExtension {
 
     meta = with stdenv.lib; {
       license = licenses.unfree;
-      maintainer = [ maintainers.jraygauthier ];
+      maintainers = [ maintainers.jraygauthier ];
       # A 32 bit linux would also be possible with some effort (specific download of binaries + 
       # patching of the elf files with 32 bit interpreter).
       platforms = [ "x86_64-linux" ];
     };
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 8047e29ad5589880c8d468d49c1c9c8b46347159..16ddb8fd40527cbfbe9163b2761ff0c7784fcfd3 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,7 +1,8 @@
 { stdenv, lib, fetchurl, callPackage, vscode-utils }:
 
 let
-  inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension;
+  inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension
+      extensionFromVscodeMarketplace;
 in
 #
 # Unless there is a good reason not to, we attemp to use the same name as the 
@@ -24,4 +25,6 @@ rec {
   };
 
   ms-vscode.cpptools = callPackage ./cpptools {};
+  
+  ms-python.python = callPackage ./python {};
 }
\ No newline at end of file
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..430ce192ed0da0a95febf2f267489d8d98bedb77
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, lib, vscode-utils
+
+, pythonUseFixed ? false, python  # When `true`, the python default setting will be fixed to specified. 
+                                  # Use version from `PATH` for default setting otherwise.
+                                  # Defaults to `false` as we expect it to be project specific most of the time.
+, ctagsUseFixed ? true, ctags     # When `true`, the ctags default setting will be fixed to specified. 
+                                  # Use version from `PATH` for default setting otherwise.
+                                  # Defaults to `true` as usually not defined on a per projet basis.
+}:
+
+assert pythonUseFixed -> null != python;
+assert ctagsUseFixed -> null != ctags;
+
+let
+  pythonDefaultsTo = if pythonUseFixed then "${python}/bin/python" else "python";
+  ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags";
+in
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "python";
+    publisher = "ms-python";
+    version = "0.8.0";
+    sha256 = "0i7s93l5g5lyi6vn77zh3ipj0p267y17fayv6vjrxc2igrs27ik6";
+  };
+
+  postPatch = ''
+    # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`.
+    substituteInPlace "./package.json" \
+      --replace "\"default\": \"python\"" "\"default\": \"${pythonDefaultsTo}\""
+
+    # Patch `packages.json` so that nix's *ctags* is used as default value for `python.workspaceSymbols.ctagsPath`.
+    substituteInPlace "./package.json" \
+      --replace "\"default\": \"ctags\"" "\"default\": \"${ctagsDefaultsTo}\""
+  '';
+
+    meta = with lib; {
+      license = licenses.mit;
+      maintainers = [ maintainers.jraygauthier ];
+    };
+}
diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix
index f6e906ab575b37a993c26715c797945d33758203..4c095278f9185882f3a940ed8a88631f9853fc5d 100644
--- a/pkgs/misc/vscode-extensions/vscode-utils.nix
+++ b/pkgs/misc/vscode-extensions/vscode-utils.nix
@@ -37,7 +37,7 @@ let
 
     installPhase = ''
       mkdir -p "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}"
-      find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/"
+      find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/"
     '';
 
   });
@@ -70,12 +70,14 @@ let
       mktplcRef = ext; 
     }); 
 
+  extensionFromVscodeMarketplace = mktplcExtRefToExtDrv;
   extensionsFromVscodeMarketplace = mktplcExtRefList:
-    builtins.map mktplcExtRefToExtDrv mktplcExtRefList;
+    builtins.map extensionFromVscodeMarketplace mktplcExtRefList;
 
 in
 
 {
   inherit fetchVsixFromVscodeMarketplace buildVscodeExtension 
-          buildVscodeMarketplaceExtension extensionsFromVscodeMarketplace;
+          buildVscodeMarketplaceExtension extensionFromVscodeMarketplace
+          extensionsFromVscodeMarketplace;
 }
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..aa73c7f86c405f5a2e1f690cb3fe9d6a7bace95c
--- /dev/null
+++ b/pkgs/os-specific/darwin/CoreSymbolication/default.nix
@@ -0,0 +1,19 @@
+{ fetchFromGitHub, stdenv }:
+
+# Reverse engineered CoreSymbolication to make dtrace buildable
+
+stdenv.mkDerivation rec {
+  name = "CoreSymbolication";
+
+  src = fetchFromGitHub {
+    repo = name;
+    owner = "matthewbauer";
+    rev = "671fcb66c82eac1827f3f53dc4cc4e9b1b94da0a";
+    sha256 = "0qpw46gwgjxiwqqjxksb8yghp2q8dwad6hzaf4zl82xpvk9n5ahj";
+  };
+
+  installPhase = ''
+    mkdir -p $out/include
+    cp -r CoreSymbolication $out/include
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 9a6624104f455f5359ce48484538847e3e58f2b1..7f6f0cdd0c4823f09b3fdab00fbc78a7f3da42d6 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -198,23 +198,36 @@ in rec {
   };
 
   overrides = super: {
-    QuartzCore = stdenv.lib.overrideDerivation super.QuartzCore (drv: {
-      installPhase = drv.installPhase + ''
-        f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h"
-        substituteInPlace "$f" \
-          --replace "QuartzCore/../Frameworks/CoreImage.framework/Headers" "CoreImage"
-      '';
+    AppKit = stdenv.lib.overrideDerivation super.AppKit (drv: {
+      __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [
+        "/System/Library/PrivateFrameworks/"
+      ];
     });
 
-    CoreServices = stdenv.lib.overrideDerivation super.CoreServices (drv: {
-      __propagatedSandboxProfile = drv.__propagatedSandboxProfile ++ [''
-        (allow mach-lookup (global-name "com.apple.CoreServices.coreservicesd"))
-      ''];
+    CoreMedia = stdenv.lib.overrideDerivation super.CoreMedia (drv: {
+      __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [
+        "/System/Library/Frameworks/CoreImage.framework"
+      ];
+    });
+
+    CoreMIDI = stdenv.lib.overrideDerivation super.CoreMIDI (drv: {
+      __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [
+        "/System/Library/PrivateFrameworks/"
+      ];
+      setupHook = ./private-frameworks-setup-hook.sh;
     });
 
     Security = stdenv.lib.overrideDerivation super.Security (drv: {
       setupHook = ./security-setup-hook.sh;
     });
+
+    QuartzCore = stdenv.lib.overrideDerivation super.QuartzCore (drv: {
+      installPhase = drv.installPhase + ''
+        f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h"
+        substituteInPlace "$f" \
+          --replace "QuartzCore/../Frameworks/CoreImage.framework/Headers" "CoreImage"
+      '';
+    });
   };
 
   bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix {
diff --git a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
index 04d8e878f4f768e0e104b7372fbb536644532887..b0d5915fc1fcf3360fb9668456d2eedd396fa4f8 100644
--- a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
+++ b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
@@ -39,4 +39,4 @@ useSystemCoreFoundationFramework () {
   export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks
 }
 
-envHooks+=(useSystemCoreFoundationFramework)
+addEnvHooks "$hostOffset" useSystemCoreFoundationFramework
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 081f713d054937534b9a43a020bfdaeb1555aa1a..f8c424089f090a57f42ccdc9f0c60306f81a689b 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -14,7 +14,6 @@ with frameworks; with libs; {
   AppKitScripting         = [];
   AppleScriptKit          = [];
   AppleScriptObjC         = [];
-  AppleShareClientCore    = [ CoreServices ];
   AudioToolbox            = [ AudioUnit CoreAudio CF CoreMIDI ];
   AudioUnit               = [ Carbon CoreAudio CF ];
   AudioVideoBridging      = [ Foundation ];
@@ -84,12 +83,10 @@ with frameworks; with libs; {
   PCSC                    = [ CoreData ];
   PreferencePanes         = [];
   PubSub                  = [];
-  Python                  = [ ApplicationServices ];
   QTKit                   = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ];
   QuickLook               = [ ApplicationServices CF ];
   QuickTime               = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
   Ruby                    = [];
-  RubyCocoa               = [];
   SceneKit                = [];
   ScreenSaver             = [];
   Scripting               = [];
@@ -105,11 +102,9 @@ with frameworks; with libs; {
   SystemConfiguration     = [ CF Security ];
   TWAIN                   = [ Carbon ];
   Tcl                     = [];
-  Tk                      = [ ApplicationServices Carbon X11 ];
   VideoDecodeAcceleration = [ CF CoreVideo ];
   VideoToolbox            = [ CF CoreMedia CoreVideo ];
   WebKit                  = [ ApplicationServices Carbon JavaScriptCore OpenGL ];
-  X11                     = []; # used by Tk, should this exist?
 
   # Umbrellas
   Accelerate          = [ CoreWLAN IOBluetooth ];
diff --git a/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh
new file mode 100644
index 0000000000000000000000000000000000000000..fbd977f8552d01adf1b95d03d930fb2b82d28679
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh
@@ -0,0 +1,8 @@
+addPrivateFrameworks() {
+    flag="-F/System/Library/PrivateFrameworks"
+    if [[ "$NIX_CFLAGS_COMPILE" != *$flag* ]]; then
+        NIX_CFLAGS_COMPILE+=" $flag"
+    fi
+}
+
+addEnvHooks "$hostOffset" addPrivateFrameworks
diff --git a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh
index f31adaa0d74410045fd97bd667f7e8a29f97572c..ed9bdbd912db14b87c71207f4b58b868050971f7 100644
--- a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh
+++ b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh
@@ -7,4 +7,4 @@ noDeprecatedDeclarations() {
   fi
 }
 
-envHooks+=(noDeprecatedDeclarations)
+addEnvHooks "$hostOffset" noDeprecatedDeclarations
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
index 8dcf28a59094a7bfb0aa366d235e49392a5e42c9..7fd32a64fe5753909b72cdfe603c4e07bcee8890 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
@@ -1,25 +1,23 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  postUnpack = ''
-    substituteInPlace $sourceRoot/Makefile \
-      --replace "/usr/lib" "/lib" \
-      --replace "/usr/local/lib" "/lib" \
-      --replace "/usr/bin" "" \
-      --replace "/bin/" "" \
+  prePatch = ''
+    substituteInPlace Makefile \
+      --replace /usr/lib /lib \
+      --replace /usr/local/lib /lib \
+      --replace /usr/bin "" \
+      --replace /bin/ "" \
       --replace "CC = " "CC = cc #" \
-      --replace "SDK_DIR = " "SDK_DIR = . #"
-  '';
-
-  # Mac OS didn't support rpaths back before 10.5, and this package intentionally builds stubs targeting versions prior to that
-  NIX_DONT_SET_RPATH = "1";
-  NIX_NO_SELF_RPATH  = "1";
+      --replace "SDK_DIR = " "SDK_DIR = . #" \
 
-  installPhase = ''
-    export DSTROOT=$out
-    make install
+    # Mac OS didn't support rpaths back before 10.5, but we don't care about it.
+    substituteInPlace Makefile \
+      --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.6 \
+      --replace -mmacosx-version-min=10.5 -mmacosx-version-min=10.6
   '';
 
+  installFlags = [ "DSTROOT=$(out)" ];
+
   meta = with stdenv.lib; {
     description = "Apple's common startup stubs for darwin";
     maintainers = with maintainers; [ copumpkin ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch b/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch
new file mode 100644
index 0000000000000000000000000000000000000000..fd9df8129407b2de934b8b9a7b47cf4e2e93a394
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch
@@ -0,0 +1,22 @@
+diff --git a/icuSources/i18n/ucoleitr.cpp b/icuSources/i18n/ucoleitr.cpp
+index ecc94c9..936452f 100644
+--- a/icuSources/i18n/ucoleitr.cpp
++++ b/icuSources/i18n/ucoleitr.cpp
+@@ -320,7 +320,7 @@ ucol_nextProcessed(UCollationElements *elems,
+                    int32_t            *ixHigh,
+                    UErrorCode         *status)
+ {
+-    return (UCollationPCE::UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status);
++    return (UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status);
+ }
+ 
+ 
+@@ -384,7 +384,7 @@ ucol_previousProcessed(UCollationElements *elems,
+                    int32_t            *ixHigh,
+                    UErrorCode         *status)
+ {
+-    return (UCollationPCE::UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status);
++    return (UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status);
+ }
+ 
+ U_NAMESPACE_BEGIN
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
index 2d098418f030df0b8329fa6d90f95e4ede6aa53a..eef26f4b79a6bcaa2cb412ac15d6c1ac03b62d5e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -3,6 +3,8 @@
 appleDerivation {
   nativeBuildInputs = [ cctools ];
 
+  patches = [ ./clang-5.patch ];
+
   postPatch = ''
     substituteInPlace makefile \
       --replace /usr/bin/ "" \
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 3d7e59f15547273c01349c0ce5a0fcde08644272..28406c9751dc5f3ad1f99821b34d58567146864c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -23,7 +23,7 @@ appleDerivation rec {
       (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
     done
 
-    (cd ${cctools}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o)
+    (cd ${cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o)
 
     cat < $out/include/TargetConditionals.h
     #ifndef __TARGETCONDITIONALS__
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
index ed76787a9008c61eac67447122d9086f1b4fc55e..000af8ad7b745275ab40f65330a99ad1b74596e0 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
@@ -451,7 +451,6 @@ _host_statistics
 _host_statistics64
 _host_swap_exception_ports
 _host_virtual_physical_table_info
-_host_zone_info
 _i386_get_ldt
 _i386_set_ldt
 _important_boost_assertion_token
diff --git a/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1cb85b1e988498ba792cebc0bdc53dbb58eea19b
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, appleDerivation, xcbuild, gnumake, Security
+, libsecurity_utilities, libsecurity_cdsa_utilities }:
+
+appleDerivation {
+  buildInputs = [ xcbuild libsecurity_utilities libsecurity_cdsa_utilities ];
+
+  DSTROOT = "$out";
+
+  NIX_CFLAGS_COMPILE = "-I.";
+  preBuild = ''
+    mkdir -p Security
+    cp ${Security}/Library/Frameworks/Security.framework/Headers/*.h Security
+  '';
+
+  patchPhase = ''
+    substituteInPlace SmartCardServices.xcodeproj/project.pbxproj \
+      --replace "/usr/bin/gnumake" "${gnumake}/bin/make"
+    substituteInPlace src/PCSC/PCSC.exp \
+      --replace _PCSCVersionString "" \
+      --replace _PCSCVersionNumber ""
+    substituteInPlace Makefile.installPhase \
+      --replace chown "# chown" \
+      --replace /usr/bin/ ""
+  '';
+
+  installPhase = ''
+    make -f Makefile.installPhase install
+    make -f Makefile-exec.installPhase install
+    mv $out/usr/* $out
+    rmdir $out/usr
+
+    mkdir -p $out/Library/Frameworks
+    cp -r Products/Release/PCSC.bundle $out/Library/Frameworks/PCSC.framework
+  '';
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ matthewbauer ];
+    platforms   = platforms.darwin;
+    license     = licenses.apsl20;
+  };
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
index a3d4099399b31b9be51edb4de82dc758382cf3a4..dcfb4aefe1f5ddba542b516898a4c595c49f5b18 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
@@ -27,14 +27,14 @@ appleDerivation {
                 | grep -v -e Desktop -e Embedded -e mklocale -e colldef)
 
     for i in $targets; do
-      xcodebuild -target $i
+      xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates -target $i
     done
   '';
 
   # temporary install phase until xcodebuild has "install" support
   installPhase = ''
     mkdir -p $out/bin/
-    install adv_cmds-*/Build/Products/Release/* $out/bin/
+    install Products/Release/* $out/bin/
 
     for n in 1 8; do
       mkdir -p $out/share/man/man$n
diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
index 9e8b78e57d6c8d148f75f62693d1e4ea6662fca9..b52ec3306dc42274d3e16a86e08b5751701770ec 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
@@ -14,7 +14,7 @@ appleDerivation rec {
   # temporary install phase until xcodebuild has "install" support
   installPhase = ''
     mkdir -p $out/bin/
-    install basic_cmds-*/Build/Products/Release/* $out/bin/
+    install Products/Release/* $out/bin/
 
     for n in 1; do
       mkdir -p $out/share/man/man$n
diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
index 2b31b04204024300ce1d87c32b55587732a652bb..20168d24dd712e6fd41536d9326e13cd9b24d7e3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
@@ -8,10 +8,6 @@ appleDerivation {
 
   propagatedBuildInputs = [ Security ];
 
-  propagatedSandboxProfile = ''
-    (allow mach-lookup (global-name "com.apple.SystemConfiguration.configd"))
-  '';
-
   patchPhase = ''
     HACK=$PWD/hack
     mkdir $HACK
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 478f9e7e303f67bfc9631cc36f2cbfb32ad745bc..3120d8ae3d10ed30770607ccf50ae0c41bfb9b7c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -7,6 +7,7 @@ let
   # now it's staying here.
   versions = {
     "osx-10.11.6" = {
+      SmartCardServices = "55111";
       dtrace        = "168";
       xnu           = "3248.60.10";
       libpthread    = "138.10.4";
@@ -43,6 +44,9 @@ let
       file_cmds     = "264.1.1";
       shell_cmds    = "187";
       system_cmds   = "550.6";
+      diskdev_cmds   = "593";
+      top           = "108";
+      text_cmds     = "99";
     };
     "osx-10.11.5" = {
       Libc          = "1082.50.1"; # 10.11.6 still unreleased :/
@@ -53,6 +57,7 @@ let
       ICU           = "531.48";
       libdispatch   = "442.1.4";
       Security      = "57031.40.6";
+      security_systemkeychain = "55202";
 
       IOAudioFamily                        = "203.3";
       IOFireWireFamily                     = "458";
@@ -186,11 +191,13 @@ let
     # There should be an IOVideo here, but they haven't released it :(
   };
 
-  IOKitSrcs = stdenv.lib.mapAttrs (name: value: if builtins.isFunction value then value name else value) IOKitSpecs;
+  IOKitSrcs = stdenv.lib.mapAttrs (name: value: if stdenv.lib.isFunction value then value name else value) IOKitSpecs;
 
   adv_cmds = applePackage "adv_cmds" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {};
 
   packages = {
+    SmartCardServices = applePackage "SmartCardServices" "osx-10.11.6" "1qqjlbi6j37mw9p3qpfnwf14xh9ff8h5786bmvzwc4kblfglabkm" {};
+
     inherit (adv_cmds) ps locale;
     architecture    = applePackage "architecture"      "osx-10.11.6"     "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {};
     bootstrap_cmds  = applePackage "bootstrap_cmds"    "dev-tools-7.0"   "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {};
@@ -201,7 +208,8 @@ let
     configd         = applePackage "configd"           "osx-10.8.5"      "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {};
     copyfile        = applePackage "copyfile"          "osx-10.11.6"     "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {};
     Csu             = applePackage "Csu"               "osx-10.11.6"     "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {};
-    dtrace          = applePackage "dtrace"            "osx-10.11.6"     "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {};
+    dtrace          = applePackage "dtrace"            "osx-10.11.6"     "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {};
+    dtrace-xcode    = applePackage "dtrace/xcode.nix"  "osx-10.11.6"     "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {};
     dyld            = applePackage "dyld"              "osx-10.11.6"     "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {};
     eap8021x        = applePackage "eap8021x"          "osx-10.11.6"     "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {};
     ICU             = applePackage "ICU"               "osx-10.10.5"     "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {};
@@ -238,10 +246,15 @@ let
     adv_cmds        = applePackage "adv_cmds/xcode.nix" "osx-10.11.6"    "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {};
     basic_cmds      = applePackage "basic_cmds"        "osx-10.11.6"     "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {};
     developer_cmds  = applePackage "developer_cmds"    "osx-10.11.6"     "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {};
+    diskdev_cmds    = applePackage "diskdev_cmds"      "osx-10.11.6"     "1ssdyiaq5m1zfy96yy38yyknp682ki6bvabdqd5z18fa0rv3m2ar" {};
     network_cmds    = applePackage "network_cmds"      "osx-10.11.6"     "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {};
     file_cmds       = applePackage "file_cmds"         "osx-10.11.6"     "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {};
     shell_cmds      = applePackage "shell_cmds"        "osx-10.11.6"     "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {};
     system_cmds     = applePackage "system_cmds"       "osx-10.11.6"     "1h46j2c5v02pkv5d9fyv6cpgyg0lczvwicrx6r9s210cl03l77jl" {};
+    text_cmds       = applePackage "text_cmds"         "osx-10.11.6"     "1f93m7dd0ghqb2hwh905mjhzblyfr7dwffw98xhgmv1mfdnigxg0" {};
+    top             = applePackage "top"               "osx-10.11.6"     "0i9120rfwapgwdvjbfg0ya143i29s1m8zbddsxh39pdc59xnsg5l" {};
+
+    security_systemkeychain = applePackage "security_systemkeychain" "osx-10.10.5" "0xviskdgxsail15npi0billyiysvljlmg38mmhnr7qi4ymnnjr90" {};
 
     libsecurity_apple_csp      = libsecPackage "libsecurity_apple_csp"      "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {};
     libsecurity_apple_cspdl    = libsecPackage "libsecurity_apple_cspdl"    "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
index 67fbf83496ed691f6cd39f48c6a8b077f19e3dd1..1f35e3008b3b1d8b01903ee4ca0926e6acdffd0d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
@@ -11,7 +11,7 @@ appleDerivation rec {
   # temporary install phase until xcodebuild has "install" support
   installPhase = ''
     mkdir -p $out/bin/
-    install developer_cmds-*/Build/Products/Release/* $out/bin/
+    install Products/Release/* $out/bin/
 
     for n in 1; do
       mkdir -p $out/share/man/man$n
diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..aba2472af6023b5b16423792f7ad011f0b559f75
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, appleDerivation, xcbuild, lib, hostPlatform, Libc, xnu, libutil-new }:
+
+appleDerivation {
+  buildInputs = [ xcbuild libutil-new ];
+
+  NIX_CFLAGS_COMPILE = "-I.";
+  NIX_LDFLAGS = "-lutil";
+  patchPhase = ''
+    # ugly hacks for missing headers
+    # most are bsd related - probably should make this a drv
+    unpackFile ${Libc.src}
+    unpackFile ${xnu.src}
+    mkdir System sys machine i386
+    cp xnu-*/bsd/sys/disklabel.h sys
+    cp xnu-*/bsd/machine/disklabel.h machine
+    cp xnu-*/bsd/i386/disklabel.h i386
+    cp -r xnu-*/bsd/sys System
+    cp -r Libc-*/uuid System
+  '';
+  installPhase = ''
+    install -D Products/Release/libdisk.a $out/lib/libdisk.a
+    rm Products/Release/libdisk.a
+    for bin in Products/Release/*; do
+      install -D $bin $out/bin/$(basename $bin)
+    done
+  '';
+
+  meta = {
+    platforms = stdenv.lib.platforms.darwin;
+    maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
+  };
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix
new file mode 100644
index 0000000000000000000000000000000000000000..dd193f2c07dc6e6dfe8174423a184fa6d65858a2
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix
@@ -0,0 +1,45 @@
+{ appleDerivation, xcbuild, CoreSymbolication, xnu, bison, flex, darling, stdenv }:
+
+appleDerivation {
+  buildInputs = [ xcbuild CoreSymbolication xnu bison flex darling ];
+  NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers";
+  NIX_LDFLAGS = "-L./Products/Release";
+  xcbuildFlags = "-target dtrace";
+
+  patchPhase = ''
+    substituteInPlace dtrace.xcodeproj/project.pbxproj --replace "/usr/sbin" ""
+    substituteInPlace libdtrace/dt_open.c \
+      --replace "/usr/bin/clang" "${stdenv.cc}/bin/cpp" \
+      --replace "/usr/bin/ld" "${stdenv.cc}/bin/ld" \
+      --replace "/usr/bin/dtrace" $out/lib/dtrace
+  '';
+
+  # hack to handle xcbuild's broken lex handling
+  preBuild = ''
+    cd libdtrace
+    yacc -d dt_grammar.y
+    flex -l -d dt_lex.l
+    cd ..
+
+    substituteInPlace dtrace.xcodeproj/project.pbxproj \
+      --replace '6EBC9800099BFBBF0001019C /* dt_grammar.y */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.yacc; name = dt_grammar.y; path = libdtrace/dt_grammar.y; sourceTree = ""; };' '6EBC9800099BFBBF0001019C /* y.tab.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = y.tab.c; path = libdtrace/y.tab.c; sourceTree = ""; };' \
+      --replace '6EBC9808099BFBBF0001019C /* dt_lex.l */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.lex; name = dt_lex.l; path = libdtrace/dt_lex.l; sourceTree = ""; };' '6EBC9808099BFBBF0001019C /* lex.yy.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lex.yy.c; path = libdtrace/lex.yy.c; sourceTree = ""; };'
+  '';
+
+  # xcbuild doesn't support install
+  installPhase = ''
+    mkdir -p $out
+
+    cp -r Products/Release/usr $out
+    mv $out/usr/* $out
+    rmdir $out/usr
+
+    mkdir $out/lib
+    cp Products/Release/*.dylib $out/lib
+
+    mkdir $out/bin
+    cp Products/Release/dtrace $out/bin
+
+    mkdir -p $out/lib/dtrace
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
index 8346ca7a9a7657d63225a2004b287037705c7d36..47a587966b44d5cd95bd829be63d3f29a52f275d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
@@ -19,7 +19,7 @@ appleDerivation rec {
   # temporary install phase until xcodebuild has "install" support
   installPhase = ''
     mkdir -p $out/bin/
-    install file_cmds-*/Build/Products/Release/* $out/bin
+    install Products/Release/* $out/bin
 
     for n in 1; do
       mkdir -p $out/share/man/man$n
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index 13b6156492bbbbd672f2e3e07db6775c7130b0ba..d9b3dfb7404915cb71eadcaa6e800758bb64a322 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -14,6 +14,8 @@ appleDerivation {
       -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib
   '';
 
+  setup-hook = ../../../../development/libraries/libiconv/setup-hook.sh;
+
   meta = {
     platforms = stdenv.lib.platforms.darwin;
   };
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
index a74198e8ddd78a0af80872695d535fdf7aa5ce83..a565971a6fa41bf16f5772bdc299e97a43831862 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
@@ -33,7 +33,7 @@ appleDerivation {
     cc -I. -c res_send.c
     cc -I. -c res_sendsigned.c
     cc -I. -c res_update.c
-    cc -dynamiclib -install_name $out/lib/libresolv.9.dylib -o libresolv.9.dylib *.o
+    cc -dynamiclib -install_name $out/lib/libresolv.9.dylib -current_version 1.0.0 -compatibility_version 1.0.0 -o libresolv.9.dylib *.o
   '';
 
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile
index 083a8a85d17d5321abd44f14c85547b517c00389..166b4e631c84c2d45397f06f3c7066758db0c2ab 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile
@@ -5,6 +5,7 @@ LIBRARY_NAME = security_apple_x509_tp
 security_apple_x509_tp_HEADER_FILES = $(notdir $(wildcard lib/*.h))
 security_apple_x509_tp_HEADER_FILES_DIR = lib
 
+security_apple_x509_tp_C_FILES = $(wildcard lib/*.c)
 security_apple_x509_tp_CC_FILES = $(wildcard lib/*.cpp)
 
 include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix
index c5ba9cc8d7ef6b5f664dab5cdd5f8a5c35868152..2a05855bd52144f6d999e907017ed9c58e46f07d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix
@@ -1,7 +1,33 @@
-{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities }:
+{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities
+, Security, xnu, xar, antlr, libsecurityd, apple_sdk
+, dtrace-xcode, osx_private_sdk }:
 appleDerivation {
-  buildInputs = [
-    libsecurity_utilities
-    libsecurity_cdsa_utilities
-  ];
-}
\ No newline at end of file
+  buildInputs = [ libsecurity_utilities libsecurity_cdsa_utilities dtrace-xcode
+                  Security xar antlr libsecurityd ];
+  NIX_CFLAGS_COMPILE = "-Iinclude -I${xnu}/Library/Frameworks/System.framework/Headers";
+  patchPhase = ''
+    substituteInPlace lib/policydb.cpp \
+      --replace "new MutableDictionary::MutableDictionary()" NULL
+    substituteInPlace lib/xpcengine.h \
+      --replace "#include " ""
+    substituteInPlace lib/policyengine.cpp \
+      --replace "#include " ""
+
+    rm lib/policyengine.cpp lib/quarantine++.cpp lib/codedirectory.cpp lib/xpcengine.cpp
+  '';
+  preBuild = ''
+    mkdir -p include
+    cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/usr/include/quarantine.h include
+    mkdir -p include/CoreServices/
+    cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/CoreServices.framework/PrivateHeaders/*.h include/CoreServices/
+
+    unpackFile ${Security.src}
+    mkdir -p include/securityd_client
+    cp Security-*/libsecurityd/lib/*.h include/securityd_client
+    mkdir -p include/xpc
+    cp ${apple_sdk.sdk}/include/xpc/*.h include/xpc
+
+    sed -i '1i #define bool int' lib/security_codesigning.d
+    dtrace -h -C -s lib/security_codesigning.d -o codesigning_dtrace.h
+  '';
+}
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 bb55fd48d8b2369bbbcdebb9188916d18c38c66a..e811c4c11a82e5be22ff2241c963dd91bc0220d2 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
@@ -4,9 +4,12 @@ appleDerivation {
     libauto
     libobjc
     IOKit
+  ];
+  propagatedBuildInputs = [
     sqlite
     apple_sdk.frameworks.PCSC
   ];
+  NIX_LDFLAGS = "-framework PCSC";
   patchPhase = ''
     substituteInPlace lib/errors.h --replace \
       '' \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix
index 860a74f61f7f7ea5394cadc71bd30b267951ee42..7facea2b8936935d951281f8eea13ecfd81e6ecc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix
@@ -4,22 +4,18 @@
 appleDerivation {
   buildInputs = [ xcbuild ];
 
-  dontUseXcbuild = true;
-
   prePatch = ''
     substituteInPlace tzlink.c \
       --replace '#include ' ""
   '';
 
-  buildPhase = ''
-    xcodebuild -target util
-  '';
+  xcbuildFlags = "-target util";
 
   installPhase = ''
     mkdir -p $out/lib $out/include
 
-    cp libutil-*/Build/Products/Release/*.dylib $out/lib
-    cp libutil-*/Build/Products/Release/*.h $out/include
+    cp Products/Release/*.dylib $out/lib
+    cp Products/Release/*.h $out/include
 
     # TODO: figure out how to get this to be right the first time around
     install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index 357a87689a0376a9b29011800da1d88e0fc6c7a5..23777c9415768004d709917d6c6b3d1499cc56c9 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -7,17 +7,19 @@ appleDerivation rec {
 
   # "spray" requires some files that aren't compiling correctly in xcbuild.
   # "rtadvd" seems to fail with some missing constants.
-  # We disable spray and rtadvd here for now.
+  # "traceroute6" and "ping6" require ipsec which doesn't build correctly
   patchPhase = ''
     substituteInPlace network_cmds.xcodeproj/project.pbxproj \
       --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \
-      --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," ""
+      --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" \
+      --replace "72CD1D9C0EE8C47C005F825D /* PBXTargetDependency */," "" \
+      --replace "7216D2C20EE89ADF00AE70E4 /* PBXTargetDependency */," ""
   '';
 
   # temporary install phase until xcodebuild has "install" support
   installPhase = ''
     mkdir -p $out/bin/
-    install network_cmds-*/Build/Products/Release/* $out/bin/
+    install Products/Release/* $out/bin/
 
     for n in 1 5; do
       mkdir -p $out/share/man/man$n
diff --git a/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1a0208ef3a08247bfa14c61fc5d7fbd2e43c34f8
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix
@@ -0,0 +1,31 @@
+{ appleDerivation, xcbuild, Security
+, libsecurity_codesigning, libsecurity_utilities, libsecurity_cdsa_utilities
+, xnu, osx_private_sdk, pcsclite}:
+
+appleDerivation {
+  buildInputs = [ xcbuild Security libsecurity_utilities
+                  libsecurity_cdsa_utilities libsecurity_codesigning
+                  pcsclite ];
+
+  NIX_LDFLAGS = "-lpcsclite";
+
+  # can't build the whole thing
+  xcbuildFlags = "-target codesign";
+
+  preBuild = ''
+    mkdir -p include/Security
+    cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/Security.framework/PrivateHeaders/*.h include/Security
+    cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/Security.framework/Headers/*.h include/Security
+
+    unpackFile ${xnu.src}
+    mkdir -p include/sys
+    cp -r xnu-*/bsd/sys/codesign.h include/sys/codesign.h
+  '';
+
+  NIX_CFLAGS_COMPILE = "-Iinclude";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp Products/Release/codesign $out/bin/codesign
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
index f434e15794eaf7b87eb7d259006ef5d204b5e24d..8ce916feb38ad657022be606cf7d984f16d90887 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
@@ -10,10 +10,12 @@ appleDerivation rec {
     # - su ('security/pam_appl.h' file not found)
     # - find (Undefined symbol '_get_date')
     # - w (Undefined symbol '_res_9_init')
+    # - expr
     substituteInPlace shell_cmds.xcodeproj/project.pbxproj \
       --replace "FCBA168714A146D000AA698B /* PBXTargetDependency */," "" \
       --replace "FCBA165914A146D000AA698B /* PBXTargetDependency */," "" \
-      --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," ""
+      --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," "" \
+      --replace "FCBA165514A146D000AA698B /* PBXTargetDependency */," ""
 
     # disable w, test install
     # get rid of permission stuff
@@ -27,7 +29,7 @@ appleDerivation rec {
   # temporary install phase until xcodebuild has "install" support
   installPhase = ''
     mkdir -p $out/usr/bin
-    install shell_cmds-*/Build/Products/Release/* $out/usr/bin
+    install Products/Release/* $out/usr/bin
 
     export DSTROOT=$out
     export SRCROOT=$PWD
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
index 2247ef3ddd2ffc99a162e263b47cf4ccb4ebb4db..2579b0b6a0a60ebcf30fd001330eee239ec08ab1 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
@@ -1,37 +1,104 @@
-{ stdenv, appleDerivation, xcbuild }:
+{ stdenv, appleDerivation, xcbuild, lib, hostPlatform
+, Librpcsvc, apple_sdk, pam, CF, openbsm }:
 
 appleDerivation rec {
   # xcbuild fails with:
   # /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1:  9083 Segmentation fault: 11  xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build
+  # see issue facebook/xcbuild#188
   # buildInputs = [ xcbuild ];
 
-  # # temporary install phase until xcodebuild has "install" support
-  # installPhase = ''
-  #   mkdir -p $out/bin/
-  #   install system_cmds-*/Build/Products/Release/* $out/bin/
-
-  #   for n in 1 5 8; do
-  #     mkdir -p $out/share/man/man$n
-  #     install */*.$n $out/share/man/man$n
-  #   done
-  # '';
-
-  # For now we just build sysctl because that's all I need... Please open a
-  # PR if you need any other utils before we fix the xcodebuild.
-  buildPhase = "cc sysctl.tproj/sysctl.c -o sysctl";
-
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      install sysctl $out/bin
-      for n in 5 8; do
-        mkdir -p $out/share/man/man$n
-        install sysctl.tproj/*.$n $out/share/man/man$n
+  buildInputs = [ Librpcsvc apple_sdk.frameworks.OpenDirectory pam CF
+                  apple_sdk.frameworks.IOKit openbsm ];
+  # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__"
+  #                    + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__"
+  #                    + lib.optionalString hostPlatform.isArm "-D__arm__";
+  NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1"
+                         "-DDAEMON_GID=1"
+                         "-DDEFAULT_AT_QUEUE=\'a\'"
+                         "-DDEFAULT_BATCH_QUEUE=\'b\'"
+                         "-DPERM_PATH=\"/usr/lib/cron/\""
+                         "-DOPEN_DIRECTORY"
+                         "-DNO_DIRECT_RPC"
+                         "-DAPPLE_GETCONF_UNDERSCORE"
+                         "-DAPPLE_GETCONF_SPEC"
+                         "-DUSE_PAM"
+                         "-DUSE_BSM_AUDIT"
+                         "-D_PW_NAME_LEN=MAXLOGNAME"
+                         "-D_PW_YPTOKEN=\"__YP!\""
+                         "-DAHZV1=64 "
+                         "-DAU_SESSION_FLAG_HAS_TTY=0x4000"
+                         "-DAU_SESSION_FLAG_HAS_AUTHENTICATED=0x4000"
+                       ] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ ";
+
+  patchPhase = ''
+    substituteInPlace login.tproj/login.c \
+      --replace bsm/audit_session.h bsm/audit.h
+    substituteInPlace login.tproj/login_audit.c \
+      --replace bsm/audit_session.h bsm/audit.h
+  '';
+
+  buildPhase = ''
+    for dir in *.tproj; do
+      name=$(basename $dir)
+      name=''${name%.tproj}
+
+      CFLAGS=""
+      case $name in
+           arch) CFLAGS="-framework CoreFoundation";;
+           atrun) CFLAGS="-Iat.tproj";;
+           chkpasswd)
+             CFLAGS="-framework OpenDirectory -framework CoreFoundation -lpam";;
+           getconf)
+               for f in getconf.tproj/*.gperf; do
+                   cfile=''${f%.gperf}.c
+                   LC_ALL=C awk -f getconf.tproj/fake-gperf.awk $f > $cfile
+               done
+           ;;
+           iostat) CFLAGS="-framework IOKit -framework CoreFoundation";;
+           login) CFLAGS="-lbsm -lpam";;
+           nvram) CFLAGS="-framework CoreFoundation -framework IOKit";;
+           sadc) CFLAGS="-framework IOKit -framework CoreFoundation";;
+           sar) CFLAGS="-Isadc.tproj";;
+      esac
+
+      echo "Building $name"
+
+      case $name in
+
+           # These are all broken currently.
+           arch) continue;;
+           chpass) continue;;
+           dirhelper) continue;;
+           dynamic_pager) continue;;
+           fs_usage) continue;;
+           latency) continue;;
+           pagesize) continue;;
+           passwd) continue;;
+           reboot) continue;;
+           sc_usage) continue;;
+           shutdown) continue;;
+           trace) continue;;
+
+           *) cc $dir/*.c -I''${dir} $CFLAGS -o $name ;;
+      esac
+    done
+  '';
+
+  installPhase = ''
+    for dir in *.tproj; do
+      name=$(basename $dir)
+      name=''${name%.tproj}
+      [ -x $name ] && install -D $name $out/bin/$name
+      for n in 1 2 3 4 5 6 7 8 9; do
+        for f in $dir/*.$n; do
+          install -D $f $out/share/man/man$n/$(basename $f)
+        done
       done
-    '';
+    done
+  '';
 
   meta = {
     platforms = stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ shlevy ];
+    maintainers = with stdenv.lib.maintainers; [ shlevy matthewbauer ];
   };
 }
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..196276b0b2737d94283ddebfd3d379c7c525b208
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, bzip2, zlib, lzma }:
+
+appleDerivation {
+  buildInputs = [ xcbuild ncurses bzip2 zlib lzma ];
+
+  # patches to use ncursees
+  # disables md5
+  patchPhase = ''
+    substituteInPlace text_cmds.xcodeproj/project.pbxproj \
+		  --replace 'FC6C98FB149A94EB00DDCC47 /* libcurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurses.dylib; path = /usr/lib/libcurses.dylib; sourceTree = ""; };' 'FC6C98FB149A94EB00DDCC47 /* libncurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.dylib; path = /usr/lib/libncurses.dylib; sourceTree = ""; };' \
+      --replace 'FC7A7EB5149875E00086576A /* PBXTargetDependency */,' ""
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    for f in Products/Release/*; do
+      install -D $f $out/bin/$(basename $f)
+    done
+  '';
+
+  meta = {
+    platforms = stdenv.lib.platforms.darwin;
+    maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
+  };
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4ddec2a30c90612224ce8e07406ee2324884f3ad
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
@@ -0,0 +1,15 @@
+{xcbuild, appleDerivation, apple_sdk, ncurses, libutil-new, lib}:
+
+appleDerivation {
+  buildInputs = [ xcbuild apple_sdk.frameworks.IOKit ncurses libutil-new ];
+  NIX_LDFLAGS = "-lutil";
+  installPhase = ''
+    install -D Products/Release/libtop.a $out/lib/libtop.a
+    install -D Products/Release/libtop.h $out/include/libtop.h
+    install -D Products/Release/top $out/bin/top
+  '';
+  meta = {
+    platforms = lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ matthewbauer ];
+  };
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
index 0ce9c54e48c4a63c107c6ef67979f4f0c04edd27..2c7da5be6e4c1c3367c9e4e669030a7fa42c2258 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, appleDerivation, fetchzip, bootstrap_cmds, bison, flex, gnum4, unifdef, perl }:
+{ stdenv, appleDerivation, fetchzip, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }:
 
 appleDerivation {
   phases = [ "unpackPhase" "patchPhase" "installPhase" ];
 
-  buildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl ];
+  buildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python ];
 
   patchPhase = ''
     substituteInPlace Makefile \
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index 5fc0db44f860e8de1339c8d981aea737442a1cfb..21d64979d7eafb53fd145536896bc71ef063482b 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -1,26 +1,27 @@
-{ stdenv, binutils-raw, cctools
+{ stdenv, binutils-unwrapped, cctools
 , hostPlatform, targetPlatform
 }:
 
 # Make sure both underlying packages claim to have prepended their binaries
-# with the same prefix.
-assert binutils-raw.prefix == cctools.prefix;
+# with the same targetPrefix.
+assert binutils-unwrapped.targetPrefix == cctools.targetPrefix;
 
 let
-  inherit (binutils-raw) prefix;
+  inherit (binutils-unwrapped) targetPrefix;
   cmds = [
     "ar" "ranlib" "as" "dsymutil" "install_name_tool"
     "ld" "strip" "otool" "lipo" "nm" "strings" "size"
   ];
 in
 
-# TODO loop over prefixed binaries too
+# TODO loop over targetPrefixed binaries too
 stdenv.mkDerivation {
-  name = "${prefix}cctools-binutils-darwin";
+  name = "${targetPrefix}cctools-binutils-darwin";
+  outputs = [ "out" "info" "man" ];
   buildCommand = ''
     mkdir -p $out/bin $out/include
 
-    ln -s ${binutils-raw.out}/bin/${prefix}c++filt $out/bin/${prefix}c++filt
+    ln -s ${binutils-unwrapped.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt
 
     # We specifically need:
     # - ld: binutils doesn't provide it on darwin
@@ -33,26 +34,23 @@ 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 ${stdenv.lib.concatStringsSep " " (builtins.map (e: prefix + e) cmds)}; do
+    for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: targetPrefix + e) cmds)}; do
       ln -sf "${cctools}/bin/$i" "$out/bin/$i"
     done
 
-    for i in ${stdenv.lib.getDev binutils-raw}/include/*.h; do
-      ln -s "$i" "$out/include/$(basename $i)"
-    done
-
-    for i in ${cctools}/include/*; do
-      ln -s "$i" "$out/include/$(basename $i)"
-    done
-
-    # FIXME: this will give us incorrect man pages for bits of cctools
-    ln -s ${binutils-raw.out}/share $out/share
-    ln -s ${binutils-raw.out}/lib $out/lib
+    ln -s ${binutils-unwrapped.out}/share $out/share
 
     ln -s ${cctools}/libexec $out/libexec
+
+    mkdir -p "$info/nix-support" "$man/nix-support"
+    printWords ${binutils-unwrapped.info} \
+      >> $info/nix-support/propagated-build-inputs
+    # FIXME: cctools missing man pages
+    printWords ${binutils-unwrapped.man} \
+      >> $man/nix-support/propagated-build-inputs
   '';
 
   passthru = {
-    inherit prefix;
+    inherit targetPrefix;
   };
 }
diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9aae2be1d033d3fff6940734987c575f4c8613a3
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
@@ -0,0 +1,98 @@
+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 1f2e7c14378039e4bfbcbdad9dc57093da098ba9..d8abdc2c6f843aeff76f5c26445fb3c3c11139f3 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,35 +1,61 @@
-{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2
+{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook
 , llvm, libcxx, libcxxabi, clang, libuuid
 , libobjc ? null, maloader ? null, xctoolchain ? null
 , hostPlatform, targetPlatform
+, enableDumpNormalizedLibArgs ? false
 }:
 
 let
-  # The prefix prepended to binary names to allow multiple binuntils on the
+
+  # We need to use an old version of cctools-port to support linking TBD files
+  # in the iOS SDK. Note that this only provides support for SDK versions up to
+  # 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the
+  # default version here, which can support the new TBD format via Apple's
+  # libtapi.
+  useOld = targetPlatform.isiOS;
+
+  # The targetPrefix prepended to binary names to allow multiple binuntils on the
   # PATH to both be usable.
-  prefix = stdenv.lib.optionalString
+  targetPrefix = stdenv.lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 in
 
-assert targetPlatform.isDarwin;
-
 # Non-Darwin alternatives
 assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null);
 
+assert enableDumpNormalizedLibArgs -> (!useOld);
+
 let
   baseParams = rec {
-    name = "${prefix}cctools-port-${version}";
-    version = "895";
+    name = "${targetPrefix}cctools-port-${version}";
+    version = if useOld then "886" else "895";
 
-    src = fetchFromGitHub {
+    src = fetchFromGitHub (if enableDumpNormalizedLibArgs then {
+      owner  = "tpoechtrager";
+      repo   = "cctools-port";
+      # master with https://github.com/tpoechtrager/cctools-port/pull/34
+      rev    = "8395d4b2c3350356e2fb02f5e04f4f463c7388df";
+      sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f";
+    } else if useOld then {
+      owner  = "tpoechtrager";
+      repo   = "cctools-port";
+      rev    = "02f0b8ecd87a3951653d838a321ae744815e21a5";
+      sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
+    } else {
       owner  = "tpoechtrager";
       repo   = "cctools-port";
       rev    = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2
       sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
-    };
+    });
 
-    nativeBuildInputs = [ autoconf automake libtool_2 ];
+    outputs = [ "out" "dev" ];
+
+    nativeBuildInputs = [
+      autoconf automake libtool_2
+    ] ++ stdenv.lib.optionals useOld [
+      autoreconfHook
+    ];
     buildInputs = [ libuuid ] ++
       # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
       stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
@@ -37,11 +63,22 @@ let
 
     patches = [
       ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
+    ] ++ stdenv.lib.optionals useOld [
+      # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
+      ./undo-unknown-triple.patch
+      ./ld-tbd-v2.patch
+      ./support-ios.patch
+    ];
+
+    __propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [
+      # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
+      "/usr/lib/libobjc.A.dylib"
+      "/usr/lib/libobjc.dylib"
     ];
 
     enableParallelBuilding = true;
 
-    # TODO(@Ericson2314): Always pass "--target" and always prefix.
+    # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
     configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
     configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [
       "CXXFLAGS=-I${libcxx}/include/c++/v1"
@@ -73,12 +110,15 @@ let
       EOF
     '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
       sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
+    '' + stdenv.lib.optionalString useOld ''
+      cd cctools
     '';
 
     # TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
     # hairy to handle during bootstrap. Perhaps it could be optional?
-    preConfigure = ''
+    preConfigure = stdenv.lib.optionalString (!useOld) ''
       cd cctools
+    '' + ''
       sh autogen.sh
     '';
 
@@ -105,10 +145,11 @@ let
       '';
 
     passthru = {
-      inherit prefix;
+      inherit targetPrefix;
     };
 
     meta = {
+      broken = !targetPlatform.isDarwin; # Only supports darwin targets
       homepage = http://www.opensource.apple.com/source/cctools/;
       description = "MacOS Compiler Tools (cross-platform port)";
       license = stdenv.lib.licenses.apsl20;
diff --git a/pkgs/os-specific/darwin/cctools/support-ios.patch b/pkgs/os-specific/darwin/cctools/support-ios.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f78c6b63ac802a71f8ff00c128d23a56e530ddf8
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/support-ios.patch
@@ -0,0 +1,13 @@
+diff --git a/cctools/configure.ac b/cctools/configure.ac
+index 56e8f24..0b4b3ff 100644
+--- a/cctools/configure.ac
++++ b/cctools/configure.ac
+@@ -39,7 +39,7 @@ EXTRACXXFLAGS=""
+ WARNINGS=""
+ 
+ case $host_os in
+-  darwin* )
++  darwin* | ios*)
+     isdarwin=yes
+     AM_CONDITIONAL([ISDARWIN], [true])
+   ;;
diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7df9bdd16dabf722c37f15b5610bfad91b94c4d5
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
@@ -0,0 +1,17 @@
+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/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b9d806cded232d9063413030981d43e0d8452c69
--- /dev/null
+++ b/pkgs/os-specific/darwin/darling/default.nix
@@ -0,0 +1,34 @@
+{stdenv, lib, fetchFromGitHub, cmake, bison, flex}:
+
+stdenv.mkDerivation rec {
+  pname = "darling";
+  name = pname;
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "darlinghq";
+    rev = "d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b";
+    sha256 = "1sdl0ysa3yfdvkq0x7vkdl64g7mcfy3qx70saf1d8rnhycbxjgjg";
+  };
+
+  # only packaging sandbox for now
+  buildPhase = ''
+    cc -c src/sandbox/sandbox.c -o src/sandbox/sandbox.o
+    cc -dynamiclib -flat_namespace src/sandbox/sandbox.o -o libsystem_sandbox.dylib
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp -rL src/sandbox/include/ $out/
+    cp libsystem_sandbox.dylib $out/lib/
+  '';
+
+  # buildInputs = [ cmake bison flex ];
+
+  meta = with lib; {
+    maintainers = with maintainers; [ matthewbauer ];
+    license = licenses.gpl3;
+    description = "Darwin/macOS emulation layer for Linux";
+    platforms = platforms.darwin;
+  };
+}
diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix
index 10eac5d471915d5a0e2d63afb6036fa9fa277848..a9051fd1279f95d07aa00c9fe06e629e30ea96c9 100644
--- a/pkgs/os-specific/darwin/duti/default.nix
+++ b/pkgs/os-specific/darwin/duti/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     '';
     maintainers = with maintainers; [matthewbauer];
     platforms = platforms.darwin;
-    licenses = licenses.publicDomain;
+    license = licenses.publicDomain;
     homepage = "http://duti.org/";
   };
 }
diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix
index d23328d362e0ac0196f17add20e50ac1bdf77df7..46ba682818688060f4cf6bee84212ef1ec33ac7e 100644
--- a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix
+++ b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix
@@ -2,8 +2,7 @@
 { haskellPackages, src, deps ? p : [], name }: let
   inherit (haskellPackages) ghc ghcWithPackages;
   with-env = ghcWithPackages deps;
-  crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else "";
-  ghcName = "${crossPrefix}ghc";
+  ghcName = "${ghc.targetPrefix}ghc";
 in runCommand name { buildInputs = [ with-env cctools ]; } ''
   mkdir -p $out/lib
   mkdir -p $out/include
diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b3790b8c87c3ed252d199ab33ce8186b96ea0075
--- /dev/null
+++ b/pkgs/os-specific/darwin/insert_dylib/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchFromGitHub, xcbuild }:
+
+stdenv.mkDerivation
+  { name = "insert_dylib-2016.08.28";
+    src = fetchFromGitHub
+      { owner = "Tyilo";
+        repo = "insert_dylib";
+        rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9";
+        sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya";
+      };
+    buildInputs = [ xcbuild ];
+    installPhase =
+      ''
+        prog=$(find . -type f -name insert_dylib)
+        mkdir -p $out/bin
+        install -m755 $prog $out/bin
+      '';
+    meta.platforms = stdenv.lib.platforms.darwin;
+  }
diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
deleted file mode 100644
index 175e9738ef9e861ba031fad419b03c4dea69c4b6..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/darwin/ios-cross/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ runCommand
-, lib
-, llvm
-, clang
-, binutils
-, stdenv
-, coreutils
-, gnugrep
-, buildPackages
-, hostPlatform
-, targetPlatform
-}:
-
-/* As of this writing, known-good prefix/arch/simulator triples:
- * aarch64-apple-darwin14 | arm64  | false
- * arm-apple-darwin10     | armv7  | false
- * i386-apple-darwin11    | i386   | true
- * x86_64-apple-darwin14  | x86_64 | true
- */
-
-# Apple uses somewhat non-standard names for this. We could fall back on
-# `targetPlatform.parsed.cpu.name`, but that would be a more standard one and
-# likely to fail. Better just to require something manual.
-assert targetPlatform ? arch;
-
-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";
-
-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}";
-    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
-          exit 1
-      fi
-      # ugh
-      tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
-      mv cc-cflags.tmp $out/nix-support/cc-cflags
-      echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags
-
-      # 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
-    '';
-  }) // {
-    inherit sdkType sdkVer sdk;
-  }
diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5b9f30b62c39c2fd6cb60f38f64c71469b9f83fc
--- /dev/null
+++ b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
@@ -0,0 +1,68 @@
+{ lib, hostPlatform, targetPlatform
+, clang-unwrapped
+, binutils-unwrapped
+, runCommand
+, stdenv
+, wrapBintoolsWith
+, wrapCCWith
+, buildIosSdk, targetIosSdkPkgs
+}:
+
+let
+
+minSdkVersion = "9.0";
+
+iosPlatformArch = { parsed, ... }: {
+  "arm"     = "armv7";
+  "aarch64" = "arm64";
+  "x86_64"  = "x86_64";
+}.${parsed.cpu.name};
+
+in
+
+rec {
+  # TODO(kmicklas): Make a pure version of this for each supported SDK version.
+  sdk = rec {
+    name = "ios-sdk";
+    type = "derivation";
+    outPath = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk";
+
+    sdkType = if targetPlatform.isiPhoneSimulator then "Simulator" else "OS";
+    version = targetPlatform.sdkVer;
+  };
+
+  binutils = wrapBintoolsWith {
+    libc = targetIosSdkPkgs.libraries;
+    bintools = binutils-unwrapped;
+    extraBuildCommands = ''
+      echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags
+    '';
+  };
+
+  clang = (wrapCCWith {
+    cc = clang-unwrapped;
+    bintools = binutils;
+    libc = targetIosSdkPkgs.libraries;
+    extraBuildCommands = ''
+      tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
+      mv cc-cflags.tmp $out/nix-support/cc-cflags
+      echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags
+      echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags
+      echo "${if targetPlatform.isiPhoneSimulator then "-mios-simulator-version-min" else "-miphoneos-version-min"}=${minSdkVersion}" >> $out/nix-support/cc-cflags
+    '';
+  }) // {
+    inherit sdk;
+  };
+
+  libraries = let sdk = buildIosSdk; in runCommand "libSystem-prebuilt" {
+    passthru = {
+      inherit sdk;
+    };
+  } ''
+    if ! [ -d ${sdk} ]; then
+        echo "You must have version ${sdk.version} of the iPhone${sdk.sdkType} sdk installed at ${sdk}" >&2
+        exit 1
+    fi
+    ln -s ${sdk}/usr $out
+  '';
+}
diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index 8a2f4f46e03f88a42e9f3badb353797ed3a25657..fb7bb12a493fca3d38526dce68f8273f53198e28 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -1,16 +1,24 @@
-{ stdenv, fetchFromGitHub, Carbon, Cocoa }:
+{ stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }:
 
 stdenv.mkDerivation rec {
   name = "khd-${version}";
-  version = "2.1.1";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "khd";
     rev = "v${version}";
-    sha256 = "1ijfrlnwdf8hk259j3jfxj6zizvqzj57458rflza626z5dnhmbpr";
+    sha256 = "0nzfhknv1s71870w2dk9dy56a3g5zsbjphmfrz0vsvi438g099r4";
   };
 
+  patches = [
+    # Fixes build issues, remove with >3.0.0
+    (fetchpatch {
+      url = https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch;
+      sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np";
+    })
+  ];
+
   buildInputs = [ Carbon Cocoa ];
 
   buildPhase = ''
diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix
index ac231f2dfe3df2a8185bd4bcce0828507d166e9b..3076392ecb26612515e1a1a18a5ae249970e9821 100644
--- a/pkgs/os-specific/darwin/kwm/default.nix
+++ b/pkgs/os-specific/darwin/kwm/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "kwm-${version}";
-  version = "4.0.4";
+  version = "4.0.5";
 
   src = fetchzip {
     stripRoot = false;
     url = "https://github.com/koekeishiya/kwm/releases/download/v${version}/Kwm-${version}.zip";
-    sha256 = "07rf4ichq511w8qmvd6s602s7xcyjhjp73d5c615sj82cxvgirwc";
+    sha256 = "1ld1vblg3hmc6lpb8p2ljvisbkijjkijf4y87z5y1ia4k8pk7mxb";
   };
 
   # TODO: Build this properly once we have swiftc.
diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0b59ecb2299e846152ecbcc55f48e27921b82f31
--- /dev/null
+++ b/pkgs/os-specific/darwin/lsusb/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "1.0";
+  name = "lsusb-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jlhonora";
+    repo = "lsusb";
+    rev = "8a6bd7084a55a58ade6584af5075c1db16afadd1";
+    sha256 = "0p8pkcgvsx44dd56wgipa8pzi3298qk9h4rl9pwsw1939hjx6h0g";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man8
+    install -m 0755 lsusb $out/bin
+    install -m 0444 man/lsusb.8 $out/share/man/man8
+  '';
+
+  meta = {
+    homepage = https://github.com/jlhonora/lsusb;
+    description = "lsusb command for Mac OS X";
+    platforms = stdenv.lib.platforms.darwin;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.varunpatro ];
+  };
+}
diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix
index 1684c0e92ceda80c60deadbe76a927db8ec88102..133266ec95aa9cbf8b46da06661ce171f34bf07f 100644
--- a/pkgs/os-specific/darwin/maloader/default.nix
+++ b/pkgs/os-specific/darwin/maloader/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "git://github.com/shinh/maloader.git";
     rev = "5f220393e0b7b9ad0cf1aba0e89df2b42a1f0442";
-    sha256 = "07j9b7n0grrbxxyn2h8pnk6pa8b370wq5z5zwbds8dlhi7q37rhn";
+    sha256 = "0dd1pn07x1y8pyn5wz8qcl1c1xwghyya4d060m3y9vx5dhv9xmzw";
   };
 
   postPatch = ''
@@ -32,5 +32,6 @@ stdenv.mkDerivation {
     description = "Mach-O loader for Linux";
     homepage = https://github.com/shinh/maloader;
     license = stdenv.lib.licenses.bsd2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix
index 09a346e4446d776f658b7f71fccf52a6e11a9b0b..960e0677da1e6ee8af420df3abe7be23c022abb2 100644
--- a/pkgs/os-specific/darwin/opencflite/default.nix
+++ b/pkgs/os-specific/darwin/opencflite/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v";
   };
 
-  configureFlags = [ "--with-uuid=${libuuid}" ];
+  configureFlags = [ "--with-uuid=${libuuid.dev}" ];
   buildInputs = [ icu tzdata.dev ];
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..aa7bfb5c3be7267754aba0b138412d7fc94307b0
--- /dev/null
+++ b/pkgs/os-specific/darwin/qes/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, Carbon }:
+
+stdenv.mkDerivation rec {
+  name = "qes-${version}";
+  version = "0.0.2";
+
+  src = fetchFromGitHub {
+    owner = "koekeishiya";
+    repo = "qes";
+    rev = "ddedf008f0c38b134501ad9f328447b671423d34";  # no tag
+    sha256 = "1w9ppid7jg6f4q7pq40lhm0whg7xmnxcmf3pb9xqfkq2zj2f7dxv";
+  };
+
+  buildInputs = [ Carbon ];
+
+  makeFlags = [ "BUILD_PATH=$(out)/bin" ];
+
+  meta = with stdenv.lib; {
+    description = "Quartz Event Synthesizer";
+    homepage = https://github.com/koekeishiya/qes;
+    platforms = platforms.darwin;
+    maintainers = with maintainers; [ lnl7 ];
+    license = licenses.mit;
+  };
+}
+
diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..24eb644e96fbe8fd9f3cedb7eb3706062773faf4
--- /dev/null
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, Carbon }:
+
+stdenv.mkDerivation rec {
+  name = "skhd-${version}";
+  version = "0.0.12";
+
+  src = fetchFromGitHub {
+    owner = "koekeishiya";
+    repo = "skhd";
+    rev = "v${version}";
+    sha256 = "09ihfd7cfqnfv095skn6rbrmjji61skwgg36b6s055fycrlbyp0h";
+  };
+
+  buildInputs = [ Carbon ];
+
+  makeFlags = [ "BUILD_PATH=$(out)/bin" ];
+
+  postInstall = ''
+    mkdir -p $out/Library/LaunchDaemons
+    cp ${./org.nixos.skhd.plist} $out/Library/LaunchDaemons/org.nixos.skhd.plist
+    substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple hotkey daemon for macOS";
+    homepage = https://github.com/koekeishiya/skhd;
+    platforms = platforms.darwin;
+    maintainers = with maintainers; [ lnl7 ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist b/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist
new file mode 100644
index 0000000000000000000000000000000000000000..e6624487740bcb70866a78366c210d03db3acdc0
--- /dev/null
+++ b/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist
@@ -0,0 +1,23 @@
+
+
+
+
+  Label
+  org.nixos.skhd
+  ProgramArguments
+  
+    @out@/bin/skhd
+  
+  ProcessType
+  Interactive
+  EnvironmentVariables
+  
+    PATH
+    @out@/bin:/nix/var/nix/profiles/default/bin:/usr/bin:/bin:/usr/sbin:/sbin
+  
+  RunAtLoad
+  
+  KeepAlive
+  
+
+
diff --git a/pkgs/os-specific/darwin/swift-corefoundation/default.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
similarity index 100%
rename from pkgs/os-specific/darwin/swift-corefoundation/default.nix
rename to pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fdc97304528df2f4584fd0cf5ea7101f5f80c374
--- /dev/null
+++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix
@@ -0,0 +1,8 @@
+{callPackage, stdenv, darwin, xcbuild}:
+
+rec {
+  corefoundation = callPackage ./corefoundation.nix {};
+  libdispatch = callPackage ./libdispatch.nix {
+   inherit (darwin) apple_sdk_sierra xnu;
+  };
+}
diff --git a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bd143b6071ba6b6b51e1db1b7aee24612c5fea74
--- /dev/null
+++ b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchFromGitHub, cmake, apple_sdk_sierra, xnu-new }:
+
+stdenv.mkDerivation rec {
+  name = "swift-corelibs-libdispatch";
+  src = fetchFromGitHub {
+    owner = "apple";
+    repo = name;
+    rev = "f83b5a498bad8e9ff8916183cf6e8ccf677c346b";
+    sha256 = "1czkyyc9llq2mnqfp19mzcfsxzas0y8zrk0gr5hg60acna6jkz2l";
+  };
+  buildInputs = [ cmake apple_sdk_sierra.sdk xnu-new ];
+}
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4104d0d455ad6709317469c1b84bbbe8e9c5a7e2
--- /dev/null
+++ b/pkgs/os-specific/darwin/trash/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, frameworks, perl } :
+stdenv.mkDerivation rec {
+  version = "0.9.0";
+  name = "trash-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ali-rantakari";
+    repo = "trash";
+    rev = "f68ad25a02e24cc58eb8ef9a493d6dc0122bcd8f";
+    sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41";
+  };
+
+  buildInputs = with frameworks; [
+    Cocoa
+    AppKit
+    ScriptingBridge
+    perl
+  ];
+
+  patches = [ ./trash.diff ];
+
+  buildPhase = ''make all docs'';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
+    install -m 0755 trash $out/bin
+    install -m 0444 trash.1 $out/share/man/man1
+  '';
+
+  meta = {
+    homepage = https://github.com/ali-rantakari/trash;
+    description = "Small command-line program for OS X that moves files or
+    folders to the trash.";
+    platforms = stdenv.lib.platforms.darwin;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/os-specific/darwin/trash/trash.diff b/pkgs/os-specific/darwin/trash/trash.diff
new file mode 100644
index 0000000000000000000000000000000000000000..546c760b10e3dde5d4c2024415ffcdbfad9e2d7d
--- /dev/null
+++ b/pkgs/os-specific/darwin/trash/trash.diff
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 5e4306f..9c975fc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,7 @@ trash: $(SOURCE_FILES)
+ 	@echo
+ 	@echo ---- Compiling:
+ 	@echo ======================================
+-	$(CC) -O2 -Wall -Wextra -Wpartial-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
++	$(CC) -O2 -Wall -Wextra -Wpartial-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
+ 
+ analyze:
+ 	@echo
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index a04d1decbd8b30e2f7af1dc474ecffdb888cf51d..bd12373da88470abb40d49d9c1058fe9f4fb6739 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "pic" ];
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   preBuild = ''
     sed -e 's/break/true/' -i examples/turn_off_gpu.sh
     sed -e 's@/bin/bash@.bin/sh@' -i examples/turn_off_gpu.sh
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 6dae0f6bb38b3d82ba0de358d6bb20a847eaad56..37de98780b695f05a315b331f7966e6e8ea81167 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = https://sourceforge.net/projects/acpiclient/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.mornfall ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index 95efbab5be4f3cce53e0260f30d87bdcb3fd6319..7a234b16c9132a1645a1dacfce24c66266a64d84 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "acpid-2.0.28";
+  name = "acpid-2.0.29";
 
   src = fetchurl {
     url = "mirror://sourceforge/acpid2/${name}.tar.xz";
-    sha256 = "043igasvp1l6nv5rzh4sksmymay2qn20anl4zm4zvwnkn1a3l34q";
+    sha256 = "1zq38al07z92r2md18zivrzgjqnn7m2wahdpgri6wijwjwkknl2q";
   };
 
   meta = with stdenv.lib; {
@@ -13,6 +13,5 @@ stdenv.mkDerivation rec {
     description = "A daemon for delivering ACPI events to userspace programs";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index 8a6eb77e6b1e1012906a9459f07421c0ca4afab1..c2c612db542225974d4bc7826757ba9f9ae3e50e 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-lib-1.1.4.1";
+  name = "alsa-lib-1.1.6";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
      "http://alsa.cybermirror.org/lib/${name}.tar.bz2"
     ];
-    sha256 = "0xjvi381105gldhv0z872a0x58sghznyx19j45lw5iyi2h68gfwi";
+    sha256 = "096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z";
   };
 
   patches = [
diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix
index 0d02daebe1d79d5ad828963e945fb4f2eae765a7..5cd937a3792805bb96074a5f0fdf90ee28378542 100644
--- a/pkgs/os-specific/linux/alsa-oss/default.nix
+++ b/pkgs/os-specific/linux/alsa-oss/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-oss-1.0.28";
+  name = "alsa-oss-1.1.6";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2"
       "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2"
     ];
-    sha256 = "1mbabiywxjjlvdh257j3a0v4vvy69mwwnvc3xlq7pg50i2m2rris";
+    sha256 = "1sj512wyci5qv8cisps96xngh7y9r5mv18ybqnazy18zwr1zgly3";
   };
 
   buildInputs = [ alsaLib ncurses libsamplerate ];
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index ae0aaa3cb63893a5e07732212699b9833ead42b7..f57f84b293b52277e06520e73a3d5a2d3ba27f21 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-plugins-1.1.4";
+  name = "alsa-plugins-1.1.6";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"
       "http://alsa.cybermirror.org/plugins/${name}.tar.bz2"
     ];
-    sha256 = "12hsvm6rpinjkg06pa9hzndkdrbfw6wk6yk00cm8y1gbv8xiq3ak";
+    sha256 = "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg";
   };
 
   # ToDo: a52, etc.?
diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix
index 940dde1f75dd5b24f3508745fa970bdf50c496de..67cae46164fc394ca9a2e05aa738cf3329c1b8ed 100644
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/pkgs/os-specific/linux/alsa-tools/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name = "alsa-tools-${version}";
-  version = "1.1.3";
+  version = "1.1.6";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2"
       "http://alsa.cybermirror.org/tools/${name}.tar.bz2"
     ];
-    sha256 = "02b75fyfmm9m2iz59d3xa97cas4f697a4pzdxn1i64kjd36iv3yq";
+    sha256 = "09rjb6hw1mn9y1jfdfj5djncgc2cr5wfps83k56rf6k4zg14v76n";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 4cb4af5ca724080b1c2219eec42d77aba0380357..e2340939fce75532854b106ac006f9a87bb73779 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "alsa-utils-${version}";
-  version = "1.1.4";
+  version = "1.1.5";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"
       "http://alsa.cybermirror.org/utils/${name}.tar.bz2"
     ];
-    sha256 = "17cxih9ibjp1193dyd79j50pyfa9dvrs6r9kpwrvzicjvr2110x7";
+    sha256 = "1s727md6mb408y2cfwzjkx23abxhampyrjdkgpyygdhxx62x42rj";
   };
 
   patchPhase = ''
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
       --replace "which" "type -p" \
       --replace "lspci" "${pciutils}/bin/lspci"
   '';
-  buildInputs = [ gettext alsaLib ncurses libsamplerate fftw ];
+  nativeBuildInputs = [ gettext ];
+  buildInputs = [ alsaLib ncurses libsamplerate fftw ];
 
   configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d";
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index e7825a0ebd699a391f4810b0a57b21a14a541e54..6828fbf6b1c95e60b0c7f7a0f8674ec442214cee 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, elfutils, mesa_noglu
+{ stdenv, fetchurl, elfutils
 , xorg, patchelf, openssl, libdrm, libudev
 , libxcb, libxshmfence, epoxy, perl, zlib
 , fetchFromGitHub, ncurses
@@ -13,8 +13,6 @@ let
 
   kernelDir = if libsOnly then null else kernel.dev;
 
-  inherit (mesa_noglu) driverLink;
-
   bitness = if stdenv.is64bit then "64" else "32";
 
   libArch =
@@ -30,9 +28,9 @@ let
 
 in stdenv.mkDerivation rec {
 
-  version = "17.10";
+  version = "17.40";
   pname = "amdgpu-pro";
-  build = "${version}-401251";
+  build = "${version}-492261";
 
   libCompatDir = "/run/lib/${libArch}";
 
@@ -41,7 +39,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
     "https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${build}.tar.xz";
-    sha256 = "004n0df8acjpjz72z3bjxb2a0b7qwln13jlknfn7xxqvhhwwy40a";
+    sha256 = "1c073lp9cq1rc2mddky2r0j2dv9dd167qj02visz37vwaxbm2r5h";
     curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx";
   };
 
@@ -57,15 +55,14 @@ in stdenv.mkDerivation rec {
     sourceRoot=.
   '';
 
-  modulePatches = [
-    ./patches/0001-disable-firmware-copy.patch
-    ./patches/0002-linux-4.9-fixes.patch
-    ./patches/0003-Change-seq_printf-format-for-64-bit-context.patch
-    ./patches/0004-fix-warnings-for-Werror.patch
-  ];
+  modulePatches = optionals (!libsOnly) ([
+    ./patches/0001-fix-warnings-for-Werror.patch
+    ./patches/0002-fix-sketchy-int-ptr-warning.patch
+    ./patches/0003-disable-firmware-copy.patch
+  ]);
 
   patchPhase = optionalString (!libsOnly) ''
-    pushd usr/src/amdgpu-pro-${build}
+    pushd usr/src/amdgpu-${build}
     for patch in $modulePatches
     do
       echo $patch
@@ -74,12 +71,18 @@ in stdenv.mkDerivation rec {
     popd
   '';
 
+  xreallocarray = ./xreallocarray.c;
+
   preBuild = optionalString (!libsOnly) ''
-    pushd usr/src/amdgpu-pro-${build}
+    pushd usr/src/amdgpu-${build}
     makeFlags="$makeFlags M=$(pwd)"
     patchShebangs pre-build.sh
     ./pre-build.sh ${kernel.version}
     popd
+    pushd lib
+    $CC -fPIC -shared -o libhack-xreallocarray.so $xreallocarray
+    strip libhack-xreallocarray.so
+    popd
   '';
 
   modules = [
@@ -89,7 +92,7 @@ in stdenv.mkDerivation rec {
   ];
 
   postBuild = optionalString (!libsOnly)
-    (concatMapStrings (m: "xz usr/src/amdgpu-pro-${build}/${m}\n") modules);
+    (concatMapStrings (m: "xz usr/src/amdgpu-${build}/${m}\n") modules);
 
   NIX_CFLAGS_COMPILE = "-Werror";
 
@@ -110,16 +113,17 @@ in stdenv.mkDerivation rec {
     pushd usr
     cp -r lib/${libArch}/* $out/lib
   '' + optionalString (!libsOnly) ''
-    cp -r src/amdgpu-pro-${build}/firmware $out/lib/firmware
+    cp -r src/amdgpu-${build}/firmware $out/lib/firmware
   '' + ''
     cp -r share $out/share
     popd
 
     pushd opt/amdgpu-pro
-  '' + optionalString (!stdenv.is64bit) ''
+  '' + optionalString (!libsOnly && stdenv.is64bit) ''
     cp -r bin $out/bin
   '' + ''
     cp -r include $out/include
+    cp -r share/* $out/share
     cp -r lib/${libArch}/* $out/lib
   '' + optionalString (!libsOnly) ''
     mv lib/xorg $out/lib/xorg
@@ -128,12 +132,12 @@ in stdenv.mkDerivation rec {
 
   '' + optionalString (!libsOnly)
     (concatMapStrings (m:
-      "install -Dm444 usr/src/amdgpu-pro-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules)
+      "install -Dm444 usr/src/amdgpu-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules)
   + ''
     mv $out/etc/vulkan $out/share
     interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)"
     libPath="$out/lib:$out/lib/gbm:$depLibPath"
-  '' + optionalString (!stdenv.is64bit) ''
+  '' + optionalString (!libsOnly && stdenv.is64bit) ''
     for prog in clinfo modetest vbltest kms-universal-planes kms-steal-crtc modeprint amdgpu_test kmstest proptest; do
       patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$out/bin/$prog"
     done
@@ -147,10 +151,17 @@ in stdenv.mkDerivation rec {
     for lib in `find "$out/lib/" -name '*.so*' -type f`; do
       patchelf --set-rpath "$libPath" "$lib"
     done
-    for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so; do
+    for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so libamdocl${bitness}.so; do
       perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib"
     done
+    for lib in dri/amdgpu_dri.so libdrm_amdgpu.so.1.0.0 libgbm_amdgpu.so.1.0.0 libkms_amdgpu.so.1.0.0 libamdocl${bitness}.so; do
+      perl -pi -e 's:/opt/amdgpu-pro/:/run/amdgpu-pro/:g' "$out/lib/$lib"
+    done
     substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/opt/amdgpu-pro/lib/${libArch}" "$out/lib"
+  '' + optionalString (!libsOnly) ''
+    for lib in drivers/modesetting_drv.so libglamoregl.so; do
+      patchelf --add-needed $out/lib/libhack-xreallocarray.so $out/lib/xorg/modules/$lib
+    done
   '';
 
   buildInputs = [
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
deleted file mode 100644
index 4733e0580afa6a1110d8bde9e123cc7a0100fd76..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 704cef8638ffbdd8de9e57f28b43ea42c685ea87 Mon Sep 17 00:00:00 2001
-From: David McFarland 
-Date: Sat, 28 Jan 2017 16:57:26 -0400
-Subject: [PATCH 1/4] disable firmware copy
-
----
- pre-build.sh | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/pre-build.sh b/pre-build.sh
-index 622ff13..e3cd009 100755
---- a/pre-build.sh
-+++ b/pre-build.sh
-@@ -35,8 +35,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
-     | sort -u \
-     | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\
-     > include/rename_symbol.h
--
--FW_DIR="/lib/firmware/$KERNELVER"
--mkdir -p $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.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ecde6401ac18d474a339d35c1409003ad7e112e4
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
@@ -0,0 +1,71 @@
+From 9167d76c435a7c1df7954f0fbe5cc6d083f8ed2f Mon Sep 17 00:00:00 2001
+From: David McFarland 
+Date: Mon, 6 Feb 2017 22:13:49 -0400
+Subject: [PATCH 1/3] fix warnings for Werror
+
+---
+ amd/amdgpu/amdgpu_device.c         | 4 ++--
+ amd/amdgpu/amdgpu_sa.c             | 2 +-
+ amd/display/dc/bios/bios_parser2.c | 8 ++++----
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/amd/amdgpu/amdgpu_device.c b/amd/amdgpu/amdgpu_device.c
+index fc1c543..186e06d 100644
+--- a/amd/amdgpu/amdgpu_device.c
++++ b/amd/amdgpu/amdgpu_device.c
+@@ -3164,7 +3164,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor)
+ 	struct drm_info_node *node, *tmp;
+ 
+ 	if (!&minor->debugfs_root)
+-		return 0;
++		return;
+ 
+ 	mutex_lock(&minor->debugfs_lock);
+ 	list_for_each_entry_safe(node, tmp,
+@@ -3175,7 +3175,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor)
+ 	}
+ 	mutex_unlock(&minor->debugfs_lock);
+ 
+-	return 0;
++	return;
+ }
+ #endif
+ 
+diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
+index 7206b34..8b7123c 100644
+--- a/amd/amdgpu/amdgpu_sa.c
++++ b/amd/amdgpu/amdgpu_sa.c
+@@ -430,7 +430,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+ 		if (i->fence)
+ #if defined(BUILD_AS_DKMS)
+ 			seq_printf(m, " protected by 0x%08x on context %d",
+-					i->fence->seqno, i->fence->context);
++					i->fence->seqno, (int)i->fence->context);
+ #else
+ 			seq_printf(m, " protected by 0x%08x on context %llu",
+ 				   i->fence->seqno, i->fence->context);
+diff --git a/amd/display/dc/bios/bios_parser2.c b/amd/display/dc/bios/bios_parser2.c
+index 86fce5a..99681c5 100644
+--- a/amd/display/dc/bios/bios_parser2.c
++++ b/amd/display/dc/bios/bios_parser2.c
+@@ -1326,13 +1326,13 @@ static enum bp_result get_embedded_panel_info_v2_1(
+ 	info->lcd_timing.misc_info.VERTICAL_CUT_OFF = 0;
+ 
+ 	info->lcd_timing.misc_info.H_REPLICATION_BY2 =
+-		lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2;
++		(lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2) != 0;
+ 	info->lcd_timing.misc_info.V_REPLICATION_BY2 =
+-		lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2;
++		(lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2) != 0;
+ 	info->lcd_timing.misc_info.COMPOSITE_SYNC =
+-		lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC;
++		(lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC) != 0;
+ 	info->lcd_timing.misc_info.INTERLACE =
+-		lvds->lcd_timing.miscinfo & ATOM_INTERLACE;
++		(lvds->lcd_timing.miscinfo & ATOM_INTERLACE) != 0;
+ 
+ 	/* not provided by VBIOS*/
+ 	info->lcd_timing.misc_info.DOUBLE_CLOCK = 0;
+-- 
+2.15.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
new file mode 100644
index 0000000000000000000000000000000000000000..20f429757a5198bba4df0d50ede02e5653e5a2ed
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
@@ -0,0 +1,25 @@
+From a07ee5dec35ca24a013a6638543ef5030b2bab40 Mon Sep 17 00:00:00 2001
+From: David McFarland 
+Date: Tue, 9 Jan 2018 21:45:33 -0400
+Subject: [PATCH 2/3] fix sketchy int->ptr warning
+
+---
+ amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+index d0f091b..707815a 100644
+--- a/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
++++ b/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+@@ -236,7 +236,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
+ 		pbn = drm_dp_calc_pbn_mode(clock, bpp);
+ 
+ 		slots = drm_dp_find_vcpi_slots(mst_mgr, pbn);
+-		ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots);
++		ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, &slots);
+ 
+ 		if (!ret)
+ 			return false;
+-- 
+2.15.1
+
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
deleted file mode 100644
index aa6cbcc118dcf963e3f810d538067f81765b3be2..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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/amdkcl/kcl_io.c                     | 2 ++
- amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-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);
- }
- #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 34313a9..44a4a71 100644
---- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -1720,6 +1720,10 @@ static int dm_plane_helper_prepare_fb(
- static int dm_plane_helper_prepare_fb(
- 	struct drm_plane *plane,
- 	const struct drm_plane_state *new_state)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+static int dm_plane_helper_prepare_fb(
-+	struct drm_plane *plane,
-+	struct drm_plane_state *new_state)
- #else
- static int dm_plane_helper_prepare_fb(
- 	struct drm_plane *plane,
-@@ -1766,6 +1770,10 @@ static void dm_plane_helper_cleanup_fb(
- static void dm_plane_helper_cleanup_fb(
- 	struct drm_plane *plane,
- 	const struct drm_plane_state *old_state)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+static void dm_plane_helper_cleanup_fb(
-+	struct drm_plane *plane,
-+	struct drm_plane_state *old_state)
- #else
- static void dm_plane_helper_cleanup_fb(
- 	struct drm_plane *plane,
--- 
-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
deleted file mode 100644
index 7a11c9bd4ef5645ea57daa9c600cb5acaf0e5924..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
----
- amd/amdgpu/amdgpu_sa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
-index 74932bf..db4119a 100644
---- a/amd/amdgpu/amdgpu_sa.c
-+++ b/amd/amdgpu/amdgpu_sa.c
-@@ -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);
- #else
--- 
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0091c471680cf5a59fa817a7eaed44963d5001fc
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
@@ -0,0 +1,25 @@
+From 7a3062acbbabdb29239bbc8c984e62589a88576e Mon Sep 17 00:00:00 2001
+From: David McFarland 
+Date: Tue, 9 Jan 2018 21:49:55 -0400
+Subject: [PATCH 3/3] disable firmware copy
+
+---
+ pre-build.sh | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/pre-build.sh b/pre-build.sh
+index e7b8a32..bad8f25 100755
+--- a/pre-build.sh
++++ b/pre-build.sh
+@@ -38,8 +38,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
+     | sort -u \
+     | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\
+     >> include/rename_symbol.h
+-
+-FW_DIR="/lib/firmware/$KERNELVER"
+-mkdir -p $FW_DIR
+-cp -ar /usr/src/amdgpu-17.40-492261/firmware/radeon $FW_DIR
+-cp -ar /usr/src/amdgpu-17.40-492261/firmware/amdgpu $FW_DIR
+-- 
+2.15.1
+
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
deleted file mode 100644
index cd360e18faac5a7f8aa0c8606476db231bdf7779..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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_ttm.c                 | 2 ++
- amd/display/amdgpu_dm/amdgpu_dm_types.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-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,
- 	return flags;
- }
- 
-+#if 0
- static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo)
- {
- 	struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
-@@ -1132,6 +1133,7 @@ static struct list_head *amdgpu_ttm_swap_lru_tail(struct ttm_buffer_object *tbo)
- 
- 	return res;
- }
-+#endif
- 
- 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 44a4a71..ae7e707 100644
---- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -932,7 +932,7 @@ static void decide_crtc_timing_for_drm_display_mode(
- }
- 
- static struct dc_target *create_target_for_sink(
--		const struct amdgpu_connector *aconnector,
-+		struct amdgpu_connector *aconnector,
- 		const struct drm_display_mode *drm_mode,
- 		const struct dm_connector_state *dm_state)
- {
--- 
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c b/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab47bacb8228186a83cc49b9e9d146c6bc9698c5
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
@@ -0,0 +1,5 @@
+#include 
+
+void *xreallocarray(void *ptr, size_t nmemb, size_t size) {
+  return reallocarray(ptr, nmemb, size);
+}
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index ff32ca01a97ff074ce54229b296e27b668ff3318..88e8a9665586324312db35fa86fdcb58317228a5 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 = "20171113";
+  version = "20180112";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "11gcnk6wjc2sw05hwi4xphvx9ksmkpvsdziaczymqxkaads3f1dy";
+    sha256 = "13gj79nnd04szqlrrzzkdr6wi1fky08pi7x8xfbg0jj3d3v0giah";
   };
 
   installPhase = ''
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index b576ca71d580a29e798e1926bdfbee5ba27578f3..c8e58dfbf6fbb67085210b4cc67a2ebad5196f9d 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, makeWrapper, autoreconfHook
+{ stdenv, fetchurl, fetchpatch, makeWrapper, autoreconfHook
 , pkgconfig, which
 , flex, bison
 , linuxHeaders ? stdenv.cc.libc.linuxHeaders
-, pythonPackages
+, python
+, gawk
 , perl
 , swig
+, ncurses
 , pam
+, buildPackages
 }:
 
 let
-  apparmor-series = "2.10";
-  apparmor-version = apparmor-series;
+  apparmor-series = "2.12";
+  apparmor-patchver = "0";
+  apparmor-version = apparmor-series + "." + apparmor-patchver;
 
   apparmor-meta = component: with stdenv.lib; {
     homepage = http://apparmor.net/;
@@ -21,17 +25,38 @@ let
   };
 
   apparmor-sources = fetchurl {
-    url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
-    sha256 = "1x06qmmbha9krx7880pxj2k3l8fxy3nm945xjjv735m2ax1243jd";
+    url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-series}.tar.gz";
+    sha256 = "0mm0mcp0w18si9wl15drndysm7v27az2942p1xjd197shg80qawa";
   };
 
   prePatchCommon = ''
-    substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man"
-    substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html"
+    substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man"
+    substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html"
     substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
     substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"
   '';
 
+  # use 'if c then x else null' to avoid rebuilding
+  # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+  patches = if stdenv.hostPlatform.isMusl then [
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0002-Provide-missing-secure_getenv-and-scandirat-function.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
+      name = "0002-Provide-missing-secure_getenv-and-scandirat-function.patch";
+      sha256 = "0pj1bzifghxwxlc39j8hyy17dkjr9fk64kkj94ayymyprz4i4nac";
+    })
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
+      name = "0003-Added-missing-typedef-definitions-on-parser.patch";
+      sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0";
+    })
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
+      name = "0007-Do-not-build-install-vim-file-with-utils-package.patch";
+      sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4";
+    })
+    # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12)
+  ] else null;
+
   # FIXME: convert these to a single multiple-outputs package?
 
   libapparmor = stdenv.mkDerivation {
@@ -44,12 +69,14 @@ let
       flex
       pkgconfig
       swig
+      ncurses
       which
+      perl
     ];
 
-    buildInputs = [
+    buildInputs = stdenv.lib.optionals (!stdenv.isCross) [
       perl
-      pythonPackages.python
+      python
     ];
 
     # required to build apparmor-parser
@@ -59,13 +86,15 @@ let
       substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h"
       substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h"
     '';
+    inherit patches;
 
     postPatch = "cd ./libraries/libapparmor";
-    configureFlags = "--with-python --with-perl";
+    # https://gitlab.com/apparmor/apparmor/issues/1
+    configureFlags = stdenv.lib.optionalString (!stdenv.isCross) "--with-python --with-perl";
 
-    outputs = [ "out" "python" ];
+    outputs = if stdenv.isCross then [ "out" ] else [ "out" "python" ];
 
-    postInstall = ''
+    postInstall = stdenv.lib.optionalString (!stdenv.isCross) ''
       mkdir -p $python/lib
       mv $out/lib/python* $python/lib/
     '';
@@ -81,22 +110,23 @@ let
 
     buildInputs = [
       perl
-      pythonPackages.python
+      python
       libapparmor
       libapparmor.python
     ];
 
     prePatch = prePatchCommon;
+    inherit patches;
     postPatch = "cd ./utils";
     makeFlags = ''LANGS='';
     installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin VIM_INSTALL_PATH=$(out)/share PYPREFIX='';
 
     postInstall = ''
       for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-status aa-unconfined ; do
-        wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${pythonPackages.python.libPrefix}/site-packages:$PYTHONPATH"
+        wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
       done
 
-      for prog in aa-exec aa-notify ; do
+      for prog in aa-notify ; do
         wrapProgram $out/bin/$prog --prefix PERL5LIB : "${libapparmor}/lib/perl5:$PERL5LIB"
       done
     '';
@@ -104,6 +134,29 @@ let
     meta = apparmor-meta "user-land utilities";
   };
 
+  apparmor-bin-utils = stdenv.mkDerivation {
+    name = "apparmor-bin-utils-${apparmor-version}";
+    src = apparmor-sources;
+
+    nativeBuildInputs = [
+      pkgconfig
+      libapparmor
+      gawk
+      which
+    ];
+
+    buildInputs = [
+      libapparmor
+    ];
+
+    prePatch = prePatchCommon;
+    postPatch = "cd ./binutils";
+    makeFlags = ''LANGS= USE_SYSTEM=1'';
+    installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin'';
+
+    meta = apparmor-meta "binary user-land utilities";
+  };
+
   apparmor-parser = stdenv.mkDerivation {
     name = "apparmor-parser-${apparmor-version}";
     src = apparmor-sources;
@@ -119,6 +172,7 @@ let
       ## techdoc.pdf still doesn't build ...
       substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages"
     '';
+    inherit patches;
     postPatch = "cd ./parser";
     makeFlags = ''LANGS= USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include'';
     installFlags = ''DESTDIR=$(out) DISTRO=unknown'';
@@ -170,6 +224,12 @@ let
 in
 
 {
-  inherit libapparmor apparmor-utils apparmor-parser apparmor-pam
-  apparmor-profiles apparmor-kernel-patches;
+  inherit
+    libapparmor
+    apparmor-utils
+    apparmor-bin-utils
+    apparmor-parser
+    apparmor-pam
+    apparmor-profiles
+    apparmor-kernel-patches;
 }
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh
index 2b907bde10aee3492cc4439a96d2c86e975c7257..6cb8cacbffac7a95c17a7ad0c4377abe27ca6b81 100644
--- a/pkgs/os-specific/linux/ati-drivers/builder.sh
+++ b/pkgs/os-specific/linux/ati-drivers/builder.sh
@@ -246,9 +246,9 @@ if test -z "$libsOnly"; then
   ( # build and install fgl_glxgears
     cd fgl_glxgears;
     gcc -DGL_ARB_texture_multisample=1 -g \
-    -I$mesa/include \
+    -I$libGLU_combined/include \
     -I$out/include \
-    -L$mesa/lib -lGL -lGLU -lX11 -lm \
+    -L$libGLU_combined/lib -lGL -lGLU -lX11 -lm \
     -o $out/bin/fgl_glxgears -Wall fgl_glxgears.c
   )
 
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index d9e6ec3cf624660a09b3e8f717728b995558d4f2..df6fa3555feee9fa43cb3d25570a475de9a5ec28 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, kernel ? null, which
 , xorg, makeWrapper, glibc, patchelf, unzip
-, fontconfig, freetype, mesa # for fgl_glxgears
+, fontconfig, freetype, libGLU_combined # for fgl_glxgears
 , # Whether to build the libraries only (i.e. not the kernel module or
   # driver utils). Used to support 32-bit binaries on 64-bit
   # Linux.
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
       xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE
       patchelf
       unzip
-      mesa
+      libGLU_combined
       fontconfig
       freetype
       makeWrapper
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
   LD_LIBRARY_PATH = makeLibraryPath
     [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
       xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE
-      mesa
+      libGLU_combined
       fontconfig
       freetype
       stdenv.cc.cc
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
                    xorg.libX11.out xorg.libXinerama.out xorg.libSM.out
                    xorg.libICE.out ];
 
-  inherit mesa; # only required to build the examples
+  inherit libGLU_combined; # only required to build the examples
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 7bec6cadcfc4888ab01e6ba50eae688da9764035..7e14983a6d2b4704c699c3394be1a18d36c6a7c5 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -1,20 +1,21 @@
 {
-  stdenv, fetchurl,
+  stdenv, buildPackages, fetchurl, fetchpatch,
   enablePython ? false, python ? null,
 }:
 
 assert enablePython -> python != null;
 
 stdenv.mkDerivation rec {
-  name = "audit-2.8.1";
+  name = "audit-2.8.3";
 
   src = fetchurl {
     url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
-    sha256 = "0v1vng43fjsh158zb5k5d81ngn4p4jmj1247m27pk0bfzy9dxv0v";
+    sha256 = "06lacv9zjn0sf076dydwmvjhdmik3xzhdjvyrkq75917xv54ajbl";
   };
 
   outputs = [ "bin" "dev" "out" "man" ];
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = stdenv.lib.optional enablePython python;
 
   configureFlags = [
@@ -26,6 +27,22 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0002-auparse-remove-use-of-rawmemchr.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696";
+      name = "0002-auparse-remove-use-of-rawmemchr.patch";
+      sha256 = "1caaqbfgb2rq3ria5bz4n8x30ihgihln6w9w9a46k62ba0wh9rkz";
+    })
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0003-all-get-rid-of-strndupa.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696";
+      name = "0003-all-get-rid-of-strndupa.patch";
+      sha256 = "1ddrm6a0ijrf7caw1wpw2kkbjp2lkxkmc16v51j5j7dvdalc6591";
+    })
+  ];
+
+  prePatch = ''
+    sed -i 's,#include ,#include \n#include ,' audisp/audispd.c
+  '';
   meta = {
     description = "Audit Library";
     homepage = http://people.redhat.com/sgrubb/audit/;
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 8c207e4a47d7e0f2e196053fd1ef2afeba35a263..859593e4b9aa5697c2e91dfa456a5a5565a67e5d 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, utillinux, nfs-utils, e2fsprogs
+{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
 , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
 
 let
-  version = "5.1.3";
+  version = "5.1.4";
   name = "autofs-${version}";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";
-    sha256 = "1gxifa93104pxlmxrikhwciy5zdgk20m63siyhq1myym7vzfnvp9";
+    sha256 = "08hpphawzcdibwbhw0r3y7hnfczlazpp90sf3bz2imgza7p31klg";
   };
 
   preConfigure = ''
@@ -17,10 +17,10 @@ in stdenv.mkDerivation {
     export sssldir="${sssd}/lib/sssd/modules"
     export HAVE_SSS_AUTOFS=1
 
-    export MOUNT=${utillinux}/bin/mount
+    export MOUNT=${mount}/bin/mount
     export MOUNT_NFS=${nfs-utils}/bin/mount.nfs
-    export UMOUNT=${utillinux}/bin/umount
-    export MODPROBE=${utillinux}/bin/modprobe
+    export UMOUNT=${umount}/bin/umount
+    export MODPROBE=${kmod}/bin/modprobe
     export E2FSCK=${e2fsprogs}/bin/fsck.ext2
     export E3FSCK=${e2fsprogs}/bin/fsck.ext3
     export E4FSCK=${e2fsprogs}/bin/fsck.ext4
diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 002e458b24ded33631db39cf1fd3ead9e144cce2..9b7484932ebdf403912c65bc1981167e8ac2d254 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.3";
+  ver = "2018.0";
 in
 stdenv.mkDerivation rec {
   name = "alfred-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "0202mxp7hwflkqnkkajx5lv1nxjng45q5gcvvdv68x46p8ikb5n2";
+    sha256 = "0mzjgjkmgdrrqa6fbpii9q1xqvg3kvwgq2k2kpdf0vy4xxnypky7";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 6ff3903c4f2fecfe162025a982238de9f815f95b..ef1d51501e85aa6882239db6544126d3d09bad0f 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.3";
+  ver = "2018.0";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "1a48kc2v8cb1757pxlli96qf3d7x7k3qw04rjadfs0iy09sz1ir9";
+    sha256 = "1x7gy6agwk68s2cbhc4wfhvhdy2ccrq0vi7jzaj94pn8nqshi5ss";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 4f8a85d5d887c8e8d043847578caa7075ea4f572..8f835b6d7ed020133e761ddeffc58cb5d4558b17 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchurl, kernel }:
 
-let base = "batman-adv-2017.3"; in
+let base = "batman-adv-2018.0"; in
 
 stdenv.mkDerivation rec {
   name = "${base}-${kernel.version}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
-    sha256 = "1m541czjwgi4rfhjr6rg9r9c3cp2ncnif4ln7ri926zigwlxs3l3";
+    sha256 = "0v2pyy9lxyy71nr9600k9935qcpn2wpyl9fsf2a4m4d2x0wgh9j8";
   };
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   hardeningDisable = [ "pic" ];
 
   preBuild = ''
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index 67b843fac4dcb641485d35e709664b79980c8b27..f5d3b4f5c4e1ca78b841a8da23a3495a18e9a722 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation {
     sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m";
   }) ];
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   hardeningDisable = [ "pic" ];
 
   preBuild = ''
@@ -48,7 +50,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A module for powering off hybrid GPUs";
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     homepage = https://github.com/Bumblebee-Project/bbswitch;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 75b7802772d61d13877eab81e22e9d41509cd3eb..2e2c872fb1877d17847ad426b770947591099420 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -1,25 +1,43 @@
-{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages_5, kernel
-, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }:
+{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel
+, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf
+, systemtap
+}:
 
 stdenv.mkDerivation rec {
-  version = "0.4.0";
+  version = "0.5.0";
   name = "bcc-${version}";
 
   src = fetchFromGitHub {
     owner = "iovisor";
     repo = "bcc";
     rev = "v${version}";
-    sha256 = "106ri3yhjhp3dgsjb05y4j6va153d5nqln3zjdz6qfz87svak0rw";
+    sha256 = "0bb3244xll5sqx0lvrchg71qy2zg0yj6r5h4v5fvrg1fjhaldys9";
   };
 
   buildInputs = [
-    llvmPackages_5.llvm llvmPackages_5.clang-unwrapped kernel
+    llvmPackages.llvm llvmPackages.clang-unwrapped kernel
     elfutils python pythonPackages.netaddr luajit netperf iperf
+    systemtap.stapBuild
   ];
 
-  nativeBuildInputs = [ makeWrapper cmake flex bison ];
+  patches = [
+    # fix build with llvm > 5.0.0 && < 6.0.0
+    (fetchpatch {
+      url = "https://github.com/iovisor/bcc/commit/bd7fa55bb39b8978dafd0b299e35616061e0a368.patch";
+      sha256 = "1sgxhsq174iihyk1x08py73q8fh78d7y3c90k5nh8vcw2pf1xbnf";
+    })
+  ];
+
+  nativeBuildInputs = [ makeWrapper cmake flex bison ]
+    # libelf is incompatible with elfutils-libelf
+    ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
 
-  cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules";
+  cmakeFlags =
+    [ "-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"
+      "-DREVISION=${version}"
+      "-DENABLE_USDT=ON"
+      "-DENABLE_CPP_API=ON"
+    ];
 
   postInstall = ''
     mkdir -p $out/bin $out/share
diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f17bc9492c1b73141869e875c4df06d938de50c5
--- /dev/null
+++ b/pkgs/os-specific/linux/beegfs/default.nix
@@ -0,0 +1,154 @@
+{ stdenv, fetchurl, pkgconfig, unzip, which
+, libuuid, attr, xfsprogs, cppunit, rdma-core
+, zlib, openssl, sqlite, jre, openjdk, ant
+, openssh, perl, gfortran
+} :
+
+let
+  version = "6.18";
+
+  subdirs = [
+    "beeond_thirdparty/build"
+    "beeond_thirdparty_gpl/build"
+    "beegfs_thirdparty/build"
+    "beegfs_opentk_lib/build"
+    "beegfs_common/build"
+    "beegfs_admon/build"
+    "beegfs_java_lib/build"
+    "beegfs_ctl/build"
+    "beegfs_fsck/build"
+    "beegfs_helperd/build"
+    "beegfs_meta/build"
+    "beegfs_mgmtd/build"
+    "beegfs_online_cfg/build"
+    "beegfs_storage/build"
+    "beegfs_utils/build"
+  ];
+
+in stdenv.mkDerivation rec {
+  name = "beegfs-${version}";
+
+  src = fetchurl {
+    url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
+    sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
+  };
+
+  nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant perl ];
+
+  buildInputs = [
+    libuuid
+    attr
+    xfsprogs
+    zlib
+    openssl
+    sqlite
+    jre
+    rdma-core
+    openssh
+    gfortran ];
+
+  hardeningDisable = [ "format" ]; # required for building beeond
+
+  postPatch = ''
+    patchShebangs ./
+    find -type f -name Makefile -exec sed -i "s:/bin/bash:${stdenv.shell}:" \{} \;
+    find -type f -name Makefile -exec sed -i "s:/bin/true:true:" \{} \;
+    find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \;
+
+    # unpack manually and patch variable name
+    sed -i '/tar -C $(SOURCE_PATH) -xzf $(PCOPY_TAR)/d' beeond_thirdparty/build/Makefile
+    cd beeond_thirdparty/source
+    tar xf pcopy-0.96.tar.gz
+    sed -i 's/\([^_]\)rank/\1grank/' pcopy-0.96/src/pcp.cpp
+    cd ../..
+  '';
+
+  buildPhase = ''
+    for i in ${toString subdirs}; do
+      make -C $i BEEGFS_OPENTK_IBVERBS=1
+    done
+    make -C beegfs_admon/build admon_gui BEEGFS_OPENTK_IBVERBS=1
+  '';
+
+  installPhase = ''
+    binDir=$out/bin
+    docDir=$out/share/doc/beegfs
+    includeDir=$out/include/beegfs
+    libDir=$out/lib
+    libDirPkg=$out/lib/beegfs
+
+    mkdir -p $binDir $libDir $libDirPkg $docDir $includeDir
+
+    cp beegfs_admon/build/beegfs-admon $binDir
+    cp beegfs_admon/build/dist/usr/bin/beegfs-admon-gui $binDir
+    cp beegfs_admon_gui/dist/beegfs-admon-gui.jar $libDirPkg
+    cp beegfs_admon/build/dist/etc/beegfs-admon.conf $docDir
+
+    cp beegfs_java_lib/build/jbeegfs.jar $libDirPkg
+    cp beegfs_java_lib/build/libjbeegfs.so $libDir
+
+    cp beegfs_ctl/build/beegfs-ctl $binDir
+    cp beegfs_fsck/build/beegfs-fsck $binDir
+
+    cp beegfs_utils/scripts/beegfs-check-servers $binDir
+    cp beegfs_utils/scripts/beegfs-df $binDir
+    cp beegfs_utils/scripts/beegfs-net $binDir
+
+    cp beegfs_helperd/build/beegfs-helperd $binDir
+    cp beegfs_helperd/build/dist/etc/beegfs-helperd.conf $docDir
+
+    cp beegfs_client_module/build/dist/sbin/beegfs-setup-client $binDir
+    cp beegfs_client_module/build/dist/etc/beegfs-client.conf $docDir
+
+    cp beegfs_meta/build/beegfs-meta $binDir
+    cp beegfs_meta/build/dist/sbin/beegfs-setup-meta $binDir
+    cp beegfs_meta/build/dist/etc/beegfs-meta.conf $docDir
+
+    cp beegfs_mgmtd/build/beegfs-mgmtd $binDir
+    cp beegfs_mgmtd/build/dist/sbin/beegfs-setup-mgmtd $binDir
+    cp beegfs_mgmtd/build/dist/etc/beegfs-mgmtd.conf $docDir
+
+    cp beegfs_storage/build/beegfs-storage $binDir
+    cp beegfs_storage/build/dist/sbin/beegfs-setup-storage $binDir
+    cp beegfs_storage/build/dist/etc/beegfs-storage.conf $docDir
+
+    cp beegfs_opentk_lib/build/libbeegfs-opentk.so $libDir
+
+    cp beegfs_client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir
+    cp -r beegfs_client_devel/include/* $includeDir
+
+    cp beeond_thirdparty_gpl/build/parallel $out/bin
+    cp beeond_thirdparty/build/pcopy/p* $out/bin
+    cp beeond_thirdparty/build/pcopy/s* $out/bin
+    cp -r beeond/scripts/* $out
+    cp beeond/source/* $out/bin
+  '';
+
+  postFixup = ''
+    substituteInPlace $out/bin/beegfs-admon-gui \
+      --replace " java " " ${jre}/bin/java " \
+      --replace "/opt/beegfs/beegfs-admon-gui/beegfs-admon-gui.jar" \
+                "$libDirPkg/beegfs-admon-gui.jar"
+
+    substituteInPlace $out/bin/beeond \
+      --replace /opt/beegfs/sbin "$out/bin"
+  '';
+
+  doCheck = true;
+
+  checkPhase = ''
+    beegfs_common/build/test-runner --text
+  '';
+
+  meta = with stdenv.lib; {
+    description = "High performance distributed filesystem with RDMA support";
+    homepage = "https://www.beegfs.io";
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    license = {
+      fullName = "BeeGFS_EULA";
+      url = "https://www.beegfs.io/docs/BeeGFS_EULA.txt";
+      free = false;
+    };
+    maintainers = with maintainers; [ markuskowa ];
+  };
+}
diff --git a/pkgs/os-specific/linux/beegfs/kernel-module.nix b/pkgs/os-specific/linux/beegfs/kernel-module.nix
new file mode 100644
index 0000000000000000000000000000000000000000..63e45928f217852e1f673e880954061dd093f038
--- /dev/null
+++ b/pkgs/os-specific/linux/beegfs/kernel-module.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, which
+, kmod, kernel
+} :
+
+let
+  version = "6.18";
+in stdenv.mkDerivation {
+  name = "beegfs-module-${version}-${kernel.version}";
+
+  src = fetchurl {
+    url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
+    sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
+  };
+
+  hardeningDisable = [ "fortify" "pic" "stackprotector" ];
+
+  nativeBuildInputs = [ which kmod ];
+
+  buildInputs = kernel.moduleBuildDependencies;
+
+  makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build/" ];
+
+  postPatch = ''
+    patchShebangs ./
+    find -type f -name Makefile -exec sed -i "s:/bin/bash:${stdenv.shell}:" \{} \;
+    find -type f -name Makefile -exec sed -i "s:/bin/true:true:" \{} \;
+    find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \;
+  '';
+
+  preBuild = "cd beegfs_client_module/build";
+
+  installPhase = ''
+    instdir=$out/lib/modules/${kernel.modDirVersion}/extras/fs/beegfs
+    mkdir -p $instdir
+    cp beegfs.ko $instdir
+  '';
+
+  meta = with stdenv.lib; {
+    description = "High performance distributed filesystem with RDMA support";
+    homepage = "https://www.beegfs.io";
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ markuskowa ];
+  };
+}
diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix
index 886aa503abbbeec87758988498ce703c1972a606..4ae449c19aa8233c6f14bb35220c3944a6260ab1 100644
--- a/pkgs/os-specific/linux/blktrace/default.nix
+++ b/pkgs/os-specific/linux/blktrace/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libaio }:
 
 stdenv.mkDerivation {
-  name = "blktrace-1.1.0";
+  name = "blktrace-1.2.0";
 
   # Official source
   # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git"
   src = fetchurl {
-    url = "http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2";
-    sha256 = "15cj9aki7z5i5y6bnchqry6yp40r4lmgmam6ar5gslnx0smgm8jl";
+    url = "http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2";
+    sha256 = "0i9z7ayh9qx4wi0ihyz15bhr1c9aknjl8v5i8c9mx3rhyy41i5i6";
   };
 
   buildInputs = [ libaio ];
diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix
deleted file mode 100644
index 11aee0d88f2c444b6da59c034a01b342d2098390..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/bluez/bluez5_28.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
-  pythonPackages, readline, libsndfile, udev, libical,
-  systemd, enableWiimote ? false }:
-
-assert stdenv.isLinux;
-
-let
-  inherit (pythonPackages) python;
-in stdenv.mkDerivation rec {
-  name = "bluez-5.28";
-   
-  src = fetchurl {
-    url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "1a8qzh38wpq5c0rydpx9isf0jc6g14g2qs18j1rmi8a79f7v9fl5";
-  };
-
-  pythonPath = with pythonPackages;
-    [ dbus pygobject2 pygobject3 recursivePthLoader ];
-
-  buildInputs =
-    [ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython
-      readline libsndfile udev libical
-      # Disables GStreamer; not clear what it gains us other than a
-      # zillion extra dependencies.
-      # gstreamer gst-plugins-base 
-    ];
-
-  preConfigure = ''
-      substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm
-      substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci "
-    '';
-
-  configureFlags = [
-    "--localstatedir=/var"
-    "--enable-library"
-    "--enable-cups"
-    "--with-dbusconfdir=$(out)/etc"
-    "--with-dbussystembusdir=$(out)/share/dbus-1/system-services"
-    "--with-dbussessionbusdir=$(out)/share/dbus-1/services"
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-    "--with-systemduserunitdir=$(out)/etc/systemd/user"
-    "--with-udevdir=$(out)/lib/udev"
-    ] ++
-    stdenv.lib.optional enableWiimote [ "--enable-wiimote" ];
-
-  # Work around `make install' trying to create /var/lib/bluetooth.
-  installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
-
-  makeFlags = "rulesdir=$(out)/lib/udev/rules.d";
-
-  # FIXME: Move these into a separate package to prevent Bluez from
-  # depending on Python etc.
-  postInstall = ''
-    mkdir $out/test
-    cp -a test $out
-    pushd $out/test
-    for a in \
-            simple-agent \
-            test-adapter \
-            test-device \
-            test-thermometer \
-            list-devices \
-            monitor-bluetooth \
-            ; do
-      ln -s ../test/$a $out/bin/bluez-$a
-    done
-    popd
-    wrapPythonProgramsIn $out/test "$out/test $pythonPath"
-
-    # for bluez4 compatibility for NixOS
-    mkdir $out/sbin
-    ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
-    ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.bluez.org/;
-    repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
-    description = "Bluetooth support for Linux";
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index e9a1f314abc171709e860a2ec4b6ad0774f94914..d4595d73d942f2218af39f1a404b5cc5512bf3fa 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
   pythonPackages, readline, udev, libical,
-  systemd, enableWiimote ? false }:
+  systemd, enableWiimote ? false, enableMidi ? false }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "bluez-5.47";
+  name = "bluez-5.49";
 
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "1j22hfjz0fp4pgclgz9mfcwjbr4wqgah3gd2qhfg4r6msmybyxfg";
+    sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k";
   };
 
   pythonPath = with pythonPackages;
-    [ dbus pygobject2 pygobject3 recursivePthLoader ];
+    [ dbus-python pygobject2 pygobject3 recursivePthLoader ];
 
   buildInputs = [
     pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-systemduserunitdir=$(out)/etc/systemd/user"
     "--with-udevdir=$(out)/lib/udev"
-    ] ++
-    stdenv.lib.optional enableWiimote [ "--enable-wiimote" ];
+    ] ++ stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]
+    ++ stdenv.lib.optional enableMidi [ "--enable-midi" ];
 
   # Work around `make install' trying to create /var/lib/bluetooth.
   installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 3143968d75c8c76ac232841b9f523b89133c70eb..9423e7a33f4eb0db855fa9210332a37646ddf268 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -16,11 +16,13 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}";
-    sha256 = hashes."${stdenv.system}";
+    sha256 = hashes.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
   };
 
   hardeningDisable = [ "pic" ];
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   patches = [
     ./i686-build-failure.patch
     ./license.patch
@@ -31,6 +33,7 @@ stdenv.mkDerivation {
     ./linux-4.11.patch
     # source: https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl
     ./linux-4.12.patch
+    ./linux-4.15.patch
     ./null-pointer-fix.patch
     ./gcc.patch
   ];
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch
new file mode 100644
index 0000000000000000000000000000000000000000..523fa291d525af6772a4ebe2ead687a19736cccf
--- /dev/null
+++ b/pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch
@@ -0,0 +1,47 @@
+See: https://lkml.org/lkml/2017/11/25/90
+
+diff -urNZ a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+--- a/src/wl/sys/wl_linux.c	2015-09-18 22:47:30.000000000 +0000
++++ b/src/wl/sys/wl_linux.c	2018-01-31 22:52:10.859856221 +0000
+@@ -93,7 +93,11 @@
+
+ #include 
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static void wl_timer(struct timer_list *tl);
++#else
+ static void wl_timer(ulong data);
++#endif
+ static void _wl_timer(wl_timer_t *t);
+ static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
+
+@@ -2298,9 +2302,15 @@
+ }
+
+ static void
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++wl_timer(struct timer_list *tl)
++{
++	wl_timer_t *t = from_timer(t, tl, timer);
++#else
+ wl_timer(ulong data)
+ {
+ 	wl_timer_t *t = (wl_timer_t *)data;
++#endif
+
+ 	if (!WL_ALL_PASSIVE_ENAB(t->wl))
+ 		_wl_timer(t);
+@@ -2352,9 +2362,13 @@
+
+ 	bzero(t, sizeof(wl_timer_t));
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++	timer_setup(&t->timer, wl_timer, 0);
++#else
+ 	init_timer(&t->timer);
+ 	t->timer.data = (ulong) t;
+ 	t->timer.function = wl_timer;
++#endif
+ 	t->wl = wl;
+ 	t->fn = fn;
+ 	t->arg = arg;
diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix
index 6cc4dc6f6d51051d7dacb8b8376fa6b103c6fa22..83c442618b8e65c8c725805904a7c482d33131f2 100644
--- a/pkgs/os-specific/linux/btfs/default.nix
+++ b/pkgs/os-specific/linux/btfs/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "btfs-${version}";
-  version = "2.17";
+  version = "2.18";
 
   src = fetchFromGitHub {
     owner  = "johang";
     repo   = "btfs";
     rev    = "v${version}";
-    sha256 = "0v0mypwnx832f7vg52wmiw0lyz7rrkhqsgi7zc261ak1gfaw4nwd";
+    sha256 = "1cn21bxx43iqvac6scmwhkw0bql092sl48r6qfidbmhbw30xl5yf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A bittorrent filesystem based on FUSE";
-    homepage    = "https://github.com/johang/btfs";
+    homepage    = https://github.com/johang/btfs;
     license     = licenses.gpl3;
     maintainers = with maintainers; [ rnhmjoj ];
     platforms   = platforms.linux;
diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/os-specific/linux/busybox/busybox-in-store.patch
index 0de7348c44fe2b19ae84d9b819902c30b2ed21fb..2d356b66b3aed22be2772eaf0fbba758baafdf80 100644
--- a/pkgs/os-specific/linux/busybox/busybox-in-store.patch
+++ b/pkgs/os-specific/linux/busybox/busybox-in-store.patch
@@ -1,19 +1,19 @@
 Allow BusyBox to be invoked as "-busybox". This is
 necessary when it's run from the Nix store as -busybox during
 stdenv bootstrap.
---- busybox-1.26.1-orig/libbb/appletlib.orig	2016-10-26 19:54:20.510957575 -0400
-+++ busybox-1.26.1/libbb/appletlib.c	2016-10-26 19:48:31.590862853 -0400
-@@ -887,7 +887,7 @@
+--- a/libbb/appletlib.c
++++ b/libbb/appletlib.c
+@@ -947,7 +947,7 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **ar
  static NORETURN void run_applet_and_exit(const char *name, char **argv)
  {
  #  if ENABLE_BUSYBOX
 -	if (is_prefixed_with(name, "busybox"))
 +	if (strstr(name, "busybox") != 0)
- 		exit(busybox_main(argv));
+ 		exit(busybox_main(/*unused:*/ 0, argv));
  #  endif
  #  if NUM_APPLETS > 0
-@@ -981,7 +981,7 @@ int main(int argc UNUSED_PARAM, char **argv)
- 
+@@ -1045,7 +1045,7 @@ int main(int argc UNUSED_PARAM, char **argv)
+
  	lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
  # if !ENABLE_BUSYBOX
 -	if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox"))
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 0030f60000d2021d65dbb29c1ef2fab39f345086..b844bf72d82aa315a93c1fb5d466dd5966bcaa2d 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -1,11 +1,13 @@
 { stdenv, lib, buildPackages, fetchurl, fetchpatch
 , enableStatic ? false
 , enableMinimal ? false
-, useMusl ? false, musl
+, useMusl ? stdenv.hostPlatform.libc == "musl", musl
 , extraConfig ? ""
 , buildPlatform, hostPlatform
 }:
 
+assert stdenv.hostPlatform.libc == "musl" -> useMusl;
+
 let
   configParser = ''
     function parseconfig {
@@ -24,35 +26,31 @@ let
     }
   '';
 
+  libcConfig = lib.optionalString useMusl ''
+    CONFIG_FEATURE_UTMP n
+    CONFIG_FEATURE_WTMP n
+  '';
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.27.2";
+  name = "busybox-1.28.3";
 
   # Note to whoever is updating busybox: please verify that:
   # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
   # still builds after the update.
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "1pv3vs2w4l2wnw5qb0rkbpvjjdd1fwjv87miavqq0r0ynqbfajwx";
+    sha256 = "0via6faqj9xcyi8r39r4n0wxlk8r2292yk0slzwrdri37w1j43dd";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];
 
   patches = [
-    ./busybox-in-store.patch 
-    (fetchpatch {
-      name = "CVE-2017-15873.patch";
-      url = "https://git.busybox.net/busybox/patch/?id=0402cb32df015d9372578e3db27db47b33d5c7b0";
-      sha256 = "1s3xqifd0dww19mbnzrks0i1az0qwd884sxjzrx33d6a9jxv4dzn";
-    })
-    (fetchpatch {
-      name = "CVE-2017-15874.patch";
-      url = "https://git.busybox.net/busybox/patch/?id=9ac42c500586fa5f10a1f6d22c3f797df11b1f6b";
-      sha256 = "0169p4ylz9zd14ghhb39yfjvbdca2kb21pphylfh9ny7i484ahql";
-    })
+    ./busybox-in-store.patch
   ];
 
+  postPatch = "patchShebangs .";
+
   configurePhase = ''
     export KCONFIG_NOTIMESTAMP=1
     make ${if enableMinimal then "allnoconfig" else "defconfig"}
@@ -77,8 +75,12 @@ stdenv.mkDerivation rec {
     # Set paths for console fonts.
     CONFIG_DEFAULT_SETFONT_DIR "/etc/kbd"
 
+    # Bump from 4KB, much faster I/O
+    CONFIG_FEATURE_COPYBUF_KB 64
+
     ${extraConfig}
-    CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.prefix}"
+    CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.targetPrefix}"
+    ${libcConfig}
     EOF
 
     make oldconfig
@@ -87,10 +89,10 @@ stdenv.mkDerivation rec {
   '';
 
   postConfigure = lib.optionalString useMusl ''
-    makeFlagsArray+=("CC=${stdenv.cc.prefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
+    makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
   '';
 
-  nativeBuildInputs = lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ];
 
diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b94fae7f787b73a2607e86f7fd52278b2c607be9
--- /dev/null
+++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix
@@ -0,0 +1,27 @@
+{ busybox, hostPlatform }:
+
+# Minimal shell for use as basic /bin/sh in sandbox builds
+busybox.override {
+  # musl roadmap has RISC-V support projected for 1.1.20
+  useMusl = !hostPlatform.isRiscV;
+  enableStatic = true;
+  enableMinimal = true;
+  extraConfig = ''
+    CONFIG_FEATURE_FANCY_ECHO y
+    CONFIG_FEATURE_SH_MATH y
+    CONFIG_FEATURE_SH_MATH_64 y
+
+    CONFIG_ASH y
+    CONFIG_ASH_OPTIMIZE_FOR_SIZE y
+
+    CONFIG_ASH_ALIAS y
+    CONFIG_ASH_BASH_COMPAT y
+    CONFIG_ASH_CMDCMD y
+    CONFIG_ASH_ECHO y
+    CONFIG_ASH_GETOPTS y
+    CONFIG_ASH_INTERNAL_GLOB y
+    CONFIG_ASH_JOB_CONTROL y
+    CONFIG_ASH_PRINTF y
+    CONFIG_ASH_TEST y
+  '';
+}
diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix
index 6ef5476f8e83db9d24b6b48904158762c9181fba..d77539fb89ed508c85ec6e34e08702a491381917 100644
--- a/pkgs/os-specific/linux/cachefilesd/default.nix
+++ b/pkgs/os-specific/linux/cachefilesd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cachefilesd-${version}";
-  version = "0.10.9";
+  version = "0.10.10";
 
   src = fetchurl {
     url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2";
-    sha256 = "1jkb3qd8rcmli3g2qgcpp1f9kklil4qgy86w7pg2cpv10ikyr5y8";
+    sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd";
   };
 
   installFlags = [
diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index 8e01bb2a5c80279bbb74be5b5d969102fa3cd4b1..6ea73c9ac6c324d5d5d2b9d87778693a82247a46 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -2,27 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "checkpolicy-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz";
-    sha256 = "1m5wjm43lzp6bld8higsvdm2dkddydihhwv9qw2w9r4dm0largcv";
+    sha256 = "009j9jc0hi4l7k8f21hn8fm25n0mqgzdpd4nk30nds6d3nglf4sl";
   };
 
-  # Don't build tests
-  postPatch = ''
-    sed '/-C test/d' -i Makefile
-    sed '1i#include ' -i checkpolicy.c
-  '';
-
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libsepol ];
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-
   preBuild = ''
-    makeFlagsArray+=("LEX=flex")
     makeFlagsArray+=("LIBDIR=${libsepol}/lib")
     makeFlagsArray+=("PREFIX=$out")
   '';
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index 1a879ba33304d56daeecfa9c544348fed0b302b0..1ef18f703d3ff8ae88e0c9cdbf5fc732b00dd9fa 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils }:
+{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils, sysctl }:
 
 stdenv.mkDerivation rec {
   name = "checksec-${version}";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -"
     substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -"
     substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils.out}/bin/readelf"
-    substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${procps}/sbin/sysctl -"
+    substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${sysctl}/bin/sysctl -"
     substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -"
   '';
 
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index 08c6d997795f5e016b68f2ea6b883776292beecf..7b6dd6fba351831894c4b0873ec8ae0563d0ac7b 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, kerberos, keyutils, pam, talloc }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, kerberos, keyutils, pam, talloc }:
 
 stdenv.mkDerivation rec {
   name = "cifs-utils-${version}";
-  version = "6.6";
+  version = "6.8";
 
   src = fetchurl {
     url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
-    sha256 = "09biws1jm23l3mjb9kh99v57z8bgzybrmimwddb40s6y0yl54wfh";
+    sha256 = "0ygz3pagjpaj5ky11hzh4byyymb7fpmqiqkprn11zwj31h2zdlg7";
   };
 
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ kerberos keyutils pam talloc ];
 
   makeFlags = "root_sbindir=$(out)/sbin";
@@ -18,6 +19,5 @@ stdenv.mkDerivation rec {
     description = "Tools for managing Linux CIFS client filesystems";
     platforms = platforms.linux;
     license = licenses.lgpl3;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 8aa1cec9e12f4bef8a94cb8478d61d055f20ead7..e4c45a9440ab5929501ffc54d9dcb0efa2299241 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake
 
 # dependencies
 , glib, libXinerama
@@ -27,6 +27,7 @@
 
 , wirelessSupport     ? true      , wirelesstools ? null
 , nvidiaSupport       ? false     , libXNVCtrl ? null
+, pulseSupport        ? false     , libpulseaudio ? null
 
 , curlSupport         ? true      , curl ? null
 , rssSupport          ? curlSupport
@@ -54,6 +55,7 @@ assert luaCairoSupport || luaImlib2Support
 
 assert wirelessSupport     -> wirelesstools != null;
 assert nvidiaSupport       -> libXNVCtrl != null;
+assert pulseSupport        -> libpulseaudio != null;
 
 assert curlSupport         -> curl != null;
 assert rssSupport          -> curlSupport && libxml2 != null;
@@ -64,13 +66,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "conky-${version}";
-  version = "1.10.6";
+  version = "1.10.8";
 
   src = fetchFromGitHub {
     owner = "brndnmtthws";
     repo = "conky";
     rev = "v${version}";
-    sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8";
+    sha256 = "18kxjmaplqvn81vmvybvpc9qczm7wgcgd4af3a8vsqdv77cn5bwq";
   };
 
   postPatch = ''
@@ -85,8 +87,8 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lgcc_s";
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib cmake libXinerama ]
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ glib libXinerama ]
     ++ optionals docsSupport        [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
     ++ optional  ncursesSupport     ncurses
     ++ optional  x11Support         xlibsWrapper
@@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
     ++ optional  rssSupport         libxml2
     ++ optional  weatherXoapSupport libxml2
     ++ optional  nvidiaSupport      libXNVCtrl
+    ++ optional  pulseSupport       libpulseaudio
     ;
 
   cmakeFlags = []
@@ -119,8 +122,13 @@ stdenv.mkDerivation rec {
     ++ optional weatherXoapSupport  "-DBUILD_WEATHER_XOAP=ON"
     ++ optional wirelessSupport     "-DBUILD_WLAN=ON"
     ++ optional nvidiaSupport       "-DBUILD_NVIDIA=ON"
+    ++ optional pulseSupport        "-DBUILD_PULSEAUDIO=ON"
     ;
 
+  # `make -f src/CMakeFiles/conky.dir/build.make src/CMakeFiles/conky.dir/conky.cc.o`:
+  # src/conky.cc:137:23: fatal error: defconfig.h: No such file or directory
+  enableParallelBuilding = false;
+
   meta = with stdenv.lib; {
     homepage = http://conky.sourceforge.net/;
     description = "Advanced, highly configurable system monitor based on torsmo";
diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix
index ea09050fc60e5b41174c4ca6838a9b4bfa4d99bf..9736d7a8f4bd79a68f56f6bc74674aa105f78707 100644
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ b/pkgs/os-specific/linux/conntrack-tools/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "Connection tracking userspace tools";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ nckx fpletz ];
+    maintainers = with maintainers; [ fpletz ];
   };
 }
diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix
index d6d529627e244ac2a891f2355efbe1e9a8f97b5d..d10b789f3e476c4f6ac314a91808a58f663b75f8 100644
--- a/pkgs/os-specific/linux/cpupower/default.nix
+++ b/pkgs/os-specific/linux/cpupower/default.nix
@@ -1,35 +1,32 @@
-{ stdenv, fetchurl, kernel, coreutils, pciutils, gettext }:
+{ stdenv, buildPackages, fetchurl, kernel, pciutils, gettext }:
 
 stdenv.mkDerivation {
   name = "cpupower-${kernel.version}";
 
   src = kernel.src;
 
-  buildInputs = [ coreutils pciutils gettext ];
+  nativeBuildInputs = [ gettext ];
+  buildInputs = [ pciutils ];
 
-  configurePhase = ''
+  postPatch = ''
     cd tools/power/cpupower
-    sed -i 's,/bin/true,${coreutils}/bin/true,' Makefile
-    sed -i 's,/bin/pwd,${coreutils}/bin/pwd,' Makefile
-    sed -i 's,/usr/bin/install,${coreutils}/bin/install,' Makefile
+    sed -i 's,/bin/true,${buildPackages.coreutils}/bin/true,' Makefile
+    sed -i 's,/bin/pwd,${buildPackages.coreutils}/bin/pwd,' Makefile
+    sed -i 's,/usr/bin/install,${buildPackages.coreutils}/bin/install,' Makefile
   '';
 
-  buildPhase = ''
-    make
-  '';
-
-  installPhase = ''
-    make \
-      bindir="$out/bin" \
-      sbindir="$out/sbin" \
-      mandir="$out/share/man" \
-      includedir="$out/include" \
-      libdir="$out/lib" \
-      localedir="$out/share/locale" \
-      docdir="$out/share/doc/cpupower" \
-      confdir="$out/etc" \
-      install install-man
-  '';
+  makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ];
+
+  installFlags = [
+    "bindir=$(out)/bin"
+    "sbindir=$(out)/sbin"
+    "mandir=$(out)/share/man"
+    "includedir=$(out)/include"
+    "libdir=$(out)/lib"
+    "localedir=$(out)/share/locale"
+    "docdir=$(out)/share/doc/cpupower"
+    "confdir=$(out)/etc"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
index 63330020afe61cfd9da00eca5fb3f8fd05de126e..940913d6a6c8aac6c86758c1d01dd8043a894c81 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -53,6 +53,5 @@ stdenv.mkDerivation rec {
     homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/;
     license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 23d1c4821b8781a4838d7009a63b85f2fac1d09d..fc7a66dcf1b6d354d47cf3a3bef4ae4a820d9a59 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -4,28 +4,23 @@
 
 stdenv.mkDerivation rec {
   name    = "criu-${version}";
-  version = "2.12.1";
+  version = "3.8.1";
 
   src = fetchurl {
     url    = "http://download.openvz.org/criu/${name}.tar.bz2";
-    sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k";
+    sha256 = "0csyhsc5d6wkcjyvsp6h9x8zxn3zk574s84gfmy3gjagv3nwqd51";
   };
 
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig docbook_xsl ];
   buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ];
 
-  patchPhase = ''
-    chmod +w ./scripts/gen-offsets.sh
-    substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
+  postPatch = ''
     substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
     substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
     substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3"
     substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0"
     ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
-
-    # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
-    sed 1i'#include ' -i criu/include/util.h
   '';
 
   buildPhase = "make PREFIX=$out";
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 7caf5e359d03436bdbcb67dc3d8f731f5b570c70..67e4df3d6f9ddb2e16f10b39286a9815b50f4459 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -1,32 +1,31 @@
-{ stdenv, fetchgit, fetchFromGitHub, meson, ninja, pkgconfig
-, dbus, glib, systemd }:
+{ stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig
+, dbus, glib, linuxHeaders, systemd }:
 
 stdenv.mkDerivation rec {
   name = "dbus-broker-${version}";
-  version = "3";
+  version = "11";
 
   src = fetchFromGitHub {
     owner           = "bus1";
     repo            = "dbus-broker";
     rev             = "v${version}";
-    sha256          = "1f2vw5b2cbdgd3g7vnzwr9lsw9v4xc5nc0nf9xc3qb5xqzsq7v7i";
+    sha256          = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b";
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
-  buildInputs = [ dbus glib systemd ];
+  nativeBuildInputs = [ docutils meson ninja pkgconfig ];
 
-  prePatch = ''
-    substituteInPlace meson.build \
-      --replace "dep_systemd.get_pkgconfig_variable('systemdsystemunitdir')" "'$out/lib/systemd/system'" \
-      --replace "dep_systemd.get_pkgconfig_variable('systemduserunitdir')"   "'$out/lib/systemd/user'"
-  '';
+  buildInputs = [ dbus glib linuxHeaders systemd ];
+
+  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system";
+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user";
 
   postInstall = ''
     install -Dm644 ../README $out/share/doc/dbus-broker/README
-  '';
 
-  checkPhase = "ninja test";
+    sed -i $out/lib/systemd/{system,user}/dbus-broker.service \
+      -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,'
+  '';
 
   doCheck = true;
 
diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix
index a63aceedee374918ecaab9d782cb23d2aef8d036..b11a4d6d8f2cc27fd6590222520faa9454a369fb 100644
--- a/pkgs/os-specific/linux/directvnc/default.nix
+++ b/pkgs/os-specific/linux/directvnc/default.nix
@@ -1,22 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, directfb, zlib, libjpeg, xproto }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xproto }:
 
 stdenv.mkDerivation rec {
-  name="directvnc-${version}";
-  version="0.7.5-test-051207";
+  name = "directvnc-${version}";
+  version = "0.7.7.2015-04-16";
 
-  src = fetchurl {
-    url = "http://directvnc-rev.googlecode.com/files/directvnc-${version}.tar.gz";
-    sha256 = "1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9";
+  src = fetchFromGitHub {
+    owner = "drinkmilk";
+    repo = "directvnc";
+    rev = "d336f586c5865da68873960092b7b5fbc9f8617a";
+    sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    directfb zlib libjpeg xproto
-  ];
-      
-  meta = {
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ directfb zlib libjpeg xproto ];
+
+  meta = with stdenv.lib; {
     description = "DirectFB VNC client";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = with stdenv.lib.platforms; linux;
+    homepage = http://drinkmilk.github.io/directvnc/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/directvnc/src-for-default.nix b/pkgs/os-specific/linux/directvnc/src-for-default.nix
deleted file mode 100644
index 1141a1133f505f12d8bb30a70cea16682e8e2bcb..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/directvnc/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="0.7.5-test-051207";
-   name="directvnc-0.7.5-test-051207";
-   hash="1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9";
-   url="http://directvnc-rev.googlecode.com/files/directvnc-${version}.tar.gz";
-   advertisedUrl="http://directvnc-rev.googlecode.com/files/directvnc-0.7.5-test-051207.tar.gz";
-  
-  
-}
diff --git a/pkgs/os-specific/linux/directvnc/src-info-for-default.nix b/pkgs/os-specific/linux/directvnc/src-info-for-default.nix
deleted file mode 100644
index 5c3ac7171addcd00ae8e343514d978dcb3c13318..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/directvnc/src-info-for-default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  downloadPage = "http://code.google.com/p/directvnc-rev/downloads/list";
-  baseName = "directvnc";
-  versionExtractorSedScript = ''s/[^0-9]*-([0-9].*[0-9])[.].*/\1/'';
-}
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index f561a65ea5cabd8de1daf91c08508256f03f17a2..55be85d33f05bcf785a5bcd1c7314f9dad9df794 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -11,17 +11,17 @@ let
 
 in stdenv.mkDerivation rec {
   name = "displaylink-${version}";
-  version = "1.3.52";
+  version = "4.1.9";
 
   src = requireFile rec {
     name = "displaylink.zip";
-    sha256 = "0ridpsxcf761vym0nlpq702qa46ynddzci17bjmyax2pph7khr0k";
+    sha256 = "d762145014df7fea8ca7af12206a077d73d8e7f2259c8dc2ce7e5fb1e69ef9a3";
     message = ''
       In order to install the DisplayLink drivers, you must first
       comply with DisplayLink's EULA and download the binaries and
       sources from here:
 
-      http://www.displaylink.com/downloads/file?id=744
+      http://www.displaylink.com/downloads/file?id=1087
 
       Once you have downloaded the file, please use the following
       commands and re-run the installation:
@@ -57,6 +57,9 @@ in stdenv.mkDerivation rec {
     fixupPhase
   '';
 
+  dontStrip = true;
+  dontPatchELF = true;
+
   meta = with stdenv.lib; {
     description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux";
     platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index 76f9d8c128c3f3dd8526e1ac1a1680cf02640c69..534e57354474ce33bc84f5df7093b9e23c8be88c 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "dmtcp-${version}";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "dmtcp";
     repo = "dmtcp";
     rev = version;
-    sha256 = "1z6cc7avs2sj8csf7rapf7nbw0giva6xpj0cshv7p9s643y8yxmi";
+    sha256 = "1sq38in4wk855yhfnzbs9xpnps97fhja93w08xjmx7szzm33g5a8";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index e44a50233c340cfa25e75f7c763d1b562a55c585..4bd50fdae40f1cad96aa9c7e0260ec447b57451c 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies;
   buildInputs = [ libvirt ];
 
   RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index 366cc9787f283dbc4ce462525d9716b2b8cd43fa..81cc6b4fbd8e16ad52ff2647d01289daf6df24fe 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -19,6 +19,6 @@ python2Packages.buildPythonApplication rec {
     description = "Versatile resource statistics tool";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ jgeerds nckx ];
+    maintainers = with maintainers; [ jgeerds ];
   };
 }
diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index 363ecf4fc41c4c18033571d3dc008827022feae8..e3f382ababc386f5fde99bd1851e412402edc14e 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -1,41 +1,41 @@
 { lib, stdenv, fetchFromGitHub, kernel, kmod }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.0";
+  version = "1.5.2";
   name = "ena-${version}-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "amzn-drivers";
     rev = "ena_linux_${version}";
-    sha256 = "0m0jqd6gyk4r43w6p5dvp1djg2qgvyhnzmg53sszlh55mlgla714";
+    sha256 = "18wf36092kr3zlpnqdkcdlim3vvjxy5f24zzsv4fwa7xg12mcfjm";
   };
 
   hardeningDisable = [ "pic" ];
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   # linux 3.12
   NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
 
-  configurePhase =
-    ''
-      cd kernel/linux/ena
-      substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion}
-    '';
-
-  installPhase =
-    ''
-      strip -S ena.ko
-      dest=$out/lib/modules/${kernel.modDirVersion}/misc
-      mkdir -p $dest
-      cp ena.ko $dest/
-      xz $dest/ena.ko
-    '';
-
-  meta = {
+  configurePhase = ''
+    cd kernel/linux/ena
+    substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion}
+  '';
+
+  installPhase = ''
+    strip -S ena.ko
+    dest=$out/lib/modules/${kernel.modDirVersion}/misc
+    mkdir -p $dest
+    cp ena.ko $dest/
+    xz $dest/ena.ko
+  '';
+
+  meta = with stdenv.lib; {
     description = "Amazon Elastic Network Adapter (ENA) driver for Linux";
     homepage = https://github.com/amzn/amzn-drivers;
-    license = lib.licenses.gpl2;
-    maintainers = [ lib.maintainers.eelco ];
-    platforms = lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index 67ce39ddbd393b391361ac67be99a85a397a9cf8..0ca85c7e50bccf60c0b7b32a2221d32079d63e59 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="eudev";
-    version = "3.2.4";
+    version = "3.2.5";
     name="${baseName}-${version}";
     url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz";
-    sha256 = "1vbg2k5mngyxdcdw4jkkzxbwdgrcr643hkby1whz7x91kg4g9p6x";
+    sha256 = "1bwh72brp4dvr2dm6ng0lflic6abl87h8zk209im5lna0m0x1hj9";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 11d0a461da09a51c5ae78a3ba1bb061b72752ea0..730df56a6429bd4512e42473d4f210ac70a96c04 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -2,20 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "evdi-${version}";
-  version = "1.4.1+git2017-06-12";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "DisplayLink";
     repo = "evdi";
-    rev = "ee1c578774e62fe4b08d92750620ed3094642160";
-    sha256 = "1m3wkmw4hjpjax7rvhmpicz09d7vxcxklq797ddjg6ljvf12671b";
+    rev = "v${version}";
+    sha256 = "01z7bx5rgpb5lc4c6dxfiv52ni25564djxmvmgy3d7r1x1mqhxgs";
   };
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   buildInputs = [ kernel libdrm ];
 
   makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
 
-  hardeningDisable = [ "pic" "format" ];
+  hardeningDisable = [ "format" "pic" "fortify" ];
 
   installPhase = ''
     install -Dm755 module/evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko
@@ -27,6 +29,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2;
     homepage = http://www.displaylink.com/;
-    broken = versionOlder kernel.version "4.9" || !stdenv.lib.versionOlder kernel.version "4.13";
+    broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "4.15";
   };
 }
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index cd11a79c8f82deb81cc542c3236fb389a52ca686..e2647112f1b2b33657fe51a8ab93bf1163f09e4e 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.04";
+  version = "0.04.03";
   src = fetchzip {
     url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
-    sha256 = "1sqf1mfafrw6402qx457gh8yxgsw80311qi0lp4cjl9dfz7vl2x1";
+    sha256 = "0yv7rpdg07rihw8iilvigib963nxf16mn26hzlb6qd1wv54k6dbr";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];
diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index ee6249ce04081ffa4a39138c701ac97aa014685f..0adeac7115df6297a87af36b95e35e246990b2b3 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -6,17 +6,19 @@ assert lib.versionAtLeast kernel.version  "4.2" || lib.versionOlder kernel.versi
 
 stdenv.mkDerivation rec {
   name = "exfat-nofuse-${version}-${kernel.version}";
-  version = "2017-06-19";
+  version = "2018-04-16";
 
   src = fetchFromGitHub {
     owner = "dorimanx";
     repo = "exfat-nofuse";
-    rev = "de4c760bc9a05ead83bc3ec6eec6cf1fb106f523";
-    sha256 = "0v979d8sbcb70lakm4jal2ck3gspkdgq9108k127f7ph08vf8djm";
+    rev = "01c30ad52625a7261e1b0d874553b6ca7af25966";
+    sha256 = "0n1ibamf1yj8iqapc86lfscnky9p07ngsi4f2kpv3d5r2s6mzsh6";
   };
 
   hardeningDisable = [ "pic" ];
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   makeFlags = [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
index 720bc34c41978d1dc5c59e198617335740e46d06..d65018c600ecbb97605812636203e00489f9e564 100644
--- a/pkgs/os-specific/linux/facetimehd/default.nix
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
   '';
 
   hardeningDisable = [ "pic" ];
+  
+  nativeBuildInputs = kernel.moduleBuildDependencies;
 
   makeFlags = [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index f68856f6b86e308a662b85d9d3c06e859318a71f..6f6418edc3e561d2c647e337d270f88ff307034b 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fatrace-${version}";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchurl {
     url = "http://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "0szn86rbbvmjcw192vjhhgc3v99s5lm2kg93gk1yzm6ay831grsh";
+    sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx";
   };
 
   buildInputs = [ python3 which ];
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
       Requires a Linux kernel with the FANOTIFY configuration option enabled.
       Enabling X86_MSR is also recommended for power-usage-report on x86.
     '';
-    maintainers = with maintainers; [ nckx ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index aa273ec613eef5481863e86cc9f5f55c56688670..4e3e373d244c7a35e3d0170fc9a8100bf7ce47c8 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -11,7 +11,7 @@
 
 let
 
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   libOnly = prefix == "lib";
 
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}ffado-${version}";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "http://www.ffado.org/files/libffado-${version}.tgz";
-    sha256 = "122z8gya60nyg47i738z2yr4qcjyk2xix4kwhf5ybkmp23kcgqqq";
+    sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f";
   };
 
   nativeBuildInputs = [ scons pkgconfig which makeWrapper python ];
@@ -41,12 +41,8 @@ stdenv.mkDerivation rec {
     optXdg_utils libxmlxx glibmm
   ];
 
-  patches = [
-    ./gcc6.patch
-    ./glibc226.patch
-  ];
-
   postPatch = ''
+    sed '1iimport sys' -i SConstruct
     # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch
     # Let's just skip this and tell it which to build
     sed '/def is_userspace_32bit(cpuinfo):/a\
diff --git a/pkgs/os-specific/linux/ffado/gcc6.patch b/pkgs/os-specific/linux/ffado/gcc6.patch
deleted file mode 100644
index f9cad9c88abd0ccc6a04c34a323781ec16c9a221..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/ffado/gcc6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Adrian Knoth 
-Forwarded: Yes
-Applied-Upstream: 2.3.1
-Last-Update: 2016-08-11
-Description: Fix FTBFS with gcc6
-
-Index: b/src/ffadotypes.h
-===================================================================
---- a/src/ffadotypes.h
-+++ b/src/ffadotypes.h
-@@ -51,6 +51,8 @@ struct ffado_handle {
- };
- 
- 
-+#include 
-+#include 
- #include 
- #include 
- 
diff --git a/pkgs/os-specific/linux/ffado/glibc226.patch b/pkgs/os-specific/linux/ffado/glibc226.patch
deleted file mode 100644
index e147ee9aa76a5019ab6a0ce79ed0d2049693fe61..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/ffado/glibc226.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libffado/src/libutil/PosixMessageQueue.cpp  (revision 2705)
-+++ libffado/src/libutil/PosixMessageQueue.cpp  (revision 2706)
-@@ -30,6 +30,7 @@
- #include 
- #include 
- #include 
-+#include 
-
- #define MQ_INVALID_ID ((mqd_t) -1)
- // one second
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 5ee8ab564b09df5d7d2a5edf9670acf820674f23..1c7ebce9f877ba3af042d7d457840bc311dce255 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.50";
+    version="0.9.52";
     name="${baseName}-${version}";
-    hash="005q7f1h7z4c1wg8vzb1zh0xi4msz6z0fcph0y3ywhlbxjvpam61";
-    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.50.tar.xz";
-    sha256="005q7f1h7z4c1wg8vzb1zh0xi4msz6z0fcph0y3ywhlbxjvpam61";
+    hash="0w8l8z4j7iph8fp7rchhnfsrik3f00f9v5xr191fp38fphzcj56s";
+    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.52.tar.xz";
+    sha256="0w8l8z4j7iph8fp7rchhnfsrik3f00f9v5xr191fp38fphzcj56s";
   };
   buildInputs = [
     which
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
index 4f09410c75e57b5a74262e4bca8688afd8cefdec..2637beb517a3e660ddfdb7d5f6c659879f534f2b 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
@@ -25,6 +25,5 @@ stdenv.mkDerivation rec {
     homepage = http://wireless.kernel.org/en/users/Drivers/b43;
     downloadPage = http://www.lwfinger.com/b43-firmware;
     license = licenses.unfree;
-    maintainers = with maintainers; [ nckx ];
   };
 }
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 bbacd615cf20d9c231c5cb06e45a20757b975f2e..724498b960c03ef70e2f18d5718aaba2ce9fd931 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,46 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2017-10-09-${src.iwlRev}";
+  version = "2018-03-20";
 
-  # The src runCommand automates the process of building a merged repository of both
-  #
-  # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
-  # http://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
-  #
-  # This gives us up to date iwlwifi firmware as well as
-  # the usual set of firmware. firmware/linux-firmware usually lags kernel releases
-  # so iwlwifi cards will fail to load on newly released kernels.
-  #
-  # To update, go to the above repositories and look for latest tags / commits, then
-  # update version to the more recent commit date
-
-  src = runCommand "firmware-linux-nonfree-src-merged-${version}" {
-    # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
-    baseRev = "bf04291309d3169c0ad3b8db52564235bbd08e30";
-    iwlRev = "iwlwifi-fw-2017-11-03";
-
-    # randomly mutate the hash to break out of fixed hash, when updating
-    outputHash = "11izv1vpq9ixlqdss19lzs5q289d7jxr5kgf6iymk4alxznffd8z";
-
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-    buildInputs = [ git gnupg ];
-    NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-  } ''
-    git init src && (
-      cd src
-      git config user.email "build-daemon@nixos.org"
-      git config user.name "Nixos Build Daemon $name"
-      git remote add base git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
-      git remote add iwl git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
-      git fetch base $baseRev
-      git checkout -b work FETCH_HEAD
-      git fetch iwl $iwlRev
-      git merge FETCH_HEAD)
-    rm -rf src/.git
-    cp -a src $out
-  '';
+  src = fetchgit {
+    url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
+    rev = "8c1e439c967a50f0698d61aafdba3841aff10db0";
+    sha256 = "110vxgahyx5dvylqrxsm5cmx4a32cl2zchvm6cgc270jz75fg7wd";
+  };
 
   preInstall = ''
     mkdir -p $out
@@ -49,12 +16,15 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "DESTDIR=$(out)" ];
 
+  # Firmware blobs do not need fixing and should not be modified
+  dontFixup = true;
+
   meta = with stdenv.lib; {
     description = "Binary firmware collection packaged by kernel.org";
     homepage = http://packages.debian.org/sid/firmware-linux-nonfree;
     license = licenses.unfreeRedistributableFirmware;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ wkennington fpletz ];
+    maintainers = with maintainers; [ fpletz ];
     priority = 6; # give precedence to kernel firmware
   };
 
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 09ca05484f7fb3d78181e9ea70166b31db3705c1..646c18860c5da1344c4b44a8bc90277c88710270 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -1,31 +1,90 @@
-{ stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool
-, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive
-, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar
-, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3
-, pillow, ninja, gcab
+{ stdenv, fetchurl, fetchpatch, gtk-doc, pkgconfig, gobjectIntrospection, intltool
+, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib-networking
+, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales
+, fwupdate, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl
+, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib
+, shared-mime-info, umockdev
 }:
-let version = "0.9.6";
-in
-  stdenv.mkDerivation
-    { name = "fwupd-${version}";
-      src = fetchurl
-        { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-          sha256 = "0h3y4ygckvkjdx7yxwbm273iv84yk37ivlcf4xvq95g64vs8gfhf";
-        };
-      buildInputs =
-        [ gtk_doc pkgconfig gobjectIntrospection intltool libgudev
-          polkit appstream-glib gusb sqlite libarchive libsoup
-          docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind
-          meson gpgme libuuid pygobject3 pillow ninja gcab
-        ];
-      patches = [ ./fix-missing-deps.patch ];
-      preConfigure = ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${efivar}/include/efivar"
-      '';
-      mesonFlags = [ "-Denable-colorhug=false" "-Denable-man=false" "-Denable-tests=false" "--localstatedir=/var" "-Denable-doc=false" "-Dwith-bootdir=/boot" ];
-      enableParallelBuilding = true;
-      meta =
-        { license = [ stdenv.lib.licenses.gpl2 ];
-          platforms = stdenv.lib.platforms.linux;
-        };
-    }
+let
+  # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
+  version = "1.0.5";
+  python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
+  installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
+in stdenv.mkDerivation {
+  name = "fwupd-${version}";
+  src = fetchurl {
+    url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
+    sha256 = "0wm195vkf6x1kg1dz0sbfwpdcn9f6638l7vyzplcfrb3v07pqxpq";
+  };
+
+  outputs = [ "out" "devdoc" "man" "installedTests" ];
+
+  nativeBuildInputs = [
+    meson ninja gtk-doc pkgconfig gobjectIntrospection intltool glibcLocales shared-mime-info
+    valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook
+  ];
+  buildInputs = [
+    polkit appstream-glib gusb sqlite libarchive libsoup elfutils libsmbios fwupdate libyaml
+    libgudev colord gpgme libuuid gnutls glib-networking efivar json-glib umockdev
+  ];
+
+  LC_ALL = "en_US.UTF-8"; # For po/make-images
+
+  patches = [
+    ./fix-missing-deps.patch
+    (fetchpatch {
+      url = https://github.com/hughsie/fwupd/commit/767210e4b1401d5d5bb7ac1e7c052a60b6529d88.patch;
+      sha256 = "00adfabxpgdg74jx7i6jihhh8njjk2r7v3fxqs4scj3vn06k5fmw";
+    })
+  ];
+
+  postPatch = ''
+    # needs a different set of modules than po/make-images
+    escapedInterpreterLine=$(echo "${installedTestsPython}/bin/python3" | sed 's|\\|\\\\|g')
+    sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" data/installed-tests/hardware.py
+
+    patchShebangs .
+    substituteInPlace data/installed-tests/fwupdmgr.test.in --subst-var-by installedtestsdir "$installedTests/share/installed-tests/fwupd"
+  '';
+
+  doCheck = true;
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
+  '';
+
+  mesonFlags = [
+    "-Dplugin_dummy=true"
+    "-Dbootdir=/boot"
+    "-Dudevdir=lib/udev"
+    "-Dsystemdunitdir=lib/systemd/system"
+    "--localstatedir=/var"
+  ];
+
+  postInstall = ''
+    moveToOutput share/installed-tests "$installedTests"
+    wrapProgram $installedTests/share/installed-tests/fwupd/hardware.py \
+      --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0"
+  '';
+
+  passthru = {
+    filesInstalledToEtc = [
+      "fwupd/remotes.d/fwupd.conf"
+      "fwupd/remotes.d/lvfs-testing.conf"
+      "fwupd/remotes.d/lvfs.conf"
+      "fwupd/remotes.d/vendor.conf"
+      "pki/fwupd/GPG-KEY-Hughski-Limited"
+      "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
+      "pki/fwupd/LVFS-CA.pem"
+      "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
+      "pki/fwupd-metadata/LVFS-CA.pem"
+    ];
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://fwupd.org/;
+    maintainers = with maintainers; [];
+    license = [ licenses.gpl2 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch
index be199227f3f8244463ad94970b7ffd27e1616acb..d1d7c06027f9d80ec3f01791e0f3062a21a60548 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch
@@ -1,86 +1,99 @@
-diff -Naur fwupd-0.9.6-orig/data/meson.build fwupd-0.9.6/data/meson.build
---- fwupd-0.9.6-orig/data/meson.build	2017-08-03 05:45:02.000000000 -0400
-+++ fwupd-0.9.6/data/meson.build	2017-09-02 19:58:37.324596487 -0400
-@@ -20,7 +20,7 @@
+--- a/data/builder/meson.build
++++ b/data/builder/meson.build
+@@ -1,3 +0,0 @@
+-install_data('README.md',
+-  install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder')
+-)
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -7,16 +7,12 @@
+   subdir('installed-tests')
+ endif
+ 
+-install_data(['daemon.conf'],
+-  install_dir : join_paths(sysconfdir, 'fwupd')
+-)
+-
+ install_data(['org.freedesktop.fwupd.metainfo.xml'],
+   install_dir: join_paths(datadir, 'metainfo')
  )
  
- install_data(['90-fwupd-devices.rules'],
--  install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
-+  install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d')
+ install_data(['org.freedesktop.fwupd.conf'],
+-  install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
++  install_dir : join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d')
  )
  
- con2 = configuration_data()
-@@ -52,7 +52,7 @@
-     output : 'fwupd-offline-update.service',
-     configuration : con2,
-     install: true,
--    install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
-+    install_dir: join_paths(get_option('prefix'), 'lib', 'systemd', 'system'),
+ install_data(['metadata.xml'],
+--- a/data/pki/meson.build
++++ b/data/pki/meson.build
+@@ -3,13 +3,13 @@
+       'GPG-KEY-Hughski-Limited',
+       'GPG-KEY-Linux-Vendor-Firmware-Service',
+     ],
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
++    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
    )
- endif
  
-@@ -63,6 +63,6 @@
-     output : 'fwupd.service',
-     configuration : con2,
-     install: true,
--    install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
-+    install_dir: join_paths(get_option('prefix'), 'lib', 'systemd', 'system'),
+   install_data([
+       'GPG-KEY-Linux-Vendor-Firmware-Service',
+     ],
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
++    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
    )
  endif
-diff -Naur fwupd-0.9.6-orig/libdfu/meson.build fwupd-0.9.6/libdfu/meson.build
---- fwupd-0.9.6-orig/libdfu/meson.build	2017-08-03 05:45:02.000000000 -0400
-+++ fwupd-0.9.6/libdfu/meson.build	2017-09-02 19:58:37.325596508 -0400
-@@ -23,6 +23,10 @@
-   giounix,
-   libm,
-   gusb,
-+  uuid,
-+  libarchive,
-+  soup,
-+  libgcab
- ]
  
- if get_option('enable-libelf')
-diff -Naur fwupd-0.9.6-orig/meson.build fwupd-0.9.6/meson.build
---- fwupd-0.9.6-orig/meson.build	2017-08-03 05:45:02.000000000 -0400
-+++ fwupd-0.9.6/meson.build	2017-09-02 19:59:07.406216716 -0400
-@@ -124,6 +124,7 @@
- if polkit.version().version_compare('>= 0.114')
-   conf.set('HAVE_POLKIT_0_114', '1')
+@@ -17,12 +17,12 @@
+   install_data([
+       'LVFS-CA.pem',
+     ],
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
++    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
+   )
+   install_data([
+       'LVFS-CA.pem',
+     ],
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
++    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
+   )
  endif
-+libgcab = dependency('libgcab-1.0')
- gudev = dependency('gudev-1.0')
- appstream_glib = dependency('appstream-glib', version : '>= 0.6.9')
- gusb = dependency('gusb', version : '>= 0.2.9')
-@@ -200,7 +201,7 @@
-                         'fwupd-plugins-2')
- conf.set_quoted('PLUGINDIR', plugin_dir)
  
--conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
-+conf.set_quoted('SYSCONFDIR', '/etc')
- conf.set_quoted('BINDIR',
-                 join_paths(get_option('prefix'),
-                            get_option('bindir')))
-@@ -227,6 +228,9 @@
- plugin_deps += gmodule
- plugin_deps += gusb
- plugin_deps += soup
-+plugin_deps += libarchive
-+plugin_deps += uuid
-+plugin_deps += libgcab
- 
- subdir('data')
- subdir('docs')
-@@ -255,6 +259,3 @@
-   endif
+--- a/data/remotes.d/meson.build
++++ b/data/remotes.d/meson.build
+@@ -3,7 +3,7 @@
+       'lvfs.conf',
+       'lvfs-testing.conf',
+     ],
+-    install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
++    install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d')
+   )
  endif
  
--if get_option('enable-systemd')
--  meson.add_install_script('meson_post_install.sh', systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir)
--endif
-diff -Naur fwupd-0.9.6-orig/po/make-images.sh fwupd-0.9.6/po/make-images.sh
---- fwupd-0.9.6-orig/po/make-images.sh	2017-08-03 05:45:02.000000000 -0400
-+++ fwupd-0.9.6/po/make-images.sh	2017-09-02 19:58:37.328596570 -0400
+@@ -19,12 +19,12 @@
+   output : 'fwupd.conf',
+   configuration : con2,
+   install: true,
+-  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
++  install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
+ )
+ configure_file(
+   input : 'vendor.conf',
+   output : 'vendor.conf',
+   configuration : con2,
+   install: true,
+-  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
++  install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
+ )
+--- a/meson_post_install.sh
++++ b/meson_post_install.sh
+@@ -11,6 +11,4 @@
+     echo 'Updating systemd deps'
+     mkdir -p ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants
+     ln -sf ../fwupd-offline-update.service ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants/fwupd-offline-update.service
+-    echo 'Creating stateful directory'
+-    mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd
+ #fi
+--- a/po/make-images.sh
++++ b/po/make-images.sh
 @@ -7,6 +7,7 @@
  #
  install -m 0755 -d ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/
@@ -89,26 +102,3 @@ diff -Naur fwupd-0.9.6-orig/po/make-images.sh fwupd-0.9.6/po/make-images.sh
  for x in ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/*/LC_IMAGES/*.bmp ; do
      gzip -f ${x}
  done
-diff -Naur fwupd-0.9.6-orig/src/meson.build fwupd-0.9.6/src/meson.build
---- fwupd-0.9.6-orig/src/meson.build	2017-08-03 05:45:02.000000000 -0400
-+++ fwupd-0.9.6/src/meson.build	2017-09-02 19:58:37.329596590 -0400
-@@ -24,6 +24,9 @@
-     polkit,
-     soup,
-     sqlite,
-+    uuid,
-+    libarchive,
-+    libgcab
-   ],
-   link_with : fwupd,
-   c_args : [
-@@ -73,6 +76,9 @@
-     gpgme,
-     gpgerror,
-     valgrind,
-+    uuid,
-+    libarchive,
-+    libgcab
-   ],
-   link_with : fwupd,
-   c_args : [
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
index f2bb9bddd578e5a08f2b2925a248ab6044400a23..fd0d222eaac8b0512e2d722f8ada04bc39eba003 100644
--- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
@@ -1,37 +1,62 @@
-{ stdenv, fetchurl, gnu-efi, efivar, libsmbios, popt, pkgconfig
-, gettext }:
-let version = "8"; in
-  stdenv.mkDerivation
-    { name = "fwupdate-${version}";
-      src = fetchurl
-        { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
-          sha256 = "10q8k1kghvbcb5fwcl2smzp8vqdfzimx9dkk0c3hz39py1phy4n8";
-        };
-      makeFlags =
-        [ "EFIDIR=nixos"
-          "LIBDIR=$(out)/lib"
-          "GNUEFIDIR=${gnu-efi}/lib"
-          "TARGETDIR=$(out)/boot/efi/nixos/"
-          "prefix=$(out)/"
-        ];
-  nativeBuildInputs = [ pkgconfig ];
-      buildInputs = [ gnu-efi libsmbios popt gettext ];
-      propagatedBuildInputs = [ efivar ];
-      # TODO: Just apply the disable to the efi subdir
-      hardeningDisable = [ "all" ];
-      patchPhase = ''
-        sed -i 's|/usr/include/smbios_c/token.h|smbios_c/token.h|' \
-          linux/libfwup.c
-        sed -i 's|/usr/share|$(prefix)share|' linux/Makefile
-        sed -i "s|/usr/include|$out/include|" linux/fwup.pc.in
-        find . -type f -print0 | xargs -0 sed -i -e 's|/boot/efi|/boot|g' -e 's|/boot/efi/EFI|/boot/EFI|g'
-      '';
-      configurePhase = ''
-        arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' )
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi -I${efivar}/include/efivar -I${gnu-efi}/include/efi/$arch"
-      '';
-      meta =
-        { license = [ stdenv.lib.licenses.gpl2 ];
-          platforms = stdenv.lib.platforms.linux;
-        };
-    }
+{ efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }:
+let
+  version = "10";
+in stdenv.mkDerivation {
+  name = "fwupdate-${version}";
+  src = fetchurl {
+    url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
+    sha256 = "0fpk3q0msq2l0bs2mvk0cqp8jbwnmi17ggc81r4v96h4jxh2rx3k";
+  };
+
+  patches = [
+    # https://github.com/rhboot/fwupdate/pull/99
+    ./fix-paths.patch
+    ./do-not-create-sharedstatedir.patch
+  ];
+
+  NIX_CFLAGS_COMPILE = [ "-I${gnu-efi}/include/efi" ];
+
+  # TODO: Just apply the disable to the efi subdir
+  hardeningDisable = [ "stackprotector" ];
+
+  makeFlags = [
+    "EFIDIR=nixos"
+    "prefix=$(out)"
+    "LIBDIR=$(out)/lib"
+    "GNUEFIDIR=${gnu-efi}/lib"
+    "ESPMOUNTPOINT=$(out)/boot"
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    gettext
+  ];
+
+  buildInputs = [
+    gnu-efi
+    libsmbios
+    popt
+  ];
+
+  propagatedBuildInputs = [
+    efivar
+  ];
+
+  # TODO: fix wrt cross-compilation
+  preConfigure = ''
+    arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' )
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi/$arch"
+  '';
+
+  postInstall = ''
+    rm -rf $out/src
+    rm -rf $out/lib/debug
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tools for using the ESRT and UpdateCapsule() to apply firmware updates";
+    maintainers = with maintainers; [ ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch b/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b8588ef2b11a1ea96c04364a1bf6b995fef579ba
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch
@@ -0,0 +1,10 @@
+--- a/linux/Makefile
++++ b/linux/Makefile
+@@ -131,7 +131,6 @@
+ 		ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so.1,$(DESTDIR)$(libdir)/$(x)) ;\
+ 		ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so,$(DESTDIR)$(libdir)/$(x)) ;\
+ 		)
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(sharedstatedir)/fwupdate/
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)/fwupdate/
+ 	$(INSTALL) -m 755 cleanup $(DESTDIR)$(libexecdir)/fwupdate/cleanup
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b01dfa355ef7090c7c4890d12b762fc937758f70
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch
@@ -0,0 +1,116 @@
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -18,19 +18,20 @@
+ ABIDIFF		:= abidiff
+ ABIDW		:= abidw
+ prefix		?= /usr/
+-prefix		:= $(abspath $(prefix))/
++prefix		:= $(abspath $(prefix))
++exec_prefix		?= $(prefix)
+ ARCH		= $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
+ ifeq ($(ARCH),x86_64)
+-  LIBDIR	?= $(prefix)lib64
++  LIBDIR	?= $(exec_prefix)/lib64
+ endif
+ ifeq ($(ARCH),ia32)
+-  LIBDIR	?= $(prefix)lib
++  LIBDIR	?= $(exec_prefix)/lib
+ endif
+ ifeq ($(ARCH),aarch64)
+-  LIBDIR	?= $(prefix)lib64
++  LIBDIR	?= $(exec_prefix)/lib64
+ endif
+ ifeq ($(ARCH),arm)
+-  LIBDIR	?= $(prefix)lib
++  LIBDIR	?= $(exec_prefix)/lib
+ endif
+ LIBDIR		?= unknown
+ ifeq ($(LIBDIR),unknown)
+@@ -45,13 +46,13 @@
+ GNUEFIDIR	?= $(LIBDIR)/gnuefi
+ libdir		?= $(LIBDIR)
+ pcdir		?= $(libdir)/pkgconfig
+-mandir		?= $(prefix)share/man
+-includedir	?= $(prefix)include
+-bindir		?= $(prefix)bin
+-datadir 	?= $(prefix)share
++mandir		?= $(prefix)/share/man
++includedir	?= $(prefix)/include
++bindir		?= $(exec_prefix)/bin
++datadir 	?= $(prefix)/share
+ localedir	?= $(datadir)/locale
+-libexecdir	?= $(prefix)libexec
+-libdatadir	?= $(prefix)lib
++libexecdir	?= $(exec_prefix)/libexec
++libdatadir	?= $(exec_prefix)/lib
+ sharedstatedir	?= /var/lib
+ 
+ EFIDIR		?= $(shell x=$$(which --skip-alias --skip-functions git 2>/dev/null) ; [ -n "$$x" ] && git config --get fwupdate.efidir)
+@@ -63,8 +64,8 @@
+ 	ESPMOUNTPOINT = "/boot/efi"
+ endif
+ 
+-DEBUGINFO	?= $(prefix)lib/debug
+-DEBUGSOURCE	?= $(prefix)src/debug
++DEBUGINFO	?= $(exec_prefix)/lib/debug
++DEBUGSOURCE	?= $(prefix)/src/debug
+ TARGETDIR	?= $(ESPMOUNTPOINT)/EFI/$(EFIDIR)
+ 
+ .PHONY: check_efidir_error
+--- a/linux/Makefile
++++ b/linux/Makefile
+@@ -93,16 +93,19 @@
+ 	sed -e "s,@@VERSION@@,$(VERSION),g" \
+ 		-e "s,@@FWUP_MAJOR_VERSION@@,$(MAJOR_VERSION),g" \
+ 		-e "s,@@FWUP_MINOR_VERSION@@,$(MINOR_VERSION),g" \
++		-e "s,@@PREFIX@@,$(prefix),g" \
++		-e "s,@@EXEC_PREFIX@@,$(exec_prefix),g" \
+ 		-e "s,@@SHAREDSTATEDIR@@,$(sharedstatedir),g" \
+ 		-e "s,@@ESPMOUNTPOINT@@,$(ESPMOUNTPOINT),g" \
+ 		-e "s,@@EFIDIR@@,$(EFIDIR),g" \
+ 		-e "s,@@LIBDIR@@,$(libdir),g" \
+ 		-e "s,@@LIBEXECDIR@@,$(libexecdir),g" \
++		-e "s,@@INCLUDEDIR@@,$(includedir),g" \
+ 		$< > $@
+ 
+ tester : tester.c
+-	$(CC) -Wall -Werror -ggdb -L. -I./include -I/usr/include/efivar \
+-		-lefivar -lfwup -o $@ $^
++	$(CC) -Wall -Werror -ggdb -L. -I./include $(shell $(PKG_CONFIG) --cflags efivar) \
++		$(shell $(PKG_CONFIG) --libs efivar) -lfwup -o $@ $^
+ 
+ test : tester
+ 	LD_LIBRARY_PATH=$(shell pwd) ./tester
+@@ -134,6 +137,6 @@
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system
+ 	$(INSTALL) -m 644 cleanup.service \
+ 		$(DESTDIR)$(libdatadir)/systemd/system/fwupdate-cleanup.service
+-	$(INSTALL) -d -m 755 $(DESTDIR)/usr/share/bash-completion/completions/
++	$(INSTALL) -d -m 755 $(DESTDIR)$(datadir)/bash-completion/completions/
+ 	$(INSTALL) -m 755 $(VPATH)/bash-completion \
+-		$(DESTDIR)/usr/share/bash-completion/completions/fwupdate
++		$(DESTDIR)$(datadir)/bash-completion/completions/fwupdate
+--- a/linux/fwup.pc.in
++++ b/linux/fwup.pc.in
+@@ -1,7 +1,7 @@
+-prefix=/usr
+-exec_prefix=/usr
++prefix=@@PREFIX@@
++exec_prefix=@@EXEC_PREFIX@@
+ libdir=@@LIBDIR@@
+-includedir=/usr/include
++includedir=@@INCLUDEDIR@@
+ 
+ Name: fwup
+ Description: Library for deployment of UEFI firmware updates.
+--- a/linux/libfwup.c
++++ b/linux/libfwup.c
+@@ -35,7 +35,7 @@
+ 
+ #include 
+ #ifdef FWUPDATE_HAVE_LIBSMBIOS__
+-#include 
++#include 
+ #include 
+ #endif
+ 
diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
index c87023bf336d91bc022132b91a95e2ab59c9d6ac..e8ab77a509ff40657744b88b564cd3f6367028fc 100644
--- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "intel2200BGFirmware-${version}";
 
   src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz";
+    url = "http://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz";
     sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index c71f1c0ea2e9bf45db98abd0c9ed6de492bde1ea..d00f1b148374eb75aa0bef341eab8730373b20ad 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,36 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-firmware-${version}";
-  version = "1.20171029";
+  version = "1.20180328";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "12aisha8rlr28310hakps04z9p45kd2wvks0w1vxw1kwfh1ncy9s";
+    sha256 = "19h4lv11idy268pyrq21c5gsff77d5xr9xjkpmzfpcq34gjh3x21";
   };
 
-  dontStrip = true;    # Stripping breaks some of the binaries
-
   installPhase = ''
     mkdir -p $out/share/raspberrypi/boot
     cp -R boot/* $out/share/raspberrypi/boot
-    cp -R hardfp/opt/vc/* $out
-    cp opt/vc/LICENCE $out/share/raspberrypi
-
-    for f in $out/bin/*; do
-      if isELF "$f"; then
-        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f"
-        patchelf --set-rpath "$out/lib" "$f"
-      fi
-    done
   '';
 
   meta = with stdenv.lib; {
     description = "Firmware for the Raspberry Pi board";
-    homepage = https://github.com/raspberrypi;
-    license = licenses.unfree;
+    homepage = https://github.com/raspberrypi/firmware;
+    license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
     platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
-    maintainers = with maintainers; [ viric tavyc ];
+    maintainers = with maintainers; [ dezgeg viric tavyc ];
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch b/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e12aeeb0cdb8ed404832f30b73ef77ca21d3a016
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch
@@ -0,0 +1,20 @@
+diff --git a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
+index aed0e83..b325676 100644
+--- a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
++++ b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
+@@ -17,15 +17,6 @@ target_link_libraries(vcfiled
+ install(TARGETS vcfiled 
+         RUNTIME DESTINATION sbin)
+ 
+-configure_file (etc/init.d/vcfiled ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled)
+-
+-# script to start up vcfiled at start of day
+-install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled
+-        DESTINATION /etc/init.d)
+-# install locally to the installation directory too
+-install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled
+-        DESTINATION ${VMCS_INSTALL_PREFIX}/share/install)
+-
+ # test program for vcfiled_check library
+ add_executable(vcfiled_lock_test vcfiled_lock_test.c)
+ target_link_libraries(vcfiled_lock_test vcfiled_check)
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7f4c9dae166ac4602af8230e63d08d1eb91ba1a7
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "raspberrypi-tools-${version}";
+  version = "2018-02-05";
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "userland";
+    rev = "a343dcad1dae4e93f4bfb99496697e207f91027e";
+    sha256 = "1z4qrwjb7x3a45mx978q8vyhnx068sgzhymm4z0ayhckji4ngal1";
+  };
+
+  patches = [ ./tools-dont-install-sysv-init-scripts.patch ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  preConfigure = ''
+    cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out")
+  '' + stdenv.lib.optionalString stdenv.isAarch64 ''
+    cmakeFlagsArray+=("-DARM64=1")
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Userland tools for the Raspberry Pi board";
+    homepage = https://github.com/raspberrypi/userland;
+    license = licenses.bsd3;
+    platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
+    maintainers = with maintainers; [ dezgeg viric tavyc ];
+  };
+}
diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix
index 2c90ff94d4a08c906b945576d110ffae2e967b9b..d49d01158229ac1ac2a04e808d1caf3300e76c53 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.17";
+  version = "0.02.00";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";
-    sha256 = "0ncfbrpyb3ak49nrdr4cb3w082n9s181lizfqx51zi9rdgkj1vm3";
+    sha256 = "0sfzmggfhhhp3vxn1s61b5bacr2hz6r7y699n3nysdciaa2scgdq";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index d69d54af96c3485d0ad36daf1cac8233ab4f1475..bf7bc8a4546aae7df4fe7646358c3f29efdfd5ea 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.02.00";
+  version = "0.02.02";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz";
-    sha256 = "07df2lb32lbr2ggi84h9pjy6ig18n2961ksji4x1hhb4cvc175dg";
+    sha256 = "02iqi4xjg2hl4paw88fz9jb88a9p4zprvq3g56cd7jwfx3vmw5a4";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix
index 54be786d10d6afe7c09b2ac3162fde6a23e99873..a091b2f17c5e9b3018fe077e019204b8396f9972 100644
--- a/pkgs/os-specific/linux/freefall/default.nix
+++ b/pkgs/os-specific/linux/freefall/default.nix
@@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index 8efef4fac4bd5859aab8f70719596875b383c9f9..267e31d427c6f78e0d65e6981cc4abba2fc99548 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, libargon2, pam }:
+{ stdenv, buildGoPackage, fetchFromGitHub, pam }:
 
 # Don't use this for anything important yet!
 
 buildGoPackage rec {
   name = "fscrypt-${version}";
-  version = "0.2.2";
+  version = "0.2.3";
 
   goPackagePath = "github.com/google/fscrypt";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscrypt";
-    rev = version;
-    sha256 = "0a85vj1zsybhzvvgdvlw6ywh2a6inmrmc95pfa1js4vkx0ixf1kh";
+    rev = "v${version}";
+    sha256 = "126bbxim4nj56kplvyv528i88mfray50r2rc6ysblkmaw6x0fd9c";
   };
 
-  buildInputs = [ libargon2 pam ];
+  buildInputs = [ pam ];
 
   meta = with stdenv.lib; {
     description =
diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix
index 81cd95332c812a7332bc4d5fced2d163d38811c1..8622dc001a877179f10c10e6aad40e678b62a257 100644
--- a/pkgs/os-specific/linux/fscryptctl/default.nix
+++ b/pkgs/os-specific/linux/fscryptctl/default.nix
@@ -4,19 +4,17 @@
 
 stdenv.mkDerivation rec {
   name = "fscryptctl-unstable-${version}";
-  version = "2017-09-12";
+  version = "2017-10-23";
 
   goPackagePath = "github.com/google/fscrypt";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscryptctl";
-    rev = "f037dcf4354ce8f25d0f371b58dfe7a7ac27576f";
-    sha256 = "1dw1y6jbm2ibn7npvpw6cl28rcz0jz4as2yl6walz7ppmqbj9scf";
+    rev = "142326810eb19d6794793db6d24d0775a15aa8e5";
+    sha256 = "1853hlpklisbqnkb7a921dsf0vp2nr2im26zpmrs592cnpsvk3hb";
   };
 
-  patches = [ ./install.patch ];
-
   makeFlags = [ "DESTDIR=$(out)/bin" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/fscryptctl/install.patch b/pkgs/os-specific/linux/fscryptctl/install.patch
deleted file mode 100644
index 11f9843bbfb047f269f017ecfcb4a5919a6c6b59..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/fscryptctl/install.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile	2017-09-24 22:48:19.322116085 +0200
-+++ b/Makefile	2017-09-24 22:50:07.655725022 +0200
-@@ -19,7 +19,7 @@
- CFLAGS += -O2 -Wall
- 
- INSTALL = install
--DESTDIR = /usr/local/bin
-+DESTDIR ?= /usr/local/bin
- 
- OBJECTS = $(NAME).o sha512.o
- 
-@@ -38,8 +38,8 @@
- 	@python -m pytest test.py -s -q
- 
- install: $(NAME)
--	$(INSTALL) -d $(DEST_DIR)
--	$(INSTALL) $(NAME) $(DEST_DIR)
-+	$(INSTALL) -d $(DESTDIR)
-+	$(INSTALL) $(NAME) $(DESTDIR)
- 
- clean:
- 	rm -f $(OBJECTS)
diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix
index 73a6d18fc8b7c3502ed5319219912a54d96ee8bd..915431c0cb1f93a0a0049c765d2813fcf7d559a1 100644
--- a/pkgs/os-specific/linux/ftop/default.nix
+++ b/pkgs/os-specific/linux/ftop/default.nix
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
       generally all that is of interest to the user).
       As with top, the items are displayed in order from most to least active.
     '';
-    maintainers = with maintainers; [ nckx ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index b9ac015f4591899d63eec7f1526901ae5270d7eb..95011653ad01fd1df1a072165ec97365c9a5fcdf 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -4,6 +4,7 @@
 , fusePackages, utillinux, gettext
 , autoconf, automake, libtool
 , meson, ninja, pkgconfig
+, autoreconfHook
 }:
 
 let
@@ -18,6 +19,8 @@ in stdenv.mkDerivation rec {
     sha256 = sha256Hash;
   };
 
+  preAutoreconf = "touch config.rpath";
+
   patches =
     stdenv.lib.optional
       (!isFuse3 && stdenv.isAarch64)
@@ -25,13 +28,14 @@ in stdenv.mkDerivation rec {
         url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
         sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
       })
-    ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch;
+    ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch
+    # TODO: Only relevant for 3.2.2 (opened an upstream issue)
+    ++ stdenv.lib.optional isFuse3 ./fuse3-fix-version.patch;
 
 
   nativeBuildInputs = if isFuse3
     then [ meson ninja pkgconfig ]
-    else [ autoconf automake libtool ];
-  buildInputs = stdenv.lib.optional (!isFuse3) gettext;
+    else [ autoreconfHook gettext ];
 
   outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
 
@@ -61,11 +65,11 @@ in stdenv.mkDerivation rec {
   postFixup = "cd $out\n" + (if isFuse3 then ''
     mv bin/mount.fuse3 bin/mount.fuse
 
-    install -D -m555 bin/mount.fuse $common/bin/mount.fuse
-    install -D -m444 etc/udev/rules.d/99-fuse.rules $common/etc/udev/rules.d/99-fuse.rules
+    install -D -m444 etc/fuse.conf $common/etc/fuse.conf
+    install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules
     install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz
   '' else ''
-    cp ${fusePackages.fuse_3.common}/bin/mount.fuse bin/mount.fuse
+    cp ${fusePackages.fuse_3.common}/etc/fuse.conf etc/fuse.conf
     cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules
     cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz
   '');
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 7856f6389c7d002bed0885628eaaacf2e3dcd5c9..ddf280bbe2f7e4488bb885e37846a044169ac4e2 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -9,12 +9,12 @@ in {
   fuse_2 = mkFuse {
     version = "2.9.7";
     sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";
-    maintainers = [ maintainers.mornfall ];
+    maintainers = [ ];
   };
 
   fuse_3 = mkFuse {
-    version = "3.2.1";
-    sha256Hash = "19bsvb5lc8k1i0h5ld109kixn6mdshzvg3y7820k9mnw34kh09y0";
+    version = "3.2.2";
+    sha256Hash = "1a0x4vpyg9lc6clwvx995mk0v6jqd37xabzp9rpdir37x814g3wh";
     maintainers = [ maintainers.primeos ];
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch b/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b6351aab3c0121d928f2747cb6f2b58b4b682165
--- /dev/null
+++ b/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch
@@ -0,0 +1,8 @@
+--- a/meson.build	2018-04-01 01:05:19.612723597 +0200
++++ b/meson.build	2018-04-01 01:40:58.171109615 +0200
+@@ -1,4 +1,4 @@
+-project('libfuse3', 'c', version: '3.2.1',
++project('libfuse3', 'c', version: '3.2.2',
+         meson_version: '>= 0.38',
+         default_options: [ 'buildtype=debugoptimized' ])
+
diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch
index f77639367acf15964b53e094873e354d9a3ace82..639dc7e07a4d142712051e134d4957f346974d37 100644
--- a/pkgs/os-specific/linux/fuse/fuse3-install.patch
+++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch
@@ -1,6 +1,6 @@
---- a/util/install_helper.sh	1970-01-01 01:00:01.000000000 +0100
-+++ b/util/install_helper.sh	2017-09-21 23:43:50.703942577 +0200
-@@ -11,19 +11,11 @@
+--- a/util/install_helper.sh	2018-04-01 01:05:19.613723599 +0200
++++ b/util/install_helper.sh	2018-04-01 01:06:02.952845382 +0200
+@@ -11,22 +11,14 @@
  udevrulesdir="$3"
  prefix="${MESON_INSTALL_DESTDIR_PREFIX}"
  
@@ -14,11 +14,15 @@
 -
  install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
 -        "${DESTDIR}/${udevrulesdir}/99-fuse3.rules"
-+        "${prefix}/${udevrulesdir}/99-fuse.rules"
++        "${prefix}/${udevrulesdir}/99-fuse3.rules"
  
  install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
 -        "${DESTDIR}/etc/init.d/fuse3"
 +        "${prefix}/etc/init.d/fuse3"
  
+ install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
+-	"${DESTDIR}/etc/fuse.conf"
++	"${prefix}/etc/fuse.conf"
+
  if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
      /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c02bfb1615c30715645a898efb80408d0c68a7c5
--- /dev/null
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre
+, json_c, flex, bison, dtc, pciutils, dmidecode, iasl }:
+
+stdenv.mkDerivation rec {
+  name = "fwts-${version}";
+  version = "18.03.00";
+
+  src = fetchzip {
+    url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
+    sha256 = "1f2gdnaygsj0spd6a559bzf3wii7l59k3sk49rjbbdb9g77nkhg2";
+    stripRoot = false;
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
+  buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl ];
+
+  postPatch = ''
+    substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/lspci"      "${pciutils}/bin/lspci"
+    substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode"
+    substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/iasl"       "${iasl}/bin/iasl"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://wiki.ubuntu.com/FirmwareTestSuite";
+    description = "Firmware Test Suite";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ tadfisher ];
+  };
+}
diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix
index 7383db95c37536d965493a285f050940a1d4c658..53895faa66cbc9b81091000dff312575bd1fb15c 100644
--- a/pkgs/os-specific/linux/gogoclient/default.nix
+++ b/pkgs/os-specific/linux/gogoclient/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, nettools, iproute, procps}:
+{stdenv, fetchurl, openssl, nettools, iproute, sysctl}:
 
 let baseName = "gogoclient";
     version  = "1.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     #url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz;
-    url = http://pkgs.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz;
+    url = http://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz;
     sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49";
   };
   patches = [./gcc46-include-fix.patch ./config-paths.patch ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \
       --replace "/sbin/route"    "${nettools}/bin/route" \
       --replace "/sbin/ip"       "${iproute}/sbin/ip" \
-      --replace "/sbin/sysctl"   "${procps}/sbin/sysctl"
+      --replace "/sbin/sysctl"   "${sysctl}/bin/sysctl"
     sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh
   '';
 
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index 1494d9f06a8a9a626b7d6d6e3972e0a95d091c78..41bdd5d12ac31d4a3f1383c739b0cee337cc83d6 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "google-authenticator-libpam-${version}";
-  version = "1.03";
+  version = "1.05";
 
   src = fetchurl {
     url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz";
-    sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7";
+    sha256 = "026vljmddi0zqcb3c0vdpabmi4r17kahc00mh6fs3qbyjbb14946";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d56253c6cedd1be76696f914c1d3ea31497297c6
--- /dev/null
+++ b/pkgs/os-specific/linux/gpu-switch/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "gpu-switch-unstable-${version}";
+  version = "2017-04-28";
+  src = fetchFromGitHub {
+    owner = "0xbb";
+    repo = "gpu-switch";
+    rev = "a365f56d435c8ef84c4dd2ab935ede4992359e31";
+    sha256 = "1jnh43nijkqd83h7piq7225ixziggyzaalabgissyxdyz6szcn0r";
+  };
+  installPhase = ''
+    mkdir -p $out/bin
+    cp gpu-switch $out/bin/
+  '';
+  meta = with lib; {
+    description = "Application that allows to switch between the graphic cards of dual-GPU MacBook Pro models";
+    homepage = https://github.com/0xbb/gpu-switch;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.msiedlarek ];
+  };
+}
diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix
index a299fd0f433842823b8be39fc84df011ed5ef7f5..27b85fbfc89ad09b8bca47e74e15f961ea2ffad0 100644
--- a/pkgs/os-specific/linux/hal-flash/default.nix
+++ b/pkgs/os-specific/linux/hal-flash/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }:
 
 stdenv.mkDerivation {
-  name = "hal-flash-0.3.0";
+  name = "hal-flash-0.3.3";
 
   src = fetchurl {
-    url = "https://github.com/cshorler/hal-flash/archive/v0.3.0.tar.gz";
-    sha256 = "163pqy39cca8cnf8rm8zr63ndsnr7rki9pf9j7dl9gyxmi7sx88s";
+    url = "https://github.com/cshorler/hal-flash/archive/v0.3.3.tar.gz";
+    sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix
index 61c0c7b495df60cb78b8ef3497793447ea49dd22..53924a782df79371bcc02cd59216f84feed4deae 100644
--- a/pkgs/os-specific/linux/hdapsd/default.nix
+++ b/pkgs/os-specific/linux/hdapsd/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib;
     { description = "Hard Drive Active Protection System Daemon";
-      hompage = "http://hdaps.sf.net/";
+      homepage = "http://hdaps.sf.net/";
       license = licenses.gpl2;
       platforms = platforms.linux;
       maintainers = [ maintainers.ehmry ];
diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix
index 0f0eab1fa202d559c95c296c6b88c21cce1c669c..cbdbefeb2a0e434e00e134ef0d0ecdf6f6f52aba 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/pkgs/os-specific/linux/hdparm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hdparm-9.52";
+  name = "hdparm-9.56";
 
   src = fetchurl {
     url = "mirror://sourceforge/hdparm/${name}.tar.gz";
-    sha256 = "1djgxhfadd865dcrl6dp7dvjxpaisy7mk17mbdbglwg24ga9qhn3";
+    sha256 = "1np42qyhb503khvacnjcl3hb1dqly68gj0a1xip3j5qhbxlyvybg";
 
   };
 
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index b058aa692f0fe3e67b134d89b8002096cdccca0b..15b3903ddd1ae5094876fbc1558ef09fab16f4cf 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.300";
+  version = "0.311";
 
   src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/hwdata/v0.300.tar.gz/sha512/34294fcf65c3cb17c19d625732d1656ec1992dde254a68ee35681ad2f310bc05028a85889efa2c1d1e8a2d10885ccc00185475a00f6f2fb82d07e2349e604a51/v0.300.tar.gz";
-    sha256 = "03xlj05qyixhnsybq1qnr7j5q2nvirs4jxpgg4sbw8swsqj3dgqi";
+    url = "https://github.com/vcrhonek/hwdata/archive/v0.311.tar.gz";
+    sha256 = "159av9wvl3biryxd5pgqcwz6wkdaa0ydmcysmzznx939mfv7w18z";
   };
 
   preConfigure = "patchShebangs ./configure";
diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f89747dc200d65bf14732dc39024eed706a52276
--- /dev/null
+++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix
@@ -0,0 +1,109 @@
+{ stdenv, lib, python, kernel, makeWrapper, writeText }:
+
+let
+  daemons = stdenv.mkDerivation rec {
+    name = "hyperv-daemons-bin-${version}";
+    inherit (kernel) src version;
+
+    nativeBuildInputs = [ makeWrapper ];
+
+    # as of 4.9 compilation will fail due to -Werror=format-security
+    hardeningDisable = [ "format" ];
+
+    preConfigure = ''
+      cd tools/hv
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      for f in fcopy kvp vss ; do
+        install -Dm755 hv_''${f}_daemon -t $out/bin
+      done
+
+      install -Dm755 hv_get_dns_info.sh lsvmbus -t $out/bin
+
+      # I don't know why this isn't being handled automatically by fixupPhase
+      substituteInPlace $out/bin/lsvmbus \
+        --replace '/usr/bin/env python' ${python.interpreter}
+
+      runHook postInstall
+    '';
+
+    postFixup = ''
+      # kvp needs to be able to find the script(s)
+      wrapProgram $out/bin/hv_kvp_daemon --prefix PATH : $out/bin
+    '';
+  };
+
+  service = bin: title: check:
+    writeText "hv-${bin}.service" ''
+      [Unit]
+      Description=Hyper-V ${title} daemon
+      ConditionVirtualization=microsoft
+      ${lib.optionalString (check != "") ''
+        ConditionPathExists=/dev/vmbus/${check}
+      ''}
+      [Service]
+      ExecStart=@out@/hv_${bin}_daemon -n
+      Restart=on-failure
+      PrivateTmp=true
+      Slice=hyperv.slice
+
+      [Install]
+      WantedBy=hyperv-daemons.target
+    '';
+
+in stdenv.mkDerivation rec {
+  name    = "hyperv-daemons-${version}";
+
+  inherit (kernel) version;
+
+  # we just stick the bins into out as well as it requires "out"
+  outputs = [ "bin" "lib" "out" ];
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ daemons ];
+
+  installPhase = ''
+    system=$lib/lib/systemd/system
+
+    mkdir -p $system
+
+    cp ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service
+    cp ${service "kvp"   "key-value pair (KVP)"     ""  } $system/hv-kvp.service
+    cp ${service "vss"   "volume shadow copy (VSS)" ""  } $system/hv-vss.service
+
+    cat > $system/hyperv-daemons.target <build, not build->host, C compiler.
-  nativeBuildInputs = [ buildPackages.stdenv.cc perl ];
-
-  extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"];
-
-  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 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
new file mode 100644
index 0000000000000000000000000000000000000000..01cab57f71961edaae80e7d85f1879372bea60c8
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -0,0 +1,54 @@
+{ stdenvNoCC, lib, buildPackages
+, buildPlatform, hostPlatform
+, fetchurl, perl
+}:
+
+assert hostPlatform.isLinux;
+
+let
+  common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation {
+    name = "linux-headers-${version}";
+
+    src = fetchurl {
+      url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+      inherit sha256;
+    };
+
+    ARCH = hostPlatform.platform.kernelArch;
+
+    # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
+    # We do this so we have a build->build, not build->host, C compiler.
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
+    nativeBuildInputs = [ perl ];
+
+    extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"];
+
+    # "patches" array defaults to 'null' to avoid changing hash
+    # and causing mass rebuild
+    inherit patches;
+
+    buildPhase = ''
+      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
+    '';
+
+    meta = with lib; {
+      description = "Header files and scripts for Linux kernel";
+      license = licenses.gpl2;
+      platforms = platforms.linux;
+    };
+  };
+in {
+
+  linuxHeaders = common {
+    version = "4.15";
+    sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js";
+  };
+}
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 0f7ad055af86708e7d576a854de5d3cbe24566c5..4d9ec389f44e95f5a73e474098331aa97484a441 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -16,7 +16,7 @@
 
 */
 
-{ stdenv, version, kernelPlatform, extraConfig, features }:
+{ stdenv, version, extraConfig, features }:
 
 with stdenv.lib;
 
@@ -32,7 +32,6 @@ with stdenv.lib;
   # Debugging.
   DEBUG_KERNEL y
   DYNAMIC_DEBUG y
-  BACKTRACE_SELF_TEST n
   DEBUG_DEVRES n
   DEBUG_STACK_USAGE n
   DEBUG_STACKOVERFLOW n
@@ -51,7 +50,7 @@ with stdenv.lib;
 
   # Bump the maximum number of CPUs to support systems like EC2 x1.*
   # instances and Xeon Phi.
-  ${optionalString (stdenv.system == "x86_64-linux" || stdenv.system == "aarch64-linux") ''
+  ${optionalString (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") ''
     NR_CPUS 384
   ''}
 
@@ -116,7 +115,6 @@ with stdenv.lib;
   # Enable various subsystems.
   ACCESSIBILITY y # Accessibility support
   AUXDISPLAY y # Auxiliary Display support
-  DONGLE y # Serial dongle support
   HIPPI y
   MTD_COMPLEX_MAPPINGS y # needed for many devices
   SCSI_LOWLEVEL y # enable lots of SCSI devices
@@ -125,6 +123,9 @@ with stdenv.lib;
   SPI y # needed for many devices
   SPI_MASTER y
   WAN y
+  ${optionalString (versionOlder version "4.17") ''
+    DONGLE y # Serial dongle support
+  ''}
 
   # Networking options.
   NET y
@@ -134,6 +135,8 @@ with stdenv.lib;
   ''}
   NETFILTER y
   NETFILTER_ADVANCED y
+  CGROUP_BPF? y # Required by systemd per-cgroup firewalling
+  CGROUP_NET_PRIO y # Required by systemd
   IP_ROUTE_VERBOSE y
   IP_MROUTE_MULTIPLE_TABLES y
   IP_VS_PROTO_TCP y
@@ -232,18 +235,23 @@ with stdenv.lib;
 
   # USB serial devices.
   USB_SERIAL_GENERIC y # USB Generic Serial Driver
-  USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
-  USB_SERIAL_KEYSPAN_USA28 y
-  USB_SERIAL_KEYSPAN_USA28X y
-  USB_SERIAL_KEYSPAN_USA28XA y
-  USB_SERIAL_KEYSPAN_USA28XB y
-  USB_SERIAL_KEYSPAN_USA19 y
-  USB_SERIAL_KEYSPAN_USA18X y
-  USB_SERIAL_KEYSPAN_USA19W y
-  USB_SERIAL_KEYSPAN_USA19QW y
-  USB_SERIAL_KEYSPAN_USA19QI y
-  USB_SERIAL_KEYSPAN_USA49W y
-  USB_SERIAL_KEYSPAN_USA49WLC y
+
+  # Include firmware for various USB serial devices.
+  # Only applicable for kernels below 4.16, after that no firmware is shipped in the kernel tree.
+  ${optionalString (versionOlder version "4.16") ''
+    USB_SERIAL_KEYSPAN_MPR y
+    USB_SERIAL_KEYSPAN_USA28 y
+    USB_SERIAL_KEYSPAN_USA28X y
+    USB_SERIAL_KEYSPAN_USA28XA y
+    USB_SERIAL_KEYSPAN_USA28XB y
+    USB_SERIAL_KEYSPAN_USA19 y
+    USB_SERIAL_KEYSPAN_USA18X y
+    USB_SERIAL_KEYSPAN_USA19W y
+    USB_SERIAL_KEYSPAN_USA19QW y
+    USB_SERIAL_KEYSPAN_USA19QI y
+    USB_SERIAL_KEYSPAN_USA49W y
+    USB_SERIAL_KEYSPAN_USA49WLC y
+  ''}
 
   # Device mapper (RAID, LVM, etc.)
   MD y
@@ -343,15 +351,16 @@ with stdenv.lib;
 
   # Security related features.
   RANDOMIZE_BASE? y
-  STRICT_DEVMEM y # Filter access to /dev/mem
+  STRICT_DEVMEM? y # Filter access to /dev/mem
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
   SECURITY_YAMA? y # Prevent processes from ptracing non-children processes
   DEVKMEM n # Disable /dev/kmem
-  ${if versionOlder version "3.14" then ''
-    CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
-  '' else ''
-    CC_STACKPROTECTOR_REGULAR? y
-  ''}
+  ${optionalString (! stdenv.hostPlatform.isArm)
+    (if versionOlder version "3.14" then ''
+        CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
+      '' else ''
+        CC_STACKPROTECTOR_REGULAR? y
+      '')}
   ${optionalString (versionAtLeast version "3.12") ''
     USER_NS y # Support for user namespaces
   ''}
@@ -370,6 +379,15 @@ with stdenv.lib;
     MICROCODE_AMD_EARLY y
   ''}
 
+  ${optionalString (versionAtLeast version "4.10") ''
+    # Write Back Throttling
+    # https://lwn.net/Articles/682582/
+    # https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655
+    BLK_WBT y
+    BLK_WBT_SQ y
+    BLK_WBT_MQ y
+  ''}
+
   # Misc. options.
   8139TOO_8129 y
   8139TOO_PIO n # PIO is slower
@@ -404,7 +422,9 @@ with stdenv.lib;
   ${optionalString (versionAtLeast version "4.3") ''
     IDLE_PAGE_TRACKING y
   ''}
-  IRDA_ULTRA y # Ultra (connectionless) protocol
+  ${optionalString (versionOlder version "4.17") ''
+    IRDA_ULTRA y # Ultra (connectionless) protocol
+  ''}
   JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels
   JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels
   JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support
@@ -435,6 +455,7 @@ with stdenv.lib;
   RC_DEVICES? y # Enable IR devices
   RT2800USB_RT55XX y
   SCHED_AUTOGROUP y
+  CFS_BANDWIDTH y
   SCSI_LOGGING y # SCSI logging facility
   SERIAL_8250 y # 8250/16550 and compatible serial support
   SLIP_COMPRESSED y # CSLIP compressed headers
@@ -571,6 +592,7 @@ with stdenv.lib;
   ${optionalString (versionOlder version "4.14") ''
     MEDIA_RC_SUPPORT y
   ''}
+  MEDIA_CONTROLLER y
   MEDIA_USB_SUPPORT y
   MEDIA_PCI_SUPPORT y
   MEDIA_ANALOG_TV_SUPPORT y
@@ -619,58 +641,72 @@ with stdenv.lib;
   FW_LOADER_USER_HELPER_FALLBACK? n
 
   # Disable various self-test modules that have no use in a production system
-  ${optionalString (versionOlder version "4.4") ''
+  # This menu disables all/most of them on >= 4.16
+  RUNTIME_TESTING_MENU? n
+  # For older kernels, painstakingly disable each symbol.
+  ${optionalString (versionOlder version "4.16") ''
     ARM_KPROBES_TEST? n
+    ASYNC_RAID6_TEST? n
+    ATOMIC64_SELFTEST? n
+    BACKTRACE_SELF_TEST? n
+    INTERVAL_TREE_TEST? n
+    PERCPU_TEST? n
+    RBTREE_TEST? n
+    TEST_BITMAP? n
+    TEST_BPF? n
+    TEST_FIRMWARE? n
+    TEST_HASH? n
+    TEST_HEXDUMP? n
+    TEST_KMOD? n
+    TEST_KSTRTOX? n
+    TEST_LIST_SORT? n
+    TEST_LKM? n
+    TEST_PARMAN? n
+    TEST_PRINTF? n
+    TEST_RHASHTABLE? n
+    TEST_SORT? n
+    TEST_STATIC_KEYS? n
+    TEST_STRING_HELPERS? n
+    TEST_UDELAY? n
+    TEST_USER_COPY? n
+    TEST_UUID? n
   ''}
 
-  ASYNC_RAID6_TEST? n
-  ATOMIC64_SELFTEST? n
-  BACKTRACE_SELF_TEST? n
   CRC32_SELFTEST? n
   CRYPTO_TEST? n
+  DRM_DEBUG_MM_SELFTEST? n
+  EFI_TEST? n
   GLOB_SELFTEST? n
-  INTERVAL_TREE_TEST? n
   LNET_SELFTEST? n
   LOCK_TORTURE_TEST? n
   MTD_TESTS? n
   NOTIFIER_ERROR_INJECTION? n
-  PERCPU_TEST? n
-  RBTREE_TEST? n
+  RCU_PERF_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
+  TEST_ASYNC_DRIVER_PROBE? n
+  WW_MUTEX_SELFTEST? n
   XZ_DEC_TEST? n
 
-  ${optionalString (versionAtLeast version "4.13") ''
-    TEST_KMOD n
+  ${optionalString (features.criu or false)  ''
+    EXPERT y
+    CHECKPOINT_RESTORE y
   ''}
 
-  ${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 ((features.criu or false) && (features.criu_revert_expert or true))
+    # Revert some changes, introduced by EXPERT, when necessary for criu
+  ''
+    RFKILL_INPUT? y
+    HID_PICOLCD_FB? y
+    HID_PICOLCD_BACKLIGHT? y
+    HID_PICOLCD_LCD? y
+    HID_PICOLCD_LEDS? y
+    HID_PICOLCD_CIR? y
+    DEBUG_MEMORY_INIT? y
   ''}
 
-  ${optionalString (versionAtLeast version "4.11") ''
-    DRM_DEBUG_MM_SELFTEST? n
-    TEST_PARMAN? n
-    TEST_SORT? n
-    WW_MUTEX_SELFTEST? n
+  ${optionalString (features.debug or false)  ''
+    DEBUG_INFO y
   ''}
 
-  ${kernelPlatform.kernelExtraConfig or ""}
   ${extraConfig}
 ''
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl
index 5bce3af94293a5608bdccc0ec0229663b4b0ac18..f886fcfdc35848d80078f63e667fc914eb0028ad 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/pkgs/os-specific/linux/kernel/generate-config.pl
@@ -13,18 +13,18 @@ use strict;
 use IPC::Open2;
 use Cwd;
 
-my $wd = getcwd;
-
+# exported via nix
 my $debug = $ENV{'DEBUG'};
 my $autoModules = $ENV{'AUTO_MODULES'};
 my $preferBuiltin = $ENV{'PREFER_BUILTIN'};
-    
+my $ignoreConfigErrors = $ENV{'ignoreConfigErrors'};
+my $buildRoot = $ENV{'BUILD_ROOT'};
 $SIG{PIPE} = 'IGNORE';
 
 # Read the answers.
 my %answers;
 my %requiredAnswers;
-open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die;
+open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die "Could not open answer file";
 while () {
     chomp;
     s/#.*//;
@@ -40,7 +40,7 @@ close ANSWERS;
 sub runConfig {
 
     # Run `make config'.
-    my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$wd config SHELL=bash ARCH=$ENV{ARCH}");
+    my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH}");
 
     # Parse the output, look for questions and then send an
     # appropriate answer.
@@ -122,7 +122,7 @@ runConfig;
 # there.  `make config' often overrides answers if later questions
 # cause options to be selected.
 my %config;
-open CONFIG, "<.config" or die;
+open CONFIG, "<$buildRoot/.config" or die "Could not read .config";
 while () {
     chomp;
     if (/^CONFIG_([A-Za-z0-9_]+)="(.*)"$/) {
@@ -137,7 +137,7 @@ while () {
 close CONFIG;
 
 foreach my $name (sort (keys %answers)) {
-    my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1"
+    my $f = $requiredAnswers{$name} && $ignoreConfigErrors ne "1"
         ? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; };
     &$f("unused option: $name\n") unless defined $config{$name};
     &$f("option not set correctly: $name (wanted '$answers{$name}', got '$config{$name}')\n")
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index c2f4e6843f591c7a2d55b907513492ae2c07e923..2b44ff51ad0aa13a1e5d8f4ccf39e03e095dc2f8 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -1,4 +1,10 @@
-{ stdenv, perl, buildLinux
+{ buildPackages
+, ncurses
+, callPackage
+, perl
+, bison ? null
+, flex ? null
+, stdenv
 
 , # The kernel source tarball.
   src
@@ -23,11 +29,18 @@
   # symbolic name and `patch' is the actual patch.  The patch may
   # optionally be compressed with gzip or bzip2.
   kernelPatches ? []
-, ignoreConfigErrors ? stdenv.platform.name != "pc"
+, ignoreConfigErrors ? hostPlatform.platform.name != "pc" ||
+                       hostPlatform != stdenv.buildPlatform
 , extraMeta ? {}
 , hostPlatform
+
+# easy overrides to hostPlatform.platform members
+, autoModules ? hostPlatform.platform.kernelAutoModules
+, preferBuiltin ? hostPlatform.platform.kernelPreferBuiltin or false
+, kernelArch ? hostPlatform.platform.kernelArch
+
 , ...
-}:
+} @ args:
 
 assert stdenv.isLinux;
 
@@ -43,14 +56,14 @@ let
     netfilterRPFilter = true;
   } // features) kernelPatches;
 
-  configWithPlatform = kernelPlatform: import ./common-config.nix {
-    inherit stdenv version kernelPlatform extraConfig;
+  config = import ./common-config.nix {
+    inherit stdenv version ;
+    # append extraConfig for backwards compatibility but also means the user can't override the kernelExtraConfig part
+    extraConfig = extraConfig + lib.optionalString (hostPlatform.platform ? kernelExtraConfig) hostPlatform.platform.kernelExtraConfig;
+
     features = kernelFeatures; # Ensure we know of all extra patches, etc.
   };
 
-  config = configWithPlatform stdenv.platform;
-  configCross = configWithPlatform hostPlatform.platform;
-
   kernelConfigFun = baseConfig:
     let
       configFromPatches =
@@ -58,38 +71,23 @@ let
     in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);
 
   configfile = stdenv.mkDerivation {
-    inherit ignoreConfigErrors;
+    inherit ignoreConfigErrors autoModules preferBuiltin kernelArch;
     name = "linux-config-${version}";
 
     generateConfig = ./generate-config.pl;
 
     kernelConfig = kernelConfigFun config;
+    passAsFile = [ "kernelConfig" ];
 
-    nativeBuildInputs = [ perl ];
-
-    platformName = stdenv.platform.name;
-    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 = hostPlatform.platform;
-      in {
-        arch = cp.kernelArch;
-        platformName = cp.name;
-        kernelBaseConfig = cp.kernelBaseConfig;
-        kernelTarget = cp.kernelTarget;
-        autoModules = cp.kernelAutoModules;
-
-        # Just ignore all options that don't apply (We are lazy).
-        ignoreConfigErrors = true;
-
-        kernelConfig = kernelConfigFun configCross;
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
+    nativeBuildInputs = [ perl ]
+      ++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ];
 
-        inherit (kernel.crossDrv) src patches preUnpack;
-      };
+    platformName = hostPlatform.platform.name;
+    # e.g. "defconfig"
+    kernelBaseConfig = hostPlatform.platform.kernelBaseConfig;
+    # e.g. "bzImage"
+    kernelTarget = hostPlatform.platform.kernelTarget;
 
     prePatch = kernel.prePatch + ''
       # Patch kconfig to print "###" after every question so that
@@ -100,47 +98,32 @@ let
     inherit (kernel) src patches preUnpack;
 
     buildPhase = ''
-      cd $buildRoot
+      export buildRoot="''${buildRoot:-build}"
 
       # Get a basic config file for later refinement with $generateConfig.
-      make -C ../$sourceRoot O=$PWD $kernelBaseConfig ARCH=$arch
+      make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C . O="$buildRoot" $kernelBaseConfig ARCH=$kernelArch
 
       # Create the config file.
       echo "generating kernel configuration..."
-      echo "$kernelConfig" > kernel-config
-      DEBUG=1 ARCH=$arch KERNEL_CONFIG=kernel-config AUTO_MODULES=$autoModules \
-           PREFER_BUILTIN=$preferBuiltin SRC=../$sourceRoot perl -w $generateConfig
+      ln -s "$kernelConfigPath" "$buildRoot/kernel-config"
+      DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \
+           PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig
     '';
 
-    installPhase = "mv .config $out";
+    installPhase = "mv $buildRoot/.config $out";
 
     enableParallelBuilding = true;
   };
 
-  kernel = buildLinux {
-    inherit version modDirVersion src kernelPatches stdenv;
-
-    configfile = configfile.nativeDrv or configfile;
-
-    crossConfigfile = configfile.crossDrv or configfile;
+  kernel = (callPackage ./manual-config.nix {}) {
+    inherit version modDirVersion src kernelPatches stdenv extraMeta configfile hostPlatform;
 
     config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
-
-    crossConfig = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
   };
 
   passthru = {
     features = kernelFeatures;
-
-    meta = kernel.meta // extraMeta;
-
-    passthru = kernel.passthru // (removeAttrs passthru [ "passthru" "meta" ]);
+    passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
   };
 
-  nativeDrv = lib.addPassthru kernel.nativeDrv passthru;
-
-  crossDrv = lib.addPassthru kernel.crossDrv passthru;
-
-in if kernel ? crossDrv
-   then nativeDrv // { inherit nativeDrv crossDrv; }
-   else lib.addPassthru kernel passthru
+in lib.extendDerivation true passthru kernel
diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index a859a3cefbd48d709107e1f98b31b838b6c48976..3a82c00c5010244af02f972b3a335837945e7742 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -61,8 +61,8 @@ ${optionalString (versionAtLeast version "4.12") ''
 DEBUG_WX y # boot-time warning on RWX mappings
 
 # Stricter /dev/mem
-STRICT_DEVMEM y
-IO_STRICT_DEVMEM y
+STRICT_DEVMEM? y
+IO_STRICT_DEVMEM? y
 
 # Perform additional validation of commonly targeted structures.
 DEBUG_CREDENTIALS y
@@ -97,6 +97,9 @@ PANIC_TIMEOUT -1
 
 GCC_PLUGINS y # Enable gcc plugin options
 
+# Gather additional entropy at boot time for systems that may not have appropriate entropy sources.
+GCC_PLUGIN_LATENT_ENTROPY y
+
 ${optionalString (versionAtLeast version "4.11") ''
   GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin
 ''}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix
deleted file mode 100644
index 26c5da458e7648c7ce47ea7afe99189f03b6d7c5..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.13.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.13.14";
-  extraMeta.branch = "4.13";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "10rjrh5yg6mdfg44xnyd5r4fc91c3b0hqf2yy7qzy7z1kr22lixs";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index cff377bc0c7f02579c7eb391f41029e48beb54b0..e064dbfd85bd5f0e2e806f7d207ccd8c8fef9fae 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -1,18 +1,15 @@
-{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 with stdenv.lib;
 
-import ./generic.nix (args // rec {
-  version = "4.14";
-
-  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
+buildLinux (args // rec {
+  version = "4.14.35";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "19wn1wswvivhlxxixnqi962jamxy9wpw13g1gj2k18chgr3mj7gq";
+    sha256 = "01zfbd766y8hfsd248lffaj6d4ghl4j918m3yvl892p84xsp5aq2";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
new file mode 100644
index 0000000000000000000000000000000000000000..07f408027d8eb78625730c91f714e1fbb5ceb746
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+
+with stdenv.lib;
+
+buildLinux (args // rec {
+  version = "4.15.18";
+
+  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+  modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
+
+  # branchVersion needs to be x.y
+  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "0hdg5h91zwypsgb1lp1m5q1iak1g00rml54fh6j7nj8dgrqwv29z";
+  };
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
new file mode 100644
index 0000000000000000000000000000000000000000..343d7c9f9dac2c819c01953d16598a849d1f2585
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+
+with stdenv.lib;
+
+buildLinux (args // rec {
+  version = "4.16.3";
+
+  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+  modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
+
+  # branchVersion needs to be x.y
+  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "18w1dhq5dnmcqc3d8imwm90zwfw0fhda7sy5fjwkhzm93nl72s8d";
+  };
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index b2f61a2062cb42bf6139e3f22afa81d27a728780..b14418964da51913ff0087884ee456ffce941965 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
-{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
-import ./generic.nix (args // rec {
-  version = "4.4.99";
+buildLinux (args // rec {
+  version = "4.4.128";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0mkyipq1l0lh04shavanx61z75c5r66xh33x47pswvhr2j6mjqxf";
+    sha256 = "1c5nlxazn2ijfra1bn3x4fdz3fx02j76hg430jgyij61vndgi5ka";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 656a8a5895f653b01e1e36f04dfbe9af02167688..2f10bcc0ea808456263c5a8f2f03da3d62bb7015 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
-{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
-import ./generic.nix (args // rec {
-  version = "4.9.63";
+buildLinux (args // rec {
+  version = "4.9.95";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18rfvzsxgjr9223r3lznbrj6fh533d68nizpcz556d7x6dpkij91";
+    sha256 = "1x4z66v6zl4q0hzinzb1wvlq9fd3v4sbwj9lay69f3vdq8knsnly";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix b/pkgs/os-specific/linux/kernel/linux-beagleboard.nix
index b0d9f04efc8459e2e88cd6c5efb843ff85547d60..4f0ff53c59ced402a168973e8965ff2cf4d7399c 100644
--- a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix
+++ b/pkgs/os-specific/linux/kernel/linux-beagleboard.nix
@@ -1,10 +1,10 @@
-{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ubootTools, dtc, ... } @ args:
 
 let
-  modDirVersion = "4.9.59";
-  tag = "r73";
+  modDirVersion = "4.14.12";
+  tag = "r23";
 in
-import ./generic.nix (args // rec {
+stdenv.lib.overrideDerivation (buildLinux (args // rec {
   version = "${modDirVersion}-ti-${tag}";
   inherit modDirVersion;
 
@@ -12,7 +12,7 @@ import ./generic.nix (args // rec {
     owner = "beagleboard";
     repo = "linux";
     rev = "${version}";
-    sha256 = "1kzbbaqmzgvfls1v9jir2ck9vcdd774mq474vhr5x6dqjnnb5kg9";
+    sha256 = "07hdv2h12gsgafxsqqr7b0fir10rv9k66riklpjba2cg6x0p2nr4";
   };
 
   kernelPatches = args.kernelPatches;
@@ -21,5 +21,14 @@ import ./generic.nix (args // rec {
     efiBootStub = false;
   } // (args.features or {});
 
-  extraMeta.hydraPlatforms = [];
-} // (args.argsOverride or {}))
+  extraMeta.hydraPlatforms = [ "armv7l-linux" ];
+} // (args.argsOverride or {}))) (oldAttrs: {
+
+  # This kernel will run mkuboot.sh.
+  postPatch = ''
+    patchShebangs scripts/
+  '';
+
+  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ dtc ubootTools ];
+
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5685e6dd904d96fc1845c5e6e73f5142ad9e0405
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
+
+with stdenv.lib;
+
+let
+  version = "4.15.18";
+  revision = "a";
+  sha256 = "1wld16i3r06mqxwwkghsxnnivg1jpc6c15y9iclhdgl4srcs1qp6";
+
+  # modVersion needs to be x.y.z, will automatically add .0 if needed
+  modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
+
+  # branchVersion needs to be x.y
+  branchVersion = concatStrings (intersperse "." (take 2 (splitString "." version)));
+
+  modDirVersion = "${modVersion}-hardened";
+in
+buildLinux (args // {
+  inherit modDirVersion;
+
+  version = "${version}-${revision}";
+  extraMeta.branch = "${branchVersion}";
+
+  src = fetchFromGitHub {
+    inherit sha256;
+    owner = "copperhead";
+    repo = "linux-hardened";
+    rev = "${version}.${revision}";
+  };
+} // (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
deleted file mode 100644
index 99bfa0b57c061b70ec617d22a3a54575e605d60c..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
-
-with stdenv.lib;
-
-let
-  version = "4.13.13";
-  revision = "a";
-  sha256 = "1bph0cvmms16mi5iczr6q1wrz7fp5gl2kz5lk8b3cx04wpj65jfl";
-
-  # modVersion needs to be x.y.z, will automatically add .0 if needed
-  modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
-
-  # branchVersion needs to be x.y
-  branchVersion = concatStrings (intersperse "." (take 2 (splitString "." version)));
-
-  modDirVersion = "${modVersion}-hardened";
-in
-import ./generic.nix (args // {
-  inherit modDirVersion;
-
-  version = "${version}-${revision}";
-  extraMeta.branch = "${branchVersion}";
-
-  src = fetchFromGitHub {
-    inherit sha256;
-    owner = "copperhead";
-    repo = "linux-hardened";
-    rev = "${version}.${revision}";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index 92b202100a63d60e9746d4ad8b364740423cf9fb..c4bade2abeda7ed0ac7249aa630314c3f88272f5 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -1,9 +1,10 @@
-{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
-import ./generic.nix (rec {
+buildLinux (rec {
   mptcpVersion = "0.93";
   modDirVersion = "4.9.60";
   version = "${modDirVersion}-mptcp_v${mptcpVersion}";
+  # autoModules= true;
 
   extraMeta = {
     branch = "4.4";
@@ -43,4 +44,4 @@ import ./generic.nix (rec {
     TCP_CONG_BALIA m
 
   '' + (args.extraConfig or "");
-} // args // (args.argsOverride or {}))
+} // args)
diff --git a/pkgs/os-specific/linux/kernel/linux-riscv.nix b/pkgs/os-specific/linux/kernel/linux-riscv.nix
new file mode 100644
index 0000000000000000000000000000000000000000..60370311865ffde37f99948ff32046e423c22dd1
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-riscv.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
+
+buildLinux (args // rec {
+  version = "4.16-rc6";
+  modDirVersion = "4.16.0-rc6";
+  extraMeta.branch = "4.16";
+
+  src = fetchFromGitHub {
+    owner = "shlevy";
+    repo ="riscv-linux";
+    rev = "a54f259c2adce68e3bd7600be8989bf1ddf9ea3a";
+    sha256 = "140w6mj4hm1vf4zsmcr2w5cghcaalbvw5d4m9z57dmq1z5plsl4q";
+  };
+
+  # Should the testing kernels ever be built on Hydra?
+  extraMeta.hydraPlatforms = [];
+
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index fb97aa579df088b72a18a0ab710ab6c1d99b7aee..a96a910c68c9ccb6e0c2ecfa959b0ae2105073c4 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,10 +1,10 @@
-{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
   modDirVersion = "4.9.59";
   tag = "1.20171029";
 in
-stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
+stdenv.lib.overrideDerivation (buildLinux (args // rec {
   version = "${modDirVersion}-${tag}";
   inherit modDirVersion;
 
diff --git a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix
index f262dfe34b79b82a7654839da155c587b3f742ff..442c89675119324656ea37fb5c004f51ec312a91 100644
--- a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix
@@ -1,8 +1,6 @@
-{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args:
 
-assert stdenv.is64bit;
-
-import ./generic.nix (args // rec {
+buildLinux (args // rec {
   version = "4.12.2";
   extraMeta.branch = "4.12-2";
 
@@ -14,5 +12,5 @@ import ./generic.nix (args // rec {
       sha256 = "1dr74i79p8r13522w2ppi8gnjd9bhngc9d2hsn91ji6f5a8fbxx9";
     }; in "${upstream}/build/linux";
 
-  extraMeta.hydraPlatforms = [];
+  extraMeta.platforms = [ "x86_64-linux" ];
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index a104cc5393c37c58c7f5c780964d6c6d47121349..1366a11b573cf8f58211f3ca257d9548b533f410 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,15 +1,15 @@
-{ stdenv, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:
 
-import ./generic.nix (args // rec {
-  version = "4.11.2017.08.23";
-  modDirVersion = "4.11.0";
+buildLinux (args // rec {
+  version = "4.15.2018.04.14";
+  modDirVersion = "4.15.0";
   extraMeta.branch = "master";
-  extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ];
+  extraMeta.maintainers = [ stdenv.lib.maintainers.davidak stdenv.lib.maintainers.chiiruno ];
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs.git";
-    rev = "fb8082a13d49397346a04ce4d3904569b0287738";
-    sha256 = "18csg2zb4lnhid27h5w95j3g8np29m8y3zfpfgjl1jr2jks64kid";
+    rev = "3b7c824e9330a640312fce1b04537c684c1d602c";
+    sha256 = "1l5ib28qkhrxggn6zj9b2839543anbxk2ip75yizgzlv9vr5m4pk";
   };
 
   extraConfig = ''
@@ -20,4 +20,3 @@ import ./generic.nix (args // rec {
   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 54e37e7213039ca8267a988a682f9f6f8ab9d8fe..6c0f01fb8ad700a8262c77a89f8b87f7a39766e5 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
-{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
-import ./generic.nix (args // rec {
-  version = "4.14-rc8";
-  modDirVersion = "4.14.0-rc8";
-  extraMeta.branch = "4.14";
+buildLinux (args // rec {
+  version = "4.17-rc1";
+  modDirVersion = "4.17.0-rc1";
+  extraMeta.branch = "4.17";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0ir2ggflm1xjnn1kvv2c99m5zni5kg0ygzlpm588wnhkzd93nqjh";
+    sha256 = "0a3lrax6f8f98lj65aawpqkzkmxcl2x4h20kr0cr7wf0jvpnn5y3";
   };
 
   # Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index f922116ed36b46b613dcc2e2363d3878bb98be58..9833bb57bafb82dcd303827c09599d7d4b577af9 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,6 +1,8 @@
-{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
+{ buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
+, ncurses ? null
+, libelf
+, utillinux
 , writeTextFile, ubootTools
-, hostPlatform
 }:
 
 let
@@ -24,26 +26,27 @@ in {
   src,
   # Any patches
   kernelPatches ? [],
-  # Patches for native compiling only
-  nativeKernelPatches ? [],
-  # Patches for cross compiling only
-  crossKernelPatches ? [],
-  # The native kernel .config file
+  # The kernel .config file
   configfile,
-  # The cross kernel .config file
-  crossConfigfile ? configfile,
   # Manually specified nixexpr representing the config
   # If unspecified, this will be autodetected from the .config
   config ? stdenv.lib.optionalAttrs allowImportFromDerivation (readConfig configfile),
-  # Cross-compiling config
-  crossConfig ? if allowImportFromDerivation then (readConfig crossConfigfile) else config,
+  # Use defaultMeta // extraMeta
+  extraMeta ? {},
   # Whether to utilize the controversial import-from-derivation feature to parse the config
-  allowImportFromDerivation ? false
+  allowImportFromDerivation ? false,
+  # ignored
+  features ? null,
+
+  hostPlatform
 }:
 
 let
   inherit (stdenv.lib)
-    hasAttr getAttr optional optionalString optionalAttrs maintainers platforms;
+    hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms;
+
+  # Dependencies that are required to build kernel modules
+  moduleBuildDependencies = optional (stdenv.lib.versionAtLeast version "4.14") libelf;
 
   installkernel = writeTextFile { name = "installkernel"; executable=true; text = ''
     #!${stdenv.shell} -e
@@ -54,8 +57,8 @@ let
 
   commonMakeFlags = [
     "O=$(buildRoot)"
-  ] ++ stdenv.lib.optionals (stdenv.platform ? kernelMakeFlags)
-    stdenv.platform.kernelMakeFlags;
+  ] ++ stdenv.lib.optionals (hostPlatform.platform ? kernelMakeFlags)
+    hostPlatform.platform.kernelMakeFlags;
 
   drvAttrs = config_: platform: kernelPatches: configfile:
     let
@@ -78,17 +81,17 @@ let
       isModular = config.isYes "MODULES";
 
       installsFirmware = (config.isEnabled "FW_LOADER") &&
-        (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL"));
+        (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) &&
+        (stdenv.lib.versionOlder version "4.14");
     in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {
       passthru = {
-        inherit version modDirVersion config kernelPatches configfile;
+        inherit version modDirVersion config kernelPatches configfile
+          moduleBuildDependencies stdenv;
       };
 
       inherit src;
 
       preUnpack = ''
-        mkdir build
-        export buildRoot="$(pwd)/build"
       '';
 
       patches = map (p: p.patch) kernelPatches;
@@ -98,24 +101,44 @@ let
             echo "stripping FHS paths in \`$mf'..."
             sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g'
         done
-        sed -i Makefile -e 's|= depmod|= ${kmod}/bin/depmod|'
+        sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|'
       '';
 
       configurePhase = ''
         runHook preConfigure
+
+        mkdir build
+        export buildRoot="$(pwd)/build"
+
+        echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"
+
+        if [[ -z "$buildRoot" || ! -d "$buildRoot" ]]; then
+          echo "set $buildRoot to the build folder please"
+          exit 1
+        fi
+
+        if [ -f "$buildRoot/.config" ]; then
+          echo "Could not link $buildRoot/.config : file exists"
+          exit 1
+        fi
         ln -sv ${configfile} $buildRoot/.config
+
+        # reads the existing .config file and prompts the user for options in
+        # the current kernel source that are not found in the file.
         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"
+          echo "Error: modDirVersion ${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)")
+
+        cd $buildRoot
       '';
 
       buildFlags = [
@@ -135,14 +158,13 @@ let
                           if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" else
                           "install") ];
 
-      postInstall = ''
-        mkdir -p $dev
-        cp $buildRoot/vmlinux $dev/
-      '' + (optionalString installsFirmware ''
+      postInstall = (optionalString installsFirmware ''
         mkdir -p $out/lib/firmware
       '') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
         make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs
       '' else "") + (if isModular then ''
+        mkdir -p $dev
+        cp vmlinux $dev/
         if [ -z "$dontStrip" ]; then
           installFlagsArray+=("INSTALL_MOD_STRIP=1")
         fi
@@ -152,7 +174,7 @@ let
         unlink $out/lib/modules/${modDirVersion}/source
 
         mkdir -p $dev/lib/modules/${modDirVersion}/build
-        cp -dpR ../$sourceRoot $dev/lib/modules/${modDirVersion}/source
+        cp -dpR .. $dev/lib/modules/${modDirVersion}/source
         cd $dev/lib/modules/${modDirVersion}/source
 
         cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build
@@ -171,7 +193,7 @@ let
         # from drivers/ in the future; it adds 50M to keep all of its
         # headers on 3.10 though.
 
-        chmod u+w -R ../source
+        chmod u+w -R ..
         arch=$(cd $dev/lib/modules/${modDirVersion}/build/arch; ls)
 
         # Remove unused arches
@@ -204,7 +226,7 @@ let
         find -empty -type d -delete
 
         # Remove reference to kmod
-        sed -i Makefile -e 's|= ${kmod}/bin/depmod|= depmod|'
+        sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|'
       '' else optionalString installsFirmware ''
         make firmware_install $makeFlags "''${makeFlagsArray[@]}" \
           $installFlags "''${installFlagsArray[@]}"
@@ -217,7 +239,7 @@ let
           "The Linux kernel" +
           (if kernelPatches == [] then "" else
             " (with patches: "
-            + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches))
+            + stdenv.lib.concatStringsSep ", " (map (x: x.name) kernelPatches)
             + ")");
         license = stdenv.lib.licenses.gpl2;
         homepage = https://www.kernel.org/;
@@ -226,35 +248,35 @@ let
           maintainers.thoughtpolice
         ];
         platforms = platforms.linux;
-      };
+      } // extraMeta;
     };
 in
 
-stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKernelPatches) configfile) // {
+assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null;
+assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
+stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches configfile) // {
   name = "linux-${version}";
 
   enableParallelBuilding = true;
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ]
-    ++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools;
+      ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
+      ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
+      ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
+      ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
+      ;
 
   hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];
 
+  # Absolute paths for compilers avoid any PATH-clobbering issues.
   makeFlags = commonMakeFlags ++ [
-    "ARCH=${stdenv.platform.kernelArch}"
+    "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
+    "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
+    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
+  ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
 
-  karch = stdenv.platform.kernelArch;
-
-  crossAttrs = let cp = hostPlatform.platform; in
-    (drvAttrs crossConfig cp (kernelPatches ++ crossKernelPatches) crossConfigfile) // {
-      makeFlags = commonMakeFlags ++ [
-        "ARCH=${cp.kernelArch}"
-        "CROSS_COMPILE=$(crossConfig)-"
-      ];
-
-      karch = cp.kernelArch;
-
-      nativeBuildInputs = optional (cp.kernelTarget == "uImage") ubootTools;
-  };
+  karch = hostPlatform.platform.kernelArch;
 })
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 754a2372c6d8be21926f131cfca4c5d0f92c9f0a..cedb2dfc2230e3369374ab6f16868d7eea75cf47 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,4 +72,16 @@ rec {
       sha256 = "09096npxpgvlwdz3pb3m9brvxh7vy0xc9z9p8hh85xyczyzcsjhr";
     };
   };
+
+  # https://patchwork.kernel.org/patch/9626797/
+  # Should be included in 4.17, so this patch can be dropped when 4.16 becomes obsolete.
+  bcm2835_mmal_v4l2_camera_driver = rec {
+    name = "bcm2835_mmal_v4l2_camera_driver";
+    patch = fetchpatch {
+      name = name + ".patch";
+      url = https://patchwork.kernel.org/patch/9626797/raw/;
+      sha256 = "0iwb0yxsf95zv4qxkvlvhqfmzx0rk13g9clvxsharvwkb4w5lwa0";
+    };
+  };
+
 }
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index b64242e911db2344321e7dc7bc763f6a3d7c32cb..a6f399c0fba4c1499036aacc77a45bbb51b0949d 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -1,7 +1,8 @@
 { 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 }:
+, libiberty, libaudit, libbfd, openssl, systemtap, numactl
+, zlib, withGtk ? false, gtk2 ? null
+}:
 
 with lib;
 
@@ -15,17 +16,29 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     cd tools/perf
-    sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
-    [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
-    export makeFlags="DESTDIR=$out $makeFlags"
+
+    substituteInPlace Makefile \
+      --replace /usr/include/elfutils $elfutils/include/elfutils
+
+    for x in util/build-id.c util/dso.c; do
+      substituteInPlace $x --replace /usr/lib/debug /run/current-system/sw/lib/debug
+    done
+
+    if [ -f bash_completion ]; then
+      sed -i 's,^have perf,_have perf,' bash_completion
+    fi
   '';
 
+  makeFlags = ["prefix=$(out)" "WERROR=0"] ++ kernel.makeFlags;
+
   # 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 makeWrapper pkgconfig ];
-  buildInputs = [ elfutils python perl newt slang libunwind binutils zlib ] ++
-    stdenv.lib.optional withGtk gtk2;
+  nativeBuildInputs = [
+    asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
+    flex bison libiberty libaudit makeWrapper pkgconfig python perl
+  ];
+  buildInputs = [
+    elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
+  ] ++ stdenv.lib.optional withGtk gtk2;
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
@@ -40,22 +53,14 @@ stdenv.mkDerivation {
       "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
     ];
 
-  installFlags = "install install-man ASCIIDOC8=1";
+  separateDebugInfo = true;
+  installFlags = "install install-man ASCIIDOC8=1 prefix=$(out)";
 
   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.cc.prefix}";
-    elfutils = elfutils.crossDrv;
-    inherit (kernel.crossDrv) src patches;
-  };
-
   meta = {
     homepage = https://perf.wiki.kernel.org/;
     description = "Linux tools to profile with performance counters";
diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh
index d9db7f9f916cf8c347f552e792d1085a7e19aeb3..878c3c14fe473cdfa22db0d6aa1719086ef26504 100755
--- a/pkgs/os-specific/linux/kernel/update.sh
+++ b/pkgs/os-specific/linux/kernel/update.sh
@@ -50,13 +50,13 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do
   # Rewrite the expression
   sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
   if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then
-    sed -i "\#import ./generic.nix (args // rec {#a \  modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
+    sed -i "\#buildLinux (args // rec {#a \  modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
   fi
-  sed -i "\#import ./generic.nix (args // rec {#a \  version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
+  sed -i "\#buildLinux (args // rec {#a \  version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
 
   # Commit the changes
   git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
   git commit -m "kernel: $OLDVER -> $V" >/dev/null 2>&1
-  
+
   echo "Updated $OLDVER -> $V"
 done
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 4a68160ce05a7aaa46be27a03c0bf725606d0a74..26f3d89c66286226d102609dd3eb2dbb2620de7f 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, buildPackages, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
   name = "kexec-tools-${version}";
-  version = "2.0.15";
+  version = "2.0.16";
 
   src = fetchurl {
     urls = [
       "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
       "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
     ];
-    sha256 = "1rwl04y1mpb28yq5ynnk8j124dmhj5p8c4hcdn453sri2j37p6w9";
+    sha256 = "043hasx5b9zk7r7dzx24z5wybg74dpmh0nyns6nrnb3mmm8k642v";
   };
 
   hardeningDisable = [ "format" "pic" "relro" ];
 
+  configureFlags = [ "BUILD_CC=${buildPackages.stdenv.cc.targetPrefix}cc" ];
+  nativeBuildInputs = [ buildPackages.stdenv.cc ];
   buildInputs = [ zlib ];
 
   meta = with stdenv.lib; {
     homepage = http://horms.net/projects/kexec/kexec-tools;
     description = "Tools related to the kexec Linux feature";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
+    badPlatforms = platforms.riscv;
   };
 }
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 92ac1a77898ca99eb6d0b424034176321641eca6..c503b982aa29415a9529dcda664f0088bb0cfd1f 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   ] # 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}";
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
 
   # Install static binaries as well.
   postInstall = ''
diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix
index 9bd7c8480c1cd6d29c67a3dc30e10f5206c8398c..7d46a13f35623fdb9d4f597df2c9db82e18872a9 100644
--- a/pkgs/os-specific/linux/kmod/aggregator.nix
+++ b/pkgs/os-specific/linux/kmod/aggregator.nix
@@ -9,6 +9,12 @@ buildEnv {
     ''
       source ${stdenv}/setup
 
+      if ! test -d "$out/lib/modules"; then
+        echo "No modules found."
+        # To support a kernel without modules
+        exit 0
+      fi
+
       kernelVersion=$(cd $out/lib/modules && ls -d *)
       if test "$(echo $kernelVersion | wc -w)" != 1; then
          echo "inconsistent kernel versions: $kernelVersion"
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index c55ebffa8293ab09cabd79aaf4dd16a48c4fe14d..f9be82255704a69e80e3544073cf4244748a5c48 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -6,11 +6,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "kmod-${version}";
-  version = "24";
+  version = "25";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
-    sha256 = "15xkkkzvca9flvkm48gkh8y8f13vlm3sl7nz9ydc7b3jy4fqs2v1";
+    sha256 = "1kgixs4m3jvwk7fb3d18n6j77qhgi9qfv4csj35rs5ancr4ycrbi";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];
diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix
index bc7b254e19e9cf49ec2d2cc7697cd0a755b5762f..d3d6cfd4c58b90328d17512f4db545605dc9bb3b 100644
--- a/pkgs/os-specific/linux/kmscon/default.nix
+++ b/pkgs/os-specific/linux/kmscon/default.nix
@@ -4,7 +4,7 @@
 , systemd
 , libxkbcommon
 , libdrm
-, mesa
+, libGLU_combined
 , pango
 , pixman
 , pkgconfig
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     systemd
     libxkbcommon
     libdrm
-    mesa
+    libGLU_combined
     pango
     pixman
     pkgconfig
diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix
index c1389f30b0598ae4c892959afd928b5ac4c1ca8d..27ffaca61e71980b56e9e88cb5fb799c826a26c2 100644
--- a/pkgs/os-specific/linux/kmscube/default.nix
+++ b/pkgs/os-specific/linux/kmscube/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }:
+{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa_noglu, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "kmscube-2017-03-19";
 
   src = fetchgit {
-    url = git://anongit.freedesktop.org/mesa/kmscube;
+    url = git://anongit.freedesktop.org/libGLU_combined/kmscube;
     rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea";
     sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ libdrm libX11 mesa_noglu ];
+  buildInputs = [ libdrm libX11 libGL mesa_noglu ];
 
   meta = with stdenv.lib; {
     description = "Example OpenGL app using KMS/GBM";
diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix
index 1e85182d6c35fc8dc4b6bae2b3aedb708452cd06..e2be136adee15fb4a2d83848f96e60665476f153 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/pkgs/os-specific/linux/libaio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   version = "0.3.110";
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0";
   };
 
+  patches = [ (fetchpatch {
+    url = https://pagure.io/libaio/c/da47c32b2ff39e52fbed1622c34b86bc88d7c217.patch;
+    sha256 = "1kqpiswjn549s3w3m89bw5qkl7bw5pvq6gp5cdzd926ymlgivj5c";
+  }) ];
+
   makeFlags = "prefix=$(out)";
 
   hardeningDisable = stdenv.lib.optional (stdenv.isi686) "stackprotector";
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 17cd40e427b9671ea2346df2b79e407e34ec11aa..f00d6272902df80ca40aebb312849f86c5fc3de3 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, attr, perl, pam ? null }:
+{ stdenv, buildPackages, fetchurl, attr, perl, pam ? null }:
 assert pam != null -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "lib" "man" "doc" ]
     ++ stdenv.lib.optional (pam != null) "pam";
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl ];
 
   buildInputs = [ pam ];
@@ -22,6 +23,8 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "lib=lib"
     (stdenv.lib.optional (pam != null) "PAM_CAP=yes")
+    "BUILD_CC=$(CC_FOR_BUILD)"
+    "CC:=$(CC)"
   ];
 
   prePatch = ''
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 81a3af54628e833f9c4577912b9c6cfc75a39ee2..f66df8163ff17b7f420b27bdb0f0a2e31c0a12fc 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig }:
 
 let version = "3.3.0"; in
 stdenv.mkDerivation {
@@ -13,6 +13,12 @@ stdenv.mkDerivation {
 
   outputs = [ "bin" "dev" "out" "man" ];
 
+  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/musl/48d2a28710ae40877fd3e178ead1fb1bb0baa62c/dev-libs/libnl/files/libnl-3.3.0_rc1-musl.patch";
+      sha256 = "0dd7xxikib201i99k2if066hh7gwf2i4ffckrjplq6lr206jn00r";
+    });
+
   nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];
 
   meta = with lib; {
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 541ead7258f6e46cb55b5e95d1e175e06c4da3da..59d5db52ac688de6ec06099def51f7735edff18d 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libsepol, pcre
+{ stdenv, fetchurl, pcre, pkgconfig, libsepol
 , enablePython ? true, swig ? null, python ? null
+, musl-fts
 }:
 
 assert enablePython -> swig != null && python != null;
@@ -8,48 +9,37 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libselinux-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libselinux-${version}.tar.gz";
-    sha256 = "0yqg73ns97jwjh1iyv0jr5qxb8k5sqq5ywfkx11lzfn5yj8k0126";
+    sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libsepol pcre ]
-             ++ optionals enablePython [ swig python ];
+             ++ optionals enablePython [ swig python ]
+             ++ optional stdenv.hostPlatform.isMusl musl-fts;
 
-  # Avoid this false warning:
-  # avc_internal.c: In function 'avc_netlink_receive':
-  # avc_internal.c:105:25: error: cast increases required alignment of target type [-Werror=cast-align]
-  #  struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
-  #                         ^
+  # drop fortify here since package uses it by default, leading to compile error:
+  # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
+  hardeningDisable = [ "fortify" ];
 
-  NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-error=cast-align";
-
-  # Unreleased upstream patch that fixes Python package issue arising
-  # from recent SWIG changes.
-  patches = optional enablePython (fetchpatch {
-    name = "fix-python-swig.patch";
-    url = "https://github.com/SELinuxProject/selinux/commit/a9604c30a5e2f71007d31aa6ba41cf7b95d94822.patch";
-    sha256 = "0mjrclh0sd8m7vq0wvl6pg29ss415j3kn0266v8ixy4fprafagfp";
-    stripLen = 1;
-  });
+  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
 
   postPatch = optionalString enablePython ''
     sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile
-  ''
-  + ''
-    sed '1i#include ' -i src/setrans_client.c
   '';
 
+  # fix install locations
   preBuild = ''
-    # Build fails without this precreated
-    mkdir -p $out/include
-
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
+    makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
+    makeFlagsArray+=("MAN8DIR=$out/share/man/man8")
+    makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages")
   '';
 
   installTargets = [ "install" ] ++ optional enablePython "install-pywrap";
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index c60d96bba784890459f338e23c320f630bf77f83..45222bee6b0037a4f0b44d96fa3cf05dc028af1a 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -1,25 +1,33 @@
-{ stdenv, fetchurl, bison, flex, libsepol, libselinux, ustr, bzip2, libaudit }:
+{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, libaudit
+, enablePython ? true, swig ? null, python ? null
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libsemanage-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz";
-    sha256 = "1134ka4mi4387ac5yv68bpp2y7ln5xxhwp07xhqnay0nxzjaqk0s";
+    sha256 = "0xnlp1yg8b1aqc6kq3pss1i1nl06rfj4x4pyl5blasnf2ivlgs87";
   };
 
-  nativeBuildInputs = [ bison flex ];
-  buildInputs = [ libsepol libselinux ustr bzip2 libaudit ];
-
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
+  nativeBuildInputs = [ bison flex pkgconfig ];
+  buildInputs = [ libsepol libselinux bzip2 libaudit ]
+    ++ optionals enablePython [ swig python ];
 
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
+    makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
+    makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages")
   '';
 
+  installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];
+
   meta = libsepol.meta // {
     description = "Policy management tools for SELinux";
     license = stdenv.lib.licenses.lgpl21;
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index 0417bf59cfa304ea5b1a2943cbe00240873b9e1e..40872f7c1ac86aabc2ef1ed88a6084a5a545c9e4 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libsepol-${version}";
-  version = "2.4";
-  se_release = "20150202";
+  version = "2.7";
+  se_release = "20170804";
   se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libsepol-${version}.tar.gz";
-    sha256 = "0ncnwhpc1gx4hrrb822fqkwy5h75zzngsrfkd5mlqh1jk7aib419";
+    sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn";
   };
 
   nativeBuildInputs = [ flex ];
@@ -16,8 +16,12 @@ stdenv.mkDerivation rec {
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("MAN8DIR=$out/share/man/man8")
+    makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
   '';
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
   passthru = { inherit se_release se_url; };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 98ec778e2c26004ac3d23befa5556cf798ceaa25..62898675f2be1ee86a615c180e6d3d80db7c18d3 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -1,36 +1,37 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, perl, autoreconfHook, doxygen }:
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext
+, libxml2, perl, doxygen }:
 
-let
-  version = "2.3.2";
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
   name = "libsmbios-${version}";
+  version = "2.4.1";
 
-  src = fetchurl {
-    url = "https://github.com/dell/libsmbios/archive/v${version}.tar.gz";
-    sha256 = "0kvi36jrvhspyyq0pjfdyvzvimdn27fvbdpf429qm3xdmfi78y2j";
+  src = fetchFromGitHub {
+    owner = "dell";
+    repo = "libsmbios";
+    rev = "v${version}";
+    sha256 = "158w5fz777is7nr5yhpr69b17nn6i1pavycxq1q9899frrpkzbsc";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ libxml2 perl doxygen ];
+  nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ];
+
+  configureFlags = [ "--disable-python" "--disable-graphviz" ];
 
-  # It tries to install some Python stuff even when Python is disabled.
-  installFlags = "pkgpythondir=$(TMPDIR)/python";
+  enableParallelBuilding = true;
 
-  postInstall =
-    ''
-      mkdir -p $out/include
-      cp -va "src/include/"* "$out/include/"
-      cp -va "out/public-include/"* "$out/include/"
-    '';
+  postInstall = ''
+    mkdir -p $out/include
+    cp -a src/include/smbios_c $out/include/
+    cp -a out/public-include/smbios_c $out/include/
+  '';
 
-  # Hack to avoid TMPDIR in RPATHs.
-  preFixup = ''rm -rf "$(pwd)" '';
+  preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs
 
-  meta = {
-    homepage = http://linux.dell.com/libsmbios/main;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dell/libsmbios;
     description = "A library to obtain BIOS information";
-    license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1
+    license = with licenses; [ osl21 gpl2Plus ];
+    maintainers = with maintainers; [ ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..879e85a0c945b3ff5746c30defa915cbd2978927
--- /dev/null
+++ b/pkgs/os-specific/linux/libwebcam/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, stdenv
+, fetchurl
+, cmake
+, pkgconfig
+, libxml2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libwebcam";
+  version = "0.2.5";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/${pname}/source/${pname}-src-${version}.tar.gz";
+    sha256 = "0hcxv8di83fk41zjh0v592qm7c0v37a3m3n3lxavd643gff1k99w";
+  };
+
+  patches = [
+    ./uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
+  ];
+
+  buildInputs = [
+    cmake
+    pkgconfig
+    libxml2
+  ];
+
+  postPatch = ''
+    substituteInPlace ./uvcdynctrl/CMakeLists.txt \
+      --replace "/lib/udev" "$out/lib/udev"
+
+    substituteInPlace ./uvcdynctrl/udev/scripts/uvcdynctrl \
+      --replace 'debug=0' 'debug=''${NIX_UVCDYNCTRL_UDEV_DEBUG:-0}' \
+      --replace 'uvcdynctrlpath=uvcdynctrl' "uvcdynctrlpath=$out/bin/uvcdynctrl"
+
+    substituteInPlace ./uvcdynctrl/udev/rules/80-uvcdynctrl.rules \
+      --replace "/lib/udev" "$out/lib/udev"
+  '';
+
+
+  preConfigure = ''
+    cmakeFlagsArray=(
+      $cmakeFlagsArray
+      "-DCMAKE_INSTALL_PREFIX=$out"
+    )
+  '';
+
+  meta = with lib; {
+    description = "The webcam-tools package";
+    platforms = platforms.linux;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ jraygauthier ];
+  };
+}
diff --git a/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch b/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
new file mode 100644
index 0000000000000000000000000000000000000000..07e5f0bf852b784fe1b677de7bc231546d6337d5
--- /dev/null
+++ b/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
@@ -0,0 +1,65 @@
+diff --git a/uvcdynctrl/main.c b/uvcdynctrl/main.c
+index b7befd1..f3a768c 100644
+--- a/uvcdynctrl/main.c
++++ b/uvcdynctrl/main.c
+@@ -674,27 +674,31 @@ get_filename (const char *dir_path, const char *vid)
+ 	printf ( "checking dir: %s \n", dir_path);
+ 	while ((dp = readdir(dir)) != NULL) 
+ 	{
+-		if((dp->d_type == DT_DIR) && (fnmatch("[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]", dp->d_name, 0) == 0))
++		if((dp->d_type == DT_DIR || dp->d_type == DT_LNK ) && (fnmatch("[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]", dp->d_name, 0) == 0))
+ 		{
+ 			if( strcasecmp(vid, dp->d_name) != 0)
+ 			{
+ 				/*doesn't match - clean up and move to the next entry*/
+ 				continue;
+ 			}
+-			
++
+ 			char *tmp = path_cat (dir_path, dp->d_name);
+-			printf("found dir: %s \n", dp->d_name);
++
+ 			DIR * subdir = opendir(tmp);
+-			while ((sdp = readdir(subdir)) != NULL) 
++			if ( subdir != NULL )
+ 			{
+-				if( fnmatch("*.xml", sdp->d_name, 0) == 0 )
++				printf("found dir: %s \n", dp->d_name);
++				while ((sdp = readdir(subdir)) != NULL) 
+ 				{
+-					file_list[nf-1] = path_cat (tmp, sdp->d_name);
+-					printf("found: %s \n", file_list[nf-1]);
+-					nf++;
+-					file_list = realloc(file_list,nf*sizeof(file_list));
+-					file_list[nf-1] = NULL;   
+-				} 
++					if( fnmatch("*.xml", sdp->d_name, 0) == 0 )
++					{
++						file_list[nf-1] = path_cat (tmp, sdp->d_name);
++						printf("found: %s \n", file_list[nf-1]);
++						nf++;
++						file_list = realloc(file_list,nf*sizeof(file_list));
++						file_list[nf-1] = NULL;   
++					} 
++				}
+ 			}
+ 			closedir(subdir);
+ 			free (tmp);
+@@ -869,9 +873,15 @@ main (int argc, char **argv)
+ 			pid_set = 1; /*flag pid.xml check*/
+ 			//printf("vid:%s pid:%s\n", vid, pid);
+ 		}
+-		
++
++		const char* dataDir = getenv( "NIX_UVCDYNCTRL_DATA_DIR" );
++		// When unavailable, fallback on data dir specified at build time.
++		if ( !dataDir ) {
++			dataDir = DATA_DIR;
++		}
++
+ 		/* get xml file list from DATA_DIR/vid/ */ 
+-		char **xml_files = get_filename (DATA_DIR, vid);
++		char **xml_files = get_filename (dataDir, vid);
+  
+ 		/*check for pid.xml*/
+ 		char fname[9];
diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix
index a1f00531cee17a649f2a80740a00eefd2116cd0a..4f35d54653834da80d738aaeb6d988cc6ca96dd9 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/pkgs/os-specific/linux/lm-sensors/default.nix
@@ -1,21 +1,30 @@
-{ stdenv, fetchurl, bison, flex, which, perl }:
+{ sensord ? false,
+  stdenv, fetchurl, bison, flex, which, perl,
+  rrdtool ? null
+}:
+
+assert sensord -> rrdtool != null;
 
 stdenv.mkDerivation rec {
   name = "lm-sensors-${version}";
   version = "3.4.0"; # don't forget to tweak fedoraproject mirror URL hash
-  
+
   src = fetchurl {
     urls = [
       "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2"
-      "http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2"
+      "http://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2"
     ];
     sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0";
   };
 
-  buildInputs = [ bison flex which perl ];
+  buildInputs = [ bison flex which perl ]
+   ++ stdenv.lib.optional sensord rrdtool;
+
+  patches = [ ./musl-fix-includes.patch ];
 
   preBuild = ''
-    makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc)
+    makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc
+    ${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"})
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch b/pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch
new file mode 100644
index 0000000000000000000000000000000000000000..501f2dd762c6374fe020b1d56c349056c00aa9ef
--- /dev/null
+++ b/pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch
@@ -0,0 +1,62 @@
+--- lm_sensors-3.3.4.orig/prog/dump/isadump.c
++++ lm_sensors-3.3.4/prog/dump/isadump.c
+@@ -36,13 +36,7 @@
+ #include "util.h"
+ #include "superio.h"
+ 
+-
+-/* To keep glibc2 happy */
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+ #include 
+-#else
+-#include 
+-#endif
+ 
+ #ifdef __powerpc__
+ unsigned long isa_io_base = 0; /* XXX for now */
+--- lm_sensors-3.3.4.orig/prog/dump/isaset.c
++++ lm_sensors-3.3.4/prog/dump/isaset.c
+@@ -32,13 +32,7 @@
+ #include 
+ #include "util.h"
+ 
+-
+-/* To keep glibc2 happy */
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+ #include 
+-#else
+-#include 
+-#endif
+ 
+ #ifdef __powerpc__
+ unsigned long isa_io_base = 0; /* XXX for now */
+--- lm_sensors-3.3.4.orig/prog/dump/superio.c
++++ lm_sensors-3.3.4/prog/dump/superio.c
+@@ -20,12 +20,7 @@
+ */
+ 
+ #include 
+-
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+ #include 
+-#else
+-#include 
+-#endif
+ 
+ #include "superio.h"
+ 
+--- lm_sensors-3.3.4.orig/prog/dump/util.c
++++ lm_sensors-3.3.4/prog/dump/util.c
+@@ -11,12 +11,7 @@
+ #include 
+ #include "util.h"
+ 
+-/* To keep glibc2 happy */
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+ #include 
+-#else
+-#include 
+-#endif
+ 
+ /* Return 1 if we should continue, 0 if we should abort */
+ int user_ack(int def)
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 435a11f15990ec64ea5eb4108096e4fa097f1f53..7c2233714d4c6116ba5a717ca5cd600f53ef11d5 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.10.0";
+  version = "2.10.5";
 
   src = fetchurl {
-    url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
-    sha256 = "1gzi7j97zymzfj6b7mlih35djflwfgg93b63q9rbs5w1kclmsrgz";
+    url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
+    sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq";
   };
 
   hardeningDisable = [ "pic" ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Linux kernel modules for LTTng tracing";
-    homepage = http://lttng.org/;
+    homepage = https://lttng.org/;
     license = with licenses; [ lgpl21 gpl2 mit ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 6382b90f1683263d5b93469547bb4e21bf61129a..bd84e121a7d69fc13b695ca60b99008d087a4dc7 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid
+{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid
 , thin-provisioning-tools, enable_dmeventd ? false }:
 
 let
-  version = "2.02.175";
+  version = "2.02.177";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
-    sha256 = "0n95cc2b0jb0fh2pd9jyg9ww7lyzpia9n9sryw9f4aq8dpna7dsd";
+    sha256 = "1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0";
   };
 
   configureFlags = [
@@ -20,7 +20,11 @@ stdenv.mkDerivation {
     "--enable-pkgconfig"
     "--enable-applib"
     "--enable-cmdlib"
-  ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd";
+  ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"
+  ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ];
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libudev libuuid thin-provisioning-tools ];
@@ -37,6 +41,23 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   #patches = [ ./purity.patch ];
+  patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+    (fetchpatch {
+      name = "fix-stdio-usage.patch";
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50";
+      sha256 = "0m6wr6qrvxqi2d2h054cnv974jq1v65lqxy05g1znz946ga73k3p";
+    })
+    (fetchpatch {
+      name = "mallinfo.patch";
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50";
+      sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0";
+    })
+    (fetchpatch {
+      name = "mlockall-default-config.patch";
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50";
+      sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l";
+    })
+  ];
 
   # To prevent make install from failing.
   preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 2660f299262aa3fa1dc8689af63880721b90904b..1b15edcc923cdb996dcec01c01f3c2d237b7461a 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,40 +1,31 @@
 { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, perl, docbook2x
-, docbook_xml_dtd_45, python3Packages
+, docbook_xml_dtd_45, python3Packages, pam
 
 # Optional Dependencies
 , libapparmor ? null, gnutls ? null, libselinux ? null, libseccomp ? null
-, cgmanager ? null, libnih ? null, dbus ? null, libcap ? null, systemd ? null
+, libcap ? null, systemd ? null
 }:
 
-let
-  enableCgmanager = cgmanager != null && libnih != null && dbus != null;
-in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "lxc-${version}";
-  version = "2.1.0";
+  version = "3.0.0";
 
   src = fetchurl {
     url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
-    sha256 = "1qld0gi19mximxm0qyr6vzav32gymhc7fvp0bzwv37j0b8q0fi1r";
+    sha256 = "12ldpkd17cy6fg7z1icr91cfs86jkkrsj61b6wdj0l7h4x624c32";
   };
 
   nativeBuildInputs = [
     autoreconfHook pkgconfig perl docbook2x python3Packages.wrapPython
   ];
   buildInputs = [
-    libapparmor gnutls libselinux libseccomp cgmanager libnih dbus libcap
+    pam libapparmor gnutls libselinux libseccomp libcap
     python3Packages.python python3Packages.setuptools systemd
   ];
 
   patches = [
     ./support-db2x.patch
-    # Fix build error against glibc 2.26
-    (fetchpatch {
-      url = "https://github.com/lxc/lxc/commit/"
-          + "180c477a326ce85632249ff16990e8c29db1b6fa.patch";
-      sha256 = "05jkiiixxk9ibj1fwzmy56rkkign28bd9mrmgiz12g92r2qahm2z";
-    })
   ];
 
   postPatch = ''
@@ -43,15 +34,8 @@ stdenv.mkDerivation rec {
 
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
 
-  # FIXME
-  # glibc 2.25 moved major()/minor() to .
-  # this commit should detect this: https://github.com/lxc/lxc/pull/1388/commits/af6824fce9c9536fbcabef8d5547f6c486f55fdf
-  # However autotools checks if mkdev is still defined in  runs before
-  # checking if major()/minor() is defined there. The mkdev check succeeds with
-  # a warning and the check which should set MAJOR_IN_SYSMACROS is skipped.
-  NIX_CFLAGS_COMPILE = [ "-DMAJOR_IN_SYSMACROS" ];
-
   configureFlags = [
+    "--enable-pam"
     "--localstatedir=/var"
     "--sysconfdir=/etc"
     "--disable-api-docs"
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index c23457c6b5f69bcc636d9531ab3e8edf03f7ed45..6f7dd2f56ff760057994ba5392aebf147b6935ec 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse
+, enableDebugBuild ? false }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxcfs-2.0.7";
+  name = "lxcfs-3.0.0";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     rev = name;
-    sha256 = "1z6d52dc12rcplgc9jdgi3lbxm6ahlsjgs1k8v8kvn261xsq1m0a";
+    sha256 = "0fsy2h7b5dkzvfm6m8vqzhnji42cszdn0b3ndnaxiwv3402ccmvk";
   };
 
   nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
-  buildInputs = [ fuse pam ];
+  buildInputs = [ fuse ];
+
+  preConfigure = stdenv.lib.optionalString enableDebugBuild ''
+    sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am
+  '';
 
   configureFlags = [
     "--with-init-script=systemd"
diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix
index a656db3064596dfe6f9a85fe8ab8f9cd117c6e02..0a6fc3c977c89ede1cde2ef84299c20d8a366e6f 100644
--- a/pkgs/os-specific/linux/mba6x_bl/default.nix
+++ b/pkgs/os-specific/linux/mba6x_bl/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   hardeningDisable = [ "pic" ];
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   makeFlags = [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index 200654909c28ec414d8a7bdfea66b63785629cfd..a825314683eaa167ee144c2bfffe0e734789db0b 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "mbpfan-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
   src = fetchFromGitHub {
     owner = "dgraziotin";
     repo = "mbpfan";
     rev = "v${version}";
-    sha256 = "1iri1py9ym0zz7fcacbf0d9y3i3ay77jmajckchagamkfha16zyp";
+    sha256 = "1l8fj92jxfp0sldvznsdsm3pn675b35clq3371h6d5wk4jx67fvg";
   };
   installPhase = ''
     mkdir -p $out/bin $out/etc
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index a7f5ffaae4a24d09cba8a8f3b23c0e522f9d9ed1..4ebc1c00f7af9072480770562d447711501fc947 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "153";
+  version = "157";
 
   src = fetchFromGitHub {
     owner  = "andikleen";
     repo   = "mcelog";
     rev    = "v${version}";
-    sha256 = "1wz55dzqdiam511d6p1958al6vzlhrhs73s7gly0mzm6kpji0gxa";
+    sha256 = "1965axyfizv2jg412a4wrrghgswwvvgymk7mbwaraw3xl9p21wgv";
   };
 
   postPatch = ''
@@ -47,6 +47,5 @@ stdenv.mkDerivation rec {
     homepage = http://mcelog.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix
deleted file mode 100644
index 5511d72884a5a6023001d9e6c635ce559ab211f3..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/mdadm/4.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv
-, fetchurl, groff
-, buildPlatform, hostPlatform
-}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation rec {
-  name = "mdadm-4.0";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz";
-    sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx";
-  };
-
-  # This is to avoid self-references, which causes the initrd to explode
-  # in size and in turn prevents mdraid systems from booting.
-  allowedReferences = [ stdenv.glibc.out ];
-
-  patches = [ ./no-self-references.patch ];
-
-  makeFlags = [
-    "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
-    "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
-    "STRIP="
-  ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
-    "CROSS_COMPILE=${stdenv.cc.prefix}"
-  ];
-
-  nativeBuildInputs = [ groff ];
-
-  preConfigure = ''
-    sed -e 's@/lib/udev@''${out}/lib/udev@' \
-        -e 's@ -Werror @ @' \
-        -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile
-  '';
-
-  meta = {
-    description = "Programs for managing RAID arrays under Linux";
-    homepage = http://neil.brown.name/blog/mdadm;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 0929bae991dd22ee1c6408d382e726bf6c925af8..7a59c2ea75738a42a4bfea69b73b95ee3d9894a4 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -1,21 +1,32 @@
-{ stdenv
+{ stdenv, writeScript
 , fetchurl, groff
 , buildPlatform, hostPlatform
 }:
 
 assert stdenv.isLinux;
 
+let
+  sendmail-script = writeScript "sendmail-script" ''
+    #!/bin/sh
+
+    if [ -x /run/wrappers/bin/sendmail ]; then
+      /run/wrappers/bin/sendmail "$@"
+    else
+      /run/current-system/sw/bin/sendmail "$@"
+    fi
+  '';
+in
 stdenv.mkDerivation rec {
-  name = "mdadm-3.3.4";
+  name = "mdadm-4.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz";
-    sha256 = "0s6a4bq7v7zxiqzv6wn06fv9f6g502dp047lj471jwxq0r9z9rca";
+    sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx";
   };
 
   # This is to avoid self-references, which causes the initrd to explode
   # in size and in turn prevents mdraid systems from booting.
-  allowedReferences = [ stdenv.glibc.out ];
+  allowedReferences = [ stdenv.cc.libc.out sendmail-script ];
 
   patches = [ ./no-self-references.patch ];
 
@@ -24,18 +35,15 @@ stdenv.mkDerivation rec {
     "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
     "STRIP="
   ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
-    "CROSS_COMPILE=${stdenv.cc.prefix}"
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
 
   nativeBuildInputs = [ groff ];
 
-  # Attempt removing if building with gcc5 when updating
-  NIX_CFLAGS_COMPILE = "-std=gnu89";
-
   preConfigure = ''
     sed -e 's@/lib/udev@''${out}/lib/udev@' \
         -e 's@ -Werror @ @' \
-        -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile
+        -e 's@/usr/sbin/sendmail@${sendmail-script}@' -i Makefile
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 19425f810d0a5c873345783b61d81df30ac21fd1..857a3b580a8eb61a696514d675c0adbd23ede532 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 = "20170707";
+  version = "20180312";
 
   src = fetchurl {
-    url = "https://downloadmirror.intel.com/26925/eng/microcode-${version}.tgz";
-    sha256 = "14zf7fbhg0msa3bm0kl139pclmkfm83s6l86x48sr9sjpxllgm2g";
+    url = "https://downloadmirror.intel.com/27591/eng/microcode-${version}.tgz";
+    sha256 = "0yg7q5blcqgq8jyjxhn9n48rxws77ylqzyn4kn10l6yzwan1yf0b";
   };
 
   buildInputs = [ libarchive ];
diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix
index 0d79027d8b79fbb29fffffe9ccec4d40de2dd614..c7990466ca73bdf33cbd11efcacadbeb9fe58654 100644
--- a/pkgs/os-specific/linux/miraclecast/default.nix
+++ b/pkgs/os-specific/linux/miraclecast/default.nix
@@ -1,27 +1,33 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, systemd, glib, readline }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+, glib, readline, pcre, systemd, udev }:
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "miraclecast-0.0-git-20151002";
+  name = "miraclecast-${version}";
+  version = "1.0-20170427";
 
   src = fetchFromGitHub {
-    owner = "albfan";
-    repo = "miraclecast";
-    rev = "30b8c2d22391423f76ba582aaaa1e0936869103a";
-    sha256 = "0i076n76kq64fayc7v06gr1853pk5r6ms86m57vd1xsjd0r9wyxd";
+    owner  = "albfan";
+    repo   = "miraclecast";
+    rev    = "a395c3c7afc39a958ae8ab805dea0f5d22118f0c";
+    sha256 = "03kbjajv2x0i2g68c5aij0icf9waxnqkc9pp32z60nc8zxy9jk1y";
   };
 
-  # INFO: It is important to list 'systemd' first as for now miraclecast
-  # links against a customized systemd. Otherwise, a systemd package from
-  # a propagatedBuildInput could take precedence.
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ systemd udev glib readline ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
 
-  meta = {
-    homepage = https://github.com/albfan/miraclecast;
+  buildInputs = [ glib pcre readline systemd udev ];
+
+  enableParallelBuilding = true;
+
+  mesonFlags = [
+    "-Drely-udev=true"
+    "-Dbuild-tests=true"
+  ];
+
+  meta = with stdenv.lib; {
     description = "Connect external monitors via Wi-Fi";
-    license = licenses.lgpl21Plus;
+    homepage    = https://github.com/albfan/miraclecast;
+    license     = licenses.lgpl21Plus;
     maintainers = with maintainers; [ tstrobel ];
-    platforms = platforms.linux;
+    platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix
index ce9136e2ddbfb6caa5529b320bb15b6ae8777ce4..e9d654add49eeceba73b4994a5f388127fb66589 100644
--- a/pkgs/os-specific/linux/mstpd/default.nix
+++ b/pkgs/os-specific/linux/mstpd/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchsvn }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
-stdenv.mkDerivation rec {
-  name = "mstpd-svn-${toString version}";
-  version = 61;
+stdenv.mkDerivation {
+  name = "mstpd-0.0.5.20171113";
 
-  src = fetchsvn {
-    url = "svn://svn.code.sf.net/p/mstpd/code/trunk";
-    rev = version;
-    sha256 = "0n5vqqqq8hk6iqdz100j9ps4zkz71vyl5qgz5bzjhayab2dyq1fd";
+  src = fetchFromGitHub {
+    owner = "mstpd";
+    repo = "mstpd";
+    rev = "2522c6eed201bce8dd81e1583f28748e9c552d0d";
+    sha256 = "0ckk386inwcx3776hf15w78hpw4db2rgv4zgf0i3zcylr83hhsr2";
   };
 
-  patches = [ ./fixes.patch ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  installFlags = [ "DESTDIR=\${out}" ];
+  installFlags = [ "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "Multiple Spanning Tree Protocol daemon";
diff --git a/pkgs/os-specific/linux/mstpd/fixes.patch b/pkgs/os-specific/linux/mstpd/fixes.patch
deleted file mode 100644
index 7303e1d7b4d3d97abb0b8b9d9c61afe3bb891cee..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/mstpd/fixes.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/Makefile b/Makefile
-index dde9f81..5af7cab 100644
---- a/Makefile
-+++ b/Makefile
-@@ -34,7 +34,6 @@ install: all
- 	-mkdir -pv $(DESTDIR)/sbin
- 	install -m 755 mstpd $(DESTDIR)/sbin/mstpd
- 	install -m 755 mstpctl $(DESTDIR)/sbin/mstpctl
--	install -m 755 bridge-stp /sbin/bridge-stp
- 	-mkdir -pv $(DESTDIR)/lib/mstpctl-utils/
- 	cp -rv lib/* $(DESTDIR)/lib/mstpctl-utils/
- 	gzip -f $(DESTDIR)/lib/mstpctl-utils/mstpctl.8
-@@ -42,8 +41,9 @@ install: all
- 	if [ -d $(DESTDIR)/etc/network/if-pre-up.d ] ; then ln -sf /lib/mstpctl-utils/ifupdown.sh $(DESTDIR)/etc/network/if-pre-up.d/mstpctl ; fi
- 	if [ -d $(DESTDIR)/etc/network/if-pre-up.d ] ; then ln -sf /lib/mstpctl-utils/ifupdown.sh $(DESTDIR)/etc/network/if-post-down.d/mstpctl ; fi
- 	if [ -d $(DESTDIR)/etc/bash_completion.d ] ; then ln -sf /lib/mstpctl-utils/bash_completion $(DESTDIR)/etc/bash_completion.d/mstpctl ; fi
--	ln -sf /lib/mstpctl-utils/mstpctl.8.gz $(DESTDIR)/usr/share/man/man8/mstpctl.8.gz
--	ln -sf /lib/mstpctl-utils/mstpctl-utils-interfaces.5.gz $(DESTDIR)/usr/share/man/man5/mstpctl-utils-interfaces.5.gz
-+	mkdir -p $(DESTDIR)/share/man/man8 $(DESTDIR)/share/man/man5
-+	ln -sf /lib/mstpctl-utils/mstpctl.8.gz $(DESTDIR)/share/man/man8/mstpctl.8.gz
-+	ln -sf /lib/mstpctl-utils/mstpctl-utils-interfaces.5.gz $(DESTDIR)/share/man/man5/mstpctl-utils-interfaces.5.gz
- 
- romfs: all
- 	$(ROMFSINST) /sbin/mstpd
-diff --git a/bridge_track.c b/bridge_track.c
-index c92fdf6..0c01aec 100644
---- a/bridge_track.c
-+++ b/bridge_track.c
-@@ -28,6 +28,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- 
-diff --git a/broadcom_xstrata/driver_deps.c b/broadcom_xstrata/driver_deps.c
-index e72e9e3..5194253 100644
---- a/broadcom_xstrata/driver_deps.c
-+++ b/broadcom_xstrata/driver_deps.c
-@@ -14,6 +14,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- #include "log.h"
-diff --git a/ctl_functions.h b/ctl_functions.h
-index 9c3b914..df464de 100644
---- a/ctl_functions.h
-+++ b/ctl_functions.h
-@@ -27,6 +27,7 @@
- #ifndef CTL_SOCKET_H
- #define CTL_SOCKET_H
- 
-+#include 
- #include 
- #include 
- 
-diff --git a/mstp.c b/mstp.c
-index 1c6a2df..b2a1acd 100644
---- a/mstp.c
-+++ b/mstp.c
-@@ -37,6 +37,7 @@
- 
- #include 
- #include 
-+#include 
- #include 
- #include 
- 
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index aaef5315b0f0f2a46caec0dce6a0be7fdf01d831..4d1c2cad2e33c19a3f88f865285a4614cb787bb5 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -1,12 +1,30 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, lib, fetchurl
+, buildPackages
+, linuxHeaders ? null
+, useBSDCompatHeaders ? true
+}:
+let
+  cdefs_h = fetchurl {
+    url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-cdefs.h";
+    sha256 = "16l3dqnfq0f20rzbkhc38v74nqcsh9n3f343bpczqq8b1rz6vfrh";
+  };
+  queue_h = fetchurl {
+    url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-queue.h";
+    sha256 = "12qm82id7zys92a1qh2l1qf2wqgq6jr4qlbjmqyfffz3s3nhfd61";
+  };
+  tree_h = fetchurl {
+    url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-tree.h";
+    sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71";
+  };
 
+in
 stdenv.mkDerivation rec {
   name    = "musl-${version}";
-  version = "1.1.18";
+  version = "1.1.19";
 
   src = fetchurl {
-    url    = "http://www.musl-libc.org/releases/${name}.tar.gz";
-    sha256 = "0651lnj5spckqjf83nz116s8qhhydgqdy3rkl4icbh5f05fyw5yh";
+    url    = "http://www.musl-libc.org/releases/musl-${version}.tar.gz";
+    sha256 = "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv";
   };
 
   enableParallelBuilding = true;
@@ -15,6 +33,14 @@ stdenv.mkDerivation rec {
   # so musl can selectively disable as needed
   hardeningDisable = [ "stackprotector" ];
 
+  # Leave these, be friendlier to debuggers/perf tools
+  # Don't force them on, but don't force off either
+  postPatch = ''
+    substituteInPlace configure \
+      --replace -fno-unwind-tables "" \
+      --replace -fno-asynchronous-unwind-tables ""
+  '';
+
   preConfigure = ''
     configureFlagsArray+=("--syslibdir=$out/lib")
   '';
@@ -22,16 +48,48 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-shared"
     "--enable-static"
+    "--enable-debug"
     "CFLAGS=-fstack-protector-strong"
+    "--enable-wrapper=all"
   ];
 
+  outputs = [ "out" "dev" ];
+
   dontDisableStatic = true;
+  separateDebugInfo = true;
+
+  postInstall = ''
+    # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do.
+    # Apparently glibc provides scsi itself?
+    (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .)
+
+    # Strip debug out of the static library
+    $STRIP -S $out/lib/libc.a
+    mkdir -p $out/bin
+
+    # Create 'ldd' symlink, builtin
+    ln -s $out/lib/libc.so $out/bin/ldd
+
+    # (impure) cc wrapper around musl for interactive usuage
+    for i in musl-gcc musl-clang ld.musl-clang; do
+      moveToOutput bin/$i $dev
+    done
+    moveToOutput lib/musl-gcc.specs $dev
+    substituteInPlace $dev/bin/musl-gcc \
+      --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs
+  '' + lib.optionalString useBSDCompatHeaders ''
+    install -D ${queue_h} $dev/include/sys/queue.h
+    install -D ${cdefs_h} $dev/include/sys/cdefs.h
+    install -D ${tree_h} $dev/include/sys/tree.h
+  '';
+
+  passthru.linuxHeaders = linuxHeaders;
 
   meta = {
     description = "An efficient, small, quality libc implementation";
     homepage    = "http://www.musl-libc.org";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/os-specific/linux/musl/fts-setup-hook.sh b/pkgs/os-specific/linux/musl/fts-setup-hook.sh
new file mode 100644
index 0000000000000000000000000000000000000000..3962dcb19a20c83300fe706e4068d434701b2caa
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/fts-setup-hook.sh
@@ -0,0 +1,17 @@
+ftsLdflags() {
+    # The `depHostOffset` describes how the host platform of the dependencies
+    # are slid relative to the depending package. It is brought into scope of
+    # the environment hook defined as the role of the dependency being applied.
+    case $depHostOffset in
+        -1) local role='BUILD_' ;;
+        0)  local role='' ;;
+        1)  local role='TARGET_' ;;
+        *)  echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
+            return 1 ;;
+    esac
+
+    export NIX_${role}LDFLAGS+=" -lfts"
+}
+
+addEnvHooks "$hostOffset" ftsLdflags
+
diff --git a/pkgs/os-specific/linux/musl/fts.nix b/pkgs/os-specific/linux/musl/fts.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0f16e8cc79bf8ec9018d7529d4549737ac804455
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/fts.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "musl-fts-${version}";
+  version = "2017-01-13";
+  src = fetchFromGitHub {
+    owner = "pullmoll";
+    repo = "musl-fts";
+    rev = "0bde52df588e8969879a2cae51c3a4774ec62472";
+    sha256 = "1q8cpzisziysrs08b89wj0rm4p6dsyl177cclpfa0f7spjm3jg03";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  setupHook = ./fts-setup-hook.sh;
+}
diff --git a/pkgs/os-specific/linux/musl/getconf.nix b/pkgs/os-specific/linux/musl/getconf.nix
new file mode 100644
index 0000000000000000000000000000000000000000..dbfaca296bf9f7c3095cee3b69b9347d8054dbac
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/getconf.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "musl-getconf";
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/alpinelinux/aports/48b16204aeeda5bc1f87e49c6b8e23d9abb07c73/main/musl/getconf.c";
+    sha256 = "0z14ml5343p5gapxw9fnbn2r72r7v2gk8662iifjrblh6sxhqzfq";
+  };
+
+  unpackPhase = ":";
+
+  buildPhase = ''$CC $src -o getconf'';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp getconf $out/bin/
+  '';
+}
+
+
diff --git a/pkgs/os-specific/linux/musl/getent.nix b/pkgs/os-specific/linux/musl/getent.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6eed17a76b02e7e00c393b70f68058024552a74d
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/getent.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "musl-getent";
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/alpinelinux/aports/89a718d88ec7466e721f3bbe9ede5ffe58061d78/main/musl/getent.c";
+    sha256 = "0b4jqnsmv1hjgcz7db3vd61k682aphl59c3yhwya2q7mkc6g48xk";
+  };
+
+  unpackPhase = ":";
+
+  buildPhase = ''$CC $src -o getent'';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp getent $out/bin/
+  '';
+}
+
diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix
index f61611fbf017d60b882a16d85f1ce1694cb7d1f1..e2abbd7335ee9b87d703b8b8333e2de8441d9c9b 100644
--- a/pkgs/os-specific/linux/mwprocapture/default.nix
+++ b/pkgs/os-specific/linux/mwprocapture/default.nix
@@ -18,15 +18,16 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mwprocapture-1.2.${version}-${kernel.version}";
-  version = "3589";
+  version = "3773";
 
   src = fetchurl {
-    url = "http://www.magewell.com/files/ProCaptureForLinux_${version}.tar.gz";
-    sha256 = "1arwnwrq52rs8g9zfxw8saip40vc3201sf7qnbqd2p23h8vzwb8i";
+    url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz";
+    sha256 = "1ri7c4l4xgkhpz0f15jra1p7mpzi8ir6lpwjm7q7hc9m4cvxcs1g";
   };
 
-  patches = [] ++ optional (versionAtLeast kernel.version "4.13") ./linux_4_13_fix.patch
-               ++ optional (versionAtLeast kernel.version "4.14") ./linux_4_14_fix.patch;
+  nativeBuildInputs = [ kernel.moduleBuildDependencies ];
+
+  patches = [ ./linux_4_14_fix.patch ];
 
   preConfigure =
   ''
diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch
deleted file mode 100644
index 925af61b49a0bd318b6f928a62a351aa2a4d353c..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur ProCaptureForLinux_3589/src/sources/ospi/ospi-linux.h ProCaptureForLinux_3589_new/src/sources/ospi/ospi-linux.h
---- ProCaptureForLinux_3589/src/sources/ospi/ospi-linux.h	2017-08-17 02:46:07.000000000 -0700
-+++ ProCaptureForLinux_3589_new/src/sources/ospi/ospi-linux.h	2017-09-03 18:13:31.843510536 -0700
-@@ -172,7 +172,7 @@
- #else
-     struct completion       done;
- #endif
--    wait_queue_t            waitq; // for multi wait
-+    wait_queue_entry_t      waitq; // for multi wait
- };
- typedef struct _os_event_t *os_event_t;
- 
diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
index 9f92a38bcc45942f54482c34a0448ed1ad84a068..94da5a00a2e259ee71b50af014ecb15c1e3a17e8 100644
--- a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
+++ b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
@@ -1,57 +1,68 @@
-diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.c ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c
---- ProCaptureForLinux_3589/src/sources/ospi/linux-file.c	2017-08-17 02:46:07.000000000 -0700
-+++ ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c	2017-11-13 20:18:50.842947380 -0800
-@@ -7,8 +7,8 @@
+diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c
+--- ProCaptureForLinux_3773/src/sources/ospi/linux-file.c	2017-12-15 01:59:57.000000000 -0800
++++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c	2017-12-23 22:47:33.666823299 -0800
+@@ -7,8 +7,9 @@
  
  #include "linux-file.h"
  
 -#include 
  #include 
 +#include 
++#include 
  
  struct file *linux_file_open(const char *path, int flags, int mode)
  {
-@@ -28,27 +28,27 @@
+@@ -28,29 +29,36 @@
      filp_close(file, NULL);
  }
  
 -ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size)
-+ssize_t linux_file_read(struct file *file, loff_t offset, const void *data, size_t size)
++ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size)
  {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)
++    return(kernel_read(file, data, size, &offset));
++#else
      mm_segment_t oldfs;
      ssize_t ret;
  
      oldfs = get_fs();
      set_fs(get_ds());
 -    ret = vfs_read(file, data, size, &offset);
-+    ret = kernel_read(file, data, size, &offset);
++    ret = vfs_read(file, (unsigned char *)data, size, &offset);
      set_fs(oldfs);
  
      return ret;
++#endif
  }
  
 -ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size)
 +ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size)
  {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)
++    return(kernel_write(file, data, size, &offset));
++#else
      mm_segment_t oldfs;
      ssize_t ret;
  
      oldfs = get_fs();
      set_fs(get_ds());
 -    ret = vfs_write(file, data, size, &offset);
-+    ret = kernel_write(file, data, size, &offset);
++    ret = vfs_write(file, (const unsigned char *)data, size, &offset);
      set_fs(oldfs);
  
      return ret;
-diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.h ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.h
---- ProCaptureForLinux_3589/src/sources/ospi/linux-file.h	2017-08-17 02:46:07.000000000 -0700
-+++ ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.h	2017-11-13 20:24:20.979690346 -0800
++#endif
+ }
+-
+diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.h ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h
+--- ProCaptureForLinux_3773/src/sources/ospi/linux-file.h	2017-12-15 01:59:57.000000000 -0800
++++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h	2017-12-23 22:46:22.028545189 -0800
 @@ -13,9 +13,9 @@
  
  void linux_file_close(struct file *file);
  
 -ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size);
-+ssize_t linux_file_read(struct file *file, loff_t offset, const void *data, size_t size);
++ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size);
  
 -ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size);
 +ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size);
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index 9fbf3055715401783bc942bd8915de5df13fafc0..ce287dc184156950d02cc93f9f82c91cc5d4bb11 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "net-tools-1.60_p20161110235919";
+  name = "net-tools-${version}";
+  version = "1.60_p20170221182432";
 
   src = fetchurl {
     url = "mirror://gentoo/distfiles/${name}.tar.xz";
-    sha256 = "1kbgwkys45kb5wqhchi1kf0sfw93c1cl0hgyw7yhacxzdfxjmdfr";
+    sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a";
   };
 
   preBuild =
diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix
index 0498f5cf37e2125f62cf39e783c8f7fd9cc6e9bc..8dbacc46154f6e765edc3ef82b0231578ef3d6aa 100644
--- a/pkgs/os-specific/linux/netatop/default.nix
+++ b/pkgs/os-specific/linux/netatop/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Network monitoring module for atop";
-    homepage = http://www.atoptool.nl/downloadnetatop.php;
+    homepage = https://www.atoptool.nl/downloadnetatop.php;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index e52174c09013bb836d325b4919cd0f34f6857e32..904dae55c9cbddb8c747a61d70a91c70ccdf0a22 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,10 +1,17 @@
 { stdenv, fetchurl, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap
 , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
+, buildEnv
 }:
 
 let
   statdPath = lib.makeBinPath [ systemd utillinux coreutils ];
 
+  # Not nice; feel free to find a nicer solution.
+  kerberosEnv = buildEnv {
+    name = "kerberos-env-${kerberos.version}";
+    paths = with lib; [ (getDev kerberos) (getLib kerberos) ];
+  };
+
 in stdenv.mkDerivation rec {
   name = "nfs-utils-${version}";
   version = "2.1.1";
@@ -26,7 +33,7 @@ in stdenv.mkDerivation rec {
   configureFlags =
     [ "--enable-gss"
       "--with-statedir=/var/lib/nfs"
-      "--with-krb5=${kerberos}"
+      "--with-krb5=${kerberosEnv}"
       "--with-systemd=$(out)/etc/systemd/system"
       "--enable-libmount-mount"
     ]
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index c06de7ea6f2c68e5f58beec7b6f3db466e650f4d..be52cbc2029d695049335043ebfd668ebcd4d8f7 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -2,11 +2,12 @@
 , flex, bison, libmnl, libnftnl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  name = "nftables-0.7";
+  version = "0.8.3";
+  name = "nftables-${version}";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2";
-    sha256 = "0hzdqigdx4i6jbpxbdyq4zy4p4waqn8l6vvz7685ikh1v0wr4qzy";
+    sha256 = "0f2yv7as1ybkfvn75f72x0z9y1ydibw4s3hbzhlmvsc8vgsy2syi";
   };
 
   configureFlags = [
diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ae6abeb1f56fde71c165b0de32244e1dec048b78
--- /dev/null
+++ b/pkgs/os-specific/linux/nmon/default.nix
@@ -0,0 +1,27 @@
+{ fetchurl, stdenv, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "nmon-${version}";
+  version = "16g";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/nmon/lmon${version}.c";
+    sha256 = "127n8xvmg7byp42sm924mdr7hd3bsfsxpryzahl0cfsh7dlxv0ns";
+  };
+
+  buildInputs = [ ncurses ];
+  unpackPhase = ":";
+  buildPhase = "cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D X86";
+  installPhase = ''
+    mkdir -p $out/bin
+    cp nmon $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "AIX & Linux Performance Monitoring tool";
+    homepage = "http://nmon.sourceforge.net";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ sveitser ];
+  };
+}
diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix
index 389e9514d703180932f9ebd2d37c3821e4fb86d5..9928897ae4d494451008534490a15d4f9d300e11 100644
--- a/pkgs/os-specific/linux/numactl/default.nix
+++ b/pkgs/os-specific/linux/numactl/default.nix
@@ -1,20 +1,33 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "numactl-2.0.10";
+  name = "numactl-${version}";
+  version = "2.0.11";
 
-  src = fetchurl {
-    url = "ftp://oss.sgi.com/www/projects/libnuma/download/${name}.tar.gz";
-    sha256 = "0qfv2ks6d3gm0mw5sj4cbhsd7cbsb7qm58xvchl2wfzifkzcinnv";
+  src = fetchFromGitHub {
+    owner = "numactl";
+    repo = "numactl";
+    rev = "v${version}";
+    sha256 = "0bcffqawwbyrnza8np0whii25mfd0dria35zal9v3l55xcrya3j9";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  patches = [
+    (fetchpatch {
+      url = https://raw.githubusercontent.com/gentoo/gentoo/b64d15e731e3d6a7671f0ec6c34a20203cf2609d/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch;
+      sha256 = "05277kv3x12n2xlh3fgnmxclxfc384mkwb0v9pd91046khj6h843";
+    })
+  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+      url = https://git.alpinelinux.org/cgit/aports/plain/testing/numactl/musl.patch?id=0592b128c71c3e70d493bc7a13caed0d7fae91dd;
+      sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v";
+    });
+
   meta = with stdenv.lib; {
     description = "Library and tools for non-uniform memory access (NUMA) machines";
     homepage = http://oss.sgi.com/projects/libnuma/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
     maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh
deleted file mode 100755
index 5d47df9a87a7b62fa2b09be5683c7be4a36cb61b..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-source $stdenv/setup
-
-dontPatchELF=1 # must keep libXv, $out in RPATH
-
-
-unpackFile() {
-    sh $src -x
-}
-
-
-buildPhase() {
-    if test -z "$libsOnly"; then
-        echo "Building linux driver against kernel: " $kernel;
-
-        cd usr/src/nv/
-
-        shopt -s nullglob
-
-        for a in $kpatches; do
-          patch -p1 < $a
-        done
-
-        # Workaround: get it to build on kernels that have CONFIG_XEN
-        # set.  Disable the test, apply a patch to disable the Xen
-        # functionality.
-        
-        #substituteInPlace Makefile.kbuild --replace xen_sanity_check fnord
-        #patch -p1 < $xenPatch
-
-        # Create the module.
-        kernelVersion=$(cd $kernel/lib/modules && ls)
-        sysSource=$(echo $kernel/lib/modules/$kernelVersion/source)
-        sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
-        unset src # used by the nv makefile
-        make SYSSRC=$sysSource SYSOUT=$sysOut module
-        cd ../../..
-    fi
-}
-
-
-installPhase() {
-
-    # Install libGL and friends.
-    mkdir -p $out/lib
-    cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/
-
-    ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so
-    ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so.1
-    ln -snf libGL.so.$versionNumber $out/lib/libGL.so
-    ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1
-    ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1
-    ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1
-    ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1
-    ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1
-    ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1
-
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.*
-    set +e
-    # Legacy nvidia doesn't have cuda
-    patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-    set -e
-    
-    if test -z "$libsOnly"; then
-        
-        # Install the kernel module.
-        mkdir -p $out/lib/modules/$kernelVersion/misc
-        cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc
-
-        # Install the X driver.
-        mkdir -p $out/lib/xorg/modules
-        cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/
-
-        ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1
-        ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so
-
-        patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
-
-        # Install the programs.
-        mkdir -p $out/bin
-
-        for i in nvidia-settings nvidia-xconfig; do
-	    cp usr/bin/$i $out/bin/$i
-	    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
-        done
-    
-        # Header files etc.
-        cp -prd usr/include usr/share $out
-
-        # Patch the `nvidia-settings.desktop' file.
-        substituteInPlace $out/share/applications/nvidia-settings.desktop \
-            --replace '__UTILS_PATH__' $out/bin \
-            --replace '__PIXMAP_PATH__' $out/share/pixmaps
-    fi
-}
-
-
-genericBuild
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index ba9b332e6d710b4c8da0cd0d6aafac67b5949de9..11a97d420a83a7b5b9f2d65296d1880e63673fe7 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -2,59 +2,59 @@
 
 let
   generic = args: callPackage (import ./generic.nix args) { };
+  kernel = callPackage # a hacky way of extracting parameters from callPackage
+    ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };
+
+  maybePatch_drm_legacy =
+    lib.optional (lib.versionOlder "4.14" (kernel.version or "0"))
+      (fetchurl {
+        url = "https://raw.githubusercontent.com/MilhouseVH/LibreELEC.tv/b5d2d6a1"
+            + "/packages/x11/driver/xf86-video-nvidia-legacy/patches/"
+            + "xf86-video-nvidia-legacy-0010-kernel-4.14.patch";
+        sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5";
+      });
 in
-{
+rec {
   # Policy: use the highest stable version as the default (on our master).
   stable = generic {
-    version = "384.90";
-    sha256_32bit = "0mq0h7g56m9zvr42ipy2664ph922754l0pdp8wpsmzfpkzg6g9lp";
-    sha256_64bit = "1ggylpzw1j217w64rspw4fhvq25wz0la0hhy0b1kxjpwy8h6ipqd";
-    settingsSha256 = "023jfbsxsbkjk78i9i6wd0sybv5hib2d7mfvy635w3anjcrsk5il";
-    persistencedSha256 = "166ya8pnv4frvrsp0x5zkg8li85vipags03wy6dlf8s940al92z2";
-  };
+    version = "390.48";
+    sha256_32bit = "1y6n2hfz9vd0h7gd31fgxcl76s5pjf8afwqyq5slqpcxpd78j5ai";
+    sha256_64bit = "16a3blvizcksmaxr644s857yanw3i3vcvqvn7qnwbsbqpmxga09c";
+    settingsSha256 = "058xaiw5g0kxrvc3lvy4424fqbjkvmsznj2v73cgbm25i1m83krl";
+    persistencedSha256 = "0y86bhzl42lqyrbibqzf8a8yd49zbq3ryb78vgsl13i44f9sl79k";
 
-  beta = generic {
-    version = "381.22";
-    sha256_32bit = "024x3c6hrivg2bkbzv1xd0585hvpa2kbn1y2gwvca7c73kpdczbv";
-    sha256_64bit = "13fj9ndy5rmh410d0vi2b0crfl7rbsm6rn7cwms0frdzkyhshghs";
-    settingsSha256 = "1gls187zfd201b29qfvwvqvl5gvp5wl9lq966vd28crwqh174jrh";
-    persistencedSha256 = "08315rb9l932fgvy758an5vh3jgks0qc4g36xip4l32pkxd9k963";
+    patches = [ ./fix_missing_symbol.patch ];
   };
 
+  beta = stable; # not enough interest to maintain beta ATM
+
+
   legacy_340 = generic {
-    version = "340.102";
-    sha256_32bit = "0a484i37j00d0rc60q0bp6fd2wfrx2c4r32di9w5svqgmrfkvcb1";
-    sha256_64bit = "0nnz51d48a5fpnnmlz1znjp937k3nshdq46fw1qm8h00dkrd55ib";
-    settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598";
-    persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i";
+    version = "340.104";
+    sha256_32bit = "1l8w95qpxmkw33c4lsf5ar9w2fkhky4x23rlpqvp1j66wbw1b473";
+    sha256_64bit = "18k65gx6jg956zxyfz31xdp914sq3msn665a759bdbryksbk3wds";
+    settingsSha256 = "1vvpqimvld2iyfjgb9wvs7ca0b0f68jzfdpr0icbyxk4vhsq7sxk";
+    persistencedSha256 = "0zqws2vsrxbxhv6z0nn2galnghcsilcn3s0f70bpm6jqj9wzy7x8";
     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
-    ];
+    patches = maybePatch_drm_legacy ++ [ ./vm_operations_struct-fault.patch ];
   };
 
   legacy_304 = generic {
-    version = "304.135";
-    sha256_32bit = "14qdl39wird04sqba94dcb77i63igmxxav62ndr4qyyavn8s3c2w";
-    sha256_64bit = "125mianhvq591np7y5jjrv9vmpbvixnkicr49ni48mcr0yjnjqkh";
-    settingsSha256 = "1y7swikdngq4nlwzkrq20yfah9zr31n1a5i6nw37awnp8xjilhzm";
+    version = "304.137";
+    sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a";
+    sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb";
+    settingsSha256 = "0i5znfq6jkabgi8xpcy12pdpww6a67i8mq60z1kjq36mmnb25pmi";
     persistencedSha256 = null;
     useGLVND = false;
     useProfiles = false;
+    settings32Bit = true;
 
     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";
+            + "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz";
+        sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l";
       };
       prefix = "debian/module/debian/patches";
       applyPatches = pnames: if pnames == [] then null else
@@ -63,8 +63,7 @@ in
           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" ];
+    in applyPatches [ "fix-typos" ];
+    patches = maybePatch_drm_legacy;
   };
-
-  legacy_173 = callPackage ./legacy173.nix { };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ea783b4f011e716de72eaa47f70bd644aec52af6
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch
@@ -0,0 +1,19 @@
+https://devtalk.nvidia.com/default/topic/1030082/linux/kernel-4-16-rc1-breaks-latest-drivers-unknown-symbol-swiotlb_map_sg_attrs-/
+--- a/kernel/common/inc/nv-linux.h~     2018-01-25 06:09:41.000000000 +0100
++++ b/kernel/common/inc/nv-linux.h      2018-03-05 13:58:17.746725638 +0100
+@@ -1209,6 +1209,7 @@ static inline NvU32 nv_alloc_init_flags(
+ static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
+ {
+     NvBool swiotlb_in_use = NV_FALSE;
++#if 0
+ #if defined(CONFIG_SWIOTLB)
+   #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
+     /*
+@@ -1251,7 +1252,7 @@ static inline NvBool nv_dma_maps_swiotlb
+     swiotlb_in_use = (swiotlb == 1);
+   #endif
+ #endif
+-
++#endif
+     return swiotlb_in_use;
+ }
diff --git a/pkgs/os-specific/linux/nvidia-x11/fs52243.patch b/pkgs/os-specific/linux/nvidia-x11/fs52243.patch
deleted file mode 100644
index 212df64fa6159da371a18e469d6bfbf3e243a790..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/fs52243.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 0d19079fe6622199cfabbd3ab9ca54359f844ce0..13e5d1b76ea650144ec9b17b6dfaa86f86d2c48e 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -6,6 +6,7 @@
 , useGLVND ? true
 , useProfiles ? true
 , preferGtk2 ? false
+, settings32Bit ? false
 
 , prePatch ? ""
 , patches ? []
@@ -62,12 +63,13 @@ let
 
     libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ];
 
-    nativeBuildInputs = [ perl nukeReferences ];
+    nativeBuildInputs = [ perl nukeReferences ]
+      ++ optionals (!libsOnly) kernel.moduleBuildDependencies;
 
     disallowedReferences = optional (!libsOnly) [ kernel.dev ];
 
     passthru = {
-      settings = callPackage (import ./settings.nix self settingsSha256) {
+      settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) {
         withGtk2 = preferGtk2;
         withGtk3 = !preferGtk2;
       };
@@ -78,7 +80,7 @@ let
       homepage = http://www.nvidia.com/object/unix.html;
       description = "X.org driver and kernel module for NVIDIA graphics cards";
       license = licenses.unfreeRedistributable;
-      platforms = platforms.linux;
+      platforms = [ "i686-linux" "x86_64-linux" ];
       maintainers = [ maintainers.vcunat ];
       priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
     };
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
deleted file mode 100644
index 51a230974c86b75c35d5d2df6f49e6686ed80793..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{stdenv, fetchurl, kernel, xorg, zlib, gtk2, atk, pango, glib, gdk_pixbuf}:
-
-let
-
-  versionNumber = "173.14.39";
-
-in
-
-stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}-${kernel.version}";
-
-  builder = ./builder-legacy173.sh;
-
-  src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        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 = "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}";
-
-  kernel = kernel.dev;
-
-  hardeningDisable = [ "pic" "format" ];
-
-  inherit versionNumber;
-
-  dontStrip = true;
-
-  glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
-
-  cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc];
-
-  programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ];
-
-  passthru = {
-    settings = null;
-    persistenced = null;
-    useGLVND = false;
-    useProfiles = false;
-  };
-
-  meta = {
-    homepage = http://www.nvidia.com/object/unix.html;
-    description = "X.org driver and kernel module for Legacy NVIDIA graphics cards";
-    license = stdenv.lib.licenses.unfree;
-  };
-}
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 22fd12427005bffbea94491b49e9f9e3df9f7249..21e6cb5d500b45018cdc607384319631eade4b87 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    platforms = nvidia_x11.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index e272ac14de0f317e04525e0dd1eb916496e8875d..e2ef51da38031c378bf763cd88a76e202138930b 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -1,6 +1,6 @@
 nvidia_x11: sha256:
 
-{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libvdpau, libXext
+{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau
 , librsvg, wrapGAppsHook
 , withGtk2 ? false, withGtk3 ? true
 }:
@@ -41,11 +41,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig m4 ];
 
-  buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus ]
+  buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]
              ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
 
-  NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ];
-
   makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ];
   installFlags = [ "PREFIX=$(out)" ];
 
@@ -73,7 +71,7 @@ stdenv.mkDerivation rec {
   binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings";
 
   postFixup = ''
-    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib" \
+    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \
       $out/bin/$binaryName
   '';
 
@@ -85,7 +83,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    platforms = nvidia_x11.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch b/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6ce5c1205e2d5384b1c8612cfe9776a98b99b66c
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch
@@ -0,0 +1,31 @@
+https://devtalk.nvidia.com/default/topic/1025051/fully-working-patches-2-of-them-for-nvidia-driver-340-104-compiler-installer-file-and-linux-kernels-4-13-amp-4-14/?offset=5
+--- a/kernel/uvm/nvidia_uvm_lite.c
++++ b/kernel/uvm/nvidia_uvm_lite.c
+@@ -818,8 +818,15 @@ done:
+ }
+
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _fault(struct vm_fault *vmf)
++#endif
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++    struct vm_area_struct *vma = vmf->vma;
++#endif
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+     unsigned long vaddr = vmf->address;
+ #else
+@@ -866,7 +873,11 @@ static struct vm_operations_struct uvmlite_vma_ops =
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+     vmf->page = NULL;
+     return VM_FAULT_SIGBUS;
diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix
index 6f9af040b8a3bcc9d7287d7e065e28aa46f927c4..02161f7133ce64ac9cec10d1202eaa13ee780939 100644
--- a/pkgs/os-specific/linux/nvidiabl/default.nix
+++ b/pkgs/os-specific/linux/nvidiabl/default.nix
@@ -2,18 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "nvidiabl-${version}-${kernel.version}";
-  version = "0.87";
+  version = "2017-09-26";
 
+  # We use a fork which adds support for newer kernels -- upstream has been abandoned.
   src = fetchFromGitHub {
-    owner = "guillaumezin";
+    owner = "yorickvP";
     repo = "nvidiabl";
-    rev = "v${version}";
-    sha256 = "1hs61dxn84vsyvrd2s899dhgg342mhfkbdn1nkhcvly45hdp2nca";
+    rev = "2d909f4dfceb24ce98479fd571411c6ec3b71bea";
+    sha256 = "0dsar8fsaxwywjh6rbrxkhdp142vqjnsyxfz6bgpbqml6slpiqs1";
   };
 
   hardeningDisable = [ "pic" ];
 
-  patches = [ ./linux4compat.patch ];
+  nativeBuildInputs = kernel.moduleBuildDependencies;
 
   preConfigure = ''
     sed -i 's|/sbin/depmod|#/sbin/depmod|' Makefile
@@ -25,11 +26,11 @@ stdenv.mkDerivation rec {
     "KVER=${kernel.modDirVersion}"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU";
     homepage = https://github.com/guillaumezin/nvidiabl;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    broken = !stdenv.lib.versionOlder kernel.version "4.9";
+    license = licenses.gpl2;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = with maintainers; [ yorickvp ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidiabl/linux4compat.patch b/pkgs/os-specific/linux/nvidiabl/linux4compat.patch
deleted file mode 100644
index ad8236a2b6306b5ef285bb069a874ac07f1a13e8..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/nvidiabl/linux4compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2bf6f08b2492cc04a2c39fdcb22a2d0c18963d1c Mon Sep 17 00:00:00 2001
-From: sonic414 
-Date: Tue, 28 Apr 2015 19:30:15 +0530
-Subject: [PATCH] strnicmp to strncasecmp in Linux 4.0.0
-
----
- nvidiabl-module.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nvidiabl-module.c b/nvidiabl-module.c
-index b789ea4..b306579 100644
---- a/nvidiabl-module.c
-+++ b/nvidiabl-module.c
-@@ -214,7 +214,7 @@ static int __init nvidiabl_init(void)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
- 	
- 	for (iii = 0 ; iii < sizeof(backlight_type_ids) ; iii++) {
--		if (strnicmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
-+		if (strncasecmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
- 			props.type = backlight_type_ids[iii].type;
- 			printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id);
- 		}
diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix
index 7912c67aa0b69cd19c339796a90192d65b0a2690..044479c5629597003de8a561c965c979d053149f 100644
--- a/pkgs/os-specific/linux/nvme-cli/default.nix
+++ b/pkgs/os-specific/linux/nvme-cli/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "nvme-cli-${version}";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "linux-nvme";
     repo = "nvme-cli";
     rev = "v${version}";
-    sha256 = "00jrr1mya9wkapiapph3nch3kpqas6vlc8kl8dbrjjfb5hg35gqf";
+    sha256 = "1nl5hl5am8djwmrw1xxnd9ahp7kyzyj0yh1nxgmx43pn3d61n0vz";
   };
 
   makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
index 36cbd1581a6b4b4f526a4eed93708d8b17e40b46..c8b404c6be7f3a1987f49743919ebce931e15926 100644
--- a/pkgs/os-specific/linux/open-isns/default.nix
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "open-isns-${version}";
-  version = "0.97";
+  version = "0.98";
 
   src = fetchFromGitHub {
     owner = "gonzoleeman";
     repo = "open-isns";
     rev = "v${version}";
-    sha256 = "17aichjgkwjfp9dx1piw7dw8ddz1bgm5mk3laid2zvjks1h739k3";
+    sha256 = "055gjwz5hxaj5jk23bf7dy9wbxk9m8cfgl1msbzjc60gr2mmcbdg";
   };
 
   propagatedBuildInputs = [ openssl ];
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index 4b5e7bbf3e3da3365c53963e231b468ee4800d54..ac8a1c7de4a818303ce109cf8c624dcded3a6ee6 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.2";
+  version = "2.5.4";
   name = "openvswitch-${version}";
 
   src = fetchurl {
     url = "http://openvswitch.org/releases/${name}.tar.gz";
-    sha256 = "0ifx758zl97dpad9vpd5i5dqj6i03k632mvgxs82hqkcsb3r6y7q";
+    sha256 = "1lji87wg953lqcdf02f1zv2m54vhd2x9jd03bb91lnlb4qlhifiv";
   };
 
   kernel = optional (_kernel != null) _kernel.dev;
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index 414338702cc846fd3ff2f42938d2d40674afa9d8..99caa813b2ea5094e22a3a7b75b4b15bd785757e 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "pagemon-${version}";
-  version = "0.01.10";
+  version = "0.01.12";
 
   src = fetchFromGitHub {
-    sha256 = "04dbcr7bzgp4kvhw1rsn084cz4qbfhf7ifyh3ikgdka9w98057h1";
+    sha256 = "0bddn22daf33dbghwfjxxgsn4gmr5knr6h9sbqhs7g7p85dla6wa";
     rev = "V${version}";
     repo = "pagemon";
     owner = "ColinIanKing";
@@ -33,6 +33,5 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 5189b84ff7e26610b7760952e747251e24955bba..5f92dfcc839035883e066b4a570d407e6638fe4b 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,16 +1,32 @@
-{ stdenv, fetchurl, flex, cracklib }:
+{ stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib }:
 
 stdenv.mkDerivation rec {
   name = "linux-pam-${version}";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "http://www.linux-pam.org/library/Linux-PAM-${version}.tar.bz2";
-    sha256 = "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl";
+    sha256 = "1fyi04d5nsh8ivd0rn2y0z83ylgc0licz7kifbb6xxi2ylgfs6i4";
   };
 
+  patches = stdenv.lib.optionals (hostPlatform.libc == "musl") [
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";
+      sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf";
+    })
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";
+      sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81";
+    })
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/musl-fix-pam_exec.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";
+      sha256 = "04dx6s9d8cxl40r7m7dc4si47ds4niaqm7902y1d6wcjvs11vrf0";
+    })
+  ];
+
   outputs = [ "out" "doc" "man" /* "modules" */ ];
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ flex ];
 
   buildInputs = [ cracklib ];
@@ -20,7 +36,7 @@ stdenv.mkDerivation rec {
   crossAttrs = {
     propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ];
     preConfigure = preConfigure + ''
-      ar x ${flex.crossDrv}/lib/libfl.a
+      $crossConfig-ar x ${flex.crossDrv}/lib/libfl.a
       mv libyywrap.o libyywrap-target.o
       ar x ${flex}/lib/libfl.a
       mv libyywrap.o libyywrap-host.o
@@ -46,6 +62,12 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     configureFlags="$configureFlags --includedir=$out/include/security"
+  '' + stdenv.lib.optionalString (hostPlatform.libc == "musl") ''
+      # export ac_cv_search_crypt=no
+      # (taken from Alpine linux, apparently insecure but also doesn't build O:))
+      # disable insecure modules
+      # sed -e 's/pam_rhosts//g' -i modules/Makefile.am
+      sed -e 's/pam_rhosts//g' -i modules/Makefile.in
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix
index 40e7e1216a64489ec89d78ef862a9e5cd4979151..76dbbf1e1be413b9ca19fc32b2b164ae6f116901 100644
--- a/pkgs/os-specific/linux/pam_krb5/default.nix
+++ b/pkgs/os-specific/linux/pam_krb5/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, pam, kerberos }:
 
 stdenv.mkDerivation rec {
-  name = "pam-krb5-4.7";
+  name = "pam-krb5-4.8";
 
   src = fetchurl {
     url = "http://archives.eyrie.org/software/kerberos/${name}.tar.gz";
-    sha256 = "04klg9a2rhdz0a2dw4f0ybcm28vcbab6lrynwq7rm4sn0hnzakwv";
+    sha256 = "0j96jfaxzkj1ifc3qxagjmaxvgda7ndqaaxx2ka018is9f5lbfrs";
   };
 
   buildInputs = [ pam kerberos ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.eyrie.org/~eagle/software/pam-krb5/;
+    homepage = https://www.eyrie.org/~eagle/software/pam-krb5/;
     description = "PAM module allowing PAM-aware applications to authenticate users by performing an AS exchange with a Kerberos KDC";
     longDescription = ''
       pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.linux;
     license = licenses.bsd3;
-    maintainers = with maintainers; [ wkennington mornfall ];
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix
index dfcd53ec77861f19a52cba722ad534ef8b441b74..c38990bdf8fd32ac55c238126b5ba18d2130f3fd 100644
--- a/pkgs/os-specific/linux/pam_mount/default.nix
+++ b/pkgs/os-specific/linux/pam_mount/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "pam_mount-2.15";
+  name = "pam_mount-2.16";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pam-mount/pam_mount/2.15/${name}.tar.xz";
-    sha256 = "091aq5zyc60wh21m1ryanjwknwxlaj9nvlswn5vjrmcdir5gnkm5";
+    url = "mirror://sourceforge/pam-mount/pam_mount/2.16/${name}.tar.xz";
+    sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index f58dadfd10ceaaf1a0b6bd7a89de650a029e966b..0f0b6ebb37a6d510e9194a236c3ae31cd4d9db61 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "pam_u2f-${version}";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src     = fetchurl {
     url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz";
-    sha256 = "189j0wgx6fs146vfp88djqpl1flpfb3962l1a2marlp6d12jwm3i";
+    sha256 = "0bbwy9k3002anhkv67zwck3dry7blqnnp291dc4qsjrca0blw217";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix
index 4611a3c09b7752355fb73041cc66a8edeed37a76..c1500e51ac377c7a10a72b8716adb3bc9d63916b 100644
--- a/pkgs/os-specific/linux/paxtest/default.nix
+++ b/pkgs/os-specific/linux/paxtest/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     description = "Test various memory protection measures";
     license     = licenses.gpl2;
     platforms   = platforms.linux;
-    maintainer  = with maintainers; [ copumpkin joachifm ];
+    maintainers = with maintainers; [ copumpkin joachifm ];
   };
 }
diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..43810210a88bde61d8984ec29a14367182de89d7
--- /dev/null
+++ b/pkgs/os-specific/linux/pcm/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "201710";
+  name = "pcm-${version}";
+
+  src = fetchFromGitHub {
+    owner = "opcm";
+    repo = "pcm";
+    rev = "${version}";
+    sha256 = "02rq8739zwwbfrhagvcgf6qpmnswxl9b0qsld26rg6zp91v2npbj";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pcm*.x $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Processor counter monitor";
+    homepage = https://www.intel.com/software/pcm;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ roosemberth ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix
index 8a5171824d0da8c68a53f040dcd751a35a294c6e..93e2c097ff74575bf8d54ec4b7238a65c739bb58 100644
--- a/pkgs/os-specific/linux/pcmciautils/default.nix
+++ b/pkgs/os-specific/linux/pcmciautils/default.nix
@@ -8,11 +8,11 @@
 
 # FIXME: should add an option to choose between hotplug and udev.
 stdenv.mkDerivation rec {
-  name = "pcmciautils-017";
+  name = "pcmciautils-018";
 
   src = fetchurl {
     url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/${name}.tar.gz";
-    sha256 = "5d8e2efad8a7f692129610603da232f2144851753d8d49a70eeb8eb1be6f6bc3";
+    sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk";
   };
 
   buildInputs = [udev yacc sysfsutils kmod flex];
diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix
index 873cb7b2b7daae4802074ef16dc50c4d9c1c29bd..31f86965ee8d5553e05e0b4e44a7e34b35758c0c 100644
--- a/pkgs/os-specific/linux/perf-tools/default.nix
+++ b/pkgs/os-specific/linux/perf-tools/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation {
-  name = "perf-tools-20160418";
+  name = "perf-tools-20171219";
 
   src = fetchFromGitHub {
     owner = "brendangregg";
     repo = "perf-tools";
-    rev = "5a511f5f775cfbc0569e6039435361cecd22dd86";
-    sha256 = "1ab735idi0h62yvhzd7822jj3555vygixv4xjrfrdvi8d2hhz6qn";
+    rev = "98d42a2a1493d2d1c651a5c396e015d4f082eb20";
+    sha256 = "09qnss9pd4kr6qadvp62m2g8sfrj86fksi1rr8m8w4314pzfb93c";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index 949350b8944e8484a017497fc1d729bc1903e5e3..cc6ac64d58ad0618112ef4a2fc1556afd67c14eb 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -6,18 +6,18 @@ assert stdenv.lib.versionAtLeast kernel.version "4.10";
 
 let
   release = "0.4.0";
-  revbump = "rev24"; # don't forget to change forum download id...
+  revbump = "rev25"; # don't forget to change forum download id...
 in stdenv.mkDerivation rec {
   name = "linux-phc-intel-${version}-${kernel.version}";
   version = "${release}-${revbump}";
 
   src = fetchurl {
-    sha256 = "02b4j8ap1fy09z36pmpplbw4vpwqdi16jyzw5kl0a60ydgxkmrpz";
-    url = "http://www.linux-phc.org/forum/download/file.php?id=178";
+    sha256 = "1w91hpphd8i0br7g5qra26jdydqar45zqwq6jq8yyz6l0vb10zlz";
+    url = "http://www.linux-phc.org/forum/download/file.php?id=194";
     name = "phc-intel-pack-${revbump}.tar.bz2";
   };
 
-  buildInputs = [ which ];
+  nativeBuildInputs = [ which ] ++ kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];
 
@@ -48,7 +48,6 @@ in stdenv.mkDerivation rec {
     homepage = http://www.linux-phc.org/;
     downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267";
     license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix
index 57ef22083fe474be7e4ae0049b20b059dcc5dbc6..523f7382a2cff00c8801ea813db41b94e32c226e 100644
--- a/pkgs/os-specific/linux/pipework/default.nix
+++ b/pkgs/os-specific/linux/pipework/default.nix
@@ -4,17 +4,16 @@
 
 stdenv.mkDerivation rec {
   name = "pipework-${version}";
-  version = "2015-07-30";
+  version = "2017-08-22";
   src = fetchFromGitHub {
     owner = "jpetazzo";
     repo = "pipework";
-    rev = "5a46ecb5f8f933fd268ef315f58a1eb1c46bd93d";
-    sha256 = "02znyg5ir37s8xqjcqqz6xnwyqxapn7c4scyqkcapxr932hf1frh";
+    rev = "ae42f1b5fef82b3bc23fe93c95c345e7af65fef3";
+    sha256 = "0c342m0bpq6ranr7dsxk9qi5mg3j5aw9wv85ql8gprdb2pz59qy8";
   };
   buildInputs = [ makeWrapper ];
   installPhase = ''
-    mkdir -p $out/bin
-    cp pipework $out/bin
+    install -D pipework $out/bin/pipework
     wrapProgram $out/bin/pipework --prefix PATH : \
       ${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]};
   '';
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index c1049d78f42ae7985a47890858c76b9383a2e908..63d159e1884298f181baf6197edf1f8a6b1682f1 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, intltool, ntfs3g, utillinux
+{ stdenv, fetchurl, cryptsetup, dbus, dbus-glib, intltool, ntfs3g, utillinux
 , mediaDir ? "/media/"
 , lockDir ? "/var/lock/pmount"
 , whiteList ? "/etc/pmount.allow"
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index 536c69ff557379f3ffd6683ecf428cdf7949e9f6..a7cac46ae6a049bcb9672430a57443224ba1b886 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -1,68 +1,36 @@
-{ stdenv, fetchurl, pythonPackages, gettext
-, setools, libsepol, libselinux, libcap_ng, libsemanage, sepolgen
-}:
+{ stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }:
 
 stdenv.mkDerivation rec {
   name = "policycoreutils-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz";
-    sha256 = "0y9l9k60iy21hj0lcvfdfxs1fxydg6d3pxp9rhy7hwr4y5vgh6dq";
+    sha256 = "1x742c7lkw30namhkw87yg7z384qzqjz0pvmqs0lk19v6958l6qa";
   };
 
-  patches = [ ./fix-printf-type.patch ];
-
   postPatch = ''
-    # Fix references to libsepol.a
-    find . -name Makefile -exec sed -i 's,[^ ]*/libsepol.a,${libsepol}/lib/libsepol.a,g' {} \;
-
     # Fix install references
-    substituteInPlace po/Makefile --replace /usr/bin/install install
-
-    # Fix references to /usr/share
-    grep -r '/usr/share' | awk -F: '{print $1}' | xargs sed -i "s,\(\$(DESTDIR)\)*/usr/share,$out/share,g"
-
-    # Fix sepolicy install
-    sed -i "s,\(setup.py install\).*,\1 --prefix=$out,g" sepolicy/Makefile
-
-    # Fix setuid install
-    sed -i 's|-m 4755|-m 755|' sandbox/Makefile
+    substituteInPlace po/Makefile \
+       --replace /usr/bin/install install --replace /usr/share /share
+    substituteInPlace newrole/Makefile --replace /usr/share /share
   '';
 
-  nativeBuildInputs = [ pythonPackages.python gettext ];
-  buildInputs = [ setools libsepol libselinux libcap_ng libsemanage ];
-  pythonPath = [ libselinux sepolgen ];
+  nativeBuildInputs = [ gettext ];
+  buildInputs = [ libsepol libselinux libsemanage ];
 
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
+    makeFlagsArray+=("LOCALEDIR=$out/share/locale")
+    makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
   '';
 
-  # Creation of the system-config-selinux directory is broken
-  preInstall = ''
-    mkdir -p $out/share/system-config-selinux
-  '';
-
-  # Fix the python scripts to include paths to libraries
-  # NOTE: We are not using wrapPythonPrograms or makeWrapper as these scripts
-  # purge the environment as a security measure
-  postInstall = ''
-    grep -r '#!.*python' $out/bin | awk -F: '{print $1}' | xargs sed -i "1a \
-    import sys; \
-    sys.path.append('$(toPythonPath "$out")'); \
-    ${stdenv.lib.flip stdenv.lib.concatMapStrings pythonPath (lib: ''
-      sys.path.append('$(toPythonPath "${lib}")'); \
-    '')}"
-  '';
-
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-
   meta = with stdenv.lib; {
     description = "SELinux policy core utilities";
     license = licenses.gpl2;
     inherit (libsepol.meta) homepage platforms maintainers;
   };
 }
-
diff --git a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch
deleted file mode 100644
index 6ab2d6dccc73404b623bc0ead40adacc29989adc..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru policycoreutils-2.4/setfiles/restore.c policycoreutils-2.4.new/setfiles/restore.c
---- policycoreutils-2.4/setfiles/restore.c	2015-02-02 09:38:10.000000000 -0500
-+++ policycoreutils-2.4.new/setfiles/restore.c	2015-08-29 20:44:13.693023222 -0400
-@@ -118,7 +118,7 @@
- 		r_opts->count++;
- 		if (r_opts->count % STAR_COUNT == 0) {
- 			if (r_opts->progress == 1) {
--				fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT );
-+				fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT );
- 			} else {
- 				if (r_opts->nfile > 0) {
- 					progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100;
diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix
index 1cdf9044b8fff6d14fee0d48425c8b083840a69a..3698b2b281f955d9288dd90b31ca233ebf22e7a8 100644
--- a/pkgs/os-specific/linux/pommed/default.nix
+++ b/pkgs/os-specific/linux/pommed/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , pciutils
 , confuse
-, dbus, dbus_glib
+, dbus, dbus-glib
 , alsaLib
 , audiofile
 , pkgconfig
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     dbus
     alsaLib
     audiofile
-    dbus_glib
+    dbus-glib
     pkgconfig
     gtk2
     gettext
diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix
index 8e52bdf936ef70481c0a1afcf56efc4e905e136f..88151fca2f5495ad8fe12ee285bb0a4a47598b4b 100644
--- a/pkgs/os-specific/linux/powerstat/default.nix
+++ b/pkgs/os-specific/linux/powerstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "powerstat-${version}";
-  version = "0.02.12";
+  version = "0.02.15";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz";
-    sha256 = "16ls3rs1wfckl0b2szqqgiv072afy4qjd3r4kz4vf2qj77kjm06w";
+    sha256 = "0m8662qv77nzbwkdpydiz87kd75cjjajgp30j6mc5padyw65bxxx";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index 5a10f455ea06a9be6a0a00f55a68a67ae4f57710..5ec708dd69fd6175743c2bb29219bd0ff61c5c12 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
+{ stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
   name = "powertop-${version}";
@@ -9,9 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "0l4jjlf05li2mc6g8nrss3h435wjhmnqd8m7v3kha3x0x7cbfzxa";
   };
 
+  outputs = [ "out" "man" ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ gettext libnl ncurses pciutils zlib ];
 
+  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (
+    fetchpatch {
+      name = "strerror_r.patch";
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e";
+      sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw";
+    }
+  );
+
   postPatch = ''
     substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
     substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset"
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 9ca48ccaf057f25fb6d1b250d0a81e9508c4d4fd..000d11af87d1c5beece28f8dda607c985a13aee0 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -1,66 +1,48 @@
 { stdenv, lib, requireFile, makeWrapper, substituteAll, p7zip
-, gawk, utillinux, xorg, glib, dbus_glib, zlib
+, gawk, utillinux, xorg, glib, dbus-glib, zlib
 , kernel ? null, libsOnly ? false
+, undmg, fetchurl
+, libelf
 }:
 
 assert (!libsOnly) -> kernel != null;
+# Disable for kernels 4.15 and above due to compatibility issues
+assert kernel != null -> stdenv.lib.versionOlder kernel.version "4.15";
 
 let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version;
     xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer));
     x64 = if stdenv.system == "x86_64-linux" then true
           else if stdenv.system == "i686-linux" then false
-          else abort "Parallels Tools for Linux only support {x86-64,i686}-linux targets";
-    # We autostart user services by ourselves, because prlcc uses hardcoded paths.
-    autostart = [ { exec = "prlcc";
-                    description = "Parallels Control Center";
-                  }
-                  { exec = "prldhd";
-                    description = "Parallels Control Center"; # not a mistake
-                  }
-                  { exec = "prl_wmouse_d";
-                    description = "Parallels Walking Mouse Daemon";
-                  }
-                  { exec = "prlcp";
-                    description = "Parallels CopyPaste Tool";
-                  }
-                  { exec = "prlsga";
-                    description = "Parallels Shared Guest Applications Tool";
-                  }
-                  { exec = "prlshprof";
-                    description = "Parallels Shared Profile Tool";
-                  }
-                ];
+          else throw "Parallels Tools for Linux only support {x86-64,i686}-linux targets";
 in
 stdenv.mkDerivation rec {
-  version = "10.0.2.27712";
+  version = "${prl_major}.2.1-41615";
+  prl_major = "12";
   name = "prl-tools-${version}";
 
-  src = requireFile rec {
-    name = "prl-tools-lin.iso";
-    sha256 = "07960jvyv7gihjlg922znjm6db6l6bd23x9mg6ympwibzf2mylmx";
-    message = ''
-      Please, place Parallels Tools for Linux image into Nix store
-      using either
-        nix-store --add-fixed sha256 ${name}
-      or
-        nix-prefetch-url file://path/to/${name}
-    '';
+  # We download the full distribution to extract prl-tools-lin.iso from
+  # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
+  src = fetchurl {
+    url =  "https://download.parallels.com/desktop/v${prl_major}/${version}/ParallelsDesktop-${version}.dmg";
+    sha256 = "1jwzwif69qlhmfky9kigjaxpxfj0lyrl1iyrpqy4iwqvajdgbbym";
   };
 
-  hardeningDisable = [ "pic" ];
+  hardeningDisable = [ "pic" "format" ];
 
   # also maybe python2 to generate xorg.conf
-  nativeBuildInputs = [ p7zip ] ++ lib.optionals (!libsOnly) [ makeWrapper ];
+  nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies;
 
   inherit libsOnly;
 
   unpackPhase = ''
-    7z x $src
-    export sourceRoot=.
+    undmg < "${src}"
+
+    export sourceRoot=prl-tools-build
+    7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso" -o$sourceRoot
     if test -z "$libsOnly"; then
-      ( cd kmods; tar -xaf prl_mod.tar.gz )
+      ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz )
     fi
-    ( cd tools; tar -xaf prltools${if x64 then ".x64" else ""}.tar.gz )
+    ( cd $sourceRoot/tools; tar -xaf prltools${if x64 then ".x64" else ""}.tar.gz )
   '';
 
   kernelVersion = if libsOnly then "" else (builtins.parseDrvName kernel.name).version;
@@ -86,13 +68,8 @@ stdenv.mkDerivation rec {
 
   libPath = with xorg;
             stdenv.lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ]
-            ++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]);
+            ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]);
 
-  desktops = map (x: substituteAll ({
-               src = ./autostart.desktop;
-               name = x.exec + ".desktop";
-               version = version;
-             } // x)) autostart;
 
   installPhase = ''
     if test -z "$libsOnly"; then
@@ -124,7 +101,7 @@ stdenv.mkDerivation rec {
           patchelf \
             --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
             --set-rpath "$out/lib:$libPath" \
-            $i
+            $i || true
         done
 
         mkdir -p $out/bin
@@ -145,11 +122,6 @@ stdenv.mkDerivation rec {
           sed 's,/bin/bash,${stdenv.shell},g' $i > $out/lib/udev/rules.d/$i
         done
 
-        mkdir -p $out/share/autostart
-        for i in $desktops; do
-          cat $i | sed "s,^Exec=,Exec=$out/bin/," > $out/share/autostart/$(basename $i)
-        done
-
         (
           cd xorg.${xorgVer}
           # Install the X modules.
@@ -189,8 +161,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Parallels Tools for Linux guests";
-    homepage = http://parallels.com;
-    platforms = platforms.linux;
+    homepage = https://parallels.com;
+    platforms = [ "i686-linux" "x86_64-linux" ];
     license = licenses.unfree;
     # I was making this package blindly and requesting testing from the real user,
     # so I can't even test it by myself and won't provide future updates.
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 4023ea5c69f934789f773acbc3d8a980c1f8af34..316f0ad1a28dfe22b394a79e0a0e9048e5507d41 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,28 +1,55 @@
-{ lib, stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchFromGitLab, fetchpatch, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "procps-${version}";
-  version = "3.3.12";
+  version = "3.3.13";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz";
-    sha256 = "1m57w6jmry84njd5sgk5afycbglql0al80grx027kwqqcfw5mmkf";
+  src = fetchFromGitLab {
+    owner ="procps-ng";
+    repo = "procps";
+    rev = "v${version}";
+    sha256 = "0r3h9adhqi5fi62lx65z839fww35lfh2isnknhkaw71xndjpzr0q";
   };
 
   buildInputs = [ ncurses ];
+  nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ];
+
+  # https://gitlab.com/procps-ng/procps/issues/88
+  # Patches needed for musl and glibc 2.28
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.com/procps-ng/procps/uploads/f91ff094be1e4638aeffb67bdbb751ba/numa.h.diff";
+      sha256 = "16r537d2wfrvbv6dg9vyfck8n31xa58903mnssw1s4kb5ap83yd5";
+      extraPrefix = "";
+    })
+    (fetchpatch {
+      url = "https://gitlab.com/procps-ng/procps/uploads/6a7bdea4d82ba781451316fda74192ae/libio_detection.diff";
+      sha256 = "0qp0j60kiycjsv213ih10imjirmxz8zja3rk9fq5lr5xf7k2lr3p";
+    })
+  ];
+
+  # autoreconfHook doesn't quite get, what procps-ng buildprocss does
+  # with po/Makefile.in.in and stuff.
+  preConfigure = ''
+    ./autogen.sh
+  '';
 
   makeFlags = "usrbin_execdir=$(out)/bin";
 
   enableParallelBuilding = true;
 
   # Too red
-  configureFlags = [ "--disable-modern-top" ];
+  configureFlags = [ "--disable-modern-top" ]
+    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
+    [ "ac_cv_func_malloc_0_nonnull=yes"
+      "ac_cv_func_realloc_0_nonnull=yes" ];
 
   meta = {
-    homepage = https://sourceforge.net/projects/procps-ng/;
+    homepage = https://gitlab.com/procps-ng/procps;
     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 ++ lib.platforms.cygwin;
+    maintainers = [ lib.maintainers.typetetris ];
   };
 }
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index cb720c20634868ebcc982df73279661abfdfef5c..504d2595785822699f81f75108bedae7b6f95a88 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "radeontop-${version}";
-  version = "2016-10-28";
+  version = "2018-03-25";
 
   src = fetchFromGitHub {
-    sha256 = "0y4rl8pm7p22s1ipyb75mlsk9qb6j4rd6nlqb3digmimnyxda1q3";
-    rev = "v1.0";
+    sha256 = "0s41xy9nrzxmimkdg23fr86rqcfiw6iqh99zpph0j990l8yzmv9b";
+    rev = "v1.1";
     repo = "radeontop";
     owner = "clbr";
   };
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/clbr/radeontop;
     platforms = platforms.linux;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ rycee nckx ];
+    maintainers = with maintainers; [ rycee ];
   };
 }
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..9aa938068791842f7c5e67a9747f973e8a353bbe
--- /dev/null
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, ethtool, nettools, libnl, libudev, python, perl
+} :
+
+let
+  version = "17.1";
+
+in stdenv.mkDerivation {
+  name = "rdma-core-${version}";
+
+  src = fetchFromGitHub {
+    owner = "linux-rdma";
+    repo = "rdma-core";
+    rev = "v${version}";
+    sha256 = "019h5q0szjccdgfk13qy0f2dxd0n1fr407b3qqq1vcmx41w9b6vz";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libnl ethtool nettools libudev python perl ];
+
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_RUNDIR=/run"
+    "-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib"
+  ];
+
+  postPatch = ''
+    substituteInPlace providers/rxe/rxe_cfg.in \
+      --replace ethtool "${ethtool}/bin/ethtool" \
+      --replace ifconfig "${nettools}/bin/ifconfig"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "RDMA Core Userspace Libraries and Daemons";
+    homepage = https://github.com/linux-rdma/rdma-core;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ markuskowa ];
+  };
+}
+
diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix
index ba35d9f73ffc14240c6f86cdfafb874dc83c0667..ee7325edbe70cccd1fe61ae1cbb72135814d68ca 100644
--- a/pkgs/os-specific/linux/regionset/default.nix
+++ b/pkgs/os-specific/linux/regionset/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     inherit version;
     homepage = http://linvdr.org/projects/regionset/;
-    descriptions = "Tool for changing the region code setting of DVD players";
+    description = "Tool for changing the region code setting of DVD players";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index 779337e85f8614f45d6d5d0ca0ac6d08afe5ed1c..4b83e478dd1c3782bcf0fd647431945f43fba884 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
     sed 1i'#include ' -i platform/linux/linux.c
   '';
 
+  # Needed with GCC 7
+  NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
+
   makeFlags = ["PREFIX=$(out)"];
   meta = {
     platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
index 5b16799a89c77f669b898582a25aed6c72e4972f..8c7b75a881f4a43530bf1c504ea419480c9237ff 100644
--- a/pkgs/os-specific/linux/rewritefs/default.nix
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = ''A FUSE filesystem intended to be used
       like Apache mod_rewrite'';
-    homepage    = "https://github.com/sloonz/rewritefs";
+    homepage    = https://github.com/sloonz/rewritefs;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ rnhmjoj ];
     platforms   = platforms.linux;
diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix
index 4fd716ab8db87b556bb03396ec0f3534c55076e5..868dcc9a58ea629ac600cebf5b8123db409e3bf1 100644
--- a/pkgs/os-specific/linux/rtkit/default.nix
+++ b/pkgs/os-specific/linux/rtkit/default.nix
@@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
       url = "http://git.0pointer.net/rtkit.git/patch/?id=88d4082ef6caf6b071d749dca1c50e7edde914cc";
       sha256 = "0hp1blbi359qz8fmr6nj4w9yc0jf3dd176f8pn25wdj38n13qkix";
     })
+
+    # Fix format string errors due to -Werror=format-security
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/r/rtkit/0.11-6/debian/patches/0006-fix-format-strings.patch";
+      sha256 = "09mr89lh16jvz6cqw00zmh0xk919bjfhjkvna1czwmafwy9p7kgp";
+    })
   ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..52542aabfdedb98fc7cd418295a217e29e50de94
--- /dev/null
+++ b/pkgs/os-specific/linux/rtl8192eu/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchFromGitHub, kernel }:
+
+with lib;
+
+let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtl8192eu";
+
+in stdenv.mkDerivation rec {
+  name = "rtl8192eu-${kernel.version}-${version}";
+  version = "4.4.1";
+
+  src = fetchFromGitHub {
+    owner = "Mange";
+    repo = "rtl8192eu-linux-driver";
+    rev = "4094004";
+    sha256 = "0rgcsp8bd5i5ik9b35qipdhq0xd8pva8kdijixxfaxm4vw6kbrvr";
+  };
+
+  hardeningDisable = [ "pic" ];
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p ${modDestDir}
+    find . -name '*.ko' -exec cp --parents {} ${modDestDir} \;
+    find ${modDestDir} -name '*.ko' -exec xz -f {} \;
+  '';
+
+  meta = {
+    description = "Realtek rtl8192eu driver";
+    homepage = https://github.com/Mange/rtl8192eu-linux-driver;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ troydm ];
+  };
+}
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 4ea6b35e377e2abefc2e7c4a0ea997ca9763f8d6..96306a9d5c6a3f425a77116e9da95a6a951aa8bd 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -1,37 +1,20 @@
-{ stdenv, fetchFromGitHub, fetchpatch, kernel }:
+{ stdenv, fetchFromGitHub, fetchpatch, kernel, bc }:
 
 stdenv.mkDerivation rec {
   name = "rtl8812au-${kernel.version}-${version}";
-  version = "4.3.20";
+  version = "5.2.20_25672.20171213";
 
   src = fetchFromGitHub {
-    owner = "Grawp";
-    repo = "rtl8812au_rtl8821au";
-    rev = "d716b38abf5ca7da72d2be0adfcebe98cceeda8f";
-    sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry";
+    owner = "zebulon2";
+    repo = "rtl8812au-driver-5.2.20";
+    rev = "aca1e0677bfe56c6c4914358df007c97486e7095";
+    sha256 = "19av8fkh3mvs2f57iibrg0cfyhjnnx4cbnfzv5aj7v5gb0j3dp0p";
   };
 
-  patches = [
-    (fetchpatch { # From PR # 42
-      name = "rtl8812au-4.11.x-fix.patch";
-      url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/3224e74ad9c230b74a658e80dad66ab95c9e2ef5.patch;
-      sha256 = "12g4yvivg4d0qm5cgxs7k54p3y7h1dc2jw6rp1xbppwf3j1z6xks";
-    })
-    (fetchpatch { # From PR #46
-      name = "rtl8812au-4.11.9-fix.patch";
-      url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/58fc45a4511b8b9d6b52813168e3eee657517b1f.patch;
-      sha256 = "18bag2mif5112lap2xvx2bb0wxrd13f9y9cwqv1qzp5nyqiniziz";
-    })
-    (fetchpatch { # From PR #43
-      name = "rtl8812au-4.12-fix.patch";
-      url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/a5475c9f1f54099ca35c8680f2dedee11fa9edec.patch;
-      sha256 = "01xa51whq1xa0sh3y2bhm65f0cryzmv46v530axqjrpnd924432d";
-    })
-  ];
+  nativeBuildInputs = [ bc ];
+  buildInputs = kernel.moduleBuildDependencies;
 
-  hardeningDisable = [ "pic" ];
-
-  NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types";
+  hardeningDisable = [ "pic" "format" ];
 
   prePatch = ''
     substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/"
@@ -44,10 +27,11 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
-    homepage = https://github.com/Grawp/rtl8812au_rtl8821au;
-    license = stdenv.lib.licenses.gpl2;
+    homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20;
+    license = licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = with maintainers; [ danielfullmer ];
   };
 }
diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..99b42fc7400757e7cf0365c2e4bbbad8bb69cf74
--- /dev/null
+++ b/pkgs/os-specific/linux/rtl8814au/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, fetchpatch, kernel }:
+
+stdenv.mkDerivation rec {
+  name = "rtl8814au-${kernel.version}-${version}";
+  version = "4.3.21";
+
+  src = fetchFromGitHub {
+    owner = "zebulon2";
+    repo = "rtl8814au";
+    rev = "a58c56a5a6cb99ffb872f07cb67b68197911854f";
+    sha256 = "1ffm67da183nz009gm5v9w1bab081hrm113kk8knl9s5qbqnn13q";
+  };
+
+  buildInputs = kernel.moduleBuildDependencies;
+
+  hardeningDisable = [ "pic" ];
+
+  NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types";
+
+  prePatch = ''
+    substituteInPlace ./Makefile \
+      --replace /lib/modules/ "${kernel.dev}/lib/modules/" \
+      --replace '$(shell uname -r)' "${kernel.modDirVersion}" \
+      --replace /sbin/depmod \# \
+      --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Realtek 8814AU USB WiFi driver";
+    homepage = https://github.com/zebulon2/rtl8814au;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.lassulus ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix
index 25548e0f962d441288a83d653654fac70b7c34d0..b29b1f639cf731ab6c323af4d0e9cf3705e43b64 100644
--- a/pkgs/os-specific/linux/rtlwifi_new/default.nix
+++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix
@@ -6,17 +6,19 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
 
 in stdenv.mkDerivation rec {
   name = "rtlwifi_new-${version}";
-  version = "2017-07-18";
+  version = "2018-02-17";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtlwifi_new";
-    rev = "a24cb561b4d23187ea103255336daa7ca88791a7";
-    sha256 = "1w9rx5wafcp1vc4yh7lj332bv78szl6gmx3ckr8yl6c39alqcv0d";
+    rev = "0588ac0cc5f530e7764705416370b70d3c2afedc";
+    sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m";
   };
 
   hardeningDisable = [ "pic" "format" ];
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
 
   enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index 39bec26e07f118a53b365dbfdbf4ee2512f1a30b..a8d5112c63b9181a513ba084a9ed81b2ba22c145 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
     homepage = http://sg.danny.cz/sg/sdparm.html;
     description = "A utility to access SCSI device parameters";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ nckx ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..8ac207d64214505c2d491717487b48c30bfba013
--- /dev/null
+++ b/pkgs/os-specific/linux/selinux-python/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, python3
+, libselinux, libsemanage, libsepol, setools }:
+
+# this is python3 only because setools only supports python3
+
+with stdenv.lib;
+with python3.pkgs;
+
+stdenv.mkDerivation rec {
+  name = "selinux-python-${version}";
+  version = "2.7";
+  se_release = "20170804";
+  se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
+
+  src = fetchurl {
+    url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz";
+    sha256 = "1va0y4b7cah7rprh04b3ylmwqgnivpkw5z2zw68nrafdbsbcn5s2";
+  };
+
+  nativeBuildInputs = [ wrapPython ];
+  buildInputs = [ libsepol python3 ];
+  propagatedBuildInputs = [ libselinux libsemanage setools ipy ];
+
+  postPatch = ''
+    substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix"
+  '';
+
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("LOCALEDIR=$out/share/locale")
+    makeFlagsArray+=("LIBSEPOLA=${libsepol}/lib/libsepol.a")
+    makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
+    makeFlagsArray+=("PYTHON=${python3}/bin/python")
+    makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages")
+  '';
+
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
+  meta = {
+    description = "SELinux policy core utilities written in Python";
+    license = licenses.gpl2;
+    homepage = https://selinuxproject.org;
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..431f5e9ef517791f1ca1454db883d65a462bd06c
--- /dev/null
+++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, bash, coreutils, python3
+, libcap_ng, policycoreutils, selinux-python, dbus
+, xorgserver, openbox, xmodmap }:
+
+# this is python3 only as it depends on selinux-python
+
+with stdenv.lib; 
+with python3.pkgs;
+
+stdenv.mkDerivation rec {
+  name = "selinux-sandbox-${version}";
+  version = "2.7";
+  se_release = "20170804";
+
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${se_release}/selinux-sandbox-${version}.tar.gz";
+    sha256 = "0hf5chm90iapb42njaps6p5460ys3ajh5446ja544vdbh01n544l";
+  };
+
+  nativeBuildInputs = [ wrapPython ];
+  buildInputs = [ bash coreutils libcap_ng policycoreutils python3 xorgserver openbox xmodmap dbus ];
+  propagatedBuildInputs = [ pygobject3 selinux-python ];
+
+  postPatch = ''
+    # Fix setuid install
+    substituteInPlace Makefile --replace "-m 4755" "-m 755"
+    substituteInPlace sandboxX.sh \
+      --replace "#!/bin/sh" "#!${bash}/bin/sh" \
+      --replace "/usr/share/sandbox/start" "$out/share/sandbox/start" \
+      --replace "/usr/bin/cut" "${coreutils}/bin/cut" \
+      --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \
+      --replace "secon" "${policycoreutils}/bin/secon"
+    substituteInPlace sandbox \
+      --replace "/usr/sbin/seunshare" "$out/bin/seunshare" \
+      --replace "/usr/share/sandbox" "$out/share/sandbox" \
+      --replace "/usr/share/locale" "${policycoreutils}/share/locale" \
+      --replace "/usr/bin/openbox" "${openbox}/bin/openbox" \
+      --replace "#!/bin/sh" "#!${bash}/bin/sh" \
+      --replace "dbus-" "${dbus}/bin/dbus-" \
+      --replace "/usr/bin/xmodmap" "${xmodmap}/bin/xmodmap" \
+      --replace "/usr/bin/shred" "${coreutils}/bin/shred" \
+      --replace "/usr/bin/test" "${coreutils}/bin/test" \
+  '';
+
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
+  '';
+
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
+  meta = {
+    description = "SELinux sandbox utility";
+    license = licenses.gpl2;
+    homepage = https://selinuxproject.org;
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index 8262c03e1e52d8608060685e21f8f6318a4d2c2f..9cb5785ca98fa05698f2e756fd26e91bdeefa9bd 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -1,35 +1,42 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, bison, flex
-, python, swig2, tcl, libsepol, libselinux, libxml2, sqlite, bzip2 }:
+{ stdenv, fetchFromGitHub, bison, flex, python3 , swig
+, libsepol, libselinux, checkpolicy
+, withGraphics ? false
+}:
 
-stdenv.mkDerivation rec {
-  name = "setools-2015-02-12";
+with stdenv.lib;
+with python3.pkgs;
+
+buildPythonApplication rec {
+  pname = "setools";
+  version = "2017-11-10";
 
   src = fetchFromGitHub {
     owner = "TresysTechnology";
-    repo = "setools3";
-    rev = "f1e5b208d507171968ca4d2eeefd7980f1004a3c";
-    sha256 = "02gzy2kpszhr13f0d9qfiwh2hj4201g2x366j53v5n5qz481aykd";
+    repo = pname;
+    rev = "a1aa0f33f5c428d3f9fe82960ed5de36f38047f7";
+    sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn";
   };
 
-  configureFlags = [
-    "--disable-gui"
-    "--with-sepol-devel=${libsepol}"
-    "--with-selinux-devel=${libselinux}"
-    "--with-tcl=${tcl}/lib"
-  ];
+  nativeBuildInputs = [ bison flex ];
+  buildInputs = [ libsepol swig ];
+  propagatedBuildInputs = [ enum34 libselinux networkx ]
+    ++ optionals withGraphics [ pyqt5 ];
 
-  hardeningDisable = [ "format" ];
+  checkInputs = [ tox checkpolicy ];
+  preCheck = ''
+    export CHECKPOLICY=${checkpolicy}/bin/checkpolicy
+  '';
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-  NIX_LDFLAGS = "-L${libsepol}/lib -L${libselinux}/lib";
+  setupPyBuildFlags = [ "-i" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig python swig2 bison flex ];
-  buildInputs = [ tcl libxml2 sqlite bzip2 ];
+  preBuild = ''
+    export SEPOL="${libsepol}/lib/libsepol.a"
+  '';
 
   meta = {
     description = "SELinux Tools";
-    homepage = http://oss.tresys.com/projects/setools/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://github.com/TresysTechnology/setools/wiki;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 64d7a694fc146bc642b168d9ef91cd7f0e82f054..3a76450a8308361eb944bd945e6d1ab69131d25e 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2
-, docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison
+, docbook_xml_dtd_412, docbook_xsl, gnome-doc-utils, flex, bison
 , pam ? null, glibcCross ? null
 , buildPlatform, hostPlatform
 }:
@@ -9,7 +9,7 @@ let
   glibc =
     if hostPlatform != buildPlatform
     then glibcCross
-    else assert stdenv ? glibc; stdenv.glibc;
+    else assert hostPlatform.libc == "glibc"; stdenv.cc.libc;
 
   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;
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
   nativeBuildInputs = [autoreconfHook libxslt libxml2
-    docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison
+    docbook_xml_dtd_412 docbook_xsl gnome-doc-utils flex bison
     ];
 
   patches =
@@ -60,9 +60,12 @@ stdenv.mkDerivation rec {
     configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog ";
   '';
 
-  configureFlags = " --enable-man ";
+  configureFlags = [
+    "--enable-man"
+    "--with-group-name-max-length=32"
+  ] ++ stdenv.lib.optional (hostPlatform.libc != "glibc") "--disable-nscd";
 
-  preBuild = assert glibc != null;
+  preBuild = stdenv.lib.optionalString (hostPlatform.libc == "glibc")
     ''
       substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd
     '';
diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix
index 9207a6b3511d0d4fcde3bbe7ce56f5b28fcd19e3..32761970d81cfff363d65330d2902bb97ff3d41b 100644
--- a/pkgs/os-specific/linux/sinit/default.nix
+++ b/pkgs/os-specific/linux/sinit/default.nix
@@ -5,7 +5,7 @@ let
     baseName="sinit";
     version="1.0";
     name="${baseName}-${version}";
-    url="http://git.suckless.org/sinit/";
+    url="https://git.suckless.org/sinit/";
     sha256="0cf8yylgrrj1wxm5v6jdlbnxpx97m38yxrc9nmv1l8hldjqsj9pc";
     rev = "refs/tags/v${version}";
   };
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.mit ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = http://tools.suckless.org/sinit;
-    downloadPage = "http://git.suckless.org/sinit";
+    homepage = https://tools.suckless.org/sinit;
+    downloadPage = "https://git.suckless.org/sinit";
   };
 }
diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix
index 04f5bf53f93637bc5d7124d7c78fada49059919c..b4b8606197e81785d27fd07c31d0c4642e4a4684 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.17";
+  version = "0.01.18";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz";
-    sha256 = "093ifrz688cm0kmzz1c6himhbdr75ig1mcaapmqy8jadc1gaw2im";
+    sha256 = "0g262gilj2jk365wj4yl93ifppgvc9rx7dmlw6ychbv72v2pbv6w";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];
diff --git a/pkgs/os-specific/linux/spl/const.patch b/pkgs/os-specific/linux/spl/const.patch
deleted file mode 100644
index 932e8a9eb1c479c5862592d92cf90fe7b6906780..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/spl/const.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
-index eb00505..6f38cef 100644
---- a/module/spl/spl-proc.c
-+++ b/module/spl/spl-proc.c
-@@ -36,7 +36,7 @@
- #include 
- #include 
- 
--#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
-+#if defined(CONSTIFY_PLUGIN)
- typedef struct ctl_table __no_const spl_ctl_table;
- #else
- typedef struct ctl_table spl_ctl_table;
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index b2d090fa7ea204339b6bd0ddebbab1946fe3b825..7c37d18c8684ecbc0f7f48275ee0fceb7735d90f 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -1,21 +1,19 @@
 { fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk
-, configFile ? "all"
 
 # Kernel dependencies
-, kernel ? null
+, kernel
 }:
 
 with stdenv.lib;
 
 let
-  buildKernel = any (n: n == configFile) [ "kernel" "all" ];
-  buildUser = any (n: n == configFile) [ "user" "all" ];
   common = { version
     , sha256
     , rev ? "spl-${version}"
     , broken ? false
+    , patches ? []
     } @ args : stdenv.mkDerivation rec {
-      name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+      name = "spl-${version}-${kernel.version}";
 
       src = fetchFromGitHub {
         owner = "zfsonlinux";
@@ -23,9 +21,9 @@ let
         inherit rev sha256;
       };
 
-      patches = [ ./const.patch ./install_prefix.patch ];
+      inherit patches;
 
-      nativeBuildInputs = [ autoreconfHook ];
+      nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;
 
       hardeningDisable = [ "pic" ];
 
@@ -37,8 +35,7 @@ let
       '';
 
       configureFlags = [
-        "--with-config=${configFile}"
-      ] ++ optionals buildKernel [
+        "--with-config=kernel"
         "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
         "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
       ];
@@ -62,19 +59,25 @@ let
       };
   };
 in
-  assert any (n: n == configFile) [ "kernel" "user" "all" ];
-  assert buildKernel -> kernel != null;
+  assert kernel != null;
 {
     splStable = common {
-      version = "0.7.3";
-      sha256 = "0j8mb9ky3pjz9hnz5w6fajpzajl15jq3p0xvxb6lhpqj3rjzsqxb";
-
-      broken = kernel != null && stdenv.lib.versionAtLeast kernel.version "4.14";
+      version = "0.7.8";
+      sha256 = "0ypyy7ij280n7rly6ifrvna9k55gxwdx9a7lalf4r1ka714379fi";
+      patches = [ ./install_prefix-0.7.8.patch ];
     };
 
     splUnstable = common {
-      version = "2017-11-16";
-      rev = "ed19bccfb651843fa208232b3a2d3d22a4152bc8";
-      sha256 = "08ihjbf5fhcnhq9zavcwswg9djlbalbx1bil4rcv6i3d617wammb";
+      version = "2018-04-10";
+      rev = "9125f8f5bdb36bfbd2d816d30b6b29b9f89ae3d8";
+      sha256 = "00zrbca906rzjd62m4khiw3sdv8x18dapcmvkyaawripwvzc4iri";
+      patches = [ ./install_prefix.patch ];
+    };
+
+    splLegacyCrypto = common {
+      version = "2018-01-24";
+      rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771";
+      sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h";
+      patches = [ ./install_prefix.patch ];
     };
 }
diff --git a/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch b/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch
new file mode 100644
index 0000000000000000000000000000000000000000..dc91392bd2feb63190e946478b7c86645b9a2dc2
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch
@@ -0,0 +1,174 @@
+diff --git a/Makefile.am b/Makefile.am
+index 4977448..ac17217 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,10 +12,10 @@ endif
+ if CONFIG_KERNEL
+ SUBDIRS += module
+ 
+-extradir = @prefix@/src/spl-$(VERSION)
++extradir = @prefix@/libexec/spl
+ extra_HEADERS = spl.release.in spl_config.h.in
+ 
+-kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION)
++kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION)
+ nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
+ endif
+ 
+diff --git a/include/Makefile.am b/include/Makefile.am
+index 3200222..4a47aaa 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -13,6 +13,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include
++kerneldir = @prefix@/libexec/spl/include
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am
+index e0da4b3..d6d7af0 100644
+--- a/include/fs/Makefile.am
++++ b/include/fs/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/fs
++kerneldir = @prefix@/libexec/spl/include/fs
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
+index 712e94e..4af9fb7 100644
+--- a/include/linux/Makefile.am
++++ b/include/linux/Makefile.am
+@@ -18,6 +18,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/linux
++kerneldir = @prefix@/libexec/spl/include/linux
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am
+index cfc8246..4fbd33d 100644
+--- a/include/rpc/Makefile.am
++++ b/include/rpc/Makefile.am
+@@ -9,6 +9,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc
++kerneldir = @prefix@/libexec/spl/include/rpc
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am
+index 10e7093..febecdf 100644
+--- a/include/sharefs/Makefile.am
++++ b/include/sharefs/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs
++kerneldir = @prefix@/libexec/spl/include/sharefs
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
+index 73c4a84..31a9f50 100644
+--- a/include/sys/Makefile.am
++++ b/include/sys/Makefile.am
+@@ -107,7 +107,7 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys
++kerneldir = @prefix@/libexec/spl/include/sys
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+ 
+diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
+index 2821cbe..a84ce8e 100644
+--- a/include/sys/fm/Makefile.am
++++ b/include/sys/fm/Makefile.am
+@@ -9,6 +9,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm
++kerneldir = @prefix@/libexec/spl/include/sys/fm
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
+index 581083e..0c35fb7 100644
+--- a/include/sys/fs/Makefile.am
++++ b/include/sys/fs/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs
++kerneldir = @prefix@/libexec/spl/include/sys/fs
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am
+index 63d9af3..de1aa18 100644
+--- a/include/sys/sysevent/Makefile.am
++++ b/include/sys/sysevent/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent
++kerneldir = @prefix@/libexec/spl/include/sys/sysevent
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/util/Makefile.am b/include/util/Makefile.am
+index e2bf09f..3f5d6ce 100644
+--- a/include/util/Makefile.am
++++ b/include/util/Makefile.am
+@@ -9,6 +9,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/util
++kerneldir = @prefix@/libexec/spl/include/util
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am
+index 7faab0a..8148b3d 100644
+--- a/include/vm/Makefile.am
++++ b/include/vm/Makefile.am
+@@ -10,6 +10,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/vm
++kerneldir = @prefix@/libexec/spl/include/vm
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/module/Makefile.in b/module/Makefile.in
+index d4e62e1..73fa01c 100644
+--- a/module/Makefile.in
++++ b/module/Makefile.in
+@@ -21,15 +21,15 @@ clean:
+ modules_install:
+ 	@# Install the kernel modules
+ 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
+-		INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
++		INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
+ 		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
+ 		KERNELRELEASE=@LINUX_VERSION@
+ 	@# Remove extraneous build products when packaging
+-	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
+-	if [ -n "$(DESTDIR)" ]; then \
++	kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
++	if [ -n "@prefix@" ]; then \
+ 		find $$kmoddir -name 'modules.*' | xargs $(RM); \
+ 	fi
+-	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
++	sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
+ 	if [ -f $$sysmap ]; then \
+ 		depmod -ae -F $$sysmap @LINUX_VERSION@; \
+ 	fi
diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch
index dc91392bd2feb63190e946478b7c86645b9a2dc2..114ca123147020ce8f6ba8349779474c9d997911 100644
--- a/pkgs/os-specific/linux/spl/install_prefix.patch
+++ b/pkgs/os-specific/linux/spl/install_prefix.patch
@@ -112,18 +112,6 @@ index 581083e..0c35fb7 100644
 +kerneldir = @prefix@/libexec/spl/include/sys/fs
  kernel_HEADERS = $(KERNEL_H)
  endif
-diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am
-index 63d9af3..de1aa18 100644
---- a/include/sys/sysevent/Makefile.am
-+++ b/include/sys/sysevent/Makefile.am
-@@ -8,6 +8,6 @@ USER_H =
- EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent
-+kerneldir = @prefix@/libexec/spl/include/sys/sysevent
- kernel_HEADERS = $(KERNEL_H)
- endif
 diff --git a/include/util/Makefile.am b/include/util/Makefile.am
 index e2bf09f..3f5d6ce 100644
 --- a/include/util/Makefile.am
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 516f0b92df6b595a9ec439a192f47ff15437ce62..3d89fdfdc281e55dcc896c47a453bb59909f4008 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "sssd-${version}";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchurl {
     url = "https://fedorahosted.org/released/sssd/${name}.tar.gz";
-    sha256 = "03wllgbxxz2zv14dcqr8d2xssppi7ibckh0rlky8gvsw6vjsd0f5";
+    sha256 = "0vjh1c5960wh86zjsamdjhljls7bb5fz5jpcazgzrpmga5w6ggrd";
   };
 
   # Something is looking for  instead of 
diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix
index 3cb9179f535c308d84f92f41fdc1161764314eb9..67df9dd2f11f182fba06f4cdbf9a8ec37060bfc6 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/pkgs/os-specific/linux/statifier/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, gcc_multi, glibc_multi }:
+{ multiStdenv, fetchurl }:
 
 let version = "1.7.4"; in
-stdenv.mkDerivation {
+multiStdenv.mkDerivation {
   name = "statifier-${version}";
 
   src = fetchurl {
@@ -9,16 +9,14 @@ stdenv.mkDerivation {
     sha256 = "03lzkla6knjhh186b43cac410x2fmhi28pkmzb3d211n3zp5i9y8";
   };
 
-  buildInputs = [ gcc_multi glibc_multi ];
-
   phaseNames = [ "patchPhase" "installPhase" ];
 
   postPatch = ''
     sed -e s@/usr/@"$out/"@g -i */Makefile src/statifier
-    sed -e s@/bin/bash@"${stdenv.shell}"@g -i src/*.sh
+    sed -e s@/bin/bash@"${multiStdenv.shell}"@g -i src/*.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with multiStdenv.lib; {
     description = "Tool for creating static Linux binaries";
     platforms = platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 18d473e219419710a6199ef5bbb7a5e797759ec6..6223c967619d62f6f48d388b089d3f49aefad28e 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,18 +3,18 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "sysdig-${version}";
-  version = "0.18.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
     rev = version;
-    sha256 = "1hmkjvfg3371hp873mnkjq9cirqszw2ji4p7mb6jcn9ihwxil2z2";
+    sha256 = "0dakxv2pkbsivavz09fwvav4dla7qzklnv45zb7x306gankkjgi1";
   };
 
   buildInputs = [
     cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc
-  ];
+  ] ++ optional (kernel != null) kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];
 
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index adfcc76c31c15478709b8ccaa42981dc67212cd9..db9f05f5f4d826d9d39ad4d507c2eae05a9597c1 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "sysstat-11.2.5";
+  name = "sysstat-11.7.3";
 
   src = fetchurl {
     url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz";
-    sha256 = "1r7869pnylamjry5f5l5m1jn68v61js9wdkz8yn37a9a2bcrqp2d";
+    sha256 = "1sk6rhdqr8xsm456fkhkcmbnqgkymqqs3jkapcf8mrnsx36gz94f";
   };
 
   buildInputs = [ gettext ];
diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
index dc0a23be98fea85b967f31bd68b166e1c543e2c6..f69269347e3737395e05f12fc60450321fa4c61c 100644
--- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
+++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
@@ -10,21 +10,15 @@ stdenv.lib.overrideDerivation systemd (p: {
   outputs = [ "out" ];
 
   buildPhase = ''
-    make $makeFlags built-sources
-    make $makeFlags systemd-cryptsetup
-    make $makeFlags systemd-cryptsetup-generator
+    ninja systemd-cryptsetup systemd-cryptsetup-generator
   '';
 
-  # For some reason systemd-cryptsetup-generator is a wrapper-script
-  # with the current release of systemd. We want the real one.
-
-  # TODO: Remove `.libs` prefix when the wrapper-script is gone
   installPhase = ''
     mkdir -p $out/lib/systemd/
-    cp .libs/systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup
-    cp .libs/*.so $out/lib/
+    cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup
+    cp src/shared/*.so $out/lib/systemd/
 
     mkdir -p $out/lib/systemd/system-generators/
-    cp .libs/systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator
+    cp systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator
   '';
 })
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7c8ffef86eec87adfa16af59b6d9a4ac3d5b25b8..7c95148830935b5f62800bed7f1a8dc176a1ae76 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,126 +1,166 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
 , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
-, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
-, kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp
-, iptables, gnu-efi
+, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
+, audit, lz4, bzip2, kexectools, libmicrohttpd
+, linuxHeaders ? stdenv.cc.libc.linuxHeaders
+, libseccomp, iptables, gnu-efi
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
+, ninja, meson, python3Packages, glibcLocales
+, patchelf
+, getent
+, hostPlatform
+, buildPackages
+, withSelinux ? false, libselinux
 }:
 
 assert stdenv.isLinux;
 
-stdenv.mkDerivation rec {
-  version = "234";
+let
+  pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
+
+in stdenv.mkDerivation rec {
+  version = "238";
   name = "systemd-${version}";
 
+  # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
+  # Also fresh patches should be cherry-picked from that tree to our current one.
   src = fetchFromGitHub {
-    owner = "nixos";
+    owner = "NixOS";
     repo = "systemd";
-    rev = "ba777535a890c2a2b7677dfacc63e12c578b9b3f";
-    sha256 = "1vb45fbqkrgczfwkb0y07ldnwhjqk2sh446hzfkdn8hrwl1lifg5";
+    rev = "02042d012c4d6c0a2854d8436dd6636d4327774f";
+    sha256 = "0iv6fygzac0z6dagbmw1nf8dx7rrr6d9cxp0fr304rn3ir58g5f0";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];
 
   nativeBuildInputs =
-    [ pkgconfig intltool gperf libxslt
-      /* FIXME: we may be able to prevent the following dependencies
-         by generating an autoconf'd tarball, but that's probably not
-         worth it. */
-      autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
+    [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
+      ninja meson
+      coreutils # meson calls date, stat etc.
+      glibcLocales
+      patchelf getent m4
     ];
   buildInputs =
     [ linuxHeaders libcap kmod xz pam acl
-      /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror
-      libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor
+      /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
+      libmicrohttpd ] ++
+      stdenv.lib.meta.enableIfAvailable kexectools ++
+      stdenv.lib.meta.enableIfAvailable libseccomp ++
+    [ libffi audit lz4 bzip2 libapparmor
       iptables gnu-efi
-    ];
+      # This is actually native, but we already pull it from buildPackages
+      pythonLxmlEnv
+    ] ++ stdenv.lib.optionals withSelinux [ libselinux ];
+
+  #dontAddPrefix = true;
+
+  mesonFlags = [
+    "-Dloadkeys-path=${kbd}/bin/loadkeys"
+    "-Dsetfont-path=${kbd}/bin/setfont"
+    "-Dtty-gid=3" # tty in NixOS has gid 3
+    # "-Dtests=" # TODO
+    "-Dlz4=true"
+    "-Dhostnamed=true"
+    "-Dnetworkd=true"
+    "-Dsysusers=false"
+    "-Dtimedated=true"
+    "-Dtimesyncd=true"
+    "-Dfirstboot=false"
+    "-Dlocaled=true"
+    "-Dresolve=true"
+    "-Dsplit-usr=false"
+    "-Dlibcurl=false"
+    "-Dlibidn=false"
+    "-Dlibidn2=true"
+    "-Dquotacheck=false"
+    "-Dldconfig=false"
+    "-Dsmack=true"
+    "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work
+    "-Dsystem-gid-max=499"
+    # "-Dtime-epoch=1"
+
+    (if stdenv.isArm || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
+    "-Defi-libdir=${toString gnu-efi}/lib"
+    "-Defi-includedir=${toString gnu-efi}/include/efi"
+    "-Defi-ldsdir=${toString gnu-efi}/lib"
+
+    "-Dsysvinit-path="
+    "-Dsysvrcnd-path="
+
+    "-Dkill-path=${coreutils}/bin/kill"
+    "-Dkmod-path=${kmod}/bin/kmod"
+    "-Dsulogin-path=${utillinux}/bin/sulogin"
+    "-Dmount-path=${utillinux}/bin/mount"
+    "-Dumount-path=${utillinux}/bin/umount"
+  ];
 
-  configureFlags =
-    [ "--localstatedir=/var"
-      "--sysconfdir=/etc"
-      "--with-rootprefix=$(out)"
-      "--with-kbd-loadkeys=${kbd}/bin/loadkeys"
-      "--with-kbd-setfont=${kbd}/bin/setfont"
-      "--with-rootprefix=$(out)"
-      "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d"
-      "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"
-      "--with-dbussessionservicedir=$(out)/share/dbus-1/services"
-      "--with-tty-gid=3" # tty in NixOS has gid 3
-      "--disable-tests"
-
-      "--enable-lz4"
-      "--enable-hostnamed"
-      "--enable-networkd"
-      "--disable-sysusers"
-      "--enable-timedated"
-      "--enable-timesyncd"
-      "--disable-firstboot"
-      "--enable-localed"
-      "--enable-resolved"
-      "--disable-split-usr"
-      "--disable-libcurl"
-      "--disable-libidn"
-      "--disable-quotacheck"
-      "--disable-ldconfig"
-      "--disable-smack"
-
-      (if stdenv.isArm then "--disable-gnuefi" else "--enable-gnuefi")
-      "--with-efi-libdir=${gnu-efi}/lib"
-      "--with-efi-includedir=${gnu-efi}/include"
-      "--with-efi-ldsdir=${gnu-efi}/lib"
-
-      "--with-sysvinit-path="
-      "--with-sysvrcnd-path="
-      "--with-rc-local-script-path-stop=/etc/halt.local"
-    ];
+  preConfigure = ''
+    mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
+    mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d)
+    mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services)
+    mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services)
+    mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d)
+    mesonFlagsArray+=(-Drootprefix=$out)
+    mesonFlagsArray+=(-Dlibdir=$lib/lib)
+    mesonFlagsArray+=(-Drootlibdir=$lib/lib)
+    mesonFlagsArray+=(-Dmandir=$man/lib)
+    mesonFlagsArray+=(-Dincludedir=$dev/include)
+    mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig)
+    mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig)
+
+    # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are?
+    substituteInPlace meson.build \
+      --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \
+                "includedir = '$dev/include'" \
+      --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \
+                "libdir = '$lib/lib'"
+
+    export LC_ALL="en_US.UTF-8";
+    # FIXME: patch this in systemd properly (and send upstream).
+    # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount
+    for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
+      test -e $i
+      substituteInPlace $i \
+        --replace /usr/bin/getent ${getent}/bin/getent \
+        --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \
+        --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \
+        --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
+        --replace /bin/echo ${coreutils}/bin/echo \
+        --replace /bin/cat ${coreutils}/bin/cat \
+        --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \
+        --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
+        --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
+    done
+
+    for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do
+      substituteInPlace $i \
+        --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python"
+    done
+
+    for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do
+      substituteInPlace $i \
+        --replace "#!/usr/bin/env python" "#!${buildPackages.python3Packages.python}/bin/python"
+    done
+
+    substituteInPlace src/journal/catalog.c \
+      --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
+  '';
+
+  # These defines are overridden by CFLAGS and would trigger annoying
+  # warning messages
+  postConfigure = ''
+    substituteInPlace config.h \
+      --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \
+      --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \
+      --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
+  '';
 
   hardeningDisable = [ "stackprotector" ];
 
-  patches = [
-    # TODO: Remove this patch when we have a systemd version
-    # with https://github.com/systemd/systemd/pull/6678
-    (fetchpatch {
-        url = "https://github.com/systemd/systemd/commit/58a78ae77063eddfcd23ea272bd2e0ddc9ea3ff7.patch";
-        sha256 = "0g3pvqigs69mciw6lj3zg12dmxnhwxndwxdjg78af52xrp0djfg8";
-    })
-  ];
-
-  preConfigure =
-    ''
-      unset RANLIB
-
-      ./autogen.sh
-
-      # FIXME: patch this in systemd properly (and send upstream).
-      for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
-        test -e $i
-        substituteInPlace $i \
-          --replace /usr/bin/getent ${stdenv.glibc.bin}/bin/getent \
-          --replace /bin/mount ${utillinux.bin}/bin/mount \
-          --replace /bin/umount ${utillinux.bin}/bin/umount \
-          --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \
-          --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \
-          --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
-          --replace /bin/echo ${coreutils}/bin/echo \
-          --replace /bin/cat ${coreutils}/bin/cat \
-          --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \
-          --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
-          --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
-      done
-
-      substituteInPlace src/journal/catalog.c \
-        --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
-
-      configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
-    '';
-
-  PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
-
   NIX_CFLAGS_COMPILE =
     [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would
       # lead to a cyclic dependency.
       "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
-      "-fno-stack-protector"
 
       # Set the release_agent on /sys/fs/cgroup/systemd to the
       # currently running systemd (/run/current-system/systemd) so
@@ -130,50 +170,33 @@ stdenv.mkDerivation rec {
       "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
     ];
 
-  installFlags =
-    [ "localstatedir=$(TMPDIR)/var"
-      "sysconfdir=$(out)/etc"
-      "sysvinitdir=$(TMPDIR)/etc/init.d"
-      "pamconfdir=$(out)/etc/pam.d"
-    ];
-
-  postInstall =
-    ''
-      # sysinit.target: Don't depend on
-      # systemd-tmpfiles-setup.service. This interferes with NixOps's
-      # send-keys feature (since sshd.service depends indirectly on
-      # sysinit.target).
-      mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/
-
-      mkdir -p $out/example/systemd
-      mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
-      mv $out/lib/systemd/{system,user} $out/example/systemd
-
-      rm -rf $out/etc/systemd/system
+  postInstall = ''
+    # sysinit.target: Don't depend on
+    # systemd-tmpfiles-setup.service. This interferes with NixOps's
+    # send-keys feature (since sshd.service depends indirectly on
+    # sysinit.target).
+    mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/
 
-      # Install SysV compatibility commands.
-      mkdir -p $out/sbin
-      ln -s $out/lib/systemd/systemd $out/sbin/telinit
-      for i in init halt poweroff runlevel reboot shutdown; do
-        ln -s $out/bin/systemctl $out/sbin/$i
-      done
+    mkdir -p $out/example/systemd
+    mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
+    mv $out/lib/systemd/{system,user} $out/example/systemd
 
-      # Fix reference to /bin/false in the D-Bus services.
-      for i in $out/share/dbus-1/system-services/*.service; do
-        substituteInPlace $i --replace /bin/false ${coreutils}/bin/false
-      done
+    rm -rf $out/etc/systemd/system
 
-      rm -rf $out/etc/rpm
+    # Fix reference to /bin/false in the D-Bus services.
+    for i in $out/share/dbus-1/system-services/*.service; do
+      substituteInPlace $i --replace /bin/false ${coreutils}/bin/false
+    done
 
-      rm $lib/lib/*.la
+    rm -rf $out/etc/rpm
 
-      # "kernel-install" shouldn't be used on NixOS.
-      find $out -name "*kernel-install*" -exec rm {} \;
+    # "kernel-install" shouldn't be used on NixOS.
+    find $out -name "*kernel-install*" -exec rm {} \;
 
-      # Keep only libudev and libsystemd in the lib output.
-      mkdir -p $out/lib
-      mv $lib/lib/security $lib/lib/libnss* $out/lib/
-    ''; # */
+    # Keep only libudev and libsystemd in the lib output.
+    mkdir -p $out/lib
+    mv $lib/lib/security $lib/lib/libnss* $out/lib/
+  ''; # */
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 6ec8abdc1760f3529469af3203966c00cf9ba679..b516cfe65eddd5178f7dc14365359aac4210ffbc 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, withoutInitTools ? false }:
 
-let version = "2.88dsf"; in
+let version = "2.89"; in
 
 stdenv.mkDerivation {
   name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version;
 
   src = fetchurl {
     url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.bz2";
-    sha256 = "068mvzaz808a673zigyaqb63xc8bndh2klk16zi5c83rw70wifv0";
+    sha256 = "0rdw5lgg2rpcfdmq90br388qr01w89vsqmpvrqcqjqsmxk9zw3c2";
   };
 
   prePatch = ''
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3189872ca3bca50a477a7fc9636efe5403daa744
--- /dev/null
+++ b/pkgs/os-specific/linux/thunderbolt/default.nix
@@ -0,0 +1,39 @@
+{ stdenv
+, boost
+, cmake
+, fetchFromGitHub
+, pkgconfig
+, txt2tags
+}:
+
+stdenv.mkDerivation rec {
+  name = "thunderbolt-${version}";
+  version = "0.9.2";
+  src = fetchFromGitHub {
+    owner = "01org";
+    repo = "thunderbolt-software-user-space";
+    rev = "1ae06410180320a5d0e7408a8d1a6ae2aa443c23";
+    sha256 = "03yk419gj0767lpk6zvla4jx3nx56zsg4x4adl4nd50xhn409rcc";
+  };
+
+  buildInputs = [
+    boost
+    cmake
+    pkgconfig
+    txt2tags
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE='Release'"
+    "-DUDEV_BIN_DIR=$out/bin"
+    "-DUDEV_RULES_DIR=$out/udev"
+  ];
+
+  meta = {
+    description = "Thunderbolt(TM) user-space components";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.ryantrinkle ];
+    homepage = https://01.org/thunderbolt-sw;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..01c84a1d1faa147803f1368a491d7614e8b587bd
--- /dev/null
+++ b/pkgs/os-specific/linux/tmon/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, kernel, ncurses }:
+
+stdenv.mkDerivation {
+  name = "tmon-${kernel.version}";
+
+  inherit (kernel) src;
+
+  buildInputs = [ ncurses ];
+
+  configurePhase = ''
+    cd tools/thermal/tmon
+  '';
+
+  makeFlags = kernel.makeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Monitoring and Testing Tool for Linux kernel thermal subsystem";
+    homepage = https://www.kernel.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index 2ef5d53b0665611b594898f10928e1a6614b6e49..a43c53e02bbdf164c1e3441343e6191a1a5d71d6 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tomb-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner  = "dyne";
     repo   = "Tomb";
     rev    = "v${version}";
-    sha256 = "192jpgn02mvi4d4inbq2q11zl7xw6njymvali7al8wmygkkycrw4";
+    sha256 = "1wk1aanzfln88min29p5av2j8gd8vj5afbs2gvarv7lvx1vi7kh1";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index 4fc14a04eeabf6dea94f29b94b9a1064788ad5a5..25eeb889cc28c097f514c2c1fa70ef2a453962e5 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -3,16 +3,18 @@
 
 stdenv.mkDerivation rec {
   name = "tp_smapi-${version}-${kernel.version}";
-  version = "0.42";
+  version = "0.43";
 
   src = fetchFromGitHub {
     owner = "evgeni";
     repo = "tp_smapi";
     rev = "tp-smapi/${version}";
-    sha256 = "12lnig90lrmkmqwl386q7ssqs9p0jikqhwl2wsmcmii1gn92hzfy";
+    sha256 = "1rjb0njckczc2mj05cagvj0lkyvmyk6bw7wkiinv81lw8m90g77g";
     name = "tp-smapi-${version}";
   };
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   hardeningDisable = [ "pic" ];
 
   makeFlags = [
@@ -37,11 +39,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "IBM ThinkPad hardware functions driver";
-    homepage = https://github.com/evgeni/tp_smapi/tree/tp-smapi/0.41;
+    homepage = https://github.com/evgeni/tp_smapi;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     # driver is only ment for linux thinkpads i think  bellow platforms should cover it.
     platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
-
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
index 48f6ce4be7656e3d7d98109f15f352f9812d4d6c..4c3a92cd87e64fea3d7b3e3eb5196f47ea3f6f08 100644
--- a/pkgs/os-specific/linux/trinity/default.nix
+++ b/pkgs/os-specific/linux/trinity/default.nix
@@ -2,15 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "trinity-${version}";
-  version = "1.8";
+  version = "1.8-git-2017-02-13";
 
   src = fetchFromGitHub {
     owner = "kernelslacker";
     repo = "trinity";
-    rev = "v${version}";
-    sha256 = "1ss6ir3ki2hnj4c8068v5bz8bpa43xqg9zlmzhgagi94g9l05qlf";
+    rev = "2989c11ce77bc7bec23da62987e2c3a0dd8a83c9";
+    sha256 = "19asyrypjhx2cgjdmwfvmgc0hk3xg00zvgkl89vwxngdb40bkwfq";
   };
 
+  # Fails on 32-bit otherwise
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
   postPatch = ''
     patchShebangs ./configure
     patchShebangs ./scripts/
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 81c8b7b4df7ac5e08765730fbb2f874a26ecea10..c4d2bf04d7a0094ed618e23525ab0ac06a8a1f6f 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     ${if cross != null then stdenv.lib.attrByPath [ "uclibc" "extraConfig" ] "" cross else ""}
     $extraCrossConfig
     EOF
-    make oldconfig
+    ( set +o pipefail; yes "" | make oldconfig )
   '';
 
   hardeningDisable = [ "stackprotector" ];
@@ -88,7 +88,9 @@ stdenv.mkDerivation {
 
   buildInputs = stdenv.lib.optional (gccCross != null) gccCross;
 
-  enableParallelBuilding = true;
+  # `make libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrwlock.h`:
+  # error: bits/sysnum.h: No such file or directory
+  enableParallelBuilding = false;
 
   installPhase = ''
     mkdir -p $out
@@ -103,11 +105,11 @@ stdenv.mkDerivation {
     libiconv = libiconvReal;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.uclibc.org/;
     description = "A small implementation of the C library";
-    maintainers = with stdenv.lib.maintainers; [ rasendubi ];
-    license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ rasendubi ];
+    license = licenses.lgpl2;
+    platforms = subtractLists ["aarch64-linux"] platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix
index 8b3ebd46c325aaeade550fa11dc72eb92f55414f..56e237a9fad02cb6c5c222d08782038d1f875120 100644
--- a/pkgs/os-specific/linux/udisks-glue/default.nix
+++ b/pkgs/os-specific/linux/udisks-glue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks, dbus_glib, glib, confuse }:
+{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, confuse }:
 
 stdenv.mkDerivation {
   name = "udisks-glue-1.3.5";
@@ -8,8 +8,8 @@ stdenv.mkDerivation {
     sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ automake autoconf udisks dbus_glib glib confuse ];
+  nativeBuildInputs = [ pkgconfig automake autoconf ];
+  buildInputs = [ udisks1 dbus-glib glib confuse ];
 
   preConfigure = "sh autogen.sh";
 
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index 98cb616e2d5c400f3199da2e002db42b405f038c..aeb9deac89d20a61bcc26f62070996cafcc7d16c 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib
+{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib
 , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
 , libxslt, docbook_xsl, utillinux, libgudev }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     '';
 
   buildInputs =
-    [ sg3_utils udev glib dbus dbus_glib polkit parted libgudev
+    [ sg3_utils udev glib dbus dbus-glib polkit parted libgudev
       lvm2 libatasmart intltool libuuid libxslt docbook_xsl
     ];
 
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index a265395f96e56b82aa15f6cddf5ed1c7e8b81f2c..1c8e429c9455d541dbf08760e035096d25b4b531 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnused
 , expat, acl, systemd, glib, libatasmart, polkit
 , libxslt, docbook_xsl, utillinux, mdadm, libgudev
+, gobjectIntrospection
 }:
 
 stdenv.mkDerivation rec {
-  name = "udisks-2.1.6";
+  name = "udisks-2.1.8";
 
   src = fetchurl {
     url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2";
-    sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify";
+    sha256 = "1nkxhnqh39c9pzvm4zfj50rgv6apqawdx09bv3sfaxrah4a6jhfs";
   };
 
-  outputs = [ "out" "man" ];
+  outputs = [ "out" "man" "dev" ];
 
   patches = [ ./force-path.patch ];
 
@@ -26,9 +27,13 @@ stdenv.mkDerivation rec {
         --replace "/bin/sh" "${stdenv.shell}" \
         --replace "/sbin/mdadm" "${mdadm}/bin/mdadm" \
         --replace " sed " " ${gnused}/bin/sed "
-    '';
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+      substituteInPlace udisks/udisksclient.c \
+        --replace 'defined( __GNUC_PREREQ)' 1 \
+        --replace '__GNUC_PREREQ(4,6)' 1
+  '';
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
 
   buildInputs = [ libxslt docbook_xsl libgudev expat acl systemd glib libatasmart polkit ];
 
@@ -38,6 +43,11 @@ stdenv.mkDerivation rec {
     "--with-udevdir=$(out)/lib/udev"
   ];
 
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0"
+    "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+  ];
+
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/udisks;
     description = "A daemon and command-line utility for querying and manipulating storage devices";
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 490df3e1abe2f4672ce8bef479f37b59e5df6957..713ef974f9fba109d1197906cf3fe84e95b6bba8 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus_glib
+{ stdenv, fetchurl, pkgconfig, glib, dbus-glib
 , intltool, libxslt, docbook_xsl, udev, libgudev, libusb1
 , useSystemd ? true, systemd, gobjectIntrospection
 }:
@@ -6,15 +6,15 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "upower-0.99.4";
+  name = "upower-0.99.7";
 
   src = fetchurl {
-    url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1c1ph1j1fnrf3vipxb7ncmdfc36dpvcvpsv8n8lmal7grjk2b8ww";
+    url = "https://upower.freedesktop.org/releases/${name}.tar.xz";
+    sha256 = "00d4830yvg84brdhz4kn60lr3r8rn2y8gdbhmhxm78i5mgvc5g14";
   };
 
   buildInputs =
-    [ dbus_glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ]
+    [ dbus-glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ]
     ++ stdenv.lib.optional useSystemd systemd;
 
   nativeBuildInputs = [ pkgconfig ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   installFlags = "historydir=$(TMPDIR)/foo";
 
   meta = {
-    homepage = http://upower.freedesktop.org/;
+    homepage = https://upower.freedesktop.org/;
     description = "A D-Bus service for power management";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch b/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch
deleted file mode 100644
index eb4d5df698accd1492a19b1ee072525301c5b831..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Library/ConfigFilePrivate.cpp b/src/Library/ConfigFilePrivate.cpp
-index 8aefa65..40914f7 100644
---- a/src/Library/ConfigFilePrivate.cpp
-+++ b/src/Library/ConfigFilePrivate.cpp
-@@ -51,7 +51,7 @@ namespace usbguard
- 
-   void ConfigFilePrivate::open(const std::string& path)
-   {
--    _stream.open(path, std::ios::in|std::ios::out);
-+    _stream.open(path, std::ios::in);
-     if (!_stream.is_open()) {
-       throw std::runtime_error("Can't open " + path);
-     }
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix
index b88d96e02a44dceeef5a5aea410fe77889ba49e2..2ca825a27d71e95a2bb681448ce208e75af42080 100644
--- a/pkgs/os-specific/linux/usbguard/default.nix
+++ b/pkgs/os-specific/linux/usbguard/default.nix
@@ -1,7 +1,8 @@
 {
   stdenv, fetchurl, lib,
-  libxslt, pandoc, pkgconfig,
-  dbus_glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg,
+  libxslt, pandoc, asciidoctor, pkgconfig,
+  dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg,
+  audit,
   libgcrypt ? null,
   libsodium ? null
 }:
@@ -11,34 +12,31 @@ with stdenv.lib;
 assert libgcrypt != null -> libsodium == null;
 
 stdenv.mkDerivation rec {
-  version = "0.7.0";
+  version = "0.7.2";
   name = "usbguard-${version}";
 
-  repo = "https://github.com/dkopecek/usbguard";
+  repo = "https://github.com/USBGuard/usbguard";
 
   src = fetchurl {
     url = "${repo}/releases/download/${name}/${name}.tar.gz";
-    sha256 = "1e1485a2b47ba3bde9de2851b371d2552a807047a21e0b81553cf80d7f722709";
+    sha256 = "5bd3e5219c590c3ae27b21315bd10b60e823cef64e5deff3305ff5b4087fc2d6";
   };
 
-  patches = [
-    ./daemon_read_only_config.patch
-    ./documentation.patch
-  ];
-
   nativeBuildInputs = [
     libxslt
+    asciidoctor
     pandoc # for rendering documentation
     pkgconfig
   ];
 
   buildInputs = [
-    dbus_glib
+    dbus-glib
     libcap_ng
     libqb
     libseccomp
     polkit
     protobuf
+    audit
 
     qtbase
     qtsvg
@@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The USBGuard software framework helps to protect your computer against BadUSB.";
-    homepage = "https://dkopecek.github.io/usbguard/";
+    homepage = "https://usbguard.github.io/";
     license = licenses.gpl2;
     maintainers = [ maintainers.tnias ];
   };
diff --git a/pkgs/os-specific/linux/usbguard/documentation.patch b/pkgs/os-specific/linux/usbguard/documentation.patch
deleted file mode 100644
index 89de627131f5c90f59b8406e9c575e38f7c81790..0000000000000000000000000000000000000000
--- a/pkgs/os-specific/linux/usbguard/documentation.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/doc/usbguard-daemon.conf.5.md b/doc/usbguard-daemon.conf.5.md
-index ea86ad1..63aec70 100644
---- a/doc/usbguard-daemon.conf.5.md
-+++ b/doc/usbguard-daemon.conf.5.md
-@@ -30,21 +30,21 @@ The **usbguard-daemon.conf** file is loaded by the USBGuard daemon after it pars
- **RestoreControllerDeviceState**=<*boolean*>
- :   The USBGuard daemon modifies some attributes of controller devices like the default authorization state of new child device instances. Using this setting, you can control whether the daemon will try to restore the attribute values to the state before modification on shutdown.
- 
-+**DeviceManagerBackend**=<*backend*>
-+:   Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`.
-+
- **IPCAllowedUsers**=<*username*> [<*username*> ...]
- :   A space delimited list of usernames that the daemon will accept IPC connections from.
- 
- **IPCAllowedGroups**=<*groupname*> [<*groupname*> ...]
- :   A space delimited list of groupnames that the daemon will accept IPC connections from.
- 
--**IPCAccessControlFiles**=<*path*>
--:   Path to a directory holding the IPC access control files.
--
--**DeviceManagerBackend**=<*backend*>
--:   Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`.
--
- **IPCAccessControlFiles**=<*path*>
- :   The files at this location will be interpreted by the daemon as IPC access control definition files. See the **IPC ACCESS CONTROL** section for more details.
- 
-+**DeviceRulesWithPort**=<*boolean*>
-+:   Generate device specific rules including the "via-port" attribute.
-+
- **AuditFilePath**=<*filepath*>
- :   USBGuard audit events log file path.
- 
diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..497b5c191669d78af265dea149d039ec17a9aba9
--- /dev/null
+++ b/pkgs/os-specific/linux/usbip/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, kernel, udev, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "usbip-${kernel.name}";
+
+  src = kernel.src;
+
+  nativeBuildInputs = [ autoconf automake libtool ];
+  buildInputs = [ udev ];
+
+  preConfigure = ''
+    cd tools/usb/usbip
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/torvalds/linux/tree/master/tools/usb/usbip;
+    description = "allows to pass USB device from server to client over the network";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 303d6bcdaa6260e73a6867414e34009a0e22c43b..31e4a3dd26f65ddc2da09b7a7a0d3518b6f3b72a 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1, hwdata }:
 
 stdenv.mkDerivation rec {
-  name = "usbutils-008";
+  name = "usbutils-009";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
-    sha256 = "132clk14j4nm8crln2jymdbbc2vhzar2j2hnxyh05m79pbq1lx24";
+    sha256 = "0q3iavmak2bs9xw486w4xfbjl0hbzii93ssgpr95mxmm9kjz1gwb";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index f54f3ab311a522d5126b7af5220093c898cb2f35..618ba42e7416cdd334f4528eafe5747dd74bd6b1 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -5,14 +5,14 @@ let
   version = lib.concatStringsSep "." ([ majorVersion ]
     ++ lib.optional (patchVersion != "") patchVersion);
   majorVersion = "2.31";
-  patchVersion = "";
+  patchVersion = "1";
 
 in stdenv.mkDerivation rec {
   name = "util-linux-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
-    sha256 = "12nw108xjhm63sh2n5a0qs33vpvbvb6rln96l9j50p7wykf7rgpr";
+    sha256 = "04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s";
   };
 
   patches = [
@@ -30,7 +30,8 @@ in stdenv.mkDerivation rec {
 
   crossAttrs = {
     # Work around use of `AC_RUN_IFELSE'.
-    preConfigure = "export scanf_cv_type_modifier=ms";
+    preConfigure = "export scanf_cv_type_modifier=ms" + lib.optionalString (systemd != null)
+      "\nconfigureFlags+=\" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/\"";
   };
 
   preConfigure = lib.optionalString (systemd != null) ''
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 3adedf8c1dd16e7af6fe2d996497ff12b71d542e..84b31d4d516b5ba210ab420ab0b733b99d90d665 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, pkgconfig, perl
 , libjpeg, udev
 , withUtils ? true
-, withGUI ? true, alsaLib, libX11, qtbase, mesa_glu
+, withGUI ? true, alsaLib, libX11, qtbase, libGLU
 }:
 
 # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT)
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig perl ];
 
-  buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ];
+  buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase libGLU ];
 
   propagatedBuildInputs = [ libjpeg ];
 
diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index 57f4b9ab6747f6173da41708de4cc6b4fa5c26f9..3db2814a0878f77c2d56d7b60932f8a6ff7da40f 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, kernel, kmod }:
+{ stdenv, fetchFromGitHub, kernel, kmod }:
 
 stdenv.mkDerivation rec {
   name = "v4l2loopback-${version}-${kernel.version}";
-  version = "0.9.1";
+  version = "0.11.0";
 
-  src = fetchurl {
-    url = "https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz";
-    sha256 = "1crkhxlnskqrfj3f7jmiiyi5m75zmj7n0s26xz07wcwdzdf2p568";
+  src = fetchFromGitHub {
+    owner = "umlaeute";
+    repo = "v4l2loopback";
+    rev = "v${version}";
+    sha256 = "1wb5qmy13w8rl4279bwp69s4sb1x5hk5d2n563p1yk8yi567p2az";
   };
 
   hardeningDisable = [ "format" "pic" ];
@@ -17,6 +19,7 @@ stdenv.mkDerivation rec {
     export PATH=${kmod}/sbin:$PATH
   '';
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
   buildInputs = [ kmod ];
 
   makeFlags = [
diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix
index 5bec71a109077f2219298a1a60036dcd0dcaeec8..72d7690d2f8a7d6632d38eee492859192a46b36d 100644
--- a/pkgs/os-specific/linux/virtualbox/default.nix
+++ b/pkgs/os-specific/linux/virtualbox/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation {
     "fortify" "pic" "stackprotector"
   ];
 
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
   patches = [
     ./fix_kerndir.patch
     ./fix_kbuild.patch
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index e1decf1d13d162d5f6e811cdd312555ef08bb5a7..b88646424be54209d7cd9dfd003340b4dd8e36e4 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20171111";
+  version = "0.0.20180413";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0mqix3v4qqwwa7hcd0h5rcwhc7yvm9jcl8b3v1vc4sj0m637fd6r";
+    sha256 = "0lbjx62ihc8prqfhvmi0v1xq1q3ayzj5rfy2p5149nr9qx3z37j1";
   };
 
   meta = with stdenv.lib; {
@@ -37,6 +37,8 @@ let
 
     NIX_CFLAGS = ["-Wno-error=cpp"];
 
+    nativeBuildInputs = kernel.moduleBuildDependencies;
+
     buildPhase = "make module";
   };
 
diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/os-specific/linux/wireless-tools/default.nix
index f5a51a4e096d32382f052266afbe9ee09492c6db..f883bf0d226220b789d4b7bf1820f1366dbd64fe 100644
--- a/pkgs/os-specific/linux/wireless-tools/default.nix
+++ b/pkgs/os-specific/linux/wireless-tools/default.nix
@@ -1,18 +1,20 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "wireless-tools-29";
+stdenv.mkDerivation rec {
+  name = "wireless-tools-${version}";
+  version = "30.pre2";
 
   src = fetchurl {
-    url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz;
-    sha256 = "18g5wa3rih89i776nc2n2s50gcds4611gi723h9ki190zqshkf3g";
+    url = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${version}.tar.gz";
+    sha256 = "01lgf592nk8fnk7l5afqvar4szkngwpgcv4xh58qsg9wkkjlhnls";
   };
 
   preBuild = "
-    makeFlagsArray=(PREFIX=$out)
+    makeFlagsArray=(PREFIX=$out CC=$CC LDCONFIG=: AR=$AR RANLIB=$RANLIB)
   ";
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 2ebb2b1890d5756bacf65f81d94ec682394fcd51..b5937dff375252fe811c1bebac2a1fadce07bf30 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "xf86-input-wacom-0.35.0";
+  name = "xf86-input-wacom-0.36.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = "0za44snc0zirq65a4lxsmg7blp1bynj6j835hm459x8yx1qhmxjm";
+    sha256 = "1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza";
   };
 
   buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender
diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix
index 8d3e490db87cfe0da406fa0ede8b19eaccc7b8ea..54d164737705c08fbb1ce00e829a55da7adc360d 100644
--- a/pkgs/os-specific/linux/xf86-video-nested/default.nix
+++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   CFLAGS = "-I${pixman}/include/pixman-1";
 
   meta = {
-    homepage = http://cgit.freedesktop.org/xorg/driver/xf86-video-nested;
+    homepage = https://cgit.freedesktop.org/xorg/driver/xf86-video-nested;
     description = "A driver to run Xorg on top of Xorg or something else";
     maintainers = [ stdenv.lib.maintainers.goibhniu ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index e932f5163750f8947a84887722feb48fcd86317f..a467b457f23662e6fafa9a6880b57e7c12a3dd1f 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch
+{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
+, perl, fetchpatch
 , configFile ? "all"
 
 # Userspace dependencies
 , zlib, libuuid, python, attr, openssl
+, libtirpc
+, nfs-utils
 
 # Kernel dependencies
-, kernel ? null, spl ? null, splUnstable ? null
+, kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null
 }:
 
 with stdenv.lib;
@@ -19,13 +22,14 @@ let
     , spl
     , rev ? "zfs-${version}"
     , isUnstable ? false
+    , isLegacyCrypto ? false
     , incompatibleKernelVersion ? null } @ args:
     if buildKernel &&
       (incompatibleKernelVersion != null) &&
         versionAtLeast kernel.version incompatibleKernelVersion then
        throw ''
          Linux v${kernel.version} is not yet supported by zfsonlinux v${version}.
-         ${stdenv.lib.optional (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
+         ${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
        ''
     else stdenv.mkDerivation rec {
       name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
@@ -38,11 +42,20 @@ let
 
       patches = extraPatches;
 
-      nativeBuildInputs = [ autoreconfHook nukeReferences ];
+      postPatch = optionalString buildKernel ''
+        patchShebangs scripts
+      '' + optionalString stdenv.hostPlatform.isMusl ''
+        substituteInPlace config/user-libtirpc.m4 \
+          --replace /usr/include/tirpc ${libtirpc}/include/tirpc
+      '';
+
+      nativeBuildInputs = [ autoreconfHook nukeReferences ]
+         ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]);
       buildInputs =
            optionals buildKernel [ spl ]
         ++ optionals buildUser [ zlib libuuid python attr ]
-        ++ optionals (buildUser && isUnstable) [ openssl ];
+        ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ]
+        ++ optional stdenv.hostPlatform.isMusl [ libtirpc ];
 
       # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
       NIX_CFLAGS_LINK = "-lgcc_s";
@@ -54,6 +67,7 @@ let
         substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"
         substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"
         substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"
+        substituteInPlace ./lib/libshare/nfs.c        --replace "/usr/sbin/exportfs"      "${nfs-utils}/bin/exportfs"
         substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"
         substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"
         substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
@@ -70,6 +84,7 @@ let
         done
 
         ./autogen.sh
+        configureFlagsArray+=("--libexecdir=$out/libexec")
       '';
 
       configureFlags = [
@@ -79,6 +94,7 @@ let
         "--with-udevdir=$(out)/lib/udev"
         "--with-systemdunitdir=$(out)/etc/systemd/system"
         "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
+        "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator"
         "--with-mounthelperdir=$(out)/bin"
         "--sysconfdir=/etc"
         "--localstatedir=/var"
@@ -125,7 +141,7 @@ let
           Copy-On-Write filesystem with data integrity detection and repair,
           snapshotting, cloning, block devices, deduplication, and more.
         '';
-        home = http://zfsonlinux.org/;
+        homepage = http://zfsonlinux.org/;
         license = licenses.cddl;
         platforms = platforms.linux;
         maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
@@ -140,9 +156,9 @@ in {
     incompatibleKernelVersion = null;
 
     # this package should point to the latest release.
-    version = "0.7.3";
+    version = "0.7.8";
 
-    sha256 = "1bbajrwfilnmfhn1n69gvsaznyc4q29wi7nkwc0p9r4dli37w28b";
+    sha256 = "0m7j5cpz81lqcfbh4w3wvqjjka07wickl27klgy1zplv6vr0baix";
 
     extraPatches = [
       (fetchpatch {
@@ -154,24 +170,48 @@ in {
     inherit spl;
   };
 
-  zfsUnstable = common {
+  zfsUnstable = common rec {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = null;
+    incompatibleKernelVersion = "4.16";
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2017-11-16";
+    version = "2018-04-10";
 
-    rev = "d4a72f23863382bdf6d0ae33196f5b5decbc48fd";
-    sha256 = "0q2gkkj11hy8m8cjd70g99bs69ldxvc17ym0x1pgwvs4722hzpha";
+    rev = "74df0c5e251a920a1966a011c16f960cd7ba562e";
+    sha256 = "1x3mipj3ryznnd7kx84r3n607hv6jqs66mb61g3zcdmvk6al4yq4";
     isUnstable = true;
 
     extraPatches = [
       (fetchpatch {
-        url = "https://github.com/Mic92/zfs/compare/ded8f06a3cfee...nixos-zfs-2017-09-12.patch";
-        sha256 = "033wf4jn0h0kp0h47ai98rywnkv5jwvf3xwym30phnaf8xxdx8aj";
+        url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-02-02.patch";
+        sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch";
       })
     ];
 
     spl = splUnstable;
   };
+
+  # TODO: Remove this module before 18.09
+  # also remove boot.zfs.enableLegacyCrypto
+  zfsLegacyCrypto = common {
+    # comment/uncomment if breaking kernel versions are known
+    incompatibleKernelVersion = "4.16";
+
+    # this package should point to a version / git revision compatible with the latest kernel release
+    version = "2018-02-01";
+
+    rev = "4c46b99d24a6e71b3c72462c11cb051d0930ad60";
+    sha256 = "011lcp2x44jgfzqqk2gjmyii1v7rxcprggv20prxa3c552drsx3c";
+    isUnstable = true;
+
+    extraPatches = [
+      (fetchpatch {
+        url = "https://github.com/Mic92/zfs/compare/4c46b99d24a6e71b3c72462c11cb051d0930ad60...nixos-zfs-2018-02-01.patch";
+        sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch";
+      })
+    ];
+
+    spl = splLegacyCrypto;
+  };
+
 }
diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix
index b2b23f2004558addad1da93210b17768dde49dff..8befa51566decfb6d1965495e214aa549f465a81 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.cc.prefix}windres";
+    # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}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
index ece2586dc8066be7ad2ee66afc3ca46718d2f9c9..102d9489fe9ff320f125b7b82de709c95c616ccf 100644
--- a/pkgs/os-specific/windows/mingw-w64/common.nix
+++ b/pkgs/os-specific/windows/mingw-w64/common.nix
@@ -1,11 +1,16 @@
 { fetchurl }:
 
 rec {
-  version = "4.0.6";
+  version = "5.0.3";
   name = "mingw-w64-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
-    sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c";
+    sha256 = "1d4wrjfdlq5xqpv9zg6ssw4lm8jnv6522xf7d6zbjygmkswisq1a";
   };
+
+  configureFlags = [
+    "--enable-idl"
+    "--enable-secure-api"
+  ];
 }
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index 6e21826381b6d64d91cabc6f1d32243e2908961b..53050435256fbcd361e20879e48d936526d6eefb 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -4,4 +4,5 @@ stdenv.mkDerivation {
   inherit (callPackage ./common.nix {}) name src;
   buildInputs = [ windows.mingw_w64_headers ];
   dontStrip = true;
+  hardeningDisable = [ "stackprotector" "fortify" ];
 }
diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix
index c585ab54ff89b691c5fd8a09558233ba63e9a3b2..1a33e8db07e8198147997a1faad49644a3bded71 100644
--- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix
+++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix
@@ -1,9 +1,9 @@
-{ stdenvNoCC, callPackage }:
+{ stdenv, callPackage }:
 
 let
   inherit (callPackage ./common.nix {}) name src;
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   name = name + "-pthreads";
   inherit src;
 
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index 6c256d14fe783e2eee7a3467e4b19503a87ea6bb..a838fa3b904c43b1c197a85085366647663076a7 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -1,33 +1,53 @@
-{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby }:
+{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }:
 
-stdenv.mkDerivation rec {
+let
   name = "qpid-cpp-${version}";
-
-  version = "0.34";
+  version = "1.37.0";
 
   src = fetchurl {
     url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz";
-    sha256 = "07ibwvw5lm7xabv32zai5x03r7l9mxm0zk7h9lbfkzmav0f41w0w";
+    sha256 = "1s4hyi867i0lqn81c1crrk6fga1gmsv61675vjv5v41skz56lrsb";
   };
 
-  buildInputs = [ cmake python2 boost libuuid ruby ];
-
-  # the subdir managementgen wants to install python stuff in ${python} and
-  # the installation tries to create some folders in /var
-  patchPhase = ''
-    sed -i '/managementgen/d' CMakeLists.txt
-    sed -i '/ENV/d' src/CMakeLists.txt
-  '';
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=unused-function";
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://qpid.apache.org;
     repositories.git = git://git.apache.org/qpid.git;
     repositories.svn = http://svn.apache.org/repos/asf/qpid;
     description = "An AMQP message broker and a C++ messaging API";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.cpages ];
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cpages ma27 ];
+  };
+
+  qpid-cpp = stdenv.mkDerivation {
+    inherit src meta name;
+
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ boost libuuid ruby python2 ];
+
+    # the subdir managementgen wants to install python stuff in ${python} and
+    # the installation tries to create some folders in /var
+    postPatch = ''
+      sed -i '/managementgen/d' CMakeLists.txt
+      sed -i '/ENV/d' src/CMakeLists.txt
+      sed -i '/management/d' CMakeLists.txt
+    '';
+
+    NIX_CFLAGS_COMPILE = [
+      "-Wno-error=deprecated-declarations"
+      "-Wno-error=unused-function"
+      "-Wno-error=int-in-bool-context"
+    ];
+  };
+
+  python-frontend = buildPythonPackage {
+    inherit name meta src;
+
+    sourceRoot = "${name}/management/python";
+
+    propagatedBuildInputs = [ qpid-python ];
   };
+in buildEnv {
+  name = "${name}-env";
+  paths = [ qpid-cpp python-frontend ];
 }
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 889ec4d3745f2ee65e0e7733399ad7609b2f9fee..3d4a8902c918b117a0ce7c6069e5dcb8b3cffba7 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,40 +1,73 @@
-{ stdenv, fetchurl, erlang, python, libxml2, libxslt, xmlto
+{ stdenv, fetchurl, runCommand
+, erlang, python, libxml2, libxslt, xmlto
 , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync
 
 , AppKit, Carbon, Cocoa
 }:
 
-stdenv.mkDerivation rec {
-  name = "rabbitmq-server-${version}";
+let
+  # we only need that one glibc binary (28k instead of 2.7M)
+  getconf = runCommand "getconf" {} ''
+    install -D ${stdenv.lib.getBin stdenv.cc.libc}/bin/getconf $out/bin/getconf
+  '';
 
-  version = "3.6.10";
+in stdenv.mkDerivation rec {
+  name = "rabbitmq-server-${version}";
+  version = "3.6.15";
 
   src = fetchurl {
     url = "https://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.xz";
-    sha256 = "0k1rhg1a51201b1hp6vaf4fk48hqz7m9hw55b8xnnyz2ld88jiqg";
+    sha256 = "1zdmil657mhjmd20jv47s5dfpj2liqwvyg0zv2ky3akanfpgj98y";
   };
 
   buildInputs =
     [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
 
-  preBuild =
-    ''
-      # Fix the "/usr/bin/env" in "calculate-relative".
-      patchShebangs .
-    '';
+  outputs = [ "out" "man" "doc" ];
+
+  postPatch = with stdenv.lib; ''
+    # patch the path to getconf
+    substituteInPlace deps/rabbit_common/src/vm_memory_monitor.erl \
+      --replace "getconf PAGESIZE" "${getconf}/bin/getconf PAGESIZE"
+  '';
+
+  preBuild = ''
+    # Fix the "/usr/bin/env" in "calculate-relative".
+    patchShebangs .
+  '';
 
   installFlags = "PREFIX=$(out) RMQ_ERLAPP_DIR=$(out)";
   installTargets = "install install-man";
 
-  postInstall =
-    ''
-      echo 'PATH=${erlang}/bin:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env
+  postInstall = ''
+    echo 'PATH=${erlang}/bin:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env
+
+    # we know exactly where rabbitmq is gonna be,
+    # so we patch that into the env-script
+    substituteInPlace $out/sbin/rabbitmq-env \
+      --replace 'RABBITMQ_SCRIPTS_DIR=`dirname $SCRIPT_PATH`' \
+                "RABBITMQ_SCRIPTS_DIR=$out/sbin"
+
+    # there’s a few stray files that belong into share
+    mkdir -p $doc/share/doc/rabbitmq-server
+    mv $out/LICENSE* $doc/share/doc/rabbitmq-server
+
+    # and an unecessarily copied INSTALL file
+    rm $out/INSTALL
+
+    # patched into a source file above;
+    # needs to be explicitely passed to not be stripped by fixup
+    mkdir -p $out/nix-support
+    echo "${getconf}" > $out/nix-support/dont-strip-getconf
+
     '';
 
   meta = {
     homepage = http://www.rabbitmq.com/;
     description = "An implementation of the AMQP messaging protocol";
+    license = stdenv.lib.licenses.mpl11;
     platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
   };
 }
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 3b67171a474efccf000e4bdd4273d0a04ae54314..bec61d460a7a9c0509685203537e5b49a0a28373 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, nettools, man
+{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, wall, hostname, man
 , enableCgiScripts ? true, gd
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   # There is no real reason for a bin/sbin split, so just use bin.
   preConfigure = ''
     export ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown
-    export ac_cv_path_WALL=${utillinux}/bin/wall
+    export ac_cv_path_WALL=${wall}/bin/wall
     sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure
     export configureFlags="\
         --bindir=$out/bin \
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     for file in "$out"/etc/apcupsd/*; do
-        sed -i -e 's|^WALL=.*|WALL="${utillinux}/bin/wall"|g' \
-               -e 's|^HOSTNAME=.*|HOSTNAME=`${nettools}/bin/hostname`|g' \
+        sed -i -e 's|^WALL=.*|WALL="${wall}/bin/wall"|g' \
+               -e 's|^HOSTNAME=.*|HOSTNAME=`${hostname}/bin/hostname`|g' \
                "$file"
     done
   '';
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index aad2f69bfa6a362691b2504d6dd37d59987eb52a..a5d89b493e8227306c37fa0f56399cd1b01ca6a5 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-confluence-${version}";
-  version = "6.5.0";
+  version = "6.6.1";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
-    sha256 = "1prac65yczrarb38vvlp7srrhd4gb1zi5v88myfkp6rhwfrdxd0n";
+    sha256 = "0nb8rjzfd0fqd9k1yxa3dj7kxgh84dgbg9l8jyj59g74ym77qmw0";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];
diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index b99cf57e08bd336bb3974422d6730893c1d3507e..fd34c1f4385945e3fa62d9d6251639f411b686f5 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "7.5.2";
+  version = "7.9.0";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "00x00q6k4sb89aipqd28lgn8l7k7w33dpg18r1dn6l7rws1mazfx";
+    sha256 = "1xj04a78dhjzb2ms875lfg5s3qc8rw31fws92yhmbs0k1866g33b";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 0e77aa1d8ee7d3996571943c9444d0318ed508fb..94bd92abb4f876b41b4f7e01ebd5731e5af2052e 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -1,29 +1,54 @@
-{ stdenv, fetchurl, flex, bison, readline
-, enableIPv6 ? false }:
+{ lib, stdenv, fetchurl, flex, bison, readline }:
 
-stdenv.mkDerivation rec {
-  name = "bird-1.6.3";
+with lib;
 
-  src = fetchurl {
-    url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
-    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
-  };
+let
+
+  generic = { version, sha256, enableIPv6 ? false }:
+    stdenv.mkDerivation rec {
+      name = "bird-${version}";
+
+      src = fetchurl {
+        inherit sha256;
+        url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
+      };
+
+      nativeBuildInputs = [ flex bison ];
+      buildInputs = [ readline ];
+
+      patches = [
+        (./. + (builtins.toPath "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch"))
+      ];
 
-  buildInputs = [ flex bison readline ];
+      configureFlags = [
+        "--localstatedir=/var"
+      ] ++ optional enableIPv6 "--enable-ipv6";
 
-  patches = [
-    ./dont-create-sysconfdir.patch
-  ];
+      meta = {
+        description = "BIRD Internet Routing Daemon";
+        homepage = http://bird.network.cz;
+        license = licenses.gpl2Plus;
+        maintainers = with maintainers; [ viric fpletz ];
+        platforms = platforms.linux;
+      };
+    };
 
-  configureFlags = [
-    "--localstatedir /var"
-  ] ++ stdenv.lib.optional enableIPv6 "--enable-ipv6";
+in
+
+{
+  bird = generic {
+    version = "1.6.3";
+    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
+  };
+
+  bird6 = generic {
+    version = "1.6.3";
+    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
+    enableIPv6 = true;
+  };
 
-  meta = {
-    description = "BIRD Internet Routing Daemon";
-    homepage = http://bird.network.cz;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
-    platforms  = stdenv.lib.platforms.linux;
+  bird2 = generic {
+    version = "2.0.2";
+    sha256 = "03s8hcl761y3489j1krarm3r3iy5qid26508i91yvy38ypb92pq3";
   };
 }
diff --git a/pkgs/servers/bird/dont-create-sysconfdir.patch b/pkgs/servers/bird/dont-create-sysconfdir-1.patch
similarity index 100%
rename from pkgs/servers/bird/dont-create-sysconfdir.patch
rename to pkgs/servers/bird/dont-create-sysconfdir-1.patch
diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/pkgs/servers/bird/dont-create-sysconfdir-2.patch
new file mode 100644
index 0000000000000000000000000000000000000000..fd86da8a1298c2546ce3a7cae3954c73743999dc
--- /dev/null
+++ b/pkgs/servers/bird/dont-create-sysconfdir-2.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index fdd5e6c..45f81a1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -165,7 +165,7 @@ tags:
+ # Install
+ 
+ install: all
+-	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
++	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)
+ 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
+ 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
+ 	if test -n "@CLIENT@" ; then								\
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index c24780095dbe9ce635eb148f625098f45dcccc15..d89e59d662e71342f6420ae39fa3ea7c2fd94323 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.10.10";
+  version = "0.10.12";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "1x7f1yz5vnsy9n50ak0vjrm4w8fqc1qvhv8fmqnsc8cgbp7f3p8w";
+    sha256 = "0vmgswln72qqay73z39qn135sl5k71zlybr2jdrcjlmp4i7hrf88";
   };
 
   buildFlagsArray = ''
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index cebff700e50a6a360c5b0f0135427a44e3521596..f4a6b47a45a4b6d0a55c7a5a5fa461cf373a5324 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, libtool, boost, double_conversion, gperftools, icu, libmysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zookeeper_mt, zstd }:
+{ stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools
+, icu, mysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC
+, zookeeper_mt, zstd }:
 
 stdenv.mkDerivation rec {
   name = "clickhouse-${version}";
@@ -16,7 +18,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake libtool ];
 
-  buildInputs = [ boost double_conversion gperftools icu libmysql lz4 openssl poco re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd ];
+  buildInputs = [
+    boost double-conversion gperftools icu mysql.connector-c lz4 openssl poco
+    re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd
+  ];
 
   cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ];
 
diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..13fad7059afecf9340c14076d2451a7439b6fed1
--- /dev/null
+++ b/pkgs/servers/computing/slurm-spank-x11/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, slurm } :
+let
+  version = "0.2.5";
+in
+stdenv.mkDerivation {
+  name = "slurm-spank-x11-${version}";
+  version = version;
+
+  src = fetchFromGitHub {
+    owner = "hautreux";
+    repo = "slurm-spank-x11";
+    rev = version;
+    sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry";
+  };
+
+  buildPhase = ''
+      gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \
+          -g -o slurm-spank-x11 slurm-spank-x11.c
+      gcc -I${slurm.dev}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \
+          -g -o x11.so slurm-spank-x11-plug.c
+    '';
+
+  installPhase = ''
+      mkdir -p $out/bin $out/lib
+      install -m 755 slurm-spank-x11 $out/bin
+      install -m 755 x11.so $out/lib
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/hautreux/slurm-spank-x11;
+    description = "Plugin for SLURM to allow for interactive X11 sessions";
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ markuskowa ];
+  };
+}
+
+
+
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 69afd479af3030663069afa3cecc693e26a4a5da..b0460f21bfafa6fbe9f531a922677ec805071bcb 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "slurm-${version}";
-  version = "17.02.6";
+  version = "17.11.5";
 
   src = fetchurl {
-    url = "https://www.schedmd.com/downloads/latest/slurm-17.02.6.tar.bz2";
-    sha256 = "1sp4xg15jc569r6dh61svgk2fmy3ndcgr5358yryajslf1w14mzh";
+    url = "https://download.schedmd.com/slurm/${name}.tar.bz2";
+    sha256 = "07ghyyz12k4rksm06xf7dshwp1ndm13zphdbqja99401q4xwbx9r";
   };
 
   outputs = [ "out" "dev" ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
-    curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl
+    curl python munge perl pam openssl mysql.connector-c ncurses gtk2 lua hwloc numactl
   ];
 
   configureFlags =
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
     rm -f $out/lib/*.la $out/lib/slurm/*.la
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://www.schedmd.com/;
     description = "Simple Linux Utility for Resource Management";
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 0219a1bf7ecbf68dc9fa6a41534bc80757e14d14..90c87f8019d09a9eebcd24e2c780ee840ab52427 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "apache-storm-" + version;
-  version = "1.0.1";
+  version = "1.2.1";
   src = fetchurl {
     url =
     "mirror://apache/storm/${name}/${name}.tar.gz";
-    sha256 = "1gr00s0fhf8ci0faf3x5dinkiw9mlnc1x1vqki8cfszvij6w0x0m";
+    sha256 = "177dqgbviagrpvalg8h67mwiwwgmiqsg0hh97hcqqcjg71ypnjkv";
   };
 
   buildInputs = [ zip unzip jzmq ];
@@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
     mv examples $out/share/${name}/.
 
     rm -f lib/jzmq* || exit 1
-    mv lib $out/.
-    mv external extlib* $out/lib/.
+    mv external extlib* lib $out/.
     mv conf bin $out/.
     mv log4j2 $out/conf/.
   '';
diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix
index 9c4bc4bda7361afef5110b10fc9f195e2a10442f..35c830dff8a5d1d77ca855d8f56aed34690055d4 100644
--- a/pkgs/servers/computing/torque/default.nix
+++ b/pkgs/servers/computing/torque/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # added to fix build with gcc7
+  NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
+
   preConfigure = ''
    substituteInPlace ./configure \
      --replace '/usr/bin/file' '${file}/bin/file'
diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix
index dc2f0f6fd7091b1d7f6fc55a8c99abdb8163da99..145052ff8c3ad0e77d53df0042f0e73564d65a31 100644
--- a/pkgs/servers/corosync/default.nix
+++ b/pkgs/servers/corosync/default.nix
@@ -9,11 +9,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "corosync-2.4.2";
+  name = "corosync-2.4.3";
 
   src = fetchurl {
     url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz";
-    sha256 = "1aab380mv4ivy5icmwvk7941jbs6ikm21p5ijk7brr4z608k0vpj";
+    sha256 = "15y5la04qn2lh1gabyifygzpa4dx3ndk5yhmaf7azxyjx0if9rxi";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index 8df584435a2f6f932a57c2b7e2e61517e1d24975..f83ef4cef38816d1897c2a556bf74af9cacc9502 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -4,13 +4,13 @@ let inherit (stdenv.lib) optional; in
 
 stdenv.mkDerivation rec {
   name = "coturn-${version}";
-  version = "4.5.0.6";
+  version = "4.5.0.7";
 
   src = fetchFromGitHub {
     owner = "coturn";
     repo = "coturn";
     rev = "${version}";
-    sha256 = "084c3zgwmmz4s6211i5jbkzsn13703lsg7vhc2cpacazq4sgsrhb";
+    sha256 = "1781fx8lqgc54j973xzgq9d7k3g2j03va82jb4217gd3a93pa65l";
   };
 
   buildInputs = [ openssl libevent ];
diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix
index 044d4fa50ab2cb943b5e26cbb4a461ce77983fb2..ee139ea2652c637df94272c0999e2ff0277611b1 100644
--- a/pkgs/servers/dante/default.nix
+++ b/pkgs/servers/dante/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation (rec {
   name = "dante-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "https://www.inet.no/dante/files/${name}.tar.gz";
-    sha256 = "0lsg3hk8zd2h9f08s13bn4l4pvyyzkj4gr4ppwa7vj7gdyyk5lmn";
+    sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms";
   };
 
   configureFlags = [
diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index c530929f79e454bf2807e0c76e9e08fd8a4f90a1..8958daa1a70a3b16714e6c550b5e3291e0afb72f 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -2,11 +2,11 @@
 , guile, python, pcre, libffi, groff }:
 
 stdenv.mkDerivation rec {
-  name = "dico-2.4";
+  name = "dico-2.5";
 
   src = fetchurl {
     url = "mirror://gnu/dico/${name}.tar.xz";
-    sha256 = "13m7vahfbdj7hb38bjgd4cmfswavvxrcpppj9n4m4rar3wyzg52g";
+    sha256 = "0szm3z4xvq0pjj8kxl4paq63byamf281kzn1la0cdm5ngavypxxq";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index 0e6c39ec92456108661e59eb4786666e1472fe27..6868c0f81664c94db82089c3d0eaf6f3de5a2177 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -13,7 +13,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ bison flex libtool which ];
 
-  enableParallelBuilding = true;
+  # Makefile(.in) contains "clientparse.c clientparse.h: clientparse.y" which
+  # causes bison to run twice, and break the build when this happens in
+  # parallel.  Test with "make -j clientparse.c clientparse.h".  The error
+  # message may be "mv: cannot move 'y.tab.c' to 'clientparse.c'".
+  enableParallelBuilding = false;
 
   patchPhase = "patch -p0 < ${./buildfix.diff}";
   configureFlags = [
@@ -25,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Dict protocol server and client";
     homepage    = http://www.dict.org;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ mornfall ];
+    maintainers = with maintainers; [ ];
     platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix
index 8637d043836b3ceade6fac60f41d5e8439232e65..13e4757fe89e4df406904553bda3fa011a03d501 100644
--- a/pkgs/servers/dict/dictd-wiktionary.nix
+++ b/pkgs/servers/dict/dictd-wiktionary.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "DICT version of English Wiktionary";
     homepage = http://en.wiktionary.org/;
-    maintainers = [ stdenv.lib.maintainers.mornfall ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index b6680e8b21c42884edd8811ad921bef09756d31d..13a78d61098b6688a46ba848a696a0eba9ae9068 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/pkgs/servers/dict/dictd-wordnet.nix
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
          the wordnet data available to dictd and by extension for lookup with
          the dict command. '';
 
-    homepage = http://wordnet.princeton.edu/;
+    homepage = https://wordnet.princeton.edu/;
 
-    maintainers = [ stdenv.lib.maintainers.mornfall ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix
index 833aaa95b0ca8216f7c39c1e7d53e098b41e2114..d35a9a683031c35776345830ec23648537db4ecb 100644
--- a/pkgs/servers/dict/libmaa.nix
+++ b/pkgs/servers/dict/libmaa.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Dict protocol server and client";
-    maintainers = [ maintainers.mornfall ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix
index dcda4e8c0bb44ce9612717e9b562ffe37e3acd44..a233b6ba4cf8e3ced29a7970c19dee1547414206 100644
--- a/pkgs/servers/diod/default.nix
+++ b/pkgs/servers/diod/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "diod-${version}";
-  version = "1.0.23";
+  version = "1.0.24";
 
   src = fetchurl {
     url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz";
-    sha256 = "002vxc9fwdwshda4jydxagr63xd6nnhbc6fh73974gi2pvp6gid3";
+    sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl";
   };
 
   buildInputs = [ munge lua libcap perl ncurses ];
diff --git a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch
index b7e7bfc73bf9a81f56c1fbb408fa825328b559b9..8276c28c3f4b3e6f96cf4dfb1e6b15ff7475a73d 100644
--- a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch
+++ b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch
@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index 6779cc3..4275520 100755
+index b9ad66b..a2a7382 100755
 --- a/configure
 +++ b/configure
-@@ -15707,21 +15707,6 @@ $as_echo "not found" >&6; }
+@@ -16033,21 +16033,6 @@ $as_echo "not found" >&6; }
  			*-hp-hpux*)
  				DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto"
  				;;
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index bf7a7266022e72162857c1c79d02ab78417488fa..86e756a0db37e8d89b05dc950943f5b0456866c5 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,16 +1,17 @@
 { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
-, enableSeccomp ? false, libseccomp ? null }:
+, enableSeccomp ? false, libseccomp ? null, buildPackages
+}:
 
 assert enableSeccomp -> libseccomp != null;
 
-let version = "9.11.2"; in
+let version = "9.12.1"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0yn7wgi2y8mpmvbjbkl4va7p0xsnn48m4yjx6ynb1hzp423asikz";
+    sha256 = "043mjcw405qa0ghm5dkhfsq35gsy279724fz3mjqpr1mbi14dr0n";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
@@ -18,11 +19,14 @@ stdenv.mkDerivation rec {
   patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++
     stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
 
-  buildInputs = [ openssl libtool perl libxml2 ] ++
+  nativeBuildInputs = [ perl ];
+  buildInputs = [ openssl libtool libxml2 ] ++
     stdenv.lib.optional enableSeccomp libseccomp;
 
   STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--with-libtool"
@@ -34,9 +38,15 @@ stdenv.mkDerivation rec {
     "--without-gssapi"
     "--without-idn"
     "--without-idnlib"
+    "--without-lmdb"
     "--without-pkcs11"
     "--without-purify"
     "--without-python"
+    "--with-randomdev=/dev/random"
+    "--with-ecdsa"
+    "--with-gost"
+    "--without-eddsa"
+    "--with-aes"
   ] ++ lib.optional enableSeccomp "--enable-seccomp";
 
   postInstall = ''
@@ -57,7 +67,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.isc.org/software/bind;
     description = "Domain name server";
-    license = stdenv.lib.licenses.isc;
+    license = stdenv.lib.licenses.mpl20;
 
     maintainers = with stdenv.lib.maintainers; [viric peti];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
index 91cae62b171536e4d0db4271683a06a7c91d61c3..5a934056d13d94c132e74981c3c40777dc127281 100644
--- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
+++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
@@ -1,40 +1,41 @@
 diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
-index f354cfb..2aa0cc5 100644
+index 388dc97..3c6135c 100644
 --- a/bin/named/include/named/globals.h
 +++ b/bin/named/include/named/globals.h
-@@ -71,7 +71,9 @@ EXTERN const char *		ns_g_version		INIT(VERSION);
- EXTERN const char *		ns_g_product		INIT(PRODUCT);
- EXTERN const char *		ns_g_description	INIT(DESCRIPTION);
- EXTERN const char *		ns_g_srcid		INIT(SRCID);
+@@ -65,7 +65,9 @@ EXTERN const char *		named_g_version		INIT(VERSION);
+ EXTERN const char *		named_g_product		INIT(PRODUCT);
+ EXTERN const char *		named_g_description	INIT(DESCRIPTION);
+ EXTERN const char *		named_g_srcid		INIT(SRCID);
 +#if 0
- EXTERN const char *		ns_g_configargs		INIT(CONFIGARGS);
+ EXTERN const char *		named_g_configargs	INIT(CONFIGARGS);
 +#endif
- EXTERN const char *		ns_g_builder		INIT(BUILDER);
- EXTERN in_port_t		ns_g_port		INIT(0);
- EXTERN isc_dscp_t		ns_g_dscp		INIT(-1);
+ EXTERN const char *		named_g_builder		INIT(BUILDER);
+ EXTERN in_port_t		named_g_port		INIT(0);
+ EXTERN isc_dscp_t		named_g_dscp		INIT(-1);
 diff --git a/bin/named/main.c b/bin/named/main.c
-index 556db54..edab41d 100644
+index 4fb0566..60d56cd 100644
 --- a/bin/named/main.c
 +++ b/bin/named/main.c
-@@ -636,8 +636,10 @@ parse_command_line(int argc, char *argv[]) {
- 			       (*ns_g_description != '\0') ? " " : "",
- 			       ns_g_description, ns_g_srcid);
- 			printf("running on %s\n", ns_os_uname());
-+#if 0
+@@ -672,8 +672,10 @@ parse_command_line(int argc, char *argv[]) {
+ 			       (*named_g_description != '\0') ? " " : "",
+ 			       named_g_description, named_g_srcid);
+ 			printf("running on %s\n", named_os_uname());
++			#if 0
  			printf("built by %s with %s\n",
- 			       ns_g_builder, ns_g_configargs);
-+#endif
+ 			       named_g_builder, named_g_configargs);
++			#endif
  #ifdef __clang__
  			printf("compiled by CLANG %s\n", __VERSION__);
  #else
-@@ -998,8 +1000,10 @@ setup(void) {
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE, "running on %s", ns_os_uname());
+@@ -1075,9 +1077,11 @@ setup(void) {
+ 		      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+ 		      "running on %s", named_os_uname());
  
 +#if 0
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE, "built with %s", ns_g_configargs);
+ 	isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
+ 		      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+ 		      "built with %s", named_g_configargs);
 +#endif
  
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE,
+ 	isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
+ 		      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7369713dc86a52bd45d8a68e29a50265dac20004
--- /dev/null
+++ b/pkgs/servers/dns/dnsdist/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, systemd
+, boost, libsodium, libedit, re2
+, net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec {
+  name = "dnsdist-${version}";
+  version = "1.3.0";
+
+  src = fetchurl {
+    url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
+    sha256 = "025sgvpi3ps0n4mzfwkk6a5ang90a3c7s2fi9vni6jj0p16wsrxa";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ systemd boost libsodium libedit re2 net_snmp lua protobuf openssl ];
+
+  configureFlags = [
+    "--enable-libsodium"
+    "--enable-re2"
+    "--enable-dnscrypt"
+    "--enable-dns-over-tls"
+    "--with-protobuf=yes"
+    "--with-net-snmp"
+    "--disable-dependency-tracking"
+    "--enable-unit-tests"
+    "--enable-systemd"
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "DNS Loadbalancer";
+    homepage = "https://dnsdist.org";
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 8ed4541edd67ede81e3e6c2c63081621a6767158..de37aeaa590bce0da733620824af561e0a4bb25f 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn
-, systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty
+, systemd, nettle, libedit, zlib, libiconv, libintl
 }:
 
 let inherit (stdenv.lib) optional optionals; in
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.6.1";
+  version = "2.6.6";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "3013d45b4c7484268f3cad078f66f730a5bc9606e6b1061488dd821c1dce41e3";
+    sha256 = "02h8qdkja4kic3br79svws6r2pq1ijz945238v99d998d2jxh6ci";
   };
 
   outputs = [ "bin" "out" "dev" ];
@@ -20,11 +20,10 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gnutls liburcu libidn
     nettle libedit
-    libiconv lmdb
+    libiconv lmdb libintl
     # without sphinx &al. for developer documentation
   ]
     ++ optionals stdenv.isLinux [ libcap_ng systemd ]
-    ++ libintlOrEmpty
     ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls
 
   enableParallelBuilding = true;
@@ -43,4 +42,3 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.vcunat ];
   };
 }
-
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index d8aed9b3143f3592d2f532857c1c51175ad18e63..09fda1b81b8bfef7dd53084a8254bc2745916532 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -1,64 +1,55 @@
-{ stdenv, fetchurl, pkgconfig, hexdump, which
+{ stdenv, fetchurl, runCommand, pkgconfig, hexdump, which
 , knot-dns, luajit, libuv, lmdb, gnutls, nettle
 , cmocka, systemd, dns-root-data, makeWrapper
 , extraFeatures ? false /* catch-all if defaults aren't enough */
 , hiredis, libmemcached, luajitPackages
 }:
+let # un-indented, over the whole file
 
-let
-  inherit (stdenv.lib) optional optionals optionalString;
-in
-stdenv.mkDerivation rec {
+result = if extraFeatures then wrapped-full else unwrapped;
+
+inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
+
+unwrapped = stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.5.0";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "c032e63a6b922294746e1ab4002860346e7a6d92b8502965a13ba599088fcb42";
+    sha256 = "1yhlwvpl81klyfb8hhvrhii99q7wvydi3vandmq9j7dvig6z1dvv";
   };
 
   outputs = [ "out" "dev" ];
 
-  configurePhase = ":";
+  configurePhase = "patchShebangs scripts/";
 
-  nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
+  nativeBuildInputs = [ pkgconfig which hexdump ];
 
   # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
   buildInputs = [ knot-dns luajit libuv gnutls nettle lmdb ]
-    ++ optional doInstallCheck cmocka
+    ++ optional doCheck cmocka
     ++ optional stdenv.isLinux systemd # sd_notify
-    ++ optionals extraFeatures [
-      hiredis libmemcached # additional cache backends
-    ];
-    ## optional dependencies; TODO: libedit, dnstap, http2 module?
+    ## optional dependencies; TODO: libedit, dnstap
+    ;
 
-  makeFlags = [ "PREFIX=$(out)" "ROOTHINTS=${dns-root-data}/root.hints" ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "ROOTHINTS=${dns-root-data}/root.hints"
+    "KEYFILE_DEFAULT=${dns-root-data}/root.ds"
+  ];
   CFLAGS = [ "-O2" "-DNDEBUG" ];
 
   enableParallelBuilding = true;
 
-  doInstallCheck = true;
-  installCheckTarget = "check";
+  doCheck = true;
+  doInstallCheck = false; # FIXME
   preInstallCheck = ''
-    export LD_LIBRARY_PATH="$out/lib"
-    sed '/^\thints$/c #' -i tests/config/test_config.mk
+    patchShebangs tests/config/runtest.sh
   '';
 
   postInstall = ''
-    rm "$out"/etc/kresd/root.hints # using system-wide instead
-  ''
-  # optional: to allow auto-bootstrapping root trust anchor via https
-  + (with luajitPackages; ''
-      wrapProgram "$out/sbin/kresd" \
-        --set LUA_PATH '${
-          stdenv.lib.concatStringsSep ";"
-            (map getLuaPath [ luasec luasocket ])
-          }' \
-        --set LUA_CPATH '${
-          stdenv.lib.concatStringsSep ";"
-            (map getLuaCPath [ luasec luasocket ])
-          }'
-    '');
+    rm "$out"/etc/knot-resolver/root.hints # using system-wide instead
+  '';
 
   meta = with stdenv.lib; {
     description = "Caching validating DNS resolver, from .cz domain registry";
@@ -68,5 +59,24 @@ stdenv.mkDerivation rec {
     platforms = filter (p: p != "aarch64-linux") platforms.unix;
     maintainers = [ maintainers.vcunat /* upstream developer */ ];
   };
-}
+};
+
+wrapped-full = with luajitPackages; let
+    luaPkgs =  [ luasec luasocket ]; # TODO: cqueues and others for http2 module
+  in runCommand unwrapped.name
+  {
+    nativeBuildInputs = [ makeWrapper ];
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+  }
+  ''
+    mkdir -p "$out/sbin" "$out/share"
+    makeWrapper '${unwrapped}/sbin/kresd' "$out"/sbin/kresd \
+      --set LUA_PATH  '${concatStringsSep ";" (map getLuaPath  luaPkgs)}' \
+      --set LUA_CPATH '${concatStringsSep ";" (map getLuaCPath luaPkgs)}'
+    ln -sr '${unwrapped}/share/man' "$out"/share/
+    ln -sr "$out"/{sbin,bin}
+  '';
+
+in result
 
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 6cf98daab5bff5324d8a17ec8c925cf0614f7e07..b4bd6175f3e794e8a00d5987d0fd3b6dddce2b55 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -10,14 +10,16 @@
 , rootServer       ? false
 , rrtypes          ? false
 , zoneStats        ? false
+
+, configFile ? "etc/nsd/nsd.conf"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.16";
+  name = "nsd-4.1.20";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "1cmaddfjb7yr87gjd5yv4d0qng0j97sy5rw5m3zxsp6c4fnng0vz";
+    sha256 = "04zph9zli3a0zx1sfphwbxx6f8whdxcjai6w0k7a565vgcfzd5wa";
   };
 
   prePatch = ''
@@ -39,7 +41,15 @@ stdenv.mkDerivation rec {
      ++ edf rootServer       "root-server"
      ++ edf rrtypes          "draft-rrtypes"
      ++ edf zoneStats        "zone-stats"
-     ++ [ "--with-ssl=${openssl.dev}" "--with-libevent=${libevent.dev}" ];
+     ++ [ "--with-ssl=${openssl.dev}"
+          "--with-libevent=${libevent.dev}"
+          "--with-nsd_conf_file=${configFile}"
+          "--with-configdir=etc/nsd"
+        ];
+
+  patchPhase = ''
+    sed 's@$(INSTALL_DATA) nsd.conf.sample $(DESTDIR)$(nsdconfigfile).sample@@g' -i Makefile.in
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.nlnetlabs.nl;
diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index 9b017249c15e64e9024f7663f1c9f261e61df7b8..76f1bd91e33d6b7b4d509d5ddf861ac0d0c4cffb 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -1,28 +1,25 @@
 { stdenv, fetchurl, pkgconfig, boost
 , openssl, systemd, lua, luajit, protobuf
-, enableLua ? false
 , enableProtoBuf ? false
 }:
-
-assert enableLua      -> lua != null && luajit != null;
 assert enableProtoBuf -> protobuf != null;
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "pdns-recursor-${version}";
-  version = "4.0.6";
+  version = "4.1.2";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
-    sha256 = "03fnjiacvhdlkr3a2206mham0p6p24gkawashs5v12r68k32l67j";
+    sha256 = "0xpd8k7ahwrwabz05zbjmg54dmd4hm5hkbfn8m1ws6y4f7qm4inv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     boost openssl systemd
-  ] ++ optional enableLua [ lua luajit ]
-    ++ optional enableProtoBuf protobuf;
+    lua luajit
+  ] ++ optional enableProtoBuf protobuf;
 
   configureFlags = [
     "--enable-reproducible"
@@ -33,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A recursive DNS server";
-    homepage = http://www.powerdns.com/;
+    homepage = https://www.powerdns.com/;
     platforms = platforms.linux;
     license = licenses.gpl2;
     maintainers = with maintainers; [ rnhmjoj ];
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index ff21a9e8f0906554a51e23ae6693877ce2463a2a..cde2fe1a426ccc46631c0b35074b9ab1f815e788 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -1,27 +1,36 @@
-{ stdenv, fetchurl, pkgconfig,
-  boost, libyamlcpp, libsodium, sqlite, protobuf,
-  libmysql, postgresql, lua, openldap, geoip, curl
+{ stdenv, fetchurl, pkgconfig
+, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2
+, mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC
 }:
 
 stdenv.mkDerivation rec {
   name = "powerdns-${version}";
-  version = "4.0.4";
+  version = "4.1.1";
 
   src = fetchurl {
     url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-    sha256 = "0qypns1iqlrc5d3iwabrsi1vpb0yffy36chsb1zpqiv9vs4snx6r";
+    sha256 = "1fh4zgj0gxgcnnhnih8k6fbw18hb9brkkrfpx3mj8b4a3hr8ilq8";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ];
+  buildInputs = [
+    boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip
+    libyamlcpp libsodium curl opendbx unixODBC botan2
+  ];
+
+  patches = [
+    # checksum type not found, maybe a dependency is to old?
+    ./skip-sha384-test.patch
+  ];
 
   # nix destroy with-modules arguments, when using configureFlags
   preConfigure = ''
     configureFlagsArray=(
-      "--with-modules=bind gmysql geoip gpgsql gsqlite3 ldap lua pipe random remote"
+      "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote"
       --with-sqlite3
       --with-socketdir=/var/lib/powerdns
       --enable-libsodium
+      --enable-botan
       --enable-tools
       --disable-dependency-tracking
       --disable-silent-rules
@@ -29,7 +38,8 @@ stdenv.mkDerivation rec {
       --enable-unit-tests
     )
   '';
-  checkPhase = "make check";
+
+  doCheck = true;
 
   meta = with stdenv.lib; {
     description = "Authoritative DNS server";
diff --git a/pkgs/servers/dns/powerdns/skip-sha384-test.patch b/pkgs/servers/dns/powerdns/skip-sha384-test.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3fafb38c48fbc781bc34d3c42633a155fa1dd44c
--- /dev/null
+++ b/pkgs/servers/dns/powerdns/skip-sha384-test.patch
@@ -0,0 +1,14 @@
+--- pdns-4.1.1.org/pdns/test-signers.cc	2018-02-17 11:43:15.953228279 +0000
++++ pdns-4.1.1/pdns/test-signers.cc	2018-02-17 11:44:21.089516393 +0000
+@@ -212,11 +212,6 @@
+       BOOST_CHECK_EQUAL(ds2.getZoneRepresentation(), signer.dsSHA256);
+     }
+ 
+-    auto ds4 = makeDSFromDNSKey(name, drc, DNSSECKeeper::SHA384);
+-    if (!signer.dsSHA384.empty()) {
+-      BOOST_CHECK_EQUAL(ds4.getZoneRepresentation(), signer.dsSHA384);
+-    }
+-
+     auto signature = dcke->sign(message);
+     BOOST_CHECK(dcke->verify(message, signature));
+ 
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 745ed18c00f8a75cc5b34b005ab927046b3192fe..964fa77c31a9be97c04e7e0afd2f26d2bf4be7f6 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.36.0";
+  version = "3.3.1.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0b75v6g7qm03jqm5za70z4x5lqks3a4cd84vblqr35zrla9vs83b";
+    sha256 = "04qq3rl3pwxnsr8z6x3dwplh6brn1nd0jpmmnvizln4ffx9wspb8";
   };
 
   buildInputs = with pkgs; [
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index 15ea30aa16cb62333217b6508b52ceca31cc05e9..29cb8c2223c06142339784924d29a2dd91d1fac0 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.1.6"; # After updating check that nixos tests pass
+  version = "3.3.1"; # After updating check that nixos tests pass
   rev = "v${version}";
 
   goPackagePath = "github.com/coreos/etcd";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "coreos";
     repo = "etcd";
-    sha256 = "1qgi6zxnijzr644w2da2gbn3gw2qwk6a3z3qmdln0r2rjnm70sx0";
+    sha256 = "11gzmi05y4kpnzgqc737l0wk5svxai4z17nl92jazqga6zhyavyl";
   };
 
   subPackages = [
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
index 84c24e684786ddf810e4a7147aa66f9ccc90d088..a1ec3a7deb08534785a2218d1f2c6efa81f29af9 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac";
   };
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";
   configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix
index 3f600b5a12212272b9c9c2ddfae1c411c4011cb9..98daab253b3c97af3d0afc7b971007a6b5408316 100644
--- a/pkgs/servers/fleet/default.nix
+++ b/pkgs/servers/fleet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "fleet-${version}";
-  version = "0.11.8";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "coreos";
     repo = "fleet";
     rev = "v${version}";
-    sha256 = "13kwaa4hkiic602wnvnk13pflrxqhk2vxwpk1bn52ilwxkjyvkig";
+    sha256 = "0j48ajz19aqfzv9iyznnn39aw51y1nqcl270grmvi5cbqycmrfm0";
   };
 
   buildInputs = [ go ];
diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index db9d112199234f34ab7d5ee9bb5e0bf3a4ede938..a3e83f4e069e35d41fdd0bdb9d82b6271817496d 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -13,7 +13,7 @@
 , withMemcached ? false
 , hiredis
 , withRedis ? false
-, libmysql
+, mysql
 , withMysql ? false
 , json_c
 , withJson ? false
@@ -29,7 +29,7 @@ assert withPcap -> libpcap != null;
 assert withCap -> libcap != null;
 assert withMemcached -> libmemcached != null;
 assert withRedis -> hiredis != null;
-assert withMysql -> libmysql != null;
+assert withMysql -> mysql != null;
 assert withYubikey -> libyubikey != null;
 assert withCollectd -> collectd != null;
 
@@ -40,11 +40,11 @@ assert withCollectd -> collectd != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "freeradius-${version}";
-  version = "3.0.15";
+  version = "3.0.17";
 
   src = fetchurl {
     url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz";
-    sha256 = "1qygf5if2xjzl7kfzwl428ydz5q1m0j5sx077n12v7znlgnwaagx";
+    sha256 = "0bc35knv46z729l4h22rirqns5v6jb0fzcffnjayhs8wjysfkfyy";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     ++ optional withCap libcap
     ++ optional withMemcached libmemcached
     ++ optional withRedis hiredis
-    ++ optional withMysql libmysql
+    ++ optional withMysql mysql.connector-c
     ++ optional withJson json_c
     ++ optional withYubikey libyubikey
     ++ optional withCollectd collectd;
diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix
index cc1582eb9e9c351cca4a14c9756b17ffe9ccf4a8..38fb7d250e349261723e9824d58c6291b844e8c5 100644
--- a/pkgs/servers/ftp/bftpd/default.nix
+++ b/pkgs/servers/ftp/bftpd/default.nix
@@ -2,11 +2,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bftpd";
-  version = "4.4";
+  version = "4.9";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
     url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz";
-    sha256 = "0hgpqwv7mj1yln8ps9bbcjhl5hvs02nxjfkk9nhkr6fysfyyn1dq";
+    sha256 = "13pjil9cjggpi773m0516lszyqvwzlgcrmmj8yn9nc24rbxwvn6d";
   };
   buildInputs = [];
   preConfigure = ''
diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix
index 4e39b78b89ece5861e8b95a079c5cea639d8df0e..f41bb726a28cb2dd2f07ab432d6940f62dc2ea19 100644
--- a/pkgs/servers/ftp/pure-ftpd/default.nix
+++ b/pkgs/servers/ftp/pure-ftpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "pure-ftpd-1.0.46";
+  name = "pure-ftpd-1.0.47";
 
   src = fetchurl {
     url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz";
-    sha256 = "0p0arcaz63fbb03fkavbc8z6m1f90p5vbnxb8mqlvpma6mrq0286";
+    sha256 = "1b97ixva8m10vln8xrfwwwzi344bkgxqji26d0nrm1yzylbc6h27";
   };
 
   buildInputs = [ openssl ];
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.pureftpd.org;
     license = licenses.isc; # with some parts covered by BSD3(?)
     maintainers = [ maintainers.lethalman ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix
deleted file mode 100644
index 63a716339237d8a2ae45f74923c07ab7d3160baf..0000000000000000000000000000000000000000
--- a/pkgs/servers/games/ghost-one/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, unzip, gmp, zlib, bzip2, boost, mysql }:
-stdenv.mkDerivation rec {
-
-  name = "ghost-one-${version}";
-  version = "1.7.265";
-
-  src = fetchurl {
-    url = "http://www.maxdevlon.com/ghost/ghostone${version}.zip";
-    sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2";
-  };
-
-  buildInputs = [ unzip gmp zlib bzip2 boost mysql.client ];
-
-  patchPhase = ''
-    substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" \
-      "${stdenv.lib.getLib mysql.client}/lib/mysql"
-  '';
-
-  buildPhase = ''
-    cd bncsutil/src/bncsutil
-    make
-    cd ../../../StormLib/stormlib/
-    make
-    mkdir -p $out/lib
-    cd ../..
-#    cp bncsutil/src/bncsutil/libbncutil.so $out/lib
-#    cp StormLib/stormlib/libStorm.so $out/lib
-    cd ghost
-    make
-    cd ..
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib
-    cp bncsutil/src/bncsutil/libbncsutil.so $out/lib
-    cp StormLib/stormlib/libStorm.so $out/lib
-
-    mkdir -p $out/bin
-    cp ghost/ghost++ $out/bin
-
-    mkdir -p $out/share/ghost-one/languages
-    cp -r mapcfgs $out/share/ghost-one
-    cp Languages/*.cfg $out/share/ghost-one/languages
-    cp language.cfg $out/share/ghost-one/languages/English.cfg
-    cp ip-to-country.csv $out/share/ghost-one/
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.codelain.com/forum/;
-    description = "A Warcraft III: Reign of Chaos and Warcraft III: The Frozen Throne game hosting bot";
-    license = licenses.asl20;
-    maintainers = [ maintainers.phreedom ];
-    broken = true; # can't even get downloaded
-  };
-}
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index e63e13a218e7a489fd0f8589cae5f1ae70319276..89f1821981fcb97e171c0cbb1fd5b645300c991b 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     description = "Share your terminal as a web application";
     homepage = https://github.com/yudai/gotty;
-    maintainers = with maintainers; [ matthiasbeyer ];
+    maintainers = with maintainers; [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index 6096aa1ed74d907e46963612ab5663c8af98c90c..3cb0d3931db3fd5a492e25f09222947a94786f1f 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "gpm-1.20.7";
 
   src = fetchurl {
-    url = "http://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2";
+    url = "https://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2";
     sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh";
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.nico.schottelius.org/software/gpm/;
+    homepage = https://www.nico.schottelius.org/software/gpm/;
     description = "A daemon that provides mouse support on the Linux console";
     license = licenses.gpl2;
     platforms = platforms.linux ++ platforms.cygwin;
diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index 7670c89f0c6a9b498f0def8c2fb2eaf22711858b..b01e94187898b920e61f7aa3ebc502926c8f13b2 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, scons, pkgconfig, dbus, dbus_glib
+{ fetchurl, stdenv, scons, pkgconfig, dbus, dbus-glib
 , ncurses, libX11, libXt, libXpm, libXaw, libXext
 , libusb1, docbook_xml_dtd_412, docbook_xsl, bc
 , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    python2Packages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext
+    python2Packages.python dbus dbus-glib ncurses libX11 libXt libXpm libXaw libXext
     libxslt libusb1
   ];
 
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
new file mode 100644
index 0000000000000000000000000000000000000000..493131795034e2054cdcbcef28f4f80840f795b1
--- /dev/null
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -0,0 +1,57 @@
+{ lib, python3, fetchpatch }:
+
+let
+  python = python3.override {
+    packageOverrides = self: super: {
+
+      aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
+        version = "2.3.10";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
+        };
+      });
+
+      yarl = super.yarl.overridePythonAttrs (oldAttrs: rec {
+        version = "1.1.0";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "6af895b45bd49254cc309ac0fe6e1595636a024953d710e01114257736184698";
+        };
+      });
+
+      aiohttp-jinja2 = super.aiohttp-jinja2.overridePythonAttrs (oldAttrs: rec {
+        version = "0.15.0";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "0f390693f46173d8ffb95669acbb0e2a3ec54ecce676703510ad47f1a6d9dc83";
+        };
+      });
+
+    };
+  };
+
+in python.pkgs.buildPythonApplication rec {
+  pname = "appdaemon";
+  version = "3.0.1";
+
+  src = python.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "ad16773da21e34e258970bf5740d1634a36c8202ac72c6925d960308ef1c58cf";
+  };
+
+  propagatedBuildInputs = with python.pkgs; [
+    aiohttp aiohttp-jinja2 astral bcrypt daemonize feedparser iso8601
+    jinja2 pyyaml requests sseclient voluptuous websocket_client yarl
+  ];
+
+  # no tests implemented
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Sandboxed python execution environment for writing automation apps for Home Assistant";
+    homepage = https://github.com/home-assistant/appdaemon;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg dotlambda ];
+  };
+}
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3a74a43d14d5cd01bed6fa7bbad8d9dbedd63bd2
--- /dev/null
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -0,0 +1,463 @@
+# Generated from parse-requirements.py
+# Do not edit!
+
+{
+  version = "0.67.1";
+  components = {
+    "abode" = ps: with ps; [  ];
+    "ads" = ps: with ps; [  ];
+    "alarm_control_panel.alarmdotcom" = ps: with ps; [  ];
+    "alarm_control_panel.concord232" = ps: with ps; [  ];
+    "alarm_control_panel.ialarm" = ps: with ps; [  ];
+    "alarm_control_panel.nx584" = ps: with ps; [  ];
+    "alarm_control_panel.simplisafe" = ps: with ps; [  ];
+    "alarm_control_panel.totalconnect" = ps: with ps; [  ];
+    "alarmdecoder" = ps: with ps; [  ];
+    "amcrest" = ps: with ps; [  ];
+    "android_ip_webcam" = ps: with ps; [  ];
+    "apcupsd" = ps: with ps; [  ];
+    "apple_tv" = ps: with ps; [  ];
+    "arduino" = ps: with ps; [  ];
+    "arlo" = ps: with ps; [  ];
+    "asterisk_mbox" = ps: with ps; [  ];
+    "august" = ps: with ps; [  ];
+    "axis" = ps: with ps; [  ];
+    "bbb_gpio" = ps: with ps; [  ];
+    "binary_sensor.concord232" = ps: with ps; [  ];
+    "binary_sensor.flic" = ps: with ps; [  ];
+    "binary_sensor.hikvision" = ps: with ps; [  ];
+    "binary_sensor.iss" = ps: with ps; [  ];
+    "binary_sensor.nx584" = ps: with ps; [  ];
+    "binary_sensor.tapsaff" = ps: with ps; [  ];
+    "binary_sensor.trend" = ps: with ps; [ numpy ];
+    "binary_sensor.workday" = ps: with ps; [  ];
+    "blink" = ps: with ps; [  ];
+    "bmw_connected_drive" = ps: with ps; [  ];
+    "calendar.caldav" = ps: with ps; [  ];
+    "calendar.todoist" = ps: with ps; [ todoist ];
+    "camera.foscam" = ps: with ps; [  ];
+    "camera.onvif" = ps: with ps; [  ];
+    "camera.proxy" = ps: with ps; [ pillow ];
+    "camera.synology" = ps: with ps; [  ];
+    "camera.uvc" = ps: with ps; [  ];
+    "camera.xeoma" = ps: with ps; [  ];
+    "canary" = ps: with ps; [  ];
+    "climate.daikin" = ps: with ps; [  ];
+    "climate.econet" = ps: with ps; [  ];
+    "climate.ephember" = ps: with ps; [  ];
+    "climate.eq3btsmart" = ps: with ps; [ construct ];
+    "climate.flexit" = ps: with ps; [  ];
+    "climate.heatmiser" = ps: with ps; [  ];
+    "climate.honeywell" = ps: with ps; [  ];
+    "climate.oem" = ps: with ps; [  ];
+    "climate.proliphix" = ps: with ps; [  ];
+    "climate.radiotherm" = ps: with ps; [  ];
+    "climate.sensibo" = ps: with ps; [  ];
+    "climate.touchline" = ps: with ps; [  ];
+    "climate.venstar" = ps: with ps; [  ];
+    "cloud" = ps: with ps; [ warrant ];
+    "coinbase" = ps: with ps; [  ];
+    "comfoconnect" = ps: with ps; [  ];
+    "config.config_entries" = ps: with ps; [  ];
+    "cover.gogogate2" = ps: with ps; [  ];
+    "cover.myq" = ps: with ps; [  ];
+    "daikin" = ps: with ps; [  ];
+    "datadog" = ps: with ps; [ datadog ];
+    "deconz" = ps: with ps; [  ];
+    "device_tracker.aruba" = ps: with ps; [ pexpect ];
+    "device_tracker.asuswrt" = ps: with ps; [ pexpect ];
+    "device_tracker.automatic" = ps: with ps; [  ];
+    "device_tracker.bbox" = ps: with ps; [  ];
+    "device_tracker.bluetooth_le_tracker" = ps: with ps; [  ];
+    "device_tracker.bluetooth_tracker" = ps: with ps; [  ];
+    "device_tracker.cisco_ios" = ps: with ps; [ pexpect ];
+    "device_tracker.fritz" = ps: with ps; [ fritzconnection ];
+    "device_tracker.google_maps" = ps: with ps; [  ];
+    "device_tracker.icloud" = ps: with ps; [  ];
+    "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ];
+    "device_tracker.mikrotik" = ps: with ps; [  ];
+    "device_tracker.netgear" = ps: with ps; [  ];
+    "device_tracker.nmap_tracker" = ps: with ps; [  ];
+    "device_tracker.owntracks" = ps: with ps; [ libnacl ];
+    "device_tracker.owntracks_http" = ps: with ps; [ libnacl ];
+    "device_tracker.snmp" = ps: with ps; [ pysnmp ];
+    "device_tracker.tile" = ps: with ps; [  ];
+    "device_tracker.trackr" = ps: with ps; [  ];
+    "device_tracker.unifi" = ps: with ps; [ pyunifi ];
+    "device_tracker.unifi_direct" = ps: with ps; [ pexpect ];
+    "device_tracker.upc_connect" = ps: with ps; [ defusedxml ];
+    "device_tracker.xiaomi_miio" = ps: with ps; [  ];
+    "digital_ocean" = ps: with ps; [ digital-ocean ];
+    "discovery" = ps: with ps; [ netdisco ];
+    "dominos" = ps: with ps; [  ];
+    "doorbird" = ps: with ps; [  ];
+    "dweet" = ps: with ps; [  ];
+    "dyson" = ps: with ps; [  ];
+    "ecobee" = ps: with ps; [  ];
+    "egardia" = ps: with ps; [  ];
+    "eight_sleep" = ps: with ps; [  ];
+    "emulated_hue" = ps: with ps; [ aiohttp-cors ];
+    "enocean" = ps: with ps; [  ];
+    "envisalink" = ps: with ps; [  ];
+    "fan.xiaomi_miio" = ps: with ps; [ construct ];
+    "feedreader" = ps: with ps; [ feedparser ];
+    "ffmpeg" = ps: with ps; [ ha-ffmpeg ];
+    "folder_watcher" = ps: with ps; [ watchdog ];
+    "frontend" = ps: with ps; [  ];
+    "gc100" = ps: with ps; [  ];
+    "goalfeed" = ps: with ps; [  ];
+    "google" = ps: with ps; [ google_api_python_client oauth2client ];
+    "hdmi_cec" = ps: with ps; [  ];
+    "hive" = ps: with ps; [  ];
+    "homekit" = ps: with ps; [  ];
+    "homematic" = ps: with ps; [ pyhomematic ];
+    "homematicip_cloud" = ps: with ps; [  ];
+    "http" = ps: with ps; [ aiohttp-cors ];
+    "hue" = ps: with ps; [  ];
+    "ifttt" = ps: with ps; [  ];
+    "ihc" = ps: with ps; [  ];
+    "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ];
+    "image_processing.dlib_face_identify" = ps: with ps; [ face_recognition ];
+    "image_processing.opencv" = ps: with ps; [ numpy ];
+    "influxdb" = ps: with ps; [ influxdb ];
+    "insteon_local" = ps: with ps; [  ];
+    "insteon_plm" = ps: with ps; [  ];
+    "iota" = ps: with ps; [  ];
+    "isy994" = ps: with ps; [  ];
+    "joaoapps_join" = ps: with ps; [  ];
+    "juicenet" = ps: with ps; [  ];
+    "keyboard" = ps: with ps; [  ];
+    "keyboard_remote" = ps: with ps; [ evdev ];
+    "kira" = ps: with ps; [  ];
+    "knx" = ps: with ps; [  ];
+    "lametric" = ps: with ps; [  ];
+    "light.avion" = ps: with ps; [  ];
+    "light.blinksticklight" = ps: with ps; [ BlinkStick ];
+    "light.blinkt" = ps: with ps; [  ];
+    "light.decora" = ps: with ps; [  ];
+    "light.decora_wifi" = ps: with ps; [  ];
+    "light.flux_led" = ps: with ps; [  ];
+    "light.greenwave" = ps: with ps; [  ];
+    "light.iglo" = ps: with ps; [  ];
+    "light.lifx" = ps: with ps; [  ];
+    "light.lifx_legacy" = ps: with ps; [  ];
+    "light.limitlessled" = ps: with ps; [  ];
+    "light.mystrom" = ps: with ps; [  ];
+    "light.nanoleaf_aurora" = ps: with ps; [  ];
+    "light.osramlightify" = ps: with ps; [  ];
+    "light.piglow" = ps: with ps; [  ];
+    "light.rpi_gpio_pwm" = ps: with ps; [  ];
+    "light.sensehat" = ps: with ps; [  ];
+    "light.tikteck" = ps: with ps; [  ];
+    "light.tplink" = ps: with ps; [  ];
+    "light.xiaomi_miio" = ps: with ps; [ construct ];
+    "light.yeelight" = ps: with ps; [  ];
+    "light.yeelightsunflower" = ps: with ps; [  ];
+    "light.zengge" = ps: with ps; [  ];
+    "linode" = ps: with ps; [ linode-api ];
+    "lirc" = ps: with ps; [  ];
+    "litejet" = ps: with ps; [  ];
+    "lock.nello" = ps: with ps; [  ];
+    "lock.nuki" = ps: with ps; [  ];
+    "lock.sesame" = ps: with ps; [  ];
+    "lutron" = ps: with ps; [  ];
+    "lutron_caseta" = ps: with ps; [  ];
+    "maxcube" = ps: with ps; [  ];
+    "media_extractor" = ps: with ps; [  ];
+    "media_player.anthemav" = ps: with ps; [  ];
+    "media_player.aquostv" = ps: with ps; [  ];
+    "media_player.bluesound" = ps: with ps; [ xmltodict ];
+    "media_player.braviatv" = ps: with ps; [  ];
+    "media_player.cast" = ps: with ps; [ PyChromecast ];
+    "media_player.channels" = ps: with ps; [  ];
+    "media_player.clementine" = ps: with ps; [  ];
+    "media_player.cmus" = ps: with ps; [  ];
+    "media_player.denonavr" = ps: with ps; [  ];
+    "media_player.directv" = ps: with ps; [  ];
+    "media_player.dunehd" = ps: with ps; [  ];
+    "media_player.emby" = ps: with ps; [  ];
+    "media_player.frontier_silicon" = ps: with ps; [  ];
+    "media_player.gpmdp" = ps: with ps; [ websocket_client ];
+    "media_player.gstreamer" = ps: with ps; [  ];
+    "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ];
+    "media_player.lg_netcast" = ps: with ps; [  ];
+    "media_player.liveboxplaytv" = ps: with ps; [  ];
+    "media_player.mediaroom" = ps: with ps; [  ];
+    "media_player.monoprice" = ps: with ps; [  ];
+    "media_player.mpd" = ps: with ps; [ mpd2 ];
+    "media_player.nad" = ps: with ps; [  ];
+    "media_player.nadtcp" = ps: with ps; [  ];
+    "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ];
+    "media_player.openhome" = ps: with ps; [  ];
+    "media_player.panasonic_viera" = ps: with ps; [ wakeonlan ];
+    "media_player.pandora" = ps: with ps; [ pexpect ];
+    "media_player.philips_js" = ps: with ps; [  ];
+    "media_player.plex" = ps: with ps; [  ];
+    "media_player.roku" = ps: with ps; [  ];
+    "media_player.russound_rio" = ps: with ps; [  ];
+    "media_player.russound_rnet" = ps: with ps; [  ];
+    "media_player.samsungtv" = ps: with ps; [ wakeonlan ];
+    "media_player.snapcast" = ps: with ps; [  ];
+    "media_player.songpal" = ps: with ps; [  ];
+    "media_player.sonos" = ps: with ps; [  ];
+    "media_player.soundtouch" = ps: with ps; [ libsoundtouch ];
+    "media_player.spotify" = ps: with ps; [ spotipy ];
+    "media_player.vizio" = ps: with ps; [  ];
+    "media_player.vlc" = ps: with ps; [  ];
+    "media_player.webostv" = ps: with ps; [ websockets ];
+    "media_player.xiaomi_tv" = ps: with ps; [  ];
+    "media_player.yamaha" = ps: with ps; [  ];
+    "media_player.yamaha_musiccast" = ps: with ps; [  ];
+    "media_player.ziggo_mediabox_xl" = ps: with ps; [  ];
+    "melissa" = ps: with ps; [  ];
+    "mochad" = ps: with ps; [  ];
+    "modbus" = ps: with ps; [  ];
+    "mqtt" = ps: with ps; [ paho-mqtt ];
+    "mqtt.server" = ps: with ps; [ hbmqtt ];
+    "mychevy" = ps: with ps; [  ];
+    "mycroft" = ps: with ps; [  ];
+    "mysensors" = ps: with ps; [  ];
+    "neato" = ps: with ps; [  ];
+    "nest" = ps: with ps; [  ];
+    "netatmo" = ps: with ps; [  ];
+    "notify.apns" = ps: with ps; [  ];
+    "notify.aws_lambda" = ps: with ps; [ boto3 ];
+    "notify.aws_sns" = ps: with ps; [ boto3 ];
+    "notify.aws_sqs" = ps: with ps; [ boto3 ];
+    "notify.ciscospark" = ps: with ps; [  ];
+    "notify.discord" = ps: with ps; [  ];
+    "notify.free_mobile" = ps: with ps; [  ];
+    "notify.gntp" = ps: with ps; [  ];
+    "notify.hipchat" = ps: with ps; [  ];
+    "notify.html5" = ps: with ps; [ pyjwt ];
+    "notify.joaoapps_join" = ps: with ps; [  ];
+    "notify.kodi" = ps: with ps; [ jsonrpc-async ];
+    "notify.lametric" = ps: with ps; [  ];
+    "notify.mailgun" = ps: with ps; [  ];
+    "notify.mastodon" = ps: with ps; [  ];
+    "notify.matrix" = ps: with ps; [ matrix-client ];
+    "notify.message_bird" = ps: with ps; [  ];
+    "notify.pushbullet" = ps: with ps; [ pushbullet ];
+    "notify.pushetta" = ps: with ps; [  ];
+    "notify.pushover" = ps: with ps; [ python-pushover ];
+    "notify.rocketchat" = ps: with ps; [  ];
+    "notify.sendgrid" = ps: with ps; [  ];
+    "notify.simplepush" = ps: with ps; [  ];
+    "notify.slack" = ps: with ps; [  ];
+    "notify.stride" = ps: with ps; [  ];
+    "notify.twitter" = ps: with ps; [  ];
+    "notify.webostv" = ps: with ps; [  ];
+    "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ];
+    "notify.yessssms" = ps: with ps; [  ];
+    "nuheat" = ps: with ps; [  ];
+    "nuimo_controller" = ps: with ps; [  ];
+    "pilight" = ps: with ps; [  ];
+    "prometheus" = ps: with ps; [  ];
+    "python_script" = ps: with ps; [  ];
+    "qwikswitch" = ps: with ps; [  ];
+    "rainbird" = ps: with ps; [  ];
+    "raincloud" = ps: with ps; [  ];
+    "raspihats" = ps: with ps; [  ];
+    "recorder" = ps: with ps; [ sqlalchemy ];
+    "remember_the_milk" = ps: with ps; [ httplib2 ];
+    "remote.harmony" = ps: with ps; [  ];
+    "remote.itach" = ps: with ps; [  ];
+    "remote.xiaomi_miio" = ps: with ps; [ construct ];
+    "rflink" = ps: with ps; [  ];
+    "rfxtrx" = ps: with ps; [  ];
+    "ring" = ps: with ps; [  ];
+    "rpi_gpio" = ps: with ps; [  ];
+    "rpi_pfio" = ps: with ps; [  ];
+    "satel_integra" = ps: with ps; [  ];
+    "scene.hunterdouglas_powerview" = ps: with ps; [  ];
+    "scsgate" = ps: with ps; [  ];
+    "sensor.airvisual" = ps: with ps; [  ];
+    "sensor.alpha_vantage" = ps: with ps; [  ];
+    "sensor.bbox" = ps: with ps; [  ];
+    "sensor.bh1750" = ps: with ps; [  ];
+    "sensor.bitcoin" = ps: with ps; [  ];
+    "sensor.blockchain" = ps: with ps; [  ];
+    "sensor.bme280" = ps: with ps; [  ];
+    "sensor.bme680" = ps: with ps; [  ];
+    "sensor.broadlink" = ps: with ps; [  ];
+    "sensor.buienradar" = ps: with ps; [  ];
+    "sensor.coinmarketcap" = ps: with ps; [  ];
+    "sensor.cpuspeed" = ps: with ps; [  ];
+    "sensor.crimereports" = ps: with ps; [  ];
+    "sensor.cups" = ps: with ps; [ pycups ];
+    "sensor.darksky" = ps: with ps; [  ];
+    "sensor.deluge" = ps: with ps; [ deluge-client ];
+    "sensor.deutsche_bahn" = ps: with ps; [  ];
+    "sensor.dht" = ps: with ps; [  ];
+    "sensor.discogs" = ps: with ps; [ discogs_client ];
+    "sensor.dnsip" = ps: with ps; [ aiodns ];
+    "sensor.dovado" = ps: with ps; [  ];
+    "sensor.dsmr" = ps: with ps; [  ];
+    "sensor.dweet" = ps: with ps; [  ];
+    "sensor.ebox" = ps: with ps; [  ];
+    "sensor.eddystone_temperature" = ps: with ps; [ construct ];
+    "sensor.eliqonline" = ps: with ps; [  ];
+    "sensor.envirophat" = ps: with ps; [  ];
+    "sensor.etherscan" = ps: with ps; [  ];
+    "sensor.fastdotcom" = ps: with ps; [  ];
+    "sensor.fedex" = ps: with ps; [  ];
+    "sensor.fido" = ps: with ps; [  ];
+    "sensor.fitbit" = ps: with ps; [  ];
+    "sensor.fixer" = ps: with ps; [  ];
+    "sensor.foobot" = ps: with ps; [  ];
+    "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
+    "sensor.fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
+    "sensor.gearbest" = ps: with ps; [  ];
+    "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ];
+    "sensor.geo_rss_events" = ps: with ps; [ feedparser ];
+    "sensor.gitter" = ps: with ps; [  ];
+    "sensor.google_travel_time" = ps: with ps; [  ];
+    "sensor.gpsd" = ps: with ps; [  ];
+    "sensor.gtfs" = ps: with ps; [  ];
+    "sensor.hp_ilo" = ps: with ps; [  ];
+    "sensor.htu21d" = ps: with ps; [  ];
+    "sensor.hydroquebec" = ps: with ps; [  ];
+    "sensor.imap" = ps: with ps; [ aioimaplib ];
+    "sensor.influxdb" = ps: with ps; [ influxdb ];
+    "sensor.irish_rail_transport" = ps: with ps; [  ];
+    "sensor.kwb" = ps: with ps; [  ];
+    "sensor.lacrosse" = ps: with ps; [  ];
+    "sensor.lastfm" = ps: with ps; [ pylast ];
+    "sensor.linux_battery" = ps: with ps; [ batinfo ];
+    "sensor.loopenergy" = ps: with ps; [  ];
+    "sensor.luftdaten" = ps: with ps; [ luftdaten ];
+    "sensor.lyft" = ps: with ps; [  ];
+    "sensor.metoffice" = ps: with ps; [  ];
+    "sensor.mfi" = ps: with ps; [  ];
+    "sensor.mhz19" = ps: with ps; [  ];
+    "sensor.miflora" = ps: with ps; [  ];
+    "sensor.modem_callerid" = ps: with ps; [  ];
+    "sensor.mopar" = ps: with ps; [  ];
+    "sensor.mvglive" = ps: with ps; [  ];
+    "sensor.nederlandse_spoorwegen" = ps: with ps; [  ];
+    "sensor.neurio_energy" = ps: with ps; [  ];
+    "sensor.nut" = ps: with ps; [  ];
+    "sensor.openevse" = ps: with ps; [  ];
+    "sensor.openweathermap" = ps: with ps; [  ];
+    "sensor.otp" = ps: with ps; [  ];
+    "sensor.plex" = ps: with ps; [  ];
+    "sensor.pocketcasts" = ps: with ps; [  ];
+    "sensor.pollen" = ps: with ps; [  ];
+    "sensor.pushbullet" = ps: with ps; [ pushbullet ];
+    "sensor.qnap" = ps: with ps; [  ];
+    "sensor.ripple" = ps: with ps; [  ];
+    "sensor.sabnzbd" = ps: with ps; [  ];
+    "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];
+    "sensor.season" = ps: with ps; [ ephem ];
+    "sensor.sense" = ps: with ps; [  ];
+    "sensor.sensehat" = ps: with ps; [  ];
+    "sensor.serial" = ps: with ps; [  ];
+    "sensor.serial_pm" = ps: with ps; [  ];
+    "sensor.shodan" = ps: with ps; [  ];
+    "sensor.sma" = ps: with ps; [  ];
+    "sensor.snmp" = ps: with ps; [ pysnmp ];
+    "sensor.sochain" = ps: with ps; [  ];
+    "sensor.speedtest" = ps: with ps; [  ];
+    "sensor.spotcrime" = ps: with ps; [  ];
+    "sensor.sql" = ps: with ps; [ sqlalchemy ];
+    "sensor.startca" = ps: with ps; [ xmltodict ];
+    "sensor.steam_online" = ps: with ps; [  ];
+    "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ];
+    "sensor.swiss_public_transport" = ps: with ps; [  ];
+    "sensor.syncthru" = ps: with ps; [  ];
+    "sensor.synologydsm" = ps: with ps; [  ];
+    "sensor.systemmonitor" = ps: with ps; [ psutil ];
+    "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ];
+    "sensor.tank_utility" = ps: with ps; [  ];
+    "sensor.ted5000" = ps: with ps; [ xmltodict ];
+    "sensor.temper" = ps: with ps; [  ];
+    "sensor.thinkingcleaner" = ps: with ps; [  ];
+    "sensor.tibber" = ps: with ps; [  ];
+    "sensor.transmission" = ps: with ps; [ transmissionrpc ];
+    "sensor.travisci" = ps: with ps; [  ];
+    "sensor.twitch" = ps: with ps; [  ];
+    "sensor.uber" = ps: with ps; [  ];
+    "sensor.ups" = ps: with ps; [  ];
+    "sensor.vasttrafik" = ps: with ps; [  ];
+    "sensor.waqi" = ps: with ps; [  ];
+    "sensor.waze_travel_time" = ps: with ps; [  ];
+    "sensor.whois" = ps: with ps; [  ];
+    "sensor.xbox_live" = ps: with ps; [  ];
+    "sensor.xiaomi_miio" = ps: with ps; [ construct ];
+    "sensor.yahoo_finance" = ps: with ps; [  ];
+    "sensor.yr" = ps: with ps; [ xmltodict ];
+    "sensor.yweather" = ps: with ps; [ yahooweather ];
+    "sensor.zestimate" = ps: with ps; [ xmltodict ];
+    "shiftr" = ps: with ps; [ paho-mqtt ];
+    "skybell" = ps: with ps; [  ];
+    "sleepiq" = ps: with ps; [  ];
+    "smappee" = ps: with ps; [  ];
+    "spc" = ps: with ps; [ websockets ];
+    "statsd" = ps: with ps; [ statsd ];
+    "switch.acer_projector" = ps: with ps; [ pyserial ];
+    "switch.anel_pwrctrl" = ps: with ps; [  ];
+    "switch.broadlink" = ps: with ps; [  ];
+    "switch.deluge" = ps: with ps; [ deluge-client ];
+    "switch.digitalloggers" = ps: with ps; [  ];
+    "switch.dlink" = ps: with ps; [  ];
+    "switch.edimax" = ps: with ps; [  ];
+    "switch.fritzdect" = ps: with ps; [  ];
+    "switch.hikvisioncam" = ps: with ps; [  ];
+    "switch.mfi" = ps: with ps; [  ];
+    "switch.mystrom" = ps: with ps; [  ];
+    "switch.netio" = ps: with ps; [  ];
+    "switch.orvibo" = ps: with ps; [  ];
+    "switch.rachio" = ps: with ps; [  ];
+    "switch.rainmachine" = ps: with ps; [  ];
+    "switch.rpi_rf" = ps: with ps; [  ];
+    "switch.snmp" = ps: with ps; [ pysnmp ];
+    "switch.thinkingcleaner" = ps: with ps; [  ];
+    "switch.tplink" = ps: with ps; [  ];
+    "switch.transmission" = ps: with ps; [ transmissionrpc ];
+    "switch.vesync" = ps: with ps; [  ];
+    "switch.wake_on_lan" = ps: with ps; [ wakeonlan ];
+    "switch.xiaomi_miio" = ps: with ps; [ construct ];
+    "tado" = ps: with ps; [  ];
+    "tahoma" = ps: with ps; [  ];
+    "telegram_bot" = ps: with ps; [ python-telegram-bot ];
+    "tellduslive" = ps: with ps; [  ];
+    "tellstick" = ps: with ps; [  ];
+    "tesla" = ps: with ps; [  ];
+    "thingspeak" = ps: with ps; [  ];
+    "toon" = ps: with ps; [  ];
+    "tradfri" = ps: with ps; [  ];
+    "tts" = ps: with ps; [ mutagen ];
+    "tts.amazon_polly" = ps: with ps; [ boto3 ];
+    "tts.baidu" = ps: with ps; [  ];
+    "tts.google" = ps: with ps; [  ];
+    "tts.microsoft" = ps: with ps; [  ];
+    "twilio" = ps: with ps; [ twilio ];
+    "upcloud" = ps: with ps; [  ];
+    "updater" = ps: with ps; [ distro ];
+    "upnp" = ps: with ps; [ miniupnpc ];
+    "usps" = ps: with ps; [  ];
+    "vacuum.roomba" = ps: with ps; [  ];
+    "vacuum.xiaomi_miio" = ps: with ps; [ construct ];
+    "velbus" = ps: with ps; [  ];
+    "velux" = ps: with ps; [  ];
+    "vera" = ps: with ps; [  ];
+    "verisure" = ps: with ps; [  ];
+    "volvooncall" = ps: with ps; [  ];
+    "vultr" = ps: with ps; [ vultr ];
+    "wake_on_lan" = ps: with ps; [ wakeonlan ];
+    "waterfurnace" = ps: with ps; [  ];
+    "weather.buienradar" = ps: with ps; [  ];
+    "weather.darksky" = ps: with ps; [  ];
+    "weather.metoffice" = ps: with ps; [  ];
+    "weather.openweathermap" = ps: with ps; [  ];
+    "weather.yweather" = ps: with ps; [ yahooweather ];
+    "wemo" = ps: with ps; [  ];
+    "wink" = ps: with ps; [  ];
+    "xiaomi_aqara" = ps: with ps; [  ];
+    "zabbix" = ps: with ps; [  ];
+    "zeroconf" = ps: with ps; [ zeroconf ];
+    "zha" = ps: with ps; [  ];
+    "zigbee" = ps: with ps; [  ];
+    "zwave" = ps: with ps; [ pydispatcher python_openzwave ];
+  };
+}
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0f15b21e468527bdd6c00dc156863c44d900581c
--- /dev/null
+++ b/pkgs/servers/home-assistant/default.nix
@@ -0,0 +1,108 @@
+{ lib, fetchFromGitHub, python3
+, extraComponents ? []
+, extraPackages ? ps: []
+, skipPip ? true }:
+
+let
+
+  py = python3.override {
+    packageOverrides = self: super: {
+      aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
+        version = "3.1.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "dc5cab081d4b334d0440b019edf24fe1cb138b8114e0e22d2b0661284bc1775f";
+        };
+      });
+      pytest = super.pytest.overridePythonAttrs (oldAttrs: rec {
+        version = "3.4.2";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5";
+        };
+      });
+      voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec {
+        version = "0.11.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918";
+        };
+      });
+      astral = super.astral.overridePythonAttrs (oldAttrs: rec {
+        version = "1.6";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083";
+        };
+      });
+      async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
+        version = "2.0.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0";
+        };
+      });
+      hass-frontend = super.callPackage ./frontend.nix { };
+    };
+  };
+
+  componentPackages = import ./component-packages.nix;
+
+  availableComponents = builtins.attrNames componentPackages.components;
+
+  getPackages = component: builtins.getAttr component componentPackages.components;
+
+  componentBuildInputs = lib.concatMap (component: getPackages component py.pkgs) extraComponents;
+
+  # Ensure that we are using a consistent package set
+  extraBuildInputs = extraPackages py.pkgs;
+
+  # Don't forget to run parse-requirements.py after updating
+  hassVersion = "0.67.1";
+
+in with py.pkgs; buildPythonApplication rec {
+  pname = "homeassistant";
+  version = assert (componentPackages.version == hassVersion); hassVersion;
+
+  disabled = pythonOlder "3.5";
+
+  inherit availableComponents;
+
+  # PyPI tarball is missing tests/ directory
+  src = fetchFromGitHub {
+    owner = "home-assistant";
+    repo = "home-assistant";
+    rev = version;
+    sha256 = "02czbqdsdar8rjkr0r5g6j1x9caazcir2w1hp595z4cn90c0342f";
+  };
+
+  propagatedBuildInputs = [
+    # From setup.py
+    requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs
+    # From http, frontend and recorder components
+    sqlalchemy aiohttp-cors hass-frontend
+  ] ++ componentBuildInputs ++ extraBuildInputs;
+
+  checkInputs = [
+    pytest requests-mock pydispatcher pytest-aiohttp
+  ];
+
+  checkPhase = ''
+    # The components' dependencies are not included, so they cannot be tested
+    py.test --ignore tests/components
+    # Some basic components should be tested however
+    # test_not_log_password fails because nothing is logged at all
+    py.test -k "not test_not_log_password" \
+      tests/components/{group,http} \
+      tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py
+  '';
+
+  makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";
+
+  meta = with lib; {
+    homepage = https://home-assistant.io/;
+    description = "Open-source home automation platform running on Python 3";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ f-breidenstein dotlambda ];
+  };
+}
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fbafa87e622ec853ac78b10b10f98bac7cc686dd
--- /dev/null
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchPypi, buildPythonPackage, user-agents }:
+
+buildPythonPackage rec {
+  pname = "home-assistant-frontend";
+  version = "20180404.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ac36d4f5e30e93b02dadd2ecdc07218fde3d97ffc2f69a6f1acf5e601cd4e5ad";
+  };
+
+  propagatedBuildInputs = [ user-agents ];
+}
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
new file mode 100755
index 0000000000000000000000000000000000000000..46e7acee17824da4b0b82c6c932951c7100f6e74
--- /dev/null
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -0,0 +1,114 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ ])"
+#
+# This script downloads https://github.com/home-assistant/home-assistant/blob/master/requirements_all.txt.
+# This file contains lines of the form
+#
+#     # homeassistant.components.foo
+#     # homeassistant.components.bar
+#     foobar==1.2.3
+#
+# i.e. it lists dependencies and the components that require them.
+# By parsing the file, a dictionary mapping component to dependencies is created.
+# For all of these dependencies, Nixpkgs' python3Packages are searched for appropriate names.
+# Then, a Nix attribute set mapping component name to dependencies is created.
+
+from urllib.request import urlopen
+from collections import OrderedDict
+import subprocess
+import os
+import sys
+import json
+import re
+
+GENERAL_PREFIX = '# homeassistant.'
+COMPONENT_PREFIX = GENERAL_PREFIX + 'components.'
+PKG_SET = 'python3Packages'
+
+def get_version():
+    with open(os.path.dirname(sys.argv[0]) + '/default.nix') as f:
+        m = re.search('hassVersion = "([\\d\\.]+)";', f.read())
+        return m.group(1)
+
+def fetch_reqs(version='master'):
+    requirements = {}
+    with urlopen('https://github.com/home-assistant/home-assistant/raw/{}/requirements_all.txt'.format(version)) as response:
+        components = []
+        for line in response.read().decode().splitlines():
+            if line == '':
+                components = []
+            elif line[:len(COMPONENT_PREFIX)] == COMPONENT_PREFIX:
+                component = line[len(COMPONENT_PREFIX):]
+                components.append(component)
+                if component not in requirements:
+                    requirements[component] = []
+            elif line[:len(GENERAL_PREFIX)] != GENERAL_PREFIX: # skip lines like "# homeassistant.scripts.xyz"
+                # Some dependencies are commented out because they don't build on all platforms
+                # Since they are still required for running the component, don't skip them
+                if line[:2] == '# ':
+                    line = line[2:]
+                # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0
+                # Therefore, if there's a "#" in the line, only take the part after it
+                line = line[line.find('#') + 1:]
+                for component in components:
+                    requirements[component].append(line)
+    return requirements
+
+# Store a JSON dump of Nixpkgs' python3Packages
+output = subprocess.check_output(['nix-env', '-f', os.path.dirname(sys.argv[0]) + '/../../..', '-qa', '-A', PKG_SET, '--json'])
+packages = json.loads(output)
+
+def name_to_attr_path(req):
+    attr_paths = []
+    names = [req]
+    # E.g. python-mpd2 is actually called python3.6-mpd2
+    # instead of python-3.6-python-mpd2 inside Nixpkgs
+    if req.startswith('python-') or req.startswith('python_'):
+        names.append(req[len('python-'):])
+    for name in names:
+        # treat "-" and "_" equally
+        name = re.sub('[-_]', '[-_]', name)
+        pattern = re.compile('^python\\d\\.\\d-{}-\\d'.format(name), re.I)
+        for attr_path, package in packages.items():
+            if pattern.match(package['name']):
+                attr_paths.append(attr_path)
+    # Let's hope there's only one derivation with a matching name
+    assert(len(attr_paths) <= 1)
+    if attr_paths:
+        return attr_paths[0]
+    else:
+        return None
+
+version = get_version()
+print('Generating component-packages.nix for version {}'.format(version))
+requirements = fetch_reqs(version=version)
+build_inputs = {}
+for component, reqs in OrderedDict(sorted(requirements.items())).items():
+    attr_paths = []
+    for req in reqs:
+        try:
+            name = req.split('==')[0]
+            attr_path = name_to_attr_path(name)
+            if attr_path is not None:
+                # Add attribute path without "python3Packages." prefix
+                attr_paths.append(attr_path[len(PKG_SET + '.'):])
+        except RequirementParseError:
+            continue
+    else:
+        build_inputs[component] = attr_paths
+
+# Only select components which have any dependency
+#build_inputs = {k: v for k, v in build_inputs.items() if len(v) > 0}
+
+with open(os.path.dirname(sys.argv[0]) + '/component-packages.nix', 'w') as f:
+    f.write('# Generated from parse-requirements.py\n')
+    f.write('# Do not edit!\n\n')
+    f.write('{\n')
+    f.write('  version = "{}";\n'.format(version))
+    f.write('  components = {\n')
+    for component, attr_paths in build_inputs.items():
+        f.write('    "{}" = ps: with ps; [ '.format(component))
+        f.write(' '.join(attr_paths))
+        f.write(' ];\n')
+    f.write('  };\n')
+    f.write('}\n')
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 25097a31416dfd979b698e67a1de466f570eb6c2..dd076606da5bf99f6b1160c54afb6727c3bcc8ff 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -4,11 +4,11 @@
 , http2Support ? true, nghttp2
 , ldapSupport ? true, openldap
 , libxml2Support ? true, libxml2
+, brotliSupport ? true, brotli
 , luaSupport ? false, lua5
 }:
 
-let optional       = stdenv.lib.optional;
-    optionalString = stdenv.lib.optionalString;
+let inherit (stdenv.lib) optional optionalString;
 in
 
 assert sslSupport -> aprutil.sslSupport && openssl != null;
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.29";
+  version = "2.4.33";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00";
+    sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05";
   };
 
   # FIXME: -dev depends on -doc
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
   setOutputFlags = false; # it would move $out/modules, etc.
 
   buildInputs = [perl] ++
+    optional brotliSupport brotli ++
     optional sslSupport openssl ++
     optional ldapSupport openldap ++    # there is no --with-ldap flag
     optional libxml2Support libxml2 ++
@@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
     --enable-cern-meta
     --enable-imagemap
     --enable-cgi
+    ${optionalString brotliSupport "--enable-brotli --with-brotli=${brotli}"}
     ${optionalString proxySupport "--enable-proxy"}
     ${optionalString sslSupport "--enable-ssl"}
     ${optionalString http2Support "--enable-http2 --with-nghttp2"}
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 1e898075d191a3887837280a5b3a7d6d22e71d3f..948ef345e10d808422451ecc3f4e5fa2d63a8d60 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mod_wsgi-${version}";
-  version = "3.5";
+  version = "4.6.4";
 
   src = fetchurl {
     url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
-    sha256 = "14xz422jlakdhxzsl8xs9if86yf1fnkwdg0havjyqs7my0w4qrzh";
+    sha256 = "1hyaxr9km7cj4k6b0d6xx3bplpa8483fhyk9x802sl22m3f2vc1k";
   };
 
   buildInputs = [ apacheHttpd python2 ];
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix
index 8958b51e873ad1ef15442c167616244ee8379f41..415b1fb48a2af1eb100af4e2c0ec26484fdbed57 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -1,17 +1,28 @@
-{ stdenv, fetchurl, cmake, doxygen, zlib, openssl, bzip2, pkgconfig, libpthreadstubs }:
+{ stdenv
+, bzip2
+, cmake
+, doxygen
+, fetchurl
+, fuse
+, lzma
+, openssl
+, pkgconfig
+, systemd
+, tcp_wrappers
+, zlib
+}:
 
 stdenv.mkDerivation rec {
   name = "apt-cacher-ng-${version}";
-  version = "0.9.1";
+  version = "3.1";
 
   src = fetchurl {
     url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
-    sha256 = "1d686knvig1niapc1ib2045f7jfad3m4jvz6gkwm276fqvm4p694";
+    sha256 = "0p8cdig70vz1dgw2v8brjin5wqrk8amncphyf11f53bza5grlc91";
   };
 
-  NIX_LDFLAGS = "-lpthread";
   nativeBuildInputs = [ cmake doxygen pkgconfig ];
-  buildInputs = [ zlib openssl bzip2 libpthreadstubs ];
+  buildInputs = [ bzip2 fuse lzma openssl systemd tcp_wrappers zlib ];
 
   meta = with stdenv.lib; {
     description = "A caching proxy specialized for linux distribution files";
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
index 1e56a2dac48d40ca03830e612d4fd24d6b437d03..f94ff56373d46233e53e603de0b623db38762f2b 100644
--- a/pkgs/servers/http/couchdb/2.0.0.nix
+++ b/pkgs/servers/http/couchdb/2.0.0.nix
@@ -3,14 +3,15 @@
 
 stdenv.mkDerivation rec {
   name = "couchdb-${version}";
-  version = "2.0.0";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
-    sha256 = "1jkfx6g9anrgmkhrkcn50axcamragranwsciw1rhmi86rglkrbyc";
+    sha256 = "1k3v9v05417087b6fcj5yv03wl6i61xqrrhp0prl9b3ir2mmbwnm";
   };
 
-  buildInputs = [ erlang icu openssl spidermonkey makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ erlang icu openssl spidermonkey ];
 
   patches = [ ./jsapi.patch ];
   postPatch = ''
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 5a988d22ecb64d6dc8115fba08d59ebb346e20ef..43334819dc5643a0d07a0742da04222a28e6e66e 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -3,30 +3,18 @@
 
 stdenv.mkDerivation rec {
   name = "couchdb-${version}";
-  version = "1.6.1";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
-    sha256 = "09w6ijj9l5jzh81nvc3hrlqp345ajg3haj353g9kxkik6wbinq2s";
+    sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i";
   };
 
-  buildInputs = [ erlang icu openssl spidermonkey curl help2man sphinx which
-    file pkgconfig ];
-
-  /* This patch removes the `-Werror` flag as there are warnings due to
-   * _BSD_SOURCE being deprecated in glibc >= 2.20
-   */
-  patchPhase = ''
-    patch src/couchdb/priv/Makefile.in < couchjs_CFLAGS = -g -Wall -D_BSD_SOURCE \$(CURL_CFLAGS) \$(JS_CFLAGS)
-    EOF
-  '';
+  nativeBuildInputs = [ help2man which file pkgconfig sphinx ];
+  buildInputs = [ erlang icu openssl spidermonkey curl ];
 
   postInstall = ''
-    sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb
+    substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt"
   '';
 
   /*
diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix
index 549beec674ccf8f16bc38470fc7f2239ab203ba7..19b2d01f5be8560c38f44b4e850ecdbe653aac70 100644
--- a/pkgs/servers/http/gatling/default.nix
+++ b/pkgs/servers/http/gatling/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, libowfat, zlib, openssl }:
 
 let
-  version = "0.13";
+  version = "0.15";
 in
 stdenv.mkDerivation rec {
   name = "gatling-${version}";
 
   src = fetchurl {
-    url = "http://dl.fefe.de/${name}.tar.bz2";
-    sha256 = "0icjx20ws8gqxgpm77dx7p9zcwi1fv162in6igx04rmnyzyla8dl";
+    url = "https://www.fefe.de/gatling/${name}.tar.xz";
+    sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg";
   };
 
   buildInputs = [  libowfat zlib openssl.dev ];
diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..cd2985960a75513ff24ca7177f8bcb72e2b1471e
--- /dev/null
+++ b/pkgs/servers/http/h2o/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub
+, pkgconfig, cmake
+, libressl_2_6, libuv, zlib
+}:
+
+with builtins;
+
+stdenv.mkDerivation rec {
+  name = "h2o-${version}";
+  version = "2.2.4";
+
+  src = fetchFromGitHub {
+    owner  = "h2o";
+    repo   = "h2o";
+    rev    = "refs/tags/v${version}";
+    sha256 = "0176x0bzjry19zs074a9i5vhncc842xikmx43wj61jky318nq4w4";
+  };
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ libressl_2_6 libuv zlib ];
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Optimized HTTP/1 and HTTP/2 server";
+    homepage    = https://h2o.examp1e.net;
+    license     = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    platforms   = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index aa6f0e1f9108c5081f856dff874f16ba234e82f0..99900bbdb3ea8466e60c9dd9ca5a1002f9ec1ef2 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -12,11 +12,11 @@ assert enableSSL -> openssl !=null;
 
 stdenv.mkDerivation rec {
   name = "hiawatha-${version}";
-  version = "10.5";
+  version = "10.7";
 
   src = fetchurl {
     url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz";
-    sha256 = "11nqdmmhq1glgsiza8pfh69wmpgwl51vb3xijmpcxv63a7ywp4fj";
+    sha256 = "1k0vgpfkmdxmkimq4ab70cqwhj5qwr4pzq7nnv957ah8cw2ijy1z";
   };
 
   buildInputs =  [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ;
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     description = "An advanced and secure webserver";
     license = licenses.gpl2;
     homepage = https://www.hiawatha-webserver.org;
-    maintainer = [ maintainers.ndowens ];
+    maintainers = [ maintainers.ndowens ];
   };
 
 }
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 98ca50c5bc4a0fbb6e910a662ecd2330a0d63b49..1e99aab24c6028b814c9b962cf051e40080483bd 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -2,19 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "jetty-${version}";
-  version = "9.3.10.v20160621";
-
+  version = "9.4.8.v20171121";
   src = fetchurl {
     url = "http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
     name = "jetty-distribution-${version}.tar.gz";
-    sha256 = "0xqv7bp82i95gikma70kyi91nlgsj5zabzg59ly9ga4mqf5y0zbz";
+    sha256 = "0bvwi70vdk468yqgvgq99lwrpy2y5znrl0b1cr8j6ygmsgnvvmjh";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
 
   installPhase = ''
     mkdir -p $out
-    mv etc lib modules start.jar $out
+    mv etc lib modules start.ini start.jar $out
   '';
 
   meta = {
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index c3e15ed846db793827ff77f55f3dfe9d819c378c..7bf1b1ffa6465053a32a7b3d3dfac83cc4cc1924 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -1,27 +1,31 @@
 { stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, attr, bzip2, which, file
 , openssl, enableMagnet ? false, lua5_1 ? null
 , enableMysql ? false, mysql ? null
+, enableLdap ? false, openldap ? null
 }:
 
 assert enableMagnet -> lua5_1 != null;
 assert enableMysql -> mysql != null;
+assert enableLdap -> openldap != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.45";
+  name = "lighttpd-1.4.49";
 
   src = fetchurl {
     url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "0grsqh7pdqnjx6xicd96adsx84vryb7c4n21dnxfygm3xrfj55qw";
+    sha256 = "02ff77cpvy1006cwfym38vf78xm18plyj636ll74r7kx2bblkpxf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ]
              ++ stdenv.lib.optional enableMagnet lua5_1
-             ++ stdenv.lib.optional enableMysql mysql.lib;
+             ++ stdenv.lib.optional enableMysql mysql.connector-c
+             ++ stdenv.lib.optional enableLdap openldap;
 
   configureFlags = [ "--with-openssl" ]
                 ++ stdenv.lib.optional enableMagnet "--with-lua"
-                ++ stdenv.lib.optional enableMysql "--with-mysql";
+                ++ stdenv.lib.optional enableMysql "--with-mysql"
+                ++ stdenv.lib.optional enableLdap "--with-ldap";
 
   preConfigure = ''
     sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..878211ebf024da7dbaed98c5a5478206c4c02abb
--- /dev/null
+++ b/pkgs/servers/http/lwan/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, pkgconfig, zlib, cmake, jemalloc }:
+
+stdenv.mkDerivation rec {
+  pname = "lwan";
+  version = "0.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "lpereira";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1mckryzb06smky0bx2bkqwqzpnq4pb8vlgmmwsvqmwi4mmw9wmi1";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ jemalloc zlib ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight high-performance multi-threaded web server";
+    longDescription = "A lightweight and speedy web server with a low memory
+      footprint (~500KiB for 10k idle connections), with minimal system calls and
+      memory allocation.  Lwan contains a hand-crafted HTTP request parser. Files are
+      served using the most efficient way according to their size: no copies between
+      kernel and userland for files larger than 16KiB.  Smaller files are sent using
+      vectored I/O of memory-mapped buffers. Header overhead is considered before
+      compressing small files.  Features include: mustache templating engine and IPv6
+      support.
+    ";
+    homepage = "https://lwan.ws/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ leenaars ];
+  };
+}
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index de30870bee8349d626f97b08f2a5bc7e90152552..ff0a4c65b4a60502a5f0b0529610fe5eab985ba9 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     "--with-mail_ssl_module"
   ]
     ++ optional (gd != null) "--with-http_image_filter_module"
-    ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
+    ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
     ++ map (mod: "--add-module=${mod.src}") modules;
 
   NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 0eb8979c3ac4b8d51140b3c495220c4d5d923f64..2bfe0329595857705eb3b5c8868b31b41ac63d99 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix (args // {
-  version = "1.13.6";
-  sha256 = "1y7qcdpjskjc1iwwrjqsbgm74jpnf873pwv17clsy83ak1pzq4l5";
+  version = "1.13.9";
+  sha256 = "0hpsyxpxj89p5vrzv9p1hp7xjbnj5c1w6fdy626ycvsiay4a3bjz";
 })
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 9f0f5ac4bb994f5f66db02fd8cfddbb11f83c4d9..95e156f96275cd9c786342898c9a312d0291d215 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -1,22 +1,26 @@
-{ fetchFromGitHub, pkgs }:
+{ fetchFromGitHub, fetchurl, lib, pkgs }:
 
 {
   brotli = {
-    src = fetchFromGitHub {
-      owner = "google";
+    src = let gitsrc = pkgs.fetchFromGitHub {
+      owner = "eustas";
       repo = "ngx_brotli";
-      rev = "788615eab7c5e0a984278113c55248305620df14";
-      sha256 = "02514bbjdhm9m38vljdh626d3c1783jxsxawv5c6bzblwmb8xgvf";
-    };
-    inputs = [ pkgs.libbrotli ];
+      rev = "6a1174446f5a866d3d13615dd2824177570f0a69";
+      sha256 = "148xfh6w1wgql2jj922ryiddrs93dyacs903j2hnil67cpia45p6";
+    }; in pkgs.runCommandNoCC "ngx_brotli-src" {} ''
+      cp -a ${gitsrc} $out
+      substituteInPlace $out/config \
+        --replace /usr/local ${lib.getDev pkgs.brotli}
+    '';
+    inputs = [ pkgs.brotli ];
   };
 
-  rtmp = {
+  rtmp ={
     src = fetchFromGitHub {
       owner = "arut";
       repo = "nginx-rtmp-module";
-      rev = "v1.1.11";
-      sha256 = "09zrnf8lk179mpqnx92zm24xl7m3bq4ca84wc2zwi5hc8kxjbwxc";
+      rev = "v1.2.1";
+      sha256 = "0na1aam176irz6w148hnvamqy1ilbn4abhdzkva0yrm35a3ksbzn";
     };
   };
 
@@ -47,6 +51,16 @@
     '';
   };
 
+  modsecurity-nginx = {
+    src = fetchFromGitHub {
+      owner = "SpiderLabs";
+      repo = "ModSecurity-nginx";
+      rev = "v1.0.0";
+      sha256 = "0zzpdqhbdqqy8kjkszv0mrq6136ah9v3zwr1jbh312j8izmzdyi7";
+    };
+    inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ];
+  };
+
   echo = {
     src = fetchFromGitHub {
       owner = "openresty";
@@ -142,8 +156,8 @@
       moduleSrc = fetchFromGitHub {
         owner  = "pagespeed";
         repo   = "ngx_pagespeed";
-        rev    = "v${version}-beta";
-        sha256 = "03dvzf1lgsjxcs1jjxq95n2rhgq0wy0f9ahvgascy0fak7qx4xj9";
+        rev    = "v${version}-stable";
+        sha256 = "0ry7vmkb2bx0sspl1kgjlrzzz6lbz07313ks2lr80rrdm2zb16wp";
       };
 
       ngx_pagespeed = pkgs.runCommand
@@ -162,6 +176,7 @@
         '';
     in {
       src = ngx_pagespeed;
+      inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps
     };
 
     shibboleth = {
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 147e24c014d275af2601f4f535694a49d1312be5..093f5f0e5027822d5becf6e60a252ff44a00989d 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, gd, geoip
-, perl }:
-
-assert stdenv.isLinux;
+{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, postgresql, libxml2, libxslt,
+gd, geoip, perl }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openresty-${version}";
-  version = "1.9.3.1";
+  version = "1.13.6.1";
 
   src = fetchurl {
-    url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz";
-    sha256 = "1fw8yxjndf5gsk44l4bsixm270fxv7f5cdiwzq9ps6j3hhgx5kyv";
+    url = "http://openresty.org/download/openresty-${version}.tar.gz";
+    sha256 = "0sv93nw1j597mdpnibmgaa3nnghdk0z6k27vavm8w2c1z9n6w96i";
   };
 
-  buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ];
+  buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ];
+  nativeBuildInputs = [ perl ];
+
+  NIX_CFLAGS_COMPILE = ["-I${libxml2.dev}/include/libxml2"];
+
+  preConfigure = ''
+    patchShebangs .
+  '';
 
   configureFlags = [
     "--with-pcre-jit"
     "--with-http_ssl_module"
-    "--with-http_spdy_module"
+    "--with-http_v2_module"
     "--with-http_realip_module"
     "--with-http_addition_module"
     "--with-http_xslt_module"
@@ -36,26 +41,22 @@ stdenv.mkDerivation rec {
     "--with-http_secure_link_module"
     "--with-http_degradation_module"
     "--with-http_stub_status_module"
+    "--with-http_postgres_module"
     "--with-ipv6"
   ];
 
-  postInstall = ''
-    mv $out/nginx/sbin/nginx $out/bin
-    mv $out/luajit/bin/luajit-2.1.0-alpha $out/bin/luajit-openresty
-    ln -s $out/bin/nginx $out/bin/openresty
-  '';
+  enableParallelBuilding = true;
 
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags"
-    export PATH="$PATH:${stdenv.cc.libc.bin}/bin"
-    patchShebangs .
+  postInstall = ''
+    ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty
+    ln -s $out/nginx/sbin/nginx $out/bin/nginx
   '';
 
   meta = {
     description = "A fast web application server built on Nginx";
     homepage    = http://openresty.org;
     license     = licenses.bsd2;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ thoughtpolice ];
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ thoughtpolice lblasc ];
   };
 }
diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix
index 4eb74c8cb5341aba4ebeb33465cc6699c9614047..a0a1addeeebf9830fd51509332a51328afb7f4b1 100644
--- a/pkgs/servers/http/pshs/default.nix
+++ b/pkgs/servers/http/pshs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pshs-${version}";
-  version = "0.3.1";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "mgorny";
     repo = "pshs";
     rev = "v${version}";
-    sha256 = "18mhxdjlyr21gghzkrrlp0imicb6bqf741p0a21c2rkvs4bv8c1w";
+    sha256 = "04l03myh99npl78y8nss053gnc7k8q60vdbdpml19sshmwaw3fgi";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
index 08e682aa71699c44c64b4730faef507249fb93e6..c234a1ae1ee7ae91206b9365ca1de1d87d08c881 100644
--- a/pkgs/servers/http/thttpd/default.nix
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "thttpd-${version}";
-  version = "2.27";
+  version = "2.28";
 
   src = fetchurl {
     url = "http://acme.com/software/thttpd/${name}.tar.gz";
-    sha256 = "0ykda5k1zzzag59zbd4bkzj1psavq0xnpy7vpk19rhx7mlvvri5i";
+    sha256 = "0a03w7wg994dizdb37pf4kd9s5lf2q414721jfqnrqpdshlzjll5";
   };
 
   prePatch = ''
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 6a29ecaad56973ad807b44757c1a0bac4fc4f2ee..098825d59ce83ba28326f355b93e4a8fb7444345 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -32,25 +32,25 @@ let
 in {
   tomcat7 = common {
     versionMajor = "7";
-    versionMinor = "0.81";
-    sha256 = "0mcr3caizqk6qrc0j9p91apdsg65ksawg0l6xpqk1fq6071nd5rq";
+    versionMinor = "0.82";
+    sha256 = "0vb7c5i50ral4rr39ss95k7cxnzd7fs21zd7f97d1f3qslzwl69g";
   };
 
   tomcat8 = common {
     versionMajor = "8";
-    versionMinor = "0.46";
-    sha256 = "14wb9mgb7z02j6wvvmcsfc2zkcqnijc40gzyg1mnxcy5fvf8nzpk";
+    versionMinor = "0.47";
+    sha256 = "0xv4v3i08rwzfmz7rkhglq5cbjgnfava8dw0i33vsp7dk162a4g4";
   };
 
   tomcat85 = common {
     versionMajor = "8";
-    versionMinor = "5.20";
-    sha256 = "1l5cgxzaassjnfbr4rbr3wzz45idcqa8aqhphhvlx1xl8xqv6p8a";
+    versionMinor = "5.23";
+    sha256 = "1qnww70x75c0qf2wn8mkpz5lszggjnh78dpb4chyw2fnbm3wxain";
   };
 
-  tomcatUnstable = common {
+  tomcat9 = common {
     versionMajor = "9";
-    versionMinor = "0.0.M17";
-    sha256 = "1ilvka2062m7412bj2fsdwvfxbrjyj9qxcia40hhv22prvkxw3cg";
+    versionMinor = "0.2";
+    sha256 = "0aaykzi0b2xsdmjp60ihcjzh1m95p0a79kn5l2v7vgbkyg449638";
   };
 }
diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix
index 67172edfd36ec9fecb8670f5bfeb7ab7e564e329..aae4589ebbe805a3f6e2eb99bcce8cce9f2e5614 100644
--- a/pkgs/servers/http/yaws/default.nix
+++ b/pkgs/servers/http/yaws/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yaws-${version}";
-  version = "2.0";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "http://yaws.hyber.org/download/${name}.tar.gz";
-    sha256 = "1gwk44a07n7yvg900yrlfc6qpvjl64k2h2hddd1jaaay8lgpcch6";
+    sha256 = "00bnvf26xlhm3v3c6jzk5kcdk8jkwr1gbd2f4h329lyrpjsx30my";
   };
 
   # The tarball includes a symlink yaws -> yaws-1.95, which seems to be
diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix
index b8eb21e492bce28ab75aec87f8ad76501ad1f29c..1abe9512f589fd6dc41463492e898c94a049b2bc 100644
--- a/pkgs/servers/identd/oidentd/default.nix
+++ b/pkgs/servers/identd/oidentd/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "oidentd-2.0.8";
+  name = "oidentd-${version}";
+  version = "2.2.2";
 
   CFLAGS = [ "--std=gnu89" ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/ojnk/${name}.tar.gz";
-    sha256 = "0vzv2086rrxcaavrm3js7aqvyc0grgaqy78x61d8s7r8hz8vwk55";
+    url = "https://ftp.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz";
+    sha256 = "1svj7ymljp4s17d7jlx6602n9081714qsj5yymmv1s9wagzjqyn9";
   };
 
   meta = {
diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix
index 0ffef616f370db76b49cf85106f2c2ddc0f8a759..fbe226d3e3d3a661a52cfad312cdbf222ccd7aa5 100644
--- a/pkgs/servers/inginious/default.nix
+++ b/pkgs/servers/inginious/default.nix
@@ -65,6 +65,7 @@ in pythonPackages.buildPythonApplication rec {
   '';
 
   meta = {
+    broken = true;
     description = "An intelligent grader that allows secured and automated testing of code made by students";
     homepage = https://github.com/UCL-INGI/INGInious;
     license = licenses.agpl3;
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index a0b59d332a3f3ebb95ad7aced281140dabbaa64e..0df055f9690f9fa223d8f4f4897e162781612f7d 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup,
-  buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, sudo, coreutils, systemd, cryptsetup
+, mount, umount
+, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "interlock-${version}";
@@ -23,8 +24,8 @@ buildGoPackage rec {
   buildFlags = [ "-tags textsecure" ];
   postPatch = ''
     grep -lr '/s\?bin/' | xargs sed -i \
-      -e 's|/bin/mount|${utillinux}/bin/mount|' \
-      -e 's|/bin/umount|${utillinux}/bin/umount|' \
+      -e 's|/bin/mount|${mount}/bin/mount|' \
+      -e 's|/bin/umount|${umount}/bin/umount|' \
       -e 's|/bin/cp|${coreutils}/bin/cp|' \
       -e 's|/bin/mv|${coreutils}/bin/mv|' \
       -e 's|/bin/chown|${coreutils}/bin/chown|' \
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index c13a0ee3d89b81cf88e03a6f6ce0beef6103a4f6..c73c69e6ee5a1fc4e252325bec4848177e3316d6 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "ircd-hybrid-8.2.21";
+  name = "ircd-hybrid-8.2.24";
 
   src = fetchurl {
     url = "mirror://sourceforge/ircd-hybrid/${name}.tgz";
-    sha256 = "19cgrgmmz1c72x4gxpd39f9ckm4j9cp1gpgvlkk73d3v13znfzy3";
+    sha256 = "03nmzrhqfsxwry316nm80m9p285v65fz75ns7fg623hcy65jv97a";
   };
 
   buildInputs = [ openssl zlib ];
diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
index 4dd57b17fed3f3f31d9b8bfd594bb0abcc2a969b..bdd88db09844eecdf3227ffbd6e5cf40bcd64198 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ngircd-24";
 
   src = fetchurl {
-    url = "http://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
+    url = "https://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
     sha256 = "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp";
   };
 
diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix
index 6ad233593a3b1685d7c621a724298a9dba9231be..002760ff0fd3b07c0a2924bae4ca00b69a8d06f2 100644
--- a/pkgs/servers/irker/default.nix
+++ b/pkgs/servers/irker/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hslwqa0gqsnl3l6hd5hxpn0wlachxd51infifhlwhyhd6iwgx8p";
   };
 
-  nativeBuildInputs = [ pkgconfig xmlto docbook2x ];
+  nativeBuildInputs = [ pkgconfig xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ];
 
   buildInputs = [
     python
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
     # 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' ""
diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5aafe55512beb2dbf13f36959c5a8c806dd65fcc
--- /dev/null
+++ b/pkgs/servers/isso/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, python2, fetchurl, fetchFromGitHub }:
+
+let python = python2.override {
+  packageOverrides = self: super: {
+    misaka = super.misaka.overridePythonAttrs (old: rec {
+      version = "1.0.2";
+      src = old.src.override {
+        inherit version;
+        sha256 = "05rmjxlfhghj90m1kc55lx3z8igabw5y8wmly66p3hphdy4f95v1";
+      };
+      propagatedBuildInputs = [ ];
+    });
+    html5lib = super.html5lib.overridePythonAttrs (old: rec {
+      version = "0.9999999";
+      src = old.src.override {
+        inherit version;
+        sha256 = "2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868";
+      };
+      checkInputs = with self; [ nose flake8 ];
+      propagatedBuildInputs = with self; [ six ];
+      checkPhase = ''
+        nosetests
+      '';
+    });
+  };
+};
+
+in with python.pkgs; buildPythonApplication rec {
+  pname = "isso";
+  version = "0.10.6";
+
+  # no tests on PyPI
+  src = fetchFromGitHub {
+    owner = "posativ";
+    repo = pname;
+    rev = version;
+    sha256 = "19x9xbwd15fikhchyl4i1wrqx589hdmh279xhnxdszrq898igywb";
+  };
+
+  propagatedBuildInputs = [ misaka werkzeug ipaddr configparser html5lib ];
+
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    ${python.interpreter} setup.py nosetests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A commenting server similar to Disqus";
+    homepage = https://posativ.org/isso/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 594bc8caf5bc8f743b2fd590b88f59babea19fc2..34d242b92a8a301f70cef17e703b7bda47474a8f 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.151";
+  version = "0.8.823";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "2df2b296b5b314ed035e8d370bf5708a8b5a23957353e2e1e0007ec08a2138a0";
+    sha256 = "0hicz21dvcakqkxix70akc3rrz570j3g0a512pqrr3bdq7ay0dkk";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
index 50f94e4688c01fba6f4084ac8adb5afab80cd679..080cbc89775680059128068b20e78eaa6b891f1a 100644
--- a/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -19,6 +19,13 @@ stdenv.mkDerivation rec {
     sed -i 's:MANDIR = $(PREFIX)/man:MANDIR = '$out'/share/man:' ./Jamsettings
     sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings
   '';
+
+  # fix build on gcc7
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=builtin-declaration-mismatch"
+    "-Wno-error=implicit-fallthrough"
+  ];
+
   buildPhase = ''jam "-j$NIX_BUILD_CORES" '';
   installPhase = ''
     jam install
diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7214c08d2427b018f5094225818283a1851d494c
--- /dev/null
+++ b/pkgs/servers/mail/clamsmtp/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "clamsmtp-" + version;
+  version = "1.10";
+
+  src = fetchurl {
+    url = "http://thewalter.net/stef/software/clamsmtp/${name}.tar.gz";
+    sha256 = "0apr1pxifw6f1rbbsdrrwzs1dnhybg4hda3qqhqcw7p14r5xnbx5";
+  };
+
+  patches = [ ./header-order.patch ];
+
+  meta = with stdenv.lib; {
+    description = "SMTP filter that allows to check for viruses using the ClamAV
+                   anti-virus software";
+    homepage = http://thewalter.net/stef/software/clamsmtp/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.ekleog ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/mail/clamsmtp/header-order.patch b/pkgs/servers/mail/clamsmtp/header-order.patch
new file mode 100644
index 0000000000000000000000000000000000000000..102ae0a471ddf7fe50e3d145c6ee5a0118885ac3
--- /dev/null
+++ b/pkgs/servers/mail/clamsmtp/header-order.patch
@@ -0,0 +1,25 @@
+diff --git a/common/smtppass.c b/common/smtppass.c
+index d9be1ba..4a366f4 100644
+--- a/common/smtppass.c
++++ b/common/smtppass.c
+@@ -60,15 +60,15 @@
+ 
+ #include "usuals.h"
+ 
+-#ifdef LINUX_TRANSPARENT_PROXY
+-#include 
+-#endif
+-
+ #include "compat.h"
+ #include "sock_any.h"
+ #include "stringx.h"
+ #include "sppriv.h"
+ 
++#ifdef LINUX_TRANSPARENT_PROXY
++#include 
++#endif
++
+ /* -----------------------------------------------------------------------
+  *  STRUCTURES
+  */
+
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 33da203c502d20d29da718acb5bc1bb761e0543a..c9065d041618f202eb6d7454fb2920cf2c857290 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl
-, bzip2, zlib, inotify-tools, pam, libcap
-, clucene_core_2, icu, openldap
+{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl
+, bzip2, zlib, lz4, inotify-tools, pam, libcap
+, clucene_core_2, icu, openldap, libsodium, libstemmer
 # Auth modules
-, withMySQL ? false, libmysql
+, withMySQL ? false, mysql
 , withPgSQL ? false, postgresql
 , withSQLite ? true, sqlite
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.2.32";
+  name = "dovecot-2.3.1";
 
   nativeBuildInputs = [ perl pkgconfig ];
-  buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
+  buildInputs =
+    [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer ]
     ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
-    ++ lib.optional withMySQL libmysql
+    ++ lib.optional withMySQL mysql.connector-c
     ++ lib.optional withPgSQL postgresql
     ++ lib.optional withSQLite sqlite;
 
   src = fetchurl {
-    url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
-    sha256 = "0bmwyvi1crmrca2knvknsf517x53w7gxrclwyrvrhddgw98j22qn";
+    url = "http://dovecot.org/releases/2.3/${name}.tar.gz";
+    sha256 = "14zva4f8k64x86sm9n21cp2yvrpph6k6k52bm22a00pxjwdq50q8";
   };
 
   preConfigure = ''
@@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
     "--with-ssl=openssl"
     "--with-zlib"
     "--with-bzlib"
+    "--with-lz4"
     "--with-ldap"
     "--with-lucene"
     "--with-icu"
@@ -68,9 +70,9 @@ stdenv.mkDerivation rec {
     ++ lib.optional withSQLite "--with-sqlite";
 
   meta = {
-    homepage = http://dovecot.org/;
+    homepage = https://dovecot.org/;
     description = "Open source IMAP and POP3 email server written with security primarily in mind";
-    maintainers = with stdenv.lib.maintainers; [viric peti rickynils];
+    maintainers = with stdenv.lib.maintainers; [ viric peti rickynils fpletz ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix
deleted file mode 100644
index 1a1ba1ad4486fd2769a1ada2e267fc541f95011d..0000000000000000000000000000000000000000
--- a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchhg, autoconf, automake, dovecot, openssl }:
-
-stdenv.mkDerivation {
-  name = "dovecot-antispam-20130429";
-
-  src = fetchhg {
-    url = "http://hg.dovecot.org/dovecot-antispam-plugin/";
-    rev = "5ebc6aae4d7c";
-    sha256 = "181i79c9sf3a80mgmycfq1f77z7fpn3j2s0qiddrj16h3yklf4gv";
-  };
-
-  buildInputs = [ dovecot openssl ];
-  nativeBuildInputs = [ autoconf automake ];
-
-  preConfigure = ''
-    ./autogen.sh
-    # Ugly hack; any ideas?
-    sed "s,^dovecot_moduledir=.*,dovecot_moduledir=$out/lib/dovecot," ${dovecot}/lib/dovecot/dovecot-config > dovecot-config
-  '';
-
-  configureFlags = [
-    "--with-dovecot=."
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://wiki2.dovecot.org/Plugins/Antispam;
-    description = "An antispam plugin for the Dovecot IMAP server";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 3df0b41c2cab6cca7705de81789354a3623d3be7..e98c58c891a1eb3e49ae45a89a0211ea7594abcb 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dovecot-pigeonhole-${version}";
-  version = "0.4.20";
+  version = "0.5.1";
 
   src = fetchurl {
-    url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
-    sha256 = "0nxy007wmyamwj01yfiqbqjnbsd98z783b811rcavwi5iw5pvqbg";
+    url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
+    sha256 = "0ivmaxic6cygfphvlrvy0xgggydm7j7kjv1ssfqbr08q4rcsmc73";
   };
 
   buildInputs = [ dovecot openssl ];
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     description = "A sieve plugin for the Dovecot IMAP server";
     license = licenses.lgpl21;
     maintainers = [ maintainers.rickynils ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
index 623f0a2b0e22d89858d5e899529411cb53ff9b72..b63390bb2474a95b6e959a1f81dbf44c23b4f0ca 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, makeWrapper
 , gawk, gnused, gnugrep, coreutils, which
 , perl, NetSMTP
-, withMySQL ? false, zlib, libmysql
+, withMySQL ? false, zlib, mysql57
 , withPgSQL ? false, postgresql
 , withSQLite ? false, sqlite
 , withDB ? false, db
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [ perl ]
-                ++ lib.optionals withMySQL [ zlib libmysql ]
+                ++ lib.optionals withMySQL [ zlib mysql57.connector-c ]
                 ++ lib.optional withPgSQL postgresql
                 ++ lib.optional withSQLite sqlite
                 ++ lib.optional withDB db;
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
     "--enable-preferences-extension"
     "--enable-long-usernames"
     "--enable-external-lookup"
-  ] ++ lib.optional withMySQL "--with-mysql-includes=${lib.getDev libmysql}/include/mysql"
+  ] ++ lib.optional withMySQL "--with-mysql-includes=${mysql57.connector-c}/include/mysql"
     ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib";
 
   # Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR"
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index b4cec18d030ee4aad3ce235c751d8a892bdab966..393ce2c5cda95d9ba9407f263aec47f8f7d3c1c8 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,23 +1,18 @@
-{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv, fetchpatch }:
+{ coreutils, db, fetchurl, openldap, openssl, pcre, perl, pkgconfig, stdenv
+, enableLDAP ? false
+}:
 
 stdenv.mkDerivation rec {
-  name = "exim-4.89";
+  name = "exim-4.91";
 
   src = fetchurl {
     url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
-    sha256 = "09lndv34jsxwglq5zsh9y4xaqj5g37g9ca4x0zb25fvvm4f0lj8c";
+    sha256 = "066ip7a5lqfn9rcr14j4nm0kqysw6mzvbbb0ip50lmfm0fqsqmzc";
   };
 
-  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";
-    })
-  ];
-
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ coreutils db openssl pcre perl ];
+  buildInputs = [ coreutils db openssl pcre perl ]
+    ++ stdenv.lib.optional enableLDAP openldap;
 
   preBuild = ''
     sed '
@@ -41,6 +36,11 @@ stdenv.mkDerivation rec {
       s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm:
       s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch:
       s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl:
+      ${stdenv.lib.optionalString enableLDAP ''
+        s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1:
+        s:^# \(LOOKUP_LDAP=yes\)$:\1:
+        s:^# \(LOOKUP_LIBS\)=.*:\1=-lldap:
+      ''}
       #/^\s*#.*/d
       #/^\s*$/d
     ' < src/EDITME > Local/Makefile
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index d64e41f300716f4143f8531e9577bb30a7e21f10..8ff20869b94efb9e97758c79bb9eb476803b8013 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7";
   };
 
-  buildInputs = [ python pythonPackages.dns ];
+  buildInputs = [ python pythonPackages.dnspython ];
 
   patches = [ ./fix-var-prefix.patch ];
 
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix
index ddf4fd5d880d1b768994cdcff7f77a937ae0408e..f11400c190af90ea8b916cc72f4b031f815dcf28 100644
--- a/pkgs/servers/mail/mlmmj/default.nix
+++ b/pkgs/servers/mail/mlmmj/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "mlmmj-${version}";
-  version = "1.2.19.0";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "http://mlmmj.org/releases/${name}.tar.gz";
-    sha256 = "18n7b41nfdj7acvmqzkkz984d26xvz14xk8kmrnzv23dkda364m0";
+    sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn";
   };
 
   postInstall = ''
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index 5e5170afbc79c35bdd598876e5c981d8d508eae2..6b63c317d78f215b45d7466a0853e6739e9905df 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, openssl, libevent, libasr,
-  python2, pkgconfig, lua5, perl, mariadb, postgresql, sqlite, hiredis }:
+  python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis }:
+
 stdenv.mkDerivation rec {
   name = "opensmtpd-extras-${version}";
   version = "5.7.1";
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl libevent
-    libasr python2 lua5 perl mariadb.client postgresql sqlite hiredis ];
+    libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ];
 
   configureFlags = [
     "--sysconfdir=/etc"
@@ -54,7 +55,7 @@ stdenv.mkDerivation rec {
     "--with-perl=${perl}"
     "--with-filter-perl"
 
-  ] ++ stdenv.lib.optional (mariadb != null) [
+  ] ++ stdenv.lib.optional (mysql != null) [
     "--with-table-mysql"
 
   ] ++ stdenv.lib.optional (postgresql != null) [
@@ -67,13 +68,14 @@ stdenv.mkDerivation rec {
     "--with-table-redis"
   ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) [ "-I${hiredis}/include/hiredis" ];
+  NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) "-I${hiredis}/include/hiredis" ++
+    stdenv.lib.optional (mysql != null) "-L${mysql.connector-c}/lib/mysql";
 
   meta = with stdenv.lib; {
     homepage = https://www.opensmtpd.org/;
     description = "Extra plugins for the OpenSMTPD mail server";
     license = licenses.isc;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ gebner ];
   };
 }
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 7b6be5ec39e887cef0d437065c8ab48639358b31..a5168ebd4dfaa64d5e7fb289ca96a71d2c2dc445 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
 , coreutils, findutils, gnugrep, gawk, icu, pcre
 , withPgSQL ? false, postgresql
-, withMySQL ? false, libmysql
+, withMySQL ? false, mysql
 , withSQLite ? false, sqlite
 , withLDAP ? false, openldap
 }:
@@ -11,7 +11,7 @@ let
     "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
     "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
    ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
-     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${lib.getDev libmysql}/include/mysql" ]
+     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]
      ++ lib.optional withSQLite "-DHAS_SQLITE"
      ++ lib.optional withLDAP "-DHAS_LDAP");
    auxlibs = lib.concatStringsSep " " ([
@@ -25,17 +25,17 @@ in stdenv.mkDerivation rec {
 
   name = "postfix-${version}";
 
-  version = "3.2.3";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
-    sha256 = "1gs025smgynrlsg44cypjam99ds92mc9q46l5085d9sy0xfrf2sv";
+    sha256 = "0fggpbsc9jkrbaw9hy0zw9h32plmfvcv0x860pbih0g346byhhkr";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
                 ++ lib.optional withPgSQL postgresql
-                ++ lib.optional withMySQL libmysql
+                ++ lib.optional withMySQL mysql.connector-c
                 ++ lib.optional withSQLite sqlite
                 ++ lib.optional withLDAP openldap;
 
@@ -90,7 +90,7 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.postfix.org/;
     description = "A fast, easy to administer, and secure mail server";
-    license = lib.licenses.bsdOriginal;
+    license = with lib.licenses; [ ipl10 epl20 ];
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.rickynils ];
   };
diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix
index 95f460e917b5a5c078a5564ecc103679265d58c1..1836d0e5cf3637602871c5ce7cbeb1ce702fe14b 100644
--- a/pkgs/servers/mail/postgrey/default.nix
+++ b/pkgs/servers/mail/postgrey/default.nix
@@ -8,18 +8,18 @@ let
     policy-test-flags = mk-perl-flags (with perlPackages; [
       ParseSyslog
     ]);
-    version = "1.36";
+    version = "1.37";
     name = "postgrey-${version}";
 in runCommand name {
   src = fetchurl {
     url = "http://postgrey.schweikert.ch/pub/${name}.tar.gz";
-    sha256 = "09jzb246ki988389r9gryigriv9sravk40q75fih5n0q4p2ghax2";
+    sha256 = "1xx51xih4711vrvc6d57il9ccallbljj5zhgqdb07jzmz11rakgz";
   };
   meta = with stdenv.lib; {
     description = "A postfix policy server to provide greylisting";
     homepage = https://postgrey.schweikert.ch/;
     platforms = postfix.meta.platforms;
-    licenses = licenses.gpl2;
+    license = licenses.gpl2;
   };
 } ''
     mkdir -p $out/bin
diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d5e410a86c1f5b5418fd4213f81ca3e2219f684f
--- /dev/null
+++ b/pkgs/servers/mail/pypolicyd-spf/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonApplication, fetchurl, pyspf }:
+
+buildPythonApplication rec {
+  name = "pypolicyd-spf-${version}";
+  majorVersion = "2.0";
+  version = "${majorVersion}.2";
+
+  src = fetchurl {
+    url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz";
+    sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z";
+  };
+
+  propagatedBuildInputs = [ pyspf ];
+
+  preBuild = ''
+    substituteInPlace setup.py --replace "'/etc'" "'$out/etc'"
+  '';
+
+  meta = with lib; {
+    homepage = https://launchpad.net/pypolicyd-spf/;
+    description = "Postfix policy engine for Sender Policy Framework (SPF) checking";
+    maintainers = with maintainers; [ abbradar ];
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 2b81edf48ba3d34707e2098c11a64dbcfeef2e22..3e31327980683fdfc71a1bc2d9243a4ff9460b01 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -6,13 +6,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
     rev = version;
-    sha256 = "1idy81absr5w677d4jlzic33hsrn0zjzbfhhdn6viym9vr8dvjx9";
+    sha256 = "04jqrki7rlxywdig264kavy1h5882rspi2drkbdzrk35jjq8rh3h";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 99045570a718bf60fde7c3c4a1e2c67a8fe91833..3cf4605396991c6de66a60e18653729d9f5aaaa5 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub }:
+{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub, fetchpatch }:
 let
   matrix-angular-sdk = pythonPackages.buildPythonPackage rec {
     name = "matrix-angular-sdk-${version}";
@@ -10,37 +10,41 @@ let
     };
   };
   matrix-synapse-ldap3 = pythonPackages.buildPythonPackage rec {
-    name = "matrix-synapse-ldap3-${version}";
-    version = "0.1.2";
+    pname = "matrix-synapse-ldap3";
+    version = "0.1.3";
 
     src = fetchFromGitHub {
       owner = "matrix-org";
       repo = "matrix-synapse-ldap3";
       rev = "v${version}";
-      sha256 = "16pivz1lhs1c3z84rxxy8khyvn0hqxwxaz552br1y9ri0maa0aq8";
+      sha256 = "0ss7ld3bpmqm8wcs64q1kb7vxlpmwk9lsgq0mh21a9izyfc7jb2l";
     };
 
     propagatedBuildInputs = with pythonPackages; [ service-identity ldap3 twisted ];
+
+    checkInputs = with pythonPackages; [ ldaptor mock ];
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.25.1";
+  version = "0.27.2";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "110558l147n1dqpylzrdzp8spj36nack88c5kknsxn69gr8yb7j2";
+    sha256 = "00hcjs5hbayamckcsfd92s7f3da9jv5nm5ygvwinyc7ml7gn66i3";
   };
 
-  patches = [ ./matrix-synapse.patch ];
+  patches = [
+    ./matrix-synapse.patch
+  ];
 
   propagatedBuildInputs = with pythonPackages; [
     blist canonicaljson daemonize dateutil frozendict pillow pyasn1
     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
+    psutil msgpack-python lxml matrix-synapse-ldap3
     phonenumbers jsonschema affinity bcrypt
   ];
 
diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index 5b2335c73f6ff3b5d300e909e8a3bdbd78b4c129..14662ff6cc2585d0b7446c34d6a2097a78925ee6 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "matterbridge-${version}";
-  version = "1.4.1";
+  version = "1.7.1";
 
   goPackagePath = "github.com/42wim/matterbridge";
 
   src = fetchurl {
     url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz";
-    sha256 = "0m0phv8rngrp9gfn71gd2z184n60rng1fmvmv5nkmzsclr2y7x8b";
+    sha256 = "0ajc7xswmwhc2xn937sv3b76s8hblfn9x9rj5825hi3d3s8zqq88";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index bf2824688441875a35ec85bf2d7e6ecb328c891e..936e457eb3361c409ad69d146b439bae4e6e4aa2 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,27 +1,32 @@
 { stdenv, fetchurl, fetchFromGitHub, buildGoPackage }:
 
+let
+  version = "4.8.0";
+  goPackagePath = "github.com/mattermost/mattermost-server";
+  buildFlags = "-ldflags \"-X '${goPackagePath}/model.BuildNumber=nixpkgs-${version}'\"";
+in
+
 buildGoPackage rec {
   name = "mattermost-${version}";
-  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "mattermost";
     repo = "mattermost-server";
     rev = "v${version}";
-    sha256 = "0imda96wgr2nkkxs2jfcqszx1fqgmbbrh7zqmgjh6ks3an1v4m3c";
+    sha256 = "16yf4p0n3klgh0zw2ikbahj9cy1wcxbwg86pld0yz63cfvfz5ns4";
   };
 
   webApp = fetchurl {
     url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
-    sha256 = "1gnzv9xkqawi36z7v9xsy1gk16x71qf0kn8r059qvyarjlyp7888";
+    sha256 = "0ykp9apsv2514bircgay0xi0jigiai65cnb8q77v1qxjzdyx8s75";
   };
 
-  goPackagePath = "github.com/mattermost/mattermost-server";
+  inherit goPackagePath;
 
   buildPhase = ''
     runHook preBuild
     cd go/src/${goPackagePath}/cmd/platform
-    go install
+    go install ${buildFlags}
     runHook postBuild
   '';
 
@@ -35,7 +40,7 @@ buildGoPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Open-Source, self-hosted Slack-alternative";
+    description = "Open-source, self-hosted Slack-alternative";
     homepage = https://www.mattermost.org;
     license = with licenses; [ agpl3 asl20 ];
     maintainers = with maintainers; [ fpletz ryantm ];
diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index 02a4e3bd66f75229c02773ff6993303b7fea6fe7..d489deb5944f61b8d19a2d6ece90a2a74d178045 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -2,16 +2,16 @@
 
 buildGoPackage rec {
   name = "matterircd-${version}";
-  version = "0.12.0";
+  version = "0.16.5";
 
   src = fetchFromGitHub {
     owner = "42wim";
     repo = "matterircd";
     rev = "v${version}";
-    sha256 = "1fgpfyb78l1kl0kja2fjqc4ik1q869cmhx6xdmp9ff2qcqk22cj0";
+    sha256 = "1rsmc2dpf25rkl8c085xwssbry3hv1gv318m7rdj616agx4m7yr2";
   };
 
-  goPackagePath = "github.com/42vim/matterircd";
+  goPackagePath = "github.com/42wim/matterircd";
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index fabd5b83724b475af980f85a7b4c72d161b6622e..e326aff0d7eead787f03a2f376341e59f4dfdc93 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, cyrus_sasl, libevent}:
 
 stdenv.mkDerivation rec {
-  name = "memcached-1.4.39";
+  version = "1.5.7";
+  name = "memcached-${version}";
 
   src = fetchurl {
     url = "http://memcached.org/files/${name}.tar.gz";
-    sha256 = "0dfpmx0fqgp55j4vl06cz63fwx5kzhzipdm7n2kxjkvyg1ybzi13";
+    sha256 = "0ijfiy1w4hk3j8hhra6kablq8kjabvcdvsl8cwd4drvszjl0ddsv";
   };
 
   buildInputs = [cyrus_sasl libevent];
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d36810b9f5c1cf59e827da41d878f043d1dd7ad1
--- /dev/null
+++ b/pkgs/servers/metabase/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  name = "metabase-${version}";
+  version = "0.28.6";
+
+  src = fetchurl {
+    url = "http://downloads.metabase.com/v${version}/metabase.jar";
+    sha256 = "1dzs57yyx6k93gvyva9y38xdb4pbvdliad3zzgk3vs74fp1zh2vq";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The easy, open source way for everyone in your company to ask questions and learn from data.";
+    homepage    = https://metabase.com;
+    license     = licenses.agpl3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ schneefux thoughtpolice ];
+  };
+}
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index c9dfe9136df57670f06c0da66b4b16f5eca821fc..786a188bbfd8a3ddcfc7c1da6752c75ad67b420b 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -1,38 +1,28 @@
-{ lib, stdenv, fetchurl, go }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "minio-${version}";
 
-  version = "2017-09-29T19-16-56Z";
+  version = "2018-03-30T00-38-44Z";
 
-  src = fetchurl {
-    url = "https://github.com/minio/minio/archive/RELEASE.${version}.tar.gz";
-    sha256 = "1h028gyfvyh5x6k4fsj4s64sgzqy7jgln6kvs27bnxzigj6dp2wx";
+  src = fetchFromGitHub {
+    owner = "minio";
+    repo = "minio";
+    rev = "RELEASE.${version}";
+    sha256 = "17vam9ifi632yfxakanxi2660wqgqrhrhhzywrgh2jmzljippf80";
   };
 
-  buildInputs = [ go ];
+  goPackagePath = "github.com/minio/minio";
 
-  unpackPhase = ''
-    d=$TMPDIR/src/github.com/minio/minio
-    mkdir -p $d
-    tar xf $src -C $d --strip-component 1
-    export GOPATH=$TMPDIR
-    cd $d
-  '';
+  buildFlagsArray = [''-ldflags=
+    -X github.com/minio/minio/cmd.Version=${version}
+  ''];
 
-  buildPhase = ''
-    mkdir -p $out/bin
-    go build -o $out/bin/minio \
-      --ldflags "-X github.com/minio/minio/cmd.Version=${version}"
-  '';
-
-  installPhase = "true";
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.minio.io/;
     description = "An S3-compatible object storage server";
-    maintainers = with lib.maintainers; [ eelco bachp ];
-    platforms = lib.platforms.x86_64;
-    license = lib.licenses.asl20;
+    maintainers = with maintainers; [ eelco bachp ];
+    platforms = platforms.unix;
+    license = licenses.asl20;
   };
 }
diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix
index 57040f4694792748606af1c95b1d5f62d0f1dbd2..7fc041d81984aa2d0733bdad3b6ea63af49f0a7f 100644
--- a/pkgs/servers/misc/airsonic/default.nix
+++ b/pkgs/servers/misc/airsonic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "airsonic-${version}";
-  version = "10.0.1";
+  version = "10.1.1";
 
   src = fetchurl {
     url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war";
-    sha256 = "1qky8dz49200f6100ivkn5g7i0hzkv3gpq2r0cj6z53s8d1ayblc";
+    sha256 = "0acj6la88lnbfdp0nilvsll48zfig7sgibgwfjjckialppyg4ir6";
   };
 
   buildCommand = ''
diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
index 08c08d7d3c165c1692327d84524970802e4594e1..92bbc309ed3dd3ba8601b3121185ad88b17fccae 100644
--- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
+++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
@@ -13,4 +13,5 @@ mkDerivation {
   executableHaskellDepends = [ base bytestring network ];
   description = "accepts TCP connections and echoes the client's IP address back to it";
   license = stdenv.lib.licenses.lgpl3;
+  broken = true; # 2018-04-10
 }
diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix
index b84dd21c3571d4264ca25a20684c5fbe66c9b4d5..f546b0b075e54d5488cc1bac05f355ce60879f0c 100644
--- a/pkgs/servers/misc/subsonic/default.nix
+++ b/pkgs/servers/misc/subsonic/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, jre }:
 
-let version = "6.0"; in
+let version = "6.1.3"; in
 
 stdenv.mkDerivation rec {
   name = "subsonic-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/subsonic/subsonic-${version}-standalone.tar.gz";
-    sha256 = "0aw7lz7bkhqvjj3lkk68n2aqr5l84s91cgifg2379w2j7dgd056z";
+    sha256 = "1v21gfymaqcx6n6d88hvha60q9hgj5z1wsac5gcwq7cjah1893jx";
   };
 
   inherit jre;
diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix
index 0511c822ebe69a649cfb01ec606002c0cc7e47f8..466c3873c600464b20aed6096fc43ea323297fd0 100644
--- a/pkgs/servers/misc/taskserver/default.nix
+++ b/pkgs/servers/misc/taskserver/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     homepage = http://taskwarrior.org;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ];
+    maintainers = with stdenv.lib.maintainers; [ makefu ];
   };
 }
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index cb9e43a5c880273e9bc281f538777e20003b1c58..0480d056c592a6e582e70c156972e427e5208680 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "cadvisor-${version}";
-  version = "0.26.1";
+  version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
     rev = "v${version}";
-    sha256 = "0rv245acz2r12c6ga2ln01961sh36w15ay0nfpfcg8inz679dnvg";
+    sha256 = "132mpcp35cymm2zqig0yrvhnvgn72k7cmn6gla0v7r0yxfl879m3";
   };
 
-  buildInputs = [ go ];
+  nativeBuildInputs = [ go ];
 
   buildPhase = ''
     mkdir -p Godeps/_workspace/src/github.com/google/
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix
index 2e694ede497f6b04c7eb28b7adc2fb5f476d6ece..34b4e87bf65c6dc8f2f0faa2d41f400e4e95ab49 100644
--- a/pkgs/servers/monitoring/fusion-inventory/default.nix
+++ b/pkgs/servers/monitoring/fusion-inventory/default.nix
@@ -1,22 +1,44 @@
-{ stdenv, fetchurl, buildPerlPackage, perlPackages
+{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, gnused, nix, dmidecode, pciutils, usbutils, iproute, nettools
+, fetchFromGitHub, makeWrapper
 }:
 
 buildPerlPackage rec {
-  version = "2.3.18";
   name = "FusionInventory-Agent-${version}";
-  src = fetchurl {
-    url = "mirror://cpan/authors/id/G/GR/GROUSSE/${name}.tar.gz";
-    sha256 = "543d96fa61b8f2a2bc599fe9f694f19d1f2094dc5506bc514d00b8a445bc5401";
+  version = "2.3.21";
+
+  src = fetchFromGitHub {
+    owner = "fusioninventory";
+    repo = "fusioninventory-agent";
+    rev = version;
+    sha256 = "034clffcn0agx85macjgml4lyhvvck7idn94pqd2c77pk6crvw2y";
   };
 
-  patches = [ ./remove_software_test.patch ];
+  patches = [
+    ./remove_software_test.patch
+    # support for os-release file
+    (fetchurl {
+      url = https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff;
+      sha256 = "0bxrjmff80ab01n23xggci32ajsah6zvcmz5x4hj6ayy6dzwi6jb";
+    })
+    # support for Nix software inventory
+    (fetchurl {
+      url = https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff;
+      sha256 = "0pyf7mp0zsb3zcqb6yysr1zfp54p9ciwjn1pzayw6s9flmcgrmbw";
+    })
+    ];
 
   postPatch = ''
+
     patchShebangs bin
+
+    substituteInPlace "lib/FusionInventory/Agent/Tools/Linux.pm" \
+      --replace /sbin/ip ${iproute}/sbin/ip
+    substituteInPlace "lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm" \
+      --replace /sbin/ip ${iproute}/sbin/ip
   '';
 
   buildTools = [];
-  buildInputs = with perlPackages; [
+  buildInputs = [ makeWrapper ] ++ (with perlPackages; [
     CGI
     DataStructureUtil
     FileCopyRecursive
@@ -28,6 +50,7 @@ buildPerlPackage rec {
     IPCRun
     JSON
     LWPProtocolhttps
+    ModuleInstall
     NetSNMP
     TestCompile
     TestDeep
@@ -35,7 +58,7 @@ buildPerlPackage rec {
     TestMockModule
     TestMockObject
     TestNoWarnings
-  ];
+  ]);
   propagatedBuildInputs = with perlPackages; [
     FileWhich
     LWP
@@ -52,7 +75,10 @@ buildPerlPackage rec {
     cp -r lib $out
 
     for cur in $out/bin/*; do
-      sed -e "s|./lib|$out/lib|" -i "$cur"
+      if [ -x "$cur" ]; then
+        sed -e "s|./lib|$out/lib|" -i "$cur"
+        wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute]}
+      fi
     done
   '';
 
diff --git a/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch b/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch
index 5449f4d3740f580d879fddfc60309d7d5c506cd2..b360f418aa0bb41579236fa4c13ec394d9fb7d44 100644
--- a/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch
+++ b/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch
@@ -28,7 +28,7 @@ index 8ee7ff02c..bd5551ab3 100755
  skip 'live SNMP test disabled', 6 unless $ENV{TEST_LIVE_SNMP};
  
 diff --git a/t/apps/agent.t b/t/apps/agent.t
-index f417b4106..12207f192 100755
+index c0f6fc52f..c83837d70 100755
 --- a/t/apps/agent.t
 +++ b/t/apps/agent.t
 @@ -12,7 +12,7 @@ use XML::TreePP;
@@ -40,15 +40,28 @@ index f417b4106..12207f192 100755
  
  my ($content, $out, $err, $rc);
  
-@@ -73,11 +73,6 @@ subtest "first inventory execution and content" => sub {
+@@ -71,11 +71,6 @@ subtest "first inventory execution and content" => sub {
+     check_content_ok($out);
  };
  
- ok(
+-ok(
 -    exists $content->{REQUEST}->{CONTENT}->{SOFTWARES},
 -    'inventory has software'
 -);
 -
--ok(
+ ok(
      exists $content->{REQUEST}->{CONTENT}->{ENVS},
      'inventory has environment variables'
- );
+diff --git a/t/tasks/inventory/linux/softwares.t b/t/tasks/inventory/linux/softwares.t
+index 72a0e578c..13944f34f 100755
+--- a/t/tasks/inventory/linux/softwares.t
++++ b/t/tasks/inventory/linux/softwares.t
+@@ -89,7 +89,7 @@ my $rpm_packages = [
+         PUBLISHER   => 'Mageia.Org',
+         NAME        => 'xfsprogs',
+         COMMENTS    => 'Utilities for managing the XFS filesystem',
+-        INSTALLDATE => '25/03/2012',
++        INSTALLDATE => '24/03/2012',
+         FILESIZE    => '3628382',
+         FROM        => 'rpm',
+         ARCH        => 'x86_64',
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index fbe49dd634ec18320904e3517a4dabcc6f07e6db..d2a0d04638957c5b599b490f9939610822f834c4 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,28 +1,28 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "4.6.2";
-  name = "grafana-v${version}";
+  version = "5.0.4";
+  name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0awf00n3rrxjyiza3mga496k1k9c4fkg6rxn9azdab1qvdkzh513";
+    sha256 = "18f69985a5j6fd2ax6z50yfss70phdh1vwyx0z69j145zac3sf90";
   };
 
   srcStatic = fetchurl {
-    url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "08svlg190h5nvv701lcl3a2iak2xdmslpdwjv2w5fcdfyp7bd6ld";
+    url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
+    sha256 = "0xdpqf8n3ds0g7nhbiwahhdj0hfc4biz69rhkl48vm31idlr92sc";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
   postInstall = ''
     tar -xvf $srcStatic
     mkdir -p $bin/share/grafana
-    mv grafana-*/{public,conf,vendor} $bin/share/grafana/
-    ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/vendor/phantomjs/phantomjs
+    mv grafana-*/{public,conf,tools} $bin/share/grafana/
+    ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs
   '';
 
   meta = with lib; {
diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix
index db3c518c729631edc2e6864ae23aed16749dd8aa..39c04857638803cf5012a2c0af02358fadcbc8ca 100644
--- a/pkgs/servers/monitoring/heapster/default.nix
+++ b/pkgs/servers/monitoring/heapster/default.nix
@@ -10,7 +10,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "kubernetes";
     repo = "heapster";
-    sha256 = "057z9imgd2gvcbvahja3i26jzgm33dmfaxraakmcr4a2xfhj50hq";
+    sha256 = "1vg83207y7yigydnnhlvzs3s94vx02i56lqgs6a96c6i3mr3ydpb";
   };
 
   preBuild = ''
diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index 804826941f21fd459dabbddad602ebacf6bf3d90..409801e8b7dc1e03912788480b4f26d4e7703398 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/pkgs/servers/monitoring/kapacitor/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kapacitor-${version}";
-  version = "1.0.0";
+  version = "1.4.0";
 
   goPackagePath = "github.com/influxdata/kapacitor";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "kapacitor";
     rev = "v${version}";
-    sha256 = "14l9bhj6qdif79s4dyqqbnjgj3m4iarvw0ckld1wdhpdgvl8w9qh";
+    sha256 = "1qanf7qljzqqkyw2cdazg0ll13q8a3fs3sqydcgfbgpdmf707sj2";
   };
 
   meta = with lib; {
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix
index 212ab8513a91976eb5acd594dc40a097394d1f11..dcc6f6f16b7f82d4ca02f087f536da74822a152d 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rvl ];
     inherit version;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
diff --git a/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch b/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6e14d61370342a6cc5df247fd6e3fccd986adf1f
--- /dev/null
+++ b/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch
@@ -0,0 +1,41 @@
+commit af5fa3623bb9a73052f9154be4a0f38c60ea42a2
+Author: Kjetil Orbekk 
+Date:   Thu Nov 23 21:21:36 2017 -0500
+
+    node: add --sconfdir to set plugin configuration dir
+
+diff --git a/node/sbin/munin-node b/node/sbin/munin-node
+index 909c8c4e..0ccf3941 100755
+--- a/node/sbin/munin-node
++++ b/node/sbin/munin-node
+@@ -100,9 +100,11 @@ sub parse_args
+     my @ORIG_ARGV  = @ARGV;
+ 
+     my $servicedir_cmdline;
++    my $sconfdir_cmdline;
+     print_usage_and_exit() unless GetOptions(
+         "config=s"     => \$conffile,
+         "servicedir=s" => \$servicedir_cmdline,
++        "sconfdir=s"   => \$sconfdir_cmdline,
+         "debug!"       => \$DEBUG,
+         "pidebug!"     => \$PIDEBUG,
+         "paranoia!"    => \$paranoia,
+@@ -112,6 +114,7 @@ sub parse_args
+ 
+     # We untaint the args brutally, since the sysadm should know what he does
+     $servicedir = $1 if defined $servicedir_cmdline && $servicedir_cmdline =~ m/(.*)/;
++    $sconfdir = $1 if defined $sconfdir_cmdline && $sconfdir_cmdline =~ m/(.*)/;
+ 
+     # Reset ARGV (for HUPing)
+     @ARGV = @ORIG_ARGV;
+@@ -175,6 +178,10 @@ Use EfileE as configuration file. [@@CONFDIR@@/munin-node.conf]
+ 
+ Override plugin directory [@@CONFDIR@@/plugins/]
+ 
++=item B<< --sconfdir  >>
++
++Override plugin configuration directory [@@CONFDIR@@/plugin-conf.d/]
++
+ =item B< --[no]paranoia >
+ 
+ Only run plugins owned by root. Check permissions as well. [--noparanoia]
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 7882572b6c888b5059ca9df7c7614cab641ad59f..62fc3c6f8f556369c618586ef3d2fa81158744be 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.33";
+  version = "2.0.37";
   name = "munin-${version}";
 
   src = fetchFromGitHub {
     owner = "munin-monitoring";
     repo = "munin";
     rev = version;
-    sha256 = "0rs05b7926mjd58sdry33i91m1h3v3svl0wg2gmhljl8wqidac5w";
+    sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78";
   };
 
   buildInputs = [ 
@@ -67,6 +67,9 @@ stdenv.mkDerivation rec {
 
     # https://github.com/munin-monitoring/munin/pull/134
     ./adding_servicedir_munin-node.patch
+
+    ./adding_sconfdir_munin-node.patch
+    ./preserve_environment.patch
   ];
 
   preBuild = ''
@@ -102,8 +105,8 @@ stdenv.mkDerivation rec {
     find "$out/lib/plugins" -type f -print0 | xargs -0 -L1 \
         sed -i -e "s|/usr/bin/||g" -e "s|/usr/sbin/||g" -e "s|\|${bc}/bin/bc|g"
 
-    if test -e $out/nix-support/propagated-native-build-inputs; then
-        ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
+    if test -e $out/nix-support/propagated-build-inputs; then
+        ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
     fi
 
     for file in "$out"/bin/munindoc "$out"/sbin/munin-* "$out"/lib/munin-* "$out"/www/cgi/*; do
diff --git a/pkgs/servers/monitoring/munin/preserve_environment.patch b/pkgs/servers/monitoring/munin/preserve_environment.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ef66f48ecb42255f2e2fa8d4356f6ccb73a55e59
--- /dev/null
+++ b/pkgs/servers/monitoring/munin/preserve_environment.patch
@@ -0,0 +1,41 @@
+commit d94c29b7397362857b81d8c877a989fdb28490d8
+Author: Kjetil Orbekk 
+Date:   Tue Nov 21 15:37:42 2017 -0500
+
+    Keep environment variables instead of overwriting them.
+
+diff --git a/common/lib/Munin/Common/Defaults.pm b/common/lib/Munin/Common/Defaults.pm
+index 131f52c0..bbf42697 100644
+--- a/common/lib/Munin/Common/Defaults.pm
++++ b/common/lib/Munin/Common/Defaults.pm
+@@ -71,7 +71,7 @@ sub export_to_environment {
+ 
+     my %defaults = %{$class->get_defaults()};
+     while (my ($k, $v) = each %defaults) {
+-        $ENV{$k} = $v;
++        $ENV{$k} = $ENV{$k} || $v;
+     }
+ 
+     return
+diff --git a/node/lib/Munin/Node/Service.pm b/node/lib/Munin/Node/Service.pm
+index 1b4f6114..be58bd77 100644
+--- a/node/lib/Munin/Node/Service.pm
++++ b/node/lib/Munin/Node/Service.pm
+@@ -122,7 +122,7 @@ sub export_service_environment {
+     # We append the USER to the MUNIN_PLUGSTATE, to avoid CVE-2012-3512
+     my $uid = $self->_resolve_uid($service);
+     my $user = getpwuid($uid);
+-    $ENV{MUNIN_PLUGSTATE} = "$Munin::Common::Defaults::MUNIN_PLUGSTATE/$user";
++    $ENV{MUNIN_PLUGSTATE} = "$ENV{MUNIN_PLUGSTATE}/$user";
+ 
+     # Provide a consistent default state-file.
+     $ENV{MUNIN_STATEFILE} = "$ENV{MUNIN_PLUGSTATE}/$service-$ENV{MUNIN_MASTER_IP}";
+@@ -243,7 +243,7 @@ sub exec_service
+ 
+     # XXX - Create the statedir for the user
+     my $uid = $self->_resolve_uid($service);
+-    Munin::Node::OS->mkdir_subdir("$Munin::Common::Defaults::MUNIN_PLUGSTATE", $uid);
++    Munin::Node::OS->mkdir_subdir("$ENV{MUNIN_PLUGSTATE}", $uid);
+ 
+     $self->change_real_and_effective_user_and_group($service);
+ 
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 5d7becb165258caea0d3129cefab8cb7d3f9da7d..47bc6d58da90dbe05b1482564c2073840b794a30 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nagios-${version}";
-  version = "4.2.4";
+  version = "4.3.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
-    sha256 = "0w0blbwiw0ps04b7gkyyk89qkgwsxh6gydhmggbm1kl3ar3mq1dh";
+    sha256 = "1wa4m952sb23dqi5w759adimsp21bkhp598rpq9dnhz3v497h2y9";
   };
 
   patches = [ ./nagios.patch ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A host, service and network monitoring program";
-    homepage    = http://www.nagios.org/;
+    homepage    = https://www.nagios.org/;
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ];
diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index 4989a01c9e39dc8d0c4e1413f3a12db4935e38c1..deac45eadb62d45235bde0ee8ecea815edea3502 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "check_ssl_cert-${version}";
-  version = "1.51.0";
+  version = "1.64.0";
 
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
     rev = "v${version}";
-    sha256 = "07g4dhwp1plzmlqazapn0s0hysmf3kk0pa2x0wns482xm1v1mr05";
+    sha256 = "0pq297sbz9hzcaccnnsfmra0bac81cki9xfrnb22a1hgfhqjxy5r";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index 1d0b5fb833627b7f8b98440a0cd5dc15872ff480..77dcfa43c43f3a9f8d9a9bd80daa1282655ffc81 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, file, openssl, perl, unzip }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, file, openssl, perl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "net-snmp-5.7.3";
@@ -8,6 +8,19 @@ stdenv.mkDerivation rec {
     sha256 = "0gkss3zclm23zwpqfhddca8278id7pk6qx1mydpimdrrcndwgpz8";
   };
 
+  patches =
+    let fetchAlpinePatch = name: sha256: fetchpatch {
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5";
+      inherit name sha256;
+    };
+  in [
+    (fetchAlpinePatch "CVE-2015-5621.patch" "05098jyvd9ddr5q26z7scbbvk1bk6x4agpjm6pyprvpc1zpi0y09")
+    (fetchAlpinePatch "fix-Makefile-PL.patch" "14ilnkj3cr6mpi242hrmmmv8nv4dj0fdgn42qfk9aa7scwsc0lc7")
+    (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m")
+    (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid")
+    (fetchAlpinePatch "remove-U64-typedef.patch" "1msxyhcqkvhqa03dwb50288g7f6nbrcd9cs036m9xc8jdgjb8k8j")
+  ];
+
   preConfigure =
     ''
       perlversion=$(perl -e 'use Config; print $Config{version};')
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix
index 808257ca121f37ca0089b1b176e8ccdd99ec216a..a0f7341571ce4a3b2e249becf7f4970dec39be0d 100644
--- a/pkgs/servers/monitoring/plugins/default.nix
+++ b/pkgs/servers/monitoring/plugins/default.nix
@@ -62,7 +62,7 @@ _EOF
   '';
 
   meta = {
-    description = "Official monitoring plugins for Nagios/Ichinga/Sensu and others.";
+    description = "Official monitoring plugins for Nagios/Icinga/Sensu and others.";
     homepage    = https://www.monitoring-plugins.org;
     license     = licenses.gpl2;
     platforms   = platforms.linux;
diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix
index 312caab954bb1d138c9ae916d47ef627a82954da..e458e130ba490feb53e50bba00acf8f1d2dc8e13 100644
--- a/pkgs/servers/monitoring/plugins/esxi.nix
+++ b/pkgs/servers/monitoring/plugins/esxi.nix
@@ -32,6 +32,6 @@ in python2Packages.buildPythonApplication rec {
   meta = with stdenv.lib; {
     homepage = https://www.claudiokuenzler.com/nagios-plugins/;
     license = licenses.gpl2;
-    maintainer = with maintainers; [ peterhoeg ];
+    maintainers = with maintainers; [ peterhoeg ];
   };
 }
diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
index 441d9595bbd13ed44620a46b4280f53dcadf47ef..9f33835c8851b976ae76d5a0a4dc5c038ef927c7 100644
--- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix
+++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
@@ -46,9 +46,9 @@ let
     '';
 
     meta = with stdenv.lib; {
-      homepage   = https://labs.consol.de/;
-      license    = licenses.gpl2;
-      maintainer = with maintainers; [ peterhoeg ];
+      homepage    = https://labs.consol.de/;
+      license     = licenses.gpl2;
+      maintainers = with maintainers; [ peterhoeg ];
       inherit description;
     };
   };
diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix
index 2f26bc26ba44a5c134d6e84b1337aa1d627da304..9f03c9ea96f61badb55a6f6b727f8aa551c19a1e 100644
--- a/pkgs/servers/monitoring/plugins/uptime.nix
+++ b/pkgs/servers/monitoring/plugins/uptime.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "Uptime check plugin for Sensu/Nagios/others";
     homepage    = https://github.com/madrisan/nagios-plugins-uptime;
     license     = licenses.gpl3;
-    maintainer  = with maintainers; [ peterhoeg ];
+    maintainers = with maintainers; [ peterhoeg ];
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 444aa92ec2e6f8a58285218167a9b437f14ce780..2f9016b749911e90000903b492d6f30ffdd82385 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.9.1";
+  version = "0.14.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,31 +11,25 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "alertmanager";
-    sha256 = "1lkfj63pp4jf58xmn015r7s42p1wyj6fryihpmdn0k76b0ccwqzj";
+    sha256 = "0f6yi19zffxnp3dlr4zs52b7bllks3kjxkdn9zvvi5lvpkzmba5j";
   };
 
   # Tests exist, but seem to clash with the firewall.
   doCheck = false;
 
-  buildFlagsArray = let t = "${goPackagePath}/version"; in ''
+  buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
     -ldflags=
        -X ${t}.Version=${version}
-       -X ${t}.Revision=unknown
+       -X ${t}.Revision=${src.rev}
        -X ${t}.Branch=unknown
        -X ${t}.BuildUser=nix@nixpkgs
        -X ${t}.BuildDate=unknown
        -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
+    mkdir -p $bin/etc/bash_completion.d
+    $NIX_BUILD_TOP/go/bin/amtool --completion-script-bash > $bin/etc/bash_completion.d/amtool_completion.sh
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index c5aa7f91bd6b6a55836bbe6dcc61650904190554..798f31c3458e12665e3d7365ab59aee23a662026 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.10.0";
+  version = "0.12.0";
   rev = version;
 
   goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "prometheus";
     repo = "blackbox_exporter";
-    sha256 = "0xxlmg6yin63pghlvjj8amf0h5plnichvcrmcq67bffhz6d792gc";
+    sha256 = "0gd3vymk3qdfjnf0rx9kwc6v0jv7f8l30igvj2v7bljar2d6hzxf";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 46c02c6bb95dd35a1ec93543b5fc60d0d7db845e..3287bc6f2583c2c57b641120c7f2e34029ad9b39 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,42 +1,56 @@
 { stdenv, go, buildGoPackage, fetchFromGitHub }:
 
-buildGoPackage rec {
-  name = "prometheus-${version}";
-  version = "1.8.1";
-  rev = "v${version}";
-
+let
   goPackagePath = "github.com/prometheus/prometheus";
 
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "prometheus";
-    repo = "prometheus";
+  generic = { version, sha256, ... }@attrs:
+    let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in
+      buildGoPackage ({
+        name = "prometheus-${version}";
+
+        inherit goPackagePath;
+
+        src = fetchFromGitHub {
+          rev = "v${version}";
+          owner = "prometheus";
+          repo = "prometheus";
+          inherit sha256;
+        };
+
+        doCheck = true;
+
+        buildFlagsArray = let t = "${goPackagePath}/version"; in ''
+          -ldflags=
+             -X ${t}.Version=${version}
+             -X ${t}.Revision=unknown
+             -X ${t}.Branch=unknown
+             -X ${t}.BuildUser=nix@nixpkgs
+             -X ${t}.BuildDate=unknown
+             -X ${t}.GoVersion=${stdenv.lib.getVersion go}
+        '';
+
+        preInstall = ''
+          mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
+          cp -a $src/documentation/* $bin/share/doc/prometheus
+          cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
+        '';
+
+        meta = with stdenv.lib; {
+          description = "Service monitoring system and time series database";
+          homepage = https://prometheus.io;
+          license = licenses.asl20;
+          maintainers = with maintainers; [ benley fpletz ];
+          platforms = platforms.unix;
+        };
+    } // attrs');
+in rec {
+  prometheus_1 = generic {
+    version = "1.8.1";
     sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4";
   };
 
-  docheck = true;
-
-  buildFlagsArray = let t = "${goPackagePath}/version"; in ''
-    -ldflags=
-       -X ${t}.Version=${version}
-       -X ${t}.Revision=unknown
-       -X ${t}.Branch=unknown
-       -X ${t}.BuildUser=nix@nixpkgs
-       -X ${t}.BuildDate=unknown
-       -X ${t}.GoVersion=${stdenv.lib.getVersion go}
-  '';
-
-  preInstall = ''
-    mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
-    cp -a $src/documentation/* $bin/share/doc/prometheus
-    cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Service monitoring system and time series database";
-    homepage = https://prometheus.io;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley fpletz ];
-    platforms = platforms.unix;
+  prometheus_2 = generic {
+    version = "2.2.1";
+    sha256 = "1zwxjmj8jh02i4y3i3zrkz7ml66zyhg3ad1npjzf3319mglsp7ch";
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c2dea18ee8157c51d29b0792fa3a86687e772489
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix
@@ -0,0 +1,93 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    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 = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175";
+      sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4";
+    };
+  }
+  {
+    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 = "c3324c1198cf3374996e9d3098edd46a6b55afc9";
+      sha256 = "19qcz5bpzj5kqyhmbq5kxr8nrqqlszazzq6w0wldis1yk1wwww00";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "e4aa40a9169a88835b849a6efb71e05dc04b88f0";
+      sha256 = "0m1n616d694jca0qjwjn5ci7scfgm2jpi94dhi356arm9lhda4jc";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "54d17b57dd7d4a3aa092476596b3f8a933bde349";
+      sha256 = "1b5218hi6k9i637k6xc7ynpll577zbnrhjm9jr2iczy3j0rr4rvr";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+]
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
new file mode 100644
index 0000000000000000000000000000000000000000..86f43116f746ab8b670d36932d9a87f047514855
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "dovecot_exporter-${version}";
+  version = "0.1.1";
+
+  goPackagePath = "github.com/kumina/dovecot_exporter";
+
+  src = fetchFromGitHub {
+    owner = "kumina";
+    repo = "dovecot_exporter";
+    rev = version;
+    sha256 = "0i7nfgkb5jqdbgr16i29jdsvh69dx9qgn6nazpw78k0lgy7mpidn";
+  };
+
+  goDeps = ./dovecot-exporter-deps.nix;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Prometheus metrics exporter for Dovecot";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ willibutz ];
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
index c89574e3fff9d8a620aff8b89fbde49dc3ffe41b..59314f1f282acc733637b2a80e1ff2bdcc4af7c5 100644
--- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
   name = "minio-exporter-${version}";
-  version = "0.1.0";
+  version = "0.2.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/joe-pll/minio-exporter";
@@ -11,9 +11,18 @@ buildGoPackage rec {
     inherit rev;
     owner = "joe-pll";
     repo = "minio-exporter";
-    sha256 = "14lz4dg0n213b6xy12fh4r20k1rcnflnfg6gjskk5zr8h7978hjx";
+    sha256 = "1my3ii5s479appiapw8gjzkq1pk62fl7d7if8ljvdj6qw4man6aa";
   };
 
+  # Required to make 0.2.0 build against latest dependencies
+  # TODO: Remove on update to 0.3.0
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/joe-pll/minio-exporter/commit/50ab89d42322dc3e2696326a9ae4d3f951f646de.patch";
+      sha256 = "0aiixhvb4x8c8abrlf1i4hmca9i6xd6b638a5vfkvawx0q7gxl97";
+    })
+  ];
+
   goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix
index 562d77f3a2f77aad76e54b638fa214140c8f8bee..1993975e2bfaf0acb7db6ed57bd1cb1d5bb615b0 100644
--- a/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix
+++ b/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix
@@ -1,4 +1,4 @@
-# This file was generated by go2nix.
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
 [
   {
     goPackagePath = "github.com/alecthomas/template";
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-ini/ini";
-      rev = "c787282c39ac1fc618827141a1f762240def08a3";
-      sha256 = "0c784qichlpqdk1zwafislskchr7f4dl7fy3g3w7xg2w63xpd7r0";
+      rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a";
+      sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn";
     };
   }
   {
@@ -41,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "130e6b02ab059e7b717a096f397c5b60111cae74";
-      sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s";
+      rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845";
+      sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";
     };
   }
   {
@@ -55,30 +55,30 @@
     };
   }
   {
-    goPackagePath = "github.com/minio/go-homedir";
+    goPackagePath = "github.com/minio/minio-go";
     fetch = {
       type = "git";
-      url = "https://github.com/minio/go-homedir";
-      rev = "21304a94172ae3a09dee2cd86a12fb6f842138c7";
-      sha256 = "1kvz91gvdrpzddlpcbf0a2kf75bfqzd40kwzq29jwhf1y5ii6cq4";
+      url = "https://github.com/minio/minio-go";
+      rev = "d218e4cb1bfc13dcef0eb5c3e74507a35be0dd3a";
+      sha256 = "0d3am33xaavdffz791qi2s0vnkpjw9vlr5p5g4lw7h5vhmy1sjb4";
     };
   }
   {
-    goPackagePath = "github.com/minio/minio-go";
+    goPackagePath = "github.com/minio/minio";
     fetch = {
       type = "git";
-      url = "https://github.com/minio/minio-go";
-      rev = "cb3571b7d8d904c4714033deb984d0a0b66955be";
-      sha256 = "165filzwslnqdgsp8wf5k1zm8wcpnsffsaffw25igy0ik8swr06w";
+      url = "https://github.com/minio/minio";
+      rev = "bb73c84b104bc447eb603d63481cdc54b8ab3c83";
+      sha256 = "1gjkgdf59yxfr2a7pl3f7z3iid86zsd85xqxcv1s0d46v7j07iga";
     };
   }
   {
-    goPackagePath = "github.com/minio/minio";
+    goPackagePath = "github.com/mitchellh/go-homedir";
     fetch = {
       type = "git";
-      url = "https://github.com/minio/minio";
-      rev = "60cc6184d253efee4a3120683517028342229e21";
-      sha256 = "0n2l163v45jraylv43jwqm0cxin68vw8cw7k21qniahhr46y4dqf";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
+      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
     };
   }
   {
@@ -86,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_golang";
-      rev = "353b8c3f3776541879f9abfd8fa8b1ae162ab394";
-      sha256 = "068fk3bdfsaij37973c66065w2cn46ahwjs44pw9v1mqk8bsrn3a";
+      rev = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada";
+      sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26";
     };
   }
   {
@@ -95,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_model";
-      rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
-      sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
+      rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
     };
   }
   {
@@ -104,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/common";
-      rev = "2f17f4a9d485bf34b4bfaccc273805040e4f86c8";
-      sha256 = "0r1dyipnd7n9vp4p6gs1y4v7ggq4avj06pr90l4qrjll55h281js";
+      rev = "89604d197083d4781071d3c65855d24ecfb0a563";
+      sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn";
     };
   }
   {
@@ -113,8 +113,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/procfs";
-      rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2";
-      sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np";
+      rev = "b15cd069a83443be3154b719d0cc9fe8117f09fb";
+      sha256 = "1cr45wg2m40bj2za8f32mq09rjlcnk5kfam0h0hr8wcb015k4wxj";
     };
   }
   {
@@ -122,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/sirupsen/logrus";
-      rev = "89742aefa4b206dcf400792f3bd35b542998eb3b";
-      sha256 = "0hk7fabx59msg2y0iik6xvfp80s73ybrwlcshbm9ds91iqbkcxi6";
+      rev = "d682213848ed68c0a260ca37d6dd5ace8423f5ba";
+      sha256 = "0nzyqwzx3k7nqfq8q7yv32gaf3ymq3bpwhkmw1hj2zakq5a93d8x";
     };
   }
   {
@@ -131,8 +131,17 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "76eec36fa14229c4b25bb894c2d0e591527af429";
-      sha256 = "1c57fdg70vhf7pigiwb2xdap6ak0c0s2pzaj9pq000aqfw54i4s8";
+      rev = "a6600008915114d9c087fad9f03d75087b1a74df";
+      sha256 = "099vyf8133bjwaqcv377d9akam3j5xwamwqrihmjhvzbvqs649yc";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec";
+      sha256 = "0bdwdxy2gz48icnh023r5fga3z4x6c8gry8jlfjqr5w12y3s281g";
     };
   }
   {
@@ -140,8 +149,17 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "314a259e304ff91bd6985da2a7149bbf91237993";
-      sha256 = "0vya62c3kmhmqx6awlxx8hc84987xkym9rhs0q28vlhwk9kczdaa";
+      rev = "2c42eef0765b9837fbdab12011af7830f55f88f0";
+      sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "e19ae1496984b1c655b8044a65c0300a3c878dd3";
+      sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w";
     };
   }
   {
@@ -149,8 +167,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/alecthomas/kingpin.v2";
-      rev = "1087e65c9441605df944fb12c33f0fe7072d18ca";
-      sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0";
+      rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
     };
   }
 ]
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 8b70ad423e9ce4cf075c2745ce5980415db51287..497f20ac55ed3cd75adac8760103256d25e75324 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.15.0";
+  version = "0.15.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/node_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "node_exporter";
-    sha256 = "0v1m6m9fmlw66s9v50y2rfr5kbpb9mxbwpcab4cmgcjs1y7wcn49";
+    sha256 = "1vxbkps80ba8c0ndawijg07am5gyc8y49h8fd0ky5h05zmkp25qv";
   };
 
   # FIXME: megacli test fails
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
new file mode 100644
index 0000000000000000000000000000000000000000..194651f43326ec8aa9ff5acf2355262a8815e0e9
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
@@ -0,0 +1,84 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
+      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-systemd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-systemd";
+      rev = "d1b7d058aa2adfc795ad17ff4aaa2bc64ec11c78";
+      sha256 = "1nz3v1b90hnmj2vjjwq96pr6psxlndqjyd30v9sgiwygzb7db9mv";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/pkg";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/pkg";
+      rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
+      sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "e09c5db296004fbe3f74490e84dcd62c3c5ddb1b";
+      sha256 = "1acnmalkqwrq6k3l71c4pyws0zn18r2609kqaq55lhbdcjgzid31";
+    };
+  }
+  {
+    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 = "82f5ff156b29e276022b1a958f7d385870fb9814";
+      sha256 = "111j329yrlgvh73dm80gawwxsh9dgjkw74254kyj5c2rfmra7znz";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "d0f7cd64bda49e08b22ae8a730aa57aa0db125d6";
+      sha256 = "1d4hfbb66xsf0wq317fwhgrwakqzhvryw4d7ip851lwrpql5fqcx";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e";
+      sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf";
+    };
+  }
+]
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3c2f01c0a5ced4ef5bbe50e0f2cfba5b68d77e33
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, systemd, makeWrapper }:
+
+buildGoPackage rec {
+  name = "postfix_exporter-${version}";
+  version = "0.1.1";
+
+  goPackagePath = "github.com/kumina/postfix_exporter";
+
+  src = fetchFromGitHub {
+    owner = "kumina";
+    repo = "postfix_exporter";
+    rev = version;
+    sha256 = "1p2j66jzzgyv2w832pw57g02vrac6ldrblqllgwyy0i8krb3ibyz";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ systemd ];
+
+  goDeps = ./postfix-exporter-deps.nix;
+
+  postInstall = ''
+    wrapProgram $bin/bin/postfix_exporter \
+      --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "A Prometheus exporter for Postfix";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ willibutz ];
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
new file mode 100644
index 0000000000000000000000000000000000000000..34120ad3fdaee9f6a6bb748433e50feb38507ebf
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
@@ -0,0 +1,26 @@
+# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "rabbitmq_exporter-${version}";
+  version = "0.25.2";
+
+  goPackagePath = "github.com/kbudde/rabbitmq_exporter";
+
+  src = fetchFromGitHub {
+    owner = "kbudde";
+    repo = "rabbitmq_exporter";
+    rev = "8238c5d9ad509dab94e631cdecf3d75155fbdee4";
+    sha256 = "1zb21jms2wlmiw5vhk1wyhv0xrv5a9y08y9q6x92hv727kjqjr6w";
+  };
+
+  goDeps = ./rabbitmq-exporter_deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Prometheus exporter for RabbitMQ";
+    homepage = https://github.com/kbudde/rabbitmq_exporter;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ocharles ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7a15a6a7b68ca0b4c80ab5e57ccb583dfd2fe57f
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix
@@ -0,0 +1,165 @@
+# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
+[
+  {
+    goPackagePath = "github.com/Sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Sirupsen/logrus";
+      rev = "95cd2b9c79aa5e72ab0bc69b7ccc2be15bf850f6";
+      sha256 = "1rkkhl68iw523bwxmp2prdrp8pk62xfp52wifzvbmqf8v1svwsqv";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+    };
+  }
+  {
+    goPackagePath = "github.com/cenk/backoff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cenk/backoff";
+      rev = "61153c768f31ee5f130071d08fc82b85208528de";
+      sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5";
+    };
+  }
+  {
+    goPackagePath = "github.com/fsouza/go-dockerclient";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsouza/go-dockerclient";
+      rev = "1d4f4ae73768d3ca16a6fb964694f58dc5eba601";
+      sha256 = "1s3m8jq8z1cm5rkn7dmjacf38n6ihkkzbdfang2aa2cgs5wl28y0";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845";
+      sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";
+    };
+  }
+  {
+    goPackagePath = "github.com/kbudde/gobert";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kbudde/gobert";
+      rev = "a6daecb9ddeb548b7cfb3f5ac9deef9ded522730";
+      sha256 = "06g036w4dny8wdjwvprjjcdh0vx851qphgrvilrn5lghv3jdr29z";
+    };
+  }
+  {
+    goPackagePath = "github.com/kylelemons/godebug";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kylelemons/godebug";
+      rev = "d65d576e9348f5982d7f6d83682b694e731a45c6";
+      sha256 = "0bc8j9kwkp0hrsz0sm7hav7cm5jp9d6ql8r2b3mz78xb1g65xhbc";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "3247c84500bff8d9fb6d579d800f20b3e091582c";
+      sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+  {
+    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 = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "2e54d0b93cba2fd133edc32211dcc32c06ef72ca";
+      sha256 = "14kn5w7imcxxlfdqxl21fsnlf1ms7200g3ldy29hwamldv8qlm7j";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "a6e9df898b1336106c743392c48ee0b71f5c4efa";
+      sha256 = "0zyprdp9bnpywcb6b9dzwyiji60mgf0s9wnw98zndfg3xrgnkasz";
+    };
+  }
+  {
+    goPackagePath = "github.com/streadway/amqp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/streadway/amqp";
+      rev = "ff791c2d22d3f1588b4e2cc71a9fba5e1da90654";
+      sha256 = "1drridn4k1n7qy82msvw9r18w4pmrah1nip36wixz098nzalz55x";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122";
+      sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "a8b9294777976932365dabb6640cf1468d95c70f";
+      sha256 = "112v83jfwd1brwaanjijvb7da4dx1iqk8b4bf9ahx0hvir56c2g8";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "8b4580aae2a0dd0c231a45d3ccb8434ff533b840";
+      sha256 = "1w66xqnpkskvj22a3f841qg4rgf0lzcrxp8678s6n07yw8qdh92p";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/ory-am/dockertest.v3";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ory-am/dockertest.v3";
+      rev = "a7951f7a8442f0e70d36e499ed4d744f00af2963";
+      sha256 = "13qv0vl79m2wirhbjs0k2a3cjl6ib7sw6rg98v95xxpn8r39ijzw";
+    };
+  }
+]
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index 64585de51ff394b406ccb7d35ef5808b152c692d..b930c1ab1f613df265a915802660eb668991da39 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "riemann-${version}";
-  version = "0.2.12";
+  version = "0.3.0";
 
   src = fetchurl {
     url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "1x57gi301rg6faxm4q5scq9dpp0v9nqiwjpsgigdb8whmjr1zwkr";
+    sha256 = "151zd8nkhigphdx6g9jhmza6963qvlnki013j1g7lyqaz43qyk1c";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix
index c0a2c3ca49e53e56176c75b71a98ed36365265fd..dba0c32b353b405d257762b3eeac2fd84ebf25eb 100644
--- a/pkgs/servers/monitoring/sensu/default.nix
+++ b/pkgs/servers/monitoring/sensu/default.nix
@@ -9,7 +9,7 @@ bundlerEnv rec {
 
   meta = with lib; {
     description = "A monitoring framework that aims to be simple, malleable, and scalable";
-    homepage    = http://sensuapp.org/;
+    homepage    = https://sensuapp.org/;
     license     = licenses.mit;
     maintainers = with maintainers; [ theuni peterhoeg ];
     platforms   = platforms.unix;
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index f71ed052d04e281861a0cab61e19f964f677da44..e06aaa9faa47f398b85e485ffb507f445b8094ab 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.4.4";
+  version = "1.5.3";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "${version}";
-    sha256 = "1hyjbx0hwyh39dgij86xlznaqnzh8m0yk96phqgxs328dlcxfl07";
+    sha256 = "0h3v80qvb9xmkmgbp46sqh76y4k84c0da586vdy3xmmbrbagnypv";
   };
 
   buildFlagsArray = [ ''-ldflags=
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.4.4.nix b/pkgs/servers/monitoring/telegraf/deps-1.4.4.nix
deleted file mode 100644
index 0cfcf03dd14829c25d282b119b05dbb9775c818d..0000000000000000000000000000000000000000
--- a/pkgs/servers/monitoring/telegraf/deps-1.4.4.nix
+++ /dev/null
@@ -1,660 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
-  {
-    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 = "c01858abb625b73a3af51d0798e4ad42c8147093";
-      sha256 = "139fyfi2h6qas83kan0kpm9d92985nl1fyhijswy37d6ia86797w";
-    };
-  }
-  {
-    goPackagePath = "github.com/Sirupsen/logrus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Sirupsen/logrus";
-      rev = "61e43dc76f7ee59a82bdf3d71033dc12bea4c77d";
-      sha256 = "08kr7zvdgwv8vsakjzq1bla6cc6dlxlg1brlga69y69xw7cz5l9p";
-    };
-  }
-  {
-    goPackagePath = "github.com/aerospike/aerospike-client-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aerospike/aerospike-client-go";
-      rev = "95e1ad7791bdbca44707fedbb29be42024900d9c";
-      sha256 = "034pirm1dzdblwadcd829qk2jqkr8hg9gpfph8ax7z0b3h2ah8xf";
-    };
-  }
-  {
-    goPackagePath = "github.com/amir/raidman";
-    fetch = {
-      type = "git";
-      url = "https://github.com/amir/raidman";
-      rev = "c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985";
-      sha256 = "10lmpz5vf2ysw8gnl0z8ravl4vvy48nbh8xpk2zzgifb6yn3x192";
-    };
-  }
-  {
-    goPackagePath = "github.com/apache/thrift";
-    fetch = {
-      type = "git";
-      url = "https://github.com/apache/thrift";
-      rev = "4aaa92ece8503a6da9bc6701604f69acf2b99d07";
-      sha256 = "1my582c0ln1byxid5acdd6dk7lvi7lwd6gka10s4bp4w3xrd55x8";
-    };
-  }
-  {
-    goPackagePath = "github.com/aws/aws-sdk-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aws/aws-sdk-go";
-      rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0";
-      sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl";
-    };
-  }
-  {
-    goPackagePath = "github.com/beorn7/perks";
-    fetch = {
-      type = "git";
-      url = "https://github.com/beorn7/perks";
-      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
-      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
-    };
-  }
-  {
-    goPackagePath = "github.com/bsm/sarama-cluster";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bsm/sarama-cluster";
-      rev = "ccdc0803695fbce22f1706d04ded46cd518fd832";
-      sha256 = "1jbb03bygjzzs6wyxp6cp057kyiyv80schwlhgi366nizp52hd56";
-    };
-  }
-  {
-    goPackagePath = "github.com/cenkalti/backoff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cenkalti/backoff";
-      rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3";
-      sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc";
-    };
-  }
-  {
-    goPackagePath = "github.com/couchbase/go-couchbase";
-    fetch = {
-      type = "git";
-      url = "https://github.com/couchbase/go-couchbase";
-      rev = "bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28";
-      sha256 = "0h59zzxcz3i8nd4ln89fi946ii8kscnqam67h3mxvjwvpnmcax9k";
-    };
-  }
-  {
-    goPackagePath = "github.com/couchbase/gomemcached";
-    fetch = {
-      type = "git";
-      url = "https://github.com/couchbase/gomemcached";
-      rev = "4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29";
-      sha256 = "12h0wsimwmr0f398538g9ngasik4gisnac9vpn0ldy8hqdpa334d";
-    };
-  }
-  {
-    goPackagePath = "github.com/couchbase/goutils";
-    fetch = {
-      type = "git";
-      url = "https://github.com/couchbase/goutils";
-      rev = "5823a0cbaaa9008406021dc5daf80125ea30bba6";
-      sha256 = "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c";
-    };
-  }
-  {
-    goPackagePath = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev = "346938d642f2ec3594ed81d874461961cd0faa76";
-      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
-    };
-  }
-  {
-    goPackagePath = "github.com/docker/docker";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/docker";
-      rev = "f5ec1e2936dcbe7b5001c2b817188b095c700c27";
-      sha256 = "1y3rkzgg8vpjq61y473lnh0qyc6msl4ixw7ci2p56fyqrhkmhf96";
-    };
-  }
-  {
-    goPackagePath = "github.com/docker/go-connections";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/go-connections";
-      rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a";
-      sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb";
-    };
-  }
-  {
-    goPackagePath = "github.com/eapache/go-resiliency";
-    fetch = {
-      type = "git";
-      url = "https://github.com/eapache/go-resiliency";
-      rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3";
-      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 = "44cc805cf13205b55f69e14bcb69867d1ae92f98";
-      sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg";
-    };
-  }
-  {
-    goPackagePath = "github.com/eclipse/paho.mqtt.golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/eclipse/paho.mqtt.golang";
-      rev = "d4f545eb108a2d19f9b1a735689dbfb719bc21fb";
-      sha256 = "01cnca8y5caramqn6p8aigj6l5p6z0nrs2xqqv90658x584138kh";
-    };
-  }
-  {
-    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/gobwas/glob";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gobwas/glob";
-      rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a";
-      sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "8ee79997227bf9b34611aee7946ae64735e6fd93";
-      sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/snappy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/snappy";
-      rev = "7db9049039a047d955fe8c19b83c8ff5abd765c7";
-      sha256 = "09l3sc9z2fqnj5b040q320gwb4gqig6lnysxcayhwckrdp5bm8hs";
-    };
-  }
-  {
-    goPackagePath = "github.com/gorilla/mux";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/mux";
-      rev = "392c28fe23e1c45ddba891b0320b3b5df220beea";
-      sha256 = "0dmihkq34ls23by08r8p92qpf77imibjd9m9qvw344j4r2z7bd4d";
-    };
-  }
-  {
-    goPackagePath = "github.com/hailocab/go-hostpool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hailocab/go-hostpool";
-      rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478";
-      sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/consul";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/consul";
-      rev = "63d2fc68239b996096a1c55a0d4b400ea4c2583f";
-      sha256 = "0vx7jpi2a9374mlhn37b33780n7g950zh482z2sd4lsf29n4c580";
-    };
-  }
-  {
-    goPackagePath = "github.com/influxdata/tail";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/tail";
-      rev = "a395bf99fe07c233f41fba0735fa2b13b58588ea";
-      sha256 = "0bmkv932xhjpxwp8n74xy8wf34kiiknwq8agfbnz931apq6iw9b0";
-    };
-  }
-  {
-    goPackagePath = "github.com/influxdata/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/toml";
-      rev = "5d1d907f22ead1cd47adde17ceec5bda9cacaf8f";
-      sha256 = "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4";
-    };
-  }
-  {
-    goPackagePath = "github.com/influxdata/wlog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/wlog";
-      rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec";
-      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 = "c2c54e542fb797ad986b31721e1baedf214ca413";
-      sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h";
-    };
-  }
-  {
-    goPackagePath = "github.com/kardianos/service";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kardianos/service";
-      rev = "6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893";
-      sha256 = "1cgqg6zbwwsn6lz2ms094q4w37x84vd9ixs50wsh3037q4sfhyll";
-    };
-  }
-  {
-    goPackagePath = "github.com/kballard/go-shellquote";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kballard/go-shellquote";
-      rev = "d8ec1a69a250a17bb0e419c386eac1f3711dc142";
-      sha256 = "1a57hm0zwyi70am670s0pkglnkk1ilddnmfxz1ba7innpkf5z6s7";
-    };
-  }
-  {
-    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/miekg/dns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/miekg/dns";
-      rev = "99f84ae56e75126dd77e5de4fae2ea034a468ca1";
-      sha256 = "1v7rccng7mbzqh5qf8d8gqfppm127v32s8i1n3k50q3flv227byf";
-    };
-  }
-  {
-    goPackagePath = "github.com/naoina/go-stringutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/naoina/go-stringutil";
-      rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b";
-      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 = "ea9585611a4ab58a205b9b125ebd74c389a6b898";
-      sha256 = "0i2whh6c8grzi9slrk2clh3dhykxzid4zn395wgysg6gfjrbd5i5";
-    };
-  }
-  {
-    goPackagePath = "github.com/nats-io/nuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/nats-io/nuid";
-      rev = "289cccf02c178dc782430d534e3c1f5b72af807f";
-      sha256 = "1dpk8qzl43gfdaj2nbw52a0xyrmpmq26a9v9dfl27vkijssb20p4";
-    };
-  }
-  {
-    goPackagePath = "github.com/nsqio/go-nsq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/nsqio/go-nsq";
-      rev = "a53d495e81424aaf7a7665a9d32a97715c40e953";
-      sha256 = "04npqz6ajr4r2w5jfvfzppr307qrwr57w4c1ppq9p9ddf7hx3wpz";
-    };
-  }
-  {
-    goPackagePath = "github.com/opencontainers/runc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opencontainers/runc";
-      rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8";
-      sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1";
-    };
-  }
-  {
-    goPackagePath = "github.com/openzipkin/zipkin-go-opentracing";
-    fetch = {
-      type = "git";
-      url = "https://github.com/openzipkin/zipkin-go-opentracing";
-      rev = "1cafbdfde94fbf2b373534764e0863aa3bd0bf7b";
-      sha256 = "1vpl3mpvhljzpnll67ip3m9aazy3dvgi57n7w3pn8kg3b7kr4rwj";
-    };
-  }
-  {
-    goPackagePath = "github.com/pierrec/lz4";
-    fetch = {
-      type = "git";
-      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";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_golang";
-      rev = "c317fb74746eac4fc65fe3909195f4cf67c5562a";
-      sha256 = "1c3rqwkajkmhk5wh6agc5jnjbbfvpfxbiy8cprpw89khch428khp";
-    };
-  }
-  {
-    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 = "dd2f054febf4a6c00f2343686efb775948a8bff4";
-      sha256 = "0rhbgj51r105ax544mfg6wp4rsqpzn3776z1k82b21xwb3b51zr1";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/procfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/procfs";
-      rev = "1878d9fbb537119d24b21ca07effd591627cd160";
-      sha256 = "0jqn5l31szmc0dv5invp5mdhndx3fcsda7zpy49zd7k95c1y20m7";
-    };
-  }
-  {
-    goPackagePath = "github.com/rcrowley/go-metrics";
-    fetch = {
-      type = "git";
-      url = "https://github.com/rcrowley/go-metrics";
-      rev = "1f30fe9094a513ce4c700b9a54458bbb0c96996c";
-      sha256 = "1hvbiaq4b6dqgjz6jkkxglfh9gf71zin6qsg508sh0r0ixfavrzj";
-    };
-  }
-  {
-    goPackagePath = "github.com/samuel/go-zookeeper";
-    fetch = {
-      type = "git";
-      url = "https://github.com/samuel/go-zookeeper";
-      rev = "1d7be4effb13d2d908342d349d71a284a7542693";
-      sha256 = "002s19109spms9ndfwykf3ryy3fnk7b56frxlqmmv37mlqgrd5v9";
-    };
-  }
-  {
-    goPackagePath = "github.com/satori/go.uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/satori/go.uuid";
-      rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b";
-      sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07";
-    };
-  }
-  {
-    goPackagePath = "github.com/shirou/gopsutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/shirou/gopsutil";
-      rev = "48fc5612898a1213aa5d6a0fb2d4f7b968e898fb";
-      sha256 = "14mwpxd2v3y4mr0g37g99vhy9jkaaaw29d3j7427rpv568vyb8sd";
-    };
-  }
-  {
-    goPackagePath = "github.com/soniah/gosnmp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/soniah/gosnmp";
-      rev = "5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15";
-      sha256 = "0dqz0w077xfk9fj5dd8xa6sqgdvjpb8vx997wnqpi3kbii1b9jnb";
-    };
-  }
-  {
-    goPackagePath = "github.com/streadway/amqp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/streadway/amqp";
-      rev = "63795daa9a446c920826655f26ba31c81c860fd6";
-      sha256 = "1v6xwskb4dqyy2q1r7k12f9wky7v6cfb4f1mx94sr3qvx37zg2yj";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
-      sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
-    };
-  }
-  {
-    goPackagePath = "github.com/vjeantet/grok";
-    fetch = {
-      type = "git";
-      url = "https://github.com/vjeantet/grok";
-      rev = "d73e972b60935c7fec0b4ffbc904ed39ecaf7efe";
-      sha256 = "09p70h5inycwrw3dmn6c7lhx4m11fvw7449wzq1k5w2jcws7amd5";
-    };
-  }
-  {
-    goPackagePath = "github.com/wvanbergen/kafka";
-    fetch = {
-      type = "git";
-      url = "https://github.com/wvanbergen/kafka";
-      rev = "bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee";
-      sha256 = "0x86gnkpsr6gsc6mk2312ay8yqrzscvvdra2knhvwgaws6rzvj2l";
-    };
-  }
-  {
-    goPackagePath = "github.com/wvanbergen/kazoo-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/wvanbergen/kazoo-go";
-      rev = "968957352185472eacb69215fa3dbfcfdbac1096";
-      sha256 = "07q37lmlc3vx620bklp93r368r73kgm2s9x7qcgcxk9701lqq7dc";
-    };
-  }
-  {
-    goPackagePath = "github.com/yuin/gopher-lua";
-    fetch = {
-      type = "git";
-      url = "https://github.com/yuin/gopher-lua";
-      rev = "66c871e454fcf10251c61bf8eff02d0978cae75a";
-      sha256 = "1srcibhsl29cy8qih132iqigl4ss303nfmglrgc583nj9kz9sf8j";
-    };
-  }
-  {
-    goPackagePath = "github.com/zensqlmonitor/go-mssqldb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/zensqlmonitor/go-mssqldb";
-      rev = "ffe5510c6fa5e15e6d983210ab501c815b56b363";
-      sha256 = "079x8ms8lv5p6253ppaxva37k6w04xnd38y8763rr2giswxqzlkl";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "dc137beb6cce2043eb6b5f223ab8bf51c32459f4";
-      sha256 = "0kia3rd0g0vkb9pf102kbg1agr1xq27bi2shkpxy9l718yvy9jwd";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d";
-      sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "739734461d1c916b6c72a63d7efda2b27edb369f";
-      sha256 = "0b0yh28ap1q0b8myg0gw4p9d6m71ry0d3n4hiycvd8sgk327379a";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "506f9d5c962f284575e88337e7d9296d27e729d3";
-      sha256 = "1ghx5vv4zlkjzlx2gslvcwpvxjggpl6wz5n49nqxiz777psx218s";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/asn1-ber.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/asn1-ber.v1";
-      rev = "4e86f4367175e39f69d9358a5f17b4dda270378d";
-      sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/fatih/pool.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/fatih/pool.v2";
-      rev = "6e328e67893eb46323ad06f0e92cb9536babbabc";
-      sha256 = "1p1sljfpbg2bp4qv7ghvz1wcmmsbcfclsninxa97kr0v7na7jw5p";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/gorethink/gorethink.v3";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/gorethink/gorethink.v3";
-      rev = "7ab832f7b65573104a555d84a27992ae9ea1f659";
-      sha256 = "1pri52ac45aqf5a2kmsd4mfhyfbkd1snkjbvanrdgipikysxi696";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/ldap.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/ldap.v2";
-      rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f";
-      sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/mgo.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/mgo.v2";
-      rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655";
-      sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/olivere/elastic.v5";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/olivere/elastic.v5";
-      rev = "3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26";
-      sha256 = "1zkwprs68q1r7pigb59n8zbw8610z9r1pi6r0s28kzdgiv30sfdm";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "4c78c975fe7c825c6d1466c42be594d1d6f3aba6";
-      sha256 = "1ddwvmsfijgl09pbqrcx73fy5kh8y3888dd29lh7i50ds5a088cx";
-    };
-  }
-]
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.5.3.nix b/pkgs/servers/monitoring/telegraf/deps-1.5.3.nix
new file mode 100644
index 0000000000000000000000000000000000000000..916b4688a06e0ab4ce89d198e4e820b3fa9bc31f
--- /dev/null
+++ b/pkgs/servers/monitoring/telegraf/deps-1.5.3.nix
@@ -0,0 +1,687 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    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 = "3b1b38866a79f06deddf0487d5c27ba0697ccd65";
+      sha256 = "02qwlqd1kdgwlv39fimpbzjhgw8shzkkad82kfwdy8lppscb20br";
+    };
+  }
+  {
+    goPackagePath = "github.com/Sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Sirupsen/logrus";
+      rev = "61e43dc76f7ee59a82bdf3d71033dc12bea4c77d";
+      sha256 = "08kr7zvdgwv8vsakjzq1bla6cc6dlxlg1brlga69y69xw7cz5l9p";
+    };
+  }
+  {
+    goPackagePath = "github.com/aerospike/aerospike-client-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aerospike/aerospike-client-go";
+      rev = "95e1ad7791bdbca44707fedbb29be42024900d9c";
+      sha256 = "034pirm1dzdblwadcd829qk2jqkr8hg9gpfph8ax7z0b3h2ah8xf";
+    };
+  }
+  {
+    goPackagePath = "github.com/amir/raidman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/amir/raidman";
+      rev = "c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985";
+      sha256 = "10lmpz5vf2ysw8gnl0z8ravl4vvy48nbh8xpk2zzgifb6yn3x192";
+    };
+  }
+  {
+    goPackagePath = "github.com/apache/thrift";
+    fetch = {
+      type = "git";
+      url = "https://github.com/apache/thrift";
+      rev = "4aaa92ece8503a6da9bc6701604f69acf2b99d07";
+      sha256 = "1my582c0ln1byxid5acdd6dk7lvi7lwd6gka10s4bp4w3xrd55x8";
+    };
+  }
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0";
+      sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+    };
+  }
+  {
+    goPackagePath = "github.com/bsm/sarama-cluster";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bsm/sarama-cluster";
+      rev = "abf039439f66c1ce78017f560b490612552f6472";
+      sha256 = "16013ac7jv72mdiv84vhk4av1vb5q8xq3fhv253fz2a17h9ld78q";
+    };
+  }
+  {
+    goPackagePath = "github.com/cenkalti/backoff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cenkalti/backoff";
+      rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3";
+      sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc";
+    };
+  }
+  {
+    goPackagePath = "github.com/couchbase/go-couchbase";
+    fetch = {
+      type = "git";
+      url = "https://github.com/couchbase/go-couchbase";
+      rev = "bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28";
+      sha256 = "0h59zzxcz3i8nd4ln89fi946ii8kscnqam67h3mxvjwvpnmcax9k";
+    };
+  }
+  {
+    goPackagePath = "github.com/couchbase/gomemcached";
+    fetch = {
+      type = "git";
+      url = "https://github.com/couchbase/gomemcached";
+      rev = "4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29";
+      sha256 = "12h0wsimwmr0f398538g9ngasik4gisnac9vpn0ldy8hqdpa334d";
+    };
+  }
+  {
+    goPackagePath = "github.com/couchbase/goutils";
+    fetch = {
+      type = "git";
+      url = "https://github.com/couchbase/goutils";
+      rev = "5823a0cbaaa9008406021dc5daf80125ea30bba6";
+      sha256 = "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29";
+      sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/docker";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/docker";
+      rev = "f5ec1e2936dcbe7b5001c2b817188b095c700c27";
+      sha256 = "1y3rkzgg8vpjq61y473lnh0qyc6msl4ixw7ci2p56fyqrhkmhf96";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/go-connections";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-connections";
+      rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a";
+      sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb";
+    };
+  }
+  {
+    goPackagePath = "github.com/eapache/go-resiliency";
+    fetch = {
+      type = "git";
+      url = "https://github.com/eapache/go-resiliency";
+      rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3";
+      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 = "44cc805cf13205b55f69e14bcb69867d1ae92f98";
+      sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg";
+    };
+  }
+  {
+    goPackagePath = "github.com/eclipse/paho.mqtt.golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/eclipse/paho.mqtt.golang";
+      rev = "d4f545eb108a2d19f9b1a735689dbfb719bc21fb";
+      sha256 = "01cnca8y5caramqn6p8aigj6l5p6z0nrs2xqqv90658x584138kh";
+    };
+  }
+  {
+    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/gobwas/glob";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/glob";
+      rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a";
+      sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "8ee79997227bf9b34611aee7946ae64735e6fd93";
+      sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/snappy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/snappy";
+      rev = "7db9049039a047d955fe8c19b83c8ff5abd765c7";
+      sha256 = "09l3sc9z2fqnj5b040q320gwb4gqig6lnysxcayhwckrdp5bm8hs";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/mux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/mux";
+      rev = "392c28fe23e1c45ddba891b0320b3b5df220beea";
+      sha256 = "0dmihkq34ls23by08r8p92qpf77imibjd9m9qvw344j4r2z7bd4d";
+    };
+  }
+  {
+    goPackagePath = "github.com/hailocab/go-hostpool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hailocab/go-hostpool";
+      rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478";
+      sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/consul";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/consul";
+      rev = "63d2fc68239b996096a1c55a0d4b400ea4c2583f";
+      sha256 = "0vx7jpi2a9374mlhn37b33780n7g950zh482z2sd4lsf29n4c580";
+    };
+  }
+  {
+    goPackagePath = "github.com/influxdata/tail";
+    fetch = {
+      type = "git";
+      url = "https://github.com/influxdata/tail";
+      rev = "a395bf99fe07c233f41fba0735fa2b13b58588ea";
+      sha256 = "0bmkv932xhjpxwp8n74xy8wf34kiiknwq8agfbnz931apq6iw9b0";
+    };
+  }
+  {
+    goPackagePath = "github.com/influxdata/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/influxdata/toml";
+      rev = "5d1d907f22ead1cd47adde17ceec5bda9cacaf8f";
+      sha256 = "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4";
+    };
+  }
+  {
+    goPackagePath = "github.com/influxdata/wlog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/influxdata/wlog";
+      rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec";
+      sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl";
+    };
+  }
+  {
+    goPackagePath = "github.com/jackc/pgx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jackc/pgx";
+      rev = "63f58fd32edb5684b9e9f4cfaac847c6b42b3917";
+      sha256 = "1n9cbdwzpagnrisxwq0frqdnkmyfg2qlxsr890527d32633hp0h2";
+    };
+  }
+  {
+    goPackagePath = "github.com/kardianos/osext";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kardianos/osext";
+      rev = "c2c54e542fb797ad986b31721e1baedf214ca413";
+      sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h";
+    };
+  }
+  {
+    goPackagePath = "github.com/kardianos/service";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kardianos/service";
+      rev = "6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893";
+      sha256 = "1cgqg6zbwwsn6lz2ms094q4w37x84vd9ixs50wsh3037q4sfhyll";
+    };
+  }
+  {
+    goPackagePath = "github.com/kballard/go-shellquote";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kballard/go-shellquote";
+      rev = "d8ec1a69a250a17bb0e419c386eac1f3711dc142";
+      sha256 = "1a57hm0zwyi70am670s0pkglnkk1ilddnmfxz1ba7innpkf5z6s7";
+    };
+  }
+  {
+    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/miekg/dns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/miekg/dns";
+      rev = "99f84ae56e75126dd77e5de4fae2ea034a468ca1";
+      sha256 = "1v7rccng7mbzqh5qf8d8gqfppm127v32s8i1n3k50q3flv227byf";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "d0303fe809921458f417bcf828397a65db30a7e4";
+      sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiplay/go-ts3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiplay/go-ts3";
+      rev = "07477f49b8dfa3ada231afc7b7b17617d42afe8e";
+      sha256 = "1z2cfqhm6g48vzscargw6vl9idfppdcm3wq1xfwy73l1s77q4n9n";
+    };
+  }
+  {
+    goPackagePath = "github.com/naoina/go-stringutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/naoina/go-stringutil";
+      rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b";
+      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 = "ea9585611a4ab58a205b9b125ebd74c389a6b898";
+      sha256 = "0i2whh6c8grzi9slrk2clh3dhykxzid4zn395wgysg6gfjrbd5i5";
+    };
+  }
+  {
+    goPackagePath = "github.com/nats-io/nuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/nuid";
+      rev = "289cccf02c178dc782430d534e3c1f5b72af807f";
+      sha256 = "1dpk8qzl43gfdaj2nbw52a0xyrmpmq26a9v9dfl27vkijssb20p4";
+    };
+  }
+  {
+    goPackagePath = "github.com/nsqio/go-nsq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsqio/go-nsq";
+      rev = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f";
+      sha256 = "194wdmgsc0qhdjx95ka7blly58r9bj2vc0bgls7jawzszfpsbx8x";
+    };
+  }
+  {
+    goPackagePath = "github.com/opencontainers/runc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/runc";
+      rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8";
+      sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1";
+    };
+  }
+  {
+    goPackagePath = "github.com/openzipkin/zipkin-go-opentracing";
+    fetch = {
+      type = "git";
+      url = "https://github.com/openzipkin/zipkin-go-opentracing";
+      rev = "1cafbdfde94fbf2b373534764e0863aa3bd0bf7b";
+      sha256 = "1vpl3mpvhljzpnll67ip3m9aazy3dvgi57n7w3pn8kg3b7kr4rwj";
+    };
+  }
+  {
+    goPackagePath = "github.com/pierrec/lz4";
+    fetch = {
+      type = "git";
+      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";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "c317fb74746eac4fc65fe3909195f4cf67c5562a";
+      sha256 = "1c3rqwkajkmhk5wh6agc5jnjbbfvpfxbiy8cprpw89khch428khp";
+    };
+  }
+  {
+    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 = "dd2f054febf4a6c00f2343686efb775948a8bff4";
+      sha256 = "0rhbgj51r105ax544mfg6wp4rsqpzn3776z1k82b21xwb3b51zr1";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "1878d9fbb537119d24b21ca07effd591627cd160";
+      sha256 = "0jqn5l31szmc0dv5invp5mdhndx3fcsda7zpy49zd7k95c1y20m7";
+    };
+  }
+  {
+    goPackagePath = "github.com/rcrowley/go-metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rcrowley/go-metrics";
+      rev = "1f30fe9094a513ce4c700b9a54458bbb0c96996c";
+      sha256 = "1hvbiaq4b6dqgjz6jkkxglfh9gf71zin6qsg508sh0r0ixfavrzj";
+    };
+  }
+  {
+    goPackagePath = "github.com/samuel/go-zookeeper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/samuel/go-zookeeper";
+      rev = "1d7be4effb13d2d908342d349d71a284a7542693";
+      sha256 = "002s19109spms9ndfwykf3ryy3fnk7b56frxlqmmv37mlqgrd5v9";
+    };
+  }
+  {
+    goPackagePath = "github.com/satori/go.uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/satori/go.uuid";
+      rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b";
+      sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07";
+    };
+  }
+  {
+    goPackagePath = "github.com/shirou/gopsutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/gopsutil";
+      rev = "384a55110aa5ae052eb93ea94940548c1e305a99";
+      sha256 = "00idmnsmalxhm1y60lhm9vyck1ay7gbp0r35fgs8bbiwq351bs23";
+    };
+  }
+  {
+    goPackagePath = "github.com/soniah/gosnmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/soniah/gosnmp";
+      rev = "5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15";
+      sha256 = "0dqz0w077xfk9fj5dd8xa6sqgdvjpb8vx997wnqpi3kbii1b9jnb";
+    };
+  }
+  {
+    goPackagePath = "github.com/streadway/amqp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/streadway/amqp";
+      rev = "63795daa9a446c920826655f26ba31c81c860fd6";
+      sha256 = "1v6xwskb4dqyy2q1r7k12f9wky7v6cfb4f1mx94sr3qvx37zg2yj";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
+      sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
+    };
+  }
+  {
+    goPackagePath = "github.com/vjeantet/grok";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vjeantet/grok";
+      rev = "d73e972b60935c7fec0b4ffbc904ed39ecaf7efe";
+      sha256 = "09p70h5inycwrw3dmn6c7lhx4m11fvw7449wzq1k5w2jcws7amd5";
+    };
+  }
+  {
+    goPackagePath = "github.com/wvanbergen/kafka";
+    fetch = {
+      type = "git";
+      url = "https://github.com/wvanbergen/kafka";
+      rev = "bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee";
+      sha256 = "0x86gnkpsr6gsc6mk2312ay8yqrzscvvdra2knhvwgaws6rzvj2l";
+    };
+  }
+  {
+    goPackagePath = "github.com/wvanbergen/kazoo-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/wvanbergen/kazoo-go";
+      rev = "968957352185472eacb69215fa3dbfcfdbac1096";
+      sha256 = "07q37lmlc3vx620bklp93r368r73kgm2s9x7qcgcxk9701lqq7dc";
+    };
+  }
+  {
+    goPackagePath = "github.com/yuin/gopher-lua";
+    fetch = {
+      type = "git";
+      url = "https://github.com/yuin/gopher-lua";
+      rev = "66c871e454fcf10251c61bf8eff02d0978cae75a";
+      sha256 = "1srcibhsl29cy8qih132iqigl4ss303nfmglrgc583nj9kz9sf8j";
+    };
+  }
+  {
+    goPackagePath = "github.com/zensqlmonitor/go-mssqldb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/zensqlmonitor/go-mssqldb";
+      rev = "ffe5510c6fa5e15e6d983210ab501c815b56b363";
+      sha256 = "079x8ms8lv5p6253ppaxva37k6w04xnd38y8763rr2giswxqzlkl";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "dc137beb6cce2043eb6b5f223ab8bf51c32459f4";
+      sha256 = "0kia3rd0g0vkb9pf102kbg1agr1xq27bi2shkpxy9l718yvy9jwd";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d";
+      sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "739734461d1c916b6c72a63d7efda2b27edb369f";
+      sha256 = "0b0yh28ap1q0b8myg0gw4p9d6m71ry0d3n4hiycvd8sgk327379a";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "506f9d5c962f284575e88337e7d9296d27e729d3";
+      sha256 = "1ghx5vv4zlkjzlx2gslvcwpvxjggpl6wz5n49nqxiz777psx218s";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/asn1-ber.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/asn1-ber.v1";
+      rev = "4e86f4367175e39f69d9358a5f17b4dda270378d";
+      sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/fatih/pool.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/fatih/pool.v2";
+      rev = "6e328e67893eb46323ad06f0e92cb9536babbabc";
+      sha256 = "1p1sljfpbg2bp4qv7ghvz1wcmmsbcfclsninxa97kr0v7na7jw5p";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/gorethink/gorethink.v3";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/gorethink/gorethink.v3";
+      rev = "7ab832f7b65573104a555d84a27992ae9ea1f659";
+      sha256 = "1pri52ac45aqf5a2kmsd4mfhyfbkd1snkjbvanrdgipikysxi696";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/ldap.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ldap.v2";
+      rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f";
+      sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/mgo.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/mgo.v2";
+      rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655";
+      sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/olivere/elastic.v5";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/olivere/elastic.v5";
+      rev = "3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26";
+      sha256 = "1zkwprs68q1r7pigb59n8zbw8610z9r1pi6r0s28kzdgiv30sfdm";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "4c78c975fe7c825c6d1466c42be594d1d6f3aba6";
+      sha256 = "1ddwvmsfijgl09pbqrcx73fy5kh8y3888dd29lh7i50ds5a088cx";
+    };
+  }
+]
diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index db23987d4aac488b7122fc4b0c4d256c6c4849d0..618c3a33cd7c440d06d9759b747b8b93dffcd9f0 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -1,15 +1,15 @@
 # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "uchiwa-web" "0.26.3" "0.26.3" "1qc69jk3730skdg2vdqncjwg15vywb1a9f8jqk6kwggmkwdklr0p")
-  (fetchbower "angular" "1.6.6" "~1.6.3" "1hc71mpipbdz6ban4zkagdhmn3rw28ksjkr6nwmbzfcpk59gnzkb")
+  (fetchbower "uchiwa-web" "1.1.2" "1.1.2" "174flmnqjm0avpvi71ii5cvas2wkgz42is38r7n4zyrhagzlj66k")
+  (fetchbower "angular" "1.6.8" "~1.6.3" "07bwbahxaz5myjj7sqv7k211avs23a9j7msl373h1qvp05fblajf")
   (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d")
-  (fetchbower "angular-cookies" "1.6.6" "~1.6.3" "0qfk0az32fmrn71ywjl63k7hgan0f0bb4d7fx7q5ch2kd75rzkfm")
+  (fetchbower "angular-cookies" "1.6.8" "~1.6.3" "0p3skdg2pmzgwm9a0gyl1vhq4lcwyrymmii7lxlrmypjhwm83il6")
   (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "14jrzvjwx64awh9z95054manp8qd57fvinqhmakipz5x12i7qrwi")
   (fetchbower "angular-moment" "1.0.1" "~1.0.1" "0zkn52s9l15d6b5zfx52g5jpib23rpb637m0p1hzc429w5bbl0rj")
-  (fetchbower "angular-resource" "1.6.6" "~1.6.3" "1fxd188qa16zbidr4kbwnw7gqcc0bjpvpa7xcmv22nbfk5akjz5b")
-  (fetchbower "angular-route" "1.6.6" "~1.6.3" "05saq9lb7xqhr1f4k2hdc2qlq0nacbgr36qsv7izvvmgh6irn1iq")
-  (fetchbower "angular-sanitize" "1.6.6" "~1.6.3" "1cikmvq456pvxdmrqw0dp04y3ar9n0nxrgv583m7cy6z228sx1hl")
+  (fetchbower "angular-resource" "1.6.8" "~1.6.3" "0pnv12c61i8giwj0fmzf38f3x6ckf24g6izrak9y7zy28nlb3y5q")
+  (fetchbower "angular-route" "1.6.8" "~1.6.3" "0k8sy5dkn589w8ykn65fhrcrfi7wkn7gagwwl5j5zgzj4m91wlar")
+  (fetchbower "angular-sanitize" "1.6.8" "~1.6.3" "0q7hy5iyjlf745yisphwa5b8rvkhc43zwwmiwfkqcdcbf3w6564l")
   (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1szigf1m28bgpfyg8hbm5rffr5zi7wr9n73nc1fqhk0yqh7gzysh")
   (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1j3vysr01niabc9fxcpixhcq1lyx2fr4q4wpmxhmiqki431h9hq8")
   (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0gb0vmwksnydlm6hklfq1n4ak2967wcmnx3cx9cgiv7v7vk3w2m9")
@@ -21,5 +21,5 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb")
   (fetchbower "ua-parser-js" "0.7.17" "~0.7.12" "1dx46rm9han9fj409rjxrlnrk9zxmaqbnn62ljnh32ihngd4yxh0")
   (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x")
-  (fetchbower "jquery" "3.2.1" ">= 1.9.0" "03vn0kq07yxl3i5shc6b0mjck1vdbz1x0jspd3wwb169mvlsxxn3")
+  (fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx")
 ]; }
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
index 924a92a2785e81eaf2a32d0975454b48d0aab18c..3e0ead7b495bae96f06448dfc3fdbc3b8b9c284a 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
 {
-  version = "0.26.3-1";
-  sha256  = "13gklnrzhcj7s7j1ga5pa7ijwav0w9a96lqh4m7858mmm92v0bsk";
+    version = "1.1.2-1";
+    sha256  = "0fmzpjwmv7fkl0ihy2gzcgfd384k3wnifg42gzap770d6kl6yj1c";
 }
diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh
new file mode 100755
index 0000000000000000000000000000000000000000..10da7f8adbf934dc748a02575e03586a0347e93c
--- /dev/null
+++ b/pkgs/servers/monitoring/uchiwa/update.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl.bin git.out nix jq.out nodePackages.bower2nix
+
+set -euo pipefail
+IFS=$'\n\t'
+
+# set -x
+
+REPO=sensu/uchiwa
+VERSION=0.0.1
+SHA="1111111111111111111111111111111111111111111111111111"
+DIR=$(pwd)
+
+write_src() {
+  cat <<_EOF > $DIR/src.nix
+{
+    version = "${VERSION}";
+    sha256  = "${SHA}";
+}
+_EOF
+}
+
+LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
+echo "Latest version: ${LATEST_VERSION}"
+
+VERSION=${1:-${LATEST_VERSION}}
+echo "Updating to: ${VERSION}"
+
+TOP=$(git rev-parse --show-toplevel)
+
+cd $(dirname $0)
+
+write_src
+pushd $TOP >/dev/null
+SHA=$(nix-prefetch-url -A uchiwa.src)
+popd >/dev/null
+write_src
+
+curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > bower.json
+rm -f bower-packages.nix
+bower2nix bower.json $DIR/bower-packages.nix
+rm -f bower.json
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index afc6f4e31599726407e50d7174513d3a7ad90caa..da2d1388c469a690dbd9ee3241807de5b3508adc 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -5,12 +5,12 @@ assert enableJabber -> minmay != null;
 
 let
 
-  version = "2.0.11";
+  version = "2.0.21";
   branch = "2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "1vqxlqwhnz02wrca08vrqbq8k19qp84hbdplmqk7d9699njim46i";
+    sha256 = "14g22x2zy5xqnh2xg23xy5gjd49d1i8pks7pkidwdwa9acwgfx71";
   };
 
   preConfigure =
diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix
index e951d3706e9db31efe48922c7f3a7c4b450bfebd..1cc604f6491b2a284224e7e5ab1d157340b822f1 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/pkgs/servers/monitoring/zabbix/2.2.nix
@@ -10,12 +10,12 @@ assert enableJabber -> minmay != null;
 
 let
 
-  version = "2.2.16";
+  version = "2.2.20";
   branch = "2.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "0hc0y3p8p6pxri7w3n311ry3m5hb440kgwwkiqlihbhsq73xiz1w";
+    sha256 = "00pfpyj3vydwx9dn0bklh1p5j0bp2awi4hvv4kgliyav8l0416hk";
   };
 
   preConfigure =
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index cd541f82d238db1b5a3906f9f6b4945f142b8621..be52698ed8398666af96029496d9aa004f3f038a 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -44,7 +44,7 @@ in
 
     meta = {
       description = "An enterprise-class open source distributed monitoring solution";
-      homepage = http://www.zabbix.com/;
+      homepage = https://www.zabbix.com/;
       license = "GPL";
       maintainers = [ stdenv.lib.maintainers.eelco ];
       platforms = stdenv.lib.platforms.linux;
@@ -60,7 +60,7 @@ in
 
     meta = with stdenv.lib; {
       description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
-      homepage = http://www.zabbix.com/;
+      homepage = https://www.zabbix.com/;
       license = licenses.gpl2;
       maintainers = [ maintainers.eelco ];
       platforms = platforms.linux;
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index d9adc0f310298db417c70ae6bac2f7ea5d4038fe..478d43722679c517d4013c1871a385c5bba011c5 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchFromGitHub, meson, ninja }:
+{ stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  version = "2.13";
+  version = "2.14";
   name = "libmpdclient-${version}";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
     repo   = "libmpdclient";
     rev    = "v${version}";
-    sha256 = "1g1n6rk8kn87mbjqxxj0vi7haj8xx21xmqlzbrx2fvyp5357zvsq";
+    sha256 = "15vn9m4qcsccff5rg7jkzy5503skz6bmqqk6qc2smgvjgwn533sm";
   };
 
-  nativeBuildInputs = [ meson ninja ];
+  nativeBuildInputs = [ meson ninja ]
+  ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   meta = with stdenv.lib; {
     description = "Client library for MPD (music player daemon)";
     homepage = https://www.musicpd.org/libs/libmpdclient/;
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ mornfall ehmry ];
+    maintainers = with maintainers; [ ehmry ];
   };
 }
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index a323cd4802cf2f74609ff107c190e208dfe19da3..fde66a71e2e6cadd6686be7bb189e07d2fc706e3 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -34,7 +34,7 @@ let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.20";
-  minor = "10";
+  minor = "18";
 
 in stdenv.mkDerivation rec {
   name = "mpd-${version}";
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
     owner  = "MusicPlayerDaemon";
     repo   = "MPD";
     rev    = "v${version}";
-    sha256 = "0i170kfn68x683fsm5rba0zbpjfr1r7s6a8nvdbva2yl0aizfzhs";
+    sha256 = "020vdn94fwjbldnkgr2h3dk9sm6f5k59qic568mw88yi7cr3mjsh";
   };
 
   patches = [ ./x86.patch ];
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index c157064fcb2b24e344e794e9cf3299407795ae93..bce69370d2bda83e30124c403cdd9289ae20d6a7 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mosquitto";
-  version = "1.4.14";
+  version = "1.4.15";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz";
-    sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm";
+    sha256 = "10wsm1n4y61nz45zwk4zjhvrfd86r2cq33370m5wjkivb8j3wfvx";
   };
 
   buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]
diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix
index 3a1e91b26eb081547a601d21815af4d32a8f6b40..de317ada6e4505c178f5992d407bf1194aa163c8 100644
--- a/pkgs/servers/neard/default.nix
+++ b/pkgs/servers/neard/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "neard-0.15-post-git-20510929";
+  name = "neard-0.16";
 
-  src = fetchgit {
-    url    = "https://git.kernel.org/pub/scm/network/nfc/neard.git";
-    sha256 = "07dny1l8n46v0yn30zqa8bkyj8ay01xphc124nhf2sqwbff7nf2m";
+  src = fetchurl {
+    url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/${name}.tar.gz";
+    sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index ec4e78a54ece0afc656cb2b1ac346e2a0d34c097..e6baf9e64d8bbb2fcde3a8f1c6b6658e8fd0a778 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "12.0.3";
+  version = "13.0.1";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "0wgvvpk7h7psy41a32f0ljh6iasjsqbf4pxi8nhybl46m35srg48";
+    sha256 = "048x3x6d11m75ghxjcjzm8amjm6ljirv6djbl53awwp9f5532hsp";
   };
 
   installPhase = ''
diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix
index a78b3d59095e03d547f28a56763c49fbf187dcf1..0fcb5047549db2f2447fe4abbec7d9642c5cc53c 100644
--- a/pkgs/servers/nextcloud/news-updater.nix
+++ b/pkgs/servers/nextcloud/news-updater.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "nextcloud-news-updater-${version}";
-  version = "10.0.0";
+  version = "10.0.1";
 
   src = fetchurl {
     url = "mirror://pypi/n/nextcloud_news_updater/nextcloud_news_updater-${version}.tar.gz";
-    sha256 = "00pscz0p4s10y1ymb6sm0gx4a5wdbhimn30582x8i28n58nnl8j0";
+    sha256 = "14jj3w417wfsm1ki34d980b0s6vfn8i29g4c66qb2fizdq1d0z6q";
   };
 
   doCheck = false;
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index 6b15c165dfdf969d971ea590284d57c7ee8e8170..bd291356b4365959f5daa6d1602b07a42d464458 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena-fuseki";
-    version = "3.5.0";
+    version = "3.7.0";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
-    sha256 = "0pdq103vqpkbwi84yyigw4dy60ch7xzazaj3gfcbipg73v81wpvp";
+    sha256 = "1824rvdrs9yhjinac2vkvkxvns8bfdvy91k5ghzzk0nrdcj31pmr";
   };
   buildInputs = [
     makeWrapper
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     for i in "$out"/bin/*; do
       wrapProgram "$i" \
         --prefix "PATH" : "${java}/bin/" \
-        --set "FUSEKI_HOME" '"''${FUSEKI_HOME:-'"$out"'}"' \
+        --set-default "FUSEKI_HOME" "$out" \
         ;
     done
   '';
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 786b142c7329b12d0edf39e8628f724133a3d113..d460284ef045e1d2fbd370db497c4a346df4b2ec 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.2.3";
+  version = "3.3.7";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "1ndd7wxw2lz1ywnz3kp0pz1jmby2jakhl00kn8jwghcbipvnx9b5";
+    sha256 = "1464nl2ampfkcd2kh1hmc18hh8ya73mjmxizm6wgl5yvkh56a82x";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index 3514ae84350df01992453970357280351db3feef..fd3b2d3aa2869e165c71edc20daf45dcd348a9e7 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2.1.15";
-  sha256 = "1yc6r4gmxz9c4zghzn6bz5wswz7dz61w7p4x9s5gqnixfp2mlapp";
+  version = "2.1.19";
+  sha256 = "1qlc62j3hf5831yrrbydn3z19zrn6bpirarinys6bmhshr7mhpyr";
 })
diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix
index b467fcfdff5b393edcdd2249ed3d2d93f80cb848..3d276128c00d1447efa23d897d15d72abe560cf3 100644
--- a/pkgs/servers/nosql/cassandra/2.2.nix
+++ b/pkgs/servers/nosql/cassandra/2.2.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2.2.9";
-  sha256 = "1wc2l8l7i43r0yc6qqi3wj4pm0969kjkh2pgx80wglzxm7275hv5";
+  version = "2.2.11";
+  sha256 = "0r39mm5ibdn9dqv11n4x33vcb5247r6fl6r07l6frqp6i36ilvl6";
 })
diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix
index 04348568bafc51242663baf6beeceb859584aabf..b6621ec954858f6a5bf8f63db4ff9d8aa47116fb 100644
--- a/pkgs/servers/nosql/cassandra/3.0.nix
+++ b/pkgs/servers/nosql/cassandra/3.0.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "3.0.9";
-  sha256 = "16jdh20cr4h47ldjqlnp2cdnb9zshqvnll6995s2a75d8m030c0g";
+  version = "3.0.15";
+  sha256 = "1n92wpp5gm41r4agjwjw9ymnnn114pmaqf04c1dx3fksk100wd5g";
 })
diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4647260b1e288044b784f939305264bc70f677c5
--- /dev/null
+++ b/pkgs/servers/nosql/cassandra/3.11.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "3.11.1";
+  sha256 = "1vgh4ysnl4xg8g5v6zm78h3sq308r7s17ppbw0ck4bwyfnbddvkg";
+})
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index f5f29bcdac7874ae994abc54a85f8c22aedf3d39..48875b093a8dd5e628090128e2f12bcf5a02cfe2 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -10,7 +10,8 @@ let
     gawk
     which
     jre
-  ] ++ stdenv.lib.optional stdenv.isLinux procps);
+    procps
+  ]);
 in
 
 stdenv.mkDerivation rec {
@@ -65,6 +66,6 @@ stdenv.mkDerivation rec {
     description = "A massively scalable open source NoSQL database";
     platforms = platforms.unix;
     license = licenses.asl20;
-    maintainers = with maintainers; [ nckx cransom ];
+    maintainers = with maintainers; [ cransom ];
   };
 }
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index e6bf634b554c1749efb370efbb0a3dbaa155fefa..3ec00dfa16e7feb9a1f772f75a08df7473b65405 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -5,12 +5,12 @@
 
 stdenv.mkDerivation rec {
   name = "EventStore-${version}";
-  version = "4.0.3";
+  version = "4.1.0";
   src = fetchFromGitHub {
     owner  = "EventStore";
     repo   = "EventStore";
     rev    = "oss-v${version}";
-    sha256 = "1905bnqyyiqprva67cp49rgib324iipw2l71jzj0ynzi7kxr4mgg";
+    sha256 = "0mvjz327kfg157fwvy8xkkf5h0g3v373pfwr70cslsy96n45jp10";
   };
 
   buildPhase = ''
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 5043c36f8c201f6b9537537ec546e9a96c2f5f5c..972bd53d95ee65ab447d55d6e403f479252c1290 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -11,6 +11,10 @@ buildGoPackage rec {
     sha256 = "048ap70hdfkxhy0y8q1jsb0lql1i99jnf3cqaqar6qs2ynzsw9hd";
   };
 
+  buildFlagsArray = [ ''-ldflags=
+    -X main.version=${version}
+  '' ];
+
   goPackagePath = "github.com/influxdata/influxdb";
 
   excludedPackages = "test";
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 969cd183c5c1da6edc365af3e1523d05d54817ad..b9e850e8dfd4df3833d207c001355384db10f1d0 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-let version = "3.4.2";
+let version = "3.4.10";
     system-libraries = [
       "pcre"
       #"asio" -- XXX use package?
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "0n8vspccrpd2z9xk3yjpz4gprd730dfacw914ksjzz9iadn0zdi9";
+    sha256 = "1wz2mhl9z0b1bdkg6m8v8mvw9k60mdv5ybq554xn3yjj9z500f24";
   };
 
   nativeBuildInputs = [ scons ];
@@ -61,12 +61,6 @@ in stdenv.mkDerivation rec {
         name = "boost160.patch";
         sha256 = "0bvsf3499zj55pzamwjmsssr6x63w434944w76273fr5rxwzcmh8";
       })
-      # probably not needed for > 3.4.10
-      (fetchpatch {
-        url = https://github.com/mongodb/mongo/commit/218a7b1d4ea3d3b.diff;
-        name = "pcre-8.41.patch";
-        sha256 = "1dra51gw130bq78l2yfkdaj0jkha95ikpv4ig21rapbl63ip3znj";
-      })
     ];
 
   postPatch = ''
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index c907f081e22ed86c3f7529e0ae9006a002790646..bc67e7eaf430de7cb7dfa13ac776a738892a5c05 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.2";
+  version = "3.3.4";
 
   src = fetchurl {
     url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz";
-    sha256 = "0kvbsm9mjwqyl3q2myif28a0f11i4rfq3hik07w9cdnrwyd75s40";
+    sha256 = "072pk0x1iyg6kasjah8qpki2z462qp0rvgn93y6ngi6zvrpdlbyc";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 9ef0987d9b96f684db87afa4c45a929e706be1ec..07489b627288047012f16e96eb4ff40b32c656af 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,22 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, lua }:
+{ stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.2";
+  version = "4.0.9";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "04s8cgvwjj1979s3hg8zkwc9pyn3jkjpz5zidp87kfcipifr385i";
+    sha256 = "0465bv6yxnwmas3wzg07vmrprv2pxhnr56hn5pxrybwf66y76kyz";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2017-15047.patch";
-      url = https://github.com/antirez/redis/commit/ffcf7d5ab1e98d84c28af9bea7be76c6737820ad.patch;
-      sha256 = "0cgx3lm0n7jxhsly8v9hdvy6vlamj3ck2jsid4fwyapz6907h64l";
-    })
-  ];
-
   buildInputs = [ lua ];
   makeFlags = "PREFIX=$(out)";
 
diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix
index a0df98faf360d69f5944adc0526091e468444bb2..4d0bb6c687db2f10146821464b0e7e71165a1842 100644
--- a/pkgs/servers/nosql/riak-cs/2.1.1.nix
+++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
     description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility";
     platforms   = [ "x86_64-linux" "x86_64-darwin" ];
     license     = licenses.asl20;
-    maintainer  = with maintainers; [ mdaiter ];
+    maintainers = with maintainers; [ mdaiter ];
   };
 }
diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix
index b58fc342ded73e6b60b154cf781025bcb7347119..d9919005e39db769aadfea21c6ba05bf34b3f2d1 100644
--- a/pkgs/servers/oauth2_proxy/default.nix
+++ b/pkgs/servers/oauth2_proxy/default.nix
@@ -1,17 +1,25 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "oauth2_proxy-${version}";
-  version = "20160120-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "10f47e325b782a60b8689653fa45360dee7fbf34";
+  version = "20180325-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "a94b0a8b25e553f7333f7b84aeb89d9d18ec259b";
   
   goPackagePath = "github.com/bitly/oauth2_proxy";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/bitly/oauth2_proxy";
-    sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si";
+    repo = "oauth2_proxy";
+    owner = "bitly";
+    sha256 = "07m258s9fxjsgixggw0d1zicd7l6l2rkm5mh3zdjdaj20sqcj217";
   };
 
   goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "A reverse proxy that provides authentication with Google, Github or other provider";
+    homepage = https://github.com/bitly/oauth2_proxy/;
+    license = licenses.mit;
+    maintainers = [ maintainers.yorickvp ];
+  };
 }
diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix
index 37ddbbde64e215af7637a249beaea7c4b7693dd1..435c7d127821d46335ebfbd78be58a8eabf5c5cf 100644
--- a/pkgs/servers/oauth2_proxy/deps.nix
+++ b/pkgs/servers/oauth2_proxy/deps.nix
@@ -1,20 +1,21 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
 [
   {
-    goPackagePath = "gopkg.in/fsnotify.v1";
+    goPackagePath = "cloud.google.com/go";
     fetch = {
       type = "git";
-      url = "https://gopkg.in/fsnotify.v1";
-      rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0";
-      sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "d27f27d9b3cf75c9901d9981f9af50bbfd9002da";
+      sha256 = "18vdhkymm4cqh5fjyz0ia0bc2mpmarjk6w6zh9ydm2d4nkj36cm5";
     };
   }
   {
-    goPackagePath = "golang.org/x/net";
+    goPackagePath = "github.com/BurntSushi/toml";
     fetch = {
       type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
-      sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
+      url = "https://github.com/BurntSushi/toml";
+      rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
+      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
     };
   }
   {
@@ -22,17 +23,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/bitly/go-simplejson";
-      rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a";
-      sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy";
+      rev = "0c965951289cce37dec52ad1f34200fefc816777";
+      sha256 = "0ys37wshd430dizzbg39x5mw55daih2q4qj5l9gr3qbmq9qdn0f3";
     };
   }
   {
-    goPackagePath = "github.com/BurntSushi/toml";
+    goPackagePath = "github.com/coreos/go-oidc";
     fetch = {
       type = "git";
-      url = "https://github.com/BurntSushi/toml";
-      rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
-      sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
+      url = "https://github.com/coreos/go-oidc";
+      rev = "065b426bd41667456c1a924468f507673629c46b";
+      sha256 = "10xhrh70rccgydi708dc9xl4ivmjnzhh1skd1ij6xl1i3x8lk3g6";
+    };
+  }
+  {
+    goPackagePath = "github.com/mbland/hmacauth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mbland/hmacauth";
+      rev = "44256dfd4bfa7594cfa73587a464ca890e85971a";
+      sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1";
     };
   }
   {
@@ -40,26 +50,35 @@
     fetch = {
       type = "git";
       url = "https://github.com/mreiferson/go-options";
-      rev = "7c174072188d0cfbe6f01bb457626abb22bdff52";
-      sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm";
+      rev = "77551d20752b54535462404ad9d877ebdb26e53d";
+      sha256 = "02c18zrx038gbas58l90xzsz9m5q3gpjprdcwmnvxsn0zvld0vpj";
     };
   }
   {
-    goPackagePath = "google.golang.org/api";
+    goPackagePath = "github.com/pquerna/cachecontrol";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/google-api-go-client";
-      rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80";
-      sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8";
+      url = "https://github.com/pquerna/cachecontrol";
+      rev = "525d0eb5f91d30e3b1548de401b7ef9ea6898520";
+      sha256 = "13r6qz9pghy9fapps5h9mhblggnjq2nfxysvf2jp4scanc5vw2y3";
     };
   }
   {
-    goPackagePath = "google.golang.org/cloud";
+    goPackagePath = "golang.org/x/crypto";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev = "6335269abf9002cf5a84613c13cda6010842b834";
-      sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf";
+      url = "https://go.googlesource.com/crypto";
+      rev = "88942b9c40a4c9d203b82b3731787b672d6e809b";
+      sha256 = "0jw1faq8krcxwf1fv3w75apk1ncnykwg8y5ahs5rasjmspvkv8cw";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "6078986fec03a1dcc236c34816c71b0e05018fda";
+      sha256 = "0qbl17mzpq7anwyzy6hdvxqk7f6q2xlm6f9dknkwlszfd4id2fwb";
     };
   }
   {
@@ -67,17 +86,44 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/oauth2";
-      rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a";
-      sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8";
+      rev = "fdc9e635145ae97e6c2cb777c48305600cf515cb";
+      sha256 = "0pznj7pb2rjar005dvppimdynarm8smj6vnqz9wvd9fxyn0q0yww";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "13d03a9a82fba647c21a0ef8fba44a795d0f0835";
+      sha256 = "1lmyd4mk7lbgnxyvr6ndfdfafazp9a4cc6c0a2q2j4n53g2vwbgk";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/google-api-go-client";
+      rev = "e4126357c891acdef6dcd7805daa4c6533be6544";
+      sha256 = "19c874pr7vhhiyw7zn6v625g8i70gqzi3rr645kai6pnd1w7s27n";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/fsnotify.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/fsnotify/fsnotify.v1";
+      rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
     };
   }
   {
-    goPackagePath = "github.com/18F/hmacauth";
+    goPackagePath = "gopkg.in/square/go-jose.v2";
     fetch = {
       type = "git";
-      url = "https://github.com/18F/hmacauth";
-      rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd";
-      sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1";
+      url = "https://gopkg.in/square/go-jose.v2";
+      rev = "552e98edab5d620205ff1a8960bf52a5a10aad03";
+      sha256 = "03w6rgxkvdv3vcfr23s6wbck431w7dwnw0jy7qnyl0qihxzn40rv";
     };
   }
 ]
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
deleted file mode 100644
index d7ed2849d604acd3ece962e9d80e978262763cbc..0000000000000000000000000000000000000000
--- a/pkgs/servers/openafs-client/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc,
-  kernel, glibc, ncurses, perl, kerberos, fetchpatch }:
-
-stdenv.mkDerivation rec {
-  name = "openafs-${version}-${kernel.version}";
-  version = "1.6.21.1";
-
-  src = fetchurl {
-    url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
-    sha256 = "0nisxnfl8nllcfmi7mxj1gngkpxd4jp1wapbkhz07qwqynq9dn5f";
-  };
-
-  nativeBuildInputs = [ autoconf automake flex yacc perl which ];
-
-  buildInputs = [ ncurses ];
-
-  hardeningDisable = [ "pic" ];
-
-  patches = [
-   (fetchpatch {
-      name = "fix-stdint-include.patch";
-      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=c193e5cba18273a062d4162118c7055b54f7eb5e";
-      sha256 = "1yc4gygcazwsslf6mzk1ai92as5jbsjv7212jcbb2dw83jydhc09";
-    })
-  ];
-
-  preConfigure = ''
-    ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux
-
-    patchShebangs .
-    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
-      echo "Patch /usr/include and /usr/src in $i"
-      substituteInPlace $i \
-        --replace "/usr/include" "${glibc.dev}/include" \
-        --replace "/usr/src" "$TMP"
-    done
-
-    ./regen.sh
-
-    ${stdenv.lib.optionalString (kerberos != null)
-      "export KRB5_CONFIG=${kerberos}/bin/krb5-config"}
-
-    configureFlagsArray=(
-      "--with-linux-kernel-build=$TMP/linux"
-      ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"}
-      "--sysconfdir=/etc/static"
-      "--disable-linux-d_splice-alias-extra-iput"
-    )
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Open AFS client";
-    homepage = https://www.openafs.org;
-    license = licenses.ipl10;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.z77z ];
-    broken = versionOlder kernel.version "3.18";
-  };
-}
diff --git a/pkgs/servers/openafs/default.nix b/pkgs/servers/openafs/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3f92299c2a0a2a904eb0ac0c191a5a75ef228d80
--- /dev/null
+++ b/pkgs/servers/openafs/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc
+, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
+, ncurses # Extra ncurses utilities. Only needed for debugging.
+, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
+}:
+
+with (import ./srcs.nix { inherit fetchurl; });
+
+stdenv.mkDerivation rec {
+  name = "openafs-${version}";
+  inherit version srcs;
+
+  nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ];
+
+  buildInputs = [ ncurses ];
+
+  patches = stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
+
+  outputs = [ "out" "dev" "man" "doc" ];
+
+  preConfigure = ''
+
+    patchShebangs .
+    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+      echo "Patch /usr/include and /usr/src in $i"
+      substituteInPlace $i \
+        --replace "/usr/include" "${glibc.dev}/include" \
+        --replace "/usr/src" "$TMP"
+    done
+
+    for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do
+      substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+        "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
+    done
+
+    ./regen.sh
+
+    ${stdenv.lib.optionalString (kerberos != null)
+      "export KRB5_CONFIG=${kerberos.dev}/bin/krb5-config"}
+
+    export AFS_SYSKVERS=26
+
+    configureFlagsArray=(
+      ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"}
+      "--sysconfdir=/etc"
+      "--localstatedir=/var"
+      "--disable-kernel-module"
+      "--disable-fuse-client"
+      "--with-html-xsl=${docbook_xsl}/share/xml/docbook-xsl/html/chunk.xsl"
+      ${stdenv.lib.optionalString (tsmbac != null) "--enable-tivoli-tsm"}
+      ${stdenv.lib.optionalString (ncurses == null) "--disable-gtx"}
+      "--disable-linux-d_splice-alias-extra-iput"
+    )
+  '' + stdenv.lib.optionalString (tsmbac != null) ''
+    export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
+    export XBSA_XLIBS="-ldl"
+  '';
+
+  buildFlags = [ "all_nolibafs" ];
+
+  postBuild = ''
+    for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+      make -C "''${d}" html
+    done
+  '';
+
+  postInstall = ''
+    mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
+    cp -r doc/{arch,examples,pdf,protocol,txt} README NEWS $doc/share/doc/openafs
+    for d in AdminGuide QuickStartUnix UserGuide ; do
+      cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
+    done
+
+    rm -r $out/lib/{openafs,afs,*.a}
+    rm $out/bin/kpasswd
+    rm $out/sbin/{kas,kdb,ka-forwarder,kadb_check}
+    rm $out/libexec/openafs/kaserver
+    rm $man/share/man/man{1/kpasswd*,5/kaserver*,8/{ka*,kdb*}}
+  '';
+
+  meta = with stdenv.lib; {
+    outputsToInstall = [ "out" "doc" "man" ];
+    description = "Open AFS client";
+    homepage = https://www.openafs.org;
+    license = licenses.ipl10;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.z77z maintainers.spacefrogg ];
+  };
+}
diff --git a/pkgs/servers/openafs/module.nix b/pkgs/servers/openafs/module.nix
new file mode 100644
index 0000000000000000000000000000000000000000..8cd9287a7772d687b4b3281b60bad8adb3849bb5
--- /dev/null
+++ b/pkgs/servers/openafs/module.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
+, kernel, glibc, perl }:
+
+with (import ./srcs.nix { inherit fetchurl; });
+
+let
+  modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
+  kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+
+in stdenv.mkDerivation rec {
+  name = "openafs-${version}-${kernel.version}";
+  inherit version src;
+
+  nativeBuildInputs = [ autoconf automake flex perl yacc which ] ++ kernel.moduleBuildDependencies;
+
+  hardeningDisable = [ "pic" ];
+
+  configureFlags = [
+    "--with-linux-kernel-build=${kernelBuildDir}"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--disable-linux-d_splice-alias-extra-iput"
+  ];
+
+  preConfigure = ''
+    patchShebangs .
+    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+      echo "Patch /usr/include and /usr/src in $i"
+      substituteInPlace $i \
+        --replace "/usr/include" "${glibc.dev}/include" \
+        --replace "/usr/src" "${kernelBuildDir}"
+    done
+
+    ./regen.sh -q
+
+  '';
+
+  buildPhase = ''
+    make V=1 only_libafs
+  '';
+
+  installPhase = ''
+    mkdir -p ${modDestDir}
+    cp src/libafs/MODLOAD-*/libafs-${kernel.version}.* ${modDestDir}/libafs.ko
+    xz -f ${modDestDir}/libafs.ko
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open AFS client kernel module";
+    homepage = https://www.openafs.org;
+    license = licenses.ipl10;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.z77z maintainers.spacefrogg ];
+    broken = versionOlder kernel.version "3.18";
+  };
+
+}
diff --git a/pkgs/servers/openafs/srcs.nix b/pkgs/servers/openafs/srcs.nix
new file mode 100644
index 0000000000000000000000000000000000000000..9e9ff623e5cd7aa1cc68cf6bcd0f7bca884684f6
--- /dev/null
+++ b/pkgs/servers/openafs/srcs.nix
@@ -0,0 +1,14 @@
+{ fetchurl }:
+rec {
+  version = "1.6.22.2";
+  src = fetchurl {
+    url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
+    sha256 = "15j17igignsfzv5jb47ryczsrz3zsmiqwnj38dx9gzz95807rkyf";
+  };
+
+  srcs = [ src
+    (fetchurl {
+      url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
+      sha256 = "1lpydca95nx5pmqvplb9n3akmxbzvhhypswh0s589ywxpv3zynxm";
+    })];
+}
diff --git a/pkgs/servers/openafs/tsmbac.patch b/pkgs/servers/openafs/tsmbac.patch
new file mode 100644
index 0000000000000000000000000000000000000000..412765fe8a5b7c880cd5dad0f261910afeed4389
--- /dev/null
+++ b/pkgs/servers/openafs/tsmbac.patch
@@ -0,0 +1,62 @@
+diff -ru3 openafs-1.6.18.1/acinclude.m4 openafs-1.6.18.1.new/acinclude.m4
+--- openafs-1.6.18.1/acinclude.m4	2016-06-21 17:13:39.000000000 +0200
++++ openafs-1.6.18.1.new/acinclude.m4	2016-11-02 18:44:30.423039662 +0100
+@@ -1373,45 +1373,7 @@
+ 
+ dnl check for tivoli
+ AC_MSG_CHECKING(for tivoli tsm butc support)
+-XBSA_CFLAGS=""
+-if test "$enable_tivoli_tsm" = "yes"; then
+-	XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
+-	XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
+-	XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
+-	XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
+-	XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample
+-	XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample
+-
+-	if test -r "$XBSADIR3/dsmapifp.h"; then
+-		XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
+-		XBSA_XLIBS="-ldl"
+-		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-	elif test -r "$XBSADIR4/dsmapifp.h"; then
+-		XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
+-		XBSA_XLIBS="-ldl"
+-		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-	elif test -r "$XBSADIR5/dsmapifp.h"; then
+-		XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5"
+-		XBSA_XLIBS="-ldl"
+-		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-	elif test -r "$XBSADIR6/dsmapifp.h"; then
+-		XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6"
+-		XBSA_XLIBS="-ldl"
+-		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-	elif test -r "$XBSADIR1/xbsa.h"; then
+-		XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
+-		XBSA_XLIBS=""
+-		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-	elif test -r "$XBSADIR2/xbsa.h"; then
+-		XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
+-		XBSA_XLIBS=""
+-		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-	else
+-		AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files])
+-	fi
+-else
+-	AC_MSG_RESULT([no])
+-fi
++AC_MSG_RESULT([yes])
+ AC_SUBST(XBSA_CFLAGS)
+ AC_SUBST(XBSA_XLIBS) 
+ 
+diff -ru3 openafs-1.6.18.1/src/butc/afsxbsa.c openafs-1.6.18.1.new/src/butc/afsxbsa.c
+--- openafs-1.6.18.1/src/butc/afsxbsa.c	2016-06-21 17:13:39.000000000 +0200
++++ openafs-1.6.18.1.new/src/butc/afsxbsa.c	2016-11-02 18:45:10.734662987 +0100
+@@ -651,7 +651,7 @@
+ #if defined(AFS_AIX_ENV)
+         dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER);
+ #elif defined (AFS_AMD64_LINUX26_ENV)
+-	dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL);
++	dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL);
+ #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
+         dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL);
+ #else
diff --git a/pkgs/servers/openpts/bugs.patch b/pkgs/servers/openpts/bugs.patch
deleted file mode 100644
index d818bafbc9f3b82510d01fd021a005fbddbf2795..0000000000000000000000000000000000000000
--- a/pkgs/servers/openpts/bugs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp openpts-0.2.6-cvs-patched/src/fsm.c openpts-0.2.6-current/src/fsm.c
---- openpts-0.2.6-cvs-patched/src/fsm.c	2012-01-05 03:49:15.000000000 -0500
-+++ openpts-0.2.6-current/src/fsm.c	2012-01-09 12:11:17.338706205 -0500
-@@ -934,7 +934,7 @@ char *getEventString(OPENPTS_PCR_EVENT_W
-     /* event */
-     event = eventWrapper->event;
-     if (event != NULL) {
--        // len = snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType);
-+        snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType);
-     } else {
-         LOG(LOG_ERR, "NULL event\n");  // TODO(munetoh)
-         xfree(buf);
diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix
deleted file mode 100644
index 27731af3803ef40d83f3ea7d7a0c4f111011415d..0000000000000000000000000000000000000000
--- a/pkgs/servers/openpts/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, trousers, openssl, libxml2, libuuid, gettext, perl }:
-
-stdenv.mkDerivation rec {
-  name = "openpts-${version}";
-  version = "0.2.6";
-
-  src = fetchurl {
-    url = "http://jaist.dl.osdn.jp/openpts/54410/openpts-${version}.tar.gz";
-    sha256 = "1b5phshl49fxr5y3g5zz75gm0n4cw8i7n29x5f1a95xkwrjpazi0";
-  };
-
-  # patches from https://apps.fedoraproject.org/packages/openpts/sources/patches/
-  patches = [ ./bugs.patch ./zlib.patch ./tboot.patch ./ptsc.patch ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake libtool trousers openssl libxml2 libuuid gettext ];
-
-  preConfigure = ''
-    substituteInPlace include/Makefile.am --replace "./cvs2msg.pl" "${perl}/bin/perl cvs2msg.pl";
-    $SHELL bootstrap.sh
-    '';
-
-  configureFlags = [ "--with-tss" "--with-aru" "--with-tboot" "--enable-tnc" "--with-aide" ];
-
-  NIX_CFLAGS_COMPILE = "-I${trousers}/include/trousers -I${trousers}/include/tss -Wno-deprecated-declarations";
-
-  preInstall = ''
-    mkdir -p $out
-    mkdir -p $out/etc
-    cp -p dist/ptsc.conf.in $out/etc/ptsc.conf
-    cp -p dist/ptsv.conf.in $out/etc/ptsv.conf
-    mkdir -p $out/share/openpts/models
-    cp -p models/*.uml $out/share/openpts/models/
-
-    mkdir -p $out/share/openpts/tpm_emulator
-    cp dist/tpm_emulator/README.rhel $out/share/openpts/tpm_emulator/README
-    cp dist/tpm_emulator/binary_bios_measurements $out/share/openpts/tpm_emulator/
-    cp dist/tpm_emulator/tcsd $out/share/openpts/tpm_emulator/
-
-    mkdir -p $out/share/openpts/tboot
-    cp dist/tboot/README.fedora15 $out/share/openpts/tboot/README
-    cp dist/tboot/ptsc.conf.fedora15 $out/share/openpts/tboot/ptsc.conf
-    cp dist/tboot/tcsd.conf.fedora15 $out/share/openpts/tboot/tcsd.conf
-    cp dist/tboot/tcsd.fedora15 $out/share/openpts/tboot/tcsd
-    '';
-
-  meta = {
-    description = "TCG Platform Trust Service (PTS)";
-    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/openpts/ptsc.patch b/pkgs/servers/openpts/ptsc.patch
deleted file mode 100644
index b6fcde7407444339ebdc2b6aeaf7b8cdb3c51f15..0000000000000000000000000000000000000000
--- a/pkgs/servers/openpts/ptsc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urNp openpts-0.2.6-patched/src/ptsc.c openpts-0.2.6-current/src/ptsc.c
---- openpts-0.2.6-patched/src/ptsc.c	2012-08-21 15:57:07.733841433 -0400
-+++ openpts-0.2.6-current/src/ptsc.c	2012-08-21 16:13:26.479732504 -0400
-@@ -457,7 +457,10 @@ void ptsc_lock(void) {
-             exit(1);
-         }
-         oldgrp = getegid();
--        setegid(grp.gr_gid);
-+        if(setegid(grp.gr_gid) != 0){
-+		LOG(LOG_ERR, "setegid fail");
-+		exit(1);
-+	}
-     }
- 
-     oldmask = umask(0);
-@@ -467,7 +470,10 @@ void ptsc_lock(void) {
-     }
-     if (grpent) {
-         chmod(LOCK_DIR, 02775);
--        setegid(oldgrp);
-+	if(setegid(oldgrp) != 0){
-+		LOG(LOG_ERR, "setegid fail");
-+		exit(1);
-+        }
-     }
-     fd = open(LOCK_FILE, O_RDWR | O_CREAT | O_TRUNC, 0660);
-     if (fd < 0) {
-
diff --git a/pkgs/servers/openpts/tboot.patch b/pkgs/servers/openpts/tboot.patch
deleted file mode 100644
index 6ecee5839202714c6d17141c7f9dc0c47d6c6886..0000000000000000000000000000000000000000
--- a/pkgs/servers/openpts/tboot.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urNp openpts-0.2.6-patched/src/tboot2iml.c openpts-0.2.6-current/src/tboot2iml.c
---- openpts-0.2.6-patched/src/tboot2iml.c	2012-07-23 16:30:12.381361421 -0400
-+++ openpts-0.2.6-current/src/tboot2iml.c	2012-07-23 17:25:59.053945778 -0400
-@@ -531,7 +531,7 @@ int sinit_acm_hash(char *filename, int s
- 
- 
- int sha1sum_unzip(char *filename, int *filesize, BYTE *digest) {
--    FILE *fp;
-+    gzFile fp;
-     char buf[2048];
-     SHA_CTX sha_ctx;
-     int len;
-@@ -541,7 +541,7 @@ int sha1sum_unzip(char *filename, int *f
- 
-     /* open */
-     fp = gzopen(filename, "rb");
--    if (fp == NULL) {
-+    if (fp == Z_NULL) {
-         LOG(LOG_ERR, "File %s does not exist\n", filename);
-         return 0;
-     }
diff --git a/pkgs/servers/openpts/zlib.patch b/pkgs/servers/openpts/zlib.patch
deleted file mode 100644
index 7fa3fce10fe9f28aca8cb0cbb5db6975eda269e7..0000000000000000000000000000000000000000
--- a/pkgs/servers/openpts/zlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp openpts-0.2.6-cvs-patched/src/Makefile.am openpts-0.2.6-current/src/Makefile.am
---- openpts-0.2.6-cvs-patched/src/Makefile.am	2012-01-05 03:49:15.000000000 -0500
-+++ openpts-0.2.6-current/src/Makefile.am	2012-01-09 14:12:02.507361732 -0500
-@@ -30,7 +30,7 @@ localedir = $(datadir)/locale
- 
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include $(LIBXML2_CFLAGS) $(TSS_CFLAGS) -I../include -DLOCALEDIR=\"$(localedir)\"
--AM_LDFLAGS = $(LIBXML2_LIBS) $(LIBCRYPTO_LIBS) $(TSS_LIBS) -lopenpts
-+AM_LDFLAGS = $(LIBXML2_LIBS) $(LIBCRYPTO_LIBS) $(TSS_LIBS) -lz -lopenpts
- # $(LIBINTL) -lopenpts
- 
- if HAVE_LIBUUID
diff --git a/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch b/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch
deleted file mode 100644
index 12fcdb4fd02c1ac2bad9e5ab63c9995ea97c4f0a..0000000000000000000000000000000000000000
--- a/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/extractor/extractor_options.cpp b/extractor/extractor_options.cpp
-index d14d8d9..c64d7fd 100644
---- a/extractor/extractor_options.cpp
-+++ b/extractor/extractor_options.cpp
-@@ -50,7 +50,7 @@ bool ExtractorOptions::ParseArguments(int argc, char *argv[], ExtractorConfig &e
-     boost::program_options::options_description config_options("Configuration");
-     config_options.add_options()("profile,p",
-                                  boost::program_options::value(
--                                     &extractor_config.profile_path)->default_value("profile.lua"),
-+                                     &extractor_config.profile_path)->default_value("@out@/profiles/car.lua"),
-                                  "Path to LUA routing profile")(
-         "threads,t",
-         boost::program_options::value(&extractor_config.requested_num_threads)
diff --git a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch b/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch
deleted file mode 100644
index 87b9b9501c4c367ef26e632eba14bf0395403fc6..0000000000000000000000000000000000000000
--- a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,8 +127,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
-     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
-         NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW)
-       message(STATUS "Using gcc specific binutils for LTO.")
--      set(CMAKE_AR     "/usr/bin/gcc-ar")
--      set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
-+      # Just let PATH do its job
-+      set(CMAKE_AR     "gcc-ar")
-+      set(CMAKE_RANLIB "gcc-ranlib")
-     endif()
-   endif (HAS_LTO_FLAG)
- endif()
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 8846f50c8861242259f265798d12d9154aed1b3b..b7c85a8f9a4baccde477e3d7f5cb675201897c15 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -1,24 +1,18 @@
-{stdenv, fetchFromGitHub, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}:
+{stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}:
 
 stdenv.mkDerivation rec {
   name = "osrm-backend-${version}";
-  version = "4.9.1";
+  version = "5.16.4";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "1r4dwniwxgfppnb9asdh98w5qxqwkjhp9gc5fabmck0gk73cwkcc";
+    sha256 = "01wghly0rqv4f9lfabmbfddjp2pclcfip45rmn0fvnj5c6x23v6v";
   };
 
-  patches = [
-    ./4.5.0-gcc-binutils.patch
-    (substituteAll {
-      src = ./4.5.0-default-profile-path.template.patch;
-    })
-  ];
-
-  buildInputs = [ cmake luabind libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ];
 
   postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";
 
@@ -26,6 +20,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Project-OSRM/osrm-backend/wiki;
     description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project";
     license = stdenv.lib.licenses.bsd2;
+    maintainers = with stdenv.lib.maintainers;[ erictapen ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix
index c452ac869fce435f942f4f5ddc8609b6198a8ac1..f02e67740b62fb7503fb45d4e5d979da5433b733 100644
--- a/pkgs/servers/owncloud/default.nix
+++ b/pkgs/servers/owncloud/default.nix
@@ -32,11 +32,6 @@ let
 
 in {
 
-  owncloud705 = common {
-    versiona = "7.0.5";
-    sha256 = "1j21b7ljvbhni9l0b1cpzlhsjy36scyas1l1j222mqdg2srfsi9y";
-  };
-
   owncloud70 = common {
     versiona = "7.0.15";
     sha256 = "1b2a0fccxlkqyyzsymx7qw8qbhsks3i6h1ybvxv8nn8hgw33nqv7";
diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix
index 0f7cc19339d891ddf721f66008ba734c5987828a..bcf1255ff4a9b465ca852a93e22c1e41afd7777c 100644
--- a/pkgs/servers/p910nd/default.nix
+++ b/pkgs/servers/p910nd/default.nix
@@ -40,6 +40,5 @@ stdenv.mkDerivation rec {
     downloadPage = http://sourceforge.net/projects/p910nd/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix
index 1ca18d7d3a74525708627ca0b2abc0b4bd233d68..a7a0791b8520794633b0a65f26a1b67d63631f49 100644
--- a/pkgs/servers/polipo/default.nix
+++ b/pkgs/servers/polipo/default.nix
@@ -18,5 +18,8 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ phreedom ehmry ];
     platforms = platforms.all;
+    knownVulnerabilities = [
+      "Unmaintained upstream: https://github.com/jech/polipo/commit/4d42ca1b5849"
+    ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix
index e4b457d0c17b4c29319e25c4dc60eb4051ee08a9..7997d0ebcd8b9691f3d86f8f249e0cb374dc1185 100644
--- a/pkgs/servers/prayer/default.nix
+++ b/pkgs/servers/prayer/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
       ${ssl} \
       -e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \
       -e 's,^PREFIX .*,PREFIX='$out, \
+      -e 's,^CCLIENT_DIR=.*,CCLIENT_DIR=${uwimap}/include/c-client,' \
       Config
     sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \
       templates/src/*.pl
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 85ee3ddcf74410d890dc22cd082ee18b7d572317..ed4a8889c67dca47284e19f293f449da248aeb5c 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -36,14 +36,23 @@
 
 stdenv.mkDerivation rec {
   name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
-  version = "11.0";
+  version = "11.1";
 
   src = fetchurl {
     url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
-    sha256 = "0sf92knqkvqmfhrbz4vlsagzqlps72wycpmln5dygicg07a0a8q7";
+    sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj";
   };
 
-  patches = [ ./caps-fix.patch ];
+  patches = [ ./caps-fix.patch (fetchpatch {
+    name = "glibc-2.27.patch";
+    url = "https://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb";
+    sha256 = "1bi6rbfdjyl6wn0jql4k18xa4hm5l2lpf1sc5j77f8l6jw956afv";
+  }) ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+      name = "padsp-fix.patch";
+      url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244";
+      sha256 = "0gf4w25zi123ghk0njapysvrlljkc3hyanacgiswfnnm1i8sab1q";
+    });
 
   outputs = [ "out" "dev" ];
 
diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index 68c9b7a59362215da50c191f51948c796af33af3..c6f150938ac6ba23a2fc0e57caa92ce12e78fbce 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.2";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "mirror://savannah/quagga/${name}.tar.gz";
-    sha256 = "0c99rjjc62xl5kwvx2pwyvs0709vbwax1qydqbqf6r7fpvr24bjj";
+    sha256 = "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73";
   };
 
   buildInputs =
diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 3b86cf1758c0d39fefb00c68fba8da7acaa71b59..5fd23476d7daec06b1c55655c6518411c17eaa64 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "radarr-${version}";
-  version = "0.2.0.846";
+  version = "0.2.0.995";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "1lpr05aaf6a9p2msmsh0j8krxk83sf5d3avrh5qpyjap5j3phvky";
+    sha256 = "04sgs292qz65fcg5vsps0fk2669xzvyfw1rbc5sbbk3hig5lhlns";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index 6752e5b80b72e4b471af23f9962f32e6668ead4b..937bf327995f372d2a98417e5333c616f8c8fb0c 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -21,6 +21,7 @@ python3Packages.buildPythonApplication {
   propagatedBuildInputs = with python3Packages; [
     vobject
     passlib
+    pytz
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 9e211b8df740387fe63807d1f5c7a76aad81fa65..6b3d60bcaea1a7f1a0ab08c4ea1c0873ca139ac2 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libnsl, libtirpc
+{ fetchurl, stdenv, pkgconfig, libnsl, libtirpc, fetchpatch
 , useSystemd ? true, systemd }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./sunrpc.patch
+    (fetchpatch {
+      name = "CVE-2017-8779.patch";
+      url = "https://raw.githubusercontent.com/guidovranken/rpcbomb/e6da9e489aa8ad000b0ad5ac9abc5b4eefc3a769/rpcbind_patch.txt";
+      sha256 = "0w231w8fxihgrn526np078j3vbj3ylvjvxjmfpjvqhga5zg821ab";
+    })
   ];
 
   buildInputs = [ libnsl libtirpc ]
diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
index 82818037072aaa035781d36cb0aab54586a4bea6..dcbfc40d7dddeda40b73d4b4a8eb0434eb082e3b 100644
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@@ -33,11 +33,11 @@
 stdenv.mkDerivation rec {
   name = "rt-${version}";
 
-  version = "4.4.0";
+  version = "4.4.2";
 
   src = fetchurl {
     url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz";
-    sha256 = "1hgz50fxv9zdcngww083aqh8vzyk148lm7mcivxflpnsqfw3696x";
+    sha256 = "0s5ykc5imcii66zkzcb8lf8adkr8zlbc2ikcpkaxzcccikhndqxj";
   };
 
   patches = [ ./override-generated.patch ];
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index b754807dc9bd4f10860e7d2552b827ba58748f75..d46f5677b9f049449fe9300ab899c9623790f955 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -4,7 +4,7 @@ let
   pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]);
   path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
 in stdenv.mkDerivation rec {
-  version = "1.2.1";
+  version = "2.3.2";
   pname = "sabnzbd";
   name = "${pname}-${version}";
 
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "1rw6f455p0n8qigzkvnlr0d6rzkx2mpzhcp7m0j8fwqdbq831q8y";
+    sha256 = "0c0ap8bygvz643fgfvvmwshcyfblq2c5jziqwgpf30g6rsbfv2v0";
   };
 
   buildInputs = [ pythonEnv makeWrapper ];
diff --git a/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch b/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7e3652dbe7b7f31fa640ab42ac1abf470b7820d3
--- /dev/null
+++ b/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch
@@ -0,0 +1,15 @@
+diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript
+--- samba-4.4.6/dynconfig/wscript	2016-01-26 14:45:46.000000000 +0300
++++ samba-4.4.6-new/dynconfig/wscript	2016-10-15 22:21:18.159705132 +0300
+@@ -416,11 +416,3 @@
+                         public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir),
+                         header_path='samba',
+                         cflags=cflags)
+-
+-    # install some extra empty directories
+-    bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
+-    bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
+-    bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
+-
+-    # these might be on non persistent storage
+-    bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
diff --git a/pkgs/servers/samba/4.x-no-persistent-install.patch b/pkgs/servers/samba/4.x-no-persistent-install.patch
index efb539bfaea52519c0f630322cbe4b061d30657a..1c360f6b2c77adf41457ec6465dbc66be32ca70a 100644
--- a/pkgs/servers/samba/4.x-no-persistent-install.patch
+++ b/pkgs/servers/samba/4.x-no-persistent-install.patch
@@ -37,18 +37,3 @@ diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript
      # Unit tests
      ctdb_unit_tests = [
          'db_hash_test',
-diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript
---- samba-4.4.6/dynconfig/wscript	2016-01-26 14:45:46.000000000 +0300
-+++ samba-4.4.6-new/dynconfig/wscript	2016-10-15 22:21:18.159705132 +0300
-@@ -416,11 +416,3 @@
-                         public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir),
-                         header_path='samba',
-                         cflags=cflags)
--
--    # install some extra empty directories
--    bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
--    bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
--    bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
--
--    # these might be on non persistent storage
--    bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 8adb90496c3148019edf2977b2843e683c780f1a..ba7e9c923e3bb738ac87a31d651384103bf31614 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
 , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc
 , popt, iniparser, libbsd, libarchive, libiconv, gettext
-, kerberos, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
+, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
 , gnutls, libgcrypt, libgpgerror
 , ncurses, libunwind, libibverbs, librdmacm, systemd
 
@@ -19,23 +19,25 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "samba-${version}";
-  version = "4.6.8";
+  version = "4.7.6";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "0pap686cl0j5c9v1v09krpqdk416x3851fbcap5ysp1zajrfw7aq";
+    sha256 = "0vkxqp3wh7bpn1fd45lznmrpn2ma1fq75yq28vi08rggr07y7v8y";
   };
 
   outputs = [ "out" "dev" "man" ];
 
   patches =
     [ ./4.x-no-persistent-install.patch
+      ./patch-source3__libads__kerberos_keytab.c.patch
+      ./4.x-no-persistent-install-dynconfig.patch
     ];
 
   buildInputs =
     [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
       docbook_xml_dtd_45 */ readline talloc popt iniparser
-      libbsd libarchive zlib acl fam libiconv gettext libunwind kerberos
+      libbsd libarchive zlib acl fam libiconv gettext libunwind krb5Full
     ]
     ++ optionals stdenv.isLinux [ libaio pam systemd ]
     ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ]
@@ -59,6 +61,7 @@ stdenv.mkDerivation rec {
     [ "--with-static-modules=NONE"
       "--with-shared-modules=ALL"
       "--with-system-mitkrb5"
+      "--with-system-mitkdc" "${krb5Full}"
       "--enable-fhs"
       "--sysconfdir=/etc"
       "--localstatedir=/var"
diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix
new file mode 100644
index 0000000000000000000000000000000000000000..df1f9feb4de5b44a8e078d4e03f35ffed984d68c
--- /dev/null
+++ b/pkgs/servers/samba/master.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub
+, samba4
+, nettle
+} :
+
+  (samba4.overrideAttrs(oldAttrs: rec {
+    name = "samba-unstable-${version}";
+    version = "2018-03-09";
+
+    src = fetchFromGitHub {
+      owner = "samba-team";
+      repo = "samba";
+      rev = "9e954bcbf43d67a18ee55f84cda0b09028f96b92";
+      sha256 = "07j1pwm4kax6pq21gq9gpmp7dhj5afdyvkhgyl3yz334mb41q11g";
+    };
+
+    # Remove unnecessary install flags, same as <4.8 patch
+    postPatch = oldAttrs.postPatch + ''
+      sed -i '423,433d' dynconfig/wscript
+    '';
+
+    patches = [ ./4.x-no-persistent-install.patch ];
+    buildInputs = [ nettle ] ++ oldAttrs.buildInputs;
+    meta.branch = "master";
+  })).override {
+    # samba4.8+ removed the ability to disable LDAP.
+    # Enable for base derivation here:
+    enableLDAP = true;
+  }
diff --git a/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch b/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9f6577c65c142661edc4e873d63112ddf78ec520
--- /dev/null
+++ b/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch
@@ -0,0 +1,20 @@
+--- old/source3/libads/kerberos_keytab.c	2017-12-23 14:23:53.247467000 +0100
++++ new/source3/libads/kerberos_keytab.c	2017-12-23 18:57:07.135340000 +0100
+@@ -32,8 +32,6 @@
+ 
+ #ifdef HAVE_KRB5
+ 
+-#ifdef HAVE_ADS
+-
+ /* This MAX_NAME_LEN is a constant defined in krb5.h */
+ #ifndef MAX_KEYTAB_NAME_LEN
+ #define MAX_KEYTAB_NAME_LEN 1100
+@@ -85,6 +83,8 @@
+ 	return ret;
+ }
+ 
++#ifdef HAVE_ADS
++
+ /**********************************************************************
+  Adds a single service principal, i.e. 'host' to the system keytab
+ ***********************************************************************/
diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
index 30beec7b873dbcaf2760cfa6da973aab8447065a..28244d1b3dcdc8f6711755a576112a9e2292e411 100644
--- a/pkgs/servers/search/elasticsearch/2.x.nix
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:
+{ stdenv, fetchurl, makeWrapper, jre, utillinux }:
 
 with stdenv.lib;
 
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./es-home-2.x.patch ./es-classpath-2.x.patch ];
 
-  buildInputs = [ makeWrapper jre ] ++
-    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+  buildInputs = [ makeWrapper jre utillinux ];
 
   installPhase = ''
     mkdir -p $out
@@ -24,9 +23,7 @@ stdenv.mkDerivation rec {
     mv $out/bin/plugin $out/bin/elasticsearch-plugin
     wrapProgram $out/bin/elasticsearch \
       --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*" \
-      ${if (!stdenv.isDarwin)
-        then ''--prefix PATH : "${utillinux}/bin/"''
-        else ''--prefix PATH : "${getopt}/bin"''} \
+      --prefix PATH : "${utillinux}/bin" \
       --set JAVA_HOME "${jre}"
     wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}"
   '';
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
index fb988b546308c57e12fe419919005611fc459b93..c80bbbcfde9144b520bf477f879c438a83ed40ad 100644
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux, getopt }:
+{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux }:
 
 with stdenv.lib;
 
@@ -8,13 +8,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
-    sha256 = "0pvi6akicg0i3bz3lbc6k9rznxw7d25flg9wbs2dyxv8i2rrqvq0";
+    sha256 = "0sm99m4m4mmigj6ll22kyaw7zkp1s2i0mhzx15fzidnybdnlifb4";
   };
 
   patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
 
-  buildInputs = [ makeWrapper jre_headless ] ++
-    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+  buildInputs = [ makeWrapper jre_headless utillinux ];
 
   installPhase = ''
     mkdir -p $out
@@ -24,9 +23,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/elasticsearch \
       --prefix ES_CLASSPATH : "$out/lib/*" \
-      ${if (!stdenv.isDarwin)
-        then ''--prefix PATH : "${utillinux}/bin/"''
-        else ''--prefix PATH : "${getopt}/bin"''} \
+      --prefix PATH : "${utillinux}/bin" \
       --set JAVA_HOME "${jre_headless}" \
       --set ES_JVM_OPTIONS "$out/config/jvm.options"
 
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
new file mode 100644
index 0000000000000000000000000000000000000000..06caf191587c14d802220f6e7c021667e1bfd17e
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = elk6Version;
+  name = "elasticsearch-${version}";
+
+  src = fetchurl {
+    url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
+    sha256 = "13hf00khq33yw6zv022vcrsf6vm43isx40x7ww8r1lqx3vmg3rli";
+  };
+
+  patches = [ ./es-home-6.x.patch ];
+
+  postPatch = ''
+    sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env
+  '';
+
+  buildInputs = [ makeWrapper jre_headless utillinux ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R bin config lib modules plugins $out
+
+    chmod -x $out/bin/*.*
+
+    wrapProgram $out/bin/elasticsearch \
+      --prefix PATH : "${utillinux}/bin/" \
+      --set JAVA_HOME "${jre_headless}"
+
+    wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
+  '';
+
+  meta = {
+    description = "Open Source, Distributed, RESTful Search Engine";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ apeschar basvandijk ];
+  };
+}
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 16f0103029026beb88b5e6327158baea5252b9d5..f4780603f502d4cacae44c8afa7dac779afd9962 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:
+{ stdenv, fetchurl, makeWrapper, jre, utillinux }:
 
 with stdenv.lib;
 
@@ -12,8 +12,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./es-home.patch ];
 
-  buildInputs = [ makeWrapper jre ] ++
-    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+  buildInputs = [ makeWrapper jre utillinux ];
 
   installPhase = ''
     mkdir -p $out
@@ -25,9 +24,7 @@ stdenv.mkDerivation rec {
     # set ES_CLASSPATH and JAVA_HOME
     wrapProgram $out/bin/elasticsearch \
       --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \
-      ${if (!stdenv.isDarwin)
-        then ''--prefix PATH : "${utillinux}/bin/"''
-        else ''--prefix PATH : "${getopt}/bin"''} \
+      --prefix PATH : "${utillinux}/bin" \
       --set JAVA_HOME "${jre}"
     wrapProgram $out/bin/elasticsearch-plugin \
       --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \
diff --git a/pkgs/servers/search/elasticsearch/es-home-6.x.patch b/pkgs/servers/search/elasticsearch/es-home-6.x.patch
new file mode 100644
index 0000000000000000000000000000000000000000..aba8d396a69cd5da2e6b94cd67c46913faca6e3e
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/es-home-6.x.patch
@@ -0,0 +1,26 @@
+diff -Naur a/bin/elasticsearch-env b/bin/elasticsearch-env
+--- a/bin/elasticsearch-env	2017-12-12 13:31:51.000000000 +0100
++++ b/bin/elasticsearch-env	2017-12-18 19:51:12.282809695 +0100
+@@ -19,18 +19,10 @@
+   fi
+ done
+ 
+-# determine Elasticsearch home; to do this, we strip from the path until we find
+-# bin, and then strip bin (there is an assumption here that there is no nested
+-# directory under bin also named bin)
+-ES_HOME=`dirname "$SCRIPT"`
+-
+-# now make ES_HOME absolute
+-ES_HOME=`cd "$ES_HOME"; pwd`
+-
+-while [ "`basename "$ES_HOME"`" != "bin" ]; do
+-  ES_HOME=`dirname "$ES_HOME"`
+-done
+-ES_HOME=`dirname "$ES_HOME"`
++if [ -z "$ES_HOME" ]; then
++    echo "You must set the ES_HOME var" >&2
++    exit 1
++fi
+ 
+ # now set the classpath
+ ES_CLASSPATH="$ES_HOME/lib/*"
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 950056ccb1d28626bb79f17e35796306d6eef995..063ad8c3f576a24ef2599cbaea98361282868100 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.8";
+  version = "8.0.1";
 
   src = fetchurl {
     url    = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "1j5biji86dicm8whbqjgjmyycxsfl5qfyxqfc4bxaspd6w18vj87";
+    sha256 = "074r71dcv1l8rm6an7b8iyfpcxbk00iysmzszssknqg8mrqvsphg";
   };
 
   buildInputs = with stdenv.lib;
diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index ead0c095d5c9f97afff5f2b7cbb6f10d8ee0a1d7..7ba23f61fedb0113efa577354c1ea02e082c26b6 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pkgconfig,
-  version ? "2.2.8",
+  version ? "2.2.11",
   mainSrc ? fetchurl {
     url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
-    sha256 = "1q6jdw5g81k7ciw9fhwklb5ifgb8zna39795m0x0lbvwjbk3ampv";
+    sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6";
   }
 }:
 
diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..876cc01592e9df2a96de0bafe3143182379931f0
--- /dev/null
+++ b/pkgs/servers/serviio/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "serviio-${version}";
+  version = "1.9";
+
+  src = fetchurl {
+    url = "http://download.serviio.org/releases/${name}-linux.tar.gz";
+    sha256 = "0vi9dwpdrk087gpi0xib0hwpvdmaf9g99nfdfx2r3wmmdzw7wysl";
+  };
+
+  phases = ["unpackPhase" "installPhase"];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R config legal lib library plugins LICENCE.txt NOTICE.txt README.txt RELEASE_NOTES.txt $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://serviio.org;
+    description = "UPnP Media Streaming Server";
+    longDescription = ''
+      Serviio is a free media server. It allows you to stream your media files (music, video or images)
+      to any DLNA-certified renderer device (e.g. a TV set, Bluray player, games console) on your home network.
+    '';
+    license = licenses.unfree;
+    maintainers = [ maintainers.thpham ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f9b17b947cf55870f4c7fa1f44d6e83e06c36deb
--- /dev/null
+++ b/pkgs/servers/shairplay/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, avahi, libao }:
+
+stdenv.mkDerivation rec {
+  name = "shairplay-${version}";
+  version = "2016-01-01";
+
+  src = fetchFromGitHub {
+    owner  = "juhovh";
+    repo   = "shairplay";
+    rev    = "ce80e005908f41d0e6fde1c4a21e9cb8ee54007b";
+    sha256 = "10b4bmqgf4rf1wszvj066mc42p90968vqrmyqyrdal4k6f8by1r6";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ avahi libao ];
+
+  enableParallelBuilding = true;
+
+  # the build will fail without complaining about a reference to /tmp
+  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+    patchelf \
+      --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$out/lib" \
+      $out/bin/shairplay
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Apple airplay and raop protocol server";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index 79f2012c7a9fe4cdab946b857da233df8bd8278f..f7a9fc658352c7e3237fdf67ea40dedc836b209f 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -2,11 +2,11 @@
 , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.2";
+  version = "3.1.7";
   name = "shairport-sync-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1lpfl591lhk66a5jfp86j669iswjzj503x02hg9h3211vxv3h9pa";
+    sha256 = "1ip8vlyly190fhcd55am5xvqisvch8mnw50xwbm663dapdb1f8ys";
     rev = version;
     repo = "shairport-sync";
     owner = "mikebrady";
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 535571f46e2017e0eb619b04d04d8fc00a97122a..1540a6f1fd18d4fd60992c72b8044eb392f9ec16 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -14,7 +14,7 @@ let
   mkWith = mkFlag "with-" "without-";
   mkOther = mkFlag "" "" true;
 
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   optPam = shouldUsePkg pam;
   optLibidn = shouldUsePkg libidn;
diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..083a224d15582b3ba30c6677d7bd46782c222151
--- /dev/null
+++ b/pkgs/servers/simplehttp2server/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "simplehttp2server-${version}";
+  version = "3.1.3";
+
+  goPackagePath = "github.com/GoogleChromeLabs/simplehttp2server";
+
+  src = fetchFromGitHub {
+     owner = "GoogleChromeLabs";
+     repo = "simplehttp2server";
+     rev = version;
+     sha256 = "113mcfvy1m91wask5039mhr0187nlw325ac32785yl4bb4igi8aw";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+     homepage = https://github.com/GoogleChromeLabs/simplehttp2server;
+     description = "HTTP/2 server for development purposes";
+     license = licenses.asl20;
+     maintainers = with maintainers; [ yrashk ];
+  };
+
+}
diff --git a/pkgs/servers/simplehttp2server/deps.nix b/pkgs/servers/simplehttp2server/deps.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e6a26bf2506c7febaa04fa91d37c53b1b4f5f121
--- /dev/null
+++ b/pkgs/servers/simplehttp2server/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/NYTimes/gziphandler";
+    fetch = {
+      type = "git";
+      url = "https://github.com/NYTimes/gziphandler";
+      rev = "289a3b81f5aedc99f8d6eb0f67827c142f1310d8";
+      sha256 = "1r9ly9wdqjcc4nwv71mfldf1f5cjm4r34vvkdm5wabmdqqqwkbyx";
+    };
+  }
+]
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 9a1ea5b55800a0ca0d53214dc4f1db9af37da576..a952dbada66fafcfffeb2b3d562a1e2159ddf216 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -3,11 +3,11 @@
 , ldns, libedit, yasm, which, lua, libopus, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "freeswitch-1.6.15";
+  name = "freeswitch-1.6.20";
 
   src = fetchurl {
     url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
-    sha256 = "071g7229shr9srwzspx29fcx3ccj3rwakkydpc4vdf1q3lldd2ld";
+    sha256 = "0hqz68abs5x5vzf1mndcvdi35nrhmnklzdrnrk8dyvzvz67hp2ah";
   };
   postPatch = ''
     patchShebangs     libs/libvpx/build/make/rtcd.pl
diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index d9a4f4733f73b1c0babaa696419351e7e063cb44..b1d614bc5cf08890693dfaae76841fdccbf4efbd 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.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "smcroute";
     rev = version;
-    sha256 = "0a1sgf9p39gbfrh7bhfg1hjqa6y18i7cig7bffmv7spqnvb50zx5";
+    sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/servers/softether/4.18.nix b/pkgs/servers/softether/4.18.nix
index 69c6cbe2c8646a964621e5e1b1f97b589f10da41..5b0d15136f894f9fc31b9ee0f51124719bf7be05 100644
--- a/pkgs/servers/softether/4.18.nix
+++ b/pkgs/servers/softether/4.18.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl
-, openssl, readline, ncurses, zlib }:
+, openssl, readline, ncurses, zlib
+, dataDir ? "/var/lib/softether" }:
 
 let
   os = if stdenv.isLinux then "1"
@@ -17,7 +18,6 @@ stdenv.mkDerivation rec {
   version = "4.18";
   build = "9570";
   compiledDate = "2015.07.26";
-  dataDir = "/var/lib/softether";
 
   src = fetchurl {
     url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.softether.org/;
     license = licenses.gpl2;
     maintainers = [ maintainers.rick68 ];
-    platforms = platforms.linux;
+    platforms = filter (p: p != "aarch64-linux") platforms.linux;
   };
 }
diff --git a/pkgs/servers/softether/4.20.nix b/pkgs/servers/softether/4.20.nix
index c6ef5a3a4df2e95fc6c3e6db3fe95bf526687939..91dd0d0411f827f1ab9f28c46439ab4d53f25f79 100644
--- a/pkgs/servers/softether/4.20.nix
+++ b/pkgs/servers/softether/4.20.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl
-, openssl, readline, ncurses, zlib }:
+, openssl, readline, ncurses, zlib
+, dataDir ? "/var/lib/softether" }:
 
 let
   os = if stdenv.isLinux then "1"
@@ -17,7 +18,6 @@ stdenv.mkDerivation rec {
   version = "4.20";
   build = "9608";
   compiledDate = "2016.04.17";
-  dataDir = "/var/lib/softether";
 
   src = fetchurl {
     url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.softether.org/;
     license = licenses.gpl2;
     maintainers = [ maintainers.rick68 ];
-    platforms = platforms.linux;
+    platforms = filter (p: p != "aarch64-linux") platforms.linux;
   };
 }
diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix
new file mode 100644
index 0000000000000000000000000000000000000000..04053174f4e4491afe7a358207b1e0bc028811a1
--- /dev/null
+++ b/pkgs/servers/softether/4.25.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl
+, openssl, readline, ncurses, zlib
+, dataDir ? "/var/lib/softether" }:
+
+let
+  os = if stdenv.isLinux then "1"
+       else if stdenv.isFreeBSD then "2"
+       else if stdenv.isSunOS then "3"
+       else if stdenv.isDarwin then "4"
+       else if stdenv.isOpenBSD then "5"
+       else "";
+  cpuBits = if stdenv.is64bit then "2" else "1";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "softether-${version}";
+  version = "4.25";
+  build = "9656";
+  compiledDate = "2018.01.15";
+
+  src = fetchurl {
+    url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
+    sha256 = "1y1m8lf0xfh7m70d15wj2jjf5a5qhi3j49ciwqmsscsqvb1xwimr";
+  };
+
+  buildInputs = [ openssl readline ncurses zlib ];
+
+  preConfigure = ''
+      echo "${os}
+      ${cpuBits}
+      " | ./configure
+      rm configure
+  '';
+
+  buildPhase = ''
+      mkdir -p $out/bin
+      sed -i \
+          -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
+          -e "/_DIR=/s|/usr|${dataDir}|g" \
+          -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
+          -e "/echo/s|echo $out/|echo |g" \
+          Makefile
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
+    homepage = https://www.softether.org/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.rick68 ];
+    platforms = filter (p: p != "aarch64-linux") platforms.linux;
+  };
+}
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index f41676a79bc46635a7091209937e6d33f4192da2..e7114b957dcb93c1296a4b7dd5d605a844a7f6f5 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.5054";
+  version = "2.0.0.5163";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "15qr8hwv89zv71h4q94nrxl8625viip7m185wqcyzma8wrx5i1zi";
+    sha256 = "037rs0cb7dfiblfy02x2l4amv9dmx1wiz5pa97vpczfgk5gq99y3";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index be9a02031ffec37ff63d0897f1049148e386032a..aba997d75f13ec3d16816f00daed5181fafc2f8e 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf }:
+{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf, ncurses6, libedit }:
 
 buildGoPackage rec {
   name = "cockroach-${version}";
-  version = "1.1.1";
+  version = "2.0.0";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
 
   src = fetchurl {
     url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
-    sha256 = "0d2nlm291k4x7hqi0kh76j6pj8b1dwbdww5f95brf0a9bl1n7qxr";
+    sha256 = "0x8hf5qwvgb2w6dcnvy20v77nf19f0l1pb40jf31rm72xhk3bwvy";
   };
 
+  buildInputs = [ (if stdenv.isDarwin then libedit else ncurses6) ];
   nativeBuildInputs = [ cmake xz which autoconf ];
 
   buildPhase = ''
diff --git a/pkgs/servers/sql/mariadb/clang-isfinite.patch b/pkgs/servers/sql/mariadb/clang-isfinite.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8da527d5784718806fa66b683f8762892832e7e5
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/clang-isfinite.patch
@@ -0,0 +1,17 @@
+diff --git a/include/my_global.h b/include/my_global.h
+index cb31ae2..2866f87 100644
+--- a/include/my_global.h
++++ b/include/my_global.h
+@@ -803,12 +803,6 @@ inline unsigned long long my_double2ulonglong(double d)
+ #endif
+ 
+ #ifndef isfinite
+-#ifdef HAVE_FINITE
+-#define isfinite(x) finite(x)
+-#else
+-#define finite(x) (1.0 / fabs(x) > 0.0)
+-#endif /* HAVE_FINITE */
+-#elif (__cplusplus >= 201103L)
+ #include 
+ static inline bool isfinite(double x) { return std::isfinite(x); }
+ #endif /* isfinite */
diff --git a/pkgs/servers/sql/mariadb/cmake-includedir.patch b/pkgs/servers/sql/mariadb/cmake-includedir.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0c4fe7d321e22433d12a05c6b2b58cb75f1cbccf
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/cmake-includedir.patch
@@ -0,0 +1,11 @@
+--- a/include/CMakeLists.txt	2017-12-25 05:59:07.204144374 +0100
++++ b/include/CMakeLists.txt	2017-12-25 05:59:26.339552817 +0100
+@@ -94,7 +94,7 @@
+ ENDIF()
+ 
+ MACRO(INSTALL_COMPAT_HEADER file footer)
+-  INSTALL(CODE "FILE(WRITE \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDEDIR}/${file}
++  INSTALL(CODE "FILE(WRITE ${INSTALL_INCLUDEDIR}/${file}
+ \"/* Do not edit this file directly, it was auto-generated by cmake */
+ 
+ #warning This file should not be included by clients, include only 
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index d6731a5b7dc3965a7989ee115ebddd809ada45ee..60462f83d108d6c063809d15b9c3df458b37756d 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
-, openssl, pcre, boost, judy, bison, libxml2
+, libiconv, openssl, pcre, boost, judy, bison, libxml2
 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl
 , fixDarwinDylibNames, cctools, CoreServices
 }:
@@ -11,31 +11,32 @@ let # in mariadb # spans the whole file
 mariadb = everything // {
   inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin
   server = everything; # a full single-output build, including everything in `client` again
-  lib = client; # compat. with the old mariadb split
+  inherit connector-c; # libmysqlclient.so
 };
 
 common = rec { # attributes common to both builds
-  version = "10.1.28";
+  version = "10.2.14";
 
   src = fetchurl {
-    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 = "1g9b0c04qhgcgw6xw29bvdjjjacr7kn82crc7apvvi10ykzwhb99";
+    url    = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz";
+    sha256 = "0zizf3q0hdkmsn6rpwdbfm5xkj21cwpnnzq9knjfpwcadqnyqhrl";
     name   = "mariadb-${version}.tar.gz";
   };
 
-  prePatch = ''
-    substituteInPlace cmake/libutils.cmake \
-      --replace /usr/bin/libtool libtool
-    sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
-  '';
-
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    ncurses openssl zlib pcre jemalloc
+    ncurses openssl zlib pcre jemalloc libiconv
   ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
 
+  prePatch = ''
+    sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
+  '';
+
+  patches = [ ./cmake-includedir.patch ]
+    ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch;
+
   cmakeFlags = [
     "-DBUILD_CONFIG=mysql_release"
     "-DMANUFACTURER=NixOS.org"
@@ -61,6 +62,7 @@ common = rec { # attributes common to both builds
     "-DPLUGIN_AUTH_GSSAPI_CLIENT=NO"
   ]
     ++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
+    ++ optional stdenv.hostPlatform.isMusl "-DWITHOUT_TOKUDB=1" # mariadb docs say disable this for musl
     ;
 
   preConfigure = ''
@@ -72,7 +74,7 @@ common = rec { # attributes common to both builds
     find "''${!outputBin}/bin" -name '*test*' -delete
   '';
 
-  passthru.mysqlVersion = "5.6";
+  passthru.mysqlVersion = "5.7";
 
   meta = with stdenv.lib; {
     description = "An enhanced, drop-in replacement for MySQL";
@@ -83,7 +85,6 @@ common = rec { # attributes common to both builds
   };
 };
 
-
 client = stdenv.mkDerivation (common // {
   name = "mariadb-client-${common.version}";
 
@@ -97,21 +98,23 @@ client = stdenv.mkDerivation (common // {
 
   preConfigure = common.preConfigure + ''
     cmakeFlags="$cmakeFlags \
-      -DINSTALL_BINDIR=$bin/bin -DINSTALL_SCRIPTDIR=$bin/bin \
+      -DINSTALL_BINDIR=$bin/bin \
+      -DINSTALL_SCRIPTDIR=$bin/bin \
       -DINSTALL_SUPPORTFILESDIR=$bin/share/mysql \
-      -DINSTALL_DOCDIR=$bin/share/doc/mysql -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \
+      -DINSTALL_DOCDIR=$bin/share/doc/mysql \
+      -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \
       "
   '';
 
   # prevent cycle; it needs to reference $dev
   postInstall = common.postInstall + ''
     moveToOutput bin/mysql_config "$dev"
+    moveToOutput bin/mariadb_config "$dev"
   '';
 
   enableParallelBuilding = true; # the client should be OK
 });
 
-
 everything = stdenv.mkDerivation (common // {
   name = "mariadb-${common.version}";
 
@@ -120,9 +123,7 @@ everything = stdenv.mkDerivation (common // {
   buildInputs = common.buildInputs ++ [
     xz lzo lz4 bzip2 snappy
     libxml2 boost judy libevent cracklib
-  ]
-    ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ]
-    ;
+  ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl;
 
   cmakeFlags = common.cmakeFlags ++ [
     "-DMYSQL_DATADIR=/var/lib/mysql"
@@ -135,6 +136,8 @@ everything = stdenv.mkDerivation (common // {
     "-DINSTALL_DOCREADMEDIR=share/doc/mysql"
     "-DINSTALL_DOCDIR=share/doc/mysql"
     "-DINSTALL_SHAREDIR=share/mysql"
+    "-DINSTALL_MYSQLTESTDIR=OFF"
+    "-DINSTALL_SQLBENCHDIR=OFF"
 
     "-DENABLED_LOCAL_INFILE=ON"
     "-DWITH_READLINE=ON"
@@ -153,12 +156,54 @@ everything = stdenv.mkDerivation (common // {
   ];
 
   postInstall = common.postInstall + ''
-    rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data
+    rm -r "$out"/data # Don't need testing data
     rm "$out"/share/man/man1/mysql-test-run.pl.1
-
-    # Don't install mysqlbug to prevent a dependency on gcc.
-    rm $out/bin/mysqlbug
+    rm "$out"/bin/rcmysql
   '';
+
+  CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"
+    + optionalString stdenv.isDarwin " -std=c++11";
 });
 
+connector-c = stdenv.mkDerivation rec {
+  name = "mariadb-connector-c-${version}";
+  version = "2.3.4";
+
+  src = fetchurl {
+    url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve";
+    sha256 = "1g1sq5knarxkfhpkcczr6qxmq12pid65cdkqnhnfs94av89hbswb";
+    name   = "mariadb-connector-c-${version}-src.tar.gz";
+  };
+
+  # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0
+  cmakeFlags = [
+    "-DWITH_EXTERNAL_ZLIB=ON"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+  ];
+
+  # The cmake setup-hook uses $out/lib by default, this is not the case here.
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
+  '';
+
+  nativeBuildInputs = [ cmake ];
+  propagatedBuildInputs = [ openssl zlib ];
+  buildInputs = [ libiconv ];
+
+  enableParallelBuilding = true;
+
+  postFixup = ''
+    ln -sv mariadb_config $out/bin/mysql_config
+    ln -sv mariadb $out/lib/mysql
+    ln -sv mariadb $out/include/mysql
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Client library that can be used to connect to MySQL or MariaDB";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ globin ];
+    platforms = platforms.all;
+  };
+};
+
 in mariadb
diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 28e7824cd423589c4b5aca47d6112dd2f5174765..29d25b77afc8a1ec5316073cb26c3e4c929ead51 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -3,7 +3,8 @@
 
 # Note: zlib is not required; MySQL can use an internal zlib.
 
-stdenv.mkDerivation rec {
+let
+self = stdenv.mkDerivation rec {
   name = "mysql-${version}";
   version = "5.5.58";
 
@@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
     "-DINSTALL_SHAREDIR=share/mysql"
   ];
 
+  NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   prePatch = ''
@@ -59,11 +61,16 @@ stdenv.mkDerivation rec {
     rm $out/share/man/man1/mysql-test-run.pl.1
   '';
 
-  passthru.mysqlVersion = "5.5";
+  passthru = {
+    client = self;
+    connector-c = self;
+    server = self;
+    mysqlVersion = "5.5";
+  };
 
   meta = {
-    homepage = http://www.mysql.com/;
+    homepage = https://www.mysql.com/;
     description = "The world's most popular open source database";
     platforms = stdenv.lib.platforms.unix;
   };
-}
+}; in self
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 687993e0dc57711f1ad82e3d23a59bb42e47b967..15e8569fd09ed32c5ab6cc3a43f9e8f72d27139b 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -3,7 +3,8 @@
 
 # Note: zlib is not required; MySQL can use an internal zlib.
 
-stdenv.mkDerivation rec {
+let
+self = stdenv.mkDerivation rec {
   name = "mysql-${version}";
   version = "5.7.20";
 
@@ -22,15 +23,20 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  outputs = [ "out" "static" ];
+
   cmakeFlags = [
     "-DWITH_SSL=yes"
-    "-DWITH_READLINE=yes"
     "-DWITH_EMBEDDED_SERVER=yes"
+    "-DWITH_UNITTEST=no"
     "-DWITH_ZLIB=yes"
+    "-DWITH_ARCHIVE_STORAGE_ENGINE=yes"
+    "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes"
+    "-DWITH_FEDERATED_STORAGE_ENGINE=yes"
+    "-DCMAKE_VERBOSE_MAKEFILE=yes"
     "-DHAVE_IPV6=yes"
     "-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"
@@ -43,6 +49,7 @@ stdenv.mkDerivation rec {
     "-DINSTALL_SHAREDIR=share/mysql"
   ];
 
+  CXXFLAGS = "-fpermissive";
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   prePatch = ''
@@ -50,15 +57,22 @@ stdenv.mkDerivation rec {
   '';
   postInstall = ''
     sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db
-    rm -r $out/mysql-test "$out"/lib/*.a
-    rm $out/share/man/man1/mysql-test-run.pl.1
+    install -vD $out/lib/*.a -t $static/lib
+    rm -r $out/mysql-test
+    rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a
+    ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary}
   '';
 
-  passthru.mysqlVersion = "5.7";
+  passthru = {
+    client = self;
+    connector-c = self;
+    server = self;
+    mysqlVersion = "5.7";
+  };
 
   meta = {
-    homepage = http://www.mysql.com/;
+    homepage = https://www.mysql.com/;
     description = "The world's most popular open source database";
     platforms = stdenv.lib.platforms.unix;
   };
-}
+}; in self
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 046eb6cfca98ccd77ed4c3ccef0eb853d783c5ea..66e62b823d9ab2de02a7d21e5db27f84e61b6d9a 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, ant, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "mysql-connector-java-5.1.39";
+  name = "mysql-connector-java-5.1.46";
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip";
-    sha256 = "0d0g51hfx7a2r6nbni8yramg4vpqk0sql0aaib6q576a0nnrq78r";
+    sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
   };
 
   buildInputs = [ unzip ant ];
diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix
index e86406cd469ccaffdb1e97541baf26816eb0db82..9068ca70cc6e0d5cf0f89c1b6dff69238cd13074 100644
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/pkgs/servers/sql/oracle-xe/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
       makeWrapper "$i" "$out/bin/''${i##*/}" \
         --set ORACLE_HOME "$out/libexec/oracle" \
         --set ORACLE_SID XE \
-        --set NLS_LANG '$("'"$out"'/libexec/oracle/bin/nls_lang.sh")' \
+        --run "export NLS_LANG=\$($out/libexec/oracle/bin/nls_lang.sh)" \
         --prefix PATH : "$out/libexec/oracle/bin"
     done
   '';
diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix
index fc6c54f82c9109540d9b6d40699db936ba8b78c2..e440f11b2e4406d9bfb59b70de51b1ab95a4b61a 100644
--- a/pkgs/servers/sql/percona/5.6.x.nix
+++ b/pkgs/servers/sql/percona/5.6.x.nix
@@ -57,5 +57,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2;
     maintainers = with maintainers; [ grahamc ];
+    broken = true; # 2018-04-11
   };
 }
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7906546ec1cad02246f5103b6de33cb1dcd2ed1b
--- /dev/null
+++ b/pkgs/servers/sql/pgbouncer/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, openssl, libevent }:
+
+stdenv.mkDerivation rec {
+  name = "pgbouncer-${version}";
+  version = "1.8.1";
+
+  src = fetchurl {
+    url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz";
+    sha256 = "1j4d7rkivg3vg27pvirigq9cy4v7pi48x7w57baq131c5lmdx2zs";
+  };
+
+  buildInputs = [ libevent openssl ];
+
+  meta = with stdenv.lib; {
+    homepage = https://pgbouncer.github.io;
+    description = "Lightweight connection pooler for PostgreSQL";
+    license = licenses.isc;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..70b8abf2502d3258a3ee33e512a15fee418ba196
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, postgresql, protobufc }:
+
+stdenv.mkDerivation rec {
+  name = "cstore_fdw-${version}";
+  version = "1.6.0";
+
+  nativeBuildInputs = [ protobufc ];
+  buildInputs = [ postgresql ];
+
+  src = fetchFromGitHub {
+    owner  = "citusdata";
+    repo   = "cstore_fdw";
+    rev    = "refs/tags/v${version}";
+    sha256 = "08jbx4hs2r742flilydp0ajjwv8ffnvq82nidh48irrfa4i7n0l0";
+  };
+
+  installPhase = ''
+    mkdir -p $out/{lib,share/extension}
+
+    cp *.so      $out/lib
+    cp *.sql     $out/share/extension
+    cp *.control $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Columnar storage for PostgreSQL";
+    homepage    = https://www.citusdata.com/;
+    maintainers = with maintainers; [ thoughtpolice ];
+    platforms   = platforms.linux;
+    license     = licenses.asl20;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index cf3349dc1660af767e62c2c8dd8c4558f4d90b69..a2093962ea93d0d0bd5e85a28ffce68900aec890 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -58,16 +58,18 @@ let
         # Prevent a retained dependency on gcc-wrapper.
         substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld
 
-        # Remove static libraries in case dynamic are available.
-        for i in $out/lib/*.a; do
-          name="$(basename "$i")"
-          if [ -e "$lib/lib/''${name%.a}.so" ] || [ -e "''${i%.a}.so" ]; then
-            rm "$i"
-          fi
-        done
+        if [ -z "''${dontDisableStatic:-}" ]; then
+          # Remove static libraries in case dynamic are available.
+          for i in $out/lib/*.a; do
+            name="$(basename "$i")"
+            if [ -e "$lib/lib/''${name%.a}.so" ] || [ -e "''${i%.a}.so" ]; then
+              rm "$i"
+            fi
+          done
+        fi
       '';
 
-    postFixup = lib.optionalString (!stdenv.isDarwin)
+    postFixup = lib.optionalString (!stdenv.isDarwin && stdenv.hostPlatform.libc == "glibc")
       ''
         # initdb needs access to "locale" command from glibc.
         wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
@@ -91,33 +93,33 @@ let
 in {
 
   postgresql93 = common {
-    version = "9.3.19";
+    version = "9.3.22";
     psqlSchema = "9.3";
-    sha256 = "1d9gmi1psg4aa6h6ylvsrdm5jnnb7p36pn4h2qrvl9z9v4n8g7pv";
+    sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v";
   };
 
   postgresql94 = common {
-    version = "9.4.14";
+    version = "9.4.17";
     psqlSchema = "9.4";
-    sha256 = "0szc0navrcjnpyafw2sai8cmwr3znsy0w6031lv7n1ab20xg4zcf";
+    sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks";
   };
 
   postgresql95 = common {
-    version = "9.5.9";
+    version = "9.5.12";
     psqlSchema = "9.5";
-    sha256 = "1m6d4y3m3ir20dzl6q3s3yvmr0a7hq3si2v1hg5hanmbck3db379";
+    sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02";
   };
 
   postgresql96 = common {
-    version = "9.6.5";
+    version = "9.6.8";
     psqlSchema = "9.6";
-    sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6";
+    sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga";
   };
 
   postgresql100 = common {
-    version = "10.0";
+    version = "10.3";
     psqlSchema = "10.0";
-    sha256 = "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi";
+    sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf";
   };
 
 }
diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix
index 39b574ae96d15fc8c83591a6eab6e580c10ac471..62ebf6b445336b48c7e5f526f84c07a332d22534 100644
--- a/pkgs/servers/sql/postgresql/jdbc/default.nix
+++ b/pkgs/servers/sql/postgresql/jdbc/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, fetchurl, ant, jdk }:
-
-let version = "9.3-1100"; in
+{ stdenv, fetchMavenArtifact }:
 
 stdenv.mkDerivation rec {
   name = "postgresql-jdbc-${version}";
+  version = "42.2.2";
 
-  src = fetchurl {
-    url = "http://jdbc.postgresql.org/download/postgresql-jdbc-${version}.src.tar.gz";
-    sha256 = "0mbdzhzg4ws0i7ps98rg0q5n68lsrdm2klj7y7skaix0rpa57gp6";
+  src = fetchMavenArtifact {
+    artifactId = "postgresql";
+    groupId = "org.postgresql";
+    sha256 = "0w7sfi1gmzqhyhr4iq9znv8hff41xwwqcblkyd9ph0m34r0555hr";
+    inherit version;
   };
 
-  buildInputs = [ ant jdk ];
-
-  buildPhase = "ant";
+  phases = [ "installPhase" ];
 
-  installPhase =
-    ''
-      mkdir -p $out/share/java
-      cp jars/*.jar $out/share/java
-    '';
+  installPhase = ''
+    install -D $src/share/java/*_postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://jdbc.postgresql.org/;
diff --git a/pkgs/servers/sql/postgresql/pg_cron/default.nix b/pkgs/servers/sql/postgresql/pg_cron/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c5a7a40546ef2d5c2ac650ae5be6e7c5e55ad003
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/pg_cron/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, postgresql }:
+
+stdenv.mkDerivation rec {
+  name = "pg_cron-${version}";
+  version = "1.0.2";
+
+  buildInputs = [ postgresql ];
+
+  src = fetchFromGitHub {
+    owner  = "citusdata";
+    repo   = "pg_cron";
+    rev    = "refs/tags/v${version}";
+    sha256 = "0z743bbal9j0pvqskznfj0zvjsqvdl7p90d4fdrl0sc0crc3nvyx";
+  };
+
+  installPhase = ''
+    mkdir -p $out/{lib,share/extension}
+
+    cp *.so      $out/lib
+    cp *.sql     $out/share/extension
+    cp *.control $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Run Cron jobs through PostgreSQL";
+    homepage    = https://www.citusdata.com/;
+    maintainers = with maintainers; [ thoughtpolice ];
+    platforms   = platforms.linux;
+    license     = licenses.postgresql;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/pg_hll/default.nix b/pkgs/servers/sql/postgresql/pg_hll/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6c453f6a40c3253e45a00671f735f5228c7f6f26
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/pg_hll/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, postgresql }:
+
+stdenv.mkDerivation rec {
+  name = "pg_hll-${version}";
+  version = "2.10.2-${builtins.substring 0 7 src.rev}";
+
+  buildInputs = [ postgresql ];
+
+  src = fetchFromGitHub {
+    owner  = "citusdata";
+    repo   = "postgresql-hll";
+    rev    = "9af41684d479a3097bab87d04936702c9e6baf5c";
+    sha256 = "044x9v9kjhxb0idqb9f5i7c3yygxxsqliswl4kspqy9f9qcblckl";
+  };
+
+  installPhase = ''
+    mkdir -p $out/{lib,share/extension}
+
+    cp *.so      $out/lib
+    cp *.sql     $out/share/extension
+    cp *.control $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "HyperLogLog for PostgreSQL";
+    homepage    = https://www.citusdata.com/;
+    maintainers = with maintainers; [ thoughtpolice ];
+    platforms   = platforms.linux;
+    license     = licenses.asl20;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix
index 0a25b314506b445a85fb5d40d71b27f2fc1defc8..50c9c68bb5f70ae1019db6adf775af98232d257e 100644
--- a/pkgs/servers/sql/postgresql/pg_repack/default.nix
+++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix
@@ -1,17 +1,16 @@
 { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
 
 stdenv.mkDerivation rec {
-    name = "pg_repack-${version}.1";
-    version = "1.4.0";
-    rev = "ver_${version}.1";
+    name = "pg_repack-${version}";
+    version = "1.4.2";
 
     buildInputs = [ postgresql openssl zlib readline ];
 
     src = fetchFromGitHub {
-      owner = "reorg";
-      repo = "pg_repack";
-      inherit rev;
-      sha256 = "1ym2dlhgcizyy4p5dcfw7kadrq6g34pv3liyfx604irprzhw9k74";
+      owner  = "reorg";
+      repo   = "pg_repack";
+      rev    = "refs/tags/ver_${version}";
+      sha256 = "1yv5x7dgiv1miazbngkrkdbc2zpwklj6nlligghjvv83bcl8969q";
     };
 
     installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
index 78ad88bc9047a8554bb73303b8b2fe0577503035..eb6f5f94810ea239b0bd90ea5155addf8bef369f 100644
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pgroonga-${version}";
-  version = "1.1.9";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz";
-    sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag";
+    sha256 = "1c4m1rg3122y8rndgz7sj9a49l3v9nm0qbpa04pls20pxzx21g5a";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix
index b17446ca778653d4668d1ab9dd858ecb89d6568b..1206e50926ed35e325284ec65b785fe99d033155 100644
--- a/pkgs/servers/sql/postgresql/pgtap/default.nix
+++ b/pkgs/servers/sql/postgresql/pgtap/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pgtap-${version}";
-  version = "0.97.0";
+  version = "0.98.0";
 
   src = fetchFromGitHub {
     owner = "theory";
     repo = "pgtap";
     rev = "v${version}";
-    sha256 = "1vzc8pxzi0rbywmrvx7i5awngsvzcz75i4jl9bk2vqr223chax6f";
+    sha256 = "17r3b409k05pbypmwdwgm1fl669jc6a1391szyxizx784k44a369";
   };
 
   nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ];
diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix
index 223bd6e470b9139883ef83149dd05de385228534..e1a4aed3b7e4a89d2c20b65ade2a1963bb0edd90 100644
--- a/pkgs/servers/sql/postgresql/timescaledb/default.nix
+++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, postgresql }:
+{ stdenv, fetchFromGitHub, cmake, postgresql }:
 
 # # To enable on NixOS:
 # config.services.postgresql = {
@@ -8,29 +8,37 @@
 
 stdenv.mkDerivation rec {
   name = "timescaledb-${version}";
-  version = "0.6.0";
+  version = "0.9.1";
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql ];
 
   src = fetchFromGitHub {
-    owner = "timescale";
-    repo = "timescaledb";
-    rev = version;
-    sha256 = "061z1ll3x7ca7fj12rl2difkdvmqykksqhpsql552qkkylg7iq4d";
+    owner  = "timescale";
+    repo   = "timescaledb";
+    rev    = "refs/tags/${version}";
+    sha256 = "00k8fk5a1xpv9nxlmafnngk31wh80h6m72vsl1hnyq7nhby7ylic";
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    install -D timescaledb.so      -t $out/lib
-    install -D timescaledb.control -t $out/share/extension
-    cp -dpR    sql/*                  $out/share/extension/
+  # Fix the install phase which tries to install into the pgsql extension dir,
+  # and cannot be manually overridden. This is rather fragile but works OK.
+  patchPhase = ''
+    for x in CMakeLists.txt sql/CMakeLists.txt; do
+      substituteInPlace "$x" \
+        --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\""
+    done
+
+    for x in src/CMakeLists.txt src/loader/CMakeLists.txt; do
+      substituteInPlace "$x" \
+        --replace 'DESTINATION ''${PG_PKGLIBDIR}' "DESTINATION \"$out/lib\""
+    done
   '';
 
   meta = with stdenv.lib; {
     description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space";
-    homepage = https://www.timescale.com/;
+    homepage    = https://www.timescale.com/;
     maintainers = with maintainers; [ volth ];
-    platforms = platforms.linux;
-    license = licenses.postgresql;
+    platforms   = platforms.linux;
+    license     = licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/topn/default.nix b/pkgs/servers/sql/postgresql/topn/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6886c80cf50d116ad3fb26ed25e6c0295b3db2ba
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/topn/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, postgresql, protobufc }:
+
+stdenv.mkDerivation rec {
+  name = "pg_topn-${version}";
+  version = "2.0.2";
+
+  nativeBuildInputs = [ protobufc ];
+  buildInputs = [ postgresql ];
+
+  src = fetchFromGitHub {
+    owner  = "citusdata";
+    repo   = "postgresql-topn";
+    rev    = "refs/tags/v${version}";
+    sha256 = "00hc3hgnqv9xaalizbcvprb7s55sydj2qgk3rhgrdlwg2g025h62";
+  };
+
+  installPhase = ''
+    mkdir -p $out/{lib,share/extension}
+
+    cp *.so      $out/lib
+    cp *.sql     $out/share/extension
+    cp *.control $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Efficient querying of 'top values' for PostgreSQL";
+    homepage    = https://www.citusdata.com/;
+    maintainers = with maintainers; [ thoughtpolice ];
+    platforms   = platforms.linux;
+    license     = licenses.agpl3;
+  };
+}
diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5b0425c410fc0c2eab0497926e5d1de100d58aeb
--- /dev/null
+++ b/pkgs/servers/sql/sqlite/jdbc/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "3.20.0";
+  pname = "sqlite-jdbc";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/xerial/${pname}/downloads/${name}.jar";
+    sha256 = "0wxfxnq2ghiwy2mwz3rljgmy1lciafhrw80lprvqz6iw8l51qfql";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    install -D "${src}" "$out/share/java/${name}.jar"
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/xerial/sqlite-jdbc";
+    description = "SQLite JDBC Driver";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jraygauthier ];
+  };
+}
+
diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix
index a24daa7081239e2a854b7f7afc83a109ada1aef5..bf2a51f65963e53a8202c949a785557925d25d32 100644
--- a/pkgs/servers/sql/virtuoso/7.x.nix
+++ b/pkgs/servers/sql/virtuoso/7.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2, openssl, readline, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "virtuoso-opensource-7.0.0";
+  name = "virtuoso-opensource-7.2.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
-    sha256 = "1z0jdzayv45y57jj8kii6csqfjhswcs8s2krqqfhab54xy6gynbl";
+    sha256 = "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002";
   };
 
   buildInputs = [ libxml2 openssl readline gawk ];
diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix
index 9f43af418e6e617508e0db34344afe670ec40c49..4c76173a280eed75a6ad0e4ce30c86eddaa536e4 100644
--- a/pkgs/servers/squid/4.nix
+++ b/pkgs/servers/squid/4.nix
@@ -2,16 +2,20 @@
 , expat, libxml2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "squid-4.0.21";
+  name = "squid-4.0.24";
 
   src = fetchurl {
     url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
-    sha256 = "0cwfj3qpl72k5l1h2rvkv1xg0720rifk4wcvi49z216hznyqwk8m";
+    sha256 = "01vayx86sakfy9zz2q5cvzv97865l1zb0jkqbh7wqz9hcgbs0789";
   };
 
   buildInputs = [
-    perl openldap pam db cyrus_sasl libcap expat libxml2 openssl
-  ];
+    perl openldap db cyrus_sasl expat libxml2 openssl
+  ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];
+
+  prePatch = ''
+    substituteInPlace configure --replace "/usr/local/include/libxml2" "${libxml2.dev}/include/libxml2"
+  '';
 
   configureFlags = [
     "--enable-ipv6"
@@ -19,12 +23,11 @@ stdenv.mkDerivation rec {
     "--disable-arch-native"
     "--with-openssl"
     "--enable-ssl-crtd"
-    "--enable-linux-netfilter"
     "--enable-storeio=ufs,aufs,diskd,rock"
     "--enable-removal-policies=lru,heap"
     "--enable-delay-pools"
     "--enable-x-accelerator-vary"
-  ];
+  ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter";
 
   meta = with stdenv.lib; {
     description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index 2da0316483b449372fe3d9a16fc9519743b56b9d..8d39fbbcef44740e02f2a85f46b773e177405d80 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
+{ stdenv, fetchurl, fetchpatch, perl, openldap, pam, db, cyrus_sasl, libcap
 , expat, libxml2, openssl }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,20 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    perl openldap pam db cyrus_sasl libcap expat libxml2 openssl
+    perl openldap db cyrus_sasl expat libxml2 openssl
+  ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];
+
+  patches = [
+    (fetchpatch {
+      name = "CVE-2018-1000024.patch";
+      url = http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_1.patch;
+      sha256 = "0vzxr4rmybz0w4c1hi3szvqawbzl4r4b8wyvq9vgq1mzkk5invpg";
+    })
+    (fetchpatch {
+      name = "CVE-2018-1000027.patch";
+      url = http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_2.patch;
+      sha256 = "1a8hwk9z7h1j0c57anfzp3bwjd4pjbyh8aks4ca79nwz4d0y6wf3";
+    })
   ];
 
   configureFlags = [
@@ -19,12 +32,11 @@ stdenv.mkDerivation rec {
     "--disable-arch-native"
     "--with-openssl"
     "--enable-ssl-crtd"
-    "--enable-linux-netfilter"
     "--enable-storeio=ufs,aufs,diskd,rock"
     "--enable-removal-policies=lru,heap"
     "--enable-delay-pools"
     "--enable-x-accelerator-vary"
-  ];
+  ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter";
 
   meta = with stdenv.lib; {
     description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix
index 7b98ded5dc1236aa2aca64d05fae9b6877461d15..bbb9b6ca51913ea942691540ac706e60f0ba362c 100644
--- a/pkgs/servers/sslh/default.nix
+++ b/pkgs/servers/sslh/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers }:
+{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }:
 
 stdenv.mkDerivation rec {
   name = "sslh-${version}";
-  version = "1.18";
+  version = "1.19c";
 
   src = fetchurl {
     url = "http://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz";
-    sha256 = "1ba5fxd2s6jh9n3wbp2a782q7syc4m6qvfrggnscdbywfyrsa08n";
+    sha256 = "1wvvqj9r293skgqi28q4ixz7zwf301h1bf514p41xbi7ifldy4dv";
   };
 
   postPatch = "patchShebangs *.sh";
 
-  buildInputs = [ libcap libconfig perl tcp_wrappers ];
+  buildInputs = [ libcap libconfig perl tcp_wrappers pcre ];
 
   makeFlags = "USELIBCAP=1 USELIBWRAP=1";
 
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0f08d94a052f69eea58836c48bfcb605fc7c800d
--- /dev/null
+++ b/pkgs/servers/teleport/default.nix
@@ -0,0 +1,41 @@
+# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
+{ stdenv, buildGoPackage, zip, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "teleport-${version}";
+  version = "2.4.1";
+
+  # This repo has a private submodule "e" which fetchgit cannot handle without failing.
+  src = fetchFromGitHub {
+    owner = "gravitational";
+    repo = "teleport";
+    rev = "v${version}";
+    sha256 = "09kmlihv4aqc39f9cyv2vm0kqgdf9vmdrgds5krnzqdgy3svyg7y";
+  };
+
+  goPackagePath = "github.com/gravitational/teleport";
+  subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
+  buildInputs = [ zip ];
+  postBuild = ''
+    pushd .
+    cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport
+    mkdir -p build
+    echo "making webassets"
+    make build/webassets.zip
+    cat build/webassets.zip >> $NIX_BUILD_TOP/go/bin/teleport
+    rm -fr build/webassets.zip
+    cd $NIX_BUILD_TOP/go/bin
+    zip -q -A teleport
+    popd
+    '';
+
+  dontStrip = true;
+
+  meta = {
+    description = "A SSH CA management suite";
+    homepage = "https://gravitational.com/teleport/";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.tomberek ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index f1fb1a34fc24a438780a652ded226b55905d4f12..d38405688fc5ec6560edf13fe1a6327f97fa0cf0 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -1,24 +1,19 @@
-{ stdenv, buildGoPackage, fetchurl, bash, go-bindata}:
+{ stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}:
 
 buildGoPackage rec {
   name = "traefik-${version}";
-  version = "1.3.8";
+  version = "1.5.2";
 
   goPackagePath = "github.com/containous/traefik";
 
-  src = fetchurl {
-    url = "https://github.com/containous/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
-    sha256 = "6fce36dd30bb5ae5f91e69f2950f22fe7a74b920e80c6b441a0721122f6a6174";
+  src = fetchFromGitHub {
+    owner = "containous";
+    repo = "traefik";
+    rev = "v${version}";
+    sha256 = "0cv05nm7jj1g2630l5zmzpmsrjx712ba3l7klh8nqs02mzykzsha";
   };
 
   buildInputs = [ go-bindata bash ];
-  unpackPhase = ''
-    runHook preUnpack
-    mkdir traefik
-    tar -C traefik -xvzf $src
-    export sourceRoot="traefik"
-    runHook postUnpack
-  '';
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index bdc37b700e5d4a238184f772dfc497a31be543cb..a3c505646214f214ff810dcfa5fe89b2df466b9c 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -1,65 +1,26 @@
-{ stdenv, fetchgit, fetchFromGitHub, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp
-, libusb1, libmicrohttpd
-}:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-let
-  version = "1.2.1";
-in
+buildGoPackage rec {
+  name = "trezord-go-${version}";
+  version = "2.0.12";
 
-stdenv.mkDerivation rec {
-  name = "trezord-${version}";
+  # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
+  hardeningDisable = [ "fortify" ];
 
-  src = fetchgit {
-    url    = "https://github.com/trezor/trezord";
-    rev    = "refs/tags/v${version}";
-    sha256 = "1iaxmwyidjdcrc6jg0859v6v5x3qnz5b0p78pq0bypvmgyijhpm4";
-  };
+  goPackagePath = "github.com/trezor/trezord-go";
 
-  common = fetchFromGitHub {
-    owner = "trezor";
-    repo = "trezor-common";
-    rev = "b55fb61218431e9c99c9d6c1673801902fc9e92e";
-    sha256 = "1zanbgz1qjs8wfwp0z91sqcvj77a9iis694k415jyd2dn4riqhdg";
+  src = fetchFromGitHub {
+    owner  = "trezor";
+    repo   = "trezord-go";
+    rev    = "v${version}";
+    sha256 = "03pz223jjfbd0g9gkk21q6d27jc8vd1bc1jz00i0f3dzvsyfx5g6";
   };
 
   meta = with stdenv.lib; {
-    description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet";
+    description = "TREZOR Communication Daemon aka TREZOR Bridge";
     homepage = https://mytrezor.com;
     license = licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ canndrew jb55 ];
     platforms = platforms.linux;
   };
-
-  patches = [ ./dynamic-link.patch ];
-
-  nativeBuildInputs = [
-    cmake
-    gcc
-    pkgconfig
-  ];
-
-  buildInputs = [
-    curl
-    boost
-    protobuf
-    libusb1
-    libmicrohttpd
-    jsoncpp
-  ];
-
-  preConfigure = ''
-    ( cd src/config
-      ln -s $common/protob/config.proto
-      protoc -I . --cpp_out=. config.proto
-    )
-  '';
-
-  LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}";
-  cmakeFlags = [ "-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'" ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp trezord $out/bin
-  '';
 }
-
diff --git a/pkgs/servers/trezord/dynamic-link.patch b/pkgs/servers/trezord/dynamic-link.patch
deleted file mode 100644
index 0f1f448a3f793b2d002a15e9b3255a12cedf8d18..0000000000000000000000000000000000000000
--- a/pkgs/servers/trezord/dynamic-link.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c0e2cf..0e3f4ac 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,13 +59,6 @@ target_link_libraries(trezord ${OS_LIBRARIES})
- find_package(CURL REQUIRED)
- find_package(libmicrohttpd REQUIRED)
- 
--# add static libs
--if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
--  set(BUILD_SHARED_LIBS off)
--  set(Boost_USE_STATIC_LIBS on)
--  set(CMAKE_FIND_STATIC FIRST)
--endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- find_package(Boost 1.53.0 REQUIRED
-   regex thread system unit_test_framework program_options chrono)
- find_package(Protobuf 2.5.0 REQUIRED)
diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix
index 8724adfdad6d26e329dba49def252a5c39086d32..6f584bfabd3d4f860f88a17752d67f29201ffc56 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/pkgs/servers/tt-rss/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "tt-rss-${version}";
-  version = "17.4";
+  version = "2018-04-05";
+  rev = "963c22646b3e1bd544bd957bf34175b996bd6e53";
 
-  src = fetchgit {
-    url = "https://git.tt-rss.org/git/tt-rss.git";
-    rev = "refs/tags/${version}";
-    sha256 = "07ng21n4pva56cxnxkzd6vzs381zn67psqpm51ym5wnl644jqh08";
+  src = fetchurl {
+    url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz";
+    sha256 = "02vjw5cag5x0rpiqalfrqf7iz21rp8ml5wnfd8pdkxbr8182bw3h";
   };
 
   installPhase = ''
@@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
     description = "Web-based news feed (RSS/Atom) aggregator";
     license = licenses.gpl2Plus;
     homepage = http://tt-rss.org;
-    maintainers = with maintainers; [ zohl ];
+    maintainers = with maintainers; [ globin zohl ];
     platforms = platforms.all;
   };
 }
-
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index d8cfadbfab2fb36561986c2f65009badbdace5dd..c0a3b5a28c31d4e2bf74c383bbc9037cec9a50e2 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -3,7 +3,7 @@
 , which, zlib }:
 
 let
-  version = "4.2.4";
+  version = "4.2.6";
 
 in stdenv.mkDerivation rec {
   name = "tvheadend-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     owner  = "tvheadend";
     repo   = "tvheadend";
     rev    = "v${version}";
-    sha256 = "1kydjmgv0nrllgi2s6aczq4x9ag01c8qm8w962qb52fzdfw7fs6k";
+    sha256 = "0rnhk0r34mfmz3cnf735nzkkyal7pnv16hfyrs0g4v5rk99rlab3";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index 102868c0d46c0e86cef519ff22cc79d5b17011f4..d1ec31d6b8562fb2cbdeac7fb9c4cfe0599ee975 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "uftp-${version}";
-  version = "4.9.4";
+  version = "4.9.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
-    sha256 = "1npfl7n1w2l0j6c6iizw1szzq0lz9wy6jb55qmwhfkzwj0zd7mqp";
+    sha256 = "0byg7ff39i32ljzqxn6rhiz3zs1b04y50xpvzmjx5v8pmdajn0sz";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 71bc0de6d9102936b5737ccba04c648b600c378a..e9d2fd07dc5656412553f2440fb94eb4e06f8d9a 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "unifi-controller-${version}";
-  version = "5.6.22";
+  version = "5.6.36";
 
   src = fetchurl {
     url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb";
-    sha256 = "1ffphdi4df3jhlcl68amb90f5pj7cwyrql4qwbswynh9d623880l";
+    sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi";
   };
 
   buildInputs = [ dpkg ];
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index d30129d93d950fdf941b9eb48e5fcdf5f9267105..bb3f79855330f72f267756ecbaf6770aa89a4105 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -4,7 +4,7 @@
 , pam, withPAM ? false
 , systemd, withSystemd ? false
 , python2, python3, ncurses
-, ruby, php-embed
+, ruby, php-embed, mysql
 }:
 
 let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else "3"}" {
@@ -33,8 +33,8 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else
                   (lib.nameValuePair "php" {
                     # 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.buildInputs;
+                    NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ];
                   })
                 ];
 
@@ -49,11 +49,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "uwsgi-${version}";
-  version = "2.0.15";
+  version = "2.0.17";
 
   src = fetchurl {
     url = "http://projects.unbit.it/downloads/${name}.tar.gz";
-    sha256 = "1zvj28wp3c1hacpd4c6ra5ilwvvfq3l8y6gn8i7mnncpddlzjbjp";
+    sha256 = "1wlbaairsmhp6bx5wv282q9pgh6w7w6yrb8vxjznfaxrinsfkhix";
   };
 
   nativeBuildInputs = [ python3 pkgconfig ];
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     ${lib.concatMapStringsSep "\n" (x: x.install or "") needed}
   '';
 
-  NIX_CFLAGS_LINK = [ "-lsystemd" ];
+  NIX_CFLAGS_LINK = [ "-lsystemd" ] ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed;
 
   meta = with stdenv.lib; {
     homepage = http://uwsgi-docs.readthedocs.org/en/latest/;
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 468cc86d8893928e8d10b27f66d6f09a2ed553ba..85192b11c30f534ca5868f01ce55b9df0c26a3c4 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -1,37 +1,53 @@
 { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
 , python, pythonPackages, makeWrapper }:
 
-stdenv.mkDerivation rec {
-  version = "5.1.3";
-  name = "varnish-${version}";
-
-  src = fetchurl {
-    url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
-    sha256 = "0km50hzjzi1kq85lr3hq519nrp261wb91ixq48vhyd41llycjfbl";
+let
+  common = { version, sha256 }:
+    stdenv.mkDerivation rec {
+      name = "varnish-${version}";
+
+      src = fetchurl {
+        url = "http://varnish-cache.org/_downloads/${name}.tgz";
+        inherit sha256;
+      };
+
+      nativeBuildInputs = [ pkgconfig ];
+      buildInputs = [
+        pcre libxslt groff ncurses readline python libedit
+        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";
+
+      outputs = [ "out" "dev" "man" ];
+
+      meta = with stdenv.lib; {
+        description = "Web application accelerator also known as a caching HTTP reverse proxy";
+        homepage = https://www.varnish-cache.org;
+        license = licenses.bsd2;
+        maintainers = with maintainers; [ garbas fpletz ];
+        platforms = platforms.unix;
+      };
+    };
+in
+{
+  varnish4 = common {
+    version = "4.1.9";
+    sha256 = "11zwyasz2fn9qxc87r175wb5ba7388sd79mlygjmqn3yv2m89n12";
   };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    pcre libxslt groff ncurses readline python libedit
-    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";
-
-  outputs = [ "out" "dev" "man" ];
-
-  meta = with stdenv.lib; {
-    description = "Web application accelerator also known as a caching HTTP reverse proxy";
-    homepage = https://www.varnish-cache.org;
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ garbas fpletz ];
-    platforms = platforms.linux ++ platforms.darwin;
+  varnish5 = common {
+    version = "5.2.1";
+    sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
+  };
+  varnish6 = common {
+    version = "6.0.0";
+    sha256 = "1vhbdch33m6ig4ijy57zvrramhs9n7cba85wd8rizgxjjnf87cn7";
   };
 }
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
index 530ae5047712b51fec6f12ad088623183c69d736..2ccb0419c042898bcb559f4316954f4c5788e888 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/pkgs/servers/varnish/digest.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.1";
-  name = "varnish-digest-${version}";
+  version = "1.0.2";
+  name = "${varnish.name}-digest-${version}";
 
   src = fetchFromGitHub {
     owner = "varnish";
     repo = "libvmod-digest";
     rev = "libvmod-digest-${version}";
-    sha256 = "0v18bqbsblhajpx5qvczic3psijhx5l2p2qlw1dkd6zl33hhppy7";
+    sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig docutils ];
   buildInputs = [ varnish libmhash ];
 
   postPatch = ''
-    substituteInPlace autogen.sh  --replace "-I \''${dataroot}/aclocal"                  ""
-    substituteInPlace Makefile.am --replace "-I \''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" ""
+    substituteInPlace autogen.sh  --replace "''${dataroot}/aclocal"                  "${varnish.dev}/share/aclocal"
+    substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
   '';
 
   configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix
new file mode 100644
index 0000000000000000000000000000000000000000..711bc1cf78f55c6c010cea684dc4377975001ad3
--- /dev/null
+++ b/pkgs/servers/varnish/dynamic.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils }:
+
+stdenv.mkDerivation rec {
+  version = "0.3";
+  name = "${varnish.name}-dynamic-${version}";
+
+  src = fetchFromGitHub {
+    owner = "nigoroll";
+    repo = "libvmod-dynamic";
+    rev = "475be183fddbd727c3d2523f0518effa9aa881f8"; # 5.2 branch for Varnish-5.2 https://github.com/nigoroll/libvmod-dynamic/commits/5.2
+    sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf";
+  };
+
+  nativeBuildInputs = [ pkgconfig docutils autoreconfHook ];
+  buildInputs = [ varnish python ];
+  postPatch = ''
+    substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
+  '';
+  configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
+
+  meta = with stdenv.lib; {
+    description = "Dynamic director similar to the DNS director from Varnish 3";
+    homepage = https://github.com/nigoroll/libvmod-dynamic;
+    inherit (varnish.meta) license platforms maintainers;
+  };
+}
diff --git a/pkgs/servers/varnish/geoip.nix b/pkgs/servers/varnish/geoip.nix
index 7816b27b14f7b3543720a52a3e18113c9e2cf1bd..d1790252065c2ecc8c4b6be2199184eb10031651 100644
--- a/pkgs/servers/varnish/geoip.nix
+++ b/pkgs/servers/varnish/geoip.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.2";
-  name = "varnish-geoip-${version}";
+  name = "${varnish.name}-geoip-${version}";
 
   src = fetchFromGitHub {
     owner = "varnish";
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index c37fae4ba3d2650dcde8be1e02db8fea85b1ec64..7775221d1638b2f980bf8332c400df7edfa8a71e 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -1,17 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.10.2";
-  name = "varnish-modules-${version}";
+  version = "0.14.0";
+  name = "${varnish.name}-modules-${version}";
 
-  src = fetchurl {
-    url = "https://download.varnish-software.com/varnish-modules/varnish-modules-${version}.tar.gz";
-    sha256 = "0inw76pm8kcidh0lq7gm3c3bh8v6yps0z7j6ar617b8wf730w1im";
+  src = fetchFromGitHub {
+    owner = "varnish";
+    repo = "varnish-modules";
+    rev = version;
+    sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40";
   };
 
-  nativeBuildInputs = [ pkgconfig docutils ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook docutils removeReferencesTo ];
   buildInputs = [ varnish python ];
 
+  postPatch = ''
+    substituteInPlace bootstrap   --replace "''${dataroot}/aclocal"                  "${varnish.dev}/share/aclocal"
+    substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
+  '';
+
+  postInstall = "find $out -type f -exec remove-references-to -t ${varnish.dev} '{}' +"; # varnish.dev captured only as __FILE__ in assert messages
+
   meta = with stdenv.lib; {
     description = "Collection of Varnish Cache modules (vmods) by Varnish Software";
     homepage = https://github.com/varnish/varnish-modules;
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f468ac58e6cd2ea9d8c28ded6233865f62ee1796
--- /dev/null
+++ b/pkgs/servers/varnish/packages.nix
@@ -0,0 +1,22 @@
+{ callPackage, varnish4, varnish5, varnish6 }:
+
+{
+  varnish4Packages = {
+    varnish = varnish4;
+    digest   = callPackage ./digest.nix   { varnish = varnish4; };
+    rtstatus = callPackage ./rtstatus.nix { varnish = varnish4; }; # varnish4 only
+    modules  = callPackage ./modules.nix  { varnish = varnish4; }; # varnish4 and varnish5 only
+    geoip    = callPackage ./geoip.nix    { varnish = varnish4; }; # varnish4 and varnish5 only
+  };
+  varnish5Packages = {
+    varnish = varnish5;
+    digest   = callPackage ./digest.nix   { varnish = varnish5; };
+    dynamic  = callPackage ./dynamic.nix  { varnish = varnish5; }; # varnish5 only (upstream has a separate branch for varnish4)
+    modules  = callPackage ./modules.nix  { varnish = varnish5; }; # varnish4 and varnish5 only
+    geoip    = callPackage ./geoip.nix    { varnish = varnish5; }; # varnish4 and varnish5 only
+  };
+  varnish6Packages = {
+    varnish = varnish6;
+    digest   = callPackage ./digest.nix   { varnish = varnish6; };
+  };
+}
diff --git a/pkgs/servers/varnish/rtstatus.nix b/pkgs/servers/varnish/rtstatus.nix
index 1efa6d5e79896c4d7204975d15410bb36eae38ed..99c0bb176597477af80b224b17a7773abd19483f 100644
--- a/pkgs/servers/varnish/rtstatus.nix
+++ b/pkgs/servers/varnish/rtstatus.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
-  name = "varnish-rtstatus-${version}";
+  name = "${varnish.name}-rtstatus-${version}";
 
   src = fetchurl {
     url = "https://download.varnish-software.com/libvmod-rtstatus/libvmod-rtstatus-${version}.tar.gz";
diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d0be4f575dd63948ba1de600478e3eeed7ca4d30
--- /dev/null
+++ b/pkgs/servers/web-apps/fileshelter/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt3, libconfig, pkgconfig } :
+
+stdenv.mkDerivation rec {
+  name = "fileshelter";
+  version = "3.0.0";
+
+  src = fetchFromGitHub {
+    owner = "epoupon";
+    repo = "fileshelter";
+    rev = "v${version}";
+    sha256 = "1n9hrls3l9gf8wfz6m9bylma1b1hdvdqsksv2dlp1zdgjdzv200b";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libzip boost wt3 libconfig ];
+
+  postInstall = ''
+    ln -s ${wt3}/share/Wt/resources $out/share/fileshelter/docroot/resources
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/epoupon/fileshelter;
+    description = "FileShelter is a 'one-click' file sharing web application";
+    maintainers = [ maintainers.willibutz ];
+    license = licenses.gpl3;
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/servers/web-apps/frab/Gemfile.lock b/pkgs/servers/web-apps/frab/Gemfile.lock
index 530c54ebd898c8872256976acdf9f9577dcdeb65..06502ef59ad51ed55aeb3dff73c99ccac916ac45 100644
--- a/pkgs/servers/web-apps/frab/Gemfile.lock
+++ b/pkgs/servers/web-apps/frab/Gemfile.lock
@@ -180,7 +180,7 @@ GEM
       pry (~> 0.10)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    puma (3.6.0)
+    puma (3.9.1)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
diff --git a/pkgs/servers/web-apps/frab/gemset.nix b/pkgs/servers/web-apps/frab/gemset.nix
index 9f881579f42ded17a6fbb44350a762a7714b99c9..449fbf1a5b6b32caf410b8bb47d4ae297225bff1 100644
--- a/pkgs/servers/web-apps/frab/gemset.nix
+++ b/pkgs/servers/web-apps/frab/gemset.nix
@@ -628,10 +628,10 @@
   puma = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rmcny3jr1jj01f9fqijwmikj212a5iql7ghifklm77x4a8pp399";
+      sha256 = "1k13n500r7v480rcbxm7k09hip0zi7p8zvy3vajj8g9hb7gdcwnp";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.9.1";
   };
   rack = {
     source = {
@@ -929,4 +929,4 @@
     };
     version = "0.9.5";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/web-apps/klaus/default.nix b/pkgs/servers/web-apps/klaus/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..81d1e57e7a04e9cda467b2611f15f94599ad796c
--- /dev/null
+++ b/pkgs/servers/web-apps/klaus/default.nix
@@ -0,0 +1,40 @@
+{ lib, python, fetchFromGitHub }:
+
+python.pkgs.buildPythonApplication rec {
+  pname = "klaus";
+  version = "1.2.2";
+
+  src = fetchFromGitHub {
+    owner = "jonashaag";
+    repo = pname;
+    rev = version;
+    sha256 = "0hkl1ycyd5ccijmknr3yfp3ga43y01m7390xnibqqgaisfvcm9wp";
+  };
+
+  prePatch = ''
+    substituteInPlace runtests.sh \
+      --replace "mkdir -p \$builddir" "mkdir -p \$builddir && pwd"
+  '';
+
+  propagatedBuildInputs = with python.pkgs; [
+    six flask pygments dulwich httpauth humanize
+  ];
+
+  checkInputs = with python.pkgs; [
+    pytest requests python-ctags3
+  ] ++ lib.optional (!isPy3k) mock;
+
+  checkPhase = ''
+    ./runtests.sh
+  '';
+
+  # Needs to set up some git repos
+  doCheck = false;
+
+  meta = with lib; {
+    description = "The first Git web viewer that Just Works";
+    homepage    = https://github.com/jonashaag/klaus;
+    license     = licenses.isc;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/servers/web-apps/piwik/bootstrap.php b/pkgs/servers/web-apps/matomo/bootstrap.php
similarity index 100%
rename from pkgs/servers/web-apps/piwik/bootstrap.php
rename to pkgs/servers/web-apps/matomo/bootstrap.php
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c8a918c2bd2204a1d880440b809410a539d6b1de
--- /dev/null
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, makeWrapper, php }:
+
+stdenv.mkDerivation rec {
+  name = "matomo-${version}";
+  version = "3.4.0";
+
+  src = fetchurl {
+    # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
+    # url = "https://builds.matomo.org/${name}.tar.gz";
+    url = "https://builds.matomo.org/piwik-${version}.tar.gz";
+    sha256 = "1hnja8mvjvlbqgw7maa76lxd5hxxg7d5ggq9wyrff25mapj398wc";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  # make-localhost-default-database-server.patch:
+  #   This changes the default value of the database server field
+  #   from 127.0.0.1 to localhost.
+  #   unix socket authentication only works with localhost,
+  #   but password-based SQL authentication works with both.
+  # TODO: is upstream interested in this?
+  patches = [ ./make-localhost-default-database-host.patch ];
+
+  # this bootstrap.php adds support for getting PIWIK_USER_PATH
+  # from an environment variable. Point it to a mutable location
+  # to be able to use matomo read-only from the nix store
+  postPatch = ''
+    cp ${./bootstrap.php} bootstrap.php
+  '';
+
+  # TODO: future versions might rename the PIWIK_… variables to MATOMO_…
+  # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH.
+  #       See https://forum.matomo.org/t/bootstrap-php/5926/10 and
+  #       https://github.com/matomo-org/matomo/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 matomo 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/matomo-console \
+      --add-flags "$out/share/console"
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A real-time web analytics application";
+    license = licenses.gpl3Plus;
+    homepage = https://matomo.org/;
+    platforms = platforms.all;
+    maintainers = [ maintainers.florianjacob ];
+  };
+}
diff --git a/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch b/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch
new file mode 100644
index 0000000000000000000000000000000000000000..48808ac2cccaa8e1b0043471a5923839a77cd25a
--- /dev/null
+++ b/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
+index 9364f49870..2625cbb91b 100644
+--- a/plugins/Installation/FormDatabaseSetup.php
++++ b/plugins/Installation/FormDatabaseSetup.php
+@@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2
+ 
+         // default values
+         $this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(
+-                                                                       'host'          => '127.0.0.1',
++                                                                       'host'          => 'localhost',
+                                                                        'type'          => $defaultDatabaseType,
+                                                                        'tables_prefix' => 'matomo_',
+                                                                   )));
diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix
deleted file mode 100644
index e5d6876ecbf5470ce1244377919734c146cf7984..0000000000000000000000000000000000000000
--- a/pkgs/servers/web-apps/piwik/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, php }:
-
-stdenv.mkDerivation rec {
-  name = "piwik-${version}";
-  version = "3.2.0";
-
-  src = fetchurl {
-    url = "https://builds.piwik.org/${name}.tar.gz";
-    sha512 = "21hss97mms5vavfzw41v2p3qsxx0ar8xa3dnr4d2fw2mps8jg3s5ng9i725lqrbl96q7855fh9ymabjsi1zr4q9nif2yap0izaakxib";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  # regarding the 127.0.0.1 substitute:
-  #   This replaces the default value of the database server field.
-  #   unix socket authentication only works with localhost,
-  #   but password-based SQL authentication works with both.
-  postPatch = ''
-    substituteInPlace plugins/Installation/FormDatabaseSetup.php \
-      --replace "=> '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
deleted file mode 100644
index ee4dab5ad64a5388463a6a8504dc30b284e3a374..0000000000000000000000000000000000000000
--- a/pkgs/servers/web-apps/pump.io/composition.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
-
-{pkgs ? import  {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
-
-let
-  nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
-    inherit nodejs;
-  };
-in
-import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
-  inherit nodeEnv;
-}
\ No newline at end of file
diff --git a/pkgs/servers/web-apps/pump.io/default.nix b/pkgs/servers/web-apps/pump.io/default.nix
deleted file mode 100644
index f888566cad664eacf85a35bcf2d08f30df863b04..0000000000000000000000000000000000000000
--- a/pkgs/servers/web-apps/pump.io/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ pkgs, system, stdenv, fetchurl, makeWrapper, nodejs, graphicsmagick }:
-
-with stdenv.lib;
-
-let
-  # To regenerate composition.nix, run generate.sh.
-  nodePackages = import ./composition.nix {
-    inherit pkgs system nodejs;
-  };
-in
-nodePackages.package.override (oldAttrs: {
-  buildInputs = oldAttrs.buildInputs ++ [ makeWrapper ];
-
-  postInstall = ''
-    for prog in pump pump-authorize pump-follow pump-post-note pump-register-app pump-register-user pump-stop-following; do
-      wrapProgram "$out/bin/$prog" \
-        --prefix PATH : ${graphicsmagick}/bin:$out/bin
-    done
-  '';
-
-  passthru.names = ["pump.io"];
-
-  meta = {
-    description = "Social server with an ActivityStreams API";
-    homepage = http://pump.io/;
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.rvl ];
-    longDescription = ''
-      This is pump.io. It's a stream server that does most of what
-      people really want from a social network.
-
-      What's it for?
-
-      I post something and my followers see it. That's the rough idea
-      behind the pump.
-
-      There's an API defined in the API.md file. It uses
-      activitystrea.ms JSON as the main data and command format.
-
-      You can post almost anything that can be represented with
-      activity streams -- short or long text, bookmarks, images,
-      video, audio, events, geo checkins. You can follow friends,
-      create lists of people, and so on.
-
-      The software is useful for at least these scenarios:
-
-      * Mobile-first social networking
-      * Activity stream functionality for an existing app
-      * Experimenting with social software
-    '';
-  };
-})
diff --git a/pkgs/servers/web-apps/pump.io/generate.sh b/pkgs/servers/web-apps/pump.io/generate.sh
deleted file mode 100755
index 6dc91c72c09ea1cfd634b3dde169ee83f0d4888b..0000000000000000000000000000000000000000
--- a/pkgs/servers/web-apps/pump.io/generate.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix curl jshon
-
-set -e
-
-# Normally, this node2nix invocation would be sufficient:
-#   exec node2nix --input node-packages.json --composition composition.nix
-#
-# But pump.io soft-depends on extra modules, which have to be *inside*
-# its own node_modules, not beside them.
-#
-# So we hack these extra deps into package.json and feed that into
-# node2nix.
-#
-# Also jshon does funny things with slashes in strings, which can be
-# fixed with sed.
-
-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-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 = \"$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.json b/pkgs/servers/web-apps/pump.io/node-packages.json
deleted file mode 100644
index 294da7ab2f1c8d3ec4f35feabb8f33e62728b7e2..0000000000000000000000000000000000000000
--- a/pkgs/servers/web-apps/pump.io/node-packages.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  "pump.io",
-  "databank-mongodb",
-  "databank-redis",
-  "databank-memcached",
-  "databank-lrucache"
-]
diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix
deleted file mode 100644
index ca27c79fab9088e894df397c680ece49a8c86c96..0000000000000000000000000000000000000000
--- a/pkgs/servers/web-apps/pump.io/node-packages.nix
+++ /dev/null
@@ -1,4889 +0,0 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
-
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
-
-let
-  sources = {
-    "bcrypt-0.8.7" = {
-      name = "bcrypt";
-      packageName = "bcrypt";
-      version = "0.8.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz";
-        sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
-      };
-    };
-    "bunyan-1.8.9" = {
-      name = "bunyan";
-      packageName = "bunyan";
-      version = "1.8.9";
-      src = fetchurl {
-        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" = {
-      name = "connect";
-      packageName = "connect";
-      version = "2.30.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz";
-        sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609";
-      };
-    };
-    "connect-auth-git://github.com/e14n/connect-auth" = {
-      name = "connect-auth";
-      packageName = "connect-auth";
-      version = "0.6.0";
-      src = fetchgit {
-        url = "git://github.com/e14n/connect-auth";
-        rev = "ae4e3c4c86a5d266be7bd91c2b99856f9a37b1ec";
-        sha256 = "1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b";
-      };
-    };
-    "connect-databank-1.0.3" = {
-      name = "connect-databank";
-      packageName = "connect-databank";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-databank/-/connect-databank-1.0.3.tgz";
-        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";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-cacerts/-/crypto-cacerts-0.1.0.tgz";
-        sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41";
-      };
-    };
-    "databank-0.19.8" = {
-      name = "databank";
-      packageName = "databank";
-      version = "0.19.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/databank/-/databank-0.19.8.tgz";
-        sha1 = "bf73d6b4fc002045793faeff2b1c3fabc9999844";
-      };
-    };
-    "dateformat-1.0.12" = {
-      name = "dateformat";
-      packageName = "dateformat";
-      version = "1.0.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz";
-        sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9";
-      };
-    };
-    "dialback-client-0.2.0" = {
-      name = "dialback-client";
-      packageName = "dialback-client";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dialback-client/-/dialback-client-0.2.0.tgz";
-        sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6";
-      };
-    };
-    "dompurify-0.8.5" = {
-      name = "dompurify";
-      packageName = "dompurify";
-      version = "0.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.5.tgz";
-        sha1 = "5bc591b61e222243cc827ca382d7a2e2660c1a44";
-      };
-    };
-    "emailjs-1.0.8" = {
-      name = "emailjs";
-      packageName = "emailjs";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emailjs/-/emailjs-1.0.8.tgz";
-        sha1 = "d4240db7670dc78aff97352092d8460edc130f66";
-      };
-    };
-    "express-3.21.2" = {
-      name = "express";
-      packageName = "express";
-      version = "3.21.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz";
-        sha1 = "0c2903ee5c54e63d65a96170764703550665a3de";
-      };
-    };
-    "express-session-1.15.2" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.15.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz";
-        sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4";
-      };
-    };
-    "gm-1.23.0" = {
-      name = "gm";
-      packageName = "gm";
-      version = "1.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gm/-/gm-1.23.0.tgz";
-        sha1 = "80a2fe9cbf131515024846444658461269f52661";
-      };
-    };
-    "helmet-3.5.0" = {
-      name = "helmet";
-      packageName = "helmet";
-      version = "3.5.0";
-      src = fetchurl {
-        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" = {
-      name = "jankyqueue";
-      packageName = "jankyqueue";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jankyqueue/-/jankyqueue-0.1.1.tgz";
-        sha1 = "4181b0318fb32e77aee8c54af73f97660f2e88d2";
-      };
-    };
-    "jsdom-7.2.2" = {
-      name = "jsdom";
-      packageName = "jsdom";
-      version = "7.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz";
-        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";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
-      };
-    };
-    "oauth-evanp-0.9.10-evanp.2" = {
-      name = "oauth-evanp";
-      packageName = "oauth-evanp";
-      version = "0.9.10-evanp.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-evanp/-/oauth-evanp-0.9.10-evanp.2.tgz";
-        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";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
-        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
-      };
-    };
-    "rimraf-2.6.1" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz";
-        sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d";
-      };
-    };
-    "sanitize-html-1.14.1" = {
-      name = "sanitize-html";
-      packageName = "sanitize-html";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
-        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
-      };
-    };
-    "schlock-0.2.1" = {
-      name = "schlock";
-      packageName = "schlock";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/schlock/-/schlock-0.2.1.tgz";
-        sha1 = "2a9aaeaa209a5422eadc5dfc005e2c2f15241f99";
-      };
-    };
-    "send-0.13.2" = {
-      name = "send";
-      packageName = "send";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz";
-        sha1 = "765e7607c8055452bba6f0b052595350986036de";
-      };
-    };
-    "showdown-1.6.4" = {
-      name = "showdown";
-      packageName = "showdown";
-      version = "1.6.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/showdown/-/showdown-1.6.4.tgz";
-        sha1 = "056bbb654ecdb8d8643ae12d6d597893ccaf46c6";
-      };
-    };
-    "sockjs-0.3.18" = {
-      name = "sockjs";
-      packageName = "sockjs";
-      version = "0.3.18";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz";
-        sha1 = "d9b289316ca7df77595ef299e075f0f937eb4207";
-      };
-    };
-    "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 = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/step/-/step-1.0.0.tgz";
-        sha1 = "b300e9d2ae9057d4d78633aae2303813a94bdff2";
-      };
-    };
-    "ua-parser-js-0.7.12" = {
-      name = "ua-parser-js";
-      packageName = "ua-parser-js";
-      version = "0.7.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz";
-        sha1 = "04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb";
-      };
-    };
-    "underscore-1.8.3" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
-        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
-      };
-    };
-    "underscore-contrib-0.3.0" = {
-      name = "underscore-contrib";
-      packageName = "underscore-contrib";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz";
-        sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7";
-      };
-    };
-    "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";
-      };
-    };
-    "validator-4.4.0" = {
-      name = "validator";
-      packageName = "validator";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-4.4.0.tgz";
-        sha1 = "35e29555dd5f7826f970a4eaecff9e6df6df3da6";
-      };
-    };
-    "webfinger-0.4.2" = {
-      name = "webfinger";
-      packageName = "webfinger";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webfinger/-/webfinger-0.4.2.tgz";
-        sha1 = "3477a6d97799461896039fcffc650b73468ee76d";
-      };
-    };
-    "databank-mongodb-1.0.0" = {
-      name = "databank-mongodb";
-      packageName = "databank-mongodb";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-1.0.0.tgz";
-        sha1 = "66f229698df1d4f7e9e3ad849a30174b2aae527b";
-      };
-    };
-    "databank-redis-0.19.6" = {
-      name = "databank-redis";
-      packageName = "databank-redis";
-      version = "0.19.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/databank-redis/-/databank-redis-0.19.6.tgz";
-        sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9";
-      };
-    };
-    "databank-lrucache-0.1.3" = {
-      name = "databank-lrucache";
-      packageName = "databank-lrucache";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.3.tgz";
-        sha1 = "a68fbf6bb5f2e1dab81f5a410065484889a0eeef";
-      };
-    };
-    "bindings-1.2.1" = {
-      name = "bindings";
-      packageName = "bindings";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
-        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
-      };
-    };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
-      };
-    };
-    "dtrace-provider-0.8.1" = {
-      name = "dtrace-provider";
-      packageName = "dtrace-provider";
-      version = "0.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.1.tgz";
-        sha1 = "cd4d174a233bea1bcf4a1fbfa5798f44f48cda9f";
-      };
-    };
-    "mv-2.1.1" = {
-      name = "mv";
-      packageName = "mv";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz";
-        sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
-      };
-    };
-    "safe-json-stringify-1.0.4" = {
-      name = "safe-json-stringify";
-      packageName = "safe-json-stringify";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz";
-        sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911";
-      };
-    };
-    "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";
-      };
-    };
-    "nan-2.5.1" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz";
-        sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2";
-      };
-    };
-    "ncp-2.0.0" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
-        sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
-      };
-    };
-    "rimraf-2.4.5" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.4.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
-        sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
-      };
-    };
-    "glob-6.0.4" = {
-      name = "glob";
-      packageName = "glob";
-      version = "6.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz";
-        sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22";
-      };
-    };
-    "inflight-1.0.6" = {
-      name = "inflight";
-      packageName = "inflight";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
-        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
-      };
-    };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-      };
-    };
-    "minimatch-3.0.3" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz";
-        sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774";
-      };
-    };
-    "once-1.4.0" = {
-      name = "once";
-      packageName = "once";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
-        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
-      };
-    };
-    "path-is-absolute-1.0.1" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
-      };
-    };
-    "wrappy-1.0.2" = {
-      name = "wrappy";
-      packageName = "wrappy";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
-        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
-      };
-    };
-    "brace-expansion-1.1.6" = {
-      name = "brace-expansion";
-      packageName = "brace-expansion";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz";
-        sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9";
-      };
-    };
-    "balanced-match-0.4.2" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz";
-        sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838";
-      };
-    };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      };
-    };
-    "basic-auth-connect-1.0.0" = {
-      name = "basic-auth-connect";
-      packageName = "basic-auth-connect";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
-        sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122";
-      };
-    };
-    "body-parser-1.13.3" = {
-      name = "body-parser";
-      packageName = "body-parser";
-      version = "1.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz";
-        sha1 = "c08cf330c3358e151016a05746f13f029c97fa97";
-      };
-    };
-    "bytes-2.1.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz";
-        sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4";
-      };
-    };
-    "cookie-0.1.3" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz";
-        sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435";
-      };
-    };
-    "cookie-parser-1.3.5" = {
-      name = "cookie-parser";
-      packageName = "cookie-parser";
-      version = "1.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz";
-        sha1 = "9d755570fb5d17890771227a02314d9be7cf8356";
-      };
-    };
-    "cookie-signature-1.0.6" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
-        sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
-      };
-    };
-    "compression-1.5.2" = {
-      name = "compression";
-      packageName = "compression";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz";
-        sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395";
-      };
-    };
-    "connect-timeout-1.6.2" = {
-      name = "connect-timeout";
-      packageName = "connect-timeout";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz";
-        sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e";
-      };
-    };
-    "content-type-1.0.2" = {
-      name = "content-type";
-      packageName = "content-type";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz";
-        sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed";
-      };
-    };
-    "csurf-1.8.3" = {
-      name = "csurf";
-      packageName = "csurf";
-      version = "1.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz";
-        sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a";
-      };
-    };
-    "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";
-      };
-    };
-    "depd-1.0.1" = {
-      name = "depd";
-      packageName = "depd";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
-        sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
-      };
-    };
-    "errorhandler-1.4.3" = {
-      name = "errorhandler";
-      packageName = "errorhandler";
-      version = "1.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz";
-        sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f";
-      };
-    };
-    "express-session-1.11.3" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.11.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz";
-        sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af";
-      };
-    };
-    "finalhandler-0.4.0" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz";
-        sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b";
-      };
-    };
-    "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";
-      };
-    };
-    "http-errors-1.3.1" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
-        sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
-      };
-    };
-    "morgan-1.6.1" = {
-      name = "morgan";
-      packageName = "morgan";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz";
-        sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2";
-      };
-    };
-    "multiparty-3.3.2" = {
-      name = "multiparty";
-      packageName = "multiparty";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
-        sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
-      };
-    };
-    "on-headers-1.0.1" = {
-      name = "on-headers";
-      packageName = "on-headers";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz";
-        sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
-      };
-    };
-    "parseurl-1.3.1" = {
-      name = "parseurl";
-      packageName = "parseurl";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz";
-        sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56";
-      };
-    };
-    "pause-0.1.0" = {
-      name = "pause";
-      packageName = "pause";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz";
-        sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74";
-      };
-    };
-    "qs-4.0.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz";
-        sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
-      };
-    };
-    "response-time-2.3.2" = {
-      name = "response-time";
-      packageName = "response-time";
-      version = "2.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz";
-        sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a";
-      };
-    };
-    "serve-favicon-2.3.2" = {
-      name = "serve-favicon";
-      packageName = "serve-favicon";
-      version = "2.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz";
-        sha1 = "dd419e268de012ab72b319d337f2105013f9381f";
-      };
-    };
-    "serve-index-1.7.3" = {
-      name = "serve-index";
-      packageName = "serve-index";
-      version = "1.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz";
-        sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2";
-      };
-    };
-    "serve-static-1.10.3" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.10.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz";
-        sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535";
-      };
-    };
-    "type-is-1.6.14" = {
-      name = "type-is";
-      packageName = "type-is";
-      version = "1.6.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz";
-        sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2";
-      };
-    };
-    "utils-merge-1.0.0" = {
-      name = "utils-merge";
-      packageName = "utils-merge";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
-        sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
-      };
-    };
-    "vhost-3.0.2" = {
-      name = "vhost";
-      packageName = "vhost";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz";
-        sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5";
-      };
-    };
-    "iconv-lite-0.4.11" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz";
-        sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
-      };
-    };
-    "on-finished-2.3.0" = {
-      name = "on-finished";
-      packageName = "on-finished";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
-        sha1 = "20f1336481b083cd75337992a16971aa2d906947";
-      };
-    };
-    "raw-body-2.1.7" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "2.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz";
-        sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
-      };
-    };
-    "ee-first-1.1.1" = {
-      name = "ee-first";
-      packageName = "ee-first";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
-        sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
-      };
-    };
-    "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.13" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
-        sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
-      };
-    };
-    "unpipe-1.0.0" = {
-      name = "unpipe";
-      packageName = "unpipe";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
-        sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
-      };
-    };
-    "accepts-1.2.13" = {
-      name = "accepts";
-      packageName = "accepts";
-      version = "1.2.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz";
-        sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea";
-      };
-    };
-    "compressible-2.0.10" = {
-      name = "compressible";
-      packageName = "compressible";
-      version = "2.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz";
-        sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd";
-      };
-    };
-    "vary-1.0.1" = {
-      name = "vary";
-      packageName = "vary";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz";
-        sha1 = "99e4981566a286118dfb2b817357df7993376d10";
-      };
-    };
-    "mime-types-2.1.15" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "2.1.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz";
-        sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed";
-      };
-    };
-    "negotiator-0.5.3" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
-        sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
-      };
-    };
-    "mime-db-1.27.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.27.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz";
-        sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1";
-      };
-    };
-    "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";
-      };
-    };
-    "csrf-3.0.6" = {
-      name = "csrf";
-      packageName = "csrf";
-      version = "3.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz";
-        sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a";
-      };
-    };
-    "rndm-1.2.0" = {
-      name = "rndm";
-      packageName = "rndm";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz";
-        sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c";
-      };
-    };
-    "tsscmp-1.0.5" = {
-      name = "tsscmp";
-      packageName = "tsscmp";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz";
-        sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
-      };
-    };
-    "uid-safe-2.1.4" = {
-      name = "uid-safe";
-      packageName = "uid-safe";
-      version = "2.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz";
-        sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81";
-      };
-    };
-    "random-bytes-1.0.0" = {
-      name = "random-bytes";
-      packageName = "random-bytes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz";
-        sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b";
-      };
-    };
-    "accepts-1.3.3" = {
-      name = "accepts";
-      packageName = "accepts";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz";
-        sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca";
-      };
-    };
-    "escape-html-1.0.3" = {
-      name = "escape-html";
-      packageName = "escape-html";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
-        sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
-      };
-    };
-    "negotiator-0.6.1" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz";
-        sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
-      };
-    };
-    "crc-3.3.0" = {
-      name = "crc";
-      packageName = "crc";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz";
-        sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba";
-      };
-    };
-    "uid-safe-2.0.0" = {
-      name = "uid-safe";
-      packageName = "uid-safe";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz";
-        sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137";
-      };
-    };
-    "base64-url-1.2.1" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz";
-        sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78";
-      };
-    };
-    "escape-html-1.0.2" = {
-      name = "escape-html";
-      packageName = "escape-html";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz";
-        sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c";
-      };
-    };
-    "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";
-      };
-    };
-    "basic-auth-1.0.4" = {
-      name = "basic-auth";
-      packageName = "basic-auth";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
-        sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
-      };
-    };
-    "readable-stream-1.1.14" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "1.1.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
-        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
-      };
-    };
-    "stream-counter-0.2.0" = {
-      name = "stream-counter";
-      packageName = "stream-counter";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
-        sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de";
-      };
-    };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
-      };
-    };
-    "isarray-0.0.1" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
-      };
-    };
-    "string_decoder-0.10.31" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "0.10.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
-      };
-    };
-    "depd-1.1.0" = {
-      name = "depd";
-      packageName = "depd";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz";
-        sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3";
-      };
-    };
-    "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";
-      };
-    };
-    "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";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz";
-        sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464";
-      };
-    };
-    "media-typer-0.3.0" = {
-      name = "media-typer";
-      packageName = "media-typer";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
-        sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
-      };
-    };
-    "oauth-0.9.7" = {
-      name = "oauth";
-      packageName = "oauth";
-      version = "0.9.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.7.tgz";
-        sha1 = "c2554d0368c966eb3050bec96584625577ad1ecd";
-      };
-    };
-    "openid-0.4.1" = {
-      name = "openid";
-      packageName = "openid";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/openid/-/openid-0.4.1.tgz";
-        sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387";
-      };
-    };
-    "async-1.5.2" = {
-      name = "async";
-      packageName = "async";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
-        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";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-immediate/-/set-immediate-0.1.1.tgz";
-        sha1 = "8986e4a773bf8ec165f24d579107673bfac141de";
-      };
-    };
-    "multiparty-4.1.3" = {
-      name = "multiparty";
-      packageName = "multiparty";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz";
-        sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94";
-      };
-    };
-    "fd-slicer-1.0.1" = {
-      name = "fd-slicer";
-      packageName = "fd-slicer";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
-        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
-      };
-    };
-    "pend-1.2.0" = {
-      name = "pend";
-      packageName = "pend";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
-        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
-      };
-    };
-    "get-stdin-4.0.1" = {
-      name = "get-stdin";
-      packageName = "get-stdin";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
-        sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
-      };
-    };
-    "meow-3.7.0" = {
-      name = "meow";
-      packageName = "meow";
-      version = "3.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz";
-        sha1 = "72cb668b425228290abbfa856892587308a801fb";
-      };
-    };
-    "camelcase-keys-2.1.0" = {
-      name = "camelcase-keys";
-      packageName = "camelcase-keys";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz";
-        sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
-      };
-    };
-    "decamelize-1.2.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
-      };
-    };
-    "loud-rejection-1.6.0" = {
-      name = "loud-rejection";
-      packageName = "loud-rejection";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz";
-        sha1 = "5b46f80147edee578870f086d04821cf998e551f";
-      };
-    };
-    "map-obj-1.0.1" = {
-      name = "map-obj";
-      packageName = "map-obj";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
-        sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
-      };
-    };
-    "minimist-1.2.0" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
-      };
-    };
-    "normalize-package-data-2.3.6" = {
-      name = "normalize-package-data";
-      packageName = "normalize-package-data";
-      version = "2.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.6.tgz";
-        sha1 = "498fa420c96401f787402ba21e600def9f981fff";
-      };
-    };
-    "object-assign-4.1.1" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
-        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
-      };
-    };
-    "read-pkg-up-1.0.1" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
-        sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
-      };
-    };
-    "redent-1.0.0" = {
-      name = "redent";
-      packageName = "redent";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz";
-        sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde";
-      };
-    };
-    "trim-newlines-1.0.0" = {
-      name = "trim-newlines";
-      packageName = "trim-newlines";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz";
-        sha1 = "5887966bb582a4503a41eb524f7d35011815a613";
-      };
-    };
-    "camelcase-2.1.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz";
-        sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f";
-      };
-    };
-    "currently-unhandled-0.4.1" = {
-      name = "currently-unhandled";
-      packageName = "currently-unhandled";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz";
-        sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
-      };
-    };
-    "signal-exit-3.0.2" = {
-      name = "signal-exit";
-      packageName = "signal-exit";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
-      };
-    };
-    "array-find-index-1.0.2" = {
-      name = "array-find-index";
-      packageName = "array-find-index";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz";
-        sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
-      };
-    };
-    "hosted-git-info-2.4.1" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz";
-        sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8";
-      };
-    };
-    "is-builtin-module-1.0.0" = {
-      name = "is-builtin-module";
-      packageName = "is-builtin-module";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
-        sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
-      };
-    };
-    "semver-5.3.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
-        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
-      };
-    };
-    "validate-npm-package-license-3.0.1" = {
-      name = "validate-npm-package-license";
-      packageName = "validate-npm-package-license";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz";
-        sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
-      };
-    };
-    "builtin-modules-1.1.1" = {
-      name = "builtin-modules";
-      packageName = "builtin-modules";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
-        sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
-      };
-    };
-    "spdx-correct-1.0.2" = {
-      name = "spdx-correct";
-      packageName = "spdx-correct";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz";
-        sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
-      };
-    };
-    "spdx-expression-parse-1.0.4" = {
-      name = "spdx-expression-parse";
-      packageName = "spdx-expression-parse";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz";
-        sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c";
-      };
-    };
-    "spdx-license-ids-1.2.2" = {
-      name = "spdx-license-ids";
-      packageName = "spdx-license-ids";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz";
-        sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57";
-      };
-    };
-    "find-up-1.1.2" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz";
-        sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
-      };
-    };
-    "read-pkg-1.1.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz";
-        sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
-      };
-    };
-    "path-exists-2.1.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz";
-        sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
-      };
-    };
-    "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";
-      };
-    };
-    "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";
-      };
-    };
-    "load-json-file-1.1.0" = {
-      name = "load-json-file";
-      packageName = "load-json-file";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz";
-        sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
-      };
-    };
-    "path-type-1.1.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz";
-        sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
-      };
-    };
-    "graceful-fs-4.1.11" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "4.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
-        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
-      };
-    };
-    "parse-json-2.2.0" = {
-      name = "parse-json";
-      packageName = "parse-json";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
-        sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
-      };
-    };
-    "pify-2.3.0" = {
-      name = "pify";
-      packageName = "pify";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
-        sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
-      };
-    };
-    "strip-bom-2.0.0" = {
-      name = "strip-bom";
-      packageName = "strip-bom";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz";
-        sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
-      };
-    };
-    "error-ex-1.3.1" = {
-      name = "error-ex";
-      packageName = "error-ex";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz";
-        sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc";
-      };
-    };
-    "is-arrayish-0.2.1" = {
-      name = "is-arrayish";
-      packageName = "is-arrayish";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
-        sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
-      };
-    };
-    "is-utf8-0.2.1" = {
-      name = "is-utf8";
-      packageName = "is-utf8";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz";
-        sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
-      };
-    };
-    "indent-string-2.1.0" = {
-      name = "indent-string";
-      packageName = "indent-string";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz";
-        sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80";
-      };
-    };
-    "strip-indent-1.0.1" = {
-      name = "strip-indent";
-      packageName = "strip-indent";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz";
-        sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2";
-      };
-    };
-    "repeating-2.0.1" = {
-      name = "repeating";
-      packageName = "repeating";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
-        sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
-      };
-    };
-    "is-finite-1.0.2" = {
-      name = "is-finite";
-      packageName = "is-finite";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
-      };
-    };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
-      };
-    };
-    "underscore-1.5.2" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
-        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";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz";
-        sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2";
-      };
-    };
-    "mimelib-0.2.14" = {
-      name = "mimelib";
-      packageName = "mimelib";
-      version = "0.2.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz";
-        sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831";
-      };
-    };
-    "moment-2.11.2" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.11.2.tgz";
-        sha1 = "87968e5f95ac038c2e42ac959c75819cd3f52901";
-      };
-    };
-    "starttls-1.0.1" = {
-      name = "starttls";
-      packageName = "starttls";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/starttls/-/starttls-1.0.1.tgz";
-        sha1 = "e6081c25de6b178f5a75f8f271c1487449183b42";
-      };
-    };
-    "bufferjs-1.1.0" = {
-      name = "bufferjs";
-      packageName = "bufferjs";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bufferjs/-/bufferjs-1.1.0.tgz";
-        sha1 = "095ffa39c5e6b40a2178a1169c9effc584a73201";
-      };
-    };
-    "encoding-0.1.12" = {
-      name = "encoding";
-      packageName = "encoding";
-      version = "0.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz";
-        sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
-      };
-    };
-    "addressparser-0.2.1" = {
-      name = "addressparser";
-      packageName = "addressparser";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz";
-        sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607";
-      };
-    };
-    "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";
-      };
-    };
-    "content-disposition-0.5.0" = {
-      name = "content-disposition";
-      packageName = "content-disposition";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
-        sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
-      };
-    };
-    "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.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
-        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
-      };
-    };
-    "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";
-      };
-    };
-    "cookie-0.3.1" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz";
-        sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
-      };
-    };
-    "crc-3.4.4" = {
-      name = "crc";
-      packageName = "crc";
-      version = "3.4.4";
-      src = fetchurl {
-        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" = {
-      name = "array-parallel";
-      packageName = "array-parallel";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz";
-        sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d";
-      };
-    };
-    "array-series-0.1.5" = {
-      name = "array-series";
-      packageName = "array-series";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz";
-        sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f";
-      };
-    };
-    "cross-spawn-4.0.2" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
-        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
-      };
-    };
-    "lru-cache-4.0.2" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
-        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
-      };
-    };
-    "which-1.2.14" = {
-      name = "which";
-      packageName = "which";
-      version = "1.2.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
-        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
-      };
-    };
-    "pseudomap-1.0.2" = {
-      name = "pseudomap";
-      packageName = "pseudomap";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
-        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
-      };
-    };
-    "yallist-2.1.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
-        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
-      };
-    };
-    "isexe-2.0.0" = {
-      name = "isexe";
-      packageName = "isexe";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
-        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
-      };
-    };
-    "connect-3.6.0" = {
-      name = "connect";
-      packageName = "connect";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz";
-        sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e";
-      };
-    };
-    "dns-prefetch-control-0.1.0" = {
-      name = "dns-prefetch-control";
-      packageName = "dns-prefetch-control";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz";
-        sha1 = "60ddb457774e178f1f9415f0cabb0e85b0b300b2";
-      };
-    };
-    "dont-sniff-mimetype-1.0.0" = {
-      name = "dont-sniff-mimetype";
-      packageName = "dont-sniff-mimetype";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz";
-        sha1 = "5932890dc9f4e2f19e5eb02a20026e5e5efc8f58";
-      };
-    };
-    "frameguard-3.0.0" = {
-      name = "frameguard";
-      packageName = "frameguard";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz";
-        sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9";
-      };
-    };
-    "helmet-csp-2.4.0" = {
-      name = "helmet-csp";
-      packageName = "helmet-csp";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.4.0.tgz";
-        sha1 = "7e53a157167a0645aadd7177d12ae6c605c1842e";
-      };
-    };
-    "hide-powered-by-1.0.0" = {
-      name = "hide-powered-by";
-      packageName = "hide-powered-by";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.0.0.tgz";
-        sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b";
-      };
-    };
-    "hpkp-2.0.0" = {
-      name = "hpkp";
-      packageName = "hpkp";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz";
-        sha1 = "10e142264e76215a5d30c44ec43de64dee6d1672";
-      };
-    };
-    "hsts-2.0.0" = {
-      name = "hsts";
-      packageName = "hsts";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hsts/-/hsts-2.0.0.tgz";
-        sha1 = "a52234c6070decf214b2b6b70bb144d07e4776c7";
-      };
-    };
-    "ienoopen-1.0.0" = {
-      name = "ienoopen";
-      packageName = "ienoopen";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ienoopen/-/ienoopen-1.0.0.tgz";
-        sha1 = "346a428f474aac8f50cf3784ea2d0f16f62bda6b";
-      };
-    };
-    "nocache-2.0.0" = {
-      name = "nocache";
-      packageName = "nocache";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz";
-        sha1 = "202b48021a0c4cbde2df80de15a17443c8b43980";
-      };
-    };
-    "referrer-policy-1.1.0" = {
-      name = "referrer-policy";
-      packageName = "referrer-policy";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz";
-        sha1 = "35774eb735bf50fb6c078e83334b472350207d79";
-      };
-    };
-    "x-xss-protection-1.0.0" = {
-      name = "x-xss-protection";
-      packageName = "x-xss-protection";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.0.0.tgz";
-        sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9";
-      };
-    };
-    "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 = "1.0.0";
-      src = fetchurl {
-        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" = {
-      name = "camelize";
-      packageName = "camelize";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz";
-        sha1 = "164a5483e630fa4321e5af07020e531831b2609b";
-      };
-    };
-    "content-security-policy-builder-1.1.0" = {
-      name = "content-security-policy-builder";
-      packageName = "content-security-policy-builder";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.1.0.tgz";
-        sha1 = "d91f1b076236c119850c7dee9924bf55e05772b3";
-      };
-    };
-    "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.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz";
-        sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b";
-      };
-    };
-    "platform-1.3.3" = {
-      name = "platform";
-      packageName = "platform";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz";
-        sha1 = "646c77011899870b6a0903e75e997e8e51da7461";
-      };
-    };
-    "dashify-0.2.2" = {
-      name = "dashify";
-      packageName = "dashify";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dashify/-/dashify-0.2.2.tgz";
-        sha1 = "6a07415a01c91faf4a32e38d9dfba71f61cb20fe";
-      };
-    };
-    "character-parser-1.2.1" = {
-      name = "character-parser";
-      packageName = "character-parser";
-      version = "1.2.1";
-      src = fetchurl {
-        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" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "2.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
-        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";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz";
-        sha1 = "55bb5e98691507b74579d0513413217c380c54cf";
-      };
-    };
-    "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.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz";
-        sha1 = "b8036170c79f07a90ff2f16e22284027a243848b";
-      };
-    };
-    "cssstyle-0.2.37" = {
-      name = "cssstyle";
-      packageName = "cssstyle";
-      version = "0.2.37";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz";
-        sha1 = "541097234cb2513c83ceed3acddc27ff27987d54";
-      };
-    };
-    "escodegen-1.8.1" = {
-      name = "escodegen";
-      packageName = "escodegen";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz";
-        sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
-      };
-    };
-    "nwmatcher-1.3.9" = {
-      name = "nwmatcher";
-      packageName = "nwmatcher";
-      version = "1.3.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz";
-        sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a";
-      };
-    };
-    "parse5-1.5.1" = {
-      name = "parse5";
-      packageName = "parse5";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz";
-        sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
-      };
-    };
-    "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";
-      };
-    };
-    "sax-1.2.2" = {
-      name = "sax";
-      packageName = "sax";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz";
-        sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828";
-      };
-    };
-    "symbol-tree-3.2.2" = {
-      name = "symbol-tree";
-      packageName = "symbol-tree";
-      version = "3.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz";
-        sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6";
-      };
-    };
-    "tough-cookie-2.3.2" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz";
-        sha1 = "f081f76e4c85720e6c37a5faced737150d84072a";
-      };
-    };
-    "webidl-conversions-2.0.1" = {
-      name = "webidl-conversions";
-      packageName = "webidl-conversions";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz";
-        sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506";
-      };
-    };
-    "whatwg-url-compat-0.6.5" = {
-      name = "whatwg-url-compat";
-      packageName = "whatwg-url-compat";
-      version = "0.6.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz";
-        sha1 = "00898111af689bb097541cd5a45ca6c8798445bf";
-      };
-    };
-    "xml-name-validator-2.0.1" = {
-      name = "xml-name-validator";
-      packageName = "xml-name-validator";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz";
-        sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635";
-      };
-    };
-    "estraverse-1.9.3" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "1.9.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz";
-        sha1 = "af67f2dc922582415950926091a4005d29c9bb44";
-      };
-    };
-    "esutils-2.0.2" = {
-      name = "esutils";
-      packageName = "esutils";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
-        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
-      };
-    };
-    "esprima-2.7.3" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "2.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz";
-        sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
-      };
-    };
-    "optionator-0.8.2" = {
-      name = "optionator";
-      packageName = "optionator";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz";
-        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
-      };
-    };
-    "source-map-0.2.0" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz";
-        sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d";
-      };
-    };
-    "prelude-ls-1.1.2" = {
-      name = "prelude-ls";
-      packageName = "prelude-ls";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
-        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
-      };
-    };
-    "deep-is-0.1.3" = {
-      name = "deep-is";
-      packageName = "deep-is";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
-        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
-      };
-    };
-    "wordwrap-1.0.0" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
-        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
-      };
-    };
-    "type-check-0.3.2" = {
-      name = "type-check";
-      packageName = "type-check";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
-        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
-      };
-    };
-    "levn-0.3.0" = {
-      name = "levn";
-      packageName = "levn";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
-        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
-      };
-    };
-    "fast-levenshtein-2.0.6" = {
-      name = "fast-levenshtein";
-      packageName = "fast-levenshtein";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
-        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
-      };
-    };
-    "aws-sign2-0.6.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
-        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
-      };
-    };
-    "aws4-1.6.0" = {
-      name = "aws4";
-      packageName = "aws4";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
-        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
-      };
-    };
-    "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";
-      };
-    };
-    "combined-stream-1.0.5" = {
-      name = "combined-stream";
-      packageName = "combined-stream";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
-        sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
-      };
-    };
-    "extend-3.0.0" = {
-      name = "extend";
-      packageName = "extend";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
-        sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
-      };
-    };
-    "forever-agent-0.6.1" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
-        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
-      };
-    };
-    "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";
-      };
-    };
-    "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";
-      };
-    };
-    "hawk-3.1.3" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
-        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
-      };
-    };
-    "http-signature-1.1.1" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
-        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
-      };
-    };
-    "is-typedarray-1.0.0" = {
-      name = "is-typedarray";
-      packageName = "is-typedarray";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
-        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
-      };
-    };
-    "isstream-0.1.2" = {
-      name = "isstream";
-      packageName = "isstream";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
-        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
-      };
-    };
-    "json-stringify-safe-5.0.1" = {
-      name = "json-stringify-safe";
-      packageName = "json-stringify-safe";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
-      };
-    };
-    "oauth-sign-0.8.2" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
-        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
-      };
-    };
-    "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.4.0";
-      src = fetchurl {
-        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" = {
-      name = "stringstream";
-      packageName = "stringstream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
-      };
-    };
-    "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";
-      };
-    };
-    "delayed-stream-1.0.0" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
-        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
-      };
-    };
-    "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";
-      };
-    };
-    "ajv-4.11.5" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "4.11.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz";
-        sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd";
-      };
-    };
-    "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";
-      };
-    };
-    "jsonify-0.0.0" = {
-      name = "jsonify";
-      packageName = "jsonify";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
-        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
-      };
-    };
-    "hoek-2.16.3" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "2.16.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
-        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
-      };
-    };
-    "boom-2.10.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "2.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
-        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
-      };
-    };
-    "cryptiles-2.0.5" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
-        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
-      };
-    };
-    "sntp-1.0.9" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
-        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
-      };
-    };
-    "assert-plus-0.2.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
-        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
-      };
-    };
-    "jsprim-1.4.0" = {
-      name = "jsprim";
-      packageName = "jsprim";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
-        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
-      };
-    };
-    "sshpk-1.11.0" = {
-      name = "sshpk";
-      packageName = "sshpk";
-      version = "1.11.0";
-      src = fetchurl {
-        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" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
-        sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
-      };
-    };
-    "json-schema-0.2.3" = {
-      name = "json-schema";
-      packageName = "json-schema";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
-        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
-      };
-    };
-    "verror-1.3.6" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
-        sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
-      };
-    };
-    "asn1-0.2.3" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
-        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
-      };
-    };
-    "dashdash-1.14.1" = {
-      name = "dashdash";
-      packageName = "dashdash";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
-        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
-      };
-    };
-    "getpass-0.1.6" = {
-      name = "getpass";
-      packageName = "getpass";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz";
-        sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6";
-      };
-    };
-    "jsbn-0.1.1" = {
-      name = "jsbn";
-      packageName = "jsbn";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
-        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
-      };
-    };
-    "tweetnacl-0.14.5" = {
-      name = "tweetnacl";
-      packageName = "tweetnacl";
-      version = "0.14.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
-        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";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
-        sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
-      };
-    };
-    "bcrypt-pbkdf-1.0.1" = {
-      name = "bcrypt-pbkdf";
-      packageName = "bcrypt-pbkdf";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
-        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
-    "tr46-0.0.3" = {
-      name = "tr46";
-      packageName = "tr46";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz";
-        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";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
-    "minimist-0.0.10" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
-        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
-      };
-    };
-    "glob-7.1.1" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz";
-        sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8";
-      };
-    };
-    "fs.realpath-1.0.0" = {
-      name = "fs.realpath";
-      packageName = "fs.realpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
-      };
-    };
-    "htmlparser2-3.9.2" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz";
-        sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338";
-      };
-    };
-    "regexp-quote-0.0.0" = {
-      name = "regexp-quote";
-      packageName = "regexp-quote";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz";
-        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";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
-        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
-      };
-    };
-    "domhandler-2.3.0" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
-        sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
-      };
-    };
-    "domutils-1.5.1" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
-        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
-      };
-    };
-    "entities-1.1.1" = {
-      name = "entities";
-      packageName = "entities";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
-        sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
-      };
-    };
-    "readable-stream-2.2.6" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz";
-        sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816";
-      };
-    };
-    "dom-serializer-0.1.0" = {
-      name = "dom-serializer";
-      packageName = "dom-serializer";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
-        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
-      };
-    };
-    "domelementtype-1.1.3" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
-        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
-      };
-    };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    };
-    "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";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
-        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
-      };
-    };
-    "util-deprecate-1.0.2" = {
-      name = "util-deprecate";
-      packageName = "util-deprecate";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
-        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
-      };
-    };
-    "destroy-1.0.4" = {
-      name = "destroy";
-      packageName = "destroy";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
-        sha1 = "978857442c44749e4206613e37946205826abd80";
-      };
-    };
-    "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";
-      };
-    };
-    "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";
-      };
-    };
-    "set-blocking-2.0.0" = {
-      name = "set-blocking";
-      packageName = "set-blocking";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
-        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
-      };
-    };
-    "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";
-      };
-    };
-    "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";
-      };
-    };
-    "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";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        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";
-      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";
-      };
-    };
-    "code-point-at-1.1.0" = {
-      name = "code-point-at";
-      packageName = "code-point-at";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
-      };
-    };
-    "is-fullwidth-code-point-1.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
-      };
-    };
-    "faye-websocket-0.10.0" = {
-      name = "faye-websocket";
-      packageName = "faye-websocket";
-      version = "0.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz";
-        sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
-      };
-    };
-    "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";
-      };
-    };
-    "websocket-driver-0.6.5" = {
-      name = "websocket-driver";
-      packageName = "websocket-driver";
-      version = "0.6.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz";
-        sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36";
-      };
-    };
-    "websocket-extensions-0.1.1" = {
-      name = "websocket-extensions";
-      packageName = "websocket-extensions";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz";
-        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";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
-        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
-      };
-    };
-    "xml2js-0.1.14" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.1.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz";
-        sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
-      };
-    };
-    "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.25";
-      src = fetchurl {
-        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" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "3.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz";
-        sha1 = "ec56233868032909207170c39448e24449dd1fc4";
-      };
-    };
-    "mongodb-core-2.1.9" = {
-      name = "mongodb-core";
-      packageName = "mongodb-core";
-      version = "2.1.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.9.tgz";
-        sha1 = "85aa71ee4fb716196e06b787557bf139f801daf5";
-      };
-    };
-    "readable-stream-2.1.5" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
-        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
-      };
-    };
-    "bson-1.0.4" = {
-      name = "bson";
-      packageName = "bson";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz";
-        sha1 = "93c10d39eaa5b58415cbc4052f3e53e562b0b72c";
-      };
-    };
-    "require_optional-1.0.0" = {
-      name = "require_optional";
-      packageName = "require_optional";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz";
-        sha1 = "52a86137a849728eb60a55533617f8f914f59abf";
-      };
-    };
-    "resolve-from-2.0.0" = {
-      name = "resolve-from";
-      packageName = "resolve-from";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz";
-        sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57";
-      };
-    };
-    "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";
-      };
-    };
-    "redis-0.10.3" = {
-      name = "redis";
-      packageName = "redis";
-      version = "0.10.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
-        sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6";
-      };
-    };
-  };
-  args = {
-    name = "pump.io";
-    packageName = "pump.io";
-    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 = [
-          sources."bindings-1.2.1"
-          sources."nan-2.3.5"
-        ];
-      })
-      (sources."bunyan-1.8.9" // {
-        dependencies = [
-          (sources."dtrace-provider-0.8.1" // {
-            dependencies = [
-              sources."nan-2.5.1"
-            ];
-          })
-          (sources."mv-2.1.1" // {
-            dependencies = [
-              sources."ncp-2.0.0"
-              (sources."rimraf-2.4.5" // {
-                dependencies = [
-                  (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."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"
-          (sources."body-parser-1.13.3" // {
-            dependencies = [
-              sources."iconv-lite-0.4.11"
-              (sources."on-finished-2.3.0" // {
-                dependencies = [
-                  sources."ee-first-1.1.1"
-                ];
-              })
-              (sources."raw-body-2.1.7" // {
-                dependencies = [
-                  sources."bytes-2.4.0"
-                  sources."iconv-lite-0.4.13"
-                  sources."unpipe-1.0.0"
-                ];
-              })
-            ];
-          })
-          sources."bytes-2.1.0"
-          sources."cookie-0.1.3"
-          sources."cookie-parser-1.3.5"
-          sources."cookie-signature-1.0.6"
-          (sources."compression-1.5.2" // {
-            dependencies = [
-              (sources."accepts-1.2.13" // {
-                dependencies = [
-                  (sources."mime-types-2.1.15" // {
-                    dependencies = [
-                      sources."mime-db-1.27.0"
-                    ];
-                  })
-                  sources."negotiator-0.5.3"
-                ];
-              })
-              (sources."compressible-2.0.10" // {
-                dependencies = [
-                  sources."mime-db-1.27.0"
-                ];
-              })
-              sources."vary-1.0.1"
-            ];
-          })
-          (sources."connect-timeout-1.6.2" // {
-            dependencies = [
-              sources."ms-0.7.1"
-            ];
-          })
-          sources."content-type-1.0.2"
-          (sources."csurf-1.8.3" // {
-            dependencies = [
-              (sources."csrf-3.0.6" // {
-                dependencies = [
-                  sources."rndm-1.2.0"
-                  sources."tsscmp-1.0.5"
-                  (sources."uid-safe-2.1.4" // {
-                    dependencies = [
-                      sources."random-bytes-1.0.0"
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-          (sources."debug-2.2.0" // {
-            dependencies = [
-              sources."ms-0.7.1"
-            ];
-          })
-          sources."depd-1.0.1"
-          (sources."errorhandler-1.4.3" // {
-            dependencies = [
-              (sources."accepts-1.3.3" // {
-                dependencies = [
-                  (sources."mime-types-2.1.15" // {
-                    dependencies = [
-                      sources."mime-db-1.27.0"
-                    ];
-                  })
-                  sources."negotiator-0.6.1"
-                ];
-              })
-              sources."escape-html-1.0.3"
-            ];
-          })
-          (sources."express-session-1.11.3" // {
-            dependencies = [
-              sources."crc-3.3.0"
-              (sources."uid-safe-2.0.0" // {
-                dependencies = [
-                  sources."base64-url-1.2.1"
-                ];
-              })
-            ];
-          })
-          (sources."finalhandler-0.4.0" // {
-            dependencies = [
-              sources."escape-html-1.0.2"
-              (sources."on-finished-2.3.0" // {
-                dependencies = [
-                  sources."ee-first-1.1.1"
-                ];
-              })
-              sources."unpipe-1.0.0"
-            ];
-          })
-          sources."fresh-0.3.0"
-          (sources."http-errors-1.3.1" // {
-            dependencies = [
-              sources."inherits-2.0.3"
-              sources."statuses-1.3.1"
-            ];
-          })
-          (sources."morgan-1.6.1" // {
-            dependencies = [
-              sources."basic-auth-1.0.4"
-              (sources."on-finished-2.3.0" // {
-                dependencies = [
-                  sources."ee-first-1.1.1"
-                ];
-              })
-            ];
-          })
-          (sources."multiparty-3.3.2" // {
-            dependencies = [
-              (sources."readable-stream-1.1.14" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-0.0.1"
-                  sources."string_decoder-0.10.31"
-                  sources."inherits-2.0.3"
-                ];
-              })
-              sources."stream-counter-0.2.0"
-            ];
-          })
-          sources."on-headers-1.0.1"
-          sources."parseurl-1.3.1"
-          sources."pause-0.1.0"
-          sources."qs-4.0.0"
-          (sources."response-time-2.3.2" // {
-            dependencies = [
-              sources."depd-1.1.0"
-            ];
-          })
-          (sources."serve-favicon-2.3.2" // {
-            dependencies = [
-              sources."etag-1.7.0"
-              sources."ms-0.7.2"
-            ];
-          })
-          (sources."serve-index-1.7.3" // {
-            dependencies = [
-              (sources."accepts-1.2.13" // {
-                dependencies = [
-                  sources."negotiator-0.5.3"
-                ];
-              })
-              sources."batch-0.5.3"
-              sources."escape-html-1.0.3"
-              (sources."mime-types-2.1.15" // {
-                dependencies = [
-                  sources."mime-db-1.27.0"
-                ];
-              })
-            ];
-          })
-          (sources."serve-static-1.10.3" // {
-            dependencies = [
-              sources."escape-html-1.0.3"
-            ];
-          })
-          (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."utils-merge-1.0.0"
-          sources."vhost-3.0.2"
-        ];
-      })
-      (sources."connect-auth-git://github.com/e14n/connect-auth" // {
-        dependencies = [
-          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."connect-multiparty-2.0.0" // {
-        dependencies = [
-          (sources."multiparty-4.1.3" // {
-            dependencies = [
-              (sources."fd-slicer-1.0.1" // {
-                dependencies = [
-                  sources."pend-1.2.0"
-                ];
-              })
-            ];
-          })
-          (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" // {
-        dependencies = [
-          sources."get-stdin-4.0.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.6" // {
-                dependencies = [
-                  sources."hosted-git-info-2.4.1"
-                  (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."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.1" // {
-                                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."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."redent-1.0.0" // {
-                dependencies = [
-                  (sources."indent-string-2.1.0" // {
-                    dependencies = [
-                      (sources."repeating-2.0.1" // {
-                        dependencies = [
-                          (sources."is-finite-1.0.2" // {
-                            dependencies = [
-                              sources."number-is-nan-1.0.1"
-                            ];
-                          })
-                        ];
-                      })
-                    ];
-                  })
-                  sources."strip-indent-1.0.1"
-                ];
-              })
-              sources."trim-newlines-1.0.0"
-            ];
-          })
-        ];
-      })
-      (sources."dialback-client-0.2.0" // {
-        dependencies = [
-          sources."underscore-1.5.2"
-          sources."step-0.0.6"
-        ];
-      })
-      sources."dompurify-0.8.5"
-      (sources."emailjs-1.0.8" // {
-        dependencies = [
-          sources."addressparser-0.3.2"
-          (sources."mimelib-0.2.14" // {
-            dependencies = [
-              (sources."encoding-0.1.12" // {
-                dependencies = [
-                  sources."iconv-lite-0.4.15"
-                ];
-              })
-              sources."addressparser-0.2.1"
-            ];
-          })
-          sources."moment-2.11.2"
-          sources."starttls-1.0.1"
-          sources."bufferjs-1.1.0"
-        ];
-      })
-      (sources."express-3.21.2" // {
-        dependencies = [
-          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."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.4" // {
-            dependencies = [
-              sources."random-bytes-1.0.0"
-            ];
-          })
-          sources."utils-merge-1.0.0"
-        ];
-      })
-      (sources."gm-1.23.0" // {
-        dependencies = [
-          sources."array-parallel-0.1.3"
-          sources."array-series-0.1.5"
-          (sources."cross-spawn-4.0.2" // {
-            dependencies = [
-              (sources."lru-cache-4.0.2" // {
-                dependencies = [
-                  sources."pseudomap-1.0.2"
-                  sources."yallist-2.1.2"
-                ];
-              })
-              (sources."which-1.2.14" // {
-                dependencies = [
-                  sources."isexe-2.0.0"
-                ];
-              })
-            ];
-          })
-          (sources."debug-2.2.0" // {
-            dependencies = [
-              sources."ms-0.7.1"
-            ];
-          })
-        ];
-      })
-      (sources."helmet-3.5.0" // {
-        dependencies = [
-          (sources."connect-3.6.0" // {
-            dependencies = [
-              (sources."debug-2.6.1" // {
-                dependencies = [
-                  sources."ms-0.7.2"
-                ];
-              })
-              (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"
-                ];
-              })
-              sources."parseurl-1.3.1"
-              sources."utils-merge-1.0.0"
-            ];
-          })
-          sources."dns-prefetch-control-0.1.0"
-          sources."dont-sniff-mimetype-1.0.0"
-          sources."frameguard-3.0.0"
-          (sources."helmet-csp-2.4.0" // {
-            dependencies = [
-              sources."camelize-1.0.0"
-              (sources."content-security-policy-builder-1.1.0" // {
-                dependencies = [
-                  sources."dashify-0.2.2"
-                ];
-              })
-              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-2.0.0"
-          (sources."hsts-2.0.0" // {
-            dependencies = [
-              sources."core-util-is-1.0.2"
-            ];
-          })
-          sources."ienoopen-1.0.0"
-          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."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."jankyqueue-0.1.1"
-      (sources."jsdom-7.2.2" // {
-        dependencies = [
-          sources."abab-1.0.3"
-          sources."acorn-2.7.0"
-          sources."acorn-globals-1.0.9"
-          sources."cssom-0.3.2"
-          sources."cssstyle-0.2.37"
-          (sources."escodegen-1.8.1" // {
-            dependencies = [
-              sources."estraverse-1.9.3"
-              sources."esutils-2.0.2"
-              sources."esprima-2.7.3"
-              (sources."optionator-0.8.2" // {
-                dependencies = [
-                  sources."prelude-ls-1.1.2"
-                  sources."deep-is-0.1.3"
-                  sources."wordwrap-1.0.0"
-                  sources."type-check-0.3.2"
-                  sources."levn-0.3.0"
-                  sources."fast-levenshtein-2.0.6"
-                ];
-              })
-              (sources."source-map-0.2.0" // {
-                dependencies = [
-                  sources."amdefine-1.0.1"
-                ];
-              })
-            ];
-          })
-          sources."nwmatcher-1.3.9"
-          sources."parse5-1.5.1"
-          (sources."request-2.81.0" // {
-            dependencies = [
-              sources."aws-sign2-0.6.0"
-              sources."aws4-1.6.0"
-              sources."caseless-0.12.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-4.2.1" // {
-                dependencies = [
-                  (sources."ajv-4.11.5" // {
-                    dependencies = [
-                      sources."co-4.6.0"
-                      (sources."json-stable-stringify-1.0.1" // {
-                        dependencies = [
-                          sources."jsonify-0.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."har-schema-1.0.5"
-                ];
-              })
-              (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.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.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.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.15" // {
-                dependencies = [
-                  sources."mime-db-1.27.0"
-                ];
-              })
-              sources."oauth-sign-0.8.2"
-              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.6.0"
-            ];
-          })
-          sources."sax-1.2.2"
-          sources."symbol-tree-3.2.2"
-          (sources."tough-cookie-2.3.2" // {
-            dependencies = [
-              sources."punycode-1.4.1"
-            ];
-          })
-          sources."webidl-conversions-2.0.1"
-          (sources."whatwg-url-compat-0.6.5" // {
-            dependencies = [
-              sources."tr46-0.0.3"
-            ];
-          })
-          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."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.6.1" // {
-        dependencies = [
-          (sources."glob-7.1.1" // {
-            dependencies = [
-              sources."fs.realpath-1.0.0"
-              (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."sanitize-html-1.14.1" // {
-        dependencies = [
-          (sources."htmlparser2-3.9.2" // {
-            dependencies = [
-              sources."domelementtype-1.3.0"
-              sources."domhandler-2.3.0"
-              (sources."domutils-1.5.1" // {
-                dependencies = [
-                  (sources."dom-serializer-0.1.0" // {
-                    dependencies = [
-                      sources."domelementtype-1.1.3"
-                    ];
-                  })
-                ];
-              })
-              sources."entities-1.1.1"
-              sources."inherits-2.0.3"
-              (sources."readable-stream-2.2.6" // {
-                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."regexp-quote-0.0.0"
-          sources."xtend-4.0.1"
-        ];
-      })
-      sources."schlock-0.2.1"
-      (sources."send-0.13.2" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."depd-1.1.0"
-          sources."destroy-1.0.4"
-          sources."escape-html-1.0.3"
-          sources."etag-1.7.0"
-          sources."fresh-0.3.0"
-          (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."range-parser-1.0.3"
-          sources."statuses-1.2.1"
-        ];
-      })
-      (sources."showdown-1.6.4" // {
-        dependencies = [
-          (sources."yargs-6.6.0" // {
-            dependencies = [
-              sources."camelcase-3.0.0"
-              (sources."cliui-3.2.0" // {
-                dependencies = [
-                  (sources."strip-ansi-3.0.1" // {
-                    dependencies = [
-                      sources."ansi-regex-2.1.1"
-                    ];
-                  })
-                  sources."wrap-ansi-2.1.0"
-                ];
-              })
-              sources."decamelize-1.2.0"
-              sources."get-caller-file-1.0.2"
-              (sources."os-locale-1.4.0" // {
-                dependencies = [
-                  (sources."lcid-1.0.0" // {
-                    dependencies = [
-                      sources."invert-kv-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.1" // {
-                                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.6" // {
-                        dependencies = [
-                          sources."hosted-git-info-2.4.1"
-                          (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."require-directory-2.1.1"
-              sources."require-main-filename-1.0.1"
-              sources."set-blocking-2.0.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."which-module-1.0.0"
-              sources."y18n-3.2.1"
-              sources."yargs-parser-4.2.1"
-            ];
-          })
-        ];
-      })
-      (sources."sockjs-0.3.18" // {
-        dependencies = [
-          (sources."faye-websocket-0.10.0" // {
-            dependencies = [
-              (sources."websocket-driver-0.6.5" // {
-                dependencies = [
-                  sources."websocket-extensions-0.1.1"
-                ];
-              })
-            ];
-          })
-          sources."uuid-2.0.3"
-        ];
-      })
-      (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" // {
-        dependencies = [
-          sources."underscore-1.6.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.2"
-            ];
-          })
-        ];
-      })
-      (sources."databank-mongodb-1.0.0" // {
-        dependencies = [
-          (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.25" // {
-            dependencies = [
-              sources."es6-promise-3.2.1"
-              (sources."mongodb-core-2.1.9" // {
-                dependencies = [
-                  sources."bson-1.0.4"
-                  (sources."require_optional-1.0.0" // {
-                    dependencies = [
-                      sources."semver-5.3.0"
-                      sources."resolve-from-2.0.0"
-                    ];
-                  })
-                ];
-              })
-              (sources."readable-stream-2.1.5" // {
-                dependencies = [
-                  sources."buffer-shims-1.0.0"
-                  sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-            ];
-          })
-        ];
-      })
-      (sources."databank-redis-0.19.6" // {
-        dependencies = [
-          sources."async-0.9.2"
-          sources."redis-0.10.3"
-          sources."underscore-1.6.0"
-        ];
-      })
-      (sources."databank-lrucache-0.1.3" // {
-        dependencies = [
-          sources."databank-1.0.1"
-          (sources."lru-cache-4.0.2" // {
-            dependencies = [
-              sources."pseudomap-1.0.2"
-              sources."yallist-2.1.2"
-            ];
-          })
-          sources."setimmediate-1.0.5"
-        ];
-      })
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      homepage = http://pump.io/;
-      license = "Apache-2.0";
-    };
-    production = true;
-  };
-in
-{
-  tarball = nodeEnv.buildNodeSourceDist args;
-  package = nodeEnv.buildNodePackage args;
-  shell = nodeEnv.buildNodeShell args;
-}
\ No newline at end of file
diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..946606e37013f6bff8432415aef38e4d6cb2547d
--- /dev/null
+++ b/pkgs/servers/web-apps/restya-board/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, unzip }:
+
+let
+
+  hide-card-id = fetchurl {
+    url = "https://github.com/RestyaPlatform/board-apps/releases/download/v2/r_hide_card_id-v0.1.2.zip";
+    sha256 = "1scm696rs8wx0z2y0g6r9vf01b0yay79azw8n785c6zdvrbqw7dp";
+  };
+
+  togetherjs = fetchurl {
+    url = "https://github.com/RestyaPlatform/board-apps/releases/download/v2/r_togetherjs-v0.1.2.zip";
+    sha256 = "1kms7z0ci15plwbs6nxvz15w0ym3in39msbncaj3cn0p72kvx5cm";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "rstya-board-${version}";
+  version = "0.6";
+
+  src = fetchurl {
+    url = "https://github.com/RestyaPlatform/board/releases/download/v${version}/board-v${version}.zip";
+    sha256 = "1js8c69qmga7bikp66fqhch3n2vw49918z32q88lz3havqzai8gd";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  buildCommand = ''
+    mkdir $out
+    unzip -d $out $src
+
+    cd $out
+    patch -p1 < ${./fix_request-uri.patch}
+
+    chmod +x $out/server/php/shell/*.sh
+
+    mkdir $out/client/apps
+    unzip -d $out/client/apps ${hide-card-id}
+    unzip -d $out/client/apps ${togetherjs}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Web-based kanban board";
+    license = licenses.osl3;
+    homepage = http://restya.com;
+    maintainers = with maintainers; [ tstrobel ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/servers/web-apps/restya-board/fix_request-uri.patch b/pkgs/servers/web-apps/restya-board/fix_request-uri.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9b96756e8299dd0529fa57f940f95fae96d51591
--- /dev/null
+++ b/pkgs/servers/web-apps/restya-board/fix_request-uri.patch
@@ -0,0 +1,12 @@
+diff --git a/server/php/R/r.php b/server/php/R/r.php
+--- a/server/php/R/r.php
++++ b/server/php/R/r.php
+@@ -18,7 +18,7 @@ $r_debug = '';
+ $authUser = $client = $form = array();
+ $_server_protocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') ? 'https' : 'http';
+ $_server_domain_url = $_server_protocol . '://' . $_SERVER['HTTP_HOST']; // http://localhost
+-header('x-response-url:' . $_SERVER[REQUEST_URI]);
++header('x-response-url:' . $_SERVER['REQUEST_URI']);
+ header('Access-Control-Allow-Origin: *');
+ header('Access-Control-Allow-Methods: *');
+ require_once '../config.inc.php';
diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix
index 1c5f52d4938ec455ea43adf04da111dcc23acad2..3835f5ae33242143c1955797eb2145e8adad86ec 100644
--- a/pkgs/servers/web-apps/searx/default.nix
+++ b/pkgs/servers/web-apps/searx/default.nix
@@ -1,38 +1,47 @@
 { lib, pythonPackages, fetchFromGitHub }:
 
-pythonPackages.buildPythonApplication rec {
-  name = "searx-${version}";
-  version = "0.12.0";
-  namePrefix = "";
+with pythonPackages;
 
+buildPythonApplication rec {
+  pname = "searx";
+  version = "0.14.0";
+
+  # Can not use PyPI because certain test files are missing.
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = "searx";
     rev = "v${version}";
-    sha256 = "196lk8dpv8fsjgmwlqik6j6rabvfid41fir6lzqy03hv7ydcw1k0";
+    sha256 = "046xg6xcs1mxgahz7kwf3fsmwd99q3hhms6pdjlvyczidlfhpmxl";
   };
 
   postPatch = ''
     substituteInPlace requirements.txt \
-      --replace 'certifi==2017.1.23' 'certifi' \
-      --replace 'lxml==3.7.3' 'lxml' \
-      --replace 'pyopenssl==16.2.0' 'pyopenssl' \
+      --replace 'certifi==2017.11.5' 'certifi' \
+      --replace 'flask==0.12.2' 'flask==0.12.*' \
+      --replace 'flask-babel==0.11.2' 'flask-babel==0.11.*' \
+      --replace 'lxml==4.1.1' 'lxml==4.1.*' \
+      --replace 'idna==2.5' 'idna' \
       --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \
-      --replace 'flask==0.12' 'flask==0.12.*' \
-      --replace 'requests[socks]==2.13.0' 'requests[socks]==2.*' \
-      --replace 'python-dateutil==2.6.0' 'python-dateutil==2.6.*'
+      --replace 'pyopenssl==17.4.0' 'pyopenssl' \
+      --replace 'python-dateutil==2.6.1' 'python-dateutil==2.6.*'
   '';
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = [
     pyyaml lxml grequests flaskbabel flask requests
     gevent speaklater Babel pytz dateutil pygments
     pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
   ];
 
+  checkInputs = [ splinter mock plone-testing robotsuite unittest2 ];
+
+  preCheck = ''
+    rm tests/test_robot.py # A variable that is imported is commented out
+  '';
+
   meta = with lib; {
     homepage = https://github.com/asciimoo/searx;
     description = "A privacy-respecting, hackable metasearch engine";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ matejc fpletz profpatsch ];
+    maintainers = with maintainers; [ matejc fpletz ];
   };
 }
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index a74221cfbd33531a796a68d7668adc8bb27cd16e..8f6722ed86ecc096421a3f5708eac9a757732a12 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.9.2";
+  version = "0.9.6";
 
   src = fetchurl {
     url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
-    sha256 = "07wn5pg7pkya8d4k2khp2jyvkdkmm5431fj1k0m1i5k65yyvfqzr";
+    sha256 = "0vi59988bjxb1cyifh0fynpxa7l6cl0v57hrxima5c9iid10pw54";
   };
 
   outputs = [ "out" "doc" ];
diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix
index 9831d7dabce14c2f1b5d81aa1984275e1dfa17c4..939976b0a2694c8bfa922cddec0141746304287a 100644
--- a/pkgs/servers/web-apps/shaarli/material-theme.nix
+++ b/pkgs/servers/web-apps/shaarli/material-theme.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "shaarli-material-${version}";
-  version = "0.9.1";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "kalvn";
     repo = "Shaarli-Material";
     rev = "v${version}";
-    sha256 = "0x8d9425n3jrwzsyxclbxfspvi91v1klq8r3m6wcj81kys7vmzgh";
+    sha256 = "1bxw74ksvfv46995iwc7jhvl78hd84lcq3h9iyxvs8gpkhkapv55";
   };
 
   patchPhase = ''
     for f in material/*.html
     do
       substituteInPlace $f \
-        --replace '.min.css"' '.min.css#"' \
-        --replace '.min.js"'  '.min.js#"' \
+        --replace '.min.css?v={$version_hash}"' '.min.css#"' \
+        --replace '.min.js?v={$version_hash}"'  '.min.js#"' \
         --replace '.png"'     '.png#"'
     done
   '';
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index 215e9fade0aa834e8ee0ae0fd58a24197f71da6e..c0d5876a3a2dec5accd3dce2d7f852e37904b77d 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -2,28 +2,24 @@
 
 stdenv.mkDerivation rec {
   name = "wallabag-${version}";
-  version = "2.2.3";
+  version = "2.3.2";
 
   # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
 
   src = fetchurl {
     url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz";
-    sha256 = "0myqarwny9p53g2gmwmg1mcn17jlx5ah0bri13panhf7ryvmrzhk";
+    sha256 = "17yczdvgl43j6wa7hksxi2b51afvyd56vdya6hbbv68iiba4jyh4";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" ];
 
-  patchPhase = ''
+  patches = [ ./wallabag-data.patch ]; # exposes $WALLABAG_DATA
+
+  prePatch = ''
     rm Makefile # use the "shared hosting" package with bundled dependencies
-    substituteInPlace app/AppKernel.php \
-      --replace "__DIR__" "getenv('WALLABAG_DATA')"
-    substituteInPlace var/bootstrap.php.cache \
-      --replace "\$this->rootDir = \$this->getRootDir()" "\$this->rootDir = getenv('WALLABAG_DATA')"
-  ''; # exposes $WALLABAG_DATA
+  '';
 
   installPhase = ''
-    mkdir -p $doc/share/doc
-    mv docs $doc/share/doc/wallabag
     mkdir $out/
     cp -R * $out/
   '';
@@ -33,11 +29,12 @@ stdenv.mkDerivation rec {
     longDescription = ''
       wallabag is a self hostable application for saving web pages.
 
-      To use, point the environment variable $WALLABAG_DATA to a directory called `app` that contains the folder `config` with wallabag's configuration files. These need to be updated every package upgrade. In `app`'s parent folder, a directory called `var` containing wallabag's data will be created.
+      Point the environment variable $WALLABAG_DATA to a data directory that contains the folder `app/config` which must be a clone of wallabag's configuration files with your customized `parameters.yml`. These need to be updated every package upgrade.
       After a package upgrade, empty the `var/cache` folder.
     '';
     license = licenses.mit;
     homepage = http://wallabag.org;
+    maintainers = with maintainers; [ schneefux ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/servers/web-apps/wallabag/wallabag-data.patch
new file mode 100644
index 0000000000000000000000000000000000000000..086e93959800e3a4ec9620b4f45fcc3792d57704
--- /dev/null
+++ b/pkgs/servers/web-apps/wallabag/wallabag-data.patch
@@ -0,0 +1,26 @@
+diff --git a/app/AppKernel.php b/app/AppKernel.php
+index 40726f05..7d44e600 100644
+--- a/app/AppKernel.php
++++ b/app/AppKernel.php
+@@ -58,14 +58,19 @@ class AppKernel extends Kernel
+         return $bundles;
+     }
+ 
++    public function getProjectDir()
++    {
++        return getenv('WALLABAG_DATA') ?: dirname(__DIR__);
++    }
++
+     public function getCacheDir()
+     {
+-        return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
++        return $this->getProjectDir() . '/var/cache/' . $this->getEnvironment();
+     }
+ 
+     public function getLogDir()
+     {
+-        return dirname(__DIR__) . '/var/logs';
++        return $this->getProjectDir() . '/var/logs';
+     }
+ 
+     public function registerContainerConfiguration(LoaderInterface $loader)
diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index bb07c42b872c6fd437d10920515294ce50601d2c..57254713f4b0361c34a067d006d50f2af74f6f79 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,8 +2,8 @@
 { fetchFromGitHub, lib } : fetchFromGitHub {
   owner = "WordPress";
   repo = "WordPress";
-  rev = "4.8.3";
-  sha256 = "077bdx22sj29v8q493b49xfzxpc38q45pjhmn4znw2fmkjilih5p";
+  rev = "4.9.1";
+  sha256 = "0d931mv6wbgnc7f15nisnn5al0ffi19zya2iwdzw98s4klpaq955";
   meta = {
     homepage = https://wordpress.org;
     description = "WordPress is open source software you can use to create a beautiful website, blog, or app.";
diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix
index 45e4df2bb8b933564bbca4a0ef868126f92df1b4..d724a81debbb703d314a5e91f5a9f5d003dea999 100644
--- a/pkgs/servers/x11/quartz-wm/default.nix
+++ b/pkgs/servers/x11/quartz-wm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, AppKit, Xplugin }:
+{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, AppKit, Xplugin, darwin }:
 
 let version = "1.3.1";
 in stdenv.mkDerivation {
@@ -19,13 +19,11 @@ in stdenv.mkDerivation {
     xorg.libXext
     pixman
     pkgconfig
-    AppKit Xplugin
+    AppKit Xplugin darwin.apple_sdk.frameworks.Foundation
   ];
-  NIX_CFLAGS_COMPILE = "-F/System/Library/Frameworks -I/usr/include";
-  NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
-    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
   meta = with lib; {
     license = licenses.apsl20;
     platforms = platforms.darwin;
+    maintainers = with maintainers; [ matthewbauer ];
   };
 }
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index fae8bf5a8ce5a747deb52c8ad71e80beee269fb5..5a832cb14d53985978138106b449ffe5b0665826 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -17,21 +17,12 @@ postInstall() {
     echo "propagating requisites $requires"
 
     for r in $requires; do
-        if test -n "$crossConfig"; then
-            for p in "${crossPkgs[@]}"; do
-                if test -e $p/lib/pkgconfig/$r.pc; then
-                    echo "  found requisite $r in $p"
-                    propagatedBuildInputs="$propagatedBuildInputs $p"
-                fi
-            done
-        else
-            for p in "${nativePkgs[@]}"; do
-                if test -e $p/lib/pkgconfig/$r.pc; then
-                    echo "  found requisite $r in $p"
-                    propagatedNativeBuildInputs="$propagatedNativeBuildInputs $p"
-                fi
-            done
-        fi
+        for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do
+            if test -e $p/lib/pkgconfig/$r.pc; then
+                echo "  found requisite $r in $p"
+                propagatedBuildInputs+=" $p"
+            fi
+        done
     done
 }
 
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4161df6ae8b980a58470a10170a741966d21c4d2..07faa8d3cc7e83648dfd039838492458c3e095f0 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1,6 +1,6 @@
 # THIS IS A GENERATED FILE.  DO NOT EDIT!
 args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig
-, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol
+, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol
 , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook
 , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;
 
@@ -44,16 +44,16 @@ let
   }) // {inherit libX11 xproto libXt ;};
 
   bdftopcf = (mkDerivation "bdftopcf" {
-    name = "bdftopcf-1.0.5";
+    name = "bdftopcf-1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2;
-      sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q";
+      url = mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2;
+      sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ libXfont ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
-  }) // {inherit libXfont ;};
+  }) // {inherit ;};
 
   bigreqsproto = (mkDerivation "bigreqsproto" {
     name = "bigreqsproto-1.1.2";
@@ -67,6 +67,18 @@ let
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
+  bitmap = (mkDerivation "bitmap" {
+    name = "bitmap-1.0.8";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz;
+      sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs";
+    };
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ libX11 libXaw xbitmaps libXmu xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
+  }) // {inherit libX11 libXaw xbitmaps libXmu xproto libXt ;};
+
   compositeproto = (mkDerivation "compositeproto" {
     name = "compositeproto-0.4.2";
     builder = ./builder.sh;
@@ -788,11 +800,11 @@ let
   }) // {inherit compositeproto libX11 libXfixes xproto ;};
 
   libXcursor = (mkDerivation "libXcursor" {
-    name = "libXcursor-1.1.14";
+    name = "libXcursor-1.1.15";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2;
-      sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv";
+      url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2;
+      sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ];
@@ -836,11 +848,11 @@ let
   }) // {inherit libX11 xextproto xproto ;};
 
   libXfixes = (mkDerivation "libXfixes" {
-    name = "libXfixes-5.0.2";
+    name = "libXfixes-5.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2;
-      sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv";
+      url = mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2;
+      sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ fixesproto libX11 xextproto xproto ];
@@ -848,11 +860,11 @@ let
   }) // {inherit fixesproto libX11 xextproto xproto ;};
 
   libXfont = (mkDerivation "libXfont" {
-    name = "libXfont-1.5.3";
+    name = "libXfont-1.5.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2;
-      sha256 = "1l4k3i3xzqdmaszykh6bb2ah78p6c3z7fak7xzgq2d38s87w31db";
+      url = mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2;
+      sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ];
@@ -860,11 +872,11 @@ let
   }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
   libXfont2 = (mkDerivation "libXfont2" {
-    name = "libXfont2-2.0.2";
+    name = "libXfont2-2.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2;
-      sha256 = "04f1lswh1ridkycgaivf1hrr77l5ap8smbfr2rqjrm7phwxqs24l";
+      url = mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2;
+      sha256 = "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ];
@@ -1100,11 +1112,11 @@ let
   }) // {inherit xproto zlib ;};
 
   libpciaccess = (mkDerivation "libpciaccess" {
-    name = "libpciaccess-0.13.5";
+    name = "libpciaccess-0.14";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2;
-      sha256 = "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m";
+      url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2;
+      sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ zlib ];
@@ -1352,11 +1364,11 @@ let
   }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
   utilmacros = (mkDerivation "utilmacros" {
-    name = "util-macros-1.19.1";
+    name = "util-macros-1.19.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2;
-      sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q";
+      url = mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2;
+      sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ ];
@@ -1748,11 +1760,11 @@ let
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
-    name = "xf86-input-libinput-0.25.0";
+    name = "xf86-input-libinput-0.26.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2;
-      sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv";
+      url = mirror://xorg/individual/driver/xf86-input-libinput-0.26.0.tar.bz2;
+      sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ inputproto xorgserver xproto ];
@@ -1827,9 +1839,9 @@ let
       sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    buildInputs = [ fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
-  }) // {inherit fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  }) // {inherit fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videoark = (mkDerivation "xf86videoark" {
     name = "xf86-video-ark-0.7.5";
@@ -1856,11 +1868,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoati = (mkDerivation "xf86videoati" {
-    name = "xf86-video-ati-7.9.0";
+    name = "xf86-video-ati-18.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2;
-      sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w";
+      url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2;
+      sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
@@ -2252,11 +2264,11 @@ let
   }) // {inherit randrproto videoproto xorgserver xproto ;};
 
   xf86videovesa = (mkDerivation "xf86videovesa" {
-    name = "xf86-video-vesa-2.3.4";
+    name = "xf86-video-vesa-2.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2;
-      sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv";
+      url = mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2;
+      sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
@@ -2384,11 +2396,11 @@ let
   }) // {inherit ;};
 
   xinit = (mkDerivation "xinit" {
-    name = "xinit-1.3.4";
+    name = "xinit-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xinit-1.3.4.tar.bz2;
-      sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m";
+      url = mirror://xorg/individual/app/xinit-1.4.0.tar.bz2;
+      sha256 = "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 xproto ];
@@ -2558,6 +2570,9 @@ let
       url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
       sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
     };
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
+    '';
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -2576,11 +2591,11 @@ let
   }) // {inherit ;};
 
   xorgserver = (mkDerivation "xorgserver" {
-    name = "xorg-server-1.19.5";
+    name = "xorg-server-1.19.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2;
-      sha256 = "0iql4pgsgpyqcrd3256pv227cdadvz01ych61n0d41ixp67gmzqq";
+      url = mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2;
+      sha256 = "15y13ihgkggmly5s07vzvpn35gzx1w0hrkbnlcvcy05h3lpm0cm7";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 1f3557dff66e704aeaf9ad145c479ec4e0afa024..9f21d3c2024b4ce5b052c86f515d32f0731e0fdb 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#! /usr/bin/env perl
 
 # Typical command to generate the list of tarballs:
 
@@ -11,6 +11,7 @@
 
 
 use strict;
+use warnings;
 
 my $tmpDir = "/tmp/xorg-unpack";
 
@@ -25,7 +26,7 @@ my %pcMap;
 my %extraAttrs;
 
 
-my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4");
+my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4");
 $pcMap{$_} = $_ foreach @missingPCs;
 $pcMap{"freetype2"} = "freetype";
 $pcMap{"libpng12"} = "libpng";
@@ -33,7 +34,7 @@ $pcMap{"libpng"} = "libpng";
 $pcMap{"dbus-1"} = "dbus";
 $pcMap{"uuid"} = "libuuid";
 $pcMap{"libudev"} = "udev";
-$pcMap{"gl"} = "mesa";
+$pcMap{"gl"} = "libGL";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "renderproto";
 $pcMap{"\$DRI3PROTO"} = "dri3proto";
@@ -230,7 +231,7 @@ print OUT "";
 print OUT <> conf/biboumi.cfg
     # TODO include conf/biboumi.cfg as example somewhere
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 2799241fa990a8d78e73460f2b4346f11454fc25..f95b5efe3d38c3d45d16dddc03a34a0c34968fd0 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,5 +1,6 @@
 { stdenv, writeScriptBin, lib, fetchurl, git, cacert
-, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps
+, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd
+, flock
 , withMysql ? false
 , withPgsql ? false
 , withSqlite ? false, sqlite
@@ -23,17 +24,17 @@ let
   ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
 
 in stdenv.mkDerivation rec {
-  version = "17.07";
+  version = "18.01";
   name = "ejabberd-${version}";
 
   src = fetchurl {
     url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "1p8ppp2czjgnq8xnhyksd82npvvx99fwr0g3rrq1wvnwh2vgb8km";
+    sha256 = "01i2n8mlgw293jdf4172f9q8ca8m35vysjws791p7nynpfdb4cn6";
   };
 
   nativeBuildInputs = [ fakegit ];
 
-  buildInputs = [ erlang openssl expat libyaml ]
+  buildInputs = [ erlang openssl expat libyaml gd ]
     ++ lib.optional withSqlite sqlite
     ++ lib.optional withPam pam
     ++ lib.optional withZlib zlib
@@ -50,7 +51,7 @@ in stdenv.mkDerivation rec {
 
     configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];
 
-    buildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];
+    nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];
 
     GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
@@ -74,7 +75,7 @@ in stdenv.mkDerivation rec {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "1q9yzccn4zf5i4hibq1r0i34q4986a93ph4792l1ph07aiisc8p7";
+    outputHash = "1v3h0c7kfifb6wsfxyv5j1wc7rlxbb7r0pgd4s340wiyxnllzzhk";
   };
 
   configureFlags =
@@ -101,18 +102,18 @@ in stdenv.mkDerivation rec {
   postInstall = ''
     sed -i \
       -e '2iexport PATH=${ctlpath}:$PATH' \
-      -e 's,\(^ *FLOCK=\).*,\1${utillinux}/bin/flock,' \
+      -e 's,\(^ *FLOCK=\).*,\1${flock}/bin/flock,' \
       -e 's,\(^ *JOT=\).*,\1,' \
       -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \
       $out/sbin/ejabberdctl
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open-source XMPP application server written in Erlang";
-    license = lib.licenses.gpl2;
+    license = licenses.gpl2;
     homepage = http://www.ejabberd.im;
-    platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.sander lib.maintainers.abbradar ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ sander abbradar ];
     broken = withElixir;
   };
 }
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 3285456a34858b84c1558a591d7d0bc3209aed89..2d0e1a529dac9a39d2504fe2f06fc54c85d725dd 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -1,16 +1,22 @@
 { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg
-, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null
-, withLibevent ? true, withZlib ? true }:
+, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop
+, withLibevent ? true, luaevent ? null
+, withDBI ? true, luadbi ? null
+# use withExtraLibs to add additional dependencies of community modules
+, withExtraLibs ? [ ]
+, withOnlyInstalledCommunityModules ? [ ]
+, withCommunityModules ? [ ] }:
 
 assert withLibevent -> luaevent != null;
-assert withZlib -> luazlib != null;
+assert withDBI -> luadbi != null;
 
 with stdenv.lib;
 
 let
   libs        = [ luasocket luasec luaexpat luafilesystem luabitop ]
                 ++ optional withLibevent luaevent
-                ++ optional withZlib luazlib;
+                ++ optional withDBI luadbi
+                ++ withExtraLibs;
   getPath     = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}";
   getLuaPath  = lib : getPath lib "lua";
   getLuaCPath = lib : getPath lib "so";
@@ -19,23 +25,22 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.9.12";
+  version = "0.10.0";
   name = "prosody-${version}";
 
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s";
+    sha256 = "1644jy5dk46vahmh6nna36s79k8k668sbi3qamjb4q3c4m3y853l";
   };
 
   communityModules = fetchhg {
-    url = "http://prosody-modules.googlecode.com/hg/";
-    rev = "4b55110b0aa8";
-    sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij";
+    url = "https://hg.prosody.im/prosody-modules";
+    rev = "150a7bd59043";
+    sha256 = "0nfx3lngcy88nd81gb7v4kh3nz1bzsm67bxgpd2lprk54diqcrz1";
   };
 
-  buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ]
-                ++ optional withLibevent luaevent
-                ++ optional withZlib luazlib;
+  buildInputs = [ lua5 makeWrapper libidn openssl ]
+    ++ optional withDBI luadbi;
 
   configureFlags = [
     "--ostype=linux"
@@ -44,7 +49,9 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-      cp $communityModules/mod_websocket/mod_websocket.lua $out/lib/prosody/modules/
+      ${concatMapStringsSep "\n" (module: ''
+        cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
+      '') (withCommunityModules ++ withOnlyInstalledCommunityModules)}
       wrapProgram $out/bin/prosody \
         --set LUA_PATH '${luaPath};' \
         --set LUA_CPATH '${luaCPath};'
@@ -54,11 +61,13 @@ stdenv.mkDerivation rec {
         --set LUA_CPATH '${luaCPath};'
     '';
 
+  passthru.communityModules = withCommunityModules;
+
   meta = {
     description = "Open-source XMPP application server written in Lua";
     license = licenses.mit;
-    homepage = http://www.prosody.im;
+    homepage = https://prosody.im;
     platforms = platforms.linux;
-    maintainers = [ maintainers.flosse ];
+    maintainers = with maintainers; [ fpletz globin ];
   };
 }
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index 4e15f472744df31d7ef8e83958056104470ea8ac..c90684e0fe0dfb2435130cd8df4bc65822862342 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "zookeeper-${version}";
-  version = "3.4.10";
+  version = "3.4.11";
 
   src = fetchurl {
     url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
-    sha256 = "09rz4ac31932yxyyc8gqrnq1zxb9ahibrq51wbz13b24w0a58zvz";
+    sha256 = "110fs5manyaq6rxbzwzs9x3aqw8d5l4177y9qaj3xhgpr2hniggn";
   };
 
   buildInputs = [ makeWrapper jre ];
diff --git a/pkgs/shells/antigen/default.nix b/pkgs/shells/antigen/default.nix
deleted file mode 100644
index b43f2d3057018b79c654b1a353be753f6ec24bea..0000000000000000000000000000000000000000
--- a/pkgs/shells/antigen/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  version = "2.2.1";
-  name = "antigen-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/zsh-users/antigen/releases/download/v${version}/antigen.zsh";
-    sha256 = "0s32280ak0gd0rr66g5dj6r5px0si8w47bcxlqfpaijg7i8xk1i7";
-  };
-  phases = "installPhase";
-
-  installPhase = ''
-    outdir=$out/share/antigen
-
-    mkdir -p $outdir
-    cp $src $outdir/antigen.zsh
-  '';
-
-  meta = {
-    description = "The plugin manager for zsh.";
-    homepage = http://antigen.sharats.me;
-    license = stdenv.lib.licenses.mit;
-  };
-}
diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
deleted file mode 100644
index 1c1b83d67b95cf6054baccc28c8e6dae9acc1a62..0000000000000000000000000000000000000000
--- a/pkgs/shells/bash-completion/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "bash-completion-${version}";
-  version = "2.7";
-
-  src = fetchurl {
-    url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";
-    sha256 = "07j484vb3k90f4989xh1g1x99g01akrp69p3dml4lza27wnqkfj1";
-  };
-
-  doCheck = true;
-
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i -e 's/readlink -f/readlink/g' bash_completion completions/*
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/scop/bash-completion;
-    description = "Programmable completion for the bash shell";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.peti ];
-  };
-}
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index b4a2ba5538816329087547b528d1dd350e261031..04a036982893603d555c4facac16ec12a80c2377 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPackages
-, fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison
+, fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison, autoconf
 , buildPlatform, hostPlatform
 , interactive ? false
 }:
@@ -36,9 +36,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  outputs = [ "out" "dev" "doc" "info" ]
-    # the man pages are small and useful enough, so include them in $out in interactive builds
-    ++ stdenv.lib.optional (!interactive) "man";
+  outputs = [ "out" "dev" "man" "doc" "info" ];
 
   NIX_CFLAGS_COMPILE = ''
     -DSYS_BASHRC="/etc/bashrc"
@@ -51,7 +49,12 @@ stdenv.mkDerivation rec {
 
   patchFlags = "-p0";
 
-  patches = upstreamPatches;
+  patches = upstreamPatches
+    # https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00006.html
+    ++ optional (hostPlatform.libc == "musl") (fetchurl {
+      url = "https://lists.gnu.org/archive/html/bug-bash/2016-10/patchJxugOXrY2y.patch";
+      sha256 = "1m4v9imidb1cc1h91f2na0b8y9kc5c5fgmpvy9apcyv2kbdcghg1";
+  });
 
   postPatch = optionalString hostPlatform.isCygwin "patch -p2 < ${./cygwin-bash-4.4.11-2.src.patch}";
 
@@ -65,13 +68,17 @@ stdenv.mkDerivation rec {
     "bash_cv_dev_stdin=present"
     "bash_cv_dev_fd=standard"
     "bash_cv_termcap_lib=libncurses"
+  ] ++ optionals (hostPlatform.libc == "musl") [
+    "--without-bash-malloc"
+    "--disable-nls"
   ];
 
   # Note: Bison is needed because the patches above modify parse.y.
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [bison]
     ++ optional (texinfo != null) texinfo
     ++ optional hostPlatform.isDarwin binutils
-    ++ optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;
+    ++ optional (hostPlatform.libc == "musl") autoconf;
 
   buildInputs = optional interactive readline70;
 
@@ -86,7 +93,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     ln -s bash "$out/bin/sh"
-    rm $out/lib/bash/Makefile.inc
+    rm -f $out/lib/bash/Makefile.inc
   '';
 
   postFixup = if interactive
@@ -96,7 +103,7 @@ stdenv.mkDerivation rec {
     ''
     # most space is taken by locale data
     else ''
-      rm -r "$out/share" "$out/bin/bashbug"
+      rm -rf "$out/share" "$out/bin/bashbug"
     '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix
index 741fb675d614544bb42148a77295b14d3f2ca861..2d5128120295a3e3e1266cc9a6fd629b32e612fa 100644
--- a/pkgs/shells/bash/bash-4.4-patches.nix
+++ b/pkgs/shells/bash/bash-4.4-patches.nix
@@ -13,4 +13,11 @@ patch: [
 (patch "010" "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4")
 (patch "011" "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx")
 (patch "012" "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps")
+(patch "013" "1djkx0w9v62q78gz3jsvamj1jq53i6hbfrfhhsw86ihwpjnfy98v")
+(patch "014" "0z5ikcq9zyxw79d0z36r5p0mspnb5piavbv03jmlan1wnknmrxx7")
+(patch "015" "09n307fi1j257abhm295k6ksmnzw47ka2zhnr0i5lbdnpvn04xnk")
+(patch "016" "1cgi1y6mifm8hsgv4avj5ih76535js3qba1sqwbfvp7si76927sh")
+(patch "017" "0w6jpj2giakji1ir83rpkx1y7n7xqppah3j748m6dm38hywr0gvp")
+(patch "018" "1k58h4wxbsg7r4rwhrvzx5hfbapba2nxjysbhh6qp6ki5ys99i2v")
+(patch "019" "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7")
 ]
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b5f600da8f7e902d3dfd1674d900a78206910d7b
--- /dev/null
+++ b/pkgs/shells/bash/bash-completion/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "bash-completion-${version}";
+  version = "2.8";
+
+  src = fetchurl {
+    url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";
+    sha256 = "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0";
+  };
+
+  doCheck = true;
+
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i -e 's/readlink -f/readlink/g' bash_completion completions/*
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/scop/bash-completion;
+    description = "Programmable completion for the bash shell";
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.peti ];
+  };
+}
diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..739dbd538a6e5852d03fc97053ce557d7a5040fd
--- /dev/null
+++ b/pkgs/shells/bash/nix-bash-completions/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "0.6.5";
+  name = "nix-bash-completions-${version}";
+
+  src = fetchFromGitHub {
+    owner = "hedning";
+    repo = "nix-bash-completions";
+    rev = "v${version}";
+    sha256 = "10f70jw81vky52s3fidf7vzl725fihiypsw39825wnkpynayhmrg";
+  };
+
+  # To enable lazy loading via. bash-completion we need a symlink to the script
+  # from every command name.
+  installPhase = ''
+    commands=$(
+      function complete() { shift 2; echo "$@"; }
+      shopt -s extglob
+      source _nix
+    )
+    install -Dm444 -t $out/share/bash-completion/completions _nix
+    cd $out/share/bash-completion/completions
+    for c in $commands; do
+      ln -s _nix $c
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/hedning/nix-bash-completions;
+    description = "Bash completions for Nix, NixOS, and NixOps";
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ hedning ];
+  };
+}
diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix
index 51319aef90aa13e9ed17d709c8e0f8928ddd593f..c3c2da329a9bd2a9380cbbfa4e8295631004dade 100644
--- a/pkgs/shells/dgsh/default.nix
+++ b/pkgs/shells/dgsh/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [ ./glibc-2.26.patch ];
+
   nativeBuildInputs = [ autoconf automake pkgconfig libtool check
     bison git gettext gperf perl texinfo help2man ncurses
   ];
@@ -31,6 +33,8 @@ stdenv.mkDerivation rec {
     make PREFIX=$out config
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "The Directed Graph Shell";
     homepage = http://www.dmst.aueb.gr/dds/sw/dgsh;
diff --git a/pkgs/shells/dgsh/glibc-2.26.patch b/pkgs/shells/dgsh/glibc-2.26.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c66768151316c8dd460804ce89cb0ebd7ff74bde
--- /dev/null
+++ b/pkgs/shells/dgsh/glibc-2.26.patch
@@ -0,0 +1,12 @@
+diff --git a/core-tools/src/dgsh-httpval.c b/core-tools/src/dgsh-httpval.c
+index 8b5dce3..7b43c3d 100644
+--- a/core-tools/src/dgsh-httpval.c
++++ b/core-tools/src/dgsh-httpval.c
+@@ -40,6 +40,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index a598d57808c4420822ac62fc3584035b9e7e6208..5a00a1ee4195118bc5ffbab4479073a55c8b93ab 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "elvish-${version}";
-  version = "0.10";
+  version = "0.11";
 
   goPackagePath = "github.com/elves/elvish";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     repo = "elvish";
     owner = "elves";
     rev = version;
-    sha256 = "0v6byd81nz0fbd3sdlippi1jn1z3gbqc2shnr7akd1n6k9259vrj";
+    sha256 = "1rzgy1ql381nwsdjgiwv4mdr1xwivnpmzgkdzms8ipn2lbwhff87";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 5832c8ef8911ed8848f4822e296a72555c5b5cb1..d6c107e995326782fa48900dcd58ba01b6b6a3f7 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, coreutils, utillinux,
   nettools, kbd, bc, which, gnused, gnugrep,
-  groff, man-db, glibc, libiconv, pcre2,
+  groff, man-db, getent, libiconv, pcre2,
   gettext, ncurses, python3
 
   , writeText
@@ -35,11 +35,11 @@ let
     #     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 ↑ ###############
   '';
@@ -88,13 +88,15 @@ let
 
   fish = stdenv.mkDerivation rec {
     name = "fish-${version}";
-    version = "2.6.0";
+    version = "2.7.1";
 
     etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
 
     src = fetchurl {
-      url = "http://fishshell.com/files/${version}/${name}.tar.gz";
-      sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby";
+      # There are differences between the release tarball and the tarball github packages from the tag
+      # Hence we cannot use fetchFromGithub
+      url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${name}.tar.gz";
+      sha256 = "0nhc3yc5lnnan7zmxqqxm07rdpwjww5ijy45ll2njdc6fnfb2az4";
     };
 
     buildInputs = [ ncurses libiconv pcre2 ];
@@ -140,7 +142,7 @@ let
       sed -e "s| ul| ${utillinux}/bin/ul|" \
           -i "$out/share/fish/functions/__fish_print_help.fish"
       for cur in $out/share/fish/functions/*.fish; do
-        sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \
+        sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \
             -i "$cur"
       done
 
@@ -157,6 +159,8 @@ let
       tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)}
     '';
 
+    enableParallelBuilding = true;
+
     meta = with stdenv.lib; {
       description = "Smart and user-friendly command line shell";
       homepage = http://fishshell.com/;
diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish/fish-foreign-env/default.nix
similarity index 100%
rename from pkgs/shells/fish-foreign-env/default.nix
rename to pkgs/shells/fish/fish-foreign-env/default.nix
diff --git a/pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch
similarity index 100%
rename from pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch
rename to pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch
diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/grml-zsh-config/default.nix
deleted file mode 100644
index d49e13e1eb355362742720fb96276992478d0e76..0000000000000000000000000000000000000000
--- a/pkgs/shells/grml-zsh-config/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchFromGitHub, lib
-, zsh, coreutils, inetutils, procps, txt2tags }:
-
-with lib;
-
-stdenv.mkDerivation rec {
-  name = "grml-zsh-config-${version}";
-  version = "0.14.2";
-
-  src = fetchFromGitHub {
-    owner = "grml";
-    repo = "grml-etc-core";
-    rev = "v${version}";
-    sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm";
-  };
-
-  buildInputs = [ zsh coreutils txt2tags ]
-    ++ optional stdenv.isLinux [ inetutils procps ];
-
-  buildPhase = ''
-    cd doc
-    make
-    cd ..
-  '';
-
-  installPhase = ''
-    install -D -m644 etc/zsh/keephack $out/etc/zsh/keephack
-    install -D -m644 etc/zsh/zshrc $out/etc/zsh/zshrc
-
-    install -D -m644 doc/grmlzshrc.5 $out/share/man/man5/grmlzshrc.5
-    ln -s grmlzshrc.5.gz $out/share/man/man5/grml-zsh-config.5.gz
-  '';
-
-  meta = with stdenv.lib; {
-    description = "grml's zsh setup";
-    homepage = http://grml.org/zsh/;
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ msteen rvolosatovs ];
-  };
-}
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 969392309833ddd69859c8037cbcd49cf7faad6a..7c2caa96d898bb59e713b1ca30469e3a764e0833 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "mksh-${version}";
-  version = "56b";
+  version = "56c";
 
   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 = "0zwsikj0gvbg693xydgmhq19hz7m5bics1w9w7j86r95xi779v20";
+    sha256 = "0xzv5b83b8ccn3d4qvwz3gk83fi1d42kphax1527nni1472fp1nx";
   };
 
   buildPhase = ''sh ./Build.sh -r -c lto'';
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://www.mirbsd.org/mksh.htm;
     license = licenses.bsd3;
-    maintainers = with maintainers; [ AndersonTorres nckx joachifm ];
+    maintainers = with maintainers; [ AndersonTorres joachifm ];
     platforms = platforms.unix;
   };
 
diff --git a/pkgs/shells/nix-bash-completions/default.nix b/pkgs/shells/nix-bash-completions/default.nix
deleted file mode 100644
index be0ac14ca91e556d577d00fa16da245b2db58618..0000000000000000000000000000000000000000
--- a/pkgs/shells/nix-bash-completions/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  version = "0.4";
-  name = "nix-bash-completions-${version}";
-
-  src = fetchFromGitHub {
-    owner = "hedning";
-    repo = "nix-bash-completions";
-    rev = "v${version}";
-    sha256 = "08gl9xnk738p180hpn3l7ggrz5zlky4pam7v74kb0gavjxm4fa2f";
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/bash-completion/completions
-    cp _nix $out/share/bash-completion/completions
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://github.com/hedning/nix-bash-completions;
-    description = "Bash completions for Nix, NixOS, and NixOps";
-    license = licenses.bsd3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ hedning ];
-  };
-}
diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix
deleted file mode 100644
index 53888c30b9414cecbb008dd7559f6b2460cc9c2a..0000000000000000000000000000000000000000
--- a/pkgs/shells/nix-zsh-completions/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-let
-  version = "0.3.3";
-in
-
-stdenv.mkDerivation rec {
-  name = "nix-zsh-completions-${version}";
-
-  src = fetchFromGitHub {
-    owner = "spwhitt";
-    repo = "nix-zsh-completions";
-    rev = "${version}";
-    sha256 = "0gvqm6grz3s0llz20sa18n5d2anmsrk892lcv7blv8rai151whpw";
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/zsh/site-functions
-    cp _* $out/share/zsh/site-functions
-  '';
-
-  meta = {
-    homepage = https://github.com/spwhitt/nix-zsh-completions;
-    description = "ZSH completions for Nix, NixOS, and NixOps";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ];
-  };
-}
diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
deleted file mode 100644
index 8b8a67c2452a5eed48da0e5b2db9f46d449ed72f..0000000000000000000000000000000000000000
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-# This script was inspired by the ArchLinux User Repository package:
-#
-#   https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git
-{ stdenv, fetchgit }:
-
-stdenv.mkDerivation rec {
-  version = "2017-09-24";
-  name = "oh-my-zsh-${version}";
-
-  src = fetchgit {
-    url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "accdcb2f1c3cca40527fef1fe4ab2d39eb6cf897";
-    sha256 = "0jrixz02mdab63yr0s16sr8gzwzhf9xnhad852swnfp3c7qlq06z";
-  };
-
-  pathsToLink = [ "/share/oh-my-zsh" ];
-
-  phases = "installPhase";
-
-  installPhase = ''
-  outdir=$out/share/oh-my-zsh
-  template=templates/zshrc.zsh-template
-
-  mkdir -p $outdir
-  cp -r $src/* $outdir
-  cd $outdir
-
-  rm LICENSE.txt
-  rm -rf .git*
-
-  chmod -R +w templates
-
-  # Change the path to oh-my-zsh dir and disable auto-updating.
-  sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \
-         -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \
-   $template
-
-  # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source
-  # them, if found.
-  cat >> $template <<- EOF
-
-  # Load the variables.
-  if [ -f ~/.zsh_variables ]; then
-      . ~/.zsh_variables
-  fi
-
-  # Load the functions.
-  if [ -f ~/.zsh_funcs ]; then
-    . ~/.zsh_funcs
-  fi
-
-  # Load the aliases.
-  if [ -f ~/.zsh_aliases ]; then
-      . ~/.zsh_aliases
-  fi
-  EOF
-  '';
-
-  meta = with stdenv.lib; {
-  description     = "A framework for managing your zsh configuration";
-  longDescription = ''
-  Oh My Zsh is a framework for managing your zsh configuration.
-
-  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 | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
-  '';
-  homepage        = "http://ohmyz.sh/";
-  license         = licenses.mit;
-  platforms       = platforms.all;
-  maintainers     = with maintainers; [ scolobb nequissimus ];
-  };
-}
diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index ec7dbbbf5ffcc2ac62627d6ddd4f64c4630110a3..ab475a63499cb1215bd072614c0d25e240e9d0e4 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchurl, coreutils }:
 let
-  version = "0.1.0";
+  version = "0.3.0";
 in
 stdenv.mkDerivation {
   name = "oil-${version}";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "0cf7jwwgvcq7q6zq8g5pi464hnn83b2km0nv6711qgqbxmsw85nx";
+    sha256 = "0j4fyn6xjaf29xqyzm09ahazmq9v1hkxv4kps7n3lzdfr32a4kk9";
   };
 
   postPatch = ''
diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix
index 8280897c47ae2b6a35477ba2a2d98a00adbbe04d..9a5f7a753d338e922d590a4b27809c8bce8ca7ff 100644
--- a/pkgs/shells/rush/default.nix
+++ b/pkgs/shells/rush/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz";
   };
 
-  patches = [ ./fix-format-security-error.patch ];
+  patches = [ ./fix-format-security-error.patch
+    ./intprops.patch
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/shells/rush/gets.patch b/pkgs/shells/rush/gets.patch
deleted file mode 100644
index 94b1f5dd2f51a08aa29418e3c57a35e93d587d94..0000000000000000000000000000000000000000
--- a/pkgs/shells/rush/gets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- rush-1.7/gnu/stdio.in.h.org	2010-06-13 19:14:59.000000000 +0200
-+++ rush-1.7/gnu/stdio.in.h	2013-12-30 14:29:55.000000000 +0100
-@@ -138,8 +138,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined gets 
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/pkgs/shells/rush/intprops.patch b/pkgs/shells/rush/intprops.patch
new file mode 100644
index 0000000000000000000000000000000000000000..947cb0b9ab9f738ad571fce428eef8ae8ab715cc
--- /dev/null
+++ b/pkgs/shells/rush/intprops.patch
@@ -0,0 +1,257 @@
+Description: Update to latest intprops.h from gnulib, fixes FTBFS with gcc 7
+Author: Adrian Bunk 
+Bug-Debian: https://bugs.debian.org/853649
+
+--- rush-1.8+dfsg.orig/gnu/intprops.h
++++ rush-1.8+dfsg/gnu/intprops.h
+@@ -1,20 +1,18 @@
+-/* -*- buffer-read-only: t -*- vi: set ro: */
+-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+ /* intprops.h -- properties of integer types
+ 
+-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
++   Copyright (C) 2001-2017 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify it
+-   under the terms of the GNU General Public License as published
+-   by the Free Software Foundation; either version 3 of the License, or
++   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 .  */
+ 
+ /* Written by Paul Eggert.  */
+@@ -23,7 +21,6 @@
+ #define _GL_INTPROPS_H
+ 
+ #include 
+-#include 
+ 
+ /* Return a value with the common real type of E and V and the value of V.  */
+ #define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
+@@ -49,12 +46,16 @@
+ 
+ /* Minimum and maximum values for integer types and expressions.  */
+ 
++/* The width in bits of the integer type or expression T.
++   Padding bits are not supported; this is checked at compile-time below.  */
++#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
++
+ /* The maximum and minimum values for the integer type T.  */
+ #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+ #define TYPE_MAXIMUM(t)                                                 \
+   ((t) (! TYPE_SIGNED (t)                                               \
+         ? (t) -1                                                        \
+-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
++        : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
+ 
+ /* The maximum and minimum values for the type of the expression E,
+    after integer promotion.  E should not have side effects.  */
+@@ -67,29 +68,23 @@
+    ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
+    : _GL_INT_NEGATE_CONVERT (e, 1))
+ #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
+-  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
++  (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
++
++/* Work around OpenVMS incompatibility with C99.  */
++#if !defined LLONG_MAX && defined __INT64_MAX
++# define LLONG_MAX __INT64_MAX
++# define LLONG_MIN __INT64_MIN
++#endif
+ 
+ /* This include file assumes that signed types are two's complement without
+    padding bits; the above macros have undefined behavior otherwise.
+    If this is a problem for you, please let us know how to fix it for your host.
+-   As a sanity check, test the assumption for some signed types that
+-    bounds.  */
+-verify (TYPE_MINIMUM (signed char) == SCHAR_MIN);
+-verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX);
+-verify (TYPE_MINIMUM (short int) == SHRT_MIN);
+-verify (TYPE_MAXIMUM (short int) == SHRT_MAX);
+-verify (TYPE_MINIMUM (int) == INT_MIN);
+-verify (TYPE_MAXIMUM (int) == INT_MAX);
+-verify (TYPE_MINIMUM (long int) == LONG_MIN);
+-verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+-#ifdef LLONG_MAX
+-verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+-verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+-#endif
++   This assumption is tested by the intprops-tests module.  */
+ 
+ /* Does the __typeof__ keyword work?  This could be done by
+    'configure', but for now it's easier to do it by hand.  */
+-#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
++#if (2 <= __GNUC__ \
++     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
+      || (0x5110 <= __SUNPRO_C && !__STDC__))
+ # define _GL_HAVE___TYPEOF__ 1
+ #else
+@@ -118,8 +113,7 @@ verify (TYPE_MAXIMUM (long long int) ==
+    signed, this macro may overestimate the true bound by one byte when
+    applied to unsigned types of size 2, 4, 16, ... bytes.  */
+ #define INT_STRLEN_BOUND(t)                                     \
+-  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
+-                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
++  (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
+    + _GL_SIGNED_TYPE_OR_EXPR (t))
+ 
+ /* Bound on buffer size needed to represent an integer type or expression T,
+@@ -224,20 +218,27 @@ verify (TYPE_MAXIMUM (long long int) ==
+    ? (a) < (min) >> (b)                                 \
+    : (max) >> (b) < (a))
+ 
+-/* True if __builtin_add_overflow (A, B, P) works when P is null.  */
+-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
++/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
++#if 5 <= __GNUC__ && !defined __ICC
++# define _GL_HAS_BUILTIN_OVERFLOW 1
++#else
++# define _GL_HAS_BUILTIN_OVERFLOW 0
++#endif
++
++/* True if __builtin_add_overflow_p (A, B, C) works.  */
++#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
+ 
+ /* The _GL*_OVERFLOW macros have the same restrictions as the
+    *_RANGE_OVERFLOW macros, except that they do not assume that operands
+    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
+    that the result (e.g., A + B) has that type.  */
+-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
+-# define _GL_ADD_OVERFLOW(a, b, min, max)
+-   __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
+-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
+-   __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
+-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
+-   __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
++#if _GL_HAS_BUILTIN_OVERFLOW_P
++# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
++   __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
++   __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
++   __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
+ #else
+ # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
+    ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
+@@ -317,7 +318,7 @@ verify (TYPE_MAXIMUM (long long int) ==
+   _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
+ #define INT_SUBTRACT_OVERFLOW(a, b) \
+   _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
+-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
++#if _GL_HAS_BUILTIN_OVERFLOW_P
+ # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
+ #else
+ # define INT_NEGATE_OVERFLOW(a) \
+@@ -351,10 +352,6 @@ verify (TYPE_MAXIMUM (long long int) ==
+ #define INT_MULTIPLY_WRAPV(a, b, r) \
+   _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
+ 
+-#ifndef __has_builtin
+-# define __has_builtin(x) 0
+-#endif
+-
+ /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
+    https://llvm.org/bugs/show_bug.cgi?id=25390
+@@ -371,17 +368,17 @@ verify (TYPE_MAXIMUM (long long int) ==
+    the operation.  BUILTIN is the builtin operation, and OVERFLOW the
+    overflow predicate.  Return 1 if the result overflows.  See above
+    for restrictions.  */
+-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
++#if _GL_HAS_BUILTIN_OVERFLOW
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
+ #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
+    (_Generic \
+     (*(r), \
+      signed char: \
+-       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \
++       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                         signed char, SCHAR_MIN, SCHAR_MAX), \
+      short int: \
+-       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \
++       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                         short int, SHRT_MIN, SHRT_MAX), \
+      int: \
+        _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+@@ -395,10 +392,10 @@ verify (TYPE_MAXIMUM (long long int) ==
+ #else
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
+    (sizeof *(r) == sizeof (signed char) \
+-    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \
++    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        signed char, SCHAR_MIN, SCHAR_MAX) \
+     : sizeof *(r) == sizeof (short int) \
+-    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \
++    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        short int, SHRT_MIN, SHRT_MAX) \
+     : sizeof *(r) == sizeof (int) \
+     ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+@@ -414,15 +411,14 @@ verify (TYPE_MAXIMUM (long long int) ==
+ # else
+ #  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
+     _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+-                     long int, LONG_MIN, LONG_MAX))
++                     long int, LONG_MIN, LONG_MAX)
+ # endif
+ #endif
+ 
+ /* Store the low-order bits of A  B into *R, where the operation
+    is given by OP.  Use the unsigned type UT for calculation to avoid
+-   overflow problems.  *R's type is T, with extremal values TMIN and
+-   TMAX.  T must be a signed integer type.  Return 1 if the result
+-   overflows.  */
++   overflow problems.  *R's type is T, with extrema TMIN and TMAX.
++   T must be a signed integer type.  Return 1 if the result overflows.  */
+ #define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \
+   (sizeof ((a) op (b)) < sizeof (t) \
+    ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \
+@@ -431,17 +427,27 @@ verify (TYPE_MAXIMUM (long long int) ==
+   ((overflow (a, b) \
+     || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \
+     || (tmax) < ((a) op (b))) \
+-   ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 1) \
+-   : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 0))
++   ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \
++   : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0))
++
++/* Return the low-order bits of A  B, where the operation is given
++   by OP.  Use the unsigned type UT for calculation to avoid undefined
++   behavior on signed integer overflow, and convert the result to type T.
++   UT is at least as wide as T and is no narrower than unsigned int,
++   T is two's complement, and there is no padding or trap representations.
++   Assume that converting UT to T yields the low-order bits, as is
++   done in all known two's-complement C compilers.  E.g., see:
++   https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html
++
++   According to the C standard, converting UT to T yields an
++   implementation-defined result or signal for values outside T's
++   range.  However, code that works around this theoretical problem
++   runs afoul of a compiler bug in Oracle Studio 12.3 x86.  See:
++   http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00049.html
++   As the compiler bug is real, don't try to work around the
++   theoretical problem.  */
+ 
+-/* Return A  B, where the operation is given by OP.  Use the
+-   unsigned type UT for calculation to avoid overflow problems.
+-   Convert the result to type T without overflow by subtracting TMIN
+-   from large values before converting, and adding it afterwards.
+-   Compilers can optimize all the operations except OP.  */
+-#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t, tmin, tmax) \
+-  (((ut) (a) op (ut) (b)) <= (tmax) \
+-   ? (t) ((ut) (a) op (ut) (b)) \
+-   : ((t) (((ut) (a) op (ut) (b)) - (tmin)) + (tmin)))
++#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \
++  ((t) ((ut) (a) op (ut) (b)))
+ 
+ #endif /* _GL_INTPROPS_H */
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 598e6dbd946048aecde21c565768318b713fa365..d22a66eb93ae6b4eea6c45655c5f283eeb68afc4 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,39 +2,34 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.4.3";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "1lx95i468px908y18fa9fmfgmjsydhkpas89dxbwfnybqxxyd3ls";
+    sha256= "0hfsan22i81wffx2xbamm8wwkxgpv12z4kfl37p9m22vpqgg0fdg";
   };
 
-  ## The logo xonsh prints during build contains unicode characters, and this
-  ## fails because locales have not been set up in the build environment.
-  ## We can fix this on Linux by setting:
-  ##    export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
-  ## but this would not be a cross platform solution, so it's simpler to just
-  ## patch the setup.py script to not print the logo during build.
-  #prePatch = ''
-  #  substituteInPlace setup.py --replace "print(logo)" ""
-  #'';
-  patchPhase = ''
+  LC_ALL = "en_US.UTF-8";
+  postPatch = ''
     rm xonsh/winutils.py
-    sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
-    sed -ie 's|test_win_ipconfig|_test_win_ipconfig|g' tests/test_execer.py
-    sed -ie 's|test_ipconfig|_test_ipconfig|g' tests/test_execer.py
-    rm tests/test_main.py
-    rm tests/test_man.py
-    rm tests/test_replay.py
+
+    sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
+    sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh
+
+    patchShebangs .
   '';
 
   checkPhase = ''
-    HOME=$TMPDIR XONSH_INTERACTIVE=0 nosetests -x
+    HOME=$TMPDIR XONSH_INTERACTIVE=0 \
+      pytest \
+        -k 'not test_man_completion and not test_printfile and not test_sourcefile and not test_printname ' \
+        tests
   '';
 
-  buildInputs = with python3Packages; [ glibcLocales nose pytest ];
+  checkInputs = with python3Packages; [ pytest glibcLocales ];
+
   propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh-autosuggestions/default.nix
deleted file mode 100644
index 4723a6abeb6d600f3f4fb4a70d79f3dca729781b..0000000000000000000000000000000000000000
--- a/pkgs/shells/zsh-autosuggestions/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchFromGitHub, zsh }:
-
-# To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option
-
-stdenv.mkDerivation rec {
-  name = "zsh-autosuggestions-${version}";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "zsh-users";
-    repo = "zsh-autosuggestions";
-    rev = "v${version}";
-    sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc";
-  };
-
-  buildInputs = [ zsh ];
-
-  installPhase = ''
-    install -D zsh-autosuggestions.zsh \
-      $out/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-    '';
-
-  meta = with stdenv.lib; {
-    description = "Fish shell autosuggestions for Zsh";
-    homepage = https://github.com/zsh-users/zsh-autosuggestions;
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.loskutov ];
-  };
-}
diff --git a/pkgs/shells/zsh-deer/default.nix b/pkgs/shells/zsh-deer/default.nix
deleted file mode 100644
index 3fa941c08c39ec70d9129e5a7d03581438f643d6..0000000000000000000000000000000000000000
--- a/pkgs/shells/zsh-deer/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchFromGitHub, perl }:
-
-let
-  version = "1.4";
-  name = "deer-${version}";
-in stdenv.mkDerivation {
-  inherit name;
-
-  src = fetchFromGitHub {
-    owner = "Vifon";
-    repo = "deer";
-    rev = "v${version}";
-    sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl";
-  };
-
-  prePatch = ''
-    substituteInPlace deer \
-      --replace " perl " " ${perl}/bin/perl "
-  '';
-
-  patches = [ ./realpath.patch ];
-
-  installPhase = ''
-    mkdir -p $out/share/zsh/site-functions/
-    cp deer $out/share/zsh/site-functions/
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Ranger-like file navigation for zsh";
-    homepage = "https://github.com/Vifon/deer";
-    license = licenses.gpl3Plus;
-    maintainers = maintainers.vyp;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/shells/zsh-prezto/default.nix b/pkgs/shells/zsh-prezto/default.nix
deleted file mode 100644
index c5f404bbd3fd2180ab0ea3f5d85a893704ee8c89..0000000000000000000000000000000000000000
--- a/pkgs/shells/zsh-prezto/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, fetchgit, fetchFromGitHub }:
-
-let
-  # https://github.com/spwhitt/nix-zsh-completions/pull/2
-  nix-zsh-completions = fetchFromGitHub {
-    owner = "garbas";
-    repo = "nix-zsh-completions";
-    rev = "9b7d216ec095ccee541ebfa5f04249aa2964d054";
-    sha256 = "1pvmfcqdvdi3nc1jm72f54mwf06yrmlq31pqw6b5fczawcz02jrz";
-  };
-in stdenv.mkDerivation rec {
-  rev = "4f19700919c8ebbaf75755fc0d03716d13183f49";
-  name = "zsh-prezto-2015-03-03_rev${builtins.substring 0 7 rev}";
-  src = fetchgit {
-    url = "https://github.com/sorin-ionescu/prezto";
-    inherit rev;
-    sha256 = "17mql9mb7zbf8q1nvnci60yrmz5bl9q964i8dv4shz8b42861cdg";
-    fetchSubmodules = true;
-  };
-  patches = [
-    (fetchurl {
-      url = "https://github.com/sorin-ionescu/prezto/pull/1028.patch";
-      sha256 = "0n2s7kfp9ljrq8lw5iibv0vyv66awrkzkqbyvy7hlcl06d8aykjv";
-    })
-  ];
-  buildPhase = ''
-    sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zpreztorc|/etc/zpreztorc|g" init.zsh
-    sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh
-    for i in runcoms/*; do
-      sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i
-    done
-    sed -i -e "s|\''${0:h}/cache.zsh|\''${ZDOTDIR:\-\$HOME}/.zfasd_cache|g" modules/fasd/init.zsh
-  '';
-  installPhase = ''
-    mkdir -p $out/modules/nix
-    cp ${nix-zsh-completions}/* $out/modules/nix -R
-    cp ./* $out/ -R
-  '';
-  meta = with stdenv.lib; {
-    description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes.";
-    homepage = https://github.com/sorin-ionescu/prezto;
-    license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
-    platforms = with platforms; unix;
-  };
-}
diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..cf22207ef09c8831cfb10da1ba94970c6019f346
--- /dev/null
+++ b/pkgs/shells/zsh/antigen/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "2.2.3";
+  name = "antigen-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/zsh-users/antigen/releases/download/v${version}/antigen.zsh";
+    sha256 = "1bmp3qf14509swpxin4j9f98n05pdilzapjm0jdzbv0dy3hn20ix";
+  };
+
+  phases = "installPhase";
+
+  installPhase = ''
+    outdir=$out/share/antigen
+    mkdir -p $outdir
+    cp $src $outdir/antigen.zsh
+  '';
+
+  meta = {
+    description = "The plugin manager for zsh.";
+    homepage = http://antigen.sharats.me;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 4b2b79a210466e60ef2c9801c8dc1352071c7793..3259dbbd9bc61a9976105643385d84f63fb1b690 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pcre }:
 
 let
-  version = "5.4.2";
+  version = "5.5.1";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
-    sha256 = "1703g6vfz2vpb866wgl71nvg0ynjq0zvrjwkqbv7v6q3606jbmn3";
+    sha256 = "0bm9n7lycdzvw5hmgi4a920pqbb5yxvmyhfxx8jbign2hzgf7g01";
   };
 
 in
@@ -15,20 +15,24 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
-    sha256 = "1jdcfinzmki2w963msvsanv29vqqfmdfm4rncwpw0r3zqnrcsywm";
+    sha256 = "10705qnnr3p416bwfjaip9r7yw187vczzjrk60yg79dfwy4slk3p";
   };
 
   buildInputs = [ ncurses pcre ];
 
+  configureFlags = [
+    "--enable-maildir-support"
+    "--enable-multibyte"
+    "--with-tcsetpgrp"
+    "--enable-pcre"
+  ];
   preConfigure = ''
-    configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre"
+    configureFlagsArray+=(--enable-zprofile=$out/etc/zprofile)
   '';
 
   # the zsh/zpty module is not available on hydra
   # so skip groups Y Z
-  checkFlagsArray = ''
-    (TESTNUM=A TESTNUM=B TESTNUM=C TESTNUM=D TESTNUM=E TESTNUM=V TESTNUM=W)
-  '';
+  checkFlags = map (T: "TESTNUM=${T}") (stdenv.lib.stringToCharacters "ABCDEVW");
 
   # XXX: think/discuss about this, also with respect to nixos vs nix-on-X
   postInstall = ''
diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e516393a23ca3a2d5f144950ff829943ef2ae560
--- /dev/null
+++ b/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, lib
+, zsh, coreutils, inetutils, procps, txt2tags }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "grml-zsh-config-${version}";
+  version = "0.14.3";
+
+  src = fetchFromGitHub {
+    owner = "grml";
+    repo = "grml-etc-core";
+    rev = "v${version}";
+    sha256 = "1akx6lwxnbcccddzw41rci8rb9n5vb6q2vpn5qr07f0grchyiifk";
+  };
+
+  buildInputs = [ zsh coreutils txt2tags procps ]
+    ++ optional stdenv.isLinux [ inetutils ];
+
+  buildPhase = ''
+    cd doc
+    make
+    cd ..
+  '';
+
+  installPhase = ''
+    install -D -m644 etc/zsh/keephack $out/etc/zsh/keephack
+    install -D -m644 etc/zsh/zshrc $out/etc/zsh/zshrc
+
+    install -D -m644 doc/grmlzshrc.5 $out/share/man/man5/grmlzshrc.5
+    ln -s grmlzshrc.5.gz $out/share/man/man5/grml-zsh-config.5.gz
+  '';
+
+  meta = with stdenv.lib; {
+    description = "grml's zsh setup";
+    homepage = http://grml.org/zsh/;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ msteen rvolosatovs ];
+  };
+}
diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
similarity index 100%
rename from pkgs/shells/lambda-mod-zsh-theme/default.nix
rename to pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2bcff6b809dca398331b484cd2e406459f9a2361
--- /dev/null
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+let
+  version = "0.3.8";
+in
+
+stdenv.mkDerivation rec {
+  name = "nix-zsh-completions-${version}";
+
+  src = fetchFromGitHub {
+    owner = "spwhitt";
+    repo = "nix-zsh-completions";
+    rev = "${version}";
+    sha256 = "05ynd38br2kn657g7l01jg1q8ja9xwrdyb95w02gh7j9cww2k06w";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/zsh/site-functions
+    cp _* $out/share/zsh/site-functions
+  '';
+
+  meta = {
+    homepage = https://github.com/spwhitt/nix-zsh-completions;
+    description = "ZSH completions for Nix, NixOS, and NixOps";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ];
+  };
+}
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5412f4ce8967413807f23ceadf7a7ab0492119b0
--- /dev/null
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -0,0 +1,74 @@
+# This script was inspired by the ArchLinux User Repository package:
+#
+#   https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  version = "2018-04-06";
+  name = "oh-my-zsh-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/robbyrussell/oh-my-zsh";
+    rev = "62b8a70a7c5d0c939d8dabfef48796a092d1a55f";
+    sha256 = "02na47pa2ly17yvwa2nhzyrp8iarawyirhfw3779sh0w78vgw1gs";
+  };
+
+  pathsToLink = [ "/share/oh-my-zsh" ];
+
+  phases = "installPhase";
+
+  installPhase = ''
+  outdir=$out/share/oh-my-zsh
+  template=templates/zshrc.zsh-template
+
+  mkdir -p $outdir
+  cp -r $src/* $outdir
+  cd $outdir
+
+  rm LICENSE.txt
+  rm -rf .git*
+
+  chmod -R +w templates
+
+  # Change the path to oh-my-zsh dir and disable auto-updating.
+  sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \
+         -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \
+   $template
+
+  # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source
+  # them, if found.
+  cat >> $template <<- EOF
+
+  # Load the variables.
+  if [ -f ~/.zsh_variables ]; then
+      . ~/.zsh_variables
+  fi
+
+  # Load the functions.
+  if [ -f ~/.zsh_funcs ]; then
+    . ~/.zsh_funcs
+  fi
+
+  # Load the aliases.
+  if [ -f ~/.zsh_aliases ]; then
+      . ~/.zsh_aliases
+  fi
+  EOF
+  '';
+
+  meta = with stdenv.lib; {
+  description     = "A framework for managing your zsh configuration";
+  longDescription = ''
+  Oh My Zsh is a framework for managing your zsh configuration.
+
+  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 | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+  '';
+  homepage        = "http://ohmyz.sh/";
+  license         = licenses.mit;
+  platforms       = platforms.all;
+  maintainers     = with maintainers; [ scolobb nequissimus ];
+  };
+}
diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..906301110e96fe6ce9e6ec061273f23862648901
--- /dev/null
+++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, zsh }:
+
+# To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option
+
+stdenv.mkDerivation rec {
+  name = "zsh-autosuggestions-${version}";
+  version = "0.4.2";
+
+  src = fetchFromGitHub {
+    owner = "zsh-users";
+    repo = "zsh-autosuggestions";
+    rev = "v${version}";
+    sha256 = "1yvbhfaaqzhmjmwjh75i1p4mrqp3ksw74bp8lrll81c6zf8bmvig";
+  };
+
+  buildInputs = [ zsh ];
+
+  installPhase = ''
+    install -D zsh-autosuggestions.zsh \
+      $out/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Fish shell autosuggestions for Zsh";
+    homepage = https://github.com/zsh-users/zsh-autosuggestions;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.loskutov ];
+  };
+}
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..453a577440711f840568f25ad5433851afc0ad57
--- /dev/null
+++ b/pkgs/shells/zsh/zsh-command-time/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub }:
+
+# To make use of this plugin, need to add
+#   programs.zsh.interactiveShellInit = ''
+#     source ${pkgs.zsh-command-time}/share/zsh-command-time/command-time.plugin.zsh
+#     ZSH_COMMAND_TIME_MIN_SECONDS=3
+#     ZSH_COMMAND_TIME_ECHO=1
+#   '';
+
+stdenv.mkDerivation rec {
+  version = "2017-05-09";
+  name = "zsh-command-time-${version}";
+
+  src = fetchFromGitHub {
+    owner = "popstas";
+    repo = "zsh-command-time";
+    rev = "2111361cbc88c542c834fbab7802ae5ae8339824";
+    sha256 = "0hr9c7196wy9cg7vkmknszr2h446yvg9pqrq0rf3213kz074dhpg";
+  };
+
+  installPhase = ''
+    install -D $src/command-time.plugin.zsh --target-directory=$out/share/zsh-command-time
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Plugin that output time: xx after long commands";
+    homepage = https://github.com/popstas/zsh-command-time;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix
similarity index 100%
rename from pkgs/shells/zsh-completions/default.nix
rename to pkgs/shells/zsh/zsh-completions/default.nix
diff --git a/pkgs/shells/zsh/zsh-deer/default.nix b/pkgs/shells/zsh/zsh-deer/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..735d6a2b7619cc15a2e2f263c05c802d28216243
--- /dev/null
+++ b/pkgs/shells/zsh/zsh-deer/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, perl }:
+
+let
+  version = "1.4";
+  name = "deer-${version}";
+in stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchFromGitHub {
+    owner = "Vifon";
+    repo = "deer";
+    rev = "v${version}";
+    sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl";
+  };
+
+  prePatch = ''
+    substituteInPlace deer \
+      --replace " perl " " ${perl}/bin/perl "
+  '';
+
+  patches = [ ./realpath.patch ];
+
+  installPhase = ''
+    mkdir -p $out/share/zsh/site-functions/
+    cp deer $out/share/zsh/site-functions/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Ranger-like file navigation for zsh";
+    homepage = "https://github.com/Vifon/deer";
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.vyp ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/shells/zsh-deer/realpath.patch b/pkgs/shells/zsh/zsh-deer/realpath.patch
similarity index 100%
rename from pkgs/shells/zsh-deer/realpath.patch
rename to pkgs/shells/zsh/zsh-deer/realpath.patch
diff --git a/pkgs/shells/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix
similarity index 100%
rename from pkgs/shells/zsh-git-prompt/default.nix
rename to pkgs/shells/zsh/zsh-git-prompt/default.nix
diff --git a/pkgs/shells/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
similarity index 100%
rename from pkgs/shells/zsh-powerlevel9k/default.nix
rename to pkgs/shells/zsh/zsh-powerlevel9k/default.nix
diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7bef904081e0608e8a7163fc891d95e33571cd1f
--- /dev/null
+++ b/pkgs/shells/zsh/zsh-prezto/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchpatch, fetchgit, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "zsh-prezto-2017-12-03";
+  src = fetchgit {
+    url = "https://github.com/sorin-ionescu/prezto";
+    rev = "029414581e54f5b63156f81acd0d377e8eb78883";
+    sha256 = "0crrj2nq0wcv5in8qimnkca2an760aqald13vq09s5kbwwc9rs1f";
+    fetchSubmodules = true;
+  };
+  buildPhase = ''
+    sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zpreztorc|/etc/zpreztorc|g" init.zsh
+    sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh
+    for i in runcoms/*; do
+      sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i
+    done
+    sed -i -e "s|\''${0:h}/cache.zsh|\''${ZDOTDIR:\-\$HOME}/.zfasd_cache|g" modules/fasd/init.zsh
+  '';
+  installPhase = ''
+    mkdir -p $out
+    cp ./* $out/ -R
+  '';
+  meta = with stdenv.lib; {
+    description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes.";
+    homepage = https://github.com/sorin-ionescu/prezto;
+    license = licenses.mit;
+    maintainers = with maintainers; [ garbas ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
similarity index 100%
rename from pkgs/shells/zsh-syntax-highlighting/default.nix
rename to pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 1a55b06ef3674c4d7e35be0ff93cd632df68ea2b..734119491a0b4448937df1bcca43cfc6085d737b 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -74,38 +74,20 @@ rec {
     };
   in stdenv // {
     mkDerivation =
-      { buildInputs ? [], nativeBuildInputs ? []
-      , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []
-      , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false
+      { nativeBuildInputs ? []
       , ...
       } @ args:
 
-      let
-        # *BuildInputs exists temporarily as another name for
-        # *HostInputs.
-
-        # The base stdenv already knows that nativeBuildInputs and
-        # buildInputs should be built with the usual gcc-wrapper
-        # And the same for propagatedBuildInputs.
-        nativeDrv = stdenv.mkDerivation args;
-      in
         stdenv.mkDerivation (args // {
           nativeBuildInputs = nativeBuildInputs
-            ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
               # without proper `file` command, libtool sometimes fails
               # to recognize 64-bit DLLs
             ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file
-            ++ stdenv.lib.optional hostPlatform.isAarch64 pkgs.updateAutotoolsGnuConfigScriptsHook
+            ++ stdenv.lib.optional
+                 (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
+                 pkgs.updateAutotoolsGnuConfigScriptsHook
             ;
 
-          # 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
-          # loader time. ld(1) explains it.
-          buildInputs = [];
-          propagatedBuildInputs = propagatedBuildInputs ++ buildInputs;
-          propagatedNativeBuildInputs = propagatedNativeBuildInputs;
-
           crossConfig = hostPlatform.config;
         } // args.crossAttrs or {});
   };
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 8197510eeeccbb2d00b76509d16b43979763e200..973be9831861ffbc0b30c944743b0ed95f546fde 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -10,9 +10,15 @@ let
     config = builtins.removeAttrs config [ "replaceStdenv" ];
   };
 
-in bootStages ++ [
+in lib.init bootStages ++ [
 
-  # Build Packages
+  # Regular native packages
+  (somePrevStage: lib.last bootStages somePrevStage // {
+    # It's OK to change the built-time dependencies
+    allowCustomOverrides = true;
+  })
+
+  # Build tool Packages
   (vanillaPackages: {
     inherit config overlays;
     selfBuild = false;
@@ -33,8 +39,10 @@ in bootStages ++ [
       buildPlatform = localSystem;
       hostPlatform = crossSystem;
       targetPlatform = crossSystem;
-      cc = if crossSystem.useiOSCross or false
-           then buildPackages.darwin.ios-cross
+      cc = if crossSystem.useiOSPrebuilt or false
+             then buildPackages.darwin.iosSdkPkgs.clang
+           else if crossSystem.useAndroidPrebuilt
+             then buildPackages.androidenv.androidndkPkgs.gcc
            else buildPackages.gcc;
     };
   })
diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh
index 77adc52d53b60c523c61c6d5e5d36d074300c521..4c8f8ebd7eb2f7dc0d32ec41a2dfaa1ca3638261 100644
--- a/pkgs/stdenv/cygwin/rebase-x86_64.sh
+++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh
@@ -8,7 +8,7 @@ _cygwinFixAutoImageBase() {
         if [ -f /etc/rebasenix.nextbase ]; then
             NEXTBASE="$( {
-    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/10cbca5b30c6cb421ce15139f32ae3a4977292cf/${file}";
+    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/d5bdfcbfe6346761a332918a267e82799ec954d2/${file}";
     inherit (localSystem) system;
     inherit sha256 executable;
   }; in {
-    sh      = fetch { file = "sh";    sha256 = "0s8a9vpzj6vadq4jmf4r8cargwnsf327hdjydxgqsfxb8y1q39w3"; };
-    bzip2   = fetch { file = "bzip2"; sha256 = "1jqljpjr8mkiv7g5rl5impqx3all8vn1mxxdwa004pr3h48c1zgg"; };
-    mkdir   = fetch { file = "mkdir"; sha256 = "17zsjiwnq07i5r85q1hg7f6cnkcgllwy2amz9klaqwjy4vzz4vwh"; };
-    cpio    = fetch { file = "cpio";  sha256 = "04hrair58dgja6syh442pswiga5an9nl58ls57yknkn2pq51nx9m"; };
-    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "103833hrci0vwi1gi978hkp69rncicvpdszn87ffpf1cq0jzpa14"; executable = false; };
+    sh      = fetch { file = "sh";    sha256 = "07wm33f1yzfpcd3rh42f8g096k4cvv7g65p968j28agzmm2s7s8m"; };
+    bzip2   = fetch { file = "bzip2"; sha256 = "0y9ri2aprkrp2dkzm6229l0mw4rxr2jy7vvh3d8mxv2698v2kdbm"; };
+    mkdir   = fetch { file = "mkdir"; sha256 = "0sb07xpy66ws6f2jfnpjibyimzb71al8n8c6y4nr8h50al3g90nr"; };
+    cpio    = fetch { file = "cpio";  sha256 = "0r5c54hg678w7zydx27bzl9p3v9fs25y5ix6vdfi1ilqim7xh65n"; };
+    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "18hp5w6klr8g307ap4368r255qpzg9r0vwg9vqvj8f2zy1xilcjf"; executable = false; };
   }
 }:
 
@@ -21,9 +21,11 @@ assert crossSystem == null;
 let
   inherit (localSystem) system platform;
 
-  libSystemProfile = ''
-    (import "${./standard-sandbox.sb}")
-  '';
+  commonImpureHostDeps = [
+    "/bin/sh"
+    "/usr/lib/libSystem.B.dylib"
+    "/usr/lib/system/libunc.dylib" # This dependency is "hidden", so our scanning code doesn't pick it up
+  ];
 in rec {
   commonPreHook = ''
     export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
@@ -37,11 +39,6 @@ in rec {
     export gl_cv_func_getcwd_abort_bug=no
   '';
 
-  # The one dependency of /bin/sh :(
-  binShClosure = ''
-    (allow file-read* (literal "/usr/lib/libncurses.5.4.dylib"))
-  '';
-
   bootstrapTools = derivation rec {
     inherit system;
 
@@ -53,7 +50,7 @@ in rec {
     reexportedLibrariesFile =
       ../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries;
 
-    __sandboxProfile = binShClosure + libSystemProfile;
+    __impureHostDeps = commonImpureHostDeps;
   };
 
   stageFun = step: last: {shell             ? "${bootstrapTools}/bin/bash",
@@ -61,38 +58,59 @@ in rec {
                           extraPreHook      ? "",
                           extraNativeBuildInputs,
                           extraBuildInputs,
+                          libcxx,
                           allowedRequisites ? null}:
     let
+      name = "bootstrap-stage${toString step}";
+
+      buildPackages = lib.optionalAttrs (last ? stdenv) {
+        inherit (last) stdenv;
+      };
+
+      coreutils = { name = "${name}-coreutils"; outPath = bootstrapTools; };
+      gnugrep   = { name = "${name}-gnugrep";   outPath = bootstrapTools; };
+
+      bintools = import ../../build-support/bintools-wrapper {
+        inherit shell;
+        inherit (last) stdenvNoCC;
+
+        nativeTools  = false;
+        nativeLibc   = false;
+        inherit buildPackages coreutils gnugrep;
+        libc         = last.pkgs.darwin.Libsystem;
+        bintools     = { name = "${name}-binutils"; outPath = bootstrapTools; };
+      };
+
+      cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {
+        inherit shell;
+        inherit (last) stdenvNoCC;
+
+        extraPackages = lib.optional (libcxx != null) libcxx;
+
+        nativeTools  = false;
+        propagateDoc = false;
+        nativeLibc   = false;
+        inherit buildPackages coreutils gnugrep bintools;
+        libc         = last.pkgs.darwin.Libsystem;
+        isClang      = true;
+        cc           = { name = "${name}-clang"; outPath = bootstrapTools; };
+      };
+
       thisStdenv = import ../generic {
+        name = "${name}-stdenv-darwin";
+
         inherit config shell extraNativeBuildInputs extraBuildInputs;
         allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
-          thisStdenv.cc.expand-response-params
+          cc.expand-response-params cc.bintools
         ];
 
-        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) stdenvNoCC;
-
-          nativeTools  = false;
-          nativeLibc   = false;
-          buildPackages = lib.optionalAttrs (last ? stdenv) {
-            inherit (last) stdenv;
-          };
-          libc         = last.pkgs.darwin.Libsystem;
-          isClang      = true;
-          cc           = { name = "clang-9.9.9";     outPath = bootstrapTools; };
-          binutils     = { name = "binutils-9.9.9";  outPath = bootstrapTools; };
-          coreutils    = { name = "coreutils-9.9.9"; outPath = bootstrapTools; };
-          gnugrep      = { name = "gnugrep-9.9.9";   outPath = bootstrapTools; };
-        };
+        inherit cc;
 
-        preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") ''
+        preHook = 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
@@ -103,13 +121,14 @@ in rec {
         initialPath  = [ bootstrapTools ];
 
         fetchurlBoot = import ../../build-support/fetchurl {
-          stdenv = stage0.stdenv;
-          curl   = bootstrapTools;
+          inherit lib;
+          stdenvNoCC = stage0.stdenv;
+          curl = bootstrapTools;
         };
 
         # The stdenvs themselves don't use mkDerivation, so I need to specify this here
-        stdenvSandboxProfile = binShClosure + libSystemProfile;
-        extraSandboxProfile  = binShClosure + libSystemProfile;
+        __stdenvImpureHostDeps = commonImpureHostDeps;
+        __extraImpureHostDeps = commonImpureHostDeps;
 
         extraAttrs = {
           inherit platform;
@@ -130,7 +149,7 @@ in rec {
     overrides = self: super: with stage0; rec {
       darwin = super.darwin // {
         Libsystem = stdenv.mkDerivation {
-          name = "bootstrap-Libsystem";
+          name = "bootstrap-stage0-Libsystem";
           buildCommand = ''
             mkdir -p $out
             ln -s ${bootstrapTools}/lib $out/lib
@@ -141,7 +160,7 @@ in rec {
       };
 
       libcxx = stdenv.mkDerivation {
-        name = "bootstrap-libcxx";
+        name = "bootstrap-stage0-libcxx";
         phases = [ "installPhase" "fixupPhase" ];
         installPhase = ''
           mkdir -p $out/lib $out/include
@@ -153,7 +172,7 @@ in rec {
       };
 
       libcxxabi = stdenv.mkDerivation {
-        name = "bootstrap-libcxxabi";
+        name = "bootstrap-stage0-libcxxabi";
         buildCommand = ''
           mkdir -p $out/lib
           ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
@@ -164,14 +183,16 @@ in rec {
 
     extraNativeBuildInputs = [];
     extraBuildInputs = [];
+    libcxx = null;
   };
 
   stage1 = prevStage: let
-    persistent = _: _: {};
+    persistent = _: super: { python = super.python.override { configd = null; }; };
   in with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
     extraNativeBuildInputs = [];
-    extraBuildInputs = [ pkgs.libcxx ];
+    extraBuildInputs = [ ];
+    libcxx = pkgs.libcxx;
 
     allowedRequisites =
       [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ];
@@ -198,7 +219,8 @@ in rec {
     '';
 
     extraNativeBuildInputs = [ pkgs.xz ];
-    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
+    extraBuildInputs = [ pkgs.darwin.CF ];
+    libcxx = pkgs.libcxx;
 
     allowedRequisites =
       [ bootstrapTools ] ++
@@ -230,7 +252,8 @@ in rec {
     # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
     # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
     extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
-    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
+    extraBuildInputs = [ pkgs.darwin.CF ];
+    libcxx = pkgs.libcxx;
 
     extraPreHook = ''
       export PATH=${pkgs.bash}/bin:$PATH
@@ -265,7 +288,9 @@ in rec {
   in with prevStage; stageFun 4 prevStage {
     shell = "${pkgs.bash}/bin/bash";
     extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
-    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
+    extraBuildInputs = [ pkgs.darwin.CF ];
+    libcxx = pkgs.libcxx;
+
     extraPreHook = ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
@@ -296,18 +321,18 @@ in rec {
       darwin = super.darwin // {
         inherit (darwin) dyld ICU Libsystem libiconv;
       } // lib.optionalAttrs (super.targetPlatform == localSystem) {
-        inherit (darwin) cctools;
+        inherit (darwin) binutils cctools;
       };
     } // lib.optionalAttrs (super.targetPlatform == localSystem) {
       # Need to get rid of these when cross-compiling.
-      inherit binutils binutils-raw;
+      inherit binutils binutils-unwrapped;
     };
   in import ../generic rec {
+    name = "stdenv-darwin";
+
     inherit config;
     inherit (pkgs.stdenv) fetchurlBoot;
 
-    name = "stdenv-darwin";
-
     buildPlatform = localSystem;
     hostPlatform = localSystem;
     targetPlatform = localSystem;
@@ -317,8 +342,8 @@ in rec {
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
 
-    stdenvSandboxProfile = binShClosure + libSystemProfile;
-    extraSandboxProfile  = binShClosure + libSystemProfile;
+    __stdenvImpureHostDeps = commonImpureHostDeps;
+    __extraImpureHostDeps = commonImpureHostDeps;
 
     initialPath = import ../common-path.nix { inherit pkgs; };
     shell       = "${pkgs.bash}/bin/bash";
@@ -331,13 +356,15 @@ in rec {
       buildPackages = {
         inherit (prevStage) stdenv;
       };
-      inherit (pkgs) coreutils binutils gnugrep;
-      cc   = pkgs.llvmPackages.clang-unwrapped;
-      libc = pkgs.darwin.Libsystem;
+      inherit (pkgs) coreutils gnugrep;
+      cc       = pkgs.llvmPackages.clang-unwrapped;
+      bintools = pkgs.darwin.binutils;
+      libc     = pkgs.darwin.Libsystem;
+      extraPackages = [ pkgs.libcxx ];
     };
 
     extraNativeBuildInputs = [];
-    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
+    extraBuildInputs = [ pkgs.darwin.CF ];
 
     extraAttrs = {
       inherit platform bootstrapTools;
@@ -352,8 +379,8 @@ in rec {
       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
+      gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext
+      binutils.bintools darwin.binutils darwin.binutils.bintools
       cc.expand-response-params
     ]) ++ (with pkgs.darwin; [
       dyld Libsystem CF cctools ICU libiconv locale
@@ -364,6 +391,10 @@ in rec {
         clang = cc;
         llvmPackages = persistent'.llvmPackages // { clang = cc; };
         inherit cc;
+
+        darwin = super.darwin // {
+          xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; };
+        };
       };
   };
 
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 5d5a3a81d44b2988fc021514f4bf341a136129c2..6fc9d7f0c1010b3f93a8c79d419610ac6f4048e0 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -15,6 +15,9 @@ in rec {
   # Avoid debugging larger changes for now.
   bzip2_ = bzip2.override (args: { linkStatic = true; });
 
+  # Avoid messing with libkrb5 and libnghttp2.
+  curl_ = curl.override (args: { gssSupport = false; http2Support = false; });
+
   build = stdenv.mkDerivation {
     name = "stdenv-bootstrap-tools";
 
@@ -60,8 +63,8 @@ in rec {
 
       # This used to be in-nixpkgs, but now is in the bundle
       # because I can't be bothered to make it partially static
-      cp ${curl.bin}/bin/curl $out/bin
-      cp -d ${curl.out}/lib/libcurl*.dylib $out/lib
+      cp ${curl_.bin}/bin/curl $out/bin
+      cp -d ${curl_.out}/lib/libcurl*.dylib $out/lib
       cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib
       cp -d ${openssl.out}/lib/*.dylib $out/lib
 
diff --git a/pkgs/stdenv/darwin/standard-sandbox.sb b/pkgs/stdenv/darwin/standard-sandbox.sb
deleted file mode 100644
index b87be89f35f21d49cf7a5c96a4b6003c4345e4ec..0000000000000000000000000000000000000000
--- a/pkgs/stdenv/darwin/standard-sandbox.sb
+++ /dev/null
@@ -1,72 +0,0 @@
-(define TMPDIR (param "_GLOBAL_TMP_DIR"))
-
-; obvious
-(allow process-fork)
-
-; allow reading system information like #CPUs, etc.
-(allow sysctl-read)
-
-; IPC
-(allow ipc-posix*)
-
-; Unix sockets
-(allow system-socket)
-
-; all runtime dependencies of libSystem.dylib
-(allow file-read*
-       (literal "/usr/lib/libSystem.dylib")
-       (literal "/usr/lib/libSystem.B.dylib")
-       (literal "/usr/lib/libobjc.A.dylib")
-       (literal "/usr/lib/libobjc.dylib")
-       (literal "/usr/lib/libauto.dylib")
-       (literal "/usr/lib/libc++abi.dylib")
-       (literal "/usr/lib/libc++.1.dylib")
-       (literal "/usr/lib/libDiagnosticMessagesClient.dylib")
-       (subpath "/usr/lib/system"))
-
-; tmp
-(allow file* process-exec (literal "/tmp") (subpath TMPDIR))
-
-; clang likes to read the system version
-(allow file-read* (literal "/System/Library/CoreServices/SystemVersion.plist"))
-
-; used for bootstrap builders
-(allow process-exec* (literal "/bin/sh"))
-
-; without this line clang cannot write to /dev/null, breaking some configure tests
-(allow file-read-metadata (literal "/dev"))
-
-; standard devices
-(allow file*
-       (literal "/dev/null")
-       (literal "/dev/random")
-       (literal "/dev/stdin")
-       (literal "/dev/stdout")
-       (literal "/dev/tty")
-       (literal "/dev/urandom")
-       (literal "/dev/zero")
-       (subpath "/dev/fd"))
-
-; does nothing, but reduces build noise
-(allow file* (literal "/dev/dtracehelper"))
-
-; ICU data and zoneinfo data are hardcoded
-; both are in libicucore and zoneinfo is in libsystem_c as well
-(allow file-read* (subpath "/usr/share/icu") (subpath "/usr/share/zoneinfo"))
-
-; no idea what this is
-(allow file-read-data (literal "/dev/autofs_nowait"))
-
-; lots of autoconf projects want to list this directory
-(allow file-read-metadata (literal "/var") (literal "/private/var/tmp"))
-
-; send signals
-(allow signal (target same-sandbox))
-
-; allow getpwuid (for git and other packages)
-(allow mach-lookup
-       (global-name "com.apple.system.notification_center")
-       (global-name "com.apple.system.opendirectoryd.libinfo"))
-
-; allow networking on localhost
-(allow network* (local ip) (remote unix-socket))
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 098caca0d890f45f259302658873fd9bd3e81edb..203cf5459400b5a51c6b22a06c42e9467155c9d0 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -45,7 +45,7 @@ in
     "armv6l-linux" = stagesLinux;
     "armv7l-linux" = stagesLinux;
     "aarch64-linux" = stagesLinux;
-    "mips64el-linux" = stagesLinux;
+    "mipsel-linux" = stagesLinux;
     "powerpc-linux" = /* stagesLinux */ stagesNative;
     "x86_64-darwin" = stagesDarwin;
     "x86_64-solaris" = stagesNix;
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 6ab8bf217269f0c84c288a19fc6d69e122fb9235..b3a6cedad8419af6857ef953c386cba74571e608 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -29,7 +29,8 @@ let inherit (localSystem) system; in
     inherit bootstrapTools;
 
     fetchurl = import ../../build-support/fetchurl {
-      inherit stdenv;
+      inherit lib;
+      stdenvNoCC = stdenv;
       curl = bootstrapTools;
     };
 
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 8544d932f81ce9f9c28877c0eafaf2c2b4bda8b0..1350e7d373013cdc120ae38aba5c0e411ca834ae 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -1,17 +1,15 @@
-# 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.
+# Checks derivation meta and attrs for problems (like brokenness,
+# licenses, etc).
 
-{ lib, config, system, meta, derivationArg, mkDerivationArg }:
+{ lib, config, hostPlatform, meta }:
 
 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";
+  allowUnfree = config.allowUnfree or false
+    || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
 
   whitelist = config.whitelistedLicenses or [];
   blacklist = config.blacklistedLicenses or [];
@@ -38,9 +36,11 @@ let
   hasBlacklistedLicense = assert areLicenseListsValid; attrs:
     hasLicense attrs && builtins.elem attrs.meta.license blacklist;
 
-  allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
+  allowBroken = config.allowBroken or false
+    || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
 
-  allowUnsupportedSystem = config.allowUnsupportedSystem or false;
+  allowUnsupportedSystem = config.allowUnsupportedSystem or false
+    || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1";
 
   isUnfree = licenses: lib.lists.any (l:
     !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses;
@@ -64,7 +64,7 @@ let
     !allowUnfreePredicate attrs;
 
   allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []);
-  allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x;
+  allowInsecurePredicate = x: (config.allowInsecurePredicate or allowInsecureDefaultPredicate) x;
 
   hasAllowedInsecure = attrs:
     (attrs.meta.knownVulnerabilities or []) == [] ||
@@ -78,6 +78,7 @@ let
   remediation = {
     unfree = remediate_whitelist "Unfree";
     broken = remediate_whitelist "Broken";
+    unsupported = remediate_whitelist "UnsupportedSystem";
     blacklisted = x: "";
     insecure = remediate_insecure;
     unknown-meta = x: "";
@@ -97,8 +98,7 @@ let
     ''
 
       Known issues:
-
-    '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + ''
+    '' + (lib.concatStrings (map (issue: " - ${issue}\n") attrs.meta.knownVulnerabilities)) + ''
 
         You can install it anyway by whitelisting this package, using the
         following methods:
@@ -125,47 +125,64 @@ let
 
       '';
 
-  throwEvalHelp = { reason , errormsg ? "" }:
-    throw (''
-      Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
+  handleEvalIssue = attrs: { reason , errormsg ? "" }:
+    let
+      msg = ''
+        Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
+
+      '' + (builtins.getAttr reason remediation) attrs;
+
+      handler = if config ? "handleEvalIssue"
+        then config.handleEvalIssue reason
+        else throw;
+    in handler msg;
 
-      '' + ((builtins.getAttr reason remediation) attrs));
 
   metaTypes = with lib.types; rec {
     # These keys are documented
     description = str;
     longDescription = str;
     branch = str;
-    homepage = str;
+    homepage = either (listOf str) str;
     downloadPage = str;
     license = either (listOf lib.types.attrs) (either lib.types.attrs str);
-    maintainers = listOf str;
+    maintainers = listOf (attrsOf str);
     priority = int;
-    platforms = listOf str;
+    platforms = listOf (either str lib.systems.parsedPlatform.types.system);
     hydraPlatforms = listOf str;
     broken = bool;
 
     # Weirder stuff that doesn't appear in the documentation?
+    knownVulnerabilities = listOf str;
+    name = str;
     version = str;
     tag = str;
     updateWalker = bool;
     executables = listOf str;
     outputsToInstall = listOf str;
     position = str;
+    available = bool;
     repositories = attrsOf str;
     isBuildPythonPackage = platforms;
-    schedulingPriority = str;
+    schedulingPriority = int;
     downloadURLRegexp = str;
     isFcitxEngine = bool;
     isIbusEngine = bool;
+    isGutenprint = bool;
+    badPlatforms = platforms;
   };
 
   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}"
+      if metaTypes.${k}.check v then null else "key '${k}' has a value ${toString 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 [];
 
+  checkPlatform = attrs: let
+      anyMatch = lib.any (lib.meta.platformMatch hostPlatform);
+    in  anyMatch (attrs.meta.platforms or lib.platforms.all) &&
+      ! anyMatch (attrs.meta.badPlatforms or []);
+
   # Check if a derivation is valid, that is whether it passes checks for
   # e.g brokenness or license.
   #
@@ -179,21 +196,21 @@ let
       { 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 !allowUnsupportedSystem && !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 !allowUnsupportedSystem && !(checkPlatform attrs) then
+      { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.config}’"; }
     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;
+  assertValidity = attrs: let
+      validity = checkValidity attrs;
+    in validity // {
+      # Throw an error if trying to evaluate an non-valid derivation
+      handled = if !validity.valid
+        then handleEvalIssue attrs (removeAttrs validity ["valid"])
+        else true;
+  };
 
-in
-  assert validityCondition;
-  derivationArg
+in assertValidity
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index d5885193b9bc45633fbcde0bced92b0d49d165ff..42288e6245e4df010467eff692d3a0da231998b5 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -135,6 +135,8 @@ let
       inherit overrides;
 
       inherit cc;
+
+      isCross = targetPlatform != buildPlatform;
     }
 
     # Propagate any extra attributes.  For instance, we use this to
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index eb8545c6999e987451874e5eec7456373a78920c..46df958b83967875a3bebef29e6a16947ae514b4 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -14,12 +14,29 @@ rec {
   mkDerivation =
     { name ? ""
 
-    , nativeBuildInputs ? []
-    , buildInputs ? []
+    # These types of dependencies are all exhaustively documented in
+    # the "Specifying Dependencies" section of the "Standard
+    # Environment" chapter of the Nixpkgs manual.
 
-    , propagatedNativeBuildInputs ? []
-    , propagatedBuildInputs ? []
+    # TODO(@Ericson2314): Stop using legacy dep attribute names
 
+    #                           host offset -> target offset
+    , depsBuildBuild              ? [] # -1 -> -1
+    , depsBuildBuildPropagated    ? [] # -1 -> -1
+    , nativeBuildInputs           ? [] # -1 ->  0  N.B. Legacy name
+    , propagatedNativeBuildInputs ? [] # -1 ->  0  N.B. Legacy name
+    , depsBuildTarget             ? [] # -1 ->  1
+    , depsBuildTargetPropagated   ? [] # -1 ->  1
+
+    , depsHostHost                ? [] #  0 ->  0
+    , depsHostHostPropagated      ? [] #  0 ->  0
+    , buildInputs                 ? [] #  0 ->  1  N.B. Legacy name
+    , propagatedBuildInputs       ? [] #  0 ->  1  N.B. Legacy name
+
+    , depsTargetTarget            ? [] #  1 ->  1
+    , depsTargetTargetPropagated  ? [] #  1 ->  1
+
+    # Configure Phase
     , configureFlags ? []
     , # Target is not included by default because most programs don't care.
       # Including it then would cause needless mass rebuilds.
@@ -28,6 +45,13 @@ rec {
       configurePlatforms ? lib.optionals
         (stdenv.hostPlatform != stdenv.buildPlatform)
         [ "build" "host" ]
+
+    # Check phase
+    , doCheck ? false
+
+    # InstallCheck phase
+    , doInstallCheck ? false
+
     , crossConfig ? null
     , meta ? {}
     , passthru ? {}
@@ -44,6 +68,7 @@ rec {
 
     , hardeningEnable ? []
     , hardeningDisable ? []
+
     , ... } @ attrs:
 
     # TODO(@Ericson2314): Make this more modular, and not O(n^2).
@@ -56,15 +81,38 @@ rec {
       inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags;
     })
     else let
-      dependencies = map lib.chooseDevOutputs [
-        (map (drv: drv.nativeDrv or drv) nativeBuildInputs
-           ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
-           ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh)
-        (map (drv: drv.crossDrv or drv) buildInputs)
+      references = nativeBuildInputs ++ buildInputs
+                ++ propagatedNativeBuildInputs ++ propagatedBuildInputs;
+
+      dependencies = map (map lib.chooseDevOutputs) [
+        [
+          (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild)
+          (map (drv: drv.nativeDrv or drv) nativeBuildInputs
+             ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
+             ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh)
+          (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget)
+        ]
+        [
+          (map (drv: drv.__spliced.hostHost or drv) depsHostHost)
+          (map (drv: drv.crossDrv or drv) buildInputs)
+        ]
+        [
+          (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget)
+        ]
       ];
-      propagatedDependencies = map lib.chooseDevOutputs [
-        (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)
-        (map (drv: drv.crossDrv or drv) propagatedBuildInputs)
+      propagatedDependencies = map (map lib.chooseDevOutputs) [
+        [
+          (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuildPropagated)
+          (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)
+          (map (drv: drv.__spliced.buildTarget or drv) depsBuildTargetPropagated)
+        ]
+        [
+          (map (drv: drv.__spliced.hostHost or drv) depsHostHostPropagated)
+          (map (drv: drv.crossDrv or drv) propagatedBuildInputs)
+        ]
+        [
+          (map (drv: drv.__spliced.targetTarget or drv) depsTargetTargetPropagated)
+        ]
       ];
 
       outputs' =
@@ -95,9 +143,12 @@ rec {
               (lib.concatLists propagatedDependencies));
         in
         {
-          name = name + lib.optionalString
+          # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
+          # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
+          name = assert validity.handled; name + lib.optionalString
             (stdenv.hostPlatform != stdenv.buildPlatform)
             ("-" + stdenv.hostPlatform.config);
+
           builder = attrs.realBuilder or stdenv.shell;
           args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
           inherit stdenv;
@@ -105,11 +156,19 @@ rec {
           userHook = config.stdenv.userHook or null;
           __ignoreNulls = true;
 
-          nativeBuildInputs = lib.elemAt dependencies 0;
-          buildInputs = lib.elemAt dependencies 1;
+          depsBuildBuild              = lib.elemAt (lib.elemAt dependencies 0) 0;
+          nativeBuildInputs           = lib.elemAt (lib.elemAt dependencies 0) 1;
+          depsBuildTarget             = lib.elemAt (lib.elemAt dependencies 0) 2;
+          depsHostBuild               = lib.elemAt (lib.elemAt dependencies 1) 0;
+          buildInputs                 = lib.elemAt (lib.elemAt dependencies 1) 1;
+          depsTargetTarget            = lib.elemAt (lib.elemAt dependencies 2) 0;
 
-          propagatedNativeBuildInputs = lib.elemAt propagatedDependencies 0;
-          propagatedBuildInputs = lib.elemAt propagatedDependencies 1;
+          depsBuildBuildPropagated    = lib.elemAt (lib.elemAt propagatedDependencies 0) 0;
+          propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1;
+          depsBuildTargetPropagated   = lib.elemAt (lib.elemAt propagatedDependencies 0) 2;
+          depsHostBuildPropagated     = lib.elemAt (lib.elemAt propagatedDependencies 1) 0;
+          propagatedBuildInputs       = lib.elemAt (lib.elemAt propagatedDependencies 1) 1;
+          depsTargetTargetPropagated  = lib.elemAt (lib.elemAt propagatedDependencies 2) 0;
 
           # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
           configureFlags = let inherit (lib) optional elem; in
@@ -134,50 +193,68 @@ rec {
             "/bin/sh"
           ];
           __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
-        } // (if outputs' != [ "out" ] then {
+        } // lib.optionalAttrs (outputs' != [ "out" ]) {
           outputs = outputs';
-        } else { }));
+        } // lib.optionalAttrs (attrs ? doCheck) {
+          # TODO(@Ericson2314): Make unconditional / resolve #33599
+          doCheck = doCheck && (stdenv.hostPlatform == stdenv.buildPlatform);
+        } // lib.optionalAttrs (attrs ? doInstallCheck) {
+          # TODO(@Ericson2314): Make unconditional / resolve #33599
+          doInstallCheck = doInstallCheck && (stdenv.hostPlatform == stdenv.buildPlatform);
+        });
+
+      validity = import ./check-meta.nix {
+        inherit lib config meta;
+        # 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) hostPlatform;
+      } 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 = { }
+      meta = {
+          # `name` above includes cross-compilation cruft (and is under assert),
+          # lets have a clean always accessible version here.
+          inherit name;
+
           # 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) )];
+          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; }
-        ;
+        # Fill `meta.position` to identify the source location of the package.
+        // lib.optionalAttrs (pos != null) {
+          position = pos.file + ":" + toString pos.line;
+        # Expose the result of the checks for everyone to see.
+        } // {
+          available = validity.valid
+                   && (if config.checkMetaRecursively or false
+                       then lib.all (d: d.meta.available or true) references
+                       else true);
+        };
 
     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);
+      lib.extendDerivation
+        validity.handled
+        ({
+           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)
+        (derivation derivationArg);
+
 }
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 02da3829c5ae2ee6412204277102cf55f2797957..d7a4781448ae546e59e626ddf7ded2cd76c4dbd3 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -188,16 +188,6 @@ addToSearchPath() {
     addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@"
 }
 
-
-ensureDir() {
-    echo "warning: ‘ensureDir’ is deprecated; use ‘mkdir’ instead" >&2
-    local dir
-    for dir in "$@"; do
-        if ! [ -x "$dir" ]; then mkdir -p "$dir"; fi
-    done
-}
-
-
 # Add $1/lib* into rpaths.
 # The function is used in multiple-outputs.sh hook,
 # so it is defined here but tried after the hook.
@@ -239,12 +229,12 @@ isScript() {
 
 # printf unfortunately will print a trailing newline regardless
 printLines() {
-    [[ "$#" -gt 0 ]] || return 0
+    (( "$#" > 0 )) || return 0
     printf '%s\n' "$@"
 }
 
 printWords() {
-    [[ "$#" -gt 0 ]] || return 0
+    (( "$#" > 0 )) || return 0
     printf '%s ' "$@"
 }
 
@@ -300,11 +290,83 @@ runHook preHook
 runHook addInputsHook
 
 
-# Recursively find all build inputs.
+# Package accumulators
+
+# shellcheck disable=SC2034
+declare -a pkgsBuildBuild pkgsBuildHost pkgsBuildTarget
+declare -a pkgsHostHost pkgsHostTarget
+declare -a pkgsTargetTarget
+
+declare -ra pkgBuildAccumVars=(pkgsBuildBuild pkgsBuildHost pkgsBuildTarget)
+declare -ra pkgHostAccumVars=(pkgsHostHost pkgsHostTarget)
+declare -ra pkgTargetAccumVars=(pkgsTargetTarget)
+
+declare -ra pkgAccumVarVars=(pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars)
+
+
+# Hooks
+
+declare -a envBuildBuildHooks envBuildHostHooks envBuildTargetHooks
+declare -a envHostHostHooks envHostTargetHooks
+declare -a envTargetTargetHooks
+
+declare -ra pkgBuildHookVars=(envBuildBuildHook envBuildHostHook envBuildTargetHook)
+declare -ra pkgHostHookVars=(envHostHostHook envHostTargetHook)
+declare -ra pkgTargetHookVars=(envTargetTargetHook)
+
+declare -ra pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars)
+
+# Add env hooks for all sorts of deps with the specified host offset.
+addEnvHooks() {
+    local depHostOffset="$1"
+    shift
+    local pkgHookVarsSlice="${pkgHookVarVars[$depHostOffset + 1]}[@]"
+    local pkgHookVar
+    for pkgHookVar in "${!pkgHookVarsSlice}"; do
+        eval "${pkgHookVar}s"'+=("$@")'
+    done
+}
+
+
+# Propagated dep files
+
+declare -ra propagatedBuildDepFiles=(
+    propagated-build-build-deps
+    propagated-native-build-inputs # Legacy name for back-compat
+    propagated-build-target-deps
+)
+declare -ra propagatedHostDepFiles=(
+    propagated-host-host-deps
+    propagated-build-inputs # Legacy name for back-compat
+)
+declare -ra propagatedTargetDepFiles=(
+    propagated-target-target-deps
+)
+declare -ra propagatedDepFilesVars=(
+    propagatedBuildDepFiles
+    propagatedHostDepFiles
+    propagatedTargetDepFiles
+)
+
+# Platform offsets: build = -1, host = 0, target = 1
+declare -ra allPlatOffsets=(-1 0 1)
+
+
+# Mutually-recursively find all build inputs. See the dependency section of the
+# stdenv chapter of the Nixpkgs manual for the specification this algorithm
+# implements.
 findInputs() {
-    local pkg="$1"
-    local var="$2"
-    local propagatedBuildInputsFile="$3"
+    local -r pkg="$1"
+    local -ri hostOffset="$2"
+    local -ri targetOffset="$3"
+
+    # Sanity check
+    (( "$hostOffset" <= "$targetOffset" )) || exit -1
+
+    local varVar="${pkgAccumVarVars[$hostOffset + 1]}"
+    local varRef="$varVar[\$targetOffset - \$hostOffset]"
+    local var="${!varRef}"
+    unset -v varVar varRef
 
     # TODO(@Ericson2314): Restore using associative array once Darwin
     # nix-shell doesn't use impure bash. This should replace the O(n)
@@ -324,6 +386,107 @@ findInputs() {
         exit 1
     fi
 
+    # The current package's host and target offset together
+    # provide a <=-preserving homomorphism from the relative
+    # offsets to current offset
+    function mapOffset() {
+        local -ri inputOffset="$1"
+        if (( "$inputOffset" <= 0 )); then
+            local -ri outputOffset="$inputOffset + $hostOffset"
+        else
+            local -ri outputOffset="$inputOffset - 1 + $targetOffset"
+        fi
+        echo "$outputOffset"
+    }
+
+    # Host offset relative to that of the package whose immediate
+    # dependencies we are currently exploring.
+    local -i relHostOffset
+    for relHostOffset in "${allPlatOffsets[@]}"; do
+        # `+ 1` so we start at 0 for valid index
+        local files="${propagatedDepFilesVars[$relHostOffset + 1]}"
+
+        # Host offset relative to the package currently being
+        # built---as absolute an offset as will be used.
+        local -i hostOffsetNext
+        hostOffsetNext="$(mapOffset relHostOffset)"
+
+        # Ensure we're in bounds relative to the package currently
+        # being built.
+        [[ "${allPlatOffsets[*]}" = *"$hostOffsetNext"*  ]] || continue
+
+        # Target offset relative to the *host* offset of the package
+        # whose immediate dependencies we are currently exploring.
+        local -i relTargetOffset
+        for relTargetOffset in "${allPlatOffsets[@]}"; do
+            (( "$relHostOffset" <= "$relTargetOffset" )) || continue
+
+            local fileRef="${files}[$relTargetOffset - $relHostOffset]"
+            local file="${!fileRef}"
+            unset -v fileRef
+
+            # Target offset relative to the package currently being
+            # built.
+            local -i targetOffsetNext
+            targetOffsetNext="$(mapOffset relTargetOffset)"
+
+            # Once again, ensure we're in bounds relative to the
+            # package currently being built.
+            [[ "${allPlatOffsets[*]}" = *"$targetOffsetNext"* ]] || continue
+
+            [[ -f "$pkg/nix-support/$file" ]] || continue
+
+            local pkgNext
+            for pkgNext in $(< "$pkg/nix-support/$file"); do
+                findInputs "$pkgNext" "$hostOffsetNext" "$targetOffsetNext"
+            done
+        done
+    done
+}
+
+# Make sure all are at least defined as empty
+: ${depsBuildBuild=} ${depsBuildBuildPropagated=}
+: ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=}
+: ${depsBuildTarget=} ${depsBuildTargetPropagated=}
+: ${depsHostHost=} ${depsHostHostPropagated=}
+: ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=}
+: ${depsTargetTarget=} ${depsTargetTargetPropagated=}
+
+for pkg in $depsBuildBuild $depsBuildBuildPropagated; do
+    findInputs "$pkg" -1 -1
+done
+for pkg in $nativeBuildInputs $propagatedNativeBuildInputs; do
+    findInputs "$pkg" -1  0
+done
+for pkg in $depsBuildTarget $depsBuildTargetPropagated; do
+    findInputs "$pkg" -1  1
+done
+for pkg in $depsHostHost $depsHostHostPropagated; do
+    findInputs "$pkg"  0  0
+done
+for pkg in $buildInputs $propagatedBuildInputs ; do
+    findInputs "$pkg"  0  1
+done
+for pkg in $depsTargetTarget $depsTargetTargetPropagated; do
+    findInputs "$pkg"  1  1
+done
+# Default inputs must be processed last
+for pkg in $defaultNativeBuildInputs; do
+    findInputs "$pkg" -1  0
+done
+for pkg in $defaultBuildInputs; do
+    findInputs "$pkg"  0  1
+done
+
+# Add package to the future PATH and run setup hooks
+activatePackage() {
+    local pkg="$1"
+    local -ri hostOffset="$2"
+    local -ri targetOffset="$3"
+
+    # Sanity check
+    (( "$hostOffset" <= "$targetOffset" )) || exit -1
+
     if [ -f "$pkg" ]; then
         local oldOpts="$(shopt -po nounset)"
         set +u
@@ -331,84 +494,91 @@ findInputs() {
         eval "$oldOpts"
     fi
 
-    if [ -d "$pkg/bin" ]; then
+    # Only dependencies whose host platform is guaranteed to match the
+    # build platform are included here. That would be `depsBuild*`,
+    # and legacy `nativeBuildInputs`, in general. If we aren't cross
+    # compiling, however, everything can be put on the PATH. To ease
+    # the transition, we do include everything in thatcase.
+    #
+    # TODO(@Ericson2314): Don't special-case native compilation
+    if [[ ( -z "${crossConfig-}" ||  "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then
         addToSearchPath _PATH "$pkg/bin"
     fi
 
-    if [ -f "$pkg/nix-support/setup-hook" ]; then
+    if [[ -f "$pkg/nix-support/setup-hook" ]]; then
         local oldOpts="$(shopt -po nounset)"
         set +u
         source "$pkg/nix-support/setup-hook"
         eval "$oldOpts"
     fi
-
-    if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then
-        local pkgNext
-        for pkgNext in $(< "$pkg/nix-support/$propagatedBuildInputsFile"); do
-            findInputs "$pkgNext" "$var" "$propagatedBuildInputsFile"
-        done
-    fi
 }
 
-declare -a nativePkgs crossPkgs
-if [ -z "${crossConfig:-}" ]; then
-    # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs)
-    # are handled identically to nativeBuildInputs
-    for i in ${nativeBuildInputs:-} ${buildInputs:-} \
-             ${defaultNativeBuildInputs:-} ${defaultBuildInputs:-} \
-             ${propagatedNativeBuildInputs:-} ${propagatedBuildInputs:-}; do
-        findInputs "$i" nativePkgs propagated-native-build-inputs
-    done
-else
-    for i in ${buildInputs:-} ${defaultBuildInputs:-} ${propagatedBuildInputs:-}; do
-        findInputs "$i" crossPkgs propagated-build-inputs
-    done
-
-    declare -a nativePkgs
-    for i in ${nativeBuildInputs:-} ${defaultNativeBuildInputs:-} ${propagatedNativeBuildInputs:-}; do
-        findInputs "$i" nativePkgs propagated-native-build-inputs
+_activatePkgs() {
+    local -i hostOffset targetOffset
+    local pkg
+
+    for hostOffset in "${allPlatOffsets[@]}"; do
+        local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}"
+        for targetOffset in "${allPlatOffsets[@]}"; do
+            (( "$hostOffset" <= "$targetOffset" )) || continue
+            local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]"
+            local pkgsSlice="${!pkgsRef}[@]"
+            for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do
+                activatePackage "$pkg" "$hostOffset" "$targetOffset"
+            done
+        done
     done
-fi
+}
 
+# Run the package setup hooks and build _PATH
+_activatePkgs
 
 # Set the relevant environment variables to point to the build inputs
 # found above.
 #
-# These `depOffset`s tell the env hook what sort of dependency
-# (ignoring propagatedness) is being passed to the env hook. In a real
-# language, we'd append a closure with this information to the
-# relevant env hook array, but bash doesn't have closures, so it's
-# easier to just pass this in.
-
-_addToNativeEnv() {
-    local pkg="$1"
-    if [[ -n "${crossConfig:-}" ]]; then
-        local -i depOffset=-1
-    else
-        local -i depOffset=0
-    fi
-
-    # Run the package-specific hooks set by the setup-hook scripts.
-    runHook envHook "$pkg"
-}
-
-# Old bash empty array hack
-for i in ${nativePkgs+"${nativePkgs[@]}"}; do
-    _addToNativeEnv "$i"
-done
-
-_addToCrossEnv() {
-    local pkg="$1"
-    local -i depOffset=0
-
-    # Run the package-specific hooks set by the setup-hook scripts.
-    runHook crossEnvHook "$pkg"
+# These `depOffset`s, beyond indexing the arrays, also tell the env
+# hook what sort of dependency (ignoring propagatedness) is being
+# passed to the env hook. In a real language, we'd append a closure
+# with this information to the relevant env hook array, but bash
+# doesn't have closures, so it's easier to just pass this in.
+_addToEnv() {
+    local -i depHostOffset depTargetOffset
+    local pkg
+
+    for depHostOffset in "${allPlatOffsets[@]}"; do
+        local hookVar="${pkgHookVarVars[$depHostOffset + 1]}"
+        local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}"
+        for depTargetOffset in "${allPlatOffsets[@]}"; do
+            (( "$depHostOffset" <= "$depTargetOffset" )) || continue
+            local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]"
+            if [[ -z "${crossConfig-}" ]]; then
+                # Apply environment hooks to all packages during native
+                # compilation to ease the transition.
+                #
+                # TODO(@Ericson2314): Don't special-case native compilation
+                for pkg in \
+                    ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \
+                    ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \
+                    ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \
+                    ${pkgsHostHost+"${pkgsHostHost[@]}"} \
+                    ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \
+                    ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"}
+                do
+                    runHook "${!hookRef}" "$pkg"
+                done
+            else
+                local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]"
+                local pkgsSlice="${!pkgsRef}[@]"
+                for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do
+                    runHook "${!hookRef}" "$pkg"
+                done
+            fi
+        done
+    done
 }
 
-# Old bash empty array hack
-for i in ${crossPkgs+"${crossPkgs[@]}"}; do
-    _addToCrossEnv "$i"
-done
+# Run the package-specific hooks set by the setup-hook scripts.
+_addToEnv
 
 
 _addRpathPrefix "$out"
@@ -599,7 +769,7 @@ _defaultUnpack() {
         # We can't preserve hardlinks because they may have been
         # introduced by store optimization, which might break things
         # in the build.
-        cp -pr --reflink=auto "$fn" "$(stripHash "$fn")"
+        cp -pr --reflink=auto -- "$fn" "$(stripHash "$fn")"
 
     else
 
@@ -696,7 +866,7 @@ unpackPhase() {
     # necessary when sources have been copied from other store
     # locations.
     if [ "${dontMakeSourcesWritable:-0}" != 1 ]; then
-        chmod -R u+w "$sourceRoot"
+        chmod -R u+w -- "$sourceRoot"
     fi
 
     runHook postUnpack
@@ -871,6 +1041,7 @@ installPhase() {
 # propagated-build-inputs.
 fixupPhase() {
     # Make sure everything is writable so "strip" et al. work.
+    local output
     for output in $outputs; do
         if [ -e "${!output}" ]; then chmod -R u+w "${!output}"; fi
     done
@@ -884,32 +1055,36 @@ fixupPhase() {
     done
 
 
-    # Propagate build inputs and setup hook into the development output.
+    # Propagate dependencies & setup hook into the development output.
+    declare -ra flatVars=(
+        # Build
+        depsBuildBuildPropagated
+        propagatedNativeBuildInputs
+        depsBuildTargetPropagated
+        # Host
+        depsHostHostPropagated
+        propagatedBuildInputs
+        # Target
+        depsTargetTargetPropagated
+    )
+    declare -ra flatFiles=(
+        "${propagatedBuildDepFiles[@]}"
+        "${propagatedHostDepFiles[@]}"
+        "${propagatedTargetDepFiles[@]}"
+    )
 
-    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"
-            # shellcheck disable=SC2086
-            printWords $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs"
-        fi
-    else
-        if [ -n "${propagatedBuildInputs:-}" ]; then
-            mkdir -p "${!outputDev}/nix-support"
-            # shellcheck disable=SC2086
-            printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs"
-        fi
+    local propagatedInputsIndex
+    for propagatedInputsIndex in "${!flatVars[@]}"; do
+        local propagatedInputsSlice="${flatVars[$propagatedInputsIndex]}[@]"
+        local propagatedInputsFile="${flatFiles[$propagatedInputsIndex]}"
+
+        [[ "${!propagatedInputsSlice}" ]] || continue
+
+        mkdir -p "${!outputDev}/nix-support"
+        # shellcheck disable=SC2086
+        printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile"
+    done
 
-        if [ -n "${propagatedNativeBuildInputs:-}" ]; then
-            mkdir -p "${!outputDev}/nix-support"
-            # shellcheck disable=SC2086
-            printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs"
-        fi
-    fi
 
     if [ -n "${setupHook:-}" ]; then
         mkdir -p "${!outputDev}/nix-support"
diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ff0eec893f2ffcf9ed59949e2188d4bab1340846
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix
@@ -0,0 +1,11 @@
+{
+  busybox = import  {
+    url = https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox;
+    sha256 = "01s6bwq84wyrjh3rdsgxni9gkzp7ss8rghg0cmp8zd87l79y8y4g";
+    executable = true;
+  };
+  bootstrapTools = import  {
+    url = https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz;
+    sha256 = "0pbqrw9z4ifkijpfpx15l2dzi00rq8c5zg9ghimz5qgr5dx7f7cl";
+  };
+}
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix
new file mode 100644
index 0000000000000000000000000000000000000000..45ac0d5f9acd076647b8013e489c53a6af5e5134
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix
@@ -0,0 +1,11 @@
+{
+  busybox = import  {
+    url = https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/busybox;
+    sha256 = "01d0hp1xgrriiy9w0sd9vbqzwxnpwiyah80pi4vrpcmbwji36j1i";
+    executable = true;
+  };
+  bootstrapTools = import  {
+    url = https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/bootstrap-tools.tar.xz;
+    sha256 = "1r9mz9w8y5jd7gfwfsrvs20qarzxy7bvrp5dlm41hnx6z617if1h";
+  };
+}
diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix
new file mode 100644
index 0000000000000000000000000000000000000000..12093f3400082cdb7e752cf655f6e908d0654d6c
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix
@@ -0,0 +1,11 @@
+{
+  busybox = import  {
+    url = https://wdtz.org/files/030q34q7fk6jdfxkgcqp5rzr4yhw3pgx-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/busybox;
+    sha256 = "16lzrwwvdk6q3g08gs45pldz0rh6xpln2343xr444960h6wqxl5v";
+    executable = true;
+  };
+  bootstrapTools = import  {
+    url = https://wdtz.org/files/030q34q7fk6jdfxkgcqp5rzr4yhw3pgx-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz;
+    sha256 = "0ly0wj8wzbikn2j8sn727vikk90bq36drh98qvfx1kkh5k5azm2j";
+  };
+}
diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6118585d545f9cededef339506a165b12495bed1
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
@@ -0,0 +1,18 @@
+{ system, bootstrapFiles }:
+
+derivation {
+  name = "bootstrap-tools";
+
+  builder = bootstrapFiles.busybox;
+
+  args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
+
+  tarball = bootstrapFiles.bootstrapTools;
+
+  inherit system;
+
+  # Needed by the GCC wrapper.
+  langC = true;
+  langCC = true;
+  isGNU = true;
+}
diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
new file mode 100644
index 0000000000000000000000000000000000000000..8b5070dc6d6fb269fdcc372a9651affc4116a9c3
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
@@ -0,0 +1,64 @@
+# Unpack the bootstrap tools tarball.
+echo Unpacking the bootstrap tools...
+$builder mkdir $out
+< $tarball $builder unxz | $builder tar x -C $out
+
+# Set the ELF interpreter / RPATH in the bootstrap binaries.
+echo Patching the bootstrap tools...
+
+if test -f $out/lib/ld.so.?; then
+   # MIPS case
+   LD_BINARY=$out/lib/ld.so.?
+else
+   # i686, x86_64 and armv5tel
+   LD_BINARY=$out/lib/ld-*so.?
+fi
+
+# On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs.  So
+# use a copy of patchelf.
+LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/cp $out/bin/patchelf .
+
+for i in $out/bin/* $out/libexec/gcc/*/*/*; do
+    if [ -L "$i" ]; then continue; fi
+    if [ -z "${i##*/liblto*}" ]; then continue; fi
+    echo patching "$i"
+    LD_LIBRARY_PATH=$out/lib $LD_BINARY \
+        ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i"
+done
+
+for i in $out/lib/libiconv*.so $out/lib/libpcre* $out/lib/libc.so; do
+    if [ -L "$i" ]; then continue; fi
+    echo patching "$i"
+    $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i"
+done
+
+export PATH=$out/bin
+
+# Fix the libc linker script.
+#cat $out/lib/libc.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libc.so.tmp
+#mv $out/lib/libc.so.tmp $out/lib/libc.so
+#cat $out/lib/libpthread.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libpthread.so.tmp
+#mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so
+
+# Provide some additional symlinks.
+ln -s bash $out/bin/sh
+ln -s bzip2 $out/bin/bunzip2
+
+# Provide a gunzip script.
+cat > $out/bin/gunzip < $out/bin/egrep
+echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep
+echo "#! $out/bin/sh" > $out/bin/fgrep
+echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep
+
+# Provide xz (actually only xz -d will work).
+echo "#! $out/bin/sh" > $out/bin/xz
+echo "exec $builder unxz \"\$@\"" >> $out/bin/xz
+
+chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/xz
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index a114ab609e6cfac5434e43208a52197f71832b9a..2eb55ae439b55417edab9535508720e2a6f19d6e 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -6,16 +6,28 @@
 { lib
 , localSystem, crossSystem, config, overlays
 
-, bootstrapFiles ? { # switch
-    "i686-linux" = import ./bootstrap-files/i686.nix;
-    "x86_64-linux" = import ./bootstrap-files/x86_64.nix;
-    "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix;
-    "armv6l-linux" = import ./bootstrap-files/armv6l.nix;
-    "armv7l-linux" = import ./bootstrap-files/armv7l.nix;
-    "aarch64-linux" = import ./bootstrap-files/aarch64.nix;
-    "mips64el-linux" = import ./bootstrap-files/loongson2f.nix;
-  }.${localSystem.system}
-    or (abort "unsupported platform for the pure Linux stdenv")
+, bootstrapFiles ?
+  let table = {
+    "glibc" = {
+      "i686-linux" = import ./bootstrap-files/i686.nix;
+      "x86_64-linux" = import ./bootstrap-files/x86_64.nix;
+      "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix;
+      "armv6l-linux" = import ./bootstrap-files/armv6l.nix;
+      "armv7l-linux" = import ./bootstrap-files/armv7l.nix;
+      "aarch64-linux" = import ./bootstrap-files/aarch64.nix;
+      "mipsel-linux" = import ./bootstrap-files/loongson2f.nix;
+    };
+    "musl" = {
+      "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix;
+      "armv6l-linux"  = import ./bootstrap-files/armv6l-musl.nix;
+      "x86_64-linux"  = import ./bootstrap-files/x86_64-musl.nix;
+    };
+  };
+  archLookupTable = table.${localSystem.libc}
+    or (abort "unsupported libc for the pure Linux stdenv");
+  files = archLookupTable.${localSystem.system}
+    or (abort "unsupported platform for the pure Linux stdenv");
+  in files
 }:
 
 assert crossSystem == null;
@@ -28,7 +40,7 @@ let
       export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
       export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
       ${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""}
-      ${if system == "mips64el-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
+      ${if system == "mipsel-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
     '';
 
 
@@ -40,7 +52,9 @@ let
 
 
   # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
-  bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; };
+  bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { inherit system bootstrapFiles; };
+
+  getLibc = stage: stage.${localSystem.libc};
 
 
   # This function builds the various standard environments used during
@@ -52,7 +66,7 @@ let
     let
 
       thisStdenv = import ../generic {
-        name = "stdenv-linux-boot";
+        name = "${name}-stdenv-linux";
         buildPlatform = localSystem;
         hostPlatform = localSystem;
         targetPlatform = localSystem;
@@ -74,16 +88,18 @@ let
         cc = if isNull prevStage.gcc-unwrapped
              then null
              else lib.makeOverridable (import ../../build-support/cc-wrapper) {
+          name = "${name}-gcc-wrapper";
           nativeTools = false;
+          propagateDoc = false;
           nativeLibc = false;
           buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
             inherit (prevStage) stdenv;
           };
           cc = prevStage.gcc-unwrapped;
+          bintools = prevStage.binutils;
           isGNU = true;
-          libc = prevStage.glibc;
-          inherit (prevStage) binutils coreutils gnugrep;
-          name = name;
+          libc = getLibc prevStage;
+          inherit (prevStage) coreutils gnugrep;
           stdenvNoCC = prevStage.ccWrapperStdenv;
         };
 
@@ -94,6 +110,7 @@ let
 
           # stdenv.glibc is used by GCC build to figure out the system-level
           # /usr/include directory.
+          # TODO: Remove this!
           inherit (prevStage) glibc;
         };
         overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
@@ -112,7 +129,8 @@ in
     __raw = true;
 
     gcc-unwrapped = null;
-    glibc = null;
+    glibc = assert false; null;
+    musl = assert false; null;
     binutils = null;
     coreutils = null;
     gnugrep = null;
@@ -121,7 +139,7 @@ in
   # Build a dummy stdenv with no GCC or working fetchurl.  This is
   # because we need a stdenv to build the GCC wrapper and fetchurl.
   (prevStage: stageFun prevStage {
-    name = null;
+    name = "bootstrap-stage0";
 
     overrides = self: super: {
       # We thread stage0's stdenv through under this name so downstream stages
@@ -134,16 +152,27 @@ in
       # will search the Glibc headers before the GCC headers).  So
       # create a dummy Glibc here, which will be used in the stdenv of
       # stage1.
-      glibc = self.stdenv.mkDerivation {
-        name = "bootstrap-glibc";
+      ${localSystem.libc} = self.stdenv.mkDerivation {
+        name = "bootstrap-stage0-${localSystem.libc}";
         buildCommand = ''
           mkdir -p $out
           ln -s ${bootstrapTools}/lib $out/lib
+        '' + lib.optionalString (localSystem.libc == "glibc") ''
           ln -s ${bootstrapTools}/include-glibc $out/include
+        '' + lib.optionalString (localSystem.libc == "musl") ''
+          ln -s ${bootstrapTools}/include-libc $out/include
         '';
       };
       gcc-unwrapped = bootstrapTools;
-      binutils = bootstrapTools;
+      binutils = import ../../build-support/bintools-wrapper {
+        name = "bootstrap-stage0-binutils-wrapper";
+        nativeTools = false;
+        nativeLibc = false;
+        buildPackages = { };
+        libc = getLibc self;
+        inherit (self) stdenvNoCC coreutils gnugrep;
+        bintools = bootstrapTools;
+      };
       coreutils = bootstrapTools;
       gnugrep = bootstrapTools;
     };
@@ -161,14 +190,16 @@ in
   # simply re-export those packages in the middle stage(s) using the
   # overrides attribute and the inherit syntax.
   (prevStage: stageFun prevStage {
-    name = "bootstrap-gcc-wrapper";
+    name = "bootstrap-stage1";
 
     # Rebuild binutils to use from stage2 onwards.
     overrides = self: super: {
-      binutils = super.binutils.override { gold = false; };
+      binutils = super.binutils_nogold;
       inherit (prevStage)
         ccWrapperStdenv
-        glibc gcc-unwrapped coreutils gnugrep;
+        gcc-unwrapped coreutils gnugrep;
+
+      ${localSystem.libc} = getLibc prevStage;
 
       # A threaded perl build needs glibc/libpthread_nonshared.a,
       # which is not included in bootstrapTools, so disable threading.
@@ -183,14 +214,19 @@ in
   # 2nd stdenv that contains our own rebuilt binutils and is used for
   # compiling our own Glibc.
   (prevStage: stageFun prevStage {
-    name = "bootstrap-gcc-wrapper";
+    name = "bootstrap-stage2";
 
     overrides = self: super: {
       inherit (prevStage)
         ccWrapperStdenv
-        binutils gcc-unwrapped coreutils gnugrep
+        gcc-unwrapped coreutils gnugrep
         perl paxctl gnum4 bison;
       # This also contains the full, dynamically linked, final Glibc.
+      binutils = prevStage.binutils.override {
+        # Rewrap the binutils with the new glibc, so both the next
+        # stage's wrappers use it.
+        libc = getLibc self;
+      };
     };
   })
 
@@ -199,22 +235,23 @@ in
   # one uses the rebuilt Glibc from stage2.  It still uses the recent
   # binutils and rest of the bootstrap tools, including GCC.
   (prevStage: stageFun prevStage {
-    name = "bootstrap-gcc-wrapper";
+    name = "bootstrap-stage3";
 
     overrides = self: super: rec {
       inherit (prevStage)
         ccWrapperStdenv
-        binutils glibc coreutils gnugrep
+        binutils coreutils gnugrep
         perl patchelf linuxHeaders gnum4 bison;
+      ${localSystem.libc} = getLibc prevStage;
       # Link GCC statically against GMP etc.  This makes sense because
       # these builds of the libraries are only used by GCC, so it
       # reduces the size of the stdenv closure.
       gmp = super.gmp.override { stdenv = self.makeStaticLibraries self.stdenv; };
       mpfr = super.mpfr.override { stdenv = self.makeStaticLibraries self.stdenv; };
       libmpc = super.libmpc.override { stdenv = self.makeStaticLibraries self.stdenv; };
-      isl_0_14 = super.isl_0_14.override { stdenv = self.makeStaticLibraries self.stdenv; };
+      isl_0_17 = super.isl_0_17.override { stdenv = self.makeStaticLibraries self.stdenv; };
       gcc-unwrapped = super.gcc-unwrapped.override {
-        isl = isl_0_14;
+        isl = isl_0_17;
       };
     };
     extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
@@ -226,14 +263,23 @@ in
   # Construct a fourth stdenv that uses the new GCC.  But coreutils is
   # still from the bootstrap tools.
   (prevStage: stageFun prevStage {
-    name = "";
+    name = "bootstrap-stage4";
 
     overrides = self: super: {
       # Zlib has to be inherited and not rebuilt in this stage,
       # because gcc (since JAR support) already depends on zlib, and
       # then if we already have a zlib we want to use that for the
       # other purposes (binutils and top-level pkgs) too.
-      inherit (prevStage) gettext gnum4 bison gmp perl glibc zlib linuxHeaders;
+      inherit (prevStage) gettext gnum4 bison gmp perl zlib linuxHeaders;
+      ${localSystem.libc} = getLibc prevStage;
+      binutils = super.binutils.override {
+        # Don't use stdenv's shell but our own
+        shell = self.bash + "/bin/bash";
+        # Build expand-response-params with last stage like below
+        buildPackages = {
+          inherit (prevStage) stdenv;
+        };
+      };
 
       gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) {
         nativeTools = false;
@@ -243,9 +289,9 @@ in
           inherit (prevStage) stdenv;
         };
         cc = prevStage.gcc-unwrapped;
-        libc = self.glibc;
-        inherit (self) stdenvNoCC binutils coreutils gnugrep;
-        name = "";
+        bintools = self.binutils;
+        libc = getLibc self;
+        inherit (self) stdenvNoCC coreutils gnugrep;
         shell = self.bash + "/bin/bash";
       };
     };
@@ -264,6 +310,8 @@ in
   (prevStage: {
     inherit config overlays;
     stdenv = import ../generic rec {
+      name = "stdenv-linux";
+
       buildPlatform = localSystem;
       hostPlatform = localSystem;
       targetPlatform = localSystem;
@@ -290,7 +338,9 @@ in
       inherit (prevStage.stdenv) fetchurlBoot;
 
       extraAttrs = {
+        # TODO: remove this!
         inherit (prevStage) glibc;
+
         inherit platform bootstrapTools;
         shellPackage = prevStage.bash;
       };
@@ -299,8 +349,8 @@ in
       allowedRequisites = with prevStage; with lib;
         # Simple executable tools
         concatMap (p: [ (getBin p) (getLib p) ])
-          [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
-            gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
+          [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils
+            gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
           ]
         # Library dependencies
         ++ map getLib (
@@ -308,21 +358,23 @@ in
             ++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv
           )
         # More complicated cases
-        ++ [
-            glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
-            gcc gcc.cc gcc.cc.lib gcc.expand-response-params
+        ++ (map (x: getOutput x (getLibc prevStage)) [ "out" "dev" "bin" ] )
+        ++  [ /*propagated from .dev*/ linuxHeaders
+            binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params
           ]
+          ++ lib.optional (localSystem.libc == "musl") libiconv
           ++ lib.optionals localSystem.isAarch64
             [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];
 
       overrides = self: super: {
         inherit (prevStage)
           gzip bzip2 xz bash coreutils diffutils findutils gawk
-          glibc gnumake gnused gnutar gnugrep gnupatch patchelf
+          gnumake gnused gnutar gnugrep gnupatch patchelf
           attr acl paxctl zlib pcre;
+        ${localSystem.libc} = getLibc prevStage;
       } // lib.optionalAttrs (super.targetPlatform == localSystem) {
         # Need to get rid of these when cross-compiling.
-        inherit (prevStage) binutils;
+        inherit (prevStage) binutils binutils-unwrapped;
         gcc = cc;
       };
     };
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 90c9d2cef67f2fe7a376264278ac0cc22c0bd644..6c217be4ea3c7b706c764c2e79dda001847cce1c 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -1,233 +1,21 @@
 {system ? builtins.currentSystem}:
 
-let buildFor = toolsArch: (
-
 let
-  lib = import ../../../lib;
-  pkgsFun = import ../../..;
-
-  inherit (lib.systems.examples)
-    sheevaplug raspberryPi armv7l-hf-multiplatform
-    aarch64-multiplatform scaleway-c1 pogoplug4;
-
-  selectedCrossSystem =
-    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; crossSystem = selectedCrossSystem; });
-
-  glibc = pkgs.libcCross;
-  bash = pkgs.bash;
-  findutils = pkgs.findutils;
-  diffutils = pkgs.diffutils;
-  gnused = pkgs.gnused;
-  gnugrep = pkgs.gnugrep;
-  gawk = pkgs.gawk;
-  gzip = pkgs.gzip;
-  bzip2 = pkgs.bzip2;
-  gnumake = pkgs.gnumake;
-  patch = pkgs.patch;
-  patchelf = pkgs.patchelf;
-  gcc = pkgs.gcc.cc;
-  gmpxx = pkgs.gmpxx;
-  mpfr = pkgs.mpfr;
-  zlib = pkgs.zlib;
-  libmpc = pkgs.libmpc;
-  binutils = pkgs.binutils;
-  libelf = pkgs.libelf;
-
-  # Keep these versions in sync with the versions used in the current GCC!
-  isl = pkgs.isl_0_14;
-in
-
-rec {
-
-
-  coreutilsMinimal = pkgs.coreutils.override (args: {
-    # We want coreutils without ACL/attr support.
-    aclSupport = false;
-    attrSupport = false;
-    # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
-    singleBinary = "symlinks";
-  });
-
-  tarMinimal = pkgs.gnutar.override { acl = null; };
-
-  busyboxMinimal = pkgs.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
-      CONFIG_MKDIR y
-      CONFIG_TAR y
-      CONFIG_UNXZ y
-    '';
+  make = crossSystem: import ./make-bootstrap-tools.nix {
+    localSystem = { inherit system; };
+    inherit crossSystem;
   };
 
-  build =
-
-    pkgs.stdenv.mkDerivation {
-      name = "stdenv-bootstrap-tools-cross";
-      crossConfig = pkgs.hostPlatform.config;
-
-      nativeBuildInputs = [
-        pkgs.buildPackages.nukeReferences
-        pkgs.buildPackages.cpio
-      ];
-
-      buildCommand = ''
-        set -x
-        mkdir -p $out/bin $out/lib $out/libexec
-
-        # Copy what we need of Glibc.
-        cp -d ${glibc.out}/lib/ld-*.so* $out/lib
-        cp -d ${glibc.out}/lib/libc*.so* $out/lib
-        cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib
-        cp -d ${glibc.out}/lib/libm*.so* $out/lib
-        cp -d ${glibc.out}/lib/libdl*.so* $out/lib
-        cp -d ${glibc.out}/lib/librt*.so*  $out/lib
-        cp -d ${glibc.out}/lib/libpthread*.so* $out/lib
-        cp -d ${glibc.out}/lib/libnsl*.so* $out/lib
-        cp -d ${glibc.out}/lib/libutil*.so* $out/lib
-        cp -d ${glibc.out}/lib/libnss*.so* $out/lib
-        cp -d ${glibc.out}/lib/libresolv*.so* $out/lib
-        cp -d ${glibc.out}/lib/crt?.o $out/lib
-
-        cp -rL ${glibc.dev}/include $out
-        chmod -R u+w "$out"
-
-        # glibc can contain linker scripts: find them, copy their deps,
-        # and get rid of absolute paths (nuke-refs would make them useless)
-        local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib")
-        cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc.out}' | sort -u)
-        for f in $lScripts; do
-          substituteInPlace "$f" --replace '${glibc.out}/lib/' ""
-        done
-
-        # Hopefully we won't need these.
-        rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
-        find $out/include -name .install -exec rm {} \;
-        find $out/include -name ..install.cmd -exec rm {} \;
-        mv $out/include $out/include-glibc
-
-        # Copy coreutils, bash, etc.
-        cp ${coreutilsMinimal}/bin/* $out/bin
-        (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
-
-        cp ${bash}/bin/bash $out/bin
-        cp ${findutils}/bin/find $out/bin
-        cp ${findutils}/bin/xargs $out/bin
-        cp -d ${diffutils}/bin/* $out/bin
-        cp -d ${gnused}/bin/* $out/bin
-        cp -d ${gnugrep}/bin/grep $out/bin
-        cp ${gawk}/bin/gawk $out/bin
-        cp -d ${gawk}/bin/awk $out/bin
-        cp ${tarMinimal}/bin/tar $out/bin
-        cp ${gzip}/bin/gzip $out/bin
-        cp ${bzip2.bin}/bin/bzip2 $out/bin
-        cp -d ${gnumake}/bin/* $out/bin
-        cp -d ${patch}/bin/* $out/bin
-        cp ${patchelf}/bin/* $out/bin
-
-        cp -d ${gnugrep.pcre.out}/lib/libpcre*.so* $out/lib # needed by grep
-
-        # Copy what we need of GCC.
-        cp -d ${gcc.out}/bin/gcc $out/bin
-        cp -d ${gcc.out}/bin/cpp $out/bin
-        cp -d ${gcc.out}/bin/g++ $out/bin
-        cp -d ${gcc.lib}/lib*/libgcc_s.so* $out/lib
-        cp -d ${gcc.lib}/lib*/libstdc++.so* $out/lib
-        cp -rd ${gcc.out}/lib/gcc $out/lib
-        chmod -R u+w $out/lib
-        rm -f $out/lib/gcc/*/*/include*/linux
-        rm -f $out/lib/gcc/*/*/include*/sound
-        rm -rf $out/lib/gcc/*/*/include*/root
-        rm -f $out/lib/gcc/*/*/include-fixed/asm
-        rm -rf $out/lib/gcc/*/*/plugin
-        #rm -f $out/lib/gcc/*/*/*.a
-        cp -rd ${gcc.out}/libexec/* $out/libexec
-        chmod -R u+w $out/libexec
-        rm -rf $out/libexec/gcc/*/*/plugin
-        mkdir $out/include
-        cp -rd ${gcc.out}/include/c++ $out/include
-        chmod -R u+w $out/include
-        rm -rf $out/include/c++/*/ext/pb_ds
-        rm -rf $out/include/c++/*/ext/parallel
-
-        cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib
-        cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
-        cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
-        cp -d ${zlib.out}/lib/libz.so* $out/lib
-        cp -d ${libelf}/lib/libelf.so* $out/lib
-
-        # These needed for cross but not native tools because the stdenv
-        # GCC has certain things built in statically. See
-        # pkgs/stdenv/linux/default.nix for the details.
-        cp -d ${isl}/lib/libisl*.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
-        done
-        cp -d ${binutils.lib}/lib/lib*.so* $out/lib
-
-        chmod -R u+w $out
-
-        # Strip executables even further.
-        for i in $out/bin/* $out/libexec/gcc/*/*/*; do
-            if test -x $i -a ! -L $i; then
-                chmod +w $i
-                $crossConfig-strip -s $i || true
-            fi
-        done
-
-        nuke-refs $out/bin/*
-        nuke-refs $out/lib/*
-        nuke-refs $out/libexec/gcc/*/*/*
-
-        mkdir $out/.pack
-        mv $out/* $out/.pack
-        mv $out/.pack $out/pack
-
-        mkdir $out/on-server
-        tar cvfJ $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack .
-        cp ${busyboxMinimal}/bin/busybox $out/on-server
-        chmod u+w $out/on-server/busybox
-        nuke-refs $out/on-server/busybox
-      ''; # */
-
-      # The result should not contain any references (store paths) so
-      # that we can safely copy them out of the store and to other
-      # locations in the store.
-      allowedReferences = [];
-    };
-
-  dist = pkgs.stdenv.mkDerivation {
-    name = "stdenv-bootstrap-tools-cross";
-
-    buildCommand = ''
-      mkdir -p $out/nix-support
-      echo "file tarball ${build}/on-server/bootstrap-tools.tar.xz" >> $out/nix-support/hydra-build-products
-      echo "file busybox ${build}/on-server/busybox" >> $out/nix-support/hydra-build-products
-    '';
-  };
-}
-
-); in {
-    armv5tel = buildFor "armv5tel";
-    armv6l = buildFor "armv6l";
-    armv7l = buildFor "armv7l";
-    aarch64 = buildFor "aarch64";
-    scaleway = buildFor "scaleway";
-    pogoplug4 = buildFor "pogoplug4";
+in with (import ../../../lib).systems.examples; {
+  armv5tel   = make sheevaplug;
+  scaleway   = make scaleway-c1;
+  pogoplug4  = make pogoplug4;
+  armv6l     = make raspberryPi;
+  armv7l     = make armv7l-hf-multiplatform;
+  aarch64    = make aarch64-multiplatform;
+  x86_64-musl  = make musl64;
+  i686-musl    = make musl32;
+  armv6l-musl  = make muslpi;
+  aarch64-musl = make aarch64-multiplatform-musl;
+  riscv64 = make riscv64;
 }
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index c8cddf248ab907f47447352145966b32564d1fca..5522bc5dea25a7da96187d776458e0b8198a743f 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -1,8 +1,11 @@
-{ system ? builtins.currentSystem }:
+{ localSystem ? { system = builtins.currentSystem; }
+, crossSystem ? null
+}:
 
-with import ../../.. {inherit system;};
-
-rec {
+let
+  pkgs = import ../../.. { inherit localSystem crossSystem; };
+  libc = pkgs.stdenv.cc.libc;
+in with pkgs; rec {
 
 
   coreutilsMinimal = coreutils.override (args: {
@@ -16,7 +19,7 @@ rec {
   tarMinimal = gnutar.override { acl = null; };
 
   busyboxMinimal = busybox.override {
-    useMusl = true;
+    useMusl = !targetPlatform.isRiscV;
     enableStatic = true;
     enableMinimal = true;
     extraConfig = ''
@@ -35,35 +38,36 @@ rec {
     stdenv.mkDerivation {
       name = "stdenv-bootstrap-tools";
 
-      buildInputs = [nukeReferences cpio];
+      nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ];
 
       buildCommand = ''
         set -x
         mkdir -p $out/bin $out/lib $out/libexec
 
+      '' + (if (hostPlatform.libc == "glibc") then ''
         # Copy what we need of Glibc.
-        cp -d ${glibc.out}/lib/ld*.so* $out/lib
-        cp -d ${glibc.out}/lib/libc*.so* $out/lib
-        cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib
-        cp -d ${glibc.out}/lib/libm*.so* $out/lib
-        cp -d ${glibc.out}/lib/libdl*.so* $out/lib
-        cp -d ${glibc.out}/lib/librt*.so*  $out/lib
-        cp -d ${glibc.out}/lib/libpthread*.so* $out/lib
-        cp -d ${glibc.out}/lib/libnsl*.so* $out/lib
-        cp -d ${glibc.out}/lib/libutil*.so* $out/lib
-        cp -d ${glibc.out}/lib/libnss*.so* $out/lib
-        cp -d ${glibc.out}/lib/libresolv*.so* $out/lib
-        cp -d ${glibc.out}/lib/crt?.o $out/lib
-
-        cp -rL ${glibc.dev}/include $out
+        cp -d ${libc.out}/lib/ld*.so* $out/lib
+        cp -d ${libc.out}/lib/libc*.so* $out/lib
+        cp -d ${libc.out}/lib/libc_nonshared.a $out/lib
+        cp -d ${libc.out}/lib/libm*.so* $out/lib
+        cp -d ${libc.out}/lib/libdl*.so* $out/lib
+        cp -d ${libc.out}/lib/librt*.so*  $out/lib
+        cp -d ${libc.out}/lib/libpthread*.so* $out/lib
+        cp -d ${libc.out}/lib/libnsl*.so* $out/lib
+        cp -d ${libc.out}/lib/libutil*.so* $out/lib
+        cp -d ${libc.out}/lib/libnss*.so* $out/lib
+        cp -d ${libc.out}/lib/libresolv*.so* $out/lib
+        cp -d ${libc.out}/lib/crt?.o $out/lib
+
+        cp -rL ${libc.dev}/include $out
         chmod -R u+w "$out"
 
-        # glibc can contain linker scripts: find them, copy their deps,
+        # libc can contain linker scripts: find them, copy their deps,
         # and get rid of absolute paths (nuke-refs would make them useless)
         local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib")
-        cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc.out}' | sort -u)
+        cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${libc.out}' | sort -u)
         for f in $lScripts; do
-          substituteInPlace "$f" --replace '${glibc.out}/lib/' ""
+          substituteInPlace "$f" --replace '${libc.out}/lib/' ""
         done
 
         # Hopefully we won't need these.
@@ -71,9 +75,20 @@ rec {
         find $out/include -name .install -exec rm {} \;
         find $out/include -name ..install.cmd -exec rm {} \;
         mv $out/include $out/include-glibc
+    '' else if (hostPlatform.libc == "musl") then ''
+        # Copy what we need from musl
+        cp ${libc.out}/lib/* $out/lib
+        cp -rL ${libc.dev}/include $out
+        chmod -R u+w "$out"
 
+        rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
+        find $out/include -name .install -exec rm {} \;
+        find $out/include -name ..install.cmd -exec rm {} \;
+        mv $out/include $out/include-libc
+    '' else throw "unsupported libc for bootstrap tools")
+    + ''
         # Copy coreutils, bash, etc.
-        cp ${coreutilsMinimal.out}/bin/* $out/bin
+        cp -d ${coreutilsMinimal.out}/bin/* $out/bin
         (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
 
         cp ${bash.out}/bin/bash $out/bin
@@ -110,7 +125,7 @@ rec {
         cp -rd ${gcc.cc.out}/libexec/* $out/libexec
         chmod -R u+w $out/libexec
         rm -rf $out/libexec/gcc/*/*/plugin
-        mkdir $out/include
+        mkdir -p $out/include
         cp -rd ${gcc.cc.out}/include/c++ $out/include
         chmod -R u+w $out/include
         rm -rf $out/include/c++/*/ext/pb_ds
@@ -118,17 +133,25 @@ rec {
 
         cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib
         cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
-        cp -d ${libmpc}/lib/libmpc*.so* $out/lib
+        cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
         cp -d ${zlib.out}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
+      '' + lib.optionalString (hostPlatform.libc == "musl") ''
+        cp -d ${libiconv.out}/lib/libiconv*.so* $out/lib
+
+      '' + lib.optionalString (hostPlatform != buildPlatform) ''
+        # These needed for cross but not native tools because the stdenv
+        # GCC has certain things built in statically. See
+        # pkgs/stdenv/linux/default.nix for the details.
+        cp -d ${isl_0_17.out}/lib/libisl*.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
+          cp ${binutils.bintools.out}/bin/$i $out/bin
         done
-        cp -d ${binutils.lib}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out
 
@@ -136,20 +159,21 @@ rec {
         for i in $out/bin/* $out/libexec/gcc/*/*/*; do
             if test -x $i -a ! -L $i; then
                 chmod +w $i
-                strip -s $i || true
+                $STRIP -s $i || true
             fi
         done
 
         nuke-refs $out/bin/*
         nuke-refs $out/lib/*
         nuke-refs $out/libexec/gcc/*/*/*
+        nuke-refs $out/lib/gcc/*/*/*
 
         mkdir $out/.pack
         mv $out/* $out/.pack
         mv $out/.pack $out/pack
 
         mkdir $out/on-server
-        tar cvfJ $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack .
+        XZ_OPT=-9 tar cvJf $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack .
         cp ${busyboxMinimal}/bin/busybox $out/on-server
         chmod u+w $out/on-server/busybox
         nuke-refs $out/on-server/busybox
@@ -177,11 +201,21 @@ rec {
     bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out";
   };
 
-  bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; };
+  bootstrapTools = if (hostPlatform.libc == "glibc") then
+    import ./bootstrap-tools {
+      inherit (hostPlatform) system;
+      inherit bootstrapFiles;
+    }
+    else if (hostPlatform.libc == "musl") then
+    import ./bootstrap-tools-musl {
+      inherit (hostPlatform) system;
+      inherit bootstrapFiles;
+    }
+    else throw "unsupported libc";
 
   test = derivation {
     name = "test-bootstrap-tools";
-    inherit system;
+    inherit (hostPlatform) system;
     builder = bootstrapFiles.busybox;
     args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ];
 
@@ -200,10 +234,17 @@ rec {
       grep --version
       gcc --version
 
+    '' + lib.optionalString (hostPlatform.libc == "glibc") ''
       ldlinux=$(echo ${bootstrapTools}/lib/ld-linux*.so.?)
       export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}"
       export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib"
       export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib"
+    '' + lib.optionalString (hostPlatform.libc == "musl") ''
+      ldmusl=$(echo ${bootstrapTools}/lib/ld-musl*.so.?)
+      export CPP="cpp -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools}"
+      export CC="gcc -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib"
+      export CXX="g++ -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib"
+    '' + ''
 
       echo '#include ' >> foo.c
       echo '#include ' >> foo.c
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 558a77281edb4fc68fff6536f748e9d10f301af9..78f7a82d2952eb4397ab20e8b431db6764a6f0aa 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -119,19 +119,28 @@ in
     };
     stdenvNoCC = stdenv;
 
-    cc = import ../../build-support/cc-wrapper {
-      name = "cc-native";
-      nativeTools = true;
-      nativeLibc = true;
+    cc = let
       nativePrefix = { # switch
         "i686-solaris" = "/usr/gnu";
         "x86_64-solaris" = "/opt/local/gcc47";
       }.${system} or "/usr";
+    in
+    import ../../build-support/cc-wrapper {
+      name = "cc-native";
+      nativeTools = true;
+      nativeLibc = true;
+      inherit nativePrefix;
+      bintools = import ../../build-support/bintools-wrapper {
+        name = "bintools";
+        inherit stdenvNoCC nativePrefix;
+        nativeTools = true;
+        nativeLibc = true;
+      };
       inherit stdenvNoCC;
     };
 
     fetchurl = import ../../build-support/fetchurl {
-      inherit stdenv;
+      inherit lib stdenvNoCC;
       # Curl should be in /usr/bin or so.
       curl = null;
     };
diff --git a/pkgs/test/cc-wrapper/multilib.nix b/pkgs/test/cc-wrapper/multilib.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5ea50b5eb268c800936ca150ca62f5dd72dd0bb3
--- /dev/null
+++ b/pkgs/test/cc-wrapper/multilib.nix
@@ -0,0 +1,37 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "cc-multilib-test";
+
+  # XXX: "depend" on cc-wrapper test?
+
+  # TODO: Have tests report pointer size or something; ensure they are what we asked for
+  buildCommand = ''
+    NIX_DEBUG=1 $CC -v
+    NIX_DEBUG=1 $CXX -v
+
+    printf "checking whether compiler builds valid C binaries... " >&2
+    $CC -o cc-check ${./cc-main.c}
+    ./cc-check
+
+    printf "checking whether compiler builds valid 32bit C binaries... " >&2
+    $CC -m32 -o c32-check ${./cc-main.c}
+    ./c32-check
+
+    printf "checking whether compiler builds valid 64bit C binaries... " >&2
+    $CC -m64 -o c64-check ${./cc-main.c}
+    ./c64-check
+
+    printf "checking whether compiler builds valid 32bit C++ binaries... " >&2
+    $CXX -m32 -o cxx32-check ${./cxx-main.cc}
+    ./cxx32-check
+
+    printf "checking whether compiler builds valid 64bit C++ binaries... " >&2
+    $CXX -m64 -o cxx64-check ${./cxx-main.cc}
+    ./cxx64-check
+
+    touch $out
+  '';
+
+  meta.platforms = stdenv.lib.platforms.x86_64;
+}
diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix
index 51e8ae53736c437da9eac5b99a645db89c76060f..73b359ffe6a499de6621f0d5143ce4bd9f0d7b32 100644
--- a/pkgs/test/macos-sierra-shared/default.nix
+++ b/pkgs/test/macos-sierra-shared/default.nix
@@ -3,7 +3,7 @@
 let
   makeBigExe = stdenv: prefix: rec {
 
-    count = 500;
+    count = 320;
 
     sillyLibs = lib.genList (i: stdenv.mkDerivation rec {
       name = "${prefix}-fluff-${toString i}";
@@ -75,13 +75,14 @@ in stdenvNoCC.mkDerivation {
   buildInputs = [ good.finalExe bad.finalExe ];
   # TODO(@Ericson2314): Be impure or require exact MacOS version of builder?
   buildCommand = ''
-    if bad-asdf
-    then echo "bad-asdf can succeed on non-sierra, OK" >&2
+    if bad-asdf &> /dev/null
+    then echo "WARNING: bad-asdf did not fail, not running on sierra?" >&2
     else echo "bad-asdf should fail on sierra, OK" >&2
     fi
 
     # Must succeed on all supported MacOS versions
     good-asdf
+    echo "good-asdf should succeed on sierra, OK"
 
     touch $out
   '';
diff --git a/pkgs/test/openftd/default.nix b/pkgs/test/openftd/default.nix
index 13b6b01f325991ac579793a20158ee6bc26a5c69..a5b817de40e9234d3f2d9f370eb442e8f5ae2321 100644
--- a/pkgs/test/openftd/default.nix
+++ b/pkgs/test/openftd/default.nix
@@ -28,7 +28,7 @@ Heb je geen mozilla, maar heb je wel de firebird/firefox variant geinstalleerd s
 { stdenv, fetchurl
 , zlib, libxml2, libxslt, firefox, openssl, curl
 , glib, gtk, libgnomeui, libgtkhtml
-, pkgconfig, dbus_glib, realCurl, pcre, libsexy, gtkspell, libnotify
+, pkgconfig, dbus-glib, realCurl, pcre, libsexy, gtkspell, libnotify
 }:
  
 stdenv.mkDerivation {
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     zlib libxml2 libxslt firefox openssl curl
-    glib gtk pkgconfig dbus_glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml
+    glib gtk pkgconfig dbus-glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml
   ];
 
   configureFlags="--with-libcurl-libraries=${curl.out}/lib --with-libcurl-headers=${curl.dev}/include --with-pcre_libraries=${pcre.out}/lib --with-pcre_headers=${pcre.dev}/include";
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 7868c2726ece51ffc7aa81c00bce3156fbb9078b..8ad1b6f6455ec9cac4e4f2ab66aa96011a5a9b98 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -39,7 +39,7 @@ let
   primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; };
   primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; };
 
-  primusLibs = lib.makeLibraryPath ([primus] ++ lib.optional (primusLib_i686 != null) primus_i686);
+  primusLibs = lib.makeLibraryPath ([ primus ] ++ lib.optional (primusLib_i686 != null) primus_i686);
 
   nvidia_x11s = [ nvidia_x11 ]
                 ++ lib.optional nvidia_x11.useGLVND libglvnd
@@ -49,7 +49,6 @@ let
   nvidiaLibs = lib.makeLibraryPath nvidia_x11s;
 
   bbdPath = lib.makeBinPath [ kmod xorgserver ];
-  bbdLibs = lib.makeLibraryPath [ libX11 libXext ];
 
   xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau));
 
@@ -133,8 +132,7 @@ in stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/sbin/bumblebeed" \
-      --prefix PATH : "${bbdPath}" \
-      --prefix LD_LIBRARY_PATH : "${bbdLibs}"
+      --prefix PATH : "${bbdPath}"
 
     wrapProgram "$out/bin/optirun" \
       --prefix PATH : "${virtualgl}/bin"
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index de51e1ad25f5eb7e839487d8a7c9bbd26e3c20fa..aeb4546ff4d3b73ff3f258766fb219c25c8af052 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -21,6 +21,6 @@ buildGoPackage rec {
     description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift";
     license = licenses.mit;
     maintainers = with maintainers; [ cstrahan ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..42f3bbdb01948abece2c481b61934f8ec40e85bc
--- /dev/null
+++ b/pkgs/tools/X11/grobi/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  version = "0.3.0";
+  name = "grobi-${version}";
+
+  goPackagePath = "github.com/fd0/grobi";
+
+  src = fetchFromGitHub {
+    rev = "78a0639ffad765933a5233a1c94d2626e24277b8";
+    owner = "fd0";
+    repo = "grobi";
+    sha256 = "16q7vnhb1p6ds561832sfdszvlafww67bjn3lc0d18v7lyak2l3i";
+  };
+
+   meta = with stdenv.lib; {
+    homepage = https://github.com/fd0/grobi;
+    description = "Automatically configure monitors/outputs for Xorg via RANDR";
+    license = with licenses; [ bsd2 ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix
index 6aaaf83d9754987f534a78828a4a9dadda749db9..5c4c65bc17a26d5f9e16879b3a37ea6447369485 100644
--- a/pkgs/tools/X11/primus/lib.nix
+++ b/pkgs/tools/X11/primus/lib.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, fetchpatch
-, libX11, mesa_noglu
+, libX11, libGL, mesa_noglu
 , nvidia_x11 ? null
 , libglvnd
 }:
 
 let
   aPackage =
-    if nvidia_x11 == null then mesa_noglu
+    if nvidia_x11 == null then libGL
     else if nvidia_x11.useGLVND then libglvnd
     else nvidia_x11;
 
@@ -28,11 +28,11 @@ in stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [ libX11 mesa_noglu ];
+  buildInputs = [ libX11 libGL ];
 
   makeFlags = [ "LIBDIR=$(out)/lib"
                 "PRIMUS_libGLa=${aPackage}/lib/libGL.so"
-                "PRIMUS_libGLd=${mesa_noglu}/lib/libGL.so"
+                "PRIMUS_libGLd=${libGL}/lib/libGL.so"
                 "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so"
               ];
 
@@ -45,7 +45,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Low-overhead client-side GPU offloading";
     homepage = https://github.com/amonakov/primus;
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
     license = licenses.bsd2;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index 5433035d2215316ff635ec99bc60c9061cafae76..92f24f2b4aa4401162eee936f23cdef49f41fcc4 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "screen-message-${version}";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ gtk3 ];
+  buildInputs = [ gtk3 hicolor-icon-theme ];
 
   # screen-message installs its binary in $(prefix)/games per default
   makeFlags = [ "execgamesdir=$(out)/bin" ];
 
   meta = {
-    homepage = http://darcs.nomeata.de/cgi-bin/darcsweb.cgi?r=screen-message.debian;
+    homepage = "https://www.joachim-breitner.de/en/projects#screen-message";
     description = "Displays a short text fullscreen in an X11 window";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.fpletz ];
diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix
index 2245f03ec7fe230514159478630126ce8626cb06..669da86621fd3458b60540426478222cd24cd211 100644
--- a/pkgs/tools/X11/setroot/default.nix
+++ b/pkgs/tools/X11/setroot/default.nix
@@ -26,7 +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;
+    maintainers = [ maintainers.vyp ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix
index 33a0deedafac41aad17d6b22adba90ab4d086a3c..2b58dd6c9115417900a2b21c3c776504785b8c1a 100644
--- a/pkgs/tools/X11/sselp/default.nix
+++ b/pkgs/tools/X11/sselp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "sselp-${version}";
  
   src = fetchurl {
-    url = "http://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${name}.tar.gz";
     sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
   };
  
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://tools.suckless.org/sselp;
+    homepage = https://tools.suckless.org/sselp;
     description = "Prints the X selection to stdout, useful in scripts";
     license = stdenv.lib.licenses.mit;
     maintainers = [stdenv.lib.maintainers.magnetophon ];
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index ece08fd5cd4833cfd77751404686aa88f3f12e31..c552011f3844618153e77379f77ff1687f9d6fc0 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }:
+{ stdenv, fetchurl, cmake, libGLU_combined, libX11, libXv, libjpeg_turbo, fltk }:
 
 stdenv.mkDerivation rec {
   name = "virtualgl-lib-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ];
+  buildInputs = [ libjpeg_turbo libGLU_combined fltk libX11 libXv ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index 90159d82c39b8442903922fc82781ee982440741..cd9d6aecdefb6e2345866a05e2c3481ed8a97eb7 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -5,11 +5,11 @@ let
   base = pythonPackages.buildPythonApplication rec {
     name = "winswitch-${version}";
     namePrefix = "";
-    version = "0.12.16";
+    version = "0.12.23";
 
     src = fetchurl {
       url = "http://winswitch.org/src/${name}.src.tar.bz2";
-      sha256 = "0ix122d7rgzdkk70f2q3sd7a4pvyaqsyxkw93pc4zkcg1xh9z3y8";
+      sha256 = "1m0akjcdlsgng426rwvzlcl76kjm993icj0pggvha40cizig1yd9";
     };
 
     propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix
index 65868a3b6b0dcf05f47f3e6539f49a05db824af0..2f925b11ba5cf5b60e2edb3a26b7076aa4c1917b 100644
--- a/pkgs/tools/X11/xcalib/default.nix
+++ b/pkgs/tools/X11/xcalib/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, libX11, libXxf86vm, libXext }:
+{ stdenv, fetchFromGitHub, libX11, libXxf86vm, libXext, libXrandr }:
 
 stdenv.mkDerivation rec {
-  name = "xcalib-0.8";
+  name = "xcalib-0.10";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/xcalib/xcalib-source-0.8.tar.gz";
-    sha256 = "8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6";
+  src = fetchFromGitHub {
+    owner = "OpenICC";
+    repo = "xcalib";
+    rev = "f95abc1a551d7c695a8b142c4d9d5035368d482d";
+    sha256 = "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr";
   };
 
-  buildInputs = [ libX11 libXxf86vm libXext ];
+  buildInputs = [ libX11 libXxf86vm libXext libXrandr ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -16,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://xcalib.sourceforge.net/;
+    inherit (src.meta) homepage;
     description = "A tiny monitor calibration loader for X and MS-Windows";
     license = licenses.gpl2;
     maintainers = [ maintainers.rickynils ];
diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
index 0af945317530f7a22e001529d2ff8398cb201183..3e0680cac4493b2e19158f517cf10cf15abda8cd 100644
--- a/pkgs/tools/X11/xdg-user-dirs/default.nix
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "xdg-user-dirs-0.16";
+  name = "xdg-user-dirs-0.17";
 
   src = fetchurl {
     url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "1rp3c94hxjlfsryvwajklynfnrcvxplhwnjqc7395l89i0nb83vp";
+    sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra";
   };
 
   buildInputs = [ libxslt docbook_xsl makeWrapper ];
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 717ad327c676282a1c070500bd46fa119233736b..28839891aa5521bc2cb0e9da30929ef15acb309f 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub
 , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
-, w3m, which, gnugrep, gnused, coreutils
+, w3m, which, gnugrep, gnused, coreutils, xset
 , mimiSupport ? false, gawk ? null }:
 
 assert mimiSupport -> gawk != null;
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
     file()  { ${file}/bin/file      "$@"; }\
     awk()   { ${gawk}/bin/awk       "$@"; }\
     sort()  { ${coreutils}/bin/sort "$@"; }\
+    xset()  { ${xset}/bin/xset      "$@"; }\
     &#' -i "$out"/bin/*
 
     substituteInPlace $out/bin/xdg-open \
@@ -53,7 +54,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://portland.freedesktop.org/wiki/;
+    homepage = https://www.freedesktop.org/wiki/Software/xdg-utils/;
     description = "A set of command line tools that assist applications with a variety of desktop integration tasks";
     license = if mimiSupport then licenses.gpl2 else licenses.free;
     maintainers = [ maintainers.eelco ];
diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix
index 5eb1faafe2ef3426aeb6f28de70947db34faf009..50d0ac4f2b9a30df1cf443b1b5ccaf68835e2e88 100644
--- a/pkgs/tools/X11/xpointerbarrier/default.nix
+++ b/pkgs/tools/X11/xpointerbarrier/default.nix
@@ -1,13 +1,13 @@
 { stdenv, xorg, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   name = "xpointerbarrier-${version}";
-  version = "17.10";
+  version = "17.11";
 
   src = fetchFromGitHub {
     owner = "vain";
     repo = "xpointerbarrier";
     rev = "v${version}";
-    sha256 = "0p4qc7ggndf74d2xdf38659prx3r3lfi5jc8nmqx52c9fqdshcrk";
+    sha256 = "0s6bd58xjyc2nqzjq6aglx6z64x9xavda3i6p8vrmxqmcpik54nm";
   };
 
   buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/vain/xpointerbarrier;
     description = "Create X11 pointer barriers around your working area";
     license = stdenv.lib.licenses.mit;
-    maintainers = stdenv.lib.maintainers.xzfc;
+    maintainers = [ stdenv.lib.maintainers.xzfc ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index a3aa7a0aa2348d68f50114c657558e5b2a1f2319..b931f270dee23d8957cd7afad1c693f1a4ac3a3c 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -12,11 +12,11 @@ let
   inherit (python2Packages) python cython buildPythonApplication;
 in buildPythonApplication rec {
   name = "xpra-${version}";
-  version = "2.1.3";
+  version = "2.2.5";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm";
+    sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index 629c10f867fa7454c63811326c9f5d7addbbc707..7e620e0c2c81c26f5cf4804bbeef76977be1dc67 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -7,11 +7,11 @@
 
 buildPythonApplication rec {
   name = "xpra-${version}";
-  version = "2.1.3";
+  version = "2.2.5";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm";
+    sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js";
   };
 
   patchPhase = ''
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 399531f71eb8992eb5c65c7b5961e8f782313783..7221555ed33f7579dc332790cbf6be2d7412f80a 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.8";
+  version = "3.9";
   src = fetchurl {
-    url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.8.tar.gz";
-    sha256 = "16r5wbb5za02ha0ilwswx37lrwa6j40px8c9gkpnmmpb5r7kv91c";
+    url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz";
+    sha256 = "17csj6x5zm3g67izfwhagkal1rbqzpw09lqmmlyrjy3vzgfkf75q";
   };
 
   buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ];
diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix
index e36808db0b8c94e999d62b21f4313c0e9cb6308b..b6b87fffb47bbb1f4615bb95a6a20445ae3f4bc8 100644
--- a/pkgs/tools/X11/xwinmosaic/default.nix
+++ b/pkgs/tools/X11/xwinmosaic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, gtk2, cmake, pkgconfig }:
+{ stdenv, fetchgit, gtk2, cmake, pkgconfig, libXdamage }:
 
 stdenv.mkDerivation rec {
   version = "0.4.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ gtk2 ];
+  buildInputs = [ gtk2 libXdamage ];
 
   meta = {
     inherit version;
diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..00d8bdd3ef4c701f82ca1d453dc2b02301d05484
--- /dev/null
+++ b/pkgs/tools/admin/acme.sh/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute }:
+stdenv.mkDerivation rec {
+  name = "acme.sh-${version}";
+  version = "2.7.8";
+
+  src = fetchFromGitHub {
+    owner = "Neilpang";
+    repo = "acme.sh";
+    rev = version;
+    sha256 = "0zm64z7av63xi7yjhljab2i8q1vx4q1mpcmcm58jm6k4babalxrf";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out $out/bin $out/libexec
+    cp -R $src/* $_
+    makeWrapper $out/libexec/acme.sh $out/bin/acme.sh \
+      --prefix PATH : "${lib.makeBinPath [ socat openssl curl iproute ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A pure Unix shell script implementing ACME client protocol";
+    homepage = https://acme.sh/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.yorickvp ];
+  };
+}
diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix
index 6232e4ad95ba4b01864558ae41b5664074dad50e..b8b335bd6186f3d99787f37aea149c1dedfa448d 100644
--- a/pkgs/tools/admin/ansible/2.1.nix
+++ b/pkgs/tools/admin/ansible/2.1.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchurl
+, fetchFromGitHub
 , pythonPackages
 , windowsSupport ? false
 }:
@@ -10,9 +11,11 @@ let
   jinja = jinja2.overridePythonAttrs (old: rec {
     version = "2.8.1";
     name = "${old.pname}-${version}";
-    src = old.src.override {
-      inherit version;
-      sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891";
+    src = fetchFromGitHub {
+      owner = "pallets";
+      repo = "jinja";
+      rev = version;
+      sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a";
     };
   });
 in buildPythonPackage rec {
@@ -36,7 +39,7 @@ in buildPythonPackage rec {
   dontPatchShebangs = false;
 
   propagatedBuildInputs = [
-    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns
+    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython
   ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix
index 02392d7ac89f32f9716158ffd261dcfb775fc267..ccca64b86b640db0856d300fea323e250334f297 100644
--- a/pkgs/tools/admin/ansible/2.2.nix
+++ b/pkgs/tools/admin/ansible/2.2.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchurl
+, fetchFromGitHub
 , pythonPackages
 , windowsSupport ? false
 }:
@@ -12,9 +13,11 @@ let
   jinja = jinja2.overridePythonAttrs (old: rec {
     version = "2.8.1";
     name = "${old.pname}-${version}";
-    src = old.src.override {
-      inherit version;
-      sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891";
+    src = fetchFromGitHub {
+      owner = "pallets";
+      repo = "jinja";
+      rev = version;
+      sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a";
     };
   });
 in buildPythonPackage rec {
@@ -38,7 +41,7 @@ in buildPythonPackage rec {
   dontPatchShebangs = false;
 
   propagatedBuildInputs = [
-    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns
+    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython
   ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/admin/ansible/2.3.nix b/pkgs/tools/admin/ansible/2.3.nix
index 7330b7d0858b746a9b59f776292ade232f420b9c..b827bdcc9c3134d8f6441400c1965ddcddb2392a 100644
--- a/pkgs/tools/admin/ansible/2.3.nix
+++ b/pkgs/tools/admin/ansible/2.3.nix
@@ -24,7 +24,7 @@ pythonPackages.buildPythonPackage rec {
   dontPatchShebangs = false;
 
   propagatedBuildInputs = with pythonPackages; [
-    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns
+    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
   ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix
index 80bd33bc776927a9c95ba021e795a42d607075c3..4f90e80202e434cad72975e12d5f85b085bac605 100644
--- a/pkgs/tools/admin/ansible/2.4.nix
+++ b/pkgs/tools/admin/ansible/2.4.nix
@@ -6,12 +6,12 @@
 
 pythonPackages.buildPythonPackage rec {
   pname = "ansible";
-  version = "2.4.1.0";
+  version = "2.4.2.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "0spv0kjaicwss4q52s727b6grdizcxpa0bbsfg26pgf5kjrayqfs";
+    sha256 = "0n3n9py4s3aykiii31xq8g4wmd6693jvby0424pjrg0bna01apri";
   };
 
   prePatch = ''
@@ -24,7 +24,7 @@ pythonPackages.buildPythonPackage rec {
   dontPatchShebangs = false;
 
   propagatedBuildInputs = with pythonPackages; [
-    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns
+    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
   ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/admin/ansible/2.5.nix b/pkgs/tools/admin/ansible/2.5.nix
new file mode 100644
index 0000000000000000000000000000000000000000..32d83861cd8c08cc46b36ab7f12159a530402b36
--- /dev/null
+++ b/pkgs/tools/admin/ansible/2.5.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, fetchurl
+, pythonPackages
+, windowsSupport ? false
+}:
+
+pythonPackages.buildPythonPackage rec {
+  pname = "ansible";
+  version = "2.5.1";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
+    sha256 = "06h0cmz0cgj1xszzn6rsypfc8lkazgh5g1yxyss1yx242d0wkw2i";
+  };
+
+  prePatch = ''
+    sed -i "s,/usr/,$out," lib/ansible/constants.py
+  '';
+
+  doCheck = false;
+  dontStrip = true;
+  dontPatchELF = true;
+  dontPatchShebangs = false;
+
+  propagatedBuildInputs = with pythonPackages; [
+    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
+  ] ++ stdenv.lib.optional windowsSupport pywinrm;
+
+  meta = with stdenv.lib; {
+    homepage = http://www.ansible.com;
+    description = "A simple automation tool";
+    license = with licenses; [ gpl3 ];
+    maintainers = with maintainers; [
+      jgeerds
+      joamaki
+    ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/tools/admin/aws-auth/default.nix b/pkgs/tools/admin/aws-auth/default.nix
deleted file mode 100644
index 9f36a6403a1767a05340e2f769d7decbdde7afe3..0000000000000000000000000000000000000000
--- a/pkgs/tools/admin/aws-auth/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, makeWrapper, jq, awscli }:
-
-stdenv.mkDerivation rec {
-  version = "unstable-2017-07-24";
-  name = "aws-auth-${version}";
-
-  src = fetchFromGitHub {
-    owner = "alphagov";
-    repo = "aws-auth";
-    rev = "5a4c9673f9f00ebaa4bb538827e1c2f277c475e1";
-    sha256 = "095j9zqxra8hi2iyz0y4azs9yigy5f6alqkfmv180pm75nbc031g";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  dontBuild = true;
-
-  # copy script and set $PATH
-  installPhase = ''
-    install -D $src/aws-auth.sh $out/bin/aws-auth
-    wrapProgram $out/bin/aws-auth \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ awscli jq ]}
-  '';
-
-  meta = {
-    homepage = https://github.com/alphagov/aws-auth;
-    description = "AWS authentication wrapper to handle MFA and IAM roles";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ris ];
-  };
-}
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4f8b1bc1368f57c911c1535e7b38e9a62d897ec3
--- /dev/null
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -0,0 +1,23 @@
+{ buildGoPackage, lib, fetchFromGitHub }:
+buildGoPackage rec {
+  name = "${pname}-${version}";
+  pname = "aws-vault";
+  version = "4.1.0";
+
+  goPackagePath = "github.com/99designs/${pname}";
+
+  src = fetchFromGitHub {
+    owner = "99designs";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "04cdynqmkbs7bkl2aay4sjxq49i90fg048lw0ssw1fpwldbvnl6j";
+  };
+
+  meta = with lib; {
+    description = "A vault for securely storing and accessing AWS credentials in development environments";
+    homepage = "https://github.com/99designs/aws-vault";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+
+}
diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix
index 6eee982694819181f6a28f023059a78ec6c6b476..c319c47ea7e45fc546e892c85b2c120ea0fb295d 100644
--- a/pkgs/tools/admin/aws_shell/default.nix
+++ b/pkgs/tools/admin/aws_shell/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "aws-shell";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5";
+    sha256 = "b46a673b81254e5e014297e08c9ecab535773aa651ca33dc3786a1fd612f9810";
   };
 
   # Why does it propagate packages that are used for testing?
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 8061cbfded8084b8ff9e1a5cc1d8265770c902a1..23908a8b66f95e8c67ed485b658501bc95b50c5f 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -1,49 +1,40 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, botocore
-, bcdoc
-, s3transfer
-, six
-, colorama
-, docutils
-, rsa
-, pyyaml
+{ lib
+, python
 , groff
 , less
 }:
 
 let
-  colorama_3_7 = colorama.overrideAttrs (old: rec {
-    name = "${pname}-${version}";
-    pname = "colorama";
-    version = "0.3.7";
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
+  py = python.override {
+    packageOverrides = self: super: {
+      colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
+        version = "0.3.7";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
+        };
+      });
     };
-  });
+  };
 
-in buildPythonPackage rec {
-  name = "${pname}-${version}";
+in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.11.185";
-  namePrefix = "";
+  version = "1.14.50";
 
-  src = fetchPypi {
+  src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "18rskl6sla456z4hkq2gmmm03fqc4rqw5pfiqdyc7a2v9kljv4ah";
+    sha256 = "1yiwj7cl9r1k9226mdq6pcmrs044k7p3d133lzgv9rb1dgp4053c";
   };
 
   # No tests included
   doCheck = false;
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with py.pkgs; [
     botocore
     bcdoc
     s3transfer
     six
-    colorama_3_7
+    colorama
     docutils
     rsa
     pyyaml
@@ -59,10 +50,10 @@ in buildPythonPackage rec {
     rm $out/bin/aws.cmd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://aws.amazon.com/cli/;
     description = "Unified tool to manage your AWS services";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
     maintainers = with maintainers; [ muflax ];
   };
 }
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index 4ccdbc204f0ac211fdb80018c8b07ec07043f528..a5e0186fa2dc3a202bda7d835d49dd43a3a38a8b 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bubblewrap-${version}";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchurl {
     url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "0ahw30ngpclk3ssa81cb7ydc6a4xc5dpqn6kmxfpc9xr30vimdnc";
+    sha256 = "1qhzwgpfsw66hcv5kqc7i4dbzhxr8drrqn3md4grcp7dn02wif2l";
   };
 
   nativeBuildInputs = [ libcap libxslt docbook_xsl ];
diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 78a38e07cc29e0bddb99725e1c27d8e850cb7027..3106552a66102b8a4238be405c222f5aae08507b 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, python2Packages, fetchFromGitHub, dialog }:
+{ stdenv, pythonPackages, fetchFromGitHub, dialog }:
 
 # Latest version of certbot supports python3 and python3 version of pythondialog
 
-python2Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "certbot-${version}";
-  version = "0.19.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "certbot";
     repo = "certbot";
     rev = "v${version}";
-    sha256 = "14i3q59v7j0q2pa1dri420fhil4h0vgl4vb471hp81f4y14gq6h7";
+    sha256 = "0dv9d1byppnvx54rhi2w3gqjk01444m5hbr9553n9gin4ribviii";
   };
 
-  propagatedBuildInputs = with python2Packages; [
+  propagatedBuildInputs = with pythonPackages; [
     ConfigArgParse
     acme
     configobj
@@ -28,7 +28,7 @@ python2Packages.buildPythonApplication rec {
     zope_component
     zope_interface
   ];
-  buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]);
+  buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
 
   patchPhase = ''
     substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail"
diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a4b119f126a4f9eb0d6ef3f1bcb2ecca03ef9809
--- /dev/null
+++ b/pkgs/tools/admin/chkcrontab/default.nix
@@ -0,0 +1,20 @@
+{ python, stdenv }:
+
+with python.pkgs;
+
+buildPythonApplication rec {
+  pname = "chkcrontab";
+  version = "1.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0gmxavjkjkvjysgf9cf5fcpk589gb75n1mn20iki82wifi1pk1jn";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A tool to detect crontab errors";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ma27 ];
+    homepage = https://github.com/lyda/chkcrontab;
+  };
+}
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index b9852ed587c5a7050418f004dd1a98e54d37e226..e70a7ba9b50cddc7993cfc7387cb279644673c25 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -23,7 +23,7 @@ python2.pkgs.buildPythonApplication rec {
   propagatedBuildInputs = with python2.pkgs; [
     argparse
     boto
-    dns
+    dnspython
   ];
 
   meta = with lib; {
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
index 4860311fa73f1e23ecb347e1fc35393bba5fcbb7..d4211328b9590f2a147806483f26389b83d5b9af 100644
--- a/pkgs/tools/admin/dehydrated/default.nix
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -1,7 +1,7 @@
 { stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
 let
   pkgName = "dehydrated";
-  version = "0.4.0";
+  version = "0.6.1";
 in
 stdenv.mkDerivation rec {
   name = pkgName + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "lukas2511";
     repo = "dehydrated";
     rev = "v${version}";
-    sha256 = "0nxs6l5i6409dzgiyjn8cnzjcblwj4rqcpxxb766vcvb8d4kqwby";
+    sha256 = "0390fnycl3l4yqacwvaf7dp08rx2vvs27s06q7b478qzrn59flz4";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..52b68a7477cc4c7f9d79cf21b470d2ebe00362db
--- /dev/null
+++ b/pkgs/tools/admin/docker-credential-gcr/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "docker-credential-gcr-${version}";
+  version = "1.4.3";
+
+  goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr";
+
+  src = fetchFromGitHub {
+    owner = "GoogleCloudPlatform";
+    repo = "docker-credential-gcr";
+    rev = "v${version}";
+    sha256 = "1xb88xjyyrdmjcgfv7fqdkv1ip3dpzsdif5vm7vkqvn83s5wj5df";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A Docker credential helper for GCR (https://gcr.io) users";
+    longDescription = ''
+      docker-credential-gcr is Google Container Registry's Docker credential
+      helper. It allows for Docker clients v1.11+ to easily make
+      authenticated requests to GCR's repositories (gcr.io, eu.gcr.io, etc.).
+    '';
+    homepage = https://github.com/GoogleCloudPlatform/docker-credential-gcr;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ suvash ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock
index 30c75f19fbf8b69beef912862e3a1b2c4b5459f0..9cb80eb131c0d0ff0eed64f135c8e48147ef823a 100644
--- a/pkgs/tools/admin/fastlane/Gemfile.lock
+++ b/pkgs/tools/admin/fastlane/Gemfile.lock
@@ -1,43 +1,46 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.5)
+    CFPropertyList (3.0.0)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    atomos (0.1.2)
     babosa (1.0.2)
     claide (1.0.2)
     colored (1.2)
     colored2 (3.1.2)
-    commander-fastlane (4.4.5)
+    commander-fastlane (4.4.6)
       highline (~> 1.7.2)
     declarative (0.0.10)
     declarative-option (0.1.0)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.1)
-    excon (0.59.0)
-    faraday (0.13.1)
+    dotenv (2.2.2)
+    emoji_regex (0.1.1)
+    excon (0.62.0)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.0)
-    fastlane (2.63.0)
-      CFPropertyList (>= 2.3, < 3.0.0)
+    fastimage (2.1.1)
+    fastlane (2.91.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
       bundler (>= 1.12.0, < 2.0.0)
       colored
-      commander-fastlane (>= 4.4.5, < 5.0.0)
+      commander-fastlane (>= 4.4.6, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (~> 0.1)
       excon (>= 0.45.0, < 1.0.0)
       faraday (~> 0.9)
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 0.9)
       fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.0.1, < 2.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
       google-api-client (>= 0.13.1, < 0.14.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
@@ -49,15 +52,17 @@ GEM
       public_suffix (~> 2.0.0)
       rubyzip (>= 1.1.0, < 2.0.0)
       security (= 0.1.3)
-      slack-notifier (>= 1.3, < 2.0.0)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
       terminal-notifier (>= 1.6.2, < 2.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (~> 0.5.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.5.0, < 2.0.0)
+      xcodeproj (>= 1.5.7, < 2.0.0)
       xcpretty (>= 0.2.4, < 1.0.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    gh_inspector (1.0.3)
+    gh_inspector (1.1.3)
     google-api-client (0.13.6)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.5)
@@ -65,7 +70,7 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.6.1)
+    googleauth (0.6.2)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
       logging (~> 2.0)
@@ -73,7 +78,7 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    highline (1.7.8)
+    highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
@@ -88,12 +93,13 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.5.1)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nanaimo (0.2.3)
+    nanaimo (0.2.5)
+    naturally (2.1.0)
     os (0.9.6)
-    plist (3.3.0)
+    plist (3.4.0)
     public_suffix (2.0.5)
     representable (3.0.4)
       declarative (< 0.1.0)
@@ -108,22 +114,29 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    slack-notifier (1.5.1)
+    simctl (1.6.3)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
     terminal-notifier (1.8.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-screen (0.5.1)
+    tty-cursor (0.5.0)
+    tty-screen (0.6.4)
+    tty-spinner (0.8.0)
+      tty-cursor (>= 0.5.0)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.5)
     unicode-display_width (1.3.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.3)
-      CFPropertyList (~> 2.3.3)
+    xcodeproj (1.5.7)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.2.4)
     xcpretty (0.2.8)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.0)
diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix
index 8dd51a5733e65ff8fab8459f9cb89cdf0dc1f6a6..4a0d0467d804240bc4a7004236f63a7067a93523 100644
--- a/pkgs/tools/admin/fastlane/gemset.nix
+++ b/pkgs/tools/admin/fastlane/gemset.nix
@@ -8,6 +8,14 @@
     };
     version = "2.5.2";
   };
+  atomos = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10z69hjv30r2w5q5wmlf0cq4jv3w744jrac8ylln8sf45ckqj7wk";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
   babosa = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -19,10 +27,10 @@
   CFPropertyList = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06dddgcai6nay552h8wmnb2m93xx5hni48s16vkbf9vbym4nfw5x";
+      sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z";
       type = "gem";
     };
-    version = "2.3.5";
+    version = "3.0.0";
   };
   claide = {
     source = {
@@ -52,10 +60,10 @@
     dependencies = ["highline"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04gpg733wv878acvrzp4kc3k934v10l3v8bcz3fjq5imjsrjdnbp";
+      sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65";
       type = "gem";
     };
-    version = "4.4.5";
+    version = "4.4.6";
   };
   declarative = {
     source = {
@@ -85,27 +93,35 @@
   dotenv = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv";
+      sha256 = "1f9s04xwa9gcsql734nwxvacgsl1si7xka4g4w3r6d3ab8a274y9";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
+  };
+  emoji_regex = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pcw3axgcmsgihp0xlsdqrqmavz0lw8g396b048fg21033kssxjn";
+      type = "gem";
+    };
+    version = "0.1.1";
   };
   excon = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mnc9lqlzwqj5ayp0lh7impisqm55mdg3mw5q4gi9yjic5sidc40";
+      sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
       type = "gem";
     };
-    version = "0.59.0";
+    version = "0.62.0";
   };
   faraday = {
     dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw";
+      sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr";
       type = "gem";
     };
-    version = "0.13.1";
+    version = "0.14.0";
   };
   faraday-cookie_jar = {
     dependencies = ["faraday" "http-cookie"];
@@ -128,27 +144,27 @@
   fastimage = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fh80nwjxm63phcdg55haz9q877fxgvnkazjihaqbf8ginn6g00v";
+      sha256 = "0dzv34dgpw1sakj4wdd26dnw1z7iwvwfdvfr9aiirspabibfq6vc";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.1.1";
   };
   fastlane = {
-    dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
+    dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1al75bb3zq0y9r1ilrbhks198zmvwykmqnn2675jd9i2ijcbxv78";
+      sha256 = "04k6pn95qbpvbmqxrs4pngvfyk4pifcv8is3819b33p754pkiqrp";
       type = "gem";
     };
-    version = "2.63.0";
+    version = "2.91.0";
   };
   gh_inspector = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x";
+      sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.3";
   };
   google-api-client = {
     dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
@@ -163,18 +179,18 @@
     dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13laklpf99m3qzq9n3vnc9dblgw7q05n1r16jlxsh4lxlaijr0sf";
+      sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.6.2";
   };
   highline = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+      sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
       type = "gem";
     };
-    version = "1.7.8";
+    version = "1.7.10";
   };
   http-cookie = {
     dependencies = ["domain_name"];
@@ -262,10 +278,10 @@
   multi_json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";
+      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
       type = "gem";
     };
-    version = "1.12.2";
+    version = "1.13.1";
   };
   multi_xml = {
     source = {
@@ -286,10 +302,18 @@
   nanaimo = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd";
+      sha256 = "03x5f7hk0s21hlkj309w0qipjxz34kyd3c5yj25zq3s2yyn57idi";
+      type = "gem";
+    };
+    version = "0.2.5";
+  };
+  naturally = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0avn8b2qbfm22afln2p7rky73zns8c444mdhdh4ki8hbjsn0f8cx";
       type = "gem";
     };
-    version = "0.2.3";
+    version = "2.1.0";
   };
   os = {
     source = {
@@ -302,10 +326,10 @@
   plist = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0k0pyqrjcz9kn1b3ahsfs9aqym7s7yzz0vavya0zn0mca3jw2zqc";
+      sha256 = "1f27kj49v76psqxgcwvwc63cf7va2bszmmw2qrrd281qzi2if79l";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.4.0";
   };
   public_suffix = {
     source = {
@@ -365,13 +389,22 @@
     };
     version = "0.8.1";
   };
+  simctl = {
+    dependencies = ["CFPropertyList" "naturally"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0l1hwxkbpgfhla6dbf0f6nhj794c0k6ilxlh07zcm8by3vdrsvib";
+      type = "gem";
+    };
+    version = "1.6.3";
+  };
   slack-notifier = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6";
+      sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv";
       type = "gem";
     };
-    version = "1.5.1";
+    version = "2.3.2";
   };
   terminal-notifier = {
     source = {
@@ -390,13 +423,30 @@
     };
     version = "1.8.0";
   };
+  tty-cursor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xmggqwbikamd4qjwvahrv0vpbznm06bqpl498pb5fy3pra2xyxz";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
   tty-screen = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12qkjwpkgznvhwbywq2y7l5mcq2f4z404b0ip7xm4byg3827lh4h";
+      sha256 = "19iq03prqjbm0nr7yn0181lph52d994jwbcsqss3lwpwkl20s6bv";
+      type = "gem";
+    };
+    version = "0.6.4";
+  };
+  tty-spinner = {
+    dependencies = ["tty-cursor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xv5bycgmiyx00bq0kx2bdixi3h1ffi86mwj858gqbxlpjbzsi94";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.8.0";
   };
   uber = {
     source = {
@@ -418,10 +468,10 @@
   unf_ext = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";
+      sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
       type = "gem";
     };
-    version = "0.0.7.4";
+    version = "0.0.7.5";
   };
   unicode-display_width = {
     source = {
@@ -440,13 +490,13 @@
     version = "1.0.0";
   };
   xcodeproj = {
-    dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"];
+    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7";
+      sha256 = "16743g16mrh47f1lxkbw28xn9mmlf1r0zicin4malalsxxkc7ykz";
       type = "gem";
     };
-    version = "1.5.3";
+    version = "1.5.7";
   };
   xcpretty = {
     dependencies = ["rouge"];
diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix
index 77451a6bc9e36f221d80bad262b4f362ef5db50e..029c09afdad4ecded24f0283c5060be2d22399d4 100644
--- a/pkgs/tools/admin/gixy/default.nix
+++ b/pkgs/tools/admin/gixy/default.nix
@@ -1,17 +1,18 @@
 { lib, fetchFromGitHub, python }:
 
 python.pkgs.buildPythonApplication rec {
-  name = "gixy-${version}";
-  version = "0.1.8";
+  pname = "gixy";
+  version = "0.1.9";
 
   # package is only compatible with python 2.7 and 3.5+
   disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27);
 
+  # fetching from GitHub because the PyPi source is missing the tests
   src = fetchFromGitHub {
     owner = "yandex";
     repo = "gixy";
     rev = "v${version}";
-    sha256 = "0dg8j8pqlzdvmyfkphrizfqzggr64npb9mnm1dcwm6c3z6k2b0ii";
+    sha256 = "11aps8a8xg1nlw36jgrmnaf38imfz2rj67wnlalrrsqb616xipcv";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 6dec65892b0f8e3ad70d5c28f3fbc7f22f4a97be..b109a835635bd36eb63a45544aa10f8093567c5e 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -17,25 +17,20 @@ let
 
   baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads";
   sources = name: system: {
-    i686-linux = {
-      url = "${baseUrl}/${name}-linux-x86.tar.gz";
-      sha256 = "0aq938s1w9mzj60avmcc68kgll54pl7635vl2mi89f6r56n0xslp";
-    };
-
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "13k2i1svry9q800s1jgf8jss0rzfxwk6qci3hsy1wrb9b2mwlz5g";
+      sha256 = "0c4jj580f7z6phiw4zhd32dlf4inkrxy3cig6ng66fi4zi6vnpc9";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "1kvaz8p1iflsi85wwi7lb6km6frj70xsricyz1ah0sw3q71zyqmc";
+      sha256 = "0rblb0akwdzr5i8al0dcz482xmx1xdnjnzgqywjvwd8fzdyzq7bp";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "177.0.0";
+  version = "190.0.1";
 
   src = fetchurl (sources name stdenv.system);
 
@@ -65,6 +60,13 @@ in stdenv.mkDerivation rec {
         ln -s $programPath $binaryPath
     done
 
+    # disable component updater and update check
+    substituteInPlace $out/google-cloud-sdk/lib/googlecloudsdk/core/config.json \
+      --replace "\"disable_updater\": false" "\"disable_updater\": true"
+    echo "
+    [component_manager]
+    disable_update_check = true" >> $out/google-cloud-sdk/properties
+
     # setup bash completion
     mkdir -p "$out/etc/bash_completion.d/"
     mv "$out/google-cloud-sdk/completion.bash.inc" "$out/etc/bash_completion.d/gcloud.inc"
@@ -81,6 +83,6 @@ in stdenv.mkDerivation rec {
     license = licenses.free;
     homepage = "https://cloud.google.com/sdk/";
     maintainers = with maintainers; [ stephenmw zimbatm ];
-    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..cfe336a7e83064400f7683451014d932f7f04a12
--- /dev/null
+++ b/pkgs/tools/admin/iamy/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "iamy-${version}";
+  version = "2.1.1";
+
+  goPackagePath = "github.com/99designs/iamy";
+
+  src = fetchFromGitHub {
+    owner = "99designs";
+    repo = "iamy";
+    rev = "v${version}";
+    sha256 = "0b55hxcvgil8rl6zh2kyndfi7s5nzclawjb0sby14wpys3v08bjf";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A cli tool for importing and exporting AWS IAM configuration to YAML files";
+    homepage = https://github.com/99designs/iamy;
+    license = licenses.mit;
+    maintainers = with maintainers; [ suvash ];
+  };
+}
diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fe165b1e66e30365afb2d07c1a79b5b7c0575fad
--- /dev/null
+++ b/pkgs/tools/admin/lego/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "lego-unstable-${version}";
+  version = "2018-02-02";
+  rev = "06a8e7c475c03ef8d4773284ac63357d2810601b";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "xenolf";
+    repo = "lego";
+    sha256 = "11a9gcgi3317z4lb1apkf6dnbjhf7xni0670nric3fbf5diqfwh2";
+  };
+
+  goPackagePath = "github.com/xenolf/lego";
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Let's Encrypt client and ACME library written in Go";
+    license = licenses.mit;
+    homepage = https://github.com/xenolf/lego;
+    maintainers = with maintainers; [ andrew-d ];
+  };
+}
diff --git a/pkgs/tools/admin/lego/deps.nix b/pkgs/tools/admin/lego/deps.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6d842c5f3f5189acf9ce03b278bd5b6e5aafb194
--- /dev/null
+++ b/pkgs/tools/admin/lego/deps.nix
@@ -0,0 +1,219 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "fd7767e8876b52efa597af4d0ec944e9b2574120";
+      sha256 = "1m7yd2vwbgypi9izgyif4k8rifgfmgsh747s1z467qlr5k17cjy5";
+    };
+  }
+  {
+    goPackagePath = "github.com/Azure/azure-sdk-for-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-sdk-for-go";
+      rev = "f111fc2fa3861c5fdced76cae4c9c71821969577";
+      sha256 = "1xfm3phjwb222nkhzi16qslj0r374rgvjw99c9wrzzlzkq2qkb38";
+    };
+  }
+  {
+    goPackagePath = "github.com/Azure/go-autorest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/go-autorest";
+      rev = "5a06e9ddbe3c22262059b8e061777b9934f982bd";
+      sha256 = "0dy80x5gxsq6vf8lpihpgv8cb8mnsk76q4ywxx3cxzfglqdjlwz6";
+    };
+  }
+  {
+    goPackagePath = "github.com/JamesClonk/vultr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/JamesClonk/vultr";
+      rev = "fa1c0367800db75e4d10d0ec90c49a8731670224";
+      sha256 = "1bx2x17aa6wfn4qy9lxk8sh7shs3x5ppz2z49s0xm8qq0rs1qi92";
+    };
+  }
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "fb9d53b0db7e801eb0d4fa021f5860794d845da3";
+      sha256 = "0md4bvrr4y5604l3bif7xx1bvhn6cc81v578s6w15mp63k9yjlpn";
+    };
+  }
+  {
+    goPackagePath = "github.com/decker502/dnspod-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/decker502/dnspod-go";
+      rev = "f33a2c6040fc2550a631de7b3a53bddccdcd73fb";
+      sha256 = "0c5v7y465k8mi5vxhln53pjn3z4h022sh14mngnx71h6szakzykg";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29";
+      sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs";
+    };
+  }
+  {
+    goPackagePath = "github.com/dnsimple/dnsimple-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dnsimple/dnsimple-go";
+      rev = "e43ab24dc4818cd584429752f69885fbc8a74baa";
+      sha256 = "0cq1xjv27nssarmflnh0w4i0l8v74129va4inhi5m2wxrz2247z7";
+    };
+  }
+  {
+    goPackagePath = "github.com/edeckers/auroradnsclient";
+    fetch = {
+      type = "git";
+      url = "https://github.com/edeckers/auroradnsclient";
+      rev = "1563e622aaca0a8bb895a448f31d4a430ab97586";
+      sha256 = "0d1izyqnlqasp56mldrpfnyhzmih2k955jn78ibzhay22dmn8ndr";
+    };
+  }
+  {
+    goPackagePath = "github.com/exoscale/egoscale";
+    fetch = {
+      type = "git";
+      url = "https://github.com/exoscale/egoscale";
+      rev = "7c8b1e7975be2af74d6e462dbea467e9061f9619";
+      sha256 = "00bqam37lkwls4rr209pcrld1rb025nm935h004lgfd8i2xjv5g4";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-querystring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-querystring";
+      rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a";
+      sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
+    };
+  }
+  {
+    goPackagePath = "github.com/miekg/dns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/miekg/dns";
+      rev = "5364553f1ee9cddc7ac8b62dce148309c386695b";
+      sha256 = "1r56ws5ayza5xk6xlkjvv7wcj6misbm5cyixvyf3pnz8wgja31wp";
+    };
+  }
+  {
+    goPackagePath = "github.com/ovh/go-ovh";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ovh/go-ovh";
+      rev = "df6beeb652924ef66aa95690b392f62864ad8842";
+      sha256 = "1nxgsrbqhznqivjxh67pn8laf4pysja5xyc40bdjvprl9nc40z6q";
+    };
+  }
+  {
+    goPackagePath = "github.com/rainycape/memcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rainycape/memcache";
+      rev = "1031fa0ce2f20c1c0e1e1b51951d8ea02c84fa05";
+      sha256 = "02cbhy192vi0d1kwh57mdrg1mkr027ndkvd1y0cx0kn0h6pszggn";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "be8372ae8ec5c6daaed3cc28ebf73c54b737c240";
+      sha256 = "1ljfacbhd180yr0lc9myvxxdka0iji2ihsx0fcczja4ik5f2mb5p";
+    };
+  }
+  {
+    goPackagePath = "github.com/timewasted/linode";
+    fetch = {
+      type = "git";
+      url = "https://github.com/timewasted/linode";
+      rev = "37e84520dcf74488f67654f9c775b9752c232dc1";
+      sha256 = "08gpys1c5xkh7f92fq31wb24vjksfnpbhfwini73dlvyi2w25a3c";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "a1c7408de3f632d86eee604a3bb755f1ffb68226";
+      sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "5119cf507ed5294cc409c092980c7497ee5d6fd2";
+      sha256 = "0r8ffhagvzpjrkm25rrlby4h6bsqqlq6kcm01g54iqm7b2yrjy1p";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "f5dfe339be1d06f81b22525fe34671ee7d2c8904";
+      sha256 = "01y9j7pjnnld4ipmzjvs0hls0hh698f2sga8cxaw5y6r5j7igaah";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "543e37812f10c46c622c9575afd7ad22f22a12ba";
+      sha256 = "0kc816fq1zj5wdw4mfa7w2q26rnh273157w8n0d30xpzl8ba2isr";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/google-api-go-client";
+      rev = "068431dcab1a5817548dd244d9795788a98329f4";
+      sha256 = "1yn5qfmmmqbm6k5h8qj5n6ra3xv9aispvjv9kqarxwvv7q5xql83";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/ini.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ini.v1";
+      rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a";
+      sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/ns1/ns1-go.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ns1/ns1-go.v2";
+      rev = "1f132c4ac59d2c7022353a8824002a15deb66f1e";
+      sha256 = "0fx646hzhi6w58hiwc76hfjxn0dj9vxbrdqkb64lqxymzxzsrfnb";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/square/go-jose.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/square/go-jose.v1";
+      rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d";
+      sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is";
+    };
+  }
+]
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 64ec5e9b418ea07717c0fe90d7b8c8460849ee3d..cfbb90fdc3082f0fe90a7ef4c9dc6fd065b5888b 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -1,23 +1,37 @@
-{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl
+, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, squashfsTools, iproute, iptables
+}:
 
 buildGoPackage rec {
-  name = "lxd-${version}";
-  version = "2.16";
-  rev = "lxd-${version}";
+  name = "lxd-3.0.0";
 
   goPackagePath = "github.com/lxc/lxd";
 
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "lxc";
-    repo = "lxd";
-    sha256 = "0i2mq9m8k9kznwz1i0xb48plp1ffpzvbdrvqvagis4sm17yab3fn";
+  src = fetchurl {
+    url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz";
+    sha256 = "0m5prdf9sk8k5bws1zva4n9ycggmy76wnjr6wb423066pszz24ww";
   };
 
-  goDeps = ./deps.nix;
+  preBuild = ''
+    # unpack vendor
+    pushd go/src/github.com/lxc/lxd
+    rm dist/src/github.com/lxc/lxd
+    cp -r dist/src/* ../../..
+    rm -r dist
+    popd
+  '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ lxc ];
+  postInstall = ''
+    # binaries from test/
+    rm $bin/bin/{deps,macaroon-identity}
+
+    wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [
+      acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables
+    ]}
+  '';
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  buildInputs = [ lxc acl ];
 
   meta = with stdenv.lib; {
     description = "Daemon based on liblxc offering a REST API to manage containers";
diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix
deleted file mode 100644
index e0f591a23d1e15dadcc3161fe9677162818d580d..0000000000000000000000000000000000000000
--- a/pkgs/tools/admin/lxd/deps.nix
+++ /dev/null
@@ -1,165 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
-[
-  {
-    goPackagePath = "github.com/dustinkirkland/golang-petname";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dustinkirkland/golang-petname";
-      rev = "4f77bdee0b67a08d17afadc0d5a4a3d1cb7d8d14";
-      sha256 = "1cizm3xywsp9vc381k02dhjq5a6c772wc05w60m4gfdmp2kmd4di";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef";
-      sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";
-    };
-  }
-  {
-    goPackagePath = "github.com/gorilla/mux";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/mux";
-      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";
-    };
-  }
-  {
-    goPackagePath = "github.com/pborman/uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pborman/uuid";
-      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";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/flosch/pongo2.v3";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/flosch/pongo2.v3";
-      rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";
-      sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/inconshreveable/log15.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/inconshreveable/log15.v2";
-      rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f";
-      sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/lxc/go-lxc.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/lxc/go-lxc.v2";
-      rev = "8304875cc3423823032ec93556beee076c6ba687";
-      sha256 = "12vrx9ilxkl1nxc5k81c6b2a1i715843r23fra681digdjnd8bpk";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/tomb.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/tomb.v2";
-      rev = "d5d1b5820637886def9eef33e03a27a9f166942c";
-      sha256 = "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
-      sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
-    };
-  }
-  {
-      goPackagePath = "github.com/gosexy/gettext";
-      fetch = {
-        type = "git";
-        url = "https://github.com/gosexy/gettext";
-        rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b";
-        sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi";
-      };
-  }
-  {
-      goPackagePath = "github.com/olekukonko/tablewriter";
-      fetch = {
-        type = "git";
-        url = "https://github.com/olekukonko/tablewriter";
-        rev = "febf2d34b54a69ce7530036c7503b1c9fbfdf0bb";
-        sha256 = "1ir7bs4m5rk8v9vpycjj7mn6sc6j9wvxkd63i9b6fmrdsx9q0x4g";
-      };
-  }
-  {
-      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/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index cebe90855fae79b5bc4e83e03911e670963bc7e8..c39c378d2216976ab10d439a4d5cfb5e39b2d57d 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl, autoreconfHook, libxcomp }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxcomp }:
 
 stdenv.mkDerivation rec {
   name = "nxproxy-${version}";
-  version = "3.5.0.32";
+  version = "3.5.99.16";
 
   src = fetchurl {
-    sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
+    sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2";
     url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
   buildInputs = [ libxcomp ];
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   preAutoreconf = ''
     cd nxproxy/
+    sed -i 's|-L\$(top_srcdir)/../nxcomp/src/.libs ||' src/Makefile.am
   '';
 
   makeFlags = [ "exec_prefix=$(out)" ];
@@ -25,6 +26,5 @@ stdenv.mkDerivation rec {
     homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index b5056460225661802e2cd1364e617153deb6a401..4077c4fb9ecbc3da6843e54bb9b30f903b0b42cd 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -8,19 +8,18 @@
 
 python2Packages.buildPythonApplication rec {
   pname = "salt";
-  version = "2017.7.2";
-  name = "${pname}-${version}";
+  version = "2017.7.4";
 
   src = python2Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0h18zwp1w90rgxpmqgrmn9wp31h03f0vak8lpnnbh0dzbbgcffzz";
+    sha256 = "15xfvclk3ns8vk17j7bfy4alq7ab5x3y3jnpqzp5583bfyak0mqx";
   };
 
   propagatedBuildInputs = with python2Packages; [
     futures
     jinja2
     markupsafe
-    msgpack
+    msgpack-python
     pycrypto
     pyyaml
     pyzmq
diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
index ff9590c79a51f94e440502f21af2fad8a09e09ba..24e59a355532633cd9ff3bf0a22d5de28e9bd429 100644
--- a/pkgs/tools/admin/salt/pepper/default.nix
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -5,10 +5,10 @@
 
 python2Packages.buildPythonApplication rec {
   name = "salt-pepper-${version}";
-  version = "0.5.0";
+  version = "0.5.5";
   src = fetchurl {
     url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck";
+    sha256 = "1wj1k64ly6af6qsmiizlx32jxh23a37smd9wb57l5zl0x8sfqq1n";
   };
 
   doCheck = false; # no tests available
diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix
index 9b3dee728eb290b707289977ca1dd67b537da62a..f7b6aaa76c68dc6142064e5422a9f09f30b3b8a2 100644
--- a/pkgs/tools/admin/sec/default.nix
+++ b/pkgs/tools/admin/sec/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, perl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "sec-2.7.7";
+  name = "sec-2.7.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz";
-    sha256 = "116nn8fg24nwcimm8gcfp52bsgh1ckrspjr8sk4i0arvpl3d12m9";
+    sha256 = "0f5a2nkd5cmg1rziizz2gmgdwb5dz99x9pbxw30p384rjh79zcaa";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index f66fd6b00afbb689a36f2dc8dce67e8104c498e9..47bf848578d9a8cb3c6ec248297898ce5eb6a015 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,26 +1,33 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages }:
-
+{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, bash }:
+ 
 pythonPackages.buildPythonApplication rec {
   pname = "simp_le-client";
-  version = "0.6.1";
-  name = "${pname}-${version}";
+  version = "0.8.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0x4fky9jizs3xi55cdy217cvm3ikpghiabysan71b07ackkdfj6k";
+    sha256 = "0nv9mm99rm8i9flgfgwvmajbsxb5rm162nfxlq3wk66bbbyr6y1i";
   };
 
+  postPatch = ''
+    # drop upper bound of acme requirement
+    sed -ri "s/'(acme>=[^,]+),<[^']+'/'\1'/" setup.py
+    substituteInPlace simp_le.py \
+      --replace "/bin/sh" "${bash}/bin/sh"
+  '';
+
   checkPhase = ''
     $out/bin/simp_le --test
   '';
 
-  propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ];
+  propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm josepy ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/zenhack/simp_le;
     description = "Simple Let's Encrypt client";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ gebner nckx ];
+    maintainers = with maintainers; [ gebner makefu ];
     platforms = platforms.all;
   };
 }
+
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 5ba53c75371e049ebd32df977159451298db9d17..3818f361cb531bb864af47873d9aecb26f6fa9f6 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -3,7 +3,7 @@
 , libjpeg_turbo, pixman, fltk
 , fontDirectories
 , cmake, gettext, libtool
-, glproto, mesa_glu
+, glproto, libGLU
 , gnutls, pam, nettle
 , xterm, openssh }:
 
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
         --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
         --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
         --disable-xorgcfg --disable-xprint --disable-static \
-        --disable-composite --disable-xtrap --enable-xcsecurity \
+        --enable-composite --disable-xtrap --enable-xcsecurity \
         --disable-{a,c,m}fb \
         --disable-xwayland \
         --disable-config-dbus --disable-config-udev --disable-config-hal \
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
         --with-xkb-path=${xkeyboard_config}/share/X11/xkb \
         --with-xkb-bin-directory=${xorg.xkbcomp}/bin \
         --with-xkb-output=$out/share/X11/xkb/compiled
-    make TIGERVNC_SRCDIR=`pwd`/../..
+    make TIGERVNC_SRCDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
     popd
   '';
 
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     fontsproto videoproto scrnsaverproto resourceproto presentproto
     utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft
     libxkbfile libXfont2 libpciaccess xineramaproto
-    glproto mesa_glu
+    glproto libGLU
   ] ++ xorgserver.buildInputs;
 
   nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil ]
diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0d983ad98ea1c9cccb4ea765f043664d6a8c7b28
--- /dev/null
+++ b/pkgs/tools/admin/vncdo/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub
+, pythonPackages
+}:
+pythonPackages.buildPythonPackage rec {
+  pname = "vncdo";
+  version = "0.11.2";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "sibson";
+    repo = "vncdotool";
+    rev = "5c03a82dcb5a3bd9e8f741f8a8d0c1ce082f2834";
+    sha256 = "0k03b09ipsz8vp362x7sx7z68mxgqw9qzvkii2f8j9vx2y79rjsh";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    pillow
+    twisted
+    pexpect
+    nose
+    ptyprocess
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sibson/vncdotool;
+    description = "A command line VNC client and python library";
+    license = licenses.mit;
+    maintainers = with maintainers; [ elitak ];
+    platforms = with platforms; linux ++ darwin;
+  };
+
+}
diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix
index 00de2c2ec46228bfedb306961f3bb3198e98501c..77536a7ad30ebb393fa5ca9c52cfc2371ced0060 100644
--- a/pkgs/tools/archivers/cromfs/default.nix
+++ b/pkgs/tools/archivers/cromfs/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "FUSE Compressed ROM filesystem with lzma";
-    homepage = http://bisqwit.iki.fi/source/cromfs.html;
+    homepage = https://bisqwit.iki.fi/source/cromfs.html;
     maintainers = [ stdenv.lib.maintainers.viric ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index d75b50bca1afe1bd2aa96940cfc711b67c9d8103..315ef72728387b8d7df95ae91780f972b666074c 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -3,11 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "dar-2.5.9";
+  version = "2.5.14";
+  name = "dar-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "0bm91d82amh5h2sla2ngbpxd0l64alcdjhxz35bhj3cpz9562wv9";
+    url = "mirror://sourceforge/dar/${name}-bis.tar.gz";
+    sha256 = "1sbd7n5mfqkwxy5rz2v8575y21j94ypwrpinizr3l2yy9pq49rx5";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
diff --git a/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch b/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch
deleted file mode 100644
index c53d92891fc4969aa33d264f716ecbb014276916..0000000000000000000000000000000000000000
--- a/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 7340f67b9860ea0531c1450e5aa261c50f67165d
-Author: Paul Eggert 
-Date:   Sat Oct 29 21:04:40 2016 -0700
-
-    When extracting, skip ".." members
-    
-    * NEWS: Document this.
-    * src/extract.c (extract_archive): Skip members whose names
-    contain "..".
-
-diff --git a/src/extract.c b/src/extract.c
-index f982433..7904148 100644
---- a/src/extract.c
-+++ b/src/extract.c
-@@ -1629,12 +1629,20 @@ extract_archive (void)
- {
-   char typeflag;
-   tar_extractor_t fun;
-+  bool skip_dotdot_name;
- 
-   fatal_exit_hook = extract_finish;
- 
-   set_next_block_after (current_header);
- 
-+  skip_dotdot_name = (!absolute_names_option
-+		      && contains_dot_dot (current_stat_info.orig_file_name));
-+  if (skip_dotdot_name)
-+    ERROR ((0, 0, _("%s: Member name contains '..'"),
-+	    quotearg_colon (current_stat_info.orig_file_name)));
-+
-   if (!current_stat_info.file_name[0]
-+      || skip_dotdot_name
-       || (interactive_option
- 	  && !confirm ("extract", current_stat_info.file_name)))
-     {
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 447ef1f623fc2b15e64f647a6d243d2e9e665c25..4677ee45afb282ec5ec43d55329e56c5463262ff 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnutar-${version}";
-  version = "1.29";
+  version = "1.30";
 
   src = fetchurl {
     url = "mirror://gnu/tar/tar-${version}.tar.xz";
-    sha256 = "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0";
+    sha256 = "1lyjyk8z8hdddsxw0ikchrsfg3i0x3fsh7l63a8jgaz1n7dr5gzi";
   };
 
-  patches = [ ./CVE-2016-6321.patch ];
-
   # avoid retaining reference to CF during stdenv bootstrap
   configureFlags = stdenv.lib.optionals stdenv.isDarwin [
     "gt_cv_func_CFPreferencesCopyAppValue=no"
diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix
index 0f6814d53c991edaca2aaba1674c69cec697505c..546e9a7aad98daad6638b353351874f20b907189 100644
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/pkgs/tools/archivers/innoextract/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}:
+{ stdenv, fetchurl, cmake, doxygen, makeWrapper, python
+, boost, lzma
+, withGog ? false, unar ? null }:
 
 stdenv.mkDerivation rec {
   name = "innoextract-1.6";
@@ -8,14 +10,23 @@ stdenv.mkDerivation rec {
     sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6";
   };
 
-  buildInputs = [ python doxygen lzma boost ];
-  nativeBuildInputs = [ cmake ];
+  buildInputs = [ python lzma boost ];
+
+  nativeBuildInputs = [ cmake makeWrapper ];
+
+  enableParallelBuilding = true;
+
+  # we need unar to for multi-archive extraction
+  postFixup = stdenv.lib.optionalString withGog ''
+    wrapProgram $out/bin/innoextract \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]}
+  '';
 
   meta = with stdenv.lib; {
     description = "A tool to unpack installers created by Inno Setup";
     homepage = http://constexpr.org/innoextract/;
-    platforms = platforms.linux;
     license = licenses.zlib;
     maintainers = with maintainers; [ abbradar ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 3550b7d7de3697c56add77b3833b956cb4935858..886ed817909149fdaa0974c387984195c2364fa3 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
       url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d";
       sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m";
     })
+    (fetchpatch rec {
+      name = "CVE-2017-17969.patch";
+      url = "https://anonscm.debian.org/cgit/users/robert/p7zip.git/plain/debian/patches/13-${name}?h=debian/16.02%2bdfsg-5";
+      sha256 = "16lbf6rgyl7xwxfjgg1243jvi39yb3i5pgqfnxswyc0jzhxv81d7";
+    })
   ];
 
   # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 9f161ac7525a61dd86a4d7128484173e6eb5203d..0228146894284eb711d7b2f487d13379be7e7224 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     in ''
       substituteInPlace tests/shar-1 --replace '${shar_sub}' '${shar_sub} -s submitter'
       substituteInPlace tests/shar-2 --replace '${shar_sub}' '${shar_sub} -s submitter'
+
+      substituteInPlace intl/Makefile.in --replace "AR = ar" ""
     '';
 
   doCheck = true;
diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix
index 520742a1b3c73d7b5ab59aa940abda37516091e4..1104548f77f8778adae7d683aa42d6e8512dfb1d 100644
--- a/pkgs/tools/archivers/unar/default.nix
+++ b/pkgs/tools/archivers/unar/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchurl, gnustep, unzip, bzip2, zlib, icu, openssl }:
 
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+let
   pname = "unar";
+
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
   version = "1.10.1";
 
   src = fetchurl {
@@ -10,23 +12,20 @@ stdenv.mkDerivation rec {
     sha256 = "0aq9zlar5vzr5qxphws8dm7ax60bsfsw77f4ciwa5dq5lla715j0";
   };
 
-  buildInputs = [
-    gnustep.make unzip gnustep.base bzip2.dev
-    zlib.dev icu.dev openssl.dev
-  ];
+  buildInputs = [ gnustep.base bzip2 icu openssl zlib ];
+
+  nativeBuildInputs = [ gnustep.make unzip ];
+
+  enableParallelBuilding = true;
 
   postPatch = ''
-    substituteInPlace Makefile.linux \
-      --replace "CC = gcc" "CC=cc" \
-      --replace "CXX = g++" "CXX=c++" \
-      --replace "OBJCC = gcc" "OBJCC=cc" \
-      --replace "OBJCXX = g++" "OBJCXX=c++"
-
-    substituteInPlace ../UniversalDetector/Makefile.linux \
-      --replace "CC = gcc" "CC=cc" \
-      --replace "CXX = g++" "CXX=c++" \
-      --replace "OBJCC = gcc" "OBJCC=c" \
-      --replace "OBJCXX = g++" "OBJCXX=c++"
+    for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do
+      substituteInPlace $f \
+        --replace "CC = gcc"     "CC=cc" \
+        --replace "CXX = g++"    "CXX=c++" \
+        --replace "OBJCC = gcc"  "OBJCC=cc" \
+        --replace "OBJCXX = g++" "OBJCXX=c++"
+    done
   '';
 
   makefile = "Makefile.linux";
@@ -34,17 +33,16 @@ stdenv.mkDerivation rec {
   sourceRoot = "./The Unarchiver/XADMaster";
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp lsar $out/bin
-    cp unar $out/bin
+    runHook preInstall
 
-    mkdir -p $out/share/man/man1
-    cp ../Extra/lsar.1 $out/share/man/man1
-    cp ../Extra/unar.1 $out/share/man/man1
+    install -Dm755 -t $out/bin lsar unar
+    install -Dm644 -t $out/share/man/man1 ../Extra/{lsar,unar}.1
 
     mkdir -p $out/etc/bash_completion.d
     cp ../Extra/lsar.bash_completion $out/etc/bash_completion.d/lsar
     cp ../Extra/unar.bash_completion $out/etc/bash_completion.d/unar
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
@@ -55,7 +53,7 @@ stdenv.mkDerivation rec {
       zip, RAR, 7z, tar, gzip, bzip2, LZMA, XZ, CAB, MSI, NSIS, EXE, ISO, BIN, \
       and split file formats, as well as the old Stuffit, Stuffit X, DiskDouble, \
       Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \
-      ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. 
+      ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats.
     '';
     license = with licenses; [ lgpl21Plus ];
     platforms = with platforms; linux;
diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix
index f3c566596c46d744e4775bcd7ac9360f81eb3a03..2505c012b26b1d27c6715c7b1139ad4d64487032 100644
--- a/pkgs/tools/archivers/unarj/default.nix
+++ b/pkgs/tools/archivers/unarj/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p";
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
+    url = "http://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
   };
 
   preInstall = ''
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Unarchiver of ARJ files";
     license = licenses.free;
-    maintainers = with maintainers; [ nckx ];
     # Vulnerable to CVE-2015-0557 & possibly CVE-2015-0556, CVE-2015-2782:
     broken = true;
   };
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7583663ebf0ab94aa9eb41abd2be69ed18c9a104
--- /dev/null
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, pkgs, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }:
+
+stdenv.mkDerivation rec {
+  name = "unp-${version}";
+  version = "2.0-pre7";
+
+  runtime_bins =  [ file unrar unzip gzip ] ++ extraBackends;
+  buildInputs = [ perl makeWrapper ] ++ runtime_bins;
+
+  src = fetchurl {
+    # url = "http://http.debian.net/debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2";
+    url = "mirror://debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2";
+    sha256 = "09w2sy7ivmylxf8blf0ywxicvb4pbl0xhrlbb3i9x9d56ll6ybbw";
+    name = "unp_2.0_pre7+nmu1.tar.bz2";
+  };
+
+  configurePhase = "true";
+  buildPhase = "true";
+  installPhase = ''
+  mkdir -p $out/bin
+  mkdir -p $out/share/man
+  cp unp $out/bin/
+  cp ucat $out/bin/
+  cp debian/unp.1 $out/share/man
+
+  wrapProgram $out/bin/unp \
+    --prefix PATH : ${lib.makeBinPath runtime_bins}
+  wrapProgram $out/bin/ucat \
+    --prefix PATH : ${lib.makeBinPath runtime_bins}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Command line tool for unpacking archives easily";
+    homepage = https://packages.qa.debian.org/u/unp.html;
+    license = with licenses; [ gpl2 ];
+    maintainers = [ maintainers.timor ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 9aedda83fd2c45fdc9941496d12d87ca7a17ecd1..15c0837154e6c54bc0b71db1320a19f89fe6d754 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-    sed 's/^CXX=g++/#CXX/' -i makefile
+    substituteInPlace makefile \
+      --replace "CXX=" "#CXX=" \
+      --replace "STRIP=" "#STRIP=" \
+      --replace "AR=" "#AR="
   '';
 
   buildPhase = ''
diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..dbf3d91f37aae72faa21224ab7dd2e03a34a3527
--- /dev/null
+++ b/pkgs/tools/archivers/wimlib/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, makeWrapper
+, pkgconfig, openssl, fuse, libxml2
+, cabextract ? null
+, cdrkit ? null
+, mtools ? null
+, ntfs3g ? null
+, syslinux ? null
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.12.0";
+  name = "wimlib-${version}";
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  buildInputs = [ openssl fuse libxml2 ntfs3g ];
+
+  src = fetchurl {
+    url = "https://wimlib.net/downloads/${name}.tar.gz";
+    sha256 = "852cf59d682a91974f715f09fa98cab621b740226adcfea7a42360be0f86464f";
+  };
+
+  preBuild = ''
+    substituteInPlace programs/mkwinpeimg.in \
+      --replace '/usr/lib/syslinux' "${syslinux}/share/syslinux"
+  '';
+
+  postInstall = let
+    path = stdenv.lib.makeBinPath  [ cabextract cdrkit mtools ntfs3g syslinux ];
+  in ''
+    for prog in $out/bin/*; do
+      wrapProgram $prog --prefix PATH : ${path}
+    done
+  '';
+
+  doCheck = true;
+
+  preCheck = ''
+    patchShebangs tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wimlib.net;
+    description = "A library and program to extract, create, and modify WIM files";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ andir ];
+    license = with licenses; [ gpl3 lgpl3 cc0 ];
+  };
+}
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
index 1c8d8367793adfd803b33c1da8edd4a86cd9031c..d8c4175e77600355a858189e80c844e5b888b9d0 100644
--- a/pkgs/tools/archivers/xarchiver/default.nix
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }:
+{ stdenv, fetchFromGitHub, fetchpatch, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   version = "0.5.4.12";
@@ -11,8 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "13d8slcx3frz0dhl1w4llj7001n57cjjb8r7dlaw5qacaas3xfwi";
   };
 
+  patches = [
+    # Fixes darwin build, remove with next update.
+    (fetchpatch {
+      url = https://github.com/ib/xarchiver/commit/8c69d066a827419feafd0bd047d19207ceadc7df.patch;
+      sha256 = "1ch1409hx1ynkm0mz93zy8h7wvcrsn56sz7lczsf6hznc8yzl0qg";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 intltool libxslt ];
+  buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ];
 
   meta = {
     description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 3c841aa621fe8442dbf70fde74a54b7dc71728f0..6d979bbf33d8b3db85350e55d13e191290808dc1 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -8,10 +8,13 @@ stdenv.mkDerivation {
   src = fetchurl {
     urls = [
       ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz
-      http://pkgs.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz
+      http://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz
     ];
     sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
   };
+  patchPhase = ''
+    substituteInPlace unix/Makefile --replace 'CC = cc' ""
+  '';
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 30b05b2b23405310f2308cb18e355cd16e674498..309604999ba20cc1eb63ac88787a955ffa596401 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Incremental journaling backup utility and archiver";
     homepage = http://mattmahoney.net/dc/zpaq.html;
     license = licenses.gpl3Plus ;
-    maintainers = with maintainers; [ raskin nckx ];
+    maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     inherit version;
   };
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 5e63c7cfaabfeca3d7860269a58699f9d9dcfa23..3004c7e2132cdbeb9c6e94121490af88ef12c98c 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "ZPAQ archive (de)compressor and algorithm development tool";
     license = licenses.gpl3Plus ;
-    maintainers = with maintainers; [ raskin nckx ];
+    maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index aa3ab987bed3127ca9ed86ce50f55eefcd38a8ce..f93231d80222b34d53344e225a72e42aab8bca9c 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "abcm2ps-${version}";
-  version = "8.13.16";
+  version = "8.13.20";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "1xb37jh811b7h72wpaykck6nskwq4mvy833q6wkhcyr041p1gcp7";
+    sha256 = "0zgwrclky6b1l1pd07s31azyxf4clwi3cp5x0wjix0wp78b89pbx";
   };
 
   prePatch = ''
@@ -19,12 +19,17 @@ stdenv.mkDerivation rec {
     "--INSTALL=install"
   ];
 
+  buildFlags = [
+    "CC=${stdenv.cc}/bin/cc"
+  ];
+
   buildInputs = [ which pkgconfig freetype pango ];
 
   meta = with stdenv.lib; {
     homepage = http://moinejf.free.fr/;
     license = licenses.gpl3;
     description = "abcm2ps is a command line program which converts ABC to music sheet in PostScript or SVG format";
+    platforms = platforms.unix;
     maintainers = [ maintainers.dotlambda ];
   };
 }
diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index cbb674f3801c1186db1f1503a061cad77f7f4f33..dc5a010ec7418d2827d674647ab7408ddf7ac999 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
   name = "abcMIDI-${version}";
-  version = "2017.06.10";
+  version = "2018.04.18";
 
-  src = fetchFromGitHub {
-    owner = "leesavide";
-    repo = "abcmidi";
-    rev = name;
-    sha256 = "0y92m3mj63vvy79ksq4z5hgkz6w50drg9a4bmbk6jylny0l0bdpy";
+  src = fetchzip {
+    url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
+    sha256 = "0kbval5ckan8vvrlpyz1mkb1ifvr149gxpb7ljbcm890p8hpaxff";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase
@@ -16,8 +14,10 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://abc.sourceforge.net/abcMIDI/;
+    downloadPage = https://ifdo.ca/~seymour/runabc/top.html;
     license = licenses.gpl2Plus;
-    description = "abc <-> MIDI conversion utilities";
+    description = "Utilities for converting between abc and MIDI";
+    platforms = platforms.unix;
     maintainers = [ maintainers.dotlambda ];
   };
 }
diff --git a/pkgs/tools/audio/beets/alternatives-beets-1.4.6.patch b/pkgs/tools/audio/beets/alternatives-beets-1.4.6.patch
new file mode 100644
index 0000000000000000000000000000000000000000..652e0e4a94b0833ed2ec2a9bae33f33e14b5675c
--- /dev/null
+++ b/pkgs/tools/audio/beets/alternatives-beets-1.4.6.patch
@@ -0,0 +1,30 @@
+diff --git a/test/helper.py b/test/helper.py
+index c216226..d409c09 100644
+--- a/test/helper.py
++++ b/test/helper.py
+@@ -11,6 +11,7 @@ import beets
+ from beets import plugins
+ from beets import ui
+ from beets.library import Item
++from beets.util import MoveOperation
+ 
+ from beetsplug import alternatives
+ from beetsplug import convert
+@@ -183,7 +184,7 @@ class TestHelper(Assertions):
+         item = Item.from_path(os.path.join(self.fixture_dir, 'min.' + ext))
+         item.add(self.lib)
+         item.update(values)
+-        item.move(copy=True)
++        item.move(operation=MoveOperation.COPY)
+         item.write()
+         album = self.lib.add_album([item])
+         album.albumartist = item.artist
+@@ -201,7 +202,7 @@ class TestHelper(Assertions):
+         item = Item.from_path(os.path.join(self.fixture_dir, 'min.mp3'))
+         item.add(self.lib)
+         item.update(values)
+-        item.move(copy=True)
++        item.move(operation=MoveOperation.COPY)
+         item.write()
+         return item
+ 
diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index 27be81733d3bdf7e91b2b851247c85b7b28ff88c..f808e90281e6801a6a2e2f38d7a534b0b1f4afba 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -11,6 +11,8 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "10za6h59pxa13y8i4amqhc6392csml0dl771lssv6b6a98kamsy7";
   };
 
+  patches = [ ./alternatives-beets-1.4.6.patch ];
+
   postPatch = ''
     sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py
     sed -i -e '/test_suite/d' setup.py
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 7e9d0ff9d860400804dff301e8c7cc56fbb43551..b8f3318057b4086e1aa99a6945d2b8a4d4867cb4 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -95,13 +95,13 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   name = "beets-${version}";
-  version = "1.4.5";
+  version = "1.4.6";
 
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "0fvfp9ckq3dhs4f8abg9fprfppyf0g6mv8br2xz99plg4wnffzmy";
+    sha256 = "0m8macydkn1fp4ymig0rg7bzw77rrm454q763gxdpq2kg08yl5py";
   };
 
   propagatedBuildInputs = [
@@ -194,7 +194,8 @@ in pythonPackages.buildPythonApplication rec {
     BEETS_TEST_SHELL="${testShell}" \
     BASH_COMPLETION_SCRIPT="${completion}" \
     HOME="$(mktemp -d)" \
-      nosetests -v
+      # Exclude failing test https://github.com/beetbox/beets/issues/2652
+      nosetests -v --exclude=test_single_month_nonmatch_ --exclude=test_asciify_variable --exclude=test_asciify_character_expanding_to_slash
 
     runHook postCheck
   '';
@@ -223,7 +224,7 @@ in pythonPackages.buildPythonApplication rec {
     description = "Music tagger and library organizer";
     homepage = http://beets.radbox.org;
     license = licenses.mit;
-    maintainers = with maintainers; [ aszlig domenkozar pjones profpatsch ];
+    maintainers = with maintainers; [ aszlig domenkozar pjones ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix
index e98667b8c04a4c27d9d16068109bb6391eb03a22..23a33122c9fb34849508d5332cfb286be5c9a8cd 100644
--- a/pkgs/tools/audio/glyr/default.nix
+++ b/pkgs/tools/audio/glyr/default.nix
@@ -15,16 +15,12 @@ stdenv.mkDerivation rec {
   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
+    platforms = platforms.unix;
   };
 }
 
diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix
index 70ae1f846430814cf9b8d8921a3da58e61874710..ca41c8a9eb3a8a3e7133d57678252fd5e3f71533 100644
--- a/pkgs/tools/audio/mpdas/default.nix
+++ b/pkgs/tools/audio/mpdas/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mpdas-${version}";
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "mpdas";
     rev = version;
-    sha256 = "1i6i36jd582y3nm5plcrswqljf528hd23whp8zw06hwqnsgca5b6";
+    sha256 = "0fcqc4w6iwbi1n3cllcgj0k61zffhqkbr8668myxap21m35x8y1r";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index b04e449835d44e0023ed724dab91781b8d5797aa..b8f39a03083ca68c2fced15305e3a0e3abf76519 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "playerctl-${version}";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "playerctl";
     rev = "v${version}";
-    sha256 = "0b4pg5pwblgbf6kvvynzh9dshfikxy5c2ks7733n7wza5wkpgmng";
+    sha256 = "1sxy87syrfk485f2x556rl567j6rph4ss0xahf04bv26bzj3mqrp";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index 385021b7354a9e4c5c0778c777407e732edeb9ae..9906fa449dda3c374d450e9aabc61e7742e6fbb2 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11 }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }:
 
 stdenv.mkDerivation rec {
   name = "pnmixer-${version}";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "nicklan";
     repo = "pnmixer";
     rev = "v${version}";
-    sha256 = "0mmrq4m2rk0wmkfmqs3fk2rnw5g5lvd7ill2s3d7ggf9vba1pcn2";
+    sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148";
   };
 
   nativeBuildInputs = [ cmake pkgconfig gettext ];
 
-  buildInputs = [ alsaLib gtk3 glib libnotify libX11 ];
+  buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/nicklan/pnmixer;
diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/tools/audio/pulsemixer/default.nix
index f07bf7d3fc5199abe7bab91a553ff5db9d9a70a0..8251c7d5cfc9dc5c5e348a5fc8e64faadfb19be7 100644
--- a/pkgs/tools/audio/pulsemixer/default.nix
+++ b/pkgs/tools/audio/pulsemixer/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "pulsemixer";
-  version = "1.3.0-license";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "GeorgeFilipkin";
     repo = pname;
     rev = version;
-    sha256 = "186xbzyn35w2j58l68mccj0cnf0wxj93zb7s0r26zj4cppwszn90";
+    sha256 = "0l5zawv36d46sj3k31k5w6imnnxzyn62r83wdhr7fp5mi3ls1h5x";
   };
 
   inherit libpulseaudio;
diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix
deleted file mode 100644
index 754e12e7f776b558e57798b918b10cc1454801f0..0000000000000000000000000000000000000000
--- a/pkgs/tools/backup/attic/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchzip, python3Packages, openssl, acl, fetchurl, pkgconfig, fuse, attr, which }:
-
-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";
-    };
-  nativeBuildInputs = [ pkgconfig ];
-    buildInputs = with python3Packages; [ pytest 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 = "";
-
-  src = fetchzip {
-    name = "${name}-src";
-    url = "https://github.com/jborg/attic/archive/${version}.tar.gz";
-    sha256 = "008566hhsd3ck70ql0fdn4vaqjfcnf493gwd49d6294f8r7qn06z";
-  };
-
-  propagatedBuildInputs = with python3Packages;
-    [ cython msgpack openssl acl llfuse-0-41 ];
-
-  preConfigure = ''
-    export ATTIC_OPENSSL_PREFIX="${openssl.dev}"
-    substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A deduplicating backup program";
-    homepage = https://attic-backup.org;
-    license = licenses.bsd3;
-    maintainers = [ maintainers.wscott ];
-    platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
-  };
-}
diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix
index 20c96b65a624b61dbdbaf228fe2717f59c423f43..23affbb8af6650fe1a24a0e2b83171204204d3ae 100644
--- a/pkgs/tools/backup/backup/default.nix
+++ b/pkgs/tools/backup/backup/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, lib, bundlerEnv, ruby_2_1, curl }:
+{ stdenv, lib, bundlerEnv, ruby, curl }:
 
 bundlerEnv {
   name = "backup_v4";
 
-  ruby = ruby_2_1;
+  inherit ruby;
   gemdir = ./.;
 
   buildInputs = [ curl ];
 
   meta = with lib; {
+    broken = true; # need ruby 2.1
     description = "Easy full stack backup operations on UNIX-like systems";
     homepage    = http://backup.github.io/backup/v4/;
     license     = licenses.mit;
-    maintainers = [ maintainers.palo ];
+    maintainers = [ maintainers.mrVanDalo ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index c3256713832249baf0fbd3fcc7e0818ea7c46bb4..691568673df391c271a32ce3b8d2460a12c3ef0e 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex
 , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
-, sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null
+, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
 , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
 }:
 
-assert sqlite != null || postgresql != null || libmysql != null;
+assert sqlite != null || postgresql != null || mysql != null;
 
 with stdenv.lib;
 let
@@ -12,20 +12,20 @@ let
 in
 stdenv.mkDerivation rec {
   name = "bareos-${version}";
-  version = "15.2.4";
+  version = "17.2.5";
 
   src = fetchFromGitHub {
     owner = "bareos";
     repo = "bareos";
     rev = "Release/${version}";
     name = "${name}-src";
-    sha256 = "02k6wmr2n12dc6vwda8xczmbqidg6fs8nfg9n2cwwpm3k1a21qnd";
+    sha256 = "1mgh25lhd05m26sq1sj5ir2b4n7560x93ib25cvf9vmmypm1c7pn";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     nettools gettext readline openssl python2 flex ncurses sqlite postgresql
-    libmysql zlib lzo jansson acl glusterfs libceph libcap rocksdb
+    mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb
   ];
 
   postPatch = ''
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     ++ optional (openssl != null) "--with-openssl=${openssl.dev}"
     ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
     ++ optional (postgresql != null) "--with-postgresql=${postgresql}"
-    ++ optional (libmysql != null) "--with-mysql=${libmysql.dev}"
+    ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}"
     ++ optional (zlib != null) "--with-zlib=${zlib.dev}"
     ++ optional (lzo != null) "--with-lzo=${lzo}"
     ++ optional (jansson != null) "--with-jansson=${jansson}"
diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2fd67765aaf396c08ffaa44b63ff2d960853dd61
--- /dev/null
+++ b/pkgs/tools/backup/bdsync/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, openssl, coreutils, which }:
+
+stdenv.mkDerivation rec {
+
+  name = "${pname}-${version}";
+  pname = "bdsync";
+  version = "0.10.1";
+
+  src = fetchFromGitHub {
+    owner = "TargetHolding";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "144hlbk3k29l7sja6piwhd2jsnzzsak13fcjbahd6m8yimxyb2nf";
+  };
+
+  postPatch = ''
+    patchShebangs ./tests.sh
+    patchShebangs ./tests/
+  '';
+
+  buildInputs = [ openssl coreutils which ];
+
+  doCheck = true;
+  checkPhase = ''
+    make test
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
+    cp bdsync $out/bin/
+    cp bdsync.1 $out/share/man/man1/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Fast block device synchronizing tool";
+    homepage = https://github.com/TargetHolding/bdsync;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jluttine ];
+  };
+
+}
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 867d2cf903a042c9a00518ab88d3c56b16e11b73..43f45a1783f56d06ffca7dfc2403699bc4c5393a 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -1,30 +1,35 @@
-{ stdenv, fetchurl, python3Packages, acl, lz4, openssl, openssh }:
+{ stdenv, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }:
 
 python3Packages.buildPythonApplication rec {
-  name = "borgbackup-${version}";
-  version = "1.1.1";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "https://github.com/borgbackup/borg/releases/download/"
-      + "${version}/${name}.tar.gz";
-    sha256 = "0iik5lq349cl87imlwra2pp0j36wjhpn8r1d3778azvvqpyjq2d5";
+  pname = "borgbackup";
+  version = "1.1.5";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "4356e6c712871f389e3cb1d6382e341ea635f9e5c65de1cd8fcd103d0fb66d3d";
   };
 
+  postPatch = ''
+    # loosen constraint on msgpack version, only 0.5.0 had problems
+    sed -i "s/'msgpack-python.*'/'msgpack-python'/g" setup.py
+  '';
+
   nativeBuildInputs = with python3Packages; [
     # For building documentation:
     sphinx guzzle_sphinx_theme
   ];
   buildInputs = [
-    lz4 openssl python3Packages.setuptools_scm
+    libb2 lz4 zstd openssl python3Packages.setuptools_scm
   ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ];
   propagatedBuildInputs = with python3Packages; [
-    cython msgpack
+    cython msgpack-python
   ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ];
 
   preConfigure = ''
     export BORG_OPENSSL_PREFIX="${openssl.dev}"
     export BORG_LZ4_PREFIX="${lz4.dev}"
+    export BORG_LIBB2_PREFIX="${libb2}"
+    export BORG_LIBZSTD_PREFIX="${zstd}"
   '';
 
   makeWrapperArgs = [
@@ -41,14 +46,11 @@ python3Packages.buildPythonApplication rec {
     cp -R docs/_build/man $out/share/man/man1
   '';
 
-  # tests fail due to missing test command in nix_run_setup.py
-  doCheck = false;
-
   meta = with stdenv.lib; {
     description = "A deduplicating backup program (attic fork)";
     homepage = https://borgbackup.github.io/;
     license = licenses.bsd3;
     platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
-    maintainers = with maintainers; [ nckx flokli ];
+    maintainers = with maintainers; [ flokli ];
   };
 }
diff --git a/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch b/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch
deleted file mode 100644
index 1ebb34ded9eafb3c8dbf11aaede4e54ec83fa2bf..0000000000000000000000000000000000000000
--- a/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d5978c207f2b266165140dd21e9746ace5792daf Mon Sep 17 00:00:00 2001
-From: Moritz Ulrich 
-Date: Fri, 18 Mar 2016 14:01:22 +0100
-Subject: [PATCH] btrbk: Prefix PATH instead of resetting it.
-
-Some distros don't even install use /usr/bin, /sbin, etc. (notably
-NixOS). Instead, they use PATH to specify which programs are available
-to a given executable.
-
-This patch changes the behavior or `btrbk` so it extends PATH with its
-own search paths instead of resetting it. This allows users and distros
-to specify their own custom location for `btrfs` via `PATH`.
----
- btrbk | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/btrbk b/btrbk
-index ab15858..0b91cbe 100755
---- a/btrbk
-+++ b/btrbk
-@@ -2464,10 +2464,11 @@ sub exit_status
- 
- MAIN:
- {
--  # set PATH instead of using absolute "/sbin/btrfs" (for now), as
--  # different distros (and even different versions of btrfs-progs)
--  # install the "btrfs" executable to different locations.
--  $ENV{PATH} = '/sbin:/bin:/usr/sbin:/usr/bin';
-+  # Prefix PATH with /sbin etc. instead of using absolute
-+  # "/sbin/btrfs" (for now), as different distros (and even different
-+  # versions of btrfs-progs) install the "btrfs" executable to
-+  # different locations.
-+  $ENV{PATH} .= '/sbin:/bin:/usr/sbin:/usr/bin';
- 
-   Getopt::Long::Configure qw(gnu_getopt);
-   $Data::Dumper::Sortkeys = 1;
--- 
-2.7.3
-
diff --git a/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch b/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch
deleted file mode 100644
index 050f1a6c430305af29308a62cc15c1674d78aa79..0000000000000000000000000000000000000000
--- a/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8abe8a915aa2d0c79c4dbe00dc7d255c32b7b85d Mon Sep 17 00:00:00 2001
-From: Moritz Ulrich 
-Date: Fri, 18 Mar 2016 13:20:48 +0100
-Subject: [PATCH] btrbk-mail: Use `btrbk` instead of unbound variable `$btrbk`
-
----
- contrib/cron/btrbk-mail | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/cron/btrbk-mail b/contrib/cron/btrbk-mail
-index f7e4f12..9143f2d 100755
---- a/contrib/cron/btrbk-mail
-+++ b/contrib/cron/btrbk-mail
-@@ -113,7 +113,7 @@ case $exitcode in
- 	;;
-     10) status="ERROR: At least one backup task aborted!"
- 	;;
--    *)  status="ERROR: $btrbk failed with error code $exitcode"
-+    *)  status="ERROR: btrbk failed with error code $exitcode"
- 	;;
- esac
- 
--- 
-2.7.3
-
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index f9feaf40ec2f1f00515eb293542b74fb5a08164a..ace543186651435dc75d13c06c309a715bc016f5 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages, makeWrapper }:
+{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
+, asciidoc-full, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
-  version = "0.25.1";
+  version = "0.26.1";
 
   src = fetchurl {
     url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz";
-    sha256 = "02qc9vbd5l0ywnv01p60v9q3dcx2z92dfaf95qf7ccxqaa9zxfr5";
+    sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp";
   };
 
-  patches = [
-    # https://github.com/digint/btrbk/pull/74
-    ./btrbk-Prefix-PATH-instead-of-resetting-it.patch
-  ];
-
-  buildInputs = with perlPackages; [ makeWrapper perl DateCalc ];
+  buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ];
 
   preInstall = ''
-    substituteInPlace Makefile \
-      --replace "/usr" "$out" \
-      --replace "/etc" "$out/etc"
+    for f in $(find . -name Makefile); do
+      substituteInPlace "$f" \
+        --replace "/usr" "$out" \
+        --replace "/etc" "$out/etc"
+    done
 
     # Tainted Mode disables PERL5LIB
     substituteInPlace btrbk --replace "perl -T" "perl"
@@ -31,9 +29,7 @@ stdenv.mkDerivation rec {
       --replace '$btrbk' 'btrbk'
   '';
 
-  fixupPhase = ''
-    patchShebangs $out/
-
+  preFixup = ''
     wrapProgram $out/sbin/btrbk \
       --set PERL5LIB $PERL5LIB \
       --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash openssh ]}"
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index d7c14a91efb4a8c29ce4728fa6bc673d491e769e..f24e89fcc840d6dea363876198c7046001039844 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, makeWrapper
+{ stdenv, fetchFromGitHub, makeWrapper
 , perl, pandoc, python2Packages, git
 , par2cmdline ? null, par2Support ? true
 }:
@@ -19,7 +19,12 @@ stdenv.mkDerivation rec {
     sha256 = "0wdr399jf64zzzsdvldhrwvnh5xpbghjvslr1j2cwr5y4i36znxf";
   };
 
-  buildInputs = [ git python2Packages.python ];
+  buildInputs = [
+    git
+    (python2Packages.python.withPackages
+      (p: with p; [ setuptools tornado ]
+        ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))
+  ];
   nativeBuildInputs = [ pandoc perl makeWrapper ];
 
   postPatch = ''
@@ -41,11 +46,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/bup \
-      --prefix PATH : ${git}/bin \
-      --prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})")
-        (with python2Packages;
-         [ setuptools tornado ]
-         ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))}
+      --prefix PATH : ${git}/bin
   '';
 
   meta = {
diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
index 783a0796e91b88365bf1914dc0a7861ee1af020e..c079d8272b126768d46c9cadf4642b90c0236ccf 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/pkgs/tools/backup/burp/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
 , acl, librsync, ncurses, openssl, zlib, uthash }:
 
 stdenv.mkDerivation rec {
   name = "burp-${version}";
-  version = "2.0.54";
+  version = "2.1.32";
 
   src = fetchFromGitHub {
     owner = "grke";
     repo = "burp";
     rev = version;
-    sha256 = "1z1w013hqxbfjgri0fan2570qwhgwvm4k4ghajbzqg8kly4fgk5x";
+    sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ librsync ncurses openssl zlib uthash ]
     ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
 
diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix
index e1d19a48971ca3bde9ad73cf0182d6f5b4e95194..91d12a568a49d9187b702e6e4d01390297896e7e 100644
--- a/pkgs/tools/backup/chunksync/default.nix
+++ b/pkgs/tools/backup/chunksync/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "0.3";
+  version = "0.4";
   name = "chunksync-${version}";
 
   src = fetchurl {
     url = "http://chunksync.florz.de/chunksync_${version}.tar.gz";
-    sha256 = "e0c27f925c5cf811798466312a56772864b633728c433fb2fcce23c8712b52fc";
+    sha256 = "1gwqp1kjwhcmwhynilakhzpzgc0c6kk8c9vkpi30gwwrwpz3cf00";
   };
 
   buildInputs = [openssl perl];
diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..eac589813f4738fc8b458649bcde2fe132b8b83e
--- /dev/null
+++ b/pkgs/tools/backup/ddar/default.nix
@@ -0,0 +1,39 @@
+{ lib, buildPythonApplication, fetchFromGitHub, python, protobuf, roundup }:
+
+buildPythonApplication rec {
+  pname = "ddar";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "basak";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "158jdy5261k9yw540g48hddy5zyqrr81ir9fjlcy4jnrwfkg7ynm";
+  };
+
+  prePatch = ''
+    substituteInPlace t/local-functions \
+      --replace 'PATH="$ddar_src:$PATH"' 'PATH="$out/bin:$PATH"'
+    # Test requires additional software and compilation of some C programs
+    substituteInPlace t/basic-test.sh \
+      --replace it_stores_and_extracts_corpus0 dont_test
+  '';
+
+  preBuild = ''
+    make -f Makefile.prep synctus/ddar_pb2.py
+  '';
+
+  propagatedBuildInputs = [ protobuf ];
+
+  checkInputs = [ roundup ];
+
+  checkPhase = ''
+    roundup t/basic-test.sh
+  '';
+
+  meta = with lib; {
+    description = "Unix de-duplicating archiver";
+    license = licenses.gpl3;
+    homepage = src.meta.homepage;
+  };
+}
diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2e86ad0deda8757e5745cf98bc493a83a08221a3
--- /dev/null
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -0,0 +1,33 @@
+{ buildGoPackage, fetchFromGitHub, stdenv, openssh, makeWrapper }:
+
+buildGoPackage rec {
+
+  name = "${pname}-${version}";
+  pname = "diskrsync";
+  version = "unstable-2018-02-03";
+
+  src = fetchFromGitHub {
+    owner = "dop251";
+    repo = pname;
+    rev = "2f36bd6e5084ce16c12a2ee216ebb2939a7d5730";
+    sha256 = "1rpfk7ds4lpff30aq4d8rw7g9j4bl2hd1bvcwd1pfxalp222zkxn";
+  };
+
+  goPackagePath = "github.com/dop251/diskrsync";
+  goDeps = ./deps.nix;
+
+  buildInputs = [ makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$bin/bin/diskrsync" --prefix PATH : ${openssh}/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Rsync for block devices and disk images";
+    homepage = https://github.com/dop251/diskrsync;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
+  };
+
+}
diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix
new file mode 100644
index 0000000000000000000000000000000000000000..684100968e88f317aff097d2eec6ed5774465ef3
--- /dev/null
+++ b/pkgs/tools/backup/diskrsync/deps.nix
@@ -0,0 +1,21 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/dop251/spgz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dop251/spgz";
+      rev = "d50e5e978e08044da0cf9babc6b42b55ec8fe0d5";
+      sha256 = "11h8z6cwxw272rn5zc4y3w9d6py113iaimy681v6xxv26d30m8bx";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "1875d0a70c90e57f11972aefd42276df65e895b9";
+      sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q";
+    };
+  }
+]
diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d36ef7ea64fb02be89403a920d9a03c98f93e631
--- /dev/null
+++ b/pkgs/tools/backup/duplicati/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchzip, mono, sqlite, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "duplicati-${version}";
+  version = "2.0.3.3";
+  channel = "beta";
+  build_date = "2018-04-02";
+
+  src = fetchzip {
+    url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip";
+    sha256 = "0hwdpsgrvm3gq648mg9g0z0rk49g71dd8r5i1a8w83pwdqv0hn9c";
+    stripRoot = false;
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/${name}}
+    cp -r * $out/share/${name}
+    makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \
+      --add-flags "$out/share/${name}/Duplicati.CommandLine.exe" \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
+          sqlite ]}
+    makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \
+      --add-flags "$out/share/${name}/Duplicati.Server.exe" \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
+          sqlite ]}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers";
+    homepage = https://www.duplicati.com/;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ nyanloutre ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/backup/lvmsync/Gemfile b/pkgs/tools/backup/lvmsync/Gemfile
new file mode 100644
index 0000000000000000000000000000000000000000..a87462e2b8a232a6e87146c2174c51202b156cf6
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org/'
+gem 'lvmsync'
diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/pkgs/tools/backup/lvmsync/Gemfile.lock
new file mode 100644
index 0000000000000000000000000000000000000000..1fe903f15088b8aa48b2c3bd3b0c6540154b32f3
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/Gemfile.lock
@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    git-version-bump (0.15.1)
+    lvmsync (3.3.2)
+      git-version-bump (~> 0.10)
+      treetop
+    polyglot (0.3.5)
+    treetop (1.6.9)
+      polyglot (~> 0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  lvmsync
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..dc589316a5853a7c246525f8089f3da926c2fba9
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, bundlerEnv, ruby, makeWrapper }:
+
+let
+
+  pname = "lvmsync";
+  version = (import ./gemset.nix)."${pname}".version;
+
+in stdenv.mkDerivation rec {
+
+  name = "${pname}-${version}";
+
+  env = bundlerEnv {
+    name = "${pname}-${version}-gems";
+    ruby = ruby;
+    gemfile  = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset   = ./gemset.nix;
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = ["installPhase"];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/lvmsync $out/bin/lvmsync
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Optimised synchronisation of LVM snapshots over a network";
+    homepage = http://theshed.hezmatt.org/lvmsync/;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
+  };
+
+}
diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/pkgs/tools/backup/lvmsync/gemset.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7f80e928660b73cdd504b92cda915bffee73313b
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/gemset.nix
@@ -0,0 +1,36 @@
+{
+  git-version-bump = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xcj20gmbpqn2gcpid4pxpnimfdg2ip9jnl1572naz0magcrwl2s";
+      type = "gem";
+    };
+    version = "0.15.1";
+  };
+  lvmsync = {
+    dependencies = ["git-version-bump" "treetop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02mdrvfibvab4p4yrdzxvndhy8drss3ri7izybcwgpbyc7isk8mv";
+      type = "gem";
+    };
+    version = "3.3.2";
+  };
+  polyglot = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  treetop = {
+    dependencies = ["polyglot"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd";
+      type = "gem";
+    };
+    version = "1.6.9";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix
index bc1f584f1c0250ddc6d34b35a08de113ef1d0f02..46f213a6ef4c6dc05037c757a37fe7a1863d531d 100644
--- a/pkgs/tools/backup/mtx/default.nix
+++ b/pkgs/tools/backup/mtx/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = https://sourceforge.net/projects/mtx/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.redvers ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..da8805bc226e7d0dd973842ec2a5246af6f0786e
--- /dev/null
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, glib, zlib, pcre, mysql, libressl }:
+
+stdenv.mkDerivation rec {
+  version = "0.9.3";
+  name = "mydumper-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "maxbube";
+    repo   = "mydumper";
+    rev    = "v${version}";
+    sha256 = "139v6707sxyslg7n1fii8b1ybdq50hbqhc8zf6p1cr3h2hhl6ns9";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ glib zlib pcre mysql.connector-c libressl ];
+
+  meta = with stdenv.lib; {
+    description = ''High-perfomance MySQL backup tool'';
+    homepage = https://github.com/maxbube/mydumper;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ izorkin ];
+  };
+}
diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index d95716864c8857bc2feb6512a6dfd07c7afa12ce..279652b0cd0b47b39163afaaa6b8a2861bec0480 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://ori.scs.stanford.edu/;
     license = licenses.mit;
     platforms = platforms.unix;
+    broken = true; # 2018-04-11
   };
 }
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix
index 681999e35d0770723ea8a269305b15b230907f9a..758146fcc00ba107d1a4d07647c777e98c2e1b24 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/pkgs/tools/backup/partclone/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook
-, pkgconfig, libuuid, e2fsprogs
+, pkgconfig, libuuid, e2fsprogs, nilfs-utils, ntfs3g
 }:
 
 stdenv.mkDerivation rec {
@@ -15,10 +15,23 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
-    e2fsprogs libuuid stdenv.cc.libc
+    e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g 
     (stdenv.lib.getOutput "static" stdenv.cc.libc)
   ];
 
+  configureFlags = [
+    "--enable-xfs"
+    "--enable-extfs"
+    "--enable-hfsp"
+    "--enable-fat"
+    "--enable-exfat"
+    "--enable-ntfs"
+    "--enable-btrfs"
+    "--enable-minix"
+    "--enable-f2fs"
+    "--enable-nilfs2"
+  ];
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6899ba88a22cadd1496cdabd51cbeecd6bf37c99
--- /dev/null
+++ b/pkgs/tools/backup/percona-xtrabackup/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, boost, bison, curl, ncurses, openssl, readline, xxd
+, libaio, libev, libgcrypt, libgpgerror, libtool, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "percona-xtrabackup-${version}";
+  version = "2.4.9";
+
+  src = fetchFromGitHub {
+    owner = "percona";
+    repo = "percona-xtrabackup";
+    rev = name;
+    sha256 = "11w87wj2jasrnygzjg3b59q9x0m6lhyg1wzdvclmgbmqsk9bvqv4";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    boost bison curl ncurses openssl readline xxd
+    libaio libev libgcrypt libgpgerror libtool zlib
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_CONFIG=xtrabackup_release"
+    "-DINSTALL_MYSQLTESTDIR=OFF"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+    "-DWITH_SSL=system"
+    "-DWITH_ZLIB=system"
+    "-DWITH_MECAB=system"
+    "-DWITH_EXTRA_CHARSETS=all"
+    "-DWITH_INNODB_MEMCACHED=1"
+    "-DWITH_MAN_PAGES=OFF"
+    "-DWITH_HTML_DOCS=OFF"
+    "-DWITH_LATEX_DOCS=OFF"
+    "-DWITH_PDF_DOCS=OFF"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Non-blocking backup tool for MySQL";
+    homepage = http://www.percona.com/software/percona-xtrabackup;
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ izorkin ];
+  };
+}
diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2da943540192ea0a74ec05e8c2bfd9c7a9e4c0f5
--- /dev/null
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, libsodium, lzma }:
+
+rustPlatform.buildRustPackage rec {
+  name = "rdedup-${version}";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "dpc";
+    repo = "rdedup";
+    rev = "v${version}";
+    sha256 = "14r6x1wi5mwadarm0vp6qnr5mykv4g0kxz9msq76fhwghwb9k1d9";
+  };
+
+  buildInputs = [ pkgconfig libsodium lzma ];
+
+  cargoSha256 = "0wyswc4b4hkiw20gz0w94vv1qgcb2zq0cdaj9zxvyr5l0abxip9w";
+
+  meta = with stdenv.lib; {
+    description = "Data deduplication with compression and public key encryption";
+    homepage = https://github.com/dpc/rdedup;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ dywedir ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index bc5755628d2801e39177a2eed57f7cf11b9b0078..158d7f1d2cf141774db57c1bcc32b501c12efe82 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "restic-${version}";
-  version = "0.7.1";
+  version = "0.8.3";
 
   goPackagePath = "github.com/restic/restic";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    sha256 = "07614wp0b6kjl8lq3qir271g0s2h8wvpdh43wsz1k6bip60nmqbf";
+    sha256 = "0vbwbxly3p1wj25ai1xak1bmhibh2ilxl55gsbnaaq7pcznc3ad9";
   };
 
   buildPhase = ''
@@ -19,12 +19,20 @@ buildGoPackage rec {
   '';
 
   installPhase = ''
-    mkdir -p $bin/bin/
+    mkdir -p \
+      $bin/bin \
+      $bin/etc/bash_completion.d \
+      $bin/share/zsh/vendor-completions \
+      $bin/share/man/man1
     cp restic $bin/bin/
+    $bin/bin/restic generate \
+      --bash-completion $bin/etc/bash_completion.d/restic.sh \
+      --zsh-completion $bin/share/zsh/vendor-completions/restic.sh \
+      --man $bin/share/man/man1
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://restic.github.io;
+    homepage = https://restic.net;
     description = "A backup program that is fast, efficient and secure";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd2;
diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d9f889897aa2403d49cf5b9acce8cb5011cec6eb
--- /dev/null
+++ b/pkgs/tools/backup/restic/rest-server.nix
@@ -0,0 +1,32 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "restic-rest-server-${version}";
+  version = "0.9.7";
+
+  goPackagePath = "github.com/restic/rest-server";
+
+  src = fetchFromGitHub {
+    owner = "restic";
+    repo = "rest-server";
+    rev = "v${version}";
+    sha256 = "1g47ly1pxwn0znbj3v5j6kqhn66d4wf0d5gjqzig75pzknapv8qj";
+  };
+
+  buildPhase = ''
+    cd go/src/${goPackagePath}
+    go run build.go
+  '';
+
+  installPhase = ''
+    install -Dt $bin/bin rest-server
+  '';
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "A high performance HTTP server that implements restic's REST backend API";
+    platforms = platforms.unix;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..96bbea4791e8f967a13bb63318e2f34f3c8bc120
--- /dev/null
+++ b/pkgs/tools/backup/rsbep/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, coreutils, gnused, gawk, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "rsbep-${version}";
+  version = "0.1.0";
+
+  src = fetchurl {
+    url = "https://www.thanassis.space/rsbep-0.1.0-ttsiodras.tar.bz2";
+    sha256 = "1zji34kc9srxp0h1s1m7k60mvgsir1wrx1n3wc990jszfplr32zc";
+  };
+
+  postFixup = ''
+    cd $out/bin
+
+    # Move internal tool 'rsbep_chopper' to libexec
+    libexecDir=$out/libexec/rsbep
+    mkdir -p $libexecDir
+    mv rsbep_chopper $libexecDir
+
+    # Fix store dependencies in scripts
+    path="export PATH=$out/bin:$libexecDir:${lib.makeBinPath [ coreutils gnused gawk ]}"
+    sed -i "2i$path" freeze.sh
+    sed -i "2i$path" melt.sh
+
+    substituteInPlace freeze.sh --replace /bin/ls ls
+
+    # Remove unneded binary
+    rm poorZFS.py
+  '';
+
+  meta = with lib; {
+    description = "Create resilient backups with Reed-Solomon error correction and byte-spreading";
+    homepage = https://www.thanassis.space/rsbep.html;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.earvstedt ];
+  };
+}
diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
index 66480a2f13a99e4db39c5f34aadb2cc029097ec5..1bd8ebfd44b6d543396d0afeebc47989ce5933fe 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -3,11 +3,11 @@
 python3Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "s3ql";
-  version = "2.21";
+  version = "2.26";
 
   src = fetchurl {
     url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2";
-    sha256 = "1mifmxbsxc2rcrydk2vs5cjfd5r0510q5y7rmavlzi8grpcqdf3d";
+    sha256 = "0xs1jbak51zwjrd6jmd96xl3a3jpw0p1s05f7sw5wipvvg0xnmfn";
   };
 
   buildInputs = [ which ]; # tests will fail without which
diff --git a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
index 182af5328eebd6df94cddd2e57b123a0f77c8d86..0af5dd5bfff193154a85dc68c95ff0cec1bd6dd0 100644
--- a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
+++ b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
@@ -294,12 +294,12 @@ rec {
   };
 
   ssql = eggDerivation {
-    name = "ssql-0.2.2";
+    name = "ssql-0.2.4";
 
     src = fetchegg {
       name = "ssql";
-      version = "0.2.2";
-      sha256 = "10557ymy0fgvqqazsg2jsbqvng0b91jqcjfgsxkrq8xs3klyd5mf";
+      version = "0.2.4";
+      sha256 = "0qhnghhx1wrvav4s7l780mspwlh8s6kzq4bl0cslwp1km90fx9bk";
     };
 
     buildInputs = [
diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/pkgs/tools/backup/ugarit/eggs.nix
index cd7cde778fa2d7d0a861321c649c94158912264c..9329618887fbb1d439c3741caadbe2d303b1465c 100644
--- a/pkgs/tools/backup/ugarit/eggs.nix
+++ b/pkgs/tools/backup/ugarit/eggs.nix
@@ -294,12 +294,12 @@ rec {
   };
 
   ssql = eggDerivation {
-    name = "ssql-0.2.2";
+    name = "ssql-0.2.4";
 
     src = fetchegg {
       name = "ssql";
-      version = "0.2.2";
-      sha256 = "10557ymy0fgvqqazsg2jsbqvng0b91jqcjfgsxkrq8xs3klyd5mf";
+      version = "0.2.4";
+      sha256 = "0qhnghhx1wrvav4s7l780mspwlh8s6kzq4bl0cslwp1km90fx9bk";
     };
 
     buildInputs = [
diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index da39b2360bd62495f0b61b2e92ed989b5b0c9d8e..3210e777889e88f93851b2617070ff9c9bae4fd6 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -1,11 +1,20 @@
-{ stdenv, buildGoPackage, fetchurl }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+let
+  rev      = "966f3c5f45ba18b2225c5b06918e41f56e223e73";
+  revCount = "240";
+  sha256   = "1m70a5rpycrfwrrc83745mamgpg54pc0n75qpzr9jbvicbp8g66p";
+in
 buildGoPackage rec {
   name = "wal-g-${version}";
-  version = "0.1.2";
-  src = fetchurl {
-    url = https://github.com/wal-g/wal-g/archive/v0.1.2.tar.gz;
-    sha256 = "0zkjs72gq7sc9cqqzxr6ms1ibk8466zpwmrziq9p4jv9r4iq3bfb";
+  version = "0.1.8pre${revCount}_${builtins.substring 0 9 rev}";
+
+  src = fetchFromGitHub {
+    owner = "wal-g";
+    repo  = "wal-g";
+    inherit rev sha256;
   };
+
   goPackagePath = "github.com/wal-g/wal-g";
   meta = {
     homepage = https://github.com/wal-g/wal-g;
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index cacfb8287a33e819c8e57ebb2f723a514e308308..796a34c253a90b6335ad50267ec712d313941b90 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.17.0";
-  checksum = "0cncwkiw0w2am7gwi01p6ln87zgg1x6blfyxx7n7x8m1mv6704hl";
+  version = "0.18.0";
+  checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd";
 in
 stdenv.mkDerivation rec {
   name = "znapzend-${version}";
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 9027bdf9c5fcd655ee6c08207fa4361929aa332d..394f3fe5b9808d3089a2515e770d19c5aa51e28f 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, dnsmasq, dhcp
-, hicolor_icon_theme, librsvg, wrapGAppsHook
+, hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection
 , withPulseAudio ? true, libpulseaudio }:
 
 let
@@ -8,16 +8,19 @@ let
 
 in stdenv.mkDerivation rec {
   name = "blueman-${version}";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz";
-    sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9";
+    sha256 = "1jl83z56c01ypvv98mxn74kpbv58yrccggp1rbmnw1dnvjxvjbic";
   };
 
-  nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython wrapGAppsHook ];
+  nativeBuildInputs = [
+    gobjectIntrospection intltool pkgconfig pythonPackages.cython
+    pythonPackages.wrapPython wrapGAppsHook
+  ];
 
-  buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ]
+  buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor-icon-theme ]
                 ++ pythonPath
                 ++ lib.optional withPulseAudio libpulseaudio;
 
diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix
index 53a193749d3c1cd65649d32d895963e7458d909d..ffc7ee192c9031192c85f42c1c90755833f577b7 100644
--- a/pkgs/tools/bluetooth/obex-data-server/default.nix
+++ b/pkgs/tools/bluetooth/obex-data-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex, dbus_libs }:
+{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus_libs }:
    
 stdenv.mkDerivation rec {
   name = "obex-data-server-0.4.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb glib dbus_glib bluez openobex dbus_libs ];
+  buildInputs = [ libusb glib dbus-glib bluez openobex dbus_libs ];
 
   patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ];
 
diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix
index ec5ca0706f49dbb635ca577a3107f1a6d1c97851..e3a360818e636c9761781a5063c0c75bc20eed5d 100644
--- a/pkgs/tools/bluetooth/openobex/default.nix
+++ b/pkgs/tools/bluetooth/openobex/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }:
    
 stdenv.mkDerivation rec {
-  name = "openobex-1.7.1";
+  name = "openobex-1.7.2";
    
   src = fetchurl {
     url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
-    sha256 = "0mza0mrdrbcw4yix6qvl31kqy7bdkgxjycr0yx7yl089v5jlc9iv";
+    sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m";
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 74ea097d2f30f7603fc2222383b64946d86c0fd3..f305cff0ea251fa44860c3ee05cf235197faa742 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -13,32 +13,18 @@ in
 
 stdenv.mkDerivation rec {
   name = "refind-${version}";
-  version = "0.10.3";
+  version = "0.11.2";
   srcName = "refind-src-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz";
-    sha256 = "1r2qp29mz08lx36i7x52i2598773bxvfhwryd954ssq2baifjav5";
+    sha256 = "1k0xpm4y0gk1rxqdyprqyqpg5j16xw3l2gm3d9zpi5n9id43jkzn";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=831258;filename=002-efiprot.patch;msg=10";
-      sha256 = "17h03h5mgkpamcj9jcq8h6x2admpknysrbdwccg7yxirlc52fc2s";
-      name = "002-efiprot.patch";
-    })
-  ];
-
   buildInputs = [ gnu-efi ];
 
   hardeningDisable = [ "stackprotector" ];
 
-  postPatch = ''
-    sed -e 's|-DEFI_FUNCTION_WRAPPER|-DEFI_FUNCTION_WRAPPER -maccumulate-outgoing-args|g' -i Make.common
-    sed -e 's|-DEFIX64|-DEFIX64 -maccumulate-outgoing-args|g' -i Make.common
-    sed -e 's|-m64|-maccumulate-outgoing-args -m64|g' -i filesystems/Make.gnuefi
-  '';
-
   makeFlags =
     [ "prefix="
       "EFIINC=${gnu-efi}/include/efi"
@@ -139,7 +125,6 @@ EOF
     homepage = http://refind.sourceforge.net/;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = [ "i686-linux" "x86_64-linux" ];
-    broken = true;
   };
 
 }
diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix
index ada58e87fd0a063248fecb265412d125ebbb5ba1..63a429e50de81c60453b3608214ca3dea211ee43 100644
--- a/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -59,6 +59,5 @@ stdenv.mkDerivation rec {
     homepage = http://bashburn.dose.se/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix
index a4298bf2920f2f66e0d764c696b8d54ea4daab5c..6828ef7d61d34aaf1c4aa0c944f816f86c605867 100644
--- a/pkgs/tools/cd-dvd/bchunk/default.nix
+++ b/pkgs/tools/cd-dvd/bchunk/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
   };
 
+  makeFlags = stdenv.lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ];
+
   installPhase = ''
     install -Dt $out/bin bchunk
-    install -Dt $out/share/man/man1 bchunk.1    
+    install -Dt $out/share/man/man1 bchunk.1
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index d62f2c25623feb01f7c650c948be7161a81f7171..8223ba2be4bb0fea45f02cb8053250129d476904 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify
-, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs
-, vcdimager, wrapGAppsHook, hicolor_icon_theme }:
+, libcanberra-gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs
+, vcdimager, wrapGAppsHook, hicolor-icon-theme }:
 
 # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590
 
@@ -20,8 +20,8 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
 
-  buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs
-                  hicolor_icon_theme
+  buildInputs = [ gtk3 libxml2 libnotify libcanberra-gtk3 libburn libisofs
+                  hicolor-icon-theme
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
                   gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ];
diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c7aab91adbeb2c340bba004f4295f0581517891d
--- /dev/null
+++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "ccd2iso-0.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ccd2iso/${name}.tar.gz";
+    sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q";
+  };
+
+  meta = with stdenv.lib; {
+    description = "CloneCD to ISO converter";
+    homepage = https://sourceforge.net/projects/ccd2iso/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ yegortimoshenko ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6523c8a0cf3f9621738d2e8e8c740e71f2c11ff6
--- /dev/null
+++ b/pkgs/tools/cd-dvd/cue2pops/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "cue2pops-${version}";
+  version = "git-2018-01-04";
+
+  src = fetchFromGitHub {
+    owner = "makefu";
+    repo = "cue2pops-linux";
+    rev = "541863adf23fdecde92eba5899f8d58586ca4551";
+    sha256 = "05w84726g3k33rz0wwb9v77g7xh4cnhy9sxlpilf775nli9bynrk";
+  };
+
+  dontConfigure = true;
+
+  makeFlags = ["CC=cc"];
+
+  installPhase = ''
+    install --directory --mode=755 $out/bin
+    install --mode=755 cue2pops $out/bin
+  '';
+
+  meta = {
+    description = "Convert CUE to ISO suitable to POPStarter";
+    homepage = https://github.com/makefu/cue2pops-linux;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 7e3c2cda48b8650ddb61c5da72dbb10f76ef3fa2..590c32188141eb90e60b7e13b7c084827fb2f4e3 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
     "--docdir=share/doc"
     "--with-nls=yes"
     "--with-embedded-src-path=no"
-  ] ++ stdenv.lib.optional (builtins.elem stdenv.system
-      stdenv.lib.platforms.x86_64) "--with-sse2=yes";
+  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes";
 
   # fatal error: inlined-icons.h: No such file or directory
   enableParallelBuilding = false;
@@ -84,6 +83,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ jgeerds nckx ];
+    maintainers = with maintainers; [ jgeerds ];
   };
 }
diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/pkgs/tools/cd-dvd/ecm-tools/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ec814d97bde04015bac0ccfd37f3feb31237a3dc
--- /dev/null
+++ b/pkgs/tools/cd-dvd/ecm-tools/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "ecm-tools-${version}";
+  version = "1.0.3";
+
+  src = fetchFromGitHub {
+    owner = "alucryd";
+    repo = "ecm-tools";
+    rev = "v${version}";
+    sha256 = "1rvyx5gcy8lfklgj80szlz3312x45wzx0d9jsgwyvy8f6m4nnb0c";
+  };
+
+  dontConfigure = true;
+
+  installPhase = ''
+    install --directory --mode=755 $out/bin
+    install --mode=755 bin2ecm $out/bin
+    (cd $out/bin; ln -s bin2ecm ecm2bin)
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A utility to uncompress ECM files to BIN CD format";
+    homepage = https://github.com/alucryd/ecm-tools;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix
index 7d0fc5969bf231f5642fa2f7ee46f8c04ab645e8..6a3f92a57c2d45d48930f313bdd2d45e24aff0f2 100644
--- a/pkgs/tools/cd-dvd/lsdvd/default.nix
+++ b/pkgs/tools/cd-dvd/lsdvd/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = https://sourceforge.net/projects/lsdvd/;
-    shortDescription = "Display information about audio, video, and subtitle tracks on a DVD";
+    description = "Display information about audio, video, and subtitle tracks on a DVD";
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
index 31ce1a986fb0e2f3161dc8103bc97bf7ac7ae187..db1e1dbfd857a5bd73b94b85f4cc511f84bcc952 100644
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "advancecomp-${version}";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "amadvance";
     repo = "advancecomp";
     rev = "v${version}";
-    sha256 = "1lvrcxcxbxac47j0ml11nikx38zan7bbr3dfjssm52r5v4cmh8j9";
+    sha256 = "1pd6czamamrd0ppk5a3a65hcgdlqwja98aandhqiajhnibwldv8x";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index c900cfa79f78a56426fa6b0b15ea6bfa292c3daf..707b8f0d799fb4479328757428e77f0181587f62 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -4,21 +4,35 @@
 
 stdenv.mkDerivation rec {
   name = "brotli-${version}";
-  version = "0.6.0";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "1wapq5hzflbmrcqgz92iv79rm893bskh03kvqgnn33dzbz3slavs";
+    sha256 = "1hlkqgkm2gv6q83dswg6b19hpw8j33y6iw924j8r647pd4qg1xs7";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
+
+  outputs = [ "out" "dev" "lib" ];
+
+  doCheck = true;
+
+  checkTarget = "test";
 
   # 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?)
+  # and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
   prePatch = "rm BUILD";
 
+  # Don't bother with "man" output for now,
+  # it currently only makes the manpages hard to use.
+  postInstall = ''
+    mkdir -p $out/share/man/man{1,3}
+    cp ../docs/*.1 $out/share/man/man1/
+    cp ../docs/*.3 $out/share/man/man3/
+  '';
+
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
 
diff --git a/pkgs/tools/compression/brotli/unstable.nix b/pkgs/tools/compression/brotli/unstable.nix
deleted file mode 100644
index 59eb1e1d469a3e6af23f613b07fdd946ab1a8c0a..0000000000000000000000000000000000000000
--- a/pkgs/tools/compression/brotli/unstable.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-# ?TODO: there's also python lib in there
-
-stdenv.mkDerivation rec {
-  name = "brotli-20160112";
-  version = "bed93862";
-
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "brotli";
-    rev = "bed93862608d4d232ebe6d229f04e48399775e8b";
-    sha256 = "0g94kqh984qkbqbj4fpkkyji9wnbrb9cs32r9d6niw1sqfnfkd6f";
-  };
-
-  preConfigure = "cd tools";
-
-  # Debian installs "brotli" instead of "bro" but let's keep upstream choice for now.
-  installPhase = ''
-    mkdir -p "$out/bin"
-    mv ./bro "$out/bin/"
-  '';
-
-  meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
-
-    description = "A generic-purpose lossless compression algorithm and tool";
-
-    longDescription =
-      ''  Brotli is a generic-purpose lossless compression algorithm that
-          compresses data using a combination of a modern variant of the LZ77
-          algorithm, Huffman coding and 2nd order context modeling, with a
-          compression ratio comparable to the best currently available
-          general-purpose compression methods. It is similar in speed with
-          deflate but offers more dense compression.
-
-          The specification of the Brotli Compressed Data Format is defined
-          in the following internet draft:
-          http://www.ietf.org/id/draft-alakuijala-brotli
-      '';
-
-    license = licenses.mit;
-    maintainers = [];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix
index 1d693f781e6c19e815f9a60d5cf60e7cf2b8ce23..095bd5f7d9a578759e5b24ec9409f32361da57d0 100644
--- a/pkgs/tools/compression/bsdiff/default.nix
+++ b/pkgs/tools/compression/bsdiff/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   patches = [ ./include-systypes.patch ];
 
   buildPhase = ''
-    cc -O3 -lbz2 bspatch.c -o bspatch
-    cc -O3 -lbz2 bsdiff.c  -o bsdiff
+    $CC -O3 -lbz2 bspatch.c -o bspatch
+    $CC -O3 -lbz2 bsdiff.c  -o bsdiff
   '';
 
   installPhase = ''
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index bb9555fa600c6ec2809e87c30d1f4775f81be74f..cfe41d3dfe7ac2c56ee487b8a9b86d327e38aab1 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gzip-${version}";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchurl {
     url = "mirror://gnu/gzip/${name}.tar.xz";
-    sha256 = "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz";
+    sha256 = "16h8g4acy7fgfxcjacr3wijjsnixwsfd2jhz3zwdi2qrzi262l5f";
   };
 
-  patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch;
-
   outputs = [ "out" "man" "info" ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index bc8666a2690768f5d383cb64e0b4bd2c76538373..04c83fa03fcf9a3ab9d7260e0f1719ca4a9a283c 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -38,6 +38,5 @@ stdenv.mkDerivation rec {
     homepage = https://lz4.github.io/lz4/;
     license = with licenses; [ bsd2 gpl2Plus ];
     platforms = platforms.unix;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index cee23934d0ce2ae2d26bc5f7a85f8e7718618554..25d09e6e947b7b96fa77df6632ed35bc2f6e1777 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -2,18 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "lzip-${version}";
-  version = "1.19";
+  version = "1.20";
 
   buildInputs = [ texinfo ];
 
   src = fetchurl {
     url = "mirror://savannah/lzip/${name}.tar.gz";
-    sha256 = "1abbch762gv8rjr579q3qyyk6c80plklbv2mw4x0vg71dgsw9bgz";
+    sha256 = "0319q59kb8g324wnj7xzbr7vvlx5bcs13lr34j0zb3kqlyjq2fy9";
   };
 
-  configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
+  configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3" + stdenv.lib.optionalString stdenv.isCross " CXX=${stdenv.cc.targetPrefix}c++";
+
+  setupHook = ./lzip-setup-hook.sh;
 
   doCheck = true;
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://www.nongnu.org/lzip/lzip.html;
diff --git a/pkgs/tools/compression/lzip/lzip-setup-hook.sh b/pkgs/tools/compression/lzip/lzip-setup-hook.sh
new file mode 100644
index 0000000000000000000000000000000000000000..092ad7737dd1dff361ba0500800524859a98af92
--- /dev/null
+++ b/pkgs/tools/compression/lzip/lzip-setup-hook.sh
@@ -0,0 +1,5 @@
+lzipUnpackCmdHook() {
+    [[ "$1" = *.tar.lz ]] && tar --lzip -xf "$1"
+}
+
+unpackCmdHooks+=(lzipUnpackCmdHook)
diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bbba21f2b34d836cf68881d87323d618416b2f6a
--- /dev/null
+++ b/pkgs/tools/compression/pbzx/default.nix
@@ -0,0 +1,27 @@
+{stdenv, lib, fetchFromGitHub, lzma, xar}:
+
+stdenv.mkDerivation rec {
+  pname = "pbzx";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+  src = fetchFromGitHub {
+    owner = "NiklasRosenstein";
+    repo = "pbzx";
+    rev = "v${version}";
+    sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90";
+  };
+  buildInputs = [ lzma xar ];
+  buildPhase = ''
+    cc pbzx.c -llzma -lxar -o pbzx
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pbzx $out/bin
+  '';
+  meta = with lib; {
+    description = "Stream parser of Apple's pbzx compression format.";
+    platforms = platforms.unix;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.matthewbauer ];
+  };
+}
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 76704c254bdbb7daa154d26db597d017bfbf2359..732aa691d4a947fe84099397dd6be4d57c887e0c 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -1,20 +1,22 @@
 { stdenv, fetchurl, zlib, utillinux }:
 
 let name = "pigz";
-    version = "2.3.4";
+    version = "2.4";
 in
 stdenv.mkDerivation {
   name = name + "-" + version;
 
   src = fetchurl {
     url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz";
-    sha256 = "16lgbjzzfx0k4a1znsw8kq3lnkx17gw93zq2sn01sny11fj1y0vg";
+    sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54";
   };
 
   enableParallelBuilding = true;
 
   buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;
 
+  makeFlags = [ "CC=cc" ];
+
   doCheck = stdenv.isLinux;
   checkTarget = "tests";
   installPhase =
diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix
index c62eead3cb731b6b4821230ece8d53cee854f304..01d18fe6ad7d9ee10bc09890336c92827c6b58b3 100644
--- a/pkgs/tools/compression/xar/default.nix
+++ b/pkgs/tools/compression/xar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2 }:
+{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, musl-fts }:
 
 stdenv.mkDerivation rec {
   version = "1.6.1";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf";
   };
 
-  buildInputs = [ libxml2 openssl zlib bzip2 ];
+  buildInputs = [ libxml2 openssl zlib bzip2 ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl musl-fts;
 
   meta = {
     homepage    = https://mackyle.github.io/xar/;
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 8bc5e464ee746841e274fec2511197b6639828f4..32de493ec77d9c639466c92188b5d0fd825b3dcf 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -57,6 +57,5 @@ in stdenv.mkDerivation rec {
     homepage = http://xdelta.org/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix
index dd7277c4e8fb636e62577aa83c226cb72c9632f8..c870e501209bcefe2292eb9ead9e693dd3fe2dd3 100644
--- a/pkgs/tools/compression/xdelta/unstable.nix
+++ b/pkgs/tools/compression/xdelta/unstable.nix
@@ -61,6 +61,5 @@ in stdenv.mkDerivation rec {
     homepage = http://xdelta.org/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 48c58434acd86e762fbe82ed08d41b5ea67372f5..da3a537da28383050c573212a568391eae7a05e3 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "xz-5.2.3";
 
   src = fetchurl {
-    url = "http://tukaani.org/xz/${name}.tar.bz2";
+    url = "https://tukaani.org/xz/${name}.tar.bz2";
     sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x";
   };
 
@@ -12,13 +12,18 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  preCheck = ''
+    # Tests have a /bin/sh dependency...
+    patchShebangs tests
+  '';
+
   # In stdenv-linux, prevent a dependency on bootstrap-tools.
-  preConfigure = "unset CONFIG_SHELL";
+  preConfigure = "CONFIG_SHELL=/bin/sh";
 
   postInstall = "rm -rf $out/share/doc";
 
   meta = with stdenv.lib; {
-    homepage = http://tukaani.org/xz/;
+    homepage = https://tukaani.org/xz/;
     description = "XZ, general-purpose data compression software, successor of LZMA";
 
     longDescription =
diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index 07e2eb19469517eefe50ab9c5c6fd75148393d44..2697d22a0e01fb9f69db5712b57a2da3de15a8de 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
   name = "zopfli-${version}";
@@ -23,27 +23,26 @@ stdenv.mkDerivation rec {
       name = "zopfli-bug-and-typo-fixes.patch";
       url = "https://github.com/google/zopfli/commit/7190e08ecac2446c7c9157cfbdb7157b18912a92.patch";
     })
+    (fetchpatch {
+      name = "zopfli-cmake.patch";
+      url = "https://github.com/google/zopfli/commit/7554e4d34e7000b0595aa606e7d72357cf46ba86.patch";
+      sha256 = "1pvfhir2083v1l042a4dy5byqdmad7sxnd4jrprl2hzzb2avxbbn";
+    })
   ];
 
-  enableParallelBuilding = false; # problems, easily reproducible
-  buildFlags = [
-    "zopfli"
-    "libzopfli"
-    "zopflipng"
-    "libzopflipng"
-  ];
+  nativeBuildInputs = [ cmake ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    install -m755 zopfli{,png} $out/bin
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ];
 
-    mkdir -p $out/lib
-    install -m755 libzopfli{,png}.so* $out/lib
-
-    mkdir -p $out/share/doc/zopfli
-    install -m644 README* $out/share/doc/zopfli
+  installPhase = ''
+    install -D -t $out/bin zopfli*
+    install -d $out/lib
+    cp -d libzopfli* $out/lib
+    install -Dm444 -t $out/share/doc/zopfli ../README*
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Very good, but slow, deflate or zlib compression";
@@ -54,8 +53,8 @@ stdenv.mkDerivation rec {
       This library can only compress, not decompress. Existing zlib or
       deflate libraries can decompress the data.
     '';
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = licenses.asl20;
-    maintainers = with maintainers; [ bobvanderlinden nckx ];
+    maintainers = with maintainers; [ bobvanderlinden ];
   };
 }
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index aad9421305eb518a385238d96e9e8845ddba760d..8fa2d181de5ea812837e8e3eaeff4e1e43a2f961 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -1,17 +1,20 @@
 { stdenv, fetchFromGitHub, gnugrep
+, fixDarwinDylibNames
 , legacySupport ? false }:
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.3.2";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
-    sha256 = "1hwh6pw1z3y5kpwcwxrk8cwc83anigiqhy3z06ywy1jll8im57pz";
+    sha256 = "090ba7dnv5z2v4vlb8b275b0n7cqsdzjqvr3b6a0w65z13mgy2nw";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";
   };
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
   makeFlags = [
     "ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}"
   ];
@@ -40,11 +43,11 @@ stdenv.mkDerivation rec {
       speed is preserved and remain roughly the same at all settings, a
       property shared by most LZ compression algorithms, such as zlib.
     '';
-    homepage = http://www.zstd.net/;
+    homepage = https://facebook.github.io/zstd/;
     # The licence of the CLI programme is GPLv2+, that of the library BSD-2.
     license = with licenses; [ gpl2Plus bsd2 ];
 
     platforms = platforms.unix;
-    maintainers = with maintainers; [ nckx orivej ];
+    maintainers = with maintainers; [ orivej ];
   };
 }
diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix
index bfa45c9930e46e72091d62a28f7e8259cbec86f9..74ba47ceee1a74e875b1c67425a84b8f8adeef18 100644
--- a/pkgs/tools/filesystems/afpfs-ng/default.nix
+++ b/pkgs/tools/filesystems/afpfs-ng/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "A client implementation of the Apple Filing Protocol";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ rnhmjoj ];
-    platform    = platforms.linux;
+    platforms   = platforms.linux;
   };
 
 }
diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix
index f4133f12541f237be4b2fbd0d81cb8f49e2ffa07..e720634ca44abac3c0a4e512f622010f6c98990e 100644
--- a/pkgs/tools/filesystems/archivemount/default.nix
+++ b/pkgs/tools/filesystems/archivemount/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, fuse, libarchive }:
 
 let
-  name = "archivemount-0.8.3";
+  name = "archivemount-0.8.12";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz";
-    sha256 = "1zv1fvik76kpp1q5f2dz01f4fwg1m5a8rl168px47jy9nyl9k277";
+    sha256 = "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..812f9954cf2075df5d2cb1821ab88741b8f3c395
--- /dev/null
+++ b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index af7a206..553ac70 100644
+--- a/Makefile
++++ b/Makefile
+@@ -47,7 +47,7 @@ ifeq ($(PREFIX),/usr)
+ 	INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools
+ else
+ 	ROOT_SBINDIR=$(PREFIX)/sbin
+-	INITRAMFS_DIR=/etc/initramfs-tools
++	INITRAMFS_DIR=$(PREFIX)/etc/initramfs-tools
+ endif
+ 
+ .PHONY: all
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index fc4d3f505cdc419eeb63933e95b96b62072643ca..c2e13b75daa982d0c87f6e109d3a525317a977ea 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,29 +1,27 @@
-{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils, liburcu, zlib, libaio }:
+{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
+, keyutils, liburcu, zlib, libaio, zstd }:
 
 stdenv.mkDerivation rec {
-  name = "bcachefs-tools-unstable-2017-08-28";
+  name = "bcachefs-tools-unstable-2018-04-10";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "b1814f2dd0c6b61a12a2ebb67a13d406d126b227";
-    sha256 = "05ba1h09rrqj6vjr3q37ybca3nbrmnifmffdyk83622l28fpv350";
+    rev = "c598d91dcb0c7e95abdacb2711898ae14ab52ca1";
+    sha256 = "1mglw6p1145nryn8babkg2hj778kqa0vrzjbdp9kxjlyb3fksmff";
   };
 
+  enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ];
-
-  preConfigure = ''
-    substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.lib.getDev stdenv.cc.libc}/include/dirent.h
-  '';
+  buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd ];
+  patches = [ ./Makefile.patch ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "Tool for managing bcachefs filesystems";
-    homepage = http://bcachefs.org/;
+    homepage = https://bcachefs.org/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ davidak ];
+    maintainers = with maintainers; [ davidak chiiruno];
     platforms = platforms.linux;
   };
 }
-
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index 4d7ee75c0060900fc89194b134b4a5ac79459e1d..a83ee771d699b6c859ed63d20ece57ede75b1a03 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, fuse, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "1.12.6";
+  version = "1.13.9";
   name    = "bindfs-${version}";
 
   src = fetchurl {
-    url    = "http://bindfs.org/downloads/${name}.tar.gz";
-    sha256 = "0s90n1n4rvpcg51ixr5wx8ixml1xnc7w28xlbnms34v19pzghm59";
+    url    = "https://bindfs.org/downloads/${name}.tar.gz";
+    sha256 = "1dgqjq2plpds442ygpv8czr5v199ljscp33m89y19x04ssljrymc";
   };
 
   dontStrip = true;
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix
index 99a118160b7e7bae7fdd501442d4e11454c29744..9c9dbede83f47a6d326ab8c3298e4bf1caef1a74 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/pkgs/tools/filesystems/boxfs/default.nix
@@ -56,6 +56,5 @@ in stdenv.mkDerivation rec {
     homepage = https://github.com/drotiro/boxfs2;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 4c8dc6218773d408d1d81204a67addb52d9889c5..e84260052a418b54e36d57f465867d27b94b93f1 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -1,36 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
-, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
+{ stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
+, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd
 }:
 
-let version = "4.13.3"; in
-
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
+  version = "4.15.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "10yp0b4pwrw5mcd81yn3d0d87fnqpp4si5d25dfhl6n2640dnnw0";
+    sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    attr acl zlib libuuid e2fsprogs lzo
-    asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+  patches = [
+    # Fix build with e2fsprogs 1.44.0
+    (fetchpatch {
+      url = "https://patchwork.kernel.org/patch/10281327/raw/";
+      sha256 = "016124hjms220809zjvvr7l1gq23j419d3piaijsaw8n7yd3kksf";
+    })
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
   ];
 
+  buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ];
+
   # gcc bug with -O1 on ARM with gcc 4.8
   # This should be fine on all platforms so apply universally
-  patchPhase = "sed -i s/-O1/-O2/ configure";
+  postPatch = "sed -i s/-O1/-O2/ configure";
 
   postInstall = ''
     install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs
   '';
 
+  configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace";
+
   meta = with stdenv.lib; {
     description = "Utilities for the btrfs filesystem";
     homepage = https://btrfs.wiki.kernel.org/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ nckx raskin wkennington ];
+    maintainers = with maintainers; [ raskin wkennington ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch b/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0b6f1d30a4c92c009f8c20f4571aa9e0749cbe8d
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch
@@ -0,0 +1,58 @@
+Seulement dans ceph: ceph.old
+diff -ur ceph.old/src/kv/RocksDBStore.cc ceph/src/kv/RocksDBStore.cc
+--- ceph.old/src/kv/RocksDBStore.cc	1980-01-02 00:00:00.000000000 +0100
++++ ceph/src/kv/RocksDBStore.cc	2018-01-24 14:08:35.017553372 +0100
+@@ -505,7 +505,7 @@
+   // considering performance overhead, default is disabled
+   if (g_conf->rocksdb_perf) {
+     rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
+-    rocksdb::perf_context.Reset();
++    rocksdb::get_perf_context()->Reset();
+   }
+ 
+   RocksDBTransactionImpl * _t =
+@@ -532,13 +532,13 @@
+     utime_t write_wal_time;
+     utime_t write_pre_and_post_process_time;
+     write_wal_time.set_from_double(
+-	static_cast(rocksdb::perf_context.write_wal_time)/1000000000);
++	static_cast(rocksdb::get_perf_context()->write_wal_time)/1000000000);
+     write_memtable_time.set_from_double(
+-	static_cast(rocksdb::perf_context.write_memtable_time)/1000000000);
++	static_cast(rocksdb::get_perf_context()->write_memtable_time)/1000000000);
+     write_delay_time.set_from_double(
+-	static_cast(rocksdb::perf_context.write_delay_time)/1000000000);
++	static_cast(rocksdb::get_perf_context()->write_delay_time)/1000000000);
+     write_pre_and_post_process_time.set_from_double(
+-	static_cast(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000);
++	static_cast(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000);
+     logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time);
+     logger->tinc(l_rocksdb_write_delay_time, write_delay_time);
+     logger->tinc(l_rocksdb_write_wal_time, write_wal_time);
+@@ -558,7 +558,7 @@
+   // considering performance overhead, default is disabled
+   if (g_conf->rocksdb_perf) {
+     rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
+-    rocksdb::perf_context.Reset();
++    rocksdb::get_perf_context()->Reset();
+   }
+ 
+   RocksDBTransactionImpl * _t =
+@@ -586,13 +586,13 @@
+     utime_t write_wal_time;
+     utime_t write_pre_and_post_process_time;
+     write_wal_time.set_from_double(
+-	static_cast(rocksdb::perf_context.write_wal_time)/1000000000);
++	static_cast(rocksdb::get_perf_context()->write_wal_time)/1000000000);
+     write_memtable_time.set_from_double(
+-	static_cast(rocksdb::perf_context.write_memtable_time)/1000000000);
++	static_cast(rocksdb::get_perf_context()->write_memtable_time)/1000000000);
+     write_delay_time.set_from_double(
+-	static_cast(rocksdb::perf_context.write_delay_time)/1000000000);
++	static_cast(rocksdb::get_perf_context()->write_delay_time)/1000000000);
+     write_pre_and_post_process_time.set_from_double(
+-	static_cast(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000);
++	static_cast(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000);
+     logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time);
+     logger->tinc(l_rocksdb_write_delay_time, write_delay_time);
+     logger->tinc(l_rocksdb_write_wal_time, write_wal_time);
diff --git a/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch b/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch
new file mode 100644
index 0000000000000000000000000000000000000000..01aa194dddf2b6fa09b7ad00da6a7607cac4925d
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch
@@ -0,0 +1,19 @@
+diff -ru ceph/src/key_value_store/kv_flat_btree_async.cc ceph-copy/src/key_value_store/kv_flat_btree_async.cc
+--- ceph/src/key_value_store/kv_flat_btree_async.cc	1980-01-02 00:00:00.000000000 +0100
++++ ceph-copy/src/key_value_store/kv_flat_btree_async.cc	2018-02-13 21:49:59.232860487 +0100
+@@ -15,13 +15,13 @@
+ #include "key_value_store/kv_flat_btree_async.h"
+ #include "key_value_store/kvs_arg_types.h"
+ #include "include/rados/librados.hpp"
+-#include "/usr/include/asm-generic/errno.h"
+-#include "/usr/include/asm-generic/errno-base.h"
+ #include "common/ceph_context.h"
+ #include "common/Clock.h"
+ #include "include/types.h"
+ 
+ 
++#include 
++#include 
+ #include 
+ #include 
+ #include 
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 334525e7902629843486bf26c2260b69f7013a1d..0f712853f24a195caa7466b3fff267218d02da0f 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -1,20 +1,12 @@
 { callPackage, fetchgit, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "9.2.0";
+  version = "12.2.2";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0a2v3bgkrbkzardcw7ymlhhyjlwi08qmcm7g34y2sjsxk9bd78an";
+    sha256 = "01anqxyffa8l2lzgyb0dj6fjicfjdx2cq9y1klh24x69gxwkdh00";
   };
 
-  patches = [
-    ./fix-pythonpath.patch
-    # For building with xfsprogs 4.5.0:
-    (fetchpatch {
-      url = "https://github.com/ceph/ceph/commit/602425abd5cef741fc1b5d4d1dd70c68e153fc8d.patch";
-      sha256 = "1iyf0ml2n50ki800vjich8lvzmcdviwqwkbs6cdj0vqv2nc5ii1g";
-    })
-  ];
 })
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 0af97dd3b5400c7089f13c9a3c7334f66b47af30..4325a935536670126d7ab42aef82292e422e1d63 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -1,12 +1,17 @@
-{ stdenv, ensureNewerSourcesHook, autoconf, automake, makeWrapper, pkgconfig
-, libtool, which, git
-, boost, python2Packages, libxml2, zlib
+{ stdenv, ensureNewerSourcesHook, cmake, pkgconfig
+, which, git
+, boost, python2Packages
+, libxml2, zlib
+, openldap, lttngUst
+, babeltrace, gperf
+, cunit, snappy
+, rocksdb, makeWrapper
 
 # Optional Dependencies
-, snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
+, yasm ? null, fcgi ? null, expat ? null
 , curl ? null, fuse ? null, libibverbs ? null, librdmacm ? null
 , libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null
-, rocksdb ? null, libs3 ? null
+, libs3 ? null
 
 # Mallocs
 , jemalloc ? null, gperftools ? null
@@ -30,21 +35,10 @@ assert cryptopp != null || (nss != null && nspr != null);
 with stdenv;
 with stdenv.lib;
 let
-  inherit (python2Packages) python;
-  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;
 
   shouldUsePkg = pkg_: let pkg = (builtins.tryEval pkg_).value;
-    in if lib.any (x: x == system) (pkg.meta.platforms or [])
-      then pkg else null;
+    in if pkg.meta.available or false then pkg else null;
 
-  optSnappy = shouldUsePkg snappy;
-  optLeveldb = shouldUsePkg leveldb;
   optYasm = shouldUsePkg yasm;
   optFcgi = shouldUsePkg fcgi;
   optExpat = shouldUsePkg expat;
@@ -55,7 +49,6 @@ let
   optLibedit = shouldUsePkg libedit;
   optLibatomic_ops = shouldUsePkg libatomic_ops;
   optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client;
-  optRocksdb = shouldUsePkg rocksdb;
   optLibs3 = if versionAtLeast version "10.0.0" then null else shouldUsePkg libs3;
 
   optJemalloc = shouldUsePkg jemalloc;
@@ -69,13 +62,11 @@ let
   optLibxfs = shouldUsePkg libxfs;
   optZfs = shouldUsePkg zfs;
 
-  hasServer = optSnappy != null && optLeveldb != null;
-  hasMon = hasServer;
-  hasMds = hasServer;
-  hasOsd = hasServer;
+  hasMon = true;
+  hasMds = true;
+  hasOsd = true;
   hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
-  hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;
 
   # TODO: Reenable when kinetic support is fixed
   #hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null;
@@ -93,192 +84,94 @@ let
     none = [ ];
   };
 
-  wrapArgs = "--set PYTHONPATH \"$(toPythonPath $lib)\""
-    + " --prefix PYTHONPATH : \"$(toPythonPath ${python2Packages.flask})\""
-    + " --set PATH \"$out/bin\"";
+  ceph-python-env = python2Packages.python.withPackages (ps: [ 
+    ps.sphinx
+    ps.flask
+    ps.argparse
+    ps.cython 
+    ps.setuptools
+    ps.pip
+    # Libraries needed by the python tools
+    ps.Mako
+    ps.pecan
+    ps.prettytable
+    ps.webob
+    ps.cherrypy
+	]);
+
 in
 stdenv.mkDerivation {
   name="ceph-${version}";
 
   inherit src;
 
-  patches = patches ++ [
-    ./0001-Makefile-env-Don-t-force-sbin.patch
+  patches = [ 
+ #	 ./ceph-patch-cmake-path.patch
+    ./0001-kv-RocksDBStore-API-break-additional.patch   
+  ] ++ optionals stdenv.isLinux [
+    ./0002-fix-absolute-include-path.patch
   ];
 
   nativeBuildInputs = [
-    autoconf automake makeWrapper pkgconfig libtool which git
+    cmake
+    pkgconfig which git python2Packages.wrapPython makeWrapper
     (ensureNewerSourcesHook { year = "1980"; })
-  ]
-    ++ optionals (versionAtLeast version "9.0.2") [
-      python2Packages.setuptools python2Packages.argparse
-    ];
+  ];
+  
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
-    boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc python2Packages.flask zlib
-  ] ++ optionals (versionAtLeast version "9.0.0") [
-    python2Packages.sphinx # Used for docs
+    boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 
+    malloc zlib openldap lttngUst babeltrace gperf cunit
+    snappy rocksdb
   ] ++ optionals stdenv.isLinux [
     linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
-  ] ++ optionals hasServer [
-    optSnappy optLeveldb
   ] ++ optionals hasRadosgw [
     optFcgi optExpat optCurl optFuse optLibedit
-  ] ++ optionals hasRocksdb [
-    optRocksdb
   ] ++ optionals hasKinetic [
     optKinetic-cpp-client
   ];
 
-  postPatch = ''
-    # Fix zfs pkgconfig detection
-    sed -i 's,\[zfs\],\[libzfs\],g' configure.ac
-
-    # Fix seagate kinetic linking
-    sed -i 's,libcrypto.a,-lcrypto,g' src/os/Makefile.am
-  '' + optionalString (versionAtLeast version "9.0.0") ''
-    # Fix gmock
-    patchShebangs src/gmock
-  '';
-
-  preConfigure = ''
-    # Ceph expects the arch command to be usable during configure
-    # for detecting the assembly type
-    mkdir -p mybin
-    echo "#${stdenv.shell} -e" >> mybin/arch
-    echo "uname -m" >> mybin/arch
-    chmod +x mybin/arch
-    PATH="$PATH:$(pwd)/mybin"
-
-    ./autogen.sh
-
-    # Fix the python site-packages install directory
-    sed -i "s,\(PYTHON\(\|_EXEC\)_PREFIX=\).*,\1'$lib',g" configure
-
-    # Fix the PYTHONPATH for installing ceph-detect-init to $out
-    mkdir -p "$(toPythonPath $out)"
-    export PYTHONPATH="$(toPythonPath $out):$PYTHONPATH"
+  
+  preConfigure =''
+    # rip off submodule that interfer with system libs
+	rm -rf src/boost
+	rm -rf src/rocksdb
+	
+	# require LD_LIBRARY_PATH for cython to find internal dep
+	export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH"
+	
+	# requires setuptools due to embedded in-cmake setup.py usage
+	export PYTHONPATH="${python2Packages.setuptools}/lib/python2.7/site-packages/:$PYTHONPATH"
   '';
 
-  configureFlags = [
-    (mkOther                               "exec_prefix"         "\${out}")
-    (mkOther                               "sysconfdir"          "/etc")
-    (mkOther                               "localstatedir"       "/var")
-    (mkOther                               "libdir"              "\${lib}/lib")
-    (mkOther                               "includedir"          "\${lib}/include")
-    (mkWith   true                         "rbd"                  null)
-    (mkWith   true                         "cephfs"               null)
-    (mkWith   hasRadosgw                   "radosgw"              null)
-    (mkWith   true                         "radosstriper"         null)
-    (mkWith   hasServer                    "mon"                  null)
-    (mkWith   hasServer                    "osd"                  null)
-    (mkWith   hasServer                    "mds"                  null)
-    (mkEnable true                         "client"               null)
-    (mkEnable hasServer                    "server"               null)
-    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"             null)
-    (mkWith   (cryptoStr == "nss")         "nss"                  null)
-    (mkEnable false                        "root-make-check"      null)
-    (mkWith   false                        "profiler"             null)
-    (mkWith   false                        "debug"                null)
-    (mkEnable false                        "coverage"             null)
-    (mkWith   (optFuse != null)            "fuse"                 null)
-    (mkWith   (malloc == optJemalloc)      "jemalloc"             null)
-    (mkWith   (malloc == optGperftools)    "tcmalloc"             null)
-    (mkEnable false                        "pgrefdebugging"       null)
-    (mkEnable false                        "cephfs-java"          null)
-    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"        null)
-    (mkWith   true                         "ocf"                  null)
-    (mkWith   hasKinetic                   "kinetic"              null)
-    (mkWith   hasRocksdb                   "librocksdb"           null)
-    (mkWith   false                        "librocksdb-static"    null)
-  ] ++ optional stdenv.isLinux [
-    (mkWith   (optLibaio != null)          "libaio"               null)
-    (mkWith   (optLibxfs != null)          "libxfs"               null)
-    (mkWith   (optZfs != null)             "libzfs"               null)
-  ] ++ optional (versionAtLeast version "0.94.3") [
-    (mkWith   false                        "tcmalloc-minimal"     null)
-  ] ++ optional (versionAtLeast version "9.0.1") [
-    (mkWith   false                        "valgrind"             null)
-  ] ++ optional (versionAtLeast version "9.0.2") [
-    (mkWith   true                         "man-pages"            null)
-    (mkWith   true                         "systemd-libexec-dir"  "\${out}/libexec")
-  ] ++ optional (versionOlder version "9.1.0") [
-    (mkWith   (optLibs3 != null)           "system-libs3"         null)
-    (mkWith   true                         "rest-bench"           null)
-  ] ++ optional (versionAtLeast version "9.1.0") [
-    (mkWith   true                         "rgw-user"             "rgw")
-    (mkWith   true                         "rgw-group"            "rgw")
-    (mkWith   true                         "systemd-unit-dir"     "\${out}/etc/systemd/system")
-    (mkWith   false                        "selinux"              null)  # TODO: Implement
+  cmakeFlags = [ 
+    "-DENABLE_GIT_VERSION=OFF"
+    "-DWITH_SYSTEM_BOOST=ON"
+    "-DWITH_SYSTEM_ROCKSDB=ON"
+    "-DWITH_LEVELDB=OFF"
+    
+    # enforce shared lib
+    "-DBUILD_SHARED_LIBS=ON"
+    
+    # disable cephfs, cmake build broken for now
+    "-DWITH_CEPHFS=OFF"
+    "-DWITH_LIBCEPHFS=OFF"
   ];
 
-  preBuild = optionalString (versionAtLeast version "9.0.0") ''
-    (cd src/gmock; make -j $NIX_BUILD_CORES)
-  '';
-
-  installFlags = [ "sysconfdir=\${out}/etc" ];
-
-  outputs = [ "out" "lib" ];
-
-  postInstall = ''
-    # Wrap all of the python scripts
-    wrapProgram $out/bin/ceph ${wrapArgs}
-    wrapProgram $out/bin/ceph-brag ${wrapArgs}
-    wrapProgram $out/bin/ceph-rest-api ${wrapArgs}
-    wrapProgram $out/sbin/ceph-create-keys ${wrapArgs}
-    wrapProgram $out/sbin/ceph-disk ${wrapArgs}
-
-    # Bring in lib as a native build input
-    mkdir -p $out/nix-support
-    echo "$lib" > $out/nix-support/propagated-native-build-inputs
-
-    # Fix the python library loading
-    find $lib/lib -name \*.pyc -or -name \*.pyd -exec rm {} \;
-    for PY in $(find $lib/lib -name \*.py); do
-      LIBS="$(sed -n "s/.*find_library('\([^)]*\)').*/\1/p" "$PY")"
-
-      # Delete any calls to find_library
-      sed -i '/find_library/d' "$PY"
-
-      # Fix each find_library call
-      for LIB in $LIBS; do
-        REALLIB="$lib/lib/lib$LIB.so"
-        sed -i "s,\(lib$LIB = CDLL(\).*,\1'$REALLIB'),g" "$PY"
-      done
-
-      # Reapply compilation optimizations
-      NAME=$(basename -s .py "$PY")
-      rm -f "$PY"{c,o}
-      pushd "$(dirname $PY)"
-      python -c "import $NAME"
-      python -O -c "import $NAME"
-      popd
-      test -f "$PY"c
-      test -f "$PY"o
-    done
-
-    # Fix .la file link dependencies
-    find "$lib/lib" -name \*.la | xargs sed -i \
-      -e 's,-lboost_[a-z]*,-L${boost.out}/lib \0,g' \
-  '' + optionalString (cryptoStr == "cryptopp") ''
-      -e 's,-lcryptopp,-L${optCryptopp}/lib \0,g' \
-  '' + optionalString (cryptoStr == "nss") ''
-      -e 's,-l\(plds4\|plc4\|nspr4\),-L${optNss}/lib \0,g' \
-      -e 's,-l\(ssl3\|smime3\|nss3\|nssutil3\),-L${optNspr}/lib \0,g' \
-  '' + ''
-
+  postFixup = ''
+    wrapPythonPrograms
+    wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/${python2Packages.python.sitePackages}
   '';
 
   enableParallelBuilding = true;
+  
+  outputs = [ "dev" "lib" "out" "doc" ];
 
   meta = {
-    homepage = http://ceph.com/;
+    homepage = https://ceph.com/;
     description = "Distributed storage system";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ak wkennington ];
+    maintainers = with maintainers; [ adev ak wkennington ];
     platforms = platforms.unix;
-    # Broken because of https://lwn.net/Vulnerabilities/709844/
-    # and our version is quite out of date.
-    broken = true;
   };
 
   passthru.version = version;
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix
index 0469ad54eb13beaced4d5ca75eebe5ae28de6644..dfd522f5a0943d01d8ca48d51bfc6be9fe7f387f 100644
--- a/pkgs/tools/filesystems/cryfs/default.nix
+++ b/pkgs/tools/filesystems/cryfs/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "cryfs-${version}";
-  version = "0.9.7";
+  version = "0.9.9";
 
   src = fetchFromGitHub {
     owner  = "cryfs";
     repo   = "cryfs";
     rev    = "${version}";
-    sha256 = "1wsv4cyjkyg3cyr6vipw1mj41bln2m69123l3miav8r4mvmkfq8w";
+    sha256 = "07f2k2b595m3vkwwlmlc0m7px0nwrrzrph3z6sss9354m0b0lcri";
   };
 
   prePatch = ''
diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 9e640b18a924c643cbfa2c0243cf0347b1549738..e44d0d229052cd9832a0de40dfcf042ec2b26b11 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
 
 stdenv.mkDerivation rec {
   name = "darling-dmg-${version}";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "0x285p16zfnp0p6injw1frc8krif748sfgxhdd7gb75kz0dfbkrk";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/darlinghq/darling-dmg/commit/cbb0092264b5c5cf3e92d6c2de23f02d859ebf44.patch";
+    sha256 = "05fhgn5c09f1rva6bvbq16nhlkblrhscbf69k04ajwdh7y98sw39";
+     })
+  ];
+
   buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ];
 
   meta = {
diff --git a/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch b/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch
deleted file mode 100644
index 829666bfe7a4001e4593449fb55f38c72a51fa54..0000000000000000000000000000000000000000
--- a/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 365903a..f126ade 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -149,7 +149,7 @@ if(NOT DEFINED bindir)
- endif()
- 
- string (TOLOWER "${CMAKE_SYSTEM_NAME}" SYSNAME)
--set (DIS_MAN ../man/${SYSNAME})
-+set (DIS_MAN ${PROJECT_SOURCE_DIR}/man/${SYSNAME})
- 
- # RPATH handling
- if(POLICY CMP0042)
diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix
index 57676e7a89a21c84657d42ef251b7c56515fcf8a..2e4ea88df7f49bdf9512b345ffd254c996bc4ce4 100644
--- a/pkgs/tools/filesystems/dislocker/default.nix
+++ b/pkgs/tools/filesystems/dislocker/default.nix
@@ -4,7 +4,7 @@
 }:
 with stdenv.lib;
 let
-  version = "0.6.1";
+  version = "0.7.1";
 in
 stdenv.mkDerivation rec {
   name = "dislocker-${version}";
@@ -13,13 +13,11 @@ stdenv.mkDerivation rec {
     owner = "aorimn";
     repo = "dislocker";
     rev = "v${version}";
-    sha256 = "1s2pvsf4jgzxk9d9m2ik7v7g81lvj8mhmhh7f53vwy0vmihf9h0d";
+    sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb";
   };
 
   buildInputs = [ cmake fuse polarssl ];
 
-  patches = [ ./cmake_dirfix.patch ];
-
   meta = {
     description = "Read BitLocker encrypted partitions in Linux";
     homepage    = https://github.com/aorimn/dislocker;
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix
index 078c80a8b70312b5fe08c4ea210f4fc5bca3c861..e1b11a3705534ad6dd6732c1b879ea48c9d86eff 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/pkgs/tools/filesystems/duff/default.nix
@@ -36,6 +36,5 @@ stdenv.mkDerivation rec {
     homepage = http://duff.dreda.org/;
     license = licenses.zlib;
     platforms = platforms.all;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 22dc9e747233d071c7c013b5f89361de320bb9bc..1c8835a2ed4c6b5373a098848561022b470a99eb 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,23 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
+{ stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.43.7";
+  name = "e2fsprogs-1.44.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "1i51w5l45zhz3i98k92xbbvkqklvjrvw3zvqky3gk9cdmqp5y0w7";
+    sha256 = "1rn1nvp8kcvjmbh2bxrjfbrz7zz519d52rrxqvc50l0hzs6hda55";
   };
 
   outputs = [ "bin" "dev" "out" "man" "info" ];
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ pkgconfig texinfo ];
-  buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
-
-  crossAttrs = {
-    preConfigure = ''
-      export CC=$crossConfig-gcc
-    '';
-  };
+  buildInputs = [ libuuid gettext ];
 
   configureFlags =
     if stdenv.isLinux then [
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 3df76d828318a71a7c1180469ef973d761344bf5..03da84f7c733fd955be0a1d6b97faf7bfdcb664e 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -5,10 +5,10 @@
 
 stdenv.mkDerivation rec {
   name = "encfs-${version}";
-  version = "1.9.2";
+  version = "1.9.4";
 
   src = fetchFromGitHub {
-    sha256 = "0isx7n4r8znk02464s0wvlzk6ry5mlnq3kgnd0rapnhjwdvwqr5y";
+    sha256 = "1hp2l4yk7fsimlrrd6a675vigmyikd323l1n3mybcdng58skj2ag";
     rev = "v${version}";
     repo = "encfs";
     owner = "vgough";
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
     description = "An encrypted filesystem in user-space via FUSE";
     homepage = https://vgough.github.io/encfs;
     license = with licenses; [ gpl3 lgpl3 ];
-    maintainers = with maintainers; [ nckx ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix
index aba0418e9dea1c6c6d0a61e2c5002fc71ff6e424..47ff22ae20ddc918d0cae0363a71ec6184c55f7c 100644
--- a/pkgs/tools/filesystems/exfat/default.nix
+++ b/pkgs/tools/filesystems/exfat/default.nix
@@ -2,23 +2,23 @@
 
 stdenv.mkDerivation rec {
   name = "exfat-${version}";
-  version = "1.2.4";
+  version = "1.2.8";
 
   src = fetchFromGitHub {
-    sha256 = "0x8wjvvlqmp0g2361m6d24csi1p4df8za2cqhyys03s1hv1qmy0k";
-    rev = "v${version}";
-    repo = "exfat";
     owner = "relan";
+    repo = "exfat";
+    rev = "v${version}";
+    sha256 = "0q02g3yvfmxj70h85a69d8s4f6y7jask268vr87j44ya51lzndd9";
   };
 
-  buildInputs = [ fuse ];
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ fuse ];
 
   meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
     description = "Free exFAT file system implementation";
-    platforms = platforms.linux;
+    inherit (src.meta) homepage;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ nckx ];
+    maintainers = with maintainers; [ dywedir ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix
index a30709d4c9209736105aa79d2d301211cae7839b..e0c5ea3def4e764d90aedfb36577729f039b6794 100644
--- a/pkgs/tools/filesystems/extundelete/default.nix
+++ b/pkgs/tools/filesystems/extundelete/default.nix
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ e2fsprogs ];
 
+  # inode field i_dir_acl was repurposed as i_size_high in e2fsprogs 1.44,
+  # breaking the build
+  patchPhase = ''
+    substituteInPlace src/insertionops.cc \
+      --replace "Directory ACL:" "High 32 bits of size:" \
+      --replace "inode.i_dir_acl" "inode.i_size_high"
+  '';
+
   meta = with stdenv.lib; {
     description = "Utility that can recover deleted files from an ext3 or ext4 partition";
     homepage = http://extundelete.sourceforge.net/;
diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix
index 4af076e8f2cd1002f7742469b40369b3583ea53b..61c6ab253cce93916a73f2fd6aacc9623053c6d7 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/pkgs/tools/filesystems/f3/default.nix
@@ -1,27 +1,26 @@
 { stdenv, fetchFromGitHub
 , parted, udev
 }:
-let
-  version = "6.0-2016.11.16-unstable";
-in
+
 stdenv.mkDerivation rec {
-  name = "f3-${version}";
+  name = "${pname}-${version}";
+  pname = "f3";
+  version = "7.0";
 
   enableParallelBuilding = true;
 
   src = fetchFromGitHub {
     owner = "AltraMayor";
-    repo = "f3";
-    rev = "eabf001f69a788e64912bc9e812c118a324077d5";
-    sha256 = "0ypqyqwqiy3ynssdd9gamk1jxywg6avb45ndlzhv3wxh2qcframm";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "195j2zd747ffbsl8p5rf7dyn1j5n05zfqy1s9fm4y6lz8yc1nr17";
   };
 
   buildInputs = [ parted udev ];
 
   patchPhase = "sed -i 's/-oroot -groot//' Makefile";
 
-  buildFlags   = [ "CFLAGS=-fgnu89-inline"  # HACK for weird gcc incompatibility with -O2
-                   "all"                    # f3read, f3write
+  buildFlags   = [ "all"                    # f3read, f3write
                    "extra"                  # f3brew, f3fix, f3probe
                  ];
 
diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix
index 3e4425847fa0369a9e86412006bff74218709c35..75a94400627d9db5f09435e30008c646f3f0a8d5 100644
--- a/pkgs/tools/filesystems/fatsort/default.nix
+++ b/pkgs/tools/filesystems/fatsort/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, help2man}:
 
 stdenv.mkDerivation rec {
-  version = "1.3.365";
+  version = "1.4.2.439";
   name = "fatsort-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fatsort/${name}.tar.gz";
-    sha256 = "0g9zn2ns86g7zmy0y8hw1w1zhnd51hy8yl6kflyhxs49n5sc7b3p";
+    url = "mirror://sourceforge/fatsort/${name}.tar.xz";
+    sha256 = "1q51qq69854kr12knhyqjv7skj95qld6j04pv5v3xvxs0y9zkg5x";
   };
 
   patches = [ ./fatsort-Makefiles.patch ];
diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1818a517fd252c9650ef6c2493bac2242be59eec
--- /dev/null
+++ b/pkgs/tools/filesystems/file-rename/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, perlPackages, makeWrapper }:
+
+perlPackages.buildPerlPackage rec {
+  name = "File-Rename-0.20";
+
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/R/RM/RMBARKER/${name}.tar.gz";
+    sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/rename \
+      --prefix PERL5LIB : $out/lib/perl5/site_perl
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Perl extension for renaming multiple files";
+    homepage = http://search.cpan.org/~rmbarker;
+    license = licenses.artistic1;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index dc15866f3cdac154e54e05733719bdc170210f6f..494fd7036e29076acd77bf6838aa4c2d602dd501 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -15,10 +15,10 @@ let
     #       The command
     #         find /nix/store/...-glusterfs-.../ -name '*.py' -executable
     #       can help with finding new Python scripts.
-    version = "3.12.1";
+    version = "3.12.4";
     name="${baseName}-${version}";
     url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
-    sha256 = "14l6p2zyjsrnjvf0lipq32p517zk813nqv06pjq6kcqkmy038wdv";
+    sha256 = "01gsc3dw491ipl47q733iznddxbg42aa749vkyaq6i6w4d7m157f";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl ncurses readline
diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix
index b0e4d5029e0859668d701c5b811ac8d799ee2664..ca2d0a627ab8f4dce104b575494c2f5de8c838b7 100644
--- a/pkgs/tools/filesystems/gpart/default.nix
+++ b/pkgs/tools/filesystems/gpart/default.nix
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
       or device.
     '';
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ nckx ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix
deleted file mode 100644
index 4e4a139f9adc921fc148010e00dfa4c3d108debb..0000000000000000000000000000000000000000
--- a/pkgs/tools/filesystems/grive/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchgit, cmake, libgcrypt, json_c, curl, expat, boost, binutils }:
-
-stdenv.mkDerivation rec {
-  version = "0.3.0";
-  name = "grive-${version}";
-
-  src = fetchgit {
-    url = "https://github.com/Grive/grive.git";
-    rev = "51e42914f3666ee6e0bc16a4c78f60b117265c24";
-    sha256 = "11cqfcjl128nfg1rjvpvr9x1x2ch3kyliw4vi14n51zqp82f9ysb";
-  };
-
-  buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost];
-
-  # work around new binutils headers, see
-  # http://stackoverflow.com/questions/11748035/binutils-bfd-h-wants-config-h-now
-  prePatch = ''
-    sed -i '1i#define PACKAGE "grive"\n#define PACKAGE_VERSION "${version}"' \
-      libgrive/src/bfd/SymbolInfo.cc
-  '';
-
-  meta = {
-    description = "An open source (experimental) Linux client for Google Drive";
-    homepage = https://github.com/Grive/grive;
-    license = stdenv.lib.licenses.gpl2;
-
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix
index a3ee1b67bab2760fb37360274b777efc12bfab28..f4bb5592abdb8b614a029d829aa523b2ad2e7198 100644
--- a/pkgs/tools/filesystems/grive2/default.nix
+++ b/pkgs/tools/filesystems/grive2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, fetchurl, yajl, cmake, libgcrypt, curl, expat, boost, binutils }:
+{ stdenv, fetchFromGitHub, pkgconfig, fetchurl, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }:
 
 stdenv.mkDerivation rec {
   version = "0.5.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ libgcrypt yajl curl expat stdenv boost binutils ];
+  buildInputs = [ libgcrypt yajl curl expat stdenv boost libiberty ];
 
   meta = with stdenv.lib; {
     description = "A console Google Drive client";
diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix
deleted file mode 100644
index 25ec31ea698acbd49c42a24453ae774844d0a7df..0000000000000000000000000000000000000000
--- a/pkgs/tools/filesystems/hfsprogs/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, openssl, libbsd }:
-
-let version = "332.25";
-    package_name = "hfsprogs"; in
-stdenv.mkDerivation rec {
-  name = "${package_name}-${version}";
-  srcs = [
-    (fetchurl {
-      url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${package_name}_${version}-11.debian.tar.gz";
-      sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c";
-    })
-    (fetchurl {
-      url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz";
-      sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6";
-    })
-  ];
-
-  sourceRoot = "diskdev_cmds-" + version;
-  patches = [ "../debian/patches/*.patch" ];
-
-  buildInputs = [ openssl libbsd ];
-  makefile = "Makefile.lnx";
-
-  # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/
-  installPhase = ''
-    # Create required package directories
-    install -m 755 -d "$out/bin"
-    install -m 755 -d "$out/share/${package_name}"
-    install -m 755 -d "$out/share/man/man8/"
-    # Copy executables
-    install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus"
-    install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus"
-    # Copy shared data
-    install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/${package_name}/hfsbootdata"
-    # Copy man pages
-    install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8"
-    install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8"
-  '';
-
-  meta = {
-    description = "HFS/HFS+ user space utils";
-    license = stdenv.lib.licenses.apsl20;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix
index e9d3df026b0883b1a1fb032ab5858d22b0750d45..4594aa9370ca420062a1077e61527437055215e2 100644
--- a/pkgs/tools/filesystems/hubicfuse/default.nix
+++ b/pkgs/tools/filesystems/hubicfuse/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hubicfuse-${version}";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "TurboGit";
     repo = "hubicfuse";
     rev = "v${version}";
-    sha256 = "1y4n63bk9vd6n1l5psjb9xm9h042kw4yh2ni33z7agixkanajv1s";
+    sha256 = "1x988hfffxgvqxh083pv3lj5031fz03sbgiiwrjpaiywfbhm8ffr";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..617457f55b61deadc339b541cfebb1e4c067c57f
--- /dev/null
+++ b/pkgs/tools/filesystems/idsk/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+
+  repo = "idsk";
+  version = "unstable-2018-02-11";
+  rev = "1846729ac3432aa8c2c0525be45cfff8a513e007";
+  name = "${repo}-${version}";
+
+  meta = with stdenv.lib; {
+    description = "Manipulating CPC dsk images and files";
+    homepage = https://github.com/cpcsdk/idsk ;
+    license = "unknown";
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+  };
+
+  src = fetchFromGitHub {
+    inherit rev repo;
+    owner = "cpcsdk";
+    sha256 = "0d891lvf2nc8bys8kyf69k54rf3jlwqrcczbff8xi0w4wsiy5ckv";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp iDSK $out/bin
+  '';
+}
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 523028f5fb2ef773aeb5951ab89ca76773f65628..c2066f95ef5ab24cf0bda8934f509454d5b5b998 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -1,7 +1,10 @@
-{ 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 }:
+{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
 
 with stdenv;
 
+let
+  avro-cpp=avro-cpp_llvm;
+in
 let
   common = import ./common.nix {
     inherit stdenv bzip2 zlib autoconf automake cmake gnumake
@@ -13,13 +16,13 @@ in rec {
 
   # irods: libs and server package
   irods = stdenv.mkDerivation (common // rec {
-    version = "4.2.1";
+    version = "4.2.2";
     prefix = "irods";
     name = "${prefix}-${version}";
 
     src = fetchurl {
       url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz";
-      sha256 = "07yj5g1mwra4sankhqx967mk4z28kc40rir5cb85x23ljql74abq";
+      sha256 = "0b89hs7sizwrs2ja7jl521byiwb58g297p0p7zg5frxmv4ig8dw7";
     };
 
     # Patches:
@@ -53,11 +56,11 @@ in rec {
 
   # icommands (CLI) package, depends on the irods package
   irods-icommands = stdenv.mkDerivation (common // rec {
-     version = "4.2.1";
+     version = "4.2.2";
      name = "irods-icommands-${version}";
      src = fetchurl {
        url = "http://github.com/irods/irods_client_icommands/archive/${version}.tar.gz";
-       sha256 = "1kg07frv2rf32nf53a1nxscwzgr0rpgxvp5fkmh5439knby10fqw";
+       sha256 = "15zcxrx0q5c3rli3snd0b2q4i0hs3zzcrbpnibbhsip855qvs77h";
      };
 
      buildInputs = common.buildInputs ++ [ irods ];
diff --git a/pkgs/tools/filesystems/irods/irods_root_path.patch b/pkgs/tools/filesystems/irods/irods_root_path.patch
index c88169ac023f6d61b85fc86e24ce8a231fc04486..16b6ba08cbb20472a09dd00889b587df70ca64dd 100644
--- a/pkgs/tools/filesystems/irods/irods_root_path.patch
+++ b/pkgs/tools/filesystems/irods/irods_root_path.patch
@@ -1,5 +1,6 @@
---- 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
+diff -r -u irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp irods-4.2.0/lib/core/src/irods_default_paths.cpp
+--- irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp	2016-11-15 06:23:55.000000000 +0000
++++ irods-4.2.0/lib/core/src/irods_default_paths.cpp	2016-12-20 18:03:17.156883399 +0000
 @@ -18,7 +18,7 @@
          try {
              boost::filesystem::path path{dl_info.dli_fname};
@@ -9,3 +10,62 @@
              return path;
          } catch(const boost::filesystem::filesystem_error& e) {
              THROW(-1, e.what());
+@@ -27,8 +27,7 @@
+ 
+     boost::filesystem::path
+     get_irods_config_directory() {
+-        boost::filesystem::path path{get_irods_root_directory()};
+-        path.append("etc").append("irods");
++        boost::filesystem::path path("/etc/irods");
+         return path;
+     }
+ 
+diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py
+--- irods-4.2.0.orig/scripts/irods/paths.py	2016-11-15 06:23:55.000000000 +0000
++++ irods-4.2.0/scripts/irods/paths.py	2016-12-21 15:17:07.437864606 +0000
+@@ -10,7 +10,7 @@
+     return os.path.join(root_directory(), 'var', 'lib', 'irods')
+ 
+ def config_directory():
+-    return os.path.join(root_directory(), 'etc', 'irods')
++    return os.path.join(os.path.abspath('/'), 'etc', 'irods')
+ 
+ def plugins_directory():
+     return os.path.join(root_directory(), 'usr', 'lib', 'irods', 'plugins')
+@@ -37,7 +37,7 @@
+ 
+ def version_path():
+     return os.path.join(
+-        irods_directory(),
++        home_directory(),
+         'VERSION.json')
+ 
+ def hosts_config_path():
+@@ -64,7 +64,7 @@
+ 
+ def log_directory():
+     return os.path.join(
+-        irods_directory(),
++        home_directory(),
+         'log')
+ 
+ def control_log_path():
+@@ -110,8 +110,7 @@
+ def server_bin_directory():
+     return os.path.join(
+         root_directory(),
+-        'usr',
+-        'sbin')
++        'bin')
+ 
+ def server_executable():
+     return os.path.join(
+@@ -132,7 +131,7 @@
+     return os.path.join(config_directory(), 'service_account.config')
+ 
+ def genosauth_path():
+-    return os.path.join(irods_directory(), 'clients', 'bin', 'genOSAuth')
++    return os.path.join(home_directory(), 'clients', 'bin', 'genOSAuth')
+ 
+ def irods_user_and_group_entries():
+     try:
diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index 929c6690a269c0a1d7b0d89f1dfce50839e96531..16e6db8e4f750ab90057921a2987be9298957c5b 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -1,21 +1,28 @@
-{ stdenv, fetchgit, autoconf, automake, pkgconfig, gettext, libtool, git, pandoc, which, attr, libiconv }:
+{ stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "mergerfs-${version}";
-  version = "2.23.0";
+  version = "2.24.2";
 
-  # not using fetchFromGitHub because of changelog being built with git log
-  src = fetchgit {
-    url = "https://github.com/trapexit/mergerfs";
-    rev = "refs/tags/${version}";
-    sha256 = "0k4nn0f4c355q7hnni7iia8qi9m0khvyd04hx1hmlrnf0zsi9mfw";
-    deepClone = true;
-    leaveDotGit = true;
+  src = fetchFromGitHub {
+    owner = "trapexit";
+    repo = "mergerfs";
+    rev = version;
+    sha256 = "0i65v7900s7c9jkj3a4v44vf3r5mvjkbcic3df940nmk0clahhcs";
   };
 
-  nativeBuildInputs = [ autoconf automake pkgconfig gettext libtool git pandoc which ];
+  nativeBuildInputs = [
+    automake autoconf pkgconfig gettext libtool pandoc which
+  ];
   buildInputs = [ attr libiconv ];
 
+  preConfigure = ''
+    cat > src/version.hpp <
+Date: Mon, 5 Feb 2018 14:38:02 -0600
+Subject: xfs_io: fix copy_file_range symbol name collision
+
+glibc 2.27 has a copy_file_range wrapper, so we need to change our
+internal function out of the way to avoid compiler warnings.
+
+Reported-by: fredrik@crux.nu
+Signed-off-by: Darrick J. Wong 
+Reviewed-by: Eric Sandeen 
+Signed-off-by: Eric Sandeen 
+---
+ io/copy_file_range.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/io/copy_file_range.c b/io/copy_file_range.c
+index d1dfc5a..99fba20 100644
+--- a/io/copy_file_range.c
++++ b/io/copy_file_range.c
+@@ -42,13 +42,18 @@ copy_range_help(void)
+ "));
+ }
+ 
++/*
++ * Issue a raw copy_file_range syscall; for our test program we don't want the
++ * glibc buffered copy fallback.
++ */
+ static loff_t
+-copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len)
++copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len)
+ {
+ 	loff_t ret;
+ 
+ 	do {
+-		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0);
++		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst,
++				len, 0);
+ 		if (ret == -1) {
+ 			perror("copy_range");
+ 			return errno;
+@@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv)
+ 		copy_dst_truncate();
+ 	}
+ 
+-	ret = copy_file_range(fd, &src, &dst, len);
++	ret = copy_file_range_cmd(fd, &src, &dst, len);
+ 	close(fd);
+ 	return ret;
+ }
+-- 
+cgit v1.1
+
diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix
index 593715b2068d919ccbf4c474107cd065c8783feb..3283d6789f7348ca1220a4cecee31621d5a47ddb 100644
--- a/pkgs/tools/filesystems/zerofree/default.nix
+++ b/pkgs/tools/filesystems/zerofree/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "zerofree-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "http://frippery.org/uml/${name}.tgz";
-    sha256 = "059g29x5r1xj6wcj4xj85l8w6qrxyl86yqbybjqqz6nxz4falxzf";
+    sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm";
   };
 
   buildInputs = [ e2fsprogs ];
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 3cdb4497baf126e5661dd3a2f571461e81513ddf..d35eae872040a10aef686fba3019a49989181ce4 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -2,7 +2,7 @@
 , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
 , libXdmcp, libXau, lib, openssl, zlib }:
 let
-  version = "1.8.3";
+  version = "2.0.0";
  in
 stdenv.mkDerivation rec {
   name = "argyllcms-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
     # while on me. It might be good to find a mirror
     url = "http://www.argyllcms.com/Argyll_V${version}_src.zip";
-    sha256 = "00ggh47qzb3xyl8rnppwxa6j113lr38aiwvsfyxwgs51aqmvq7bd";
+    sha256 = "1583hspas7rw5xwrs1rb4yn1yl34wh6lfik6xyszpfv39a2axdxx";
 
     # The argyllcms web server doesn't like curl ...
     curlOpts = "--user-agent 'Mozilla/5.0'";
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 6c6a93dc73ac8b9b4562e498c86dcec14d480f30..7337cd227a2eb0c7a6959d140d57186909df0fad 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl
   , freeglut, ghostscriptX, imagemagick, fftw 
-  , boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv
+  , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv
   , python, zlib, perl, texLive, texinfo, xz
 , darwin
 }:
@@ -9,18 +9,18 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.41";
+    version="2.44";
     name="${baseName}-${version}";
-    hash="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx";
-    url="https://freefr.dl.sourceforge.net/project/asymptote/2.41/asymptote-2.41.src.tgz";
-    sha256="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx";
+    hash="1rs9v95g19ri6ra2m921jf2yr9avqnzfybrqxilsld98xpqx56vg";
+    url="https://freefr.dl.sourceforge.net/project/asymptote/2.44/asymptote-2.44.src.tgz";
+    sha256="1rs9v95g19ri6ra2m921jf2yr9avqnzfybrqxilsld98xpqx56vg";
   };
   buildInputs = [
    ghostscriptX imagemagick fftw
    boehmgc ncurses readline gsl libsigsegv
    python zlib perl texLive texinfo xz ]
    ++ stdenv.lib.optionals stdenv.isLinux
-     [ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ]
+     [ freeglut libGLU libGL mesa_noglu.osmesa ]
    ++ stdenv.lib.optionals stdenv.isDarwin
      (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ])
    ;
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index d6a31bd5c7f7d75c0d6d1eaaa94d039023cf089b..7ed2cc8b6aaf57ec4f2740642e0296ad250c98d5 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "GNU barcode generator";
     maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; allBut darwin;
+    platforms = platforms.linux; # Maybe other non-darwin Unix
     downloadPage = "http://ftp.gnu.org/gnu/barcode/";
     updateWalker = true;
     homepage = http://ftp.gnu.org/gnu/barcode/;
diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix
index 8c53882ff1b22314c57a5af013357fab9eb3b7df..a4d49edcb44766207779ad9c1e81fa362d71071c 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/pkgs/tools/graphics/cfdg/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation rec {
   name = "cfdg-${version}";
-  version = "3.0.2";
+  version = "3.0.9";
   src = fetchurl {
-    sha256 = "1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p";
+    sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl";
     url = "http://www.contextfreeart.org/download/ContextFreeSource${version}.tgz";
   };
 
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index 66d3a1100804b3a6523348226bdf72c2c70a6309..0223375a08849611d3051cec87b3e8288f5a2697 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }:
 
 stdenv.mkDerivation rec {
-  name = "dcraw-9.26.0";
+  name = "dcraw-9.27.0";
 
   src = fetchurl {
     url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz";
-    sha256 = "18zvzaxjq1yaj90xm8bwb30lqbjyjyp002bp175dayh3kr91syc5";
+    sha256 = "16bhk3pl5kb9ikv367szl8m92nx85rqypz5im8x3sakm357wrn61";
   };
 
   buildInputs = [ libjpeg lcms2 gettext jasper ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.cybercom.net/~dcoffin/dcraw/;
     description = "Decoder for many camera raw picture formats";
     license = stdenv.lib.licenses.free;
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
     maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix
index 56c1c97636218a0451024c9808a6f0d36b4a336a..c8c330d80e5b51cd9cbd2aad73edd6c474cebda0 100644
--- a/pkgs/tools/graphics/ditaa/default.nix
+++ b/pkgs/tools/graphics/ditaa/default.nix
@@ -1,27 +1,20 @@
-{ stdenv, fetchurl, unzip, jre }:
+{ stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "ditaa-0.9";
+  name = "ditaa-0.11.0";
 
   src = fetchurl {
-    name = "${name}.zip";
-    url = "mirror://sourceforge/project/ditaa/ditaa/0.9/ditaa0_9.zip";
-    sha256 = "12g6k3hacvyw3s9pijli7vfnkspyp37qkr29qgbmq1hbp0ryk2fn";
+    url = https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar;
+    sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l";
   };
 
-  buildInputs = [ unzip ];
-
   phases = [ "installPhase" ];
 
   installPhase = ''
-    unzip "$src"
-    
     mkdir -p "$out/bin"
     mkdir -p "$out/lib"
-    mkdir -p "$out/share/ditaa"
 
-    cp dita*.jar "$out/lib/ditaa.jar"
-    cp COPYING HISTORY "$out/share/ditaa"
+    cp ${src} "$out/lib/ditaa.jar"
 
     cat > "$out/bin/ditaa" << EOF
     #!${stdenv.shell}
@@ -33,8 +26,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Convert ascii art diagrams into proper bitmap graphics";
-    homepage = http://ditaa.sourceforge.net/;
-    license = licenses.gpl2;
+    homepage = https://github.com/stathissideris/ditaa;
+    license = licenses.lgpl3;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index 91dd85b0757defe4217b1a1797f034b536969760..8bc33fb1b0a44fb1e881b82daf6047cf3287fd9b 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }:
 
 stdenv.mkDerivation rec {
-  name = "editres-1.0.6";
+  name = "editres-1.0.7";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/${name}.tar.gz";
-    sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45";
+    sha256 = "10mbgijb6ac6wqb2grpy9mrazzw68jxjkxr9cbdf1111pa64yj19";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix
index 2a0796699fb8536b68b96e0fa728a1aeaab788f9..2ffe4eb7f809cfa3e18aa53319e12aea8665f60e 100644
--- a/pkgs/tools/graphics/enblend-enfuse/default.nix
+++ b/pkgs/tools/graphics/enblend-enfuse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, mesa, vigra
+, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU_combined, vigra
 , help2man, pkgconfig, perl, texlive }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7";
   };
 
-  buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff mesa vigra ];
+  buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU_combined vigra ];
 
   nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ];
 
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
     homepage = http://enblend.sourceforge.net/;
     description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ nckx ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix
index 537d1a8c7db970dd860d4373f059d7667febbecc..d6ec68ba3cc5bd18ceb7fb30fab0ee1ecce1f152 100644
--- a/pkgs/tools/graphics/exif/default.nix
+++ b/pkgs/tools/graphics/exif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libexif, popt, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, libexif, popt, libintl }:
 
 stdenv.mkDerivation rec {
   name = "exif-0.6.21";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libexif popt ] ++ libintlOrEmpty;
+  buildInputs = [ libexif popt libintl ];
 
   meta = {
     homepage = http://libexif.sourceforge.net/;
diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix
index c7a22f00dce7d670fb1c84030cb9f3e42045b5e2..066c181f53c20be407e519e57fd7bf5be55a449b 100644
--- a/pkgs/tools/graphics/fim/default.nix
+++ b/pkgs/tools/graphics/fim/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   name = "fim-${version}";
-  version = "0.5rc3";
+  version = "0.6";
 
   src = fetchurl {
-    url = mirror://savannah/fbi-improved/fim-0.5-rc3.tar.gz;
-    sha256 = "12aka85h469zfj0zcx3xdpan70gq8nf5rackgb1ldcl9mqjn50c2";
+    url = "mirror://savannah/fbi-improved/${name}-trunk.tar.gz";
+    sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
index 7c5f9eaf5de6ef9d4a2c4bd3f0342ee9cd92b8b8..05ce6b6f7c9c7f42d0e2cea763c6adc366d186db 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gifsicle-${version}";
-  version = "1.90";
+  version = "1.91";
 
   src = fetchurl {
     url = "http://www.lcdf.org/gifsicle/${name}.tar.gz";
-    sha256 = "0kc35g99fygzjj7qjcy87rdb8mbgmacr2mga9ihgln1dfnbb0wrd";
+    sha256 = "00586z1yz86qcblgmf16yly39n4lkjrscl52hvfxqk14m81fckha";
   };
 
   buildInputs = optional gifview [ xproto libXt libX11 ];
diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix
index bdfecb9de735c9409cc64aa4b9c37a18efc162c5..52f5a099727403df2f8f83d2d61b18067d13a286 100644
--- a/pkgs/tools/graphics/glee/default.nix
+++ b/pkgs/tools/graphics/glee/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchgit, cmake, mesa, xorg }:
+{stdenv, fetchgit, cmake, libGLU_combined, xorg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ mesa xorg.libX11 ];
+  buildInputs = [ libGLU_combined xorg.libX11 ];
 
   configureScript = ''
     cmake
diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix
index 0d31f8f1a6f7a3625c20a8722d8c78896120aece..43da52634e68ca69a125ea951e6945a6ab56f2ff 100644
--- a/pkgs/tools/graphics/glmark2/default.nix
+++ b/pkgs/tools/graphics/glmark2/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, mesa, libdrm,
-  python27, wayland, libudev }:
+{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm,
+  python27, wayland, libudev, mesa_noglu }:
 
 stdenv.mkDerivation rec {
   name = "glmark2-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland libudev
+    libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland libudev mesa_noglu
   ];
 
   buildPhase = ''
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 03be1e909307323c6887fc4d147b6d11d9bf626c..a3a9a4d8eda4059da30ec032d3e081dfcc68ad94 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchurl, xlibsWrapper, mesa_noglu }:
+{ stdenv, fetchurl, libGL, libX11 }:
 
-let version = "8.3.0"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "glxinfo-${version}";
+  version = "8.3.0";
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2";
     sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1";
   };
 
-  buildInputs = [ xlibsWrapper mesa_noglu ];
+  buildInputs = [ libX11 libGL ];
 
   configurePhase = "true";
 
   buildPhase = "
     cd src/xdemos
-    gcc glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11
-    gcc glxgears.c -o glxgears -lGL -lX11
+    $CC glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11
+    $CC glxgears.c -o glxgears -lGL -lX11 -lm
   ";
 
   installPhase = "
@@ -25,7 +24,11 @@ stdenv.mkDerivation {
     cp glxinfo glxgears $out/bin/
   ";
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Test utilities for OpenGL";
+    homepage = https://www.mesa3d.org/;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 6ac152cb7b8c7bb1177ae2398002bdae4273d8f9..a8c491b049ffbc3a54044e25b7a6edd2253b6520 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gmic-${version}";
-  version = "1.7.9";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "http://gmic.eu/files/source/gmic_${version}.tar.gz";
-    sha256 = "0cvi5kmcrrg5pm774ligyy33fasgsfp3mr6ingjzd99rn4710bqm";
+    sha256 = "0iac1zaix2zv1dfp45ca0wk9pj6k02gf8l1vmg820z8jd12pa19w";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 7594474538d0127cb49682d2c1d16ac97f9c9de4..a177f33bb3774decd81f7815452e5fd45b23d7a0 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, zlib, gd, texinfo4, makeWrapper, readline
+{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, texinfo
+, cairo, gd, libcerf, pango, readline, zlib
 , withTeXLive ? false, texlive
 , withLua ? false, lua
 , emacs ? null
@@ -8,39 +9,44 @@
 , libXaw ? null
 , aquaterm ? false
 , withWxGTK ? false, wxGTK ? null
-, pango ? null
-, cairo ? null
-, pkgconfig ? null
 , fontconfig ? null
 , gnused ? null
 , coreutils ? null
-, withQt ? false, qt }:
+, withQt ? false, qttools, qtbase, qtsvg
+}:
 
 assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
 let
   withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
 in
 stdenv.mkDerivation rec {
-  name = "gnuplot-5.2.1";
+  name = "gnuplot-5.2.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
-    sha256 = "123yh0ysahn71nlibsz5qkq18rlf18qqfhrlkvl925ijdgxv1ikx";
+    sha256 = "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4";
   };
 
+  nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools;
+
   buildInputs =
-    [ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ]
+    [ cairo gd libcerf pango readline zlib ]
     ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; })
     ++ lib.optional withLua lua
     ++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
-    ++ lib.optional withQt qt
-    # compiling with wxGTK causes a malloc (double free) error on darwin
-    ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK;
+    ++ lib.optionals withQt [ qtbase qtsvg ]
+    ++ lib.optional withWxGTK wxGTK;
+
+  postPatch = ''
+    # lrelease is in qttools, not in qtbase.
+    sed -i configure -e 's|''${QT5LOC}/lrelease|lrelease|'
+  '';
 
-  configureFlags =
-    (if withX then ["--with-x"] else ["--without-x"])
-    ++ (if withQt then ["--enable-qt"] else ["--disable-qt"])
-    ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"]);
+  configureFlags = [
+    (if withX then "--with-x" else "--without-x")
+    (if withQt then "--with-qt=qt5" else "--without-qt")
+    (if aquaterm then "--with-aquaterm" else "--without-aquaterm")
+  ];
 
   postInstall = lib.optionalString withX ''
     wrapProgram $out/bin/gnuplot \
@@ -50,6 +56,8 @@ stdenv.mkDerivation rec {
        --run '. ${./set-gdfontpath-from-fontconfig.sh}'
   '';
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     homepage = http://www.gnuplot.info/;
     description = "A portable command-line driven graphing utility for many platforms";
diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e505f0bb6db5751b167788beeeef7a1197af08a5
--- /dev/null
+++ b/pkgs/tools/graphics/graph-easy/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPerlPackage, fetchurl }:
+
+buildPerlPackage rec {
+  name = "Graph-Easy-${version}";
+  version = "0.76";
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+    sha256 = "d4a2c10aebef663b598ea37f3aa3e3b752acf1fbbb961232c3dbe1155008d1fa";
+  };
+  
+  meta = with stdenv.lib; {
+    homepage = http://search.cpan.org/~tels/Graph-Easy/bin/graph-easy;
+    description = "Render/convert graphs in/from various formats";
+    license = licenses.gpl1;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jensbin ];
+  };
+}
diff --git a/pkgs/tools/graphics/graphviz/0001-vimdot-lookup-vim-in-PATH.patch b/pkgs/tools/graphics/graphviz/0001-vimdot-lookup-vim-in-PATH.patch
deleted file mode 100644
index d5f71a4de9e52273e8de2a4fc45c1b14ca73b919..0000000000000000000000000000000000000000
--- a/pkgs/tools/graphics/graphviz/0001-vimdot-lookup-vim-in-PATH.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2008bf62e13ebe41cdad3e16f8b42f46ae393876 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= 
-Date: Tue, 6 Jan 2015 20:39:41 +0100
-Subject: [PATCH] vimdot: lookup 'vim' in $PATH
-
-Instead of hardcoding /usr/bin/vim. Needed for NixOS (http://nixos.org), and is
-probably useful for others too.
----
- plugin/xlib/vimdot.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugin/xlib/vimdot.sh b/plugin/xlib/vimdot.sh
-index 749fe6a..4e6dd4b 100755
---- a/plugin/xlib/vimdot.sh
-+++ b/plugin/xlib/vimdot.sh
-@@ -3,9 +3,9 @@
- 
- error() { echo "$0: $*" >&2; exit 1; }
- 
--editor="/usr/bin/vim"
-+editor="vim"
- 
--if ! test -x "$editor"; then error "the \"$editor\" editor not found or not executable"; fi
-+if ! test -x "$(command -v "$editor")"; then error "the \"$editor\" editor not found or not executable"; fi
- 
- default="noname.gv"
- 
--- 
-2.1.3
-
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index fb8f0472ce357dbca93e45edfb5e4a0a1b96485c..544949f33b711c82485e7df049d2cc60cb4b8a08 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -1,67 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
-, yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo
-, ApplicationServices
-}:
-
-stdenv.mkDerivation rec {
+import ./base.nix {
+  rev = "10c3c34c5198beacfba950764f34960c6884a34f";
   version = "2.32.0";
-  name = "graphviz-${version}";
-
-  src = fetchurl {
-    url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
-    sha256 = "0ym7lw3xnkcgbk32vfmm3329xymca60gzn90rq6dv8887qqv4lyq";
-  };
-
-  buildInputs =
-    [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
-      pango gd gts
-    ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices gettext ];
-
-  CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo";
-
-  configureFlags =
-    [ "--with-pngincludedir=${libpng.dev}/include"
-      "--with-pnglibdir=${libpng.out}/lib"
-      "--with-jpegincludedir=${libjpeg.dev}/include"
-      "--with-jpeglibdir=${libjpeg.out}/lib"
-      "--with-expatincludedir=${expat.dev}/include"
-      "--with-expatlibdir=${expat.out}/lib"
-      "--with-ltdl-include=${libtool}/include"
-      "--with-ltdl-lib=${libtool.lib}/lib"
-      "--with-cgraph=no"
-      "--with-sparse=no"
-    ]
-    ++ stdenv.lib.optional (xorg == null) "--without-x";
-
-  hardeningDisable = [ "fortify" ];
-
-  preBuild = ''
-    sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
-  '';
-
-  # "command -v" is POSIX, "which" is not
-  postInstall = ''
-    sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty
-    sed -i 's|which|command -v|' $out/bin/vimdot
-  '';
-
-  meta = {
-    homepage = http://www.graphviz.org/;
-    description = "Open source graph visualization software";
-
-    longDescription = ''
-      Graphviz is open source graph visualization software. Graph
-      visualization is a way of representing structural information as
-      diagrams of abstract graphs and networks. It has important
-      applications in networking, bioinformatics, software engineering,
-      database and web design, machine learning, and in visual
-      interfaces for other technical domains.
-    '';
-
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ];
-    inherit version;
-    branch = "2.32";
-  };
+  sha256 = "18b2wnz6xk8hndy7dlr1vn9vziyryyflh747n9966778gmh8bick";
 }
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b360f9a345033fe5b143b310c5157d3ec1d619e2
--- /dev/null
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -0,0 +1,63 @@
+{ rev, sha256, version }:
+
+{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, cairo, expat, flex
+, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
+, yacc, xorg ? null, ApplicationServices ? null }:
+
+assert stdenv.isDarwin -> ApplicationServices != null;
+
+let
+  inherit (stdenv.lib) optional optionals optionalString;
+in
+
+stdenv.mkDerivation rec {
+  name = "graphviz-${version}";
+
+  src = fetchFromGitLab {
+    owner = "graphviz";
+    repo = "graphviz";
+    inherit sha256 rev;
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [
+    libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
+    gettext
+  ] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ])
+    ++ optionals (stdenv.isDarwin) [ ApplicationServices ];
+
+  hardeningDisable = [ "fortify" ];
+
+  CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin)
+    "-I${cairo.dev}/include/cairo";
+
+  configureFlags = [
+    "--with-ltdl-lib=${libtool.lib}/lib"
+    "--with-ltdl-include=${libtool}/include"
+  ] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ];
+
+  postPatch = ''
+    for f in $(find . -name Makefile.in); do
+      substituteInPlace $f --replace "-lstdc++" "-lc++"
+    done
+  '';
+
+  preAutoreconf = "./autogen.sh";
+
+  postFixup = optionalString (xorg != null) ''
+    substituteInPlace $out/bin/dotty --replace '`which lefty`' $out/bin/lefty
+    substituteInPlace $out/bin/vimdot \
+      --replace /usr/bin/vi '$(command -v vi)' \
+      --replace /usr/bin/vim '$(command -v vim)' \
+      --replace /usr/bin/vimdot $out/bin/vimdot \
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://graphviz.org;
+    description = "Graph visualization tools";
+    license = licenses.epl10;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bjornfor raskin ];
+  };
+}
diff --git a/pkgs/tools/graphics/graphviz/cve-2014-9157.patch b/pkgs/tools/graphics/graphviz/cve-2014-9157.patch
deleted file mode 100644
index 66ce496ca74886eab1e440dceae0ab4c2dd1722a..0000000000000000000000000000000000000000
--- a/pkgs/tools/graphics/graphviz/cve-2014-9157.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From https://lists.debian.org/debian-qa-packages/2014/12/msg00048.html , which
-seems to come from Ubuntu.
-
-Subject: Fix format string vulnerability (CVE-2014-9157) in yyerror() routine
-Origin: https://github.com/ellson/graphviz/commit/99eda421f7ddc27b14e4ac1d2126e5fe41719081
-Author: Emden R. Gansner
-
----
- lib/cgraph/scan.l |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/lib/cgraph/scan.l
-===================================================================
---- a/lib/cgraph/scan.l
-+++ b/lib/cgraph/scan.l
-@@ -225,7 +225,7 @@
- 	agxbput (&xb, buf);
- 	agxbput (&xb, yytext);
- 	agxbput (&xb,"'\n");
--	agerr(AGERR,agxbuse(&xb));
-+	agerr(AGERR, "%s", agxbuse(&xb));
- 	agxbfree(&xb);
- }
- /* must be here to see flex's macro defns */
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index ce864261c8b3654b74d3ef5ba08dea7fb17af4bf..48b1b0764c51dbc8ac30311e44ab5e72f33c404d 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -1,69 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat
-, yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo
-, flex
-, ApplicationServices
-}:
-
-stdenv.mkDerivation rec {
+import ./base.nix rec {
+  rev = "stable_release_${version}";
   version = "2.40.1";
-  name = "graphviz-${version}";
-
-  src = fetchurl {
-    url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
-    sha256 = "08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna";
-  };
-
-  hardeningDisable = [ "fortify" ];
-
-  patches = [ ];
-
-  buildInputs =
-    [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
-    ] ++ stdenv.lib.optionals (xorg != null)
-      (with xorg; [ xlibsWrapper libXrender libXaw libXpm ])
-    ++ stdenv.lib.optionals (stdenv.isDarwin) [ ApplicationServices gettext ];
-
-  CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin)
-    "-I${cairo.dev}/include/cairo";
-
-  configureFlags = stdenv.lib.optional (xorg == null) "--without-x";
-
-  postPatch = (stdenv.lib.optionalString stdenv.isDarwin ''
-    for foo in cmd/dot/Makefile.in cmd/edgepaint/Makefile.in \
-                    cmd/mingle/Makefile.in plugin/gdiplus/Makefile.in; do
-      substituteInPlace "$foo" --replace "-lstdc++" "-lc++"
-    done
-  '') + ''
-      substituteInPlace "plugin/xlib/vimdot.sh" --replace "/usr/bin/vim" "\$(command -v vim)"
-  '';
-
-  preBuild = ''
-    sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
-  '';
-
-  # "command -v" is POSIX, "which" is not
-  postInstall = stdenv.lib.optionalString (xorg != null) ''
-    sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty
-    sed -i 's|which|command -v|' $out/bin/vimdot
-  '';
-
-  meta = {
-    homepage = http://www.graphviz.org/;
-    description = "Open source graph visualization software";
-
-    longDescription = ''
-      Graphviz is open source graph visualization software. Graph
-      visualization is a way of representing structural information as
-      diagrams of abstract graphs and networks. It has important
-      applications in networking, bioinformatics, software engineering,
-      database and web design, machine learning, and in visual
-      interfaces for other technical domains.
-    '';
-
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ];
-    downloadPage = "http://www.graphviz.org/pub/graphviz/ARCHIVE/";
-    inherit version;
-    updateWalker = true;
-  };
-}
+  sha256 = "1xjqq3g2n6jgwp5xzyvibgrxawlskkpam69fjjz9ksrrjas2qwzj";
+ }
diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix
index 7261326633a12153b213721f6dba0e28f9d4dbc3..dc703cf02f75e1e588dd051ef42d811f477c4256 100644
--- a/pkgs/tools/graphics/gromit-mpx/default.nix
+++ b/pkgs/tools/graphics/gromit-mpx/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig
 , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp
-, libxkbcommon, epoxy, at_spi2_core, dbus, libdbusmenu-glib
+, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib
 }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     autoconf automake autoreconfHook
     gtk glib pcre libappindicator libpthreadstubs
-    libXdmcp libxkbcommon epoxy at_spi2_core
+    libXdmcp libxkbcommon epoxy at-spi2-core
     dbus libdbusmenu-glib
   ];
 
diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix
index 720af4622c785d4c0943ee7f80e965f019f675af..3ab2232e26c6a2a225699ce2262c96e89cccb79a 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.3";
+  name = "icoutils-0.32.3";
 
   src = fetchurl {
     url = "mirror://savannah/icoutils/${name}.tar.bz2";
-    sha256 = "d4651de8e3f9e28d24b5343a2b7564f49754e5fe7d211c5d4dd60dcd65c8a152";
+    sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp";
   };
 
   buildInputs = [ makeWrapper libpng perl ];
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix
index 69ae03d675031d069931a287cb4796419488607d..e9f1ad5dacd7677d836091fb1a52c7637b0939cd 100644
--- a/pkgs/tools/graphics/imgur-screenshot/default.nix
+++ b/pkgs/tools/graphics/imgur-screenshot/default.nix
@@ -2,14 +2,14 @@
 
 let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ];
 in stdenv.mkDerivation rec {
-  version = "1.7.1";
+  version = "1.7.4";
   name = "imgur-screenshot-${version}";
 
   src = fetchFromGitHub {
     owner = "jomo";
     repo = "imgur-screenshot";
     rev = "v${version}";
-    sha256 = "01wiqrc7xxvk7kzgw756jahwa0szb200l8030iwfcgxb679k3v0j";
+    sha256 = "1bhi9sk8v7szh2fj13qwvdwzy5dw2w4kml86sy1ns1rn0xin0cgr";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index 2f18857b2a1641217092a23f2915f46c72c26d51..0fa991638457cc80b12df45444e583e8aea73a62 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew
-, mesa, boost, glm, freetype }:
+, libGLU_combined, boost, glm, freetype }:
 
 stdenv.mkDerivation rec {
   name = "logstalgia-${version}";
-  version = "1.0.7";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz";
-    sha256 = "1qghz1j3jmfj093br2hfyibayg3fmhg8fvp5ix9n9rbvzc1zslsm";
+    sha256 = "0nvnk8q9m2ignzwxak0vch88blywbx4znk70xf9fg38xa4rf94yn";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa boost
+  buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined boost
                   glm freetype ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index aaf7b68d177f074945eb1b10e0f30bc736096393..c7e8dc966e8db8b654d642021cfb00de130c8dcd 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig
 , zlib, libpng, libjpeg
-, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }:
+, libGLU_combined, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }:
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs =
-    [ zlib libpng libjpeg mesa glm libX11 libXext libXfixes libXrandr
+    [ zlib libpng libjpeg libGLU_combined glm libX11 libXext libXfixes libXrandr
       libXcomposite slop icu ];
 
   doCheck = false;
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 1f1dd36323350d33df5d8c3bdd08a2e942264010..fcd347182ec482388bfa773ad97d31a3f2324e15 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "netpbm-10.77.02";
 
   src = fetchsvn {
-    url = "svn://svn.code.sf.net/p/netpbm/code/advanced";
+    url = "https://svn.code.sf.net/p/netpbm/code/advanced";
     rev = 2883;
     sha256 = "1lxa5gasmqrwgihkk8ij7vb9kgdw3d5mp25kydkrf6x4wibg1w5f";
   };
diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bc14190707570d1c81ea63ab089ab439892972a1
--- /dev/null
+++ b/pkgs/tools/graphics/optar/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, imagemagick, libpng }:
+
+stdenv.mkDerivation rec {
+  name = "optar-${version}";
+  version = "20150210";
+
+  src = fetchurl {
+    url    = "http://ronja.twibright.com/optar.tgz";
+    sha256 = "10lr31k3xfcpa6vxkbl3abph7j3gks2210489khnnzmhmfdnm1a4";
+  };
+
+  buildInputs = [ libpng ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace /usr/local $out
+
+    substituteInPlace pgm2ps \
+      --replace 'convert ' "${stdenv.lib.getBin imagemagick}/bin/convert "
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Optar stands for OPTical ARchiver - it's a codec for encoding data on paper";
+    homepage = http://ronja.twibright.com/optar/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = with platforms; linux; # possibly others, but only tested on Linux
+  };
+}
diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix
index f9b82a38344e07bec009ab435c6668c543d75eae..fd0b0caea4cad33f69ab3129cd106ea29ab614a0 100644
--- a/pkgs/tools/graphics/optipng/default.nix
+++ b/pkgs/tools/graphics/optipng/default.nix
@@ -7,11 +7,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "optipng-0.7.6";
+  name = "optipng-0.7.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/optipng/${name}.tar.gz";
-    sha256 = "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28";
+    sha256 = "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg";
   };
 
   buildInputs = [ libpng ];
diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..21d86f4c44b67a3e9db6404782b3296a36e3bfd7
--- /dev/null
+++ b/pkgs/tools/graphics/oxipng/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  version = "1.0.1";
+  name = "oxipng-${version}";
+
+  src = fetchFromGitHub {
+    owner = "shssoichiro";
+    repo = "oxipng";
+    rev = "v${version}";
+    sha256 = "0w39f0dhq9cxk25vy0wh8vicxyckvj1vmglx5va4550i3q0hsrws";
+  };
+
+  cargoSha256 = "00nbx6n73yl4ax05pqkmim1vhy0pymgz5la1cc4y18gjbjjj9w4h";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/shssoichiro/oxipng;
+    description = "A lossless PNG compression optimizer";
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 7e6b3523ed80122d050a38b5adec69f51617b299..4c1ff502433160caea5f6cf600ba489a3a30d688 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -1,12 +1,16 @@
-{ stdenv, fetchurl, cmake, pkgconfig, openexr, ilmbase, zlib, imagemagick, mesa, freeglut, fftwFloat, fftw, gsl, libexif, perl, opencv, qt4 }:
+{ stdenv, fetchurl, cmake, pkgconfig
+, openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat
+, fftw, gsl, libexif, perl, opencv, qt4
+}:
 
 stdenv.mkDerivation rec {
-  name = "pfstools";
-  version = "2.0.5";
+  name = "${pname}-${version}";
+  pname = "pfstools";
+  version = "2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${name}/${version}/${name}-${version}.tgz";
-    sha256 = "1fyc2c7jzr7k797c2dqyyvapzc3szxwcp48r382yxz2yq558xgd9";
+    url = "mirror://sourceforge/${pname}/${version}/${name}.tgz";
+    sha256 = "04rlb705gmdiphcybf9dyr0d5lla2cfs3c308zz37x0vwi445six";
   };
 
   outputs = [ "out" "dev" "man"];
@@ -15,9 +19,11 @@ stdenv.mkDerivation rec {
     -DWITH_MATLAB=false 
   '';
 
-  buildInputs = [ openexr zlib imagemagick mesa freeglut fftwFloat fftw gsl libexif perl opencv qt4 ];
-
   nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [
+    openexr zlib imagemagick libGLU_combined freeglut fftwFloat
+    fftw gsl libexif perl opencv qt4
+  ];
 
   patches = [ ./threads.patch ./pfstools.patch ];
 
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/tools/graphics/plotutils/debian-patches.nix
index 0615d1f52e1aaa9a752da77ba35940d318738514..d7c60a11eb676bf4769396253c5ed4c98358d723 100644
--- a/pkgs/tools/graphics/plotutils/debian-patches.nix
+++ b/pkgs/tools/graphics/plotutils/debian-patches.nix
@@ -1,14 +1,42 @@
 # Generated by debian-patches.sh from debian-patches.txt
 let
-  prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-3";
+  prefix = "https://sources.debian.org/data/main/p/plotutils/2.6-9/debian/patches";
 in
 [
+  {
+    url = "${prefix}/01_AC_PROG_CXX.diff";
+    sha256 = "0r7xgwbk2yqs7b29gwhr8pnbqvy3a3x698j17s4yg501ragw1gqv";
+  }
   {
     url = "${prefix}/10_repair_postscript";
     sha256 = "01v4a8mdhgsjxbf9a2xppx2lb05lp818v8afp5x2njv64wpgla8p";
   }
+  {
+    url = "${prefix}/11_manpages_sb_macro";
+    sha256 = "01vvhznw5z7lb7afwgw53cwg8w676s4v30kychlrl8kn5yks94qs";
+  }
+  {
+    url = "${prefix}/14_manpage_spline";
+    sha256 = "1xp3cx9y9njp5wp40dkp7rwd2flkiik2gb08nh4516vkm73avfrd";
+  }
+  {
+    url = "${prefix}/20_svg_attribute_syntax";
+    sha256 = "0vy089w00x2zh87igv3dcqq7kggqxpc4javb694pa5xl5bvddnqk";
+  }
+  {
+    url = "${prefix}/21_plot2svg_test.diff";
+    sha256 = "0lv8hj9fiqj6z72pnaw3imk3164n1kcy5ym0j9jl2pn3a19p1jmb";
+  }
   {
     url = "${prefix}/25_libpng15";
     sha256 = "0l640rcsgc2mwpk7iqm0cf3b0gfcdgcn9wg4x88gaqxzx9rriph0";
   }
+  {
+    url = "${prefix}/30_hershey_glyphs";
+    sha256 = "0n7rn6ln9ikzq2dialif58ag5pch7q7zqd5zcsxxdyyasx4s5gm2";
+  }
+  {
+    url = "${prefix}/35_spline.test.error.diff";
+    sha256 = "1kqj1n8myk8xmglj6qcybj34zm4kpn6aw320jbpqhblkgp7m0fb1";
+  }
 ]
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.txt b/pkgs/tools/graphics/plotutils/debian-patches.txt
index 8694be8edd798f1b913d9462d5eca30d1ced91d2..c28d96fdd5bca8113515199b4d6ca45fa14a19d5 100644
--- a/pkgs/tools/graphics/plotutils/debian-patches.txt
+++ b/pkgs/tools/graphics/plotutils/debian-patches.txt
@@ -1,3 +1,10 @@
-plotutils/2.6-2
+plotutils/2.6-9
+01_AC_PROG_CXX.diff
 10_repair_postscript
+11_manpages_sb_macro
+14_manpage_spline
+20_svg_attribute_syntax
+21_plot2svg_test.diff
 25_libpng15
+30_hershey_glyphs
+35_spline.test.error.diff
diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix
index 219bfdf8c14d8294318ab2930da053709bcb0647..85685e0b0482a7aef445761b2ea29810a040c550 100644
--- a/pkgs/tools/graphics/plotutils/default.nix
+++ b/pkgs/tools/graphics/plotutils/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libpng }:
+{ fetchurl, stdenv, libpng, autoreconfHook }:
 
 # debian splits this package into plotutils and libplot2c2
 
@@ -13,14 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libpng ];
-
-  # disable failing test on i686
-  # https://lists.gnu.org/archive/html/bug-plotutils/2016-04/msg00002.html
-  prePatch = stdenv.lib.optionalString stdenv.isi686 ''
-    substituteInPlace test/Makefile.in --replace 'spline.test' ' '
-  '';
-
   patches = map fetchurl (import ./debian-patches.nix);
 
   configureFlags = "--enable-libplotter"; # required for pstoedit
@@ -29,6 +23,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Powerful C/C++ library for exporting 2D vector graphics";
 
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index 3bcbc5d5eade2cfe67744c1983e01ba68cd6f7b1..fce1f3f913cff72228bd424718869ac126dd9a1a 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.8.1";
+  name = "pngcrush-1.8.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "1h3sibmmiq4ynvf8hrpksfrbcmszxh4bqpkqy5c0m8828c7drpr9";
+    sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv";
   };
 
   makeFlags = [ "CC=cc" "LD=cc" ];      # gcc and/or clang compat
diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix
index 93f57f95e3e29b49660395034cef9bd15696137d..b53a07bcfadfeff86e62ac10d775960669608f41 100644
--- a/pkgs/tools/graphics/pngquant/default.nix
+++ b/pkgs/tools/graphics/pngquant/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "pngquant-${version}";
-  version = "2.9.1";
+  version = "2.11.7";
 
   src = fetchgit {
     url = "https://www.github.com/pornel/pngquant.git";
     rev = "refs/tags/${version}";
-    sha256 = "0xhnrjsk55jy5q68f81y7l61c6x18i4fzkm3i4dgndrhri5g4n1q";
+    sha256 = "1qr5qr2wznzp0v9xwyz4r3982rcm9kys913w8gwmv7qd1akvx2qh";
     fetchSubmodules = true;
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   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;
+    platforms = platforms.unix;
     license = licenses.gpl3;
     maintainers = [ maintainers.volth ];
   };
diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index 7284ee95a9097c9ca18f96ea4d338e2b1673ec84..5dfed3722e09dab0d0f0ebbc47026821aefb2b55 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchFromGitHub, autoconf, automake, boost
-, zlib, libpng, libjpeg, libtiff
+, zlib, libpng, libjpeg, libtiff, x11, SDL
 }:
 
 stdenv.mkDerivation rec {
   name = "povray-${version}";
-  version = "3.7.0.4";
+  version = "3.7.0.7";
 
   src = fetchFromGitHub {
     owner = "POV-Ray";
     repo = "povray";
     rev = "v${version}";
-    sha256 = "1wkwb43w5r9pa79yazy4w4s8n6g280igag97hgl7dyi289q39n0q";
+    sha256 = "0gqbc4ycjfqpnixzzqxlygmargk6sm77b0k3xzff9dxdrak3xng7";
   };
 
 
-  buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff ];
+  buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff x11 SDL ];
 
   # the installPhase wants to put files into $HOME. I let it put the files
   # to $TMPDIR, so they don't get into the $out
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
                  sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in}
                '';
 
-  configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" ];
+  configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" "--with-x" ];
 
   enableParallelBuilding = true;
   
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index 9fdf0ad0465a4d3252c824662f2260401357ad52..a31a9848c10190e4427eb998122ffd6e9c37d722 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pstoedit-3.70";
+  name = "pstoedit-3.71";
 
   src = fetchurl {
     url = "mirror://sourceforge/pstoedit/${name}.tar.gz";
-    sha256 = "130kz0ghsrggdn70kygrmsy3n533hwd948q69vyvqz44yw9n3f06";
+    sha256 = "15dwrwjbixjqph2jmdqzi9fihwpqc1kz5jcv5phxw8wwrlicv285";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..95f7c547b5596c766fab79ba81b54eb3e4102f75
--- /dev/null
+++ b/pkgs/tools/graphics/pywal/default.nix
@@ -0,0 +1,28 @@
+{ lib, python3Packages, fetchFromGitHub, imagemagick, feh }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "pywal";
+  version = "2.0.5";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "117f61db013409ee2657aab9230cc5c2cb2b428c17f7fbcf664909122962165e";
+  };
+
+  # necessary for imagemagick to be found during tests
+  buildInputs = [ imagemagick ];
+
+  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ imagemagick feh ]}" ];
+
+  preCheck = ''
+    mkdir tmp
+    HOME=$PWD/tmp
+  '';
+
+  meta = with lib; {
+    description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3.";
+    homepage = https://github.com/dylanaraps/pywal;
+    license = licenses.mit;
+    maintainers = with maintainers; [ Fresheyeball ];
+  };
+}
diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index 104e423bd7214d549e9819837f856e404ecd66c8..a83e38e577dd0f13a2344d2abfdcc5653dfd7bee 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, libpng, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qrencode-3.4.4";
+  name = "qrencode-4.0.0";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "198zvsfa2y5bb3ccikrhmhd4i43apr3b26dqcf3zkjyv3n5iirgg";
+    sha256 = "02vx69fl52jbcrmnydsaxcmy6nxqm9jyxzd7hr07s491d7hka069";
   };
 
   buildInputs = [ libpng ];
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://fukuchi.org/works/qrencode/;
     description = "QR code encoder";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ yegortimoshenko ];
   };
 }
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix
index 86b4cb91de072c7d6d44e4d6cb9b06092cb3cb89..402628f0fc8f668a057c93c64110dd7fe5180ede 100644
--- a/pkgs/tools/graphics/scanbd/default.nix
+++ b/pkgs/tools/graphics/scanbd/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "scanbd-${version}";
-  version = "1.4.4";
+  version = "1.5.1";
 
   src = fetchurl {
-    sha256 = "07a59jk9b2hh49v5lcpckp64f5lny9sq8h0h2p2jcs9cqazf6q9s";
+    sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n";
     url = "mirror://sourceforge/scanbd/${name}.tgz";
   };
 
@@ -52,6 +52,5 @@ stdenv.mkDerivation rec {
     downloadPage = http://sourceforge.net/projects/scanbd/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix
index 4c7c5f1c38589eed2e7cbe3c6b6ae64384b8c948..266221de17359915eeaee42eba1683f310b8485b 100644
--- a/pkgs/tools/graphics/svgcleaner/default.nix
+++ b/pkgs/tools/graphics/svgcleaner/default.nix
@@ -1,25 +1,23 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   name = "svgcleaner-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "RazrFalcon";
     repo = "svgcleaner";
     rev = "v${version}";
-    sha256 = "0l75a2kqh2syl14pmywrkxhr19fcnfpzjj9gj3503aw0r800g16m";
+    sha256 = "1jpnqsln37kkxz98vj7gly3c2170v6zamd876nc9nfl9vns41s0f";
   };
 
-  cargoSha256 = "1hl04wqdgspajf2w664i00vgp13yi0sxvjjpfs5vfhm641z3j69y";
+  cargoSha256 = "0d5jlq301s55xgdg9mv26hbj75pkjkyxfny7vbiqp9igj128lza3";
 
   meta = with stdenv.lib; {
     description = "A tool for tidying and optimizing SVGs";
     homepage = "https://github.com/RazrFalcon/svgcleaner";
     license = licenses.gpl2;
     platforms = platforms.all;
-    maintainer = [ maintainers.mehandes ];
+    maintainers = [ maintainers.mehandes ];
   };
 }
diff --git a/pkgs/tools/graphics/swfdec/default.nix b/pkgs/tools/graphics/swfdec/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1c3c0f3b4515f57cc782e8967fd5d673cb927a40
--- /dev/null
+++ b/pkgs/tools/graphics/swfdec/default.nix
@@ -0,0 +1,38 @@
+{stdenv, fetchurl
+, cairo, pango, glib, liboil, zlib, gstreamer, gst-plugins-base
+, gst-plugins-good , gtk2, libsoup, alsaLib, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "swfdec";
+  version = "0.8.4";
+
+  src = fetchurl {
+    url = "http://swfdec.freedesktop.org/download/swfdec/0.8/swfdec-${version}.tar.gz";
+    sha256 = "00nqrd0fzf0g76rn80d7h56n6hxv7x1x6k89zj45bj564lzwc3vs";
+  };
+
+  buildInputs = [
+    cairo glib liboil pango zlib gstreamer gst-plugins-base gst-plugins-good
+    gtk2 libsoup alsaLib pkgconfig
+  ];
+  
+  postInstall = ''
+    mkdir "$out/bin"
+    cp tools/.libs/swfdec-extract "$out/bin"
+    cp tools/.libs/dump "$out/bin/swfdec-dump"
+    cp player/.libs/swfplay "$out/bin/swfplay"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    inherit version;
+    description = "Decoder/renderer for Macromedia Flash animations";
+    license = stdenv.lib.licenses.lgpl21 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = https://swfdec.freedesktop.org/wiki/;
+  };
+}
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 4fb16b497176c404dcd609693eb26d6f94248dce..d1dfe7afbf84c100c81b52a14ab8c879a2f08327 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips,
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, expat,
   fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif,
   python27, libpng, matio ? null, cfitsio ? null, libwebp ? null
 }:
 
 stdenv.mkDerivation rec {
-  name = "vips-8.3.1";
+  name = "vips-${version}";
+  version = "8.6.3";
 
   src = fetchurl {
-    url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";
-    sha256 = "01hh1baar2r474kny24fcq6ddshcvq104207mqxnkis0as6pzjq9";
+    url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "14h9w61gaimldmqaym0zhf9fkxjj1pkd5lhglhs6pxphynwxnnpq";
   };
 
   buildInputs =
     [ pkgconfig glib libxml2 fftw orc lcms
       imagemagick openexr libtiff libjpeg
       libgsf libexif python27 libpng
+      expat
     ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index b513115c68fe8c8eb67b233b846e3b99a8dc0b21..3ecd91aaca14e969f03b6ce974ec820ab2f429f8 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://wkhtmltopdf.org/;
+    homepage = https://wkhtmltopdf.org/;
     description = "Tools for rendering web pages to PDF or images";
     longDescription = ''
       wkhtmltopdf and wkhtmltoimage are open source (LGPL) command line tools
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 87bb4923b8ad6430fa066725cbc607fd0be56fd4..b8bf73fda648b11cb799956f2073506d22de9211 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl
 , libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook
+, enableVideo ? stdenv.isLinux
 }:
 
 let
@@ -38,7 +39,12 @@ in stdenv.mkDerivation rec {
 
   buildInputs =
     [ imagemagickBig pkgconfig python pygtk perl libX11
-      libv4l qt4 lzma gtk2 autoreconfHook ];
+      lzma autoreconfHook ] ++
+    stdenv.lib.optionals enableVideo [ libv4l gtk2 qt4 ];
+
+  configureFlags = stdenv.lib.optionals (!enableVideo) [
+    "--disable-video" "--without-gtk" "--without-qt"
+  ];
 
   hardeningDisable = [ "fortify" ];
 
@@ -52,7 +58,7 @@ in stdenv.mkDerivation rec {
       Code.
     '';
     maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = licenses.lgpl21;
     homepage = http://zbar.sourceforge.net/;
   };
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
index 6022bcebc3b2dca1314543b7e556e7819b13392e..f2610efd2eb45ef169e3485927f02d992d84a631 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qt4 }:
+{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }:
 
 stdenv.mkDerivation rec {
   name = "fcitx-libpinyin-${version}";
-  version = "0.3.91";
+  version = "0.5.3";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz";
-    sha256 = "19h0p1s8bkw24v7x6v19fg7dqpz2kkjlvvrqhypi5bkkvfswf7xn";
+    sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake fcitx gettext libpinyin glib pcre dbus qt4 ];
+  nativeBuildInputs = [ pkgconfig  ];
+  buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev cmake fcitx gettext libpinyin glib pcre dbus ];
 
   preInstall = ''
     substituteInPlace src/cmake_install.cmake \
@@ -24,13 +24,14 @@ stdenv.mkDerivation rec {
   '';
 
   preBuild = let
+    ZHUYIN_DATA_FILE_NAME = "model.text.20161206.tar.gz";
     store_path = fetchurl {
-      url = https://download.fcitx-im.org/data/model.text.20130308.tar.gz;
-      sha256 = "0s8sazix29z1ilxmkw2f0bv6i349awd89ibylf9ixy615s1vb5a5";
+      url = "https://download.fcitx-im.org/data/${ZHUYIN_DATA_FILE_NAME}";
+      sha256 = "017p11si1b7bkwx36xaybq5a9icq1pd7x1jbymqw92akfgjj8w2w";
     };
   in
     ''
-      cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/model.text.20130308.tar.gz
+      cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/${ZHUYIN_DATA_FILE_NAME}
     '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
index e9e2e29f7fad170f215901fff4896fc72850de39..2bd4bf1c878c8d8320776455ccbafd0070abfc68 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor_icon_theme }:
+{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "fcitx-rime-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr";
   };
 
-  buildInputs = [ cmake pkgconfig fcitx librime brise hicolor_icon_theme ];
+  buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ];
 
   # cmake cannont automatically find our nonstandard brise install location
   cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ];
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c2e8837f5d13a34808ffd6a54a8be7e1f81e65cb
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-skk-${version}";
+  version = "0.1.4";
+  src = fetchFromGitHub {
+    owner = "fcitx";
+    repo = "fcitx-skk";
+    rev = "f66d0f56a40ff833edbfa68a4be4eaa2e93d0e3d";
+    sha256 = "1yl2syqrk212h26vzzkwl19fyp71inqmsli9411h4n2hbcp6m916";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ fcitx libskk skk-dicts ];
+
+  cmakeFlags = [ "-DSKK_DEFAULT_PATH=${skk-dicts}/share/SKK-JISYO.combined"
+                 "-DENABLE_QT=FALSE"
+               ];
+  preInstall = ''
+    substituteInPlace src/cmake_install.cmake \
+      --replace ${fcitx} $out
+    substituteInPlace po/cmake_install.cmake \
+      --replace ${fcitx} $out
+    substituteInPlace data/cmake_install.cmake \
+      --replace ${fcitx} $out
+  '';
+
+  meta = with stdenv.lib; {
+    isFcitxEngine = true;
+    description   = "A SKK style input method engine for fcitx";
+    longDescription = ''
+      Fcitx-skk is an input method engine for fcitx. It is based on libskk and thus
+      provides basic features of SKK Japanese input method such as kana-to-kanji conversion,
+      new word registration, completion, numeric conversion, abbrev mode, kuten input,
+      hankaku-katakana input, and re-conversion.
+    '';
+    license       = licenses.gpl3Plus;
+    platforms     = platforms.linux;
+    maintainers   = with maintainers; [ yuriaisaka ];
+  };
+
+}
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
index 227e17347c1f1dc31deb5efa6912c439df84adc2..929cdb30b919e81af458d620928175446b2db7d1 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
@@ -1,22 +1,16 @@
-{ stdenv, fetchurl, fetchpatch, cmake, fcitx, gettext }:
+{ stdenv, fetchurl, cmake, fcitx, gettext }:
 
 stdenv.mkDerivation rec {
   name = "fcitx-table-other-${version}";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx-table-other/${name}.tar.xz";
-    sha256 = "12fqbsjrpx5pndx2jf7fksrlp01a4yxz62h2vpxrbkpk73ljly4v";
+    sha256 = "1di60lr6l5k2sdwi3yrc0hl89j2k0yipayrsn803vd040w1fgfhq";
   };
 
   buildInputs = [ cmake fcitx gettext ];
 
-  patches = [
-    (fetchpatch { url = https://sources.debian.net/data/main/f/fcitx-table-other/0.2.3-3/debian/patches/0001-table-other-fix-build.patch;
-                  sha256 = "06n1df9szfgfjm5al8r1mvp4cib5h0cm601kwngl6k1vqyyjzg1j";
-                })
-  ];
-
   preInstall = ''
    substituteInPlace tables/cmake_install.cmake \
       --replace ${fcitx} $out
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index b0da0034ef96179ff2d46932fccfbba817a38de4..1a3352676b15d80c6d86a6ea233d5509f4be476e 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.1.0";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz";
-    sha256 = "0r8c5k0qin3mz2p1mdciip6my0x58662sx5z50zs4c5pkdg21qwv";
+    sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
@@ -16,10 +16,12 @@ stdenv.mkDerivation rec {
   preInstall = ''
     substituteInPlace platforminputcontext/cmake_install.cmake \
       --replace ${qtbase.out} $out
+    substituteInPlace quickphrase-editor/cmake_install.cmake \
+      --replace ${fcitx} $out
   '';
 
   meta = with stdenv.lib; {
-    homepage    = "https://github.com/fcitx/fcitx-qt5";
+    homepage    = https://github.com/fcitx/fcitx-qt5;
     description = "Qt5 IM Module for Fcitx";
     license     = licenses.gpl2;
     platforms   = platforms.linux;
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index c489b3e4ed74a07de3ab2383788f9c8fb04c6720..c7d0eecb763c9e1a94c640eca4548de148ce53dc 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -2,27 +2,75 @@
 , libxml2, enchant, isocodes, icu, libpthreadstubs
 , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
 , dbus, gtk2, gtk3, qt4, extra-cmake-modules
+, xkeyboard_config, pcre, libuuid, curl, cacert
+, withPinyin ? true
+, fetchFromGitHub
 }:
 
+let
+  # releases at http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz
+  # contains all data but if we want to compile from source, we need to
+  # fetch them ourselves
+  # to update the urls and where to unpack these, look into the
+  # src/module/*/data/CMakeLists.txt files
+  # fcitx_download tgt_name url output)
+  dicts = let SPELL_EN_DICT_VER="20121020"; in fetchurl {
+      url = "http://download.fcitx-im.org/data/en_dict-${SPELL_EN_DICT_VER}.tar.gz";
+      sha256 = "1svcb97sq7nrywp5f2ws57cqvlic8j6p811d9ngflplj8xw5sjn4";
+  };
+  table = fetchurl {
+      url = http://download.fcitx-im.org/data/table.tar.gz;
+      sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1";
+  };
+  pystroke-data = let PY_STROKE_VER="20121124"; in fetchurl {
+      url = "http://download.fcitx-im.org/data/py_stroke-${PY_STROKE_VER}.tar.gz";
+      sha256 = "0j72ckmza5d671n2zg0psg7z9iils4gyxz7jgkk54fd4pyljiccf";
+  };
+  pytable-data = let PY_TABLE_VER="20121124"; in fetchurl {
+      url = "http://download.fcitx-im.org/data/py_table-${PY_TABLE_VER}.tar.gz";
+      sha256 = "011cg7wssssm6hm564cwkrrnck2zj5rxi7p9z5akvhg6gp4nl522";
+  };
+  pinyin-data = fetchurl {
+      url = http://download.fcitx-im.org/data/pinyin.tar.gz;
+      sha256 = "1qfq5dy4czvd1lvdnxzyaiir9x8b1m46jjny11y0i33m9ar2jf2q";
+  };
+in
 stdenv.mkDerivation rec {
   name = "fcitx-${version}";
-  version = "4.2.9.1";
+  version = "4.2.9.5";
 
-  src = fetchurl {
-    url    = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz";
-    sha256 = "0xvcmm4yi7kagf55d0yl3ql5ssbkm9410fwbz3kd988pchichdsk";
+  src = fetchFromGitHub {
+    owner = "fcitx";
+    repo = "fcitx";
+    rev = version;
+    sha256 = "0rv69bacdvblka85dakz4ldpznrgwj59nqcccp5mkkn1rab4zh1r";
   };
 
+  # put data at the correct locations else cmake tries to fetch them,
+  # which fails in sandboxed mode
+  prePatch = ''
+    cp ${dicts} src/module/spell/dict/$(stripHash ${dicts})
+    cp ${table} src/im/table/data/$(stripHash ${table})
+  ''
+  + stdenv.lib.optionalString withPinyin ''
+    cp ${pystroke-data} src/module/pinyin-enhance/data/$(stripHash ${pystroke-data})
+    cp ${pytable-data} src/module/pinyin-enhance/data/$(stripHash ${pytable-data})
+    cp ${pinyin-data} src/im/pinyin/data/$(stripHash ${pinyin-data})
+  ''
+  ;
+
   postPatch = ''
     substituteInPlace src/frontend/qt/CMakeLists.txt \
       --replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins
+
+    patchShebangs cmake/
   '';
 
-  nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig ];
+  nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ];
 
   buildInputs = [
-    enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
-    libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4
+    xkeyboard_config enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
+    libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid
   ];
 
   cmakeFlags = ''
@@ -33,10 +81,15 @@ stdenv.mkDerivation rec {
     -DENABLE_OPENCC=OFF
     -DENABLE_PRESAGE=OFF
     -DENABLE_XDGAUTOSTART=OFF
-  '';
+    -DENABLE_PINYIN=${if withPinyin then "ON" else "OFF"}
+    -DENABLE_TABLE=ON
+    -DENABLE_SPELL=ON
+    -DENABLE_QT_GUI=ON
+    -DXKB_RULES_XML_FILE='${xkeyboard_config}/share/X11/xkb/rules/evdev.xml'
+    '';
 
   meta = with stdenv.lib; {
-    homepage    = "https://github.com/fcitx/fcitx";
+    homepage    = https://github.com/fcitx/fcitx;
     description = "A Flexible Input Method Framework";
     license     = licenses.gpl2;
     platforms   = platforms.linux;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 53b2a3abf28ead7b7a1aafd5b0408dd20d3ed941..c7f7369ba88d505a2f9c5c1c3363df1d73db5afb 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-anthy-${version}";
-  version = "1.5.9";
+  version = "1.5.10";
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1y8sf837rmp662bv6zakny0xcm7c9c5qda7f9kq9riv9ywpcbw6x";
+    sha256 = "0jpqz7pb9brlqiwrbr3i6wvj3b39a9bs9lljl3qa3r77mz8y0cyc";
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..19d862e030850f5d04a0929b0e173cc8735d5023
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl
+, vala, intltool, pkgconfig
+, libkkc, ibus, skk-dicts
+, gtk3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ibus-kkc";
+  version = "1.5.22";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2";
+  };
+
+  nativeBuildInputs = [
+    vala intltool pkgconfig
+  ];
+
+  buildInputs = [ libkkc ibus skk-dicts gtk3 ];
+
+  postInstall = ''
+    ln -s ${skk-dicts}/share $out/share/skk
+  '';
+
+  meta = with stdenv.lib; {
+    isIbusEngine = true;
+    description  = "libkkc (Japanese Kana Kanji input method) engine for ibus";
+    homepage     = https://github.com/ueno/ibus-kkc;
+    license      = licenses.gpl2;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ vanzef ];
+  };
+}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 6293fa30d7a76b9dd3528cd7fd20141374fa83a7..bd22aefe2a950e2b67f5ea0e489b4d4ab90b7e04 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-libpinyin-${version}";
-  version = "1.8.0";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner  = "libpinyin";
     repo   = "ibus-libpinyin";
     rev    = version;
-    sha256 = "1d85kzlhav0ay798i88yqyrjbkv3y7w2aiadpmcjgscyd5ccsnnz";
+    sha256 = "02rwddv1lxzk70946v3rjsx1p7hx1d9bnwb7cx406cbws73yb2r9";
   };
 
   buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index 328c803e7dbc1e1c02a30df602d33f69b7d772a6..ff01c8419260aa1643945e05833427806610e8cb 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-table-others-${version}";
-  version = "1.3.7";
+  version = "1.3.9";
 
   src = fetchurl {
     url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0vmz82il796062jbla5pawsr5dqyhs7ald7xjp84zfccc09dg9kx";
+    sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 8c552799432bdae0ebc7017dd4d62b13f3bef763..04a0a1e36dbcb4a6bdfa01e9584426aa8a491f2b 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-table-${version}";
-  version = "1.9.16";
+  version = "1.9.18";
 
   src = fetchFromGitHub {
     owner  = "kaio";
     repo   = "ibus-table";
     rev    = version;
-    sha256 = "1gkb6nsibk59kp404b394sg638jgah2a2b6ffq3gkacqg5j30wjb";
+    sha256 = "0isxgz7f6xhrcv5qrdd6gm3ysmqp3mi5ngnbqz08f7pclllaridp";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index 1ea7ef4251fe8cb5148d21695274ef94fa00bd83..e31d1ddfaa80d97fe2afd2c061af84128e3278d1 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "121zh3q0li1k537fcvbd4ns4jgl9bbb9gm9ihy8cfxgirv38lcfa";
   };
 
-  propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ];
+  propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein pygobject3 ];
 
   nativeBuildInputs = [ python3Packages.wrapPython ];
 
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 3fd29d65f369fa213d3a8b911fd1e223daaaf61f..59ddab7294f56f37fd8956aeb379d615e8330d91 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -1,129 +1,138 @@
-{ stdenv, fetchurl, wrapGAppsHook
-, intltool, isocodes, pkgconfig
-, python3
-, gtk2, gtk3, atk, dconf, glib, json_glib
-, dbus, libnotify, gobjectIntrospection, wayland
-}:
+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig
+, vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2
+, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true
+, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }:
+
+assert withWayland -> wayland != null && libxkbcommon != null;
+
+with stdenv.lib;
 
 let
-  emojiData = let
-    srcs = {
-      data = fetchurl {
-        url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt";
-        sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf";
-      };
-      sequences = fetchurl {
-        url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt";
-        sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1";
-      };
-      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 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q";
-      };
-      test = fetchurl {
-        url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt";
-        sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw";
-      };
+  emojiSrcs = {
+    data = fetchurl {
+      url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt";
+      sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf";
+    };
+    sequences = fetchurl {
+      url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt";
+      sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1";
+    };
+    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 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q";
     };
-  in stdenv.mkDerivation {
+    test = fetchurl {
+      url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt";
+      sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw";
+    };
+  };
+  emojiData = stdenv.mkDerivation {
     name = "emoji-data-5.0";
     unpackPhase = ":";
-    dontBuild = true;
-    installPhase = with stdenv.lib; ''
+    installPhase = ''
       mkdir $out
-      ${builtins.toString (flip mapAttrsToList srcs (k: v: ''
-        cp ${v} $out/emoji-${k}.txt
-      ''))}
+      ${builtins.toString (flip mapAttrsToList emojiSrcs (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";
+    version = "31.90.0_1";
+    src = fetchFromGitHub {
+      owner = "fujiwarat";
+      repo = "cldr-emoji-annotation";
+      rev = version;
+      sha256 = "1vsj32bg8ab4d80rz0fxy6sj2lv31inzyjnddjm079bnvlaf2kih";
     };
+    nativeBuildInputs = [ autoreconfHook ];
   };
-  pyEnv = python3.buildEnv.override {
-    extraLibs = [ python3.pkgs.pygobject3 ];
-
+  python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]);
+  python3BuildEnv = python3.buildEnv.override {
     # ImportError: No module named site
     postBuild = ''
-      makeWrapper '${glib.dev}/bin/glib-genmarshal' "$out"/bin/glib-genmarshal \
-        --unset PYTHONPATH
+      makeWrapper ${glib.dev}/bin/gdbus-codegen $out/bin/gdbus-codegen --unset PYTHONPATH
+      makeWrapper ${glib.dev}/bin/glib-genmarshal $out/bin/glib-genmarshal --unset PYTHONPATH
+      makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH
     '';
   };
-in stdenv.mkDerivation rec {
+in
+
+stdenv.mkDerivation rec {
   name = "ibus-${version}";
-  version = "1.5.16";
+  version = "1.5.17";
 
-  src = fetchurl {
-    url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz";
-    sha256 = "07py16jb81kd7vkqhcia9cb2avsbg5jswp2kzf0k4bprwkxppd9n";
+  src = fetchFromGitHub {
+    owner = "ibus";
+    repo = "ibus";
+    rev = version;
+    sha256 = "09mrj9d8qpl9cbylg1zx8c3ymc5gdy4jrf6zs125wjz0b574g5av";
   };
 
   postPatch = ''
-    # These paths will be set in the wrapper.
-    sed -e "/export IBUS_DATAROOTDIR/ s/^.*$//" \
-        -e "/export IBUS_LIBEXECDIR/ s/^.*$//" \
-        -e "/export IBUS_LOCALEDIR/ s/^.*$//" \
-        -e "/export IBUS_PREFIX/ s/^.*$//" \
-        -i "setup/ibus-setup.in"
+    substituteInPlace setup/ibus-setup.in --subst-var-by PYTHON ${python3Runtime.interpreter}
+    substituteInPlace data/dconf/Makefile.am --replace "dconf update" true
+    substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus
+    echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh
+    cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .
   '';
 
+  preAutoreconf = "touch ChangeLog";
+  preConfigure = "intltoolize";
+
   configureFlags = [
     "--disable-gconf"
-    "--enable-dconf"
     "--disable-memconf"
-    "--enable-ui"
-    "--enable-python-library"
+    (enableFeature (dconf != null) "dconf")
+    (enableFeature (libnotify != null) "libnotify")
+    (enableFeature withWayland "wayland")
+    (enableFeature enablePythonLibrary "python-library")
+    (enableFeature enableUI "ui")
     "--with-unicode-emoji-dir=${emojiData}"
     "--with-emoji-annotation-dir=${cldrEmojiAnnotation}/share/unicode/cldr/common/annotations"
   ];
 
-  buildInputs = [
-    pyEnv
-    intltool isocodes pkgconfig
-    gtk2 gtk3 dconf
-    json_glib
-    dbus libnotify gobjectIntrospection wayland
+  nativeBuildInputs = [
+    autoreconfHook
+    gconf
+    gtk-doc
+    intltool
+    makeWrapper
+    pkgconfig
+    python3BuildEnv
+    vala
+    wrapGAppsHook
   ];
 
   propagatedBuildInputs = [ glib ];
 
-  nativeBuildInputs = [ wrapGAppsHook ];
-
-  outputs = [ "out" "dev" ];
+  buildInputs = [
+    dbus
+    dconf
+    gdk_pixbuf
+    gobjectIntrospection
+    gtk2
+    gtk3
+    isocodes
+    json-glib
+    libnotify
+  ] ++ optionals withWayland [
+    libxkbcommon
+    wayland
+  ];
 
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    # Fix hard-coded installation paths, so make does not try to overwrite our
-    # Python installation.
-    sed -e "/py2overridesdir=/ s|=.*$|=$out/lib/${python3.libPrefix}|" \
-        -e "/pyoverridesdir=/ s|=.*$|=$out/lib/${python3.libPrefix}|" \
-        -e "/PYTHON2_LIBDIR/ s|=.*|=$out/lib/${python3.libPrefix}|" \
-        -i configure
-
-    # Don't try to generate a system-wide dconf database; it wouldn't work.
-    substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
-  '';
-
   doInstallCheck = true;
   installCheckPhase = "$out/bin/ibus version";
 
-  postInstall = ''
-    moveToOutput "bin/ibus-setup" "$dev"
-  '';
-
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://github.com/ibus/ibus;
-    description = "Intelligent Input Bus for Linux / Unix OS";
+    description = "Intelligent Input Bus, input method framework";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.ttuegel ];
+    maintainers = with maintainers; [ ttuegel yegortimoshenko ];
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
index d41ba1e791f9624cf6e8b44f28b1c8d9e9af556d..2b93274b79a20945e65cc26ac6afad63484e385f 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -1,5 +1,5 @@
 { stdenv, runCommand, makeWrapper, lndir
-, dconf, hicolor_icon_theme, ibus, librsvg, plugins
+, dconf, hicolor-icon-theme, ibus, librsvg, plugins
 }:
 
 let
@@ -7,7 +7,7 @@ let
   env = {
     buildInputs = [ ibus ] ++ plugins;
     nativeBuildInputs = [ lndir makeWrapper ];
-    propagatedUserEnvPackages = [ hicolor_icon_theme ];
+    propagatedUserEnvPackages = [ hicolor-icon-theme ];
     paths = [ ibus ] ++ plugins;
     inherit (ibus) meta;
   };
@@ -37,7 +37,7 @@ let
           --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \
           --prefix PYTHONPATH : "$PYTHONPATH" \
           --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-          --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share"
+          --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"
     done
 
     for prog in ibus-daemon; do
@@ -56,7 +56,7 @@ let
           --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \
           --prefix PYTHONPATH : "$PYTHONPATH" \
           --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-          --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \
+          --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
           --add-flags "--cache=refresh"
     done
   '';
diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
index b31a24b0c837b47475d508c7e1e110509c595db9..994e9da3e43022f49ef26fdad07724dfd67675af 100644
--- a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
+++ b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
@@ -13,11 +13,11 @@ in stdenv.mkDerivation {
 
   buildInputs = [ cmake ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://gitlab.com/interception/linux/plugins/caps2esc";
     description = "Transforming the most useless key ever into the most useful one";
-    license = stdenv.lib.licenses.mit;
-    maintainers = stdenv.lib.maintainers.vyp;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    maintainers = [ maintainers.vyp ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
index ba54d4954c584883eac3fc94e7f101d2aa32c708..33fea9705acd1d5e355ec3885f04d712fd779d23 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcppWithoutBoost,
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp,
   libevdev, libudev }:
 
 let
@@ -12,8 +12,8 @@ in stdenv.mkDerivation {
     sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake libevdev libudev libyamlcppWithoutBoost ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libevdev libudev libyamlcpp ];
 
   prePatch = ''
     substituteInPlace CMakeLists.txt --replace \
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
     description = "A minimal composable infrastructure on top of libudev and libevdev";
     homepage = "https://gitlab.com/interception/linux/tools";
     license = stdenv.lib.licenses.gpl3;
-    maintainers = stdenv.lib.maintainers.vyp;
+    maintainers = [ stdenv.lib.maintainers.vyp ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix
index f04afd639b7d4221dfd4064ede127f167fb9a8a7..b930da02acc9787c2b5ddf0d70ce4ef10ab19bdf 100644
--- a/pkgs/tools/inputmethods/keyfuzz/default.nix
+++ b/pkgs/tools/inputmethods/keyfuzz/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Manipulate the scancode/keycode translation tables of keyboard drivers.";
-    homepace    = http://0pointer.de/lennart/projects/keyfuzz/;
+    homepage    = http://0pointer.de/lennart/projects/keyfuzz/;
     license     = licenses.gpl2Plus;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ mboes ];
diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b694fcabbd0dd3f12942280e351aaa0d44cc6f3e
--- /dev/null
+++ b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch
@@ -0,0 +1,13 @@
+diff --git a/libinput-gestures b/libinput-gestures
+index f337ba3..fe56d66 100755
+--- a/libinput-gestures
++++ b/libinput-gestures
+@@ -6,7 +6,7 @@ from collections import OrderedDict
+ from pathlib import Path
+ from distutils.version import LooseVersion as Version
+ 
+-PROG = Path(sys.argv[0]).stem
++PROG = "libinput-gestures"
+ 
+ # Conf file containing gesture commands.
+ # Search first for user file then system file.
diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c6ee123db8b6302490caf80452879c1bb9e9ee14
--- /dev/null
+++ b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
@@ -0,0 +1,43 @@
+diff --git a/libinput-gestures b/libinput-gestures
+index f337ba3..5f5b05d 100755
+--- a/libinput-gestures
++++ b/libinput-gestures
+@@ -75,17 +75,13 @@ def get_libinput_vers():
+     'Return the libinput installed version number string'
+     # Try to use newer libinput interface then fall back to old
+     # (depreciated) interface.
+-    res = run(('libinput', '--version'), check=False)
++    res = run(('@libinput@', '--version'), check=False)
+     return res.strip() if res else run(('libinput-list-devices', '--version'))
+ 
+ # Libinput changed the way in which it's utilities are called
+ libvers = get_libinput_vers()
+-if Version(libvers) >= Version('1.8'):
+-    cmd_debug_events = 'libinput debug-events'
+-    cmd_list_devices = 'libinput list-devices'
+-else:
+-    cmd_debug_events = 'libinput-debug-events'
+-    cmd_list_devices = 'libinput-list-devices'
++cmd_debug_events = '@libinput@ debug-events'
++cmd_list_devices = '@libinput@ list-devices'
+ 
+ def get_devices_list():
+     'Get list of devices and their attributes (as a dict) from libinput'
+@@ -187,7 +183,7 @@ class COMMAND_internal(COMMAND):
+ 
+     def run(self):
+         'Get list of current workspaces and select next one'
+-        stdout = run(('wmctrl', '-d'), check=False)
++        stdout = run(('@wmctrl@', '-d'), check=False)
+         if not stdout:
+             # This command can fail on GNOME when you have only a single
+             # dynamic workspace using Xorg (probably a GNOME bug) so let's
+@@ -220,7 +216,7 @@ class COMMAND_internal(COMMAND):
+ 
+         # Switch to desired workspace
+         if index >= minindex and index < maxindex:
+-            run(('wmctrl', '-s', str(index)))
++            run(('@wmctrl@', '-s', str(index)))
+ 
+ # Table of gesture handlers
+ handlers = OrderedDict()
diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..31a7098e08d6b058ab7c406db340e02a3e7c9817
--- /dev/null
+++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix
@@ -0,0 +1,54 @@
+{ lib, stdenv, fetchFromGitHub, makeWrapper,
+  libinput, wmctrl,
+  xdotool ? null,
+  extraUtilsPath ? lib.optional (xdotool != null) xdotool
+}:
+stdenv.mkDerivation rec {
+  pname = "libinput-gestures";
+  version = "2.33";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "bulletmark";
+    repo = "libinput-gestures";
+    rev = version;
+    sha256 = "0a4zq880da1rn0mxn1sq4cp6zkw4bfslr0vjczkbj4immjrj422j";
+  };
+  patches = [
+    ./0001-hardcode-name.patch
+    ./0002-paths.patch
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postPatch =
+    ''
+      substituteInPlace libinput-gestures-setup --replace /usr/ /
+
+      substituteInPlace libinput-gestures \
+        --replace      /etc     "$out/etc" \
+        --subst-var-by libinput "${libinput}/bin/libinput" \
+        --subst-var-by wmctrl   "${wmctrl}/bin/wmctrl"
+    '';
+  installPhase =
+    ''
+      runHook preInstall
+      ${stdenv.shell} libinput-gestures-setup -d "$out" install
+      runHook postInstall
+    '';
+  postFixup =
+    ''
+      rm "$out/bin/libinput-gestures-setup"
+      substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out"
+      chmod +x "$out/share/applications/libinput-gestures.desktop"
+      wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath extraUtilsPath}"
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/bulletmark/libinput-gestures;
+    description = "Gesture mapper for libinput";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ teozkr ];
+  };
+}
diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0051be14ee7c8a0a0111bde5afdde7ca79c518c9
--- /dev/null
+++ b/pkgs/tools/inputmethods/libkkc/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl
+, vala, gobjectIntrospection, intltool, python2Packages, glib
+, pkgconfig
+, libgee, json_glib, marisa, libkkc-data
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libkkc";
+  version = "0.3.5";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef";
+  };
+
+  nativeBuildInputs = [
+    vala gobjectIntrospection
+    python2Packages.python python2Packages.marisa
+    intltool glib pkgconfig
+  ];
+
+  buildInputs = [ marisa libkkc-data ];
+  enableParallelBuilding = true;
+
+  propagatedBuildInputs = [ libgee json_glib ];
+
+  postInstall = ''
+    ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Japanese Kana Kanji conversion input method library";
+    homepage    = https://github.com/ueno/libkkc;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vanzef ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix
index 944d6de1084aebb4411591a1d8e8713ba101663a..dd8e96f8a6f88329b863f3302199060dac348bcb 100644
--- a/pkgs/tools/inputmethods/m17n-db/default.nix
+++ b/pkgs/tools/inputmethods/m17n-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "m17n-db-1.7.0";
+  name = "m17n-db-1.8.0";
 
   src = fetchurl {
     url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
-    sha256 = "1w08hnsbknrcjlzp42c99bgwc9hzsnf5m4apdv0dacql2s09zfm2";
+    sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5";
   };
 
   buildInputs = [ gettext ];
diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix
index 982f35a9fe682ba8a8a6bd639d344c7f8efca66f..12b669c87777234c79735c99dcf7cf19444533a3 100644
--- a/pkgs/tools/inputmethods/m17n-lib/default.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, m17n_db}:
 stdenv.mkDerivation rec {
-  name = "m17n-lib-1.7.0";
+  name = "m17n-lib-1.8.0";
 
   src = fetchurl {
     url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
-    sha256 = "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f";
+    sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq";
   };
 
   buildInputs = [ m17n_db ];
diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..cecacd4af95474ade3d312d3889e63ef47caa113
--- /dev/null
+++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, skktools }:
+
+let
+  # kana to kanji
+  small = fetchurl {
+    url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.S";
+    sha256 = "15kp4iwz58fp1zg0i13x7w9wwm15v8n2hhm0nf2zsl7az5mn5yi4";
+  };
+  medium = fetchurl {
+    url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.M";
+    sha256 = "1vhagixhrp9lq5x7dldxcanhznawazp00xivpp1z52kx10lnkmv0";
+  };
+  large = fetchurl {
+    url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.L";
+    sha256 = "07cv0j95iajkr48j4ln411vnhl3z93yx96zjc03bgs10dbpagaaz";
+  };
+
+  # english to japanese
+  edict = fetchurl {
+    url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.edict";
+    sha256 = "18k8z1wkgwgfwbs6sylf39h1nc1p5l2b00h7mfjlb8p91plkb45w";
+  };
+  # misc
+  assoc = fetchurl {
+    url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.assoc";
+    sha256 = "12d6xpp1bfin9nwl35ydl5yc6vx0qpwhxss0khi19n1nsbyqnixm";
+  };
+in
+
+stdenv.mkDerivation rec {
+  name = "skk-dicts-unstable-${version}";
+  version = "2017-10-26";
+  srcs = [ small medium large edict assoc ];
+  nativeBuildInputs = [ skktools ];
+
+  phases = [ "installPhase" ];
+  installPhase = ''
+    function dictname() {
+      src=$1
+      name=$(basename $src)          # remove dir name
+      dict=$(echo $name | cut -b34-) # remove sha256 prefix
+      echo $dict
+    }
+    mkdir -p $out/share
+
+    for src in $srcs; do
+      dst=$out/share/$(dictname $src)
+      echo ";;; -*- coding: utf-8 -*-" > $dst  # libskk requires this on the first line
+      iconv -f EUC-JP -t UTF-8 $src |\
+        ${skktools}/bin/skkdic-expr2 >> $dst
+    done
+
+    # combine .L .edict and .assoc for convenience
+    dst=$out/share/SKK-JISYO.combined
+    echo ";;; -*- coding: utf-8 -*-" > $dst
+    ${skktools}/bin/skkdic-expr2 \
+      $out/share/$(dictname ${large}) + \
+      $out/share/$(dictname ${edict}) + \
+      $out/share/$(dictname ${assoc}) >> $dst
+  '';
+
+  meta = {
+    description = "A collection of standard SKK dictionaries";
+    longDescription = ''
+      This package provides a collection of standard kana-to-kanji
+      dictionaries for the SKK Japanese input method.
+    '';
+    homepage = https://github.com/skk-dev/dict;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix
index bdcbc939a07b50711a9f1a748a52f58f37626444..82dd387f536d7b67ca7ccfddc8950238ad883d0a 100644
--- a/pkgs/tools/inputmethods/touchegg/default.nix
+++ b/pkgs/tools/inputmethods/touchegg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis, qmake4Hook }:
+{ stdenv, fetchurl, xorg, xorgserver, qt4, libGLU_combined, geis, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   name = "touchegg-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038";
   };
 
-  buildInputs = [ xorgserver mesa xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ];
+  buildInputs = [ xorgserver libGLU_combined xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ];
 
   nativeBuildInputs = [ qmake4Hook ];
 
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 3f37c1a2ab0c3a98d3b5a2e3dbba3efdafd998c4..96b88714178591e8557c8580247a3cdb6f8c4097 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -1,5 +1,31 @@
-{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs4, ncurses,
- cmake, anthy, automoc4, m17n_lib, m17n_db}:
+{ stdenv, fetchurl, intltool, pkgconfig, cmake
+, ncurses, m17n_lib, m17n_db, expat
+, withAnthy ? true, anthy ? null
+, withGtk ? true
+, withGtk2 ? withGtk, gtk2 ? null
+, withGtk3 ? withGtk, gtk3 ? null
+, withQt ? true
+, withQt4 ? withQt, qt4 ? null
+, withLibnotify ? true, libnotify ? null
+, withSqlite ? true, sqlite ? null
+, withNetworking ? true, curl ? null, openssl ? null
+, withFFI ? true, libffi ? null
+
+# Things that are clearly an overkill to be enabled by default
+, withMisc ? false, libeb ? null
+}:
+
+with stdenv.lib;
+
+assert withAnthy -> anthy != null;
+assert withGtk2 -> gtk2 != null;
+assert withGtk3 -> gtk3 != null;
+assert withQt4 -> qt4 != null;
+assert withLibnotify -> libnotify != null;
+assert withSqlite -> sqlite != null;
+assert withNetworking -> curl != null && openssl != null;
+assert withFFI -> libffi != null;
+assert withMisc -> libeb != null;
 
 stdenv.mkDerivation rec {
   version = "1.8.6";
@@ -8,32 +34,56 @@ stdenv.mkDerivation rec {
   buildInputs = [
     intltool
     pkgconfig
-    qt4
-    gtk2
-    gtk3
-    kdelibs4
     ncurses
     cmake
-    anthy
-    automoc4
     m17n_lib
     m17n_db
-  ];
+    expat
+  ]
+  ++ optional withAnthy anthy
+  ++ optional withGtk2 gtk2
+  ++ optional withGtk3 gtk3
+  ++ optional withQt4 qt4
+  ++ optional withLibnotify libnotify
+  ++ optional withSqlite sqlite
+  ++ optionals withNetworking [
+    curl openssl
+  ]
+  ++ optional withFFI libffi
+  ++ optional withMisc libeb;
 
   patches = [ ./data-hook.patch ];
 
   configureFlags = [
-    "--with-gtk2"
-    "--with-gtk3"
-    "--enable-kde4-applet"
-    "--enable-notify=knotify4"
     "--enable-pref"
-    "--with-qt4"
-    "--with-qt4-immodule"
     "--with-skk"
     "--with-x"
-    "--with-anthy-utf8"
-  ];
+    "--with-xft"
+    "--with-expat=${expat.dev}"
+  ]
+  ++ optional withAnthy "--with-anthy-utf8"
+  ++ optional withGtk2 "--with-gtk2"
+  ++ optional withGtk3 "--with-gtk3"
+  ++ optionals withQt4 [
+    "--with-qt4"
+    "--with-qt4-immodule"
+  ]
+  ++ optional withLibnotify "--enable-notify=libnotify"
+  ++ optional withSqlite "--with-sqlite3"
+  ++ optionals withNetworking [
+    "--with-curl"
+    "--with-openssl-dir=${openssl.dev}"
+  ]
+  ++ optional withFFI "--with-ffi"
+  ++ optional withMisc "--with-eb";
+
+  # TODO: things in `./configure --help`, but not in nixpkgs
+  #--with-canna            Use Canna [default=no]
+  #--with-wnn              Build with libwnn [default=no]
+  #--with-mana             Build a plugin for Mana [default=yes]
+  #--with-prime            Build a plugin for PRIME [default=yes]
+  #--with-sj3              Use SJ3 [default=no]
+  #--with-osx-dcs          Build with OS X Dictionary Services [default=no]
 
   dontUseCmakeConfigure = true;
 
@@ -45,8 +95,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage    = "https://github.com/uim/uim";
     description = "A multilingual input method framework";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with maintainers; [ ericsagnes ];
+    license     = licenses.bsd3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ ericsagnes oxij ];
   };
 }
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index d11392599220b4f001d1224603f92e5f21f70c60..d1125d572ee9922d171a95a9c7043ca6af63803b 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libiconv ];
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
-
   meta = with stdenv.lib; {
     description = "Encrypt files with Advanced Encryption Standard (AES)";
     homepage    = https://www.aescrypt.com/;
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index ee0accac2d9bd75b0c541912a8097aaa3d5e6607..62d46bba5b0db89a78f2c4710078416aa854e1fe 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -22,5 +22,6 @@ mkDerivation rec {
     maintainers = with maintainers; [ jb55 ];
     license = licenses.gpl3;
     platforms = with platforms; linux;
+    broken = true; # 2018-04-10
   };
 }
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index 6214bc216f8bc7258019eea581cb79154bbf5d4a..168a3f887728c14f711df38f97c7478a596def87 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -2,14 +2,14 @@
 
 let
 
-  version = "1.1.1";
+  version = "1.2.0";
   rev = "v${version}";
 
   aptlySrc = fetchFromGitHub {
     inherit rev;
     owner = "smira";
     repo = "aptly";
-    sha256 = "197a7nh8li20slqxgn8s8xm13x5b8ansmabk8rx32sngb73hp4av";
+    sha256 = "1acnkmgarz9rp0skkh7zzwkhisjlmbl74jqjmqd3mn42y528c34b";
   };
 
   aptlyCompletionSrc = fetchFromGitHub {
diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix
index 76f42b1976ae6504a19111d6808ae92e81a37d70..6b1512e854b04bd46df8895c9ad3c15406e20485 100644
--- a/pkgs/tools/misc/argtable/default.nix
+++ b/pkgs/tools/misc/argtable/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.argtable.org/;
+    homepage = https://www.argtable.org/;
     description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library";
     license = licenses.bsd3;
     maintainers = with maintainers; [ artuuge ];
diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
index 4d6e90a347e73cbce61f7f4772ec59a67cb974e6..0808704ecb783cfff8502197a13c9aac8957a853 100644
--- a/pkgs/tools/misc/asciinema/default.nix
+++ b/pkgs/tools/misc/asciinema/default.nix
@@ -4,7 +4,7 @@ let
   pythonPackages = python3Packages;
 in pythonPackages.buildPythonApplication rec {
   name = "asciinema-${version}";
-  version = "1.4.0";
+  version = "2.0.0";
 
   buildInputs = with pythonPackages; [ nose ];
   propagatedBuildInputs = with pythonPackages; [ requests ];
@@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec {
     owner = "asciinema";
     repo = "asciinema";
     rev = "v${version}";
-    sha256 = "1m2gjqxb5gqyz19lvp7jmwp7cxjc6nb0b2rrlsg3z2bl6vmi1xn2";
+    sha256 = "1f92hv9w58jf1f7igspjxvrxqn3n21kgya2zb56spqyydr4jzwdk";
   };
 
   patchPhase = ''
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 974b7691cb935ce6c433fcf80167810b1a748705..859112d29bc23583d000f4102223f541b692d4bd 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -1,42 +1,27 @@
-{ stdenv, fetchurl,
-  boost, clasp, cmake, gringo, re2c
+{ stdenv, fetchzip
+, boost, clasp, cmake, gringo, re2c
 }:
 
-let
-  version = "1.9.1";
-in
-
 stdenv.mkDerivation rec {
+  version = "1.9.4";
   name = "aspcud-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz";
-    sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0";
+  src = fetchzip {
+    url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz";
+    sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw";
   };
 
   buildInputs = [ boost clasp cmake gringo re2c ];
 
-  buildPhase = ''
-    cmake -DCMAKE_BUILD_TYPE=Release \
-      -DGRINGO_LOC=${gringo}/bin/gringo \
-      -DCLASP_LOC=${clasp}/bin/clasp \
-      -DENCODING_LOC=$out/share/aspcud/specification.lp \
-      .
-
-    make
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/{aspcud,cudf2lp,lemon} $out/bin
-
-    mkdir -p $out/share/aspcud
-    cp ../share/aspcud/specification.lp $out/share/aspcud
-  '';
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DASPCUD_GRINGO_PATH=${gringo}/bin/gringo"
+    "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp"
+  ];
 
   meta = with stdenv.lib; {
     description = "Solver for package problems in CUDF format using ASP";
-    homepage = http://potasssco.sourceforge.net/;
+    homepage = "https://potassco.org/aspcud/";
     platforms = platforms.all;
     maintainers = [ maintainers.hakuch ];
     license = licenses.gpl3Plus;
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index 817510bfb761d830d998958409ab4ad83104de28..4d3376108b7ed37628f11da88e01ddb44d35daa0 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, python, bash }:
 
 let
-  version = "22.5.0";
+  version = "22.5.1";
 in
   stdenv.mkDerivation rec {
     name = "autojump-${version}";
@@ -9,7 +9,7 @@ in
     src = fetchurl {
       url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz";
       name = "autojump-${version}.tar.gz";
-      sha256 = "00ai0j37ka3557a8m7ig44dby7v01pckwi8gl479vz5b5pw1z8cd";
+      sha256 = "17z9j9936x0nizwrzf664bngh60x5qbvrrf1s5qdzd0f2gdanpvn";
     };
 
     buildInputs = [ python bash ];
@@ -22,6 +22,9 @@ in
       mkdir -p "$out/etc/bash_completion.d"
       cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d"
 
+      mkdir -p $out/share/fish/vendor_completions.d/
+      cp -v $out/share/autojump/autojump.fish "$out/share/fish/vendor_completions.d/autojump.fish"
+
       cat <